diff --git a/bsp/buildroot/CHANGES b/bsp/buildroot/CHANGES
index a0100074..cdf68216 100644
--- a/bsp/buildroot/CHANGES
+++ b/bsp/buildroot/CHANGES
@@ -1,22 +1,1073 @@
-2017.02.11, Released April 11th, 2018
+2018.02.6, Released October 7th, 2018
 
 	Important / security related fixes.
 
+	Add a number of patches to fix build errors for host utilities
+	on modern distributions using glibc-2.28.
+
+	mkusers: Ensure existing group members are preserved when a
+	group is reprocessed.
+
+	printvars: Fix issue with exceeding shell command line length
+	limits for certain setups.
+
+	Updated/fixes packages: acpid, android-tools, apache,
+	arp-scan, bandwidthd, bind, bison, clamav, connman, cppcms,
+	cramfs, fio, gcc, ghostscript, glibc, gnupg, httping,
+	igmpproxy, imagemagick, imlib2, ipsec-tools, lcms2, libcurl,
+	libesmtp, libnfs, libssh, libxslt, links, linuxptp,
+	mediastreamer, minicom, moarvm, nilfs-utils, ocrad, parted,
+	php, pv, python-django, qt, qt5quickcontrols, qt5webengine,
+	screen, sdl2, shairport-sync, squashfs, strongswan,
+	vboot-utils, webkitgtk, wireguard, x265, xen, xlib_libXfont,
+	xlib_libXft
+
+	New packages: brotli, woff2
+
+2018.02.5, Released August 29th, 2018
+
+	Important / security related fixes.
+
+	Defconfigs: Raspberrypi2: Bump rootfs size, T7680: Fix
+	genimage.cfg issue, ARM Juno: Bump ATF to v1.3 to fix build
+	issue.
+
+	Updated/fixed packages: acl, apache, attr, bind,
+	boot-wrapper-aarch64, brltty, bzip2, chrony, crda, cryptsetup,
+	dahdi-tools, dmidecode, dropbear, eigen, erlang, ffmpeg, gawk,
+	gcc, ghostscript, gnutls, ipsec-tools, libarchive, libfuse,
+	libopenssl, libselinux, libsoup, lighttpd, linuxptp,
+	lttng-modules, lttng-tools, lua-flu, lvm2, m4, makedevs,
+	mariadb, mbedtls, mesa3d-headers, mtd, ncurses, nodejs,
+	openssh, php, postgresql, python-django, qt5xmlpatterns, ruby,
+	samba4, shairport-sync, stress-ng, ti-utils, uboot-tools, vim,
+	waylandpp, wireless_tools, wireshark, wpa_supplicant, xorriso,
+	znc
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#10781: cryptsetup luksOpen container_file container causes..
+	#10986: Installing package attr when already supplied by..
+	#11191: xattr and check-package issue
+
+2018.02.4, Released July 21th, 2018
+
+	Important / security related fixes.
+
+	U-Boot: Ensure host version of ncurses is picked up and not
+	host-ncurses built by buildroot, as that otherwise causes
+	widechar/non-widechar conflicts and corrupted menuconfig
+	menus.
+
+	Linux: Enable CONFIG_PERF_EVENTS when perf is enabled.
+
+	Defconfigs: Raspberrypi3: Bump rootfs size, Minnowboard-max:
+	Support ethernet on Turbot variant.
+
+	Updated/fixed packages: bind, clamav, collectd, dos2unix,
+	edid-decode, gcc, gdb, heimdal, hidapi, imx-gpu-viv, libcurl,
+	libglib2, liblogging, libostree, libsoup, libv4l, lm-sensors,
+	ncurses, network-manager, patchelf, pinentry, procps-ng, qpdf,
+	qt5, qt53d, qt5base, qt5charts, qt5script, qt5serialport,
+	systemd, wireguard, wireless-regdb
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#11101: host-patchelf Endian Issue with relative RPATH
+
+2018.02.3, Released June 18th, 2018
+
+	Important / security related fixes.
+
+	Various fixes for building on modern distributions (GCC 8.x,
+	no rpcgen utility).
+
+	ARM: Default to binutils 2.28 and warn about newer binutils
+	versions, which are known to cause boot failures for Linux
+	kernels built in thumb mode.
+
+	Busybox/mdev: Fix module autoloading.
+
+	Busybox/sysvinit: inittab: Add /dev/{stdin,stdout,stderr}
+	symlinks, call swapon -a to activate any configured swap
+	devices.
+
+	Dependencies: Check that PATH does not contain current working
+	directory, which triggers a number of build failures.
+
+	Infrastructure: Error out for packages erroneously using the
+	'local' site method but not defining a _SITE.
+
+	Linux: Fix cuImage.<dtb> / simpleImage.<dtb> handling.  Ensure
+	kconfig uses ncurses from the host to fix a ncurses/ncursesw
+	mixup, causing menuconfig display corruption.
+
+	Toolchain: Workarounds for fix-rpath issues with binutils and
+	elf2flt.
+
+	Util-linux: Fix blocking on getrandom() issue with recent
+	kernels.
+
+	Remove broken freescale_imx31_3stack,
+	freescale_imx6sololiteevk and freescale_imx6ulevk defconfigs.
+
+	Updated/fixed packages: apr-util, asterisk, attr, audit,
+	autofs, binutils, busybox, cifs-utils, cups-filters, dash,
+	ebtables, exim, expect, f2fs-tools, faketime, file, gdb, git,
+	glibc, gnupg, gnupg2, gst1-plugins-bad, imagemagick, jamvm,
+	jpeg-turbo, libcap, libcoap, libcurl, libgcrypt, libjpeg,
+	libnss, libressl, libtirpc, libvncserver, libvorbis, libxslt,
+	log4cplus, lrzsz, ltrace, lynx, mariadb, mbedtls, mpg123,
+	nasm, netplug, network-manager, nfs-utils, nodejs,
+	openvmtools, patch, perl, php-amqp, poppler, procps-ng,
+	python, python-websockets, quota, redis, samba4, sysvinit,
+	transmission, triggerhappy, util-linux, wavpack, wget,
+	wireshark, xen, zmqpp
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#10986: Installing package attr when already supplied by busybox..
+	#11031: ld-elf2flt: host/bin/ld.real': execvp: No such file or..
+
+2018.02.2, Released May 4th, 2018
+
+	Important / security related fixes.
+
+	Tweak package size/file instrumentation to better handle
+	package rebuilds.
+
+	Revert /etc/shells creation when bash is enabled.
+
+	Exclude /lib/firmware from the rpath fixup logic, as it may
+	contain non-native ELF files.
+
+	Scanpypi: Support the new PyPi infrastructure.
+
+	Handle GCC 8.x on the host.
+
+	Ensure timestamp of /usr is updated to support the systemd
+	ConditionNeedsUpdate option.
+
+	Updated/fixed packages: bluez5_utils, flann, gdb, gnupg2,
+	grub2, libcec, libcgi, libglib2, libgpg-error, libgpgme,
+	libtomcrypt, mbedtls, mkpasswd, php, python, python-requests,
+	python-watchdog, qt53d, qt5websockets, sdl2, sdl2_image,
+	syslog-ng, systemd, tcl, tcllib, uclibc, usb_modeswitch,
+	wireguard, wmctrl
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#10896: /bin/sh not in /etc/shells
+	#10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is enabled
+
+2018.02.1, Released April 9th, 2018
+
+	Important / security related fixes.
+
+	Removed unmaintained defconfigs: Creator Ci40, Firefly rk3288,
+	Freescale mpc8315erdb / p1010rdb_pa, Riotboard, Teliv EVK
+	Pro3.
+
+	Infrastructure: Speed up instrumentation for package size by
+	comparing timestamps instead of md5 checksums, as doing
+	checksums could lead to up to 25% longer build time for big
+	configurations.
+
+	Rename the internal <pkg>_BASE_NAME variable to <pkg>_NASENAME
+	to avoid name clashes with packages ending on '-base'.
+
+	Add a better fix for build issues for autotools based packages
+	checking for C++ support on toolchains without C++ support.
+
+	Build host-tar if tar is older than 1.27 on the build machine
+	to work around reproducibility issues with git archives
+	containing long paths.
+
+	check-unique-files: Fix for filenames not representable in the
+	users' locale.
+
+	Check-bin-arch: Add support for per-package ignore paths
+	(<pkg>_BIN_ARCH_EXCLUDE).
+
+	Toolchain: Fix SSP support detection for external toolchains.
+
+	linux: Add _NEEDS_HOST_OPENSSL / LIBELF options to ensure
+	these dependencies are available for Linux configurations
+	needed these dependencies, similar to how it is done for
+	U-Boot.
+
+	Support custom (not in tree) device tree files in addition to
+	in-tree ones.
+
+	U-Boot / uboot-tools: Fix header conflict with libfdt-devel
+	installed on host.
+
+	Updated/fixed packages: apache, busybox, c-ares, cmake,
+	docker-engine, enlightenment, eudev, fbgrab, freescale-imx,
+	gtest, imagemagick, intel-microcode, irssi, jimtcl, kmod,
+	kodi, ktap, libcoap, libcurl, libfcgi, libhttpparser,
+	libminiupnpc, libopenssl, libpjsip, libss7, libssh2, libupnp
+	libupnpp, libuv, libvorbis, memcached, motion, musl, nodejs,
+	ntp, openblas, opencv3, openocd, opus-tools, patch, php,
+	pkgconf, postgresql, powerpc-utils, python-jsonschema,
+	python-webpy, qemu, qt5bsae, qt5script, qt5webkit, rapidjson,
+	rauc, sam-ba, samba4, sngrep, systemd, tremor, uboot-tools,
+	uclibc-ng-test, upmpdcli, wireshark, xerces, xterm, zstd
+
+	New packages: docker-proxy, python-functools32
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#10766: upmpdcli: Segmentation fault
+	#10776: ktap fails to build
+	#10846: error in compiling gnutls
+	#10856: openblas on qemu_x86_64_defconfig fails with "sgemm_..
+
+2018.02, Released March 4th, 2018
+
+	Fixes all over the tree.
+
+	Issues with systemd with a readonly rootfs and DBus fixed.
+
+	Instructure:
+	- check-uniq-files: fix Python 2.6 compatibility.
+	- dependencies.sh: check for external argparse module for
+	  Python 2.6.
+	- Add infrastructure to detect and use a UTF-8 locale on the
+	  host, needed by systemd.
+
+	Update/fixed packages: clamav, dash, dhcp, dovecot, efl,
+	ffmpeg, libv4l, mono, mosquitto, php, postgresql, qt,
+	scanpypi, sdl2, systemd, tor, tvheadend, uboot, wavpack
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#10831: qemu_x86_64_defconfig build fails on linux-headers..
+
+2018.02-rc3, Released February 27th, 2018
+
+	Fixes all over the tree.
+
+	check-bin-arch: skip /lib/modules to allow 32-bit userland
+	with 64bit kernel.
+
 	dependencies: Blacklist tar 1.30+ and build our own host-tar
 	if needed as tar 1.30+ changed the --numeric-owner output for
 	long path names. Build host-tar before other host-dependencies
 	as they need it to extract their source tarballs.
 
-	Updated/fixed packages: apache, busybox, clamav, dhcp,
-	dnsmasq, dovecot, exim, imagemagick, irssi, jq, libcurl,
-	libpjsip, librsvg, libtasn1, libvorbis, libxml2, lz4, mariadb,
-	mbedtls, mosquitto, ntp, openblas, opencv3, openssl, patch,
-	postgresql, python-webpy, qt53d, qt5tools, quagga, rsync,
-	samba4, sngrep, tremor, wavpack, wireshark, xerces, xterm
+	Update/fixed packages: asterisk, azmq, bluez5_utils, domoticz,
+	e2fsprogs, erlang, exim, glibc, gpsd, jq, libglib2, libvorbis,
+	mariadb, mbedtls, mesa3d, mesa3d-headers, mpv, patch, pcre2,
+	php, qt5, qt5multimedia, qt5wayland, qt5webengine, qt5webkit,
+	systemd, quagga, rustc, uboot, wireguard, zic, zlib-ng
 
 	Issues resolved (http://bugs.uclibc.org):
 
-	#10856: openblas on qemu_x86_64_defconfig fails with "sgemm_..
+	#10726: Current libglib2.mk creates broken libglib2 binary...
+	#10786: Linux fails to build unless make linux-menuconfig...
+	#10796: Cannot generate cpio image without selecting CON...
+
+2018.02-rc2, Released February 15th, 2018
+
+	Fixes all over the tree.
+
+	Dependencies: Ensure C++ support is available like for C
+	support for packages needing 32bit host support.
+
+	utils/genrandconfig: Check host dependencies for config.
+
+	Updated/fixed packages: busybox, dnsmasq, dropbear, ffmpeg,
+	glibc, keepalived, libcpprestsdk, libgpiod, libmaxminddb,
+	librsvg, libtasn1, libv4l, libxml2, lightning, ltp-testsuite,
+	mesa3d, mesa3d-demos, mesa3d-headers, nftables, open-lldp,
+	php, postgresql, python-crossbar, qt5, qt53d, qt5enginio,
+	qt5tools, qt5webengine, qt5webkit, rsync, rust-bin, rustc,
+	systemd
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#9781: ti-sgx-km build on kernel >4.1
+	#10141: Squashfs extended attribute failures
+
+2018.02-rc1, Released February 5th, 2018
+
+	The global source-check and per-package <pkg>-source-check
+	targets have been removed.
+
+	Architecture: Add x86 Silvermont variant. Add several new ARM
+	variants, rework MIPS NaN logic. Support mainline binutils/gcc
+	for ARC.
+
+	Toolchains: Linaro toolchains upgraded to 2017.11 release, ARC
+	external toolchains upgraded to arc-2017.09. Libatomic is now
+	also copied for external musl based toolchains.
+	Add binutils 2.30.x and switch to binutils 2.29.x by default.
+
+	Added hardening options to build with RELRO and FORTITY.
+
+	New defconfigs: Bananapi M64, FriendlyARM Nanopi A64 & NEO2,
+	imx6slevk, imx6sx-sdb, imx6ulevk, Olimex A64-OLinuXino,
+	Orangepi lite / pc plus / pc / prime / win / win plus / zero
+	plus2, Pine64, Solidrun MacchiatoBin. Sopine.
+
+	Add utils/diffconfig, a simple utility for comparing
+	configuration files - Adapted from the version in the
+	Linux kernel.
+
+	Infrastructure: Check that the same file is not touched by
+	multiple packages, as a preparation for toplevel parallel
+	builds.
+
+	Hashes for the license files for a large number of packages
+	have been added, ensuring that license changes will not be
+	missed when packages are bumped.
+
+	Fix build issue for autotools based packages checking for C++
+	support on toolchains without C++ support and on a distro
+	lacking /lib/cpp (E.G. Arch Linux).
+
+	Support for the meson build system.
+
+	Pie charts generated by 'graph-build' or 'graph-size' are now
+	sorted according to the size of each piece.
+
+	System: Only show getty options when busybox init or sysvinit
+	are used.
+
+	ARM-trusted-firmware: Support ATF bundled in U-Boot as
+	well as U-Boot bundled in ATF.
+
+	Zlib is now a virtual package, provided by either libzlib or
+	zlib-ng, similar to openssl.
+
+	Support for the Rust programming language.
+
+	New packages: aoetools, armbian-firmware, binaries-marvell,
+	brltty, cargo, cargo-bin, cups-filters, curlpp, daq,
+	flatbuffers, gconf, glorytun, gstreamer1-mm, imx-m4fwloader,
+	imx-gpu-g2d, json-for-modern-cpp, libcpprestsdk, libgta,
+	libostree, libupnp18, luadbi, luadbi-sqlite3, lua-utf8, lynx,
+	meson, mv-ddr-marvell, nilfs-utils, opentracing-cpp,
+	open-lldp, pimd, proj, python-flask-cors,
+	python-jaraco-classes, python-more-itertools, python-oauthlib,
+	python-raven, python-remi, python-requests-oauthlib,
+	python-schedule, python-secretstorage, python-see,
+	python-tabledata, python-txtorcon, python-xlib, qt5charts,
+	rtl8189fs, rtl8723bu, rust, rustc, rust-bin, rygel, safeclib,
+	solatus, tcf-agent, traceroute, waylandpp, wolfssl,
+	zisofs-tools, zlib-ng
+
+	Removed packages: eeprog
+
+2017.11.2, Released January 21st, 2018
+
+	Important / security related fixes.
+
+	External toolchain: libatomic is now also copied for musl
+	based toolchains.
+
+	nconfig: Fix for ncurses/ncursesw linking issue causing crashes.
+
+	System: Only show getty options when busybox init or sysvinit
+	are used.
+
+	Infrastructure: Fix build issue for autotools based packages
+	checking for C++ support on toolchains without C++ support and
+	on a distro lacking /lib/cpp (E.G. Arch Linux).
+
+	Pie charts generated by 'graph-build' or 'graph-size' are now
+	sorted according to the size of each piece.
+
+	Updated/fixed packages: asterisk, avahi, bind, busybox,
+	coreutils, eeprog, intel-microcode, iputils, irssi, kmsxx,
+	libiio, linux-firmware, lz4, mariadb, matchbox-lib, mcookie,
+	ntp, php, pound, rpcbind, tar, ti-cgt-pru, webkitgtk, xen,
+	xlib_libXpm
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9996: lz4 package does not install lz4 binaries in target
+	#10176: Rsyslog's S01logging is deleted by Busybox.mk from...
+	#10216: package/x11r7/mcookie/mcookie.c:207: bad size ?
+	#10301: systemd/getty unused options
+	#10331: kmsxx, host installation fails with BR2_SHARED_...
+	#10556: Building ntp package with SSL library libressl...
+	#10641: avahi-autoipd not starting when using systemd-tmpfiles
+
+2017.11.1, Released December 31th, 2017
+
+	Important / security related fixes.
+
+	Updated/fixed packages: asterisk, checkpolicy, dhcp, flann,
+	gdb, glibc, heimdal, kodi-pvr-mediaportal-tvserver,
+	kodi-pvr-stalker, libcue, libopenssl, libpqxx, libsoxr,
+	linknx, linux-tools, lldpd, ltp-testsuite, mariadb, mfgtools,
+	nodejs, nut, pulseaudio, python-cffi, qemu, rsync, tor, uboot,
+	uboot-tools, vlc, webkitgtk, weston, wireguard, wireshark,
+	xenomai, xfsprogs
+
+2017.11, Released November 30, 2017
+
+	Fixes all over the tree.
+
+	Toolchain: Use github mirror for Glibc.
+
+	Defconfigs: Correct boot.cmd for bananapi-m1.
+
+	Makefiles: Workaround include order issues for certain make
+	versions by explicitly sorting the result of wildcard where it
+	matters.
+
+	Download: Ensure subversion runs in non-interactive mode.
+
+	Updated/fixed packages: asterisk, boost, chrony, dovecot,
+	dvb-apps, exim, feh, freerdp, fwup, google-breakpad, jose,
+	kvm-unit-test, lftp, libcurl, libevent, libfastjson, libpjsip,
+	libupnp, linphone, localedef, lttng-tools, mp4v2, mtools,
+	ndisc6, oracle-mysql, parted, pdbg, qt, qt5connectivity,
+	qt5declarative, qt5webkit, rauc, runc, samba4, shairport-sync,
+	systemd-bootchart, webkitgtk, wireguard, xlib_libXcursor,
+	xlib_libXfont, xlib_libXfont2,
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	10501: host-localedef fails to compile on Ubuntu 17.10
+	10506: Changed kernel image type (e.g. zImage to uImage)...
+
+2017.11-rc2, Released November 13th, 2017
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: collectd, ffmpeg, freerdp,
+	go-bootstrap, imagemagick, jimtcl, libpjsip, libplist, libuv,
+	mesa3d, nodejs, ntp, openjpeg, postgresql, python-numpy, ruby,
+	snmp++, usb_modeswitch, util-linux, vboot-utils, webkitgtk,
+	wireshark, wpa_supplicant, xapp_xdriinfo
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
+	#10491: Cannot output security warning when compiled with buildroot..
+
+2017.11-rc1, Released November 6th, 2017
+
+	Fixes all over the tree and new features.
+
+	Openssl is now a virtual package, which may be provided by
+	OpenSSL (now renamed to libopenssl) or LibreSSL.
+
+	libssh2: there is now an explicit choice of the backend to use
+	(mbedtls, gnutls or openssl). Previously, the choice was implicit
+	based on the TLS library that was selected. Now, it is possible to
+	choose the backend, which is important if several TLS libraries are
+	selected.
+
+	netsnmp: all MIB files are now installed, making the target filesystem a
+	bit bigger than before. To remove unneeded MIBS, you should use a
+	post-build script.
+
+	Toolchain: Linaro toolchains updated to 2017.08, ARC toolchain
+	updated to 2017.09, Glibc updated to 2.26, Glibc support for
+	ARCv2. The toolchain wrapper now handles SOURCE_DATE_EPOCH for
+	older (pre-gcc7.x) toolchains for BR2_REPRODUCIBLE.
+
+	New defconfigs: Atmel SAM45D27, Bananapi M1 and M2 Plus,
+	Engicam i.CoreM6 Qt5 configuration, i.MX6 sabreauto (mainline
+	kernel/u-boot), i.MX6Q sabresd Qt5 configuration, i.MX7d-pico,
+	QEMU ppc64le, Raspberry pi3 Qt5 webengine configuration,
+	Technologic TS-7680.
+
+	New packages: asterisk, azmq, bcg729, boinc, dahdi-linux,
+	dahdi-tools, freeswitch-mod-bcg729, fscryptctl, libb64,
+	libpri, libss7, lua-basexx, lua-compat53, lua-cqueues,
+	lua-curl, lua-datafile, lua-fifo, lua-httpd,
+	lua-lpeg-patterns, lua-markdown, lua-sailor, lua-value,
+	luksmeta, minetest, minetest-game, pdmenu, prosody,
+	python-aiocoap, python-automat, python-ibmiotf,
+	python-iso8601, python-m2r, python-simplesqlite,
+	python-websockets, python-xmltodict, qt5wayland, qt5webengine,
+	restorecond, selinux-python, semodule-utils, uhubctl,
+	wireguard, wsapi-fcgi, wsapi-xavante
+
+	Removed packages: aiccu, rfkill, sepolgen
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#10281: lsblk does not compile for util-linux
+	#10336: lttng compilation fails : linking error
+	#10351: glibc missing in rootfs
+	#10356: nfs-utils missing header
+	#10361: python3 python-config script generates invalid includes
+	#10366: dropbear download url has changed
+	#10391: WiringPi retrieves wrong (old) version
+	#10406: Beaglebone black: Buggy SGX driver version, swapped...
+	#10426: uboot-tools' fw_setenv does not update the redundant...
+	#10451: libpcap 1.8.x and 1.7x does not compile on PPC
+
+2017.08.2, Released November 28th, 2017
+
+	Important / security related fixes.
+
+	Qt: 5.6 version updated to 5.6.3.
+
+	Reproducible: Do not override SOURCE_DATE_EPOCH if already set
+	in the environment.
+
+	Makefiles: Workaround include order issues for certain make
+	versions by explicitly sorting the result of wildcard where it
+	matters.
+
+	Updated/fixed packages: apr, apr-util, arqp-standalone,
+	azure-iot-sdk-c, collectd, dvb-apps, ffmpeg, go-bootstrap,
+	google-breakpad, gstreamer, imagemagick, irssi, jimtcl,
+	kvm-unit-test, libcurl, libfastjson, libglib2, libidn,
+	libpjsip, libplist, localedef, lttng-tools, luajit, mesa3d,
+	moarvm, mp4v2, openssh, openssl, oracle-mysql, postgresql,
+	python3, python-pyqt5, qt, qt5base, qt5canvas3d,
+	qt5connectivity, qt5declarative, qt5engineio,
+	qt5graphicaleffects, qt5imageformats, qt5location,
+	qt5multimedia, qt5quickcontrols, qt5quickcontrols2, qt5script,
+	qt5sensors, qt5serialbus, qt5serialport, qt5svg, qt5tools,
+	qt5webchannel, qt5webkit, qt5websockets, qt5x11extras,
+	qt5xmlpatterns, quagga, redis, ruby, samba4, sdl2, snmppp,
+	swupdate, ti-gfx, uboot-tools, usb_modeswitch, vboot-utils,
+	webkitgtk, wget, wireshark, xapp_xdriinfo.
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	10326: mesa3d package fails to build when BR2_SHARED_STATIC_LIBS=y
+	10361: python3 python-config script generates invalid includes
+	10501: host-localedef fails to compile on Ubuntu 17.10
+
+2017.08.1, Released October 23rd, 2017
+
+	Important / security related fixes.
+
+	Webkitgtk bumped to the 2.18.x series, fixing a large number
+	of security issues.
+
+	Defconfigs: galileo: fix ext4 related kernel config, bump
+	kernel for gcc 6.x compatibility, enable wchar support for
+	grub2. wandboard: correct rootfs offset
+
+	support: Ensure gzip compression level 6 is used for git
+	tarballs. check-bin-arch: Correctly handle (ignore) symbolic
+	links. check-rpath: Also handle PIE binaries
+
+	External toolchain: Correctly handle glibc Buildroot
+	toolchains built with merged /usr
+
+	musl: fix ARMv4 build with binutils 2.27.51+, fix for
+	CVE-2017-15650
+
+	Updated/fixed packages: apache, augeas, bind, bluez5_utils,
+	busybox, bzip2, cmake, dnsmasq, ejabberd, gcc, git, go, ffmpeg, file,
+	flashrom, gd, gdk-pixbug, gnupg2, hostapd, ifupdown-scripts,
+	imagemagick, iucode-tool, kernel-module-imx-gpu-viv, lame,
+	libarchive, libcurl, libffi, libidn, libmbim, libnspr, libnss,
+	libressl, librsync, libsoup, libxml2, libzip, mbedtls, musl,
+	netplug, nginx, openvpn, pkgconf, poppler, proxychains-ng,
+	qemu, qt, rpi-userland, syslog, ruby, samba4, softether,
+	sqlite, strongswan, subversion, supertuxkart, supervisor, tcpdump,
+	tor, unrar, urq, vboot-utils, webkitgtk, wpa_supplicant, xen,
+	xmlstarlet, xlib_libXfont, xlib_libXfont2,
+	xserver_xorg-server, zsh
+
+2017.08, Released September 1st, 2017
+
+	Minor fixes.
+
+	Toolchain: Don't allow internal toolchain builds for MIPS
+	M6201/P6600, as support for these are not yet in mainline GCC.
+
+	Updated/fixed packages: bcusdk, connman, dialog, dnsmasq,
+	gnupg, grub2, iostat, iucode-tool, libgcrypt, libkcapi,
+	libphidget, libv4l, linux-tools, mediastreamer, minidlna,
+	nss-pam-ldapd, nvidia-driver, qt-webkit-kiosk, rpcbind, squid,
+	transmission, vde2, vim
+
+	Updated/fixed defconfigs:
+
+	Removed packages: simicfs.
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#10261: Grub2 fails to build for x86_64
+
+2017.08-rc3, Released August 23rd, 2017
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: alsa-lib, alsa-utils, cc-tool,
+	dbus-cpp, e2fsprogs, elf2flt, faad2, fakeroot, gcc, git, gpsd,
+	gst1-validate, kvmtool, libconfuse, libepoxy, librsync,
+	libspatialindex, libunwind, linux, linux-headers, lua,
+	mariadb, mesa3d, mtd, openocd, python3, syslinux, sysvinit,
+	whois, xen, zmqpp.
+
+	Updated/fixed defconfigs: ci20, socrates_cyclone5,
+	toradex_apalis_imx6.
+
+	Removed defconfig: Armadeus APF9328.
+
+	skeleton-* packages introduced in -rc1 have been renamed to
+	skeleton-init-* instead.
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#10141: Squashfs extended attribute failures
+
+2017.08-rc2, Released August 11th, 2017
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: bind, dbus, erlang-p1-xml, faad2,
+	ficl, gcc, gdb, glibc, jack2, libcurl, linux, linux-headers,
+	lua, mutt, nvme, qt5base, skeleton-common, snappy, stella,
+	swupdate, uclibc, valgrind, webkitgtk.
+
+	Updated/fixed defconfigs: beaglebone_qt5, minnowboard_max,
+	nanopi_m1{, _plus}, olimex_a20_olinuxino_lime, qemu_sparc,
+	qemu_sparc64.
+
+	The cmake-package infrastructure for host packages has been
+	fixed to not incorrectly detect target packages through
+	pkg-config.
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9926:  systemd-resolved.service: Failed at step NAMESPACE (systemd 233)
+	#10021: libqeglfs-viv-integration.so file is missing for qt5 on armv7
+	#10026: lua-5.3.4: fix lua linker error in swupdate
+	#10146: package/skeleton-common fix recursive variable
+	#10156: glibc compilation fails for X86 32bits (i386)
+	#10201: toolchain-wrapper.c:192: (error) Memory leak:
+	#10221: Buildroot Support
+
+2017.08-rc1, Released August 2nd, 2017
+
+	Infrastructure:
+
+	- The skeleton package has been split into multiple packages:
+	  skeleton-sysv (when Busybox or SysV init are used),
+	  skeleton-systemd (when systemd is used), skeleton-none (when
+	  no init system is used) and skeleton-custom (when a custom
+	  skeleton is used). Those packages, except skeleton-custom,
+	  share common logic and data in a new package called
+	  skeleton-common. The skeleton package becomes a virtual
+	  package. This change allows to generate a filesystem that is
+	  compliant with systemd expectations.
+
+	- Support for using a read-only filesystem with systemd has
+	  been fixed.
+
+	- Major revamp of the gettext handling, with user-visible
+	  effect:
+
+	  - prior to this revamp, when BR2_ENABLE_LOCALE=y, each
+	    package could decide to enable or not NLS support. When
+	    BR2_ENABLE_LOCALE was disabled, NLS support was forced off
+	    by passing --disable-nls to packages.
+
+	  - after this revamp, a new BR2_SYSTEM_ENABLE_NLS option
+	    controls whether NLS support should be enabled or not in
+	    packages. This option defaults to disabled, which means
+	    that now, NLS support is by default disabled in all
+	    packages.
+
+	  Therefore, if you need NLS support in packages, you must now
+	  explicitly enable the BR2_SYSTEM_ENABLE_NLS option.
+
+	- The host directory no longer has a usr/ component. This
+	  makes it much more natural to use that directory as an
+	  externally used toolchain. For compatibility with existing
+	  scripts, a usr -> . link is still added.
+
+	- Hashes are now checked on tarballs by Buildroot when a
+	  package is sourced from a Git repository.
+
+	- Patches are no longer being downloaded from Github, since
+	  auto-generated patches could change over time, and break
+	  hashes. All patches that were downloaded from Github are now
+	  stored in their respective package directories.
+
+	- Hash files in packages can now contain hashes for the
+	  license files contained in the package source code. This
+	  allows to detect changes in such license files.
+
+	- Binaries in $(TARGET_DIR) are now cleaned up from invalid
+	  RPATHs at the end of the build.
+
+	- A new "make sdk" target prepares $(HOST_DIR) to be
+	  relocatable: turns RPATHs in host binaries into relocatable
+	  ones, removes bogus RPATHs from staging binaries/libraries,
+	  and provides a relocate-sdk script that can be executed to
+	  relocate the SDK after installation.
+
+	- Addition of utils/genrandconfig which generates a random
+	  configuration based on a set of pre-defined toolchain
+	  configurations (support/config-fragments/autobuild/) and a
+	  random selection of packages. It is now used by the
+	  autobuilders to generate the random configurations.
+
+	Filesystems:
+
+	- ext2/3/4 filesystems are now generated using mkfs.ext from
+	  e2fsprogs instead of using genext2fs.
+
+	Architecture:
+
+	- Addition of support for ARM big.LITTLE variants
+	- Improved MIPS support, with options to select NaN encoding
+	  and FP32 mode.
+
+	Toolchain:
+
+	- Switch to gcc 6.x as the default gcc version, add support
+	  for gcc 7.x, remove support for gcc 4.8
+	- Switch to binutils 2.28 as the default binutils version, add
+	  support for binutils 2.29, remove support for binutils 2.26
+	- Support added for gdb 8.0
+	- uClibc-ng bumped to 1.0.26
+	- CodeSourcery toolchains for x86 and SuperH have been
+	  removed, they were using a too old glibc version
+	  (2.17). External toolchains with glibc 2.17 or earlier are
+	  no longer supported.
+	- The version selection in the glibc package has been
+	  removed. Like musl and uClibc-ng, we now use the latest
+	  glibc version.
+	- Improved support for Xtensa toolchain overlays, which can
+	  now be downloaded.
+
+	Tools:
+
+	- Numerous improvements to the runtime test infrastructure
+	- Tests are now executed by Gitlab CI on a regular basis
+	- Tools that are directly useful to the user have been moved
+	  from support/scripts/ to utils/: brmake, check-package,
+	  get-developers, scancpan, scanpipy, size-stats-compare,
+	  test-pkg.
+
+	New defconfigs: A13 Olinuxino, Engicam platforms (i.CoreM6
+	Solo/Dual/DualLite/Quad, RQS SOM, GEAM6UL SOM, Is.IoT MX6UL
+	SOM), Nano Pi M1 (Plus), OrangePi Zero and Plus.
+
+	New packages: azure-iot-sdk-c, cracklib, dt-utils, easy-rsa,
+	erlang-jiffy, erlang-p1-oauth2, erlang-p1-xmpp,
+	ifupdown-scripts, irrlicht, kodi-inputstream-adaptive,
+	kodi-inputstream-rtmp, kvazaar, let-me-create, libloki,
+	libpwquality, libressl, libspatialindex, libva-utils,
+	linuxconsoletools, linuxptp, luaossl, lua-sdl2, lua-stdlib,
+	lsscsi, paxtest, pcre2, pixz, python-asn1crypto,
+	python-backports-shutil-get-terminal-size, python-bcrypt,
+	python-cheroot, python-h2, python-hpack, python-hyperframe,
+	python-hyperlink, python-ipython-genutils, python-pathlib2,
+	python-pickleshare, python-priority, python-portend,
+	python-scandir, python-systemd, python-tempora,
+	python-traitlets, python-typepy, qt5virtualkeyboard,
+	ratpoison, rauc, refpolicy, rhash, sdl2_mixer, sdl2_net,
+	xr819-xradio, zstd
+
+	Removed packages: cloog, input-tools, mke2img
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#7892: systemd-journald is broken
+	#9341: avahi-utils does not compile with uClibc +  libglib2
+	#9441: Link BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY to
+	       BR2_ENABLE_DEBUG
+	#9746: ext4 image generated by Buildroot is not working
+	       properly with U-Boot
+	#9886: Build fails with "unexpected EOF while looking for
+	       matching `"'" if PATH contains a newline
+	#9891: parted 3.1 => 3.2?
+	#9911: qt5 does not build on sparc
+	#9916: qt5 does not build on
+	       arm-buildroot-linux-uclibcgnueabihf for ARMv8 cores
+	#9936: Host QEMU does not build with SDL support because of
+	       pkg-config
+	#9941: nodejs option disappears for arm
+	#9951: SCANCPAN failure
+	#9966: util-linux-2.30/.stamp_built' failed
+	#9976: License file for package 'rtl8821au' incorrect
+	#9991: SGX Error implicit declaration of function
+	       ‘dmac_map_area’
+	#10011: wget does not work from Buildroot
+	#10036: Buildroot builds Raspbian Jessie headless image
+		presenting incorrect prompt
+	#10051: make: *** No rule to make target
+		'raspberrpi3_defconfig'. Stop reported with Buildroot
+		v2017.05.1
+	#10056: No .config file was produced in /buildroot folder
+	#10061: gcc5.4 buildroot toolchain for powerpc libsanitizer
+		failure
+	#10071: fakeroot: replace hard-coded paths in post install
+	#10076: Makefile:4113: recipe for target 'all-gcc'  failed
+	#10091: gcc7.1 does not build with graphite support due to old
+		isl
+	#10121: webkit without the multimedia option causes build
+		error
+
+2017.05.2, Released July 27th, 2017
+
+	Important / security related fixes.
+
+	Webkitgtk bumped to the 2.16.x series, fixing a large number
+	of security issues.
+
+	host-aespipe compile fix for Debian/Gentoo/Ubuntu toolchains
+	which default to PIE mode.
+
+	Updated/fixed packages: aespipe, apache, bind, binutils,
+	busybox, ccache, collectd, dieharder, efibootmgr, efivar,
+	expat, ffmpeg, gcc, heimdal, iproute2, irssi, libglib2,
+	libmemcached, libosip2, libtirpc, libxml-parser-perl,
+	linux-fusion, linux-zigbee, mpg123, orc, pcre, php, protobuf,
+	pulseaudio, python-setproctitle, qt5base, rpi-firmware,
+	samba4, syslinux, systemd, spice, tcpdump, tiff, uboot-tools,
+	webkitgtk, x265, xserver_xorg-server, xvisor
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#10061: gcc5.4 buildroot toolchain for powerpc libsanitizer...
+
+2017.05.1, Released July 4th, 2017
+
+	Important / security related fixes.
+
+	Update support/scripts/scancpan to use METACPAN v1 API as v0
+	has been shutdown.
+
+	Update support/scripts/mkusers to handle setups where
+	/etc/shadow is a symlink.
+
+	External toolchain: Don't create musl dynamic loader symlink
+	for static builds.
+
+	Setlocalversion: Correct detection of mercurial revisions for
+	non-tagged versions.
+
+	Defconfigs: at91sam9x5ek_mmc: workaround boot rom issue.
+
+	Updated/fixed packages: apache, automake, bind, botan, c-ares,
+	dhcp, expat, fcgiwrap, gcc, gdb, gesftpserver, glibc, glmark2,
+	gnutls, gst1-plugins-bad, imagemagick, imx-uuc, intltool,
+	iperf, ipsec-tools, irssi, kmod, libcurl, libgcrypt, libmad,
+	libnl, lugaro, mosquitto, mpg123, ncurses, nodejs, ntp,
+	openssh, openvpn, pngquant, python-simplegeneric, qt5base,
+	qt5multimedia, rtl8821au, socat, spice, systemd, tor, trinity,
+	tslib, vlc, x264, xen, xlib_libxshmfenc, xserver_xorg-server
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9976: License file for package 'rtl8821au' incorrect
+
+2017.05, Released May 31st, 2017
+
+	Minor fixes.
+
+	External toolchain: musl dynamic linker symlink for mips-sf
+	corrected.
+
+	Updated/fixed packages: agentpp, bash, exim, hans, madplay,
+	qpid-proton, rtl8188eu, snmppp, stm32flash, strongswan, sudo,
+	xen
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9906: genimage: Disk full
+
+2017.05-rc3, Released May 30th, 2017
+
+	Fixes all over the tree.
+
+	ARC toolchain bumped to 2017.03
+
+	Runtime testing improvements and cleanups.
+
+	Updated/fixed packages: acpica, armadillo, audiofile, c-icap,
+	cppcms, dhcp, docker-engine, dropbear, elfutils, erlang,
+	fbgrab, ffmpeg, flashrom, ftop, gnutls, google-breakpad,
+	keepalived, kodi, libcdio, libepoxy, libev, libminiupnpc,
+	libqmi, libtasn1, libv4l, mariadb, mono, mosh, mosquitto,
+	mxml, ntp, opencv, openpowerlink, oracle-mysql, popt,
+	pulseview, python-enum34, rabbitmq-c, redis, samba4, stella,
+	xen
+
+	Removed packages: firejail, ola
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9871: fbgrab 1.3 won't build with BR2_REPRODUCIBLE set
+	#9876: aarch64 support with gcc 4.8 toolchain
+	#9896: host-gcc-initial error downloading because incorrect URL
+
+2017.05-rc2, Released May 17th, 2017
+
+	Fixes all over the tree.
+
+	ARC toolchain bumped to 2017.03-rc2
+
+	Updated/fixed packages: bluez_utils, boost, clamav, daemon,
+	efibootmgr, efl, espeak, expedite, faketime, ffmpeg, fxload,
+	git, gpsd, kvm-unit-tests, libcdio, libv4l, lua, mke2img,
+	mpir, mpv, odroid-scripts, openblas, opencv3, openvpn, php,
+	postgresql, protobuf, qt5declarative, qwt, radvd, rpcbind,
+	rtmpdump, strongswan, sudo, ltp-testsuite, uclibc-ng-test,
+	vlc, x11vnc, xfsprogs
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9796: source-check broken for Git downloads
+	#9866: BASE_DIR usage
+
+2017.05-rc1, Released May 8th, 2017
+
+	Fixes all over the tree and new features.
+
+	Infrastructure:
+
+	- Installed binaries are now checked for correct architecture
+	  to catch natively built binaries or binaries built for other
+	  architecture variants.
+
+	- Luarocks infrastructure improvements to extraction handling,
+	  support for upstream name != Buildroot package name.
+
+	- 'make printvars' output format has changed to make it easier
+	  to use in scripts. It now has options to quote the variables
+	  and to show the expanded/unexpanded values.
+
+	- Automatic ext2 rootfs size calculation has been removed. The
+	  logic was not working working reliable in all setups as it
+	  depends on the host filesystem behaviour, so instead now the
+	  size has to be specified explicitly (defaults to 60MB).
+
+	- The git download infrastructure now ensures that GNU format
+	  tar files are created.
+
+	- Fixed a variable clashing issue in the mkusers script with
+	  internal bash variables.
+
+	- Fakeroot now links against libacl to fix issues on
+	  distributions using acls.
+
+	- Correct permissions for /dev/pts/ptmx when systemd is used
+	  with recent glibc versions.
+
+	- br2-external: Improve error reporting.
+
+	- A wrapper script for genimage has been added in
+	  support/scripts/genimage.sh for easy use of genimage from
+	  post-image scripts.
+
+	- A script to check for common style issues in new packages
+	  before submitting has been added in support/scripts/check-package
+
+	- Defconfigs are now tested by gitlab-CI instead of Travis:
+	  https://gitlab.com/buildroot.org/buildroot
+
+	- Infrastructure for runtime testing has been added to
+          support/testing
+
+	Toolchain:
+
+	- External linaro toolchains updated to 2017.02, ARC toolchain
+          updated to 2017.03-rc1, NIOSII CodeSourcery to 2017.05
+
+	- A number of fixes and improvements to the external toolchain
+	  handling, including C library detection, multilib and ld.so
+	  handling
+
+	- Glibc 2.25 and uClibc-ng 1.0.24 added, wordexp support enabled
+          for uClibc-ng
+
+	- Binutils 2.28 added and default changed to 2.27
+
+
+	Architectures:
+
+	- Support for the C-SKY architecture has been added.
+
+
+	License handling:
+
+	- The package license markings for legal info now uses the
+	  SPDX short identifiers for the license string where possible.
+
+	- License info has been improved / added for a number of packages.
+
+
+	Misc:
+
+	- Cmake 3.7.x installed on the host is no longer ignored as a
+          workaround for the RPATH issues has been implemented.
+
+	- Docker-engine can now be built statically on an otherwise
+	  dynamic linked build for docker-in-docker setups.
+
+	- U-Boot now supports out-of-tree device trees, similar to
+          Linux
+
+	- Nodejs 0.10.x support (and with it, support for <ARMv6) has
+          been removed as this is now EOL upstream.
+
+	New defconfigs: AT91sam9x5ek dev/mmc/mmc-dev, banana pro,
+	Nationalchip gx6605s, MIPS creator ci40, nexbox a95x, 64bit
+	defconfig for raspberry pi 3, stm32f429-disc1.
+
+	The raspberry pi zero-w and rpi3 compute module are now also
+	supported by the rpi0 / rpi3 defconfigs, beaglebone green is
+	supported by the beaglebone defconfig.
+
+	Removed defconfig: minnowboard, via imx6 vab820, altera
+	socdk/sockit
+
+	New packages: arp-scan, atest, augeas, bluez-tools, daemon,
+	dc3dd, dieharder, execline, fmt, ghostscript, gqrx,
+	gst1-vaapi, jo, keepalived, kmscube, kodi-jsonschemabuilder,
+	kodi-skin-confluence, kodi-texturepacker, lensfun, leptonica,
+	libbson, libcsv, libgphoto2, libkcapi, libmaxminddb,
+	libmediaart, libnpth, libscrypt, lua-bit32, lua-resty-http,
+	lugaru, memtool, mpir, nanomsg, physfs, phytool, pngquant,
+	python-decorator, python-simplegeneric,
+	python-sortedcontainers, rpi-bt-firmware, rpi-wifi-firmware,
+	s6, s6-dns, s6-linux-init, s6-linux-utils, s6-networking,
+	s6-portable-utils, s6-rc, supertux, tesseract-ocr,
+	uccp420wlan, wilink-bt-firmware
+
+	Broken packages: ola
+
+	Removed packages: cosmo, kodi-visualisation-fountain,
+	polarssl, portmap, xdriver_xf86-video-glide,
+	xdriver_xf86-video-v4l, xdriver_xf86-video-wsfb
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#8831: image generation fails on host ZFS due to "no free space"
+	#9436: e2fsprogs remove busybox applets even of unselected e2fs..
+	#9456: mkusers script bash errors
+	#9496: mke2img fails during build on ntfs-3g host partition
+	#9531: NPM fails to build embedded modules
+	#9596: KODI: --enable-lirc needs "HAVE_LIRC" compiler definition..
+	#9691: Wrong cryptsetup package include files location
+	#9696: Wrong cryptsetup package include files location
+	#9706: Can't download newer revisions of package from PyPI
+	#9711: Recent libCEC version bump seems to break kodi package
+	#9716: exit, shutdown, reboot from kodi
+	#9721: version 2017.02: no acceptable m4 could be found in $PATH
+	#9726: Raspberry Pi version B - Problems with UART speed in..
+	#9751: expat legal info - manifest.csv: GPLv2 Source site: MIT..
+	#9756: glibc fails to build on buildroot-sh4*-buildroot-linux-gnu
+	#9766: support/scripts/pkgutil.py conflicts with the pkgutil.py..
+	#9776: libubox build failed
+	#9791: Python searches for packages in the user site directory
+	#9806: libseccomp is not available when BR2_arm=y
+	#9826: post-build scritp - symlinks created in post-build script..
+	#9836: triggerhappy: systemd unit broken
+	#9846: musl libc not installed correctly in target folder
+	#9856: build libubox failed on ubuntu 17.04 64bit
 
 2017.02.10, Released January 31st, 2018
 
@@ -33,10 +1084,10 @@
 
 	Updated/fixed packages: avahi, berkeleydb, bind, busybox,
 	ccache, clamav, coreutils, dovecot, eeprog, eudev, fis,
-	intel-microcode, iputils, irssi, kmsxx, liberation, libiio,
-	lz4, mariadb, matchbox-lib, mcookie, openocd, php, pound,
-	rpcbind, squid, tar, ti-cgt-pru, transmission, util-linux,
-	webkitgtk, wireshark, xen
+	intel-microcode, iputils, irssi, kmsxx, libcurl, liberation,
+	libiio, lz4, mariadb, matchbox-lib, mcookie, openocd, php,
+	pound, rpcbind, squid, tar, ti-cgt-pru, transmission,
+	util-linux, webkitgtk, wireshark, xen
 
 	Issues resolved (http://bugs.buildroot.org):
 
@@ -149,12 +1200,12 @@
 	which default to PIE mode.
 
 	Updated/fixed packages: aespipe, apache, bind, binutils,
-	ccache, collectd, efibootmgr, efivar, expat, ffmpeg, gcc,
-	heimdal, iproute2, irssi, libglib2, libmemcached, libosip2,
-	libtirpc, libxml-parser-perl, linux-fusion, linux-zigbee,
-	mpg123, nodejs, orc, pcre, php, pulseaudio,
+	busybox, ccache, collectd, efibootmgr, efivar, expat, ffmpeg,
+	gcc, heimdal, iproute2, irssi, libglib2, libmemcached,
+	libosip2, libtirpc, libxml-parser-perl, linux-fusion,
+	linux-zigbee, mpg123, nodejs, orc, pcre, php, pulseaudio,
 	python-setproctitle, qt5base, rpi-firmware, samba4, syslinux,
-	systemd, spice, tiff, webkitgtk, x265, xen,
+	systemd, spice, tcpdump, tiff, webkitgtk, x265, xen,
 	xserver_xorg-server, xvisor
 
 	Issues resolved (http://bugs.buildroot.org):
@@ -429,6 +1480,14 @@
 	#9576: External tree with BR 2016.11 does not work anymore
 	#9606: xorg-server cannot build for ARM target
 
+2016.11.3, Released March 9th, 2017
+
+	Important / security related fixes.
+
+	Updated/fixed packages: bind, dbus, gnutls, imagemagick,
+	lcms2, libcurl, ntfs-3g, ntp, openssl, php, quagga, redis,
+	squid, stunnel, tcpdump, vim, wavpack, wireshark, xlib_libXpm
+
 2016.11.2, Released January 25th, 2017
 
 	Important / security related fixes.
diff --git a/bsp/buildroot/Config.in b/bsp/buildroot/Config.in
index 345d5c5b..52fb53bc 100644
--- a/bsp/buildroot/Config.in
+++ b/bsp/buildroot/Config.in
@@ -62,8 +62,13 @@ config BR2_HOST_GCC_AT_LEAST_7
 	default y if BR2_HOST_GCC_VERSION = "7"
 	select BR2_HOST_GCC_AT_LEAST_6
 
+config BR2_HOST_GCC_AT_LEAST_8
+	bool
+	default y if BR2_HOST_GCC_VERSION = "8"
+	select BR2_HOST_GCC_AT_LEAST_7
+
 # Hidden boolean selected by packages in need of Java in order to build
-# (example: xbmc)
+# (example: kodi)
 config BR2_NEEDS_HOST_JAVA
 	bool
 
@@ -106,7 +111,7 @@ config BR2_WGET
 
 config BR2_SVN
 	string "Subversion (svn) command"
-	default "svn"
+	default "svn --non-interactive"
 
 config BR2_BZR
 	string "Bazaar (bzr) command"
@@ -332,6 +337,9 @@ config BR2_CCACHE_DIR
 	default "$(HOME)/.buildroot-ccache"
 	help
 	  Where ccache should store cached files.
+	  If the Linux shell environment has defined the BR2_CCACHE_DIR
+	  environment variable, then this overrides this configuration
+	  item.
 
 config BR2_CCACHE_INITIAL_SETUP
 	string "Compiler cache initial setup"
@@ -419,13 +427,10 @@ config BR2_DEBUG_3
 endchoice
 endif
 
-choice
-	prompt "strip command for binaries on target"
-	default BR2_STRIP_strip
-
 config BR2_STRIP_strip
-	bool "strip"
+	bool "strip target binaries"
 	depends on !BR2_PACKAGE_HOST_ELF2FLT
+	default y
 	help
 	  Binaries and libraries in the target filesystem will be
 	  stripped using the normal 'strip' command. This allows to save
@@ -433,15 +438,9 @@ config BR2_STRIP_strip
 	  on the target are needed for native debugging, but not when
 	  remote debugging is used.
 
-config BR2_STRIP_none
-	bool "none"
-	help
-	  Do not strip binaries and libraries in the target filesystem.
-endchoice
-
 config BR2_STRIP_EXCLUDE_FILES
 	string "executables that should not be stripped"
-	depends on !BR2_STRIP_none
+	depends on BR2_STRIP_strip
 	default ""
 	help
 	  You may specify a space-separated list of binaries and
@@ -449,7 +448,7 @@ config BR2_STRIP_EXCLUDE_FILES
 
 config BR2_STRIP_EXCLUDE_DIRS
 	string "directories that should be skipped when stripping"
-	depends on !BR2_STRIP_none
+	depends on BR2_STRIP_strip
 	default ""
 	help
 	  You may specify a space-separated list of directories that
@@ -548,6 +547,7 @@ config BR2_GOOGLE_BREAKPAD_ENABLE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	help
 	  This option will enable the use of google breakpad, a library
 	  and tool suite that allows you to distribute an application to
@@ -575,61 +575,6 @@ config BR2_GOOGLE_BREAKPAD_INCLUDE_FILES
 
 endif
 
-choice
-	bool "build code with Stack Smashing Protection"
-	default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy
-	depends on BR2_TOOLCHAIN_HAS_SSP
-	help
-	  Enable stack smashing protection support using GCC's
-	  -fstack-protector option family.
-
-	  See
-	  http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
-	  for details.
-
-	  Note that this requires the toolchain to have SSP support.
-	  This is always the case for glibc and eglibc toolchain, but is
-	  optional in uClibc toolchains.
-
-config BR2_SSP_NONE
-	bool "None"
-	help
-	  Disable stack-smashing protection.
-
-config BR2_SSP_REGULAR
-	bool "-fstack-protector"
-	help
-	  Emit extra code to check for buffer overflows, such as stack
-	  smashing attacks. This is done by adding a guard variable to
-	  functions with vulnerable objects. This includes functions
-	  that call alloca, and functions with buffers larger than 8
-	  bytes. The guards are initialized when a function is entered
-	  and then checked when the function exits. If a guard check
-	  fails, an error message is printed and the program exits.
-
-config BR2_SSP_STRONG
-	bool "-fstack-protector-strong"
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-	help
-	  Like -fstack-protector but includes additional functions to be
-	  protected - those that have local array definitions, or have
-	  references to local frame addresses.
-
-comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9"
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
-
-config BR2_SSP_ALL
-	bool "-fstack-protector-all"
-	help
-	  Like -fstack-protector except that all functions are
-	  protected. This option might have a significant performance
-	  impact on the compiled binaries.
-
-endchoice
-
-comment "Stack Smashing Protection needs a toolchain w/ SSP"
-	depends on !BR2_TOOLCHAIN_HAS_SSP
-
 choice
 	bool "libraries"
 	default BR2_SHARED_LIBS if BR2_BINFMT_SUPPORTS_SHARED
@@ -721,6 +666,8 @@ config BR2_COMPILER_PARANOID_UNSAFE_PATH
 
 config BR2_REPRODUCIBLE
 	bool "Make the build reproducible (experimental)"
+	# SOURCE_DATE_EPOCH support in toolchain-wrapper requires GCC 4.4
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
 	help
 	  This option will remove all sources of non-reproducibility
 	  from the build process. For a given Buildroot configuration,
@@ -738,6 +685,133 @@ config BR2_REPRODUCIBLE
 
 endmenu
 
+comment "Security Hardening Options"
+
+choice
+	bool "Stack Smashing Protection"
+	default BR2_SSP_ALL if BR2_ENABLE_SSP # legacy
+	depends on BR2_TOOLCHAIN_HAS_SSP
+	help
+	  Enable stack smashing protection support using GCC's
+	  -fstack-protector option family.
+
+	  See
+	  http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
+	  for details.
+
+	  Note that this requires the toolchain to have SSP support.
+	  This is always the case for glibc and eglibc toolchain, but is
+	  optional in uClibc toolchains.
+
+config BR2_SSP_NONE
+	bool "None"
+	help
+	  Disable stack-smashing protection.
+
+config BR2_SSP_REGULAR
+	bool "-fstack-protector"
+	help
+	  Emit extra code to check for buffer overflows, such as stack
+	  smashing attacks. This is done by adding a guard variable to
+	  functions with vulnerable objects. This includes functions
+	  that call alloca, and functions with buffers larger than 8
+	  bytes. The guards are initialized when a function is entered
+	  and then checked when the function exits. If a guard check
+	  fails, an error message is printed and the program exits.
+
+config BR2_SSP_STRONG
+	bool "-fstack-protector-strong"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	help
+	  Like -fstack-protector but includes additional functions to be
+	  protected - those that have local array definitions, or have
+	  references to local frame addresses.
+
+comment "Stack Smashing Protection strong needs a toolchain w/ gcc >= 4.9"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
+config BR2_SSP_ALL
+	bool "-fstack-protector-all"
+	help
+	  Like -fstack-protector except that all functions are
+	  protected. This option might have a significant performance
+	  impact on the compiled binaries.
+
+endchoice
+
+comment "Stack Smashing Protection needs a toolchain w/ SSP"
+	depends on !BR2_TOOLCHAIN_HAS_SSP
+
+choice
+	bool "RELRO Protection"
+	depends on BR2_SHARED_LIBS
+	help
+	  Enable a link-time protection know as RELRO (RELocation Read Only)
+	  which helps to protect from certain type of exploitation techniques
+	  altering the content of some ELF sections.
+
+config BR2_RELRO_NONE
+	bool "None"
+	help
+	  Disables Relocation link-time protections.
+
+config BR2_RELRO_PARTIAL
+	bool "Partial"
+	help
+	  This option makes the dynamic section not writeable after
+	  initialization (with almost no performance penalty).
+
+config BR2_RELRO_FULL
+	bool "Full"
+	help
+	  This option includes the partial configuration, but also
+	  marks the GOT as read-only at the cost of initialization time
+	  during program loading, i.e every time an executable is started.
+
+endchoice
+
+comment "RELocation Read Only (RELRO) needs shared libraries"
+	depends on !BR2_SHARED_LIBS
+
+choice
+	bool "Buffer-overflow Detection (FORTIFY_SOURCE)"
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_OPTIMIZE_0
+	help
+	  Enable the _FORTIFY_SOURCE macro which introduces additional
+	  checks to detect buffer-overflows in the following standard library
+	  functions: memcpy, mempcpy, memmove, memset, strcpy, stpcpy,
+	  strncpy, strcat, strncat, sprintf, vsprintf, snprintf, vsnprintf,
+	  gets.
+
+	  NOTE: This feature requires an optimization level of s/1/2/3/g
+
+	  Support for this feature has been present since GCC 4.x.
+
+config BR2_FORTIFY_SOURCE_NONE
+	bool "None"
+	help
+	  Disables additional checks to detect buffer-overflows.
+
+config BR2_FORTIFY_SOURCE_1
+	bool "Conservative"
+	help
+	  This option sets _FORTIFY_SOURCE to 1 and only introduces
+	  checks that shouldn't change the behavior of conforming
+	  programs.  Adds checks at compile-time only.
+
+config BR2_FORTIFY_SOURCE_2
+	bool "Aggressive"
+	help
+	  This option sets _FORTIFY_SOURCES to 2 and some more
+	  checking is added, but some conforming programs might fail.
+	  Also adds checks at run-time (detected buffer overflow
+	  terminates the program)
+
+endchoice
+
+comment "Fortify Source needs a glibc toolchain and optimization"
+	depends on (!BR2_TOOLCHAIN_USES_GLIBC || BR2_OPTIMIZE_0)
 endmenu
 
 source "toolchain/Config.in"
diff --git a/bsp/buildroot/Config.in.legacy b/bsp/buildroot/Config.in.legacy
index 0f2f95b8..40f39e3a 100644
--- a/bsp/buildroot/Config.in.legacy
+++ b/bsp/buildroot/Config.in.legacy
@@ -135,16 +135,356 @@ comment "legacy options in the menu below. Once you have     "
 comment "disabled all legacy options, this text will         "
 comment "disappear and you will be able to start the build.  "
 comment "*                                                   "
-comment "Note: at some point in the future, the oldest legacy"
-comment "options will be removed, and configuration files    "
-comment "that still have those options set, will fail to     "
-comment "build, or run, in unpredictable ways.               "
+comment "Note: legacy options older than 5 years have been   "
+comment "removed, and configuration files that still have    "
+comment "those options set, will fail to build, or run in    "
+comment "unpredictable ways.                                 "
 comment "----------------------------------------------------"
 endif
 
 ###############################################################################
+comment "Legacy options removed in 2018.02"
 
-comment "Legacy options removed in 2017.02"
+config BR2_PACKAGE_TRANSMISSION_REMOTE
+	bool "transmission remote tool option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_TRANSMISSION_DAEMON
+	help
+	  Upstream does not provide a separate configure option for
+	  the tool transmission-remote, it is built when the
+	  transmission daemon has been enabled. Therefore, Buildroot
+	  has automatically enabled BR2_PACKAGE_TRANSMISSION_DAEMON
+	  for you.
+
+config BR2_KERNEL_HEADERS_3_4
+	bool "kernel headers version 3.4.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
+	select BR2_LEGACY
+	help
+	  Version 3.4.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_10
+	bool "kernel headers version 3.10.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
+	select BR2_LEGACY
+	help
+	  Version 3.10.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_12
+	bool "kernel headers version 3.12.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_1
+	select BR2_LEGACY
+	help
+	  Version 3.12.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.1.x of the headers have been automatically
+	  selected in your configuration.
+
+config BR2_BINUTILS_VERSION_2_27_X
+	bool "binutils version 2.27 support removed"
+	select BR2_LEGACY
+	help
+	  Support for binutils version 2.27 has been removed. The
+	  current default version (2.29 or later) has been selected
+	  instead.
+
+config BR2_PACKAGE_EEPROG
+	bool "eeprog package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_I2C_TOOLS
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	help
+	  The eeprog program is now provided by the i2c-tools package.
+
+config BR2_PACKAGE_GNUPG2_GPGV2
+	bool "gnupg2 gpgv2 option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GNUPG2_GPGV
+	help
+	  The gpgv2 executable is now named gpgv. The config option
+	  has been renamed accordingly.
+
+config BR2_PACKAGE_IMX_GPU_VIV_APITRACE
+	bool "Vivante apitrace tool option removed"
+	select BR2_LEGACY
+	help
+	  The apitrace tool for Vivante is not provided by the
+	  imx-gpu-viv package any longer.
+
+config BR2_PACKAGE_IMX_GPU_VIV_G2D
+	bool "Vivante G2D libraries from imx-gpu-viv removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_IMX_GPU_G2D
+	help
+	  The G2D libraries are now provided by the imx-gpu-g2d package.
+
+###############################################################################
+comment "Legacy options removed in 2017.11"
+
+config BR2_PACKAGE_RFKILL
+	bool "rfkill package removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_RFKILL
+	help
+	  The rfkill program is now provided by the util-linux package.
+
+config BR2_PACKAGE_UTIL_LINUX_RESET
+	bool "util-linux reset option removed"
+	select BR2_LEGACY
+	help
+	  The util-linux package no longer offers a "reset" command. Use
+	  either the reset command provided by BusyBox or select ncurses
+	  programs, which will install a symlink from "tset" to reset.
+
+config BR2_PACKAGE_POLICYCOREUTILS_AUDIT2ALLOW
+	bool "policycoreutils audit2allow option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_SELINUX_PYTHON
+	select BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW
+	help
+	  The policycoreutils package no longer offers audit2allow
+	  as a option. This package has been moved into the
+	  selinux-python package by the SELinux maintainers.
+
+config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND
+	bool "policycoreutils restorecond option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_RESTORECOND
+	help
+	  The policycoreutils package no longer offers restorecond
+	  as a option.  This package has been moved into a seperate
+	  package maintained by the SELinux maintainers.
+
+config BR2_PACKAGE_SEPOLGEN
+	bool "sepolgen package has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_SELINUX_PYTHON
+	select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
+	help
+	  Sepolgen is no longer a individual package, but instead has
+	  been moved into the selinux-python package by the SELinux
+	  maintainers.
+
+config BR2_PACKAGE_OPENOBEX_BLUEZ
+	bool "openobex bluez option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  The OpenOBEX package no longer offers an option to enable or
+	  disable BlueZ support. Instead, BlueZ support is always
+	  included when the bluez5_utils or bluez_utils package is
+	  selected.
+
+config BR2_PACKAGE_OPENOBEX_LIBUSB
+	bool "openobex libusb option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LIBUSB
+	help
+	  The OpenOBEX package no longer offers an option to enable or
+	  disable libusb support. Instead, USB support is always
+	  included when the libusb package is selected.
+
+config BR2_PACKAGE_OPENOBEX_APPS
+	bool "openobex apps option removed"
+	select BR2_LEGACY
+	help
+	  The OpenOBEX package no longer offers an option to enable or
+	  disable apps support.
+
+config BR2_PACKAGE_OPENOBEX_SYSLOG
+	bool "openobex syslog option removed"
+	select BR2_LEGACY
+	help
+	  The OpenOBEX package no longer offers an option to enable or
+	  disable syslog support.
+
+config BR2_PACKAGE_OPENOBEX_DUMP
+	bool "openobex dump option removed"
+	select BR2_LEGACY
+	help
+	  The OpenOBEX package no longer offers an option to enable or
+	  disable dump support.
+
+config BR2_PACKAGE_AICCU
+	bool "aiccu utility removed"
+	select BR2_LEGACY
+	help
+	  As the SixXS project has ceased its operation on 2017-06-06,
+	  the AICCU utility has no use anymore and has been removed.
+
+	  https://www.sixxs.net/sunset/
+
+config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
+	bool "util-linux login utilities option removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_UTIL_LINUX_LAST
+	select BR2_PACKAGE_UTIL_LINUX_LOGIN
+	select BR2_PACKAGE_UTIL_LINUX_RUNUSER
+	select BR2_PACKAGE_UTIL_LINUX_SU
+	select BR2_PACKAGE_UTIL_LINUX_SULOGIN
+	help
+	  Login utilities (last, login, runuser, su, sulogin) now have
+	  their own configuration options in the util-linux menu.
+
+###############################################################################
+comment "Legacy options removed in 2017.08"
+
+config BR2_TARGET_GRUB
+	bool "grub (aka grub-legacy) has been removed"
+	select BR2_LEGACY
+	help
+	  grub-legacy is no longer maintained, and no longer builds with
+	  recent binutils versions.
+
+	  Use grub2 or syslinux instead.
+
+config BR2_PACKAGE_SIMICSFS
+	bool "simicsfs support removed"
+	select BR2_LEGACY
+	help
+	  Support for simicsfs kernel driver that provides access to a
+	  host computer's local filesystem when the target is
+	  executing within a SIMICS simulation has been removed.
+
+	  Simics is now moving away from the simicsfs kernel module,
+	  as the kernel module has required too much maintenance
+	  work. Users should move to the user mode Simics agent
+	  instead.
+
+config BR2_BINUTILS_VERSION_2_26_X
+	bool "binutils version 2.26 support removed"
+	select BR2_LEGACY
+	help
+	  Support for binutils version 2.26 has been removed. The
+	  current default version (2.28 or later) has been selected
+	  instead.
+
+config BR2_XTENSA_OVERLAY_DIR
+	string "The BR2_XTENSA_OVERLAY_DIR option has been removed"
+	help
+	  The BR2_XTENSA_OVERLAY_DIR has been removed in favour of
+	  BR2_XTENSA_OVERLAY_FILE. You must now pass the complete
+	  path to the overlay file, not to the directory containing
+	  it.
+
+config BR2_XTENSA_OVERLAY_DIR_WRAP
+	bool
+	default y if BR2_XTENSA_OVERLAY_DIR != ""
+	select BR2_LEGACY
+
+config BR2_XTENSA_CUSTOM_NAME
+	string "The BR2_XTENSA_CUSTOM_NAME option has been removed"
+	help
+	  The BR2_XTENSA_CUSTOM_NAME option has been removed.
+
+config BR2_XTENSA_CUSTOM_NAME_WRAP
+	bool
+	default y if BR2_XTENSA_CUSTOM_NAME != ""
+	select BR2_LEGACY
+
+config BR2_PACKAGE_HOST_MKE2IMG
+	bool "host mke2img has been removed"
+	select BR2_LEGACY
+	help
+	  We now call mkfs directly to generate ext2/3/4 filesystem
+	  image, so mke2img is no longer necessary.
+
+config BR2_TARGET_ROOTFS_EXT2_BLOCKS
+	int "exact size in blocks has been removed"
+	default 0
+	help
+	  This option has been removed in favor of
+	  BR2_TARGET_ROOTFS_EXT2_SIZE. It has been set automatically
+	  to the value you had before. Set to 0 here to remove the
+	  warning.
+
+config BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP
+	bool
+	default y if BR2_TARGET_ROOTFS_EXT2_BLOCKS != 0 && \
+		BR2_TARGET_ROOTFS_EXT2_BLOCKS != 61440 # deprecated default value
+	select BR2_LEGACY
+
+# Note: BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP still referenced in fs/ext2/Config.in
+
+config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES
+	int "ext2 extra inodes has been removed" if BR2_TARGET_ROOTFS_EXT2_INODES = 0
+	default 0
+	help
+	  Buildroot now uses mkfs.ext2/3/4 to generate ext2/3/4
+	  images. It now automatically selects the number of inodes
+	  based on the image size. The extra number of inodes can no
+	  longer be provided; instead, provide the total number of
+	  inodes needed in BR2_TARGET_ROOTFS_EXT2_INODES.
+
+config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES_WRAP
+	bool
+	default y if BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES != 0
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE
+	bool "cdxaparse removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC
+	bool "dataurisrc moved to gstreamer1"
+	select BR2_LEGACY
+	help
+	  Dataurisrc has moved to gstreamer core and is always built.
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP
+	bool "dccp removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE
+	bool "hdvparse removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE
+	bool "mve removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX
+	bool "nuvdemux removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT
+	bool "patchdetect removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI
+	bool "sdi removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA
+	bool "tta removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
+	bool "videomeasure removed"
+	select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA
+	select BR2_LEGACY
+	help
+	  videomeasure plugin has been removed and has been replaced by
+	  iqa, which has automatically been enabled.
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK
+	bool "apexsink removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL
+	bool "sdl removed"
+	select BR2_LEGACY
+
+config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD
+	bool "mad (*.mp3 audio) removed"
+	select BR2_LEGACY
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC
 	bool "gst1-plugins-bad webrtc renamed to webrtcdsp"
@@ -156,6 +496,21 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC
 	  name webrtc. Therefore, we have renamed the option to match
 	  the actual name of the GStreamer plugin.
 
+config BR2_STRIP_none
+	bool "Strip command 'none' has been removed"
+	select BR2_LEGACY
+	help
+	  The strip command choice has been changed into a single
+	  boolean option. Please check that the new setting is
+	  correct (in the "Build options" sub-menu)
+
+config BR2_PACKAGE_BEECRYPT_CPP
+	bool "C++ support removed in beecrypt"
+	select BR2_LEGACY
+	help
+	  Support for C++ depends on icu. The beecrypt package is
+	  incompatible with icu 59+.
+
 config BR2_PACKAGE_SPICE_CLIENT
 	bool "spice client support removed"
 	select BR2_LEGACY
@@ -179,6 +534,233 @@ config BR2_PACKAGE_SPICE_TUNNEL
 	  Spice network redirection, aka tunnelling has been removed
 	  upstream.
 
+config BR2_PACKAGE_INPUT_TOOLS
+	bool "input-tools removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LINUXCONSOLETOOLS
+	help
+	  input-tools has been removed, it is replaced by
+	  linuxconsoletools, which has automatically been enabled.
+
+config BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH
+	bool "inputattach moved to linuxconsoletools"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LINUXCONSOLETOOLS
+	select BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH
+	help
+	  input-tools has been removed, inputattach is now part
+	  of linuxconsoletools, which has automatically been
+	  enabled.
+
+config BR2_PACKAGE_INPUT_TOOLS_JSCAL
+	bool "jscal moved to linuxconsoletools"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LINUXCONSOLETOOLS
+	select BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK
+	help
+	  input-tools has been removed, jscal is now part
+	  of linuxconsoletools, which has automatically been
+	  enabled.
+
+config BR2_PACKAGE_INPUT_TOOLS_JSTEST
+	bool "jstest moved to linuxconsoletools"
+	select BR2_LEGACY
+	select BR2_PACKAGE_LINUXCONSOLETOOLS
+	select BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK
+	help
+	  input-tools has been removed, jstest is now part
+	  of linuxconsoletools, which has automatically been
+	  enabled.
+
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
+	bool "SH Sourcery toolchain has been removed"
+	select BR2_LEGACY
+	help
+	  The Sourcery CodeBench toolchain for the sh architecture has
+	  been removed, since it uses glibc older than 2.17 that requires
+	  -lrt to link executables using clock_* system calls. This makes
+	  this toolchain difficult to maintain over time.
+
+config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86
+	bool "x86 Sourcery toolchain has been removed"
+	select BR2_LEGACY
+	help
+	  The Sourcery CodeBench toolchain for the x86 architecture has
+	  been removed, since it uses glibc older than 2.17 that requires
+	  -lrt to link executables using clock_* system calls. This makes
+	  this toolchain difficult to maintain over time.
+
+config BR2_GCC_VERSION_4_8_X
+	bool "gcc 4.8.x support removed"
+	select BR2_LEGACY
+	help
+	  Support for gcc version 4.8.x has been removed. The current
+	  default version (5.x or later) has been selected instead.
+
+###############################################################################
+comment "Legacy options removed in 2017.05"
+
+config BR2_PACKAGE_SUNXI_MALI_R2P4
+	bool "sunxi-mali r2p4 removed"
+	select BR2_LEGACY
+	help
+	  sunxi-mali libMali for r2p4 Mali kernel module has been
+	  removed since the libump package only provides libUMP.so.3.
+	  libMali for r2p4 Mali kernel module requires libUMP.so.2.
+
+config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT
+	bool "CoffeeScript option has been removed"
+	select BR2_LEGACY
+	help
+	  The option to enable NodeJS CoffeeScript has been removed.
+	  To continue using it, add "coffee-script" to
+	  BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL.
+
+config BR2_PACKAGE_NODEJS_MODULES_EXPRESS
+	bool "Express web application framework option has been removed"
+	select BR2_LEGACY
+	help
+	  The option to enable the NodeJS Express web application
+	  framework has been removed. To continue using it, add
+	  "express" to BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL.
+
+config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL
+	bool "bluez5_utils gatttool install option removed"
+	select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
+	help
+	  The option to install gatttool specifically has been removed.
+	  Since version 5.44 gatttool is in the list of deprecated
+	  tools. The option to build and install deprecated tools has
+	  been automatically enabled.
+
+config BR2_PACKAGE_OPENOCD_FT2XXX
+	bool "openocd ft2232 support has been removed"
+	select BR2_PACKAGE_OPENOCD_FTDI
+	select BR2_LEGACY
+	help
+	  FT2232 support in OpenOCD has been removed, it's replaced by
+	  FDTI support, which has automatically been enabled.
+
+config BR2_PACKAGE_KODI_RTMPDUMP
+	bool "kodi rtmp has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
+	help
+	  Internal rtmp support was removed from Kodi.
+
+config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
+	bool "kodi-visualisation-fountain has been removed"
+	select BR2_LEGACY
+	help
+	  According to upstream 'the visualization is not currently
+	  in a working shape.'
+
+config BR2_PACKAGE_PORTMAP
+	bool "portmap has been removed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_RPCBIND
+	help
+	  The portmap upstream tarball is removed, no releases since
+	  ten years and latest change in upstream git in 2014.
+	  You should better use rpcbind as a RPC portmapper.
+
+config BR2_BINUTILS_VERSION_2_25_X
+	bool "binutils version 2.25 support removed"
+	select BR2_LEGACY
+	help
+	  Support for binutils version 2.25 has been removed. The
+	  current default version (2.27 or later) has been selected
+	  instead.
+
+config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
+	bool "uclibc RPC support has been removed"
+	select BR2_LEGACY
+	help
+	  uClibc-ng removed internal RPC implementation in 1.0.23. You
+	  should use libtirpc instead.
+
+config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS
+	int "extra size in blocks has been removed"
+	default 0
+	help
+	  Since the support for auto calculation of the filesystem size has been
+	  removed, this option is now useless and must be 0.
+	  You may want to check that BR2_TARGET_ROOTFS_EXT2_BLOCKS matchs
+	  your needs.
+
+config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS_WRAP
+	bool
+	default y if BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS != 0
+	select BR2_LEGACY
+
+config BR2_PACKAGE_SYSTEMD_KDBUS
+	bool "systemd-kdbus has been removed"
+	select BR2_LEGACY
+	help
+	  --enable/disable-kdbus configure option has been removed since
+	  systemd-231.
+
+config BR2_PACKAGE_POLARSSL
+	bool "polarssl has been removed"
+	select BR2_LEGACY
+	help
+	  The polarssl crypto library has been removed since the 1.2.x
+	  release branch is no longer maintained. Newer upstream
+	  branches/releases (mbedtls) have API changes so they're not
+	  drop-in replacements.
+
+config BR2_NBD_CLIENT
+	bool "nbd client option was renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NBD_CLIENT
+	help
+	  The nbd client option has been renamed to BR2_PACKAGE_NBD_CLIENT.
+
+config BR2_NBD_SERVER
+	bool "nbd server option was renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_NBD_SERVER
+	help
+	  The nbd server option has been renamed to BR2_PACKAGE_NBD_SERVER.
+
+config BR2_PACKAGE_GMOCK
+	bool "gmock merged into gtest package"
+	select BR2_LEGACY
+	select BR2_PACKAGE_GTEST
+	select BR2_PACKAGE_GTEST_GMOCK
+	help
+	  GMock is now a suboption of the GTest package.
+
+config BR2_KERNEL_HEADERS_4_8
+	bool "kernel headers version 4.8.x are no longer supported"
+	select BR2_KERNEL_HEADERS_4_4
+	select BR2_LEGACY
+	help
+	  Version 4.8.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed. As an alternative,
+	  version 4.4.x of the headers have been automatically
+	  selected in your configuration.
+
+config BR2_KERNEL_HEADERS_3_18
+	bool "kernel headers version 3.18.x are no longer supported"
+	select BR2_KERNEL_HEADERS_3_12
+	select BR2_LEGACY
+	help
+	  Version 3.18.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed. As an alternative,
+	  version 3.12.x of the headers have been automatically
+	  selected in your configuration.
+
+config BR2_GLIBC_VERSION_2_22
+	bool "glibc 2.22 removed"
+	select BR2_LEGACY
+	help
+	  Support for glibc version 2.22 has been removed. The current
+	  default version has been selected instead.
+
+###############################################################################
+comment "Legacy options removed in 2017.02"
+
 config BR2_PACKAGE_PERL_DB_FILE
 	bool "perl-db-file removed"
 	select BR2_LEGACY
@@ -446,22 +1028,22 @@ config BR2_GCC_VERSION_4_8_ARC
 
 config BR2_KERNEL_HEADERS_4_0
 	bool "kernel headers version 4.0.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_18
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 4.0.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.18.x of the headers have been
+	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
 config BR2_KERNEL_HEADERS_3_19
 	bool "kernel headers version 3.19.x are no longer supported"
-	select BR2_KERNEL_HEADERS_3_18
+	select BR2_KERNEL_HEADERS_3_12
 	select BR2_LEGACY
 	help
 	  Version 3.19.x of the Linux kernel headers have been deprecated
 	  for more than four buildroot releases and are now removed.
-	  As an alternative, version 3.18.x of the headers have been
+	  As an alternative, version 3.12.x of the headers have been
 	  automatically selected in your configuration.
 
 config BR2_PACKAGE_LIBEVAS_GENERIC_LOADERS
@@ -491,6 +1073,14 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL
 ###############################################################################
 comment "Legacy options removed in 2016.08"
 
+config BR2_PACKAGE_EFL_JP2K
+	bool "libevas jp2k loader has been removed"
+	select BR2_LEGACY
+	help
+	  JP2K support in EFL requires openjpeg 1.x (libopenjpeg1.pc)
+	  while Buildroot only packages openjpeg 2.x. Therefore, the
+	  JP2K loader has been removed from EFL.
+
 config BR2_PACKAGE_SYSTEMD_COMPAT
 	bool "systemd compatibility libraries have been removed"
 	select BR2_LEGACY
@@ -635,13 +1225,6 @@ config BR2_x86_i386
 	  The support for the i386 processors of the x86 architecture
 	  has been removed.
 
-config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
-	bool "qt5webkit-examples package removed"
-	select BR2_LEGACY
-	help
-	  The qt5webkit-examples package has been removed, since it
-	  was removed from upstream starting from Qt 5.6.
-
 config BR2_PACKAGE_QT5QUICK1
 	bool "qt5quick1 package removed"
 	select BR2_LEGACY
@@ -811,6 +1394,7 @@ config BR2_LINUX_KERNEL_SAME_AS_HEADERS
 
 config BR2_PACKAGE_CUPS_PDFTOPS
 	bool "Pdftops support has been removed from Cups"
+	select BR2_PACKAGE_CUPS_FILTERS
 	select BR2_LEGACY
 	help
 	  Pdftops support has been removed from the cups package
@@ -2551,144 +3135,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8712
 	help
 	  Now covers the whole Realtek 87xx familly: 8712/8723.
 
-###############################################################################
-comment "Legacy options removed in 2013.02"
-
-config BR2_sa110
-	bool "sa110 ARM target switched to strongarm"
-	select BR2_LEGACY
-	select BR2_strongarm
-	help
-	  The SA110 is the same as a generic StrongARM, it just differs
-	  in speed, peripherals and cache.
-
-config BR2_sa1100
-	bool "sa1100 ARM target switched to strongarm"
-	select BR2_LEGACY
-	select BR2_strongarm
-	help
-	  The SA1100 is the same as a generic StrongARM, it just differs
-	  in speed, peripherals and cache.
-
-config BR2_PACKAGE_GDISK
-	bool "gdisk has been replaced by gptfdisk"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GPTFDISK
-	help
-	  The option has been renamed BR2_PACKAGE_GPTFDISK.
-
-config BR2_PACKAGE_GDISK_GDISK
-	bool "gdisk tool from gdisk has been replaced by gdisk in gptfdisk"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GPTFDISK
-	select BR2_PACKAGE_GPTFDISK_GDISK
-	help
-	  The option has been renamed BR2_PACKAGE_GPTFDISK_GDISK.
-
-config BR2_PACKAGE_GDISK_SGDISK
-	bool "sgdisk tool from gdisk has been replaced by sgdisk in gptfdisk"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GPTFDISK
-	select BR2_PACKAGE_GPTFDISK_SGDISK
-	help
-	  The option has been renamed BR2_PACKAGE_GPTFDISK_SGDISK.
-
-config BR2_PACKAGE_GDB_HOST
-	bool "gdb for the host option has been renamed"
-	select BR2_PACKAGE_HOST_GDB
-	select BR2_LEGACY
-	help
-	  Due to the conversion of gdb to the package infrastructure,
-	  the BR2_PACKAGE_GDB_HOST option has been renamed
-	  BR2_PACKAGE_HOST_GDB.
-
-config BR2_PACKAGE_DIRECTB_DITHER_RGB16
-	bool "DirectFB RGB16 dithering option has been renamed"
-	select BR2_PACKAGE_DIRECTFB_DITHER_RGB16
-	select BR2_LEGACY
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_DIRECTFB_DITHER_RGB16.
-
-config BR2_PACKAGE_DIRECTB_TESTS
-	bool "DirectFB Tests option has been renamed"
-	select BR2_PACKAGE_DIRECTFB_TESTS
-	select BR2_LEGACY
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_DIRECTFB_TESTS.
-
-###############################################################################
-comment "Legacy options removed in 2012.11"
-
-config BR2_PACKAGE_CUSTOMIZE
-	bool "customize package has been removed"
-	select BR2_LEGACY
-	help
-	  The 'customize' special package has been removed. Instead,
-	  we recommend to create either your own packages, or use a
-	  post-build script to customize your root filesystem. See
-	  Buildroot's documentation for more details.
-
-config BR2_PACKAGE_XSERVER_xorg
-	bool "X.org modular server"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR.
-
-config BR2_PACKAGE_XSERVER_tinyx
-	bool "KDrive / TinyX server"
-	select BR2_LEGACY
-	select BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
-	help
-	  The option has been renamed
-	  BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE.
-
-config BR2_PACKAGE_PTHREAD_STUBS
-	bool "pthread-stubs option has been renamed"
-	select BR2_LEGACY
-	select BR2_PACKAGE_LIBPTHREAD_STUBS
-	help
-	  For consistency reason, the pthread-stubs package has been
-	  renamed to libpthread-stubs.
-
-###############################################################################
-comment "Legacy options removed in 2012.08"
-
-config BR2_PACKAGE_GETTEXT_STATIC
-	bool "libgettext.a is now selected by BR2_PREFER_STATIC_LIB"
-	select BR2_LEGACY
-	help
-	  To build a static gettext library, select BR2_PREFER_STATIC_LIB.
-
-
-config BR2_PACKAGE_LIBINTL
-	bool "libintl"
-	select BR2_LEGACY
-	select BR2_PACKAGE_GETTEXT
-	help
-	  libintl is now installed by selecting BR2_PACKAGE_GETTEXT. This now
-	  only installs the library, not the executables.
-
-config BR2_PACKAGE_INPUT_TOOLS_EVTEST
-	bool "input-tools evtest is now a separate package evtest"
-	select BR2_LEGACY
-	select BR2_PACKAGE_EVTEST
-	help
-	  The evtest program from input-tools is now a separate package.
-
-config BR2_BFIN_FDPIC
-	bool "BR2_BFIN_FDPIC is now BR2_BINFMT_FDPIC"
-	select BR2_BINFMT_FDPIC
-	select BR2_LEGACY
-
-config BR2_BFIN_FLAT
-	bool "BR2_BFIN_FLAT is now BR2_BINFMT_FLAT"
-	select BR2_BINFMT_FLAT
-	select BR2_LEGACY
-
 endmenu
 
 endif # !SKIP_LEGACY
diff --git a/bsp/buildroot/DEVELOPERS b/bsp/buildroot/DEVELOPERS
index b21176e5..ba16b466 100644
--- a/bsp/buildroot/DEVELOPERS
+++ b/bsp/buildroot/DEVELOPERS
@@ -30,10 +30,49 @@ N:	Abhilash Tuse <abhilash.tuse@imgtec.com>
 F:	package/gstreamer1/gst1-rtsp-server/
 
 N:	Adam Duskett <aduskett@gmail.com>
+F:	package/audit/
+F:	package/busybox/
+F:	package/checkpolicy/
+F:	package/cppdb/
+F:	package/gstreamer1/gstreamer1/
+F:	package/gstreamer1/gstreamer1-mm/
+F:	package/gstreamer1/gst1-plugins-bad/
+F:	package/gstreamer1/gst1-plugins-base/
+F:	package/gstreamer1/gst1-plugins-good/
+F:	package/gstreamer1/gst1-plugins-ugly/
+F:	package/gstreamer1/gst1-vaapi/
+F:	package/imx-usb-loader/
+F:	package/janus-gateway/
+F:	package/json-for-modern-cpp/
+F:	package/libcpprestsdk/
+F:	package/libressl/
+F:	package/libselinux/
+F:	package/libsemanage/
+F:	package/libsepol/
 F:	package/nginx-naxsi/
+F:	package/policycoreutils/
 F:	package/python-mutagen/
+F:	package/restorecond/
+F:	package/refpolicy/
+F:	package/selinux-python/
+F:	package/semodule-utils/
+F:	package/setools/
 F:	package/sngrep/
 
+N:	Adrian Perez de Castro <aperez@igalia.com>
+F:	package/brotli/
+F:	package/libepoxy/
+F:	package/webkitgtk/
+F:	package/woff2/
+
+N:	Adrien Gallouët <adrien@gallouet.fr>
+F:	package/glorytun/
+
+N:	Aleksander Morgado <aleksander@aleksander.es>
+F:	package/libmbim/
+F:	package/libqmi/
+F:	package/modem-manager/
+
 N:	Alex Suykov <alex.suykov@gmail.com>
 F:	package/vboot-utils/
 
@@ -48,13 +87,20 @@ F:	package/putty/
 N:	Alexander Lukichev <alexander.lukichev@espotel.com>
 F:	package/openpgm/
 
+N:	Alexander Mukhin <alexander.i.mukhin@gmail.com>
+F:	package/hostapd/
+
 N:	Alexander Varnin <fenixk19@mail.ru>
 F:	package/liblog4c-localtime/
 
-N:	Alexandre Belloni <alexandre.belloni@free-electrons.com>
+N:	Alexandre Belloni <alexandre.belloni@bootlin.com>
 F:	package/tz/
 
-N:	Alistair Francis <alistair.francis@xilinx.com>
+N:	Alexandre Esse <alexandre.esse.dev@gmail.com>
+F:	package/kvazaar/
+F:	package/v4l2loopback/
+
+N:	Alistair Francis <alistair@alistair23.me>
 F:	package/xen/
 
 N:	Alvaro G. M <alvaro.gamez@hazent.com>
@@ -66,17 +112,31 @@ N:	Anders Darander <anders@chargestorm.se>
 F:	package/ktap/
 
 N:	André Hentschel <nerv@dawncrow.de>
+F:	package/azure-iot-sdk-c/
 F:	package/openal/
 F:	package/p7zip/
 F:	package/wine/
 
-N:	Andrew Ruder <andrew.ruder@elecsyscorp.com>
-F:	package/expect/
+N:	Andrey Smirnov <andrew.smirnov@gmail.com>
+F:	package/python-backports-shutil-get-terminal-size/
+F:	package/python-decorator/
+F:	package/python-ipython-genutils/
+F:	package/python-pathlib2/
+F:	package/python-pickleshare/
+F:	package/python-scandir/
+F:	package/python-simplegeneric/
+F:	package/python-systemd/
+F:	package/python-traitlets/
+F:	package/zstd/
+
+N:	Andrey Yurovsky <yurovsky@gmail.com>
+F:	package/rauc/
 
 N:	Andy Kennedy <andy.kennedy@adtran.com>
 F:	package/libunwind/
 
 N:	Angelo Compagnucci <angelo.compagnucci@gmail.com>
+F:	package/i2c-tools/
 F:	package/mono/
 F:	package/mono-gtksharp3/
 F:	package/monolite/
@@ -86,10 +146,13 @@ F:	package/python-pydal/
 F:	package/python-web2py/
 F:	package/sysdig/
 
+N:	Antony Pavlov <antonynpavlov@gmail.com>
+F:	package/lsscsi/
+
 N:	Anthony Viallard <viallard@syscom-instruments.com>
 F:	package/gnuplot/
 
-N:	Antoine Ténart <antoine.tenart@free-electrons.com>
+N:	Antoine Ténart <antoine.tenart@bootlin.com>
 F:	package/wf111/
 
 N:	ARC Maintainers <arc-buildroot@synopsys.com>
@@ -103,9 +166,11 @@ N:	Arnaud Aujon <arnaud@intelibre.fr>
 F:	package/espeak/
 
 N:	Arnout Vandecappelle <arnout@mind.be>
+F:	package/arp-scan/
 F:	package/freescale-imx/firmware-imx/
 F:	package/freescale-imx/imx-lib/
 F:	package/gstreamer/gst-fsl-plugins/
+F:	package/lua-bit32/
 F:	package/owfs/
 F:	package/python-bottle/
 F:	package/sqlcipher/
@@ -125,7 +190,10 @@ F:	package/luasec/
 F:	package/lua-ev/
 F:	package/orbit/
 
-N:	Bartosz Golaszewski <bgolaszewski@baylibre.com>
+N:	Bartosz Bilas <b.bilas@grinn-global.com>
+F:	package/qt5/qt5scxml/
+
+N:	Bartosz Golaszewski <brgl@bgdev.pl>
 F:	package/autoconf-archive/
 F:	package/doxygen/
 F:	package/libgpiod/
@@ -137,8 +205,18 @@ F:	package/pulseview/
 F:	package/sigrok-cli/
 
 N:	Baruch Siach <baruch@tkos.co.il>
+F:	package/daemon/
+F:	package/dropbear/
 F:	package/ebtables/
+F:	package/i2c-tools/
+F:	package/libcurl/
+F:	package/libpcap/
 F:	package/openipmi/
+F:	package/socat/
+F:	package/strace/
+F:	package/tcpdump/
+F:	package/ti-uim/
+F:	package/uhubctl/
 
 N:	Ben Boeckel <mathstuf@gmail.com>
 F:	package/taskd/
@@ -147,9 +225,14 @@ N:	Benjamin Kamath <kamath.ben@gmail.com>
 F:	package/lapack/
 
 N:	Bernd Kuhls <bernd.kuhls@t-online.de>
+F:	package/alsa-lib/
+F:	package/alsa-utils/
 F:	package/apache/
 F:	package/apr/
 F:	package/apr-util/
+F:	package/bcg729/
+F:	package/bluez-tools/
+F:	package/boinc/
 F:	package/clamav/
 F:	package/dovecot/
 F:	package/dovecot-pigeonhole/
@@ -158,9 +241,12 @@ F:	package/eudev/
 F:	package/exim/
 F:	package/fetchmail/
 F:	package/freeswitch/
+F:	package/freeswitch-mod-bcg729/
 F:	package/ffmpeg/
+F:	package/ghostscript/
 F:	package/giflib/
 F:	package/glmark2/
+F:	package/hdparm/
 F:	package/jsoncpp/
 F:	package/kodi*
 F:	package/lame/
@@ -193,10 +279,12 @@ F:	package/libldns/
 F:	package/libmicrohttpd/
 F:	package/libminiupnpc/
 F:	package/libnatpmp/
+F:	package/libnpth/
 F:	package/libogg/
 F:	package/libopenh264/
 F:	package/libpciaccess/
 F:	package/libplatform/
+F:	package/libpng/
 F:	package/libsidplay2/
 F:	package/libsilk/
 F:	package/libsndfile/
@@ -206,6 +294,7 @@ F:	package/libsquish/
 F:	package/liburiparser/
 F:	package/libva/
 F:	package/libva-intel-driver/
+F:	package/libva-utils/
 F:	package/libvorbis/
 F:	package/libvpx/
 F:	package/libyuv/
@@ -239,6 +328,7 @@ F:	package/perl-timedate/
 F:	package/perl-uri/
 F:	package/perl-www-robotrules/
 F:	package/pixman/
+F:	package/pngquant/
 F:	package/pound/
 F:	package/pure-ftpd/
 F:	package/python-couchdb/
@@ -248,10 +338,13 @@ F:	package/python-mwclient/
 F:	package/python-mwscrape/
 F:	package/python-mwscrape2slob/
 F:	package/python-mako/
+F:	package/python-oauthlib/
 F:	package/python-pyicu/
 F:	package/python-pylru/
+F:	package/python-requests-oauthlib/
 F:	package/python-slob/
 F:	package/rtmpdump/
+F:	package/samba4/
 F:	package/softether/
 F:	package/taglib/
 F:	package/tinyxml2/
@@ -263,6 +356,7 @@ F:	package/vdr/
 F:	package/vdr-plugin-vnsiserver/
 F:	package/vlc/
 F:	package/vnstat/
+F:	package/waylandpp/
 F:	package/x11r7/
 F:	package/x264/
 F:	package/x265/
@@ -279,6 +373,9 @@ N:	Bogdan Radulescu <bogdan@nimblex.net>
 F:	package/iftop/
 F:	package/ncdu/
 
+N:	Brock Williams <brock@cottonwoodcomputer.com>
+F:	package/pdmenu/
+
 N:	Bryan Brinsko <bryan.brinsko@rockwellcollins.com>
 F:	package/pps-tools/
 
@@ -286,7 +383,6 @@ N:	Carlo Caione <carlo.caione@gmail.com>
 F:	package/sunxi-boards/
 
 N:	Carlos Santos <casantos@datacom.ind.br>
-F:	package/gmock/
 F:	package/gtest/
 F:	package/libpam-radius-auth/
 F:	package/libpam-tacplus/
@@ -299,12 +395,25 @@ F:	package/libdvbsi/
 F:	package/libsvg/
 F:	package/libsvg-cairo/
 
+N:	Chakra Divi <chakra@openedev.com>
+F:	board/friendlyarm/nanopi-m1
+F:	board/friendlyarm/nanopi-m1-plus
+F:	board/olimex/a13_olinuxino
+F:	board/orangepi/orangepi-plus
+F:	configs/nanopi_m1_defconfig
+F:	configs/nanopi_m1_plus_defconfig
+F:	configs/olimex_a13_olinuxino_defconfig
+F:	configs/orangepi_plus_defconfig
+
 N:	Chris Packham <judge.packham@gmail.com>
 F:	package/eventlog/
 F:	package/micropython/
 F:	package/micropython-lib/
 F:	package/syslog-ng/
 
+N:	Christian Kellermann <christian.kellermann@solectrix.de>
+F:	package/python-pylibftdi/
+
 N:	Christian Stewart <christian@paral.in>
 F:	linux/linux-ext-aufs.mk
 F:	package/aufs/
@@ -312,6 +421,7 @@ F:	package/aufs-util/
 F:	package/batman-adv/
 F:	package/docker-containerd/
 F:	package/docker-engine/
+F:	package/docker-proxy/
 F:	package/mosh/
 F:	package/rtl8821au/
 F:	package/runc/
@@ -336,9 +446,11 @@ F:	package/libselinux/
 F:	package/libsemanage/
 F:	package/libsepol/
 F:	package/policycoreutils/
-F:	package/sepolgen/
 F:	package/ustr/
 
+N:	Corentin Guillevic <corentin.guillevic@smile.fr>
+F:	package/libloki/
+
 N:	Cédric Chépied <cedric.chepied@gmail.com>
 F:	package/znc/
 
@@ -357,7 +469,6 @@ F:	package/log4cpp/
 
 N:	Daniel Nyström <daniel.nystrom@timeterminal.se>
 F:	package/e2tools/
-F:	package/fbgrab/
 
 N:	Daniel Price <daniel.price@gmail.com>
 F:	package/nodejs/
@@ -375,9 +486,6 @@ F:	package/lua-cjson/
 F:	package/luaexpat/
 F:	package/xinetd/
 
-N:	Dave Skok <blanco.ether@gmail.com>
-F:	package/ola/
-
 N:	David Bachelart <david.bachelart@bbright.com>
 F:	package/ccrypt/
 F:	package/dos2unix/
@@ -396,6 +504,9 @@ F:	package/openldap/
 N:	David du Colombier <0intro@gmail.com>
 F:	package/x264/
 
+N:	David Graziano <david.graziano@rockwellcollins.com>
+F:	package/libcsv/
+
 N:	David Lechner <david@lechnology.com>
 F:	board/lego/ev3/
 F:	configs/lego_ev3_defconfig
@@ -423,16 +534,33 @@ F:	package/nss-pam-ldapd/
 F:	package/sp-oops-extract/
 F:	package/unscd/
 
+N:	Dushara Jayasinghe <nidujay@gmail.com>
+F:	package/prosody/
+
 N:	Ed Swierk <eswierk@skyportsystems.com>
 F:	package/xxhash/
 
 N:	Eric Le Bihan <eric.le.bihan.dev@free.fr>
+F:	docs/manual/adding-packages-meson.txt
 F:	package/adwaita-icon-theme/
+F:	package/cargo-bin/
+F:	package/cargo/
 F:	package/darkhttpd/
 F:	package/eudev/
+F:	package/execline/
 F:	package/hicolor-icon-theme/
 F:	package/jemalloc/
+F:	package/meson/
 F:	package/ninja/
+F:	package/rust-bin/
+F:	package/rust/
+F:	package/s6/
+F:	package/s6-dns/
+F:	package/s6-linux-init/
+F:	package/s6-linux-utils/
+F:	package/s6-networking/
+F:	package/s6-portable-utils/
+F:	package/s6-rc/
 F:	package/skalibs/
 F:	package/smack/
 F:	package/xvisor/
@@ -449,6 +577,7 @@ F:	package/efivar/
 F:	package/fwts/
 F:	package/spi-tools/
 F:	package/xdotool/
+F:	configs/pc_x86_64_*
 
 N:	Erik Stromdahl <erik.stromdahl@gmail.com>
 F:	package/mxsldr/
@@ -460,6 +589,8 @@ N:	Evan Zelkowitz <evan.zelkowitz@gmail.com>
 F:	package/sdl_gfx/
 
 N:	Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
+F:	board/ci20/
+F:	configs/ci20_defconfig
 F:	arch/Config.in.nios2
 F:	package/fio/
 F:	package/iptraf-ng/
@@ -473,18 +604,31 @@ F:	package/supertuxkart/
 N:	Fabio Estevam <festevam@gmail.com>
 F:	board/warp7/
 F:	configs/freescale_imx*
+F:	configs/imx23evk_defconfig
+F:	configs/imx6-sabre*
+F:	configs/imx6slevk_defconfig
+F:	configs/imx6sx-sdb_defconfig
+F:	configs/imx6ulevk_defconfig
 F:	configs/imx6ulpico_defconfig
+F:	configs/imx7dpico_defconfig
+F:	configs/mx25pdk_defconfig
+F:	configs/mx51evk_defconfig
+F:	configs/mx53loco_defconfig
 F:	configs/mx6cubox_defconfig
 F:	configs/mx6sx_udoo_neo_defconfig
 F:	configs/mx6udoo_defconfig
 F:	configs/wandboard_defconfig
 F:	configs/warp7_defconfig
+F:	package/atest/
+F:	package/kmscube/
 
 N:	Fabio Porcedda <fabio.porcedda@gmail.com>
 F:	package/netsurf-buildsystem/
 
 N:	Fabrice Fontaine <fabrice.fontaine@orange.com>
 F:	package/domoticz/
+F:	package/libmediaart/
+F:	package/libmaxminddb/
 F:	package/openzwave/
 
 N:	Fabrice Fontaine <fontaine.fabrice@gmail.com>
@@ -492,13 +636,21 @@ F:	package/alljoyn/
 F:	package/alljoyn-base/
 F:	package/alljoyn-tcl/
 F:	package/alljoyn-tcl-base/
+F:	package/boinc/
+F:	package/flatbuffers/
 F:	package/gtksourceview/
 F:	package/gssdp/
 F:	package/gupnp/
 F:	package/gupnp-dlna/
 F:	package/gupnp-tools/
+F:	package/hiredis/
 F:	package/igd2-for-linux/
+F:	package/libupnp/
+F:	package/libupnp18/
 F:	package/minissdpd/
+F:	package/motion/
+F:	package/rygel/
+F:	package/safeclib/
 F:	package/tinycbor/
 F:	package/tinydtls/
 
@@ -514,7 +666,6 @@ F:	board/olimex/a20_olinuxino
 F:	configs/olimex_a20_olinuxino_*
 F:	package/4th/
 F:	package/botan/
-F:	package/cosmo/
 F:	package/dado/
 F:	package/ficl/
 F:	package/gdbm/
@@ -535,11 +686,16 @@ F:	package/perl*
 F:	package/pkg-perl.mk
 F:	package/pkg-luarocks.mk
 F:	package/qemu/
+F:	package/sdl2_mixer/
+F:	package/sdl2_net/
 F:	package/tekui/
-F:	support/scripts/scancpan
+F:	package/wsapi-fcgi/
+F:	package/wsapi-xavante/
+F:	utils/scancpan
 
 N:	Frank Hunleth <fhunleth@troodon-software.com>
 F:	package/am335x-pru-package/
+F:	package/libconfuse/
 F:	package/libdmtx/
 F:	package/libsodium/
 F:	package/php-amqp/
@@ -550,6 +706,11 @@ F:	package/ucl/
 F:	package/upx/
 F:	package/zxing-cpp/
 
+N:	Gaël Portay <gael.portay@savoirfairelinux.com>
+F:	package/qt5/qt5virtualkeyboard/
+F:	package/qt5/qt5webengine/
+F:	package/qt5/qt5webkit-examples/
+
 N:	Gary Bisson <gary.bisson@boundarydevices.com>
 F:	board/boundarydevices/
 F:	configs/nitrogen*
@@ -571,7 +732,9 @@ N:	Gilles Talis <gilles.talis@gmail.com>
 F:	package/fdk-aac/
 F:	package/httping/
 F:	package/iozone/
+F:	package/leptonica/
 F:	package/ocrad/
+F:	package/tesseract-ocr/
 F:	package/webp/
 
 N:	Gregory Dymarek <gregd72002@gmail.com>
@@ -591,164 +754,20 @@ F:	package/sdl2/
 N:	Guillaume William Brs <guillaume.bressaix@gmail.com>
 F:	package/liquid-dsp/
 
-N:	Gustavo Zacarias <gustavo@zacarias.com.ar>
-F:	arch/Config.in.powerpc
-F:	board/qemu/
-F:	configs/qemu_*
-F:	package/argp-standalone/
-F:	package/arptables/
-F:	package/audiofile/
-F:	package/autossh/
-F:	package/bitstream-vera/
-F:	package/blktrace/
-F:	package/bmon/
-F:	package/btrfs-progs/
-F:	package/c-ares/
-F:	package/cantarell/
-F:	package/check/
-F:	package/collectd/
-F:	package/comix-cursors/
-F:	package/connman-gtk/
-F:	package/conntrack-tools/
-F:	package/cppdb/
-F:	package/crda/
-F:	package/cryptodev-linux/
-F:	package/dbus-cpp/
-F:	package/debianutils/
-F:	package/dt/
-F:	package/exfat/
-F:	package/exfat-utils/
-F:	package/f2fs-tools/
-F:	package/faad2/
-F:	package/fping/
-F:	package/ftop/
-F:	package/gcr/
-F:	package/geoip/
-F:	package/gpsd/
-F:	package/granite/
-F:	package/graphite2/
-F:	package/gsettings-desktop-schemas/
-F:	package/gstreamer1/
-F:	package/hans/
-F:	package/haveged/
-F:	package/heimdal/
-F:	package/hostapd/
-F:	package/ifupdown/
-F:	package/inconsolata/
-F:	package/iodine/
-F:	package/iperf3/
-F:	package/ipset/
-F:	package/iw/
-F:	package/jhead/
-F:	package/jquery-keyboard/
-F:	package/kompexsqlite/
-F:	package/kvmtool/
-F:	package/lame/
-F:	package/lft/
-F:	package/libao/
-F:	package/libcroco/
-F:	package/libcue/
-F:	package/libcuefile/
-F:	package/libepoxy/
-F:	package/libgee/
-F:	package/libglib2/
-F:	package/libgtk2/
-F:	package/libgtk3/
-F:	package/libmcrypt/
-F:	package/libmemcached/
-F:	package/libmhash/
-F:	package/libmnl/
-F:	package/libmng/
-F:	package/libmpdclient/
-F:	package/libnetfilter_acct/
-F:	package/libnetfilter_conntrack/
-F:	package/libnetfilter_cthelper/
-F:	package/libnetfilter_cttimeout/
-F:	package/libnetfilter_log/
-F:	package/libnetfilter_queue/
-F:	package/libnfnetlink/
-F:	package/libnl/
-F:	package/liboping/
-F:	package/libreplaygain/
-F:	package/libsamplerate/
-F:	package/libtorrent/
-F:	package/libuv/
-F:	package/lksctp-tools/
-F:	package/lshw/
-F:	package/lz4/
-F:	package/lzip/
-F:	package/mbedtls/
-F:	package/mcrypt/
-F:	package/memcached/
-F:	package/minizip/
-F:	package/mpd/
-F:	package/mpv/
-F:	package/mtr/
-F:	package/musepack/
-F:	package/ncmpc/
-F:	package/net-tools/
-F:	package/netstat-nat/
-F:	package/nettle/
-F:	package/nfacct/
-F:	package/nftables/
-F:	package/nload/
-F:	package/nmap/
-F:	package/noip/
-F:	package/norm/
-F:	package/obsidian-cursors/
-F:	package/ocf-linux/
-F:	package/opencore-amr/
-F:	package/openswan/
-F:	package/openvpn/
-F:	package/opusfile/
-F:	package/p11-kit/
-F:	package/p910nd/
-F:	package/pax-utils/
-F:	package/procrank_linux/
-F:	package/php-*
-F:	package/pkgconf/
-F:	package/privoxy/
-F:	package/protobuf-c/
-F:	package/ptpd/
-F:	package/ptpd2/
-F:	package/pwgen/
-F:	package/ramspeed/
-F:	package/rng-tools/
-F:	package/rtorrent/
-F:	package/samba4/
-F:	package/sbc/
-F:	package/snmppp/
-F:	package/sox/
-F:	package/spidev_test/
-F:	package/squid/
-F:	package/start-stop-daemon/
-F:	package/swig/
-F:	package/thrift/
-F:	package/twolame/
-F:	package/ulogd/
-F:	package/unionfs/
-F:	package/unrar/
-F:	package/ushare/
-F:	package/vala/
-F:	package/vorbis-tools/
-F:	package/wavpack/
-F:	package/wayland-protocols/
-F:	package/webkitgtk/
-F:	package/whois/
-F:	package/wireshark/
-F:	package/wpa_supplicant/
-F:	package/wpan-tools/
-F:	package/x11r7/xdriver_xf86-video-qxl/
-F:	package/xtables-addons/
-F:	package/zd1211-firmware/
+N:	Guo Ren <ren_guo@c-sky.com>
+F:	arch/Config.in.csky
+F:	board/csky/
+F:	configs/csky_*
 
 N:	Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
 F:	package/gnuradio/
+F:	package/gqrx/
 F:	package/gr-osmosdr/
 F:	package/libusbgx/
 F:	package/python-cheetah/
 F:	package/python-markdown/
 F:	package/python-pyqt/
+F:	package/python-remi/
 F:	package/python-sip/
 
 N:	Henrique Camargo <henrique@henriquecamargo.com>
@@ -765,6 +784,40 @@ F:	package/python-rpi-gpio/
 N:	Ignacy Gawędzki <ignacy.gawedzki@green-communications.fr>
 F:	package/angularjs/
 
+N:	Ilias Apalodimas <apalos@gmail.com>
+F:	package/keepalived/
+
+N:	Ismael Luceno <ismael@iodev.co.uk>
+F:	package/axel/
+
+N:	Jagan Teki <jagan@amarulasolutions.com>
+F:	board/bananapi/
+F:	board/engicam/
+F:	board/friendlyarm/nanopi-a64/
+F:	board/friendlyarm/nanopi-neo2/
+F:	board/olimex/a64-olinuxino/
+F:	board/orangepi/orangepi-pc2/
+F:	board/orangepi/orangepi-prime/
+F:	board/orangepi/orangepi-win/
+F:	board/orangepi/orangepi-zero-plus2/
+F:	board/pine64/
+F:	configs/bananapi_m1_defconfig
+F:	configs/bananapi_m64_defconfig
+F:	configs/friendlyarm_nanopi_a64_defconfig
+F:	configs/friendlyarm_nanopi_neo2_defconfig
+F:	configs/olimex_a64_olinuxino_defconfig
+F:	configs/orangepi_pc2_defconfig
+F:	configs/orangepi_prime_defconfig
+F:	configs/orangepi_win_defconfig
+F:	configs/orangepi_zero_plus2_defconfig
+F:	configs/pine64_defconfig
+F:	configs/pine64_sopine_defconfig
+F:	configs/engicam_imx6qdl_icore_defconfig
+F:	configs/engicam_imx6qdl_icore_qt5_defconfig
+F:	configs/engicam_imx6qdl_icore_rqs_defconfig
+F:	configs/engicam_imx6ul_geam_defconfig
+F:	configs/engicam_imx6ul_isiot_defconfig
+
 N:	James Knight <james.knight@rockwellcollins.com>
 F:	package/atkmm/
 F:	package/cairomm/
@@ -776,6 +829,13 @@ F:	package/pangomm/
 F:	package/rpm/
 F:	package/yad/
 
+N:	Jan Heylen <jan.heylen@nokia.com>
+F:	package/opentracing-cpp/
+
+N:	Jan Kraval <jan.kraval@gmail.com>
+F:	board/orangepi/orangepi-lite
+F:	configs/orangepi_lite_defconfig
+
 N:	Jan Pedersen <jp@jp-embedded.com>
 F:	package/zip/
 
@@ -801,6 +861,15 @@ F:	package/fxload/
 
 N:	Joel Stanley <joel@jms.id.au>
 F:	package/pdbg/
+F:	board/qemu/ppc64le-pseries/
+F:	configs/qemu_ppc64le_pseries_defconfig
+
+N:	Joseph Kogut <joseph.kogut@gmail.com>
+F:	package/gconf/
+F:	package/python-raven/
+F:	package/python-schedule/
+F:	package/python-websockets/
+F:	package/python-xlib/
 
 N:	Johan Derycke <johanderycke@gmail.com>
 F:	package/python-libconfig/
@@ -808,15 +877,18 @@ F:	package/python-libconfig/
 N:	Johan Oudinet <johan.oudinet@gmail.com>
 F:	package/ejabberd/
 F:	package/erlang-goldrush/
+F:	package/erlang-jiffy/
 F:	package/erlang-lager/
 F:	package/erlang-p1-cache-tab/
 F:	package/erlang-p1-iconv/
+F:	package/erlang-p1-oauth2/
 F:	package/erlang-p1-sip/
 F:	package/erlang-p1-stringprep/
 F:	package/erlang-p1-stun/
 F:	package/erlang-p1-tls/
 F:	package/erlang-p1-utils/
 F:	package/erlang-p1-xml/
+F:	package/erlang-p1-xmpp/
 F:	package/erlang-p1-yaml/
 F:	package/erlang-p1-zlib/
 F:	package/nginx-dav-ext/
@@ -845,6 +917,9 @@ F:	package/libuio/
 F:	package/netsniff-ng/
 F:	package/rabbitmq-c/
 
+N:	Joshua Henderson <joshua.henderson@microchip.com>
+F:	package/qt5/qt5wayland/
+
 N:	Juha Rantanen <juha@codercoded.com>
 F:	package/acsccid/
 
@@ -872,6 +947,13 @@ F:	package/qt5/
 N:	Julien Floret <julien.floret@6wind.com>
 F:	package/lldpd/
 
+N:	Laurent Charpentier <laurent_pubs@yahoo.com>
+F:	package/open-lldp/
+
+N:	Julien Viard de Galbert <julien@vdg.name>
+F:	package/dieharder/
+F:	package/easy-rsa/
+
 N:	Justin Maggard <jmaggard@netgear.com>
 F:	package/dtach/
 
@@ -890,6 +972,9 @@ F:	package/x11r7/xdriver_xf86-video-imx/
 F:	package/x11r7/xdriver_xf86-video-imx-viv/
 
 N:	Jörg Krause <joerg.krause@embedded.rocks>
+F:	board/lemaker/bananapro/
+F:	configs/bananapro_defconfig
+F:	package/augeas/
 F:	package/bctoolbox/
 F:	package/libshout/
 F:	package/libupnpp/
@@ -911,6 +996,17 @@ F:	package/cpuload/
 F:	package/bwm-ng/
 F:	package/ramsmp/
 
+N:	Kevin Joly <kevin.joly@sensefly.com>
+F:	package/libgphoto2/
+
+N:	Koen Martens <gmc@sonologic.nl>
+F:	package/linuxconsoletools/
+
+N:	Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+F:	package/bcusdk/
+F:	package/libpthsem/
+F:	package/nilfs-utils/
+
 N:	Laurent Cans <laurent.cans@gmail.com>
 F:	package/aircrack-ng/
 
@@ -947,7 +1043,7 @@ F:	support/legal-info/
 N:	Lucas De Marchi <lucas.de.marchi@gmail.com>
 F:	package/fswebcam/
 
-N:	Ludovic Desroches <ludovic.desroches@atmel.com>
+N:	Ludovic Desroches <ludovic.desroches@microchip.com>
 F:	board/atmel/
 F:	configs/at91*
 F:	configs/atmel_*
@@ -958,6 +1054,12 @@ F:	package/python-simplejson/
 F:	package/python-versiontools/
 F:	package/wilc1000-firmware/
 
+N:	Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+F:	package/ffmpeg/
+F:	package/mpv/
+F:	package/rpi-firmware/
+F:	package/rpi-userland/
+
 N:	Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
 F:	package/nvme/
 
@@ -974,50 +1076,134 @@ N:	Marcin Niestroj <m.niestroj@grinn-global.com>
 F:	board/grinn/
 F:	configs/grinn_*
 F:	package/argparse/
+F:	package/dt-utils/
 F:	package/easydbus/
+F:	package/lua-flu/
+F:	package/lua-stdlib/
+F:	package/luaossl/
 F:	package/rs485conf/
 F:	package/turbolua/
 
+N:	Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+F:	package/libkcapi/
+
+N:	Marcus Folkesson <marcus.folkesson@gmail.com>
+F:	package/libostree/
+F:	package/libselinux/
+F:	package/libsemanage/
+F:	package/libsepol/
+F:	package/selinux-python/
+F:	utils/config
+F:	utils/diffconfig
+
 N:	Marek Belisko <marek.belisko@open-nandra.com>
 F:	package/libatasmart/
 F:	package/polkit/
 F:	package/sg3_utils/
 F:	package/udisks/
 
+N:	Mario Lang <mlang@blind.guru>
+F:	package/brltty/
+F:	package/lynx/
+
+N:	Mario Rugiero <mrugiero@gmail.com>
+F:	package/ratpoison/
+
 N:	Markos Chandras <markos.chandras@imgtec.com>
 F:	package/harfbuzz/
 F:	package/libsecret/
 
 N:	Martin Bark <martin@barkynet.com>
 F:	package/ca-certificates/
+F:	package/connman/
+F:	package/nodejs/
 F:	package/tzdata/
 F:	package/zic/
 
 N:	Martin Hicks <mort@bork.org>
 F:	package/cryptsetup/
 
+N:	Martin Kepplinger <martink@posteo.de>
+F:	package/tslib/
+F:	package/x11r7/xdriver_xf86-input-tslib/
+F:	package/x11vnc/
+
 N:	Mathieu Audat <mathieu.audat@savoirfairelinux.com>
 F:	board/technologic/ts4900/
 F:	configs/ts4900_defconfig
 F:	package/ts4900-fpga/
 
 N:	Matt Weber <matthew.weber@rockwellcollins.com>
+F:	package/argp-standalone/
+F:	package/aufs/
+F:	package/aufs-util/
 F:	package/bc/
+F:	package/bridge-utils/
+F:	package/checkpolicy/
+F:	package/cgroupfs-mount/
+F:	package/crda/
+F:	package/devmem2/
+F:	package/dnsmasq/
+F:	package/dosfstools/
 F:	package/eigen/
+F:	package/ethtool/
+F:	package/flashbench/
 F:	package/fmc/
 F:	package/fmlib/
+F:	package/git/
+F:	package/gnutls/
+F:	package/hostapd/
+F:	package/i2c-tools/
+F:	package/ifplugd/
 F:	package/igmpproxy/
+F:	package/iperf/
+F:	package/iperf3/
 F:	package/iputils/
+F:	package/iw/
+F:	package/kvm-unit-tests/
+F:	package/kvmtool/
+F:	package/libcsv/
+F:	package/libcurl/
+F:	package/libfcgi/
+F:	package/libopenssl/
+F:	package/libselinux/
+F:	package/libsemanage/
+F:	package/libsepol/
+F:	package/libssh2/
+F:	package/libqmi/
+F:	package/lighttpd/
+F:	package/logrotate/
+F:	package/makedevs/
+F:	package/memtester/
+F:	package/mii-diag/
+F:	package/mrouted/
+F:	package/mtd/
+F:	package/mtools/
+F:	package/nginx-upload/
 F:	package/omniorb/
+F:	package/paxtest/
+F:	package/picocom/
+F:	package/policycoreutils/
+F:	package/proftpd/
+F:	package/protobuf-c/
+F:	package/protobuf/
+F:	package/python-flask-cors/
 F:	package/python-ipy/
 F:	package/python-posix-ipc/
 F:	package/python-pypcap/
 F:	package/python-pyrex/
 F:	package/raptor/
+F:	package/rng-tools/
+F:	package/rsyslog/
 F:	package/setools/
-F:	package/simicsfs/
 F:	package/smcroute/
 F:	package/tclap/
+F:	package/uboot-tools/
+F:	package/unionfs/
+F:	package/valijson/
+F:	package/wpa_supplicant/
+F:	package/wireless_tools/
+F:	package/xen/
 
 N:	Mauro Condarelli <mc5686@mclink.it>
 F:	package/mc/
@@ -1074,11 +1260,10 @@ F:	package/systemd-bootchart/
 F:	package/tinyalsa/
 F:	package/tinyxml/
 
-N:	Maxime Ripard <maxime.ripard@free-electrons.com>
+N:	Maxime Ripard <maxime.ripard@bootlin.com>
 F:	package/kmsxx/
 
 N:	Michael Rommel <rommel@layer-7.net>
-F:	package/aiccu/
 F:	package/knock/
 F:	package/python-crc16/
 F:	package/python-pyzmq/
@@ -1086,6 +1271,10 @@ F:	package/python-pyzmq/
 N:	Michael Trimarchi <michael@amarulasolutions.com>
 F:	package/python-spidev/
 
+N:	Michał Łyszczek <michal.lyszczek@bofc.pl>
+F:	board/altera/socrates_cyclone5/
+F:	configs/socrates_cyclone5_defconfig
+
 N:	Mikhail Boiko <mikhailboiko85@gmail.com>
 F:	package/libfribidi/
 
@@ -1096,6 +1285,13 @@ N:	Murat Demirten <mdemirten@yh.com.tr>
 F:	package/jpeg-turbo/
 F:	package/libgeotiff/
 
+N:	Mike Harmony <mike.harmony@snapav.com>
+F:	board/sinovoip/m2-plus/
+F:	configs/bananapi_m2_plus_defconfig
+
+N:	Mylène Josserand <mylene.josserand@bootlin.com>
+F:	package/rtl8723bu/
+
 N:	Nathan Lynch <ntl@pobox.com>
 F:	package/chrony/
 
@@ -1115,13 +1311,13 @@ F:	package/nvidia-tegra23/nvidia-tegra23-codecs/
 N:	Nimai Mahajan <nimaim@gmail.com>
 F:	package/libucl/
 
-N:	Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
-F:	package/cgroupfs-mount/
-
 N:	Noé Rubinstein <noe.rubinstein@gmail.com>
 F:	package/tpm-tools/
 F:	package/trousers/
 
+N:	Norbert Lange <nolange79@gmail.com>
+F:	package/tcf-agent/
+
 N:	Olaf Rempel <razzor@kopf-tisch.de>
 F:	package/ctorrent/
 
@@ -1133,6 +1329,8 @@ N:	Olivier Matz <olivier.matz@6wind.com>
 F:	package/python-pyelftools/
 
 N:	Olivier Schonken <olivier.schonken@gmail.com>
+F:	package/cups/
+F:	package/cups-filters/
 F:	package/ijs/
 F:	package/poppler/
 F:	package/qpdf/
@@ -1150,14 +1348,8 @@ F:	package/google-breakpad/
 N:	Patrick Gerber <kpa_info@yahoo.fr>
 F:	package/yavta/
 
-N:	Patrick Ziegler <patrick.ziegler@fh-kl.de>
-F:	package/aespipe/
-F:	package/libqmi/
-
-N:	Paul Cercueil <paul.cercueil@analog.com>
-F:	package/libiio/
-
 N:	Paul Cercueil <paul@crapouillou.net>
+F:	package/libiio/
 F:	package/lightning/
 
 N:	Pedro Aguilar <paguilar@paguilar.org>
@@ -1166,13 +1358,20 @@ F:	package/libunistring/
 N:	Peter Korsgaard <peter@korsgaard.com>
 F:	board/orangepi/
 F:	configs/orangepi_pc_defconfig
+F:	package/dump1090/
 F:	package/flickcurl/
+F:	package/fscryptctl/
+F:	package/jo/
+F:	package/jose/
 F:	package/libfastjson/
+F:	package/luksmeta/
 F:	package/lzop/
+F:	package/memtool/
 F:	package/mosquitto/
 F:	package/python-alsaaudio/
 F:	package/python-enum/
 F:	package/python-enum34/
+F:	package/python-functools32/
 F:	package/python-ipaddr/
 F:	package/python-pam/
 F:	package/python-psutil/
@@ -1201,9 +1400,23 @@ F:	package/sdl2_gfx/
 F:	package/sdl2_image/
 F:	package/sdl2_ttf/
 
+N:	Petr Kulhavy <brain@jikos.cz>
+F:	package/linuxptp/
+
 N:	Petr Vorel <petr.vorel@gmail.com>
+F:	package/connman/
+F:	package/feh/
+F:	package/imlib2/
+F:	package/iproute2/
+F:	package/iputils/
+F:	package/libmbim/
+F:	package/libqmi/
 F:	package/linux-backports/
 F:	package/ltp-testsuite/
+F:	package/modem-manager/
+F:	package/network-manager/
+F:	package/ofono/
+F:	package/python-networkmanager/
 
 N:	Phil Eichinger <phil.eichinger@gmail.com>
 F:	package/libqrencode/
@@ -1232,6 +1445,7 @@ F:	package/libvips/
 N:	Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
 F:	package/libdvbpsi/
 F:	package/mraa/
+F:	package/synergy/
 
 N:	Pranit Sirsat <Pranit.Sirsat@imgtec.com>
 F:	package/paho-mqtt-c/
@@ -1239,13 +1453,15 @@ F:	package/paho-mqtt-c/
 N:	Qais Yousef <Qais.Yousef@imgtec.com>
 F:	package/bellagio/
 
-N:	Rahul Bedarkar <rahul.bedarkar@imgtec.com>
+N:	Rahul Bedarkar <rahulbedarkar89@gmail.com>
 F:	package/cxxtest/
 F:	package/gflags/
 F:	package/glog/
 F:	package/gssdp/
 F:	package/gupnp/
 F:	package/gupnp-av/
+F:	package/let-me-create/
+F:	package/nanomsg/
 
 N:	Rahul Jain <rahul.jain@imgtec.com>
 F:	package/uhttpd/
@@ -1254,11 +1470,16 @@ F:	package/ustream-ssl/
 N:	Renaud Aubin <root@renaud.io>
 F:	package/libhttpparser/
 
+N:	Rhys Williams <github@wilberforce.co.nz>
+F:	package/lirc-tools/
+
 N:	Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
 F:	package/atop/
 
-N:	Rhys Williams <github@wilberforce.co.nz>
-F:	package/lirc-tools/
+N:	Ricardo Martincoski <ricardo.martincoski@gmail.com>
+F:	support/testing/
+F:	utils/check-package
+F:	utils/checkpackagelib/
 
 N:	Richard Braun <rbraun@sceen.net>
 F:	package/curlftpfs/
@@ -1268,6 +1489,9 @@ N:	Rico Bachmann <bachmann@tofwerk.com>
 F:	package/apr-util/
 F:	package/subversion/
 
+N:	RJ Ascani <rj.ascani@gmail.com>
+F:	package/azmq/
+
 N:	Rodrigo Rebello <rprebello@gmail.com>
 F:	package/chocolate-doom/
 F:	package/irssi/
@@ -1280,18 +1504,27 @@ F:	package/efl/
 F:	package/enlightenment/
 F:	package/expedite/
 F:	package/iqvlinux/
+F:	package/irrlicht/
 F:	package/liblinear/
+F:	package/lensfun/
+F:	package/libgta/
+F:	package/libspatialindex/
 F:	package/linux-syscall-support/
+F:	package/lugaru/
 F:	package/mcelog/
+F:	package/mesa3d/
+F:	package/minetest/
+F:	package/minetest-game/
 F:	package/openpowerlink/
+F:	package/physfs/
+F:	package/solarus/
 F:	package/stress-ng/
+F:	package/supertux/
+F:	package/supertuxkart/
 F:	package/terminology/
 F:	package/upower/
 F:	package/xenomai/
 
-N:	Romain Perier <romain.perier@free-electrons.com>
-F:	package/amd-catalyst/
-
 N:	Ryan Barnett <ryan.barnett@rockwellcollins.com>
 F:	package/atftp/
 F:	package/miraclecast/
@@ -1313,14 +1546,6 @@ F:	package/biosdevname/
 N:	Rémi Rérolle <remi.rerolle@gmail.com>
 F:	package/libfreeimage/
 
-N:	Sagaert Johan <sagaert.johan@skynet.be>
-F:	package/git/
-F:	package/gsl/
-F:	package/jquery-mobile/
-F:	package/libgsasl/
-F:	package/qdecoder/
-F:	package/qlibc/
-
 N:	Sam Bobroff <sam.bobroff@au1.ibm.com>
 F:	arch/Config.in.powerpc
 F:	package/librtas/
@@ -1356,12 +1581,43 @@ F:	package/kyua/
 F:	package/lutok/
 F:	package/yaml-cpp/
 
+N:	Semyon Kolganov <semenak94@mail.ru>
+F:	package/fmt/
+F:	package/libbson/
+F:	package/lua-resty-http/
+F:	package/mpir/
+
+N:	Sergey Matyukevich <geomatsi@gmail.com>
+F:	boot/arm-trusted-firmware/
+F:	boot/binaries-marvell/
+F:	boot/mv-ddr-marvell/
+F:	board/linksprite/pcduino
+F:	board/orangepi/orangepi-zero
+F:	board/orangepi/orangepi-one
+F:	board/orangepi/orangepi-pc-plus/
+F:	board/solidrun/macchiatobin
+F:	configs/linksprite_pcduino_defconfig
+F:	configs/orangepi_one_defconfig
+F:	configs/orangepi_pc_plus_defconfig
+F:	configs/orangepi_zero_defconfig
+F:	configs/solidrun_macchiatobin_mainline_defconfig
+F:	configs/solidrun_macchiatobin_marvell_defconfig
+F:	package/armbian-firmware/
+F:	package/rtl8189fs/
+F:	package/xr819-xradio/
+
 N:	Sergio Prado <sergio.prado@e-labworks.com>
+F:	package/aoetools/
+F:	package/curlpp/
+F:	package/daq/
 F:	package/libgdiplus/
 F:	package/mongodb/
+F:	package/pimd/
 F:	package/stella/
+F:	package/traceroute/
 F:	package/tunctl/
 F:	package/ubus/
+F:	package/wolfssl/
 
 N:	Simon Dawson <spdawson@gmail.com>
 F:	boot/at91bootstrap3/
@@ -1412,6 +1668,12 @@ F:	package/elfutils/
 F:	package/libtasn1/
 F:	package/proxychains-ng/
 F:	package/yasm/
+F:	package/zlib-ng/
+
+N:	Stefan Sørensen <stefan.sorensen@spectralink.com>
+F:	package/cracklib/
+F:	package/libpwquality/
+F:	package/libscrypt/
 
 N:	Stephan Hoffmann <sho@relinux.de>
 F:	package/cache-calibrator/
@@ -1437,13 +1699,15 @@ F:	package/tovid/
 F:	package/xorriso/
 
 N:	Steve Thomas <scjthm@live.com>
-F:	package/cloog/
 F:	package/isl/
 
 N:	Steven Noonan <steven@uplinklabs.net>
 F:	package/hwloc/
 F:	package/powertop/
 
+N:	Sven Haardiek <sven.haardiek@greenbone.net>
+F:	package/lcdproc/
+
 N:	Sven Neumann <neumann@teufel.de>
 F:	package/gstreamer1/gst1-libav/
 
@@ -1456,6 +1720,7 @@ N:	Sébastien Szymanski <sebastien.szymanski@armadeus.com>
 F:	package/mmc-utils/
 F:	package/python-flask-jsonrpc/
 F:	package/python-flask-login/
+F:	package/qt5/qt5charts/
 
 N:	Theo Debrouwere <t.debrouwere@televic.com>
 F:	package/pugixml/
@@ -1477,10 +1742,10 @@ N:	Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
 F:	docs/manual/
 F:	package/opkg-utils/
 F:	support/scripts/size-stats
-F:	support/scripts/size-stats-compare
+F:	utils/size-stats-compare
 F:	toolchain/
 
-N:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+N:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 F:	arch/Config.in.arm
 F:	boot/boot-wrapper-aarch64/
 F:	boot/grub2/
@@ -1521,7 +1786,6 @@ F:	package/ne10/
 F:	package/pkg-python.mk
 F:	package/pkg-autotools.mk
 F:	package/pkg-generic.mk
-F:	package/polarssl/
 F:	package/python/
 F:	package/python3/
 F:	package/python-mad/
@@ -1539,6 +1803,9 @@ F:	toolchain/
 N:	Tiago Brusamarello <tiago.brusamarello@datacom.ind.br>
 F:	package/aer-inject/
 
+N:	Timo Ketola <timo.ketola@exertus.fi>
+F:	package/fbgrab/
+
 N:	Tzu-Jung Lee <roylee17@gmail.com>
 F:	package/dropwatch/
 F:	package/tstools/
@@ -1559,15 +1826,19 @@ F:	package/openmpi/
 F:	package/pinentry/
 F:	package/trinity/
 
-N:	Vincent Stehlé <vincent.stehle@intel.com>
+N:	Vincent Stehlé <vincent.stehle@laposte.net>
 F:	package/i7z/
 F:	package/msr-tools/
+F:	package/pixz/
 
 N:	Vinicius Tinti <viniciustinti@gmail.com>
 F:	package/python-thrift/
 
+N:	Vivien Didelot <vivien.didelot@savoirfairelinux.com>
+F:	board/technologic/ts5500/
+F:	configs/ts5500_defconfig
+
 N:	Volkov Viacheslav <sv99@inbox.ru>
-F:	package/rfkill/
 F:	package/v4l2grab/
 F:	package/zbar/
 
@@ -1579,13 +1850,10 @@ F:	arch/Config.in.bfin
 F:	arch/Config.in.m68k
 F:	arch/Config.in.or1k
 F:	arch/Config.in.sparc
+F:	package/glibc/
+F:	package/mksh/
 F:	package/uclibc/
 F:	package/uclibc-ng-test/
-F:	package/mksh/
-
-N:	Waldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
-F:	package/ccid/
-F:	package/pcsc-lite/
 
 N:	Will Newton <will.newton@gmail.com>
 F:	package/enchant/
@@ -1594,9 +1862,6 @@ F:	package/libmicrohttpd/
 F:	package/sysprof/
 F:	package/time/
 
-N:	Will Newton <will.newton@imgtec.com>
-F:	package/numactl/
-
 N:	Will Wagner <will_wagner@carallon.com>
 F:	package/yaffs2utils/
 
@@ -1610,8 +1875,12 @@ N:	Wojciech Niziński <niziak@spox.org>
 F:	package/fwup/
 
 N:	Yann E. MORIN <yann.morin.1998@free.fr>
+F:	fs/squashfs/
+F:	package/asterisk/
 F:	package/cegui06/
 F:	package/celt051/
+F:	package/dahdi-linux/
+F:	package/dahdi-tools/
 F:	package/dtc/
 F:	package/dtv-scan-tables/
 F:	package/dvb-apps/
@@ -1622,11 +1891,14 @@ F:	package/libedit/
 F:	package/libgsm/
 F:	package/libinput/
 F:	package/libiscsi/
+F:	package/libpri/
 F:	package/libseccomp/
+F:	package/libss7/
+F:	package/linux-firmware/
 F:	package/linux-tools/
 F:	package/matchbox*
 F:	package/mesa3d-headers/
-F:	package/mke2img/
+F:	package/nbd/
 F:	package/nut/
 F:	package/nvidia-driver/
 F:	package/omxplayer/
@@ -1646,6 +1918,7 @@ F:	package/vde2/
 F:	package/w_scan/
 F:	package/wayland/
 F:	package/weston/
+F:	package/zisofs-tools/
 F:	support/download/
 
 N:	Yegor Yefremov <yegorslists@googlemail.com>
@@ -1675,6 +1948,8 @@ F:	package/linux-firmware/
 F:	package/modem-manager/
 F:	package/nuttcp/
 F:	package/parted/
+F:	package/phytool/
+F:	package/poco/
 F:	package/python*
 F:	package/ser2net/
 F:	package/socketcand/
@@ -1684,11 +1959,12 @@ F:	package/ti-utils/
 F:	package/x11r7/xapp_xconsole/
 F:	package/x11r7/xapp_xinput-calibrator/
 F:	package/zlog/
-F:	support/scripts/scanpypi
+F:	utils/scanpypi
 
-N:	Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+N:	Zoltan Gyarmati <zgyarmati@zgyarmati.de>
 F:	package/crudini/
 F:	package/grantlee/
+F:	package/proj/
 F:	package/python-configobj/
 F:	package/python-iniparse/
 F:	package/qjson/
diff --git a/bsp/buildroot/Makefile b/bsp/buildroot/Makefile
index e7bf2853..36614a8c 100644
--- a/bsp/buildroot/Makefile
+++ b/bsp/buildroot/Makefile
@@ -84,11 +84,12 @@ else # umask / $(CURDIR) / $(O)
 
 # This is our default rule, so must come first
 all:
+.PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2017.02.11
+export BR2_VERSION := 2018.02.6
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1523473000
+BR2_VERSION_EPOCH = 1538896000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -125,11 +126,11 @@ DATE := $(shell date +%Y%m%d)
 # Need to export it, so it can be got from environment in children (eg. mconf)
 export BR2_VERSION_FULL := $(BR2_VERSION)$(shell $(TOPDIR)/support/scripts/setlocalversion)
 
+# List of targets and target patterns for which .config doesn't need to be read in
 noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconfig \
-	defconfig %_defconfig allyesconfig allnoconfig silentoldconfig release \
+	defconfig %_defconfig allyesconfig allnoconfig alldefconfig silentoldconfig release \
 	randpackageconfig allyespackageconfig allnopackageconfig \
-	print-version olddefconfig distclean manual manual-html manual-split-html \
-	manual-pdf manual-text manual-epub
+	print-version olddefconfig distclean manual manual-%
 
 # Some global targets do not trigger a build, but are used to collect
 # metadata, or do various checks. When such targets are triggered,
@@ -140,7 +141,7 @@ noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconf
 # We're building in two situations: when MAKECMDGOALS is empty
 # (default target is to build), or when MAKECMDGOALS contains
 # something else than one of the nobuild_targets.
-nobuild_targets := source %-source source-check \
+nobuild_targets := source %-source \
 	legal-info %-legal-info external-deps _external-deps \
 	clean distclean help show-targets graph-depends \
 	%-graph-depends %-show-depends %-show-version \
@@ -362,6 +363,22 @@ ifneq ($(firstword $(HOSTCC_VERSION)),4)
 HOSTCC_VERSION := $(firstword $(HOSTCC_VERSION))
 endif
 
+ifeq ($(BR2_NEEDS_HOST_UTF8_LOCALE),y)
+# First, we try to use the user's configured locale (as that's the
+# language they'd expect messages to be displayed), then we favour
+# a non language-specific locale like C.UTF-8 if one is available,
+# so we sort with the C locale to get it at the top.
+# This is guaranteed to not be empty, because of the check in
+# support/dependencies/dependencies.sh
+HOST_UTF8_LOCALE := $(shell \
+			( echo $${LC_ALL:-$${LC_MESSAGES:-$${LANG}}}; \
+			  locale -a 2>/dev/null | LC_ALL=C sort \
+			) \
+			| grep -i -E 'utf-?8$$' \
+			| head -n 1)
+HOST_UTF8_LOCALE_ENV := LC_ALL=$(HOST_UTF8_LOCALE)
+endif
+
 # Make sure pkg-config doesn't look outside the buildroot tree
 HOST_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
 unexport PKG_CONFIG_PATH
@@ -439,14 +456,14 @@ TAR_OPTIONS = $(call qstrip,$(BR2_TAR_OPTIONS)) -xf
 HOST_DIR := $(call qstrip,$(BR2_HOST_DIR))
 
 # Quotes are needed for spaces and all in the original PATH content.
-BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin:$(PATH)"
+BR_PATH = "$(HOST_DIR)/bin:$(HOST_DIR)/sbin:$(PATH)"
 
 # Location of a file giving a big fat warning that output/target
 # should not be used as the root filesystem.
 TARGET_DIR_WARNING_FILE = $(TARGET_DIR)/THIS_IS_NOT_YOUR_ROOT_FILESYSTEM
 
 ifeq ($(BR2_CCACHE),y)
-CCACHE := $(HOST_DIR)/usr/bin/ccache
+CCACHE := $(HOST_DIR)/bin/ccache
 BR_CACHE_DIR ?= $(call qstrip,$(BR2_CCACHE_DIR))
 export BR_CACHE_DIR
 HOSTCC := $(CCACHE) $(HOSTCC)
@@ -478,7 +495,11 @@ all: world
 # may rely on it.
 include Makefile.legacy
 
+include system/system.mk
 include package/Makefile.in
+# arch/arch.mk.* must be after package/Makefile.in because it may need to
+# complement variables defined therein, like BR_NO_CHECK_HASH_FOR.
+-include $(sort $(wildcard arch/arch.mk.*))
 include support/dependencies/dependencies.mk
 
 PACKAGES += $(DEPENDENCIES_HOST_PREREQ)
@@ -537,22 +558,37 @@ $(foreach pkg,$(call UPPERCASE,$(PACKAGES)),\
 
 endif
 
+.PHONY: dirs
 dirs: $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BINARIES_DIR)
+	$(HOST_DIR) $(HOST_DIR)/usr $(HOST_DIR)/lib $(BINARIES_DIR)
 
 $(BUILD_DIR)/buildroot-config/auto.conf: $(BR2_CONFIG)
 	$(MAKE1) $(EXTRAMAKEARGS) HOSTCC="$(HOSTCC_NOCCACHE)" HOSTCXX="$(HOSTCXX_NOCCACHE)" silentoldconfig
 
+.PHONY: prepare
 prepare: $(BUILD_DIR)/buildroot-config/auto.conf
 
-rebuild: $(foreach pkg,$(PACKAGES),$(pkg)-clean-for-rebuild) world
-
+.PHONY: world
 world: target-post-image
 
-.PHONY: all world toolchain dirs clean distclean source outputmakefile \
-	legal-info legal-info-prepare legal-info-clean printvars help \
-	list-defconfigs target-finalize target-post-image source-check \
-	rebuild
+.PHONY: sdk
+sdk: world
+	@$(call MESSAGE,"Rendering the SDK relocatable")
+	$(TOPDIR)/support/scripts/fix-rpath host
+	$(TOPDIR)/support/scripts/fix-rpath staging
+	$(INSTALL) -m 755 $(TOPDIR)/support/misc/relocate-sdk.sh $(HOST_DIR)/relocate-sdk.sh
+	echo $(HOST_DIR) > $(HOST_DIR)/share/buildroot/sdk-location
+
+# Compatibility symlink in case a post-build script still uses $(HOST_DIR)/usr
+$(HOST_DIR)/usr: $(HOST_DIR)
+	@ln -snf . $@
+
+$(HOST_DIR)/lib: $(HOST_DIR)
+	@mkdir -p $@
+	@case $(HOSTARCH) in \
+		(*64) ln -snf lib $(@D)/lib64;; \
+		(*)   ln -snf lib $(@D)/lib32;; \
+	esac
 
 # Populating the staging with the base directories is handled by the skeleton package
 $(STAGING_DIR):
@@ -606,7 +642,7 @@ define GENERATE_GLIBC_LOCALES
 		fi ; \
 		echo "Generating locale $${inputfile}.$${charmap}" ; \
 		I18NPATH=$(STAGING_DIR)/usr/share/i18n:/usr/share/i18n \
-		$(HOST_DIR)/usr/bin/localedef \
+		$(HOST_DIR)/bin/localedef \
 			--prefix=$(TARGET_DIR) \
 			--$(call LOWERCASE,$(BR2_ENDIAN))-endian \
 			-i $${inputfile} -f $${charmap} \
@@ -656,8 +692,13 @@ endif
 
 $(TARGETS_ROOTFS): target-finalize
 
+.PHONY: target-finalize
 target-finalize: $(PACKAGES)
 	@$(call MESSAGE,"Finalizing target directory")
+	# Check files that are touched by more than one package
+	./support/scripts/check-uniq-files -t target $(BUILD_DIR)/packages-file-list.txt
+	./support/scripts/check-uniq-files -t staging $(BUILD_DIR)/packages-file-list-staging.txt
+	./support/scripts/check-uniq-files -t host $(BUILD_DIR)/packages-file-list-host.txt
 	$(foreach hook,$(TARGET_FINALIZE_HOOKS),$($(hook))$(sep))
 	rm -rf $(TARGET_DIR)/usr/include $(TARGET_DIR)/usr/share/aclocal \
 		$(TARGET_DIR)/usr/lib/pkgconfig $(TARGET_DIR)/usr/share/pkgconfig \
@@ -704,7 +745,11 @@ endif
 		echo "ID=buildroot"; \
 		echo "VERSION_ID=$(BR2_VERSION)"; \
 		echo "PRETTY_NAME=\"Buildroot $(BR2_VERSION)\"" \
-	) >  $(TARGET_DIR)/etc/os-release
+	) >  $(TARGET_DIR)/usr/lib/os-release
+	ln -sf ../usr/lib/os-release $(TARGET_DIR)/etc
+
+	@$(call MESSAGE,"Sanitizing RPATH in target tree")
+	$(TOPDIR)/support/scripts/fix-rpath target
 
 	@$(foreach d, $(call qstrip,$(BR2_ROOTFS_OVERLAY)), \
 		$(call MESSAGE,"Copying overlay $(d)"); \
@@ -716,32 +761,37 @@ endif
 		$(call MESSAGE,"Executing post-build script $(s)"); \
 		$(EXTRA_ENV) $(s) $(TARGET_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
 
+	touch $(TARGET_DIR)/usr
+
+.PHONY: target-post-image
 target-post-image: $(TARGETS_ROOTFS) target-finalize
 	@$(foreach s, $(call qstrip,$(BR2_ROOTFS_POST_IMAGE_SCRIPT)), \
 		$(call MESSAGE,"Executing post-image script $(s)"); \
 		$(EXTRA_ENV) $(s) $(BINARIES_DIR) $(call qstrip,$(BR2_ROOTFS_POST_SCRIPT_ARGS))$(sep))
 
+.PHONY: source
 source: $(foreach p,$(PACKAGES),$(p)-all-source)
 
+.PHONY: _external-deps external-deps
 _external-deps: $(foreach p,$(PACKAGES),$(p)-all-external-deps)
 external-deps:
 	@$(MAKE1) -Bs $(EXTRAMAKEARGS) _external-deps | sort -u
 
-# check if download URLs are outdated
-source-check: $(foreach p,$(PACKAGES),$(p)-all-source-check)
-
+.PHONY: legal-info-clean
 legal-info-clean:
 	@rm -fr $(LEGAL_INFO_DIR)
 
+.PHONY: legal-info-prepare
 legal-info-prepare: $(LEGAL_INFO_DIR)
-	@$(call MESSAGE,"Collecting legal info")
-	@$(call legal-license-file,buildroot,COPYING,COPYING,HOST)
+	@$(call MESSAGE,"Buildroot $(BR2_VERSION_FULL) Collecting legal info")
+	@$(call legal-license-file,buildroot,buildroot,support/legal-info,COPYING,COPYING,HOST)
 	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,TARGET)
 	@$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,SOURCE SITE,HOST)
-	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved,not saved,HOST)
+	@$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPL-2.0+,COPYING,not saved,not saved,HOST)
 	@$(call legal-warning,the Buildroot source code has not been saved)
 	@cp $(BR2_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
 
+.PHONY: legal-info
 legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p)-all-legal-info) \
 		$(REDIST_SOURCES_DIR_TARGET) $(REDIST_SOURCES_DIR_HOST)
 	@cat support/legal-info/README.header >>$(LEGAL_REPORT)
@@ -756,9 +806,14 @@ legal-info: dirs legal-info-clean legal-info-prepare $(foreach p,$(PACKAGES),$(p
 		mv .legal-info.sha256 legal-info.sha256)
 	@echo "Legal info produced in $(LEGAL_INFO_DIR)"
 
+.PHONY: show-targets
 show-targets:
-	@echo $(PACKAGES) $(TARGETS_ROOTFS)
+	@echo $(sort $(PACKAGES)) $(sort $(TARGETS_ROOTFS))
 
+.PHONY: show-build-order
+show-build-order: $(patsubst %,%-show-build-order,$(PACKAGES))
+
+.PHONY: graph-build
 graph-build: $(O)/build/build-time.log
 	@install -d $(GRAPHS_DIR)
 	$(foreach o,name build duration,./support/scripts/graph-build-time \
@@ -770,10 +825,12 @@ graph-build: $(O)/build/build-time.log
 				   --output=$(GRAPHS_DIR)/build.pie-$(t).$(BR_GRAPH_OUT) \
 				   $(if $(BR2_GRAPH_ALT),--alternate-colors)$(sep))
 
+.PHONY: graph-depends-requirements
 graph-depends-requirements:
 	@dot -? >/dev/null 2>&1 || \
 		{ echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; }
 
+.PHONY: graph-depends
 graph-depends: graph-depends-requirements
 	@$(INSTALL) -d $(GRAPHS_DIR)
 	@cd "$(CONFIG_DIR)"; \
@@ -783,6 +840,7 @@ graph-depends: graph-depends-requirements
 		-o $(GRAPHS_DIR)/$(@).$(BR_GRAPH_OUT) \
 		$(GRAPHS_DIR)/$(@).dot
 
+.PHONY: graph-size
 graph-size:
 	$(Q)mkdir -p $(GRAPHS_DIR)
 	$(Q)$(TOPDIR)/support/scripts/size-stats --builddir $(BASE_DIR) \
@@ -790,13 +848,21 @@ graph-size:
 		--file-size-csv $(GRAPHS_DIR)/file-size-stats.csv \
 		--package-size-csv $(GRAPHS_DIR)/package-size-stats.csv
 
+.PHONY: check-dependencies
 check-dependencies:
 	@cd "$(CONFIG_DIR)"; \
 	$(TOPDIR)/support/scripts/graph-depends -C
 
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
-all: menuconfig
+# Some subdirectories are also package names. To avoid that "make linux"
+# on an unconfigured tree produces "Nothing to be done", add an explicit
+# rule for it.
+# Also for 'all' we error out and ask the user to configure first.
+.PHONY: linux toolchain
+linux toolchain all: outputmakefile
+	$(error Please configure Buildroot first (e.g. "make menuconfig"))
+	@exit 1
 
 endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
@@ -848,50 +914,20 @@ config: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 # no values are set for the legacy options so a subsequent oldconfig
 # will query them. Therefore, run an additional olddefconfig.
 
-oldconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@$(COMMON_CONFIG_ENV) $< --oldconfig $(CONFIG_CONFIG_IN)
-
-randconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --randconfig $(CONFIG_CONFIG_IN)
+randconfig allyesconfig alldefconfig allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --$@ $(CONFIG_CONFIG_IN)
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
 
-allyesconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --allyesconfig $(CONFIG_CONFIG_IN)
-	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
-
-allnoconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y $< --allnoconfig $(CONFIG_CONFIG_IN)
-	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
-
-randpackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+randpackageconfig allyespackageconfig allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
 		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
-		$< --randconfig $(CONFIG_CONFIG_IN)
+		$< --$(subst package,,$@) $(CONFIG_CONFIG_IN)
 	@rm -f $(CONFIG_DIR)/.config.nopkg
 	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
 
-allyespackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
-	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
-		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
-		$< --allyesconfig $(CONFIG_CONFIG_IN)
-	@rm -f $(CONFIG_DIR)/.config.nopkg
-	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
-
-allnopackageconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	@grep -v BR2_PACKAGE_ $(BR2_CONFIG) > $(CONFIG_DIR)/.config.nopkg
-	@$(COMMON_CONFIG_ENV) SKIP_LEGACY=y \
-		KCONFIG_ALLCONFIG=$(CONFIG_DIR)/.config.nopkg \
-		$< --allnoconfig $(CONFIG_CONFIG_IN)
-	@rm -f $(CONFIG_DIR)/.config.nopkg
-	@$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN) >/dev/null
-
-silentoldconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	$(COMMON_CONFIG_ENV) $< --silentoldconfig $(CONFIG_CONFIG_IN)
-
-olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
-	$(COMMON_CONFIG_ENV) $< --olddefconfig $(CONFIG_CONFIG_IN)
+oldconfig silentoldconfig olddefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
+	@$(COMMON_CONFIG_ENV) $< --$@ $(CONFIG_CONFIG_IN)
 
 defconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 	@$(COMMON_CONFIG_ENV) $< --defconfig$(if $(DEFCONFIG),=$(DEFCONFIG)) $(CONFIG_CONFIG_IN)
@@ -921,6 +957,7 @@ savedefconfig: $(BUILD_DIR)/buildroot-config/conf prepare-kconfig
 # outputmakefile generates a Makefile in the output directory, if using a
 # separate output directory. This allows convenient use of make in the
 # output directory.
+.PHONY: outputmakefile
 outputmakefile:
 ifeq ($(NEED_WRAPPER),y)
 	$(Q)$(TOPDIR)/support/scripts/mkmakefile $(TOPDIR) $(O)
@@ -937,18 +974,25 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
 # Makefiles. Alternatively, if a non-empty VARS variable is passed,
 # only the variables matching the make pattern passed in VARS are
 # displayed.
+.PHONY: printvars
 printvars:
-	@$(foreach V, \
+	@:
+	$(foreach V, \
 		$(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \
 		$(if $(filter-out environment% default automatic, \
 				$(origin $V)), \
-		$(info $V=$($V) ($(value $V)))))
+		$(if $(QUOTED_VARS),\
+			$(info $V='$(subst ','\'',$(if $(RAW_VARS),$(value $V),$($V)))'), \
+			$(info $V=$(if $(RAW_VARS),$(value $V),$($V))))))
+# ' Syntax colouring...
 
+.PHONY: clean
 clean:
 	rm -rf $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
 		$(BUILD_DIR) $(BASE_DIR)/staging \
 		$(LEGAL_INFO_DIR) $(GRAPHS_DIR)
 
+.PHONY: distclean
 distclean: clean
 ifeq ($(O),$(CURDIR)/output)
 	rm -rf $(O)
@@ -956,6 +1000,7 @@ endif
 	rm -rf $(TOPDIR)/dl $(BR2_CONFIG) $(CONFIG_DIR)/.config.old $(CONFIG_DIR)/..config.tmp \
 		$(CONFIG_DIR)/.auto.deps $(BR2_EXTERNAL_FILE)
 
+.PHONY: help
 help:
 	@echo 'Cleaning:'
 	@echo '  clean                  - delete all files created by build'
@@ -964,6 +1009,7 @@ help:
 	@echo 'Build:'
 	@echo '  all                    - make world'
 	@echo '  toolchain              - build toolchain'
+	@echo '  sdk                    - build relocatable SDK'
 	@echo
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
@@ -974,11 +1020,12 @@ help:
 	@echo '  silentoldconfig        - Same as oldconfig, but quietly, additionally update deps'
 	@echo '  olddefconfig           - Same as silentoldconfig but sets new symbols to their default value'
 	@echo '  randconfig             - New config with random answer to all options'
-	@echo '  defconfig              - New config with default answer to all options'
-	@echo '                             BR2_DEFCONFIG, if set, is used as input'
+	@echo '  defconfig              - New config with default answer to all options;'
+	@echo '                             BR2_DEFCONFIG, if set on the command line, is used as input'
 	@echo '  savedefconfig          - Save current config to BR2_DEFCONFIG (minimal config)'
 	@echo '  allyesconfig           - New config where all options are accepted with yes'
 	@echo '  allnoconfig            - New config where all options are answered with no'
+	@echo '  alldefconfig           - New config where all options are set to default'
 	@echo '  randpackageconfig      - New config with random answer to package options'
 	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
 	@echo '  allnopackageconfig     - New config where package options are answered with no'
@@ -1017,9 +1064,9 @@ help:
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
-	@echo '  source-check           - check selected packages for valid download URLs'
 	@echo '  external-deps          - list external packages used'
 	@echo '  legal-info             - generate info about license compliance'
+	@echo '  printvars              - dump all the internal variables'
 	@echo
 	@echo '  make V=0|1             - 0 => quiet build (default), 1 => verbose build'
 	@echo '  make O=dir             - Locate all output files in "dir", including .config'
@@ -1051,6 +1098,7 @@ endef
 
 # We iterate over BR2_EXTERNAL_NAMES rather than BR2_EXTERNAL_DIRS,
 # because we want to display the name of the br2-external tree.
+.PHONY: list-defconfigs
 list-defconfigs:
 	$(call list-defconfigs,$(TOPDIR))
 	$(foreach name,$(BR2_EXTERNAL_NAMES),\
@@ -1073,6 +1121,12 @@ release:
 print-version:
 	@echo $(BR2_VERSION_FULL)
 
+.PHONY: .gitlab-ci.yml
+.gitlab-ci.yml: .gitlab-ci.yml.in
+	cp $< $@
+	(cd configs; LC_ALL=C ls -1 *_defconfig) | sed 's/$$/: *defconfig/' >> $@
+	./support/testing/run-tests -l 2>&1 | sed -r -e '/^test_run \((.*)\).*/!d; s//\1: *runtime_test/' | LC_ALL=C sort >> $@
+
 include docs/manual/manual.mk
 -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(sort $(wildcard $(dir)/docs/*/*.mk)))
 
diff --git a/bsp/buildroot/VERSION b/bsp/buildroot/VERSION
index 152278ce..e5a2805c 100644
--- a/bsp/buildroot/VERSION
+++ b/bsp/buildroot/VERSION
@@ -1 +1 @@
-buildroot 2017_02_11
+buildroot 2018_02_6
diff --git a/bsp/buildroot/arch/Config.in b/bsp/buildroot/arch/Config.in
index 7149b2cb..d3f63da3 100644
--- a/bsp/buildroot/arch/Config.in
+++ b/bsp/buildroot/arch/Config.in
@@ -79,12 +79,22 @@ config BR2_aarch64_be
 config BR2_bfin
 	bool "Blackfin"
 	select BR2_ARCH_HAS_FDPIC_SUPPORT
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	help
 	  The Blackfin is a family of 16 or 32-bit microprocessors developed,
 	  manufactured and marketed by Analog Devices.
 	  http://www.analog.com/
 	  http://en.wikipedia.org/wiki/Blackfin
 
+config BR2_csky
+	bool "csky"
+	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
+	select BR2_ARCH_HAS_MMU_MANDATORY
+	help
+	  csky is processor IP from china.
+	  http://www.c-sky.com/
+	  http://www.github.com/c-sky
+
 config BR2_i386
 	bool "i386"
 	select BR2_ARCH_HAS_MMU_MANDATORY
@@ -242,6 +252,37 @@ config BR2_xtensa
 
 endchoice
 
+# For some architectures or specific cores, our internal toolchain
+# backend is not suitable (like, missing support in upstream gcc, or
+# no ChipCo fork exists...)
+config BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
+	bool
+
+config BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
+	bool
+	default y if !BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
+
+# The following symbols are selected by the individual
+# Config.in.$ARCH files
+config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
+	bool
+
+config BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
+	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
+
+config BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
+
+config BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+
+config BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+
 # The following string values are defined by the individual
 # Config.in.$ARCH files
 config BR2_ARCH
@@ -256,6 +297,12 @@ config BR2_GCC_TARGET_ARCH
 config BR2_GCC_TARGET_ABI
 	string
 
+config BR2_GCC_TARGET_NAN
+	string
+
+config BR2_GCC_TARGET_FP32_MODE
+	string
+
 config BR2_GCC_TARGET_CPU
 	string
 
@@ -284,6 +331,12 @@ config BR2_GCC_TARGET_MODE
 config BR2_BINFMT_SUPPORTS_SHARED
 	bool
 
+# Must match the name of the architecture from readelf point of view,
+# i.e the "Machine:" field of readelf output. See get_machine_name()
+# in binutils/readelf.c for the list of possible values.
+config BR2_READELF_ARCH_NAME
+	string
+
 # Set up target binary format
 choice
 	prompt "Target Binary Format"
@@ -369,6 +422,10 @@ if BR2_bfin
 source "arch/Config.in.bfin"
 endif
 
+if BR2_csky
+source "arch/Config.in.csky"
+endif
+
 if BR2_m68k
 source "arch/Config.in.m68k"
 endif
diff --git a/bsp/buildroot/arch/Config.in.arc b/bsp/buildroot/arch/Config.in.arc
index 7d341f31..92503a01 100644
--- a/bsp/buildroot/arch/Config.in.arc
+++ b/bsp/buildroot/arch/Config.in.arc
@@ -38,6 +38,10 @@ config BR2_GCC_TARGET_CPU
 	default "arc700" if BR2_arc770d
 	default "archs"	 if BR2_archs38
 
+config BR2_READELF_ARCH_NAME
+	default "ARCompact"	if BR2_arc750d || BR2_arc770d
+	default "ARCv2"		if BR2_archs38
+
 choice
 	prompt "MMU Page Size"
 	default BR2_ARC_PAGE_SIZE_8K
diff --git a/bsp/buildroot/arch/Config.in.arm b/bsp/buildroot/arch/Config.in.arm
index 596921df..b05e83e3 100644
--- a/bsp/buildroot/arch/Config.in.arm
+++ b/bsp/buildroot/arch/Config.in.arm
@@ -59,29 +59,42 @@ config BR2_ARM_CPU_ARMV7A
 config BR2_ARM_CPU_ARMV7M
 	bool
 
-config BR2_ARM_CPU_ARMV8
+config BR2_ARM_CPU_ARMV8A
 	bool
 
 choice
 	prompt "Target Architecture Variant"
+	default BR2_cortex_a53 if BR2_ARCH_IS_64
 	default BR2_arm926t
 	help
 	  Specific CPU variant to use
 
+if !BR2_ARCH_IS_64
+comment "armv4 cores"
 config BR2_arm920t
 	bool "arm920t"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV4
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_arm922t
 	bool "arm922t"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV4
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
+config BR2_fa526
+	bool "fa526/626"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_strongarm
+	bool "strongarm sa110/sa1100"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+
+comment "armv5 cores"
 config BR2_arm926t
 	bool "arm926t"
 	select BR2_ARM_CPU_HAS_ARM
@@ -89,14 +102,25 @@ config BR2_arm926t
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV5
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
+config BR2_iwmmxt
+	bool "iwmmxt"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_xscale
+	bool "xscale"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_THUMB
+	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+
+comment "armv6 cores"
 config BR2_arm1136j_s
 	bool "arm1136j-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_arm1136jf_s
 	bool "arm1136jf-s"
 	select BR2_ARM_CPU_HAS_ARM
@@ -104,14 +128,12 @@ config BR2_arm1136jf_s
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_arm1176jz_s
 	bool "arm1176jz-s"
 	select BR2_ARM_CPU_HAS_ARM
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_arm1176jzf_s
 	bool "arm1176jzf-s"
 	select BR2_ARM_CPU_HAS_ARM
@@ -119,7 +141,6 @@ config BR2_arm1176jzf_s
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_arm11mpcore
 	bool "mpcore"
 	select BR2_ARM_CPU_HAS_ARM
@@ -127,7 +148,8 @@ config BR2_arm11mpcore
 	select BR2_ARM_CPU_HAS_THUMB
 	select BR2_ARM_CPU_ARMV6
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
+
+comment "armv7a cores"
 config BR2_cortex_a5
 	bool "cortex-A5"
 	select BR2_ARM_CPU_HAS_ARM
@@ -136,7 +158,6 @@ config BR2_cortex_a5
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a7
 	bool "cortex-A7"
 	select BR2_ARM_CPU_HAS_ARM
@@ -145,7 +166,6 @@ config BR2_cortex_a7
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a8
 	bool "cortex-A8"
 	select BR2_ARM_CPU_HAS_ARM
@@ -154,7 +174,6 @@ config BR2_cortex_a8
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a9
 	bool "cortex-A9"
 	select BR2_ARM_CPU_HAS_ARM
@@ -163,7 +182,6 @@ config BR2_cortex_a9
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a12
 	bool "cortex-A12"
 	select BR2_ARM_CPU_HAS_ARM
@@ -172,7 +190,6 @@ config BR2_cortex_a12
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
 config BR2_cortex_a15
 	bool "cortex-A15"
 	select BR2_ARM_CPU_HAS_ARM
@@ -181,7 +198,15 @@ config BR2_cortex_a15
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
+config BR2_cortex_a15_a7
+	bool "cortex-A15/A7 big.LITTLE"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_NEON
+	select BR2_ARM_CPU_HAS_VFPV4
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 config BR2_cortex_a17
 	bool "cortex-A17"
 	select BR2_ARM_CPU_HAS_ARM
@@ -190,14 +215,61 @@ config BR2_cortex_a17
 	select BR2_ARM_CPU_HAS_THUMB2
 	select BR2_ARM_CPU_ARMV7A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+config BR2_cortex_a17_a7
+	bool "cortex-A17/A7 big.LITTLE"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_NEON
+	select BR2_ARM_CPU_HAS_VFPV4
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+config BR2_pj4
+	bool "pj4"
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_VFPV3
+	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+
+comment "armv7m cores"
+config BR2_cortex_m3
+	bool "cortex-M3"
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_ARMV7M
+config BR2_cortex_m4
+	bool "cortex-M4"
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_ARMV7M
+endif # !BR2_ARCH_IS_64
+
+comment "armv8 cores"
+config BR2_cortex_a32
+	bool "cortex-A32"
 	depends on !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_ARM
+	select BR2_ARM_CPU_HAS_NEON
+	select BR2_ARM_CPU_HAS_THUMB2
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+config BR2_cortex_a35
+	bool "cortex-A35"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a53
 	bool "cortex-A53"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 config BR2_cortex_a57
 	bool "cortex-A57"
@@ -205,58 +277,161 @@ config BR2_cortex_a57
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
+config BR2_cortex_a57_a53
+	bool "cortex-A57/A53 big.LITTLE"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_cortex_a72
 	bool "cortex-A72"
 	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
 	select BR2_ARM_CPU_HAS_FP_ARMV8
-	select BR2_ARM_CPU_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-config BR2_cortex_m3
-	bool "cortex-M3"
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_ARMV7M
-	depends on !BR2_ARCH_IS_64
-config BR2_cortex_m4
-	bool "cortex-M4"
-	select BR2_ARM_CPU_HAS_THUMB2
-	select BR2_ARM_CPU_ARMV7M
-	depends on !BR2_ARCH_IS_64
-config BR2_fa526
-	bool "fa526/626"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+config BR2_cortex_a72_a53
+	bool "cortex-A72/A53 big.LITTLE"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
-config BR2_pj4
-	bool "pj4"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_VFPV3
-	select BR2_ARM_CPU_ARMV7A
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+config BR2_cortex_a73
+	bool "cortex-A73"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
-config BR2_strongarm
-	bool "strongarm sa110/sa1100"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_ARMV4
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_cortex_a73_a35
+	bool "cortex-A73/A35 big.LITTLE"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
-config BR2_xscale
-	bool "xscale"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_HAS_THUMB
-	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_cortex_a73_a53
+	bool "cortex-A73/A53 big.LITTLE"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
-config BR2_iwmmxt
-	bool "iwmmxt"
-	select BR2_ARM_CPU_HAS_ARM
-	select BR2_ARM_CPU_ARMV5
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_exynos_m1
+	bool "exynos-m1"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
 	select BR2_ARCH_HAS_MMU_OPTIONAL
-	depends on !BR2_ARCH_IS_64
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+config BR2_falkor
+	bool "falkor"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_qdf24xx
+	bool "qdf24xx"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+if BR2_ARCH_IS_64
+config BR2_thunderx
+	bool "thunderx"
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+config BR2_thunderxt81
+	bool "thunderxt81"
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_thunderxt83
+	bool "thunderxt83"
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_thunderxt88
+	bool "thunderxt88"
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_thunderxt88p1
+	bool "thunderxt88p1"
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+endif # BR2_ARCH_IS_64
+config BR2_xgene1
+	bool "xgene1"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+
+if BR2_ARCH_IS_64
+comment "armv8.1a cores"
+config BR2_thunderx2t99
+	bool "thunderx2t99"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_thunderx2t99p1
+	bool "thunderx2t99p1"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+config BR2_vulcan
+	bool "vulcan"
+	select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64
+	select BR2_ARM_CPU_HAS_FP_ARMV8
+	select BR2_ARM_CPU_ARMV8A
+	select BR2_ARCH_HAS_MMU_OPTIONAL
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+endif # BR2_ARCH_IS_64
 endchoice
 
 config BR2_ARM_ENABLE_NEON
@@ -511,32 +686,60 @@ config BR2_ENDIAN
 	default "BIG"	 if (BR2_armeb || BR2_aarch64_be)
 
 config BR2_GCC_TARGET_CPU
+	# armv4
 	default "arm920t"	if BR2_arm920t
 	default "arm922t"	if BR2_arm922t
+	default "fa526"		if BR2_fa526
+	default "strongarm"	if BR2_strongarm
+	# armv5
 	default "arm926ej-s"	if BR2_arm926t
+	default "iwmmxt"	if BR2_iwmmxt
+	default "xscale"	if BR2_xscale
+	# armv6
 	default "arm1136j-s"	if BR2_arm1136j_s
 	default "arm1136jf-s"	if BR2_arm1136jf_s
 	default "arm1176jz-s"	if BR2_arm1176jz_s
 	default "arm1176jzf-s"	if BR2_arm1176jzf_s
 	default "mpcore"	if BR2_arm11mpcore && BR2_ARM_CPU_HAS_VFPV2
 	default "mpcorenovfp"	if BR2_arm11mpcore
+	# armv7a
 	default "cortex-a5"	if BR2_cortex_a5
 	default "cortex-a7"	if BR2_cortex_a7
 	default "cortex-a8"	if BR2_cortex_a8
 	default "cortex-a9"	if BR2_cortex_a9
 	default "cortex-a12"	if BR2_cortex_a12
 	default "cortex-a15"	if BR2_cortex_a15
+	default "cortex-a15.cortex-a7"	if BR2_cortex_a15_a7
 	default "cortex-a17"	if BR2_cortex_a17
+	default "cortex-a17.cortex-a7"	if BR2_cortex_a17_a7
+	default "marvell-pj4"	if BR2_pj4
+	# armv7m
 	default "cortex-m3"	if BR2_cortex_m3
 	default "cortex-m4"	if BR2_cortex_m4
-	default "fa526"		if BR2_fa526
-	default "marvell-pj4"	if BR2_pj4
-	default "strongarm"	if BR2_strongarm
-	default "xscale"	if BR2_xscale
-	default "iwmmxt"	if BR2_iwmmxt
+	# armv8a
+	default "cortex-a32"	if BR2_cortex_a32
+	default "cortex-a35"	if BR2_cortex_a35
 	default "cortex-a53"	if BR2_cortex_a53
 	default "cortex-a57"	if BR2_cortex_a57
+	default "cortex-a57.cortex-a53"	if BR2_cortex_a57_a53
 	default "cortex-a72"	if BR2_cortex_a72
+	default "cortex-a72.cortex-a53"	if BR2_cortex_a72_a53
+	default "cortex-a73"	if BR2_cortex_a73
+	default "cortex-a73.cortex-a35"	if BR2_cortex_a73_a35
+	default "cortex-a73.cortex-a53"	if BR2_cortex_a73_a53
+	default "exynos-m1"	if BR2_exynos_m1
+	default "falkor"	if BR2_falkor
+	default "qdf24xx"	if BR2_qdf24xx
+	default "thunderx"	if BR2_thunderx
+	default "thunderxt81"	if BR2_thunderxt81
+	default "thunderxt83"	if BR2_thunderxt83
+	default "thunderxt88"	if BR2_thunderxt88
+	default "thunderxt88p1"	if BR2_thunderxt88p1
+	default "xgene1"	if BR2_xgene1
+	# armv8.1a
+	default "thunderx2t99"	if BR2_thunderx2t99
+	default "thunderx2t99p1"	if BR2_thunderx2t99p1
+	default "vulcan"	if BR2_vulcan
 
 config BR2_GCC_TARGET_ABI
 	default "aapcs-linux"	if BR2_arm || BR2_armeb
@@ -546,11 +749,11 @@ config BR2_GCC_TARGET_FPU
 	depends on BR2_arm || BR2_armeb
 	default "vfp"		if BR2_ARM_FPU_VFPV2
 	default "vfpv3"		if BR2_ARM_FPU_VFPV3
-	default "vfpv3-d16" 	if BR2_ARM_FPU_VFPV3D16
-	default "vfpv4" 	if BR2_ARM_FPU_VFPV4
-	default "vfpv4-d16" 	if BR2_ARM_FPU_VFPV4D16
-	default "neon" 		if BR2_ARM_FPU_NEON
-	default "neon-vfpv4" 	if BR2_ARM_FPU_NEON_VFPV4
+	default "vfpv3-d16"	if BR2_ARM_FPU_VFPV3D16
+	default "vfpv4"		if BR2_ARM_FPU_VFPV4
+	default "vfpv4-d16"	if BR2_ARM_FPU_VFPV4D16
+	default "neon"		if BR2_ARM_FPU_NEON
+	default "neon-vfpv4"	if BR2_ARM_FPU_NEON_VFPV4
 	default "fp-armv8"	if BR2_ARM_FPU_FP_ARMV8
 	default "neon-fp-armv8"	if BR2_ARM_FPU_NEON_FP_ARMV8
 
@@ -562,3 +765,7 @@ config BR2_GCC_TARGET_FLOAT_ABI
 config BR2_GCC_TARGET_MODE
 	default "arm"		if BR2_ARM_INSTRUCTIONS_ARM
 	default "thumb"		if BR2_ARM_INSTRUCTIONS_THUMB || BR2_ARM_INSTRUCTIONS_THUMB2
+
+config BR2_READELF_ARCH_NAME
+	default "ARM"		if BR2_arm || BR2_armeb
+	default "AArch64"	if BR2_aarch64 || BR2_aarch64_be
diff --git a/bsp/buildroot/arch/Config.in.bfin b/bsp/buildroot/arch/Config.in.bfin
index 9f7056a6..bd9589c7 100644
--- a/bsp/buildroot/arch/Config.in.bfin
+++ b/bsp/buildroot/arch/Config.in.bfin
@@ -4,14 +4,6 @@ choice
 	default BR2_bf532
 	help
 	  Specify target CPU
-config BR2_bf606
-	bool "bf606"
-config BR2_bf607
-	bool "bf607"
-config BR2_bf608
-	bool "bf608"
-config BR2_bf609
-	bool "bf609"
 config BR2_bf512
 	bool "bf512"
 config BR2_bf514
@@ -105,3 +97,6 @@ config BR2_GCC_TARGET_CPU_REVISION
 	  value of the -mcpu option. For example, if the selected CPU is
 	  bf609, and then selected CPU revision is "0.0", then gcc will
 	  receive the -mcpu=bf609-0.0 option.
+
+config BR2_READELF_ARCH_NAME
+	default "Analog Devices Blackfin"
diff --git a/bsp/buildroot/arch/Config.in.csky b/bsp/buildroot/arch/Config.in.csky
new file mode 100644
index 00000000..e88e4e2d
--- /dev/null
+++ b/bsp/buildroot/arch/Config.in.csky
@@ -0,0 +1,48 @@
+choice
+	prompt "Target Architecture Variant"
+	default BR2_ck610
+	help
+	  Specific CPU variant to use
+
+config BR2_ck610
+	bool "ck610"
+
+config BR2_ck807
+	bool "ck807"
+
+config BR2_ck810
+	bool "ck810"
+
+endchoice
+
+config BR2_CSKY_FPU
+	bool "Enable FPU coprocessor"
+	depends on BR2_ck810 || BR2_ck807
+	help
+	  You can say N here if your C-SKY CPU doesn't have a
+	  Floating-Point Coprocessor or if you don't need FPU support
+	  for your user-space programs.
+
+config BR2_CSKY_DSP
+	bool "Enable DSP enhanced instructions"
+	depends on BR2_ck810 || BR2_ck807
+
+config BR2_ARCH
+	default "csky"
+
+config BR2_ENDIAN
+	default "LITTLE"
+
+config BR2_GCC_TARGET_CPU
+	default "ck610"		if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807"		if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807e"	if (BR2_ck807 && !BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck807f"	if (BR2_ck807 &&  BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck807ef"	if (BR2_ck807 &&  BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck810"		if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck810e"	if (BR2_ck810 && !BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+	default "ck810f"	if (BR2_ck810 &&  BR2_CSKY_FPU && !BR2_CSKY_DSP)
+	default "ck810ef"	if (BR2_ck810 &&  BR2_CSKY_FPU &&  BR2_CSKY_DSP)
+
+config BR2_READELF_ARCH_NAME
+	default "CSKY"
diff --git a/bsp/buildroot/arch/Config.in.m68k b/bsp/buildroot/arch/Config.in.m68k
index ced871f5..c56031cb 100644
--- a/bsp/buildroot/arch/Config.in.m68k
+++ b/bsp/buildroot/arch/Config.in.m68k
@@ -35,3 +35,6 @@ endchoice
 config BR2_GCC_TARGET_CPU
 	default "68040"		if BR2_m68k_68040
 	default "5208"		if BR2_m68k_cf5208
+
+config BR2_READELF_ARCH_NAME
+	default "MC68000"
diff --git a/bsp/buildroot/arch/Config.in.microblaze b/bsp/buildroot/arch/Config.in.microblaze
index 2d4c1fec..042712a1 100644
--- a/bsp/buildroot/arch/Config.in.microblaze
+++ b/bsp/buildroot/arch/Config.in.microblaze
@@ -6,6 +6,9 @@ config BR2_ENDIAN
 	default "LITTLE" if BR2_microblazeel
 	default "BIG"	 if BR2_microblazebe
 
+config BR2_READELF_ARCH_NAME
+	default "Xilinx MicroBlaze"
+
 config BR2_microblaze
 	bool
 	default y if BR2_microblazeel || BR2_microblazebe
diff --git a/bsp/buildroot/arch/Config.in.mips b/bsp/buildroot/arch/Config.in.mips
index ce41e9e7..f8e57bab 100644
--- a/bsp/buildroot/arch/Config.in.mips
+++ b/bsp/buildroot/arch/Config.in.mips
@@ -1,20 +1,30 @@
 # mips default CPU ISAs
 config BR2_MIPS_CPU_MIPS32
 	bool
+	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS32R2
 	bool
+	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS32R5
 	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_MIPS_CPU_MIPS32R6
 	bool
+	select BR2_MIPS_NAN_2008
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_MIPS_CPU_MIPS64
 	bool
+	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS64R2
 	bool
+	select BR2_MIPS_NAN_LEGACY
 config BR2_MIPS_CPU_MIPS64R5
 	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 config BR2_MIPS_CPU_MIPS64R6
 	bool
+	select BR2_MIPS_NAN_2008
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 
 choice
 	prompt "Target Architecture Variant"
@@ -47,18 +57,23 @@ config BR2_mips_interaptiv
 	bool "interAptiv"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R2
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_mips_m5150
 	bool "M5150"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R5
+	select BR2_MIPS_NAN_2008
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_mips_m6250
 	bool "M6250"
 	depends on !BR2_ARCH_IS_64
+	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_MIPS_CPU_MIPS32R6
 config BR2_mips_p5600
 	bool "P5600"
 	depends on !BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS32R5
+	select BR2_MIPS_NAN_2008
 config BR2_mips_xburst
 	bool "XBurst"
 	depends on !BR2_ARCH_IS_64
@@ -92,9 +107,11 @@ config BR2_mips_i6400
 	bool "I6400"
 	depends on BR2_ARCH_IS_64
 	select BR2_MIPS_CPU_MIPS64R6
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 config BR2_mips_p6600
 	bool "P6600"
 	depends on BR2_ARCH_IS_64
+	select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
 	select BR2_MIPS_CPU_MIPS64R6
 endchoice
 
@@ -126,6 +143,64 @@ config BR2_MIPS_SOFT_FLOAT
 	  floating point functions, then everything will need to be
 	  compiled with soft floating point support (-msoft-float).
 
+choice
+	prompt "FP mode"
+	depends on !BR2_ARCH_IS_64 && !BR2_MIPS_SOFT_FLOAT
+	default BR2_MIPS_FP32_MODE_XX
+	help
+	  MIPS32 supports different FP modes (32,xx,64). Information about FP
+	  modes can be found here:
+	  https://sourceware.org/binutils/docs/as/MIPS-Options.html
+	  https://dmz-portal.imgtec.com/wiki/MIPS_O32_ABI_-_FR0_and_FR1_Interlinking#5._Generating_modeless_code
+
+config BR2_MIPS_FP32_MODE_32
+	bool "32"
+	depends on !BR2_MIPS_CPU_MIPS32R6
+
+config BR2_MIPS_FP32_MODE_XX
+	bool "xx"
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+
+config BR2_MIPS_FP32_MODE_64
+	bool "64"
+	depends on !BR2_MIPS_CPU_MIPS32
+endchoice
+
+config BR2_GCC_TARGET_FP32_MODE
+	default "32"	if BR2_MIPS_FP32_MODE_32
+	default "xx"	if BR2_MIPS_FP32_MODE_XX
+	default "64"	if BR2_MIPS_FP32_MODE_64
+
+config BR2_MIPS_NAN_LEGACY
+	bool
+
+config BR2_MIPS_NAN_2008
+	bool
+	select BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
+
+choice
+	prompt "Target NaN"
+	depends on BR2_mips_32r5 || BR2_mips_64r5
+	default BR2_MIPS_ENABLE_NAN_2008
+	help
+	  MIPS supports two different NaN encodings, legacy and 2008.
+	  Information about MIPS NaN encodings can be found here:
+	  https://sourceware.org/binutils/docs/as/MIPS-NaN-Encodings.html
+
+config BR2_MIPS_ENABLE_NAN_LEGACY
+	bool "legacy"
+	select BR2_MIPS_NAN_LEGACY
+
+config BR2_MIPS_ENABLE_NAN_2008
+	bool "2008"
+	depends on !BR2_MIPS_SOFT_FLOAT
+	select BR2_MIPS_NAN_2008
+endchoice
+
+config BR2_GCC_TARGET_NAN
+	default "legacy"	if BR2_MIPS_NAN_LEGACY
+	default "2008"		if BR2_MIPS_NAN_2008
+
 config BR2_ARCH
 	default "mips"		if BR2_mips
 	default "mipsel"	if BR2_mipsel
@@ -134,7 +209,7 @@ config BR2_ARCH
 
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_mipsel || BR2_mips64el
-	default "BIG" 	    	if BR2_mips || BR2_mips64
+	default "BIG"		if BR2_mips || BR2_mips64
 
 config BR2_GCC_TARGET_ARCH
 	default "mips32"	if BR2_mips_32
@@ -161,3 +236,6 @@ config BR2_GCC_TARGET_ABI
 	default "32"		if BR2_MIPS_OABI32
 	default "n32"		if BR2_MIPS_NABI32
 	default "64"		if BR2_MIPS_NABI64
+
+config BR2_READELF_ARCH_NAME
+	default "MIPS R3000"
diff --git a/bsp/buildroot/arch/Config.in.nios2 b/bsp/buildroot/arch/Config.in.nios2
index ed638981..74663310 100644
--- a/bsp/buildroot/arch/Config.in.nios2
+++ b/bsp/buildroot/arch/Config.in.nios2
@@ -3,3 +3,6 @@ config BR2_ARCH
 
 config BR2_ENDIAN
 	default "LITTLE"
+
+config BR2_READELF_ARCH_NAME
+	default "Altera Nios II"
diff --git a/bsp/buildroot/arch/Config.in.or1k b/bsp/buildroot/arch/Config.in.or1k
index dba64a6a..b31ab3e9 100644
--- a/bsp/buildroot/arch/Config.in.or1k
+++ b/bsp/buildroot/arch/Config.in.or1k
@@ -3,3 +3,6 @@ config BR2_ARCH
 
 config BR2_ENDIAN
 	default "BIG"
+
+config BR2_READELF_ARCH_NAME
+	default "OpenRISC 1000"
diff --git a/bsp/buildroot/arch/Config.in.powerpc b/bsp/buildroot/arch/Config.in.powerpc
index 09ac794d..09684126 100644
--- a/bsp/buildroot/arch/Config.in.powerpc
+++ b/bsp/buildroot/arch/Config.in.powerpc
@@ -212,3 +212,7 @@ config BR2_GCC_TARGET_ABI
 	default "no-spe"		if BR2_PPC_ABI_no-spe
 	default "ibmlongdouble"		if BR2_PPC_ABI_ibmlongdouble
 	default "ieeelongdouble"	if BR2_PPC_ABI_ieeelongdouble
+
+config BR2_READELF_ARCH_NAME
+	default "PowerPC"	if BR2_powerpc
+	default "PowerPC64"	if BR2_powerpc64 || BR2_powerpc64le
diff --git a/bsp/buildroot/arch/Config.in.sh b/bsp/buildroot/arch/Config.in.sh
index 47052125..deb7244f 100644
--- a/bsp/buildroot/arch/Config.in.sh
+++ b/bsp/buildroot/arch/Config.in.sh
@@ -27,3 +27,6 @@ config BR2_ARCH
 config BR2_ENDIAN
 	default "LITTLE"	if BR2_sh4 || BR2_sh4a
 	default "BIG"		if BR2_sh2a || BR2_sh4eb || BR2_sh4aeb
+
+config BR2_READELF_ARCH_NAME
+	default "Renesas / SuperH SH"
diff --git a/bsp/buildroot/arch/Config.in.sparc b/bsp/buildroot/arch/Config.in.sparc
index 307540fd..9b6a6aa2 100644
--- a/bsp/buildroot/arch/Config.in.sparc
+++ b/bsp/buildroot/arch/Config.in.sparc
@@ -28,3 +28,7 @@ config BR2_GCC_TARGET_CPU
 	default "leon3"		if BR2_sparc_leon3
 	default "v8"		if BR2_sparc_v8
 	default "ultrasparc"	if BR2_sparc_v9
+
+config BR2_READELF_ARCH_NAME
+	default "Sparc"		if BR2_sparc
+	default "Sparc v9"	if BR2_sparc64
diff --git a/bsp/buildroot/arch/Config.in.x86 b/bsp/buildroot/arch/Config.in.x86
index efa95678..8e623b3c 100644
--- a/bsp/buildroot/arch/Config.in.x86
+++ b/bsp/buildroot/arch/Config.in.x86
@@ -129,6 +129,15 @@ config BR2_x86_atom
 	select BR2_X86_CPU_HAS_SSE2
 	select BR2_X86_CPU_HAS_SSE3
 	select BR2_X86_CPU_HAS_SSSE3
+config BR2_x86_silvermont
+	bool "silvermont"
+	select BR2_X86_CPU_HAS_MMX
+	select BR2_X86_CPU_HAS_SSE
+	select BR2_X86_CPU_HAS_SSE2
+	select BR2_X86_CPU_HAS_SSE3
+	select BR2_X86_CPU_HAS_SSSE3
+	select BR2_X86_CPU_HAS_SSE4
+	select BR2_X86_CPU_HAS_SSE42
 config BR2_x86_k6
 	bool "k6"
 	select BR2_X86_CPU_HAS_MMX
@@ -229,6 +238,7 @@ config BR2_ARCH
 	default "i686"		if BR2_x86_corei7_avx && BR2_i386
 	default "i686"		if BR2_x86_corei7_avx2 && BR2_i386
 	default "i686"		if BR2_x86_atom && BR2_i386
+	default "i686"		if BR2_x86_silvermont && BR2_i386
 	default "i686"		if BR2_x86_opteron && BR2_i386
 	default "i686"		if BR2_x86_opteron_sse3 && BR2_i386
 	default "i686"		if BR2_x86_barcelona && BR2_i386
@@ -261,6 +271,7 @@ config BR2_GCC_TARGET_ARCH
 	default "corei7-avx"	if BR2_x86_corei7_avx
 	default "core-avx2"	if BR2_x86_core_avx2
 	default "atom"		if BR2_x86_atom
+	default "silvermont"	if BR2_x86_silvermont
 	default "k8"		if BR2_x86_opteron
 	default "k8-sse3"	if BR2_x86_opteron_sse3
 	default "barcelona"	if BR2_x86_barcelona
@@ -275,3 +286,7 @@ config BR2_GCC_TARGET_ARCH
 	default "c3"		if BR2_x86_c3
 	default "c3-2"		if BR2_x86_c32
 	default "geode"		if BR2_x86_geode
+
+config BR2_READELF_ARCH_NAME
+	default "Intel 80386"			if BR2_i386
+	default "Advanced Micro Devices X86-64" if BR2_x86_64
diff --git a/bsp/buildroot/arch/Config.in.xtensa b/bsp/buildroot/arch/Config.in.xtensa
index fcb3dc92..5d5bcb48 100644
--- a/bsp/buildroot/arch/Config.in.xtensa
+++ b/bsp/buildroot/arch/Config.in.xtensa
@@ -2,39 +2,32 @@ choice
 	prompt "Target Architecture Variant"
 	depends on BR2_xtensa
 	default BR2_xtensa_fsf
+
 config BR2_XTENSA_CUSTOM
 	select BR2_ARCH_HAS_MMU_OPTIONAL
 	bool "Custom Xtensa processor configuration"
+
 config BR2_xtensa_fsf
 	select BR2_ARCH_HAS_MMU_MANDATORY
 	bool "fsf - Default configuration"
+
 endchoice
 
-config BR2_XTENSA_CUSTOM_NAME
-	string "Custom Xtensa processor configuration name"
+config BR2_XTENSA_OVERLAY_FILE
+	string "Overlay file for custom configuration"
 	depends on BR2_XTENSA_CUSTOM
-	default ""
 	help
-	  Name given to a custom Xtensa processor configuration.
+	  Enter the path to the overlay tarball for a custom processor
+	  configuration.
 
-config BR2_XTENSA_CORE_NAME
-	string
-	default BR2_XTENSA_CUSTOM_NAME	if BR2_XTENSA_CUSTOM
-	default ""			if BR2_xtensa_fsf
-
-config BR2_XTENSA_OVERLAY_DIR
-	string "Overlay directory for custom configuration"
-	depends on BR2_XTENSA_CUSTOM
-	default ""
-	help
-	  Provide the directory path that contains the overlay file
-	  for a custom processor configuration. The path is relative
-	  to the top directory of buildroot.
 	  These overlay files are tar packages with updated configuration
 	  files for various toolchain packages and Xtensa processor
 	  configurations. They are provided by the processor vendor or
 	  directly from Tensilica.
 
+	  The path can be either absolute, or relative to the top directory
+	  of buildroot.
+
 choice
 	prompt "Target Architecture Endianness"
 	depends on BR2_XTENSA_CUSTOM
@@ -54,3 +47,6 @@ config BR2_ENDIAN
 
 config BR2_ARCH
 	default "xtensa"	if BR2_xtensa
+
+config BR2_READELF_ARCH_NAME
+	default "Tensilica Xtensa Processor"
diff --git a/bsp/buildroot/arch/arch.mk.xtensa b/bsp/buildroot/arch/arch.mk.xtensa
new file mode 100644
index 00000000..2b6cd26d
--- /dev/null
+++ b/bsp/buildroot/arch/arch.mk.xtensa
@@ -0,0 +1,36 @@
+################################################################################
+# This variable can be used by packages that need to extract the overlay.
+#
+# ARCH_XTENSA_OVERLAY_FILE is the path to the overlay tarball; empty if not
+#                          using any overlay
+#
+# Example:
+#   ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
+#       tar xf $(ARCH_XTENSA_OVERLAY_FILE) -C $(@D) --strip-components=1 gcc
+#   endif
+################################################################################
+BR_ARCH_XTENSA_OVERLAY_FILE = $(call qstrip,$(BR2_XTENSA_OVERLAY_FILE))
+ifneq ($(filter http://% https://% ftp://% scp://%,$(BR_ARCH_XTENSA_OVERLAY_FILE)),)
+ARCH_XTENSA_OVERLAY_URL = $(BR_ARCH_XTENSA_OVERLAY_FILE)
+ARCH_XTENSA_OVERLAY_FILE = $(DL_DIR)/$(notdir $(BR_ARCH_XTENSA_OVERLAY_FILE))
+# Do not check that file, we can't know its hash
+BR_NO_CHECK_HASH_FOR += $(notdir $(ARCH_XTENSA_OVERLAY_URL))
+else
+ARCH_XTENSA_OVERLAY_FILE = $(BR_ARCH_XTENSA_OVERLAY_FILE)
+endif
+
+################################################################################
+# arch-xtensa-overlay-extract -- extract an extensa overlay
+#
+# argument 1 is the path in which to extract
+# argument 2 is the component to extract, one of: gcc, binutils, gdb, linux,
+#            u-boot
+#
+# Example:
+#   $(call arch-xtensa-overlay-extract,/path/to/overlay.tar,$(@D),gcc)
+################################################################################
+define arch-xtensa-overlay-extract
+	$(call suitable-extractor,$(ARCH_XTENSA_OVERLAY_FILE)) \
+		$(ARCH_XTENSA_OVERLAY_FILE) | \
+	$(TAR) --strip-components=1 -C $(1) $(TAR_OPTIONS) - $(2)
+endef
diff --git a/bsp/buildroot/board/altera/post-image.sh b/bsp/buildroot/board/altera/post-image.sh
deleted file mode 100755
index 03e7819a..00000000
--- a/bsp/buildroot/board/altera/post-image.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# post-image.sh for SoCkit/SoCDK
-# 2014, "Roman Diouskine" <roman.diouskine@savoirfairelinux.com>
-# 2014, "Sebastien Bourdelin" <sebastien.bourdelin@savoirfairelinux.com>
-
-# create a DTB file copy with the name expected by the u-boot config
-# Name of the DTB is passed as the second argument to the script.
-cp -af $BINARIES_DIR/${2}.dtb  $BINARIES_DIR/socfpga.dtb
diff --git a/bsp/buildroot/board/altera/readme.txt b/bsp/buildroot/board/altera/readme.txt
deleted file mode 100644
index 1894a790..00000000
--- a/bsp/buildroot/board/altera/readme.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-SoCkit, SoC Development Kit
-
-Intro
-=====
-
-This is the buildroot board support for the Arrow SoCkit Evaluation Board
-and the Altera Cyclone 5 Development Board.
-
-A good source of information for Arrow SoCkit:
-http://www.rocketboards.org/foswiki/Documentation/ArrowSoCKitEvaluationBoard
-
-More information about SoC DK:
-https://www.altera.com/products/boards_and_kits/dev-kits/altera/kit-cyclone-v-soc.html
-
-How it works
-============
-
-Boot process:
--------------
-
-In summary, the bootloader has multiple stages, an hardcoded boot routine is
-loaded from an on-chip ROM.
-
-  - That first stage is scanning the SD card's partition table to find
-    partition having the 0xA2 type.
-  - This partition is expected to contain a boot image on its first 60 Kb,
-    because u-boot is bigger, we must fill it with a preloader (u-boot-spl)
-    which will load the u-boot image.
-  - Then the u-boot image will load the Linux kernel.
-
-A good source of information for the boot process is:
-http://xillybus.com/tutorials/u-boot-image-altera-soc
-
-Note for the SPL:
-The SPL generated by the u-boot from Rocketboards doesn't seems to work,
-therefore we provide a patch for {uboot-PKG}/board/altera/socfpga_cyclone5/*
-based on the files generated with the Altera example design.
-
-For more information about this files please look at:
-http://www.rocketboards.org/foswiki/Documentation/PreloaderUbootCustomization#Common_Source_Code
-
-How to build it
-===============
-
-Configure Buildroot
--------------------
-
-The altera_sockit_defconfig configuration is a minimal configuration with
-all that is required to bring the SoCkit:
-
-  $ make altera_sockit_defconfig
-
-and for the SoC Development Board:
-
-  $ make altera_sockdk_defconfig
-
-Build everything
-----------------
-
-Note: you will need to have access to the network, since Buildroot will
-download the packages' sources.
-
-  $ make
-
-Result of the build
--------------------
-
-After building, you should obtain this tree:
-
-    output/images/
-    ├── rootfs.ext2
-    ├── rootfs.ext3 -> rootfs.ext2
-    ├── rootfs.tar
-    ├── socfpga_cyclone5_sockit.dtb or socfpga_cyclone5_socdk.dtb
-    ├── socfpga.dtb
-    ├── u-boot.img
-    ├── u-boot-spl.bin
-    └── uImage
-
-
-Signing the Preloader
----------------------
-
-*** BEWARE ****
-The u-boot-spl.bin must be signed using the Altera's tool "mkpimage".
-This tool comes as a part of the Altera development environnment (SoC EDS).
-A fork of this tool have been done by Maxime Hadjinlian and can be found here:
-https://github.com/maximeh/mkpimage
-
-Remember that without signing the u-boot-spl.bin, the board will not boot !!!
-
-  $ mkpimage u-boot-spl.bin -o u-boot-spl-signed.bin
-
-Prepare your SDcard
-===================
-
-A good source of information for the partitioning process is:
-http://www.rocketboards.org/foswiki/view/Projects/SoCKitLinaroLinuxDesktop#Partition_the_SD_Card
-
-Create the SDcard partition table
-----------------------------------
-
-Determine the device associated to the SD card:
-
-  $ cat /proc/partitions
-
-let's assume it is /dev/mmcblk0:
-
-  $ sudo fdisk /dev/mmcblk0
-
-Delete all previous partitions with 'd' then create the new partition table,
-using these options, pressing enter after each one:
-
-  * n p 1 9000000 +20480K t 1 b
-  * n p 2 4096 +4496384K t 83
-  * n p 3 2048 +1024K t 3 a2
-
-Using the 'p' option, the SD card's partition must look like this:
-
-Device         Boot     Start       End  Blocks  Id System
-/dev/mmcblk0p1        9000000   9041919   20960   b W95 FAT32
-/dev/mmcblk0p2           4096   8996863 4496384  83 Linux
-/dev/mmcblk0p3           2048      4095    1024  a2 Unknown
-
-Then write the partition table using 'w' and exit.
-
-Make partition one a DOS partition:
-
-  $ sudo mkdosfs /dev/mmcblk0p1
-
-Install the binaries to the SDcard
-----------------------------------
-
-Remember your binaries are located in output/images/, go inside that directory:
-
-  $ cd output/images
-
-The partition with type a2 is the partition scan by the first bootloader stage
-in the SoCkit ROM to find the next bootloader stage so we must write the signed
-preloader and the u-boot binaries in that partition:
-
-  $ sudo dd if=u-boot-spl-signed.bin of=/dev/mmcblk0p3 bs=64k seek=0
-  $ sudo dd if=u-boot.img of=/dev/mmcblk0p3 bs=64k seek=4
-
-Copy the Linux kernel and its Device tree:
-
-  $ sudo mkdir /mnt/sdcard
-  $ sudo mount /dev/mmcblk0p1 /mnt/sdcard
-  $ sudo cp socfpga.dtb uImage /mnt/sdcard
-  $ sudo umount /mnt/sdcard
-
-Copy the rootfs:
-
-  $ sudo dd if=rootfs.ext2 of=/dev/mmcblk0p2 bs=64k
-  $ sudo sync
-
-It's Done!
-
-Finish
-======
-
-Eject your SDcard, insert it in your SoCkit, and power it up.
-
-if you want a serial console, you can plug a micro B USB cable on the USB-UART
-port, the serial port config to used is 57600/8-N-1.
diff --git a/bsp/buildroot/board/altera/sockit/uboot-sockit-preloader-sample-design.patch b/bsp/buildroot/board/altera/sockit/uboot-sockit-preloader-sample-design.patch
deleted file mode 100644
index ddf0abce..00000000
--- a/bsp/buildroot/board/altera/sockit/uboot-sockit-preloader-sample-design.patch
+++ /dev/null
@@ -1,820 +0,0 @@
-From c70f2ebb350da20af1a0ed4b7960b8e5a1952713 Mon Sep 17 00:00:00 2001
-From: Sebastien Bourdelin <sebastien.bourdelin@savoirfairelinux.com>
-Date: Thu, 20 Feb 2014 11:51:31 -0500
-Subject: [PATCH] board: add to sockit a working preloader design
-
----
- board/altera/socfpga_cyclone5/build.h              |   2 +-
- board/altera/socfpga_cyclone5/iocsr_config.c       | 314 ++++++++++-----------
- board/altera/socfpga_cyclone5/pinmux_config.c      |  32 +--
- board/altera/socfpga_cyclone5/pinmux_config.h      |   8 +-
- board/altera/socfpga_cyclone5/sdram/sdram_config.h |  14 +-
- .../altera/socfpga_cyclone5/sdram/sequencer_auto.h |  16 +-
- .../sdram/sequencer_auto_ac_init.c                 |  16 +-
- .../socfpga_cyclone5/sdram/sequencer_defines.h     |  34 +--
- 8 files changed, 218 insertions(+), 218 deletions(-)
-
-diff --git a/board/altera/socfpga_cyclone5/build.h b/board/altera/socfpga_cyclone5/build.h
-index e5d9c3c..a369015 100644
---- a/board/altera/socfpga_cyclone5/build.h
-+++ b/board/altera/socfpga_cyclone5/build.h
-@@ -29,7 +29,7 @@
-  * Handoff files must provide user option whether to
-  * enable watchdog during preloader execution phase
-  */
--#define CONFIG_PRELOADER_WATCHDOG_ENABLE	(0)
-+#define CONFIG_PRELOADER_WATCHDOG_ENABLE	(1)
- 
- /*
-  * Handoff files must provide user option whether to enable
-diff --git a/board/altera/socfpga_cyclone5/iocsr_config.c b/board/altera/socfpga_cyclone5/iocsr_config.c
-index fa663e1..90fc154 100644
---- a/board/altera/socfpga_cyclone5/iocsr_config.c
-+++ b/board/altera/socfpga_cyclone5/iocsr_config.c
-@@ -7,113 +7,113 @@ const unsigned long iocsr_scan_chain0_table[((CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH
- 	0xC0000000,
- 	0x0000003F,
- 	0x00008000,
--	0x00020080,
--	0x08020000,
--	0x08000000,
--	0x00018020,
-+	0x00060180,
-+	0x18060000,
-+	0x18000000,
-+	0x00018060,
- 	0x00000000,
- 	0x00004000,
--	0x00010040,
--	0x04010000,
--	0x04000000,
--	0x00000010,
--	0x00004010,
-+	0x000300C0,
-+	0x0C030000,
-+	0x0C000000,
-+	0x00000030,
-+	0x0000C030,
- 	0x00002000,
--	0x00020000,
--	0x02008000,
--	0x02000000,
--	0x00000008,
--	0x00002008,
-+	0x00018060,
-+	0x06018000,
-+	0x06000000,
-+	0x00000018,
-+	0x00006018,
- 	0x00001000,
- };
- 
- const unsigned long iocsr_scan_chain1_table[((CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH / 32) + 1)] = {
--	0x000C0300,
--	0x10040000,
--	0x100000C0,
--	0x00000040,
--	0x00010040,
-+	0x00100000,
-+	0x300C0000,
-+	0x300000C0,
-+	0x000000C0,
-+	0x000300C0,
- 	0x00008000,
- 	0x00080000,
--	0x18060000,
--	0x18000000,
--	0x00000060,
--	0x00018060,
-+	0x20000000,
-+	0x00000000,
-+	0x00000080,
-+	0x00020000,
- 	0x00004000,
--	0x00010040,
-+	0x000300C0,
- 	0x10000000,
--	0x04000000,
--	0x00000010,
--	0x00004010,
-+	0x0C000000,
-+	0x00000030,
-+	0x0000C030,
- 	0x00002000,
--	0x06008020,
--	0x02008000,
-+	0x06018060,
-+	0x06018000,
- 	0x01FE0000,
- 	0xF8000000,
- 	0x00000007,
- 	0x00001000,
--	0x00004010,
--	0x01004000,
--	0x01000000,
--	0x00003004,
--	0x00001004,
-+	0x0000C030,
-+	0x0300C000,
-+	0x03000000,
-+	0x0000300C,
-+	0x0000300C,
- 	0x00000800,
- 	0x00000000,
- 	0x00000000,
--	0x00800000,
--	0x00000002,
-+	0x01800000,
-+	0x00000006,
- 	0x00002000,
- 	0x00000400,
- 	0x00000000,
--	0x00401000,
-+	0x00C03000,
- 	0x00000003,
- 	0x00000000,
- 	0x00000000,
- 	0x00000200,
--	0x00600802,
-+	0x00601806,
- 	0x00000000,
--	0x80200000,
--	0x80000600,
--	0x00000200,
-+	0x80600000,
-+	0x80000601,
-+	0x00000601,
- 	0x00000100,
--	0x00300401,
--	0xC0100400,
--	0x40100000,
--	0x40000300,
--	0x000C0100,
-+	0x00300C03,
-+	0xC0300C00,
-+	0xC0300000,
-+	0xC0000300,
-+	0x000C0300,
- 	0x00000080,
- };
- 
- const unsigned long iocsr_scan_chain2_table[((CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH / 32) + 1)] = {
--	0x80040100,
-+	0x300C0300,
- 	0x00000000,
- 	0x0FF00000,
- 	0x00000000,
--	0x0C010040,
-+	0x0C0300C0,
- 	0x00008000,
--	0x18020080,
--	0x00000000,
--	0x08000000,
--	0x00040020,
--	0x06018060,
-+	0x18060180,
-+	0x18060000,
-+	0x18000000,
-+	0x00018060,
-+	0x00018060,
- 	0x00004000,
--	0x0C010040,
--	0x04010000,
-+	0x000300C0,
-+	0x0C030000,
- 	0x00000030,
- 	0x00000000,
--	0x03004010,
-+	0x0300C030,
- 	0x00002000,
--	0x06008020,
--	0x02008000,
--	0x02000018,
--	0x00006008,
--	0x01802008,
-+	0x00018060,
-+	0x06018000,
-+	0x06000000,
-+	0x00000018,
-+	0x00006018,
- 	0x00001000,
--	0x03004010,
--	0x01004000,
--	0x0100000C,
--	0x00003004,
--	0x00C01004,
-+	0x0000C030,
-+	0x00000000,
-+	0x03000000,
-+	0x0000000C,
-+	0x00C0300C,
- 	0x00000800,
- };
- 
-@@ -170,14 +170,14 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0xA0000034,
- 	0x0D000001,
- 	0x6068030C,
--	0xC7034018,
--	0x0E381A01,
-+	0xCF034059,
-+	0x1E781A03,
- 	0x8030C0D0,
--	0x34018606,
--	0x01A01C70,
-+	0x34059606,
-+	0x01A03CF0,
- 	0x0C0D0000,
--	0x18606803,
--	0x01C70340,
-+	0x59606803,
-+	0x03CF0340,
- 	0xD000001A,
- 	0x068030C0,
- 	0x10040000,
-@@ -244,15 +244,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0xA0000034,
- 	0x0D000001,
- 	0x6068030C,
--	0xC7034018,
--	0x0E381A01,
-+	0xCF034059,
-+	0x1E781A03,
- 	0x8030C0D0,
--	0x34018606,
-+	0x34059606,
- 	0x01A00000,
- 	0x0C0D0000,
--	0x18606803,
--	0x01C70340,
--	0xD00E381A,
-+	0x59606803,
-+	0x03CF0340,
-+	0xD01E781A,
- 	0x068030C0,
- 	0x10040000,
- 	0x00200000,
-@@ -273,7 +273,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0xAA0D4000,
--	0x01C3A808,
-+	0x01C3A810,
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0x00040100,
-@@ -301,7 +301,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x2A835000,
- 	0x0070EA04,
- 	0x2A835000,
--	0x0070EA02,
-+	0x0070EA04,
- 	0x2A835000,
- 	0x0070EA04,
- 	0x00010040,
-@@ -321,15 +321,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x14864000,
- 	0x69A47A05,
- 	0xCBCF23D7,
--	0xF41E791E,
--	0x034ED348,
-+	0xF5DE791E,
-+	0x0356D348,
- 	0x821A0000,
- 	0x0000D000,
- 	0x01860680,
- 	0xD769A47A,
- 	0x1ECBCF23,
--	0x48F41E79,
--	0x00034ED3,
-+	0x48F5DE79,
-+	0x000356D3,
- 	0x00080200,
- 	0x00001000,
- 	0x00080200,
-@@ -347,7 +347,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0xAA0D4000,
--	0x01C3A808,
-+	0x01C3A810,
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0x00040100,
-@@ -375,7 +375,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x2A835000,
- 	0x0070EA04,
- 	0x2A835000,
--	0x0070EA02,
-+	0x0070EA04,
- 	0x2A835000,
- 	0x0070EA04,
- 	0x00015000,
-@@ -395,15 +395,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x14864000,
- 	0x69A47A05,
- 	0xCBCF23D7,
--	0xF41E791E,
--	0x034ED348,
--	0x821A00C3,
-+	0xF5DE791E,
-+	0x0356D348,
-+	0x821A02CB,
- 	0x0000D000,
- 	0x00000680,
- 	0xD769A47A,
- 	0x1ECBCF23,
--	0x48F41E79,
--	0x00034ED3,
-+	0x48F5DE79,
-+	0x000356D3,
- 	0x00080200,
- 	0x00001000,
- 	0x00080200,
-@@ -421,7 +421,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0xAA0D4000,
--	0x01C3A808,
-+	0x01C3A810,
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0x00040100,
-@@ -449,7 +449,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x2A835000,
- 	0x0070EA04,
- 	0x2A835000,
--	0x0070EA02,
-+	0x0070EA04,
- 	0x2A835000,
- 	0x0070EA04,
- 	0x00010040,
-@@ -469,15 +469,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x14864000,
- 	0x69A47A05,
- 	0xCBCF23D7,
--	0xF41E791E,
--	0x034ED348,
-+	0xF5DE791E,
-+	0x0356D348,
- 	0x821A0000,
- 	0x0000D000,
- 	0x00000680,
- 	0xD769A47A,
- 	0x1ECBCF23,
--	0x48F41E79,
--	0x00034ED3,
-+	0x48F5DE79,
-+	0x000356D3,
- 	0x00080200,
- 	0x00001000,
- 	0x00080200,
-@@ -495,7 +495,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0xAA0D4000,
--	0x01C3A808,
-+	0x01C3A810,
- 	0xAA0D4000,
- 	0x01C3A810,
- 	0x00040100,
-@@ -523,7 +523,7 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x2A835000,
- 	0x0070EA04,
- 	0x2A835000,
--	0x0070EA02,
-+	0x0070EA04,
- 	0x2A835000,
- 	0x0070EA04,
- 	0x00010040,
-@@ -543,15 +543,15 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x14864000,
- 	0x69A47A05,
- 	0xCBCF23D7,
--	0xF41E791E,
--	0x034ED348,
-+	0xF5DE791E,
-+	0x0356D348,
- 	0x821A0000,
- 	0x0000D000,
- 	0x00000680,
- 	0xD769A47A,
- 	0x1ECBCF23,
--	0x48F41E79,
--	0x00034ED3,
-+	0x48F5DE79,
-+	0x000356D3,
- 	0x00080200,
- 	0x00001000,
- 	0x00080200,
-@@ -567,80 +567,80 @@ const unsigned long iocsr_scan_chain3_table[((CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH
- 	0x04000002,
- 	0x00820000,
- 	0x00489000,
--	0x001A1A1A,
--	0x085506A0,
--	0x0000E1D4,
--	0x045506A0,
--	0x0000E1D4,
--	0x085506A0,
--	0x8000E1D4,
-+	0x801A1A1A,
-+	0x00000200,
-+	0x80000004,
-+	0x00000200,
-+	0x80000004,
-+	0x00000200,
-+	0x80000004,
- 	0x00000200,
- 	0x00000004,
--	0x04000000,
--	0x00000009,
--	0x00002410,
-+	0x00040000,
-+	0x10000000,
-+	0x00000000,
- 	0x00000040,
--	0x41000000,
--	0x00002082,
--	0x00000350,
--	0x000000DA,
-+	0x00010000,
-+	0x40002000,
-+	0x00000100,
-+	0x40000002,
-+	0x00000100,
-+	0x40000002,
- 	0x00000100,
- 	0x40000002,
- 	0x00000100,
- 	0x00000002,
--	0x042A8350,
--	0x000070EA,
--	0x86000000,
--	0x08000004,
-+	0x00020000,
-+	0x08000000,
- 	0x00000000,
--	0x00482000,
--	0x21800000,
--	0x00101061,
--	0x021541A8,
--	0x00003875,
--	0x011541A8,
--	0x00003875,
--	0x021541A8,
--	0x20003875,
-+	0x00000020,
-+	0x00008000,
-+	0x20001000,
-+	0x00000080,
-+	0x20000001,
-+	0x00000080,
-+	0x20000001,
-+	0x00000080,
-+	0x20000001,
- 	0x00000080,
- 	0x00000001,
--	0x41000000,
--	0x00000002,
--	0x00FF0904,
-+	0x00010000,
-+	0x04000000,
-+	0x00FF0000,
- 	0x00000000,
--	0x90400000,
--	0x00000820,
-+	0x00004000,
-+	0x00000800,
- 	0x80000001,
--	0x38D612AF,
--	0x86F8E38E,
--	0x0A0A78B4,
--	0x000D020A,
-+	0x00041419,
-+	0x40000000,
-+	0x04000816,
-+	0x000D0000,
- 	0x00006800,
--	0x028A4320,
--	0xEBB4D23D,
--	0x8F65E791,
--	0xA47A0F3C,
--	0x0001A769,
--	0x00410D00,
-+	0x00000340,
-+	0xD000001A,
-+	0x06800000,
-+	0x00340000,
-+	0x0001A000,
-+	0x00000D00,
- 	0x40000068,
--	0x3D000003,
--	0x91EBB4D2,
--	0x3C8F65E7,
--	0x69A47A0F,
--	0x000001A7,
-+	0x1A000003,
-+	0x00D00000,
-+	0x00068000,
-+	0x00003400,
-+	0x000001A0,
-+	0x00000401,
-+	0x00000008,
- 	0x00000401,
- 	0x00000008,
- 	0x00000401,
- 	0x00000008,
--	0x00000540,
--	0x000003A8,
--	0x10AA0D40,
--	0x8001C3A8,
-+	0x00000401,
-+	0x80000008,
- 	0x0000007F,
-+	0x20000000,
- 	0x00000000,
--	0x00004060,
--	0xE1208000,
-+	0xE0000080,
- 	0x0000001F,
--	0x00004100,
-+	0x00004000,
- };
- 
-diff --git a/board/altera/socfpga_cyclone5/pinmux_config.c b/board/altera/socfpga_cyclone5/pinmux_config.c
-index 730067e..cfd74cd 100644
---- a/board/altera/socfpga_cyclone5/pinmux_config.c
-+++ b/board/altera/socfpga_cyclone5/pinmux_config.c
-@@ -23,7 +23,7 @@ unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM] = {
- 	0, /* EMACIO18 */
- 	0, /* EMACIO19 */
- 	3, /* FLASHIO0 */
--	3, /* FLASHIO1 */
-+	0, /* FLASHIO1 */
- 	3, /* FLASHIO2 */
- 	3, /* FLASHIO3 */
- 	0, /* FLASHIO4 */
-@@ -34,25 +34,25 @@ unsigned long sys_mgr_init_table[CONFIG_HPS_PINMUX_NUM] = {
- 	3, /* FLASHIO9 */
- 	3, /* FLASHIO10 */
- 	3, /* FLASHIO11 */
--	3, /* GENERALIO0 */
--	3, /* GENERALIO1 */
--	3, /* GENERALIO2 */
--	3, /* GENERALIO3 */
--	3, /* GENERALIO4 */
--	3, /* GENERALIO5 */
--	3, /* GENERALIO6 */
--	3, /* GENERALIO7 */
--	3, /* GENERALIO8 */
-+	0, /* GENERALIO0 */
-+	1, /* GENERALIO1 */
-+	1, /* GENERALIO2 */
-+	1, /* GENERALIO3 */
-+	1, /* GENERALIO4 */
-+	0, /* GENERALIO5 */
-+	0, /* GENERALIO6 */
-+	0, /* GENERALIO7 */
-+	0, /* GENERALIO8 */
- 	3, /* GENERALIO9 */
- 	3, /* GENERALIO10 */
- 	3, /* GENERALIO11 */
- 	3, /* GENERALIO12 */
--	2, /* GENERALIO13 */
--	2, /* GENERALIO14 */
--	3, /* GENERALIO15 */
--	3, /* GENERALIO16 */
--	2, /* GENERALIO17 */
--	2, /* GENERALIO18 */
-+	0, /* GENERALIO13 */
-+	0, /* GENERALIO14 */
-+	1, /* GENERALIO15 */
-+	1, /* GENERALIO16 */
-+	1, /* GENERALIO17 */
-+	1, /* GENERALIO18 */
- 	0, /* GENERALIO19 */
- 	0, /* GENERALIO20 */
- 	0, /* GENERALIO21 */
-diff --git a/board/altera/socfpga_cyclone5/pinmux_config.h b/board/altera/socfpga_cyclone5/pinmux_config.h
-index fb483ab..64c750a 100644
---- a/board/altera/socfpga_cyclone5/pinmux_config.h
-+++ b/board/altera/socfpga_cyclone5/pinmux_config.h
-@@ -11,15 +11,15 @@
- #define CONFIG_HPS_UART0 (1)
- #define CONFIG_HPS_UART1 (0)
- #define CONFIG_HPS_TRACE (0)
--#define CONFIG_HPS_I2C0 (1)
--#define CONFIG_HPS_I2C1 (0)
-+#define CONFIG_HPS_I2C0 (0)
-+#define CONFIG_HPS_I2C1 (1)
- #define CONFIG_HPS_I2C2 (0)
- #define CONFIG_HPS_I2C3 (0)
- #define CONFIG_HPS_SPIM0 (1)
--#define CONFIG_HPS_SPIM1 (0)
-+#define CONFIG_HPS_SPIM1 (1)
- #define CONFIG_HPS_SPIS0 (0)
- #define CONFIG_HPS_SPIS1 (0)
--#define CONFIG_HPS_CAN0 (1)
-+#define CONFIG_HPS_CAN0 (0)
- #define CONFIG_HPS_CAN1 (0)
- 
- #define CONFIG_HPS_SDMMC_BUSWIDTH (4)
-diff --git a/board/altera/socfpga_cyclone5/sdram/sdram_config.h b/board/altera/socfpga_cyclone5/sdram/sdram_config.h
-index b90d6f3..dd027ef 100755
---- a/board/altera/socfpga_cyclone5/sdram/sdram_config.h
-+++ b/board/altera/socfpga_cyclone5/sdram/sdram_config.h
-@@ -4,16 +4,16 @@
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMTYPE			(2)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_MEMBL			(8)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ADDRORDER		(0)
--#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN			(1)
--#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN		(1)
-+#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCEN			(0)
-+#define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_ECCCORREN		(0)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_REORDEREN		(1)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_STARVELIMIT		(10)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_DQSTRKEN			(0)
- #define CONFIG_HPS_SDR_CTRLCFG_CTRLCFG_NODMPINS			(0)
--#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL			(6)
-+#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCWL			(8)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_AL			(0)
--#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL			(7)
--#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD			(4)
-+#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TCL			(11)
-+#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRRD			(3)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TFAW			(12)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING1_TRFC			(104)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TREFI		(3120)
-@@ -21,7 +21,7 @@
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TRP		(6)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWR		(6)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING2_IF_TWTR		(4)
--#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP			(4)
-+#define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRTP			(3)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRAS			(14)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TRC			(20)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMTIMING3_TMRD			(4)
-@@ -33,7 +33,7 @@
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_ROWBITS		(15)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_BANKBITS		(3)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMADDRW_CSBITS			(1)
--#define CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH		(40)
-+#define CONFIG_HPS_SDR_CTRLCFG_DRAMIFWIDTH_IFWIDTH		(32)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMDEVWIDTH_DEVWIDTH		(8)
- #define CONFIG_HPS_SDR_CTRLCFG_DRAMINTR_INTREN			(0)
- #define CONFIG_HPS_SDR_CTRLCFG_STATICCFG_MEMBL			(2)
-diff --git a/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h b/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h
-index e8c5484..919676d 100644
---- a/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h
-+++ b/board/altera/socfpga_cyclone5/sdram/sequencer_auto.h
-@@ -34,7 +34,7 @@
- #define __RW_MGR_ac_read_en 0x21
- #define __RW_MGR_ac_mrs3_mirr 0x0C
- #define __RW_MGR_ac_mrs2 0x05
--#define __RW_MGR_CONTENT_ac_mrs1 0x10090044
-+#define __RW_MGR_CONTENT_ac_mrs1 0x10090006
- #define __RW_MGR_CONTENT_ac_mrs3 0x100B0000
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_0_nodata_wl_1 0x18980000
- #define __RW_MGR_CONTENT_ac_act_1 0x106B0000
-@@ -46,8 +46,8 @@
- #define __RW_MGR_CONTENT_ac_init_reset_0_cke_0 0x20700000
- #define __RW_MGR_CONTENT_ac_read_bank_0_1_norden 0x10580008
- #define __RW_MGR_CONTENT_ac_pre_all 0x10280400
--#define __RW_MGR_CONTENT_ac_mrs0_user 0x10080431
--#define __RW_MGR_CONTENT_ac_mrs0_dll_reset 0x10080530
-+#define __RW_MGR_CONTENT_ac_mrs0_user 0x10080471
-+#define __RW_MGR_CONTENT_ac_mrs0_dll_reset 0x10080570
- #define __RW_MGR_CONTENT_ac_read_bank_0_0 0x13580000
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_1 0x1C980008
- #define __RW_MGR_CONTENT_ac_read_bank_0_1 0x13580008
-@@ -55,21 +55,21 @@
- #define __RW_MGR_CONTENT_ac_write_bank_1_col_1 0x1C9B0008
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_0 0x1C980000
- #define __RW_MGR_CONTENT_ac_read_bank_1_0 0x135B0000
--#define __RW_MGR_CONTENT_ac_mrs1_mirr 0x100A0024
-+#define __RW_MGR_CONTENT_ac_mrs1_mirr 0x100A0006
- #define __RW_MGR_CONTENT_ac_read_bank_1_1 0x135B0008
- #define __RW_MGR_CONTENT_ac_des_odt_1 0x38780000
--#define __RW_MGR_CONTENT_ac_mrs0_dll_reset_mirr 0x100804C8
-+#define __RW_MGR_CONTENT_ac_mrs0_dll_reset_mirr 0x100804E8
- #define __RW_MGR_CONTENT_ac_zqcl 0x10380400
- #define __RW_MGR_CONTENT_ac_write_predata 0x38F80000
--#define __RW_MGR_CONTENT_ac_mrs0_user_mirr 0x10080449
-+#define __RW_MGR_CONTENT_ac_mrs0_user_mirr 0x10080469
- #define __RW_MGR_CONTENT_ac_ref 0x10480000
- #define __RW_MGR_CONTENT_ac_nop 0x30780000
- #define __RW_MGR_CONTENT_ac_rdimm 0x10780000
--#define __RW_MGR_CONTENT_ac_mrs2_mirr 0x10090010
-+#define __RW_MGR_CONTENT_ac_mrs2_mirr 0x10090218
- #define __RW_MGR_CONTENT_ac_write_bank_0_col_0_nodata 0x18180000
- #define __RW_MGR_CONTENT_ac_read_en 0x33780000
- #define __RW_MGR_CONTENT_ac_mrs3_mirr 0x100B0000
--#define __RW_MGR_CONTENT_ac_mrs2 0x100A0008
-+#define __RW_MGR_CONTENT_ac_mrs2 0x100A0218
- 
- #define __RW_MGR_READ_B2B_WAIT2 0x6A
- #define __RW_MGR_LFSR_WR_RD_BANK_0_WAIT 0x31
-diff --git a/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c b/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c
-index e16efa1..20b4ca1 100644
---- a/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c
-+++ b/board/altera/socfpga_cyclone5/sdram/sequencer_auto_ac_init.c
-@@ -6,16 +6,16 @@ const alt_u32 ac_rom_init[36] =
- {
- 	0x20700000,
- 	0x20780000,
--	0x10080431,
--	0x10080530,
--	0x10090044,
--	0x100a0008,
-+	0x10080471,
-+	0x10080570,
-+	0x10090006,
-+	0x100a0218,
- 	0x100b0000,
- 	0x10380400,
--	0x10080449,
--	0x100804c8,
--	0x100a0024,
--	0x10090010,
-+	0x10080469,
-+	0x100804e8,
-+	0x100a0006,
-+	0x10090218,
- 	0x100b0000,
- 	0x30780000,
- 	0x38780000,
-diff --git a/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h b/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h
-index 52faf3f..b85b85c 100644
---- a/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h
-+++ b/board/altera/socfpga_cyclone5/sdram/sequencer_defines.h
-@@ -1,28 +1,28 @@
- #ifndef _SEQUENCER_DEFINES_H_
- #define _SEQUENCER_DEFINES_H_
- 
--#define AC_ROM_MR1_MIRR 0000000100100
-+#define AC_ROM_MR1_MIRR 0000000000110
- #define AC_ROM_MR1_OCD_ENABLE
--#define AC_ROM_MR2_MIRR 0000000010000
-+#define AC_ROM_MR2_MIRR 0001000011000
- #define AC_ROM_MR3_MIRR 0000000000000
- #define AC_ROM_MR0_CALIB
--#define AC_ROM_MR0_DLL_RESET_MIRR 0010011001000
--#define AC_ROM_MR0_DLL_RESET 0010100110000
--#define AC_ROM_MR0_MIRR 0010001001001
--#define AC_ROM_MR0 0010000110001
--#define AC_ROM_MR1 0000001000100
--#define AC_ROM_MR2 0000000001000
-+#define AC_ROM_MR0_DLL_RESET_MIRR 0010011101000
-+#define AC_ROM_MR0_DLL_RESET 0010101110000
-+#define AC_ROM_MR0_MIRR 0010001101001
-+#define AC_ROM_MR0 0010001110001
-+#define AC_ROM_MR1 0000000000110
-+#define AC_ROM_MR2 0001000011000
- #define AC_ROM_MR3 0000000000000
- #define AFI_CLK_FREQ 401
- #define AFI_RATE_RATIO 1
- #define ARRIAVGZ 0
- #define ARRIAV 0
--#define AVL_CLK_FREQ 67
-+#define AVL_CLK_FREQ 81
- #define BFM_MODE 0
- #define BURST2 0
- #define CALIBRATE_BIT_SLIPS 0
--#define CALIB_LFIFO_OFFSET 7
--#define CALIB_VFIFO_OFFSET 5
-+#define CALIB_LFIFO_OFFSET 11
-+#define CALIB_VFIFO_OFFSET 9
- #define CYCLONEV 1
- #define DDR2 0
- #define DDR3 1
-@@ -89,20 +89,20 @@
- #define RW_MGR_MEM_CHIP_SELECT_WIDTH 1
- #define RW_MGR_MEM_CLK_EN_WIDTH 1
- #define RW_MGR_MEM_CONTROL_WIDTH 1
--#define RW_MGR_MEM_DATA_MASK_WIDTH 5
--#define RW_MGR_MEM_DATA_WIDTH 40
-+#define RW_MGR_MEM_DATA_MASK_WIDTH 4
-+#define RW_MGR_MEM_DATA_WIDTH 32
- #define RW_MGR_MEM_DQ_PER_READ_DQS 8
- #define RW_MGR_MEM_DQ_PER_WRITE_DQS 8
--#define RW_MGR_MEM_IF_READ_DQS_WIDTH 5
--#define RW_MGR_MEM_IF_WRITE_DQS_WIDTH 5
-+#define RW_MGR_MEM_IF_READ_DQS_WIDTH 4
-+#define RW_MGR_MEM_IF_WRITE_DQS_WIDTH 4
- #define RW_MGR_MEM_NUMBER_OF_CS_PER_DIMM 1
- #define RW_MGR_MEM_NUMBER_OF_RANKS 1
- #define RW_MGR_MEM_ODT_WIDTH 1
- #define RW_MGR_MEM_VIRTUAL_GROUPS_PER_READ_DQS 1
- #define RW_MGR_MEM_VIRTUAL_GROUPS_PER_WRITE_DQS 1
- #define RW_MGR_MR0_BL 1
--#define RW_MGR_MR0_CAS_LATENCY 3
--#define RW_MGR_TRUE_MEM_DATA_MASK_WIDTH 5
-+#define RW_MGR_MR0_CAS_LATENCY 7
-+#define RW_MGR_TRUE_MEM_DATA_MASK_WIDTH 4
- #define RW_MGR_WRITE_TO_DEBUG_READ 1.0
- #define SKEW_CALIBRATION 0
- #define STATIC_FULL_CALIBRATION 1
--- 
-1.9.0
-
diff --git a/bsp/buildroot/board/altera/socrates_cyclone5/boot-env.txt b/bsp/buildroot/board/altera/socrates_cyclone5/boot-env.txt
new file mode 100644
index 00000000..ed5b6138
--- /dev/null
+++ b/bsp/buildroot/board/altera/socrates_cyclone5/boot-env.txt
@@ -0,0 +1,8 @@
+linux_load_address=0x100000
+linux_dtb_load_address=0x100
+linux_dtb=socfpga_cyclone5_socrates.dtb
+linux_load=mmc rescan; fatload mmc 0:1 ${linux_load_address} zImage; fatload mmc 0:1 ${linux_dtb_load_address} ${linux_dtb}
+bootargs=console=ttyS0,115200 root=/dev/mmcblk0p3 ro rootwait
+source_env=fatload mmc 0:1 0x2000000 boot.scr; source 0x2000000
+bootcmd=run linux_load; bootz ${linux_load_address} - ${linux_dtb_load_address}
+bootdelay=1
diff --git a/bsp/buildroot/board/altera/socrates_cyclone5/genimage.cfg b/bsp/buildroot/board/altera/socrates_cyclone5/genimage.cfg
new file mode 100644
index 00000000..63fef8ba
--- /dev/null
+++ b/bsp/buildroot/board/altera/socrates_cyclone5/genimage.cfg
@@ -0,0 +1,58 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"socfpga_cyclone5_socrates.dtb"
+		}
+	}
+	size = 8M
+}
+
+image uboot.img {
+	hdimage {
+		partition-table = "no"
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "u-boot-spl.bin.crc"
+		offset = 0
+		size = 64k
+	}
+
+	partition uboot-full {
+		in-partition-table = "no"
+		image = "u-boot.img"
+		offset = 256k
+	}
+
+	size = 1M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition uboot-env {
+		in-partition-table = "no"
+		image = "uboot-env.bin"
+		offset = 17408 # 512 * 34 -> just after gpt
+	}
+
+	partition boot {
+		partition-type = 0xc
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition uboot {
+		partition-type = 0xa2
+		image = "uboot.img"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+		size = 500M
+	}
+}
diff --git a/bsp/buildroot/board/altera/socrates_cyclone5/readme.txt b/bsp/buildroot/board/altera/socrates_cyclone5/readme.txt
new file mode 100644
index 00000000..4e78feef
--- /dev/null
+++ b/bsp/buildroot/board/altera/socrates_cyclone5/readme.txt
@@ -0,0 +1,52 @@
+EBV SoCrates Evaluation Board
+
+Intro
+=====
+
+More information about this board can be found here:
+https://rocketboards.org/foswiki/Documentation/EBVSoCratesEvaluationBoard
+
+Build
+=====
+
+First, load socrates config for buildroot
+
+    make socrates_cyclone5_defconfig
+
+Build everything
+
+    make
+
+Following files will be generated in output/images
+
+.
+├── boot.vfat
+├── rootfs.ext2
+├── rootfs.ext4 -> rootfs.ext2
+├── rootfs.tar
+├── sdcard.img
+├── socfpga_cyclone5_socrates.dtb
+├── u-boot-spl.bin
+├── u-boot-spl.bin.crc
+├── u-boot.bin
+├── u-boot.img
+├── uboot-env.bin
+├── uboot.img
+└── zImage
+
+
+Creating bootable SD card
+=========================
+
+Simply invoke
+
+dd if=output/images/sdcard.img of=/dev/sdX
+
+Where X is your SD card device (not partition)
+
+Booting
+=======
+
+Pins 6:8 on P18 selector is used to determine boot device. To boot socrates from
+sdcard set these pins to value 0x5 (101b). Remaining pins are used to determine
+how to configure FPGA and are not associated with booting into Linux kernel.
diff --git a/bsp/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch b/bsp/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch
new file mode 100644
index 00000000..aac15a12
--- /dev/null
+++ b/bsp/buildroot/board/arcturus/ppc-ucp1020/patches/linux/0003-powerpc-ptrace-Fix-out-of-bounds-array-access-warning.patch
@@ -0,0 +1,53 @@
+From 35b7ce4f8f290794d3b89db7461e8c568b5defa1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 25 Apr 2016 09:19:17 -0700
+Subject: powerpc/ptrace: Fix out of bounds array access warning
+
+commit 1e407ee3b21f981140491d5b8a36422979ca246f upstream.
+
+gcc-6 correctly warns about a out of bounds access
+
+arch/powerpc/kernel/ptrace.c:407:24: warning: index 32 denotes an offset greater than size of 'u64[32][1] {aka long long unsigned int[32][1]}' [-Warray-bounds]
+        offsetof(struct thread_fp_state, fpr[32][0]));
+                        ^
+
+check the end of array instead of beginning of next element to fix this
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Kees Cook <keescook@chromium.org>
+Cc: Michael Ellerman <mpe@ellerman.id.au>
+Cc: Segher Boessenkool <segher@kernel.crashing.org>
+Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
+Acked-by: Olof Johansson <olof@lixom.net>
+Cc: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Oleksandr Zhadan <oleks@arcturusnetworks.com>
+---
+ arch/powerpc/kernel/ptrace.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
+index f21897b..93f200f 100644
+--- a/arch/powerpc/kernel/ptrace.c
++++ b/arch/powerpc/kernel/ptrace.c
+@@ -376,7 +376,7 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
+ 
+ #else
+ 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
+-		     offsetof(struct thread_fp_state, fpr[32][0]));
++		     offsetof(struct thread_fp_state, fpr[32]));
+ 
+ 	return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+ 				   &target->thread.fp_state, 0, -1);
+@@ -404,7 +404,7 @@ static int fpr_set(struct task_struct *target, const struct user_regset *regset,
+ 	return 0;
+ #else
+ 	BUILD_BUG_ON(offsetof(struct thread_fp_state, fpscr) !=
+-		     offsetof(struct thread_fp_state, fpr[32][0]));
++		     offsetof(struct thread_fp_state, fpr[32]));
+ 
+ 	return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+ 				  &target->thread.fp_state, 0, -1);
+-- 
+cgit v1.1
diff --git a/bsp/buildroot/board/armadeus/apf27/linux-3.18.config b/bsp/buildroot/board/armadeus/apf27/linux-3.18.config
deleted file mode 100644
index ed5a569e..00000000
--- a/bsp/buildroot/board/armadeus/apf27/linux-3.18.config
+++ /dev/null
@@ -1,224 +0,0 @@
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CGROUPS=y
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=m
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_ARCH_MULTI_V7 is not set
-CONFIG_ARCH_MXC=y
-CONFIG_MACH_IMX27_DT=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_PM_DEBUG=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_MCP251X=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_CFI_I2 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
-CONFIG_MTD_UBI=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_SMSC_PHY=y
-CONFIG_RTL8187=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_RT2X00=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RTL8192CU=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IMX=m
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_IMX=y
-CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_IMX=y
-CONFIG_SPI=y
-CONFIG_SPI_IMX=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_W1=y
-CONFIG_W1_MASTER_MXC=y
-CONFIG_W1_SLAVE_THERM=y
-CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_MEDIA_USB_SUPPORT=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_PWC=m
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=m
-CONFIG_VIDEO_MX2=m
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-# CONFIG_DVB_AU8522_V4L is not set
-# CONFIG_DVB_TUNER_DIB0070 is not set
-# CONFIG_DVB_TUNER_DIB0090 is not set
-CONFIG_FB=y
-# CONFIG_FB_MX3 is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-# CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_SND_SOC=m
-CONFIG_SND_IMX_SOC=m
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_CHIPIDEA_DEBUG=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
-CONFIG_USB_ULPI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_HID=m
-CONFIG_MMC=y
-CONFIG_MMC_MXC=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_LEDS_TRIGGER_TRANSIENT=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1374=y
-CONFIG_RTC_DRV_MXC=m
-CONFIG_DMADEVICES=y
-CONFIG_IMX_SDMA=y
-CONFIG_IMX_DMA=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_IIO=y
-CONFIG_MAX1027=y
-CONFIG_MAX5821=y
-CONFIG_PWM=y
-CONFIG_PWM_IMX=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=m
-CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_FS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_PREEMPT is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
diff --git a/bsp/buildroot/board/armadeus/apf27/linux-4.12.config b/bsp/buildroot/board/armadeus/apf27/linux-4.12.config
new file mode 100644
index 00000000..d0fb5d35
--- /dev/null
+++ b/bsp/buildroot/board/armadeus/apf27/linux-4.12.config
@@ -0,0 +1,216 @@
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CGROUPS=y
+CONFIG_EMBEDDED=y
+# CONFIG_COMPAT_BRK is not set
+CONFIG_SLAB=y
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=m
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_MXC=y
+CONFIG_MACH_IMX27_DT=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_PM_DEBUG=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_CAN=m
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_MCP251X=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_GEOMETRY=y
+# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
+# CONFIG_MTD_CFI_I2 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_UBI=y
+CONFIG_EEPROM_AT24=y
+CONFIG_EEPROM_AT25=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_SMSC_PHY=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_RT2X00=m
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RTL8187=m
+CONFIG_RTL8192CU=m
+CONFIG_ZD1211RW=m
+CONFIG_INPUT_JOYDEV=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_IMX=m
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_IMX=y
+CONFIG_SERIAL_IMX_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_IMX=y
+CONFIG_SPI_SPIDEV=m
+CONFIG_GPIO_SYSFS=y
+CONFIG_W1=y
+CONFIG_W1_MASTER_MXC=y
+CONFIG_W1_SLAVE_THERM=y
+CONFIG_WATCHDOG=y
+CONFIG_IMX2_WDT=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_USB_SUPPORT=y
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_PWC=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=m
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_FB=y
+# CONFIG_FB_MX3 is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_SOUND=m
+CONFIG_SND=m
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+# CONFIG_SND_DRIVERS is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_IMX_SOC=m
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_ACM=y
+CONFIG_USB_PRINTER=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_CHIPIDEA=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_ETH=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_G_HID=m
+CONFIG_MMC=y
+CONFIG_MMC_MXC=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_ONESHOT=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_GPIO=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_LEDS_TRIGGER_TRANSIENT=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1374=y
+CONFIG_RTC_DRV_MXC=m
+CONFIG_DMADEVICES=y
+CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
+# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_IIO=y
+CONFIG_MAX1027=y
+CONFIG_MAX5821=y
+CONFIG_PWM=y
+CONFIG_PWM_IMX=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_DNOTIFY is not set
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_UBIFS_FS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=m
+CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_FS=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_FTRACE is not set
+CONFIG_DEBUG_LL=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
diff --git a/bsp/buildroot/board/armadeus/apf28/linux-4.4.config b/bsp/buildroot/board/armadeus/apf28/linux-4.4.config
deleted file mode 100644
index cf389d80..00000000
--- a/bsp/buildroot/board/armadeus/apf28/linux-4.4.config
+++ /dev/null
@@ -1,185 +0,0 @@
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EMBEDDED=y
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLAB=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_IOSCHED_CFQ is not set
-# CONFIG_ARCH_MULTI_V7 is not set
-CONFIG_ARCH_MXS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CPU_IDLE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-CONFIG_CAN=m
-CONFIG_CAN_VCAN=m
-CONFIG_CAN_FLEXCAN=m
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-CONFIG_BT_HCIBTUSB=m
-CONFIG_CFG80211=m
-CONFIG_MAC80211=m
-CONFIG_MAC80211_RC_PID=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-# CONFIG_M25PXX_USE_FAST_READ is not set
-CONFIG_MTD_SST25L=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_GPMI_NAND=y
-CONFIG_MTD_UBI=y
-CONFIG_EEPROM_AT24=y
-CONFIG_EEPROM_AT25=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_ST=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_CHR_DEV_SCH=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_SCSI_LOGGING=y
-CONFIG_SCSI_SCAN_ASYNC=y
-CONFIG_NETDEVICES=y
-CONFIG_RTL8187=m
-CONFIG_RT2X00=m
-CONFIG_RT73USB=m
-CONFIG_ZD1211RW=m
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-# CONFIG_SERIO_SERPORT is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_SERIAL_MXS_AUART=y
-CONFIG_TTY_PRINTK=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MXS=y
-CONFIG_SPI=y
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_MXS=y
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIO_SYSFS=y
-CONFIG_HWMON=m
-CONFIG_WATCHDOG=y
-CONFIG_STMP3XXX_RTC_WATCHDOG=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_MEDIA_SUPPORT=m
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_FB=y
-CONFIG_FB_MXS=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_USB=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_MON=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_ACM=y
-CONFIG_USB_PRINTER=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_CHIPIDEA=y
-CONFIG_USB_CHIPIDEA_UDC=y
-CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_MXS_PHY=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_ETH=m
-CONFIG_MMC=y
-CONFIG_MMC_MXS=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_STMP=y
-CONFIG_DMADEVICES=y
-CONFIG_MXS_DMA=y
-CONFIG_STAGING=y
-CONFIG_MXS_LRADC=y
-CONFIG_IIO=y
-CONFIG_PWM=y
-CONFIG_PWM_MXS=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT2_FS_XIP=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_FS=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
diff --git a/bsp/buildroot/board/armadeus/readme.txt b/bsp/buildroot/board/armadeus/readme.txt
index a1f13252..98c7b082 100644
--- a/bsp/buildroot/board/armadeus/readme.txt
+++ b/bsp/buildroot/board/armadeus/readme.txt
@@ -13,7 +13,6 @@ Supported platforms
 Buildroot currently supports the following Armadeus platforms with the
 associated defconfigs:
 
- * APF9328 SOM + devt boards -> armadeus_apf9328_defconfig
  * APF27 SOM + devt board    -> armadeus_apf27_defconfig
  * APF51 SOM + devt board    -> armadeus_apf51_defconfig
  * APF28 SOM + devt board    -> armadeus_apf28_defconfig
@@ -46,15 +45,12 @@ When the build is finished, you will end up with:
 
     output/images/
     ├── imx**-apfxxdev.dtb	[1]
-    ├── rootfs.jffs2		[2]
     ├── rootfs.tar
-    ├── rootfs.ubi		[2]
-    ├── rootfs.ubifs		[2]
+    ├── rootfs.ubi
+    ├── rootfs.ubifs
     └── uImage
 
 [1] Only if the kernel version used uses a Device Tree.
-[2] .ubi/.ubifs images are not available on APF9328 and replaced by a
-    .jffs2 one in this case.
 
 Building U-Boot is currently not supported in these configurations.
 
@@ -69,7 +65,6 @@ it:
   $ cp output/images/uImage /tftpboot/apfxx-linux.bin
   $ cp output/images/*.dtb /tftpboot/
   $ cp output/images/rootfs.ubi /tftpboot/apfxx-rootfs.ubi
-  $ cp output/images/rootfs.jffs2 /tftpboot/apfxx-rootfs.jffs2
 
 where "apfxx" is the version of your SOM, as used with _defconfigs.
 
diff --git a/bsp/buildroot/board/atmel/at91sam9x5ek_mmc/genimage.cfg b/bsp/buildroot/board/atmel/at91sam9x5ek_mmc/genimage.cfg
new file mode 100644
index 00000000..7a552665
--- /dev/null
+++ b/bsp/buildroot/board/atmel/at91sam9x5ek_mmc/genimage.cfg
@@ -0,0 +1,39 @@
+# Image for SD card boot on Atmel at91sam9x5ek boards
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"at91sam9g15ek.dtb",
+			"at91sam9g25ek.dtb",
+			"at91sam9g35ek.dtb",
+			"at91sam9x25ek.dtb",
+			"at91sam9x35ek.dtb",
+			"boot.bin",
+			"u-boot.bin"
+		}
+
+		file uboot.env {
+			image = "uboot-env.bin"
+		}
+	}
+	size = 16M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 1M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/atmel/at91sam9x5ek_mmc/uboot-env.txt b/bsp/buildroot/board/atmel/at91sam9x5ek_mmc/uboot-env.txt
new file mode 100644
index 00000000..568e4bc9
--- /dev/null
+++ b/bsp/buildroot/board/atmel/at91sam9x5ek_mmc/uboot-env.txt
@@ -0,0 +1,7 @@
+bootargs=console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait video=Unknown-1:800x480-16
+bootcmd=fatload mmc 0:1 0x21000000 at91sam9g35ek.dtb; fatload mmc 0:1 0x22000000 zImage; bootz 0x22000000 - 0x21000000
+bootdelay=1
+ethact=gmac0
+stderr=serial
+stdin=serial
+stdout=serial
diff --git a/bsp/buildroot/board/atmel/flasher.sh b/bsp/buildroot/board/atmel/flasher.sh
index bbdb199b..c1227609 100755
--- a/bsp/buildroot/board/atmel/flasher.sh
+++ b/bsp/buildroot/board/atmel/flasher.sh
@@ -130,7 +130,6 @@ if [[ $BOARD == "*pda4" ]]; then
 	video_mode="video=LVDS-1:480x272-16"
 fi
 
-echo "Executing: ${!F} O=$1/images $1/host/opt/sam-ba/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode"
+echo "Executing: ${!F} O=$1/images $1/host/bin/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode"
 export O=$1/images
-$1/host/opt/sam-ba/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode
-
+$1/host/bin/sam-ba $TTY ${!M} $(dirname $0)/nandflash.tcl -- ${!F} ${!D} $video_mode
diff --git a/bsp/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg b/bsp/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg
new file mode 100644
index 00000000..f5222ff8
--- /dev/null
+++ b/bsp/buildroot/board/atmel/sama5d27_som1_ek_mmc/genimage.cfg
@@ -0,0 +1,34 @@
+# Image for SD card boot on Atmel SAMA5D2 Xplained boards
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"at91-sama5d27_som1_ek.dtb",
+			"at91-sama5d27_som1_ek_pda4.dtb",
+			"at91-sama5d27_som1_ek_pda7.dtb",
+			"at91-sama5d27_som1_ek_pda7b.dtb",
+			"boot.bin",
+			"u-boot.bin"
+		}
+	}
+	size = 16M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 1M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/atmel/sama5d3_xplained_mmc/post-image.sh b/bsp/buildroot/board/atmel/sama5d3_xplained_mmc/post-image.sh
deleted file mode 100755
index 359b4c9e..00000000
--- a/bsp/buildroot/board/atmel/sama5d3_xplained_mmc/post-image.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
diff --git a/bsp/buildroot/board/atmel/sama5d4_xplained_mmc/post-image.sh b/bsp/buildroot/board/atmel/sama5d4_xplained_mmc/post-image.sh
deleted file mode 100755
index 359b4c9e..00000000
--- a/bsp/buildroot/board/atmel/sama5d4_xplained_mmc/post-image.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
diff --git a/bsp/buildroot/board/bananapi/bananapi-m1/boot.cmd b/bsp/buildroot/board/bananapi/bananapi-m1/boot.cmd
new file mode 100644
index 00000000..0cf6f4d6
--- /dev/null
+++ b/bsp/buildroot/board/bananapi/bananapi-m1/boot.cmd
@@ -0,0 +1,7 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+mmc dev 0
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun7i-a20-bananapi.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/bananapi/bananapi-m1/genimage.cfg b/bsp/buildroot/board/bananapi/bananapi-m1/genimage.cfg
new file mode 100644
index 00000000..e2e13116
--- /dev/null
+++ b/bsp/buildroot/board/bananapi/bananapi-m1/genimage.cfg
@@ -0,0 +1,33 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun7i-a20-bananapi.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/bananapi/bananapi-m1/readme.txt b/bsp/buildroot/board/bananapi/bananapi-m1/readme.txt
new file mode 100644
index 00000000..382ba63c
--- /dev/null
+++ b/bsp/buildroot/board/bananapi/bananapi-m1/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Bananapi M1. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Bananapi M1 link:
+http://www.banana-pi.org/m1.html
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M1
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make bananapi_m1_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Bananapi M1 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/bananapi/bananapi-m64/boot.cmd b/bsp/buildroot/board/bananapi/bananapi-m64/boot.cmd
new file mode 100644
index 00000000..d35c9b0b
--- /dev/null
+++ b/bsp/buildroot/board/bananapi/bananapi-m64/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-a64-bananapi-m64.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/bananapi/bananapi-m64/genimage.cfg b/bsp/buildroot/board/bananapi/bananapi-m64/genimage.cfg
new file mode 100644
index 00000000..9730d8fa
--- /dev/null
+++ b/bsp/buildroot/board/bananapi/bananapi-m64/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-a64-bananapi-m64.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/bananapi/bananapi-m64/readme.txt b/bsp/buildroot/board/bananapi/bananapi-m64/readme.txt
new file mode 100644
index 00000000..0dec3e52
--- /dev/null
+++ b/bsp/buildroot/board/bananapi/bananapi-m64/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Bananapi M64. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Bananapi M64 link:
+http://www.banana-pi.org/m64.html
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Bananapi+M64
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make bananapi_m64_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Bananapi M64 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/beaglebone/genimage.cfg b/bsp/buildroot/board/beaglebone/genimage.cfg
index ba60297d..cfc1039e 100644
--- a/bsp/buildroot/board/beaglebone/genimage.cfg
+++ b/bsp/buildroot/board/beaglebone/genimage.cfg
@@ -9,6 +9,7 @@ image boot.vfat {
 			"am335x-evmsk.dtb",
 			"am335x-bone.dtb",
 			"am335x-boneblack.dtb",
+			"am335x-bonegreen.dtb",
 		}
 	}
 	size = 16M
diff --git a/bsp/buildroot/board/beaglebone/genimage_linux41.cfg b/bsp/buildroot/board/beaglebone/genimage_linux41.cfg
new file mode 100644
index 00000000..ba60297d
--- /dev/null
+++ b/bsp/buildroot/board/beaglebone/genimage_linux41.cfg
@@ -0,0 +1,32 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"MLO",
+			"u-boot.img",
+			"zImage",
+			"uEnv.txt",
+			"am335x-evm.dtb",
+			"am335x-evmsk.dtb",
+			"am335x-bone.dtb",
+			"am335x-boneblack.dtb",
+		}
+	}
+	size = 16M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		partition-type = 0xC
+		bootable = "true"
+                image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/beaglebone/post-image.sh b/bsp/buildroot/board/beaglebone/post-image.sh
index f0c2bc7f..68fe0896 100755
--- a/bsp/buildroot/board/beaglebone/post-image.sh
+++ b/bsp/buildroot/board/beaglebone/post-image.sh
@@ -8,7 +8,15 @@ BOARD_DIR="$(dirname $0)"
 # copy the uEnv.txt to the output/images directory
 cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt
 
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+# the 4.1 kernel does not provide a dtb for beaglebone green, so we
+# use a different genimage config if am335x-bonegreen.dtb is not
+# built:
+if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then
+	GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
+else
+	GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg"
+fi
+
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 
 rm -rf "${GENIMAGE_TMP}"
diff --git a/bsp/buildroot/board/boundarydevices/common/6x_bootscript.txt b/bsp/buildroot/board/boundarydevices/common/6x_bootscript.txt
index 2fc687af..af5822a8 100644
--- a/bsp/buildroot/board/boundarydevices/common/6x_bootscript.txt
+++ b/bsp/buildroot/board/boundarydevices/common/6x_bootscript.txt
@@ -106,6 +106,7 @@ fi
 
 if itest.s "x" != "x${wlmac}" ; then
 	setenv bootargs ${bootargs} wlcore.mac=${wlmac}
+	setenv bootargs ${bootargs} wlan.mac=${wlmac}
 fi
 
 if itest.s "x" != "x${gpumem}" ; then
diff --git a/bsp/buildroot/board/boundarydevices/common/boot.cmd b/bsp/buildroot/board/boundarydevices/common/boot.cmd
new file mode 100644
index 00000000..7602b013
--- /dev/null
+++ b/bsp/buildroot/board/boundarydevices/common/boot.cmd
@@ -0,0 +1,155 @@
+setenv bootargs ''
+
+setenv initrd_high 0xffffffff
+m4=''
+a_base=0x10000000
+if itest.s x51 == "x${imx_cpu}" ; then
+	a_base=0x90000000
+elif itest.s x53 == "x${imx_cpu}"; then
+	a_base=0x70000000
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+	a_base=0x80000000
+	if itest.s "x1" == "x$m4enabled" ; then
+		run m4boot;
+		m4='-m4';
+	fi
+fi
+
+setexpr a_script  ${a_base} + 0x00800000
+setexpr a_zImage  ${a_base} + 0x00800000
+setexpr a_fdt     ${a_base} + 0x03000000
+setexpr a_ramdisk ${a_base} + 0x03800000
+setexpr a_initrd  ${a_base} + 0x03a00000
+setexpr a_reset_cause_marker ${a_base} + 0x80
+setexpr a_reset_cause	     ${a_base} + 0x84
+
+if itest.s "x" == "x${board}" ; then
+	echo "!!!! Error: Your u-boot is outdated. Please upgrade.";
+	exit;
+fi
+
+if itest.s "x" == "x${fdt_file}" ; then
+	if itest.s x6SOLO == "x${imx_cpu}" ; then
+		fdt_file=imx6dl-${board}.dtb;
+	elif itest.s x6DL == "x${imx_cpu}" ; then
+		fdt_file=imx6dl-${board}.dtb;
+	elif itest.s x6QP == "x${imx_cpu}" ; then
+		fdt_file=imx6qp-${board}.dtb;
+	elif itest.s x6SX == "x${imx_cpu}" ; then
+		fdt_file=imx6sx-${board}${m4}.dtb;
+	elif itest.s x7D == "x${imx_cpu}" ; then
+		fdt_file=imx7d-${board}${m4}.dtb;
+	elif itest.s x51 == "x${imx_cpu}" ; then
+		fdt_file=imx51-${board}${m4}.dtb;
+	elif itest.s x53 == "x${imx_cpu}" ; then
+		fdt_file=imx53-${board}${m4}.dtb;
+	else
+		fdt_file=imx6q-${board}.dtb;
+	fi
+fi
+
+if itest.s x${distro_bootpart} == x ; then
+	distro_bootpart=1
+fi
+
+if load ${devtype} ${devnum}:${distro_bootpart} ${a_script} uEnv.txt ; then
+    env import -t ${a_script} ${filesize}
+fi
+
+setenv bootargs ${bootargs} console=${console},115200 vmalloc=400M consoleblank=0 rootwait fixrtc cpu=${imx_cpu} board=${board}
+
+if load ${devtype} ${devnum}:${distro_bootpart} ${a_fdt} ${prefix}${fdt_file} ; then
+	fdt addr ${a_fdt}
+	setenv fdt_high 0xffffffff
+else
+	echo "!!!! Error loading ${prefix}${fdt_file}";
+	exit;
+fi
+
+cmd_xxx_present=
+fdt resize
+if itest.s "x" != "x${cmd_custom}" ; then
+	run cmd_custom
+	cmd_xxx_present=1;
+fi
+
+if itest.s "x" != "x${cmd_hdmi}" ; then
+	run cmd_hdmi
+	cmd_xxx_present=1;
+	if itest.s x == x${allow_noncea} ; then
+		setenv bootargs ${bootargs} mxc_hdmi.only_cea=1;
+		echo "only CEA modes allowed on HDMI port";
+	else
+		setenv bootargs ${bootargs} mxc_hdmi.only_cea=0;
+		echo "non-CEA modes allowed on HDMI, audio may be affected";
+	fi
+fi
+
+if itest.s "x" != "x${cmd_lcd}" ; then
+	run cmd_lcd
+	cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lcd2}" ; then
+	run cmd_lcd2
+	cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lvds}" ; then
+	run cmd_lvds
+	cmd_xxx_present=1;
+fi
+if itest.s "x" != "x${cmd_lvds2}" ; then
+	run cmd_lvds2
+	cmd_xxx_present=1;
+fi
+
+if itest.s "x" == "x${cmd_xxx_present}" ; then
+	echo "!!!!!!!!!!!!!!!!"
+	echo "warning: your u-boot may be outdated, please upgrade"
+	echo "!!!!!!!!!!!!!!!!"
+fi
+
+if test "sata" = "${devtype}" ; then
+	setenv bootargs "${bootargs} root=/dev/sda${distro_bootpart}" ;
+elif test "usb" = "${devtype}" ; then
+	setenv bootargs "${bootargs} root=/dev/sda${distro_bootpart}" ;
+else
+	setenv bootargs "${bootargs} root=/dev/mmcblk${devnum}p${distro_bootpart}"
+fi
+
+if itest.s "x" != "x${disable_msi}" ; then
+	setenv bootargs ${bootargs} pci=nomsi
+fi;
+
+if itest.s "x" != "x${disable_giga}" ; then
+	setenv bootargs ${bootargs} fec.disable_giga=1
+fi
+
+if itest.s "x" != "x${wlmac}" ; then
+	setenv bootargs ${bootargs} wlcore.mac=${wlmac}
+	setenv bootargs ${bootargs} wlan.mac=${wlmac}
+fi
+
+if itest.s "x" != "x${gpumem}" ; then
+	setenv bootargs ${bootargs} galcore.contiguousSize=${gpumem}
+fi
+
+if itest.s "x" != "x${cma}" ; then
+	setenv bootargs ${bootargs} cma=${cma}
+fi
+
+if itest.s "x" != "x${loglevel}" ; then
+	setenv bootargs ${bootargs} loglevel=${loglevel}
+fi
+
+if itest.s "x" != "x${show_fdt}" ; then
+	fdt print /
+fi
+
+if itest.s "x" != "x${show_env}" ; then
+	printenv
+fi
+
+if load ${devtype} ${devnum}:${distro_bootpart} ${a_zImage} ${prefix}zImage ; then
+	bootz ${a_zImage} - ${a_fdt}
+fi
+echo "Error loading kernel image"
diff --git a/bsp/buildroot/board/boundarydevices/common/post-build.sh b/bsp/buildroot/board/boundarydevices/common/post-build.sh
index f68fa0e6..b8abb265 100755
--- a/bsp/buildroot/board/boundarydevices/common/post-build.sh
+++ b/bsp/buildroot/board/boundarydevices/common/post-build.sh
@@ -7,14 +7,19 @@
 
 BOARD_DIR="$(dirname $0)"
 
-# bd u-boot looks for bootscript here
-$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+# bd u-boot looks for standard bootscript
+install -m 0644 -D $BINARIES_DIR/boot.scr $TARGET_DIR/boot/
+# legacy 6x_bootscript script
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
 -n "boot script" -d $BOARD_DIR/6x_bootscript.txt $TARGET_DIR/6x_bootscript
 
 # u-boot / update script for bd upgradeu command
 if [ -e $BINARIES_DIR/u-boot.imx ];
 then
     install -D -m 0644 $BINARIES_DIR/u-boot.imx $TARGET_DIR/u-boot.imx
-    $HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+    $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
+    -n "upgrade script" -d $BOARD_DIR/upgrade.cmd $TARGET_DIR/upgrade.scr
+    # legacy 6x_upgrade script
+    $HOST_DIR/bin/mkimage -A arm -O linux -T script -C none -a 0 -e 0 \
     -n "upgrade script" -d $BOARD_DIR/6x_upgrade.txt $TARGET_DIR/6x_upgrade
 fi
diff --git a/bsp/buildroot/board/boundarydevices/common/upgrade.cmd b/bsp/buildroot/board/boundarydevices/common/upgrade.cmd
new file mode 100644
index 00000000..249185db
--- /dev/null
+++ b/bsp/buildroot/board/boundarydevices/common/upgrade.cmd
@@ -0,0 +1,154 @@
+if itest.s a$uboot_defconfig == a; then
+        echo "Please set uboot_defconfig to the appropriate value"
+        exit
+fi
+
+offset=0x400
+erase_size=0xC0000
+qspi_offset=0x0
+a_base=0x12000000
+
+if itest.s x51 == "x${imx_cpu}"; then
+	a_base=0x92000000
+elif itest.s x53 == "x${imx_cpu}"; then
+	a_base=0x72000000
+elif itest.s x6SX == "x${imx_cpu}" || itest.s x7D == "x${imx_cpu}"; then
+	a_base=0x82000000
+fi
+
+qspi_match=1
+setexpr a_qspi1 ${a_base}
+setexpr a_qspi2 ${a_qspi1} + 0x400000
+setexpr a_uImage1 ${a_qspi1} + 0x400
+setexpr a_uImage2 ${a_qspi2} + 0x400
+setexpr a_script ${a_base}
+
+setenv stdout serial,vga
+
+if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000 ; then
+	echo "probed SPI ROM" ;
+else
+	echo "Error initializing EEPROM"
+	exit
+fi
+
+if itest.s x7D == "x${imx_cpu}"; then
+	echo "check qspi parameter block" ;
+	if ${fs}load ${devtype} ${devnum}:1 ${a_qspi1} qspi-${sfname}.${uboot_defconfig} ; then
+	else
+		echo "parameter file qspi-${sfname}.${uboot_defconfig} not found on SD card"
+		exit
+	fi
+	if itest ${filesize} != 0x200 ; then
+		echo "------- qspi-${sfname}.${uboot_defconfig} 0x${filesize} != 0x200 bytes" ;
+		exit
+	fi
+	setexpr a_marker ${a_qspi1} + 0x1fc
+	if itest *${a_marker} != c0ffee01 ; then
+		echo "------- qspi-${sfname}.${uboot_defconfig} c0ffee01 marker missing" ;
+		exit
+	fi
+	if sf read ${a_qspi2} ${qspi_offset} 0x200 ; then
+	else
+		echo "Error reading qspi parameter from EEPROM"
+		exit
+	fi
+	if cmp.b ${a_qspi1} ${a_qspi2} 0x200 ; then
+		echo "------- qspi parameters match"
+	else
+		echo "------- qspi parameters mismatch"
+		qspi_match=0
+	fi
+fi
+
+echo "check U-Boot" ;
+
+if ${fs}load ${devtype} ${devnum}:1 ${a_uImage1} u-boot.$uboot_defconfig ; then
+else
+	echo "File u-boot.$uboot_defconfig not found on SD card" ;
+	exit
+fi
+echo "read $filesize bytes from SD card" ;
+if sf read ${a_uImage2} $offset $filesize ; then
+else
+	echo "Error reading boot loader from EEPROM" ;
+	exit
+fi
+
+if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
+	echo "------- U-Boot versions match" ;
+	if itest.s "${qspi_match}" == "1" ; then
+		echo "------- upgrade not needed" ;
+		if itest.s "x" != "x${next}" ; then
+			if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
+				source ${a_script}
+			else
+				echo "${next} not found on SD card"
+			fi
+		fi
+		exit
+	fi
+	erase_size=0x1000
+	if itest.s xMX25L6405D == "x${sfname}"; then
+		erase_size=0x10000
+	fi
+	setexpr filesize ${erase_size} - ${offset}
+fi
+
+echo "Need U-Boot upgrade" ;
+echo "Program in 5 seconds" ;
+for n in 5 4 3 2 1 ; do
+	echo $n ;
+	sleep 1 ;
+done
+echo "erasing" ;
+sf erase 0 ${erase_size} ;
+
+# two steps to prevent bricking
+echo "programming" ;
+setexpr a1 ${a_uImage1} + 0x400
+setexpr o1 ${offset} + 0x400
+setexpr s1 ${filesize} - 0x400
+sf write ${a1} ${o1} ${s1} ;
+sf write ${a_uImage1} $offset 0x400 ;
+
+if itest.s x7D == "x${imx_cpu}"; then
+	sf write ${a_qspi1} ${qspi_offset} 0x200
+fi
+
+echo "verifying" ;
+if sf read ${a_uImage2} $offset $filesize ; then
+else
+	echo "Error re-reading EEPROM" ;
+	exit
+fi
+if cmp.b ${a_uImage1} ${a_uImage2} $filesize ; then
+else
+	echo "Read verification error" ;
+	exit
+fi
+
+if itest.s x7D == "x${imx_cpu}"; then
+	if sf read ${a_qspi2} ${qspi_offset} 0x200 ; then
+	else
+		echo "Error re-reading qspi" ;
+		exit
+	fi
+	if cmp.b ${a_qspi1} ${a_qspi2} 0x200 ; then
+	else
+		echo "qspi parameter block verification error" ;
+		exit
+	fi
+fi
+
+if itest.s "x" != "x${next}" ; then
+	if ${fs}load ${devtype} ${devnum}:1 ${a_script} ${next} ; then
+		source ${a_script}
+	else
+		echo "${next} not found on ${devtype} ${devnum}"
+	fi
+fi
+
+while echo "---- U-Boot upgraded. reset" ; do
+	sleep 120
+done
diff --git a/bsp/buildroot/board/chromebook/snow/mksd.sh b/bsp/buildroot/board/chromebook/snow/mksd.sh
index b6302aa8..cba1578e 100755
--- a/bsp/buildroot/board/chromebook/snow/mksd.sh
+++ b/bsp/buildroot/board/chromebook/snow/mksd.sh
@@ -14,8 +14,8 @@
 # cgpt does not create protective MBR, and the kernel refuses to read
 # GPT unless there's some kind of MBR in sector 0. So we need parted
 # to write that single sector before doing anything with the GPT.
-cgpt=$HOST_DIR/usr/bin/cgpt
-parted=$HOST_DIR/usr/sbin/parted
+cgpt=$HOST_DIR/bin/cgpt
+parted=$HOST_DIR/sbin/parted
 kernel=$BINARIES_DIR/uImage.kpart
 rootfs=$BINARIES_DIR/rootfs.ext2
 
diff --git a/bsp/buildroot/board/chromebook/snow/readme.txt b/bsp/buildroot/board/chromebook/snow/readme.txt
index e012cb3f..1afd9498 100644
--- a/bsp/buildroot/board/chromebook/snow/readme.txt
+++ b/bsp/buildroot/board/chromebook/snow/readme.txt
@@ -88,7 +88,7 @@ you will probably want the rootfs to occupy the whole remaining space.
 
 cgpt may be used to check current layout:
 
-	output/host/usr/bin/cgpt show $SD
+	output/host/bin/cgpt show $SD
 
 All sizes and all offsets are in 512-byte blocks.
 
diff --git a/bsp/buildroot/board/chromebook/snow/sign.sh b/bsp/buildroot/board/chromebook/snow/sign.sh
index 39005ed6..e8f111ff 100755
--- a/bsp/buildroot/board/chromebook/snow/sign.sh
+++ b/bsp/buildroot/board/chromebook/snow/sign.sh
@@ -5,9 +5,9 @@
 # The resulting file is called uImage.kpart.
 
 BOARD_DIR=$(dirname $0)
-mkimage=$HOST_DIR/usr/bin/mkimage
-futility=$HOST_DIR/usr/bin/futility
-devkeys=$HOST_DIR/usr/share/vboot/devkeys
+mkimage=$HOST_DIR/bin/mkimage
+futility=$HOST_DIR/bin/futility
+devkeys=$HOST_DIR/share/vboot/devkeys
 
 run() { echo "$@"; "$@"; }
 die() { echo "$@" >&2; exit 1; }
diff --git a/bsp/buildroot/board/ci20/genimage.cfg b/bsp/buildroot/board/ci20/genimage.cfg
new file mode 100644
index 00000000..fa3e7368
--- /dev/null
+++ b/bsp/buildroot/board/ci20/genimage.cfg
@@ -0,0 +1,29 @@
+image sdcard.img {
+    hdimage {
+    }
+
+    partition uboot-spl {
+        in-partition-table = "no"
+        image = "u-boot-spl.bin"
+        offset = 512
+    }
+
+    partition uboot {
+        in-partition-table = "no"
+        image = "u-boot.img"
+        offset = 14k
+    }
+
+    partition uboot-env {
+        in-partition-table = "no"
+        image = "uboot-env.bin"
+        offset = 526k
+    }
+
+    partition rootfs {
+        partition-type = 0x83
+        image = "rootfs.ext4"
+        offset = 2M
+        size = 60M
+    }
+}
diff --git a/bsp/buildroot/board/ci20/readme.txt b/bsp/buildroot/board/ci20/readme.txt
index ca7bb529..71d50706 100644
--- a/bsp/buildroot/board/ci20/readme.txt
+++ b/bsp/buildroot/board/ci20/readme.txt
@@ -2,41 +2,45 @@
 * MIPS Creator CI20 *
 *********************
 
+Introduction
+============
+
 The 'ci20_defconfig' will create a root filesystem and a kernel image
 under the 'output/images/' directory. This document will try to explain how
 to use them in order to run Buildroot in the MIPS Creator CI20 board.
 
-Assuming you are at the U-Boot prompt of the MIPS Creator CI20, you have to
-load the generated kernel image by using the 'tftpboot' command. In
-order to do that, you will need to get the network working. Here you
-have the instructions to set the ip address, netmask and gateway:
+How to build it
+===============
 
-  setenv ipaddr x.x.x.x
-  setenv netmask x.x.x.x
-  setenv gatewayip x.x.x.x
+Configure Buildroot
+-------------------
 
-Now you have to set the ip for the TFTP server you are going to load the
-kernel image from, and also the name of the kernel image file (we use
-'uImage' as a filename in this example):
+  $ make ci20_defconfig
 
-  setenv serverip x.x.x.x
-  setenv bootfile uImage
+Build the rootfs
+----------------
 
-And finally load the kernel image:
+Note: you will need to have access to the network, since Buildroot will
+download the packages' sources.
 
-  tftpboot
+You may now build your rootfs with:
 
-Now you have to extract the generated root filesystem into a USB drive
-or SD-Card. Here you have the instructions to boot from the two of them.
-You have to choose the one your prefer:
+  $ make
 
-From USB
-  setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0
-mem=768M@0x30000000 root=/dev/sda1
+(This may take a while, consider getting yourself a coffee ;-) )
 
-From SD-Card
-  setenv bootargs console=ttyS4,115200 console=tty0 mem=256M@0x0
-mem=768M@0x30000000 root=/dev/mmcblk0p1
+How to write the SD card
+========================
 
-And finally run this command to boot the board:
-  bootm
+Once the build process is finished you will have an image called
+"sdcard.img" in the output/images/ directory.
+
+Make sure the SD card is not mounted then copy the bootable "sdcard.img" onto
+it with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+
+Insert the SDcard into your ci20, and power it up. Your new system
+should come up now and start a console on the UART HEADER.
+
+see: https://elinux.org/CI20_Hardware#Dedicated_UART_header
diff --git a/bsp/buildroot/board/ci20/uboot-env.txt b/bsp/buildroot/board/ci20/uboot-env.txt
new file mode 100644
index 00000000..3093496c
--- /dev/null
+++ b/bsp/buildroot/board/ci20/uboot-env.txt
@@ -0,0 +1,10 @@
+baudrate=115200
+board_mfr=NP
+bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 ip=dhcp
+bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000
+bootdelay=1
+ethargs=env set bootargs ${bootargs}
+loads_echo=1
+stderr=eserial0,eserial4
+stdin=eserial0,eserial4
+stdout=eserial0,eserial4
diff --git a/bsp/buildroot/board/csky/gx6605s/gdbinit b/bsp/buildroot/board/csky/gx6605s/gdbinit
new file mode 100644
index 00000000..d602aad4
--- /dev/null
+++ b/bsp/buildroot/board/csky/gx6605s/gdbinit
@@ -0,0 +1,25 @@
+tar jtag jtag://127.0.0.1:1025
+reset
+
+# setup CCR (Cache Config Reg)
+# 0-1:MP,2:IE,3:DE,4:WB,5:RS,6:Z,7:BE
+set $cr18 = 0x7d
+
+# vendor custom setup, double cache line & preload
+set $cr30 = 0xc
+
+# pin mux for serial8250
+set *(unsigned int *) 0xa030a14c |= (1 << 22) | (1 << 23)
+
+# pass devicetree blob
+# r2 is magic
+# r3 is address
+set $r2 = 0x20150401
+set $r3 = 0x92000000
+restore gx6605s.dtb binary 0x92000000
+
+# flush cache
+set $cr17 = 0x33
+
+load
+
diff --git a/bsp/buildroot/board/csky/readme.txt b/bsp/buildroot/board/csky/readme.txt
new file mode 100644
index 00000000..b4605c54
--- /dev/null
+++ b/bsp/buildroot/board/csky/readme.txt
@@ -0,0 +1,88 @@
+C-SKY Development Kit
+
+Intro
+=====
+
+C-SKY is a CPU Architecture from www.c-sky.com and has it own instruction set.
+Just like arm and mips in linux/arch, it named as 'csky'.
+
+gx6605s develop board is made by Hangzhou Nationalchip and C-SKY.
+
+Hardware Spec:
+  * CPU: ck610 up to 594Mhz
+  * Integrate with 64MB ddr2 in SOC.
+  * Integrate with hardware Jtag.
+  * Integrate with usb-to-serial chip.
+  * USB ehci controller in SOC.
+  * Power Supply: DC 5V from two micro-usb.
+
+How to build it
+===============
+
+Configure Buildroot
+-------------------
+
+The csky_gx6605s_defconfig configuration is a sample configuration with
+all that is required to bring the gx6605s Development Board:
+
+  $ make csky_gx6605s_defconfig
+
+Build everything
+----------------
+
+Note: you will need to have access to the network, since Buildroot will
+download the packages' sources.
+
+  $ make
+
+Result of the build
+-------------------
+
+After building, you should obtain this tree:
+
+    output/images/
+    ├── vmlinux
+    ├── rootfs.ext2
+    └── <board name>.dtb
+
+How to run it
+=============
+
+Prepare Jtag-Server
+-------------------
+
+  Download the Jtag-Server here:
+
+  https://github.com/c-sky/tools/raw/master/DebugServerConsole-linux-x86_64-V4.2.00-20161213.tar.gz
+
+  Go to the unpacked directory:
+
+  $./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025
+
+  Perhaps you need to use "sudo", which need libusb to detect c510:b210
+
+  $ sudo ./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025
+
+Prepare USB drive
+-----------------
+
+  You sould determine which device associated to the usb drive
+  carefully. eg:
+
+  $ cat /proc/partitions
+   8       48    1971712 sdd
+   8       49     976720 sdd1
+
+  $ sudo dd if=rootfs.ext2 of=/dev/sdd1
+  $ sudo sync
+
+Run
+---
+
+  Plug the usb drive on gx6605s dev board.
+
+  Setup the Console with the rate 115200/8-N-1.
+
+  $ cd output/images
+  $ ../host/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux
+
diff --git a/bsp/buildroot/board/cubietech/cubieboard2/post-build.sh b/bsp/buildroot/board/cubietech/cubieboard2/post-build.sh
deleted file mode 100755
index 465d493c..00000000
--- a/bsp/buildroot/board/cubietech/cubieboard2/post-build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# post-build.sh for Cubieboard2
-# 2013, Carlo Caione <carlo.caione@gmail.com>
-
-BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/usr/bin/mkimage
-BOOT_CMD=$BOARD_DIR/boot.cmd
-BOOT_CMD_H=$BINARIES_DIR/boot.scr
-
-# U-Boot script
-$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
diff --git a/bsp/buildroot/board/embest/riotboard/readme.txt b/bsp/buildroot/board/embest/riotboard/readme.txt
deleted file mode 100644
index b7390d0d..00000000
--- a/bsp/buildroot/board/embest/riotboard/readme.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-Buildroot for Embest RIoTboard
-==============================
-
-1. Compiling buildroot
-----------------------
-
-make riotboard_defconfig
-make
-
-2. Installing buildroot
------------------------
-
-Prepare an SD-card and plug it into your card reader. Write the bootloader to
-your SD-card:
-
-sudo dd if=output/images/u-boot.imx of=/dev/sdX bs=1k seek=1
-
-Create 1 partition on the SD-card using your favourite tool. The
-partition should be big enough to hold your rootfs, for example
-128MiB. Here's an example partition layout:
-
-   Device Boot      Start         End      Blocks   Id  System
-/dev/sdX1            2048      264191      131072   83  Linux
-
-Format the SD-card partition with your favourite filesystem:
-
-sudo mkfs.ext2 /dev/sdX1
-
-Deploy your rootfs to the SD-card:
-
-sudo mkdir /mnt/sdcard/
-sudo mount /dev/sdX1 /mnt/sdcard/
-sudo tar xf output/images/rootfs.tar -C /mnt/sdcard/
-sudo umount /dev/sdX1
-
-3. Running buildroot
---------------------
-
-Position the board so you can read the label "RIoTboard" on the right side of
-SW1 DIP switches. Configure the SW1 swiches like this:
-
-10100101 (1 means ON position, 0 means OFF position)
-
-Now plug your prepared SD-card in slot J6. Connect a serial console (115200, 8,
-N, 1) to header J18. Connect a 5V/1A power supply to the board and enjoy your
-new toy.
diff --git a/bsp/buildroot/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf b/bsp/buildroot/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf
deleted file mode 100644
index c7d32e00..00000000
--- a/bsp/buildroot/board/embest/riotboard/rootfs_overlay/boot/extlinux/extlinux.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-default buildroot
-
-label buildroot
-kernel /boot/uImage
-devicetree /boot/imx6dl-riotboard.dtb
-append console=ttymxc1,115200 root=/dev/mmcblk0p1 rw
diff --git a/bsp/buildroot/board/engicam/geam6ul/genimage.cfg b/bsp/buildroot/board/engicam/geam6ul/genimage.cfg
new file mode 100644
index 00000000..fcca6e17
--- /dev/null
+++ b/bsp/buildroot/board/engicam/geam6ul/genimage.cfg
@@ -0,0 +1,38 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"uImage",
+			"imx6ul-geam-kit.dtb"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition SPL {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1024
+	}
+
+	partition u-boot-dtb {
+		in-partition-table = "no"
+		image = "u-boot-dtb.img"
+		offset = 69K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 8M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+	}
+}
diff --git a/bsp/buildroot/board/engicam/geam6ul/readme.txt b/bsp/buildroot/board/engicam/geam6ul/readme.txt
new file mode 100644
index 00000000..ace993a6
--- /dev/null
+++ b/bsp/buildroot/board/engicam/geam6ul/readme.txt
@@ -0,0 +1,66 @@
+********************************************
+Buildroot for Engicam GEAM6UL SOM platforms:
+********************************************
+
+This file documents the Buildroot support for all Engicam GEAM6UL
+SOM platform boards.
+
+GEAM6UL SOM Starter kits:
+https://www.engicam.com/vis-prod/101115
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the Engicam GEAM6UL SOM:
+
+- for GEAM6UL SOM:
+
+  make engicam_imx6ul_geam_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/:
+  - imx6ul-geam-kit.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - SPL
+  - u-boot-dtb.img
+  - uImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+  sync
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/engicam/geam6ul/genimage.cfg
+
+Boot the GEAM6UL boards with SD boot:
+====================================
+
+To boot your newly created system:
+- insert the SD card in the SD slot of the board;
+- connect 3-wire RS232 serial port J28 on board, and connect with other
+  serial end or USB cable(if serial-to-usb converter used) using
+  a terminal emulator at 115200 bps, 8n1;
+- close JM3 for sd boot.
+- power on the board.
+
+Enjoy!
diff --git a/bsp/buildroot/board/engicam/icorem6/genimage.cfg b/bsp/buildroot/board/engicam/icorem6/genimage.cfg
new file mode 100644
index 00000000..835d9058
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6/genimage.cfg
@@ -0,0 +1,41 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"uImage",
+			"imx6dl-icore.dtb",
+			"imx6q-icore.dtb",
+			"imx6q-icore-ofcap10.dtb",
+			"imx6q-icore-ofcap12.dtb"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition SPL {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1024
+	}
+
+	partition u-boot-dtb {
+		in-partition-table = "no"
+		image = "u-boot-dtb.img"
+		offset = 69K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 8M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+	}
+}
diff --git a/bsp/buildroot/board/engicam/icorem6/linux_qt5.fragment b/bsp/buildroot/board/engicam/icorem6/linux_qt5.fragment
new file mode 100644
index 00000000..5c0505e5
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6/linux_qt5.fragment
@@ -0,0 +1,4 @@
+# Currently kernel mainline exhibits issues when running cpufreq as ondemand
+# governor on mx6.
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
diff --git a/bsp/buildroot/board/engicam/icorem6/readme.txt b/bsp/buildroot/board/engicam/icorem6/readme.txt
new file mode 100644
index 00000000..bd78c5a5
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6/readme.txt
@@ -0,0 +1,93 @@
+*********************************************
+Buildroot for Engicam i.CoreM6 SOM platforms:
+*********************************************
+
+This file documents the Buildroot support for Engicam i.CoreM6
+platform boards.
+
+i.CoreM6 Quad/Dual/DualLite/Solo SOM Starter kits:
+https://www.engicam.com/vis-prod/101120
+i.CoreM6 Quad/Dual/DualLite/Solo Open Frame 10.1 C.TOUCH kits:
+https://www.engicam.com/vis-prod/101133
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the Engicam i.CoreM6:
+
+  make engicam_imx6qdl_icore_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/:
+  - imx6q-icore.dtb (for i.CoreM6 Quad/Dual)
+  - imx6dl-icore.dtb (for i.CoreM6 DualLite/Solo)
+  - imx6q-icore-ofcap10.dtb (for i.CoreM6 Quad/Dual ofcap 10)
+  - imx6q-icore-ofcap12.dtb (for i.CoreM6 Quad/Dual ofcap 12)
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - SPL
+  - u-boot-dtb.img
+  - uImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+  sync
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/engicam/icorem6/genimage.cfg
+
+Boot the i.CoreM6 boards with SD boot:
+=====================================
+
+To boot your newly created system:
+- insert the SD card in the SD slot of the board;
+- connect 3-wire RS232 serial port J28 on board, and connect with other
+  serial end or USB cable(if serial-to-usb converter used) using
+  a terminal emulator at 115200 bps, 8n1;
+- close JM3 for sd boot.
+- power on the board.
+
+Testing graphics on i.CoreM6:
+============================
+
+Build with support for Etnaviv, Qt5 and demo applications:
+
+  make engicam_imx6qdl_icore_qt5_defconfig
+  make
+
+Running kmscube
+# kmscube -D /dev/dri/card1
+
+Running glmark2-es2-drm
+# glmark2-es2-drm
+
+Running Qt5 Cinematic Demo:
+- for i.CoreM6 Starter Kit
+# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore.json
+- for i.CoreM6 ofcap10
+# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore-ofcap10.json
+- for i.CoreM6 ofcap12
+# export QT_QPA_EGLFS_KMS_CONFIG=/root/imx6qdl-icore-ofcap12.json
+
+# CinematicExperience-demo
+
+Enjoy!
diff --git a/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json b/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json
new file mode 100644
index 00000000..963c7c00
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap10.json
@@ -0,0 +1,11 @@
+{
+  "device": "/dev/dri/card1",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "LVDS-1",
+      "mode": "1280x800"
+    }
+  ]
+}
diff --git a/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json b/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json
new file mode 100644
index 00000000..36700aff
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore-ofcap12.json
@@ -0,0 +1,11 @@
+{
+  "device": "/dev/dri/card1",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "LVDS-1",
+      "mode": "1280x480"
+    }
+  ]
+}
diff --git a/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json b/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json
new file mode 100644
index 00000000..ac139a3e
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6/rootfs_overlay/root/imx6qdl-icore.json
@@ -0,0 +1,11 @@
+{
+  "device": "/dev/dri/card1",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "LVDS-1",
+      "mode": "800x480"
+    }
+  ]
+}
diff --git a/bsp/buildroot/board/engicam/icorem6_rqs/genimage.cfg b/bsp/buildroot/board/engicam/icorem6_rqs/genimage.cfg
new file mode 100644
index 00000000..967d10b1
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6_rqs/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"uImage",
+			"imx6dl-icore-rqs.dtb",
+			"imx6q-icore-rqs.dtb"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition SPL {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1024
+	}
+
+	partition u-boot-dtb {
+		in-partition-table = "no"
+		image = "u-boot-dtb.img"
+		offset = 69K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 8M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+	}
+}
diff --git a/bsp/buildroot/board/engicam/icorem6_rqs/readme.txt b/bsp/buildroot/board/engicam/icorem6_rqs/readme.txt
new file mode 100644
index 00000000..a0bf6f50
--- /dev/null
+++ b/bsp/buildroot/board/engicam/icorem6_rqs/readme.txt
@@ -0,0 +1,69 @@
+*************************************************
+Buildroot for Engicam i.CoreM6 RQS SOM platforms:
+*************************************************
+
+This file documents the Buildroot support for Engicam i.CoreM6 RQS
+SOM platform boards.
+
+i.CoreM6 Quad/Dual/DualLite/Solo RQS SOM Starter kits:
+https://www.engicam.com/vis-prod/101124
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the Engicam i.CoreM6 RQS:
+
+- for i.CoreM6 RQS Quad/Dual/DualLite/Solo:
+
+  make engicam_imx6qdl_icore_rqs_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/:
+- for i.CoreM6 Quad/Dual RQS:
+  - imx6q-icore-rqs.dtb
+- for i.CoreM6 DualLite/Solo RQS:
+  - imx6dl-icore-rqs.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - SPL
+  - u-boot-dtb.img
+  - uImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+  sync
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/engicam/icorem6_rqs/genimage.cfg
+
+Boot the i.CoreM6 RQS boards with SD boot:
+=========================================
+
+To boot your newly created system:
+- insert the SD card in the SD slot of the board;
+- connect 3-wire RS232 serial port J7 on board, and connect with other
+  serial end or USB cable(if serial-to-usb converter used) using
+  a terminal emulator at 115200 bps, 8n1;
+- close JM2 for sd boot.
+- power on the board.
+
+Enjoy!
diff --git a/bsp/buildroot/board/engicam/isiot/genimage.cfg b/bsp/buildroot/board/engicam/isiot/genimage.cfg
new file mode 100644
index 00000000..dc8c20db
--- /dev/null
+++ b/bsp/buildroot/board/engicam/isiot/genimage.cfg
@@ -0,0 +1,38 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"uImage",
+			"imx6ul-isiot-emmc.dtb"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition SPL {
+		in-partition-table = "no"
+		image = "SPL"
+		offset = 1024
+	}
+
+	partition u-boot-dtb {
+		in-partition-table = "no"
+		image = "u-boot-dtb.img"
+		offset = 69K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+		offset = 8M
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext2"
+	}
+}
diff --git a/bsp/buildroot/board/engicam/isiot/readme.txt b/bsp/buildroot/board/engicam/isiot/readme.txt
new file mode 100644
index 00000000..5394007c
--- /dev/null
+++ b/bsp/buildroot/board/engicam/isiot/readme.txt
@@ -0,0 +1,66 @@
+********************************************
+Buildroot for Engicam Is.IoT SOM platforms:
+********************************************
+
+This file documents the Buildroot support for all Engicam Is.IoT MX6UL
+SOM platform boards.
+
+Is.IoT MX6UL SOM Starter kits:
+https://www.engicam.com/vis-prod/101122
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the Engicam Is.IoT MX6UL SOM:
+
+- for Is.IoT MX6UL SOM:
+
+  make engicam_imx6ul_isiot_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/:
+  - imx6ul-isiot-emmc.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - SPL
+  - u-boot-dtb.img
+  - uImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+  sync
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/engicam/isiot/genimage.cfg
+
+Boot the Is.IoT MX6UL boards with SD boot:
+=========================================
+
+To boot your newly created system:
+- insert the SD card in the SD slot of the board;
+- connect 3-wire RS232 serial port J28 on board, and connect with other
+  serial end or USB cable(if serial-to-usb converter used) using
+  a terminal emulator at 115200 bps, 8n1;
+- close JM3 for sd boot.
+- power on the board.
+
+Enjoy!
diff --git a/bsp/buildroot/board/firefly/firefly-rk3288/extlinux.conf b/bsp/buildroot/board/firefly/firefly-rk3288/extlinux.conf
deleted file mode 100644
index 39ac5b9d..00000000
--- a/bsp/buildroot/board/firefly/firefly-rk3288/extlinux.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-default firefly-rk3288
-
-label firefly-rk3288
-kernel /boot/uImage
-devicetree /boot/rk3288-firefly.dtb
-append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait
diff --git a/bsp/buildroot/board/firefly/firefly-rk3288/post-build.sh b/bsp/buildroot/board/firefly/firefly-rk3288/post-build.sh
deleted file mode 100755
index 94e89ce6..00000000
--- a/bsp/buildroot/board/firefly/firefly-rk3288/post-build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-BOARD_DIR="$(dirname $0)"
-
-install -m 0644 -D $BOARD_DIR/extlinux.conf $TARGET_DIR/boot/extlinux/extlinux.conf
diff --git a/bsp/buildroot/board/firefly/firefly-rk3288/post-image.sh b/bsp/buildroot/board/firefly/firefly-rk3288/post-image.sh
deleted file mode 100755
index 1dd30a6e..00000000
--- a/bsp/buildroot/board/firefly/firefly-rk3288/post-image.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-MKIMAGE=$HOST_DIR/usr/bin/mkimage
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/sd-image.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-$MKIMAGE -n rk3288 -T rksd -d $BINARIES_DIR/u-boot-spl-dtb.bin $BINARIES_DIR/u-boot-spl-dtb.img
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage							\
-	--rootpath "${TARGET_DIR}"		\
-	--tmppath "${GENIMAGE_TMP}"		\
-	--inputpath "${BINARIES_DIR}"	\
-	--outputpath "${BINARIES_DIR}"	\
-	--config "${GENIMAGE_CFG}"
-
-exit $?
diff --git a/bsp/buildroot/board/firefly/firefly-rk3288/readme.txt b/bsp/buildroot/board/firefly/firefly-rk3288/readme.txt
deleted file mode 100644
index d6210857..00000000
--- a/bsp/buildroot/board/firefly/firefly-rk3288/readme.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Firefly RK3288
-
-How to build it
-===============
-
-  $ make firefly_rk3288_defconfig
-
-Then you can edit the build options using
-
-  $ make menuconfig
-
-Compile all and build rootfs image:
-
-  $ make
-
-Result of the build
--------------------
-
-After building, you should get a tree like this:
-
-  output/images/
-  ├── rk3288-firefly.dtb
-  ├── rootfs.ext2
-  ├── rootfs.ext4 -> rootfs.ext2
-  ├── sdcard.img
-  ├── u-boot-dtb.img
-  ├── u-boot-spl-dtb.bin
-  ├── u-boot-spl-dtb.img
-  └── uImage
-
-Prepare your SDCard
-===================
-
-Buildroot generates a ready-to-use SD card image that you can flash directly to
-the card. The image will be in output/images/sdcard.img.
-You can write this image directly to an SD card device (i.e. /dev/xxx):
-
-  $ dd if=output/images/sdcard.img of=/dev/xxx
-
-Finally, you can insert the SD card to the Firefly RK3288 board and boot it.
diff --git a/bsp/buildroot/board/firefly/firefly-rk3288/sd-image.cfg b/bsp/buildroot/board/firefly/firefly-rk3288/sd-image.cfg
deleted file mode 100644
index a9eb9f01..00000000
--- a/bsp/buildroot/board/firefly/firefly-rk3288/sd-image.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-image sdcard.img {
-  hdimage {
-  }
-
-  partition u-boot-spl-dtb {
-    in-partition-table = "no"
-    image = "u-boot-spl-dtb.img"
-    offset = 32K
-  }
-
-  partition u-boot-dtb {
-    in-partition-table = "no"
-    image = "u-boot-dtb.img"
-    offset = 128K
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext4"
-    size = 512M
-  }
-}
diff --git a/bsp/buildroot/board/freescale/common/imx/genimage.cfg.template_spl b/bsp/buildroot/board/freescale/common/imx/genimage.cfg.template_spl
new file mode 100644
index 00000000..0b6e2286
--- /dev/null
+++ b/bsp/buildroot/board/freescale/common/imx/genimage.cfg.template_spl
@@ -0,0 +1,46 @@
+# Minimal SD card image for the Freescale boards Template for SPL Boot
+#
+# We mimic the .sdcard Freescale's image format:
+# * the SD card must have 1 kB free space at the beginning,
+# * U-Boot is dumped as is,
+# * a FAT partition at offset 8MB is containing zImage/uImage and DTB files
+# * a single root filesystem partition is required (ext2, ext3 or ext4)
+#
+
+image boot.vfat {
+  vfat {
+    files = {
+      %FILES%
+    }
+  }
+  size = 16M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition spl {
+    in-partition-table = "no"
+    image = "SPL"
+    offset = 1024
+  }
+
+  partition u-boot-img {
+    in-partition-table = "no"
+    image = "u-boot.img"
+    offset = 69K
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+    offset = 8M
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext2"
+  }
+}
diff --git a/bsp/buildroot/board/freescale/common/imx/post-image.sh b/bsp/buildroot/board/freescale/common/imx/post-image.sh
index 9e4da82d..b2397434 100755
--- a/bsp/buildroot/board/freescale/common/imx/post-image.sh
+++ b/bsp/buildroot/board/freescale/common/imx/post-image.sh
@@ -28,6 +28,15 @@ linux_image()
 	fi
 }
 
+genimage_type()
+{
+	if grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then
+		echo "genimage.cfg.template_spl"
+	else
+		echo "genimage.cfg.template"
+	fi
+}
+
 main()
 {
 	local FILES="$(dtb_list) $(linux_image)"
@@ -35,7 +44,7 @@ main()
 	local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 
 	sed -e "s/%FILES%/${FILES}/" \
-		board/freescale/common/imx/genimage.cfg.template > ${GENIMAGE_CFG}
+		board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG}
 
 	rm -rf "${GENIMAGE_TMP}"
 
diff --git a/bsp/buildroot/board/freescale/imx31_3stack/linux.fragment b/bsp/buildroot/board/freescale/imx31_3stack/linux.fragment
deleted file mode 100644
index beb6b46f..00000000
--- a/bsp/buildroot/board/freescale/imx31_3stack/linux.fragment
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FB_MXS is not set
diff --git a/bsp/buildroot/board/freescale/imx31_3stack/readme.txt b/bsp/buildroot/board/freescale/imx31_3stack/readme.txt
deleted file mode 100644
index 4f8f393b..00000000
--- a/bsp/buildroot/board/freescale/imx31_3stack/readme.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-**************************************
-Freescale i.MX31 PDK development board
-**************************************
-
-This file documents the Buildroot support for the Freescale i.MX31 PDK in "3
-stack" configuration.
-
-The i.MX31 Product Development Kit (or PDK) is Freescale development board [1]
-based on the i.MX31 application processor [2].
-
-For more details on the i.MX31 PDK board, refer to the User's Guide [3].
-
-Build
-=====
-
-First, configure Buildroot for your i.MX31 PDK board:
-
-  make freescale_imx31_3stack_defconfig
-
-Build all components:
-
-  make
-
-You will find in ./output/images/ the following files:
-  - rootfs.cpio
-  - rootfs.cpio.gz
-  - rootfs.tar
-  - zImage
-
-The generated zImage does include the rootfs.
-
-Boot the PDK board
-==================
-
-The i.MX31 PDK contains a RedBoot bootloader in flash, which can be used to
-boot the newly created Buildroot images from the network.
-
-This necessitates to setup a TFTP server first. This setup is explained for
-example in Freescale i.MX31 PDK 1.5 Linux User's Guide [4].
-
-Here is a sample RedBoot configuration, for proper network boot of Buildroot on
-the i.MX31 PDK:
-
-    RedBoot> fconfig -l
-    Run script at boot: true
-    Boot script:
-    .. load -r -b 0x100000 zImage
-    .. exec -c "console=ttymxc0,115200"
-
-    Boot script timeout (1000ms resolution): 2
-    Use BOOTP for network configuration: false
-    Gateway IP address: <your gateway IP address>
-    Local IP address: <your PDK IP address>
-    Local IP address mask: 255.255.255.0
-    Default server IP address: <your TFTP server IP address>
-    Board specifics: 0
-    Console baud rate: 115200
-    Set eth0 network hardware address [MAC]: false
-    GDB connection port: 9000
-    Force console for special debug messages: false
-    Network debug at boot time: false
-
-Adapt those settings to your network configuration by replacing the appropriate
-network addresses where necessary.
-
-You might want to verify that your i.MX31 PDK switches settings are the correct
-ones for UART, power, boot mode, etc. Here is a reference switches
-configuration:
-
-    SW4
-    1   2   3   4   5   6   7  8
-    ON off off off off off off ON
-
-    SW5 SW6 SW7 SW8 SW9 SW10
-     0   1   0   0   0    0
-
-See the i.MX31 PDK Linux Quick Start Guide [5] for more details on the switches
-settings.
-
-Connect a serial terminal set to 115200n8 and power on the i.MX31 PDK board.
-Buildroot will present a login prompt on the serial port.
-
-Enjoy!
-
-References
-==========
-
-[1] http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MX31PDK
-[2] http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=i.MX31
-[3] http://cache.freescale.com/files/32bit/doc/user_guide/pdk15_imx31_Hardware_UG.pdf
-[4] http://cache.freescale.com/files/32bit/doc/support_info/IMX31_PDK15_LINUXDOCS_BUNDLE.zip, pdk15_imx31__Linux_UG.pdf
-[5] http://www.freescale.com/files/32bit/doc/quick_ref_guide/PDK14LINUXQUICKSTART.pdf
diff --git a/bsp/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment b/bsp/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment
new file mode 100644
index 00000000..d4f26b16
--- /dev/null
+++ b/bsp/buildroot/board/freescale/imx6-sabresd/linux_qt5.fragment
@@ -0,0 +1,5 @@
+# Currently mx6sabresd exhibits touchscreen issues when running cpufreq as
+# ondemand governor with a mainline kernel.
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+CONFIG_VIDEO_CODA=m
diff --git a/bsp/buildroot/board/freescale/imx6-sabresd/readme.txt b/bsp/buildroot/board/freescale/imx6-sabresd/readme.txt
new file mode 100644
index 00000000..f09ff5ca
--- /dev/null
+++ b/bsp/buildroot/board/freescale/imx6-sabresd/readme.txt
@@ -0,0 +1,110 @@
+*******************************
+Freescale i.MX6 Sabre SD boards
+*******************************
+
+This file documents the Buildroot support for the Freescale i.MX6 Sabre SD
+boards based on i.MX6Q, i.MX6DL and iMX6QP.
+
+Thanks to the SPL support in U-Boot it is possible to run a single
+sdcard.img in all i.MX6 Sabre SD board variants.
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+Build
+=====
+
+First, configure Buildroot for the i.MX6 Sabre SD board:
+
+  make imx6-sabresd_defconfig
+
+Build all components:
+
+  make
+
+You will find the following files in output/images/ :
+  - imx6q-sabresd.dtb
+  - imx6dl-sabresd.dtb
+  - imx6qp-sabresd.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - u-boot.imx
+  - zImage
+
+Create a bootable SD card
+=========================
+
+To determine the device associated to the SD card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on a SD card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the card content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template.
+
+Boot the i.MX6 Sabre SD board
+=============================
+
+To boot your newly created system:
+- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+  emulator at 115200 bps, 8n1;
+- power on the board.
+
+Testing graphics on the i.MX6 Sabre SD board
+============================================
+
+The imx6-sabresd_qt5_defconfig allows to quickly test the graphics
+capabilities of i.MX6 using the opensource Etnaviv graphics stack
+and kernel mainline.
+
+In order to build it:
+
+make imx6-sabresd_qt5_defconfig
+make
+
+Then flash the SD card as explained above.
+
+Running kmscube application:
+
+# kmscube
+
+Running Qt5 Cinematic Demo:
+
+# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
+# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
+
+Running gl2mark benchmark:
+
+# glmark2-es2-drm
+
+Testing video playback on the i.MX6 Sabre SD board
+==================================================
+
+As the mx6sabresd has two display outputs (LVDS and HDMI), it is necessary to
+know what is the connector that corresponds to the HDMI output.
+
+This information can be found by running:
+
+# modetest
+
+And search for the HDMI connector number. In our case it shows up as 37.
+
+In the mx6sabresd prompt run the following Gstreamer pipeline:
+
+# gst-launch-1.0 filesrc location=/root/trailer_1080p_h264_mp3.avi ! avidemux ! \
+h264parse ! v4l2video1dec capture-io-mode=dmabuf ! kmssink connector-id=37    \
+name=imx-drm sync=0
+
+(The video used on this example was retrieved from:
+http://linode.boundarydevices.com/videos/trailer_1080p_h264_mp3.avi)
+
+Enjoy!
diff --git a/bsp/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json b/bsp/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
new file mode 100644
index 00000000..d5d063af
--- /dev/null
+++ b/bsp/buildroot/board/freescale/imx6-sabresd/rootfs_overlay/root/sabresd.json
@@ -0,0 +1,15 @@
+{
+  "device": "/dev/dri/card0",
+  "hwcursor": false,
+  "pbuffers": true,
+  "outputs": [
+    {
+      "name": "HDMI-1",
+      "mode": "off"
+    },
+    {
+      "name": "LVDS-1",
+      "mode": "1024x768"
+    }
+  ]
+}
diff --git a/bsp/buildroot/board/freescale/imx6q-sabresd/readme.txt b/bsp/buildroot/board/freescale/imx6q-sabresd/readme.txt
deleted file mode 100644
index 10e973cf..00000000
--- a/bsp/buildroot/board/freescale/imx6q-sabresd/readme.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-*******************************
-Freescale i.MX6Q Sabre SD board
-*******************************
-
-This file documents the Buildroot support for the Freescale i.MX6Q Sabre SD
-board.
-
-This configuration uses U-Boot mainline and kernel mainline.
-
-Build
-=====
-
-First, configure Buildroot for the i.MX6Q Sabre SD board:
-
-  make imx6q-sabresd_defconfig
-
-Build all components:
-
-  make
-
-You will find the following files in output/images/ :
-  - imx6q-sabresd.dtb
-  - rootfs.ext4
-  - rootfs.tar
-  - sdcard.img
-  - u-boot.imx
-  - zImage
-
-Create a bootable SD card
-=========================
-
-To determine the device associated to the SD card have a look in the
-/proc/partitions file:
-
-  cat /proc/partitions
-
-Buildroot prepares a bootable "sdcard.img" image in the output/images/
-directory, ready to be dumped on a SD card. Launch the following
-command as root:
-
-  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
-
-*** WARNING! This will destroy all the card content. Use with care! ***
-
-For details about the medium image layout, see the definition in
-board/freescale/common/imx/genimage.cfg.template.
-
-Boot the i.MX6Q Sabre SD board
-==============================
-
-To boot your newly created system:
-- insert the SD card in the SD3 slot of the board (close to the HDMI connector);
-- put a micro USB cable into the Debug USB Port and connect using a terminal
-  emulator at 115200 bps, 8n1;
-- power on the board.
-
-Enjoy!
diff --git a/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch b/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch
new file mode 100644
index 00000000..92eff757
--- /dev/null
+++ b/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/0002-imximage-Remove-failure-when-no-IVT-offset-is-found.patch
@@ -0,0 +1,55 @@
+From 24ba28680abe868e8db3442a9bf523ad3af1febd Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fabio.estevam@nxp.com>
+Date: Fri, 9 Mar 2018 08:25:00 -0300
+Subject: [PATCH] imximage: Remove failure when no IVT offset is found
+
+Sometimes imximage throws the following error:
+
+  CFGS    board/freescale/vf610twr/imximage.cfg.cfgtmp
+  CFGS    board/freescale/vf610twr/imximage.cfg.cfgtmp
+  MKIMAGE u-boot-dtb.imx
+Error: No BOOT_FROM tag in board/freescale/vf610twr/imximage.cfg.cfgtmp
+arch/arm/mach-imx/Makefile:100: recipe for target 'u-boot-dtb.imx' failed
+
+Later on, when running mkimage for the u-boot.imx it will succeed in
+finding the IVT offset.
+
+Looks like some race condition happening during parallel build when
+processing mkimage for u-boot-dtb.imx and u-boot.imx.
+
+A proper fix still needs to be implemented, but as a workaround let's
+remove the error when the IVT offset is not found.
+
+It is useful to have such message, especially during bring-up phase,
+but the build error that it causes is severe, so better avoid the
+build error for now.
+
+The error checking can be re-implemented later when we have a proper
+fix.
+
+Reported-by: Breno Lima <breno.lima@nxp.com>
+Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
+---
+ tools/imximage.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/tools/imximage.c b/tools/imximage.c
+index 0c43196..bef56f8 100644
+--- a/tools/imximage.c
++++ b/tools/imximage.c
+@@ -765,11 +765,6 @@ static uint32_t parse_cfg_file(struct imx_header *imxhdr, char *name)
+ 	(*set_dcd_rst)(imxhdr, dcd_len, name, lineno);
+ 	fclose(fd);
+ 
+-	/* Exit if there is no BOOT_FROM field specifying the flash_offset */
+-	if (imximage_ivt_offset == FLASH_OFFSET_UNDEFINED) {
+-		fprintf(stderr, "Error: No BOOT_FROM tag in %s\n", name);
+-		exit(EXIT_FAILURE);
+-	}
+ 	return dcd_len;
+ }
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch b/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
index 9e2aebf3..d57875f8 100644
--- a/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
+++ b/bsp/buildroot/board/freescale/imx6sabre/patches/uboot/uboot-0001-mx6qsabre_common-boot-Linux-to-init-in-mfgtools-mode.patch
@@ -22,10 +22,10 @@ diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common
 index 93d4c4b..d2e7efd 100644
 --- a/include/configs/mx6sabre_common.h
 +++ b/include/configs/mx6sabre_common.h
-@@ -106,7 +106,7 @@
+@@ -52,7 +52,7 @@
  
  #define CONFIG_MFG_ENV_SETTINGS \
- 	"mfgtool_args=setenv bootargs console=" CONFIG_CONSOLE_DEV ",115200 " \
+ 	"mfgtool_args=setenv bootargs console=" CONSOLE_DEV ",115200 " \
 -		"rdinit=/linuxrc " \
 +		"rdinit=/init " \
  		"g_mass_storage.stall=0 g_mass_storage.removable=1 " \
diff --git a/bsp/buildroot/board/freescale/imx6sabre/readme.txt b/bsp/buildroot/board/freescale/imx6sabre/readme.txt
index a1bd82fd..4b8db523 100644
--- a/bsp/buildroot/board/freescale/imx6sabre/readme.txt
+++ b/bsp/buildroot/board/freescale/imx6sabre/readme.txt
@@ -18,8 +18,8 @@ Read the SABRE for Automotive Infotainment Quick Start Guide for an
 introduction to the board:
 http://cache.freescale.com/files/32bit/doc/user_guide/IMX6SABREINFOQSG.pdf
 
-Build
-=====
+Building with NXP kernel and NXP U-Boot
+=======================================
 
 First, configure Buildroot for your SABRE board.
 For i.MX6Q SABRE SD board:
@@ -54,6 +54,27 @@ You will find in ./output/images/ the following files:
   - u-boot.imx
   - uImage, or zImage for i.MX6 SoloX
 
+Building with mainline kernel and mainline U-Boot
+=================================================
+
+Mainline U-Boot uses SPL and can support the three
+variants of mx6sabreauto boards: mx6q, mx6dl and mx6qp.
+
+First, configure Buildroot for your mx6sabreauto board
+
+  make imx6-sabreauto_defconfig
+
+Build all components:
+
+  make
+
+You will find in output/images/ the following files:
+  - imx6dl-sabresd.dtb, imx6q-sabresd.dtb, imx6q-sabresd.dtb
+  - rootfs.ext2
+  - SPL and u-boot.img
+  - u-boot.imx
+  - zImage
+
 Create a bootable SD card
 =========================
 
diff --git a/bsp/buildroot/board/freescale/imx6slevk/readme.txt b/bsp/buildroot/board/freescale/imx6slevk/readme.txt
new file mode 100644
index 00000000..424380e3
--- /dev/null
+++ b/bsp/buildroot/board/freescale/imx6slevk/readme.txt
@@ -0,0 +1,14 @@
+NXP i.MX6SL EVK board
+---------------------
+
+To build a minimal support for this board:
+
+$ make imx6slevk_defconfig
+$ make
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be flashed into the SD card:
+
+$ sudo dd if=output/images/sdcard.img of=/dev/<sd-card-device>; sync
+
+Then insert the SD card into the SD2 slot and boot the board.
diff --git a/bsp/buildroot/board/freescale/imx6sxsdb/readme.txt b/bsp/buildroot/board/freescale/imx6sxsdb/readme.txt
new file mode 100644
index 00000000..2779075f
--- /dev/null
+++ b/bsp/buildroot/board/freescale/imx6sxsdb/readme.txt
@@ -0,0 +1,14 @@
+NXP i.MX6SX SDB board
+---------------------
+
+To build a minimal support for this board:
+
+$ make imx6sx-sdb_defconfig
+$ make
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be flashed into the SD card:
+
+$ sudo dd if=output/images/sdcard.img of=/dev/<sd-card-device>; sync
+
+Then insert the SD card into the SD4 boot slot and boot the board.
diff --git a/bsp/buildroot/board/freescale/imx6ulevk/readme.txt b/bsp/buildroot/board/freescale/imx6ulevk/readme.txt
index 25b95fec..90355f35 100644
--- a/bsp/buildroot/board/freescale/imx6ulevk/readme.txt
+++ b/bsp/buildroot/board/freescale/imx6ulevk/readme.txt
@@ -12,8 +12,18 @@ Build
 
 First, configure Buildroot for your i.MX6UL EVK board:
 
+In order to to do so there are two supported options:
+
   make freescale_imx6ulevk_defconfig
 
+if you plan to use NXP provided U-Boot and kernel.
+
+or
+
+  make imx6ulevk_defconfig
+
+if you plan to use mainline U-Boot and mainline kernel.
+
 Build all components:
 
   make
diff --git a/bsp/buildroot/board/freescale/mpc8315erdb/linux-4.5.config b/bsp/buildroot/board/freescale/mpc8315erdb/linux-4.5.config
deleted file mode 100644
index 8f560693..00000000
--- a/bsp/buildroot/board/freescale/mpc8315erdb/linux-4.5.config
+++ /dev/null
@@ -1,70 +0,0 @@
-CONFIG_FSL_EMB_PERFMON=y
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_EMBEDDED=y
-CONFIG_MODULES=y
-# CONFIG_PPC_CHRP is not set
-# CONFIG_PPC_PMAC is not set
-CONFIG_PPC_83xx=y
-CONFIG_MPC831x_RDB=y
-CONFIG_MCU_MPC8349EMITX=y
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-# CONFIG_PCIEASPM is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_FSL_ELBC=y
-CONFIG_SCSI_MQ_DEFAULT=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_CONSTANTS=y
-CONFIG_ATA=y
-CONFIG_SATA_FSL=y
-CONFIG_NETDEVICES=y
-CONFIG_GIANFAR=y
-CONFIG_REALTEK_PHY=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MPC=y
-CONFIG_SPI=y
-CONFIG_SPI_FSL_SPI=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_MPC8XXX=y
-CONFIG_WATCHDOG=y
-CONFIG_8xxx_WDT=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_FSL=y
-CONFIG_USB_STORAGE=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_DS1307=y
-CONFIG_RTC_DRV_GENERIC=y
-CONFIG_DMADEVICES=y
-CONFIG_FSL_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-CONFIG_EXT4_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_VFAT_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_SQUASHFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_CRYPTO_DEV_TALITOS=y
diff --git a/bsp/buildroot/board/freescale/mpc8315erdb/readme.txt b/bsp/buildroot/board/freescale/mpc8315erdb/readme.txt
deleted file mode 100644
index b4c87b4d..00000000
--- a/bsp/buildroot/board/freescale/mpc8315erdb/readme.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-You'll need to program the files created by buildroot into the flash.
-The fast way is to tftp transfer the files via one of the network interfaces.
-
-Alternatively you can transfer the files via serial console with an Ymodem
-file transfer from your terminal program by using a "loady" command
-from the u-boot prompt instead of the "tftp ..." commands stated below.
-Beware that serial console file transfers are quite slow!
-
-1. Program the kernel to NAND flash
-
-    => tftp $loadaddr uImage
-    => nand erase 0x100000 0x1e0000
-    => nand write $loadaddr 0x100000 0x1e0000
-
-2. Program the DTB to NAND flash
-
-    => tftp $loadaddr mpc8315erdb.dtb
-    => nand erase 0x2e0000 0x20000
-    => nand write $loadaddr 0x2e0000 0x20000
-
-3. Program the root filesystem to NAND flash
-
-    => tftp $loadaddr rootfs.jffs2
-    => nand erase 0x400000 0x1c00000
-    => nand write $loadaddr 0x400000 $filesize
-
-4. Booting your new system
-
-    => setenv nandboot 'setenv bootargs root=/dev/mtdblock3 rootfstype=jffs2 console=$consoledev,$baudrate;nand read $fdtaddr 0x2e0000 0x20000;nand read $loadaddr 0x100000 0x1e0000;bootm $loadaddr - $fdtaddr'
-
-    If you want to set this boot option as default:
-
-    => setenv bootcmd 'run nandboot'
-    => saveenv
-
-    ...or for a single boot:
-
-    => run nandboot
-
-    You can login with user "root".
diff --git a/bsp/buildroot/board/freescale/p1010rdb/linux-4.1.config b/bsp/buildroot/board/freescale/p1010rdb/linux-4.1.config
deleted file mode 100644
index 2de430cb..00000000
--- a/bsp/buildroot/board/freescale/p1010rdb/linux-4.1.config
+++ /dev/null
@@ -1,70 +0,0 @@
-CONFIG_PPC_85xx=y
-CONFIG_PHYS_64BIT=y
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_EXPERT=y
-CONFIG_MODULES=y
-CONFIG_P1010_RDB=y
-CONFIG_HIGHMEM=y
-CONFIG_SWIOTLB=y
-CONFIG_FORCE_MAX_ZONEORDER=12
-CONFIG_PCI=y
-CONFIG_PCI_MSI=y
-CONFIG_RAPIDIO=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_DEVTMPFS=y
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_FTL=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_PHYSMAP_OF=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_FSL_ELBC=y
-CONFIG_MTD_NAND_FSL_IFC=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_ATA=y
-CONFIG_SATA_FSL=y
-CONFIG_NETDEVICES=y
-CONFIG_GIANFAR=y
-CONFIG_VITESSE_PHY=y
-CONFIG_FIXED_PHY=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250_MANY_PORTS=y
-CONFIG_SERIAL_8250_DETECT_IRQ=y
-CONFIG_SERIAL_8250_RSA=y
-CONFIG_NVRAM=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MPC=y
-CONFIG_SPI=y
-CONFIG_SPI_FSL_SPI=y
-CONFIG_SPI_FSL_ESPI=y
-CONFIG_USB=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_FSL=y
-CONFIG_USB_STORAGE=y
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_OF_ESDHC=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_DMADEVICES=y
-CONFIG_FSL_DMA=y
-CONFIG_EXT4_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_SQUASHFS=y
-CONFIG_CRYPTO_DEV_FSL_CAAM=y
diff --git a/bsp/buildroot/board/freescale/p1010rdb/readme.txt b/bsp/buildroot/board/freescale/p1010rdb/readme.txt
deleted file mode 100644
index 025c97e8..00000000
--- a/bsp/buildroot/board/freescale/p1010rdb/readme.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-You'll need to program the files created by buildroot into the flash.
-The fast way is to tftp transfer the files via one of the network interfaces.
-
-Alternatively you can transfer the files via serial console with an Ymodem
-file transfer from your terminal program by using a "loady" command
-from the u-boot prompt instead of the "tftp ..." commands stated below.
-Beware that serial console file transfers are quite slow!
-
-1. Program the DTB to NOR flash
-
-    => tftp $loadaddr p1010rdb-pa.dtb
-    => erase 0xee000000 +$filesize
-    => cp.b $loadaddr 0xee000000 $filesize
-
-2. Program the kernel to NOR flash
-
-    => tftp $loadaddr uImage
-    => erase 0xee080000 +$filesize
-    => cp.b $loadaddr 0xee080000 $filesize
-
-3. Program the root filesystem to NOR flash
-
-    => tftp $loadaddr rootfs.jffs2
-    => erase 0xee800000 0xeff5ffff
-    => cp.b $loadaddr 0xee800000 $filesize
-
-4. Booting your new system
-
-    => setenv norboot 'setenv bootargs root=/dev/mtdblock2 rootfstype=jffs2 console=$consoledev,$baudrate;bootm 0xee080000 - 0xee000000'
-
-    If you want to set this boot option as default:
-
-    => setenv bootcmd 'run norboot'
-    => saveenv
-
-    ...or for a single boot:
-
-    => run norboot
-
-    You can login with user "root".
diff --git a/bsp/buildroot/board/freescale/warpboard/README b/bsp/buildroot/board/freescale/warpboard/README
index 55d51f87..67d4e044 100644
--- a/bsp/buildroot/board/freescale/warpboard/README
+++ b/bsp/buildroot/board/freescale/warpboard/README
@@ -23,7 +23,7 @@ Update uboot
 
 - Load u-boot.imx in the WarpBoard by using the imx-usb-loader host utility:
 
-  $ ./output/host/usr/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx
+  $ ./output/host/bin/imx_usb -c output/host/etc/imx-loader.d/ output/images/u-boot.imx
 
 - U-Boot will appear in minicom
 
@@ -36,7 +36,7 @@ Update uboot
 
 - Transfer U-Boot into flash by running this command in host side:
 
- $ sudo ./output/host/usr/bin/dfu-util -D output/images/u-boot.imx -a boot
+ $ sudo ./output/host/bin/dfu-util -D output/images/u-boot.imx -a boot
 
 - remove power and put the WarpBoard back into normal boot mode by
   opening the j2 jumper.
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-a64/boot.cmd b/bsp/buildroot/board/friendlyarm/nanopi-a64/boot.cmd
new file mode 100644
index 00000000..446bd856
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-a64/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-a64-nanopi-a64.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-a64/genimage.cfg b/bsp/buildroot/board/friendlyarm/nanopi-a64/genimage.cfg
new file mode 100644
index 00000000..66b6c5f4
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-a64/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-a64-nanopi-a64.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-a64/readme.txt b/bsp/buildroot/board/friendlyarm/nanopi-a64/readme.txt
new file mode 100644
index 00000000..88c4e661
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-a64/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Nanopi A64. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Nanopi A64 link:
+http://nanopi.io/nanopi-a64.html
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+Nanopi+A64
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make friendlyarm_nanopi_a64_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Nanopi A64 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/boot.cmd b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/boot.cmd
new file mode 100644
index 00000000..35a1d65d
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1-plus.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/genimage.cfg b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/genimage.cfg
new file mode 100644
index 00000000..fdb3b906
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/genimage.cfg
@@ -0,0 +1,35 @@
+# Minimal SD card image for the NanoPi M1 Plus
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-nanopi-m1-plus.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch
new file mode 100644
index 00000000..c0527326
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/patches/linux/0001-ARM-dts-nanopi-m1-plus-add-dts-to-linux-4.11.5.patch
@@ -0,0 +1,103 @@
+From 4ec28d4e1040b94c66e97aa77071c9ef3478f022 Mon Sep 17 00:00:00 2001
+From: Chakra Divi <chakra@openedev.com>
+Date: Thu, 6 Jul 2017 18:22:35 +0530
+Subject: [PATCH] ARM: dts: nanopi-m1-plus : add dts to linux 4.11.5
+
+This patch is used to add nanopi-m1-plus dts
+file in linux source code helps to add nanopi-m1-plus
+board support in buildroot and is part of the linux
+main-line ; refer to the below link for info
+[https://patchwork.kernel.org/patch/9755033]
+
+Signed-off-by: Chakra Divi <chakra@openedev.com>
+---
+ arch/arm/boot/dts/Makefile                    |    1 +
+ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts |   64 +++++++++++++++++++++++++
+ 2 files changed, 65 insertions(+)
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 0118084..928e5d3 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -867,6 +867,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \
+ 	sun8i-h3-bananapi-m2-plus.dtb \
+ 	sun8i-h3-beelink-x2.dtb \
+ 	sun8i-h3-nanopi-m1.dtb	\
++	sun8i-h3-nanopi-m1-plus.dtb \
+ 	sun8i-h3-nanopi-neo.dtb \
+ 	sun8i-h3-orangepi-2.dtb \
+ 	sun8i-h3-orangepi-lite.dtb \
+diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+new file mode 100644
+index 0000000..8ddd1b2
+--- /dev/null
++++ b/arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
+@@ -0,0 +1,64 @@
++/*
++ * Copyright (C) 2017 Jagan Teki <jteki@openedev.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful,
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively,
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use,
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++#include "sun8i-h3-nanopi.dtsi"
++
++/ {
++	model = "FriendlyArm NanoPi M1 Plus";
++	compatible = "friendlyarm,nanopi-m1-plus", "allwinner,sun8i-h3";
++};
++
++&ehci1 {
++	status = "okay";
++};
++
++&ehci2 {
++	status = "okay";
++};
++
++&ohci1 {
++	status = "okay";
++};
++
++&ohci2 {
++	status = "okay";
++};
+-- 
+1.7.9.5
+
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt
new file mode 100644
index 00000000..3e16c8af
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1-plus/readme.txt
@@ -0,0 +1,29 @@
+NanoPi M1 Plus
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the NanoPi M1 Plus. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make nanopi_m1_plus_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1/boot.cmd b/bsp/buildroot/board/friendlyarm/nanopi-m1/boot.cmd
new file mode 100644
index 00000000..b4d612ed
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-nanopi-m1.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1/genimage.cfg b/bsp/buildroot/board/friendlyarm/nanopi-m1/genimage.cfg
new file mode 100644
index 00000000..23c9c7dc
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the NanoPi M1
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-nanopi-m1.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-m1/readme.txt b/bsp/buildroot/board/friendlyarm/nanopi-m1/readme.txt
new file mode 100644
index 00000000..8b10e4b7
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-m1/readme.txt
@@ -0,0 +1,29 @@
+NanoPi M1
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the NanoPi M1. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make nanopi_m1_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/bsp/buildroot/board/nanopi-neo/boot.cmd b/bsp/buildroot/board/friendlyarm/nanopi-neo/boot.cmd
similarity index 100%
rename from bsp/buildroot/board/nanopi-neo/boot.cmd
rename to bsp/buildroot/board/friendlyarm/nanopi-neo/boot.cmd
diff --git a/bsp/buildroot/board/nanopi-neo/genimage.cfg b/bsp/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg
similarity index 100%
rename from bsp/buildroot/board/nanopi-neo/genimage.cfg
rename to bsp/buildroot/board/friendlyarm/nanopi-neo/genimage.cfg
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-neo/post-build.sh b/bsp/buildroot/board/friendlyarm/nanopi-neo/post-build.sh
new file mode 100755
index 00000000..9759efb5
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-neo/post-build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+# post-build.sh for Nanopi NEO, based on the Orange Pi PC
+# 2013, Carlo Caione <carlo.caione@gmail.com>
+# 2016, "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+BOARD_DIR="$( dirname "${0}" )"
+MKIMAGE="${HOST_DIR}/bin/mkimage"
+BOOT_CMD="${BOARD_DIR}/boot.cmd"
+BOOT_CMD_H="${BINARIES_DIR}/boot.scr"
+
+# U-Boot script
+"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}"
diff --git a/bsp/buildroot/board/nanopi-neo/post-image.sh b/bsp/buildroot/board/friendlyarm/nanopi-neo/post-image.sh
similarity index 100%
rename from bsp/buildroot/board/nanopi-neo/post-image.sh
rename to bsp/buildroot/board/friendlyarm/nanopi-neo/post-image.sh
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-neo/readme.txt b/bsp/buildroot/board/friendlyarm/nanopi-neo/readme.txt
new file mode 100644
index 00000000..539df541
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-neo/readme.txt
@@ -0,0 +1,42 @@
+Intro
+=====
+
+The instructions herein are valid for the FriendlyARM NanoPi NEO,
+both the 256MiB and 512MiB versions. They should also work for the
+NanoPi NEO Air, but this is untested so far.
+
+The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC:
+  - quad-core Cortex-A7 @1.2GHz
+  - 256 or 512MiB of DDR
+  - uSDCard as only storage option
+  - 3x USB 2.0 host (one socket, two on expansion pin-holes)
+  - 1x USB 2.0 OTG (also used as power source)
+  - 10/100 ethernet MAC
+  - GPIOs, SPI, I2c...
+
+Support for the Nanopi NEO in U-Boot and Linux is very recent, so only
+core, basic features are available.
+
+Unfortunately, support for the ethernet MAC and the USB OTG are not
+yet upstream, but are being actively worked on.
+
+
+How to build
+============
+
+    $ make nanopi_neo_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+You will then obtain an image ready to be written to your micro SDcard:
+
+    $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M
+
+Notes:
+  - replace 'sdX' with the actual device with your micro SDcard,
+  - you may need to be root to do that (use 'sudo').
+
+Insert the micro SDcard in your NanoPi NEO and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-neo2/boot.cmd b/bsp/buildroot/board/friendlyarm/nanopi-neo2/boot.cmd
new file mode 100644
index 00000000..9a39f4af
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-neo2/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-h5-nanopi-neo2.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-neo2/genimage.cfg b/bsp/buildroot/board/friendlyarm/nanopi-neo2/genimage.cfg
new file mode 100644
index 00000000..ebe123b7
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-neo2/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-h5-nanopi-neo2.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/friendlyarm/nanopi-neo2/readme.txt b/bsp/buildroot/board/friendlyarm/nanopi-neo2/readme.txt
new file mode 100644
index 00000000..0f445e2b
--- /dev/null
+++ b/bsp/buildroot/board/friendlyarm/nanopi-neo2/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Nanopi NEO2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Nanopi NEO2 link:
+http://nanopi.io/nanopi-neo2.html
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/FriendlyARM+NanoPi+NEO2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make friendlyarm_nanopi_neo2_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Nanopi NEO2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/gdb/bfin-bf512/linux-4.6.config b/bsp/buildroot/board/gdb/bfin-bf512/linux.config
similarity index 100%
rename from bsp/buildroot/board/gdb/bfin-bf512/linux-4.6.config
rename to bsp/buildroot/board/gdb/bfin-bf512/linux.config
diff --git a/bsp/buildroot/board/gdb/bfin-bf512/readme.txt b/bsp/buildroot/board/gdb/bfin-bf512/readme.txt
index a56b5bcf..b8ff250a 100644
--- a/bsp/buildroot/board/gdb/bfin-bf512/readme.txt
+++ b/bsp/buildroot/board/gdb/bfin-bf512/readme.txt
@@ -1,10 +1,10 @@
 Run the simulation with GDB for FDPIC:
 
- ./output/host/usr/bin/bfin-buildroot-linux-uclibc-run --env operating --model bf512 output/images/vmlinux
+ ./output/host/bin/bfin-buildroot-linux-uclibc-run --env operating --model bf512 output/images/vmlinux
 
 Run the simulation with GDB for FLAT:
 
- ./output/host/usr/bin/bfin-buildroot-uclinux-uclibc-run --env operating --model bf512 output/images/vmlinux
+ ./output/host/bin/bfin-buildroot-uclinux-uclibc-run --env operating --model bf512 output/images/vmlinux
 
 The login prompt will appear in the terminal that started GDB.
 
diff --git a/bsp/buildroot/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch b/bsp/buildroot/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch
deleted file mode 100644
index b6ea1b69..00000000
--- a/bsp/buildroot/board/grinn/liteboard/patches/linux/0001-ARM-dts-imx6ul-Add-DTS-for-liteSOM-module.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 8cbabc57257bdbf5f1cf039a265c875da8ddc2e9 Mon Sep 17 00:00:00 2001
-From: Marcin Niestroj <m.niestroj@grinn-global.com>
-Date: Fri, 21 Oct 2016 17:07:16 +0200
-Subject: [PATCH 1/2] ARM: dts: imx6ul: Add DTS for liteSOM module
-
-This is a SOM (System on Module), so it will be part of another boards.
-Hence, this is a "dtsi" file that will be included from another device
-tree files.
-
-Hardware specification:
- * Freescale i.MX6UL SoC
- * up to 512 MB RAM
- * eMMC on uSDHC2
-
-Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
-Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
----
- arch/arm/boot/dts/imx6ul-litesom.dtsi | 82 +++++++++++++++++++++++++++++++++++
- 1 file changed, 82 insertions(+)
- create mode 100644 arch/arm/boot/dts/imx6ul-litesom.dtsi
-
-diff --git a/arch/arm/boot/dts/imx6ul-litesom.dtsi b/arch/arm/boot/dts/imx6ul-litesom.dtsi
-new file mode 100644
-index 000000000000..461292d33417
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-litesom.dtsi
-@@ -0,0 +1,82 @@
-+/*
-+ * Copyright 2016 Grinn
-+ *
-+ * Author: Marcin Niestroj <m.niestroj@grinn-global.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License
-+ *     version 2 as published by the Free Software Foundation.
-+ *
-+ *     This file is distributed in the hope that it will be useful
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include "imx6ul.dtsi"
-+
-+/ {
-+	model = "Grinn i.MX6UL liteSOM";
-+	compatible = "grinn,imx6ul-litesom", "fsl,imx6ul";
-+
-+	memory {
-+		reg = <0x80000000 0x20000000>;
-+	};
-+};
-+
-+&iomuxc {
-+	pinctrl_usdhc2: usdhc2grp {
-+		fsl,pins = <
-+			MX6UL_PAD_NAND_RE_B__USDHC2_CLK	    0x10069
-+			MX6UL_PAD_NAND_WE_B__USDHC2_CMD	    0x17059
-+			MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059
-+			MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059
-+			MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059
-+			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059
-+			MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059
-+			MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059
-+			MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059
-+			MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059
-+			MX6UL_PAD_NAND_ALE__USDHC2_RESET_B  0x17059
-+		>;
-+	};
-+};
-+
-+&usdhc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_usdhc2>;
-+	no-1-8-v;
-+	non-removable;
-+	keep-power-in-suspend;
-+	wakeup-source;
-+	bus-width = <8>;
-+	status = "okay";
-+};
--- 
-2.11.0
-
diff --git a/bsp/buildroot/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch b/bsp/buildroot/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch
deleted file mode 100644
index c73cd4fa..00000000
--- a/bsp/buildroot/board/grinn/liteboard/patches/linux/0002-ARM-dts-imx6ul-Add-DTS-for-liteBoard.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 35a8bca870bedebb9d37ad58b905863cba780f9f Mon Sep 17 00:00:00 2001
-From: Marcin Niestroj <m.niestroj@grinn-global.com>
-Date: Fri, 21 Oct 2016 17:07:17 +0200
-Subject: [PATCH 2/2] ARM: dts: imx6ul: Add DTS for liteBoard
-
-liteBoard is a development board which uses liteSOM as its base.
-
-Hardware specification:
- * liteSOM (i.MX6UL, DRAM, eMMC)
- * Ethernet PHY (id 0)
- * USB host (usb_otg1)
- * MicroSD slot (uSDHC1)
-
-Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
-Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
----
- arch/arm/boot/dts/Makefile             |   1 +
- arch/arm/boot/dts/imx6ul-liteboard.dts | 147 +++++++++++++++++++++++++++++++++
- 2 files changed, 148 insertions(+)
- create mode 100644 arch/arm/boot/dts/imx6ul-liteboard.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index c558ba75cbcc..a587ce231f83 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -420,6 +420,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- dtb-$(CONFIG_SOC_IMX6UL) += \
- 	imx6ul-14x14-evk.dtb \
- 	imx6ul-geam-kit.dtb \
-+	imx6ul-liteboard.dtb \
- 	imx6ul-pico-hobbit.dtb \
- 	imx6ul-tx6ul-0010.dtb \
- 	imx6ul-tx6ul-0011.dtb \
-diff --git a/arch/arm/boot/dts/imx6ul-liteboard.dts b/arch/arm/boot/dts/imx6ul-liteboard.dts
-new file mode 100644
-index 000000000000..6e04cb9202f4
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6ul-liteboard.dts
-@@ -0,0 +1,147 @@
-+/*
-+ * Copyright 2016 Grinn
-+ *
-+ * Author: Marcin Niestroj <m.niestroj@grinn-global.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License
-+ *     version 2 as published by the Free Software Foundation.
-+ *
-+ *     This file is distributed in the hope that it will be useful
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx6ul-litesom.dtsi"
-+
-+/ {
-+	model = "Grinn i.MX6UL liteBoard";
-+	compatible = "grinn,imx6ul-liteboard", "grinn,imx6ul-litesom",
-+		     "fsl,imx6ul";
-+
-+	chosen {
-+		stdout-path = &uart1;
-+	};
-+
-+	reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
-+		compatible = "regulator-fixed";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pinctrl_usb_otg1_vbus>;
-+		regulator-name = "usb_otg1_vbus";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		gpio = <&gpio2 8 GPIO_ACTIVE_LOW>;
-+	};
-+};
-+
-+&iomuxc {
-+	pinctrl_enet1: enet1grp {
-+		fsl,pins = <
-+			MX6UL_PAD_GPIO1_IO07__ENET1_MDC		0x1b0b0
-+			MX6UL_PAD_GPIO1_IO06__ENET1_MDIO	0x1b0b0
-+			MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN	0x1b0b0
-+			MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER	0x1b0b0
-+			MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
-+			MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
-+			MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN	0x1b0b0
-+			MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
-+			MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
-+			MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x4001b031
-+		>;
-+	};
-+
-+	pinctrl_uart1: uart1grp {
-+		fsl,pins = <
-+			MX6UL_PAD_UART1_TX_DATA__UART1_DCE_TX	0x1b0b1
-+			MX6UL_PAD_UART1_RX_DATA__UART1_DCE_RX	0x1b0b1
-+		>;
-+	};
-+
-+	pinctrl_usdhc1: usdhc1grp {
-+		fsl,pins = <
-+			MX6UL_PAD_UART1_RTS_B__GPIO1_IO19	0x17059
-+			MX6UL_PAD_SD1_CMD__USDHC1_CMD		0x17059
-+			MX6UL_PAD_SD1_CLK__USDHC1_CLK		0x10071
-+			MX6UL_PAD_SD1_DATA0__USDHC1_DATA0	0x17059
-+			MX6UL_PAD_SD1_DATA1__USDHC1_DATA1	0x17059
-+			MX6UL_PAD_SD1_DATA2__USDHC1_DATA2	0x17059
-+			MX6UL_PAD_SD1_DATA3__USDHC1_DATA3	0x17059
-+		>;
-+	};
-+
-+	pinctrl_usb_otg1_vbus: usb-otg1-vbus {
-+		fsl,pins = <
-+			MX6UL_PAD_ENET2_RX_DATA0__GPIO2_IO08	0x79
-+		>;
-+	};
-+};
-+
-+&fec1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_enet1>;
-+	phy-mode = "rmii";
-+	phy-handle = <&ethphy0>;
-+	status = "okay";
-+
-+	mdio {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		ethphy0: ethernet-phy@0 {
-+			reg = <0>;
-+		};
-+	};
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart1>;
-+	status = "okay";
-+};
-+
-+&usbotg1 {
-+	vbus-supply = <&reg_usb_otg1_vbus>;
-+	dr_mode = "host";
-+	status = "okay";
-+};
-+
-+&usdhc1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_usdhc1>;
-+	cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
-+	no-1-8-v;
-+	keep-power-in-suspend;
-+	wakeup-source;
-+	status = "okay";
-+};
--- 
-2.11.0
-
diff --git a/bsp/buildroot/board/intel/galileo/linux-3.14.config b/bsp/buildroot/board/intel/galileo/linux-3.14.config
index 58564da9..e7aa9cf2 100644
--- a/bsp/buildroot/board/intel/galileo/linux-3.14.config
+++ b/bsp/buildroot/board/intel/galileo/linux-3.14.config
@@ -28,7 +28,7 @@ CONFIG_EMBEDDED=y
 CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
+CONFIG_LBDAF=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_BSD_DISKLABEL=y
 # CONFIG_ZONE_DMA is not set
diff --git a/bsp/buildroot/board/lego/ev3/busybox.fragment b/bsp/buildroot/board/lego/ev3/busybox.fragment
new file mode 100644
index 00000000..901274d3
--- /dev/null
+++ b/bsp/buildroot/board/lego/ev3/busybox.fragment
@@ -0,0 +1,3 @@
+CONFIG_BEEP=y
+CONFIG_FEATURE_BEEP_FREQ=440
+CONFIG_FEATURE_BEEP_LENGTH_MS=250
diff --git a/bsp/buildroot/board/lego/ev3/genimage.cfg b/bsp/buildroot/board/lego/ev3/genimage.cfg
index 6b8546cc..3da3048d 100644
--- a/bsp/buildroot/board/lego/ev3/genimage.cfg
+++ b/bsp/buildroot/board/lego/ev3/genimage.cfg
@@ -19,14 +19,14 @@ image flash.bin {
 		size = 320K
 	}
 	partition uimage {
-		image = "uImage"
-		size = 3M
+		image = "uImage.da850-lego-ev3"
+		size = 4M
 		offset = 0x50000
 	}
 	partition rootfs {
 		image = "rootfs.squashfs"
-		size = 9600K
-		offset = 0x350000
+		size = 10M
+		offset = 0x450000
 	}
 }
 
@@ -34,8 +34,8 @@ image flash.bin {
 
 image boot.vfat {
 	vfat {
-		files = {
-			"uImage"
+		file uImage {
+			image = "uImage.da850-lego-ev3"
 		}
 	}
 	size = 16M
diff --git a/bsp/buildroot/board/lego/ev3/linux.fragment b/bsp/buildroot/board/lego/ev3/linux.fragment
index 55936367..30dea57b 100644
--- a/bsp/buildroot/board/lego/ev3/linux.fragment
+++ b/bsp/buildroot/board/lego/ev3/linux.fragment
@@ -1,7 +1,62 @@
+CONFIG_ARCH_DAVINCI_DM644x=n
+CONFIG_ARCH_DAVINCI_DM355=n
+CONFIG_ARCH_DAVINCI_DM646x=n
+CONFIG_ARCH_DAVINCI_DA830=n
+CONFIG_ARCH_DAVINCI_DM365=n
+CONFIG_MACH_SFFSDR=n
+CONFIG_MACH_NEUROS_OSD2=n
+CONFIG_MACH_DM355_LEOPARD=n
+CONFIG_MACH_MITYOMAPL138=n
+CONFIG_MACH_OMAPL138_HAWKBOARD=n
+CONFIG_MACH_DAVINCI_DA850_EVM=n
+CONFIG_ATA=n
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_M25P80=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=1
 CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_PWM_BEEPER=y
+CONFIG_SPI_DAVINCI=y
+CONFIG_PINCTRL_DA850_PUPD=y
+CONFIG_V4L_PLATFORM_DRIVERS=n
+CONFIG_SOUND=n
+CONFIG_SND=n
+CONFIG_SND_SOC=n
+CONFIG_SND_EDMA_SOC=n
+CONFIG_SND_DAVINCI_SOC_MCASP=n
+CONFIG_SND_SOC_TLV320AIC3X=n
+CONFIG_SND_SIMPLE_CARD=n
+CONFIG_DAVINCI_WATCHDOG=y
+CONFIG_USB=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_DAVINCI=y
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_DA8XX=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_USB_GADGET=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_DRV_OMAP=y
+CONFIG_IIO=y
+CONFIG_TI_ADS7950=y
+CONFIG_PWM_TIECAP=y
+CONFIG_PWM_TIEHRPWM=y
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_LZ4=y
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XZ=y
+CONFIG_DRM=y
+CONFIG_DRM_TILCDC=n
+CONFIG_DRM_DUMB_VGA_DAC=n
+CONFIG_DRM_TINYDRM=y
+CONFIG_TINYDRM_ST7586=y
+CONFIG_FB_DA8XX=n
diff --git a/bsp/buildroot/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch b/bsp/buildroot/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch
new file mode 100644
index 00000000..ee0ce616
--- /dev/null
+++ b/bsp/buildroot/board/lego/ev3/patches/uboot/configs-legoev3-increase-flash-image-sizes.patch
@@ -0,0 +1,31 @@
+From cdd8d11858fa34f6e813fae46b5556e9fb3570dc Mon Sep 17 00:00:00 2001
+From: David Lechner <david@lechnology.com>
+Date: Sun, 19 Nov 2017 19:54:32 -0600
+Subject: [PATCH] configs: legoev3: increase flash image sizes
+
+This increases the kernel image to 4M and the rootfs image to 10M.
+
+It is getting hard to get a kernel image to fit in 3M and the rootfs image
+size now matches the filesyssize variable.
+
+Signed-off-by: David Lechner <david@lechnology.com>
+---
+ include/configs/legoev3.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h
+index 79fa3c4..2eeaf85 100644
+--- a/include/configs/legoev3.h
++++ b/include/configs/legoev3.h
+@@ -204,7 +204,7 @@
+ 	"mmcargs=setenv bootargs mem=${memsize} console=${console} root=/dev/mmcblk0p2 rw rootwait lpj=747520\0" \
+ 	"mmcboot=bootm ${loadaddr}\0" \
+ 	"flashargs=setenv bootargs mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=squashfs console=${console} lpj=747520\0" \
+-	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x300000; sf read ${filesysaddr} 0x350000 0x960000; bootm ${loadaddr}\0" \
++	"flashboot=sf probe 0; sf read ${loadaddr} 0x50000 0x400000; sf read ${filesysaddr} 0x450000 0xA00000; bootm ${loadaddr}\0" \
+ 	"loadimage=fatload mmc 0 ${loadaddr} uImage\0" \
+ 	"loadbootscr=fatload mmc 0 ${bootscraddr} boot.scr\0" \
+ 	"bootscript=source ${bootscraddr}\0" \
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/board/lego/ev3/readme.txt b/bsp/buildroot/board/lego/ev3/readme.txt
index c40907c6..8df91ac1 100644
--- a/bsp/buildroot/board/lego/ev3/readme.txt
+++ b/bsp/buildroot/board/lego/ev3/readme.txt
@@ -13,12 +13,6 @@ See:
 - http://www.lego.com/en-us/mindstorms/products/ev3/31313-mindstorms-ev3/
 - http://www.ti.com/product/am1808
 
-The buildroot configuration uses the Linux kernel of the ev3dev project.
-See:
-- https://github.com/ev3dev/ev3-kernel/
-- https://github.com/ev3dev/lego-linux-drivers/
-- http://www.ev3dev.org/
-
 How it works
 ============
 
@@ -65,7 +59,8 @@ After building, you should obtain this tree:
     ├── rootfs.squashfs
     ├── sdcard.img
     ├── u-boot.bin
-    └── uImage
+    ├── uImage -> uImage.da850-lego-ev3
+    └── uImage.da850-lego-ev3
 
 Installation
 ============
diff --git a/bsp/buildroot/board/lemaker/bananapro/boot.cmd b/bsp/buildroot/board/lemaker/bananapro/boot.cmd
new file mode 100644
index 00000000..439f5b12
--- /dev/null
+++ b/bsp/buildroot/board/lemaker/bananapro/boot.cmd
@@ -0,0 +1,5 @@
+setenv fdt_high ffffffff
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun7i-a20-bananapro.dtb
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/lemaker/bananapro/genimage.cfg b/bsp/buildroot/board/lemaker/bananapro/genimage.cfg
new file mode 100644
index 00000000..190a4b1f
--- /dev/null
+++ b/bsp/buildroot/board/lemaker/bananapro/genimage.cfg
@@ -0,0 +1,37 @@
+# Minimal SD card image for the Banana Pro
+# Based in the Orange Pi genimage.cfg
+
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun7i-a20-bananapro.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/lemaker/bananapro/linux-wifi.fragment b/bsp/buildroot/board/lemaker/bananapro/linux-wifi.fragment
new file mode 100644
index 00000000..8e4bd5cc
--- /dev/null
+++ b/bsp/buildroot/board/lemaker/bananapro/linux-wifi.fragment
@@ -0,0 +1,23 @@
+# Networking support
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_CFG80211_WEXT=y
+
+# Network device support
+CONFIG_WLAN=y
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_BRCMFMAC=m
+# CONFIG_WLAN_VENDOR_ADMTEK is not set
+# CONFIG_WLAN_VENDOR_ATH is not set
+# CONFIG_WLAN_VENDOR_ATMEL is not set
+# CONFIG_WLAN_VENDOR_CISCO is not set
+# CONFIG_WLAN_VENDOR_INTEL is not set
+# CONFIG_WLAN_VENDOR_INTERSIL is not set
+# CONFIG_WLAN_VENDOR_MARVELL is not set
+# CONFIG_WLAN_VENDOR_MEDIATEK is not set
+# CONFIG_WLAN_VENDOR_RALINK is not set
+# CONFIG_WLAN_VENDOR_REALTEK is not set
+# CONFIG_WLAN_VENDOR_RSI is not set
+# CONFIG_WLAN_VENDOR_ST is not set
+# CONFIG_WLAN_VENDOR_TI is not set
+# CONFIG_WLAN_VENDOR_ZYDAS is not set
diff --git a/bsp/buildroot/board/lemaker/bananapro/post-build.sh b/bsp/buildroot/board/lemaker/bananapro/post-build.sh
new file mode 100755
index 00000000..a335310d
--- /dev/null
+++ b/bsp/buildroot/board/lemaker/bananapro/post-build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Remove all but the brcmfmac43362 firmware files
+find $TARGET_DIR/lib/firmware/brcm -type f -not -name "brcmfmac43362*" -delete
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/bin/mkimage
+BOOT_CMD=$BOARD_DIR/boot.cmd
+BOOT_CMD_H=$BINARIES_DIR/boot.scr
+
+# U-Boot script
+$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
diff --git a/bsp/buildroot/board/olimex/a20_olinuxino/post-image.sh b/bsp/buildroot/board/lemaker/bananapro/post-image.sh
similarity index 100%
rename from bsp/buildroot/board/olimex/a20_olinuxino/post-image.sh
rename to bsp/buildroot/board/lemaker/bananapro/post-image.sh
diff --git a/bsp/buildroot/board/lemaker/bananapro/readme.txt b/bsp/buildroot/board/lemaker/bananapro/readme.txt
new file mode 100644
index 00000000..27b922e2
--- /dev/null
+++ b/bsp/buildroot/board/lemaker/bananapro/readme.txt
@@ -0,0 +1,62 @@
+Banana Pro
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+Buildroot environment for the Banana Pro. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+  $ make bananapro_defconfig
+
+Compile everything and build the SD card image:
+
+  $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ dd if=output/images/sdcard.img of=/dev/sdX
+
+Notes:
+  - replace 'sdX' with the actual device with your micro SD card
+  - you may need to be root to do that (use 'sudo')
+
+Insert the micro SD card in your Banana Pro and power it up. The console
+is on the debug TTL UART, 115200 8N1.
+
+Ethernet
+==========
+
+  # udhcpc -i eth0
+
+Wifi
+==========
+
+  # wpa_passphrase YOUR_SSID >> /etc/wpa_supplicant.conf
+  (enter the wifi password and press enter)
+  # wpa_supplicant -i wlan0 -c /etc/wpa_supplicant.conf -B
+  # udhcpc -i wlan0
+
+Note:
+  - replace 'YOUR_SSID' with the actual SSID from your access point
+
+Audio
+==========
+
+Connect a headphone to the 3.5mm jack (TRRS). Note, that the Banana Pro
+has an on-board microphone, too.
+
+  # amixer cset name='Power Amplifier DAC Playback Switch' on
+  # amixer cset name='Power Amplifier Mute Switch' on
+  # amixer cset name='Power Amplifier Volume' 42
diff --git a/bsp/buildroot/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt b/bsp/buildroot/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt
new file mode 100644
index 00000000..14a554fd
--- /dev/null
+++ b/bsp/buildroot/board/lemaker/bananapro/rootfs_overlay/lib/firmware/brcm/brcmfmac43362-sdio.txt
@@ -0,0 +1,56 @@
+#AP6210_NVRAM_V1.2_03192013
+manfid=0x2d0
+prodid=0x492
+vendid=0x14e4
+devid=0x4343
+boardtype=0x0598
+
+# Board Revision is P307, same nvram file can be used for P304, P305, P306 and P307 as the tssi pa params used are same
+#Please force the automatic RX PER data to the respective board directory if not using P307 board, for e.g. for P305 boards force the data into the following directory /projects/BCM43362/a1_labdata/boardtests/results/sdg_rev0305
+boardrev=0x1307
+boardnum=777
+xtalfreq=26000
+boardflags=0x80201
+boardflags2=0x80
+sromrev=3
+wl0id=0x431b
+macaddr=00:90:4c:07:71:12
+aa2g=1
+ag0=2
+maxp2ga0=74
+cck2gpo=0x2222
+ofdm2gpo=0x44444444
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+pa0maxpwr=56
+
+#P207 PA params
+#pa0b0=5447
+#pa0b1=-658
+#pa0b2=-175
+
+#Same PA params for P304,P305, P306, P307
+
+pa0b0=5447
+pa0b1=-607
+pa0b2=-160
+pa0itssit=62
+pa1itssit=62
+
+
+cckPwrOffset=5
+ccode=0
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+triso2g=0
+noise_cal_enable_2g=0
+noise_cal_po_2g=0
+swctrlmap_2g=0x04040404,0x02020202,0x02020202,0x010101,0x1ff
+temp_add=29767
+temp_mult=425
+
+btc_flags=0x6
+btc_params0=5000
+btc_params1=1000
+btc_params6=63
diff --git a/bsp/buildroot/board/linksprite/pcduino/post-build.sh b/bsp/buildroot/board/linksprite/pcduino/post-build.sh
index 268c1071..e1e18776 100755
--- a/bsp/buildroot/board/linksprite/pcduino/post-build.sh
+++ b/bsp/buildroot/board/linksprite/pcduino/post-build.sh
@@ -3,7 +3,7 @@
 # 2013, Carlo Caione <carlo.caione@gmail.com>
 
 BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/usr/bin/mkimage
+MKIMAGE=$HOST_DIR/bin/mkimage
 BOOT_CMD=$BOARD_DIR/boot.cmd
 BOOT_CMD_H=$BINARIES_DIR/boot.scr
 
diff --git a/bsp/buildroot/board/minnowboard/grub-minnowboard.cfg b/bsp/buildroot/board/minnowboard/grub-minnowboard.cfg
deleted file mode 100644
index 33a0f4aa..00000000
--- a/bsp/buildroot/board/minnowboard/grub-minnowboard.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /bzImage root=/dev/mmcblk0p2 rootwait console=ttyPCH0,115200
-}
diff --git a/bsp/buildroot/board/minnowboard/grub-minnowboard-max.cfg b/bsp/buildroot/board/minnowboard/grub.cfg
similarity index 100%
rename from bsp/buildroot/board/minnowboard/grub-minnowboard-max.cfg
rename to bsp/buildroot/board/minnowboard/grub.cfg
diff --git a/bsp/buildroot/board/minnowboard/linux-3.8.config b/bsp/buildroot/board/minnowboard/linux-3.8.config
deleted file mode 100644
index 460aa2d0..00000000
--- a/bsp/buildroot/board/minnowboard/linux-3.8.config
+++ /dev/null
@@ -1,172 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_RCU_FANOUT=32
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_MEMCG=y
-CONFIG_MEMCG_SWAP=y
-CONFIG_MEMCG_KMEM=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-CONFIG_NAMESPACES=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
-CONFIG_PROFILING=y
-CONFIG_OPROFILE=y
-CONFIG_KPROBES=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_SMP=y
-CONFIG_MATOM=y
-CONFIG_SCHED_SMT=y
-CONFIG_PREEMPT=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-# CONFIG_MTRR_SANITIZER is not set
-CONFIG_EFI=y
-CONFIG_EFI_STUB=y
-CONFIG_HZ_1000=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_X86_ACPI_CPUFREQ=y
-CONFIG_INTEL_IDLE=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_MSI=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_XFRM_SUB_POLICY=y
-CONFIG_NET_KEY_MIGRATE=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_FW_LOADER=m
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_PCH_PHUB=m
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=m
-CONFIG_NETCONSOLE=y
-CONFIG_TUN=m
-CONFIG_PCH_GBE=m
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO_POLLED=y
-# CONFIG_MOUSE_PS2 is not set
-# CONFIG_SERIO_I8042 is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_PCH_UART=y
-CONFIG_SERIAL_PCH_UART_CONSOLE=y
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
-CONFIG_HPET=y
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_EG20T=m
-CONFIG_SPI=y
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_TOPCLIFF_PCH=m
-CONFIG_SPI_SPIDEV=m
-CONFIG_GPIOLIB=y
-CONFIG_DEBUG_GPIO=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_SCH=y
-CONFIG_GPIO_PCH=y
-CONFIG_WATCHDOG=y
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_AGP=m
-CONFIG_DRM=m
-CONFIG_FB=y
-CONFIG_FB_EFI=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_SOUND=m
-CONFIG_SND=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_USB=y
-CONFIG_USB_SUSPEND=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=m
-CONFIG_USB_EG20T=m
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_ONESHOT=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_CPU=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_DMADEVICES=y
-CONFIG_PCH_DMA=y
-CONFIG_MINNOWBOARD=y
-CONFIG_MINNOWBOARD_GPIO=m
-CONFIG_MINNOWBOARD_KEYS=m
-CONFIG_EFI_VARS=y
-CONFIG_EXT4_FS=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-CONFIG_FANOTIFY=y
-CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
-CONFIG_ISO9660_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_NFS_FS=y
-CONFIG_NFS_V4=y
-CONFIG_ROOT_NFS=y
-CONFIG_PRINTK_TIME=y
-CONFIG_FRAME_WARN=1024
-CONFIG_TIMER_STATS=y
-CONFIG_LATENCYTOP=y
-CONFIG_BLK_DEV_IO_TRACE=y
diff --git a/bsp/buildroot/board/minnowboard/linux-4.8.config b/bsp/buildroot/board/minnowboard/linux-4.8.config
deleted file mode 100644
index fba48a16..00000000
--- a/bsp/buildroot/board/minnowboard/linux-4.8.config
+++ /dev/null
@@ -1,58 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_SMP=y
-CONFIG_X86_INTEL_LPSS=y
-CONFIG_MATOM=y
-CONFIG_EFI=y
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
-CONFIG_X86_INTEL_PSTATE=y
-CONFIG_X86_ACPI_CPUFREQ=y
-CONFIG_INTEL_IDLE=y
-CONFIG_IA32_EMULATION=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_ATA=y
-CONFIG_SATA_AHCI=y
-CONFIG_ATA_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_R8169=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DW=y
-CONFIG_I2C_I801=y
-CONFIG_I2C_DESIGNWARE_PLATFORM=y
-CONFIG_I2C_DESIGNWARE_PCI=y
-CONFIG_SPI=y
-CONFIG_SPI_DESIGNWARE=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_PINCTRL_BAYTRAIL=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_AGP=y
-CONFIG_DRM=y
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_I915=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-# CONFIG_SND_DRIVERS is not set
-CONFIG_SND_HDA_INTEL=y
-CONFIG_SND_HDA_CODEC_HDMI=y
-# CONFIG_SND_SPI is not set
-# CONFIG_SND_USB is not set
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_NOP_USB_XCEIV=y
-CONFIG_MMC=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PCI=y
-CONFIG_MMC_SDHCI_ACPI=y
-CONFIG_PWM=y
-CONFIG_EXT4_FS=y
diff --git a/bsp/buildroot/board/minnowboard/linux.config b/bsp/buildroot/board/minnowboard/linux.config
new file mode 100644
index 00000000..27077dbc
--- /dev/null
+++ b/bsp/buildroot/board/minnowboard/linux.config
@@ -0,0 +1,60 @@
+CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
+CONFIG_SMP=y
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_MATOM=y
+CONFIG_EFI=y
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_INTEL_IDLE=y
+CONFIG_IA32_EMULATION=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_SG=y
+CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_R8169=y
+CONFIG_IGB=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DW=y
+CONFIG_I2C_I801=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+CONFIG_I2C_DESIGNWARE_PCI=y
+CONFIG_SPI=y
+CONFIG_SPI_DESIGNWARE=y
+CONFIG_SPI_PXA2XX=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_AGP=y
+CONFIG_DRM=y
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_I915=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+# CONFIG_SND_SPI is not set
+# CONFIG_SND_USB is not set
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_NOP_USB_XCEIV=y
+CONFIG_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_PWM=y
+CONFIG_EXT4_FS=y
+CONFIG_UNWINDER_FRAME_POINTER=y
diff --git a/bsp/buildroot/board/minnowboard/post-build.sh b/bsp/buildroot/board/minnowboard/post-build.sh
index 45f7b527..24b8c053 100755
--- a/bsp/buildroot/board/minnowboard/post-build.sh
+++ b/bsp/buildroot/board/minnowboard/post-build.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
-# args from BR2_ROOTFS_POST_SCRIPT_ARGS
-# $2    board name
 
-cp -v board/minnowboard/grub-${2}.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
+cp -v board/minnowboard/grub.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
 
 # Add a console on tty1
 if [ -e ${TARGET_DIR}/etc/inittab ]; then
diff --git a/bsp/buildroot/board/minnowboard/readme.txt b/bsp/buildroot/board/minnowboard/readme.txt
index f76cd77c..fdbb81e3 100644
--- a/bsp/buildroot/board/minnowboard/readme.txt
+++ b/bsp/buildroot/board/minnowboard/readme.txt
@@ -1,14 +1,10 @@
-How to get started with the MinnowBoard (MAX)
-=============================================
+How to get started with the MinnowBoard MAX
+===========================================
 
 1. Build
 
   Apply the defconfig:
 
-  $ make minnowboard_defconfig
-
-  Or, for the Minnowboard MAX board:
-
   $ make minnowboard_max_defconfig
 
   Add any additional packages required and build:
@@ -18,7 +14,7 @@ How to get started with the MinnowBoard (MAX)
 2. Write the SD card
 
   The build process will create a SD card image in output/images.
-  Write the image to an mSD card, insert into the MinnowBoard
+  Write the image to an mSD card, insert into the MinnowBoard MAX
   and power the board on.
 
   $ dd if=output/images/sdcard.img of=/dev/mmcblk0; sync
diff --git a/bsp/buildroot/board/nanopi-neo/post-build.sh b/bsp/buildroot/board/nanopi-neo/post-build.sh
deleted file mode 100755
index e6791e71..00000000
--- a/bsp/buildroot/board/nanopi-neo/post-build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# post-build.sh for Nanopi NEO, based on the Orange Pi PC
-# 2013, Carlo Caione <carlo.caione@gmail.com>
-# 2016, "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-BOARD_DIR="$( dirname "${0}" )"
-MKIMAGE="${HOST_DIR}/usr/bin/mkimage"
-BOOT_CMD="${BOARD_DIR}/boot.cmd"
-BOOT_CMD_H="${BINARIES_DIR}/boot.scr"
-
-# U-Boot script
-"${MKIMAGE}" -C none -A arm -T script -d "${BOOT_CMD}" "${BOOT_CMD_H}"
diff --git a/bsp/buildroot/board/nanopi-neo/readme.txt b/bsp/buildroot/board/nanopi-neo/readme.txt
deleted file mode 100644
index 95fc6289..00000000
--- a/bsp/buildroot/board/nanopi-neo/readme.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Intro
-=====
-
-The instructions herein are valid for the FriendlyARM NanoPi NEO,
-both the 256MiB and 512MiB versions. They should also work the the
-NanoPi NEO Air, but this is untested so far.
-
-The FriendlyARM Nanopi NEO is a 4x4cm² board with an Allwiner H3 SoC:
-  - quad-core Cortex-A7 @1.2GHz
-  - 256 or 512MiB of DDR
-  - uSDCard as only storage option
-  - 3x USB 2.0 host (one socket, two on expansion pin-holes)
-  - 1x USB 2.0 OTG (also used as power source)
-  - 10/100 ethernet MAC
-  - GPIOs, SPI, I2c...
-
-Support for the Nanopi NEO in U-Boot and Linux is very recent, so
-much so that we have to use an -rc tag for U-Boot and a special
-Linux tree.
-
-Unfortunately, support for the ethernet MAC and the USB OTG are not
-yet upstream, but are being actively worked on.
-
-
-How to build
-============
-
-    $ make nanopi_neo_defconfig
-    $ make
-
-Note: you will need access to the internet to download the required
-sources.
-
-You will then obtain an image ready to be written to your micro SDcard:
-
-    $ dd if=output/images/sdcard.img of=/dev/sdX bs=1M
-
-Notes:
-  - replace 'sdX' with the actual device with your micro SDcard,
-  - you may need to be root to do that (use 'sudo').
-
-Insert the micro SDcard in your NanoPi NEO and power it up. The console
-is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/nexbox/a95x/boot.txt b/bsp/buildroot/board/nexbox/a95x/boot.txt
new file mode 100644
index 00000000..f388ba81
--- /dev/null
+++ b/bsp/buildroot/board/nexbox/a95x/boot.txt
@@ -0,0 +1,11 @@
+setenv bootargs console=ttyAML0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait
+
+fatload mmc 0:1 0x01080000 uImage
+
+if itest.s "${aml_dt}" == "gxl_p212_2g"; then
+	fatload mmc 0:1 $dtb_mem_addr meson-gxl-s905x-nexbox-a95x.dtb
+else
+	fatload mmc 0:1 $dtb_mem_addr meson-gxbb-nexbox-a95x.dtb
+fi
+
+bootm 0x1080000 - $dtb_mem_addr
diff --git a/bsp/buildroot/board/nexbox/a95x/genimage.cfg b/bsp/buildroot/board/nexbox/a95x/genimage.cfg
new file mode 100644
index 00000000..74e2d3a6
--- /dev/null
+++ b/bsp/buildroot/board/nexbox/a95x/genimage.cfg
@@ -0,0 +1,28 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"uImage",
+			"meson-gxbb-nexbox-a95x.dtb",
+			"meson-gxl-s905x-nexbox-a95x.dtb",
+			"boot.scr"
+		}
+	}
+	size = 32M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/nexbox/a95x/post-build.sh b/bsp/buildroot/board/nexbox/a95x/post-build.sh
new file mode 100755
index 00000000..f8706f2d
--- /dev/null
+++ b/bsp/buildroot/board/nexbox/a95x/post-build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+MKIMAGE=$HOST_DIR/bin/mkimage
+
+$MKIMAGE -C none -A arm64 -T script -d $BOARD_DIR/boot.txt $BINARIES_DIR/boot.scr
+
+# vendor u-boot uses uImage
+if [ -e $BINARIES_DIR/Image ]; then
+    $MKIMAGE -A arm64 -O linux -T kernel -C none -a 0x1080000 -e 0x1080000 \
+	     -n linux -d $BINARIES_DIR/Image $BINARIES_DIR/uImage
+fi
diff --git a/bsp/buildroot/board/atmel/sama5d2_xplained_mmc/post-image.sh b/bsp/buildroot/board/nexbox/a95x/post-image.sh
similarity index 100%
rename from bsp/buildroot/board/atmel/sama5d2_xplained_mmc/post-image.sh
rename to bsp/buildroot/board/nexbox/a95x/post-image.sh
diff --git a/bsp/buildroot/board/nexbox/a95x/readme.txt b/bsp/buildroot/board/nexbox/a95x/readme.txt
new file mode 100644
index 00000000..e08b4e4e
--- /dev/null
+++ b/bsp/buildroot/board/nexbox/a95x/readme.txt
@@ -0,0 +1,48 @@
+Nexbox A95X
+
+Intro
+=====
+
+Nexbox A95X is a low cost Android STB based around an Amlogic s905(x) SoC
+(quad A53), 8/16GB eMMC and 1/2GB RAM.  To use this defconfig, wires to the
+internal UART solder pads must be added.  See the linux-meson page for
+details:
+
+http://linux-meson.com/doku.php?id=nexbox_a95x_s905
+
+Both the s905 (gxbb) and s905x (gxl) variant is supported.
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the A95X.  With the current configuration it will
+bring-up the board from microSD, and allow access through the serial
+console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make nexbox_a95x_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto a microSD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+
+How to boot
+===========
+
+Insert microSD card and connect serial cable. Power board and stop
+U-Boot by pressing any key. Boot the system by typing:
+
+fatload mmc 0:1 0x1070000 boot.scr
+autoscr 0x1070000
diff --git a/bsp/buildroot/board/olimex/a13_olinuxino/boot.cmd b/bsp/buildroot/board/olimex/a13_olinuxino/boot.cmd
new file mode 100644
index 00000000..4dd1c7b7
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a13_olinuxino/boot.cmd
@@ -0,0 +1,7 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+mmc dev 0
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun5i-a13-olinuxino.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/olimex/a13_olinuxino/genimage.cfg b/bsp/buildroot/board/olimex/a13_olinuxino/genimage.cfg
new file mode 100644
index 00000000..6f6b0b0b
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a13_olinuxino/genimage.cfg
@@ -0,0 +1,34 @@
+image boot.vfat {
+        vfat {
+                files = {
+                        "zImage",
+                        "sun5i-a13-olinuxino.dtb",
+                        "boot.scr"
+                }
+        }
+        size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+        partition boot {
+                partition-type = 0xC
+                bootable = "true"
+                image = "boot.vfat"
+        }
+
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/olimex/a13_olinuxino/post-build.sh b/bsp/buildroot/board/olimex/a13_olinuxino/post-build.sh
new file mode 100755
index 00000000..aa2a76bd
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a13_olinuxino/post-build.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+MKIMAGE=$HOST_DIR/bin/mkimage
+
+$MKIMAGE -A arm -O linux -T script -C none \
+	 -d board/olimex/a13_olinuxino/boot.cmd \
+	 ${BINARIES_DIR}/boot.scr
diff --git a/bsp/buildroot/board/olimex/a13_olinuxino/readme.txt b/bsp/buildroot/board/olimex/a13_olinuxino/readme.txt
new file mode 100644
index 00000000..b64e339f
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a13_olinuxino/readme.txt
@@ -0,0 +1,43 @@
+A13-OLinuXino
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with
+the buildroot environment for the A13-OLinuXino. With the current
+configuration it will bring-up the board, and allow access through the
+serial console.
+
+For more details about the A13-OLinuXino:
+
+https://www.olimex.com/Products/OLinuXino/A13/A13-OLinuXino/open-source-hardware
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make olimex_a13_olinuxino_defconfig
+
+Compile everything and build the rootfs image:
+
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+The sdcard.img file is a complete bootable image ready to be written
+on the boot medium. To install it, simply copy the image to a micro SD
+card:
+
+    # dd if=output/images/sdcard.img of=/dev/sdX
+
+Notes:
+  - replace 'sdX' with the actual device with your micro SDcard,
+  - you may need to be root to do that (use 'sudo').
+
+Eject the SD card, insert it in the A13-OLinuXino board, and power it
+up.
diff --git a/bsp/buildroot/board/olimex/a20_olinuxino/post-build.sh b/bsp/buildroot/board/olimex/a20_olinuxino/post-build.sh
index ac8d4df1..7a8a4274 100755
--- a/bsp/buildroot/board/olimex/a20_olinuxino/post-build.sh
+++ b/bsp/buildroot/board/olimex/a20_olinuxino/post-build.sh
@@ -1,12 +1,8 @@
 #!/bin/sh
-# args from BR2_ROOTFS_POST_SCRIPT_ARGS
-# $2    path of boot.cmd
-# $3    output directory for boot.scr
 
-MKIMAGE=$HOST_DIR/usr/bin/mkimage
-
-$MKIMAGE -A arm -O linux -T script -C none -d $2 $3/boot.scr
+cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr
 
 if [ -e $BINARIES_DIR/script.bin ]; then
-	cp $BINARIES_DIR/script.bin $3/script.bin
+	# mali requires a legacy kernel
+	cp $BINARIES_DIR/script.bin $TARGET_DIR/boot/script.bin
 fi
diff --git a/bsp/buildroot/board/olimex/a64-olinuxino/boot.cmd b/bsp/buildroot/board/olimex/a64-olinuxino/boot.cmd
new file mode 100644
index 00000000..28ed6d9d
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a64-olinuxino/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-a64-olinuxino.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/olimex/a64-olinuxino/genimage.cfg b/bsp/buildroot/board/olimex/a64-olinuxino/genimage.cfg
new file mode 100644
index 00000000..328b68be
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a64-olinuxino/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-a64-olinuxino.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/olimex/a64-olinuxino/readme.txt b/bsp/buildroot/board/olimex/a64-olinuxino/readme.txt
new file mode 100644
index 00000000..342bdc77
--- /dev/null
+++ b/bsp/buildroot/board/olimex/a64-olinuxino/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the A64-OLinuXino. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+A64-OLinuXino link:
+https://www.olimex.com/Products/OLinuXino/A64/
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Olimex+A64-Olinuxino
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make olimex_a64_olinuxino_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your A64-OLinuXino and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/openblocks/a6/readme.txt b/bsp/buildroot/board/openblocks/a6/readme.txt
new file mode 100644
index 00000000..10a78bb7
--- /dev/null
+++ b/bsp/buildroot/board/openblocks/a6/readme.txt
@@ -0,0 +1,78 @@
+Openblocks A6
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Openblocks A6. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make openblocks_a6_defconfig
+
+Compile everything:
+
+    $ make
+
+Updating board over TFTP
+========================
+
+Copy the content of output/images to the root of your TFTP server.
+
+Connect serial and ethernet, power up board and stop it in U-Boot:
+
+DRAM (DDR2) CAS Latency = 5 tRP = 5 tRAS = 14 tRCD=5
+DRAM CS[0] base 0x00000000   size 512MB
+DRAM Total size 512MB  16bit width
+Addresses 8M - 0M are saved for the U-Boot usage.
+Mem malloc Initialization (8M - 7M): Done
+NAND:64 MB
+POST:  mac verify Eth0 PASSED
+
+CPU : Marvell Feroceon (Rev 1)
+
+Streaming disabled
+Write allocate disabled
+
+
+USB 0: host mode
+Net:   egiga0
+Hit any key to stop autoboot:  0
+openblocks>>
+
+
+Load kernel from tftp:
+
+setenv serverip <tftp-server-ip>
+setenv bootfile uImage.kirkwood-openblocks_a6
+bootp && tftp
+
+
+Write it to nand:
+
+nand erase 0x590000 0x1c5c000
+nand write.e $loadaddr 0x590000 0x1c5c000
+
+
+Load rootfs from tftp:
+
+setenv serverip <tftp-server-ip>
+setenv bootfile rootfs.jffs2
+bootp && tftp
+
+
+Write it to nand:
+
+nand erase 0x2214000 0x1dc4000
+nand write.jffs2 $loadaddr 0x2214000 0x1dc4000
+
+
+Configure kernel to use rootfs:
+
+setenv root /dev/mtdblock5 rootfstype=jffs2
+saveenv
+boot
diff --git a/bsp/buildroot/board/orangepi/orangepi-lite/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-lite/boot.cmd
new file mode 100644
index 00000000..5c29dabf
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-lite/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-lite.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-lite/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-lite/genimage.cfg
new file mode 100644
index 00000000..cd81f986
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-lite/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the OrangePi Lite
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-orangepi-lite.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-lite/linux-extras.config b/bsp/buildroot/board/orangepi/orangepi-lite/linux-extras.config
new file mode 100644
index 00000000..5e3af2b8
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-lite/linux-extras.config
@@ -0,0 +1,8 @@
+# wireless core
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_CFG80211_WEXT=y
+
+# wireless drivers
+CONFIG_WLAN=y
diff --git a/bsp/buildroot/board/orangepi/orangepi-lite/readme.txt b/bsp/buildroot/board/orangepi/orangepi-lite/readme.txt
new file mode 100644
index 00000000..5f402bf2
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-lite/readme.txt
@@ -0,0 +1,29 @@
+OrangePi Lite
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the OrangePi Lite. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make orangepi_lite_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/bsp/buildroot/board/orangepi/orangepi-one/post-build.sh b/bsp/buildroot/board/orangepi/orangepi-one/post-build.sh
deleted file mode 120000
index cd7f1164..00000000
--- a/bsp/buildroot/board/orangepi/orangepi-one/post-build.sh
+++ /dev/null
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file
diff --git a/bsp/buildroot/board/orangepi/orangepi-one/post-image.sh b/bsp/buildroot/board/orangepi/orangepi-one/post-image.sh
deleted file mode 120000
index ae6294fa..00000000
--- a/bsp/buildroot/board/orangepi/orangepi-one/post-image.sh
+++ /dev/null
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc-plus/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-pc-plus/boot.cmd
new file mode 100644
index 00000000..0c75c862
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc-plus/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-pc-plus.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc-plus/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-pc-plus/genimage.cfg
new file mode 100644
index 00000000..9ffa1a21
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc-plus/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the OrangePi PC Plus
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-orangepi-pc-plus.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc-plus/linux-extras.config b/bsp/buildroot/board/orangepi/orangepi-pc-plus/linux-extras.config
new file mode 100644
index 00000000..5e3af2b8
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc-plus/linux-extras.config
@@ -0,0 +1,8 @@
+# wireless core
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_CFG80211_WEXT=y
+
+# wireless drivers
+CONFIG_WLAN=y
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc-plus/readme.txt b/bsp/buildroot/board/orangepi/orangepi-pc-plus/readme.txt
new file mode 100644
index 00000000..49206949
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc-plus/readme.txt
@@ -0,0 +1,29 @@
+OrangePi PC Plus
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the OrangePi PC Plus. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make orangepi_pc_plus_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc/post-build.sh b/bsp/buildroot/board/orangepi/orangepi-pc/post-build.sh
deleted file mode 120000
index cd7f1164..00000000
--- a/bsp/buildroot/board/orangepi/orangepi-pc/post-build.sh
+++ /dev/null
@@ -1 +0,0 @@
-../post-build.sh
\ No newline at end of file
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc/post-image.sh b/bsp/buildroot/board/orangepi/orangepi-pc/post-image.sh
deleted file mode 120000
index ae6294fa..00000000
--- a/bsp/buildroot/board/orangepi/orangepi-pc/post-image.sh
+++ /dev/null
@@ -1 +0,0 @@
-../post-image.sh
\ No newline at end of file
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc2/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-pc2/boot.cmd
new file mode 100644
index 00000000..4d4fc7bf
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc2/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-pc2.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc2/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-pc2/genimage.cfg
new file mode 100644
index 00000000..e10c67ff
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc2/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-h5-orangepi-pc2.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-pc2/readme.txt b/bsp/buildroot/board/orangepi/orangepi-pc2/readme.txt
new file mode 100644
index 00000000..12004819
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-pc2/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Orangepi PC2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Orangepi PC2 link:
+http://www.orangepi.org/orangepipc2/
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+PC2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make orangepi_pc2_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Orangepi PC2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/orangepi/orangepi-plus/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-plus/boot.cmd
new file mode 100644
index 00000000..1a378cb9
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-plus/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-orangepi-plus.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-plus/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-plus/genimage.cfg
new file mode 100644
index 00000000..391678b7
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-plus/genimage.cfg
@@ -0,0 +1,35 @@
+# Minimal SD card image for the OrangePi Plus\Plus2
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-orangepi-plus.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-plus/readme.txt b/bsp/buildroot/board/orangepi/orangepi-plus/readme.txt
new file mode 100644
index 00000000..7f871bcf
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-plus/readme.txt
@@ -0,0 +1,29 @@
+OrangePi Plus/Plus2
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the OrangePi Plus/Plus2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make orangepi_plus_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/bsp/buildroot/board/orangepi/orangepi-prime/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-prime/boot.cmd
new file mode 100644
index 00000000..34887880
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-prime/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-prime.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-prime/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-prime/genimage.cfg
new file mode 100644
index 00000000..bb01ed9f
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-prime/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-h5-orangepi-prime.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-prime/readme.txt b/bsp/buildroot/board/orangepi/orangepi-prime/readme.txt
new file mode 100644
index 00000000..5811884d
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-prime/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Orangepi Prime. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Orangepi Prime link:
+http://www.orangepi.org/OrangePiPrime/
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Prime
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make orangepi_prime_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Orangepi Prime and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/orangepi/orangepi-win/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-win/boot.cmd
new file mode 100644
index 00000000..2ddb769d
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-win/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-a64-orangepi-win.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-win/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-win/genimage.cfg
new file mode 100644
index 00000000..db025d55
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-win/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-a64-orangepi-win.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-win/readme.txt b/bsp/buildroot/board/orangepi/orangepi-win/readme.txt
new file mode 100644
index 00000000..93adddd8
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-win/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Orangepi Win/Win Plus. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Orangepi Win/Win Plus link:
+http://www.orangepi.org/OrangePiWin_WinPlus/
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Win
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make orangepi_win_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Orangepi Win/Win Plus and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd
new file mode 100644
index 00000000..4772a9be
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-h5-orangepi-zero-plus2.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg
new file mode 100644
index 00000000..8091edad
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-h5-orangepi-zero-plus2.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
new file mode 100644
index 00000000..20340293
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/patches/linux/linux-0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch
@@ -0,0 +1,30 @@
+From f88e9301948173dd35afad4a6939092c7f269aed Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Fri, 3 Nov 2017 22:58:54 +0300
+Subject: [PATCH] arm64: dts: orange-pi-zero-plus2: fix sdcard detect
+
+The sdcard detect pin on orange-pi-zero-plus2 is pulled up.
+Fix cd-gpio description to enable sdcard detect.
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+index b6b7a56..a42fd79 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+@@ -71,7 +71,7 @@
+ 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+ 	vmmc-supply = <&reg_vcc3v3>;
+ 	bus-width = <4>;
+-	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
++	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+ 	status = "okay";
+ };
+ 
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt
new file mode 100644
index 00000000..322ba0e1
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero-plus2/readme.txt
@@ -0,0 +1,37 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Orangepi Zero Plus2. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Orangepi Zero Plus2 link:
+http://www.orangepi.org/OrangePiZeroPlus2/
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Orangepi+Zero+Plus2
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make orangepi_zero_plus2_defconfig
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Orangepi Zero Plus2 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/boot.cmd b/bsp/buildroot/board/orangepi/orangepi-zero/boot.cmd
new file mode 100644
index 00000000..44f0885f
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/boot.cmd
@@ -0,0 +1,8 @@
+setenv fdt_high ffffffff
+
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h2-plus-orangepi-zero.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/genimage.cfg b/bsp/buildroot/board/orangepi/orangepi-zero/genimage.cfg
new file mode 100644
index 00000000..017435f2
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/genimage.cfg
@@ -0,0 +1,36 @@
+# Minimal SD card image for the OrangePi Zero
+#
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h2-plus-orangepi-zero.dtb",
+			"boot.scr"
+		}
+	}
+	size = 10M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 512M
+	}
+}
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/linux-extras.config b/bsp/buildroot/board/orangepi/orangepi-zero/linux-extras.config
new file mode 100644
index 00000000..fe00af5e
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/linux-extras.config
@@ -0,0 +1,17 @@
+# spidev
+CONFIG_SPI_SPIDEV=y
+
+# spi nor
+CONFIG_MTD=y
+CONFIG_MTD_OF_PARTS=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_M25P80=y
+
+# wireless core
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_CFG80211_WEXT=y
+
+# wireless drivers
+CONFIG_WLAN=y
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch b/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
new file mode 100644
index 00000000..146d23d1
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0001-ARM-dts-orange-pi-zero-interrupt-triggering-xr819.patch
@@ -0,0 +1,35 @@
+From 321faaf4b78d46a0c77782c1798856746f0619e9 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Fri, 19 May 2017 23:39:48 +0300
+Subject: [PATCH 1/3] ARM: dts: orange-pi-zero: specify XR819 WiFi chip
+ interrupts
+
+The orange-pi-zero board has Allwinner XR819 SDIO wifi chip. The board
+dts file provides a node enabling mmc1 controller. Together with an
+out-of-tree driver https://github.com/fifteenhex/xradio this node
+enables using the wifi chip.
+
+This commit specifies XR819 interrupt configuration for the driver.
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index b7ca916d871d..4e1a9050c6b4 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -125,6 +125,9 @@
+ 	 */
+ 	xr819: sdio_wifi@1 {
+ 		reg = <1>;
++		compatible = "xradio,xr819";
++		interrupt-parent = <&pio>;
++		interrupts = <6 10 IRQ_TYPE_EDGE_RISING>;
+ 	};
+ };
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch b/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
new file mode 100644
index 00000000..fc24e7b8
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0002-ARM-dts-orange-pi-zero-enable-spi-nor.patch
@@ -0,0 +1,42 @@
+From 068c3baff3048a3db4ef2518ff917ce749cd8169 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Sat, 20 May 2017 11:24:26 +0300
+Subject: [PATCH 2/3] ARM: dts: orange-pi-zero: enable SPI NOR
+
+Enable SPI NOR on orange-pi-zero board.
+
+For more information see:
+- http://linux-sunxi.org/Orange_Pi_Zero#SPI_NOR_flash
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index 4e1a9050c6b4..cdf19821b1f3 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -161,3 +161,19 @@
+ 	/* USB VBUS is always on */
+ 	status = "okay";
+ };
++
++&spi0 {
++	status = "okay";
++
++	flash@0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
++		reg = <0>;
++		spi-max-frequency = <40000000>;
++
++		partition@00000000 {
++			reg = <0x00000000 0x200000>;	/* 2Mb */
++		};
++	};
++};
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch b/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
new file mode 100644
index 00000000..553155ce
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/patches/linux/0003-ARM-dts-orange-pi-zero-enable-spidev.patch
@@ -0,0 +1,42 @@
+From 8dd1b2a696bb7e9914abd11cc6f5c0f54c33d626 Mon Sep 17 00:00:00 2001
+From: Sergey Matyukevich <geomatsi@gmail.com>
+Date: Sat, 20 May 2017 15:36:51 +0300
+Subject: [PATCH 3/3] ARM: dts: orange-pi-zero: enable spidev
+
+On orange-pi-zero board SPI1 pins are accessible via GPIO expansion port.
+This patch enables spidev driver for SPI1.
+
+Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
+---
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+index cdf19821b1f3..7242aaecb14f 100644
+--- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
++++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
+@@ -59,6 +59,7 @@
+ 		serial0 = &uart0;
+ 		/* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */
+ 		ethernet1 = &xr819;
++		spi1 = &spi1;
+ 	};
+ 
+ 	chosen {
+@@ -177,3 +178,13 @@
+ 		};
+ 	};
+ };
++
++&spi1 {
++	status = "okay";
++
++	spidev@0 {
++		compatible = "rohm,dh2228fv";
++		reg = <0>;
++		spi-max-frequency = <10000000>;
++	};
++};
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/board/orangepi/orangepi-zero/readme.txt b/bsp/buildroot/board/orangepi/orangepi-zero/readme.txt
new file mode 100644
index 00000000..1afdbb78
--- /dev/null
+++ b/bsp/buildroot/board/orangepi/orangepi-zero/readme.txt
@@ -0,0 +1,29 @@
+OrangePi Zero
+
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the OrangePi Zero. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+How to build it
+===============
+
+Configure Buildroot:
+
+    $ make orangepi_zero_defconfig
+
+Compile everything and build the SD card image:
+
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
diff --git a/bsp/buildroot/board/orangepi/post-build.sh b/bsp/buildroot/board/orangepi/post-build.sh
deleted file mode 100755
index a544a195..00000000
--- a/bsp/buildroot/board/orangepi/post-build.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# post-build.sh for OrangePi taken from CubieBoard's post-build.sh
-# 2013, Carlo Caione <carlo.caione@gmail.com>
-
-BOARD_DIR="$(dirname $0)"
-MKIMAGE=$HOST_DIR/usr/bin/mkimage
-BOOT_CMD=$BOARD_DIR/boot.cmd
-BOOT_CMD_H=$BINARIES_DIR/boot.scr
-
-# U-Boot script
-$MKIMAGE -C none -A arm -T script -d $BOOT_CMD $BOOT_CMD_H
diff --git a/bsp/buildroot/board/orangepi/post-image.sh b/bsp/buildroot/board/orangepi/post-image.sh
deleted file mode 100755
index 359b4c9e..00000000
--- a/bsp/buildroot/board/orangepi/post-image.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                               \
-	--rootpath "${TARGET_DIR}"     \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
diff --git a/bsp/buildroot/board/pc/grub-bios.cfg b/bsp/buildroot/board/pc/grub-bios.cfg
new file mode 100644
index 00000000..bd3e3f00
--- /dev/null
+++ b/bsp/buildroot/board/pc/grub-bios.cfg
@@ -0,0 +1,6 @@
+set default="0"
+set timeout="5"
+
+menuentry "Buildroot" {
+	linux /boot/bzImage root=/dev/sda1 rootwait console=tty1
+}
diff --git a/bsp/buildroot/board/pc/grub-efi.cfg b/bsp/buildroot/board/pc/grub-efi.cfg
new file mode 100755
index 00000000..222301a4
--- /dev/null
+++ b/bsp/buildroot/board/pc/grub-efi.cfg
@@ -0,0 +1,6 @@
+set default="0"
+set timeout="5"
+
+menuentry "Buildroot" {
+	linux /bzImage root=/dev/sda2 rootwait console=tty1
+}
diff --git a/bsp/buildroot/board/pc/linux-extras.config b/bsp/buildroot/board/pc/linux-extras.config
deleted file mode 100644
index 8c9c2257..00000000
--- a/bsp/buildroot/board/pc/linux-extras.config
+++ /dev/null
@@ -1,45 +0,0 @@
-# Filesystem support
-CONFIG_FUSE_FS=y
-CONFIG_SQUASHFS=y
-
-# Ethernet drivers
-CONFIG_ATL2=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_ALX=m
-CONFIG_E100=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IGB=m
-CONFIG_R8169=m
-
-# Video drivers
-CONFIG_DRM_I915=y
-CONFIG_FB_VESA=y
-
-# Wireless drivers
-CONFIG_CFG80211=m
-CONFIG_CFG80211_WEXT=y
-CONFIG_MAC80211=m
-CONFIG_ATH_CARDS=m
-CONFIG_ATH9K=m
-CONFIG_ATH9K_HTC=m
-CONFIG_CARL9170=m
-CONFIG_ATH10K=m
-CONFIG_ATH10K_PCI=m
-CONFIG_IWL4965=m
-CONFIG_IWL3945=m
-CONFIG_IWLWIFI=m
-CONFIG_RT2X00=m
-CONFIG_RT2800PCI=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2800USB_RT3573=y
-CONFIG_RT2800USB_RT53XX=y
-CONFIG_RT2800USB_RT55XX=y
-# CONFIG_RTL_CARDS is not set
-CONFIG_RTL8XXXU=m
-
-# EFI support
-CONFIG_EFI=y
diff --git a/bsp/buildroot/board/pc/linux.config b/bsp/buildroot/board/pc/linux.config
new file mode 100644
index 00000000..0fff1170
--- /dev/null
+++ b/bsp/buildroot/board/pc/linux.config
@@ -0,0 +1,84 @@
+CONFIG_SYSVIPC=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_SMP=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_EFI=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_NETFILTER=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_WEXT=y
+CONFIG_MAC80211=m
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_VIRTIO_NET=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+CONFIG_R8169=m
+CONFIG_ATH9K=m
+CONFIG_ATH9K_HTC=m
+CONFIG_CARL9170=m
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+CONFIG_IWLWIFI=m
+CONFIG_RT2X00=m
+CONFIG_RT2800PCI=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+# CONFIG_RTL_CARDS is not set
+CONFIG_RTL8XXXU=m
+CONFIG_INPUT_EVDEV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_DRM=y
+CONFIG_DRM_I915=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_BOCHS=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_FB_VESA=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_EXT4_FS=y
+CONFIG_FUSE_FS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_SQUASHFS=y
diff --git a/bsp/buildroot/board/pc/post-image.sh b/bsp/buildroot/board/pc/post-image.sh
index 3b51409c..bdd0847e 100755
--- a/bsp/buildroot/board/pc/post-image.sh
+++ b/bsp/buildroot/board/pc/post-image.sh
@@ -1,35 +1,14 @@
 #!/bin/sh
 
+BOARD_DIR="$(dirname $0)"
+
 # Detect boot strategy, EFI or BIOS
 if [ -f ${BINARIES_DIR}/efi-part/startup.nsh ]; then
-  BOOT_TYPE=efi
-  # grub.cfg needs customization for EFI since the root partition is
-  # number 2, and bzImage is in the EFI partition (1)
-  cat >${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg <<__EOF__
-set default="0"
-set timeout="5"
-
-menuentry "Buildroot" {
-	linux /bzImage root=/dev/sda2 rootwait console=tty1
-}
-__EOF__
+  cp -f ${BOARD_DIR}/grub-efi.cfg ${BINARIES_DIR}/efi-part/EFI/BOOT/grub.cfg
 else
-  BOOT_TYPE=bios
+  cp -f ${BOARD_DIR}/grub-bios.cfg ${TARGET_DIR}/boot/grub/grub.cfg
   # Copy grub 1st stage to binaries, required for genimage
-  cp -f ${HOST_DIR}/usr/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
+  cp -f ${HOST_DIR}/lib/grub/i386-pc/boot.img ${BINARIES_DIR}
 fi
 
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOOT_TYPE}.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage                           \
-       --rootpath "${TARGET_DIR}"     \
-       --tmppath "${GENIMAGE_TMP}"    \
-       --inputpath "${BINARIES_DIR}"  \
-       --outputpath "${BINARIES_DIR}" \
-       --config "${GENIMAGE_CFG}"
-
 exit $?
diff --git a/bsp/buildroot/board/pc/readme.txt b/bsp/buildroot/board/pc/readme.txt
index 68ca2116..ca3b5123 100644
--- a/bsp/buildroot/board/pc/readme.txt
+++ b/bsp/buildroot/board/pc/readme.txt
@@ -35,3 +35,44 @@ Bare PC sample config
   the setup as well.
 
 3. Enjoy
+
+Emulation in qemu (BIOS)
+========================
+
+1. Edit grub-bios.cfg
+
+  Since the driver will show up in the virtual machine as /dev/vda,
+  change board/pc/grub-bios.cfg to use root=/dev/vda2 instead of
+  root=/dev/sda2. Then rebuild grub2 and the image.
+
+2. Run the emulation with:
+
+qemu-system-x86_64 \
+	-M pc \
+	-drive file=output/images/disk.img,if=virtio,format=raw \
+	-net nic,model=virtio \
+	-net user
+
+
+Emulation in qemu (UEFI)
+========================
+
+1. Edit grub-efi.cfg
+
+  Since the driver will show up in the virtual machine as /dev/vda,
+  change board/pc/grub-efi.cfg to use root=/dev/vda2 instead of
+  root=/dev/sda2. Then rebuild grub2 and the image.
+
+2. Run the emulation with:
+
+qemu-system-x86_64 \
+	-M pc \
+	-bios </path/to/OVMF_CODE.fd> \
+	-drive file=output/images/disk.img,if=virtio,format=raw \
+	-net nic,model=virtio \
+	-net user
+
+Note that </path/to/OVMF.fd> needs to point to a valid x86_64 UEFI
+firmware image for qemu. It may be provided by your distribution as a
+edk2 or OVMF package, in path such as
+/usr/share/edk2/ovmf/OVMF_CODE.fd .
diff --git a/bsp/buildroot/board/pine64/pine64/boot.cmd b/bsp/buildroot/board/pine64/pine64/boot.cmd
new file mode 100644
index 00000000..14f56104
--- /dev/null
+++ b/bsp/buildroot/board/pine64/pine64/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-a64-pine64.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/pine64/pine64/genimage.cfg b/bsp/buildroot/board/pine64/pine64/genimage.cfg
new file mode 100644
index 00000000..2ff38d54
--- /dev/null
+++ b/bsp/buildroot/board/pine64/pine64/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-a64-pine64.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/pine64/pine64/readme.txt b/bsp/buildroot/board/pine64/pine64/readme.txt
new file mode 100644
index 00000000..85226fdd
--- /dev/null
+++ b/bsp/buildroot/board/pine64/pine64/readme.txt
@@ -0,0 +1,38 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the Pine64. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+Pine64 link:
+https://www.pine64.org/?page_id=1194
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/Pine64
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make pine64_defconfig
+
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your Pine64 and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/pine64/sopine/boot.cmd b/bsp/buildroot/board/pine64/sopine/boot.cmd
new file mode 100644
index 00000000..2eab6423
--- /dev/null
+++ b/bsp/buildroot/board/pine64/sopine/boot.cmd
@@ -0,0 +1,6 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+fatload mmc 0 $kernel_addr_r Image
+fatload mmc 0 $fdt_addr_r sun50i-a64-sopine-baseboard.dtb
+
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/pine64/sopine/genimage.cfg b/bsp/buildroot/board/pine64/sopine/genimage.cfg
new file mode 100644
index 00000000..02ebe7ab
--- /dev/null
+++ b/bsp/buildroot/board/pine64/sopine/genimage.cfg
@@ -0,0 +1,39 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"Image",
+			"sun50i-a64-sopine-baseboard.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition spl {
+		in-partition-table = "no"
+		image = "sunxi-spl.bin"
+		offset = 8192
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot.itb"
+		offset = 40K
+		size = 1M # 1MB - 40K
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/pine64/sopine/readme.txt b/bsp/buildroot/board/pine64/sopine/readme.txt
new file mode 100644
index 00000000..08cb380b
--- /dev/null
+++ b/bsp/buildroot/board/pine64/sopine/readme.txt
@@ -0,0 +1,38 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with the
+buildroot environment for the SoPine. With the current configuration
+it will bring-up the board, and allow access through the serial console.
+
+SoPINE link:
+https://www.pine64.org/?page_id=1491
+
+Wiki link:
+https://openedev.amarulasolutions.com/display/ODWIKI/SoPine
+
+This configuration uses U-Boot mainline and kernel mainline.
+
+How to build
+============
+
+    $ make pine64_sopine_defconfig
+
+    $ make
+
+Note: you will need access to the internet to download the required
+sources.
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image called "sdcard.img"
+in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX
+  $ sudo sync
+
+Insert the micro SDcard in your SoPine and power it up. The console
+is on the serial line, 115200 8N1.
diff --git a/bsp/buildroot/board/qemu/aarch64-virt/linux-4.9.config b/bsp/buildroot/board/qemu/aarch64-virt/linux-4.13.config
similarity index 100%
rename from bsp/buildroot/board/qemu/aarch64-virt/linux-4.9.config
rename to bsp/buildroot/board/qemu/aarch64-virt/linux-4.13.config
diff --git a/bsp/buildroot/board/qemu/aarch64-virt/readme.txt b/bsp/buildroot/board/qemu/aarch64-virt/readme.txt
index 1c4c7f9c..9e09d953 100644
--- a/bsp/buildroot/board/qemu/aarch64-virt/readme.txt
+++ b/bsp/buildroot/board/qemu/aarch64-virt/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:
 
-  qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0
+  qemu-system-aarch64 -M virt -cpu cortex-a57 -nographic -smp 1 -kernel output/images/Image -append "root=/dev/vda console=ttyAMA0" -netdev user,id=eth0 -device virtio-net-device,netdev=eth0 -drive file=output/images/rootfs.ext4,if=none,format=raw,id=hd0 -device virtio-blk-device,drive=hd0
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/arm-versatile/linux-4.9.config b/bsp/buildroot/board/qemu/arm-versatile/linux-4.13.config
similarity index 100%
rename from bsp/buildroot/board/qemu/arm-versatile/linux-4.9.config
rename to bsp/buildroot/board/qemu/arm-versatile/linux-4.13.config
diff --git a/bsp/buildroot/board/qemu/arm-versatile/readme.txt b/bsp/buildroot/board/qemu/arm-versatile/readme.txt
index c8ea4cda..6e899f4b 100644
--- a/bsp/buildroot/board/qemu/arm-versatile/readme.txt
+++ b/bsp/buildroot/board/qemu/arm-versatile/readme.txt
@@ -9,4 +9,4 @@ Or for the noMMU emulation:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/arm-vexpress/readme.txt b/bsp/buildroot/board/qemu/arm-vexpress/readme.txt
index 99812b9a..57bb8141 100644
--- a/bsp/buildroot/board/qemu/arm-vexpress/readme.txt
+++ b/bsp/buildroot/board/qemu/arm-vexpress/readme.txt
@@ -8,4 +8,4 @@ graphical window is the framebuffer.
 If you want to emulate more cores change "-smp 1" to "-smp 2" for
 dual-core or even "smp -4" for a quad-core configuration.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/m68k-mcf5208/linux-4.8.config b/bsp/buildroot/board/qemu/m68k-mcf5208/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/m68k-mcf5208/linux-4.8.config
rename to bsp/buildroot/board/qemu/m68k-mcf5208/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/m68k-mcf5208/readme.txt b/bsp/buildroot/board/qemu/m68k-mcf5208/readme.txt
index 00deb2c3..014a0dc0 100644
--- a/bsp/buildroot/board/qemu/m68k-mcf5208/readme.txt
+++ b/bsp/buildroot/board/qemu/m68k-mcf5208/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/m68k-q800/linux-4.9.config b/bsp/buildroot/board/qemu/m68k-q800/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/m68k-q800/linux-4.9.config
rename to bsp/buildroot/board/qemu/m68k-q800/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/microblazebe-mmu/linux-4.9.config b/bsp/buildroot/board/qemu/microblazebe-mmu/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/microblazebe-mmu/linux-4.9.config
rename to bsp/buildroot/board/qemu/microblazebe-mmu/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/microblazebe-mmu/readme.txt b/bsp/buildroot/board/qemu/microblazebe-mmu/readme.txt
index 25fc35ca..cf0afdaf 100644
--- a/bsp/buildroot/board/qemu/microblazebe-mmu/readme.txt
+++ b/bsp/buildroot/board/qemu/microblazebe-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/microblazeel-mmu/linux-4.9.config b/bsp/buildroot/board/qemu/microblazeel-mmu/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/microblazeel-mmu/linux-4.9.config
rename to bsp/buildroot/board/qemu/microblazeel-mmu/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/microblazeel-mmu/readme.txt b/bsp/buildroot/board/qemu/microblazeel-mmu/readme.txt
index 1a77a56f..9edf101a 100644
--- a/bsp/buildroot/board/qemu/microblazeel-mmu/readme.txt
+++ b/bsp/buildroot/board/qemu/microblazeel-mmu/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/mips32r2-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips32r2-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips32r2-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips32r2-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips32r2-malta/readme.txt b/bsp/buildroot/board/qemu/mips32r2-malta/readme.txt
index 13f8910b..7002ab1d 100644
--- a/bsp/buildroot/board/qemu/mips32r2-malta/readme.txt
+++ b/bsp/buildroot/board/qemu/mips32r2-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/mips32r2el-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips32r2el-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips32r2el-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips32r2el-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips32r2el-malta/readme.txt b/bsp/buildroot/board/qemu/mips32r2el-malta/readme.txt
index 5c4bbda6..bfc9c49d 100644
--- a/bsp/buildroot/board/qemu/mips32r2el-malta/readme.txt
+++ b/bsp/buildroot/board/qemu/mips32r2el-malta/readme.txt
@@ -6,4 +6,4 @@ The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer. No keyboard support has been
 enabled.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/mips32r6-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips32r6-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips32r6-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips32r6-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips32r6-malta/readme.txt b/bsp/buildroot/board/qemu/mips32r6-malta/readme.txt
index 107c47d8..7d79c660 100644
--- a/bsp/buildroot/board/qemu/mips32r6-malta/readme.txt
+++ b/bsp/buildroot/board/qemu/mips32r6-malta/readme.txt
@@ -4,4 +4,4 @@ qemu-system-mips -M malta -cpu mips32r6-generic -kernel output/images/vmlinux -d
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/mips32r6el-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips32r6el-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips32r6el-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips32r6el-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips32r6el-malta/readme.txt b/bsp/buildroot/board/qemu/mips32r6el-malta/readme.txt
index e29115f7..78f83505 100644
--- a/bsp/buildroot/board/qemu/mips32r6el-malta/readme.txt
+++ b/bsp/buildroot/board/qemu/mips32r6el-malta/readme.txt
@@ -4,4 +4,4 @@ qemu-system-mipsel -M malta -cpu mips32r6-generic -kernel output/images/vmlinux
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/mips64-malta/linux-4.8.config b/bsp/buildroot/board/qemu/mips64-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips64-malta/linux-4.8.config
rename to bsp/buildroot/board/qemu/mips64-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips64-malta/readme.txt b/bsp/buildroot/board/qemu/mips64-malta/readme.txt
index a89985dd..8a732101 100644
--- a/bsp/buildroot/board/qemu/mips64-malta/readme.txt
+++ b/bsp/buildroot/board/qemu/mips64-malta/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/mips64el-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips64el-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips64el-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips64el-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips64r6-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips64r6-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips64r6-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips64r6-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips64r6el-malta/linux-4.9.config b/bsp/buildroot/board/qemu/mips64r6el-malta/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/mips64r6el-malta/linux-4.9.config
rename to bsp/buildroot/board/qemu/mips64r6el-malta/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/mips64r6el-malta/readme.txt b/bsp/buildroot/board/qemu/mips64r6el-malta/readme.txt
index b1dc23a2..9250cf37 100644
--- a/bsp/buildroot/board/qemu/mips64r6el-malta/readme.txt
+++ b/bsp/buildroot/board/qemu/mips64r6el-malta/readme.txt
@@ -4,7 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
-
-Might work with 2.6.0 by changing the -cpu entry to MIPS64R6-generic
-since the naming was updated and the old name removed in 2.7.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/nios2-10m50/linux-4.9.fragment b/bsp/buildroot/board/qemu/nios2-10m50/linux-4.11.fragment
similarity index 100%
rename from bsp/buildroot/board/qemu/nios2-10m50/linux-4.9.fragment
rename to bsp/buildroot/board/qemu/nios2-10m50/linux-4.11.fragment
diff --git a/bsp/buildroot/board/qemu/nios2-10m50/readme.txt b/bsp/buildroot/board/qemu/nios2-10m50/readme.txt
index 978ba95c..f7dee370 100644
--- a/bsp/buildroot/board/qemu/nios2-10m50/readme.txt
+++ b/bsp/buildroot/board/qemu/nios2-10m50/readme.txt
@@ -4,6 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with the upcoming QEMU 2.9.0 [1]
-
-[1] http://git.qemu.org/?p=qemu.git;h=ae5045ae5b2bbd8ce1335d1b05f9ecacca83a6cf
+Tested with QEMU 2.9.0.
diff --git a/bsp/buildroot/board/qemu/or1k/linux-4.9.config b/bsp/buildroot/board/qemu/or1k/linux.config
similarity index 100%
rename from bsp/buildroot/board/qemu/or1k/linux-4.9.config
rename to bsp/buildroot/board/qemu/or1k/linux.config
diff --git a/bsp/buildroot/board/qemu/or1k/patches/linux/0001-ld-or1k.patch b/bsp/buildroot/board/qemu/or1k/patches/linux/0001-ld-or1k.patch
deleted file mode 100644
index aba2463c..00000000
--- a/bsp/buildroot/board/qemu/or1k/patches/linux/0001-ld-or1k.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-OpenRISC arch name was in the beginning or32
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S
---- linux-4.4.5.orig/arch/openrisc/kernel/vmlinux.lds.S	2016-03-10 00:35:58.000000000 +0100
-+++ linux-4.4.5/arch/openrisc/kernel/vmlinux.lds.S	2016-03-16 09:21:07.933535532 +0100
-@@ -30,7 +30,7 @@
- #include <asm/cache.h>
- #include <asm-generic/vmlinux.lds.h>
- 
--OUTPUT_FORMAT("elf32-or32", "elf32-or32", "elf32-or32")
-+OUTPUT_FORMAT("elf32-or1k", "elf32-or1k", "elf32-or1k")
- jiffies = jiffies_64 + 4;
- 
- SECTIONS
diff --git a/bsp/buildroot/board/qemu/or1k/patches/linux/0002-kallsyms.patch b/bsp/buildroot/board/qemu/or1k/patches/linux/0002-kallsyms.patch
deleted file mode 100644
index e788a7a9..00000000
--- a/bsp/buildroot/board/qemu/or1k/patches/linux/0002-kallsyms.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: https://lkml.org/lkml/2016/12/31/13
-
-The build robot reports:
-
-   .tmp_kallsyms1.o: In function `kallsyms_relative_base':
->> (.rodata+0x8a18): undefined reference to `_text'
-
-This is when using 'make alldefconfig'. Adding this _text symbol to mark
-the start of the kernel as in other architecture fixes this.
-
-Signed-off-by: Stafford Horne <shorne@gmail.com>
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur linux-4.9.orig/arch/openrisc/kernel/vmlinux.lds.S linux-4.9/arch/openrisc/kernel/vmlinux.lds.S
---- linux-4.9.orig/arch/openrisc/kernel/vmlinux.lds.S	2016-12-11 20:17:54.000000000 +0100
-+++ linux-4.9/arch/openrisc/kernel/vmlinux.lds.S	2017-01-01 12:13:43.039107518 +0100
-@@ -38,6 +38,8 @@
-         /* Read-only sections, merged into text segment: */
-         . = LOAD_BASE ;
- 
-+	_text = .;
-+
- 	/* _s_kernel_ro must be page aligned */
- 	. = ALIGN(PAGE_SIZE);
- 	_s_kernel_ro = .;
diff --git a/bsp/buildroot/board/qemu/or1k/readme.txt b/bsp/buildroot/board/qemu/or1k/readme.txt
index 53c66ad9..a04314e7 100644
--- a/bsp/buildroot/board/qemu/or1k/readme.txt
+++ b/bsp/buildroot/board/qemu/or1k/readme.txt
@@ -1,9 +1,9 @@
 Run the emulation with:
 
- qemu-system-or32 -kernel output/images/vmlinux -nographic
+ qemu-system-or1k -kernel output/images/vmlinux -nographic
 
 The login prompt will appear in the terminal that started Qemu.
 
 Ethernet support is not working, yet.
 
-Tested with QEMU 2.8.0.
+Tested with QEMU 2.9.0.
diff --git a/bsp/buildroot/board/qemu/ppc-g3beige/linux-4.9.config b/bsp/buildroot/board/qemu/ppc-g3beige/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/ppc-g3beige/linux-4.9.config
rename to bsp/buildroot/board/qemu/ppc-g3beige/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/ppc-g3beige/readme.txt b/bsp/buildroot/board/qemu/ppc-g3beige/readme.txt
index 3bd88a6e..42c97a0c 100644
--- a/bsp/buildroot/board/qemu/ppc-g3beige/readme.txt
+++ b/bsp/buildroot/board/qemu/ppc-g3beige/readme.txt
@@ -5,4 +5,4 @@ Run the emulation with:
 The login prompt will appear in the terminal that started Qemu. The
 graphical window is the framebuffer.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/ppc-mpc8544ds/linux-4.9.config b/bsp/buildroot/board/qemu/ppc-mpc8544ds/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/ppc-mpc8544ds/linux-4.9.config
rename to bsp/buildroot/board/qemu/ppc-mpc8544ds/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/ppc-mpc8544ds/readme.txt b/bsp/buildroot/board/qemu/ppc-mpc8544ds/readme.txt
index d8f31cbc..0008c84b 100644
--- a/bsp/buildroot/board/qemu/ppc-mpc8544ds/readme.txt
+++ b/bsp/buildroot/board/qemu/ppc-mpc8544ds/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/ppc64-pseries/readme.txt b/bsp/buildroot/board/qemu/ppc64-pseries/readme.txt
index 94fa228b..9de13779 100644
--- a/bsp/buildroot/board/qemu/ppc64-pseries/readme.txt
+++ b/bsp/buildroot/board/qemu/ppc64-pseries/readme.txt
@@ -1,7 +1,7 @@
 Run the emulation with:
 
- qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append 'console=hvc0 root=/dev/sda' -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
+ qemu-system-ppc64 -M pseries -cpu POWER7 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/ppc64le-pseries/readme.txt b/bsp/buildroot/board/qemu/ppc64le-pseries/readme.txt
new file mode 100644
index 00000000..95455e94
--- /dev/null
+++ b/bsp/buildroot/board/qemu/ppc64le-pseries/readme.txt
@@ -0,0 +1,7 @@
+Run the emulation with:
+
+qemu-system-ppc64 -M pseries -cpu POWER8 -m 256 -kernel output/images/vmlinux -append "console=hvc0 root=/dev/sda" -drive file=output/images/rootfs.ext2,if=scsi,index=0,format=raw -serial stdio -display curses
+
+The login prompt will appear in the terminal window.
+
+Tested with QEMU 2.10.0
diff --git a/bsp/buildroot/board/qemu/sparc-ss10/linux-4.9.config b/bsp/buildroot/board/qemu/sparc-ss10/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/sparc-ss10/linux-4.9.config
rename to bsp/buildroot/board/qemu/sparc-ss10/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/sparc-ss10/readme.txt b/bsp/buildroot/board/qemu/sparc-ss10/readme.txt
index 5a07ee00..0ce461d2 100644
--- a/bsp/buildroot/board/qemu/sparc-ss10/readme.txt
+++ b/bsp/buildroot/board/qemu/sparc-ss10/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/sparc64-sun4u/linux-4.9.config b/bsp/buildroot/board/qemu/sparc64-sun4u/linux-4.11.config
similarity index 100%
rename from bsp/buildroot/board/qemu/sparc64-sun4u/linux-4.9.config
rename to bsp/buildroot/board/qemu/sparc64-sun4u/linux-4.11.config
diff --git a/bsp/buildroot/board/qemu/sparc64-sun4u/readme.txt b/bsp/buildroot/board/qemu/sparc64-sun4u/readme.txt
index aaf96c35..adfff708 100644
--- a/bsp/buildroot/board/qemu/sparc64-sun4u/readme.txt
+++ b/bsp/buildroot/board/qemu/sparc64-sun4u/readme.txt
@@ -4,4 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/x86/linux-4.15.config b/bsp/buildroot/board/qemu/x86/linux-4.15.config
new file mode 100644
index 00000000..79f7537d
--- /dev/null
+++ b/bsp/buildroot/board/qemu/x86/linux-4.15.config
@@ -0,0 +1,51 @@
+CONFIG_SYSVIPC=y
+CONFIG_CGROUPS=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_SMP=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_VIRTIO_NET=y
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+# CONFIG_WLAN is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_DRM=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_BOCHS=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_EXT4_FS=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
diff --git a/bsp/buildroot/board/qemu/x86/linux-4.9.config b/bsp/buildroot/board/qemu/x86/linux-4.9.config
deleted file mode 120000
index 44b2fa12..00000000
--- a/bsp/buildroot/board/qemu/x86/linux-4.9.config
+++ /dev/null
@@ -1 +0,0 @@
-../x86_64/linux-4.9.config
\ No newline at end of file
diff --git a/bsp/buildroot/board/qemu/x86/readme.txt b/bsp/buildroot/board/qemu/x86/readme.txt
index 4f2e4c7d..b003ad53 100644
--- a/bsp/buildroot/board/qemu/x86/readme.txt
+++ b/bsp/buildroot/board/qemu/x86/readme.txt
@@ -1,9 +1,9 @@
 Run the emulation with:
 
-  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append root=/dev/vda -net nic,model=virtio -net user
+  qemu-system-i386 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user
 
 Optionally add -smp N to emulate a SMP system with N CPUs.
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/x86_64/linux-4.15.config b/bsp/buildroot/board/qemu/x86_64/linux-4.15.config
new file mode 100644
index 00000000..5fa33d44
--- /dev/null
+++ b/bsp/buildroot/board/qemu/x86_64/linux-4.15.config
@@ -0,0 +1,52 @@
+CONFIG_SYSVIPC=y
+CONFIG_CGROUPS=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_SMP=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_VIRTIO_NET=y
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+# CONFIG_WLAN is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_DRM=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_BOCHS=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_EXT4_FS=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_UNWINDER_FRAME_POINTER=y
diff --git a/bsp/buildroot/board/qemu/x86_64/linux-4.9.config b/bsp/buildroot/board/qemu/x86_64/linux-4.9.config
deleted file mode 100644
index e3bd1454..00000000
--- a/bsp/buildroot/board/qemu/x86_64/linux-4.9.config
+++ /dev/null
@@ -1,45 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_SMP=y
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_ATA=y
-CONFIG_ATA_PIIX=y
-CONFIG_NETDEVICES=y
-CONFIG_VIRTIO_NET=y
-CONFIG_NE2K_PCI=y
-CONFIG_8139CP=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_DRM=y
-CONFIG_DRM_BOCHS=y
-CONFIG_DRM_QXL=y
-CONFIG_DRM_VIRTIO_GPU=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_USB=y
-CONFIG_USB_XHCI_HCD=y
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_INPUT=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
-CONFIG_EXT4_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
diff --git a/bsp/buildroot/board/qemu/x86_64/readme.txt b/bsp/buildroot/board/qemu/x86_64/readme.txt
index 6ea28d39..ed7b5f55 100644
--- a/bsp/buildroot/board/qemu/x86_64/readme.txt
+++ b/bsp/buildroot/board/qemu/x86_64/readme.txt
@@ -1,9 +1,9 @@
 Run the emulation with:
 
-  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append root=/dev/vda -net nic,model=virtio -net user
+  qemu-system-x86_64 -M pc -kernel output/images/bzImage -drive file=output/images/rootfs.ext2,if=virtio,format=raw -append "root=/dev/vda" -net nic,model=virtio -net user
 
 Optionally add -smp N to emulate a SMP system with N CPUs.
 
 The login prompt will appear in the graphical window.
 
-Tested with QEMU 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11-nommu.config b/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11-nommu.config
new file mode 100644
index 00000000..10f7ee12
--- /dev/null
+++ b/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11-nommu.config
@@ -0,0 +1,38 @@
+CONFIG_NO_HZ_IDLE=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_XTENSA_VARIANT_CUSTOM=y
+CONFIG_XTENSA_VARIANT_CUSTOM_NAME="dc233c"
+# CONFIG_XTENSA_VARIANT_MMU is not set
+CONFIG_XTENSA_UNALIGNED_USER=y
+CONFIG_PREEMPT=y
+CONFIG_KERNEL_LOAD_ADDRESS=0x00003000
+# CONFIG_PCI is not set
+CONFIG_XTENSA_PLATFORM_XTFPGA=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 memmap=0x04000000@0"
+CONFIG_DEFAULT_MEM_START=0x00000000
+CONFIG_BINFMT_FLAT=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+CONFIG_DNS_RESOLVER=y
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_NETDEVICES=y
+CONFIG_MARVELL_PHY=y
+# CONFIG_WLAN is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HWMON is not set
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_TMPFS=y
+CONFIG_FANOTIFY=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_S32C1I_SELFTEST is not set
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11.config b/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11.config
new file mode 100644
index 00000000..625b8604
--- /dev/null
+++ b/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.11.config
@@ -0,0 +1,36 @@
+# CONFIG_SWAP is not set
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_XTENSA_VARIANT_DC233C=y
+CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX=y
+CONFIG_XTENSA_PLATFORM_XTFPGA=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyS0,38400 memmap=0x04000000@0"
+# CONFIG_COMPACTION is not set
+# CONFIG_BOUNCE is not set
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_NETDEVICES=y
+# CONFIG_WLAN is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+# CONFIG_HWMON is not set
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_LD_NO_RELAX=y
+# CONFIG_S32C1I_SELFTEST is not set
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.8-nommu.config b/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.8-nommu.config
deleted file mode 100644
index 29f6fa4c..00000000
--- a/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.8-nommu.config
+++ /dev/null
@@ -1,37 +0,0 @@
-CONFIG_NO_HZ_IDLE=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_XTENSA_VARIANT_CUSTOM=y
-CONFIG_XTENSA_VARIANT_CUSTOM_NAME="dc233c"
-# CONFIG_XTENSA_VARIANT_MMU is not set
-CONFIG_XTENSA_UNALIGNED_USER=y
-CONFIG_PREEMPT=y
-# CONFIG_PCI is not set
-CONFIG_XTENSA_PLATFORM_XTFPGA=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8"
-CONFIG_DEFAULT_MEM_START=0x00000000
-CONFIG_BINFMT_FLAT=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_IPV6 is not set
-CONFIG_NETFILTER=y
-CONFIG_DNS_RESOLVER=y
-# CONFIG_WIRELESS is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_NETDEVICES=y
-CONFIG_MARVELL_PHY=y
-# CONFIG_WLAN is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_TMPFS=y
-CONFIG_FANOTIFY=y
-CONFIG_PRINTK_TIME=y
-# CONFIG_S32C1I_SELFTEST is not set
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.8.config b/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.8.config
deleted file mode 100644
index 2d8e58d7..00000000
--- a/bsp/buildroot/board/qemu/xtensa-lx60/linux-4.8.config
+++ /dev/null
@@ -1,36 +0,0 @@
-# CONFIG_SWAP is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_XTENSA_VARIANT_DC233C=y
-CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX=y
-CONFIG_XTENSA_PLATFORM_XTFPGA=y
-CONFIG_CMDLINE_BOOL=y
-CONFIG_CMDLINE="console=ttyS0,38400"
-# CONFIG_COMPACTION is not set
-# CONFIG_BOUNCE is not set
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_NETDEVICES=y
-# CONFIG_WLAN is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_LD_NO_RELAX=y
-# CONFIG_S32C1I_SELFTEST is not set
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/linux/linux-0001-disable-redboot-and-uboot.patch b/bsp/buildroot/board/qemu/xtensa-lx60/linux/linux-0001-disable-redboot-and-uboot.patch
deleted file mode 100644
index c0ccf484..00000000
--- a/bsp/buildroot/board/qemu/xtensa-lx60/linux/linux-0001-disable-redboot-and-uboot.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-disable boot-uboot and boot-redboot, requires a patched u-boot and mkimage
-
-Signed-off-by:Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur linux-3.15.orig/arch/xtensa/boot/Makefile linux-3.15/arch/xtensa/boot/Makefile
---- linux-3.15.orig/arch/xtensa/boot/Makefile	2014-06-08 20:19:54.000000000 +0200
-+++ linux-3.15/arch/xtensa/boot/Makefile	2014-06-14 20:07:15.206091165 +0200
-@@ -23,7 +23,7 @@
- 
- bootdir-$(CONFIG_XTENSA_PLATFORM_ISS)	 += boot-elf
- bootdir-$(CONFIG_XTENSA_PLATFORM_XT2000) += boot-redboot boot-elf boot-uboot
--bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-redboot boot-elf boot-uboot
-+bootdir-$(CONFIG_XTENSA_PLATFORM_XTFPGA) += boot-elf
- 
- zImage Image: $(bootdir-y)
- 
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/readme.txt b/bsp/buildroot/board/qemu/xtensa-lx60/readme.txt
index be77345e..9a82c537 100644
--- a/bsp/buildroot/board/qemu/xtensa-lx60/readme.txt
+++ b/bsp/buildroot/board/qemu/xtensa-lx60/readme.txt
@@ -4,5 +4,4 @@ Run the emulation with:
 
 The login prompt will appear in the terminal that started Qemu.
 
-Tested with QEMU 2.6.0
-Known to fail with 2.5.0
+Tested with QEMU 2.9.0
diff --git a/bsp/buildroot/board/qemu/xtensa-lx60/xtensa_dc233c.tar b/bsp/buildroot/board/qemu/xtensa-lx60/xtensa_dc233c.tar
deleted file mode 100644
index 1a97d7a8..00000000
Binary files a/bsp/buildroot/board/qemu/xtensa-lx60/xtensa_dc233c.tar and /dev/null differ
diff --git a/bsp/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg b/bsp/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg
index a9d4c450..212c3060 100644
--- a/bsp/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg
+++ b/bsp/buildroot/board/raspberrypi/genimage-raspberrypi0.cfg
@@ -2,6 +2,7 @@ image boot.vfat {
   vfat {
     files = {
       "bcm2708-rpi-b-plus.dtb",
+      "bcm2708-rpi-0-w.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
diff --git a/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg b/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg
new file mode 100644
index 00000000..c5f86527
--- /dev/null
+++ b/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg
@@ -0,0 +1,31 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2710-rpi-3-b.dtb",
+      "bcm2837-rpi-3-b.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}
diff --git a/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg b/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg
index 3c9f1e5e..98ff7090 100644
--- a/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg
+++ b/bsp/buildroot/board/raspberrypi/genimage-raspberrypi3.cfg
@@ -2,6 +2,7 @@ image boot.vfat {
   vfat {
     files = {
       "bcm2710-rpi-3-b.dtb",
+      "bcm2710-rpi-cm3.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
diff --git a/bsp/buildroot/board/raspberrypi/post-image.sh b/bsp/buildroot/board/raspberrypi/post-image.sh
index b2bb0706..3c6c9384 100755
--- a/bsp/buildroot/board/raspberrypi/post-image.sh
+++ b/bsp/buildroot/board/raspberrypi/post-image.sh
@@ -1,22 +1,53 @@
-#!/bin/sh
+#!/bin/bash
+
+set -e
 
 BOARD_DIR="$(dirname $0)"
 BOARD_NAME="$(basename ${BOARD_DIR})"
 GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
 
-case "${2}" in
-	--add-pi3-miniuart-bt-overlay)
-	if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
-		echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
-		cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+for arg in "$@"
+do
+	case "${arg}" in
+		--add-pi3-miniuart-bt-overlay)
+		if ! grep -qE '^dtoverlay=' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+			echo "Adding 'dtoverlay=pi3-miniuart-bt' to config.txt (fixes ttyAMA0 serial console)."
+			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
 
 # fixes rpi3 ttyAMA0 serial console
 dtoverlay=pi3-miniuart-bt
 __EOF__
-	fi
-	;;
-esac
+		fi
+		;;
+		--aarch64)
+		# Run a 64bits kernel (armv8)
+		sed -e '/^kernel=/s,=.*,=Image,' -i "${BINARIES_DIR}/rpi-firmware/config.txt"
+		if ! grep -qE '^arm_control=0x200' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+
+# enable 64bits support
+arm_control=0x200
+__EOF__
+		fi
+
+		# Enable uart console
+		if ! grep -qE '^enable_uart=1' "${BINARIES_DIR}/rpi-firmware/config.txt"; then
+			cat << __EOF__ >> "${BINARIES_DIR}/rpi-firmware/config.txt"
+
+# enable rpi3 ttyS0 serial console
+enable_uart=1
+__EOF__
+		fi
+		;;
+		--gpu_mem_256=*|--gpu_mem_512=*|--gpu_mem_1024=*)
+		# Set GPU memory
+		gpu_mem="${arg:2}"
+		sed -e "/^${gpu_mem%=*}=/s,=.*,=${gpu_mem##*=}," -i "${BINARIES_DIR}/rpi-firmware/config.txt"
+		;;
+	esac
+
+done
 
 rm -rf "${GENIMAGE_TMP}"
 
diff --git a/bsp/buildroot/board/raspberrypi3-64 b/bsp/buildroot/board/raspberrypi3-64
new file mode 120000
index 00000000..fcdafc81
--- /dev/null
+++ b/bsp/buildroot/board/raspberrypi3-64
@@ -0,0 +1 @@
+raspberrypi
\ No newline at end of file
diff --git a/bsp/buildroot/board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch b/bsp/buildroot/board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch
new file mode 100644
index 00000000..791dd930
--- /dev/null
+++ b/bsp/buildroot/board/roseapplepi/patches/linux/0005-compiler-gcc-integrate-the-various-compiler-gcc-345-.patch
@@ -0,0 +1,363 @@
+From 21be6b635320321216dde9201fa57a3aed60ee12 Mon Sep 17 00:00:00 2001
+From: Joe Perches <joe@perches.com>
+Date: Thu, 25 Jun 2015 15:01:02 -0700
+Subject: [PATCH] compiler-gcc: integrate the various compiler-gcc[345].h files
+
+As gcc major version numbers are going to advance rather rapidly in the
+future, there's no real value in separate files for each compiler
+version.
+
+Deduplicate some of the macros #defined in each file too.
+
+Neaten comments using normal kernel commenting style.
+
+Signed-off-by: Joe Perches <joe@perches.com>
+Cc: Andi Kleen <andi@firstfloor.org>
+Cc: Michal Marek <mmarek@suse.cz>
+Cc: Segher Boessenkool <segher@kernel.crashing.org>
+Cc: Sasha Levin <levinsasha928@gmail.com>
+Cc: Anton Blanchard <anton@samba.org>
+Cc: Alan Modra <amodra@gmail.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+(cherry picked from commit cb984d101b30eb7478d32df56a0023e4603cba7f)
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ include/linux/compiler-gcc.h  | 120 ++++++++++++++++++++++++++++++++++++++++--
+ include/linux/compiler-gcc3.h |  23 --------
+ include/linux/compiler-gcc4.h |  88 -------------------------------
+ include/linux/compiler-gcc5.h |  66 -----------------------
+ 4 files changed, 116 insertions(+), 181 deletions(-)
+ delete mode 100644 include/linux/compiler-gcc3.h
+ delete mode 100644 include/linux/compiler-gcc4.h
+ delete mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
+index 24545cd90a25..0c5d746850c2 100644
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -97,10 +97,122 @@
+ #define __maybe_unused			__attribute__((unused))
+ #define __always_unused			__attribute__((unused))
+ 
+-#define __gcc_header(x) #x
+-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+-#define gcc_header(x) _gcc_header(x)
+-#include gcc_header(__GNUC__)
++/* gcc version specific checks */
++
++#if GCC_VERSION < 30200
++# error Sorry, your compiler is too old - please upgrade it.
++#endif
++
++#if GCC_VERSION < 30300
++# define __used			__attribute__((__unused__))
++#else
++# define __used			__attribute__((__used__))
++#endif
++
++#ifdef CONFIG_GCOV_KERNEL
++# if GCC_VERSION < 30400
++#   error "GCOV profiling support for gcc versions below 3.4 not included"
++# endif /* __GNUC_MINOR__ */
++#endif /* CONFIG_GCOV_KERNEL */
++
++#if GCC_VERSION >= 30400
++#define __must_check		__attribute__((warn_unused_result))
++#endif
++
++#if GCC_VERSION >= 40000
++
++/* GCC 4.1.[01] miscompiles __weak */
++#ifdef __KERNEL__
++# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
++#  error Your version of gcc miscompiles the __weak directive
++# endif
++#endif
++
++#define __used			__attribute__((__used__))
++#define __compiler_offsetof(a, b)					\
++	__builtin_offsetof(a, b)
++
++#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
++# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
++#endif
++
++#if GCC_VERSION >= 40300
++/* Mark functions as cold. gcc will assume any path leading to a call
++ * to them will be unlikely.  This means a lot of manual unlikely()s
++ * are unnecessary now for any paths leading to the usual suspects
++ * like BUG(), printk(), panic() etc. [but let's keep them for now for
++ * older compilers]
++ *
++ * Early snapshots of gcc 4.3 don't support this and we can't detect this
++ * in the preprocessor, but we can live with this because they're unreleased.
++ * Maketime probing would be overkill here.
++ *
++ * gcc also has a __attribute__((__hot__)) to move hot functions into
++ * a special section, but I don't see any sense in this right now in
++ * the kernel context
++ */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++#endif /* GCC_VERSION >= 40300 */
++
++#if GCC_VERSION >= 40500
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++#endif /* GCC_VERSION >= 40500 */
++
++#if GCC_VERSION >= 40600
++/*
++ * Tell the optimizer that something else uses this function or variable.
++ */
++#define __visible	__attribute__((externally_visible))
++#endif
++
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#if GCC_VERSION >= 40400
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#endif
++#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
++#define __HAVE_BUILTIN_BSWAP16__
++#endif
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
++
++#if GCC_VERSION >= 50000
++#define KASAN_ABI_VERSION 4
++#elif GCC_VERSION >= 40902
++#define KASAN_ABI_VERSION 3
++#endif
++
++#endif	/* gcc version >= 40000 specific checks */
+ 
+ #if !defined(__noclone)
+ #define __noclone	/* not needed */
+diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
+deleted file mode 100644
+index 7d89febe4d79..000000000000
+--- a/include/linux/compiler-gcc3.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-#if GCC_VERSION < 30200
+-# error Sorry, your compiler is too old - please upgrade it.
+-#endif
+-
+-#if GCC_VERSION >= 30300
+-# define __used			__attribute__((__used__))
+-#else
+-# define __used			__attribute__((__unused__))
+-#endif
+-
+-#if GCC_VERSION >= 30400
+-#define __must_check		__attribute__((warn_unused_result))
+-#endif
+-
+-#ifdef CONFIG_GCOV_KERNEL
+-# if GCC_VERSION < 30400
+-#   error "GCOV profiling support for gcc versions below 3.4 not included"
+-# endif /* __GNUC_MINOR__ */
+-#endif /* CONFIG_GCOV_KERNEL */
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+deleted file mode 100644
+index 2507fd2a1eb4..000000000000
+--- a/include/linux/compiler-gcc4.h
++++ /dev/null
+@@ -1,88 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-/* GCC 4.1.[01] miscompiles __weak */
+-#ifdef __KERNEL__
+-# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
+-#  error Your version of gcc miscompiles the __weak directive
+-# endif
+-#endif
+-
+-#define __used			__attribute__((__used__))
+-#define __must_check 		__attribute__((warn_unused_result))
+-#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
+-
+-#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
+-# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+-#endif
+-
+-#if GCC_VERSION >= 40300
+-/* Mark functions as cold. gcc will assume any path leading to a call
+-   to them will be unlikely.  This means a lot of manual unlikely()s
+-   are unnecessary now for any paths leading to the usual suspects
+-   like BUG(), printk(), panic() etc. [but let's keep them for now for
+-   older compilers]
+-
+-   Early snapshots of gcc 4.3 don't support this and we can't detect this
+-   in the preprocessor, but we can live with this because they're unreleased.
+-   Maketime probing would be overkill here.
+-
+-   gcc also has a __attribute__((__hot__)) to move hot functions into
+-   a special section, but I don't see any sense in this right now in
+-   the kernel context */
+-#define __cold			__attribute__((__cold__))
+-
+-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+-
+-#ifndef __CHECKER__
+-# define __compiletime_warning(message) __attribute__((warning(message)))
+-# define __compiletime_error(message) __attribute__((error(message)))
+-#endif /* __CHECKER__ */
+-#endif /* GCC_VERSION >= 40300 */
+-
+-#if GCC_VERSION >= 40500
+-/*
+- * Mark a position in code as unreachable.  This can be used to
+- * suppress control flow warnings after asm blocks that transfer
+- * control elsewhere.
+- *
+- * Early snapshots of gcc 4.5 don't support this and we can't detect
+- * this in the preprocessor, but we can live with this because they're
+- * unreleased.  Really, we need to have autoconf for the kernel.
+- */
+-#define unreachable() __builtin_unreachable()
+-
+-/* Mark a function definition as prohibited from being cloned. */
+-#define __noclone	__attribute__((__noclone__))
+-
+-#endif /* GCC_VERSION >= 40500 */
+-
+-#if GCC_VERSION >= 40600
+-/*
+- * Tell the optimizer that something else uses this function or variable.
+- */
+-#define __visible __attribute__((externally_visible))
+-#endif
+-
+-/*
+- * GCC 'asm goto' miscompiles certain code sequences:
+- *
+- *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+- *
+- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+- * Fixed in GCC 4.8.2 and later versions.
+- *
+- * (asm goto is automatically volatile - the naming reflects this.)
+- */
+-#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+-
+-#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+-#if GCC_VERSION >= 40400
+-#define __HAVE_BUILTIN_BSWAP32__
+-#define __HAVE_BUILTIN_BSWAP64__
+-#endif
+-#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
+-#define __HAVE_BUILTIN_BSWAP16__
+-#endif
+-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+deleted file mode 100644
+index cdd1cc202d51..000000000000
+--- a/include/linux/compiler-gcc5.h
++++ /dev/null
+@@ -1,66 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-#define __used				__attribute__((__used__))
+-#define __must_check			__attribute__((warn_unused_result))
+-#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
+-
+-/* Mark functions as cold. gcc will assume any path leading to a call
+-   to them will be unlikely.  This means a lot of manual unlikely()s
+-   are unnecessary now for any paths leading to the usual suspects
+-   like BUG(), printk(), panic() etc. [but let's keep them for now for
+-   older compilers]
+-
+-   Early snapshots of gcc 4.3 don't support this and we can't detect this
+-   in the preprocessor, but we can live with this because they're unreleased.
+-   Maketime probing would be overkill here.
+-
+-   gcc also has a __attribute__((__hot__)) to move hot functions into
+-   a special section, but I don't see any sense in this right now in
+-   the kernel context */
+-#define __cold			__attribute__((__cold__))
+-
+-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+-
+-#ifndef __CHECKER__
+-# define __compiletime_warning(message) __attribute__((warning(message)))
+-# define __compiletime_error(message) __attribute__((error(message)))
+-#endif /* __CHECKER__ */
+-
+-/*
+- * Mark a position in code as unreachable.  This can be used to
+- * suppress control flow warnings after asm blocks that transfer
+- * control elsewhere.
+- *
+- * Early snapshots of gcc 4.5 don't support this and we can't detect
+- * this in the preprocessor, but we can live with this because they're
+- * unreleased.  Really, we need to have autoconf for the kernel.
+- */
+-#define unreachable() __builtin_unreachable()
+-
+-/* Mark a function definition as prohibited from being cloned. */
+-#define __noclone	__attribute__((__noclone__))
+-
+-/*
+- * Tell the optimizer that something else uses this function or variable.
+- */
+-#define __visible __attribute__((externally_visible))
+-
+-/*
+- * GCC 'asm goto' miscompiles certain code sequences:
+- *
+- *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+- *
+- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+- * Fixed in GCC 4.8.2 and later versions.
+- *
+- * (asm goto is automatically volatile - the naming reflects this.)
+- */
+-#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+-
+-#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+-#define __HAVE_BUILTIN_BSWAP32__
+-#define __HAVE_BUILTIN_BSWAP64__
+-#define __HAVE_BUILTIN_BSWAP16__
+-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch b/bsp/buildroot/board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch
new file mode 100644
index 00000000..ae19a490
--- /dev/null
+++ b/bsp/buildroot/board/roseapplepi/patches/uboot/0001-compiler-.h-sync-include-linux-compiler-.h-with-Linu.patch
@@ -0,0 +1,809 @@
+From 9b2c282b348dfe966bbba967dc7a45ce817cce50 Mon Sep 17 00:00:00 2001
+From: Tom Rini <trini@konsulko.com>
+Date: Mon, 29 Feb 2016 11:34:15 -0500
+Subject: [PATCH] compiler*.h: sync include/linux/compiler*.h with Linux
+ 4.5-rc6
+
+Copy these from Linux v4.5-rc6 tag.
+
+This is needed so that we can keep up with newer gcc versions.  Note
+that we don't have the uapi/ hierarchy from the kernel so continue to
+use <linux/types.h>
+
+Signed-off-by: Tom Rini <trini@konsulko.com>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ include/linux/compiler-gcc.h   | 259 ++++++++++++++++++++++++++++++++---------
+ include/linux/compiler-gcc3.h  |  23 ----
+ include/linux/compiler-gcc4.h  |  88 --------------
+ include/linux/compiler-gcc5.h  |  65 -----------
+ include/linux/compiler-intel.h |   5 +
+ include/linux/compiler.h       | 178 ++++++++++++++++++++++++++--
+ 6 files changed, 383 insertions(+), 235 deletions(-)
+ delete mode 100644 include/linux/compiler-gcc3.h
+ delete mode 100644 include/linux/compiler-gcc4.h
+ delete mode 100644 include/linux/compiler-gcc5.h
+
+diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
+index e057bd2a84..22ab246fee 100644
+--- a/include/linux/compiler-gcc.h
++++ b/include/linux/compiler-gcc.h
+@@ -5,14 +5,28 @@
+ /*
+  * Common definitions for all gcc versions go here.
+  */
+-#define GCC_VERSION (__GNUC__ * 10000 \
+-		   + __GNUC_MINOR__ * 100 \
+-		   + __GNUC_PATCHLEVEL__)
+-
++#define GCC_VERSION (__GNUC__ * 10000		\
++		     + __GNUC_MINOR__ * 100	\
++		     + __GNUC_PATCHLEVEL__)
+ 
+ /* Optimization barrier */
++
+ /* The "volatile" is due to gcc bugs */
+ #define barrier() __asm__ __volatile__("": : :"memory")
++/*
++ * This version is i.e. to prevent dead stores elimination on @ptr
++ * where gcc and llvm may behave differently when otherwise using
++ * normal barrier(): while gcc behavior gets along with a normal
++ * barrier(), llvm needs an explicit input variable to be assumed
++ * clobbered. The issue is as follows: while the inline asm might
++ * access any memory it wants, the compiler could have fit all of
++ * @ptr into memory registers instead, and since @ptr never escaped
++ * from that, it proofed that the inline asm wasn't touching any of
++ * it. This version works well with both compilers, i.e. we're telling
++ * the compiler that the inline asm absolutely may see the contents
++ * of @ptr. See also: https://llvm.org/bugs/show_bug.cgi?id=15495
++ */
++#define barrier_data(ptr) __asm__ __volatile__("": :"r"(ptr) :"memory")
+ 
+ /*
+  * This macro obfuscates arithmetic on a variable address so that gcc
+@@ -32,58 +46,63 @@
+  * the inline assembly constraint from =g to =r, in this particular
+  * case either is valid.
+  */
+-#define RELOC_HIDE(ptr, off)					\
+-  ({ unsigned long __ptr;					\
+-    __asm__ ("" : "=r"(__ptr) : "0"(ptr));		\
+-    (typeof(ptr)) (__ptr + (off)); })
++#define RELOC_HIDE(ptr, off)						\
++({									\
++	unsigned long __ptr;						\
++	__asm__ ("" : "=r"(__ptr) : "0"(ptr));				\
++	(typeof(ptr)) (__ptr + (off));					\
++})
+ 
+ /* Make the optimizer believe the variable can be manipulated arbitrarily. */
+-#define OPTIMIZER_HIDE_VAR(var) __asm__ ("" : "=r" (var) : "0" (var))
++#define OPTIMIZER_HIDE_VAR(var)						\
++	__asm__ ("" : "=r" (var) : "0" (var))
+ 
+ #ifdef __CHECKER__
+-#define __must_be_array(arr) 0
++#define __must_be_array(a)	0
+ #else
+ /* &a[0] degrades to a pointer: a different type from an array */
+-#define __must_be_array(a) BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
++#define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))
+ #endif
+ 
+ /*
+  * Force always-inline if the user requests it so via the .config,
+  * or if gcc is too old:
+  */
+-#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \
++#if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) ||		\
+     !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4)
+-# define inline		inline		__attribute__((always_inline)) notrace
+-# define __inline__	__inline__	__attribute__((always_inline)) notrace
+-# define __inline	__inline	__attribute__((always_inline)) notrace
++#define inline		inline		__attribute__((always_inline)) notrace
++#define __inline__	__inline__	__attribute__((always_inline)) notrace
++#define __inline	__inline	__attribute__((always_inline)) notrace
+ #else
+ /* A lot of inline functions can cause havoc with function tracing */
+-# define inline		inline		notrace
+-# define __inline__	__inline__	notrace
+-# define __inline	__inline	notrace
++#define inline		inline		notrace
++#define __inline__	__inline__	notrace
++#define __inline	__inline	notrace
+ #endif
+ 
+-#define __deprecated			__attribute__((deprecated))
+-#ifndef __packed
+-#define __packed			__attribute__((packed))
+-#endif
+-#ifndef __weak
+-#define __weak				__attribute__((weak))
+-#endif
++#define __always_inline	inline __attribute__((always_inline))
++#define  noinline	__attribute__((noinline))
++
++#define __deprecated	__attribute__((deprecated))
++#define __packed	__attribute__((packed))
++#define __weak		__attribute__((weak))
++#define __alias(symbol)	__attribute__((alias(#symbol)))
+ 
+ /*
+- * it doesn't make sense on ARM (currently the only user of __naked) to trace
+- * naked functions because then mcount is called without stack and frame pointer
+- * being set up and there is no chance to restore the lr register to the value
+- * before mcount was called.
++ * it doesn't make sense on ARM (currently the only user of __naked)
++ * to trace naked functions because then mcount is called without
++ * stack and frame pointer being set up and there is no chance to
++ * restore the lr register to the value before mcount was called.
++ *
++ * The asm() bodies of naked functions often depend on standard calling
++ * conventions, therefore they must be noinline and noclone.
+  *
+- * The asm() bodies of naked functions often depend on standard calling conventions,
+- * therefore they must be noinline and noclone.  GCC 4.[56] currently fail to enforce
+- * this, so we must do so ourselves.  See GCC PR44290.
++ * GCC 4.[56] currently fail to enforce this, so we must do so ourselves.
++ * See GCC PR44290.
+  */
+-#define __naked				__attribute__((naked)) noinline __noclone notrace
++#define __naked		__attribute__((naked)) noinline __noclone notrace
+ 
+-#define __noreturn			__attribute__((noreturn))
++#define __noreturn	__attribute__((noreturn))
+ 
+ /*
+  * From the GCC manual:
+@@ -95,34 +114,170 @@
+  * would be.
+  * [...]
+  */
+-#ifndef __pure
+-#define __pure				__attribute__((pure))
++#define __pure			__attribute__((pure))
++#define __aligned(x)		__attribute__((aligned(x)))
++#define __printf(a, b)		__attribute__((format(printf, a, b)))
++#define __scanf(a, b)		__attribute__((format(scanf, a, b)))
++#define __attribute_const__	__attribute__((__const__))
++#define __maybe_unused		__attribute__((unused))
++#define __always_unused		__attribute__((unused))
++
++/* gcc version specific checks */
++
++#if GCC_VERSION < 30200
++# error Sorry, your compiler is too old - please upgrade it.
++#endif
++
++#if GCC_VERSION < 30300
++# define __used			__attribute__((__unused__))
++#else
++# define __used			__attribute__((__used__))
++#endif
++
++#ifdef CONFIG_GCOV_KERNEL
++# if GCC_VERSION < 30400
++#   error "GCOV profiling support for gcc versions below 3.4 not included"
++# endif /* __GNUC_MINOR__ */
++#endif /* CONFIG_GCOV_KERNEL */
++
++#if GCC_VERSION >= 30400
++#define __must_check		__attribute__((warn_unused_result))
++#endif
++
++#if GCC_VERSION >= 40000
++
++/* GCC 4.1.[01] miscompiles __weak */
++#ifdef __KERNEL__
++# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
++#  error Your version of gcc miscompiles the __weak directive
++# endif
++#endif
++
++#define __used			__attribute__((__used__))
++#define __compiler_offsetof(a, b)					\
++	__builtin_offsetof(a, b)
++
++#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
++# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
++#endif
++
++#if GCC_VERSION >= 40300
++/* Mark functions as cold. gcc will assume any path leading to a call
++ * to them will be unlikely.  This means a lot of manual unlikely()s
++ * are unnecessary now for any paths leading to the usual suspects
++ * like BUG(), printk(), panic() etc. [but let's keep them for now for
++ * older compilers]
++ *
++ * Early snapshots of gcc 4.3 don't support this and we can't detect this
++ * in the preprocessor, but we can live with this because they're unreleased.
++ * Maketime probing would be overkill here.
++ *
++ * gcc also has a __attribute__((__hot__)) to move hot functions into
++ * a special section, but I don't see any sense in this right now in
++ * the kernel context
++ */
++#define __cold			__attribute__((__cold__))
++
++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
++
++#ifndef __CHECKER__
++# define __compiletime_warning(message) __attribute__((warning(message)))
++# define __compiletime_error(message) __attribute__((error(message)))
++#endif /* __CHECKER__ */
++#endif /* GCC_VERSION >= 40300 */
++
++#if GCC_VERSION >= 40500
++/*
++ * Mark a position in code as unreachable.  This can be used to
++ * suppress control flow warnings after asm blocks that transfer
++ * control elsewhere.
++ *
++ * Early snapshots of gcc 4.5 don't support this and we can't detect
++ * this in the preprocessor, but we can live with this because they're
++ * unreleased.  Really, we need to have autoconf for the kernel.
++ */
++#define unreachable() __builtin_unreachable()
++
++/* Mark a function definition as prohibited from being cloned. */
++#define __noclone	__attribute__((__noclone__))
++
++#endif /* GCC_VERSION >= 40500 */
++
++#if GCC_VERSION >= 40600
++/*
++ * When used with Link Time Optimization, gcc can optimize away C functions or
++ * variables which are referenced only from assembly code.  __visible tells the
++ * optimizer that something else uses this function or variable, thus preventing
++ * this.
++ */
++#define __visible	__attribute__((externally_visible))
+ #endif
+-#ifndef __aligned
+-#define __aligned(x)			__attribute__((aligned(x)))
++
++
++#if GCC_VERSION >= 40900 && !defined(__CHECKER__)
++/*
++ * __assume_aligned(n, k): Tell the optimizer that the returned
++ * pointer can be assumed to be k modulo n. The second argument is
++ * optional (default 0), so we use a variadic macro to make the
++ * shorthand.
++ *
++ * Beware: Do not apply this to functions which may return
++ * ERR_PTRs. Also, it is probably unwise to apply it to functions
++ * returning extra information in the low bits (but in that case the
++ * compiler should see some alignment anyway, when the return value is
++ * massaged by 'flags = ptr & 3; ptr &= ~3;').
++ */
++#define __assume_aligned(a, ...) __attribute__((__assume_aligned__(a, ## __VA_ARGS__)))
+ #endif
+-#define __printf(a, b)			__attribute__((format(printf, a, b)))
+-#define __scanf(a, b)			__attribute__((format(scanf, a, b)))
+-#define  noinline			__attribute__((noinline))
+-#define __attribute_const__		__attribute__((__const__))
+-#define __maybe_unused			__attribute__((unused))
+-#define __always_unused			__attribute__((unused))
+ 
+-#define __gcc_header(x) #x
+-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
+-#define gcc_header(x) _gcc_header(x)
+-#include gcc_header(__GNUC__)
++/*
++ * GCC 'asm goto' miscompiles certain code sequences:
++ *
++ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
++ *
++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
++ *
++ * (asm goto is automatically volatile - the naming reflects this.)
++ */
++#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
++
++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
++#if GCC_VERSION >= 40400
++#define __HAVE_BUILTIN_BSWAP32__
++#define __HAVE_BUILTIN_BSWAP64__
++#endif
++#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
++#define __HAVE_BUILTIN_BSWAP16__
++#endif
++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
++
++#if GCC_VERSION >= 50000
++#define KASAN_ABI_VERSION 4
++#elif GCC_VERSION >= 40902
++#define KASAN_ABI_VERSION 3
++#endif
++
++#if GCC_VERSION >= 40902
++/*
++ * Tell the compiler that address safety instrumentation (KASAN)
++ * should not be applied to that function.
++ * Conflicts with inlining: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
++ */
++#define __no_sanitize_address __attribute__((no_sanitize_address))
++#endif
++
++#endif	/* gcc version >= 40000 specific checks */
+ 
+ #if !defined(__noclone)
+ #define __noclone	/* not needed */
+ #endif
+ 
++#if !defined(__no_sanitize_address)
++#define __no_sanitize_address
++#endif
++
+ /*
+  * A trick to suppress uninitialized variable warning without generating any
+  * code
+  */
+ #define uninitialized_var(x) x = x
+-
+-#ifndef __always_inline
+-#define __always_inline		inline __attribute__((always_inline))
+-#endif
+diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h
+deleted file mode 100644
+index 7d89febe4d..0000000000
+--- a/include/linux/compiler-gcc3.h
++++ /dev/null
+@@ -1,23 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-#if GCC_VERSION < 30200
+-# error Sorry, your compiler is too old - please upgrade it.
+-#endif
+-
+-#if GCC_VERSION >= 30300
+-# define __used			__attribute__((__used__))
+-#else
+-# define __used			__attribute__((__unused__))
+-#endif
+-
+-#if GCC_VERSION >= 30400
+-#define __must_check		__attribute__((warn_unused_result))
+-#endif
+-
+-#ifdef CONFIG_GCOV_KERNEL
+-# if GCC_VERSION < 30400
+-#   error "GCOV profiling support for gcc versions below 3.4 not included"
+-# endif /* __GNUC_MINOR__ */
+-#endif /* CONFIG_GCOV_KERNEL */
+diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
+deleted file mode 100644
+index 2507fd2a1e..0000000000
+--- a/include/linux/compiler-gcc4.h
++++ /dev/null
+@@ -1,88 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc4.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-/* GCC 4.1.[01] miscompiles __weak */
+-#ifdef __KERNEL__
+-# if GCC_VERSION >= 40100 &&  GCC_VERSION <= 40101
+-#  error Your version of gcc miscompiles the __weak directive
+-# endif
+-#endif
+-
+-#define __used			__attribute__((__used__))
+-#define __must_check 		__attribute__((warn_unused_result))
+-#define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
+-
+-#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
+-# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
+-#endif
+-
+-#if GCC_VERSION >= 40300
+-/* Mark functions as cold. gcc will assume any path leading to a call
+-   to them will be unlikely.  This means a lot of manual unlikely()s
+-   are unnecessary now for any paths leading to the usual suspects
+-   like BUG(), printk(), panic() etc. [but let's keep them for now for
+-   older compilers]
+-
+-   Early snapshots of gcc 4.3 don't support this and we can't detect this
+-   in the preprocessor, but we can live with this because they're unreleased.
+-   Maketime probing would be overkill here.
+-
+-   gcc also has a __attribute__((__hot__)) to move hot functions into
+-   a special section, but I don't see any sense in this right now in
+-   the kernel context */
+-#define __cold			__attribute__((__cold__))
+-
+-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+-
+-#ifndef __CHECKER__
+-# define __compiletime_warning(message) __attribute__((warning(message)))
+-# define __compiletime_error(message) __attribute__((error(message)))
+-#endif /* __CHECKER__ */
+-#endif /* GCC_VERSION >= 40300 */
+-
+-#if GCC_VERSION >= 40500
+-/*
+- * Mark a position in code as unreachable.  This can be used to
+- * suppress control flow warnings after asm blocks that transfer
+- * control elsewhere.
+- *
+- * Early snapshots of gcc 4.5 don't support this and we can't detect
+- * this in the preprocessor, but we can live with this because they're
+- * unreleased.  Really, we need to have autoconf for the kernel.
+- */
+-#define unreachable() __builtin_unreachable()
+-
+-/* Mark a function definition as prohibited from being cloned. */
+-#define __noclone	__attribute__((__noclone__))
+-
+-#endif /* GCC_VERSION >= 40500 */
+-
+-#if GCC_VERSION >= 40600
+-/*
+- * Tell the optimizer that something else uses this function or variable.
+- */
+-#define __visible __attribute__((externally_visible))
+-#endif
+-
+-/*
+- * GCC 'asm goto' miscompiles certain code sequences:
+- *
+- *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+- *
+- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+- * Fixed in GCC 4.8.2 and later versions.
+- *
+- * (asm goto is automatically volatile - the naming reflects this.)
+- */
+-#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+-
+-#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+-#if GCC_VERSION >= 40400
+-#define __HAVE_BUILTIN_BSWAP32__
+-#define __HAVE_BUILTIN_BSWAP64__
+-#endif
+-#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
+-#define __HAVE_BUILTIN_BSWAP16__
+-#endif
+-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
+deleted file mode 100644
+index c8c5659525..0000000000
+--- a/include/linux/compiler-gcc5.h
++++ /dev/null
+@@ -1,65 +0,0 @@
+-#ifndef __LINUX_COMPILER_H
+-#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
+-#endif
+-
+-#define __used				__attribute__((__used__))
+-#define __must_check			__attribute__((warn_unused_result))
+-#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
+-
+-/* Mark functions as cold. gcc will assume any path leading to a call
+-   to them will be unlikely.  This means a lot of manual unlikely()s
+-   are unnecessary now for any paths leading to the usual suspects
+-   like BUG(), printk(), panic() etc. [but let's keep them for now for
+-   older compilers]
+-
+-   Early snapshots of gcc 4.3 don't support this and we can't detect this
+-   in the preprocessor, but we can live with this because they're unreleased.
+-   Maketime probing would be overkill here.
+-
+-   gcc also has a __attribute__((__hot__)) to move hot functions into
+-   a special section, but I don't see any sense in this right now in
+-   the kernel context */
+-#define __cold			__attribute__((__cold__))
+-
+-#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
+-
+-#ifndef __CHECKER__
+-# define __compiletime_warning(message) __attribute__((warning(message)))
+-# define __compiletime_error(message) __attribute__((error(message)))
+-#endif /* __CHECKER__ */
+-
+-/*
+- * Mark a position in code as unreachable.  This can be used to
+- * suppress control flow warnings after asm blocks that transfer
+- * control elsewhere.
+- *
+- * Early snapshots of gcc 4.5 don't support this and we can't detect
+- * this in the preprocessor, but we can live with this because they're
+- * unreleased.  Really, we need to have autoconf for the kernel.
+- */
+-#define unreachable() __builtin_unreachable()
+-
+-/* Mark a function definition as prohibited from being cloned. */
+-#define __noclone	__attribute__((__noclone__))
+-
+-/*
+- * Tell the optimizer that something else uses this function or variable.
+- */
+-#define __visible __attribute__((externally_visible))
+-
+-/*
+- * GCC 'asm goto' miscompiles certain code sequences:
+- *
+- *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
+- *
+- * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
+- *
+- * (asm goto is automatically volatile - the naming reflects this.)
+- */
+-#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
+-
+-#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
+-#define __HAVE_BUILTIN_BSWAP32__
+-#define __HAVE_BUILTIN_BSWAP64__
+-#define __HAVE_BUILTIN_BSWAP16__
+-#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
+diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
+index ba147a1727..d4c71132d0 100644
+--- a/include/linux/compiler-intel.h
++++ b/include/linux/compiler-intel.h
+@@ -13,9 +13,14 @@
+ /* Intel ECC compiler doesn't support gcc specific asm stmts.
+  * It uses intrinsics to do the equivalent things.
+  */
++#undef barrier
++#undef barrier_data
+ #undef RELOC_HIDE
+ #undef OPTIMIZER_HIDE_VAR
+ 
++#define barrier() __memory_barrier()
++#define barrier_data(ptr) barrier()
++
+ #define RELOC_HIDE(ptr, off)					\
+   ({ unsigned long __ptr;					\
+      __ptr = (unsigned long) (ptr);				\
+diff --git a/include/linux/compiler.h b/include/linux/compiler.h
+index d5ad7b1118..020ad16a04 100644
+--- a/include/linux/compiler.h
++++ b/include/linux/compiler.h
+@@ -17,6 +17,7 @@
+ # define __release(x)	__context__(x,-1)
+ # define __cond_lock(x,c)	((c) ? ({ __acquire(x); 1; }) : 0)
+ # define __percpu	__attribute__((noderef, address_space(3)))
++# define __pmem		__attribute__((noderef, address_space(5)))
+ #ifdef CONFIG_SPARSE_RCU_POINTER
+ # define __rcu		__attribute__((noderef, address_space(4)))
+ #else
+@@ -42,6 +43,7 @@ extern void __chk_io_ptr(const volatile void __iomem *);
+ # define __cond_lock(x,c) (c)
+ # define __percpu
+ # define __rcu
++# define __pmem
+ #endif
+ 
+ /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
+@@ -54,7 +56,11 @@ extern void __chk_io_ptr(const volatile void __iomem *);
+ #include <linux/compiler-gcc.h>
+ #endif
+ 
++#if defined(CC_USING_HOTPATCH) && !defined(__CHECKER__)
++#define notrace __attribute__((hotpatch(0,0)))
++#else
+ #define notrace __attribute__((no_instrument_function))
++#endif
+ 
+ /* Intel compiler defines __GNUC__. So we will overwrite implementations
+  * coming from above header files here
+@@ -138,7 +144,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+  */
+ #define if(cond, ...) __trace_if( (cond , ## __VA_ARGS__) )
+ #define __trace_if(cond) \
+-	if (__builtin_constant_p((cond)) ? !!(cond) :			\
++	if (__builtin_constant_p(!!(cond)) ? !!(cond) :			\
+ 	({								\
+ 		int ______r;						\
+ 		static struct ftrace_branch_data			\
+@@ -165,6 +171,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ # define barrier() __memory_barrier()
+ #endif
+ 
++#ifndef barrier_data
++# define barrier_data(ptr) barrier()
++#endif
++
+ /* Unreachable code */
+ #ifndef unreachable
+ # define unreachable() do { } while (1)
+@@ -186,6 +196,126 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ # define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __LINE__)
+ #endif
+ 
++#include <linux/types.h>
++
++#define __READ_ONCE_SIZE						\
++({									\
++	switch (size) {							\
++	case 1: *(__u8 *)res = *(volatile __u8 *)p; break;		\
++	case 2: *(__u16 *)res = *(volatile __u16 *)p; break;		\
++	case 4: *(__u32 *)res = *(volatile __u32 *)p; break;		\
++	case 8: *(__u64 *)res = *(volatile __u64 *)p; break;		\
++	default:							\
++		barrier();						\
++		__builtin_memcpy((void *)res, (const void *)p, size);	\
++		barrier();						\
++	}								\
++})
++
++static __always_inline
++void __read_once_size(const volatile void *p, void *res, int size)
++{
++	__READ_ONCE_SIZE;
++}
++
++#ifdef CONFIG_KASAN
++/*
++ * This function is not 'inline' because __no_sanitize_address confilcts
++ * with inlining. Attempt to inline it may cause a build failure.
++ * 	https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
++ * '__maybe_unused' allows us to avoid defined-but-not-used warnings.
++ */
++static __no_sanitize_address __maybe_unused
++void __read_once_size_nocheck(const volatile void *p, void *res, int size)
++{
++	__READ_ONCE_SIZE;
++}
++#else
++static __always_inline
++void __read_once_size_nocheck(const volatile void *p, void *res, int size)
++{
++	__READ_ONCE_SIZE;
++}
++#endif
++
++static __always_inline void __write_once_size(volatile void *p, void *res, int size)
++{
++	switch (size) {
++	case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
++	case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
++	case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
++	case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
++	default:
++		barrier();
++		__builtin_memcpy((void *)p, (const void *)res, size);
++		barrier();
++	}
++}
++
++/*
++ * Prevent the compiler from merging or refetching reads or writes. The
++ * compiler is also forbidden from reordering successive instances of
++ * READ_ONCE, WRITE_ONCE and ACCESS_ONCE (see below), but only when the
++ * compiler is aware of some particular ordering.  One way to make the
++ * compiler aware of ordering is to put the two invocations of READ_ONCE,
++ * WRITE_ONCE or ACCESS_ONCE() in different C statements.
++ *
++ * In contrast to ACCESS_ONCE these two macros will also work on aggregate
++ * data types like structs or unions. If the size of the accessed data
++ * type exceeds the word size of the machine (e.g., 32 bits or 64 bits)
++ * READ_ONCE() and WRITE_ONCE()  will fall back to memcpy and print a
++ * compile-time warning.
++ *
++ * Their two major use cases are: (1) Mediating communication between
++ * process-level code and irq/NMI handlers, all running on the same CPU,
++ * and (2) Ensuring that the compiler does not  fold, spindle, or otherwise
++ * mutilate accesses that either do not require ordering or that interact
++ * with an explicit memory barrier or atomic instruction that provides the
++ * required ordering.
++ */
++
++#define __READ_ONCE(x, check)						\
++({									\
++	union { typeof(x) __val; char __c[1]; } __u;			\
++	if (check)							\
++		__read_once_size(&(x), __u.__c, sizeof(x));		\
++	else								\
++		__read_once_size_nocheck(&(x), __u.__c, sizeof(x));	\
++	__u.__val;							\
++})
++#define READ_ONCE(x) __READ_ONCE(x, 1)
++
++/*
++ * Use READ_ONCE_NOCHECK() instead of READ_ONCE() if you need
++ * to hide memory access from KASAN.
++ */
++#define READ_ONCE_NOCHECK(x) __READ_ONCE(x, 0)
++
++#define WRITE_ONCE(x, val) \
++({							\
++	union { typeof(x) __val; char __c[1]; } __u =	\
++		{ .__val = (__force typeof(x)) (val) }; \
++	__write_once_size(&(x), __u.__c, sizeof(x));	\
++	__u.__val;					\
++})
++
++/**
++ * smp_cond_acquire() - Spin wait for cond with ACQUIRE ordering
++ * @cond: boolean expression to wait for
++ *
++ * Equivalent to using smp_load_acquire() on the condition variable but employs
++ * the control dependency of the wait to reduce the barrier on many platforms.
++ *
++ * The control dependency provides a LOAD->STORE order, the additional RMB
++ * provides LOAD->LOAD order, together they provide LOAD->{LOAD,STORE} order,
++ * aka. ACQUIRE.
++ */
++#define smp_cond_acquire(cond)	do {		\
++	while (!(cond))				\
++		cpu_relax();			\
++	smp_rmb(); /* ctrl + rmb := acquire */	\
++} while (0)
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* __ASSEMBLY__ */
+@@ -304,6 +434,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ #define __visible
+ #endif
+ 
++/*
++ * Assume alignment of return value.
++ */
++#ifndef __assume_aligned
++#define __assume_aligned(a, ...)
++#endif
++
++
+ /* Are two types/vars the same type (ignoring qualifiers)? */
+ #ifndef __same_type
+ # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
+@@ -311,7 +449,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+ 
+ /* Is this type a native word size -- useful for atomic operations */
+ #ifndef __native_word
+-# define __native_word(t) (sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
++# define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
+ #endif
+ 
+ /* Compile time object size, -1 for unknown */
+@@ -373,12 +511,38 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
+  * to make the compiler aware of ordering is to put the two invocations of
+  * ACCESS_ONCE() in different C statements.
+  *
+- * This macro does absolutely -nothing- to prevent the CPU from reordering,
+- * merging, or refetching absolutely anything at any time.  Its main intended
+- * use is to mediate communication between process-level code and irq/NMI
+- * handlers, all running on the same CPU.
++ * ACCESS_ONCE will only work on scalar types. For union types, ACCESS_ONCE
++ * on a union member will work as long as the size of the member matches the
++ * size of the union and the size is smaller than word size.
++ *
++ * The major use cases of ACCESS_ONCE used to be (1) Mediating communication
++ * between process-level code and irq/NMI handlers, all running on the same CPU,
++ * and (2) Ensuring that the compiler does not  fold, spindle, or otherwise
++ * mutilate accesses that either do not require ordering or that interact
++ * with an explicit memory barrier or atomic instruction that provides the
++ * required ordering.
++ *
++ * If possible use READ_ONCE()/WRITE_ONCE() instead.
++ */
++#define __ACCESS_ONCE(x) ({ \
++	 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
++	(volatile typeof(x) *)&(x); })
++#define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
++
++/**
++ * lockless_dereference() - safely load a pointer for later dereference
++ * @p: The pointer to load
++ *
++ * Similar to rcu_dereference(), but for situations where the pointed-to
++ * object's lifetime is managed by something other than RCU.  That
++ * "something other" might be reference counting or simple immortality.
+  */
+-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
++#define lockless_dereference(p) \
++({ \
++	typeof(p) _________p1 = READ_ONCE(p); \
++	smp_read_barrier_depends(); /* Dependency order vs. p above. */ \
++	(_________p1); \
++})
+ 
+ /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
+ #ifdef CONFIG_KPROBES
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/board/sinovoip/m2-plus/boot.cmd b/bsp/buildroot/board/sinovoip/m2-plus/boot.cmd
new file mode 100644
index 00000000..d22464a1
--- /dev/null
+++ b/bsp/buildroot/board/sinovoip/m2-plus/boot.cmd
@@ -0,0 +1,7 @@
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+
+mmc dev 0
+fatload mmc 0 $kernel_addr_r zImage
+fatload mmc 0 $fdt_addr_r sun8i-h3-bananapi-m2-plus.dtb
+
+bootz $kernel_addr_r - $fdt_addr_r
diff --git a/bsp/buildroot/board/sinovoip/m2-plus/genimage.cfg b/bsp/buildroot/board/sinovoip/m2-plus/genimage.cfg
new file mode 100644
index 00000000..cde0669e
--- /dev/null
+++ b/bsp/buildroot/board/sinovoip/m2-plus/genimage.cfg
@@ -0,0 +1,33 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"zImage",
+			"sun8i-h3-bananapi-m2-plus.dtb",
+			"boot.scr"
+		}
+	}
+	size = 64M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition u-boot {
+		in-partition-table = "no"
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8192
+		size = 1040384 # 1MB - 8192
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/solidrun/macchiatobin/genimage.cfg b/bsp/buildroot/board/solidrun/macchiatobin/genimage.cfg
new file mode 100644
index 00000000..fdcda368
--- /dev/null
+++ b/bsp/buildroot/board/solidrun/macchiatobin/genimage.cfg
@@ -0,0 +1,16 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition uboot {
+		in-partition-table = "no"
+		image = "flash-image.bin"
+		offset = 0x200000
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		offset = 0x2200000
+		image = "rootfs.ext4"
+	}
+}
diff --git a/bsp/buildroot/board/solidrun/macchiatobin/linux-extras.config b/bsp/buildroot/board/solidrun/macchiatobin/linux-extras.config
new file mode 100644
index 00000000..11267d2f
--- /dev/null
+++ b/bsp/buildroot/board/solidrun/macchiatobin/linux-extras.config
@@ -0,0 +1,3 @@
+CONFIG_MARVELL_PHY=y
+CONFIG_MARVELL_10G_PHY=y
+CONFIG_PHY_MVEBU_CP110_COMPHY=y
diff --git a/bsp/buildroot/board/solidrun/macchiatobin/post-build.sh b/bsp/buildroot/board/solidrun/macchiatobin/post-build.sh
new file mode 100755
index 00000000..9c1b5b88
--- /dev/null
+++ b/bsp/buildroot/board/solidrun/macchiatobin/post-build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+BOARD_DIR="$(dirname $0)"
+
+install -m 0644 -D ${BOARD_DIR}/uEnv-example.txt ${TARGET_DIR}/boot/uEnv-example.txt
diff --git a/bsp/buildroot/board/solidrun/macchiatobin/readme.txt b/bsp/buildroot/board/solidrun/macchiatobin/readme.txt
new file mode 100644
index 00000000..dfbd6e79
--- /dev/null
+++ b/bsp/buildroot/board/solidrun/macchiatobin/readme.txt
@@ -0,0 +1,91 @@
+Intro
+=====
+
+This default configuration will allow you to start experimenting with
+the buildroot environment for the MacchiatoBin board based on the
+Marvell Armada 8040 SoC. Documentation for the board hardware and
+software is available on the wiki at: http://wiki.macchiatobin.net
+
+This default configuration will bring up the board and allow access
+through the serial console.
+
+How to build
+============
+
+There are two build options: mainline support and vendor support.
+
+For the mainline BSP, we use:
+ - Linux v4.15
+ - U-Boot v2018.01
+
+For the vendor BSP, we use the sources available from Marvell Github
+page at https://github.com/MarvellEmbeddedProcessors, which uses:
+ - Linux v4.4.52
+ - U-Boot v2017.03
+
+At the moment mainline support for the board is a work in progress.
+Mainline kernel 4.15 enables eth2 in 1Gb (RJ45 connector J5) and
+eth0 in 10Gb (SFP connector CON15 and RJ45 connector CON16).
+The vendor BSP enables more hardware features out of the box,
+e.g. all the network interfaces.
+
+To use the mainline BSP run the following commands:
+
+    $ make solidrun_macchiatobin_mainline_defconfig
+    $ make
+
+To use the vendor BSP run the following commands:
+
+    $ make solidrun_macchiatobin_marvell_defconfig
+    $ make
+
+How to write the SD card
+========================
+
+Once the build process is finished you will have an image
+called "sdcard.img" in the output/images/ directory.
+
+Copy the bootable "sdcard.img" onto an SD card with "dd":
+
+  $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync
+  $ sudo sync
+
+How to boot the board
+=====================
+
+The MacchiatoBin board can be setup to load the bootloader from
+different sources including eMMC, SPI flash, and SD-card.
+
+On Rev 1.2 board to select boot from SD-card the DIP switches
+SW1 and SW2 should be configured as follows:
+
+SW2: 01110
+SW1: 1xxxx
+
+The upcoming Rev 1.3 board will have a single pins header J1 instead
+of the SW1/2 DIP switches. To boot from SD-card the setting of J1
+jumpers should match the DIP switches of Rev v1.2 board
+from left to right:
+
+J1: 011101xxxx
+
+Insert the micro SDcard in the MacchiatoBin board and power it up.
+The serial console is accessible at the micro-USB Type-B connector
+marked CON9. The serial line settings are 115200 8N1.
+
+By default U-Boot will load its environment from the SPI flash. On the
+first boot SPI flash may be empty or it may contain a legacy
+environment incompatible with up-to-date mainline U-Boot and
+kernel. Then the following commands can be used to boot the board:
+
+=> ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt
+=> env import -t 0x01700000 $filesize
+=> boot
+
+The example environment from uEnv-example.txt can be written to
+SPI flash using the following commands:
+
+=> env default -f -a
+=> ext4load mmc 1:1 0x01700000 /boot/uEnv-example.txt
+=> env import -t 0x01700000 $filesize
+=> saveenv
diff --git a/bsp/buildroot/board/solidrun/macchiatobin/uEnv-example.txt b/bsp/buildroot/board/solidrun/macchiatobin/uEnv-example.txt
new file mode 100644
index 00000000..1967e2ba
--- /dev/null
+++ b/bsp/buildroot/board/solidrun/macchiatobin/uEnv-example.txt
@@ -0,0 +1,7 @@
+bootargs=console=ttyS0,115200 root=/dev/mmcblk1p1 rw rootwait
+fdt_addr=0x1000000
+fdt_high=0xffffffffffffffff
+fdt_name=boot/armada-8040-mcbin.dtb
+kernel_addr=0x2000000
+image_name=boot/Image
+bootcmd=mmc dev 1; ext4load mmc 1:1 $kernel_addr $image_name; ext4load mmc 1:1 $fdt_addr $fdt_name; booti $kernel_addr - $fdt_addr
diff --git a/bsp/buildroot/board/solidrun/mx6cubox/post-build.sh b/bsp/buildroot/board/solidrun/mx6cubox/post-build.sh
index 07c480e6..43e091c5 100755
--- a/bsp/buildroot/board/solidrun/mx6cubox/post-build.sh
+++ b/bsp/buildroot/board/solidrun/mx6cubox/post-build.sh
@@ -2,7 +2,7 @@
 
 BOARD_DIR="$(dirname $0)"
 
-$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none  \
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
 -n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
 
 install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/flash.sh b/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/flash.sh
index ffb8fcff..b19e0a60 100755
--- a/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/flash.sh
+++ b/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/flash.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 
 OUTPUT_DIR=$1
+BOARD_NAME=${2:-stm32f429discovery}
 
 if ! test -d "${OUTPUT_DIR}" ; then
     echo "ERROR: no output directory specified."
-    echo "Usage: $0 OUTPUT_DIR"
+    echo "Usage: $0 OUTPUT_DIR BOARD_NAME"
+    echo ""
+    echo "Arguments:"
+    echo "    OUTPUT_DIR    The Buildroot output directory."
+    echo "    BOARD_NAME    One of the available boards among:"
+    echo "                  stm32f429discovery, stm32f429disc1"
     exit 1
 fi
 
-${OUTPUT_DIR}/host/usr/bin/openocd -f board/stm32f429discovery.cfg \
+${OUTPUT_DIR}/host/bin/openocd -f board/${BOARD_NAME}.cfg \
   -c "init" \
   -c "reset init" \
   -c "flash probe 0" \
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/readme.txt b/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/readme.txt
index 43a25b42..f512cb2e 100644
--- a/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/readme.txt
+++ b/bsp/buildroot/board/stmicroelectronics/stm32f429-disco/readme.txt
@@ -4,6 +4,12 @@ STM32F429 Discovery
 This tutorial describes how to use the predefined Buildroot
 configuration for the STM32F429 Discovery evaluation platform.
 
+Supported HW
+------------
+
+ - STM32F429I-DISCO evaluation board
+ - STM32F429I-DISC1 evaluation board
+
 Building
 --------
 
@@ -24,7 +30,8 @@ The UART is configured at 115200.
 Flashing
 --------
 
-  ./board/stmicroelectronics/stm32f429-disco/flash.sh output/
+  ./board/stmicroelectronics/stm32f429-disco/flash.sh output/ \
+      {stm32f429discovery|stm32f429disc1}
 
 It will flash the minimal bootloader, the Device Tree Blob, and the
 kernel image which includes the root filesystem as initramfs.
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/flash.sh b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/flash.sh
index a68bea09..0ec0beb2 100755
--- a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/flash.sh
+++ b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/flash.sh
@@ -8,7 +8,7 @@ if ! test -d "${OUTPUT_DIR}" ; then
     exit 1
 fi
 
-${OUTPUT_DIR}/host/usr/bin/openocd -f board/stm32f469discovery.cfg \
+${OUTPUT_DIR}/host/bin/openocd -f board/stm32f469discovery.cfg \
   -c "init" \
   -c "reset init" \
   -c "flash probe 0" \
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-ARM-stm32-Identify-a-new-board-STM32F469.patch b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-ARM-stm32-Identify-a-new-board-STM32F469.patch
deleted file mode 100644
index 01af4154..00000000
--- a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-ARM-stm32-Identify-a-new-board-STM32F469.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3b572676972f9bcf69695fd85a582c6622f7faa8 Mon Sep 17 00:00:00 2001
-From: Lee Jones <lee.jones@linaro.org>
-Date: Tue, 16 Feb 2016 14:04:17 +0000
-Subject: [PATCH] ARM: stm32: Identify a new board - STM32F469
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
----
- arch/arm/mach-stm32/board-dt.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arm/mach-stm32/board-dt.c b/arch/arm/mach-stm32/board-dt.c
-index f2ad772..ceee477 100644
---- a/arch/arm/mach-stm32/board-dt.c
-+++ b/arch/arm/mach-stm32/board-dt.c
-@@ -10,6 +10,7 @@
- 
- static const char *const stm32_compat[] __initconst = {
- 	"st,stm32f429",
-+	"st,stm32f469",
- 	NULL
- };
- 
--- 
-2.6.4
-
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-ARM-stm32f249-disco-don-t-force-init-in-chosen-boota.patch b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-ARM-stm32f249-disco-don-t-force-init-in-chosen-boota.patch
new file mode 100644
index 00000000..750e477d
--- /dev/null
+++ b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0001-ARM-stm32f249-disco-don-t-force-init-in-chosen-boota.patch
@@ -0,0 +1,33 @@
+From c8f8f33c2f0460a34c9545b01a7972a7ed2df0e9 Mon Sep 17 00:00:00 2001
+From: Christophe Priouzeau <christophe.priouzeau@st.com>
+Date: Mon, 29 May 2017 13:38:16 +0200
+Subject: [PATCH] ARM: stm32f249-disco: don't force init= in /chosen/bootargs
+
+There is no reason to override the kernel's default init= value, as
+this breaks userspace that assumes the kernel default of /init is
+used. Since stm32 is often used with a minimal bootloader
+(afboot-stm32) that doesn't provide any mechanism to override the DTB,
+we need to adjust the kernel command line in the Device Tree source.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
+---
+ arch/arm/boot/dts/stm32f469-disco.dts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
+index 0dd56ef..93ee1b2 100644
+--- a/arch/arm/boot/dts/stm32f469-disco.dts
++++ b/arch/arm/boot/dts/stm32f469-disco.dts
+@@ -53,7 +53,7 @@
+ 	compatible = "st,stm32f469i-disco", "st,stm32f469";
+ 
+ 	chosen {
+-		bootargs = "root=/dev/ram rdinit=/linuxrc";
++		bootargs = "root=/dev/ram";
+ 		stdout-path = "serial0:115200n8";
+ 	};
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0002-ARM-stm32-Supply-a-DTS-file-for-the-STM32F469-Discov.patch b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0002-ARM-stm32-Supply-a-DTS-file-for-the-STM32F469-Discov.patch
deleted file mode 100644
index 45f52282..00000000
--- a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0002-ARM-stm32-Supply-a-DTS-file-for-the-STM32F469-Discov.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From a08561ffdfb13986e2628296ccfd42f8a273b729 Mon Sep 17 00:00:00 2001
-From: Lee Jones <lee.jones@linaro.org>
-Date: Tue, 16 Feb 2016 13:53:47 +0000
-Subject: [PATCH] ARM: stm32: Supply a DTS file for the STM32F469 Discovery
- board
-
-It's pretty similar to the STM32F429, but there are some
-subtle changes required to boot successfully.
-
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
-[Thomas: remove rdinit= from /chosen/bootargs.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- arch/arm/boot/dts/stm32f469-disco.dts | 75 +++++++++++++++++++++++++++++++++++
- 1 file changed, 75 insertions(+)
- create mode 100644 arch/arm/boot/dts/stm32f469-disco.dts
-
-diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts
-new file mode 100644
-index 0000000..9e73656
---- /dev/null
-+++ b/arch/arm/boot/dts/stm32f469-disco.dts
-@@ -0,0 +1,75 @@
-+/*
-+ * Copyright 2016 - Lee Jones <lee.jones@linaro.org>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ *     You should have received a copy of the GNU General Public
-+ *     License along with this file; if not, write to the Free
-+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-+ *     MA 02110-1301 USA
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+#include "stm32f429.dtsi"
-+
-+/ {
-+	model = "STMicroelectronics STM32F469i-DISCO board";
-+	compatible = "st,stm32f469i-disco", "st,stm32f469";
-+
-+	chosen {
-+		bootargs = "root=/dev/ram";
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	memory {
-+		reg = <0x00000000 0x800000>;
-+	};
-+
-+	aliases {
-+		serial0 = &usart3;
-+	};
-+};
-+
-+&clk_hse {
-+	clock-frequency = <8000000>;
-+};
-+
-+&usart3 {
-+	status = "okay";
-+};
--- 
-2.6.4
-
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0003-ARM-configs-Add-new-config-fragment-to-change-RAM-st.patch b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0003-ARM-configs-Add-new-config-fragment-to-change-RAM-st.patch
deleted file mode 100644
index e12c9bc7..00000000
--- a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/linux/0003-ARM-configs-Add-new-config-fragment-to-change-RAM-st.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7d67f4be6e1b4d08126023c3902e3fc39488bbf9 Mon Sep 17 00:00:00 2001
-From: Lee Jones <lee.jones@linaro.org>
-Date: Tue, 16 Feb 2016 13:56:13 +0000
-Subject: [PATCH] ARM: configs: Add new config fragment to change RAM start
- point
-
-Rather than duplicate a defconfig for each difference
-between platforms, we can choose to pick a basic defconfig and
-manipulate it at run-time using config fragments.  Here we're
-adding a new fragment to over-ride the RAM start point to 0x0.
-
-Cc: Arnd Bergmann <arnd@arndb.de>
-Signed-off-by: Lee Jones <lee.jones@linaro.org>
----
- arch/arm/configs/dram_0x00000000.config | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 arch/arm/configs/dram_0x00000000.config
-
-diff --git a/arch/arm/configs/dram_0x00000000.config b/arch/arm/configs/dram_0x00000000.config
-new file mode 100644
-index 0000000..db96dcb
---- /dev/null
-+++ b/arch/arm/configs/dram_0x00000000.config
-@@ -0,0 +1 @@
-+CONFIG_DRAM_BASE=0x00000000
--- 
-2.6.4
-
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/openocd/0001-add-config.patch b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/openocd/0001-add-config.patch
deleted file mode 100644
index 036c4f62..00000000
--- a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/openocd/0001-add-config.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 26045588f462476cee356d15a24944d6c26befb4 Mon Sep 17 00:00:00 2001
-From: Maxime Coquelin <mcoquelin.stm32@gmail.com>
-Date: Sat, 24 Oct 2015 00:13:38 +0200
-Subject: [PATCH] tcl: add STM32F469 discovery board config
-
-Change-Id: Iad7ee06330b3259ea0ce0d174dfdade6785913eb
-Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
-Reviewed-on: http://openocd.zylin.com/3043
-Tested-by: jenkins
-Reviewed-by: Antonio Borneo <borneo.antonio@gmail.com>
-Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
----
- tcl/board/stm32f469discovery.cfg | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
- create mode 100644 tcl/board/stm32f469discovery.cfg
-
-diff --git a/tcl/board/stm32f469discovery.cfg b/tcl/board/stm32f469discovery.cfg
-new file mode 100644
-index 0000000..eecfe33
---- /dev/null
-+++ b/tcl/board/stm32f469discovery.cfg
-@@ -0,0 +1,12 @@
-+#
-+# This is an STM32F469 discovery board with a single STM32F469NI chip.
-+# http://www.st.com/web/catalog/tools/FM116/CL1620/SC959/SS1532/LN1848/PF262395
-+#
-+
-+source [find interface/stlink-v2-1.cfg]
-+
-+transport select hla_swd
-+
-+source [find target/stm32f4x.cfg]
-+
-+reset_config srst_only
--- 
-1.9.1
-
diff --git a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch b/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch
deleted file mode 100644
index bfec9832..00000000
--- a/bsp/buildroot/board/stmicroelectronics/stm32f469-disco/patches/openocd/0002-flash-nor.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3e219648c80a27f0519003f3b088cbb846e255d8 Mon Sep 17 00:00:00 2001
-From: Maxime Coquelin <maxime.coquelin@st.com>
-Date: Sat, 24 Oct 2015 00:03:54 +0200
-Subject: [PATCH] flash/nor/stm32f2x: Add STM32F469 part
-
-Change-Id: I4e13ceb0ba954dc2fea059ddeef10109be938c9c
-Signed-off-by: Maxime Coquelin <mcoquelin.stm32@gmail.com>
-Reviewed-on: http://openocd.zylin.com/3042
-Tested-by: jenkins
-Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
----
- src/flash/nor/stm32f2x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
-index 2130444..89fc75d 100644
---- a/src/flash/nor/stm32f2x.c
-+++ b/src/flash/nor/stm32f2x.c
-@@ -790,6 +790,7 @@ static int stm32x_probe(struct flash_bank *bank)
- 		max_flash_size_in_kb = 1024;
- 		break;
- 	case 0x419:
-+	case 0x434:
- 		max_flash_size_in_kb = 2048;
- 		break;
- 	case 0x423:
-@@ -952,6 +953,7 @@ static int get_stm32x_info(struct flash_bank *bank, char *buf, int buf_size)
- 
- 	case 0x413:
- 	case 0x419:
-+	case 0x434:
- 		device_str = "STM32F4xx";
- 
- 		switch (rev_id) {
--- 
-1.9.1
-
diff --git a/bsp/buildroot/board/synopsys/axs10x/fs-overlay/etc/inittab b/bsp/buildroot/board/synopsys/axs10x/fs-overlay/etc/inittab
index 43bacc65..7412a273 100644
--- a/bsp/buildroot/board/synopsys/axs10x/fs-overlay/etc/inittab
+++ b/bsp/buildroot/board/synopsys/axs10x/fs-overlay/etc/inittab
@@ -14,12 +14,16 @@
 # process   == program to run
 
 # Startup the system
-null::sysinit:/bin/mount -t proc proc /proc
-null::sysinit:/bin/mount -o remount,rw /
-null::sysinit:/bin/mkdir -p /dev/pts
-null::sysinit:/bin/mkdir -p /dev/shm
-null::sysinit:/bin/mount -a
-null::sysinit:/bin/hostname -F /etc/hostname
+::sysinit:/bin/mount -t proc proc /proc
+::sysinit:/bin/mount -o remount,rw /
+::sysinit:/bin/mkdir -p /dev/pts /dev/shm
+::sysinit:/bin/mount -a
+::sysinit:/sbin/swapon -a
+null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd
+null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin
+null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout
+null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
+::sysinit:/bin/hostname -F /etc/hostname
 # now run any rc scripts
 ::sysinit:/etc/init.d/rcS
 
diff --git a/bsp/buildroot/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch b/bsp/buildroot/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch
new file mode 100644
index 00000000..7af878d8
--- /dev/null
+++ b/bsp/buildroot/board/synopsys/axs10x/patches/u-boot/0001-axs103-Clean-up-smp_kick_all_cpus.patch
@@ -0,0 +1,48 @@
+From ee5a5a51780bcb17e5240335ddfa9c98a0e6f890 Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Thu, 30 Mar 2017 19:18:30 +0300
+Subject: [PATCH] axs103: Clean-up smp_kick_all_cpus()
+
+ * Rely on default pulse polarity value
+ * Don't mess with "multicore" value as it doesn't affect execution
+
+In essence we now do a bare minimal stuff:
+ 1) Select HS38x2_1 with CORE_SEL=1 bits
+ 2) Select "manual" core start (via CREG) with START_MODE=0
+ 3) Generate cpu_start pulse with START=1
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
+---
+ board/synopsys/axs10x/axs10x.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
+index a5e774b2cf7b..57c790220f71 100644
+--- a/board/synopsys/axs10x/axs10x.c
++++ b/board/synopsys/axs10x/axs10x.c
+@@ -61,16 +61,14 @@ void smp_kick_all_cpus(void)
+ {
+ /* CPU start CREG */
+ #define AXC003_CREG_CPU_START	0xF0001400
+-
+ /* Bits positions in CPU start CREG */
+ #define BITS_START	0
+-#define BITS_POLARITY	8
++#define BITS_START_MODE	4
+ #define BITS_CORE_SEL	9
+-#define BITS_MULTICORE	12
+-
+-#define CMD	(1 << BITS_MULTICORE) | (1 << BITS_CORE_SEL) | \
+-		(1 << BITS_POLARITY) | (1 << BITS_START)
+ 
+-	writel(CMD, (void __iomem *)AXC003_CREG_CPU_START);
++	int cmd = readl((void __iomem *)AXC003_CREG_CPU_START);
++	cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START);
++	cmd &= ~(1 << BITS_START_MODE);
++	writel(cmd, (void __iomem *)AXC003_CREG_CPU_START);
+ }
+ #endif
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch b/bsp/buildroot/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch
new file mode 100644
index 00000000..0fcc0e63
--- /dev/null
+++ b/bsp/buildroot/board/synopsys/axs10x/patches/u-boot/0002-axs103-Support-slave-core-kick-start-on-axs103-v1.1-.patch
@@ -0,0 +1,72 @@
+From a5fa3b17cb10ce020f8b7fe6a26c45d75f55b481 Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Fri, 31 Mar 2017 11:14:35 +0300
+Subject: [PATCH] axs103: Support slave core kick-start on axs103 v1.1
+ firmware
+
+In axs103 v1.1 procedure to kick-start slave cores has changed quite a bit
+compared to previous implementation.
+
+In particular:
+ * We used to have a generic START bit for all cores selected by CORE_SEL
+   mask. But now we don't touch CORE_SEL at all because we have a dedicated
+   START bit for each core:
+     bit 0: Core 0 (master)
+     bit 1: Core 1 (slave)
+ * Now there's no need to select "manual" mode of core start
+
+Additional challenge for us is how to tell which axs103 firmware we're
+dealing with. For now we'll rely on ARC core version which was bumped
+from 2.1c to 3.0.
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
+---
+ board/synopsys/axs10x/axs10x.c | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/board/synopsys/axs10x/axs10x.c b/board/synopsys/axs10x/axs10x.c
+index 57c790220f71..e6b69da3da7f 100644
+--- a/board/synopsys/axs10x/axs10x.c
++++ b/board/synopsys/axs10x/axs10x.c
+@@ -7,6 +7,7 @@
+ #include <common.h>
+ #include <dwmmc.h>
+ #include <malloc.h>
++#include <asm/arcregs.h>
+ #include "axs10x.h"
+ 
+ DECLARE_GLOBAL_DATA_PTR;
+@@ -66,9 +67,27 @@ void smp_kick_all_cpus(void)
+ #define BITS_START_MODE	4
+ #define BITS_CORE_SEL	9
+ 
++/*
++ * In axs103 v1.1 START bits semantics has changed quite a bit.
++ * We used to have a generic START bit for all cores selected by CORE_SEL mask.
++ * But now we don't touch CORE_SEL at all because we have a dedicated START bit
++ * for each core:
++ *     bit 0: Core 0 (master)
++ *     bit 1: Core 1 (slave)
++ */
++#define BITS_START_CORE1	1
++
++#define ARCVER_HS38_3_0	0x53
++
++	int core_family = read_aux_reg(ARC_AUX_IDENTITY) & 0xff;
+ 	int cmd = readl((void __iomem *)AXC003_CREG_CPU_START);
+-	cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START);
+-	cmd &= ~(1 << BITS_START_MODE);
++
++	if (core_family < ARCVER_HS38_3_0) {
++		cmd |= (1 << BITS_CORE_SEL) | (1 << BITS_START);
++		cmd &= ~(1 << BITS_START_MODE);
++	} else {
++		cmd |= (1 << BITS_START_CORE1);
++	}
+ 	writel(cmd, (void __iomem *)AXC003_CREG_CPU_START);
+ }
+ #endif
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch b/bsp/buildroot/board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch
deleted file mode 100644
index 7ff78149..00000000
--- a/bsp/buildroot/board/synopsys/vdk/patches/linux/0001-arc-vdk-Disable-halt-on-reset.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1e248a880ee46921f85213da32b18f6becf07078 Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Date: Tue, 31 Jan 2017 19:00:29 +0300
-Subject: [PATCH 1/3] arc: vdk: Disable halt on reset
-
-In recent VDKs ARC cores are configured as "run on reset"
-which made existing kernel configuration outdated to effect that
-slave cores never start execution of the code keeping only master
-online.
-
-With that fix we're again in sync with VDK platform.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- arch/arc/configs/vdk_hs38_smp_defconfig | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
-index 969b206d6c67..00036e814dc1 100644
---- a/arch/arc/configs/vdk_hs38_smp_defconfig
-+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
-@@ -15,6 +15,7 @@ CONFIG_ARC_PLAT_AXS10X=y
- CONFIG_AXS103=y
- CONFIG_ISA_ARCV2=y
- CONFIG_SMP=y
-+# CONFIG_ARC_SMP_HALT_ON_RESET is not set
- # CONFIG_ARC_HAS_GFRC is not set
- CONFIG_ARC_UBOOT_SUPPORT=y
- CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp"
--- 
-2.7.4
-
diff --git a/bsp/buildroot/board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch b/bsp/buildroot/board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch
deleted file mode 100644
index bd5dedb1..00000000
--- a/bsp/buildroot/board/synopsys/vdk/patches/linux/0002-arc-vdk-Add-support-of-MMC-controller.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c9d5ba0157fcfe48c0ec3448bdaecbabb8cefbca Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Date: Tue, 31 Jan 2017 19:02:44 +0300
-Subject: [PATCH 2/3] arc: vdk: Add support of MMC controller
-
-ARC VDK virtual platform emulates host MMC controller (DW Mobile Storage)
-and moreover rootfs is situated on that virtual card.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- arch/arc/boot/dts/vdk_axs10x_mb.dtsi    | 18 ++++++++++++++++++
- arch/arc/configs/vdk_hs38_smp_defconfig |  5 ++++-
- 2 files changed, 22 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-index 99498a4b4216..1953914b9f4f 100644
---- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-@@ -23,6 +23,12 @@
- 				#clock-cells = <0>;
- 			};
- 
-+			mmcclk: mmcclk {
-+				compatible = "fixed-clock";
-+				clock-frequency = <50000000>;
-+				#clock-cells = <0>;
-+			};
-+
- 			pguclk: pguclk {
- 				#clock-cells = <0>;
- 				compatible = "fixed-clock";
-@@ -94,5 +100,17 @@
- 			interrupts = <5>;
- 			interrupt-names = "arc_ps2_irq";
- 		};
-+
-+		mmc@0x15000 {
-+			compatible = "snps,dw-mshc";
-+			reg = <0x15000 0x400>;
-+			num-slots = <1>;
-+			fifo-depth = <1024>;
-+			card-detect-delay = <200>;
-+			clocks = <&apbclk>, <&mmcclk>;
-+			clock-names = "biu", "ciu";
-+			interrupts = <7>;
-+			bus-width = <4>;
-+		};
- 	};
- };
-diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
-index 00036e814dc1..85c697a7ef1c 100644
---- a/arch/arc/configs/vdk_hs38_smp_defconfig
-+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
-@@ -79,9 +79,12 @@ CONFIG_USB_OHCI_HCD=y
- CONFIG_USB_OHCI_HCD_PLATFORM=y
- CONFIG_USB_STORAGE=y
- CONFIG_USB_SERIAL=y
-+CONFIG_MMC=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PLTFM=y
-+CONFIG_MMC_DW=y
- # CONFIG_IOMMU_SUPPORT is not set
- CONFIG_EXT3_FS=y
--CONFIG_EXT4_FS=y
- CONFIG_MSDOS_FS=y
- CONFIG_VFAT_FS=y
- CONFIG_NTFS_FS=y
--- 
-2.7.4
-
diff --git a/bsp/buildroot/board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch b/bsp/buildroot/board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch
deleted file mode 100644
index 2b084a93..00000000
--- a/bsp/buildroot/board/synopsys/vdk/patches/linux/0003-arc-vdk-Add-support-of-UIO.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From caa0dca3f4913712d1883e9b3b540f0815864ed9 Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Date: Tue, 31 Jan 2017 19:03:56 +0300
-Subject: [PATCH 3/3] arc: vdk: Add support of UIO
-
-ARC VDK for EVSS uses UIO for communication with Embedded Vision
-Subsystem.
-
-Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
----
- arch/arc/boot/dts/vdk_axs10x_mb.dtsi    | 8 ++++++++
- arch/arc/configs/vdk_hs38_smp_defconfig | 2 ++
- 2 files changed, 10 insertions(+)
-
-diff --git a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-index 1953914b9f4f..f0df59b23e21 100644
---- a/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-+++ b/arch/arc/boot/dts/vdk_axs10x_mb.dtsi
-@@ -112,5 +112,13 @@
- 			interrupts = <7>;
- 			bus-width = <4>;
- 		};
-+
-+		/* Embedded Vision subsystem UIO mappings; only relevant for EV VDK */
-+		uio_ev: uio@0xD0000000 {
-+			compatible = "generic-uio";
-+			reg = <0xD0000000 0x2000 0xD1000000 0x2000 0x90000000 0x10000000 0xC0000000 0x10000000>;
-+			reg-names = "ev_gsa", "ev_ctrl", "ev_shared_mem", "ev_code_mem";
-+			interrupts = <23>;
-+		};
- 	};
- };
-diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig
-index 85c697a7ef1c..ecd7f42d50c9 100644
---- a/arch/arc/configs/vdk_hs38_smp_defconfig
-+++ b/arch/arc/configs/vdk_hs38_smp_defconfig
-@@ -83,6 +83,8 @@ CONFIG_MMC=y
- CONFIG_MMC_SDHCI=y
- CONFIG_MMC_SDHCI_PLTFM=y
- CONFIG_MMC_DW=y
-+CONFIG_UIO=y
-+CONFIG_UIO_PDRV_GENIRQ=y
- # CONFIG_IOMMU_SUPPORT is not set
- CONFIG_EXT3_FS=y
- CONFIG_MSDOS_FS=y
--- 
-2.7.4
-
diff --git a/bsp/buildroot/board/technexion/imx7dpico/readme.txt b/bsp/buildroot/board/technexion/imx7dpico/readme.txt
new file mode 100644
index 00000000..cda3f285
--- /dev/null
+++ b/bsp/buildroot/board/technexion/imx7dpico/readme.txt
@@ -0,0 +1,59 @@
+****************************
+Technexion i.MX7D Pico board
+****************************
+
+This file documents the Buildroot support for the Technexion i.MX7D Pico board.
+
+Build
+=====
+
+First, configure Buildroot for the i.MX7D Pico board:
+
+  make imx7dpico_defconfig
+
+Build all components:
+
+  make
+
+You will find in output/images/ the following files:
+  - imx7d-pico.dtb
+  - rootfs.ext4
+  - rootfs.tar
+  - sdcard.img
+  - u-boot.imx
+  - zImage
+
+Flash the eMMC
+==============
+
+In the U-Boot prompt lauch:
+
+=> ums 0 mmc 0
+
+This will mount the eMMC content in the host PC as a mass storage device.
+
+To determine the device associated to the eMMC card have a look in the
+/proc/partitions file:
+
+  cat /proc/partitions
+
+Buildroot prepares a bootable "sdcard.img" image in the output/images/
+directory, ready to be dumped on the eMMC card. Launch the following
+command as root:
+
+  dd if=output/images/sdcard.img of=/dev/<your-sd-device>
+
+*** WARNING! This will destroy all the eMMC content. Use with care! ***
+
+For details about the medium image layout, see the definition in
+board/freescale/common/imx/genimage.cfg.template.
+
+Boot the i.MX7D Pico board
+==========================
+
+To boot your newly created system:
+- put a micro USB cable into the Debug USB Port and connect using a terminal
+  emulator at 115200 bps, 8n1;
+- power on the board.
+
+Enjoy!
diff --git a/bsp/buildroot/board/technologic/ts4800/post-image.sh b/bsp/buildroot/board/technologic/ts4800/post-image.sh
index 167dea81..cc8e5da3 100755
--- a/bsp/buildroot/board/technologic/ts4800/post-image.sh
+++ b/bsp/buildroot/board/technologic/ts4800/post-image.sh
@@ -9,7 +9,7 @@ GENIMAGE_TMP=${BUILD_DIR}/.genimage_tmp
 
 rm -rf ${GENIMAGE_TMP}
 
-${HOST_DIR}/usr/bin/genimage \
+${HOST_DIR}/bin/genimage \
         --config ${GENIMAGE_CFG} \
         --rootpath ${TARGET_DIR} \
         --tmppath ${GENIMAGE_TMP} \
diff --git a/bsp/buildroot/board/technologic/ts4900/post-image.sh b/bsp/buildroot/board/technologic/ts4900/post-image.sh
index 1e90cded..cb966d88 100755
--- a/bsp/buildroot/board/technologic/ts4900/post-image.sh
+++ b/bsp/buildroot/board/technologic/ts4900/post-image.sh
@@ -9,7 +9,7 @@ GENIMAGE_TMP=$BUILD_DIR/.genimage_tmp
 
 rm -rf $GENIMAGE_TMP
 
-${HOST_DIR}/usr/bin/genimage \
+${HOST_DIR}/bin/genimage \
         --config ${GENIMAGE_CFG} \
         --rootpath $TARGET_DIR \
         --tmppath $GENIMAGE_TMP \
diff --git a/bsp/buildroot/board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg b/bsp/buildroot/board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg
similarity index 100%
rename from bsp/buildroot/board/technologic/ts5x00/fs-overlay/boot/syslinux/syslinux.cfg
rename to bsp/buildroot/board/technologic/ts5500/fs-overlay/boot/syslinux/syslinux.cfg
diff --git a/bsp/buildroot/board/technologic/ts5500/linux-4.14.config b/bsp/buildroot/board/technologic/ts5500/linux-4.14.config
new file mode 100644
index 00000000..eb81596e
--- /dev/null
+++ b/bsp/buildroot/board/technologic/ts5500/linux-4.14.config
@@ -0,0 +1,111 @@
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+CONFIG_MELAN=y
+CONFIG_X86_GENERIC=y
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_NOHIGHMEM=y
+# CONFIG_COMPACTION is not set
+# CONFIG_BOUNCE is not set
+# CONFIG_RELOCATABLE is not set
+# CONFIG_SUSPEND is not set
+# CONFIG_ACPI is not set
+CONFIG_CPU_IDLE=y
+CONFIG_TS5500=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_DIAG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_BLK_DEV is not set
+CONFIG_BLK_DEV_SD=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+# CONFIG_ATA_VERBOSE_ERROR is not set
+# CONFIG_SATA_PMP is not set
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=y
+CONFIG_NETDEVICES=y
+# CONFIG_NET_CORE is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+CONFIG_NET_TULIP=y
+CONFIG_DM9102=y
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_PHYLIB=y
+CONFIG_DAVICOM_PHY=y
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_TS5500=y
+CONFIG_SENSORS_MAX197=y
+CONFIG_WATCHDOG=y
+CONFIG_SC520_WDT=y
+CONFIG_USB=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_FTDI_SIO=y
+CONFIG_USB_SERIAL_PL2303=y
+# CONFIG_X86_PLATFORM_DEVICES is not set
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_DMIID is not set
+CONFIG_EXT4_FS=y
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+# CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_UTF8=y
+# CONFIG_VIRTUALIZATION is not set
+CONFIG_XZ_DEC=y
diff --git a/bsp/buildroot/board/technologic/ts5500/readme.txt b/bsp/buildroot/board/technologic/ts5500/readme.txt
new file mode 100644
index 00000000..1e73ab3e
--- /dev/null
+++ b/bsp/buildroot/board/technologic/ts5500/readme.txt
@@ -0,0 +1,52 @@
+Technologic Systems TS-5x00 SBCs
+================================
+
+This document explains how to set up a basic Buildroot system for the
+Technologic Systems TS-5x00 serie of x86-based Single Board Computers.
+
+TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more
+information please have a look at http://wiki.embeddedarm.com/wiki/#AMD
+
+The kernel configuration works for any AMD Elan520-based SBCs, but the support
+is enhanced for the TS-5500 and TS-5400 models (on-board devices registration
+and additional sysfs attributes under /sys/devices/platform/).
+
+To build the default configuration you only have to:
+
+    $ make ts5500_defconfig
+    $ make
+
+You will need a Compact Flash card of sufficient size and the first or only
+partition configured as Linux type, with the bootable flag.
+
+You can transfer the system on the partition then optionally resize it with:
+
+    # dd if=output/images/rootfs.ext4 of=/dev/sdX1
+    # resize2fs /dev/sdX1
+
+Or you can just extract the root filesystem to the partition with:
+
+    # mount /dev/sdX1 /mnt
+    # tar -pxf output/images/rootfs.tar -C /mnt
+    # umount /mnt
+
+To install the bootloader, you will need to copy the MBR:
+
+    # cat output/images/syslinux/mbr.bin > /dev/sdX
+
+Then install SYSLINUX in the mounted partition:
+
+    # mount /dev/sdX1 /mnt
+    # output/host/sbin/extlinux --install /mnt/boot/syslinux
+    # umount /mnt
+
+IMPORTANT: In order for the board to boot the Compact Flash with a recent
+config, the BIOS must use Logical Block Addressing (LBA). You can do it by
+choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS
+Configuration" screen. Also, don't forget to set the 'active' (or 'bootable')
+flag on partition 1. For details about the CMOS setup, please see:
+http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens
+
+Connect a terminal program to the rs232 connector marked "COM2"
+with baudrate set to 115200, insert the Compact Flash card into the socket,
+power up the board, and enjoy.
diff --git a/bsp/buildroot/board/technologic/ts5x00/linux-3.17.config b/bsp/buildroot/board/technologic/ts5x00/linux-3.17.config
deleted file mode 100644
index 60cd8a0f..00000000
--- a/bsp/buildroot/board/technologic/ts5x00/linux-3.17.config
+++ /dev/null
@@ -1,113 +0,0 @@
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_MELAN=y
-CONFIG_X86_GENERIC=y
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_NOHIGHMEM=y
-# CONFIG_COMPACTION is not set
-# CONFIG_BOUNCE is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_RELOCATABLE is not set
-# CONFIG_SUSPEND is not set
-# CONFIG_ACPI is not set
-CONFIG_CPU_IDLE=y
-CONFIG_TS5500=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_BLK_DEV is not set
-CONFIG_BLK_DEV_SD=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_ATA_GENERIC=y
-CONFIG_PATA_LEGACY=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_CORE is not set
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-CONFIG_NET_TULIP=y
-CONFIG_DM9102=y
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-CONFIG_PHYLIB=y
-CONFIG_DAVICOM_PHY=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_8250=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_TS5500=y
-CONFIG_SENSORS_MAX197=y
-CONFIG_WATCHDOG=y
-CONFIG_SC520_WDT=y
-CONFIG_USB=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
-# CONFIG_X86_PLATFORM_DEVICES is not set
-# CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_DMIID is not set
-CONFIG_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_15=y
-CONFIG_NLS_UTF8=y
-# CONFIG_VIRTUALIZATION is not set
-CONFIG_XZ_DEC=y
diff --git a/bsp/buildroot/board/technologic/ts5x00/readme.txt b/bsp/buildroot/board/technologic/ts5x00/readme.txt
deleted file mode 100644
index 1e506829..00000000
--- a/bsp/buildroot/board/technologic/ts5x00/readme.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-Technologic Systems TS-5x00 SBCs
-================================
-
-This document explains how to set up a basic Buildroot system for the
-Technologic Systems TS-5x00 serie of x86-based Single Board Computers.
-
-TS-5x00 Single Board Computers are based on the AMD Elan520 processor. For more
-information please have a look at http://wiki.embeddedarm.com/wiki/#AMD
-
-The kernel configuration works for any AMD Elan520-based SBCs, but the support
-is enhanced for the TS-5500 and TS-5400 models (on-board devices registration
-and additional sysfs attributes under /sys/devices/platform/).
-
-To build the default configuration you only have to:
-
-    $ make ts5x00_defconfig
-    $ make
-
-You will need a Compact Flash card of sufficient size and the first or only
-partition configured as Linux type, with the bootable flag.
-
-You can transfer the system on the partition then optionally resize it with:
-
-    # dd if=output/images/rootfs.ext4 of=/dev/sdX1
-    # resize2fs /dev/sdX1
-
-Or you can just extract the root filesystem to the partition with:
-
-    # mount /dev/sdX1 /mnt
-    # tar -pxf output/images/rootfs.tar -C /mnt
-    # umount /mnt
-
-To install the bootloader, you will need to copy the MBR:
-
-    # cat output/images/syslinux/mbr.bin > /dev/sdX
-
-Then install SYSLINUX in the mounted partition:
-
-    # mount /dev/sdX1 /mnt
-    # output/host/sbin/extlinux --install /mnt/boot/syslinux
-    # umount /mnt
-
-IMPORTANT: In order for the board to boot the Compact Flash with a recent
-config, the BIOS must use Logical Block Addressing (LBA). You can do it by
-choosing "Ide 0: AUTOCONFIG, LBA" under "IDE DRIVE GEOMETRY" in the "Basic CMOS
-Configuration" screen. Also, don't forget to set the 'active' (or 'bootable')
-flag on partition 1. For details about the CMOS setup, please see:
-http://wiki.embeddedarm.com/wiki/TS-5500#System_BIOS_Setup_Screens
-
-Connect a terminal program to the rs232 connector marked "COM2"
-with baudrate set to 115200, insert the Compact Flash card into the socket,
-power up the board, and enjoy.
diff --git a/bsp/buildroot/board/technologic/ts7680/genimage.cfg b/bsp/buildroot/board/technologic/ts7680/genimage.cfg
new file mode 100644
index 00000000..70b1dac6
--- /dev/null
+++ b/bsp/buildroot/board/technologic/ts7680/genimage.cfg
@@ -0,0 +1,14 @@
+image sdcard.img {
+	hdimage {
+	}
+
+	partition unused {
+		size =  512
+	}
+
+	partition rootfs {
+		partition-type = 0x83
+		image = "rootfs.ext4"
+		size = 256M
+	}
+}
diff --git a/bsp/buildroot/board/technologic/ts7680/readme.txt b/bsp/buildroot/board/technologic/ts7680/readme.txt
new file mode 100644
index 00000000..4ddd4915
--- /dev/null
+++ b/bsp/buildroot/board/technologic/ts7680/readme.txt
@@ -0,0 +1,51 @@
+Technologic Systems TS-7680 SBC
+===============================
+
+This document explains how to set up a basic Buildroot system for
+the Technologic Systems TS-7680 Single Board Computer.
+
+The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S
+running at 454MHz. The TS-7680 features are 10/100 Ethernet ports,
+Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports,
+relays and ADC/DAC. More details on the board here:
+https://wiki.embeddedarm.com/wiki/TS-7680
+
+The TS-7680 uses a 3.14.28 Linux kernel provided by
+Technologic Systems.
+
+To build the default configuration you only have to run:
+
+  $ make ts7680_defconfig
+  $ make
+
+The output looks like:
+output/images
+├── imx28-ts7680.dtb
+├── rootfs.ext2
+├── rootfs.ext4 -> rootfs.ext2
+├── rootfs.tar
+├── sdcard.img
+└── uImage
+
+The provided genimage configuration generates an image file containing
+two partitions. The first one is unused, but mandatory as the
+TS-7680 built-in bootloader loads the Linux uImage from the /boot
+directory in the second partition. The second partition contains the
+rootfs with the Linux uImage into the /boot directory.
+
+  $ fdisk output/images/sdcard.img
+  output/images/sdcard.img1          1      1       1  512B  0 Empty
+  output/images/sdcard.img2          2 524289  524288  256M 83 Linux
+
+This image can be directly written to an SD card.
+
+    $ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0
+
+To boot with Buildroot, insert this SD card on the board, make sure
+the SD jumper is present and the U-Boot jumper is not.
+
+The bootloader comes pre-flashed on the board on an SPI flash. Since
+updating the bootloader is risky and not trivial, it is not included
+in the Buildroot defconfig. Refer to
+https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on
+which U-Boot config to use and how to flash it.
diff --git a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch b/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch
deleted file mode 100644
index 15515460..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0001-watchdog-add-keep-alive-support.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From b5e57a9f158a293b1151638336478af8a5aad0f0 Mon Sep 17 00:00:00 2001
-From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-Date: Wed, 14 Nov 2012 19:16:35 +0800
-Subject: [PATCH 1/5] watchdog: add keep alive support
-
-this will allow to ping the watchdog via poller
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- drivers/watchdog/Kconfig   |  1 +
- drivers/watchdog/wd_core.c | 21 +++++++++++++++++++++
- include/watchdog.h         |  2 ++
- 3 files changed, 24 insertions(+)
-
-diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
-index 2e2900c..0b4dc84 100644
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -4,6 +4,7 @@ config WATCHDOG_IMX_RESET_SOURCE
- 
- menuconfig WATCHDOG
- 	bool "Watchdog support"
-+	select GENERIC_POLLER
- 	help
- 	  Many platforms support a watchdog to keep track of a working machine.
- 	  This framework provides routines to handle these watchdogs.
-diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
-index 3d0cfc6..a1b9e28 100644
---- a/drivers/watchdog/wd_core.c
-+++ b/drivers/watchdog/wd_core.c
-@@ -17,18 +17,39 @@
- #include <errno.h>
- #include <linux/ctype.h>
- #include <watchdog.h>
-+#include <poller.h>
- 
- /*
-  * Note: this simple framework supports one watchdog only.
-  */
- static struct watchdog *watchdog;
- 
-+static void watchdog_poller_func(struct poller_struct *poller)
-+{
-+	watchdog->keep_alive(watchdog);
-+}
-+
-+static struct poller_struct watchdog_poller = {
-+	.func = watchdog_poller_func,
-+};
-+
- int watchdog_register(struct watchdog *wd)
- {
- 	if (watchdog != NULL)
- 		return -EBUSY;
- 
- 	watchdog = wd;
-+
-+	if (watchdog->keep_alive) {
-+		int ret;
-+
-+		ret = poller_register(&watchdog_poller);
-+		if (ret) {
-+			watchdog = NULL;
-+			return ret;
-+		}
-+	}
-+
- 	return 0;
- }
- EXPORT_SYMBOL(watchdog_register);
-diff --git a/include/watchdog.h b/include/watchdog.h
-index 3e2d08e..d5ecf2f 100644
---- a/include/watchdog.h
-+++ b/include/watchdog.h
-@@ -13,8 +13,10 @@
- #ifndef INCLUDE_WATCHDOG_H
- # define INCLUDE_WATCHDOG_H
- 
-+
- struct watchdog {
- 	int (*set_timeout)(struct watchdog *, unsigned);
-+	void (*keep_alive)(struct watchdog *);
- };
- 
- int watchdog_register(struct watchdog *);
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch b/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch
deleted file mode 100644
index 1ca87695..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0002-watchdog-add-at91sam9-watchdog-support.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From e1d54ffb987c346c45c20968be34c50c62a91c07 Mon Sep 17 00:00:00 2001
-From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-Date: Wed, 14 Nov 2012 19:17:47 +0800
-Subject: [PATCH 2/5] watchdog: add at91sam9 watchdog support
-
-with keep alive support
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- drivers/watchdog/Kconfig        |   7 +++
- drivers/watchdog/Makefile       |   1 +
- drivers/watchdog/at91sam9_wdt.c | 131 ++++++++++++++++++++++++++++++++++++++++
- drivers/watchdog/at91sam9_wdt.h |  38 ++++++++++++
- 4 files changed, 177 insertions(+)
- create mode 100644 drivers/watchdog/at91sam9_wdt.c
- create mode 100644 drivers/watchdog/at91sam9_wdt.h
-
-diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
-index 0b4dc84..98a21d7 100644
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -11,6 +11,13 @@ menuconfig WATCHDOG
- 
- if WATCHDOG
- 
-+config WATCHDOG_AT91SAM9X
-+	tristate "AT91SAM9X / AT91CAP9 watchdog"
-+	depends on ARCH_AT91
-+	help
-+	  Watchdog timer embedded into AT91SAM9X and AT91CAP9 chips. This will
-+	  reboot your system when the timeout is reached.
-+
- config WATCHDOG_MXS28
- 	bool "i.MX28"
- 	depends on ARCH_IMX28
-diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
-index f522b88..3d15d52 100644
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -1,3 +1,4 @@
- obj-$(CONFIG_WATCHDOG) += wd_core.o
-+obj-$(CONFIG_WATCHDOG_AT91SAM9X) += at91sam9_wdt.o
- obj-$(CONFIG_WATCHDOG_MXS28) += im28wd.o
- obj-$(CONFIG_WATCHDOG_IMX_RESET_SOURCE) += imxwd.o
-diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
-new file mode 100644
-index 0000000..203d83a
---- /dev/null
-+++ b/drivers/watchdog/at91sam9_wdt.c
-@@ -0,0 +1,131 @@
-+/*
-+ * (c) 2012 Juergen Beisert <kernel@pengutronix.de>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * Note: this driver works for the i.MX28 SoC. It might work for the
-+ * i.MX23 Soc as well, but is not tested yet.
-+ */
-+
-+#include <common.h>
-+#include <init.h>
-+#include <io.h>
-+#include <errno.h>
-+#include <malloc.h>
-+#include <watchdog.h>
-+
-+#include "at91sam9_wdt.h"
-+
-+struct at91sam9_wdt {
-+	struct watchdog wdt;
-+	void __iomem *base;
-+};
-+
-+#define to_at91sam9_wdt(h) container_of(h, struct at91sam9_wdt, wdt)
-+
-+#define wdt_read(at91wdt, field) \
-+	__raw_readl(at91wdt->base + field)
-+#define wdt_write(at91wdt, field, val) \
-+	__raw_writel((val), at91wdt->base + field)
-+
-+static void at91sam9_wdt_keep_alive(struct watchdog *wdt)
-+{
-+	struct at91sam9_wdt *at91wdt = to_at91sam9_wdt(wdt);
-+
-+	wdt_write(at91wdt, AT91_WDT_CR, AT91_WDT_KEY | AT91_WDT_WDRSTT);
-+}
-+
-+static int at91sam9_wdt_settimeout(struct watchdog *wdt, unsigned int timeout)
-+{
-+	struct at91sam9_wdt *at91wdt = to_at91sam9_wdt(wdt);
-+	unsigned int reg;
-+	unsigned int mr;
-+
-+	/* Check if disabled */
-+	mr = wdt_read(at91wdt, AT91_WDT_MR);
-+	if (mr & AT91_WDT_WDDIS) {
-+		pr_err("sorry, watchdog is disabled\n");
-+		return -EIO;
-+	}
-+
-+	if (!timeout) {
-+		wdt_write(at91wdt, AT91_WDT_MR, AT91_WDT_WDDIS);
-+		return 0;
-+	}
-+
-+	/*
-+	 * All counting occurs at SLOW_CLOCK / 128 = 256 Hz
-+	 *
-+	 * Since WDV is a 12-bit counter, the maximum period is
-+	 * 4096 / 256 = 16 seconds.
-+	 */
-+	reg = AT91_WDT_WDRSTEN	/* causes watchdog reset */
-+		/* | AT91_WDT_WDRPROC	causes processor reset only */
-+		| AT91_WDT_WDDBGHLT	/* disabled in debug mode */
-+		| AT91_WDT_WDD		/* restart at any time */
-+		| (timeout & AT91_WDT_WDV);  /* timer value */
-+	wdt_write(at91wdt, AT91_WDT_MR, reg);
-+
-+	return 0;
-+}
-+
-+static int at91sam9_wdt_probe(struct device_d *dev)
-+{
-+	struct at91sam9_wdt *priv;
-+	struct watchdog *wdt;
-+	int ret;
-+	unsigned int mr;
-+
-+	priv = xzalloc(sizeof(struct at91sam9_wdt));
-+	priv->base = dev_request_mem_region(dev, 0);
-+	wdt = &priv->wdt;
-+
-+	wdt->set_timeout = at91sam9_wdt_settimeout;
-+	wdt->keep_alive = at91sam9_wdt_keep_alive;
-+
-+	/* Check if disabled */
-+	mr = wdt_read(priv, AT91_WDT_MR);
-+	if (mr & AT91_WDT_WDDIS) {
-+		dev_err(dev, "sorry, watchdog is disabled\n");
-+		ret = -EIO;
-+		goto err;
-+	}
-+
-+	ret = watchdog_register(wdt);
-+	if (ret != 0)
-+		goto err;
-+
-+	dev->priv = priv;
-+	return 0;
-+
-+err:
-+	free(priv);
-+	return ret;
-+}
-+
-+static void at91sam9_wdt_remove(struct device_d *dev)
-+{
-+	struct at91sam9_wdt *priv= dev->priv;
-+	watchdog_deregister(&priv->wdt);
-+	free(priv);
-+}
-+
-+static struct driver_d at91sam9_wdt_driver = {
-+	.name	= "at91sam9_wdt",
-+	.probe	= at91sam9_wdt_probe,
-+	.remove = at91sam9_wdt_remove,
-+};
-+
-+static int at91sam9_wdt_init(void)
-+{
-+	return platform_driver_register(&at91sam9_wdt_driver);
-+}
-+coredevice_initcall(at91sam9_wdt_init);
-diff --git a/drivers/watchdog/at91sam9_wdt.h b/drivers/watchdog/at91sam9_wdt.h
-new file mode 100644
-index 0000000..2b68c1a
---- /dev/null
-+++ b/drivers/watchdog/at91sam9_wdt.h
-@@ -0,0 +1,38 @@
-+/*
-+ * drivers/watchdog/at91sam9_wdt.h
-+ *
-+ * Copyright (C) 2007 Andrew Victor
-+ * Copyright (C) 2007 Atmel Corporation.
-+ *
-+ * Watchdog Timer (WDT) - System peripherals regsters.
-+ * Based on AT91SAM9261 datasheet revision D.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ */
-+
-+#ifndef AT91_WDT_H
-+#define AT91_WDT_H
-+
-+#define AT91_WDT_CR		0x00			/* Watchdog Control Register */
-+#define		AT91_WDT_WDRSTT		(1    << 0)		/* Restart */
-+#define		AT91_WDT_KEY		(0xa5 << 24)		/* KEY Password */
-+
-+#define AT91_WDT_MR		0x04			/* Watchdog Mode Register */
-+#define		AT91_WDT_WDV		(0xfff << 0)		/* Counter Value */
-+#define		AT91_WDT_WDFIEN		(1     << 12)		/* Fault Interrupt Enable */
-+#define		AT91_WDT_WDRSTEN	(1     << 13)		/* Reset Processor */
-+#define		AT91_WDT_WDRPROC	(1     << 14)		/* Timer Restart */
-+#define		AT91_WDT_WDDIS		(1     << 15)		/* Watchdog Disable */
-+#define		AT91_WDT_WDD		(0xfff << 16)		/* Delta Value */
-+#define		AT91_WDT_WDDBGHLT	(1     << 28)		/* Debug Halt */
-+#define		AT91_WDT_WDIDLEHLT	(1     << 29)		/* Idle Halt */
-+
-+#define AT91_WDT_SR		0x08			/* Watchdog Status Register */
-+#define		AT91_WDT_WDUNF		(1 << 0)		/* Watchdog Underflow */
-+#define		AT91_WDT_WDERR		(1 << 1)		/* Watchdog Error */
-+
-+
-+#endif
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch b/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch
deleted file mode 100644
index bf972003..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0003-at91sam9260-9g20-add-wathdog-support.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3338bcb05479f1149420d4a0ea3904cb9e42eef5 Mon Sep 17 00:00:00 2001
-From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
-Date: Wed, 14 Nov 2012 19:18:22 +0800
-Subject: [PATCH 3/5] at91sam9260/9g20: add wathdog support
-
-Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----
- arch/arm/mach-at91/at91sam9260_devices.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
-index 1c375ee..5885f91 100644
---- a/arch/arm/mach-at91/at91sam9260_devices.c
-+++ b/arch/arm/mach-at91/at91sam9260_devices.c
-@@ -10,6 +10,7 @@
-  *
-  */
- #include <common.h>
-+#include <init.h>
- #include <sizes.h>
- #include <asm/armlinux.h>
- #include <asm/hardware.h>
-@@ -397,3 +398,14 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data)
- #else
- void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
- #endif
-+
-+#ifdef CONFIG_WATCHDOG_AT91SAM9X
-+static int at91_add_device_watchdog(void)
-+{
-+	add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL,
-+		AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL);
-+
-+	return 0;
-+}
-+coredevice_initcall(at91_add_device_watchdog);
-+#endif
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch b/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch
deleted file mode 100644
index cdfd026a..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0004-at91sam9260-9g20-fix-wathdog-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e03bf0e3ad24898019b89eb9a6935d159c60268f Mon Sep 17 00:00:00 2001
-From: Fabio Porcedda <fabio.porcedda@gmail.com>
-Date: Thu, 17 Jan 2013 11:32:35 +0100
-Subject: [PATCH 4/5] at91sam9260/9g20: fix wathdog support
-
-Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
----
- arch/arm/mach-at91/at91sam9260_devices.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
-index 5885f91..df675d2 100644
---- a/arch/arm/mach-at91/at91sam9260_devices.c
-+++ b/arch/arm/mach-at91/at91sam9260_devices.c
-@@ -403,7 +403,7 @@ void at91_add_device_mci(short mmc_id, struct atmel_mci_platform_data *data) {}
- static int at91_add_device_watchdog(void)
- {
- 	add_generic_device("at91sam9_wdt", DEVICE_ID_SINGLE, NULL,
--		AT91_WDT + AT91_BASE_SYS, 16, IORESOURCE_MEM, NULL);
-+		AT91_BASE_WDT, 16, IORESOURCE_MEM, NULL);
- 
- 	return 0;
- }
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch b/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch
deleted file mode 100644
index 837e8c63..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/barebox-2013.04.0-0005-watchdog-enable-for-evk-pro3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 98c96ea36a4b3bb9b92dde849db5e8d6918b5168 Mon Sep 17 00:00:00 2001
-From: Fabio Porcedda <fabio.porcedda@gmail.com>
-Date: Thu, 17 Jan 2013 11:32:59 +0100
-Subject: [PATCH 5/5] watchdog: enable for evk-pro3
-
-Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
----
- arch/arm/configs/telit_evk_pro3_defconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/configs/telit_evk_pro3_defconfig b/arch/arm/configs/telit_evk_pro3_defconfig
-index 050d176..436cecf 100644
---- a/arch/arm/configs/telit_evk_pro3_defconfig
-+++ b/arch/arm/configs/telit_evk_pro3_defconfig
-@@ -68,6 +68,8 @@ CONFIG_MCI_ATMEL=y
- CONFIG_LED=y
- CONFIG_LED_GPIO=y
- CONFIG_LED_TRIGGERS=y
-+CONFIG_WATCHDOG=y
-+CONFIG_WATCHDOG_AT91SAM9X=y
- CONFIG_FS_TFTP=y
- CONFIG_FS_FAT=y
- CONFIG_FS_FAT_LFN=y
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/board/telit/evk-pro3/linux-3.9.config b/bsp/buildroot/board/telit/evk-pro3/linux-3.9.config
deleted file mode 100644
index 99c2f2d2..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/linux-3.9.config
+++ /dev/null
@@ -1,201 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZO=y
-# CONFIG_SWAP is not set
-CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_AT91=y
-CONFIG_SOC_AT91SAM9260=y
-CONFIG_SOC_AT91SAM9263=y
-CONFIG_SOC_AT91SAM9G45=y
-CONFIG_SOC_AT91SAM9X5=y
-CONFIG_SOC_AT91SAM9N12=y
-CONFIG_MACH_AT91SAM_DT=y
-CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
-CONFIG_AT91_TIMER_HZ=128
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_LEDS=y
-CONFIG_LEDS_CPU=y
-CONFIG_UACCESS_WITH_MEMCPY=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
-CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw"
-CONFIG_KEXEC=y
-CONFIG_AUTO_ZRELADDR=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_PNP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_DIAG is not set
-CONFIG_IPV6=y
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
-CONFIG_IPV6_SIT_6RD=y
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_STANDALONE is not set
-# CONFIG_PREVENT_FIRMWARE_BUILD is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_MTD_UBI=y
-CONFIG_MTD_UBI_GLUEBI=y
-CONFIG_PROC_DEVICETREE=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=4
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_ATMEL_PWM=y
-CONFIG_ATMEL_TCLIB=y
-CONFIG_EEPROM_93CX6=m
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_NETDEVICES=y
-CONFIG_MII=y
-CONFIG_MACB=y
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_DAVICOM_PHY=y
-CONFIG_MICREL_PHY=y
-# CONFIG_WLAN is not set
-CONFIG_INPUT_POLLDEV=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=272
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_SERIO is not set
-CONFIG_LEGACY_PTY_COUNT=4
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
-CONFIG_I2C_GPIO=y
-CONFIG_SPI=y
-CONFIG_SPI_ATMEL=y
-CONFIG_PINCTRL_AT91=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_AT91SAM9X_WATCHDOG=y
-CONFIG_SSB=m
-CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_ATMEL=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_ATMEL_LCDC=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_ACORN_8x8=y
-CONFIG_FONT_MINI_4x6=y
-CONFIG_LOGO=y
-# CONFIG_HID_SUPPORT is not set
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_ACM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_FTDI_SIO=y
-CONFIG_USB_SERIAL_PL2303=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_AT91=m
-CONFIG_USB_ATMEL_USBA=m
-CONFIG_USB_ETH=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-CONFIG_MMC=y
-CONFIG_MMC_ATMELMCI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_AT91RM9200=y
-CONFIG_RTC_DRV_AT91SAM9=y
-CONFIG_DMADEVICES=y
-# CONFIG_IOMMU_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_UBIFS_FS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_USER=y
-CONFIG_CRYPTO=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ARC4=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_USER_API_HASH=m
-CONFIG_CRYPTO_USER_API_SKCIPHER=m
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC7=m
-CONFIG_AVERAGE=y
diff --git a/bsp/buildroot/board/telit/evk-pro3/readme.txt b/bsp/buildroot/board/telit/evk-pro3/readme.txt
deleted file mode 100644
index ace9dd4c..00000000
--- a/bsp/buildroot/board/telit/evk-pro3/readme.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-Buildroot board support for Telit EVK-PRO3 with Telit GE863-PRO3
-
-Official site:
-  http://www.telit.com/en/products.php?p_id=3&p_ac=show&p=10
-
-Build images:
-    make telit_evk_pro3_defconfig
-    make
-
-  images built:
-  - output/images/barebox.bin
-  - output/images/zImage
-  - output/images/rootfs.ubi
-
-
-Flash built images:
-  The first time you need to bootstrap from Telit Official Release 221.07.1007,
-  at the U-Boot prompt type:
-    U-Boot> loadb
-  send buildroot/output/images/barebox.bin
-    U-Boot> go 0x20200000
-
-  flash updated images using barebox through tftp:
-    barebox:/ erase dev/self0; cp /mnt/tftp/barebox.bin /dev/self0
-    barebox:/ erase /dev/nand0.kernel.bb; cp /mnt/tftp/zImage /dev/nand0.kernel.bb
-    barebox:/ erase /dev/nand0.rootfs.bb; cp /mnt/tftp/rootfs.ubi /dev/nand0.rootfs.bb
-    barebox:/ erase dev/env0
-    barebox:/ reset
diff --git a/bsp/buildroot/board/udoo/mx6qdl/genimage.cfg b/bsp/buildroot/board/udoo/mx6qdl/genimage.cfg
deleted file mode 100644
index 4361d540..00000000
--- a/bsp/buildroot/board/udoo/mx6qdl/genimage.cfg
+++ /dev/null
@@ -1,48 +0,0 @@
-# Minimal microSD card image for Udoo MX6Q/DL boards
-#
-# We mimic the .sdcard Freescale's image format for i.MX6:
-# * the microSD card must have 1 kB free space at the beginning,
-# * U-Boot is dumped as is,
-# * a FAT partition at offset 16 MB is containing zImage and dtbs,
-# * a single root filesystem partition is required (Ext4 in this case).
-#
-
-image boot.vfat {
-	vfat {
-		files = {
-			"imx6q-udoo.dtb",
-			"imx6dl-udoo.dtb",
-			"zImage"
-		}
-	}
-	size = 16M
-}
-
-image sdcard.img {
-	hdimage {
-	}
-
-	partition SPL {
-		in-partition-table = "no"
-		image = "SPL"
-		offset = 1K
-	}
-
-	partition u-boot {
-		in-partition-table = "no"
-		image = "u-boot.img"
-		offset = 69K
-	}
-
-	partition boot {
-		partition-type = 0xC
-		bootable = "true"
-		image = "boot.vfat"
-		offset = 16M
-	}
-
-	partition rootfs {
-		partition-type = 0x83
-		image = "rootfs.ext4"
-	}
-}
diff --git a/bsp/buildroot/board/udoo/mx6qdl/post-image.sh b/bsp/buildroot/board/udoo/mx6qdl/post-image.sh
deleted file mode 100755
index b4ac4608..00000000
--- a/bsp/buildroot/board/udoo/mx6qdl/post-image.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage \
-  --rootpath "${TARGET_DIR}" \
-  --tmppath "${GENIMAGE_TMP}" \
-  --inputpath "${BINARIES_DIR}" \
-  --outputpath "${BINARIES_DIR}" \
-  --config "${GENIMAGE_CFG}"
diff --git a/bsp/buildroot/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch b/bsp/buildroot/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch
deleted file mode 100644
index 2e8cea5d..00000000
--- a/bsp/buildroot/board/udoo/neo/patches/linux/0001-udoo_neo_support.patch
+++ /dev/null
@@ -1,560 +0,0 @@
-From 76e691fc7653b85d390e58710e5c7db73ca49367 Mon Sep 17 00:00:00 2001
-From: Andreas Färber <afaerber@suse.de>
-Date: Sun, 16 Oct 2016 16:44:23 +0200
-Subject: ARM: dts: imx6sx: Add UDOO Neo support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add initial device trees for UDOO Neo Basic, Extended and Full boards:
-* Serial console is enabled, other serial ports are prepared.
-* I2C based PMIC is enabled.
-* Ethernet is enabled for Basic and Full.
-* SDHC is enabled, with the SDIO_PWR GPIO modeled as a regulator.
-* Both user LEDs are enabled, with the orange one reserved for the M4
-  and with the SD card as default trigger for the red LED.
-
-The decision on a board compatible string is deferred to later.
-
-Cc: Ettore Chimenti <ettore.chimenti@udoo.org>
-Signed-off-by: Andreas Färber <afaerber@suse.de>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
----
- arch/arm/boot/dts/Makefile                     |   5 +-
- arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts    |  69 ++++++
- arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts |  54 +++++
- arch/arm/boot/dts/imx6sx-udoo-neo-full.dts     |  69 ++++++
- arch/arm/boot/dts/imx6sx-udoo-neo.dtsi         | 293 +++++++++++++++++++++++++
- 5 files changed, 489 insertions(+), 1 deletion(-)
- create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
- create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
- create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
- create mode 100644 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index 019976b..da0197d 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -417,7 +417,10 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
- 	imx6sx-sabreauto.dtb \
- 	imx6sx-sdb-reva.dtb \
- 	imx6sx-sdb-sai.dtb \
--	imx6sx-sdb.dtb
-+	imx6sx-sdb.dtb \
-+	imx6sx-udoo-neo-basic.dtb \
-+	imx6sx-udoo-neo-extended.dtb \
-+	imx6sx-udoo-neo-full.dtb
- dtb-$(CONFIG_SOC_IMX6UL) += \
- 	imx6ul-14x14-evk.dtb \
- 	imx6ul-geam-kit.dtb \
-diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
-new file mode 100644
-index 0000000..0b88878
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright (c) 2016 Andreas Färber
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This library is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This library is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx6sx-udoo-neo.dtsi"
-+
-+/ {
-+	model = "UDOO Neo Basic";
-+	compatible = "fsl,imx6sx";
-+
-+	memory {
-+		reg = <0x80000000 0x20000000>;
-+	};
-+};
-+
-+&fec1 {
-+	phy-handle = <&ethphy1>;
-+	status = "okay";
-+
-+	mdio {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		ethphy1: ethernet-phy@0 {
-+			compatible = "ethernet-phy-ieee802.3-c22";
-+			reg = <0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
-new file mode 100644
-index 0000000..d6fdd17
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts
-@@ -0,0 +1,54 @@
-+/*
-+ * Copyright (c) 2016 Andreas Färber
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This library is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This library is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx6sx-udoo-neo.dtsi"
-+
-+/ {
-+	model = "UDOO Neo Extended";
-+	compatible = "fsl,imx6sx";
-+
-+	memory {
-+		reg = <0x80000000 0x40000000>;
-+	};
-+};
-diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
-new file mode 100644
-index 0000000..d8c3577
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6sx-udoo-neo-full.dts
-@@ -0,0 +1,69 @@
-+/*
-+ * Copyright (c) 2016 Andreas Färber
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This library is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This library is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx6sx-udoo-neo.dtsi"
-+
-+/ {
-+	model = "UDOO Neo Full";
-+	compatible = "fsl,imx6sx";
-+
-+	memory {
-+		reg = <0x80000000 0x40000000>;
-+	};
-+};
-+
-+&fec1 {
-+	phy-handle = <&ethphy1>;
-+	status = "okay";
-+
-+	mdio {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+
-+		ethphy1: ethernet-phy@0 {
-+			compatible = "ethernet-phy-ieee802.3-c22";
-+			reg = <0>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
-new file mode 100644
-index 0000000..2b65d26
---- /dev/null
-+++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
-@@ -0,0 +1,293 @@
-+/*
-+ * Copyright (c) 2016 Andreas Färber
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This library is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This library is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include "imx6sx.dtsi"
-+
-+/ {
-+	compatible = "fsl,imx6sx";
-+
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+
-+		red {
-+			label = "udoo-neo:red:mmc";
-+			gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;
-+			default-state = "off";
-+			linux,default-trigger = "mmc0";
-+		};
-+
-+		orange {
-+			label = "udoo-neo:orange:user";
-+			gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>;
-+			default-state = "keep";
-+		};
-+	};
-+
-+	reg_sdio_pwr: regulator-sdio-pwr {
-+		compatible = "regulator-fixed";
-+		gpio = <&gpio6 1 GPIO_ACTIVE_HIGH>;
-+		enable-active-high;
-+		regulator-name = "SDIO_PWR";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		regulator-boot-on;
-+	};
-+};
-+
-+&cpu0 {
-+	arm-supply = <&sw1a_reg>;
-+	soc-supply = <&sw1c_reg>;
-+};
-+
-+&fec1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_enet1>;
-+	phy-mode = "rmii";
-+	phy-reset-gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
-+};
-+
-+&i2c1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_i2c1>;
-+	clock-frequency = <100000>;
-+	status = "okay";
-+
-+	pmic: pmic@08 {
-+		compatible = "fsl,pfuze3000";
-+		reg = <0x08>;
-+
-+		regulators {
-+			sw1a_reg: sw1a {
-+				regulator-min-microvolt = <700000>;
-+				regulator-max-microvolt = <1475000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+				regulator-ramp-delay = <6250>;
-+			};
-+
-+			sw1c_reg: sw1b {
-+				regulator-min-microvolt = <700000>;
-+				regulator-max-microvolt = <1475000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+				regulator-ramp-delay = <6250>;
-+			};
-+
-+			sw2_reg: sw2 {
-+				regulator-min-microvolt = <1500000>;
-+				regulator-max-microvolt = <1850000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			sw3a_reg: sw3 {
-+				regulator-min-microvolt = <900000>;
-+				regulator-max-microvolt = <1650000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			swbst_reg: swbst {
-+				regulator-min-microvolt = <5000000>;
-+				regulator-max-microvolt = <5150000>;
-+			};
-+
-+			snvs_reg: vsnvs {
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <3000000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			vref_reg: vrefddr {
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			vgen1_reg: vldo1 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+
-+			vgen2_reg: vldo2 {
-+				regulator-min-microvolt = <800000>;
-+				regulator-max-microvolt = <1550000>;
-+			};
-+
-+			vgen3_reg: vccsd {
-+				regulator-min-microvolt = <2850000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+
-+			vgen4_reg: v33 {
-+				regulator-min-microvolt = <2850000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+
-+			vgen5_reg: vldo3 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+
-+			vgen6_reg: vldo4 {
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-always-on;
-+			};
-+		};
-+	};
-+};
-+
-+&iomuxc {
-+	pinctrl_enet1: enet1grp {
-+		fsl,pins =
-+			<MX6SX_PAD_ENET1_CRS__GPIO2_IO_1	0xa0b1>,
-+			<MX6SX_PAD_ENET1_MDC__ENET1_MDC		0xa0b1>,
-+			<MX6SX_PAD_ENET1_MDIO__ENET1_MDIO	0xa0b1>,
-+			<MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0	0xa0b1>,
-+			<MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1	0xa0b1>,
-+			<MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN	0xa0b1>,
-+
-+			<MX6SX_PAD_ENET1_TX_CLK__ENET1_REF_CLK1	0x3081>,
-+			<MX6SX_PAD_ENET2_TX_CLK__GPIO2_IO_9	0x3081>,
-+			<MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0	0x3081>,
-+			<MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1	0x3081>,
-+			<MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN	0x3081>,
-+			<MX6SX_PAD_RGMII1_RXC__ENET1_RX_ER	0x3081>,
-+
-+			<MX6SX_PAD_ENET2_RX_CLK__ENET2_REF_CLK_25M	0x91>;
-+	};
-+
-+	pinctrl_i2c1: i2c1grp {
-+		fsl,pins =
-+			<MX6SX_PAD_GPIO1_IO00__I2C1_SCL		0x4001b8b1>,
-+			<MX6SX_PAD_GPIO1_IO01__I2C1_SDA		0x4001b8b1>;
-+	};
-+
-+	pinctrl_uart1: uart1grp {
-+		fsl,pins =
-+			<MX6SX_PAD_GPIO1_IO04__UART1_TX		0x1b0b1>,
-+			<MX6SX_PAD_GPIO1_IO05__UART1_RX		0x1b0b1>;
-+	};
-+
-+	pinctrl_uart2: uart2grp {
-+		fsl,pins =
-+			<MX6SX_PAD_GPIO1_IO06__UART2_TX		0x1b0b1>,
-+			<MX6SX_PAD_GPIO1_IO07__UART2_RX		0x1b0b1>;
-+	};
-+
-+	pinctrl_uart5: uart5grp {
-+		fsl,pins =
-+			<MX6SX_PAD_SD4_DATA4__UART5_RX		0x1b0b1>,
-+			<MX6SX_PAD_SD4_DATA5__UART5_TX		0x1b0b1>;
-+	};
-+
-+	pinctrl_uart6: uart6grp {
-+		fsl,pins =
-+			<MX6SX_PAD_CSI_DATA00__UART6_RI_B	0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA01__UART6_DSR_B	0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA02__UART6_DTR_B	0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA03__UART6_DCD_B	0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA04__UART6_RX		0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA05__UART6_TX		0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA06__UART6_RTS_B	0x1b0b1>,
-+			<MX6SX_PAD_CSI_DATA07__UART6_CTS_B	0x1b0b1>;
-+	};
-+
-+	pinctrl_usdhc2: usdhc2grp {
-+		fsl,pins =
-+			<MX6SX_PAD_SD2_CMD__USDHC2_CMD		0x17059>,
-+			<MX6SX_PAD_SD2_CLK__USDHC2_CLK		0x10059>,
-+			<MX6SX_PAD_SD2_DATA0__USDHC2_DATA0	0x17059>,
-+			<MX6SX_PAD_SD2_DATA1__USDHC2_DATA1	0x17059>,
-+			<MX6SX_PAD_SD2_DATA2__USDHC2_DATA2	0x17059>,
-+			<MX6SX_PAD_SD2_DATA3__USDHC2_DATA3	0x17059>,
-+			<MX6SX_PAD_SD1_DATA0__GPIO6_IO_2	0x17059>; /* CD */
-+	};
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart1>;
-+	status = "okay";
-+};
-+
-+/* Cortex-M4 serial */
-+&uart2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart2>;
-+	status = "disabled";
-+};
-+
-+/* Arduino serial */
-+&uart5 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart5>;
-+	status = "disabled";
-+};
-+
-+&uart6 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart6>;
-+	uart-has-rtscts;
-+	status = "disabled";
-+};
-+
-+&usdhc2 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_usdhc2>;
-+	vmmc-supply = <&reg_sdio_pwr>;
-+	bus-width = <4>;
-+	cd-gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
-+	no-1-8-v;
-+	keep-power-in-suspend;
-+	wakeup-source;
-+	status = "okay";
-+};
--- 
-cgit v0.12
diff --git a/bsp/buildroot/board/udoo/neo/post-build.sh b/bsp/buildroot/board/udoo/neo/post-build.sh
index 07c480e6..43e091c5 100755
--- a/bsp/buildroot/board/udoo/neo/post-build.sh
+++ b/bsp/buildroot/board/udoo/neo/post-build.sh
@@ -2,7 +2,7 @@
 
 BOARD_DIR="$(dirname $0)"
 
-$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none  \
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
 -n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
 
 install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
diff --git a/bsp/buildroot/board/via/imx6_vab820/genimage.cfg b/bsp/buildroot/board/via/imx6_vab820/genimage.cfg
deleted file mode 100644
index 54acaa79..00000000
--- a/bsp/buildroot/board/via/imx6_vab820/genimage.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-# Minimal SD card image for the VIA VAB-820 / AMOS-820
-#
-# The SD card must have at least 1 MB free at the beginning.
-# U-Boot is added before the filesystem partitions as is.
-# A FAT boot partition and an Ext4 root filesystem partition are required.
-
-image boot.vfat {
-  vfat {
-    files = {
-      "imx6q-vab820.dtb",
-      "uImage"
-    }
-  }
-  size = 10M
-}
-
-image sdcard.img {
-  hdimage {
-  }
-
-  partition u-boot {
-    in-partition-table = "no"
-    image = "u-boot.imx"
-    offset = 1024
-  }
-
-  partition boot {
-    partition-type = 0xC
-    bootable = "true"
-    image = "boot.vfat"
-  }
-
-  partition rootfs {
-    partition-type = 0x83
-    image = "rootfs.ext4"
-    size = 512M
-  }
-}
diff --git a/bsp/buildroot/board/via/imx6_vab820/post-image.sh b/bsp/buildroot/board/via/imx6_vab820/post-image.sh
deleted file mode 100755
index 00de33b0..00000000
--- a/bsp/buildroot/board/via/imx6_vab820/post-image.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-BOARD_DIR="$(dirname $0)"
-GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
-GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-
-rm -rf "${GENIMAGE_TMP}"
-
-genimage \
-  --rootpath "${TARGET_DIR}" \
-  --tmppath "${GENIMAGE_TMP}" \
-  --inputpath "${BINARIES_DIR}" \
-  --outputpath "${BINARIES_DIR}" \
-  --config "${GENIMAGE_CFG}"
-
-RET=${?}
-exit ${RET}
diff --git a/bsp/buildroot/board/via/imx6_vab820/readme.txt b/bsp/buildroot/board/via/imx6_vab820/readme.txt
deleted file mode 100644
index 908441f7..00000000
--- a/bsp/buildroot/board/via/imx6_vab820/readme.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-VIA VAB-820/AMOS-820
-====================
-
-This file documents the Buildroot support for the VIA VAB-820 board and
-VIA AMOS-820 system, which are built around a Freescale i.MX6 Quad/Dual SoC.
-The kernel and u-boot is based on the official VIA BSP, which is in turn
-based on the Freescale Linux 3.10.17_1.0.0_ga BSP.
-
-
-Configuring and building Buildroot
-----------------------------------
-
-Start from the defconfig:
-
-  $ make via_imx6_vab820_defconfig
-
-You can edit build options the usual way:
-
-  $ make menuconfig
-
-When you are happy with the setup, run:
-
-  $ make
-
-The result of the build with the default settings should be these files:
-
-  output/images
-  ├── boot.vfat
-  ├── imx6q-vab820.dtb
-  ├── rootfs.ext2
-  ├── rootfs.ext4 -> rootfs.ext2
-  ├── rootfs.tar
-  ├── sdcard.img
-  ├── u-boot.imx
-  └── uImage
-
-Copy the bootable `sdcard.img` onto an SD card with "dd":
-
-  $ sudo dd if=output/images/sdcard.img of=/dev/sdX bs=1M conv=fsync
-
-where "sdX" is the appropriate partition of your card.
-
-For details about the medium image layout, see the definition in
-`board/via/imx6_vab820/genimage.cfg`.
-
-
-Setting up your SD card manually
---------------------------------
-
-*Important*: pay attention which partition you are modifying so you don't
-accidentally erase the wrong file system, e.g your host computer or your
-external storage!
-
-In the default setup you need to create 2 partitions on your SD card:
-a boot partition and a root partition. In this guide and in the default u-boot
-settings the boot partition is vfat, while the root partition is ext4.
-
-You also need to leave space for u-boot at the beginning of the card, before
-all the partitions.
-
-For example, if your SD card is at /dev/sdX, using fdisk, and starting from
-an empty card, the steps are along these lines:
-
-  # fdisk /dev/sdX
-  n         (new partition)
-  p         (primary partition)
-  1	    (first partition)
-  <return>  (default first sector, should be at least 1MB from the beginning
-             which is 2048 sectors if the sector size is 512KB)
-  +50M      (50MB size, as an example)
-  t         (switch partition type)
-  b         (select "W95 FAT32" type)
-  n         (the second partition)
-  p         (primary partition)
-  2	    (second partition)
-  <return>  (default first sector)
-  <return>  (use all remaining space)
-  p         (print so the partition looks something like this below)
-    Device     Boot  Start      End  Sectors  Size Id Type
-    /dev/sdX1         2048   104447   102400   50M  b W95 FAT32
-    /dev/sdX2       104448 15564799 15460352  7.4G 83 Linux
-  w         (save changes)
-
-After this you need to format the newly created file system:
-
-  # mkfs.vfat -L boot /dev/sdX1
-  # mkfs.ext4 -L rootfs /dev/sdX2
-
-Now the system can be copied onto the card. First copy the u-boot onto
-the region of the card before the first partition (starting from the
-root directory of buildroot):
-
-  # dd if=output/images/u-boot.imx of=/dev/sdX bs=512 seek=2
-
-Mount the first partition /dev/sdX1, and copy the kernel and the
-compiled device tree:
-
-  # cp output/images/uImage /mnt/<BOOT-PARTITION>
-  # cp output/images/imx6q-vab820.dtb /mnt/<BOOT-PARTITION>
-
-Finally, copy the root file system onto the mounted (empty) /dev/sdX2
-rootfs partition:
-
-  # tar xf output/images/rootfs.tar -C /mnt/<ROOTFS-PARTITION>
-
-
-Booting
--------
-
-To use the on-card u-boot, you need adjust jumper J11 located just next to
-the SD card slot on the VAB-820 board. The correct position for SD card
-boot is jumping the two pins towards the inside of the board.
-
-To modify the default boot parameters compiled into u-boot, you can create
-a boot script with the file name `boot.scr` and place it onto the boot
-partition (same directory as `uImage`).
-
-If you want to have the login prompt on the serial debug line instead of
-the console, adjust the buildroot settings as:
-"System Configuration > getty options > TTY port > ttymxc1"
diff --git a/bsp/buildroot/board/wandboard/post-build.sh b/bsp/buildroot/board/wandboard/post-build.sh
index 07c480e6..43e091c5 100755
--- a/bsp/buildroot/board/wandboard/post-build.sh
+++ b/bsp/buildroot/board/wandboard/post-build.sh
@@ -2,7 +2,7 @@
 
 BOARD_DIR="$(dirname $0)"
 
-$HOST_DIR/usr/bin/mkimage -A arm -O linux -T script -C none  \
+$HOST_DIR/bin/mkimage -A arm -O linux -T script -C none  \
 -n "boot script" -d $BOARD_DIR/boot.scr.txt $BOARD_DIR/boot.scr
 
 install -m 0644 -D $BOARD_DIR/boot.scr $TARGET_DIR/boot/boot.scr
diff --git a/bsp/buildroot/board/warp7/linux.fragment b/bsp/buildroot/board/warp7/linux.fragment
deleted file mode 100644
index 892d0cb7..00000000
--- a/bsp/buildroot/board/warp7/linux.fragment
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CFG80211_WEXT=y
diff --git a/bsp/buildroot/board/zynq/genimage.cfg b/bsp/buildroot/board/zynq/genimage.cfg
new file mode 100644
index 00000000..76e61c3a
--- /dev/null
+++ b/bsp/buildroot/board/zynq/genimage.cfg
@@ -0,0 +1,25 @@
+image boot.vfat {
+	vfat {
+		files = {
+			"boot.bin",
+			"u-boot.img",
+			"devicetree.dtb",
+			"uImage"
+		}
+		file uramdisk.image.gz {
+			image = "rootfs.cpio.uboot"
+		}
+	}
+	size = 32M
+}
+
+image sdcard.img {
+	hdimage {
+	}
+
+	partition boot {
+		partition-type = 0xC
+		bootable = "true"
+		image = "boot.vfat"
+	}
+}
diff --git a/bsp/buildroot/board/zynq/post-image.sh b/bsp/buildroot/board/zynq/post-image.sh
new file mode 100755
index 00000000..0cf92e0a
--- /dev/null
+++ b/bsp/buildroot/board/zynq/post-image.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# By default U-Boot loads DTB from a file named "devicetree.dtb", so
+# let's use a symlink with that name that points to the *first*
+# devicetree listed in the config.
+
+FIRST_DT=$(sed -n \
+           's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \
+           ${BR2_CONFIG})
+
+[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/devicetree.dtb
+
+support/scripts/genimage.sh -c board/zynq/genimage.cfg
diff --git a/bsp/buildroot/board/zynq/readme.txt b/bsp/buildroot/board/zynq/readme.txt
index c5506fe9..16273496 100644
--- a/bsp/buildroot/board/zynq/readme.txt
+++ b/bsp/buildroot/board/zynq/readme.txt
@@ -14,13 +14,13 @@ Steps to create a working system for a Zynq board:
     make zynq_microzed_defconfig  (MicroZed)
 2) make
 3) All needed files will be available in the output/images directory.
-   Create a FAT32 partition at the beginning of your SD Card and copy files:
-     - boot.bin
-     - u-boot.img
-     - uImage
-     - uramdisk.image.gz (should be renamed from rootfs.cpio.uboot)
-     - devicetree.dtb (should be renamed from zynq-***.dtb)
-   into your SD card
+   The sdcard.img file is a complete bootable image ready to be written
+   on the boot medium. To install it, simply copy the image to an SD
+   card:
+
+       # dd if=output/images/sdcard.img of=/dev/sdX
+
+   Where 'sdX' is the device node of the uSD.
 4) boot your board
 
 You can alter the booting procedure by creating a file uEnv.txt
diff --git a/bsp/buildroot/boot/Config.in b/bsp/buildroot/boot/Config.in
index 273c1c7a..3687c41a 100644
--- a/bsp/buildroot/boot/Config.in
+++ b/bsp/buildroot/boot/Config.in
@@ -6,11 +6,12 @@ source "boot/at91bootstrap3/Config.in"
 source "boot/at91dataflashboot/Config.in"
 source "boot/arm-trusted-firmware/Config.in"
 source "boot/barebox/Config.in"
+source "boot/binaries-marvell/Config.in"
 source "boot/boot-wrapper-aarch64/Config.in"
-source "boot/grub/Config.in"
 source "boot/grub2/Config.in"
 source "boot/gummiboot/Config.in"
 source "boot/lpc32xxcdl/Config.in"
+source "boot/mv-ddr-marvell/Config.in"
 source "boot/mxs-bootlets/Config.in"
 source "boot/s500-bootloader/Config.in"
 source "boot/syslinux/Config.in"
diff --git a/bsp/buildroot/boot/arm-trusted-firmware/Config.in b/bsp/buildroot/boot/arm-trusted-firmware/Config.in
index 2df82678..7aef87cb 100644
--- a/bsp/buildroot/boot/arm-trusted-firmware/Config.in
+++ b/bsp/buildroot/boot/arm-trusted-firmware/Config.in
@@ -14,7 +14,7 @@ choice
 	  Select the specific ATF version you want to use
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
-	bool "v1.2"
+	bool "v1.4"
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	bool "Custom tarball"
@@ -33,7 +33,7 @@ endif
 
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION
 	string
-	default "v1.2"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
+	default "v1.4"		if BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_VERSION
 	default "custom"	if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL
 	default BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION \
 				if BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT
@@ -56,6 +56,30 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM
 	help
 	  Target plaform to build for.
 
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP
+	bool "Build FIP image"
+	help
+	  This option enables building the FIP image (Firmware Image
+	  Package). This is typically the image format used by
+	  platforms were ATF encapsulates the second stage bootloader
+	  (such as U-Boot).
+
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31
+	bool "Build BL31 image"
+	help
+	  This option enables building the BL31 image. This is
+	  typically used on platforms where another bootloader (e.g
+	  U-Boot) encapsulates ATF BL31.
+
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
+	bool "Use U-Boot as BL33"
+	depends on BR2_TARGET_UBOOT
+	help
+	  This option allows to embed u-boot.bin as the BL33 part of
+	  the ARM Trusted Firmware. It ensures that the u-boot package
+	  gets built before ATF, and that the appropriate BL33
+	  variable pointing to u-boot.bin is passed when building ATF.
+
 config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES
 	string "Additional ATF build variables"
 	help
diff --git a/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash b/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
index e048e012..39407186 100644
--- a/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
+++ b/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 cbdd9b770ec1ab4933fc7f9f520daea5a364bb4dc964820fb017a0cf8c7df556 arm-trusted-firmware-v1.2.tar.gz
-md5 fac2c08bd74337fec2e14a98fc9f748f arm-trusted-firmware-v1.2.tar.gz
+sha256 6dae02acd85278394bfad6e2683e186e5332a711e4491ac4632ad6480f6e5494 arm-trusted-firmware-v1.4.tar.gz
+sha256 487795b8023df866259fa159bab94706b747fb0d623b7913f1c4955c0ab5f164  license.rst
diff --git a/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 5acfab39..4bac916e 100644
--- a/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/bsp/buildroot/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -5,10 +5,8 @@
 ################################################################################
 
 ARM_TRUSTED_FIRMWARE_VERSION = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_VERSION))
-ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3c
-ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.md
-
-ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
+ARM_TRUSTED_FIRMWARE_LICENSE = BSD-3-Clause
+ARM_TRUSTED_FIRMWARE_LICENSE_FILES = license.rst
 
 ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
 # Handle custom ATF tarballs as specified by the configuration
@@ -19,6 +17,7 @@ BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
 else ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT),y)
 ARM_TRUSTED_FIRMWARE_SITE = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL))
 ARM_TRUSTED_FIRMWARE_SITE_METHOD = git
+BR_NO_CHECK_HASH_FOR += $(ARM_TRUSTED_FIRMWARE_SOURCE)
 else
 ARM_TRUSTED_FIRMWARE_SITE = $(call github,ARM-software,arm-trusted-firmware,$(ARM_TRUSTED_FIRMWARE_VERSION))
 endif
@@ -29,27 +28,64 @@ ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_
 
 ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
-	BL33=$(BINARIES_DIR)/u-boot.bin \
 	$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
-	PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
-	all fip
+	PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
+
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y)
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin
+ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot
+endif
 
 ifeq ($(BR2_TARGET_VEXPRESS_FIRMWARE),y)
 ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SCP_BL2=$(BINARIES_DIR)/scp-fw.bin
 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += vexpress-firmware
 endif
 
+ifeq ($(BR2_TARGET_BINARIES_MARVELL),y)
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SCP_BL2=$(BINARIES_DIR)/scp-fw.bin
+ARM_TRUSTED_FIRMWARE_DEPENDENCIES += binaries-marvell
+endif
+
+ifeq ($(BR2_TARGET_MV_DDR_MARVELL),y)
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += MV_DDR_PATH=$(MV_DDR_MARVELL_DIR)
+ARM_TRUSTED_FIRMWARE_DEPENDENCIES += mv-ddr-marvell
+endif
+
+ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all
+
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP),y)
+ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += fip
+ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-openssl
+# fiptool only exists in newer (>= 1.3) versions of ATF, so we build
+# it conditionally. We need to explicitly build it as it requires
+# OpenSSL, and therefore needs to be passed proper variables to find
+# the host OpenSSL.
+define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL
+	if test -d $(@D)/tools/fiptool; then \
+		$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/fiptool \
+			$(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
+			CPPFLAGS="$(HOST_CPPFLAGS)" \
+			LDLIBS="$(HOST_LDFLAGS) -lcrypto" ; \
+	fi
+endef
+endif
+
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y)
+ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31
+endif
+
 define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
+	$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
 	$(TARGET_CONFIGURE_OPTS) \
 		$(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
-			$(ARM_TRUSTED_FIRMWARE_MAKE_TARGET)
+			$(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
 endef
 
 define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS
 	cp -dpf $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release/*.bin $(BINARIES_DIR)/
 endef
 
-# Configuration ckeck
+# Configuration check
 ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE)$(BR_BUILDING),yy)
 
 ifeq ($(ARM_TRUSTED_FIRMWARE_VERSION),custom)
diff --git a/bsp/buildroot/boot/at91bootstrap3/Config.in b/bsp/buildroot/boot/at91bootstrap3/Config.in
index 237deb92..f82a0e5e 100644
--- a/bsp/buildroot/boot/at91bootstrap3/Config.in
+++ b/bsp/buildroot/boot/at91bootstrap3/Config.in
@@ -8,6 +8,8 @@ config BR2_TARGET_AT91BOOTSTRAP3
 	  - Peripheral drivers such as PIO, PMC or SDRAMC...
 	  - Physical media algorithm such as DataFlash, NandFlash, NOR Flash...
 
+	  https://www.at91.com/linux4sam/bin/view/Linux4SAM/AT91Bootstrap
+
 if BR2_TARGET_AT91BOOTSTRAP3
 
 choice
diff --git a/bsp/buildroot/boot/at91bootstrap3/at91bootstrap3.mk b/bsp/buildroot/boot/at91bootstrap3/at91bootstrap3.mk
index 32732f47..685be5bb 100644
--- a/bsp/buildroot/boot/at91bootstrap3/at91bootstrap3.mk
+++ b/bsp/buildroot/boot/at91bootstrap3/at91bootstrap3.mk
@@ -9,6 +9,7 @@ AT91BOOTSTRAP3_VERSION = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_VERSION))
 ifeq ($(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT),y)
 AT91BOOTSTRAP3_SITE = $(call qstrip,$(BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL))
 AT91BOOTSTRAP3_SITE_METHOD = git
+BR_NO_CHECK_HASH_FOR += $(AT91BOOTSTRAP3_SOURCE)
 else
 AT91BOOTSTRAP3_SITE = $(call github,linux4sam,at91bootstrap,$(AT91BOOTSTRAP3_VERSION))
 endif
diff --git a/bsp/buildroot/boot/barebox/Config.in b/bsp/buildroot/boot/barebox/Config.in
index e6ecd821..fd22d904 100644
--- a/bsp/buildroot/boot/barebox/Config.in
+++ b/bsp/buildroot/boot/barebox/Config.in
@@ -12,7 +12,7 @@ choice
 	  Select the specific Barebox version you want to use
 
 config BR2_TARGET_BAREBOX_LATEST_VERSION
-	bool "2017.01.0"
+	bool "2017.09.0"
 
 config BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	bool "Custom version"
@@ -40,7 +40,7 @@ endif
 
 config BR2_TARGET_BAREBOX_VERSION
 	string
-	default "2017.01.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
+	default "2017.09.0"	if BR2_TARGET_BAREBOX_LATEST_VERSION
 	default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
 	default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
diff --git a/bsp/buildroot/boot/barebox/barebox-aux/Config.in b/bsp/buildroot/boot/barebox/barebox-aux/Config.in
index ec3b97cb..d39d24f7 100644
--- a/bsp/buildroot/boot/barebox/barebox-aux/Config.in
+++ b/bsp/buildroot/boot/barebox/barebox-aux/Config.in
@@ -30,9 +30,9 @@ config BR2_TARGET_BAREBOX_AUX_CONFIG_FRAGMENT_FILES
 	  that will be merged to the main Barebox configuration file.
 
 config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE
-	string "Image filename"
+	string "Image file names"
 	help
-	  Name of the generated barebox image, which will be copied to
+	  Space-separated list of barebox images which will be copied to
 	  the images directory.
 
 	  If left empty, defaults to:
diff --git a/bsp/buildroot/boot/barebox/barebox.hash b/bsp/buildroot/boot/barebox/barebox.hash
index f769c1d8..b2419702 100644
--- a/bsp/buildroot/boot/barebox/barebox.hash
+++ b/bsp/buildroot/boot/barebox/barebox.hash
@@ -1,5 +1,5 @@
-# http://www.barebox.org/download/barebox-2017.01.0.tar.bz2.md5
-md5 d2933437885497b09d69d6e6f4beeffc  barebox-2017.01.0.tar.bz2
+# http://www.barebox.org/download/barebox-2017.09.0.tar.bz2.md5
+md5 b92e9c99cda7fbb61d01baf5679df261 barebox-2017.09.0.tar.bz2
 
 # Locally calculated
-sha256 ca4cc06bdc7183e3fcb4bed300f1e820df1e022a7b86fdcf64205ddb6a103567  barebox-2017.01.0.tar.bz2
+sha256 43283edc019f95a53fdb7d1b7c294afc4741bfcace348d6beeded5fe5147a81b barebox-2017.09.0.tar.bz2
diff --git a/bsp/buildroot/boot/barebox/barebox.mk b/bsp/buildroot/boot/barebox/barebox.mk
index 7a110d21..b811e322 100644
--- a/bsp/buildroot/boot/barebox/barebox.mk
+++ b/bsp/buildroot/boot/barebox/barebox.mk
@@ -22,7 +22,6 @@ ifeq ($$($(1)_VERSION),custom)
 $(1)_TARBALL = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_TARBALL_LOCATION))
 $(1)_SITE = $$(patsubst %/,%,$$(dir $$($(1)_TARBALL)))
 $(1)_SOURCE = $$(notdir $$($(1)_TARBALL))
-BR_NO_CHECK_HASH_FOR += $$($(1)_SOURCE)
 else ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_GIT),y)
 $(1)_SITE = $$(call qstrip,$$(BR2_TARGET_BAREBOX_CUSTOM_GIT_REPO_URL))
 $(1)_SITE_METHOD = git
@@ -30,13 +29,10 @@ else
 # Handle stable official Barebox versions
 $(1)_SOURCE = barebox-$$($(1)_VERSION).tar.bz2
 $(1)_SITE = http://www.barebox.org/download
-ifeq ($$(BR2_TARGET_BAREBOX_CUSTOM_VERSION),y)
-BR_NO_CHECK_HASH_FOR += $$($(1)_SOURCE)
-endif
 endif
 
 $(1)_DEPENDENCIES = host-lzop
-$(1)_LICENSE = GPLv2 with exceptions
+$(1)_LICENSE = GPL-2.0 with exceptions
 $(1)_LICENSE_FILES = COPYING
 
 $(1)_CUSTOM_EMBEDDED_ENV_PATH = $$(call qstrip,$$(BR2_TARGET_$(1)_CUSTOM_EMBEDDED_ENV_PATH))
@@ -113,11 +109,11 @@ define $(1)_BUILD_CMDS
 	$$($(1)_BUILD_CUSTOM_ENV)
 endef
 
-$(1)_IMAGE_FILE = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE))
+$(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE))
 
 define $(1)_INSTALL_IMAGES_CMDS
-	if test -n "$$($(1)_IMAGE_FILE)"; then \
-		cp -L $$(@D)/$$($(1)_IMAGE_FILE) $$(BINARIES_DIR) ; \
+	if test -n "$$($(1)_IMAGE_FILES)"; then \
+		cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \
 	elif test -h $$(@D)/barebox-flash-image ; then \
 		cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \
 	else \
@@ -155,3 +151,7 @@ barebox-package=$(call inner-barebox-package,$(call UPPERCASE,$(pkgname)))
 
 include boot/barebox/barebox/barebox.mk
 include boot/barebox/barebox-aux/barebox-aux.mk
+
+ifeq ($(BR2_TARGET_BAREBOX)$(BR2_TARGET_BAREBOX_LATEST_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(BAREBOX_SOURCE)
+endif
diff --git a/bsp/buildroot/boot/barebox/barebox/Config.in b/bsp/buildroot/boot/barebox/barebox/Config.in
index 3d8d0145..0be26adf 100644
--- a/bsp/buildroot/boot/barebox/barebox/Config.in
+++ b/bsp/buildroot/boot/barebox/barebox/Config.in
@@ -31,9 +31,9 @@ config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES
 	  that will be merged to the main Barebox configuration file.
 
 config BR2_TARGET_BAREBOX_IMAGE_FILE
-	string "Image filename"
+	string "Image file names"
 	help
-	  Name of the generated barebox image, which will be copied to
+	  Space-separated list of barebox images which will be copied to
 	  the images directory.
 
 	  If left empty, defaults to:
diff --git a/bsp/buildroot/boot/binaries-marvell/Config.in b/bsp/buildroot/boot/binaries-marvell/Config.in
new file mode 100644
index 00000000..d565e4db
--- /dev/null
+++ b/bsp/buildroot/boot/binaries-marvell/Config.in
@@ -0,0 +1,32 @@
+config BR2_TARGET_BINARIES_MARVELL
+	bool "binaries-marvell"
+	depends on BR2_aarch64
+	help
+	  Some systems, including Marvell Armada SoC, have a separate
+	  System Control Processor (SCP) for power management, clocks,
+	  reset and system control. ATF Boot Loader stage 2 (BL2) loads
+	  optional SCP_BL2 image into a platform-specific region
+	  of secure memory. This package downloads and installs such
+	  firmwares, which are needed to build ATF.
+
+	  https://github.com/MarvellEmbeddedProcessors/binaries-marvell/
+
+if BR2_TARGET_BINARIES_MARVELL
+
+choice
+	prompt "Marvell Armada platform"
+
+config BR2_TARGET_BINARIES_MARVELL_7040
+	bool "7040"
+
+config BR2_TARGET_BINARIES_MARVELL_8040
+	bool "8040"
+
+endchoice
+
+config BR2_TARGET_BINARIES_MARVELL_IMAGE
+	string
+	default "mrvl_scp_bl2_8040.img" if BR2_TARGET_BINARIES_MARVELL_8040
+	default "mrvl_scp_bl2_7040.img" if BR2_TARGET_BINARIES_MARVELL_7040
+
+endif
diff --git a/bsp/buildroot/boot/binaries-marvell/binaries-marvell.hash b/bsp/buildroot/boot/binaries-marvell/binaries-marvell.hash
new file mode 100644
index 00000000..94c66039
--- /dev/null
+++ b/bsp/buildroot/boot/binaries-marvell/binaries-marvell.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 7c41cddc2ce46038b630b59d2e9e50e903d27032bcfbf38019eaed14fcfdbe40 binaries-marvell-a8ac27b7884ed2c1efcf9f3326de3e0ed7b94e91.tar.gz
+sha256 d8560ab4ea4042a55eee6857ded1d7e4bca2d9120b8c7a86d2a7fdc4ba4994e0	README.md
diff --git a/bsp/buildroot/boot/binaries-marvell/binaries-marvell.mk b/bsp/buildroot/boot/binaries-marvell/binaries-marvell.mk
new file mode 100644
index 00000000..152c9cd9
--- /dev/null
+++ b/bsp/buildroot/boot/binaries-marvell/binaries-marvell.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# binaries-marvell
+#
+################################################################################
+
+BINARIES_MARVELL_VERSION = a8ac27b7884ed2c1efcf9f3326de3e0ed7b94e91
+BINARIES_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,binaries-marvell,$(BINARIES_MARVELL_VERSION))
+
+BINARIES_MARVELL_LICENSE = GPL-2.0 with freertos-exception-2.0
+BINARIES_MARVELL_LICENSE_FILES = README.md
+
+BINARIES_MARVELL_IMAGE = $(call qstrip,$(BR2_TARGET_BINARIES_MARVELL_IMAGE))
+BINARIES_MARVELL_INSTALL_IMAGES  = YES
+
+define BINARIES_MARVELL_INSTALL_IMAGES_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/$(BINARIES_MARVELL_IMAGE) $(BINARIES_DIR)/scp-fw.bin
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk b/bsp/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
index 601cfab3..cd6e1b7b 100644
--- a/bsp/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
+++ b/bsp/buildroot/boot/boot-wrapper-aarch64/boot-wrapper-aarch64.mk
@@ -6,7 +6,7 @@
 
 BOOT_WRAPPER_AARCH64_VERSION = 4266507a84f8c06452109d38e0350d4759740694
 BOOT_WRAPPER_AARCH64_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/mark/boot-wrapper-aarch64.git
-BOOT_WRAPPER_AARCH64_LICENSE = BSD3c
+BOOT_WRAPPER_AARCH64_LICENSE = BSD-3-Clause
 BOOT_WRAPPER_AARCH64_LICENSE_FILES = LICENSE.txt
 BOOT_WRAPPER_AARCH64_DEPENDENCIES = linux
 BOOT_WRAPPER_AARCH64_INSTALL_IMAGES = YES
diff --git a/bsp/buildroot/boot/grub/Config.in b/bsp/buildroot/boot/grub/Config.in
deleted file mode 100644
index 4db8642a..00000000
--- a/bsp/buildroot/boot/grub/Config.in
+++ /dev/null
@@ -1,200 +0,0 @@
-config BR2_TARGET_GRUB
-	bool "grub"
-	depends on BR2_i386 || BR2_x86_64
-	select BR2_HOSTARCH_NEEDS_IA32_COMPILER
-	help
-	  The GRand Unified Bootloader for x86 systems.
-
-	  Some notes on creating a disk image with Grub installed:
-	    1. Create an empty disk image
-	       dd if=/dev/zero of=disk.img bs=1M count=32
-	    2. Create one primary partition
-	       cfdisk -h 16 -s 63 disk.img
-	    3. Set up a loop device
-	       sudo losetup -f disk.img
-	    4. Set up loop devices per partitions
-	       sudo partx -a /dev/loop0
-	    5. Create the ext2 filesystem
-	       sudo mkfs.ext2 -L root /dev/loop0p1
-	    6. Mount the filesystem
-	       mount /dev/loop0p1 /mnt
-	    7. Extract the root filesystem
-	       sudo tar -C /mnt -xf output/images/rootfs.tar
-	    8. Unmount the filesystem, clean up loop device
-	       sudo umount /mnt
-	       sudo partx -d /dev/loop0
-	       sudo losetup -d /dev/loop0
-	    9. Install grub
-	       output/host/sbin/grub --device-map=/dev/null
-	       and in the grub shell, enter:
-		device (hd0) disk.img
-		geometry (hd0) <cylinders> 16 63
-		root (hd0,0)
-		setup (hd0)
-	    10. Image is ready
-		Can be tested in Qemu, with:
-		  qemu-system-{i386,x86-64} -hda disk.img
-
-if BR2_TARGET_GRUB
-
-config BR2_TARGET_GRUB_SPLASH
-	bool "Splashimage support"
-	help
-	  Add support for splashimage.
-
-	  A splashimage is a 14-color indexed .xpm picture which is
-	  displayed as background for the grub menu. See
-	  http://www.katspace.org/computers/Grub_Splash/ for details
-	  on how to generate a splashimage.
-
-config BR2_TARGET_GRUB_DISKLESS
-	bool "diskless support"
-	help
-	  enable diskless support
-
-menu "filesystem drivers"
-
-config BR2_TARGET_GRUB_FS_EXT2
-	bool "ext2"
-	default y
-	help
-	  Enable support for the ext2 filesystem in Grub
-
-config BR2_TARGET_GRUB_FS_FAT
-	bool "FAT"
-	default y
-	help
-	  Enable support for the FAT filesystem in Grub.
-
-config BR2_TARGET_GRUB_FS_ISO9660
-	bool "ISO9660"
-	help
-	  Enable support for the ISO9660 filesystem in Grub.
-
-config BR2_TARGET_GRUB_FS_JFS
-	bool "IBM JFS"
-	help
-	  Enable support for the JFS filesystem in Grub.
-
-config BR2_TARGET_GRUB_FS_REISERFS
-	bool "ReiserFS"
-	help
-	  Enable support for the ReiserFS filesystem in Grub.
-
-config BR2_TARGET_GRUB_FS_XFS
-	bool "SGI XFS"
-	help
-	  Enable support for the XFS filesystem in Grub.
-
-endmenu
-
-menu "network drivers"
-
-config BR2_TARGET_GRUB_3c595
-	bool "3Com595 driver"
-	help
-	  enable 3Com595 driver
-
-config BR2_TARGET_GRUB_3c90x
-	bool "3Com90x driver"
-	help
-	  enable 3Com90x driver
-
-config BR2_TARGET_GRUB_davicom
-	bool "Davicom driver"
-	help
-	  enable Davicom driver
-
-config BR2_TARGET_GRUB_e1000
-	bool "Etherexpress Pro/1000 driver"
-	help
-	  enable Etherexpress Pro/1000 driver
-
-config BR2_TARGET_GRUB_eepro100
-	bool "Etherexpress Pro/100 driver"
-	help
-	  enable Etherexpress Pro/100 driver
-
-config BR2_TARGET_GRUB_epic100
-	bool "SMC 83c170 EPIC/100 driver"
-	help
-	  enable SMC 83c170 EPIC/100 driver
-
-config BR2_TARGET_GRUB_forcedeth
-	bool "Nvidia Geforce driver"
-	help
-	  enable Nvidia Geforce driver
-
-config BR2_TARGET_GRUB_natsemi
-	bool "NatSemi DP8381x driver"
-	help
-	  enable NatSemi DP8381x driver
-
-config BR2_TARGET_GRUB_ns83820
-	bool "NS83820 driver"
-	help
-	  enable NS83820 driver
-
-config BR2_TARGET_GRUB_ns8390
-	bool "NE2000 PCI driver"
-	help
-	  enable NE2000 PCI driver
-
-config BR2_TARGET_GRUB_pcnet32
-	bool "AMD Lance/PCI PCNet/32 driver"
-	help
-	  enable AMD Lance/PCI PCNet/32 driver
-
-config BR2_TARGET_GRUB_pnic
-	bool "Bochs Pseudo Nic driver"
-	help
-	  enable Bochs Pseudo Nic driver
-
-config BR2_TARGET_GRUB_rtl8139
-	bool "Realtek 8139 driver"
-	help
-	  enable Realtek 8139 driver
-
-config BR2_TARGET_GRUB_r8169
-	bool "Realtek 8169 driver"
-	help
-	  enable Realtek 8169 driver
-
-config BR2_TARGET_GRUB_sis900
-	bool "SIS 900 and SIS 7016 driver"
-	help
-	  enable SIS 900 and SIS 7016 driver
-
-config BR2_TARGET_GRUB_tg3
-	bool "Broadcom Tigon3 driver"
-	help
-	  enable Broadcom Tigon3 driver
-
-config BR2_TARGET_GRUB_tulip
-	bool "Tulip driver"
-	help
-	  enable Tulip driver
-
-config BR2_TARGET_GRUB_tlan
-	bool "TI ThunderLAN driver"
-	help
-	  enable TI ThunderLAN driver
-
-config BR2_TARGET_GRUB_undi
-	bool "PXE UNDI driver"
-	help
-	  enable PXE UNDI driver
-
-config BR2_TARGET_GRUB_via_rhine
-	bool "Rhine-I/II driver"
-	help
-	  enable Rhine-I/II driver
-
-config BR2_TARGET_GRUB_w89c840
-	bool "Winbond W89c840 driver"
-	help
-	  enable Winbond W89c840 driver
-
-endmenu
-
-endif # BR2_TARGET_GRUB
diff --git a/bsp/buildroot/boot/grub/grub.100-autoreconf.patch b/bsp/buildroot/boot/grub/grub.100-autoreconf.patch
deleted file mode 100644
index e5dd8343..00000000
--- a/bsp/buildroot/boot/grub/grub.100-autoreconf.patch
+++ /dev/null
@@ -1,1407 +0,0 @@
-diff -rup grub-0.97.oorig/aclocal.m4 grub-0.97/aclocal.m4
---- grub-0.97.oorig/aclocal.m4	2005-05-08 04:41:18.000000000 +0200
-+++ grub-0.97/aclocal.m4	2006-03-12 14:00:35.000000000 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--#                                                        -*- Autoconf -*-
--# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.4])])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -106,26 +83,16 @@ AC_PREREQ([2.50])dnl
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# AM_CONDITIONAL                                              -*- Autoconf -*-
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 6
-+# serial 7
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@ AC_CONFIG_COMMANDS_PRE(
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# serial 7						-*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
- 
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
-@@ -177,7 +133,6 @@ fi])])
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_
- AC_SUBST([AMDEPBACKSLASH])
- ])
- 
--# Generate code to set up dependency tracking.   -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--#   Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--#serial 2
-+#serial 3
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,30 +340,19 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Do all the work for Automake.                            -*- Autoconf -*-
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--# This macro actually does too much some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
- 
--# serial 11
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
- 
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -521,51 +454,27 @@ for _am_header in $config_headers :; do
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
- 
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
--#                                                          -*- Autoconf -*-
--# Copyright (C) 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 1
-+# serial 2
- 
- # Check whether the underlying file-system supports filenames
- # with a leading dot.  For instance MS-DOS doesn't.
-@@ -580,28 +489,17 @@ fi
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
--# Add --enable-maintainer-mode option to configure.
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
- # From Jim Meyering
- 
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
- 
- AC_DEFUN([AM_MAINTAINER_MODE],
- [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-@@ -620,26 +518,15 @@ AC_DEFUN([AM_MAINTAINER_MODE],
- 
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 3
- 
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -683,27 +570,16 @@ AC_MSG_RESULT([$_am_result])
- rm -f confinc confmf
- ])
- 
--#  -*- Autoconf -*-
--
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 4
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -729,27 +605,16 @@ else
- fi
- ])
- 
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
- # created by `make install' are always world readable, even if the
- # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -803,26 +668,15 @@ else
- fi
- AC_SUBST([mkdir_p])])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
-+# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# serial 3
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -847,28 +701,16 @@ AC_DEFUN([_AM_SET_OPTIONS],
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 4
- 
- # AM_SANITY_CHECK
- # ---------------
-@@ -911,25 +753,14 @@ Check your system clock])
- fi
- AC_MSG_RESULT(yes)])
- 
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries.  This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -952,25 +783,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
--# Copyright (C) 2004  Free Software Foundation, Inc.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 2
- 
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-Only in grub-0.97/: autom4te.cache
-diff -rup grub-0.97.oorig/configure grub-0.97/configure
---- grub-0.97.oorig/configure	2005-05-08 04:48:12.000000000 +0200
-+++ grub-0.97/configure	2006-03-12 14:00:38.000000000 +0100
-@@ -311,7 +311,7 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE GRAPHICS_SUPPORT_TRUE GRAPHICS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -914,6 +914,7 @@ Optional Features:
-                           set the default memory location for WD/SMC
-   --enable-cs-scan=LIST   probe for CS89x0 base address using LIST
-   --enable-diskless       enable diskless support
-+  --disable-graphics      disable graphics terminal support
-   --disable-hercules      disable hercules terminal support
-   --disable-serial        disable serial terminal support
-   --enable-serial-speed-simulation
-@@ -1032,7 +1033,7 @@ esac
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd $ac_popdir
-+    cd "$ac_popdir"
-   done
- fi
- 
-@@ -2631,8 +2632,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2690,8 +2690,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2807,8 +2806,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2862,8 +2860,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2908,8 +2905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -2953,8 +2949,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3458,8 +3453,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3523,8 +3517,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3595,8 +3588,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -3656,8 +3648,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4095,8 +4086,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4161,8 +4151,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4234,8 +4223,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4300,8 +4288,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4366,8 +4353,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4440,8 +4426,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4506,8 +4491,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4597,8 +4581,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4673,8 +4656,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -4745,8 +4727,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5070,8 +5051,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5241,8 +5221,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5313,8 +5292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
-+	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-@@ -5966,6 +5944,22 @@ else
- fi
- 
- 
-+# Check whether --enable-graphics or --disable-graphics was given.
-+if test "${enable_graphics+set}" = set; then
-+  enableval="$enable_graphics"
-+
-+fi;
-+
-+
-+if test "x$enable_graphics" != xno; then
-+  GRAPHICS_SUPPORT_TRUE=
-+  GRAPHICS_SUPPORT_FALSE='#'
-+else
-+  GRAPHICS_SUPPORT_TRUE='#'
-+  GRAPHICS_SUPPORT_FALSE=
-+fi
-+
-+
- # Check whether --enable-hercules or --disable-hercules was given.
- if test "${enable_hercules+set}" = set; then
-   enableval="$enable_hercules"
-@@ -6270,6 +6264,13 @@ echo "$as_me: error: conditional \"DISKL
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${GRAPHICS_SUPPORT_TRUE}" && test -z "${GRAPHICS_SUPPORT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${HERCULES_SUPPORT_TRUE}" && test -z "${HERCULES_SUPPORT_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HERCULES_SUPPORT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -6907,6 +6908,8 @@ s,@NETBOOT_SUPPORT_TRUE@,$NETBOOT_SUPPOR
- s,@NETBOOT_SUPPORT_FALSE@,$NETBOOT_SUPPORT_FALSE,;t t
- s,@DISKLESS_SUPPORT_TRUE@,$DISKLESS_SUPPORT_TRUE,;t t
- s,@DISKLESS_SUPPORT_FALSE@,$DISKLESS_SUPPORT_FALSE,;t t
-+s,@GRAPHICS_SUPPORT_TRUE@,$GRAPHICS_SUPPORT_TRUE,;t t
-+s,@GRAPHICS_SUPPORT_FALSE@,$GRAPHICS_SUPPORT_FALSE,;t t
- s,@HERCULES_SUPPORT_TRUE@,$HERCULES_SUPPORT_TRUE,;t t
- s,@HERCULES_SUPPORT_FALSE@,$HERCULES_SUPPORT_FALSE,;t t
- s,@SERIAL_SUPPORT_TRUE@,$SERIAL_SUPPORT_TRUE,;t t
-@@ -7088,11 +7091,6 @@ esac
-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-   esac
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
-   # Let's still pretend it is `configure' which instantiates (i.e., don't
-   # use $as_me), people would be surprised to read:
-   #    /* config.h.  Generated by config.status.  */
-@@ -7131,6 +7129,12 @@ echo "$as_me: error: cannot find input f
- 	 fi;;
-       esac
-     done` || { (exit 1); exit 1; }
-+
-+  if test x"$ac_file" != x-; then
-+    { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+    rm -f "$ac_file"
-+  fi
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
-diff -rup grub-0.97.oorig/docs/Makefile.in grub-0.97/docs/Makefile.in
---- grub-0.97.oorig/docs/Makefile.in	2005-05-08 04:42:34.000000000 +0200
-+++ grub-0.97/docs/Makefile.in	2006-03-12 14:00:43.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(kernel_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -120,6 +118,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -304,9 +304,11 @@ kernel-kernel.obj: kernel.c
- 	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
- 	am__cwd=`pwd` && cd $(srcdir) && \
- 	rm -rf $$backupdir && mkdir $$backupdir && \
--	for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
--	  if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
--	done; \
-+	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-+	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-+	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-+	  done; \
-+	else :; fi && \
- 	cd "$$am__cwd"; \
- 	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
- 	 -o $@ $<; \
-@@ -371,10 +373,11 @@ multiboot.dvi: multiboot.texi $(multiboo
- multiboot.pdf: multiboot.texi $(multiboot_TEXINFOS)
- multiboot.html: multiboot.texi $(multiboot_TEXINFOS)
- .dvi.ps:
-+	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- 	$(DVIPS) -o $@ $<
- 
- uninstall-info-am:
--	$(PRE_UNINSTALL)
-+	@$(PRE_UNINSTALL)
- 	@if (install-info --version && \
- 	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
- 	  list='$(INFO_DEPS)'; \
-@@ -390,7 +393,7 @@ uninstall-info-am:
- 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
- 	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
- 	  (if cd "$(DESTDIR)$(infodir)"; then \
--	     echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9])"; \
-+	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
- 	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
- 	   else :; fi); \
- 	done
-@@ -403,10 +406,13 @@ dist-info: $(INFO_DEPS)
- 	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
- 	  esac; \
- 	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
--	  for file in $$d/$$base*; do \
--	    relfile=`expr "$$file" : "$$d/\(.*\)"`; \
--	    test -f $(distdir)/$$relfile || \
--	      cp -p $$file $(distdir)/$$relfile; \
-+	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
-+	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
-+	    if test -f $$file; then \
-+	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
-+	      test -f $(distdir)/$$relfile || \
-+		cp -p $$file $(distdir)/$$relfile; \
-+	    else :; fi; \
- 	  done; \
- 	done
- 
-diff -rup grub-0.97.oorig/grub/Makefile.in grub-0.97/grub/Makefile.in
---- grub-0.97.oorig/grub/Makefile.in	2005-05-08 04:42:34.000000000 +0200
-+++ grub-0.97/grub/Makefile.in	2006-03-12 14:00:43.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(grub_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/lib/Makefile.in grub-0.97/lib/Makefile.in
---- grub-0.97.oorig/lib/Makefile.in	2005-05-08 04:42:35.000000000 +0200
-+++ grub-0.97/lib/Makefile.in	2006-03-12 14:00:44.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libcommon_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -96,6 +94,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/Makefile.in grub-0.97/Makefile.in
---- grub-0.97.oorig/Makefile.in	2005-05-08 04:42:40.000000000 +0200
-+++ grub-0.97/Makefile.in	2006-03-12 14:00:49.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -101,6 +101,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -250,7 +252,13 @@ uninstall-info-am:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -262,7 +270,7 @@ $(RECURSIVE_TARGETS):
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -270,7 +278,13 @@ $(RECURSIVE_TARGETS):
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -291,7 +305,7 @@ maintainer-clean-recursive:
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-diff -rup grub-0.97.oorig/netboot/Makefile.in grub-0.97/netboot/Makefile.in
---- grub-0.97.oorig/netboot/Makefile.in	2005-05-08 04:42:35.000000000 +0200
-+++ grub-0.97/netboot/Makefile.in	2006-03-12 14:00:44.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,8 +14,6 @@
- 
- @SET_MAKE@
- 
--SOURCES = $(libdrivers_a_SOURCES) $(EXTRA_libdrivers_a_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -97,6 +95,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/stage1/Makefile.in grub-0.97/stage1/Makefile.in
---- grub-0.97.oorig/stage1/Makefile.in	2005-05-08 04:42:36.000000000 +0200
-+++ grub-0.97/stage1/Makefile.in	2006-03-12 14:00:45.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(stage1_exec_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -102,6 +100,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-diff -rup grub-0.97.oorig/stage2/Makefile.in grub-0.97/stage2/Makefile.in
---- grub-0.97.oorig/stage2/Makefile.in	2005-05-08 04:42:39.000000000 +0200
-+++ grub-0.97/stage2/Makefile.in	2006-03-12 14:00:48.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -18,8 +18,6 @@
- 
- 
- 
--SOURCES = $(libgrub_a_SOURCES) $(diskless_exec_SOURCES) $(e2fs_stage1_5_exec_SOURCES) $(fat_stage1_5_exec_SOURCES) $(ffs_stage1_5_exec_SOURCES) $(iso9660_stage1_5_exec_SOURCES) $(jfs_stage1_5_exec_SOURCES) $(minix_stage1_5_exec_SOURCES) $(nbloader_exec_SOURCES) $(pre_stage2_exec_SOURCES) $(pxeloader_exec_SOURCES) $(reiserfs_stage1_5_exec_SOURCES) $(start_exec_SOURCES) $(start_eltorito_exec_SOURCES) $(ufs2_stage1_5_exec_SOURCES) $(vstafs_stage1_5_exec_SOURCES) $(xfs_stage1_5_exec_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -100,7 +98,7 @@ am_libgrub_a_OBJECTS = libgrub_a-boot.$(
- 	libgrub_a-fsys_xfs.$(OBJEXT) libgrub_a-gunzip.$(OBJEXT) \
- 	libgrub_a-md5.$(OBJEXT) libgrub_a-serial.$(OBJEXT) \
- 	libgrub_a-stage2.$(OBJEXT) libgrub_a-terminfo.$(OBJEXT) \
--	libgrub_a-tparm.$(OBJEXT)
-+	libgrub_a-tparm.$(OBJEXT) libgrub_a-graphics.$(OBJEXT)
- libgrub_a_OBJECTS = $(am_libgrub_a_OBJECTS)
- PROGRAMS = $(noinst_PROGRAMS)
- am__objects_1 = diskless_exec-asm.$(OBJEXT) \
-@@ -125,7 +123,8 @@ am__objects_1 = diskless_exec-asm.$(OBJE
- 	diskless_exec-serial.$(OBJEXT) \
- 	diskless_exec-smp-imps.$(OBJEXT) \
- 	diskless_exec-stage2.$(OBJEXT) \
--	diskless_exec-terminfo.$(OBJEXT) diskless_exec-tparm.$(OBJEXT)
-+	diskless_exec-terminfo.$(OBJEXT) diskless_exec-tparm.$(OBJEXT) \
-+	diskless_exec-graphics.$(OBJEXT)
- am_diskless_exec_OBJECTS = $(am__objects_1)
- diskless_exec_OBJECTS = $(am_diskless_exec_OBJECTS)
- diskless_exec_DEPENDENCIES = ../netboot/libdrivers.a
-@@ -217,7 +216,8 @@ am_pre_stage2_exec_OBJECTS = pre_stage2_
- 	pre_stage2_exec-smp-imps.$(OBJEXT) \
- 	pre_stage2_exec-stage2.$(OBJEXT) \
- 	pre_stage2_exec-terminfo.$(OBJEXT) \
--	pre_stage2_exec-tparm.$(OBJEXT)
-+	pre_stage2_exec-tparm.$(OBJEXT) \
-+	pre_stage2_exec-graphics.$(OBJEXT)
- pre_stage2_exec_OBJECTS = $(am_pre_stage2_exec_OBJECTS)
- @NETBOOT_SUPPORT_TRUE@pre_stage2_exec_DEPENDENCIES =  \
- @NETBOOT_SUPPORT_TRUE@	../netboot/libdrivers.a
-@@ -344,6 +344,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
-@@ -435,7 +437,7 @@ noinst_HEADERS = apic.h defs.h dir.h dis
-         fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
- 	imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
- 	nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
--	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h
-+	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h
- 
- EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
- 
-@@ -448,7 +450,7 @@ libgrub_a_SOURCES = boot.c builtins.c ch
- 	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
- 	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
- 	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
--	terminfo.c tparm.c
-+	terminfo.c tparm.c graphics.c
- 
- libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
- 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
-@@ -479,8 +481,10 @@ START_ELTORITO_LINK = -nostdlib -Wl,-N -
- @SERIAL_SUPPORT_TRUE@SERIAL_FLAGS = -DSUPPORT_SERIAL=1
- @HERCULES_SUPPORT_FALSE@HERCULES_FLAGS = 
- @HERCULES_SUPPORT_TRUE@HERCULES_FLAGS = -DSUPPORT_HERCULES=1
-+@GRAPHICS_SUPPORT_FALSE@GRAPHICS_FLAGS = 
-+@GRAPHICS_SUPPORT_TRUE@GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1
- STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
-+	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
- 
- STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
- STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
-@@ -490,7 +494,8 @@ pre_stage2_exec_SOURCES = asm.S bios.c b
- 	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
- 	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
- 	fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
--	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c
-+	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \
-+	graphics.c
- 
- pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
- pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
-@@ -766,6 +771,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_ufs2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_vstafs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-fsys_xfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-graphics.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-gunzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-hercules.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskless_exec-md5.Po@am__quote@
-@@ -820,6 +826,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_ufs2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_vstafs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-fsys_xfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-graphics.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-gunzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-md5.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgrub_a-serial.Po@am__quote@
-@@ -850,6 +857,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_ufs2.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_vstafs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-fsys_xfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-graphics.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-gunzip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-hercules.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pre_stage2_exec-md5.Po@am__quote@
-@@ -1367,6 +1375,20 @@ libgrub_a-tparm.obj: tparm.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
- 
-+libgrub_a-graphics.o: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -MT libgrub_a-graphics.o -MD -MP -MF "$(DEPDIR)/libgrub_a-graphics.Tpo" -c -o libgrub_a-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgrub_a-graphics.Tpo" "$(DEPDIR)/libgrub_a-graphics.Po"; else rm -f "$(DEPDIR)/libgrub_a-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='libgrub_a-graphics.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
-+
-+libgrub_a-graphics.obj: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -MT libgrub_a-graphics.obj -MD -MP -MF "$(DEPDIR)/libgrub_a-graphics.Tpo" -c -o libgrub_a-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libgrub_a-graphics.Tpo" "$(DEPDIR)/libgrub_a-graphics.Po"; else rm -f "$(DEPDIR)/libgrub_a-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='libgrub_a-graphics.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgrub_a_CFLAGS) $(CFLAGS) -c -o libgrub_a-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
-+
- diskless_exec-bios.o: bios.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-bios.o -MD -MP -MF "$(DEPDIR)/diskless_exec-bios.Tpo" -c -o diskless_exec-bios.o `test -f 'bios.c' || echo '$(srcdir)/'`bios.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/diskless_exec-bios.Tpo" "$(DEPDIR)/diskless_exec-bios.Po"; else rm -f "$(DEPDIR)/diskless_exec-bios.Tpo"; exit 1; fi
-@@ -1731,6 +1753,20 @@ diskless_exec-tparm.obj: tparm.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
- 
-+diskless_exec-graphics.o: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-graphics.o -MD -MP -MF "$(DEPDIR)/diskless_exec-graphics.Tpo" -c -o diskless_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/diskless_exec-graphics.Tpo" "$(DEPDIR)/diskless_exec-graphics.Po"; else rm -f "$(DEPDIR)/diskless_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='diskless_exec-graphics.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
-+
-+diskless_exec-graphics.obj: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -MT diskless_exec-graphics.obj -MD -MP -MF "$(DEPDIR)/diskless_exec-graphics.Tpo" -c -o diskless_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/diskless_exec-graphics.Tpo" "$(DEPDIR)/diskless_exec-graphics.Po"; else rm -f "$(DEPDIR)/diskless_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='diskless_exec-graphics.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(diskless_exec_CFLAGS) $(CFLAGS) -c -o diskless_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
-+
- e2fs_stage1_5_exec-common.o: common.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(e2fs_stage1_5_exec_CFLAGS) $(CFLAGS) -MT e2fs_stage1_5_exec-common.o -MD -MP -MF "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo" -c -o e2fs_stage1_5_exec-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo" "$(DEPDIR)/e2fs_stage1_5_exec-common.Po"; else rm -f "$(DEPDIR)/e2fs_stage1_5_exec-common.Tpo"; exit 1; fi
-@@ -2599,6 +2635,20 @@ pre_stage2_exec-tparm.obj: tparm.c
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-tparm.obj `if test -f 'tparm.c'; then $(CYGPATH_W) 'tparm.c'; else $(CYGPATH_W) '$(srcdir)/tparm.c'; fi`
- 
-+pre_stage2_exec-graphics.o: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -MT pre_stage2_exec-graphics.o -MD -MP -MF "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" -c -o pre_stage2_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" "$(DEPDIR)/pre_stage2_exec-graphics.Po"; else rm -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='pre_stage2_exec-graphics.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
-+
-+pre_stage2_exec-graphics.obj: graphics.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -MT pre_stage2_exec-graphics.obj -MD -MP -MF "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" -c -o pre_stage2_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo" "$(DEPDIR)/pre_stage2_exec-graphics.Po"; else rm -f "$(DEPDIR)/pre_stage2_exec-graphics.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='pre_stage2_exec-graphics.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(pre_stage2_exec_CFLAGS) $(CFLAGS) -c -o pre_stage2_exec-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
-+
- reiserfs_stage1_5_exec-common.o: common.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(reiserfs_stage1_5_exec_CFLAGS) $(CFLAGS) -MT reiserfs_stage1_5_exec-common.o -MD -MP -MF "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo" -c -o reiserfs_stage1_5_exec-common.o `test -f 'common.c' || echo '$(srcdir)/'`common.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo" "$(DEPDIR)/reiserfs_stage1_5_exec-common.Po"; else rm -f "$(DEPDIR)/reiserfs_stage1_5_exec-common.Tpo"; exit 1; fi
-diff -rup grub-0.97.oorig/util/Makefile.in grub-0.97/util/Makefile.in
---- grub-0.97.oorig/util/Makefile.in	2005-05-08 04:42:39.000000000 +0200
-+++ grub-0.97/util/Makefile.in	2006-03-12 14:00:48.000000000 +0100
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.4 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,8 +15,6 @@
- @SET_MAKE@
- 
- 
--SOURCES = $(mbchk_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -102,6 +100,8 @@ ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FSYS_CFLAGS = @FSYS_CFLAGS@
-+GRAPHICS_SUPPORT_FALSE = @GRAPHICS_SUPPORT_FALSE@
-+GRAPHICS_SUPPORT_TRUE = @GRAPHICS_SUPPORT_TRUE@
- GRUB_CFLAGS = @GRUB_CFLAGS@
- GRUB_LIBS = @GRUB_LIBS@
- HERCULES_SUPPORT_FALSE = @HERCULES_SUPPORT_FALSE@
diff --git a/bsp/buildroot/boot/grub/grub.200-fix_mbr_handling.patch b/bsp/buildroot/boot/grub/grub.200-fix_mbr_handling.patch
deleted file mode 100644
index 21e200f1..00000000
--- a/bsp/buildroot/boot/grub/grub.200-fix_mbr_handling.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/stage2/disk_io.c
-===================================================================
---- a/stage2/disk_io.c
-+++ b/stage2/disk_io.c
-@@ -365,7 +365,7 @@
- int
- devwrite (unsigned int sector, int sector_count, char *buf)
- {
--#if defined(GRUB_UTIL) && defined(__linux__)
-+#if defined(GRUB_UTIL) && defined(__linux__) && !defined(SUPPORT_LOOPDEV)
-   if (current_partition != 0xFFFFFF
-       && is_disk_device (device_map, current_drive))
-     {
diff --git a/bsp/buildroot/boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch b/bsp/buildroot/boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
deleted file mode 100644
index 8ed9d76c..00000000
--- a/bsp/buildroot/boot/grub/grub.300-honor_UCLIBC_HAS_LFS.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: b/grub/asmstub.c
-===================================================================
---- a/grub/asmstub.c
-+++ b/grub/asmstub.c
-@@ -18,10 +18,13 @@
-  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <features.h>
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
- /* Try to use glibc's transparant LFS support. */
- #define _LARGEFILE_SOURCE	1
- /* lseek becomes synonymous with lseek64.  */
- #define _FILE_OFFSET_BITS	64
-+#endif
- 
- /* Simulator entry point. */
- int grub_stage2 (void);
-Index: b/lib/device.c
-===================================================================
---- a/lib/device.c
-+++ b/lib/device.c
-@@ -18,10 +18,13 @@
-  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
-+#include <features.h>
-+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__)
- /* Try to use glibc's transparant LFS support. */
- #define _LARGEFILE_SOURCE       1
- /* lseek becomes synonymous with lseek64.  */
- #define _FILE_OFFSET_BITS       64
-+#endif
- 
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/bsp/buildroot/boot/grub/grub.400-nic_update2.patch b/bsp/buildroot/boot/grub/grub.400-nic_update2.patch
deleted file mode 100644
index 5e3c16d4..00000000
--- a/bsp/buildroot/boot/grub/grub.400-nic_update2.patch
+++ /dev/null
@@ -1,47064 +0,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-08-31
-Initial Package Version: 0.97
-Origin: OpenSolaris, Joe Ciccone, Jim Gifford
-Upstream Status: N/A
-Description: Adds support for Forcedeth and other NIC's
-	     Fixes for GCC 4.x
-	     Removal of bad network drivers
- 
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -872,47 +872,32 @@
-   --disable-packet-retransmission
-                           turn off packet retransmission
-   --enable-pci-direct     access PCI directly instead of using BIOS
--  --enable-3c509          enable 3Com509 driver
--  --enable-3c529          enable 3Com529 driver
-   --enable-3c595          enable 3Com595 driver
-   --enable-3c90x          enable 3Com90x driver
--  --enable-cs89x0         enable CS89x0 driver
-   --enable-davicom        enable Davicom driver
--  --enable-depca          enable DEPCA and EtherWORKS driver
--  --enable-eepro          enable Etherexpress Pro/10 driver
-+  --enable-e1000          enable Etherexpress Pro/1000 driver
-   --enable-eepro100       enable Etherexpress Pro/100 driver
-   --enable-epic100        enable SMC 83c170 EPIC/100 driver
--  --enable-3c507          enable 3Com507 driver
--  --enable-exos205        enable EXOS205 driver
--  --enable-ni5210         enable Racal-Interlan NI5210 driver
--  --enable-lance          enable Lance PCI PCNet/32 driver
--  --enable-ne2100         enable Novell NE2100 driver
--  --enable-ni6510         enable Racal-Interlan NI6510 driver
-+  --enable-forcedeth      enable Nvidia Geforce driver
-   --enable-natsemi        enable NatSemi DP8381x driver
--  --enable-ni5010         enable Racal-Interlan NI5010 driver
--  --enable-3c503          enable 3Com503 driver
--  --enable-ne             enable NE1000/2000 ISA driver
-+  --enable-ns83820        enable NS83820 driver
-   --enable-ns8390         enable NE2000 PCI driver
--  --enable-wd             enable WD8003/8013, SMC8216/8416 driver
--  --enable-otulip         enable old Tulip driver
-+  --enable-pcnet32        enable AMD Lance/PCI PCNet/32 driver
-+  --enable-pnic           enable Bochs Pseudo Nic driver
-   --enable-rtl8139        enable Realtek 8139 driver
-+  --enable-r8169          enable Realtek 8169 driver
-   --enable-sis900         enable SIS 900 and SIS 7016 driver
--  --enable-sk-g16         enable Schneider and Koch G16 driver
--  --enable-smc9000        enable SMC9000 driver
--  --enable-tiara          enable Tiara driver
-+  --enable-tg3            enable Broadcom Tigon3 driver
-   --enable-tulip          enable Tulip driver
-+  --enable-tlan           enable TI ThunderLAN driver
-+  --enable-undi           enable PXE UNDI driver
-   --enable-via-rhine      enable Rhine-I/II driver
--  --enable-w89c840        enable Winbond W89c840, Compex RL100-ATX driver
--  --enable-3c503-shmem    use 3c503 shared memory mode
--  --enable-3c503-aui      use AUI by default on 3c503 cards
-+  --enable-w89c840        enable Winbond W89c840 driver
-   --enable-compex-rl2000-fix
-                           specify this if you have a Compex RL2000 PCI
--  --enable-smc9000-scan=LIST
--                          probe for SMC9000 I/O addresses using LIST
-   --enable-ne-scan=LIST   probe for NE base address using LIST
-   --enable-wd-default-mem=MEM
-                           set the default memory location for WD/SMC
--  --enable-cs-scan=LIST   probe for CS89x0 base address using LIST
-   --enable-diskless       enable diskless support
-   --disable-graphics      disable graphics terminal support
-   --disable-hercules      disable hercules terminal support
-@@ -5537,7 +5522,7 @@
- 
- fi;
- if test "x$enable_packet_retransmission" != xno; then
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1"
-+  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1 -DCONFIG_PCI"
- fi
- 
- # Check whether --enable-pci-direct or --disable-pci-direct was given.
-@@ -5549,26 +5534,6 @@
-   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONFIG_PCI_DIRECT=1"
- fi
- 
--# Check whether --enable-3c509 or --disable-3c509 was given.
--if test "${enable_3c509+set}" = set; then
--  enableval="$enable_3c509"
--
--fi;
--if test "x$enable_3c509" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o"
--fi
--
--# Check whether --enable-3c529 or --disable-3c529 was given.
--if test "${enable_3c529+set}" = set; then
--  enableval="$enable_3c529"
--
--fi;
--if test "x$enable_3c529" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o"
--fi
--
- # Check whether --enable-3c595 or --disable-3c595 was given.
- if test "${enable_3c595+set}" = set; then
-   enableval="$enable_3c595"
-@@ -5589,16 +5554,6 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o"
- fi
- 
--# Check whether --enable-cs89x0 or --disable-cs89x0 was given.
--if test "${enable_cs89x0+set}" = set; then
--  enableval="$enable_cs89x0"
--
--fi;
--if test "x$enable_cs89x0" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o"
--fi
--
- # Check whether --enable-davicom or --disable-davicom was given.
- if test "${enable_davicom+set}" = set; then
-   enableval="$enable_davicom"
-@@ -5609,24 +5564,14 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS davicom.o"
- fi
- 
--# Check whether --enable-depca or --disable-depca was given.
--if test "${enable_depca+set}" = set; then
--  enableval="$enable_depca"
-+# Check whether --enable-e1000 or --disable-e1000 was given.
-+if test "${enable_e1000+set}" = set; then
-+  enableval="$enable_e1000"
- 
- fi;
--if test "x$enable_depca" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o"
--fi
--
--# Check whether --enable-eepro or --disable-eepro was given.
--if test "${enable_eepro+set}" = set; then
--  enableval="$enable_eepro"
--
--fi;
--if test "x$enable_eepro" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro.o"
-+if test "x$enable_e1000" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_E1000=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS e1000.o"
- fi
- 
- # Check whether --enable-eepro100 or --disable-eepro100 was given.
-@@ -5649,64 +5594,14 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o"
- fi
- 
--# Check whether --enable-3c507 or --disable-3c507 was given.
--if test "${enable_3c507+set}" = set; then
--  enableval="$enable_3c507"
--
--fi;
--if test "x$enable_3c507" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o"
--fi
--
--# Check whether --enable-exos205 or --disable-exos205 was given.
--if test "${enable_exos205+set}" = set; then
--  enableval="$enable_exos205"
--
--fi;
--if test "x$enable_exos205" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o"
--fi
--
--# Check whether --enable-ni5210 or --disable-ni5210 was given.
--if test "${enable_ni5210+set}" = set; then
--  enableval="$enable_ni5210"
--
--fi;
--if test "x$enable_ni5210" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o"
--fi
--
--# Check whether --enable-lance or --disable-lance was given.
--if test "${enable_lance+set}" = set; then
--  enableval="$enable_lance"
--
--fi;
--if test "x$enable_lance" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o"
--fi
--
--# Check whether --enable-ne2100 or --disable-ne2100 was given.
--if test "${enable_ne2100+set}" = set; then
--  enableval="$enable_ne2100"
--
--fi;
--if test "x$enable_ne2100" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o"
--fi
--
--# Check whether --enable-ni6510 or --disable-ni6510 was given.
--if test "${enable_ni6510+set}" = set; then
--  enableval="$enable_ni6510"
-+# Check whether --enable-forcedeth or --disable-forcedeth was given.
-+if test "${enable_forcedeth+set}" = set; then
-+  enableval="$enable_forcedeth"
- 
- fi;
--if test "x$enable_ni6510" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o"
-+if test "x$enable_forcedeth" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_FORCEDETH=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS forcedeth.o"
- fi
- 
- # Check whether --enable-natsemi or --disable-natsemi was given.
-@@ -5719,34 +5614,14 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS natsemi.o"
- fi
- 
--# Check whether --enable-ni5010 or --disable-ni5010 was given.
--if test "${enable_ni5010+set}" = set; then
--  enableval="$enable_ni5010"
-+# Check whether --enable-ns83820 or --disable-ns83820 was given.
-+if test "${enable_ns83820+set}" = set; then
-+  enableval="$enable_ns83820"
- 
- fi;
--if test "x$enable_ni5010" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5010=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5010.o"
--fi
--
--# Check whether --enable-3c503 or --disable-3c503 was given.
--if test "${enable_3c503+set}" = set; then
--  enableval="$enable_3c503"
--
--fi;
--if test "x$enable_3c503" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o"
--fi
--
--# Check whether --enable-ne or --disable-ne was given.
--if test "${enable_ne+set}" = set; then
--  enableval="$enable_ne"
--
--fi;
--if test "x$enable_ne" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o"
-+if test "x$enable_ns83820" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS83820=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns83820.o"
- fi
- 
- # Check whether --enable-ns8390 or --disable-ns8390 was given.
-@@ -5759,24 +5634,24 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o"
- fi
- 
--# Check whether --enable-wd or --disable-wd was given.
--if test "${enable_wd+set}" = set; then
--  enableval="$enable_wd"
-+# Check whether --enable-pcnet32 or --disable-pcnet32 was given.
-+if test "${enable_pcnet32+set}" = set; then
-+  enableval="$enable_pcnet32"
- 
- fi;
--if test "x$enable_wd" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o"
-+if test "x$enable_pcnet32" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PCNET32=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pcnet32.o"
- fi
- 
--# Check whether --enable-otulip or --disable-otulip was given.
--if test "${enable_otulip+set}" = set; then
--  enableval="$enable_otulip"
-+# Check whether --enable-pnic or --disable-pnic was given.
-+if test "${enable_pnic+set}" = set; then
-+  enableval="$enable_pnic"
- 
- fi;
--if test "x$enable_otulip" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o"
-+if test "x$enable_pnic" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PNIC=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pnic.o"
- fi
- 
- # Check whether --enable-rtl8139 or --disable-rtl8139 was given.
-@@ -5789,6 +5664,16 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o"
- fi
- 
-+# Check whether --enable-r8169 or --disable-r8169 was given.
-+if test "${enable_r8169+set}" = set; then
-+  enableval="$enable_r8169"
-+
-+fi;
-+if test "x$enable_r8169" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_R8169=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS r8169.o"
-+fi
-+
- # Check whether --enable-sis900 or --disable-sis900 was given.
- if test "${enable_sis900+set}" = set; then
-   enableval="$enable_sis900"
-@@ -5799,34 +5684,14 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS sis900.o"
- fi
- 
--# Check whether --enable-sk-g16 or --disable-sk-g16 was given.
--if test "${enable_sk_g16+set}" = set; then
--  enableval="$enable_sk_g16"
--
--fi;
--if test "x$enable_sk_g16" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o"
--fi
--
--# Check whether --enable-smc9000 or --disable-smc9000 was given.
--if test "${enable_smc9000+set}" = set; then
--  enableval="$enable_smc9000"
--
--fi;
--if test "x$enable_smc9000" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o"
--fi
--
--# Check whether --enable-tiara or --disable-tiara was given.
--if test "${enable_tiara+set}" = set; then
--  enableval="$enable_tiara"
-+# Check whether --enable-tg3 or --disable-tg3 was given.
-+if test "${enable_tg3+set}" = set; then
-+  enableval="$enable_tg3"
- 
- fi;
--if test "x$enable_tiara" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o"
-+if test "x$enable_tg3" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TG3=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tg3.o"
- fi
- 
- # Check whether --enable-tulip or --disable-tulip was given.
-@@ -5839,6 +5704,16 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o"
- fi
- 
-+# Check whether --enable-tlan or --disable-tlan was given.
-+if test "${enable_tlan+set}" = set; then
-+  enableval="$enable_tlan"
-+
-+fi;
-+if test "x$enable_tlan" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TLAN=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tlan.o"
-+fi
-+
- # Check whether --enable-via-rhine or --disable-via-rhine was given.
- if test "${enable_via_rhine+set}" = set; then
-   enableval="$enable_via_rhine"
-@@ -5873,24 +5748,6 @@
-   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_TFTP=1"
- fi
- 
--# Check whether --enable-3c503-shmem or --disable-3c503-shmem was given.
--if test "${enable_3c503_shmem+set}" = set; then
--  enableval="$enable_3c503_shmem"
--
--fi;
--if test "x$enable_3c503_shmem" = xyes; then
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1"
--fi
--
--# Check whether --enable-3c503-aui or --disable-3c503-aui was given.
--if test "${enable_3c503_aui+set}" = set; then
--  enableval="$enable_3c503_aui"
--
--fi;
--if test "x$enable_3c503_aui" = xyes; then
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1"
--fi
--
- # Check whether --enable-compex-rl2000-fix or --disable-compex-rl2000-fix was given.
- if test "${enable_compex_rl2000_fix+set}" = set; then
-   enableval="$enable_compex_rl2000_fix"
-@@ -5900,12 +5757,6 @@
-   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1"
- fi
- 
--# Check whether --enable-smc9000-scan or --disable-smc9000-scan was given.
--if test "${enable_smc9000_scan+set}" = set; then
--  enableval="$enable_smc9000_scan"
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan"
--fi;
--
- # Check whether --enable-ne-scan or --disable-ne-scan was given.
- if test "${enable_ne_scan+set}" = set; then
-   enableval="$enable_ne_scan"
-@@ -5922,12 +5773,6 @@
-   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000"
- fi;
- 
--# Check whether --enable-cs-scan or --disable-cs-scan was given.
--if test "${enable_cs_scan+set}" = set; then
--  enableval="$enable_cs_scan"
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan"
--fi;
--
- # Check whether --enable-diskless or --disable-diskless was given.
- if test "${enable_diskless+set}" = set; then
-   enableval="$enable_diskless"
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -344,7 +344,7 @@
-   [  --disable-packet-retransmission
-                           turn off packet retransmission])
- if test "x$enable_packet_retransmission" != xno; then
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1"
-+  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCONGESTED=1 -DCONFIG_PCI"
- fi
- 
- AC_ARG_ENABLE(pci-direct,
-@@ -354,20 +354,6 @@
- fi
- 
- dnl Device drivers.
--AC_ARG_ENABLE(3c509,
--  [  --enable-3c509          enable 3Com509 driver])
--if test "x$enable_3c509" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C509"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c509.o"
--fi
--
--AC_ARG_ENABLE(3c529,
--  [  --enable-3c529          enable 3Com529 driver])
--if test "x$enable_3c529" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C529=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c529.o"
--fi
--
- AC_ARG_ENABLE(3c595,
-   [  --enable-3c595          enable 3Com595 driver])
- if test "x$enable_3c595" = xyes; then
-@@ -382,13 +368,6 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c90x.o"
- fi
- 
--AC_ARG_ENABLE(cs89x0,
--  [  --enable-cs89x0         enable CS89x0 driver])
--if test "x$enable_cs89x0" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_CS89X0=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS cs89x0.o"
--fi
--
- AC_ARG_ENABLE(davicom,
-   [  --enable-davicom        enable Davicom driver])
- if test "x$enable_davicom" = xyes; then
-@@ -396,18 +375,11 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS davicom.o"
- fi
- 
--AC_ARG_ENABLE(depca,
--  [  --enable-depca          enable DEPCA and EtherWORKS driver])
--if test "x$enable_depca" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_DEPCA=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS depca.o"
--fi
--
--AC_ARG_ENABLE(eepro,
--  [  --enable-eepro          enable Etherexpress Pro/10 driver])
--if test "x$enable_eepro" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EEPRO=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS eepro.o"
-+AC_ARG_ENABLE(e1000,
-+  [  --enable-e1000          enable Etherexpress Pro/1000 driver])
-+if test "x$enable_e1000" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_E1000=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS e1000.o"
- fi
- 
- AC_ARG_ENABLE(eepro100,
-@@ -424,46 +396,11 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS epic100.o"
- fi
- 
--AC_ARG_ENABLE(3c507,
--  [  --enable-3c507          enable 3Com507 driver])
--if test "x$enable_3c507" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C507=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c507.o"
--fi
--
--AC_ARG_ENABLE(exos205,
--  [  --enable-exos205        enable EXOS205 driver])
--if test "x$enable_exos205" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_EXOS205=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS exos205.o"
--fi
--
--AC_ARG_ENABLE(ni5210,
--  [  --enable-ni5210         enable Racal-Interlan NI5210 driver])
--if test "x$enable_ni5210" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5210=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5210.o"
--fi
--
--AC_ARG_ENABLE(lance,
--  [  --enable-lance          enable Lance PCI PCNet/32 driver])
--if test "x$enable_lance" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_LANCE=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS lance.o"
--fi
--
--AC_ARG_ENABLE(ne2100,
--  [  --enable-ne2100         enable Novell NE2100 driver])
--if test "x$enable_ne2100" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE2100=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne2100.o"
--fi
--
--AC_ARG_ENABLE(ni6510,
--  [  --enable-ni6510         enable Racal-Interlan NI6510 driver])
--if test "x$enable_ni6510" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI6510=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni6510.o"
-+AC_ARG_ENABLE(forcedeth,
-+  [  --enable-forcedeth      enable Nvidia Geforce driver])
-+if test "x$enable_forcedeth" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_FORCEDETH=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS forcedeth.o"
- fi
- 
- AC_ARG_ENABLE(natsemi,
-@@ -473,25 +410,11 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS natsemi.o"
- fi
- 
--AC_ARG_ENABLE(ni5010,
--  [  --enable-ni5010         enable Racal-Interlan NI5010 driver])
--if test "x$enable_ni5010" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NI5010=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ni5010.o"
--fi
--
--AC_ARG_ENABLE(3c503,
--  [  --enable-3c503          enable 3Com503 driver])
--if test "x$enable_3c503" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_3C503=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS 3c503.o"
--fi
--
--AC_ARG_ENABLE(ne,
--  [  --enable-ne             enable NE1000/2000 ISA driver])
--if test "x$enable_ne" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NE=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ne.o"
-+AC_ARG_ENABLE(ns83820,
-+  [  --enable-ns83820        enable NS83820 driver])
-+if test "x$enable_ns83820" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_NS83820=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns83820.o"
- fi
- 
- AC_ARG_ENABLE(ns8390,
-@@ -501,18 +424,18 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS ns8390.o"
- fi
- 
--AC_ARG_ENABLE(wd,
--  [  --enable-wd             enable WD8003/8013, SMC8216/8416 driver])
--if test "x$enable_wd" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_WD=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS wd.o"
-+AC_ARG_ENABLE(pcnet32,
-+  [  --enable-pcnet32        enable AMD Lance/PCI PCNet/32 driver])
-+if test "x$enable_pcnet32" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PCNET32=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pcnet32.o"
- fi
- 
--AC_ARG_ENABLE(otulip,
--  [  --enable-otulip         enable old Tulip driver])
--if test "x$enable_otulip" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_OTULIP=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS otulip.o"
-+AC_ARG_ENABLE(pnic,
-+  [  --enable-pnic           enable Bochs Pseudo Nic driver])
-+if test "x$enable_pnic" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_PNIC=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS pnic.o"
- fi
- 
- AC_ARG_ENABLE(rtl8139,
-@@ -522,6 +445,13 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS rtl8139.o"
- fi
- 
-+AC_ARG_ENABLE(r8169,
-+  [  --enable-r8169          enable Realtek 8169 driver])
-+if test "x$enable_r8169" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_R8169=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS r8169.o"
-+fi
-+
- AC_ARG_ENABLE(sis900,
-   [  --enable-sis900         enable SIS 900 and SIS 7016 driver])
- if test "x$enable_sis900" = xyes; then
-@@ -529,25 +459,11 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS sis900.o"
- fi
- 
--AC_ARG_ENABLE(sk-g16,
--  [  --enable-sk-g16         enable Schneider and Koch G16 driver])
--if test "x$enable_sk_g16" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SK_G16=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS sk_g16.o"
--fi
--
--AC_ARG_ENABLE(smc9000,
--  [  --enable-smc9000        enable SMC9000 driver])
--if test "x$enable_smc9000" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_SMC9000=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS smc9000.o"
--fi
--
--AC_ARG_ENABLE(tiara,
--  [  --enable-tiara          enable Tiara driver])
--if test "x$enable_tiara" = xyes; then
--  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TIARA=1"
--  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tiara.o"
-+AC_ARG_ENABLE(tg3,
-+  [  --enable-tg3            enable Broadcom Tigon3 driver])
-+if test "x$enable_tg3" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TG3=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tg3.o"
- fi
- 
- AC_ARG_ENABLE(tulip,
-@@ -557,6 +473,13 @@
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS tulip.o"
- fi
- 
-+AC_ARG_ENABLE(tlan,
-+  [  --enable-tlan           enable TI ThunderLAN driver])
-+if test "x$enable_tlan" = xyes; then
-+  NET_CFLAGS="$NET_CFLAGS -DINCLUDE_TLAN=1"
-+  NETBOOT_DRIVERS="$NETBOOT_DRIVERS tlan.o"
-+fi
-+
- AC_ARG_ENABLE(via-rhine,
-   [  --enable-via-rhine      enable Rhine-I/II driver])
- if test "x$enable_via_rhine" = xyes; then
-@@ -565,7 +488,7 @@
- fi
- 
- AC_ARG_ENABLE(w89c840,
--  [  --enable-w89c840        enable Winbond W89c840, Compex RL100-ATX driver])
-+  [  --enable-w89c840        enable Winbond W89c840 driver])
- if test "x$enable_w89c840" = xyes; then
-   NET_CFLAGS="$NET_CFLAGS -DINCLUDE_W89C840=1"
-   NETBOOT_DRIVERS="$NETBOOT_DRIVERS w89c840.o"
-@@ -577,19 +500,7 @@
-   FSYS_CFLAGS="$FSYS_CFLAGS -DFSYS_TFTP=1"
- fi
- 
--dnl Extra options.
--AC_ARG_ENABLE(3c503-shmem,
--  [  --enable-3c503-shmem    use 3c503 shared memory mode])
--if test "x$enable_3c503_shmem" = xyes; then
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_SHMEM=1"
--fi
--
--AC_ARG_ENABLE(3c503-aui,
--  [  --enable-3c503-aui      use AUI by default on 3c503 cards])
--if test "x$enable_3c503_aui" = xyes; then
--  NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DT503_AUI=1"
--fi
--
-+dnl extra flag for ns8390.c
- AC_ARG_ENABLE(compex-rl2000-fix,
-   [  --enable-compex-rl2000-fix
-                           specify this if you have a Compex RL2000 PCI])
-@@ -597,11 +508,6 @@
-   NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCOMPEX_RL2000_FIX=1"
- fi
- 
--AC_ARG_ENABLE(smc9000-scan,
--  [  --enable-smc9000-scan=LIST
--                          probe for SMC9000 I/O addresses using LIST],
--  [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DSMC9000_SCAN=$enable_smc9000_scan"])
--
- AC_ARG_ENABLE(ne-scan,
-   [  --enable-ne-scan=LIST   probe for NE base address using LIST],
-   [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DNE_SCAN=$enable_ne_scan"],
-@@ -613,10 +519,6 @@
-   [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=$enable_wd_default_mem"],
-   [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DWD_DEFAULT_MEM=0xCC000"])
- 
--AC_ARG_ENABLE(cs-scan,
--  [  --enable-cs-scan=LIST   probe for CS89x0 base address using LIST],
--  [NET_EXTRAFLAGS="$NET_EXTRAFLAGS -DCS_SCAN=$enable_cs_scan"])
--
- dnl Diskless
- AC_ARG_ENABLE(diskless,
-   [  --enable-diskless       enable diskless support])
-Index: b/netboot/3c509.h
-===================================================================
---- a/netboot/3c509.h
-+++ /dev/null
-@@ -1,397 +0,0 @@
--/*
-- * Copyright (c) 1993 Herb Peyerl (hpeyerl@novatel.ca) All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions are
-- * met: 1. Redistributions of source code must retain the above copyright
-- * notice, this list of conditions and the following disclaimer. 2. The name
-- * of the author may not be used to endorse or promote products derived from
-- * this software withough specific prior written permission
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- *
-- * if_epreg.h,v 1.4 1994/11/13 10:12:37 gibbs Exp Modified by:
-- *
-- October 2, 1994
--
-- Modified by: Andres Vega Garcia
--
-- INRIA - Sophia Antipolis, France
-- e-mail: avega@sophia.inria.fr
-- finger: avega@pax.inria.fr
--
-- */
--
--/*
-- * Ethernet software status per interface.
-- */
--/*
-- * Some global constants
-- */
--
--#define TX_INIT_RATE		16
--#define TX_INIT_MAX_RATE	64
--#define RX_INIT_LATENCY		64
--#define RX_INIT_EARLY_THRESH	64
--#define MIN_RX_EARLY_THRESHF	16	/* not less than ether_header */
--#define MIN_RX_EARLY_THRESHL	4
--
--#define EEPROMSIZE	0x40
--#define MAX_EEPROMBUSY	1000
--#define EP_LAST_TAG	0xd7
--#define EP_MAX_BOARDS	16
--#define EP_ID_PORT	0x100
--
--/*
-- * some macros to acces long named fields
-- */
--#define IS_BASE (eth_nic_base)
--#define BASE	(eth_nic_base)
--
--/*
-- * Commands to read/write EEPROM trough EEPROM command register (Window 0,
-- * Offset 0xa)
-- */
--#define EEPROM_CMD_RD	0x0080	/* Read:  Address required (5 bits) */
--#define EEPROM_CMD_WR	0x0040	/* Write: Address required (5 bits) */
--#define EEPROM_CMD_ERASE 0x00c0	/* Erase: Address required (5 bits) */
--#define EEPROM_CMD_EWEN	0x0030	/* Erase/Write Enable: No data required */
--
--#define EEPROM_BUSY		(1<<15)
--#define EEPROM_TST_MODE		(1<<14)
--
--/*
-- * Some short functions, worth to let them be a macro
-- */
--#define is_eeprom_busy(b) (inw((b)+EP_W0_EEPROM_COMMAND)&EEPROM_BUSY)
--#define GO_WINDOW(x)	outw(WINDOW_SELECT|(x), BASE+EP_COMMAND)
--
--/**************************************************************************
-- *
-- * These define the EEPROM data structure.  They are used in the probe
-- * function to verify the existance of the adapter after having sent
-- * the ID_Sequence.
-- *
-- * There are others but only the ones we use are defined here.
-- *
-- **************************************************************************/
--
--#define EEPROM_NODE_ADDR_0	0x0	/* Word */
--#define EEPROM_NODE_ADDR_1	0x1	/* Word */
--#define EEPROM_NODE_ADDR_2	0x2	/* Word */
--#define EEPROM_PROD_ID		0x3	/* 0x9[0-f]50 */
--#define EEPROM_MFG_ID		0x7	/* 0x6d50 */
--#define EEPROM_ADDR_CFG		0x8	/* Base addr */
--#define EEPROM_RESOURCE_CFG	0x9	/* IRQ. Bits 12-15 */
--
--/**************************************************************************
-- *
-- * These are the registers for the 3Com 3c509 and their bit patterns when
-- * applicable.  They have been taken out the the "EtherLink III Parallel
-- * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual
-- * from 3com.
-- *
-- **************************************************************************/
--
--#define EP_COMMAND		0x0e	/* Write. BASE+0x0e is always a
--					 * command reg. */
--#define EP_STATUS		0x0e	/* Read. BASE+0x0e is always status
--					 * reg. */
--#define EP_WINDOW		0x0f	/* Read. BASE+0x0f is always window
--					 * reg. */
--/*
-- * Window 0 registers. Setup.
-- */
--/* Write */
--#define EP_W0_EEPROM_DATA	0x0c
--#define EP_W0_EEPROM_COMMAND	0x0a
--#define EP_W0_RESOURCE_CFG	0x08
--#define EP_W0_ADDRESS_CFG	0x06
--#define EP_W0_CONFIG_CTRL	0x04
--/* Read */
--#define EP_W0_PRODUCT_ID	0x02
--#define EP_W0_MFG_ID		0x00
--
--/*
-- * Window 1 registers. Operating Set.
-- */
--/* Write */
--#define EP_W1_TX_PIO_WR_2	0x02
--#define EP_W1_TX_PIO_WR_1	0x00
--/* Read */
--#define EP_W1_FREE_TX		0x0c
--#define EP_W1_TX_STATUS		0x0b	/* byte */
--#define EP_W1_TIMER		0x0a	/* byte */
--#define EP_W1_RX_STATUS		0x08
--#define EP_W1_RX_PIO_RD_2	0x02
--#define EP_W1_RX_PIO_RD_1	0x00
--
--/*
-- * Window 2 registers. Station Address Setup/Read
-- */
--/* Read/Write */
--#define EP_W2_ADDR_5		0x05
--#define EP_W2_ADDR_4		0x04
--#define EP_W2_ADDR_3		0x03
--#define EP_W2_ADDR_2		0x02
--#define EP_W2_ADDR_1		0x01
--#define EP_W2_ADDR_0		0x00
--
--/*
-- * Window 3 registers.  FIFO Management.
-- */
--/* Read */
--#define EP_W3_FREE_TX		0x0c
--#define EP_W3_FREE_RX		0x0a
--
--/*
-- * Window 4 registers. Diagnostics.
-- */
--/* Read/Write */
--#define EP_W4_MEDIA_TYPE	0x0a
--#define EP_W4_CTRLR_STATUS	0x08
--#define EP_W4_NET_DIAG		0x06
--#define EP_W4_FIFO_DIAG		0x04
--#define EP_W4_HOST_DIAG		0x02
--#define EP_W4_TX_DIAG		0x00
--
--/*
-- * Window 5 Registers.  Results and Internal status.
-- */
--/* Read */
--#define EP_W5_READ_0_MASK	0x0c
--#define EP_W5_INTR_MASK		0x0a
--#define EP_W5_RX_FILTER		0x08
--#define EP_W5_RX_EARLY_THRESH	0x06
--#define EP_W5_TX_AVAIL_THRESH	0x02
--#define EP_W5_TX_START_THRESH	0x00
--
--/*
-- * Window 6 registers. Statistics.
-- */
--/* Read/Write */
--#define TX_TOTAL_OK		0x0c
--#define RX_TOTAL_OK		0x0a
--#define TX_DEFERRALS		0x08
--#define RX_FRAMES_OK		0x07
--#define TX_FRAMES_OK		0x06
--#define RX_OVERRUNS		0x05
--#define TX_COLLISIONS		0x04
--#define TX_AFTER_1_COLLISION	0x03
--#define TX_AFTER_X_COLLISIONS	0x02
--#define TX_NO_SQE		0x01
--#define TX_CD_LOST		0x00
--
--/****************************************
-- *
-- * Register definitions.
-- *
-- ****************************************/
--
--/*
-- * Command register. All windows.
-- *
-- * 16 bit register.
-- *     15-11:  5-bit code for command to be executed.
-- *     10-0:   11-bit arg if any. For commands with no args;
-- *	      this can be set to anything.
-- */
--#define GLOBAL_RESET		(unsigned short) 0x0000	/* Wait at least 1ms
--							 * after issuing */
--#define WINDOW_SELECT		(unsigned short) (0x1<<11)
--#define START_TRANSCEIVER	(unsigned short) (0x2<<11)	/* Read ADDR_CFG reg to
--							 * determine whether
--							 * this is needed. If
--							 * so; wait 800 uSec
--							 * before using trans-
--							 * ceiver. */
--#define RX_DISABLE		(unsigned short) (0x3<<11)	/* state disabled on
--							 * power-up */
--#define RX_ENABLE		(unsigned short) (0x4<<11)
--#define RX_RESET		(unsigned short) (0x5<<11)
--#define RX_DISCARD_TOP_PACK	(unsigned short) (0x8<<11)
--#define TX_ENABLE		(unsigned short) (0x9<<11)
--#define TX_DISABLE		(unsigned short) (0xa<<11)
--#define TX_RESET		(unsigned short) (0xb<<11)
--#define REQ_INTR		(unsigned short) (0xc<<11)
--#define SET_INTR_MASK		(unsigned short) (0xe<<11)
--#define SET_RD_0_MASK		(unsigned short) (0xf<<11)
--#define SET_RX_FILTER		(unsigned short) (0x10<<11)
--#define FIL_INDIVIDUAL	(unsigned short) (0x1)
--#define FIL_GROUP		(unsigned short) (0x2)
--#define FIL_BRDCST	(unsigned short) (0x4)
--#define FIL_ALL		(unsigned short) (0x8)
--#define SET_RX_EARLY_THRESH	(unsigned short) (0x11<<11)
--#define SET_TX_AVAIL_THRESH	(unsigned short) (0x12<<11)
--#define SET_TX_START_THRESH	(unsigned short) (0x13<<11)
--#define STATS_ENABLE		(unsigned short) (0x15<<11)
--#define STATS_DISABLE		(unsigned short) (0x16<<11)
--#define STOP_TRANSCEIVER	(unsigned short) (0x17<<11)
--/*
-- * The following C_* acknowledge the various interrupts. Some of them don't
-- * do anything.  See the manual.
-- */
--#define ACK_INTR		(unsigned short) (0x6800)
--#define C_INTR_LATCH	(unsigned short) (ACK_INTR|0x1)
--#define C_CARD_FAILURE	(unsigned short) (ACK_INTR|0x2)
--#define C_TX_COMPLETE	(unsigned short) (ACK_INTR|0x4)
--#define C_TX_AVAIL	(unsigned short) (ACK_INTR|0x8)
--#define C_RX_COMPLETE	(unsigned short) (ACK_INTR|0x10)
--#define C_RX_EARLY	(unsigned short) (ACK_INTR|0x20)
--#define C_INT_RQD		(unsigned short) (ACK_INTR|0x40)
--#define C_UPD_STATS	(unsigned short) (ACK_INTR|0x80)
--
--/*
-- * Status register. All windows.
-- *
-- *     15-13:  Window number(0-7).
-- *     12:     Command_in_progress.
-- *     11:     reserved.
-- *     10:     reserved.
-- *     9:      reserved.
-- *     8:      reserved.
-- *     7:      Update Statistics.
-- *     6:      Interrupt Requested.
-- *     5:      RX Early.
-- *     4:      RX Complete.
-- *     3:      TX Available.
-- *     2:      TX Complete.
-- *     1:      Adapter Failure.
-- *     0:      Interrupt Latch.
-- */
--#define S_INTR_LATCH		(unsigned short) (0x1)
--#define S_CARD_FAILURE		(unsigned short) (0x2)
--#define S_TX_COMPLETE		(unsigned short) (0x4)
--#define S_TX_AVAIL		(unsigned short) (0x8)
--#define S_RX_COMPLETE		(unsigned short) (0x10)
--#define S_RX_EARLY		(unsigned short) (0x20)
--#define S_INT_RQD		(unsigned short) (0x40)
--#define S_UPD_STATS		(unsigned short) (0x80)
--#define S_5_INTS		(S_CARD_FAILURE|S_TX_COMPLETE|\
--				 S_TX_AVAIL|S_RX_COMPLETE|S_RX_EARLY)
--#define S_COMMAND_IN_PROGRESS	(unsigned short) (0x1000)
--
--/*
-- * FIFO Registers.
-- * RX Status. Window 1/Port 08
-- *
-- *     15:     Incomplete or FIFO empty.
-- *     14:     1: Error in RX Packet   0: Incomplete or no error.
-- *     13-11:  Type of error.
-- *	      1000 = Overrun.
-- *	      1011 = Run Packet Error.
-- *	      1100 = Alignment Error.
-- *	      1101 = CRC Error.
-- *	      1001 = Oversize Packet Error (>1514 bytes)
-- *	      0010 = Dribble Bits.
-- *	      (all other error codes, no errors.)
-- *
-- *     10-0:   RX Bytes (0-1514)
-- */
--#define ERR_RX_INCOMPLETE	(unsigned short) (0x1<<15)
--#define ERR_RX			(unsigned short) (0x1<<14)
--#define ERR_RX_OVERRUN		(unsigned short) (0x8<<11)
--#define ERR_RX_RUN_PKT		(unsigned short) (0xb<<11)
--#define ERR_RX_ALIGN		(unsigned short) (0xc<<11)
--#define ERR_RX_CRC		(unsigned short) (0xd<<11)
--#define ERR_RX_OVERSIZE		(unsigned short) (0x9<<11)
--#define ERR_RX_DRIBBLE		(unsigned short) (0x2<<11)
--
--/*
-- * FIFO Registers.
-- * TX Status. Window 1/Port 0B
-- *
-- *   Reports the transmit status of a completed transmission. Writing this
-- *   register pops the transmit completion stack.
-- *
-- *   Window 1/Port 0x0b.
-- *
-- *     7:      Complete
-- *     6:      Interrupt on successful transmission requested.
-- *     5:      Jabber Error (TP Only, TX Reset required. )
-- *     4:      Underrun (TX Reset required. )
-- *     3:      Maximum Collisions.
-- *     2:      TX Status Overflow.
-- *     1-0:    Undefined.
-- *
-- */
--#define TXS_COMPLETE		0x80
--#define TXS_SUCCES_INTR_REQ		0x40
--#define TXS_JABBER		0x20
--#define TXS_UNDERRUN		0x10
--#define TXS_MAX_COLLISION	0x8
--#define TXS_STATUS_OVERFLOW	0x4
--
--/*
-- * Configuration control register.
-- * Window 0/Port 04
-- */
--/* Read */
--#define IS_AUI				(1<<13)
--#define IS_BNC				(1<<12)
--#define IS_UTP				(1<<9)
--/* Write */
--#define ENABLE_DRQ_IRQ			0x0001
--#define W0_P4_CMD_RESET_ADAPTER		0x4
--#define W0_P4_CMD_ENABLE_ADAPTER	0x1
--/*
-- * Media type and status.
-- * Window 4/Port 0A
-- */
--#define ENABLE_UTP			0xc0
--#define DISABLE_UTP			0x0
--
--/*
-- * Resource control register
-- */
--
--#define SET_IRQ(i)	( ((i)<<12) | 0xF00) /* set IRQ i */
--
--/*
-- * Receive status register
-- */
--
--#define RX_BYTES_MASK			(unsigned short) (0x07ff)
--#define RX_ERROR	0x4000
--#define RX_INCOMPLETE	0x8000
--
--
--/*
-- * Misc defines for various things.
-- */
--#define ACTIVATE_ADAPTER_TO_CONFIG	0xff /* to the id_port */
--#define MFG_ID				0x6d50 /* in EEPROM and W0 ADDR_CONFIG */
--#define PROD_ID				0x9150
--
--#define AUI				0x1
--#define BNC				0x2
--#define UTP				0x4
--
--#define RX_BYTES_MASK			(unsigned short) (0x07ff)
--
-- /* EISA support */
--#define EP_EISA_START			0x1000
--#define EP_EISA_W0			0x0c80
--
--#ifdef	INCLUDE_3C529
-- /* MCA support */
--#define MCA_MOTHERBOARD_SETUP_REG	0x94
--#define MCA_ADAPTER_SETUP_REG		0x96
--#define MCA_MAX_SLOT_NR			8
--#define MCA_POS_REG(n)			(0x100+(n))
--#endif
--
--/*
-- * Local variables:
-- *  c-basic-offset: 8
-- * End:
-- */
-Index: b/netboot/3c595.c
-===================================================================
---- a/netboot/3c595.c
-+++ b/netboot/3c595.c
-@@ -20,6 +20,7 @@
- *
- *  Copyright (c) 1994 Herb Peyerl <hpeyerl@novatel.ca>
- *
-+* timlegge	08-24-2003	Add Multicast Support
- */
- 
- /* #define EDEBUG */
-@@ -30,7 +31,7 @@
- #include "3c595.h"
- #include "timer.h"
- 
--static unsigned short	eth_nic_base, eth_asic_base;
-+static unsigned short	eth_nic_base;
- static unsigned short	vx_connector, vx_connectors;
- 
- static struct connector_entry {
-@@ -57,14 +58,12 @@
- static void vxgetlink(void);
- static void vxsetlink(void);
- 
--#define	udelay(n)	waiton_timer2(((n)*TICKS_PER_MS)/1000)
--
- /**************************************************************************
- ETH_RESET - Reset adapter
- ***************************************************************************/
- static void t595_reset(struct nic *nic)
- {
--	int i, j;
-+	int i;
- 
- 	/***********************************************************
- 			Reset 3Com 595 card
-@@ -133,7 +132,7 @@
- 	outw(ACK_INTR | 0xff, BASE + VX_COMMAND);
- 
- 	outw(SET_RX_FILTER | FIL_INDIVIDUAL |
--	    FIL_BRDCST, BASE + VX_COMMAND);
-+	    FIL_BRDCST|FIL_MULTICAST, BASE + VX_COMMAND);
- 
- 	vxsetlink();
- /*{
-@@ -225,10 +224,9 @@
- /**************************************************************************
- ETH_POLL - Wait for a frame
- ***************************************************************************/
--static int t595_poll(struct nic *nic)
-+static int t595_poll(struct nic *nic, int retrieve)
- {
- 	/* common variables */
--	unsigned short type = 0;	/* used by EDEBUG */
- 	/* variables for 3C595 */
- 	short status, cst;
- 	register short rx_fifo;
-@@ -262,6 +260,8 @@
- 	if (rx_fifo==0)
- 		return 0;
- 
-+	if ( ! retrieve ) return 1;
-+
- 		/* read packet */
- #ifdef EDEBUG
- 	printf("[l=%d",rx_fifo);
-@@ -300,12 +300,15 @@
- 	outw(RX_DISCARD_TOP_PACK, BASE + VX_COMMAND);
- 	while (inw(BASE + VX_STATUS) & S_COMMAND_IN_PROGRESS);
- #ifdef EDEBUG
-+{
-+	unsigned short type = 0;	/* used by EDEBUG */
- 	type = (nic->packet[12]<<8) | nic->packet[13];
- 	if(nic->packet[0]+nic->packet[1]+nic->packet[2]+nic->packet[3]+nic->packet[4]+
- 	    nic->packet[5] == 0xFF*ETH_ALEN)
- 		printf(",t=%hX,b]",type);
- 	else
- 		printf(",t=%hX]",type);
-+}
- #endif
- 	return 1;
- }
-@@ -382,9 +385,8 @@
- static void            
- vxsetlink(void)
- {       
--    int i, j, k;
-+    int i, j;
-     char *reason, *warning;
--    static short prev_flags;
-     static char prev_conn = -1;
- 
-     if (prev_conn == -1) {
-@@ -438,28 +440,47 @@
-     GO_WINDOW(1); 
- }
- 
--static void t595_disable(struct nic *nic)
-+static void t595_disable(struct dev *dev)
- {
--    outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
--    udelay(8000);
--    GO_WINDOW(4);
--    outw(0, BASE + VX_W4_MEDIA_TYPE);
--    GO_WINDOW(1);
-+	struct nic *nic = (struct nic *)dev;
-+	t595_reset(nic);
-+
-+	outw(STOP_TRANSCEIVER, BASE + VX_COMMAND);
-+	udelay(8000);
-+	GO_WINDOW(4);
-+	outw(0, BASE + VX_W4_MEDIA_TYPE);
-+	GO_WINDOW(1);
-+}
-+
-+static void t595_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
- }
- 
- /**************************************************************************
- ETH_PROBE - Look for an adapter
- ***************************************************************************/
--struct nic *t595_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *pci)
-+static int t595_probe(struct dev *dev, struct pci_device *pci)
- {
-+	struct nic *nic = (struct nic *)dev;
- 	int i;
- 	unsigned short *p;
- 
--	if (probeaddrs == 0 || probeaddrs[0] == 0)
-+	if (pci->ioaddr == 0)
- 		return 0;
- /*	eth_nic_base = probeaddrs[0] & ~3; */
- 	eth_nic_base = pci->ioaddr;
- 
-+	nic->irqno  = 0;
-+	nic->ioaddr = pci->ioaddr & ~3;
-+
- 	GO_WINDOW(0);
- 	outw(GLOBAL_RESET, BASE + VX_COMMAND);
- 	VX_BUSY_WAIT;
-@@ -487,14 +508,40 @@
- 	printf("Ethernet address: %!\n", nic->node_addr);
- 
- 	t595_reset(nic);
--	nic->reset = t595_reset;
--	nic->poll = t595_poll;
-+	dev->disable  = t595_disable;
-+	nic->poll     = t595_poll;
- 	nic->transmit = t595_transmit;
--	nic->disable = t595_disable;
--	return nic;
-+	nic->irq      = t595_irq;
-+	return 1;
- 
- }
- 
-+static struct pci_id t595_nics[] = {
-+PCI_ROM(0x10b7, 0x5900, "3c590",           "3Com590"),		/* Vortex 10Mbps */
-+PCI_ROM(0x10b7, 0x5950, "3c595",           "3Com595"),		/* Vortex 100baseTx */
-+PCI_ROM(0x10b7, 0x5951, "3c595-1",         "3Com595"),		/* Vortex 100baseT4 */
-+PCI_ROM(0x10b7, 0x5952, "3c595-2",         "3Com595"),		/* Vortex 100base-MII */
-+PCI_ROM(0x10b7, 0x9000, "3c900-tpo",       "3Com900-TPO"),	/* 10 Base TPO */
-+PCI_ROM(0x10b7, 0x9001, "3c900-t4",        "3Com900-Combo"),	/* 10/100 T4 */
-+PCI_ROM(0x10b7, 0x9004, "3c900b-tpo",      "3Com900B-TPO"),	/* 10 Base TPO */
-+PCI_ROM(0x10b7, 0x9005, "3c900b-combo",    "3Com900B-Combo"),	/* 10 Base Combo */
-+PCI_ROM(0x10b7, 0x9006, "3c900b-tpb2",     "3Com900B-2/T"),	/* 10 Base TP and Base2 */
-+PCI_ROM(0x10b7, 0x900a, "3c900b-fl",       "3Com900B-FL"),	/* 10 Base F */
-+PCI_ROM(0x10b7, 0x9800, "3c980-cyclone-1", "3Com980-Cyclone"),	/* Cyclone */
-+PCI_ROM(0x10b7, 0x9805, "3c9805-1",        "3Com9805"),		/* Dual Port Server Cyclone */
-+PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX"),	/* Hurricane */
-+PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado"),
-+};
-+
-+struct pci_driver t595_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "3C595",
-+	.probe    = t595_probe,
-+	.ids      = t595_nics,
-+	.id_count = sizeof(t595_nics)/sizeof(t595_nics[0]),
-+	.class    = 0,
-+};
-+
- /*
-  * Local variables:
-  *  c-basic-offset: 8
-Index: b/netboot/3c90x.c
-===================================================================
---- a/netboot/3c90x.c
-+++ b/netboot/3c90x.c
-@@ -1,7 +1,7 @@
- /*
-  * 3c90x.c -- This file implements the 3c90x driver for etherboot.  Written
-  * by Greg Beeley, Greg.Beeley@LightSys.org.  Modified by Steve Smith,
-- * Steve.Smith@Juno.Com
-+ * Steve.Smith@Juno.Com. Alignment bug fix Neil Newell (nn@icenoir.net).
-  *
-  * This program Copyright (C) 1999 LightSys Technology Services, Inc.
-  * Portions Copyright (C) 1999 Steve Smith
-@@ -31,13 +31,15 @@
-  *					Re-wrote poll and transmit for
-  *					better error recovery and heavy
-  *					network traffic operation
-+ * v2.01    5-26-2003 NN Fixed driver alignment issue which
-+ *                  caused system lockups if driver structures
-+ *                  not 8-byte aligned.
-  *
-  */
- 
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- #include "timer.h"
- 
- #define	XCVR_MAGIC	(0x5A00)
-@@ -47,9 +49,6 @@
-  **/
- #define	XMIT_RETRIES	250
- 
--#undef	virt_to_bus
--#define	virt_to_bus(x)	((unsigned long)x)
--
- /*** Register definitions for the 3c905 ***/
- enum Registers
-     {
-@@ -225,7 +224,7 @@
-     unsigned int	DataAddr;
-     unsigned int	DataLength;
-     }
--    TXD;
-+    TXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
- 
- /*** RX descriptor ***/
- typedef struct
-@@ -235,7 +234,7 @@
-     unsigned int	DataAddr;
-     unsigned int	DataLength;
-     }
--    RXD;
-+    RXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
- 
- /*** Global variables ***/
- static struct
-@@ -311,6 +310,7 @@
-     }
- 
- 
-+#if 0
- /*** a3c90x_internal_WriteEepromWord - write a physical word of
-  *** data to the onboard serial eeprom (not the BIOS prom, but the
-  *** nvram in the card that stores, among other things, the MAC
-@@ -344,8 +344,9 @@
- 
-     return 0;
-     }
-+#endif
- 
--
-+#if 0
- /*** a3c90x_internal_WriteEeprom - write data to the serial eeprom,
-  *** and re-compute the eeprom checksum.
-  ***/
-@@ -384,8 +385,7 @@
- 
-     return 0;
-     }
--
--
-+#endif
- 
- /*** a3c90x_reset: exported function that resets the card to its default
-  *** state.  This is so the Linux driver can re-set the card up the way
-@@ -393,12 +393,10 @@
-  *** not alter the selected transceiver that we used to download the boot
-  *** image.
-  ***/
--static void
--a3c90x_reset(struct nic *nic)
-+static void a3c90x_reset(void)
-     {
--    int cfg;
--
- #ifdef	CFG_3C90X_PRESERVE_XCVR
-+    int cfg;
-     /** Read the current InternalConfig value. **/
-     a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
-     cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
-@@ -473,7 +471,7 @@
-  *** p - the pointer to the packet data itself.
-  ***/
- static void
--a3c90x_transmit(struct nic *nic, const char *d, unsigned int t,
-+a3c90x_transmit(struct nic *nic __unused, const char *d, unsigned int t,
-                 unsigned int s, const char *p)
-     {
- 
-@@ -553,7 +551,7 @@
- 	if (status & 0x02)
- 	    {
- 	    printf("3C90X: Tx Reclaim Error (%hhX)\n", status);
--	    a3c90x_reset(NULL);
-+	    a3c90x_reset();
- 	    }
- 	else if (status & 0x04)
- 	    {
-@@ -572,18 +570,18 @@
- 	else if (status & 0x10)
- 	    {
- 	    printf("3C90X: Tx Underrun (%hhX)\n", status);
--	    a3c90x_reset(NULL);
-+	    a3c90x_reset();
- 	    }
- 	else if (status & 0x20)
- 	    {
- 	    printf("3C90X: Tx Jabber (%hhX)\n", status);
--	    a3c90x_reset(NULL);
-+	    a3c90x_reset();
- 	    }
- 	else if ((status & 0x80) != 0x80)
- 	    {
- 	    printf("3C90X: Internal Error - Incomplete Transmission (%hhX)\n",
- 	           status);
--	    a3c90x_reset(NULL);
-+	    a3c90x_reset();
- 	    }
- 	}
- 
-@@ -601,7 +599,7 @@
-  *** in nic->packetlen.  Return 1 if a packet was found.
-  ***/
- static int
--a3c90x_poll(struct nic *nic)
-+a3c90x_poll(struct nic *nic, int retrieve)
-     {
-     int i, errcode;
- 
-@@ -610,6 +608,8 @@
- 	return 0;
- 	}
- 
-+    if ( ! retrieve ) return 1;
-+
-     /** we don't need to acknowledge rxComplete -- the upload engine
-      ** does it for us.
-      **/
-@@ -663,34 +663,51 @@
-  *** [Ken]
-  ***/
- static void
--a3c90x_disable(struct nic *nic)
--    {
-+a3c90x_disable(struct dev *dev __unused)
-+{
-+	/* reset and disable merge */
-+	a3c90x_reset();
- 	/* Disable the receiver and transmitter. */
- 	outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
- 	outw(cmdTxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
--    }
--
-+}
- 
-+static void a3c90x_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
- 
- /*** a3c90x_probe: exported routine to probe for the 3c905 card and perform
-  *** initialization.  If this routine is called, the pci functions did find the
-  *** card.  We just have to init it here.
-  ***/
--struct nic*
--a3c90x_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *pci)
--    {
-+static int a3c90x_probe(struct dev *dev, struct pci_device *pci)
-+{
-+    struct nic *nic = (struct nic *)dev;
-     int i, c;
-     unsigned short eeprom[0x21];
-     unsigned int cfg;
-     unsigned int mopt;
-+    unsigned int mstat;
-     unsigned short linktype;
-+#define	HWADDR_OFFSET	10
- 
--    if (probeaddrs == 0 || probeaddrs[0] == 0)
-+    if (pci->ioaddr == 0)
-           return 0;
- 
-     adjust_pci_device(pci);
- 
--    INF_3C90X.IOAddr = probeaddrs[0] & ~3;
-+    nic->ioaddr = pci->ioaddr & ~3;
-+    nic->irqno = 0;
-+
-+    INF_3C90X.IOAddr = pci->ioaddr & ~3;
-     INF_3C90X.CurrentWindow = 255;
-     switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03))
- 	{
-@@ -756,30 +773,45 @@
-            "Copyright 1999 LightSys Technology Services, Inc.\n"
-            "Portions Copyright 1999 Steve Smith\n");
-     printf("Provided with ABSOLUTELY NO WARRANTY.\n");
-+#ifdef	CFG_3C90X_BOOTROM_FIX
-+    if (INF_3C90X.isBrev)
-+        {
-+        printf("NOTE: 3c905b bootrom fix enabled; has side "
-+	   "effects.  See 3c90x.txt for info.\n");
-+	}
-+#endif
-     printf("-------------------------------------------------------"
-            "------------------------\n");
- 
-     /** Retrieve the Hardware address and print it on the screen. **/
--    INF_3C90X.HWAddr[0] = eeprom[0]>>8;
--    INF_3C90X.HWAddr[1] = eeprom[0]&0xFF;
--    INF_3C90X.HWAddr[2] = eeprom[1]>>8;
--    INF_3C90X.HWAddr[3] = eeprom[1]&0xFF;
--    INF_3C90X.HWAddr[4] = eeprom[2]>>8;
--    INF_3C90X.HWAddr[5] = eeprom[2]&0xFF;
-+    INF_3C90X.HWAddr[0] = eeprom[HWADDR_OFFSET + 0]>>8;
-+    INF_3C90X.HWAddr[1] = eeprom[HWADDR_OFFSET + 0]&0xFF;
-+    INF_3C90X.HWAddr[2] = eeprom[HWADDR_OFFSET + 1]>>8;
-+    INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
-+    INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
-+    INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
-     printf("MAC Address = %!\n", INF_3C90X.HWAddr);
- 
-+    /* Test if the link is good, if not continue */
-+    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winDiagnostics4);
-+    mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w);
-+    if((mstat & (1<<11)) == 0) {
-+	printf("Valid link not established\n");
-+	return 0;
-+    }
-+
-     /** Program the MAC address into the station address registers **/
-     a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
--    outw(htons(eeprom[0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
--    outw(htons(eeprom[1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
--    outw(htons(eeprom[2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
-+    outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
-+    outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
-+    outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
-     outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
-     outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
-     outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
- 
-     /** Fill in our entry in the etherboot arp table **/
-     for(i=0;i<ETH_ALEN;i++)
--	nic->node_addr[i] = (eeprom[i/2] >> (8*((i&1)^1))) & 0xff;
-+	nic->node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;
- 
-     /** Read the media options register, print a message and set default
-      ** xcvr.
-@@ -903,8 +935,8 @@
-     while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
- 	;
- 
--    /** Set the RX filter = receive only individual pkts & bcast. **/
--    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x04);
-+    /** Set the RX filter = receive only individual pkts & multicast & bcast. **/
-+    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
-     a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
- 
- 
-@@ -918,12 +950,46 @@
-                                  cmdAcknowledgeInterrupt, 0x661);
- 
-     /** Set our exported functions **/
--    nic->reset    = a3c90x_reset;
-+    dev->disable  = a3c90x_disable;
-     nic->poll     = a3c90x_poll;
-     nic->transmit = a3c90x_transmit;
--    nic->disable  = a3c90x_disable;
-+    nic->irq      = a3c90x_irq;
- 
--    return nic;
--    }
-+    return 1;
-+}
- 
- 
-+static struct pci_id a3c90x_nics[] = {
-+/* Original 90x revisions: */
-+PCI_ROM(0x10b7, 0x9000, "3c905-tpo",     "3Com900-TPO"),	/* 10 Base TPO */
-+PCI_ROM(0x10b7, 0x9001, "3c905-t4",      "3Com900-Combo"),	/* 10/100 T4 */
-+PCI_ROM(0x10b7, 0x9050, "3c905-tpo100",  "3Com905-TX"),		/* 100 Base TX / 10/100 TPO */
-+PCI_ROM(0x10b7, 0x9051, "3c905-combo",   "3Com905-T4"),		/* 100 Base T4 / 10 Base Combo */
-+/* Newer 90xB revisions: */
-+PCI_ROM(0x10b7, 0x9004, "3c905b-tpo",    "3Com900B-TPO"),	/* 10 Base TPO */
-+PCI_ROM(0x10b7, 0x9005, "3c905b-combo",  "3Com900B-Combo"),	/* 10 Base Combo */
-+PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2",   "3Com900B-2/T"),	/* 10 Base TP and Base2 */
-+PCI_ROM(0x10b7, 0x900a, "3c905b-fl",     "3Com900B-FL"),	/* 10 Base FL */
-+PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"),	/* 10/100 TPO */
-+PCI_ROM(0x10b7, 0x9056, "3c905b-t4",     "3Com905B-T4"),	/* 10/100 T4 */
-+PCI_ROM(0x10b7, 0x9058, "3c905b-9058",   "3Com905B-9058"),	/* Cyclone 10/100/BNC */
-+PCI_ROM(0x10b7, 0x905a, "3c905b-fx",     "3Com905B-FL"),	/* 100 Base FX / 10 Base FX */
-+/* Newer 90xC revision: */
-+PCI_ROM(0x10b7, 0x9200, "3c905c-tpo",    "3Com905C-TXM"),	/* 10/100 TPO (3C905C-TXM) */
-+PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm","3Com20B-EMB WNM"),
-+PCI_ROM(0x10b7, 0x9800, "3c980",         "3Com980-Cyclone"),	/* Cyclone */
-+PCI_ROM(0x10b7, 0x9805, "3c9805",        "3Com9805"),		/* Dual Port Server Cyclone */
-+PCI_ROM(0x10b7, 0x7646, "3csoho100-tx",  "3CSOHO100-TX"),	/* Hurricane */
-+PCI_ROM(0x10b7, 0x4500, "3c450",         "3Com450 HomePNA Tornado"),
-+PCI_ROM(0x10b7, 0x1201, "3c982a",        "3Com982A"),
-+PCI_ROM(0x10b7, 0x1202, "3c982b",        "3Com982B"),
-+};
-+
-+struct pci_driver a3c90x_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "3C90X",
-+	.probe    = a3c90x_probe,
-+	.ids      = a3c90x_nics,
-+	.id_count = sizeof(a3c90x_nics)/sizeof(a3c90x_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/3c90x.txt
-===================================================================
---- a/netboot/3c90x.txt
-+++ /dev/null
-@@ -1,307 +0,0 @@
--
--	Instructions for use of the 3C90X driver for EtherBoot
--
--		Original 3C905B support by:
--			Greg Beeley (Greg.Beeley@LightSys.org),
--			LightSys Technology Services, Inc.
--			February 11, 1999
--
--		Updates for 3C90X family by:
--			Steve Smith (steve.smith@juno.com)
--			October 1, 1999
--
--		Minor documentation updates by
--			Greg Beeley (Greg.Beeley@LightSys.org)
--			March 29, 2000
--
---------------------------------------------------------------------------------
--
--I   OVERVIEW
--
--    The 3c90X series ethernet cards are a group of high-performance busmaster
--    DMA cards from 3Com.  This particular driver supports both the 3c90x and
--    the 3c90xB revision cards.  3C90xC family support has been tested to some
--    degree but not extensively.
--
--    Here's the licensing information:
--
--    This program Copyright (C) 1999 LightSys Technology Services, Inc.
--    Portions Copyright (C) 1999 Steve Smith.
--
--    This program may be re-distributed in source or binary form, modified,
--    sold, or copied for any purpose, provided that the above copyright message
--    and this text are included with all source copies or derivative works, and
--    provided that the above copyright message and this text are included in the
--    documentation of any binary-only distributions.  This program is
--    distributed WITHOUT ANY WARRANTY, without even the warranty of FITNESS FOR
--    A PARTICULAR PURPOSE or MERCHANTABILITY.  Please read the associated
--    documentation "3c90x.txt" before compiling and using this driver.
--
--
--II  FLASH PROMS
--
--    The 3c90xB cards, according to the 3Com documentation, only accept the
--    following flash memory chips:
--
--	Atmel AT29C512 (64 kilobyte)
--	Atmel AT29C010 (128 kilobyte)
--
--    The 3c90x cards, according to the 3Com documentation, accept the
--    following flash memory chips capacities:
--
--	64  kb (8 kB)
--	128 kb (16 kB)
--	256 kb (32 kB) and
--	512 kb (64 kB)
--
--    Atmel AT29C512 (64 kilobyte) chips are specifically listed for both
--    adapters, but flashing on the 3c905b cards would only be supported
--    through the Atmel parts.  Any device, of the supported size, should
--    be supported when programmed by a dedicated PROM programmer (e.g.
--    not the card).
--
--    To use this driver in such a PROM, visit Atmel's web site and download
--    their .PDF file containing a list of their distributors.  Contact the
--    distributors for pricing information.  The prices are quite reasonable
--    (about $3 US each for the 64 kB part), and are comparable to what one would
--    expect for similarly sized standard EPROMs.  And, the flash chips are much
--    easier to work with, as they don't need to be UV-erased to be reprogrammed.
--    The 3C905B card actually provides a method to program the flash memory
--    while it is resident on board the card itself; if someone would like to
--    write a small DOS program to do the programming, I can provide the
--    information about the registers and so forth.
--
--    A utility program, 3c90xutil, is provided with Etherboot in the 'contrib'
--    directory that allows for the on-board flashing of the ROM while Linux
--    is running.  The program has been successfully used under Linux, but I
--    have heard problem reports of its use under FreeBSD.  Anyone willing to
--    make it work under FreeBSD is more than welcome to do so!
--
--    You also have the option of using EPROM chips - the 3C905B-TX-NM has been
--    successfully tested with 27C256 (32kB) and 27C512 (64kB) chips with a
--    specified access time of 100ns and faster.
--
--
--III GENERAL USE
--
--    Normally, the basic procedure for using this driver is as follows:
--
--	1.  Run the 3c90xcfg program on the driver diskette to enable the
--	boot PROM and set it to 64k or 128k, as appropriate.
--	2.  Build the appropriate 3c90x.fd0 or 3c90x.fd0 floppy image with
--	possibly the value CFG_3C90X_XCVR defined to the transceiver type that
--	you want to use (i.e., 10/100 rj45, AUI, coax, MII).
--	3.  Run the floppy image on the PC to be network booted, to get
--	it configured, and to verify that it will boot properly.
--	4.  Build the 3c90x.rom or 3c90x.lzrom PROM image and program
--	it into the flash or EPROM memory chip.
--	5.  Put the PROM in the ethernet card, boot and enable 'boot from
--	network first' in the system BIOS, save and reboot.
--
--    Here are some issues to be aware of:
--
--	1.  If you experience crashes or different behaviour when using the
--	boot PROM, add the setting CFG_3C90X_BOOTROM_FIX and go through the
--	steps 2-5 above.  This works around a bug in some 3c905B cards (see
--	below), but has some side-effects which may not be desirable.
--        Please note that you have to boot off a floppy (not PROM!) once for
--        this fix to take effect.
--	2.  The possible need to manually set the CFG_3C90X_XCVR value to
--	configure the transceiver type.  Values are listed below.
--	3.  The possible need to define CFG_3C90X_PRESERVE_XCVR for use in
--	operating systems that don't intelligently determine the
--	transceiver type.
--
--    Some things that are on the 'To-Do' list, perhaps for me, but perhaps
--    for any other volunteers out there:
--
--	1.  Extend the driver to fully implement the auto-select
--	algorithm if the card has multiple media ports.
--	2.  Fix any bugs in the code <grin>....
--	3.  Extend the driver to support the 3c905c revision cards
--	"officially".  Right now, the support has been primarily empirical
--	and not based on 3c905C documentation.
--
--    Now for the details....
--
--    This driver has been tested on roughly 300 systems.  The main two
--    configuration issues to contend with are:
--
--	1.  Ensure that PCI Busmastering is enabled for the adapter (configured
--	in the CMOS setup)
--	2.  Some systems don't work properly with the adapter when plug and
--	play OS is enabled; I always set it to "No" or "Disabled" -- this makes
--	it easier and really doesn't adversely affect anything.
--
--    Roughly 95% of the systems worked when configured properly.  A few
--    have issues with booting locally once the boot PROM has been installed
--    (this number has been less than 2%).  Other configuration issues that
--    to check:
--
--	1.  Newer BIOS's actually work correctly with the network boot order.
--	Set the network adapter first.  Most older BIOS's automatically go to
--	the network boot PROM first.
--	2.  For systems where the adapter was already installed and is just
--	having the PROM installed, try setting the "reset configuration data"
--	to yes in the CMOS setup if the BIOS isn't seen at first.  If your BIOS
--	doesn't have this option, remove the card, start the system, shut down,
--	install the card and restart (or switch to a different PCI slot).
--	3.  Make sure the CMOS security settings aren't preventing a boot.
--
--    The 3c905B cards have a significant 'bug' that relates to the flash prom:
--    unless the card is set internally to the MII transceiver, it will only
--    read the first 8k of the PROM image.  Don't ask why -- it seems really
--    obscure, but it has to do with the way they mux'd the address lines
--    from the PCI bus to the ROM.  Unfortunately, most of us are not using
--    MII transceivers, and even the .lzrom image ends up being just a little
--    bit larger than 8k.  Note that the workaround for this is disabled by
--    default, because the Windows NT 4.0 driver does not like it (no packets
--    are transmitted).
--
--    So, the solution that I've used is to internally set the card's nvram
--    configuration to use MII when it boots.  The 3c905b driver does this
--    automatically.  This way, the 16k prom image can be loaded into memory,
--    and then the 3c905b driver can set the temporary configuration of the
--    card to an appropriate value, either configurable by the user or chosen
--    by the driver.
--
--    To enable the 3c905B bugfix, which is necessary for these cards when 
--    booting from the Flash ROM, define -DCFG_3C90X_BOOTROM_FIX when building,
--    create a floppy image and boot it once.
--    Thereafter, the card should accept the larger prom image.
--
--    The driver should choose an appropriate transceiver on the card.  However,
--    if it doesn't on your card or if you need to, for instance, set your
--    card to 10mbps when connected to an unmanaged 10/100 hub, you can specify
--    which transceiver you want to use.  To do this, build the 3c905b.fd0
--    image with -DCFG_3C90X_XCVR=x, where 'x' is one of the following
--    values:
--
--	0	10Base-T
--	1	10mbps AUI
--	3	10Base-2 (thinnet/coax)
--	4	100Base-TX
--	5	100Base-FX
--	6	MII
--	8	Auto-negotiation 10Base-T / 100Base-TX (usually the default)
--	9	MII External MAC Mode
--	255	Allow driver to choose an 'appropriate' media port.
--
--    Then proceed from step 2 in the above 'general use' instructions.  The
--    .rom image can be built with CFG_3C90X_XCVR set to a value, but you
--    normally don't want to do this, since it is easier to change the
--    transceiver type by rebuilding a new floppy, changing the BIOS to floppy
--    boot, booting, and then changing the BIOS back to network boot.  If
--    CFG_3C90X_XCVR is not set in a particular build, it just uses the
--    current configuration (either its 'best guess' or whatever the stored
--    CFG_3C90X_XCVR value was from the last time it was set).
--
--    [[ Note for the more technically inclined:  The CFG_3C90X_XCVR value is
--    programmed into a register in the card's NVRAM that was reserved for
--    LanWorks PROM images to use.  When the driver boots, the card comes
--    up in MII mode, and the driver checks the LanWorks register to find
--    out if the user specified a transceiver type.  If it finds that
--    information, it uses that, otherwise it picks a transceiver that the
--    card has based on the 3c905b's MediaOptions register.  This driver isn't
--    quite smart enough to always determine which media port is actually
--    _connected_; maybe someone else would like to take on that task (it
--    actually involves sending a self-directed packet and seeing if it
--    comes back.  IF it does, that port is connected). ]]
--
--    Another issue to keep in mind is that it is possible that some OS'es
--    might not be happy with the way I've handled the PROM-image hack with
--    setting MII mode on bootup.  Linux 2.0.35 does not have this problem.
--    Behavior of other systems may vary.  The 3com documentation specifically
--    says that, at least with the card that I have, the device driver in the
--    OS should auto-select the media port, so other drivers should work fine
--    with this 'hack'.  However, if yours doesn't seem to, you can try defining
--    CFG_3C90X_PRESERVE_XCVR when building to cause Etherboot to keep the
--    working setting (that allowed the bootp/tftp process) across the eth_reset
--    operation.
--
--
--IV  FOR DEVELOPERS....
--
--    If you would like to fix/extend/etc. this driver, feel free to do so; just
--    be sure you can test the modified version on the 3c905B-TX cards that the
--    driver was originally designed for.  This section of this document gives
--    some information that might be relevant to a programmer.
--
--    A.  Main Entry Point
--
--	a3c90x_probe is the main entry point for this driver.  It is referred
--	to in an array in 'config.c'.
--
--    B.  Other Important Functions
--
--	The functions a3c90x_transmit, a3c90x_poll, a3c90x_reset, and
--	a3c90x_disable are static functions that EtherBoot finds out about
--	as a  result of a3c90x_probe setting entries in the nic structure
--	for them.  The EtherBoot framework does not use interrupts.  It is
--	polled.  All transmit and receive operations are initiated by the
--	etherboot framework, not by an interrupt or by the driver.
--
--    C.  Internal Functions
--
--	The following functions are internal to the driver:
--
--	a3c90x_internal_IssueCommand - sends a command to the 3c905b card.
--	a3c90x_internal_SetWindow - shifts between one of eight register
--	windows onboard the 3c90x.  The bottom 16 bytes of the card's
--	I/O space are multiplexed among 128 bytes, only 16 of which are
--	visible at any one time.  This SetWindow function selects one of
--	the eight sets.
--	a3c90x_internal_ReadEeprom - reads a word (16 bits) from the
--	card's onboard nvram.  This is NOT the BIOS boot rom.  This is
--	where the card stores such things as its hardware address.
--	a3c90x_internal_WriteEeprom - writes a word (16 bits) to the
--	card's nvram, and recomputes the eeprom checksum.
--	a3c90x_internal_WriteEepromWord - writes a word (16 bits) to the
--	card's nvram.  Used by the above routine.
--	a3c90x_internal_WriteEepromWord - writes a word (16 bits) to the
--	card's nvram.  Used by the above routine.
--
--    D.  Globals
--
--	All global variables are inside a global structure named INF_3C90X.
--	So, wherever you see that structure referenced, you know the variable
--	is a global.  Just keeps things a little neater.
--
--    E.  Enumerations
--
--	There are quite a few enumerated type definitions for registers and
--	so forth, many for registers that I didn't even touch in the driver.
--	Register types start with 'reg', window numbers (for SetWindow)
--	start with 'win', and commands (for IssueCommand) start with 'cmd'.
--	Register offsets also include an indication in the name as to the
--	size of the register (_b = byte, _w = word, _l = long), and which
--	window the register is in, if it is windowed (0-7).
--
--    F.  Why the 'a3c90x' name?
--
--	I had to come up with a letter at the beginning of all of the
--	identifiers, since 3com so conveniently had their name start with a
--	number.  Another driver used 't' (for 'three'?); I chose 'a' for
--	no reason at all.
--
--Addendum by Jorge L. deLyra <delyra@latt.if.usp.br>, 22Nov2000 re
--working around the 3C905 hardware bug mentioned above:
--
--Use this floppy to fix any 3COM model 3C905B PCI 10/100 Ethernet cards
--that fail to load and run the boot program the first time around. If
--they have a "Lucent" rather than a "Broadcom" chipset these cards have
--a configuration bug that causes a hang when trying to load the boot
--program from the PROM, if you try to use them right out of the box.
--
--The boot program in this floppy is the file named 3c905b-tpo100.rom
--from Etherboot version 4.6.10, compiled with the bugfix parameter
--
--			CFG_3C90X_BOOTROM_FIX
--
--You have to take the chip off the card and boot the system once using
--this floppy. Once loaded from the floppy, the boot program will access
--the card and change some setting in it, correcting the problem. After
--that you may use either this boot program or the normal one, compiled
--without this bugfix parameter, to boot the machine from the PROM chip.
--
--[Any recent Etherboot version should do, not just 4.6.10 - Ed.]
-Index: b/netboot/Makefile.am
-===================================================================
---- a/netboot/Makefile.am
-+++ b/netboot/Makefile.am
-@@ -10,58 +10,72 @@
- 
- noinst_LIBRARIES = $(LIBDRIVERS)
- 
--libdrivers_a_SOURCES = cards.h config.c etherboot.h \
--	fsys_tftp.c linux-asm-io.h linux-asm-string.h \
--	main.c misc.c nic.h osdep.h pci.c pci.h timer.c timer.h
--EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c595.c 3c595.h 3c90x.c \
--	cs89x0.c cs89x0.h davicom.c depca.c eepro.c eepro100.c \
--	epic100.c epic100.h fa311.c i82586.c lance.c natsemi.c \
--	ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \
--	sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
--	tiara.c tlan.c tulip.c via-rhine.c w89c840.c
-+libdrivers_a_SOURCES = big_bswap.h bootp.h byteswap.h config.c cpu.h \
-+	dev.h elf.h endian.h etherboot.h fsys_tftp.c grub.h \
-+	i386_byteswap.h i386_elf.h i386_endian.h i386_timer.c \
-+	if_arp.h if_ether.h igmp.h in.h io.h ip.h isa.h latch.h \
-+	little_bswap.h misc.c nic.c nic.h osdep.h pci.c pci.h \
-+	pci_ids.h pci_io.c stdint.h tftp.h timer.c timer.h \
-+	types.h udp.h mii.h pic8259.c pic8259.h pxe.h basemem.c segoff.h
-+EXTRA_libdrivers_a_SOURCES = 3c595.c 3c595.h 3c90x.c davicom.c \
-+	e1000.c e1000_hw.h eepro100.c epic100.c epic100.h natsemi.c \
-+	ns8390.c ns8390.h pcnet32.c rtl8139.c sis900.c sis900.h \
-+	sundance.c tg3.c tg3.h tlan.c tlan.h tulip.c via-rhine.c \
-+	w89c840.c r8169.c forcedeth.c ns83820.c pnic.c pnic_api.c \
-+	undi.c undi.h
- libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	-DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
- # Filled by configure.
- libdrivers_a_LIBADD = @NETBOOT_DRIVERS@
- libdrivers_a_DEPENDENCIES = $(libdrivers_a_LIBADD)
- 
--EXTRA_DIST = README.netboot 3c90x.txt cs89x0.txt sis900.txt tulip.txt
-+EXTRA_DIST = README.netboot
- 
- # These below are several special rules for the device drivers.
- # We cannot use a simple rule for them...
- 
- # What objects are derived from a driver?
--3c509_drivers = 3c509.o 3c529.o
-+#3c509_drivers = 3c509.o 3c529.o
- 3c595_drivers = 3c595.o
- 3c90x_drivers = 3c90x.o
--cs89x0_drivers = cs89x0.o
-+#cs89x0_drivers = cs89x0.o
- davicom_drivers = davicom.o
--depca_drivers = depca.o
--eepro_drivers = eepro.o
-+#depca_drivers = depca.o
-+#eepro_drivers = eepro.o
-+e1000_drivers = e1000.o
- eepro100_drivers = eepro100.o
- epic100_drivers = epic100.o
- #fa311_drivers = fa311.o
--i82586_drivers = 3c507.o exos205.o ni5210.o
--lance_drivers = lance.o ne2100.o ni6510.o
-+forcedeth_drivers = forcedeth.o
-+#i82586_drivers = 3c507.o exos205.o ni5210.o
-+#lance_drivers = lance.o ne2100.o ni6510.o
- natsemi_drivers = natsemi.o
--ni5010_drivers = ni5010.o
-+#ni5010_drivers = ni5010.o
-+ns83820_drivers = ns83820.o
- ns8390_drivers = 3c503.o ne.o ns8390.o wd.o
--otulip_drivers = otulip.o
-+#otulip_drivers = otulip.o
-+pcnet32_drivers = pcnet32.o
-+pnic_drivers = pnic.o
-+r8169_drivers = r8169.o
- rtl8139_drivers = rtl8139.o
- sis900_drivers = sis900.o
--sk_g16_drivers = sk_g16.o
--smc9000_drivers = smc9000.o
--tiara_drivers = tiara.o
--#tlan_drivers = tlan.o
-+#sk_g16_drivers = sk_g16.o
-+sundance_driver = sundance.o
-+#smc9000_drivers = smc9000.o
-+tg3_drivers = tg3.o
-+#tiara_drivers = tiara.o
-+tlan_drivers = tlan.o
- tulip_drivers = tulip.o
-+undi_drivers = undi.o
- via_rhine_drivers = via_rhine.o
- w89c840_drivers = w89c840.o
- 
-+
- # Is it really necessary to specify dependecies explicitly?
--$(3c509_drivers): 3c509.c 3c509.h
--$(3c509_drivers): %.o: 3c509.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(3c509_drivers): 3c509.c 3c509.h
-+#$(3c509_drivers): %.o: 3c509.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- $(3c595_drivers): 3c595.c 3c595.h
- $(3c595_drivers): %.o: 3c595.c
-@@ -73,23 +87,28 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(cs89x0_drivers): cs89x0.c cs89x0.h
--$(cs89x0_drivers): %.o: cs89x0.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(cs89x0_drivers): cs89x0.c cs89x0.h
-+#$(cs89x0_drivers): %.o: cs89x0.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- $(davicom_drivers): davicom.c
- $(davicom_drivers): %.o: davicom.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(depca_drivers): depca.c
--$(depca_drivers): %.o: depca.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(depca_drivers): depca.c
-+#$(depca_drivers): %.o: depca.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+#$(eepro_drivers): eepro.c
-+#$(eepro_drivers): %.o: eepro.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(eepro_drivers): eepro.c
--$(eepro_drivers): %.o: eepro.c
-+$(e1000_drivers): e1000.c e1000_hw.h
-+$(e1000_drivers): %.o: e1000.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-@@ -103,28 +122,38 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-+$(forcedeth_drivers): forcedeth.c
-+$(forcedeth_drivers): %.o: forcedeth.c
-+	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
- #$(fa311_drivers): fa311.c
- #$(fa311_drivers): %.o: fa311.c
- #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(i82586_drivers): i82586.c
--$(i82586_drivers): %.o: i82586.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(i82586_drivers): i82586.c
-+#$(i82586_drivers): %.o: i82586.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(lance_drivers): lance.c
--$(lance_drivers): %.o: lance.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(lance_drivers): lance.c
-+#$(lance_drivers): %.o: lance.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- $(natsemi_drivers): natsemi.c
- $(natsemi_drivers): %.o: natsemi.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(ni5010_drivers): ni5010.c
--$(ni5010_drivers): %.o: ni5010.c
-+#$(ni5010_drivers): ni5010.c
-+#$(ni5010_drivers): %.o: ni5010.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(ns83820_drivers): ns83820.c
-+$(ns83820_drivers): %.o: ns83820.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-@@ -133,8 +162,18 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(otulip_drivers): otulip.c otulip.h
--$(otulip_drivers): %.o: otulip.c
-+#$(otulip_drivers): otulip.c otulip.h
-+#$(otulip_drivers): %.o: otulip.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(pcnet32_drivers): pcnet32.c
-+$(pcnet32_drivers): %.o: pcnet32.c
-+	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(pnic_drivers): pnic.c
-+$(pnic_drivers): %.o: pnic.c pnic_api.h
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-@@ -143,36 +182,56 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(sis900_drivers): sis900.c
--$(sis900_drivers): %.o: sis900.c sis900.h
-+$(r8169_drivers): r8169.c
-+$(r8169_drivers): %.o: r8169.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(sk_g16_drivers): sk_g16.c sk_g16.h
--$(sk_g16_drivers): %.o: sk_g16.c
-+$(sis900_drivers): sis900.c sis900.h
-+$(sis900_drivers): %.o: sis900.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(smc9000_drivers): smc9000.c smc9000.h
--$(smc9000_drivers): %.o: smc9000.c
-+#$(sk_g16_drivers): sk_g16.c sk_g16.h
-+#$(sk_g16_drivers): %.o: sk_g16.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+#$(smc9000_drivers): smc9000.c smc9000.h
-+#$(smc9000_drivers): %.o: smc9000.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(sundance_drivers): sundance.c
-+$(sundance_drivers): %.o: sundance.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(tiara_drivers): tiara.c
--$(tiara_drivers): %.o: tiara.c
-+$(tg3_drivers): tg3.c tg3.h
-+$(tg3_drivers): %.o: tg3.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--#$(tlan_drivers): tlan.c
--#$(tlan_drivers): %.o: tlan.c
-+#$(tiara_drivers): tiara.c
-+#$(tiara_drivers): %.o: tiara.c
- #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-+$(tlan_drivers): tlan.c tlan.h
-+$(tlan_drivers): %.o: tlan.c
-+	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
- $(tulip_drivers): tulip.c
- $(tulip_drivers): %.o: tulip.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-+$(undi_drivers): undi.c undi.h
-+$(undi_drivers): %.o: undi.c
-+	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+          $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
- $(via_rhine_drivers): via-rhine.c
- $(via_rhine_drivers): %.o: via-rhine.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-@@ -184,36 +243,45 @@
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- # Per-object flags.
--3c509_o_CFLAGS = -DINCLUDE_3C509=1
--3c529_o_CFLAGS = -DINCLUDE_3C529=1
-+#3c509_o_CFLAGS = -DINCLUDE_3C509=1
-+#3c529_o_CFLAGS = -DINCLUDE_3C529=1
- 3c595_o_CFLAGS = -DINCLUDE_3C595=1
- 3c90x_o_CFLAGS = -DINCLUDE_3C90X=1
--cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
-+#cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
- davicom_o_CFLAGS = -DINCLUDE_DAVICOM=1
--depca_o_CFLAGS = -DINCLUDE_DEPCA=1
--eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
-+#depca_o_CFLAGS = -DINCLUDE_DEPCA=1
-+#eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
-+e1000_o_CFLAGS = -DINCLUDE_E1000=1
- eepro100_o_CFLAGS = -DINCLUDE_EEPRO100=1
- epic100_o_CFLAGS = -DINCLUDE_EPIC100=1
- #fa311_o_CFLAGS = -DINCLUDE_FA311=1
--3c507_o_CFLAGS = -DINCLUDE_3C507=1
--exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
--ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
--lance_o_CFLAGS = -DINCLUDE_LANCE=1
--ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
--ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
-+forcedeth_o_CFLAGS = -DINCLUDE_FORCEDETH=1
-+#3c507_o_CFLAGS = -DINCLUDE_3C507=1
-+#exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
-+#ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
-+#lance_o_CFLAGS = -DINCLUDE_LANCE=1
-+#ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
-+#ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
- natsemi_o_CFLAGS = -DINCLUDE_NATSEMI=1
--ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
--3c503_o_CFLAGS = -DINCLUDE_3C503=1
--ne_o_CFLAGS = -DINCLUDE_NE=1
-+#ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
-+#3c503_o_CFLAGS = -DINCLUDE_3C503=1
-+#ne_o_CFLAGS = -DINCLUDE_NE=1
-+ns83820_o_CFLAGS = -DINCLUDE_NS83820=1
- ns8390_o_CFLAGS = -DINCLUDE_NS8390=1
--wd_o_CFLAGS = -DINCLUDE_WD=1
--otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
-+#wd_o_CFLAGS = -DINCLUDE_WD=1
-+#otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
-+pcnet32_o_CFLAGS = -DINCLUDE_PCNET32=1
-+pnic_o_CFLAGS = -DINCLUDE_PNIC=1
-+r8169_o_CFLAGS = -DINCLUDE_R8169=1
- rtl8139_o_CFLAGS = -DINCLUDE_RTL8139=1
- sis900_o_CFLAGS = -DINCLUDE_SIS900=1
--sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
--smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
--tiara_o_CFLAGS = -DINCLUDE_TIARA=1
--#tlan_o_CFLAGS = -DINCLUDE_TLAN=1
-+#sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
-+#smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
-+sundance_o_CFLAGS = -DINCLUDE_SUNDANCE=1
-+#tiara_o_CFLAGS = -DINCLUDE_TIARA=1
-+tg3_o_CFLAGS = -DINCLUDE_TG3=1
-+tlan_o_CFLAGS = -DINCLUDE_TLAN=1
- tulip_o_CFLAGS = -DINCLUDE_TULIP=1
-+undi_o_CFLAGS = -DINCLUDE_UNDI=1
- via_rhine_o_CFLAGS = -DINCLUDE_VIA_RHINE=1
- w89c840_o_CFLAGS = -DINCLUDE_W89C840=1
-Index: b/netboot/Makefile.in
-===================================================================
---- a/netboot/Makefile.in
-+++ b/netboot/Makefile.in
-@@ -46,18 +46,51 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--LIBRARIES = $(noinst_LIBRARIES)
- AR = ar
- ARFLAGS = cru
-+LIBRARIES = $(noinst_LIBRARIES)
- libdrivers_a_AR = $(AR) $(ARFLAGS)
- am_libdrivers_a_OBJECTS = libdrivers_a-config.$(OBJEXT) \
--	libdrivers_a-fsys_tftp.$(OBJEXT) libdrivers_a-main.$(OBJEXT) \
--	libdrivers_a-misc.$(OBJEXT) libdrivers_a-pci.$(OBJEXT) \
--	libdrivers_a-timer.$(OBJEXT)
-+	libdrivers_a-fsys_tftp.$(OBJEXT) \
-+	libdrivers_a-i386_timer.$(OBJEXT) libdrivers_a-misc.$(OBJEXT) \
-+	libdrivers_a-nic.$(OBJEXT) libdrivers_a-pci.$(OBJEXT) \
-+	libdrivers_a-pci_io.$(OBJEXT) libdrivers_a-timer.$(OBJEXT) \
-+	libdrivers_a-pic8259.$(OBJEXT) libdrivers_a-basemem.$(OBJEXT)
- libdrivers_a_OBJECTS = $(am_libdrivers_a_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/libdrivers_a-3c595.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-3c90x.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-basemem.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-config.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-davicom.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-e1000.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-eepro100.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-epic100.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-forcedeth.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-fsys_tftp.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-i386_timer.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-misc.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-natsemi.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-nic.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-ns83820.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-ns8390.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pci.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pci_io.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pcnet32.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pic8259.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pnic.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-pnic_api.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-r8169.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-rtl8139.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-sis900.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-tg3.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-timer.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-tlan.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-tulip.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-via-rhine.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/libdrivers_a-w89c840.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -148,8 +181,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -186,16 +217,19 @@
- # Don't build the netboot support by default.
- @NETBOOT_SUPPORT_TRUE@LIBDRIVERS = libdrivers.a
- noinst_LIBRARIES = $(LIBDRIVERS)
--libdrivers_a_SOURCES = cards.h config.c etherboot.h \
--	fsys_tftp.c linux-asm-io.h linux-asm-string.h \
--	main.c misc.c nic.h osdep.h pci.c pci.h timer.c timer.h
--
--EXTRA_libdrivers_a_SOURCES = 3c509.c 3c509.h 3c595.c 3c595.h 3c90x.c \
--	cs89x0.c cs89x0.h davicom.c depca.c eepro.c eepro100.c \
--	epic100.c epic100.h fa311.c i82586.c lance.c natsemi.c \
--	ni5010.c ns8390.c ns8390.h otulip.c otulip.h rtl8139.c \
--	sis900.c sis900.h sk_g16.c sk_g16.h smc9000.c smc9000.h \
--	tiara.c tlan.c tulip.c via-rhine.c w89c840.c
-+libdrivers_a_SOURCES = big_bswap.h bootp.h byteswap.h config.c cpu.h \
-+	dev.h elf.h endian.h etherboot.h fsys_tftp.c grub.h \
-+	i386_byteswap.h i386_elf.h i386_endian.h i386_timer.c \
-+	if_arp.h if_ether.h igmp.h in.h io.h ip.h isa.h latch.h \
-+	little_bswap.h misc.c nic.c nic.h osdep.h pci.c pci.h \
-+	pci_ids.h pci_io.c stdint.h tftp.h timer.c timer.h \
-+	types.h udp.h mii.h pic8259.c pic8259.h pxe.h basemem.c segoff.h
-+
-+EXTRA_libdrivers_a_SOURCES = 3c595.c 3c595.h 3c90x.c davicom.c \
-+	e1000.c e1000_hw.h eepro100.c epic100.c epic100.h natsemi.c \
-+	ns8390.c ns8390.h pcnet32.c rtl8139.c sis900.c sis900.h \
-+	tg3.c tg3.h tlan.c tlan.h tulip.c via-rhine.c \
-+	w89c840.c r8169.c forcedeth.c ns83820.c pnic.c pnic_api.c 
- 
- libdrivers_a_CFLAGS = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	-DFSYS_TFTP=1 $(NET_CFLAGS) $(NET_EXTRAFLAGS)
-@@ -203,69 +237,83 @@
- # Filled by configure.
- libdrivers_a_LIBADD = @NETBOOT_DRIVERS@
- libdrivers_a_DEPENDENCIES = $(libdrivers_a_LIBADD)
--EXTRA_DIST = README.netboot 3c90x.txt cs89x0.txt sis900.txt tulip.txt
-+EXTRA_DIST = README.netboot
- 
- # These below are several special rules for the device drivers.
- # We cannot use a simple rule for them...
- 
- # What objects are derived from a driver?
--3c509_drivers = 3c509.o 3c529.o
-+#3c509_drivers = 3c509.o 3c529.o
- 3c595_drivers = 3c595.o
- 3c90x_drivers = 3c90x.o
--cs89x0_drivers = cs89x0.o
-+#cs89x0_drivers = cs89x0.o
- davicom_drivers = davicom.o
--depca_drivers = depca.o
--eepro_drivers = eepro.o
-+#depca_drivers = depca.o
-+#eepro_drivers = eepro.o
-+e1000_drivers = e1000.o
- eepro100_drivers = eepro100.o
- epic100_drivers = epic100.o
- #fa311_drivers = fa311.o
--i82586_drivers = 3c507.o exos205.o ni5210.o
--lance_drivers = lance.o ne2100.o ni6510.o
-+forcedeth_drivers = forcedeth.o
-+#i82586_drivers = 3c507.o exos205.o ni5210.o
-+#lance_drivers = lance.o ne2100.o ni6510.o
- natsemi_drivers = natsemi.o
--ni5010_drivers = ni5010.o
-+#ni5010_drivers = ni5010.o
-+ns83820_drivers = ns83820.o
- ns8390_drivers = 3c503.o ne.o ns8390.o wd.o
--otulip_drivers = otulip.o
-+#otulip_drivers = otulip.o
-+pcnet32_drivers = pcnet32.o
-+pnic_drivers = pnic.o
-+r8169_drivers = r8169.o
- rtl8139_drivers = rtl8139.o
- sis900_drivers = sis900.o
--sk_g16_drivers = sk_g16.o
--smc9000_drivers = smc9000.o
--tiara_drivers = tiara.o
--#tlan_drivers = tlan.o
-+#sk_g16_drivers = sk_g16.o
-+#smc9000_drivers = smc9000.o
-+tg3_drivers = tg3.o
-+#tiara_drivers = tiara.o
-+tlan_drivers = tlan.o
- tulip_drivers = tulip.o
- via_rhine_drivers = via_rhine.o
- w89c840_drivers = w89c840.o
- 
- # Per-object flags.
--3c509_o_CFLAGS = -DINCLUDE_3C509=1
--3c529_o_CFLAGS = -DINCLUDE_3C529=1
-+#3c509_o_CFLAGS = -DINCLUDE_3C509=1
-+#3c529_o_CFLAGS = -DINCLUDE_3C529=1
- 3c595_o_CFLAGS = -DINCLUDE_3C595=1
- 3c90x_o_CFLAGS = -DINCLUDE_3C90X=1
--cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
-+#cs89x0_o_CFLAGS = -DINCLUDE_CS89X0=1
- davicom_o_CFLAGS = -DINCLUDE_DAVICOM=1
--depca_o_CFLAGS = -DINCLUDE_DEPCA=1
--eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
-+#depca_o_CFLAGS = -DINCLUDE_DEPCA=1
-+#eepro_o_CFLAGS = -DINCLUDE_EEPRO=1
-+e1000_o_CFLAGS = -DINCLUDE_E1000=1
- eepro100_o_CFLAGS = -DINCLUDE_EEPRO100=1
- epic100_o_CFLAGS = -DINCLUDE_EPIC100=1
- #fa311_o_CFLAGS = -DINCLUDE_FA311=1
--3c507_o_CFLAGS = -DINCLUDE_3C507=1
--exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
--ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
--lance_o_CFLAGS = -DINCLUDE_LANCE=1
--ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
--ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
-+forcedeth_o_CFLAGS = -DINCLUDE_FORCEDETH=1
-+#3c507_o_CFLAGS = -DINCLUDE_3C507=1
-+#exos205_o_CFLAGS = -DINCLUDE_EXOS205=1
-+#ni5210_o_CFLAGS = -DINCLUDE_NI5210=1
-+#lance_o_CFLAGS = -DINCLUDE_LANCE=1
-+#ne2100_o_CFLAGS = -DINCLUDE_NE2100=1
-+#ni6510_o_CFLAGS = -DINCLUDE_NI6510=1
- natsemi_o_CFLAGS = -DINCLUDE_NATSEMI=1
--ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
--3c503_o_CFLAGS = -DINCLUDE_3C503=1
--ne_o_CFLAGS = -DINCLUDE_NE=1
-+#ni5010_o_CFLAGS = -DINCLUDE_NI5010=1
-+#3c503_o_CFLAGS = -DINCLUDE_3C503=1
-+#ne_o_CFLAGS = -DINCLUDE_NE=1
-+ns83820_o_CFLAGS = -DINCLUDE_NS83820=1
- ns8390_o_CFLAGS = -DINCLUDE_NS8390=1
--wd_o_CFLAGS = -DINCLUDE_WD=1
--otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
-+#wd_o_CFLAGS = -DINCLUDE_WD=1
-+#otulip_o_CFLAGS = -DINCLUDE_OTULIP=1
-+pcnet32_o_CFLAGS = -DINCLUDE_PCNET32=1
-+pnic_o_CFLAGS = -DINCLUDE_PNIC=1
-+r8169_o_CFLAGS = -DINCLUDE_R8169=1
- rtl8139_o_CFLAGS = -DINCLUDE_RTL8139=1
- sis900_o_CFLAGS = -DINCLUDE_SIS900=1
--sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
--smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
--tiara_o_CFLAGS = -DINCLUDE_TIARA=1
--#tlan_o_CFLAGS = -DINCLUDE_TLAN=1
-+#sk_g16_o_CFLAGS = -DINCLUDE_SK_G16=1
-+#smc9000_o_CFLAGS = -DINCLUDE_SMC9000=1
-+#tiara_o_CFLAGS = -DINCLUDE_TIARA=1
-+tg3_o_CFLAGS = -DINCLUDE_TG3=1
-+tlan_o_CFLAGS = -DINCLUDE_TLAN=1
- tulip_o_CFLAGS = -DINCLUDE_TULIP=1
- via_rhine_o_CFLAGS = -DINCLUDE_VIA_RHINE=1
- w89c840_o_CFLAGS = -DINCLUDE_W89C840=1
-@@ -316,32 +364,32 @@
- distclean-compile:
- 	-rm -f *.tab.c
- 
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-3c509.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-3c595.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-3c90x.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-basemem.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-config.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-cs89x0.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-davicom.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-depca.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-eepro.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-e1000.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-eepro100.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-epic100.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-fa311.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-forcedeth.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-fsys_tftp.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-i82586.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-lance.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-main.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-i386_timer.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-misc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-natsemi.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-ni5010.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-nic.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-ns83820.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-ns8390.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-otulip.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pci.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pci_io.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pcnet32.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pic8259.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pnic.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-pnic_api.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-r8169.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-rtl8139.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-sis900.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-sk_g16.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-smc9000.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tiara.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tg3.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-timer.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tlan.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libdrivers_a-tulip.Po@am__quote@
-@@ -352,450 +400,513 @@
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- libdrivers_a-config.o: config.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-config.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-config.Tpo" -c -o libdrivers_a-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-config.Tpo" "$(DEPDIR)/libdrivers_a-config.Po"; else rm -f "$(DEPDIR)/libdrivers_a-config.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='libdrivers_a-config.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-config.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-config.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-config.o `test -f 'config.c' || echo '$(srcdir)/'`config.c
- 
- libdrivers_a-config.obj: config.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-config.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-config.Tpo" -c -o libdrivers_a-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-config.Tpo" "$(DEPDIR)/libdrivers_a-config.Po"; else rm -f "$(DEPDIR)/libdrivers_a-config.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config.c' object='libdrivers_a-config.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-config.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-config.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-config.obj `if test -f 'config.c'; then $(CYGPATH_W) 'config.c'; else $(CYGPATH_W) '$(srcdir)/config.c'; fi`
- 
- libdrivers_a-fsys_tftp.o: fsys_tftp.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fsys_tftp.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" -c -o libdrivers_a-fsys_tftp.o `test -f 'fsys_tftp.c' || echo '$(srcdir)/'`fsys_tftp.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" "$(DEPDIR)/libdrivers_a-fsys_tftp.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fsys_tftp.c' object='libdrivers_a-fsys_tftp.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-fsys_tftp.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-fsys_tftp.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fsys_tftp.o `test -f 'fsys_tftp.c' || echo '$(srcdir)/'`fsys_tftp.c
- 
- libdrivers_a-fsys_tftp.obj: fsys_tftp.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fsys_tftp.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" -c -o libdrivers_a-fsys_tftp.obj `if test -f 'fsys_tftp.c'; then $(CYGPATH_W) 'fsys_tftp.c'; else $(CYGPATH_W) '$(srcdir)/fsys_tftp.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo" "$(DEPDIR)/libdrivers_a-fsys_tftp.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fsys_tftp.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fsys_tftp.c' object='libdrivers_a-fsys_tftp.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-fsys_tftp.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-fsys_tftp.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fsys_tftp.obj `if test -f 'fsys_tftp.c'; then $(CYGPATH_W) 'fsys_tftp.c'; else $(CYGPATH_W) '$(srcdir)/fsys_tftp.c'; fi`
- 
--libdrivers_a-main.o: main.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-main.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-main.Tpo" -c -o libdrivers_a-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-main.Tpo" "$(DEPDIR)/libdrivers_a-main.Po"; else rm -f "$(DEPDIR)/libdrivers_a-main.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libdrivers_a-main.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
--
--libdrivers_a-main.obj: main.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-main.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-main.Tpo" -c -o libdrivers_a-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-main.Tpo" "$(DEPDIR)/libdrivers_a-main.Po"; else rm -f "$(DEPDIR)/libdrivers_a-main.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='libdrivers_a-main.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
-+libdrivers_a-i386_timer.o: i386_timer.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i386_timer.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" -c -o libdrivers_a-i386_timer.o `test -f 'i386_timer.c' || echo '$(srcdir)/'`i386_timer.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" "$(DEPDIR)/libdrivers_a-i386_timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i386_timer.c' object='libdrivers_a-i386_timer.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-i386_timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-i386_timer.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i386_timer.o `test -f 'i386_timer.c' || echo '$(srcdir)/'`i386_timer.c
-+
-+libdrivers_a-i386_timer.obj: i386_timer.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i386_timer.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" -c -o libdrivers_a-i386_timer.obj `if test -f 'i386_timer.c'; then $(CYGPATH_W) 'i386_timer.c'; else $(CYGPATH_W) '$(srcdir)/i386_timer.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo" "$(DEPDIR)/libdrivers_a-i386_timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i386_timer.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i386_timer.c' object='libdrivers_a-i386_timer.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-i386_timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-i386_timer.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i386_timer.obj `if test -f 'i386_timer.c'; then $(CYGPATH_W) 'i386_timer.c'; else $(CYGPATH_W) '$(srcdir)/i386_timer.c'; fi`
- 
- libdrivers_a-misc.o: misc.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-misc.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-misc.Tpo" -c -o libdrivers_a-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-misc.Tpo" "$(DEPDIR)/libdrivers_a-misc.Po"; else rm -f "$(DEPDIR)/libdrivers_a-misc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='libdrivers_a-misc.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-misc.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-misc.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
- 
- libdrivers_a-misc.obj: misc.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-misc.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-misc.Tpo" -c -o libdrivers_a-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-misc.Tpo" "$(DEPDIR)/libdrivers_a-misc.Po"; else rm -f "$(DEPDIR)/libdrivers_a-misc.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='libdrivers_a-misc.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-misc.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-misc.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'; fi`
- 
-+libdrivers_a-nic.o: nic.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-nic.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-nic.Tpo" -c -o libdrivers_a-nic.o `test -f 'nic.c' || echo '$(srcdir)/'`nic.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-nic.Tpo" "$(DEPDIR)/libdrivers_a-nic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-nic.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nic.c' object='libdrivers_a-nic.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-nic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-nic.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-nic.o `test -f 'nic.c' || echo '$(srcdir)/'`nic.c
-+
-+libdrivers_a-nic.obj: nic.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-nic.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-nic.Tpo" -c -o libdrivers_a-nic.obj `if test -f 'nic.c'; then $(CYGPATH_W) 'nic.c'; else $(CYGPATH_W) '$(srcdir)/nic.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-nic.Tpo" "$(DEPDIR)/libdrivers_a-nic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-nic.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='nic.c' object='libdrivers_a-nic.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-nic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-nic.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-nic.obj `if test -f 'nic.c'; then $(CYGPATH_W) 'nic.c'; else $(CYGPATH_W) '$(srcdir)/nic.c'; fi`
-+
- libdrivers_a-pci.o: pci.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci.Tpo" -c -o libdrivers_a-pci.o `test -f 'pci.c' || echo '$(srcdir)/'`pci.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci.Tpo" "$(DEPDIR)/libdrivers_a-pci.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci.c' object='libdrivers_a-pci.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci.o `test -f 'pci.c' || echo '$(srcdir)/'`pci.c
- 
- libdrivers_a-pci.obj: pci.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci.Tpo" -c -o libdrivers_a-pci.obj `if test -f 'pci.c'; then $(CYGPATH_W) 'pci.c'; else $(CYGPATH_W) '$(srcdir)/pci.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci.Tpo" "$(DEPDIR)/libdrivers_a-pci.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci.c' object='libdrivers_a-pci.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci.obj `if test -f 'pci.c'; then $(CYGPATH_W) 'pci.c'; else $(CYGPATH_W) '$(srcdir)/pci.c'; fi`
- 
-+libdrivers_a-pci_io.o: pci_io.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci_io.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci_io.Tpo" -c -o libdrivers_a-pci_io.o `test -f 'pci_io.c' || echo '$(srcdir)/'`pci_io.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo" "$(DEPDIR)/libdrivers_a-pci_io.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci_io.c' object='libdrivers_a-pci_io.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci_io.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci_io.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci_io.o `test -f 'pci_io.c' || echo '$(srcdir)/'`pci_io.c
-+
-+libdrivers_a-pci_io.obj: pci_io.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pci_io.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pci_io.Tpo" -c -o libdrivers_a-pci_io.obj `if test -f 'pci_io.c'; then $(CYGPATH_W) 'pci_io.c'; else $(CYGPATH_W) '$(srcdir)/pci_io.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo" "$(DEPDIR)/libdrivers_a-pci_io.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pci_io.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pci_io.c' object='libdrivers_a-pci_io.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pci_io.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pci_io.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pci_io.obj `if test -f 'pci_io.c'; then $(CYGPATH_W) 'pci_io.c'; else $(CYGPATH_W) '$(srcdir)/pci_io.c'; fi`
-+
- libdrivers_a-timer.o: timer.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-timer.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-timer.Tpo" -c -o libdrivers_a-timer.o `test -f 'timer.c' || echo '$(srcdir)/'`timer.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-timer.Tpo" "$(DEPDIR)/libdrivers_a-timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-timer.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timer.c' object='libdrivers_a-timer.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-timer.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-timer.o `test -f 'timer.c' || echo '$(srcdir)/'`timer.c
- 
- libdrivers_a-timer.obj: timer.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-timer.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-timer.Tpo" -c -o libdrivers_a-timer.obj `if test -f 'timer.c'; then $(CYGPATH_W) 'timer.c'; else $(CYGPATH_W) '$(srcdir)/timer.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-timer.Tpo" "$(DEPDIR)/libdrivers_a-timer.Po"; else rm -f "$(DEPDIR)/libdrivers_a-timer.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='timer.c' object='libdrivers_a-timer.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-timer.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-timer.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-timer.obj `if test -f 'timer.c'; then $(CYGPATH_W) 'timer.c'; else $(CYGPATH_W) '$(srcdir)/timer.c'; fi`
- 
--libdrivers_a-3c509.o: 3c509.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c509.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c509.Tpo" -c -o libdrivers_a-3c509.o `test -f '3c509.c' || echo '$(srcdir)/'`3c509.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c509.Tpo" "$(DEPDIR)/libdrivers_a-3c509.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c509.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c509.c' object='libdrivers_a-3c509.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c509.o `test -f '3c509.c' || echo '$(srcdir)/'`3c509.c
--
--libdrivers_a-3c509.obj: 3c509.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c509.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c509.Tpo" -c -o libdrivers_a-3c509.obj `if test -f '3c509.c'; then $(CYGPATH_W) '3c509.c'; else $(CYGPATH_W) '$(srcdir)/3c509.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c509.Tpo" "$(DEPDIR)/libdrivers_a-3c509.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c509.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c509.c' object='libdrivers_a-3c509.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c509.obj `if test -f '3c509.c'; then $(CYGPATH_W) '3c509.c'; else $(CYGPATH_W) '$(srcdir)/3c509.c'; fi`
-+libdrivers_a-pic8259.o: pic8259.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pic8259.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pic8259.Tpo" -c -o libdrivers_a-pic8259.o `test -f 'pic8259.c' || echo '$(srcdir)/'`pic8259.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo" "$(DEPDIR)/libdrivers_a-pic8259.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pic8259.c' object='libdrivers_a-pic8259.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pic8259.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pic8259.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pic8259.o `test -f 'pic8259.c' || echo '$(srcdir)/'`pic8259.c
-+
-+libdrivers_a-pic8259.obj: pic8259.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pic8259.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pic8259.Tpo" -c -o libdrivers_a-pic8259.obj `if test -f 'pic8259.c'; then $(CYGPATH_W) 'pic8259.c'; else $(CYGPATH_W) '$(srcdir)/pic8259.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo" "$(DEPDIR)/libdrivers_a-pic8259.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pic8259.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pic8259.c' object='libdrivers_a-pic8259.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pic8259.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pic8259.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pic8259.obj `if test -f 'pic8259.c'; then $(CYGPATH_W) 'pic8259.c'; else $(CYGPATH_W) '$(srcdir)/pic8259.c'; fi`
-+
-+libdrivers_a-basemem.o: basemem.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-basemem.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-basemem.Tpo" -c -o libdrivers_a-basemem.o `test -f 'basemem.c' || echo '$(srcdir)/'`basemem.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-basemem.Tpo" "$(DEPDIR)/libdrivers_a-basemem.Po"; else rm -f "$(DEPDIR)/libdrivers_a-basemem.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='basemem.c' object='libdrivers_a-basemem.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-basemem.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-basemem.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-basemem.o `test -f 'basemem.c' || echo '$(srcdir)/'`basemem.c
-+
-+libdrivers_a-basemem.obj: basemem.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-basemem.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-basemem.Tpo" -c -o libdrivers_a-basemem.obj `if test -f 'basemem.c'; then $(CYGPATH_W) 'basemem.c'; else $(CYGPATH_W) '$(srcdir)/basemem.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-basemem.Tpo" "$(DEPDIR)/libdrivers_a-basemem.Po"; else rm -f "$(DEPDIR)/libdrivers_a-basemem.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='basemem.c' object='libdrivers_a-basemem.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-basemem.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-basemem.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-basemem.obj `if test -f 'basemem.c'; then $(CYGPATH_W) 'basemem.c'; else $(CYGPATH_W) '$(srcdir)/basemem.c'; fi`
- 
- libdrivers_a-3c595.o: 3c595.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c595.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c595.Tpo" -c -o libdrivers_a-3c595.o `test -f '3c595.c' || echo '$(srcdir)/'`3c595.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c595.Tpo" "$(DEPDIR)/libdrivers_a-3c595.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c595.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c595.c' object='libdrivers_a-3c595.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c595.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c595.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c595.o `test -f '3c595.c' || echo '$(srcdir)/'`3c595.c
- 
- libdrivers_a-3c595.obj: 3c595.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c595.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c595.Tpo" -c -o libdrivers_a-3c595.obj `if test -f '3c595.c'; then $(CYGPATH_W) '3c595.c'; else $(CYGPATH_W) '$(srcdir)/3c595.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c595.Tpo" "$(DEPDIR)/libdrivers_a-3c595.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c595.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c595.c' object='libdrivers_a-3c595.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c595.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c595.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c595.obj `if test -f '3c595.c'; then $(CYGPATH_W) '3c595.c'; else $(CYGPATH_W) '$(srcdir)/3c595.c'; fi`
- 
- libdrivers_a-3c90x.o: 3c90x.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c90x.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c90x.Tpo" -c -o libdrivers_a-3c90x.o `test -f '3c90x.c' || echo '$(srcdir)/'`3c90x.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo" "$(DEPDIR)/libdrivers_a-3c90x.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c90x.c' object='libdrivers_a-3c90x.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c90x.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c90x.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c90x.o `test -f '3c90x.c' || echo '$(srcdir)/'`3c90x.c
- 
- libdrivers_a-3c90x.obj: 3c90x.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-3c90x.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-3c90x.Tpo" -c -o libdrivers_a-3c90x.obj `if test -f '3c90x.c'; then $(CYGPATH_W) '3c90x.c'; else $(CYGPATH_W) '$(srcdir)/3c90x.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo" "$(DEPDIR)/libdrivers_a-3c90x.Po"; else rm -f "$(DEPDIR)/libdrivers_a-3c90x.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='3c90x.c' object='libdrivers_a-3c90x.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-3c90x.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-3c90x.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-3c90x.obj `if test -f '3c90x.c'; then $(CYGPATH_W) '3c90x.c'; else $(CYGPATH_W) '$(srcdir)/3c90x.c'; fi`
- 
--libdrivers_a-cs89x0.o: cs89x0.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-cs89x0.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" -c -o libdrivers_a-cs89x0.o `test -f 'cs89x0.c' || echo '$(srcdir)/'`cs89x0.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" "$(DEPDIR)/libdrivers_a-cs89x0.Po"; else rm -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cs89x0.c' object='libdrivers_a-cs89x0.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-cs89x0.o `test -f 'cs89x0.c' || echo '$(srcdir)/'`cs89x0.c
--
--libdrivers_a-cs89x0.obj: cs89x0.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-cs89x0.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" -c -o libdrivers_a-cs89x0.obj `if test -f 'cs89x0.c'; then $(CYGPATH_W) 'cs89x0.c'; else $(CYGPATH_W) '$(srcdir)/cs89x0.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo" "$(DEPDIR)/libdrivers_a-cs89x0.Po"; else rm -f "$(DEPDIR)/libdrivers_a-cs89x0.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cs89x0.c' object='libdrivers_a-cs89x0.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-cs89x0.obj `if test -f 'cs89x0.c'; then $(CYGPATH_W) 'cs89x0.c'; else $(CYGPATH_W) '$(srcdir)/cs89x0.c'; fi`
--
- libdrivers_a-davicom.o: davicom.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-davicom.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-davicom.Tpo" -c -o libdrivers_a-davicom.o `test -f 'davicom.c' || echo '$(srcdir)/'`davicom.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-davicom.Tpo" "$(DEPDIR)/libdrivers_a-davicom.Po"; else rm -f "$(DEPDIR)/libdrivers_a-davicom.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='davicom.c' object='libdrivers_a-davicom.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-davicom.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-davicom.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-davicom.o `test -f 'davicom.c' || echo '$(srcdir)/'`davicom.c
- 
- libdrivers_a-davicom.obj: davicom.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-davicom.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-davicom.Tpo" -c -o libdrivers_a-davicom.obj `if test -f 'davicom.c'; then $(CYGPATH_W) 'davicom.c'; else $(CYGPATH_W) '$(srcdir)/davicom.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-davicom.Tpo" "$(DEPDIR)/libdrivers_a-davicom.Po"; else rm -f "$(DEPDIR)/libdrivers_a-davicom.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='davicom.c' object='libdrivers_a-davicom.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-davicom.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-davicom.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-davicom.obj `if test -f 'davicom.c'; then $(CYGPATH_W) 'davicom.c'; else $(CYGPATH_W) '$(srcdir)/davicom.c'; fi`
- 
--libdrivers_a-depca.o: depca.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-depca.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-depca.Tpo" -c -o libdrivers_a-depca.o `test -f 'depca.c' || echo '$(srcdir)/'`depca.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-depca.Tpo" "$(DEPDIR)/libdrivers_a-depca.Po"; else rm -f "$(DEPDIR)/libdrivers_a-depca.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='depca.c' object='libdrivers_a-depca.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-depca.o `test -f 'depca.c' || echo '$(srcdir)/'`depca.c
--
--libdrivers_a-depca.obj: depca.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-depca.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-depca.Tpo" -c -o libdrivers_a-depca.obj `if test -f 'depca.c'; then $(CYGPATH_W) 'depca.c'; else $(CYGPATH_W) '$(srcdir)/depca.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-depca.Tpo" "$(DEPDIR)/libdrivers_a-depca.Po"; else rm -f "$(DEPDIR)/libdrivers_a-depca.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='depca.c' object='libdrivers_a-depca.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-depca.obj `if test -f 'depca.c'; then $(CYGPATH_W) 'depca.c'; else $(CYGPATH_W) '$(srcdir)/depca.c'; fi`
--
--libdrivers_a-eepro.o: eepro.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro.Tpo" -c -o libdrivers_a-eepro.o `test -f 'eepro.c' || echo '$(srcdir)/'`eepro.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro.Tpo" "$(DEPDIR)/libdrivers_a-eepro.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro.c' object='libdrivers_a-eepro.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro.o `test -f 'eepro.c' || echo '$(srcdir)/'`eepro.c
--
--libdrivers_a-eepro.obj: eepro.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro.Tpo" -c -o libdrivers_a-eepro.obj `if test -f 'eepro.c'; then $(CYGPATH_W) 'eepro.c'; else $(CYGPATH_W) '$(srcdir)/eepro.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro.Tpo" "$(DEPDIR)/libdrivers_a-eepro.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro.c' object='libdrivers_a-eepro.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro.obj `if test -f 'eepro.c'; then $(CYGPATH_W) 'eepro.c'; else $(CYGPATH_W) '$(srcdir)/eepro.c'; fi`
-+libdrivers_a-e1000.o: e1000.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-e1000.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-e1000.Tpo" -c -o libdrivers_a-e1000.o `test -f 'e1000.c' || echo '$(srcdir)/'`e1000.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-e1000.Tpo" "$(DEPDIR)/libdrivers_a-e1000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-e1000.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='e1000.c' object='libdrivers_a-e1000.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-e1000.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-e1000.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-e1000.o `test -f 'e1000.c' || echo '$(srcdir)/'`e1000.c
-+
-+libdrivers_a-e1000.obj: e1000.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-e1000.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-e1000.Tpo" -c -o libdrivers_a-e1000.obj `if test -f 'e1000.c'; then $(CYGPATH_W) 'e1000.c'; else $(CYGPATH_W) '$(srcdir)/e1000.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-e1000.Tpo" "$(DEPDIR)/libdrivers_a-e1000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-e1000.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='e1000.c' object='libdrivers_a-e1000.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-e1000.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-e1000.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-e1000.obj `if test -f 'e1000.c'; then $(CYGPATH_W) 'e1000.c'; else $(CYGPATH_W) '$(srcdir)/e1000.c'; fi`
- 
- libdrivers_a-eepro100.o: eepro100.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro100.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro100.Tpo" -c -o libdrivers_a-eepro100.o `test -f 'eepro100.c' || echo '$(srcdir)/'`eepro100.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo" "$(DEPDIR)/libdrivers_a-eepro100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro100.c' object='libdrivers_a-eepro100.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-eepro100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-eepro100.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro100.o `test -f 'eepro100.c' || echo '$(srcdir)/'`eepro100.c
- 
- libdrivers_a-eepro100.obj: eepro100.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-eepro100.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-eepro100.Tpo" -c -o libdrivers_a-eepro100.obj `if test -f 'eepro100.c'; then $(CYGPATH_W) 'eepro100.c'; else $(CYGPATH_W) '$(srcdir)/eepro100.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo" "$(DEPDIR)/libdrivers_a-eepro100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-eepro100.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='eepro100.c' object='libdrivers_a-eepro100.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-eepro100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-eepro100.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-eepro100.obj `if test -f 'eepro100.c'; then $(CYGPATH_W) 'eepro100.c'; else $(CYGPATH_W) '$(srcdir)/eepro100.c'; fi`
- 
- libdrivers_a-epic100.o: epic100.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-epic100.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-epic100.Tpo" -c -o libdrivers_a-epic100.o `test -f 'epic100.c' || echo '$(srcdir)/'`epic100.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-epic100.Tpo" "$(DEPDIR)/libdrivers_a-epic100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-epic100.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='epic100.c' object='libdrivers_a-epic100.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-epic100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-epic100.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-epic100.o `test -f 'epic100.c' || echo '$(srcdir)/'`epic100.c
- 
- libdrivers_a-epic100.obj: epic100.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-epic100.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-epic100.Tpo" -c -o libdrivers_a-epic100.obj `if test -f 'epic100.c'; then $(CYGPATH_W) 'epic100.c'; else $(CYGPATH_W) '$(srcdir)/epic100.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-epic100.Tpo" "$(DEPDIR)/libdrivers_a-epic100.Po"; else rm -f "$(DEPDIR)/libdrivers_a-epic100.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='epic100.c' object='libdrivers_a-epic100.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-epic100.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-epic100.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-epic100.obj `if test -f 'epic100.c'; then $(CYGPATH_W) 'epic100.c'; else $(CYGPATH_W) '$(srcdir)/epic100.c'; fi`
- 
--libdrivers_a-fa311.o: fa311.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fa311.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-fa311.Tpo" -c -o libdrivers_a-fa311.o `test -f 'fa311.c' || echo '$(srcdir)/'`fa311.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fa311.Tpo" "$(DEPDIR)/libdrivers_a-fa311.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fa311.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fa311.c' object='libdrivers_a-fa311.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fa311.o `test -f 'fa311.c' || echo '$(srcdir)/'`fa311.c
--
--libdrivers_a-fa311.obj: fa311.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-fa311.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-fa311.Tpo" -c -o libdrivers_a-fa311.obj `if test -f 'fa311.c'; then $(CYGPATH_W) 'fa311.c'; else $(CYGPATH_W) '$(srcdir)/fa311.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-fa311.Tpo" "$(DEPDIR)/libdrivers_a-fa311.Po"; else rm -f "$(DEPDIR)/libdrivers_a-fa311.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='fa311.c' object='libdrivers_a-fa311.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-fa311.obj `if test -f 'fa311.c'; then $(CYGPATH_W) 'fa311.c'; else $(CYGPATH_W) '$(srcdir)/fa311.c'; fi`
--
--libdrivers_a-i82586.o: i82586.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i82586.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-i82586.Tpo" -c -o libdrivers_a-i82586.o `test -f 'i82586.c' || echo '$(srcdir)/'`i82586.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i82586.Tpo" "$(DEPDIR)/libdrivers_a-i82586.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i82586.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i82586.c' object='libdrivers_a-i82586.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i82586.o `test -f 'i82586.c' || echo '$(srcdir)/'`i82586.c
--
--libdrivers_a-i82586.obj: i82586.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-i82586.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-i82586.Tpo" -c -o libdrivers_a-i82586.obj `if test -f 'i82586.c'; then $(CYGPATH_W) 'i82586.c'; else $(CYGPATH_W) '$(srcdir)/i82586.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-i82586.Tpo" "$(DEPDIR)/libdrivers_a-i82586.Po"; else rm -f "$(DEPDIR)/libdrivers_a-i82586.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='i82586.c' object='libdrivers_a-i82586.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-i82586.obj `if test -f 'i82586.c'; then $(CYGPATH_W) 'i82586.c'; else $(CYGPATH_W) '$(srcdir)/i82586.c'; fi`
--
--libdrivers_a-lance.o: lance.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-lance.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-lance.Tpo" -c -o libdrivers_a-lance.o `test -f 'lance.c' || echo '$(srcdir)/'`lance.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-lance.Tpo" "$(DEPDIR)/libdrivers_a-lance.Po"; else rm -f "$(DEPDIR)/libdrivers_a-lance.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lance.c' object='libdrivers_a-lance.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-lance.o `test -f 'lance.c' || echo '$(srcdir)/'`lance.c
--
--libdrivers_a-lance.obj: lance.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-lance.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-lance.Tpo" -c -o libdrivers_a-lance.obj `if test -f 'lance.c'; then $(CYGPATH_W) 'lance.c'; else $(CYGPATH_W) '$(srcdir)/lance.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-lance.Tpo" "$(DEPDIR)/libdrivers_a-lance.Po"; else rm -f "$(DEPDIR)/libdrivers_a-lance.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lance.c' object='libdrivers_a-lance.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-lance.obj `if test -f 'lance.c'; then $(CYGPATH_W) 'lance.c'; else $(CYGPATH_W) '$(srcdir)/lance.c'; fi`
--
- libdrivers_a-natsemi.o: natsemi.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-natsemi.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-natsemi.Tpo" -c -o libdrivers_a-natsemi.o `test -f 'natsemi.c' || echo '$(srcdir)/'`natsemi.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo" "$(DEPDIR)/libdrivers_a-natsemi.Po"; else rm -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='natsemi.c' object='libdrivers_a-natsemi.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-natsemi.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-natsemi.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-natsemi.o `test -f 'natsemi.c' || echo '$(srcdir)/'`natsemi.c
- 
- libdrivers_a-natsemi.obj: natsemi.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-natsemi.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-natsemi.Tpo" -c -o libdrivers_a-natsemi.obj `if test -f 'natsemi.c'; then $(CYGPATH_W) 'natsemi.c'; else $(CYGPATH_W) '$(srcdir)/natsemi.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo" "$(DEPDIR)/libdrivers_a-natsemi.Po"; else rm -f "$(DEPDIR)/libdrivers_a-natsemi.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='natsemi.c' object='libdrivers_a-natsemi.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-natsemi.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-natsemi.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-natsemi.obj `if test -f 'natsemi.c'; then $(CYGPATH_W) 'natsemi.c'; else $(CYGPATH_W) '$(srcdir)/natsemi.c'; fi`
- 
--libdrivers_a-ni5010.o: ni5010.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ni5010.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-ni5010.Tpo" -c -o libdrivers_a-ni5010.o `test -f 'ni5010.c' || echo '$(srcdir)/'`ni5010.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo" "$(DEPDIR)/libdrivers_a-ni5010.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ni5010.c' object='libdrivers_a-ni5010.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ni5010.o `test -f 'ni5010.c' || echo '$(srcdir)/'`ni5010.c
--
--libdrivers_a-ni5010.obj: ni5010.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ni5010.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-ni5010.Tpo" -c -o libdrivers_a-ni5010.obj `if test -f 'ni5010.c'; then $(CYGPATH_W) 'ni5010.c'; else $(CYGPATH_W) '$(srcdir)/ni5010.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo" "$(DEPDIR)/libdrivers_a-ni5010.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ni5010.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ni5010.c' object='libdrivers_a-ni5010.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ni5010.obj `if test -f 'ni5010.c'; then $(CYGPATH_W) 'ni5010.c'; else $(CYGPATH_W) '$(srcdir)/ni5010.c'; fi`
--
- libdrivers_a-ns8390.o: ns8390.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns8390.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns8390.Tpo" -c -o libdrivers_a-ns8390.o `test -f 'ns8390.c' || echo '$(srcdir)/'`ns8390.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo" "$(DEPDIR)/libdrivers_a-ns8390.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns8390.c' object='libdrivers_a-ns8390.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns8390.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns8390.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns8390.o `test -f 'ns8390.c' || echo '$(srcdir)/'`ns8390.c
- 
- libdrivers_a-ns8390.obj: ns8390.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns8390.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns8390.Tpo" -c -o libdrivers_a-ns8390.obj `if test -f 'ns8390.c'; then $(CYGPATH_W) 'ns8390.c'; else $(CYGPATH_W) '$(srcdir)/ns8390.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo" "$(DEPDIR)/libdrivers_a-ns8390.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns8390.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns8390.c' object='libdrivers_a-ns8390.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns8390.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns8390.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns8390.obj `if test -f 'ns8390.c'; then $(CYGPATH_W) 'ns8390.c'; else $(CYGPATH_W) '$(srcdir)/ns8390.c'; fi`
- 
--libdrivers_a-otulip.o: otulip.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-otulip.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-otulip.Tpo" -c -o libdrivers_a-otulip.o `test -f 'otulip.c' || echo '$(srcdir)/'`otulip.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-otulip.Tpo" "$(DEPDIR)/libdrivers_a-otulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-otulip.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='otulip.c' object='libdrivers_a-otulip.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-otulip.o `test -f 'otulip.c' || echo '$(srcdir)/'`otulip.c
--
--libdrivers_a-otulip.obj: otulip.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-otulip.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-otulip.Tpo" -c -o libdrivers_a-otulip.obj `if test -f 'otulip.c'; then $(CYGPATH_W) 'otulip.c'; else $(CYGPATH_W) '$(srcdir)/otulip.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-otulip.Tpo" "$(DEPDIR)/libdrivers_a-otulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-otulip.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='otulip.c' object='libdrivers_a-otulip.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-otulip.obj `if test -f 'otulip.c'; then $(CYGPATH_W) 'otulip.c'; else $(CYGPATH_W) '$(srcdir)/otulip.c'; fi`
-+libdrivers_a-pcnet32.o: pcnet32.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pcnet32.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" -c -o libdrivers_a-pcnet32.o `test -f 'pcnet32.c' || echo '$(srcdir)/'`pcnet32.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" "$(DEPDIR)/libdrivers_a-pcnet32.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcnet32.c' object='libdrivers_a-pcnet32.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pcnet32.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pcnet32.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pcnet32.o `test -f 'pcnet32.c' || echo '$(srcdir)/'`pcnet32.c
-+
-+libdrivers_a-pcnet32.obj: pcnet32.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pcnet32.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" -c -o libdrivers_a-pcnet32.obj `if test -f 'pcnet32.c'; then $(CYGPATH_W) 'pcnet32.c'; else $(CYGPATH_W) '$(srcdir)/pcnet32.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo" "$(DEPDIR)/libdrivers_a-pcnet32.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pcnet32.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pcnet32.c' object='libdrivers_a-pcnet32.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pcnet32.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pcnet32.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pcnet32.obj `if test -f 'pcnet32.c'; then $(CYGPATH_W) 'pcnet32.c'; else $(CYGPATH_W) '$(srcdir)/pcnet32.c'; fi`
- 
- libdrivers_a-rtl8139.o: rtl8139.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-rtl8139.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" -c -o libdrivers_a-rtl8139.o `test -f 'rtl8139.c' || echo '$(srcdir)/'`rtl8139.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" "$(DEPDIR)/libdrivers_a-rtl8139.Po"; else rm -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rtl8139.c' object='libdrivers_a-rtl8139.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-rtl8139.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-rtl8139.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-rtl8139.o `test -f 'rtl8139.c' || echo '$(srcdir)/'`rtl8139.c
- 
- libdrivers_a-rtl8139.obj: rtl8139.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-rtl8139.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" -c -o libdrivers_a-rtl8139.obj `if test -f 'rtl8139.c'; then $(CYGPATH_W) 'rtl8139.c'; else $(CYGPATH_W) '$(srcdir)/rtl8139.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo" "$(DEPDIR)/libdrivers_a-rtl8139.Po"; else rm -f "$(DEPDIR)/libdrivers_a-rtl8139.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='rtl8139.c' object='libdrivers_a-rtl8139.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-rtl8139.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-rtl8139.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-rtl8139.obj `if test -f 'rtl8139.c'; then $(CYGPATH_W) 'rtl8139.c'; else $(CYGPATH_W) '$(srcdir)/rtl8139.c'; fi`
- 
- libdrivers_a-sis900.o: sis900.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sis900.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-sis900.Tpo" -c -o libdrivers_a-sis900.o `test -f 'sis900.c' || echo '$(srcdir)/'`sis900.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sis900.Tpo" "$(DEPDIR)/libdrivers_a-sis900.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sis900.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sis900.c' object='libdrivers_a-sis900.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-sis900.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-sis900.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sis900.o `test -f 'sis900.c' || echo '$(srcdir)/'`sis900.c
- 
- libdrivers_a-sis900.obj: sis900.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sis900.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-sis900.Tpo" -c -o libdrivers_a-sis900.obj `if test -f 'sis900.c'; then $(CYGPATH_W) 'sis900.c'; else $(CYGPATH_W) '$(srcdir)/sis900.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sis900.Tpo" "$(DEPDIR)/libdrivers_a-sis900.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sis900.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sis900.c' object='libdrivers_a-sis900.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-sis900.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-sis900.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sis900.obj `if test -f 'sis900.c'; then $(CYGPATH_W) 'sis900.c'; else $(CYGPATH_W) '$(srcdir)/sis900.c'; fi`
- 
--libdrivers_a-sk_g16.o: sk_g16.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sk_g16.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" -c -o libdrivers_a-sk_g16.o `test -f 'sk_g16.c' || echo '$(srcdir)/'`sk_g16.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" "$(DEPDIR)/libdrivers_a-sk_g16.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sk_g16.c' object='libdrivers_a-sk_g16.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sk_g16.o `test -f 'sk_g16.c' || echo '$(srcdir)/'`sk_g16.c
--
--libdrivers_a-sk_g16.obj: sk_g16.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-sk_g16.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" -c -o libdrivers_a-sk_g16.obj `if test -f 'sk_g16.c'; then $(CYGPATH_W) 'sk_g16.c'; else $(CYGPATH_W) '$(srcdir)/sk_g16.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo" "$(DEPDIR)/libdrivers_a-sk_g16.Po"; else rm -f "$(DEPDIR)/libdrivers_a-sk_g16.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sk_g16.c' object='libdrivers_a-sk_g16.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-sk_g16.obj `if test -f 'sk_g16.c'; then $(CYGPATH_W) 'sk_g16.c'; else $(CYGPATH_W) '$(srcdir)/sk_g16.c'; fi`
--
--libdrivers_a-smc9000.o: smc9000.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-smc9000.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-smc9000.Tpo" -c -o libdrivers_a-smc9000.o `test -f 'smc9000.c' || echo '$(srcdir)/'`smc9000.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo" "$(DEPDIR)/libdrivers_a-smc9000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smc9000.c' object='libdrivers_a-smc9000.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-smc9000.o `test -f 'smc9000.c' || echo '$(srcdir)/'`smc9000.c
--
--libdrivers_a-smc9000.obj: smc9000.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-smc9000.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-smc9000.Tpo" -c -o libdrivers_a-smc9000.obj `if test -f 'smc9000.c'; then $(CYGPATH_W) 'smc9000.c'; else $(CYGPATH_W) '$(srcdir)/smc9000.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo" "$(DEPDIR)/libdrivers_a-smc9000.Po"; else rm -f "$(DEPDIR)/libdrivers_a-smc9000.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='smc9000.c' object='libdrivers_a-smc9000.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-smc9000.obj `if test -f 'smc9000.c'; then $(CYGPATH_W) 'smc9000.c'; else $(CYGPATH_W) '$(srcdir)/smc9000.c'; fi`
--
--libdrivers_a-tiara.o: tiara.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tiara.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tiara.Tpo" -c -o libdrivers_a-tiara.o `test -f 'tiara.c' || echo '$(srcdir)/'`tiara.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tiara.Tpo" "$(DEPDIR)/libdrivers_a-tiara.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tiara.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tiara.c' object='libdrivers_a-tiara.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tiara.o `test -f 'tiara.c' || echo '$(srcdir)/'`tiara.c
--
--libdrivers_a-tiara.obj: tiara.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tiara.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tiara.Tpo" -c -o libdrivers_a-tiara.obj `if test -f 'tiara.c'; then $(CYGPATH_W) 'tiara.c'; else $(CYGPATH_W) '$(srcdir)/tiara.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tiara.Tpo" "$(DEPDIR)/libdrivers_a-tiara.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tiara.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tiara.c' object='libdrivers_a-tiara.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tiara.obj `if test -f 'tiara.c'; then $(CYGPATH_W) 'tiara.c'; else $(CYGPATH_W) '$(srcdir)/tiara.c'; fi`
-+libdrivers_a-tg3.o: tg3.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tg3.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tg3.Tpo" -c -o libdrivers_a-tg3.o `test -f 'tg3.c' || echo '$(srcdir)/'`tg3.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tg3.Tpo" "$(DEPDIR)/libdrivers_a-tg3.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tg3.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tg3.c' object='libdrivers_a-tg3.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tg3.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tg3.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tg3.o `test -f 'tg3.c' || echo '$(srcdir)/'`tg3.c
-+
-+libdrivers_a-tg3.obj: tg3.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tg3.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tg3.Tpo" -c -o libdrivers_a-tg3.obj `if test -f 'tg3.c'; then $(CYGPATH_W) 'tg3.c'; else $(CYGPATH_W) '$(srcdir)/tg3.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tg3.Tpo" "$(DEPDIR)/libdrivers_a-tg3.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tg3.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tg3.c' object='libdrivers_a-tg3.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tg3.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tg3.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tg3.obj `if test -f 'tg3.c'; then $(CYGPATH_W) 'tg3.c'; else $(CYGPATH_W) '$(srcdir)/tg3.c'; fi`
- 
- libdrivers_a-tlan.o: tlan.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tlan.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tlan.Tpo" -c -o libdrivers_a-tlan.o `test -f 'tlan.c' || echo '$(srcdir)/'`tlan.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tlan.Tpo" "$(DEPDIR)/libdrivers_a-tlan.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tlan.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tlan.c' object='libdrivers_a-tlan.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tlan.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tlan.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tlan.o `test -f 'tlan.c' || echo '$(srcdir)/'`tlan.c
- 
- libdrivers_a-tlan.obj: tlan.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tlan.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tlan.Tpo" -c -o libdrivers_a-tlan.obj `if test -f 'tlan.c'; then $(CYGPATH_W) 'tlan.c'; else $(CYGPATH_W) '$(srcdir)/tlan.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tlan.Tpo" "$(DEPDIR)/libdrivers_a-tlan.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tlan.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tlan.c' object='libdrivers_a-tlan.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tlan.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tlan.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tlan.obj `if test -f 'tlan.c'; then $(CYGPATH_W) 'tlan.c'; else $(CYGPATH_W) '$(srcdir)/tlan.c'; fi`
- 
- libdrivers_a-tulip.o: tulip.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tulip.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-tulip.Tpo" -c -o libdrivers_a-tulip.o `test -f 'tulip.c' || echo '$(srcdir)/'`tulip.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tulip.Tpo" "$(DEPDIR)/libdrivers_a-tulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tulip.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tulip.c' object='libdrivers_a-tulip.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tulip.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tulip.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tulip.o `test -f 'tulip.c' || echo '$(srcdir)/'`tulip.c
- 
- libdrivers_a-tulip.obj: tulip.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-tulip.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-tulip.Tpo" -c -o libdrivers_a-tulip.obj `if test -f 'tulip.c'; then $(CYGPATH_W) 'tulip.c'; else $(CYGPATH_W) '$(srcdir)/tulip.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-tulip.Tpo" "$(DEPDIR)/libdrivers_a-tulip.Po"; else rm -f "$(DEPDIR)/libdrivers_a-tulip.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='tulip.c' object='libdrivers_a-tulip.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-tulip.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-tulip.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-tulip.obj `if test -f 'tulip.c'; then $(CYGPATH_W) 'tulip.c'; else $(CYGPATH_W) '$(srcdir)/tulip.c'; fi`
- 
- libdrivers_a-via-rhine.o: via-rhine.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-via-rhine.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" -c -o libdrivers_a-via-rhine.o `test -f 'via-rhine.c' || echo '$(srcdir)/'`via-rhine.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" "$(DEPDIR)/libdrivers_a-via-rhine.Po"; else rm -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='via-rhine.c' object='libdrivers_a-via-rhine.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-via-rhine.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-via-rhine.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-via-rhine.o `test -f 'via-rhine.c' || echo '$(srcdir)/'`via-rhine.c
- 
- libdrivers_a-via-rhine.obj: via-rhine.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-via-rhine.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" -c -o libdrivers_a-via-rhine.obj `if test -f 'via-rhine.c'; then $(CYGPATH_W) 'via-rhine.c'; else $(CYGPATH_W) '$(srcdir)/via-rhine.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo" "$(DEPDIR)/libdrivers_a-via-rhine.Po"; else rm -f "$(DEPDIR)/libdrivers_a-via-rhine.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='via-rhine.c' object='libdrivers_a-via-rhine.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-via-rhine.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-via-rhine.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-via-rhine.obj `if test -f 'via-rhine.c'; then $(CYGPATH_W) 'via-rhine.c'; else $(CYGPATH_W) '$(srcdir)/via-rhine.c'; fi`
- 
- libdrivers_a-w89c840.o: w89c840.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-w89c840.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-w89c840.Tpo" -c -o libdrivers_a-w89c840.o `test -f 'w89c840.c' || echo '$(srcdir)/'`w89c840.c; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo" "$(DEPDIR)/libdrivers_a-w89c840.Po"; else rm -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='w89c840.c' object='libdrivers_a-w89c840.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-w89c840.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-w89c840.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-w89c840.o `test -f 'w89c840.c' || echo '$(srcdir)/'`w89c840.c
- 
- libdrivers_a-w89c840.obj: w89c840.c
- @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-w89c840.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-w89c840.Tpo" -c -o libdrivers_a-w89c840.obj `if test -f 'w89c840.c'; then $(CYGPATH_W) 'w89c840.c'; else $(CYGPATH_W) '$(srcdir)/w89c840.c'; fi`; \
- @am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo" "$(DEPDIR)/libdrivers_a-w89c840.Po"; else rm -f "$(DEPDIR)/libdrivers_a-w89c840.Tpo"; exit 1; fi
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='w89c840.c' object='libdrivers_a-w89c840.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-w89c840.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-w89c840.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-w89c840.obj `if test -f 'w89c840.c'; then $(CYGPATH_W) 'w89c840.c'; else $(CYGPATH_W) '$(srcdir)/w89c840.c'; fi`
--uninstall-info-am:
-+
-+libdrivers_a-r8169.o: r8169.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-r8169.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-r8169.Tpo" -c -o libdrivers_a-r8169.o `test -f 'r8169.c' || echo '$(srcdir)/'`r8169.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-r8169.Tpo" "$(DEPDIR)/libdrivers_a-r8169.Po"; else rm -f "$(DEPDIR)/libdrivers_a-r8169.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='r8169.c' object='libdrivers_a-r8169.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-r8169.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-r8169.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-r8169.o `test -f 'r8169.c' || echo '$(srcdir)/'`r8169.c
-+
-+libdrivers_a-r8169.obj: r8169.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-r8169.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-r8169.Tpo" -c -o libdrivers_a-r8169.obj `if test -f 'r8169.c'; then $(CYGPATH_W) 'r8169.c'; else $(CYGPATH_W) '$(srcdir)/r8169.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-r8169.Tpo" "$(DEPDIR)/libdrivers_a-r8169.Po"; else rm -f "$(DEPDIR)/libdrivers_a-r8169.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='r8169.c' object='libdrivers_a-r8169.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-r8169.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-r8169.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-r8169.obj `if test -f 'r8169.c'; then $(CYGPATH_W) 'r8169.c'; else $(CYGPATH_W) '$(srcdir)/r8169.c'; fi`
-+
-+libdrivers_a-forcedeth.o: forcedeth.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-forcedeth.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" -c -o libdrivers_a-forcedeth.o `test -f 'forcedeth.c' || echo '$(srcdir)/'`forcedeth.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" "$(DEPDIR)/libdrivers_a-forcedeth.Po"; else rm -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='forcedeth.c' object='libdrivers_a-forcedeth.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-forcedeth.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-forcedeth.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-forcedeth.o `test -f 'forcedeth.c' || echo '$(srcdir)/'`forcedeth.c
-+
-+libdrivers_a-forcedeth.obj: forcedeth.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-forcedeth.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" -c -o libdrivers_a-forcedeth.obj `if test -f 'forcedeth.c'; then $(CYGPATH_W) 'forcedeth.c'; else $(CYGPATH_W) '$(srcdir)/forcedeth.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo" "$(DEPDIR)/libdrivers_a-forcedeth.Po"; else rm -f "$(DEPDIR)/libdrivers_a-forcedeth.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='forcedeth.c' object='libdrivers_a-forcedeth.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-forcedeth.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-forcedeth.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-forcedeth.obj `if test -f 'forcedeth.c'; then $(CYGPATH_W) 'forcedeth.c'; else $(CYGPATH_W) '$(srcdir)/forcedeth.c'; fi`
-+
-+libdrivers_a-ns83820.o: ns83820.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns83820.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns83820.Tpo" -c -o libdrivers_a-ns83820.o `test -f 'ns83820.c' || echo '$(srcdir)/'`ns83820.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo" "$(DEPDIR)/libdrivers_a-ns83820.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns83820.c' object='libdrivers_a-ns83820.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns83820.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns83820.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns83820.o `test -f 'ns83820.c' || echo '$(srcdir)/'`ns83820.c
-+
-+libdrivers_a-ns83820.obj: ns83820.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-ns83820.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-ns83820.Tpo" -c -o libdrivers_a-ns83820.obj `if test -f 'ns83820.c'; then $(CYGPATH_W) 'ns83820.c'; else $(CYGPATH_W) '$(srcdir)/ns83820.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo" "$(DEPDIR)/libdrivers_a-ns83820.Po"; else rm -f "$(DEPDIR)/libdrivers_a-ns83820.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ns83820.c' object='libdrivers_a-ns83820.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-ns83820.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-ns83820.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-ns83820.obj `if test -f 'ns83820.c'; then $(CYGPATH_W) 'ns83820.c'; else $(CYGPATH_W) '$(srcdir)/ns83820.c'; fi`
-+
-+libdrivers_a-pnic.o: pnic.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic.Tpo" -c -o libdrivers_a-pnic.o `test -f 'pnic.c' || echo '$(srcdir)/'`pnic.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic.Tpo" "$(DEPDIR)/libdrivers_a-pnic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic.c' object='libdrivers_a-pnic.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic.o `test -f 'pnic.c' || echo '$(srcdir)/'`pnic.c
-+
-+libdrivers_a-pnic.obj: pnic.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic.Tpo" -c -o libdrivers_a-pnic.obj `if test -f 'pnic.c'; then $(CYGPATH_W) 'pnic.c'; else $(CYGPATH_W) '$(srcdir)/pnic.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic.Tpo" "$(DEPDIR)/libdrivers_a-pnic.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic.c' object='libdrivers_a-pnic.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic.obj `if test -f 'pnic.c'; then $(CYGPATH_W) 'pnic.c'; else $(CYGPATH_W) '$(srcdir)/pnic.c'; fi`
-+
-+libdrivers_a-pnic_api.o: pnic_api.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic_api.o -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" -c -o libdrivers_a-pnic_api.o `test -f 'pnic_api.c' || echo '$(srcdir)/'`pnic_api.c; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" "$(DEPDIR)/libdrivers_a-pnic_api.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic_api.c' object='libdrivers_a-pnic_api.o' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic_api.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic_api.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic_api.o `test -f 'pnic_api.c' || echo '$(srcdir)/'`pnic_api.c
-+
-+libdrivers_a-pnic_api.obj: pnic_api.c
-+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -MT libdrivers_a-pnic_api.obj -MD -MP -MF "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" -c -o libdrivers_a-pnic_api.obj `if test -f 'pnic_api.c'; then $(CYGPATH_W) 'pnic_api.c'; else $(CYGPATH_W) '$(srcdir)/pnic_api.c'; fi`; \
-+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo" "$(DEPDIR)/libdrivers_a-pnic_api.Po"; else rm -f "$(DEPDIR)/libdrivers_a-pnic_api.Tpo"; exit 1; fi
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pnic_api.c' object='libdrivers_a-pnic_api.obj' libtool=no @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/libdrivers_a-pnic_api.Po' tmpdepfile='$(DEPDIR)/libdrivers_a-pnic_api.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdrivers_a_CFLAGS) $(CFLAGS) -c -o libdrivers_a-pnic_api.obj `if test -f 'pnic_api.c'; then $(CYGPATH_W) 'pnic_api.c'; else $(CYGPATH_W) '$(srcdir)/pnic_api.c'; fi`
- 
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-@@ -817,11 +928,9 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
--	  test -n "$$unique" || unique=$$empty_fix; \
--	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	    $$tags $$unique; \
--	fi
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
- ctags: CTAGS
- CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -895,7 +1004,7 @@
- clean-generic:
- 
- distclean-generic:
--	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -962,10 +1071,10 @@
- 
- 
- # Is it really necessary to specify dependecies explicitly?
--$(3c509_drivers): 3c509.c 3c509.h
--$(3c509_drivers): %.o: 3c509.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(3c509_drivers): 3c509.c 3c509.h
-+#$(3c509_drivers): %.o: 3c509.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- $(3c595_drivers): 3c595.c 3c595.h
- $(3c595_drivers): %.o: 3c595.c
-@@ -977,23 +1086,28 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(cs89x0_drivers): cs89x0.c cs89x0.h
--$(cs89x0_drivers): %.o: cs89x0.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(cs89x0_drivers): cs89x0.c cs89x0.h
-+#$(cs89x0_drivers): %.o: cs89x0.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- $(davicom_drivers): davicom.c
- $(davicom_drivers): %.o: davicom.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(depca_drivers): depca.c
--$(depca_drivers): %.o: depca.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(depca_drivers): depca.c
-+#$(depca_drivers): %.o: depca.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(eepro_drivers): eepro.c
--$(eepro_drivers): %.o: eepro.c
-+#$(eepro_drivers): eepro.c
-+#$(eepro_drivers): %.o: eepro.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(e1000_drivers): e1000.c e1000_hw.h
-+$(e1000_drivers): %.o: e1000.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-@@ -1007,28 +1121,38 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-+$(forcedeth_drivers): forcedeth.c
-+$(forcedeth_drivers): %.o: forcedeth.c
-+	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
- #$(fa311_drivers): fa311.c
- #$(fa311_drivers): %.o: fa311.c
- #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(i82586_drivers): i82586.c
--$(i82586_drivers): %.o: i82586.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(i82586_drivers): i82586.c
-+#$(i82586_drivers): %.o: i82586.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(lance_drivers): lance.c
--$(lance_drivers): %.o: lance.c
--	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+#$(lance_drivers): lance.c
-+#$(lance_drivers): %.o: lance.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
- $(natsemi_drivers): natsemi.c
- $(natsemi_drivers): %.o: natsemi.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(ni5010_drivers): ni5010.c
--$(ni5010_drivers): %.o: ni5010.c
-+#$(ni5010_drivers): ni5010.c
-+#$(ni5010_drivers): %.o: ni5010.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(ns83820_drivers): ns83820.c
-+$(ns83820_drivers): %.o: ns83820.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-@@ -1037,41 +1161,62 @@
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(otulip_drivers): otulip.c otulip.h
--$(otulip_drivers): %.o: otulip.c
-+#$(otulip_drivers): otulip.c otulip.h
-+#$(otulip_drivers): %.o: otulip.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+$(pcnet32_drivers): pcnet32.c
-+$(pcnet32_drivers): %.o: pcnet32.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(rtl8139_drivers): rtl8139.c
--$(rtl8139_drivers): %.o: rtl8139.c
-+$(pnic_drivers): pnic.c
-+$(pnic_drivers): %.o: pnic.c pnic_api.h
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(sis900_drivers): sis900.c
--$(sis900_drivers): %.o: sis900.c sis900.h
-+$(rtl8139_drivers): rtl8139.c
-+$(rtl8139_drivers): %.o: rtl8139.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(sk_g16_drivers): sk_g16.c sk_g16.h
--$(sk_g16_drivers): %.o: sk_g16.c
-+$(r8169_drivers): r8169.c
-+$(r8169_drivers): %.o: r8169.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(smc9000_drivers): smc9000.c smc9000.h
--$(smc9000_drivers): %.o: smc9000.c
-+$(sis900_drivers): sis900.c sis900.h
-+$(sis900_drivers): %.o: sis900.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--$(tiara_drivers): tiara.c
--$(tiara_drivers): %.o: tiara.c
-+#$(sk_g16_drivers): sk_g16.c sk_g16.h
-+#$(sk_g16_drivers): %.o: sk_g16.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+#$(smc9000_drivers): smc9000.c smc9000.h
-+#$(smc9000_drivers): %.o: smc9000.c
-+#	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+#	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
-+
-+$(tg3_drivers): tg3.c tg3.h
-+$(tg3_drivers): %.o: tg3.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- 	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
--#$(tlan_drivers): tlan.c
--#$(tlan_drivers): %.o: tlan.c
-+#$(tiara_drivers): tiara.c
-+#$(tiara_drivers): %.o: tiara.c
- #	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
- #	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
- 
-+$(tlan_drivers): tlan.c tlan.h
-+$(tlan_drivers): %.o: tlan.c
-+	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-+	  $(NET_EXTRAFLAGS) $($(basename $@)_o_CFLAGS) -o $@ -c $<
-+
- $(tulip_drivers): tulip.c
- $(tulip_drivers): %.o: tulip.c
- 	$(COMPILE) $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
-Index: b/netboot/basemem.c
-===================================================================
---- /dev/null
-+++ b/netboot/basemem.c
-@@ -0,0 +1,178 @@
-+#include "etherboot.h"
-+#define DEBUG_BASEMEM
-+/* Routines to allocate base memory in a BIOS-compatible way, by
-+ * updating the Free Base Memory Size counter at 40:13h.
-+ *
-+ * Michael Brown <mbrown@fensystems.co.uk> (mcb30)
-+ * $Id: grub-0.95-diskless-patch-2-undi.patch,v 1.1.1.1 2005/06/14 08:18:50 wesolows Exp $
-+ */
-+
-+#define fbms ( ( uint16_t * ) phys_to_virt ( 0x413 ) )
-+#define BASE_MEMORY_MAX ( 640 )
-+#define FREE_BLOCK_MAGIC ( ('!'<<0) + ('F'<<8) + ('R'<<16) + ('E'<<24) )
-+
-+typedef struct free_base_memory_block {
-+	uint32_t	magic;
-+	uint16_t	size_kb;
-+} free_base_memory_block_t;
-+
-+/* Return amount of free base memory in bytes
-+ */
-+
-+uint32_t get_free_base_memory ( void ) {
-+	return *fbms << 10;
-+}
-+
-+/* Adjust the real mode stack pointer.  We keep the real mode stack at
-+ * the top of free base memory, rather than allocating space for it.
-+ */
-+
-+inline void adjust_real_mode_stack ( void ) {
-+/*  	real_mode_stack = ( *fbms << 10 ); */
-+}
-+
-+/* Allocate N bytes of base memory.  Amount allocated will be rounded
-+ * up to the nearest kB, since that's the granularity of the BIOS FBMS
-+ * counter.  Returns NULL if memory cannot be allocated.
-+ */
-+
-+void * allot_base_memory ( size_t size ) {
-+	uint16_t size_kb = ( size + 1023 ) >> 10;
-+	void *ptr = NULL;
-+
-+#ifdef DEBUG_BASEMEM
-+	printf ( "Trying to allocate %d kB of base memory, %d kB free\n",
-+		 size_kb, *fbms );
-+#endif
-+
-+	/* Free up any unused memory before we start */
-+	free_unused_base_memory();
-+
-+	/* Check available base memory */
-+	if ( size_kb > *fbms ) { return NULL; }
-+
-+	/* Reduce available base memory */
-+	*fbms -= size_kb;
-+
-+	/* Calculate address of memory allocated */
-+	ptr = phys_to_virt ( *fbms << 10 );
-+
-+#ifdef DEBUG_BASEMEM
-+	/* Zero out memory.  We do this so that allocation of
-+	 * already-used space will show up in the form of a crash as
-+	 * soon as possible.
-+	 */
-+	memset ( ptr, 0, size_kb << 10 );
-+#endif
-+
-+	/* Adjust real mode stack pointer */
-+	adjust_real_mode_stack ();
-+
-+	return ptr;
-+}
-+
-+/* Free base memory allocated by allot_base_memory.  The BIOS provides
-+ * nothing better than a LIFO mechanism for freeing memory (i.e. it
-+ * just has the single "total free memory" counter), but we improve
-+ * upon this slightly; as long as you free all the allotted blocks, it
-+ * doesn't matter what order you free them in.  (This will only work
-+ * for blocks that are freed via forget_base_memory()).
-+ *
-+ * Yes, it's annoying that you have to remember the size of the blocks
-+ * you've allotted.  However, since our granularity of allocation is
-+ * 1K, the alternative is to risk wasting the occasional kB of base
-+ * memory, which is a Bad Thing.  Really, you should be using as
-+ * little base memory as possible, so consider the awkwardness of the
-+ * API to be a feature! :-)
-+ */
-+
-+void forget_base_memory ( void *ptr, size_t size ) {
-+	uint16_t remainder = virt_to_phys(ptr) & 1023;
-+	uint16_t size_kb = ( size + remainder + 1023 ) >> 10;
-+	free_base_memory_block_t *free_block =
-+		( free_base_memory_block_t * ) ( ptr - remainder );
-+	
-+	if ( ( ptr == NULL ) || ( size == 0 ) ) { return; }
-+
-+#ifdef DEBUG_BASEMEM
-+	printf ( "Trying to free %d bytes base memory at 0x%x\n",
-+		 size, virt_to_phys ( ptr ) );
-+	if ( remainder > 0 ) {
-+		printf ( "WARNING: destructively expanding free block "
-+			 "downwards to 0x%x\n",
-+			 virt_to_phys ( ptr - remainder ) );
-+	}
-+#endif
-+
-+	/* Mark every kilobyte within this block as free.  This is
-+	 * overkill for normal purposes, but helps when something has
-+	 * allocated base memory with a granularity finer than the
-+	 * BIOS granularity of 1kB.  PXE ROMs tend to do this when
-+	 * they allocate their own memory.  This method allows us to
-+	 * free their blocks (admittedly in a rather dangerous,
-+	 * tread-on-anything-either-side sort of way, but there's no
-+	 * other way to do it).
-+	 *
-+	 * Since we're marking every kB as free, there's actually no
-+	 * need for recording the size of the blocks.  However, we
-+	 * keep this in so that debug messages are friendlier.  It
-+	 * probably adds around 8 bytes to the overall code size.
-+	 */
-+	while ( size_kb > 0 ) {
-+		/* Mark this block as unused */
-+		free_block->magic = FREE_BLOCK_MAGIC;
-+		free_block->size_kb = size_kb;
-+		/* Move up by 1 kB */
-+		(void *)(free_block += ( 1 << 10 ));
-+		size_kb--;
-+	}
-+
-+	/* Free up unused base memory */
-+	free_unused_base_memory();
-+}
-+
-+/* Do the actual freeing of memory.  This is split out from
-+ * forget_base_memory() so that it may be called separately.  It
-+ * should be called whenever base memory is deallocated by an external
-+ * entity (if we can detect that it has done so) so that we get the
-+ * chance to free up our own blocks.
-+ */
-+void free_unused_base_memory ( void ) {
-+	free_base_memory_block_t *free_block = NULL;
-+
-+	/* Try to release memory back to the BIOS.  Free all
-+	 * consecutive blocks marked as free.
-+	 */
-+	while ( 1 ) {
-+		/* Calculate address of next potential free block */
-+		free_block = ( free_base_memory_block_t * )
-+			phys_to_virt ( *fbms << 10 );
-+		
-+		/* Stop processing if we're all the way up to 640K or
-+		 * if this is not a free block
-+		 */
-+		if ( ( *fbms == BASE_MEMORY_MAX ) ||
-+		     ( free_block->magic != FREE_BLOCK_MAGIC ) ) {
-+			break;
-+		}
-+
-+		/* Return memory to BIOS */
-+		*fbms += free_block->size_kb;
-+
-+#ifdef DEBUG_BASEMEM
-+		printf ( "Freed %d kB base memory, %d kB now free\n",
-+			 free_block->size_kb, *fbms );
-+		
-+		/* Zero out freed block.  We do this in case
-+		 * the block contained any structures that
-+		 * might be located by scanning through
-+		 * memory.
-+		 */
-+		memset ( free_block, 0, free_block->size_kb << 10 );
-+#endif			
-+	}
-+
-+	/* Adjust real mode stack pointer */
-+	adjust_real_mode_stack ();
-+}
-+
-Index: b/netboot/big_bswap.h
-===================================================================
---- /dev/null
-+++ b/netboot/big_bswap.h
-@@ -0,0 +1,17 @@
-+#ifndef ETHERBOOT_BIG_BSWAP_H
-+#define ETHERBOOT_BIG_BSWAP_H
-+
-+#define ntohl(x) 	(x)
-+#define htonl(x) 	(x)
-+#define ntohs(x) 	(x)
-+#define htons(x) 	(x)
-+#define cpu_to_le32(x)	__bswap_32(x)
-+#define cpu_to_le16(x)	__bswap_16(x)
-+#define cpu_to_be32(x)	(x)
-+#define cpu_to_be16(x)	(x)
-+#define le32_to_cpu(x)	__bswap_32(x)
-+#define le16_to_cpu(x)	__bswap_16(x)
-+#define be32_to_cpu(x)	(x)
-+#define be16_to_cpu(x)	(x)
-+
-+#endif /* ETHERBOOT_BIG_BSWAP_H */
-Index: b/netboot/bootp.h
-===================================================================
---- /dev/null
-+++ b/netboot/bootp.h
-@@ -0,0 +1,182 @@
-+#ifndef	_BOOTP_H
-+#define	_BOOTP_H
-+
-+#include "if_ether.h"
-+#include "ip.h"
-+#include "udp.h"
-+
-+#ifndef	MAX_BOOTP_RETRIES
-+#define MAX_BOOTP_RETRIES	20
-+#endif
-+
-+#ifdef	ALTERNATE_DHCP_PORTS_1067_1068
-+#undef	NON_STANDARD_BOOTP_SERVER
-+#define	NON_STANDARD_BOOTP_SERVER	1067
-+#undef	NON_STANDARD_BOOTP_CLIENT
-+#define	NON_STANDARD_BOOTP_CLIENT	1068
-+#endif
-+
-+#ifdef	NON_STANDARD_BOOTP_SERVER
-+#define	BOOTP_SERVER	NON_STANDARD_BOOTP_SERVER
-+#else
-+#define BOOTP_SERVER	67
-+#endif
-+#ifdef	NON_STANDARD_BOOTP_CLIENT
-+#define	BOOTP_CLIENT	NON_STANDARD_BOOTP_CLIENT
-+#else
-+#define BOOTP_CLIENT	68
-+#endif
-+
-+#define BOOTP_REQUEST	1
-+#define BOOTP_REPLY	2
-+
-+#define TAG_LEN(p)		(*((p)+1))
-+#define RFC1533_COOKIE		99, 130, 83, 99
-+#define RFC1533_PAD		0
-+#define RFC1533_NETMASK		1
-+#define RFC1533_TIMEOFFSET	2
-+#define RFC1533_GATEWAY		3
-+#define RFC1533_TIMESERVER	4
-+#define RFC1533_IEN116NS	5
-+#define RFC1533_DNS		6
-+#define RFC1533_LOGSERVER	7
-+#define RFC1533_COOKIESERVER	8
-+#define RFC1533_LPRSERVER	9
-+#define RFC1533_IMPRESSSERVER	10
-+#define RFC1533_RESOURCESERVER	11
-+#define RFC1533_HOSTNAME	12
-+#define RFC1533_BOOTFILESIZE	13
-+#define RFC1533_MERITDUMPFILE	14
-+#define RFC1533_DOMAINNAME	15
-+#define RFC1533_SWAPSERVER	16
-+#define RFC1533_ROOTPATH	17
-+#define RFC1533_EXTENSIONPATH	18
-+#define RFC1533_IPFORWARDING	19
-+#define RFC1533_IPSOURCEROUTING	20
-+#define RFC1533_IPPOLICYFILTER	21
-+#define RFC1533_IPMAXREASSEMBLY	22
-+#define RFC1533_IPTTL		23
-+#define RFC1533_IPMTU		24
-+#define RFC1533_IPMTUPLATEAU	25
-+#define RFC1533_INTMTU		26
-+#define RFC1533_INTLOCALSUBNETS	27
-+#define RFC1533_INTBROADCAST	28
-+#define RFC1533_INTICMPDISCOVER	29
-+#define RFC1533_INTICMPRESPOND	30
-+#define RFC1533_INTROUTEDISCOVER 31
-+#define RFC1533_INTROUTESOLICIT	32
-+#define RFC1533_INTSTATICROUTES	33
-+#define RFC1533_LLTRAILERENCAP	34
-+#define RFC1533_LLARPCACHETMO	35
-+#define RFC1533_LLETHERNETENCAP	36
-+#define RFC1533_TCPTTL		37
-+#define RFC1533_TCPKEEPALIVETMO	38
-+#define RFC1533_TCPKEEPALIVEGB	39
-+#define RFC1533_NISDOMAIN	40
-+#define RFC1533_NISSERVER	41
-+#define RFC1533_NTPSERVER	42
-+#define RFC1533_VENDOR		43
-+#define RFC1533_NBNS		44
-+#define RFC1533_NBDD		45
-+#define RFC1533_NBNT		46
-+#define RFC1533_NBSCOPE		47
-+#define RFC1533_XFS		48
-+#define RFC1533_XDM		49
-+#ifndef	NO_DHCP_SUPPORT
-+#define RFC2132_REQ_ADDR	50
-+#define RFC2132_MSG_TYPE	53
-+#define RFC2132_SRV_ID		54
-+#define RFC2132_PARAM_LIST	55
-+#define RFC2132_MAX_SIZE	57
-+#define	RFC2132_VENDOR_CLASS_ID	60
-+
-+#define DHCPDISCOVER		1
-+#define DHCPOFFER		2
-+#define DHCPREQUEST		3
-+#define DHCPACK			5
-+#endif	/* NO_DHCP_SUPPORT */
-+
-+#define RFC1533_VENDOR_MAJOR	0
-+#define RFC1533_VENDOR_MINOR	0
-+
-+#define RFC1533_VENDOR_MAGIC	128
-+#define RFC1533_VENDOR_ADDPARM	129
-+#define	RFC1533_VENDOR_ETHDEV	130
-+#ifdef	IMAGE_FREEBSD
-+#define RFC1533_VENDOR_HOWTO    132
-+#define RFC1533_VENDOR_KERNEL_ENV    133
-+#endif
-+#define RFC1533_VENDOR_ETHERBOOT_ENCAP 150
-+#define RFC1533_VENDOR_MNUOPTS	160
-+#define RFC1533_VENDOR_NIC_DEV_ID 175
-+#define RFC1533_VENDOR_SELECTION 176
-+#define RFC1533_VENDOR_ARCH     177
-+#define RFC1533_VENDOR_MOTD	184
-+#define RFC1533_VENDOR_NUMOFMOTD 8
-+#define RFC1533_VENDOR_IMG	192
-+#define RFC1533_VENDOR_NUMOFIMG	16
-+
-+#define RFC1533_VENDOR_CONFIGFILE 150
-+
-+#define RFC1533_END		255
-+
-+#define BOOTP_VENDOR_LEN	64
-+
-+#define DHCP_OPT_LEN		312
-+
-+/* Format of a bootp packet */
-+struct bootp_t {
-+	uint8_t  bp_op;
-+	uint8_t  bp_htype;
-+	uint8_t  bp_hlen;
-+	uint8_t  bp_hops;
-+	uint32_t bp_xid;
-+	uint16_t bp_secs;
-+	uint16_t unused;
-+	in_addr bp_ciaddr;
-+	in_addr bp_yiaddr;
-+	in_addr bp_siaddr;
-+	in_addr bp_giaddr;
-+	uint8_t  bp_hwaddr[16];
-+	uint8_t  bp_sname[64];
-+	char     bp_file[128];
-+	uint8_t  bp_vend[BOOTP_VENDOR_LEN];
-+};
-+
-+struct dhcp_t {
-+	uint8_t  bp_op;
-+	uint8_t  bp_htype;
-+	uint8_t  bp_hlen;
-+	uint8_t  bp_hops;
-+	uint32_t bp_xid;
-+	uint16_t bp_secs;
-+	uint16_t bp_flag;
-+	in_addr bp_ciaddr;
-+	in_addr bp_yiaddr;
-+	in_addr bp_siaddr;
-+	in_addr bp_giaddr;
-+	uint8_t  bp_hwaddr[16];
-+	uint8_t  bp_sname[64];
-+	char     bp_file[128];
-+	uint8_t  bp_vend[DHCP_OPT_LEN];
-+};
-+
-+/* Format of a bootp IP packet */
-+struct bootpip_t
-+{
-+	struct iphdr ip;
-+	struct udphdr udp;
-+	struct bootp_t bp;
-+};
-+struct dhcpip_t
-+{
-+	struct iphdr ip;
-+	struct udphdr udp;
-+	struct dhcp_t bp;
-+};
-+
-+#define MAX_RFC1533_VENDLEN (ETH_MAX_MTU - sizeof(struct bootpip_t) + BOOTP_VENDOR_LEN)
-+
-+#define BOOTP_DATA_ADDR (&bootp_data)
-+
-+#endif	/* _BOOTP_H */
-Index: b/netboot/byteswap.h
-===================================================================
---- /dev/null
-+++ b/netboot/byteswap.h
-@@ -0,0 +1,20 @@
-+#ifndef ETHERBOOT_BYTESWAP_H
-+#define ETHERBOOT_BYTESWAP_H
-+
-+#include "endian.h"
-+#include "i386_byteswap.h"
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#include "little_bswap.h"
-+#endif
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#include "big_bswap.h"
-+#endif
-+
-+/* Make routines available to all */
-+#define swap32(x)	__bswap_32(x)
-+#define swap16(x)	__bswap_16(x)
-+#define bswap_32(x)	__bswap_32(x)
-+#define bswap_16(x)	__bswap_16(x)
-+	
-+#endif /* ETHERBOOT_BYTESWAP_H */
-Index: b/netboot/cards.h
-===================================================================
---- a/netboot/cards.h
-+++ /dev/null
-@@ -1,183 +0,0 @@
--#ifndef	CARDS_H
--#define CARDS_H
--
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
--#include "nic.h"
--
--/* OK, this is how the PCI support hack works:  if pci.h is included before
-- * this file is included, assume that the driver supports PCI.  This means that
-- * this file is usually included last.  */
--
--#ifdef	PCI_H
--#define PCI_ARG(x) ,x
--#else
--#define PCI_ARG(x)
--#endif
--
--#ifdef	INCLUDE_WD
--extern struct nic	*wd_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_3C503
--extern struct nic	*t503_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_VIA_RHINE
--extern struct nic	*rhine_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NE
--extern struct nic	*ne_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NS8390
--extern struct nic	*nepci_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_3C509
--extern struct nic	*t509_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_3C529
--extern struct nic	*t529_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_3C595
--extern struct nic	*t595_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_3C90X
--extern struct nic	*a3c90x_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_EEPRO
--extern struct nic	*eepro_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_EEPRO100
--extern struct nic	*eepro100_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_EPIC100
--extern struct nic	*epic100_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_OTULIP
--extern struct nic	*otulip_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_TULIP
--extern struct nic	*tulip_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_DAVICOM
--extern struct nic	*davicom_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_CS89X0
--extern struct nic	*cs89x0_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_LANCE
--extern struct nic	*lancepci_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NE2100
--extern struct nic	*ne2100_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NI6510
--extern struct nic	*ni6510_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_SK_G16
--extern struct nic	*SK_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_3C507
--extern struct nic	*t507_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NI5010
--extern struct nic	*ni5010_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NI5210
--extern struct nic	*ni5210_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_EXOS205
--extern struct nic	*exos205_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_SMC9000
--extern struct nic	*smc9000_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_TIARA
--extern struct nic	*tiara_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_DEPCA
--extern struct nic	*depca_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_RTL8139
--extern struct nic	*rtl8139_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_W89C840
--extern struct nic	*w89c840_probe(struct nic *, unsigned short *
--	PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_SIS900
--extern struct nic	*sis900_probe(struct nic *, unsigned short *
--        PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_NATSEMI
--extern struct nic	*natsemi_probe(struct nic *, unsigned short *
--        PCI_ARG(struct pci_device *));
--#endif
--
--#ifdef	INCLUDE_TLAN
--extern struct nic	*tlan_probe(struct nic *, unsigned short *
--        PCI_ARG(struct pci_device *));
--#endif
--
--#endif	/* CARDS_H */
-Index: b/netboot/config.c
-===================================================================
---- a/netboot/config.c
-+++ b/netboot/config.c
-@@ -1,598 +1,165 @@
- /*
-- *  GRUB  --  GRand Unified Bootloader
-- *  Copyright (C) 2001,2002  Free Software Foundation, Inc.
-- *
-- *  This program is free software; you can redistribute it and/or modify
-- *  it under the terms of the GNU General Public License as published by
-- *  the Free Software Foundation; either version 2 of the License, or
-- *  (at your option) any later version.
-- *
-- *  This program is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- *  GNU General Public License for more details.
-- *
-- *  You should have received a copy of the GNU General Public License
-- *  along with this program; if not, write to the Free Software
-- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-- */
--
--/* Based on "src/config.c" in etherboot-5.0.5.  */
--
--/*
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License as
-  * published by the Free Software Foundation; either version 2, or (at
-  * your option) any later version.
-  */
- 
--#define GRUB	1
--#include <etherboot.h>
--#include <nic.h>
-+#include	"grub.h"
-+#include	"pci.h"
-+#include	"isa.h"
-+#include	"nic.h"
- 
--#undef	INCLUDE_PCI
--#if	defined(INCLUDE_NS8390) || defined(INCLUDE_EEPRO100) || defined(INCLUDE_LANCE) || defined(INCLUDE_EPIC100) || defined(INCLUDE_TULIP) || defined(INCLUDE_OTULIP) || defined(INCLUDE_3C90X) ||  defined(INCLUDE_3C595) || defined(INCLUDE_RTL8139) || defined(INCLUDE_VIA_RHINE) || defined(INCLUDE_W89C840) || defined(INCLUDE_DAVICOM) || defined(INCLUDE_SIS900) || defined(INCLUDE_NATSEMI) || defined(INCLUDE_TLAN)
--	/* || others later */
--# define INCLUDE_PCI
--# include <pci.h>
--static unsigned short pci_ioaddrs[16];
--
--static struct pci_device pci_nic_list[] =
-+#ifdef CONFIG_PCI
-+static int pci_probe(struct dev *dev, const char *type_name)
- {
--#ifdef	INCLUDE_NS8390
--  { PCI_VENDOR_ID_REALTEK,	PCI_DEVICE_ID_REALTEK_8029,
--    "Realtek 8029", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_WINBOND2,	PCI_DEVICE_ID_WINBOND2_89C940,
--    "Winbond NE2000-PCI", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_COMPEX,	PCI_DEVICE_ID_COMPEX_RL2000,
--    "Compex ReadyLink 2000", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_KTI,		PCI_DEVICE_ID_KTI_ET32P2,
--    "KTI ET32P2", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_NETVIN,	PCI_DEVICE_ID_NETVIN_NV5000SC,
--    "NetVin NV5000SC", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_HOLTEK,	PCI_DEVICE_ID_HOLTEK_HT80232,
--    "Holtek HT80232", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_3C90X
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900TPO,
--    "3Com900-TPO", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900COMBO,
--    "3Com900-Combo", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905TX,
--    "3Com905-TX", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905T4,
--    "3Com905-T4", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9004,
--    "3Com900B-TPO", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9005,
--    "3Com900B-Combo", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9006,
--    "3Com900B-2/T", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x900A,
--    "3Com900B-FL", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905B_TX,
--    "3Com905B-TX", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9056,
--    "3Com905B-T4", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x905A,
--    "3Com905B-FL", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C905C_TXM,
--    "3Com905C-TXM", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9800,
--    "3Com980-Cyclone", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9805,
--    "3Com9805", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x7646,
--    "3CSOHO100-TX", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_3C595
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C590,
--    "3Com590", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C595,
--    "3Com595", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C595_1,
--    "3Com595", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C595_2,
--    "3Com595", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900TPO,
--    "3Com900-TPO", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		PCI_DEVICE_ID_3COM_3C900COMBO,
--    "3Com900-Combo", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9004,
--    "3Com900B-TPO", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9005,
--    "3Com900B-Combo", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9006,
--    "3Com900B-2/T", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x900A,
--    "3Com900B-FL", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9800,
--    "3Com980-Cyclone", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x9805,
--    "3Com9805", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_3COM,		0x7646,
--    "3CSOHO100-TX", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_EEPRO100
--  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82557,
--    "Intel EtherExpressPro100", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82559ER,
--    "Intel EtherExpressPro100 82559ER", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ID1029,
--    "Intel EtherExpressPro100 ID1029", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_ID1030,
--    "Intel Corporation 82559 InBusiness 10/100", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82562,
--    "Intel EtherExpressPro100 82562EM", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_EPIC100
--  { PCI_VENDOR_ID_SMC,		PCI_DEVICE_ID_SMC_EPIC100,
--    "SMC EtherPowerII", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_LANCE
--  { PCI_VENDOR_ID_AMD,		PCI_DEVICE_ID_AMD_LANCE,
--    "AMD Lance/PCI", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_AMD_HOMEPNA,	PCI_DEVICE_ID_AMD_HOMEPNA,
--    "AMD Lance/HomePNA", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_RTL8139
--  { PCI_VENDOR_ID_REALTEK,	PCI_DEVICE_ID_REALTEK_8139,
--    "Realtek 8139", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DLINK,	PCI_DEVICE_ID_DFE530TXP,
--    "DFE530TX+/DFE538TX", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_SMC_1211,	PCI_DEVICE_ID_SMC_1211,
--    "SMC EZ10/100", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_OTULIP
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP,
--    "Digital Tulip", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_FAST,
--    "Digital Tulip Fast", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_PLUS,
--    "Digital Tulip+", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_21142,
--    "Digital Tulip 21142", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_TULIP
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP,
--    "Digital Tulip", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_FAST,
--    "Digital Tulip Fast", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_TULIP_PLUS,
--    "Digital Tulip+", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DEC,		PCI_DEVICE_ID_DEC_21142,
--    "Digital Tulip 21142", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_MACRONIX,	PCI_DEVICE_ID_MX987x5,
--    "Macronix MX987x5", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_LINKSYS,	PCI_DEVICE_ID_LC82C115,
--    "LinkSys LNE100TX", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_LINKSYS,	PCI_DEVICE_ID_DEC_TULIP,
--    "Netgear FA310TX", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9102,
--    "Davicom 9102", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9009,
--    "Davicom 9009", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_ADMTEK,	PCI_DEVICE_ID_ADMTEK_0985,
--    "ADMtek Centaur-P", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_ADMTEK,	0x0981,
--    "ADMtek AN981 Comet", 0, 0, 0, 0},
--  { 0x125B,			0x1400,
--    "ASIX AX88140", 0, 0, 0, 0 },
--  { 0x11F6,			0x9881,
--    "Compex RL100-TX", 0, 0, 0, 0 },
--#endif
--#ifdef	INCLUDE_DAVICOM
--  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9102,
--    "Davicom 9102", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_DAVICOM,	PCI_DEVICE_ID_DM9009,
--    "Davicom 9009", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_VIA_RHINE
--  { PCI_VENDOR_ID_VIATEC,	PCI_DEVICE_ID_VIA_VT6102,
--    "VIA 6102", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_VIATEC,	PCI_DEVICE_ID_VIA_RHINE_I,
--    "VIA 3043", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_VIATEC,	PCI_DEVICE_ID_VIA_86C100A,
--    "VIA 86C100A", 0, 0, 0, 0},
--#endif
--#ifdef	INCLUDE_W89C840
--  { PCI_VENDOR_ID_WINBOND2,	PCI_DEVICE_ID_WINBOND2_89C840,
--    "Winbond W89C840F", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_COMPEX,	PCI_DEVICE_ID_COMPEX_RL100ATX,
--    "Compex RL100ATX", 0, 0, 0, 0},
--#endif
--#ifdef INCLUDE_SIS900
--  { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS900,
--    "SIS900", 0, 0, 0, 0},
--  { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS7016,
--    "SIS7016", 0, 0, 0, 0},
--#endif
--  
--#ifdef INCLUDE_NATSEMI
--  { PCI_VENDOR_ID_NS,	     	PCI_DEVICE_ID_DP83815,
--    "DP83815", 0, 0, 0, 0},
--#endif
--  
--#ifdef INCLUDE_TLAN
--  { PCI_VENDOR_ID_OLICOM,	PCI_DEVICE_ID_OLICOM_OC2326,
--    "OC2326", 0, 0, 0, 0},
-+/*
-+ *	NIC probing is in pci device order, followed by the 
-+ *      link order of the drivers.  A driver that matches 
-+ *      on vendor and device id will supersede a driver
-+ *      that matches on pci class.
-+ *
-+ *	If you want to probe for another device behind the same pci
-+ *      device just increment index.  And the previous probe call
-+ *      will be repeated.
-+ */
-+	struct pci_probe_state *state = &dev->state.pci;
-+	printf("Probing pci %s...\n", type_name);
-+	if (dev->how_probe == PROBE_FIRST) {
-+		state->advance    = 1;
-+		state->dev.driver = 0;
-+		state->dev.bus    = 0;
-+		state->dev.devfn  = 0;
-+		dev->index        = -1;
-+	}
-+	for(;;) {
-+		if ((dev->how_probe != PROBE_AWAKE) && state->advance) {
-+			find_pci(dev->type, &state->dev);
-+			dev->index = -1;
-+		}
-+		state->advance = 1;
-+		
-+		if (state->dev.driver == 0)
-+			break;
-+		
-+#if 0
-+		/* FIXME the romaddr code needs a total rethought to be useful */
-+		if (state->dev.romaddr != ((unsigned long) rom.rom_segment << 4)) {
-+			continue;
-+		}
-+#endif
-+		if (dev->how_probe != PROBE_AWAKE) {
-+			dev->type_index++;
-+		}
-+		dev->devid.bus_type = PCI_BUS_TYPE;
-+		dev->devid.vendor_id = htons(state->dev.vendor);
-+		dev->devid.device_id = htons(state->dev.dev_id);
-+		/* FIXME how do I handle dev->index + PROBE_AGAIN?? */
-+		
-+		printf("[%s]", state->dev.name);
-+		if (state->dev.driver->probe(dev, &state->dev)) {
-+			state->advance = (dev->index == -1);
-+			return PROBE_WORKED;
-+		}
-+		putchar('\n');
-+	}
-+	return PROBE_FAILED;
-+}
- #endif
- 
--  /* other PCI NICs go here */
--  {0, 0, NULL, 0, 0, 0, 0}
--};
--#endif	/* INCLUDE_*PCI */
--
--#include <cards.h>
--
--#ifdef INCLUDE_PCI
--struct pci_dispatch_table
-+#ifdef CONFIG_ISA
-+static int isa_probe(struct dev *dev, const char *type_name)
- {
--  unsigned short vendor;
--  unsigned short dev_id;
--  struct nic *(*eth_probe) (struct nic *, unsigned short *,
--			    struct pci_device *);
--};
--
--static struct pci_dispatch_table PCI_NIC[] =
--{
--# ifdef INCLUDE_NS8390
--  { PCI_VENDOR_ID_REALTEK,  PCI_DEVICE_ID_REALTEK_8029,    nepci_probe },
--  { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940, nepci_probe },
--  { PCI_VENDOR_ID_COMPEX,   PCI_DEVICE_ID_COMPEX_RL2000,   nepci_probe },
--  { PCI_VENDOR_ID_KTI,      PCI_DEVICE_ID_KTI_ET32P2,      nepci_probe },
--  { PCI_VENDOR_ID_NETVIN,   PCI_DEVICE_ID_NETVIN_NV5000SC, nepci_probe },
--  { PCI_VENDOR_ID_HOLTEK,   PCI_DEVICE_ID_HOLTEK_HT80232,  nepci_probe },
--# endif /* INCLUDE_NS8390 */
--# ifdef INCLUDE_3C90X
--  { PCI_VENDOR_ID_3COM,	    PCI_DEVICE_ID_3COM_3C900TPO,   a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C900COMBO, a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905TX,    a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905T4,    a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x9004,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x9005,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x9006,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x900A,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905B_TX,  a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x9056,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x905A,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C905C_TXM, a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x9800,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x9805,                        a3c90x_probe },
--  { PCI_VENDOR_ID_3COM,     0x7646,                        a3c90x_probe },
--# endif /* INCLUDE_3C90X */
--# ifdef	INCLUDE_3C595
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C590,      t595_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C595,      t595_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C595_1,    t595_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C595_2,    t595_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C900TPO,   t595_probe },
--  { PCI_VENDOR_ID_3COM,     PCI_DEVICE_ID_3COM_3C900COMBO, t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x9004,                        t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x9005,                        t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x9006,                        t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x900A,                        t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x9800,                        t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x9805,                        t595_probe },
--  { PCI_VENDOR_ID_3COM,     0x7646,                        t595_probe },
--# endif /* INCLUDE_3C595 */
--# ifdef	INCLUDE_EEPRO100
--  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82557,     eepro100_probe },
--  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82559ER,   eepro100_probe },
--  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_ID1029,    eepro100_probe },
--  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_ID1030,    eepro100_probe },
--  { PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82562,     eepro100_probe },
--# endif /* INCLUDE_EEPRO100 */
--# ifdef	INCLUDE_EPIC100
--  { PCI_VENDOR_ID_SMC,      PCI_DEVICE_ID_SMC_EPIC100,     epic100_probe },
--# endif /* INCLUDE_EPIC100 */
--# ifdef	INCLUDE_LANCE
--  { PCI_VENDOR_ID_AMD,      PCI_DEVICE_ID_AMD_LANCE,       lancepci_probe },
--  { PCI_VENDOR_ID_AMD_HOMEPNA, PCI_DEVICE_ID_AMD_HOMEPNA,  lancepci_probe },
--# endif /* INCLUDE_LANCE */
--# ifdef	INCLUDE_RTL8139
--  { PCI_VENDOR_ID_REALTEK,  PCI_DEVICE_ID_REALTEK_8139,    rtl8139_probe },
--  { PCI_VENDOR_ID_DLINK,    PCI_DEVICE_ID_DFE530TXP,       rtl8139_probe },
--  { PCI_VENDOR_ID_SMC_1211, PCI_DEVICE_ID_SMC_1211,        rtl8139_probe },
--# endif /* INCLUDE_RTL8139 */
--# ifdef	INCLUDE_OTULIP
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP,       otulip_probe },
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_FAST,  otulip_probe },
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_PLUS,  otulip_probe },
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_21142,       otulip_probe },
--# endif /* INCLUDE_OTULIP */
--# ifdef	INCLUDE_TULIP
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP,       tulip_probe },
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_FAST,  tulip_probe },
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_TULIP_PLUS,  tulip_probe },
--  { PCI_VENDOR_ID_DEC,      PCI_DEVICE_ID_DEC_21142,       tulip_probe },
--  { PCI_VENDOR_ID_MACRONIX, PCI_DEVICE_ID_MX987x5,         tulip_probe },
--  { PCI_VENDOR_ID_LINKSYS,  PCI_DEVICE_ID_LC82C115,        tulip_probe },
--  { PCI_VENDOR_ID_LINKSYS,  PCI_DEVICE_ID_DEC_TULIP,       tulip_probe },
--  { PCI_VENDOR_ID_DAVICOM,  PCI_DEVICE_ID_DM9102,          tulip_probe },
--  { PCI_VENDOR_ID_DAVICOM,  PCI_DEVICE_ID_DM9009,          tulip_probe },
--  { PCI_VENDOR_ID_ADMTEK,   PCI_DEVICE_ID_ADMTEK_0985,     tulip_probe },
--  { PCI_VENDOR_ID_ADMTEK,   0x0981,                        tulip_probe },
--  { 0x125B,                 0x1400,                        tulip_probe },
--  { 0x11F6,                 0x9881,                        tulip_probe },
--# endif /* INCLUDE_TULIP */
--# ifdef INCLUDE_DAVICOM
--  { PCI_VENDOR_ID_DAVICOM,   PCI_DEVICE_ID_DM9102,           davicom_probe },
--  { PCI_VENDOR_ID_DAVICOM,   PCI_DEVICE_ID_DM9009,           davicom_probe },
--# endif /* INCLUDE_DAVICOM */
--# ifdef	INCLUDE_VIA_RHINE
--  { PCI_VENDOR_ID_VIATEC,   PCI_DEVICE_ID_VIA_VT6102,      rhine_probe },
--  { PCI_VENDOR_ID_VIATEC,   PCI_DEVICE_ID_VIA_RHINE_I,     rhine_probe },
--  { PCI_VENDOR_ID_VIATEC,   PCI_DEVICE_ID_VIA_86C100A,     rhine_probe },
--# endif /* INCLUDE_VIA_RHINE */
--# ifdef INCLUDE_W89C840
--  { PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C840, w89c840_probe },
--  { PCI_VENDOR_ID_COMPEX,   PCI_DEVICE_ID_COMPEX_RL100ATX, w89c840_probe },
--# endif /* INCLUDE_W89C840 */
--# ifdef INCLUDE_SIS900
--  { PCI_VENDOR_ID_SIS,      PCI_DEVICE_ID_SIS900,          sis900_probe },
--  { PCI_VENDOR_ID_SIS,      PCI_DEVICE_ID_SIS7016,         sis900_probe },
--# endif /* INCLUDE_SIS900 */
--# ifdef INCLUDE_NATSEMI
--  { PCI_VENDOR_ID_NS,       PCI_DEVICE_ID_DP83815,         natsemi_probe },
--# endif /* INCLUDE_NATSEMI */
--# ifdef INCLUDE_TLAN
--  { PCI_VENDOR_ID_OLICOM,   PCI_DEVICE_ID_OLICOM_OC2326,   tlan_probe },
--# endif /* INCLUDE_TLAN */
--  { 0,                      0,                             0 }
--};
--#endif /* GRUB && INCLUDE_PCI */
--
--struct dispatch_table
--{
--  const char	*nic_name;
--#ifdef	INCLUDE_PCI
--  struct nic	*(*eth_probe) (struct nic *, unsigned short *,
--			       struct pci_device *);
--#else
--  struct nic	*(*eth_probe) (struct nic *, unsigned short *);
--#endif	/* INCLUDE_PCI */
--  unsigned short	*probe_ioaddrs;		/* for probe overrides */
--};
--
- /*
-- *	NIC probing is in order of appearance in this table.
-+ *	NIC probing is in the order the drivers were linked togeter.
-  *	If for some reason you want to change the order,
-- *	just rearrange the entries (bracketed by the #ifdef/#endif)
-+ *	just change the order you list the drivers in.
-  */
--static struct dispatch_table	NIC[] =
--{
--#ifdef	INCLUDE_RTL8139
--  { "RTL8139", rtl8139_probe, pci_ioaddrs },
--#endif
--#ifdef INCLUDE_SIS900
--  { "SIS900", sis900_probe, pci_ioaddrs },	
--#endif
--#ifdef INCLUDE_NATSEMI
--  { "NATSEMI", natsemi_probe, pci_ioaddrs },	
--#endif
--#ifdef	INCLUDE_WD
--  { "WD", wd_probe, 0 },
--#endif
--#ifdef	INCLUDE_3C503
--  { "3C503", t503_probe, 0 },
--#endif
--#ifdef	INCLUDE_NE
--  { "NE*000", ne_probe, 0 },
--#endif
--#ifdef	INCLUDE_3C509
--  { "3C5x9", t509_probe, 0 },
--#endif
--#ifdef	INCLUDE_3C529
--  { "3C5x9", t529_probe, 0 },
--#endif
--#ifdef	INCLUDE_3C595
--  { "3C595", t595_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_3C90X
--  { "3C90X", a3c90x_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_EEPRO
--  { "EEPRO", eepro_probe, 0 },
--#endif
--#ifdef	INCLUDE_EEPRO100
--  { "EEPRO100", eepro100_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_EPIC100
--  { "EPIC100", epic100_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_OTULIP
--  { "OTulip", otulip_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_TULIP
--  { "Tulip", tulip_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_DAVICOM
--  { "DAVICOM", davicom_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_CS89X0
--  { "CS89x0", cs89x0_probe, 0 },
--#endif
--#ifdef	INCLUDE_NE2100
--  { "NE2100", ne2100_probe, 0 },
--#endif
--#ifdef	INCLUDE_NI6510
--  { "NI6510", ni6510_probe, 0 },
--#endif
--#ifdef	INCLUDE_SK_G16
--  { "SK_G16", SK_probe, 0 },
--#endif
--#ifdef	INCLUDE_3C507
--  { "3C507", t507_probe, 0 },
--#endif
--#ifdef	INCLUDE_NI5010
--  { "NI5010", ni5010_probe, 0 },
--#endif
--#ifdef	INCLUDE_NI5210
--  { "NI5210", ni5210_probe, 0 },
--#endif
--#ifdef	INCLUDE_EXOS205
--  { "EXOS205", exos205_probe, 0 },
--#endif
--#ifdef	INCLUDE_SMC9000
--  { "SMC9000", smc9000_probe, 0 },
--#endif
--#ifdef	INCLUDE_TIARA
--  { "TIARA", tiara_probe, 0 },
--#endif
--#ifdef	INCLUDE_DEPCA
--  { "DEPCA", depca_probe, 0 },
--#endif
--#ifdef	INCLUDE_NS8390
--  { "NE2000/PCI", nepci_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_LANCE
--  { "LANCE/PCI", lancepci_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_VIA_RHINE
--  { "VIA 86C100", rhine_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_W89C840
--  { "W89C840F", w89c840_probe, pci_ioaddrs },
--#endif
--#ifdef	INCLUDE_TLAN
--  { "Olicom 2326", tlan_probe, pci_ioaddrs },
--#endif
--  /* this entry must always be last to mark the end of list */
--  { 0, 0, 0 }
--};
--
--#define	NIC_TABLE_SIZE	(sizeof (NIC) / sizeof (NIC[0]))
--
--static int
--eth_dummy (struct nic *dummy)
--{
--  return 0;
-+	struct isa_probe_state *state = &dev->state.isa;
-+	printf("Probing isa %s...\n", type_name);
-+	if (dev->how_probe == PROBE_FIRST) {
-+		state->advance = 0;
-+		state->driver  = isa_drivers;
-+		dev->index     = -1;
-+	}
-+	for(;;)
-+	{
-+		if ((dev->how_probe != PROBE_AWAKE) && state->advance) {
-+			state->driver++;
-+			dev->index = -1;
-+		}
-+		state->advance = 1;
-+		
-+		if (state->driver >= isa_drivers_end)
-+			break;
-+
-+		if (state->driver->type != dev->type)
-+			continue;
-+
-+		if (dev->how_probe != PROBE_AWAKE) {
-+			dev->type_index++;
-+		}
-+		printf("[%s]", state->driver->name);
-+		dev->devid.bus_type = ISA_BUS_TYPE;
-+		/* FIXME how do I handle dev->index + PROBE_AGAIN?? */
-+		/* driver will fill in vendor and device IDs */
-+		if (state->driver->probe(dev, state->driver->ioaddrs)) {
-+			state->advance = (dev->index == -1);
-+			return PROBE_WORKED;
-+		}
-+		putchar('\n');
-+	}
-+	return PROBE_FAILED;
- }
--
--static char	packet[ETH_FRAME_LEN];
--
--struct nic	nic =
--{
--  (void (*) (struct nic *)) eth_dummy,	/* reset */
--  eth_dummy,				/* poll */
--  (void (*) (struct nic *, const char *,
--	     unsigned int, unsigned int,
--	     const char *)) eth_dummy,	/* transmit */
--  (void (*) (struct nic *)) eth_dummy,	/* disable */
--#ifdef	T503_AUI
--  1,					/* aui */
- #else
--  0,					/* no aui */
-+#define isa_probe(d,tn) (PROBE_FAILED)
- #endif
--  &rom,					/* rom_info */
--  arptable[ARP_CLIENT].node,		/* node_addr */
--  packet,				/* packet */
--  0,				/* packetlen */
--  0,				/* priv_data */
-+static const char *driver_name[] = {
-+	"nic", 
-+	"disk", 
-+	"floppy",
- };
--
--void
--eth_reset (void)
-+int probe(struct dev *dev)
- {
--  (*nic.reset) (&nic);
--}
-+	const char *type_name;
- 
--int
--eth_probe (void)
--{
--  struct pci_device	*p;
--  const struct dispatch_table	*t;
--  static int probed = 0;
-+	EnterFunction("probe");
- 
--  /* If already probed, don't try to probe it any longer.  */
--  if (probed)
--    return 1;
--  
--  /* Clear the ready flag.  */
--  network_ready = 0;
--  /* Clear the ARP table.  */
--  grub_memset ((char *) arptable, 0,
--	       MAX_ARP * sizeof (struct arptable_t));
--  
--  p = 0;
--  
--#ifdef	INCLUDE_PCI
--  /* In GRUB, the ROM info is initialized here.  */
--  rom = *((struct rom_info *) ROM_INFO_LOCATION);
--  
--  eth_pci_init(pci_nic_list);
--  pci_ioaddrs[0] = 0;
--  pci_ioaddrs[1] = 0;
--  /* at this point we have a list of possible PCI candidates
--     we just pick the first one with a non-zero ioaddr */
--  for (p = pci_nic_list; p->vendor != 0; ++p)
--    {
--      if (p->ioaddr != 0)
--	{
--	  pci_ioaddrs[0] = p->ioaddr;
--	  break;
-+	type_name = "";
-+	if ((dev->type >= 0) && 
-+		(dev->type < sizeof(driver_name)/sizeof(driver_name[0]))) {
-+		type_name = driver_name[dev->type];
- 	}
--    }
--#endif
--  
--  etherboot_printf("Probing...");
--	
--#ifdef INCLUDE_PCI
--  if (p->vendor)
--    {
--      struct pci_dispatch_table *pt;
--      
--      for (pt = PCI_NIC; pt->eth_probe != 0; pt++)
--	if (p->vendor == pt->vendor && p->dev_id == pt->dev_id)
--	  {
--	    etherboot_printf ("[%s]", p->name);
--	    if ((pt->eth_probe) (&nic, pci_ioaddrs, p))
--	      {
--		probed = 1;
--		return 1;
--	      }
--	  }
--    }
--#endif /* INCLUDE_PCI */
--	
--  for (t = NIC; t->nic_name != 0; ++t)
--    {
--      etherboot_printf("[%s]", t->nic_name);
--#ifdef	INCLUDE_PCI
--      if ((*t->eth_probe) (&nic, t->probe_ioaddrs, p))
--	{
--	  probed = 1;
--	  return 1;
-+	if (dev->how_probe == PROBE_FIRST) {
-+		dev->to_probe = PROBE_PCI;
-+		memset(&dev->state, 0, sizeof(dev->state));
- 	}
--#else
--      if ((*t->eth_probe) (&nic, t->probe_ioaddrs))
--	{
--	  probed = 1;
--	  return 1;
-+	if (dev->to_probe == PROBE_PCI) {
-+		dev->how_probe = pci_probe(dev, type_name);
-+		if (dev->how_probe == PROBE_FAILED) {
-+			dev->to_probe = PROBE_ISA;
-+		}
-+	}
-+	if (dev->to_probe == PROBE_ISA) {
-+		dev->how_probe = isa_probe(dev, type_name);
-+		if (dev->how_probe == PROBE_FAILED) {
-+			dev->to_probe = PROBE_NONE;
-+		}
-+	}
-+	if ((dev->to_probe != PROBE_PCI) &&
-+		(dev->to_probe != PROBE_ISA)) {
-+		dev->how_probe = PROBE_FAILED;
-+		
- 	}
--#endif	/* INCLUDE_PCI */
--    }
--  
--  return 0;
--}
--
--int
--eth_poll (void)
--{
--  return ((*nic.poll) (&nic));
--}
- 
--void
--eth_transmit (const char *d, unsigned int t, unsigned int s, const void *p)
--{
--  (*nic.transmit) (&nic, d, t, s, p);
--  if (t == IP)
--    twiddle ();
-+	LeaveFunction("probe");
-+	return dev->how_probe;
- }
- 
--void
--eth_disable (void)
-+void disable(struct dev *dev)
- {
--  (*nic.disable) (&nic);
-+	if (dev->disable) {
-+		dev->disable(dev);
-+		dev->disable = 0;
-+	}
- }
-Index: b/netboot/cpu.h
-===================================================================
---- /dev/null
-+++ b/netboot/cpu.h
-@@ -0,0 +1,243 @@
-+#ifndef I386_BITS_CPU_H
-+#define I386_BITS_CPU_H
-+
-+
-+/* Sample usage: CPU_FEATURE_P(cpu.x86_capability, FPU) */
-+#define CPU_FEATURE_P(CAP, FEATURE) \
-+	(!!(CAP[(X86_FEATURE_##FEATURE)/32] & ((X86_FEATURE_##FEATURE) & 0x1f)))
-+
-+#define NCAPINTS	4	/* Currently we have 4 32-bit words worth of info */
-+
-+/* Intel-defined CPU features, CPUID level 0x00000001, word 0 */
-+#define X86_FEATURE_FPU		(0*32+ 0) /* Onboard FPU */
-+#define X86_FEATURE_VME		(0*32+ 1) /* Virtual Mode Extensions */
-+#define X86_FEATURE_DE		(0*32+ 2) /* Debugging Extensions */
-+#define X86_FEATURE_PSE 	(0*32+ 3) /* Page Size Extensions */
-+#define X86_FEATURE_TSC		(0*32+ 4) /* Time Stamp Counter */
-+#define X86_FEATURE_MSR		(0*32+ 5) /* Model-Specific Registers, RDMSR, WRMSR */
-+#define X86_FEATURE_PAE		(0*32+ 6) /* Physical Address Extensions */
-+#define X86_FEATURE_MCE		(0*32+ 7) /* Machine Check Architecture */
-+#define X86_FEATURE_CX8		(0*32+ 8) /* CMPXCHG8 instruction */
-+#define X86_FEATURE_APIC	(0*32+ 9) /* Onboard APIC */
-+#define X86_FEATURE_SEP		(0*32+11) /* SYSENTER/SYSEXIT */
-+#define X86_FEATURE_MTRR	(0*32+12) /* Memory Type Range Registers */
-+#define X86_FEATURE_PGE		(0*32+13) /* Page Global Enable */
-+#define X86_FEATURE_MCA		(0*32+14) /* Machine Check Architecture */
-+#define X86_FEATURE_CMOV	(0*32+15) /* CMOV instruction (FCMOVCC and FCOMI too if FPU present) */
-+#define X86_FEATURE_PAT		(0*32+16) /* Page Attribute Table */
-+#define X86_FEATURE_PSE36	(0*32+17) /* 36-bit PSEs */
-+#define X86_FEATURE_PN		(0*32+18) /* Processor serial number */
-+#define X86_FEATURE_CLFLSH	(0*32+19) /* Supports the CLFLUSH instruction */
-+#define X86_FEATURE_DTES	(0*32+21) /* Debug Trace Store */
-+#define X86_FEATURE_ACPI	(0*32+22) /* ACPI via MSR */
-+#define X86_FEATURE_MMX		(0*32+23) /* Multimedia Extensions */
-+#define X86_FEATURE_FXSR	(0*32+24) /* FXSAVE and FXRSTOR instructions (fast save and restore */
-+				          /* of FPU context), and CR4.OSFXSR available */
-+#define X86_FEATURE_XMM		(0*32+25) /* Streaming SIMD Extensions */
-+#define X86_FEATURE_XMM2	(0*32+26) /* Streaming SIMD Extensions-2 */
-+#define X86_FEATURE_SELFSNOOP	(0*32+27) /* CPU self snoop */
-+#define X86_FEATURE_HT		(0*32+28) /* Hyper-Threading */
-+#define X86_FEATURE_ACC		(0*32+29) /* Automatic clock control */
-+#define X86_FEATURE_IA64	(0*32+30) /* IA-64 processor */
-+
-+/* AMD-defined CPU features, CPUID level 0x80000001, word 1 */
-+/* Don't duplicate feature flags which are redundant with Intel! */
-+#define X86_FEATURE_SYSCALL	(1*32+11) /* SYSCALL/SYSRET */
-+#define X86_FEATURE_MMXEXT	(1*32+22) /* AMD MMX extensions */
-+#define X86_FEATURE_LM		(1*32+29) /* Long Mode (x86-64) */
-+#define X86_FEATURE_3DNOWEXT	(1*32+30) /* AMD 3DNow! extensions */
-+#define X86_FEATURE_3DNOW	(1*32+31) /* 3DNow! */
-+
-+/* Transmeta-defined CPU features, CPUID level 0x80860001, word 2 */
-+#define X86_FEATURE_RECOVERY	(2*32+ 0) /* CPU in recovery mode */
-+#define X86_FEATURE_LONGRUN	(2*32+ 1) /* Longrun power control */
-+#define X86_FEATURE_LRTI	(2*32+ 3) /* LongRun table interface */
-+
-+/* Other features, Linux-defined mapping, word 3 */
-+/* This range is used for feature bits which conflict or are synthesized */
-+#define X86_FEATURE_CXMMX	(3*32+ 0) /* Cyrix MMX extensions */
-+#define X86_FEATURE_K6_MTRR	(3*32+ 1) /* AMD K6 nonstandard MTRRs */
-+#define X86_FEATURE_CYRIX_ARR	(3*32+ 2) /* Cyrix ARRs (= MTRRs) */
-+#define X86_FEATURE_CENTAUR_MCR	(3*32+ 3) /* Centaur MCRs (= MTRRs) */
-+
-+#define MAX_X86_VENDOR_ID 16
-+struct cpuinfo_x86 {
-+	uint8_t	 x86;		/* CPU family */
-+	uint8_t	 x86_model;
-+	uint8_t	 x86_mask;
-+
-+       	int	 cpuid_level;	/* Maximum supported CPUID level, -1=no CPUID */
-+	unsigned x86_capability[NCAPINTS];
-+	char	 x86_vendor_id[MAX_X86_VENDOR_ID];
-+};
-+
-+
-+#define X86_VENDOR_INTEL 0
-+#define X86_VENDOR_CYRIX 1
-+#define X86_VENDOR_AMD 2
-+#define X86_VENDOR_UMC 3
-+#define X86_VENDOR_NEXGEN 4
-+#define X86_VENDOR_CENTAUR 5
-+#define X86_VENDOR_RISE 6
-+#define X86_VENDOR_TRANSMETA 7
-+#define X86_VENDOR_NSC 8
-+#define X86_VENDOR_UNKNOWN 0xff
-+
-+/*
-+ * EFLAGS bits
-+ */
-+#define X86_EFLAGS_CF	0x00000001 /* Carry Flag */
-+#define X86_EFLAGS_PF	0x00000004 /* Parity Flag */
-+#define X86_EFLAGS_AF	0x00000010 /* Auxillary carry Flag */
-+#define X86_EFLAGS_ZF	0x00000040 /* Zero Flag */
-+#define X86_EFLAGS_SF	0x00000080 /* Sign Flag */
-+#define X86_EFLAGS_TF	0x00000100 /* Trap Flag */
-+#define X86_EFLAGS_IF	0x00000200 /* Interrupt Flag */
-+#define X86_EFLAGS_DF	0x00000400 /* Direction Flag */
-+#define X86_EFLAGS_OF	0x00000800 /* Overflow Flag */
-+#define X86_EFLAGS_IOPL	0x00003000 /* IOPL mask */
-+#define X86_EFLAGS_NT	0x00004000 /* Nested Task */
-+#define X86_EFLAGS_RF	0x00010000 /* Resume Flag */
-+#define X86_EFLAGS_VM	0x00020000 /* Virtual Mode */
-+#define X86_EFLAGS_AC	0x00040000 /* Alignment Check */
-+#define X86_EFLAGS_VIF	0x00080000 /* Virtual Interrupt Flag */
-+#define X86_EFLAGS_VIP	0x00100000 /* Virtual Interrupt Pending */
-+#define X86_EFLAGS_ID	0x00200000 /* CPUID detection flag */
-+
-+/*
-+ * Generic CPUID function
-+ */
-+static inline void cpuid(int op, 
-+	unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx)
-+{
-+	__asm__("cpuid"
-+		: "=a" (*eax),
-+		  "=b" (*ebx),
-+		  "=c" (*ecx),
-+		  "=d" (*edx)
-+		: "0" (op));
-+}
-+
-+/*
-+ * CPUID functions returning a single datum
-+ */
-+static inline unsigned int cpuid_eax(unsigned int op)
-+{
-+	unsigned int eax;
-+
-+	__asm__("cpuid"
-+		: "=a" (eax)
-+		: "0" (op)
-+		: "bx", "cx", "dx");
-+	return eax;
-+}
-+static inline unsigned int cpuid_ebx(unsigned int op)
-+{
-+	unsigned int eax, ebx;
-+
-+	__asm__("cpuid"
-+		: "=a" (eax), "=b" (ebx)
-+		: "0" (op)
-+		: "cx", "dx" );
-+	return ebx;
-+}
-+static inline unsigned int cpuid_ecx(unsigned int op)
-+{
-+	unsigned int eax, ecx;
-+
-+	__asm__("cpuid"
-+		: "=a" (eax), "=c" (ecx)
-+		: "0" (op)
-+		: "bx", "dx" );
-+	return ecx;
-+}
-+static inline unsigned int cpuid_edx(unsigned int op)
-+{
-+	unsigned int eax, edx;
-+
-+	__asm__("cpuid"
-+		: "=a" (eax), "=d" (edx)
-+		: "0" (op)
-+		: "bx", "cx");
-+	return edx;
-+}
-+
-+/*
-+ * Intel CPU features in CR4
-+ */
-+#define X86_CR4_VME		0x0001	/* enable vm86 extensions */
-+#define X86_CR4_PVI		0x0002	/* virtual interrupts flag enable */
-+#define X86_CR4_TSD		0x0004	/* disable time stamp at ipl 3 */
-+#define X86_CR4_DE		0x0008	/* enable debugging extensions */
-+#define X86_CR4_PSE		0x0010	/* enable page size extensions */
-+#define X86_CR4_PAE		0x0020	/* enable physical address extensions */
-+#define X86_CR4_MCE		0x0040	/* Machine check enable */
-+#define X86_CR4_PGE		0x0080	/* enable global pages */
-+#define X86_CR4_PCE		0x0100	/* enable performance counters at ipl 3 */
-+#define X86_CR4_OSFXSR		0x0200	/* enable fast FPU save and restore */
-+#define X86_CR4_OSXMMEXCPT	0x0400	/* enable unmasked SSE exceptions */
-+
-+
-+#define MSR_K6_EFER			0xC0000080
-+/* EFER bits: */ 
-+#define _EFER_SCE 0  /* SYSCALL/SYSRET */
-+#define _EFER_LME 8  /* Long mode enable */
-+#define _EFER_LMA 10 /* Long mode active (read-only) */
-+#define _EFER_NX 11  /* No execute enable */
-+
-+#define EFER_SCE (1<<_EFER_SCE)
-+#define EFER_LME (1<<EFER_LME)
-+#define EFER_LMA (1<<EFER_LMA)
-+#define EFER_NX (1<<_EFER_NX)
-+
-+#define rdmsr(msr,val1,val2) \
-+     __asm__ __volatile__("rdmsr" \
-+			  : "=a" (val1), "=d" (val2) \
-+			  : "c" (msr))
-+
-+#define wrmsr(msr,val1,val2) \
-+     __asm__ __volatile__("wrmsr" \
-+			  : /* no outputs */ \
-+			  : "c" (msr), "a" (val1), "d" (val2))
-+
-+
-+#define read_cr0()	({ \
-+	unsigned int __dummy; \
-+	__asm__( \
-+		"movl %%cr0, %0\n\t" \
-+		:"=r" (__dummy)); \
-+	__dummy; \
-+})
-+#define write_cr0(x) \
-+	__asm__("movl %0,%%cr0": :"r" (x));
-+
-+#define read_cr3()	({ \
-+	unsigned int __dummy; \
-+	__asm__( \
-+		"movl %%cr3, %0\n\t" \
-+		:"=r" (__dummy)); \
-+	__dummy; \
-+})
-+#define write_cr3x(x) \
-+	__asm__("movl %0,%%cr3": :"r" (x));
-+
-+
-+#define read_cr4()	({ \
-+	unsigned int __dummy; \
-+	__asm__( \
-+		"movl %%cr4, %0\n\t" \
-+		:"=r" (__dummy)); \
-+	__dummy; \
-+})
-+#define write_cr4x(x) \
-+	__asm__("movl %0,%%cr4": :"r" (x));
-+
-+
-+extern struct cpuinfo_x86 cpu_info;
-+#ifdef CONFIG_X86_64
-+extern void cpu_setup(void);
-+#else
-+#define cpu_setup() do {} while(0)
-+#endif
-+
-+#endif /* I386_BITS_CPU_H */
-Index: b/netboot/cs89x0.c
-===================================================================
---- a/netboot/cs89x0.c
-+++ b/netboot/cs89x0.c
-@@ -16,662 +16,3 @@
-    -- quote from email
- **/
- 
--/* cs89x0.c: A Crystal Semiconductor CS89[02]0 driver for etherboot. */
--/*
--  Permission is granted to distribute the enclosed cs89x0.[ch] driver
--  only in conjunction with the Etherboot package.  The code is
--  ordinarily distributed under the GPL.
--  
--  Russ Nelson, January 2000
--
--  ChangeLog:
--
--  Thu Dec 6 22:40:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
--
--  * disabled all "advanced" features; this should make the code more reliable
--
--  * reorganized the reset function
--
--  * always reset the address port, so that autoprobing will continue working
--
--  * some cosmetic changes
--
--  * 2.5
--
--  Thu Dec 5 21:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
--
--  * tested the code against a CS8900 card
--
--  * lots of minor bug fixes and adjustments
--
--  * this is the first release, that actually works! it still requires some
--    changes in order to be more tolerant to different environments
--
--  * 4
--
--  Fri Nov 22 23:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
--
--  * read the manuals for the CS89x0 chipsets and took note of all the
--    changes that will be neccessary in order to adapt Russel Nelson's code
--    to the requirements of a BOOT-Prom
--
--  * 6
--
--  Thu Nov 19 22:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
--
--  * Synched with Russel Nelson's current code (v1.00)
--
--  * 2
--
--  Thu Nov 12 18:00:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
--
--  * Cleaned up some of the code and tried to optimize the code size.
--
--  * 1.5
--
--  Sun Nov 10 16:30:00 1996  Markus Gutschke  <gutschk@math.uni-muenster.de>
--
--  * First experimental release. This code compiles fine, but I
--  have no way of testing whether it actually works.
--
--  * I did not (yet) bother to make the code 16bit aware, so for
--  the time being, it will only work for Etherboot/32.
--
--  * 12
--
--  */
--
--#include "etherboot.h"
--#include "nic.h"
--#include "cards.h"
--#include "cs89x0.h"
--
--static unsigned short	eth_nic_base;
--static unsigned long    eth_mem_start;
--static unsigned short   eth_irq;
--static unsigned short   eth_cs_type;	/* one of: CS8900, CS8920, CS8920M  */
--static unsigned short   eth_auto_neg_cnf;
--static unsigned short   eth_adapter_cnf;
--static unsigned short	eth_linectl;
--
--/*************************************************************************
--	CS89x0 - specific routines
--**************************************************************************/
--
--static inline int readreg(int portno)
--{
--	outw(portno, eth_nic_base + ADD_PORT);
--	return inw(eth_nic_base + DATA_PORT);
--}
--
--static inline void writereg(int portno, int value)
--{
--	outw(portno, eth_nic_base + ADD_PORT);
--	outw(value, eth_nic_base + DATA_PORT);
--	return;
--}
--
--/*************************************************************************
--EEPROM access
--**************************************************************************/
--
--static int wait_eeprom_ready(void)
--{
--	unsigned long tmo = currticks() + 4*TICKS_PER_SEC;
--
--	/* check to see if the EEPROM is ready, a timeout is used -
--	   just in case EEPROM is ready when SI_BUSY in the
--	   PP_SelfST is clear */
--	while(readreg(PP_SelfST) & SI_BUSY) {
--		if (currticks() >= tmo)
--			return -1; }
--	return 0;
--}
--
--static int get_eeprom_data(int off, int len, unsigned short *buffer)
--{
--	int i;
--
--#ifdef	EDEBUG
--	printf("\ncs: EEPROM data from %hX for %hX:",off,len);
--#endif
--	for (i = 0; i < len; i++) {
--		if (wait_eeprom_ready() < 0)
--			return -1;
--		/* Now send the EEPROM read command and EEPROM location
--		   to read */
--		writereg(PP_EECMD, (off + i) | EEPROM_READ_CMD);
--		if (wait_eeprom_ready() < 0)
--			return -1;
--		buffer[i] = readreg(PP_EEData);
--#ifdef	EDEBUG
--		if (!(i%10))
--			printf("\ncs: ");
--		printf("%hX ", buffer[i]);
--#endif
--	}
--#ifdef	EDEBUG
--	putchar('\n');
--#endif
--
--	return(0);
--}
--
--static int get_eeprom_chksum(int off, int len, unsigned short *buffer)
--{
--	int  i, cksum;
--
--	cksum = 0;
--	for (i = 0; i < len; i++)
--		cksum += buffer[i];
--	cksum &= 0xffff;
--	if (cksum == 0)
--		return 0;
--	return -1;
--}
--
--/*************************************************************************
--Activate all of the available media and probe for network
--**************************************************************************/
--
--static void clrline(void)
--{
--	int i;
--
--	putchar('\r');
--	for (i = 79; i--; ) putchar(' ');
--	printf("\rcs: ");
--	return;
--}
--
--static void control_dc_dc(int on_not_off)
--{
--	unsigned int selfcontrol;
--	unsigned long tmo = currticks() + TICKS_PER_SEC;
--
--	/* control the DC to DC convertor in the SelfControl register.  */
--	selfcontrol = HCB1_ENBL; /* Enable the HCB1 bit as an output */
--	if (((eth_adapter_cnf & A_CNF_DC_DC_POLARITY) != 0) ^ on_not_off)
--		selfcontrol |= HCB1;
--	else
--		selfcontrol &= ~HCB1;
--	writereg(PP_SelfCTL, selfcontrol);
--
--	/* Wait for the DC/DC converter to power up - 1000ms */
--	while (currticks() < tmo);
--
--	return;
--}
--
--static int detect_tp(void)
--{
--	unsigned long tmo;
--
--	/* Turn on the chip auto detection of 10BT/ AUI */
--
--	clrline(); printf("attempting %s:","TP");
--
--        /* If connected to another full duplex capable 10-Base-T card
--	   the link pulses seem to be lost when the auto detect bit in
--	   the LineCTL is set.  To overcome this the auto detect bit
--	   will be cleared whilst testing the 10-Base-T interface.
--	   This would not be necessary for the sparrow chip but is
--	   simpler to do it anyway. */
--	writereg(PP_LineCTL, eth_linectl &~ AUI_ONLY);
--	control_dc_dc(0);
--
--        /* Delay for the hardware to work out if the TP cable is
--	   present - 150ms */
--	for (tmo = currticks() + 4; currticks() < tmo; );
--
--	if ((readreg(PP_LineST) & LINK_OK) == 0)
--		return 0;
--
--	if (eth_cs_type != CS8900) {
--
--		writereg(PP_AutoNegCTL, eth_auto_neg_cnf & AUTO_NEG_MASK);
--
--		if ((eth_auto_neg_cnf & AUTO_NEG_BITS) == AUTO_NEG_ENABLE) {
--			printf(" negotiating duplex... ");
--			while (readreg(PP_AutoNegST) & AUTO_NEG_BUSY) {
--				if (currticks() - tmo > 40*TICKS_PER_SEC) {
--					printf("time out ");
--					break;
--				}
--			}
--		}
--		if (readreg(PP_AutoNegST) & FDX_ACTIVE)
--			printf("using full duplex");
--		else
--			printf("using half duplex");
--	}
--
--	return A_CNF_MEDIA_10B_T;
--}
--
--/* send a test packet - return true if carrier bits are ok */
--static int send_test_pkt(struct nic *nic)
--{
--	static unsigned char testpacket[] = { 0,0,0,0,0,0, 0,0,0,0,0,0,
--				     0, 46, /*A 46 in network order       */
--				     0, 0,  /*DSAP=0 & SSAP=0 fields      */
--				     0xf3,0 /*Control (Test Req+P bit set)*/ };
--	unsigned long tmo;
--
--	writereg(PP_LineCTL, readreg(PP_LineCTL) | SERIAL_TX_ON);
--
--	memcpy(testpacket, nic->node_addr, ETH_ALEN);
--	memcpy(testpacket+ETH_ALEN, nic->node_addr, ETH_ALEN);
--
--	outw(TX_AFTER_ALL, eth_nic_base + TX_CMD_PORT);
--	outw(ETH_ZLEN, eth_nic_base + TX_LEN_PORT);
--
--	/* Test to see if the chip has allocated memory for the packet */
--	for (tmo = currticks() + 2;
--	     (readreg(PP_BusST) & READY_FOR_TX_NOW) == 0; )
--		if (currticks() >= tmo)
--			return(0);
--
--	/* Write the contents of the packet */
--	outsw(eth_nic_base + TX_FRAME_PORT, testpacket,
--	      (ETH_ZLEN+1)>>1);
--
--	printf(" sending test packet ");
--	/* wait a couple of timer ticks for packet to be received */
--	for (tmo = currticks() + 2; currticks() < tmo; );
--
--	if ((readreg(PP_TxEvent) & TX_SEND_OK_BITS) == TX_OK) {
--			printf("succeeded");
--			return 1;
--	}
--	printf("failed");
--	return 0;
--}
--
--
--static int detect_aui(struct nic *nic)
--{
--	clrline(); printf("attempting %s:","AUI");
--	control_dc_dc(0);
--
--	writereg(PP_LineCTL, (eth_linectl & ~AUTO_AUI_10BASET) | AUI_ONLY);
--
--	if (send_test_pkt(nic)) {
--		return A_CNF_MEDIA_AUI; }
--	else
--		return 0;
--}
--
--static int detect_bnc(struct nic *nic)
--{
--	clrline(); printf("attempting %s:","BNC");
--	control_dc_dc(1);
--
--	writereg(PP_LineCTL, (eth_linectl & ~AUTO_AUI_10BASET) | AUI_ONLY);
--
--	if (send_test_pkt(nic)) {
--		return A_CNF_MEDIA_10B_2; }
--	else
--		return 0;
--}
--
--/**************************************************************************
--ETH_RESET - Reset adapter
--***************************************************************************/
--
--static void cs89x0_reset(struct nic *nic)
--{
--	int  i;
--	unsigned long reset_tmo;
--
--	writereg(PP_SelfCTL, readreg(PP_SelfCTL) | POWER_ON_RESET);
--
--	/* wait for two ticks; that is 2*55ms */
--	for (reset_tmo = currticks() + 2; currticks() < reset_tmo; );
--
--	if (eth_cs_type != CS8900) {
--		/* Hardware problem requires PNP registers to be reconfigured
--		   after a reset */
--		if (eth_irq != 0xFFFF) {
--			outw(PP_CS8920_ISAINT, eth_nic_base + ADD_PORT);
--			outb(eth_irq, eth_nic_base + DATA_PORT);
--			outb(0, eth_nic_base + DATA_PORT + 1); }
--
--		if (eth_mem_start) {
--			outw(PP_CS8920_ISAMemB, eth_nic_base + ADD_PORT);
--			outb((eth_mem_start >> 8) & 0xff, eth_nic_base + DATA_PORT);
--			outb((eth_mem_start >> 24) & 0xff, eth_nic_base + DATA_PORT + 1); } }
--
--	/* Wait until the chip is reset */
--	for (reset_tmo = currticks() + 2;
--	     (readreg(PP_SelfST) & INIT_DONE) == 0 &&
--		     currticks() < reset_tmo; );
--
--	/* disable interrupts and memory accesses */
--	writereg(PP_BusCTL, 0);
--
--	/* set the ethernet address */
--	for (i=0; i < ETH_ALEN/2; i++)
--		writereg(PP_IA+i*2,
--			 nic->node_addr[i*2] |
--			 (nic->node_addr[i*2+1] << 8));
--
--	/* receive only error free packets addressed to this card */
--	writereg(PP_RxCTL, DEF_RX_ACCEPT);
--
--	/* do not generate any interrupts on receive operations */
--	writereg(PP_RxCFG, 0);
--
--	/* do not generate any interrupts on transmit operations */
--	writereg(PP_TxCFG, 0);
--
--	/* do not generate any interrupts on buffer operations */
--	writereg(PP_BufCFG, 0);
--
--	/* reset address port, so that autoprobing will keep working */
--	outw(PP_ChipID, eth_nic_base + ADD_PORT);
--
--	return;
--}
--
--/**************************************************************************
--ETH_TRANSMIT - Transmit a frame
--***************************************************************************/
--
--static void cs89x0_transmit(
--	struct nic *nic,
--	const char *d,			/* Destination */
--	unsigned int t,			/* Type */
--	unsigned int s,			/* size */
--	const char *p)			/* Packet */
--{
--	unsigned long tmo;
--	int           sr;
--
--	/* does this size have to be rounded??? please,
--	   somebody have a look in the specs */
--	if ((sr = ((s + ETH_HLEN + 1)&~1)) < ETH_ZLEN)
--		sr = ETH_ZLEN;
--
--retry:
--	/* initiate a transmit sequence */
--	outw(TX_AFTER_ALL, eth_nic_base + TX_CMD_PORT);
--	outw(sr, eth_nic_base + TX_LEN_PORT);
--
--	/* Test to see if the chip has allocated memory for the packet */
--	if ((readreg(PP_BusST) & READY_FOR_TX_NOW) == 0) {
--		/* Oops... this should not happen! */
--		printf("cs: unable to send packet; retrying...\n");
--		for (tmo = currticks() + 5*TICKS_PER_SEC; currticks() < tmo; );
--		cs89x0_reset(nic);
--		goto retry; }
--
--	/* Write the contents of the packet */
--	outsw(eth_nic_base + TX_FRAME_PORT, d, ETH_ALEN/2);
--	outsw(eth_nic_base + TX_FRAME_PORT, nic->node_addr,
--	      ETH_ALEN/2);
--	outw(((t >> 8)&0xFF)|(t << 8), eth_nic_base + TX_FRAME_PORT);
--	outsw(eth_nic_base + TX_FRAME_PORT, p, (s+1)/2);
--	for (sr = sr/2 - (s+1)/2 - ETH_ALEN - 1; sr-- > 0;
--	     outw(0, eth_nic_base + TX_FRAME_PORT));
--
--	/* wait for transfer to succeed */
--	for (tmo = currticks()+5*TICKS_PER_SEC;
--	     (s = readreg(PP_TxEvent)&~0x1F) == 0 && currticks() < tmo;)
--		/* nothing */ ;
--	if ((s & TX_SEND_OK_BITS) != TX_OK) {
--		printf("\ntransmission error %#hX\n", s);
--	}
--
--	return;
--}
--
--/**************************************************************************
--ETH_POLL - Wait for a frame
--***************************************************************************/
--
--static int cs89x0_poll(struct nic *nic)
--{
--	int status;
--
--	status = readreg(PP_RxEvent);
--
--	if ((status & RX_OK) == 0)
--		return(0);
--
--	status = inw(eth_nic_base + RX_FRAME_PORT);
--	nic->packetlen = inw(eth_nic_base + RX_FRAME_PORT);
--	insw(eth_nic_base + RX_FRAME_PORT, nic->packet, nic->packetlen >> 1);
--	if (nic->packetlen & 1)
--		nic->packet[nic->packetlen-1] = inw(eth_nic_base + RX_FRAME_PORT);
--	return 1;
--}
--
--static void cs89x0_disable(struct nic *nic)
--{
--	cs89x0_reset(nic);
--}
--
--/**************************************************************************
--ETH_PROBE - Look for an adapter
--***************************************************************************/
--
--struct nic *cs89x0_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	static const unsigned int netcard_portlist[] = {
--#ifdef	CS_SCAN
--		CS_SCAN,
--#else	/* use "conservative" default values for autoprobing */
--		0x300,0x320,0x340,0x200,0x220,0x240,
--		0x260,0x280,0x2a0,0x2c0,0x2e0,
--	/* if that did not work, then be more aggressive */
--		0x301,0x321,0x341,0x201,0x221,0x241,
--		0x261,0x281,0x2a1,0x2c1,0x2e1,
--#endif
--		0};
--
--	int      i, result = -1;
--	unsigned rev_type = 0, ioaddr, ioidx, isa_cnf, cs_revision;
--	unsigned short eeprom_buff[CHKSUM_LEN];
--
--
--	for (ioidx = 0; (ioaddr=netcard_portlist[ioidx++]) != 0; ) {
--		/* if they give us an odd I/O address, then do ONE write to
--		   the address port, to get it back to address zero, where we
--		   expect to find the EISA signature word. */
--		if (ioaddr & 1) {
--			ioaddr &= ~1;
--			if ((inw(ioaddr + ADD_PORT) & ADD_MASK) != ADD_SIG)
--				continue;
--			outw(PP_ChipID, ioaddr + ADD_PORT);
--		}
--
--		if (inw(ioaddr + DATA_PORT) != CHIP_EISA_ID_SIG)
--			continue;
--		eth_nic_base = ioaddr;
--
--		/* get the chip type */
--		rev_type = readreg(PRODUCT_ID_ADD);
--		eth_cs_type = rev_type &~ REVISON_BITS;
--		cs_revision = ((rev_type & REVISON_BITS) >> 8) + 'A';
--
--		printf("\ncs: cs89%c0%s rev %c, base %#hX",
--		       eth_cs_type==CS8900?'0':'2',
--		       eth_cs_type==CS8920M?"M":"",
--		       cs_revision,
--		       eth_nic_base);
--
--		/* First check to see if an EEPROM is attached*/
--		if ((readreg(PP_SelfST) & EEPROM_PRESENT) == 0) {
--			printf("\ncs: no EEPROM...\n");
--			outw(PP_ChipID, eth_nic_base + ADD_PORT);
--			continue; }
--		else if (get_eeprom_data(START_EEPROM_DATA,CHKSUM_LEN,
--					 eeprom_buff) < 0) {
--			printf("\ncs: EEPROM read failed...\n");
--			outw(PP_ChipID, eth_nic_base + ADD_PORT);
--			continue; }
--		else if (get_eeprom_chksum(START_EEPROM_DATA,CHKSUM_LEN,
--					   eeprom_buff) < 0) {
--			printf("\ncs: EEPROM checksum bad...\n");
--			outw(PP_ChipID, eth_nic_base + ADD_PORT);
--			continue; }
--
--		/* get transmission control word but keep the
--		   autonegotiation bits */
--		eth_auto_neg_cnf = eeprom_buff[AUTO_NEG_CNF_OFFSET/2];
--		/* Store adapter configuration */
--		eth_adapter_cnf = eeprom_buff[ADAPTER_CNF_OFFSET/2];
--		/* Store ISA configuration */
--		isa_cnf = eeprom_buff[ISA_CNF_OFFSET/2];
--
--		/* store the initial memory base address */
--		eth_mem_start = eeprom_buff[PACKET_PAGE_OFFSET/2] << 8;
--
--		printf("%s%s%s, addr ",
--		       (eth_adapter_cnf & A_CNF_10B_T)?", RJ-45":"",
--		       (eth_adapter_cnf & A_CNF_AUI)?", AUI":"",
--		       (eth_adapter_cnf & A_CNF_10B_2)?", BNC":"");
--
--		/* If this is a CS8900 then no pnp soft */
--		if (eth_cs_type != CS8900 &&
--		    /* Check if the ISA IRQ has been set  */
--		    (i = readreg(PP_CS8920_ISAINT) & 0xff,
--		     (i != 0 && i < CS8920_NO_INTS)))
--			eth_irq = i;
--		else {
--			i = isa_cnf & INT_NO_MASK;
--			if (eth_cs_type == CS8900) {
--				/* the table that follows is dependent
--				   upon how you wired up your cs8900
--				   in your system.  The table is the
--				   same as the cs8900 engineering demo
--				   board.  irq_map also depends on the
--				   contents of the table.  Also see
--				   write_irq, which is the reverse
--				   mapping of the table below. */
--				if (i < 4) i = "\012\013\014\005"[i];
--				else printf("\ncs: BUG: isa_config is %d\n", i); }
--			eth_irq = i; }
--
--		/* Retrieve and print the ethernet address. */
--		for (i=0; i<ETH_ALEN; i++) {
--			nic->node_addr[i] = ((unsigned char *)eeprom_buff)[i];
--		}
--		printf("%!\n", nic->node_addr);
--
--		/* Set the LineCTL quintuplet based on adapter
--		   configuration read from EEPROM */
--		if ((eth_adapter_cnf & A_CNF_EXTND_10B_2) &&
--		    (eth_adapter_cnf & A_CNF_LOW_RX_SQUELCH))
--			eth_linectl = LOW_RX_SQUELCH;
--		else
--			eth_linectl = 0;
--
--		/* check to make sure that they have the "right"
--		   hardware available */
--		switch(eth_adapter_cnf & A_CNF_MEDIA_TYPE) {
--		case A_CNF_MEDIA_10B_T: result = eth_adapter_cnf & A_CNF_10B_T;
--			break;
--		case A_CNF_MEDIA_AUI:   result = eth_adapter_cnf & A_CNF_AUI;
--			break;
--		case A_CNF_MEDIA_10B_2: result = eth_adapter_cnf & A_CNF_10B_2;
--			break;
--		default: result = eth_adapter_cnf & (A_CNF_10B_T | A_CNF_AUI |
--						     A_CNF_10B_2);
--		}
--		if (!result) {
--			printf("cs: EEPROM is configured for unavailable media\n");
--		error:
--			writereg(PP_LineCTL, readreg(PP_LineCTL) &
--				 ~(SERIAL_TX_ON | SERIAL_RX_ON));
--			outw(PP_ChipID, eth_nic_base + ADD_PORT);
--			continue;
--		}
--
--		/* Initialize the card for probing of the attached media */
--		cs89x0_reset(nic);
--
--		/* set the hardware to the configured choice */
--		switch(eth_adapter_cnf & A_CNF_MEDIA_TYPE) {
--		case A_CNF_MEDIA_10B_T:
--			result = detect_tp();
--			if (!result) {
--				clrline();
--				printf("10Base-T (RJ-45%s",
--				       ") has no cable\n"); }
--			/* check "ignore missing media" bit */
--			if (eth_auto_neg_cnf & IMM_BIT)
--				/* Yes! I don't care if I see a link pulse */
--				result = A_CNF_MEDIA_10B_T;
--			break;
--		case A_CNF_MEDIA_AUI:
--			result = detect_aui(nic);
--			if (!result) {
--				clrline();
--				printf("10Base-5 (AUI%s",
--				       ") has no cable\n"); }
--			/* check "ignore missing media" bit */
--			if (eth_auto_neg_cnf & IMM_BIT)
--				/* Yes! I don't care if I see a carrrier */
--				result = A_CNF_MEDIA_AUI;
--			break;
--		case A_CNF_MEDIA_10B_2:
--			result = detect_bnc(nic);
--			if (!result) {
--				clrline();
--				printf("10Base-2 (BNC%s",
--				       ") has no cable\n"); }
--			/* check "ignore missing media" bit */
--			if (eth_auto_neg_cnf & IMM_BIT)
--				/* Yes! I don't care if I can xmit a packet */
--				result = A_CNF_MEDIA_10B_2;
--			break;
--		case A_CNF_MEDIA_AUTO:
--			writereg(PP_LineCTL, eth_linectl | AUTO_AUI_10BASET);
--			if (eth_adapter_cnf & A_CNF_10B_T)
--				if ((result = detect_tp()) != 0)
--					break;
--			if (eth_adapter_cnf & A_CNF_AUI)
--				if ((result = detect_aui(nic)) != 0)
--					break;
--			if (eth_adapter_cnf & A_CNF_10B_2)
--				if ((result = detect_bnc(nic)) != 0)
--					break;
--			clrline(); printf("no media detected\n");
--			goto error;
--		}
--		clrline();
--		switch(result) {
--		case 0:                 printf("no network cable attached to configured media\n");
--			goto error;
--		case A_CNF_MEDIA_10B_T: printf("using 10Base-T (RJ-45)\n");
--			break;
--		case A_CNF_MEDIA_AUI:   printf("using 10Base-5 (AUI)\n");
--			break;
--		case A_CNF_MEDIA_10B_2: printf("using 10Base-2 (BNC)\n");
--			break;
--		}
--
--		/* Turn on both receive and transmit operations */
--		writereg(PP_LineCTL, readreg(PP_LineCTL) | SERIAL_RX_ON |
--			 SERIAL_TX_ON);
--
--		break;
--	}
--
--	if (ioaddr == 0)
--		return (0);
--	nic->reset = cs89x0_reset;
--	nic->poll = cs89x0_poll;
--	nic->transmit = cs89x0_transmit;
--	nic->disable = cs89x0_disable;
--	return (nic);
--}
--
--/*
-- * Local variables:
-- *  c-basic-offset: 8
-- * End:
-- */
--
-Index: b/netboot/cs89x0.h
-===================================================================
---- a/netboot/cs89x0.h
-+++ b/netboot/cs89x0.h
-@@ -16,464 +16,3 @@
-    -- quote from email
- **/
- 
--/*  Copyright, 1988-1992, Russell Nelson, Crynwr Software
--
--   This program is free software; you can redistribute it and/or modify
--   it under the terms of the GNU General Public License as published by
--   the Free Software Foundation, version 1.
--
--   This program is distributed in the hope that it will be useful,
--   but WITHOUT ANY WARRANTY; without even the implied warranty of
--   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--   GNU General Public License for more details.
--
--   You should have received a copy of the GNU General Public License
--   along with this program; if not, write to the Free Software
--   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
--
--#define PP_ChipID 0x0000	/* offset   0h -> Corp -ID              */
--				/* offset   2h -> Model/Product Number  */
--				/* offset   3h -> Chip Revision Number  */
--
--#define PP_ISAIOB 0x0020	/*  IO base address */
--#define PP_CS8900_ISAINT 0x0022	/*  ISA interrupt select */
--#define PP_CS8920_ISAINT 0x0370	/*  ISA interrupt select */
--#define PP_CS8900_ISADMA 0x0024	/*  ISA Rec DMA channel */
--#define PP_CS8920_ISADMA 0x0374	/*  ISA Rec DMA channel */
--#define PP_ISASOF 0x0026	/*  ISA DMA offset */
--#define PP_DmaFrameCnt 0x0028	/*  ISA DMA Frame count */
--#define PP_DmaByteCnt 0x002A	/*  ISA DMA Byte count */
--#define PP_CS8900_ISAMemB 0x002C	/*  Memory base */
--#define PP_CS8920_ISAMemB 0x0348 /*  */
--
--#define PP_ISABootBase 0x0030	/*  Boot Prom base  */
--#define PP_ISABootMask 0x0034	/*  Boot Prom Mask */
--
--/* EEPROM data and command registers */
--#define PP_EECMD 0x0040		/*  NVR Interface Command register */
--#define PP_EEData 0x0042	/*  NVR Interface Data Register */
--#define PP_DebugReg 0x0044	/*  Debug Register */
--
--#define PP_RxCFG 0x0102		/*  Rx Bus config */
--#define PP_RxCTL 0x0104		/*  Receive Control Register */
--#define PP_TxCFG 0x0106		/*  Transmit Config Register */
--#define PP_TxCMD 0x0108		/*  Transmit Command Register */
--#define PP_BufCFG 0x010A	/*  Bus configuration Register */
--#define PP_LineCTL 0x0112	/*  Line Config Register */
--#define PP_SelfCTL 0x0114	/*  Self Command Register */
--#define PP_BusCTL 0x0116	/*  ISA bus control Register */
--#define PP_TestCTL 0x0118	/*  Test Register */
--#define PP_AutoNegCTL 0x011C	/*  Auto Negotiation Ctrl */
--
--#define PP_ISQ 0x0120		/*  Interrupt Status */
--#define PP_RxEvent 0x0124	/*  Rx Event Register */
--#define PP_TxEvent 0x0128	/*  Tx Event Register */
--#define PP_BufEvent 0x012C	/*  Bus Event Register */
--#define PP_RxMiss 0x0130	/*  Receive Miss Count */
--#define PP_TxCol 0x0132		/*  Transmit Collision Count */
--#define PP_LineST 0x0134	/*  Line State Register */
--#define PP_SelfST 0x0136	/*  Self State register */
--#define PP_BusST 0x0138		/*  Bus Status */
--#define PP_TDR 0x013C		/*  Time Domain Reflectometry */
--#define PP_AutoNegST 0x013E	/*  Auto Neg Status */
--#define PP_TxCommand 0x0144	/*  Tx Command */
--#define PP_TxLength 0x0146	/*  Tx Length */
--#define PP_LAF 0x0150		/*  Hash Table */
--#define PP_IA 0x0158		/*  Physical Address Register */
--
--#define PP_RxStatus 0x0400	/*  Receive start of frame */
--#define PP_RxLength 0x0402	/*  Receive Length of frame */
--#define PP_RxFrame 0x0404	/*  Receive frame pointer */
--#define PP_TxFrame 0x0A00	/*  Transmit frame pointer */
--
--/*  Primary I/O Base Address. If no I/O base is supplied by the user, then this */
--/*  can be used as the default I/O base to access the PacketPage Area. */
--#define DEFAULTIOBASE 0x0300
--#define FIRST_IO 0x020C		/*  First I/O port to check */
--#define LAST_IO 0x037C		/*  Last I/O port to check (+10h) */
--#define ADD_MASK 0x3000		/*  Mask it use of the ADD_PORT register */
--#define ADD_SIG 0x3000		/*  Expected ID signature */
--
--#define CHIP_EISA_ID_SIG 0x630E   /*  Product ID Code for Crystal Chip (CS8900 spec 4.3) */
--
--#ifdef	IBMEIPKT
--#define EISA_ID_SIG 0x4D24	/*  IBM */
--#define PART_NO_SIG 0x1010	/*  IBM */
--#define MONGOOSE_BIT 0x0000	/*  IBM */
--#else
--#define EISA_ID_SIG 0x630E	/*  PnP Vendor ID (same as chip id for Crystal board) */
--#define PART_NO_SIG 0x4000	/*  ID code CS8920 board (PnP Vendor Product code) */
--#define MONGOOSE_BIT 0x2000	/*  PART_NO_SIG + MONGOOSE_BUT => ID of mongoose */
--#endif
--
--#define PRODUCT_ID_ADD 0x0002   /*  Address of product ID */
--
--/*  Mask to find out the types of  registers */
--#define REG_TYPE_MASK 0x001F
--
--/*  Eeprom Commands */
--#define ERSE_WR_ENBL 0x00F0
--#define ERSE_WR_DISABLE 0x0000
--
--/*  Defines Control/Config register quintuplet numbers */
--#define RX_BUF_CFG 0x0003
--#define RX_CONTROL 0x0005
--#define TX_CFG 0x0007
--#define TX_COMMAND 0x0009
--#define BUF_CFG 0x000B
--#define LINE_CONTROL 0x0013
--#define SELF_CONTROL 0x0015
--#define BUS_CONTROL 0x0017
--#define TEST_CONTROL 0x0019
--
--/*  Defines Status/Count registers quintuplet numbers */
--#define RX_EVENT 0x0004
--#define TX_EVENT 0x0008
--#define BUF_EVENT 0x000C
--#define RX_MISS_COUNT 0x0010
--#define TX_COL_COUNT 0x0012
--#define LINE_STATUS 0x0014
--#define SELF_STATUS 0x0016
--#define BUS_STATUS 0x0018
--#define TDR 0x001C
--
--/* PP_RxCFG - Receive  Configuration and Interrupt Mask bit definition -  Read/write */
--#define SKIP_1 0x0040
--#define RX_STREAM_ENBL 0x0080
--#define RX_OK_ENBL 0x0100
--#define RX_DMA_ONLY 0x0200
--#define AUTO_RX_DMA 0x0400
--#define BUFFER_CRC 0x0800
--#define RX_CRC_ERROR_ENBL 0x1000
--#define RX_RUNT_ENBL 0x2000
--#define RX_EXTRA_DATA_ENBL 0x4000
--
--/* PP_RxCTL - Receive Control bit definition - Read/write */
--#define RX_IA_HASH_ACCEPT 0x0040
--#define RX_PROM_ACCEPT 0x0080
--#define RX_OK_ACCEPT 0x0100
--#define RX_MULTCAST_ACCEPT 0x0200
--#define RX_IA_ACCEPT 0x0400
--#define RX_BROADCAST_ACCEPT 0x0800
--#define RX_BAD_CRC_ACCEPT 0x1000
--#define RX_RUNT_ACCEPT 0x2000
--#define RX_EXTRA_DATA_ACCEPT 0x4000
--#define RX_ALL_ACCEPT (RX_PROM_ACCEPT|RX_BAD_CRC_ACCEPT|RX_RUNT_ACCEPT|RX_EXTRA_DATA_ACCEPT)
--/*  Default receive mode - individually addressed, broadcast, and error free */
--#define DEF_RX_ACCEPT (RX_IA_ACCEPT | RX_BROADCAST_ACCEPT | RX_OK_ACCEPT)
--
--/* PP_TxCFG - Transmit Configuration Interrupt Mask bit definition - Read/write */
--#define TX_LOST_CRS_ENBL 0x0040
--#define TX_SQE_ERROR_ENBL 0x0080
--#define TX_OK_ENBL 0x0100
--#define TX_LATE_COL_ENBL 0x0200
--#define TX_JBR_ENBL 0x0400
--#define TX_ANY_COL_ENBL 0x0800
--#define TX_16_COL_ENBL 0x8000
--
--/* PP_TxCMD - Transmit Command bit definition - Read-only */
--#define TX_START_4_BYTES 0x0000
--#define TX_START_64_BYTES 0x0040
--#define TX_START_128_BYTES 0x0080
--#define TX_START_ALL_BYTES 0x00C0
--#define TX_FORCE 0x0100
--#define TX_ONE_COL 0x0200
--#define TX_TWO_PART_DEFF_DISABLE 0x0400
--#define TX_NO_CRC 0x1000
--#define TX_RUNT 0x2000
--
--/* PP_BufCFG - Buffer Configuration Interrupt Mask bit definition - Read/write */
--#define GENERATE_SW_INTERRUPT 0x0040
--#define RX_DMA_ENBL 0x0080
--#define READY_FOR_TX_ENBL 0x0100
--#define TX_UNDERRUN_ENBL 0x0200
--#define RX_MISS_ENBL 0x0400
--#define RX_128_BYTE_ENBL 0x0800
--#define TX_COL_COUNT_OVRFLOW_ENBL 0x1000
--#define RX_MISS_COUNT_OVRFLOW_ENBL 0x2000
--#define RX_DEST_MATCH_ENBL 0x8000
--
--/* PP_LineCTL - Line Control bit definition - Read/write */
--#define SERIAL_RX_ON 0x0040
--#define SERIAL_TX_ON 0x0080
--#define AUI_ONLY 0x0100
--#define AUTO_AUI_10BASET 0x0200
--#define MODIFIED_BACKOFF 0x0800
--#define NO_AUTO_POLARITY 0x1000
--#define TWO_PART_DEFDIS 0x2000
--#define LOW_RX_SQUELCH 0x4000
--
--/* PP_SelfCTL - Software Self Control bit definition - Read/write */
--#define POWER_ON_RESET 0x0040
--#define SW_STOP 0x0100
--#define SLEEP_ON 0x0200
--#define AUTO_WAKEUP 0x0400
--#define HCB0_ENBL 0x1000
--#define HCB1_ENBL 0x2000
--#define HCB0 0x4000
--#define HCB1 0x8000
--
--/* PP_BusCTL - ISA Bus Control bit definition - Read/write */
--#define RESET_RX_DMA 0x0040
--#define MEMORY_ON 0x0400
--#define DMA_BURST_MODE 0x0800
--#define IO_CHANNEL_READY_ON 0x1000
--#define RX_DMA_SIZE_64K 0x2000
--#define ENABLE_IRQ 0x8000
--
--/* PP_TestCTL - Test Control bit definition - Read/write */
--#define LINK_OFF 0x0080
--#define ENDEC_LOOPBACK 0x0200
--#define AUI_LOOPBACK 0x0400
--#define BACKOFF_OFF 0x0800
--#define FAST_TEST 0x8000
--
--/* PP_RxEvent - Receive Event Bit definition - Read-only */
--#define RX_IA_HASHED 0x0040
--#define RX_DRIBBLE 0x0080
--#define RX_OK 0x0100
--#define RX_HASHED 0x0200
--#define RX_IA 0x0400
--#define RX_BROADCAST 0x0800
--#define RX_CRC_ERROR 0x1000
--#define RX_RUNT 0x2000
--#define RX_EXTRA_DATA 0x4000
--
--#define HASH_INDEX_MASK 0x0FC00
--
--/* PP_TxEvent - Transmit Event Bit definition - Read-only */
--#define TX_LOST_CRS 0x0040
--#define TX_SQE_ERROR 0x0080
--#define TX_OK 0x0100
--#define TX_LATE_COL 0x0200
--#define TX_JBR 0x0400
--#define TX_16_COL 0x8000
--#define TX_SEND_OK_BITS (TX_OK|TX_LOST_CRS)
--#define TX_COL_COUNT_MASK 0x7800
--
--/* PP_BufEvent - Buffer Event Bit definition - Read-only */
--#define SW_INTERRUPT 0x0040
--#define RX_DMA 0x0080
--#define READY_FOR_TX 0x0100
--#define TX_UNDERRUN 0x0200
--#define RX_MISS 0x0400
--#define RX_128_BYTE 0x0800
--#define TX_COL_OVRFLW 0x1000
--#define RX_MISS_OVRFLW 0x2000
--#define RX_DEST_MATCH 0x8000
--
--/* PP_LineST - Ethernet Line Status bit definition - Read-only */
--#define LINK_OK 0x0080
--#define AUI_ON 0x0100
--#define TENBASET_ON 0x0200
--#define POLARITY_OK 0x1000
--#define CRS_OK 0x4000
--
--/* PP_SelfST - Chip Software Status bit definition */
--#define ACTIVE_33V 0x0040
--#define INIT_DONE 0x0080
--#define SI_BUSY 0x0100
--#define EEPROM_PRESENT 0x0200
--#define EEPROM_OK 0x0400
--#define EL_PRESENT 0x0800
--#define EE_SIZE_64 0x1000
--
--/* PP_BusST - ISA Bus Status bit definition */
--#define TX_BID_ERROR 0x0080
--#define READY_FOR_TX_NOW 0x0100
--
--/* PP_AutoNegCTL - Auto Negotiation Control bit definition */
--#define RE_NEG_NOW 0x0040
--#define ALLOW_FDX 0x0080
--#define AUTO_NEG_ENABLE 0x0100
--#define NLP_ENABLE 0x0200
--#define FORCE_FDX 0x8000
--#define AUTO_NEG_BITS (FORCE_FDX|NLP_ENABLE|AUTO_NEG_ENABLE)
--#define AUTO_NEG_MASK (FORCE_FDX|NLP_ENABLE|AUTO_NEG_ENABLE|ALLOW_FDX|RE_NEG_NOW)
--
--/* PP_AutoNegST - Auto Negotiation Status bit definition */
--#define AUTO_NEG_BUSY 0x0080
--#define FLP_LINK 0x0100
--#define FLP_LINK_GOOD 0x0800
--#define LINK_FAULT 0x1000
--#define HDX_ACTIVE 0x4000
--#define FDX_ACTIVE 0x8000
--
--/*  The following block defines the ISQ event types */
--#define ISQ_RECEIVER_EVENT 0x04
--#define ISQ_TRANSMITTER_EVENT 0x08
--#define ISQ_BUFFER_EVENT 0x0c
--#define ISQ_RX_MISS_EVENT 0x10
--#define ISQ_TX_COL_EVENT 0x12
--
--#define ISQ_EVENT_MASK 0x003F   /*  ISQ mask to find out type of event */
--#define ISQ_HIST 16		/*  small history buffer */
--#define AUTOINCREMENT 0x8000	/*  Bit mask to set bit-15 for autoincrement */
--
--#define TXRXBUFSIZE 0x0600
--#define RXDMABUFSIZE 0x8000
--#define RXDMASIZE 0x4000
--#define TXRX_LENGTH_MASK 0x07FF
--
--/*  rx options bits */
--#define RCV_WITH_RXON	1       /*  Set SerRx ON */
--#define RCV_COUNTS	2       /*  Use Framecnt1 */
--#define RCV_PONG	4       /*  Pong respondent */
--#define RCV_DONG	8       /*  Dong operation */
--#define RCV_POLLING	0x10	/*  Poll RxEvent */
--#define RCV_ISQ		0x20	/*  Use ISQ, int */
--#define RCV_AUTO_DMA	0x100	/*  Set AutoRxDMAE */
--#define RCV_DMA		0x200	/*  Set RxDMA only */
--#define RCV_DMA_ALL	0x400	/*  Copy all DMA'ed */
--#define RCV_FIXED_DATA	0x800	/*  Every frame same */
--#define RCV_IO		0x1000	/*  Use ISA IO only */
--#define RCV_MEMORY	0x2000	/*  Use ISA Memory */
--
--#define RAM_SIZE	0x1000       /*  The card has 4k bytes or RAM */
--#define PKT_START PP_TxFrame  /*  Start of packet RAM */
--
--#define RX_FRAME_PORT	0x0000
--#define TX_FRAME_PORT RX_FRAME_PORT
--#define TX_CMD_PORT	0x0004
--#define TX_NOW		0x0000       /*  Tx packet after   5 bytes copied */
--#define TX_AFTER_381	0x0020       /*  Tx packet after 381 bytes copied */
--#define TX_AFTER_ALL	0x0060       /*  Tx packet after all bytes copied */
--#define TX_LEN_PORT	0x0006
--#define ISQ_PORT	0x0008
--#define ADD_PORT	0x000A
--#define DATA_PORT	0x000C
--
--#define EEPROM_WRITE_EN		0x00F0
--#define EEPROM_WRITE_DIS	0x0000
--#define EEPROM_WRITE_CMD	0x0100
--#define EEPROM_READ_CMD		0x0200
--
--/*  Receive Header */
--/*  Description of header of each packet in receive area of memory */
--#define RBUF_EVENT_LOW	0   /*  Low byte of RxEvent - status of received frame */
--#define RBUF_EVENT_HIGH	1   /*  High byte of RxEvent - status of received frame */
--#define RBUF_LEN_LOW	2   /*  Length of received data - low byte */
--#define RBUF_LEN_HI	3   /*  Length of received data - high byte */
--#define RBUF_HEAD_LEN	4   /*  Length of this header */
--
--#define CHIP_READ 0x1   /*  Used to mark state of the repins code (chip or dma) */
--#define DMA_READ 0x2   /*  Used to mark state of the repins code (chip or dma) */
--
--/*  for bios scan */
--/*  */
--#ifdef	CSDEBUG
--/*  use these values for debugging bios scan */
--#define BIOS_START_SEG 0x00000
--#define BIOS_OFFSET_INC 0x0010
--#else
--#define BIOS_START_SEG 0x0c000
--#define BIOS_OFFSET_INC 0x0200
--#endif
--
--#define BIOS_LAST_OFFSET 0x0fc00
--
--/*  Byte offsets into the EEPROM configuration buffer */
--#define ISA_CNF_OFFSET 0x6
--#define TX_CTL_OFFSET (ISA_CNF_OFFSET + 8)			/*  8900 eeprom */
--#define AUTO_NEG_CNF_OFFSET (ISA_CNF_OFFSET + 8)		/*  8920 eeprom */
--
--  /*  the assumption here is that the bits in the eeprom are generally  */
--  /*  in the same position as those in the autonegctl register. */
--  /*  Of course the IMM bit is not in that register so it must be  */
--  /*  masked out */
--#define EE_FORCE_FDX  0x8000
--#define EE_NLP_ENABLE 0x0200
--#define EE_AUTO_NEG_ENABLE 0x0100
--#define EE_ALLOW_FDX 0x0080
--#define EE_AUTO_NEG_CNF_MASK (EE_FORCE_FDX|EE_NLP_ENABLE|EE_AUTO_NEG_ENABLE|EE_ALLOW_FDX)
--
--#define IMM_BIT 0x0040		/*  ignore missing media */
--
--#define ADAPTER_CNF_OFFSET (AUTO_NEG_CNF_OFFSET + 2)
--#define A_CNF_10B_T 0x0001
--#define A_CNF_AUI 0x0002
--#define A_CNF_10B_2 0x0004
--#define A_CNF_MEDIA_TYPE 0x0060
--#define A_CNF_MEDIA_AUTO 0x0000
--#define A_CNF_MEDIA_10B_T 0x0020
--#define A_CNF_MEDIA_AUI 0x0040
--#define A_CNF_MEDIA_10B_2 0x0060
--#define A_CNF_DC_DC_POLARITY 0x0080
--#define A_CNF_NO_AUTO_POLARITY 0x2000
--#define A_CNF_LOW_RX_SQUELCH 0x4000
--#define A_CNF_EXTND_10B_2 0x8000
--
--#define PACKET_PAGE_OFFSET 0x8
--
--/*  Bit definitions for the ISA configuration word from the EEPROM */
--#define INT_NO_MASK 0x000F
--#define DMA_NO_MASK 0x0070
--#define ISA_DMA_SIZE 0x0200
--#define ISA_AUTO_RxDMA 0x0400
--#define ISA_RxDMA 0x0800
--#define DMA_BURST 0x1000
--#define STREAM_TRANSFER 0x2000
--#define ANY_ISA_DMA (ISA_AUTO_RxDMA | ISA_RxDMA)
--
--/*  DMA controller registers */
--#define DMA_BASE 0x00     /*  DMA controller base */
--#define DMA_BASE_2 0x0C0    /*  DMA controller base */
--
--#define DMA_STAT 0x0D0    /*  DMA controller status register */
--#define DMA_MASK 0x0D4    /*  DMA controller mask register */
--#define DMA_MODE 0x0D6    /*  DMA controller mode register */
--#define DMA_RESETFF 0x0D8    /*  DMA controller first/last flip flop */
--
--/*  DMA data */
--#define DMA_DISABLE 0x04     /*  Disable channel n */
--#define DMA_ENABLE 0x00     /*  Enable channel n */
--/*  Demand transfers, incr. address, auto init, writes, ch. n */
--#define DMA_RX_MODE 0x14
--/*  Demand transfers, incr. address, auto init, reads, ch. n */
--#define DMA_TX_MODE 0x18
--
--#define DMA_SIZE (16*1024) /*  Size of dma buffer - 16k */
--
--#define CS8900 0x0000
--#define CS8920 0x4000
--#define CS8920M 0x6000
--#define REVISON_BITS 0x1F00
--#define EEVER_NUMBER 0x12
--#define CHKSUM_LEN 0x14
--#define CHKSUM_VAL 0x0000
--#define START_EEPROM_DATA 0x001c /*  Offset into eeprom for start of data */
--#define IRQ_MAP_EEPROM_DATA 0x0046 /*  Offset into eeprom for the IRQ map */
--#define IRQ_MAP_LEN 0x0004 /*  No of bytes to read for the IRQ map */
--#define PNP_IRQ_FRMT 0x0022 /*  PNP small item IRQ format */
--#define CS8900_IRQ_MAP 0x1c20 /*  This IRQ map is fixed */
--
--#define CS8920_NO_INTS 0x0F   /*  Max CS8920 interrupt select # */
--
--#define PNP_ADD_PORT 0x0279
--#define PNP_WRITE_PORT 0x0A79
--
--#define GET_PNP_ISA_STRUCT 0x40
--#define PNP_ISA_STRUCT_LEN 0x06
--#define PNP_CSN_CNT_OFF 0x01
--#define PNP_RD_PORT_OFF 0x02
--#define PNP_FUNCTION_OK 0x00
--#define PNP_WAKE 0x03
--#define PNP_RSRC_DATA 0x04
--#define PNP_RSRC_READY 0x01
--#define PNP_STATUS 0x05
--#define PNP_ACTIVATE 0x30
--#define PNP_CNF_IO_H 0x60
--#define PNP_CNF_IO_L 0x61
--#define PNP_CNF_INT 0x70
--#define PNP_CNF_DMA 0x74
--#define PNP_CNF_MEM 0x48
--
--#define BIT0 1
--#define BIT15 0x8000
--
--/*
-- * Local variables:
-- *  c-basic-offset: 8
-- * End:
-- */
--
-Index: b/netboot/cs89x0.txt
-===================================================================
---- a/netboot/cs89x0.txt
-+++ /dev/null
-@@ -1,26 +0,0 @@
--Permission is granted to distribute the enclosed cs89x0.[ch] driver
--only in conjunction with the Etherboot package.  The code is
--ordinarily distributed under the GPL.
--
--Russ Nelson, January 2000
--
--CREDITS
--
--I want to thank
--
--  Mike Cruse <mcruse@cti-ltd.com>
--     for providing an evaluation NIC and for sponsoring the
--     development of this driver.
--
--  Randall Sears <sears@crystal.cirrus.com>
--  Deva Bodas <bodas@crystal.cirrus.com>
--  Andreas Kraemer <akraemer@crystal.cirrus.com>
--  Wolfgang Krause <100303.2673@compuserve.com>
--     for excellent technical support and for providing the required
--     programming information. I appreciate Crystal Semiconductor's
--     commitment towards free software.
--
--  Russell Nelson <nelson@crynwr.com>
--     for writing the Linux device driver for the CS89x0
--     chipset. Russel's code is very well designed and simplified my
--     job a lot.
-Index: b/netboot/davicom.c
-===================================================================
---- a/netboot/davicom.c
-+++ b/netboot/davicom.c
-@@ -1,12 +1,12 @@
-+#ifdef ALLMULTI
-+#error multicast support is not yet implemented
-+#endif
- /*  
-     DAVICOM DM9009/DM9102/DM9102A Etherboot Driver	V1.00
- 
--    This driver was ported from Marty Conner's Tulip Etherboot driver. 
--    Thanks Marty Connor (mdc@thinguin.org) 
--    You can get Tulip driver source file from this URL:
-+    This driver was ported from Marty Connor's Tulip Etherboot driver. 
-+    Thanks Marty Connor (mdc@etherboot.org) 
- 
--    "http://etherboot.sourceforge..net/#Distribution"
--    
-     This davicom etherboot driver supports DM9009/DM9102/DM9102A/
-     DM9102A+DM9801/DM9102A+DM9802 NICs.
- 
-@@ -36,7 +36,6 @@
- 			register(CR6)
- */
- 
--
- /*********************************************************************/
- /* Declarations                                                      */
- /*********************************************************************/
-@@ -44,7 +43,6 @@
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- 
- #undef DAVICOM_DEBUG
- #undef DAVICOM_DEBUG_WHERE
-@@ -99,8 +97,10 @@
- #define eeprom_delay()  inl(ee_addr)
- 
- /* helpful macro if on a big_endian machine for changing byte order.
--   not strictly needed on Intel */
-+   not strictly needed on Intel
-+   Already defined in Etherboot includes
- #define le16_to_cpu(val) (val)
-+*/
- 
- /* transmit and receive descriptor format */
- struct txdesc {
-@@ -138,20 +138,12 @@
- /* transmit descriptor and buffer */
- #define NTXD 2
- static struct txdesc txd[NTXD] __attribute__ ((aligned(4)));
--#ifdef	USE_LOWMEM_BUFFER
--#define txb ((char *)0x10000 - BUFLEN)
--#else
- static unsigned char txb[BUFLEN] __attribute__ ((aligned(4)));
--#endif
- 
- /* receive descriptor(s) and buffer(s) */
- #define NRXD 4
- static struct rxdesc rxd[NRXD] __attribute__ ((aligned(4)));
--#ifdef	USE_LOWMEM_BUFFER
--#define rxb ((char *)0x10000 - NRXD * BUFLEN - BUFLEN)
--#else
- static unsigned char rxb[NRXD * BUFLEN] __attribute__ ((aligned(4)));
--#endif
- static int rxd_tail;
- static int TxPtr;
- 
-@@ -161,15 +153,13 @@
- /*********************************************************************/
- static void whereami(const char *str);
- static int read_eeprom(unsigned long ioaddr, int location, int addr_len);
--struct nic *davicom_probe(struct nic *nic, unsigned short *io_addrs,
--			struct pci_device *pci);
-+static int davicom_probe(struct dev *dev, struct pci_device *pci);
- static void davicom_init_chain(struct nic *nic);	/* Sten 10/9 */
- static void davicom_reset(struct nic *nic);
- static void davicom_transmit(struct nic *nic, const char *d, unsigned int t,
- 			   unsigned int s, const char *p);
--static int davicom_poll(struct nic *nic);
--static void davicom_disable(struct nic *nic);
--static void whereami (const char *str);
-+static int davicom_poll(struct nic *nic, int retrieve);
-+static void davicom_disable(struct dev *dev);
- #ifdef	DAVICOM_DEBUG
- static void davicom_more(void);
- #endif /* DAVICOM_DEBUG */
-@@ -184,13 +174,10 @@
- /*********************************************************************/
- /* Utility Routines                                                  */
- /*********************************************************************/
--
--static inline void whereami (const char *str)
-+static inline void whereami(const char *str)
- {
--#ifdef	DAVICOM_DEBUG_WHERE
-   printf("%s\n", str);
-   /* sleep(2); */
--#endif
- }
- 
- #ifdef	DAVICOM_DEBUG
-@@ -360,7 +347,7 @@
- /*
-   Sense media mode and set CR6
- */
--static void davicom_media_chk(struct nic * nic)
-+static void davicom_media_chk(struct nic * nic __unused)
- {
-   unsigned long to, csr6;
- 
-@@ -446,8 +433,8 @@
-   /* Sten: Set 2 TX descriptor but use one TX buffer because
- 	   it transmit a packet and wait complete every time. */
-   for (i=0; i<NTXD; i++) {
--    txd[i].buf1addr = &txb[0];		/* Used same TX buffer */
--    txd[i].buf2addr = (unsigned char *)&txd[i+1]; /*  Point to Next TX desc */
-+    txd[i].buf1addr = (void *)virt_to_bus(&txb[0]);	/* Used same TX buffer */
-+    txd[i].buf2addr = (void *)virt_to_bus(&txd[i+1]);	/*  Point to Next TX desc */
-     txd[i].buf1sz   = 0;
-     txd[i].buf2sz   = 0;
-     txd[i].control  = 0x184;           /* Begin/End/Chain */
-@@ -466,8 +453,8 @@
- 
-   /* setup receive descriptor */
-   for (i=0; i<NRXD; i++) {
--    rxd[i].buf1addr = &rxb[i * BUFLEN];
--    rxd[i].buf2addr = (unsigned char *)&rxd[i+1]; /* Point to Next RX desc */
-+    rxd[i].buf1addr = (void *)virt_to_bus(&rxb[i * BUFLEN]);
-+    rxd[i].buf2addr = (void *)virt_to_bus(&rxd[i+1]); /* Point to Next RX desc */
-     rxd[i].buf1sz   = BUFLEN;
-     rxd[i].buf2sz   = 0;        /* not used */
-     rxd[i].control  = 0x4;		/* Chain Structure */
-@@ -475,8 +462,8 @@
-   }
- 
-   /* Chain the last descriptor to first */
--  txd[NTXD - 1].buf2addr = (unsigned char *)&txd[0];
--  rxd[NRXD - 1].buf2addr = (unsigned char *)&rxd[0];
-+  txd[NTXD - 1].buf2addr = (void *)virt_to_bus(&txd[0]);
-+  rxd[NRXD - 1].buf2addr = (void *)virt_to_bus(&rxd[0]);
-   TxPtr = 0;
-   rxd_tail = 0;
- }
-@@ -488,7 +475,6 @@
- static void davicom_reset(struct nic *nic)
- {
-   unsigned long to;
--  u32 addr_low, addr_high;
- 
-   whereami("davicom_reset\n");
- 
-@@ -507,8 +493,8 @@
-   davicom_init_chain(nic);	/* Sten 10/9 */
- 
-   /* Point to receive descriptor */
--  outl((unsigned long)&rxd[0], ioaddr + CSR3);
--  outl((unsigned long)&txd[0], ioaddr + CSR4);	/* Sten 10/9 */
-+  outl(virt_to_bus(&rxd[0]), ioaddr + CSR3);
-+  outl(virt_to_bus(&txd[0]), ioaddr + CSR4);	/* Sten 10/9 */
- 
-   /* According phyxcer media mode to set CR6,
-      DM9102/A phyxcer can auto-detect media mode */
-@@ -591,13 +577,15 @@
- /*********************************************************************/
- /* eth_poll - Wait for a frame                                       */
- /*********************************************************************/
--static int davicom_poll(struct nic *nic)
-+static int davicom_poll(struct nic *nic, int retrieve)
- {
-   whereami("davicom_poll\n");
- 
-   if (rxd[rxd_tail].status & 0x80000000)
-     return 0;
- 
-+  if ( ! retrieve ) return 1;
-+
-   whereami("davicom_poll got one\n");
- 
-   nic->packetlen = (rxd[rxd_tail].status & 0x3FFF0000) >> 16;
-@@ -627,10 +615,13 @@
- /*********************************************************************/
- /* eth_disable - Disable the interface                               */
- /*********************************************************************/
--static void davicom_disable(struct nic *nic)
-+static void davicom_disable(struct dev *dev)
- {
-+  struct nic *nic = (struct nic *)dev;
-   whereami("davicom_disable\n");
- 
-+  davicom_reset(nic);
-+
-   /* disable interrupts */
-   outl(0x00000000, ioaddr + CSR7);
- 
-@@ -640,24 +631,43 @@
-   /* Clear the missed-packet counter. */
-   (volatile unsigned long)inl(ioaddr + CSR8);
- }
-+
-+
-+/*********************************************************************/
-+/* eth_irq - enable, disable and force interrupts                    */
-+/*********************************************************************/
-+static void davicom_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
- 
- /*********************************************************************/
- /* eth_probe - Look for an adapter                                   */
- /*********************************************************************/
--struct nic *davicom_probe(struct nic *nic, unsigned short *io_addrs,
--                          struct pci_device *pci)
-+static int davicom_probe(struct dev *dev, struct pci_device *pci)
- {
-+  struct nic *nic = (struct nic *)dev;
-   unsigned int i;
--  u32 l1, l2;
- 
-   whereami("davicom_probe\n");
- 
--  if (io_addrs == 0 || *io_addrs == 0)
-+  if (pci->ioaddr == 0)
-     return 0;
- 
-   vendor  = pci->vendor;
-   dev_id  = pci->dev_id;
--  ioaddr  = *io_addrs;
-+  ioaddr  = pci->ioaddr & ~3;
-+
-+  nic->irqno  = 0;
-+  nic->ioaddr = pci->ioaddr & ~3;
- 
-   /* wakeup chip */
-   pcibios_write_config_dword(pci->bus, pci->devfn, 0x40, 0x00000000);
-@@ -683,10 +693,26 @@
-   /* initialize device */
-   davicom_reset(nic);
- 
--  nic->reset    = davicom_reset;
-+  dev->disable  = davicom_disable;
-   nic->poll     = davicom_poll;
-   nic->transmit = davicom_transmit;
--  nic->disable  = davicom_disable;
-+  nic->irq      = davicom_irq;
- 
--  return nic;
-+  return 1;
- }
-+
-+static struct pci_id davicom_nics[] = {
-+PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100"),
-+PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102"),
-+PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009"),
-+PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132"),	/* Needs probably some fixing */
-+};
-+
-+struct pci_driver davicom_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "DAVICOM",
-+	.probe    = davicom_probe,
-+	.ids      = davicom_nics,
-+	.id_count = sizeof(davicom_nics)/sizeof(davicom_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/depca.c
-===================================================================
---- a/netboot/depca.c
-+++ /dev/null
-@@ -1,752 +0,0 @@
--/* Etherboot: depca.h merged, comments from Linux driver retained */
--/*  depca.c: A DIGITAL DEPCA  & EtherWORKS ethernet driver for linux.
--
--    Written 1994, 1995 by David C. Davies.
--
--
--                      Copyright 1994 David C. Davies
--		                   and 
--			 United States Government
--	 (as represented by the Director, National Security Agency).  
--
--               Copyright 1995  Digital Equipment Corporation.
--
--
--    This software may be used and distributed according to the terms of
--    the GNU Public License, incorporated herein by reference.
--
--    This driver is written for the Digital Equipment Corporation series
--    of DEPCA and EtherWORKS ethernet cards:
--
--        DEPCA       (the original)
--    	DE100
--    	DE101
--	DE200 Turbo
--	DE201 Turbo
--	DE202 Turbo (TP BNC)
--	DE210
--	DE422       (EISA)
--
--    The  driver has been tested on DE100, DE200 and DE202 cards  in  a
--    relatively busy network. The DE422 has been tested a little.
--
--    This  driver will NOT work   for the DE203,  DE204  and DE205 series  of
--    cards,  since they have  a  new custom ASIC in   place of the AMD  LANCE
--    chip.  See the 'ewrk3.c'   driver in the  Linux  source tree for running
--    those cards.
--
--    I have benchmarked the driver with a  DE100 at 595kB/s to (542kB/s from)
--    a DECstation 5000/200.
--
--    The author may be reached at davies@maniac.ultranet.com
--
--    =========================================================================
--
--    The  driver was originally based  on   the 'lance.c' driver from  Donald
--    Becker   which  is included with  the  standard  driver distribution for
--    linux.  V0.4  is  a complete  re-write  with only  the kernel  interface
--    remaining from the original code.
--
--    1) Lance.c code in /linux/drivers/net/
--    2) "Ethernet/IEEE 802.3 Family. 1992 World Network Data Book/Handbook",
--       AMD, 1992 [(800) 222-9323].
--    3) "Am79C90 CMOS Local Area Network Controller for Ethernet (C-LANCE)",
--       AMD, Pub. #17881, May 1993.
--    4) "Am79C960 PCnet-ISA(tm), Single-Chip Ethernet Controller for ISA",
--       AMD, Pub. #16907, May 1992
--    5) "DEC EtherWORKS LC Ethernet Controller Owners Manual",
--       Digital Equipment corporation, 1990, Pub. #EK-DE100-OM.003
--    6) "DEC EtherWORKS Turbo Ethernet Controller Owners Manual",
--       Digital Equipment corporation, 1990, Pub. #EK-DE200-OM.003
--    7) "DEPCA Hardware Reference Manual", Pub. #EK-DEPCA-PR
--       Digital Equipment Corporation, 1989
--    8) "DEC EtherWORKS Turbo_(TP BNC) Ethernet Controller Owners Manual",
--       Digital Equipment corporation, 1991, Pub. #EK-DE202-OM.001
--    
--
--    Peter Bauer's depca.c (V0.5) was referred to when debugging V0.1 of this
--    driver.
--
--    The original DEPCA  card requires that the  ethernet ROM address counter
--    be enabled to count and has an 8 bit NICSR.  The ROM counter enabling is
--    only  done when a  0x08 is read as the  first address octet (to minimise
--    the chances  of writing over some  other hardware's  I/O register).  The
--    NICSR accesses   have been changed  to  byte accesses  for all the cards
--    supported by this driver, since there is only one  useful bit in the MSB
--    (remote boot timeout) and it  is not used.  Also, there  is a maximum of
--    only 48kB network  RAM for this  card.  My thanks  to Torbjorn Lindh for
--    help debugging all this (and holding my feet to  the fire until I got it
--    right).
--
--    The DE200  series  boards have  on-board 64kB  RAM for  use  as a shared
--    memory network  buffer. Only the DE100  cards make use  of a  2kB buffer
--    mode which has not  been implemented in  this driver (only the 32kB  and
--    64kB modes are supported [16kB/48kB for the original DEPCA]).
--
--    At the most only 2 DEPCA cards can  be supported on  the ISA bus because
--    there is only provision  for two I/O base addresses  on each card (0x300
--    and 0x200). The I/O address is detected by searching for a byte sequence
--    in the Ethernet station address PROM at the expected I/O address for the
--    Ethernet  PROM.   The shared memory  base   address  is 'autoprobed'  by
--    looking  for the self  test PROM  and detecting the  card name.   When a
--    second  DEPCA is  detected,  information  is   placed in the   base_addr
--    variable of the  next device structure (which  is created if necessary),
--    thus  enabling ethif_probe  initialization  for the device.  More than 2
--    EISA cards can  be  supported, but  care will  be  needed assigning  the
--    shared memory to ensure that each slot has the  correct IRQ, I/O address
--    and shared memory address assigned.
--
--    ************************************************************************
--
--    NOTE: If you are using two  ISA DEPCAs, it is  important that you assign
--    the base memory addresses correctly.   The  driver autoprobes I/O  0x300
--    then 0x200.  The  base memory address for  the first device must be less
--    than that of the second so that the auto probe will correctly assign the
--    I/O and memory addresses on the same card.  I can't think of a way to do
--    this unambiguously at the moment, since there is nothing on the cards to
--    tie I/O and memory information together.
--
--    I am unable  to  test  2 cards   together for now,    so this  code   is
--    unchecked. All reports, good or bad, are welcome.
--
--    ************************************************************************
--
--    The board IRQ   setting must be  at an  unused IRQ which  is auto-probed
--    using Donald Becker's autoprobe routines. DEPCA and DE100 board IRQs are
--    {2,3,4,5,7}, whereas the  DE200 is at {5,9,10,11,15}.  Note that IRQ2 is
--    really IRQ9 in machines with 16 IRQ lines.
--
--    No 16MB memory  limitation should exist with this  driver as DMA is  not
--    used and the common memory area is in low memory on the network card (my
--    current system has 20MB and I've not had problems yet).
--
--    The ability to load this driver as a loadable module has been added. To
--    utilise this ability, you have to do <8 things:
--
--    0) have a copy of the loadable modules code installed on your system.
--    1) copy depca.c from the  /linux/drivers/net directory to your favourite
--    temporary directory.
--    2) if you wish, edit the  source code near  line 1530 to reflect the I/O
--    address and IRQ you're using (see also 5).
--    3) compile  depca.c, but include -DMODULE in  the command line to ensure
--    that the correct bits are compiled (see end of source code).
--    4) if you are wanting to add a new  card, goto 5. Otherwise, recompile a
--    kernel with the depca configuration turned off and reboot.
--    5) insmod depca.o [irq=7] [io=0x200] [mem=0xd0000] [adapter_name=DE100]
--       [Alan Cox: Changed the code to allow command line irq/io assignments]
--       [Dave Davies: Changed the code to allow command line mem/name
--                                                                assignments]
--    6) run the net startup bits for your eth?? interface manually 
--    (usually /etc/rc.inet[12] at boot time). 
--    7) enjoy!
--
--    Note that autoprobing is not allowed in loadable modules - the system is
--    already up and running and you're messing with interrupts.
--
--    To unload a module, turn off the associated interface 
--    'ifconfig eth?? down' then 'rmmod depca'.
--
--    To assign a base memory address for the shared memory  when running as a
--    loadable module, see 5 above.  To include the adapter  name (if you have
--    no PROM  but know the card name)  also see 5  above. Note that this last
--    option  will not work  with kernel  built-in  depca's. 
--
--    The shared memory assignment for a loadable module  makes sense to avoid
--    the 'memory autoprobe' picking the wrong shared memory  (for the case of
--    2 depca's in a PC).
--
--    ************************************************************************
--    Support for MCA EtherWORKS cards added 11-3-98.
--    Verified to work with up to 2 DE212 cards in a system (although not
--      fully stress-tested).  
--
--    Currently known bugs/limitations:
--
--    Note:  with the MCA stuff as a module, it trusts the MCA configuration,
--           not the command line for IRQ and memory address.  You can
--           specify them if you want, but it will throw your values out.
--           You still have to pass the IO address it was configured as
--           though.
--
--    ************************************************************************
--    TO DO:
--    ------
--
--
--    Revision History
--    ----------------
--
--    Version   Date        Description
--  
--      0.1     25-jan-94   Initial writing.
--      0.2     27-jan-94   Added LANCE TX hardware buffer chaining.
--      0.3      1-feb-94   Added multiple DEPCA support.
--      0.31     4-feb-94   Added DE202 recognition.
--      0.32    19-feb-94   Tidy up. Improve multi-DEPCA support.
--      0.33    25-feb-94   Fix DEPCA ethernet ROM counter enable.
--                          Add jabber packet fix from murf@perftech.com
--			  and becker@super.org
--      0.34     7-mar-94   Fix DEPCA max network memory RAM & NICSR access.
--      0.35     8-mar-94   Added DE201 recognition. Tidied up.
--      0.351   30-apr-94   Added EISA support. Added DE422 recognition.
--      0.36    16-may-94   DE422 fix released.
--      0.37    22-jul-94   Added MODULE support
--      0.38    15-aug-94   Added DBR ROM switch in depca_close(). 
--                          Multi DEPCA bug fix.
--      0.38axp 15-sep-94   Special version for Alpha AXP Linux V1.0.
--      0.381   12-dec-94   Added DE101 recognition, fix multicast bug.
--      0.382    9-feb-95   Fix recognition bug reported by <bkm@star.rl.ac.uk>.
--      0.383   22-feb-95   Fix for conflict with VESA SCSI reported by
--                          <stromain@alf.dec.com>
--      0.384   17-mar-95   Fix a ring full bug reported by <bkm@star.rl.ac.uk>
--      0.385    3-apr-95   Fix a recognition bug reported by 
--                                                <ryan.niemi@lastfrontier.com>
--      0.386   21-apr-95   Fix the last fix...sorry, must be galloping senility
--      0.40    25-May-95   Rewrite for portability & updated.
--                          ALPHA support from <jestabro@amt.tay1.dec.com>
--      0.41    26-Jun-95   Added verify_area() calls in depca_ioctl() from
--                          suggestion by <heiko@colossus.escape.de>
--      0.42    27-Dec-95   Add 'mem' shared memory assignment for loadable 
--                          modules.
--                          Add 'adapter_name' for loadable modules when no PROM.
--			  Both above from a suggestion by 
--			  <pchen@woodruffs121.residence.gatech.edu>.
--			  Add new multicasting code.
--      0.421   22-Apr-96	  Fix alloc_device() bug <jari@markkus2.fimr.fi>
--      0.422   29-Apr-96	  Fix depca_hw_init() bug <jari@markkus2.fimr.fi>
--      0.423    7-Jun-96   Fix module load bug <kmg@barco.be>
--      0.43    16-Aug-96   Update alloc_device() to conform to de4x5.c
--      0.44     1-Sep-97   Fix *_probe() to test check_region() first - bug
--                           reported by <mmogilvi@elbert.uccs.edu>
--      0.45     3-Nov-98   Added support for MCA EtherWORKS (DE210/DE212) cards
--                           by <tymm@computer.org> 
--      0.451    5-Nov-98   Fixed mca stuff cuz I'm a dummy. <tymm@computer.org>
--      0.5     14-Nov-98   Re-spin for 2.1.x kernels.
--      0.51    27-Jun-99   Correct received packet length for CRC from
--                           report by <worm@dkik.dk>
--
--    =========================================================================
--*/
--
--#include "etherboot.h"
--#include "nic.h"
--#include "cards.h"
--
--/*
--** I/O addresses. Note that the 2k buffer option is not supported in
--** this driver.
--*/
--#define DEPCA_NICSR ioaddr+0x00   /* Network interface CSR */
--#define DEPCA_RBI   ioaddr+0x02   /* RAM buffer index (2k buffer mode) */
--#define DEPCA_DATA  ioaddr+0x04   /* LANCE registers' data port */
--#define DEPCA_ADDR  ioaddr+0x06   /* LANCE registers' address port */
--#define DEPCA_HBASE ioaddr+0x08   /* EISA high memory base address reg. */
--#define DEPCA_PROM  ioaddr+0x0c   /* Ethernet address ROM data port */
--#define DEPCA_CNFG  ioaddr+0x0c   /* EISA Configuration port */
--#define DEPCA_RBSA  ioaddr+0x0e   /* RAM buffer starting address (2k buff.) */
--
--/*
--** These are LANCE registers addressable through DEPCA_ADDR 
--*/
--#define CSR0       0
--#define CSR1       1
--#define CSR2       2
--#define CSR3       3
--
--/* 
--** NETWORK INTERFACE CSR (NI_CSR) bit definitions 
--*/
-- 
--#define TO       	0x0100	/* Time Out for remote boot */
--#define SHE      	0x0080  /* SHadow memory Enable */
--#define BS       	0x0040  /* Bank Select */
--#define BUF      	0x0020	/* BUFfer size (1->32k, 0->64k) */
--#define RBE      	0x0010	/* Remote Boot Enable (1->net boot) */
--#define AAC      	0x0008  /* Address ROM Address Counter (1->enable) */
--#define _128KB      	0x0008  /* 128kB Network RAM (1->enable) */
--#define IM       	0x0004	/* Interrupt Mask (1->mask) */
--#define IEN      	0x0002	/* Interrupt tristate ENable (1->enable) */
--#define LED      	0x0001	/* LED control */
--
--/* 
--** Control and Status Register 0 (CSR0) bit definitions 
--*/
--
--#define ERR     	0x8000 	/* Error summary */
--#define BABL    	0x4000 	/* Babble transmitter timeout error  */
--#define CERR    	0x2000 	/* Collision Error */
--#define MISS    	0x1000 	/* Missed packet */
--#define MERR    	0x0800 	/* Memory Error */
--#define RINT    	0x0400 	/* Receiver Interrupt */
--#define TINT    	0x0200 	/* Transmit Interrupt */
--#define IDON    	0x0100 	/* Initialization Done */
--#define INTR    	0x0080 	/* Interrupt Flag */
--#define INEA    	0x0040 	/* Interrupt Enable */
--#define RXON    	0x0020 	/* Receiver on */
--#define TXON    	0x0010 	/* Transmitter on */
--#define TDMD    	0x0008 	/* Transmit Demand */
--#define STOP    	0x0004 	/* Stop */
--#define STRT    	0x0002 	/* Start */
--#define INIT    	0x0001 	/* Initialize */
--#define INTM            0xff00  /* Interrupt Mask */
--#define INTE            0xfff0  /* Interrupt Enable */
--
--/*
--** CONTROL AND STATUS REGISTER 3 (CSR3)
--*/
--
--#define BSWP    	0x0004	/* Byte SWaP */
--#define ACON    	0x0002	/* ALE control */
--#define BCON    	0x0001	/* Byte CONtrol */
--
--/*
--** Initialization Block Mode Register 
--*/
--
--#define PROM       	0x8000 	/* Promiscuous Mode */
--#define EMBA       	0x0080	/* Enable Modified Back-off Algorithm */
--#define INTL       	0x0040 	/* Internal Loopback */
--#define DRTY       	0x0020 	/* Disable Retry */
--#define COLL       	0x0010 	/* Force Collision */
--#define DTCR       	0x0008 	/* Disable Transmit CRC */
--#define LOOP       	0x0004 	/* Loopback */
--#define DTX        	0x0002 	/* Disable the Transmitter */
--#define DRX        	0x0001 	/* Disable the Receiver */
--
--/*
--** Receive Message Descriptor 1 (RMD1) bit definitions. 
--*/
--
--#define R_OWN       0x80000000 	/* Owner bit 0 = host, 1 = lance */
--#define R_ERR     	0x4000 	/* Error Summary */
--#define R_FRAM    	0x2000 	/* Framing Error */
--#define R_OFLO    	0x1000 	/* Overflow Error */
--#define R_CRC     	0x0800 	/* CRC Error */
--#define R_BUFF    	0x0400 	/* Buffer Error */
--#define R_STP     	0x0200 	/* Start of Packet */
--#define R_ENP     	0x0100 	/* End of Packet */
--
--/*
--** Transmit Message Descriptor 1 (TMD1) bit definitions. 
--*/
--
--#define T_OWN       0x80000000 	/* Owner bit 0 = host, 1 = lance */
--#define T_ERR     	0x4000 	/* Error Summary */
--#define T_ADD_FCS 	0x2000 	/* More the 1 retry needed to Xmit */
--#define T_MORE    	0x1000	/* >1 retry to transmit packet */
--#define T_ONE     	0x0800 	/* 1 try needed to transmit the packet */
--#define T_DEF     	0x0400 	/* Deferred */
--#define T_STP       0x02000000 	/* Start of Packet */
--#define T_ENP       0x01000000	/* End of Packet */
--#define T_FLAGS     0xff000000  /* TX Flags Field */
--
--/*
--** Transmit Message Descriptor 3 (TMD3) bit definitions.
--*/
--
--#define TMD3_BUFF    0x8000	/* BUFFer error */
--#define TMD3_UFLO    0x4000	/* UnderFLOw error */
--#define TMD3_RES     0x2000	/* REServed */
--#define TMD3_LCOL    0x1000	/* Late COLlision */
--#define TMD3_LCAR    0x0800	/* Loss of CARrier */
--#define TMD3_RTRY    0x0400	/* ReTRY error */
--
--/*
--** Ethernet PROM defines
--*/
--#define PROBE_LENGTH    32
--
--/*
--** Set the number of Tx and Rx buffers. Ensure that the memory requested
--** here is <= to the amount of shared memory set up by the board switches.
--** The number of descriptors MUST BE A POWER OF 2.
--**
--** total_memory = NUM_RX_DESC*(8+RX_BUFF_SZ) + NUM_TX_DESC*(8+TX_BUFF_SZ)
--*/
--#define NUM_RX_DESC     2               /* Number of RX descriptors */
--#define NUM_TX_DESC     2               /* Number of TX descriptors */
--#define RX_BUFF_SZ	1536            /* Buffer size for each Rx buffer */
--#define TX_BUFF_SZ	1536            /* Buffer size for each Tx buffer */
--
--/*
--** ISA Bus defines
--*/
--#define DEPCA_IO_PORTS	{0x300, 0x200, 0}
--
--#ifndef	DEPCA_MODEL
--#define	DEPCA_MODEL	DEPCA
--#endif
--
--static enum {
--	DEPCA, DE100, DE101, DE200, DE201, DE202, DE210, DE212, DE422, unknown
--} adapter = DEPCA_MODEL;
--
--/*
--** Name <-> Adapter mapping
--*/
--
--static char *adapter_name[] = {
--	"DEPCA",
--	"DE100","DE101",
--	"DE200","DE201","DE202",
--	"DE210","DE212",
--	"DE422",
--	""
--};
--
--#ifndef	DEPCA_RAM_BASE
--#define DEPCA_RAM_BASE	0xd0000
--#endif
--
--/*
--** Memory Alignment. Each descriptor is 4 longwords long. To force a
--** particular alignment on the TX descriptor, adjust DESC_SKIP_LEN and
--** DESC_ALIGN. ALIGN aligns the start address of the private memory area
--** and hence the RX descriptor ring's first entry. 
--*/
--#define ALIGN4      ((u32)4 - 1)       /* 1 longword align */
--#define ALIGN8      ((u32)8 - 1)       /* 2 longword (quadword) align */
--#define ALIGN         ALIGN8              /* Keep the LANCE happy... */
--
--typedef	long		s32;
--typedef	unsigned long	u32;
--typedef	short		s16;
--typedef	unsigned short	u16;
--typedef	char		s8;
--typedef	unsigned char	u8;
--
--/*
--** The DEPCA Rx and Tx ring descriptors. 
--*/
--struct depca_rx_desc {
--    volatile s32 base;
--    s16 buf_length;		/* This length is negative 2's complement! */
--    s16 msg_length;		/* This length is "normal". */
--};
--
--struct depca_tx_desc {
--    volatile s32 base;
--    s16 length;		        /* This length is negative 2's complement! */
--    s16 misc;                   /* Errors and TDR info */
--};
--
--#define LA_MASK 0x0000ffff      /* LANCE address mask for mapping network RAM
--				   to LANCE memory address space */
--
--/*
--** The Lance initialization block, described in databook, in common memory.
--*/
--struct depca_init {
--    u16 mode;	                /* Mode register */
--    u8  phys_addr[ETH_ALEN];	/* Physical ethernet address */
--    u8  mcast_table[8];	        /* Multicast Hash Table. */
--    u32 rx_ring;     	        /* Rx ring base pointer & ring length */
--    u32 tx_ring;	        /* Tx ring base pointer & ring length */
--};
--
--struct depca_private {
--	struct depca_rx_desc	*rx_ring;
--	struct depca_tx_desc	*tx_ring;
--	struct depca_init	init_block;	/* Shadow init block */
--	char			*rx_memcpy[NUM_RX_DESC];
--	char			*tx_memcpy[NUM_TX_DESC];
--	u32			bus_offset;	/* ISA bus address offset */
--	u32			sh_mem;		/* address of shared mem */
--	u32			dma_buffs;	/* Rx & Tx buffer start */
--	int			rx_cur, tx_cur;	/* Next free ring entry */
--	int			txRingMask, rxRingMask;
--	s32			rx_rlen, tx_rlen;
--	/* log2([rt]xRingMask+1) for the descriptors */
--};
--
--static Address		mem_start = DEPCA_RAM_BASE;
--static Address		mem_len, offset;
--static unsigned short	ioaddr = 0;
--static struct depca_private	lp;
--
--/*
--** Miscellaneous defines...
--*/
--#define STOP_DEPCA \
--    outw(CSR0, DEPCA_ADDR);\
--    outw(STOP, DEPCA_DATA)
--
--/* Initialize the lance Rx and Tx descriptor rings. */
--static void depca_init_ring(struct nic *nic)
--{
--	int	i;
--	u32	p;
--
--	lp.rx_cur = lp.tx_cur = 0;
--	/* Initialize the base addresses and length of each buffer in the ring */
--	for (i = 0; i <= lp.rxRingMask; i++) {
--		writel((p = lp.dma_buffs + i * RX_BUFF_SZ) | R_OWN, &lp.rx_ring[i].base);
--		writew(-RX_BUFF_SZ, &lp.rx_ring[i].buf_length);
--		lp.rx_memcpy[i] = (char *) (p + lp.bus_offset);
--	}
--	for (i = 0; i <= lp.txRingMask; i++) {
--		writel((p = lp.dma_buffs + (i + lp.txRingMask + 1) * TX_BUFF_SZ) & 0x00ffffff, &lp.tx_ring[i].base);
--		lp.tx_memcpy[i] = (char *) (p + lp.bus_offset);
--	}
--
--	/* Set up the initialization block */
--	lp.init_block.rx_ring = ((u32) ((u32) lp.rx_ring) & LA_MASK) | lp.rx_rlen;
--	lp.init_block.tx_ring = ((u32) ((u32) lp.tx_ring) & LA_MASK) | lp.tx_rlen;
--	for (i = 0; i < ETH_ALEN; i++)
--		lp.init_block.phys_addr[i] = nic->node_addr[i];
--	lp.init_block.mode = 0x0000;	/* Enable the Tx and Rx */
--	memset(lp.init_block.mcast_table, 0, sizeof(lp.init_block.mcast_table));
--}
--
--static void LoadCSRs(void)
--{
--	outw(CSR1, DEPCA_ADDR);	/* initialisation block address LSW */
--	outw((u16) (lp.sh_mem & LA_MASK), DEPCA_DATA);
--	outw(CSR2, DEPCA_ADDR);	/* initialisation block address MSW */
--	outw((u16) ((lp.sh_mem & LA_MASK) >> 16), DEPCA_DATA);
--	outw(CSR3, DEPCA_ADDR);	/* ALE control */
--	outw(ACON, DEPCA_DATA);
--	outw(CSR0, DEPCA_ADDR);	/* Point back to CSR0 */
--}
--
--static int InitRestartDepca(void)
--{
--	int		i;
--
--	/* Copy the shadow init_block to shared memory */
--	memcpy_toio((char *)lp.sh_mem, &lp.init_block, sizeof(struct depca_init));
--	outw(CSR0, DEPCA_ADDR);		/* point back to CSR0 */
--	outw(INIT, DEPCA_DATA);		/* initialise DEPCA */
--
--	for (i = 0; i < 100 && !(inw(DEPCA_DATA) & IDON); i++)
--		;
--	if (i < 100) {
--		/* clear IDON by writing a 1, and start LANCE */
--		outw(IDON | STRT, DEPCA_DATA);
--	} else {
--		printf("DEPCA not initialised\n");
--		return (1);
--	}
--	return (0);
--}
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--static void depca_reset(struct nic *nic)
--{
--	s16	nicsr;
--	int	i, j;
--
--	STOP_DEPCA;
--	nicsr = inb(DEPCA_NICSR);
--	nicsr = ((nicsr & ~SHE & ~RBE & ~IEN) | IM);
--	outb(nicsr, DEPCA_NICSR);
--	if (inw(DEPCA_DATA) != STOP)
--	{
--		printf("depca: Cannot stop NIC\n");
--		return;
--	}
--
--	/* Initialisation block */
--	lp.sh_mem = mem_start;
--	mem_start += sizeof(struct depca_init);
--	/* Tx & Rx descriptors (aligned to a quadword boundary) */
--	mem_start = (mem_start + ALIGN) & ~ALIGN;
--	lp.rx_ring = (struct depca_rx_desc *) mem_start;
--	mem_start += (sizeof(struct depca_rx_desc) * NUM_RX_DESC);
--	lp.tx_ring = (struct depca_tx_desc *) mem_start;
--	mem_start += (sizeof(struct depca_tx_desc) * NUM_TX_DESC);
--
--	lp.bus_offset = mem_start & 0x00ff0000;
--	/* LANCE re-mapped start address */
--	lp.dma_buffs = mem_start & LA_MASK;
--
--	/* Finish initialising the ring information. */
--	lp.rxRingMask = NUM_RX_DESC - 1;
--	lp.txRingMask = NUM_TX_DESC - 1;
--
--	/* Calculate Tx/Rx RLEN size for the descriptors. */
--	for (i = 0, j = lp.rxRingMask; j > 0; i++) {
--		j >>= 1;
--	}
--	lp.rx_rlen = (s32) (i << 29);
--	for (i = 0, j = lp.txRingMask; j > 0; i++) {
--		j >>= 1;
--	}
--	lp.tx_rlen = (s32) (i << 29);
--
--	/* Load the initialisation block */
--	depca_init_ring(nic);
--	LoadCSRs();
--	InitRestartDepca();
--}
--
--/**************************************************************************
--POLL - Wait for a frame
--***************************************************************************/
--static int depca_poll(struct nic *nic)
--{
--	int		entry;
--	u32		status;
--
--	entry = lp.rx_cur;
--	if ((status = readl(&lp.rx_ring[entry].base) & R_OWN))
--		return (0);
--	memcpy(nic->packet, lp.rx_memcpy[entry], nic->packetlen = lp.rx_ring[entry].msg_length);
--	lp.rx_ring[entry].base |= R_OWN;
--	lp.rx_cur = (++lp.rx_cur) & lp.rxRingMask;
--	return (1);
--}
--
--/**************************************************************************
--TRANSMIT - Transmit a frame
--***************************************************************************/
--static void depca_transmit(
--	struct nic *nic,
--	const char *d,			/* Destination */
--	unsigned int t,			/* Type */
--	unsigned int s,			/* size */
--	const char *p)			/* Packet */
--{
--	int		entry, len;
--	char		*mem;
--
--	/* send the packet to destination */
--	/*
--	** Caution: the right order is important here... dont
--	** setup the ownership rights until all the other
--	** information is in place
--	*/
--	mem = lp.tx_memcpy[entry = lp.tx_cur];
--	memcpy_toio(mem, d, ETH_ALEN);
--	memcpy_toio(mem + ETH_ALEN, nic->node_addr, ETH_ALEN);
--	mem[ETH_ALEN * 2] = t >> 8;
--	mem[ETH_ALEN * 2 + 1] = t;
--	memcpy_toio(mem + ETH_HLEN, p, s);
--	s += ETH_HLEN;
--	len = (s < ETH_ZLEN ? ETH_ZLEN : s);
--	/* clean out flags */
--	writel(readl(&lp.tx_ring[entry].base) & ~T_FLAGS, &lp.tx_ring[entry].base);
--	/* clears other error flags */
--	writew(0x0000, &lp.tx_ring[entry].misc);
--	/* packet length in buffer */
--	writew(-len, &lp.tx_ring[entry].length);
--	/* start and end of packet, ownership */
--	writel(readl(&lp.tx_ring[entry].base) | (T_STP|T_ENP|T_OWN), &lp.tx_ring[entry].base);
--	/* update current pointers */
--	lp.tx_cur = (++lp.tx_cur) & lp.txRingMask;
--}
--
--/**************************************************************************
--DISABLE - Turn off ethernet interface
--***************************************************************************/
--static void depca_disable(struct nic *nic)
--{
--	STOP_DEPCA;
--}
--
--/*
--** Look for a special sequence in the Ethernet station address PROM that
--** is common across all DEPCA products. Note that the original DEPCA needs
--** its ROM address counter to be initialized and enabled. Only enable
--** if the first address octet is a 0x08 - this minimises the chances of
--** messing around with some other hardware, but it assumes that this DEPCA
--** card initialized itself correctly.
--**
--** Search the Ethernet address ROM for the signature. Since the ROM address
--** counter can start at an arbitrary point, the search must include the entire
--** probe sequence length plus the (length_of_the_signature - 1).
--** Stop the search IMMEDIATELY after the signature is found so that the
--** PROM address counter is correctly positioned at the start of the
--** ethernet address for later read out.
--*/
--static int depca_probe1(struct nic *nic)
--{
--	u8	data, nicsr;
--	/* This is only correct for little endian machines, but then
--	   Etherboot doesn't work on anything but a PC */
--	u8	sig[] = { 0xFF, 0x00, 0x55, 0xAA, 0xFF, 0x00, 0x55, 0xAA };
--	int	i, j;
--	long	sum, chksum;
--
--	data = inb(DEPCA_PROM);		/* clear counter on DEPCA */
--	data = inb(DEPCA_PROM);		/* read data */
--	if (data == 0x8) {
--		nicsr = inb(DEPCA_NICSR);
--		nicsr |= AAC;
--		outb(nicsr, DEPCA_NICSR);
--	}
--	for (i = 0, j = 0; j < (int)sizeof(sig) && i < PROBE_LENGTH+((int)sizeof(sig))-1; ++i) {
--		data = inb(DEPCA_PROM);
--		if (data == sig[j])		/* track signature */
--			++j;
--		else
--			j = (data == sig[0]) ? 1 : 0;
--	}
--	if (j != sizeof(sig))
--		return (0);
--	/* put the card in its initial state */
--	STOP_DEPCA;
--	nicsr = ((inb(DEPCA_NICSR) & ~SHE & ~RBE & ~IEN) | IM);
--	outb(nicsr, DEPCA_NICSR);
--	if (inw(DEPCA_DATA) != STOP)
--		return (0);
--	memcpy((char *)mem_start, sig, sizeof(sig));
--	if (memcmp((char *)mem_start, sig, sizeof(sig)) != 0)
--		return (0);
--	for (i = 0, j = 0, sum = 0; j < 3; j++) {
--		sum <<= 1;
--		if (sum > 0xFFFF)
--			sum -= 0xFFFF;
--		sum += (u8)(nic->node_addr[i++] = inb(DEPCA_PROM));
--		sum += (u16)((nic->node_addr[i++] = inb(DEPCA_PROM)) << 8);
--		if (sum > 0xFFFF)
--			sum -= 0xFFFF;
--	}
--	if (sum == 0xFFFF)
--		sum = 0;
--	chksum = (u8)inb(DEPCA_PROM);
--	chksum |= (u16)(inb(DEPCA_PROM) << 8);
--	mem_len = (adapter == DEPCA) ? (48 << 10) : (64 << 10);
--	offset = 0;
--	if (nicsr & BUF) {
--		offset = 0x8000;
--		nicsr &= ~BS;
--		mem_len -= (32 << 10);
--	}
--	if (adapter != DEPCA)	/* enable shadow RAM */
--		outb(nicsr |= SHE, DEPCA_NICSR);
--	printf("%s base %#hX, memory [%#hX-%#hX], addr %!",
--		adapter_name[adapter], ioaddr, mem_start, mem_start + mem_len,
--		nic->node_addr);
--	if (sum != chksum)
--		printf(" (bad checksum)");
--	putchar('\n');
--	return (1);
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--***************************************************************************/
--struct nic *depca_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	static unsigned short	base[] = DEPCA_IO_PORTS;
--	int			i;
--
--	if (probe_addrs == 0 || probe_addrs[0] == 0)
--		probe_addrs = base;	/* Use defaults */
--	for (i = 0; (ioaddr = base[i]) != 0; ++i) {
--		if (depca_probe1(nic))
--			break;
--	}
--	if (ioaddr == 0)
--		return (0);
--	depca_reset(nic);
--	/* point to NIC specific routines */
--	nic->reset = depca_reset;
--	nic->poll = depca_poll;
--	nic->transmit = depca_transmit;
--	nic->disable = depca_disable;
--	return (nic);
--}
-Index: b/netboot/dev.h
-===================================================================
---- /dev/null
-+++ b/netboot/dev.h
-@@ -0,0 +1,83 @@
-+#ifndef _DEV_H
-+#define _DEV_H
-+
-+#include "isa.h"
-+#include "pci.h"
-+
-+/* Need to check the packing of this struct if Etherboot is ported */
-+struct dev_id
-+{
-+	unsigned short	vendor_id;
-+	unsigned short	device_id;
-+	unsigned char	bus_type;
-+#define	PCI_BUS_TYPE	1
-+#define	ISA_BUS_TYPE	2
-+};
-+
-+/* Dont use sizeof, that will include the padding */
-+#define	DEV_ID_SIZE	8
-+
-+
-+struct pci_probe_state 
-+{
-+#ifdef CONFIG_PCI
-+	struct pci_device dev;
-+	int advance;
-+#else
-+	int dummy;
-+#endif
-+};
-+struct isa_probe_state
-+{
-+#ifdef CONFIG_ISA
-+	const struct isa_driver *driver;
-+	int advance;
-+#else
-+	int dummy;
-+#endif
-+};
-+
-+union probe_state
-+{
-+	struct pci_probe_state pci;
-+	struct isa_probe_state isa;
-+};
-+
-+struct dev
-+{
-+	void		(*disable)P((struct dev *));
-+	struct dev_id	devid;	/* device ID string (sent to DHCP server) */
-+	int		index;  /* Index of next device on this controller to probe */
-+	int		type;		/* Type of device I am probing for */
-+	int		how_probe;	/* First, next or awake */
-+	int 		to_probe;	/* Flavor of device I am probing */
-+	int		failsafe;	/* Failsafe probe requested */
-+	int		type_index;	/* Index of this device (within type) */
-+#define	PROBE_NONE 0
-+#define PROBE_PCI  1
-+#define PROBE_ISA  2
-+	union probe_state state;
-+};
-+
-+
-+#define NIC_DRIVER    0
-+#define DISK_DRIVER   1
-+#define FLOPPY_DRIVER 2
-+
-+#define BRIDGE_DRIVER 1000
-+
-+#define PROBE_FIRST  (-1)
-+#define PROBE_NEXT   0
-+#define PROBE_AWAKE  1		/* After calling disable bring up the same device */
-+
-+/* The probe result codes are selected
-+ * to allow them to be fed back into the probe
-+ * routine and get a successful probe.
-+ */
-+#define PROBE_FAILED PROBE_FIRST
-+#define PROBE_WORKED  PROBE_NEXT
-+
-+extern int probe(struct dev *dev);
-+extern void disable(struct dev *dev);
-+
-+#endif /* _DEV_H */
-Index: b/netboot/e1000.c
-===================================================================
---- /dev/null
-+++ b/netboot/e1000.c
-@@ -0,0 +1,3682 @@
-+/**************************************************************************
-+Etherboot -  BOOTP/TFTP Bootstrap Program
-+Inter Pro 1000 for Etherboot
-+Drivers are port from Intel's Linux driver e1000-4.3.15
-+
-+***************************************************************************/
-+/*******************************************************************************
-+
-+  
-+  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
-+  
-+  This program is free software; you can redistribute it and/or modify it 
-+  under the terms of the GNU General Public License as published by the Free 
-+  Software Foundation; either version 2 of the License, or (at your option) 
-+  any later version.
-+  
-+  This program is distributed in the hope that it will be useful, but WITHOUT 
-+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
-+  more details.
-+  
-+  You should have received a copy of the GNU General Public License along with
-+  this program; if not, write to the Free Software Foundation, Inc., 59 
-+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+  
-+  The full GNU General Public License is included in this distribution in the
-+  file called LICENSE.
-+  
-+  Contact Information:
-+  Linux NICS <linux.nics@intel.com>
-+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-+
-+*******************************************************************************/
-+/*
-+ *  Copyright (C) Archway Digital Solutions.
-+ *
-+ *  written by Chrsitopher Li <cli at arcyway dot com> or <chrisl at gnuchina dot org>
-+ *  2/9/2002
-+ *
-+ *  Copyright (C) Linux Networx.
-+ *  Massive upgrade to work with the new intel gigabit NICs.
-+ *  <ebiederman at lnxi dot com>
-+ *
-+ *  Support for 82541ei & 82547ei chips from Intel's Linux driver 5.1.13 added by
-+ *  Georg Baum <gbaum@users.sf.net>, sponsored by PetaMem GmbH and linkLINE Communications, Inc.
-+ *
-+ *  01/2004: Updated to Linux driver 5.2.22 by Georg Baum <gbaum@users.sf.net>
-+ */
-+
-+/* to get some global routines like printf */
-+#include "etherboot.h"
-+/* to get the interface to the body of the program */
-+#include "nic.h"
-+/* to get the PCI support functions, if this is a PCI NIC */
-+#include "pci.h"
-+#include "timer.h"
-+
-+typedef unsigned char *dma_addr_t;
-+
-+typedef enum {
-+	FALSE = 0,
-+	TRUE = 1
-+} boolean_t;
-+
-+#define DEBUG 0
-+
-+
-+/* Some pieces of code are disabled with #if 0 ... #endif.
-+ * They are not deleted to show where the etherboot driver differs
-+ * from the linux driver below the function level.
-+ * Some member variables of the hw struct have been eliminated
-+ * and the corresponding inplace checks inserted instead.
-+ * Pieces such as LED handling that we definitely don't need are deleted.
-+ *
-+ * The following defines should not be needed normally,
-+ * but may be helpful for debugging purposes. */
-+
-+/* Define this if you want to program the transmission control register
-+ * the way the Linux driver does it. */
-+#undef LINUX_DRIVER_TCTL
-+
-+/* Define this to behave more like the Linux driver. */
-+#undef LINUX_DRIVER
-+
-+#include "e1000_hw.h"
-+
-+/* NIC specific static variables go here */
-+static struct e1000_hw hw;
-+static char tx_pool[128 + 16];
-+static char rx_pool[128 + 16];
-+static char packet[2096];
-+
-+static struct e1000_tx_desc *tx_base;
-+static struct e1000_rx_desc *rx_base;
-+
-+static int tx_tail;
-+static int rx_tail, rx_last;
-+
-+/* Function forward declarations */
-+static int e1000_setup_link(struct e1000_hw *hw);
-+static int e1000_setup_fiber_serdes_link(struct e1000_hw *hw);
-+static int e1000_setup_copper_link(struct e1000_hw *hw);
-+static int e1000_phy_setup_autoneg(struct e1000_hw *hw);
-+static void e1000_config_collision_dist(struct e1000_hw *hw);
-+static int e1000_config_mac_to_phy(struct e1000_hw *hw);
-+static int e1000_config_fc_after_link_up(struct e1000_hw *hw);
-+static int e1000_check_for_link(struct e1000_hw *hw);
-+static int e1000_wait_autoneg(struct e1000_hw *hw);
-+static void e1000_get_speed_and_duplex(struct e1000_hw *hw, uint16_t *speed, uint16_t *duplex);
-+static int e1000_read_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy_data);
-+static int e1000_read_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr, uint16_t *phy_data);
-+static int e1000_write_phy_reg(struct e1000_hw *hw, uint32_t reg_addr, uint16_t phy_data);
-+static int e1000_write_phy_reg_ex(struct e1000_hw *hw, uint32_t reg_addr, uint16_t phy_data);
-+static void e1000_phy_hw_reset(struct e1000_hw *hw);
-+static int e1000_phy_reset(struct e1000_hw *hw);
-+static int e1000_detect_gig_phy(struct e1000_hw *hw);
-+
-+/* Printing macros... */
-+
-+#define E1000_ERR(args...) printf("e1000: " args)
-+
-+#if DEBUG >= 3
-+#define E1000_DBG(args...) printf("e1000: " args)
-+#else
-+#define E1000_DBG(args...)
-+#endif
-+
-+#define MSGOUT(S, A, B)     printk(S "\n", A, B)
-+#if DEBUG >= 2
-+#define DEBUGFUNC(F)        DEBUGOUT(F "\n");
-+#else
-+#define DEBUGFUNC(F)
-+#endif
-+#if DEBUG >= 1
-+#define DEBUGOUT(S) printf(S)
-+#define DEBUGOUT1(S,A) printf(S,A)
-+#define DEBUGOUT2(S,A,B) printf(S,A,B)
-+#define DEBUGOUT3(S,A,B,C) printf(S,A,B,C)
-+#define DEBUGOUT7(S,A,B,C,D,E,F,G) printf(S,A,B,C,D,E,F,G)
-+#else
-+#define DEBUGOUT(S)
-+#define DEBUGOUT1(S,A)
-+#define DEBUGOUT2(S,A,B)
-+#define DEBUGOUT3(S,A,B,C)
-+#define DEBUGOUT7(S,A,B,C,D,E,F,G)
-+#endif
-+
-+#define E1000_WRITE_REG(a, reg, value) ( \
-+    ((a)->mac_type >= e1000_82543) ? \
-+        (writel((value), ((a)->hw_addr + E1000_##reg))) : \
-+        (writel((value), ((a)->hw_addr + E1000_82542_##reg))))
-+
-+#define E1000_READ_REG(a, reg) ( \
-+    ((a)->mac_type >= e1000_82543) ? \
-+        readl((a)->hw_addr + E1000_##reg) : \
-+        readl((a)->hw_addr + E1000_82542_##reg))
-+
-+#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
-+    ((a)->mac_type >= e1000_82543) ? \
-+        writel((value), ((a)->hw_addr + E1000_##reg + ((offset) << 2))) : \
-+        writel((value), ((a)->hw_addr + E1000_82542_##reg + ((offset) << 2))))
-+
-+#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
-+    ((a)->mac_type >= e1000_82543) ? \
-+        readl((a)->hw_addr + E1000_##reg + ((offset) << 2)) : \
-+        readl((a)->hw_addr + E1000_82542_##reg + ((offset) << 2)))
-+
-+#define E1000_WRITE_FLUSH(a) {uint32_t x; x = E1000_READ_REG(a, STATUS);}
-+
-+uint32_t
-+e1000_io_read(struct e1000_hw *hw __unused, uint32_t port)
-+{
-+        return inl(port);
-+}
-+
-+void
-+e1000_io_write(struct e1000_hw *hw __unused, uint32_t port, uint32_t value)
-+{
-+        outl(value, port);
-+}
-+
-+static inline void e1000_pci_set_mwi(struct e1000_hw *hw)
-+{
-+	pci_write_config_word(hw->pdev, PCI_COMMAND, hw->pci_cmd_word);
-+}
-+
-+static inline void e1000_pci_clear_mwi(struct e1000_hw *hw)
-+{
-+	pci_write_config_word(hw->pdev, PCI_COMMAND,
-+			      hw->pci_cmd_word & ~PCI_COMMAND_INVALIDATE);
-+}
-+
-+/******************************************************************************
-+ * Raises the EEPROM's clock input.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ * eecd - EECD's current value
-+ *****************************************************************************/
-+static void
-+e1000_raise_ee_clk(struct e1000_hw *hw,
-+                   uint32_t *eecd)
-+{
-+	/* Raise the clock input to the EEPROM (by setting the SK bit), and then
-+	 * wait <delay> microseconds.
-+	 */
-+	*eecd = *eecd | E1000_EECD_SK;
-+	E1000_WRITE_REG(hw, EECD, *eecd);
-+	E1000_WRITE_FLUSH(hw);
-+	udelay(hw->eeprom.delay_usec);
-+}
-+
-+/******************************************************************************
-+ * Lowers the EEPROM's clock input.
-+ *
-+ * hw - Struct containing variables accessed by shared code 
-+ * eecd - EECD's current value
-+ *****************************************************************************/
-+static void
-+e1000_lower_ee_clk(struct e1000_hw *hw,
-+                   uint32_t *eecd)
-+{
-+	/* Lower the clock input to the EEPROM (by clearing the SK bit), and then 
-+	 * wait 50 microseconds. 
-+	 */
-+	*eecd = *eecd & ~E1000_EECD_SK;
-+	E1000_WRITE_REG(hw, EECD, *eecd);
-+	E1000_WRITE_FLUSH(hw);
-+	udelay(hw->eeprom.delay_usec);
-+}
-+
-+/******************************************************************************
-+ * Shift data bits out to the EEPROM.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ * data - data to send to the EEPROM
-+ * count - number of bits to shift out
-+ *****************************************************************************/
-+static void
-+e1000_shift_out_ee_bits(struct e1000_hw *hw,
-+                        uint16_t data,
-+                        uint16_t count)
-+{
-+	struct e1000_eeprom_info *eeprom = &hw->eeprom;
-+	uint32_t eecd;
-+	uint32_t mask;
-+	
-+	/* We need to shift "count" bits out to the EEPROM. So, value in the
-+	 * "data" parameter will be shifted out to the EEPROM one bit at a time.
-+	 * In order to do this, "data" must be broken down into bits. 
-+	 */
-+	mask = 0x01 << (count - 1);
-+	eecd = E1000_READ_REG(hw, EECD);
-+	if (eeprom->type == e1000_eeprom_microwire) {
-+		eecd &= ~E1000_EECD_DO;
-+	} else if (eeprom->type == e1000_eeprom_spi) {
-+		eecd |= E1000_EECD_DO;
-+	}
-+	do {
-+		/* A "1" is shifted out to the EEPROM by setting bit "DI" to a "1",
-+		 * and then raising and then lowering the clock (the SK bit controls
-+		 * the clock input to the EEPROM).  A "0" is shifted out to the EEPROM
-+		 * by setting "DI" to "0" and then raising and then lowering the clock.
-+		 */
-+		eecd &= ~E1000_EECD_DI;
-+		
-+		if(data & mask)
-+			eecd |= E1000_EECD_DI;
-+		
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		
-+		udelay(eeprom->delay_usec);
-+		
-+		e1000_raise_ee_clk(hw, &eecd);
-+		e1000_lower_ee_clk(hw, &eecd);
-+		
-+		mask = mask >> 1;
-+		
-+	} while(mask);
-+
-+	/* We leave the "DI" bit set to "0" when we leave this routine. */
-+	eecd &= ~E1000_EECD_DI;
-+	E1000_WRITE_REG(hw, EECD, eecd);
-+}
-+
-+/******************************************************************************
-+ * Shift data bits in from the EEPROM
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static uint16_t
-+e1000_shift_in_ee_bits(struct e1000_hw *hw,
-+                       uint16_t count)
-+{
-+	uint32_t eecd;
-+	uint32_t i;
-+	uint16_t data;
-+	
-+	/* In order to read a register from the EEPROM, we need to shift 'count' 
-+	 * bits in from the EEPROM. Bits are "shifted in" by raising the clock
-+	 * input to the EEPROM (setting the SK bit), and then reading the value of
-+	 * the "DO" bit.  During this "shifting in" process the "DI" bit should
-+	 * always be clear.
-+	 */
-+	
-+	eecd = E1000_READ_REG(hw, EECD);
-+	
-+	eecd &= ~(E1000_EECD_DO | E1000_EECD_DI);
-+	data = 0;
-+	
-+	for(i = 0; i < count; i++) {
-+		data = data << 1;
-+		e1000_raise_ee_clk(hw, &eecd);
-+		
-+		eecd = E1000_READ_REG(hw, EECD);
-+		
-+		eecd &= ~(E1000_EECD_DI);
-+		if(eecd & E1000_EECD_DO)
-+			data |= 1;
-+		
-+		e1000_lower_ee_clk(hw, &eecd);
-+	}
-+	
-+	return data;
-+}
-+
-+/******************************************************************************
-+ * Prepares EEPROM for access
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *
-+ * Lowers EEPROM clock. Clears input pin. Sets the chip select pin. This 
-+ * function should be called before issuing a command to the EEPROM.
-+ *****************************************************************************/
-+static int32_t
-+e1000_acquire_eeprom(struct e1000_hw *hw)
-+{
-+	struct e1000_eeprom_info *eeprom = &hw->eeprom;
-+	uint32_t eecd, i=0;
-+
-+	eecd = E1000_READ_REG(hw, EECD);
-+
-+	/* Request EEPROM Access */
-+	if(hw->mac_type > e1000_82544) {
-+		eecd |= E1000_EECD_REQ;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		eecd = E1000_READ_REG(hw, EECD);
-+		while((!(eecd & E1000_EECD_GNT)) &&
-+		      (i < E1000_EEPROM_GRANT_ATTEMPTS)) {
-+			i++;
-+			udelay(5);
-+			eecd = E1000_READ_REG(hw, EECD);
-+		}
-+		if(!(eecd & E1000_EECD_GNT)) {
-+			eecd &= ~E1000_EECD_REQ;
-+			E1000_WRITE_REG(hw, EECD, eecd);
-+			DEBUGOUT("Could not acquire EEPROM grant\n");
-+			return -E1000_ERR_EEPROM;
-+		}
-+	}
-+
-+	/* Setup EEPROM for Read/Write */
-+
-+	if (eeprom->type == e1000_eeprom_microwire) {
-+		/* Clear SK and DI */
-+		eecd &= ~(E1000_EECD_DI | E1000_EECD_SK);
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+
-+		/* Set CS */
-+		eecd |= E1000_EECD_CS;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+	} else if (eeprom->type == e1000_eeprom_spi) {
-+		/* Clear SK and CS */
-+		eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		udelay(1);
-+	}
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Returns EEPROM to a "standby" state
-+ * 
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static void
-+e1000_standby_eeprom(struct e1000_hw *hw)
-+{
-+	struct e1000_eeprom_info *eeprom = &hw->eeprom;
-+	uint32_t eecd;
-+	
-+	eecd = E1000_READ_REG(hw, EECD);
-+
-+	if(eeprom->type == e1000_eeprom_microwire) {
-+
-+		/* Deselect EEPROM */
-+		eecd &= ~(E1000_EECD_CS | E1000_EECD_SK);
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(eeprom->delay_usec);
-+	
-+		/* Clock high */
-+		eecd |= E1000_EECD_SK;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(eeprom->delay_usec);
-+	
-+		/* Select EEPROM */
-+		eecd |= E1000_EECD_CS;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(eeprom->delay_usec);
-+
-+		/* Clock low */
-+		eecd &= ~E1000_EECD_SK;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(eeprom->delay_usec);
-+	} else if(eeprom->type == e1000_eeprom_spi) {
-+		/* Toggle CS to flush commands */
-+		eecd |= E1000_EECD_CS;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(eeprom->delay_usec);
-+		eecd &= ~E1000_EECD_CS;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(eeprom->delay_usec);
-+	}
-+}
-+
-+/******************************************************************************
-+ * Terminates a command by inverting the EEPROM's chip select pin
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static void
-+e1000_release_eeprom(struct e1000_hw *hw)
-+{
-+	uint32_t eecd;
-+
-+	eecd = E1000_READ_REG(hw, EECD);
-+
-+	if (hw->eeprom.type == e1000_eeprom_spi) {
-+		eecd |= E1000_EECD_CS;  /* Pull CS high */
-+		eecd &= ~E1000_EECD_SK; /* Lower SCK */
-+
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+
-+		udelay(hw->eeprom.delay_usec);
-+	} else if(hw->eeprom.type == e1000_eeprom_microwire) {
-+		/* cleanup eeprom */
-+
-+		/* CS on Microwire is active-high */
-+		eecd &= ~(E1000_EECD_CS | E1000_EECD_DI);
-+
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+
-+		/* Rising edge of clock */
-+		eecd |= E1000_EECD_SK;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(hw->eeprom.delay_usec);
-+
-+		/* Falling edge of clock */
-+		eecd &= ~E1000_EECD_SK;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+		E1000_WRITE_FLUSH(hw);
-+		udelay(hw->eeprom.delay_usec);
-+	}
-+
-+	/* Stop requesting EEPROM access */
-+	if(hw->mac_type > e1000_82544) {
-+		eecd &= ~E1000_EECD_REQ;
-+		E1000_WRITE_REG(hw, EECD, eecd);
-+	}
-+}
-+
-+/******************************************************************************
-+ * Reads a 16 bit word from the EEPROM.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static int32_t
-+e1000_spi_eeprom_ready(struct e1000_hw *hw)
-+{
-+	uint16_t retry_count = 0;
-+	uint8_t spi_stat_reg;
-+
-+	/* Read "Status Register" repeatedly until the LSB is cleared.  The
-+	 * EEPROM will signal that the command has been completed by clearing
-+	 * bit 0 of the internal status register.  If it's not cleared within
-+	 * 5 milliseconds, then error out.
-+	 */
-+	retry_count = 0;
-+	do {
-+		e1000_shift_out_ee_bits(hw, EEPROM_RDSR_OPCODE_SPI,
-+		hw->eeprom.opcode_bits);
-+		spi_stat_reg = (uint8_t)e1000_shift_in_ee_bits(hw, 8);
-+		if (!(spi_stat_reg & EEPROM_STATUS_RDY_SPI))
-+			break;
-+
-+		udelay(5);
-+		retry_count += 5;
-+
-+	} while(retry_count < EEPROM_MAX_RETRY_SPI);
-+
-+	/* ATMEL SPI write time could vary from 0-20mSec on 3.3V devices (and
-+	 * only 0-5mSec on 5V devices)
-+	 */
-+	if(retry_count >= EEPROM_MAX_RETRY_SPI) {
-+		DEBUGOUT("SPI EEPROM Status error\n");
-+		return -E1000_ERR_EEPROM;
-+	}
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Reads a 16 bit word from the EEPROM.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ * offset - offset of  word in the EEPROM to read
-+ * data - word read from the EEPROM
-+ * words - number of words to read
-+ *****************************************************************************/
-+static int
-+e1000_read_eeprom(struct e1000_hw *hw,
-+                  uint16_t offset,
-+		  uint16_t words,
-+                  uint16_t *data)
-+{
-+	struct e1000_eeprom_info *eeprom = &hw->eeprom;
-+	uint32_t i = 0;
-+	
-+	DEBUGFUNC("e1000_read_eeprom");
-+
-+	/* A check for invalid values:  offset too large, too many words, and not
-+	 * enough words.
-+	 */
-+	if((offset > eeprom->word_size) || (words > eeprom->word_size - offset) ||
-+	   (words == 0)) {
-+		DEBUGOUT("\"words\" parameter out of bounds\n");
-+		return -E1000_ERR_EEPROM;
-+	}
-+
-+	/*  Prepare the EEPROM for reading  */
-+	if(e1000_acquire_eeprom(hw) != E1000_SUCCESS)
-+		return -E1000_ERR_EEPROM;
-+
-+	if(eeprom->type == e1000_eeprom_spi) {
-+		uint16_t word_in;
-+		uint8_t read_opcode = EEPROM_READ_OPCODE_SPI;
-+
-+		if(e1000_spi_eeprom_ready(hw)) {
-+			e1000_release_eeprom(hw);
-+			return -E1000_ERR_EEPROM;
-+		}
-+
-+		e1000_standby_eeprom(hw);
-+
-+		/* Some SPI eeproms use the 8th address bit embedded in the opcode */
-+		if((eeprom->address_bits == 8) && (offset >= 128))
-+			read_opcode |= EEPROM_A8_OPCODE_SPI;
-+
-+		/* Send the READ command (opcode + addr)  */
-+		e1000_shift_out_ee_bits(hw, read_opcode, eeprom->opcode_bits);
-+		e1000_shift_out_ee_bits(hw, (uint16_t)(offset*2), eeprom->address_bits);
-+
-+		/* Read the data.  The address of the eeprom internally increments with
-+		 * each byte (spi) being read, saving on the overhead of eeprom setup
-+		 * and tear-down.  The address counter will roll over if reading beyond
-+		 * the size of the eeprom, thus allowing the entire memory to be read
-+		 * starting from any offset. */
-+		for (i = 0; i < words; i++) {
-+			word_in = e1000_shift_in_ee_bits(hw, 16);
-+			data[i] = (word_in >> 8) | (word_in << 8);
-+		}
-+	} else if(eeprom->type == e1000_eeprom_microwire) {
-+		for (i = 0; i < words; i++) {
-+			/*  Send the READ command (opcode + addr)  */
-+			e1000_shift_out_ee_bits(hw, EEPROM_READ_OPCODE_MICROWIRE,
-+						eeprom->opcode_bits);
-+			e1000_shift_out_ee_bits(hw, (uint16_t)(offset + i),
-+			                        eeprom->address_bits);
-+
-+			/* Read the data.  For microwire, each word requires the overhead
-+			 * of eeprom setup and tear-down. */
-+			data[i] = e1000_shift_in_ee_bits(hw, 16);
-+			e1000_standby_eeprom(hw);
-+		}
-+	}
-+
-+	/* End this read operation */
-+	e1000_release_eeprom(hw);
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Verifies that the EEPROM has a valid checksum
-+ * 
-+ * hw - Struct containing variables accessed by shared code
-+ *
-+ * Reads the first 64 16 bit words of the EEPROM and sums the values read.
-+ * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is
-+ * valid.
-+ *****************************************************************************/
-+static int
-+e1000_validate_eeprom_checksum(struct e1000_hw *hw)
-+{
-+	uint16_t checksum = 0;
-+	uint16_t i, eeprom_data;
-+
-+	DEBUGFUNC("e1000_validate_eeprom_checksum");
-+
-+	for(i = 0; i < (EEPROM_CHECKSUM_REG + 1); i++) {
-+		if(e1000_read_eeprom(hw, i, 1, &eeprom_data) < 0) {
-+			DEBUGOUT("EEPROM Read Error\n");
-+			return -E1000_ERR_EEPROM;
-+		}
-+		checksum += eeprom_data;
-+	}
-+	
-+	if(checksum == (uint16_t) EEPROM_SUM)
-+		return E1000_SUCCESS;
-+	else {
-+		DEBUGOUT("EEPROM Checksum Invalid\n");    
-+		return -E1000_ERR_EEPROM;
-+	}
-+}
-+
-+/******************************************************************************
-+ * Reads the adapter's MAC address from the EEPROM and inverts the LSB for the
-+ * second function of dual function devices
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static int 
-+e1000_read_mac_addr(struct e1000_hw *hw)
-+{
-+	uint16_t offset;
-+	uint16_t eeprom_data;
-+	int i;
-+
-+	DEBUGFUNC("e1000_read_mac_addr");
-+
-+	for(i = 0; i < NODE_ADDRESS_SIZE; i += 2) {
-+		offset = i >> 1;
-+		if(e1000_read_eeprom(hw, offset, 1, &eeprom_data) < 0) {
-+			DEBUGOUT("EEPROM Read Error\n");
-+			return -E1000_ERR_EEPROM;
-+		}
-+		hw->mac_addr[i] = eeprom_data & 0xff;
-+		hw->mac_addr[i+1] = (eeprom_data >> 8) & 0xff;
-+	}
-+	if(((hw->mac_type == e1000_82546) || (hw->mac_type == e1000_82546_rev_3)) &&
-+		(E1000_READ_REG(hw, STATUS) & E1000_STATUS_FUNC_1))
-+		/* Invert the last bit if this is the second device */
-+		hw->mac_addr[5] ^= 1;
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Initializes receive address filters.
-+ *
-+ * hw - Struct containing variables accessed by shared code 
-+ *
-+ * Places the MAC address in receive address register 0 and clears the rest
-+ * of the receive addresss registers. Clears the multicast table. Assumes
-+ * the receiver is in reset when the routine is called.
-+ *****************************************************************************/
-+static void
-+e1000_init_rx_addrs(struct e1000_hw *hw)
-+{
-+	uint32_t i;
-+	uint32_t addr_low;
-+	uint32_t addr_high;
-+	
-+	DEBUGFUNC("e1000_init_rx_addrs");
-+	
-+	/* Setup the receive address. */
-+	DEBUGOUT("Programming MAC Address into RAR[0]\n");
-+	addr_low = (hw->mac_addr[0] |
-+		(hw->mac_addr[1] << 8) |
-+		(hw->mac_addr[2] << 16) | (hw->mac_addr[3] << 24));
-+	
-+	addr_high = (hw->mac_addr[4] |
-+		(hw->mac_addr[5] << 8) | E1000_RAH_AV);
-+	
-+	E1000_WRITE_REG_ARRAY(hw, RA, 0, addr_low);
-+	E1000_WRITE_REG_ARRAY(hw, RA, 1, addr_high);
-+	
-+	/* Zero out the other 15 receive addresses. */
-+	DEBUGOUT("Clearing RAR[1-15]\n");
-+	for(i = 1; i < E1000_RAR_ENTRIES; i++) {
-+		E1000_WRITE_REG_ARRAY(hw, RA, (i << 1), 0);
-+		E1000_WRITE_REG_ARRAY(hw, RA, ((i << 1) + 1), 0);
-+	}
-+}
-+
-+/******************************************************************************
-+ * Clears the VLAN filer table
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static void
-+e1000_clear_vfta(struct e1000_hw *hw)
-+{
-+	uint32_t offset;
-+    
-+	for(offset = 0; offset < E1000_VLAN_FILTER_TBL_SIZE; offset++)
-+		E1000_WRITE_REG_ARRAY(hw, VFTA, offset, 0);
-+}
-+
-+/******************************************************************************
-+* Writes a value to one of the devices registers using port I/O (as opposed to
-+* memory mapped I/O). Only 82544 and newer devices support port I/O. *
-+* hw - Struct containing variables accessed by shared code
-+* offset - offset to write to * value - value to write
-+*****************************************************************************/
-+void e1000_write_reg_io(struct e1000_hw *hw, uint32_t offset, uint32_t value){
-+	uint32_t io_addr = hw->io_base;
-+	uint32_t io_data = hw->io_base + 4;
-+	e1000_io_write(hw, io_addr, offset);
-+	e1000_io_write(hw, io_data, value);
-+}
-+
-+/******************************************************************************
-+ * Set the phy type member in the hw struct.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static int32_t
-+e1000_set_phy_type(struct e1000_hw *hw)
-+{
-+	DEBUGFUNC("e1000_set_phy_type");
-+
-+	switch(hw->phy_id) {
-+	case M88E1000_E_PHY_ID:
-+	case M88E1000_I_PHY_ID:
-+	case M88E1011_I_PHY_ID:
-+		hw->phy_type = e1000_phy_m88;
-+		break;
-+	case IGP01E1000_I_PHY_ID:
-+		hw->phy_type = e1000_phy_igp;
-+		break;
-+	default:
-+		/* Should never have loaded on this device */
-+		hw->phy_type = e1000_phy_undefined;
-+		return -E1000_ERR_PHY_TYPE;
-+	}
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * IGP phy init script - initializes the GbE PHY
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static void
-+e1000_phy_init_script(struct e1000_hw *hw)
-+{
-+	DEBUGFUNC("e1000_phy_init_script");
-+
-+#if 0
-+	/* See e1000_sw_init() of the Linux driver */
-+	if(hw->phy_init_script) {
-+#else
-+	if((hw->mac_type == e1000_82541) ||
-+	   (hw->mac_type == e1000_82547) ||
-+	   (hw->mac_type == e1000_82541_rev_2) ||
-+	   (hw->mac_type == e1000_82547_rev_2)) {
-+#endif
-+		mdelay(20);
-+
-+		e1000_write_phy_reg(hw,0x0000,0x0140);
-+
-+		mdelay(5);
-+
-+		if(hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547) {
-+			e1000_write_phy_reg(hw, 0x1F95, 0x0001);
-+
-+			e1000_write_phy_reg(hw, 0x1F71, 0xBD21);
-+
-+			e1000_write_phy_reg(hw, 0x1F79, 0x0018);
-+
-+			e1000_write_phy_reg(hw, 0x1F30, 0x1600);
-+
-+			e1000_write_phy_reg(hw, 0x1F31, 0x0014);
-+
-+			e1000_write_phy_reg(hw, 0x1F32, 0x161C);
-+
-+			e1000_write_phy_reg(hw, 0x1F94, 0x0003);
-+
-+			e1000_write_phy_reg(hw, 0x1F96, 0x003F);
-+
-+			e1000_write_phy_reg(hw, 0x2010, 0x0008);
-+		} else {
-+			e1000_write_phy_reg(hw, 0x1F73, 0x0099);
-+		}
-+
-+		e1000_write_phy_reg(hw, 0x0000, 0x3300);
-+
-+
-+		if(hw->mac_type == e1000_82547) {
-+			uint16_t fused, fine, coarse;
-+
-+			/* Move to analog registers page */
-+			e1000_read_phy_reg(hw, IGP01E1000_ANALOG_SPARE_FUSE_STATUS, &fused);
-+
-+			if(!(fused & IGP01E1000_ANALOG_SPARE_FUSE_ENABLED)) {
-+				e1000_read_phy_reg(hw, IGP01E1000_ANALOG_FUSE_STATUS, &fused);
-+
-+				fine = fused & IGP01E1000_ANALOG_FUSE_FINE_MASK;
-+				coarse = fused & IGP01E1000_ANALOG_FUSE_COARSE_MASK;
-+
-+				if(coarse > IGP01E1000_ANALOG_FUSE_COARSE_THRESH) {
-+					coarse -= IGP01E1000_ANALOG_FUSE_COARSE_10;
-+					fine -= IGP01E1000_ANALOG_FUSE_FINE_1;
-+				} else if(coarse == IGP01E1000_ANALOG_FUSE_COARSE_THRESH)
-+					fine -= IGP01E1000_ANALOG_FUSE_FINE_10;
-+
-+				fused = (fused & IGP01E1000_ANALOG_FUSE_POLY_MASK) |
-+					(fine & IGP01E1000_ANALOG_FUSE_FINE_MASK) |
-+					(coarse & IGP01E1000_ANALOG_FUSE_COARSE_MASK);
-+
-+				e1000_write_phy_reg(hw, IGP01E1000_ANALOG_FUSE_CONTROL, fused);
-+				e1000_write_phy_reg(hw, IGP01E1000_ANALOG_FUSE_BYPASS,
-+						IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL);
-+			}
-+		}
-+	}
-+}
-+
-+/******************************************************************************
-+ * Set the mac type member in the hw struct.
-+ * 
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static int
-+e1000_set_mac_type(struct e1000_hw *hw)
-+{
-+	DEBUGFUNC("e1000_set_mac_type");
-+
-+	switch (hw->device_id) {
-+	case E1000_DEV_ID_82542:
-+		switch (hw->revision_id) {
-+		case E1000_82542_2_0_REV_ID:
-+			hw->mac_type = e1000_82542_rev2_0;
-+			break;
-+		case E1000_82542_2_1_REV_ID:
-+			hw->mac_type = e1000_82542_rev2_1;
-+			break;
-+		default:
-+			/* Invalid 82542 revision ID */
-+			return -E1000_ERR_MAC_TYPE;
-+		}
-+		break;
-+	case E1000_DEV_ID_82543GC_FIBER:
-+	case E1000_DEV_ID_82543GC_COPPER:
-+		hw->mac_type = e1000_82543;
-+		break;
-+	case E1000_DEV_ID_82544EI_COPPER:
-+	case E1000_DEV_ID_82544EI_FIBER:
-+	case E1000_DEV_ID_82544GC_COPPER:
-+	case E1000_DEV_ID_82544GC_LOM:
-+		hw->mac_type = e1000_82544;
-+		break;
-+	case E1000_DEV_ID_82540EM:
-+	case E1000_DEV_ID_82540EM_LOM:
-+	case E1000_DEV_ID_82540EP:
-+	case E1000_DEV_ID_82540EP_LOM:
-+	case E1000_DEV_ID_82540EP_LP:
-+		hw->mac_type = e1000_82540;
-+		break;
-+	case E1000_DEV_ID_82545EM_COPPER:
-+	case E1000_DEV_ID_82545EM_FIBER:
-+		hw->mac_type = e1000_82545;
-+		break;
-+	case E1000_DEV_ID_82545GM_COPPER:
-+	case E1000_DEV_ID_82545GM_FIBER:
-+	case E1000_DEV_ID_82545GM_SERDES:
-+		hw->mac_type = e1000_82545_rev_3;
-+		break;
-+	case E1000_DEV_ID_82546EB_COPPER:
-+	case E1000_DEV_ID_82546EB_FIBER:
-+	case E1000_DEV_ID_82546EB_QUAD_COPPER:
-+		hw->mac_type = e1000_82546;
-+		break;
-+	case E1000_DEV_ID_82546GB_COPPER:
-+	case E1000_DEV_ID_82546GB_FIBER:
-+	case E1000_DEV_ID_82546GB_SERDES:
-+		hw->mac_type = e1000_82546_rev_3;
-+		break;
-+	case E1000_DEV_ID_82541EI:
-+	case E1000_DEV_ID_82541EI_MOBILE:
-+		hw->mac_type = e1000_82541;
-+		break;
-+	case E1000_DEV_ID_82541ER:
-+	case E1000_DEV_ID_82541GI:
-+	case E1000_DEV_ID_82541GI_MOBILE:
-+		hw->mac_type = e1000_82541_rev_2;
-+		break;
-+	case E1000_DEV_ID_82547EI:
-+		hw->mac_type = e1000_82547;
-+		break;
-+	case E1000_DEV_ID_82547GI:
-+		hw->mac_type = e1000_82547_rev_2;
-+		break;
-+	default:
-+		/* Should never have loaded on this device */
-+		return -E1000_ERR_MAC_TYPE;
-+	}
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/*****************************************************************************
-+ * Set media type and TBI compatibility.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ * **************************************************************************/
-+static void
-+e1000_set_media_type(struct e1000_hw *hw)
-+{
-+	uint32_t status;
-+
-+	DEBUGFUNC("e1000_set_media_type");
-+	
-+	if(hw->mac_type != e1000_82543) {
-+		/* tbi_compatibility is only valid on 82543 */
-+		hw->tbi_compatibility_en = FALSE;
-+	}
-+
-+	switch (hw->device_id) {
-+		case E1000_DEV_ID_82545GM_SERDES:
-+		case E1000_DEV_ID_82546GB_SERDES:
-+			hw->media_type = e1000_media_type_internal_serdes;
-+			break;
-+		default:
-+			if(hw->mac_type >= e1000_82543) {
-+				status = E1000_READ_REG(hw, STATUS);
-+				if(status & E1000_STATUS_TBIMODE) {
-+					hw->media_type = e1000_media_type_fiber;
-+					/* tbi_compatibility not valid on fiber */
-+					hw->tbi_compatibility_en = FALSE;
-+				} else {
-+					hw->media_type = e1000_media_type_copper;
-+				}
-+			} else {
-+				/* This is an 82542 (fiber only) */
-+				hw->media_type = e1000_media_type_fiber;
-+			}
-+	}
-+}
-+
-+/******************************************************************************
-+ * Reset the transmit and receive units; mask and clear all interrupts.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static void
-+e1000_reset_hw(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl;
-+	uint32_t ctrl_ext;
-+	uint32_t icr;
-+	uint32_t manc;
-+	
-+	DEBUGFUNC("e1000_reset_hw");
-+	
-+	/* For 82542 (rev 2.0), disable MWI before issuing a device reset */
-+	if(hw->mac_type == e1000_82542_rev2_0) {
-+		DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-+		e1000_pci_clear_mwi(hw);
-+	}
-+
-+	/* Clear interrupt mask to stop board from generating interrupts */
-+	DEBUGOUT("Masking off all interrupts\n");
-+	E1000_WRITE_REG(hw, IMC, 0xffffffff);
-+	
-+	/* Disable the Transmit and Receive units.  Then delay to allow
-+	 * any pending transactions to complete before we hit the MAC with
-+	 * the global reset.
-+	 */
-+	E1000_WRITE_REG(hw, RCTL, 0);
-+	E1000_WRITE_REG(hw, TCTL, E1000_TCTL_PSP);
-+	E1000_WRITE_FLUSH(hw);
-+
-+	/* The tbi_compatibility_on Flag must be cleared when Rctl is cleared. */
-+	hw->tbi_compatibility_on = FALSE;
-+
-+	/* Delay to allow any outstanding PCI transactions to complete before
-+	 * resetting the device
-+	 */ 
-+	mdelay(10);
-+
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+
-+	/* Must reset the PHY before resetting the MAC */
-+	if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-+		E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_PHY_RST));
-+		mdelay(5);
-+	}
-+
-+	/* Issue a global reset to the MAC.  This will reset the chip's
-+	 * transmit, receive, DMA, and link units.  It will not effect
-+	 * the current PCI configuration.  The global reset bit is self-
-+	 * clearing, and should clear within a microsecond.
-+	 */
-+	DEBUGOUT("Issuing a global reset to MAC\n");
-+
-+	switch(hw->mac_type) {
-+		case e1000_82544:
-+		case e1000_82540:
-+		case e1000_82545:
-+		case e1000_82546:
-+		case e1000_82541:
-+		case e1000_82541_rev_2:
-+			/* These controllers can't ack the 64-bit write when issuing the
-+			 * reset, so use IO-mapping as a workaround to issue the reset */
-+			E1000_WRITE_REG_IO(hw, CTRL, (ctrl | E1000_CTRL_RST));
-+			break;
-+		case e1000_82545_rev_3:
-+		case e1000_82546_rev_3:
-+			/* Reset is performed on a shadow of the control register */
-+			E1000_WRITE_REG(hw, CTRL_DUP, (ctrl | E1000_CTRL_RST));
-+			break;
-+		default:
-+			E1000_WRITE_REG(hw, CTRL, (ctrl | E1000_CTRL_RST));
-+			break;
-+	}
-+
-+	/* After MAC reset, force reload of EEPROM to restore power-on settings to
-+	 * device.  Later controllers reload the EEPROM automatically, so just wait
-+	 * for reload to complete.
-+	 */
-+	switch(hw->mac_type) {
-+		case e1000_82542_rev2_0:
-+		case e1000_82542_rev2_1:
-+		case e1000_82543:
-+		case e1000_82544:
-+			/* Wait for reset to complete */
-+			udelay(10);
-+			ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
-+			ctrl_ext |= E1000_CTRL_EXT_EE_RST;
-+			E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
-+			E1000_WRITE_FLUSH(hw);
-+			/* Wait for EEPROM reload */
-+			mdelay(2);
-+			break;
-+		case e1000_82541:
-+		case e1000_82541_rev_2:
-+		case e1000_82547:
-+		case e1000_82547_rev_2:
-+			/* Wait for EEPROM reload */
-+			mdelay(20);
-+			break;
-+		default:
-+			/* Wait for EEPROM reload (it happens automatically) */
-+			mdelay(5);
-+			break;
-+	}
-+
-+	/* Disable HW ARPs on ASF enabled adapters */
-+	if(hw->mac_type >= e1000_82540) {
-+		manc = E1000_READ_REG(hw, MANC);
-+		manc &= ~(E1000_MANC_ARP_EN);
-+		E1000_WRITE_REG(hw, MANC, manc);
-+	}
-+
-+	if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-+		e1000_phy_init_script(hw);
-+	}
-+
-+	/* Clear interrupt mask to stop board from generating interrupts */
-+	DEBUGOUT("Masking off all interrupts\n");
-+	E1000_WRITE_REG(hw, IMC, 0xffffffff);
-+	
-+	/* Clear any pending interrupt events. */
-+	icr = E1000_READ_REG(hw, ICR);
-+
-+	/* If MWI was previously enabled, reenable it. */
-+	if(hw->mac_type == e1000_82542_rev2_0) {
-+#ifdef LINUX_DRIVER
-+		if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
-+#endif
-+			e1000_pci_set_mwi(hw);
-+	}
-+}
-+
-+/******************************************************************************
-+ * Performs basic configuration of the adapter.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ * 
-+ * Assumes that the controller has previously been reset and is in a 
-+ * post-reset uninitialized state. Initializes the receive address registers,
-+ * multicast table, and VLAN filter table. Calls routines to setup link
-+ * configuration and flow control settings. Clears all on-chip counters. Leaves
-+ * the transmit and receive units disabled and uninitialized.
-+ *****************************************************************************/
-+static int
-+e1000_init_hw(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl, status;
-+	uint32_t i;
-+	int32_t ret_val;
-+	uint16_t pcix_cmd_word;
-+	uint16_t pcix_stat_hi_word;
-+	uint16_t cmd_mmrbc;
-+	uint16_t stat_mmrbc;
-+	e1000_bus_type bus_type = e1000_bus_type_unknown;
-+
-+	DEBUGFUNC("e1000_init_hw");
-+
-+	/* Set the media type and TBI compatibility */
-+	e1000_set_media_type(hw);
-+
-+	/* Disabling VLAN filtering. */
-+	DEBUGOUT("Initializing the IEEE VLAN\n");
-+	E1000_WRITE_REG(hw, VET, 0);
-+	
-+	e1000_clear_vfta(hw);
-+	
-+	/* For 82542 (rev 2.0), disable MWI and put the receiver into reset */
-+	if(hw->mac_type == e1000_82542_rev2_0) {
-+		DEBUGOUT("Disabling MWI on 82542 rev 2.0\n");
-+		e1000_pci_clear_mwi(hw);
-+		E1000_WRITE_REG(hw, RCTL, E1000_RCTL_RST);
-+		E1000_WRITE_FLUSH(hw);
-+		mdelay(5);
-+	}
-+	
-+	/* Setup the receive address. This involves initializing all of the Receive
-+	 * Address Registers (RARs 0 - 15).
-+	 */
-+	e1000_init_rx_addrs(hw);
-+	
-+	/* For 82542 (rev 2.0), take the receiver out of reset and enable MWI */
-+	if(hw->mac_type == e1000_82542_rev2_0) {
-+		E1000_WRITE_REG(hw, RCTL, 0);
-+		E1000_WRITE_FLUSH(hw);
-+		mdelay(1);
-+#ifdef LINUX_DRIVER
-+		if(hw->pci_cmd_word & CMD_MEM_WRT_INVALIDATE)
-+#endif
-+			e1000_pci_set_mwi(hw);
-+	}
-+	
-+	/* Zero out the Multicast HASH table */
-+	DEBUGOUT("Zeroing the MTA\n");
-+	for(i = 0; i < E1000_MC_TBL_SIZE; i++)
-+		E1000_WRITE_REG_ARRAY(hw, MTA, i, 0);
-+	
-+#if 0
-+	/* Set the PCI priority bit correctly in the CTRL register.  This
-+	 * determines if the adapter gives priority to receives, or if it
-+	 * gives equal priority to transmits and receives.
-+	 */
-+	if(hw->dma_fairness) {
-+		ctrl = E1000_READ_REG(hw, CTRL);
-+		E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PRIOR);
-+	}
-+#endif
-+
-+	switch(hw->mac_type) {
-+		case e1000_82545_rev_3:
-+		case e1000_82546_rev_3:
-+			break;
-+		default:
-+			if (hw->mac_type >= e1000_82543) {
-+				/* See e1000_get_bus_info() of the Linux driver */
-+				status = E1000_READ_REG(hw, STATUS);
-+				bus_type = (status & E1000_STATUS_PCIX_MODE) ?
-+					e1000_bus_type_pcix : e1000_bus_type_pci;
-+			}
-+
-+			/* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */
-+			if(bus_type == e1000_bus_type_pcix) {
-+				pci_read_config_word(hw->pdev, PCIX_COMMAND_REGISTER, &pcix_cmd_word);
-+				pci_read_config_word(hw->pdev, PCIX_STATUS_REGISTER_HI, &pcix_stat_hi_word);
-+				cmd_mmrbc = (pcix_cmd_word & PCIX_COMMAND_MMRBC_MASK) >>
-+					PCIX_COMMAND_MMRBC_SHIFT;
-+				stat_mmrbc = (pcix_stat_hi_word & PCIX_STATUS_HI_MMRBC_MASK) >>
-+					PCIX_STATUS_HI_MMRBC_SHIFT;
-+				if(stat_mmrbc == PCIX_STATUS_HI_MMRBC_4K)
-+					stat_mmrbc = PCIX_STATUS_HI_MMRBC_2K;
-+				if(cmd_mmrbc > stat_mmrbc) {
-+					pcix_cmd_word &= ~PCIX_COMMAND_MMRBC_MASK;
-+					pcix_cmd_word |= stat_mmrbc << PCIX_COMMAND_MMRBC_SHIFT;
-+					pci_write_config_word(hw->pdev, PCIX_COMMAND_REGISTER, pcix_cmd_word);
-+				}
-+			}
-+			break;
-+	}
-+
-+	/* Call a subroutine to configure the link and setup flow control. */
-+	ret_val = e1000_setup_link(hw);
-+	
-+	/* Set the transmit descriptor write-back policy */
-+	if(hw->mac_type > e1000_82544) {
-+		ctrl = E1000_READ_REG(hw, TXDCTL);
-+		ctrl = (ctrl & ~E1000_TXDCTL_WTHRESH) | E1000_TXDCTL_FULL_TX_DESC_WB;
-+		E1000_WRITE_REG(hw, TXDCTL, ctrl);
-+	}
-+
-+#if 0
-+	/* Clear all of the statistics registers (clear on read).  It is
-+	 * important that we do this after we have tried to establish link
-+	 * because the symbol error count will increment wildly if there
-+	 * is no link.
-+	 */
-+	e1000_clear_hw_cntrs(hw);
-+#endif
-+
-+	return ret_val;
-+}
-+
-+/******************************************************************************
-+ * Adjust SERDES output amplitude based on EEPROM setting.
-+ *
-+ * hw - Struct containing variables accessed by shared code.
-+ *****************************************************************************/
-+static int32_t
-+e1000_adjust_serdes_amplitude(struct e1000_hw *hw)
-+{
-+	uint16_t eeprom_data;
-+	int32_t  ret_val;
-+
-+	DEBUGFUNC("e1000_adjust_serdes_amplitude");
-+
-+	if(hw->media_type != e1000_media_type_internal_serdes)
-+		return E1000_SUCCESS;
-+
-+	switch(hw->mac_type) {
-+		case e1000_82545_rev_3:
-+		case e1000_82546_rev_3:
-+			break;
-+		default:
-+			return E1000_SUCCESS;
-+	}
-+
-+	if ((ret_val = e1000_read_eeprom(hw, EEPROM_SERDES_AMPLITUDE, 1,
-+					&eeprom_data))) {
-+		return ret_val;
-+	}
-+
-+	if(eeprom_data != EEPROM_RESERVED_WORD) {
-+		/* Adjust SERDES output amplitude only. */
-+		eeprom_data &= EEPROM_SERDES_AMPLITUDE_MASK;
-+		if((ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_EXT_CTRL,
-+		                                  eeprom_data)))
-+			return ret_val;
-+	}
-+
-+	return E1000_SUCCESS;
-+}
-+								   
-+/******************************************************************************
-+ * Configures flow control and link settings.
-+ * 
-+ * hw - Struct containing variables accessed by shared code
-+ * 
-+ * Determines which flow control settings to use. Calls the apropriate media-
-+ * specific link configuration function. Configures the flow control settings.
-+ * Assuming the adapter has a valid link partner, a valid link should be
-+ * established. Assumes the hardware has previously been reset and the 
-+ * transmitter and receiver are not enabled.
-+ *****************************************************************************/
-+static int
-+e1000_setup_link(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl_ext;
-+	int32_t ret_val;
-+	uint16_t eeprom_data;
-+
-+	DEBUGFUNC("e1000_setup_link");
-+	
-+	/* Read and store word 0x0F of the EEPROM. This word contains bits
-+	 * that determine the hardware's default PAUSE (flow control) mode,
-+	 * a bit that determines whether the HW defaults to enabling or
-+	 * disabling auto-negotiation, and the direction of the
-+	 * SW defined pins. If there is no SW over-ride of the flow
-+	 * control setting, then the variable hw->fc will
-+	 * be initialized based on a value in the EEPROM.
-+	 */
-+	if(e1000_read_eeprom(hw, EEPROM_INIT_CONTROL2_REG, 1, &eeprom_data) < 0) {
-+		DEBUGOUT("EEPROM Read Error\n");
-+		return -E1000_ERR_EEPROM;
-+	}
-+	
-+	if(hw->fc == e1000_fc_default) {
-+		if((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 0)
-+			hw->fc = e1000_fc_none;
-+		else if((eeprom_data & EEPROM_WORD0F_PAUSE_MASK) == 
-+			EEPROM_WORD0F_ASM_DIR)
-+			hw->fc = e1000_fc_tx_pause;
-+		else
-+			hw->fc = e1000_fc_full;
-+	}
-+	
-+	/* We want to save off the original Flow Control configuration just
-+	 * in case we get disconnected and then reconnected into a different
-+	 * hub or switch with different Flow Control capabilities.
-+	 */
-+	if(hw->mac_type == e1000_82542_rev2_0)
-+		hw->fc &= (~e1000_fc_tx_pause);
-+
-+#if 0
-+	/* See e1000_sw_init() of the Linux driver */
-+	if((hw->mac_type < e1000_82543) && (hw->report_tx_early == 1))
-+#else
-+	if((hw->mac_type < e1000_82543) && (hw->mac_type >= e1000_82543))
-+#endif
-+		hw->fc &= (~e1000_fc_rx_pause);
-+	
-+#if 0
-+	hw->original_fc = hw->fc;
-+#endif
-+
-+	DEBUGOUT1("After fix-ups FlowControl is now = %x\n", hw->fc);
-+	
-+	/* Take the 4 bits from EEPROM word 0x0F that determine the initial
-+	 * polarity value for the SW controlled pins, and setup the
-+	 * Extended Device Control reg with that info.
-+	 * This is needed because one of the SW controlled pins is used for
-+	 * signal detection.  So this should be done before e1000_setup_pcs_link()
-+	 * or e1000_phy_setup() is called.
-+	 */
-+	if(hw->mac_type == e1000_82543) {
-+		ctrl_ext = ((eeprom_data & EEPROM_WORD0F_SWPDIO_EXT) << 
-+			SWDPIO__EXT_SHIFT);
-+		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
-+	}
-+	
-+	/* Call the necessary subroutine to configure the link. */
-+	ret_val = (hw->media_type == e1000_media_type_copper) ?
-+		e1000_setup_copper_link(hw) :
-+		e1000_setup_fiber_serdes_link(hw);
-+	if (ret_val < 0) {
-+		return ret_val;
-+	}
-+	
-+	/* Initialize the flow control address, type, and PAUSE timer
-+	 * registers to their default values.  This is done even if flow
-+	 * control is disabled, because it does not hurt anything to
-+	 * initialize these registers.
-+	 */
-+	DEBUGOUT("Initializing the Flow Control address, type and timer regs\n");
-+	
-+	E1000_WRITE_REG(hw, FCAL, FLOW_CONTROL_ADDRESS_LOW);
-+	E1000_WRITE_REG(hw, FCAH, FLOW_CONTROL_ADDRESS_HIGH);
-+	E1000_WRITE_REG(hw, FCT, FLOW_CONTROL_TYPE);
-+#if 0
-+	E1000_WRITE_REG(hw, FCTTV, hw->fc_pause_time);
-+#else
-+	E1000_WRITE_REG(hw, FCTTV, FC_DEFAULT_TX_TIMER);
-+#endif
-+	
-+	/* Set the flow control receive threshold registers.  Normally,
-+	 * these registers will be set to a default threshold that may be
-+	 * adjusted later by the driver's runtime code.  However, if the
-+	 * ability to transmit pause frames in not enabled, then these
-+	 * registers will be set to 0. 
-+	 */
-+	if(!(hw->fc & e1000_fc_tx_pause)) {
-+		E1000_WRITE_REG(hw, FCRTL, 0);
-+		E1000_WRITE_REG(hw, FCRTH, 0);
-+	} else {
-+		/* We need to set up the Receive Threshold high and low water marks
-+		 * as well as (optionally) enabling the transmission of XON frames.
-+		 */
-+#if 0
-+		if(hw->fc_send_xon) {
-+			E1000_WRITE_REG(hw, FCRTL, (hw->fc_low_water | E1000_FCRTL_XONE));
-+			E1000_WRITE_REG(hw, FCRTH, hw->fc_high_water);
-+		} else {
-+			E1000_WRITE_REG(hw, FCRTL, hw->fc_low_water);
-+			E1000_WRITE_REG(hw, FCRTH, hw->fc_high_water);
-+		}
-+#else
-+		E1000_WRITE_REG(hw, FCRTL, (FC_DEFAULT_LO_THRESH | E1000_FCRTL_XONE));
-+		E1000_WRITE_REG(hw, FCRTH, FC_DEFAULT_HI_THRESH);
-+#endif
-+	}
-+	return ret_val;
-+}
-+
-+/******************************************************************************
-+ * Sets up link for a fiber based or serdes based adapter
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *
-+ * Manipulates Physical Coding Sublayer functions in order to configure
-+ * link. Assumes the hardware has been previously reset and the transmitter
-+ * and receiver are not enabled.
-+ *****************************************************************************/
-+static int
-+e1000_setup_fiber_serdes_link(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl;
-+	uint32_t status;
-+	uint32_t txcw = 0;
-+	uint32_t i;
-+	uint32_t signal = 0;
-+	int32_t ret_val;
-+
-+	DEBUGFUNC("e1000_setup_fiber_serdes_link");
-+
-+	/* On adapters with a MAC newer than 82544, SW Defineable pin 1 will be 
-+	 * set when the optics detect a signal. On older adapters, it will be 
-+	 * cleared when there is a signal.  This applies to fiber media only.
-+	 * If we're on serdes media, adjust the output amplitude to value set in
-+	 * the EEPROM.
-+	 */
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	if(hw->media_type == e1000_media_type_fiber)
-+		signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
-+
-+	if((ret_val = e1000_adjust_serdes_amplitude(hw)))
-+		return ret_val;
-+
-+	/* Take the link out of reset */
-+	ctrl &= ~(E1000_CTRL_LRST);
-+
-+#if 0
-+	/* Adjust VCO speed to improve BER performance */
-+	if((ret_val = e1000_set_vco_speed(hw)))
-+		return ret_val;
-+#endif
-+
-+	e1000_config_collision_dist(hw);
-+	
-+	/* Check for a software override of the flow control settings, and setup
-+	 * the device accordingly.  If auto-negotiation is enabled, then software
-+	 * will have to set the "PAUSE" bits to the correct value in the Tranmsit
-+	 * Config Word Register (TXCW) and re-start auto-negotiation.  However, if
-+	 * auto-negotiation is disabled, then software will have to manually 
-+	 * configure the two flow control enable bits in the CTRL register.
-+	 *
-+	 * The possible values of the "fc" parameter are:
-+	 *      0:  Flow control is completely disabled
-+	 *      1:  Rx flow control is enabled (we can receive pause frames, but 
-+	 *          not send pause frames).
-+	 *      2:  Tx flow control is enabled (we can send pause frames but we do
-+	 *          not support receiving pause frames).
-+	 *      3:  Both Rx and TX flow control (symmetric) are enabled.
-+	 */
-+	switch (hw->fc) {
-+	case e1000_fc_none:
-+		/* Flow control is completely disabled by a software over-ride. */
-+		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD);
-+		break;
-+	case e1000_fc_rx_pause:
-+		/* RX Flow control is enabled and TX Flow control is disabled by a 
-+		 * software over-ride. Since there really isn't a way to advertise 
-+		 * that we are capable of RX Pause ONLY, we will advertise that we
-+		 * support both symmetric and asymmetric RX PAUSE. Later, we will
-+		 *  disable the adapter's ability to send PAUSE frames.
-+		 */
-+		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-+		break;
-+	case e1000_fc_tx_pause:
-+		/* TX Flow control is enabled, and RX Flow control is disabled, by a 
-+		 * software over-ride.
-+		 */
-+		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_ASM_DIR);
-+		break;
-+	case e1000_fc_full:
-+		/* Flow control (both RX and TX) is enabled by a software over-ride. */
-+		txcw = (E1000_TXCW_ANE | E1000_TXCW_FD | E1000_TXCW_PAUSE_MASK);
-+		break;
-+	default:
-+		DEBUGOUT("Flow control param set incorrectly\n");
-+		return -E1000_ERR_CONFIG;
-+		break;
-+	}
-+	
-+	/* Since auto-negotiation is enabled, take the link out of reset (the link
-+	 * will be in reset, because we previously reset the chip). This will
-+	 * restart auto-negotiation.  If auto-neogtiation is successful then the
-+	 * link-up status bit will be set and the flow control enable bits (RFCE
-+	 * and TFCE) will be set according to their negotiated value.
-+	 */
-+	DEBUGOUT("Auto-negotiation enabled\n");
-+	
-+	E1000_WRITE_REG(hw, TXCW, txcw);
-+	E1000_WRITE_REG(hw, CTRL, ctrl);
-+	E1000_WRITE_FLUSH(hw);
-+	
-+	hw->txcw = txcw;
-+	mdelay(1);
-+	
-+	/* If we have a signal (the cable is plugged in) then poll for a "Link-Up"
-+	 * indication in the Device Status Register.  Time-out if a link isn't 
-+	 * seen in 500 milliseconds seconds (Auto-negotiation should complete in 
-+	 * less than 500 milliseconds even if the other end is doing it in SW).
-+	 * For internal serdes, we just assume a signal is present, then poll.
-+	 */
-+	if(hw->media_type == e1000_media_type_internal_serdes ||
-+	   (E1000_READ_REG(hw, CTRL) & E1000_CTRL_SWDPIN1) == signal) {
-+		DEBUGOUT("Looking for Link\n");
-+		for(i = 0; i < (LINK_UP_TIMEOUT / 10); i++) {
-+			mdelay(10);
-+			status = E1000_READ_REG(hw, STATUS);
-+			if(status & E1000_STATUS_LU) break;
-+		}
-+		if(i == (LINK_UP_TIMEOUT / 10)) {
-+			DEBUGOUT("Never got a valid link from auto-neg!!!\n");
-+			hw->autoneg_failed = 1;
-+			/* AutoNeg failed to achieve a link, so we'll call 
-+			 * e1000_check_for_link. This routine will force the link up if
-+			 * we detect a signal. This will allow us to communicate with
-+			 * non-autonegotiating link partners.
-+			 */
-+			if((ret_val = e1000_check_for_link(hw))) {
-+				DEBUGOUT("Error while checking for link\n");
-+				return ret_val;
-+			}
-+			hw->autoneg_failed = 0;
-+		} else {
-+			hw->autoneg_failed = 0;
-+			DEBUGOUT("Valid Link Found\n");
-+		}
-+	} else {
-+		DEBUGOUT("No Signal Detected\n");
-+	}
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+* Detects which PHY is present and the speed and duplex
-+*
-+* hw - Struct containing variables accessed by shared code
-+******************************************************************************/
-+static int
-+e1000_setup_copper_link(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl;
-+	int32_t ret_val;
-+	uint16_t i;
-+	uint16_t phy_data;
-+	
-+	DEBUGFUNC("e1000_setup_copper_link");
-+	
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	/* With 82543, we need to force speed and duplex on the MAC equal to what
-+	 * the PHY speed and duplex configuration is. In addition, we need to
-+	 * perform a hardware reset on the PHY to take it out of reset.
-+	 */
-+	if(hw->mac_type > e1000_82543) {
-+		ctrl |= E1000_CTRL_SLU;
-+		ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-+		E1000_WRITE_REG(hw, CTRL, ctrl);
-+	} else {
-+		ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX | E1000_CTRL_SLU);
-+		E1000_WRITE_REG(hw, CTRL, ctrl);
-+		e1000_phy_hw_reset(hw);
-+	}
-+	
-+	/* Make sure we have a valid PHY */
-+	if((ret_val = e1000_detect_gig_phy(hw))) {
-+		DEBUGOUT("Error, did not detect valid phy.\n");
-+		return ret_val;
-+	}
-+	DEBUGOUT1("Phy ID = %x \n", hw->phy_id);
-+
-+	if(hw->mac_type <= e1000_82543 ||
-+	   hw->mac_type == e1000_82541 || hw->mac_type == e1000_82547 ||
-+#if 0
-+	   hw->mac_type == e1000_82541_rev_2 || hw->mac_type == e1000_82547_rev_2)
-+		hw->phy_reset_disable = FALSE;
-+
-+	if(!hw->phy_reset_disable) {
-+#else
-+	   hw->mac_type == e1000_82541_rev_2 || hw->mac_type == e1000_82547_rev_2) {
-+#endif
-+	if (hw->phy_type == e1000_phy_igp) {
-+
-+		if((ret_val = e1000_phy_reset(hw))) {
-+			DEBUGOUT("Error Resetting the PHY\n");
-+			return ret_val;
-+		}
-+
-+		/* Wait 10ms for MAC to configure PHY from eeprom settings */
-+		mdelay(15);
-+
-+#if 0
-+		/* disable lplu d3 during driver init */
-+		if((ret_val = e1000_set_d3_lplu_state(hw, FALSE))) {
-+			DEBUGOUT("Error Disabling LPLU D3\n");
-+			return ret_val;
-+		}
-+
-+		/* Configure mdi-mdix settings */
-+		if((ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL,
-+		                                 &phy_data)))
-+			return ret_val;
-+
-+		if((hw->mac_type == e1000_82541) || (hw->mac_type == e1000_82547)) {
-+			hw->dsp_config_state = e1000_dsp_config_disabled;
-+			/* Force MDI for IGP B-0 PHY */
-+			phy_data &= ~(IGP01E1000_PSCR_AUTO_MDIX |
-+			              IGP01E1000_PSCR_FORCE_MDI_MDIX);
-+			hw->mdix = 1;
-+
-+		} else {
-+			hw->dsp_config_state = e1000_dsp_config_enabled;
-+			phy_data &= ~IGP01E1000_PSCR_AUTO_MDIX;
-+
-+			switch (hw->mdix) {
-+			case 1:
-+				phy_data &= ~IGP01E1000_PSCR_FORCE_MDI_MDIX;
-+				break;
-+			case 2:
-+				phy_data |= IGP01E1000_PSCR_FORCE_MDI_MDIX;
-+				break;
-+			case 0:
-+			default:
-+				phy_data |= IGP01E1000_PSCR_AUTO_MDIX;
-+				break;
-+			}
-+		}
-+		if((ret_val = e1000_write_phy_reg(hw, IGP01E1000_PHY_PORT_CTRL,
-+		                                  phy_data)))
-+			return ret_val;
-+
-+		/* set auto-master slave resolution settings */
-+		e1000_ms_type phy_ms_setting = hw->master_slave;
-+
-+		if(hw->ffe_config_state == e1000_ffe_config_active)
-+			hw->ffe_config_state = e1000_ffe_config_enabled;
-+
-+		if(hw->dsp_config_state == e1000_dsp_config_activated)
-+			hw->dsp_config_state = e1000_dsp_config_enabled;
-+#endif
-+
-+		/* when autonegotiation advertisment is only 1000Mbps then we
-+		 * should disable SmartSpeed and enable Auto MasterSlave
-+		 * resolution as hardware default. */
-+		if(hw->autoneg_advertised == ADVERTISE_1000_FULL) {
-+			/* Disable SmartSpeed */
-+			if((ret_val = e1000_read_phy_reg(hw,
-+			                                 IGP01E1000_PHY_PORT_CONFIG,
-+			                                 &phy_data)))
-+				return ret_val;
-+			phy_data &= ~IGP01E1000_PSCFR_SMART_SPEED;
-+			if((ret_val = e1000_write_phy_reg(hw,
-+			                                  IGP01E1000_PHY_PORT_CONFIG,
-+			                                  phy_data)))
-+				return ret_val;
-+			/* Set auto Master/Slave resolution process */
-+			if((ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL,
-+			                                 &phy_data)))
-+				return ret_val;
-+			phy_data &= ~CR_1000T_MS_ENABLE;
-+			if((ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,
-+			                                  phy_data)))
-+				return ret_val;
-+		}
-+
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL,
-+		                                 &phy_data)))
-+			return ret_val;
-+
-+#if 0
-+		/* load defaults for future use */
-+		hw->original_master_slave = (phy_data & CR_1000T_MS_ENABLE) ?
-+		                            ((phy_data & CR_1000T_MS_VALUE) ?
-+		                             e1000_ms_force_master :
-+		                             e1000_ms_force_slave) :
-+		                             e1000_ms_auto;
-+
-+		switch (phy_ms_setting) {
-+		case e1000_ms_force_master:
-+			phy_data |= (CR_1000T_MS_ENABLE | CR_1000T_MS_VALUE);
-+			break;
-+		case e1000_ms_force_slave:
-+			phy_data |= CR_1000T_MS_ENABLE;
-+			phy_data &= ~(CR_1000T_MS_VALUE);
-+			break;
-+		case e1000_ms_auto:
-+			phy_data &= ~CR_1000T_MS_ENABLE;
-+		default:
-+			break;
-+		}
-+#endif
-+
-+		if((ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL,
-+		                                  phy_data)))
-+			return ret_val;
-+	} else {
-+		/* Enable CRS on TX. This must be set for half-duplex operation. */
-+		if((ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_CTRL,
-+		                                 &phy_data)))
-+			return ret_val;
-+
-+		phy_data |= M88E1000_PSCR_ASSERT_CRS_ON_TX;
-+
-+		/* Options:
-+		 *   MDI/MDI-X = 0 (default)
-+		 *   0 - Auto for all speeds
-+		 *   1 - MDI mode
-+		 *   2 - MDI-X mode
-+		 *   3 - Auto for 1000Base-T only (MDI-X for 10/100Base-T modes)
-+		 */
-+#if 0
-+		phy_data &= ~M88E1000_PSCR_AUTO_X_MODE;
-+
-+		switch (hw->mdix) {
-+		case 1:
-+			phy_data |= M88E1000_PSCR_MDI_MANUAL_MODE;
-+			break;
-+		case 2:
-+			phy_data |= M88E1000_PSCR_MDIX_MANUAL_MODE;
-+			break;
-+		case 3:
-+			phy_data |= M88E1000_PSCR_AUTO_X_1000T;
-+			break;
-+		case 0:
-+		default:
-+#endif
-+			phy_data |= M88E1000_PSCR_AUTO_X_MODE;
-+#if 0
-+			break;
-+		}
-+#endif
-+
-+		/* Options:
-+		 *   disable_polarity_correction = 0 (default)
-+		 *       Automatic Correction for Reversed Cable Polarity
-+		 *   0 - Disabled
-+		 *   1 - Enabled
-+		 */
-+		phy_data &= ~M88E1000_PSCR_POLARITY_REVERSAL;
-+		if((ret_val = e1000_write_phy_reg(hw, M88E1000_PHY_SPEC_CTRL,
-+		                                  phy_data)))
-+			return ret_val;
-+
-+		/* Force TX_CLK in the Extended PHY Specific Control Register
-+		 * to 25MHz clock.
-+		 */
-+		if((ret_val = e1000_read_phy_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL,
-+		                                 &phy_data)))
-+			return ret_val;
-+
-+		phy_data |= M88E1000_EPSCR_TX_CLK_25;
-+
-+#ifdef LINUX_DRIVER
-+		if (hw->phy_revision < M88E1011_I_REV_4) {
-+#endif
-+			/* Configure Master and Slave downshift values */
-+			phy_data &= ~(M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK |
-+				M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK);
-+			phy_data |= (M88E1000_EPSCR_MASTER_DOWNSHIFT_1X |
-+				M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X);
-+			if((ret_val = e1000_write_phy_reg(hw,
-+			                                  M88E1000_EXT_PHY_SPEC_CTRL,
-+			                                  phy_data)))
-+				return ret_val;
-+		}
-+	
-+		/* SW Reset the PHY so all changes take effect */
-+		if((ret_val = e1000_phy_reset(hw))) {
-+			DEBUGOUT("Error Resetting the PHY\n");
-+			return ret_val;
-+#ifdef LINUX_DRIVER
-+		}
-+#endif
-+	}
-+	
-+	/* Options:
-+	 *   autoneg = 1 (default)
-+	 *      PHY will advertise value(s) parsed from
-+	 *      autoneg_advertised and fc
-+	 *   autoneg = 0
-+	 *      PHY will be set to 10H, 10F, 100H, or 100F
-+	 *      depending on value parsed from forced_speed_duplex.
-+	 */
-+	
-+	/* Is autoneg enabled?  This is enabled by default or by software
-+	 * override.  If so, call e1000_phy_setup_autoneg routine to parse the
-+	 * autoneg_advertised and fc options. If autoneg is NOT enabled, then
-+	 * the user should have provided a speed/duplex override.  If so, then
-+	 * call e1000_phy_force_speed_duplex to parse and set this up.
-+	 */
-+	/* Perform some bounds checking on the hw->autoneg_advertised
-+	 * parameter.  If this variable is zero, then set it to the default.
-+	 */
-+	hw->autoneg_advertised &= AUTONEG_ADVERTISE_SPEED_DEFAULT;
-+	
-+	/* If autoneg_advertised is zero, we assume it was not defaulted
-+	 * by the calling code so we set to advertise full capability.
-+	 */
-+	if(hw->autoneg_advertised == 0)
-+		hw->autoneg_advertised = AUTONEG_ADVERTISE_SPEED_DEFAULT;
-+	
-+	DEBUGOUT("Reconfiguring auto-neg advertisement params\n");
-+	if((ret_val = e1000_phy_setup_autoneg(hw))) {
-+		DEBUGOUT("Error Setting up Auto-Negotiation\n");
-+		return ret_val;
-+	}
-+	DEBUGOUT("Restarting Auto-Neg\n");
-+	
-+	/* Restart auto-negotiation by setting the Auto Neg Enable bit and
-+	 * the Auto Neg Restart bit in the PHY control register.
-+	 */
-+	if((ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data)))
-+		return ret_val;
-+
-+	phy_data |= (MII_CR_AUTO_NEG_EN | MII_CR_RESTART_AUTO_NEG);
-+	if((ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data)))
-+		return ret_val;
-+
-+#if 0	
-+	/* Does the user want to wait for Auto-Neg to complete here, or
-+	 * check at a later time (for example, callback routine).
-+	 */
-+	if(hw->wait_autoneg_complete) {
-+		if((ret_val = e1000_wait_autoneg(hw))) {
-+			DEBUGOUT("Error while waiting for autoneg to complete\n");
-+			return ret_val;
-+		}
-+	}
-+#else
-+	/* If we do not wait for autonegotiation to complete I 
-+	 * do not see a valid link status.
-+	 */
-+	if((ret_val = e1000_wait_autoneg(hw))) {
-+		DEBUGOUT("Error while waiting for autoneg to complete\n");
-+		return ret_val;
-+	}
-+#endif
-+	} /* !hw->phy_reset_disable */
-+	
-+	/* Check link status. Wait up to 100 microseconds for link to become
-+	 * valid.
-+	 */
-+	for(i = 0; i < 10; i++) {
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
-+			return ret_val;
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
-+			return ret_val;
-+
-+		if(phy_data & MII_SR_LINK_STATUS) {
-+			/* We have link, so we need to finish the config process:
-+			 *   1) Set up the MAC to the current PHY speed/duplex
-+			 *      if we are on 82543.  If we
-+			 *      are on newer silicon, we only need to configure
-+			 *      collision distance in the Transmit Control Register.
-+			 *   2) Set up flow control on the MAC to that established with
-+			 *      the link partner.
-+			 */
-+			if(hw->mac_type >= e1000_82544) {
-+				e1000_config_collision_dist(hw);
-+			} else {
-+				if((ret_val = e1000_config_mac_to_phy(hw))) {
-+					DEBUGOUT("Error configuring MAC to PHY settings\n");
-+					return ret_val;
-+				}
-+			}
-+			if((ret_val = e1000_config_fc_after_link_up(hw))) {
-+				DEBUGOUT("Error Configuring Flow Control\n");
-+				return ret_val;
-+			}
-+#if 0
-+			if(hw->phy_type == e1000_phy_igp) {
-+				if((ret_val = e1000_config_dsp_after_link_change(hw, TRUE))) {
-+					DEBUGOUT("Error Configuring DSP after link up\n");
-+					return ret_val;
-+				}
-+			}
-+#endif
-+			DEBUGOUT("Valid link established!!!\n");
-+			return E1000_SUCCESS;
-+		}
-+		udelay(10);
-+	}
-+	
-+	DEBUGOUT("Unable to establish link!!!\n");
-+	return -E1000_ERR_NOLINK;
-+}
-+
-+/******************************************************************************
-+* Configures PHY autoneg and flow control advertisement settings
-+*
-+* hw - Struct containing variables accessed by shared code
-+******************************************************************************/
-+static int
-+e1000_phy_setup_autoneg(struct e1000_hw *hw)
-+{
-+	int32_t ret_val;
-+	uint16_t mii_autoneg_adv_reg;
-+	uint16_t mii_1000t_ctrl_reg;
-+
-+	DEBUGFUNC("e1000_phy_setup_autoneg");
-+	
-+	/* Read the MII Auto-Neg Advertisement Register (Address 4). */
-+	if((ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
-+	                                 &mii_autoneg_adv_reg)))
-+		return ret_val;
-+
-+	/* Read the MII 1000Base-T Control Register (Address 9). */
-+	if((ret_val = e1000_read_phy_reg(hw, PHY_1000T_CTRL, &mii_1000t_ctrl_reg)))
-+		return ret_val;
-+
-+	/* Need to parse both autoneg_advertised and fc and set up
-+	 * the appropriate PHY registers.  First we will parse for
-+	 * autoneg_advertised software override.  Since we can advertise
-+	 * a plethora of combinations, we need to check each bit
-+	 * individually.
-+	 */
-+	
-+	/* First we clear all the 10/100 mb speed bits in the Auto-Neg
-+	 * Advertisement Register (Address 4) and the 1000 mb speed bits in
-+	 * the  1000Base-T Control Register (Address 9).
-+	 */
-+	mii_autoneg_adv_reg &= ~REG4_SPEED_MASK;
-+	mii_1000t_ctrl_reg &= ~REG9_SPEED_MASK;
-+
-+	DEBUGOUT1("autoneg_advertised %x\n", hw->autoneg_advertised);
-+
-+	/* Do we want to advertise 10 Mb Half Duplex? */
-+	if(hw->autoneg_advertised & ADVERTISE_10_HALF) {
-+		DEBUGOUT("Advertise 10mb Half duplex\n");
-+		mii_autoneg_adv_reg |= NWAY_AR_10T_HD_CAPS;
-+	}
-+
-+	/* Do we want to advertise 10 Mb Full Duplex? */
-+	if(hw->autoneg_advertised & ADVERTISE_10_FULL) {
-+		DEBUGOUT("Advertise 10mb Full duplex\n");
-+		mii_autoneg_adv_reg |= NWAY_AR_10T_FD_CAPS;
-+	}
-+
-+	/* Do we want to advertise 100 Mb Half Duplex? */
-+	if(hw->autoneg_advertised & ADVERTISE_100_HALF) {
-+		DEBUGOUT("Advertise 100mb Half duplex\n");
-+		mii_autoneg_adv_reg |= NWAY_AR_100TX_HD_CAPS;
-+	}
-+
-+	/* Do we want to advertise 100 Mb Full Duplex? */
-+	if(hw->autoneg_advertised & ADVERTISE_100_FULL) {
-+		DEBUGOUT("Advertise 100mb Full duplex\n");
-+		mii_autoneg_adv_reg |= NWAY_AR_100TX_FD_CAPS;
-+	}
-+
-+	/* We do not allow the Phy to advertise 1000 Mb Half Duplex */
-+	if(hw->autoneg_advertised & ADVERTISE_1000_HALF) {
-+		DEBUGOUT("Advertise 1000mb Half duplex requested, request denied!\n");
-+	}
-+
-+	/* Do we want to advertise 1000 Mb Full Duplex? */
-+	if(hw->autoneg_advertised & ADVERTISE_1000_FULL) {
-+		DEBUGOUT("Advertise 1000mb Full duplex\n");
-+		mii_1000t_ctrl_reg |= CR_1000T_FD_CAPS;
-+	}
-+
-+	/* Check for a software override of the flow control settings, and
-+	 * setup the PHY advertisement registers accordingly.  If
-+	 * auto-negotiation is enabled, then software will have to set the
-+	 * "PAUSE" bits to the correct value in the Auto-Negotiation
-+	 * Advertisement Register (PHY_AUTONEG_ADV) and re-start auto-negotiation.
-+	 *
-+	 * The possible values of the "fc" parameter are:
-+	 *      0:  Flow control is completely disabled
-+	 *      1:  Rx flow control is enabled (we can receive pause frames
-+	 *          but not send pause frames).
-+	 *      2:  Tx flow control is enabled (we can send pause frames
-+	 *          but we do not support receiving pause frames).
-+	 *      3:  Both Rx and TX flow control (symmetric) are enabled.
-+	 *  other:  No software override.  The flow control configuration
-+	 *          in the EEPROM is used.
-+	 */
-+	switch (hw->fc) {
-+	case e1000_fc_none: /* 0 */
-+		/* Flow control (RX & TX) is completely disabled by a
-+		 * software over-ride.
-+		 */
-+		mii_autoneg_adv_reg &= ~(NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-+		break;
-+	case e1000_fc_rx_pause: /* 1 */
-+		/* RX Flow control is enabled, and TX Flow control is
-+		 * disabled, by a software over-ride.
-+		 */
-+		/* Since there really isn't a way to advertise that we are
-+		 * capable of RX Pause ONLY, we will advertise that we
-+		 * support both symmetric and asymmetric RX PAUSE.  Later
-+		 * (in e1000_config_fc_after_link_up) we will disable the
-+		 *hw's ability to send PAUSE frames.
-+		 */
-+		mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-+		break;
-+	case e1000_fc_tx_pause: /* 2 */
-+		/* TX Flow control is enabled, and RX Flow control is
-+		 * disabled, by a software over-ride.
-+		 */
-+		mii_autoneg_adv_reg |= NWAY_AR_ASM_DIR;
-+		mii_autoneg_adv_reg &= ~NWAY_AR_PAUSE;
-+		break;
-+	case e1000_fc_full: /* 3 */
-+		/* Flow control (both RX and TX) is enabled by a software
-+		 * over-ride.
-+		 */
-+		mii_autoneg_adv_reg |= (NWAY_AR_ASM_DIR | NWAY_AR_PAUSE);
-+		break;
-+	default:
-+		DEBUGOUT("Flow control param set incorrectly\n");
-+		return -E1000_ERR_CONFIG;
-+	}
-+
-+	if((ret_val = e1000_write_phy_reg(hw, PHY_AUTONEG_ADV,
-+	                       mii_autoneg_adv_reg)))
-+		return ret_val;
-+
-+	DEBUGOUT1("Auto-Neg Advertising %x\n", mii_autoneg_adv_reg);
-+
-+	if((ret_val = e1000_write_phy_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg)))
-+		return ret_val;
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+* Sets the collision distance in the Transmit Control register
-+*
-+* hw - Struct containing variables accessed by shared code
-+*
-+* Link should have been established previously. Reads the speed and duplex
-+* information from the Device Status register.
-+******************************************************************************/
-+static void
-+e1000_config_collision_dist(struct e1000_hw *hw)
-+{
-+	uint32_t tctl;
-+
-+	tctl = E1000_READ_REG(hw, TCTL);
-+	
-+	tctl &= ~E1000_TCTL_COLD;
-+	tctl |= E1000_COLLISION_DISTANCE << E1000_COLD_SHIFT;
-+	
-+	E1000_WRITE_REG(hw, TCTL, tctl);
-+	E1000_WRITE_FLUSH(hw);
-+}
-+
-+/******************************************************************************
-+* Sets MAC speed and duplex settings to reflect the those in the PHY
-+*
-+* hw - Struct containing variables accessed by shared code
-+* mii_reg - data to write to the MII control register
-+*
-+* The contents of the PHY register containing the needed information need to
-+* be passed in.
-+******************************************************************************/
-+static int
-+e1000_config_mac_to_phy(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl;
-+	int32_t ret_val;
-+	uint16_t phy_data;
-+
-+	DEBUGFUNC("e1000_config_mac_to_phy");
-+
-+	/* Read the Device Control Register and set the bits to Force Speed
-+	 * and Duplex.
-+	 */
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	ctrl |= (E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
-+	ctrl &= ~(E1000_CTRL_SPD_SEL | E1000_CTRL_ILOS);
-+
-+	/* Set up duplex in the Device Control and Transmit Control
-+	 * registers depending on negotiated values.
-+	 */
-+	if (hw->phy_type == e1000_phy_igp) {
-+		if((ret_val = e1000_read_phy_reg(hw, IGP01E1000_PHY_PORT_STATUS,
-+		                                 &phy_data)))
-+			return ret_val;
-+
-+		if(phy_data & IGP01E1000_PSSR_FULL_DUPLEX) ctrl |= E1000_CTRL_FD;
-+		else ctrl &= ~E1000_CTRL_FD;
-+
-+		e1000_config_collision_dist(hw);
-+
-+		/* Set up speed in the Device Control register depending on
-+		 * negotiated values.
-+		 */
-+		if((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
-+		   IGP01E1000_PSSR_SPEED_1000MBPS)
-+			ctrl |= E1000_CTRL_SPD_1000;
-+		else if((phy_data & IGP01E1000_PSSR_SPEED_MASK) ==
-+			IGP01E1000_PSSR_SPEED_100MBPS)
-+			ctrl |= E1000_CTRL_SPD_100;
-+	} else {
-+		if((ret_val = e1000_read_phy_reg(hw, M88E1000_PHY_SPEC_STATUS,
-+		                                 &phy_data)))
-+			return ret_val;
-+		
-+		if(phy_data & M88E1000_PSSR_DPLX) ctrl |= E1000_CTRL_FD;
-+		else ctrl &= ~E1000_CTRL_FD;
-+
-+		e1000_config_collision_dist(hw);
-+
-+		/* Set up speed in the Device Control register depending on
-+		 * negotiated values.
-+		 */
-+		if((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_1000MBS)
-+			ctrl |= E1000_CTRL_SPD_1000;
-+		else if((phy_data & M88E1000_PSSR_SPEED) == M88E1000_PSSR_100MBS)
-+			ctrl |= E1000_CTRL_SPD_100;
-+	}
-+	/* Write the configured values back to the Device Control Reg. */
-+	E1000_WRITE_REG(hw, CTRL, ctrl);
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Forces the MAC's flow control settings.
-+ * 
-+ * hw - Struct containing variables accessed by shared code
-+ *
-+ * Sets the TFCE and RFCE bits in the device control register to reflect
-+ * the adapter settings. TFCE and RFCE need to be explicitly set by
-+ * software when a Copper PHY is used because autonegotiation is managed
-+ * by the PHY rather than the MAC. Software must also configure these
-+ * bits when link is forced on a fiber connection.
-+ *****************************************************************************/
-+static int
-+e1000_force_mac_fc(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl;
-+	
-+	DEBUGFUNC("e1000_force_mac_fc");
-+	
-+	/* Get the current configuration of the Device Control Register */
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	
-+	/* Because we didn't get link via the internal auto-negotiation
-+	 * mechanism (we either forced link or we got link via PHY
-+	 * auto-neg), we have to manually enable/disable transmit an
-+	 * receive flow control.
-+	 *
-+	 * The "Case" statement below enables/disable flow control
-+	 * according to the "hw->fc" parameter.
-+	 *
-+	 * The possible values of the "fc" parameter are:
-+	 *      0:  Flow control is completely disabled
-+	 *      1:  Rx flow control is enabled (we can receive pause
-+	 *          frames but not send pause frames).
-+	 *      2:  Tx flow control is enabled (we can send pause frames
-+	 *          frames but we do not receive pause frames).
-+	 *      3:  Both Rx and TX flow control (symmetric) is enabled.
-+	 *  other:  No other values should be possible at this point.
-+	 */
-+	
-+	switch (hw->fc) {
-+	case e1000_fc_none:
-+		ctrl &= (~(E1000_CTRL_TFCE | E1000_CTRL_RFCE));
-+		break;
-+	case e1000_fc_rx_pause:
-+		ctrl &= (~E1000_CTRL_TFCE);
-+		ctrl |= E1000_CTRL_RFCE;
-+		break;
-+	case e1000_fc_tx_pause:
-+		ctrl &= (~E1000_CTRL_RFCE);
-+		ctrl |= E1000_CTRL_TFCE;
-+		break;
-+	case e1000_fc_full:
-+		ctrl |= (E1000_CTRL_TFCE | E1000_CTRL_RFCE);
-+		break;
-+	default:
-+		DEBUGOUT("Flow control param set incorrectly\n");
-+		return -E1000_ERR_CONFIG;
-+	}
-+	
-+	/* Disable TX Flow Control for 82542 (rev 2.0) */
-+	if(hw->mac_type == e1000_82542_rev2_0)
-+		ctrl &= (~E1000_CTRL_TFCE);
-+	
-+	E1000_WRITE_REG(hw, CTRL, ctrl);
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Configures flow control settings after link is established
-+ * 
-+ * hw - Struct containing variables accessed by shared code
-+ *
-+ * Should be called immediately after a valid link has been established.
-+ * Forces MAC flow control settings if link was forced. When in MII/GMII mode
-+ * and autonegotiation is enabled, the MAC flow control settings will be set
-+ * based on the flow control negotiated by the PHY. In TBI mode, the TFCE
-+ * and RFCE bits will be automaticaly set to the negotiated flow control mode.
-+ *****************************************************************************/
-+static int
-+e1000_config_fc_after_link_up(struct e1000_hw *hw)
-+{
-+	int32_t ret_val;
-+	uint16_t mii_status_reg;
-+	uint16_t mii_nway_adv_reg;
-+	uint16_t mii_nway_lp_ability_reg;
-+	uint16_t speed;
-+	uint16_t duplex;
-+	
-+	DEBUGFUNC("e1000_config_fc_after_link_up");
-+	
-+	/* Check for the case where we have fiber media and auto-neg failed
-+	 * so we had to force link.  In this case, we need to force the
-+	 * configuration of the MAC to match the "fc" parameter.
-+	 */
-+	if(((hw->media_type == e1000_media_type_fiber) && (hw->autoneg_failed)) ||
-+	   ((hw->media_type == e1000_media_type_internal_serdes) && (hw->autoneg_failed))) { 
-+		if((ret_val = e1000_force_mac_fc(hw))) {
-+			DEBUGOUT("Error forcing flow control settings\n");
-+			return ret_val;
-+		}
-+	}
-+	
-+	/* Check for the case where we have copper media and auto-neg is
-+	 * enabled.  In this case, we need to check and see if Auto-Neg
-+	 * has completed, and if so, how the PHY and link partner has
-+	 * flow control configured.
-+	 */
-+	if(hw->media_type == e1000_media_type_copper) {
-+		/* Read the MII Status Register and check to see if AutoNeg
-+		 * has completed.  We read this twice because this reg has
-+		 * some "sticky" (latched) bits.
-+		 */
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg)))
-+			return ret_val;
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &mii_status_reg)))
-+			return ret_val;
-+		
-+		if(mii_status_reg & MII_SR_AUTONEG_COMPLETE) {
-+			/* The AutoNeg process has completed, so we now need to
-+			 * read both the Auto Negotiation Advertisement Register
-+			 * (Address 4) and the Auto_Negotiation Base Page Ability
-+			 * Register (Address 5) to determine how flow control was
-+			 * negotiated.
-+			 */
-+			if((ret_val = e1000_read_phy_reg(hw, PHY_AUTONEG_ADV,
-+			                                 &mii_nway_adv_reg)))
-+				return ret_val;
-+			if((ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
-+			                                 &mii_nway_lp_ability_reg)))
-+				return ret_val;
-+
-+			/* Two bits in the Auto Negotiation Advertisement Register
-+			 * (Address 4) and two bits in the Auto Negotiation Base
-+			 * Page Ability Register (Address 5) determine flow control
-+			 * for both the PHY and the link partner.  The following
-+			 * table, taken out of the IEEE 802.3ab/D6.0 dated March 25,
-+			 * 1999, describes these PAUSE resolution bits and how flow
-+			 * control is determined based upon these settings.
-+			 * NOTE:  DC = Don't Care
-+			 *
-+			 *   LOCAL DEVICE  |   LINK PARTNER
-+			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | NIC Resolution
-+			 *-------|---------|-------|---------|--------------------
-+			 *   0   |    0    |  DC   |   DC    | e1000_fc_none
-+			 *   0   |    1    |   0   |   DC    | e1000_fc_none
-+			 *   0   |    1    |   1   |    0    | e1000_fc_none
-+			 *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-+			 *   1   |    0    |   0   |   DC    | e1000_fc_none
-+			 *   1   |   DC    |   1   |   DC    | e1000_fc_full
-+			 *   1   |    1    |   0   |    0    | e1000_fc_none
-+			 *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-+			 *
-+			 */
-+			/* Are both PAUSE bits set to 1?  If so, this implies
-+			 * Symmetric Flow Control is enabled at both ends.  The
-+			 * ASM_DIR bits are irrelevant per the spec.
-+			 *
-+			 * For Symmetric Flow Control:
-+			 *
-+			 *   LOCAL DEVICE  |   LINK PARTNER
-+			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-+			 *-------|---------|-------|---------|--------------------
-+			 *   1   |   DC    |   1   |   DC    | e1000_fc_full
-+			 *
-+			 */
-+			if((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-+				(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE)) {
-+				/* Now we need to check if the user selected RX ONLY
-+				 * of pause frames.  In this case, we had to advertise
-+				 * FULL flow control because we could not advertise RX
-+				 * ONLY. Hence, we must now check to see if we need to
-+				 * turn OFF  the TRANSMISSION of PAUSE frames.
-+				 */
-+#if 0
-+				if(hw->original_fc == e1000_fc_full) {
-+					hw->fc = e1000_fc_full;
-+#else
-+				if(hw->fc == e1000_fc_full) {
-+#endif
-+					DEBUGOUT("Flow Control = FULL.\r\n");
-+				} else {
-+					hw->fc = e1000_fc_rx_pause;
-+					DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
-+				}
-+			}
-+			/* For receiving PAUSE frames ONLY.
-+			 *
-+			 *   LOCAL DEVICE  |   LINK PARTNER
-+			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-+			 *-------|---------|-------|---------|--------------------
-+			 *   0   |    1    |   1   |    1    | e1000_fc_tx_pause
-+			 *
-+			 */
-+			else if(!(mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-+				(mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-+				(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-+				(mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-+				hw->fc = e1000_fc_tx_pause;
-+				DEBUGOUT("Flow Control = TX PAUSE frames only.\r\n");
-+			}
-+			/* For transmitting PAUSE frames ONLY.
-+			 *
-+			 *   LOCAL DEVICE  |   LINK PARTNER
-+			 * PAUSE | ASM_DIR | PAUSE | ASM_DIR | Result
-+			 *-------|---------|-------|---------|--------------------
-+			 *   1   |    1    |   0   |    1    | e1000_fc_rx_pause
-+			 *
-+			 */
-+			else if((mii_nway_adv_reg & NWAY_AR_PAUSE) &&
-+				(mii_nway_adv_reg & NWAY_AR_ASM_DIR) &&
-+				!(mii_nway_lp_ability_reg & NWAY_LPAR_PAUSE) &&
-+				(mii_nway_lp_ability_reg & NWAY_LPAR_ASM_DIR)) {
-+				hw->fc = e1000_fc_rx_pause;
-+				DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
-+			}
-+			/* Per the IEEE spec, at this point flow control should be
-+			 * disabled.  However, we want to consider that we could
-+			 * be connected to a legacy switch that doesn't advertise
-+			 * desired flow control, but can be forced on the link
-+			 * partner.  So if we advertised no flow control, that is
-+			 * what we will resolve to.  If we advertised some kind of
-+			 * receive capability (Rx Pause Only or Full Flow Control)
-+			 * and the link partner advertised none, we will configure
-+			 * ourselves to enable Rx Flow Control only.  We can do
-+			 * this safely for two reasons:  If the link partner really
-+			 * didn't want flow control enabled, and we enable Rx, no
-+			 * harm done since we won't be receiving any PAUSE frames
-+			 * anyway.  If the intent on the link partner was to have
-+			 * flow control enabled, then by us enabling RX only, we
-+			 * can at least receive pause frames and process them.
-+			 * This is a good idea because in most cases, since we are
-+			 * predominantly a server NIC, more times than not we will
-+			 * be asked to delay transmission of packets than asking
-+			 * our link partner to pause transmission of frames.
-+			 */
-+#if 0
-+			else if(hw->original_fc == e1000_fc_none ||
-+				hw->original_fc == e1000_fc_tx_pause) {
-+#else
-+			else if(hw->fc == e1000_fc_none)
-+				DEBUGOUT("Flow Control = NONE.\r\n");
-+			else if(hw->fc == e1000_fc_tx_pause) {
-+#endif
-+				hw->fc = e1000_fc_none;
-+				DEBUGOUT("Flow Control = NONE.\r\n");
-+			} else {
-+				hw->fc = e1000_fc_rx_pause;
-+				DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n");
-+			}
-+			
-+			/* Now we need to do one last check...  If we auto-
-+			 * negotiated to HALF DUPLEX, flow control should not be
-+			 * enabled per IEEE 802.3 spec.
-+			 */
-+			e1000_get_speed_and_duplex(hw, &speed, &duplex);
-+			
-+			if(duplex == HALF_DUPLEX)
-+				hw->fc = e1000_fc_none;
-+			
-+			/* Now we call a subroutine to actually force the MAC
-+			 * controller to use the correct flow control settings.
-+			 */
-+			if((ret_val = e1000_force_mac_fc(hw))) {
-+				DEBUGOUT("Error forcing flow control settings\n");
-+				return ret_val;
-+			}
-+		} else {
-+			DEBUGOUT("Copper PHY and Auto Neg has not completed.\r\n");
-+		}
-+	}
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Checks to see if the link status of the hardware has changed.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *
-+ * Called by any function that needs to check the link status of the adapter.
-+ *****************************************************************************/
-+static int
-+e1000_check_for_link(struct e1000_hw *hw)
-+{
-+	uint32_t rxcw;
-+	uint32_t ctrl;
-+	uint32_t status;
-+	uint32_t rctl;
-+	uint32_t signal = 0;
-+	int32_t ret_val;
-+	uint16_t phy_data;
-+	uint16_t lp_capability;
-+	
-+	DEBUGFUNC("e1000_check_for_link");
-+	
-+	/* On adapters with a MAC newer than 82544, SW Defineable pin 1 will be 
-+	 * set when the optics detect a signal. On older adapters, it will be 
-+	 * cleared when there is a signal.  This applies to fiber media only.
-+	 */
-+	if(hw->media_type == e1000_media_type_fiber)
-+		signal = (hw->mac_type > e1000_82544) ? E1000_CTRL_SWDPIN1 : 0;
-+
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	status = E1000_READ_REG(hw, STATUS);
-+	rxcw = E1000_READ_REG(hw, RXCW);
-+	
-+	/* If we have a copper PHY then we only want to go out to the PHY
-+	 * registers to see if Auto-Neg has completed and/or if our link
-+	 * status has changed.  The get_link_status flag will be set if we
-+	 * receive a Link Status Change interrupt or we have Rx Sequence
-+	 * Errors.
-+	 */
-+#if 0
-+	if((hw->media_type == e1000_media_type_copper) && hw->get_link_status) {
-+#else
-+	if(hw->media_type == e1000_media_type_copper) {
-+#endif
-+		/* First we want to see if the MII Status Register reports
-+		 * link.  If so, then we want to get the current speed/duplex
-+		 * of the PHY.
-+		 * Read the register twice since the link bit is sticky.
-+		 */
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
-+			return ret_val;
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
-+			return ret_val;
-+		
-+		if(phy_data & MII_SR_LINK_STATUS) {
-+#if 0
-+			hw->get_link_status = FALSE;
-+#endif
-+		} else {
-+			/* No link detected */
-+			return -E1000_ERR_NOLINK;
-+		}
-+
-+		/* We have a M88E1000 PHY and Auto-Neg is enabled.  If we
-+		 * have Si on board that is 82544 or newer, Auto
-+		 * Speed Detection takes care of MAC speed/duplex
-+		 * configuration.  So we only need to configure Collision
-+		 * Distance in the MAC.  Otherwise, we need to force
-+		 * speed/duplex on the MAC to the current PHY speed/duplex
-+		 * settings.
-+		 */
-+		if(hw->mac_type >= e1000_82544)
-+			e1000_config_collision_dist(hw);
-+		else {
-+			if((ret_val = e1000_config_mac_to_phy(hw))) {
-+				DEBUGOUT("Error configuring MAC to PHY settings\n");
-+				return ret_val;
-+			}
-+		}
-+		
-+		/* Configure Flow Control now that Auto-Neg has completed. First, we 
-+		 * need to restore the desired flow control settings because we may
-+		 * have had to re-autoneg with a different link partner.
-+		 */
-+		if((ret_val = e1000_config_fc_after_link_up(hw))) {
-+			DEBUGOUT("Error configuring flow control\n");
-+			return ret_val;
-+		}
-+		
-+		/* At this point we know that we are on copper and we have
-+		 * auto-negotiated link.  These are conditions for checking the link
-+		 * parter capability register.  We use the link partner capability to
-+		 * determine if TBI Compatibility needs to be turned on or off.  If
-+		 * the link partner advertises any speed in addition to Gigabit, then
-+		 * we assume that they are GMII-based, and TBI compatibility is not
-+		 * needed. If no other speeds are advertised, we assume the link
-+		 * partner is TBI-based, and we turn on TBI Compatibility.
-+		 */
-+		if(hw->tbi_compatibility_en) {
-+			if((ret_val = e1000_read_phy_reg(hw, PHY_LP_ABILITY,
-+			                                 &lp_capability)))
-+				return ret_val;
-+			if(lp_capability & (NWAY_LPAR_10T_HD_CAPS |
-+                                NWAY_LPAR_10T_FD_CAPS |
-+                                NWAY_LPAR_100TX_HD_CAPS |
-+                                NWAY_LPAR_100TX_FD_CAPS |
-+                                NWAY_LPAR_100T4_CAPS)) {
-+				/* If our link partner advertises anything in addition to 
-+				 * gigabit, we do not need to enable TBI compatibility.
-+				 */
-+				if(hw->tbi_compatibility_on) {
-+					/* If we previously were in the mode, turn it off. */
-+					rctl = E1000_READ_REG(hw, RCTL);
-+					rctl &= ~E1000_RCTL_SBP;
-+					E1000_WRITE_REG(hw, RCTL, rctl);
-+					hw->tbi_compatibility_on = FALSE;
-+				}
-+			} else {
-+				/* If TBI compatibility is was previously off, turn it on. For
-+				 * compatibility with a TBI link partner, we will store bad
-+				 * packets. Some frames have an additional byte on the end and
-+				 * will look like CRC errors to to the hardware.
-+				 */
-+				if(!hw->tbi_compatibility_on) {
-+					hw->tbi_compatibility_on = TRUE;
-+					rctl = E1000_READ_REG(hw, RCTL);
-+					rctl |= E1000_RCTL_SBP;
-+					E1000_WRITE_REG(hw, RCTL, rctl);
-+				}
-+			}
-+		}
-+	}
-+	/* If we don't have link (auto-negotiation failed or link partner cannot
-+	 * auto-negotiate), the cable is plugged in (we have signal), and our
-+	 * link partner is not trying to auto-negotiate with us (we are receiving
-+	 * idles or data), we need to force link up. We also need to give
-+	 * auto-negotiation time to complete, in case the cable was just plugged
-+	 * in. The autoneg_failed flag does this.
-+	 */
-+	else if((((hw->media_type == e1000_media_type_fiber) &&
-+	        ((ctrl & E1000_CTRL_SWDPIN1) == signal)) ||
-+	        (hw->media_type == e1000_media_type_internal_serdes)) &&
-+		(!(status & E1000_STATUS_LU)) &&
-+		(!(rxcw & E1000_RXCW_C))) {
-+		if(hw->autoneg_failed == 0) {
-+			hw->autoneg_failed = 1;
-+			return 0;
-+		}
-+		DEBUGOUT("NOT RXing /C/, disable AutoNeg and force link.\r\n");
-+		
-+		/* Disable auto-negotiation in the TXCW register */
-+		E1000_WRITE_REG(hw, TXCW, (hw->txcw & ~E1000_TXCW_ANE));
-+		
-+		/* Force link-up and also force full-duplex. */
-+		ctrl = E1000_READ_REG(hw, CTRL);
-+		ctrl |= (E1000_CTRL_SLU | E1000_CTRL_FD);
-+		E1000_WRITE_REG(hw, CTRL, ctrl);
-+		
-+		/* Configure Flow Control after forcing link up. */
-+		if((ret_val = e1000_config_fc_after_link_up(hw))) {
-+			DEBUGOUT("Error configuring flow control\n");
-+			return ret_val;
-+		}
-+	}
-+	/* If we are forcing link and we are receiving /C/ ordered sets, re-enable
-+	 * auto-negotiation in the TXCW register and disable forced link in the
-+	 * Device Control register in an attempt to auto-negotiate with our link
-+	 * partner.
-+	 */
-+	else if(((hw->media_type == e1000_media_type_fiber)  ||
-+	         (hw->media_type == e1000_media_type_internal_serdes)) &&
-+		(ctrl & E1000_CTRL_SLU) &&
-+		(rxcw & E1000_RXCW_C)) {
-+		DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\r\n");
-+		E1000_WRITE_REG(hw, TXCW, hw->txcw);
-+		E1000_WRITE_REG(hw, CTRL, (ctrl & ~E1000_CTRL_SLU));
-+	}
-+#if 0
-+	/* If we force link for non-auto-negotiation switch, check link status
-+	 * based on MAC synchronization for internal serdes media type.
-+	 */
-+	else if((hw->media_type == e1000_media_type_internal_serdes) &&
-+			!(E1000_TXCW_ANE & E1000_READ_REG(hw, TXCW))) {
-+		/* SYNCH bit and IV bit are sticky. */
-+		udelay(10);
-+		if(E1000_RXCW_SYNCH & E1000_READ_REG(hw, RXCW)) {
-+			if(!(rxcw & E1000_RXCW_IV)) {
-+				hw->serdes_link_down = FALSE;
-+				DEBUGOUT("SERDES: Link is up.\n");
-+			}
-+		} else {
-+			hw->serdes_link_down = TRUE;
-+			DEBUGOUT("SERDES: Link is down.\n");
-+		}
-+	}
-+#endif
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+ * Detects the current speed and duplex settings of the hardware.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ * speed - Speed of the connection
-+ * duplex - Duplex setting of the connection
-+ *****************************************************************************/
-+static void 
-+e1000_get_speed_and_duplex(struct e1000_hw *hw,
-+                           uint16_t *speed,
-+                           uint16_t *duplex)
-+{
-+	uint32_t status;
-+	
-+	DEBUGFUNC("e1000_get_speed_and_duplex");
-+	
-+	if(hw->mac_type >= e1000_82543) {
-+		status = E1000_READ_REG(hw, STATUS);
-+		if(status & E1000_STATUS_SPEED_1000) {
-+			*speed = SPEED_1000;
-+			DEBUGOUT("1000 Mbs, ");
-+		} else if(status & E1000_STATUS_SPEED_100) {
-+			*speed = SPEED_100;
-+			DEBUGOUT("100 Mbs, ");
-+		} else {
-+			*speed = SPEED_10;
-+			DEBUGOUT("10 Mbs, ");
-+		}
-+		
-+		if(status & E1000_STATUS_FD) {
-+			*duplex = FULL_DUPLEX;
-+			DEBUGOUT("Full Duplex\r\n");
-+		} else {
-+			*duplex = HALF_DUPLEX;
-+			DEBUGOUT(" Half Duplex\r\n");
-+		}
-+	} else {
-+		DEBUGOUT("1000 Mbs, Full Duplex\r\n");
-+		*speed = SPEED_1000;
-+		*duplex = FULL_DUPLEX;
-+	}
-+}
-+
-+/******************************************************************************
-+* Blocks until autoneg completes or times out (~4.5 seconds)
-+*
-+* hw - Struct containing variables accessed by shared code
-+******************************************************************************/
-+static int
-+e1000_wait_autoneg(struct e1000_hw *hw)
-+{
-+	int32_t ret_val;
-+	uint16_t i;
-+	uint16_t phy_data;
-+	
-+	DEBUGFUNC("e1000_wait_autoneg");
-+	DEBUGOUT("Waiting for Auto-Neg to complete.\n");
-+	
-+	/* We will wait for autoneg to complete or 4.5 seconds to expire. */
-+	for(i = PHY_AUTO_NEG_TIME; i > 0; i--) {
-+		/* Read the MII Status Register and wait for Auto-Neg
-+		 * Complete bit to be set.
-+		 */
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
-+			return ret_val;
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_STATUS, &phy_data)))
-+			return ret_val;
-+		if(phy_data & MII_SR_AUTONEG_COMPLETE) {
-+			DEBUGOUT("Auto-Neg complete.\n");
-+			return E1000_SUCCESS;
-+		}
-+		mdelay(100);
-+	}
-+	DEBUGOUT("Auto-Neg timedout.\n");
-+	return -E1000_ERR_TIMEOUT;
-+}
-+
-+/******************************************************************************
-+* Raises the Management Data Clock
-+*
-+* hw - Struct containing variables accessed by shared code
-+* ctrl - Device control register's current value
-+******************************************************************************/
-+static void
-+e1000_raise_mdi_clk(struct e1000_hw *hw,
-+                    uint32_t *ctrl)
-+{
-+	/* Raise the clock input to the Management Data Clock (by setting the MDC
-+	 * bit), and then delay 10 microseconds.
-+	 */
-+	E1000_WRITE_REG(hw, CTRL, (*ctrl | E1000_CTRL_MDC));
-+	E1000_WRITE_FLUSH(hw);
-+	udelay(10);
-+}
-+
-+/******************************************************************************
-+* Lowers the Management Data Clock
-+*
-+* hw - Struct containing variables accessed by shared code
-+* ctrl - Device control register's current value
-+******************************************************************************/
-+static void
-+e1000_lower_mdi_clk(struct e1000_hw *hw,
-+                    uint32_t *ctrl)
-+{
-+	/* Lower the clock input to the Management Data Clock (by clearing the MDC
-+	 * bit), and then delay 10 microseconds.
-+	 */
-+	E1000_WRITE_REG(hw, CTRL, (*ctrl & ~E1000_CTRL_MDC));
-+	E1000_WRITE_FLUSH(hw);
-+	udelay(10);
-+}
-+
-+/******************************************************************************
-+* Shifts data bits out to the PHY
-+*
-+* hw - Struct containing variables accessed by shared code
-+* data - Data to send out to the PHY
-+* count - Number of bits to shift out
-+*
-+* Bits are shifted out in MSB to LSB order.
-+******************************************************************************/
-+static void
-+e1000_shift_out_mdi_bits(struct e1000_hw *hw,
-+                         uint32_t data,
-+                         uint16_t count)
-+{
-+	uint32_t ctrl;
-+	uint32_t mask;
-+
-+	/* We need to shift "count" number of bits out to the PHY. So, the value
-+	 * in the "data" parameter will be shifted out to the PHY one bit at a 
-+	 * time. In order to do this, "data" must be broken down into bits.
-+	 */
-+	mask = 0x01;
-+	mask <<= (count - 1);
-+	
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	
-+	/* Set MDIO_DIR and MDC_DIR direction bits to be used as output pins. */
-+	ctrl |= (E1000_CTRL_MDIO_DIR | E1000_CTRL_MDC_DIR);
-+	
-+	while(mask) {
-+		/* A "1" is shifted out to the PHY by setting the MDIO bit to "1" and
-+		 * then raising and lowering the Management Data Clock. A "0" is
-+		 * shifted out to the PHY by setting the MDIO bit to "0" and then
-+		 * raising and lowering the clock.
-+		 */
-+		if(data & mask) ctrl |= E1000_CTRL_MDIO;
-+		else ctrl &= ~E1000_CTRL_MDIO;
-+		
-+		E1000_WRITE_REG(hw, CTRL, ctrl);
-+		E1000_WRITE_FLUSH(hw);
-+		
-+		udelay(10);
-+
-+		e1000_raise_mdi_clk(hw, &ctrl);
-+		e1000_lower_mdi_clk(hw, &ctrl);
-+
-+		mask = mask >> 1;
-+	}
-+}
-+
-+/******************************************************************************
-+* Shifts data bits in from the PHY
-+*
-+* hw - Struct containing variables accessed by shared code
-+*
-+* Bits are shifted in in MSB to LSB order. 
-+******************************************************************************/
-+static uint16_t
-+e1000_shift_in_mdi_bits(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl;
-+	uint16_t data = 0;
-+	uint8_t i;
-+
-+	/* In order to read a register from the PHY, we need to shift in a total
-+	 * of 18 bits from the PHY. The first two bit (turnaround) times are used
-+	 * to avoid contention on the MDIO pin when a read operation is performed.
-+	 * These two bits are ignored by us and thrown away. Bits are "shifted in"
-+	 * by raising the input to the Management Data Clock (setting the MDC bit),
-+	 * and then reading the value of the MDIO bit.
-+	 */ 
-+	ctrl = E1000_READ_REG(hw, CTRL);
-+	
-+	/* Clear MDIO_DIR (SWDPIO1) to indicate this bit is to be used as input. */
-+	ctrl &= ~E1000_CTRL_MDIO_DIR;
-+	ctrl &= ~E1000_CTRL_MDIO;
-+	
-+	E1000_WRITE_REG(hw, CTRL, ctrl);
-+	E1000_WRITE_FLUSH(hw);
-+	
-+	/* Raise and Lower the clock before reading in the data. This accounts for
-+	 * the turnaround bits. The first clock occurred when we clocked out the
-+	 * last bit of the Register Address.
-+	 */
-+	e1000_raise_mdi_clk(hw, &ctrl);
-+	e1000_lower_mdi_clk(hw, &ctrl);
-+	
-+	for(data = 0, i = 0; i < 16; i++) {
-+		data = data << 1;
-+		e1000_raise_mdi_clk(hw, &ctrl);
-+		ctrl = E1000_READ_REG(hw, CTRL);
-+		/* Check to see if we shifted in a "1". */
-+		if(ctrl & E1000_CTRL_MDIO) data |= 1;
-+		e1000_lower_mdi_clk(hw, &ctrl);
-+	}
-+	
-+	e1000_raise_mdi_clk(hw, &ctrl);
-+	e1000_lower_mdi_clk(hw, &ctrl);
-+	
-+	return data;
-+}
-+
-+/*****************************************************************************
-+* Reads the value from a PHY register, if the value is on a specific non zero
-+* page, sets the page first.
-+*
-+* hw - Struct containing variables accessed by shared code
-+* reg_addr - address of the PHY register to read
-+******************************************************************************/
-+static int
-+e1000_read_phy_reg(struct e1000_hw *hw,
-+                   uint32_t reg_addr,
-+                   uint16_t *phy_data)
-+{
-+	uint32_t ret_val;
-+
-+	DEBUGFUNC("e1000_read_phy_reg");
-+
-+	if(hw->phy_type == e1000_phy_igp &&
-+	   (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
-+		if((ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-+		                                     (uint16_t)reg_addr)))
-+			return ret_val;
-+	}
-+
-+	ret_val = e1000_read_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr,
-+	                                phy_data);
-+
-+	return ret_val;
-+}
-+
-+static int
-+e1000_read_phy_reg_ex(struct e1000_hw *hw,
-+                      uint32_t reg_addr,
-+                      uint16_t *phy_data)
-+{
-+	uint32_t i;
-+	uint32_t mdic = 0;
-+	const uint32_t phy_addr = 1;
-+
-+	DEBUGFUNC("e1000_read_phy_reg_ex");
-+	
-+	if(reg_addr > MAX_PHY_REG_ADDRESS) {
-+		DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
-+		return -E1000_ERR_PARAM;
-+	}
-+	
-+	if(hw->mac_type > e1000_82543) {
-+		/* Set up Op-code, Phy Address, and register address in the MDI
-+		 * Control register.  The MAC will take care of interfacing with the
-+		 * PHY to retrieve the desired data.
-+		 */
-+		mdic = ((reg_addr << E1000_MDIC_REG_SHIFT) |
-+			(phy_addr << E1000_MDIC_PHY_SHIFT) | 
-+			(E1000_MDIC_OP_READ));
-+		
-+		E1000_WRITE_REG(hw, MDIC, mdic);
-+
-+		/* Poll the ready bit to see if the MDI read completed */
-+		for(i = 0; i < 64; i++) {
-+			udelay(50);
-+			mdic = E1000_READ_REG(hw, MDIC);
-+			if(mdic & E1000_MDIC_READY) break;
-+		}
-+		if(!(mdic & E1000_MDIC_READY)) {
-+			DEBUGOUT("MDI Read did not complete\n");
-+			return -E1000_ERR_PHY;
-+		}
-+		if(mdic & E1000_MDIC_ERROR) {
-+			DEBUGOUT("MDI Error\n");
-+			return -E1000_ERR_PHY;
-+		}
-+		*phy_data = (uint16_t) mdic;
-+	} else {
-+		/* We must first send a preamble through the MDIO pin to signal the
-+		 * beginning of an MII instruction.  This is done by sending 32
-+		 * consecutive "1" bits.
-+		 */
-+		e1000_shift_out_mdi_bits(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
-+		
-+		/* Now combine the next few fields that are required for a read
-+		 * operation.  We use this method instead of calling the
-+		 * e1000_shift_out_mdi_bits routine five different times. The format of
-+		 * a MII read instruction consists of a shift out of 14 bits and is
-+		 * defined as follows:
-+		 *    <Preamble><SOF><Op Code><Phy Addr><Reg Addr>
-+		 * followed by a shift in of 18 bits.  This first two bits shifted in
-+		 * are TurnAround bits used to avoid contention on the MDIO pin when a
-+		 * READ operation is performed.  These two bits are thrown away
-+		 * followed by a shift in of 16 bits which contains the desired data.
-+		 */
-+		mdic = ((reg_addr) | (phy_addr << 5) | 
-+			(PHY_OP_READ << 10) | (PHY_SOF << 12));
-+		
-+		e1000_shift_out_mdi_bits(hw, mdic, 14);
-+		
-+		/* Now that we've shifted out the read command to the MII, we need to
-+		 * "shift in" the 16-bit value (18 total bits) of the requested PHY
-+		 * register address.
-+		 */
-+		*phy_data = e1000_shift_in_mdi_bits(hw);
-+	}
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+* Writes a value to a PHY register
-+*
-+* hw - Struct containing variables accessed by shared code
-+* reg_addr - address of the PHY register to write
-+* data - data to write to the PHY
-+******************************************************************************/
-+static int 
-+e1000_write_phy_reg(struct e1000_hw *hw,
-+                    uint32_t reg_addr,
-+                    uint16_t phy_data)
-+{
-+	uint32_t ret_val;
-+
-+	DEBUGFUNC("e1000_write_phy_reg");
-+
-+	if(hw->phy_type == e1000_phy_igp &&
-+	   (reg_addr > MAX_PHY_MULTI_PAGE_REG)) {
-+		if((ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT,
-+		                                     (uint16_t)reg_addr)))
-+			return ret_val;
-+	}
-+
-+	ret_val = e1000_write_phy_reg_ex(hw, IGP01E1000_PHY_PAGE_SELECT & reg_addr,
-+	                                 phy_data);
-+
-+	return ret_val;
-+}
-+
-+static int
-+e1000_write_phy_reg_ex(struct e1000_hw *hw,
-+                       uint32_t reg_addr,
-+                       uint16_t phy_data)
-+{
-+	uint32_t i;
-+	uint32_t mdic = 0;
-+	const uint32_t phy_addr = 1;
-+	
-+	DEBUGFUNC("e1000_write_phy_reg_ex");
-+	
-+	if(reg_addr > MAX_PHY_REG_ADDRESS) {
-+		DEBUGOUT1("PHY Address %d is out of range\n", reg_addr);
-+		return -E1000_ERR_PARAM;
-+	}
-+	
-+	if(hw->mac_type > e1000_82543) {
-+		/* Set up Op-code, Phy Address, register address, and data intended
-+		 * for the PHY register in the MDI Control register.  The MAC will take
-+		 * care of interfacing with the PHY to send the desired data.
-+		 */
-+		mdic = (((uint32_t) phy_data) |
-+			(reg_addr << E1000_MDIC_REG_SHIFT) |
-+			(phy_addr << E1000_MDIC_PHY_SHIFT) | 
-+			(E1000_MDIC_OP_WRITE));
-+		
-+		E1000_WRITE_REG(hw, MDIC, mdic);
-+		
-+		/* Poll the ready bit to see if the MDI read completed */
-+		for(i = 0; i < 640; i++) {
-+			udelay(5);
-+			mdic = E1000_READ_REG(hw, MDIC);
-+			if(mdic & E1000_MDIC_READY) break;
-+		}
-+		if(!(mdic & E1000_MDIC_READY)) {
-+			DEBUGOUT("MDI Write did not complete\n");
-+			return -E1000_ERR_PHY;
-+		}
-+	} else {
-+		/* We'll need to use the SW defined pins to shift the write command
-+		 * out to the PHY. We first send a preamble to the PHY to signal the
-+		 * beginning of the MII instruction.  This is done by sending 32 
-+		 * consecutive "1" bits.
-+		 */
-+		e1000_shift_out_mdi_bits(hw, PHY_PREAMBLE, PHY_PREAMBLE_SIZE);
-+		
-+		/* Now combine the remaining required fields that will indicate a 
-+		 * write operation. We use this method instead of calling the
-+		 * e1000_shift_out_mdi_bits routine for each field in the command. The
-+		 * format of a MII write instruction is as follows:
-+		 * <Preamble><SOF><Op Code><Phy Addr><Reg Addr><Turnaround><Data>.
-+		 */
-+		mdic = ((PHY_TURNAROUND) | (reg_addr << 2) | (phy_addr << 7) |
-+			(PHY_OP_WRITE << 12) | (PHY_SOF << 14));
-+		mdic <<= 16;
-+		mdic |= (uint32_t) phy_data;
-+		
-+		e1000_shift_out_mdi_bits(hw, mdic, 32);
-+	}
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+* Returns the PHY to the power-on reset state
-+*
-+* hw - Struct containing variables accessed by shared code
-+******************************************************************************/
-+static void
-+e1000_phy_hw_reset(struct e1000_hw *hw)
-+{
-+	uint32_t ctrl, ctrl_ext;
-+
-+	DEBUGFUNC("e1000_phy_hw_reset");
-+	
-+	DEBUGOUT("Resetting Phy...\n");
-+	
-+	if(hw->mac_type > e1000_82543) {
-+		/* Read the device control register and assert the E1000_CTRL_PHY_RST
-+		 * bit. Then, take it out of reset.
-+		 */
-+		ctrl = E1000_READ_REG(hw, CTRL);
-+		E1000_WRITE_REG(hw, CTRL, ctrl | E1000_CTRL_PHY_RST);
-+		E1000_WRITE_FLUSH(hw);
-+		mdelay(10);
-+		E1000_WRITE_REG(hw, CTRL, ctrl);
-+		E1000_WRITE_FLUSH(hw);
-+	} else {
-+		/* Read the Extended Device Control Register, assert the PHY_RESET_DIR
-+		 * bit to put the PHY into reset. Then, take it out of reset.
-+		 */
-+		ctrl_ext = E1000_READ_REG(hw, CTRL_EXT);
-+		ctrl_ext |= E1000_CTRL_EXT_SDP4_DIR;
-+		ctrl_ext &= ~E1000_CTRL_EXT_SDP4_DATA;
-+		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
-+		E1000_WRITE_FLUSH(hw);
-+		mdelay(10);
-+		ctrl_ext |= E1000_CTRL_EXT_SDP4_DATA;
-+		E1000_WRITE_REG(hw, CTRL_EXT, ctrl_ext);
-+		E1000_WRITE_FLUSH(hw);
-+	}
-+	udelay(150);
-+}
-+
-+/******************************************************************************
-+* Resets the PHY
-+*
-+* hw - Struct containing variables accessed by shared code
-+*
-+* Sets bit 15 of the MII Control regiser
-+******************************************************************************/
-+static int 
-+e1000_phy_reset(struct e1000_hw *hw)
-+{
-+	int32_t ret_val;
-+	uint16_t phy_data;
-+
-+	DEBUGFUNC("e1000_phy_reset");
-+
-+	if(hw->mac_type != e1000_82541_rev_2) {
-+		if((ret_val = e1000_read_phy_reg(hw, PHY_CTRL, &phy_data)))
-+			return ret_val;
-+		
-+		phy_data |= MII_CR_RESET;
-+		if((ret_val = e1000_write_phy_reg(hw, PHY_CTRL, phy_data)))
-+			return ret_val;
-+		
-+		udelay(1);
-+	} else e1000_phy_hw_reset(hw);
-+
-+	if(hw->phy_type == e1000_phy_igp)
-+		e1000_phy_init_script(hw);
-+
-+	return E1000_SUCCESS;
-+}
-+
-+/******************************************************************************
-+* Probes the expected PHY address for known PHY IDs
-+*
-+* hw - Struct containing variables accessed by shared code
-+******************************************************************************/
-+static int
-+e1000_detect_gig_phy(struct e1000_hw *hw)
-+{
-+	int32_t phy_init_status, ret_val;
-+	uint16_t phy_id_high, phy_id_low;
-+	boolean_t match = FALSE;
-+
-+	DEBUGFUNC("e1000_detect_gig_phy");
-+	
-+	/* Read the PHY ID Registers to identify which PHY is onboard. */
-+	if((ret_val = e1000_read_phy_reg(hw, PHY_ID1, &phy_id_high)))
-+		return ret_val;
-+
-+	hw->phy_id = (uint32_t) (phy_id_high << 16);
-+	udelay(20);
-+	if((ret_val = e1000_read_phy_reg(hw, PHY_ID2, &phy_id_low)))
-+		return ret_val;
-+	
-+	hw->phy_id |= (uint32_t) (phy_id_low & PHY_REVISION_MASK);
-+#ifdef LINUX_DRIVER
-+	hw->phy_revision = (uint32_t) phy_id_low & ~PHY_REVISION_MASK;
-+#endif
-+	
-+	switch(hw->mac_type) {
-+	case e1000_82543:
-+		if(hw->phy_id == M88E1000_E_PHY_ID) match = TRUE;
-+		break;
-+	case e1000_82544:
-+		if(hw->phy_id == M88E1000_I_PHY_ID) match = TRUE;
-+		break;
-+	case e1000_82540:
-+	case e1000_82545:
-+	case e1000_82545_rev_3:
-+	case e1000_82546:
-+	case e1000_82546_rev_3:
-+		if(hw->phy_id == M88E1011_I_PHY_ID) match = TRUE;
-+		break;
-+	case e1000_82541:
-+	case e1000_82541_rev_2:
-+	case e1000_82547:
-+	case e1000_82547_rev_2:
-+		if(hw->phy_id == IGP01E1000_I_PHY_ID) match = TRUE;
-+		break;
-+	default:
-+		DEBUGOUT1("Invalid MAC type %d\n", hw->mac_type);
-+		return -E1000_ERR_CONFIG;
-+	}
-+	phy_init_status = e1000_set_phy_type(hw);
-+
-+	if ((match) && (phy_init_status == E1000_SUCCESS)) {
-+		DEBUGOUT1("PHY ID 0x%X detected\n", hw->phy_id);
-+		return E1000_SUCCESS;
-+	}
-+	DEBUGOUT1("Invalid PHY ID 0x%X\n", hw->phy_id);
-+	return -E1000_ERR_PHY;
-+}
-+
-+/******************************************************************************
-+ * Sets up eeprom variables in the hw struct.  Must be called after mac_type
-+ * is configured.
-+ *
-+ * hw - Struct containing variables accessed by shared code
-+ *****************************************************************************/
-+static void
-+e1000_init_eeprom_params(struct e1000_hw *hw)
-+{
-+	struct e1000_eeprom_info *eeprom = &hw->eeprom;
-+	uint32_t eecd = E1000_READ_REG(hw, EECD);
-+	uint16_t eeprom_size;
-+
-+	DEBUGFUNC("e1000_init_eeprom_params");
-+
-+	switch (hw->mac_type) {
-+	case e1000_82542_rev2_0:
-+	case e1000_82542_rev2_1:
-+	case e1000_82543:
-+	case e1000_82544:
-+		eeprom->type = e1000_eeprom_microwire;
-+		eeprom->word_size = 64;
-+		eeprom->opcode_bits = 3;
-+		eeprom->address_bits = 6;
-+		eeprom->delay_usec = 50;
-+		break;
-+	case e1000_82540:
-+	case e1000_82545:
-+	case e1000_82545_rev_3:
-+	case e1000_82546:
-+	case e1000_82546_rev_3:
-+		eeprom->type = e1000_eeprom_microwire;
-+		eeprom->opcode_bits = 3;
-+		eeprom->delay_usec = 50;
-+		if(eecd & E1000_EECD_SIZE) {
-+			eeprom->word_size = 256;
-+			eeprom->address_bits = 8;
-+		} else {
-+			eeprom->word_size = 64;
-+			eeprom->address_bits = 6;
-+		}
-+		break;
-+	case e1000_82541:
-+	case e1000_82541_rev_2:
-+	case e1000_82547:
-+	case e1000_82547_rev_2:
-+		if (eecd & E1000_EECD_TYPE) {
-+			eeprom->type = e1000_eeprom_spi;
-+			if (eecd & E1000_EECD_ADDR_BITS) {
-+				eeprom->page_size = 32;
-+				eeprom->address_bits = 16;
-+			} else {
-+				eeprom->page_size = 8;
-+				eeprom->address_bits = 8;
-+			}
-+		} else {
-+			eeprom->type = e1000_eeprom_microwire;
-+			eeprom->opcode_bits = 3;
-+			eeprom->delay_usec = 50;
-+			if (eecd & E1000_EECD_ADDR_BITS) {
-+				eeprom->word_size = 256;
-+				eeprom->address_bits = 8;
-+			} else {
-+				eeprom->word_size = 64;
-+				eeprom->address_bits = 6;
-+			}
-+		}
-+		break;
-+	default:
-+		eeprom->type = e1000_eeprom_spi;
-+		if (eecd & E1000_EECD_ADDR_BITS) {
-+			eeprom->page_size = 32;
-+			eeprom->address_bits = 16;
-+		} else {
-+			eeprom->page_size = 8;
-+			eeprom->address_bits = 8;
-+		}
-+		break;
-+	}
-+
-+	if (eeprom->type == e1000_eeprom_spi) {
-+		eeprom->opcode_bits = 8;
-+		eeprom->delay_usec = 1;
-+		eeprom->word_size = 64;
-+		if (e1000_read_eeprom(hw, EEPROM_CFG, 1, &eeprom_size) == 0) {
-+			eeprom_size &= EEPROM_SIZE_MASK;
-+
-+			switch (eeprom_size) {
-+			case EEPROM_SIZE_16KB:
-+				eeprom->word_size = 8192;
-+				break;
-+			case EEPROM_SIZE_8KB:
-+				eeprom->word_size = 4096;
-+				break;
-+			case EEPROM_SIZE_4KB:
-+				eeprom->word_size = 2048;
-+				break;
-+			case EEPROM_SIZE_2KB:
-+				eeprom->word_size = 1024;
-+				break;
-+			case EEPROM_SIZE_1KB:
-+				eeprom->word_size = 512;
-+				break;
-+			case EEPROM_SIZE_512B:
-+				eeprom->word_size = 256;
-+				break;
-+			case EEPROM_SIZE_128B:
-+			default:
-+				break;
-+			}
-+		}
-+	}
-+}
-+
-+/**
-+ * e1000_reset - Reset the adapter
-+ */
-+
-+static int
-+e1000_reset(struct e1000_hw *hw)
-+{
-+	uint32_t pba;
-+	/* Repartition Pba for greater than 9k mtu
-+	 * To take effect CTRL.RST is required.
-+	 */
-+
-+	if(hw->mac_type < e1000_82547) {
-+		pba = E1000_PBA_48K;
-+	} else {
-+		pba = E1000_PBA_30K;
-+	}
-+	E1000_WRITE_REG(hw, PBA, pba);
-+
-+	/* flow control settings */
-+#if 0
-+	hw->fc_high_water = FC_DEFAULT_HI_THRESH;
-+	hw->fc_low_water = FC_DEFAULT_LO_THRESH;
-+	hw->fc_pause_time = FC_DEFAULT_TX_TIMER;
-+	hw->fc_send_xon = 1;
-+	hw->fc = hw->original_fc;
-+#endif
-+	
-+	e1000_reset_hw(hw);
-+	if(hw->mac_type >= e1000_82544)
-+		E1000_WRITE_REG(hw, WUC, 0);
-+	return e1000_init_hw(hw);
-+}
-+
-+/**
-+ * e1000_sw_init - Initialize general software structures (struct e1000_adapter)
-+ * @adapter: board private structure to initialize
-+ *
-+ * e1000_sw_init initializes the Adapter private data structure.
-+ * Fields are initialized based on PCI device information and
-+ * OS network device settings (MTU size).
-+ **/
-+
-+static int 
-+e1000_sw_init(struct pci_device *pdev, struct e1000_hw *hw)
-+{
-+	int result;
-+
-+	/* PCI config space info */
-+	pci_read_config_word(pdev, PCI_VENDOR_ID, &hw->vendor_id);
-+	pci_read_config_word(pdev, PCI_DEVICE_ID, &hw->device_id);
-+	pci_read_config_byte(pdev, PCI_REVISION, &hw->revision_id);
-+#if 0
-+	pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID,
-+                             &hw->subsystem_vendor_id);
-+	pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &hw->subsystem_id);
-+#endif
-+
-+	pci_read_config_word(pdev, PCI_COMMAND, &hw->pci_cmd_word);
-+
-+	/* identify the MAC */
-+
-+	result = e1000_set_mac_type(hw);
-+	if (result) {
-+		E1000_ERR("Unknown MAC Type\n");
-+		return result;
-+	}
-+
-+	/* initialize eeprom parameters */
-+
-+	e1000_init_eeprom_params(hw);
-+
-+#if 0
-+	if((hw->mac_type == e1000_82541) ||
-+	   (hw->mac_type == e1000_82547) ||
-+	   (hw->mac_type == e1000_82541_rev_2) ||
-+	   (hw->mac_type == e1000_82547_rev_2))
-+		hw->phy_init_script = 1;
-+#endif
-+
-+	e1000_set_media_type(hw);
-+
-+#if 0
-+	if(hw->mac_type < e1000_82543)
-+		hw->report_tx_early = 0;
-+	else
-+		hw->report_tx_early = 1;
-+
-+	hw->wait_autoneg_complete = FALSE;
-+#endif
-+	hw->tbi_compatibility_en = TRUE;
-+#if 0
-+	hw->adaptive_ifs = TRUE;
-+
-+	/* Copper options */
-+
-+	if(hw->media_type == e1000_media_type_copper) {
-+		hw->mdix = AUTO_ALL_MODES;
-+		hw->disable_polarity_correction = FALSE;
-+		hw->master_slave = E1000_MASTER_SLAVE;
-+	}
-+#endif
-+	return E1000_SUCCESS;
-+}
-+
-+static void fill_rx (void)
-+{
-+	struct e1000_rx_desc *rd;
-+	rx_last = rx_tail;
-+	rd = rx_base + rx_tail;
-+	rx_tail = (rx_tail + 1) % 8;
-+	memset (rd, 0, 16);
-+	rd->buffer_addr = virt_to_bus(&packet);
-+	E1000_WRITE_REG (&hw, RDT, rx_tail);
-+}
-+
-+static void init_descriptor (void)
-+{
-+	unsigned long ptr;
-+	unsigned long tctl;
-+
-+	ptr = virt_to_phys(tx_pool);
-+	if (ptr & 0xf)
-+		ptr = (ptr + 0x10) & (~0xf);
-+
-+	tx_base = phys_to_virt(ptr);
-+
-+	E1000_WRITE_REG (&hw, TDBAL, virt_to_bus(tx_base));
-+	E1000_WRITE_REG (&hw, TDBAH, 0);
-+	E1000_WRITE_REG (&hw, TDLEN, 128);
-+
-+	/* Setup the HW Tx Head and Tail descriptor pointers */
-+
-+	E1000_WRITE_REG (&hw, TDH, 0);
-+	E1000_WRITE_REG (&hw, TDT, 0);
-+	tx_tail = 0;
-+
-+	/* Program the Transmit Control Register */
-+
-+#ifdef LINUX_DRIVER_TCTL
-+	tctl = E1000_READ_REG(&hw, TCTL);
-+
-+	tctl &= ~E1000_TCTL_CT;
-+	tctl |= E1000_TCTL_EN | E1000_TCTL_PSP |
-+		(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT);
-+#else
-+	tctl = E1000_TCTL_PSP | E1000_TCTL_EN |
-+		(E1000_COLLISION_THRESHOLD << E1000_CT_SHIFT) | 
-+		(E1000_HDX_COLLISION_DISTANCE << E1000_COLD_SHIFT);
-+#endif
-+
-+	E1000_WRITE_REG (&hw, TCTL, tctl);
-+
-+	e1000_config_collision_dist(&hw);
-+
-+
-+	rx_tail = 0;
-+	/* disable receive */
-+	E1000_WRITE_REG (&hw, RCTL, 0);
-+	ptr = virt_to_phys(rx_pool);
-+	if (ptr & 0xf)
-+		ptr = (ptr + 0x10) & (~0xf);
-+	rx_base = phys_to_virt(ptr);
-+
-+	/* Setup the Base and Length of the Rx Descriptor Ring */
-+
-+	E1000_WRITE_REG (&hw, RDBAL, virt_to_bus(rx_base));
-+	E1000_WRITE_REG (&hw, RDBAH, 0);
-+
-+	E1000_WRITE_REG (&hw, RDLEN, 128);
-+
-+	/* Setup the HW Rx Head and Tail Descriptor Pointers */
-+	E1000_WRITE_REG (&hw, RDH, 0);
-+	E1000_WRITE_REG (&hw, RDT, 0);
-+
-+	E1000_WRITE_REG (&hw, RCTL, 
-+		E1000_RCTL_EN | 
-+		E1000_RCTL_BAM | 
-+		E1000_RCTL_SZ_2048 | 
-+		E1000_RCTL_MPE);
-+	fill_rx();
-+}
-+
-+
-+
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int
-+e1000_poll (struct nic *nic, int retrieve)
-+{
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+	struct e1000_rx_desc *rd;
-+
-+	rd = rx_base + rx_last;
-+	if (!rd->status & E1000_RXD_STAT_DD)
-+		return 0;
-+
-+	if ( ! retrieve ) return 1;
-+
-+	//      printf("recv: packet %! -> %! len=%d \n", packet+6, packet,rd->Length);
-+	memcpy (nic->packet, packet, rd->length);
-+	nic->packetlen = rd->length;
-+	fill_rx ();
-+	return 1;
-+}
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void
-+e1000_transmit (struct nic *nic, const char *d,	/* Destination */
-+		    unsigned int type,	/* Type */
-+		    unsigned int size,	/* size */
-+		    const char *p)	/* Packet */
-+{
-+	/* send the packet to destination */
-+	struct eth_hdr {
-+		unsigned char dst_addr[ETH_ALEN];
-+		unsigned char src_addr[ETH_ALEN];
-+		unsigned short type;
-+	} hdr;
-+	struct e1000_tx_desc *txhd;	/* header */
-+	struct e1000_tx_desc *txp;	/* payload */
-+	DEBUGFUNC("send");
-+
-+	memcpy (&hdr.dst_addr, d, ETH_ALEN);
-+	memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN);
-+
-+	hdr.type = htons (type);
-+	txhd = tx_base + tx_tail;
-+	tx_tail = (tx_tail + 1) % 8;
-+	txp = tx_base + tx_tail;
-+	tx_tail = (tx_tail + 1) % 8;
-+
-+	txhd->buffer_addr = virt_to_bus (&hdr);
-+	txhd->lower.data = sizeof (hdr);
-+	txhd->upper.data = 0;
-+
-+	txp->buffer_addr = virt_to_bus(p);
-+	txp->lower.data = E1000_TXD_CMD_RPS | E1000_TXD_CMD_EOP | E1000_TXD_CMD_IFCS | size;
-+	txp->upper.data = 0;
-+
-+	E1000_WRITE_REG (&hw, TDT, tx_tail);
-+	while (!(txp->upper.data & E1000_TXD_STAT_DD)) {
-+		udelay(10);	/* give the nic a chance to write to the register */
-+		poll_interruptions();
-+	}
-+	DEBUGFUNC("send end");
-+}
-+
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void e1000_disable (struct dev *dev __unused)
-+{
-+	/* Clear the transmit ring */
-+	E1000_WRITE_REG (&hw, TDH, 0);
-+	E1000_WRITE_REG (&hw, TDT, 0);
-+
-+	/* Clear the receive ring */
-+	E1000_WRITE_REG (&hw, RDH, 0);
-+	E1000_WRITE_REG (&hw, RDT, 0);
-+
-+	/* put the card in its initial state */
-+	E1000_WRITE_REG (&hw, CTRL, E1000_CTRL_RST);
-+
-+	/* Turn off the ethernet interface */
-+	E1000_WRITE_REG (&hw, RCTL, 0);
-+	E1000_WRITE_REG (&hw, TCTL, 0);
-+	mdelay (10);
-+
-+	/* Unmap my window to the device */
-+	iounmap(hw.hw_addr);
-+}
-+
-+/**************************************************************************
-+IRQ - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void e1000_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+#define IORESOURCE_IO	0x00000100     /* Resource type */
-+#define BAR_0		0
-+#define BAR_1		1
-+#define BAR_5		5
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+You should omit the last argument struct pci_device * for a non-PCI NIC
-+***************************************************************************/
-+static int e1000_probe(struct dev *dev, struct pci_device *p)
-+{
-+	struct nic *nic = (struct nic *)dev;
-+	unsigned long mmio_start, mmio_len;
-+	int ret_val, i;
-+
-+	if (p == 0)
-+		return 0;
-+	/* Initialize hw with default values */
-+	memset(&hw, 0, sizeof(hw));
-+	hw.pdev = p;
-+
-+#if 1
-+	/* Are these variables needed? */
-+	hw.fc                    = e1000_fc_none;
-+#if 0
-+	hw.original_fc           = e1000_fc_none;
-+#endif
-+	hw.autoneg_failed        = 0;
-+#if 0
-+	hw.get_link_status       = TRUE;
-+#endif
-+#endif
-+
-+	mmio_start = pci_bar_start(p, PCI_BASE_ADDRESS_0);
-+	mmio_len   = pci_bar_size(p,  PCI_BASE_ADDRESS_0);
-+	hw.hw_addr = ioremap(mmio_start, mmio_len);
-+
-+	for(i = BAR_1; i <= BAR_5; i++) {
-+		if(pci_bar_size(p, i) == 0)
-+			continue;                
-+		if(pci_find_capability(p, i) & IORESOURCE_IO) {
-+			hw.io_base = pci_bar_start(p, i);
-+			break;
-+                }        
-+	}
-+
-+	adjust_pci_device(p);
-+
-+	nic->ioaddr   = p->ioaddr & ~3;
-+	nic->irqno    = 0;
-+
-+	/* From Matt Hortman <mbhortman@acpthinclient.com> */
-+	/* MAC and Phy settings */
-+
-+	/* setup the private structure */
-+	if (e1000_sw_init(p, &hw) < 0) {
-+		iounmap(hw.hw_addr);
-+		return 0;
-+	}
-+
-+	/* make sure the EEPROM is good */
-+
-+	if (e1000_validate_eeprom_checksum(&hw) < 0) {
-+		printf ("The EEPROM Checksum Is Not Valid\n");
-+		iounmap(hw.hw_addr);
-+		return 0;
-+	}
-+
-+	/* copy the MAC address out of the EEPROM */
-+
-+	e1000_read_mac_addr(&hw);
-+	memcpy (nic->node_addr, hw.mac_addr, ETH_ALEN);
-+	
-+	printf("Ethernet addr: %!\n", nic->node_addr);
-+
-+	/* reset the hardware with the new settings */
-+
-+	ret_val = e1000_reset(&hw);
-+	if (ret_val < 0) {
-+		if ((ret_val == -E1000_ERR_NOLINK) ||
-+			(ret_val == -E1000_ERR_TIMEOUT)) {
-+			E1000_ERR("Valid Link not detected\n");
-+		} else {
-+			E1000_ERR("Hardware Initialization Failed\n");
-+		}
-+		iounmap(hw.hw_addr);
-+		return 0;
-+	}
-+	init_descriptor();
-+
-+	/* point to NIC specific routines */
-+	dev->disable  = e1000_disable;
-+	nic->poll     = e1000_poll;
-+	nic->transmit = e1000_transmit;
-+	nic->irq      = e1000_irq;
-+
-+	return 1;
-+}
-+
-+static struct pci_id e1000_nics[] = {
-+PCI_ROM(0x8086, 0x1000, "e1000-82542",               "Intel EtherExpressPro1000"),
-+PCI_ROM(0x8086, 0x1001, "e1000-82543gc-fiber",       "Intel EtherExpressPro1000 82543GC Fiber"),
-+PCI_ROM(0x8086, 0x1004, "e1000-82543gc-copper",	     "Intel EtherExpressPro1000 82543GC Copper"),
-+PCI_ROM(0x8086, 0x1008, "e1000-82544ei-copper",      "Intel EtherExpressPro1000 82544EI Copper"),
-+PCI_ROM(0x8086, 0x1009, "e1000-82544ei-fiber",       "Intel EtherExpressPro1000 82544EI Fiber"),
-+PCI_ROM(0x8086, 0x100C, "e1000-82544gc-copper",      "Intel EtherExpressPro1000 82544GC Copper"),
-+PCI_ROM(0x8086, 0x100D, "e1000-82544gc-lom",         "Intel EtherExpressPro1000 82544GC LOM"),
-+PCI_ROM(0x8086, 0x100E, "e1000-82540em",     	     "Intel EtherExpressPro1000 82540EM"),
-+PCI_ROM(0x8086, 0x100F, "e1000-82545em-copper",      "Intel EtherExpressPro1000 82545EM Copper"),
-+PCI_ROM(0x8086, 0x1010, "e1000-82546eb-copper",      "Intel EtherExpressPro1000 82546EB Copper"),
-+PCI_ROM(0x8086, 0x1011, "e1000-82545em-fiber",       "Intel EtherExpressPro1000 82545EM Fiber"),
-+PCI_ROM(0x8086, 0x1012, "e1000-82546eb-fiber", 	     "Intel EtherExpressPro1000 82546EB Copper"),
-+PCI_ROM(0x8086, 0x1013, "e1000-82541ei",	     "Intel EtherExpressPro1000 82541EI"),
-+PCI_ROM(0x8086, 0x1015, "e1000-82540em-lom",  	     "Intel EtherExpressPro1000 82540EM LOM"),
-+PCI_ROM(0x8086, 0x1016, "e1000-82540ep-lom",	     "Intel EtherExpressPro1000 82540EP LOM"),
-+PCI_ROM(0x8086, 0x1017, "e1000-82540ep",	     "Intel EtherExpressPro1000 82540EP"),
-+PCI_ROM(0x8086, 0x1018, "e1000-82541ep",	     "Intel EtherExpressPro1000 82541EP"),
-+PCI_ROM(0x8086, 0x1019, "e1000-82547ei",	     "Intel EtherExpressPro1000 82547EI"),
-+PCI_ROM(0x8086, 0x101d, "e1000-82546eb-quad-copper", "Intel EtherExpressPro1000 82546EB Quad Copper"),
-+PCI_ROM(0x8086, 0x101e, "e1000-82540ep-lp",	     "Intel EtherExpressPro1000 82540EP LP"),
-+PCI_ROM(0x8086, 0x1026, "e1000-82545gm-copper",	     "Intel EtherExpressPro1000 82545GM Copper"),
-+PCI_ROM(0x8086, 0x1027, "e1000-82545gm-fiber",	     "Intel EtherExpressPro1000 82545GM Fiber"),
-+PCI_ROM(0x8086, 0x1028, "e1000-82545gm-serdes",	     "Intel EtherExpressPro1000 82545GM SERDES"),
-+PCI_ROM(0x8086, 0x1075, "e1000-82547gi",	     "Intel EtherExpressPro1000 82547GI"),
-+PCI_ROM(0x8086, 0x1076, "e1000-82541gi",	     "Intel EtherExpressPro1000 82541GI"),
-+PCI_ROM(0x8086, 0x1077, "e1000-82541gi-mobile",	     "Intel EtherExpressPro1000 82541GI Mobile"),
-+PCI_ROM(0x8086, 0x1078, "e1000-82541er",	     "Intel EtherExpressPro1000 82541ER"),
-+PCI_ROM(0x8086, 0x1079, "e1000-82546gb-copper",	     "Intel EtherExpressPro1000 82546GB Copper"),
-+PCI_ROM(0x8086, 0x107a, "e1000-82546gb-fiber",	     "Intel EtherExpressPro1000 82546GB Fiber"),
-+PCI_ROM(0x8086, 0x107b, "e1000-82546gb-serdes",	     "Intel EtherExpressPro1000 82546GB SERDES"),
-+};
-+
-+struct pci_driver e1000_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "E1000",
-+	.probe    = e1000_probe,
-+	.ids      = e1000_nics,
-+	.id_count = sizeof(e1000_nics)/sizeof(e1000_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/e1000_hw.h
-===================================================================
---- /dev/null
-+++ b/netboot/e1000_hw.h
-@@ -0,0 +1,2058 @@
-+/*******************************************************************************
-+
-+  
-+  Copyright(c) 1999 - 2003 Intel Corporation. All rights reserved.
-+  
-+  This program is free software; you can redistribute it and/or modify it 
-+  under the terms of the GNU General Public License as published by the Free 
-+  Software Foundation; either version 2 of the License, or (at your option) 
-+  any later version.
-+  
-+  This program is distributed in the hope that it will be useful, but WITHOUT 
-+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
-+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
-+  more details.
-+  
-+  You should have received a copy of the GNU General Public License along with
-+  this program; if not, write to the Free Software Foundation, Inc., 59 
-+  Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-+  
-+  The full GNU General Public License is included in this distribution in the
-+  file called LICENSE.
-+  
-+  Contact Information:
-+  Linux NICS <linux.nics@intel.com>
-+  Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
-+
-+*******************************************************************************/
-+
-+/* e1000_hw.h
-+ * Structures, enums, and macros for the MAC
-+ */
-+
-+#ifndef _E1000_HW_H_
-+#define _E1000_HW_H_
-+
-+/* Forward declarations of structures used by the shared code */
-+struct e1000_hw;
-+struct e1000_hw_stats;
-+
-+/* Enumerated types specific to the e1000 hardware */
-+/* Media Access Controlers */
-+typedef enum {
-+    e1000_undefined = 0,
-+    e1000_82542_rev2_0,
-+    e1000_82542_rev2_1,
-+    e1000_82543,
-+    e1000_82544,
-+    e1000_82540,
-+    e1000_82545,
-+    e1000_82545_rev_3,
-+    e1000_82546,
-+    e1000_82546_rev_3,
-+    e1000_82541,
-+    e1000_82541_rev_2,
-+    e1000_82547,
-+    e1000_82547_rev_2,
-+    e1000_num_macs
-+} e1000_mac_type;
-+
-+typedef enum {
-+    e1000_eeprom_uninitialized = 0,
-+    e1000_eeprom_spi,
-+    e1000_eeprom_microwire,
-+    e1000_num_eeprom_types
-+} e1000_eeprom_type;
-+
-+/* Media Types */
-+typedef enum {
-+	e1000_media_type_copper = 0,
-+	e1000_media_type_fiber = 1,
-+	e1000_media_type_internal_serdes = 2,
-+	e1000_num_media_types
-+} e1000_media_type;
-+
-+typedef enum {
-+    e1000_10_half = 0,
-+    e1000_10_full = 1,
-+    e1000_100_half = 2,
-+    e1000_100_full = 3
-+} e1000_speed_duplex_type;
-+
-+/* Flow Control Settings */
-+typedef enum {
-+	e1000_fc_none = 0,
-+	e1000_fc_rx_pause = 1,
-+	e1000_fc_tx_pause = 2,
-+	e1000_fc_full = 3,
-+	e1000_fc_default = 0xFF
-+} e1000_fc_type;
-+
-+/* PCI bus types */
-+typedef enum {
-+	e1000_bus_type_unknown = 0,
-+	e1000_bus_type_pci,
-+	e1000_bus_type_pcix,
-+	e1000_bus_type_reserved
-+} e1000_bus_type;
-+
-+/* PCI bus speeds */
-+typedef enum {
-+	e1000_bus_speed_unknown = 0,
-+	e1000_bus_speed_33,
-+	e1000_bus_speed_66,
-+	e1000_bus_speed_100,
-+	e1000_bus_speed_120,
-+	e1000_bus_speed_133,
-+	e1000_bus_speed_reserved
-+} e1000_bus_speed;
-+
-+/* PCI bus widths */
-+typedef enum {
-+	e1000_bus_width_unknown = 0,
-+	e1000_bus_width_32,
-+	e1000_bus_width_64,
-+	e1000_bus_width_reserved
-+} e1000_bus_width;
-+
-+/* PHY status info structure and supporting enums */
-+typedef enum {
-+	e1000_cable_length_50 = 0,
-+	e1000_cable_length_50_80,
-+	e1000_cable_length_80_110,
-+	e1000_cable_length_110_140,
-+	e1000_cable_length_140,
-+	e1000_cable_length_undefined = 0xFF
-+} e1000_cable_length;
-+
-+typedef enum {
-+    e1000_igp_cable_length_10  = 10,
-+    e1000_igp_cable_length_20  = 20,
-+    e1000_igp_cable_length_30  = 30,
-+    e1000_igp_cable_length_40  = 40,
-+    e1000_igp_cable_length_50  = 50,
-+    e1000_igp_cable_length_60  = 60,
-+    e1000_igp_cable_length_70  = 70,
-+    e1000_igp_cable_length_80  = 80,
-+    e1000_igp_cable_length_90  = 90,
-+    e1000_igp_cable_length_100 = 100,
-+    e1000_igp_cable_length_110 = 110,
-+    e1000_igp_cable_length_120 = 120,
-+    e1000_igp_cable_length_130 = 130,
-+    e1000_igp_cable_length_140 = 140,
-+    e1000_igp_cable_length_150 = 150,
-+    e1000_igp_cable_length_160 = 160,
-+    e1000_igp_cable_length_170 = 170,
-+    e1000_igp_cable_length_180 = 180
-+} e1000_igp_cable_length;
-+
-+typedef enum {
-+	e1000_10bt_ext_dist_enable_normal = 0,
-+	e1000_10bt_ext_dist_enable_lower,
-+	e1000_10bt_ext_dist_enable_undefined = 0xFF
-+} e1000_10bt_ext_dist_enable;
-+
-+typedef enum {
-+	e1000_rev_polarity_normal = 0,
-+	e1000_rev_polarity_reversed,
-+	e1000_rev_polarity_undefined = 0xFF
-+} e1000_rev_polarity;
-+
-+typedef enum {
-+    e1000_downshift_normal = 0,
-+    e1000_downshift_activated,
-+    e1000_downshift_undefined = 0xFF
-+} e1000_downshift;
-+
-+typedef enum {
-+	e1000_polarity_reversal_enabled = 0,
-+	e1000_polarity_reversal_disabled,
-+	e1000_polarity_reversal_undefined = 0xFF
-+} e1000_polarity_reversal;
-+
-+typedef enum {
-+	e1000_auto_x_mode_manual_mdi = 0,
-+	e1000_auto_x_mode_manual_mdix,
-+	e1000_auto_x_mode_auto1,
-+	e1000_auto_x_mode_auto2,
-+	e1000_auto_x_mode_undefined = 0xFF
-+} e1000_auto_x_mode;
-+
-+typedef enum {
-+	e1000_1000t_rx_status_not_ok = 0,
-+	e1000_1000t_rx_status_ok,
-+	e1000_1000t_rx_status_undefined = 0xFF
-+} e1000_1000t_rx_status;
-+
-+typedef enum {
-+    e1000_phy_m88 = 0,
-+    e1000_phy_igp,
-+    e1000_phy_undefined = 0xFF
-+} e1000_phy_type;
-+
-+typedef enum {
-+    e1000_ms_hw_default = 0,
-+    e1000_ms_force_master,
-+    e1000_ms_force_slave,
-+    e1000_ms_auto
-+} e1000_ms_type;
-+
-+typedef enum {
-+    e1000_ffe_config_enabled = 0,
-+    e1000_ffe_config_active,
-+    e1000_ffe_config_blocked
-+} e1000_ffe_config;
-+
-+typedef enum {
-+    e1000_dsp_config_disabled = 0,
-+    e1000_dsp_config_enabled,
-+    e1000_dsp_config_activated,
-+    e1000_dsp_config_undefined = 0xFF
-+} e1000_dsp_config;
-+
-+struct e1000_phy_info {
-+	e1000_cable_length cable_length;
-+	e1000_10bt_ext_dist_enable extended_10bt_distance;
-+	e1000_rev_polarity cable_polarity;
-+	e1000_downshift downshift;
-+	e1000_polarity_reversal polarity_correction;
-+	e1000_auto_x_mode mdix_mode;
-+	e1000_1000t_rx_status local_rx;
-+	e1000_1000t_rx_status remote_rx;
-+};
-+
-+struct e1000_phy_stats {
-+	uint32_t idle_errors;
-+	uint32_t receive_errors;
-+};
-+
-+struct e1000_eeprom_info {
-+    e1000_eeprom_type type;
-+    uint16_t word_size;
-+    uint16_t opcode_bits;
-+    uint16_t address_bits;
-+    uint16_t delay_usec;
-+    uint16_t page_size;
-+};
-+
-+
-+
-+/* Error Codes */
-+#define E1000_SUCCESS      0
-+#define E1000_ERR_EEPROM   1
-+#define E1000_ERR_PHY      2
-+#define E1000_ERR_CONFIG   3
-+#define E1000_ERR_PARAM    4
-+#define E1000_ERR_MAC_TYPE 5
-+#define E1000_ERR_PHY_TYPE 6
-+#define E1000_ERR_NOLINK   7
-+#define E1000_ERR_TIMEOUT  8
-+
-+#define E1000_READ_REG_IO(a, reg) \
-+	e1000_read_reg_io((a), E1000_##reg)
-+#define E1000_WRITE_REG_IO(a, reg, val) \
-+	e1000_write_reg_io((a), E1000_##reg, val)
-+
-+/* PCI Device IDs */
-+#define E1000_DEV_ID_82542               0x1000
-+#define E1000_DEV_ID_82543GC_FIBER       0x1001
-+#define E1000_DEV_ID_82543GC_COPPER      0x1004
-+#define E1000_DEV_ID_82544EI_COPPER      0x1008
-+#define E1000_DEV_ID_82544EI_FIBER       0x1009
-+#define E1000_DEV_ID_82544GC_COPPER      0x100C
-+#define E1000_DEV_ID_82544GC_LOM         0x100D
-+#define E1000_DEV_ID_82540EM             0x100E
-+#define E1000_DEV_ID_82540EM_LOM         0x1015
-+#define E1000_DEV_ID_82540EP_LOM         0x1016
-+#define E1000_DEV_ID_82540EP             0x1017
-+#define E1000_DEV_ID_82540EP_LP          0x101E
-+#define E1000_DEV_ID_82545EM_COPPER      0x100F
-+#define E1000_DEV_ID_82545EM_FIBER       0x1011
-+#define E1000_DEV_ID_82545GM_COPPER      0x1026
-+#define E1000_DEV_ID_82545GM_FIBER       0x1027
-+#define E1000_DEV_ID_82545GM_SERDES      0x1028
-+#define E1000_DEV_ID_82546EB_COPPER      0x1010
-+#define E1000_DEV_ID_82546EB_FIBER       0x1012
-+#define E1000_DEV_ID_82546EB_QUAD_COPPER 0x101D
-+#define E1000_DEV_ID_82541EI             0x1013
-+#define E1000_DEV_ID_82541EI_MOBILE      0x1018
-+#define E1000_DEV_ID_82541ER             0x1078
-+#define E1000_DEV_ID_82547GI             0x1075
-+#define E1000_DEV_ID_82541GI             0x1076
-+#define E1000_DEV_ID_82541GI_MOBILE      0x1077
-+#define E1000_DEV_ID_82546GB_COPPER      0x1079
-+#define E1000_DEV_ID_82546GB_FIBER       0x107A
-+#define E1000_DEV_ID_82546GB_SERDES      0x107B
-+#define E1000_DEV_ID_82547EI             0x1019
-+
-+#define NODE_ADDRESS_SIZE 6
-+#define ETH_LENGTH_OF_ADDRESS 6
-+
-+/* MAC decode size is 128K - This is the size of BAR0 */
-+#define MAC_DECODE_SIZE (128 * 1024)
-+
-+#define E1000_82542_2_0_REV_ID 2
-+#define E1000_82542_2_1_REV_ID 3
-+
-+#define SPEED_10    10
-+#define SPEED_100   100
-+#define SPEED_1000  1000
-+#define HALF_DUPLEX 1
-+#define FULL_DUPLEX 2
-+
-+/* The sizes (in bytes) of a ethernet packet */
-+#define ENET_HEADER_SIZE             14
-+#define MAXIMUM_ETHERNET_FRAME_SIZE  1518 /* With FCS */
-+#define MINIMUM_ETHERNET_FRAME_SIZE  64   /* With FCS */
-+#define ETHERNET_FCS_SIZE            4
-+#define MAXIMUM_ETHERNET_PACKET_SIZE \
-+    (MAXIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
-+#define MINIMUM_ETHERNET_PACKET_SIZE \
-+    (MINIMUM_ETHERNET_FRAME_SIZE - ETHERNET_FCS_SIZE)
-+#define CRC_LENGTH                   ETHERNET_FCS_SIZE
-+#define MAX_JUMBO_FRAME_SIZE         0x3F00
-+
-+
-+/* 802.1q VLAN Packet Sizes */
-+#define VLAN_TAG_SIZE                     4     /* 802.3ac tag (not DMAed) */
-+
-+/* Ethertype field values */
-+#define ETHERNET_IEEE_VLAN_TYPE 0x8100  /* 802.3ac packet */
-+#define ETHERNET_IP_TYPE        0x0800  /* IP packets */
-+#define ETHERNET_ARP_TYPE       0x0806  /* Address Resolution Protocol (ARP) */
-+
-+/* Packet Header defines */
-+#define IP_PROTOCOL_TCP    6
-+#define IP_PROTOCOL_UDP    0x11
-+
-+/* This defines the bits that are set in the Interrupt Mask
-+ * Set/Read Register.  Each bit is documented below:
-+ *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
-+ *   o RXSEQ  = Receive Sequence Error 
-+ */
-+#define POLL_IMS_ENABLE_MASK ( \
-+    E1000_IMS_RXDMT0 |         \
-+    E1000_IMS_RXSEQ)
-+
-+/* This defines the bits that are set in the Interrupt Mask
-+ * Set/Read Register.  Each bit is documented below:
-+ *   o RXT0   = Receiver Timer Interrupt (ring 0)
-+ *   o TXDW   = Transmit Descriptor Written Back
-+ *   o RXDMT0 = Receive Descriptor Minimum Threshold hit (ring 0)
-+ *   o RXSEQ  = Receive Sequence Error
-+ *   o LSC    = Link Status Change
-+ */
-+#define IMS_ENABLE_MASK ( \
-+    E1000_IMS_RXT0   |    \
-+    E1000_IMS_TXDW   |    \
-+    E1000_IMS_RXDMT0 |    \
-+    E1000_IMS_RXSEQ  |    \
-+    E1000_IMS_LSC)
-+
-+/* Number of high/low register pairs in the RAR. The RAR (Receive Address
-+ * Registers) holds the directed and multicast addresses that we monitor. We
-+ * reserve one of these spots for our directed address, allowing us room for
-+ * E1000_RAR_ENTRIES - 1 multicast addresses. 
-+ */
-+#define E1000_RAR_ENTRIES 15
-+
-+#define MIN_NUMBER_OF_DESCRIPTORS 8
-+#define MAX_NUMBER_OF_DESCRIPTORS 0xFFF8
-+
-+/* Receive Descriptor */
-+struct e1000_rx_desc {
-+    uint64_t buffer_addr; /* Address of the descriptor's data buffer */
-+    uint16_t length;     /* Length of data DMAed into data buffer */
-+    uint16_t csum;       /* Packet checksum */
-+    uint8_t status;      /* Descriptor status */
-+    uint8_t errors;      /* Descriptor Errors */
-+    uint16_t special;
-+};
-+
-+/* Receive Decriptor bit definitions */
-+#define E1000_RXD_STAT_DD       0x01    /* Descriptor Done */
-+#define E1000_RXD_STAT_EOP      0x02    /* End of Packet */
-+#define E1000_RXD_STAT_IXSM     0x04    /* Ignore checksum */
-+#define E1000_RXD_STAT_VP       0x08    /* IEEE VLAN Packet */
-+#define E1000_RXD_STAT_TCPCS    0x20    /* TCP xsum calculated */
-+#define E1000_RXD_STAT_IPCS     0x40    /* IP xsum calculated */
-+#define E1000_RXD_STAT_PIF      0x80    /* passed in-exact filter */
-+#define E1000_RXD_ERR_CE        0x01    /* CRC Error */
-+#define E1000_RXD_ERR_SE        0x02    /* Symbol Error */
-+#define E1000_RXD_ERR_SEQ       0x04    /* Sequence Error */
-+#define E1000_RXD_ERR_CXE       0x10    /* Carrier Extension Error */
-+#define E1000_RXD_ERR_TCPE      0x20    /* TCP/UDP Checksum Error */
-+#define E1000_RXD_ERR_IPE       0x40    /* IP Checksum Error */
-+#define E1000_RXD_ERR_RXE       0x80    /* Rx Data Error */
-+#define E1000_RXD_SPC_VLAN_MASK 0x0FFF  /* VLAN ID is in lower 12 bits */
-+#define E1000_RXD_SPC_PRI_MASK  0xE000  /* Priority is in upper 3 bits */
-+#define E1000_RXD_SPC_PRI_SHIFT 0x000D  /* Priority is in upper 3 of 16 */
-+#define E1000_RXD_SPC_CFI_MASK  0x1000  /* CFI is bit 12 */
-+#define E1000_RXD_SPC_CFI_SHIFT 0x000C  /* CFI is bit 12 */
-+
-+/* mask to determine if packets should be dropped due to frame errors */
-+#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
-+    E1000_RXD_ERR_CE  |                \
-+    E1000_RXD_ERR_SE  |                \
-+    E1000_RXD_ERR_SEQ |                \
-+    E1000_RXD_ERR_CXE |                \
-+    E1000_RXD_ERR_RXE)
-+
-+/* Transmit Descriptor */
-+struct e1000_tx_desc {
-+    uint64_t buffer_addr;       /* Address of the descriptor's data buffer */
-+    union {
-+        uint32_t data;
-+        struct {
-+            uint16_t length;    /* Data buffer length */
-+            uint8_t cso;        /* Checksum offset */
-+            uint8_t cmd;        /* Descriptor control */
-+        } flags;
-+    } lower;
-+    union {
-+        uint32_t data;
-+        struct {
-+            uint8_t status;     /* Descriptor status */
-+            uint8_t css;        /* Checksum start */
-+            uint16_t special;
-+        } fields;
-+    } upper;
-+};
-+
-+/* Transmit Descriptor bit definitions */
-+#define E1000_TXD_DTYP_D     0x00100000 /* Data Descriptor */
-+#define E1000_TXD_DTYP_C     0x00000000 /* Context Descriptor */
-+#define E1000_TXD_POPTS_IXSM 0x01       /* Insert IP checksum */
-+#define E1000_TXD_POPTS_TXSM 0x02       /* Insert TCP/UDP checksum */
-+#define E1000_TXD_CMD_EOP    0x01000000 /* End of Packet */
-+#define E1000_TXD_CMD_IFCS   0x02000000 /* Insert FCS (Ethernet CRC) */
-+#define E1000_TXD_CMD_IC     0x04000000 /* Insert Checksum */
-+#define E1000_TXD_CMD_RS     0x08000000 /* Report Status */
-+#define E1000_TXD_CMD_RPS    0x10000000 /* Report Packet Sent */
-+#define E1000_TXD_CMD_DEXT   0x20000000 /* Descriptor extension (0 = legacy) */
-+#define E1000_TXD_CMD_VLE    0x40000000 /* Add VLAN tag */
-+#define E1000_TXD_CMD_IDE    0x80000000 /* Enable Tidv register */
-+#define E1000_TXD_STAT_DD    0x00000001 /* Descriptor Done */
-+#define E1000_TXD_STAT_EC    0x00000002 /* Excess Collisions */
-+#define E1000_TXD_STAT_LC    0x00000004 /* Late Collisions */
-+#define E1000_TXD_STAT_TU    0x00000008 /* Transmit underrun */
-+#define E1000_TXD_CMD_TCP    0x01000000 /* TCP packet */
-+#define E1000_TXD_CMD_IP     0x02000000 /* IP packet */
-+#define E1000_TXD_CMD_TSE    0x04000000 /* TCP Seg enable */
-+#define E1000_TXD_STAT_TC    0x00000004 /* Tx Underrun */
-+
-+/* Offload Context Descriptor */
-+struct e1000_context_desc {
-+    union {
-+        uint32_t ip_config;
-+        struct {
-+            uint8_t ipcss;      /* IP checksum start */
-+            uint8_t ipcso;      /* IP checksum offset */
-+            uint16_t ipcse;     /* IP checksum end */
-+        } ip_fields;
-+    } lower_setup;
-+    union {
-+        uint32_t tcp_config;
-+        struct {
-+            uint8_t tucss;      /* TCP checksum start */
-+            uint8_t tucso;      /* TCP checksum offset */
-+            uint16_t tucse;     /* TCP checksum end */
-+        } tcp_fields;
-+    } upper_setup;
-+    uint32_t cmd_and_length;    /* */
-+    union {
-+        uint32_t data;
-+        struct {
-+            uint8_t status;     /* Descriptor status */
-+            uint8_t hdr_len;    /* Header length */
-+            uint16_t mss;       /* Maximum segment size */
-+        } fields;
-+    } tcp_seg_setup;
-+};
-+
-+/* Offload data descriptor */
-+struct e1000_data_desc {
-+    uint64_t buffer_addr;       /* Address of the descriptor's buffer address */
-+    union {
-+        uint32_t data;
-+        struct {
-+            uint16_t length;    /* Data buffer length */
-+            uint8_t typ_len_ext;        /* */
-+            uint8_t cmd;        /* */
-+        } flags;
-+    } lower;
-+    union {
-+        uint32_t data;
-+        struct {
-+            uint8_t status;     /* Descriptor status */
-+            uint8_t popts;      /* Packet Options */
-+            uint16_t special;   /* */
-+        } fields;
-+    } upper;
-+};
-+
-+/* Filters */
-+#define E1000_NUM_UNICAST          16   /* Unicast filter entries */
-+#define E1000_MC_TBL_SIZE          128  /* Multicast Filter Table (4096 bits) */
-+#define E1000_VLAN_FILTER_TBL_SIZE 128  /* VLAN Filter Table (4096 bits) */
-+
-+
-+/* Receive Address Register */
-+struct e1000_rar {
-+    volatile uint32_t low;      /* receive address low */
-+    volatile uint32_t high;     /* receive address high */
-+};
-+
-+/* Number of entries in the Multicast Table Array (MTA). */
-+#define E1000_NUM_MTA_REGISTERS 128
-+
-+/* IPv4 Address Table Entry */
-+struct e1000_ipv4_at_entry {
-+    volatile uint32_t ipv4_addr;        /* IP Address (RW) */
-+    volatile uint32_t reserved;
-+};
-+
-+/* Four wakeup IP addresses are supported */
-+#define E1000_WAKEUP_IP_ADDRESS_COUNT_MAX 4
-+#define E1000_IP4AT_SIZE                  E1000_WAKEUP_IP_ADDRESS_COUNT_MAX
-+#define E1000_IP6AT_SIZE                  1
-+
-+/* IPv6 Address Table Entry */
-+struct e1000_ipv6_at_entry {
-+    volatile uint8_t ipv6_addr[16];
-+};
-+
-+/* Flexible Filter Length Table Entry */
-+struct e1000_fflt_entry {
-+    volatile uint32_t length;   /* Flexible Filter Length (RW) */
-+    volatile uint32_t reserved;
-+};
-+
-+/* Flexible Filter Mask Table Entry */
-+struct e1000_ffmt_entry {
-+    volatile uint32_t mask;     /* Flexible Filter Mask (RW) */
-+    volatile uint32_t reserved;
-+};
-+
-+/* Flexible Filter Value Table Entry */
-+struct e1000_ffvt_entry {
-+    volatile uint32_t value;    /* Flexible Filter Value (RW) */
-+    volatile uint32_t reserved;
-+};
-+
-+/* Four Flexible Filters are supported */
-+#define E1000_FLEXIBLE_FILTER_COUNT_MAX 4
-+
-+/* Each Flexible Filter is at most 128 (0x80) bytes in length */
-+#define E1000_FLEXIBLE_FILTER_SIZE_MAX  128
-+
-+#define E1000_FFLT_SIZE E1000_FLEXIBLE_FILTER_COUNT_MAX
-+#define E1000_FFMT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-+#define E1000_FFVT_SIZE E1000_FLEXIBLE_FILTER_SIZE_MAX
-+
-+/* Register Set. (82543, 82544)
-+ *
-+ * Registers are defined to be 32 bits and  should be accessed as 32 bit values.
-+ * These registers are physically located on the NIC, but are mapped into the 
-+ * host memory address space.
-+ *
-+ * RW - register is both readable and writable
-+ * RO - register is read only
-+ * WO - register is write only
-+ * R/clr - register is read only and is cleared when read
-+ * A - register array
-+ */
-+#define E1000_CTRL     0x00000  /* Device Control - RW */
-+#define E1000_CTRL_DUP 0x00004  /* Device Control Duplicate (Shadow) - RW */
-+#define E1000_STATUS   0x00008  /* Device Status - RO */
-+#define E1000_EECD     0x00010  /* EEPROM/Flash Control - RW */
-+#define E1000_EERD     0x00014  /* EEPROM Read - RW */
-+#define E1000_CTRL_EXT 0x00018  /* Extended Device Control - RW */
-+#define E1000_FLA      0x0001C  /* Flash Access - RW */
-+#define E1000_MDIC     0x00020  /* MDI Control - RW */
-+#define E1000_FCAL     0x00028  /* Flow Control Address Low - RW */
-+#define E1000_FCAH     0x0002C  /* Flow Control Address High -RW */
-+#define E1000_FCT      0x00030  /* Flow Control Type - RW */
-+#define E1000_VET      0x00038  /* VLAN Ether Type - RW */
-+#define E1000_ICR      0x000C0  /* Interrupt Cause Read - R/clr */
-+#define E1000_ITR      0x000C4  /* Interrupt Throttling Rate - RW */
-+#define E1000_ICS      0x000C8  /* Interrupt Cause Set - WO */
-+#define E1000_IMS      0x000D0  /* Interrupt Mask Set - RW */
-+#define E1000_IMC      0x000D8  /* Interrupt Mask Clear - WO */
-+#define E1000_RCTL     0x00100  /* RX Control - RW */
-+#define E1000_FCTTV    0x00170  /* Flow Control Transmit Timer Value - RW */
-+#define E1000_TXCW     0x00178  /* TX Configuration Word - RW */
-+#define E1000_RXCW     0x00180  /* RX Configuration Word - RO */
-+#define E1000_TCTL     0x00400  /* TX Control - RW */
-+#define E1000_TIPG     0x00410  /* TX Inter-packet gap -RW */
-+#define E1000_TBT      0x00448  /* TX Burst Timer - RW */
-+#define E1000_AIT      0x00458  /* Adaptive Interframe Spacing Throttle - RW */
-+#define E1000_LEDCTL   0x00E00  /* LED Control - RW */
-+#define E1000_PBA      0x01000  /* Packet Buffer Allocation - RW */
-+#define E1000_FCRTL    0x02160  /* Flow Control Receive Threshold Low - RW */
-+#define E1000_FCRTH    0x02168  /* Flow Control Receive Threshold High - RW */
-+#define E1000_RDBAL    0x02800  /* RX Descriptor Base Address Low - RW */
-+#define E1000_RDBAH    0x02804  /* RX Descriptor Base Address High - RW */
-+#define E1000_RDLEN    0x02808  /* RX Descriptor Length - RW */
-+#define E1000_RDH      0x02810  /* RX Descriptor Head - RW */
-+#define E1000_RDT      0x02818  /* RX Descriptor Tail - RW */
-+#define E1000_RDTR     0x02820  /* RX Delay Timer - RW */
-+#define E1000_RXDCTL   0x02828  /* RX Descriptor Control - RW */
-+#define E1000_RADV     0x0282C  /* RX Interrupt Absolute Delay Timer - RW */
-+#define E1000_RSRPD    0x02C00  /* RX Small Packet Detect - RW */
-+#define E1000_TXDMAC   0x03000  /* TX DMA Control - RW */
-+#define E1000_TDFH     0x03410  /* TX Data FIFO Head - RW */
-+#define E1000_TDFT     0x03418  /* TX Data FIFO Tail - RW */
-+#define E1000_TDFHS    0x03420  /* TX Data FIFO Head Saved - RW */
-+#define E1000_TDFTS    0x03428  /* TX Data FIFO Tail Saved - RW */
-+#define E1000_TDFPC    0x03430  /* TX Data FIFO Packet Count - RW */
-+#define E1000_TDBAL    0x03800  /* TX Descriptor Base Address Low - RW */
-+#define E1000_TDBAH    0x03804  /* TX Descriptor Base Address High - RW */
-+#define E1000_TDLEN    0x03808  /* TX Descriptor Length - RW */
-+#define E1000_TDH      0x03810  /* TX Descriptor Head - RW */
-+#define E1000_TDT      0x03818  /* TX Descripotr Tail - RW */
-+#define E1000_TIDV     0x03820  /* TX Interrupt Delay Value - RW */
-+#define E1000_TXDCTL   0x03828  /* TX Descriptor Control - RW */
-+#define E1000_TADV     0x0382C  /* TX Interrupt Absolute Delay Val - RW */
-+#define E1000_TSPMT    0x03830  /* TCP Segmentation PAD & Min Threshold - RW */
-+#define E1000_CRCERRS  0x04000  /* CRC Error Count - R/clr */
-+#define E1000_ALGNERRC 0x04004  /* Alignment Error Count - R/clr */
-+#define E1000_SYMERRS  0x04008  /* Symbol Error Count - R/clr */
-+#define E1000_RXERRC   0x0400C  /* Receive Error Count - R/clr */
-+#define E1000_MPC      0x04010  /* Missed Packet Count - R/clr */
-+#define E1000_SCC      0x04014  /* Single Collision Count - R/clr */
-+#define E1000_ECOL     0x04018  /* Excessive Collision Count - R/clr */
-+#define E1000_MCC      0x0401C  /* Multiple Collision Count - R/clr */
-+#define E1000_LATECOL  0x04020  /* Late Collision Count - R/clr */
-+#define E1000_COLC     0x04028  /* Collision Count - R/clr */
-+#define E1000_DC       0x04030  /* Defer Count - R/clr */
-+#define E1000_TNCRS    0x04034  /* TX-No CRS - R/clr */
-+#define E1000_SEC      0x04038  /* Sequence Error Count - R/clr */
-+#define E1000_CEXTERR  0x0403C  /* Carrier Extension Error Count - R/clr */
-+#define E1000_RLEC     0x04040  /* Receive Length Error Count - R/clr */
-+#define E1000_XONRXC   0x04048  /* XON RX Count - R/clr */
-+#define E1000_XONTXC   0x0404C  /* XON TX Count - R/clr */
-+#define E1000_XOFFRXC  0x04050  /* XOFF RX Count - R/clr */
-+#define E1000_XOFFTXC  0x04054  /* XOFF TX Count - R/clr */
-+#define E1000_FCRUC    0x04058  /* Flow Control RX Unsupported Count- R/clr */
-+#define E1000_PRC64    0x0405C  /* Packets RX (64 bytes) - R/clr */
-+#define E1000_PRC127   0x04060  /* Packets RX (65-127 bytes) - R/clr */
-+#define E1000_PRC255   0x04064  /* Packets RX (128-255 bytes) - R/clr */
-+#define E1000_PRC511   0x04068  /* Packets RX (255-511 bytes) - R/clr */
-+#define E1000_PRC1023  0x0406C  /* Packets RX (512-1023 bytes) - R/clr */
-+#define E1000_PRC1522  0x04070  /* Packets RX (1024-1522 bytes) - R/clr */
-+#define E1000_GPRC     0x04074  /* Good Packets RX Count - R/clr */
-+#define E1000_BPRC     0x04078  /* Broadcast Packets RX Count - R/clr */
-+#define E1000_MPRC     0x0407C  /* Multicast Packets RX Count - R/clr */
-+#define E1000_GPTC     0x04080  /* Good Packets TX Count - R/clr */
-+#define E1000_GORCL    0x04088  /* Good Octets RX Count Low - R/clr */
-+#define E1000_GORCH    0x0408C  /* Good Octets RX Count High - R/clr */
-+#define E1000_GOTCL    0x04090  /* Good Octets TX Count Low - R/clr */
-+#define E1000_GOTCH    0x04094  /* Good Octets TX Count High - R/clr */
-+#define E1000_RNBC     0x040A0  /* RX No Buffers Count - R/clr */
-+#define E1000_RUC      0x040A4  /* RX Undersize Count - R/clr */
-+#define E1000_RFC      0x040A8  /* RX Fragment Count - R/clr */
-+#define E1000_ROC      0x040AC  /* RX Oversize Count - R/clr */
-+#define E1000_RJC      0x040B0  /* RX Jabber Count - R/clr */
-+#define E1000_MGTPRC   0x040B4  /* Management Packets RX Count - R/clr */
-+#define E1000_MGTPDC   0x040B8  /* Management Packets Dropped Count - R/clr */
-+#define E1000_MGTPTC   0x040BC  /* Management Packets TX Count - R/clr */
-+#define E1000_TORL     0x040C0  /* Total Octets RX Low - R/clr */
-+#define E1000_TORH     0x040C4  /* Total Octets RX High - R/clr */
-+#define E1000_TOTL     0x040C8  /* Total Octets TX Low - R/clr */
-+#define E1000_TOTH     0x040CC  /* Total Octets TX High - R/clr */
-+#define E1000_TPR      0x040D0  /* Total Packets RX - R/clr */
-+#define E1000_TPT      0x040D4  /* Total Packets TX - R/clr */
-+#define E1000_PTC64    0x040D8  /* Packets TX (64 bytes) - R/clr */
-+#define E1000_PTC127   0x040DC  /* Packets TX (65-127 bytes) - R/clr */
-+#define E1000_PTC255   0x040E0  /* Packets TX (128-255 bytes) - R/clr */
-+#define E1000_PTC511   0x040E4  /* Packets TX (256-511 bytes) - R/clr */
-+#define E1000_PTC1023  0x040E8  /* Packets TX (512-1023 bytes) - R/clr */
-+#define E1000_PTC1522  0x040EC  /* Packets TX (1024-1522 Bytes) - R/clr */
-+#define E1000_MPTC     0x040F0  /* Multicast Packets TX Count - R/clr */
-+#define E1000_BPTC     0x040F4  /* Broadcast Packets TX Count - R/clr */
-+#define E1000_TSCTC    0x040F8  /* TCP Segmentation Context TX - R/clr */
-+#define E1000_TSCTFC   0x040FC  /* TCP Segmentation Context TX Fail - R/clr */
-+#define E1000_RXCSUM   0x05000  /* RX Checksum Control - RW */
-+#define E1000_MTA      0x05200  /* Multicast Table Array - RW Array */
-+#define E1000_RA       0x05400  /* Receive Address - RW Array */
-+#define E1000_VFTA     0x05600  /* VLAN Filter Table Array - RW Array */
-+#define E1000_WUC      0x05800  /* Wakeup Control - RW */
-+#define E1000_WUFC     0x05808  /* Wakeup Filter Control - RW */
-+#define E1000_WUS      0x05810  /* Wakeup Status - RO */
-+#define E1000_MANC     0x05820  /* Management Control - RW */
-+#define E1000_IPAV     0x05838  /* IP Address Valid - RW */
-+#define E1000_IP4AT    0x05840  /* IPv4 Address Table - RW Array */
-+#define E1000_IP6AT    0x05880  /* IPv6 Address Table - RW Array */
-+#define E1000_WUPL     0x05900  /* Wakeup Packet Length - RW */
-+#define E1000_WUPM     0x05A00  /* Wakeup Packet Memory - RO A */
-+#define E1000_FFLT     0x05F00  /* Flexible Filter Length Table - RW Array */
-+#define E1000_FFMT     0x09000  /* Flexible Filter Mask Table - RW Array */
-+#define E1000_FFVT     0x09800  /* Flexible Filter Value Table - RW Array */
-+
-+/* Register Set (82542)
-+ *
-+ * Some of the 82542 registers are located at different offsets than they are
-+ * in more current versions of the 8254x. Despite the difference in location,
-+ * the registers function in the same manner.
-+ */
-+#define E1000_82542_CTRL     E1000_CTRL
-+#define E1000_82542_CTRL_DUP E1000_CTRL_DUP
-+#define E1000_82542_STATUS   E1000_STATUS
-+#define E1000_82542_EECD     E1000_EECD
-+#define E1000_82542_EERD     E1000_EERD
-+#define E1000_82542_CTRL_EXT E1000_CTRL_EXT
-+#define E1000_82542_FLA      E1000_FLA
-+#define E1000_82542_MDIC     E1000_MDIC
-+#define E1000_82542_FCAL     E1000_FCAL
-+#define E1000_82542_FCAH     E1000_FCAH
-+#define E1000_82542_FCT      E1000_FCT
-+#define E1000_82542_VET      E1000_VET
-+#define E1000_82542_RA       0x00040
-+#define E1000_82542_ICR      E1000_ICR
-+#define E1000_82542_ITR      E1000_ITR
-+#define E1000_82542_ICS      E1000_ICS
-+#define E1000_82542_IMS      E1000_IMS
-+#define E1000_82542_IMC      E1000_IMC
-+#define E1000_82542_RCTL     E1000_RCTL
-+#define E1000_82542_RDTR     0x00108
-+#define E1000_82542_RDBAL    0x00110
-+#define E1000_82542_RDBAH    0x00114
-+#define E1000_82542_RDLEN    0x00118
-+#define E1000_82542_RDH      0x00120
-+#define E1000_82542_RDT      0x00128
-+#define E1000_82542_FCRTH    0x00160
-+#define E1000_82542_FCRTL    0x00168
-+#define E1000_82542_FCTTV    E1000_FCTTV
-+#define E1000_82542_TXCW     E1000_TXCW
-+#define E1000_82542_RXCW     E1000_RXCW
-+#define E1000_82542_MTA      0x00200
-+#define E1000_82542_TCTL     E1000_TCTL
-+#define E1000_82542_TIPG     E1000_TIPG
-+#define E1000_82542_TDBAL    0x00420
-+#define E1000_82542_TDBAH    0x00424
-+#define E1000_82542_TDLEN    0x00428
-+#define E1000_82542_TDH      0x00430
-+#define E1000_82542_TDT      0x00438
-+#define E1000_82542_TIDV     0x00440
-+#define E1000_82542_TBT      E1000_TBT
-+#define E1000_82542_AIT      E1000_AIT
-+#define E1000_82542_VFTA     0x00600
-+#define E1000_82542_LEDCTL   E1000_LEDCTL
-+#define E1000_82542_PBA      E1000_PBA
-+#define E1000_82542_RXDCTL   E1000_RXDCTL
-+#define E1000_82542_RADV     E1000_RADV
-+#define E1000_82542_RSRPD    E1000_RSRPD
-+#define E1000_82542_TXDMAC   E1000_TXDMAC
-+#define E1000_82542_TDFHS    E1000_TDFHS
-+#define E1000_82542_TDFTS    E1000_TDFTS
-+#define E1000_82542_TDFPC    E1000_TDFPC
-+#define E1000_82542_TXDCTL   E1000_TXDCTL
-+#define E1000_82542_TADV     E1000_TADV
-+#define E1000_82542_TSPMT    E1000_TSPMT
-+#define E1000_82542_CRCERRS  E1000_CRCERRS
-+#define E1000_82542_ALGNERRC E1000_ALGNERRC
-+#define E1000_82542_SYMERRS  E1000_SYMERRS
-+#define E1000_82542_RXERRC   E1000_RXERRC
-+#define E1000_82542_MPC      E1000_MPC
-+#define E1000_82542_SCC      E1000_SCC
-+#define E1000_82542_ECOL     E1000_ECOL
-+#define E1000_82542_MCC      E1000_MCC
-+#define E1000_82542_LATECOL  E1000_LATECOL
-+#define E1000_82542_COLC     E1000_COLC
-+#define E1000_82542_DC       E1000_DC
-+#define E1000_82542_TNCRS    E1000_TNCRS
-+#define E1000_82542_SEC      E1000_SEC
-+#define E1000_82542_CEXTERR  E1000_CEXTERR
-+#define E1000_82542_RLEC     E1000_RLEC
-+#define E1000_82542_XONRXC   E1000_XONRXC
-+#define E1000_82542_XONTXC   E1000_XONTXC
-+#define E1000_82542_XOFFRXC  E1000_XOFFRXC
-+#define E1000_82542_XOFFTXC  E1000_XOFFTXC
-+#define E1000_82542_FCRUC    E1000_FCRUC
-+#define E1000_82542_PRC64    E1000_PRC64
-+#define E1000_82542_PRC127   E1000_PRC127
-+#define E1000_82542_PRC255   E1000_PRC255
-+#define E1000_82542_PRC511   E1000_PRC511
-+#define E1000_82542_PRC1023  E1000_PRC1023
-+#define E1000_82542_PRC1522  E1000_PRC1522
-+#define E1000_82542_GPRC     E1000_GPRC
-+#define E1000_82542_BPRC     E1000_BPRC
-+#define E1000_82542_MPRC     E1000_MPRC
-+#define E1000_82542_GPTC     E1000_GPTC
-+#define E1000_82542_GORCL    E1000_GORCL
-+#define E1000_82542_GORCH    E1000_GORCH
-+#define E1000_82542_GOTCL    E1000_GOTCL
-+#define E1000_82542_GOTCH    E1000_GOTCH
-+#define E1000_82542_RNBC     E1000_RNBC
-+#define E1000_82542_RUC      E1000_RUC
-+#define E1000_82542_RFC      E1000_RFC
-+#define E1000_82542_ROC      E1000_ROC
-+#define E1000_82542_RJC      E1000_RJC
-+#define E1000_82542_MGTPRC   E1000_MGTPRC
-+#define E1000_82542_MGTPDC   E1000_MGTPDC
-+#define E1000_82542_MGTPTC   E1000_MGTPTC
-+#define E1000_82542_TORL     E1000_TORL
-+#define E1000_82542_TORH     E1000_TORH
-+#define E1000_82542_TOTL     E1000_TOTL
-+#define E1000_82542_TOTH     E1000_TOTH
-+#define E1000_82542_TPR      E1000_TPR
-+#define E1000_82542_TPT      E1000_TPT
-+#define E1000_82542_PTC64    E1000_PTC64
-+#define E1000_82542_PTC127   E1000_PTC127
-+#define E1000_82542_PTC255   E1000_PTC255
-+#define E1000_82542_PTC511   E1000_PTC511
-+#define E1000_82542_PTC1023  E1000_PTC1023
-+#define E1000_82542_PTC1522  E1000_PTC1522
-+#define E1000_82542_MPTC     E1000_MPTC
-+#define E1000_82542_BPTC     E1000_BPTC
-+#define E1000_82542_TSCTC    E1000_TSCTC
-+#define E1000_82542_TSCTFC   E1000_TSCTFC
-+#define E1000_82542_RXCSUM   E1000_RXCSUM
-+#define E1000_82542_WUC      E1000_WUC
-+#define E1000_82542_WUFC     E1000_WUFC
-+#define E1000_82542_WUS      E1000_WUS
-+#define E1000_82542_MANC     E1000_MANC
-+#define E1000_82542_IPAV     E1000_IPAV
-+#define E1000_82542_IP4AT    E1000_IP4AT
-+#define E1000_82542_IP6AT    E1000_IP6AT
-+#define E1000_82542_WUPL     E1000_WUPL
-+#define E1000_82542_WUPM     E1000_WUPM
-+#define E1000_82542_FFLT     E1000_FFLT
-+#define E1000_82542_TDFH     0x08010
-+#define E1000_82542_TDFT     0x08018
-+#define E1000_82542_FFMT     E1000_FFMT
-+#define E1000_82542_FFVT     E1000_FFVT
-+
-+/* Statistics counters collected by the MAC */
-+struct e1000_hw_stats {
-+    uint64_t crcerrs;
-+    uint64_t algnerrc;
-+    uint64_t symerrs;
-+    uint64_t rxerrc;
-+    uint64_t mpc;
-+    uint64_t scc;
-+    uint64_t ecol;
-+    uint64_t mcc;
-+    uint64_t latecol;
-+    uint64_t colc;
-+    uint64_t dc;
-+    uint64_t tncrs;
-+    uint64_t sec;
-+    uint64_t cexterr;
-+    uint64_t rlec;
-+    uint64_t xonrxc;
-+    uint64_t xontxc;
-+    uint64_t xoffrxc;
-+    uint64_t xofftxc;
-+    uint64_t fcruc;
-+    uint64_t prc64;
-+    uint64_t prc127;
-+    uint64_t prc255;
-+    uint64_t prc511;
-+    uint64_t prc1023;
-+    uint64_t prc1522;
-+    uint64_t gprc;
-+    uint64_t bprc;
-+    uint64_t mprc;
-+    uint64_t gptc;
-+    uint64_t gorcl;
-+    uint64_t gorch;
-+    uint64_t gotcl;
-+    uint64_t gotch;
-+    uint64_t rnbc;
-+    uint64_t ruc;
-+    uint64_t rfc;
-+    uint64_t roc;
-+    uint64_t rjc;
-+    uint64_t mgprc;
-+    uint64_t mgpdc;
-+    uint64_t mgptc;
-+    uint64_t torl;
-+    uint64_t torh;
-+    uint64_t totl;
-+    uint64_t toth;
-+    uint64_t tpr;
-+    uint64_t tpt;
-+    uint64_t ptc64;
-+    uint64_t ptc127;
-+    uint64_t ptc255;
-+    uint64_t ptc511;
-+    uint64_t ptc1023;
-+    uint64_t ptc1522;
-+    uint64_t mptc;
-+    uint64_t bptc;
-+    uint64_t tsctc;
-+    uint64_t tsctfc;
-+};
-+
-+/* Structure containing variables used by the shared code (e1000_hw.c) */
-+struct e1000_hw {
-+	struct pci_device *pdev;
-+	uint8_t *hw_addr;
-+	e1000_mac_type   mac_type;
-+	e1000_phy_type phy_type;
-+#if 0
-+	uint32_t phy_init_script;
-+#endif
-+	e1000_media_type media_type;
-+	e1000_fc_type    fc;
-+#if 0
-+	e1000_bus_speed bus_speed;
-+	e1000_bus_width bus_width;
-+	e1000_bus_type  bus_type;
-+#endif
-+	struct e1000_eeprom_info eeprom;
-+#if 0
-+	e1000_ms_type master_slave;
-+	e1000_ms_type original_master_slave;
-+	e1000_ffe_config ffe_config_state;
-+#endif
-+	uint32_t io_base;
-+	uint32_t phy_id;
-+#ifdef LINUX_DRIVER
-+	uint32_t phy_revision;
-+#endif
-+	uint32_t phy_addr;
-+#if 0
-+	uint32_t original_fc;
-+#endif
-+	uint32_t txcw;
-+	uint32_t autoneg_failed;
-+#if 0
-+	uint32_t max_frame_size;
-+	uint32_t min_frame_size;
-+	uint32_t mc_filter_type;
-+	uint32_t num_mc_addrs;
-+	uint32_t collision_delta;
-+	uint32_t tx_packet_delta;
-+	uint32_t ledctl_default;
-+	uint32_t ledctl_mode1;
-+	uint32_t ledctl_mode2;
-+	uint16_t phy_spd_default;
-+#endif
-+	uint16_t autoneg_advertised;
-+	uint16_t pci_cmd_word;
-+#if 0
-+	uint16_t fc_high_water;
-+	uint16_t fc_low_water;
-+	uint16_t fc_pause_time;
-+	uint16_t current_ifs_val;
-+	uint16_t ifs_min_val;
-+	uint16_t ifs_max_val;
-+	uint16_t ifs_step_size;
-+	uint16_t ifs_ratio;
-+#endif
-+	uint16_t device_id;
-+	uint16_t vendor_id;
-+#if 0
-+	uint16_t subsystem_id;
-+	uint16_t subsystem_vendor_id;
-+#endif
-+	uint8_t revision_id;
-+#if 0
-+	uint8_t autoneg;
-+	uint8_t mdix;
-+	uint8_t forced_speed_duplex;
-+	uint8_t wait_autoneg_complete;
-+	uint8_t dma_fairness;
-+#endif
-+	uint8_t mac_addr[NODE_ADDRESS_SIZE];
-+#if 0
-+	uint8_t perm_mac_addr[NODE_ADDRESS_SIZE];
-+	boolean_t disable_polarity_correction;
-+	boolean_t speed_downgraded;
-+	e1000_dsp_config dsp_config_state;
-+	boolean_t get_link_status;
-+	boolean_t serdes_link_down;
-+#endif
-+	boolean_t tbi_compatibility_en;
-+	boolean_t tbi_compatibility_on;
-+#if 0
-+	boolean_t phy_reset_disable;
-+	boolean_t fc_send_xon;
-+	boolean_t fc_strict_ieee;
-+	boolean_t report_tx_early;
-+	boolean_t adaptive_ifs;
-+	boolean_t ifs_params_forced;
-+	boolean_t in_ifs_mode;
-+#endif
-+};
-+
-+
-+#define E1000_EEPROM_SWDPIN0   0x0001   /* SWDPIN 0 EEPROM Value */
-+#define E1000_EEPROM_LED_LOGIC 0x0020   /* Led Logic Word */
-+
-+/* Register Bit Masks */
-+/* Device Control */
-+#define E1000_CTRL_FD       0x00000001  /* Full duplex.0=half; 1=full */
-+#define E1000_CTRL_BEM      0x00000002  /* Endian Mode.0=little,1=big */
-+#define E1000_CTRL_PRIOR    0x00000004  /* Priority on PCI. 0=rx,1=fair */
-+#define E1000_CTRL_LRST     0x00000008  /* Link reset. 0=normal,1=reset */
-+#define E1000_CTRL_TME      0x00000010  /* Test mode. 0=normal,1=test */
-+#define E1000_CTRL_SLE      0x00000020  /* Serial Link on 0=dis,1=en */
-+#define E1000_CTRL_ASDE     0x00000020  /* Auto-speed detect enable */
-+#define E1000_CTRL_SLU      0x00000040  /* Set link up (Force Link) */
-+#define E1000_CTRL_ILOS     0x00000080  /* Invert Loss-Of Signal */
-+#define E1000_CTRL_SPD_SEL  0x00000300  /* Speed Select Mask */
-+#define E1000_CTRL_SPD_10   0x00000000  /* Force 10Mb */
-+#define E1000_CTRL_SPD_100  0x00000100  /* Force 100Mb */
-+#define E1000_CTRL_SPD_1000 0x00000200  /* Force 1Gb */
-+#define E1000_CTRL_BEM32    0x00000400  /* Big Endian 32 mode */
-+#define E1000_CTRL_FRCSPD   0x00000800  /* Force Speed */
-+#define E1000_CTRL_FRCDPX   0x00001000  /* Force Duplex */
-+#define E1000_CTRL_SWDPIN0  0x00040000  /* SWDPIN 0 value */
-+#define E1000_CTRL_SWDPIN1  0x00080000  /* SWDPIN 1 value */
-+#define E1000_CTRL_SWDPIN2  0x00100000  /* SWDPIN 2 value */
-+#define E1000_CTRL_SWDPIN3  0x00200000  /* SWDPIN 3 value */
-+#define E1000_CTRL_SWDPIO0  0x00400000  /* SWDPIN 0 Input or output */
-+#define E1000_CTRL_SWDPIO1  0x00800000  /* SWDPIN 1 input or output */
-+#define E1000_CTRL_SWDPIO2  0x01000000  /* SWDPIN 2 input or output */
-+#define E1000_CTRL_SWDPIO3  0x02000000  /* SWDPIN 3 input or output */
-+#define E1000_CTRL_RST      0x04000000  /* Global reset */
-+#define E1000_CTRL_RFCE     0x08000000  /* Receive Flow Control enable */
-+#define E1000_CTRL_TFCE     0x10000000  /* Transmit flow control enable */
-+#define E1000_CTRL_RTE      0x20000000  /* Routing tag enable */
-+#define E1000_CTRL_VME      0x40000000  /* IEEE VLAN mode enable */
-+#define E1000_CTRL_PHY_RST  0x80000000  /* PHY Reset */
-+
-+/* Device Status */
-+#define E1000_STATUS_FD         0x00000001      /* Full duplex.0=half,1=full */
-+#define E1000_STATUS_LU         0x00000002      /* Link up.0=no,1=link */
-+#define E1000_STATUS_FUNC_MASK  0x0000000C      /* PCI Function Mask */
-+#define E1000_STATUS_FUNC_0     0x00000000      /* Function 0 */
-+#define E1000_STATUS_FUNC_1     0x00000004      /* Function 1 */
-+#define E1000_STATUS_TXOFF      0x00000010      /* transmission paused */
-+#define E1000_STATUS_TBIMODE    0x00000020      /* TBI mode */
-+#define E1000_STATUS_SPEED_MASK 0x000000C0
-+#define E1000_STATUS_SPEED_10   0x00000000      /* Speed 10Mb/s */
-+#define E1000_STATUS_SPEED_100  0x00000040      /* Speed 100Mb/s */
-+#define E1000_STATUS_SPEED_1000 0x00000080      /* Speed 1000Mb/s */
-+#define E1000_STATUS_ASDV       0x00000300      /* Auto speed detect value */
-+#define E1000_STATUS_MTXCKOK    0x00000400      /* MTX clock running OK */
-+#define E1000_STATUS_PCI66      0x00000800      /* In 66Mhz slot */
-+#define E1000_STATUS_BUS64      0x00001000      /* In 64 bit slot */
-+#define E1000_STATUS_PCIX_MODE  0x00002000      /* PCI-X mode */
-+#define E1000_STATUS_PCIX_SPEED 0x0000C000      /* PCI-X bus speed */
-+
-+/* Constants used to intrepret the masked PCI-X bus speed. */
-+#define E1000_STATUS_PCIX_SPEED_66  0x00000000 /* PCI-X bus speed  50-66 MHz */
-+#define E1000_STATUS_PCIX_SPEED_100 0x00004000 /* PCI-X bus speed  66-100 MHz */
-+#define E1000_STATUS_PCIX_SPEED_133 0x00008000 /* PCI-X bus speed 100-133 MHz */
-+
-+/* EEPROM/Flash Control */
-+#define E1000_EECD_SK        0x00000001 /* EEPROM Clock */
-+#define E1000_EECD_CS        0x00000002 /* EEPROM Chip Select */
-+#define E1000_EECD_DI        0x00000004 /* EEPROM Data In */
-+#define E1000_EECD_DO        0x00000008 /* EEPROM Data Out */
-+#define E1000_EECD_FWE_MASK  0x00000030 
-+#define E1000_EECD_FWE_DIS   0x00000010 /* Disable FLASH writes */
-+#define E1000_EECD_FWE_EN    0x00000020 /* Enable FLASH writes */
-+#define E1000_EECD_FWE_SHIFT 4
-+#define E1000_EECD_REQ       0x00000040 /* EEPROM Access Request */
-+#define E1000_EECD_GNT       0x00000080 /* EEPROM Access Grant */
-+#define E1000_EECD_PRES      0x00000100 /* EEPROM Present */
-+#define E1000_EECD_SIZE      0x00000200 /* EEPROM Size (0=64 word 1=256 word) */
-+#define E1000_EECD_ADDR_BITS 0x00000400 /* EEPROM Addressing bits based on type
-+                                         * (0-small, 1-large) */
-+#define E1000_EECD_TYPE      0x00002000 /* EEPROM Type (1-SPI, 0-Microwire) */
-+#ifndef E1000_EEPROM_GRANT_ATTEMPTS
-+#define E1000_EEPROM_GRANT_ATTEMPTS 1000 /* EEPROM # attempts to gain grant */
-+#endif
-+
-+/* EEPROM Read */
-+#define E1000_EERD_START      0x00000001 /* Start Read */
-+#define E1000_EERD_DONE       0x00000010 /* Read Done */
-+#define E1000_EERD_ADDR_SHIFT 8
-+#define E1000_EERD_ADDR_MASK  0x0000FF00 /* Read Address */
-+#define E1000_EERD_DATA_SHIFT 16
-+#define E1000_EERD_DATA_MASK  0xFFFF0000 /* Read Data */
-+
-+/* SPI EEPROM Status Register */
-+#define EEPROM_STATUS_RDY_SPI  0x01
-+#define EEPROM_STATUS_WEN_SPI  0x02
-+#define EEPROM_STATUS_BP0_SPI  0x04
-+#define EEPROM_STATUS_BP1_SPI  0x08
-+#define EEPROM_STATUS_WPEN_SPI 0x80
-+
-+/* Extended Device Control */
-+#define E1000_CTRL_EXT_GPI0_EN   0x00000001 /* Maps SDP4 to GPI0 */ 
-+#define E1000_CTRL_EXT_GPI1_EN   0x00000002 /* Maps SDP5 to GPI1 */
-+#define E1000_CTRL_EXT_PHYINT_EN E1000_CTRL_EXT_GPI1_EN
-+#define E1000_CTRL_EXT_GPI2_EN   0x00000004 /* Maps SDP6 to GPI2 */
-+#define E1000_CTRL_EXT_GPI3_EN   0x00000008 /* Maps SDP7 to GPI3 */
-+#define E1000_CTRL_EXT_SDP4_DATA 0x00000010 /* Value of SW Defineable Pin 4 */
-+#define E1000_CTRL_EXT_SDP5_DATA 0x00000020 /* Value of SW Defineable Pin 5 */
-+#define E1000_CTRL_EXT_PHY_INT   E1000_CTRL_EXT_SDP5_DATA
-+#define E1000_CTRL_EXT_SDP6_DATA 0x00000040 /* Value of SW Defineable Pin 6 */
-+#define E1000_CTRL_EXT_SDP7_DATA 0x00000080 /* Value of SW Defineable Pin 7 */
-+#define E1000_CTRL_EXT_SDP4_DIR  0x00000100 /* Direction of SDP4 0=in 1=out */
-+#define E1000_CTRL_EXT_SDP5_DIR  0x00000200 /* Direction of SDP5 0=in 1=out */
-+#define E1000_CTRL_EXT_SDP6_DIR  0x00000400 /* Direction of SDP6 0=in 1=out */
-+#define E1000_CTRL_EXT_SDP7_DIR  0x00000800 /* Direction of SDP7 0=in 1=out */
-+#define E1000_CTRL_EXT_ASDCHK    0x00001000 /* Initiate an ASD sequence */
-+#define E1000_CTRL_EXT_EE_RST    0x00002000 /* Reinitialize from EEPROM */
-+#define E1000_CTRL_EXT_IPS       0x00004000 /* Invert Power State */
-+#define E1000_CTRL_EXT_SPD_BYPS  0x00008000 /* Speed Select Bypass */
-+#define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000
-+#define E1000_CTRL_EXT_LINK_MODE_GMII 0x00000000
-+#define E1000_CTRL_EXT_LINK_MODE_TBI  0x00C00000
-+#define E1000_CTRL_EXT_WR_WMARK_MASK  0x03000000
-+#define E1000_CTRL_EXT_WR_WMARK_256   0x00000000
-+#define E1000_CTRL_EXT_WR_WMARK_320   0x01000000
-+#define E1000_CTRL_EXT_WR_WMARK_384   0x02000000
-+#define E1000_CTRL_EXT_WR_WMARK_448   0x03000000
-+
-+/* MDI Control */
-+#define E1000_MDIC_DATA_MASK 0x0000FFFF
-+#define E1000_MDIC_REG_MASK  0x001F0000
-+#define E1000_MDIC_REG_SHIFT 16
-+#define E1000_MDIC_PHY_MASK  0x03E00000
-+#define E1000_MDIC_PHY_SHIFT 21
-+#define E1000_MDIC_OP_WRITE  0x04000000
-+#define E1000_MDIC_OP_READ   0x08000000
-+#define E1000_MDIC_READY     0x10000000
-+#define E1000_MDIC_INT_EN    0x20000000
-+#define E1000_MDIC_ERROR     0x40000000
-+
-+/* LED Control */
-+#define E1000_LEDCTL_LED0_MODE_MASK  0x0000000F
-+#define E1000_LEDCTL_LED0_MODE_SHIFT 0
-+#define E1000_LEDCTL_LED0_IVRT       0x00000040
-+#define E1000_LEDCTL_LED0_BLINK      0x00000080
-+#define E1000_LEDCTL_LED1_MODE_MASK  0x00000F00
-+#define E1000_LEDCTL_LED1_MODE_SHIFT 8
-+#define E1000_LEDCTL_LED1_IVRT       0x00004000
-+#define E1000_LEDCTL_LED1_BLINK      0x00008000
-+#define E1000_LEDCTL_LED2_MODE_MASK  0x000F0000
-+#define E1000_LEDCTL_LED2_MODE_SHIFT 16
-+#define E1000_LEDCTL_LED2_IVRT       0x00400000
-+#define E1000_LEDCTL_LED2_BLINK      0x00800000
-+#define E1000_LEDCTL_LED3_MODE_MASK  0x0F000000
-+#define E1000_LEDCTL_LED3_MODE_SHIFT 24
-+#define E1000_LEDCTL_LED3_IVRT       0x40000000
-+#define E1000_LEDCTL_LED3_BLINK      0x80000000
-+
-+#define E1000_LEDCTL_MODE_LINK_10_1000  0x0
-+#define E1000_LEDCTL_MODE_LINK_100_1000 0x1
-+#define E1000_LEDCTL_MODE_LINK_UP       0x2
-+#define E1000_LEDCTL_MODE_ACTIVITY      0x3
-+#define E1000_LEDCTL_MODE_LINK_ACTIVITY 0x4
-+#define E1000_LEDCTL_MODE_LINK_10       0x5
-+#define E1000_LEDCTL_MODE_LINK_100      0x6
-+#define E1000_LEDCTL_MODE_LINK_1000     0x7
-+#define E1000_LEDCTL_MODE_PCIX_MODE     0x8
-+#define E1000_LEDCTL_MODE_FULL_DUPLEX   0x9
-+#define E1000_LEDCTL_MODE_COLLISION     0xA
-+#define E1000_LEDCTL_MODE_BUS_SPEED     0xB
-+#define E1000_LEDCTL_MODE_BUS_SIZE      0xC
-+#define E1000_LEDCTL_MODE_PAUSED        0xD
-+#define E1000_LEDCTL_MODE_LED_ON        0xE
-+#define E1000_LEDCTL_MODE_LED_OFF       0xF
-+
-+/* Receive Address */
-+#define E1000_RAH_AV  0x80000000        /* Receive descriptor valid */
-+
-+/* Interrupt Cause Read */
-+#define E1000_ICR_TXDW    0x00000001    /* Transmit desc written back */
-+#define E1000_ICR_TXQE    0x00000002    /* Transmit Queue empty */
-+#define E1000_ICR_LSC     0x00000004    /* Link Status Change */
-+#define E1000_ICR_RXSEQ   0x00000008    /* rx sequence error */
-+#define E1000_ICR_RXDMT0  0x00000010    /* rx desc min. threshold (0) */
-+#define E1000_ICR_RXO     0x00000040    /* rx overrun */
-+#define E1000_ICR_RXT0    0x00000080    /* rx timer intr (ring 0) */
-+#define E1000_ICR_MDAC    0x00000200    /* MDIO access complete */
-+#define E1000_ICR_RXCFG   0x00000400    /* RX /c/ ordered set */
-+#define E1000_ICR_GPI_EN0 0x00000800    /* GP Int 0 */
-+#define E1000_ICR_GPI_EN1 0x00001000    /* GP Int 1 */
-+#define E1000_ICR_GPI_EN2 0x00002000    /* GP Int 2 */
-+#define E1000_ICR_GPI_EN3 0x00004000    /* GP Int 3 */
-+#define E1000_ICR_TXD_LOW 0x00008000
-+#define E1000_ICR_SRPD    0x00010000
-+
-+/* Interrupt Cause Set */
-+#define E1000_ICS_TXDW    E1000_ICR_TXDW        /* Transmit desc written back */
-+#define E1000_ICS_TXQE    E1000_ICR_TXQE        /* Transmit Queue empty */
-+#define E1000_ICS_LSC     E1000_ICR_LSC         /* Link Status Change */
-+#define E1000_ICS_RXSEQ   E1000_ICR_RXSEQ       /* rx sequence error */
-+#define E1000_ICS_RXDMT0  E1000_ICR_RXDMT0      /* rx desc min. threshold */
-+#define E1000_ICS_RXO     E1000_ICR_RXO         /* rx overrun */
-+#define E1000_ICS_RXT0    E1000_ICR_RXT0        /* rx timer intr */
-+#define E1000_ICS_MDAC    E1000_ICR_MDAC        /* MDIO access complete */
-+#define E1000_ICS_RXCFG   E1000_ICR_RXCFG       /* RX /c/ ordered set */
-+#define E1000_ICS_GPI_EN0 E1000_ICR_GPI_EN0     /* GP Int 0 */
-+#define E1000_ICS_GPI_EN1 E1000_ICR_GPI_EN1     /* GP Int 1 */
-+#define E1000_ICS_GPI_EN2 E1000_ICR_GPI_EN2     /* GP Int 2 */
-+#define E1000_ICS_GPI_EN3 E1000_ICR_GPI_EN3     /* GP Int 3 */
-+#define E1000_ICS_TXD_LOW E1000_ICR_TXD_LOW
-+#define E1000_ICS_SRPD    E1000_ICR_SRPD
-+
-+/* Interrupt Mask Set */
-+#define E1000_IMS_TXDW    E1000_ICR_TXDW        /* Transmit desc written back */
-+#define E1000_IMS_TXQE    E1000_ICR_TXQE        /* Transmit Queue empty */
-+#define E1000_IMS_LSC     E1000_ICR_LSC         /* Link Status Change */
-+#define E1000_IMS_RXSEQ   E1000_ICR_RXSEQ       /* rx sequence error */
-+#define E1000_IMS_RXDMT0  E1000_ICR_RXDMT0      /* rx desc min. threshold */
-+#define E1000_IMS_RXO     E1000_ICR_RXO         /* rx overrun */
-+#define E1000_IMS_RXT0    E1000_ICR_RXT0        /* rx timer intr */
-+#define E1000_IMS_MDAC    E1000_ICR_MDAC        /* MDIO access complete */
-+#define E1000_IMS_RXCFG   E1000_ICR_RXCFG       /* RX /c/ ordered set */
-+#define E1000_IMS_GPI_EN0 E1000_ICR_GPI_EN0     /* GP Int 0 */
-+#define E1000_IMS_GPI_EN1 E1000_ICR_GPI_EN1     /* GP Int 1 */
-+#define E1000_IMS_GPI_EN2 E1000_ICR_GPI_EN2     /* GP Int 2 */
-+#define E1000_IMS_GPI_EN3 E1000_ICR_GPI_EN3     /* GP Int 3 */
-+#define E1000_IMS_TXD_LOW E1000_ICR_TXD_LOW
-+#define E1000_IMS_SRPD    E1000_ICR_SRPD
-+
-+/* Interrupt Mask Clear */
-+#define E1000_IMC_TXDW    E1000_ICR_TXDW        /* Transmit desc written back */
-+#define E1000_IMC_TXQE    E1000_ICR_TXQE        /* Transmit Queue empty */
-+#define E1000_IMC_LSC     E1000_ICR_LSC         /* Link Status Change */
-+#define E1000_IMC_RXSEQ   E1000_ICR_RXSEQ       /* rx sequence error */
-+#define E1000_IMC_RXDMT0  E1000_ICR_RXDMT0      /* rx desc min. threshold */
-+#define E1000_IMC_RXO     E1000_ICR_RXO         /* rx overrun */
-+#define E1000_IMC_RXT0    E1000_ICR_RXT0        /* rx timer intr */
-+#define E1000_IMC_MDAC    E1000_ICR_MDAC        /* MDIO access complete */
-+#define E1000_IMC_RXCFG   E1000_ICR_RXCFG       /* RX /c/ ordered set */
-+#define E1000_IMC_GPI_EN0 E1000_ICR_GPI_EN0     /* GP Int 0 */
-+#define E1000_IMC_GPI_EN1 E1000_ICR_GPI_EN1     /* GP Int 1 */
-+#define E1000_IMC_GPI_EN2 E1000_ICR_GPI_EN2     /* GP Int 2 */
-+#define E1000_IMC_GPI_EN3 E1000_ICR_GPI_EN3     /* GP Int 3 */
-+#define E1000_IMC_TXD_LOW E1000_ICR_TXD_LOW
-+#define E1000_IMC_SRPD    E1000_ICR_SRPD
-+
-+/* Receive Control */
-+#define E1000_RCTL_RST          0x00000001      /* Software reset */
-+#define E1000_RCTL_EN           0x00000002      /* enable */
-+#define E1000_RCTL_SBP          0x00000004      /* store bad packet */
-+#define E1000_RCTL_UPE          0x00000008      /* unicast promiscuous enable */
-+#define E1000_RCTL_MPE          0x00000010      /* multicast promiscuous enab */
-+#define E1000_RCTL_LPE          0x00000020      /* long packet enable */
-+#define E1000_RCTL_LBM_NO       0x00000000      /* no loopback mode */
-+#define E1000_RCTL_LBM_MAC      0x00000040      /* MAC loopback mode */
-+#define E1000_RCTL_LBM_SLP      0x00000080      /* serial link loopback mode */
-+#define E1000_RCTL_LBM_TCVR     0x000000C0      /* tcvr loopback mode */
-+#define E1000_RCTL_RDMTS_HALF   0x00000000      /* rx desc min threshold size */
-+#define E1000_RCTL_RDMTS_QUAT   0x00000100      /* rx desc min threshold size */
-+#define E1000_RCTL_RDMTS_EIGTH  0x00000200      /* rx desc min threshold size */
-+#define E1000_RCTL_MO_SHIFT     12              /* multicast offset shift */
-+#define E1000_RCTL_MO_0         0x00000000      /* multicast offset 11:0 */
-+#define E1000_RCTL_MO_1         0x00001000      /* multicast offset 12:1 */
-+#define E1000_RCTL_MO_2         0x00002000      /* multicast offset 13:2 */
-+#define E1000_RCTL_MO_3         0x00003000      /* multicast offset 15:4 */
-+#define E1000_RCTL_MDR          0x00004000      /* multicast desc ring 0 */
-+#define E1000_RCTL_BAM          0x00008000      /* broadcast enable */
-+/* these buffer sizes are valid if E1000_RCTL_BSEX is 0 */
-+#define E1000_RCTL_SZ_2048      0x00000000      /* rx buffer size 2048 */
-+#define E1000_RCTL_SZ_1024      0x00010000      /* rx buffer size 1024 */
-+#define E1000_RCTL_SZ_512       0x00020000      /* rx buffer size 512 */
-+#define E1000_RCTL_SZ_256       0x00030000      /* rx buffer size 256 */
-+/* these buffer sizes are valid if E1000_RCTL_BSEX is 1 */
-+#define E1000_RCTL_SZ_16384     0x00010000      /* rx buffer size 16384 */
-+#define E1000_RCTL_SZ_8192      0x00020000      /* rx buffer size 8192 */
-+#define E1000_RCTL_SZ_4096      0x00030000      /* rx buffer size 4096 */
-+#define E1000_RCTL_VFE          0x00040000      /* vlan filter enable */
-+#define E1000_RCTL_CFIEN        0x00080000      /* canonical form enable */
-+#define E1000_RCTL_CFI          0x00100000      /* canonical form indicator */
-+#define E1000_RCTL_DPF          0x00400000      /* discard pause frames */
-+#define E1000_RCTL_PMCF         0x00800000      /* pass MAC control frames */
-+#define E1000_RCTL_BSEX         0x02000000      /* Buffer size extension */
-+
-+/* Receive Descriptor */
-+#define E1000_RDT_DELAY 0x0000ffff      /* Delay timer (1=1024us) */
-+#define E1000_RDT_FPDB  0x80000000      /* Flush descriptor block */
-+#define E1000_RDLEN_LEN 0x0007ff80      /* descriptor length */
-+#define E1000_RDH_RDH   0x0000ffff      /* receive descriptor head */
-+#define E1000_RDT_RDT   0x0000ffff      /* receive descriptor tail */
-+
-+/* Flow Control */
-+#define E1000_FCRTH_RTH  0x0000FFF8     /* Mask Bits[15:3] for RTH */
-+#define E1000_FCRTH_XFCE 0x80000000     /* External Flow Control Enable */
-+#define E1000_FCRTL_RTL  0x0000FFF8     /* Mask Bits[15:3] for RTL */
-+#define E1000_FCRTL_XONE 0x80000000     /* Enable XON frame transmission */
-+
-+/* Receive Descriptor Control */
-+#define E1000_RXDCTL_PTHRESH 0x0000003F /* RXDCTL Prefetch Threshold */
-+#define E1000_RXDCTL_HTHRESH 0x00003F00 /* RXDCTL Host Threshold */
-+#define E1000_RXDCTL_WTHRESH 0x003F0000 /* RXDCTL Writeback Threshold */
-+#define E1000_RXDCTL_GRAN    0x01000000 /* RXDCTL Granularity */
-+
-+/* Transmit Descriptor Control */
-+#define E1000_TXDCTL_PTHRESH 0x000000FF /* TXDCTL Prefetch Threshold */
-+#define E1000_TXDCTL_HTHRESH 0x0000FF00 /* TXDCTL Host Threshold */
-+#define E1000_TXDCTL_WTHRESH 0x00FF0000 /* TXDCTL Writeback Threshold */
-+#define E1000_TXDCTL_GRAN    0x01000000 /* TXDCTL Granularity */
-+#define E1000_TXDCTL_LWTHRESH 0xFE000000 /* TXDCTL Low Threshold */
-+#define E1000_TXDCTL_FULL_TX_DESC_WB 0x01010000 /* GRAN=1, WTHRESH=1 */
-+
-+/* Transmit Configuration Word */
-+#define E1000_TXCW_FD         0x00000020        /* TXCW full duplex */
-+#define E1000_TXCW_HD         0x00000040        /* TXCW half duplex */
-+#define E1000_TXCW_PAUSE      0x00000080        /* TXCW sym pause request */
-+#define E1000_TXCW_ASM_DIR    0x00000100        /* TXCW astm pause direction */
-+#define E1000_TXCW_PAUSE_MASK 0x00000180        /* TXCW pause request mask */
-+#define E1000_TXCW_RF         0x00003000        /* TXCW remote fault */
-+#define E1000_TXCW_NP         0x00008000        /* TXCW next page */
-+#define E1000_TXCW_CW         0x0000ffff        /* TxConfigWord mask */
-+#define E1000_TXCW_TXC        0x40000000        /* Transmit Config control */
-+#define E1000_TXCW_ANE        0x80000000        /* Auto-neg enable */
-+
-+/* Receive Configuration Word */
-+#define E1000_RXCW_CW    0x0000ffff     /* RxConfigWord mask */
-+#define E1000_RXCW_NC    0x04000000     /* Receive config no carrier */
-+#define E1000_RXCW_IV    0x08000000     /* Receive config invalid */
-+#define E1000_RXCW_CC    0x10000000     /* Receive config change */
-+#define E1000_RXCW_C     0x20000000     /* Receive config */
-+#define E1000_RXCW_SYNCH 0x40000000     /* Receive config synch */
-+#define E1000_RXCW_ANC   0x80000000     /* Auto-neg complete */
-+
-+/* Transmit Control */
-+#define E1000_TCTL_RST    0x00000001    /* software reset */
-+#define E1000_TCTL_EN     0x00000002    /* enable tx */
-+#define E1000_TCTL_BCE    0x00000004    /* busy check enable */
-+#define E1000_TCTL_PSP    0x00000008    /* pad short packets */
-+#define E1000_TCTL_CT     0x00000ff0    /* collision threshold */
-+#define E1000_TCTL_COLD   0x003ff000    /* collision distance */
-+#define E1000_TCTL_SWXOFF 0x00400000    /* SW Xoff transmission */
-+#define E1000_TCTL_PBE    0x00800000    /* Packet Burst Enable */
-+#define E1000_TCTL_RTLC   0x01000000    /* Re-transmit on late collision */
-+#define E1000_TCTL_NRTU   0x02000000    /* No Re-transmit on underrun */
-+
-+/* Receive Checksum Control */
-+#define E1000_RXCSUM_PCSS_MASK 0x000000FF   /* Packet Checksum Start */
-+#define E1000_RXCSUM_IPOFL     0x00000100   /* IPv4 checksum offload */
-+#define E1000_RXCSUM_TUOFL     0x00000200   /* TCP / UDP checksum offload */
-+#define E1000_RXCSUM_IPV6OFL   0x00000400   /* IPv6 checksum offload */
-+
-+/* Definitions for power management and wakeup registers */
-+/* Wake Up Control */
-+#define E1000_WUC_APME       0x00000001 /* APM Enable */
-+#define E1000_WUC_PME_EN     0x00000002 /* PME Enable */
-+#define E1000_WUC_PME_STATUS 0x00000004 /* PME Status */
-+#define E1000_WUC_APMPME     0x00000008 /* Assert PME on APM Wakeup */
-+#define E1000_WUC_SPM        0x80000000 /* Enable SPM */
-+
-+/* Wake Up Filter Control */
-+#define E1000_WUFC_LNKC 0x00000001 /* Link Status Change Wakeup Enable */
-+#define E1000_WUFC_MAG  0x00000002 /* Magic Packet Wakeup Enable */
-+#define E1000_WUFC_EX   0x00000004 /* Directed Exact Wakeup Enable */
-+#define E1000_WUFC_MC   0x00000008 /* Directed Multicast Wakeup Enable */
-+#define E1000_WUFC_BC   0x00000010 /* Broadcast Wakeup Enable */
-+#define E1000_WUFC_ARP  0x00000020 /* ARP Request Packet Wakeup Enable */
-+#define E1000_WUFC_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Enable */
-+#define E1000_WUFC_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Enable */
-+#define E1000_WUFC_FLX0 0x00010000 /* Flexible Filter 0 Enable */
-+#define E1000_WUFC_FLX1 0x00020000 /* Flexible Filter 1 Enable */
-+#define E1000_WUFC_FLX2 0x00040000 /* Flexible Filter 2 Enable */
-+#define E1000_WUFC_FLX3 0x00080000 /* Flexible Filter 3 Enable */
-+#define E1000_WUFC_ALL_FILTERS 0x000F00FF /* Mask for all wakeup filters */
-+#define E1000_WUFC_FLX_OFFSET 16       /* Offset to the Flexible Filters bits */
-+#define E1000_WUFC_FLX_FILTERS 0x000F0000 /* Mask for the 4 flexible filters */
-+
-+/* Wake Up Status */
-+#define E1000_WUS_LNKC 0x00000001 /* Link Status Changed */
-+#define E1000_WUS_MAG  0x00000002 /* Magic Packet Received */
-+#define E1000_WUS_EX   0x00000004 /* Directed Exact Received */
-+#define E1000_WUS_MC   0x00000008 /* Directed Multicast Received */
-+#define E1000_WUS_BC   0x00000010 /* Broadcast Received */
-+#define E1000_WUS_ARP  0x00000020 /* ARP Request Packet Received */
-+#define E1000_WUS_IPV4 0x00000040 /* Directed IPv4 Packet Wakeup Received */
-+#define E1000_WUS_IPV6 0x00000080 /* Directed IPv6 Packet Wakeup Received */
-+#define E1000_WUS_FLX0 0x00010000 /* Flexible Filter 0 Match */
-+#define E1000_WUS_FLX1 0x00020000 /* Flexible Filter 1 Match */
-+#define E1000_WUS_FLX2 0x00040000 /* Flexible Filter 2 Match */
-+#define E1000_WUS_FLX3 0x00080000 /* Flexible Filter 3 Match */
-+#define E1000_WUS_FLX_FILTERS 0x000F0000 /* Mask for the 4 flexible filters */
-+
-+/* Management Control */
-+#define E1000_MANC_SMBUS_EN      0x00000001 /* SMBus Enabled - RO */
-+#define E1000_MANC_ASF_EN        0x00000002 /* ASF Enabled - RO */
-+#define E1000_MANC_R_ON_FORCE    0x00000004 /* Reset on Force TCO - RO */
-+#define E1000_MANC_RMCP_EN       0x00000100 /* Enable RCMP 026Fh Filtering */
-+#define E1000_MANC_0298_EN       0x00000200 /* Enable RCMP 0298h Filtering */
-+#define E1000_MANC_IPV4_EN       0x00000400 /* Enable IPv4 */
-+#define E1000_MANC_IPV6_EN       0x00000800 /* Enable IPv6 */
-+#define E1000_MANC_SNAP_EN       0x00001000 /* Accept LLC/SNAP */
-+#define E1000_MANC_ARP_EN        0x00002000 /* Enable ARP Request Filtering */
-+#define E1000_MANC_NEIGHBOR_EN   0x00004000 /* Enable Neighbor Discovery 
-+                                             * Filtering */
-+#define E1000_MANC_TCO_RESET     0x00010000 /* TCO Reset Occurred */
-+#define E1000_MANC_RCV_TCO_EN    0x00020000 /* Receive TCO Packets Enabled */
-+#define E1000_MANC_REPORT_STATUS 0x00040000 /* Status Reporting Enabled */
-+#define E1000_MANC_SMB_REQ       0x01000000 /* SMBus Request */
-+#define E1000_MANC_SMB_GNT       0x02000000 /* SMBus Grant */
-+#define E1000_MANC_SMB_CLK_IN    0x04000000 /* SMBus Clock In */
-+#define E1000_MANC_SMB_DATA_IN   0x08000000 /* SMBus Data In */
-+#define E1000_MANC_SMB_DATA_OUT  0x10000000 /* SMBus Data Out */
-+#define E1000_MANC_SMB_CLK_OUT   0x20000000 /* SMBus Clock Out */
-+
-+#define E1000_MANC_SMB_DATA_OUT_SHIFT  28 /* SMBus Data Out Shift */
-+#define E1000_MANC_SMB_CLK_OUT_SHIFT   29 /* SMBus Clock Out Shift */
-+
-+/* Wake Up Packet Length */
-+#define E1000_WUPL_LENGTH_MASK 0x0FFF   /* Only the lower 12 bits are valid */
-+
-+#define E1000_MDALIGN          4096
-+
-+/* EEPROM Commands - Microwire */
-+#define EEPROM_READ_OPCODE_MICROWIRE  0x6  /* EEPROM read opcode */
-+#define EEPROM_WRITE_OPCODE_MICROWIRE 0x5  /* EEPROM write opcode */
-+#define EEPROM_ERASE_OPCODE_MICROWIRE 0x7  /* EEPROM erase opcode */
-+#define EEPROM_EWEN_OPCODE_MICROWIRE  0x13 /* EEPROM erase/write enable */
-+#define EEPROM_EWDS_OPCODE_MICROWIRE  0x10 /* EEPROM erast/write disable */
-+
-+/* EEPROM Commands - SPI */
-+#define EEPROM_MAX_RETRY_SPI    5000 /* Max wait of 5ms, for RDY signal */
-+#define EEPROM_READ_OPCODE_SPI  0x3  /* EEPROM read opcode */
-+#define EEPROM_WRITE_OPCODE_SPI 0x2  /* EEPROM write opcode */
-+#define EEPROM_A8_OPCODE_SPI    0x8  /* opcode bit-3 = address bit-8 */
-+#define EEPROM_WREN_OPCODE_SPI  0x6  /* EEPROM set Write Enable latch */
-+#define EEPROM_WRDI_OPCODE_SPI  0x4  /* EEPROM reset Write Enable latch */
-+#define EEPROM_RDSR_OPCODE_SPI  0x5  /* EEPROM read Status register */
-+#define EEPROM_WRSR_OPCODE_SPI  0x1  /* EEPROM write Status register */
-+
-+/* EEPROM Size definitions */
-+#define EEPROM_SIZE_16KB        0x1800
-+#define EEPROM_SIZE_8KB         0x1400
-+#define EEPROM_SIZE_4KB         0x1000
-+#define EEPROM_SIZE_2KB         0x0C00
-+#define EEPROM_SIZE_1KB         0x0800
-+#define EEPROM_SIZE_512B        0x0400
-+#define EEPROM_SIZE_128B        0x0000
-+#define EEPROM_SIZE_MASK        0x1C00
-+
-+/* EEPROM Word Offsets */
-+#define EEPROM_COMPAT              0x0003
-+#define EEPROM_ID_LED_SETTINGS     0x0004
-+#define EEPROM_SERDES_AMPLITUDE       0x0006 /* For SERDES output amplitude adjustment. */
-+#define EEPROM_INIT_CONTROL1_REG   0x000A
-+#define EEPROM_INIT_CONTROL2_REG   0x000F
-+#define EEPROM_INIT_CONTROL3_PORT_B   0x0014
-+#define EEPROM_INIT_CONTROL3_PORT_A   0x0024
-+#define EEPROM_CFG                 0x0012
-+#define EEPROM_FLASH_VERSION       0x0032
-+#define EEPROM_CHECKSUM_REG        0x003F
-+
-+/* Word definitions for ID LED Settings */
-+#define ID_LED_RESERVED_0000 0x0000
-+#define ID_LED_RESERVED_FFFF 0xFFFF
-+#define ID_LED_DEFAULT       ((ID_LED_OFF1_ON2 << 12) | \
-+                              (ID_LED_OFF1_OFF2 << 8) | \
-+                              (ID_LED_DEF1_DEF2 << 4) | \
-+                              (ID_LED_DEF1_DEF2))
-+#define ID_LED_DEF1_DEF2     0x1
-+#define ID_LED_DEF1_ON2      0x2
-+#define ID_LED_DEF1_OFF2     0x3
-+#define ID_LED_ON1_DEF2      0x4
-+#define ID_LED_ON1_ON2       0x5
-+#define ID_LED_ON1_OFF2      0x6
-+#define ID_LED_OFF1_DEF2     0x7
-+#define ID_LED_OFF1_ON2      0x8
-+#define ID_LED_OFF1_OFF2     0x9
-+
-+#define IGP_ACTIVITY_LED_MASK   0xFFFFF0FF
-+#define IGP_ACTIVITY_LED_ENABLE 0x0300
-+#define IGP_LED3_MODE           0x07000000
-+
-+
-+/* Mask bits for SERDES amplitude adjustment in Word 6 of the EEPROM */
-+#define EEPROM_SERDES_AMPLITUDE_MASK  0x000F
-+
-+/* Mask bits for fields in Word 0x0a of the EEPROM */
-+#define EEPROM_WORD0A_ILOS   0x0010
-+#define EEPROM_WORD0A_SWDPIO 0x01E0
-+#define EEPROM_WORD0A_LRST   0x0200
-+#define EEPROM_WORD0A_FD     0x0400
-+#define EEPROM_WORD0A_66MHZ  0x0800
-+
-+/* Mask bits for fields in Word 0x0f of the EEPROM */
-+#define EEPROM_WORD0F_PAUSE_MASK 0x3000
-+#define EEPROM_WORD0F_PAUSE      0x1000
-+#define EEPROM_WORD0F_ASM_DIR    0x2000
-+#define EEPROM_WORD0F_ANE        0x0800
-+#define EEPROM_WORD0F_SWPDIO_EXT 0x00F0
-+
-+/* For checksumming, the sum of all words in the EEPROM should equal 0xBABA. */
-+#define EEPROM_SUM 0xBABA
-+
-+/* EEPROM Map defines (WORD OFFSETS)*/
-+#define EEPROM_NODE_ADDRESS_BYTE_0 0
-+#define EEPROM_PBA_BYTE_1          8
-+
-+#define EEPROM_RESERVED_WORD          0xFFFF
-+
-+/* EEPROM Map Sizes (Byte Counts) */
-+#define PBA_SIZE 4
-+
-+/* Collision related configuration parameters */
-+#define E1000_COLLISION_THRESHOLD       16
-+#define E1000_CT_SHIFT                  4
-+#define E1000_COLLISION_DISTANCE        64
-+#define E1000_FDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-+#define E1000_HDX_COLLISION_DISTANCE    E1000_COLLISION_DISTANCE
-+#define E1000_COLD_SHIFT                12
-+
-+/* Number of Transmit and Receive Descriptors must be a multiple of 8 */
-+#define REQ_TX_DESCRIPTOR_MULTIPLE  8
-+#define REQ_RX_DESCRIPTOR_MULTIPLE  8
-+
-+/* Default values for the transmit IPG register */
-+#define DEFAULT_82542_TIPG_IPGT        10
-+#define DEFAULT_82543_TIPG_IPGT_FIBER  9
-+#define DEFAULT_82543_TIPG_IPGT_COPPER 8
-+
-+#define E1000_TIPG_IPGT_MASK  0x000003FF
-+#define E1000_TIPG_IPGR1_MASK 0x000FFC00
-+#define E1000_TIPG_IPGR2_MASK 0x3FF00000
-+
-+#define DEFAULT_82542_TIPG_IPGR1 2
-+#define DEFAULT_82543_TIPG_IPGR1 8
-+#define E1000_TIPG_IPGR1_SHIFT  10
-+
-+#define DEFAULT_82542_TIPG_IPGR2 10
-+#define DEFAULT_82543_TIPG_IPGR2 6
-+#define E1000_TIPG_IPGR2_SHIFT  20
-+
-+#define E1000_TXDMAC_DPP 0x00000001
-+
-+/* Adaptive IFS defines */
-+#define TX_THRESHOLD_START     8
-+#define TX_THRESHOLD_INCREMENT 10
-+#define TX_THRESHOLD_DECREMENT 1
-+#define TX_THRESHOLD_STOP      190
-+#define TX_THRESHOLD_DISABLE   0
-+#define TX_THRESHOLD_TIMER_MS  10000
-+#define MIN_NUM_XMITS          1000
-+#define IFS_MAX                80
-+#define IFS_STEP               10
-+#define IFS_MIN                40
-+#define IFS_RATIO              4
-+
-+/* PBA constants */
-+#define E1000_PBA_16K 0x0010    /* 16KB, default TX allocation */
-+#define E1000_PBA_22K 0x0016
-+#define E1000_PBA_24K 0x0018
-+#define E1000_PBA_30K 0x001E
-+#define E1000_PBA_40K 0x0028
-+#define E1000_PBA_48K 0x0030    /* 48KB, default RX allocation */
-+
-+/* Flow Control Constants */
-+#define FLOW_CONTROL_ADDRESS_LOW  0x00C28001
-+#define FLOW_CONTROL_ADDRESS_HIGH 0x00000100
-+#define FLOW_CONTROL_TYPE         0x8808
-+
-+/* The historical defaults for the flow control values are given below. */
-+#define FC_DEFAULT_HI_THRESH        (0x8000)    /* 32KB */
-+#define FC_DEFAULT_LO_THRESH        (0x4000)    /* 16KB */
-+#define FC_DEFAULT_TX_TIMER         (0x100)     /* ~130 us */
-+
-+/* PCIX Config space */
-+#define PCIX_COMMAND_REGISTER    0xE6
-+#define PCIX_STATUS_REGISTER_LO  0xE8
-+#define PCIX_STATUS_REGISTER_HI  0xEA
-+
-+#define PCIX_COMMAND_MMRBC_MASK      0x000C
-+#define PCIX_COMMAND_MMRBC_SHIFT     0x2
-+#define PCIX_STATUS_HI_MMRBC_MASK    0x0060
-+#define PCIX_STATUS_HI_MMRBC_SHIFT   0x5
-+#define PCIX_STATUS_HI_MMRBC_4K      0x3
-+#define PCIX_STATUS_HI_MMRBC_2K      0x2
-+
-+
-+/* Number of bits required to shift right the "pause" bits from the
-+ * EEPROM (bits 13:12) to the "pause" (bits 8:7) field in the TXCW register.
-+ */
-+#define PAUSE_SHIFT 5
-+
-+/* Number of bits required to shift left the "SWDPIO" bits from the
-+ * EEPROM (bits 8:5) to the "SWDPIO" (bits 25:22) field in the CTRL register.
-+ */
-+#define SWDPIO_SHIFT 17
-+
-+/* Number of bits required to shift left the "SWDPIO_EXT" bits from the
-+ * EEPROM word F (bits 7:4) to the bits 11:8 of The Extended CTRL register.
-+ */
-+#define SWDPIO__EXT_SHIFT 4
-+
-+/* Number of bits required to shift left the "ILOS" bit from the EEPROM
-+ * (bit 4) to the "ILOS" (bit 7) field in the CTRL register.
-+ */
-+#define ILOS_SHIFT  3
-+
-+
-+#define RECEIVE_BUFFER_ALIGN_SIZE  (256)
-+
-+/* Number of milliseconds we wait for auto-negotiation to complete */
-+#define LINK_UP_TIMEOUT             500
-+
-+#define E1000_TX_BUFFER_SIZE ((uint32_t)1514)
-+
-+/* The carrier extension symbol, as received by the NIC. */
-+#define CARRIER_EXTENSION   0x0F
-+
-+/* TBI_ACCEPT macro definition:
-+ *
-+ * This macro requires:
-+ *      adapter = a pointer to struct e1000_hw 
-+ *      status = the 8 bit status field of the RX descriptor with EOP set
-+ *      error = the 8 bit error field of the RX descriptor with EOP set
-+ *      length = the sum of all the length fields of the RX descriptors that
-+ *               make up the current frame
-+ *      last_byte = the last byte of the frame DMAed by the hardware
-+ *      max_frame_length = the maximum frame length we want to accept.
-+ *      min_frame_length = the minimum frame length we want to accept.
-+ *
-+ * This macro is a conditional that should be used in the interrupt 
-+ * handler's Rx processing routine when RxErrors have been detected.
-+ *
-+ * Typical use:
-+ *  ...
-+ *  if (TBI_ACCEPT) {
-+ *      accept_frame = TRUE;
-+ *      e1000_tbi_adjust_stats(adapter, MacAddress);
-+ *      frame_length--;
-+ *  } else {
-+ *      accept_frame = FALSE;
-+ *  }
-+ *  ...
-+ */
-+
-+#define TBI_ACCEPT(adapter, status, errors, length, last_byte) \
-+    ((adapter)->tbi_compatibility_on && \
-+     (((errors) & E1000_RXD_ERR_FRAME_ERR_MASK) == E1000_RXD_ERR_CE) && \
-+     ((last_byte) == CARRIER_EXTENSION) && \
-+     (((status) & E1000_RXD_STAT_VP) ? \
-+          (((length) > ((adapter)->min_frame_size - VLAN_TAG_SIZE)) && \
-+           ((length) <= ((adapter)->max_frame_size + 1))) : \
-+          (((length) > (adapter)->min_frame_size) && \
-+           ((length) <= ((adapter)->max_frame_size + VLAN_TAG_SIZE + 1)))))
-+
-+
-+/* Structures, enums, and macros for the PHY */
-+
-+/* Bit definitions for the Management Data IO (MDIO) and Management Data
-+ * Clock (MDC) pins in the Device Control Register.
-+ */
-+#define E1000_CTRL_PHY_RESET_DIR  E1000_CTRL_SWDPIO0
-+#define E1000_CTRL_PHY_RESET      E1000_CTRL_SWDPIN0
-+#define E1000_CTRL_MDIO_DIR       E1000_CTRL_SWDPIO2
-+#define E1000_CTRL_MDIO           E1000_CTRL_SWDPIN2
-+#define E1000_CTRL_MDC_DIR        E1000_CTRL_SWDPIO3
-+#define E1000_CTRL_MDC            E1000_CTRL_SWDPIN3
-+#define E1000_CTRL_PHY_RESET_DIR4 E1000_CTRL_EXT_SDP4_DIR
-+#define E1000_CTRL_PHY_RESET4     E1000_CTRL_EXT_SDP4_DATA
-+
-+/* PHY 1000 MII Register/Bit Definitions */
-+/* PHY Registers defined by IEEE */
-+#define PHY_CTRL         0x00 /* Control Register */
-+#define PHY_STATUS       0x01 /* Status Regiser */
-+#define PHY_ID1          0x02 /* Phy Id Reg (word 1) */
-+#define PHY_ID2          0x03 /* Phy Id Reg (word 2) */
-+#define PHY_AUTONEG_ADV  0x04 /* Autoneg Advertisement */
-+#define PHY_LP_ABILITY   0x05 /* Link Partner Ability (Base Page) */
-+#define PHY_AUTONEG_EXP  0x06 /* Autoneg Expansion Reg */
-+#define PHY_NEXT_PAGE_TX 0x07 /* Next Page TX */
-+#define PHY_LP_NEXT_PAGE 0x08 /* Link Partner Next Page */
-+#define PHY_1000T_CTRL   0x09 /* 1000Base-T Control Reg */
-+#define PHY_1000T_STATUS 0x0A /* 1000Base-T Status Reg */
-+#define PHY_EXT_STATUS   0x0F /* Extended Status Reg */
-+
-+/* M88E1000 Specific Registers */
-+#define M88E1000_PHY_SPEC_CTRL     0x10  /* PHY Specific Control Register */
-+#define M88E1000_PHY_SPEC_STATUS   0x11  /* PHY Specific Status Register */
-+#define M88E1000_INT_ENABLE        0x12  /* Interrupt Enable Register */
-+#define M88E1000_INT_STATUS        0x13  /* Interrupt Status Register */
-+#define M88E1000_EXT_PHY_SPEC_CTRL 0x14  /* Extended PHY Specific Control */
-+#define M88E1000_RX_ERR_CNTR       0x15  /* Receive Error Counter */
-+
-+#define M88E1000_PHY_EXT_CTRL      0x1A  /* PHY extend control register */
-+#define M88E1000_PHY_PAGE_SELECT   0x1D  /* Reg 29 for page number setting */
-+#define M88E1000_PHY_GEN_CONTROL   0x1E  /* Its meaning depends on reg 29 */
-+#define M88E1000_PHY_VCO_REG_BIT8  0x100 /* Bits 8 & 11 are adjusted for */
-+#define M88E1000_PHY_VCO_REG_BIT11 0x800    /* improved BER performance */
-+
-+#define IGP01E1000_IEEE_REGS_PAGE  0x0000
-+#define IGP01E1000_IEEE_RESTART_AUTONEG 0x3300
-+#define IGP01E1000_IEEE_FORCE_GIGA      0x0140
-+
-+/* IGP01E1000 Specific Registers */
-+#define IGP01E1000_PHY_PORT_CONFIG 0x10 /* PHY Specific Port Config Register */
-+#define IGP01E1000_PHY_PORT_STATUS 0x11 /* PHY Specific Status Register */
-+#define IGP01E1000_PHY_PORT_CTRL   0x12 /* PHY Specific Control Register */
-+#define IGP01E1000_PHY_LINK_HEALTH 0x13 /* PHY Link Health Register */
-+#define IGP01E1000_GMII_FIFO       0x14 /* GMII FIFO Register */
-+#define IGP01E1000_PHY_CHANNEL_QUALITY 0x15 /* PHY Channel Quality Register */
-+#define IGP01E1000_PHY_PAGE_SELECT     0x1F /* PHY Page Select Core Register */
-+
-+/* IGP01E1000 AGC Registers - stores the cable length values*/
-+#define IGP01E1000_PHY_AGC_A        0x1172
-+#define IGP01E1000_PHY_AGC_B        0x1272
-+#define IGP01E1000_PHY_AGC_C        0x1472
-+#define IGP01E1000_PHY_AGC_D        0x1872
-+
-+/* IGP01E1000 DSP Reset Register */
-+#define IGP01E1000_PHY_DSP_RESET   0x1F33
-+#define IGP01E1000_PHY_DSP_SET     0x1F71
-+#define IGP01E1000_PHY_DSP_FFE     0x1F35
-+
-+#define IGP01E1000_PHY_CHANNEL_NUM    4
-+#define IGP01E1000_PHY_AGC_PARAM_A    0x1171
-+#define IGP01E1000_PHY_AGC_PARAM_B    0x1271
-+#define IGP01E1000_PHY_AGC_PARAM_C    0x1471
-+#define IGP01E1000_PHY_AGC_PARAM_D    0x1871
-+
-+#define IGP01E1000_PHY_EDAC_MU_INDEX        0xC000
-+#define IGP01E1000_PHY_EDAC_SIGN_EXT_9_BITS 0x8000
-+
-+#define IGP01E1000_PHY_ANALOG_TX_STATE      0x2890
-+#define IGP01E1000_PHY_ANALOG_CLASS_A       0x2000
-+#define IGP01E1000_PHY_FORCE_ANALOG_ENABLE  0x0004
-+#define IGP01E1000_PHY_DSP_FFE_CM_CP        0x0069
-+
-+#define IGP01E1000_PHY_DSP_FFE_DEFAULT      0x002A
-+/* IGP01E1000 PCS Initialization register - stores the polarity status when
-+ * speed = 1000 Mbps. */
-+#define IGP01E1000_PHY_PCS_INIT_REG  0x00B4
-+#define IGP01E1000_PHY_PCS_CTRL_REG  0x00B5
-+
-+#define IGP01E1000_ANALOG_REGS_PAGE  0x20C0
-+  
-+#define MAX_PHY_REG_ADDRESS 0x1F        /* 5 bit address bus (0-0x1F) */
-+#define MAX_PHY_MULTI_PAGE_REG  0xF     /*Registers that are equal on all pages*/
-+/* PHY Control Register */
-+#define MII_CR_SPEED_SELECT_MSB 0x0040  /* bits 6,13: 10=1000, 01=100, 00=10 */
-+#define MII_CR_COLL_TEST_ENABLE 0x0080  /* Collision test enable */
-+#define MII_CR_FULL_DUPLEX      0x0100  /* FDX =1, half duplex =0 */
-+#define MII_CR_RESTART_AUTO_NEG 0x0200  /* Restart auto negotiation */
-+#define MII_CR_ISOLATE          0x0400  /* Isolate PHY from MII */
-+#define MII_CR_POWER_DOWN       0x0800  /* Power down */
-+#define MII_CR_AUTO_NEG_EN      0x1000  /* Auto Neg Enable */
-+#define MII_CR_SPEED_SELECT_LSB 0x2000  /* bits 6,13: 10=1000, 01=100, 00=10 */
-+#define MII_CR_LOOPBACK         0x4000  /* 0 = normal, 1 = loopback */
-+#define MII_CR_RESET            0x8000  /* 0 = normal, 1 = PHY reset */
-+
-+/* PHY Status Register */
-+#define MII_SR_EXTENDED_CAPS     0x0001 /* Extended register capabilities */
-+#define MII_SR_JABBER_DETECT     0x0002 /* Jabber Detected */
-+#define MII_SR_LINK_STATUS       0x0004 /* Link Status 1 = link */
-+#define MII_SR_AUTONEG_CAPS      0x0008 /* Auto Neg Capable */
-+#define MII_SR_REMOTE_FAULT      0x0010 /* Remote Fault Detect */
-+#define MII_SR_AUTONEG_COMPLETE  0x0020 /* Auto Neg Complete */
-+#define MII_SR_PREAMBLE_SUPPRESS 0x0040 /* Preamble may be suppressed */
-+#define MII_SR_EXTENDED_STATUS   0x0100 /* Ext. status info in Reg 0x0F */
-+#define MII_SR_100T2_HD_CAPS     0x0200 /* 100T2 Half Duplex Capable */
-+#define MII_SR_100T2_FD_CAPS     0x0400 /* 100T2 Full Duplex Capable */
-+#define MII_SR_10T_HD_CAPS       0x0800 /* 10T   Half Duplex Capable */
-+#define MII_SR_10T_FD_CAPS       0x1000 /* 10T   Full Duplex Capable */
-+#define MII_SR_100X_HD_CAPS      0x2000 /* 100X  Half Duplex Capable */
-+#define MII_SR_100X_FD_CAPS      0x4000 /* 100X  Full Duplex Capable */
-+#define MII_SR_100T4_CAPS        0x8000 /* 100T4 Capable */
-+
-+/* Autoneg Advertisement Register */
-+#define NWAY_AR_SELECTOR_FIELD 0x0001   /* indicates IEEE 802.3 CSMA/CD */
-+#define NWAY_AR_10T_HD_CAPS    0x0020   /* 10T   Half Duplex Capable */
-+#define NWAY_AR_10T_FD_CAPS    0x0040   /* 10T   Full Duplex Capable */
-+#define NWAY_AR_100TX_HD_CAPS  0x0080   /* 100TX Half Duplex Capable */
-+#define NWAY_AR_100TX_FD_CAPS  0x0100   /* 100TX Full Duplex Capable */
-+#define NWAY_AR_100T4_CAPS     0x0200   /* 100T4 Capable */
-+#define NWAY_AR_PAUSE          0x0400   /* Pause operation desired */
-+#define NWAY_AR_ASM_DIR        0x0800   /* Asymmetric Pause Direction bit */
-+#define NWAY_AR_REMOTE_FAULT   0x2000   /* Remote Fault detected */
-+#define NWAY_AR_NEXT_PAGE      0x8000   /* Next Page ability supported */
-+
-+/* Link Partner Ability Register (Base Page) */
-+#define NWAY_LPAR_SELECTOR_FIELD 0x0000 /* LP protocol selector field */
-+#define NWAY_LPAR_10T_HD_CAPS    0x0020 /* LP is 10T   Half Duplex Capable */
-+#define NWAY_LPAR_10T_FD_CAPS    0x0040 /* LP is 10T   Full Duplex Capable */
-+#define NWAY_LPAR_100TX_HD_CAPS  0x0080 /* LP is 100TX Half Duplex Capable */
-+#define NWAY_LPAR_100TX_FD_CAPS  0x0100 /* LP is 100TX Full Duplex Capable */
-+#define NWAY_LPAR_100T4_CAPS     0x0200 /* LP is 100T4 Capable */
-+#define NWAY_LPAR_PAUSE          0x0400 /* LP Pause operation desired */
-+#define NWAY_LPAR_ASM_DIR        0x0800 /* LP Asymmetric Pause Direction bit */
-+#define NWAY_LPAR_REMOTE_FAULT   0x2000 /* LP has detected Remote Fault */
-+#define NWAY_LPAR_ACKNOWLEDGE    0x4000 /* LP has rx'd link code word */
-+#define NWAY_LPAR_NEXT_PAGE      0x8000 /* Next Page ability supported */
-+
-+/* Autoneg Expansion Register */
-+#define NWAY_ER_LP_NWAY_CAPS      0x0001 /* LP has Auto Neg Capability */
-+#define NWAY_ER_PAGE_RXD          0x0002 /* LP is 10T   Half Duplex Capable */
-+#define NWAY_ER_NEXT_PAGE_CAPS    0x0004 /* LP is 10T   Full Duplex Capable */
-+#define NWAY_ER_LP_NEXT_PAGE_CAPS 0x0008 /* LP is 100TX Half Duplex Capable */
-+#define NWAY_ER_PAR_DETECT_FAULT  0x0010 /* LP is 100TX Full Duplex Capable */
-+
-+/* Next Page TX Register */
-+#define NPTX_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
-+#define NPTX_TOGGLE         0x0800 /* Toggles between exchanges
-+                                    * of different NP
-+                                    */
-+#define NPTX_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg
-+                                    * 0 = cannot comply with msg
-+                                    */
-+#define NPTX_MSG_PAGE       0x2000 /* formatted(1)/unformatted(0) pg */
-+#define NPTX_NEXT_PAGE      0x8000 /* 1 = addition NP will follow 
-+                                    * 0 = sending last NP
-+                                    */
-+
-+/* Link Partner Next Page Register */
-+#define LP_RNPR_MSG_CODE_FIELD 0x0001 /* NP msg code or unformatted data */
-+#define LP_RNPR_TOGGLE         0x0800 /* Toggles between exchanges
-+                                       * of different NP
-+                                       */
-+#define LP_RNPR_ACKNOWLDGE2    0x1000 /* 1 = will comply with msg 
-+                                       * 0 = cannot comply with msg
-+                                       */
-+#define LP_RNPR_MSG_PAGE       0x2000  /* formatted(1)/unformatted(0) pg */
-+#define LP_RNPR_ACKNOWLDGE     0x4000  /* 1 = ACK / 0 = NO ACK */
-+#define LP_RNPR_NEXT_PAGE      0x8000  /* 1 = addition NP will follow
-+                                        * 0 = sending last NP 
-+                                        */
-+
-+/* 1000BASE-T Control Register */
-+#define CR_1000T_ASYM_PAUSE      0x0080 /* Advertise asymmetric pause bit */
-+#define CR_1000T_HD_CAPS         0x0100 /* Advertise 1000T HD capability */
-+#define CR_1000T_FD_CAPS         0x0200 /* Advertise 1000T FD capability  */
-+#define CR_1000T_REPEATER_DTE    0x0400 /* 1=Repeater/switch device port */
-+                                        /* 0=DTE device */
-+#define CR_1000T_MS_VALUE        0x0800 /* 1=Configure PHY as Master */
-+                                        /* 0=Configure PHY as Slave */
-+#define CR_1000T_MS_ENABLE       0x1000 /* 1=Master/Slave manual config value */
-+                                        /* 0=Automatic Master/Slave config */
-+#define CR_1000T_TEST_MODE_NORMAL 0x0000 /* Normal Operation */
-+#define CR_1000T_TEST_MODE_1     0x2000 /* Transmit Waveform test */
-+#define CR_1000T_TEST_MODE_2     0x4000 /* Master Transmit Jitter test */
-+#define CR_1000T_TEST_MODE_3     0x6000 /* Slave Transmit Jitter test */
-+#define CR_1000T_TEST_MODE_4     0x8000 /* Transmitter Distortion test */
-+
-+/* 1000BASE-T Status Register */
-+#define SR_1000T_IDLE_ERROR_CNT   0x00FF /* Num idle errors since last read */
-+#define SR_1000T_ASYM_PAUSE_DIR   0x0100 /* LP asymmetric pause direction bit */
-+#define SR_1000T_LP_HD_CAPS       0x0400 /* LP is 1000T HD capable */
-+#define SR_1000T_LP_FD_CAPS       0x0800 /* LP is 1000T FD capable */
-+#define SR_1000T_REMOTE_RX_STATUS 0x1000 /* Remote receiver OK */
-+#define SR_1000T_LOCAL_RX_STATUS  0x2000 /* Local receiver OK */
-+#define SR_1000T_MS_CONFIG_RES    0x4000 /* 1=Local TX is Master, 0=Slave */
-+#define SR_1000T_MS_CONFIG_FAULT  0x8000 /* Master/Slave config fault */
-+#define SR_1000T_REMOTE_RX_STATUS_SHIFT 12
-+#define SR_1000T_LOCAL_RX_STATUS_SHIFT  13
-+#define SR_1000T_PHY_EXCESSIVE_IDLE_ERR_COUNT    5
-+#define FFE_IDLE_ERR_COUNT_TIMEOUT_20            20
-+#define FFE_IDLE_ERR_COUNT_TIMEOUT_100           100
-+
-+/* Extended Status Register */
-+#define IEEE_ESR_1000T_HD_CAPS 0x1000 /* 1000T HD capable */
-+#define IEEE_ESR_1000T_FD_CAPS 0x2000 /* 1000T FD capable */
-+#define IEEE_ESR_1000X_HD_CAPS 0x4000 /* 1000X HD capable */
-+#define IEEE_ESR_1000X_FD_CAPS 0x8000 /* 1000X FD capable */
-+
-+#define PHY_TX_POLARITY_MASK   0x0100 /* register 10h bit 8 (polarity bit) */
-+#define PHY_TX_NORMAL_POLARITY 0      /* register 10h bit 8 (normal polarity) */
-+
-+#define AUTO_POLARITY_DISABLE  0x0010 /* register 11h bit 4 */
-+                                      /* (0=enable, 1=disable) */
-+
-+/* M88E1000 PHY Specific Control Register */
-+#define M88E1000_PSCR_JABBER_DISABLE    0x0001 /* 1=Jabber Function disabled */
-+#define M88E1000_PSCR_POLARITY_REVERSAL 0x0002 /* 1=Polarity Reversal enabled */
-+#define M88E1000_PSCR_SQE_TEST          0x0004 /* 1=SQE Test enabled */
-+#define M88E1000_PSCR_CLK125_DISABLE    0x0010 /* 1=CLK125 low, 
-+                                                * 0=CLK125 toggling
-+                                                */
-+#define M88E1000_PSCR_MDI_MANUAL_MODE  0x0000  /* MDI Crossover Mode bits 6:5 */
-+                                               /* Manual MDI configuration */
-+#define M88E1000_PSCR_MDIX_MANUAL_MODE 0x0020  /* Manual MDIX configuration */
-+#define M88E1000_PSCR_AUTO_X_1000T     0x0040  /* 1000BASE-T: Auto crossover,
-+                                                *  100BASE-TX/10BASE-T: 
-+                                                *  MDI Mode
-+                                                */
-+#define M88E1000_PSCR_AUTO_X_MODE      0x0060  /* Auto crossover enabled 
-+                                                * all speeds. 
-+                                                */
-+#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE 0x0080 
-+                                        /* 1=Enable Extended 10BASE-T distance
-+                                         * (Lower 10BASE-T RX Threshold)
-+                                         * 0=Normal 10BASE-T RX Threshold */
-+#define M88E1000_PSCR_MII_5BIT_ENABLE      0x0100
-+                                        /* 1=5-Bit interface in 100BASE-TX
-+                                         * 0=MII interface in 100BASE-TX */
-+#define M88E1000_PSCR_SCRAMBLER_DISABLE    0x0200 /* 1=Scrambler disable */
-+#define M88E1000_PSCR_FORCE_LINK_GOOD      0x0400 /* 1=Force link good */
-+#define M88E1000_PSCR_ASSERT_CRS_ON_TX     0x0800 /* 1=Assert CRS on Transmit */
-+
-+#define M88E1000_PSCR_POLARITY_REVERSAL_SHIFT    1
-+#define M88E1000_PSCR_AUTO_X_MODE_SHIFT          5
-+#define M88E1000_PSCR_10BT_EXT_DIST_ENABLE_SHIFT 7
-+
-+/* M88E1000 PHY Specific Status Register */
-+#define M88E1000_PSSR_JABBER             0x0001 /* 1=Jabber */
-+#define M88E1000_PSSR_REV_POLARITY       0x0002 /* 1=Polarity reversed */
-+#define M88E1000_PSSR_DOWNSHIFT          0x0020 /* 1=Downshifted */
-+#define M88E1000_PSSR_MDIX               0x0040 /* 1=MDIX; 0=MDI */
-+#define M88E1000_PSSR_CABLE_LENGTH       0x0380 /* 0=<50M;1=50-80M;2=80-110M;
-+                                            * 3=110-140M;4=>140M */
-+#define M88E1000_PSSR_LINK               0x0400 /* 1=Link up, 0=Link down */
-+#define M88E1000_PSSR_SPD_DPLX_RESOLVED  0x0800 /* 1=Speed & Duplex resolved */
-+#define M88E1000_PSSR_PAGE_RCVD          0x1000 /* 1=Page received */
-+#define M88E1000_PSSR_DPLX               0x2000 /* 1=Duplex 0=Half Duplex */
-+#define M88E1000_PSSR_SPEED              0xC000 /* Speed, bits 14:15 */
-+#define M88E1000_PSSR_10MBS              0x0000 /* 00=10Mbs */
-+#define M88E1000_PSSR_100MBS             0x4000 /* 01=100Mbs */
-+#define M88E1000_PSSR_1000MBS            0x8000 /* 10=1000Mbs */
-+
-+#define M88E1000_PSSR_REV_POLARITY_SHIFT 1
-+#define M88E1000_PSSR_DOWNSHIFT_SHIFT    5
-+#define M88E1000_PSSR_MDIX_SHIFT         6
-+#define M88E1000_PSSR_CABLE_LENGTH_SHIFT 7
-+
-+/* M88E1000 Extended PHY Specific Control Register */
-+#define M88E1000_EPSCR_FIBER_LOOPBACK 0x4000 /* 1=Fiber loopback */
-+#define M88E1000_EPSCR_DOWN_NO_IDLE   0x8000 /* 1=Lost lock detect enabled.
-+                                              * Will assert lost lock and bring
-+                                              * link down if idle not seen
-+                                              * within 1ms in 1000BASE-T 
-+                                              */
-+/* Number of times we will attempt to autonegotiate before downshifting if we
-+ * are the master */
-+#define M88E1000_EPSCR_MASTER_DOWNSHIFT_MASK 0x0C00
-+#define M88E1000_EPSCR_MASTER_DOWNSHIFT_1X   0x0000    
-+#define M88E1000_EPSCR_MASTER_DOWNSHIFT_2X   0x0400
-+#define M88E1000_EPSCR_MASTER_DOWNSHIFT_3X   0x0800
-+#define M88E1000_EPSCR_MASTER_DOWNSHIFT_4X   0x0C00
-+/* Number of times we will attempt to autonegotiate before downshifting if we
-+ * are the slave */
-+#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_MASK  0x0300
-+#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_DIS   0x0000
-+#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X    0x0100
-+#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_2X    0x0200
-+#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_3X    0x0300
-+#define M88E1000_EPSCR_TX_CLK_2_5     0x0060 /* 2.5 MHz TX_CLK */
-+#define M88E1000_EPSCR_TX_CLK_25      0x0070 /* 25  MHz TX_CLK */
-+#define M88E1000_EPSCR_TX_CLK_0       0x0000 /* NO  TX_CLK */
-+
-+/* IGP01E1000 Specific Port Config Register - R/W */
-+#define IGP01E1000_PSCFR_AUTO_MDIX_PAR_DETECT  0x0010
-+#define IGP01E1000_PSCFR_PRE_EN                0x0020
-+#define IGP01E1000_PSCFR_SMART_SPEED           0x0080
-+#define IGP01E1000_PSCFR_DISABLE_TPLOOPBACK    0x0100
-+#define IGP01E1000_PSCFR_DISABLE_JABBER        0x0400
-+#define IGP01E1000_PSCFR_DISABLE_TRANSMIT      0x2000
-+
-+/* IGP01E1000 Specific Port Status Register - R/O */
-+#define IGP01E1000_PSSR_AUTONEG_FAILED         0x0001 /* RO LH SC */
-+#define IGP01E1000_PSSR_POLARITY_REVERSED      0x0002
-+#define IGP01E1000_PSSR_CABLE_LENGTH           0x007C
-+#define IGP01E1000_PSSR_FULL_DUPLEX            0x0200
-+#define IGP01E1000_PSSR_LINK_UP                0x0400
-+#define IGP01E1000_PSSR_MDIX                   0x0800
-+#define IGP01E1000_PSSR_SPEED_MASK             0xC000 /* speed bits mask */
-+#define IGP01E1000_PSSR_SPEED_10MBPS           0x4000
-+#define IGP01E1000_PSSR_SPEED_100MBPS          0x8000
-+#define IGP01E1000_PSSR_SPEED_1000MBPS         0xC000
-+#define IGP01E1000_PSSR_CABLE_LENGTH_SHIFT     0x0002 /* shift right 2 */
-+#define IGP01E1000_PSSR_MDIX_SHIFT             0x000B /* shift right 11 */
-+
-+/* IGP01E1000 Specific Port Control Register - R/W */
-+#define IGP01E1000_PSCR_TP_LOOPBACK            0x0001
-+#define IGP01E1000_PSCR_CORRECT_NC_SCMBLR      0x0200
-+#define IGP01E1000_PSCR_TEN_CRS_SELECT         0x0400
-+#define IGP01E1000_PSCR_FLIP_CHIP              0x0800
-+#define IGP01E1000_PSCR_AUTO_MDIX              0x1000
-+#define IGP01E1000_PSCR_FORCE_MDI_MDIX         0x2000 /* 0-MDI, 1-MDIX */
-+
-+/* IGP01E1000 Specific Port Link Health Register */
-+#define IGP01E1000_PLHR_SS_DOWNGRADE           0x8000
-+#define IGP01E1000_PLHR_GIG_SCRAMBLER_ERROR    0x4000
-+#define IGP01E1000_PLHR_GIG_REM_RCVR_NOK       0x0800 /* LH */
-+#define IGP01E1000_PLHR_IDLE_ERROR_CNT_OFLOW   0x0400 /* LH */
-+#define IGP01E1000_PLHR_DATA_ERR_1             0x0200 /* LH */
-+#define IGP01E1000_PLHR_DATA_ERR_0             0x0100
-+#define IGP01E1000_PLHR_AUTONEG_FAULT          0x0010
-+#define IGP01E1000_PLHR_AUTONEG_ACTIVE         0x0008
-+#define IGP01E1000_PLHR_VALID_CHANNEL_D        0x0004
-+#define IGP01E1000_PLHR_VALID_CHANNEL_C        0x0002
-+#define IGP01E1000_PLHR_VALID_CHANNEL_B        0x0001
-+#define IGP01E1000_PLHR_VALID_CHANNEL_A        0x0000
-+
-+/* IGP01E1000 Channel Quality Register */
-+#define IGP01E1000_MSE_CHANNEL_D        0x000F
-+#define IGP01E1000_MSE_CHANNEL_C        0x00F0
-+#define IGP01E1000_MSE_CHANNEL_B        0x0F00
-+#define IGP01E1000_MSE_CHANNEL_A        0xF000
-+
-+/* IGP01E1000 DSP reset macros */
-+#define DSP_RESET_ENABLE     0x0
-+#define DSP_RESET_DISABLE    0x2
-+#define E1000_MAX_DSP_RESETS 10
-+
-+/* IGP01E1000 AGC Registers */
-+
-+#define IGP01E1000_AGC_LENGTH_SHIFT 7         /* Coarse - 13:11, Fine - 10:7 */
-+
-+/* 7 bits (3 Coarse + 4 Fine) --> 128 optional values */
-+#define IGP01E1000_AGC_LENGTH_TABLE_SIZE 128
-+
-+/* The precision of the length is +/- 10 meters */
-+#define IGP01E1000_AGC_RANGE    10
-+
-+/* IGP01E1000 PCS Initialization register */
-+/* bits 3:6 in the PCS registers stores the channels polarity */
-+#define IGP01E1000_PHY_POLARITY_MASK    0x0078
-+
-+/* IGP01E1000 GMII FIFO Register */
-+#define IGP01E1000_GMII_FLEX_SPD               0x10 /* Enable flexible speed
-+                                                     * on Link-Up */
-+#define IGP01E1000_GMII_SPD                    0x20 /* Enable SPD */
-+
-+/* IGP01E1000 Analog Register */
-+#define IGP01E1000_ANALOG_SPARE_FUSE_STATUS         0x20D1
-+#define IGP01E1000_ANALOG_FUSE_STATUS               0x20D0
-+#define IGP01E1000_ANALOG_FUSE_CONTROL              0x20DC
-+#define IGP01E1000_ANALOG_FUSE_BYPASS               0x20DE
-+
-+#define IGP01E1000_ANALOG_FUSE_POLY_MASK            0xF000
-+#define IGP01E1000_ANALOG_FUSE_FINE_MASK            0x0F80
-+#define IGP01E1000_ANALOG_FUSE_COARSE_MASK          0x0070
-+#define IGP01E1000_ANALOG_SPARE_FUSE_ENABLED        0x0100
-+#define IGP01E1000_ANALOG_FUSE_ENABLE_SW_CONTROL    0x0002
-+
-+#define IGP01E1000_ANALOG_FUSE_COARSE_THRESH        0x0040
-+#define IGP01E1000_ANALOG_FUSE_COARSE_10            0x0010
-+#define IGP01E1000_ANALOG_FUSE_FINE_1               0x0080
-+#define IGP01E1000_ANALOG_FUSE_FINE_10              0x0500
-+
-+/* Bit definitions for valid PHY IDs. */
-+#define M88E1000_E_PHY_ID  0x01410C50
-+#define M88E1000_I_PHY_ID  0x01410C30
-+#define M88E1011_I_PHY_ID  0x01410C20
-+#define IGP01E1000_I_PHY_ID  0x02A80380
-+#define M88E1000_12_PHY_ID M88E1000_E_PHY_ID
-+#define M88E1000_14_PHY_ID M88E1000_E_PHY_ID
-+#define M88E1011_I_REV_4   0x04
-+
-+/* Miscellaneous PHY bit definitions. */
-+#define PHY_PREAMBLE        0xFFFFFFFF
-+#define PHY_SOF             0x01
-+#define PHY_OP_READ         0x02
-+#define PHY_OP_WRITE        0x01
-+#define PHY_TURNAROUND      0x02
-+#define PHY_PREAMBLE_SIZE   32
-+#define MII_CR_SPEED_1000   0x0040
-+#define MII_CR_SPEED_100    0x2000
-+#define MII_CR_SPEED_10     0x0000
-+#define E1000_PHY_ADDRESS   0x01
-+#define PHY_AUTO_NEG_TIME   45  /* 4.5 Seconds */
-+#define PHY_FORCE_TIME      20  /* 2.0 Seconds */
-+#define PHY_REVISION_MASK   0xFFFFFFF0
-+#define DEVICE_SPEED_MASK   0x00000300  /* Device Ctrl Reg Speed Mask */
-+#define REG4_SPEED_MASK     0x01E0
-+#define REG9_SPEED_MASK     0x0300
-+#define ADVERTISE_10_HALF   0x0001
-+#define ADVERTISE_10_FULL   0x0002
-+#define ADVERTISE_100_HALF  0x0004
-+#define ADVERTISE_100_FULL  0x0008
-+#define ADVERTISE_1000_HALF 0x0010
-+#define ADVERTISE_1000_FULL 0x0020
-+#define AUTONEG_ADVERTISE_SPEED_DEFAULT 0x002F  /* Everything but 1000-Half */
-+#define AUTONEG_ADVERTISE_10_100_ALL    0x000F	/* All 10/100 speeds*/
-+#define AUTONEG_ADVERTISE_10_ALL        0x0003	/* 10Mbps Full & Half speeds*/
-+
-+#endif /* _E1000_HW_H_ */
-Index: b/netboot/eepro.c
-===================================================================
---- a/netboot/eepro.c
-+++ /dev/null
-@@ -1,586 +0,0 @@
--/**************************************************************************
--Etherboot -  BOOTP/TFTP Bootstrap Program
--Intel EEPRO/10 NIC driver for Etherboot
--Adapted from Linux eepro.c from kernel 2.2.17
--
--This board accepts a 32 pin EEPROM (29C256), however a test with a
--27C010 shows that this EPROM also works in the socket, but it's not clear
--how repeatably. The two top address pins appear to be held low, thus
--the bottom 32kB of the 27C010 is visible in the CPU's address space.
--To be sure you could put 4 copies of the code in the 27C010, then
--it doesn't matter whether the extra lines are held low or high, just
--hopefully not floating as CMOS chips don't like floating inputs.
--
--Be careful with seating the EPROM as the socket on my board actually
--has 34 pins, the top row of 2 are not used.
--***************************************************************************/
--
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
--/* to get some global routines like printf */
--#include "etherboot.h"
--/* to get the interface to the body of the program */
--#include "nic.h"
--/* to get our own prototype */
--#include "cards.h"
--/* we use timer2 for microsecond waits */
--#include "timer.h"
--
--#undef	DEBUG		/* only after include files */
--
--/* Different 82595 chips */
--#define LAN595		0
--#define LAN595TX	1
--#define LAN595FX	2
--#define LAN595FX_10ISA	3
--
--#define	SLOW_DOWN	inb(0x80);
--
--/* The station (ethernet) address prefix, used for IDing the board. */
--#define SA_ADDR0 0x00	/* Etherexpress Pro/10 */
--#define SA_ADDR1 0xaa
--#define SA_ADDR2 0x00
--
--#define GetBit(x,y) ((x & (1<<y))>>y)
--
--/* EEPROM Word 0: */
--#define ee_PnP       0  /* Plug 'n Play enable bit */
--#define ee_Word1     1  /* Word 1? */
--#define ee_BusWidth  2  /* 8/16 bit */
--#define ee_FlashAddr 3  /* Flash Address */
--#define ee_FlashMask 0x7   /* Mask */
--#define ee_AutoIO    6  /* */
--#define ee_reserved0 7  /* =0! */
--#define ee_Flash     8  /* Flash there? */
--#define ee_AutoNeg   9  /* Auto Negotiation enabled? */
--#define ee_IO0       10 /* IO Address LSB */
--#define ee_IO0Mask   0x /*...*/
--#define ee_IO1       15 /* IO MSB */
--
--/* EEPROM Word 1: */
--#define ee_IntSel    0   /* Interrupt */
--#define ee_IntMask   0x7
--#define ee_LI        3   /* Link Integrity 0= enabled */
--#define ee_PC        4   /* Polarity Correction 0= enabled */
--#define ee_TPE_AUI   5   /* PortSelection 1=TPE */
--#define ee_Jabber    6   /* Jabber prevention 0= enabled */
--#define ee_AutoPort  7   /* Auto Port Selection 1= Disabled */
--#define ee_SMOUT     8   /* SMout Pin Control 0= Input */
--#define ee_PROM      9   /* Flash EPROM / PROM 0=Flash */
--#define ee_reserved1 10  /* .. 12 =0! */
--#define ee_AltReady  13  /* Alternate Ready, 0=normal */
--#define ee_reserved2 14  /* =0! */
--#define ee_Duplex    15
--
--/* Word2,3,4: */
--#define ee_IA5       0 /*bit start for individual Addr Byte 5 */
--#define ee_IA4       8 /*bit start for individual Addr Byte 5 */
--#define ee_IA3       0 /*bit start for individual Addr Byte 5 */
--#define ee_IA2       8 /*bit start for individual Addr Byte 5 */
--#define ee_IA1       0 /*bit start for individual Addr Byte 5 */
--#define ee_IA0       8 /*bit start for individual Addr Byte 5 */
--
--/* Word 5: */
--#define ee_BNC_TPE   0 /* 0=TPE */
--#define ee_BootType  1 /* 00=None, 01=IPX, 10=ODI, 11=NDIS */
--#define ee_BootTypeMask 0x3 
--#define ee_NumConn   3  /* Number of Connections 0= One or Two */
--#define ee_FlashSock 4  /* Presence of Flash Socket 0= Present */
--#define ee_PortTPE   5
--#define ee_PortBNC   6
--#define ee_PortAUI   7
--#define ee_PowerMgt  10 /* 0= disabled */
--#define ee_CP        13 /* Concurrent Processing */
--#define ee_CPMask    0x7
--
--/* Word 6: */
--#define ee_Stepping  0 /* Stepping info */
--#define ee_StepMask  0x0F
--#define ee_BoardID   4 /* Manucaturer Board ID, reserved */
--#define ee_BoardMask 0x0FFF
--
--/* Word 7: */
--#define ee_INT_TO_IRQ 0 /* int to IRQ Mapping  = 0x1EB8 for Pro/10+ */
--#define ee_FX_INT2IRQ 0x1EB8 /* the _only_ mapping allowed for FX chips */
--
--/*..*/
--#define ee_SIZE 0x40 /* total EEprom Size */
--#define ee_Checksum 0xBABA /* initial and final value for adding checksum */
--
--
--/* Card identification via EEprom:   */
--#define ee_addr_vendor 0x10  /* Word offset for EISA Vendor ID */
--#define ee_addr_id 0x11      /* Word offset for Card ID */
--#define ee_addr_SN 0x12      /* Serial Number */
--#define ee_addr_CRC_8 0x14   /* CRC over last thee Bytes */
--
--
--#define ee_vendor_intel0 0x25  /* Vendor ID Intel */
--#define ee_vendor_intel1 0xD4
--#define ee_id_eepro10p0 0x10   /* ID for eepro/10+ */
--#define ee_id_eepro10p1 0x31
--
--/* now this section could be used by both boards: the oldies and the ee10:
-- * ee10 uses tx buffer before of rx buffer and the oldies the inverse.
-- * (aris)
-- */
--#define	RAM_SIZE	0x8000
--
--#define	RCV_HEADER	8
--#define RCV_DEFAULT_RAM	0x6000
--#define RCV_RAM 	rcv_ram
--
--static unsigned rcv_ram = RCV_DEFAULT_RAM;
--
--#define XMT_HEADER	8
--#define XMT_RAM		(RAM_SIZE - RCV_RAM)
--
--#define XMT_START	((rcv_start + RCV_RAM) % RAM_SIZE)
--
--#define RCV_LOWER_LIMIT	(rcv_start >> 8)
--#define RCV_UPPER_LIMIT	(((rcv_start + RCV_RAM) - 2) >> 8)
--#define XMT_LOWER_LIMIT	(XMT_START >> 8)
--#define XMT_UPPER_LIMIT	(((XMT_START + XMT_RAM) - 2) >> 8)
--
--#define RCV_START_PRO	0x00
--#define RCV_START_10	XMT_RAM
--					/* by default the old driver */
--static unsigned rcv_start = RCV_START_PRO;
--
--#define	RCV_DONE	0x0008
--#define	RX_OK		0x2000
--#define	RX_ERROR	0x0d81
--
--#define	TX_DONE_BIT	0x0080
--#define	CHAIN_BIT	0x8000
--#define	XMT_STATUS	0x02
--#define	XMT_CHAIN	0x04
--#define	XMT_COUNT	0x06
--
--#define	BANK0_SELECT	0x00		
--#define	BANK1_SELECT	0x40		
--#define	BANK2_SELECT	0x80		
--
--/* Bank 0 registers */
--#define	COMMAND_REG	0x00	/* Register 0 */
--#define	MC_SETUP	0x03
--#define	XMT_CMD		0x04
--#define	DIAGNOSE_CMD	0x07
--#define	RCV_ENABLE_CMD	0x08
--#define	RCV_DISABLE_CMD	0x0a
--#define	STOP_RCV_CMD	0x0b
--#define	RESET_CMD	0x0e
--#define	POWER_DOWN_CMD	0x18
--#define	RESUME_XMT_CMD	0x1c
--#define	SEL_RESET_CMD	0x1e
--#define	STATUS_REG	0x01	/* Register 1 */
--#define	RX_INT		0x02
--#define	TX_INT		0x04
--#define	EXEC_STATUS	0x30
--#define	ID_REG		0x02	/* Register 2	*/
--#define	R_ROBIN_BITS	0xc0	/* round robin counter */
--#define	ID_REG_MASK	0x2c
--#define	ID_REG_SIG	0x24
--#define	AUTO_ENABLE	0x10
--#define	INT_MASK_REG	0x03	/* Register 3	*/
--#define	RX_STOP_MASK	0x01
--#define	RX_MASK		0x02
--#define	TX_MASK		0x04
--#define	EXEC_MASK	0x08
--#define	ALL_MASK	0x0f
--#define	IO_32_BIT	0x10
--#define	RCV_BAR		0x04	/* The following are word (16-bit) registers */
--#define	RCV_STOP	0x06
--
--#define	XMT_BAR_PRO	0x0a
--#define	XMT_BAR_10	0x0b
--static unsigned xmt_bar = XMT_BAR_PRO;
--
--#define	HOST_ADDRESS_REG	0x0c
--#define	IO_PORT		0x0e
--#define	IO_PORT_32_BIT	0x0c
--
--/* Bank 1 registers */
--#define	REG1	0x01
--#define	WORD_WIDTH	0x02
--#define	INT_ENABLE	0x80
--#define INT_NO_REG	0x02
--#define	RCV_LOWER_LIMIT_REG	0x08
--#define	RCV_UPPER_LIMIT_REG	0x09
--
--#define	XMT_LOWER_LIMIT_REG_PRO	0x0a
--#define	XMT_UPPER_LIMIT_REG_PRO	0x0b
--#define	XMT_LOWER_LIMIT_REG_10	0x0b
--#define	XMT_UPPER_LIMIT_REG_10	0x0a
--static unsigned xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_PRO;
--static unsigned xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_PRO;
--
--/* Bank 2 registers */
--#define	XMT_Chain_Int	0x20	/* Interrupt at the end of the transmit chain */
--#define	XMT_Chain_ErrStop	0x40 /* Interrupt at the end of the chain even if there are errors */
--#define	RCV_Discard_BadFrame	0x80 /* Throw bad frames away, and continue to receive others */
--#define	REG2		0x02
--#define	PRMSC_Mode	0x01
--#define	Multi_IA	0x20
--#define	REG3		0x03
--#define	TPE_BIT		0x04
--#define	BNC_BIT		0x20
--#define	REG13		0x0d
--#define	FDX		0x00
--#define	A_N_ENABLE	0x02
--	
--#define	I_ADD_REG0	0x04
--#define	I_ADD_REG1	0x05
--#define	I_ADD_REG2	0x06
--#define	I_ADD_REG3	0x07
--#define	I_ADD_REG4	0x08
--#define	I_ADD_REG5	0x09
--
--#define EEPROM_REG_PRO	0x0a
--#define EEPROM_REG_10	0x0b
--static unsigned eeprom_reg = EEPROM_REG_PRO;
--
--#define EESK 0x01
--#define EECS 0x02
--#define EEDI 0x04
--#define EEDO 0x08
--
--/* The horrible routine to read a word from the serial EEPROM. */
--/* IMPORTANT - the 82595 will be set to Bank 0 after the eeprom is read */
--
--/* The delay between EEPROM clock transitions. */
--#define eeprom_delay() { udelay(40); }
--#define EE_READ_CMD (6 << 6)
--
--/* do a full reset */
--#define eepro_full_reset(ioaddr)	outb(RESET_CMD, ioaddr); udelay(40);
--
--/* do a nice reset */
--#define eepro_sel_reset(ioaddr) 	{ \
--					outb(SEL_RESET_CMD, ioaddr); \
--					SLOW_DOWN; \
--					SLOW_DOWN; \
--					}
--
--/* clear all interrupts */
--#define	eepro_clear_int(ioaddr)	outb(ALL_MASK, ioaddr + STATUS_REG)
--
--/* enable rx */
--#define	eepro_en_rx(ioaddr)	outb(RCV_ENABLE_CMD, ioaddr)
--
--/* disable rx */
--#define	eepro_dis_rx(ioaddr)	outb(RCV_DISABLE_CMD, ioaddr)
--
--/* switch bank */
--#define eepro_sw2bank0(ioaddr) outb(BANK0_SELECT, ioaddr)
--#define eepro_sw2bank1(ioaddr) outb(BANK1_SELECT, ioaddr)
--#define eepro_sw2bank2(ioaddr) outb(BANK2_SELECT, ioaddr)
--
--static unsigned int	rx_start, tx_start;
--static int		tx_last;
--static unsigned		tx_end;
--static int		eepro = 0;
--static unsigned short	ioaddr = 0;
--static unsigned int	mem_start, mem_end = RCV_DEFAULT_RAM / 1024;
--
--#define	udelay(n)	waiton_timer2(((n)*TICKS_PER_MS)/1000)
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--static void eepro_reset(struct nic *nic)
--{
--	int		temp_reg, i;
--
--	/* put the card in its initial state */
--	eepro_sw2bank2(ioaddr);	/* be careful, bank2 now */
--	temp_reg = inb(ioaddr + eeprom_reg);
--#ifdef	DEBUG
--	printf("Stepping %d\n", temp_reg >> 5);
--#endif
--	if (temp_reg & 0x10)	/* check the TurnOff Enable bit */
--		outb(temp_reg & 0xEF, ioaddr + eeprom_reg);
--	for (i = 0; i < ETH_ALEN; i++)	/* fill the MAC address */
--		outb(nic->node_addr[i], ioaddr + I_ADD_REG0 + i);
--	temp_reg = inb(ioaddr + REG1);
--	/* setup Transmit Chaining and discard bad RCV frames */
--	outb(temp_reg | XMT_Chain_Int | XMT_Chain_ErrStop
--		| RCV_Discard_BadFrame, ioaddr + REG1);
--	temp_reg = inb(ioaddr + REG2);		/* match broadcast */
--	outb(temp_reg | 0x14, ioaddr + REG2);
--	temp_reg = inb(ioaddr + REG3);
--	outb(temp_reg & 0x3F, ioaddr + REG3);	/* clear test mode */
--	/* set the receiving mode */
--	eepro_sw2bank1(ioaddr);	/* be careful, bank1 now */
--	/* initialise the RCV and XMT upper and lower limits */
--	outb(RCV_LOWER_LIMIT, ioaddr + RCV_LOWER_LIMIT_REG);
--	outb(RCV_UPPER_LIMIT, ioaddr + RCV_UPPER_LIMIT_REG);
--	outb(XMT_LOWER_LIMIT, ioaddr + xmt_lower_limit_reg);
--	outb(XMT_UPPER_LIMIT, ioaddr + xmt_upper_limit_reg);
--	eepro_sw2bank0(ioaddr);	/* Switch back to bank 0 */
--	eepro_clear_int(ioaddr);
--	/* Initialise RCV */
--	outw(rx_start = (RCV_LOWER_LIMIT << 8), ioaddr + RCV_BAR);
--	outw(((RCV_UPPER_LIMIT << 8) | 0xFE), ioaddr + RCV_STOP);
--	/* Intialise XMT */
--	outw((XMT_LOWER_LIMIT << 8), ioaddr + xmt_bar);
--	eepro_sel_reset(ioaddr);
--	tx_start = tx_end = (XMT_LOWER_LIMIT << 8);
--	tx_last = 0;
--	eepro_en_rx(ioaddr);
--}
--
--/**************************************************************************
--POLL - Wait for a frame
--***************************************************************************/
--static int eepro_poll(struct nic *nic)
--{
--	int		i;
--	unsigned int	rcv_car = rx_start;
--	unsigned int	rcv_event, rcv_status, rcv_next_frame, rcv_size;
--
--	/* return true if there's an ethernet packet ready to read */
--	/* nic->packet should contain data on return */
--	/* nic->packetlen should contain length of data */
--#if	0
--	if ((inb(ioaddr + STATUS_REG) & 0x40) == 0)
--		return (0);
--	outb(0x40, ioaddr + STATUS_REG);
--#endif
--	outw(rcv_car, ioaddr + HOST_ADDRESS_REG);
--	rcv_event = inw(ioaddr + IO_PORT);
--	if (rcv_event != RCV_DONE)
--		return (0);
--	rcv_status = inw(ioaddr + IO_PORT);
--	rcv_next_frame = inw(ioaddr + IO_PORT);
--	rcv_size = inw(ioaddr + IO_PORT);
--#if	0
--	printf("%hX %hX %d %hhX\n", rcv_status, rcv_next_frame, rcv_size,
--		inb(ioaddr + STATUS_REG));
--#endif
--	if ((rcv_status & (RX_OK|RX_ERROR)) != RX_OK) {
--		printf("Receive error %hX\n", rcv_status);
--		return (0);
--	}
--	rcv_size &= 0x3FFF;
--	insw(ioaddr + IO_PORT, nic->packet, ((rcv_size + 3) >> 1));
--#if	0
--	for (i = 0; i < 48; i++) {
--		printf("%hhX", nic->packet[i]);
--		putchar(i % 16 == 15 ? '\n' : ' ');
--	}
--#endif
--	nic->packetlen = rcv_size;
--	rcv_car = rx_start + RCV_HEADER + rcv_size;
--	rx_start = rcv_next_frame;
--	if (rcv_car == 0)
--		rcv_car = ((RCV_UPPER_LIMIT << 8) | 0xff);
--	outw(rcv_car - 1, ioaddr + RCV_STOP);
--	return (1);
--}
--
--/**************************************************************************
--TRANSMIT - Transmit a frame
--***************************************************************************/
--static void eepro_transmit(
--	struct nic *nic,
--	const char *d,			/* Destination */
--	unsigned int t,			/* Type */
--	unsigned int s,			/* size */
--	const char *p)			/* Packet */
--{
--	unsigned int	status, tx_available, last, end, length;
--	unsigned short	type;
--	int		boguscount = 20;
--
--	length = s + ETH_HLEN;
--	if (tx_end > tx_start)
--		tx_available = XMT_RAM - (tx_end - tx_start);
--	else if (tx_end < tx_start)
--		tx_available = tx_start - tx_end;
--	else
--		tx_available = XMT_RAM;
--	last = tx_end;
--	end = last + (((length + 3) >> 1) << 1) + XMT_HEADER;
--	if (end >= (XMT_UPPER_LIMIT << 8)) {
--		last = (XMT_LOWER_LIMIT << 8);
--		end = last + (((length + 3) >> 1) << 1) + XMT_HEADER;
--	}
--	outw(last, ioaddr + HOST_ADDRESS_REG);
--	outw(XMT_CMD, ioaddr + IO_PORT);
--	outw(0, ioaddr + IO_PORT);
--	outw(end, ioaddr + IO_PORT);
--	outw(length, ioaddr + IO_PORT);
--	outsw(ioaddr + IO_PORT, d, ETH_ALEN / 2);
--	outsw(ioaddr + IO_PORT, nic->node_addr, ETH_ALEN / 2);
--	type = htons(t);
--	outsw(ioaddr + IO_PORT, &type, sizeof(type) / 2);
--	outsw(ioaddr + IO_PORT, p, (s + 3) >> 1);
--	/* A dummy read to flush the DRAM write pipeline */
--	status = inw(ioaddr + IO_PORT);
--	outw(last, ioaddr + xmt_bar);
--	outb(XMT_CMD, ioaddr);
--	tx_start = last;
--	tx_last = last;
--	tx_end = end;
--#if	0
--	printf("%d %d\n", tx_start, tx_end);
--#endif
--	while (boguscount > 0) {
--		if (((status = inw(ioaddr + IO_PORT)) & TX_DONE_BIT) == 0) {
--			udelay(40);
--			boguscount--;
--			continue;
--		}
--#if	DEBUG
--		if ((status & 0x2000) == 0)
--			printf("Transmit status %hX\n", status);
--#endif
--	}
--}
--
--/**************************************************************************
--DISABLE - Turn off ethernet interface
--***************************************************************************/
--static void eepro_disable(struct nic *nic)
--{
--	eepro_sw2bank0(ioaddr);	/* Switch to bank 0 */
--	/* Flush the Tx and disable Rx */
--	outb(STOP_RCV_CMD, ioaddr);
--	tx_start = tx_end = (XMT_LOWER_LIMIT << 8);
--	tx_last = 0;
--	/* Reset the 82595 */
--	eepro_full_reset(ioaddr);
--}
--
--static int read_eeprom(int location)
--{
--	int		i;
--	unsigned short	retval = 0;
--	int		ee_addr = ioaddr + eeprom_reg;
--	int		read_cmd = location | EE_READ_CMD;
--	int		ctrl_val = EECS;
--
--	if (eepro == LAN595FX_10ISA) {
--		eepro_sw2bank1(ioaddr);
--		outb(0x00, ioaddr + STATUS_REG);
--	}
--	eepro_sw2bank2(ioaddr);
--	outb(ctrl_val, ee_addr);
--	/* shift the read command bits out */
--	for (i = 8; i >= 0; i--) {
--		short outval = (read_cmd & (1 << i)) ? ctrl_val | EEDI : ctrl_val;
--		outb(outval, ee_addr);
--		outb(outval | EESK, ee_addr);	/* EEPROM clock tick */
--		eeprom_delay();
--		outb(outval, ee_addr);		/* finish EEPROM clock tick */
--		eeprom_delay();
--	}
--	outb(ctrl_val, ee_addr);
--	for (i = 16; i > 0; i--) {
--		outb(ctrl_val | EESK, ee_addr);
--		eeprom_delay();
--		retval = (retval << 1) | ((inb(ee_addr) & EEDO) ? 1 : 0);
--		outb(ctrl_val, ee_addr);
--		eeprom_delay();
--	}
--	/* terminate the EEPROM access */
--	ctrl_val &= ~EECS;
--	outb(ctrl_val | EESK, ee_addr);
--	eeprom_delay();
--	outb(ctrl_val, ee_addr);
--	eeprom_delay();
--	eepro_sw2bank0(ioaddr);
--	return (retval);
--}
--
--static int eepro_probe1(struct nic *nic)
--{
--	int		i, id, counter, l_eepro = 0;
--	union {
--		unsigned char	caddr[ETH_ALEN];
--		unsigned short	saddr[ETH_ALEN/2];
--	} station_addr;
--	char		*name;
--
--	id = inb(ioaddr + ID_REG);
--	if ((id & ID_REG_MASK) != ID_REG_SIG)
--		return (0);
--	counter = id & R_ROBIN_BITS;
--	if (((id = inb(ioaddr + ID_REG)) & R_ROBIN_BITS) != (counter + 0x40))
--		return (0);
--	/* yes the 82595 has been found */
--	station_addr.saddr[2] = read_eeprom(2);
--	if (station_addr.saddr[2] == 0x0000 || station_addr.saddr[2] == 0xFFFF) {
--		l_eepro = 3;
--		eepro = LAN595FX_10ISA;
--		eeprom_reg= EEPROM_REG_10;
--		rcv_start = RCV_START_10;
--		xmt_lower_limit_reg = XMT_LOWER_LIMIT_REG_10;
--		xmt_upper_limit_reg = XMT_UPPER_LIMIT_REG_10;
--		station_addr.saddr[2] = read_eeprom(2);
--	}
--	station_addr.saddr[1] = read_eeprom(3);
--	station_addr.saddr[0] = read_eeprom(4);
--	if (l_eepro)
--		name = "Intel EtherExpress 10 ISA";
--	else if (read_eeprom(7) == ee_FX_INT2IRQ) {
--		name = "Intel EtherExpress Pro/10+ ISA";
--		l_eepro = 2;
--	} else if (station_addr.saddr[0] == SA_ADDR1) {
--		name = "Intel EtherExpress Pro/10 ISA";
--		l_eepro = 1;
--	} else {
--		l_eepro = 0;
--		name = "Intel 82595-based LAN card";
--	}
--	station_addr.saddr[0] = swap16(station_addr.saddr[0]);
--	station_addr.saddr[1] = swap16(station_addr.saddr[1]);
--	station_addr.saddr[2] = swap16(station_addr.saddr[2]);
--	for (i = 0; i < ETH_ALEN; i++) {
--		nic->node_addr[i] = station_addr.caddr[i];
--	}
--	printf("\n%s ioaddr %#hX, addr %!", name, ioaddr, nic->node_addr);
--	mem_start = RCV_LOWER_LIMIT << 8;
--	if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29)
--		mem_end = RCV_UPPER_LIMIT << 8;
--	else {
--		mem_end = mem_end * 1024 + (RCV_LOWER_LIMIT << 8);
--		rcv_ram = mem_end - (RCV_LOWER_LIMIT << 8);
--	}
--	printf(", Rx mem %dK, if %s\n", (mem_end - mem_start) >> 10,
--		GetBit(read_eeprom(5), ee_BNC_TPE) ? "BNC" : "TP");
--	return (1);
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--***************************************************************************/
--struct nic *eepro_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	unsigned short		*p;
--	/* same probe list as the Linux driver */
--	static unsigned short	ioaddrs[] = {
--		0x300, 0x210, 0x240, 0x280, 0x2C0, 0x200, 0x320, 0x340, 0x360, 0};
--
--	if (probe_addrs == 0 || probe_addrs[0] == 0)
--		probe_addrs = ioaddrs;
--	for (p = probe_addrs; (ioaddr = *p) != 0; p++) {
--		if (eepro_probe1(nic))
--			break;
--	}
--	if (*p == 0)
--		return (0);
--	eepro_reset(nic);
--	/* point to NIC specific routines */
--	nic->reset = eepro_reset;
--	nic->poll = eepro_poll;
--	nic->transmit = eepro_transmit;
--	nic->disable = eepro_disable;
--	return (nic);
--}
-Index: b/netboot/eepro100.c
-===================================================================
---- a/netboot/eepro100.c
-+++ b/netboot/eepro100.c
-@@ -80,8 +80,8 @@
-  *
-  * Caveats:
-  *
-- * The etherboot framework moves the code to the 32k segment from
-- * 0x98000 to 0xa0000. There is just a little room between the end of
-+ * The Etherboot framework moves the code to the 48k segment from
-+ * 0x94000 to 0xa0000. There is just a little room between the end of
-  * this driver and the 0xa0000 address. If you compile in too many
-  * features, this will overflow.
-  * The number under "hex" in the output of size that scrolls by while
-@@ -92,17 +92,13 @@
- /* The etherboot authors seem to dislike the argument ordering in
-  * outb macros that Linux uses. I disklike the confusion that this
-  * has caused even more.... This file uses the Linux argument ordering.  */
--/* Sorry not us. It's inherted code from FreeBSD. [The authors] */
-+/* Sorry not us. It's inherited code from FreeBSD. [The authors] */
- 
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- #include "timer.h"
- 
--#undef	virt_to_bus
--#define	virt_to_bus(x)	((unsigned long)x)
--
- static int ioaddr;
- 
- typedef unsigned char  u8;
-@@ -121,6 +117,18 @@
-   SCBEarlyRx = 20,                /* Early receive byte count. */
- };
- 
-+enum SCBCmdBits {
-+	SCBMaskCmdDone=0x8000, SCBMaskRxDone=0x4000, SCBMaskCmdIdle=0x2000,
-+	SCBMaskRxSuspend=0x1000, SCBMaskEarlyRx=0x0800, SCBMaskFlowCtl=0x0400,
-+	SCBTriggerIntr=0x0200, SCBMaskAll=0x0100,
-+	/* The rest are Rx and Tx commands. */
-+	CUStart=0x0010, CUResume=0x0020, CUStatsAddr=0x0040, CUShowStats=0x0050,
-+	CUCmdBase=0x0060,	/* CU Base address (set to zero) . */
-+	CUDumpStats=0x0070, /* Dump then reset stats counters. */
-+	RxStart=0x0001, RxResume=0x0002, RxAbort=0x0004, RxAddrLoad=0x0006,
-+	RxResumeNoResources=0x0007,
-+};
-+
- static int do_eeprom_cmd(int cmd, int cmd_len);
- void hd(void *where, int n);
- 
-@@ -139,8 +147,6 @@
- #define EE_WRITE_1      0x4806
- #define EE_ENB          (0x4800 | EE_CS)
- 
--#define udelay(n)       waiton_timer2(((n)*TICKS_PER_MS)/1000)
--
- /* The EEPROM commands include the alway-set leading bit. */
- #define EE_READ_CMD     6
- 
-@@ -184,9 +190,18 @@
-    Typically this takes 0 ticks. */
- static inline void wait_for_cmd_done(int cmd_ioaddr)
- {
--  short wait = 100;
--  do   ;
--  while(inb(cmd_ioaddr) && --wait >= 0);
-+  int wait = 0;
-+  int delayed_cmd;
-+
-+  do
-+    if (inb(cmd_ioaddr) == 0) return;
-+  while(++wait <= 100);
-+  delayed_cmd = inb(cmd_ioaddr);
-+  do
-+    if (inb(cmd_ioaddr) == 0) break;
-+  while(++wait <= 10000);
-+  printf("Command %2.2x was not immediately accepted, %d ticks!\n",
-+      delayed_cmd, wait);
- }
- 
- /* Elements of the dump_statistics block. This block must be lword aligned. */
-@@ -212,35 +227,30 @@
- 
- /* A speedo3 TX buffer descriptor with two buffers... */
- static struct TxFD {
--  volatile s16 status;
--  s16 command;
--  u32 link;          /* void * */
--  u32 tx_desc_addr;  /* (almost) Always points to the tx_buf_addr element. */
--  s32 count;         /* # of TBD (=2), Tx start thresh., etc. */
--                     /* This constitutes two "TBD" entries: hdr and data */
--  u32 tx_buf_addr0;  /* void *, header of frame to be transmitted.  */
--  s32 tx_buf_size0;  /* Length of Tx hdr. */
--  u32 tx_buf_addr1;  /* void *, data to be transmitted.  */
--  s32 tx_buf_size1;  /* Length of Tx data. */
-+	volatile s16 status;
-+	s16 command;
-+	u32 link;          /* void * */
-+	u32 tx_desc_addr;  /* (almost) Always points to the tx_buf_addr element. */
-+	s32 count;         /* # of TBD (=2), Tx start thresh., etc. */
-+	/* This constitutes two "TBD" entries: hdr and data */
-+	u32 tx_buf_addr0;  /* void *, header of frame to be transmitted.  */
-+	s32 tx_buf_size0;  /* Length of Tx hdr. */
-+	u32 tx_buf_addr1;  /* void *, data to be transmitted.  */
-+	s32 tx_buf_size1;  /* Length of Tx data. */
- } txfd;
- 
- struct RxFD {               /* Receive frame descriptor. */
--  volatile s16 status;
--  s16 command;
--  u32 link;                 /* struct RxFD * */
--  u32 rx_buf_addr;          /* void * */
--  u16 count;
--  u16 size;
--  char packet[1518];
-+	volatile s16 status;
-+	s16 command;
-+	u32 link;                 /* struct RxFD * */
-+	u32 rx_buf_addr;          /* void * */
-+	u16 count;
-+	u16 size;
-+	char packet[1518];
- };
- 
--#ifdef	USE_LOWMEM_BUFFER
--#define rxfd ((struct RxFD *)(0x10000 - sizeof(struct RxFD)))
--#define ACCESS(x) x->
--#else
- static struct RxFD rxfd;
- #define ACCESS(x) x.
--#endif
- 
- static int congenb = 0;         /* Enable congestion control in the DP83840. */
- static int txfifo = 8;          /* Tx FIFO threshold in 4 byte units, 0-15 */
-@@ -256,8 +266,7 @@
-   u32 link;
-   unsigned char data[22];
- } confcmd = {
--  0, CmdConfigure,
--  (u32) & txfd,
-+  0, 0, 0, /* filled in later */
-   {22, 0x08, 0, 0,  0, 0x80, 0x32, 0x03,  1, /* 1=Use MII  0=Use AUI */
-    0, 0x2E, 0,  0x60, 0,
-    0xf2, 0x48,   0, 0x40, 0xf2, 0x80,        /* 0x40=Force full-duplex */
-@@ -276,19 +285,20 @@
- 
- static int mdio_write(int phy_id, int location, int value)
- {
--  int val, boguscnt = 64*4;         /* <64 usec. to complete, typ 27 ticks */
-+	int val, boguscnt = 64*4;         /* <64 usec. to complete, typ 27 ticks */
- 
--  outl(0x04000000 | (location<<16) | (phy_id<<21) | value,
--       ioaddr + SCBCtrlMDI);
--  do {
--    udelay(16);
--
--    val = inl(ioaddr + SCBCtrlMDI);
--    if (--boguscnt < 0) {
--      printf(" mdio_write() timed out with val = %X.\n", val);
--    }
--  } while (! (val & 0x10000000));
--  return val & 0xffff;
-+	outl(0x04000000 | (location<<16) | (phy_id<<21) | value,
-+	     ioaddr + SCBCtrlMDI);
-+	do {
-+		udelay(16);
-+		
-+		val = inl(ioaddr + SCBCtrlMDI);
-+		if (--boguscnt < 0) {
-+			printf(" mdio_write() timed out with val = %X.\n", val);
-+			break;
-+		}
-+	} while (! (val & 0x10000000));
-+	return val & 0xffff;
- }
- 
- /* Support function: mdio_read
-@@ -298,17 +308,19 @@
-  */
- static int mdio_read(int phy_id, int location)
- {
--  int val, boguscnt = 64*4;               /* <64 usec. to complete, typ 27 ticks */
--  outl(0x08000000 | (location<<16) | (phy_id<<21), ioaddr + SCBCtrlMDI);
--  do {
--    udelay(16);
--
--    val = inl(ioaddr + SCBCtrlMDI);
--    if (--boguscnt < 0) {
--      printf( " mdio_read() timed out with val = %X.\n", val);
--    }
--  } while (! (val & 0x10000000));
--  return val & 0xffff;
-+	int val, boguscnt = 64*4;               /* <64 usec. to complete, typ 27 ticks */
-+	outl(0x08000000 | (location<<16) | (phy_id<<21), ioaddr + SCBCtrlMDI);
-+	do {
-+		udelay(16);
-+		
-+		val = inl(ioaddr + SCBCtrlMDI);
-+
-+		if (--boguscnt < 0) {
-+			printf( " mdio_read() timed out with val = %X.\n", val);
-+			break;
-+		}
-+	} while (! (val & 0x10000000));
-+	return val & 0xffff;
- }
- 
- /* The fixes for the code were kindly provided by Dragan Stancevic
-@@ -340,25 +352,26 @@
- 	return retval;
- }
- 
-+#if 0
- static inline void whereami (const char *str)
- {
--#if	0
-   printf ("%s\n", str);
-   sleep (2);
--#endif
- }
-+#else
-+#define whereami(s)
-+#endif
- 
--/* function: eepro100_reset
-- * resets the card. This is used to allow Etherboot to probe the card again
-- * from a "virginal" state....
-- * Arguments: none
-- *
-- * returns:   void.
-- */
--
--static void eepro100_reset(struct nic *nic)
-+static void eepro100_irq(struct nic *nic __unused, irq_action_t action __unused)
- {
--  outl(0, ioaddr + SCBPort);
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
- }
- 
- /* function: eepro100_transmit
-@@ -373,61 +386,87 @@
- 
- static void eepro100_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p)
- {
--  struct eth_hdr {
--    unsigned char dst_addr[ETH_ALEN];
--    unsigned char src_addr[ETH_ALEN];
--    unsigned short type;
--  } hdr;
--  unsigned short status;
--  int to;
--  int s1, s2;
--
--  status = inw(ioaddr + SCBStatus);
--  /* Acknowledge all of the current interrupt sources ASAP. */
--  outw(status & 0xfc00, ioaddr + SCBStatus);
-+	struct eth_hdr {
-+		unsigned char dst_addr[ETH_ALEN];
-+		unsigned char src_addr[ETH_ALEN];
-+		unsigned short type;
-+	} hdr;
-+	unsigned short status;
-+	int s1, s2;
-+
-+	status = inw(ioaddr + SCBStatus);
-+	/* Acknowledge all of the current interrupt sources ASAP. */
-+	outw(status & 0xfc00, ioaddr + SCBStatus);
- 
- #ifdef	DEBUG
--  printf ("transmitting type %hX packet (%d bytes). status = %hX, cmd=%hX\n",
--	  t, s, status, inw (ioaddr + SCBCmd));
-+	printf ("transmitting type %hX packet (%d bytes). status = %hX, cmd=%hX\n",
-+		t, s, status, inw (ioaddr + SCBCmd));
- #endif
- 
--  memcpy (&hdr.dst_addr, d, ETH_ALEN);
--  memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN);
-+	memcpy (&hdr.dst_addr, d, ETH_ALEN);
-+	memcpy (&hdr.src_addr, nic->node_addr, ETH_ALEN);
- 
--  hdr.type = htons (t);
-+	hdr.type = htons (t);
- 
--  txfd.status = 0;
--  txfd.command = CmdSuspend | CmdTx | CmdTxFlex;
--  txfd.link   = virt_to_bus (&txfd);
--  txfd.count   = 0x02208000;
--  txfd.tx_desc_addr = (u32)&txfd.tx_buf_addr0;
-+	txfd.status = 0;
-+	txfd.command = CmdSuspend | CmdTx | CmdTxFlex;
-+	txfd.link   = virt_to_bus (&txfd);
-+	txfd.count   = 0x02208000;
-+	txfd.tx_desc_addr = virt_to_bus(&txfd.tx_buf_addr0);
- 
--  txfd.tx_buf_addr0 = virt_to_bus (&hdr);
--  txfd.tx_buf_size0 = sizeof (hdr);
-+	txfd.tx_buf_addr0 = virt_to_bus (&hdr);
-+	txfd.tx_buf_size0 = sizeof (hdr);
- 
--  txfd.tx_buf_addr1 = virt_to_bus (p);
--  txfd.tx_buf_size1 = s;
-+	txfd.tx_buf_addr1 = virt_to_bus (p);
-+	txfd.tx_buf_size1 = s;
- 
- #ifdef	DEBUG
--  printf ("txfd: \n");
--  hd (&txfd, sizeof (txfd));
-+	printf ("txfd: \n");
-+	hd (&txfd, sizeof (txfd));
- #endif
- 
--  outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
--  outw(INT_MASK | CU_START, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
--
--  s1 = inw (ioaddr + SCBStatus);
--  load_timer2(10*TICKS_PER_MS);		/* timeout 10 ms for transmit */
--  while (!txfd.status && timer2_running())
--    /* Wait */;
--  s2 = inw (ioaddr + SCBStatus);
-+	outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
-+	outw(INT_MASK | CU_START, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
-+
-+	s1 = inw (ioaddr + SCBStatus);
-+	load_timer2(10*TICKS_PER_MS);		/* timeout 10 ms for transmit */
-+	while (!txfd.status && timer2_running())
-+		/* Wait */;
-+	s2 = inw (ioaddr + SCBStatus);
- 
- #ifdef	DEBUG
--  printf ("s1 = %hX, s2 = %hX.\n", s1, s2);
-+	printf ("s1 = %hX, s2 = %hX.\n", s1, s2);
- #endif
- }
- 
-+/*
-+ * Sometimes the receiver stops making progress.  This routine knows how to
-+ * get it going again, without losing packets or being otherwise nasty like
-+ * a chip reset would be.  Previously the driver had a whole sequence
-+ * of if RxSuspended, if it's no buffers do one thing, if it's no resources,
-+ * do another, etc.  But those things don't really matter.  Separate logic
-+ * in the ISR provides for allocating buffers--the other half of operation
-+ * is just making sure the receiver is active.  speedo_rx_soft_reset does that.
-+ * This problem with the old, more involved algorithm is shown up under
-+ * ping floods on the order of 60K packets/second on a 100Mbps fdx network.
-+ */
-+static void
-+speedo_rx_soft_reset(void)
-+{
-+  wait_for_cmd_done(ioaddr + SCBCmd);
-+	/*
-+	* Put the hardware into a known state.
-+	*/
-+	outb(RX_ABORT, ioaddr + SCBCmd);
-+
-+	ACCESS(rxfd)rx_buf_addr = 0xffffffff;
-+
-+  wait_for_cmd_done(ioaddr + SCBCmd);
-+
-+	outb(RX_START, ioaddr + SCBCmd);
-+}
-+
- /* function: eepro100_poll / eth_poll
-  * This recieves a packet from the network.
-  *
-@@ -440,34 +479,87 @@
-  *            returns the length of the packet in nic->packetlen.
-  */
- 
--static int eepro100_poll(struct nic *nic)
-+static int eepro100_poll(struct nic *nic, int retrieve)
- {
--  if (!ACCESS(rxfd)status)
--    return 0;
-+  unsigned int status;
-+  status = inw(ioaddr + SCBStatus);
- 
--  /* Ok. We got a packet. Now restart the reciever.... */
--  ACCESS(rxfd)status = 0;
--  ACCESS(rxfd)command = 0xc000;
--  outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
--  outw(INT_MASK | RX_START, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
-+	if (!ACCESS(rxfd)status)
-+		return 0;
-+
-+	/* There is a packet ready */
-+	if ( ! retrieve ) return 1;
-+
-+  /*
-+   * The chip may have suspended reception for various reasons.
-+   * Check for that, and re-prime it should this be the case.
-+   */
-+  switch ((status >> 2) & 0xf) {
-+  case 0: /* Idle */
-+    break;
-+  case 1:	/* Suspended */
-+  case 2:	/* No resources (RxFDs) */
-+  case 9:	/* Suspended with no more RBDs */
-+  case 10: /* No resources due to no RBDs */
-+  case 12: /* Ready with no RBDs */
-+    speedo_rx_soft_reset();
-+    break;
-+  case 3:  case 5:  case 6:  case 7:  case 8:
-+  case 11:  case 13:  case 14:  case 15:
-+    /* these are all reserved values */
-+    break;
-+  }
-+
-+	/* Ok. We got a packet. Now restart the reciever.... */
-+	ACCESS(rxfd)status = 0;
-+	ACCESS(rxfd)command = 0xc000;
-+	outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
-+	outw(INT_MASK | RX_START, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
- 
- #ifdef	DEBUG
--  printf ("Got a packet: Len = %d.\n", ACCESS(rxfd)count & 0x3fff);
-+	printf ("Got a packet: Len = %d.\n", ACCESS(rxfd)count & 0x3fff);
- #endif
--  nic->packetlen =  ACCESS(rxfd)count & 0x3fff;
--  memcpy (nic->packet, ACCESS(rxfd)packet, nic->packetlen);
-+	nic->packetlen =  ACCESS(rxfd)count & 0x3fff;
-+	memcpy (nic->packet, ACCESS(rxfd)packet, nic->packetlen);
- #ifdef	DEBUG
--  hd (nic->packet, 0x30);
-+	hd (nic->packet, 0x30);
- #endif
--  return 1;
-+	return 1;
- }
- 
--static void eepro100_disable(struct nic *nic)
-+/* function: eepro100_disable
-+ * resets the card. This is used to allow Etherboot or Linux
-+ * to probe the card again from a "virginal" state....
-+ * Arguments: none
-+ *
-+ * returns:   void.
-+ */
-+static void eepro100_disable(struct dev *dev __unused)
- {
--    /* See if this PartialReset solves the problem with interfering with
--       kernel operation after Etherboot hands over. - Ken 20001102 */
--    outl(2, ioaddr + SCBPort);
-+/* from eepro100_reset */
-+	outl(0, ioaddr + SCBPort);
-+/* from eepro100_disable */
-+	/* See if this PartialReset solves the problem with interfering with
-+	   kernel operation after Etherboot hands over. - Ken 20001102 */
-+	outl(2, ioaddr + SCBPort);
-+
-+	/* The following is from the Intel e100 driver.
-+	 * This hopefully solves the problem with hanging hard DOS images. */
-+
-+	/* wait for the reset to take effect */
-+	udelay(20);
-+
-+	/* Mask off our interrupt line -- it is unmasked after reset */
-+	{
-+		u16 intr_status;
-+		/* Disable interrupts on our PCI board by setting the mask bit */
-+		outw(INT_MASK, ioaddr + SCBCmd);
-+		intr_status = inw(ioaddr + SCBStatus);
-+		/* ack and clear intrs */
-+		outw(intr_status, ioaddr + SCBStatus);
-+		inw(ioaddr + SCBStatus);
-+	}
- }
- 
- /* exported function: eepro100_probe / eth_probe
-@@ -478,25 +570,30 @@
-  *            leaves the 82557 initialized, and ready to recieve packets.
-  */
- 
--struct nic *eepro100_probe(struct nic *nic, unsigned short *probeaddrs, struct pci_device *p)
-+static int eepro100_probe(struct dev *dev, struct pci_device *p)
- {
-+	struct nic *nic = (struct nic *)dev;
- 	unsigned short sum = 0;
- 	int i;
- 	int read_cmd, ee_size;
--	unsigned short value;
- 	int options;
--	int promisc;
-+	int rx_mode;
- 
- 	/* we cache only the first few words of the EEPROM data
- 	   be careful not to access beyond this array */
- 	unsigned short eeprom[16];
- 
--	if (probeaddrs == 0 || probeaddrs[0] == 0)
-+	if (p->ioaddr == 0)
- 		return 0;
--	ioaddr = probeaddrs[0] & ~3; /* Mask the bit that says "this is an io addr" */
-+	ioaddr = p->ioaddr & ~3; /* Mask the bit that says "this is an io addr" */
-+	nic->ioaddr = ioaddr;
- 
- 	adjust_pci_device(p);
- 
-+	/* Copy IRQ from PCI information */
-+	/* nic->irqno = pci->irq; */
-+	nic->irqno = 0;
-+
- 	if ((do_eeprom_cmd(EE_READ_CMD << 24, 27) & 0xffe0000)
- 		== 0xffe0000) {
- 		ee_size = 0x100;
-@@ -513,123 +610,138 @@
- 		sum += value;
- 	}
- 
--  for (i=0;i<ETH_ALEN;i++) {
--	nic->node_addr[i] =  (eeprom[i/2] >> (8*(i&1))) & 0xff;
--  }
--  printf ("Ethernet addr: %!\n", nic->node_addr);
--
--  if (sum != 0xBABA)
--	printf("eepro100: Invalid EEPROM checksum %#hX, "
--	       "check settings before activating this device!\n", sum);
--  outl(0, ioaddr + SCBPort);
--  udelay (10000);
--
--  whereami ("Got eeprom.");
--
--  outl(virt_to_bus(&lstats), ioaddr + SCBPointer);
--  outw(INT_MASK | CU_STATSADDR, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
--
--  whereami ("set stats addr.");
--  /* INIT RX stuff. */
--
--  /* Base = 0 */
--  outl(0, ioaddr + SCBPointer);
--  outw(INT_MASK | RX_ADDR_LOAD, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
--
--  whereami ("set rx base addr.");
--
--  ACCESS(rxfd)status  = 0x0001;
--  ACCESS(rxfd)command = 0x0000;
--  ACCESS(rxfd)link    = virt_to_bus(&(ACCESS(rxfd)status));
--  ACCESS(rxfd)rx_buf_addr = (int) &nic->packet;
--  ACCESS(rxfd)count   = 0;
--  ACCESS(rxfd)size    = 1528;
--
--  outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
--  outw(INT_MASK | RX_START, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
--
--  whereami ("started RX process.");
--
--  /* Start the reciever.... */
--  ACCESS(rxfd)status = 0;
--  ACCESS(rxfd)command = 0xc000;
--  outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
--  outw(INT_MASK | RX_START, ioaddr + SCBCmd);
--
--  /* INIT TX stuff. */
--
--  /* Base = 0 */
--  outl(0, ioaddr + SCBPointer);
--  outw(INT_MASK | CU_CMD_BASE, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
--
--  whereami ("set TX base addr.");
--
--  txfd.command      = (CmdIASetup);
--  txfd.status       = 0x0000;
--  txfd.link         = virt_to_bus (&confcmd);
--
--  {
--	char *t = (char *)&txfd.tx_desc_addr;
-+	for (i=0;i<ETH_ALEN;i++) {
-+		nic->node_addr[i] =  (eeprom[i/2] >> (8*(i&1))) & 0xff;
-+	}
-+	printf ("Ethernet addr: %!\n", nic->node_addr);
- 
--	for (i=0;i<ETH_ALEN;i++)
--		t[i] = nic->node_addr[i];
--  }
-+	if (sum != 0xBABA)
-+		printf("eepro100: Invalid EEPROM checksum %#hX, "
-+		       "check settings before activating this device!\n", sum);
-+	outl(0, ioaddr + SCBPort);
-+	udelay (10000);
-+	whereami ("Got eeprom.");
-+
-+	/* Base = 0 */
-+	outl(0, ioaddr + SCBPointer);
-+	outw(INT_MASK | RX_ADDR_LOAD, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
-+	whereami ("set rx base addr.");
-+
-+	outl(virt_to_bus(&lstats), ioaddr + SCBPointer);
-+	outw(INT_MASK | CU_STATSADDR, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
-+	whereami ("set stats addr.");
-+
-+	/* INIT RX stuff. */
-+	ACCESS(rxfd)status  = 0x0001;
-+	ACCESS(rxfd)command = 0x0000;
-+	ACCESS(rxfd)link    = virt_to_bus(&(ACCESS(rxfd)status));
-+	ACCESS(rxfd)rx_buf_addr = virt_to_bus(&nic->packet);
-+	ACCESS(rxfd)count   = 0;
-+	ACCESS(rxfd)size    = 1528;
-+
-+	outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
-+	outw(INT_MASK | RX_START, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
-+
-+	whereami ("started RX process.");
-+
-+	/* Start the reciever.... */
-+	ACCESS(rxfd)status = 0;
-+	ACCESS(rxfd)command = 0xc000;
-+	outl(virt_to_bus(&(ACCESS(rxfd)status)), ioaddr + SCBPointer);
-+	outw(INT_MASK | RX_START, ioaddr + SCBCmd);
-+
-+	/* INIT TX stuff. */
-+
-+	/* Base = 0 */
-+	outl(0, ioaddr + SCBPointer);
-+	outw(INT_MASK | CU_CMD_BASE, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
-+
-+	whereami ("set TX base addr.");
-+
-+	txfd.command      = (CmdIASetup);
-+	txfd.status       = 0x0000;
-+	txfd.link         = virt_to_bus (&confcmd);
-+
-+	{
-+		char *t = (char *)&txfd.tx_desc_addr;
-+		
-+		for (i=0;i<ETH_ALEN;i++)
-+			t[i] = nic->node_addr[i];
-+	}
- 
- #ifdef	DEBUG
--  printf ("Setup_eaddr:\n");
--  hd (&txfd, 0x20);
-+	printf ("Setup_eaddr:\n");
-+	hd (&txfd, 0x20);
- #endif
--  /*      options = 0x40; */ /* 10mbps half duplex... */
--  options = 0x00;            /* Autosense */
--
--  promisc = 0;
--
--  if (   ((eeprom[6]>>8) & 0x3f) == DP83840
--	  || ((eeprom[6]>>8) & 0x3f) == DP83840A) {
--	int mdi_reg23 = mdio_read(eeprom[6] & 0x1f, 23) | 0x0422;
--	if (congenb)
--	  mdi_reg23 |= 0x0100;
--	printf("  DP83840 specific setup, setting register 23 to %hX.\n",
--	       mdi_reg23);
--	mdio_write(eeprom[6] & 0x1f, 23, mdi_reg23);
--  }
--  whereami ("Done DP8340 special setup.");
--  if (options != 0) {
--	mdio_write(eeprom[6] & 0x1f, 0,
--		   ((options & 0x20) ? 0x2000 : 0) |    /* 100mbps? */
--		   ((options & 0x10) ? 0x0100 : 0)); /* Full duplex? */
--	whereami ("set mdio_register.");
--  }
-+	/*      options = 0x40; */ /* 10mbps half duplex... */
-+	options = 0x00;            /* Autosense */
- 
--  confcmd.command  = CmdSuspend | CmdConfigure;
--  confcmd.status   = 0x0000;
--  confcmd.link     = virt_to_bus (&txfd);
--  confcmd.data[1]  = (txfifo << 4) | rxfifo;
--  confcmd.data[4]  = rxdmacount;
--  confcmd.data[5]  = txdmacount + 0x80;
--  confcmd.data[15] = promisc ? 0x49: 0x48;
--  confcmd.data[19] = (options & 0x10) ? 0xC0 : 0x80;
--  confcmd.data[21] = promisc ? 0x0D: 0x05;
-+#ifdef PROMISC
-+	rx_mode = 3;
-+#elif ALLMULTI
-+	rx_mode = 1;
-+#else
-+	rx_mode = 0;
-+#endif
- 
--  outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
--  outw(INT_MASK | CU_START, ioaddr + SCBCmd);
--  wait_for_cmd_done(ioaddr + SCBCmd);
-+	if (   ((eeprom[6]>>8) & 0x3f) == DP83840
-+	       || ((eeprom[6]>>8) & 0x3f) == DP83840A) {
-+		int mdi_reg23 = mdio_read(eeprom[6] & 0x1f, 23) | 0x0422;
-+		if (congenb)
-+			mdi_reg23 |= 0x0100;
-+		printf("  DP83840 specific setup, setting register 23 to %hX.\n",
-+		       mdi_reg23);
-+		mdio_write(eeprom[6] & 0x1f, 23, mdi_reg23);
-+	}
-+	whereami ("Done DP8340 special setup.");
-+	if (options != 0) {
-+		mdio_write(eeprom[6] & 0x1f, 0,
-+			   ((options & 0x20) ? 0x2000 : 0) |    /* 100mbps? */
-+			   ((options & 0x10) ? 0x0100 : 0)); /* Full duplex? */
-+		whereami ("set mdio_register.");
-+	}
- 
--  whereami ("started TX thingy (config, iasetup).");
-+	confcmd.command  = CmdSuspend | CmdConfigure;
-+	confcmd.status   = 0x0000;
-+	confcmd.link     = virt_to_bus (&txfd);
-+	confcmd.data[1]  = (txfifo << 4) | rxfifo;
-+	confcmd.data[4]  = rxdmacount;
-+	confcmd.data[5]  = txdmacount + 0x80;
-+	confcmd.data[15] = (rx_mode & 2) ? 0x49: 0x48;
-+	confcmd.data[19] = (options & 0x10) ? 0xC0 : 0x80;
-+	confcmd.data[21] = (rx_mode & 1) ? 0x0D: 0x05;
-+
-+	outl(virt_to_bus(&txfd), ioaddr + SCBPointer);
-+	outw(INT_MASK | CU_START, ioaddr + SCBCmd);
-+	wait_for_cmd_done(ioaddr + SCBCmd);
-+
-+	whereami ("started TX thingy (config, iasetup).");
-+
-+	load_timer2(10*TICKS_PER_MS);
-+	while (!txfd.status && timer2_running())
-+		/* Wait */;
-+
-+	/* Read the status register once to disgard stale data */
-+	mdio_read(eeprom[6] & 0x1f, 1);
-+	/* Check to see if the network cable is plugged in.
-+	 * This allows for faster failure if there is nothing
-+	 * we can do.
-+	 */
-+	if (!(mdio_read(eeprom[6] & 0x1f, 1) & (1 << 2))) {
-+		printf("Valid link not established\n");
-+		eepro100_disable(dev);
-+		return 0;
-+	}
- 
--  load_timer2(10*TICKS_PER_MS);
--  while (!txfd.status && timer2_running())
--	/* Wait */;
--
--  nic->reset = eepro100_reset;
--  nic->poll = eepro100_poll;
--  nic->transmit = eepro100_transmit;
--  nic->disable = eepro100_disable;
--  return nic;
-+	dev->disable  = eepro100_disable;
-+	nic->poll     = eepro100_poll;
-+	nic->transmit = eepro100_transmit;
-+	nic->irq      = eepro100_irq;
-+	return 1;
- }
- 
- /*********************************************************************/
-@@ -639,16 +751,59 @@
- /* Hexdump a number of bytes from memory... */
- void hd (void *where, int n)
- {
--  int i;
-+	int i;
- 
--  while (n > 0) {
--    printf ("%X ", where);
--    for (i=0;i < ( (n>16)?16:n);i++)
--      printf (" %hhX", ((char *)where)[i]);
--    printf ("\n");
--    n -= 16;
--    where += 16;
--  }
-+	while (n > 0) {
-+		printf ("%X ", where);
-+		for (i=0;i < ( (n>16)?16:n);i++)
-+			printf (" %hhX", ((char *)where)[i]);
-+		printf ("\n");
-+		n -= 16;
-+		where += 16;
-+	}
- }
- #endif
- 
-+static struct pci_id eepro100_nics[] = {
-+PCI_ROM(0x8086, 0x1029, "id1029",        "Intel EtherExpressPro100 ID1029"),
-+PCI_ROM(0x8086, 0x1030, "id1030",        "Intel EtherExpressPro100 ID1030"),
-+PCI_ROM(0x8086, 0x1031, "82801cam",      "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-+PCI_ROM(0x8086, 0x1032, "eepro100-1032", "Intel PRO/100 VE Network Connection"),
-+PCI_ROM(0x8086, 0x1033, "eepro100-1033", "Intel PRO/100 VM Network Connection"),
-+PCI_ROM(0x8086, 0x1034, "eepro100-1034", "Intel PRO/100 VM Network Connection"),
-+PCI_ROM(0x8086, 0x1035, "eepro100-1035", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-+PCI_ROM(0x8086, 0x1036, "eepro100-1036", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-+PCI_ROM(0x8086, 0x1037, "eepro100-1037", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-+PCI_ROM(0x8086, 0x1038, "id1038",        "Intel PRO/100 VM Network Connection"),
-+PCI_ROM(0x8086, 0x1039, "82562et",       "Intel PRO100 VE 82562ET"),
-+PCI_ROM(0x8086, 0x103a, "id103a",        "Intel Corporation 82559 InBusiness 10/100"),
-+PCI_ROM(0x8086, 0x103b, "82562etb",      "Intel PRO100 VE 82562ETB"),
-+PCI_ROM(0x8086, 0x103c, "eepro100-103c", "Intel PRO/100 VM Network Connection"),
-+PCI_ROM(0x8086, 0x103d, "eepro100-103d", "Intel PRO/100 VE Network Connection"),
-+PCI_ROM(0x8086, 0x103e, "eepro100-103e", "Intel PRO/100 VM Network Connection"),
-+PCI_ROM(0x8086, 0x1059, "82551qm",       "Intel PRO/100 M Mobile Connection"),
-+PCI_ROM(0x8086, 0x1209, "82559er",       "Intel EtherExpressPro100 82559ER"),
-+PCI_ROM(0x8086, 0x1227, "82865",         "Intel 82865 EtherExpress PRO/100A"),
-+PCI_ROM(0x8086, 0x1228, "82556",         "Intel 82556 EtherExpress PRO/100 Smart"),
-+PCI_ROM(0x8086, 0x1229, "eepro100",      "Intel EtherExpressPro100"),
-+PCI_ROM(0x8086, 0x2449, "82562em",       "Intel EtherExpressPro100 82562EM"),
-+PCI_ROM(0x8086, 0x2459, "82562-1",       "Intel 82562 based Fast Ethernet Connection"),
-+PCI_ROM(0x8086, 0x245d, "82562-2",       "Intel 82562 based Fast Ethernet Connection"),
-+PCI_ROM(0x8086, 0x1050, "82562ez",       "Intel 82562EZ Network Connection"),
-+PCI_ROM(0x8086, 0x5200, "eepro100-5200", "Intel EtherExpress PRO/100 Intelligent Server"),
-+PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent Server"),
-+};
-+
-+/* Cards with device ids 0x1030 to 0x103F, 0x2449, 0x2459 or 0x245D might need
-+ * a workaround for hardware bug on 10 mbit half duplex (see linux driver eepro100.c)
-+ * 2003/03/17 gbaum */
-+
-+
-+struct pci_driver eepro100_driver = {
-+	.type      = NIC_DRIVER,
-+	.name      = "EEPRO100",
-+	.probe     = eepro100_probe,
-+	.ids       = eepro100_nics,
-+	.id_count  = sizeof(eepro100_nics)/sizeof(eepro100_nics[0]),
-+	.class     = 0
-+};
-Index: b/netboot/elf.h
-===================================================================
---- /dev/null
-+++ b/netboot/elf.h
-@@ -0,0 +1,234 @@
-+#ifndef ELF_H
-+#define ELF_H
-+
-+#define EI_NIDENT	16	/* Size of e_ident array. */
-+
-+/* Values for e_type. */
-+#define ET_NONE		0	/* No file type */
-+#define ET_REL		1	/* Relocatable file */
-+#define ET_EXEC		2	/* Executable file */
-+#define ET_DYN		3	/* Shared object file */
-+#define ET_CORE		4	/* Core file */
-+
-+/* Values for e_machine (architecute). */
-+#define EM_NONE		 0		/* No machine */
-+#define EM_M32		 1		/* AT&T WE 32100 */
-+#define EM_SPARC	 2		/* SUN SPARC */
-+#define EM_386		 3		/* Intel 80386+ */
-+#define EM_68K		 4		/* Motorola m68k family */
-+#define EM_88K		 5		/* Motorola m88k family */
-+#define EM_486		 6		/* Perhaps disused */
-+#define EM_860		 7		/* Intel 80860 */
-+#define EM_MIPS		 8		/* MIPS R3000 big-endian */
-+#define EM_S370		 9		/* IBM System/370 */
-+#define EM_MIPS_RS3_LE	10		/* MIPS R3000 little-endian */
-+
-+#define EM_PARISC	15		/* HPPA */
-+#define EM_VPP500	17		/* Fujitsu VPP500 */
-+#define EM_SPARC32PLUS	18		/* Sun's "v8plus" */
-+#define EM_960		19		/* Intel 80960 */
-+#define EM_PPC		20		/* PowerPC */
-+#define EM_PPC64	21		/* PowerPC 64-bit */
-+#define EM_S390		22		/* IBM S390 */
-+
-+#define EM_V800		36		/* NEC V800 series */
-+#define EM_FR20		37		/* Fujitsu FR20 */
-+#define EM_RH32		38		/* TRW RH-32 */
-+#define EM_RCE		39		/* Motorola RCE */
-+#define EM_ARM		40		/* ARM */
-+#define EM_FAKE_ALPHA	41		/* Digital Alpha */
-+#define EM_SH		42		/* Hitachi SH */
-+#define EM_SPARCV9	43		/* SPARC v9 64-bit */
-+#define EM_TRICORE	44		/* Siemens Tricore */
-+#define EM_ARC		45		/* Argonaut RISC Core */
-+#define EM_H8_300	46		/* Hitachi H8/300 */
-+#define EM_H8_300H	47		/* Hitachi H8/300H */
-+#define EM_H8S		48		/* Hitachi H8S */
-+#define EM_H8_500	49		/* Hitachi H8/500 */
-+#define EM_IA_64	50		/* Intel Merced */
-+#define EM_MIPS_X	51		/* Stanford MIPS-X */
-+#define EM_COLDFIRE	52		/* Motorola Coldfire */
-+#define EM_68HC12	53		/* Motorola M68HC12 */
-+#define EM_MMA		54		/* Fujitsu MMA Multimedia Accelerator*/
-+#define EM_PCP		55		/* Siemens PCP */
-+#define EM_NCPU		56		/* Sony nCPU embeeded RISC */
-+#define EM_NDR1		57		/* Denso NDR1 microprocessor */
-+#define EM_STARCORE	58		/* Motorola Start*Core processor */
-+#define EM_ME16		59		/* Toyota ME16 processor */
-+#define EM_ST100	60		/* STMicroelectronic ST100 processor */
-+#define EM_TINYJ	61		/* Advanced Logic Corp. Tinyj emb.fam*/
-+#define EM_X86_64	62		/* AMD x86-64 architecture */
-+#define EM_PDSP		63		/* Sony DSP Processor */
-+
-+#define EM_FX66		66		/* Siemens FX66 microcontroller */
-+#define EM_ST9PLUS	67		/* STMicroelectronics ST9+ 8/16 mc */
-+#define EM_ST7		68		/* STmicroelectronics ST7 8 bit mc */
-+#define EM_68HC16	69		/* Motorola MC68HC16 microcontroller */
-+#define EM_68HC11	70		/* Motorola MC68HC11 microcontroller */
-+#define EM_68HC08	71		/* Motorola MC68HC08 microcontroller */
-+#define EM_68HC05	72		/* Motorola MC68HC05 microcontroller */
-+#define EM_SVX		73		/* Silicon Graphics SVx */
-+#define EM_AT19		74		/* STMicroelectronics ST19 8 bit mc */
-+#define EM_VAX		75		/* Digital VAX */
-+#define EM_CRIS		76		/* Axis Communications 32-bit embedded processor */
-+#define EM_JAVELIN	77		/* Infineon Technologies 32-bit embedded processor */
-+#define EM_FIREPATH	78		/* Element 14 64-bit DSP Processor */
-+#define EM_ZSP		79		/* LSI Logic 16-bit DSP Processor */
-+#define EM_MMIX		80		/* Donald Knuth's educational 64-bit processor */
-+#define EM_HUANY	81		/* Harvard University machine-independent object files */
-+#define EM_PRISM	82		/* SiTera Prism */
-+#define EM_AVR		83		/* Atmel AVR 8-bit microcontroller */
-+#define EM_FR30		84		/* Fujitsu FR30 */
-+#define EM_D10V		85		/* Mitsubishi D10V */
-+#define EM_D30V		86		/* Mitsubishi D30V */
-+#define EM_V850		87		/* NEC v850 */
-+#define EM_M32R		88		/* Mitsubishi M32R */
-+#define EM_MN10300	89		/* Matsushita MN10300 */
-+#define EM_MN10200	90		/* Matsushita MN10200 */
-+#define EM_PJ		91		/* picoJava */
-+#define EM_OPENRISC	92		/* OpenRISC 32-bit embedded processor */
-+#define EM_ARC_A5	93		/* ARC Cores Tangent-A5 */
-+#define EM_XTENSA	94		/* Tensilica Xtensa Architecture */
-+#define EM_NUM		95
-+
-+/* Values for p_type. */
-+#define PT_NULL		0	/* Unused entry. */
-+#define PT_LOAD		1	/* Loadable segment. */
-+#define PT_DYNAMIC	2	/* Dynamic linking information segment. */
-+#define PT_INTERP	3	/* Pathname of interpreter. */
-+#define PT_NOTE		4	/* Auxiliary information. */
-+#define PT_SHLIB	5	/* Reserved (not used). */
-+#define PT_PHDR		6	/* Location of program header itself. */
-+
-+/* Values for p_flags. */
-+#define PF_X		0x1	/* Executable. */
-+#define PF_W		0x2	/* Writable. */
-+#define PF_R		0x4	/* Readable. */
-+
-+
-+#define	ELF_PROGRAM_RETURNS_BIT	0x8000000	/* e_flags bit 31 */
-+
-+#define EI_MAG0		0
-+#define ELFMAG0		0x7f
-+
-+#define EI_MAG1		1
-+#define ELFMAG1		'E'
-+
-+#define EI_MAG2		2
-+#define ELFMAG2		'L'
-+
-+#define EI_MAG3		3
-+#define ELFMAG3		'F'
-+
-+#define ELFMAG		"\177ELF"
-+
-+#define EI_CLASS	4	/* File class byte index */
-+#define ELFCLASSNONE	0	/* Invalid class */
-+#define ELFCLASS32	1	/* 32-bit objects */
-+#define ELFCLASS64	2	/* 64-bit objects */
-+
-+#define EI_DATA		5	/* Data encodeing byte index */
-+#define ELFDATANONE	0	/* Invalid data encoding */
-+#define ELFDATA2LSB	1	/* 2's complement little endian */
-+#define ELFDATA2MSB	2	/* 2's complement big endian */
-+
-+#define EI_VERSION	6	/* File version byte index */
-+				/* Value must be EV_CURRENT */
-+
-+#define EV_NONE		0	/* Invalid ELF Version */
-+#define EV_CURRENT	1	/* Current version */
-+
-+#define ELF32_PHDR_SIZE (8*4)	/* Size of an elf program header */
-+
-+#ifndef ASSEMBLY
-+/*
-+ * ELF definitions common to all 32-bit architectures.
-+ */
-+
-+typedef uint32_t	Elf32_Addr;
-+typedef uint16_t	Elf32_Half;
-+typedef uint32_t	Elf32_Off;
-+typedef int32_t		Elf32_Sword;
-+typedef uint32_t	Elf32_Word;
-+typedef uint32_t	Elf32_Size;
-+
-+typedef uint64_t	Elf64_Addr;
-+typedef uint16_t	Elf64_Half;
-+typedef uint64_t	Elf64_Off;
-+typedef int32_t		Elf64_Sword;
-+typedef uint32_t	Elf64_Word;
-+typedef uint64_t	Elf64_Size;
-+
-+/*
-+ * ELF header.
-+ */
-+typedef struct {
-+	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
-+	Elf32_Half	e_type;		/* File type. */
-+	Elf32_Half	e_machine;	/* Machine architecture. */
-+	Elf32_Word	e_version;	/* ELF format version. */
-+	Elf32_Addr	e_entry;	/* Entry point. */
-+	Elf32_Off	e_phoff;	/* Program header file offset. */
-+	Elf32_Off	e_shoff;	/* Section header file offset. */
-+	Elf32_Word	e_flags;	/* Architecture-specific flags. */
-+	Elf32_Half	e_ehsize;	/* Size of ELF header in bytes. */
-+	Elf32_Half	e_phentsize;	/* Size of program header entry. */
-+	Elf32_Half	e_phnum;	/* Number of program header entries. */
-+	Elf32_Half	e_shentsize;	/* Size of section header entry. */
-+	Elf32_Half	e_shnum;	/* Number of section header entries. */
-+	Elf32_Half	e_shstrndx;	/* Section name strings section. */
-+} Elf32_Ehdr;
-+
-+typedef struct {
-+	unsigned char	e_ident[EI_NIDENT];	/* File identification. */
-+	Elf64_Half	e_type;		/* File type. */
-+	Elf64_Half	e_machine;	/* Machine architecture. */
-+	Elf64_Word	e_version;	/* ELF format version. */
-+	Elf64_Addr	e_entry;	/* Entry point. */
-+	Elf64_Off	e_phoff;	/* Program header file offset. */
-+	Elf64_Off	e_shoff;	/* Section header file offset. */
-+	Elf64_Word	e_flags;	/* Architecture-specific flags. */
-+	Elf64_Half	e_ehsize;	/* Size of ELF header in bytes. */
-+	Elf64_Half	e_phentsize;	/* Size of program header entry. */
-+	Elf64_Half	e_phnum;	/* Number of program header entries. */
-+	Elf64_Half	e_shentsize;	/* Size of section header entry. */
-+	Elf64_Half	e_shnum;	/* Number of section header entries. */
-+	Elf64_Half	e_shstrndx;	/* Section name strings section. */
-+} Elf64_Ehdr;
-+
-+/*
-+ * Program header.
-+ */
-+typedef struct {
-+	Elf32_Word	p_type;		/* Entry type. */
-+	Elf32_Off	p_offset;	/* File offset of contents. */
-+	Elf32_Addr	p_vaddr;	/* Virtual address (not used). */
-+	Elf32_Addr	p_paddr;	/* Physical address. */
-+	Elf32_Size	p_filesz;	/* Size of contents in file. */
-+	Elf32_Size	p_memsz;	/* Size of contents in memory. */
-+	Elf32_Word	p_flags;	/* Access permission flags. */
-+	Elf32_Size	p_align;	/* Alignment in memory and file. */
-+} Elf32_Phdr;
-+
-+typedef struct {
-+	Elf64_Word	p_type;		/* Entry type. */
-+	Elf64_Word	p_flags;	/* Access permission flags. */
-+	Elf64_Off	p_offset;	/* File offset of contents. */
-+	Elf64_Addr	p_vaddr;	/* Virtual address (not used). */
-+	Elf64_Addr	p_paddr;	/* Physical address. */
-+	Elf64_Size	p_filesz;	/* Size of contents in file. */
-+	Elf64_Size	p_memsz;	/* Size of contents in memory. */
-+	Elf64_Size	p_align;	/* Alignment in memory and file. */
-+} Elf64_Phdr;
-+
-+/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */
-+
-+
-+/* ELF Defines for the current architecture */
-+#include "i386_elf.h"
-+
-+#endif /* ASSEMBLY */
-+
-+//#include "elf_boot.h"
-+
-+#endif /* ELF_H */
-Index: b/netboot/endian.h
-===================================================================
---- /dev/null
-+++ b/netboot/endian.h
-@@ -0,0 +1,19 @@
-+#ifndef ETHERBOOT_ENDIAN_H
-+#define ETHERBOOT_ENDIAN_H
-+
-+/* Definitions for byte order, according to significance of bytes,
-+   from low addresses to high addresses.  The value is what you get by
-+   putting '4' in the most significant byte, '3' in the second most
-+   significant byte, '2' in the second least significant byte, and '1'
-+   in the least significant byte, and then writing down one digit for
-+   each byte, starting with the byte at the lowest address at the left,
-+   and proceeding to the byte with the highest address at the right.  */
-+
-+#define __LITTLE_ENDIAN 1234
-+#define __BIG_ENDIAN    4321
-+#define __PDP_ENDIAN    3412
-+
-+#include "i386_endian.h"
-+
-+
-+#endif /* ETHERBOOT_ENDIAN_H */
-Index: b/netboot/epic100.c
-===================================================================
---- a/netboot/epic100.c
-+++ b/netboot/epic100.c
-@@ -1,15 +1,18 @@
-+
- /* epic100.c: A SMC 83c170 EPIC/100 fast ethernet driver for Etherboot */
- 
-+/* 05/06/2003	timlegge	Fixed relocation and implemented Multicast */
- #define LINUX_OUT_MACROS
- 
- #include "etherboot.h"
-+#include "pci.h"
- #include "nic.h"
--#include "cards.h"
- #include "timer.h"
- #include "epic100.h"
- 
--#undef	virt_to_bus
--#define	virt_to_bus(x)	((unsigned long)x)
-+/* Condensed operations for readability */
-+#define virt_to_le32desc(addr)	cpu_to_le32(virt_to_bus(addr))
-+#define le32desc_to_virt(addr)	bus_to_virt(le32_to_cpu(addr))
- 
- #define TX_RING_SIZE	2	/* use at least 2 buffers for TX */
- #define RX_RING_SIZE	2
-@@ -26,23 +29,18 @@
- 
- /* The EPIC100 Rx and Tx buffer descriptors. */
- struct epic_rx_desc {
--    unsigned short status;
--    unsigned short rxlength;
--    unsigned long  bufaddr;
--    unsigned short buflength;
--    unsigned short control;
--    unsigned long  next;
-+    unsigned long status;
-+    unsigned long bufaddr;
-+    unsigned long buflength;
-+    unsigned long next;
- };
--
- /* description of the tx descriptors control bits commonly used */
- #define TD_STDFLAGS	TD_LASTDESC
- 
- struct epic_tx_desc {
--    unsigned short status;
--    unsigned short txlength;
--    unsigned long  bufaddr;
--    unsigned short buflength;
--    unsigned short control;
-+    unsigned long status;
-+    unsigned long bufaddr;
-+    unsigned long buflength;
-     unsigned long  next;
- };
- 
-@@ -51,12 +49,15 @@
- 
- static void	epic100_open(void);
- static void	epic100_init_ring(void);
--static void	epic100_disable(struct nic *nic);
--static int	epic100_poll(struct nic *nic);
-+static void	epic100_disable(struct dev *dev);
-+static int	epic100_poll(struct nic *nic, int retrieve);
- static void	epic100_transmit(struct nic *nic, const char *destaddr,
- 				 unsigned int type, unsigned int len, const char *data);
-+#ifdef	DEBUG_EEPROM
- static int	read_eeprom(int location);
-+#endif
- static int	mii_read(int phy_id, int location);
-+static void     epic100_irq(struct nic *nic, irq_action_t action);
- 
- static int	ioaddr;
- 
-@@ -69,6 +70,7 @@
- static int	mmctl  ;
- static int	mmdata ;
- static int	lan0   ;
-+static int	mc0    ;
- static int	rxcon  ;
- static int	txcon  ;
- static int	prcdar ;
-@@ -80,37 +82,27 @@
- static unsigned short	eeprom[64];
- #endif
- static signed char	phys[4];		/* MII device addresses. */
--static struct epic_rx_desc	rx_ring[RX_RING_SIZE];
--static struct epic_tx_desc	tx_ring[TX_RING_SIZE];
--#ifdef	USE_LOWMEM_BUFFER
--#define rx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE)
--#define tx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE - PKT_BUF_SZ * TX_RING_SIZE)
--#else
--static char		rx_packet[PKT_BUF_SZ * RX_RING_SIZE];
--static char		tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
--#endif
-+static struct epic_rx_desc	rx_ring[RX_RING_SIZE]
-+	__attribute__ ((aligned(4)));
-+static struct epic_tx_desc	tx_ring[TX_RING_SIZE]
-+	__attribute__ ((aligned(4)));
-+static unsigned char	 	rx_packet[PKT_BUF_SZ * RX_RING_SIZE];
-+static unsigned char		tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
- 
- /***********************************************************************/
- /*                    Externally visible functions                     */
- /***********************************************************************/
- 
--    static void
--epic100_reset(struct nic *nic)
--{
--    /* Soft reset the chip. */
--    outl(GC_SOFT_RESET, genctl);
--}
- 
--    struct nic*
--epic100_probe(struct nic *nic, unsigned short *probeaddrs)
-+    static int
-+epic100_probe(struct dev *dev, struct pci_device *pci)
- {
--    unsigned short sum = 0;
--    unsigned short value;
-+    struct nic *nic = (struct nic *)dev;
-     int i;
-     unsigned short* ap;
-     unsigned int phy, phy_idx;
- 
--    if (probeaddrs == 0 || probeaddrs[0] == 0)
-+    if (pci->ioaddr == 0)
- 	return 0;
- 
-     /* Ideally we would detect all network cards in slot order.  That would
-@@ -118,7 +110,9 @@
-        well with the current structure.  So instead we detect just the
-        Epic cards in slot order. */
- 
--    ioaddr = probeaddrs[0] & ~3; /* Mask the bit that says "this is an io addr" */
-+    ioaddr = pci->ioaddr;
-+    nic->irqno  = 0;
-+    nic->ioaddr = pci->ioaddr & ~3;
- 
-     /* compute all used static epic100 registers address */
-     command = ioaddr + COMMAND;		/* Control Register */
-@@ -130,6 +124,7 @@
-     mmctl   = ioaddr + MMCTL;		/* MII Management Interface Control */
-     mmdata  = ioaddr + MMDATA;		/* MII Management Interface Data */
-     lan0    = ioaddr + LAN0;		/* MAC address. (0x40-0x48) */
-+    mc0     = ioaddr + MC0; 		/* Multicast Control */
-     rxcon   = ioaddr + RXCON;		/* Receive Control */
-     txcon   = ioaddr + TXCON;		/* Transmit Control */
-     prcdar  = ioaddr + PRCDAR;		/* PCI Receive Current Descr Address */
-@@ -160,11 +155,15 @@
-     }
- 
- #ifdef	DEBUG_EEPROM
-+{
-+    unsigned short sum = 0;
-+    unsigned short value;
-     for (i = 0; i < 64; i++) {
- 	value = read_eeprom(i);
- 	eeprom[i] = value;
- 	sum += value;
-     }
-+}
- 
- #if	(EPIC_DEBUG > 1)
-     printf("EEPROM contents\n");
-@@ -202,15 +201,26 @@
- 
-     epic100_open();
- 
--    nic->reset    = epic100_reset;
-+    dev->disable  = epic100_disable;
-     nic->poll     = epic100_poll;
-     nic->transmit = epic100_transmit;
--    nic->disable  = epic100_disable;
-+    nic->irq      = epic100_irq;
- 
--    return nic;
-+    return 1;
- }
- 
--    static void
-+static void set_rx_mode(void)
-+{
-+	unsigned char mc_filter[8];
-+	int i;
-+	memset(mc_filter, 0xff, sizeof(mc_filter));
-+	outl(0x0C, rxcon);
-+	for(i = 0; i < 4; i++)
-+		outw(((unsigned short *)mc_filter)[i], mc0 + i*4);
-+	return;
-+}
-+	
-+   static void
- epic100_open(void)
- {
-     int mii_reg5;
-@@ -237,11 +247,11 @@
-     outl(tmp, txcon);
- 
-     /* Give adress of RX and TX ring to the chip */
--    outl(virt_to_bus(&rx_ring), prcdar);
--    outl(virt_to_bus(&tx_ring), ptcdar);
-+    outl(virt_to_le32desc(&rx_ring), prcdar);
-+    outl(virt_to_le32desc(&tx_ring), ptcdar);
- 
-     /* Start the chip's Rx process: receive unicast and broadcast */
--    outl(0x04, rxcon);
-+    set_rx_mode();
-     outl(CR_START_RX | CR_QUEUE_RX, command);
- 
-     putchar('\n');
-@@ -252,34 +262,30 @@
- epic100_init_ring(void)
- {
-     int i;
--    char* p;
- 
-     cur_rx = cur_tx = 0;
- 
--    p = &rx_packet[0];
-     for (i = 0; i < RX_RING_SIZE; i++) {
--	rx_ring[i].status    = RRING_OWN;	/* Owned by Epic chip */
--	rx_ring[i].buflength = PKT_BUF_SZ;
--	rx_ring[i].bufaddr   = virt_to_bus(p + (PKT_BUF_SZ * i));
--	rx_ring[i].control   = 0;
--	rx_ring[i].next      = virt_to_bus(&(rx_ring[i + 1]) );
-+	rx_ring[i].status    = cpu_to_le32(RRING_OWN);	/* Owned by Epic chip */
-+	rx_ring[i].buflength = cpu_to_le32(PKT_BUF_SZ);
-+	rx_ring[i].bufaddr   = virt_to_bus(&rx_packet[i * PKT_BUF_SZ]);
-+	rx_ring[i].next      = virt_to_le32desc(&rx_ring[i + 1]) ;
-     }
-     /* Mark the last entry as wrapping the ring. */
--    rx_ring[i-1].next = virt_to_bus(&rx_ring[0]);
-+    rx_ring[i-1].next = virt_to_le32desc(&rx_ring[0]);
- 
-     /*
-      *The Tx buffer descriptor is filled in as needed,
-      * but we do need to clear the ownership bit.
-      */
--    p = &tx_packet[0];
- 
-     for (i = 0; i < TX_RING_SIZE; i++) {
--	tx_ring[i].status  = 0;			/* Owned by CPU */
--	tx_ring[i].bufaddr = virt_to_bus(p + (PKT_BUF_SZ * i));
--	tx_ring[i].control = TD_STDFLAGS;
--	tx_ring[i].next    = virt_to_bus(&(tx_ring[i + 1]) );
-+	tx_ring[i].status  = 0x0000;			/* Owned by CPU */
-+    	tx_ring[i].buflength = 0x0000 | cpu_to_le32(TD_STDFLAGS << 16);
-+	tx_ring[i].bufaddr = virt_to_bus(&tx_packet[i * PKT_BUF_SZ]);
-+	tx_ring[i].next    = virt_to_le32desc(&tx_ring[i + 1]);
-     }
--    tx_ring[i-1].next = virt_to_bus(&tx_ring[0]);
-+	tx_ring[i-1].next    = virt_to_le32desc(&tx_ring[0]);
- }
- 
- /* function: epic100_transmit
-@@ -296,7 +302,7 @@
- 		 unsigned int len, const char *data)
- {
-     unsigned short nstype;
--    char* txp;
-+    unsigned char *txp;
-     int entry;
- 
-     /* Calculate the next Tx descriptor entry. */
-@@ -310,7 +316,7 @@
- 	return;
-     }
- 
--    txp = (char*)tx_ring[entry].bufaddr;
-+    txp = tx_packet + (entry * PKT_BUF_SZ);
- 
-     memcpy(txp, destaddr, ETH_ALEN);
-     memcpy(txp + ETH_ALEN, nic->node_addr, ETH_ALEN);
-@@ -319,26 +325,29 @@
-     memcpy(txp + ETH_HLEN, data, len);
- 
-     len += ETH_HLEN;
--
-+	len &= 0x0FFF;
-+	while(len < ETH_ZLEN)
-+		txp[len++] = '\0';
-     /*
-      * Caution: the write order is important here,
-      * set the base address with the "ownership"
-      * bits last.
-      */
--    tx_ring[entry].txlength  = (len >= 60 ? len : 60);
--    tx_ring[entry].buflength = len;
--    tx_ring[entry].status    = TRING_OWN;	/* Pass ownership to the chip. */
-+    
-+    tx_ring[entry].buflength |= cpu_to_le32(len);
-+    tx_ring[entry].status = cpu_to_le32(len << 16) | 
-+	    cpu_to_le32(TRING_OWN);	/* Pass ownership to the chip. */
- 
-     cur_tx++;
- 
-     /* Trigger an immediate transmit demand. */
--    outl(CR_QUEUE_TX, command);
--
-+    outl(CR_QUEUE_TX, command); 
-+    
-     load_timer2(10*TICKS_PER_MS);         /* timeout 10 ms for transmit */
--    while ((tx_ring[entry].status & TRING_OWN) && timer2_running())
-+    while ((le32_to_cpu(tx_ring[entry].status) & (TRING_OWN)) && timer2_running())
- 	/* Wait */;
- 
--    if ((tx_ring[entry].status & TRING_OWN) != 0)
-+    if ((le32_to_cpu(tx_ring[entry].status) & TRING_OWN) != 0)
- 	printf("Oops, transmitter timeout, status=%hX\n",
- 	    tx_ring[entry].status);
- }
-@@ -356,17 +365,19 @@
-  */
- 
-     static int
--epic100_poll(struct nic *nic)
-+epic100_poll(struct nic *nic, int retrieve)
- {
-     int entry;
--    int status;
-     int retcode;
--
-+    int status;
-     entry = cur_rx % RX_RING_SIZE;
- 
--    if ((status = rx_ring[entry].status & RRING_OWN) == RRING_OWN)
-+    if ((rx_ring[entry].status & cpu_to_le32(RRING_OWN)) == RRING_OWN)
- 	return (0);
- 
-+    if ( ! retrieve ) return 1;
-+
-+    status = le32_to_cpu(rx_ring[entry].status);
-     /* We own the next entry, it's a new packet. Send it up. */
- 
- #if	(EPIC_DEBUG > 4)
-@@ -383,8 +394,8 @@
- 	retcode = 0;
-     } else {
- 	/* Omit the four octet CRC from the length. */
--	nic->packetlen = rx_ring[entry].rxlength - 4;
--	memcpy(nic->packet, (char*)rx_ring[entry].bufaddr, nic->packetlen);
-+	nic->packetlen = le32_to_cpu((rx_ring[entry].buflength))- 4;
-+	memcpy(nic->packet, &rx_packet[entry * PKT_BUF_SZ], nic->packetlen);
- 	retcode = 1;
-     }
- 
-@@ -395,17 +406,30 @@
-     rx_ring[entry].status = RRING_OWN;
- 
-     /* Restart Receiver */
--    outl(CR_START_RX | CR_QUEUE_RX, command);
-+    outl(CR_START_RX | CR_QUEUE_RX, command); 
- 
-     return retcode;
- }
- 
- 
-     static void
--epic100_disable(struct nic *nic)
-+epic100_disable(struct dev *dev __unused)
- {
-+	/* Soft reset the chip. */
-+	outl(GC_SOFT_RESET, genctl);
- }
- 
-+static void epic100_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
- 
- #ifdef	DEBUG_EEPROM
- /* Serial EEPROM section. */
-@@ -479,3 +503,18 @@
- 	    break;
-     return inw(mmdata);
- }
-+
-+
-+static struct pci_id epic100_nics[] = {
-+PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII"),		/* SMC 83c170 EPIC/100 */
-+PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175"),
-+};
-+
-+struct pci_driver epic100_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "EPIC100",
-+	.probe    = epic100_probe,
-+	.ids      = epic100_nics,
-+	.id_count = sizeof(epic100_nics)/sizeof(epic100_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/etherboot.h
-===================================================================
---- a/netboot/etherboot.h
-+++ b/netboot/etherboot.h
-@@ -1,6 +1,6 @@
- /*
-  *  GRUB  --  GRand Unified Bootloader
-- *  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-+ *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
-  *
-  *  This program is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-@@ -17,528 +17,40 @@
-  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
- 
--/* RULE: You must define the macro ``GRUB'' when including this header
--   file in GRUB code.  */
-+#ifndef ETHERBOOT_H
-+#define ETHERBOOT_H
- 
--/* Based on "src/etherboot.h" in etherboot-5.0.5.  */
--
--/**************************************************************************
--ETHERBOOT -  BOOTP/TFTP Bootstrap Program
--
--Author: Martin Renters
--  Date: Dec/93
--
--**************************************************************************/
--
--/* Include GRUB-specific macros and prototypes here.  */
--#include <shared.h>
--
--/* FIXME: For now, enable the DHCP support. Perhaps I should segregate
--   the DHCP support from the BOOTP support, and permit both to
--   co-exist.  */
--#undef NO_DHCP_SUPPORT
--
--/* In GRUB, the relocated address in Etherboot doesn't have any sense.
--   Just define it as a bogus value.  */
--#define RELOC	0
--
--/* FIXME: Should be an option.  */
--#define BACKOFF_LIMIT	7
--
--#include <osdep.h>
--
--#define CTRL_C		3
--
--#ifndef	MAX_TFTP_RETRIES
--# define MAX_TFTP_RETRIES	20
-+#include "shared.h"
-+#include "osdep.h"
-+#include "if_ether.h"
-+#include "in.h"
-+
-+/* Link configuration time in tenths of a second */
-+#ifndef VALID_LINK_TIMEOUT
-+#define VALID_LINK_TIMEOUT	100 /* 10.0 seconds */
- #endif
- 
--#ifndef	MAX_BOOTP_RETRIES
--# define MAX_BOOTP_RETRIES	20
--#endif
--
--#define MAX_BOOTP_EXTLEN	(ETH_FRAME_LEN - ETH_HLEN - \
--				 sizeof (struct bootp_t))
--
--#ifndef	MAX_ARP_RETRIES
--# define MAX_ARP_RETRIES	20
--#endif
--
--#ifndef	MAX_RPC_RETRIES
--# define MAX_RPC_RETRIES	20
--#endif
--
--#define	TICKS_PER_SEC		18
--
--/* Inter-packet retry in ticks */
--#define TIMEOUT			(10 * TICKS_PER_SEC)
--
--/* These settings have sense only if compiled with -DCONGESTED */
--/* total retransmission timeout in ticks */
--#define TFTP_TIMEOUT		(30 * TICKS_PER_SEC)
--/* packet retransmission timeout in ticks */
--#define TFTP_REXMT		(3 * TICKS_PER_SEC)
--
- #ifndef	NULL
- # define NULL			((void *) 0)
- #endif
- 
--/*
--   I'm moving towards the defined names in linux/if_ether.h for clarity.
--   The confusion between 60/64 and 1514/1518 arose because the NS8390
--   counts the 4 byte frame checksum in the incoming packet, but not
--   in the outgoing packet. 60/1514 are the correct numbers for most
--   if not all of the other NIC controllers. I will be retiring the
--   64/1518 defines in the lead-up to 5.0.
--*/
--
--#define ETH_ALEN		6	/* Size of Ethernet address */
--#define ETH_HLEN		14	/* Size of ethernet header */
--#define	ETH_ZLEN		60	/* Minimum packet */
--/*#define ETH_MIN_PACKET		64*/
--#define	ETH_FRAME_LEN		1514	/* Maximum packet */
--/*#define ETH_MAX_PACKET		1518*/
--/* Because some DHCP/BOOTP servers don't treat the maximum length the same
--   as Etherboot, subtract the size of an IP header and that of an UDP
--   header.  */
--#define	ETH_MAX_MTU		(ETH_FRAME_LEN - ETH_HLEN \
--				- sizeof (struct iphdr) \
--				- sizeof (struct udphdr))
--
--#define ARP_CLIENT	0
--#define ARP_SERVER	1
--#define ARP_GATEWAY	2
--#define ARP_ROOTSERVER	3
--#define ARP_SWAPSERVER	4
--#define MAX_ARP		ARP_SWAPSERVER+1
--
--#define	RARP_REQUEST	3
--#define	RARP_REPLY	4
--
--#define IP		0x0800
--#define ARP		0x0806
--#define	RARP		0x8035
--
--#define BOOTP_SERVER	67
--#define BOOTP_CLIENT	68
--#define TFTP_PORT	69
--#define SUNRPC_PORT	111
--
--#define IP_UDP		17
--/* Same after going through htonl */
--#define IP_BROADCAST	0xFFFFFFFF
--
--#define ARP_REQUEST	1
--#define ARP_REPLY	2
--
--#define BOOTP_REQUEST	1
--#define BOOTP_REPLY	2
--
--#define TAG_LEN(p)		(*((p) + 1))
--#define RFC1533_COOKIE		99, 130, 83, 99
--#define RFC1533_PAD		0
--#define RFC1533_NETMASK		1
--#define RFC1533_TIMEOFFSET	2
--#define RFC1533_GATEWAY		3
--#define RFC1533_TIMESERVER	4
--#define RFC1533_IEN116NS	5
--#define RFC1533_DNS		6
--#define RFC1533_LOGSERVER	7
--#define RFC1533_COOKIESERVER	8
--#define RFC1533_LPRSERVER	9
--#define RFC1533_IMPRESSSERVER	10
--#define RFC1533_RESOURCESERVER	11
--#define RFC1533_HOSTNAME	12
--#define RFC1533_BOOTFILESIZE	13
--#define RFC1533_MERITDUMPFILE	14
--#define RFC1533_DOMAINNAME	15
--#define RFC1533_SWAPSERVER	16
--#define RFC1533_ROOTPATH	17
--#define RFC1533_EXTENSIONPATH	18
--#define RFC1533_IPFORWARDING	19
--#define RFC1533_IPSOURCEROUTING	20
--#define RFC1533_IPPOLICYFILTER	21
--#define RFC1533_IPMAXREASSEMBLY	22
--#define RFC1533_IPTTL		23
--#define RFC1533_IPMTU		24
--#define RFC1533_IPMTUPLATEAU	25
--#define RFC1533_INTMTU		26
--#define RFC1533_INTLOCALSUBNETS	27
--#define RFC1533_INTBROADCAST	28
--#define RFC1533_INTICMPDISCOVER	29
--#define RFC1533_INTICMPRESPOND	30
--#define RFC1533_INTROUTEDISCOVER 31
--#define RFC1533_INTROUTESOLICIT	32
--#define RFC1533_INTSTATICROUTES	33
--#define RFC1533_LLTRAILERENCAP	34
--#define RFC1533_LLARPCACHETMO	35
--#define RFC1533_LLETHERNETENCAP	36
--#define RFC1533_TCPTTL		37
--#define RFC1533_TCPKEEPALIVETMO	38
--#define RFC1533_TCPKEEPALIVEGB	39
--#define RFC1533_NISDOMAIN	40
--#define RFC1533_NISSERVER	41
--#define RFC1533_NTPSERVER	42
--#define RFC1533_VENDOR		43
--#define RFC1533_NBNS		44
--#define RFC1533_NBDD		45
--#define RFC1533_NBNT		46
--#define RFC1533_NBSCOPE		47
--#define RFC1533_XFS		48
--#define RFC1533_XDM		49
--#ifndef	NO_DHCP_SUPPORT
--#define RFC2132_REQ_ADDR	50
--#define RFC2132_MSG_TYPE	53
--#define RFC2132_SRV_ID		54
--#define RFC2132_PARAM_LIST	55
--#define RFC2132_MAX_SIZE	57
--#define RFC2132_VENDOR_CLASS_ID	60
--
--#define DHCPDISCOVER		1
--#define DHCPOFFER		2
--#define DHCPREQUEST		3
--#define DHCPACK			5
--#endif	/* NO_DHCP_SUPPORT */
--
--#define RFC1533_VENDOR_MAJOR	0
--#define RFC1533_VENDOR_MINOR	0
--
--#define RFC1533_VENDOR_MAGIC	128
--#define RFC1533_VENDOR_ADDPARM	129
--#define RFC1533_VENDOR_MNUOPTS	160
--#define RFC1533_VENDOR_SELECTION 176
--#define RFC1533_VENDOR_MOTD	184
--#define RFC1533_VENDOR_NUMOFMOTD 8
--#define RFC1533_VENDOR_IMG	192
--#define RFC1533_VENDOR_NUMOFIMG	16
--
--#define RFC1533_VENDOR_CONFIGFILE	150
--
--#define RFC1533_END		255
--
--#define BOOTP_VENDOR_LEN	64
--#ifndef	NO_DHCP_SUPPORT
--#define DHCP_OPT_LEN		312
--#endif	/* NO_DHCP_SUPPORT */
--
--#define	TFTP_DEFAULTSIZE_PACKET	512
--#define	TFTP_MAX_PACKET		1432 /* 512 */
--
--#define TFTP_RRQ	1
--#define TFTP_WRQ	2
--#define TFTP_DATA	3
--#define TFTP_ACK	4
--#define TFTP_ERROR	5
--#define TFTP_OACK	6
--
--#define TFTP_CODE_EOF	1
--#define TFTP_CODE_MORE	2
--#define TFTP_CODE_ERROR	3
--#define TFTP_CODE_BOOT	4
--#define TFTP_CODE_CFG	5
--
--#define AWAIT_ARP	0
--#define AWAIT_BOOTP	1
--#define AWAIT_TFTP	2
--#define AWAIT_RARP	3
--#define AWAIT_RPC	4
--#define AWAIT_QDRAIN	5	/* drain queue, process ARP requests */
--
--typedef struct
--{
--  unsigned long	s_addr;
--}
--in_addr;
--
--struct arptable_t
--{
--  in_addr ipaddr;
--  unsigned char node[6];
--};
--
--/*
-- * A pity sipaddr and tipaddr are not longword aligned or we could use
-- * in_addr. No, I don't want to use #pragma packed.
-- */
--struct arprequest
--{
--  unsigned short hwtype;
--  unsigned short protocol;
--  char hwlen;
--  char protolen;
--  unsigned short opcode;
--  char shwaddr[6];
--  char sipaddr[4];
--  char thwaddr[6];
--  char tipaddr[4];
--};
--
--struct iphdr
--{
--  char verhdrlen;
--  char service;
--  unsigned short len;
--  unsigned short ident;
--  unsigned short frags;
--  char ttl;
--  char protocol;
--  unsigned short chksum;
--  in_addr src;
--  in_addr dest;
--};
--
--struct udphdr
--{
--  unsigned short src;
--  unsigned short dest;
--  unsigned short len;
--  unsigned short chksum;
--};
--
--/* Format of a bootp packet.  */
--struct bootp_t
--{
--  char bp_op;
--  char bp_htype;
--  char bp_hlen;
--  char bp_hops;
--  unsigned long bp_xid;
--  unsigned short bp_secs;
--  unsigned short unused;
--  in_addr bp_ciaddr;
--  in_addr bp_yiaddr;
--  in_addr bp_siaddr;
--  in_addr bp_giaddr;
--  char bp_hwaddr[16];
--  char bp_sname[64];
--  char bp_file[128];
--#ifdef	NO_DHCP_SUPPORT
--  char bp_vend[BOOTP_VENDOR_LEN];
--#else
--  char bp_vend[DHCP_OPT_LEN];
--#endif	/* NO_DHCP_SUPPORT */
--};
--
--/* Format of a bootp IP packet.  */
--struct bootpip_t
--{
--  struct iphdr ip;
--  struct udphdr udp;
--  struct bootp_t bp;
--};
--
--/* Format of bootp packet with extensions.  */
--struct bootpd_t
--{
--  struct bootp_t bootp_reply;
--  unsigned char  bootp_extension[MAX_BOOTP_EXTLEN];
--};
--
--struct tftp_t
--{
--  struct iphdr ip;
--  struct udphdr udp;
--  unsigned short opcode;
--  union
--  {
--    char rrq[TFTP_DEFAULTSIZE_PACKET];
--    
--    struct
--    {
--      unsigned short block;
--      char download[TFTP_MAX_PACKET];
--    }
--    data;
--    
--    struct
--    {
--      unsigned short block;
--    }
--    ack;
--    
--    struct
--    {
--      unsigned short errcode;
--      char errmsg[TFTP_DEFAULTSIZE_PACKET];
--    }
--    err;
--    
--    struct
--    {
--      char data[TFTP_DEFAULTSIZE_PACKET+2];
--    }
--    oack;
--  }
--  u;
--};
--
--/* Define a smaller tftp packet solely for making requests to conserve stack
--   512 bytes should be enough.  */
--struct tftpreq_t
--{
--  struct iphdr ip;
--  struct udphdr udp;
--  unsigned short opcode;
--  union
--  {
--    char rrq[512];
--    
--    struct
--    {
--      unsigned short block;
--    }
--    ack;
--    
--    struct
--    {
--      unsigned short errcode;
--      char errmsg[512-2];
--    }
--    err;
--  }
--  u;
--};
--
--#define TFTP_MIN_PACKET	(sizeof(struct iphdr) + sizeof(struct udphdr) + 4)
--
--struct rpc_t
--{
--  struct iphdr ip;
--  struct udphdr udp;
--  union
--  {
--    char data[300];		/* longest RPC call must fit!!!! */
--    
--    struct
--    {
--      long id;
--      long type;
--      long rpcvers;
--      long prog;
--      long vers;
--      long proc;
--      long data[1];
--    }
--    call;
--    
--    struct
--    {
--      long id;
--      long type;
--      long rstatus;
--      long verifier;
--      long v2;
--      long astatus;
--      long data[1];
--    }
--    reply;
--  }
--  u;
--};
--
--#define PROG_PORTMAP	100000
--#define PROG_NFS	100003
--#define PROG_MOUNT	100005
--
--#define MSG_CALL	0
--#define MSG_REPLY	1
--
--#define PORTMAP_GETPORT	3
--
--#define MOUNT_ADDENTRY	1
--#define MOUNT_UMOUNTALL	4
--
--#define NFS_LOOKUP	4
--#define NFS_READ	6
--
--#define NFS_FHSIZE	32
--
--#define NFSERR_PERM	1
--#define NFSERR_NOENT	2
--#define NFSERR_ACCES	13
--
--/* Block size used for NFS read accesses.  A RPC reply packet (including  all
-- * headers) must fit within a single Ethernet frame to avoid fragmentation.
-- * Chosen to be a power of two, as most NFS servers are optimized for this.  */
--#define NFS_READ_SIZE	1024
--
--#define	FLOPPY_BOOT_LOCATION	0x7c00
--/* Must match offsets in loader.S */
--#define ROM_SEGMENT		0x1fa
--#define ROM_LENGTH		0x1fc
--
--#define	ROM_INFO_LOCATION	(FLOPPY_BOOT_LOCATION + ROM_SEGMENT)
--/* at end of floppy boot block */
--
--struct rom_info
--{
--  unsigned short	rom_segment;
--  unsigned short	rom_length;
--};
--
--static inline int
--rom_address_ok (struct rom_info *rom, int assigned_rom_segment)
--{
--  return (assigned_rom_segment < 0xC000
--	  || assigned_rom_segment == rom->rom_segment);
--}
--
--/* Define a type for passing info to a loaded program.  */
--struct ebinfo
--{
--  unsigned char	major, minor;	/* Version */
--  unsigned short	flags;		/* Bit flags */
--};
--
--/***************************************************************************
--External prototypes
--***************************************************************************/
--/* main.c */
--extern void print_network_configuration (void);
--extern int ifconfig (char *ip, char *sm, char *gw, char *svr);
--extern int udp_transmit (unsigned long destip, unsigned int srcsock,
--			 unsigned int destsock, int len, const void *buf);
--extern int await_reply (int type, int ival, void *ptr, int timeout);
--extern int decode_rfc1533 (unsigned char *, int, int, int);
--extern long rfc2131_sleep_interval (int base, int exp);
--extern void cleanup (void);
--extern int rarp (void);
--extern int bootp (void);
--extern void cleanup_net (void);
--
--/* config.c */
--extern void print_config (void);
--extern void eth_reset (void);
--extern int eth_probe (void);
--extern int eth_poll (void);
--extern void eth_transmit (const char *d, unsigned int t,
--			  unsigned int s, const void *p);
--extern void eth_disable (void);
--
--/* misc.c */
--extern void twiddle (void);
--extern void sleep (int secs);
--extern int getdec (char **s);
--extern void etherboot_printf (const char *, ...);
--extern int etherboot_sprintf (char *, const char *, ...);
--extern int inet_aton (char *p, in_addr *i);
--
--/***************************************************************************
--External variables
--***************************************************************************/
--/* main.c */
--extern int ip_abort;
--extern int network_ready;
--extern struct rom_info rom;
--extern struct arptable_t arptable[MAX_ARP];
--
--/* config.c */
--extern struct nic nic;
-+#define gateA20_set() gateA20(1)
-+#define gateA20_unset() gateA20(0)
-+#define EBDEBUG 0
-+/* The 'rom_info' maybe arch depended. It must be moved to some other
-+ * place */
-+struct rom_info {
-+	unsigned short	rom_segment;
-+	unsigned short	rom_length;
-+};
-+
-+extern void poll_interruptions P((void));
-+
-+/* For UNDI drivers */
-+extern void fake_irq ( uint8_t irq );
-+extern void _trivial_irq_handler_start;
-+extern uint32_t get_free_base_memory ( void );
-+extern void forget_base_memory ( void*, size_t );
-+extern void free_unused_base_memory ( void );
- 
--/* Local hack - define some macros to use etherboot source files "as is".  */
--#ifndef GRUB
--# undef printf
--# define printf	etherboot_printf
--# undef sprintf
--# define sprintf etherboot_sprintf
--#endif /* GRUB */
-+#endif /* ETHERBOOT_H */
-Index: b/netboot/fa311.c
-===================================================================
---- a/netboot/fa311.c
-+++ /dev/null
-@@ -1,421 +0,0 @@
--/*
--        Driver for the National Semiconductor DP83810 Ethernet controller.
--        
--        Portions Copyright (C) 2001 Inprimis Technologies, Inc.
--        http://www.inprimis.com/
--        
--        This driver is based (heavily) on the Linux driver for this chip 
--        which is copyright 1999-2001 by Donald Becker.
--
--        This software has no warranties expressed or implied for any
--        purpose.
--
--        This software may be used and distributed according to the terms of
--        the GNU General Public License (GPL), incorporated herein by reference.
--        Drivers based on or derived from this code fall under the GPL and must
--        retain the authorship, copyright and license notice.  This file is not
--        a complete program and may only be used when the entire operating
--        system is licensed under the GPL.  License for under other terms may be
--        available.  Contact the original author for details.
--
--        The original author may be reached as becker@scyld.com, or at
--        Scyld Computing Corporation
--        410 Severn Ave., Suite 210
--        Annapolis MD 21403
--*/
--
--
--typedef unsigned char  u8;
--typedef   signed char  s8;
--typedef unsigned short u16;
--typedef   signed short s16;
--typedef unsigned int   u32;
--typedef   signed int   s32;
--
--#include "etherboot.h"
--#include "nic.h"
--#include "pci.h"
--
--#undef	virt_to_bus
--#define	virt_to_bus(x)          ((unsigned long)x)
--#define cpu_to_le32(val)        (val)
--#define le32_to_cpu(val)        (val)
--#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
--#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
--
--#define TX_RING_SIZE 1
--#define RX_RING_SIZE 4
--#define TIME_OUT     1000000
--#define PKT_BUF_SZ   1536
--
--/* Offsets to the device registers. */
--enum register_offsets {
--    ChipCmd=0x00, ChipConfig=0x04, EECtrl=0x08, PCIBusCfg=0x0C,
--    IntrStatus=0x10, IntrMask=0x14, IntrEnable=0x18,
--    TxRingPtr=0x20, TxConfig=0x24,
--    RxRingPtr=0x30, RxConfig=0x34,
--    WOLCmd=0x40, PauseCmd=0x44, RxFilterAddr=0x48, RxFilterData=0x4C,
--    BootRomAddr=0x50, BootRomData=0x54, StatsCtrl=0x5C, StatsData=0x60,
--    RxPktErrs=0x60, RxMissed=0x68, RxCRCErrs=0x64,
--};
--
--/* Bit in ChipCmd. */
--enum ChipCmdBits {
--    ChipReset=0x100, RxReset=0x20, TxReset=0x10, RxOff=0x08, RxOn=0x04,
--    TxOff=0x02, TxOn=0x01,
--};
--
--/* Bits in the interrupt status/mask registers. */
--enum intr_status_bits {
--    IntrRxDone=0x0001, IntrRxIntr=0x0002, IntrRxErr=0x0004, IntrRxEarly=0x0008,
--    IntrRxIdle=0x0010, IntrRxOverrun=0x0020,
--    IntrTxDone=0x0040, IntrTxIntr=0x0080, IntrTxErr=0x0100,
--    IntrTxIdle=0x0200, IntrTxUnderrun=0x0400,
--    StatsMax=0x0800, LinkChange=0x4000,	WOLPkt=0x2000,
--    RxResetDone=0x1000000, TxResetDone=0x2000000,
--    IntrPCIErr=0x00f00000, IntrNormalSummary=0x0251, IntrAbnormalSummary=0xED20,
--};
--
--/* Bits in the RxMode register. */
--enum rx_mode_bits {
--    AcceptErr=0x20, AcceptRunt=0x10, AcceptBroadcast=0xC0000000,
--    AcceptMulticast=0x00200000, AcceptAllMulticast=0x20000000,
--    AcceptAllPhys=0x10000000, AcceptMyPhys=0x08000000,
--};
--
--/* Bits in network_desc.status */
--enum desc_status_bits {
--    DescOwn=0x80000000, DescMore=0x40000000, DescIntr=0x20000000,
--    DescNoCRC=0x10000000,
--    DescPktOK=0x08000000, RxTooLong=0x00400000,
--};
--
--/* The Rx and Tx buffer descriptors. */
--struct netdev_desc {
--    u32 next_desc;
--    s32 cmd_status;
--    u32 addr;
--};
--
--static struct FA311_DEV {
--    unsigned int    ioaddr;
--    unsigned short  vendor;
--    unsigned short  device;
--    unsigned int    cur_rx;
--    unsigned int    cur_tx;
--    unsigned int    rx_buf_sz;
--    volatile struct netdev_desc *rx_head_desc;
--    volatile struct netdev_desc rx_ring[RX_RING_SIZE] __attribute__ ((aligned (4)));
--    volatile struct netdev_desc tx_ring[TX_RING_SIZE] __attribute__ ((aligned (4)));
--} fa311_dev;
--
--static int  eeprom_read(long ioaddr, int location);
--static void init_ring(struct FA311_DEV *dev);
--static void fa311_reset(struct nic *nic);
--static int  fa311_poll(struct nic *nic);
--static void fa311_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p);
--static void fa311_disable(struct nic *nic);
--
--static char rx_packet[PKT_BUF_SZ * RX_RING_SIZE] __attribute__ ((aligned (4)));
--static char tx_packet[PKT_BUF_SZ * TX_RING_SIZE] __attribute__ ((aligned (4)));
--
--struct nic * fa311_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
--{
--int            prev_eedata;
--int            i;
--int            duplex;
--int            tx_config;
--int            rx_config;
--unsigned char  macaddr[6];
--unsigned char  mactest;
--unsigned char  pci_bus = 0;
--struct FA311_DEV* dev = &fa311_dev;
--	
--    if (io_addrs == 0 || *io_addrs == 0)
--        return (0);
--    memset(dev, 0, sizeof(*dev));
--    dev->vendor = pci->vendor;
--    dev->device = pci->dev_id;
--    dev->ioaddr = pci->membase;
--
--    /* Work around the dropped serial bit. */
--    prev_eedata = eeprom_read(dev->ioaddr, 6);
--    for (i = 0; i < 3; i++) {
--        int eedata = eeprom_read(dev->ioaddr, i + 7);
--        macaddr[i*2] = (eedata << 1) + (prev_eedata >> 15);
--        macaddr[i*2+1] = eedata >> 7;
--        prev_eedata = eedata;
--    }
--    mactest = 0;
--    for (i = 0; i < 6; i++)
--        mactest |= macaddr[i];
--    if (mactest == 0)
--        return (0);
--    for (i = 0; i < 6; i++)
--        nic->node_addr[i] = macaddr[i];
--    printf("%! ", nic->node_addr);
--
--    adjust_pci_device(pci);
--
--    fa311_reset(nic);
--
--    nic->reset = fa311_reset;
--    nic->disable = fa311_disable;
--    nic->poll = fa311_poll;
--    nic->transmit = fa311_transmit;
--
--    init_ring(dev);
--
--    writel(virt_to_bus(dev->rx_ring), dev->ioaddr + RxRingPtr);
--    writel(virt_to_bus(dev->tx_ring), dev->ioaddr + TxRingPtr);
--
--    for (i = 0; i < 6; i += 2)
--    {
--        writel(i, dev->ioaddr + RxFilterAddr);
--        writew(macaddr[i] + (macaddr[i+1] << 8),
--               dev->ioaddr + RxFilterData);
--    }
--
--    /* Initialize other registers. */
--    /* Configure for standard, in-spec Ethernet. */
--    if (readl(dev->ioaddr + ChipConfig) & 0x20000000)
--    {    /* Full duplex */
--        tx_config = 0xD0801002;
--        rx_config = 0x10000020;
--    }
--    else
--    {
--        tx_config = 0x10801002;
--        rx_config = 0x0020;
--    }
--    writel(tx_config, dev->ioaddr + TxConfig);
--    writel(rx_config, dev->ioaddr + RxConfig);
--
--    duplex = readl(dev->ioaddr + ChipConfig) & 0x20000000 ? 1 : 0;
--    if (duplex) {
--        rx_config |= 0x10000000;
--        tx_config |= 0xC0000000;
--    } else {
--        rx_config &= ~0x10000000;
--        tx_config &= ~0xC0000000;
--    }
--    writew(tx_config, dev->ioaddr + TxConfig);
--    writew(rx_config, dev->ioaddr + RxConfig);
--
--    writel(AcceptBroadcast | AcceptAllMulticast | AcceptMyPhys, 
--           dev->ioaddr + RxFilterAddr);
--
--    writel(RxOn | TxOn, dev->ioaddr + ChipCmd);
--    writel(4, dev->ioaddr + StatsCtrl);              /* Clear Stats */
--    return nic;	
--
--}
--
--static void fa311_reset(struct nic *nic)
--{
--u32 chip_config;
--struct FA311_DEV* dev = &fa311_dev;
--
--    /* Reset the chip to erase previous misconfiguration. */
--    outl(ChipReset, dev->ioaddr + ChipCmd);
--
--    if ((readl(dev->ioaddr + ChipConfig) & 0xe000) != 0xe000)
--    {
--        chip_config = readl(dev->ioaddr + ChipConfig);
--    }
--}
--
--static int fa311_poll(struct nic *nic)
--{
--s32 desc_status;
--int to;
--int entry;
--int retcode;
--struct FA311_DEV* dev = &fa311_dev;
--
--    retcode = 0;
--    entry = dev->cur_rx;
--    to = TIME_OUT;
--    while (to != 0)
--    {
--        desc_status = dev->rx_ring[entry].cmd_status;
--        if ((desc_status & DescOwn) != 0)
--            break;
--        else
--            --to;
--    }
--    if (to != 0)
--    {
--        readl(dev->ioaddr + IntrStatus);         /* clear interrrupt bits */
--        /* driver owns the next entry it's a new packet. Send it up. */
--        if ((desc_status & (DescMore|DescPktOK|RxTooLong)) == DescPktOK)
--        {
--            nic->packetlen = (desc_status & 0x0fff) - 4;    /* Omit CRC size. */
--            memcpy(nic->packet, (char*)(dev->rx_ring[entry].addr), nic->packetlen);
--            retcode = 1;
--        }
--        /* Give the descriptor back to the chip */
--        dev->rx_ring[entry].cmd_status = cpu_to_le32(dev->rx_buf_sz);
--        dev->cur_rx++;
--        if (dev->cur_rx >= RX_RING_SIZE)
--            dev->cur_rx = 0;
--        dev->rx_head_desc = &dev->rx_ring[dev->cur_rx];
--    }
--    /* Restart Rx engine if stopped. */
--    writel(RxOn, dev->ioaddr + ChipCmd);
--    return retcode;
--}
--
--static void fa311_transmit(struct nic *nic, const char *destaddr, unsigned int type, unsigned int len, const char *data)
--{
--unsigned short nstype;
--s32            desc_status;
--int            to;
--int            entry;
--char*          txp;
--unsigned char* s;
--struct FA311_DEV* dev = &fa311_dev;
--
--    /* Calculate the next Tx descriptor entry. */
--    entry = dev->cur_tx;
--    txp = (char*)(dev->tx_ring[entry].addr);
--
--    memcpy(txp, destaddr, ETH_ALEN);
--    memcpy(txp + ETH_ALEN, nic->node_addr, ETH_ALEN);
--    nstype = htons(type);
--    memcpy(txp + 12, (char*)&nstype, 2);
--    memcpy(txp + ETH_HLEN, data, len);
--    len += ETH_HLEN;
--    /* pad frame */
--    if (len <  ETH_ZLEN)
--    {
--        s = (unsigned char*)(txp+len);
--        while (s < (unsigned char*)(txp+ETH_ZLEN))
--            *s++ = 0;
--        len = ETH_ZLEN;
--    }
--    dev->tx_ring[entry].cmd_status = cpu_to_le32(DescOwn | len);
--    dev->cur_tx++;
--    if (dev->cur_tx >= TX_RING_SIZE)
--        dev->cur_tx = 0;
--
--    /* Wake the potentially-idle transmit channel. */
--    writel(TxOn, dev->ioaddr + ChipCmd);
--
--    /* wait for tranmission to complete */
--    to = TIME_OUT;
--    while (to != 0)
--    {
--        desc_status = dev->tx_ring[entry].cmd_status;
--        if ((desc_status & DescOwn) == 0)
--            break;
--        else
--            --to;
--    }
--
--    readl(dev->ioaddr + IntrStatus);         /* clear interrrupt bits */
--    return;
--}
--
--static void fa311_disable(struct nic *nic)
--{
--struct FA311_DEV* dev = &fa311_dev;
--
--    /* Stop the chip's Tx and Rx processes. */
--    writel(RxOff | TxOff, dev->ioaddr + ChipCmd);
--}
--
--
--/* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.
--   The EEPROM code is for the common 93c06/46 EEPROMs with 6 bit addresses. */
--
--/* Delay between EEPROM clock transitions.
--   No extra delay is needed with 33Mhz PCI, but future 66Mhz access may need
--   a delay.  Note that pre-2.0.34 kernels had a cache-alignment bug that
--   made udelay() unreliable.
--   The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
--   depricated.
--*/
--#define eeprom_delay(ee_addr)	inl(ee_addr)
--
--enum EEPROM_Ctrl_Bits {
--	EE_ShiftClk=0x04, EE_DataIn=0x01, EE_ChipSelect=0x08, EE_DataOut=0x02,
--};
--#define EE_Write0 (EE_ChipSelect)
--#define EE_Write1 (EE_ChipSelect | EE_DataIn)
--
--/* The EEPROM commands include the alway-set leading bit. */
--enum EEPROM_Cmds {
--	EE_WriteCmd=(5 << 6), EE_ReadCmd=(6 << 6), EE_EraseCmd=(7 << 6),
--};
--
--
--static int eeprom_read(long addr, int location)
--{
--	int i;
--	int retval = 0;
--	int ee_addr = addr + EECtrl;
--	int read_cmd = location | EE_ReadCmd;
--	writel(EE_Write0, ee_addr);
--
--	/* Shift the read command bits out. */
--	for (i = 10; i >= 0; i--) {
--		short dataval = (read_cmd & (1 << i)) ? EE_Write1 : EE_Write0;
--		writel(dataval, ee_addr);
--		eeprom_delay(ee_addr);
--		writel(dataval | EE_ShiftClk, ee_addr);
--		eeprom_delay(ee_addr);
--	}
--	writel(EE_ChipSelect, ee_addr);
--	eeprom_delay(ee_addr);
--
--	for (i = 0; i < 16; i++) {
--		writel(EE_ChipSelect | EE_ShiftClk, ee_addr);
--		eeprom_delay(ee_addr);
--		retval |= (readl(ee_addr) & EE_DataOut) ? 1 << i : 0;
--		writel(EE_ChipSelect, ee_addr);
--		eeprom_delay(ee_addr);
--	}
--
--	/* Terminate the EEPROM access. */
--	writel(EE_Write0, ee_addr);
--	writel(0, ee_addr);
--	return retval;
--}
--
--/* Initialize the Rx and Tx rings, along with various 'dev' bits. */
--static void init_ring(struct FA311_DEV *dev)
--{
--	int i;
--
--	dev->cur_rx = 0;
--    dev->cur_tx = 0;
--
--	dev->rx_buf_sz = PKT_BUF_SZ;
--	dev->rx_head_desc = &dev->rx_ring[0];
--
--	/* Initialize all Rx descriptors. */
--	for (i = 0; i < RX_RING_SIZE; i++) {
--		dev->rx_ring[i].next_desc = virt_to_le32desc(&dev->rx_ring[i+1]);
--		dev->rx_ring[i].cmd_status = DescOwn;
--	}
--	/* Mark the last entry as wrapping the ring. */
--	dev->rx_ring[i-1].next_desc = virt_to_le32desc(&dev->rx_ring[0]);
--
--	/* Fill in the Rx buffers.  Handle allocation failure gracefully. */
--	for (i = 0; i < RX_RING_SIZE; i++) {
--		dev->rx_ring[i].addr = (u32)(&rx_packet[PKT_BUF_SZ * i]);
--	    dev->rx_ring[i].cmd_status = cpu_to_le32(dev->rx_buf_sz);
--	}
--
--	for (i = 0; i < TX_RING_SIZE; i++) {
--		dev->tx_ring[i].next_desc = virt_to_le32desc(&dev->tx_ring[i+1]);
--		dev->tx_ring[i].cmd_status = 0;
--	}
--	dev->tx_ring[i-1].next_desc = virt_to_le32desc(&dev->tx_ring[0]);
--
--	for (i = 0; i < TX_RING_SIZE; i++)
--		dev->tx_ring[i].addr = (u32)(&tx_packet[PKT_BUF_SZ * i]);
--	return;
--}
--
-Index: b/netboot/forcedeth.c
-===================================================================
---- /dev/null
-+++ b/netboot/forcedeth.c
-@@ -0,0 +1,1039 @@
-+/**************************************************************************
-+*    forcedeth.c -- Etherboot device driver for the NVIDIA nForce 
-+*			media access controllers.
-+*
-+* Note: This driver is based on the Linux driver that was based on
-+*      a cleanroom reimplementation which was based on reverse
-+*      engineered documentation written by Carl-Daniel Hailfinger
-+*      and Andrew de Quincey. It's neither supported nor endorsed
-+*      by NVIDIA Corp. Use at your own risk.
-+*
-+*    Written 2004 by Timothy Legge <tlegge@rogers.com>
-+*
-+*    This program is free software; you can redistribute it and/or modify
-+*    it under the terms of the GNU General Public License as published by
-+*    the Free Software Foundation; either version 2 of the License, or
-+*    (at your option) any later version.
-+*
-+*    This program is distributed in the hope that it will be useful,
-+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+*    GNU General Public License for more details.
-+*
-+*    You should have received a copy of the GNU General Public License
-+*    along with this program; if not, write to the Free Software
-+*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*
-+*    Portions of this code based on:
-+*		forcedeth: Ethernet driver for NVIDIA nForce media access controllers:
-+*
-+*	(C) 2003 Manfred Spraul
-+*		See Linux Driver for full information
-+*	
-+*	Linux Driver Version 0.22, 19 Jan 2004
-+* 
-+* 
-+*    REVISION HISTORY:
-+*    ================
-+*    v1.0	01-31-2004	timlegge	Initial port of Linux driver
-+*    v1.1	02-03-2004	timlegge	Large Clean up, first release 
-+*    
-+*    Indent Options: indent -kr -i8
-+***************************************************************************/
-+
-+/* to get some global routines like printf */
-+#include "etherboot.h"
-+/* to get the interface to the body of the program */
-+#include "nic.h"
-+/* to get the PCI support functions, if this is a PCI NIC */
-+#include "pci.h"
-+/* Include timer support functions */
-+#include "timer.h"
-+
-+#define drv_version "v1.1"
-+#define drv_date "02-03-2004"
-+
-+//#define TFTM_DEBUG
-+#ifdef TFTM_DEBUG
-+#define dprintf(x) printf x
-+#else
-+#define dprintf(x)
-+#endif
-+
-+typedef unsigned char u8;
-+typedef signed char s8;
-+typedef unsigned short u16;
-+typedef signed short s16;
-+typedef unsigned int u32;
-+typedef signed int s32;
-+
-+/* Condensed operations for readability. */
-+#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
-+#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
-+
-+unsigned long BASE;
-+/* NIC specific static variables go here */
-+
-+
-+/*
-+ * Hardware access:
-+ */
-+
-+#define DEV_NEED_LASTPACKET1	0x0001
-+#define DEV_IRQMASK_1		0x0002
-+#define DEV_IRQMASK_2		0x0004
-+#define DEV_NEED_TIMERIRQ	0x0008
-+
-+enum {
-+	NvRegIrqStatus = 0x000,
-+#define NVREG_IRQSTAT_MIIEVENT	0040
-+#define NVREG_IRQSTAT_MASK		0x1ff
-+	NvRegIrqMask = 0x004,
-+#define NVREG_IRQ_RX			0x0002
-+#define NVREG_IRQ_RX_NOBUF		0x0004
-+#define NVREG_IRQ_TX_ERR		0x0008
-+#define NVREG_IRQ_TX2			0x0010
-+#define NVREG_IRQ_TIMER			0x0020
-+#define NVREG_IRQ_LINK			0x0040
-+#define NVREG_IRQ_TX1			0x0100
-+#define NVREG_IRQMASK_WANTED_1		0x005f
-+#define NVREG_IRQMASK_WANTED_2		0x0147
-+#define NVREG_IRQ_UNKNOWN		(~(NVREG_IRQ_RX|NVREG_IRQ_RX_NOBUF|NVREG_IRQ_TX_ERR|NVREG_IRQ_TX2|NVREG_IRQ_TIMER|NVREG_IRQ_LINK|NVREG_IRQ_TX1))
-+
-+	NvRegUnknownSetupReg6 = 0x008,
-+#define NVREG_UNKSETUP6_VAL		3
-+
-+/*
-+ * NVREG_POLL_DEFAULT is the interval length of the timer source on the nic
-+ * NVREG_POLL_DEFAULT=97 would result in an interval length of 1 ms
-+ */
-+	NvRegPollingInterval = 0x00c,
-+#define NVREG_POLL_DEFAULT	970
-+	NvRegMisc1 = 0x080,
-+#define NVREG_MISC1_HD		0x02
-+#define NVREG_MISC1_FORCE	0x3b0f3c
-+
-+	NvRegTransmitterControl = 0x084,
-+#define NVREG_XMITCTL_START	0x01
-+	NvRegTransmitterStatus = 0x088,
-+#define NVREG_XMITSTAT_BUSY	0x01
-+
-+	NvRegPacketFilterFlags = 0x8c,
-+#define NVREG_PFF_ALWAYS	0x7F0008
-+#define NVREG_PFF_PROMISC	0x80
-+#define NVREG_PFF_MYADDR	0x20
-+
-+	NvRegOffloadConfig = 0x90,
-+#define NVREG_OFFLOAD_HOMEPHY	0x601
-+#define NVREG_OFFLOAD_NORMAL	0x5ee
-+	NvRegReceiverControl = 0x094,
-+#define NVREG_RCVCTL_START	0x01
-+	NvRegReceiverStatus = 0x98,
-+#define NVREG_RCVSTAT_BUSY	0x01
-+
-+	NvRegRandomSeed = 0x9c,
-+#define NVREG_RNDSEED_MASK	0x00ff
-+#define NVREG_RNDSEED_FORCE	0x7f00
-+
-+	NvRegUnknownSetupReg1 = 0xA0,
-+#define NVREG_UNKSETUP1_VAL	0x16070f
-+	NvRegUnknownSetupReg2 = 0xA4,
-+#define NVREG_UNKSETUP2_VAL	0x16
-+	NvRegMacAddrA = 0xA8,
-+	NvRegMacAddrB = 0xAC,
-+	NvRegMulticastAddrA = 0xB0,
-+#define NVREG_MCASTADDRA_FORCE	0x01
-+	NvRegMulticastAddrB = 0xB4,
-+	NvRegMulticastMaskA = 0xB8,
-+	NvRegMulticastMaskB = 0xBC,
-+
-+	NvRegTxRingPhysAddr = 0x100,
-+	NvRegRxRingPhysAddr = 0x104,
-+	NvRegRingSizes = 0x108,
-+#define NVREG_RINGSZ_TXSHIFT 0
-+#define NVREG_RINGSZ_RXSHIFT 16
-+	NvRegUnknownTransmitterReg = 0x10c,
-+	NvRegLinkSpeed = 0x110,
-+#define NVREG_LINKSPEED_FORCE 0x10000
-+#define NVREG_LINKSPEED_10	10
-+#define NVREG_LINKSPEED_100	100
-+#define NVREG_LINKSPEED_1000	1000
-+	NvRegUnknownSetupReg5 = 0x130,
-+#define NVREG_UNKSETUP5_BIT31	(1<<31)
-+	NvRegUnknownSetupReg3 = 0x134,
-+#define NVREG_UNKSETUP3_VAL1	0x200010
-+	NvRegTxRxControl = 0x144,
-+#define NVREG_TXRXCTL_KICK	0x0001
-+#define NVREG_TXRXCTL_BIT1	0x0002
-+#define NVREG_TXRXCTL_BIT2	0x0004
-+#define NVREG_TXRXCTL_IDLE	0x0008
-+#define NVREG_TXRXCTL_RESET	0x0010
-+	NvRegMIIStatus = 0x180,
-+#define NVREG_MIISTAT_ERROR		0x0001
-+#define NVREG_MIISTAT_LINKCHANGE	0x0008
-+#define NVREG_MIISTAT_MASK		0x000f
-+#define NVREG_MIISTAT_MASK2		0x000f
-+	NvRegUnknownSetupReg4 = 0x184,
-+#define NVREG_UNKSETUP4_VAL	8
-+
-+	NvRegAdapterControl = 0x188,
-+#define NVREG_ADAPTCTL_START	0x02
-+#define NVREG_ADAPTCTL_LINKUP	0x04
-+#define NVREG_ADAPTCTL_PHYVALID	0x4000
-+#define NVREG_ADAPTCTL_RUNNING	0x100000
-+#define NVREG_ADAPTCTL_PHYSHIFT	24
-+	NvRegMIISpeed = 0x18c,
-+#define NVREG_MIISPEED_BIT8	(1<<8)
-+#define NVREG_MIIDELAY	5
-+	NvRegMIIControl = 0x190,
-+#define NVREG_MIICTL_INUSE	0x10000
-+#define NVREG_MIICTL_WRITE	0x08000
-+#define NVREG_MIICTL_ADDRSHIFT	5
-+	NvRegMIIData = 0x194,
-+	NvRegWakeUpFlags = 0x200,
-+#define NVREG_WAKEUPFLAGS_VAL		0x7770
-+#define NVREG_WAKEUPFLAGS_BUSYSHIFT	24
-+#define NVREG_WAKEUPFLAGS_ENABLESHIFT	16
-+#define NVREG_WAKEUPFLAGS_D3SHIFT	12
-+#define NVREG_WAKEUPFLAGS_D2SHIFT	8
-+#define NVREG_WAKEUPFLAGS_D1SHIFT	4
-+#define NVREG_WAKEUPFLAGS_D0SHIFT	0
-+#define NVREG_WAKEUPFLAGS_ACCEPT_MAGPAT		0x01
-+#define NVREG_WAKEUPFLAGS_ACCEPT_WAKEUPPAT	0x02
-+#define NVREG_WAKEUPFLAGS_ACCEPT_LINKCHANGE	0x04
-+
-+	NvRegPatternCRC = 0x204,
-+	NvRegPatternMask = 0x208,
-+	NvRegPowerCap = 0x268,
-+#define NVREG_POWERCAP_D3SUPP	(1<<30)
-+#define NVREG_POWERCAP_D2SUPP	(1<<26)
-+#define NVREG_POWERCAP_D1SUPP	(1<<25)
-+	NvRegPowerState = 0x26c,
-+#define NVREG_POWERSTATE_POWEREDUP	0x8000
-+#define NVREG_POWERSTATE_VALID		0x0100
-+#define NVREG_POWERSTATE_MASK		0x0003
-+#define NVREG_POWERSTATE_D0		0x0000
-+#define NVREG_POWERSTATE_D1		0x0001
-+#define NVREG_POWERSTATE_D2		0x0002
-+#define NVREG_POWERSTATE_D3		0x0003
-+};
-+
-+
-+
-+#define NV_TX_LASTPACKET	(1<<0)
-+#define NV_TX_RETRYERROR	(1<<3)
-+#define NV_TX_LASTPACKET1	(1<<8)
-+#define NV_TX_DEFERRED		(1<<10)
-+#define NV_TX_CARRIERLOST	(1<<11)
-+#define NV_TX_LATECOLLISION	(1<<12)
-+#define NV_TX_UNDERFLOW		(1<<13)
-+#define NV_TX_ERROR		(1<<14)
-+#define NV_TX_VALID		(1<<15)
-+
-+#define NV_RX_DESCRIPTORVALID	(1<<0)
-+#define NV_RX_MISSEDFRAME	(1<<1)
-+#define NV_RX_SUBSTRACT1	(1<<3)
-+#define NV_RX_ERROR1		(1<<7)
-+#define NV_RX_ERROR2		(1<<8)
-+#define NV_RX_ERROR3		(1<<9)
-+#define NV_RX_ERROR4		(1<<10)
-+#define NV_RX_CRCERR		(1<<11)
-+#define NV_RX_OVERFLOW		(1<<12)
-+#define NV_RX_FRAMINGERR	(1<<13)
-+#define NV_RX_ERROR		(1<<14)
-+#define NV_RX_AVAIL		(1<<15)
-+
-+/* Miscelaneous hardware related defines: */
-+#define NV_PCI_REGSZ		0x270
-+
-+/* various timeout delays: all in usec */
-+#define NV_TXRX_RESET_DELAY	4
-+#define NV_TXSTOP_DELAY1	10
-+#define NV_TXSTOP_DELAY1MAX	500000
-+#define NV_TXSTOP_DELAY2	100
-+#define NV_RXSTOP_DELAY1	10
-+#define NV_RXSTOP_DELAY1MAX	500000
-+#define NV_RXSTOP_DELAY2	100
-+#define NV_SETUP5_DELAY		5
-+#define NV_SETUP5_DELAYMAX	50000
-+#define NV_POWERUP_DELAY	5
-+#define NV_POWERUP_DELAYMAX	5000
-+#define NV_MIIBUSY_DELAY	50
-+#define NV_MIIPHY_DELAY	10
-+#define NV_MIIPHY_DELAYMAX	10000
-+
-+#define NV_WAKEUPPATTERNS	5
-+#define NV_WAKEUPMASKENTRIES	4
-+
-+/* General driver defaults */
-+#define NV_WATCHDOG_TIMEO	(2*HZ)
-+#define DEFAULT_MTU		1500	/* also maximum supported, at least for now */
-+
-+#define RX_RING		4
-+#define TX_RING		2
-+/* limited to 1 packet until we understand NV_TX_LASTPACKET */
-+#define TX_LIMIT_STOP	10
-+#define TX_LIMIT_START	5
-+
-+/* rx/tx mac addr + type + vlan + align + slack*/
-+#define RX_NIC_BUFSIZE		(DEFAULT_MTU + 64)
-+/* even more slack */
-+#define RX_ALLOC_BUFSIZE	(DEFAULT_MTU + 128)
-+
-+#define OOM_REFILL	(1+HZ/20)
-+#define POLL_WAIT	(1+HZ/100)
-+
-+struct ring_desc {
-+	u32 PacketBuffer;
-+	u16 Length;
-+	u16 Flags;
-+};
-+
-+
-+/* Define the TX Descriptor */
-+static struct ring_desc tx_ring[TX_RING];
-+
-+/* Create a static buffer of size RX_BUF_SZ for each
-+TX Descriptor.  All descriptors point to a
-+part of this buffer */
-+static unsigned char txb[TX_RING * RX_NIC_BUFSIZE];
-+
-+/* Define the TX Descriptor */
-+static struct ring_desc rx_ring[RX_RING];
-+
-+/* Create a static buffer of size RX_BUF_SZ for each
-+RX Descriptor   All descriptors point to a
-+part of this buffer */
-+static unsigned char rxb[RX_RING * RX_NIC_BUFSIZE];
-+
-+/* Private Storage for the NIC */
-+struct forcedeth_private {
-+	/* General data:
-+	 * Locking: spin_lock(&np->lock); */
-+	int in_shutdown;
-+	u32 linkspeed;
-+	int duplex;
-+	int phyaddr;
-+
-+	/* General data: RO fields */
-+	u8 *ring_addr;
-+	u32 orig_mac[2];
-+	u32 irqmask;
-+	/* rx specific fields.
-+	 * Locking: Within irq hander or disable_irq+spin_lock(&np->lock);
-+	 */
-+	struct ring_desc *rx_ring;
-+	unsigned int cur_rx, refill_rx;
-+	struct sk_buff *rx_skbuff[RX_RING];
-+	u32 rx_dma[RX_RING];
-+	unsigned int rx_buf_sz;
-+
-+	/*
-+	 * tx specific fields.
-+	 */
-+	struct ring_desc *tx_ring;
-+	unsigned int next_tx, nic_tx;
-+	struct sk_buff *tx_skbuff[TX_RING];
-+	u32 tx_dma[TX_RING];
-+	u16 tx_flags;
-+} npx;
-+
-+static struct forcedeth_private *np;
-+
-+static inline void pci_push(u8 * base)
-+{
-+	/* force out pending posted writes */
-+	readl(base);
-+}
-+static int reg_delay(int offset, u32 mask,
-+		     u32 target, int delay, int delaymax, const char *msg)
-+{
-+	u8 *base = (u8 *) BASE;
-+
-+	pci_push(base);
-+	do {
-+		udelay(delay);
-+		delaymax -= delay;
-+		if (delaymax < 0) {
-+			if (msg)
-+				printf(msg);
-+			return 1;
-+		}
-+	} while ((readl(base + offset) & mask) != target);
-+	return 0;
-+}
-+
-+#define MII_READ	(-1)
-+#define MII_PHYSID1         0x02	/* PHYS ID 1                   */
-+#define MII_PHYSID2         0x03	/* PHYS ID 2                   */
-+#define MII_BMCR            0x00	/* Basic mode control register */
-+#define MII_BMSR            0x01	/* Basic mode status register  */
-+#define MII_ADVERTISE       0x04	/* Advertisement control reg   */
-+#define MII_LPA             0x05	/* Link partner ability reg    */
-+
-+#define BMSR_ANEGCOMPLETE       0x0020	/* Auto-negotiation complete   */
-+
-+/* Link partner ability register. */
-+#define LPA_SLCT                0x001f	/* Same as advertise selector  */
-+#define LPA_10HALF              0x0020	/* Can do 10mbps half-duplex   */
-+#define LPA_10FULL              0x0040	/* Can do 10mbps full-duplex   */
-+#define LPA_100HALF             0x0080	/* Can do 100mbps half-duplex  */
-+#define LPA_100FULL             0x0100	/* Can do 100mbps full-duplex  */
-+#define LPA_100BASE4            0x0200	/* Can do 100mbps 4k packets   */
-+#define LPA_RESV                0x1c00	/* Unused...                   */
-+#define LPA_RFAULT              0x2000	/* Link partner faulted        */
-+#define LPA_LPACK               0x4000	/* Link partner acked us       */
-+#define LPA_NPAGE               0x8000	/* Next page bit               */
-+
-+/* mii_rw: read/write a register on the PHY.
-+ *
-+ * Caller must guarantee serialization
-+ */
-+static int mii_rw(struct nic *nic __unused, int addr, int miireg,
-+		  int value)
-+{
-+	u8 *base = (u8 *) BASE;
-+	int was_running;
-+	u32 reg;
-+	int retval;
-+
-+	writel(NVREG_MIISTAT_MASK, base + NvRegMIIStatus);
-+	was_running = 0;
-+	reg = readl(base + NvRegAdapterControl);
-+	if (reg & NVREG_ADAPTCTL_RUNNING) {
-+		was_running = 1;
-+		writel(reg & ~NVREG_ADAPTCTL_RUNNING,
-+		       base + NvRegAdapterControl);
-+	}
-+	reg = readl(base + NvRegMIIControl);
-+	if (reg & NVREG_MIICTL_INUSE) {
-+		writel(NVREG_MIICTL_INUSE, base + NvRegMIIControl);
-+		udelay(NV_MIIBUSY_DELAY);
-+	}
-+
-+	reg =
-+	    NVREG_MIICTL_INUSE | (addr << NVREG_MIICTL_ADDRSHIFT) | miireg;
-+	if (value != MII_READ) {
-+		writel(value, base + NvRegMIIData);
-+		reg |= NVREG_MIICTL_WRITE;
-+	}
-+	writel(reg, base + NvRegMIIControl);
-+
-+	if (reg_delay(NvRegMIIControl, NVREG_MIICTL_INUSE, 0,
-+		      NV_MIIPHY_DELAY, NV_MIIPHY_DELAYMAX, NULL)) {
-+		dprintf(("mii_rw of reg %d at PHY %d timed out.\n",
-+			 miireg, addr));
-+		retval = -1;
-+	} else if (value != MII_READ) {
-+		/* it was a write operation - fewer failures are detectable */
-+		dprintf(("mii_rw wrote 0x%x to reg %d at PHY %d\n",
-+			 value, miireg, addr));
-+		retval = 0;
-+	} else if (readl(base + NvRegMIIStatus) & NVREG_MIISTAT_ERROR) {
-+		dprintf(("mii_rw of reg %d at PHY %d failed.\n",
-+			 miireg, addr));
-+		retval = -1;
-+	} else {
-+		/* FIXME: why is that required? */
-+		udelay(50);
-+		retval = readl(base + NvRegMIIData);
-+		dprintf(("mii_rw read from reg %d at PHY %d: 0x%x.\n",
-+			 miireg, addr, retval));
-+	}
-+	if (was_running) {
-+		reg = readl(base + NvRegAdapterControl);
-+		writel(reg | NVREG_ADAPTCTL_RUNNING,
-+		       base + NvRegAdapterControl);
-+	}
-+	return retval;
-+}
-+
-+static void start_rx(struct nic *nic __unused)
-+{
-+	u8 *base = (u8 *) BASE;
-+
-+	dprintf(("start_rx\n"));
-+	/* Already running? Stop it. */
-+	if (readl(base + NvRegReceiverControl) & NVREG_RCVCTL_START) {
-+		writel(0, base + NvRegReceiverControl);
-+		pci_push(base);
-+	}
-+	writel(np->linkspeed, base + NvRegLinkSpeed);
-+	pci_push(base);
-+	writel(NVREG_RCVCTL_START, base + NvRegReceiverControl);
-+	pci_push(base);
-+}
-+
-+static void stop_rx(void)
-+{
-+	u8 *base = (u8 *) BASE;
-+
-+	dprintf(("stop_rx\n"));
-+	writel(0, base + NvRegReceiverControl);
-+	reg_delay(NvRegReceiverStatus, NVREG_RCVSTAT_BUSY, 0,
-+		  NV_RXSTOP_DELAY1, NV_RXSTOP_DELAY1MAX,
-+		  "stop_rx: ReceiverStatus remained busy");
-+
-+	udelay(NV_RXSTOP_DELAY2);
-+	writel(0, base + NvRegLinkSpeed);
-+}
-+
-+static void start_tx(struct nic *nic __unused)
-+{
-+	u8 *base = (u8 *) BASE;
-+
-+	dprintf(("start_tx\n"));
-+	writel(NVREG_XMITCTL_START, base + NvRegTransmitterControl);
-+	pci_push(base);
-+}
-+
-+static void stop_tx(void)
-+{
-+	u8 *base = (u8 *) BASE;
-+
-+	dprintf(("stop_tx\n"));
-+	writel(0, base + NvRegTransmitterControl);
-+	reg_delay(NvRegTransmitterStatus, NVREG_XMITSTAT_BUSY, 0,
-+		  NV_TXSTOP_DELAY1, NV_TXSTOP_DELAY1MAX,
-+		  "stop_tx: TransmitterStatus remained busy");
-+
-+	udelay(NV_TXSTOP_DELAY2);
-+	writel(0, base + NvRegUnknownTransmitterReg);
-+}
-+
-+
-+static void txrx_reset(struct nic *nic __unused)
-+{
-+	u8 *base = (u8 *) BASE;
-+
-+	dprintf(("txrx_reset\n"));
-+	writel(NVREG_TXRXCTL_BIT2 | NVREG_TXRXCTL_RESET,
-+	       base + NvRegTxRxControl);
-+	pci_push(base);
-+	udelay(NV_TXRX_RESET_DELAY);
-+	writel(NVREG_TXRXCTL_BIT2, base + NvRegTxRxControl);
-+	pci_push(base);
-+}
-+
-+/*
-+ * alloc_rx: fill rx ring entries.
-+ * Return 1 if the allocations for the skbs failed and the
-+ * rx engine is without Available descriptors
-+ */
-+static int alloc_rx(struct nic *nic __unused)
-+{
-+	unsigned int refill_rx = np->refill_rx;
-+	int i;
-+	//while (np->cur_rx != refill_rx) {
-+	for (i = 0; i < RX_RING; i++) {
-+		//int nr = refill_rx % RX_RING;
-+		rx_ring[i].PacketBuffer =
-+		    virt_to_le32desc(&rxb[i * RX_NIC_BUFSIZE]);
-+		rx_ring[i].Length = cpu_to_le16(RX_NIC_BUFSIZE);
-+		wmb();
-+		rx_ring[i].Flags = cpu_to_le16(NV_RX_AVAIL);
-+		/*      printf("alloc_rx: Packet  %d marked as Available\n",
-+		   refill_rx); */
-+		refill_rx++;
-+	}
-+	np->refill_rx = refill_rx;
-+	if (np->cur_rx - refill_rx == RX_RING)
-+		return 1;
-+	return 0;
-+}
-+
-+static int update_linkspeed(struct nic *nic)
-+{
-+	int adv, lpa, newdup;
-+	u32 newls;
-+	adv = mii_rw(nic, np->phyaddr, MII_ADVERTISE, MII_READ);
-+	lpa = mii_rw(nic, np->phyaddr, MII_LPA, MII_READ);
-+	dprintf(("update_linkspeed: PHY advertises 0x%hX, lpa 0x%hX.\n",
-+		 adv, lpa));
-+
-+	/* FIXME: handle parallel detection properly, handle gigabit ethernet */
-+	lpa = lpa & adv;
-+	if (lpa & LPA_100FULL) {
-+		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_100;
-+		newdup = 1;
-+	} else if (lpa & LPA_100HALF) {
-+		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_100;
-+		newdup = 0;
-+	} else if (lpa & LPA_10FULL) {
-+		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
-+		newdup = 1;
-+	} else if (lpa & LPA_10HALF) {
-+		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
-+		newdup = 0;
-+	} else {
-+		printf("bad ability %hX - falling back to 10HD.\n", lpa);
-+		newls = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
-+		newdup = 0;
-+	}
-+	if (np->duplex != newdup || np->linkspeed != newls) {
-+		np->duplex = newdup;
-+		np->linkspeed = newls;
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+
-+
-+static int init_ring(struct nic *nic)
-+{
-+	int i;
-+
-+	np->next_tx = np->nic_tx = 0;
-+	for (i = 0; i < TX_RING; i++) {
-+		tx_ring[i].Flags = 0;
-+	}
-+
-+	np->cur_rx = 0;
-+	np->refill_rx = 0;
-+	for (i = 0; i < RX_RING; i++) {
-+		rx_ring[i].Flags = 0;
-+	}
-+	return alloc_rx(nic);
-+}
-+
-+static void set_multicast(struct nic *nic)
-+{
-+
-+	u8 *base = (u8 *) BASE;
-+	u32 addr[2];
-+	u32 mask[2];
-+	u32 pff;
-+	u32 alwaysOff[2];
-+	u32 alwaysOn[2];
-+
-+	memset(addr, 0, sizeof(addr));
-+	memset(mask, 0, sizeof(mask));
-+
-+	pff = NVREG_PFF_MYADDR;
-+
-+	alwaysOn[0] = alwaysOn[1] = alwaysOff[0] = alwaysOff[1] = 0;
-+
-+	addr[0] = alwaysOn[0];
-+	addr[1] = alwaysOn[1];
-+	mask[0] = alwaysOn[0] | alwaysOff[0];
-+	mask[1] = alwaysOn[1] | alwaysOff[1];
-+
-+	addr[0] |= NVREG_MCASTADDRA_FORCE;
-+	pff |= NVREG_PFF_ALWAYS;
-+	stop_rx();
-+	writel(addr[0], base + NvRegMulticastAddrA);
-+	writel(addr[1], base + NvRegMulticastAddrB);
-+	writel(mask[0], base + NvRegMulticastMaskA);
-+	writel(mask[1], base + NvRegMulticastMaskB);
-+	writel(pff, base + NvRegPacketFilterFlags);
-+	start_rx(nic);
-+}
-+
-+/**************************************************************************
-+RESET - Reset the NIC to prepare for use
-+***************************************************************************/
-+static int forcedeth_reset(struct nic *nic)
-+{
-+	u8 *base = (u8 *) BASE;
-+	int ret, oom, i;
-+	ret = 0;
-+	dprintf(("forcedeth: open\n"));
-+
-+	/* 1) erase previous misconfiguration */
-+	/* 4.1-1: stop adapter: ignored, 4.3 seems to be overkill */
-+	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
-+	writel(0, base + NvRegMulticastAddrB);
-+	writel(0, base + NvRegMulticastMaskA);
-+	writel(0, base + NvRegMulticastMaskB);
-+	writel(0, base + NvRegPacketFilterFlags);
-+	writel(0, base + NvRegAdapterControl);
-+	writel(0, base + NvRegLinkSpeed);
-+	writel(0, base + NvRegUnknownTransmitterReg);
-+	txrx_reset(nic);
-+	writel(0, base + NvRegUnknownSetupReg6);
-+
-+	/* 2) initialize descriptor rings */
-+	np->in_shutdown = 0;
-+	oom = init_ring(nic);
-+
-+	/* 3) set mac address */
-+	{
-+		u32 mac[2];
-+
-+		mac[0] =
-+		    (nic->node_addr[0] << 0) + (nic->node_addr[1] << 8) +
-+		    (nic->node_addr[2] << 16) + (nic->node_addr[3] << 24);
-+		mac[1] =
-+		    (nic->node_addr[4] << 0) + (nic->node_addr[5] << 8);
-+
-+		writel(mac[0], base + NvRegMacAddrA);
-+		writel(mac[1], base + NvRegMacAddrB);
-+	}
-+
-+	/* 4) continue setup */
-+	np->linkspeed = NVREG_LINKSPEED_FORCE | NVREG_LINKSPEED_10;
-+	np->duplex = 0;
-+	writel(NVREG_UNKSETUP3_VAL1, base + NvRegUnknownSetupReg3);
-+	writel(0, base + NvRegTxRxControl);
-+	pci_push(base);
-+	writel(NVREG_TXRXCTL_BIT1, base + NvRegTxRxControl);
-+
-+	reg_delay(NvRegUnknownSetupReg5, NVREG_UNKSETUP5_BIT31,
-+		  NVREG_UNKSETUP5_BIT31, NV_SETUP5_DELAY,
-+		  NV_SETUP5_DELAYMAX,
-+		  "open: SetupReg5, Bit 31 remained off\n");
-+	writel(0, base + NvRegUnknownSetupReg4);
-+
-+	/* 5) Find a suitable PHY */
-+	writel(NVREG_MIISPEED_BIT8 | NVREG_MIIDELAY, base + NvRegMIISpeed);
-+	for (i = 1; i < 32; i++) {
-+		int id1, id2;
-+
-+		id1 = mii_rw(nic, i, MII_PHYSID1, MII_READ);
-+		if (id1 < 0)
-+			continue;
-+		id2 = mii_rw(nic, i, MII_PHYSID2, MII_READ);
-+		if (id2 < 0)
-+			continue;
-+		dprintf(("open: Found PHY %04x:%04x at address %d.\n",
-+			 id1, id2, i));
-+		np->phyaddr = i;
-+
-+		update_linkspeed(nic);
-+
-+		break;
-+	}
-+	if (i == 32) {
-+		printf("open: failing due to lack of suitable PHY.\n");
-+		ret = -1;
-+		goto out_drain;
-+	}
-+
-+	printf("%d-Mbs Link, %s-Duplex\n",
-+	       np->linkspeed & NVREG_LINKSPEED_10 ? 10 : 100,
-+	       np->duplex ? "Full" : "Half");
-+	/* 6) continue setup */
-+	writel(NVREG_MISC1_FORCE | (np->duplex ? 0 : NVREG_MISC1_HD),
-+	       base + NvRegMisc1);
-+	writel(readl(base + NvRegTransmitterStatus),
-+	       base + NvRegTransmitterStatus);
-+	writel(NVREG_PFF_ALWAYS, base + NvRegPacketFilterFlags);
-+	writel(NVREG_OFFLOAD_NORMAL, base + NvRegOffloadConfig);
-+
-+	writel(readl(base + NvRegReceiverStatus),
-+	       base + NvRegReceiverStatus);
-+
-+	/* FIXME: I cheated and used the calculator to get a random number */
-+	i = 75963081;
-+	writel(NVREG_RNDSEED_FORCE | (i & NVREG_RNDSEED_MASK),
-+	       base + NvRegRandomSeed);
-+	writel(NVREG_UNKSETUP1_VAL, base + NvRegUnknownSetupReg1);
-+	writel(NVREG_UNKSETUP2_VAL, base + NvRegUnknownSetupReg2);
-+	writel(NVREG_POLL_DEFAULT, base + NvRegPollingInterval);
-+	writel(NVREG_UNKSETUP6_VAL, base + NvRegUnknownSetupReg6);
-+	writel((np->
-+		phyaddr << NVREG_ADAPTCTL_PHYSHIFT) |
-+	       NVREG_ADAPTCTL_PHYVALID, base + NvRegAdapterControl);
-+	writel(NVREG_UNKSETUP4_VAL, base + NvRegUnknownSetupReg4);
-+	writel(NVREG_WAKEUPFLAGS_VAL, base + NvRegWakeUpFlags);
-+
-+	/* 7) start packet processing */
-+	writel((u32) virt_to_le32desc(&rx_ring[0]),
-+	       base + NvRegRxRingPhysAddr);
-+	writel((u32) virt_to_le32desc(&tx_ring[0]),
-+	       base + NvRegTxRingPhysAddr);
-+
-+
-+	writel(((RX_RING - 1) << NVREG_RINGSZ_RXSHIFT) +
-+	       ((TX_RING - 1) << NVREG_RINGSZ_TXSHIFT),
-+	       base + NvRegRingSizes);
-+
-+	i = readl(base + NvRegPowerState);
-+	if ((i & NVREG_POWERSTATE_POWEREDUP) == 0) {
-+		writel(NVREG_POWERSTATE_POWEREDUP | i,
-+		       base + NvRegPowerState);
-+	}
-+	pci_push(base);
-+	udelay(10);
-+	writel(readl(base + NvRegPowerState) | NVREG_POWERSTATE_VALID,
-+	       base + NvRegPowerState);
-+	writel(NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl);
-+
-+	writel(0, base + NvRegIrqMask);
-+	pci_push(base);
-+	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
-+	pci_push(base);
-+	writel(NVREG_MIISTAT_MASK2, base + NvRegMIIStatus);
-+	writel(NVREG_IRQSTAT_MASK, base + NvRegIrqStatus);
-+	pci_push(base);
-+/*
-+	writel(np->irqmask, base + NvRegIrqMask);
-+*/
-+	writel(NVREG_MCASTADDRA_FORCE, base + NvRegMulticastAddrA);
-+	writel(0, base + NvRegMulticastAddrB);
-+	writel(0, base + NvRegMulticastMaskA);
-+	writel(0, base + NvRegMulticastMaskB);
-+	writel(NVREG_PFF_ALWAYS | NVREG_PFF_MYADDR,
-+	       base + NvRegPacketFilterFlags);
-+
-+	set_multicast(nic);
-+	//start_rx(nic);
-+	start_tx(nic);
-+
-+	if (!
-+	    (mii_rw(nic, np->phyaddr, MII_BMSR, MII_READ) &
-+	     BMSR_ANEGCOMPLETE)) {
-+		printf("no link during initialization.\n");
-+	}
-+
-+	udelay(10000);
-+      out_drain:
-+	return ret;
-+}
-+
-+//extern void hex_dump(const char *data, const unsigned int len);
-+
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int forcedeth_poll(struct nic *nic, int retrieve)
-+{
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+
-+	struct ring_desc *prd;
-+	int len;
-+	int i;
-+
-+	i = np->cur_rx % RX_RING;
-+	prd = &rx_ring[i];
-+
-+	if ( ! (prd->Flags & cpu_to_le16(NV_RX_DESCRIPTORVALID)) ) {
-+	  return 0;
-+	}
-+
-+	if ( ! retrieve ) return 1;
-+
-+	/* got a valid packet - forward it to the network core */
-+	len = cpu_to_le16(prd->Length);
-+	nic->packetlen = len;
-+	//hex_dump(rxb + (i * RX_NIC_BUFSIZE), len);
-+	memcpy(nic->packet, rxb +
-+	       (i * RX_NIC_BUFSIZE), nic->packetlen);
-+
-+	wmb();
-+	np->cur_rx++;
-+	alloc_rx(nic);
-+	return 1;
-+}
-+
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void forcedeth_transmit(struct nic *nic, const char *d,	/* Destination */
-+			       unsigned int t,	/* Type */
-+			       unsigned int s,	/* size */
-+			       const char *p)
-+{				/* Packet */
-+	/* send the packet to destination */
-+	u8 *ptxb;
-+	u16 nstype;
-+	//u16 status;
-+	u8 *base = (u8 *) BASE;
-+	int nr = np->next_tx % TX_RING;
-+
-+	/* point to the current txb incase multiple tx_rings are used */
-+	ptxb = txb + (nr * RX_NIC_BUFSIZE);
-+	//np->tx_skbuff[nr] = ptxb;
-+
-+	/* copy the packet to ring buffer */
-+	memcpy(ptxb, d, ETH_ALEN);	/* dst */
-+	memcpy(ptxb + ETH_ALEN, nic->node_addr, ETH_ALEN);	/* src */
-+	nstype = htons((u16) t);	/* type */
-+	memcpy(ptxb + 2 * ETH_ALEN, (u8 *) & nstype, 2);	/* type */
-+	memcpy(ptxb + ETH_HLEN, p, s);
-+
-+	s += ETH_HLEN;
-+	while (s < ETH_ZLEN)	/* pad to min length */
-+		ptxb[s++] = '\0';
-+
-+	tx_ring[nr].PacketBuffer = (u32) virt_to_le32desc(ptxb);
-+	tx_ring[nr].Length = cpu_to_le16(s - 1);
-+
-+	wmb();
-+	tx_ring[nr].Flags = np->tx_flags;
-+
-+	writel(NVREG_TXRXCTL_KICK, base + NvRegTxRxControl);
-+	pci_push(base);
-+	tx_ring[nr].Flags = np->tx_flags;
-+	np->next_tx++;
-+}
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void forcedeth_disable(struct dev *dev __unused)
-+{
-+	/* put the card in its initial state */
-+	/* This function serves 3 purposes.
-+	 * This disables DMA and interrupts so we don't receive
-+	 *  unexpected packets or interrupts from the card after
-+	 *  etherboot has finished. 
-+	 * This frees resources so etherboot may use
-+	 *  this driver on another interface
-+	 * This allows etherboot to reinitialize the interface
-+	 *  if something is something goes wrong.
-+	 */
-+	u8 *base = (u8 *) BASE;
-+	np->in_shutdown = 1;
-+	stop_tx();
-+	stop_rx();
-+
-+	/* disable interrupts on the nic or we will lock up */
-+	writel(0, base + NvRegIrqMask);
-+	pci_push(base);
-+	dprintf(("Irqmask is zero again\n"));
-+
-+	/* specia op:o write back the misordered MAC address - otherwise
-+	 * the next probe_nic would see a wrong address.
-+	 */
-+	writel(np->orig_mac[0], base + NvRegMacAddrA);
-+	writel(np->orig_mac[1], base + NvRegMacAddrB);
-+}
-+
-+/**************************************************************************
-+IRQ - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void forcedeth_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+***************************************************************************/
-+#define IORESOURCE_MEM 0x00000200
-+#define board_found 1
-+#define valid_link 0
-+static int forcedeth_probe(struct dev *dev, struct pci_device *pci)
-+{
-+	struct nic *nic = (struct nic *) dev;
-+	unsigned long addr;
-+	int sz;
-+	u8 *base;
-+
-+	if (pci->ioaddr == 0)
-+		return 0;
-+
-+	printf("forcedeth.c: Found %s, vendor=0x%hX, device=0x%hX\n",
-+	       pci->name, pci->vendor, pci->dev_id);
-+
-+	nic->irqno  = 0;
-+	nic->ioaddr = pci->ioaddr & ~3;
-+
-+	/* point to private storage */
-+	np = &npx;
-+
-+	adjust_pci_device(pci);
-+
-+	addr = pci_bar_start(pci, PCI_BASE_ADDRESS_0);
-+	sz = pci_bar_size(pci, PCI_BASE_ADDRESS_0);
-+
-+	/* BASE is used throughout to address the card */
-+	BASE = (unsigned long) ioremap(addr, sz);
-+	if (!BASE)
-+		return 0;
-+	//rx_ring[0] = rx_ring;
-+	//tx_ring[0] = tx_ring; 
-+
-+	/* read the mac address */
-+	base = (u8 *) BASE;
-+	np->orig_mac[0] = readl(base + NvRegMacAddrA);
-+	np->orig_mac[1] = readl(base + NvRegMacAddrB);
-+
-+	nic->node_addr[0] = (np->orig_mac[1] >> 8) & 0xff;
-+	nic->node_addr[1] = (np->orig_mac[1] >> 0) & 0xff;
-+	nic->node_addr[2] = (np->orig_mac[0] >> 24) & 0xff;
-+	nic->node_addr[3] = (np->orig_mac[0] >> 16) & 0xff;
-+	nic->node_addr[4] = (np->orig_mac[0] >> 8) & 0xff;
-+	nic->node_addr[5] = (np->orig_mac[0] >> 0) & 0xff;
-+#ifdef LINUX
-+	if (!is_valid_ether_addr(dev->dev_addr)) {
-+		/*
-+		 * Bad mac address. At least one bios sets the mac address
-+		 * to 01:23:45:67:89:ab
-+		 */
-+		printk(KERN_ERR
-+		       "%s: Invalid Mac address detected: %02x:%02x:%02x:%02x:%02x:%02x\n",
-+		       pci_name(pci_dev), dev->dev_addr[0],
-+		       dev->dev_addr[1], dev->dev_addr[2],
-+		       dev->dev_addr[3], dev->dev_addr[4],
-+		       dev->dev_addr[5]);
-+		printk(KERN_ERR
-+		       "Please complain to your hardware vendor. Switching to a random MAC.\n");
-+		dev->dev_addr[0] = 0x00;
-+		dev->dev_addr[1] = 0x00;
-+		dev->dev_addr[2] = 0x6c;
-+		get_random_bytes(&dev->dev_addr[3], 3);
-+	}
-+#endif
-+	printf("%s: MAC Address %!, ", pci->name, nic->node_addr);
-+
-+	np->tx_flags =
-+	    cpu_to_le16(NV_TX_LASTPACKET | NV_TX_LASTPACKET1 |
-+			NV_TX_VALID);
-+	switch (pci->dev_id) {
-+	case 0x01C3:		// nforce
-+		np->irqmask = NVREG_IRQMASK_WANTED_2;
-+		np->irqmask |= NVREG_IRQ_TIMER;
-+		break;
-+	case 0x0066:		// nforce2
-+		np->tx_flags |= cpu_to_le16(NV_TX_LASTPACKET1);
-+		np->irqmask = NVREG_IRQMASK_WANTED_2;
-+		np->irqmask |= NVREG_IRQ_TIMER;
-+		break;
-+	case 0x00D6:		// nforce3
-+		np->tx_flags |= cpu_to_le16(NV_TX_LASTPACKET1);
-+		np->irqmask = NVREG_IRQMASK_WANTED_2;
-+		np->irqmask |= NVREG_IRQ_TIMER;
-+
-+	}
-+	dprintf(("%s: forcedeth.c: subsystem: %hX:%hX bound to %s\n",
-+		 pci->name, pci->vendor, pci->dev_id, pci->name));
-+
-+	forcedeth_reset(nic);
-+//      if (board_found && valid_link)
-+	/* point to NIC specific routines */
-+	dev->disable = forcedeth_disable;
-+	nic->poll = forcedeth_poll;
-+	nic->transmit = forcedeth_transmit;
-+	nic->irq    = forcedeth_irq;
-+	return 1;
-+//      }
-+	/* else */
-+}
-+
-+static struct pci_id forcedeth_nics[] = {
-+	PCI_ROM(0x10de, 0x01C3, "nforce", "nForce Ethernet Controller"),
-+	PCI_ROM(0x10de, 0x0066, "nforce2", "nForce2 Ethernet Controller"),
-+	PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce3 Ethernet Controller"),
-+};
-+
-+struct pci_driver forcedeth_driver = {
-+	.type = NIC_DRIVER,
-+	.name = "forcedeth",
-+	.probe = forcedeth_probe,
-+	.ids = forcedeth_nics,
-+	.id_count = sizeof(forcedeth_nics) / sizeof(forcedeth_nics[0]),
-+	.class = 0,
-+};
-Index: b/netboot/fsys_tftp.c
-===================================================================
---- a/netboot/fsys_tftp.c
-+++ b/netboot/fsys_tftp.c
-@@ -29,14 +29,15 @@
- /* #define TFTP_DEBUG	1 */
- 
- #include <filesys.h>
-+#include <shared.h>
- 
--#define GRUB	1
--#include <etherboot.h>
--#include <nic.h>
-+#include "grub.h"
-+#include "tftp.h"
-+#include "nic.h"
- 
- static int retry;
- static unsigned short iport = 2000;
--static unsigned short oport;
-+static unsigned short oport = 0;
- static unsigned short block, prevblock;
- static int bcounter;
- static struct tftp_t tp, saved_tp;
-@@ -46,6 +47,172 @@
- static unsigned short len, saved_len;
- static char *buf;
- 
-+/**
-+ * tftp_read
-+ *
-+ * Read file with _name_, data handled by _fnc_. In fact, grub never
-+ * use it, we just use it to read dhcp config file.
-+ */
-+static int await_tftp(int ival, void *ptr __unused, 
-+		      unsigned short ptype __unused, struct iphdr *ip, 
-+		      struct udphdr *udp)
-+{
-+	if (!udp) {
-+		return 0;
-+	}
-+	if (arptable[ARP_CLIENT].ipaddr.s_addr != ip->dest.s_addr)
-+		return 0;
-+	if (ntohs(udp->dest) != ival)
-+		return 0;
-+	return 1;
-+}
-+
-+int tftp_file_read(const char *name, int (*fnc)(unsigned char *, unsigned int, unsigned int, int))
-+{
-+	struct tftpreq_t tp;
-+	struct tftp_t  *tr;
-+	int		rc;
-+
-+	retry = 0;
-+	block = 0;
-+	prevblock = 0;
-+	bcounter = 0;
-+	
-+
-+	rx_qdrain();
-+
-+	tp.opcode = htons(TFTP_RRQ);
-+	/* Warning: the following assumes the layout of bootp_t.
-+	   But that's fixed by the IP, UDP and BOOTP specs. */
-+	len = sizeof(tp.ip) + sizeof(tp.udp) + sizeof(tp.opcode) +
-+		sprintf((char *)tp.u.rrq, "%s%coctet%cblksize%c%d",
-+		name, 0, 0, 0, TFTP_MAX_PACKET) + 1;
-+	if (!udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr, ++iport,
-+			  TFTP_PORT, len, &tp))
-+		return (0);
-+	for (;;)
-+	{
-+		long timeout;
-+#ifdef	CONGESTED
-+		timeout = rfc2131_sleep_interval(block?TFTP_REXMT: TIMEOUT, retry);
-+#else
-+		timeout = rfc2131_sleep_interval(TIMEOUT, retry);
-+#endif
-+		if (!await_reply(await_tftp, iport, NULL, timeout))
-+		{
-+			if (!block && retry++ < MAX_TFTP_RETRIES)
-+			{	/* maybe initial request was lost */
-+				if (!udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr,
-+						  ++iport, TFTP_PORT, len, &tp))
-+					return (0);
-+				continue;
-+			}
-+#ifdef	CONGESTED
-+			if (block && ((retry += TFTP_REXMT) < TFTP_TIMEOUT))
-+			{	/* we resend our last ack */
-+#ifdef	MDEBUG
-+				printf("<REXMT>\n");
-+#endif
-+				udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr,
-+					     iport, oport,
-+					     TFTP_MIN_PACKET, &tp);
-+				continue;
-+			}
-+#endif
-+			break;	/* timeout */
-+		}
-+		tr = (struct tftp_t *)&nic.packet[ETH_HLEN];
-+		if (tr->opcode == ntohs(TFTP_ERROR))
-+		{
-+			printf("TFTP error %d (%s)\n",
-+			       ntohs(tr->u.err.errcode),
-+			       tr->u.err.errmsg);
-+			break;
-+		}
-+
-+		if (tr->opcode == ntohs(TFTP_OACK)) {
-+			char *p = tr->u.oack.data, *e;
-+
-+			if (prevblock)		/* shouldn't happen */
-+				continue;	/* ignore it */
-+			len = ntohs(tr->udp.len) - sizeof(struct udphdr) - 2;
-+			if (len > TFTP_MAX_PACKET)
-+				goto noak;
-+			e = p + len;
-+			while (*p != '\0' && p < e) {
-+/* 				if (!strcasecmp("blksize", p)) { */
-+				if (!grub_strcmp("blksize", p)) {
-+					p += 8;
-+/* 					if ((packetsize = strtoul(p, &p, 10)) < */
-+					if ((packetsize = getdec(&p)) < TFTP_DEFAULTSIZE_PACKET)
-+						goto noak;
-+					while (p < e && *p) p++;
-+					if (p < e)
-+						p++;
-+				}
-+				else {
-+				noak:
-+					tp.opcode = htons(TFTP_ERROR);
-+					tp.u.err.errcode = 8;
-+/*
-+ *	Warning: the following assumes the layout of bootp_t.
-+ *	But that's fixed by the IP, UDP and BOOTP specs.
-+ */
-+					len = sizeof(tp.ip) + sizeof(tp.udp) + sizeof(tp.opcode) + sizeof(tp.u.err.errcode) +
-+/*
-+ *	Normally bad form to omit the format string, but in this case
-+ *	the string we are copying from is fixed. sprintf is just being
-+ *	used as a strcpy and strlen.
-+ */
-+						sprintf((char *)tp.u.err.errmsg,
-+						"RFC1782 error") + 1;
-+					udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr,
-+						     iport, ntohs(tr->udp.src),
-+						     len, &tp);
-+					return (0);
-+				}
-+			}
-+			if (p > e)
-+				goto noak;
-+			block = tp.u.ack.block = 0; /* this ensures, that */
-+						/* the packet does not get */
-+						/* processed as data! */
-+		}
-+		else if (tr->opcode == htons(TFTP_DATA)) {
-+			len = ntohs(tr->udp.len) - sizeof(struct udphdr) - 4;
-+			if (len > packetsize)	/* shouldn't happen */
-+				continue;	/* ignore it */
-+			block = ntohs(tp.u.ack.block = tr->u.data.block); }
-+		else {/* neither TFTP_OACK nor TFTP_DATA */
-+			break;
-+		}
-+
-+		if ((block || bcounter) && (block != (unsigned short)(prevblock+1))) {
-+			/* Block order should be continuous */
-+			tp.u.ack.block = htons(block = prevblock);
-+		}
-+		tp.opcode = htons(TFTP_ACK);
-+		oport = ntohs(tr->udp.src);
-+		udp_transmit(arptable[ARP_SERVER].ipaddr.s_addr, iport,
-+			     oport, TFTP_MIN_PACKET, &tp);	/* ack */
-+		if ((unsigned short)(block-prevblock) != 1) {
-+			/* Retransmission or OACK, don't process via callback
-+			 * and don't change the value of prevblock.  */
-+			continue;
-+		}
-+		prevblock = block;
-+		retry = 0;	/* It's the right place to zero the timer? */
-+		if ((rc = fnc(tr->u.data.download,
-+			      ++bcounter, len, len < packetsize)) <= 0)
-+			return(rc);
-+		if (len < packetsize) {	/* End of data --- fnc should not have returned */
-+			printf("tftp download complete, but\n");
-+			return (1);
-+		}
-+	}
-+	return (0);
-+}
-+
- /* Fill the buffer by receiving the data via the TFTP protocol.  */
- static int
- buf_fill (int abort)
-@@ -65,9 +232,9 @@
-       timeout = rfc2131_sleep_interval (TIMEOUT, retry);
- #endif
-   
--      if (! await_reply (AWAIT_TFTP, iport, NULL, timeout))
-+      if (! await_reply (await_tftp, iport, NULL, timeout))
- 	{
--	  if (ip_abort)
-+	  if (user_abort)
- 	    return 0;
- 
- 	  if (! block && retry++ < MAX_TFTP_RETRIES)
-@@ -270,13 +437,7 @@
-   buf_read = 0;
-   saved_filepos = 0;
- 
--  /* Clear out the Rx queue first.  It contains nothing of interest,
--   * except possibly ARP requests from the DHCP/TFTP server.  We use
--   * polling throughout Etherboot, so some time may have passed since we
--   * last polled the receive queue, which may now be filled with
--   * broadcast packets.  This will cause the reply to the packets we are
--   * about to send to be lost immediately.  Not very clever.  */
--  await_reply (AWAIT_QDRAIN, 0, NULL, 0);
-+  rx_qdrain();
-   
- #ifdef TFTP_DEBUG
-   grub_printf ("send_rrq ()\n");
-Index: b/netboot/grub.h
-===================================================================
---- /dev/null
-+++ b/netboot/grub.h
-@@ -0,0 +1,171 @@
-+#ifndef GRUB_H
-+#define GRUB_H
-+
-+#include "osdep.h"
-+#include "byteswap.h"
-+#include "in.h"
-+#include "ip.h"
-+#include "udp.h"
-+#include "if_ether.h"
-+#include "latch.h"
-+#include "io.h"
-+#include "nic.h"
-+#include <shared.h>
-+
-+#define K_ESC		'\033'
-+#define K_EOF		'\04'  /* Ctrl-D */
-+#define K_INTR		'\03'  /* Ctrl-C */
-+
-+#ifndef	MAX_RPC_RETRIES
-+#define MAX_RPC_RETRIES		20
-+#endif
-+
-+
-+/* Inter-packet retry in ticks */
-+#ifndef TIMEOUT
-+#define TIMEOUT			(10*TICKS_PER_SEC)
-+#endif
-+
-+#ifndef	NULL
-+#define NULL	((void *)0)
-+#endif
-+
-+
-+#define ARP_CLIENT	0
-+#define ARP_SERVER	1
-+#define ARP_GATEWAY	2
-+#define MAX_ARP		ARP_GATEWAY+1
-+
-+#define IGMP_SERVER	0
-+#define MAX_IGMP	IGMP_SERVER+1
-+
-+#define	RARP_REQUEST	3
-+#define	RARP_REPLY	4
-+
-+
-+#define MULTICAST_MASK    0xF0000000
-+#define MULTICAST_NETWORK 0xE0000000
-+
-+struct arptable_t {
-+	in_addr ipaddr;
-+	uint8_t node[6];
-+};
-+
-+struct igmptable_t {
-+	in_addr group;
-+	unsigned long time;
-+};
-+
-+#define	KERNEL_BUF	(BOOTP_DATA_ADDR->bootp_reply.bp_file)
-+
-+#define	FLOPPY_BOOT_LOCATION	0x7c00
-+/* Must match offsets in loader.S */
-+#define ROM_SEGMENT		0x1fa
-+#define ROM_LENGTH		0x1fc
-+
-+#define	ROM_INFO_LOCATION	(FLOPPY_BOOT_LOCATION+ROM_SEGMENT)
-+/* at end of floppy boot block */
-+
-+
-+
-+/* Define a type for passing info to a loaded program */
-+struct ebinfo {
-+	uint8_t  major, minor;	/* Version */
-+	uint16_t flags;		/* Bit flags */
-+};
-+
-+/***************************************************************************
-+External prototypes
-+***************************************************************************/
-+extern void rx_qdrain P((void));
-+extern int tftp P((const char *name, int (*)(unsigned char *, unsigned int, unsigned int, int)));
-+extern int ip_transmit P((int len, const void *buf));
-+extern void build_ip_hdr P((unsigned long destip, int ttl, int protocol, 
-+	int option_len, int len, const void *buf));
-+extern void build_udp_hdr P((unsigned long destip, 
-+	unsigned int srcsock, unsigned int destsock, int ttl,
-+	int len, const void *buf));
-+extern int udp_transmit P((unsigned long destip, unsigned int srcsock,
-+	unsigned int destsock, int len, const void *buf));
-+typedef int (*reply_t)(int ival, void *ptr, unsigned short ptype, struct iphdr *ip, struct udphdr *udp);
-+extern int await_reply P((reply_t reply,	int ival, void *ptr, long timeout));
-+extern int decode_rfc1533 P((unsigned char *, unsigned int, unsigned int, int));
-+extern void join_group(int slot, unsigned long group);
-+extern void leave_group(int slot);
-+#define RAND_MAX 2147483647L
-+extern uint16_t ipchksum P((const void *ip, unsigned long len));
-+extern uint16_t add_ipchksums P((unsigned long offset, uint16_t sum, uint16_t new));
-+extern int32_t random P((void));
-+extern long rfc2131_sleep_interval P((long base, int exp));
-+extern long rfc1112_sleep_interval P((long base, int exp));
-+#ifndef DOWNLOAD_PROTO_TFTP
-+#define	tftp(fname, load_block) 0
-+#endif
-+extern void cleanup P((void));
-+
-+/* misc.c */
-+extern void twiddle P((void));
-+extern void sleep P((int secs));
-+extern void interruptible_sleep P((int secs));
-+extern void poll_interruptions P((void));
-+extern int strcasecmp P((const char *a, const char *b));
-+extern char *substr P((const char *a, const char *b));
-+extern unsigned long strtoul P((const char *p, const char **, int base));
-+extern void printf P((const char *, ...));
-+extern int sprintf P((char *, const char *, ...));
-+extern int inet_aton P((char *p, in_addr *i));
-+extern void putchar P((int));
-+extern int getchar P((void));
-+extern int iskey P((void));
-+
-+extern void grub_printf(const char *, ...);
-+extern char config_file[128];
-+extern void etherboot_printf(const char *,  ...);
-+extern int etherboot_sprintf(char *, const char *, ...);
-+extern int getdec(char **s);
-+extern void cleanup_net(void);
-+extern void print_network_configuration (void);
-+extern int ifconfig (char *, char *, char *, char *);
-+extern struct arptable_t arptable[MAX_ARP];
-+
-+#undef printf
-+#undef sprintf
-+#define printf etherboot_printf
-+#define sprintf etherboot_sprintf
-+
-+#ifdef DEBUG
-+#define EnterFunction(func) printf("Enter: " func "\n");
-+#define LeaveFunction(func) printf("Leave: " func "\n");
-+#else
-+#define EnterFunction(func)
-+#define LeaveFunction(func)
-+#endif
-+
-+/*
-+ * Some codes from etherboot use a level in DEBUG. Define it to be
-+ * zero means no debug info output, that will make them silence in
-+ * compiling. Up it as you want.
-+ */
-+#ifndef DEBUG
-+#  define DEBUG 0
-+#endif
-+
-+/*#define RPC_DEBUG*/
-+
-+extern char *hostname;
-+
-+extern int hostnamelen;
-+/* Whether network is ready */
-+extern int network_ready;
-+
-+/* User aborted in await_reply if not zero */
-+extern int user_abort;
-+
-+extern int rarp(void);
-+extern int grub_eth_probe(void);
-+extern int bootp(void);
-+
-+extern int dhcp(void);
-+
-+extern struct nic nic;
-+#endif /* GRUB_H */
-Index: b/netboot/i386_byteswap.h
-===================================================================
---- /dev/null
-+++ b/netboot/i386_byteswap.h
-@@ -0,0 +1,46 @@
-+#ifndef ETHERBOOT_BITS_BYTESWAP_H
-+#define ETHERBOOT_BITS_BYTESWAP_H
-+
-+#include "types.h"
-+static inline uint16_t __i386_bswap_16(uint16_t x)
-+{
-+	__asm__("xchgb %b0,%h0\n\t"
-+		: "=q" (x)
-+		: "0" (x));
-+	return x;
-+}
-+
-+static inline uint32_t __i386_bswap_32(uint32_t x)
-+{
-+	__asm__("xchgb %b0,%h0\n\t"
-+		"rorl $16,%0\n\t"
-+		"xchgb %b0,%h0"
-+		: "=q" (x)
-+		: "0" (x));
-+	return x;
-+}
-+
-+
-+#define __bswap_constant_16(x) \
-+	((uint16_t)((((uint16_t)(x) & 0x00ff) << 8) | \
-+		(((uint16_t)(x) & 0xff00) >> 8)))
-+
-+#define __bswap_constant_32(x) \
-+	((uint32_t)((((uint32_t)(x) & 0x000000ffU) << 24) | \
-+		(((uint32_t)(x) & 0x0000ff00U) <<  8) | \
-+		(((uint32_t)(x) & 0x00ff0000U) >>  8) | \
-+		(((uint32_t)(x) & 0xff000000U) >> 24)))
-+
-+#define __bswap_16(x) \
-+	(__builtin_constant_p(x) ? \
-+	__bswap_constant_16(x) : \
-+	__i386_bswap_16(x))
-+
-+
-+#define __bswap_32(x) \
-+	(__builtin_constant_p(x) ? \
-+	__bswap_constant_32(x) : \
-+	__i386_bswap_32(x))
-+
-+
-+#endif /* ETHERBOOT_BITS_BYTESWAP_H */
-Index: b/netboot/i386_elf.h
-===================================================================
---- /dev/null
-+++ b/netboot/i386_elf.h
-@@ -0,0 +1,91 @@
-+#ifndef I386_BITS_ELF_H
-+#define I386_BITS_ELF_H
-+
-+#include "cpu.h"
-+
-+#ifdef CONFIG_X86_64
-+/* ELF Defines for the 64bit version of the current architecture */
-+#define EM_CURRENT_64	EM_X86_64
-+#define EM_CURRENT_64_PRESENT ( \
-+	CPU_FEATURE_P(cpu_info.x86_capability, LM) && \
-+	CPU_FEATURE_P(cpu_info.x86_capability, PAE) && \
-+	CPU_FEATURE_P(cpu_info.x86_capability, PSE))
-+			
-+#define ELF_CHECK_X86_64_ARCH(x) \
-+	(EM_CURRENT_64_PRESENT && ((x).e_machine == EM_X86_64))
-+#define __unused_i386
-+#else
-+#define ELF_CHECK_X86_64_ARCH(x) 0
-+#define __unused_i386 __unused
-+#endif
-+
-+
-+/* ELF Defines for the current architecture */
-+#define	EM_CURRENT	EM_386
-+#define ELFDATA_CURRENT	ELFDATA2LSB
-+
-+#define ELF_CHECK_I386_ARCH(x) \
-+	(((x).e_machine == EM_386) || ((x).e_machine == EM_486))
-+
-+#define ELF_CHECK_ARCH(x) \
-+	((ELF_CHECK_I386_ARCH(x) || ELF_CHECK_X86_64_ARCH(x)) && \
-+		((x).e_entry <= 0xffffffffUL))
-+
-+#ifdef  IMAGE_FREEBSD
-+/*
-+ * FreeBSD has this rather strange "feature" of its design.
-+ * At some point in its evolution, FreeBSD started to rely
-+ * externally on private/static/debug internal symbol information.
-+ * That is, some of the interfaces that software uses to access
-+ * and work with the FreeBSD kernel are made available not
-+ * via the shared library symbol information (the .DYNAMIC section)
-+ * but rather the debug symbols.  This means that any symbol, not
-+ * just publicly defined symbols can be (and are) used by system
-+ * tools to make the system work.  (such as top, swapinfo, swapon,
-+ * etc)
-+ *
-+ * Even worse, however, is the fact that standard ELF loaders do
-+ * not know how to load the symbols since they are not within
-+ * an ELF PT_LOAD section.  The kernel needs these symbols to
-+ * operate so the following changes/additions to the boot
-+ * loading of EtherBoot have been made to get the kernel to load.
-+ * All of the changes are within IMAGE_FREEBSD such that the
-+ * extra/changed code only compiles when FREEBSD support is
-+ * enabled.
-+ */
-+
-+/*
-+ * Section header for FreeBSD (debug symbol kludge!) support
-+ */
-+typedef struct {
-+	Elf32_Word	sh_name;	/* Section name (index into the
-+					   section header string table). */
-+	Elf32_Word	sh_type;	/* Section type. */
-+	Elf32_Word	sh_flags;	/* Section flags. */
-+	Elf32_Addr	sh_addr;	/* Address in memory image. */
-+	Elf32_Off	sh_offset;	/* Offset in file. */
-+	Elf32_Size	sh_size;	/* Size in bytes. */
-+	Elf32_Word	sh_link;	/* Index of a related section. */
-+	Elf32_Word	sh_info;	/* Depends on section type. */
-+	Elf32_Size	sh_addralign;	/* Alignment in bytes. */
-+	Elf32_Size	sh_entsize;	/* Size of each entry in section. */
-+} Elf32_Shdr;
-+
-+/* sh_type */
-+#define SHT_SYMTAB	2		/* symbol table section */
-+#define SHT_STRTAB	3		/* string table section */
-+
-+/*
-+ * Module information subtypes (for the metadata that we need to build)
-+ */
-+#define MODINFO_END		0x0000		/* End of list */
-+#define MODINFO_NAME		0x0001		/* Name of module (string) */
-+#define MODINFO_TYPE		0x0002		/* Type of module (string) */
-+#define MODINFO_METADATA	0x8000		/* Module-specfic */
-+
-+#define MODINFOMD_SSYM		0x0003		/* start of symbols */
-+#define MODINFOMD_ESYM		0x0004		/* end of symbols */
-+
-+#endif	/* IMAGE_FREEBSD */
-+
-+#endif /* I386_BITS_ELF_H */
-Index: b/netboot/i386_endian.h
-===================================================================
---- /dev/null
-+++ b/netboot/i386_endian.h
-@@ -0,0 +1,6 @@
-+#ifndef ETHERBOOT_BITS_ENDIAN_H
-+#define ETHERBOOT_BITS_ENDIAN_H
-+
-+#define __BYTE_ORDER __LITTLE_ENDIAN
-+
-+#endif /* ETHERBOOT_BITS_ENDIAN_H */
-Index: b/netboot/i386_timer.c
-===================================================================
---- /dev/null
-+++ b/netboot/i386_timer.c
-@@ -0,0 +1,192 @@
-+/* A couple of routines to implement a low-overhead timer for drivers */
-+
-+ /*
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2, or (at
-+ * your option) any later version.
-+ */
-+#include "grub.h"
-+#include "osdep.h"
-+#include "io.h"
-+#include "timer.h"
-+#include "latch.h"
-+
-+void __load_timer2(unsigned int ticks)
-+{
-+	/*
-+	 * Now let's take care of PPC channel 2
-+	 *
-+	 * Set the Gate high, program PPC channel 2 for mode 0,
-+	 * (interrupt on terminal count mode), binary count,
-+	 * load 5 * LATCH count, (LSB and MSB) to begin countdown.
-+	 *
-+	 * Note some implementations have a bug where the high bits byte
-+	 * of channel 2 is ignored.
-+	 */
-+	/* Set up the timer gate, turn off the speaker */
-+	/* Set the Gate high, disable speaker */
-+	outb((inb(PPC_PORTB) & ~PPCB_SPKR) | PPCB_T2GATE, PPC_PORTB);
-+	/* binary, mode 0, LSB/MSB, Ch 2 */
-+	outb(TIMER2_SEL|WORD_ACCESS|MODE0|BINARY_COUNT, TIMER_MODE_PORT);
-+	/* LSB of ticks */
-+	outb(ticks & 0xFF, TIMER2_PORT);
-+	/* MSB of ticks */
-+	outb(ticks >> 8, TIMER2_PORT);
-+}
-+
-+static int __timer2_running(void)
-+{
-+	return ((inb(PPC_PORTB) & PPCB_T2OUT) == 0);
-+}
-+
-+#if !defined(CONFIG_TSC_CURRTICKS)
-+void setup_timers(void)
-+{
-+	return;
-+}
-+
-+void load_timer2(unsigned int ticks)
-+{
-+	return __load_timer2(ticks);
-+}
-+
-+int timer2_running(void)
-+{
-+	return __timer2_running();
-+}
-+
-+void ndelay(unsigned int nsecs)
-+{
-+	waiton_timer2((nsecs * CLOCK_TICK_RATE)/1000000000);
-+}
-+void udelay(unsigned int usecs)
-+{
-+	waiton_timer2((usecs * TICKS_PER_MS)/1000);
-+}
-+#endif /* !defined(CONFIG_TSC_CURRTICKS) */
-+
-+#if defined(CONFIG_TSC_CURRTICKS)
-+
-+#define rdtsc(low,high) \
-+     __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
-+
-+#define rdtscll(val) \
-+     __asm__ __volatile__ ("rdtsc" : "=A" (val))
-+
-+
-+/* Number of clock ticks to time with the rtc */
-+#define LATCH 0xFF
-+
-+#define LATCHES_PER_SEC ((CLOCK_TICK_RATE + (LATCH/2))/LATCH)
-+#define TICKS_PER_LATCH ((LATCHES_PER_SEC + (TICKS_PER_SEC/2))/TICKS_PER_SEC)
-+
-+static void sleep_latch(void)
-+{
-+	__load_timer2(LATCH);
-+	while(__timer2_running());
-+}
-+
-+/* ------ Calibrate the TSC ------- 
-+ * Time how long it takes to excute a loop that runs in known time.
-+ * And find the convertion needed to get to CLOCK_TICK_RATE
-+ */
-+
-+
-+static unsigned long long calibrate_tsc(void)
-+{
-+	unsigned long startlow, starthigh;
-+	unsigned long endlow, endhigh;
-+	
-+	rdtsc(startlow,starthigh);
-+	sleep_latch();
-+	rdtsc(endlow,endhigh);
-+
-+	/* 64-bit subtract - gcc just messes up with long longs */
-+	__asm__("subl %2,%0\n\t"
-+		"sbbl %3,%1"
-+		:"=a" (endlow), "=d" (endhigh)
-+		:"g" (startlow), "g" (starthigh),
-+		"0" (endlow), "1" (endhigh));
-+	
-+	/* Error: ECPUTOOFAST */
-+	if (endhigh)
-+		goto bad_ctc;
-+	
-+	endlow *= TICKS_PER_LATCH;
-+	return endlow;
-+
-+	/*
-+	 * The CTC wasn't reliable: we got a hit on the very first read,
-+	 * or the CPU was so fast/slow that the quotient wouldn't fit in
-+	 * 32 bits..
-+	 */
-+bad_ctc:
-+	printf("bad_ctc\n");
-+	return 0;
-+}
-+
-+static unsigned long clocks_per_tick;
-+void setup_timers(void)
-+{
-+	if (!clocks_per_tick) {
-+		clocks_per_tick = calibrate_tsc();
-+		/* Display the CPU Mhz to easily test if the calibration was bad */
-+		printf("CPU %ld Mhz\n", (clocks_per_tick/1000 * TICKS_PER_SEC)/1000);
-+	}
-+}
-+
-+unsigned long currticks(void)
-+{
-+	unsigned long clocks_high, clocks_low;
-+	unsigned long currticks;
-+	/* Read the Time Stamp Counter */
-+	rdtsc(clocks_low, clocks_high);
-+
-+	/* currticks = clocks / clocks_per_tick; */
-+	__asm__("divl %1"
-+		:"=a" (currticks)
-+		:"r" (clocks_per_tick), "0" (clocks_low), "d" (clocks_high));
-+
-+
-+	return currticks;
-+}
-+
-+static unsigned long long timer_timeout;
-+static int __timer_running(void)
-+{
-+	unsigned long long now;
-+	rdtscll(now);
-+	return now < timer_timeout;
-+}
-+
-+void udelay(unsigned int usecs)
-+{
-+	unsigned long long now;
-+	rdtscll(now);
-+	timer_timeout = now + usecs * ((clocks_per_tick * TICKS_PER_SEC)/(1000*1000));
-+	while(__timer_running());
-+}
-+void ndelay(unsigned int nsecs)
-+{
-+	unsigned long long now;
-+	rdtscll(now);
-+	timer_timeout = now + nsecs * ((clocks_per_tick * TICKS_PER_SEC)/(1000*1000*1000));
-+	while(__timer_running());
-+}
-+
-+void load_timer2(unsigned int timer2_ticks)
-+{
-+	unsigned long long now;
-+	unsigned long clocks;
-+	rdtscll(now);
-+	clocks = timer2_ticks * ((clocks_per_tick * TICKS_PER_SEC)/CLOCK_TICK_RATE);
-+	timer_timeout = now + clocks;
-+}
-+
-+int timer2_running(void)
-+{
-+	return __timer_running();
-+}
-+
-+#endif /* RTC_CURRTICKS */
-Index: b/netboot/i82586.c
-===================================================================
---- a/netboot/i82586.c
-+++ /dev/null
-@@ -1,825 +0,0 @@
--/**************************************************************************
--Etherboot -  BOOTP/TFTP Bootstrap Program
--i82586 NIC driver for Etherboot
--Ken Yap, January 1998
--***************************************************************************/
--
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
--#include "etherboot.h"
--#include "nic.h"
--#include "cards.h"
--#include "timer.h"
--
--#define	udelay(n)	waiton_timer2(((n)*TICKS_PER_MS)/1000)
--
--/* Sources of information:
--
--   Donald Becker's excellent 3c507 driver in Linux
--   Intel 82596 data sheet (yes, 82596; it has a 586 compatibility mode)
--*/
--
--/* Code below mostly stolen wholesale from 3c507.c driver in Linux */
--
--/*
--		Details of the i82586.
--
--   You'll really need the databook to understand the details of this part,
--   but the outline is that the i82586 has two separate processing units.
--   Both are started from a list of three configuration tables, of which only
--   the last, the System Control Block (SCB), is used after reset-time.  The SCB
--   has the following fields:
--		Status word
--		Command word
--		Tx/Command block addr.
--		Rx block addr.
--   The command word accepts the following controls for the Tx and Rx units:
--  */
--
--#define	CUC_START	0x0100
--#define	CUC_RESUME	0x0200
--#define	CUC_SUSPEND	0x0300
--#define	RX_START	0x0010
--#define	RX_RESUME	0x0020
--#define	RX_SUSPEND	0x0030
--
--/* The Rx unit uses a list of frame descriptors and a list of data buffer
--   descriptors.  We use full-sized (1518 byte) data buffers, so there is
--   a one-to-one pairing of frame descriptors to buffer descriptors.
--
--   The Tx ("command") unit executes a list of commands that look like:
--	Status word	Written by the 82586 when the command is done.
--	Command word	Command in lower 3 bits, post-command action in upper 3
--	Link word	The address of the next command.
--	Parameters	(as needed).
--
--	Some definitions related to the Command Word are:
-- */
--#define CMD_EOL		0x8000		/* The last command of the list, stop. */
--#define CMD_SUSP	0x4000		/* Suspend after doing cmd. */
--#define CMD_INTR	0x2000		/* Interrupt after doing cmd. */
--
--enum commands {
--	CmdNOp = 0, CmdSASetup = 1, CmdConfigure = 2, CmdMulticastList = 3,
--	CmdTx = 4, CmdTDR = 5, CmdDump = 6, CmdDiagnose = 7};
--
--/*
--		Details of the EtherLink16 Implementation
--
--  The 3c507 and NI5210 are generic shared-memory i82586 implementations.
--  3c507: The host can map 16K, 32K, 48K, or 64K of the 64K memory into
--  0x0[CD][08]0000, or all 64K into 0xF[02468]0000.
--  NI5210: The host can map 8k or 16k at 0x[CDE][048C]000 but we
--  assume 8k because to have 16k you cannot put a ROM on the NIC.
--  */
--
--/* Offsets from the base I/O address. */
--
--#ifdef	INCLUDE_3C507
--
--#define	SA_DATA		0	/* Station address data, or 3Com signature. */
--#define MISC_CTRL	6	/* Switch the SA_DATA banks, and bus config bits. */
--#define RESET_IRQ	10	/* Reset the latched IRQ line. */
--#define I82586_ATTN	11	/* Frob the 82586 Channel Attention line. */
--#define ROM_CONFIG	13
--#define MEM_CONFIG	14
--#define IRQ_CONFIG	15
--#define EL16_IO_EXTENT	16
--
--/* The ID port is used at boot-time to locate the ethercard. */
--#define ID_PORT		0x100
--
--#endif
--
--#ifdef	INCLUDE_NI5210
--
--#define	NI52_RESET	0  /* writing to this address, resets the i82586 */
--#define	I82586_ATTN	1  /* channel attention, kick the 586 */
--
--#endif
--
--#ifdef	INCLUDE_EXOS205
--
--#define	EXOS205_RESET	0  /* writing to this address, resets the i82586 */
--#define	I82586_ATTN	1  /* channel attention, kick the 586 */
--
--#endif
--
--/* Offsets to registers in the mailbox (SCB). */
--#define iSCB_STATUS	0x8
--#define iSCB_CMD	0xA
--#define iSCB_CBL	0xC	/* Command BLock offset. */
--#define iSCB_RFA	0xE	/* Rx Frame Area offset. */
--
--/*  Since the 3c507 maps the shared memory window so that the last byte is
--at 82586 address FFFF, the first byte is at 82586 address 0, 16K, 32K, or
--48K corresponding to window sizes of 64K, 48K, 32K and 16K respectively.
--We can account for this be setting the 'SBC Base' entry in the ISCP table
--below for all the 16 bit offset addresses, and also adding the 'SCB Base'
--value to all 24 bit physical addresses (in the SCP table and the TX and RX
--Buffer Descriptors).
--				-Mark
--*/
--
--/*
--  What follows in 'init_words[]' is the "program" that is downloaded to the
--  82586 memory.  It's mostly tables and command blocks, and starts at the
--  reset address 0xfffff6.  This is designed to be similar to the EtherExpress,
--  thus the unusual location of the SCB at 0x0008.
--
--  Even with the additional "don't care" values, doing it this way takes less
--  program space than initializing the individual tables, and I feel it's much
--  cleaner.
--
--  The databook is particularly useless for the first two structures, I had
--  to use the Crynwr driver as an example.
--
--  The memory setup is as follows:
--*/
--
--#define CONFIG_CMD	0x18
--#define SET_SA_CMD	0x24
--#define SA_OFFSET	0x2A
--#define IDLELOOP	0x30
--#define TDR_CMD		0x38
--#define TDR_TIME	0x3C
--#define DUMP_CMD	0x40
--#define DIAG_CMD	0x48
--#define SET_MC_CMD	0x4E
--#define DUMP_DATA	0x56	/* A 170 byte buffer for dump and Set-MC into. */
--
--#define TX_BUF_START	0x0100
--#define TX_BUF_SIZE	(1518+14+20+16) /* packet+header+TBD */
--
--#define RX_BUF_START	0x1000
--#define RX_BUF_SIZE	(1518+14+18)	/* packet+header+RBD */
--#define RX_BUF_END	(mem_end - mem_start - 20)
--
--/*
--  That's it: only 86 bytes to set up the beast, including every extra
--  command available.  The 170 byte buffer at DUMP_DATA is shared between the
--  Dump command (called only by the diagnostic program) and the SetMulticastList
--  command.
--
--  To complete the memory setup you only have to write the station address at
--  SA_OFFSET and create the Tx & Rx buffer lists.
--
--  The Tx command chain and buffer list is setup as follows:
--  A Tx command table, with the data buffer pointing to...
--  A Tx data buffer descriptor.  The packet is in a single buffer, rather than
--	chaining together several smaller buffers.
--  A NoOp command, which initially points to itself,
--  And the packet data.
--
--  A transmit is done by filling in the Tx command table and data buffer,
--  re-writing the NoOp command, and finally changing the offset of the last
--  command to point to the current Tx command.  When the Tx command is finished,
--  it jumps to the NoOp, when it loops until the next Tx command changes the
--  "link offset" in the NoOp.  This way the 82586 never has to go through the
--  slow restart sequence.
--
--  The Rx buffer list is set up in the obvious ring structure.  We have enough
--  memory (and low enough interrupt latency) that we can avoid the complicated
--  Rx buffer linked lists by alway associating a full-size Rx data buffer with
--  each Rx data frame.
--
--  I currently use one transmit buffer starting at TX_BUF_START (0x0100), and
--  use the rest of memory, from RX_BUF_START to RX_BUF_END, for Rx buffers.
--
--  */
--
--static unsigned short init_words[] = {
--	/*	System Configuration Pointer (SCP). */
--#if	defined(INCLUDE_3C507)
--	0x0000,					/* Set bus size to 16 bits. */
--#else
--	0x0001,					/* Set bus size to 8 bits */
--#endif
--	0,0,					/* pad words. */
--	0x0000,0x0000,				/* ISCP phys addr, set in init_82586_mem(). */
--
--	/*	Intermediate System Configuration Pointer (ISCP). */
--	0x0001,					/* Status word that's cleared when init is done. */
--	0x0008,0,0,				/* SCB offset, (skip, skip) */
--
--	/* System Control Block (SCB). */
--	0,0xf000|RX_START|CUC_START,		/* SCB status and cmd. */
--	CONFIG_CMD,				/* Command list pointer, points to Configure. */
--	RX_BUF_START,				/* Rx block list. */
--	0,0,0,0,				/* Error count: CRC, align, buffer, overrun. */
--
--	/* 0x0018: Configure command.  Change to put MAC data with packet. */
--	0, CmdConfigure,			/* Status, command. */
--	SET_SA_CMD,				/* Next command is Set Station Addr. */
--	0x0804,					/* "4" bytes of config data, 8 byte FIFO. */
--	0x2e40,					/* Magic values, including MAC data location. */
--	0,					/* Unused pad word. */
--
--	/* 0x0024: Setup station address command. */
--	0, CmdSASetup,
--	SET_MC_CMD,				/* Next command. */
--	0xaa00,0xb000,0x0bad,	/* Station address (to be filled in) */
--
--	/* 0x0030: NOP, looping back to itself.  Point to first Tx buffer to Tx. */
--	0, CmdNOp, IDLELOOP, 0 /* pad */,
--
--	/* 0x0038: A unused Time-Domain Reflectometer command. */
--	0, CmdTDR, IDLELOOP, 0,
--
--	/* 0x0040: An unused Dump State command. */
--	0, CmdDump, IDLELOOP, DUMP_DATA,
--
--	/* 0x0048: An unused Diagnose command. */
--	0, CmdDiagnose, IDLELOOP,
--
--	/* 0x004E: An empty set-multicast-list command. */
--	0, CmdMulticastList, IDLELOOP, 0,
--};
--
--/* NIC specific static variables go here */
--
--static unsigned short		ioaddr, irq, scb_base;
--static Address			mem_start, mem_end;
--static unsigned short		rx_head, rx_tail;
--
--#define	read_mem(m,s)	fmemcpy((char *)s, m, sizeof(s))
--
--static void setup_rx_buffers(struct nic *nic)
--{
--	Address			write_ptr;
--	unsigned short		cur_rx_buf;
--	static unsigned short	rx_cmd[16] = {
--		0x0000,			/* Rx status */
--		0x0000,			/* Rx command, only and last */
--		RX_BUF_START,		/* Link (will be adjusted) */
--		RX_BUF_START + 22,	/* Buffer offset (will be adjusted) */
--		0x0000, 0x0000, 0x0000,	/* Pad for dest addr */
--		0x0000, 0x0000, 0x0000,	/* Pad for source addr */
--		0x0000,			/* Pad for protocol */
--		0x0000,			/* Buffer: Actual count */
--		-1,			/* Buffer: Next (none) */
--		RX_BUF_START + 0x20,	/* Buffer: Address low (+ scb_base) (will be adjusted) */
--		0x0000,			/* Buffer: Address high */
--		0x8000 | (RX_BUF_SIZE - 0x20)
--	};
--
--	cur_rx_buf = rx_head = RX_BUF_START;
--	do {		/* While there is room for one more buffer */
--		write_ptr = mem_start + cur_rx_buf;
--		/* adjust some contents */
--		rx_cmd[1] = 0x0000;
--		rx_cmd[2] = cur_rx_buf + RX_BUF_SIZE;
--		rx_cmd[3] = cur_rx_buf + 22;
--		rx_cmd[13] = cur_rx_buf + 0x20 + scb_base;
--		memcpy((char *)write_ptr, (char *)rx_cmd, sizeof(rx_cmd));
--		rx_tail = cur_rx_buf;
--		cur_rx_buf += RX_BUF_SIZE;
--	} while (cur_rx_buf <= RX_BUF_END - RX_BUF_SIZE);
--	/* Terminate the list by setting the EOL bit and wrap ther pointer
--	   to make the list a ring. */
--	write_ptr = mem_start + rx_tail;
--	rx_cmd[1] = 0xC000;
--	rx_cmd[2] = rx_head;
--	memcpy((char *)write_ptr, (char *)rx_cmd, sizeof(unsigned short) * 3);
--}
--
--static void ack_status(void)
--{
--	unsigned short	cmd, status;
--	unsigned short	*shmem = (short *)mem_start;
--
--	cmd = (status = shmem[iSCB_STATUS>>1]) & 0xf000;
--	if (status & 0x100)		/* CU suspended? */
--		cmd |= CUC_RESUME;
--	if ((status & 0x200) == 0)	/* CU not active? */
--		cmd |= CUC_START;
--	if (status & 0x010)		/* RU suspended? */
--		cmd |= RX_RESUME;
--	else if ((status & 0x040) == 0)	/* RU not active? */
--		cmd |= RX_START;
--	if (cmd == 0)			/* Nothing to do */
--		return;
--	shmem[iSCB_CMD>>1] = cmd;
--#if	defined(DEBUG)
--	printf("Status %hX Command %hX\n", status, cmd);
--#endif
--	outb(0, ioaddr + I82586_ATTN);
--}
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--
--static void i82586_reset(struct nic *nic)
--{
--	unsigned long	time;
--	unsigned short	*shmem = (short *)mem_start;
--
--	/* put the card in its initial state */
--
--#ifdef	INCLUDE_3C507
--	/* Enable loopback to protect the wire while starting up,
--	   and hold the 586 in reset during the memory initialisation. */
--	outb(0x20, ioaddr + MISC_CTRL);
--#endif
--
--	/* Fix the ISCP address and base. */
--	init_words[3] = scb_base;
--	init_words[7] = scb_base;
--
--	/* Write the words at 0xfff6. */
--	/* Write the words at 0x0000. */
--	/* Fill in the station address. */
--	memcpy((char *)(mem_end - 10), (char *)init_words, 10);
--	memcpy((char *)mem_start, (char *)&init_words[5], sizeof(init_words) - 10);
--	memcpy((char *)mem_start + SA_OFFSET, nic->node_addr, ETH_ALEN);
--	setup_rx_buffers(nic);
--
--#ifdef	INCLUDE_3C507
--	/* Start the 586 by releasing the reset line, but leave loopback. */
--	outb(0xA0, ioaddr + MISC_CTRL);
--#endif
--
--	/* This was time consuming to track down; you need to give two channel
--	   attention signals to reliably start up the i82586. */
--	outb(0, ioaddr + I82586_ATTN);
--	time = currticks() + TICKS_PER_SEC;	/* allow 1 second to init */
--	while (
--			shmem[iSCB_STATUS>>1] == 0)
--	{
--		if (currticks() > time)
--		{
--			printf("i82586 initialisation timed out with status %hX, cmd %hX\n",
--					shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
--			break;
--		}
--	}
--	/* Issue channel-attn -- the 82586 won't start. */
--	outb(0, ioaddr + I82586_ATTN);
--
--#ifdef	INCLUDE_3C507
--	/* Disable loopback. */
--	outb(0x80, ioaddr + MISC_CTRL);
--#endif
--#if	defined(DEBUG)
--	printf("i82586 status %hX, cmd %hX\n",
--			shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
--#endif
--}
--
--/**************************************************************************
--  POLL - Wait for a frame
-- ***************************************************************************/
--static int i82586_poll(struct nic *nic)
--{
--	int		status;
--	unsigned short	rfd_cmd, next_rx_frame, data_buffer_addr,
--	frame_status, pkt_len;
--	unsigned short	*shmem = (short *)mem_start + rx_head;
--
--	/* return true if there's an ethernet packet ready to read */
--	if (
--			((frame_status = shmem[0]) & 0x8000) == 0)
--		return (0);		/* nope */
--	rfd_cmd = shmem[1];
--	next_rx_frame = shmem[2];
--	data_buffer_addr = shmem[3];
--	pkt_len = shmem[11];
--	status = 0;
--	if (rfd_cmd != 0 || data_buffer_addr != rx_head + 22
--			|| (pkt_len & 0xC000) != 0xC000)
--		printf("\nRx frame corrupt, discarded");
--	else if ((frame_status & 0x2000) == 0)
--		printf("\nRx frame had error");
--	else
--	{
--		/* We have a frame, copy it to our buffer */
--		pkt_len &= 0x3FFF;
--		memcpy(nic->packet, (char *)mem_start + rx_head + 0x20, pkt_len);
--		/* Only packets not from ourself */
--		if (memcmp(nic->packet + ETH_ALEN, nic->node_addr, ETH_ALEN) != 0)
--		{
--			nic->packetlen = pkt_len;
--			status = 1;
--		}
--	}
--	/* Clear the status word and set EOL on Rx frame */
--	shmem[0] = 0;
--	shmem[1] = 0xC000;
--	*(short *)(mem_start + rx_tail + 2) = 0;
--	rx_tail = rx_head;
--	rx_head = next_rx_frame;
--	ack_status();
--	return (status);
--}
--
--/**************************************************************************
--  TRANSMIT - Transmit a frame
-- ***************************************************************************/
--static void i82586_transmit(
--		struct nic *nic,
--		const char *d,			/* Destination */
--		unsigned int t,			/* Type */
--		unsigned int s,			/* size */
--		const char *p)			/* Packet */
--{
--	Address			bptr;
--	unsigned short		type, z;
--	static unsigned short	tx_cmd[11] = {
--		0x0,			/* Tx status */
--		CmdTx,			/* Tx command */
--		TX_BUF_START+16,	/* Next command is a NoOp */
--		TX_BUF_START+8,		/* Data Buffer offset */
--		0x8000,			/* | with size */
--		0xffff,			/* No next data buffer */
--		TX_BUF_START+22,	/* + scb_base */
--		0x0,			/* Buffer address high bits (always zero) */
--		0x0,			/* Nop status */
--		CmdNOp,			/* Nop command */
--		TX_BUF_START+16		/* Next is myself */
--	};
--	unsigned short	*shmem = (short *)mem_start + TX_BUF_START;
--
--	/* send the packet to destination */
--	/* adjust some contents */
--	type = htons(t);
--	if (s < ETH_ZLEN)
--		s = ETH_ZLEN;
--	tx_cmd[4] = (s + ETH_HLEN) | 0x8000;
--	tx_cmd[6] = TX_BUF_START + 22 + scb_base;
--	bptr = mem_start + TX_BUF_START;
--	memcpy((char *)bptr, (char *)tx_cmd, sizeof(tx_cmd));
--	bptr += sizeof(tx_cmd);
--	memcpy((char *)bptr, d, ETH_ALEN);
--	bptr += ETH_ALEN;
--	memcpy((char *)bptr, nic->node_addr, ETH_ALEN);
--	bptr += ETH_ALEN;
--	memcpy((char *)bptr, (char *)&type, sizeof(type));
--	bptr += sizeof(type);
--	memcpy((char *)bptr, p, s);
--	/* Change the offset in the IDLELOOP */
--	*(unsigned short *)(mem_start + IDLELOOP + 4) = TX_BUF_START;
--	/* Wait for transmit completion */
--	while (
--			(shmem[0] & 0x2000) == 0)
--		;
--	/* Change the offset in the IDLELOOP back and
--	   change the final loop to point here */
--	*(unsigned short *)(mem_start + IDLELOOP + 4) = IDLELOOP;
--	*(unsigned short *)(mem_start + TX_BUF_START + 20) = IDLELOOP;
--	ack_status();
--}
--
--/**************************************************************************
--  DISABLE - Turn off ethernet interface
-- ***************************************************************************/
--static void i82586_disable(struct nic *nic)
--{
--	unsigned short	*shmem = (short *)mem_start;
--
--#if	0
--	/* Flush the Tx and disable Rx. */
--	shmem[iSCB_CMD>>1] = RX_SUSPEND | CUC_SUSPEND;
--	outb(0, ioaddr + I82586_ATTN);
--#ifdef	INCLUDE_NI5210
--	outb(0, ioaddr + NI52_RESET);
--#endif
--#endif	/* 0 */
--}
--
--#ifdef	INCLUDE_3C507
--
--static int t507_probe1(struct nic *nic, unsigned short ioaddr)
--{
--	int			i;
--	Address			size;
--	char			mem_config;
--	char			if_port;
--
--	if (inb(ioaddr) != '*' || inb(ioaddr+1) != '3'
--		|| inb(ioaddr+2) != 'C' || inb(ioaddr+3) != 'O')
--		return (0);
--	irq = inb(ioaddr + IRQ_CONFIG) & 0x0f;
--	mem_config = inb(ioaddr + MEM_CONFIG);
--	if (mem_config & 0x20)
--	{
--		size = 65536L;
--		mem_start = 0xf00000L + (mem_config & 0x08 ? 0x080000L
--			: (((Address)mem_config & 0x3) << 17));
--	}
--	else
--	{
--		size = ((((Address)mem_config & 0x3) + 1) << 14);
--		mem_start = 0x0c0000L + (((Address)mem_config & 0x18) << 12);
--	}
--	mem_end = mem_start + size;
--	scb_base = 65536L - size;
--	if_port = inb(ioaddr + ROM_CONFIG) & 0x80;
--	/* Get station address */
--	outb(0x01, ioaddr + MISC_CTRL);
--	for (i = 0; i < ETH_ALEN; ++i)
--	{
--		nic->node_addr[i] = inb(ioaddr+i);
--	}
--	printf("\n3c507 ioaddr %#hX, IRQ %d, mem [%#X-%#X], %sternal xcvr, addr %!\n",
--		ioaddr, irq, mem_start, mem_end, if_port ? "in" : "ex", nic->node_addr);
--	return (1);
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--***************************************************************************/
--
--struct nic *t507_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	static unsigned char	init_ID_done = 0;
--	unsigned short		lrs_state = 0xff;
--	static unsigned short	io_addrs[] = { 0x300, 0x320, 0x340, 0x280, 0 };
--	unsigned short		*p;
--	int			i;
--
--	if (init_ID_done == 0)
--	{
--		/* Send the ID sequence to the ID_PORT to enable the board */
--		outb(0x00, ID_PORT);
--		for (i = 0; i < 255; ++i)
--		{
--			outb(lrs_state, ID_PORT);
--			lrs_state <<= 1;
--			if (lrs_state & 0x100)
--				lrs_state ^= 0xe7;
--		}
--		outb(0x00, ID_PORT);
--		init_ID_done = 1;
--	}
--	/* if probe_addrs is 0, then routine can use a hardwired default */
--	if (probe_addrs == 0)
--		probe_addrs = io_addrs;
--	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
--		if (t507_probe1(nic, ioaddr))
--			break;
--	if (ioaddr != 0)
--	{
--		/* point to NIC specific routines */
--		i82586_reset(nic);
--		nic->reset = i82586_reset;
--		nic->poll = i82586_poll;
--		nic->transmit = i82586_transmit;
--		nic->disable = i82586_disable;
--		return nic;
--	}
--	/* else */
--	{
--		return 0;
--	}
--}
--
--#endif
--
--#ifdef	INCLUDE_NI5210
--
--static int ni5210_probe2(void)
--{
--	unsigned short		i;
--	unsigned short		shmem[10];
--
--	/* Fix the ISCP address and base. */
--	init_words[3] = scb_base;
--	init_words[7] = scb_base;
--
--	/* Write the words at 0xfff6. */
--	/* Write the words at 0x0000. */
--	memcpy((char *)(mem_end - 10), (char *)init_words, 10);
--	memcpy((char *)mem_start, (char *)&init_words[5], sizeof(init_words) - 10);
--	if (*(unsigned short *)mem_start != 1)
--		return (0);
--	outb(0, ioaddr + NI52_RESET);
--	outb(0, ioaddr + I82586_ATTN);
--	udelay(32);
--	i = 50;
--	while (
--		shmem[iSCB_STATUS>>1] == 0)
--	{
--		if (--i == 0)
--		{
--			printf("i82586 initialisation timed out with status %hX, cmd %hX\n",
--				shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
--			break;
--		}
--	}
--	/* Issue channel-attn -- the 82586 won't start. */
--	outb(0, ioaddr + I82586_ATTN);
--	if (*(unsigned short *)mem_start != 0)
--		return (0);
--	return (1);
--}
--
--static int ni5210_probe1(struct nic *nic)
--{
--	int			i;
--	static Address		mem_addrs[] = {
--		0xc0000, 0xc4000, 0xc8000, 0xcc000,
--		0xd0000, 0xd4000, 0xd8000, 0xdc000,
--		0xe0000, 0xe4000, 0xe8000, 0xec000,
--		0 };
--	Address			*p;
--
--	if (inb(ioaddr + 6) != 0x0 || inb(ioaddr + 7) != 0x55)
--		return (0);
--	scb_base = -8192;		/* assume 8k memory */
--	for (p = mem_addrs; (mem_start = *p) != 0; ++p)
--		if (mem_end = mem_start + 8192, ni5210_probe2())
--			break;
--	if (mem_start == 0)
--		return (0);
--	/* Get station address */
--	for (i = 0; i < ETH_ALEN; ++i)
--	{
--		nic->node_addr[i] = inb(ioaddr+i);
--	}
--	printf("\nNI5210 ioaddr %#hX, mem [%#X-%#X], addr %!\n",
--		ioaddr, mem_start, mem_end, nic->node_addr);
--	return (1);
--}
--
--struct nic *ni5210_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	/* missing entries are addresses usually already used */
--	static unsigned short	io_addrs[] = {
--		0x200, 0x208, 0x210, 0x218, 0x220, 0x228, 0x230, 0x238,
--		0x240, 0x248, 0x250, 0x258, 0x260, 0x268, 0x270, /*Par*/
--		0x280, 0x288, 0x290, 0x298, 0x2A0, 0x2A8, 0x2B0, 0x2B8,
--		0x2C0, 0x2C8, 0x2D0, 0x2D8, 0x2E0, 0x2E8, 0x2F0, /*Ser*/
--		0x300, 0x308, 0x310, 0x318, 0x320, 0x328, 0x330, 0x338,
--		0x340, 0x348, 0x350, 0x358, 0x360, 0x368, 0x370, /*Par*/
--		0x380, 0x388, 0x390, 0x398, 0x3A0, 0x3A8, /*Vid,Par*/
--		0x3C0, 0x3C8, 0x3D0, 0x3D8, 0x3E0, 0x3E8, /*Ser*/
--		0x0
--	};
--	unsigned short		*p;
--	int			i;
--
--	/* if probe_addrs is 0, then routine can use a hardwired default */
--	if (probe_addrs == 0)
--		probe_addrs = io_addrs;
--	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
--		if (ni5210_probe1(nic))
--			break;
--	if (ioaddr != 0)
--	{
--		/* point to NIC specific routines */
--		i82586_reset(nic);
--		nic->reset = i82586_reset;
--		nic->poll = i82586_poll;
--		nic->transmit = i82586_transmit;
--		nic->disable = i82586_disable;
--		return nic;
--	}
--	/* else */
--	{
--		return 0;
--	}
--}
--#endif
--
--#ifdef	INCLUDE_EXOS205
--
--/*
-- * Code to download to I186 in EXOS205
-- */
--
--static unsigned char exos_i186_init[] =
--{
--0x08,0x00,0x14,0x00,0x00,0x00,0xaa,0xfa,0x33,0xc0,0xba,0xfe,0xff,0xef,0xb8,0xf8,
--0xff,0xe7,0xa0,0xb8,0x7c,0x00,0xe7,0xa4,0xb8,0xbc,0x80,0xe7,0xa8,0x8c,0xc8,0x8e,
--0xd8,0xbb,0x2f,0x0e,0xc6,0x07,0xa5,0x33,0xc9,0xeb,0x00,0xeb,0x00,0xeb,0x00,0xe2,
--0xf8,0xbe,0x2c,0x0e,0xba,0x02,0x05,0x33,0xdb,0xb9,0x03,0x00,0xec,0x24,0x0f,0x8a,
--0xe0,0x02,0xd8,0x42,0x42,0xec,0x02,0xd8,0xd0,0xe0,0xd0,0xe0,0xd0,0xe0,0xd0,0xe0,
--0x0a,0xc4,0x88,0x04,0x42,0x42,0x46,0xe2,0xe3,0x8a,0xe3,0xd0,0xec,0xd0,0xec,0xd0,
--0xec,0xd0,0xec,0x80,0xe3,0x0f,0x02,0xe3,0x80,0xf4,0x05,0xec,0x3a,0xe0,0x74,0x05,
--0xc6,0x04,0x5a,0xeb,0xfe,0xc6,0x04,0x55,0x33,0xc0,0x8e,0xd8,0xbe,0x38,0x00,0xc7,
--0x04,0xce,0x0e,0x46,0x46,0xc7,0x04,0x00,0xff,0xfb,0xba,0x3c,0x00,0xb8,0x03,0x00,
--0xef,0x33,0xdb,0x33,0xc9,0xbd,0x04,0x0f,0x90,0x90,0x90,0x90,0xe2,0xfa,0x43,0x2e,
--0x89,0x5e,0x00,0xeb,0xf3,0x52,0xba,0x00,0x06,0xef,0x50,0x53,0x55,0xbd,0xf8,0x0e,
--0x2e,0x8b,0x5e,0x00,0x43,0x2e,0x89,0x5e,0x00,0xba,0x22,0x00,0xb8,0x00,0x80,0xef,
--0x5d,0x5b,0x58,0x5a,0xcf,0x49,0x4e,0x54,0x52,0x20,0x63,0x6e,0x74,0x2d,0x3e,0x00,
--0x00,0x4c,0x4f,0x4f,0x50,0x20,0x63,0x6e,0x74,0x2d,0x3e,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xea,0x30,0x0e,0x00,0xff,0x00,0x00,0x00,0x00,
--0x00,0x00,0x00,0x00,0x00,0x00,00
--};
--
--/* These offsets are from the end of the i186 download code */
--
--#define	OFFSET_SEMA		0x1D1
--#define	OFFSET_ADDR		0x1D7
--
--static int exos205_probe2(void)
--{
--	unsigned short		i;
--	unsigned short		shmem[10];
--
--	/* Fix the ISCP address and base. */
--	init_words[3] = scb_base;
--	init_words[7] = scb_base;
--
--	/* Write the words at 0xfff6. */
--	/* Write the words at 0x0000. */
--	memcpy((char *)(mem_end - 10), (char *)init_words, 10);
--	memcpy((char *)mem_start, (char *)&init_words[5], sizeof(init_words) - 10);
--	if (*(unsigned short *)mem_start != 1)
--		return (0);
--	outb(0, ioaddr + EXOS205_RESET);
--	outb(0, ioaddr + I82586_ATTN);
--	i = 50;
--	while (
--		shmem[iSCB_STATUS>>1] == 0)
--	{
--		if (--i == 0)
--		{
--			printf("i82586 initialisation timed out with status %hX, cmd %hX\n",
--				shmem[iSCB_STATUS>>1], shmem[iSCB_CMD>>1]);
--			break;
--		}
--	}
--	/* Issue channel-attn -- the 82586 won't start. */
--	outb(0, ioaddr + I82586_ATTN);
--	if (*(unsigned short *)mem_start != 0)
--		return (0);
--	return (1);
--}
--
--static int exos205_probe1(struct nic *nic)
--{
--	int			i;
--	/* If you know the other addresses please let me know */
--	static Address		mem_addrs[] = {
--		0xcc000, 0 };
--	Address			*p;
--
--	scb_base = -16384;		/* assume 8k memory */
--	for (p = mem_addrs; (mem_start = *p) != 0; ++p)
--		if (mem_end = mem_start + 16384, exos205_probe2())
--			break;
--	if (mem_start == 0)
--		return (0);
--	/* Get station address */
--	for (i = 0; i < ETH_ALEN; ++i)
--	{
--		nic->node_addr[i] = inb(ioaddr+i);
--	}
--	printf("\nEXOS205 ioaddr %#hX, mem [%#X-%#X], addr %!\n",
--		ioaddr, mem_start, mem_end, nic->node_addr);
--	return (1);
--}
--
--struct nic *exos205_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	/* If you know the other addresses, please let me know */
--	static unsigned short	io_addrs[] = {
--		0x310, 0x0
--	};
--	unsigned short		*p;
--	int			i;
--
--	/* if probe_addrs is 0, then routine can use a hardwired default */
--	if (probe_addrs == 0)
--		probe_addrs = io_addrs;
--	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
--		if (exos205_probe1(nic))
--			break;
--	if (ioaddr != 0)
--	{
--		/* point to NIC specific routines */
--		i82586_reset(nic);
--		nic->reset = i82586_reset;
--		nic->poll = i82586_poll;
--		nic->transmit = i82586_transmit;
--		nic->disable = i82586_disable;
--		return nic;
--	}
--	/* else */
--	{
--		return 0;
--	}
--}
--
--#endif
-Index: b/netboot/if_arp.h
-===================================================================
---- /dev/null
-+++ b/netboot/if_arp.h
-@@ -0,0 +1,29 @@
-+#ifndef	_IF_ARP_H
-+#define	_IF_ARP_H
-+
-+#include "types.h"
-+
-+#define ARP_REQUEST	1
-+#define ARP_REPLY	2
-+
-+#ifndef	MAX_ARP_RETRIES
-+#define MAX_ARP_RETRIES		20
-+#endif
-+
-+/*
-+ * A pity sipaddr and tipaddr are not longword aligned or we could use
-+ * in_addr. No, I don't want to use #pragma packed.
-+ */
-+struct arprequest {
-+	uint16_t hwtype;
-+	uint16_t protocol;
-+	uint8_t  hwlen;
-+	uint8_t  protolen;
-+	uint16_t opcode;
-+	uint8_t  shwaddr[6];
-+	uint8_t  sipaddr[4];
-+	uint8_t  thwaddr[6];
-+	uint8_t  tipaddr[4];
-+};
-+
-+#endif	/* _IF_ARP_H */
-Index: b/netboot/if_ether.h
-===================================================================
---- /dev/null
-+++ b/netboot/if_ether.h
-@@ -0,0 +1,21 @@
-+#ifndef	_IF_ETHER_H
-+#define	_IF_ETHER_H
-+
-+/*
-+   I'm moving towards the defined names in linux/if_ether.h for clarity.
-+   The confusion between 60/64 and 1514/1518 arose because the NS8390
-+   counts the 4 byte frame checksum in the incoming packet, but not
-+   in the outgoing packet. 60/1514 are the correct numbers for most
-+   if not all of the other NIC controllers.
-+*/
-+
-+#define ETH_ALEN		6	/* Size of Ethernet address */
-+#define ETH_HLEN		14	/* Size of ethernet header */
-+#define	ETH_ZLEN		60	/* Minimum packet */
-+#define	ETH_FRAME_LEN		1514	/* Maximum packet */
-+#define ETH_DATA_ALIGN		2	/* Amount needed to align the data after an ethernet header */
-+#ifndef	ETH_MAX_MTU
-+#define	ETH_MAX_MTU		(ETH_FRAME_LEN-ETH_HLEN)
-+#endif
-+
-+#endif	/* _IF_ETHER_H */
-Index: b/netboot/igmp.h
-===================================================================
---- /dev/null
-+++ b/netboot/igmp.h
-@@ -0,0 +1,27 @@
-+#ifndef	_IGMP_H
-+#define	_IGMP_H
-+
-+/* Max interval between IGMP packets */
-+#define IGMP_INTERVAL			(10*TICKS_PER_SEC)
-+#define IGMPv1_ROUTER_PRESENT_TIMEOUT	(400*TICKS_PER_SEC)
-+
-+#define IGMP_QUERY	0x11
-+#define IGMPv1_REPORT	0x12
-+#define IGMPv2_REPORT	0x16
-+#define IGMP_LEAVE	0x17
-+#define GROUP_ALL_HOSTS 0xe0000001 /* 224.0.0.1 Host byte order */
-+
-+struct igmp {
-+	uint8_t  type;
-+	uint8_t  response_time;
-+	uint16_t chksum;
-+	in_addr group;
-+};
-+
-+struct igmp_ip_t { /* Format of an igmp ip packet */
-+	struct iphdr ip;
-+	uint8_t router_alert[4]; /* Router alert option */
-+	struct igmp igmp;
-+};
-+
-+#endif	/* _IGMP_H */
-Index: b/netboot/in.h
-===================================================================
---- /dev/null
-+++ b/netboot/in.h
-@@ -0,0 +1,21 @@
-+#ifndef	_IN_H
-+#define	_IN_H
-+
-+#include "types.h"
-+
-+#define IP		0x0800
-+#define ARP		0x0806
-+#define	RARP		0x8035
-+
-+#define IP_ICMP		1
-+#define IP_IGMP		2
-+#define IP_UDP		17
-+
-+/* Same after going through htonl */
-+#define IP_BROADCAST	0xFFFFFFFF
-+
-+typedef struct {
-+	uint32_t	s_addr;
-+} in_addr;
-+
-+#endif	/* _IN_H */
-Index: b/netboot/io.h
-===================================================================
---- /dev/null
-+++ b/netboot/io.h
-@@ -0,0 +1,239 @@
-+#ifndef	IO_H
-+#define IO_H
-+
-+
-+/* Amount of relocation etherboot is experiencing */
-+extern unsigned long virt_offset;
-+
-+/* Don't require identity mapped physical memory,
-+ * osloader.c is the only valid user at the moment.
-+ */
-+unsigned long virt_to_phys(volatile const void *virt_addr);
-+void *phys_to_virt(unsigned long phys_addr);
-+
-+/* virt_to_bus converts an addresss inside of etherboot [_start, _end]
-+ * into a memory access cards can use.
-+ */
-+#define virt_to_bus virt_to_phys
-+
-+
-+/* bus_to_virt reverses virt_to_bus, the address must be output
-+ * from virt_to_bus to be valid.  This function does not work on
-+ * all bus addresses.
-+ */
-+#define bus_to_virt phys_to_virt
-+
-+/* ioremap converts a random 32bit bus address into something
-+ * etherboot can access.
-+ */
-+static inline void *ioremap(unsigned long bus_addr, unsigned long length __unused)
-+{
-+	return bus_to_virt(bus_addr);
-+}
-+
-+/* iounmap cleans up anything ioremap had to setup */
-+static inline void iounmap(void *virt_addr __unused)
-+{
-+	return;
-+}
-+
-+/*
-+ * This file contains the definitions for the x86 IO instructions
-+ * inb/inw/inl/outb/outw/outl and the "string versions" of the same
-+ * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing"
-+ * versions of the single-IO instructions (inb_p/inw_p/..).
-+ *
-+ * This file is not meant to be obfuscating: it's just complicated
-+ * to (a) handle it all in a way that makes gcc able to optimize it
-+ * as well as possible and (b) trying to avoid writing the same thing
-+ * over and over again with slight variations and possibly making a
-+ * mistake somewhere.
-+ */
-+
-+/*
-+ * Thanks to James van Artsdalen for a better timing-fix than
-+ * the two short jumps: using outb's to a nonexistent port seems
-+ * to guarantee better timings even on fast machines.
-+ *
-+ * On the other hand, I'd like to be sure of a non-existent port:
-+ * I feel a bit unsafe about using 0x80 (should be safe, though)
-+ *
-+ *		Linus
-+ */
-+
-+#ifdef	SLOW_IO_BY_JUMPING
-+#define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:")
-+#else
-+#define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80")
-+#endif
-+
-+#ifdef	REALLY_SLOW_IO
-+#define SLOW_DOWN_IO { __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; }
-+#else
-+#define SLOW_DOWN_IO __SLOW_DOWN_IO
-+#endif
-+
-+/*
-+ * readX/writeX() are used to access memory mapped devices. On some
-+ * architectures the memory mapped IO stuff needs to be accessed
-+ * differently. On the x86 architecture, we just read/write the
-+ * memory location directly.
-+ */
-+#define readb(addr) (*(volatile unsigned char *) (addr))
-+#define readw(addr) (*(volatile unsigned short *) (addr))
-+#define readl(addr) (*(volatile unsigned int *) (addr))
-+
-+#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b))
-+#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b))
-+#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b))
-+
-+#define memcpy_fromio(a,b,c)	memcpy((a),(void *)(b),(c))
-+#define memcpy_toio(a,b,c)	memcpy((void *)(a),(b),(c))
-+
-+/*
-+ * Force strict CPU ordering.
-+ * And yes, this is required on UP too when we're talking
-+ * to devices.
-+ *
-+ * For now, "wmb()" doesn't actually do anything, as all
-+ * Intel CPU's follow what Intel calls a *Processor Order*,
-+ * in which all writes are seen in the program order even
-+ * outside the CPU.
-+ *
-+ * I expect future Intel CPU's to have a weaker ordering,
-+ * but I'd also expect them to finally get their act together
-+ * and add some real memory barriers if so.
-+ *
-+ * Some non intel clones support out of order store. wmb() ceases to be a
-+ * nop for these.
-+ */
-+ 
-+#define mb() 	__asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory")
-+#define rmb()	mb()
-+#define wmb()	mb();
-+
-+
-+/*
-+ * Talk about misusing macros..
-+ */
-+
-+#define __OUT1(s,x) \
-+extern void __out##s(unsigned x value, unsigned short port); \
-+extern inline void __out##s(unsigned x value, unsigned short port) {
-+
-+#define __OUT2(s,s1,s2) \
-+__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
-+
-+#define __OUT(s,s1,x) \
-+__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); } \
-+__OUT1(s##c,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); } \
-+__OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); SLOW_DOWN_IO; } \
-+__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
-+
-+#define __IN1(s,x) \
-+extern unsigned x __in##s(unsigned short port); \
-+extern inline unsigned x __in##s(unsigned short port) { unsigned x _v;
-+
-+#define __IN2(s,s1,s2) \
-+__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
-+
-+#define __IN(s,s1,x,i...) \
-+__IN1(s,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); return _v; } \
-+__IN1(s##c,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); return _v; } \
-+__IN1(s##_p,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); SLOW_DOWN_IO; return _v; } \
-+__IN1(s##c_p,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; }
-+
-+#define __INS(s) \
-+extern void ins##s(unsigned short port, void * addr, unsigned long count); \
-+extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
-+{ __asm__ __volatile__ ("cld ; rep ; ins" #s \
-+: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
-+
-+#define __OUTS(s) \
-+extern void outs##s(unsigned short port, const void * addr, unsigned long  count); \
-+extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
-+{ __asm__ __volatile__ ("cld ; rep ; outs" #s \
-+: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
-+
-+__IN(b,"", char)
-+__IN(w,"",short)
-+__IN(l,"", long)
-+
-+__OUT(b,"b",char)
-+__OUT(w,"w",short)
-+__OUT(l,,int)
-+
-+__INS(b)
-+__INS(w)
-+__INS(l)
-+
-+__OUTS(b)
-+__OUTS(w)
-+__OUTS(l)
-+
-+/*
-+ * Note that due to the way __builtin_constant_p() works, you
-+ *  - can't use it inside a inline function (it will never be true)
-+ *  - you don't have to worry about side effects within the __builtin..
-+ */
-+#define outb(val,port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__outbc((val),(port)) : \
-+	__outb((val),(port)))
-+
-+#define inb(port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__inbc(port) : \
-+	__inb(port))
-+
-+#define outb_p(val,port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__outbc_p((val),(port)) : \
-+	__outb_p((val),(port)))
-+
-+#define inb_p(port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__inbc_p(port) : \
-+	__inb_p(port))
-+
-+#define outw(val,port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__outwc((val),(port)) : \
-+	__outw((val),(port)))
-+
-+#define inw(port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__inwc(port) : \
-+	__inw(port))
-+
-+#define outw_p(val,port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__outwc_p((val),(port)) : \
-+	__outw_p((val),(port)))
-+
-+#define inw_p(port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__inwc_p(port) : \
-+	__inw_p(port))
-+
-+#define outl(val,port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__outlc((val),(port)) : \
-+	__outl((val),(port)))
-+
-+#define inl(port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__inlc(port) : \
-+	__inl(port))
-+
-+#define outl_p(val,port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__outlc_p((val),(port)) : \
-+	__outl_p((val),(port)))
-+
-+#define inl_p(port) \
-+((__builtin_constant_p((port)) && (port) < 256) ? \
-+	__inlc_p(port) : \
-+	__inl_p(port))
-+
-+#endif /* ETHERBOOT_IO_H */
-Index: b/netboot/ip.h
-===================================================================
---- /dev/null
-+++ b/netboot/ip.h
-@@ -0,0 +1,36 @@
-+#ifndef	_IP_H
-+#define	_IP_H
-+
-+/* We need 'uint16_t' */
-+#include "types.h"
-+/* We need 'in_addr' */
-+#include "in.h"
-+
-+struct iphdr {
-+	uint8_t  verhdrlen;
-+	uint8_t  service;
-+	uint16_t len;
-+	uint16_t ident;
-+	uint16_t frags;
-+	uint8_t  ttl;
-+	uint8_t  protocol;
-+	uint16_t chksum;
-+	in_addr src;
-+	in_addr dest;
-+};
-+
-+extern void build_ip_hdr(unsigned long __destip, int __ttl, int __protocol, 
-+			 int __option_len, int __len, const void * __buf);
-+
-+extern int ip_transmit(int __len, const void * __buf);
-+
-+extern uint16_t ipchksum(const void * __data, unsigned long __length);
-+
-+extern uint16_t add_ipchksums(unsigned long __offset, uint16_t __sum, 
-+			      uint16_t __new);
-+
-+
-+
-+
-+
-+#endif	/* _IP_H */
-Index: b/netboot/isa.h
-===================================================================
---- /dev/null
-+++ b/netboot/isa.h
-@@ -0,0 +1,27 @@
-+#if !defined(ISA_H) && defined(CONFIG_ISA)
-+#define ISA_H
-+
-+struct dev;
-+
-+#define ISAPNP_VENDOR(a,b,c)	(((((a)-'A'+1)&0x3f)<<2)|\
-+				((((b)-'A'+1)&0x18)>>3)|((((b)-'A'+1)&7)<<13)|\
-+				((((c)-'A'+1)&0x1f)<<8))
-+
-+#define	GENERIC_ISAPNP_VENDOR	ISAPNP_VENDOR('P','N','P')
-+
-+struct isa_driver
-+{
-+	int type;
-+	const char *name;
-+	int (*probe)(struct dev *, unsigned short *);
-+	unsigned short *ioaddrs;
-+};
-+
-+#define __isa_driver	__attribute__ ((unused,__section__(".drivers.isa")))
-+extern const struct isa_driver isa_drivers[];
-+extern const struct isa_driver isa_drivers_end[];
-+
-+#define ISA_ROM(IMAGE, DESCRIPTION)
-+
-+#endif /* ISA_H */
-+
-Index: b/netboot/lance.c
-===================================================================
---- a/netboot/lance.c
-+++ /dev/null
-@@ -1,564 +0,0 @@
--/**************************************************************************
--Etherboot -  BOOTP/TFTP Bootstrap Program
--LANCE NIC driver for Etherboot
--Large portions borrowed from the Linux LANCE driver by Donald Becker
--Ken Yap, July 1997
--***************************************************************************/
--
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
--/* to get some global routines like printf */
--#include "etherboot.h"
--/* to get the interface to the body of the program */
--#include "nic.h"
--#ifdef	INCLUDE_LANCE
--#include "pci.h"
--#endif
--#include "cards.h"
--
--/* Offsets from base I/O address */
--#if	defined(INCLUDE_NE2100) || defined(INCLUDE_LANCE)
--#define	LANCE_ETH_ADDR	0x0
--#define	LANCE_DATA	0x10
--#define	LANCE_ADDR	0x12
--#define	LANCE_RESET	0x14
--#define	LANCE_BUS_IF	0x16
--#define	LANCE_TOTAL_SIZE	0x18
--#endif
--#ifdef	INCLUDE_NI6510
--#define	LANCE_ETH_ADDR	0x8
--#define	LANCE_DATA	0x0
--#define	LANCE_ADDR	0x2
--#define	LANCE_RESET	0x4
--#define	LANCE_BUS_IF	0x6
--#define	LANCE_TOTAL_SIZE	0x10
--#endif
--
--/* lance_poll() now can use multiple Rx buffers to prevent packet loss. Set
-- * Set LANCE_LOG_RX_BUFFERS to 0..7 for 1, 2, 4, 8, 16, 32, 64 or 128 Rx
-- * buffers. Usually 4 (=16 Rx buffers) is a good value. (Andreas Neuhaus)
-- * Decreased to 2 (=4 Rx buffers) (Ken Yap, 20010305) */
--
--#define LANCE_LOG_RX_BUFFERS	2		/* Use 2^2=4 Rx buffers */
--
--#define RX_RING_SIZE		(1 << (LANCE_LOG_RX_BUFFERS))
--#define RX_RING_MOD_MASK	(RX_RING_SIZE - 1)
--#define RX_RING_LEN_BITS	((LANCE_LOG_RX_BUFFERS) << 29)
--
--struct lance_init_block
--{
--	unsigned short	mode;
--	unsigned char	phys_addr[ETH_ALEN];
--	unsigned long	filter[2];
--	Address		rx_ring;
--	Address		tx_ring;
--};
--
--struct lance_rx_head
--{
--	union {
--		Address		base;
--		unsigned char	addr[4];
--	} u;
--	short		buf_length;	/* 2s complement */
--	short		msg_length;
--};
--
--struct lance_tx_head
--{
--	union {
--		Address		base;
--		unsigned char	addr[4];
--	} u;
--	short		buf_length;	/* 2s complement */
--	short		misc;
--};
--
--struct lance_interface
--{
--	struct lance_init_block	init_block;
--	struct lance_rx_head	rx_ring[RX_RING_SIZE];
--	struct lance_tx_head	tx_ring;
--	unsigned char		rbuf[RX_RING_SIZE][ETH_FRAME_LEN+4];
--	unsigned char		tbuf[ETH_FRAME_LEN];
--	/*
--	 * Do not alter the order of the struct members above;
--	 * the hardware depends on the correct alignment.
--	 */
--	int			rx_idx;
--};
--
--#define	LANCE_MUST_PAD		0x00000001
--#define	LANCE_ENABLE_AUTOSELECT	0x00000002
--#define	LANCE_SELECT_PHONELINE	0x00000004
--#define	LANCE_MUST_UNRESET	0x00000008
--
--/* A mapping from the chip ID number to the part number and features.
--   These are from the datasheets -- in real life the '970 version
--   reportedly has the same ID as the '965. */
--static const struct lance_chip_type
--{
--	int	id_number;
--	const char	*name;
--	int	flags;
--} chip_table[] = {
--	{0x0000, "LANCE 7990",			/* Ancient lance chip.  */
--		LANCE_MUST_PAD + LANCE_MUST_UNRESET},
--	{0x0003, "PCnet/ISA 79C960",		/* 79C960 PCnet/ISA.  */
--		LANCE_ENABLE_AUTOSELECT},
--	{0x2260, "PCnet/ISA+ 79C961",		/* 79C961 PCnet/ISA+, Plug-n-Play.  */
--		LANCE_ENABLE_AUTOSELECT},
--	{0x2420, "PCnet/PCI 79C970",		/* 79C970 or 79C974 PCnet-SCSI, PCI. */
--		LANCE_ENABLE_AUTOSELECT},
--	/* Bug: the PCnet/PCI actually uses the PCnet/VLB ID number, so just call
--		it the PCnet32. */
--	{0x2430, "PCnet32",			/* 79C965 PCnet for VL bus. */
--		LANCE_ENABLE_AUTOSELECT},
--        {0x2621, "PCnet/PCI-II 79C970A",        /* 79C970A PCInetPCI II. */
--                LANCE_ENABLE_AUTOSELECT},
--	{0x2625, "PCnet-FAST III 79C973",	/* 79C973 PCInet-FAST III. */
--		LANCE_ENABLE_AUTOSELECT},
--        {0x2626, "PCnet/HomePNA 79C978",        
--                LANCE_ENABLE_AUTOSELECT|LANCE_SELECT_PHONELINE},
--	{0x0, "PCnet (unknown)",
--		LANCE_ENABLE_AUTOSELECT},
--};
--
--/* Define a macro for converting program addresses to real addresses */
--#undef	virt_to_bus
--#define	virt_to_bus(x)		((unsigned long)x)
--
--static int			chip_version;
--static int			lance_version;
--static unsigned short		ioaddr;
--#ifndef	INCLUDE_LANCE
--static int			dma;
--#endif
--static struct lance_interface	*lp;
--
--/* additional 8 bytes for 8-byte alignment space */
--#ifdef	USE_LOWMEM_BUFFER
--#define lance ((char *)0x10000 - (sizeof(struct lance_interface)+8))
--#else
--static char			lance[sizeof(struct lance_interface)+8];
--#endif
--
--#ifndef	INCLUDE_LANCE
--/* DMA defines and helper routines */
--
--/* DMA controller registers */
--#define DMA1_CMD_REG		0x08	/* command register (w) */
--#define DMA1_STAT_REG		0x08	/* status register (r) */
--#define DMA1_REQ_REG            0x09    /* request register (w) */
--#define DMA1_MASK_REG		0x0A	/* single-channel mask (w) */
--#define DMA1_MODE_REG		0x0B	/* mode register (w) */
--#define DMA1_CLEAR_FF_REG	0x0C	/* clear pointer flip-flop (w) */
--#define DMA1_TEMP_REG           0x0D    /* Temporary Register (r) */
--#define DMA1_RESET_REG		0x0D	/* Master Clear (w) */
--#define DMA1_CLR_MASK_REG       0x0E    /* Clear Mask */
--#define DMA1_MASK_ALL_REG       0x0F    /* all-channels mask (w) */
--
--#define DMA2_CMD_REG		0xD0	/* command register (w) */
--#define DMA2_STAT_REG		0xD0	/* status register (r) */
--#define DMA2_REQ_REG            0xD2    /* request register (w) */
--#define DMA2_MASK_REG		0xD4	/* single-channel mask (w) */
--#define DMA2_MODE_REG		0xD6	/* mode register (w) */
--#define DMA2_CLEAR_FF_REG	0xD8	/* clear pointer flip-flop (w) */
--#define DMA2_TEMP_REG           0xDA    /* Temporary Register (r) */
--#define DMA2_RESET_REG		0xDA	/* Master Clear (w) */
--#define DMA2_CLR_MASK_REG       0xDC    /* Clear Mask */
--#define DMA2_MASK_ALL_REG       0xDE    /* all-channels mask (w) */
--
--
--#define DMA_MODE_READ	0x44	/* I/O to memory, no autoinit, increment, single mode */
--#define DMA_MODE_WRITE	0x48	/* memory to I/O, no autoinit, increment, single mode */
--#define DMA_MODE_CASCADE 0xC0   /* pass thru DREQ->HRQ, DACK<-HLDA only */
--
--/* enable/disable a specific DMA channel */
--static void enable_dma(unsigned int dmanr)
--{
--	if (dmanr <= 3)
--		outb_p(dmanr, DMA1_MASK_REG);
--	else
--		outb_p(dmanr & 3, DMA2_MASK_REG);
--}
--
--static void disable_dma(unsigned int dmanr)
--{
--	if (dmanr <= 3)
--		outb_p(dmanr | 4, DMA1_MASK_REG);
--	else
--		outb_p((dmanr & 3) | 4, DMA2_MASK_REG);
--}
--
--/* set mode (above) for a specific DMA channel */
--static void set_dma_mode(unsigned int dmanr, char mode)
--{
--	if (dmanr <= 3)
--		outb_p(mode | dmanr, DMA1_MODE_REG);
--	else
--		outb_p(mode | (dmanr&3), DMA2_MODE_REG);
--}
--#endif	/* !INCLUDE_LANCE */
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--static void lance_reset(struct nic *nic)
--{
--	int		i;
--	Address		l;
--
--	/* Reset the LANCE */
--	(void)inw(ioaddr+LANCE_RESET);
--	/* Un-Reset the LANCE, needed only for the NE2100 */
--	if (chip_table[lance_version].flags & LANCE_MUST_UNRESET)
--		outw(0, ioaddr+LANCE_RESET);
--	if (chip_table[lance_version].flags & LANCE_ENABLE_AUTOSELECT)
--	{
--		/* This is 79C960 specific; Turn on auto-select of media
--		   (AUI, BNC). */
--		outw(0x2, ioaddr+LANCE_ADDR);
--		/* Don't touch 10base2 power bit. */
--		outw(inw(ioaddr+LANCE_BUS_IF) | 0x2, ioaddr+LANCE_BUS_IF);
--	}
--	/* HomePNA cards need to explicitly pick the phoneline interface.
--	 * Some of these cards have ethernet interfaces as well, this
--	 * code might require some modification for those.
--  	 */
--        if (chip_table[lance_version].flags & LANCE_SELECT_PHONELINE) {
--                short media, check ;
--                /* this is specific to HomePNA cards... */
--                outw(49, ioaddr+0x12) ;
--                media = inw(ioaddr+0x16) ;
--#ifdef DEBUG
--                printf("media was %d\n", media) ;
--#endif
--                media &= ~3 ;
--                media |= 1 ;
--#ifdef DEBUG
--                printf("media changed to %d\n", media) ;
--#endif
--                media &= ~3 ;
--                media |= 1 ;
--                outw(49, ioaddr+0x12) ;
--                outw(media, ioaddr+0x16) ;
--                outw(49, ioaddr+0x12) ;
--                check = inw(ioaddr+0x16) ;
--#ifdef DEBUG
--                printf("check %s, media was set properly\n", 
--			check ==  media ? "passed" : "FAILED" ) ; 
--#endif
--	}
-- 
--	/* Re-initialise the LANCE, and start it when done. */
--	/* Set station address */
--	for (i = 0; i < ETH_ALEN; ++i)
--		lp->init_block.phys_addr[i] = nic->node_addr[i];
--	/* Preset the receive ring headers */
--	for (i=0; i<RX_RING_SIZE; i++) {
--		lp->rx_ring[i].buf_length = -ETH_FRAME_LEN-4;
--		/* OWN */
--		lp->rx_ring[i].u.base = virt_to_bus(lp->rbuf[i]) & 0xffffff;
--		/* we set the top byte as the very last thing */
--		lp->rx_ring[i].u.addr[3] = 0x80;
--	}
--	lp->rx_idx = 0;
--	lp->init_block.mode = 0x0;	/* enable Rx and Tx */
--	l = (Address)virt_to_bus(&lp->init_block);
--	outw(0x1, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw((short)l, ioaddr+LANCE_DATA);
--	outw(0x2, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw((short)(l >> 16), ioaddr+LANCE_DATA);
--	outw(0x4, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw(0x915, ioaddr+LANCE_DATA);
--	outw(0x0, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw(0x4, ioaddr+LANCE_DATA);		/* stop */
--	outw(0x1, ioaddr+LANCE_DATA);		/* init */
--	for (i = 10000; i > 0; --i)
--		if (inw(ioaddr+LANCE_DATA) & 0x100)
--			break;
--#ifdef	DEBUG
--	if (i <= 0)
--		printf("Init timed out\n");
--#endif
--	/* Apparently clearing the InitDone bit here triggers a bug
--	   in the '974. (Mark Stockton) */
--	outw(0x2, ioaddr+LANCE_DATA);		/* start */
--}
--
--/**************************************************************************
--POLL - Wait for a frame
--***************************************************************************/
--static int lance_poll(struct nic *nic)
--{
--	int		status;
--
--	status = lp->rx_ring[lp->rx_idx].u.base >> 24;
--	if (status & 0x80)
--		return (0);
--#ifdef	DEBUG
--	printf("LANCE packet received rx_ring.u.base %X mcnt %hX csr0 %hX\n",
--		lp->rx_ring[lp->rx_idx].u.base, lp->rx_ring[lp->rx_idx].msg_length,
--		inw(ioaddr+LANCE_DATA));
--#endif
--	if (status == 0x3)
--		memcpy(nic->packet, lp->rbuf[lp->rx_idx], nic->packetlen = lp->rx_ring[lp->rx_idx].msg_length);
--	/* Andrew Boyd of QNX reports that some revs of the 79C765
--	   clear the buffer length */
--	lp->rx_ring[lp->rx_idx].buf_length = -ETH_FRAME_LEN-4;
--	lp->rx_ring[lp->rx_idx].u.addr[3] |= 0x80;	/* prime for next receive */
--
--	/* I'm not sure if the following is still ok with multiple Rx buffers, but it works */
--	outw(0x0, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw(0x500, ioaddr+LANCE_DATA);		/* clear receive + InitDone */
--
--	/* Switch to the next Rx ring buffer */
--	lp->rx_idx = (lp->rx_idx + 1) & RX_RING_MOD_MASK;
--
--	return (status == 0x3);
--}
--
--/**************************************************************************
--TRANSMIT - Transmit a frame
--***************************************************************************/
--static void lance_transmit(
--	struct nic *nic,
--	const char *d,			/* Destination */
--	unsigned int t,			/* Type */
--	unsigned int s,			/* size */
--	const char *p)			/* Packet */
--{
--	unsigned long		time;
--
--	/* copy the packet to ring buffer */
--	memcpy(lp->tbuf, d, ETH_ALEN);	/* dst */
--	memcpy(&lp->tbuf[ETH_ALEN], nic->node_addr, ETH_ALEN); /* src */
--	lp->tbuf[ETH_ALEN+ETH_ALEN] = t >> 8;	/* type */
--	lp->tbuf[ETH_ALEN+ETH_ALEN+1] = t;	/* type */
--	memcpy(&lp->tbuf[ETH_HLEN], p, s);
--	s += ETH_HLEN;
--	if (chip_table[chip_version].flags & LANCE_MUST_PAD)
--		while (s < ETH_ZLEN)	/* pad to min length */
--			lp->tbuf[s++] = 0;
--	lp->tx_ring.buf_length = -s;
--	lp->tx_ring.misc = 0x0;
--	/* OWN, STP, ENP */
--	lp->tx_ring.u.base = virt_to_bus(lp->tbuf) & 0xffffff;
--	/* we set the top byte as the very last thing */
--	lp->tx_ring.u.addr[3] = 0x83;
--	/* Trigger an immediate send poll */
--	outw(0x0, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);	/* as in the datasheets... */
--	/* Klaus Espenlaub: the value below was 0x48, but that enabled the
--	 * interrupt line, causing a hang if for some reasone the interrupt
--	 * controller had the LANCE interrupt enabled.  I have no idea why
--	 * nobody ran into this before...  */
--	outw(0x08, ioaddr+LANCE_DATA);
--	/* wait for transmit complete */
--	time = currticks() + TICKS_PER_SEC;		/* wait one second */
--	while (currticks() < time && (lp->tx_ring.u.base & 0x80000000) != 0)
--		;
--	if ((lp->tx_ring.u.base & 0x80000000) != 0)
--		printf("LANCE timed out on transmit\n");
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw(0x200, ioaddr+LANCE_DATA);		/* clear transmit + InitDone */
--#ifdef	DEBUG
--	printf("tx_ring.u.base %X tx_ring.buf_length %hX tx_ring.misc %hX csr0 %hX\n",
--		lp->tx_ring.u.base, lp->tx_ring.buf_length, lp->tx_ring.misc,
--		inw(ioaddr+LANCE_DATA));
--#endif
--}
--
--static void lance_disable(struct nic *nic)
--{
--	(void)inw(ioaddr+LANCE_RESET);
--	if (chip_table[lance_version].flags & LANCE_MUST_UNRESET)
--		outw(0, ioaddr+LANCE_RESET);
--
--	outw(0, ioaddr+LANCE_ADDR);
--	outw(0x0004, ioaddr+LANCE_DATA);	/* stop the LANCE */
--
--#ifndef	INCLUDE_LANCE
--	disable_dma(dma);
--#endif
--}
--
--#ifdef	INCLUDE_LANCE
--static int lance_probe1(struct nic *nic, struct pci_device *pci)
--#else
--static int lance_probe1(struct nic *nic)
--#endif
--{
--	int			reset_val ;
--	unsigned int		i;
--	Address			l;
--	short			dma_channels;
--#ifndef	INCLUDE_LANCE
--	static const char	dmas[] = { 5, 6, 7, 3 };
--#endif
--
--	reset_val = inw(ioaddr+LANCE_RESET);
--	outw(reset_val, ioaddr+LANCE_RESET);
--#if	1  /* Klaus Espenlaub -- was #ifdef	INCLUDE_NE2100*/
--	outw(0x0, ioaddr+LANCE_ADDR);	/* Switch to window 0 */
--	if (inw(ioaddr+LANCE_DATA) != 0x4)
--		return (-1);
--#endif
--	outw(88, ioaddr+LANCE_ADDR);	/* Get the version of the chip */
--	if (inw(ioaddr+LANCE_ADDR) != 88)
--		lance_version = 0;
--	else
--	{
--		chip_version = inw(ioaddr+LANCE_DATA);
--		outw(89, ioaddr+LANCE_ADDR);
--		chip_version |= inw(ioaddr+LANCE_DATA) << 16;
--		if ((chip_version & 0xfff) != 0x3)
--			return (-1);
--		chip_version = (chip_version >> 12) & 0xffff;
--		for (lance_version = 1; chip_table[lance_version].id_number != 0; ++lance_version)
--			if (chip_table[lance_version].id_number == chip_version)
--				break;
--	}
--	/* make sure data structure is 8-byte aligned */
--	l = ((Address)lance + 7) & ~7;
--	lp = (struct lance_interface *)l;
--	lp->init_block.mode = 0x3;	/* disable Rx and Tx */
--	lp->init_block.filter[0] = lp->init_block.filter[1] = 0x0;
--	/* using multiple Rx buffer and a single Tx buffer */
--	lp->init_block.rx_ring = (virt_to_bus(&lp->rx_ring) & 0xffffff) | RX_RING_LEN_BITS;
--	lp->init_block.tx_ring = virt_to_bus(&lp->tx_ring) & 0xffffff;
--	l = virt_to_bus(&lp->init_block);
--	outw(0x1, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw((unsigned short)l, ioaddr+LANCE_DATA);
--	outw(0x2, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw((unsigned short)(l >> 16), ioaddr+LANCE_DATA);
--	outw(0x4, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	outw(0x915, ioaddr+LANCE_DATA);
--	outw(0x0, ioaddr+LANCE_ADDR);
--	(void)inw(ioaddr+LANCE_ADDR);
--	/* Get station address */
--	for (i = 0; i < ETH_ALEN; ++i) {
--		nic->node_addr[i] = inb(ioaddr+LANCE_ETH_ADDR+i);
--	}
--#ifndef	INCLUDE_LANCE
--	/* now probe for DMA channel */
--	dma_channels = ((inb(DMA1_STAT_REG) >> 4) & 0xf) |
--		(inb(DMA2_STAT_REG) & 0xf0);
--	/* need to fix when PCI provides DMA info */
--	for (i = 0; i < (sizeof(dmas)/sizeof(dmas[0])); ++i)
--	{
--		int		j;
--
--		dma = dmas[i];
--		/* Don't enable a permanently busy DMA channel,
--		   or the machine will hang */
--		if (dma_channels & (1 << dma))
--			continue;
--		outw(0x7f04, ioaddr+LANCE_DATA);	/* clear memory error bits */
--		set_dma_mode(dma, DMA_MODE_CASCADE);
--		enable_dma(dma);
--		outw(0x1, ioaddr+LANCE_DATA);		/* init */
--		for (j = 100; j > 0; --j)
--			if (inw(ioaddr+LANCE_DATA) & 0x900)
--				break;
--		if (inw(ioaddr+LANCE_DATA) & 0x100)
--			break;
--		else
--			disable_dma(dma);
--	}
--	if (i >= (sizeof(dmas)/sizeof(dmas[0])))
--		dma = 0;
--	printf("\n%s base %#X, DMA %d, addr %!\n",
--		chip_table[lance_version].name, ioaddr, dma, nic->node_addr);
--#else
--	printf(" %s base %#hX, addr %!\n", chip_table[lance_version].name, ioaddr, nic->node_addr);
--#endif
--	if (chip_table[chip_version].flags & LANCE_ENABLE_AUTOSELECT) {
--		/* Turn on auto-select of media (10baseT or BNC) so that the
--		 * user watch the LEDs. */
--		outw(0x0002, ioaddr+LANCE_ADDR);
--		/* Don't touch 10base2 power bit. */
--		outw(inw(ioaddr+LANCE_BUS_IF) | 0x0002, ioaddr+LANCE_BUS_IF);
--	}
--	return (lance_version);
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--***************************************************************************/
--
--#ifdef	INCLUDE_LANCE
--struct nic *lancepci_probe(struct nic *nic, unsigned short *probe_addrs, struct pci_device *pci)
--#endif
--#ifdef	INCLUDE_NE2100
--struct nic *ne2100_probe(struct nic *nic, unsigned short *probe_addrs)
--#endif
--#ifdef	INCLUDE_NI6510
--struct nic *ni6510_probe(struct nic *nic, unsigned short *probe_addrs)
--#endif
--{
--	unsigned short		*p;
--#ifndef	INCLUDE_LANCE
--	static unsigned short	io_addrs[] = { 0x300, 0x320, 0x340, 0x360, 0 };
--#endif
--
--	/* if probe_addrs is 0, then routine can use a hardwired default */
--	if (probe_addrs == 0) {
--#ifdef	INCLUDE_LANCE
--		return 0;
--#else
--		probe_addrs = io_addrs;
--#endif
--	}
--	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
--	{
--		char	offset15, offset14 = inb(ioaddr + 14);
--		unsigned short	pci_cmd;
--
--#ifdef	INCLUDE_NE2100
--		if ((offset14 == 0x52 || offset14 == 0x57) &&
--		 ((offset15 = inb(ioaddr + 15)) == 0x57 || offset15 == 0x44))
--			if (lance_probe1(nic) >= 0)
--				break;
--#endif
--#ifdef	INCLUDE_NI6510
--		if ((offset14 == 0x00 || offset14 == 0x52) &&
--		 ((offset15 = inb(ioaddr + 15)) == 0x55 || offset15 == 0x44))
--			if (lance_probe1(nic) >= 0)
--				break;
--#endif
--#ifdef	INCLUDE_LANCE
--		adjust_pci_device(pci);
--		if (lance_probe1(nic, pci) >= 0)
--			break;
--#endif
--	}
--	/* if board found */
--	if (ioaddr != 0)
--	{
--		/* point to NIC specific routines */
--		lance_reset(nic);
--		nic->reset = lance_reset;
--		nic->poll = lance_poll;
--		nic->transmit = lance_transmit;
--		nic->disable = lance_disable;
--		return nic;
--	}
--
--	/* no board found */
--	return 0;
--}
-Index: b/netboot/latch.h
-===================================================================
---- /dev/null
-+++ b/netboot/latch.h
-@@ -0,0 +1,10 @@
-+#ifndef LATCH_H
-+#define LATCH_H
-+
-+#define	TICKS_PER_SEC		18
-+
-+/* For different calibrators of the TSC move the declaration of
-+ * sleep_latch and the definitions of it's length here...
-+ */
-+
-+#endif /* LATCH_H */
-Index: b/netboot/linux-asm-io.h
-===================================================================
---- a/netboot/linux-asm-io.h
-+++ /dev/null
-@@ -1,187 +0,0 @@
--#ifndef	_ASM_IO_H
--#define _ASM_IO_H
--
--/*
-- * This file contains the definitions for the x86 IO instructions
-- * inb/inw/inl/outb/outw/outl and the "string versions" of the same
-- * (insb/insw/insl/outsb/outsw/outsl). You can also use "pausing"
-- * versions of the single-IO instructions (inb_p/inw_p/..).
-- *
-- * This file is not meant to be obfuscating: it's just complicated
-- * to (a) handle it all in a way that makes gcc able to optimize it
-- * as well as possible and (b) trying to avoid writing the same thing
-- * over and over again with slight variations and possibly making a
-- * mistake somewhere.
-- */
--
--/*
-- * Thanks to James van Artsdalen for a better timing-fix than
-- * the two short jumps: using outb's to a nonexistent port seems
-- * to guarantee better timings even on fast machines.
-- *
-- * On the other hand, I'd like to be sure of a non-existent port:
-- * I feel a bit unsafe about using 0x80 (should be safe, though)
-- *
-- *		Linus
-- */
--
--#ifdef	SLOW_IO_BY_JUMPING
--#define __SLOW_DOWN_IO __asm__ __volatile__("jmp 1f\n1:\tjmp 1f\n1:")
--#else
--#define __SLOW_DOWN_IO __asm__ __volatile__("outb %al,$0x80")
--#endif
--
--#ifdef	REALLY_SLOW_IO
--#define SLOW_DOWN_IO { __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; __SLOW_DOWN_IO; }
--#else
--#define SLOW_DOWN_IO __SLOW_DOWN_IO
--#endif
--
--/*
-- * readX/writeX() are used to access memory mapped devices. On some
-- * architectures the memory mapped IO stuff needs to be accessed
-- * differently. On the x86 architecture, we just read/write the
-- * memory location directly.
-- */
--#define readb(addr) (*(volatile unsigned char *) (addr))
--#define readw(addr) (*(volatile unsigned short *) (addr))
--#define readl(addr) (*(volatile unsigned int *) (addr))
--
--#define writeb(b,addr) ((*(volatile unsigned char *) (addr)) = (b))
--#define writew(b,addr) ((*(volatile unsigned short *) (addr)) = (b))
--#define writel(b,addr) ((*(volatile unsigned int *) (addr)) = (b))
--
--#define memset_io(a,b,c)	memset((void *)(a),(b),(c))
--#define memcpy_fromio(a,b,c)	memcpy((a),(void *)(b),(c))
--#define memcpy_toio(a,b,c)	memcpy((void *)(a),(b),(c))
--
--/*
-- * Again, i386 does not require mem IO specific function.
-- */
--
--#define eth_io_copy_and_sum(a,b,c,d)	eth_copy_and_sum((a),(void *)(b),(c),(d))
--
--/*
-- * Talk about misusing macros..
-- */
--
--#define __OUT1(s,x) \
--extern void __out##s(unsigned x value, unsigned short port); \
--extern inline void __out##s(unsigned x value, unsigned short port) {
--
--#define __OUT2(s,s1,s2) \
--__asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1"
--
--#define __OUT(s,s1,x) \
--__OUT1(s,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); } \
--__OUT1(s##c,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); } \
--__OUT1(s##_p,x) __OUT2(s,s1,"w") : : "a" (value), "d" (port)); SLOW_DOWN_IO; } \
--__OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; }
--
--#define __IN1(s,x) \
--extern unsigned x __in##s(unsigned short port); \
--extern inline unsigned x __in##s(unsigned short port) { unsigned x _v;
--
--#define __IN2(s,s1,s2) \
--__asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0"
--
--#define __IN(s,s1,x,i...) \
--__IN1(s,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); return _v; } \
--__IN1(s##c,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); return _v; } \
--__IN1(s##_p,x) __IN2(s,s1,"w") : "=a" (_v) : "d" (port) ,##i ); SLOW_DOWN_IO; return _v; } \
--__IN1(s##c_p,x) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; }
--
--#define __INS(s) \
--extern void ins##s(unsigned short port, void * addr, unsigned long count); \
--extern inline void ins##s(unsigned short port, void * addr, unsigned long count) \
--{ __asm__ __volatile__ ("cld ; rep ; ins" #s \
--: "=D" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
--
--#define __OUTS(s) \
--extern void outs##s(unsigned short port, const void * addr, unsigned long  count); \
--extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
--{ __asm__ __volatile__ ("cld ; rep ; outs" #s \
--: "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
--
--__IN(b,"", char)
--__IN(w,"",short)
--__IN(l,"", long)
--
--__OUT(b,"b",char)
--__OUT(w,"w",short)
--__OUT(l,,int)
--
--__INS(b)
--__INS(w)
--__INS(l)
--
--__OUTS(b)
--__OUTS(w)
--__OUTS(l)
--
--/*
-- * Note that due to the way __builtin_constant_p() works, you
-- *  - can't use it inside a inline function (it will never be true)
-- *  - you don't have to worry about side effects within the __builtin..
-- */
--#define outb(val,port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__outbc((val),(port)) : \
--	__outb((val),(port)))
--
--#define inb(port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__inbc(port) : \
--	__inb(port))
--
--#define outb_p(val,port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__outbc_p((val),(port)) : \
--	__outb_p((val),(port)))
--
--#define inb_p(port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__inbc_p(port) : \
--	__inb_p(port))
--
--#define outw(val,port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__outwc((val),(port)) : \
--	__outw((val),(port)))
--
--#define inw(port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__inwc(port) : \
--	__inw(port))
--
--#define outw_p(val,port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__outwc_p((val),(port)) : \
--	__outw_p((val),(port)))
--
--#define inw_p(port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__inwc_p(port) : \
--	__inw_p(port))
--
--#define outl(val,port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__outlc((val),(port)) : \
--	__outl((val),(port)))
--
--#define inl(port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__inlc(port) : \
--	__inl(port))
--
--#define outl_p(val,port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__outlc_p((val),(port)) : \
--	__outl_p((val),(port)))
--
--#define inl_p(port) \
--((__builtin_constant_p((port)) && (port) < 256) ? \
--	__inlc_p(port) : \
--	__inl_p(port))
--
--#endif
-Index: b/netboot/linux-asm-string.h
-===================================================================
---- a/netboot/linux-asm-string.h
-+++ /dev/null
-@@ -1,291 +0,0 @@
--/*
-- * Taken from Linux /usr/include/asm/string.h
-- * All except memcpy, memmove, memset and memcmp removed.
-- */
--
--#ifndef	_I386_STRING_H_
--#define _I386_STRING_H_
--
--/*
-- * This string-include defines all string functions as inline
-- * functions. Use gcc. It also assumes ds=es=data space, this should be
-- * normal. Most of the string-functions are rather heavily hand-optimized,
-- * see especially strtok,strstr,str[c]spn. They should work, but are not
-- * very easy to understand. Everything is done entirely within the register
-- * set, making the functions fast and clean. String instructions have been
-- * used through-out, making for "slightly" unclear code :-)
-- *
-- *		NO Copyright (C) 1991, 1992 Linus Torvalds,
-- *		consider these trivial functions to be PD.
-- */
--
--typedef int	size_t;
--
--extern void *__memcpy(void * to, const void * from, size_t n);
--extern void *__constant_memcpy(void * to, const void * from, size_t n);
--extern void *memmove(void * dest,const void * src, size_t n);
--extern void *__memset_generic(void * s, char c,size_t count);
--extern void *__constant_c_memset(void * s, unsigned long c, size_t count);
--extern void *__constant_c_and_count_memset(void * s, unsigned long pattern, size_t count);
--
--
--extern inline void * __memcpy(void * to, const void * from, size_t n)
--{
--int d0, d1, d2;
--__asm__ __volatile__(
--	"cld\n\t"
--	"rep ; movsl\n\t"
--	"testb $2,%b4\n\t"
--	"je 1f\n\t"
--	"movsw\n"
--	"1:\ttestb $1,%b4\n\t"
--	"je 2f\n\t"
--	"movsb\n"
--	"2:"
--	: "=&c" (d0), "=&D" (d1), "=&S" (d2)
--	:"0" (n/4), "q" (n),"1" ((long) to),"2" ((long) from)
--	: "memory");
--return (to);
--}
--
--/*
-- * This looks horribly ugly, but the compiler can optimize it totally,
-- * as the count is constant.
-- */
--extern inline void * __constant_memcpy(void * to, const void * from, size_t n)
--{
--	switch (n) {
--		case 0:
--			return to;
--		case 1:
--			*(unsigned char *)to = *(const unsigned char *)from;
--			return to;
--		case 2:
--			*(unsigned short *)to = *(const unsigned short *)from;
--			return to;
--		case 3:
--			*(unsigned short *)to = *(const unsigned short *)from;
--			*(2+(unsigned char *)to) = *(2+(const unsigned char *)from);
--			return to;
--		case 4:
--			*(unsigned long *)to = *(const unsigned long *)from;
--			return to;
--		case 6:	/* for Ethernet addresses */
--			*(unsigned long *)to = *(const unsigned long *)from;
--			*(2+(unsigned short *)to) = *(2+(const unsigned short *)from);
--			return to;
--		case 8:
--			*(unsigned long *)to = *(const unsigned long *)from;
--			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
--			return to;
--		case 12:
--			*(unsigned long *)to = *(const unsigned long *)from;
--			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
--			*(2+(unsigned long *)to) = *(2+(const unsigned long *)from);
--			return to;
--		case 16:
--			*(unsigned long *)to = *(const unsigned long *)from;
--			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
--			*(2+(unsigned long *)to) = *(2+(const unsigned long *)from);
--			*(3+(unsigned long *)to) = *(3+(const unsigned long *)from);
--			return to;
--		case 20:
--			*(unsigned long *)to = *(const unsigned long *)from;
--			*(1+(unsigned long *)to) = *(1+(const unsigned long *)from);
--			*(2+(unsigned long *)to) = *(2+(const unsigned long *)from);
--			*(3+(unsigned long *)to) = *(3+(const unsigned long *)from);
--			*(4+(unsigned long *)to) = *(4+(const unsigned long *)from);
--			return to;
--	}
--#define COMMON(x) \
--__asm__ __volatile__( \
--	"cld\n\t" \
--	"rep ; movsl" \
--	x \
--	: "=&c" (d0), "=&D" (d1), "=&S" (d2) \
--	: "0" (n/4),"1" ((long) to),"2" ((long) from) \
--	: "memory");
--{
--	int d0, d1, d2;
--	switch (n % 4) {
--		case 0: COMMON(""); return to;
--		case 1: COMMON("\n\tmovsb"); return to;
--		case 2: COMMON("\n\tmovsw"); return to;
--		default: COMMON("\n\tmovsw\n\tmovsb"); return to;
--	}
--}
--
--#undef COMMON
--}
--
--#define __HAVE_ARCH_MEMCPY
--#define memcpy(t, f, n) \
--(__builtin_constant_p(n) ? \
-- __constant_memcpy((t),(f),(n)) : \
-- __memcpy((t),(f),(n)))
--
--#define __HAVE_ARCH_MEMMOVE
--extern inline void * memmove(void * dest,const void * src, size_t n)
--{
--int d0, d1, d2;
--if (dest<src)
--__asm__ __volatile__(
--	"cld\n\t"
--	"rep\n\t"
--	"movsb"
--	: "=&c" (d0), "=&S" (d1), "=&D" (d2)
--	:"0" (n),"1" (src),"2" (dest)
--	: "memory");
--else
--__asm__ __volatile__(
--	"std\n\t"
--	"rep\n\t"
--	"movsb\n\t"
--	"cld"
--	: "=&c" (d0), "=&S" (d1), "=&D" (d2)
--	:"0" (n),
--	 "1" (n-1+(const char *)src),
--	 "2" (n-1+(char *)dest)
--	:"memory");
--return dest;
--}
--
--#define memcmp __builtin_memcmp
--
--extern inline void * __memset_generic(void * s, char c,size_t count)
--{
--int d0, d1;
--__asm__ __volatile__(
--	"cld\n\t"
--	"rep\n\t"
--	"stosb"
--	: "=&c" (d0), "=&D" (d1)
--	:"a" (c),"1" (s),"0" (count)
--	:"memory");
--return s;
--}
--
--/* we might want to write optimized versions of these later */
--#define __constant_count_memset(s,c,count) __memset_generic((s),(c),(count))
--
--/*
-- * memset(x,0,y) is a reasonably common thing to do, so we want to fill
-- * things 32 bits at a time even when we don't know the size of the
-- * area at compile-time..
-- */
--extern inline void * __constant_c_memset(void * s, unsigned long c, size_t count)
--{
--int d0, d1;
--__asm__ __volatile__(
--	"cld\n\t"
--	"rep ; stosl\n\t"
--	"testb $2,%b3\n\t"
--	"je 1f\n\t"
--	"stosw\n"
--	"1:\ttestb $1,%b3\n\t"
--	"je 2f\n\t"
--	"stosb\n"
--	"2:"
--	: "=&c" (d0), "=&D" (d1)
--	:"a" (c), "q" (count), "0" (count/4), "1" ((long) s)
--	:"memory");
--return (s);
--}
--
--/*
-- * This looks horribly ugly, but the compiler can optimize it totally,
-- * as we by now know that both pattern and count is constant..
-- */
--extern inline void * __constant_c_and_count_memset(void * s, unsigned long pattern, size_t count)
--{
--	switch (count) {
--		case 0:
--			return s;
--		case 1:
--			*(unsigned char *)s = pattern;
--			return s;
--		case 2:
--			*(unsigned short *)s = pattern;
--			return s;
--		case 3:
--			*(unsigned short *)s = pattern;
--			*(2+(unsigned char *)s) = pattern;
--			return s;
--		case 4:
--			*(unsigned long *)s = pattern;
--			return s;
--	}
--#define COMMON(x) \
--__asm__  __volatile__("cld\n\t" \
--	"rep ; stosl" \
--	x \
--	: "=&c" (d0), "=&D" (d1) \
--	: "a" (pattern),"0" (count/4),"1" ((long) s) \
--	: "memory")
--{
--	int d0, d1;
--	switch (count % 4) {
--		case 0: COMMON(""); return s;
--		case 1: COMMON("\n\tstosb"); return s;
--		case 2: COMMON("\n\tstosw"); return s;
--		default: COMMON("\n\tstosw\n\tstosb"); return s;
--	}
--}
--
--#undef COMMON
--}
--
--#define __constant_c_x_memset(s, c, count) \
--(__builtin_constant_p(count) ? \
-- __constant_c_and_count_memset((s),(c),(count)) : \
-- __constant_c_memset((s),(c),(count)))
--
--#define __memset(s, c, count) \
--(__builtin_constant_p(count) ? \
-- __constant_count_memset((s),(c),(count)) : \
-- __memset_generic((s),(c),(count)))
--
--#define __HAVE_ARCH_MEMSET
--#define memset(s, c, count) \
--(__builtin_constant_p(c) ? \
-- __constant_c_x_memset((s),(c),(count)) : \
-- __memset((s),(c),(count)))
--
--#define __HAVE_ARCH_STRNCMP
--static inline int strncmp(const char * cs,const char * ct,size_t count)
--{
--register int __res;
--int d0, d1, d2;
--__asm__ __volatile__(
--	"1:\tdecl %3\n\t"
--	"js 2f\n\t"
--	"lodsb\n\t"
--	"scasb\n\t"
--	"jne 3f\n\t"
--	"testb %%al,%%al\n\t"
--	"jne 1b\n"
--	"2:\txorl %%eax,%%eax\n\t"
--	"jmp 4f\n"
--	"3:\tsbbl %%eax,%%eax\n\t"
--	"orb $1,%%al\n"
--	"4:"
--		     :"=a" (__res), "=&S" (d0), "=&D" (d1), "=&c" (d2)
--		     :"1" (cs),"2" (ct),"3" (count));
--return __res;
--}
--
--#define __HAVE_ARCH_STRLEN
--static inline size_t strlen(const char * s)
--{
--int d0;
--register int __res;
--__asm__ __volatile__(
--	"repne\n\t"
--	"scasb\n\t"
--	"notl %0\n\t"
--	"decl %0"
--	:"=c" (__res), "=&D" (d0) :"1" (s),"a" (0), "0" (0xffffffff));
--return __res;
--}
--
--#endif
-Index: b/netboot/little_bswap.h
-===================================================================
---- /dev/null
-+++ b/netboot/little_bswap.h
-@@ -0,0 +1,17 @@
-+#ifndef ETHERBOOT_LITTLE_BSWAP_H
-+#define ETHERBOOT_LITTLE_BSWAP_H
-+
-+#define ntohl(x)	__bswap_32(x)
-+#define htonl(x) 	__bswap_32(x)
-+#define ntohs(x) 	__bswap_16(x)
-+#define htons(x) 	__bswap_16(x)
-+#define cpu_to_le32(x)	(x)
-+#define cpu_to_le16(x)	(x)
-+#define cpu_to_be32(x)	__bswap_32(x)
-+#define cpu_to_be16(x)	__bswap_16(x)
-+#define le32_to_cpu(x)	(x)
-+#define le16_to_cpu(x)	(x)
-+#define be32_to_cpu(x)	__bswap_32(x)
-+#define be16_to_cpu(x)	__bswap_16(x)
-+
-+#endif /* ETHERBOOT_LITTLE_BSWAP_H */
-Index: b/netboot/mii.h
-===================================================================
---- /dev/null
-+++ b/netboot/mii.h
-@@ -0,0 +1,105 @@
-+/*
-+ * linux/mii.h: definitions for MII-compatible transceivers
-+ * Originally drivers/net/sunhme.h.
-+ *
-+ * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)
-+ *
-+ * Copied Form Linux 2.4.25 an unneeded items removed by:
-+ * Timothy Legge (timlegge at etherboot dot org)
-+ *
-+ * 03/26/2004
-+ */
-+
-+/* Generic MII registers. */
-+
-+#define MII_BMCR            0x00	/* Basic mode control register */
-+#define MII_BMSR            0x01	/* Basic mode status register  */
-+#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
-+#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
-+#define MII_ADVERTISE       0x04	/* Advertisement control reg   */
-+#define MII_LPA             0x05	/* Link partner ability reg    */
-+#define MII_EXPANSION       0x06        /* Expansion register          */
-+#define MII_DCOUNTER        0x12        /* Disconnect counter          */
-+#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
-+#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
-+#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
-+#define MII_SREVISION       0x16        /* Silicon revision            */
-+#define MII_RESV1           0x17        /* Reserved...                 */
-+#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
-+#define MII_PHYADDR         0x19        /* PHY address                 */
-+#define MII_RESV2           0x1a        /* Reserved...                 */
-+#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
-+#define MII_NCONFIG         0x1c        /* Network interface config    */
-+
-+/* Basic mode control register. */
-+#define BMCR_RESV               0x007f  /* Unused...                   */
-+#define BMCR_CTST               0x0080  /* Collision test              */
-+#define BMCR_FULLDPLX           0x0100	/* Full duplex                 */
-+#define BMCR_ANRESTART          0x0200	/* Auto negotiation restart    */
-+#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
-+#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
-+#define BMCR_ANENABLE           0x1000	/* Enable auto negotiation     */
-+#define BMCR_SPEED100           0x2000	/* Select 100Mbps              */
-+#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
-+#define BMCR_RESET              0x8000	/* Reset the DP83840           */
-+
-+/* Basic mode status register. */
-+#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
-+#define BMSR_JCD                0x0002  /* Jabber detected             */
-+#define BMSR_LSTATUS            0x0004  /* Link status                 */
-+#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
-+#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
-+#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
-+#define BMSR_RESV               0x07c0  /* Unused...                   */
-+#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
-+#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
-+#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
-+#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
-+#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
-+
-+/* Advertisement control register. */
-+#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
-+#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
-+#define ADVERTISE_10HALF        0x0020	/* Try for 10mbps half-duplex  */
-+#define ADVERTISE_10FULL        0x0040	/* Try for 10mbps full-duplex  */
-+#define ADVERTISE_100HALF       0x0080	/* Try for 100mbps half-duplex */
-+#define ADVERTISE_100FULL       0x0100	/* Try for 100mbps full-duplex */
-+#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
-+#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
-+#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
-+#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
-+#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
-+
-+#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
-+			ADVERTISE_CSMA)
-+#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
-+                      ADVERTISE_100HALF | ADVERTISE_100FULL)
-+
-+/* Link partner ability register. */
-+#define LPA_SLCT                0x001f  /* Same as advertise selector  */
-+#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
-+#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
-+#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
-+#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
-+#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
-+#define LPA_RESV                0x1c00  /* Unused...                   */
-+#define LPA_RFAULT              0x2000  /* Link partner faulted        */
-+#define LPA_LPACK               0x4000  /* Link partner acked us       */
-+#define LPA_NPAGE               0x8000  /* Next page bit               */
-+
-+#define LPA_DUPLEX            (LPA_10FULL | LPA_100FULL)
-+#define LPA_100                       (LPA_100FULL | LPA_100HALF | LPA_100BASE4)
-+
-+/* Expansion register for auto-negotiation. */
-+#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
-+#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
-+#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
-+#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
-+#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
-+#define EXPANSION_RESV          0xffe0  /* Unused...                   */
-+
-+/* N-way test register. */
-+#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
-+#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
-+#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
-+
-Index: b/netboot/misc.c
-===================================================================
---- a/netboot/misc.c
-+++ b/netboot/misc.c
-@@ -19,37 +19,90 @@
- 
- /* Based on "src/misc.c" in etherboot-5.0.5.  */
- 
--#define GRUB	1
--#include <etherboot.h>
-+#include "grub.h"
-+#include "timer.h"
- 
--void
--sleep (int secs)
-+#include "nic.h"
-+
-+/**************************************************************************
-+RANDOM - compute a random number between 0 and 2147483647L or 2147483562?
-+**************************************************************************/
-+int32_t random(void)
- {
--  unsigned long tmo = currticks () + secs;
-+	static int32_t seed = 0;
-+	int32_t q;
-+	if (!seed) /* Initialize linear congruential generator */
-+		seed = currticks() + *(int32_t *)&arptable[ARP_CLIENT].node
-+		       + ((int16_t *)arptable[ARP_CLIENT].node)[2];
-+	/* simplified version of the LCG given in Bruce Schneier's
-+	   "Applied Cryptography" */
-+	q = seed/53668;
-+	if ((seed = 40014*(seed-53668*q) - 12211*q) < 0) seed += 2147483563L;
-+	return seed;
-+}
- 
--  while (currticks () < tmo)
--    ;
-+/**************************************************************************
-+POLL INTERRUPTIONS
-+**************************************************************************/
-+void poll_interruptions(void)
-+{
-+	if (checkkey() != -1 && ASCII_CHAR(getkey()) == K_INTR) {
-+		user_abort++;
-+	}
- }
- 
--void
--twiddle (void)
-+/**************************************************************************
-+SLEEP
-+**************************************************************************/
-+void sleep(int secs)
- {
--  static unsigned long lastticks = 0;
--  static int count = 0;
--  static const char tiddles[]="-\\|/";
--  unsigned long ticks;
-+	unsigned long tmo;
- 
--  if (debug)
--    {
--      if ((ticks = currticks ()) == lastticks)
--	return;
--      
--      lastticks = ticks;
--      grub_putchar (tiddles[(count++) & 3]);
--      grub_putchar ('\b');
--    }
-+	for (tmo = currticks()+secs*TICKS_PER_SEC; currticks() < tmo; ) {
-+		poll_interruptions();
-+	}
-+}
-+
-+/**************************************************************************
-+INTERRUPTIBLE SLEEP
-+**************************************************************************/
-+void interruptible_sleep(int secs)
-+{
-+	printf("<sleep>\n");
-+	return sleep(secs);
-+}
-+
-+/**************************************************************************
-+TWIDDLE
-+**************************************************************************/
-+void twiddle(void)
-+{
-+#ifdef BAR_PROGRESS
-+	static int count=0;
-+	static const char tiddles[]="-\\|/";
-+	static unsigned long lastticks = 0;
-+	unsigned long ticks;
-+#endif
-+#ifdef FREEBSD_PXEEMU
-+	extern char pxeemu_nbp_active;
-+	if(pxeemu_nbp_active != 0)
-+		return;
-+#endif
-+#ifdef	BAR_PROGRESS
-+	/* Limit the maximum rate at which characters are printed */
-+	ticks = currticks();
-+	if ((lastticks + (TICKS_PER_SEC/18)) > ticks)
-+		return;
-+	lastticks = ticks;
-+
-+	putchar(tiddles[(count++)&3]);
-+	putchar('\b');
-+#else
-+	//putchar('.');
-+#endif	/* BAR_PROGRESS */
- }
- 
-+
- /* Because Etherboot uses its own formats for the printf family,
-    define separate definitions from GRUB.  */
- /**************************************************************************
-@@ -264,3 +317,5 @@
-   
-   return ret;
- }
-+
-+
-Index: b/netboot/natsemi.c
-===================================================================
---- a/netboot/natsemi.c
-+++ b/netboot/natsemi.c
-@@ -47,15 +47,15 @@
- /* Revision History */
- 
- /*
-+  13 Dec 2003 timlegge 1.1 Enabled Multicast Support
-   29 May 2001  mdc     1.0
-      Initial Release.  Tested with Netgear FA311 and FA312 boards
--*/
-+*/
- /* Includes */
- 
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- 
- /* defines */
- 
-@@ -71,21 +71,18 @@
- 
- #define NUM_RX_DESC    4              /* Number of Rx descriptor registers. */
- 
--typedef unsigned char  u8;
--typedef   signed char  s8;
--typedef unsigned short u16;
--typedef   signed short s16;
--typedef unsigned int   u32;
--typedef   signed int   s32;
-+typedef uint8_t    u8;
-+typedef int8_t     s8;
-+typedef uint16_t   u16;
-+typedef int16_t    s16;
-+typedef uint32_t   u32;
-+typedef int32_t    s32;
- 
- /* helpful macroes if on a big_endian machine for changing byte order.
-    not strictly needed on Intel */
--#define le16_to_cpu(val) (val)
--#define cpu_to_le32(val) (val)
- #define get_unaligned(ptr) (*(ptr))
- #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
- #define get_u16(ptr) (*(u16 *)(ptr))
--#define virt_to_bus(x) ((unsigned long)x)
- #define virt_to_le32desc(addr)  virt_to_bus(addr)
- 
- enum pcistuff {
-@@ -161,7 +158,8 @@
-     AcceptMulticast    = 0x00200000, 
-     AcceptAllMulticast = 0x20000000,
-     AcceptAllPhys      = 0x10000000, 
--    AcceptMyPhys       = 0x08000000
-+    AcceptMyPhys       = 0x08000000,
-+    RxFilterEnable     = 0x80000000
- };
- 
- typedef struct _BufferDesc {
-@@ -207,17 +205,12 @@
- static BufferDesc txd              __attribute__ ((aligned(4)));
- static BufferDesc rxd[NUM_RX_DESC] __attribute__ ((aligned(4)));
- 
--#ifdef USE_LOWMEM_BUFFER
--#define txb ((char *)0x10000 - TX_BUF_SIZE)
--#define rxb ((char *)0x10000 - NUM_RX_DESC*RX_BUF_SIZE - TX_BUF_SIZE)
--#else
- static unsigned char txb[TX_BUF_SIZE] __attribute__ ((aligned(4)));
- static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE] __attribute__ ((aligned(4)));
--#endif
- 
- /* Function Prototypes */
- 
--struct nic *natsemi_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci);
-+static int natsemi_probe(struct dev *dev, struct pci_device *pci);
- static int eeprom_read(long addr, int location);
- static int mdio_read(int phy_id, int location);
- static void natsemi_init(struct nic *nic);
-@@ -228,8 +221,9 @@
- static void natsemi_set_rx_mode(struct nic *nic);
- static void natsemi_check_duplex(struct nic *nic);
- static void natsemi_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p);
--static int  natsemi_poll(struct nic *nic);
--static void natsemi_disable(struct nic *nic);
-+static int  natsemi_poll(struct nic *nic, int retrieve);
-+static void natsemi_disable(struct dev *dev);
-+static void natsemi_irq(struct nic *nic, irq_action_t action);
- 
- /* 
-  * Function: natsemi_probe
-@@ -245,24 +239,28 @@
-  * Returns:   struct nic *:          pointer to NIC data structure
-  */
- 
--struct nic *
--natsemi_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
-+static int
-+natsemi_probe(struct dev *dev, struct pci_device *pci)
- {
-+    struct nic *nic = (struct nic *)dev;
-     int i;
-     int prev_eedata;
-     u32 tmp;
- 
--    if (io_addrs == 0 || *io_addrs == 0)
--        return NULL;
-+    if (pci->ioaddr == 0)
-+        return 0;
-+
-+    adjust_pci_device(pci);
- 
-     /* initialize some commonly used globals */
- 	
--    ioaddr     = *io_addrs & ~3;
-+    nic->irqno  = 0;
-+    nic->ioaddr = pci->ioaddr & ~3;
-+
-+    ioaddr     = pci->ioaddr & ~3;
-     vendor     = pci->vendor;
-     dev_id     = pci->dev_id;
-     nic_name   = pci->name;
--    
--    adjust_pci_device(pci);
- 
-     /* natsemi has a non-standard PM control register
-      * in PCI config space.  Some boards apparently need
-@@ -317,12 +315,12 @@
-     /* initialize device */
-     natsemi_init(nic);
- 
--    nic->reset    = natsemi_init;
-+    dev->disable  = natsemi_disable;
-     nic->poll     = natsemi_poll;
-     nic->transmit = natsemi_transmit;
--    nic->disable  = natsemi_disable;
-+    nic->irq      = natsemi_irq;
- 
--    return nic;
-+    return 1;
- }
- 
- /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.
-@@ -452,7 +450,7 @@
-  * Returns:   void.
-  */
- static void 
--natsemi_reset(struct nic *nic)
-+natsemi_reset(struct nic *nic __unused)
- {
-     outl(ChipReset, ioaddr + ChipCmd);
- 	
-@@ -504,14 +502,14 @@
-  */
- 
- static void
--natsemi_init_txd(struct nic *nic)
-+natsemi_init_txd(struct nic *nic __unused)
- {
-     txd.link   = (u32) 0;
-     txd.cmdsts = (u32) 0;
--    txd.bufptr = (u32) &txb[0];
-+    txd.bufptr = virt_to_bus(&txb[0]);
- 
-     /* load Transmit Descriptor Register */
--    outl((u32) &txd, ioaddr + TxRingPtr); 
-+    outl(virt_to_bus(&txd), ioaddr + TxRingPtr); 
-     if (natsemi_debug > 1)
-         printf("natsemi_init_txd: TX descriptor register loaded with: %X\n", 
-                inl(ioaddr + TxRingPtr));
-@@ -527,7 +525,7 @@
-  */
-  
- static void 
--natsemi_init_rxd(struct nic *nic) 
-+natsemi_init_rxd(struct nic *nic __unused) 
- { 
-     int i;
- 
-@@ -535,16 +533,16 @@
- 
-     /* init RX descriptor */
-     for (i = 0; i < NUM_RX_DESC; i++) {
--        rxd[i].link   = (i+1 < NUM_RX_DESC) ? (u32) &rxd[i+1] : (u32) &rxd[0];
-+        rxd[i].link   = virt_to_bus((i+1 < NUM_RX_DESC) ? &rxd[i+1] : &rxd[0]);
-         rxd[i].cmdsts = (u32) RX_BUF_SIZE;
--        rxd[i].bufptr = (u32) &rxb[i*RX_BUF_SIZE];
-+        rxd[i].bufptr = virt_to_bus(&rxb[i*RX_BUF_SIZE]);
-         if (natsemi_debug > 1)
-             printf("natsemi_init_rxd: rxd[%d]=%X link=%X cmdsts=%X bufptr=%X\n", 
-                    i, &rxd[i], rxd[i].link, rxd[i].cmdsts, rxd[i].bufptr);
-     }
- 
-     /* load Receive Descriptor Register */
--    outl((u32) &rxd[0], ioaddr + RxRingPtr);
-+    outl(virt_to_bus(&rxd[0]), ioaddr + RxRingPtr);
- 
-     if (natsemi_debug > 1)
-         printf("natsemi_init_rxd: RX descriptor register loaded with: %X\n", 
-@@ -562,14 +560,15 @@
-  * Returns:   void.
-  */
- 
--static void natsemi_set_rx_mode(struct nic *nic)
-+static void natsemi_set_rx_mode(struct nic *nic __unused)
- {
--    u32 rx_mode = AcceptBroadcast | AcceptMyPhys;
-+    u32 rx_mode = RxFilterEnable | AcceptBroadcast |
-+	    AcceptAllMulticast | AcceptMyPhys;
- 	
-     outl(rx_mode, ioaddr + RxFilterAddr);
- }
- 
--static void natsemi_check_duplex(struct nic *nic)
-+static void natsemi_check_duplex(struct nic *nic __unused)
- {
-     int duplex = inl(ioaddr + ChipConfig) & 0x20000000 ? 1 : 0;
- 	
-@@ -607,14 +606,14 @@
- 		 unsigned int s,     /* size */
- 		 const char  *p)     /* Packet */
- {
--    u32 status, to, nstype;
-+    u32 to, nstype;
-     volatile u32 tx_status;
-     
-     /* Stop the transmitter */
-     outl(TxOff, ioaddr + ChipCmd);
- 
-     /* load Transmit Descriptor Register */
--    outl((u32) &txd, ioaddr + TxRingPtr);
-+    outl(virt_to_bus(&txd), ioaddr + TxRingPtr);
-     if (natsemi_debug > 1)
-         printf("natsemi_transmit: TX descriptor register loaded with: %X\n", 
-                inl(ioaddr + TxRingPtr));
-@@ -636,7 +635,7 @@
-         txb[s++] = '\0';
- 
-     /* set the transmit buffer descriptor and enable Transmit State Machine */
--    txd.bufptr = (u32) &txb[0];
-+    txd.bufptr = virt_to_bus(&txb[0]);
-     txd.cmdsts = (u32) OWN | s;
- 
-     /* restart the transmitter */
-@@ -647,7 +646,7 @@
- 
-     to = currticks() + TX_TIMEOUT;
- 
--    while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to))
-+    while (((tx_status=txd.cmdsts & OWN) && (currticks() < to))
-         /* wait */ ;
- 
-     if (currticks() >= to) {
-@@ -674,7 +673,7 @@
-  */
- 
- static int
--natsemi_poll(struct nic *nic)
-+natsemi_poll(struct nic *nic, int retrieve)
- {
-     u32 rx_status = rxd[cur_rx].cmdsts;
-     int retstat = 0;
-@@ -685,6 +684,8 @@
-     if (!(rx_status & OWN))
-         return retstat;
- 
-+    if ( ! retrieve ) return 1;
-+
-     if (natsemi_debug > 1)
-         printf("natsemi_poll: got a packet: cur_rx:%d, status:%X\n",
-                cur_rx, rx_status);
-@@ -704,7 +705,7 @@
- 
-     /* return the descriptor and buffer to receive ring */
-     rxd[cur_rx].cmdsts = RX_BUF_SIZE;
--    rxd[cur_rx].bufptr = (u32) &rxb[cur_rx*RX_BUF_SIZE];
-+    rxd[cur_rx].bufptr = virt_to_bus(&rxb[cur_rx*RX_BUF_SIZE]);
-         
-     if (++cur_rx == NUM_RX_DESC)
-         cur_rx = 0;
-@@ -725,8 +726,12 @@
-  */
- 
- static void
--natsemi_disable(struct nic *nic)
-+natsemi_disable(struct dev *dev)
- {
-+    struct nic *nic = (struct nic *)dev;
-+    /* merge reset and disable */
-+    natsemi_init(nic);
-+
-     /* Disable interrupts using the mask. */
-     outl(0, ioaddr + IntrMask);
-     outl(0, ioaddr + IntrEnable);
-@@ -737,3 +742,39 @@
-     /* Restore PME enable bit */
-     outl(SavedClkRun, ioaddr + ClkRun);
- }
-+
-+/* Function: natsemi_irq
-+ *
-+ * Description: Enable, Disable, or Force interrupts
-+ *    
-+ * Arguments: struct nic *nic:          NIC data structure
-+ *            irq_action_t action:      requested action to perform
-+ *
-+ * Returns:   void.
-+ */
-+
-+static void 
-+natsemi_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+static struct pci_id natsemi_nics[] = {
-+PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
-+};
-+
-+struct pci_driver natsemi_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "NATSEMI",
-+	.probe    = natsemi_probe,
-+	.ids      = natsemi_nics,
-+	.id_count = sizeof(natsemi_nics)/sizeof(natsemi_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/nfs.h
-===================================================================
---- /dev/null
-+++ b/netboot/nfs.h
-@@ -0,0 +1,63 @@
-+#ifndef	_NFS_H
-+#define	_NFS_H
-+
-+#define SUNRPC_PORT	111
-+
-+#define PROG_PORTMAP	100000
-+#define PROG_NFS	100003
-+#define PROG_MOUNT	100005
-+
-+#define MSG_CALL	0
-+#define MSG_REPLY	1
-+
-+#define PORTMAP_GETPORT	3
-+
-+#define MOUNT_ADDENTRY	1
-+#define MOUNT_UMOUNTALL	4
-+
-+#define NFS_LOOKUP	4
-+#define	NFS_READLINK	5
-+#define NFS_READ	6
-+
-+#define NFS_FHSIZE	32
-+
-+#define NFSERR_PERM	1
-+#define NFSERR_NOENT	2
-+#define NFSERR_ACCES	13
-+#define	NFSERR_ISDIR	21
-+#define	NFSERR_INVAL	22
-+
-+/* Block size used for NFS read accesses.  A RPC reply packet (including  all
-+ * headers) must fit within a single Ethernet frame to avoid fragmentation.
-+ * Chosen to be a power of two, as most NFS servers are optimized for this.  */
-+#define NFS_READ_SIZE	1024
-+
-+#define NFS_MAXLINKDEPTH 16
-+
-+struct rpc_t {
-+	struct iphdr ip;
-+	struct udphdr udp;
-+	union {
-+		uint8_t  data[300];		/* longest RPC call must fit!!!! */
-+		struct {
-+			uint32_t id;
-+			uint32_t type;
-+			uint32_t rpcvers;
-+			uint32_t prog;
-+			uint32_t vers;
-+			uint32_t proc;
-+			uint32_t data[1];
-+		} call;
-+		struct {
-+			uint32_t id;
-+			uint32_t type;
-+			uint32_t rstatus;
-+			uint32_t verifier;
-+			uint32_t v2;
-+			uint32_t astatus;
-+			uint32_t data[1];
-+		} reply;
-+	} u;
-+};
-+
-+#endif	/* _NFS_H */
-Index: b/netboot/ni5010.c
-===================================================================
---- a/netboot/ni5010.c
-+++ /dev/null
-@@ -1,371 +0,0 @@
--/**************************************************************************
--Etherboot -  BOOTP/TFTP Bootstrap Program
--Driver for NI5010.
--Code freely taken from Jan-Pascal van Best and Andreas Mohr's
--Linux NI5010 driver.
--***************************************************************************/
--
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
--/* to get some global routines like printf */
--#include "etherboot.h"
--/* to get the interface to the body of the program */
--#include "nic.h"
--/* to get our own prototype */
--#include "cards.h"
--
--/* ni5010.h file included verbatim */
--/*
-- * Racal-Interlan ni5010 Ethernet definitions
-- *
-- * This is an extension to the Linux operating system, and is covered by the
-- * same Gnu Public License that covers that work.
-- *
-- * copyrights (c) 1996 by Jan-Pascal van Best (jvbest@wi.leidenuniv.nl)
-- *
-- * I have done a look in the following sources:
-- *   crynwr-packet-driver by Russ Nelson
-- */
--
--#define NI5010_BUFSIZE	2048	/* number of bytes in a buffer */
--
--#define NI5010_MAGICVAL0 0x00  /* magic-values for ni5010 card */
--#define NI5010_MAGICVAL1 0x55
--#define NI5010_MAGICVAL2 0xAA
--
--#define SA_ADDR0 0x02
--#define SA_ADDR1 0x07
--#define SA_ADDR2 0x01
--
--/* The number of low I/O ports used by the ni5010 ethercard. */
--#define NI5010_IO_EXTENT       32
--
--#define PRINTK(x) if (NI5010_DEBUG) printk x
--#define PRINTK2(x) if (NI5010_DEBUG>=2) printk x
--#define PRINTK3(x) if (NI5010_DEBUG>=3) printk x
--
--/* The various IE command registers */
--#define EDLC_XSTAT	(ioaddr + 0x00)	/* EDLC transmit csr */
--#define EDLC_XCLR	(ioaddr + 0x00)	/* EDLC transmit "Clear IRQ" */
--#define EDLC_XMASK	(ioaddr + 0x01)	/* EDLC transmit "IRQ Masks" */
--#define EDLC_RSTAT	(ioaddr + 0x02)	/* EDLC receive csr */
--#define EDLC_RCLR	(ioaddr + 0x02)	/* EDLC receive "Clear IRQ" */
--#define EDLC_RMASK	(ioaddr + 0x03)	/* EDLC receive "IRQ Masks" */
--#define EDLC_XMODE	(ioaddr + 0x04)	/* EDLC transmit Mode */
--#define EDLC_RMODE	(ioaddr + 0x05)	/* EDLC receive Mode */
--#define EDLC_RESET	(ioaddr + 0x06)	/* EDLC RESET register */
--#define EDLC_TDR1	(ioaddr + 0x07)	/* "Time Domain Reflectometry" reg1 */
--#define EDLC_ADDR	(ioaddr + 0x08)	/* EDLC station address, 6 bytes */
--	 			/* 0x0E doesn't exist for r/w */
--#define EDLC_TDR2	(ioaddr + 0x0f)	/* "Time Domain Reflectometry" reg2 */
--#define IE_GP		(ioaddr + 0x10)	/* GP pointer (word register) */
--				/* 0x11 is 2nd byte of GP Pointer */
--#define IE_RCNT		(ioaddr + 0x10)	/* Count of bytes in rcv'd packet */
-- 				/* 0x11 is 2nd byte of "Byte Count" */
--#define IE_MMODE	(ioaddr + 0x12)	/* Memory Mode register */
--#define IE_DMA_RST	(ioaddr + 0x13)	/* IE DMA Reset.  write only */
--#define IE_ISTAT	(ioaddr + 0x13)	/* IE Interrupt Status.  read only */
--#define IE_RBUF		(ioaddr + 0x14)	/* IE Receive Buffer port */
--#define IE_XBUF		(ioaddr + 0x15)	/* IE Transmit Buffer port */
--#define IE_SAPROM	(ioaddr + 0x16)	/* window on station addr prom */
--#define IE_RESET	(ioaddr + 0x17)	/* any write causes Board Reset */
--
--/* bits in EDLC_XSTAT, interrupt clear on write, status when read */
--#define XS_TPOK		0x80	/* transmit packet successful */
--#define XS_CS		0x40	/* carrier sense */
--#define XS_RCVD		0x20	/* transmitted packet received */
--#define XS_SHORT	0x10	/* transmission media is shorted */
--#define XS_UFLW		0x08	/* underflow.  iff failed board */
--#define XS_COLL		0x04	/* collision occurred */
--#define XS_16COLL	0x02	/* 16th collision occurred */
--#define XS_PERR		0x01	/* parity error */
--
--#define XS_CLR_UFLW	0x08	/* clear underflow */
--#define XS_CLR_COLL	0x04	/* clear collision */
--#define XS_CLR_16COLL	0x02	/* clear 16th collision */
--#define XS_CLR_PERR	0x01	/* clear parity error */
--
--/* bits in EDLC_XMASK, mask/enable transmit interrupts.  register is r/w */
--#define XM_TPOK		0x80	/* =1 to enable Xmt Pkt OK interrupts */
--#define XM_RCVD		0x20	/* =1 to enable Xmt Pkt Rcvd ints */
--#define XM_UFLW		0x08	/* =1 to enable Xmt Underflow ints */
--#define XM_COLL		0x04	/* =1 to enable Xmt Collision ints */
--#define XM_COLL16	0x02	/* =1 to enable Xmt 16th Coll ints */
--#define XM_PERR		0x01	/* =1 to enable Xmt Parity Error ints */
-- 				/* note: always clear this bit */
--#define XM_ALL		(XM_TPOK | XM_RCVD | XM_UFLW | XM_COLL | XM_COLL16)
--
--/* bits in EDLC_RSTAT, interrupt clear on write, status when read */
--#define RS_PKT_OK	0x80	/* received good packet */
--#define RS_RST_PKT	0x10	/* RESET packet received */
--#define RS_RUNT		0x08	/* Runt Pkt rcvd.  Len < 64 Bytes */
--#define RS_ALIGN	0x04	/* Alignment error. not 8 bit aligned */
--#define RS_CRC_ERR	0x02	/* Bad CRC on rcvd pkt */
--#define RS_OFLW		0x01	/* overflow for rcv FIFO */
--#define RS_VALID_BITS	( RS_PKT_OK | RS_RST_PKT | RS_RUNT | RS_ALIGN | RS_CRC_ERR | RS_OFLW )
-- 				/* all valid RSTAT bits */
--
--#define RS_CLR_PKT_OK	0x80	/* clear rcvd packet interrupt */
--#define RS_CLR_RST_PKT	0x10	/* clear RESET packet received */
--#define RS_CLR_RUNT	0x08	/* clear Runt Pckt received */
--#define RS_CLR_ALIGN	0x04	/* clear Alignment error */
--#define RS_CLR_CRC_ERR	0x02	/* clear CRC error */
--#define RS_CLR_OFLW	0x01	/* clear rcv FIFO Overflow */
--
--/* bits in EDLC_RMASK, mask/enable receive interrupts.  register is r/w */
--#define RM_PKT_OK	0x80	/* =1 to enable rcvd good packet ints */
--#define RM_RST_PKT	0x10	/* =1 to enable RESET packet ints */
--#define RM_RUNT		0x08	/* =1 to enable Runt Pkt rcvd ints */
--#define RM_ALIGN	0x04	/* =1 to enable Alignment error ints */
--#define RM_CRC_ERR	0x02	/* =1 to enable Bad CRC error ints */
--#define RM_OFLW		0x01	/* =1 to enable overflow error ints */
--
--/* bits in EDLC_RMODE, set Receive Packet mode.  register is r/w */
--#define RMD_TEST	0x80	/* =1 for Chip testing.  normally 0 */
--#define RMD_ADD_SIZ	0x10	/* =1 5-byte addr match.  normally 0 */
--#define RMD_EN_RUNT	0x08	/* =1 enable runt rcv.  normally 0 */
--#define RMD_EN_RST	0x04	/* =1 to rcv RESET pkt.  normally 0 */
--
--#define RMD_PROMISC	0x03	/* receive *all* packets.  unusual */
--#define RMD_MULTICAST	0x02	/* receive multicasts too.  unusual */
--#define RMD_BROADCAST	0x01	/* receive broadcasts & normal. usual */
--#define RMD_NO_PACKETS	0x00	/* don't receive any packets. unusual */
--
--/* bits in EDLC_XMODE, set Transmit Packet mode.  register is r/w */
--#define XMD_COLL_CNT	0xf0	/* coll's since success.  read-only */
--#define XMD_IG_PAR	0x08	/* =1 to ignore parity.  ALWAYS set */
--#define XMD_T_MODE	0x04	/* =1 to power xcvr. ALWAYS set this */
--#define XMD_LBC		0x02	/* =1 for loopback.  normally set */
--#define XMD_DIS_C	0x01	/* =1 disables contention. normally 0 */
--
--/* bits in EDLC_RESET, write only */
--#define RS_RESET	0x80	/* =1 to hold EDLC in reset state */
--
--/* bits in IE_MMODE, write only */
--#define MM_EN_DMA	0x80	/* =1 begin DMA xfer, Cplt clrs it */
--#define MM_EN_RCV	0x40	/* =1 allows Pkt rcv.  clr'd by rcv */
--#define MM_EN_XMT	0x20	/* =1 begin Xmt pkt.  Cplt clrs it */
--#define MM_BUS_PAGE	0x18	/* =00 ALWAYS.  Used when MUX=1 */
--#define MM_NET_PAGE	0x06	/* =00 ALWAYS.  Used when MUX=0 */
--#define MM_MUX		0x01	/* =1 means Rcv Buff on system bus */
--				/* =0 means Xmt Buff on system bus */
--
--/* bits in IE_ISTAT, read only */
--#define IS_TDIAG	0x80	/* =1 if Diagnostic problem */
--#define IS_EN_RCV	0x20	/* =1 until frame is rcv'd cplt */
--#define IS_EN_XMT	0x10	/* =1 until frame is xmt'd cplt */
--#define IS_EN_DMA	0x08	/* =1 until DMA is cplt or aborted */
--#define IS_DMA_INT	0x04	/* =0 iff DMA done interrupt. */
--#define IS_R_INT	0x02	/* =0 iff unmasked Rcv interrupt */
--#define IS_X_INT	0x01	/* =0 iff unmasked Xmt interrupt */
--
--/* NIC specific static variables go here */
--
--static unsigned short		ioaddr = 0;
--static unsigned int		bufsize_rcv = 0;
--
--#if	0
--static void show_registers(void)
--{
--	printf("XSTAT %hhX ", inb(EDLC_XSTAT));
--	printf("XMASK %hhX ", inb(EDLC_XMASK));
--	printf("RSTAT %hhX ", inb(EDLC_RSTAT));
--	printf("RMASK %hhX ", inb(EDLC_RMASK));
--	printf("RMODE %hhX ", inb(EDLC_RMODE));
--	printf("XMODE %hhX ", inb(EDLC_XMODE));
--	printf("ISTAT %hhX\n", inb(IE_ISTAT));
--}
--#endif
--
--static void reset_receiver(void)
--{
--	outw(0, IE_GP);		/* Receive packet at start of buffer */
--	outb(RS_VALID_BITS, EDLC_RCLR);	/* Clear all pending Rcv interrupts */
--	outb(MM_EN_RCV, IE_MMODE); /* Enable rcv */
--}
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--static void ni5010_reset(struct nic *nic)
--{
--	int		i;
--
--	/* Reset the hardware here.  Don't forget to set the station address. */
--	outb(RS_RESET, EDLC_RESET);	/* Hold up EDLC_RESET while configing board */
--	outb(0, IE_RESET);	/* Hardware reset of ni5010 board */
--	outb(0, EDLC_XMASK);	/* Disable all Xmt interrupts */
--	outb(0, EDLC_RMASK);	/* Disable all Rcv interrupt */
--	outb(0xFF, EDLC_XCLR);	/* Clear all pending Xmt interrupts */
--	outb(0xFF, EDLC_RCLR);	/* Clear all pending Rcv interrupts */
--	outb(XMD_LBC, EDLC_XMODE);	/* Only loopback xmits */
--	/* Set the station address */
--	for(i = 0; i < ETH_ALEN; i++)
--		outb(nic->node_addr[i], EDLC_ADDR + i);
--	outb(XMD_IG_PAR | XMD_T_MODE | XMD_LBC, EDLC_XMODE); 
--				/* Normal packet xmit mode */
--	outb(RMD_BROADCAST, EDLC_RMODE);
--				/* Receive broadcast and normal packets */
--	reset_receiver();
--	outb(0x00, EDLC_RESET);	/* Un-reset the ni5010 */
--}
--
--/**************************************************************************
--POLL - Wait for a frame
--***************************************************************************/
--static int ni5010_poll(struct nic *nic)
--{
--	int		rcv_stat;
--
--	if (((rcv_stat = inb(EDLC_RSTAT)) & RS_VALID_BITS) != RS_PKT_OK) {
--		outb(rcv_stat, EDLC_RSTAT);	/* Clear the status */
--		return (0);
--	}
--        outb(rcv_stat, EDLC_RCLR);	/* Clear the status */
--	nic->packetlen = inw(IE_RCNT);
--	/* Read packet into buffer */
--        outb(MM_MUX, IE_MMODE);	/* Rcv buffer to system bus */
--	outw(0, IE_GP);		/* Seek to beginning of packet */
--	insb(IE_RBUF, nic->packet, nic->packetlen); 
--	return (1);
--}
--
--/**************************************************************************
--TRANSMIT - Transmit a frame
--***************************************************************************/
--static void ni5010_transmit(struct nic *nic,
--	const char *d,	/* Destination */
--	unsigned int t,	/* Type */
--	unsigned int s,	/* size */
--	const char *p)	/* Packet */
--{
--	unsigned int	len;
--	int		buf_offs, xmt_stat;
--	unsigned long	time;
--
--	len = s + ETH_HLEN;
--	if (len < ETH_ZLEN)
--		len = ETH_ZLEN;
--	buf_offs = NI5010_BUFSIZE - len;
--	outb(0, EDLC_RMASK);	/* Mask all receive interrupts */
--	outb(0, IE_MMODE);	/* Put Xmit buffer on system bus */
--	outb(0xFF, EDLC_RCLR);	/* Clear out pending rcv interrupts */
--	outw(buf_offs, IE_GP);	/* Point GP at start of packet */
--	outsb(IE_XBUF, d, ETH_ALEN);	/* Put dst in buffer */
--	outsb(IE_XBUF, nic->node_addr, ETH_ALEN);/* Put src in buffer */
--	outb(t >> 8, IE_XBUF);
--	outb(t, IE_XBUF);
--	outsb(IE_XBUF, p, s);	/* Put data in buffer */
--	while (s++ < ETH_ZLEN - ETH_HLEN)	/* Pad to min size */
--		outb(0, IE_XBUF);
--	outw(buf_offs, IE_GP);	/* Rewrite where packet starts */
--	/* should work without that outb() (Crynwr used it) */
--	/*outb(MM_MUX, IE_MMODE);*/
--	/* Xmt buffer to EDLC bus */
--	outb(MM_EN_XMT | MM_MUX, IE_MMODE);	/* Begin transmission */
--	/* wait for transmit complete */
--	while (((xmt_stat = inb(IE_ISTAT)) & IS_EN_XMT) != 0)
--		;
--	reset_receiver();	/* Immediately switch to receive */
--}
--
--/**************************************************************************
--DISABLE - Turn off ethernet interface
--***************************************************************************/
--static void ni5010_disable(struct nic *nic)
--{
--	outb(0, IE_MMODE);
--	outb(RS_RESET, EDLC_RESET);
--}
--
--static inline int rd_port(void)
--{
--	inb(IE_RBUF);
--	return inb(IE_SAPROM);
--}
--
--static int ni5010_probe1(struct nic *nic)
--{
--	int		i, boguscount = 40, data;
--
--	/* The tests are from the Linux NI5010 driver
--	   I don't understand it all, but if it works for them...  */
--	if (inb(ioaddr) == 0xFF)
--		return (0);
--	while ((rd_port() & rd_port() & rd_port()
--		& rd_port() & rd_port() & rd_port()) != 0xFF)
--	{
--		if (boguscount-- <= 0)
--			return (0);
--	}
--	for (i = 0; i < 32; i++)
--		if ((data = rd_port()) != 0xFF)
--			break;
--	if (data == 0xFF)
--		return (0);
--	if (data == SA_ADDR0 && rd_port() == SA_ADDR1 && rd_port() == SA_ADDR2) {
--		for (i = 0; i < 4; i++)
--			rd_port();
--		if (rd_port() != NI5010_MAGICVAL1 || rd_port() != NI5010_MAGICVAL2)
--			return (0);
--	} else
--		return (0);
--	for (i = 0; i < ETH_ALEN; i++) {
--		outw(i, IE_GP);
--		nic->node_addr[i] = inb(IE_SAPROM);
--	}
--	printf("\nNI5010 ioaddr %#hX, addr %!\n", ioaddr, nic->node_addr);
--/* get the size of the onboard receive buffer
-- * higher addresses than bufsize are wrapped into real buffer
-- * i.e. data for offs. 0x801 is written to 0x1 with a 2K onboard buffer
-- */
--	if (bufsize_rcv == 0) {
--        	outb(1, IE_MMODE);      /* Put Rcv buffer on system bus */
--        	outw(0, IE_GP);		/* Point GP at start of packet */
--        	outb(0, IE_RBUF);	/* set buffer byte 0 to 0 */
--        	for (i = 1; i < 0xFF; i++) {
--                	outw(i << 8, IE_GP); /* Point GP at packet size to be tested */
--                	outb(i, IE_RBUF);
--                	outw(0x0, IE_GP); /* Point GP at start of packet */
--                	data = inb(IE_RBUF);
--                	if (data == i) break;
--        	}
--		bufsize_rcv = i << 8;
--        	outw(0, IE_GP);		/* Point GP at start of packet */
--        	outb(0, IE_RBUF);	/* set buffer byte 0 to 0 again */
--	}
--	printf("Bufsize rcv/xmt=%d/%d\n", bufsize_rcv, NI5010_BUFSIZE);
--	return (1);
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--***************************************************************************/
--struct nic *ni5010_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	static unsigned short	io_addrs[] = {
--		0x300, 0x320, 0x340, 0x360, 0x380, 0x3a0, 0 };
--	unsigned short		*p;
--
--	/* if probe_addrs is 0, then use list above */
--	if (probe_addrs == 0 || *probe_addrs == 0)
--		probe_addrs = io_addrs;
--	for (p = probe_addrs; (ioaddr = *p) != 0; p++) {
--		if (ni5010_probe1(nic))
--			break;
--	}
--	if (ioaddr == 0)
--		return (0);
--	ni5010_reset(nic);
--	/* point to NIC specific routines */
--	nic->reset = ni5010_reset;
--	nic->poll = ni5010_poll;
--	nic->transmit = ni5010_transmit;
--	nic->disable = ni5010_disable;
--	return (nic);
--}
-Index: b/netboot/nic.c
-===================================================================
---- /dev/null
-+++ b/netboot/nic.c
-@@ -0,0 +1,1198 @@
-+/**************************************************************************
-+Etherboot -  Network Bootstrap Program
-+
-+Literature dealing with the network protocols:
-+	ARP - RFC826
-+	RARP - RFC903
-+        IP - RFC791
-+	UDP - RFC768
-+	BOOTP - RFC951, RFC2132 (vendor extensions)
-+	DHCP - RFC2131, RFC2132 (options)
-+	TFTP - RFC1350, RFC2347 (options), RFC2348 (blocksize), RFC2349 (tsize)
-+	RPC - RFC1831, RFC1832 (XDR), RFC1833 (rpcbind/portmapper)
-+	NFS - RFC1094, RFC1813 (v3, useful for clarifications, not implemented)
-+	IGMP - RFC1112, RFC2113, RFC2365, RFC2236, RFC3171
-+
-+**************************************************************************/
-+#include "etherboot.h"
-+#include "grub.h"
-+#include "nic.h"
-+#include "elf.h" /* FOR EM_CURRENT */
-+#include "bootp.h"
-+#include "if_arp.h"
-+#include "tftp.h"
-+#include "timer.h"
-+#include "ip.h"
-+#include "udp.h"
-+
-+/* Currently no other module uses rom, but it is available */
-+struct rom_info		rom;
-+struct arptable_t	arptable[MAX_ARP];
-+#if MULTICAST_LEVEL2
-+unsigned long last_igmpv1 = 0;
-+struct igmptable_t	igmptable[MAX_IGMP];
-+#endif
-+static unsigned long	netmask;
-+/* Used by nfs.c */
-+char *hostname = "";
-+int hostnamelen = 0;
-+static uint32_t xid;
-+static unsigned char *end_of_rfc1533 = NULL;
-+static const unsigned char broadcast[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
-+static const in_addr zeroIP = { 0L };
-+static char rfc1533_venddata[MAX_RFC1533_VENDLEN];
-+static unsigned char rfc1533_cookie[4] = { RFC1533_COOKIE };
-+static unsigned char rfc1533_cookie_bootp[5] = { RFC1533_COOKIE, RFC1533_END };
-+static unsigned char rfc1533_cookie_dhcp[] = { RFC1533_COOKIE };
-+static int dhcp_reply;
-+static in_addr dhcp_server = { 0L };
-+static in_addr dhcp_addr = { 0L };
-+
-+static const unsigned char dhcpdiscover[] = {
-+	RFC2132_MSG_TYPE, 1, DHCPDISCOVER,
-+	RFC2132_MAX_SIZE, 2,	/* request as much as we can */
-+	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
-+	/* Vendor class identifier */
-+	RFC2132_VENDOR_CLASS_ID, 10, 'G', 'R', 'U', 'B', 'C', 'l', 'i', 'e', 'n', 't',
-+	RFC2132_PARAM_LIST, 4, RFC1533_NETMASK, RFC1533_GATEWAY,
-+	RFC1533_HOSTNAME, RFC1533_EXTENSIONPATH, RFC1533_END
-+};
-+static const unsigned char dhcprequest [] = {
-+	RFC2132_MSG_TYPE,1,DHCPREQUEST,
-+	RFC2132_SRV_ID,4,0,0,0,0,
-+	RFC2132_REQ_ADDR,4,0,0,0,0,
-+	RFC2132_MAX_SIZE,2,	/* request as much as we can */
-+	ETH_MAX_MTU / 256, ETH_MAX_MTU % 256,
-+	/* Vendor class identifier */
-+	RFC2132_VENDOR_CLASS_ID, 10, 'G', 'R', 'U', 'B', 'C', 'l', 'i', 'e', 'n', 't',
-+	RFC2132_PARAM_LIST,
-+	/* 4 standard + 2 vendortags */
-+	4 + 2,
-+	/* Standard parameters */
-+	RFC1533_NETMASK, RFC1533_GATEWAY,
-+	RFC1533_HOSTNAME, RFC1533_EXTENSIONPATH,
-+	/* Etherboot vendortags */
-+	RFC1533_VENDOR_MAGIC,
-+	RFC1533_VENDOR_CONFIGFILE,
-+	RFC1533_END
-+};
-+
-+/* See nic.h */
-+int user_abort = 0;
-+int network_ready = 0;
-+
-+#ifdef	REQUIRE_VCI_ETHERBOOT
-+int	vci_etherboot;
-+#endif
-+
-+static int dummy(void *unused __unused)
-+{
-+	return (0);
-+}
-+
-+/* Careful.  We need an aligned buffer to avoid problems on machines
-+ * that care about alignment.  To trivally align the ethernet data
-+ * (the ip hdr and arp requests) we offset the packet by 2 bytes.
-+ * leaving the ethernet data 16 byte aligned.  Beyond this
-+ * we use memmove but this makes the common cast simple and fast.
-+ */
-+static char	packet[ETH_FRAME_LEN + ETH_DATA_ALIGN] __aligned;
-+
-+struct nic	nic =
-+{
-+	{
-+		0,				/* dev.disable */
-+		{
-+			0,
-+			0,
-+			PCI_BUS_TYPE,
-+		},				/* dev.devid */
-+		0,				/* index */
-+		0,				/* type */
-+		PROBE_FIRST,			/* how_pobe */
-+		PROBE_NONE,			/* to_probe */
-+		0,				/* failsafe */
-+		0,				/* type_index */
-+		{},				/* state */
-+	},
-+	(int (*)(struct nic *, int))dummy,      /* poll */
-+	(void (*)(struct nic *, const char *,
-+		unsigned int, unsigned int,
-+		const char *))dummy,		/* transmit */
-+	(void (*)(struct nic *, irq_action_t))dummy, /* irq */
-+	0,					/* flags */
-+	&rom,					/* rom_info */
-+	arptable[ARP_CLIENT].node,		/* node_addr */
-+	packet + ETH_DATA_ALIGN,		/* packet */
-+	0,					/* packetlen */
-+	0,			/* ioaddr */
-+	0,			/* irqno */
-+	NULL,					/* priv_data */
-+};
-+
-+
-+
-+int grub_eth_probe(void)
-+{
-+	static int probed = 0;
-+	struct dev *dev;
-+
-+	EnterFunction("grub_eth_probe");
-+
-+	if (probed)
-+		return 1;
-+
-+	network_ready = 0;
-+	grub_memset((char *)arptable, 0, MAX_ARP * sizeof(struct arptable_t));
-+	dev = &nic.dev;
-+	dev->how_probe = -1;
-+	dev->type = NIC_DRIVER;
-+	dev->failsafe = 1;
-+	rom = *((struct rom_info *)ROM_INFO_LOCATION);
-+
-+	probed = (eth_probe(dev) == PROBE_WORKED);
-+
-+	LeaveFunction("grub_eth_probe");
-+	return probed;
-+}
-+
-+int eth_probe(struct dev *dev)
-+{
-+	return probe(dev);
-+}
-+
-+int eth_poll(int retrieve)
-+{
-+	return ((*nic.poll)(&nic, retrieve));
-+}
-+
-+void eth_transmit(const char *d, unsigned int t, unsigned int s, const void *p)
-+{
-+	(*nic.transmit)(&nic, d, t, s, p);
-+	if (t == IP) twiddle();
-+}
-+
-+void eth_disable(void)
-+{
-+#ifdef MULTICAST_LEVEL2
-+	int i;
-+	for(i = 0; i < MAX_IGMP; i++) {
-+		leave_group(i);
-+	}
-+#endif
-+	disable(&nic.dev);
-+}
-+
-+void eth_irq (irq_action_t action)
-+{
-+	(*nic.irq)(&nic,action);
-+}
-+
-+/**************************************************************************
-+IPCHKSUM - Checksum IP Header
-+**************************************************************************/
-+uint16_t ipchksum(const void *data, unsigned long length)
-+{
-+	unsigned long sum;
-+	unsigned long i;
-+	const uint8_t *ptr;
-+
-+	/* In the most straight forward way possible,
-+	 * compute an ip style checksum.
-+	 */
-+	sum = 0;
-+	ptr = data;
-+	for(i = 0; i < length; i++) {
-+		unsigned long value;
-+		value = ptr[i];
-+		if (i & 1) {
-+			value <<= 8;
-+		}
-+		/* Add the new value */
-+		sum += value;
-+		/* Wrap around the carry */
-+		if (sum > 0xFFFF) {
-+			sum = (sum + (sum >> 16)) & 0xFFFF;
-+		}
-+	}
-+	return (~cpu_to_le16(sum)) & 0xFFFF;
-+}
-+
-+uint16_t add_ipchksums(unsigned long offset, uint16_t sum, uint16_t new)
-+{
-+	unsigned long checksum;
-+	sum = ~sum & 0xFFFF;
-+	new = ~new & 0xFFFF;
-+	if (offset & 1) {
-+		/* byte swap the sum if it came from an odd offset 
-+		 * since the computation is endian independant this
-+		 * works.
-+		 */
-+		new = bswap_16(new);
-+	}
-+	checksum = sum + new;
-+	if (checksum > 0xFFFF) {
-+		checksum -= 0xFFFF;
-+	}
-+	return (~checksum) & 0xFFFF;
-+}
-+
-+/**************************************************************************
-+DEFAULT_NETMASK - Return default netmask for IP address
-+**************************************************************************/
-+static inline unsigned long default_netmask(void)
-+{
-+	int net = ntohl(arptable[ARP_CLIENT].ipaddr.s_addr) >> 24;
-+	if (net <= 127)
-+		return(htonl(0xff000000));
-+	else if (net < 192)
-+		return(htonl(0xffff0000));
-+	else
-+		return(htonl(0xffffff00));
-+}
-+
-+/**************************************************************************
-+IP_TRANSMIT - Send an IP datagram
-+**************************************************************************/
-+static int await_arp(int ival, void *ptr,
-+	unsigned short ptype, struct iphdr *ip __unused, struct udphdr *udp __unused)
-+{
-+	struct	arprequest *arpreply;
-+	if (ptype != ARP)
-+		return 0;
-+	if (nic.packetlen < ETH_HLEN + sizeof(struct arprequest))
-+		return 0;
-+	arpreply = (struct arprequest *)&nic.packet[ETH_HLEN];
-+
-+	if (arpreply->opcode != htons(ARP_REPLY)) 
-+		return 0;
-+	if (memcmp(arpreply->sipaddr, ptr, sizeof(in_addr)) != 0)
-+		return 0;
-+	memcpy(arptable[ival].node, arpreply->shwaddr, ETH_ALEN);
-+	return 1;
-+}
-+
-+int ip_transmit(int len, const void *buf)
-+{
-+	unsigned long destip;
-+	struct iphdr *ip;
-+	struct arprequest arpreq;
-+	int arpentry, i;
-+	int retry;
-+
-+	ip = (struct iphdr *)buf;
-+	destip = ip->dest.s_addr;
-+	if (destip == IP_BROADCAST) {
-+		eth_transmit(broadcast, IP, len, buf);
-+#ifdef MULTICAST_LEVEL1 
-+	} else if ((destip & htonl(MULTICAST_MASK)) == htonl(MULTICAST_NETWORK)) {
-+		unsigned char multicast[6];
-+		unsigned long hdestip;
-+		hdestip = ntohl(destip);
-+		multicast[0] = 0x01;
-+		multicast[1] = 0x00;
-+		multicast[2] = 0x5e;
-+		multicast[3] = (hdestip >> 16) & 0x7;
-+		multicast[4] = (hdestip >> 8) & 0xff;
-+		multicast[5] = hdestip & 0xff;
-+		eth_transmit(multicast, IP, len, buf);
-+#endif
-+	} else {
-+		if (((destip & netmask) !=
-+		     (arptable[ARP_CLIENT].ipaddr.s_addr & netmask)) &&
-+		    arptable[ARP_GATEWAY].ipaddr.s_addr)
-+			destip = arptable[ARP_GATEWAY].ipaddr.s_addr;
-+		for(arpentry = 0; arpentry<MAX_ARP; arpentry++)
-+			if (arptable[arpentry].ipaddr.s_addr == destip) break;
-+		if (arpentry == MAX_ARP) {
-+			printf("%@ is not in my arp table!\n", destip);
-+			return(0);
-+		}
-+		for (i = 0; i < ETH_ALEN; i++)
-+			if (arptable[arpentry].node[i])
-+				break;
-+		if (i == ETH_ALEN) {	/* Need to do arp request */
-+			arpreq.hwtype = htons(1);
-+			arpreq.protocol = htons(IP);
-+			arpreq.hwlen = ETH_ALEN;
-+			arpreq.protolen = 4;
-+			arpreq.opcode = htons(ARP_REQUEST);
-+			memcpy(arpreq.shwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
-+			memcpy(arpreq.sipaddr, &arptable[ARP_CLIENT].ipaddr, sizeof(in_addr));
-+			memset(arpreq.thwaddr, 0, ETH_ALEN);
-+			memcpy(arpreq.tipaddr, &destip, sizeof(in_addr));
-+			for (retry = 1; retry <= MAX_ARP_RETRIES; retry++) {
-+				long timeout;
-+				eth_transmit(broadcast, ARP, sizeof(arpreq),
-+					&arpreq);
-+				timeout = rfc2131_sleep_interval(TIMEOUT, retry);
-+				if (await_reply(await_arp, arpentry,
-+					arpreq.tipaddr, timeout)) goto xmit;
-+			}
-+			return(0);
-+		}
-+xmit:
-+		eth_transmit(arptable[arpentry].node, IP, len, buf);
-+	}
-+	return 1;
-+}
-+
-+void build_ip_hdr(unsigned long destip, int ttl, int protocol, int option_len,
-+	int len, const void *buf)
-+{
-+	struct iphdr *ip;
-+	ip = (struct iphdr *)buf;
-+	ip->verhdrlen = 0x45;
-+	ip->verhdrlen += (option_len/4);
-+	ip->service = 0;
-+	ip->len = htons(len);
-+	ip->ident = 0;
-+	ip->frags = 0; /* Should we set don't fragment? */
-+	ip->ttl = ttl;
-+	ip->protocol = protocol;
-+	ip->chksum = 0;
-+	ip->src.s_addr = arptable[ARP_CLIENT].ipaddr.s_addr;
-+	ip->dest.s_addr = destip;
-+	ip->chksum = ipchksum(buf, sizeof(struct iphdr) + option_len);
-+}
-+
-+static uint16_t udpchksum(struct iphdr *ip, struct udphdr *udp)
-+{
-+	struct udp_pseudo_hdr pseudo;
-+	uint16_t checksum;
-+
-+	/* Compute the pseudo header */
-+	pseudo.src.s_addr  = ip->src.s_addr;
-+	pseudo.dest.s_addr = ip->dest.s_addr;
-+	pseudo.unused      = 0;
-+	pseudo.protocol    = IP_UDP;
-+	pseudo.len         = udp->len;
-+
-+	/* Sum the pseudo header */
-+	checksum = ipchksum(&pseudo, 12);
-+
-+	/* Sum the rest of the udp packet */
-+	checksum = add_ipchksums(12, checksum, ipchksum(udp, ntohs(udp->len)));
-+	return checksum;
-+}
-+
-+
-+void build_udp_hdr(unsigned long destip, 
-+	unsigned int srcsock, unsigned int destsock, int ttl,
-+	int len, const void *buf)
-+{
-+	struct iphdr *ip;
-+	struct udphdr *udp;
-+	ip = (struct iphdr *)buf;
-+	build_ip_hdr(destip, ttl, IP_UDP, 0, len, buf);
-+	udp = (struct udphdr *)((char *)buf + sizeof(struct iphdr));
-+	udp->src = htons(srcsock);
-+	udp->dest = htons(destsock);
-+	udp->len = htons(len - sizeof(struct iphdr));
-+	udp->chksum = 0;
-+	if ((udp->chksum = udpchksum(ip, udp)) == 0)
-+		udp->chksum = 0xffff;
-+}
-+
-+
-+/**************************************************************************
-+UDP_TRANSMIT - Send an UDP datagram
-+**************************************************************************/
-+int udp_transmit(unsigned long destip, unsigned int srcsock,
-+	unsigned int destsock, int len, const void *buf)
-+{
-+	build_udp_hdr(destip, srcsock, destsock, 60, len, buf);
-+	return ip_transmit(len, buf);
-+}
-+
-+/**************************************************************************
-+QDRAIN - clear the nic's receive queue
-+**************************************************************************/
-+static int await_qdrain(int ival __unused, void *ptr __unused,
-+	unsigned short ptype __unused, 
-+	struct iphdr *ip __unused, struct udphdr *udp __unused)
-+{
-+	return 0;
-+}
-+
-+void rx_qdrain(void)
-+{
-+	/* Clear out the Rx queue first.  It contains nothing of interest,
-+	 * except possibly ARP requests from the DHCP/TFTP server.  We use
-+	 * polling throughout Etherboot, so some time may have passed since we
-+	 * last polled the receive queue, which may now be filled with
-+	 * broadcast packets.  This will cause the reply to the packets we are
-+	 * about to send to be lost immediately.  Not very clever.  */
-+	await_reply(await_qdrain, 0, NULL, 0);
-+}
-+
-+/**
-+ * rarp
-+ *
-+ * Get IP address by rarp. Just copy from etherboot
-+ **/
-+static int await_rarp(int ival, void *ptr, unsigned short ptype, 
-+		      struct iphdr *ip, struct udphdr *udp)
-+{
-+	struct arprequest *arpreply;
-+	if (ptype != RARP)
-+		return 0;
-+	if (nic.packetlen < ETH_HLEN + sizeof(struct arprequest))
-+		return 0;
-+	arpreply = (struct arprequest *)&nic.packet[ETH_HLEN];
-+	if (arpreply->opcode != htons(RARP_REPLY))
-+		return 0;
-+	if (memcmp(arpreply->thwaddr, ptr, ETH_ALEN) == 0){
-+		memcpy(arptable[ARP_SERVER].node, arpreply->shwaddr, ETH_ALEN);
-+		memcpy(&arptable[ARP_SERVER].ipaddr, arpreply->sipaddr, sizeof(in_addr));
-+		memcpy(&arptable[ARP_CLIENT].ipaddr, arpreply->tipaddr, sizeof(in_addr));
-+		return 1;
-+	}
-+	return 0;
-+}
-+
-+int rarp(void)
-+{
-+	int retry;
-+
-+	/* arp and rarp requests share the same packet structure. */
-+	struct arprequest rarpreq;
-+
-+	if(!grub_eth_probe())
-+		return 0;
-+	network_ready = 0;
-+
-+	memset(&rarpreq, 0, sizeof(rarpreq));
-+
-+	rarpreq.hwtype = htons(1);
-+	rarpreq.protocol = htons(IP);
-+	rarpreq.hwlen = ETH_ALEN;
-+	rarpreq.protolen = 4;
-+	rarpreq.opcode = htons(RARP_REQUEST);
-+	memcpy(&rarpreq.shwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
-+	/* sipaddr is already zeroed out */
-+	memcpy(&rarpreq.thwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
-+	/* tipaddr is already zeroed out */
-+
-+	for (retry = 0; retry < MAX_ARP_RETRIES; ++retry) {
-+		long timeout;
-+		eth_transmit(broadcast, RARP, sizeof(rarpreq), &rarpreq);
-+
-+		timeout = rfc2131_sleep_interval(TIMEOUT, retry);
-+		if (await_reply(await_rarp, 0, rarpreq.shwaddr, timeout))
-+			break;
-+		if (user_abort)
-+			return 0;
-+	}
-+
-+	if (retry < MAX_ARP_RETRIES) {
-+		network_ready = 1;
-+		return (1);
-+	}
-+	return (0);
-+}
-+
-+/**
-+ * bootp
-+ *
-+ * Get IP address by bootp, segregate from bootp in etherboot.
-+ **/
-+static int await_bootp(int ival __unused, void *ptr __unused,
-+	unsigned short ptype __unused, struct iphdr *ip __unused, 
-+	struct udphdr *udp)
-+{
-+	struct	bootp_t *bootpreply;
-+	int len;		/* Length of vendor */
-+
-+	if (!udp) {
-+		return 0;
-+	}
-+	bootpreply = (struct bootp_t *)
-+		&nic.packet[ETH_HLEN + sizeof(struct iphdr) + sizeof(struct udphdr)];
-+	len = nic.packetlen - (ETH_HLEN + sizeof(struct iphdr) + 
-+		sizeof(struct udphdr) + sizeof(struct bootp_t) - BOOTP_VENDOR_LEN);
-+	if (len < 0) {
-+		return 0;
-+	}
-+	if (udp->dest != htons(BOOTP_CLIENT))
-+		return 0;
-+	if (bootpreply->bp_op != BOOTP_REPLY)
-+		return 0;
-+	if (bootpreply->bp_xid != xid)
-+		return 0;
-+	if (memcmp((char *)&bootpreply->bp_siaddr, (char *)&zeroIP, sizeof(in_addr)) == 0)
-+		return 0;
-+	if ((memcmp(broadcast, bootpreply->bp_hwaddr, ETH_ALEN) != 0) &&
-+	    (memcmp(arptable[ARP_CLIENT].node, bootpreply->bp_hwaddr, ETH_ALEN) != 0)) {
-+		return 0;
-+	}
-+	arptable[ARP_CLIENT].ipaddr.s_addr = bootpreply->bp_yiaddr.s_addr;
-+	netmask = default_netmask();
-+	arptable[ARP_SERVER].ipaddr.s_addr = bootpreply->bp_siaddr.s_addr;
-+	memset(arptable[ARP_SERVER].node, 0, ETH_ALEN);  /* Kill arp */
-+	arptable[ARP_GATEWAY].ipaddr.s_addr = bootpreply->bp_giaddr.s_addr;
-+	memset(arptable[ARP_GATEWAY].node, 0, ETH_ALEN);  /* Kill arp */
-+	/* We don't care bootpreply->bp_file, it must be 'pxegrub':-) */
-+	memcpy((char *)rfc1533_venddata, (char *)(bootpreply->bp_vend), len);
-+	decode_rfc1533(rfc1533_venddata, 0, len, 1);
-+	return(1);
-+}
-+
-+int bootp(void)
-+{
-+	int retry;
-+	struct bootpip_t ip;
-+	unsigned long  starttime;
-+	
-+	EnterFunction("bootp");
-+
-+	if(!grub_eth_probe())
-+		return 0;
-+	network_ready = 0;
-+
-+	memset(&ip, 0, sizeof(struct bootpip_t));
-+	ip.bp.bp_op = BOOTP_REQUEST;
-+	ip.bp.bp_htype = 1;
-+	ip.bp.bp_hlen = ETH_ALEN;
-+	starttime = currticks();
-+	/* Use lower 32 bits of node address, more likely to be
-+	   distinct than the time since booting */
-+	memcpy(&xid, &arptable[ARP_CLIENT].node[2], sizeof(xid));
-+	ip.bp.bp_xid = xid += htonl(starttime);
-+	/* bp_secs defaults to zero */
-+	memcpy(ip.bp.bp_hwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
-+	memcpy(ip.bp.bp_vend, rfc1533_cookie_bootp, sizeof(rfc1533_cookie_bootp)); /* request RFC-style options */
-+
-+	for (retry = 0; retry < MAX_BOOTP_RETRIES; ) {
-+		long timeout;
-+
-+		rx_qdrain();
-+
-+		udp_transmit(IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
-+			sizeof(struct bootpip_t), &ip);
-+		timeout = rfc2131_sleep_interval(TIMEOUT, retry++);
-+		if (await_reply(await_bootp, 0, NULL, timeout)){
-+			network_ready = 1;
-+			return(1);
-+		}
-+		if (user_abort)
-+			return 0;
-+		ip.bp.bp_secs = htons((currticks()-starttime)/TICKS_PER_SEC);
-+	}
-+	return(0);
-+}
-+
-+/**
-+ * dhcp
-+ *
-+ * Get IP address by dhcp, segregate from bootp in etherboot.
-+ **/
-+static int await_dhcp(int ival __unused, void *ptr __unused,
-+	unsigned short ptype __unused, struct iphdr *ip __unused, 
-+	struct udphdr *udp)
-+{
-+	struct	dhcp_t *dhcpreply;
-+	int len;
-+
-+	if (!udp) {
-+		return 0;
-+	}
-+	dhcpreply = (struct dhcp_t *)
-+		&nic.packet[ETH_HLEN + sizeof(struct iphdr) + sizeof(struct udphdr)];
-+	len = nic.packetlen - (ETH_HLEN + sizeof(struct iphdr) + 
-+		sizeof(struct udphdr) + sizeof(struct dhcp_t) - DHCP_OPT_LEN);
-+	if (len < 0){
-+		return 0;
-+	}
-+	if (udp->dest != htons(BOOTP_CLIENT))
-+		return 0;
-+	if (dhcpreply->bp_op != BOOTP_REPLY)
-+		return 0;
-+	if (dhcpreply->bp_xid != xid)
-+		return 0;
-+	if (memcmp((char *)&dhcpreply->bp_siaddr, (char *)&zeroIP, sizeof(in_addr)) == 0)
-+		return 0;
-+	if ((memcmp(broadcast, dhcpreply->bp_hwaddr, ETH_ALEN) != 0) &&
-+	    (memcmp(arptable[ARP_CLIENT].node, dhcpreply->bp_hwaddr, ETH_ALEN) != 0)) {
-+		return 0;
-+	}
-+	arptable[ARP_CLIENT].ipaddr.s_addr = dhcpreply->bp_yiaddr.s_addr;
-+	dhcp_addr.s_addr = dhcpreply->bp_yiaddr.s_addr;
-+	netmask = default_netmask();
-+	arptable[ARP_SERVER].ipaddr.s_addr = dhcpreply->bp_siaddr.s_addr;
-+	memset(arptable[ARP_SERVER].node, 0, ETH_ALEN);  /* Kill arp */
-+	arptable[ARP_GATEWAY].ipaddr.s_addr = dhcpreply->bp_giaddr.s_addr;
-+	memset(arptable[ARP_GATEWAY].node, 0, ETH_ALEN);  /* Kill arp */
-+	/* We don't care bootpreply->bp_file. It must be 'pxegrub' */
-+	memcpy((char *)rfc1533_venddata, (char *)(dhcpreply->bp_vend), len);
-+	decode_rfc1533(rfc1533_venddata, 0, len, 1);
-+	return(1);
-+}
-+
-+int dhcp(void)
-+{
-+	int retry;
-+	int reqretry;
-+	struct dhcpip_t ip;
-+	unsigned long  starttime;
-+
-+	if(!grub_eth_probe())
-+		return 0;
-+
-+	network_ready = 0;
-+
-+	memset(&ip, 0, sizeof(struct dhcpip_t));
-+	ip.bp.bp_op = BOOTP_REQUEST;
-+	ip.bp.bp_htype = 1;
-+	ip.bp.bp_hlen = ETH_ALEN;
-+	starttime = currticks();
-+	/* Use lower 32 bits of node address, more likely to be
-+	   distinct than the time since booting */
-+	memcpy(&xid, &arptable[ARP_CLIENT].node[2], sizeof(xid));
-+	ip.bp.bp_xid = xid += htonl(starttime);
-+	memcpy(ip.bp.bp_hwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
-+	memcpy(ip.bp.bp_vend, rfc1533_cookie_dhcp, sizeof rfc1533_cookie_dhcp); /* request RFC-style options */
-+	memcpy(ip.bp.bp_vend + sizeof rfc1533_cookie_dhcp, dhcpdiscover, sizeof dhcpdiscover);
-+
-+	for (retry = 0; retry < MAX_BOOTP_RETRIES; ) {
-+		long timeout;
-+
-+		rx_qdrain();
-+
-+		udp_transmit(IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
-+			     sizeof(struct bootpip_t), &ip);
-+		timeout = rfc2131_sleep_interval(TIMEOUT, retry++);
-+		if (await_reply(await_dhcp, 0, NULL, timeout)) {
-+			/* If not a DHCPOFFER then must be just a
-+			   BOOTP reply, be backward compatible with
-+			   BOOTP then. Jscott report a bug here, but I
-+			   don't know how it happened */
-+			if (dhcp_reply != DHCPOFFER){
-+				network_ready = 1;
-+				return(1);
-+			}
-+			dhcp_reply = 0;
-+			memcpy(ip.bp.bp_vend, rfc1533_cookie_dhcp, sizeof rfc1533_cookie_dhcp);
-+			memcpy(ip.bp.bp_vend + sizeof rfc1533_cookie_dhcp, dhcprequest, sizeof dhcprequest);
-+			/* Beware: the magic numbers 9 and 15 depend on
-+			   the layout of dhcprequest */
-+			memcpy(&ip.bp.bp_vend[9], &dhcp_server, sizeof(in_addr));
-+			memcpy(&ip.bp.bp_vend[15], &dhcp_addr, sizeof(in_addr));
-+			for (reqretry = 0; reqretry < MAX_BOOTP_RETRIES; ) {
-+				udp_transmit(IP_BROADCAST, BOOTP_CLIENT, BOOTP_SERVER,
-+					     sizeof(struct bootpip_t), &ip);
-+				dhcp_reply=0;
-+				timeout = rfc2131_sleep_interval(TIMEOUT, reqretry++);
-+				if (await_reply(await_dhcp, 0, NULL, timeout))
-+					if (dhcp_reply == DHCPACK){
-+						network_ready = 1;
-+						return(1);
-+					}
-+				if (user_abort)
-+					return 0;
-+			}
-+		}
-+		if (user_abort)
-+			return 0;
-+		ip.bp.bp_secs = htons((currticks()-starttime)/TICKS_PER_SEC);
-+	}
-+	return(0);
-+}
-+
-+#ifdef MULTICAST_LEVEL2
-+static void send_igmp_reports(unsigned long now)
-+{
-+	int i;
-+	for(i = 0; i < MAX_IGMP; i++) {
-+		if (igmptable[i].time && (now >= igmptable[i].time)) {
-+			struct igmp_ip_t igmp;
-+			igmp.router_alert[0] = 0x94;
-+			igmp.router_alert[1] = 0x04;
-+			igmp.router_alert[2] = 0;
-+			igmp.router_alert[3] = 0;
-+			build_ip_hdr(igmptable[i].group.s_addr, 
-+				1, IP_IGMP, sizeof(igmp.router_alert), sizeof(igmp), &igmp);
-+			igmp.igmp.type = IGMPv2_REPORT;
-+			if (last_igmpv1 && 
-+				(now < last_igmpv1 + IGMPv1_ROUTER_PRESENT_TIMEOUT)) {
-+				igmp.igmp.type = IGMPv1_REPORT;
-+			}
-+			igmp.igmp.response_time = 0;
-+			igmp.igmp.chksum = 0;
-+			igmp.igmp.group.s_addr = igmptable[i].group.s_addr;
-+			igmp.igmp.chksum = ipchksum(&igmp.igmp, sizeof(igmp.igmp));
-+			ip_transmit(sizeof(igmp), &igmp);
-+#ifdef	MDEBUG
-+			printf("Sent IGMP report to: %@\n", igmp.igmp.group.s_addr);
-+#endif
-+			/* Don't send another igmp report until asked */
-+			igmptable[i].time = 0;
-+		}
-+	}
-+}
-+
-+static void process_igmp(struct iphdr *ip, unsigned long now)
-+{
-+	struct igmp *igmp;
-+	int i;
-+	unsigned iplen = 0;
-+	if (!ip || (ip->protocol == IP_IGMP) ||
-+		(nic.packetlen < sizeof(struct iphdr) + sizeof(struct igmp))) {
-+		return;
-+	}
-+	iplen = (ip->verhdrlen & 0xf)*4;
-+	igmp = (struct igmp *)&nic.packet[sizeof(struct iphdr)];
-+	if (ipchksum(igmp, ntohs(ip->len) - iplen) != 0)
-+		return;
-+	if ((igmp->type == IGMP_QUERY) && 
-+		(ip->dest.s_addr == htonl(GROUP_ALL_HOSTS))) {
-+		unsigned long interval = IGMP_INTERVAL;
-+		if (igmp->response_time == 0) {
-+			last_igmpv1 = now;
-+		} else {
-+			interval = (igmp->response_time * TICKS_PER_SEC)/10;
-+		}
-+		
-+#ifdef	MDEBUG
-+		printf("Received IGMP query for: %@\n", igmp->group.s_addr);
-+#endif			       
-+		for(i = 0; i < MAX_IGMP; i++) {
-+			uint32_t group = igmptable[i].group.s_addr;
-+			if ((group == 0) || (group == igmp->group.s_addr)) {
-+				unsigned long time;
-+				time = currticks() + rfc1112_sleep_interval(interval, 0);
-+				if (time < igmptable[i].time) {
-+					igmptable[i].time = time;
-+				}
-+			}
-+		}
-+	}
-+	if (((igmp->type == IGMPv1_REPORT) || (igmp->type == IGMPv2_REPORT)) &&
-+		(ip->dest.s_addr == igmp->group.s_addr)) {
-+#ifdef	MDEBUG
-+		printf("Received IGMP report for: %@\n", igmp->group.s_addr);
-+#endif			       
-+		for(i = 0; i < MAX_IGMP; i++) {
-+			if ((igmptable[i].group.s_addr == igmp->group.s_addr) &&
-+				igmptable[i].time != 0) {
-+				igmptable[i].time = 0;
-+			}
-+		}
-+	}
-+}
-+
-+void leave_group(int slot)
-+{
-+	/* Be very stupid and always send a leave group message if 
-+	 * I have subscribed.  Imperfect but it is standards
-+	 * compliant, easy and reliable to implement.
-+	 *
-+	 * The optimal group leave method is to only send leave when,
-+	 * we were the last host to respond to a query on this group,
-+	 * and igmpv1 compatibility is not enabled.
-+	 */
-+	if (igmptable[slot].group.s_addr) {
-+		struct igmp_ip_t igmp;
-+		igmp.router_alert[0] = 0x94;
-+		igmp.router_alert[1] = 0x04;
-+		igmp.router_alert[2] = 0;
-+		igmp.router_alert[3] = 0;
-+		build_ip_hdr(htonl(GROUP_ALL_HOSTS),
-+			1, IP_IGMP, sizeof(igmp.router_alert), sizeof(igmp), &igmp);
-+		igmp.igmp.type = IGMP_LEAVE;
-+		igmp.igmp.response_time = 0;
-+		igmp.igmp.chksum = 0;
-+		igmp.igmp.group.s_addr = igmptable[slot].group.s_addr;
-+		igmp.igmp.chksum = ipchksum(&igmp.igmp, sizeof(igmp));
-+		ip_transmit(sizeof(igmp), &igmp);
-+#ifdef	MDEBUG
-+		printf("Sent IGMP leave for: %@\n", igmp.igmp.group.s_addr);
-+#endif	
-+	}
-+	memset(&igmptable[slot], 0, sizeof(igmptable[0]));
-+}
-+
-+void join_group(int slot, unsigned long group)
-+{
-+	/* I have already joined */
-+	if (igmptable[slot].group.s_addr == group)
-+		return;
-+	if (igmptable[slot].group.s_addr) {
-+		leave_group(slot);
-+	}
-+	/* Only join a group if we are given a multicast ip, this way
-+	 * code can be given a non-multicast (broadcast or unicast ip)
-+	 * and still work... 
-+	 */
-+	if ((group & htonl(MULTICAST_MASK)) == htonl(MULTICAST_NETWORK)) {
-+		igmptable[slot].group.s_addr = group;
-+		igmptable[slot].time = currticks();
-+	}
-+}
-+#else
-+#define send_igmp_reports(now);
-+#define process_igmp(ip, now)
-+#endif
-+
-+/**************************************************************************
-+AWAIT_REPLY - Wait until we get a response for our request
-+************f**************************************************************/
-+int await_reply(reply_t reply, int ival, void *ptr, long timeout)
-+{
-+	unsigned long time, now;
-+	struct	iphdr *ip;
-+	unsigned iplen = 0;
-+	struct	udphdr *udp;
-+	unsigned short ptype;
-+	int result;
-+
-+	user_abort = 0;
-+
-+	time = timeout + currticks();
-+	/* The timeout check is done below.  The timeout is only checked if
-+	 * there is no packet in the Rx queue.  This assumes that eth_poll()
-+	 * needs a negligible amount of time.  
-+	 */
-+	for (;;) {
-+		now = currticks();
-+		send_igmp_reports(now);
-+		result = eth_poll(1);
-+		if (result == 0) {
-+			/* We don't have anything */
-+		
-+			/* Check for abort key only if the Rx queue is empty -
-+			 * as long as we have something to process, don't
-+			 * assume that something failed.  It is unlikely that
-+			 * we have no processing time left between packets.  */
-+			poll_interruptions();
-+			/* Do the timeout after at least a full queue walk.  */
-+			if ((timeout == 0) || (currticks() > time) || user_abort == 1) {
-+				break;
-+			}
-+			continue;
-+		}
-+	
-+		/* We have something! */
-+
-+		/* Find the Ethernet packet type */
-+		if (nic.packetlen >= ETH_HLEN) {
-+			ptype = ((unsigned short) nic.packet[12]) << 8
-+				| ((unsigned short) nic.packet[13]);
-+		} else continue; /* what else could we do with it? */
-+		/* Verify an IP header */
-+		ip = 0;
-+		if ((ptype == IP) && (nic.packetlen >= ETH_HLEN + sizeof(struct iphdr))) {
-+			unsigned ipoptlen;
-+			ip = (struct iphdr *)&nic.packet[ETH_HLEN];
-+			if ((ip->verhdrlen < 0x45) || (ip->verhdrlen > 0x4F)) 
-+				continue;
-+			iplen = (ip->verhdrlen & 0xf) * 4;
-+			if (ipchksum(ip, iplen) != 0)
-+				continue;
-+			if (ip->frags & htons(0x3FFF)) {
-+				static int warned_fragmentation = 0;
-+				if (!warned_fragmentation) {
-+					printf("ALERT: got a fragmented packet - reconfigure your server\n");
-+					warned_fragmentation = 1;
-+				}
-+				continue;
-+			}
-+			if (ntohs(ip->len) > ETH_MAX_MTU)
-+				continue;
-+
-+			ipoptlen = iplen - sizeof(struct iphdr);
-+			if (ipoptlen) {
-+				/* Delete the ip options, to guarantee
-+				 * good alignment, and make etherboot simpler.
-+				 */
-+				memmove(&nic.packet[ETH_HLEN + sizeof(struct iphdr)], 
-+					&nic.packet[ETH_HLEN + iplen],
-+					nic.packetlen - ipoptlen);
-+				nic.packetlen -= ipoptlen;
-+			}
-+		}
-+		udp = 0;
-+		if (ip && (ip->protocol == IP_UDP) && 
-+		    (nic.packetlen >= ETH_HLEN + sizeof(struct iphdr) + sizeof(struct udphdr))) {
-+			udp = (struct udphdr *)&nic.packet[ETH_HLEN + sizeof(struct iphdr)];
-+			
-+			/* Make certain we have a reasonable packet length */
-+			if (ntohs(udp->len) > (ntohs(ip->len) - iplen))
-+				continue;
-+
-+			if (udp->chksum && udpchksum(ip, udp)) {
-+				printf("UDP checksum error\n");
-+				continue;
-+			}
-+		}
-+		result = reply(ival, ptr, ptype, ip, udp);
-+		if (result > 0) {
-+			return result;
-+		}
-+		
-+		/* If it isn't a packet the upper layer wants see if there is a default
-+		 * action.  This allows us reply to arp and igmp queryies.
-+		 */
-+		if ((ptype == ARP) &&
-+		    (nic.packetlen >= ETH_HLEN + sizeof(struct arprequest))) {
-+			struct	arprequest *arpreply;
-+			unsigned long tmp;
-+			
-+			arpreply = (struct arprequest *)&nic.packet[ETH_HLEN];
-+			memcpy(&tmp, arpreply->tipaddr, sizeof(in_addr));
-+			if ((arpreply->opcode == htons(ARP_REQUEST)) &&
-+			    (tmp == arptable[ARP_CLIENT].ipaddr.s_addr)) {
-+				arpreply->opcode = htons(ARP_REPLY);
-+				memcpy(arpreply->tipaddr, arpreply->sipaddr, sizeof(in_addr));
-+				memcpy(arpreply->thwaddr, arpreply->shwaddr, ETH_ALEN);
-+				memcpy(arpreply->sipaddr, &arptable[ARP_CLIENT].ipaddr, sizeof(in_addr));
-+				memcpy(arpreply->shwaddr, arptable[ARP_CLIENT].node, ETH_ALEN);
-+				eth_transmit(arpreply->thwaddr, ARP,
-+					     sizeof(struct  arprequest),
-+					     arpreply);
-+#ifdef	MDEBUG
-+				memcpy(&tmp, arpreply->tipaddr, sizeof(in_addr));
-+				printf("Sent ARP reply to: %@\n",tmp);
-+#endif	/* MDEBUG */
-+			}
-+		}
-+		process_igmp(ip, now);
-+	}
-+	return(0);
-+}
-+
-+#ifdef	REQUIRE_VCI_ETHERBOOT
-+/**************************************************************************
-+FIND_VCI_ETHERBOOT - Looks for "Etherboot" in Vendor Encapsulated Identifiers
-+On entry p points to byte count of VCI options
-+**************************************************************************/
-+static int find_vci_etherboot(unsigned char *p)
-+{
-+	unsigned char	*end = p + 1 + *p;
-+
-+	for (p++; p < end; ) {
-+		if (*p == RFC2132_VENDOR_CLASS_ID) {
-+			if (strncmp("Etherboot", p + 2, sizeof("Etherboot") - 1) == 0)
-+				return (1);
-+		} else if (*p == RFC1533_END)
-+			return (0);
-+		p += TAG_LEN(p) + 2;
-+	}
-+	return (0);
-+}
-+#endif	/* REQUIRE_VCI_ETHERBOOT */
-+
-+/**
-+ * decode_rfc1533
-+ *
-+ * Decodes RFC1533 header
-+ **/
-+int decode_rfc1533(unsigned char *p, unsigned int block, unsigned int len, int eof)
-+{
-+	static unsigned char *extdata = NULL, *extend = NULL;
-+	unsigned char        *extpath = NULL;
-+	unsigned char        *endp;
-+
-+	if (block == 0) {
-+		end_of_rfc1533 = NULL;
-+		if (memcmp(p, rfc1533_cookie, sizeof(rfc1533_cookie)))
-+			return(0); /* no RFC 1533 header found */
-+		p += 4;
-+		endp = p + len;
-+	} else {
-+		if (block == 1) {
-+			if (memcmp(p, rfc1533_cookie, sizeof(rfc1533_cookie)))
-+				return(0); /* no RFC 1533 header found */
-+			p += 4;
-+			len -= 4; }
-+		if (extend + len <= (unsigned char *)
-+		    rfc1533_venddata + sizeof(rfc1533_venddata)) {
-+			memcpy(extend, p, len);
-+			extend += len;
-+		} else {
-+			printf("Overflow in vendor data buffer! Aborting...\n");
-+			*extdata = RFC1533_END;
-+			return(0);
-+		}
-+		p = extdata; endp = extend;
-+	}
-+	if (!eof)
-+		return 1;
-+	while (p < endp) {
-+		unsigned char c = *p;
-+		if (c == RFC1533_PAD) {
-+			p++;
-+			continue;
-+		}
-+		else if (c == RFC1533_END) {
-+			end_of_rfc1533 = endp = p;
-+			continue;
-+		}
-+		else if (c == RFC1533_NETMASK)
-+			memcpy(&netmask, p+2, sizeof(in_addr));
-+		else if (c == RFC1533_GATEWAY) {
-+			/* This is a little simplistic, but it will
-+			   usually be sufficient.
-+			   Take only the first entry */
-+			if (TAG_LEN(p) >= sizeof(in_addr))
-+				memcpy(&arptable[ARP_GATEWAY].ipaddr, p+2, sizeof(in_addr));
-+		}
-+		else if (c == RFC1533_EXTENSIONPATH)
-+			extpath = p;
-+		else if (c == RFC2132_MSG_TYPE)
-+			dhcp_reply=*(p+2);
-+		else if (c == RFC2132_SRV_ID)
-+			memcpy(&dhcp_server, p+2, sizeof(in_addr));
-+		else if (c == RFC1533_HOSTNAME) {
-+			hostname = p + 2;
-+			hostnamelen = *(p + 1);
-+		}
-+		else if (c == RFC1533_VENDOR_CONFIGFILE){
-+			int l = TAG_LEN (p);
-+	  
-+			/* Eliminate the trailing NULs according to RFC 2132.  */
-+			while (*(p + 2 + l - 1) == '\000' && l > 0)
-+				l--;
-+	  
-+			/* XXX: Should check if LEN is less than the maximum length
-+			   of CONFIG_FILE. This kind of robustness will be a goal
-+			   in GRUB 1.0.  */
-+			memcpy (config_file, p + 2, l);
-+			config_file[l] = 0;
-+		}
-+		else {
-+			;
-+		}
-+		p += TAG_LEN(p) + 2;
-+	}
-+	extdata = extend = endp;
-+	if (block <= 0 && extpath != NULL) {
-+		char fname[64];
-+		if (TAG_LEN(extpath) >= sizeof(fname)){
-+			printf("Overflow in vendor data buffer! Aborting...\n");
-+			*extdata = RFC1533_END;
-+			return(0);
-+		}
-+		memcpy(fname, extpath+2, TAG_LEN(extpath));
-+		fname[(int)TAG_LEN(extpath)] = '\0';
-+		printf("Loading BOOTP-extension file: %s\n",fname);
-+		tftp_file_read(fname, decode_rfc1533);
-+	}
-+	return 1;	/* proceed with next block */
-+}
-+
-+
-+/* FIXME double check TWO_SECOND_DIVISOR */
-+#define TWO_SECOND_DIVISOR (RAND_MAX/TICKS_PER_SEC)
-+/**************************************************************************
-+RFC2131_SLEEP_INTERVAL - sleep for expotentially longer times (base << exp) +- 1 sec)
-+**************************************************************************/
-+long rfc2131_sleep_interval(long base, int exp)
-+{
-+	unsigned long tmo;
-+#ifdef BACKOFF_LIMIT
-+	if (exp > BACKOFF_LIMIT)
-+		exp = BACKOFF_LIMIT;
-+#endif
-+	tmo = (base << exp) + (TICKS_PER_SEC - (random()/TWO_SECOND_DIVISOR));
-+	return tmo;
-+}
-+
-+#ifdef MULTICAST_LEVEL2
-+/**************************************************************************
-+RFC1112_SLEEP_INTERVAL - sleep for expotentially longer times, up to (base << exp)
-+**************************************************************************/
-+long rfc1112_sleep_interval(long base, int exp)
-+{
-+	unsigned long divisor, tmo;
-+#ifdef BACKOFF_LIMIT
-+	if (exp > BACKOFF_LIMIT)
-+		exp = BACKOFF_LIMIT;
-+#endif
-+	divisor = RAND_MAX/(base << exp);
-+	tmo = random()/divisor;
-+	return tmo;
-+}
-+#endif /* MULTICAST_LEVEL_2 */
-+/* ifconfig - configure network interface.  */
-+int
-+ifconfig (char *ip, char *sm, char *gw, char *svr)
-+{
-+  in_addr tmp;
-+  
-+  if (sm) 
-+    {
-+      if (! inet_aton (sm, &tmp))
-+	return 0;
-+      
-+      netmask = tmp.s_addr;
-+    }
-+  
-+  if (ip) 
-+    {
-+      if (! inet_aton (ip, &arptable[ARP_CLIENT].ipaddr)) 
-+	return 0;
-+      
-+      if (! netmask && ! sm) 
-+	netmask = default_netmask ();
-+    }
-+  
-+  if (gw && ! inet_aton (gw, &arptable[ARP_GATEWAY].ipaddr)) 
-+    return 0;
-+
-+  /* Clear out the ARP entry.  */
-+  grub_memset (arptable[ARP_GATEWAY].node, 0, ETH_ALEN);
-+  
-+  if (svr && ! inet_aton (svr, &arptable[ARP_SERVER].ipaddr)) 
-+    return 0;
-+
-+  /* Likewise.  */
-+  grub_memset (arptable[ARP_SERVER].node, 0, ETH_ALEN);
-+  
-+  if (ip || sm)
-+    {
-+      if (IP_BROADCAST == (netmask | arptable[ARP_CLIENT].ipaddr.s_addr)
-+	  || netmask == (netmask | arptable[ARP_CLIENT].ipaddr.s_addr)
-+	  || ! netmask)
-+	network_ready = 0;
-+      else
-+	network_ready = 1;
-+    }
-+  
-+  return 1;
-+}
-+
-+/*
-+ * print_network_configuration
-+ *
-+ * Output the network configuration. It may broke the graphic console now.:-(
-+ */
-+void print_network_configuration (void)
-+{
-+	EnterFunction("print_network_configuration");
-+	if (! grub_eth_probe ())
-+		grub_printf ("No ethernet card found.\n");
-+	else if (! network_ready)
-+		grub_printf ("Not initialized yet.\n");
-+	else {
-+		etherboot_printf ("Address: %@\n", arptable[ARP_CLIENT].ipaddr.s_addr);
-+		etherboot_printf ("Netmask: %@\n", netmask);
-+		etherboot_printf ("Server: %@\n", arptable[ARP_SERVER].ipaddr.s_addr);
-+		etherboot_printf ("Gateway: %@\n", arptable[ARP_GATEWAY].ipaddr.s_addr);
-+	}
-+	LeaveFunction("print_network_configuration");
-+}
-+
-+/**
-+ * cleanup_net
-+ *
-+ * Mark network unusable, and disable NICs
-+ */
-+void cleanup_net (void)
-+{
-+	if (network_ready){
-+		/* Stop receiving packets.  */
-+		eth_disable ();
-+		network_ready = 0;
-+	}
-+}
-Index: b/netboot/nic.h
-===================================================================
---- a/netboot/nic.h
-+++ b/netboot/nic.h
-@@ -8,24 +8,38 @@
- #ifndef	NIC_H
- #define NIC_H
- 
-+#include "dev.h"
-+
-+typedef enum {
-+	DISABLE = 0,
-+	ENABLE,
-+	FORCE
-+} irq_action_t;
-+
- /*
-  *	Structure returned from eth_probe and passed to other driver
-  *	functions.
-  */
--
- struct nic
- {
--	void		(*reset)P((struct nic *));
--	int		(*poll)P((struct nic *));
-+	struct dev	dev;  /* This must come first */
-+	int		(*poll)P((struct nic *, int retrieve));
- 	void		(*transmit)P((struct nic *, const char *d,
- 				unsigned int t, unsigned int s, const char *p));
--	void		(*disable)P((struct nic *));
-+	void		(*irq)P((struct nic *, irq_action_t));
- 	int		flags;	/* driver specific flags */
- 	struct rom_info	*rom_info;	/* -> rom_info from main */
- 	unsigned char	*node_addr;
--	char		*packet;
-+	unsigned char	*packet;
- 	unsigned int	packetlen;
-+	unsigned int	ioaddr;
-+	unsigned char	irqno;
- 	void		*priv_data;	/* driver can hang private data here */
- };
- 
-+extern int  eth_probe(struct dev *dev);
-+extern int  eth_poll(int retrieve);
-+extern void eth_transmit(const char *d, unsigned int t, unsigned int s, const void *p);
-+extern void eth_disable(void);
-+extern void eth_irq(irq_action_t action);
- #endif	/* NIC_H */
-Index: b/netboot/ns83820.c
-===================================================================
---- /dev/null
-+++ b/netboot/ns83820.c
-@@ -0,0 +1,1020 @@
-+/**************************************************************************
-+*    ns83820.c: Etherboot device driver for the National Semiconductor 83820
-+*    Written 2004 by Timothy Legge <tlegge@rogers.com>
-+*
-+*    This program is free software; you can redistribute it and/or modify
-+*    it under the terms of the GNU General Public License as published by
-+*    the Free Software Foundation; either version 2 of the License, or
-+*    (at your option) any later version.
-+*
-+*    This program is distributed in the hope that it will be useful,
-+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+*    GNU General Public License for more details.
-+*
-+*    You should have received a copy of the GNU General Public License
-+*    along with this program; if not, write to the Free Software
-+*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*
-+*    Portions of this code based on:
-+*	ns83820.c by Benjamin LaHaise with contributions
-+* 		for Linux kernel 2.4.x.
-+*	
-+*    Linux Driver Version 0.20, 20020610
-+* 
-+*    This development of this Etherboot driver was funded by:
-+*
-+*    NXTV: http://www.nxtv.com/
-+*    	
-+*    REVISION HISTORY:
-+*    ================
-+*
-+*    v1.0	02-16-2004	timlegge	Initial port of Linux driver
-+*    v1.1	02-19-2004	timlegge	More rohbust transmit and poll
-+*    
-+*    Indent Options: indent -kr -i8
-+***************************************************************************/
-+
-+/* to get some global routines like printf */
-+#include "etherboot.h"
-+/* to get the interface to the body of the program */
-+#include "nic.h"
-+/* to get the PCI support functions, if this is a PCI NIC */
-+#include "pci.h"
-+
-+#if ARCH == ia64		/* Support 64-bit addressing */
-+#define USE_64BIT_ADDR
-+#endif
-+
-+//#define DDEBUG
-+#ifdef DDEBUG
-+#define dprintf(x) printf x
-+#else
-+#define dprintf(x)
-+#endif
-+
-+typedef unsigned char u8;
-+typedef signed char s8;
-+typedef unsigned short u16;
-+typedef signed short s16;
-+typedef unsigned int u32;
-+typedef signed int s32;
-+
-+#define HZ 100
-+
-+/* Condensed operations for readability. */
-+#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
-+#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
-+
-+/* NIC specific static variables go here */
-+
-+/* Global parameters.  See MODULE_PARM near the bottom. */
-+// static int ihr = 2;
-+static int reset_phy = 0;
-+static int lnksts = 0;		/* CFG_LNKSTS bit polarity */
-+
-+#if defined(CONFIG_HIGHMEM64G) || defined(__ia64__)
-+#define USE_64BIT_ADDR	"+"
-+#endif
-+
-+#if defined(USE_64BIT_ADDR)
-+#define TRY_DAC	1
-+#else
-+#define TRY_DAC	0
-+#endif
-+
-+/* tunables */
-+#define RX_BUF_SIZE	1500	/* 8192 */
-+
-+/* Must not exceed ~65000. */
-+#define NR_RX_DESC	64
-+#define NR_TX_DESC	1
-+
-+		   /* not tunable *//* Extra 6 bytes for 64 bit alignment (divisable by 8) */
-+#define REAL_RX_BUF_SIZE (RX_BUF_SIZE + 14 + 6)	/* rx/tx mac addr + type */
-+
-+#define MIN_TX_DESC_FREE	8
-+
-+/* register defines */
-+#define CFGCS		0x04
-+
-+#define CR_TXE		0x00000001
-+#define CR_TXD		0x00000002
-+/* Ramit : Here's a tip, don't do a RXD immediately followed by an RXE
-+ * The Receive engine skips one descriptor and moves
-+ * onto the next one!! */
-+#define CR_RXE		0x00000004
-+#define CR_RXD		0x00000008
-+#define CR_TXR		0x00000010
-+#define CR_RXR		0x00000020
-+#define CR_SWI		0x00000080
-+#define CR_RST		0x00000100
-+
-+#define PTSCR_EEBIST_FAIL       0x00000001
-+#define PTSCR_EEBIST_EN         0x00000002
-+#define PTSCR_EELOAD_EN         0x00000004
-+#define PTSCR_RBIST_FAIL        0x000001b8
-+#define PTSCR_RBIST_DONE        0x00000200
-+#define PTSCR_RBIST_EN          0x00000400
-+#define PTSCR_RBIST_RST         0x00002000
-+
-+#define MEAR_EEDI		0x00000001
-+#define MEAR_EEDO		0x00000002
-+#define MEAR_EECLK		0x00000004
-+#define MEAR_EESEL		0x00000008
-+#define MEAR_MDIO		0x00000010
-+#define MEAR_MDDIR		0x00000020
-+#define MEAR_MDC		0x00000040
-+
-+#define ISR_TXDESC3	0x40000000
-+#define ISR_TXDESC2	0x20000000
-+#define ISR_TXDESC1	0x10000000
-+#define ISR_TXDESC0	0x08000000
-+#define ISR_RXDESC3	0x04000000
-+#define ISR_RXDESC2	0x02000000
-+#define ISR_RXDESC1	0x01000000
-+#define ISR_RXDESC0	0x00800000
-+#define ISR_TXRCMP	0x00400000
-+#define ISR_RXRCMP	0x00200000
-+#define ISR_DPERR	0x00100000
-+#define ISR_SSERR	0x00080000
-+#define ISR_RMABT	0x00040000
-+#define ISR_RTABT	0x00020000
-+#define ISR_RXSOVR	0x00010000
-+#define ISR_HIBINT	0x00008000
-+#define ISR_PHY		0x00004000
-+#define ISR_PME		0x00002000
-+#define ISR_SWI		0x00001000
-+#define ISR_MIB		0x00000800
-+#define ISR_TXURN	0x00000400
-+#define ISR_TXIDLE	0x00000200
-+#define ISR_TXERR	0x00000100
-+#define ISR_TXDESC	0x00000080
-+#define ISR_TXOK	0x00000040
-+#define ISR_RXORN	0x00000020
-+#define ISR_RXIDLE	0x00000010
-+#define ISR_RXEARLY	0x00000008
-+#define ISR_RXERR	0x00000004
-+#define ISR_RXDESC	0x00000002
-+#define ISR_RXOK	0x00000001
-+
-+#define TXCFG_CSI	0x80000000
-+#define TXCFG_HBI	0x40000000
-+#define TXCFG_MLB	0x20000000
-+#define TXCFG_ATP	0x10000000
-+#define TXCFG_ECRETRY	0x00800000
-+#define TXCFG_BRST_DIS	0x00080000
-+#define TXCFG_MXDMA1024	0x00000000
-+#define TXCFG_MXDMA512	0x00700000
-+#define TXCFG_MXDMA256	0x00600000
-+#define TXCFG_MXDMA128	0x00500000
-+#define TXCFG_MXDMA64	0x00400000
-+#define TXCFG_MXDMA32	0x00300000
-+#define TXCFG_MXDMA16	0x00200000
-+#define TXCFG_MXDMA8	0x00100000
-+
-+#define CFG_LNKSTS	0x80000000
-+#define CFG_SPDSTS	0x60000000
-+#define CFG_SPDSTS1	0x40000000
-+#define CFG_SPDSTS0	0x20000000
-+#define CFG_DUPSTS	0x10000000
-+#define CFG_TBI_EN	0x01000000
-+#define CFG_MODE_1000	0x00400000
-+/* Ramit : Dont' ever use AUTO_1000, it never works and is buggy.
-+ * Read the Phy response and then configure the MAC accordingly */
-+#define CFG_AUTO_1000	0x00200000
-+#define CFG_PINT_CTL	0x001c0000
-+#define CFG_PINT_DUPSTS	0x00100000
-+#define CFG_PINT_LNKSTS	0x00080000
-+#define CFG_PINT_SPDSTS	0x00040000
-+#define CFG_TMRTEST	0x00020000
-+#define CFG_MRM_DIS	0x00010000
-+#define CFG_MWI_DIS	0x00008000
-+#define CFG_T64ADDR	0x00004000
-+#define CFG_PCI64_DET	0x00002000
-+#define CFG_DATA64_EN	0x00001000
-+#define CFG_M64ADDR	0x00000800
-+#define CFG_PHY_RST	0x00000400
-+#define CFG_PHY_DIS	0x00000200
-+#define CFG_EXTSTS_EN	0x00000100
-+#define CFG_REQALG	0x00000080
-+#define CFG_SB		0x00000040
-+#define CFG_POW		0x00000020
-+#define CFG_EXD		0x00000010
-+#define CFG_PESEL	0x00000008
-+#define CFG_BROM_DIS	0x00000004
-+#define CFG_EXT_125	0x00000002
-+#define CFG_BEM		0x00000001
-+
-+#define EXTSTS_UDPPKT	0x00200000
-+#define EXTSTS_TCPPKT	0x00080000
-+#define EXTSTS_IPPKT	0x00020000
-+
-+#define SPDSTS_POLARITY	(CFG_SPDSTS1 | CFG_SPDSTS0 | CFG_DUPSTS | (lnksts ? CFG_LNKSTS : 0))
-+
-+#define MIBC_MIBS	0x00000008
-+#define MIBC_ACLR	0x00000004
-+#define MIBC_FRZ	0x00000002
-+#define MIBC_WRN	0x00000001
-+
-+#define PCR_PSEN	(1 << 31)
-+#define PCR_PS_MCAST	(1 << 30)
-+#define PCR_PS_DA	(1 << 29)
-+#define PCR_STHI_8	(3 << 23)
-+#define PCR_STLO_4	(1 << 23)
-+#define PCR_FFHI_8K	(3 << 21)
-+#define PCR_FFLO_4K	(1 << 21)
-+#define PCR_PAUSE_CNT	0xFFFE
-+
-+#define RXCFG_AEP	0x80000000
-+#define RXCFG_ARP	0x40000000
-+#define RXCFG_STRIPCRC	0x20000000
-+#define RXCFG_RX_FD	0x10000000
-+#define RXCFG_ALP	0x08000000
-+#define RXCFG_AIRL	0x04000000
-+#define RXCFG_MXDMA512	0x00700000
-+#define RXCFG_DRTH	0x0000003e
-+#define RXCFG_DRTH0	0x00000002
-+
-+#define RFCR_RFEN	0x80000000
-+#define RFCR_AAB	0x40000000
-+#define RFCR_AAM	0x20000000
-+#define RFCR_AAU	0x10000000
-+#define RFCR_APM	0x08000000
-+#define RFCR_APAT	0x07800000
-+#define RFCR_APAT3	0x04000000
-+#define RFCR_APAT2	0x02000000
-+#define RFCR_APAT1	0x01000000
-+#define RFCR_APAT0	0x00800000
-+#define RFCR_AARP	0x00400000
-+#define RFCR_MHEN	0x00200000
-+#define RFCR_UHEN	0x00100000
-+#define RFCR_ULM	0x00080000
-+
-+#define VRCR_RUDPE	0x00000080
-+#define VRCR_RTCPE	0x00000040
-+#define VRCR_RIPE	0x00000020
-+#define VRCR_IPEN	0x00000010
-+#define VRCR_DUTF	0x00000008
-+#define VRCR_DVTF	0x00000004
-+#define VRCR_VTREN	0x00000002
-+#define VRCR_VTDEN	0x00000001
-+
-+#define VTCR_PPCHK	0x00000008
-+#define VTCR_GCHK	0x00000004
-+#define VTCR_VPPTI	0x00000002
-+#define VTCR_VGTI	0x00000001
-+
-+#define CR		0x00
-+#define CFG		0x04
-+#define MEAR		0x08
-+#define PTSCR		0x0c
-+#define	ISR		0x10
-+#define	IMR		0x14
-+#define	IER		0x18
-+#define	IHR		0x1c
-+#define TXDP		0x20
-+#define TXDP_HI		0x24
-+#define TXCFG		0x28
-+#define GPIOR		0x2c
-+#define RXDP		0x30
-+#define RXDP_HI		0x34
-+#define RXCFG		0x38
-+#define PQCR		0x3c
-+#define WCSR		0x40
-+#define PCR		0x44
-+#define RFCR		0x48
-+#define RFDR		0x4c
-+
-+#define SRR		0x58
-+
-+#define VRCR		0xbc
-+#define VTCR		0xc0
-+#define VDR		0xc4
-+#define CCSR		0xcc
-+
-+#define TBICR		0xe0
-+#define TBISR		0xe4
-+#define TANAR		0xe8
-+#define TANLPAR		0xec
-+#define TANER		0xf0
-+#define TESR		0xf4
-+
-+#define TBICR_MR_AN_ENABLE	0x00001000
-+#define TBICR_MR_RESTART_AN	0x00000200
-+
-+#define TBISR_MR_LINK_STATUS	0x00000020
-+#define TBISR_MR_AN_COMPLETE	0x00000004
-+
-+#define TANAR_PS2 		0x00000100
-+#define TANAR_PS1 		0x00000080
-+#define TANAR_HALF_DUP 		0x00000040
-+#define TANAR_FULL_DUP 		0x00000020
-+
-+#define GPIOR_GP5_OE		0x00000200
-+#define GPIOR_GP4_OE		0x00000100
-+#define GPIOR_GP3_OE		0x00000080
-+#define GPIOR_GP2_OE		0x00000040
-+#define GPIOR_GP1_OE		0x00000020
-+#define GPIOR_GP3_OUT		0x00000004
-+#define GPIOR_GP1_OUT		0x00000001
-+
-+#define LINK_AUTONEGOTIATE	0x01
-+#define LINK_DOWN		0x02
-+#define LINK_UP			0x04
-+
-+
-+#define __kick_rx()	writel(CR_RXE, ns->base + CR)
-+
-+#define kick_rx() do { \
-+	dprintf(("kick_rx: maybe kicking\n")); \
-+		writel(virt_to_le32desc(&rx_ring[ns->cur_rx]), ns->base + RXDP); \
-+		if (ns->next_rx == ns->next_empty) \
-+			printf("uh-oh: next_rx == next_empty???\n"); \
-+		__kick_rx(); \
-+} while(0)
-+
-+
-+#ifdef USE_64BIT_ADDR
-+#define HW_ADDR_LEN	8
-+#else
-+#define HW_ADDR_LEN	4
-+#endif
-+
-+#define CMDSTS_OWN	0x80000000
-+#define CMDSTS_MORE	0x40000000
-+#define CMDSTS_INTR	0x20000000
-+#define CMDSTS_ERR	0x10000000
-+#define CMDSTS_OK	0x08000000
-+#define CMDSTS_LEN_MASK	0x0000ffff
-+
-+#define CMDSTS_DEST_MASK	0x01800000
-+#define CMDSTS_DEST_SELF	0x00800000
-+#define CMDSTS_DEST_MULTI	0x01000000
-+
-+#define DESC_SIZE	8	/* Should be cache line sized */
-+
-+#ifdef USE_64BIT_ADDR
-+struct ring_desc {
-+	uint64_t link;
-+	uint64_t bufptr;
-+	u32 cmdsts;
-+	u32 extsts;		/* Extended status field */
-+};
-+#else
-+struct ring_desc {
-+	u32 link;
-+	u32 bufptr;
-+	u32 cmdsts;
-+	u32 extsts;		/* Extended status field */
-+};
-+#endif
-+
-+/* Define the TX Descriptor */
-+static struct ring_desc tx_ring[NR_TX_DESC]
-+    __attribute__ ((aligned(8)));
-+
-+/* Create a static buffer of size REAL_RX_BUF_SIZE for each
-+TX Descriptor.  All descriptors point to a
-+part of this buffer */
-+static unsigned char txb[NR_TX_DESC * REAL_RX_BUF_SIZE];
-+
-+/* Define the TX Descriptor */
-+static struct ring_desc rx_ring[NR_RX_DESC]
-+    __attribute__ ((aligned(8)));
-+
-+/* Create a static buffer of size REAL_RX_BUF_SIZE for each
-+RX Descriptor   All descriptors point to a
-+part of this buffer */
-+static unsigned char rxb[NR_RX_DESC * REAL_RX_BUF_SIZE]
-+    __attribute__ ((aligned(8)));
-+
-+/* Private Storage for the NIC */
-+struct ns83820_private {
-+	u8 *base;
-+	int up;
-+	long idle;
-+	u32 *next_rx_desc;
-+	u16 next_rx, next_empty;
-+	u32 cur_rx;
-+	u32 *descs;
-+	unsigned ihr;
-+	u32 CFG_cache;
-+	u32 MEAR_cache;
-+	u32 IMR_cache;
-+	int linkstate;
-+	u16 tx_done_idx;
-+	u16 tx_idx;
-+	u16 tx_intr_idx;
-+	u32 phy_descs;
-+	u32 *tx_descs;
-+
-+} nsx;
-+static struct ns83820_private *ns;
-+
-+static void phy_intr(struct nic *nic __unused)
-+{
-+	static char *speeds[] =
-+	    { "10", "100", "1000", "1000(?)", "1000F" };
-+	u32 cfg, new_cfg;
-+	u32 tbisr, tanar, tanlpar;
-+	int speed, fullduplex, newlinkstate;
-+
-+	cfg = readl(ns->base + CFG) ^ SPDSTS_POLARITY;
-+	if (ns->CFG_cache & CFG_TBI_EN) {
-+		/* we have an optical transceiver */
-+		tbisr = readl(ns->base + TBISR);
-+		tanar = readl(ns->base + TANAR);
-+		tanlpar = readl(ns->base + TANLPAR);
-+		dprintf(("phy_intr: tbisr=%hX, tanar=%hX, tanlpar=%hX\n",
-+			 tbisr, tanar, tanlpar));
-+
-+		if ((fullduplex = (tanlpar & TANAR_FULL_DUP)
-+		     && (tanar & TANAR_FULL_DUP))) {
-+
-+			/* both of us are full duplex */
-+			writel(readl(ns->base + TXCFG)
-+			       | TXCFG_CSI | TXCFG_HBI | TXCFG_ATP,
-+			       ns->base + TXCFG);
-+			writel(readl(ns->base + RXCFG) | RXCFG_RX_FD,
-+			       ns->base + RXCFG);
-+			/* Light up full duplex LED */
-+			writel(readl(ns->base + GPIOR) | GPIOR_GP1_OUT,
-+			       ns->base + GPIOR);
-+
-+		} else if (((tanlpar & TANAR_HALF_DUP)
-+			    && (tanar & TANAR_HALF_DUP))
-+			   || ((tanlpar & TANAR_FULL_DUP)
-+			       && (tanar & TANAR_HALF_DUP))
-+			   || ((tanlpar & TANAR_HALF_DUP)
-+			       && (tanar & TANAR_FULL_DUP))) {
-+
-+			/* one or both of us are half duplex */
-+			writel((readl(ns->base + TXCFG)
-+				& ~(TXCFG_CSI | TXCFG_HBI)) | TXCFG_ATP,
-+			       ns->base + TXCFG);
-+			writel(readl(ns->base + RXCFG) & ~RXCFG_RX_FD,
-+			       ns->base + RXCFG);
-+			/* Turn off full duplex LED */
-+			writel(readl(ns->base + GPIOR) & ~GPIOR_GP1_OUT,
-+			       ns->base + GPIOR);
-+		}
-+
-+		speed = 4;	/* 1000F */
-+
-+	} else {
-+		/* we have a copper transceiver */
-+		new_cfg =
-+		    ns->CFG_cache & ~(CFG_SB | CFG_MODE_1000 | CFG_SPDSTS);
-+
-+		if (cfg & CFG_SPDSTS1)
-+			new_cfg |= CFG_MODE_1000;
-+		else
-+			new_cfg &= ~CFG_MODE_1000;
-+
-+		speed = ((cfg / CFG_SPDSTS0) & 3);
-+		fullduplex = (cfg & CFG_DUPSTS);
-+
-+		if (fullduplex)
-+			new_cfg |= CFG_SB;
-+
-+		if ((cfg & CFG_LNKSTS) &&
-+		    ((new_cfg ^ ns->CFG_cache) & CFG_MODE_1000)) {
-+			writel(new_cfg, ns->base + CFG);
-+			ns->CFG_cache = new_cfg;
-+		}
-+
-+		ns->CFG_cache &= ~CFG_SPDSTS;
-+		ns->CFG_cache |= cfg & CFG_SPDSTS;
-+	}
-+
-+	newlinkstate = (cfg & CFG_LNKSTS) ? LINK_UP : LINK_DOWN;
-+
-+	if (newlinkstate & LINK_UP && ns->linkstate != newlinkstate) {
-+		printf("link now %s mbps, %s duplex and up.\n",
-+		       speeds[speed], fullduplex ? "full" : "half");
-+	} else if (newlinkstate & LINK_DOWN
-+		   && ns->linkstate != newlinkstate) {
-+		printf("link now down.\n");
-+	}
-+	ns->linkstate = newlinkstate;
-+}
-+static void ns83820_set_multicast(struct nic *nic __unused);
-+static void ns83820_setup_rx(struct nic *nic)
-+{
-+	unsigned i;
-+	ns->idle = 1;
-+	ns->next_rx = 0;
-+	ns->next_rx_desc = ns->descs;
-+	ns->next_empty = 0;
-+	ns->cur_rx = 0;
-+
-+
-+	for (i = 0; i < NR_RX_DESC; i++) {
-+		rx_ring[i].link = virt_to_le32desc(&rx_ring[i + 1]);
-+		rx_ring[i].bufptr =
-+		    virt_to_le32desc(&rxb[i * REAL_RX_BUF_SIZE]);
-+		rx_ring[i].cmdsts = cpu_to_le32(REAL_RX_BUF_SIZE);
-+		rx_ring[i].extsts = cpu_to_le32(0);
-+	}
-+//      No need to wrap the ring 
-+//      rx_ring[i].link = virt_to_le32desc(&rx_ring[0]);
-+	writel(0, ns->base + RXDP_HI);
-+	writel(virt_to_le32desc(&rx_ring[0]), ns->base + RXDP);
-+
-+	dprintf(("starting receiver\n"));
-+
-+	writel(0x0001, ns->base + CCSR);
-+	writel(0, ns->base + RFCR);
-+	writel(0x7fc00000, ns->base + RFCR);
-+	writel(0xffc00000, ns->base + RFCR);
-+
-+	ns->up = 1;
-+
-+	phy_intr(nic);
-+
-+	/* Okay, let it rip */
-+	ns->IMR_cache |= ISR_PHY;
-+	ns->IMR_cache |= ISR_RXRCMP;
-+	//dev->IMR_cache |= ISR_RXERR;
-+	//dev->IMR_cache |= ISR_RXOK;
-+	ns->IMR_cache |= ISR_RXORN;
-+	ns->IMR_cache |= ISR_RXSOVR;
-+	ns->IMR_cache |= ISR_RXDESC;
-+	ns->IMR_cache |= ISR_RXIDLE;
-+	ns->IMR_cache |= ISR_TXDESC;
-+	ns->IMR_cache |= ISR_TXIDLE;
-+
-+	// No reason to enable interupts...
-+	// writel(ns->IMR_cache, ns->base + IMR);
-+	// writel(1, ns->base + IER);
-+	ns83820_set_multicast(nic);
-+	kick_rx();
-+}
-+
-+
-+static void ns83820_do_reset(struct nic *nic __unused, u32 which)
-+{
-+	dprintf(("resetting chip...\n"));
-+	writel(which, ns->base + CR);
-+	do {
-+
-+	} while (readl(ns->base + CR) & which);
-+	dprintf(("okay!\n"));
-+}
-+
-+static void ns83820_reset(struct nic *nic)
-+{
-+	unsigned i;
-+	dprintf(("ns83820_reset\n"));
-+
-+	writel(0, ns->base + PQCR);
-+
-+	ns83820_setup_rx(nic);
-+
-+	for (i = 0; i < NR_TX_DESC; i++) {
-+		tx_ring[i].link = 0;
-+		tx_ring[i].bufptr = 0;
-+		tx_ring[i].cmdsts = cpu_to_le32(0);
-+		tx_ring[i].extsts = cpu_to_le32(0);
-+	}
-+
-+	ns->tx_idx = 0;
-+	ns->tx_done_idx = 0;
-+	writel(0, ns->base + TXDP_HI);
-+	return;
-+}
-+static void ns83820_getmac(struct nic *nic __unused, u8 * mac)
-+{
-+	unsigned i;
-+	for (i = 0; i < 3; i++) {
-+		u32 data;
-+		/* Read from the perfect match memory: this is loaded by
-+		 * the chip from the EEPROM via the EELOAD self test.
-+		 */
-+		writel(i * 2, ns->base + RFCR);
-+		data = readl(ns->base + RFDR);
-+		*mac++ = data;
-+		*mac++ = data >> 8;
-+	}
-+}
-+
-+static void ns83820_set_multicast(struct nic *nic __unused)
-+{
-+	u8 *rfcr = ns->base + RFCR;
-+	u32 and_mask = 0xffffffff;
-+	u32 or_mask = 0;
-+	u32 val;
-+
-+	/* Support Multicast */
-+	and_mask &= ~(RFCR_AAU | RFCR_AAM);
-+	or_mask |= RFCR_AAM;
-+	val = (readl(rfcr) & and_mask) | or_mask;
-+	/* Ramit : RFCR Write Fix doc says RFEN must be 0 modify other bits */
-+	writel(val & ~RFCR_RFEN, rfcr);
-+	writel(val, rfcr);
-+
-+}
-+static void ns83820_run_bist(struct nic *nic __unused, const char *name,
-+			     u32 enable, u32 done, u32 fail)
-+{
-+	int timed_out = 0;
-+	long start;
-+	u32 status;
-+	int loops = 0;
-+
-+	dprintf(("start %s\n", name))
-+
-+	    start = currticks();
-+
-+	writel(enable, ns->base + PTSCR);
-+	for (;;) {
-+		loops++;
-+		status = readl(ns->base + PTSCR);
-+		if (!(status & enable))
-+			break;
-+		if (status & done)
-+			break;
-+		if (status & fail)
-+			break;
-+		if ((currticks() - start) >= HZ) {
-+			timed_out = 1;
-+			break;
-+		}
-+	}
-+
-+	if (status & fail)
-+		printf("%s failed! (0x%hX & 0x%hX)\n", name, status, fail);
-+	else if (timed_out)
-+		printf("run_bist %s timed out! (%hX)\n", name, status);
-+	dprintf(("done %s in %d loops\n", name, loops));
-+}
-+
-+/*************************************
-+Check Link
-+*************************************/
-+static void ns83820_check_intr(struct nic *nic) {
-+	int i;
-+	u32 isr = readl(ns->base + ISR);
-+	if(ISR_PHY & isr)
-+		phy_intr(nic);
-+	if(( ISR_RXIDLE | ISR_RXDESC | ISR_RXERR) & isr)
-+		kick_rx();
-+	for (i = 0; i < NR_RX_DESC; i++) {
-+		if (rx_ring[i].cmdsts == CMDSTS_OWN) {
-+//			rx_ring[i].link = virt_to_le32desc(&rx_ring[i + 1]);
-+			rx_ring[i].cmdsts = cpu_to_le32(REAL_RX_BUF_SIZE);
-+		}
-+	}
-+}
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int ns83820_poll(struct nic *nic, int retrieve)
-+{
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+	u32 cmdsts;
-+	int entry = ns->cur_rx;
-+
-+	ns83820_check_intr(nic);
-+
-+	cmdsts = le32_to_cpu(rx_ring[entry].cmdsts);
-+
-+	if ( ! ( (CMDSTS_OWN & (cmdsts)) && (cmdsts != (CMDSTS_OWN)) ) )
-+	  return 0;
-+
-+	if ( ! retrieve ) return 1;
-+
-+	if (! (CMDSTS_OK & cmdsts) )
-+	  return 0;
-+
-+	nic->packetlen = cmdsts & 0xffff;
-+	memcpy(nic->packet,
-+	       rxb + (entry * REAL_RX_BUF_SIZE),
-+	       nic->packetlen);
-+	//			rx_ring[entry].link = 0;
-+	rx_ring[entry].cmdsts = cpu_to_le32(CMDSTS_OWN);
-+
-+	ns->cur_rx = ++ns->cur_rx % NR_RX_DESC;
-+
-+	if (ns->cur_rx == 0)	/* We have wrapped the ring */
-+	  kick_rx();
-+
-+	return 1;
-+}
-+
-+static inline void kick_tx(struct nic *nic __unused)
-+{
-+	dprintf(("kick_tx\n"));
-+	writel(CR_TXE, ns->base + CR);
-+}
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void ns83820_transmit(struct nic *nic, const char *d,	/* Destination */
-+			     unsigned int t,	/* Type */
-+			     unsigned int s,	/* size */
-+			     const char *p)
-+{				/* Packet */
-+	/* send the packet to destination */
-+
-+	u16 nstype;
-+	u32 cmdsts, extsts;
-+	int cur_tx = 0;
-+	u32 isr = readl(ns->base + ISR);
-+	if (ISR_TXIDLE & isr)
-+		kick_tx(nic);
-+	/* point to the current txb incase multiple tx_rings are used */
-+	memcpy(txb, d, ETH_ALEN);
-+	memcpy(txb + ETH_ALEN, nic->node_addr, ETH_ALEN);
-+	nstype = htons((u16) t);
-+	memcpy(txb + 2 * ETH_ALEN, (u8 *) & nstype, 2);
-+	memcpy(txb + ETH_HLEN, p, s);
-+	s += ETH_HLEN;
-+	s &= 0x0FFF;
-+	while (s < ETH_ZLEN)
-+		txb[s++] = '\0';
-+
-+	/* Setup the transmit descriptor */
-+	extsts = 0;
-+	extsts |= EXTSTS_UDPPKT;
-+
-+	tx_ring[cur_tx].bufptr = virt_to_le32desc(&txb);
-+	tx_ring[cur_tx].extsts = cpu_to_le32(extsts);
-+
-+	cmdsts = cpu_to_le32(0);
-+	cmdsts |= cpu_to_le32(CMDSTS_OWN | s);
-+	tx_ring[cur_tx].cmdsts = cpu_to_le32(cmdsts);
-+
-+	writel(virt_to_le32desc(&tx_ring[0]), ns->base + TXDP);
-+	kick_tx(nic);
-+}
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void ns83820_disable(struct dev *dev)
-+{
-+	/* put the card in its initial state */
-+	/* This function serves 3 purposes.
-+	 * This disables DMA and interrupts so we don't receive
-+	 *  unexpected packets or interrupts from the card after
-+	 *  etherboot has finished. 
-+	 * This frees resources so etherboot may use
-+	 *  this driver on another interface
-+	 * This allows etherboot to reinitialize the interface
-+	 *  if something is something goes wrong.
-+	 */
-+	/* disable interrupts */
-+	writel(0, ns->base + IMR);
-+	writel(0, ns->base + IER);
-+	readl(ns->base + IER);
-+
-+	ns->up = 0;
-+
-+	ns83820_do_reset((struct nic *) dev, CR_RST);
-+
-+	ns->IMR_cache &=
-+	    ~(ISR_RXOK | ISR_RXDESC | ISR_RXERR | ISR_RXEARLY |
-+	      ISR_RXIDLE);
-+	writel(ns->IMR_cache, ns->base + IMR);
-+
-+	/* touch the pci bus... */
-+	readl(ns->base + IMR);
-+
-+	/* assumes the transmitter is already disabled and reset */
-+	writel(0, ns->base + RXDP_HI);
-+	writel(0, ns->base + RXDP);
-+}
-+
-+/**************************************************************************
-+IRQ - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void ns83820_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+***************************************************************************/
-+
-+#define board_found 1
-+#define valid_link 0
-+static int ns83820_probe(struct dev *dev, struct pci_device *pci)
-+{
-+	struct nic *nic = (struct nic *) dev;
-+	int sz;
-+	long addr;
-+	int using_dac = 0;
-+
-+	if (pci->ioaddr == 0)
-+		return 0;
-+
-+	printf("ns83820.c: Found %s, vendor=0x%hX, device=0x%hX\n",
-+	       pci->name, pci->vendor, pci->dev_id);
-+
-+	/* point to private storage */
-+	ns = &nsx;
-+
-+	adjust_pci_device(pci);
-+
-+	addr = pci_bar_start(pci, PCI_BASE_ADDRESS_1);
-+	sz = pci_bar_size(pci, PCI_BASE_ADDRESS_1);
-+
-+	ns->base = ioremap(addr, (1UL << 12));
-+//      ns->base = ioremap(addr, sz);
-+
-+	if (!ns->base)
-+		return 0;
-+
-+	nic->irqno  = 0;
-+	nic->ioaddr = pci->ioaddr & ~3;
-+
-+	/* disable interrupts */
-+	writel(0, ns->base + IMR);
-+	writel(0, ns->base + IER);
-+	readl(ns->base + IER);
-+
-+	ns->IMR_cache = 0;
-+
-+	ns83820_do_reset(nic, CR_RST);
-+
-+	/* Must reset the ram bist before running it */
-+	writel(PTSCR_RBIST_RST, ns->base + PTSCR);
-+	ns83820_run_bist(nic, "sram bist", PTSCR_RBIST_EN,
-+			 PTSCR_RBIST_DONE, PTSCR_RBIST_FAIL);
-+	ns83820_run_bist(nic, "eeprom bist", PTSCR_EEBIST_EN, 0,
-+			 PTSCR_EEBIST_FAIL);
-+	ns83820_run_bist(nic, "eeprom load", PTSCR_EELOAD_EN, 0, 0);
-+
-+	/* I love config registers */
-+	ns->CFG_cache = readl(ns->base + CFG);
-+
-+	if ((ns->CFG_cache & CFG_PCI64_DET)) {
-+		printf("%s: detected 64 bit PCI data bus.\n", pci->name);
-+		/*dev->CFG_cache |= CFG_DATA64_EN; */
-+		if (!(ns->CFG_cache & CFG_DATA64_EN))
-+			printf
-+			    ("%s: EEPROM did not enable 64 bit bus.  Disabled.\n",
-+			     pci->name);
-+	} else
-+		ns->CFG_cache &= ~(CFG_DATA64_EN);
-+
-+	ns->CFG_cache &= (CFG_TBI_EN | CFG_MRM_DIS | CFG_MWI_DIS |
-+			  CFG_T64ADDR | CFG_DATA64_EN | CFG_EXT_125 |
-+			  CFG_M64ADDR);
-+	ns->CFG_cache |=
-+	    CFG_PINT_DUPSTS | CFG_PINT_LNKSTS | CFG_PINT_SPDSTS |
-+	    CFG_EXTSTS_EN | CFG_EXD | CFG_PESEL;
-+	ns->CFG_cache |= CFG_REQALG;
-+	ns->CFG_cache |= CFG_POW;
-+	ns->CFG_cache |= CFG_TMRTEST;
-+
-+	/* When compiled with 64 bit addressing, we must always enable
-+	 * the 64 bit descriptor format.
-+	 */
-+#ifdef USE_64BIT_ADDR
-+	ns->CFG_cache |= CFG_M64ADDR;
-+#endif
-+
-+//FIXME: Enable section on dac or remove this
-+	if (using_dac)
-+		ns->CFG_cache |= CFG_T64ADDR;
-+
-+	/* Big endian mode does not seem to do what the docs suggest */
-+	ns->CFG_cache &= ~CFG_BEM;
-+
-+	/* setup optical transceiver if we have one */
-+	if (ns->CFG_cache & CFG_TBI_EN) {
-+		dprintf(("%s: enabling optical transceiver\n", pci->name));
-+		writel(readl(ns->base + GPIOR) | 0x3e8, ns->base + GPIOR);
-+
-+		/* setup auto negotiation feature advertisement */
-+		writel(readl(ns->base + TANAR)
-+		       | TANAR_HALF_DUP | TANAR_FULL_DUP,
-+		       ns->base + TANAR);
-+
-+		/* start auto negotiation */
-+		writel(TBICR_MR_AN_ENABLE | TBICR_MR_RESTART_AN,
-+		       ns->base + TBICR);
-+		writel(TBICR_MR_AN_ENABLE, ns->base + TBICR);
-+		ns->linkstate = LINK_AUTONEGOTIATE;
-+
-+		ns->CFG_cache |= CFG_MODE_1000;
-+	}
-+	writel(ns->CFG_cache, ns->base + CFG);
-+	dprintf(("CFG: %hX\n", ns->CFG_cache));
-+
-+	/* FIXME: reset_phy is defaulted to 0, should we reset anyway? */
-+	if (reset_phy) {
-+		dprintf(("%s: resetting phy\n", pci->name));
-+		writel(ns->CFG_cache | CFG_PHY_RST, ns->base + CFG);
-+		writel(ns->CFG_cache, ns->base + CFG);
-+	}
-+#if 0				/* Huh?  This sets the PCI latency register.  Should be done via 
-+				 * the PCI layer.  FIXME.
-+				 */
-+	if (readl(dev->base + SRR))
-+		writel(readl(dev->base + 0x20c) | 0xfe00,
-+		       dev->base + 0x20c);
-+#endif
-+
-+	/* Note!  The DMA burst size interacts with packet
-+	 * transmission, such that the largest packet that
-+	 * can be transmitted is 8192 - FLTH - burst size.
-+	 * If only the transmit fifo was larger...
-+	 */
-+	/* Ramit : 1024 DMA is not a good idea, it ends up banging 
-+	 * some DELL and COMPAQ SMP systems */
-+	writel(TXCFG_CSI | TXCFG_HBI | TXCFG_ATP | TXCFG_MXDMA512
-+	       | ((1600 / 32) * 0x100), ns->base + TXCFG);
-+
-+	/* Set Rx to full duplex, don't accept runt, errored, long or length
-+	 * range errored packets.  Use 512 byte DMA.
-+	 */
-+	/* Ramit : 1024 DMA is not a good idea, it ends up banging 
-+	 * some DELL and COMPAQ SMP systems 
-+	 * Turn on ALP, only we are accpeting Jumbo Packets */
-+	writel(RXCFG_AEP | RXCFG_ARP | RXCFG_AIRL | RXCFG_RX_FD
-+	       | RXCFG_STRIPCRC
-+	       //| RXCFG_ALP
-+	       | (RXCFG_MXDMA512) | 0, ns->base + RXCFG);
-+
-+	/* Disable priority queueing */
-+	writel(0, ns->base + PQCR);
-+
-+	/* Enable IP checksum validation and detetion of VLAN headers.
-+	 * Note: do not set the reject options as at least the 0x102
-+	 * revision of the chip does not properly accept IP fragments
-+	 * at least for UDP.
-+	 */
-+	/* Ramit : Be sure to turn on RXCFG_ARP if VLAN's are enabled, since
-+	 * the MAC it calculates the packetsize AFTER stripping the VLAN
-+	 * header, and if a VLAN Tagged packet of 64 bytes is received (like
-+	 * a ping with a VLAN header) then the card, strips the 4 byte VLAN
-+	 * tag and then checks the packet size, so if RXCFG_ARP is not enabled,
-+	 * it discrards it!.  These guys......
-+	 */
-+	writel(VRCR_IPEN | VRCR_VTDEN, ns->base + VRCR);
-+
-+	/* Enable per-packet TCP/UDP/IP checksumming */
-+	writel(VTCR_PPCHK, ns->base + VTCR);
-+
-+	/* Ramit : Enable async and sync pause frames */
-+//      writel(0, ns->base + PCR); 
-+	writel((PCR_PS_MCAST | PCR_PS_DA | PCR_PSEN | PCR_FFLO_4K |
-+		PCR_FFHI_8K | PCR_STLO_4 | PCR_STHI_8 | PCR_PAUSE_CNT),
-+	       ns->base + PCR);
-+
-+	/* Disable Wake On Lan */
-+	writel(0, ns->base + WCSR);
-+
-+	ns83820_getmac(nic, nic->node_addr);
-+	printf("%! at ioaddr 0x%hX, ", nic->node_addr, ns->base);
-+
-+	if (using_dac) {
-+		dprintf(("%s: using 64 bit addressing.\n", pci->name));
-+	}
-+
-+	dprintf(("%s: DP83820 %d.%d: %! io=0x%hX\n",
-+		 pci->name,
-+		 (unsigned) readl(ns->base + SRR) >> 8,
-+		 (unsigned) readl(ns->base + SRR) & 0xff,
-+		 nic->node_addr, pci->ioaddr));
-+
-+#ifdef PHY_CODE_IS_FINISHED
-+	ns83820_probe_phy(dev);
-+#endif
-+
-+	ns83820_reset(nic);
-+	/* point to NIC specific routines */
-+	dev->disable  = ns83820_disable;
-+	nic->poll     = ns83820_poll;
-+	nic->transmit = ns83820_transmit;
-+	nic->irq      = ns83820_irq;
-+	return 1;
-+}
-+
-+static struct pci_id ns83820_nics[] = {
-+	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820"),
-+};
-+
-+struct pci_driver ns83820_driver = {
-+	.type = NIC_DRIVER,
-+	.name = "NS83820/PCI",
-+	.probe = ns83820_probe,
-+	.ids = ns83820_nics,
-+	.id_count = sizeof(ns83820_nics) / sizeof(ns83820_nics[0]),
-+	.class = 0,
-+};
-Index: b/netboot/ns8390.c
-===================================================================
---- a/netboot/ns8390.c
-+++ b/netboot/ns8390.c
-@@ -13,11 +13,15 @@
-   the proper functioning of this software, nor do the authors assume any
-   responsibility for damages incurred with its use.
- 
-+Multicast support added by Timothy Legge (timlegge@users.sourceforge.net) 09/28/2003
-+Relocation support added by Ken Yap (ken_yap@users.sourceforge.net) 28/12/02
- 3c503 support added by Bill Paul (wpaul@ctr.columbia.edu) on 11/15/94
- SMC8416 support added by Bill Paul (wpaul@ctr.columbia.edu) on 12/25/94
- 3c503 PIO support added by Jim Hague (jim.hague@acm.org) on 2/17/98
- RX overrun by Klaus Espenlaub (espenlaub@informatik.uni-ulm.de) on 3/10/99
-   parts taken from the Linux 8390 driver (by Donald Becker and Paul Gortmaker)
-+SMC8416 PIO support added by Andrew Bettison (andrewb@zip.com.au) on 4/3/02
-+  based on the Linux 8390 driver (by Donald Becker and Paul Gortmaker)
- 
- **************************************************************************/
- 
-@@ -26,10 +30,16 @@
- #include "ns8390.h"
- #ifdef	INCLUDE_NS8390
- #include "pci.h"
-+#else
-+#include "isa.h"
- #endif
--#include "cards.h"
- 
--static unsigned char	eth_vendor, eth_flags, eth_laar;
-+typedef int Address;
-+
-+static unsigned char	eth_vendor, eth_flags;
-+#ifdef	INCLUDE_WD
-+static unsigned char	eth_laar;
-+#endif
- static unsigned short	eth_nic_base, eth_asic_base;
- static unsigned char	eth_memsize, eth_rx_start, eth_tx_start;
- static Address		eth_bmem, eth_rmem;
-@@ -66,6 +76,7 @@
- #endif
- 
- #if	defined(INCLUDE_WD)
-+#define	ASIC_PIO	WD_IAR
- #define	eth_probe	wd_probe
- #if	defined(INCLUDE_3C503) || defined(INCLUDE_NE) || defined(INCLUDE_NS8390)
- Error you must only define one of INCLUDE_WD, INCLUDE_3C503, INCLUDE_NE, INCLUDE_NS8390
-@@ -101,13 +112,16 @@
- #endif
- #endif
- 
--#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM))
-+#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM)) || (defined(INCLUDE_WD) && defined(WD_790_PIO))
- /**************************************************************************
- ETH_PIO_READ - Read a frame via Programmed I/O
- **************************************************************************/
- static void eth_pio_read(unsigned int src, unsigned char *dst, unsigned int cnt)
- {
--	if (eth_flags & FLAG_16BIT) { ++cnt; cnt &= ~1; }
-+#ifdef	INCLUDE_WD
-+	outb(src & 0xff, eth_asic_base + WD_GP2);
-+	outb(src >> 8, eth_asic_base + WD_GP2);
-+#else
- 	outb(D8390_COMMAND_RD2 |
- 		D8390_COMMAND_STA, eth_nic_base + D8390_P0_COMMAND);
- 	outb(cnt, eth_nic_base + D8390_P0_RBCR0);
-@@ -122,9 +136,10 @@
- 	outb(src >> 8, eth_asic_base + _3COM_DAMSB);
- 	outb(t503_output | _3COM_CR_START, eth_asic_base + _3COM_CR);
- #endif
-+#endif
- 
- 	if (eth_flags & FLAG_16BIT)
--		cnt >>= 1;
-+		cnt = (cnt + 1) >> 1;
- 
- 	while(cnt--) {
- #ifdef	INCLUDE_3C503
-@@ -153,7 +168,10 @@
- #ifdef	COMPEX_RL2000_FIX
- 	unsigned int x;
- #endif	/* COMPEX_RL2000_FIX */
--	if (eth_flags & FLAG_16BIT) { ++cnt; cnt &= ~1; }
-+#ifdef	INCLUDE_WD
-+	outb(dst & 0xff, eth_asic_base + WD_GP2);
-+	outb(dst >> 8, eth_asic_base + WD_GP2);
-+#else
- 	outb(D8390_COMMAND_RD2 |
- 		D8390_COMMAND_STA, eth_nic_base + D8390_P0_COMMAND);
- 	outb(D8390_ISR_RDC, eth_nic_base + D8390_P0_ISR);
-@@ -170,9 +188,10 @@
- 
- 	outb(t503_output | _3COM_CR_DDIR | _3COM_CR_START, eth_asic_base + _3COM_CR);
- #endif
-+#endif
- 
- 	if (eth_flags & FLAG_16BIT)
--		cnt >>= 1;
-+		cnt = (cnt + 1) >> 1;
- 
- 	while(cnt--)
- 	{
-@@ -201,17 +220,40 @@
- 	if (x >= COMPEX_RL2000_TRIES)
- 		printf("Warning: Compex RL2000 aborted wait!\n");
- #endif	/* COMPEX_RL2000_FIX */
-+#ifndef	INCLUDE_WD
- 	while((inb(eth_nic_base + D8390_P0_ISR) & D8390_ISR_RDC)
- 		!= D8390_ISR_RDC);
- #endif
-+#endif
- }
- #else
- /**************************************************************************
- ETH_PIO_READ - Dummy routine when NE2000 not compiled in
- **************************************************************************/
--static void eth_pio_read(unsigned int src, unsigned char *dst, unsigned int cnt) {}
-+static void eth_pio_read(unsigned int src __unused, unsigned char *dst  __unused, unsigned int cnt __unused) {}
- #endif
- 
-+
-+/**************************************************************************
-+enable_multycast - Enable Multicast
-+**************************************************************************/
-+static void enable_multicast(unsigned short eth_nic_base) 
-+{
-+	unsigned char mcfilter[8];
-+	int i;
-+	memset(mcfilter, 0xFF, 8);
-+	outb(4, eth_nic_base+D8390_P0_RCR);	
-+	outb(D8390_COMMAND_RD2 + D8390_COMMAND_PS1, eth_nic_base + D8390_P0_COMMAND);
-+	for(i=0;i<8;i++)
-+	{
-+		outb(mcfilter[i], eth_nic_base + 8 + i);
-+		if(inb(eth_nic_base + 8 + i)!=mcfilter[i])
-+			printf("Error SMC 83C690 Multicast filter read/write mishap %d\n",i);
-+	}
-+	outb(D8390_COMMAND_RD2 + D8390_COMMAND_PS0, eth_nic_base + D8390_P0_COMMAND);
-+	outb(4 | 0x08, eth_nic_base+D8390_P0_RCR);
-+}
-+
- /**************************************************************************
- NS8390_RESET - Reset adapter
- **************************************************************************/
-@@ -238,7 +280,14 @@
- 	outb(eth_tx_start, eth_nic_base+D8390_P0_TPSR);
- 	outb(eth_rx_start, eth_nic_base+D8390_P0_PSTART);
- #ifdef	INCLUDE_WD
--	if (eth_flags & FLAG_790) outb(0, eth_nic_base + 0x09);
-+	if (eth_flags & FLAG_790) {
-+#ifdef	WD_790_PIO
-+		outb(0x10, eth_asic_base + 0x06); /* disable interrupts, enable PIO */
-+		outb(0x01, eth_nic_base + 0x09); /* enable ring read auto-wrap */
-+#else
-+		outb(0, eth_nic_base + 0x09);
-+#endif
-+	}
- #endif
- 	outb(eth_memsize, eth_nic_base+D8390_P0_PSTOP);
- 	outb(eth_memsize - 1, eth_nic_base+D8390_P0_BOUND);
-@@ -266,8 +315,10 @@
- 		outb(D8390_COMMAND_PS0 |
- 			D8390_COMMAND_RD2 | D8390_COMMAND_STA, eth_nic_base+D8390_P0_COMMAND);
- 	outb(0xFF, eth_nic_base+D8390_P0_ISR);
--	outb(0, eth_nic_base+D8390_P0_TCR);
--	outb(4, eth_nic_base+D8390_P0_RCR);	/* allow broadcast frames */
-+	outb(0, eth_nic_base+D8390_P0_TCR);	/* transmitter on */
-+	outb(4, eth_nic_base+D8390_P0_RCR);	/* allow rx broadcast frames */
-+
-+	enable_multicast(eth_nic_base);
- 
- #ifdef	INCLUDE_3C503
-         /*
-@@ -281,7 +332,7 @@
- #endif
- }
- 
--static int ns8390_poll(struct nic *nic);
-+static int ns8390_poll(struct nic *nic, int retrieve);
- 
- #ifndef	INCLUDE_3C503
- /**************************************************************************
-@@ -324,7 +375,7 @@
- 
- 	/* clear the RX ring, acknowledge overrun interrupt */
- 	eth_drain_receiver = 1;
--	while (ns8390_poll(nic))
-+	while (ns8390_poll(nic, 1))
- 		/* Nothing */;
- 	eth_drain_receiver = 0;
- 	outb(D8390_ISR_OVW, eth_nic_base+D8390_P0_ISR);
-@@ -344,50 +395,54 @@
- 	unsigned int s,			/* size */
- 	const char *p)			/* Packet */
- {
-+#if defined(INCLUDE_3C503) || (defined(INCLUDE_WD) && ! defined(WD_790_PIO))
-+	Address		eth_vmem = bus_to_virt(eth_bmem);
-+#endif
- #ifdef	INCLUDE_3C503
-         if (!(eth_flags & FLAG_PIO)) {
--                memcpy((char *)eth_bmem, d, ETH_ALEN);	/* dst */
--                memcpy((char *)eth_bmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
--                *((char *)eth_bmem+12) = t>>8;		/* type */
--                *((char *)eth_bmem+13) = t;
--                memcpy((char *)eth_bmem+ETH_HLEN, p, s);
-+                memcpy((char *)eth_vmem, d, ETH_ALEN);	/* dst */
-+                memcpy((char *)eth_vmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
-+                *((char *)eth_vmem+12) = t>>8;		/* type */
-+                *((char *)eth_vmem+13) = t;
-+                memcpy((char *)eth_vmem+ETH_HLEN, p, s);
-                 s += ETH_HLEN;
--                while (s < ETH_ZLEN) *((char *)eth_bmem+(s++)) = 0;
-+                while (s < ETH_ZLEN) *((char *)eth_vmem+(s++)) = 0;
-         }
- #endif
- 
- #ifdef	INCLUDE_WD
--	/* Memory interface */
- 	if (eth_flags & FLAG_16BIT) {
- 		outb(eth_laar | WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
- 		inb(0x84);
- 	}
-+#ifndef	WD_790_PIO
-+	/* Memory interface */
- 	if (eth_flags & FLAG_790) {
- 		outb(WD_MSR_MENB, eth_asic_base + WD_MSR);
- 		inb(0x84);
- 	}
- 	inb(0x84);
--	memcpy((char *)eth_bmem, d, ETH_ALEN);	/* dst */
--	memcpy((char *)eth_bmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
--	*((char *)eth_bmem+12) = t>>8;		/* type */
--	*((char *)eth_bmem+13) = t;
--	memcpy((char *)eth_bmem+ETH_HLEN, p, s);
-+	memcpy((char *)eth_vmem, d, ETH_ALEN);	/* dst */
-+	memcpy((char *)eth_vmem+ETH_ALEN, nic->node_addr, ETH_ALEN); /* src */
-+	*((char *)eth_vmem+12) = t>>8;		/* type */
-+	*((char *)eth_vmem+13) = t;
-+	memcpy((char *)eth_vmem+ETH_HLEN, p, s);
- 	s += ETH_HLEN;
--	while (s < ETH_ZLEN) *((char *)eth_bmem+(s++)) = 0;
-+	while (s < ETH_ZLEN) *((char *)eth_vmem+(s++)) = 0;
- 	if (eth_flags & FLAG_790) {
- 		outb(0, eth_asic_base + WD_MSR);
- 		inb(0x84);
- 	}
--	if (eth_flags & FLAG_16BIT) {
--		outb(eth_laar & ~WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
--		inb(0x84);
--	}
-+#else
-+	inb(0x84);
-+#endif
- #endif
- 
- #if	defined(INCLUDE_3C503)
--	if (eth_flags & FLAG_PIO) {
-+	if (eth_flags & FLAG_PIO)
- #endif
--#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM))
-+#if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390) || (defined(INCLUDE_3C503) && !defined(T503_SHMEM)) || (defined(INCLUDE_WD) && defined(WD_790_PIO))
-+	{
- 		/* Programmed I/O */
- 		unsigned short type;
- 		type = (t >> 8) | (t << 8);
-@@ -398,12 +453,16 @@
- 		eth_pio_write(p, (eth_tx_start<<8)+ETH_HLEN, s);
- 		s += ETH_HLEN;
- 		if (s < ETH_ZLEN) s = ETH_ZLEN;
-+	}
- #endif
- #if	defined(INCLUDE_3C503)
--	}
- #endif
- 
- #ifdef	INCLUDE_WD
-+	if (eth_flags & FLAG_16BIT) {
-+		outb(eth_laar & ~WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
-+		inb(0x84);
-+	}
- 	if (eth_flags & FLAG_790)
- 		outb(D8390_COMMAND_PS0 |
- 			D8390_COMMAND_STA, eth_nic_base+D8390_P0_COMMAND);
-@@ -428,7 +487,7 @@
- /**************************************************************************
- NS8390_POLL - Wait for a frame
- **************************************************************************/
--static int ns8390_poll(struct nic *nic)
-+static int ns8390_poll(struct nic *nic, int retrieve)
- {
- 	int ret = 0;
- 	unsigned char rstat, curr, next;
-@@ -453,22 +512,27 @@
- 	outb(D8390_COMMAND_PS0, eth_nic_base+D8390_P0_COMMAND);
- 	if (curr >= eth_memsize) curr=eth_rx_start;
- 	if (curr == next) return(0);
-+
-+	if ( ! retrieve ) return 1;
-+
- #ifdef	INCLUDE_WD
- 	if (eth_flags & FLAG_16BIT) {
- 		outb(eth_laar | WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
- 		inb(0x84);
- 	}
-+#ifndef	WD_790_PIO
- 	if (eth_flags & FLAG_790) {
- 		outb(WD_MSR_MENB, eth_asic_base + WD_MSR);
- 		inb(0x84);
- 	}
-+#endif
- 	inb(0x84);
- #endif
- 	pktoff = next << 8;
- 	if (eth_flags & FLAG_PIO)
- 		eth_pio_read(pktoff, (char *)&pkthdr, 4);
- 	else
--		memcpy(&pkthdr, (char *)eth_rmem + pktoff, 4);
-+		memcpy(&pkthdr, bus_to_virt(eth_rmem + pktoff), 4);
- 	pktoff += sizeof(pkthdr);
- 	/* incoming length includes FCS so must sub 4 */
- 	len = pkthdr.len - 4;
-@@ -486,7 +550,7 @@
- 			if (eth_flags & FLAG_PIO)
- 				eth_pio_read(pktoff, p, frag);
- 			else
--				memcpy(p, (char *)eth_rmem + pktoff, frag);
-+				memcpy(p, bus_to_virt(eth_rmem + pktoff), frag);
- 			pktoff = eth_rx_start << 8;
- 			p += frag;
- 			len -= frag;
-@@ -495,14 +559,16 @@
- 		if (eth_flags & FLAG_PIO)
- 			eth_pio_read(pktoff, p, len);
- 		else
--			memcpy(p, (char *)eth_rmem + pktoff, len);
-+			memcpy(p, bus_to_virt(eth_rmem + pktoff), len);
- 		ret = 1;
- 	}
- #ifdef	INCLUDE_WD
-+#ifndef	WD_790_PIO
- 	if (eth_flags & FLAG_790) {
- 		outb(0, eth_asic_base + WD_MSR);
- 		inb(0x84);
- 	}
-+#endif
- 	if (eth_flags & FLAG_16BIT) {
- 		outb(eth_laar & ~WD_LAAR_M16EN, eth_asic_base + WD_LAAR);
- 		inb(0x84);
-@@ -519,31 +585,56 @@
- /**************************************************************************
- NS8390_DISABLE - Turn off adapter
- **************************************************************************/
--static void ns8390_disable(struct nic *nic)
-+static void ns8390_disable(struct dev *dev)
- {
-+	struct nic *nic = (struct nic *)dev;
-+	/* reset and disable merge */
-+	ns8390_reset(nic);
-+}
-+
-+/**************************************************************************
-+NS8390_IRQ - Enable, Disable, or Force interrupts
-+**************************************************************************/
-+static void ns8390_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
- }
- 
- /**************************************************************************
- ETH_PROBE - Look for an adapter
- **************************************************************************/
- #ifdef	INCLUDE_NS8390
--struct nic *eth_probe(struct nic *nic, unsigned short *probe_addrs,
--		      struct pci_device *pci)
-+static int eth_probe (struct dev *dev, struct pci_device *pci)
- #else
--struct nic *eth_probe(struct nic *nic, unsigned short *probe_addrs)
-+static int eth_probe (struct dev *dev, unsigned short *probe_addrs __unused)
- #endif
- {
-+	struct nic *nic = (struct nic *)dev;
- 	int i;
--	struct wd_board *brd;
--	unsigned short chksum;
--	unsigned char c;
-+#ifdef INCLUDE_NS8390
-+	unsigned short pci_probe_addrs[] = { pci->ioaddr, 0 };
-+	unsigned short *probe_addrs = pci_probe_addrs;
-+#endif
- 	eth_vendor = VENDOR_NONE;
- 	eth_drain_receiver = 0;
- 
-+	nic->irqno  = 0;
-+
- #ifdef	INCLUDE_WD
-+{
- 	/******************************************************************
- 	Search for WD/SMC cards
- 	******************************************************************/
-+	struct wd_board *brd;
-+	unsigned short chksum;
-+	unsigned char c;
- 	for (eth_asic_base = WD_LOW_BASE; eth_asic_base <= WD_HIGH_BASE;
- 		eth_asic_base += 0x20) {
- 		chksum = 0;
-@@ -560,6 +651,9 @@
- 	/* We've found a board */
- 	eth_vendor = VENDOR_WD;
- 	eth_nic_base = eth_asic_base + WD_NIC_ADDR;
-+
-+	nic->ioaddr = eth_nic_base;
-+
- 	c = inb(eth_asic_base+WD_BID);	/* Get board id */
- 	for (brd = wd_boards; brd->name; brd++)
- 		if (brd->id == c) break;
-@@ -582,8 +676,9 @@
- 	} else
- 		eth_bmem = WD_DEFAULT_MEM;
- 	if (brd->id == TYPE_SMC8216T || brd->id == TYPE_SMC8216C) {
--		*((unsigned int *)(eth_bmem + 8192)) = (unsigned int)0;
--		if (*((unsigned int *)(eth_bmem + 8192))) {
-+		/* from Linux driver, 8416BT detects as 8216 sometimes */
-+		unsigned int addr = inb(eth_asic_base + 0xb);
-+		if (((addr >> 4) & 3) == 0) {
- 			brd += 2;
- 			eth_memsize = brd->memsize;
- 		}
-@@ -592,19 +687,27 @@
- 	for (i=0; i<ETH_ALEN; i++) {
- 		nic->node_addr[i] = inb(i+eth_asic_base+WD_LAR);
- 	}
--	printf("\n%s base %#hx, memory %#hx, addr %!\n",
--		brd->name, eth_asic_base, eth_bmem, nic->node_addr);
-+	printf("\n%s base %#hx", brd->name, eth_asic_base);
- 	if (eth_flags & FLAG_790) {
-+#ifdef	WD_790_PIO
-+		printf(", PIO mode, addr %!\n", nic->node_addr);
-+		eth_bmem = 0;
-+		eth_flags |= FLAG_PIO;		/* force PIO mode */
-+		outb(0, eth_asic_base+WD_MSR);
-+#else
-+		printf(", memory %#x, addr %!\n", eth_bmem, nic->node_addr);
- 		outb(WD_MSR_MENB, eth_asic_base+WD_MSR);
- 		outb((inb(eth_asic_base+0x04) |
- 			0x80), eth_asic_base+0x04);
--		outb((((unsigned)eth_bmem >> 13) & 0x0F) |
--			(((unsigned)eth_bmem >> 11) & 0x40) |
-+		outb(((unsigned)(eth_bmem >> 13) & 0x0F) |
-+			((unsigned)(eth_bmem >> 11) & 0x40) |
- 			(inb(eth_asic_base+0x0B) & 0xB0), eth_asic_base+0x0B);
- 		outb((inb(eth_asic_base+0x04) &
- 			~0x80), eth_asic_base+0x04);
-+#endif
- 	} else {
--		outb((((unsigned)eth_bmem >> 13) & 0x3F) | 0x40, eth_asic_base+WD_MSR);
-+		printf(", memory %#x, addr %!\n", eth_bmem, nic->node_addr);
-+		outb(((unsigned)(eth_bmem >> 13) & 0x3F) | 0x40, eth_asic_base+WD_MSR);
- 	}
- 	if (eth_flags & FLAG_16BIT) {
- 		if (eth_flags & FLAG_790) {
-@@ -624,8 +727,14 @@
- 		}
- 		inb(0x84);
- 	}
-+}
- #endif
- #ifdef	INCLUDE_3C503
-+#ifdef	T503_AUI
-+	nic->flags = 1;		/* aui */
-+#else
-+	nic->flags = 0;		/* no aui */
-+#endif
-         /******************************************************************
-         Search for 3Com 3c503 if no WD/SMC cards
-         ******************************************************************/
-@@ -708,11 +817,12 @@
-         /* Get our ethernet address */
- 
-                 outb(_3COM_CR_EALO | _3COM_CR_XSEL, eth_asic_base + _3COM_CR);
-+		nic->ioaddr = eth_nic_base;
-                 printf("\n3Com 3c503 base %#hx, ", eth_nic_base);
-                 if (eth_flags & FLAG_PIO)
- 			printf("PIO mode");
-                 else
--			printf("memory %#hx", eth_bmem);
-+			printf("memory %#x", eth_bmem);
-                 for (i=0; i<ETH_ALEN; i++) {
-                         nic->node_addr[i] = inb(eth_nic_base+i);
-                 }
-@@ -734,9 +844,9 @@
-          */
- 
- 		if (!(eth_flags & FLAG_PIO)) {
--			memset((char *)eth_bmem, 0, 0x2000);
-+			memset(bus_to_virt(eth_bmem), 0, 0x2000);
- 			for(i = 0; i < 0x2000; ++i)
--				if (*(((char *)eth_bmem)+i)) {
-+				if (*((char *)(bus_to_virt(eth_bmem+i)))) {
- 					printf ("Failed to clear 3c503 shared mem.\n");
- 					return (0);
- 				}
-@@ -749,9 +859,11 @@
-         }
- #endif
- #if	defined(INCLUDE_NE) || defined(INCLUDE_NS8390)
-+{
- 	/******************************************************************
- 	Search for NE1000/2000 if no WD/SMC or 3com cards
- 	******************************************************************/
-+	unsigned char c;
- 	if (eth_vendor == VENDOR_NONE) {
- 		char romdata[16], testbuf[32];
- 		int idx;
-@@ -810,23 +922,94 @@
- 		for (i=0; i<ETH_ALEN; i++) {
- 			nic->node_addr[i] = romdata[i + ((eth_flags & FLAG_16BIT) ? i : 0)];
- 		}
-+		nic->ioaddr = eth_nic_base;
- 		printf("\nNE%c000 base %#hx, addr %!\n",
- 			(eth_flags & FLAG_16BIT) ? '2' : '1', eth_nic_base,
- 			nic->node_addr);
- 	}
-+}
- #endif
- 	if (eth_vendor == VENDOR_NONE)
- 		return(0);
-         if (eth_vendor != VENDOR_3COM)
- 		eth_rmem = eth_bmem;
- 	ns8390_reset(nic);
--	nic->reset = ns8390_reset;
--	nic->poll = ns8390_poll;
-+
-+	dev->disable  = ns8390_disable; 
-+	nic->poll     = ns8390_poll;
- 	nic->transmit = ns8390_transmit;
--	nic->disable = ns8390_disable;
--	return(nic);
-+	nic->irq      = ns8390_irq;
-+
-+        /* Based on PnP ISA map */
-+#ifdef	INCLUDE_WD
-+        dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
-+        dev->devid.device_id = htons(0x812a);
-+#endif
-+#ifdef	INCLUDE_3C503
-+        dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
-+        dev->devid.device_id = htons(0x80f3);
-+#endif
-+#ifdef	INCLUDE_NE
-+        dev->devid.vendor_id = htons(GENERIC_ISAPNP_VENDOR);
-+        dev->devid.device_id = htons(0x80d6);
-+#endif
-+	return 1;
- }
- 
-+#ifdef	INCLUDE_WD
-+static struct isa_driver wd_driver __isa_driver = {
-+	.type    = NIC_DRIVER,
-+	.name    = "WD",
-+	.probe   = wd_probe,
-+	.ioaddrs = 0, 
-+};
-+#endif
-+
-+#ifdef	INCLUDE_3C503
-+static struct isa_driver t503_driver __isa_driver = {
-+	.type    = NIC_DRIVER,
-+	.name    = "3C503",
-+	.probe   = t503_probe,
-+	.ioaddrs = 0, 
-+};
-+#endif
-+
-+#ifdef	INCLUDE_NE
-+static struct isa_driver ne_driver __isa_driver = {
-+	.type    = NIC_DRIVER,
-+	.name    = "NE*000",
-+	.probe   = ne_probe,
-+	.ioaddrs = 0, 
-+};
-+#endif
-+
-+#ifdef	INCLUDE_NS8390
-+static struct pci_id nepci_nics[] = {
-+/* A few NE2000 PCI clones, list not exhaustive */
-+PCI_ROM(0x10ec, 0x8029, "rtl8029",      "Realtek 8029"),
-+PCI_ROM(0x1186, 0x0300, "dlink-528",    "D-Link DE-528"),
-+PCI_ROM(0x1050, 0x0940, "winbond940",   "Winbond NE2000-PCI"),		/* Winbond 86C940 / 89C940 */
-+PCI_ROM(0x1050, 0x5a5a, "winbond940f",  "Winbond W89c940F"),		/* Winbond 89C940F */
-+PCI_ROM(0x11f6, 0x1401, "compexrl2000", "Compex ReadyLink 2000"),
-+PCI_ROM(0x8e2e, 0x3000, "ktiet32p2",    "KTI ET32P2"),
-+PCI_ROM(0x4a14, 0x5000, "nv5000sc",     "NetVin NV5000SC"),
-+PCI_ROM(0x12c3, 0x0058, "holtek80232",  "Holtek HT80232"),
-+PCI_ROM(0x12c3, 0x5598, "holtek80229",  "Holtek HT80229"),
-+PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34"),
-+PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926"),
-+};
-+
-+struct pci_driver nepci_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "NE2000/PCI",
-+	.probe    = nepci_probe,
-+	.ids      = nepci_nics,
-+	.id_count = sizeof(nepci_nics)/sizeof(nepci_nics[0]),
-+	.class    = 0,
-+};
-+
-+#endif /* INCLUDE_NS8390 */
-+
- /*
-  * Local variables:
-  *  c-basic-offset: 8
-Index: b/netboot/osdep.h
-===================================================================
---- a/netboot/osdep.h
-+++ b/netboot/osdep.h
-@@ -1,94 +1,18 @@
--#ifndef	__OSDEP_H__
--#define __OSDEP_H__
-+#ifndef	_OSDEP_H
-+#define _OSDEP_H
- 
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
-+#define __unused __attribute__((unused))
-+#define __aligned __attribute__((aligned(16)))
- 
--#define	__LITTLE_ENDIAN		/* x86 */
--
--/* Taken from /usr/include/linux/hfs_sysdep.h */
--#if defined(__BIG_ENDIAN)
--#	if !defined(__constant_htonl)
--#		define __constant_htonl(x) (x)
--#	endif
--#	if !defined(__constant_htons)
--#		define __constant_htons(x) (x)
--#	endif
--#elif defined(__LITTLE_ENDIAN)
--#	if !defined(__constant_htonl)
--#		define __constant_htonl(x) \
--        ((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \
--                             (((unsigned long int)(x) & 0x0000ff00U) <<  8) | \
--                             (((unsigned long int)(x) & 0x00ff0000U) >>  8) | \
--                             (((unsigned long int)(x) & 0xff000000U) >> 24)))
--#	endif
--#	if !defined(__constant_htons)
--#		define __constant_htons(x) \
--        ((unsigned short int)((((unsigned short int)(x) & 0x00ff) << 8) | \
--                              (((unsigned short int)(x) & 0xff00) >> 8)))
--#	endif
--#else
--#	error "Don't know if bytes are big- or little-endian!"
--#endif
--
--#define ntohl(x) \
--(__builtin_constant_p(x) ? \
-- __constant_htonl((x)) : \
-- __swap32(x))
--#define htonl(x) \
--(__builtin_constant_p(x) ? \
-- __constant_htonl((x)) : \
-- __swap32(x))
--#define ntohs(x) \
--(__builtin_constant_p(x) ? \
-- __constant_htons((x)) : \
-- __swap16(x))
--#define htons(x) \
--(__builtin_constant_p(x) ? \
-- __constant_htons((x)) : \
-- __swap16(x))
--
--static inline unsigned long int __swap32(unsigned long int x)
--{
--	__asm__("xchgb %b0,%h0\n\t"
--		"rorl $16,%0\n\t"
--		"xchgb %b0,%h0"
--		: "=q" (x)
--		: "0" (x));
--	return x;
--}
--
--static inline unsigned short int __swap16(unsigned short int x)
--{
--	__asm__("xchgb %b0,%h0"
--		: "=q" (x)
--		: "0" (x));
--	return x;
--}
--
--/* Make routines available to all */
--#define	swap32(x)	__swap32(x)
--#define	swap16(x)	__swap16(x)
--
--#include "linux-asm-io.h"
--
--typedef	unsigned long Address;
-+#include "io.h"
-+#include "byteswap.h"
-+#include "latch.h"
- 
- /* ANSI prototyping macro */
- #ifdef	__STDC__
--#define	P(x)	x
-+#  define	P(x)	x
- #else
--#define	P(x)	()
-+#  define	P(x)	()
- #endif
- 
- #endif
--
--/*
-- * Local variables:
-- *  c-basic-offset: 8
-- * End:
-- */
-Index: b/netboot/otulip.c
-===================================================================
---- a/netboot/otulip.c
-+++ /dev/null
-@@ -1,374 +0,0 @@
--/*
--  Etherboot DEC Tulip driver
--  adapted by Ken Yap from
--
--  FreeBSD netboot DEC 21143 driver
--
--  Author: David Sharp
--    date: Nov/98
--
-- Known to work on DEC DE500 using 21143-PC chipset.
-- Even on cards with the same chipset there can be
-- incompatablity problems with the way media selection
-- and status LED settings are done.  See comments below.
--
-- Some code fragments were taken from verious places,
-- Ken Yap's etherboot, FreeBSD's if_de.c, and various
-- Linux related files.  DEC's manuals for the 21143 and
-- SROM format were very helpful.  The Linux de driver
-- development page has a number of links to useful
-- related information.  Have a look at:
-- ftp://cesdis.gsfc.nasa.gov/pub/linux/drivers/tulip-devel.html
--
--*/
--
--#include "etherboot.h"
--#include "nic.h"
--#include "pci.h"
--#include "cards.h"
--#include "otulip.h"
--
--static unsigned short vendor, dev_id;
--static unsigned short ioaddr;
--static unsigned int *membase;
--static unsigned char srom[1024];
--
--#define BUFLEN 1536     /* must be longword divisable */
--                        /* buffers must be longword aligned */
--
--/* transmit descriptor and buffer */
--static struct txdesc txd;
--
--/* receive descriptor(s) and buffer(s) */
--#define NRXD 4
--static struct rxdesc rxd[NRXD];
--static int rxd_tail = 0;
--#ifdef	USE_LOWMEM_BUFFER
--#define rxb ((char *)0x10000 - NRXD * BUFLEN)
--#define txb ((char *)0x10000 - NRXD * BUFLEN - BUFLEN)
--#else
--static unsigned char rxb[NRXD * BUFLEN];
--static unsigned char txb[BUFLEN];
--#endif
--
--static unsigned char ehdr[ETH_HLEN];    /* buffer for ethernet header */
--
--enum tulip_offsets {
--        CSR0=0,    CSR1=0x08, CSR2=0x10, CSR3=0x18, CSR4=0x20, CSR5=0x28,
--        CSR6=0x30, CSR7=0x38, CSR8=0x40, CSR9=0x48, CSR10=0x50, CSR11=0x58,
--        CSR12=0x60, CSR13=0x68, CSR14=0x70, CSR15=0x78 };
--
--
--/***************************************************************************/
--/* 21143 specific stuff  */
--/***************************************************************************/
--
--/* XXX assume 33MHz PCI bus,  this is not very accurate and should be
--   used only with gross over estimations of required delay times unless
--   you tune UADJUST to your specific processor and I/O subsystem */
--
--#define UADJUST 870
--static void udelay(unsigned long usec) {
--  unsigned long i;
--  for (i=((usec*UADJUST)/33)+1; i>0; i--) (void) TULIP_CSR_READ(csr_0);
--}
--
--/* The following srom related code was taken from FreeBSD's if_de.c */
--/* with minor alterations to make it work here.  the Linux code is */
--/* better but this was easier to use */
--
--static void delay_300ns(void)
--{
--    int idx;
--    for (idx = (300 / 33) + 1; idx > 0; idx--)
--        (void) TULIP_CSR_READ(csr_busmode);
--}
--
--#define EMIT do { TULIP_CSR_WRITE(csr_srom_mii, csr); delay_300ns(); } while (0)
--
--static void srom_idle(void)
--{
--    unsigned bit, csr;
--
--    csr  = SROMSEL ; EMIT;
--    csr  = SROMSEL | SROMRD; EMIT;
--    csr ^= SROMCS; EMIT;
--    csr ^= SROMCLKON; EMIT;
--    /*
--     * Write 25 cycles of 0 which will force the SROM to be idle.
--     */
--    for (bit = 3 + SROM_BITWIDTH + 16; bit > 0; bit--) {
--        csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
--        csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
--    }
--    csr ^= SROMCLKOFF; EMIT;
--    csr ^= SROMCS; EMIT;
--    csr  = 0; EMIT;
--}
--
--static void srom_read(void)
--{
--    unsigned idx;
--    const unsigned bitwidth = SROM_BITWIDTH;
--    const unsigned cmdmask = (SROMCMD_RD << bitwidth);
--    const unsigned msb = 1 << (bitwidth + 3 - 1);
--    unsigned lastidx = (1 << bitwidth) - 1;
--
--    srom_idle();
--
--    for (idx = 0; idx <= lastidx; idx++) {
--        unsigned lastbit, data, bits, bit, csr;
--        csr  = SROMSEL ;                EMIT;
--        csr  = SROMSEL | SROMRD;        EMIT;
--        csr ^= SROMCSON;                EMIT;
--        csr ^=            SROMCLKON;    EMIT;
--
--        lastbit = 0;
--        for (bits = idx|cmdmask, bit = bitwidth + 3; bit > 0; bit--, bits <<= 1)
-- {
--            const unsigned thisbit = bits & msb;
--            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
--            if (thisbit != lastbit) {
--                csr ^= SROMDOUT; EMIT;  /* clock low; invert data */
--            } else {
--                EMIT;
--            }
--            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
--            lastbit = thisbit;
--        }
--        csr ^= SROMCLKOFF; EMIT;
--
--        for (data = 0, bits = 0; bits < 16; bits++) {
--            data <<= 1;
--            csr ^= SROMCLKON; EMIT;     /* clock high; data valid */
--            data |= TULIP_CSR_READ(csr_srom_mii) & SROMDIN ? 1 : 0;
--            csr ^= SROMCLKOFF; EMIT;    /* clock low; data not valid */
--        }
--        srom[idx*2] = data & 0xFF;
--        srom[idx*2+1] = data >> 8;
--        csr  = SROMSEL | SROMRD; EMIT;
--        csr  = 0; EMIT;
--    }
--    srom_idle();
--}
--
--/**************************************************************************
--ETH_RESET - Reset adapter
--***************************************************************************/
--static void tulip_reset(struct nic *nic)
--{
--        int x,cnt=2;
--
--        outl(0x00000001, ioaddr + CSR0);
--        udelay(1000);
--        /* turn off reset and set cache align=16lword, burst=unlimit */
--        outl(0x01A08000, ioaddr + CSR0);
--
--	/* for some reason the media selection does not take
--           the first time se it is repeated.  */
--
--        while(cnt--) {
--        /* stop TX,RX processes */
--        if (cnt == 1)
--		outl(0x32404000, ioaddr + CSR6);
--        else
--		outl(0x32000040, ioaddr + CSR6);
--
--        /* XXX - media selection is vendor specific and hard coded right
--           here.  This should be fixed to use the hints in the SROM and
--           allow media selection by the user at runtime.  MII support
--           should also be added.  Support for chips other than the
--           21143 should be added here as well  */
--
--        /* start  set to 10Mbps half-duplex */
--
--        /* setup SIA */
--        outl(0x0, ioaddr + CSR13);              /* reset SIA */
--        outl(0x7f3f, ioaddr + CSR14);
--        outl(0x8000008, ioaddr + CSR15);
--        outl(0x0, ioaddr + CSR13);
--        outl(0x1, ioaddr + CSR13);
--        outl(0x2404000, ioaddr + CSR6);
--
--        /* initalize GP */
--        outl(0x8af0008, ioaddr + CSR15);
--        outl(0x50008, ioaddr + CSR15);
--
--        /* end  set to 10Mbps half-duplex */
--
--	if (vendor == PCI_VENDOR_ID_MACRONIX && dev_id == PCI_DEVICE_ID_MX987x5) {
--		/* do stuff for MX98715 */
--		outl(0x01a80000, ioaddr + CSR6);
--		outl(0xFFFFFFFF, ioaddr + CSR14);
--		outl(0x00001000, ioaddr + CSR12);
--	}
--
--        outl(0x0, ioaddr + CSR7);       /* disable interrupts */
--
--        /* construct setup packet which is used by the 21143 to
--           program its CAM to recognize interesting MAC addresses */
--
--        memset(&txd, 0, sizeof(struct txdesc));
--        txd.buf1addr = &txb[0];
--        txd.buf2addr = &txb[0];         /* just in case */
--        txd.buf1sz   = 192;             /* setup packet must be 192 bytes */
--        txd.buf2sz   = 0;
--        txd.control  = 0x020;           /* setup packet */
--        txd.status   = 0x80000000;      /* give ownership to 21143 */
--
--        /* construct perfect filter frame */
--        /* with mac address as first match */
--        /* and broadcast address for all others */
--
--        for(x=0;x<192;x++) txb[x] = 0xff;
--        txb[0] = nic->node_addr[0];
--        txb[1] = nic->node_addr[1];
--        txb[4] = nic->node_addr[2];
--        txb[5] = nic->node_addr[3];
--        txb[8] = nic->node_addr[4];
--        txb[9] = nic->node_addr[5];
--        outl((unsigned long)&txd, ioaddr + CSR4);        /* set xmit buf */
--        outl(0x2406000, ioaddr + CSR6);         /* start transmiter */
--
--        udelay(50000);  /* wait for the setup packet to be processed */
--
--        }
--
--        /* setup receive descriptor */
--        {
--          int x;
--          for(x=0;x<NRXD;x++) {
--            memset(&rxd[x], 0, sizeof(struct rxdesc));
--            rxd[x].buf1addr = &rxb[x * BUFLEN];
--            rxd[x].buf2addr = 0;        /* not used */
--            rxd[x].buf1sz   = BUFLEN;
--            rxd[x].buf2sz   = 0;        /* not used */
--            rxd[x].control  = 0x0;
--            rxd[x].status   = 0x80000000;       /* give ownership it to 21143 */
--          }
--          rxd[NRXD - 1].control  = 0x008;       /* Set Receive end of ring on la
--st descriptor */
--          rxd_tail = 0;
--        }
--
--        /* tell DC211XX where to find rx descriptor list */
--        outl((unsigned long)&rxd[0], ioaddr + CSR3);
--        /* start the receiver */
--        outl(0x2406002, ioaddr + CSR6);
--
--}
--
--/**************************************************************************
--ETH_TRANSMIT - Transmit a frame
--***************************************************************************/
--static const char padmap[] = {
--        0, 3, 2, 1};
--
--static void tulip_transmit(struct nic *nic, const char *d, unsigned int t, unsigned int s, const char *p)
--{
--        unsigned long time;
--
--        /* setup ethernet header */
--
--	memcpy(ehdr, d, ETH_ALEN);
--	memcpy(&ehdr[ETH_ALEN], nic->node_addr, ETH_ALEN);
--        ehdr[ETH_ALEN*2] = (t >> 8) & 0xff;
--        ehdr[ETH_ALEN*2+1] = t & 0xff;
--
--        /* setup the transmit descriptor */
--
--        memset(&txd, 0, sizeof(struct txdesc));
--
--        txd.buf1addr = &ehdr[0];        /* ethernet header */
--        txd.buf1sz   = ETH_HLEN;
--
--        txd.buf2addr = p;               /* packet to transmit */
--        txd.buf2sz   = s;
--
--        txd.control  = 0x188;           /* LS+FS+TER */
--
--        txd.status   = 0x80000000;      /* give it to 21143 */
--
--        outl(inl(ioaddr + CSR6) & ~0x00004000, ioaddr + CSR6);
--        outl((unsigned long)&txd, ioaddr + CSR4);
--        outl(inl(ioaddr + CSR6) | 0x00004000, ioaddr + CSR6);
--
--/*   Wait for transmit to complete before returning.  not well tested.
--
--        time = currticks();
--        while(txd.status & 0x80000000) {
--          if (currticks() - time > 20) {
--            printf("transmit timeout.\n");
--            break;
--          }
--        }
--*/
--
--}
--
--/**************************************************************************
--ETH_POLL - Wait for a frame
--***************************************************************************/
--static int tulip_poll(struct nic *nic)
--{
--        if (rxd[rxd_tail].status & 0x80000000) return 0;
--
--        nic->packetlen = (rxd[rxd_tail].status & 0x3FFF0000) >> 16;
--
--        /* copy packet to working buffer */
--        /* XXX - this copy could be avoided with a little more work
--           but for now we are content with it because the optimised
--           memcpy(, , ) is quite fast */
--
--        memcpy(nic->packet, rxb + rxd_tail * BUFLEN, nic->packetlen);
--
--        /* return the descriptor and buffer to recieve ring */
--        rxd[rxd_tail].status = 0x80000000;
--        rxd_tail++;
--        if (rxd_tail == NRXD) rxd_tail = 0;
--
--        return 1;
--}
--
--static void tulip_disable(struct nic *nic)
--{
--	/* nothing for the moment */
--}
--
--/**************************************************************************
--ETH_PROBE - Look for an adapter
--***************************************************************************/
--struct nic *otulip_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
--{
--        int i;
--
--	if (io_addrs == 0 || *io_addrs == 0)
--		return (0);
--	vendor = pci->vendor;
--	dev_id = pci->dev_id;
--	ioaddr = *io_addrs;
--	membase = (unsigned int *)pci->membase;
--
--        /* wakeup chip */
--        pcibios_write_config_dword(pci->bus,pci->devfn,0x40,0x00000000);
--
--        /* Stop the chip's Tx and Rx processes. */
--        /* outl(inl(ioaddr + CSR6) & ~0x2002, ioaddr + CSR6); */
--        /* Clear the missed-packet counter. */
--        /* (volatile int)inl(ioaddr + CSR8); */
--
--        srom_read();
--
--	for (i=0; i < ETH_ALEN; i++)
--		nic->node_addr[i] = srom[20+i];
--
--        printf("Tulip %! at ioaddr %#hX\n", nic->node_addr, ioaddr);
--
--        tulip_reset(nic);
--
--	nic->reset = tulip_reset;
--	nic->poll = tulip_poll;
--	nic->transmit = tulip_transmit;
--	nic->disable = tulip_disable;
--        return nic;
--}
-Index: b/netboot/otulip.h
-===================================================================
---- a/netboot/otulip.h
-+++ /dev/null
-@@ -1,76 +0,0 @@
--/* mostly stolen from FreeBSD if_de.c, if_devar.h */
--
--#define TULIP_CSR_READ(csr)		(membase[csr*2])
--#define CSR_READ(csr)			(membase[csr*2])
--#define TULIP_CSR_WRITE(csr, val)	(membase[csr*2] = val)
--#define CSR_WRITE(csr, val)		(membase[csr*2] = val)
--
--#define csr_0			0
--#define csr_1			1
--#define csr_2			2
--#define csr_3			3
--#define csr_4			4
--#define csr_5			5
--#define csr_6			6
--#define csr_7			7
--#define csr_8			8
--#define csr_9			9
--#define csr_10			10
--#define csr_11			11
--#define csr_12			12
--#define csr_13			13
--#define csr_14			14
--#define csr_15			15
--
--#define csr_busmode		csr_0
--#define csr_txpoll		csr_1
--#define csr_rxpoll		csr_2
--#define csr_rxlist		csr_3
--#define csr_txlist		csr_4
--#define csr_status		csr_5
--#define csr_command		csr_6
--#define csr_intr		csr_7
--#define csr_missed_frames	csr_8
--#define csr_enetrom		csr_9		/* 21040 */
--#define csr_reserved		csr_10		/* 21040 */
--#define csr_full_duplex		csr_11		/* 21040 */
--#define csr_bootrom		csr_10		/* 21041/21140A/?? */
--#define csr_gp			csr_12		/* 21140* */
--#define csr_watchdog		csr_15		/* 21140* */
--#define csr_gp_timer		csr_11		/* 21041/21140* */
--#define csr_srom_mii		csr_9		/* 21041/21140* */
--#define csr_sia_status		csr_12		/* 2104x */
--#define csr_sia_connectivity	csr_13		/* 2104x */
--#define csr_sia_tx_rx		csr_14		/* 2104x */
--#define csr_sia_general		csr_15		/* 2104x */
--
--#define SROMSEL		0x0800
--#define SROMCS		0x0001
--#define SROMCLKON	0x0002
--#define SROMCLKOFF	0x0002
--#define SROMRD		0x4000
--#define SROMWR		0x2000
--#define SROM_BITWIDTH	6
--#define SROMCMD_RD	6
--#define SROMCSON	0x0001
--#define SROMDOUT	0x0004
--#define SROMDIN		0x0008
--
--
--struct txdesc {
--	unsigned long	status;		/* owner, status */
--	unsigned long	buf1sz:11,	/* size of buffer 1 */
--			buf2sz:11,	/* size of buffer 2 */
--			control:10;	/* control bits */
--	const unsigned char *buf1addr;	/* buffer 1 address */
--	const unsigned char *buf2addr;	/* buffer 2 address */
--};
--
--struct rxdesc {
--	unsigned long	status;		/* owner, status */
--	unsigned long	buf1sz:11,	/* size of buffer 1 */
--			buf2sz:11,	/* size of buffer 2 */
--			control:10;	/* control bits */
--	unsigned char	*buf1addr;	/* buffer 1 address */
--	unsigned char	*buf2addr;	/* buffer 2 address */
--};
-Index: b/netboot/pci.c
-===================================================================
---- a/netboot/pci.c
-+++ b/netboot/pci.c
-@@ -1,15 +1,3 @@
--/*
--** Support for NE2000 PCI clones added David Monro June 1997
--** Generalised to other NICs by Ken Yap July 1997
--**
--** Most of this is taken from:
--**
--** /usr/src/linux/drivers/pci/pci.c
--** /usr/src/linux/include/linux/pci.h
--** /usr/src/linux/arch/i386/bios32.c
--** /usr/src/linux/include/linux/bios32.h
--** /usr/src/linux/drivers/net/ne.c
--*/
- 
- /*
-  * This program is free software; you can redistribute it and/or
-@@ -18,402 +6,294 @@
-  * your option) any later version.
-  */
- 
--#include "etherboot.h"
-+#include "grub.h"
- #include "pci.h"
- 
--/*#define	DEBUG	1*/
--#define DEBUG	0
--
--#ifdef	CONFIG_PCI_DIRECT
--#define  PCIBIOS_SUCCESSFUL                0x00
--
--/*
-- * Functions for accessing PCI configuration space with type 1 accesses
-- */
--
--#define CONFIG_CMD(bus, device_fn, where)   (0x80000000 | (bus << 16) | (device_fn << 8) | (where & ~3))
--
--int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn,
--			       unsigned int where, unsigned char *value)
-+unsigned long virt_offset = 0;
-+unsigned long virt_to_phys(volatile const void *virt_addr)
- {
--    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
--    *value = inb(0xCFC + (where&3));
--    return PCIBIOS_SUCCESSFUL;
-+	return ((unsigned long)virt_addr) + virt_offset;
- }
- 
--int pcibios_read_config_word (unsigned int bus,
--    unsigned int device_fn, unsigned int where, unsigned short *value)
-+void *phys_to_virt(unsigned long phys_addr)
- {
--    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
--    *value = inw(0xCFC + (where&2));
--    return PCIBIOS_SUCCESSFUL;
-+	return (void *)(phys_addr - virt_offset);
- }
- 
--int pcibios_read_config_dword (unsigned int bus, unsigned int device_fn,
--				 unsigned int where, unsigned int *value)
--{
--    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
--    *value = inl(0xCFC);
--    return PCIBIOS_SUCCESSFUL;
--}
-+#ifdef INCLUDE_3C595
-+extern struct pci_driver t595_driver;
-+#endif /* INCLUDE_3C595 */
- 
--int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn,
--				 unsigned int where, unsigned char value)
--{
--    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
--    outb(value, 0xCFC + (where&3));
--    return PCIBIOS_SUCCESSFUL;
--}
-+#ifdef INCLUDE_3C90X
-+extern struct pci_driver a3c90x_driver;
-+#endif /* INCLUDE_3C90X */
- 
--int pcibios_write_config_word (unsigned int bus, unsigned int device_fn,
--				 unsigned int where, unsigned short value)
--{
--    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
--    outw(value, 0xCFC + (where&2));
--    return PCIBIOS_SUCCESSFUL;
--}
-+#ifdef INCLUDE_DAVICOM
-+extern struct pci_driver davicom_driver;
-+#endif /* INCLUDE_DAVICOM */
- 
--int pcibios_write_config_dword (unsigned int bus, unsigned int device_fn, unsigned int where, unsigned int value)
--{
--    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
--    outl(value, 0xCFC);
--    return PCIBIOS_SUCCESSFUL;
--}
-+#ifdef INCLUDE_E1000
-+extern struct pci_driver e1000_driver;
-+#endif /* INCLUDE_E1000 */
- 
--#undef CONFIG_CMD
-+#ifdef INCLUDE_EEPRO100
-+extern struct pci_driver eepro100_driver;
-+#endif /* INCLUDE_EEPRO100 */
- 
--#else	 /* CONFIG_PCI_DIRECT  not defined */
-+#ifdef INCLUDE_EPIC100
-+extern struct pci_driver epic100_driver;
-+#endif /* INCLUDE_EPIC100 */
- 
--static struct {
--	unsigned long address;
--	unsigned short segment;
--} bios32_indirect = { 0, KERN_CODE_SEG };
--
--static long pcibios_entry;
--static struct {
--	unsigned long address;
--	unsigned short segment;
--} pci_indirect = { 0, KERN_CODE_SEG };
-+#ifdef INCLUDE_FORCEDETH
-+extern struct pci_driver forcedeth_driver;
-+#endif /* INCLUDE_FORCEDETH */
- 
--static unsigned long bios32_service(unsigned long service)
--{
--	unsigned char return_code;	/* %al */
--	unsigned long address;		/* %ebx */
--	unsigned long length;		/* %ecx */
--	unsigned long entry;		/* %edx */
--	unsigned long flags;
--
--	save_flags(flags);
--	__asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%edi)"
--#else
--		"lcall *(%%edi)"
--#endif
--		: "=a" (return_code),
--		  "=b" (address),
--		  "=c" (length),
--		  "=d" (entry)
--		: "0" (service),
--		  "1" (0),
--		  "D" (&bios32_indirect));
--	restore_flags(flags);
--
--	switch (return_code) {
--		case 0:
--			return address + entry;
--		case 0x80:	/* Not present */
--			printf("bios32_service(%d) : not present\n", service);
--			return 0;
--		default: /* Shouldn't happen */
--			printf("bios32_service(%d) : returned %#X, mail drew@colorado.edu\n",
--				service, return_code);
--			return 0;
--	}
--}
-+#ifdef INCLUDE_NATSEMI
-+extern struct pci_driver natsemi_driver;
-+#endif /* INCLUDE_NATSEMI */
- 
--int pcibios_read_config_byte(unsigned int bus,
--        unsigned int device_fn, unsigned int where, unsigned char *value)
--{
--        unsigned long ret;
--        unsigned long bx = (bus << 8) | device_fn;
--        unsigned long flags;
--
--        save_flags(flags);
--        __asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%esi)\n\t"
--#else
--		"lcall *(%%esi)\n\t"
--#endif
--                "jc 1f\n\t"
--                "xor %%ah, %%ah\n"
--                "1:"
--                : "=c" (*value),
--                  "=a" (ret)
--                : "1" (PCIBIOS_READ_CONFIG_BYTE),
--                  "b" (bx),
--                  "D" ((long) where),
--                  "S" (&pci_indirect));
--        restore_flags(flags);
--        return (int) (ret & 0xff00) >> 8;
--}
-+#ifdef INCLUDE_NS83820
-+extern struct pci_driver ns83820_driver;
-+#endif /* INCLUDE_NS83820 */
- 
--int pcibios_read_config_word(unsigned int bus,
--        unsigned int device_fn, unsigned int where, unsigned short *value)
--{
--        unsigned long ret;
--        unsigned long bx = (bus << 8) | device_fn;
--        unsigned long flags;
--
--        save_flags(flags);
--        __asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%esi)\n\t"
--#else
--		"lcall *(%%esi)\n\t"
--#endif
--                "jc 1f\n\t"
--                "xor %%ah, %%ah\n"
--                "1:"
--                : "=c" (*value),
--                  "=a" (ret)
--                : "1" (PCIBIOS_READ_CONFIG_WORD),
--                  "b" (bx),
--                  "D" ((long) where),
--                  "S" (&pci_indirect));
--        restore_flags(flags);
--        return (int) (ret & 0xff00) >> 8;
--}
-+#ifdef INCLUDE_NS8390
-+extern struct pci_driver nepci_driver;
-+#endif /* INCLUDE_NS8390 */
- 
--int pcibios_read_config_dword(unsigned int bus,
--        unsigned int device_fn, unsigned int where, unsigned int *value)
--{
--        unsigned long ret;
--        unsigned long bx = (bus << 8) | device_fn;
--        unsigned long flags;
--
--        save_flags(flags);
--        __asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%esi)\n\t"
--#else
--		"lcall *(%%esi)\n\t"
--#endif
--                "jc 1f\n\t"
--                "xor %%ah, %%ah\n"
--                "1:"
--                : "=c" (*value),
--                  "=a" (ret)
--                : "1" (PCIBIOS_READ_CONFIG_DWORD),
--                  "b" (bx),
--                  "D" ((long) where),
--                  "S" (&pci_indirect));
--        restore_flags(flags);
--        return (int) (ret & 0xff00) >> 8;
--}
-+#ifdef INCLUDE_PCNET32
-+extern struct pci_driver pcnet32_driver;
-+#endif /* INCLUDE_PCNET32 */
- 
--int pcibios_write_config_byte (unsigned int bus,
--	unsigned int device_fn, unsigned int where, unsigned char value)
--{
--	unsigned long ret;
--	unsigned long bx = (bus << 8) | device_fn;
--	unsigned long flags;
--
--	save_flags(flags); cli();
--	__asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%esi)\n\t"
--#else
--		"lcall *(%%esi)\n\t"
--#endif
--		"jc 1f\n\t"
--		"xor %%ah, %%ah\n"
--		"1:"
--		: "=a" (ret)
--		: "0" (PCIBIOS_WRITE_CONFIG_BYTE),
--		  "c" (value),
--		  "b" (bx),
--		  "D" ((long) where),
--		  "S" (&pci_indirect));
--	restore_flags(flags);
--	return (int) (ret & 0xff00) >> 8;
--}
-+#ifdef INCLUDE_PNIC
-+extern struct pci_driver pnic_driver;
-+#endif /* INCLUDE_PNIC */
- 
--int pcibios_write_config_word (unsigned int bus,
--	unsigned int device_fn, unsigned int where, unsigned short value)
--{
--	unsigned long ret;
--	unsigned long bx = (bus << 8) | device_fn;
--	unsigned long flags;
--
--	save_flags(flags); cli();
--	__asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%esi)\n\t"
--#else
--		"lcall *(%%esi)\n\t"
--#endif
--		"jc 1f\n\t"
--		"xor %%ah, %%ah\n"
--		"1:"
--		: "=a" (ret)
--		: "0" (PCIBIOS_WRITE_CONFIG_WORD),
--		  "c" (value),
--		  "b" (bx),
--		  "D" ((long) where),
--		  "S" (&pci_indirect));
--	restore_flags(flags);
--	return (int) (ret & 0xff00) >> 8;
--}
-+#ifdef INCLUDE_RTL8139
-+extern struct pci_driver rtl8139_driver;
-+#endif /* INCLUDE_RTL8139 */
- 
--int pcibios_write_config_dword (unsigned int bus,
--	unsigned int device_fn, unsigned int where, unsigned int value)
--{
--	unsigned long ret;
--	unsigned long bx = (bus << 8) | device_fn;
--	unsigned long flags;
--
--	save_flags(flags); cli();
--	__asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--		"lcall (%%esi)\n\t"
--#else
--		"lcall *(%%esi)\n\t"
--#endif
--		"jc 1f\n\t"
--		"xor %%ah, %%ah\n"
--		"1:"
--		: "=a" (ret)
--		: "0" (PCIBIOS_WRITE_CONFIG_DWORD),
--		  "c" (value),
--		  "b" (bx),
--		  "D" ((long) where),
--		  "S" (&pci_indirect));
--	restore_flags(flags);
--	return (int) (ret & 0xff00) >> 8;
--}
-+#ifdef INCLUDE_SIS900
-+extern struct pci_driver sis900_driver;
-+extern struct pci_driver sis_bridge_driver;
-+#endif /* INCLUDE_SIS900 */
- 
--static void check_pcibios(void)
--{
--	unsigned long signature;
--	unsigned char present_status;
--	unsigned char major_revision;
--	unsigned char minor_revision;
--	unsigned long flags;
--	int pack;
--
--	if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
--		pci_indirect.address = pcibios_entry;
--
--		save_flags(flags);
--		__asm__(
--#ifdef ABSOLUTE_WITHOUT_ASTERISK
--			"lcall (%%edi)\n\t"
--#else
--			"lcall *(%%edi)\n\t"
--#endif
--			"jc 1f\n\t"
--			"xor %%ah, %%ah\n"
--			"1:\tshl $8, %%eax\n\t"
--			"movw %%bx, %%ax"
--			: "=d" (signature),
--			  "=a" (pack)
--			: "1" (PCIBIOS_PCI_BIOS_PRESENT),
--			  "D" (&pci_indirect)
--			: "bx", "cx");
--		restore_flags(flags);
--
--		present_status = (pack >> 16) & 0xff;
--		major_revision = (pack >> 8) & 0xff;
--		minor_revision = pack & 0xff;
--		if (present_status || (signature != PCI_SIGNATURE)) {
--			printf("ERROR: BIOS32 says PCI BIOS, but no PCI "
--				"BIOS????\n");
--			pcibios_entry = 0;
--		}
--#if	DEBUG
--		if (pcibios_entry) {
--			printf ("pcibios_init : PCI BIOS revision %hhX.%hhX"
--				" entry at %#X\n", major_revision,
--				minor_revision, pcibios_entry);
--		}
--#endif
--	}
--}
-+#ifdef INCLUDE_SUNDANCE
-+extern struct pci_driver sundance_driver;
-+#endif	/* INCLUDE_SUNDANCE */
- 
--static void pcibios_init(void)
--{
--	union bios32 *check;
--	unsigned char sum;
--	int i, length;
--	unsigned long bios32_entry = 0;
--
--	/*
--	 * Follow the standard procedure for locating the BIOS32 Service
--	 * directory by scanning the permissible address range from
--	 * 0xe0000 through 0xfffff for a valid BIOS32 structure.
--	 *
--	 */
-+#ifdef INCLUDE_TG3
-+extern struct pci_driver  tg3_driver;
-+#endif /* INCLUDE_TG3 */
-+
-+#ifdef INCLUDE_TLAN
-+extern struct pci_driver tlan_driver;
-+#endif /* INCLUDE_TLAN */
-+
-+#ifdef INCLUDE_TULIP
-+extern struct pci_driver tulip_driver;
-+#endif /* INCLUDE_TULIP */
-+
-+#ifdef INCLUDE_UNDI
-+extern struct pci_driver undi_driver;
-+#endif /* INCLUDE_UNDI */
-+
-+#ifdef INCLUDE_VIA_RHINE
-+extern struct pci_driver rhine_driver;
-+#endif/* INCLUDE_VIA_RHINE */
-+
-+#ifdef INCLUDE_W89C840
-+extern struct pci_driver w89c840_driver;
-+#endif /* INCLUDE_W89C840 */
-+
-+#ifdef INCLUDE_R8169
-+extern struct pci_driver r8169_driver;
-+#endif /* INCLUDE_R8169 */
-+
-+static const struct pci_driver *pci_drivers[] = {
-+
-+#ifdef INCLUDE_3C595
-+	&t595_driver,
-+#endif /* INCLUDE_3C595 */
-+
-+#ifdef INCLUDE_3C90X
-+	&a3c90x_driver,
-+#endif /* INCLUDE_3C90X */
-+
-+#ifdef INCLUDE_DAVICOM
-+	&davicom_driver,
-+#endif /* INCLUDE_DAVICOM */
-+
-+#ifdef INCLUDE_E1000
-+	&e1000_driver,
-+#endif /* INCLUDE_E1000 */
-+
-+#ifdef INCLUDE_EEPRO100
-+	&eepro100_driver,
-+#endif /* INCLUDE_EEPRO100 */
-+
-+#ifdef INCLUDE_EPIC100
-+	&epic100_driver,
-+#endif /* INCLUDE_EPIC100 */
-+
-+#ifdef INCLUDE_FORCEDETH
-+	&forcedeth_driver,
-+#endif /* INCLUDE_FORCEDETH */
-+
-+#ifdef INCLUDE_NATSEMI
-+	&natsemi_driver,
-+#endif /* INCLUDE_NATSEMI */
-+
-+#ifdef INCLUDE_NS83820
-+	&ns83820_driver,
-+#endif /* INCLUDE_NS83820 */
-+
-+#ifdef INCLUDE_NS8390
-+	&nepci_driver,
-+#endif /* INCLUDE_NS8390 */
-+
-+#ifdef INCLUDE_PCNET32
-+	&pcnet32_driver,
-+#endif /* INCLUDE_PCNET32 */
-+
-+#ifdef INCLUDE_PNIC
-+	&pnic_driver,
-+#endif /* INCLUDE_PNIC */
- 
--	for (check = (union bios32 *) 0xe0000; check <= (union bios32 *) 0xffff0; ++check) {
--		if (check->fields.signature != BIOS32_SIGNATURE)
-+#ifdef INCLUDE_RTL8139
-+	&rtl8139_driver,
-+#endif /* INCLUDE_RTL8139 */
-+
-+#ifdef INCLUDE_SIS900
-+	&sis900_driver,
-+	&sis_bridge_driver,
-+#endif /* INCLUDE_SIS900 */
-+
-+#ifdef INCLUDE_SUNDANCE
-+	&sundance_driver,
-+#endif /* INCLUDE_SUNDANCE */
-+
-+#ifdef INCLUDE_TG3
-+	& tg3_driver,
-+#endif /* INCLUDE_TG3 */
-+
-+#ifdef INCLUDE_TLAN
-+	&tlan_driver,
-+#endif /* INCLUDE_TLAN */
-+
-+#ifdef INCLUDE_TULIP
-+	& tulip_driver,
-+#endif /* INCLUDE_TULIP */
-+
-+#ifdef INCLUDE_VIA_RHINE
-+	&rhine_driver,
-+#endif/* INCLUDE_VIA_RHINE */
-+
-+#ifdef INCLUDE_W89C840
-+	&w89c840_driver,
-+#endif /* INCLUDE_W89C840 */
-+
-+#ifdef INCLUDE_R8169
-+	&r8169_driver,
-+#endif /* INCLUDE_R8169 */
-+
-+/* We must be the last one */
-+#ifdef INCLUDE_UNDI
-+	&undi_driver,
-+#endif /* INCLUDE_UNDI */
-+
-+	0
-+};
-+
-+static void scan_drivers(
-+	int type, 
-+	uint32_t class, uint16_t vendor, uint16_t device,
-+	const struct pci_driver *last_driver, struct pci_device *dev)
-+{
-+	const struct pci_driver *skip_driver = last_driver;
-+	/* Assume there is only one match of the correct type */
-+	const struct pci_driver *driver;
-+	int i, j;
-+	
-+	for(j = 0; pci_drivers[j] != 0; j++){
-+		driver = pci_drivers[j];
-+		if (driver->type != type)
- 			continue;
--		length = check->fields.length * 16;
--		if (!length)
-+		if (skip_driver) {
-+			if (skip_driver == driver) 
-+				skip_driver = 0;
- 			continue;
--		sum = 0;
--		for (i = 0; i < length ; ++i)
--			sum += check->chars[i];
--		if (sum != 0)
-+		}
-+		for(i = 0; i < driver->id_count; i++) {
-+			if ((vendor == driver->ids[i].vendor) &&
-+			    (device == driver->ids[i].dev_id)) {
-+				
-+				dev->driver = driver;
-+				dev->name   = driver->ids[i].name;
-+
-+				goto out;
-+			}
-+		}
-+	}
-+	if (!class) {
-+		goto out;
-+	}
-+	for(j = 0; pci_drivers[j] != 0; j++){
-+		driver = pci_drivers[j];
-+		if (driver->type != type)
- 			continue;
--		if (check->fields.revision != 0) {
--			printf("pcibios_init : unsupported revision %d at %#X, mail drew@colorado.edu\n",
--				check->fields.revision, check);
-+		if (skip_driver) {
-+			if (skip_driver == driver)
-+				skip_driver = 0;
- 			continue;
- 		}
--#if	DEBUG
--		printf("pcibios_init : BIOS32 Service Directory "
--			"structure at %#X\n", check);
--#endif
--		if (!bios32_entry) {
--			if (check->fields.entry >= 0x100000) {
--				printf("pcibios_init: entry in high "
--					"memory, giving up\n");
--				return;
--			} else {
--				bios32_entry = check->fields.entry;
--#if	DEBUG
--				printf("pcibios_init : BIOS32 Service Directory"
--					" entry at %#X\n", bios32_entry);
--#endif
--				bios32_indirect.address = bios32_entry;
--			}
-+		if (last_driver == driver)
-+			continue;
-+		if ((class >> 8) == driver->class) {
-+			dev->driver = driver;
-+			dev->name   = driver->name;
-+			goto out;
- 		}
- 	}
--	if (bios32_entry)
--		check_pcibios();
-+ out:
-+	return;
- }
--#endif	/* CONFIG_PCI_DIRECT not defined*/
- 
--static void scan_bus(struct pci_device *pcidev)
-+void scan_pci_bus(int type, struct pci_device *dev)
- {
--	unsigned int devfn, l, bus, buses;
-+	unsigned int first_bus, first_devfn;
-+	const struct pci_driver *first_driver;
-+	unsigned int devfn, bus, buses;
- 	unsigned char hdr_type = 0;
--	unsigned short vendor, device;
--	unsigned int membase, ioaddr, romaddr;
--	int i, reg;
--	unsigned int pci_ioaddr = 0;
--
-+	uint32_t class;
-+	uint16_t vendor, device;
-+	uint32_t l, membase, ioaddr, romaddr;
-+	int reg;
-+
-+	EnterFunction("scan_pci_bus");
-+	first_bus    = 0;
-+	first_devfn  = 0;
-+	first_driver = 0;
-+	if (dev->driver) {
-+		first_driver = dev->driver;
-+		first_bus    = dev->bus;
-+		first_devfn  = dev->devfn;
-+		/* Re read the header type on a restart */
-+		pcibios_read_config_byte(first_bus, first_devfn & ~0x7, 
-+			PCI_HEADER_TYPE, &hdr_type);
-+		dev->driver  = 0;
-+		dev->bus     = 0;
-+		dev->devfn   = 0;
-+	}
-+		
- 	/* Scan all PCI buses, until we find our card.
--	 * We could be smart only scan the required busses but that
-+	 * We could be smart only scan the required buses but that
- 	 * is error prone, and tricky.
--	 * By scanning all possible pci busses in order we should find
-+	 * By scanning all possible pci buses in order we should find
- 	 * our card eventually. 
- 	 */
- 	buses=256;
--	for (bus = 0; bus < buses; ++bus) {
--		for (devfn = 0; devfn < 0xff; ++devfn) {
-+	for (bus = first_bus; bus < buses; ++bus) {
-+		for (devfn = first_devfn; devfn < 0xff; ++devfn, first_driver = 0) {
- 			if (PCI_FUNC (devfn) == 0)
- 				pcibios_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type);
- 			else if (!(hdr_type & 0x80))	/* not a multi-function device */
-@@ -421,61 +301,90 @@
- 			pcibios_read_config_dword(bus, devfn, PCI_VENDOR_ID, &l);
- 			/* some broken boards return 0 if a slot is empty: */
- 			if (l == 0xffffffff || l == 0x00000000) {
--				hdr_type = 0;
- 				continue;
- 			}
- 			vendor = l & 0xffff;
- 			device = (l >> 16) & 0xffff;
- 
-+			pcibios_read_config_dword(bus, devfn, PCI_REVISION, &l);
-+			class = (l >> 8) & 0xffffff;
- #if	DEBUG
--			printf("bus %hhX, function %hhX, vendor %hX, device %hX\n",
--				bus, devfn, vendor, device);
-+		{
-+			int i;
-+			printf("%hhx:%hhx.%hhx [%hX/%hX] ---- ",
-+				bus, PCI_SLOT(devfn), PCI_FUNC(devfn),
-+				vendor, device);
-+#if	DEBUG > 1
-+			for(i = 0; i < 256; i++) {
-+				unsigned char byte;
-+				if ((i & 0xf) == 0) {
-+					printf("%hhx: ", i);
-+				}
-+				pcibios_read_config_byte(bus, devfn, i, &byte);
-+				printf("%hhx ", byte);
-+				if ((i & 0xf) == 0xf) {
-+					printf("\n");
-+				}
-+			}
-+#endif
-+
-+		}
-+#endif
-+			scan_drivers(type, class, vendor, device, first_driver, dev);
-+			if (!dev->driver){
-+#if DEBUG
-+				printf("No driver fit.\n");
- #endif
--			for (i = 0; pcidev[i].vendor != 0; i++) {
--				if (vendor != pcidev[i].vendor
--				    || device != pcidev[i].dev_id)
-+				continue;
-+			}
-+#if DEBUG
-+			printf("Get Driver:\n");
-+#endif
-+			dev->devfn = devfn;
-+			dev->bus = bus;
-+			dev->class = class;
-+			dev->vendor = vendor;
-+			dev->dev_id = device;
-+			
-+			
-+			/* Get the ROM base address */
-+			pcibios_read_config_dword(bus, devfn, 
-+				PCI_ROM_ADDRESS, &romaddr);
-+			romaddr >>= 10;
-+			dev->romaddr = romaddr;
-+			
-+			/* Get the ``membase'' */
-+			pcibios_read_config_dword(bus, devfn,
-+				PCI_BASE_ADDRESS_1, &membase);
-+			dev->membase = membase;
-+				
-+			/* Get the ``ioaddr'' */
-+			for (reg = PCI_BASE_ADDRESS_0; reg <= PCI_BASE_ADDRESS_5; reg += 4) {
-+				pcibios_read_config_dword(bus, devfn, reg, &ioaddr);
-+				if ((ioaddr & PCI_BASE_ADDRESS_IO_MASK) == 0 || (ioaddr & PCI_BASE_ADDRESS_SPACE_IO) == 0)
- 					continue;
--				pcidev[i].devfn = devfn;
--				pcidev[i].bus = bus;
--				for (reg = PCI_BASE_ADDRESS_0; reg <= PCI_BASE_ADDRESS_5; reg += 4) {
--					pcibios_read_config_dword(bus, devfn, reg, &ioaddr);
--
--					if ((ioaddr & PCI_BASE_ADDRESS_IO_MASK) == 0 || (ioaddr & PCI_BASE_ADDRESS_SPACE_IO) == 0)
--						continue;
--					/* Strip the I/O address out of the returned value */
--					ioaddr &= PCI_BASE_ADDRESS_IO_MASK;
--					/* Get the memory base address */
--					pcibios_read_config_dword(bus, devfn,
--						PCI_BASE_ADDRESS_1, &membase);
--					/* Get the ROM base address */
--					pcibios_read_config_dword(bus, devfn, PCI_ROM_ADDRESS, &romaddr);
--					romaddr >>= 10;
--					printf("Found %s at %#hx, ROM address %#hx\n",
--						pcidev[i].name, ioaddr, romaddr);
--					/* Take the first one or the one that matches in boot ROM address */
--					if (pci_ioaddr == 0 || romaddr == ((unsigned long) rom.rom_segment << 4)) {
--						pcidev[i].membase = membase;
--						pcidev[i].ioaddr = ioaddr;
--						return;
--					}
--				}
-+				
-+				
-+				/* Strip the I/O address out of the returned value */
-+				ioaddr &= PCI_BASE_ADDRESS_IO_MASK;
-+				
-+				/* Take the first one or the one that matches in boot ROM address */
-+				dev->ioaddr = ioaddr;
- 			}
-+#if DEBUG > 2
-+			printf("Found %s ROM address %#hx\n",
-+				dev->name, romaddr);
-+#endif
-+			LeaveFunction("scan_pci_bus");
-+			return;
- 		}
-+		first_devfn = 0;
- 	}
-+	first_bus = 0;
-+	LeaveFunction("scan_pci_bus");
- }
- 
--void eth_pci_init(struct pci_device *pcidev)
--{
--#ifndef	CONFIG_PCI_DIRECT
--	pcibios_init();
--	if (!pcibios_entry) {
--		printf("pci_init: no BIOS32 detected\n");
--		return;
--	}
--#endif
--	scan_bus(pcidev);
--	/* return values are in pcidev structures */
--}
-+
- 
- /*
-  *	Set device to be a busmaster in case BIOS neglected to do so.
-@@ -489,13 +398,134 @@
- 	pcibios_read_config_word(p->bus, p->devfn, PCI_COMMAND, &pci_command);
- 	new_command = pci_command | PCI_COMMAND_MASTER|PCI_COMMAND_IO;
- 	if (pci_command != new_command) {
--		printf("The PCI BIOS has not enabled this device!\nUpdating PCI command %hX->%hX. pci_bus %hhX pci_device_fn %hhX\n",
-+#if DEBUG > 0
-+		printf(
-+			"The PCI BIOS has not enabled this device!\n"
-+			"Updating PCI command %hX->%hX. pci_bus %hhX pci_device_fn %hhX\n",
- 			   pci_command, new_command, p->bus, p->devfn);
-+#endif
- 		pcibios_write_config_word(p->bus, p->devfn, PCI_COMMAND, new_command);
- 	}
- 	pcibios_read_config_byte(p->bus, p->devfn, PCI_LATENCY_TIMER, &pci_latency);
- 	if (pci_latency < 32) {
--		printf("PCI latency timer (CFLT) is unreasonably low at %d. Setting to 32 clocks.\n", pci_latency);
-+#if DEBUG > 0
-+		printf("PCI latency timer (CFLT) is unreasonably low at %d. Setting to 32 clocks.\n", 
-+			pci_latency);
-+#endif
- 		pcibios_write_config_byte(p->bus, p->devfn, PCI_LATENCY_TIMER, 32);
- 	}
- }
-+
-+/*
-+ * Find the start of a pci resource.
-+ */
-+unsigned long pci_bar_start(struct pci_device *dev, unsigned int index)
-+{
-+	uint32_t lo, hi;
-+	unsigned long bar;
-+	pci_read_config_dword(dev, index, &lo);
-+	if (lo & PCI_BASE_ADDRESS_SPACE_IO) {
-+		bar = lo & PCI_BASE_ADDRESS_IO_MASK;
-+	} else {
-+		bar = 0;
-+		if ((lo & PCI_BASE_ADDRESS_MEM_TYPE_MASK) == PCI_BASE_ADDRESS_MEM_TYPE_64) {
-+			pci_read_config_dword(dev, index + 4, &hi);
-+			if (hi) {
-+				if (sizeof(unsigned long) > sizeof(uint32_t)) {
-+					bar = hi;
-+					/* It's REALLY interesting:-) */
-+					bar <<=32;
-+				}
-+				else {
-+					printf("Unhandled 64bit BAR\n");
-+					return -1UL;
-+				}
-+			}
-+		}
-+		bar |= lo & PCI_BASE_ADDRESS_MEM_MASK;
-+	}
-+	return bar + pcibios_bus_base(dev->bus);
-+}
-+
-+/*
-+ * Find the size of a pci resource.
-+ */
-+unsigned long pci_bar_size(struct pci_device *dev, unsigned int bar)
-+{
-+	uint32_t start, size;
-+	/* Save the original bar */
-+	pci_read_config_dword(dev, bar, &start);
-+	/* Compute which bits can be set */
-+	pci_write_config_dword(dev, bar, ~0);
-+	pci_read_config_dword(dev, bar, &size);
-+	/* Restore the original size */
-+	pci_write_config_dword(dev, bar, start);
-+	/* Find the significant bits */
-+	if (start & PCI_BASE_ADDRESS_SPACE_IO) {
-+		size &= PCI_BASE_ADDRESS_IO_MASK;
-+	} else {
-+		size &= PCI_BASE_ADDRESS_MEM_MASK;
-+	}
-+	/* Find the lowest bit set */
-+	size = size & ~(size - 1);
-+	return size;
-+}
-+
-+/**
-+ * pci_find_capability - query for devices' capabilities 
-+ * @dev: PCI device to query
-+ * @cap: capability code
-+ *
-+ * Tell if a device supports a given PCI capability.
-+ * Returns the address of the requested capability structure within the
-+ * device's PCI configuration space or 0 in case the device does not
-+ * support it.  Possible values for @cap:
-+ *
-+ *  %PCI_CAP_ID_PM           Power Management 
-+ *
-+ *  %PCI_CAP_ID_AGP          Accelerated Graphics Port 
-+ *
-+ *  %PCI_CAP_ID_VPD          Vital Product Data 
-+ *
-+ *  %PCI_CAP_ID_SLOTID       Slot Identification 
-+ *
-+ *  %PCI_CAP_ID_MSI          Message Signalled Interrupts
-+ *
-+ *  %PCI_CAP_ID_CHSWP        CompactPCI HotSwap 
-+ */
-+int pci_find_capability(struct pci_device *dev, int cap)
-+{
-+	uint16_t status;
-+	uint8_t pos, id;
-+	uint8_t hdr_type;
-+	int ttl = 48;
-+
-+	pci_read_config_word(dev, PCI_STATUS, &status);
-+	if (!(status & PCI_STATUS_CAP_LIST))
-+		return 0;
-+	pci_read_config_byte(dev, PCI_HEADER_TYPE, &hdr_type);
-+	switch (hdr_type & 0x7F) {
-+	case PCI_HEADER_TYPE_NORMAL:
-+	case PCI_HEADER_TYPE_BRIDGE:
-+	default:
-+		pci_read_config_byte(dev, PCI_CAPABILITY_LIST, &pos);
-+		break;
-+	case PCI_HEADER_TYPE_CARDBUS:
-+		pci_read_config_byte(dev, PCI_CB_CAPABILITY_LIST, &pos);
-+		break;
-+	}
-+	while (ttl-- && pos >= 0x40) {
-+		pos &= ~3;
-+		pci_read_config_byte(dev, pos + PCI_CAP_LIST_ID, &id);
-+#if	DEBUG > 0
-+		printf("Capability: %d\n", id);
-+#endif
-+		if (id == 0xff)
-+			break;
-+		if (id == cap)
-+			return pos;
-+		pci_read_config_byte(dev, pos + PCI_CAP_LIST_NEXT, &pos);
-+	}
-+	return 0;
-+}
-+
-Index: b/netboot/pci.h
-===================================================================
---- a/netboot/pci.h
-+++ b/netboot/pci.h
-@@ -1,4 +1,4 @@
--#ifndef	PCI_H
-+#if !defined(PCI_H) && defined(CONFIG_PCI)
- #define PCI_H
- 
- /*
-@@ -21,10 +21,19 @@
-  * your option) any later version.
-  */
- 
-+#include "pci_ids.h"
-+
- #define PCI_COMMAND_IO			0x1	/* Enable response in I/O space */
- #define PCI_COMMAND_MEM			0x2	/* Enable response in mem space */
- #define PCI_COMMAND_MASTER		0x4	/* Enable bus mastering */
- #define PCI_LATENCY_TIMER		0x0d	/* 8 bits */
-+#define PCI_COMMAND_SPECIAL		0x8	/* Enable response to special cycles */
-+#define PCI_COMMAND_INVALIDATE		0x10	/* Use memory write and invalidate */
-+#define  PCI_COMMAND_VGA_PALETTE 0x20	/* Enable palette snooping */
-+#define  PCI_COMMAND_PARITY	0x40	/* Enable parity checking */
-+#define  PCI_COMMAND_WAIT 	0x80	/* Enable address/data stepping */
-+#define  PCI_COMMAND_SERR	0x100	/* Enable SERR */
-+#define  PCI_COMMAND_FAST_BACK	0x200	/* Enable back-to-back writes */
- 
- #define PCIBIOS_PCI_FUNCTION_ID         0xb1XX
- #define PCIBIOS_PCI_BIOS_PRESENT        0xb101
-@@ -42,10 +51,37 @@
- #define PCI_DEVICE_ID           0x02    /* 16 bits */
- #define PCI_COMMAND             0x04    /* 16 bits */
- 
-+#define PCI_STATUS		0x06	/* 16 bits */
-+#define  PCI_STATUS_CAP_LIST	0x10	/* Support Capability List */
-+#define  PCI_STATUS_66MHZ	0x20	/* Support 66 Mhz PCI 2.1 bus */
-+#define  PCI_STATUS_UDF		0x40	/* Support User Definable Features [obsolete] */
-+#define  PCI_STATUS_FAST_BACK	0x80	/* Accept fast-back to back */
-+#define  PCI_STATUS_PARITY	0x100	/* Detected parity error */
-+#define  PCI_STATUS_DEVSEL_MASK	0x600	/* DEVSEL timing */
-+#define  PCI_STATUS_DEVSEL_FAST	0x000	
-+#define  PCI_STATUS_DEVSEL_MEDIUM 0x200
-+#define  PCI_STATUS_DEVSEL_SLOW 0x400
-+#define  PCI_STATUS_SIG_TARGET_ABORT 0x800 /* Set on target abort */
-+#define  PCI_STATUS_REC_TARGET_ABORT 0x1000 /* Master ack of " */
-+#define  PCI_STATUS_REC_MASTER_ABORT 0x2000 /* Set on master abort */
-+#define  PCI_STATUS_SIG_SYSTEM_ERROR 0x4000 /* Set when we drive SERR */
-+#define  PCI_STATUS_DETECTED_PARITY 0x8000 /* Set on parity error */
-+
- #define PCI_REVISION            0x08    /* 8 bits  */
-+#define PCI_REVISION_ID         0x08    /* 8 bits  */
-+#define PCI_CLASS_REVISION      0x08    /* 32 bits  */
- #define PCI_CLASS_CODE          0x0b    /* 8 bits */
- #define PCI_SUBCLASS_CODE       0x0a    /* 8 bits */
- #define PCI_HEADER_TYPE         0x0e    /* 8 bits */
-+#define  PCI_HEADER_TYPE_NORMAL	0
-+#define  PCI_HEADER_TYPE_BRIDGE 1
-+#define  PCI_HEADER_TYPE_CARDBUS 2
-+
-+
-+/* Header type 0 (normal devices) */
-+#define PCI_CARDBUS_CIS		0x28
-+#define PCI_SUBSYSTEM_VENDOR_ID	0x2c
-+#define PCI_SUBSYSTEM_ID	0x2e  
- 
- #define PCI_BASE_ADDRESS_0      0x10    /* 32 bits */
- #define PCI_BASE_ADDRESS_1      0x14    /* 32 bits */
-@@ -54,15 +90,155 @@
- #define PCI_BASE_ADDRESS_4      0x20    /* 32 bits */
- #define PCI_BASE_ADDRESS_5      0x24    /* 32 bits */
- 
-+#define PCI_BASE_ADDRESS_MEM_TYPE_MASK 0x06
-+#define PCI_BASE_ADDRESS_MEM_TYPE_32	0x00	/* 32 bit address */
-+#define PCI_BASE_ADDRESS_MEM_TYPE_1M	0x02	/* Below 1M [obsolete] */
-+#define PCI_BASE_ADDRESS_MEM_TYPE_64	0x04	/* 64 bit address */
-+
- #ifndef	PCI_BASE_ADDRESS_IO_MASK
- #define	PCI_BASE_ADDRESS_IO_MASK       (~0x03)
- #endif
-+#ifndef	PCI_BASE_ADDRESS_MEM_MASK
-+#define	PCI_BASE_ADDRESS_MEM_MASK       (~0x0f)
-+#endif
- #define	PCI_BASE_ADDRESS_SPACE_IO	0x01
- #define	PCI_ROM_ADDRESS		0x30	/* 32 bits */
- #define	PCI_ROM_ADDRESS_ENABLE	0x01	/* Write 1 to enable ROM,
- 					   bits 31..11 are address,
- 					   10..2 are reserved */
- 
-+#define PCI_CAPABILITY_LIST	0x34	/* Offset of first capability list entry */
-+
-+#define PCI_INTERRUPT_LINE	0x3c	/* IRQ number (0-15) */
-+#define PCI_INTERRUPT_PIN	0x3d	/* IRQ pin on PCI bus (A-D) */
-+
-+/* Header type 1 (PCI-to-PCI bridges) */
-+#define PCI_PRIMARY_BUS		0x18	/* Primary bus number */
-+#define PCI_SECONDARY_BUS	0x19	/* Secondary bus number */
-+#define PCI_SUBORDINATE_BUS	0x1a	/* Highest bus number behind the bridge */
-+#define PCI_SEC_LATENCY_TIMER	0x1b	/* Latency timer for secondary interface */
-+#define PCI_IO_BASE		0x1c	/* I/O range behind the bridge */
-+#define PCI_IO_LIMIT		0x1d
-+#define  PCI_IO_RANGE_TYPE_MASK	0x0f	/* I/O bridging type */
-+#define  PCI_IO_RANGE_TYPE_16	0x00
-+#define  PCI_IO_RANGE_TYPE_32	0x01
-+#define  PCI_IO_RANGE_MASK	~0x0f
-+#define PCI_SEC_STATUS		0x1e	/* Secondary status register, only bit 14 used */
-+#define PCI_MEMORY_BASE		0x20	/* Memory range behind */
-+#define PCI_MEMORY_LIMIT	0x22
-+#define  PCI_MEMORY_RANGE_TYPE_MASK 0x0f
-+#define  PCI_MEMORY_RANGE_MASK	~0x0f
-+#define PCI_PREF_MEMORY_BASE	0x24	/* Prefetchable memory range behind */
-+#define PCI_PREF_MEMORY_LIMIT	0x26
-+#define  PCI_PREF_RANGE_TYPE_MASK 0x0f
-+#define  PCI_PREF_RANGE_TYPE_32	0x00
-+#define  PCI_PREF_RANGE_TYPE_64	0x01
-+#define  PCI_PREF_RANGE_MASK	~0x0f
-+#define PCI_PREF_BASE_UPPER32	0x28	/* Upper half of prefetchable memory range */
-+#define PCI_PREF_LIMIT_UPPER32	0x2c
-+#define PCI_IO_BASE_UPPER16	0x30	/* Upper half of I/O addresses */
-+#define PCI_IO_LIMIT_UPPER16	0x32
-+/* 0x34 same as for htype 0 */
-+/* 0x35-0x3b is reserved */
-+#define PCI_ROM_ADDRESS1	0x38	/* Same as PCI_ROM_ADDRESS, but for htype 1 */
-+/* 0x3c-0x3d are same as for htype 0 */
-+#define PCI_BRIDGE_CONTROL	0x3e
-+#define  PCI_BRIDGE_CTL_PARITY	0x01	/* Enable parity detection on secondary interface */
-+#define  PCI_BRIDGE_CTL_SERR	0x02	/* The same for SERR forwarding */
-+#define  PCI_BRIDGE_CTL_NO_ISA	0x04	/* Disable bridging of ISA ports */
-+#define  PCI_BRIDGE_CTL_VGA	0x08	/* Forward VGA addresses */
-+#define  PCI_BRIDGE_CTL_MASTER_ABORT 0x20  /* Report master aborts */
-+#define  PCI_BRIDGE_CTL_BUS_RESET 0x40	/* Secondary bus reset */
-+#define  PCI_BRIDGE_CTL_FAST_BACK 0x80	/* Fast Back2Back enabled on secondary interface */
-+
-+#define PCI_CB_CAPABILITY_LIST	0x14
-+
-+/* Capability lists */
-+
-+#define PCI_CAP_LIST_ID		0	/* Capability ID */
-+#define  PCI_CAP_ID_PM		0x01	/* Power Management */
-+#define  PCI_CAP_ID_AGP		0x02	/* Accelerated Graphics Port */
-+#define  PCI_CAP_ID_VPD		0x03	/* Vital Product Data */
-+#define  PCI_CAP_ID_SLOTID	0x04	/* Slot Identification */
-+#define  PCI_CAP_ID_MSI		0x05	/* Message Signalled Interrupts */
-+#define  PCI_CAP_ID_CHSWP	0x06	/* CompactPCI HotSwap */
-+#define PCI_CAP_LIST_NEXT	1	/* Next capability in the list */
-+#define PCI_CAP_FLAGS		2	/* Capability defined flags (16 bits) */
-+#define PCI_CAP_SIZEOF		4
-+
-+/* Power Management Registers */
-+
-+#define PCI_PM_PMC              2       /* PM Capabilities Register */
-+#define  PCI_PM_CAP_VER_MASK	0x0007	/* Version */
-+#define  PCI_PM_CAP_PME_CLOCK	0x0008	/* PME clock required */
-+#define  PCI_PM_CAP_RESERVED    0x0010  /* Reserved field */
-+#define  PCI_PM_CAP_DSI		0x0020	/* Device specific initialization */
-+#define  PCI_PM_CAP_AUX_POWER	0x01C0	/* Auxilliary power support mask */
-+#define  PCI_PM_CAP_D1		0x0200	/* D1 power state support */
-+#define  PCI_PM_CAP_D2		0x0400	/* D2 power state support */
-+#define  PCI_PM_CAP_PME		0x0800	/* PME pin supported */
-+#define  PCI_PM_CAP_PME_MASK    0xF800  /* PME Mask of all supported states */
-+#define  PCI_PM_CAP_PME_D0      0x0800  /* PME# from D0 */
-+#define  PCI_PM_CAP_PME_D1      0x1000  /* PME# from D1 */
-+#define  PCI_PM_CAP_PME_D2      0x2000  /* PME# from D2 */
-+#define  PCI_PM_CAP_PME_D3      0x4000  /* PME# from D3 (hot) */
-+#define  PCI_PM_CAP_PME_D3cold  0x8000  /* PME# from D3 (cold) */
-+#define PCI_PM_CTRL		4	/* PM control and status register */
-+#define  PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
-+#define  PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
-+#define  PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
-+#define  PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */
-+#define  PCI_PM_CTRL_PME_STATUS	0x8000	/* PME pin status */
-+#define PCI_PM_PPB_EXTENSIONS	6	/* PPB support extensions (??) */
-+#define  PCI_PM_PPB_B2_B3	0x40	/* Stop clock when in D3hot (??) */
-+#define  PCI_PM_BPCC_ENABLE	0x80	/* Bus power/clock control enable (??) */
-+#define PCI_PM_DATA_REGISTER	7	/* (??) */
-+#define PCI_PM_SIZEOF		8
-+
-+/* AGP registers */
-+
-+#define PCI_AGP_VERSION		2	/* BCD version number */
-+#define PCI_AGP_RFU		3	/* Rest of capability flags */
-+#define PCI_AGP_STATUS		4	/* Status register */
-+#define  PCI_AGP_STATUS_RQ_MASK	0xff000000	/* Maximum number of requests - 1 */
-+#define  PCI_AGP_STATUS_SBA	0x0200	/* Sideband addressing supported */
-+#define  PCI_AGP_STATUS_64BIT	0x0020	/* 64-bit addressing supported */
-+#define  PCI_AGP_STATUS_FW	0x0010	/* FW transfers supported */
-+#define  PCI_AGP_STATUS_RATE4	0x0004	/* 4x transfer rate supported */
-+#define  PCI_AGP_STATUS_RATE2	0x0002	/* 2x transfer rate supported */
-+#define  PCI_AGP_STATUS_RATE1	0x0001	/* 1x transfer rate supported */
-+#define PCI_AGP_COMMAND		8	/* Control register */
-+#define  PCI_AGP_COMMAND_RQ_MASK 0xff000000  /* Master: Maximum number of requests */
-+#define  PCI_AGP_COMMAND_SBA	0x0200	/* Sideband addressing enabled */
-+#define  PCI_AGP_COMMAND_AGP	0x0100	/* Allow processing of AGP transactions */
-+#define  PCI_AGP_COMMAND_64BIT	0x0020 	/* Allow processing of 64-bit addresses */
-+#define  PCI_AGP_COMMAND_FW	0x0010 	/* Force FW transfers */
-+#define  PCI_AGP_COMMAND_RATE4	0x0004	/* Use 4x rate */
-+#define  PCI_AGP_COMMAND_RATE2	0x0002	/* Use 2x rate */
-+#define  PCI_AGP_COMMAND_RATE1	0x0001	/* Use 1x rate */
-+#define PCI_AGP_SIZEOF		12
-+
-+/* Slot Identification */
-+
-+#define PCI_SID_ESR		2	/* Expansion Slot Register */
-+#define  PCI_SID_ESR_NSLOTS	0x1f	/* Number of expansion slots available */
-+#define  PCI_SID_ESR_FIC	0x20	/* First In Chassis Flag */
-+#define PCI_SID_CHASSIS_NR	3	/* Chassis Number */
-+
-+/* Message Signalled Interrupts registers */
-+
-+#define PCI_MSI_FLAGS		2	/* Various flags */
-+#define  PCI_MSI_FLAGS_64BIT	0x80	/* 64-bit addresses allowed */
-+#define  PCI_MSI_FLAGS_QSIZE	0x70	/* Message queue size configured */
-+#define  PCI_MSI_FLAGS_QMASK	0x0e	/* Maximum queue size available */
-+#define  PCI_MSI_FLAGS_ENABLE	0x01	/* MSI feature enabled */
-+#define PCI_MSI_RFU		3	/* Rest of capability flags */
-+#define PCI_MSI_ADDRESS_LO	4	/* Lower 32 bits */
-+#define PCI_MSI_ADDRESS_HI	8	/* Upper 32 bits (if PCI_MSI_FLAGS_64BIT set) */
-+#define PCI_MSI_DATA_32		8	/* 16 bits of data for 32-bit devices */
-+#define PCI_MSI_DATA_64		12	/* 16 bits of data for 64-bit devices */
-+
-+#define PCI_SLOT(devfn)		  ((devfn) >> 3)
- #define PCI_FUNC(devfn)           ((devfn) & 0x07)
- 
- #define BIOS32_SIGNATURE        (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
-@@ -85,108 +261,97 @@
- 	char chars[16];
- };
- 
--#define KERN_CODE_SEG	0x8	/* This _MUST_ match start.S */
--
--/* Stuff for asm */
--#define save_flags(x) \
--__asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */ :"memory")
--
--#define cli() __asm__ __volatile__ ("cli": : :"memory")
--
--#define restore_flags(x) \
--__asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
--
--#define PCI_VENDOR_ID_ADMTEK            0x1317
--#define PCI_DEVICE_ID_ADMTEK_0985       0x0985
--#define PCI_VENDOR_ID_REALTEK           0x10ec
--#define PCI_DEVICE_ID_REALTEK_8029      0x8029
--#define PCI_DEVICE_ID_REALTEK_8139      0x8139
--#define PCI_VENDOR_ID_WINBOND2          0x1050
--#define PCI_DEVICE_ID_WINBOND2_89C940   0x0940
--#define PCI_DEVICE_ID_WINBOND2_89C840   0x0840
--#define PCI_VENDOR_ID_COMPEX            0x11f6
--#define PCI_DEVICE_ID_COMPEX_RL2000     0x1401
--#define PCI_DEVICE_ID_COMPEX_RL100ATX   0x2011
--#define PCI_VENDOR_ID_KTI               0x8e2e
--#define PCI_DEVICE_ID_KTI_ET32P2        0x3000
--#define PCI_VENDOR_ID_NETVIN            0x4a14
--#define PCI_DEVICE_ID_NETVIN_NV5000SC   0x5000
--#define	PCI_VENDOR_ID_HOLTEK		0x12c3
--#define	PCI_DEVICE_ID_HOLTEK_HT80232	0x0058
--#define PCI_VENDOR_ID_3COM		0x10b7
--#define PCI_DEVICE_ID_3COM_3C590	0x5900
--#define PCI_DEVICE_ID_3COM_3C595	0x5950
--#define PCI_DEVICE_ID_3COM_3C595_1	0x5951
--#define PCI_DEVICE_ID_3COM_3C595_2	0x5952
--#define PCI_DEVICE_ID_3COM_3C900TPO	0x9000
--#define PCI_DEVICE_ID_3COM_3C900COMBO	0x9001
--#define PCI_DEVICE_ID_3COM_3C905TX	0x9050
--#define PCI_DEVICE_ID_3COM_3C905T4	0x9051
--#define PCI_DEVICE_ID_3COM_3C905B_TX	0x9055
--#define PCI_DEVICE_ID_3COM_3C905C_TXM	0x9200
--#define PCI_VENDOR_ID_INTEL		0x8086
--#define PCI_DEVICE_ID_INTEL_82557	0x1229
--#define PCI_DEVICE_ID_INTEL_82559ER	0x1209
--#define PCI_DEVICE_ID_INTEL_ID1029	0x1029
--#define PCI_DEVICE_ID_INTEL_ID1030	0x1030
--#define PCI_DEVICE_ID_INTEL_82562	0x2449
--#define PCI_VENDOR_ID_AMD		0x1022
--#define PCI_DEVICE_ID_AMD_LANCE		0x2000
--#define PCI_VENDOR_ID_AMD_HOMEPNA	0x1022
--#define PCI_DEVICE_ID_AMD_HOMEPNA	0x2001
--#define PCI_VENDOR_ID_SMC_1211          0x1113
--#define PCI_DEVICE_ID_SMC_1211          0x1211
--#define PCI_VENDOR_ID_DEC		0x1011
--#define PCI_DEVICE_ID_DEC_TULIP		0x0002
--#define PCI_DEVICE_ID_DEC_TULIP_FAST	0x0009
--#define PCI_DEVICE_ID_DEC_TULIP_PLUS	0x0014
--#define PCI_DEVICE_ID_DEC_21142		0x0019
--#define PCI_VENDOR_ID_SMC		0x10B8
--#ifndef	PCI_DEVICE_ID_SMC_EPIC100
--# define PCI_DEVICE_ID_SMC_EPIC100	0x0005
--#endif
--#define PCI_VENDOR_ID_MACRONIX		0x10d9
--#define PCI_DEVICE_ID_MX987x5		0x0531
--#define PCI_VENDOR_ID_LINKSYS		0x11AD
--#define PCI_DEVICE_ID_LC82C115		0xC115
--#define PCI_VENDOR_ID_VIATEC		0x1106
--#define PCI_DEVICE_ID_VIA_RHINE_I	0x3043
--#define PCI_DEVICE_ID_VIA_VT6102	0x3065
--#define PCI_DEVICE_ID_VIA_86C100A	0x6100
--#define PCI_VENDOR_ID_DAVICOM		0x1282
--#define	PCI_DEVICE_ID_DM9009		0x9009
--#define PCI_DEVICE_ID_DM9102		0x9102
--#define PCI_VENDOR_ID_SIS         	0x1039
--#define PCI_DEVICE_ID_SIS900     	0x0900   
--#define PCI_DEVICE_ID_SIS7016    	0x7016  
--#define	PCI_VENDOR_ID_DLINK		0x1186
--#define	PCI_DEVICE_ID_DFE530TXP		0x1300
--#define	PCI_VENDOR_ID_NS		0x100B
--#define	PCI_DEVICE_ID_DP83815		0x0020
--#define PCI_VENDOR_ID_OLICOM		0x108d
--#define PCI_DEVICE_ID_OLICOM_OC3136	0x0001
--#define PCI_DEVICE_ID_OLICOM_OC2315	0x0011
--#define PCI_DEVICE_ID_OLICOM_OC2325	0x0012
--#define PCI_DEVICE_ID_OLICOM_OC2183	0x0013
--#define PCI_DEVICE_ID_OLICOM_OC2326	0x0014
--#define PCI_DEVICE_ID_OLICOM_OC6151	0x0021
-+struct pci_device;
-+struct dev;
-+typedef int (*pci_probe_t)(struct dev *, struct pci_device *);
- 
- struct pci_device {
--	unsigned short	vendor, dev_id;
--	const char	*name;
--	unsigned int	membase;
--	unsigned short	ioaddr;
--	unsigned char	devfn;
--	unsigned char	bus;
-+	uint32_t		class;
-+	uint16_t		vendor, dev_id;
-+	const char		*name;
-+	/* membase and ioaddr are silly and depricated */
-+	unsigned int		membase;
-+	unsigned int		ioaddr;
-+	unsigned int		romaddr;
-+	unsigned char		irq;
-+	unsigned char		devfn;
-+	unsigned char		bus;
-+	unsigned char		use_specified;
-+	const struct pci_driver	*driver;
-+};
-+
-+extern void scan_pci_bus(int type, struct pci_device *dev);
-+extern void find_pci(int type, struct pci_device *dev);
-+
-+extern int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn, unsigned int where, uint8_t *value);
-+extern int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn, unsigned int where, uint8_t value);
-+extern int pcibios_read_config_word(unsigned int bus, unsigned int device_fn, unsigned int where, uint16_t *value);
-+extern int pcibios_write_config_word (unsigned int bus, unsigned int device_fn, unsigned int where, uint16_t value);
-+extern int pcibios_read_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, uint32_t *value);
-+extern int pcibios_write_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, uint32_t value);
-+extern unsigned long pcibios_bus_base(unsigned int bus);
-+extern void adjust_pci_device(struct pci_device *p);
-+
-+
-+static inline int 
-+pci_read_config_byte(struct pci_device *dev, unsigned int where, uint8_t *value)
-+{
-+	return pcibios_read_config_byte(dev->bus, dev->devfn, where, value);
-+}
-+static inline int 
-+pci_write_config_byte(struct pci_device *dev, unsigned int where, uint8_t value)
-+{
-+	return pcibios_write_config_byte(dev->bus, dev->devfn, where, value);
-+}
-+static inline int 
-+pci_read_config_word(struct pci_device *dev, unsigned int where, uint16_t *value)
-+{
-+	return pcibios_read_config_word(dev->bus, dev->devfn, where, value);
-+}
-+static inline int 
-+pci_write_config_word(struct pci_device *dev, unsigned int where, uint16_t value)
-+{
-+	return pcibios_write_config_word(dev->bus, dev->devfn, where, value);
-+}
-+static inline int 
-+pci_read_config_dword(struct pci_device *dev, unsigned int where, uint32_t *value)
-+{
-+	return pcibios_read_config_dword(dev->bus, dev->devfn, where, value);
-+}
-+static inline int 
-+pci_write_config_dword(struct pci_device *dev, unsigned int where, uint32_t value)
-+{
-+	return pcibios_write_config_dword(dev->bus, dev->devfn, where, value);
-+}
-+
-+/* Helper functions to find the size of a pci bar */
-+extern unsigned long pci_bar_start(struct pci_device *dev, unsigned int bar);
-+extern unsigned long pci_bar_size(struct pci_device *dev, unsigned int bar);
-+/* Helper function to find pci capabilities */
-+extern int pci_find_capability(struct pci_device *dev, int cap);
-+struct pci_id {
-+	unsigned short vendor, dev_id;
-+	const char *name;
-+};
-+
-+struct dev;
-+/* Most pci drivers will use this */
-+struct pci_driver {
-+	int type;
-+	const char *name;
-+	pci_probe_t probe;
-+	struct pci_id *ids;
-+	int id_count;
-+
-+/* On a few occasions the hardware is standardized enough that
-+ * we only need to know the class of the device and not the exact
-+ * type to drive the device correctly.  If this is the case
-+ * set a class value other than 0.
-+ */
-+	unsigned short class;
- };
- 
--extern void	eth_pci_init(struct pci_device *);
-+#define PCI_ROM(VENDOR_ID, DEVICE_ID, IMAGE, DESCRIPTION) \
-+	{ VENDOR_ID, DEVICE_ID, IMAGE, }
- 
--extern int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned char *value);
--extern int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn, unsigned int where, unsigned char value);
--extern int pcibios_read_config_word(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned short *value);
--extern int pcibios_write_config_word (unsigned int bus, unsigned int device_fn, unsigned int where, unsigned short value);
--extern int pcibios_read_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned int *value);
--extern int pcibios_write_config_dword(unsigned int bus, unsigned int device_fn, unsigned int where, unsigned int value);
--void adjust_pci_device(struct pci_device *p);
- #endif	/* PCI_H */
-Index: b/netboot/pci_ids.h
-===================================================================
---- /dev/null
-+++ b/netboot/pci_ids.h
-@@ -0,0 +1,1809 @@
-+/*
-+ *	PCI Class, Vendor and Device IDs
-+ *
-+ *	Please keep sorted.
-+ */
-+
-+/* Device classes and subclasses */
-+
-+#define PCI_CLASS_NOT_DEFINED		0x0000
-+#define PCI_CLASS_NOT_DEFINED_VGA	0x0001
-+
-+#define PCI_BASE_CLASS_STORAGE		0x01
-+#define PCI_CLASS_STORAGE_SCSI		0x0100
-+#define PCI_CLASS_STORAGE_IDE		0x0101
-+#define PCI_CLASS_STORAGE_FLOPPY	0x0102
-+#define PCI_CLASS_STORAGE_IPI		0x0103
-+#define PCI_CLASS_STORAGE_RAID		0x0104
-+#define PCI_CLASS_STORAGE_OTHER		0x0180
-+
-+#define PCI_BASE_CLASS_NETWORK		0x02
-+#define PCI_CLASS_NETWORK_ETHERNET	0x0200
-+#define PCI_CLASS_NETWORK_TOKEN_RING	0x0201
-+#define PCI_CLASS_NETWORK_FDDI		0x0202
-+#define PCI_CLASS_NETWORK_ATM		0x0203
-+#define PCI_CLASS_NETWORK_OTHER		0x0280
-+
-+#define PCI_BASE_CLASS_DISPLAY		0x03
-+#define PCI_CLASS_DISPLAY_VGA		0x0300
-+#define PCI_CLASS_DISPLAY_XGA		0x0301
-+#define PCI_CLASS_DISPLAY_3D		0x0302
-+#define PCI_CLASS_DISPLAY_OTHER		0x0380
-+
-+#define PCI_BASE_CLASS_MULTIMEDIA	0x04
-+#define PCI_CLASS_MULTIMEDIA_VIDEO	0x0400
-+#define PCI_CLASS_MULTIMEDIA_AUDIO	0x0401
-+#define PCI_CLASS_MULTIMEDIA_PHONE	0x0402
-+#define PCI_CLASS_MULTIMEDIA_OTHER	0x0480
-+
-+#define PCI_BASE_CLASS_MEMORY		0x05
-+#define PCI_CLASS_MEMORY_RAM		0x0500
-+#define PCI_CLASS_MEMORY_FLASH		0x0501
-+#define PCI_CLASS_MEMORY_OTHER		0x0580
-+
-+#define PCI_BASE_CLASS_BRIDGE		0x06
-+#define PCI_CLASS_BRIDGE_HOST		0x0600
-+#define PCI_CLASS_BRIDGE_ISA		0x0601
-+#define PCI_CLASS_BRIDGE_EISA		0x0602
-+#define PCI_CLASS_BRIDGE_MC		0x0603
-+#define PCI_CLASS_BRIDGE_PCI		0x0604
-+#define PCI_CLASS_BRIDGE_PCMCIA		0x0605
-+#define PCI_CLASS_BRIDGE_NUBUS		0x0606
-+#define PCI_CLASS_BRIDGE_CARDBUS	0x0607
-+#define PCI_CLASS_BRIDGE_RACEWAY	0x0608
-+#define PCI_CLASS_BRIDGE_OTHER		0x0680
-+
-+#define PCI_BASE_CLASS_COMMUNICATION	0x07
-+#define PCI_CLASS_COMMUNICATION_SERIAL	0x0700
-+#define PCI_CLASS_COMMUNICATION_PARALLEL 0x0701
-+#define PCI_CLASS_COMMUNICATION_MULTISERIAL 0x0702
-+#define PCI_CLASS_COMMUNICATION_MODEM	0x0703
-+#define PCI_CLASS_COMMUNICATION_OTHER	0x0780
-+
-+#define PCI_BASE_CLASS_SYSTEM		0x08
-+#define PCI_CLASS_SYSTEM_PIC		0x0800
-+#define PCI_CLASS_SYSTEM_DMA		0x0801
-+#define PCI_CLASS_SYSTEM_TIMER		0x0802
-+#define PCI_CLASS_SYSTEM_RTC		0x0803
-+#define PCI_CLASS_SYSTEM_PCI_HOTPLUG	0x0804
-+#define PCI_CLASS_SYSTEM_OTHER		0x0880
-+
-+#define PCI_BASE_CLASS_INPUT		0x09
-+#define PCI_CLASS_INPUT_KEYBOARD	0x0900
-+#define PCI_CLASS_INPUT_PEN		0x0901
-+#define PCI_CLASS_INPUT_MOUSE		0x0902
-+#define PCI_CLASS_INPUT_SCANNER		0x0903
-+#define PCI_CLASS_INPUT_GAMEPORT	0x0904
-+#define PCI_CLASS_INPUT_OTHER		0x0980
-+
-+#define PCI_BASE_CLASS_DOCKING		0x0a
-+#define PCI_CLASS_DOCKING_GENERIC	0x0a00
-+#define PCI_CLASS_DOCKING_OTHER		0x0a80
-+
-+#define PCI_BASE_CLASS_PROCESSOR	0x0b
-+#define PCI_CLASS_PROCESSOR_386		0x0b00
-+#define PCI_CLASS_PROCESSOR_486		0x0b01
-+#define PCI_CLASS_PROCESSOR_PENTIUM	0x0b02
-+#define PCI_CLASS_PROCESSOR_ALPHA	0x0b10
-+#define PCI_CLASS_PROCESSOR_POWERPC	0x0b20
-+#define PCI_CLASS_PROCESSOR_MIPS	0x0b30
-+#define PCI_CLASS_PROCESSOR_CO		0x0b40
-+
-+#define PCI_BASE_CLASS_SERIAL		0x0c
-+#define PCI_CLASS_SERIAL_FIREWIRE	0x0c00
-+#define PCI_CLASS_SERIAL_ACCESS		0x0c01
-+#define PCI_CLASS_SERIAL_SSA		0x0c02
-+#define PCI_CLASS_SERIAL_USB		0x0c03
-+#define PCI_CLASS_SERIAL_FIBER		0x0c04
-+#define PCI_CLASS_SERIAL_SMBUS		0x0c05
-+
-+#define PCI_BASE_CLASS_INTELLIGENT	0x0e
-+#define PCI_CLASS_INTELLIGENT_I2O	0x0e00
-+
-+#define PCI_BASE_CLASS_SATELLITE	0x0f
-+#define PCI_CLASS_SATELLITE_TV		0x0f00
-+#define PCI_CLASS_SATELLITE_AUDIO	0x0f01
-+#define PCI_CLASS_SATELLITE_VOICE	0x0f03
-+#define PCI_CLASS_SATELLITE_DATA	0x0f04
-+
-+#define PCI_BASE_CLASS_CRYPT		0x10
-+#define PCI_CLASS_CRYPT_NETWORK		0x1000
-+#define PCI_CLASS_CRYPT_ENTERTAINMENT	0x1001
-+#define PCI_CLASS_CRYPT_OTHER		0x1080
-+
-+#define PCI_BASE_CLASS_SIGNAL_PROCESSING 0x11
-+#define PCI_CLASS_SP_DPIO		0x1100
-+#define PCI_CLASS_SP_OTHER		0x1180
-+
-+#define PCI_CLASS_OTHERS		0xff
-+
-+/* Vendors and devices.  Sort key: vendor first, device next. */
-+
-+#define PCI_VENDOR_ID_DYNALINK		0x0675
-+#define PCI_DEVICE_ID_DYNALINK_IS64PH	0x1702
-+
-+#define PCI_VENDOR_ID_BERKOM			0x0871
-+#define PCI_DEVICE_ID_BERKOM_A1T		0xffa1
-+#define PCI_DEVICE_ID_BERKOM_T_CONCEPT		0xffa2
-+#define PCI_DEVICE_ID_BERKOM_A4T		0xffa4
-+#define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO	0xffa8
-+
-+#define PCI_VENDOR_ID_COMPAQ		0x0e11
-+#define PCI_DEVICE_ID_COMPAQ_TOKENRING	0x0508
-+#define PCI_DEVICE_ID_COMPAQ_1280	0x3033
-+#define PCI_DEVICE_ID_COMPAQ_TRIFLEX	0x4000
-+#define PCI_DEVICE_ID_COMPAQ_6010	0x6010
-+#define PCI_DEVICE_ID_COMPAQ_SMART2P	0xae10
-+#define PCI_DEVICE_ID_COMPAQ_NETEL100	0xae32
-+#define PCI_DEVICE_ID_COMPAQ_NETEL10	0xae34
-+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3I	0xae35
-+#define PCI_DEVICE_ID_COMPAQ_NETEL100D	0xae40
-+#define PCI_DEVICE_ID_COMPAQ_NETEL100PI	0xae43
-+#define PCI_DEVICE_ID_COMPAQ_NETEL100I	0xb011
-+#define PCI_DEVICE_ID_COMPAQ_CISS	0xb060
-+#define PCI_DEVICE_ID_COMPAQ_CISSB	0xb178
-+#define PCI_DEVICE_ID_COMPAQ_THUNDER	0xf130
-+#define PCI_DEVICE_ID_COMPAQ_NETFLEX3B	0xf150
-+
-+#define PCI_VENDOR_ID_NCR		0x1000
-+#define PCI_VENDOR_ID_LSI_LOGIC		0x1000
-+#define PCI_DEVICE_ID_NCR_53C810	0x0001
-+#define PCI_DEVICE_ID_NCR_53C820	0x0002
-+#define PCI_DEVICE_ID_NCR_53C825	0x0003
-+#define PCI_DEVICE_ID_NCR_53C815	0x0004
-+#define PCI_DEVICE_ID_LSI_53C810AP	0x0005
-+#define PCI_DEVICE_ID_NCR_53C860	0x0006
-+#define PCI_DEVICE_ID_LSI_53C1510	0x000a
-+#define PCI_DEVICE_ID_NCR_53C896	0x000b
-+#define PCI_DEVICE_ID_NCR_53C895	0x000c
-+#define PCI_DEVICE_ID_NCR_53C885	0x000d
-+#define PCI_DEVICE_ID_NCR_53C875	0x000f
-+#define PCI_DEVICE_ID_NCR_53C1510	0x0010
-+#define PCI_DEVICE_ID_LSI_53C895A	0x0012
-+#define PCI_DEVICE_ID_LSI_53C875A	0x0013
-+#define PCI_DEVICE_ID_LSI_53C1010_33	0x0020
-+#define PCI_DEVICE_ID_LSI_53C1010_66	0x0021
-+#define PCI_DEVICE_ID_LSI_53C1030	0x0030
-+#define PCI_DEVICE_ID_LSI_53C1035	0x0040
-+#define PCI_DEVICE_ID_NCR_53C875J	0x008f
-+#define PCI_DEVICE_ID_LSI_FC909		0x0621
-+#define PCI_DEVICE_ID_LSI_FC929		0x0622
-+#define PCI_DEVICE_ID_LSI_FC929_LAN	0x0623
-+#define PCI_DEVICE_ID_LSI_FC919		0x0624
-+#define PCI_DEVICE_ID_LSI_FC919_LAN	0x0625
-+#define PCI_DEVICE_ID_NCR_YELLOWFIN	0x0701
-+#define PCI_DEVICE_ID_LSI_61C102	0x0901
-+#define PCI_DEVICE_ID_LSI_63C815	0x1000
-+
-+#define PCI_VENDOR_ID_ATI		0x1002
-+/* Mach64 */
-+#define PCI_DEVICE_ID_ATI_68800		0x4158
-+#define PCI_DEVICE_ID_ATI_215CT222	0x4354
-+#define PCI_DEVICE_ID_ATI_210888CX	0x4358
-+#define PCI_DEVICE_ID_ATI_215ET222	0x4554
-+/* Mach64 / Rage */
-+#define PCI_DEVICE_ID_ATI_215GB		0x4742
-+#define PCI_DEVICE_ID_ATI_215GD		0x4744
-+#define PCI_DEVICE_ID_ATI_215GI		0x4749
-+#define PCI_DEVICE_ID_ATI_215GP		0x4750
-+#define PCI_DEVICE_ID_ATI_215GQ		0x4751
-+#define PCI_DEVICE_ID_ATI_215XL		0x4752
-+#define PCI_DEVICE_ID_ATI_215GT		0x4754
-+#define PCI_DEVICE_ID_ATI_215GTB	0x4755
-+#define PCI_DEVICE_ID_ATI_215_IV	0x4756
-+#define PCI_DEVICE_ID_ATI_215_IW	0x4757
-+#define PCI_DEVICE_ID_ATI_215_IZ	0x475A
-+#define PCI_DEVICE_ID_ATI_210888GX	0x4758
-+#define PCI_DEVICE_ID_ATI_215_LB	0x4c42
-+#define PCI_DEVICE_ID_ATI_215_LD	0x4c44
-+#define PCI_DEVICE_ID_ATI_215_LG	0x4c47
-+#define PCI_DEVICE_ID_ATI_215_LI	0x4c49
-+#define PCI_DEVICE_ID_ATI_215_LM	0x4c4D
-+#define PCI_DEVICE_ID_ATI_215_LN	0x4c4E
-+#define PCI_DEVICE_ID_ATI_215_LR	0x4c52
-+#define PCI_DEVICE_ID_ATI_215_LS	0x4c53
-+#define PCI_DEVICE_ID_ATI_264_LT	0x4c54
-+/* Mach64 VT */
-+#define PCI_DEVICE_ID_ATI_264VT		0x5654
-+#define PCI_DEVICE_ID_ATI_264VU		0x5655
-+#define PCI_DEVICE_ID_ATI_264VV		0x5656
-+/* Rage128 Pro GL */
-+#define PCI_DEVICE_ID_ATI_Rage128_PA	0x5041
-+#define PCI_DEVICE_ID_ATI_Rage128_PB	0x5042
-+#define PCI_DEVICE_ID_ATI_Rage128_PC	0x5043
-+#define PCI_DEVICE_ID_ATI_Rage128_PD	0x5044
-+#define PCI_DEVICE_ID_ATI_Rage128_PE	0x5045
-+#define PCI_DEVICE_ID_ATI_RAGE128_PF	0x5046
-+/* Rage128 Pro VR */
-+#define PCI_DEVICE_ID_ATI_RAGE128_PG	0x5047
-+#define PCI_DEVICE_ID_ATI_RAGE128_PH	0x5048
-+#define PCI_DEVICE_ID_ATI_RAGE128_PI	0x5049
-+#define PCI_DEVICE_ID_ATI_RAGE128_PJ	0x504A
-+#define PCI_DEVICE_ID_ATI_RAGE128_PK	0x504B
-+#define PCI_DEVICE_ID_ATI_RAGE128_PL	0x504C
-+#define PCI_DEVICE_ID_ATI_RAGE128_PM	0x504D
-+#define PCI_DEVICE_ID_ATI_RAGE128_PN	0x504E
-+#define PCI_DEVICE_ID_ATI_RAGE128_PO	0x504F
-+#define PCI_DEVICE_ID_ATI_RAGE128_PP	0x5050
-+#define PCI_DEVICE_ID_ATI_RAGE128_PQ	0x5051
-+#define PCI_DEVICE_ID_ATI_RAGE128_PR	0x5052
-+#define PCI_DEVICE_ID_ATI_RAGE128_TR	0x5452
-+#define PCI_DEVICE_ID_ATI_RAGE128_PS	0x5053
-+#define PCI_DEVICE_ID_ATI_RAGE128_PT	0x5054
-+#define PCI_DEVICE_ID_ATI_RAGE128_PU	0x5055
-+#define PCI_DEVICE_ID_ATI_RAGE128_PV	0x5056
-+#define PCI_DEVICE_ID_ATI_RAGE128_PW	0x5057
-+#define PCI_DEVICE_ID_ATI_RAGE128_PX	0x5058
-+/* Rage128 GL */
-+#define PCI_DEVICE_ID_ATI_RAGE128_RE	0x5245
-+#define PCI_DEVICE_ID_ATI_RAGE128_RF	0x5246
-+#define PCI_DEVICE_ID_ATI_RAGE128_RG	0x534b
-+#define PCI_DEVICE_ID_ATI_RAGE128_RH	0x534c
-+#define PCI_DEVICE_ID_ATI_RAGE128_RI	0x534d
-+/* Rage128 VR */
-+#define PCI_DEVICE_ID_ATI_RAGE128_RK	0x524b
-+#define PCI_DEVICE_ID_ATI_RAGE128_RL	0x524c
-+#define PCI_DEVICE_ID_ATI_RAGE128_RM	0x5345
-+#define PCI_DEVICE_ID_ATI_RAGE128_RN	0x5346
-+#define PCI_DEVICE_ID_ATI_RAGE128_RO	0x5347
-+/* Rage128 M3 */
-+#define PCI_DEVICE_ID_ATI_RAGE128_LE	0x4c45
-+#define PCI_DEVICE_ID_ATI_RAGE128_LF	0x4c46
-+/* Rage128 Pro Ultra */
-+#define PCI_DEVICE_ID_ATI_RAGE128_U1	0x5446
-+#define PCI_DEVICE_ID_ATI_RAGE128_U2	0x544C
-+#define PCI_DEVICE_ID_ATI_RAGE128_U3	0x5452
-+/* Radeon M4 */
-+#define PCI_DEVICE_ID_ATI_RADEON_LE	0x4d45
-+#define PCI_DEVICE_ID_ATI_RADEON_LF	0x4d46
-+/* Radeon NV-100 */
-+#define PCI_DEVICE_ID_ATI_RADEON_N1	0x5159
-+#define PCI_DEVICE_ID_ATI_RADEON_N2	0x515a
-+/* Radeon */
-+#define PCI_DEVICE_ID_ATI_RADEON_RA	0x5144
-+#define PCI_DEVICE_ID_ATI_RADEON_RB	0x5145
-+#define PCI_DEVICE_ID_ATI_RADEON_RC	0x5146
-+#define PCI_DEVICE_ID_ATI_RADEON_RD	0x5147
-+
-+#define PCI_VENDOR_ID_VLSI		0x1004
-+#define PCI_DEVICE_ID_VLSI_82C592	0x0005
-+#define PCI_DEVICE_ID_VLSI_82C593	0x0006
-+#define PCI_DEVICE_ID_VLSI_82C594	0x0007
-+#define PCI_DEVICE_ID_VLSI_82C597	0x0009
-+#define PCI_DEVICE_ID_VLSI_82C541	0x000c
-+#define PCI_DEVICE_ID_VLSI_82C543	0x000d
-+#define PCI_DEVICE_ID_VLSI_82C532	0x0101
-+#define PCI_DEVICE_ID_VLSI_82C534	0x0102
-+#define PCI_DEVICE_ID_VLSI_82C535	0x0104
-+#define PCI_DEVICE_ID_VLSI_82C147	0x0105
-+#define PCI_DEVICE_ID_VLSI_VAS96011	0x0702
-+
-+#define PCI_VENDOR_ID_ADL		0x1005
-+#define PCI_DEVICE_ID_ADL_2301		0x2301
-+
-+#define PCI_VENDOR_ID_NS		0x100b
-+#define PCI_DEVICE_ID_NS_87415		0x0002
-+#define PCI_DEVICE_ID_NS_87560_LIO	0x000e
-+#define PCI_DEVICE_ID_NS_87560_USB	0x0012
-+#define PCI_DEVICE_ID_NS_83815		0x0020
-+#define	PCI_DEVICE_ID_DP83815		0x0020
-+#define PCI_DEVICE_ID_NS_83820		0x0022
-+#define PCI_DEVICE_ID_NS_87410		0xd001
-+
-+#define PCI_VENDOR_ID_TSENG		0x100c
-+#define PCI_DEVICE_ID_TSENG_W32P_2	0x3202
-+#define PCI_DEVICE_ID_TSENG_W32P_b	0x3205
-+#define PCI_DEVICE_ID_TSENG_W32P_c	0x3206
-+#define PCI_DEVICE_ID_TSENG_W32P_d	0x3207
-+#define PCI_DEVICE_ID_TSENG_ET6000	0x3208
-+
-+#define PCI_VENDOR_ID_WEITEK		0x100e
-+#define PCI_DEVICE_ID_WEITEK_P9000	0x9001
-+#define PCI_DEVICE_ID_WEITEK_P9100	0x9100
-+
-+#define PCI_VENDOR_ID_DEC		0x1011
-+#define PCI_DEVICE_ID_DEC_BRD		0x0001
-+#define PCI_DEVICE_ID_DEC_TULIP		0x0002
-+#define PCI_DEVICE_ID_DEC_TGA		0x0004
-+#define PCI_DEVICE_ID_DEC_TULIP_FAST	0x0009
-+#define PCI_DEVICE_ID_DEC_TGA2		0x000D
-+#define PCI_DEVICE_ID_DEC_FDDI		0x000F
-+#define PCI_DEVICE_ID_DEC_TULIP_PLUS	0x0014
-+#define PCI_DEVICE_ID_DEC_21142		0x0019
-+#define PCI_DEVICE_ID_DEC_21052		0x0021
-+#define PCI_DEVICE_ID_DEC_21150		0x0022
-+#define PCI_DEVICE_ID_DEC_21152		0x0024
-+#define PCI_DEVICE_ID_DEC_21153		0x0025
-+#define PCI_DEVICE_ID_DEC_21154		0x0026
-+#define PCI_DEVICE_ID_DEC_21285		0x1065
-+#define PCI_DEVICE_ID_COMPAQ_42XX	0x0046
-+
-+#define PCI_VENDOR_ID_CIRRUS		0x1013
-+#define PCI_DEVICE_ID_CIRRUS_7548	0x0038
-+#define PCI_DEVICE_ID_CIRRUS_5430	0x00a0
-+#define PCI_DEVICE_ID_CIRRUS_5434_4	0x00a4
-+#define PCI_DEVICE_ID_CIRRUS_5434_8	0x00a8
-+#define PCI_DEVICE_ID_CIRRUS_5436	0x00ac
-+#define PCI_DEVICE_ID_CIRRUS_5446	0x00b8
-+#define PCI_DEVICE_ID_CIRRUS_5480	0x00bc
-+#define PCI_DEVICE_ID_CIRRUS_5462	0x00d0
-+#define PCI_DEVICE_ID_CIRRUS_5464	0x00d4
-+#define PCI_DEVICE_ID_CIRRUS_5465	0x00d6
-+#define PCI_DEVICE_ID_CIRRUS_6729	0x1100
-+#define PCI_DEVICE_ID_CIRRUS_6832	0x1110
-+#define PCI_DEVICE_ID_CIRRUS_7542	0x1200
-+#define PCI_DEVICE_ID_CIRRUS_7543	0x1202
-+#define PCI_DEVICE_ID_CIRRUS_7541	0x1204
-+
-+#define PCI_VENDOR_ID_IBM		0x1014
-+#define PCI_DEVICE_ID_IBM_FIRE_CORAL	0x000a
-+#define PCI_DEVICE_ID_IBM_TR		0x0018
-+#define PCI_DEVICE_ID_IBM_82G2675	0x001d
-+#define PCI_DEVICE_ID_IBM_MCA		0x0020
-+#define PCI_DEVICE_ID_IBM_82351		0x0022
-+#define PCI_DEVICE_ID_IBM_PYTHON	0x002d
-+#define PCI_DEVICE_ID_IBM_SERVERAID	0x002e
-+#define PCI_DEVICE_ID_IBM_TR_WAKE	0x003e
-+#define PCI_DEVICE_ID_IBM_MPIC		0x0046
-+#define PCI_DEVICE_ID_IBM_3780IDSP	0x007d
-+#define PCI_DEVICE_ID_IBM_CHUKAR	0x0096
-+#define	PCI_DEVICE_ID_IBM_405GP		0x0156
-+#define PCI_DEVICE_ID_IBM_SERVERAIDI960	0x01bd
-+#define PCI_DEVICE_ID_IBM_MPIC_2	0xffff
-+
-+#define PCI_VENDOR_ID_COMPEX2		0x101a // pci.ids says "AT&T GIS (NCR)"
-+#define PCI_DEVICE_ID_COMPEX2_100VG	0x0005
-+
-+#define PCI_VENDOR_ID_WD		0x101c
-+#define PCI_DEVICE_ID_WD_7197		0x3296
-+
-+#define PCI_VENDOR_ID_AMI		0x101e
-+#define PCI_DEVICE_ID_AMI_MEGARAID3	0x1960
-+#define PCI_DEVICE_ID_AMI_MEGARAID	0x9010
-+#define PCI_DEVICE_ID_AMI_MEGARAID2	0x9060
-+
-+#define PCI_VENDOR_ID_AMD		0x1022
-+
-+#define PCI_DEVICE_ID_AMD_LANCE		0x2000
-+#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001
-+#define PCI_DEVICE_ID_AMD_HOMEPNA	0x2001
-+#define PCI_DEVICE_ID_AMD_SCSI		0x2020
-+#define PCI_DEVICE_ID_AMD_FE_GATE_7006	0x7006
-+#define PCI_DEVICE_ID_AMD_FE_GATE_7007	0x7007
-+#define PCI_DEVICE_ID_AMD_FE_GATE_700C	0x700C
-+#define PCI_DEVIDE_ID_AMD_FE_GATE_700D	0x700D
-+#define PCI_DEVICE_ID_AMD_FE_GATE_700E	0x700E
-+#define PCI_DEVICE_ID_AMD_FE_GATE_700F	0x700F
-+#define PCI_DEVICE_ID_AMD_COBRA_7400	0x7400
-+#define PCI_DEVICE_ID_AMD_COBRA_7401	0x7401
-+#define PCI_DEVICE_ID_AMD_COBRA_7403	0x7403
-+#define PCI_DEVICE_ID_AMD_COBRA_7404	0x7404
-+#define PCI_DEVICE_ID_AMD_VIPER_7408	0x7408
-+#define PCI_DEVICE_ID_AMD_VIPER_7409	0x7409
-+#define PCI_DEVICE_ID_AMD_VIPER_740B	0x740B
-+#define PCI_DEVICE_ID_AMD_VIPER_740C	0x740C
-+#define PCI_DEVICE_ID_AMD_VIPER_7410	0x7410
-+#define PCI_DEVICE_ID_AMD_VIPER_7411	0x7411
-+#define PCI_DEVICE_ID_AMD_VIPER_7413	0x7413
-+#define PCI_DEVICE_ID_AMD_VIPER_7414	0x7414
-+#define PCI_DEVICE_ID_AMD_VIPER_7440	0x7440
-+#define PCI_DEVICE_ID_AMD_VIPER_7441	0x7441
-+#define PCI_DEVICE_ID_AMD_VIPER_7443	0x7443
-+#define PCI_DEVICE_ID_AMD_VIPER_7448	0x7448
-+#define PCI_DEVICE_ID_AMD_VIPER_7449	0x7449
-+
-+#define PCI_VENDOR_ID_TRIDENT		0x1023
-+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
-+#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001
-+#define PCI_DEVICE_ID_TRIDENT_9320	0x9320
-+#define PCI_DEVICE_ID_TRIDENT_9388	0x9388
-+#define PCI_DEVICE_ID_TRIDENT_9397	0x9397
-+#define PCI_DEVICE_ID_TRIDENT_939A	0x939A
-+#define PCI_DEVICE_ID_TRIDENT_9520	0x9520
-+#define PCI_DEVICE_ID_TRIDENT_9525	0x9525
-+#define PCI_DEVICE_ID_TRIDENT_9420	0x9420
-+#define PCI_DEVICE_ID_TRIDENT_9440	0x9440
-+#define PCI_DEVICE_ID_TRIDENT_9660	0x9660
-+#define PCI_DEVICE_ID_TRIDENT_9750	0x9750
-+#define PCI_DEVICE_ID_TRIDENT_9850	0x9850
-+#define PCI_DEVICE_ID_TRIDENT_9880	0x9880
-+#define PCI_DEVICE_ID_TRIDENT_8400	0x8400
-+#define PCI_DEVICE_ID_TRIDENT_8420	0x8420
-+#define PCI_DEVICE_ID_TRIDENT_8500	0x8500
-+
-+#define PCI_VENDOR_ID_AI		0x1025
-+#define PCI_DEVICE_ID_AI_M1435		0x1435
-+
-+#define PCI_VENDOR_ID_DELL              0x1028
-+
-+#define PCI_VENDOR_ID_MATROX		0x102B
-+#define PCI_DEVICE_ID_MATROX_MGA_2	0x0518
-+#define PCI_DEVICE_ID_MATROX_MIL	0x0519
-+#define PCI_DEVICE_ID_MATROX_MYS	0x051A
-+#define PCI_DEVICE_ID_MATROX_MIL_2	0x051b
-+#define PCI_DEVICE_ID_MATROX_MIL_2_AGP	0x051f
-+#define PCI_DEVICE_ID_MATROX_MGA_IMP	0x0d10
-+#define PCI_DEVICE_ID_MATROX_G100_MM	0x1000
-+#define PCI_DEVICE_ID_MATROX_G100_AGP	0x1001
-+#define PCI_DEVICE_ID_MATROX_G200_PCI	0x0520
-+#define PCI_DEVICE_ID_MATROX_G200_AGP	0x0521
-+#define	PCI_DEVICE_ID_MATROX_G400	0x0525
-+#define PCI_DEVICE_ID_MATROX_G550	0x2527
-+#define PCI_DEVICE_ID_MATROX_VIA	0x4536
-+
-+#define PCI_VENDOR_ID_CT		0x102c
-+#define PCI_DEVICE_ID_CT_65545		0x00d8
-+#define PCI_DEVICE_ID_CT_65548		0x00dc
-+#define PCI_DEVICE_ID_CT_65550		0x00e0
-+#define PCI_DEVICE_ID_CT_65554		0x00e4
-+#define PCI_DEVICE_ID_CT_65555		0x00e5
-+
-+#define PCI_VENDOR_ID_MIRO		0x1031
-+#define PCI_DEVICE_ID_MIRO_36050	0x5601
-+
-+#define PCI_VENDOR_ID_NEC		0x1033
-+#define PCI_DEVICE_ID_NEC_PCX2		0x0046
-+#define PCI_DEVICE_ID_NEC_NILE4		0x005a
-+#define PCI_DEVICE_ID_NEC_VRC5476       0x009b
-+
-+#define PCI_VENDOR_ID_FD		0x1036
-+#define PCI_DEVICE_ID_FD_36C70		0x0000
-+
-+#define PCI_VENDOR_ID_SIS         	0x1039
-+#define PCI_VENDOR_ID_SI		0x1039
-+#define PCI_DEVICE_ID_SI_5591_AGP	0x0001
-+#define PCI_DEVICE_ID_SI_6202		0x0002
-+#define PCI_DEVICE_ID_SI_503		0x0008
-+#define PCI_DEVICE_ID_SI_ACPI		0x0009
-+#define PCI_DEVICE_ID_SI_5597_VGA	0x0200
-+#define PCI_DEVICE_ID_SI_6205		0x0205
-+#define PCI_DEVICE_ID_SI_501		0x0406
-+#define PCI_DEVICE_ID_SI_496		0x0496
-+#define PCI_DEVICE_ID_SI_300		0x0300
-+#define PCI_DEVICE_ID_SI_315H		0x0310
-+#define PCI_DEVICE_ID_SI_315		0x0315
-+#define PCI_DEVICE_ID_SI_315PRO		0x0325
-+#define PCI_DEVICE_ID_SI_530		0x0530
-+#define PCI_DEVICE_ID_SI_540		0x0540
-+#define PCI_DEVICE_ID_SI_550		0x0550
-+#define PCI_DEVICE_ID_SI_601		0x0601
-+#define PCI_DEVICE_ID_SI_620		0x0620
-+#define PCI_DEVICE_ID_SI_630		0x0630
-+#define PCI_DEVICE_ID_SI_635		0x0635
-+#define PCI_DEVICE_ID_SI_640		0x0640
-+#define PCI_DEVICE_ID_SI_645		0x0645
-+#define PCI_DEVICE_ID_SI_650		0x0650
-+#define PCI_DEVICE_ID_SI_730		0x0730
-+#define PCI_DEVICE_ID_SI_735		0x0735
-+#define PCI_DEVICE_ID_SI_740		0x0740
-+#define PCI_DEVICE_ID_SI_745		0x0745
-+#define PCI_DEVICE_ID_SI_750		0x0750
-+#define PCI_DEVICE_ID_SI_900		0x0900
-+#define PCI_DEVICE_ID_SIS900		0x0900
-+#define PCI_DEVICE_ID_SI_5107		0x5107
-+#define PCI_DEVICE_ID_SI_5300		0x5300
-+#define PCI_DEVICE_ID_SI_540_VGA	0x5300
-+#define PCI_DEVICE_ID_SI_550_VGA	0x5315
-+#define PCI_DEVICE_ID_SI_5511		0x5511
-+#define PCI_DEVICE_ID_SI_5513		0x5513
-+#define PCI_DEVICE_ID_SI_5571		0x5571
-+#define PCI_DEVICE_ID_SI_5591		0x5591
-+#define PCI_DEVICE_ID_SI_5597		0x5597
-+#define PCI_DEVICE_ID_SI_5598		0x5598
-+#define PCI_DEVICE_ID_SI_5600		0x5600
-+#define PCI_DEVICE_ID_SI_6300		0x6300
-+#define PCI_DEVICE_ID_SI_630_VGA	0x6300
-+#define PCI_DEVICE_ID_SI_6306		0x6306
-+#define PCI_DEVICE_ID_SI_6326		0x6326
-+#define PCI_DEVICE_ID_SI_7001		0x7001
-+#define PCI_DEVICE_ID_SI_7016		0x7016
-+#define PCI_DEVICE_ID_SIS7016    	0x7016  
-+#define PCI_DEVICE_ID_SI_730_VGA	0x7300
-+
-+#define PCI_VENDOR_ID_HP		0x103c
-+#define PCI_DEVICE_ID_HP_DONNER_GFX	0x1008
-+#define PCI_DEVICE_ID_HP_TACHYON	0x1028
-+#define PCI_DEVICE_ID_HP_TACHLITE	0x1029
-+#define PCI_DEVICE_ID_HP_J2585A		0x1030
-+#define PCI_DEVICE_ID_HP_J2585B		0x1031
-+#define PCI_DEVICE_ID_HP_SAS		0x1048
-+#define PCI_DEVICE_ID_HP_DIVA1		0x1049
-+#define PCI_DEVICE_ID_HP_DIVA2		0x104A
-+#define PCI_DEVICE_ID_HP_SP2_0		0x104B
-+
-+#define PCI_VENDOR_ID_PCTECH		0x1042
-+#define PCI_DEVICE_ID_PCTECH_RZ1000	0x1000
-+#define PCI_DEVICE_ID_PCTECH_RZ1001	0x1001
-+#define PCI_DEVICE_ID_PCTECH_SAMURAI_0	0x3000
-+#define PCI_DEVICE_ID_PCTECH_SAMURAI_1	0x3010
-+#define PCI_DEVICE_ID_PCTECH_SAMURAI_IDE 0x3020
-+
-+#define PCI_VENDOR_ID_ASUSTEK		0x1043
-+#define PCI_DEVICE_ID_ASUSTEK_0675	0x0675
-+
-+#define PCI_VENDOR_ID_DPT		0x1044
-+#define PCI_DEVICE_ID_DPT		0xa400
-+
-+#define PCI_VENDOR_ID_OPTI		0x1045
-+#define PCI_DEVICE_ID_OPTI_92C178	0xc178
-+#define PCI_DEVICE_ID_OPTI_82C557	0xc557
-+#define PCI_DEVICE_ID_OPTI_82C558	0xc558
-+#define PCI_DEVICE_ID_OPTI_82C621	0xc621
-+#define PCI_DEVICE_ID_OPTI_82C700	0xc700
-+#define PCI_DEVICE_ID_OPTI_82C701	0xc701
-+#define PCI_DEVICE_ID_OPTI_82C814	0xc814
-+#define PCI_DEVICE_ID_OPTI_82C822	0xc822
-+#define PCI_DEVICE_ID_OPTI_82C861	0xc861
-+#define PCI_DEVICE_ID_OPTI_82C825	0xd568
-+
-+#define PCI_VENDOR_ID_ELSA		0x1048
-+#define PCI_DEVICE_ID_ELSA_MICROLINK	0x1000
-+#define PCI_DEVICE_ID_ELSA_QS3000	0x3000
-+
-+#define PCI_VENDOR_ID_ELSA		0x1048
-+#define PCI_DEVICE_ID_ELSA_MICROLINK	0x1000
-+#define PCI_DEVICE_ID_ELSA_QS3000	0x3000
-+
-+#define PCI_VENDOR_ID_SGS		0x104a
-+#define PCI_DEVICE_ID_SGS_2000		0x0008
-+#define PCI_DEVICE_ID_SGS_1764		0x0009
-+
-+#define PCI_VENDOR_ID_BUSLOGIC		      0x104B
-+#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140
-+#define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER    0x1040
-+#define PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT     0x8130
-+
-+#define PCI_VENDOR_ID_TI		0x104c
-+#define PCI_DEVICE_ID_TI_TVP4010	0x3d04
-+#define PCI_DEVICE_ID_TI_TVP4020	0x3d07
-+#define PCI_DEVICE_ID_TI_1130		0xac12
-+#define PCI_DEVICE_ID_TI_1031		0xac13
-+#define PCI_DEVICE_ID_TI_1131		0xac15
-+#define PCI_DEVICE_ID_TI_1250		0xac16
-+#define PCI_DEVICE_ID_TI_1220		0xac17
-+#define PCI_DEVICE_ID_TI_1221		0xac19
-+#define PCI_DEVICE_ID_TI_1210		0xac1a
-+#define PCI_DEVICE_ID_TI_1410		0xac50
-+#define PCI_DEVICE_ID_TI_1450		0xac1b
-+#define PCI_DEVICE_ID_TI_1225		0xac1c
-+#define PCI_DEVICE_ID_TI_1251A		0xac1d
-+#define PCI_DEVICE_ID_TI_1211		0xac1e
-+#define PCI_DEVICE_ID_TI_1251B		0xac1f
-+#define PCI_DEVICE_ID_TI_4410		0xac41
-+#define PCI_DEVICE_ID_TI_4451		0xac42
-+#define PCI_DEVICE_ID_TI_1420		0xac51
-+
-+#define PCI_VENDOR_ID_SONY		0x104d
-+#define PCI_DEVICE_ID_SONY_CXD3222	0x8039
-+
-+#define PCI_VENDOR_ID_OAK		0x104e
-+#define PCI_DEVICE_ID_OAK_OTI107	0x0107
-+
-+/* Winbond have two vendor IDs! See 0x10ad as well */
-+#define PCI_VENDOR_ID_WINBOND2		0x1050
-+#define PCI_DEVICE_ID_WINBOND2_89C840   0x0840
-+#define PCI_DEVICE_ID_WINBOND2_89C940	0x0940
-+#define PCI_DEVICE_ID_WINBOND2_89C940F	0x5a5a
-+#define PCI_DEVICE_ID_WINBOND2_6692	0x6692
-+
-+#define PCI_VENDOR_ID_ANIGMA		0x1051
-+#define PCI_DEVICE_ID_ANIGMA_MC145575	0x0100
-+  
-+#define PCI_VENDOR_ID_EFAR		0x1055
-+#define PCI_DEVICE_ID_EFAR_SLC90E66_1	0x9130
-+#define PCI_DEVICE_ID_EFAR_SLC90E66_0	0x9460
-+#define PCI_DEVICE_ID_EFAR_SLC90E66_2	0x9462
-+#define PCI_DEVICE_ID_EFAR_SLC90E66_3	0x9463
-+
-+#define PCI_VENDOR_ID_MOTOROLA		0x1057
-+#define PCI_VENDOR_ID_MOTOROLA_OOPS	0x1507
-+#define PCI_DEVICE_ID_MOTOROLA_MPC105	0x0001
-+#define PCI_DEVICE_ID_MOTOROLA_MPC106	0x0002
-+#define PCI_DEVICE_ID_MOTOROLA_RAVEN	0x4801
-+#define PCI_DEVICE_ID_MOTOROLA_FALCON	0x4802
-+#define PCI_DEVICE_ID_MOTOROLA_CPX8216	0x4806
-+
-+#define PCI_VENDOR_ID_PROMISE		0x105a
-+#define PCI_DEVICE_ID_PROMISE_20265	0x0d30
-+#define PCI_DEVICE_ID_PROMISE_20267	0x4d30
-+#define PCI_DEVICE_ID_PROMISE_20246	0x4d33
-+#define PCI_DEVICE_ID_PROMISE_20262	0x4d38
-+#define PCI_DEVICE_ID_PROMISE_20268	0x4d68
-+#define PCI_DEVICE_ID_PROMISE_20268R	0x6268
-+#define PCI_DEVICE_ID_PROMISE_20269	0x4d69
-+#define PCI_DEVICE_ID_PROMISE_20275	0x1275
-+#define PCI_DEVICE_ID_PROMISE_5300	0x5300
-+
-+#define PCI_VENDOR_ID_N9		0x105d
-+#define PCI_DEVICE_ID_N9_I128		0x2309
-+#define PCI_DEVICE_ID_N9_I128_2		0x2339
-+#define PCI_DEVICE_ID_N9_I128_T2R	0x493d
-+
-+#define PCI_VENDOR_ID_UMC		0x1060
-+#define PCI_DEVICE_ID_UMC_UM8673F	0x0101
-+#define PCI_DEVICE_ID_UMC_UM8891A	0x0891
-+#define PCI_DEVICE_ID_UMC_UM8886BF	0x673a
-+#define PCI_DEVICE_ID_UMC_UM8886A	0x886a
-+#define PCI_DEVICE_ID_UMC_UM8881F	0x8881
-+#define PCI_DEVICE_ID_UMC_UM8886F	0x8886
-+#define PCI_DEVICE_ID_UMC_UM9017F	0x9017
-+#define PCI_DEVICE_ID_UMC_UM8886N	0xe886
-+#define PCI_DEVICE_ID_UMC_UM8891N	0xe891
-+
-+#define PCI_VENDOR_ID_X			0x1061
-+#define PCI_DEVICE_ID_X_AGX016		0x0001
-+
-+#define PCI_VENDOR_ID_MYLEX		0x1069
-+#define PCI_DEVICE_ID_MYLEX_DAC960_P	0x0001
-+#define PCI_DEVICE_ID_MYLEX_DAC960_PD	0x0002
-+#define PCI_DEVICE_ID_MYLEX_DAC960_PG	0x0010
-+#define PCI_DEVICE_ID_MYLEX_DAC960_LA	0x0020
-+#define PCI_DEVICE_ID_MYLEX_DAC960_LP	0x0050
-+#define PCI_DEVICE_ID_MYLEX_DAC960_BA	0xBA56
-+
-+#define PCI_VENDOR_ID_PICOP		0x1066
-+#define PCI_DEVICE_ID_PICOP_PT86C52X	0x0001
-+#define PCI_DEVICE_ID_PICOP_PT80C524	0x8002
-+
-+#define PCI_VENDOR_ID_APPLE		0x106b
-+#define PCI_DEVICE_ID_APPLE_BANDIT	0x0001
-+#define PCI_DEVICE_ID_APPLE_GC		0x0002
-+#define PCI_DEVICE_ID_APPLE_HYDRA	0x000e
-+#define PCI_DEVICE_ID_APPLE_UNI_N_FW	0x0018
-+#define PCI_DEVICE_ID_APPLE_KL_USB	0x0019
-+#define PCI_DEVICE_ID_APPLE_UNI_N_AGP	0x0020
-+#define PCI_DEVICE_ID_APPLE_UNI_N_GMAC	0x0021
-+#define PCI_DEVICE_ID_APPLE_UNI_N_FW2	0x0030
-+
-+#define PCI_VENDOR_ID_YAMAHA		0x1073
-+#define PCI_DEVICE_ID_YAMAHA_724	0x0004
-+#define PCI_DEVICE_ID_YAMAHA_724F	0x000d
-+#define PCI_DEVICE_ID_YAMAHA_740	0x000a
-+#define PCI_DEVICE_ID_YAMAHA_740C	0x000c
-+#define PCI_DEVICE_ID_YAMAHA_744	0x0010
-+#define PCI_DEVICE_ID_YAMAHA_754	0x0012
-+
-+#define PCI_VENDOR_ID_NEXGEN		0x1074
-+#define PCI_DEVICE_ID_NEXGEN_82C501	0x4e78
-+
-+#define PCI_VENDOR_ID_QLOGIC		0x1077
-+#define PCI_DEVICE_ID_QLOGIC_ISP1020	0x1020
-+#define PCI_DEVICE_ID_QLOGIC_ISP1022	0x1022
-+#define PCI_DEVICE_ID_QLOGIC_ISP2100	0x2100
-+#define PCI_DEVICE_ID_QLOGIC_ISP2200	0x2200
-+
-+#define PCI_VENDOR_ID_CYRIX		0x1078
-+#define PCI_DEVICE_ID_CYRIX_5510	0x0000
-+#define PCI_DEVICE_ID_CYRIX_PCI_MASTER	0x0001
-+#define PCI_DEVICE_ID_CYRIX_5520	0x0002
-+#define PCI_DEVICE_ID_CYRIX_5530_LEGACY	0x0100
-+#define PCI_DEVICE_ID_CYRIX_5530_SMI	0x0101
-+#define PCI_DEVICE_ID_CYRIX_5530_IDE	0x0102
-+#define PCI_DEVICE_ID_CYRIX_5530_AUDIO	0x0103
-+#define PCI_DEVICE_ID_CYRIX_5530_VIDEO	0x0104
-+
-+#define PCI_VENDOR_ID_LEADTEK		0x107d
-+#define PCI_DEVICE_ID_LEADTEK_805	0x0000
-+
-+#define PCI_VENDOR_ID_INTERPHASE	0x107e
-+#define PCI_DEVICE_ID_INTERPHASE_5526	0x0004
-+#define PCI_DEVICE_ID_INTERPHASE_55x6	0x0005
-+#define PCI_DEVICE_ID_INTERPHASE_5575	0x0008
-+
-+#define PCI_VENDOR_ID_CONTAQ		0x1080
-+#define PCI_DEVICE_ID_CONTAQ_82C599	0x0600
-+#define PCI_DEVICE_ID_CONTAQ_82C693	0xc693
-+
-+#define PCI_VENDOR_ID_FOREX		0x1083
-+
-+#define PCI_VENDOR_ID_OLICOM		0x108d
-+#define PCI_DEVICE_ID_OLICOM_OC3136	0x0001
-+#define PCI_DEVICE_ID_OLICOM_OC2315	0x0011
-+#define PCI_DEVICE_ID_OLICOM_OC2325	0x0012
-+#define PCI_DEVICE_ID_OLICOM_OC2183	0x0013
-+#define PCI_DEVICE_ID_OLICOM_OC2326	0x0014
-+#define PCI_DEVICE_ID_OLICOM_OC6151	0x0021
-+
-+#define PCI_VENDOR_ID_SUN		0x108e
-+#define PCI_DEVICE_ID_SUN_EBUS		0x1000
-+#define PCI_DEVICE_ID_SUN_HAPPYMEAL	0x1001
-+#define PCI_DEVICE_ID_SUN_RIO_EBUS	0x1100
-+#define PCI_DEVICE_ID_SUN_RIO_GEM	0x1101
-+#define PCI_DEVICE_ID_SUN_RIO_1394	0x1102
-+#define PCI_DEVICE_ID_SUN_RIO_USB	0x1103
-+#define PCI_DEVICE_ID_SUN_GEM		0x2bad
-+#define PCI_DEVICE_ID_SUN_SIMBA		0x5000
-+#define PCI_DEVICE_ID_SUN_PBM		0x8000
-+#define PCI_DEVICE_ID_SUN_SCHIZO	0x8001
-+#define PCI_DEVICE_ID_SUN_SABRE		0xa000
-+#define PCI_DEVICE_ID_SUN_HUMMINGBIRD	0xa001
-+
-+#define PCI_VENDOR_ID_CMD		0x1095
-+#define PCI_DEVICE_ID_CMD_640		0x0640
-+#define PCI_DEVICE_ID_CMD_643		0x0643
-+#define PCI_DEVICE_ID_CMD_646		0x0646
-+#define PCI_DEVICE_ID_CMD_647		0x0647
-+#define PCI_DEVICE_ID_CMD_648		0x0648
-+#define PCI_DEVICE_ID_CMD_649		0x0649
-+#define PCI_DEVICE_ID_CMD_670		0x0670
-+#define PCI_DEVICE_ID_CMD_680		0x0680
-+
-+#define PCI_VENDOR_ID_VISION		0x1098
-+#define PCI_DEVICE_ID_VISION_QD8500	0x0001
-+#define PCI_DEVICE_ID_VISION_QD8580	0x0002
-+
-+#define PCI_VENDOR_ID_BROOKTREE		0x109e
-+#define PCI_DEVICE_ID_BROOKTREE_848	0x0350
-+#define PCI_DEVICE_ID_BROOKTREE_849A	0x0351
-+#define PCI_DEVICE_ID_BROOKTREE_878_1	0x036e
-+#define PCI_DEVICE_ID_BROOKTREE_878	0x0878
-+#define PCI_DEVICE_ID_BROOKTREE_8474	0x8474
-+
-+#define PCI_VENDOR_ID_SIERRA		0x10a8
-+#define PCI_DEVICE_ID_SIERRA_STB	0x0000
-+
-+#define PCI_VENDOR_ID_SGI		0x10a9
-+#define PCI_DEVICE_ID_SGI_IOC3		0x0003
-+
-+#define PCI_VENDOR_ID_ACC		0x10aa
-+#define PCI_DEVICE_ID_ACC_2056		0x0000
-+
-+#define PCI_VENDOR_ID_WINBOND		0x10ad
-+#define PCI_DEVICE_ID_WINBOND_83769	0x0001
-+#define PCI_DEVICE_ID_WINBOND_82C105	0x0105
-+#define PCI_DEVICE_ID_WINBOND_83C553	0x0565
-+
-+#define PCI_VENDOR_ID_DATABOOK		0x10b3
-+#define PCI_DEVICE_ID_DATABOOK_87144	0xb106
-+
-+#define PCI_VENDOR_ID_PLX		0x10b5
-+#define PCI_DEVICE_ID_PLX_R685		0x1030
-+#define PCI_DEVICE_ID_PLX_ROMULUS	0x106a
-+#define PCI_DEVICE_ID_PLX_SPCOM800	0x1076
-+#define PCI_DEVICE_ID_PLX_1077		0x1077
-+#define PCI_DEVICE_ID_PLX_SPCOM200	0x1103
-+#define PCI_DEVICE_ID_PLX_DJINN_ITOO	0x1151
-+#define PCI_DEVICE_ID_PLX_R753		0x1152
-+#define PCI_DEVICE_ID_PLX_9050		0x9050
-+#define PCI_DEVICE_ID_PLX_9060		0x9060
-+#define PCI_DEVICE_ID_PLX_9060ES	0x906E
-+#define PCI_DEVICE_ID_PLX_9060SD	0x906D
-+#define PCI_DEVICE_ID_PLX_9080		0x9080
-+#define PCI_DEVICE_ID_PLX_GTEK_SERIAL2	0xa001
-+
-+#define PCI_VENDOR_ID_MADGE		0x10b6
-+#define PCI_DEVICE_ID_MADGE_MK2		0x0002
-+#define PCI_DEVICE_ID_MADGE_C155S	0x1001
-+
-+#define PCI_VENDOR_ID_3COM		0x10b7
-+#define PCI_DEVICE_ID_3COM_3C985	0x0001
-+#define PCI_DEVICE_ID_3COM_3C339	0x3390
-+#define PCI_DEVICE_ID_3COM_3C590	0x5900
-+#define PCI_DEVICE_ID_3COM_3C595	0x5950
-+#define PCI_DEVICE_ID_3COM_3C595TX	0x5950
-+#define PCI_DEVICE_ID_3COM_3C595_1	0x5951
-+#define PCI_DEVICE_ID_3COM_3C595T4	0x5951
-+#define PCI_DEVICE_ID_3COM_3C595_2	0x5952
-+#define PCI_DEVICE_ID_3COM_3C595MII	0x5952
-+#define PCI_DEVICE_ID_3COM_3C900TPO	0x9000
-+#define PCI_DEVICE_ID_3COM_3C900COMBO	0x9001
-+#define PCI_DEVICE_ID_3COM_3C905TX	0x9050
-+#define PCI_DEVICE_ID_3COM_3C905T4	0x9051
-+#define PCI_DEVICE_ID_3COM_3C905B_TX	0x9055
-+#define PCI_DEVICE_ID_3COM_3C905C_TXM	0x9200
-+
-+#define PCI_VENDOR_ID_SMC		0x10b8
-+#define PCI_DEVICE_ID_SMC_EPIC100	0x0005
-+
-+#define PCI_VENDOR_ID_SUNDANCE		0x13F0
-+#define PCI_DEVICE_ID_SUNDANCE_ALTA	0x0201
-+
-+#define PCI_VENDOR_ID_AL		0x10b9
-+#define PCI_DEVICE_ID_AL_M1445		0x1445
-+#define PCI_DEVICE_ID_AL_M1449		0x1449
-+#define PCI_DEVICE_ID_AL_M1451		0x1451
-+#define PCI_DEVICE_ID_AL_M1461		0x1461
-+#define PCI_DEVICE_ID_AL_M1489		0x1489
-+#define PCI_DEVICE_ID_AL_M1511		0x1511
-+#define PCI_DEVICE_ID_AL_M1513		0x1513
-+#define PCI_DEVICE_ID_AL_M1521		0x1521
-+#define PCI_DEVICE_ID_AL_M1523		0x1523
-+#define PCI_DEVICE_ID_AL_M1531		0x1531
-+#define PCI_DEVICE_ID_AL_M1533		0x1533
-+#define PCI_DEVICE_ID_AL_M1541		0x1541
-+#define PCI_DEVICE_ID_AL_M1621          0x1621
-+#define PCI_DEVICE_ID_AL_M1631          0x1631
-+#define PCI_DEVICE_ID_AL_M1641          0x1641
-+#define PCI_DEVICE_ID_AL_M1647          0x1647
-+#define PCI_DEVICE_ID_AL_M1651          0x1651
-+#define PCI_DEVICE_ID_AL_M1543		0x1543
-+#define PCI_DEVICE_ID_AL_M3307		0x3307
-+#define PCI_DEVICE_ID_AL_M4803		0x5215
-+#define PCI_DEVICE_ID_AL_M5219		0x5219
-+#define PCI_DEVICE_ID_AL_M5229		0x5229
-+#define PCI_DEVICE_ID_AL_M5237		0x5237
-+#define PCI_DEVICE_ID_AL_M5243		0x5243
-+#define PCI_DEVICE_ID_AL_M5451		0x5451
-+#define PCI_DEVICE_ID_AL_M7101		0x7101
-+
-+#define PCI_VENDOR_ID_MITSUBISHI	0x10ba
-+
-+#define PCI_VENDOR_ID_SURECOM		0x10bd
-+#define PCI_DEVICE_ID_SURECOM_NE34	0x0e34
-+
-+#define PCI_VENDOR_ID_NEOMAGIC		0x10c8
-+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2070 0x0001
-+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128V 0x0002
-+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZV 0x0003
-+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_NM2160 0x0004
-+#define PCI_DEVICE_ID_NEOMAGIC_MAGICMEDIA_256AV       0x0005
-+#define PCI_DEVICE_ID_NEOMAGIC_MAGICGRAPH_128ZVPLUS   0x0083
-+
-+#define PCI_VENDOR_ID_ASP		0x10cd
-+#define PCI_DEVICE_ID_ASP_ABP940	0x1200
-+#define PCI_DEVICE_ID_ASP_ABP940U	0x1300
-+#define PCI_DEVICE_ID_ASP_ABP940UW	0x2300
-+
-+#define PCI_VENDOR_ID_MACRONIX		0x10d9
-+#define PCI_DEVICE_ID_MACRONIX_MX98713	0x0512
-+#define PCI_DEVICE_ID_MX987x3		0x0512
-+#define PCI_DEVICE_ID_MACRONIX_MX987x5	0x0531
-+#define PCI_DEVICE_ID_MX987x5		0x0531
-+
-+#define PCI_VENDOR_ID_TCONRAD		0x10da
-+#define PCI_DEVICE_ID_TCONRAD_TOKENRING	0x0508
-+
-+#define PCI_VENDOR_ID_CERN		0x10dc
-+#define PCI_DEVICE_ID_CERN_SPSB_PMC	0x0001
-+#define PCI_DEVICE_ID_CERN_SPSB_PCI	0x0002
-+#define PCI_DEVICE_ID_CERN_HIPPI_DST	0x0021
-+#define PCI_DEVICE_ID_CERN_HIPPI_SRC	0x0022
-+
-+#define PCI_VENDOR_ID_NVIDIA			0x10de
-+#define PCI_DEVICE_ID_NVIDIA_TNT		0x0020
-+#define PCI_DEVICE_ID_NVIDIA_TNT2		0x0028
-+#define PCI_DEVICE_ID_NVIDIA_UTNT2		0x0029
-+#define PCI_DEVICE_ID_NVIDIA_VTNT2		0x002C
-+#define PCI_DEVICE_ID_NVIDIA_UVTNT2		0x002D
-+#define PCI_DEVICE_ID_NVIDIA_ITNT2		0x00A0
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_SDR	0x0100
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_DDR	0x0101
-+#define PCI_DEVICE_ID_NVIDIA_QUADRO		0x0103
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX	0x0110
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_MX2	0x0111
-+#define PCI_DEVICE_ID_NVIDIA_QUADRO2_MXR	0x0113
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS	0x0150
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2	0x0151
-+#define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA	0x0152
-+#define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO	0x0153
-+
-+#define PCI_VENDOR_ID_IMS		0x10e0
-+#define PCI_DEVICE_ID_IMS_8849		0x8849
-+#define PCI_DEVICE_ID_IMS_TT128		0x9128
-+#define PCI_DEVICE_ID_IMS_TT3D		0x9135
-+
-+#define PCI_VENDOR_ID_TEKRAM2		0x10e1
-+#define PCI_DEVICE_ID_TEKRAM2_690c	0x690c
-+
-+#define PCI_VENDOR_ID_TUNDRA		0x10e3
-+#define PCI_DEVICE_ID_TUNDRA_CA91C042	0x0000
-+
-+#define PCI_VENDOR_ID_AMCC		0x10e8
-+#define PCI_DEVICE_ID_AMCC_MYRINET	0x8043
-+#define PCI_DEVICE_ID_AMCC_PARASTATION	0x8062
-+#define PCI_DEVICE_ID_AMCC_S5933	0x807d
-+#define PCI_DEVICE_ID_AMCC_S5933_HEPC3	0x809c
-+
-+#define PCI_VENDOR_ID_INTERG		0x10ea
-+#define PCI_DEVICE_ID_INTERG_1680	0x1680
-+#define PCI_DEVICE_ID_INTERG_1682	0x1682
-+#define PCI_DEVICE_ID_INTERG_2000	0x2000
-+#define PCI_DEVICE_ID_INTERG_2010	0x2010
-+#define PCI_DEVICE_ID_INTERG_5000	0x5000
-+#define PCI_DEVICE_ID_INTERG_5050	0x5050
-+
-+#define PCI_VENDOR_ID_REALTEK		0x10ec
-+#define PCI_DEVICE_ID_REALTEK_8029	0x8029
-+#define PCI_DEVICE_ID_REALTEK_8129	0x8129
-+#define PCI_DEVICE_ID_REALTEK_8139	0x8139
-+
-+#define PCI_VENDOR_ID_XILINX		0x10ee
-+#define PCI_DEVICE_ID_TURBOPAM		0x4020
-+
-+#define PCI_VENDOR_ID_TRUEVISION	0x10fa
-+#define PCI_DEVICE_ID_TRUEVISION_T1000	0x000c
-+
-+#define PCI_VENDOR_ID_INIT		0x1101
-+#define PCI_DEVICE_ID_INIT_320P		0x9100
-+#define PCI_DEVICE_ID_INIT_360P		0x9500
-+
-+#define PCI_VENDOR_ID_CREATIVE		0x1102 // duplicate: ECTIVA
-+#define PCI_DEVICE_ID_CREATIVE_EMU10K1	0x0002
-+
-+#define PCI_VENDOR_ID_ECTIVA		0x1102 // duplicate: CREATIVE
-+#define PCI_DEVICE_ID_ECTIVA_EV1938	0x8938
-+
-+#define PCI_VENDOR_ID_TTI		0x1103
-+#define PCI_DEVICE_ID_TTI_HPT343	0x0003
-+#define PCI_DEVICE_ID_TTI_HPT366	0x0004
-+
-+#define PCI_VENDOR_ID_VIA		0x1106
-+#define PCI_VENDOR_ID_VIATEC		0x1106
-+#define PCI_DEVICE_ID_VIA_8363_0	0x0305
-+#define PCI_DEVICE_ID_VIA_8371_0	0x0391
-+#define PCI_DEVICE_ID_VIA_8501_0	0x0501
-+#define PCI_DEVICE_ID_VIA_82C505	0x0505
-+#define PCI_DEVICE_ID_VIA_82C561	0x0561
-+#define PCI_DEVICE_ID_VIA_82C586_1	0x0571
-+#define PCI_DEVICE_ID_VIA_82C576	0x0576
-+#define PCI_DEVICE_ID_VIA_82C585	0x0585
-+#define PCI_DEVICE_ID_VIA_82C586_0	0x0586
-+#define PCI_DEVICE_ID_VIA_82C595	0x0595
-+#define PCI_DEVICE_ID_VIA_82C596	0x0596
-+#define PCI_DEVICE_ID_VIA_82C597_0	0x0597
-+#define PCI_DEVICE_ID_VIA_82C598_0	0x0598
-+#define PCI_DEVICE_ID_VIA_8601_0	0x0601
-+#define PCI_DEVICE_ID_VIA_8605_0	0x0605
-+#define PCI_DEVICE_ID_VIA_82C680	0x0680
-+#define PCI_DEVICE_ID_VIA_82C686	0x0686
-+#define PCI_DEVICE_ID_VIA_82C691	0x0691
-+#define PCI_DEVICE_ID_VIA_82C693	0x0693
-+#define PCI_DEVICE_ID_VIA_82C693_1	0x0698
-+#define PCI_DEVICE_ID_VIA_82C926	0x0926
-+#define PCI_DEVICE_ID_VIA_82C576_1	0x1571
-+#define PCI_DEVICE_ID_VIA_82C595_97	0x1595
-+#define PCI_DEVICE_ID_VIA_82C586_2	0x3038
-+#define PCI_DEVICE_ID_VIA_82C586_3	0x3040
-+#define PCI_DEVICE_ID_VIA_RHINE_I	0x3043
-+#define PCI_DEVICE_ID_VIA_6305		0x3044
-+#define PCI_DEVICE_ID_VIA_82C596_3	0x3050
-+#define PCI_DEVICE_ID_VIA_82C596B_3	0x3051
-+#define PCI_DEVICE_ID_VIA_82C686_4	0x3057
-+#define PCI_DEVICE_ID_VIA_82C686_5	0x3058
-+#define PCI_DEVICE_ID_VIA_8233_5	0x3059
-+#define PCI_DEVICE_ID_VIA_8233_7	0x3065
-+#define PCI_DEVICE_ID_VIA_VT6102	0x3065
-+#define PCI_DEVICE_ID_VIA_82C686_6	0x3068
-+#define PCI_DEVICE_ID_VIA_8233_0	0x3074
-+#define PCI_DEVICE_ID_VIA_VT6105	0x3106
-+#define PCI_DEVICE_ID_VIA_8233C_0	0x3109
-+#define PCI_DEVICE_ID_VIA_8633_0	0x3091
-+#define PCI_DEVICE_ID_VIA_8367_0	0x3099
-+#define PCI_DEVICE_ID_VIA_86C100A	0x6100
-+#define PCI_DEVICE_ID_VIA_8231		0x8231
-+#define PCI_DEVICE_ID_VIA_8231_4	0x8235
-+#define PCI_DEVICE_ID_VIA_8365_1	0x8305
-+#define PCI_DEVICE_ID_VIA_8371_1	0x8391
-+#define PCI_DEVICE_ID_VIA_8501_1	0x8501
-+#define PCI_DEVICE_ID_VIA_82C597_1	0x8597
-+#define PCI_DEVICE_ID_VIA_82C598_1	0x8598
-+#define PCI_DEVICE_ID_VIA_8601_1	0x8601
-+#define PCI_DEVICE_ID_VIA_8505_1	0X8605
-+#define PCI_DEVICE_ID_VIA_8633_1	0xB091
-+#define PCI_DEVICE_ID_VIA_8367_1	0xB099
-+
-+#define PCI_VENDOR_ID_SIEMENS           0x110A
-+#define PCI_DEVICE_ID_SIEMENS_DSCC4     0x2102
-+
-+#define PCI_VENDOR_ID_SMC2		0x1113
-+#define PCI_DEVICE_ID_SMC2_1211TX	0x1211
-+#define PCI_DEVICE_ID_SMC2_1211         0x1211
-+#define PCI_DEVICE_ID_SMC2_1216         0x1216
-+
-+#define PCI_VENDOR_ID_VORTEX		0x1119
-+#define PCI_DEVICE_ID_VORTEX_GDT60x0	0x0000
-+#define PCI_DEVICE_ID_VORTEX_GDT6000B	0x0001
-+#define PCI_DEVICE_ID_VORTEX_GDT6x10	0x0002
-+#define PCI_DEVICE_ID_VORTEX_GDT6x20	0x0003
-+#define PCI_DEVICE_ID_VORTEX_GDT6530	0x0004
-+#define PCI_DEVICE_ID_VORTEX_GDT6550	0x0005
-+#define PCI_DEVICE_ID_VORTEX_GDT6x17	0x0006
-+#define PCI_DEVICE_ID_VORTEX_GDT6x27	0x0007
-+#define PCI_DEVICE_ID_VORTEX_GDT6537	0x0008
-+#define PCI_DEVICE_ID_VORTEX_GDT6557	0x0009
-+#define PCI_DEVICE_ID_VORTEX_GDT6x15	0x000a
-+#define PCI_DEVICE_ID_VORTEX_GDT6x25	0x000b
-+#define PCI_DEVICE_ID_VORTEX_GDT6535	0x000c
-+#define PCI_DEVICE_ID_VORTEX_GDT6555	0x000d
-+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP	0x0100
-+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP	0x0101
-+#define PCI_DEVICE_ID_VORTEX_GDT6537RP	0x0102
-+#define PCI_DEVICE_ID_VORTEX_GDT6557RP	0x0103
-+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP	0x0104
-+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP	0x0105
-+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP1	0x0110
-+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP1	0x0111
-+#define PCI_DEVICE_ID_VORTEX_GDT6537RP1	0x0112
-+#define PCI_DEVICE_ID_VORTEX_GDT6557RP1	0x0113
-+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP1	0x0114
-+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP1	0x0115
-+#define PCI_DEVICE_ID_VORTEX_GDT6x17RP2	0x0120
-+#define PCI_DEVICE_ID_VORTEX_GDT6x27RP2	0x0121
-+#define PCI_DEVICE_ID_VORTEX_GDT6537RP2	0x0122
-+#define PCI_DEVICE_ID_VORTEX_GDT6557RP2	0x0123
-+#define PCI_DEVICE_ID_VORTEX_GDT6x11RP2	0x0124
-+#define PCI_DEVICE_ID_VORTEX_GDT6x21RP2	0x0125
-+
-+#define PCI_VENDOR_ID_EF		0x111a
-+#define PCI_DEVICE_ID_EF_ATM_FPGA	0x0000
-+#define PCI_DEVICE_ID_EF_ATM_ASIC	0x0002
-+
-+#define PCI_VENDOR_ID_IDT		0x111d
-+#define PCI_DEVICE_ID_IDT_IDT77201	0x0001
-+
-+#define PCI_VENDOR_ID_FORE		0x1127
-+#define PCI_DEVICE_ID_FORE_PCA200PC	0x0210
-+#define PCI_DEVICE_ID_FORE_PCA200E	0x0300
-+
-+#define PCI_VENDOR_ID_IMAGINGTECH	0x112f
-+#define PCI_DEVICE_ID_IMAGINGTECH_ICPCI	0x0000
-+
-+#define PCI_VENDOR_ID_PHILIPS		0x1131
-+#define PCI_DEVICE_ID_PHILIPS_SAA7145	0x7145
-+#define PCI_DEVICE_ID_PHILIPS_SAA7146	0x7146
-+#define PCI_DEVICE_ID_PHILIPS_SAA9730	0x9730
-+
-+#define PCI_VENDOR_ID_EICON		0x1133
-+#define PCI_DEVICE_ID_EICON_DIVA20PRO	0xe001
-+#define PCI_DEVICE_ID_EICON_DIVA20	0xe002
-+#define PCI_DEVICE_ID_EICON_DIVA20PRO_U	0xe003
-+#define PCI_DEVICE_ID_EICON_DIVA20_U	0xe004
-+#define PCI_DEVICE_ID_EICON_DIVA201	0xe005
-+#define PCI_DEVICE_ID_EICON_MAESTRA	0xe010
-+#define PCI_DEVICE_ID_EICON_MAESTRAQ	0xe012
-+#define PCI_DEVICE_ID_EICON_MAESTRAQ_U	0xe013
-+#define PCI_DEVICE_ID_EICON_MAESTRAP	0xe014
-+ 
-+#define PCI_VENDOR_ID_CYCLONE		0x113c
-+#define PCI_DEVICE_ID_CYCLONE_SDK	0x0001
-+
-+#define PCI_VENDOR_ID_ALLIANCE		0x1142
-+#define PCI_DEVICE_ID_ALLIANCE_PROMOTIO	0x3210
-+#define PCI_DEVICE_ID_ALLIANCE_PROVIDEO	0x6422
-+#define PCI_DEVICE_ID_ALLIANCE_AT24	0x6424
-+#define PCI_DEVICE_ID_ALLIANCE_AT3D	0x643d
-+
-+#define PCI_VENDOR_ID_SYSKONNECT	0x1148
-+#define PCI_DEVICE_ID_SYSKONNECT_FP	0x4000
-+#define PCI_DEVICE_ID_SYSKONNECT_TR	0x4200
-+#define PCI_DEVICE_ID_SYSKONNECT_GE	0x4300
-+
-+#define PCI_VENDOR_ID_VMIC		0x114a
-+#define PCI_DEVICE_ID_VMIC_VME		0x7587
-+
-+#define PCI_VENDOR_ID_DIGI		0x114f
-+#define PCI_DEVICE_ID_DIGI_EPC		0x0002
-+#define PCI_DEVICE_ID_DIGI_RIGHTSWITCH	0x0003
-+#define PCI_DEVICE_ID_DIGI_XEM		0x0004
-+#define PCI_DEVICE_ID_DIGI_XR		0x0005
-+#define PCI_DEVICE_ID_DIGI_CX		0x0006
-+#define PCI_DEVICE_ID_DIGI_XRJ		0x0009
-+#define PCI_DEVICE_ID_DIGI_EPCJ		0x000a
-+#define PCI_DEVICE_ID_DIGI_XR_920	0x0027
-+#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_E	0x0070
-+#define PCI_DEVICE_ID_DIGI_DF_M_E	0x0071
-+#define PCI_DEVICE_ID_DIGI_DF_M_IOM2_A	0x0072
-+#define PCI_DEVICE_ID_DIGI_DF_M_A	0x0073
-+
-+#define PCI_VENDOR_ID_MUTECH		0x1159
-+#define PCI_DEVICE_ID_MUTECH_MV1000	0x0001
-+
-+#define PCI_VENDOR_ID_XIRCOM		0x115d
-+#define PCI_DEVICE_ID_XIRCOM_X3201_ETH	0x0003
-+#define PCI_DEVICE_ID_XIRCOM_X3201_MDM	0x0103
-+
-+#define PCI_VENDOR_ID_RENDITION		0x1163
-+#define PCI_DEVICE_ID_RENDITION_VERITE	0x0001
-+#define PCI_DEVICE_ID_RENDITION_VERITE2100 0x2000
-+
-+#define PCI_VENDOR_ID_SERVERWORKS	  0x1166
-+#define PCI_DEVICE_ID_SERVERWORKS_HE	  0x0008
-+#define PCI_DEVICE_ID_SERVERWORKS_LE	  0x0009
-+#define PCI_DEVICE_ID_SERVERWORKS_CIOB30  0x0010
-+#define PCI_DEVICE_ID_SERVERWORKS_CMIC_HE 0x0011
-+#define PCI_DEVICE_ID_SERVERWORKS_OSB4	  0x0200
-+#define PCI_DEVICE_ID_SERVERWORKS_CSB5	  0x0201
-+#define PCI_DEVICE_ID_SERVERWORKS_OSB4IDE 0x0211
-+#define PCI_DEVICE_ID_SERVERWORKS_CSB5IDE 0x0212
-+#define PCI_DEVICE_ID_SERVERWORKS_OSB4USB 0x0220
-+#define PCI_DEVICE_ID_SERVERWORKS_CSB5USB PCI_DEVICE_ID_SERVERWORKS_OSB4USB
-+#define PCI_DEVICE_ID_SERVERWORKS_CSB5ISA 0x0230
-+
-+#define PCI_VENDOR_ID_SBE		0x1176
-+#define PCI_DEVICE_ID_SBE_WANXL100	0x0301
-+#define PCI_DEVICE_ID_SBE_WANXL200	0x0302
-+#define PCI_DEVICE_ID_SBE_WANXL400	0x0104
-+
-+#define PCI_VENDOR_ID_TOSHIBA		0x1179
-+#define PCI_DEVICE_ID_TOSHIBA_601	0x0601
-+#define PCI_DEVICE_ID_TOSHIBA_TOPIC95	0x060a
-+#define PCI_DEVICE_ID_TOSHIBA_TOPIC97	0x060f
-+
-+#define PCI_VENDOR_ID_RICOH		0x1180
-+#define PCI_DEVICE_ID_RICOH_RL5C465	0x0465
-+#define PCI_DEVICE_ID_RICOH_RL5C466	0x0466
-+#define PCI_DEVICE_ID_RICOH_RL5C475	0x0475
-+#define PCI_DEVICE_ID_RICOH_RL5C476	0x0476
-+#define PCI_DEVICE_ID_RICOH_RL5C478	0x0478
-+
-+#define	PCI_VENDOR_ID_DLINK		0x1186
-+#define	PCI_DEVICE_ID_DFE530TXP		0x1300
-+#define PCI_DEVICE_ID_DFE530TXS		0x1002
-+
-+#define PCI_VENDOR_ID_ARTOP		0x1191
-+#define PCI_DEVICE_ID_ARTOP_ATP8400	0x0004
-+#define PCI_DEVICE_ID_ARTOP_ATP850UF	0x0005
-+#define PCI_DEVICE_ID_ARTOP_ATP860	0x0006
-+#define PCI_DEVICE_ID_ARTOP_ATP860R	0x0007
-+#define PCI_DEVICE_ID_ARTOP_AEC7610	0x8002
-+#define PCI_DEVICE_ID_ARTOP_AEC7612UW	0x8010
-+#define PCI_DEVICE_ID_ARTOP_AEC7612U	0x8020
-+#define PCI_DEVICE_ID_ARTOP_AEC7612S	0x8030
-+#define PCI_DEVICE_ID_ARTOP_AEC7612D	0x8040
-+#define PCI_DEVICE_ID_ARTOP_AEC7612SUW	0x8050
-+#define PCI_DEVICE_ID_ARTOP_8060	0x8060
-+
-+#define PCI_VENDOR_ID_ZEITNET		0x1193
-+#define PCI_DEVICE_ID_ZEITNET_1221	0x0001
-+#define PCI_DEVICE_ID_ZEITNET_1225	0x0002
-+
-+#define PCI_VENDOR_ID_OMEGA		0x119b
-+#define PCI_DEVICE_ID_OMEGA_82C092G	0x1221
-+
-+#define PCI_VENDOR_ID_FUJITSU_ME	0x119e
-+#define PCI_DEVICE_ID_FUJITSU_FS155	0x0001
-+#define PCI_DEVICE_ID_FUJITSU_FS50	0x0003
-+
-+#define PCI_SUBVENDOR_ID_KEYSPAN	0x11a9
-+#define PCI_SUBDEVICE_ID_KEYSPAN_SX2	0x5334
-+
-+#define PCI_VENDOR_ID_GALILEO		0x11ab
-+#define PCI_DEVICE_ID_GALILEO_GT64011	0x4146
-+#define PCI_DEVICE_ID_GALILEO_GT64111	0x4146
-+#define PCI_DEVICE_ID_GALILEO_GT96100	0x9652
-+#define PCI_DEVICE_ID_GALILEO_GT96100A	0x9653
-+
-+#define PCI_VENDOR_ID_LINKSYS		0x11ad
-+#define PCI_VENDOR_ID_LITEON		0x11ad
-+#define PCI_DEVICE_ID_LITEON_LNE100TX	0x0002
-+#define PCI_DEVICE_ID_LC82C115		0xC115
-+
-+#define PCI_VENDOR_ID_V3		0x11b0
-+#define PCI_DEVICE_ID_V3_V960		0x0001
-+#define PCI_DEVICE_ID_V3_V350		0x0001
-+#define PCI_DEVICE_ID_V3_V961		0x0002
-+#define PCI_DEVICE_ID_V3_V351		0x0002
-+
-+#define PCI_VENDOR_ID_NP		0x11bc
-+#define PCI_DEVICE_ID_NP_PCI_FDDI	0x0001
-+
-+#define PCI_VENDOR_ID_ATT		0x11c1
-+#define PCI_DEVICE_ID_ATT_L56XMF	0x0440
-+#define PCI_DEVICE_ID_ATT_VENUS_MODEM	0x480
-+
-+#define PCI_VENDOR_ID_SPECIALIX		0x11cb
-+#define PCI_DEVICE_ID_SPECIALIX_IO8	0x2000
-+#define PCI_DEVICE_ID_SPECIALIX_XIO	0x4000
-+#define PCI_DEVICE_ID_SPECIALIX_RIO	0x8000
-+#define PCI_SUBDEVICE_ID_SPECIALIX_SPEED4 0xa004
-+
-+#define PCI_VENDOR_ID_AURAVISION	0x11d1
-+#define PCI_DEVICE_ID_AURAVISION_VXP524	0x01f7
-+
-+#define PCI_VENDOR_ID_ANALOG_DEVICES	0x11d4
-+#define PCI_DEVICE_ID_AD1889JS		0x1889
-+
-+#define PCI_VENDOR_ID_IKON		0x11d5
-+#define PCI_DEVICE_ID_IKON_10115	0x0115
-+#define PCI_DEVICE_ID_IKON_10117	0x0117
-+
-+#define PCI_VENDOR_ID_ZORAN		0x11de
-+#define PCI_DEVICE_ID_ZORAN_36057	0x6057
-+#define PCI_DEVICE_ID_ZORAN_36120	0x6120
-+
-+#define PCI_VENDOR_ID_KINETIC		0x11f4
-+#define PCI_DEVICE_ID_KINETIC_2915	0x2915
-+
-+#define PCI_VENDOR_ID_COMPEX		0x11f6
-+#define PCI_DEVICE_ID_COMPEX_ENET100VG4	0x0112
-+#define PCI_DEVICE_ID_COMPEX_RL2000	0x1401
-+#define PCI_DEVICE_ID_COMPEX_RL100ATX   0x2011
-+
-+#define PCI_VENDOR_ID_RP		0x11fe
-+#define PCI_DEVICE_ID_RP32INTF		0x0001
-+#define PCI_DEVICE_ID_RP8INTF		0x0002
-+#define PCI_DEVICE_ID_RP16INTF		0x0003
-+#define PCI_DEVICE_ID_RP4QUAD		0x0004
-+#define PCI_DEVICE_ID_RP8OCTA		0x0005
-+#define PCI_DEVICE_ID_RP8J		0x0006
-+#define PCI_DEVICE_ID_RPP4		0x000A
-+#define PCI_DEVICE_ID_RPP8		0x000B
-+#define PCI_DEVICE_ID_RP8M		0x000C
-+
-+#define PCI_VENDOR_ID_CYCLADES		0x120e
-+#define PCI_DEVICE_ID_CYCLOM_Y_Lo	0x0100
-+#define PCI_DEVICE_ID_CYCLOM_Y_Hi	0x0101
-+#define PCI_DEVICE_ID_CYCLOM_4Y_Lo	0x0102
-+#define PCI_DEVICE_ID_CYCLOM_4Y_Hi	0x0103
-+#define PCI_DEVICE_ID_CYCLOM_8Y_Lo	0x0104
-+#define PCI_DEVICE_ID_CYCLOM_8Y_Hi	0x0105
-+#define PCI_DEVICE_ID_CYCLOM_Z_Lo	0x0200
-+#define PCI_DEVICE_ID_CYCLOM_Z_Hi	0x0201
-+#define PCI_DEVICE_ID_PC300_RX_2	0x0300
-+#define PCI_DEVICE_ID_PC300_RX_1	0x0301
-+#define PCI_DEVICE_ID_PC300_TE_2	0x0310
-+#define PCI_DEVICE_ID_PC300_TE_1	0x0311
-+
-+#define PCI_VENDOR_ID_ESSENTIAL		0x120f
-+#define PCI_DEVICE_ID_ESSENTIAL_ROADRUNNER	0x0001
-+
-+#define PCI_VENDOR_ID_O2		0x1217
-+#define PCI_DEVICE_ID_O2_6729		0x6729
-+#define PCI_DEVICE_ID_O2_6730		0x673a
-+#define PCI_DEVICE_ID_O2_6832		0x6832
-+#define PCI_DEVICE_ID_O2_6836		0x6836
-+
-+#define PCI_VENDOR_ID_3DFX		0x121a
-+#define PCI_DEVICE_ID_3DFX_VOODOO	0x0001
-+#define PCI_DEVICE_ID_3DFX_VOODOO2	0x0002
-+#define PCI_DEVICE_ID_3DFX_BANSHEE	0x0003
-+#define PCI_DEVICE_ID_3DFX_VOODOO3	0x0005
-+
-+#define PCI_VENDOR_ID_SIGMADES		0x1236
-+#define PCI_DEVICE_ID_SIGMADES_6425	0x6401
-+
-+#define PCI_VENDOR_ID_CCUBE		0x123f
-+
-+#define PCI_VENDOR_ID_AVM		0x1244
-+#define PCI_DEVICE_ID_AVM_B1		0x0700
-+#define PCI_DEVICE_ID_AVM_C4		0x0800
-+#define PCI_DEVICE_ID_AVM_A1		0x0a00
-+#define PCI_DEVICE_ID_AVM_A1_V2		0x0e00
-+#define PCI_DEVICE_ID_AVM_C2		0x1100
-+#define PCI_DEVICE_ID_AVM_T1		0x1200
-+
-+#define PCI_VENDOR_ID_DIPIX		0x1246
-+
-+#define PCI_VENDOR_ID_STALLION		0x124d
-+#define PCI_DEVICE_ID_STALLION_ECHPCI832 0x0000
-+#define PCI_DEVICE_ID_STALLION_ECHPCI864 0x0002
-+#define PCI_DEVICE_ID_STALLION_EIOPCI	0x0003
-+
-+#define PCI_VENDOR_ID_OPTIBASE		0x1255
-+#define PCI_DEVICE_ID_OPTIBASE_FORGE	0x1110
-+#define PCI_DEVICE_ID_OPTIBASE_FUSION	0x1210
-+#define PCI_DEVICE_ID_OPTIBASE_VPLEX	0x2110
-+#define PCI_DEVICE_ID_OPTIBASE_VPLEXCC	0x2120
-+#define PCI_DEVICE_ID_OPTIBASE_VQUEST	0x2130
-+
-+#define PCI_VENDOR_ID_ESS		0x125d
-+#define PCI_DEVICE_ID_ESS_ESS1968	0x1968
-+#define PCI_DEVICE_ID_ESS_AUDIOPCI	0x1969
-+#define PCI_DEVICE_ID_ESS_ESS1978	0x1978
-+
-+#define PCI_VENDOR_ID_HARRIS        	0x1260
-+#define PCI_DEVICE_ID_HARRIS_PRISM2	0x3873
-+
-+#define PCI_VENDOR_ID_SATSAGEM		0x1267
-+#define PCI_DEVICE_ID_SATSAGEM_NICCY	0x1016
-+#define PCI_DEVICE_ID_SATSAGEM_PCR2101	0x5352
-+#define PCI_DEVICE_ID_SATSAGEM_TELSATTURBO 0x5a4b
-+
-+#define PCI_VENDOR_ID_HUGHES		0x1273
-+#define PCI_DEVICE_ID_HUGHES_DIRECPC	0x0002
-+
-+#define PCI_VENDOR_ID_ENSONIQ		0x1274
-+#define PCI_DEVICE_ID_ENSONIQ_CT5880	0x5880
-+#define PCI_DEVICE_ID_ENSONIQ_ES1370	0x5000
-+#define PCI_DEVICE_ID_ENSONIQ_ES1371	0x1371
-+
-+#define PCI_VENDOR_ID_ROCKWELL		0x127A
-+
-+#define PCI_VENDOR_ID_DAVICOM		0x1282
-+#define	PCI_DEVICE_ID_DM9009		0x9009
-+#define PCI_DEVICE_ID_DM9102		0x9102
-+
-+#define PCI_VENDOR_ID_ITE		0x1283
-+#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
-+#define PCI_DEVICE_ID_ITE_IT8172G	0x8172
-+#define PCI_DEVICE_ID_ITE_8872		0x8872
-+
-+
-+/* formerly Platform Tech */
-+#define PCI_VENDOR_ID_ESS_OLD		0x1285
-+#define PCI_DEVICE_ID_ESS_ESS0100	0x0100
-+
-+#define PCI_VENDOR_ID_ALTEON		0x12ae
-+#define PCI_DEVICE_ID_ALTEON_ACENIC	0x0001
-+
-+#define PCI_VENDOR_ID_USR		0x12B9
-+
-+#define	PCI_VENDOR_ID_HOLTEK		0x12c3
-+#define	PCI_DEVICE_ID_HOLTEK_HT80232	0x0058
-+
-+#define PCI_SUBVENDOR_ID_CONNECT_TECH			0x12c4
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_232		0x0001
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_232		0x0002
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_232		0x0003
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485		0x0004
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_4_4	0x0005
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485		0x0006
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH4_485_2_2	0x0007
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH2_485		0x0008
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH8_485_2_6	0x0009
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH081101V1	0x000A
-+#define PCI_SUBDEVICE_ID_CONNECT_TECH_BH041101V1	0x000B
-+
-+#define PCI_VENDOR_ID_PICTUREL		0x12c5
-+#define PCI_DEVICE_ID_PICTUREL_PCIVST	0x0081
-+
-+#define PCI_VENDOR_ID_NVIDIA_SGS	0x12d2
-+#define PCI_DEVICE_ID_NVIDIA_SGS_RIVA128 0x0018
-+
-+#define PCI_SUBVENDOR_ID_CHASE_PCIFAST		0x12E0
-+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST4		0x0031
-+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST8		0x0021
-+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16	0x0011
-+#define PCI_SUBDEVICE_ID_CHASE_PCIFAST16FMC	0x0041
-+#define PCI_SUBVENDOR_ID_CHASE_PCIRAS		0x124D
-+#define PCI_SUBDEVICE_ID_CHASE_PCIRAS4		0xF001
-+#define PCI_SUBDEVICE_ID_CHASE_PCIRAS8		0xF010
-+
-+#define PCI_VENDOR_ID_AUREAL		0x12eb
-+#define PCI_DEVICE_ID_AUREAL_VORTEX_1	0x0001
-+#define PCI_DEVICE_ID_AUREAL_VORTEX_2	0x0002
-+
-+#define PCI_VENDOR_ID_CBOARDS		0x1307
-+#define PCI_DEVICE_ID_CBOARDS_DAS1602_16 0x0001
-+
-+#define PCI_VENDOR_ID_SIIG		0x131f
-+#define PCI_DEVICE_ID_SIIG_1S_10x_550	0x1000
-+#define PCI_DEVICE_ID_SIIG_1S_10x_650	0x1001
-+#define PCI_DEVICE_ID_SIIG_1S_10x_850	0x1002
-+#define PCI_DEVICE_ID_SIIG_1S1P_10x_550	0x1010
-+#define PCI_DEVICE_ID_SIIG_1S1P_10x_650	0x1011
-+#define PCI_DEVICE_ID_SIIG_1S1P_10x_850	0x1012
-+#define PCI_DEVICE_ID_SIIG_1P_10x	0x1020
-+#define PCI_DEVICE_ID_SIIG_2P_10x	0x1021
-+#define PCI_DEVICE_ID_SIIG_2S_10x_550	0x1030
-+#define PCI_DEVICE_ID_SIIG_2S_10x_650	0x1031
-+#define PCI_DEVICE_ID_SIIG_2S_10x_850	0x1032
-+#define PCI_DEVICE_ID_SIIG_2S1P_10x_550	0x1034
-+#define PCI_DEVICE_ID_SIIG_2S1P_10x_650	0x1035
-+#define PCI_DEVICE_ID_SIIG_2S1P_10x_850	0x1036
-+#define PCI_DEVICE_ID_SIIG_4S_10x_550	0x1050
-+#define PCI_DEVICE_ID_SIIG_4S_10x_650	0x1051
-+#define PCI_DEVICE_ID_SIIG_4S_10x_850	0x1052
-+#define PCI_DEVICE_ID_SIIG_1S_20x_550	0x2000
-+#define PCI_DEVICE_ID_SIIG_1S_20x_650	0x2001
-+#define PCI_DEVICE_ID_SIIG_1S_20x_850	0x2002
-+#define PCI_DEVICE_ID_SIIG_1P_20x	0x2020
-+#define PCI_DEVICE_ID_SIIG_2P_20x	0x2021
-+#define PCI_DEVICE_ID_SIIG_2S_20x_550	0x2030
-+#define PCI_DEVICE_ID_SIIG_2S_20x_650	0x2031
-+#define PCI_DEVICE_ID_SIIG_2S_20x_850	0x2032
-+#define PCI_DEVICE_ID_SIIG_2P1S_20x_550	0x2040
-+#define PCI_DEVICE_ID_SIIG_2P1S_20x_650	0x2041
-+#define PCI_DEVICE_ID_SIIG_2P1S_20x_850	0x2042
-+#define PCI_DEVICE_ID_SIIG_1S1P_20x_550	0x2010
-+#define PCI_DEVICE_ID_SIIG_1S1P_20x_650	0x2011
-+#define PCI_DEVICE_ID_SIIG_1S1P_20x_850	0x2012
-+#define PCI_DEVICE_ID_SIIG_4S_20x_550	0x2050
-+#define PCI_DEVICE_ID_SIIG_4S_20x_650	0x2051
-+#define PCI_DEVICE_ID_SIIG_4S_20x_850	0x2052
-+#define PCI_DEVICE_ID_SIIG_2S1P_20x_550	0x2060
-+#define PCI_DEVICE_ID_SIIG_2S1P_20x_650	0x2061
-+#define PCI_DEVICE_ID_SIIG_2S1P_20x_850	0x2062
-+
-+#define PCI_VENDOR_ID_ADMTEK            0x1317
-+#define PCI_DEVICE_ID_ADMTEK_0985       0x0985
-+
-+#define PCI_VENDOR_ID_DOMEX		0x134a
-+#define PCI_DEVICE_ID_DOMEX_DMX3191D	0x0001
-+
-+#define PCI_VENDOR_ID_QUATECH		0x135C
-+#define PCI_DEVICE_ID_QUATECH_QSC100	0x0010
-+#define PCI_DEVICE_ID_QUATECH_DSC100	0x0020
-+#define PCI_DEVICE_ID_QUATECH_DSC200	0x0030
-+#define PCI_DEVICE_ID_QUATECH_QSC200	0x0040
-+#define PCI_DEVICE_ID_QUATECH_ESC100D	0x0050
-+#define PCI_DEVICE_ID_QUATECH_ESC100M	0x0060
-+
-+#define PCI_VENDOR_ID_SEALEVEL		0x135e
-+#define PCI_DEVICE_ID_SEALEVEL_U530	0x7101
-+#define PCI_DEVICE_ID_SEALEVEL_UCOMM2	0x7201
-+#define PCI_DEVICE_ID_SEALEVEL_UCOMM422	0x7402
-+#define PCI_DEVICE_ID_SEALEVEL_UCOMM232	0x7202
-+#define PCI_DEVICE_ID_SEALEVEL_COMM4	0x7401
-+#define PCI_DEVICE_ID_SEALEVEL_COMM8	0x7801
-+
-+#define PCI_VENDOR_ID_HYPERCOPE		0x1365
-+#define PCI_DEVICE_ID_HYPERCOPE_PLX	0x9050
-+#define PCI_SUBDEVICE_ID_HYPERCOPE_OLD_ERGO	0x0104
-+#define PCI_SUBDEVICE_ID_HYPERCOPE_ERGO		0x0106
-+#define PCI_SUBDEVICE_ID_HYPERCOPE_METRO	0x0107
-+#define PCI_SUBDEVICE_ID_HYPERCOPE_CHAMP2	0x0108
-+#define PCI_SUBDEVICE_ID_HYPERCOPE_PLEXUS	0x0109
-+
-+#define PCI_VENDOR_ID_KAWASAKI		0x136b
-+#define PCI_DEVICE_ID_MCHIP_KL5A72002	0xff01
-+
-+#define PCI_VENDOR_ID_LMC		0x1376
-+#define PCI_DEVICE_ID_LMC_HSSI		0x0003
-+#define PCI_DEVICE_ID_LMC_DS3		0x0004
-+#define PCI_DEVICE_ID_LMC_SSI		0x0005
-+#define PCI_DEVICE_ID_LMC_T1		0x0006
-+
-+#define PCI_VENDOR_ID_NETGEAR		0x1385
-+#define PCI_DEVICE_ID_NETGEAR_MA301	0x4100
-+#define PCI_DEVICE_ID_NETGEAR_GA620	0x620a
-+#define PCI_DEVICE_ID_NETGEAR_GA622	0x622a
-+
-+#define PCI_VENDOR_ID_APPLICOM		0x1389
-+#define PCI_DEVICE_ID_APPLICOM_PCIGENERIC 0x0001
-+#define PCI_DEVICE_ID_APPLICOM_PCI2000IBS_CAN 0x0002
-+#define PCI_DEVICE_ID_APPLICOM_PCI2000PFB 0x0003
-+
-+#define PCI_VENDOR_ID_MOXA		0x1393
-+#define PCI_DEVICE_ID_MOXA_C104		0x1040
-+#define PCI_DEVICE_ID_MOXA_C168		0x1680
-+#define PCI_DEVICE_ID_MOXA_CP204J	0x2040
-+#define PCI_DEVICE_ID_MOXA_C218		0x2180
-+#define PCI_DEVICE_ID_MOXA_C320		0x3200
-+
-+#define PCI_VENDOR_ID_CCD		0x1397
-+#define PCI_DEVICE_ID_CCD_2BD0		0x2bd0
-+#define PCI_DEVICE_ID_CCD_B000		0xb000
-+#define PCI_DEVICE_ID_CCD_B006		0xb006
-+#define PCI_DEVICE_ID_CCD_B007		0xb007
-+#define PCI_DEVICE_ID_CCD_B008		0xb008
-+#define PCI_DEVICE_ID_CCD_B009		0xb009
-+#define PCI_DEVICE_ID_CCD_B00A		0xb00a
-+#define PCI_DEVICE_ID_CCD_B00B		0xb00b
-+#define PCI_DEVICE_ID_CCD_B00C		0xb00c
-+#define PCI_DEVICE_ID_CCD_B100		0xb100
-+
-+#define PCI_VENDOR_ID_MICROGATE		0x13c0
-+#define PCI_DEVICE_ID_MICROGATE_USC	0x0010
-+#define PCI_DEVICE_ID_MICROGATE_SCC	0x0020
-+#define PCI_DEVICE_ID_MICROGATE_SCA	0x0030
-+
-+#define PCI_VENDOR_ID_3WARE		0x13C1
-+#define PCI_DEVICE_ID_3WARE_1000	0x1000
-+
-+#define PCI_VENDOR_ID_ABOCOM		0x13D1
-+#define PCI_DEVICE_ID_ABOCOM_2BD1       0x2BD1
-+
-+#define PCI_VENDOR_ID_CMEDIA		0x13f6
-+#define PCI_DEVICE_ID_CMEDIA_CM8338A	0x0100
-+#define PCI_DEVICE_ID_CMEDIA_CM8338B	0x0101
-+#define PCI_DEVICE_ID_CMEDIA_CM8738	0x0111
-+#define PCI_DEVICE_ID_CMEDIA_CM8738B	0x0112
-+
-+#define PCI_VENDOR_ID_LAVA		0x1407
-+#define PCI_DEVICE_ID_LAVA_DSERIAL	0x0100 /* 2x 16550 */
-+#define PCI_DEVICE_ID_LAVA_QUATRO_A	0x0101 /* 2x 16550, half of 4 port */
-+#define PCI_DEVICE_ID_LAVA_QUATRO_B	0x0102 /* 2x 16550, half of 4 port */
-+#define PCI_DEVICE_ID_LAVA_PORT_PLUS	0x0200 /* 2x 16650 */
-+#define PCI_DEVICE_ID_LAVA_QUAD_A	0x0201 /* 2x 16650, half of 4 port */
-+#define PCI_DEVICE_ID_LAVA_QUAD_B	0x0202 /* 2x 16650, half of 4 port */
-+#define PCI_DEVICE_ID_LAVA_SSERIAL	0x0500 /* 1x 16550 */
-+#define PCI_DEVICE_ID_LAVA_PORT_650	0x0600 /* 1x 16650 */
-+#define PCI_DEVICE_ID_LAVA_PARALLEL	0x8000
-+#define PCI_DEVICE_ID_LAVA_DUAL_PAR_A	0x8002 /* The Lava Dual Parallel is */
-+#define PCI_DEVICE_ID_LAVA_DUAL_PAR_B	0x8003 /* two PCI devices on a card */
-+#define PCI_DEVICE_ID_LAVA_BOCA_IOPPAR	0x8800
-+
-+#define PCI_VENDOR_ID_TIMEDIA		0x1409
-+#define PCI_DEVICE_ID_TIMEDIA_1889	0x7168
-+
-+#define PCI_VENDOR_ID_OXSEMI		0x1415
-+#define PCI_DEVICE_ID_OXSEMI_12PCI840	0x8403
-+#define PCI_DEVICE_ID_OXSEMI_16PCI954	0x9501
-+#define PCI_DEVICE_ID_OXSEMI_16PCI952	0x950A
-+#define PCI_DEVICE_ID_OXSEMI_16PCI95N	0x9511
-+#define PCI_DEVICE_ID_OXSEMI_16PCI954PP	0x9513
-+
-+#define PCI_VENDOR_ID_AIRONET		0x14b9
-+#define PCI_DEVICE_ID_AIRONET_4800_1	0x0001
-+#define PCI_DEVICE_ID_AIRONET_4800	0x4500 // values switched?  see
-+#define PCI_DEVICE_ID_AIRONET_4500	0x4800 // drivers/net/aironet4500_card.c
-+
-+#define PCI_VENDOR_ID_TITAN		0x14D2
-+#define PCI_DEVICE_ID_TITAN_010L	0x8001
-+#define PCI_DEVICE_ID_TITAN_100L	0x8010
-+#define PCI_DEVICE_ID_TITAN_110L	0x8011
-+#define PCI_DEVICE_ID_TITAN_200L	0x8020
-+#define PCI_DEVICE_ID_TITAN_210L	0x8021
-+#define PCI_DEVICE_ID_TITAN_400L	0x8040
-+#define PCI_DEVICE_ID_TITAN_800L	0x8080
-+#define PCI_DEVICE_ID_TITAN_100		0xA001
-+#define PCI_DEVICE_ID_TITAN_200		0xA005
-+#define PCI_DEVICE_ID_TITAN_400		0xA003
-+#define PCI_DEVICE_ID_TITAN_800B	0xA004
-+
-+#define PCI_VENDOR_ID_PANACOM		0x14d4
-+#define PCI_DEVICE_ID_PANACOM_QUADMODEM	0x0400
-+#define PCI_DEVICE_ID_PANACOM_DUALMODEM	0x0402
-+
-+#define PCI_VENDOR_ID_BROADCOM		0x14e4
-+#define PCI_DEVICE_ID_TIGON3_5700	0x1644
-+#define PCI_DEVICE_ID_TIGON3_5701	0x1645
-+#define PCI_DEVICE_ID_TIGON3_5702	0x1646
-+#define PCI_DEVICE_ID_TIGON3_5703	0x1647
-+#define PCI_DEVICE_ID_TIGON3_5704	0x1648
-+#define PCI_DEVICE_ID_TIGON3_5702FE	0x164d
-+#define PCI_DEVICE_ID_TIGON3_5705	0x1653
-+#define PCI_DEVICE_ID_TIGON3_5705_2	0x1654
-+#define PCI_DEVICE_ID_TIGON3_5705M	0x165d
-+#define PCI_DEVICE_ID_TIGON3_5705M_2	0x165e
-+#define PCI_DEVICE_ID_TIGON3_5782	0x1696
-+#define PCI_DEVICE_ID_TIGON3_5788	0x169c
-+#define PCI_DEVICE_ID_TIGON3_5702X	0x16a6
-+#define PCI_DEVICE_ID_TIGON3_5703X	0x16a7
-+#define PCI_DEVICE_ID_TIGON3_5704S	0x16a8
-+#define PCI_DEVICE_ID_TIGON3_5702A3	0x16c6
-+#define PCI_DEVICE_ID_TIGON3_5703A3	0x16c7
-+#define PCI_DEVICE_ID_TIGON3_5901	0x170d
-+#define PCI_DEVICE_ID_TIGON3_5901_2	0x170e
-+
-+#define PCI_VENDOR_ID_SYBA		0x1592
-+#define PCI_DEVICE_ID_SYBA_2P_EPP	0x0782
-+#define PCI_DEVICE_ID_SYBA_1P_ECP	0x0783
-+
-+#define PCI_VENDOR_ID_MORETON		0x15aa
-+#define PCI_DEVICE_ID_RASTEL_2PORT	0x2000
-+
-+#define PCI_VENDOR_ID_ZOLTRIX		0x15b0
-+#define PCI_DEVICE_ID_ZOLTRIX_2BD0	0x2bd0 
-+
-+#define PCI_VENDOR_ID_PDC		0x15e9
-+#define PCI_DEVICE_ID_PDC_1841		0x1841
-+
-+#define PCI_VENDOR_ID_SYMPHONY		0x1c1c
-+#define PCI_DEVICE_ID_SYMPHONY_101	0x0001
-+
-+#define PCI_VENDOR_ID_TEKRAM		0x1de1
-+#define PCI_DEVICE_ID_TEKRAM_DC290	0xdc29
-+
-+#define PCI_VENDOR_ID_3DLABS		0x3d3d
-+#define PCI_DEVICE_ID_3DLABS_300SX	0x0001
-+#define PCI_DEVICE_ID_3DLABS_500TX	0x0002
-+#define PCI_DEVICE_ID_3DLABS_DELTA	0x0003
-+#define PCI_DEVICE_ID_3DLABS_PERMEDIA	0x0004
-+#define PCI_DEVICE_ID_3DLABS_MX		0x0006
-+#define PCI_DEVICE_ID_3DLABS_PERMEDIA2	0x0007
-+#define PCI_DEVICE_ID_3DLABS_GAMMA	0x0008
-+#define PCI_DEVICE_ID_3DLABS_PERMEDIA2V	0x0009
-+
-+#define PCI_VENDOR_ID_AVANCE		0x4005
-+#define PCI_DEVICE_ID_AVANCE_ALG2064	0x2064
-+#define PCI_DEVICE_ID_AVANCE_2302	0x2302
-+
-+#define PCI_VENDOR_ID_AKS		0x416c
-+#define PCI_DEVICE_ID_AKS_ALADDINCARD	0x0100
-+#define PCI_DEVICE_ID_AKS_CPC		0x0200
-+
-+#define PCI_VENDOR_ID_NETVIN		0x4a14
-+#define PCI_DEVICE_ID_NETVIN_NV5000SC	0x5000
-+
-+#define PCI_VENDOR_ID_S3		0x5333
-+#define PCI_DEVICE_ID_S3_PLATO_PXS	0x0551
-+#define PCI_DEVICE_ID_S3_ViRGE		0x5631
-+#define PCI_DEVICE_ID_S3_TRIO		0x8811
-+#define PCI_DEVICE_ID_S3_AURORA64VP	0x8812
-+#define PCI_DEVICE_ID_S3_TRIO64UVP	0x8814
-+#define PCI_DEVICE_ID_S3_ViRGE_VX	0x883d
-+#define PCI_DEVICE_ID_S3_868		0x8880
-+#define PCI_DEVICE_ID_S3_928		0x88b0
-+#define PCI_DEVICE_ID_S3_864_1		0x88c0
-+#define PCI_DEVICE_ID_S3_864_2		0x88c1
-+#define PCI_DEVICE_ID_S3_964_1		0x88d0
-+#define PCI_DEVICE_ID_S3_964_2		0x88d1
-+#define PCI_DEVICE_ID_S3_968		0x88f0
-+#define PCI_DEVICE_ID_S3_TRIO64V2	0x8901
-+#define PCI_DEVICE_ID_S3_PLATO_PXG	0x8902
-+#define PCI_DEVICE_ID_S3_ViRGE_DXGX	0x8a01
-+#define PCI_DEVICE_ID_S3_ViRGE_GX2	0x8a10
-+#define PCI_DEVICE_ID_S3_ViRGE_MX	0x8c01
-+#define PCI_DEVICE_ID_S3_ViRGE_MXP	0x8c02
-+#define PCI_DEVICE_ID_S3_ViRGE_MXPMV	0x8c03
-+#define PCI_DEVICE_ID_S3_SONICVIBES	0xca00
-+
-+#define PCI_VENDOR_ID_DCI		0x6666
-+#define PCI_DEVICE_ID_DCI_PCCOM4	0x0001
-+#define PCI_DEVICE_ID_DCI_PCCOM8	0x0002
-+
-+#define PCI_VENDOR_ID_GENROCO		0x5555
-+#define PCI_DEVICE_ID_GENROCO_HFP832	0x0003
-+
-+#define PCI_VENDOR_ID_INTEL		0x8086
-+#define PCI_DEVICE_ID_INTEL_21145	0x0039
-+#define PCI_DEVICE_ID_INTEL_82375	0x0482
-+#define PCI_DEVICE_ID_INTEL_82424	0x0483
-+#define PCI_DEVICE_ID_INTEL_82378	0x0484
-+#define PCI_DEVICE_ID_INTEL_82430	0x0486
-+#define PCI_DEVICE_ID_INTEL_82434	0x04a3
-+#define PCI_DEVICE_ID_INTEL_I960	0x0960
-+#define PCI_DEVICE_ID_INTEL_82542       	0x1000
-+#define PCI_DEVICE_ID_INTEL_82543GC_FIBER  	0x1001
-+#define PCI_DEVICE_ID_INTEL_82543GC_COPPER 	0x1004
-+#define PCI_DEVICE_ID_INTEL_82544EI_COPPER 	0x1008
-+#define PCI_DEVICE_ID_INTEL_82544EI_FIBER 	0x1009
-+#define PCI_DEVICE_ID_INTEL_82544GC_COPPER 	0x100C
-+#define PCI_DEVICE_ID_INTEL_82544GC_LOM   	0x100D
-+#define PCI_DEVICE_ID_INTEL_82540EM		0x100E
-+#define PCI_DEVICE_ID_INTEL_82545EM_COPPER	0x100F
-+#define PCI_DEVICE_ID_INTEL_82546EB_COPPER	0x1010
-+#define PCI_DEVICE_ID_INTEL_82545EM_FIBER	0x1011
-+#define PCI_DEVICE_ID_INTEL_82546EB_FIBER	0x1012
-+#define PCI_DEVICE_ID_INTEL_82540EM_LOM		0x1015
-+#define PCI_DEVICE_ID_INTEL_ID1029	0x1029
-+#define PCI_DEVICE_ID_INTEL_ID1030	0x1030
-+#define PCI_DEVICE_ID_INTEL_ID1031	0x1031
-+#define PCI_DEVICE_ID_INTEL_ID1038	0x1038
-+#define PCI_DEVICE_ID_INTEL_ID1039	0x1039
-+#define PCI_DEVICE_ID_INTEL_ID103A	0x103A
-+#define PCI_DEVICE_ID_INTEL_82562ET	0x1031
-+#define PCI_DEVICE_ID_INTEL_82559ER	0x1209
-+#define PCI_DEVICE_ID_INTEL_82092AA_0	0x1221
-+#define PCI_DEVICE_ID_INTEL_82092AA_1	0x1222
-+#define PCI_DEVICE_ID_INTEL_7116	0x1223
-+#define PCI_DEVICE_ID_INTEL_82596	0x1226
-+#define PCI_DEVICE_ID_INTEL_82865	0x1227
-+#define PCI_DEVICE_ID_INTEL_82557	0x1229
-+#define PCI_DEVICE_ID_INTEL_82437	0x122d
-+#define PCI_DEVICE_ID_INTEL_82371FB_0	0x122e
-+#define PCI_DEVICE_ID_INTEL_82371FB_1	0x1230
-+#define PCI_DEVICE_ID_INTEL_82371MX	0x1234
-+#define PCI_DEVICE_ID_INTEL_82437MX	0x1235
-+#define PCI_DEVICE_ID_INTEL_82441	0x1237
-+#define PCI_DEVICE_ID_INTEL_82380FB	0x124b
-+#define PCI_DEVICE_ID_INTEL_82439	0x1250
-+#define PCI_DEVICE_ID_INTEL_80960_RP	0x1960
-+#define PCI_DEVICE_ID_INTEL_82801AA_0	0x2410
-+#define PCI_DEVICE_ID_INTEL_82801AA_1	0x2411
-+#define PCI_DEVICE_ID_INTEL_82801AA_2	0x2412
-+#define PCI_DEVICE_ID_INTEL_82801AA_3	0x2413
-+#define PCI_DEVICE_ID_INTEL_82801AA_5	0x2415
-+#define PCI_DEVICE_ID_INTEL_82801AA_6	0x2416
-+#define PCI_DEVICE_ID_INTEL_82801AA_8	0x2418
-+#define PCI_DEVICE_ID_INTEL_82801AB_0	0x2420
-+#define PCI_DEVICE_ID_INTEL_82801AB_1	0x2421
-+#define PCI_DEVICE_ID_INTEL_82801AB_2	0x2422
-+#define PCI_DEVICE_ID_INTEL_82801AB_3	0x2423
-+#define PCI_DEVICE_ID_INTEL_82801AB_5	0x2425
-+#define PCI_DEVICE_ID_INTEL_82801AB_6	0x2426
-+#define PCI_DEVICE_ID_INTEL_82801AB_8	0x2428
-+#define PCI_DEVICE_ID_INTEL_82801BA_0	0x2440
-+#define PCI_DEVICE_ID_INTEL_82801BA_1	0x2442
-+#define PCI_DEVICE_ID_INTEL_82801BA_2	0x2443
-+#define PCI_DEVICE_ID_INTEL_82801BA_3	0x2444
-+#define PCI_DEVICE_ID_INTEL_82801BA_4	0x2445
-+#define PCI_DEVICE_ID_INTEL_82801BA_5	0x2446
-+#define PCI_DEVICE_ID_INTEL_82801BA_6	0x2448
-+#define PCI_DEVICE_ID_INTEL_82801BA_7	0x2449
-+#define PCI_DEVICE_ID_INTEL_82562	0x2449
-+#define PCI_DEVICE_ID_INTEL_82801BA_8	0x244a
-+#define PCI_DEVICE_ID_INTEL_82801BA_9	0x244b
-+#define PCI_DEVICE_ID_INTEL_82801BA_10	0x244c
-+#define PCI_DEVICE_ID_INTEL_82801BA_11	0x244e
-+#define PCI_DEVICE_ID_INTEL_82801CA_0	0x2480
-+#define PCI_DEVICE_ID_INTEL_82801CA_2	0x2482
-+#define PCI_DEVICE_ID_INTEL_82801CA_3	0x2483
-+#define PCI_DEVICE_ID_INTEL_82801CA_4	0x2484
-+#define PCI_DEVICE_ID_INTEL_82801CA_5	0x2485
-+#define PCI_DEVICE_ID_INTEL_82801CA_6	0x2486
-+#define PCI_DEVICE_ID_INTEL_82801CA_7	0x2487
-+#define PCI_DEVICE_ID_INTEL_82801CA_10	0x248a
-+#define PCI_DEVICE_ID_INTEL_82801CA_11	0x248b
-+#define PCI_DEVICE_ID_INTEL_82801CA_12	0x248c
-+#define PCI_DEVICE_ID_INTEL_80310	0x530d
-+#define PCI_DEVICE_ID_INTEL_82371SB_0	0x7000
-+#define PCI_DEVICE_ID_INTEL_82371SB_1	0x7010
-+#define PCI_DEVICE_ID_INTEL_82371SB_2	0x7020
-+#define PCI_DEVICE_ID_INTEL_82437VX	0x7030
-+#define PCI_DEVICE_ID_INTEL_82439TX	0x7100
-+#define PCI_DEVICE_ID_INTEL_82371AB_0	0x7110
-+#define PCI_DEVICE_ID_INTEL_82371AB	0x7111
-+#define PCI_DEVICE_ID_INTEL_82371AB_2	0x7112
-+#define PCI_DEVICE_ID_INTEL_82371AB_3	0x7113
-+#define PCI_DEVICE_ID_INTEL_82810_MC1	0x7120
-+#define PCI_DEVICE_ID_INTEL_82810_IG1	0x7121
-+#define PCI_DEVICE_ID_INTEL_82810_MC3	0x7122
-+#define PCI_DEVICE_ID_INTEL_82810_IG3	0x7123
-+#define PCI_DEVICE_ID_INTEL_82443LX_0	0x7180
-+#define PCI_DEVICE_ID_INTEL_82443LX_1	0x7181
-+#define PCI_DEVICE_ID_INTEL_82443BX_0	0x7190
-+#define PCI_DEVICE_ID_INTEL_82443BX_1	0x7191
-+#define PCI_DEVICE_ID_INTEL_82443BX_2	0x7192
-+#define PCI_DEVICE_ID_INTEL_82443MX_0	0x7198
-+#define PCI_DEVICE_ID_INTEL_82443MX_1	0x7199
-+#define PCI_DEVICE_ID_INTEL_82443MX_2	0x719a
-+#define PCI_DEVICE_ID_INTEL_82443MX_3	0x719b
-+#define PCI_DEVICE_ID_INTEL_82372FB_0	0x7600
-+#define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
-+#define PCI_DEVICE_ID_INTEL_82372FB_2	0x7602
-+#define PCI_DEVICE_ID_INTEL_82372FB_3	0x7603
-+#define PCI_DEVICE_ID_INTEL_82454GX	0x84c4
-+#define PCI_DEVICE_ID_INTEL_82450GX	0x84c5
-+#define PCI_DEVICE_ID_INTEL_82451NX	0x84ca
-+
-+#define PCI_VENDOR_ID_COMPUTONE		0x8e0e
-+#define PCI_DEVICE_ID_COMPUTONE_IP2EX	0x0291
-+#define PCI_DEVICE_ID_COMPUTONE_PG	0x0302
-+#define PCI_SUBVENDOR_ID_COMPUTONE	0x8e0e
-+#define PCI_SUBDEVICE_ID_COMPUTONE_PG4	0x0001
-+#define PCI_SUBDEVICE_ID_COMPUTONE_PG8	0x0002
-+#define PCI_SUBDEVICE_ID_COMPUTONE_PG6	0x0003
-+
-+#define PCI_VENDOR_ID_KTI		0x8e2e
-+#define PCI_DEVICE_ID_KTI_ET32P2	0x3000
-+
-+#define PCI_VENDOR_ID_ADAPTEC		0x9004
-+#define PCI_DEVICE_ID_ADAPTEC_7810	0x1078
-+#define PCI_DEVICE_ID_ADAPTEC_7821	0x2178
-+#define PCI_DEVICE_ID_ADAPTEC_38602	0x3860
-+#define PCI_DEVICE_ID_ADAPTEC_7850	0x5078
-+#define PCI_DEVICE_ID_ADAPTEC_7855	0x5578
-+#define PCI_DEVICE_ID_ADAPTEC_5800	0x5800
-+#define PCI_DEVICE_ID_ADAPTEC_3860	0x6038
-+#define PCI_DEVICE_ID_ADAPTEC_1480A	0x6075
-+#define PCI_DEVICE_ID_ADAPTEC_7860	0x6078
-+#define PCI_DEVICE_ID_ADAPTEC_7861	0x6178
-+#define PCI_DEVICE_ID_ADAPTEC_7870	0x7078
-+#define PCI_DEVICE_ID_ADAPTEC_7871	0x7178
-+#define PCI_DEVICE_ID_ADAPTEC_7872	0x7278
-+#define PCI_DEVICE_ID_ADAPTEC_7873	0x7378
-+#define PCI_DEVICE_ID_ADAPTEC_7874	0x7478
-+#define PCI_DEVICE_ID_ADAPTEC_7895	0x7895
-+#define PCI_DEVICE_ID_ADAPTEC_7880	0x8078
-+#define PCI_DEVICE_ID_ADAPTEC_7881	0x8178
-+#define PCI_DEVICE_ID_ADAPTEC_7882	0x8278
-+#define PCI_DEVICE_ID_ADAPTEC_7883	0x8378
-+#define PCI_DEVICE_ID_ADAPTEC_7884	0x8478
-+#define PCI_DEVICE_ID_ADAPTEC_7885	0x8578
-+#define PCI_DEVICE_ID_ADAPTEC_7886	0x8678
-+#define PCI_DEVICE_ID_ADAPTEC_7887	0x8778
-+#define PCI_DEVICE_ID_ADAPTEC_7888	0x8878
-+#define PCI_DEVICE_ID_ADAPTEC_1030	0x8b78
-+
-+#define PCI_VENDOR_ID_ADAPTEC2		0x9005
-+#define PCI_DEVICE_ID_ADAPTEC2_2940U2	0x0010
-+#define PCI_DEVICE_ID_ADAPTEC2_2930U2	0x0011
-+#define PCI_DEVICE_ID_ADAPTEC2_7890B	0x0013
-+#define PCI_DEVICE_ID_ADAPTEC2_7890	0x001f
-+#define PCI_DEVICE_ID_ADAPTEC2_3940U2	0x0050
-+#define PCI_DEVICE_ID_ADAPTEC2_3950U2D	0x0051
-+#define PCI_DEVICE_ID_ADAPTEC2_7896	0x005f
-+#define PCI_DEVICE_ID_ADAPTEC2_7892A	0x0080
-+#define PCI_DEVICE_ID_ADAPTEC2_7892B	0x0081
-+#define PCI_DEVICE_ID_ADAPTEC2_7892D	0x0083
-+#define PCI_DEVICE_ID_ADAPTEC2_7892P	0x008f
-+#define PCI_DEVICE_ID_ADAPTEC2_7899A	0x00c0
-+#define PCI_DEVICE_ID_ADAPTEC2_7899B	0x00c1
-+#define PCI_DEVICE_ID_ADAPTEC2_7899D	0x00c3
-+#define PCI_DEVICE_ID_ADAPTEC2_7899P	0x00cf
-+
-+#define PCI_VENDOR_ID_ATRONICS		0x907f
-+#define PCI_DEVICE_ID_ATRONICS_2015	0x2015
-+
-+#define PCI_VENDOR_ID_HOLTEK2		0x9412
-+#define PCI_DEVICE_ID_HOLTEK2_6565	0x6565
-+
-+#define PCI_VENDOR_ID_NETMOS		0x9710
-+#define PCI_DEVICE_ID_NETMOS_9735	0x9735
-+#define PCI_DEVICE_ID_NETMOS_9835	0x9835
-+
-+#define PCI_SUBVENDOR_ID_EXSYS		0xd84d
-+#define PCI_SUBDEVICE_ID_EXSYS_4014	0x4014
-+
-+#define PCI_VENDOR_ID_TIGERJET		0xe159
-+#define PCI_DEVICE_ID_TIGERJET_300	0x0001
-+#define PCI_DEVICE_ID_TIGERJET_100	0x0002
-+
-+#define PCI_VENDOR_ID_ARK		0xedd8
-+#define PCI_DEVICE_ID_ARK_STING		0xa091
-+#define PCI_DEVICE_ID_ARK_STINGARK	0xa099
-+#define PCI_DEVICE_ID_ARK_2000MT	0xa0a1
-+
-Index: b/netboot/pci_io.c
-===================================================================
---- /dev/null
-+++ b/netboot/pci_io.c
-@@ -0,0 +1,431 @@
-+/*
-+** Support for NE2000 PCI clones added David Monro June 1997
-+** Generalised to other NICs by Ken Yap July 1997
-+**
-+** Most of this is taken from:
-+**
-+** /usr/src/linux/drivers/pci/pci.c
-+** /usr/src/linux/include/linux/pci.h
-+** /usr/src/linux/arch/i386/bios32.c
-+** /usr/src/linux/include/linux/bios32.h
-+** /usr/src/linux/drivers/net/ne.c
-+*/
-+#define PCBIOS
-+#include "grub.h"
-+#include "pci.h"
-+
-+#ifdef	CONFIG_PCI_DIRECT
-+#define  PCIBIOS_SUCCESSFUL                0x00
-+
-+#define DEBUG 0
-+
-+/*
-+ * Functions for accessing PCI configuration space with type 1 accesses
-+ */
-+
-+#define CONFIG_CMD(bus, device_fn, where)   (0x80000000 | (bus << 16) | (device_fn << 8) | (where & ~3))
-+
-+int pcibios_read_config_byte(unsigned int bus, unsigned int device_fn,
-+			       unsigned int where, uint8_t *value)
-+{
-+    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
-+    *value = inb(0xCFC + (where&3));
-+    return PCIBIOS_SUCCESSFUL;
-+}
-+
-+int pcibios_read_config_word (unsigned int bus,
-+    unsigned int device_fn, unsigned int where, uint16_t *value)
-+{
-+    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
-+    *value = inw(0xCFC + (where&2));
-+    return PCIBIOS_SUCCESSFUL;
-+}
-+
-+int pcibios_read_config_dword (unsigned int bus, unsigned int device_fn,
-+				 unsigned int where, uint32_t *value)
-+{
-+    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
-+    *value = inl(0xCFC);
-+    return PCIBIOS_SUCCESSFUL;
-+}
-+
-+int pcibios_write_config_byte (unsigned int bus, unsigned int device_fn,
-+				 unsigned int where, uint8_t value)
-+{
-+    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
-+    outb(value, 0xCFC + (where&3));
-+    return PCIBIOS_SUCCESSFUL;
-+}
-+
-+int pcibios_write_config_word (unsigned int bus, unsigned int device_fn,
-+				 unsigned int where, uint16_t value)
-+{
-+    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
-+    outw(value, 0xCFC + (where&2));
-+    return PCIBIOS_SUCCESSFUL;
-+}
-+
-+int pcibios_write_config_dword (unsigned int bus, unsigned int device_fn, unsigned int where, uint32_t value)
-+{
-+    outl(CONFIG_CMD(bus,device_fn,where), 0xCF8);
-+    outl(value, 0xCFC);
-+    return PCIBIOS_SUCCESSFUL;
-+}
-+
-+#undef CONFIG_CMD
-+
-+#else	 /* CONFIG_PCI_DIRECT  not defined */
-+
-+#if !defined(PCBIOS)
-+#error "The pcibios can only be used when the PCBIOS support is compiled in"
-+#endif
-+
-+
-+#define KERN_CODE_SEG 0X8
-+/* Stuff for asm */
-+#define save_flags(x) \
-+__asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */ :"memory")
-+
-+#define cli() __asm__ __volatile__ ("cli": : :"memory")
-+
-+#define restore_flags(x) \
-+__asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory")
-+
-+
-+
-+static struct {
-+	unsigned long address;
-+	unsigned short segment;
-+} bios32_indirect = { 0, KERN_CODE_SEG };
-+
-+static long pcibios_entry = 0;
-+static struct {
-+	unsigned long address;
-+	unsigned short segment;
-+} pci_indirect = { 0, KERN_CODE_SEG };
-+
-+static unsigned long bios32_service(unsigned long service)
-+{
-+	unsigned char return_code;	/* %al */
-+	unsigned long address;		/* %ebx */
-+	unsigned long length;		/* %ecx */
-+	unsigned long entry;		/* %edx */
-+	unsigned long flags;
-+
-+	save_flags(flags);
-+	__asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%edi)"
-+#else
-+		"lcall *(%%edi)"
-+#endif
-+		: "=a" (return_code),
-+		  "=b" (address),
-+		  "=c" (length),
-+		  "=d" (entry)
-+		: "0" (service),
-+		  "1" (0),
-+		  "D" (&bios32_indirect));
-+	restore_flags(flags);
-+
-+	switch (return_code) {
-+		case 0:
-+			return address + entry;
-+		case 0x80:	/* Not present */
-+			printf("bios32_service(%d) : not present\n", service);
-+			return 0;
-+		default: /* Shouldn't happen */
-+			printf("bios32_service(%d) : returned %#X, mail drew@colorado.edu\n",
-+				service, return_code);
-+			return 0;
-+	}
-+}
-+
-+int pcibios_read_config_byte(unsigned int bus,
-+        unsigned int device_fn, unsigned int where, uint8_t *value)
-+{
-+        unsigned long ret;
-+        unsigned long bx = (bus << 8) | device_fn;
-+        unsigned long flags;
-+
-+        save_flags(flags);
-+        __asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%esi)\n\t"
-+#else
-+		"lcall *(%%esi)\n\t"
-+#endif
-+                "jc 1f\n\t"
-+                "xor %%ah, %%ah\n"
-+                "1:"
-+                : "=c" (*value),
-+                  "=a" (ret)
-+                : "1" (PCIBIOS_READ_CONFIG_BYTE),
-+                  "b" (bx),
-+                  "D" ((long) where),
-+                  "S" (&pci_indirect));
-+        restore_flags(flags);
-+        return (int) (ret & 0xff00) >> 8;
-+}
-+
-+int pcibios_read_config_word(unsigned int bus,
-+        unsigned int device_fn, unsigned int where, uint16_t *value)
-+{
-+        unsigned long ret;
-+        unsigned long bx = (bus << 8) | device_fn;
-+        unsigned long flags;
-+
-+        save_flags(flags);
-+        __asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%esi)\n\t"
-+#else
-+		"lcall *(%%esi)\n\t"
-+#endif
-+                "jc 1f\n\t"
-+                "xor %%ah, %%ah\n"
-+                "1:"
-+                : "=c" (*value),
-+                  "=a" (ret)
-+                : "1" (PCIBIOS_READ_CONFIG_WORD),
-+                  "b" (bx),
-+                  "D" ((long) where),
-+                  "S" (&pci_indirect));
-+        restore_flags(flags);
-+        return (int) (ret & 0xff00) >> 8;
-+}
-+
-+int pcibios_read_config_dword(unsigned int bus,
-+        unsigned int device_fn, unsigned int where, uint32_t *value)
-+{
-+        unsigned long ret;
-+        unsigned long bx = (bus << 8) | device_fn;
-+        unsigned long flags;
-+
-+        save_flags(flags);
-+        __asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%esi)\n\t"
-+#else
-+		"lcall *(%%esi)\n\t"
-+#endif
-+                "jc 1f\n\t"
-+                "xor %%ah, %%ah\n"
-+                "1:"
-+                : "=c" (*value),
-+                  "=a" (ret)
-+                : "1" (PCIBIOS_READ_CONFIG_DWORD),
-+                  "b" (bx),
-+                  "D" ((long) where),
-+                  "S" (&pci_indirect));
-+        restore_flags(flags);
-+        return (int) (ret & 0xff00) >> 8;
-+}
-+
-+int pcibios_write_config_byte (unsigned int bus,
-+	unsigned int device_fn, unsigned int where, uint8_t value)
-+{
-+	unsigned long ret;
-+	unsigned long bx = (bus << 8) | device_fn;
-+	unsigned long flags;
-+
-+	save_flags(flags); cli();
-+	__asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%esi)\n\t"
-+#else
-+		"lcall *(%%esi)\n\t"
-+#endif
-+		"jc 1f\n\t"
-+		"xor %%ah, %%ah\n"
-+		"1:"
-+		: "=a" (ret)
-+		: "0" (PCIBIOS_WRITE_CONFIG_BYTE),
-+		  "c" (value),
-+		  "b" (bx),
-+		  "D" ((long) where),
-+		  "S" (&pci_indirect));
-+	restore_flags(flags);
-+	return (int) (ret & 0xff00) >> 8;
-+}
-+
-+int pcibios_write_config_word (unsigned int bus,
-+	unsigned int device_fn, unsigned int where, uint16_t value)
-+{
-+	unsigned long ret;
-+	unsigned long bx = (bus << 8) | device_fn;
-+	unsigned long flags;
-+
-+	save_flags(flags); cli();
-+	__asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%esi)\n\t"
-+#else
-+		"lcall *(%%esi)\n\t"
-+#endif
-+		"jc 1f\n\t"
-+		"xor %%ah, %%ah\n"
-+		"1:"
-+		: "=a" (ret)
-+		: "0" (PCIBIOS_WRITE_CONFIG_WORD),
-+		  "c" (value),
-+		  "b" (bx),
-+		  "D" ((long) where),
-+		  "S" (&pci_indirect));
-+	restore_flags(flags);
-+	return (int) (ret & 0xff00) >> 8;
-+}
-+
-+int pcibios_write_config_dword (unsigned int bus,
-+	unsigned int device_fn, unsigned int where, uint32_t value)
-+{
-+	unsigned long ret;
-+	unsigned long bx = (bus << 8) | device_fn;
-+	unsigned long flags;
-+
-+	save_flags(flags); cli();
-+	__asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+		"lcall (%%esi)\n\t"
-+#else
-+		"lcall *(%%esi)\n\t"
-+#endif
-+		"jc 1f\n\t"
-+		"xor %%ah, %%ah\n"
-+		"1:"
-+		: "=a" (ret)
-+		: "0" (PCIBIOS_WRITE_CONFIG_DWORD),
-+		  "c" (value),
-+		  "b" (bx),
-+		  "D" ((long) where),
-+		  "S" (&pci_indirect));
-+	restore_flags(flags);
-+	return (int) (ret & 0xff00) >> 8;
-+}
-+
-+static void check_pcibios(void)
-+{
-+	unsigned long signature;
-+	unsigned char present_status;
-+	unsigned char major_revision;
-+	unsigned char minor_revision;
-+	unsigned long flags;
-+	int pack;
-+
-+	if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
-+		pci_indirect.address = pcibios_entry;
-+
-+		save_flags(flags);
-+		__asm__(
-+#ifdef ABSOLUTE_WITHOUT_ASTERISK
-+			"lcall (%%edi)\n\t"
-+#else
-+			"lcall *(%%edi)\n\t"
-+#endif
-+			"jc 1f\n\t"
-+			"xor %%ah, %%ah\n"
-+			"1:\tshl $8, %%eax\n\t"
-+			"movw %%bx, %%ax"
-+			: "=d" (signature),
-+			  "=a" (pack)
-+			: "1" (PCIBIOS_PCI_BIOS_PRESENT),
-+			  "D" (&pci_indirect)
-+			: "bx", "cx");
-+		restore_flags(flags);
-+
-+		present_status = (pack >> 16) & 0xff;
-+		major_revision = (pack >> 8) & 0xff;
-+		minor_revision = pack & 0xff;
-+		if (present_status || (signature != PCI_SIGNATURE)) {
-+			printf("ERROR: BIOS32 says PCI BIOS, but no PCI "
-+				"BIOS????\n");
-+			pcibios_entry = 0;
-+		}
-+#if	DEBUG
-+		if (pcibios_entry) {
-+			printf ("pcibios_init : PCI BIOS revision %hhX.%hhX"
-+				" entry at %#X\n", major_revision,
-+				minor_revision, pcibios_entry);
-+		}
-+#endif
-+	}
-+}
-+
-+static void pcibios_init(void)
-+{
-+	union bios32 *check;
-+	unsigned char sum;
-+	int i, length;
-+	unsigned long bios32_entry = 0;
-+
-+	EnterFunction("pcibios_init");
-+	/*
-+	 * Follow the standard procedure for locating the BIOS32 Service
-+	 * directory by scanning the permissible address range from
-+	 * 0xe0000 through 0xfffff for a valid BIOS32 structure.
-+	 *
-+	 */
-+
-+	for (check = (union bios32 *) 0xe0000; check <= (union bios32 *) 0xffff0; ++check) {
-+		if (check->fields.signature != BIOS32_SIGNATURE)
-+			continue;
-+		length = check->fields.length * 16;
-+		if (!length)
-+			continue;
-+		sum = 0;
-+		for (i = 0; i < length ; ++i)
-+			sum += check->chars[i];
-+		if (sum != 0)
-+			continue;
-+		if (check->fields.revision != 0) {
-+			printf("pcibios_init : unsupported revision %d at %#X, mail drew@colorado.edu\n",
-+				check->fields.revision, check);
-+			continue;
-+		}
-+#if	DEBUG
-+		printf("pcibios_init : BIOS32 Service Directory "
-+			"structure at %#X\n", check);
-+#endif
-+		if (!bios32_entry) {
-+			if (check->fields.entry >= 0x100000) {
-+				printf("pcibios_init: entry in high "
-+					"memory, giving up\n");
-+				return;
-+			} else {
-+				bios32_entry = check->fields.entry;
-+#if	DEBUG
-+				printf("pcibios_init : BIOS32 Service Directory"
-+					" entry at %#X\n", bios32_entry);
-+#endif
-+				bios32_indirect.address = bios32_entry;
-+			}
-+		}
-+	}
-+	if (bios32_entry)
-+		check_pcibios();
-+	LeaveFunction("pcibios_init");
-+}
-+
-+#endif	/* CONFIG_PCI_DIRECT not defined*/
-+
-+unsigned long pcibios_bus_base(unsigned int bus __unused)
-+{
-+	/* architecturally this must be 0 */
-+	return 0;
-+}
-+
-+void find_pci(int type, struct pci_device *dev)
-+{
-+	EnterFunction("find_pci");
-+#ifndef	CONFIG_PCI_DIRECT
-+	if (!pcibios_entry) {
-+		pcibios_init();
-+	}
-+	if (!pcibios_entry) {
-+		printf("pci_init: no BIOS32 detected\n");
-+		return;
-+	}
-+#endif
-+	LeaveFunction("find_pci");
-+	return scan_pci_bus(type, dev);
-+}
-Index: b/netboot/pcnet32.c
-===================================================================
---- /dev/null
-+++ b/netboot/pcnet32.c
-@@ -0,0 +1,1004 @@
-+/**************************************************************************
-+*
-+*    pcnet32.c -- Etherboot device driver for the AMD PCnet32
-+*    Written 2003-2003 by Timothy Legge <tlegge@rogers.com>
-+*
-+*    This program is free software; you can redistribute it and/or modify
-+*    it under the terms of the GNU General Public License as published by
-+*    the Free Software Foundation; either version 2 of the License, or
-+*    (at your option) any later version.
-+*
-+*    This program is distributed in the hope that it will be useful,
-+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+*    GNU General Public License for more details.
-+*
-+*    You should have received a copy of the GNU General Public License
-+*    along with this program; if not, write to the Free Software
-+*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*
-+*    Portions of this code based on:
-+*		pcnet32.c: An AMD PCnet32 ethernet driver for linux:
-+*
-+*	(C) 1996-1999 Thomas Bogendoerfer
-+*		See Linux Driver for full information
-+*	
-+*	The transmit and poll functions were written with reference to:
-+*	lance.c - LANCE NIC driver for Etherboot written by Ken Yap 
-+*	
-+*	Linux Driver Version 1.27a, 10.02.2002
-+* 
-+* 
-+*    REVISION HISTORY:
-+*    ================
-+*    v1.0	08-06-2003	timlegge	Initial port of Linux driver
-+*    v1.1	08-23-2003	timlegge	Add multicast support
-+*    v1.2	01-17-2004	timlegge	Initial driver output cleanup
-+*    v1.3	03-29-2004	timlegge	More driver cleanup
-+*    
-+*    Indent Options: indent -kr -i8
-+***************************************************************************/
-+
-+/* to get some global routines like printf */
-+#include "etherboot.h"
-+/* to get the interface to the body of the program */
-+#include "nic.h"
-+/* to get the PCI support functions, if this is a PCI NIC */
-+#include "pci.h"
-+/* Include the time functions */
-+#include "timer.h"
-+#include "mii.h"
-+/* void hex_dump(const char *data, const unsigned int len); */
-+
-+/* Etherboot Specific definations */
-+#define drv_version "v1.3"
-+#define drv_date "03-29-2004"
-+
-+typedef unsigned char u8;
-+typedef signed char s8;
-+typedef unsigned short u16;
-+typedef signed short s16;
-+typedef unsigned int u32;
-+typedef signed int s32;
-+
-+static u32 ioaddr;		/* Globally used for the card's io address */
-+
-+#ifdef EDEBUG
-+#define dprintf(x) printf x
-+#else
-+#define dprintf(x)
-+#endif
-+
-+/* Condensed operations for readability. */
-+#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
-+#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
-+
-+/* End Etherboot Specific */
-+
-+int cards_found /* __initdata */ ;
-+
-+#ifdef REMOVE
-+/* FIXME: Remove these they are probably pointless */
-+
-+/* 
-+ * VLB I/O addresses 
-+ */
-+static unsigned int pcnet32_portlist[] /*__initdata */  =
-+{ 0x300, 0x320, 0x340, 0x360, 0 };
-+
-+static int pcnet32_debug = 1;
-+static int tx_start = 1;	/* Mapping -- 0:20, 1:64, 2:128, 3:~220 (depends on chip vers) */
-+static int pcnet32vlb;		/* check for VLB cards ? */
-+
-+static struct net_device *pcnet32_dev;
-+
-+static int max_interrupt_work = 80;
-+static int rx_copybreak = 200;
-+#endif
-+#define PCNET32_PORT_AUI      0x00
-+#define PCNET32_PORT_10BT     0x01
-+#define PCNET32_PORT_GPSI     0x02
-+#define PCNET32_PORT_MII      0x03
-+
-+#define PCNET32_PORT_PORTSEL  0x03
-+#define PCNET32_PORT_ASEL     0x04
-+#define PCNET32_PORT_100      0x40
-+#define PCNET32_PORT_FD	      0x80
-+
-+#define PCNET32_DMA_MASK 0xffffffff
-+
-+/*
-+ * table to translate option values from tulip
-+ * to internal options
-+ */
-+static unsigned char options_mapping[] = {
-+	PCNET32_PORT_ASEL,	/*  0 Auto-select      */
-+	PCNET32_PORT_AUI,	/*  1 BNC/AUI          */
-+	PCNET32_PORT_AUI,	/*  2 AUI/BNC          */
-+	PCNET32_PORT_ASEL,	/*  3 not supported    */
-+	PCNET32_PORT_10BT | PCNET32_PORT_FD,	/*  4 10baseT-FD       */
-+	PCNET32_PORT_ASEL,	/*  5 not supported    */
-+	PCNET32_PORT_ASEL,	/*  6 not supported    */
-+	PCNET32_PORT_ASEL,	/*  7 not supported    */
-+	PCNET32_PORT_ASEL,	/*  8 not supported    */
-+	PCNET32_PORT_MII,	/*  9 MII 10baseT      */
-+	PCNET32_PORT_MII | PCNET32_PORT_FD,	/* 10 MII 10baseT-FD   */
-+	PCNET32_PORT_MII,	/* 11 MII (autosel)    */
-+	PCNET32_PORT_10BT,	/* 12 10BaseT          */
-+	PCNET32_PORT_MII | PCNET32_PORT_100,	/* 13 MII 100BaseTx    */
-+	PCNET32_PORT_MII | PCNET32_PORT_100 | PCNET32_PORT_FD,	/* 14 MII 100BaseTx-FD */
-+	PCNET32_PORT_ASEL	/* 15 not supported    */
-+};
-+
-+#define MAX_UNITS 8		/* More are supported, limit only on options */
-+static int options[MAX_UNITS];
-+static int full_duplex[MAX_UNITS];
-+
-+/*
-+ *				Theory of Operation
-+ * 
-+ * This driver uses the same software structure as the normal lance
-+ * driver. So look for a verbose description in lance.c. The differences
-+ * to the normal lance driver is the use of the 32bit mode of PCnet32
-+ * and PCnetPCI chips. Because these chips are 32bit chips, there is no
-+ * 16MB limitation and we don't need bounce buffers.
-+ */
-+
-+
-+
-+/*
-+ * Set the number of Tx and Rx buffers, using Log_2(# buffers).
-+ * Reasonable default values are 4 Tx buffers, and 16 Rx buffers.
-+ * That translates to 2 (4 == 2^^2) and 4 (16 == 2^^4).
-+ */
-+#ifndef PCNET32_LOG_TX_BUFFERS
-+#define PCNET32_LOG_TX_BUFFERS 1
-+#define PCNET32_LOG_RX_BUFFERS 2
-+#endif
-+
-+#define TX_RING_SIZE		(1 << (PCNET32_LOG_TX_BUFFERS))
-+#define TX_RING_MOD_MASK	(TX_RING_SIZE - 1)
-+/* FIXME: Fix this to allow multiple tx_ring descriptors */
-+#define TX_RING_LEN_BITS	0x0000	/*PCNET32_LOG_TX_BUFFERS) << 12) */
-+
-+#define RX_RING_SIZE		(1 << (PCNET32_LOG_RX_BUFFERS))
-+#define RX_RING_MOD_MASK	(RX_RING_SIZE - 1)
-+#define RX_RING_LEN_BITS	((PCNET32_LOG_RX_BUFFERS) << 4)
-+
-+#define PKT_BUF_SZ		1544
-+
-+/* Offsets from base I/O address. */
-+#define PCNET32_WIO_RDP		0x10
-+#define PCNET32_WIO_RAP		0x12
-+#define PCNET32_WIO_RESET	0x14
-+#define PCNET32_WIO_BDP		0x16
-+
-+#define PCNET32_DWIO_RDP	0x10
-+#define PCNET32_DWIO_RAP	0x14
-+#define PCNET32_DWIO_RESET	0x18
-+#define PCNET32_DWIO_BDP	0x1C
-+
-+#define PCNET32_TOTAL_SIZE	0x20
-+
-+/* Buffers for the tx and Rx */
-+
-+/* Create a static buffer of size PKT_BUF_SZ for each
-+TX Descriptor.  All descriptors point to a
-+part of this buffer */
-+static unsigned char txb[PKT_BUF_SZ * TX_RING_SIZE];
-+//    __attribute__ ((aligned(16)));
-+
-+/* Create a static buffer of size PKT_BUF_SZ for each
-+RX Descriptor   All descriptors point to a
-+part of this buffer */
-+static unsigned char rxb[RX_RING_SIZE * PKT_BUF_SZ];
-+//    __attribute__ ((aligned(16)));
-+
-+/* The PCNET32 Rx and Tx ring descriptors. */
-+struct pcnet32_rx_head {
-+	u32 base;
-+	s16 buf_length;
-+	s16 status;
-+	u32 msg_length;
-+	u32 reserved;
-+};
-+
-+struct pcnet32_tx_head {
-+	u32 base;
-+	s16 length;
-+	s16 status;
-+	u32 misc;
-+	u32 reserved;
-+};
-+
-+/* The PCNET32 32-Bit initialization block, described in databook. */
-+struct pcnet32_init_block {
-+	u16 mode;
-+	u16 tlen_rlen;
-+	u8 phys_addr[6];
-+	u16 reserved;
-+	u32 filter[2];
-+	/* Receive and transmit ring base, along with extra bits. */
-+	u32 rx_ring;
-+	u32 tx_ring;
-+};
-+/* PCnet32 access functions */
-+struct pcnet32_access {
-+	u16(*read_csr) (unsigned long, int);
-+	void (*write_csr) (unsigned long, int, u16);
-+	 u16(*read_bcr) (unsigned long, int);
-+	void (*write_bcr) (unsigned long, int, u16);
-+	 u16(*read_rap) (unsigned long);
-+	void (*write_rap) (unsigned long, u16);
-+	void (*reset) (unsigned long);
-+};
-+
-+/* Define the TX Descriptor */
-+static struct pcnet32_tx_head tx_ring[TX_RING_SIZE]
-+    __attribute__ ((aligned(16)));
-+
-+
-+/* Define the RX Descriptor */
-+static struct pcnet32_rx_head rx_ring[RX_RING_SIZE]
-+    __attribute__ ((aligned(16)));
-+
-+/* May need to be moved to mii.h */
-+struct mii_if_info {
-+	int phy_id;
-+	int advertising;
-+	unsigned int full_duplex:1;	/* is full duplex? */
-+};
-+
-+/*
-+ * The first three fields of pcnet32_private are read by the ethernet device 
-+ * so we allocate the structure should be allocated by pci_alloc_consistent().
-+ */
-+#define MII_CNT 4
-+struct pcnet32_private {
-+	struct pcnet32_init_block init_block;
-+	struct pci_dev *pci_dev;	/* Pointer to the associated pci device structure */
-+	const char *name;
-+	/* The saved address of a sent-in-place packet/buffer, for skfree(). */
-+	struct sk_buff *tx_skbuff[TX_RING_SIZE];
-+	struct sk_buff *rx_skbuff[RX_RING_SIZE];
-+	struct pcnet32_access a;
-+	unsigned int cur_rx, cur_tx;	/* The next free ring entry */
-+	char tx_full;
-+	int options;
-+	int shared_irq:1,	/* shared irq possible */
-+	 ltint:1,		/* enable TxDone-intr inhibitor */
-+	 dxsuflo:1,		/* disable transmit stop on uflo */
-+	 mii:1;			/* mii port available */
-+	struct mii_if_info mii_if;
-+	unsigned char phys[MII_CNT];
-+	struct net_device *next;
-+	int full_duplex:1;
-+} lpx;
-+
-+static struct pcnet32_private *lp;
-+
-+static int mdio_read(struct nic *nic __unused, int phy_id, int reg_num);
-+#if 0
-+static void mdio_write(struct nic *nic __unused, int phy_id, int reg_num,
-+		       int val);
-+#endif
-+enum pci_flags_bit {
-+	PCI_USES_IO = 1, PCI_USES_MEM = 2, PCI_USES_MASTER = 4,
-+	PCI_ADDR0 = 0x10 << 0, PCI_ADDR1 = 0x10 << 1, PCI_ADDR2 =
-+	    0x10 << 2, PCI_ADDR3 = 0x10 << 3,
-+};
-+
-+
-+static u16 pcnet32_wio_read_csr(unsigned long addr, int index)
-+{
-+	outw(index, addr + PCNET32_WIO_RAP);
-+	return inw(addr + PCNET32_WIO_RDP);
-+}
-+
-+static void pcnet32_wio_write_csr(unsigned long addr, int index, u16 val)
-+{
-+	outw(index, addr + PCNET32_WIO_RAP);
-+	outw(val, addr + PCNET32_WIO_RDP);
-+}
-+
-+static u16 pcnet32_wio_read_bcr(unsigned long addr, int index)
-+{
-+	outw(index, addr + PCNET32_WIO_RAP);
-+	return inw(addr + PCNET32_WIO_BDP);
-+}
-+
-+static void pcnet32_wio_write_bcr(unsigned long addr, int index, u16 val)
-+{
-+	outw(index, addr + PCNET32_WIO_RAP);
-+	outw(val, addr + PCNET32_WIO_BDP);
-+}
-+
-+static u16 pcnet32_wio_read_rap(unsigned long addr)
-+{
-+	return inw(addr + PCNET32_WIO_RAP);
-+}
-+
-+static void pcnet32_wio_write_rap(unsigned long addr, u16 val)
-+{
-+	outw(val, addr + PCNET32_WIO_RAP);
-+}
-+
-+static void pcnet32_wio_reset(unsigned long addr)
-+{
-+	inw(addr + PCNET32_WIO_RESET);
-+}
-+
-+static int pcnet32_wio_check(unsigned long addr)
-+{
-+	outw(88, addr + PCNET32_WIO_RAP);
-+	return (inw(addr + PCNET32_WIO_RAP) == 88);
-+}
-+
-+static struct pcnet32_access pcnet32_wio = {
-+      read_csr:pcnet32_wio_read_csr,
-+      write_csr:pcnet32_wio_write_csr,
-+      read_bcr:pcnet32_wio_read_bcr,
-+      write_bcr:pcnet32_wio_write_bcr,
-+      read_rap:pcnet32_wio_read_rap,
-+      write_rap:pcnet32_wio_write_rap,
-+      reset:pcnet32_wio_reset
-+};
-+
-+static u16 pcnet32_dwio_read_csr(unsigned long addr, int index)
-+{
-+	outl(index, addr + PCNET32_DWIO_RAP);
-+	return (inl(addr + PCNET32_DWIO_RDP) & 0xffff);
-+}
-+
-+static void pcnet32_dwio_write_csr(unsigned long addr, int index, u16 val)
-+{
-+	outl(index, addr + PCNET32_DWIO_RAP);
-+	outl(val, addr + PCNET32_DWIO_RDP);
-+}
-+
-+static u16 pcnet32_dwio_read_bcr(unsigned long addr, int index)
-+{
-+	outl(index, addr + PCNET32_DWIO_RAP);
-+	return (inl(addr + PCNET32_DWIO_BDP) & 0xffff);
-+}
-+
-+static void pcnet32_dwio_write_bcr(unsigned long addr, int index, u16 val)
-+{
-+	outl(index, addr + PCNET32_DWIO_RAP);
-+	outl(val, addr + PCNET32_DWIO_BDP);
-+}
-+
-+static u16 pcnet32_dwio_read_rap(unsigned long addr)
-+{
-+	return (inl(addr + PCNET32_DWIO_RAP) & 0xffff);
-+}
-+
-+static void pcnet32_dwio_write_rap(unsigned long addr, u16 val)
-+{
-+	outl(val, addr + PCNET32_DWIO_RAP);
-+}
-+
-+static void pcnet32_dwio_reset(unsigned long addr)
-+{
-+	inl(addr + PCNET32_DWIO_RESET);
-+}
-+
-+static int pcnet32_dwio_check(unsigned long addr)
-+{
-+	outl(88, addr + PCNET32_DWIO_RAP);
-+	return ((inl(addr + PCNET32_DWIO_RAP) & 0xffff) == 88);
-+}
-+
-+static struct pcnet32_access pcnet32_dwio = {
-+      read_csr:pcnet32_dwio_read_csr,
-+      write_csr:pcnet32_dwio_write_csr,
-+      read_bcr:pcnet32_dwio_read_bcr,
-+      write_bcr:pcnet32_dwio_write_bcr,
-+      read_rap:pcnet32_dwio_read_rap,
-+      write_rap:pcnet32_dwio_write_rap,
-+      reset:pcnet32_dwio_reset
-+};
-+
-+
-+/* Initialize the PCNET32 Rx and Tx rings. */
-+static int pcnet32_init_ring(struct nic *nic)
-+{
-+	int i;
-+
-+	lp->tx_full = 0;
-+	lp->cur_rx = lp->cur_tx = 0;
-+
-+	for (i = 0; i < RX_RING_SIZE; i++) {
-+		rx_ring[i].base = (u32) virt_to_le32desc(&rxb[i]);
-+		rx_ring[i].buf_length = le16_to_cpu(-PKT_BUF_SZ);
-+		rx_ring[i].status = le16_to_cpu(0x8000);
-+	}
-+
-+	/* The Tx buffer address is filled in as needed, but we do need to clear
-+	   the upper ownership bit. */
-+	for (i = 0; i < TX_RING_SIZE; i++) {
-+		tx_ring[i].base = 0;
-+		tx_ring[i].status = 0;
-+	}
-+
-+
-+	lp->init_block.tlen_rlen =
-+	    le16_to_cpu(TX_RING_LEN_BITS | RX_RING_LEN_BITS);
-+	for (i = 0; i < 6; i++)
-+		lp->init_block.phys_addr[i] = nic->node_addr[i];
-+	lp->init_block.rx_ring = (u32) virt_to_le32desc(&rx_ring[0]);
-+	lp->init_block.tx_ring = (u32) virt_to_le32desc(&tx_ring[0]);
-+	return 0;
-+}
-+
-+/**************************************************************************
-+RESET - Reset adapter
-+***************************************************************************/
-+static void pcnet32_reset(struct nic *nic)
-+{
-+	/* put the card in its initial state */
-+	u16 val;
-+	int i;
-+
-+	/* Reset the PCNET32 */
-+	lp->a.reset(ioaddr);
-+
-+	/* switch pcnet32 to 32bit mode */
-+	lp->a.write_bcr(ioaddr, 20, 2);
-+
-+	/* set/reset autoselect bit */
-+	val = lp->a.read_bcr(ioaddr, 2) & ~2;
-+	if (lp->options & PCNET32_PORT_ASEL)
-+		val |= 2;
-+	lp->a.write_bcr(ioaddr, 2, val);
-+	/* handle full duplex setting */
-+	if (lp->full_duplex) {
-+		val = lp->a.read_bcr(ioaddr, 9) & ~3;
-+		if (lp->options & PCNET32_PORT_FD) {
-+			val |= 1;
-+			if (lp->options ==
-+			    (PCNET32_PORT_FD | PCNET32_PORT_AUI))
-+				val |= 2;
-+		} else if (lp->options & PCNET32_PORT_ASEL) {
-+			/* workaround of xSeries250, turn on for 79C975 only */
-+			i = ((lp->a.
-+			      read_csr(ioaddr,
-+				       88) | (lp->a.read_csr(ioaddr,
-+							     89) << 16)) >>
-+			     12) & 0xffff;
-+			if (i == 0x2627)
-+				val |= 3;
-+		}
-+		lp->a.write_bcr(ioaddr, 9, val);
-+	}
-+
-+	/* set/reset GPSI bit in test register */
-+	val = lp->a.read_csr(ioaddr, 124) & ~0x10;
-+	if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
-+		val |= 0x10;
-+	lp->a.write_csr(ioaddr, 124, val);
-+
-+	if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
-+		val = lp->a.read_bcr(ioaddr, 32) & ~0x38;	/* disable Auto Negotiation, set 10Mpbs, HD */
-+		if (lp->options & PCNET32_PORT_FD)
-+			val |= 0x10;
-+		if (lp->options & PCNET32_PORT_100)
-+			val |= 0x08;
-+		lp->a.write_bcr(ioaddr, 32, val);
-+	} else {
-+		if (lp->options & PCNET32_PORT_ASEL) {	/* enable auto negotiate, setup, disable fd */
-+			val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
-+			val |= 0x20;
-+			lp->a.write_bcr(ioaddr, 32, val);
-+		}
-+	}
-+
-+#ifdef DO_DXSUFLO
-+	if (lp->dxsuflo) {	/* Disable transmit stop on underflow */
-+		val = lp->a.read_csr(ioaddr, 3);
-+		val |= 0x40;
-+		lp->a.write_csr(ioaddr, 3, val);
-+	}
-+#endif
-+
-+	if (lp->ltint) {	/* Enable TxDone-intr inhibitor */
-+		val = lp->a.read_csr(ioaddr, 5);
-+		val |= (1 << 14);
-+		lp->a.write_csr(ioaddr, 5, val);
-+	}
-+	lp->init_block.mode =
-+	    le16_to_cpu((lp->options & PCNET32_PORT_PORTSEL) << 7);
-+	lp->init_block.filter[0] = 0xffffffff;
-+	lp->init_block.filter[1] = 0xffffffff;
-+
-+	pcnet32_init_ring(nic);
-+
-+
-+	/* Re-initialize the PCNET32, and start it when done. */
-+	lp->a.write_csr(ioaddr, 1,
-+			(virt_to_bus(&lp->init_block)) & 0xffff);
-+	lp->a.write_csr(ioaddr, 2, (virt_to_bus(&lp->init_block)) >> 16);
-+	lp->a.write_csr(ioaddr, 4, 0x0915);
-+	lp->a.write_csr(ioaddr, 0, 0x0001);
-+
-+
-+	i = 0;
-+	while (i++ < 100)
-+		if (lp->a.read_csr(ioaddr, 0) & 0x0100)
-+			break;
-+	/* 
-+	 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
-+	 * reports that doing so triggers a bug in the '974.
-+	 */
-+	lp->a.write_csr(ioaddr, 0, 0x0042);
-+
-+	dprintf(("pcnet32 open, csr0 %hX.\n", lp->a.read_csr(ioaddr, 0)));
-+
-+}
-+
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int pcnet32_poll(struct nic *nic __unused, int retrieve)
-+{
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+
-+	int status;
-+	int entry;
-+
-+	entry = lp->cur_rx & RX_RING_MOD_MASK;
-+	status = ((short) le16_to_cpu(rx_ring[entry].status) >> 8);
-+
-+	if (status < 0)
-+		return 0;
-+
-+	if ( ! retrieve ) return 1;
-+
-+	if (status == 0x03) {
-+		nic->packetlen =
-+		    (le32_to_cpu(rx_ring[entry].msg_length) & 0xfff) - 4;
-+		memcpy(nic->packet, &rxb[entry], nic->packetlen);
-+
-+		/* Andrew Boyd of QNX reports that some revs of the 79C765
-+		 * clear the buffer length */
-+		rx_ring[entry].buf_length = le16_to_cpu(-PKT_BUF_SZ);
-+		rx_ring[entry].status |= le16_to_cpu(0x8000);	/* prime for next receive */
-+		/* Switch to the next Rx ring buffer */
-+		lp->cur_rx++;
-+
-+	} else {
-+		return 0;
-+	}
-+
-+	return 1;
-+}
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void pcnet32_transmit(struct nic *nic __unused, const char *d,	/* Destination */
-+			     unsigned int t,	/* Type */
-+			     unsigned int s,	/* size */
-+			     const char *p)
-+{				/* Packet */
-+	/* send the packet to destination */
-+	unsigned long time;
-+	u8 *ptxb;
-+	u16 nstype;
-+	u16 status;
-+	int entry = 0;		/*lp->cur_tx & TX_RING_MOD_MASK; */
-+
-+	status = 0x8300;
-+	/* point to the current txb incase multiple tx_rings are used */
-+	ptxb = txb + (lp->cur_tx * PKT_BUF_SZ);
-+
-+	/* copy the packet to ring buffer */
-+	memcpy(ptxb, d, ETH_ALEN);	/* dst */
-+	memcpy(ptxb + ETH_ALEN, nic->node_addr, ETH_ALEN);	/* src */
-+	nstype = htons((u16) t);	/* type */
-+	memcpy(ptxb + 2 * ETH_ALEN, (u8 *) & nstype, 2);	/* type */
-+	memcpy(ptxb + ETH_HLEN, p, s);
-+
-+	s += ETH_HLEN;
-+	while (s < ETH_ZLEN)	/* pad to min length */
-+		ptxb[s++] = '\0';
-+
-+	tx_ring[entry].length = le16_to_cpu(-s);
-+	tx_ring[entry].misc = 0x00000000;
-+	tx_ring[entry].base = (u32) virt_to_le32desc(ptxb);
-+
-+	/* we set the top byte as the very last thing */
-+	tx_ring[entry].status = le16_to_cpu(status);
-+
-+
-+	/* Trigger an immediate send poll */
-+	lp->a.write_csr(ioaddr, 0, 0x0048);
-+
-+	/* wait for transmit complete */
-+	lp->cur_tx = 0;		/* (lp->cur_tx + 1); */
-+	time = currticks() + TICKS_PER_SEC;	/* wait one second */
-+	while (currticks() < time &&
-+	       ((short) le16_to_cpu(tx_ring[entry].status) < 0));
-+
-+	if ((short) le16_to_cpu(tx_ring[entry].status) < 0)
-+		printf("PCNET32 timed out on transmit\n");
-+
-+	/* Stop pointing at the current txb
-+	 * otherwise the card continues to send the packet */
-+	tx_ring[entry].base = 0;
-+
-+}
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void pcnet32_disable(struct dev *dev __unused)
-+{
-+	/* Stop the PCNET32 here -- it ocassionally polls memory if we don't */
-+	lp->a.write_csr(ioaddr, 0, 0x0004);
-+
-+	/*
-+	 * Switch back to 16-bit mode to avoid problesm with dumb 
-+	 * DOS packet driver after a warm reboot
-+	 */
-+	lp->a.write_bcr(ioaddr, 20, 4);
-+}
-+
-+/**************************************************************************
-+IRQ - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void pcnet32_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+You should omit the last argument struct pci_device * for a non-PCI NIC
-+***************************************************************************/
-+static int pcnet32_probe(struct dev *dev, struct pci_device *pci)
-+{
-+	struct nic *nic = (struct nic *) dev;
-+	int i, media;
-+	int fdx, mii, fset, dxsuflo, ltint;
-+	int chip_version;
-+	char *chipname;
-+	struct pcnet32_access *a = NULL;
-+	u8 promaddr[6];
-+
-+	int shared = 1;
-+	if (pci->ioaddr == 0)
-+		return 0;
-+
-+	/* BASE is used throughout to address the card */
-+	ioaddr = pci->ioaddr;
-+	printf("pcnet32.c: Found %s, Vendor=0x%hX Device=0x%hX\n",
-+	       pci->name, pci->vendor, pci->dev_id);
-+
-+	nic->irqno  = 0;
-+	nic->ioaddr = pci->ioaddr & ~3;
-+
-+	/* reset the chip */
-+	pcnet32_wio_reset(ioaddr);
-+
-+	/* NOTE: 16-bit check is first, otherwise some older PCnet chips fail */
-+	if (pcnet32_wio_read_csr(ioaddr, 0) == 4
-+	    && pcnet32_wio_check(ioaddr)) {
-+		a = &pcnet32_wio;
-+	} else {
-+		pcnet32_dwio_reset(ioaddr);
-+		if (pcnet32_dwio_read_csr(ioaddr, 0) == 4
-+		    && pcnet32_dwio_check(ioaddr)) {
-+			a = &pcnet32_dwio;
-+		} else
-+			return 0;
-+	}
-+
-+	chip_version =
-+	    a->read_csr(ioaddr, 88) | (a->read_csr(ioaddr, 89) << 16);
-+
-+	dprintf(("PCnet chip version is %0xhX\n", chip_version));
-+	if ((chip_version & 0xfff) != 0x003)
-+		return 0;
-+
-+	/* initialize variables */
-+	fdx = mii = fset = dxsuflo = ltint = 0;
-+	chip_version = (chip_version >> 12) & 0xffff;
-+
-+	switch (chip_version) {
-+	case 0x2420:
-+		chipname = "PCnet/PCI 79C970";	/* PCI */
-+		break;
-+	case 0x2430:
-+		if (shared)
-+			chipname = "PCnet/PCI 79C970";	/* 970 gives the wrong chip id back */
-+		else
-+			chipname = "PCnet/32 79C965";	/* 486/VL bus */
-+		break;
-+	case 0x2621:
-+		chipname = "PCnet/PCI II 79C970A";	/* PCI */
-+		fdx = 1;
-+		break;
-+	case 0x2623:
-+		chipname = "PCnet/FAST 79C971";	/* PCI */
-+		fdx = 1;
-+		mii = 1;
-+		fset = 1;
-+		ltint = 1;
-+		break;
-+	case 0x2624:
-+		chipname = "PCnet/FAST+ 79C972";	/* PCI */
-+		fdx = 1;
-+		mii = 1;
-+		fset = 1;
-+		break;
-+	case 0x2625:
-+		chipname = "PCnet/FAST III 79C973";	/* PCI */
-+		fdx = 1;
-+		mii = 1;
-+		break;
-+	case 0x2626:
-+		chipname = "PCnet/Home 79C978";	/* PCI */
-+		fdx = 1;
-+		/* 
-+		 * This is based on specs published at www.amd.com.  This section
-+		 * assumes that a card with a 79C978 wants to go into 1Mb HomePNA
-+		 * mode.  The 79C978 can also go into standard ethernet, and there
-+		 * probably should be some sort of module option to select the
-+		 * mode by which the card should operate
-+		 */
-+		/* switch to home wiring mode */
-+		media = a->read_bcr(ioaddr, 49);
-+
-+		printf("media reset to %#x.\n", media);
-+		a->write_bcr(ioaddr, 49, media);
-+		break;
-+	case 0x2627:
-+		chipname = "PCnet/FAST III 79C975";	/* PCI */
-+		fdx = 1;
-+		mii = 1;
-+		break;
-+	default:
-+		printf("PCnet version %#x, no PCnet32 chip.\n",
-+		       chip_version);
-+		return 0;
-+	}
-+
-+	/*
-+	 *  On selected chips turn on the BCR18:NOUFLO bit. This stops transmit
-+	 *  starting until the packet is loaded. Strike one for reliability, lose
-+	 *  one for latency - although on PCI this isnt a big loss. Older chips 
-+	 *  have FIFO's smaller than a packet, so you can't do this.
-+	 */
-+
-+	if (fset) {
-+		a->write_bcr(ioaddr, 18,
-+			     (a->read_bcr(ioaddr, 18) | 0x0800));
-+		a->write_csr(ioaddr, 80,
-+			     (a->read_csr(ioaddr, 80) & 0x0C00) | 0x0c00);
-+		dxsuflo = 1;
-+		ltint = 1;
-+	}
-+
-+	dprintf(("%s at %hX,", chipname, ioaddr));
-+
-+	/* read PROM address */
-+	for (i = 0; i < 6; i++)
-+		promaddr[i] = inb(ioaddr + i);
-+
-+	/* Update the nic structure with the MAC Address */
-+	for (i = 0; i < ETH_ALEN; i++) {
-+		nic->node_addr[i] = promaddr[i];
-+	}
-+	/* Print out some hardware info */
-+	printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr,
-+	       ioaddr);
-+
-+	/* Set to pci bus master */
-+	adjust_pci_device(pci);
-+
-+	/* point to private storage */
-+	lp = &lpx;
-+
-+#if EBDEBUG
-+	if (((chip_version + 1) & 0xfffe) == 0x2624) {	/* Version 0x2623 or 0x2624 */
-+		i = a->read_csr(ioaddr, 80) & 0x0C00;	/* Check tx_start_pt */
-+		dprintf(("    tx_start_pt(0x%hX):", i));
-+		switch (i >> 10) {
-+		case 0:
-+			dprintf(("  20 bytes,"));
-+			break;
-+		case 1:
-+			dprintf(("  64 bytes,"));
-+			break;
-+		case 2:
-+			dprintf((" 128 bytes,"));
-+			break;
-+		case 3:
-+			dprintf(("~220 bytes,"));
-+			break;
-+		}
-+		i = a->read_bcr(ioaddr, 18);	/* Check Burst/Bus control */
-+		dprintf((" BCR18(%hX):", i & 0xffff));
-+		if (i & (1 << 5))
-+			dprintf(("BurstWrEn "));
-+		if (i & (1 << 6))
-+			dprintf(("BurstRdEn "));
-+		if (i & (1 << 7))
-+			dprintf(("DWordIO "));
-+		if (i & (1 << 11))
-+			dprintf(("NoUFlow "));
-+		i = a->read_bcr(ioaddr, 25);
-+		dprintf(("    SRAMSIZE=0x%hX,", i << 8));
-+		i = a->read_bcr(ioaddr, 26);
-+		dprintf((" SRAM_BND=0x%hX,", i << 8));
-+		i = a->read_bcr(ioaddr, 27);
-+		if (i & (1 << 14))
-+			dprintf(("LowLatRx"));
-+	}
-+#endif
-+	lp->name = chipname;
-+	lp->shared_irq = shared;
-+	lp->full_duplex = fdx;
-+	lp->dxsuflo = dxsuflo;
-+	lp->ltint = ltint;
-+	lp->mii = mii;
-+	/* FIXME: Fix Options for only one card */
-+	if ((cards_found >= MAX_UNITS)
-+	    || ((unsigned int) options[cards_found] > sizeof(options_mapping)))
-+		lp->options = PCNET32_PORT_ASEL;
-+	else
-+		lp->options = options_mapping[options[cards_found]];
-+
-+	if (fdx && !(lp->options & PCNET32_PORT_ASEL) &&
-+	    ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
-+		lp->options |= PCNET32_PORT_FD;
-+
-+	if (!a) {
-+		printf("No access methods\n");
-+		return 0;
-+	}
-+	lp->a = *a;
-+
-+	/* detect special T1/E1 WAN card by checking for MAC address */
-+	if (nic->node_addr[0] == 0x00 && nic->node_addr[1] == 0xe0
-+	    && nic->node_addr[2] == 0x75)
-+		lp->options = PCNET32_PORT_FD | PCNET32_PORT_GPSI;
-+
-+	lp->init_block.mode = le16_to_cpu(0x0003);	/* Disable Rx and Tx. */
-+	lp->init_block.tlen_rlen =
-+	    le16_to_cpu(TX_RING_LEN_BITS | RX_RING_LEN_BITS);
-+	for (i = 0; i < 6; i++)
-+		lp->init_block.phys_addr[i] = nic->node_addr[i];
-+	lp->init_block.filter[0] = 0xffffffff;
-+	lp->init_block.filter[1] = 0xffffffff;
-+	lp->init_block.rx_ring = virt_to_bus(&rx_ring);
-+	lp->init_block.tx_ring = virt_to_bus(&tx_ring);
-+
-+	/* switch pcnet32 to 32bit mode */
-+	a->write_bcr(ioaddr, 20, 2);
-+
-+
-+	a->write_csr(ioaddr, 1, (virt_to_bus(&lp->init_block)) & 0xffff);
-+	a->write_csr(ioaddr, 2, (virt_to_bus(&lp->init_block)) >> 16);
-+
-+	/* 
-+	 * To auto-IRQ we enable the initialization-done and DMA error
-+	 * interrupts. For ISA boards we get a DMA error, but VLB and PCI
-+	 * boards will work.
-+	 */
-+	/* Trigger an initialization just for the interrupt. */
-+
-+	a->write_csr(ioaddr, 0, 0x41);
-+	mdelay(1);
-+
-+	cards_found++;
-+
-+	/* point to NIC specific routines */
-+	pcnet32_reset(nic);
-+	if (1) {
-+	        int tmp;
-+		int phy, phy_idx = 0;
-+		u16 mii_lpa;
-+		lp->phys[0] = 1;	/* Default Setting */
-+		for (phy = 1; phy < 32 && phy_idx < MII_CNT; phy++) {
-+			int mii_status = mdio_read(nic, phy, MII_BMSR);
-+			if (mii_status != 0xffff && mii_status != 0x0000) {
-+				lp->phys[phy_idx++] = phy;
-+				lp->mii_if.advertising =
-+				    mdio_read(nic, phy, MII_ADVERTISE);
-+				if ((mii_status & 0x0040) == 0) {
-+				  tmp = phy;
-+				  dprintf (("MII PHY found at address %d, status " 
-+					    "%hX advertising %hX\n", phy, mii_status, 
-+					    lp->mii_if.advertising));
-+				}
-+			}
-+		}
-+		if (phy_idx == 0)
-+			printf("No MII transceiver found!\n");
-+		lp->mii_if.phy_id = lp->phys[0];
-+
-+		lp->mii_if.advertising =
-+		    mdio_read(nic, lp->phys[0], MII_ADVERTISE);
-+
-+		mii_lpa = mdio_read(nic, lp->phys[0], MII_LPA);
-+		lp->mii_if.advertising &= mii_lpa;
-+		if (lp->mii_if.advertising & ADVERTISE_100FULL)
-+			printf("100Mbps Full-Duplex\n");
-+		else if (lp->mii_if.advertising & ADVERTISE_100HALF)
-+			printf("100Mbps Half-Duplex\n");
-+		else if (lp->mii_if.advertising & ADVERTISE_10FULL)
-+			printf("10Mbps Full-Duplex\n");
-+		else if (lp->mii_if.advertising & ADVERTISE_10HALF)
-+			printf("10Mbps Half-Duplex\n");
-+		else
-+			printf("\n");
-+	}
-+
-+	nic->poll     = pcnet32_poll;
-+	nic->transmit = pcnet32_transmit;
-+	dev->disable  = pcnet32_disable;
-+	nic->irq      = pcnet32_irq;
-+
-+	return 1;
-+}
-+static int mdio_read(struct nic *nic __unused, int phy_id, int reg_num)
-+{
-+	u16 val_out;
-+	int phyaddr;
-+
-+	if (!lp->mii)
-+		return 0;
-+
-+	phyaddr = lp->a.read_bcr(ioaddr, 33);
-+
-+	lp->a.write_bcr(ioaddr, 33,
-+			((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
-+	val_out = lp->a.read_bcr(ioaddr, 34);
-+	lp->a.write_bcr(ioaddr, 33, phyaddr);
-+
-+	return val_out;
-+}
-+
-+#if 0
-+static void mdio_write(struct nic *nic __unused, int phy_id, int reg_num,
-+		       int val)
-+{
-+	int phyaddr;
-+
-+	if (!lp->mii)
-+		return;
-+
-+	phyaddr = lp->a.read_bcr(ioaddr, 33);
-+
-+	lp->a.write_bcr(ioaddr, 33,
-+			((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
-+	lp->a.write_bcr(ioaddr, 34, val);
-+	lp->a.write_bcr(ioaddr, 33, phyaddr);
-+}
-+#endif
-+
-+static struct pci_id pcnet32_nics[] = {
-+	PCI_ROM(0x1022, 0x2000, "lancepci", "AMD Lance/PCI"),
-+	PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD Lance/PCI PCNet/32"),
-+	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD Lance/HomePNA"),
-+};
-+
-+struct pci_driver pcnet32_driver = {
-+	.type = NIC_DRIVER,
-+	.name = "PCNET32/PCI",
-+	.probe = pcnet32_probe,
-+	.ids = pcnet32_nics,
-+	.id_count = sizeof(pcnet32_nics) / sizeof(pcnet32_nics[0]),
-+	.class = 0,
-+};
-Index: b/netboot/pic8259.c
-===================================================================
---- /dev/null
-+++ b/netboot/pic8259.c
-@@ -0,0 +1,267 @@
-+/*
-+ * Basic support for controlling the 8259 Programmable Interrupt Controllers.
-+ *
-+ * Initially written by Michael Brown (mcb30).
-+ */
-+
-+#include <etherboot.h>
-+#include <pic8259.h>
-+
-+#ifdef DEBUG_IRQ
-+#define DBG(...) printf ( __VA_ARGS__ )
-+#else
-+#define DBG(...)
-+#endif
-+
-+/* Current locations of trivial IRQ handler.  These will change at
-+ * runtime when relocation is used; the handler needs to be copied to
-+ * base memory before being installed.
-+ */
-+void (*trivial_irq_handler)P((void)) = _trivial_irq_handler;
-+uint16_t volatile *trivial_irq_trigger_count = &_trivial_irq_trigger_count;
-+segoff_t *trivial_irq_chain_to = &_trivial_irq_chain_to;
-+uint8_t *trivial_irq_chain = &_trivial_irq_chain;
-+irq_t trivial_irq_installed_on = IRQ_NONE;
-+
-+/* Previous trigger count for trivial IRQ handler */
-+static uint16_t trivial_irq_previous_trigger_count = 0;
-+
-+/* Install a handler for the specified IRQ.  Address of previous
-+ * handler will be stored in previous_handler.  Enabled/disabled state
-+ * of IRQ will be preserved across call, therefore if the handler does
-+ * chaining, ensure that either (a) IRQ is disabled before call, or
-+ * (b) previous_handler points directly to the place that the handler
-+ * picks up its chain-to address.
-+ */
-+
-+int install_irq_handler ( irq_t irq, segoff_t *handler,
-+			  uint8_t *previously_enabled,
-+			  segoff_t *previous_handler ) {
-+	segoff_t *irq_vector = IRQ_VECTOR ( irq );
-+	*previously_enabled = irq_enabled ( irq );
-+
-+	if ( irq > IRQ_MAX ) {
-+		DBG ( "Invalid IRQ number %d\n" );
-+		return 0;
-+	}
-+
-+	previous_handler->segment = irq_vector->segment;
-+	previous_handler->offset = irq_vector->offset;
-+	if ( *previously_enabled ) disable_irq ( irq );
-+	DBG ( "Installing handler at %hx:%hx for IRQ %d, leaving %s\n",
-+		  handler->segment, handler->offset, irq,
-+		  ( *previously_enabled ? "enabled" : "disabled" ) );
-+	DBG ( "...(previous handler at %hx:%hx)\n",
-+		  previous_handler->segment, previous_handler->offset );
-+	irq_vector->segment = handler->segment;
-+	irq_vector->offset = handler->offset;
-+	if ( *previously_enabled ) enable_irq ( irq );
-+	return 1;
-+}
-+
-+/* Remove handler for the specified IRQ.  Routine checks that another
-+ * handler has not been installed that chains to handler before
-+ * uninstalling handler.  Enabled/disabled state of the IRQ will be
-+ * restored to that specified by previously_enabled.
-+ */
-+
-+int remove_irq_handler ( irq_t irq, segoff_t *handler,
-+			 uint8_t *previously_enabled,
-+			 segoff_t *previous_handler ) {
-+	segoff_t *irq_vector = IRQ_VECTOR ( irq );
-+
-+	if ( irq > IRQ_MAX ) {
-+		DBG ( "Invalid IRQ number %d\n" );
-+		return 0;
-+	}
-+	if ( ( irq_vector->segment != handler->segment ) ||
-+	     ( irq_vector->offset != handler->offset ) ) {
-+		DBG ( "Cannot remove handler for IRQ %d\n" );
-+		return 0;
-+	}
-+
-+	DBG ( "Removing handler for IRQ %d\n", irq );
-+	disable_irq ( irq );
-+	irq_vector->segment = previous_handler->segment;
-+	irq_vector->offset = previous_handler->offset;
-+	if ( *previously_enabled ) enable_irq ( irq );
-+	return 1;
-+}
-+
-+/* Install the trivial IRQ handler.  This routine installs the
-+ * handler, tests it and enables the IRQ.
-+ */
-+
-+int install_trivial_irq_handler ( irq_t irq ) {
-+	segoff_t trivial_irq_handler_segoff = SEGOFF(trivial_irq_handler);
-+	
-+	if ( trivial_irq_installed_on != IRQ_NONE ) {
-+		DBG ( "Can install trivial IRQ handler only once\n" );
-+		return 0;
-+	}
-+	if ( SEGMENT(trivial_irq_handler) > 0xffff ) {
-+		DBG ( "Trivial IRQ handler not in base memory\n" );
-+		return 0;
-+	}
-+
-+	DBG ( "Installing trivial IRQ handler on IRQ %d\n", irq );
-+	if ( ! install_irq_handler ( irq, &trivial_irq_handler_segoff,
-+				     trivial_irq_chain,
-+				     trivial_irq_chain_to ) )
-+		return 0;
-+	trivial_irq_installed_on = irq;
-+
-+	DBG ( "Testing trivial IRQ handler\n" );
-+	disable_irq ( irq );
-+	*trivial_irq_trigger_count = 0;
-+	trivial_irq_previous_trigger_count = 0;
-+	fake_irq ( irq );
-+	if ( ! trivial_irq_triggered ( irq ) ) {
-+		DBG ( "Installation of trivial IRQ handler failed\n" );
-+		remove_trivial_irq_handler ( irq );
-+		return 0;
-+	}
-+	DBG ( "Trivial IRQ handler installed successfully\n" );
-+	enable_irq ( irq );
-+	return 1;
-+}
-+
-+/* Remove the trivial IRQ handler.
-+ */
-+
-+int remove_trivial_irq_handler ( irq_t irq ) {
-+	segoff_t trivial_irq_handler_segoff = SEGOFF(trivial_irq_handler);
-+
-+	if ( trivial_irq_installed_on == IRQ_NONE ) return 1;
-+	if ( irq != trivial_irq_installed_on ) {
-+		DBG ( "Cannot uninstall trivial IRQ handler from IRQ %d; "
-+		      "is installed on IRQ %d\n", irq,
-+		      trivial_irq_installed_on );
-+		return 0;
-+	}
-+
-+	if ( ! remove_irq_handler ( irq, &trivial_irq_handler_segoff,
-+				    trivial_irq_chain,
-+				    trivial_irq_chain_to ) )
-+		return 0;
-+
-+	if ( trivial_irq_triggered ( trivial_irq_installed_on ) ) {
-+		DBG ( "Sending EOI for unwanted trivial IRQ\n" );
-+		send_specific_eoi ( trivial_irq_installed_on );
-+	}
-+
-+	trivial_irq_installed_on = IRQ_NONE;
-+	return 1;
-+}
-+
-+/* Safe method to detect whether or not trivial IRQ has been
-+ * triggered.  Using this call avoids potential race conditions.  This
-+ * call will return success only once per trigger.
-+ */
-+
-+int trivial_irq_triggered ( irq_t irq ) {
-+	uint16_t trivial_irq_this_trigger_count = *trivial_irq_trigger_count;
-+	int triggered = ( trivial_irq_this_trigger_count -
-+			  trivial_irq_previous_trigger_count );
-+	
-+	/* irq is not used at present, but we have it in the API for
-+	 * future-proofing; in case we want the facility to have
-+	 * multiple trivial IRQ handlers installed simultaneously.
-+	 *
-+	 * Avoid compiler warning about unused variable.
-+	 */
-+	if ( irq == IRQ_NONE ) {};
-+	
-+	trivial_irq_previous_trigger_count = trivial_irq_this_trigger_count;
-+	return triggered ? 1 : 0;
-+}
-+
-+/* Copy trivial IRQ handler to a new location.  Typically used to copy
-+ * the handler into base memory; when relocation is being used we need
-+ * to do this before installing the handler.
-+ *
-+ * Call with target=NULL in order to restore the handler to its
-+ * original location.
-+ */
-+
-+int copy_trivial_irq_handler ( void *target, size_t target_size ) {
-+	irq_t currently_installed_on = trivial_irq_installed_on;
-+	uint32_t offset = ( target == NULL ? 0 :
-+			    target - &_trivial_irq_handler_start );
-+
-+	if (( target != NULL ) && ( target_size < TRIVIAL_IRQ_HANDLER_SIZE )) {
-+		DBG ( "Insufficient space to copy trivial IRQ handler\n" );
-+		return 0;
-+	}
-+
-+	if ( currently_installed_on != IRQ_NONE ) {
-+		DBG ("WARNING: relocating trivial IRQ handler while in use\n");
-+		if ( ! remove_trivial_irq_handler ( currently_installed_on ) )
-+			return 0;
-+	}
-+
-+	/* Do the actual copy */
-+	if ( target != NULL ) {
-+		DBG ( "Copying trivial IRQ handler to %hx:%hx\n",
-+		      SEGMENT(target), OFFSET(target) );
-+		memcpy ( target, &_trivial_irq_handler_start,
-+			 TRIVIAL_IRQ_HANDLER_SIZE );
-+	} else {
-+		DBG ( "Restoring trivial IRQ handler to original location\n" );
-+	}
-+	/* Update all the pointers to structures within the handler */
-+	trivial_irq_handler = ( void (*)P((void)) )
-+		( (void*)_trivial_irq_handler + offset );
-+	trivial_irq_trigger_count = (uint16_t*)
-+		( (void*)&_trivial_irq_trigger_count + offset );
-+	trivial_irq_chain_to = (segoff_t*)
-+		( (void*)&_trivial_irq_chain_to + offset );
-+	trivial_irq_chain = (uint8_t*)
-+		( (void*)&_trivial_irq_chain + offset );
-+
-+	if ( currently_installed_on != IRQ_NONE ) {
-+		if ( ! install_trivial_irq_handler ( currently_installed_on ) )
-+			return 0;
-+	}
-+	return 1;
-+}
-+
-+/* Send non-specific EOI(s).  This seems to be inherently unsafe.
-+ */
-+
-+void send_nonspecific_eoi ( irq_t irq ) {
-+	DBG ( "Sending non-specific EOI for IRQ %d\n", irq );
-+	if ( irq >= IRQ_PIC_CUTOFF ) {
-+		outb ( ICR_EOI_NON_SPECIFIC, PIC2_ICR );
-+	}		
-+	outb ( ICR_EOI_NON_SPECIFIC, PIC1_ICR );
-+}
-+
-+/* Send specific EOI(s).
-+ */
-+
-+void send_specific_eoi ( irq_t irq ) {
-+	DBG ( "Sending specific EOI for IRQ %d\n", irq );
-+	outb ( ICR_EOI_SPECIFIC | ICR_VALUE(irq), ICR_REG(irq) );
-+	if ( irq >= IRQ_PIC_CUTOFF ) {
-+		outb ( ICR_EOI_SPECIFIC | ICR_VALUE(CHAINED_IRQ),
-+		       ICR_REG(CHAINED_IRQ) );
-+	}
-+}
-+
-+/* Dump current 8259 status: enabled IRQs and handler addresses.
-+ */
-+
-+#ifdef DEBUG_IRQ
-+void dump_irq_status ( void ) {
-+	int irq = 0;
-+	
-+	for ( irq = 0; irq < 16; irq++ ) {
-+		if ( irq_enabled ( irq ) ) {
-+			printf ( "IRQ%d enabled, ISR at %hx:%hx\n", irq,
-+				 IRQ_VECTOR(irq)->segment,
-+				 IRQ_VECTOR(irq)->offset );
-+		}
-+	}
-+}
-+#endif
-Index: b/netboot/pic8259.h
-===================================================================
---- /dev/null
-+++ b/netboot/pic8259.h
-@@ -0,0 +1,99 @@
-+/*
-+ * Basic support for controlling the 8259 Programmable Interrupt Controllers.
-+ *
-+ * Initially written by Michael Brown (mcb30).
-+ */
-+
-+#ifndef PIC8259_H
-+#define PIC8259_H
-+
-+/* For segoff_t */
-+#include <segoff.h>
-+
-+#define IRQ_PIC_CUTOFF (8)
-+
-+/* 8259 register locations */
-+#define PIC1_ICW1 (0x20)
-+#define PIC1_OCW2 (0x20)
-+#define PIC1_OCW3 (0x20)
-+#define PIC1_ICR (0x20)
-+#define PIC1_IRR (0x20)
-+#define PIC1_ISR (0x20)
-+#define PIC1_ICW2 (0x21)
-+#define PIC1_ICW3 (0x21)
-+#define PIC1_ICW4 (0x21)
-+#define PIC1_IMR (0x21)
-+#define PIC2_ICW1 (0xa0)
-+#define PIC2_OCW2 (0xa0)
-+#define PIC2_OCW3 (0xa0)
-+#define PIC2_ICR (0xa0)
-+#define PIC2_IRR (0xa0)
-+#define PIC2_ISR (0xa0)
-+#define PIC2_ICW2 (0xa1)
-+#define PIC2_ICW3 (0xa1)
-+#define PIC2_ICW4 (0xa1)
-+#define PIC2_IMR (0xa1)
-+
-+/* Register command values */
-+#define OCW3_ID (0x08)
-+#define OCW3_READ_IRR (0x03)
-+#define OCW3_READ_ISR (0x02)
-+#define ICR_EOI_NON_SPECIFIC (0x20)
-+#define ICR_EOI_NOP (0x40)
-+#define ICR_EOI_SPECIFIC (0x60)
-+#define ICR_EOI_SET_PRIORITY (0xc0)
-+
-+/* Macros to enable/disable IRQs */
-+#define IMR_REG(x) ( (x) < IRQ_PIC_CUTOFF ? PIC1_IMR : PIC2_IMR )
-+#define IMR_BIT(x) ( 1 << ( (x) % IRQ_PIC_CUTOFF ) )
-+#define irq_enabled(x) ( ( inb ( IMR_REG(x) ) & IMR_BIT(x) ) == 0 )
-+#define enable_irq(x) outb ( inb( IMR_REG(x) ) & ~IMR_BIT(x), IMR_REG(x) )
-+#define disable_irq(x) outb ( inb( IMR_REG(x) ) | IMR_BIT(x), IMR_REG(x) )
-+
-+/* Macros for acknowledging IRQs */
-+#define ICR_REG(x) ( (x) < IRQ_PIC_CUTOFF ? PIC1_ICR : PIC2_ICR )
-+#define ICR_VALUE(x) ( (x) % IRQ_PIC_CUTOFF )
-+#define CHAINED_IRQ 2
-+
-+/* Utility macros to convert IRQ numbers to INT numbers and INT vectors  */
-+#define IRQ_INT(x) ( (x)<IRQ_PIC_CUTOFF ? (x)+0x08 : (x)-IRQ_PIC_CUTOFF+0x70 )
-+#define INT_VECTOR(x) ( (segoff_t*) phys_to_virt( 4 * (x) ) )
-+#define IRQ_VECTOR(x) ( INT_VECTOR ( IRQ_INT(x) ) )
-+
-+/* Other constants */
-+typedef uint8_t irq_t;
-+#define IRQ_MAX (15)
-+#define IRQ_NONE (0xff)
-+
-+/* Labels in assembly code (in pcbios.S)
-+ */
-+extern void _trivial_irq_handler_start;
-+extern void _trivial_irq_handler ( void );
-+extern volatile uint16_t _trivial_irq_trigger_count;
-+extern segoff_t _trivial_irq_chain_to;
-+extern uint8_t _trivial_irq_chain;
-+extern void _trivial_irq_handler_end;
-+#define TRIVIAL_IRQ_HANDLER_SIZE \
-+	((uint32_t)( &_trivial_irq_handler_end - &_trivial_irq_handler_start ))
-+
-+/* Function prototypes
-+ */
-+int install_irq_handler ( irq_t irq, segoff_t *handler,
-+			  uint8_t *previously_enabled,
-+			  segoff_t *previous_handler );
-+int remove_irq_handler ( irq_t irq, segoff_t *handler,
-+			 uint8_t *previously_enabled,
-+			 segoff_t *previous_handler );
-+int install_trivial_irq_handler ( irq_t irq );
-+int remove_trivial_irq_handler ( irq_t irq );
-+int trivial_irq_triggered ( irq_t irq );
-+int copy_trivial_irq_handler ( void *target, size_t target_size );
-+void send_non_specific_eoi ( irq_t irq );
-+void send_specific_eoi ( irq_t irq );
-+#ifdef DEBUG_IRQ
-+void dump_irq_status ( void );
-+#else
-+#define dump_irq_status()
-+#endif
-+
-+#endif /* PIC8259_H */
-Index: b/netboot/pnic.c
-===================================================================
---- /dev/null
-+++ b/netboot/pnic.c
-@@ -0,0 +1,267 @@
-+/**************************************************************************
-+Etherboot -  BOOTP/TFTP Bootstrap Program
-+Bochs Pseudo NIC driver for Etherboot
-+***************************************************************************/
-+
-+/*
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2, or (at
-+ * your option) any later version.
-+ *
-+ * See pnic_api.h for an explanation of the Bochs Pseudo NIC.
-+ */
-+
-+/* to get some global routines like printf */
-+#include "etherboot.h"
-+/* to get the interface to the body of the program */
-+#include "nic.h"
-+/* to get the PCI support functions, if this is a PCI NIC */
-+#include "pci.h"
-+
-+/* PNIC API */
-+#include "pnic_api.h"
-+
-+/* Private data structure */
-+typedef struct {
-+	uint16_t api_version;
-+} pnic_priv_data_t;
-+
-+/* Function prototypes */
-+static int pnic_api_check ( uint16_t api_version );
-+
-+/* NIC specific static variables go here */
-+static uint8_t tx_buffer[ETH_FRAME_LEN];
-+
-+/* 
-+ * Utility functions: issue a PNIC command, retrieve result.  Use
-+ * pnic_command_quiet if you don't want failure codes to be
-+ * automatically printed.  Returns the PNIC status code.
-+ * 
-+ * Set output_length to NULL only if you expect to receive exactly
-+ * output_max_length bytes, otherwise it'll complain that you didn't
-+ * get enough data (on the assumption that if you not interested in
-+ * discovering the output length then you're expecting a fixed amount
-+ * of data).
-+ */
-+
-+static uint16_t pnic_command_quiet ( struct nic *nic, uint16_t command,
-+				     void *input, uint16_t input_length,
-+				     void *output, uint16_t output_max_length,
-+				     uint16_t *output_length ) {
-+	int i;
-+	uint16_t status;
-+	uint16_t _output_length;
-+
-+	if ( input != NULL ) {
-+		/* Write input length */
-+		outw ( input_length, nic->ioaddr + PNIC_REG_LEN );
-+		/* Write input data */
-+		for ( i = 0; i < input_length; i++ ) {
-+			outb( ((char*)input)[i], nic->ioaddr + PNIC_REG_DATA );
-+		}
-+	}
-+	/* Write command */
-+	outw ( command, nic->ioaddr + PNIC_REG_CMD );
-+	/* Retrieve status */
-+	status = inw ( nic->ioaddr + PNIC_REG_STAT );
-+	/* Retrieve output length */
-+	_output_length = inw ( nic->ioaddr + PNIC_REG_LEN );
-+	if ( output_length == NULL ) {
-+		if ( _output_length != output_max_length ) {
-+			printf ( "pnic_command %#hx: wrong data length "
-+				 "returned (expected %d, got %d)\n", command,
-+				 output_max_length, _output_length );
-+		}
-+	} else {
-+		*output_length = _output_length;
-+	}
-+	if ( output != NULL ) {
-+		if ( _output_length > output_max_length ) {
-+			printf ( "pnic_command %#hx: output buffer too small "
-+				 "(have %d, need %d)\n", command,
-+				 output_max_length, _output_length );
-+			_output_length = output_max_length;
-+		}
-+		/* Retrieve output data */
-+		for ( i = 0; i < _output_length; i++ ) {
-+			((char*)output)[i] =
-+				inb ( nic->ioaddr + PNIC_REG_DATA );
-+		}
-+	}
-+	return status;
-+}
-+
-+static uint16_t pnic_command ( struct nic *nic, uint16_t command,
-+			       void *input, uint16_t input_length,
-+			       void *output, uint16_t output_max_length,
-+			       uint16_t *output_length ) {
-+	pnic_priv_data_t *priv = (pnic_priv_data_t*)nic->priv_data;
-+	uint16_t status = pnic_command_quiet ( nic, command,
-+					       input, input_length,
-+					       output, output_max_length,
-+					       output_length );
-+	if ( status == PNIC_STATUS_OK ) return status;
-+	printf ( "PNIC command %#hx (len %#hx) failed with status %#hx\n",
-+		 command, input_length, status );
-+	if ( priv->api_version ) pnic_api_check(priv->api_version);
-+	return status;
-+}
-+
-+/* Check API version matches that of NIC */
-+static int pnic_api_check ( uint16_t api_version ) {
-+	if ( api_version != PNIC_API_VERSION ) {
-+		printf ( "Warning: API version mismatch! "
-+			 "(NIC's is %d.%d, ours is %d.%d)\n",
-+			 api_version >> 8, api_version & 0xff,
-+			 PNIC_API_VERSION >> 8, PNIC_API_VERSION & 0xff );
-+	}
-+	if ( api_version < PNIC_API_VERSION ) {
-+		printf ( "*** You may need to update your copy of Bochs ***\n" );
-+	}
-+	return ( api_version == PNIC_API_VERSION );
-+}
-+
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int pnic_poll(struct nic *nic, int retrieve)
-+{
-+	uint16_t length;
-+	uint16_t qlen;
-+
-+	/* Check receive queue length to see if there's anything to
-+	 * get.  Necessary since once we've called PNIC_CMD_RECV we
-+	 * have to read out the packet, otherwise it's lost forever.
-+	 */
-+	if ( pnic_command ( nic, PNIC_CMD_RECV_QLEN, NULL, 0,
-+			    &qlen, sizeof(qlen), NULL )
-+	     != PNIC_STATUS_OK ) return ( 0 );
-+	if ( qlen == 0 ) return ( 0 );
-+
-+	/* There is a packet ready.  Return 1 if we're only checking. */
-+	if ( ! retrieve ) return ( 1 );
-+
-+	/* Retrieve the packet */
-+	if ( pnic_command ( nic, PNIC_CMD_RECV, NULL, 0,
-+			    nic->packet, ETH_FRAME_LEN, &length )
-+	     != PNIC_STATUS_OK ) return ( 0 );
-+	nic->packetlen = length;
-+	return ( 1 );
-+}
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void pnic_transmit(
-+	struct nic *nic,
-+	const char *dest,		/* Destination */
-+	unsigned int type,		/* Type */
-+	unsigned int size,		/* size */
-+	const char *data)		/* Packet */
-+{
-+	unsigned int nstype = htons ( type );
-+
-+	if ( ( ETH_HLEN + size ) >= ETH_FRAME_LEN ) {
-+		printf ( "pnic_transmit: packet too large\n" );
-+		return;
-+	}
-+
-+	/* Assemble packet */
-+	memcpy ( tx_buffer, dest, ETH_ALEN );
-+	memcpy ( tx_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN );
-+	memcpy ( tx_buffer + 2 * ETH_ALEN, &nstype, 2 );
-+	memcpy ( tx_buffer + ETH_HLEN, data, size );
-+
-+	pnic_command ( nic, PNIC_CMD_XMIT, tx_buffer, ETH_HLEN + size,
-+		       NULL, 0, NULL );
-+}
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void pnic_disable(struct dev *dev)
-+{
-+	struct nic *nic = (struct nic *)dev;
-+	pnic_command ( nic, PNIC_CMD_RESET, NULL, 0, NULL, 0, NULL );
-+}
-+
-+/**************************************************************************
-+IRQ - Handle card interrupt status
-+***************************************************************************/
-+static void pnic_irq ( struct nic *nic, irq_action_t action )
-+{
-+	uint8_t enabled;
-+
-+	switch ( action ) {
-+	case DISABLE :
-+	case ENABLE :
-+		enabled = ( action == ENABLE ? 1 : 0 );
-+		pnic_command ( nic, PNIC_CMD_MASK_IRQ,
-+			       &enabled, sizeof(enabled), NULL, 0, NULL );
-+		break;
-+	case FORCE :
-+		pnic_command ( nic, PNIC_CMD_FORCE_IRQ,
-+			       NULL, 0, NULL, 0, NULL );
-+		break;
-+	}
-+}
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+***************************************************************************/
-+
-+static int pnic_probe(struct dev *dev, struct pci_device *pci)
-+{
-+	struct nic *nic = (struct nic *)dev;
-+	static pnic_priv_data_t priv;
-+	uint16_t status;
-+
-+	printf(" - ");
-+
-+	/* Clear private data structure and chain it in */
-+	memset ( &priv, 0, sizeof(priv) );
-+	nic->priv_data = &priv;
-+
-+	/* Mask the bit that says "this is an io addr" */
-+	nic->ioaddr = pci->ioaddr & ~3;
-+	nic->irqno = pci->irq;
-+	/* Not sure what this does, but the rtl8139 driver does it */
-+	adjust_pci_device(pci);
-+
-+	status = pnic_command_quiet( nic, PNIC_CMD_API_VER, NULL, 0,
-+				     &priv.api_version,
-+				     sizeof(priv.api_version), NULL );
-+	if ( status != PNIC_STATUS_OK ) {
-+		printf ( "PNIC failed installation check, code %#hx\n",
-+			 status );
-+		return 0;
-+	}
-+	pnic_api_check(priv.api_version);
-+	status = pnic_command ( nic, PNIC_CMD_READ_MAC, NULL, 0,
-+				nic->node_addr, ETH_ALEN, NULL );
-+	printf ( "Detected Bochs Pseudo NIC MAC %! (API v%d.%d) at %#hx\n",
-+		 nic->node_addr, priv.api_version>>8, priv.api_version&0xff,
-+		 nic->ioaddr );
-+
-+	/* point to NIC specific routines */
-+	dev->disable  = pnic_disable;
-+	nic->poll     = pnic_poll;
-+	nic->transmit = pnic_transmit;
-+	nic->irq      = pnic_irq;
-+	return 1;
-+}
-+
-+static struct pci_id pnic_nics[] = {
-+/* genrules.pl doesn't let us use macros for PCI IDs...*/
-+PCI_ROM(0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor"),
-+};
-+
-+struct pci_driver pnic_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "PNIC",
-+	.probe    = pnic_probe,
-+	.ids      = pnic_nics,
-+	.id_count = sizeof(pnic_nics)/sizeof(pnic_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/pnic_api.h
-===================================================================
---- /dev/null
-+++ b/netboot/pnic_api.h
-@@ -0,0 +1,59 @@
-+/*
-+ * Constants etc. for the Bochs/Etherboot pseudo-NIC
-+ * 
-+ * This header file must be valid C and C++.
-+ *
-+ * Operation of the pseudo-NIC (PNIC) is pretty simple.  To write a
-+ * command plus data, first write the length of the data to
-+ * PNIC_REG_LEN, then write the data a byte at a type to
-+ * PNIC_REG_DATA, then write the command code to PNIC_REG_CMD.  The
-+ * status will be available from PNIC_REG_STAT.  The length of any
-+ * data returned will be in PNIC_REG_LEN and can be read a byte at a
-+ * time from PNIC_REG_DATA.
-+ */
-+
-+/*
-+ * PCI parameters
-+ */
-+#define PNIC_PCI_VENDOR	0xfefe	/* Hopefully these won't clash with */
-+#define PNIC_PCI_DEVICE 0xefef	/* any real PCI device IDs.         */
-+
-+/*
-+ * 'Hardware' register addresses, offset from io_base
-+ */
-+#define PNIC_REG_CMD	0x00	/* Command register, 2 bytes, write only */
-+#define PNIC_REG_STAT	0x00	/* Status register, 2 bytes, read only */
-+#define PNIC_REG_LEN	0x02	/* Length register, 2 bytes, read-write */
-+#define PNIC_REG_DATA	0x04	/* Data port, 1 byte, read-write */
-+/*
-+ * PNIC_MAX_REG used in Bochs to claim i/o space
-+ */
-+#define PNIC_MAX_REG	0x04
-+
-+/*
-+ * Command code definitions: write these into PNIC_REG_CMD
-+ */
-+#define PNIC_CMD_NOOP		0x0000
-+#define PNIC_CMD_API_VER	0x0001
-+#define PNIC_CMD_READ_MAC	0x0002
-+#define PNIC_CMD_RESET		0x0003
-+#define PNIC_CMD_XMIT		0x0004
-+#define PNIC_CMD_RECV		0x0005
-+#define PNIC_CMD_RECV_QLEN	0x0006
-+#define PNIC_CMD_MASK_IRQ	0x0007
-+#define PNIC_CMD_FORCE_IRQ	0x0008
-+
-+/*
-+ * Status code definitions: read these from PNIC_REG_STAT
-+ *
-+ * We avoid using status codes that might be confused with
-+ * randomly-read data (e.g. 0x0000, 0xffff etc.)
-+ */
-+#define PNIC_STATUS_OK		0x4f4b		/* 'OK' */
-+#define PNIC_STATUS_UNKNOWN_CMD	0x3f3f		/* '??' */
-+
-+/*
-+ * Other miscellaneous information
-+ */
-+
-+#define PNIC_API_VERSION	0x0101		/* 1.1 */
-Index: b/netboot/pxe.h
-===================================================================
---- /dev/null
-+++ b/netboot/pxe.h
-@@ -0,0 +1,521 @@
-+/*
-+ * Copyright (c) 2000 Alfred Perlstein <alfred@freebsd.org>
-+ * All rights reserved.
-+ * Copyright (c) 2000 Paul Saab <ps@freebsd.org>
-+ * All rights reserved.
-+ * Copyright (c) 2000 John Baldwin <jhb@freebsd.org>
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ * SUCH DAMAGE.
-+ *
-+ * $FreeBSD: src/sys/boot/i386/libi386/pxe.h,v 1.4.2.2 2000/09/10 02:52:18 ps Exp $
-+ */
-+
-+/*
-+ * The typedefs and structures declared in this file
-+ * clearly violate style(9), the reason for this is to conform to the
-+ * typedefs/structure-names used in the Intel literature to avoid confusion.
-+ *
-+ * It's for your own good. :)
-+ */
-+
-+/* SEGOFF16_t defined in separate header for Etherboot
-+ */
-+#include <segoff.h>
-+
-+/* It seems that intel didn't think about ABI,
-+ * either that or 16bit ABI != 32bit ABI (which seems reasonable)
-+ * I have to thank Intel for the hair loss I incurred trying to figure
-+ * out why PXE was mis-reading structures I was passing it (at least
-+ * from my point of view)
-+ *
-+ * Solution: use gcc's '__attribute__ ((packed))' to correctly align
-+ * structures passed into PXE
-+ * Question: does this really work for PXE's expected ABI?
-+ */
-+#define	PACKED		__attribute__ ((packed))
-+
-+#define	S_SIZE(s)	s, sizeof(s) - 1
-+
-+#define	IP_STR		"%d.%d.%d.%d"
-+#define	IP_ARGS(ip)					\
-+	(int)(ip >> 24) & 0xff, (int)(ip >> 16) & 0xff, \
-+	(int)(ip >> 8) & 0xff, (int)ip & 0xff
-+
-+#define	MAC_STR		"%02x:%02x:%02x:%02x:%02x:%02x"
-+#define	MAC_ARGS(mac)					\
-+	mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] 
-+
-+#define	PXENFSROOTPATH	"/pxeroot"
-+
-+typedef struct {
-+	uint16_t		Seg_Addr;
-+	uint32_t		Phy_Addr;
-+	uint16_t		Seg_Size;
-+} PACKED SEGDESC_t; /* PACKED is required, otherwise gcc pads this out to 12
-+		       bytes - mbrown@fensystems.co.uk (mcb30) 17/5/03 */
-+
-+typedef	uint16_t		SEGSEL_t;
-+typedef	uint16_t		PXENV_STATUS_t;
-+typedef	uint32_t		IP4_t;
-+typedef	uint32_t		ADDR32_t;
-+typedef	uint16_t		UDP_PORT_t;
-+
-+#define	MAC_ADDR_LEN		16
-+typedef	uint8_t			MAC_ADDR[MAC_ADDR_LEN];
-+
-+/* PXENV+ */
-+typedef struct {
-+	uint8_t		Signature[6];	/* 'PXENV+' */
-+	uint16_t	Version;	/* MSB = major, LSB = minor */
-+	uint8_t		Length;		/* structure length */
-+	uint8_t		Checksum;	/* checksum pad */
-+	SEGOFF16_t	RMEntry;	/* SEG:OFF to PXE entry point */
-+	/* don't use PMOffset and PMSelector (from the 2.1 PXE manual) */
-+	uint32_t	PMOffset;	/* Protected mode entry */
-+	SEGSEL_t	PMSelector;	/* Protected mode selector */
-+	SEGSEL_t	StackSeg;	/* Stack segment address */
-+	uint16_t	StackSize;	/* Stack segment size (bytes) */
-+	SEGSEL_t	BC_CodeSeg;	/* BC Code segment address */
-+	uint16_t	BC_CodeSize;	/* BC Code segment size (bytes) */
-+	SEGSEL_t	BC_DataSeg;	/* BC Data segment address */
-+	uint16_t	BC_DataSize;	/* BC Data segment size (bytes) */
-+	SEGSEL_t	UNDIDataSeg;	/* UNDI Data segment address */
-+	uint16_t	UNDIDataSize;	/* UNDI Data segment size (bytes) */
-+	SEGSEL_t	UNDICodeSeg;	/* UNDI Code segment address */
-+	uint16_t	UNDICodeSize;	/* UNDI Code segment size (bytes) */
-+	SEGOFF16_t	PXEPtr;		/* SEG:OFF to !PXE struct, 
-+					   only present when Version > 2.1 */
-+} PACKED pxenv_t;
-+
-+/* !PXE */
-+typedef struct {
-+	uint8_t		Signature[4];
-+	uint8_t		StructLength;
-+	uint8_t		StructCksum;
-+	uint8_t		StructRev;
-+	uint8_t		reserved_1;
-+	SEGOFF16_t	UNDIROMID;
-+	SEGOFF16_t	BaseROMID;
-+	SEGOFF16_t	EntryPointSP;
-+	SEGOFF16_t	EntryPointESP;
-+	SEGOFF16_t	StatusCallout;
-+	uint8_t		reserved_2;
-+	uint8_t		SegDescCn;
-+	SEGSEL_t	FirstSelector;
-+	SEGDESC_t	Stack;
-+	SEGDESC_t	UNDIData;
-+	SEGDESC_t	UNDICode;
-+	SEGDESC_t	UNDICodeWrite;
-+	SEGDESC_t	BC_Data;
-+	SEGDESC_t	BC_Code;
-+	SEGDESC_t	BC_CodeWrite;
-+} PACKED pxe_t;
-+
-+#define	PXENV_START_UNDI		0x0000
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint16_t	ax;
-+	uint16_t	bx;
-+	uint16_t	dx;
-+	uint16_t	di;
-+	uint16_t	es;
-+} PACKED t_PXENV_START_UNDI;
-+
-+#define	PXENV_UNDI_STARTUP		0x0001
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_STARTUP;
-+
-+#define	PXENV_UNDI_CLEANUP		0x0002
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_CLEANUP;
-+
-+#define	PXENV_UNDI_INITIALIZE		0x0003
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	ADDR32_t	ProtocolIni;	/* Phys addr of a copy of the driver module */
-+	uint8_t		reserved[8];
-+} PACKED t_PXENV_UNDI_INITIALIZE;
-+
-+
-+#define	MAXNUM_MCADDR		8
-+typedef struct {
-+	uint16_t	MCastAddrCount;
-+	MAC_ADDR	McastAddr[MAXNUM_MCADDR];
-+} PACKED t_PXENV_UNDI_MCAST_ADDRESS;
-+
-+#define	PXENV_UNDI_RESET_ADAPTER	0x0004		
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-+} PACKED t_PXENV_UNDI_RESET;
-+
-+#define	PXENV_UNDI_SHUTDOWN		0x0005
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_SHUTDOWN;
-+
-+#define	PXENV_UNDI_OPEN			0x0006
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint16_t	OpenFlag;
-+	uint16_t	PktFilter;
-+#	define FLTR_DIRECTED	0x0001
-+#	define FLTR_BRDCST	0x0002
-+#	define FLTR_PRMSCS	0x0003
-+#	define FLTR_SRC_RTG	0x0004
-+
-+	t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-+} PACKED t_PXENV_UNDI_OPEN;
-+
-+#define	PXENV_UNDI_CLOSE		0x0007
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_CLOSE;
-+
-+#define	PXENV_UNDI_TRANSMIT		0x0008
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint8_t		Protocol;
-+#	define P_UNKNOWN	0
-+#	define P_IP		1
-+#	define P_ARP		2
-+#	define P_RARP		3
-+
-+	uint8_t		XmitFlag;
-+#	define XMT_DESTADDR	0x0000
-+#	define XMT_BROADCAST	0x0001
-+
-+	SEGOFF16_t	DestAddr;
-+	SEGOFF16_t	TBD;
-+	uint32_t	Reserved[2];
-+} PACKED t_PXENV_UNDI_TRANSMIT;
-+
-+#define	MAX_DATA_BLKS		8
-+typedef struct {
-+	uint16_t	ImmedLength;
-+	SEGOFF16_t	Xmit;
-+	uint16_t	DataBlkCount;
-+	struct	DataBlk {
-+		uint8_t		TDPtrType;
-+		uint8_t		TDRsvdByte;
-+		uint16_t	TDDataLen;
-+		SEGOFF16_t	TDDataPtr;
-+	} DataBlock[MAX_DATA_BLKS];
-+} PACKED t_PXENV_UNDI_TBD;
-+
-+#define	PXENV_UNDI_SET_MCAST_ADDRESS	0x0009
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	t_PXENV_UNDI_MCAST_ADDRESS R_Mcast_Buf;
-+} PACKED t_PXENV_UNDI_SET_MCAST_ADDR;
-+
-+#define	PXENV_UNDI_SET_STATION_ADDRESS	0x000A
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	MAC_ADDR	StationAddress;		/* Temp MAC addres to use */
-+} PACKED t_PXENV_UNDI_SET_STATION_ADDRESS;
-+
-+#define	PXENV_UNDI_SET_PACKET_FILTER	0x000B
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint8_t		filter;			/* see UNDI_OPEN (0x0006) */
-+} PACKED t_PXENV_UNDI_SET_PACKET_FILTER;
-+
-+#define	PXENV_UNDI_GET_INFORMATION	0x000C
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint16_t	BaseIo;			/* Adapter base I/O address */
-+	uint16_t	IntNumber;		/* Adapter IRQ number */
-+	uint16_t	MaxTranUnit;		/* Adapter maximum transmit unit */
-+	uint16_t	HwType;			/* Type of protocol at the hardware addr */
-+#	define ETHER_TYPE	1
-+#	define EXP_ETHER_TYPE	2
-+#	define IEEE_TYPE	6
-+#	define ARCNET_TYPE	7
-+
-+	uint16_t	HwAddrLen;		/* Length of hardware address */
-+	MAC_ADDR	CurrentNodeAddress;	/* Current hardware address */
-+	MAC_ADDR	PermNodeAddress;	/* Permanent hardware address */
-+	SEGSEL_t	ROMAddress;		/* Real mode ROM segment address */
-+	uint16_t	RxBufCt;		/* Receive queue length */
-+	uint16_t	TxBufCt;		/* Transmit queue length */
-+} PACKED t_PXENV_UNDI_GET_INFORMATION;
-+
-+#define	PXENV_UNDI_GET_STATISTICS	0x000D
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint32_t	XmitGoodFrames;		/* Number of successful transmissions */
-+	uint32_t	RcvGoodFrames;		/* Number of good frames received */
-+	uint32_t	RcvCRCErrors;		/* Number of frames with CRC errors */
-+	uint32_t	RcvResourceErrors;	/* Number of frames dropped */
-+} PACKED t_PXENV_UNDI_GET_STATISTICS;
-+
-+#define	PXENV_UNDI_CLEAR_STATISTICS	0x000E
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_CLEAR_STATISTICS;
-+
-+#define	PXENV_UNDI_INITIATE_DIAGS	0x000F
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_INITIATE_DIAGS;
-+
-+#define	PXENV_UNDI_FORCE_INTERRUPT	0x0010
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_UNDI_FORCE_INTERRUPT;
-+
-+#define	PXENV_UNDI_GET_MCAST_ADDRESS	0x0011
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	IP4_t		InetAddr;		/* IP mulicast address */
-+	MAC_ADDR	MediaAddr;		/* MAC multicast address */
-+} PACKED t_PXENV_UNDI_GET_MCAST_ADDR;
-+
-+#define	PXENV_UNDI_GET_NIC_TYPE		0x0012
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint8_t		NicType;		/* Type of NIC */
-+#	define PCI_NIC		2
-+#	define PnP_NIC		3
-+#	define CardBus_NIC	4
-+
-+	union {
-+		struct {
-+			uint16_t	Vendor_ID;
-+			uint16_t	Dev_ID;
-+			uint8_t		Base_Class;
-+			uint8_t		Sub_Class;
-+			uint8_t		Prog_Intf;
-+			uint8_t		Rev;
-+			uint16_t	BusDevFunc;
-+			uint16_t	SubVendor_ID;
-+			uint16_t	SubDevice_ID;
-+		} pci, cardbus;
-+		struct {
-+			uint32_t	EISA_Dev_ID;
-+			uint8_t		Base_Class;
-+			uint8_t		Sub_Class;
-+			uint8_t		Prog_Intf;
-+			uint16_t	CardSelNum;
-+		} pnp;
-+	} info;
-+} PACKED t_PXENV_UNDI_GET_NIC_TYPE;
-+
-+#define	PXENV_UNDI_GET_IFACE_INFO	0x0013
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint8_t		IfaceType[16];		/* Name of MAC type in ASCII. */
-+	uint32_t	LinkSpeed;		/* Defined in NDIS 2.0 spec */
-+	uint32_t	ServiceFlags;		/* Defined in NDIS 2.0 spec */
-+	uint32_t	Reserved[4];		/* must be 0 */
-+} PACKED t_PXENV_UNDI_GET_IFACE_INFO;
-+
-+#define	PXENV_UNDI_ISR			0x0014
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint16_t	FuncFlag;		/* PXENV_UNDI_ISR_OUT_xxx */
-+	uint16_t	BufferLength;		/* Length of Frame */
-+	uint16_t	FrameLength;		/* Total length of reciever frame */
-+	uint16_t	FrameHeaderLength;	/* Length of the media header in Frame */
-+	SEGOFF16_t	Frame;			/* receive buffer */
-+	uint8_t		ProtType;		/* Protocol type */
-+	uint8_t		PktType;		/* Packet Type */
-+#	define PXENV_UNDI_ISR_IN_START		1
-+#	define PXENV_UNDI_ISR_IN_PROCESS	2
-+#	define PXENV_UNDI_ISR_IN_GET_NEXT	3
-+
-+	/* one of these will be returned for PXENV_UNDI_ISR_IN_START */
-+#	define PXENV_UNDI_ISR_OUT_OURS		0
-+#	define PXENV_UNDI_ISR_OUT_NOT_OURS	1
-+
-+	/*
-+	 * one of these will bre returnd for PXEND_UNDI_ISR_IN_PROCESS
-+	 * and PXENV_UNDI_ISR_IN_GET_NEXT
-+	 */
-+#	define PXENV_UNDI_ISR_OUT_DONE		0
-+#	define PXENV_UNDI_ISR_OUT_TRANSMIT	2
-+#	define PXENV_UNDI_ISR_OUT_RECEIVE	3
-+#	define PXENV_UNDI_ISR_OUT_BUSY		4
-+} PACKED t_PXENV_UNDI_ISR;
-+
-+#define	PXENV_STOP_UNDI			0x0015
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_STOP_UNDI;
-+
-+#define	PXENV_TFTP_OPEN			0x0020
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	IP4_t		ServerIPAddress;
-+	IP4_t		GatewayIPAddress;
-+	uint8_t		FileName[128];
-+	UDP_PORT_t	TFTPPort;
-+	uint16_t	PacketSize;
-+} PACKED t_PXENV_TFTP_OPEN;
-+
-+#define	PXENV_TFTP_CLOSE		0x0021
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_TFTP_CLOSE;
-+
-+#define	PXENV_TFTP_READ			0x0022
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint16_t	PacketNumber;
-+	uint16_t	BufferSize;
-+	SEGOFF16_t	Buffer;
-+} PACKED t_PXENV_TFTP_READ;
-+
-+#define	PXENV_TFTP_READ_FILE		0x0023
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint8_t		FileName[128];
-+	uint32_t	BufferSize;
-+	ADDR32_t	Buffer;
-+	IP4_t		ServerIPAddress;
-+	IP4_t		GatewayIPAdress;
-+	IP4_t		McastIPAdress;
-+	UDP_PORT_t	TFTPClntPort;
-+	UDP_PORT_t	TFTPSrvPort;
-+	uint16_t	TFTPOpenTimeOut;
-+	uint16_t	TFTPReopenDelay;
-+} PACKED t_PXENV_TFTP_READ_FILE;
-+
-+#define	PXENV_TFTP_GET_FSIZE		0x0025
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	IP4_t		ServerIPAddress;
-+	IP4_t		GatewayIPAdress;
-+	uint8_t		FileName[128];
-+	uint32_t	FileSize;
-+} PACKED t_PXENV_TFTP_GET_FSIZE;
-+
-+#define	PXENV_UDP_OPEN			0x0030
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	IP4_t		src_ip;		/* IP address of this station */
-+} PACKED t_PXENV_UDP_OPEN;
-+
-+#define	PXENV_UDP_CLOSE			0x0031
-+typedef struct {
-+	PXENV_STATUS_t	status;
-+} PACKED t_PXENV_UDP_CLOSE;
-+
-+#define	PXENV_UDP_READ			0x0032
-+typedef struct {
-+	PXENV_STATUS_t	status;
-+	IP4_t		src_ip;		/* IP of sender */
-+	IP4_t		dest_ip;	/* Only accept packets sent to this IP */
-+	UDP_PORT_t	s_port;		/* UDP source port of sender */
-+	UDP_PORT_t	d_port;		/* Only accept packets sent to this port */
-+	uint16_t	buffer_size;	/* Size of the packet buffer */
-+	SEGOFF16_t	buffer;		/* SEG:OFF to the packet buffer */
-+} PACKED t_PXENV_UDP_READ;
-+
-+#define	PXENV_UDP_WRITE			0x0033
-+typedef struct {
-+	PXENV_STATUS_t	status;
-+	IP4_t		ip;		/* dest ip addr */
-+	IP4_t		gw;		/* ip gateway */
-+	UDP_PORT_t	src_port;	/* source udp port */
-+	UDP_PORT_t	dst_port;	/* destination udp port */
-+	uint16_t	buffer_size;	/* Size of the packet buffer */
-+	SEGOFF16_t	buffer;		/* SEG:OFF to the packet buffer */
-+} PACKED t_PXENV_UDP_WRITE;
-+
-+#define	PXENV_UNLOAD_STACK		0x0070
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint8_t		reserved[10];
-+} PACKED t_PXENV_UNLOAD_STACK;
-+
-+
-+#define	PXENV_GET_CACHED_INFO		0x0071
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+	uint16_t	PacketType;	/* type (defined right here) */
-+#	define PXENV_PACKET_TYPE_DHCP_DISCOVER  1
-+#	define PXENV_PACKET_TYPE_DHCP_ACK       2
-+#	define PXENV_PACKET_TYPE_BINL_REPLY     3
-+	uint16_t	BufferSize;	/* max to copy, leave at 0 for pointer */
-+	SEGOFF16_t	Buffer;		/* copy to, leave at 0 for pointer */
-+	uint16_t	BufferLimit;	/* max size of buffer in BC dataseg ? */
-+} PACKED t_PXENV_GET_CACHED_INFO;
-+
-+
-+/* structure filled in by PXENV_GET_CACHED_INFO 
-+ * (how we determine which IP we downloaded the initial bootstrap from)
-+ * words can't describe...
-+ */
-+typedef struct {
-+	uint8_t		opcode;
-+#	define BOOTP_REQ	1
-+#	define BOOTP_REP	2
-+	uint8_t		Hardware;	/* hardware type */
-+	uint8_t		Hardlen;	/* hardware addr len */
-+	uint8_t		Gatehops;	/* zero it */
-+	uint32_t	ident;		/* random number chosen by client */
-+	uint16_t	seconds;	/* seconds since did initial bootstrap */
-+	uint16_t	Flags;		/* seconds since did initial bootstrap */
-+#	define BOOTP_BCAST	0x8000		/* ? */
-+	IP4_t		cip;		/* Client IP */
-+	IP4_t		yip;		/* Your IP */
-+	IP4_t		sip;		/* IP to use for next boot stage */
-+	IP4_t		gip;		/* Relay IP ? */
-+	MAC_ADDR	CAddr;		/* Client hardware address */
-+	uint8_t		Sname[64];	/* Server's hostname (Optional) */
-+	uint8_t		bootfile[128];	/* boot filename */
-+	union {
-+#		if 1
-+#		define BOOTP_DHCPVEND  1024    /* DHCP extended vendor field size */
-+#		else
-+#		define BOOTP_DHCPVEND  312	/* DHCP standard vendor field size */
-+#		endif
-+		uint8_t		d[BOOTP_DHCPVEND];	/* raw array of vendor/dhcp options */
-+		struct {
-+			uint8_t		magic[4];	/* DHCP magic cookie */
-+#			ifndef		VM_RFC1048
-+#			define		VM_RFC1048	0x63825363L	/* ? */
-+#			endif
-+			uint32_t	flags;		/* bootp flags/opcodes */
-+			uint8_t		pad[56];	/* I don't think intel knows what a
-+							   union does... */
-+		} v;
-+	} vendor;
-+} PACKED BOOTPLAYER;
-+
-+#define	PXENV_RESTART_TFTP		0x0073
-+#define	t_PXENV_RESTART_TFTP		t_PXENV_TFTP_READ_FILE
-+
-+#define	PXENV_START_BASE		0x0075
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_START_BASE;
-+
-+#define	PXENV_STOP_BASE			0x0076
-+typedef struct {
-+	PXENV_STATUS_t	Status;
-+} PACKED t_PXENV_STOP_BASE;
-Index: b/netboot/r8169.c
-===================================================================
---- /dev/null
-+++ b/netboot/r8169.c
-@@ -0,0 +1,854 @@
-+/**************************************************************************
-+*    r8169.c: Etherboot device driver for the RealTek RTL-8169 Gigabit
-+*    Written 2003 by Timothy Legge <tlegge@rogers.com>
-+*
-+*    This program is free software; you can redistribute it and/or modify
-+*    it under the terms of the GNU General Public License as published by
-+*    the Free Software Foundation; either version 2 of the License, or
-+*    (at your option) any later version.
-+*
-+*    This program is distributed in the hope that it will be useful,
-+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+*    GNU General Public License for more details.
-+*
-+*    You should have received a copy of the GNU General Public License
-+*    along with this program; if not, write to the Free Software
-+*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*
-+*    Portions of this code based on:
-+*	r8169.c: A RealTek RTL-8169 Gigabit Ethernet driver 
-+* 		for Linux kernel 2.4.x.
-+*
-+*    Written 2002 ShuChen <shuchen@realtek.com.tw>
-+*	  See Linux Driver for full information
-+*	
-+*    Linux Driver Version 1.27a, 10.02.2002
-+* 
-+*    Thanks to:
-+*    	Jean Chen of RealTek Semiconductor Corp. for
-+*    	providing the evaluation NIC used to develop 
-+*    	this driver.  RealTek's support for Etherboot 
-+*    	is appreciated.
-+*    	
-+*    REVISION HISTORY:
-+*    ================
-+*
-+*    v1.0	11-26-2003	timlegge	Initial port of Linux driver
-+*    v1.5	01-17-2004	timlegge	Initial driver output cleanup
-+*    v1.6	03-27-2004	timlegge	Additional Cleanup
-+*    
-+*    Indent Options: indent -kr -i8
-+***************************************************************************/
-+
-+/* to get some global routines like printf */
-+#include "etherboot.h"
-+/* to get the interface to the body of the program */
-+#include "nic.h"
-+/* to get the PCI support functions, if this is a PCI NIC */
-+#include "pci.h"
-+#include "timer.h"
-+
-+#define drv_version "v1.6"
-+#define drv_date "03-27-2004"
-+
-+typedef unsigned char u8;
-+typedef signed char s8;
-+typedef unsigned short u16;
-+typedef signed short s16;
-+typedef unsigned int u32;
-+typedef signed int s32;
-+
-+#define HZ 1000
-+
-+static u32 ioaddr;
-+
-+#ifdef EDEBUG
-+#define dprintf(x) printf x
-+#else
-+#define dprintf(x)
-+#endif
-+
-+/* Condensed operations for readability. */
-+#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
-+#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
-+
-+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
-+
-+/* media options 
-+        _10_Half = 0x01,
-+        _10_Full = 0x02,
-+        _100_Half = 0x04,
-+        _100_Full = 0x08,
-+        _1000_Full = 0x10,
-+*/
-+static int media = -1;
-+
-+#if 0
-+/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-+static int max_interrupt_work = 20;
-+#endif
-+
-+#if 0
-+/* Maximum number of multicast addresses to filter (vs. Rx-all-multicast).
-+   The RTL chips use a 64 element hash table based on the Ethernet CRC.  */
-+static int multicast_filter_limit = 32;
-+#endif
-+
-+/* MAC address length*/
-+#define MAC_ADDR_LEN	6
-+
-+/* max supported gigabit ethernet frame size -- must be at least (dev->mtu+14+4).*/
-+#define MAX_ETH_FRAME_SIZE	1536
-+
-+#define TX_FIFO_THRESH 256	/* In bytes */
-+
-+#define RX_FIFO_THRESH	7	/* 7 means NO threshold, Rx buffer level before first PCI xfer.  */
-+#define RX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */
-+#define TX_DMA_BURST	6	/* Maximum PCI burst, '6' is 1024 */
-+#define EarlyTxThld 	0x3F	/* 0x3F means NO early transmit */
-+#define RxPacketMaxSize	0x0800	/* Maximum size supported is 16K-1 */
-+#define InterFrameGap	0x03	/* 3 means InterFrameGap = the shortest one */
-+
-+#define NUM_TX_DESC	1	/* Number of Tx descriptor registers */
-+#define NUM_RX_DESC	4	/* Number of Rx descriptor registers */
-+#define RX_BUF_SIZE	1536	/* Rx Buffer size */
-+
-+#define RTL_MIN_IO_SIZE 0x80
-+#define TX_TIMEOUT  (6*HZ)
-+
-+/* write/read MMIO register */
-+#define RTL_W8(reg, val8)	writeb ((val8), ioaddr + (reg))
-+#define RTL_W16(reg, val16)	writew ((val16), ioaddr + (reg))
-+#define RTL_W32(reg, val32)	writel ((val32), ioaddr + (reg))
-+#define RTL_R8(reg)		readb (ioaddr + (reg))
-+#define RTL_R16(reg)		readw (ioaddr + (reg))
-+#define RTL_R32(reg)		((unsigned long) readl (ioaddr + (reg)))
-+
-+enum RTL8169_registers {
-+	MAC0 = 0,		/* Ethernet hardware address. */
-+	MAR0 = 8,		/* Multicast filter. */
-+	TxDescStartAddr = 0x20,
-+	TxHDescStartAddr = 0x28,
-+	FLASH = 0x30,
-+	ERSR = 0x36,
-+	ChipCmd = 0x37,
-+	TxPoll = 0x38,
-+	IntrMask = 0x3C,
-+	IntrStatus = 0x3E,
-+	TxConfig = 0x40,
-+	RxConfig = 0x44,
-+	RxMissed = 0x4C,
-+	Cfg9346 = 0x50,
-+	Config0 = 0x51,
-+	Config1 = 0x52,
-+	Config2 = 0x53,
-+	Config3 = 0x54,
-+	Config4 = 0x55,
-+	Config5 = 0x56,
-+	MultiIntr = 0x5C,
-+	PHYAR = 0x60,
-+	TBICSR = 0x64,
-+	TBI_ANAR = 0x68,
-+	TBI_LPAR = 0x6A,
-+	PHYstatus = 0x6C,
-+	RxMaxSize = 0xDA,
-+	CPlusCmd = 0xE0,
-+	RxDescStartAddr = 0xE4,
-+	EarlyTxThres = 0xEC,
-+	FuncEvent = 0xF0,
-+	FuncEventMask = 0xF4,
-+	FuncPresetState = 0xF8,
-+	FuncForceEvent = 0xFC,
-+};
-+
-+enum RTL8169_register_content {
-+	/*InterruptStatusBits */
-+	SYSErr = 0x8000,
-+	PCSTimeout = 0x4000,
-+	SWInt = 0x0100,
-+	TxDescUnavail = 0x80,
-+	RxFIFOOver = 0x40,
-+	RxUnderrun = 0x20,
-+	RxOverflow = 0x10,
-+	TxErr = 0x08,
-+	TxOK = 0x04,
-+	RxErr = 0x02,
-+	RxOK = 0x01,
-+
-+	/*RxStatusDesc */
-+	RxRES = 0x00200000,
-+	RxCRC = 0x00080000,
-+	RxRUNT = 0x00100000,
-+	RxRWT = 0x00400000,
-+
-+	/*ChipCmdBits */
-+	CmdReset = 0x10,
-+	CmdRxEnb = 0x08,
-+	CmdTxEnb = 0x04,
-+	RxBufEmpty = 0x01,
-+
-+	/*Cfg9346Bits */
-+	Cfg9346_Lock = 0x00,
-+	Cfg9346_Unlock = 0xC0,
-+
-+	/*rx_mode_bits */
-+	AcceptErr = 0x20,
-+	AcceptRunt = 0x10,
-+	AcceptBroadcast = 0x08,
-+	AcceptMulticast = 0x04,
-+	AcceptMyPhys = 0x02,
-+	AcceptAllPhys = 0x01,
-+
-+	/*RxConfigBits */
-+	RxCfgFIFOShift = 13,
-+	RxCfgDMAShift = 8,
-+
-+	/*TxConfigBits */
-+	TxInterFrameGapShift = 24,
-+	TxDMAShift = 8,		/* DMA burst value (0-7) is shift this many bits */
-+
-+	/*rtl8169_PHYstatus */
-+	TBI_Enable = 0x80,
-+	TxFlowCtrl = 0x40,
-+	RxFlowCtrl = 0x20,
-+	_1000bpsF = 0x10,
-+	_100bps = 0x08,
-+	_10bps = 0x04,
-+	LinkStatus = 0x02,
-+	FullDup = 0x01,
-+
-+	/*GIGABIT_PHY_registers */
-+	PHY_CTRL_REG = 0,
-+	PHY_STAT_REG = 1,
-+	PHY_AUTO_NEGO_REG = 4,
-+	PHY_1000_CTRL_REG = 9,
-+
-+	/*GIGABIT_PHY_REG_BIT */
-+	PHY_Restart_Auto_Nego = 0x0200,
-+	PHY_Enable_Auto_Nego = 0x1000,
-+
-+	/* PHY_STAT_REG = 1; */
-+	PHY_Auto_Neco_Comp = 0x0020,
-+
-+	/* PHY_AUTO_NEGO_REG = 4; */
-+	PHY_Cap_10_Half = 0x0020,
-+	PHY_Cap_10_Full = 0x0040,
-+	PHY_Cap_100_Half = 0x0080,
-+	PHY_Cap_100_Full = 0x0100,
-+
-+	/* PHY_1000_CTRL_REG = 9; */
-+	PHY_Cap_1000_Full = 0x0200,
-+
-+	PHY_Cap_Null = 0x0,
-+
-+	/*_MediaType*/
-+	_10_Half = 0x01,
-+	_10_Full = 0x02,
-+	_100_Half = 0x04,
-+	_100_Full = 0x08,
-+	_1000_Full = 0x10,
-+
-+	/*_TBICSRBit*/
-+	TBILinkOK = 0x02000000,
-+};
-+
-+static struct {
-+	const char *name;
-+	u8 version;		/* depend on RTL8169 docs */
-+	u32 RxConfigMask;	/* should clear the bits supported by this chip */
-+} rtl_chip_info[] = {
-+	{
-+"RTL-8169", 0x00, 0xff7e1880,},};
-+
-+enum _DescStatusBit {
-+	OWNbit = 0x80000000,
-+	EORbit = 0x40000000,
-+	FSbit = 0x20000000,
-+	LSbit = 0x10000000,
-+};
-+
-+struct TxDesc {
-+	u32 status;
-+	u32 vlan_tag;
-+	u32 buf_addr;
-+	u32 buf_Haddr;
-+};
-+
-+struct RxDesc {
-+	u32 status;
-+	u32 vlan_tag;
-+	u32 buf_addr;
-+	u32 buf_Haddr;
-+};
-+
-+/* The descriptors for this card are required to be aligned on
-+256 byte boundaries.  As the align attribute does not do more than
-+16 bytes of alignment it requires some extra steps.  Add 256 to the 
-+size of the array and the init_ring adjusts the alignment */
-+
-+/* Define the TX Descriptor */
-+static u8 tx_ring[NUM_TX_DESC * sizeof(struct TxDesc) + 256];
-+
-+/* Create a static buffer of size RX_BUF_SZ for each
-+TX Descriptor.  All descriptors point to a
-+part of this buffer */
-+static unsigned char txb[NUM_TX_DESC * RX_BUF_SIZE];
-+
-+/* Define the RX Descriptor */
-+static u8 rx_ring[NUM_RX_DESC * sizeof(struct TxDesc) + 256];
-+
-+/* Create a static buffer of size RX_BUF_SZ for each
-+RX Descriptor   All descriptors point to a
-+part of this buffer */
-+static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE];
-+
-+struct rtl8169_private {
-+	void *mmio_addr;	/* memory map physical address */
-+	int chipset;
-+	unsigned long cur_rx;	/* Index into the Rx descriptor buffer of next Rx pkt. */
-+	unsigned long cur_tx;	/* Index into the Tx descriptor buffer of next Rx pkt. */
-+	unsigned char *TxDescArrays;	/* Index of Tx Descriptor buffer */
-+	unsigned char *RxDescArrays;	/* Index of Rx Descriptor buffer */
-+	struct TxDesc *TxDescArray;	/* Index of 256-alignment Tx Descriptor buffer */
-+	struct RxDesc *RxDescArray;	/* Index of 256-alignment Rx Descriptor buffer */
-+	unsigned char *RxBufferRing[NUM_RX_DESC];	/* Index of Rx Buffer array */
-+	unsigned char *Tx_skbuff[NUM_TX_DESC];
-+} tpx;
-+
-+static struct rtl8169_private *tpc;
-+
-+static const u16 rtl8169_intr_mask =
-+    SYSErr | PCSTimeout | RxUnderrun | RxOverflow | RxFIFOOver | TxErr |
-+    TxOK | RxErr | RxOK;
-+static const unsigned int rtl8169_rx_config =
-+    (RX_FIFO_THRESH << RxCfgFIFOShift) | (RX_DMA_BURST << RxCfgDMAShift);
-+
-+void mdio_write(int RegAddr, int value)
-+{
-+	int i;
-+
-+	RTL_W32(PHYAR, 0x80000000 | (RegAddr & 0xFF) << 16 | value);
-+	udelay(1000);
-+
-+	for (i = 2000; i > 0; i--) {
-+		/* Check if the RTL8169 has completed writing to the specified MII register */
-+		if (!(RTL_R32(PHYAR) & 0x80000000)) {
-+			break;
-+		} else {
-+			udelay(100);
-+		}
-+	}
-+}
-+
-+int mdio_read(int RegAddr)
-+{
-+	int i, value = -1;
-+
-+	RTL_W32(PHYAR, 0x0 | (RegAddr & 0xFF) << 16);
-+	udelay(1000);
-+
-+	for (i = 2000; i > 0; i--) {
-+		/* Check if the RTL8169 has completed retrieving data from the specified MII register */
-+		if (RTL_R32(PHYAR) & 0x80000000) {
-+			value = (int) (RTL_R32(PHYAR) & 0xFFFF);
-+			break;
-+		} else {
-+			udelay(100);
-+		}
-+	}
-+	return value;
-+}
-+
-+static int rtl8169_init_board(struct pci_device *pdev)
-+{
-+	int i;
-+	unsigned long rtreg_base, rtreg_len;
-+	u32 tmp;
-+
-+	rtreg_base = pci_bar_start(pdev, PCI_BASE_ADDRESS_1);
-+	rtreg_len = pci_bar_size(pdev, PCI_BASE_ADDRESS_1);
-+
-+	/* check for weird/broken PCI region reporting */
-+	if (rtreg_len < RTL_MIN_IO_SIZE) {
-+		printf("Invalid PCI region size(s), aborting\n");
-+	}
-+
-+	adjust_pci_device(pdev);
-+/*      pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM); */
-+
-+	/* ioremap MMIO region */
-+	ioaddr = (unsigned long) ioremap(rtreg_base, rtreg_len);
-+	if (ioaddr == 0)
-+		return 0;
-+
-+	tpc->mmio_addr = &ioaddr;
-+	/* Soft reset the chip. */
-+	RTL_W8(ChipCmd, CmdReset);
-+
-+	/* Check that the chip has finished the reset. */
-+	for (i = 1000; i > 0; i--)
-+		if ((RTL_R8(ChipCmd) & CmdReset) == 0)
-+			break;
-+		else
-+			udelay(10);
-+
-+	/* identify chip attached to board */
-+	tmp = RTL_R32(TxConfig);
-+	tmp = ((tmp & 0x7c000000) + ((tmp & 0x00800000) << 2)) >> 24;
-+
-+	for (i = ARRAY_SIZE(rtl_chip_info) - 1; i >= 0; i--)
-+		if (tmp == rtl_chip_info[i].version) {
-+			tpc->chipset = i;
-+			goto match;
-+		}
-+	/* if unknown chip, assume array element #0, original RTL-8169 in this case */
-+	dprintf(("PCI device: unknown chip version, assuming RTL-8169\n"));
-+	dprintf(("PCI device: TxConfig = 0x%hX\n",
-+		 (unsigned long) RTL_R32(TxConfig)));
-+	tpc->chipset = 0;
-+	return 1;
-+      match:
-+	return 0;
-+
-+}
-+
-+/**************************************************************************
-+IRQ - Wait for a frame
-+***************************************************************************/
-+void r8169_irq ( struct nic *nic __unused, irq_action_t action ) {
-+	int intr_status = 0;
-+	int interested = RxUnderrun | RxOverflow | RxFIFOOver | RxErr | RxOK;
-+ 
-+	switch ( action ) {
-+		case DISABLE:
-+		case ENABLE:
-+			intr_status = RTL_R16(IntrStatus);
-+			/* h/w no longer present (hotplug?) or major error, 
-+				bail */
-+			if (intr_status == 0xFFFF)
-+				break;
-+
-+			intr_status = intr_status & ~interested;
-+			if ( action == ENABLE )
-+				intr_status = intr_status | interested;
-+			RTL_W16(IntrMask, intr_status);
-+			break;
-+		case FORCE :
-+			RTL_W8(TxPoll, (RTL_R8(TxPoll) | 0x01));
-+			break;
-+	}
-+}
-+
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int r8169_poll(struct nic *nic, int retreive)
-+{
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+	int cur_rx;
-+	unsigned int intr_status = 0;
-+	cur_rx = tpc->cur_rx;
-+	if ((tpc->RxDescArray[cur_rx].status & OWNbit) == 0) {
-+	         /* There is a packet ready */
-+  	         if(!retreive)
-+  	                 return 1;
-+		intr_status = RTL_R16(IntrStatus);
-+		/* h/w no longer present (hotplug?) or major error,
-+			bail */
-+		if (intr_status == 0xFFFF)
-+			return 0;
-+		RTL_W16(IntrStatus, intr_status & 
-+			~(RxFIFOOver | RxOverflow | RxOK));
-+
-+		if (!(tpc->RxDescArray[cur_rx].status & RxRES)) {
-+			nic->packetlen = (int) (tpc->RxDescArray[cur_rx].
-+						status & 0x00001FFF) - 4;
-+			memcpy(nic->packet, tpc->RxBufferRing[cur_rx],
-+			       nic->packetlen);
-+			if (cur_rx == NUM_RX_DESC - 1)
-+				tpc->RxDescArray[cur_rx].status =
-+				    (OWNbit | EORbit) + RX_BUF_SIZE;
-+			else
-+				tpc->RxDescArray[cur_rx].status =
-+				    OWNbit + RX_BUF_SIZE;
-+			tpc->RxDescArray[cur_rx].buf_addr =
-+			    virt_to_bus(tpc->RxBufferRing[cur_rx]);
-+		} else
-+			printf("Error Rx");
-+		/* FIXME: shouldn't I reset the status on an error */
-+		cur_rx = (cur_rx + 1) % NUM_RX_DESC;
-+		tpc->cur_rx = cur_rx;
-+		RTL_W16(IntrStatus, intr_status & 
-+			(RxFIFOOver | RxOverflow | RxOK));
-+
-+		return 1;
-+
-+	}
-+	tpc->cur_rx = cur_rx;
-+	/* FIXME: There is no reason to do this as cur_rx did not change */
-+
-+	return (0);		/* initially as this is called to flush the input */
-+
-+}
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void r8169_transmit(struct nic *nic, const char *d,	/* Destination */
-+			   unsigned int t,	/* Type */
-+			   unsigned int s,	/* size */
-+			   const char *p)
-+{				/* Packet */
-+	/* send the packet to destination */
-+
-+	u16 nstype;
-+	u32 to;
-+	u8 *ptxb;
-+	int entry = tpc->cur_tx % NUM_TX_DESC;
-+
-+	/* point to the current txb incase multiple tx_rings are used */
-+	ptxb = tpc->Tx_skbuff[entry * MAX_ETH_FRAME_SIZE];
-+	memcpy(ptxb, d, ETH_ALEN);
-+	memcpy(ptxb + ETH_ALEN, nic->node_addr, ETH_ALEN);
-+	nstype = htons((u16) t);
-+	memcpy(ptxb + 2 * ETH_ALEN, (u8 *) & nstype, 2);
-+	memcpy(ptxb + ETH_HLEN, p, s);
-+	s += ETH_HLEN;
-+	s &= 0x0FFF;
-+	while (s < ETH_ZLEN)
-+		ptxb[s++] = '\0';
-+
-+	tpc->TxDescArray[entry].buf_addr = virt_to_bus(ptxb);
-+	if (entry != (NUM_TX_DESC - 1))
-+		tpc->TxDescArray[entry].status =
-+		    (OWNbit | FSbit | LSbit) | ((s > ETH_ZLEN) ? s :
-+						ETH_ZLEN);
-+	else
-+		tpc->TxDescArray[entry].status =
-+		    (OWNbit | EORbit | FSbit | LSbit) | ((s > ETH_ZLEN) ? s
-+							 : ETH_ZLEN);
-+	RTL_W8(TxPoll, 0x40);	/* set polling bit */
-+
-+	tpc->cur_tx++;
-+	to = currticks() + TX_TIMEOUT;
-+	while ((tpc->TxDescArray[entry].status & OWNbit) && (currticks() < to));	/* wait */
-+
-+	if (currticks() >= to) {
-+		printf("TX Time Out");
-+	}
-+}
-+
-+static void rtl8169_set_rx_mode(struct nic *nic __unused)
-+{
-+	u32 mc_filter[2];	/* Multicast hash filter */
-+	int rx_mode;
-+	u32 tmp = 0;
-+
-+	/* IFF_ALLMULTI */
-+	/* Too many to filter perfectly -- accept all multicasts. */
-+	rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
-+	mc_filter[1] = mc_filter[0] = 0xffffffff;
-+
-+	tmp =
-+	    rtl8169_rx_config | rx_mode | (RTL_R32(RxConfig) &
-+					   rtl_chip_info[tpc->chipset].
-+					   RxConfigMask);
-+
-+	RTL_W32(RxConfig, tmp);
-+	RTL_W32(MAR0 + 0, mc_filter[0]);
-+	RTL_W32(MAR0 + 4, mc_filter[1]);
-+}
-+static void rtl8169_hw_start(struct nic *nic)
-+{
-+	u32 i;
-+
-+	/* Soft reset the chip. */
-+	RTL_W8(ChipCmd, CmdReset);
-+
-+	/* Check that the chip has finished the reset. */
-+	for (i = 1000; i > 0; i--) {
-+		if ((RTL_R8(ChipCmd) & CmdReset) == 0)
-+			break;
-+		else
-+			udelay(10);
-+	}
-+
-+	RTL_W8(Cfg9346, Cfg9346_Unlock);
-+	RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
-+	RTL_W8(EarlyTxThres, EarlyTxThld);
-+
-+	/* For gigabit rtl8169 */
-+	RTL_W16(RxMaxSize, RxPacketMaxSize);
-+
-+	/* Set Rx Config register */
-+	i = rtl8169_rx_config | (RTL_R32(RxConfig) &
-+				 rtl_chip_info[tpc->chipset].RxConfigMask);
-+	RTL_W32(RxConfig, i);
-+
-+	/* Set DMA burst size and Interframe Gap Time */
-+	RTL_W32(TxConfig,
-+		(TX_DMA_BURST << TxDMAShift) | (InterFrameGap <<
-+						TxInterFrameGapShift));
-+
-+
-+	tpc->cur_rx = 0;
-+
-+	RTL_W32(TxDescStartAddr, virt_to_le32desc(tpc->TxDescArray));
-+	RTL_W32(RxDescStartAddr, virt_to_le32desc(tpc->RxDescArray));
-+	RTL_W8(Cfg9346, Cfg9346_Lock);
-+	udelay(10);
-+
-+	RTL_W32(RxMissed, 0);
-+
-+	rtl8169_set_rx_mode(nic);
-+
-+	/* no early-rx interrupts */
-+	RTL_W16(MultiIntr, RTL_R16(MultiIntr) & 0xF000);
-+}
-+
-+static void rtl8169_init_ring(struct nic *nic __unused)
-+{
-+	int i;
-+
-+	tpc->cur_rx = 0;
-+	tpc->cur_tx = 0;
-+	memset(tpc->TxDescArray, 0x0, NUM_TX_DESC * sizeof(struct TxDesc));
-+	memset(tpc->RxDescArray, 0x0, NUM_RX_DESC * sizeof(struct RxDesc));
-+
-+	for (i = 0; i < NUM_TX_DESC; i++) {
-+		tpc->Tx_skbuff[i] = &txb[i];
-+	}
-+
-+	for (i = 0; i < NUM_RX_DESC; i++) {
-+		if (i == (NUM_RX_DESC - 1))
-+			tpc->RxDescArray[i].status =
-+			    (OWNbit | EORbit) + RX_BUF_SIZE;
-+		else
-+			tpc->RxDescArray[i].status = OWNbit + RX_BUF_SIZE;
-+
-+		tpc->RxBufferRing[i] = &rxb[i * RX_BUF_SIZE];
-+		tpc->RxDescArray[i].buf_addr =
-+		    virt_to_bus(tpc->RxBufferRing[i]);
-+	}
-+}
-+
-+/**************************************************************************
-+RESET - Finish setting up the ethernet interface
-+***************************************************************************/
-+static void r8169_reset(struct nic *nic)
-+{
-+	int i;
-+	u8 diff;
-+	u32 TxPhyAddr, RxPhyAddr;
-+
-+	tpc->TxDescArrays = tx_ring;
-+	if (tpc->TxDescArrays == 0)
-+		printf("Allot Error");
-+	/* Tx Desscriptor needs 256 bytes alignment; */
-+	TxPhyAddr = virt_to_bus(tpc->TxDescArrays);
-+	diff = 256 - (TxPhyAddr - ((TxPhyAddr >> 8) << 8));
-+	TxPhyAddr += diff;
-+	tpc->TxDescArray = (struct TxDesc *) (tpc->TxDescArrays + diff);
-+
-+	tpc->RxDescArrays = rx_ring;
-+	/* Rx Desscriptor needs 256 bytes alignment; */
-+	RxPhyAddr = virt_to_bus(tpc->RxDescArrays);
-+	diff = 256 - (RxPhyAddr - ((RxPhyAddr >> 8) << 8));
-+	RxPhyAddr += diff;
-+	tpc->RxDescArray = (struct RxDesc *) (tpc->RxDescArrays + diff);
-+
-+	if (tpc->TxDescArrays == NULL || tpc->RxDescArrays == NULL) {
-+		printf("Allocate RxDescArray or TxDescArray failed\n");
-+		return;
-+	}
-+
-+	rtl8169_init_ring(nic);
-+	rtl8169_hw_start(nic);
-+	/* Construct a perfect filter frame with the mac address as first match
-+	 * and broadcast for all others */
-+	for (i = 0; i < 192; i++)
-+		txb[i] = 0xFF;
-+
-+	txb[0] = nic->node_addr[0];
-+	txb[1] = nic->node_addr[1];
-+	txb[2] = nic->node_addr[2];
-+	txb[3] = nic->node_addr[3];
-+	txb[4] = nic->node_addr[4];
-+	txb[5] = nic->node_addr[5];
-+}
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void r8169_disable(struct dev *dev __unused)
-+{
-+	int i;
-+	/* Stop the chip's Tx and Rx DMA processes. */
-+	RTL_W8(ChipCmd, 0x00);
-+
-+	/* Disable interrupts by clearing the interrupt mask. */
-+	RTL_W16(IntrMask, 0x0000);
-+
-+	RTL_W32(RxMissed, 0);
-+
-+	tpc->TxDescArrays = NULL;
-+	tpc->RxDescArrays = NULL;
-+	tpc->TxDescArray = NULL;
-+	tpc->RxDescArray = NULL;
-+	for (i = 0; i < NUM_RX_DESC; i++) {
-+		tpc->RxBufferRing[i] = NULL;
-+	}
-+}
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+***************************************************************************/
-+
-+#define board_found 1
-+#define valid_link 0
-+static int r8169_probe(struct dev *dev, struct pci_device *pci)
-+{
-+	struct nic *nic = (struct nic *) dev;
-+	static int board_idx = -1;
-+	static int printed_version = 0;
-+	int i, rc;
-+	int option = -1, Cap10_100 = 0, Cap1000 = 0;
-+
-+	printf("r8169.c: Found %s, Vendor=%hX Device=%hX\n",
-+	       pci->name, pci->vendor, pci->dev_id);
-+
-+	board_idx++;
-+
-+	printed_version = 1;
-+
-+	/* point to private storage */
-+	tpc = &tpx;
-+
-+	rc = rtl8169_init_board(pci);	/* Return code is meaningless */
-+
-+	/* Get MAC address.  FIXME: read EEPROM */
-+	for (i = 0; i < MAC_ADDR_LEN; i++)
-+		nic->node_addr[i] = RTL_R8(MAC0 + i);
-+
-+	dprintf(("%s: Identified chip type is '%s'.\n", pci->name,
-+		 rtl_chip_info[tpc->chipset].name));
-+	/* Print out some hardware info */
-+	printf("%s: %! at ioaddr %hX, ", pci->name, nic->node_addr,
-+	       ioaddr);
-+
-+	/* if TBI is not endbled */
-+	if (!(RTL_R8(PHYstatus) & TBI_Enable)) {
-+		int val = mdio_read(PHY_AUTO_NEGO_REG);
-+
-+		option = media;
-+		/* Force RTL8169 in 10/100/1000 Full/Half mode. */
-+		if (option > 0) {
-+			printf(" Force-mode Enabled.\n");
-+			Cap10_100 = 0, Cap1000 = 0;
-+			switch (option) {
-+			case _10_Half:
-+				Cap10_100 = PHY_Cap_10_Half;
-+				Cap1000 = PHY_Cap_Null;
-+				break;
-+			case _10_Full:
-+				Cap10_100 = PHY_Cap_10_Full;
-+				Cap1000 = PHY_Cap_Null;
-+				break;
-+			case _100_Half:
-+				Cap10_100 = PHY_Cap_100_Half;
-+				Cap1000 = PHY_Cap_Null;
-+				break;
-+			case _100_Full:
-+				Cap10_100 = PHY_Cap_100_Full;
-+				Cap1000 = PHY_Cap_Null;
-+				break;
-+			case _1000_Full:
-+				Cap10_100 = PHY_Cap_Null;
-+				Cap1000 = PHY_Cap_1000_Full;
-+				break;
-+			default:
-+				break;
-+			}
-+			/* leave PHY_AUTO_NEGO_REG bit4:0 unchanged */
-+			mdio_write(PHY_AUTO_NEGO_REG,
-+				   Cap10_100 | (val & 0x1F));
-+			mdio_write(PHY_1000_CTRL_REG, Cap1000);
-+		} else {
-+			dprintf(("Auto-negotiation Enabled.\n",
-+				 pci->name));
-+
-+			/* enable 10/100 Full/Half Mode, leave PHY_AUTO_NEGO_REG bit4:0 unchanged */
-+			mdio_write(PHY_AUTO_NEGO_REG,
-+				   PHY_Cap_10_Half | PHY_Cap_10_Full |
-+				   PHY_Cap_100_Half | PHY_Cap_100_Full |
-+				   (val & 0x1F));
-+
-+			/* enable 1000 Full Mode */
-+			mdio_write(PHY_1000_CTRL_REG, PHY_Cap_1000_Full);
-+
-+		}
-+
-+		/* Enable auto-negotiation and restart auto-nigotiation */
-+		mdio_write(PHY_CTRL_REG,
-+			   PHY_Enable_Auto_Nego | PHY_Restart_Auto_Nego);
-+		udelay(100);
-+
-+		/* wait for auto-negotiation process */
-+		for (i = 10000; i > 0; i--) {
-+			/* Check if auto-negotiation complete */
-+			if (mdio_read(PHY_STAT_REG) & PHY_Auto_Neco_Comp) {
-+				udelay(100);
-+				option = RTL_R8(PHYstatus);
-+				if (option & _1000bpsF) {
-+					printf
-+					    ("1000Mbps Full-duplex operation.\n");
-+				} else {
-+					printf
-+					    ("%sMbps %s-duplex operation.\n",
-+					     (option & _100bps) ? "100" :
-+					     "10",
-+					     (option & FullDup) ? "Full" :
-+					     "Half");
-+				}
-+				break;
-+			} else {
-+				udelay(100);
-+			}
-+		}		/* end for-loop to wait for auto-negotiation process */
-+
-+	} else {
-+		udelay(100);
-+		printf
-+		    ("%s: 1000Mbps Full-duplex operation, TBI Link %s!\n",
-+		     pci->name,
-+		     (RTL_R32(TBICSR) & TBILinkOK) ? "OK" : "Failed");
-+
-+	}
-+
-+	r8169_reset(nic);
-+	/* point to NIC specific routines */
-+	dev->disable = r8169_disable;
-+	nic->poll = r8169_poll;
-+	nic->transmit = r8169_transmit;
-+	nic->irqno = pci->irq;
-+	nic->irq = r8169_irq;
-+	nic->ioaddr = ioaddr;
-+	return 1;
-+
-+}
-+
-+static struct pci_id r8169_nics[] = {
-+	PCI_ROM(0x10ec, 0x8169, "r8169", "RealTek RTL8169 Gigabit Ethernet"),
-+};
-+
-+struct pci_driver r8169_driver = {
-+	.type = NIC_DRIVER,
-+	.name = "r8169/PCI",
-+	.probe = r8169_probe,
-+	.ids = r8169_nics,
-+	.id_count = sizeof(r8169_nics) / sizeof(r8169_nics[0]),
-+	.class = 0,
-+};
-Index: b/netboot/rtl8139.c
-===================================================================
---- a/netboot/rtl8139.c
-+++ b/netboot/rtl8139.c
-@@ -17,6 +17,8 @@
- /*********************************************************************/
- 
- /*
-+  28 Dec 2002	ken_yap@users.sourceforge.net (Ken Yap)
-+     Put in virt_to_bus calls to allow Etherboot relocation.
- 
-   06 Apr 2001	ken_yap@users.sourceforge.net (Ken Yap)
-      Following email from Hyun-Joon Cha, added a disable routine, otherwise
-@@ -63,7 +65,6 @@
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- #include "timer.h"
- 
- #define RTL_TIMEOUT (1*TICKS_PER_SEC)
-@@ -112,9 +113,19 @@
- 	 * definitions we will probably never need to know about.  */
- };
- 
-+enum RxEarlyStatusBits {
-+	ERGood=0x08, ERBad=0x04, EROVW=0x02, EROK=0x01
-+};
-+
- enum ChipCmdBits {
- 	CmdReset=0x10, CmdRxEnb=0x08, CmdTxEnb=0x04, RxBufEmpty=0x01, };
- 
-+enum IntrMaskBits {
-+	SERR=0x8000, TimeOut=0x4000, LenChg=0x2000,
-+	FOVW=0x40, PUN_LinkChg=0x20, RXOVW=0x10,
-+	TER=0x08, TOK=0x04, RER=0x02, ROK=0x01
-+};
-+
- /* Interrupt register bits, using my own meaningful names. */
- enum IntrStatusBits {
- 	PCIErr=0x8000, PCSTimeout=0x4000, CableLenChange= 0x2000,
-@@ -155,74 +166,68 @@
- 	AcceptMulticast=0x04, AcceptMyPhys=0x02, AcceptAllPhys=0x01,
- };
- 
--static int ioaddr;
- static unsigned int cur_rx,cur_tx;
- 
- /* The RTL8139 can only transmit from a contiguous, aligned memory block.  */
- static unsigned char tx_buffer[TX_BUF_SIZE] __attribute__((aligned(4)));
--
--/* I know that this is a MEGA HACK, but the tagged boot image specification
-- * states that we can do whatever we want below 0x10000 - so we do!  */
--/* But we still give the user the choice of using an internal buffer
--   just in case - Ken */
--#ifdef	USE_LOWMEM_BUFFER
--#define rx_ring ((unsigned char *)(0x10000 - (RX_BUF_LEN + 16)))
--#else
- static unsigned char rx_ring[RX_BUF_LEN+16] __attribute__((aligned(4)));
--#endif
- 
--struct nic *rtl8139_probe(struct nic *nic, unsigned short *probeaddrs,
--	struct pci_device *pci);
--static int read_eeprom(int location);
-+static int rtl8139_probe(struct dev *dev, struct pci_device *pci);
-+static int read_eeprom(struct nic *nic, int location, int addr_len);
- static void rtl_reset(struct nic *nic);
- static void rtl_transmit(struct nic *nic, const char *destaddr,
- 	unsigned int type, unsigned int len, const char *data);
--static int rtl_poll(struct nic *nic);
--static void rtl_disable(struct nic*);
-+static int rtl_poll(struct nic *nic, int retrieve);
-+static void rtl_disable(struct dev *);
-+static void rtl_irq(struct nic *nic, irq_action_t action);
- 
- 
--struct nic *rtl8139_probe(struct nic *nic, unsigned short *probeaddrs,
--	struct pci_device *pci)
-+static int rtl8139_probe(struct dev *dev, struct pci_device *pci)
- {
-+	struct nic *nic = (struct nic *)dev;
- 	int i;
- 	int speed10, fullduplex;
-+	int addr_len;
-+	unsigned short *ap = (unsigned short*)nic->node_addr;
- 
- 	/* There are enough "RTL8139" strings on the console already, so
- 	 * be brief and concentrate on the interesting pieces of info... */
- 	printf(" - ");
- 
- 	/* Mask the bit that says "this is an io addr" */
--	ioaddr = probeaddrs[0] & ~3;
-+	nic->ioaddr = pci->ioaddr & ~3;
-+
-+	/* Copy IRQ from PCI information */
-+	nic->irqno = pci->irq;
- 
- 	adjust_pci_device(pci);
- 
- 	/* Bring the chip out of low-power mode. */
--	outb(0x00, ioaddr + Config1);
--
--	if (read_eeprom(0) != 0xffff) {
--		unsigned short *ap = (unsigned short*)nic->node_addr;
--		for (i = 0; i < 3; i++)
--			*ap++ = read_eeprom(i + 7);
--	} else {
--		unsigned char *ap = (unsigned char*)nic->node_addr;
--		for (i = 0; i < ETH_ALEN; i++)
--			*ap++ = inb(ioaddr + MAC0 + i);
--	}
-+	outb(0x00, nic->ioaddr + Config1);
- 
--	speed10 = inb(ioaddr + MediaStatus) & MSRSpeed10;
--	fullduplex = inw(ioaddr + MII_BMCR) & BMCRDuplex;
--	printf("ioaddr %#hX, addr %! %sMbps %s-duplex\n", ioaddr,
--		nic->node_addr,  speed10 ? "10" : "100",
--		fullduplex ? "full" : "half");
-+	addr_len = read_eeprom(nic,0,8) == 0x8129 ? 8 : 6;
-+	for (i = 0; i < 3; i++)
-+	  *ap++ = read_eeprom(nic,i + 7,addr_len);
-+
-+	speed10 = inb(nic->ioaddr + MediaStatus) & MSRSpeed10;
-+	fullduplex = inw(nic->ioaddr + MII_BMCR) & BMCRDuplex;
-+	printf("ioaddr %#hX, irq %d, addr %! %sMbps %s-duplex\n", nic->ioaddr,
-+	       nic->irqno, nic->node_addr,  speed10 ? "10" : "100",
-+	       fullduplex ? "full" : "half");
- 
- 	rtl_reset(nic);
- 
--	nic->reset = rtl_reset;
--	nic->poll = rtl_poll;
-+	if (inb(nic->ioaddr + MediaStatus) & MSRLinkFail) {
-+		printf("Cable not connected or other link failure\n");
-+		return(0);
-+	}
-+
-+	dev->disable  = rtl_disable;
-+	nic->poll     = rtl_poll;
- 	nic->transmit = rtl_transmit;
--	nic->disable = rtl_disable;
-+	nic->irq      = rtl_irq;
- 
--	return nic;
-+	return 1;
- }
- 
- /* Serial EEPROM section. */
-@@ -244,22 +249,23 @@
- #define eeprom_delay()  inl(ee_addr)
- 
- /* The EEPROM commands include the alway-set leading bit. */
--#define EE_WRITE_CMD    (5 << 6)
--#define EE_READ_CMD     (6 << 6)
--#define EE_ERASE_CMD    (7 << 6)
-+#define EE_WRITE_CMD    (5)
-+#define EE_READ_CMD     (6)
-+#define EE_ERASE_CMD    (7)
- 
--static int read_eeprom(int location)
-+static int read_eeprom(struct nic *nic, int location, int addr_len)
- {
- 	int i;
- 	unsigned int retval = 0;
--	long ee_addr = ioaddr + Cfg9346;
--	int read_cmd = location | EE_READ_CMD;
-+	long ee_addr = nic->ioaddr + Cfg9346;
-+	int read_cmd = location | (EE_READ_CMD << addr_len);
- 
- 	outb(EE_ENB & ~EE_CS, ee_addr);
- 	outb(EE_ENB, ee_addr);
-+	eeprom_delay();
- 
- 	/* Shift the read command bits out. */
--	for (i = 10; i >= 0; i--) {
-+	for (i = 4 + addr_len; i >= 0; i--) {
- 		int dataval = (read_cmd & (1 << i)) ? EE_DATA_WRITE : 0;
- 		outb(EE_ENB | dataval, ee_addr);
- 		eeprom_delay();
-@@ -279,31 +285,51 @@
- 
- 	/* Terminate the EEPROM access. */
- 	outb(~EE_CS, ee_addr);
-+	eeprom_delay();
- 	return retval;
- }
- 
-+static const unsigned int rtl8139_rx_config = 
-+	(RX_BUF_LEN_IDX << 11) |
-+	(RX_FIFO_THRESH << 13) |
-+	(RX_DMA_BURST << 8);
-+	
-+static void set_rx_mode(struct nic *nic) {
-+	unsigned int mc_filter[2];
-+	int rx_mode;
-+	/* !IFF_PROMISC */
-+	rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
-+	mc_filter[1] = mc_filter[0] = 0xffffffff;
-+
-+	outl(rtl8139_rx_config | rx_mode, nic->ioaddr + RxConfig);
-+
-+	outl(mc_filter[0], nic->ioaddr + MAR0 + 0);
-+	outl(mc_filter[1], nic->ioaddr + MAR0 + 4);
-+}
-+	
- static void rtl_reset(struct nic* nic)
- {
- 	int i;
- 
--	outb(CmdReset, ioaddr + ChipCmd);
-+	outb(CmdReset, nic->ioaddr + ChipCmd);
- 
- 	cur_rx = 0;
- 	cur_tx = 0;
- 
- 	/* Give the chip 10ms to finish the reset. */
- 	load_timer2(10*TICKS_PER_MS);
--	while ((inb(ioaddr + ChipCmd) & CmdReset) != 0 && timer2_running())
-+	while ((inb(nic->ioaddr + ChipCmd) & CmdReset) != 0 &&
-+	       timer2_running())
- 		/* wait */;
- 
- 	for (i = 0; i < ETH_ALEN; i++)
--		outb(nic->node_addr[i], ioaddr + MAC0 + i);
-+		outb(nic->node_addr[i], nic->ioaddr + MAC0 + i);
- 
- 	/* Must enable Tx/Rx before setting transfer thresholds! */
--	outb(CmdRxEnb | CmdTxEnb, ioaddr + ChipCmd);
-+	outb(CmdRxEnb | CmdTxEnb, nic->ioaddr + ChipCmd);
- 	outl((RX_FIFO_THRESH<<13) | (RX_BUF_LEN_IDX<<11) | (RX_DMA_BURST<<8),
--		ioaddr + RxConfig);		/* accept no frames yet!  */
--	outl((TX_DMA_BURST<<8)|0x03000000, ioaddr + TxConfig);
-+		nic->ioaddr + RxConfig);	  /* accept no frames yet!  */
-+	outl((TX_DMA_BURST<<8)|0x03000000, nic->ioaddr + TxConfig);
- 
- 	/* The Linux driver changes Config1 here to use a different LED pattern
- 	 * for half duplex or full/autodetect duplex (for full/autodetect, the
-@@ -316,19 +342,26 @@
- #ifdef	DEBUG_RX
- 	printf("rx ring address is %X\n",(unsigned long)rx_ring);
- #endif
--	outl((unsigned long)rx_ring, ioaddr + RxBuf);
-+	outl((unsigned long)virt_to_bus(rx_ring), nic->ioaddr + RxBuf);
-+
-+
- 
--	/* Start the chip's Tx and Rx process. */
--	outl(0, ioaddr + RxMissed);
--	/* set_rx_mode */
--	outb(AcceptBroadcast|AcceptMyPhys, ioaddr + RxConfig);
- 	/* If we add multicast support, the MAR0 register would have to be
- 	 * initialized to 0xffffffffffffffff (two 32 bit accesses).  Etherboot
- 	 * only needs broadcast (for ARP/RARP/BOOTP/DHCP) and unicast.  */
--	outb(CmdRxEnb | CmdTxEnb, ioaddr + ChipCmd);
- 
-+	outb(CmdRxEnb | CmdTxEnb, nic->ioaddr + ChipCmd);
-+	
-+	outl(rtl8139_rx_config, nic->ioaddr + RxConfig);
-+	
-+	/* Start the chip's Tx and Rx process. */
-+	outl(0, nic->ioaddr + RxMissed);
-+
-+	/* set_rx_mode */
-+	set_rx_mode(nic);
-+	
- 	/* Disable all known interrupts by setting the interrupt mask. */
--	outw(0, ioaddr + IntrMask);
-+	outw(0, nic->ioaddr + IntrMask);
- }
- 
- static void rtl_transmit(struct nic *nic, const char *destaddr,
-@@ -337,10 +370,11 @@
- 	unsigned int status, to, nstype;
- 	unsigned long txstatus;
- 
-+	/* nstype assignment moved up here to avoid gcc 3.0.3 compiler bug */
-+	nstype = htons(type);
- 	memcpy(tx_buffer, destaddr, ETH_ALEN);
- 	memcpy(tx_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN);
--	nstype = htons(type);
--	memcpy(tx_buffer + 2 * ETH_ALEN, (char*)&nstype, 2);
-+	memcpy(tx_buffer + 2 * ETH_ALEN, &nstype, 2);
- 	memcpy(tx_buffer + ETH_HLEN, data, len);
- 
- 	len += ETH_HLEN;
-@@ -354,22 +388,22 @@
- 		tx_buffer[len++] = '\0';
- 	}
- 
--	outl((unsigned long)tx_buffer, ioaddr + TxAddr0 + cur_tx*4);
-+	outl((unsigned long)virt_to_bus(tx_buffer), nic->ioaddr + TxAddr0 + cur_tx*4);
- 	outl(((TX_FIFO_THRESH<<11) & 0x003f0000) | len,
--		ioaddr + TxStatus0 + cur_tx*4);
-+		nic->ioaddr + TxStatus0 + cur_tx*4);
- 
- 	to = currticks() + RTL_TIMEOUT;
- 
- 	do {
--		status = inw(ioaddr + IntrStatus);
-+		status = inw(nic->ioaddr + IntrStatus);
- 		/* Only acknlowledge interrupt sources we can properly handle
- 		 * here - the RxOverflow/RxFIFOOver MUST be handled in the
- 		 * rtl_poll() function.  */
--		outw(status & (TxOK | TxErr | PCIErr), ioaddr + IntrStatus);
-+		outw(status & (TxOK | TxErr | PCIErr), nic->ioaddr + IntrStatus);
- 		if ((status & (TxOK | TxErr | PCIErr)) != 0) break;
- 	} while (currticks() < to);
- 
--	txstatus = inl(ioaddr+ TxStatus0 + cur_tx*4);
-+	txstatus = inl(nic->ioaddr+ TxStatus0 + cur_tx*4);
- 
- 	if (status & TxOK) {
- 		cur_tx = (cur_tx + 1) % NUM_TX_DESC;
-@@ -386,19 +420,22 @@
- 	}
- }
- 
--static int rtl_poll(struct nic *nic)
-+static int rtl_poll(struct nic *nic, int retrieve)
- {
- 	unsigned int status;
- 	unsigned int ring_offs;
- 	unsigned int rx_size, rx_status;
- 
--	if (inb(ioaddr + ChipCmd) & RxBufEmpty) {
-+	if (inb(nic->ioaddr + ChipCmd) & RxBufEmpty) {
- 		return 0;
- 	}
- 
--	status = inw(ioaddr + IntrStatus);
-+	/* There is a packet ready */
-+	if ( ! retrieve ) return 1;
-+
-+	status = inw(nic->ioaddr + IntrStatus);
- 	/* See below for the rest of the interrupt acknowledges.  */
--	outw(status & ~(RxFIFOOver | RxOverflow | RxOK), ioaddr + IntrStatus);
-+	outw(status & ~(RxFIFOOver | RxOverflow | RxOK), nic->ioaddr + IntrStatus);
- 
- #ifdef	DEBUG_RX
- 	printf("rtl_poll: int %hX ", status);
-@@ -438,21 +475,77 @@
- 		nic->packet[12], nic->packet[13], rx_status);
- #endif
- 	cur_rx = (cur_rx + rx_size + 4 + 3) & ~3;
--	outw(cur_rx - 16, ioaddr + RxBufPtr);
-+	outw(cur_rx - 16, nic->ioaddr + RxBufPtr);
- 	/* See RTL8139 Programming Guide V0.1 for the official handling of
- 	 * Rx overflow situations.  The document itself contains basically no
- 	 * usable information, except for a few exception handling rules.  */
--	outw(status & (RxFIFOOver | RxOverflow | RxOK), ioaddr + IntrStatus);
-+	outw(status & (RxFIFOOver | RxOverflow | RxOK), nic->ioaddr + IntrStatus);
- 	return 1;
- }
- 
--static void rtl_disable(struct nic *nic)
-+static void rtl_irq(struct nic *nic, irq_action_t action)
- {
-+	unsigned int mask;
-+	/* Bit of a guess as to which interrupts we should allow */
-+	unsigned int interested = ROK | RER | RXOVW | FOVW | SERR;
-+
-+	switch ( action ) {
-+	case DISABLE :
-+	case ENABLE :
-+		mask = inw(nic->ioaddr + IntrMask);
-+		mask = mask & ~interested;
-+		if ( action == ENABLE ) mask = mask | interested;
-+		outw(mask, nic->ioaddr + IntrMask);
-+		break;
-+	case FORCE :
-+		/* Apparently writing a 1 to this read-only bit of a
-+		 * read-only and otherwise unrelated register will
-+		 * force an interrupt.  If you ever want to see how
-+		 * not to write a datasheet, read the one for the
-+		 * RTL8139...
-+		 */
-+		outb(EROK, nic->ioaddr + RxEarlyStatus);
-+		break;
-+	}
-+}
-+
-+static void rtl_disable(struct dev *dev)
-+{
-+	struct nic *nic = (struct nic *)dev;
-+	/* merge reset and disable */
-+	rtl_reset(nic);
-+
- 	/* reset the chip */
--	outb(CmdReset, ioaddr + ChipCmd);
-+	outb(CmdReset, nic->ioaddr + ChipCmd);
- 
- 	/* 10 ms timeout */
- 	load_timer2(10*TICKS_PER_MS);
--	while ((inb(ioaddr + ChipCmd) & CmdReset) != 0 && timer2_running())
-+	while ((inb(nic->ioaddr + ChipCmd) & CmdReset) != 0 && timer2_running())
- 		/* wait */;
- }
-+
-+static struct pci_id rtl8139_nics[] = {
-+PCI_ROM(0x10ec, 0x8129, "rtl8129",       "Realtek 8129"),
-+PCI_ROM(0x10ec, 0x8139, "rtl8139",       "Realtek 8139"),
-+PCI_ROM(0x10ec, 0x8138, "rtl8139b",      "Realtek 8139B"),
-+PCI_ROM(0x1186, 0x1300, "dfe538",        "DFE530TX+/DFE538TX"),
-+PCI_ROM(0x1113, 0x1211, "smc1211-1",     "SMC EZ10/100"),
-+PCI_ROM(0x1112, 0x1211, "smc1211",       "SMC EZ10/100"),
-+PCI_ROM(0x1500, 0x1360, "delta8139",     "Delta Electronics 8139"),
-+PCI_ROM(0x4033, 0x1360, "addtron8139",   "Addtron Technology 8139"),
-+PCI_ROM(0x1186, 0x1340, "dfe690txd",     "D-Link DFE690TXD"),
-+PCI_ROM(0x13d1, 0xab06, "fe2000vx",      "AboCom FE2000VX"),
-+PCI_ROM(0x1259, 0xa117, "allied8139",    "Allied Telesyn 8139"),
-+PCI_ROM(0x14ea, 0xab06, "fnw3603tx",     "Planex FNW-3603-TX"),
-+PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX"),
-+PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139"),
-+};
-+
-+struct pci_driver rtl8139_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "RTL8139",
-+	.probe    = rtl8139_probe,
-+	.ids      = rtl8139_nics,
-+	.id_count = sizeof(rtl8139_nics)/sizeof(rtl8139_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/segoff.h
-===================================================================
---- /dev/null
-+++ b/netboot/segoff.h
-@@ -0,0 +1,43 @@
-+/*
-+ * Segment:offset types and macros
-+ *
-+ * Initially written by Michael Brown (mcb30).
-+ */
-+
-+#ifndef SEGOFF_H
-+#define SEGOFF_H
-+
-+#include <stdint.h>
-+#include <io.h>
-+
-+/* Segment:offset structure.  Note that the order within the structure
-+ * is offset:segment.
-+ */
-+typedef struct {
-+	uint16_t offset;
-+	uint16_t segment;
-+} segoff_t;
-+
-+/* For PXE stuff */
-+typedef segoff_t SEGOFF16_t;
-+
-+/* Macros for converting from virtual to segment:offset addresses,
-+ * when we don't actually care which of the many isomorphic results we
-+ * get.
-+ */
-+#ifdef DEBUG_SEGMENT
-+uint16_t SEGMENT ( const void * const ptr ) {
-+	uint32_t phys = virt_to_phys ( ptr );
-+	if ( phys > 0xfffff ) {
-+		printf ( "FATAL ERROR: segment address out of range\n" );
-+	}
-+	return phys >> 4;
-+}
-+#else
-+#define SEGMENT(x) ( virt_to_phys ( x ) >> 4 )
-+#endif
-+#define OFFSET(x) ( virt_to_phys ( x ) & 0xf )
-+#define SEGOFF(x) { OFFSET(x), SEGMENT(x) }
-+#define VIRTUAL(x,y) ( phys_to_virt ( ( ( x ) << 4 ) + ( y ) ) )
-+
-+#endif /* SEGOFF_H */
-Index: b/netboot/sis900.c
-===================================================================
---- a/netboot/sis900.c
-+++ b/netboot/sis900.c
-@@ -27,6 +27,11 @@
- /* Revision History */
- 
- /*
-+  07 Dec 2003  timlegge - Enabled Multicast Support
-+  06 Dec 2003  timlegge - Fixed relocation issue in 5.2
-+  04 Jan 2002  Chien-Yu Chen, Doug Ambrisko, Marty Connor  Patch to Etherboot 5.0.5
-+     Added support for the SiS 630ET plus various bug fixes from linux kernel
-+     source 2.4.17.
-   01 March 2001  mdc     1.0
-      Initial Release.  Tested with PCI based sis900 card and ThinkNIC
-      computer.
-@@ -35,13 +40,12 @@
-      Testet with SIS730S chipset + ICS1893
- */
- 
--
- /* Includes */
- 
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
-+#include "timer.h"
- 
- #include "sis900.h"
- 
-@@ -51,6 +55,7 @@
- 
- static unsigned short vendor, dev_id;
- static unsigned long ioaddr;
-+static u8 pci_revision;
- 
- static unsigned int cur_phy;
- 
-@@ -58,15 +63,10 @@
- 
- static BufferDesc txd;
- static BufferDesc rxd[NUM_RX_DESC];
--
--#ifdef USE_LOWMEM_BUFFER
--#define txb ((char *)0x10000 - TX_BUF_SIZE)
--#define rxb ((char *)0x10000 - NUM_RX_DESC*RX_BUF_SIZE - TX_BUF_SIZE)
--#else
- static unsigned char txb[TX_BUF_SIZE];
- static unsigned char rxb[NUM_RX_DESC * RX_BUF_SIZE];
--#endif
- 
-+#if 0
- static struct mac_chip_info {
-     const char *name;
-     u16 vendor_id, device_id, flags;
-@@ -78,11 +78,13 @@
-       PCI_COMMAND_IO|PCI_COMMAND_MASTER, SIS900_TOTAL_SIZE},
-     {0,0,0,0,0} /* 0 terminated list. */
- };
-+#endif
- 
- static void sis900_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
- static void amd79c901_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
- static void ics1893_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
- static void rtl8201_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
-+static void vt6103_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex);
- 
- static struct mii_chip_info {
-     const char * name;
-@@ -96,6 +98,7 @@
-     {"AMD 79C901 HomePNA PHY",   0x0000, 0x35c8, amd79c901_read_mode},
-     {"ICS 1893 Integrated PHYceiver"   , 0x0015, 0xf441,ics1893_read_mode},
-     {"RTL 8201 10/100Mbps Phyceiver"   , 0x0000, 0x8201,rtl8201_read_mode},
-+    {"VIA 6103 10/100Mbps Phyceiver", 0x0101, 0x8f20,vt6103_read_mode},
-     {0,0,0,0}
- };
- 
-@@ -106,24 +109,32 @@
-     u16 status;
- } mii;
- 
--
- // PCI to ISA bridge for SIS640E access
--static struct pci_device   pci_isa_bridge_list[] = {
-+static struct pci_id   pci_isa_bridge_list[] = {
- 	{ 0x1039, 0x0008,
--		"SIS 85C503/5513 PCI to ISA bridge", 0, 0, 0, 0},
--	{0, 0, NULL, 0, 0, 0, 0}
-+		"SIS 85C503/5513 PCI to ISA bridge"},
-+};
-+
-+struct pci_driver sis_bridge_driver = {
-+	.type     = BRIDGE_DRIVER,
-+	.name     = "",
-+	.probe    = 0,
-+	.ids      = pci_isa_bridge_list,
-+	.id_count = sizeof(pci_isa_bridge_list)/sizeof(pci_isa_bridge_list[0]),
-+	.class    = 0,
- };
- 
- /* Function Prototypes */
- 
--struct nic *sis900_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci);
-+static int sis900_probe(struct dev *dev, struct pci_device *pci);
- 
- static u16  sis900_read_eeprom(int location);
- static void sis900_mdio_reset(long mdio_addr);
- static void sis900_mdio_idle(long mdio_addr);
- static u16  sis900_mdio_read(int phy_id, int location);
-+#if 0
- static void sis900_mdio_write(int phy_id, int location, int val);
--
-+#endif
- static void sis900_init(struct nic *nic);
- 
- static void sis900_reset(struct nic *nic);
-@@ -136,9 +147,11 @@
- 
- static void sis900_transmit(struct nic *nic, const char *d, 
-                             unsigned int t, unsigned int s, const char *p);
--static int  sis900_poll(struct nic *nic);
-+static int  sis900_poll(struct nic *nic, int retrieve);
-+
-+static void sis900_disable(struct dev *dev);
- 
--static void sis900_disable(struct nic *nic);
-+static void sis900_irq(struct nic *nic, irq_action_t action);
- 
- /**
-  *	sis900_get_mac_addr: - Get MAC address for stand alone SiS900 model
-@@ -149,7 +162,7 @@
-  *	MAC address is read from read_eeprom() into @net_dev->dev_addr.
-  */
- 
--static int sis900_get_mac_addr(struct pci_device * pci_dev , struct nic *nic)
-+static int sis900_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
- {
- 	u16 signature;
- 	int i;
-@@ -168,6 +181,50 @@
- }
- 
- /**
-+ *	sis96x_get_mac_addr: - Get MAC address for SiS962 or SiS963 model
-+ *	@pci_dev: the sis900 pci device
-+ *	@net_dev: the net device to get address for 
-+ *
-+ *	SiS962 or SiS963 model, use EEPROM to store MAC address. And EEPROM 
-+ *	is shared by
-+ *	LAN and 1394. When access EEPROM, send EEREQ signal to hardware first 
-+ *	and wait for EEGNT. If EEGNT is ON, EEPROM is permitted to be access 
-+ *	by LAN, otherwise is not. After MAC address is read from EEPROM, send
-+ *	EEDONE signal to refuse EEPROM access by LAN. 
-+ *	The EEPROM map of SiS962 or SiS963 is different to SiS900. 
-+ *	The signature field in SiS962 or SiS963 spec is meaningless. 
-+ *	MAC address is read into @net_dev->dev_addr.
-+ */
-+
-+static int sis96x_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
-+{
-+/* 	long ioaddr = net_dev->base_addr; */
-+	long ee_addr = ioaddr + mear;
-+	u32 waittime = 0;
-+	int i;
-+	
-+	printf("Alternate function\n");
-+
-+	outl(EEREQ, ee_addr);
-+	while(waittime < 2000) {
-+		if(inl(ee_addr) & EEGNT) {
-+
-+			/* get MAC address from EEPROM */
-+			for (i = 0; i < 3; i++)
-+			        ((u16 *)(nic->node_addr))[i] = sis900_read_eeprom(i+EEPROMMACAddr);
-+
-+			outl(EEDONE, ee_addr);
-+			return 1;
-+		} else {
-+			udelay(1);	
-+			waittime ++;
-+		}
-+	}
-+	outl(EEDONE, ee_addr);
-+	return 0;
-+}
-+
-+/**
-  *	sis630e_get_mac_addr: - Get MAC address for SiS630E model
-  *	@pci_dev: the sis900 pci device
-  *	@net_dev: the net device to get address for
-@@ -177,17 +234,21 @@
-  *	MAC address is read into @net_dev->dev_addr.
-  */
- 
--static int sis630e_get_mac_addr(struct pci_device * pci_dev, struct nic *nic)
-+static int sis630e_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
- {
- 	u8 reg;
- 	int i;
--	struct pci_device	*p;
--
--	// find PCI to ISA bridge
--	eth_pci_init(pci_isa_bridge_list);
-+	struct pci_device	p[1];
- 
--    /* the firts entry in this list should contain bus/devfn */
--    p = pci_isa_bridge_list;
-+	/* find PCI to ISA bridge */
-+	memset(p, 0, sizeof(p));
-+	do {
-+		find_pci(BRIDGE_DRIVER, p);
-+	} while(p->driver && p->driver != &sis_bridge_driver);
-+
-+	/* error on failure */
-+	if (!p->driver)
-+	    return 0;
- 
- 	pcibios_read_config_byte(p->bus,p->devfn, 0x48, &reg);
- 	pcibios_write_config_byte(p->bus,p->devfn, 0x48, reg | 0x40);
-@@ -201,7 +262,43 @@
- 
- 	return 1;
- }
--
-+
-+/**
-+ *      sis630e_get_mac_addr: - Get MAC address for SiS630E model
-+ *      @pci_dev: the sis900 pci device
-+ *      @net_dev: the net device to get address for
-+ *
-+ *      SiS630E model, use APC CMOS RAM to store MAC address.
-+ *      APC CMOS RAM is accessed through ISA bridge.
-+ *      MAC address is read into @net_dev->dev_addr.
-+ */
-+
-+static int sis635_get_mac_addr(struct pci_device * pci_dev __unused, struct nic *nic)
-+{
-+        u32 rfcrSave;
-+        u32 i;
-+	
-+	
-+        rfcrSave = inl(rfcr + ioaddr);
-+
-+        outl(rfcrSave | RELOAD, ioaddr + cr);
-+        outl(0, ioaddr + cr);
-+
-+        /* disable packet filtering before setting filter */
-+        outl(rfcrSave & ~RFEN, rfcr + ioaddr);
-+
-+        /* load MAC addr to filter data register */
-+        for (i = 0 ; i < 3 ; i++) {
-+                outl((i << RFADDR_shift), ioaddr + rfcr);
-+                *( ((u16 *)nic->node_addr) + i) = inw(ioaddr + rfdr);
-+        }
-+
-+        /* enable packet filitering */
-+        outl(rfcrSave | RFEN, rfcr + ioaddr);
-+
-+        return 1;
-+}
-+
- /* 
-  * Function: sis900_probe
-  *
-@@ -216,19 +313,21 @@
-  * Returns:   struct nic *:          pointer to NIC data structure
-  */
- 
--struct nic *sis900_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
-+static int sis900_probe(struct dev *dev, struct pci_device *pci)
- {
-+    struct nic *nic = (struct nic *)dev;
-     int i;
-     int found=0;
-     int phy_addr;
--    u16 signature;
-     u8 revision;
-     int ret;
- 
--    if (io_addrs == 0 || *io_addrs == 0)
--        return NULL;
-+    if (pci->ioaddr == 0)
-+        return 0;
- 
--    ioaddr  = *io_addrs & ~3;
-+    nic->irqno  = 0;
-+    nic->ioaddr = pci->ioaddr & ~3;
-+    ioaddr  = pci->ioaddr & ~3;
-     vendor  = pci->vendor;
-     dev_id  = pci->dev_id;
- 
-@@ -240,19 +339,29 @@
-     /* get MAC address */
-     ret = 0;
-     pcibios_read_config_byte(pci->bus,pci->devfn, PCI_REVISION, &revision);
--    if (revision == SIS630E_900_REV || revision == SIS630EA1_900_REV)
--       ret = sis630e_get_mac_addr(pci, nic);
--    else if (revision == SIS630S_900_REV)
-+    
-+    /* save for use later in sis900_reset() */
-+    pci_revision = revision; 
-+
-+    if (revision == SIS630E_900_REV)
-         ret = sis630e_get_mac_addr(pci, nic);
-+    else if ((revision > 0x81) && (revision <= 0x90))
-+        ret = sis635_get_mac_addr(pci, nic);
-+    else if (revision == SIS96x_900_REV)
-+	ret = sis96x_get_mac_addr(pci, nic);
-     else
-         ret = sis900_get_mac_addr(pci, nic);
- 
-     if (ret == 0)
-     {
-         printf ("sis900_probe: Error MAC address not found\n");
--        return NULL;
-+        return 0;
-     }
- 
-+    /* 630ET : set the mii access mode as software-mode */
-+    if (revision == SIS630ET_900_REV)
-+	outl(ACCESSMODE | inl(ioaddr + cr), ioaddr + cr);
-+
-     printf("\nsis900_probe: MAC addr %! at ioaddr %#hX\n",
-            nic->node_addr, ioaddr);
-     printf("sis900_probe: Vendor:%#hX Device:%#hX\n", vendor, dev_id);
-@@ -264,7 +373,7 @@
-     for (phy_addr = 0; phy_addr < 32; phy_addr++) {
-         u16 mii_status;
-         u16 phy_id0, phy_id1;
--                
-+
-         mii_status = sis900_mdio_read(phy_addr, MII_STATUS);
-         if (mii_status == 0xffff || mii_status == 0x0000)
-             /* the mii is not accessable, try next one */
-@@ -272,7 +381,7 @@
-                 
-         phy_id0 = sis900_mdio_read(phy_addr, MII_PHY_ID0);
-         phy_id1 = sis900_mdio_read(phy_addr, MII_PHY_ID1);
--                
-+
-         /* search our mii table for the current mii */ 
-         for (i = 0; mii_chip_table[i].phy_id1; i++) {
- 
-@@ -294,7 +403,7 @@
-         
-     if (found == 0) {
-         printf("sis900_probe: No MII transceivers found!\n");
--        return NULL;
-+        return 0;
-     }
- 
-     /* Arbitrarily select the last PHY found as current PHY */
-@@ -304,15 +413,14 @@
-     /* initialize device */
-     sis900_init(nic);
- 
--    nic->reset    = sis900_init;
-+    dev->disable  = sis900_disable;
-     nic->poll     = sis900_poll;
-     nic->transmit = sis900_transmit;
--    nic->disable  = sis900_disable;
-+    nic->irq      = sis900_irq;
- 
--    return nic;
-+    return 1;
- }
- 
--
- /* 
-  * EEPROM Routines:  These functions read and write to EEPROM for 
-  *    retrieving the MAC address and other configuration information about 
-@@ -322,7 +430,6 @@
- /* Delay between EEPROM clock transitions. */
- #define eeprom_delay()  inl(ee_addr)
- 
--
- /* Function: sis900_read_eeprom
-  *
-  * Description: reads and returns a given location from EEPROM
-@@ -378,7 +485,6 @@
- 
- #define sis900_mdio_delay()    inl(mdio_addr)
- 
--
- /* 
-    Read and write the MII management registers using software-generated
-    serial MDIO protocol. Note that the command bits and data bits are
-@@ -432,9 +538,11 @@
-         outl(MDC, mdio_addr);
-         sis900_mdio_delay();
-     }
-+    outl(0x00, mdio_addr);
-     return retval;
- }
- 
-+#if 0
- static void sis900_mdio_write(int phy_id, int location, int value)
- {
-     long mdio_addr = ioaddr + mear;
-@@ -471,10 +579,11 @@
-         outb(MDC, mdio_addr);
-         sis900_mdio_delay();
-     }
-+    outl(0x00, mdio_addr);
-     return;
- }
-+#endif
- 
--
- /* Function: sis900_init
-  *
-  * Description: resets the ethernet controller chip and various
-@@ -500,10 +609,9 @@
- 
-     sis900_check_mode(nic);
- 
--    outl(RxENA, ioaddr + cr);
-+    outl(RxENA| inl(ioaddr + cr), ioaddr + cr);
- }
- 
--
- /* 
-  * Function: sis900_reset
-  *
-@@ -515,7 +623,7 @@
-  */
- 
- static void 
--sis900_reset(struct nic *nic)
-+sis900_reset(struct nic *nic __unused)
- {
-     int i = 0;
-     u32 status = TxRCMP | RxRCMP;
-@@ -524,16 +632,19 @@
-     outl(0, ioaddr + imr);
-     outl(0, ioaddr + rfcr);
- 
--    outl(RxRESET | TxRESET | RESET, ioaddr + cr);
--        
-+    outl(RxRESET | TxRESET | RESET | inl(ioaddr + cr), ioaddr + cr);
-+
-     /* Check that the chip has finished the reset. */
-     while (status && (i++ < 1000)) {
-         status ^= (inl(isr + ioaddr) & status);
-     }
--    outl(PESEL, ioaddr + cfg);
-+
-+    if( (pci_revision == SIS635A_900_REV) || (pci_revision == SIS900B_900_REV) )
-+            outl(PESEL | RND_CNT, ioaddr + cfg);
-+    else
-+            outl(PESEL, ioaddr + cfg);
- }
- 
--
- /* Function: sis_init_rxfilter
-  *
-  * Description: sets receive filter address to our MAC address
-@@ -552,7 +663,7 @@
-     rfcrSave = inl(rfcr + ioaddr);
- 
-     /* disable packet filtering before setting filter */
--    outl(rfcrSave & ~RFEN, rfcr);
-+    outl(rfcrSave & ~RFEN, rfcr + ioaddr);
- 
-     /* load MAC addr to filter data register */
-     for (i = 0 ; i < 3 ; i++) {
-@@ -571,7 +682,6 @@
-     outl(rfcrSave | RFEN, rfcr + ioaddr);
- }
- 
--
- /* 
-  * Function: sis_init_txd
-  *
-@@ -583,20 +693,19 @@
-  */
- 
- static void
--sis900_init_txd(struct nic *nic)
-+sis900_init_txd(struct nic *nic __unused)
- {
-     txd.link   = (u32) 0;
-     txd.cmdsts = (u32) 0;
--    txd.bufptr = (u32) &txb[0];
-+    txd.bufptr = virt_to_bus(&txb[0]);
- 
-     /* load Transmit Descriptor Register */
--    outl((u32) &txd, ioaddr + txdp); 
-+    outl(virt_to_bus(&txd), ioaddr + txdp); 
-     if (sis900_debug > 0)
-         printf("sis900_init_txd: TX descriptor register loaded with: %X\n", 
-                inl(ioaddr + txdp));
- }
- 
--
- /* Function: sis_init_rxd
-  *
-  * Description: initializes the Rx descriptor ring
-@@ -607,7 +716,7 @@
-  */
- 
- static void 
--sis900_init_rxd(struct nic *nic) 
-+sis900_init_rxd(struct nic *nic __unused) 
- { 
-     int i;
- 
-@@ -615,16 +724,16 @@
- 
-     /* init RX descriptor */
-     for (i = 0; i < NUM_RX_DESC; i++) {
--        rxd[i].link   = (i+1 < NUM_RX_DESC) ? (u32) &rxd[i+1] : (u32) &rxd[0];
-+        rxd[i].link   = virt_to_bus((i+1 < NUM_RX_DESC) ? &rxd[i+1] : &rxd[0]);
-         rxd[i].cmdsts = (u32) RX_BUF_SIZE;
--        rxd[i].bufptr = (u32) &rxb[i*RX_BUF_SIZE];
-+        rxd[i].bufptr = virt_to_bus(&rxb[i*RX_BUF_SIZE]);
-         if (sis900_debug > 0)
-             printf("sis900_init_rxd: rxd[%d]=%X link=%X cmdsts=%X bufptr=%X\n", 
-                    i, &rxd[i], rxd[i].link, rxd[i].cmdsts, rxd[i].bufptr);
-     }
- 
-     /* load Receive Descriptor Register */
--    outl((u32) &rxd[0], ioaddr + rxdp);
-+    outl(virt_to_bus(&rxd[0]), ioaddr + rxdp);
- 
-     if (sis900_debug > 0)
-         printf("sis900_init_rxd: RX descriptor register loaded with: %X\n", 
-@@ -632,7 +741,6 @@
- 
- }
- 
--
- /* Function: sis_init_rxd
-  *
-  * Description: 
-@@ -644,25 +752,36 @@
-  * Returns:   void.
-  */
- 
--static void sis900_set_rx_mode(struct nic *nic)
-+static void sis900_set_rx_mode(struct nic *nic __unused)
- {
--    int i;
-+    int i, table_entries;
-+    u32 rx_mode; 
-+    u16 mc_filter[16] = {0};	/* 256/128 bits multicast hash table */
-+    	
-+    if((pci_revision == SIS635A_900_REV) || (pci_revision == SIS900B_900_REV))
-+	table_entries = 16;
-+    else
-+	table_entries = 8;
- 
--    /* Configure Multicast Hash Table in Receive Filter 
--       to reject all MCAST packets */
--    for (i = 0; i < 8; i++) {
-+    /* accept all multicast packet */
-+    rx_mode = RFAAB | RFAAM;
-+    for (i = 0; i < table_entries; i++)
-+		mc_filter[i] = 0xffff;
-+					
-+    /* update Multicast Hash Table in Receive Filter */
-+    for (i = 0; i < table_entries; i++) {
-         /* why plus 0x04? That makes the correct value for hash table. */
-         outl((u32)(0x00000004+i) << RFADDR_shift, ioaddr + rfcr);
--        outl((u32)(0x0), ioaddr + rfdr);
-+        outl(mc_filter[i], ioaddr + rfdr);
-     }
--    /* Accept Broadcast packets, destination addresses that match 
-+
-+    /* Accept Broadcast and multicast packets, destination addresses that match 
-        our MAC address */
--    outl(RFEN | RFAAB, ioaddr + rfcr);
-+    outl(RFEN | rx_mode, ioaddr + rfcr);
- 
-     return;
- }
- 
--
- /* Function: sis900_check_mode
-  *
-  * Description: checks the state of transmit and receive
-@@ -674,15 +793,21 @@
-  */
- 
- static void
--sis900_check_mode (struct nic *nic)
-+sis900_check_mode(struct nic *nic)
- {
-     int speed, duplex;
-     u32 tx_flags = 0, rx_flags = 0;
- 
-     mii.chip_info->read_mode(nic, cur_phy, &speed, &duplex);
- 
--    tx_flags = TxATP | (TX_DMA_BURST << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift);
--    rx_flags = RX_DMA_BURST << RxMXDMA_shift;
-+    if( inl(ioaddr + cfg) & EDB_MASTER_EN ) {
-+        tx_flags = TxATP | (DMA_BURST_64 << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift);
-+	rx_flags = DMA_BURST_64 << RxMXDMA_shift;
-+    }
-+    else {
-+            tx_flags = TxATP | (DMA_BURST_512 << TxMXDMA_shift) | (TX_FILL_THRESH << TxFILLT_shift);
-+            rx_flags = DMA_BURST_512 << RxMXDMA_shift;
-+    }
- 
-     if (speed == HW_SPEED_HOME || speed == HW_SPEED_10_MBPS) {
-         rx_flags |= (RxDRNT_10 << RxDRNT_shift);
-@@ -702,7 +827,6 @@
-     outl (rx_flags, ioaddr + rxcfg);
- }
- 
--
- /* Function: sis900_read_mode
-  *
-  * Description: retrieves and displays speed and duplex
-@@ -714,24 +838,33 @@
-  */
- 
- static void
--sis900_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
-+sis900_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
- {
-     int i = 0;
-     u32 status;
-+    u16 phy_id0, phy_id1;
-         
-     /* STSOUT register is Latched on Transition, read operation updates it */
-     while (i++ < 2)
-         status = sis900_mdio_read(phy_addr, MII_STSOUT);
- 
--    if (status & MII_STSOUT_SPD)
--        *speed = HW_SPEED_100_MBPS;
--    else
--        *speed = HW_SPEED_10_MBPS;
--
--    if (status & MII_STSOUT_DPLX)
--        *duplex = FDX_CAPABLE_FULL_SELECTED;
--    else
--        *duplex = FDX_CAPABLE_HALF_SELECTED;
-+    *speed = HW_SPEED_10_MBPS;
-+    *duplex = FDX_CAPABLE_HALF_SELECTED;
-+    
-+    if (status & (MII_NWAY_TX | MII_NWAY_TX_FDX))
-+	*speed = HW_SPEED_100_MBPS;
-+    if (status & ( MII_NWAY_TX_FDX | MII_NWAY_T_FDX))
-+	*duplex = FDX_CAPABLE_FULL_SELECTED;
-+	
-+    /* Workaround for Realtek RTL8201 PHY issue */
-+    phy_id0 = sis900_mdio_read(phy_addr, MII_PHY_ID0);
-+    phy_id1 = sis900_mdio_read(phy_addr, MII_PHY_ID1);
-+    if((phy_id0 == 0x0000) && ((phy_id1 & 0xFFF0) == 0x8200)){
-+	if(sis900_mdio_read(phy_addr, MII_CONTROL) & MII_CNTL_FDX)
-+	    *duplex = FDX_CAPABLE_FULL_SELECTED;
-+	if(sis900_mdio_read(phy_addr, 0x0019) & 0x01)
-+	    *speed = HW_SPEED_100_MBPS;
-+    }
- 
-     if (status & MII_STSOUT_LINK_FAIL)
-         printf("sis900_read_mode: Media Link Off\n");
-@@ -743,7 +876,6 @@
-                "full" : "half");
- }
- 
--
- /* Function: amd79c901_read_mode
-  *
-  * Description: retrieves and displays speed and duplex
-@@ -755,7 +887,7 @@
-  */
- 
- static void
--amd79c901_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
-+amd79c901_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
- {
-     int i;
-     u16 status;
-@@ -796,7 +928,6 @@
-     }
- }
- 
--
- /**
-  *	ics1893_read_mode: - read media mode for ICS1893 PHY
-  *	@net_dev: the net device to read mode for
-@@ -808,7 +939,7 @@
-  *	to determine the speed and duplex mode for sis900
-  */
- 
--static void ics1893_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
-+static void ics1893_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
- {
- 	int i = 0;
- 	u32 status;
-@@ -848,7 +979,7 @@
-  *	to determine the speed and duplex mode for sis900
-  */
- 
--static void rtl8201_read_mode(struct nic *nic, int phy_addr, int *speed, int *duplex)
-+static void rtl8201_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
- {
- 	u32 status;
- 
-@@ -878,7 +1009,51 @@
- 		       *duplex == FDX_CAPABLE_FULL_SELECTED ?
- 		       "full" : "half");
- 	else
--		printf("rtl9201_read_config_mode: Media Link Off\n");
-+		printf("rtl8201_read_config_mode: Media Link Off\n");
-+}
-+
-+/**
-+ *	vt6103_read_mode: - read media mode for vt6103 phy
-+ *	@nic: the net device to read mode for
-+ *	@phy_addr: mii phy address
-+ *	@speed: the transmit speed to be determined
-+ *	@duplex: the duplex mode to be determined
-+ *
-+ *	read MII_STATUS register from rtl8201 phy
-+ *	to determine the speed and duplex mode for sis900
-+ */
-+
-+static void vt6103_read_mode(struct nic *nic __unused, int phy_addr, int *speed, int *duplex)
-+{
-+	u32 status;
-+
-+	status = sis900_mdio_read(phy_addr, MII_STATUS);
-+
-+	if (status & MII_STAT_CAN_TX_FDX) {
-+		*speed = HW_SPEED_100_MBPS;
-+		*duplex = FDX_CAPABLE_FULL_SELECTED;
-+	}
-+	else if (status & MII_STAT_CAN_TX) {
-+		*speed = HW_SPEED_100_MBPS;
-+		*duplex = FDX_CAPABLE_HALF_SELECTED;
-+	}
-+	else if (status & MII_STAT_CAN_T_FDX) {
-+		*speed = HW_SPEED_10_MBPS;
-+		*duplex = FDX_CAPABLE_FULL_SELECTED;
-+	}
-+	else if (status & MII_STAT_CAN_T) {
-+		*speed = HW_SPEED_10_MBPS;
-+		*duplex = FDX_CAPABLE_HALF_SELECTED;
-+	}
-+
-+	if (status & MII_STAT_LINK)
-+		printf("vt6103_read_mode: Media Link On %s %s-duplex \n",
-+		       *speed == HW_SPEED_100_MBPS ?
-+		       "100mbps" : "10mbps",
-+		       *duplex == FDX_CAPABLE_FULL_SELECTED ?
-+		       "full" : "half");
-+	else
-+		printf("vt6103_read_config_mode: Media Link Off\n");
- }
- 
- /* Function: sis900_transmit
-@@ -900,14 +1075,14 @@
-                 unsigned int s,     /* size */
-                 const char  *p)     /* Packet */
- {
--    u32 status, to, nstype;
-+    u32 to, nstype;
-     volatile u32 tx_status;
-     
-     /* Stop the transmitter */
--    outl(TxDIS, ioaddr + cr);
-+    outl(TxDIS | inl(ioaddr + cr), ioaddr + cr);
- 
-     /* load Transmit Descriptor Register */
--    outl((u32) &txd, ioaddr + txdp); 
-+    outl(virt_to_bus(&txd), ioaddr + txdp); 
-     if (sis900_debug > 1)
-         printf("sis900_transmit: TX descriptor register loaded with: %X\n", 
-                inl(ioaddr + txdp));
-@@ -929,18 +1104,18 @@
-         txb[s++] = '\0';
- 
-     /* set the transmit buffer descriptor and enable Transmit State Machine */
--    txd.bufptr = (u32) &txb[0];
-+    txd.bufptr = virt_to_bus(&txb[0]);
-     txd.cmdsts = (u32) OWN | s;
- 
-     /* restart the transmitter */
--    outl(TxENA, ioaddr + cr);
-+    outl(TxENA | inl(ioaddr + cr), ioaddr + cr);
- 
-     if (sis900_debug > 1)
-         printf("sis900_transmit: Queued Tx packet size %d.\n", (int) s);
- 
-     to = currticks() + TX_TIMEOUT;
- 
--    while (((tx_status=txd.cmdsts) & OWN) && (currticks() < to))
-+    while (((tx_status=txd.cmdsts & OWN) && (currticks() < to))
-         /* wait */ ;
- 
-     if (currticks() >= to) {
-@@ -955,7 +1130,6 @@
-     outl(0, ioaddr + imr);
- }
- 
--
- /* Function: sis900_poll
-  *
-  * Description: checks for a received packet and returns it if found.
-@@ -971,7 +1145,7 @@
-  */
- 
- static int
--sis900_poll(struct nic *nic)
-+sis900_poll(struct nic *nic, int retrieve)
- {
-     u32 rx_status = rxd[cur_rx].cmdsts;
-     int retstat = 0;
-@@ -986,6 +1160,8 @@
-         printf("sis900_poll: got a packet: cur_rx:%d, status:%X\n",
-                cur_rx, rx_status);
- 
-+    if ( ! retrieve ) return 1;
-+    
-     nic->packetlen = (rx_status & DSIZE) - CRC_SIZE;
- 
-     if (rx_status & (ABORT|OVERRUN|TOOLONG|RUNT|RXISERR|CRCERR|FAERR)) {
-@@ -1001,18 +1177,18 @@
- 
-     /* return the descriptor and buffer to receive ring */
-     rxd[cur_rx].cmdsts = RX_BUF_SIZE;
--    rxd[cur_rx].bufptr = (u32) &rxb[cur_rx*RX_BUF_SIZE];
-+    rxd[cur_rx].bufptr = virt_to_bus(&rxb[cur_rx*RX_BUF_SIZE]);
-         
-     if (++cur_rx == NUM_RX_DESC)
-         cur_rx = 0;
- 
-     /* re-enable the potentially idle receive state machine */
--    outl(RxENA , ioaddr + cr);
-+    outl(RxENA | inl(ioaddr + cr), ioaddr + cr);
- 
-     return retstat;
-+
- }
- 
--
- /* Function: sis900_disable
-  *
-  * Description: Turns off interrupts and stops Tx and Rx engines
-@@ -1023,12 +1199,53 @@
-  */
- 
- static void
--sis900_disable(struct nic *nic)
-+sis900_disable(struct dev *dev)
- {
-+    struct nic *nic = (struct nic *)dev;
-+    /* merge reset and disable */
-+    sis900_init(nic);
-+
-     /* Disable interrupts by clearing the interrupt mask. */
-     outl(0, ioaddr + imr);
-     outl(0, ioaddr + ier);
-     
-     /* Stop the chip's Tx and Rx Status Machine */
--    outl(RxDIS | TxDIS, ioaddr + cr);
-+    outl(RxDIS | TxDIS | inl(ioaddr + cr), ioaddr + cr);
-+}
-+
-+/* Function: sis900_irq
-+ *
-+ * Description: Enable, Disable, or Force, interrupts
-+ *    
-+ * Arguments: struct nic *nic:          NIC data structure
-+ *            irq_action_t action:      Requested action       
-+ *
-+ * Returns:   void.
-+ */
-+
-+static void
-+sis900_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
- }
-+
-+static struct pci_id sis900_nics[] = {
-+PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900"),
-+PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
-+};
-+
-+struct pci_driver sis900_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "SIS900",
-+	.probe    = sis900_probe,
-+	.ids      = sis900_nics,
-+	.id_count = sizeof(sis900_nics)/sizeof(sis900_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/sis900.h
-===================================================================
---- a/netboot/sis900.h
-+++ b/netboot/sis900.h
-@@ -39,14 +39,16 @@
- 
- /* Symbolic names for bits in various registers */
- enum sis900_command_register_bits {
--    RESET   = 0x00000100, 
--    SWI     = 0x00000080, 
--    RxRESET = 0x00000020,
--    TxRESET = 0x00000010, 
--    RxDIS   = 0x00000008, 
--    RxENA   = 0x00000004,
--    TxDIS   = 0x00000002, 
--    TxENA   = 0x00000001
-+    RELOAD     = 0x00000400,
-+    ACCESSMODE = 0x00000200,
-+    RESET      = 0x00000100, 
-+    SWI        = 0x00000080, 
-+    RxRESET    = 0x00000020,
-+    TxRESET    = 0x00000010, 
-+    RxDIS      = 0x00000008, 
-+    RxENA      = 0x00000004,
-+    TxDIS      = 0x00000002, 
-+    TxENA      = 0x00000001
- };
- 
- enum sis900_configuration_register_bits {
-@@ -57,7 +59,10 @@
-     EXD      = 0x00000010, 
-     PESEL    = 0x00000008, 
-     LPM      = 0x00000004, 
--    BEM      = 0x00000001
-+    BEM      = 0x00000001,
-+    RND_CNT  = 0x00000400,
-+    FAIR_BACKOFF = 0x00000200,
-+    EDB_MASTER_EN = 0x00002000
- };
- 
- enum sis900_eeprom_access_reigster_bits {
-@@ -108,6 +113,10 @@
- #define TX_DMA_BURST    0
- #define RX_DMA_BURST    0
- 
-+enum sis900_tx_rx_dma{
-+	        DMA_BURST_512 = 0,      DMA_BURST_64 = 5
-+};
-+
- /* transmit FIFO threshholds */
- #define TX_FILL_THRESH  16      /* 1/4 FIFO size */
- #define TxFILLT_shift   8
-@@ -172,6 +181,11 @@
-     EEeraseAll      = 0x0120,
-     EEwriteAll      = 0x0110, 
-     EEaddrMask      = 0x013F, 
-+    EEcmdShift 	    = 16
-+};
-+/* For SiS962 or SiS963, request the eeprom software access */
-+enum sis96x_eeprom_command {
-+	EEREQ = 0x00000400, EEDONE = 0x00000200, EEGNT = 0x00000100
- };
- 
- /* Manamgement Data I/O (mdio) frame */
-@@ -236,7 +250,8 @@
-     MII_CONFIG1 = 0x0010,
-     MII_CONFIG2 = 0x0011,
-     MII_STSOUT  = 0x0012,
--    MII_MASK    = 0x0013
-+    MII_MASK    = 0x0013,
-+    MII_RESV    = 0x0014
- };
- 
- /* mii registers specific to AMD 79C901 */
-@@ -320,7 +335,9 @@
- 
- enum sis900_revision_id {
- 	SIS630A_900_REV = 0x80,		SIS630E_900_REV = 0x81,
--	SIS630S_900_REV = 0x82,		SIS630EA1_900_REV = 0x83
-+	SIS630S_900_REV = 0x82,		SIS630EA1_900_REV = 0x83,
-+	SIS630ET_900_REV = 0x84,        SIS635A_900_REV = 0x90,
-+	SIS96x_900_REV = 0X91,		SIS900B_900_REV = 0x03
- };
- 
- enum sis630_revision_id {
-Index: b/netboot/sis900.txt
-===================================================================
---- a/netboot/sis900.txt
-+++ /dev/null
-@@ -1,91 +0,0 @@
--How I added the SIS900 card to Etherboot
--
--Author: Marty Connor (mdc@thinguin.org)
--
--Date:   25 Febrary 2001
--
--Description:
--
--This file is intended to help people who want to write an Etherboot
--driver or port another driver to Etherboot.  It is a starting point.
--Perhaps someday I may write a more detailed description of writing an
--Etherboot driver. This text should help get people started, and
--studying sis900.[ch] should help show the basic structure and
--techniques involved in writing and Etherboot driver.
--
--***********************************************************************
--
--0. Back up all the files I need to modify:
--
--cd etherboot-4.7.20/src
--cp Makefile Makefile.orig
--cp config.c config.c.orig
--cp pci.h pci.h.orig
--cp NIC NIC.orig
--cp cards.h cards.h.orig
--
--1. Edit src/Makefile to add SIS900FLAGS to defines
--
--SIS900FLAGS=	       	-DINCLUDE_SIS900
--
--2. edit src/pci.h to add PCI signatures for card
--
--#define PCI_VENDOR_ID_SIS         	0x1039
--#define PCI_DEVICE_ID_SIS900     	0x0900   
--#define PCI_DEVICE_ID_SIS7016    	0x7016  
--
--3. Edit src/config.c to add the card to the card probe list
--
--#if defined(INCLUDE_NS8390)  || defined(INCLUDE_EEPRO100)  || 
--    defined(INCLUDE_LANCE)   || defined(INCLUDE_EPIC100)   || 
--    defined(INCLUDE_TULIP)   || defined(INCLUDE_OTULIP)    ||
--    defined(INCLUDE_3C90X)   || defined(INCLUDE_3C595)     ||
--    defined(INCLUDE_RTL8139) || defined(INCLUDE_VIA_RHINE) || 
--    defined(INCLUDE_SIS900)  || defined(INCLUDE_W89C840)
--
--... and ...
--
--#ifdef INCLUDE_SIS900
--       { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS900,
--         "SIS900", 0, 0, 0, 0},
--       { PCI_VENDOR_ID_SIS,     	PCI_DEVICE_ID_SIS7016,
--	 "SIS7016", 0, 0, 0, 0},
--#endif
--
--... and ...
--
--#ifdef INCLUDE_SIS900
--	{ "SIS900", sis900_probe, pci_ioaddrs },	
--#endif
--
--4. Edit NIC to add sis900 and sis7016 to NIC list
--
--# SIS 900 and SIS 7016
--sis900		sis900		0x1039,0x0900
--sis7016		sis900		0x1039,0x7016
--
--5. Edit cards.h to add sis900 probe routine declaration
--
--#ifdef	INCLUDE_SIS900
--extern struct nic	*sis900_probe(struct nic *, unsigned short *
--                        PCI_ARG(struct pci_device *));
--#endif
--
--***********************************************************************
--
--At this point, you can begin creating your driver source file.  See
--the "Writing and Etherboot Driver" section of the Etherboot
--documentation for some hints.  See the skel.c file for a starting
--point.  If there is a Linux driver for the card, you may be able to
--use that.  Copy and learn from existing Etherboot drivers (this is GPL
--/ Open Source software!).
--
--Join the etherboot-developers and etherboot-users mailing lists
--(information is on etherboot.sourceforge.net) for information and
--assistance. We invite more developers to help improve Etherboot.
--
--Visit the http://etherboot.sourceforge.net, http://thinguin.org, 
--http://rom-o-matic.net, and http://ltsp.org sites for information and
--assistance.
--
--Enjoy.
-Index: b/netboot/smc9000.c
-===================================================================
---- a/netboot/smc9000.c
-+++ /dev/null
-@@ -1,522 +0,0 @@
-- /*------------------------------------------------------------------------
-- * smc9000.c
-- * This is a Etherboot driver for SMC's 9000 series of Ethernet cards.
-- *
-- * Copyright (C) 1998 Daniel Engstr�m <daniel.engstrom@riksnett.no>
-- * Based on the Linux SMC9000 driver, smc9194.c by Eric Stahlman
-- * Copyright (C) 1996 by Erik Stahlman <eric@vt.edu>
-- *
-- * This software may be used and distributed according to the terms
-- * of the GNU Public License, incorporated herein by reference.
-- *
-- * "Features" of the SMC chip:
-- *   4608 byte packet memory. ( for the 91C92/4.  Others have more )
-- *   EEPROM for configuration
-- *   AUI/TP selection
-- *
-- * Authors
-- *	Erik Stahlman				<erik@vt.edu>
-- *      Daniel Engstr�m                         <daniel.engstrom@riksnett.no>
-- *
-- * History
-- * 98-09-25              Daniel Engstr�m Etherboot driver crated from Eric's
-- *                                       Linux driver.
-- *
-- *---------------------------------------------------------------------------*/
--#define LINUX_OUT_MACROS 1
--#define SMC9000_VERBOSE  1
--#define SMC9000_DEBUG    0
--
--#include "etherboot.h"
--#include "nic.h"
--#include "cards.h"
--#include "smc9000.h"
--
--# define _outb outb
--# define _outw outw
--
--static const char       smc9000_version[] = "Version 0.99 98-09-30";
--static unsigned int	smc9000_base=0;
--static const char       *interfaces[ 2 ] = { "TP", "AUI" };
--static const char       *chip_ids[ 15 ] =  {
--   NULL, NULL, NULL,
--   /* 3 */ "SMC91C90/91C92",
--   /* 4 */ "SMC91C94",
--   /* 5 */ "SMC91C95",
--   NULL,
--   /* 7 */ "SMC91C100",
--   /* 8 */ "SMC91C100FD",
--   NULL, NULL, NULL,
--   NULL, NULL, NULL
--};
--static const char      smc91c96_id[] = "SMC91C96";
--
--/*
-- * Function: smc_reset( int ioaddr )
-- * Purpose:
-- *	This sets the SMC91xx chip to its normal state, hopefully from whatever
-- *	mess that any other DOS driver has put it in.
-- *
-- * Maybe I should reset more registers to defaults in here?  SOFTRESET  should
-- * do that for me.
-- *
-- * Method:
-- *	1.  send a SOFT RESET
-- *	2.  wait for it to finish
-- *	3.  reset the memory management unit
-- *      4.  clear all interrupts
-- *
--*/
--static void smc_reset(int ioaddr)
--{
--   /* This resets the registers mostly to defaults, but doesn't
--    * affect EEPROM.  That seems unnecessary */
--   SMC_SELECT_BANK(ioaddr, 0);
--   _outw( RCR_SOFTRESET, ioaddr + RCR );
--
--   /* this should pause enough for the chip to be happy */
--   SMC_DELAY(ioaddr);
--
--   /* Set the transmit and receive configuration registers to
--    * default values */
--   _outw(RCR_CLEAR, ioaddr + RCR);
--   _outw(TCR_CLEAR, ioaddr + TCR);
--
--   /* Reset the MMU */
--   SMC_SELECT_BANK(ioaddr, 2);
--   _outw( MC_RESET, ioaddr + MMU_CMD );
--
--   /* Note:  It doesn't seem that waiting for the MMU busy is needed here,
--    * but this is a place where future chipsets _COULD_ break.  Be wary
--    * of issuing another MMU command right after this */
--   _outb(0, ioaddr + INT_MASK);
--}
--
--
--/*----------------------------------------------------------------------
-- * Function: smc_probe( int ioaddr )
-- *
-- * Purpose:
-- *	Tests to see if a given ioaddr points to an SMC9xxx chip.
-- *	Returns a 0 on success
-- *
-- * Algorithm:
-- *	(1) see if the high byte of BANK_SELECT is 0x33
-- *	(2) compare the ioaddr with the base register's address
-- *	(3) see if I recognize the chip ID in the appropriate register
-- *
-- * ---------------------------------------------------------------------
-- */
--static int smc_probe( int ioaddr )
--{
--   word bank;
--   word	revision_register;
--   word base_address_register;
--
--   /* First, see if the high byte is 0x33 */
--   bank = inw(ioaddr + BANK_SELECT);
--   if ((bank & 0xFF00) != 0x3300) {
--      return -1;
--   }
--   /* The above MIGHT indicate a device, but I need to write to further
--    *	test this.  */
--   _outw(0x0, ioaddr + BANK_SELECT);
--   bank = inw(ioaddr + BANK_SELECT);
--   if ((bank & 0xFF00) != 0x3300) {
--      return -1;
--   }
--
--   /* well, we've already written once, so hopefully another time won't
--    *  hurt.  This time, I need to switch the bank register to bank 1,
--    *  so I can access the base address register */
--   SMC_SELECT_BANK(ioaddr, 1);
--   base_address_register = inw(ioaddr + BASE);
--
--   if (ioaddr != (base_address_register >> 3 & 0x3E0))  {
--#ifdef	SMC9000_VERBOSE
--      printf("SMC9000: IOADDR %hX doesn't match configuration (%hX)."
--	     "Probably not a SMC chip\n",
--	     ioaddr, base_address_register >> 3 & 0x3E0);
--#endif
--      /* well, the base address register didn't match.  Must not have
--       * been a SMC chip after all. */
--      return -1;
--   }
--
--
--   /* check if the revision register is something that I recognize.
--    * These might need to be added to later, as future revisions
--    * could be added.  */
--   SMC_SELECT_BANK(ioaddr, 3);
--   revision_register  = inw(ioaddr + REVISION);
--   if (!chip_ids[(revision_register >> 4) & 0xF]) {
--      /* I don't recognize this chip, so... */
--#ifdef	SMC9000_VERBOSE
--      printf("SMC9000: IO %hX: Unrecognized revision register:"
--	     " %hX, Contact author.\n", ioaddr, revision_register);
--#endif
--      return -1;
--   }
--
--   /* at this point I'll assume that the chip is an SMC9xxx.
--    * It might be prudent to check a listing of MAC addresses
--    * against the hardware address, or do some other tests. */
--   return 0;
--}
--
--
--/**************************************************************************
-- * ETH_RESET - Reset adapter
-- ***************************************************************************/
--
--static void smc9000_reset(struct nic *nic)
--{
--   smc_reset(smc9000_base);
--}
--
--/**************************************************************************
-- * ETH_TRANSMIT - Transmit a frame
-- ***************************************************************************/
--static void smc9000_transmit(
--	struct nic *nic,
--	const char *d,			/* Destination */
--	unsigned int t,			/* Type */
--	unsigned int s,			/* size */
--	const char *p)			/* Packet */
--{
--   word length; /* real, length incl. header */
--   word numPages;
--   unsigned long time_out;
--   byte	packet_no;
--   word status;
--   int i;
--
--   /* We dont pad here since we can have the hardware doing it for us */
--   length = (s + ETH_HLEN + 1)&~1;
--
--   /* convert to MMU pages */
--   numPages = length / 256;
--
--   if (numPages > 7 ) {
--#ifdef	SMC9000_VERBOSE
--      printf("SMC9000: Far too big packet error. \n");
--#endif
--      return;
--   }
--
--   /* dont try more than, say 30 times */
--   for (i=0;i<30;i++) {
--      /* now, try to allocate the memory */
--      SMC_SELECT_BANK(smc9000_base, 2);
--      _outw(MC_ALLOC | numPages, smc9000_base + MMU_CMD);
--
--      status = 0;
--      /* wait for the memory allocation to finnish */
--      for (time_out = currticks() + 5*TICKS_PER_SEC; currticks() < time_out; ) {
--	 status = inb(smc9000_base + INTERRUPT);
--	 if ( status & IM_ALLOC_INT ) {
--	    /* acknowledge the interrupt */
--	    _outb(IM_ALLOC_INT, smc9000_base + INTERRUPT);
--	    break;
--	 }
--      }
--
--      if ((status & IM_ALLOC_INT) != 0 ) {
--	 /* We've got the memory */
--	 break;
--      } else {
--	 printf("SMC9000: Memory allocation timed out, resetting MMU.\n");
--	 _outw(MC_RESET, smc9000_base + MMU_CMD);
--      }
--   }
--
--   /* If I get here, I _know_ there is a packet slot waiting for me */
--   packet_no = inb(smc9000_base + PNR_ARR + 1);
--   if (packet_no & 0x80) {
--      /* or isn't there?  BAD CHIP! */
--      printf("SMC9000: Memory allocation failed. \n");
--      return;
--   }
--
--   /* we have a packet address, so tell the card to use it */
--   _outb(packet_no, smc9000_base + PNR_ARR);
--
--   /* point to the beginning of the packet */
--   _outw(PTR_AUTOINC, smc9000_base + POINTER);
--
--#if	SMC9000_DEBUG > 2
--   printf("Trying to xmit packet of length %hX\n", length );
--#endif
--
--   /* send the packet length ( +6 for status, length and ctl byte )
--    * and the status word ( set to zeros ) */
--   _outw(0, smc9000_base + DATA_1 );
--
--   /* send the packet length ( +6 for status words, length, and ctl) */
--   _outb((length+6) & 0xFF,  smc9000_base + DATA_1);
--   _outb((length+6) >> 8 ,   smc9000_base + DATA_1);
--
--   /* Write the contents of the packet */
--
--   /* The ethernet header first... */
--   outsw(smc9000_base + DATA_1, d, ETH_ALEN >> 1);
--   outsw(smc9000_base + DATA_1, nic->node_addr, ETH_ALEN >> 1);
--   _outw(htons(t), smc9000_base + DATA_1);
--
--   /* ... the data ... */
--   outsw(smc9000_base + DATA_1 , p, s >> 1);
--
--   /* ... and the last byte, if there is one.   */
--   if ((s & 1) == 0) {
--      _outw(0, smc9000_base + DATA_1);
--   } else {
--      _outb(p[s-1], smc9000_base + DATA_1);
--      _outb(0x20, smc9000_base + DATA_1);
--   }
--
--   /* and let the chipset deal with it */
--   _outw(MC_ENQUEUE , smc9000_base + MMU_CMD);
--
--   status = 0; time_out = currticks() + 5*TICKS_PER_SEC;
--   do {
--      status = inb(smc9000_base + INTERRUPT);
--
--      if ((status & IM_TX_INT ) != 0) {
--	 word tx_status;
--
--	 /* ack interrupt */
--	 _outb(IM_TX_INT, smc9000_base + INTERRUPT);
--
--	 packet_no = inw(smc9000_base + FIFO_PORTS);
--	 packet_no &= 0x7F;
--
--	 /* select this as the packet to read from */
--	 _outb( packet_no, smc9000_base + PNR_ARR );
--
--	 /* read the first word from this packet */
--	 _outw( PTR_AUTOINC | PTR_READ, smc9000_base + POINTER );
--
--	 tx_status = inw( smc9000_base + DATA_1 );
--
--	 if (0 == (tx_status & TS_SUCCESS)) {
--#ifdef	SMC9000_VERBOSE
--	    printf("SMC9000: TX FAIL STATUS: %hX \n", tx_status);
--#endif
--	    /* re-enable transmit */
--	    SMC_SELECT_BANK(smc9000_base, 0);
--	    _outw(inw(smc9000_base + TCR ) | TCR_ENABLE, smc9000_base + TCR );
--	 }
--
--	 /* kill the packet */
--	 SMC_SELECT_BANK(smc9000_base, 2);
--	 _outw(MC_FREEPKT, smc9000_base + MMU_CMD);
--
--	 return;
--      }
--   }while(currticks() < time_out);
--
--   printf("SMC9000: Waring TX timed out, resetting board\n");
--   smc_reset(smc9000_base);
--   return;
--}
--
--/**************************************************************************
-- * ETH_POLL - Wait for a frame
-- ***************************************************************************/
--static int smc9000_poll(struct nic *nic)
--{
--   if(!smc9000_base)
--     return 0;
--
--   SMC_SELECT_BANK(smc9000_base, 2);
--   if (inw(smc9000_base + FIFO_PORTS) & FP_RXEMPTY)
--     return 0;
--
--   /*  start reading from the start of the packet */
--   _outw(PTR_READ | PTR_RCV | PTR_AUTOINC, smc9000_base + POINTER);
--
--   /* First read the status and check that we're ok */
--   if (!(inw(smc9000_base + DATA_1) & RS_ERRORS)) {
--      /* Next: read the packet length and mask off the top bits */
--      nic->packetlen = (inw(smc9000_base + DATA_1) & 0x07ff);
--
--      /* the packet length includes the 3 extra words */
--      nic->packetlen -= 6;
--#if	SMC9000_DEBUG > 2
--      printf(" Reading %d words (and %d byte(s))\n",
--	       (nic->packetlen >> 1), nic->packetlen & 1);
--#endif
--      /* read the packet (and the last "extra" word) */
--      insw(smc9000_base + DATA_1, nic->packet, (nic->packetlen+2) >> 1);
--      /* is there an odd last byte ? */
--      if (nic->packet[nic->packetlen+1] & 0x20)
--	 nic->packetlen++;
--
--      /*  error or good, tell the card to get rid of this packet */
--      _outw(MC_RELEASE, smc9000_base + MMU_CMD);
--      return 1;
--   }
--
--   printf("SMC9000: RX error\n");
--   /*  error or good, tell the card to get rid of this packet */
--   _outw(MC_RELEASE, smc9000_base + MMU_CMD);
--   return 0;
--}
--
--static void smc9000_disable(struct nic *nic)
--{
--   if(!smc9000_base)
--     return;
--
--   /* no more interrupts for me */
--   SMC_SELECT_BANK(smc9000_base, 2);
--   _outb( 0, smc9000_base + INT_MASK);
--
--   /* and tell the card to stay away from that nasty outside world */
--   SMC_SELECT_BANK(smc9000_base, 0);
--   _outb( RCR_CLEAR, smc9000_base + RCR );
--   _outb( TCR_CLEAR, smc9000_base + TCR );
--}
--
--/**************************************************************************
-- * ETH_PROBE - Look for an adapter
-- ***************************************************************************/
--
--struct nic *smc9000_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--   unsigned short   revision;
--   int	            memory;
--   int              media;
--   const char *	    version_string;
--   const char *	    if_string;
--   int              i;
--
--   /*
--    * the SMC9000 can be at any of the following port addresses.  To change,
--    * for a slightly different card, you can add it to the array.  Keep in
--    * mind that the array must end in zero.
--    */
--   static unsigned short portlist[] = {
--#ifdef	SMC9000_SCAN
--      SMC9000_SCAN,
--#else
--      0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0,
--      0x300, 0x320, 0x340, 0x360, 0x380, 0x3A0, 0x3C0, 0x3E0,
--#endif
--      0 };
--
--   printf("\nSMC9000 %s\n", smc9000_version);
--#ifdef	SMC9000_VERBOSE
--   printf("Copyright (C) 1998 Daniel Engstr\x94m\n");
--   printf("Copyright (C) 1996 Eric Stahlman\n");
--#endif
--   /* if no addresses supplied, fall back on defaults */
--   if (probe_addrs == 0 || probe_addrs[0] == 0)
--     probe_addrs = portlist;
--
--   /* check every ethernet address */
--   for (i = 0; probe_addrs[i]; i++) {
--      /* check this specific address */
--      if (smc_probe(probe_addrs[i]) == 0)
--	smc9000_base = probe_addrs[i];
--   }
--
--   /* couldn't find anything */
--   if(0 == smc9000_base)
--     goto out;
--
--   /*
--    * Get the MAC address ( bank 1, regs 4 - 9 )
--    */
--   SMC_SELECT_BANK(smc9000_base, 1);
--   for ( i = 0; i < 6; i += 2 ) {
--      word address;
--
--      address = inw(smc9000_base + ADDR0 + i);
--      nic->node_addr[i+1] = address >> 8;
--      nic->node_addr[i] = address & 0xFF;
--   }
--
--
--   /* get the memory information */
--   SMC_SELECT_BANK(smc9000_base, 0);
--   memory = ( inw(smc9000_base + MCR) >> 9 )  & 0x7;  /* multiplier */
--   memory *= 256 * (inw(smc9000_base + MIR) & 0xFF);
--
--   /*
--    * Now, I want to find out more about the chip.  This is sort of
--    * redundant, but it's cleaner to have it in both, rather than having
--    * one VERY long probe procedure.
--    */
--   SMC_SELECT_BANK(smc9000_base, 3);
--   revision  = inw(smc9000_base + REVISION);
--   version_string = chip_ids[(revision >> 4) & 0xF];
--
--   if (((revision & 0xF0) >> 4 == CHIP_9196) &&
--       ((revision & 0x0F) >= REV_9196)) {
--      /* This is a 91c96. 'c96 has the same chip id as 'c94 (4) but
--       * a revision starting at 6 */
--      version_string = smc91c96_id;
--   }
--
--   if ( !version_string ) {
--      /* I shouldn't get here because this call was done before.... */
--      goto out;
--   }
--
--   /* is it using AUI or 10BaseT ? */
--   SMC_SELECT_BANK(smc9000_base, 1);
--   if (inw(smc9000_base + CONFIG) & CFG_AUI_SELECT)
--     media = 2;
--   else
--     media = 1;
--
--   if_string = interfaces[media - 1];
--
--   /* now, reset the chip, and put it into a known state */
--   smc_reset(smc9000_base);
--
--   printf("%s rev:%d I/O port:%hX Interface:%s RAM:%d bytes \n",
--	  version_string, revision & 0xF,
--	  smc9000_base, if_string, memory );
--   /*
--    * Print the Ethernet address
--    */
--   printf("Ethernet MAC address: %!\n", nic->node_addr);
--
--   SMC_SELECT_BANK(smc9000_base, 0);
--
--   /* see the header file for options in TCR/RCR NORMAL*/
--   _outw(TCR_NORMAL, smc9000_base + TCR);
--   _outw(RCR_NORMAL, smc9000_base + RCR);
--
--   /* Select which interface to use */
--   SMC_SELECT_BANK(smc9000_base, 1);
--   if ( media == 1 ) {
--      _outw( inw( smc9000_base + CONFIG ) & ~CFG_AUI_SELECT,
--	   smc9000_base + CONFIG );
--   }
--   else if ( media == 2 ) {
--      _outw( inw( smc9000_base + CONFIG ) | CFG_AUI_SELECT,
--	   smc9000_base + CONFIG );
--   }
--
--   nic->reset = smc9000_reset;
--   nic->poll = smc9000_poll;
--   nic->transmit = smc9000_transmit;
--   nic->disable = smc9000_disable;
--
--
--   return nic;
--
--out:
--#ifdef	SMC9000_VERBOSE
--   printf("No SMC9000 adapters found\n");
--#endif
--   smc9000_base = 0;
--
--   return (0);
--}
--
--
--
-Index: b/netboot/smc9000.h
-===================================================================
---- a/netboot/smc9000.h
-+++ /dev/null
-@@ -1,205 +0,0 @@
--/*------------------------------------------------------------------------
-- * smc9000.h
-- *
-- * Copyright (C) 1998 by Daniel Engstr�m
-- * Copyright (C) 1996 by Erik Stahlman
-- *
-- * This software may be used and distributed according to the terms
-- * of the GNU Public License, incorporated herein by reference.
-- *
-- * This file contains register information and access macros for
-- * the SMC91xxx chipset.
-- *
-- * Information contained in this file was obtained from the SMC91C94
-- * manual from SMC.  To get a copy, if you really want one, you can find
-- * information under www.smsc.com in the components division.
-- * ( this thanks to advice from Donald Becker ).
-- *
-- * Authors
-- *      Daniel Engstr�m                         <daniel.engstrom@riksnett.no>
-- *	Erik Stahlman				<erik@vt.edu>
-- *
-- * History
-- * 96-01-06		 Erik Stahlman   moved definitions here from main .c
-- *                                       file
-- * 96-01-19		 Erik Stahlman	 polished this up some, and added
-- *                                       better error handling
-- * 98-09-25              Daniel Engstr�m adjusted for Etherboot
-- * 98-09-27              Daniel Engstr�m moved some static strings back to the
-- *                                       main .c file
-- * --------------------------------------------------------------------------*/
--#ifndef	_SMC9000_H_
--# define _SMC9000_H_
--
--/* I want some simple types */
--typedef unsigned char			byte;
--typedef unsigned short			word;
--typedef unsigned long int		dword;
--
--/*---------------------------------------------------------------
-- *
-- * A description of the SMC registers is probably in order here,
-- * although for details, the SMC datasheet is invaluable.
-- *
-- * Basically, the chip has 4 banks of registers ( 0 to 3 ), which
-- * are accessed by writing a number into the BANK_SELECT register
-- * ( I also use a SMC_SELECT_BANK macro for this ).
-- *
-- * The banks are configured so that for most purposes, bank 2 is all
-- * that is needed for simple run time tasks.
-- * ----------------------------------------------------------------------*/
--
--/*
-- * Bank Select Register:
-- *
-- *		yyyy yyyy 0000 00xx
-- *		xx		= bank number
-- *		yyyy yyyy	= 0x33, for identification purposes.
-- */
--#define	BANK_SELECT		14
--
--/* BANK 0  */
--
--#define	TCR		0	/* transmit control register */
--#define TCR_ENABLE	0x0001	/* if this is 1, we can transmit */
--#define TCR_FDUPLX	0x0800	/* receive packets sent out */
--#define TCR_STP_SQET	0x1000	/* stop transmitting if Signal quality error */
--#define	TCR_MON_CNS	0x0400	/* monitors the carrier status */
--#define	TCR_PAD_ENABLE	0x0080	/* pads short packets to 64 bytes */
--
--#define	TCR_CLEAR	0	/* do NOTHING */
--/* the normal settings for the TCR register : */
--#define	TCR_NORMAL	(TCR_ENABLE | TCR_PAD_ENABLE)
--
--
--#define EPH_STATUS	2
--#define ES_LINK_OK	0x4000	/* is the link integrity ok ? */
--
--#define	RCR		4
--#define RCR_SOFTRESET	0x8000	/* resets the chip */
--#define	RCR_STRIP_CRC	0x200	/* strips CRC */
--#define RCR_ENABLE	0x100	/* IFF this is set, we can receive packets */
--#define RCR_ALMUL	0x4	/* receive all multicast packets */
--#define	RCR_PROMISC	0x2	/* enable promiscuous mode */
--
--/* the normal settings for the RCR register : */
--#define	RCR_NORMAL	(RCR_STRIP_CRC | RCR_ENABLE)
--#define RCR_CLEAR	0x0		/* set it to a base state */
--
--#define	COUNTER		6
--#define	MIR		8
--#define	MCR		10
--/* 12 is reserved */
--
--/* BANK 1 */
--#define CONFIG			0
--#define CFG_AUI_SELECT		0x100
--#define	BASE			2
--#define	ADDR0			4
--#define	ADDR1			6
--#define	ADDR2			8
--#define	GENERAL			10
--#define	CONTROL			12
--#define	CTL_POWERDOWN		0x2000
--#define	CTL_LE_ENABLE		0x80
--#define	CTL_CR_ENABLE		0x40
--#define	CTL_TE_ENABLE		0x0020
--#define CTL_AUTO_RELEASE	0x0800
--#define	CTL_EPROM_ACCESS	0x0003 /* high if Eprom is being read */
--
--/* BANK 2 */
--#define MMU_CMD		0
--#define MC_BUSY		1	/* only readable bit in the register */
--#define MC_NOP		0
--#define	MC_ALLOC	0x20	/* or with number of 256 byte packets */
--#define	MC_RESET	0x40
--#define	MC_REMOVE	0x60	/* remove the current rx packet */
--#define MC_RELEASE	0x80	/* remove and release the current rx packet */
--#define MC_FREEPKT	0xA0	/* Release packet in PNR register */
--#define MC_ENQUEUE	0xC0	/* Enqueue the packet for transmit */
--
--#define	PNR_ARR		2
--#define FIFO_PORTS	4
--
--#define FP_RXEMPTY	0x8000
--#define FP_TXEMPTY	0x80
--
--#define	POINTER		6
--#define PTR_READ	0x2000
--#define	PTR_RCV		0x8000
--#define	PTR_AUTOINC	0x4000
--#define PTR_AUTO_INC	0x0040
--
--#define	DATA_1		8
--#define	DATA_2		10
--#define	INTERRUPT	12
--
--#define INT_MASK	13
--#define IM_RCV_INT	0x1
--#define	IM_TX_INT	0x2
--#define	IM_TX_EMPTY_INT	0x4
--#define	IM_ALLOC_INT	0x8
--#define	IM_RX_OVRN_INT	0x10
--#define	IM_EPH_INT	0x20
--#define	IM_ERCV_INT	0x40 /* not on SMC9192 */
--
--/* BANK 3 */
--#define	MULTICAST1	0
--#define	MULTICAST2	2
--#define	MULTICAST3	4
--#define	MULTICAST4	6
--#define	MGMT		8
--#define	REVISION	10 /* ( hi: chip id   low: rev # ) */
--
--
--/* this is NOT on SMC9192 */
--#define	ERCV		12
--
--/* Note that 9194 and 9196 have the smame chip id,
-- * the 9196 will have revisions starting at 6 */
--#define CHIP_9190	3
--#define CHIP_9194	4
--#define CHIP_9195	5
--#define CHIP_9196	4
--#define CHIP_91100	7
--#define CHIP_91100FD	8
--
--#define REV_9196	6
--
--/*
-- * Transmit status bits
-- */
--#define TS_SUCCESS	0x0001
--#define TS_LOSTCAR	0x0400
--#define TS_LATCOL	0x0200
--#define TS_16COL	0x0010
--
--/*
-- * Receive status bits
-- */
--#define RS_ALGNERR	0x8000
--#define RS_BADCRC	0x2000
--#define RS_ODDFRAME	0x1000
--#define RS_TOOLONG	0x0800
--#define RS_TOOSHORT	0x0400
--#define RS_MULTICAST	0x0001
--#define RS_ERRORS	(RS_ALGNERR | RS_BADCRC | RS_TOOLONG | RS_TOOSHORT)
--
--
--/*-------------------------------------------------------------------------
-- *  I define some macros to make it easier to do somewhat common
-- * or slightly complicated, repeated tasks.
-- --------------------------------------------------------------------------*/
--
--/* select a register bank, 0 to 3  */
--
--#define SMC_SELECT_BANK(x, y) { _outw( y, x + BANK_SELECT ); }
--
--/* define a small delay for the reset */
--#define SMC_DELAY(x) { inw( x + RCR );\
--			inw( x + RCR );\
--			inw( x + RCR ); }
--
--
--#endif	/* _SMC_9000_H_ */
--
-Index: b/netboot/stdint.h
-===================================================================
---- /dev/null
-+++ b/netboot/stdint.h
-@@ -0,0 +1,18 @@
-+#ifndef STDINT_H
-+#define STDINT_H
-+/* 
-+ * I'm architecture depended. Check me before port GRUB
-+ */
-+typedef unsigned           size_t;
-+
-+typedef unsigned char      uint8_t;
-+typedef unsigned short     uint16_t;
-+typedef unsigned long      uint32_t;
-+typedef unsigned long long uint64_t;
-+
-+typedef signed char        int8_t;
-+typedef signed short       int16_t;
-+typedef signed long        int32_t;
-+typedef signed long long   int64_t;
-+
-+#endif /* STDINT_H */
-Index: b/netboot/tftp.h
-===================================================================
---- /dev/null
-+++ b/netboot/tftp.h
-@@ -0,0 +1,82 @@
-+#ifndef	_TFTP_H
-+#define	_TFTP_H
-+
-+#include "if_ether.h"
-+#include "ip.h"
-+#include "udp.h"
-+
-+#ifndef	MAX_TFTP_RETRIES
-+#define MAX_TFTP_RETRIES	20
-+#endif
-+
-+/* These settings have sense only if compiled with -DCONGESTED */
-+/* total retransmission timeout in ticks */
-+#define TFTP_TIMEOUT		(30*TICKS_PER_SEC)
-+/* packet retransmission timeout in ticks */
-+#define TFTP_REXMT		(3*TICKS_PER_SEC)
-+
-+#define TFTP_PORT	69
-+#define	TFTP_DEFAULTSIZE_PACKET	512
-+#define	TFTP_MAX_PACKET		1432 /* 512 */
-+
-+#define TFTP_RRQ	1
-+#define TFTP_WRQ	2
-+#define TFTP_DATA	3
-+#define TFTP_ACK	4
-+#define TFTP_ERROR	5
-+#define TFTP_OACK	6
-+
-+#define TFTP_CODE_EOF	1
-+#define TFTP_CODE_MORE	2
-+#define TFTP_CODE_ERROR	3
-+#define TFTP_CODE_BOOT	4
-+#define TFTP_CODE_CFG	5
-+
-+struct tftp_t {
-+	struct iphdr ip;
-+	struct udphdr udp;
-+	uint16_t opcode;
-+	union {
-+		uint8_t rrq[TFTP_DEFAULTSIZE_PACKET];
-+		struct {
-+			uint16_t block;
-+			uint8_t  download[TFTP_MAX_PACKET];
-+		} data;
-+		struct {
-+			uint16_t block;
-+		} ack;
-+		struct {
-+			uint16_t errcode;
-+			uint8_t  errmsg[TFTP_DEFAULTSIZE_PACKET];
-+		} err;
-+		struct {
-+			uint8_t  data[TFTP_DEFAULTSIZE_PACKET+2];
-+		} oack;
-+	} u;
-+};
-+
-+/* define a smaller tftp packet solely for making requests to conserve stack
-+   512 bytes should be enough */
-+struct tftpreq_t {
-+	struct iphdr ip;
-+	struct udphdr udp;
-+	uint16_t opcode;
-+	union {
-+		uint8_t rrq[512];
-+		struct {
-+			uint16_t block;
-+		} ack;
-+		struct {
-+			uint16_t errcode;
-+			uint8_t  errmsg[512-2];
-+		} err;
-+	} u;
-+};
-+
-+#define TFTP_MIN_PACKET	(sizeof(struct iphdr) + sizeof(struct udphdr) + 4)
-+
-+typedef int (*read_actor_t)(unsigned char *, unsigned int, unsigned int, int);
-+
-+int tftp_file_read(const char *name, read_actor_t);
-+
-+#endif	/* _TFTP_H */
-Index: b/netboot/tg3.c
-===================================================================
---- /dev/null
-+++ b/netboot/tg3.c
-@@ -0,0 +1,3322 @@
-+/* $Id: grub-0.95-diskless-patch-2.patch,v 1.1.1.1 2005/06/14 08:18:50 wesolows Exp $
-+ * tg3.c: Broadcom Tigon3 ethernet driver.
-+ *
-+ * Copyright (C) 2001, 2002 David S. Miller (davem@redhat.com)
-+ * Copyright (C) 2001, 2002 Jeff Garzik (jgarzik@mandrakesoft.com)
-+ * Copyright (C) 2003 Eric Biederman (ebiederman@lnxi.com)  [etherboot port]
-+ */
-+
-+/* 11-13-2003	timlegge	Fix Issue with NetGear GA302T 
-+ * 11-18-2003   ebiederm        Generalize NetGear Fix to what the code was supposed to be.
-+ */
-+
-+#include "etherboot.h"
-+#include "nic.h"
-+#include "pci.h"
-+#include "timer.h"
-+/*#include "string.h"*/
-+#include "tg3.h"
-+
-+#define SUPPORT_COPPER_PHY  1
-+#define SUPPORT_FIBER_PHY   1
-+#define SUPPORT_LINK_REPORT 1
-+#define SUPPORT_PARTNO_STR  1
-+#define SUPPORT_PHY_STR     1
-+
-+struct tg3 tg3;
-+
-+/* Dummy defines for error handling */
-+#define EBUSY  1
-+#define ENODEV 2
-+#define EINVAL 3
-+#define ENOMEM 4
-+
-+
-+/* These numbers seem to be hard coded in the NIC firmware somehow.
-+ * You can't change the ring sizes, but you can change where you place
-+ * them in the NIC onboard memory.
-+ */
-+#define TG3_RX_RING_SIZE		512
-+#define TG3_DEF_RX_RING_PENDING		20	/* RX_RING_PENDING seems to be o.k. at 20 and 200 */
-+#define TG3_RX_RCB_RING_SIZE	1024
-+
-+/*	(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ? \
-+	 512 : 1024) */
-+ #define TG3_TX_RING_SIZE		512
-+#define TG3_DEF_TX_RING_PENDING		(TG3_TX_RING_SIZE - 1)
-+
-+#define TG3_RX_RING_BYTES	(sizeof(struct tg3_rx_buffer_desc) * TG3_RX_RING_SIZE)
-+#define TG3_RX_RCB_RING_BYTES	(sizeof(struct tg3_rx_buffer_desc) * TG3_RX_RCB_RING_SIZE)
-+
-+#define TG3_TX_RING_BYTES	(sizeof(struct tg3_tx_buffer_desc) * TG3_TX_RING_SIZE)
-+#define NEXT_TX(N)		(((N) + 1) & (TG3_TX_RING_SIZE - 1))
-+#define PREV_TX(N)		(((N) - 1) & (TG3_TX_RING_SIZE - 1))
-+
-+#define RX_PKT_BUF_SZ		(1536 + 2 + 64)
-+
-+
-+static struct bss {
-+	struct tg3_rx_buffer_desc rx_std[TG3_RX_RING_SIZE];
-+	struct tg3_rx_buffer_desc rx_rcb[TG3_RX_RCB_RING_SIZE];
-+	struct tg3_tx_buffer_desc tx_ring[TG3_TX_RING_SIZE];
-+	struct tg3_hw_status      hw_status;
-+	struct tg3_hw_stats       hw_stats;
-+	unsigned char             rx_bufs[TG3_DEF_RX_RING_PENDING][RX_PKT_BUF_SZ];
-+} tg3_bss;
-+
-+/**
-+ * pci_save_state - save the PCI configuration space of a device before suspending
-+ * @dev: - PCI device that we're dealing with
-+ * @buffer: - buffer to hold config space context
-+ *
-+ * @buffer must be large enough to hold the entire PCI 2.2 config space 
-+ * (>= 64 bytes).
-+ */
-+static int pci_save_state(struct pci_device *dev, uint32_t *buffer)
-+{
-+	int i;
-+	for (i = 0; i < 16; i++)
-+		pci_read_config_dword(dev, i * 4,&buffer[i]);
-+	return 0;
-+}
-+
-+/** 
-+ * pci_restore_state - Restore the saved state of a PCI device
-+ * @dev: - PCI device that we're dealing with
-+ * @buffer: - saved PCI config space
-+ *
-+ */
-+static int pci_restore_state(struct pci_device *dev, uint32_t *buffer)
-+{
-+	int i;
-+
-+	for (i = 0; i < 16; i++)
-+		pci_write_config_dword(dev,i * 4, buffer[i]);
-+	return 0;
-+}
-+
-+static void tg3_write_indirect_reg32(uint32_t off, uint32_t val)
-+{
-+	pci_write_config_dword(tg3.pdev, TG3PCI_REG_BASE_ADDR, off);
-+	pci_write_config_dword(tg3.pdev, TG3PCI_REG_DATA, val);
-+}
-+
-+#define tw32(reg,val)		tg3_write_indirect_reg32((reg),(val))
-+#define tw32_mailbox(reg, val)	writel(((val) & 0xffffffff), tg3.regs + (reg))
-+#define tw16(reg,val)		writew(((val) & 0xffff), tg3.regs + (reg))
-+#define tw8(reg,val)		writeb(((val) & 0xff), tg3.regs + (reg))
-+#define tr32(reg)		readl(tg3.regs + (reg))
-+#define tr16(reg)		readw(tg3.regs + (reg))
-+#define tr8(reg)		readb(tg3.regs + (reg))
-+
-+static void tw32_carefully(uint32_t reg, uint32_t val)
-+{
-+	tw32(reg, val);
-+	tr32(reg);
-+	udelay(100);
-+}
-+
-+static void tw32_mailbox2(uint32_t reg, uint32_t val)
-+{
-+	tw32_mailbox(reg, val);
-+	tr32(reg);
-+}
-+
-+static void tg3_write_mem(uint32_t off, uint32_t val)
-+{
-+	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-+	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_DATA, val);
-+
-+	/* Always leave this as zero. */
-+	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+}
-+
-+static void tg3_read_mem(uint32_t off, uint32_t *val)
-+{
-+	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, off);
-+	pci_read_config_dword(tg3.pdev, TG3PCI_MEM_WIN_DATA, val);
-+
-+	/* Always leave this as zero. */
-+	pci_write_config_dword(tg3.pdev, TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+}
-+
-+static void tg3_disable_ints(struct tg3 *tp)
-+{
-+	tw32(TG3PCI_MISC_HOST_CTRL,
-+	     (tp->misc_host_ctrl | MISC_HOST_CTRL_MASK_PCI_INT));
-+	tw32_mailbox2(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0x00000001);
-+}
-+
-+static void tg3_switch_clocks(struct tg3 *tp)
-+{
-+	uint32_t orig_clock_ctrl, clock_ctrl;
-+
-+	clock_ctrl = tr32(TG3PCI_CLOCK_CTRL);
-+
-+	orig_clock_ctrl = clock_ctrl;
-+	clock_ctrl &= (CLOCK_CTRL_FORCE_CLKRUN | CLOCK_CTRL_CLKRUN_OENABLE | 0x1f);
-+	tp->pci_clock_ctrl = clock_ctrl;
-+	
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) &&
-+		(orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE)!=0) {
-+		tw32_carefully(TG3PCI_CLOCK_CTRL, 
-+			clock_ctrl | (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK));
-+		tw32_carefully(TG3PCI_CLOCK_CTRL, 
-+			clock_ctrl | (CLOCK_CTRL_ALTCLK));
-+	}
-+	tw32_carefully(TG3PCI_CLOCK_CTRL, clock_ctrl);
-+}
-+
-+#define PHY_BUSY_LOOPS	5000
-+
-+static int tg3_readphy(struct tg3 *tp, int reg, uint32_t *val)
-+{
-+	uint32_t frame_val;
-+	int loops, ret;
-+
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode & ~MAC_MI_MODE_AUTO_POLL);
-+
-+	*val = 0xffffffff;
-+
-+	frame_val  = ((PHY_ADDR << MI_COM_PHY_ADDR_SHIFT) &
-+		      MI_COM_PHY_ADDR_MASK);
-+	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
-+		      MI_COM_REG_ADDR_MASK);
-+	frame_val |= (MI_COM_CMD_READ | MI_COM_START);
-+	
-+	tw32_carefully(MAC_MI_COM, frame_val);
-+
-+	loops = PHY_BUSY_LOOPS;
-+	while (loops-- > 0) {
-+		udelay(10);
-+		frame_val = tr32(MAC_MI_COM);
-+
-+		if ((frame_val & MI_COM_BUSY) == 0) {
-+			udelay(5);
-+			frame_val = tr32(MAC_MI_COM);
-+			break;
-+		}
-+	}
-+
-+	ret = -EBUSY;
-+	if (loops > 0) {
-+		*val = frame_val & MI_COM_DATA_MASK;
-+		ret = 0;
-+	}
-+
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
-+
-+	return ret;
-+}
-+
-+static int tg3_writephy(struct tg3 *tp, int reg, uint32_t val)
-+{
-+	uint32_t frame_val;
-+	int loops, ret;
-+
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode & ~MAC_MI_MODE_AUTO_POLL);
-+
-+	frame_val  = ((PHY_ADDR << MI_COM_PHY_ADDR_SHIFT) &
-+		      MI_COM_PHY_ADDR_MASK);
-+	frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
-+		      MI_COM_REG_ADDR_MASK);
-+	frame_val |= (val & MI_COM_DATA_MASK);
-+	frame_val |= (MI_COM_CMD_WRITE | MI_COM_START);
-+	
-+	tw32_carefully(MAC_MI_COM, frame_val);
-+
-+	loops = PHY_BUSY_LOOPS;
-+	while (loops-- > 0) {
-+		udelay(10);
-+		frame_val = tr32(MAC_MI_COM);
-+		if ((frame_val & MI_COM_BUSY) == 0) {
-+			udelay(5);
-+			frame_val = tr32(MAC_MI_COM);
-+			break;
-+		}
-+	}
-+
-+	ret = -EBUSY;
-+	if (loops > 0)
-+		ret = 0;
-+
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
-+
-+	return ret;
-+}
-+
-+static int tg3_writedsp(struct tg3 *tp, uint16_t addr, uint16_t val)
-+{
-+	int err;
-+	err  = tg3_writephy(tp, MII_TG3_DSP_ADDRESS, addr);
-+	err |= tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
-+	return err;
-+}
-+
-+
-+static void tg3_phy_set_wirespeed(struct tg3 *tp)
-+{
-+	uint32_t val;
-+
-+	if (tp->tg3_flags2 & TG3_FLG2_NO_ETH_WIRE_SPEED)
-+		return;
-+
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x7007);
-+	tg3_readphy(tp, MII_TG3_AUX_CTRL, &val);
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, (val | (1 << 15) | (1 << 4)));
-+}
-+
-+static int tg3_bmcr_reset(struct tg3 *tp)
-+{
-+	uint32_t phy_control;
-+	int limit, err;
-+
-+	/* OK, reset it, and poll the BMCR_RESET bit until it
-+	 * clears or we time out.
-+	 */
-+	phy_control = BMCR_RESET;
-+	err = tg3_writephy(tp, MII_BMCR, phy_control);
-+	if (err != 0)
-+		return -EBUSY;
-+
-+	limit = 5000;
-+	while (limit--) {
-+		err = tg3_readphy(tp, MII_BMCR, &phy_control);
-+		if (err != 0)
-+			return -EBUSY;
-+
-+		if ((phy_control & BMCR_RESET) == 0) {
-+			udelay(40);
-+			break;
-+		}
-+		udelay(10);
-+	}
-+	if (limit <= 0)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static int tg3_wait_macro_done(struct tg3 *tp)
-+{
-+	int limit = 100;
-+
-+	while (limit--) {
-+		uint32_t tmp32;
-+
-+		tg3_readphy(tp, 0x16, &tmp32);
-+		if ((tmp32 & 0x1000) == 0)
-+			break;
-+	}
-+	if (limit <= 0)
-+		return -EBUSY;
-+
-+	return 0;
-+}
-+
-+static int tg3_phy_write_and_check_testpat(struct tg3 *tp, int *resetp)
-+{
-+	static const uint32_t test_pat[4][6] = {
-+	{ 0x00005555, 0x00000005, 0x00002aaa, 0x0000000a, 0x00003456, 0x00000003 },
-+	{ 0x00002aaa, 0x0000000a, 0x00003333, 0x00000003, 0x0000789a, 0x00000005 },
-+	{ 0x00005a5a, 0x00000005, 0x00002a6a, 0x0000000a, 0x00001bcd, 0x00000003 },
-+	{ 0x00002a5a, 0x0000000a, 0x000033c3, 0x00000003, 0x00002ef1, 0x00000005 }
-+	};
-+	int chan;
-+
-+	for (chan = 0; chan < 4; chan++) {
-+		int i;
-+
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
-+			(chan * 0x2000) | 0x0200);
-+		tg3_writephy(tp, 0x16, 0x0002);
-+
-+		for (i = 0; i < 6; i++)
-+			tg3_writephy(tp, MII_TG3_DSP_RW_PORT,
-+				test_pat[chan][i]);
-+
-+		tg3_writephy(tp, 0x16, 0x0202);
-+		if (tg3_wait_macro_done(tp)) {
-+			*resetp = 1;
-+			return -EBUSY;
-+		}
-+
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
-+			     (chan * 0x2000) | 0x0200);
-+		tg3_writephy(tp, 0x16, 0x0082);
-+		if (tg3_wait_macro_done(tp)) {
-+			*resetp = 1;
-+			return -EBUSY;
-+		}
-+
-+		tg3_writephy(tp, 0x16, 0x0802);
-+		if (tg3_wait_macro_done(tp)) {
-+			*resetp = 1;
-+			return -EBUSY;
-+		}
-+
-+		for (i = 0; i < 6; i += 2) {
-+			uint32_t low, high;
-+
-+			tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &low);
-+			tg3_readphy(tp, MII_TG3_DSP_RW_PORT, &high);
-+			if (tg3_wait_macro_done(tp)) {
-+				*resetp = 1;
-+				return -EBUSY;
-+			}
-+			low &= 0x7fff;
-+			high &= 0x000f;
-+			if (low != test_pat[chan][i] ||
-+			    high != test_pat[chan][i+1]) {
-+				tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x000b);
-+				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x4001);
-+				tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x4005);
-+
-+				return -EBUSY;
-+			}
-+		}
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_phy_reset_chanpat(struct tg3 *tp)
-+{
-+	int chan;
-+
-+	for (chan = 0; chan < 4; chan++) {
-+		int i;
-+
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS,
-+			     (chan * 0x2000) | 0x0200);
-+		tg3_writephy(tp, 0x16, 0x0002);
-+		for (i = 0; i < 6; i++)
-+			tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x000);
-+		tg3_writephy(tp, 0x16, 0x0202);
-+		if (tg3_wait_macro_done(tp))
-+			return -EBUSY;
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_phy_reset_5703_4_5(struct tg3 *tp)
-+{
-+	uint32_t reg32, phy9_orig;
-+	int retries, do_phy_reset, err;
-+
-+	retries = 10;
-+	do_phy_reset = 1;
-+	do {
-+		if (do_phy_reset) {
-+			err = tg3_bmcr_reset(tp);
-+			if (err)
-+				return err;
-+			do_phy_reset = 0;
-+		}
-+		
-+		/* Disable transmitter and interrupt.  */
-+		tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
-+		reg32 |= 0x3000;
-+		tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
-+
-+		/* Set full-duplex, 1000 mbps.  */
-+		tg3_writephy(tp, MII_BMCR,
-+			BMCR_FULLDPLX | TG3_BMCR_SPEED1000);
-+
-+		/* Set to master mode.  */
-+		tg3_readphy(tp, MII_TG3_CTRL, &phy9_orig);
-+		tg3_writephy(tp, MII_TG3_CTRL,
-+			(MII_TG3_CTRL_AS_MASTER |
-+				MII_TG3_CTRL_ENABLE_AS_MASTER));
-+
-+		/* Enable SM_DSP_CLOCK and 6dB.  */
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-+
-+		/* Block the PHY control access.  */
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
-+		tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0800);
-+
-+		err = tg3_phy_write_and_check_testpat(tp, &do_phy_reset);
-+		if (!err)
-+			break;
-+	} while (--retries);
-+
-+	err = tg3_phy_reset_chanpat(tp);
-+	if (err)
-+		return err;
-+
-+	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8005);
-+	tg3_writephy(tp, MII_TG3_DSP_RW_PORT, 0x0000);
-+
-+	tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x8200);
-+	tg3_writephy(tp, 0x16, 0x0000);
-+
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0400);
-+
-+	tg3_writephy(tp, MII_TG3_CTRL, phy9_orig);
-+
-+	tg3_readphy(tp, MII_TG3_EXT_CTRL, &reg32);
-+	reg32 &= ~0x3000;
-+	tg3_writephy(tp, MII_TG3_EXT_CTRL, reg32);
-+
-+	return err;
-+}
-+
-+/* This will reset the tigon3 PHY if there is no valid
-+ * link.
-+ */
-+static int tg3_phy_reset(struct tg3 *tp)
-+{
-+	uint32_t phy_status;
-+	int err;
-+
-+	err  = tg3_readphy(tp, MII_BMSR, &phy_status);
-+	err |= tg3_readphy(tp, MII_BMSR, &phy_status);
-+	if (err != 0)
-+		return -EBUSY;
-+
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
-+		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-+		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) {
-+		err = tg3_phy_reset_5703_4_5(tp);
-+		if (err)
-+			return err;
-+		goto out;
-+	}
-+	err = tg3_bmcr_reset(tp);
-+	if (err)
-+		return err;
-+ out:
-+	tg3_phy_set_wirespeed(tp);
-+	return 0;
-+}
-+
-+static void tg3_set_power_state_0(struct tg3 *tp)
-+{
-+	uint16_t power_control;
-+	int pm = tp->pm_cap;
-+
-+	/* Make sure register accesses (indirect or otherwise)
-+	 * will function correctly.
-+	 */
-+	pci_write_config_dword(tp->pdev,  TG3PCI_MISC_HOST_CTRL, tp->misc_host_ctrl);
-+
-+	pci_read_config_word(tp->pdev, pm + PCI_PM_CTRL, &power_control);
-+
-+	power_control |= PCI_PM_CTRL_PME_STATUS;
-+	power_control &= ~(PCI_PM_CTRL_STATE_MASK);
-+	power_control |= 0;
-+	pci_write_config_word(tp->pdev, pm + PCI_PM_CTRL, power_control);
-+
-+	tw32_carefully(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
-+
-+	return;
-+}
-+
-+
-+#if SUPPORT_LINK_REPORT
-+static void tg3_link_report(struct tg3 *tp)
-+{
-+	if (!tp->carrier_ok) {
-+		printf("Link is down.\n");
-+	} else {
-+		printf("Link is up at %d Mbps, %s duplex. %s %s %s\n",
-+			(tp->link_config.active_speed == SPEED_1000 ?
-+			       1000 :
-+			(tp->link_config.active_speed == SPEED_100 ?
-+				100 : 10)),
-+			(tp->link_config.active_duplex == DUPLEX_FULL ?  
-+				"full" : "half"),
-+			(tp->tg3_flags & TG3_FLAG_TX_PAUSE) ? "TX" : "",
-+			(tp->tg3_flags & TG3_FLAG_RX_PAUSE) ? "RX" : "",
-+			(tp->tg3_flags & (TG3_FLAG_TX_PAUSE |TG3_FLAG_RX_PAUSE)) ? "flow control" : "");
-+	}
-+}
-+#else
-+#define tg3_link_report(tp)
-+#endif
-+
-+static void tg3_setup_flow_control(struct tg3 *tp, uint32_t local_adv, uint32_t remote_adv)
-+{
-+	uint32_t new_tg3_flags = 0;
-+
-+	if (local_adv & ADVERTISE_PAUSE_CAP) {
-+		if (local_adv & ADVERTISE_PAUSE_ASYM) {
-+			if (remote_adv & LPA_PAUSE_CAP)
-+				new_tg3_flags |=
-+					(TG3_FLAG_RX_PAUSE |
-+					 TG3_FLAG_TX_PAUSE);
-+			else if (remote_adv & LPA_PAUSE_ASYM)
-+				new_tg3_flags |=
-+					(TG3_FLAG_RX_PAUSE);
-+		} else {
-+			if (remote_adv & LPA_PAUSE_CAP)
-+				new_tg3_flags |=
-+					(TG3_FLAG_RX_PAUSE |
-+					 TG3_FLAG_TX_PAUSE);
-+		}
-+	} else if (local_adv & ADVERTISE_PAUSE_ASYM) {
-+		if ((remote_adv & LPA_PAUSE_CAP) &&
-+		    (remote_adv & LPA_PAUSE_ASYM))
-+			new_tg3_flags |= TG3_FLAG_TX_PAUSE;
-+	}
-+
-+	tp->tg3_flags &= ~(TG3_FLAG_RX_PAUSE | TG3_FLAG_TX_PAUSE);
-+	tp->tg3_flags |= new_tg3_flags;
-+
-+	if (new_tg3_flags & TG3_FLAG_RX_PAUSE)
-+		tp->rx_mode |= RX_MODE_FLOW_CTRL_ENABLE;
-+	else
-+		tp->rx_mode &= ~RX_MODE_FLOW_CTRL_ENABLE;
-+
-+	if (new_tg3_flags & TG3_FLAG_TX_PAUSE)
-+		tp->tx_mode |= TX_MODE_FLOW_CTRL_ENABLE;
-+	else
-+		tp->tx_mode &= ~TX_MODE_FLOW_CTRL_ENABLE;
-+}
-+
-+#if SUPPORT_COPPER_PHY
-+static void tg3_aux_stat_to_speed_duplex(
-+	struct tg3 *tp __unused, uint32_t val, uint8_t *speed, uint8_t *duplex)
-+{
-+	static const uint8_t map[] = {
-+		[0] = (SPEED_INVALID << 2) | DUPLEX_INVALID,
-+		[MII_TG3_AUX_STAT_10HALF >> 8]   = (SPEED_10 << 2) | DUPLEX_HALF,
-+		[MII_TG3_AUX_STAT_10FULL >> 8]   = (SPEED_10 << 2) | DUPLEX_FULL,
-+		[MII_TG3_AUX_STAT_100HALF >> 8]  = (SPEED_100 << 2) | DUPLEX_HALF,
-+		[MII_TG3_AUX_STAT_100_4 >> 8] = (SPEED_INVALID << 2) | DUPLEX_INVALID,
-+		[MII_TG3_AUX_STAT_100FULL >> 8]  = (SPEED_100 << 2) | DUPLEX_FULL,
-+		[MII_TG3_AUX_STAT_1000HALF >> 8] = (SPEED_1000 << 2) | DUPLEX_HALF,
-+		[MII_TG3_AUX_STAT_1000FULL >> 8] = (SPEED_1000 << 2) | DUPLEX_FULL,
-+	};
-+	uint8_t result;
-+	result = map[(val & MII_TG3_AUX_STAT_SPDMASK) >> 8];
-+	*speed = result >> 2;
-+	*duplex = result & 3;
-+}
-+
-+static int tg3_phy_copper_begin(struct tg3 *tp)
-+{
-+	uint32_t new_adv;
-+
-+	tp->link_config.advertising =
-+		(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-+			ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
-+			ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
-+			ADVERTISED_Autoneg | ADVERTISED_MII);
-+	
-+	if (tp->tg3_flags & TG3_FLAG_10_100_ONLY) {
-+		tp->link_config.advertising &=
-+			~(ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full);
-+	}
-+	
-+	new_adv = (ADVERTISE_CSMA | ADVERTISE_PAUSE_CAP);
-+	if (tp->link_config.advertising & ADVERTISED_10baseT_Half) {
-+		new_adv |= ADVERTISE_10HALF;
-+	}
-+	if (tp->link_config.advertising & ADVERTISED_10baseT_Full) {
-+		new_adv |= ADVERTISE_10FULL;
-+	}
-+	if (tp->link_config.advertising & ADVERTISED_100baseT_Half) {
-+		new_adv |= ADVERTISE_100HALF;
-+	}
-+	if (tp->link_config.advertising & ADVERTISED_100baseT_Full) {
-+		new_adv |= ADVERTISE_100FULL;
-+	}
-+	tg3_writephy(tp, MII_ADVERTISE, new_adv);
-+	
-+	if (tp->link_config.advertising &
-+		(ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full)) {
-+		new_adv = 0;
-+		if (tp->link_config.advertising & ADVERTISED_1000baseT_Half) {
-+			new_adv |= MII_TG3_CTRL_ADV_1000_HALF;
-+		}
-+		if (tp->link_config.advertising & ADVERTISED_1000baseT_Full) {
-+			new_adv |= MII_TG3_CTRL_ADV_1000_FULL;
-+		}
-+		if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY) &&
-+			(tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+				tp->pci_chip_rev_id == CHIPREV_ID_5701_B0)) {
-+			new_adv |= (MII_TG3_CTRL_AS_MASTER |
-+				MII_TG3_CTRL_ENABLE_AS_MASTER);
-+		}
-+		tg3_writephy(tp, MII_TG3_CTRL, new_adv);
-+	} else {
-+		tg3_writephy(tp, MII_TG3_CTRL, 0);
-+	}
-+
-+	tg3_writephy(tp, MII_BMCR, BMCR_ANENABLE | BMCR_ANRESTART);
-+
-+	return 0;
-+}
-+
-+static int tg3_init_5401phy_dsp(struct tg3 *tp)
-+{
-+	int err;
-+
-+	/* Turn off tap power management. */
-+	err  = tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c20);
-+	
-+	err |= tg3_writedsp(tp, 0x0012, 0x1804);
-+	err |= tg3_writedsp(tp, 0x0013, 0x1204);
-+	err |= tg3_writedsp(tp, 0x8006, 0x0132);
-+	err |= tg3_writedsp(tp, 0x8006, 0x0232);
-+	err |= tg3_writedsp(tp, 0x201f, 0x0a20);
-+
-+	udelay(40);
-+
-+	return err;
-+}
-+
-+static int tg3_setup_copper_phy(struct tg3 *tp)
-+{
-+	int current_link_up;
-+	uint32_t bmsr, dummy;
-+	int i, err;
-+
-+	tw32_carefully(MAC_STATUS,
-+		(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
-+
-+	tp->mi_mode = MAC_MI_MODE_BASE;
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
-+
-+	tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x02);
-+
-+	/* Some third-party PHYs need to be reset on link going
-+	 * down.
-+	 */
-+	if (	(	(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
-+			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-+			(tp->pci_chip_rev_id == CHIPREV_ID_5705_A0)) &&
-+		(tp->carrier_ok)) {
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		if (!(bmsr & BMSR_LSTATUS))
-+			tg3_phy_reset(tp);
-+	}
-+
-+	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401) {
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+		tg3_readphy(tp, MII_BMSR, &bmsr);
-+
-+		if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE))
-+			bmsr = 0;
-+
-+		if (!(bmsr & BMSR_LSTATUS)) {
-+			err = tg3_init_5401phy_dsp(tp);
-+			if (err)
-+				return err;
-+
-+			tg3_readphy(tp, MII_BMSR, &bmsr);
-+			for (i = 0; i < 1000; i++) {
-+				udelay(10);
-+				tg3_readphy(tp, MII_BMSR, &bmsr);
-+				if (bmsr & BMSR_LSTATUS) {
-+					udelay(40);
-+					break;
-+				}
-+			}
-+
-+			if ((tp->phy_id & PHY_ID_REV_MASK) == PHY_REV_BCM5401_B0 &&
-+			    !(bmsr & BMSR_LSTATUS) &&
-+			    tp->link_config.active_speed == SPEED_1000) {
-+				err = tg3_phy_reset(tp);
-+				if (!err)
-+					err = tg3_init_5401phy_dsp(tp);
-+				if (err)
-+					return err;
-+			}
-+		}
-+	} else if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+		   tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) {
-+		/* 5701 {A0,B0} CRC bug workaround */
-+		tg3_writephy(tp, 0x15, 0x0a75);
-+		tg3_writephy(tp, 0x1c, 0x8c68);
-+		tg3_writephy(tp, 0x1c, 0x8d68);
-+		tg3_writephy(tp, 0x1c, 0x8c68);
-+	}
-+
-+	/* Clear pending interrupts... */
-+	tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
-+	tg3_readphy(tp, MII_TG3_ISTAT, &dummy);
-+
-+	tg3_writephy(tp, MII_TG3_IMASK, ~0);
-+
-+	if (tp->led_mode == led_mode_three_link)
-+		tg3_writephy(tp, MII_TG3_EXT_CTRL,
-+			     MII_TG3_EXT_CTRL_LNK3_LED_MODE);
-+	else
-+		tg3_writephy(tp, MII_TG3_EXT_CTRL, 0);
-+
-+	current_link_up = 0;
-+
-+	tg3_readphy(tp, MII_BMSR, &bmsr);
-+	tg3_readphy(tp, MII_BMSR, &bmsr);
-+
-+	if (bmsr & BMSR_LSTATUS) {
-+		uint32_t aux_stat, bmcr;
-+
-+		tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
-+		for (i = 0; i < 2000; i++) {
-+			udelay(10);
-+			tg3_readphy(tp, MII_TG3_AUX_STAT, &aux_stat);
-+			if (aux_stat)
-+				break;
-+		}
-+
-+		tg3_aux_stat_to_speed_duplex(tp, aux_stat,
-+			&tp->link_config.active_speed,
-+			&tp->link_config.active_duplex);
-+		tg3_readphy(tp, MII_BMCR, &bmcr);
-+		tg3_readphy(tp, MII_BMCR, &bmcr);
-+		if (bmcr & BMCR_ANENABLE) {
-+			uint32_t gig_ctrl;
-+			
-+			current_link_up = 1;
-+			
-+			/* Force autoneg restart if we are exiting
-+			 * low power mode.
-+			 */
-+			tg3_readphy(tp, MII_TG3_CTRL, &gig_ctrl);
-+			if (!(gig_ctrl & (MII_TG3_CTRL_ADV_1000_HALF |
-+				      MII_TG3_CTRL_ADV_1000_FULL))) {
-+				current_link_up = 0;
-+			}
-+		} else {
-+			current_link_up = 0;
-+		}
-+	}
-+
-+	if (current_link_up == 1 &&
-+		(tp->link_config.active_duplex == DUPLEX_FULL)) {
-+		uint32_t local_adv, remote_adv;
-+
-+		tg3_readphy(tp, MII_ADVERTISE, &local_adv);
-+		local_adv &= (ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
-+
-+		tg3_readphy(tp, MII_LPA, &remote_adv);
-+		remote_adv &= (LPA_PAUSE_CAP | LPA_PAUSE_ASYM);
-+
-+		/* If we are not advertising full pause capability,
-+		 * something is wrong.  Bring the link down and reconfigure.
-+		 */
-+		if (local_adv != ADVERTISE_PAUSE_CAP) {
-+			current_link_up = 0;
-+		} else {
-+			tg3_setup_flow_control(tp, local_adv, remote_adv);
-+		}
-+	}
-+
-+	if (current_link_up == 0) {
-+		uint32_t tmp;
-+
-+		tg3_phy_copper_begin(tp);
-+
-+		tg3_readphy(tp, MII_BMSR, &tmp);
-+		tg3_readphy(tp, MII_BMSR, &tmp);
-+		if (tmp & BMSR_LSTATUS)
-+			current_link_up = 1;
-+	}
-+
-+	tp->mac_mode &= ~MAC_MODE_PORT_MODE_MASK;
-+	if (current_link_up == 1) {
-+		if (tp->link_config.active_speed == SPEED_100 ||
-+		    tp->link_config.active_speed == SPEED_10)
-+			tp->mac_mode |= MAC_MODE_PORT_MODE_MII;
-+		else
-+			tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
-+	} else
-+		tp->mac_mode |= MAC_MODE_PORT_MODE_GMII;
-+
-+	tp->mac_mode &= ~MAC_MODE_HALF_DUPLEX;
-+	if (tp->link_config.active_duplex == DUPLEX_HALF)
-+		tp->mac_mode |= MAC_MODE_HALF_DUPLEX;
-+
-+	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) {
-+		if ((tp->led_mode == led_mode_link10) ||
-+		    (current_link_up == 1 &&
-+		     tp->link_config.active_speed == SPEED_10))
-+			tp->mac_mode |= MAC_MODE_LINK_POLARITY;
-+	} else {
-+		if (current_link_up == 1)
-+			tp->mac_mode |= MAC_MODE_LINK_POLARITY;
-+		tw32(MAC_LED_CTRL, LED_CTRL_PHY_MODE_1);
-+	}
-+
-+	/* ??? Without this setting Netgear GA302T PHY does not
-+	 * ??? send/receive packets...
-+	 * With this other PHYs cannot bring up the link
-+	 */
-+	if ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5411 &&
-+		tp->pci_chip_rev_id == CHIPREV_ID_5700_ALTIMA) {
-+		tp->mi_mode |= MAC_MI_MODE_AUTO_POLL;
-+		tw32_carefully(MAC_MI_MODE, tp->mi_mode);
-+	}
-+
-+	tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+	/* Link change polled. */
-+	tw32_carefully(MAC_EVENT, 0);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 &&
-+	    current_link_up == 1 &&
-+	    tp->link_config.active_speed == SPEED_1000 &&
-+	    ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ||
-+	     (tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED))) {
-+		udelay(120);
-+		tw32_carefully(MAC_STATUS,
-+			(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
-+		tg3_write_mem(
-+			      NIC_SRAM_FIRMWARE_MBOX,
-+			      NIC_SRAM_FIRMWARE_MBOX_MAGIC2);
-+	}
-+
-+	if (current_link_up != tp->carrier_ok) {
-+		tp->carrier_ok = current_link_up;
-+		tg3_link_report(tp);
-+	}
-+
-+	return 0;
-+}
-+#else
-+#define tg3_setup_copper_phy(TP) (-EINVAL)
-+#endif /* SUPPORT_COPPER_PHY */
-+
-+#if SUPPORT_FIBER_PHY
-+struct tg3_fiber_aneginfo {
-+	int state;
-+#define ANEG_STATE_UNKNOWN		0
-+#define ANEG_STATE_AN_ENABLE		1
-+#define ANEG_STATE_RESTART_INIT		2
-+#define ANEG_STATE_RESTART		3
-+#define ANEG_STATE_DISABLE_LINK_OK	4
-+#define ANEG_STATE_ABILITY_DETECT_INIT	5
-+#define ANEG_STATE_ABILITY_DETECT	6
-+#define ANEG_STATE_ACK_DETECT_INIT	7
-+#define ANEG_STATE_ACK_DETECT		8
-+#define ANEG_STATE_COMPLETE_ACK_INIT	9
-+#define ANEG_STATE_COMPLETE_ACK		10
-+#define ANEG_STATE_IDLE_DETECT_INIT	11
-+#define ANEG_STATE_IDLE_DETECT		12
-+#define ANEG_STATE_LINK_OK		13
-+#define ANEG_STATE_NEXT_PAGE_WAIT_INIT	14
-+#define ANEG_STATE_NEXT_PAGE_WAIT	15
-+
-+	uint32_t flags;
-+#define MR_AN_ENABLE		0x00000001
-+#define MR_RESTART_AN		0x00000002
-+#define MR_AN_COMPLETE		0x00000004
-+#define MR_PAGE_RX		0x00000008
-+#define MR_NP_LOADED		0x00000010
-+#define MR_TOGGLE_TX		0x00000020
-+#define MR_LP_ADV_FULL_DUPLEX	0x00000040
-+#define MR_LP_ADV_HALF_DUPLEX	0x00000080
-+#define MR_LP_ADV_SYM_PAUSE	0x00000100
-+#define MR_LP_ADV_ASYM_PAUSE	0x00000200
-+#define MR_LP_ADV_REMOTE_FAULT1	0x00000400
-+#define MR_LP_ADV_REMOTE_FAULT2	0x00000800
-+#define MR_LP_ADV_NEXT_PAGE	0x00001000
-+#define MR_TOGGLE_RX		0x00002000
-+#define MR_NP_RX		0x00004000
-+
-+#define MR_LINK_OK		0x80000000
-+
-+	unsigned long link_time, cur_time;
-+
-+	uint32_t ability_match_cfg;
-+	int ability_match_count;
-+
-+	char ability_match, idle_match, ack_match;
-+
-+	uint32_t txconfig, rxconfig;
-+#define ANEG_CFG_NP		0x00000080
-+#define ANEG_CFG_ACK		0x00000040
-+#define ANEG_CFG_RF2		0x00000020
-+#define ANEG_CFG_RF1		0x00000010
-+#define ANEG_CFG_PS2		0x00000001
-+#define ANEG_CFG_PS1		0x00008000
-+#define ANEG_CFG_HD		0x00004000
-+#define ANEG_CFG_FD		0x00002000
-+#define ANEG_CFG_INVAL		0x00001f06
-+
-+};
-+#define ANEG_OK		0
-+#define ANEG_DONE	1
-+#define ANEG_TIMER_ENAB	2
-+#define ANEG_FAILED	-1
-+
-+#define ANEG_STATE_SETTLE_TIME	10000
-+
-+static int tg3_fiber_aneg_smachine(struct tg3 *tp,
-+				   struct tg3_fiber_aneginfo *ap)
-+{
-+	unsigned long delta;
-+	uint32_t rx_cfg_reg;
-+	int ret;
-+
-+	if (ap->state == ANEG_STATE_UNKNOWN) {
-+		ap->rxconfig = 0;
-+		ap->link_time = 0;
-+		ap->cur_time = 0;
-+		ap->ability_match_cfg = 0;
-+		ap->ability_match_count = 0;
-+		ap->ability_match = 0;
-+		ap->idle_match = 0;
-+		ap->ack_match = 0;
-+	}
-+	ap->cur_time++;
-+
-+	if (tr32(MAC_STATUS) & MAC_STATUS_RCVD_CFG) {
-+		rx_cfg_reg = tr32(MAC_RX_AUTO_NEG);
-+
-+		if (rx_cfg_reg != ap->ability_match_cfg) {
-+			ap->ability_match_cfg = rx_cfg_reg;
-+			ap->ability_match = 0;
-+			ap->ability_match_count = 0;
-+		} else {
-+			if (++ap->ability_match_count > 1) {
-+				ap->ability_match = 1;
-+				ap->ability_match_cfg = rx_cfg_reg;
-+			}
-+		}
-+		if (rx_cfg_reg & ANEG_CFG_ACK)
-+			ap->ack_match = 1;
-+		else
-+			ap->ack_match = 0;
-+
-+		ap->idle_match = 0;
-+	} else {
-+		ap->idle_match = 1;
-+		ap->ability_match_cfg = 0;
-+		ap->ability_match_count = 0;
-+		ap->ability_match = 0;
-+		ap->ack_match = 0;
-+
-+		rx_cfg_reg = 0;
-+	}
-+
-+	ap->rxconfig = rx_cfg_reg;
-+	ret = ANEG_OK;
-+
-+	switch(ap->state) {
-+	case ANEG_STATE_UNKNOWN:
-+		if (ap->flags & (MR_AN_ENABLE | MR_RESTART_AN))
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+
-+		/* fallthru */
-+	case ANEG_STATE_AN_ENABLE:
-+		ap->flags &= ~(MR_AN_COMPLETE | MR_PAGE_RX);
-+		if (ap->flags & MR_AN_ENABLE) {
-+			ap->link_time = 0;
-+			ap->cur_time = 0;
-+			ap->ability_match_cfg = 0;
-+			ap->ability_match_count = 0;
-+			ap->ability_match = 0;
-+			ap->idle_match = 0;
-+			ap->ack_match = 0;
-+
-+			ap->state = ANEG_STATE_RESTART_INIT;
-+		} else {
-+			ap->state = ANEG_STATE_DISABLE_LINK_OK;
-+		}
-+		break;
-+
-+	case ANEG_STATE_RESTART_INIT:
-+		ap->link_time = ap->cur_time;
-+		ap->flags &= ~(MR_NP_LOADED);
-+		ap->txconfig = 0;
-+		tw32(MAC_TX_AUTO_NEG, 0);
-+		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
-+		tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+		ret = ANEG_TIMER_ENAB;
-+		ap->state = ANEG_STATE_RESTART;
-+
-+		/* fallthru */
-+	case ANEG_STATE_RESTART:
-+		delta = ap->cur_time - ap->link_time;
-+		if (delta > ANEG_STATE_SETTLE_TIME) {
-+			ap->state = ANEG_STATE_ABILITY_DETECT_INIT;
-+		} else {
-+			ret = ANEG_TIMER_ENAB;
-+		}
-+		break;
-+
-+	case ANEG_STATE_DISABLE_LINK_OK:
-+		ret = ANEG_DONE;
-+		break;
-+
-+	case ANEG_STATE_ABILITY_DETECT_INIT:
-+		ap->flags &= ~(MR_TOGGLE_TX);
-+		ap->txconfig = (ANEG_CFG_FD | ANEG_CFG_PS1);
-+		tw32(MAC_TX_AUTO_NEG, ap->txconfig);
-+		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
-+		tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+		ap->state = ANEG_STATE_ABILITY_DETECT;
-+		break;
-+
-+	case ANEG_STATE_ABILITY_DETECT:
-+		if (ap->ability_match != 0 && ap->rxconfig != 0) {
-+			ap->state = ANEG_STATE_ACK_DETECT_INIT;
-+		}
-+		break;
-+
-+	case ANEG_STATE_ACK_DETECT_INIT:
-+		ap->txconfig |= ANEG_CFG_ACK;
-+		tw32(MAC_TX_AUTO_NEG, ap->txconfig);
-+		tp->mac_mode |= MAC_MODE_SEND_CONFIGS;
-+		tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+		ap->state = ANEG_STATE_ACK_DETECT;
-+
-+		/* fallthru */
-+	case ANEG_STATE_ACK_DETECT:
-+		if (ap->ack_match != 0) {
-+			if ((ap->rxconfig & ~ANEG_CFG_ACK) ==
-+			    (ap->ability_match_cfg & ~ANEG_CFG_ACK)) {
-+				ap->state = ANEG_STATE_COMPLETE_ACK_INIT;
-+			} else {
-+				ap->state = ANEG_STATE_AN_ENABLE;
-+			}
-+		} else if (ap->ability_match != 0 &&
-+			   ap->rxconfig == 0) {
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+		}
-+		break;
-+
-+	case ANEG_STATE_COMPLETE_ACK_INIT:
-+		if (ap->rxconfig & ANEG_CFG_INVAL) {
-+			ret = ANEG_FAILED;
-+			break;
-+		}
-+		ap->flags &= ~(MR_LP_ADV_FULL_DUPLEX |
-+			       MR_LP_ADV_HALF_DUPLEX |
-+			       MR_LP_ADV_SYM_PAUSE |
-+			       MR_LP_ADV_ASYM_PAUSE |
-+			       MR_LP_ADV_REMOTE_FAULT1 |
-+			       MR_LP_ADV_REMOTE_FAULT2 |
-+			       MR_LP_ADV_NEXT_PAGE |
-+			       MR_TOGGLE_RX |
-+			       MR_NP_RX);
-+		if (ap->rxconfig & ANEG_CFG_FD)
-+			ap->flags |= MR_LP_ADV_FULL_DUPLEX;
-+		if (ap->rxconfig & ANEG_CFG_HD)
-+			ap->flags |= MR_LP_ADV_HALF_DUPLEX;
-+		if (ap->rxconfig & ANEG_CFG_PS1)
-+			ap->flags |= MR_LP_ADV_SYM_PAUSE;
-+		if (ap->rxconfig & ANEG_CFG_PS2)
-+			ap->flags |= MR_LP_ADV_ASYM_PAUSE;
-+		if (ap->rxconfig & ANEG_CFG_RF1)
-+			ap->flags |= MR_LP_ADV_REMOTE_FAULT1;
-+		if (ap->rxconfig & ANEG_CFG_RF2)
-+			ap->flags |= MR_LP_ADV_REMOTE_FAULT2;
-+		if (ap->rxconfig & ANEG_CFG_NP)
-+			ap->flags |= MR_LP_ADV_NEXT_PAGE;
-+
-+		ap->link_time = ap->cur_time;
-+
-+		ap->flags ^= (MR_TOGGLE_TX);
-+		if (ap->rxconfig & 0x0008)
-+			ap->flags |= MR_TOGGLE_RX;
-+		if (ap->rxconfig & ANEG_CFG_NP)
-+			ap->flags |= MR_NP_RX;
-+		ap->flags |= MR_PAGE_RX;
-+
-+		ap->state = ANEG_STATE_COMPLETE_ACK;
-+		ret = ANEG_TIMER_ENAB;
-+		break;
-+
-+	case ANEG_STATE_COMPLETE_ACK:
-+		if (ap->ability_match != 0 &&
-+		    ap->rxconfig == 0) {
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+			break;
-+		}
-+		delta = ap->cur_time - ap->link_time;
-+		if (delta > ANEG_STATE_SETTLE_TIME) {
-+			if (!(ap->flags & (MR_LP_ADV_NEXT_PAGE))) {
-+				ap->state = ANEG_STATE_IDLE_DETECT_INIT;
-+			} else {
-+				if ((ap->txconfig & ANEG_CFG_NP) == 0 &&
-+				    !(ap->flags & MR_NP_RX)) {
-+					ap->state = ANEG_STATE_IDLE_DETECT_INIT;
-+				} else {
-+					ret = ANEG_FAILED;
-+				}
-+			}
-+		}
-+		break;
-+
-+	case ANEG_STATE_IDLE_DETECT_INIT:
-+		ap->link_time = ap->cur_time;
-+		tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
-+		tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+		ap->state = ANEG_STATE_IDLE_DETECT;
-+		ret = ANEG_TIMER_ENAB;
-+		break;
-+
-+	case ANEG_STATE_IDLE_DETECT:
-+		if (ap->ability_match != 0 &&
-+		    ap->rxconfig == 0) {
-+			ap->state = ANEG_STATE_AN_ENABLE;
-+			break;
-+		}
-+		delta = ap->cur_time - ap->link_time;
-+		if (delta > ANEG_STATE_SETTLE_TIME) {
-+			/* XXX another gem from the Broadcom driver :( */
-+			ap->state = ANEG_STATE_LINK_OK;
-+		}
-+		break;
-+
-+	case ANEG_STATE_LINK_OK:
-+		ap->flags |= (MR_AN_COMPLETE | MR_LINK_OK);
-+		ret = ANEG_DONE;
-+		break;
-+
-+	case ANEG_STATE_NEXT_PAGE_WAIT_INIT:
-+		/* ??? unimplemented */
-+		break;
-+
-+	case ANEG_STATE_NEXT_PAGE_WAIT:
-+		/* ??? unimplemented */
-+		break;
-+
-+	default:
-+		ret = ANEG_FAILED;
-+		break;
-+	};
-+
-+	return ret;
-+}
-+
-+static int tg3_setup_fiber_phy(struct tg3 *tp)
-+{
-+	uint32_t orig_pause_cfg;
-+	uint16_t orig_active_speed;
-+	uint8_t orig_active_duplex;
-+	int current_link_up;
-+	int i;
-+
-+	orig_pause_cfg =
-+		(tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
-+				  TG3_FLAG_TX_PAUSE));
-+	orig_active_speed = tp->link_config.active_speed;
-+	orig_active_duplex = tp->link_config.active_duplex;
-+
-+	tp->mac_mode &= ~(MAC_MODE_PORT_MODE_MASK | MAC_MODE_HALF_DUPLEX);
-+	tp->mac_mode |= MAC_MODE_PORT_MODE_TBI;
-+	tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+	/* Reset when initting first time or we have a link. */
-+	if (!(tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) ||
-+	    (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED)) {
-+		/* Set PLL lock range. */
-+		tg3_writephy(tp, 0x16, 0x8007);
-+
-+		/* SW reset */
-+		tg3_writephy(tp, MII_BMCR, BMCR_RESET);
-+
-+		/* Wait for reset to complete. */
-+		mdelay(5);
-+
-+		/* Config mode; select PMA/Ch 1 regs. */
-+		tg3_writephy(tp, 0x10, 0x8411);
-+
-+		/* Enable auto-lock and comdet, select txclk for tx. */
-+		tg3_writephy(tp, 0x11, 0x0a10);
-+
-+		tg3_writephy(tp, 0x18, 0x00a0);
-+		tg3_writephy(tp, 0x16, 0x41ff);
-+
-+		/* Assert and deassert POR. */
-+		tg3_writephy(tp, 0x13, 0x0400);
-+		udelay(40);
-+		tg3_writephy(tp, 0x13, 0x0000);
-+
-+		tg3_writephy(tp, 0x11, 0x0a50);
-+		udelay(40);
-+		tg3_writephy(tp, 0x11, 0x0a10);
-+
-+		/* Wait for signal to stabilize */
-+		mdelay(150);
-+
-+		/* Deselect the channel register so we can read the PHYID
-+		 * later.
-+		 */
-+		tg3_writephy(tp, 0x10, 0x8011);
-+	}
-+
-+	/* Disable link change interrupt.  */
-+	tw32_carefully(MAC_EVENT, 0);
-+
-+	current_link_up = 0;
-+	if (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) {
-+		if (!(tp->tg3_flags & TG3_FLAG_GOT_SERDES_FLOWCTL)) {
-+			struct tg3_fiber_aneginfo aninfo;
-+			int status = ANEG_FAILED;
-+			unsigned int tick;
-+			uint32_t tmp;
-+
-+			memset(&aninfo, 0, sizeof(aninfo));
-+			aninfo.flags |= (MR_AN_ENABLE);
-+
-+			tw32(MAC_TX_AUTO_NEG, 0);
-+
-+			tmp = tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK;
-+			tw32_carefully(MAC_MODE, tmp | MAC_MODE_PORT_MODE_GMII);
-+
-+			tw32_carefully(MAC_MODE, tp->mac_mode | MAC_MODE_SEND_CONFIGS);
-+
-+			aninfo.state = ANEG_STATE_UNKNOWN;
-+			aninfo.cur_time = 0;
-+			tick = 0;
-+			while (++tick < 195000) {
-+				status = tg3_fiber_aneg_smachine(tp, &aninfo);
-+				if (status == ANEG_DONE ||
-+				    status == ANEG_FAILED)
-+					break;
-+
-+				udelay(1);
-+			}
-+
-+			tp->mac_mode &= ~MAC_MODE_SEND_CONFIGS;
-+			tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+			if (status == ANEG_DONE &&
-+			    (aninfo.flags &
-+			     (MR_AN_COMPLETE | MR_LINK_OK |
-+			      MR_LP_ADV_FULL_DUPLEX))) {
-+				uint32_t local_adv, remote_adv;
-+
-+				local_adv = ADVERTISE_PAUSE_CAP;
-+				remote_adv = 0;
-+				if (aninfo.flags & MR_LP_ADV_SYM_PAUSE)
-+					remote_adv |= LPA_PAUSE_CAP;
-+				if (aninfo.flags & MR_LP_ADV_ASYM_PAUSE)
-+					remote_adv |= LPA_PAUSE_ASYM;
-+
-+				tg3_setup_flow_control(tp, local_adv, remote_adv);
-+
-+				tp->tg3_flags |=
-+					TG3_FLAG_GOT_SERDES_FLOWCTL;
-+				current_link_up = 1;
-+			}
-+			for (i = 0; i < 60; i++) {
-+				udelay(20);
-+				tw32_carefully(MAC_STATUS,
-+					(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
-+				if ((tr32(MAC_STATUS) &
-+				     (MAC_STATUS_SYNC_CHANGED |
-+				      MAC_STATUS_CFG_CHANGED)) == 0)
-+					break;
-+			}
-+			if (current_link_up == 0 &&
-+			    (tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED)) {
-+				current_link_up = 1;
-+			}
-+		} else {
-+			/* Forcing 1000FD link up. */
-+			current_link_up = 1;
-+		}
-+	}
-+
-+	tp->mac_mode &= ~MAC_MODE_LINK_POLARITY;
-+	tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+	tp->hw_status->status =
-+		(SD_STATUS_UPDATED |
-+		 (tp->hw_status->status & ~SD_STATUS_LINK_CHG));
-+
-+	for (i = 0; i < 100; i++) {
-+		udelay(20);
-+		tw32_carefully(MAC_STATUS,
-+			(MAC_STATUS_SYNC_CHANGED | MAC_STATUS_CFG_CHANGED));
-+		if ((tr32(MAC_STATUS) &
-+		     (MAC_STATUS_SYNC_CHANGED |
-+		      MAC_STATUS_CFG_CHANGED)) == 0)
-+			break;
-+	}
-+
-+	if ((tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) == 0)
-+		current_link_up = 0;
-+
-+	if (current_link_up == 1) {
-+		tp->link_config.active_speed = SPEED_1000;
-+		tp->link_config.active_duplex = DUPLEX_FULL;
-+	} else {
-+		tp->link_config.active_speed = SPEED_INVALID;
-+		tp->link_config.active_duplex = DUPLEX_INVALID;
-+	}
-+
-+	if (current_link_up != tp->carrier_ok) {
-+		tp->carrier_ok = current_link_up;
-+		tg3_link_report(tp);
-+	} else {
-+		uint32_t now_pause_cfg =
-+			tp->tg3_flags & (TG3_FLAG_RX_PAUSE |
-+					 TG3_FLAG_TX_PAUSE);
-+		if (orig_pause_cfg != now_pause_cfg ||
-+		    orig_active_speed != tp->link_config.active_speed ||
-+		    orig_active_duplex != tp->link_config.active_duplex)
-+			tg3_link_report(tp);
-+	}
-+
-+	if ((tr32(MAC_STATUS) & MAC_STATUS_PCS_SYNCED) == 0) {
-+		tw32_carefully(MAC_MODE, tp->mac_mode | MAC_MODE_LINK_POLARITY);
-+		if (tp->tg3_flags & TG3_FLAG_INIT_COMPLETE) {
-+			tw32_carefully(MAC_MODE, tp->mac_mode);
-+		}
-+	}
-+
-+	return 0;
-+}
-+#else
-+#define tg3_setup_fiber_phy(TP) (-EINVAL)
-+#endif /* SUPPORT_FIBER_PHY */
-+
-+static int tg3_setup_phy(struct tg3 *tp)
-+{
-+	int err;
-+
-+	if (tp->phy_id == PHY_ID_SERDES) {
-+		err = tg3_setup_fiber_phy(tp);
-+	} else {
-+		err = tg3_setup_copper_phy(tp);
-+	}
-+
-+	if (tp->link_config.active_speed == SPEED_1000 &&
-+	    tp->link_config.active_duplex == DUPLEX_HALF)
-+		tw32(MAC_TX_LENGTHS,
-+		     ((2 << TX_LENGTHS_IPG_CRS_SHIFT) |
-+		      (6 << TX_LENGTHS_IPG_SHIFT) |
-+		      (0xff << TX_LENGTHS_SLOT_TIME_SHIFT)));
-+	else
-+		tw32(MAC_TX_LENGTHS,
-+		     ((2 << TX_LENGTHS_IPG_CRS_SHIFT) |
-+		      (6 << TX_LENGTHS_IPG_SHIFT) |
-+		      (32 << TX_LENGTHS_SLOT_TIME_SHIFT)));
-+
-+	return err;
-+}
-+
-+
-+#define MAX_WAIT_CNT 1000
-+
-+/* To stop a block, clear the enable bit and poll till it
-+ * clears.  
-+ */
-+static int tg3_stop_block(struct tg3 *tp, unsigned long ofs, uint32_t enable_bit)
-+{
-+	unsigned int i;
-+	uint32_t val;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+		switch(ofs) {
-+		case RCVLSC_MODE:
-+		case DMAC_MODE:
-+		case MBFREE_MODE:
-+		case BUFMGR_MODE:
-+		case MEMARB_MODE:
-+			/* We can't enable/disable these bits of the
-+			 * 5705, just say success.
-+			 */
-+			return 0;
-+		default:
-+			break;
-+		}
-+	}
-+	val = tr32(ofs);
-+	val &= ~enable_bit;
-+	tw32(ofs, val);
-+	tr32(ofs);
-+
-+	for (i = 0; i < MAX_WAIT_CNT; i++) {
-+		udelay(100);
-+		val = tr32(ofs);
-+		if ((val & enable_bit) == 0)
-+			break;
-+	}
-+
-+	if (i == MAX_WAIT_CNT) {
-+		printf("tg3_stop_block timed out, ofs=%lx enable_bit=%x\n",
-+		       ofs, enable_bit);
-+		return -ENODEV;
-+	}
-+
-+	return 0;
-+}
-+
-+static int tg3_abort_hw(struct tg3 *tp)
-+{
-+	int i, err;
-+
-+	tg3_disable_ints(tp);
-+
-+	tp->rx_mode &= ~RX_MODE_ENABLE;
-+	tw32_carefully(MAC_RX_MODE, tp->rx_mode);
-+
-+	err  = tg3_stop_block(tp, RCVBDI_MODE,   RCVBDI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVLPC_MODE,   RCVLPC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVLSC_MODE,   RCVLSC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVDBDI_MODE,  RCVDBDI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVDCC_MODE,   RCVDCC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RCVCC_MODE,    RCVCC_MODE_ENABLE);
-+
-+	err |= tg3_stop_block(tp, SNDBDS_MODE,   SNDBDS_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDBDI_MODE,   SNDBDI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDDATAI_MODE, SNDDATAI_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, RDMAC_MODE,    RDMAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDDATAC_MODE, SNDDATAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, SNDBDC_MODE,   SNDBDC_MODE_ENABLE);
-+	if (err)
-+		goto out;
-+
-+	tp->mac_mode &= ~MAC_MODE_TDE_ENABLE;
-+	tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+	tp->tx_mode &= ~TX_MODE_ENABLE;
-+	tw32_carefully(MAC_TX_MODE, tp->tx_mode);
-+
-+	for (i = 0; i < MAX_WAIT_CNT; i++) {
-+		udelay(100);
-+		if (!(tr32(MAC_TX_MODE) & TX_MODE_ENABLE))
-+			break;
-+	}
-+	if (i >= MAX_WAIT_CNT) {
-+		printf("tg3_abort_hw timed out TX_MODE_ENABLE will not clear MAC_TX_MODE=%x\n",
-+			tr32(MAC_TX_MODE));
-+		return -ENODEV;
-+	}
-+
-+	err  = tg3_stop_block(tp, HOSTCC_MODE, HOSTCC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, WDMAC_MODE,  WDMAC_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, MBFREE_MODE, MBFREE_MODE_ENABLE);
-+
-+	tw32(FTQ_RESET, 0xffffffff);
-+	tw32(FTQ_RESET, 0x00000000);
-+
-+	err |= tg3_stop_block(tp, BUFMGR_MODE, BUFMGR_MODE_ENABLE);
-+	err |= tg3_stop_block(tp, MEMARB_MODE, MEMARB_MODE_ENABLE);
-+	if (err)
-+		goto out;
-+
-+	memset(tp->hw_status, 0, TG3_HW_STATUS_SIZE);
-+
-+out:
-+	return err;
-+}
-+
-+static void tg3_chip_reset(struct tg3 *tp)
-+{
-+	uint32_t val;
-+
-+	if (!(tp->tg3_flags2 & TG3_FLG2_SUN_5704)) {
-+		/* Force NVRAM to settle.
-+		 * This deals with a chip bug which can result in EEPROM
-+		 * corruption.
-+		 */
-+		if (tp->tg3_flags & TG3_FLAG_NVRAM) {
-+			int i;
-+	
-+			tw32(NVRAM_SWARB, SWARB_REQ_SET1);
-+			for (i = 0; i < 100000; i++) {
-+				if (tr32(NVRAM_SWARB) & SWARB_GNT1)
-+					break;
-+				udelay(10);
-+			}
-+		}
-+	}
-+	/* In Etherboot we don't need to worry about the 5701
-+	 * REG_WRITE_BUG because we do all register writes indirectly.
-+	 */
-+
-+	/* do the reset */
-+	val = GRC_MISC_CFG_CORECLK_RESET;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
-+		val |= GRC_MISC_CFG_KEEP_GPHY_POWER;
-+	tw32(GRC_MISC_CFG, val);
-+
-+	/* Flush PCI posted writes.  The normal MMIO registers
-+	 * are inaccessible at this time so this is the only
-+	 * way to make this reliably.  I tried to use indirect
-+	 * register read/write but this upset some 5701 variants.
-+	 */
-+	pci_read_config_dword(tp->pdev, PCI_COMMAND, &val);
-+
-+	udelay(120);
-+
-+	/* Re-enable indirect register accesses. */
-+	pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-+			       tp->misc_host_ctrl);
-+
-+	/* Set MAX PCI retry to zero. */
-+	val = (PCISTATE_ROM_ENABLE | PCISTATE_ROM_RETRY_ENABLE);
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0 &&
-+	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE))
-+		val |= PCISTATE_RETRY_SAME_DMA;
-+	pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, val);
-+
-+	pci_restore_state(tp->pdev, tp->pci_cfg_state);
-+
-+	/* Make sure PCI-X relaxed ordering bit is clear. */
-+	pci_read_config_dword(tp->pdev, TG3PCI_X_CAPS, &val);
-+	val &= ~PCIX_CAPS_RELAXED_ORDERING;
-+	pci_write_config_dword(tp->pdev, TG3PCI_X_CAPS, val);
-+
-+	tw32(MEMARB_MODE, MEMARB_MODE_ENABLE);
-+
-+	if (((tp->nic_sram_data_cfg & NIC_SRAM_DATA_CFG_MINI_PCI) != 0) &&
-+		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) {
-+		tp->pci_clock_ctrl |=
-+			(CLOCK_CTRL_FORCE_CLKRUN | CLOCK_CTRL_CLKRUN_OENABLE);
-+		tw32(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
-+	}
-+
-+	tw32(TG3PCI_MISC_HOST_CTRL, tp->misc_host_ctrl);
-+}
-+
-+static void tg3_stop_fw(struct tg3 *tp)
-+{
-+	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
-+		uint32_t val;
-+		int i;
-+
-+		tg3_write_mem(NIC_SRAM_FW_CMD_MBOX, FWCMD_NICDRV_PAUSE_FW);
-+		val = tr32(GRC_RX_CPU_EVENT);
-+		val |= (1 << 14);
-+		tw32(GRC_RX_CPU_EVENT, val);
-+
-+		/* Wait for RX cpu to ACK the event.  */
-+		for (i = 0; i < 100; i++) {
-+			if (!(tr32(GRC_RX_CPU_EVENT) & (1 << 14)))
-+				break;
-+			udelay(1);
-+		}
-+	}
-+}
-+
-+static int tg3_restart_fw(struct tg3 *tp, uint32_t state)
-+{
-+	uint32_t val;
-+	int i;
-+	
-+	tg3_write_mem(NIC_SRAM_FIRMWARE_MBOX, 
-+		NIC_SRAM_FIRMWARE_MBOX_MAGIC1);
-+	/* Wait for firmware initialization to complete. */
-+	for (i = 0; i < 100000; i++) {
-+		tg3_read_mem(NIC_SRAM_FIRMWARE_MBOX, &val);
-+		if (val == (uint32_t) ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1)
-+			break;
-+		udelay(10);
-+	}
-+	if (i >= 100000 &&
-+		    !(tp->tg3_flags2 & TG3_FLG2_SUN_5704)) {
-+		printf("Firmware will not restart magic=%x\n",
-+			val);
-+		return -ENODEV;
-+	}
-+	if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) {
-+		state = DRV_STATE_SUSPEND;
-+	}
-+	tg3_write_mem(NIC_SRAM_FW_DRV_STATE_MBOX, state);
-+	return 0;
-+}
-+
-+static int tg3_halt(struct tg3 *tp)
-+{
-+	tg3_stop_fw(tp);
-+	tg3_abort_hw(tp);
-+	tg3_chip_reset(tp);
-+	return tg3_restart_fw(tp, DRV_STATE_UNLOAD);
-+}
-+
-+static void __tg3_set_mac_addr(struct tg3 *tp)
-+{
-+	uint32_t addr_high, addr_low;
-+	int i;
-+
-+	addr_high = ((tp->nic->node_addr[0] << 8) |
-+		     tp->nic->node_addr[1]);
-+	addr_low = ((tp->nic->node_addr[2] << 24) |
-+		    (tp->nic->node_addr[3] << 16) |
-+		    (tp->nic->node_addr[4] <<  8) |
-+		    (tp->nic->node_addr[5] <<  0));
-+	for (i = 0; i < 4; i++) {
-+		tw32(MAC_ADDR_0_HIGH + (i * 8), addr_high);
-+		tw32(MAC_ADDR_0_LOW + (i * 8), addr_low);
-+	}
-+
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700) &&
-+		(GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) &&
-+		(GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705)) {
-+		for(i = 0; i < 12; i++) {
-+			tw32(MAC_EXTADDR_0_HIGH + (i * 8), addr_high);
-+			tw32(MAC_EXTADDR_0_LOW + (i * 8), addr_low);
-+		}
-+	}
-+	addr_high = (tp->nic->node_addr[0] +
-+		     tp->nic->node_addr[1] +
-+		     tp->nic->node_addr[2] +
-+		     tp->nic->node_addr[3] +
-+		     tp->nic->node_addr[4] +
-+		     tp->nic->node_addr[5]) &
-+		TX_BACKOFF_SEED_MASK;
-+	tw32(MAC_TX_BACKOFF_SEED, addr_high);
-+}
-+
-+static void tg3_set_bdinfo(struct tg3 *tp, uint32_t bdinfo_addr,
-+			   dma_addr_t mapping, uint32_t maxlen_flags,
-+			   uint32_t nic_addr)
-+{
-+	tg3_write_mem((bdinfo_addr +
-+		       TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH),
-+		      ((uint64_t) mapping >> 32));
-+	tg3_write_mem((bdinfo_addr +
-+		       TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW),
-+		      ((uint64_t) mapping & 0xffffffff));
-+	tg3_write_mem((bdinfo_addr +
-+		       TG3_BDINFO_MAXLEN_FLAGS),
-+		       maxlen_flags);
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		tg3_write_mem((bdinfo_addr + TG3_BDINFO_NIC_ADDR), nic_addr);
-+	}
-+}
-+
-+
-+static void tg3_init_rings(struct tg3 *tp)
-+{
-+	unsigned i;
-+
-+	/* Zero out the tg3 variables */
-+	memset(&tg3_bss, 0, sizeof(tg3_bss));
-+	tp->rx_std    = &tg3_bss.rx_std[0];
-+	tp->rx_rcb    = &tg3_bss.rx_rcb[0];
-+	tp->tx_ring   = &tg3_bss.tx_ring[0];
-+	tp->hw_status = &tg3_bss.hw_status;
-+	tp->hw_stats  = &tg3_bss.hw_stats;
-+	tp->mac_mode  = 0;
-+
-+
-+	/* Initialize tx/rx rings for packet processing.
-+	 *
-+	 * The chip has been shut down and the driver detached from
-+	 * the networking, so no interrupts or new tx packets will
-+	 * end up in the driver.
-+	 */
-+
-+	/* Initialize invariants of the rings, we only set this
-+	 * stuff once.  This works because the card does not
-+	 * write into the rx buffer posting rings.
-+	 */
-+	for (i = 0; i < TG3_RX_RING_SIZE; i++) {
-+		struct tg3_rx_buffer_desc *rxd;
-+
-+		rxd = &tp->rx_std[i];
-+		rxd->idx_len = (RX_PKT_BUF_SZ - 2 - 64)	<< RXD_LEN_SHIFT;
-+		rxd->type_flags = (RXD_FLAG_END << RXD_FLAGS_SHIFT);
-+		rxd->opaque = (RXD_OPAQUE_RING_STD | (i << RXD_OPAQUE_INDEX_SHIFT));
-+
-+		/* Note where the receive buffer for the ring is placed */
-+		rxd->addr_hi = 0;
-+		rxd->addr_lo = virt_to_bus(
-+			&tg3_bss.rx_bufs[i%TG3_DEF_RX_RING_PENDING][2]);
-+	}
-+}
-+
-+#define TG3_WRITE_SETTINGS(TABLE) \
-+do { \
-+	const uint32_t *_table, *_end; \
-+	_table = TABLE; \
-+	_end = _table + sizeof(TABLE)/sizeof(TABLE[0]);  \
-+	for(; _table < _end; _table += 2) { \
-+		tw32(_table[0], _table[1]); \
-+	} \
-+} while(0)
-+
-+
-+/* initialize/reset the tg3 */
-+static int tg3_setup_hw(struct tg3 *tp)
-+{
-+	uint32_t val, rdmac_mode;
-+	int i, err, limit;
-+
-+	/* Simply don't support setups with extremly buggy firmware in etherboot */
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0) {
-+		printf("Error 5701_A0 firmware bug detected\n");
-+		return -EINVAL;
-+	}
-+
-+	tg3_disable_ints(tp);
-+
-+	/* Originally this was all in tg3_init_hw */
-+
-+	/* Force the chip into D0. */
-+	tg3_set_power_state_0(tp);
-+
-+	tg3_switch_clocks(tp);
-+
-+	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+
-+
-+	/* Originally this was all in tg3_reset_hw */
-+
-+	tg3_stop_fw(tp);
-+
-+	/* No need to call tg3_abort_hw here, it is called before tg3_setup_hw. */
-+
-+	tg3_chip_reset(tp);
-+
-+	tw32(GRC_MODE, tp->grc_mode);  /* Redundant? */
-+
-+	err = tg3_restart_fw(tp, DRV_STATE_START);
-+	if (err)
-+		return err;
-+
-+	if (tp->phy_id == PHY_ID_SERDES) {
-+		tp->mac_mode = MAC_MODE_PORT_MODE_TBI;
-+	}
-+	tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+
-+	/* This works around an issue with Athlon chipsets on
-+	 * B3 tigon3 silicon.  This bit has no effect on any
-+	 * other revision.
-+	 */
-+	tp->pci_clock_ctrl |= CLOCK_CTRL_DELAY_PCI_GRANT;
-+	tw32_carefully(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl);
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0 &&
-+	    (tp->tg3_flags & TG3_FLAG_PCIX_MODE)) {
-+		val = tr32(TG3PCI_PCISTATE);
-+		val |= PCISTATE_RETRY_SAME_DMA;
-+		tw32(TG3PCI_PCISTATE, val);
-+	}
-+
-+	/* Descriptor ring init may make accesses to the
-+	 * NIC SRAM area to setup the TX descriptors, so we
-+	 * can only do this after the hardware has been
-+	 * successfully reset.
-+	 */
-+	tg3_init_rings(tp);
-+
-+	/* Clear statistics/status block in chip */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		for (i = NIC_SRAM_STATS_BLK;
-+		     i < NIC_SRAM_STATUS_BLK + TG3_HW_STATUS_SIZE;
-+		     i += sizeof(uint32_t)) {
-+			tg3_write_mem(i, 0);
-+			udelay(40);
-+		}
-+	}
-+
-+	/* This value is determined during the probe time DMA
-+	 * engine test, tg3_setup_dma.
-+	 */
-+	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
-+
-+	tp->grc_mode &= ~(GRC_MODE_HOST_SENDBDS |
-+			  GRC_MODE_4X_NIC_SEND_RINGS |
-+			  GRC_MODE_NO_TX_PHDR_CSUM |
-+			  GRC_MODE_NO_RX_PHDR_CSUM);
-+	tp->grc_mode |= GRC_MODE_HOST_SENDBDS;
-+	tp->grc_mode |= GRC_MODE_NO_TX_PHDR_CSUM;
-+	tp->grc_mode |= GRC_MODE_NO_RX_PHDR_CSUM;
-+
-+	tw32(GRC_MODE,
-+		tp->grc_mode | 
-+		(GRC_MODE_IRQ_ON_MAC_ATTN | GRC_MODE_HOST_STACKUP));
-+
-+	/* Setup the timer prescalar register.  Clock is always 66Mhz. */
-+	tw32(GRC_MISC_CFG,
-+	     (65 << GRC_MISC_CFG_PRESCALAR_SHIFT));
-+
-+	/* Initialize MBUF/DESC pool. */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		tw32(BUFMGR_MB_POOL_ADDR, NIC_SRAM_MBUF_POOL_BASE);
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
-+			tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE64);
-+		else
-+			tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE96);
-+		tw32(BUFMGR_DMA_DESC_POOL_ADDR, NIC_SRAM_DMA_DESC_POOL_BASE);
-+		tw32(BUFMGR_DMA_DESC_POOL_SIZE, NIC_SRAM_DMA_DESC_POOL_SIZE);
-+	}
-+	if (!(tp->tg3_flags & TG3_FLAG_JUMBO_ENABLE)) {
-+		tw32(BUFMGR_MB_RDMA_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_read_dma_low_water);
-+		tw32(BUFMGR_MB_MACRX_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_mac_rx_low_water);
-+		tw32(BUFMGR_MB_HIGH_WATER,
-+		     tp->bufmgr_config.mbuf_high_water);
-+	} else {
-+		tw32(BUFMGR_MB_RDMA_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_read_dma_low_water_jumbo);
-+		tw32(BUFMGR_MB_MACRX_LOW_WATER,
-+		     tp->bufmgr_config.mbuf_mac_rx_low_water_jumbo);
-+		tw32(BUFMGR_MB_HIGH_WATER,
-+		     tp->bufmgr_config.mbuf_high_water_jumbo);
-+	}
-+	tw32(BUFMGR_DMA_LOW_WATER,
-+	     tp->bufmgr_config.dma_low_water);
-+	tw32(BUFMGR_DMA_HIGH_WATER,
-+	     tp->bufmgr_config.dma_high_water);
-+
-+	tw32(BUFMGR_MODE, BUFMGR_MODE_ENABLE | BUFMGR_MODE_ATTN_ENABLE);
-+	for (i = 0; i < 2000; i++) {
-+		if (tr32(BUFMGR_MODE) & BUFMGR_MODE_ENABLE)
-+			break;
-+		udelay(10);
-+	}
-+	if (i >= 2000) {
-+		printf("tg3_setup_hw cannot enable BUFMGR\n");
-+		return -ENODEV;
-+	}
-+
-+	tw32(FTQ_RESET, 0xffffffff);
-+	tw32(FTQ_RESET, 0x00000000);
-+	for (i = 0; i < 2000; i++) {
-+		if (tr32(FTQ_RESET) == 0x00000000)
-+			break;
-+		udelay(10);
-+	}
-+	if (i >= 2000) {
-+		printf("tg3_setup_hw cannot reset FTQ\n");
-+		return -ENODEV;
-+	}
-+
-+	/* Initialize TG3_BDINFO's at:
-+	 *  RCVDBDI_STD_BD:	standard eth size rx ring
-+	 *  RCVDBDI_JUMBO_BD:	jumbo frame rx ring
-+	 *  RCVDBDI_MINI_BD:	small frame rx ring (??? does not work)
-+	 *
-+	 * like so:
-+	 *  TG3_BDINFO_HOST_ADDR:	high/low parts of DMA address of ring
-+	 *  TG3_BDINFO_MAXLEN_FLAGS:	(rx max buffer size << 16) |
-+	 *                              ring attribute flags
-+	 *  TG3_BDINFO_NIC_ADDR:	location of descriptors in nic SRAM
-+	 *
-+	 * Standard receive ring @ NIC_SRAM_RX_BUFFER_DESC, 512 entries.
-+	 * Jumbo receive ring @ NIC_SRAM_RX_JUMBO_BUFFER_DESC, 256 entries.
-+	 *
-+	 * ??? No space allocated for mini receive ring? :(
-+	 *
-+	 * The size of each ring is fixed in the firmware, but the location is
-+	 * configurable.
-+	 */
-+	{
-+		static const uint32_t table_all[] = {
-+			/* Setup replenish thresholds. */
-+			RCVBDI_STD_THRESH, TG3_DEF_RX_RING_PENDING / 8,
-+
-+			/* Etherboot lives below 4GB */
-+			RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_HIGH, 0,
-+			RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR, NIC_SRAM_RX_BUFFER_DESC,
-+		};
-+		static const uint32_t table_not_5705[] = {
-+			/* Buffer maximum length */
-+			RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS, RX_STD_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT,
-+			
-+			/* Disable the mini frame rx ring */
-+			RCVDBDI_MINI_BD + TG3_BDINFO_MAXLEN_FLAGS,	BDINFO_FLAGS_DISABLED,
-+			
-+			/* Disable the jumbo frame rx ring */
-+			RCVBDI_JUMBO_THRESH, 0,
-+			RCVDBDI_JUMBO_BD + TG3_BDINFO_MAXLEN_FLAGS, BDINFO_FLAGS_DISABLED,
-+			
-+			
-+		};
-+		TG3_WRITE_SETTINGS(table_all);
-+		tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW, 
-+			virt_to_bus(tp->rx_std));
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+			tw32(RCVDBDI_STD_BD + TG3_BDINFO_MAXLEN_FLAGS,
-+				RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT);
-+		} else {
-+			TG3_WRITE_SETTINGS(table_not_5705);
-+		}
-+	}
-+
-+	
-+	/* There is only one send ring on 5705, no need to explicitly
-+	 * disable the others.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		/* Clear out send RCB ring in SRAM. */
-+		for (i = NIC_SRAM_SEND_RCB; i < NIC_SRAM_RCV_RET_RCB; i += TG3_BDINFO_SIZE)
-+			tg3_write_mem(i + TG3_BDINFO_MAXLEN_FLAGS, BDINFO_FLAGS_DISABLED);
-+	}
-+
-+	tp->tx_prod = 0;
-+	tw32_mailbox(MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0);
-+	tw32_mailbox2(MAILBOX_SNDNIC_PROD_IDX_0 + TG3_64BIT_REG_LOW, 0);
-+
-+	tg3_set_bdinfo(tp,
-+		NIC_SRAM_SEND_RCB,
-+		virt_to_bus(tp->tx_ring),
-+		(TG3_TX_RING_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT),
-+		NIC_SRAM_TX_BUFFER_DESC);
-+
-+	/* There is only one receive return ring on 5705, no need to explicitly
-+	 * disable the others.
-+	 */
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		for (i = NIC_SRAM_RCV_RET_RCB; i < NIC_SRAM_STATS_BLK; i += TG3_BDINFO_SIZE) {
-+			tg3_write_mem(i + TG3_BDINFO_MAXLEN_FLAGS,
-+				BDINFO_FLAGS_DISABLED);
-+		}
-+	}
-+
-+	tp->rx_rcb_ptr = 0;
-+	tw32_mailbox2(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, 0);
-+
-+	tg3_set_bdinfo(tp,
-+		NIC_SRAM_RCV_RET_RCB,
-+		virt_to_bus(tp->rx_rcb),
-+		(TG3_RX_RCB_RING_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT),
-+		0);
-+
-+	tp->rx_std_ptr = TG3_DEF_RX_RING_PENDING;
-+	tw32_mailbox2(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW,
-+		     tp->rx_std_ptr);
-+
-+	tw32_mailbox2(MAILBOX_RCV_JUMBO_PROD_IDX + TG3_64BIT_REG_LOW, 0);
-+
-+	/* Initialize MAC address and backoff seed. */
-+	__tg3_set_mac_addr(tp);
-+
-+	/* Calculate RDMAC_MODE setting early, we need it to determine
-+	 * the RCVLPC_STATE_ENABLE mask.
-+	 */
-+	rdmac_mode = (RDMAC_MODE_ENABLE | RDMAC_MODE_TGTABORT_ENAB |
-+		RDMAC_MODE_MSTABORT_ENAB | RDMAC_MODE_PARITYERR_ENAB |
-+		RDMAC_MODE_ADDROFLOW_ENAB | RDMAC_MODE_FIFOOFLOW_ENAB |
-+		RDMAC_MODE_FIFOURUN_ENAB | RDMAC_MODE_FIFOOREAD_ENAB |
-+		RDMAC_MODE_LNGREAD_ENAB);
-+	if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
-+		rdmac_mode |= RDMAC_MODE_SPLIT_ENABLE;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+		if (tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
-+			if (!(tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) &&
-+				!(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
-+				rdmac_mode |= RDMAC_MODE_FIFO_LONG_BURST;
-+			}
-+		}
-+	}
-+
-+	/* Setup host coalescing engine. */
-+	tw32(HOSTCC_MODE, 0);
-+	for (i = 0; i < 2000; i++) {
-+		if (!(tr32(HOSTCC_MODE) & HOSTCC_MODE_ENABLE))
-+			break;
-+		udelay(10);
-+	}
-+
-+	tp->mac_mode = MAC_MODE_TXSTAT_ENABLE | MAC_MODE_RXSTAT_ENABLE |
-+		MAC_MODE_TDE_ENABLE | MAC_MODE_RDE_ENABLE | MAC_MODE_FHDE_ENABLE;
-+	tw32_carefully(MAC_MODE, tp->mac_mode | MAC_MODE_RXSTAT_CLEAR | MAC_MODE_TXSTAT_CLEAR);
-+
-+	tp->grc_local_ctrl = GRC_LCLCTRL_INT_ON_ATTN | GRC_LCLCTRL_AUTO_SEEPROM;
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700)
-+		tp->grc_local_ctrl |= (GRC_LCLCTRL_GPIO_OE1 |
-+				       GRC_LCLCTRL_GPIO_OUTPUT1);
-+	tw32_carefully(GRC_LOCAL_CTRL, tp->grc_local_ctrl);
-+
-+	tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 0);
-+	tr32(MAILBOX_INTERRUPT_0);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+		tw32_carefully(DMAC_MODE, DMAC_MODE_ENABLE);
-+	}
-+
-+	val = (	WDMAC_MODE_ENABLE | WDMAC_MODE_TGTABORT_ENAB |
-+		WDMAC_MODE_MSTABORT_ENAB | WDMAC_MODE_PARITYERR_ENAB |
-+		WDMAC_MODE_ADDROFLOW_ENAB | WDMAC_MODE_FIFOOFLOW_ENAB |
-+		WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
-+		WDMAC_MODE_LNGREAD_ENAB);
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) &&
-+		((tr32(TG3PCI_PCISTATE) & PCISTATE_BUS_SPEED_HIGH) != 0) &&
-+		!(tp->tg3_flags2 & TG3_FLG2_IS_5788)) {
-+		val |= WDMAC_MODE_RX_ACCEL;
-+	}
-+	tw32_carefully(WDMAC_MODE, val);
-+
-+	if ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) != 0) {
-+		val = tr32(TG3PCI_X_CAPS);
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) {
-+			val &= PCIX_CAPS_BURST_MASK;
-+			val |= (PCIX_CAPS_MAX_BURST_CPIOB << PCIX_CAPS_BURST_SHIFT);
-+		} else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+			val &= ~(PCIX_CAPS_SPLIT_MASK | PCIX_CAPS_BURST_MASK);
-+			val |= (PCIX_CAPS_MAX_BURST_CPIOB << PCIX_CAPS_BURST_SHIFT);
-+			if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
-+				val |= (tp->split_mode_max_reqs <<
-+					PCIX_CAPS_SPLIT_SHIFT);
-+		}
-+		tw32(TG3PCI_X_CAPS, val);
-+	}
-+
-+	tw32_carefully(RDMAC_MODE, rdmac_mode);
-+	{
-+		static const uint32_t table_all[] = {
-+			/* MTU + ethernet header + FCS + optional VLAN tag */
-+			MAC_RX_MTU_SIZE, ETH_MAX_MTU + ETH_HLEN + 8,
-+			
-+			/* The slot time is changed by tg3_setup_phy if we
-+			 * run at gigabit with half duplex.
-+			 */
-+			MAC_TX_LENGTHS,	
-+			(2 << TX_LENGTHS_IPG_CRS_SHIFT) |
-+			(6 << TX_LENGTHS_IPG_SHIFT) |
-+			(32 << TX_LENGTHS_SLOT_TIME_SHIFT),
-+			
-+			/* Receive rules. */
-+			MAC_RCV_RULE_CFG, RCV_RULE_CFG_DEFAULT_CLASS,
-+			RCVLPC_CONFIG, 0x0181,
-+			
-+			/* Receive/send statistics. */
-+			RCVLPC_STATS_ENABLE, 0xffffff,
-+			RCVLPC_STATSCTRL, RCVLPC_STATSCTRL_ENABLE,
-+			SNDDATAI_STATSENAB, 0xffffff,
-+			SNDDATAI_STATSCTRL, (SNDDATAI_SCTRL_ENABLE |SNDDATAI_SCTRL_FASTUPD),
-+			
-+			/* Host coalescing engine */
-+			HOSTCC_RXCOL_TICKS, 0,
-+			HOSTCC_TXCOL_TICKS, LOW_TXCOL_TICKS,
-+			HOSTCC_RXMAX_FRAMES, 1,
-+			HOSTCC_TXMAX_FRAMES, LOW_RXMAX_FRAMES,
-+			HOSTCC_RXCOAL_MAXF_INT, 1,
-+			HOSTCC_TXCOAL_MAXF_INT, 0,
-+			
-+			/* Status/statistics block address. */
-+			/* Etherboot lives below 4GB, so HIGH == 0 */
-+			HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH, 0,
-+
-+			/* No need to enable 32byte coalesce mode. */
-+			HOSTCC_MODE, HOSTCC_MODE_ENABLE | 0,
-+			
-+			RCVCC_MODE, RCVCC_MODE_ENABLE | RCVCC_MODE_ATTN_ENABLE,
-+			RCVLPC_MODE, RCVLPC_MODE_ENABLE,
-+			
-+			RCVDCC_MODE, RCVDCC_MODE_ENABLE | RCVDCC_MODE_ATTN_ENABLE,
-+
-+			SNDDATAC_MODE, SNDDATAC_MODE_ENABLE,
-+			SNDBDC_MODE, SNDBDC_MODE_ENABLE | SNDBDC_MODE_ATTN_ENABLE,
-+			RCVBDI_MODE, RCVBDI_MODE_ENABLE | RCVBDI_MODE_RCB_ATTN_ENAB,
-+			RCVDBDI_MODE, RCVDBDI_MODE_ENABLE | RCVDBDI_MODE_INV_RING_SZ,
-+			SNDDATAI_MODE, SNDDATAI_MODE_ENABLE,
-+			SNDBDI_MODE, SNDBDI_MODE_ENABLE | SNDBDI_MODE_ATTN_ENABLE,
-+			SNDBDS_MODE, SNDBDS_MODE_ENABLE | SNDBDS_MODE_ATTN_ENABLE,
-+			
-+			/* Accept all multicast frames. */
-+			MAC_HASH_REG_0, 0xffffffff,
-+			MAC_HASH_REG_1, 0xffffffff,
-+			MAC_HASH_REG_2, 0xffffffff,
-+			MAC_HASH_REG_3, 0xffffffff,
-+		};
-+		static const uint32_t table_not_5705[] = {
-+			/* Host coalescing engine */
-+			HOSTCC_RXCOAL_TICK_INT, 0,
-+			HOSTCC_TXCOAL_TICK_INT, 0,
-+
-+			/* Status/statistics block address. */
-+			/* Etherboot lives below 4GB, so HIGH == 0 */
-+			HOSTCC_STAT_COAL_TICKS, DEFAULT_STAT_COAL_TICKS,
-+			HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_HIGH, 0,
-+			HOSTCC_STATS_BLK_NIC_ADDR, NIC_SRAM_STATS_BLK,
-+			HOSTCC_STATUS_BLK_NIC_ADDR, NIC_SRAM_STATUS_BLK,
-+
-+			RCVLSC_MODE, RCVLSC_MODE_ENABLE | RCVLSC_MODE_ATTN_ENABLE,
-+
-+			MBFREE_MODE, MBFREE_MODE_ENABLE,
-+		};
-+		TG3_WRITE_SETTINGS(table_all);
-+		tw32(HOSTCC_STATS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
-+			virt_to_bus(tp->hw_stats));
-+		tw32(HOSTCC_STATUS_BLK_HOST_ADDR + TG3_64BIT_REG_LOW,
-+			virt_to_bus(tp->hw_status));
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5705) {
-+			TG3_WRITE_SETTINGS(table_not_5705);
-+		}
-+	}
-+
-+	tp->tx_mode = TX_MODE_ENABLE;
-+	tw32_carefully(MAC_TX_MODE, tp->tx_mode);
-+
-+	tp->rx_mode = RX_MODE_ENABLE;
-+	tw32_carefully(MAC_RX_MODE, tp->rx_mode);
-+
-+	tp->mi_mode = MAC_MI_MODE_BASE;
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
-+
-+	tw32(MAC_LED_CTRL, 0);
-+	tw32(MAC_MI_STAT, MAC_MI_STAT_LNKSTAT_ATTN_ENAB);
-+	if (tp->phy_id == PHY_ID_SERDES) {
-+		tw32_carefully(MAC_RX_MODE, RX_MODE_RESET);
-+	}
-+	tp->rx_mode |= RX_MODE_KEEP_VLAN_TAG; /* drop tagged vlan packets */
-+	tw32_carefully(MAC_RX_MODE, tp->rx_mode);
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5703_A1)
-+		tw32(MAC_SERDES_CFG, 0x616000);
-+
-+	/* Prevent chip from dropping frames when flow control
-+	 * is enabled.
-+	 */
-+	tw32(MAC_LOW_WMARK_MAX_RX_FRAME, 2);
-+	tr32(MAC_LOW_WMARK_MAX_RX_FRAME);
-+
-+	err = tg3_setup_phy(tp);
-+
-+	/* Ignore CRC stats */
-+
-+	/* Initialize receive rules. */
-+	tw32(MAC_RCV_RULE_0,  0xc2000000 & RCV_RULE_DISABLE_MASK);
-+	tw32(MAC_RCV_VALUE_0, 0xffffffff & RCV_RULE_DISABLE_MASK);
-+	tw32(MAC_RCV_RULE_1,  0x86000004 & RCV_RULE_DISABLE_MASK);
-+	tw32(MAC_RCV_VALUE_1, 0xffffffff & RCV_RULE_DISABLE_MASK);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)
-+		limit = 8;
-+	else
-+		limit = 16;
-+	if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF)
-+		limit -= 4;
-+	switch (limit) {
-+	case 16:	tw32(MAC_RCV_RULE_15,  0); tw32(MAC_RCV_VALUE_15,  0);
-+	case 15:	tw32(MAC_RCV_RULE_14,  0); tw32(MAC_RCV_VALUE_14,  0);
-+	case 14:	tw32(MAC_RCV_RULE_13,  0); tw32(MAC_RCV_VALUE_13,  0);
-+	case 13:	tw32(MAC_RCV_RULE_12,  0); tw32(MAC_RCV_VALUE_12,  0);
-+	case 12:	tw32(MAC_RCV_RULE_11,  0); tw32(MAC_RCV_VALUE_11,  0);
-+	case 11:	tw32(MAC_RCV_RULE_10,  0); tw32(MAC_RCV_VALUE_10,  0);
-+	case 10:	tw32(MAC_RCV_RULE_9,  0);  tw32(MAC_RCV_VALUE_9,  0);
-+	case 9:		tw32(MAC_RCV_RULE_8,  0);  tw32(MAC_RCV_VALUE_8,  0);
-+	case 8:		tw32(MAC_RCV_RULE_7,  0);  tw32(MAC_RCV_VALUE_7,  0);
-+	case 7:		tw32(MAC_RCV_RULE_6,  0);  tw32(MAC_RCV_VALUE_6,  0);
-+	case 6:		tw32(MAC_RCV_RULE_5,  0);  tw32(MAC_RCV_VALUE_5,  0);
-+	case 5:		tw32(MAC_RCV_RULE_4,  0);  tw32(MAC_RCV_VALUE_4,  0);
-+	case 4:		/* tw32(MAC_RCV_RULE_3,  0); tw32(MAC_RCV_VALUE_3,  0); */
-+	case 3:		/* tw32(MAC_RCV_RULE_2,  0); tw32(MAC_RCV_VALUE_2,  0); */
-+	case 2:
-+	case 1:
-+	default:
-+		break;
-+	};
-+
-+	return err;
-+}
-+
-+
-+
-+/* Chips other than 5700/5701 use the NVRAM for fetching info. */
-+static void tg3_nvram_init(struct tg3 *tp)
-+{
-+	tw32(GRC_EEPROM_ADDR,
-+	     (EEPROM_ADDR_FSM_RESET |
-+	      (EEPROM_DEFAULT_CLOCK_PERIOD <<
-+	       EEPROM_ADDR_CLKPERD_SHIFT)));
-+
-+	mdelay(1);
-+
-+	/* Enable seeprom accesses. */
-+	tw32_carefully(GRC_LOCAL_CTRL,
-+		tr32(GRC_LOCAL_CTRL) | GRC_LCLCTRL_AUTO_SEEPROM);
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700 &&
-+	    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) {
-+		uint32_t nvcfg1 = tr32(NVRAM_CFG1);
-+
-+		tp->tg3_flags |= TG3_FLAG_NVRAM;
-+		if (nvcfg1 & NVRAM_CFG1_FLASHIF_ENAB) {
-+			if (nvcfg1 & NVRAM_CFG1_BUFFERED_MODE)
-+				tp->tg3_flags |= TG3_FLAG_NVRAM_BUFFERED;
-+		} else {
-+			nvcfg1 &= ~NVRAM_CFG1_COMPAT_BYPASS;
-+			tw32(NVRAM_CFG1, nvcfg1);
-+		}
-+
-+	} else {
-+		tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED);
-+	}
-+}
-+
-+
-+static int tg3_nvram_read_using_eeprom(
-+	struct tg3 *tp __unused, uint32_t offset, uint32_t *val)
-+{
-+	uint32_t tmp;
-+	int i;
-+
-+	if (offset > EEPROM_ADDR_ADDR_MASK ||
-+		(offset % 4) != 0) {
-+		return -EINVAL;
-+	}
-+
-+	tmp = tr32(GRC_EEPROM_ADDR) & ~(EEPROM_ADDR_ADDR_MASK |
-+					EEPROM_ADDR_DEVID_MASK |
-+					EEPROM_ADDR_READ);
-+	tw32(GRC_EEPROM_ADDR,
-+	     tmp |
-+	     (0 << EEPROM_ADDR_DEVID_SHIFT) |
-+	     ((offset << EEPROM_ADDR_ADDR_SHIFT) &
-+	      EEPROM_ADDR_ADDR_MASK) |
-+	     EEPROM_ADDR_READ | EEPROM_ADDR_START);
-+
-+	for (i = 0; i < 10000; i++) {
-+		tmp = tr32(GRC_EEPROM_ADDR);
-+
-+		if (tmp & EEPROM_ADDR_COMPLETE)
-+			break;
-+		udelay(100);
-+	}
-+	if (!(tmp & EEPROM_ADDR_COMPLETE)) {
-+		return -EBUSY;
-+	}
-+
-+	*val = tr32(GRC_EEPROM_DATA);
-+	return 0;
-+}
-+
-+static int tg3_nvram_read(struct tg3 *tp, uint32_t offset, uint32_t *val)
-+{
-+	int i, saw_done_clear;
-+
-+	if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
-+		return tg3_nvram_read_using_eeprom(tp, offset, val);
-+
-+	if (tp->tg3_flags & TG3_FLAG_NVRAM_BUFFERED)
-+		offset = ((offset / NVRAM_BUFFERED_PAGE_SIZE) <<
-+			  NVRAM_BUFFERED_PAGE_POS) +
-+			(offset % NVRAM_BUFFERED_PAGE_SIZE);
-+
-+	if (offset > NVRAM_ADDR_MSK)
-+		return -EINVAL;
-+
-+	tw32(NVRAM_SWARB, SWARB_REQ_SET1);
-+	for (i = 0; i < 1000; i++) {
-+		if (tr32(NVRAM_SWARB) & SWARB_GNT1)
-+			break;
-+		udelay(20);
-+	}
-+
-+	tw32(NVRAM_ADDR, offset);
-+	tw32(NVRAM_CMD,
-+	     NVRAM_CMD_RD | NVRAM_CMD_GO |
-+	     NVRAM_CMD_FIRST | NVRAM_CMD_LAST | NVRAM_CMD_DONE);
-+
-+	/* Wait for done bit to clear then set again. */
-+	saw_done_clear = 0;
-+	for (i = 0; i < 1000; i++) {
-+		udelay(10);
-+		if (!saw_done_clear &&
-+		    !(tr32(NVRAM_CMD) & NVRAM_CMD_DONE))
-+			saw_done_clear = 1;
-+		else if (saw_done_clear &&
-+			 (tr32(NVRAM_CMD) & NVRAM_CMD_DONE))
-+			break;
-+	}
-+	if (i >= 1000) {
-+		tw32(NVRAM_SWARB, SWARB_REQ_CLR1);
-+		return -EBUSY;
-+	}
-+
-+	*val = bswap_32(tr32(NVRAM_RDDATA));
-+	tw32(NVRAM_SWARB, 0x20);
-+
-+	return 0;
-+}
-+
-+struct subsys_tbl_ent {
-+	uint16_t subsys_vendor, subsys_devid;
-+	uint32_t phy_id;
-+};
-+
-+static struct subsys_tbl_ent subsys_id_to_phy_id[] = {
-+	/* Broadcom boards. */
-+	{ 0x14e4, 0x1644, PHY_ID_BCM5401 }, /* BCM95700A6 */
-+	{ 0x14e4, 0x0001, PHY_ID_BCM5701 }, /* BCM95701A5 */
-+	{ 0x14e4, 0x0002, PHY_ID_BCM8002 }, /* BCM95700T6 */
-+	{ 0x14e4, 0x0003, PHY_ID_SERDES  }, /* BCM95700A9 */
-+	{ 0x14e4, 0x0005, PHY_ID_BCM5701 }, /* BCM95701T1 */
-+	{ 0x14e4, 0x0006, PHY_ID_BCM5701 }, /* BCM95701T8 */
-+	{ 0x14e4, 0x0007, PHY_ID_SERDES  }, /* BCM95701A7 */
-+	{ 0x14e4, 0x0008, PHY_ID_BCM5701 }, /* BCM95701A10 */
-+	{ 0x14e4, 0x8008, PHY_ID_BCM5701 }, /* BCM95701A12 */
-+	{ 0x14e4, 0x0009, PHY_ID_BCM5701 }, /* BCM95703Ax1 */
-+	{ 0x14e4, 0x8009, PHY_ID_BCM5701 }, /* BCM95703Ax2 */
-+
-+	/* 3com boards. */
-+	{ PCI_VENDOR_ID_3COM, 0x1000, PHY_ID_BCM5401 }, /* 3C996T */
-+	{ PCI_VENDOR_ID_3COM, 0x1006, PHY_ID_BCM5701 }, /* 3C996BT */
-+	/* { PCI_VENDOR_ID_3COM, 0x1002, PHY_ID_XXX },     3C996CT */
-+	/* { PCI_VENDOR_ID_3COM, 0x1003, PHY_ID_XXX },     3C997T */
-+	{ PCI_VENDOR_ID_3COM, 0x1004, PHY_ID_SERDES  }, /* 3C996SX */
-+	/* { PCI_VENDOR_ID_3COM, 0x1005, PHY_ID_XXX },     3C997SZ */
-+	{ PCI_VENDOR_ID_3COM, 0x1007, PHY_ID_BCM5701 }, /* 3C1000T */
-+	{ PCI_VENDOR_ID_3COM, 0x1008, PHY_ID_BCM5701 }, /* 3C940BR01 */
-+
-+	/* DELL boards. */
-+	{ PCI_VENDOR_ID_DELL, 0x00d1, PHY_ID_BCM5401 }, /* VIPER */
-+	{ PCI_VENDOR_ID_DELL, 0x0106, PHY_ID_BCM5401 }, /* JAGUAR */
-+	{ PCI_VENDOR_ID_DELL, 0x0109, PHY_ID_BCM5411 }, /* MERLOT */
-+	{ PCI_VENDOR_ID_DELL, 0x010a, PHY_ID_BCM5411 }, /* SLIM_MERLOT */
-+
-+	/* Compaq boards. */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x007c, PHY_ID_BCM5701 }, /* BANSHEE */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x009a, PHY_ID_BCM5701 }, /* BANSHEE_2 */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x007d, PHY_ID_SERDES  }, /* CHANGELING */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x0085, PHY_ID_BCM5701 }, /* NC7780 */
-+	{ PCI_VENDOR_ID_COMPAQ, 0x0099, PHY_ID_BCM5701 }  /* NC7780_2 */
-+};
-+
-+static int tg3_phy_probe(struct tg3 *tp)
-+{
-+	uint32_t eeprom_phy_id, hw_phy_id_1, hw_phy_id_2;
-+	uint32_t hw_phy_id, hw_phy_id_masked;
-+	enum phy_led_mode eeprom_led_mode;
-+	uint32_t val;
-+	unsigned i;
-+	int eeprom_signature_found, err;
-+
-+	tp->phy_id = PHY_ID_INVALID;
-+
-+	for (i = 0; i < sizeof(subsys_id_to_phy_id)/sizeof(subsys_id_to_phy_id[0]); i++) {
-+		if ((subsys_id_to_phy_id[i].subsys_vendor == tp->subsystem_vendor) &&
-+			(subsys_id_to_phy_id[i].subsys_devid == tp->subsystem_device)) {
-+			tp->phy_id = subsys_id_to_phy_id[i].phy_id;
-+			break;
-+		}
-+	}
-+
-+	eeprom_phy_id = PHY_ID_INVALID;
-+	eeprom_led_mode = led_mode_auto;
-+	eeprom_signature_found = 0;
-+	tg3_read_mem(NIC_SRAM_DATA_SIG, &val);
-+	if (val == NIC_SRAM_DATA_SIG_MAGIC) {
-+		uint32_t nic_cfg;
-+
-+		tg3_read_mem(NIC_SRAM_DATA_CFG, &nic_cfg);
-+		tp->nic_sram_data_cfg = nic_cfg;
-+
-+		eeprom_signature_found = 1;
-+
-+		if ((nic_cfg & NIC_SRAM_DATA_CFG_PHY_TYPE_MASK) ==
-+		    NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER) {
-+			eeprom_phy_id = PHY_ID_SERDES;
-+		} else {
-+			uint32_t nic_phy_id;
-+
-+			tg3_read_mem(NIC_SRAM_DATA_PHY_ID, &nic_phy_id);
-+			if (nic_phy_id != 0) {
-+				uint32_t id1 = nic_phy_id & NIC_SRAM_DATA_PHY_ID1_MASK;
-+				uint32_t id2 = nic_phy_id & NIC_SRAM_DATA_PHY_ID2_MASK;
-+
-+				eeprom_phy_id  = (id1 >> 16) << 10;
-+				eeprom_phy_id |= (id2 & 0xfc00) << 16;
-+				eeprom_phy_id |= (id2 & 0x03ff) <<  0;
-+			}
-+		}
-+
-+		switch (nic_cfg & NIC_SRAM_DATA_CFG_LED_MODE_MASK) {
-+		case NIC_SRAM_DATA_CFG_LED_TRIPLE_SPD:
-+			eeprom_led_mode = led_mode_three_link;
-+			break;
-+
-+		case NIC_SRAM_DATA_CFG_LED_LINK_SPD:
-+			eeprom_led_mode = led_mode_link10;
-+			break;
-+
-+		default:
-+			eeprom_led_mode = led_mode_auto;
-+			break;
-+		};
-+		if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
-+			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) ||
-+			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705)) &&
-+			(nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP)) {
-+			tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
-+		}
-+
-+		if (nic_cfg & NIC_SRAM_DATA_CFG_ASF_ENABLE)
-+			tp->tg3_flags |= TG3_FLAG_ENABLE_ASF;
-+		if (nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL)
-+			tp->tg3_flags |= TG3_FLAG_SERDES_WOL_CAP;
-+	}
-+
-+	/* Now read the physical PHY_ID from the chip and verify
-+	 * that it is sane.  If it doesn't look good, we fall back
-+	 * to either the hard-coded table based PHY_ID and failing
-+	 * that the value found in the eeprom area.
-+	 */
-+	err  = tg3_readphy(tp, MII_PHYSID1, &hw_phy_id_1);
-+	err |= tg3_readphy(tp, MII_PHYSID2, &hw_phy_id_2);
-+
-+	hw_phy_id  = (hw_phy_id_1 & 0xffff) << 10;
-+	hw_phy_id |= (hw_phy_id_2 & 0xfc00) << 16;
-+	hw_phy_id |= (hw_phy_id_2 & 0x03ff) <<  0;
-+
-+	hw_phy_id_masked = hw_phy_id & PHY_ID_MASK;
-+
-+	if (!err && KNOWN_PHY_ID(hw_phy_id_masked)) {
-+		tp->phy_id = hw_phy_id;
-+	} else {
-+		/* phy_id currently holds the value found in the
-+		 * subsys_id_to_phy_id[] table or PHY_ID_INVALID
-+		 * if a match was not found there.
-+		 */
-+		if (tp->phy_id == PHY_ID_INVALID) {
-+			if (!eeprom_signature_found ||
-+			    !KNOWN_PHY_ID(eeprom_phy_id & PHY_ID_MASK))
-+				return -ENODEV;
-+			tp->phy_id = eeprom_phy_id;
-+		}
-+	}
-+
-+	err = tg3_phy_reset(tp);
-+	if (err)
-+		return err;
-+
-+	if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0 ||
-+	    tp->pci_chip_rev_id == CHIPREV_ID_5701_B0) {
-+		uint32_t mii_tg3_ctrl;
-+		
-+		/* These chips, when reset, only advertise 10Mb
-+		 * capabilities.  Fix that.
-+		 */
-+		err  = tg3_writephy(tp, MII_ADVERTISE,
-+				    (ADVERTISE_CSMA |
-+				     ADVERTISE_PAUSE_CAP |
-+				     ADVERTISE_10HALF |
-+				     ADVERTISE_10FULL |
-+				     ADVERTISE_100HALF |
-+				     ADVERTISE_100FULL));
-+		mii_tg3_ctrl = (MII_TG3_CTRL_ADV_1000_HALF |
-+				MII_TG3_CTRL_ADV_1000_FULL |
-+				MII_TG3_CTRL_AS_MASTER |
-+				MII_TG3_CTRL_ENABLE_AS_MASTER);
-+		if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
-+			mii_tg3_ctrl = 0;
-+
-+		err |= tg3_writephy(tp, MII_TG3_CTRL, mii_tg3_ctrl);
-+		err |= tg3_writephy(tp, MII_BMCR,
-+				    (BMCR_ANRESTART | BMCR_ANENABLE));
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) {
-+		tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
-+		tg3_writephy(tp, MII_TG3_DSP_ADDRESS, 0x201f);
-+		tg3_writedsp(tp, MII_TG3_DSP_RW_PORT, 0x2aaa);
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
-+		tg3_writephy(tp, 0x1c, 0x8d68);
-+		tg3_writephy(tp, 0x1c, 0x8d68);
-+	}
-+
-+	/* Enable Ethernet@WireSpeed */
-+	tg3_phy_set_wirespeed(tp);
-+
-+	if (!err && ((tp->phy_id & PHY_ID_MASK) == PHY_ID_BCM5401)) {
-+		err = tg3_init_5401phy_dsp(tp);
-+	}
-+
-+	/* Determine the PHY led mode. 
-+	 * Be careful if this gets set wrong it can result in an inability to 
-+	 * establish a link.
-+	 */
-+	if (tp->phy_id == PHY_ID_SERDES) {
-+		tp->led_mode = led_mode_three_link;
-+	}
-+	else if (tp->subsystem_vendor == PCI_VENDOR_ID_DELL) {
-+		tp->led_mode = led_mode_link10;
-+	} else {
-+		tp->led_mode = led_mode_three_link;
-+		if (eeprom_signature_found &&
-+		    eeprom_led_mode != led_mode_auto)
-+			tp->led_mode = eeprom_led_mode;
-+	}
-+
-+	if (tp->phy_id == PHY_ID_SERDES)
-+		tp->link_config.advertising =
-+			(ADVERTISED_1000baseT_Half |
-+			 ADVERTISED_1000baseT_Full |
-+			 ADVERTISED_Autoneg |
-+			 ADVERTISED_FIBRE);
-+	if (tp->tg3_flags & TG3_FLAG_10_100_ONLY)
-+		tp->link_config.advertising &=
-+			~(ADVERTISED_1000baseT_Half |
-+			  ADVERTISED_1000baseT_Full);
-+
-+	return err;
-+}
-+
-+#if SUPPORT_PARTNO_STR
-+static void tg3_read_partno(struct tg3 *tp)
-+{
-+	unsigned char vpd_data[256];
-+	int i;
-+
-+	for (i = 0; i < 256; i += 4) {
-+		uint32_t tmp;
-+
-+		if (tg3_nvram_read(tp, 0x100 + i, &tmp))
-+			goto out_not_found;
-+
-+		vpd_data[i + 0] = ((tmp >>  0) & 0xff);
-+		vpd_data[i + 1] = ((tmp >>  8) & 0xff);
-+		vpd_data[i + 2] = ((tmp >> 16) & 0xff);
-+		vpd_data[i + 3] = ((tmp >> 24) & 0xff);
-+	}
-+
-+	/* Now parse and find the part number. */
-+	for (i = 0; i < 256; ) {
-+		unsigned char val = vpd_data[i];
-+		int block_end;
-+
-+		if (val == 0x82 || val == 0x91) {
-+			i = (i + 3 +
-+			     (vpd_data[i + 1] +
-+			      (vpd_data[i + 2] << 8)));
-+			continue;
-+		}
-+
-+		if (val != 0x90)
-+			goto out_not_found;
-+
-+		block_end = (i + 3 +
-+			     (vpd_data[i + 1] +
-+			      (vpd_data[i + 2] << 8)));
-+		i += 3;
-+		while (i < block_end) {
-+			if (vpd_data[i + 0] == 'P' &&
-+			    vpd_data[i + 1] == 'N') {
-+				int partno_len = vpd_data[i + 2];
-+
-+				if (partno_len > 24)
-+					goto out_not_found;
-+
-+				memcpy(tp->board_part_number,
-+				       &vpd_data[i + 3],
-+				       partno_len);
-+
-+				/* Success. */
-+				return;
-+			}
-+		}
-+
-+		/* Part number not found. */
-+		goto out_not_found;
-+	}
-+
-+out_not_found:
-+	memcpy(tp->board_part_number, "none", sizeof("none"));
-+}
-+#else
-+#define tg3_read_partno(TP) ((TP)->board_part_number[0] = '\0')
-+#endif
-+
-+static int tg3_get_invariants(struct tg3 *tp)
-+{
-+	uint32_t misc_ctrl_reg;
-+	uint32_t pci_state_reg, grc_misc_cfg;
-+	uint16_t pci_cmd;
-+	uint8_t  pci_latency;
-+	int err;
-+
-+	/* Read the subsystem vendor and device ids */
-+	pci_read_config_word(tp->pdev, PCI_SUBSYSTEM_VENDOR_ID, &tp->subsystem_vendor);
-+	pci_read_config_word(tp->pdev, PCI_SUBSYSTEM_ID, &tp->subsystem_device);
-+
-+	/* The sun_5704 code needs infrastructure etherboot does have
-+	 * ignore it for now.
-+	 */
-+
-+	/* If we have an AMD 762 or Intel ICH/ICH0 chipset, write
-+	 * reordering to the mailbox registers done by the host
-+	 * controller can cause major troubles.  We read back from
-+	 * every mailbox register write to force the writes to be
-+	 * posted to the chip in order.
-+	 *
-+	 * TG3_FLAG_MBOX_WRITE_REORDER has been forced on.
-+	 */
-+
-+	/* Force memory write invalidate off.  If we leave it on,
-+	 * then on 5700_BX chips we have to enable a workaround.
-+	 * The workaround is to set the TG3PCI_DMA_RW_CTRL boundry
-+	 * to match the cacheline size.  The Broadcom driver have this
-+	 * workaround but turns MWI off all the times so never uses
-+	 * it.  This seems to suggest that the workaround is insufficient.
-+	 */
-+	pci_read_config_word(tp->pdev, PCI_COMMAND, &pci_cmd);
-+	pci_cmd &= ~PCI_COMMAND_INVALIDATE;
-+	/* Also, force SERR#/PERR# in PCI command. */
-+	pci_cmd |= PCI_COMMAND_PARITY | PCI_COMMAND_SERR;
-+	pci_write_config_word(tp->pdev, PCI_COMMAND, pci_cmd);
-+
-+	/* It is absolutely critical that TG3PCI_MISC_HOST_CTRL
-+	 * has the register indirect write enable bit set before
-+	 * we try to access any of the MMIO registers.  It is also
-+	 * critical that the PCI-X hw workaround situation is decided
-+	 * before that as well.
-+	 */
-+	pci_read_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL, &misc_ctrl_reg);
-+
-+	tp->pci_chip_rev_id = (misc_ctrl_reg >> MISC_HOST_CTRL_CHIPREV_SHIFT);
-+
-+	/* Initialize misc host control in PCI block. */
-+	tp->misc_host_ctrl |= (misc_ctrl_reg &
-+			       MISC_HOST_CTRL_CHIPREV);
-+	pci_write_config_dword(tp->pdev, TG3PCI_MISC_HOST_CTRL,
-+			       tp->misc_host_ctrl);
-+
-+	pci_read_config_byte(tp->pdev, PCI_LATENCY_TIMER, &pci_latency);
-+	if (pci_latency < 64) {
-+		pci_write_config_byte(tp->pdev, PCI_LATENCY_TIMER, 64);
-+	}
-+
-+	pci_read_config_dword(tp->pdev, TG3PCI_PCISTATE, &pci_state_reg);
-+
-+	/* If this is a 5700 BX chipset, and we are in PCI-X
-+	 * mode, enable register write workaround.
-+	 *
-+	 * The workaround is to use indirect register accesses
-+	 * for all chip writes not to mailbox registers.
-+	 *
-+	 * In etherboot to simplify things we just always use this work around.
-+	 */
-+	if ((pci_state_reg & PCISTATE_CONV_PCI_MODE) == 0) {
-+		tp->tg3_flags |= TG3_FLAG_PCIX_MODE;
-+	}
-+	/* Back to back register writes can cause problems on the 5701,
-+	 * the workaround is to read back all reg writes except those to
-+	 * mailbox regs.
-+	 * In etherboot we always use indirect register accesses so
-+	 * we don't see this.
-+	 */
-+
-+	if ((pci_state_reg & PCISTATE_BUS_SPEED_HIGH) != 0)
-+		tp->tg3_flags |= TG3_FLAG_PCI_HIGH_SPEED;
-+	if ((pci_state_reg & PCISTATE_BUS_32BIT) != 0)
-+		tp->tg3_flags |= TG3_FLAG_PCI_32BIT;
-+
-+	/* Chip-specific fixup from Broadcom driver */
-+	if ((tp->pci_chip_rev_id == CHIPREV_ID_5704_A0) &&
-+	    (!(pci_state_reg & PCISTATE_RETRY_SAME_DMA))) {
-+		pci_state_reg |= PCISTATE_RETRY_SAME_DMA;
-+		pci_write_config_dword(tp->pdev, TG3PCI_PCISTATE, pci_state_reg);
-+	}
-+
-+	/* Force the chip into D0. */
-+	tg3_set_power_state_0(tp);
-+
-+	/* Etherboot does not ask the tg3 to do checksums */
-+	/* Etherboot does not ask the tg3 to do jumbo frames */
-+	/* Ehterboot does not ask the tg3 to use WakeOnLan. */
-+
-+	/* A few boards don't want Ethernet@WireSpeed phy feature */
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700) ||
-+		((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
-+			(tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) &&
-+			(tp->pci_chip_rev_id != CHIPREV_ID_5705_A1))) {
-+		tp->tg3_flags2 |= TG3_FLG2_NO_ETH_WIRE_SPEED;
-+	}
-+
-+	/* Avoid tagged irq status etherboot does not use irqs */
-+
-+	/* Only 5701 and later support tagged irq status mode.
-+	 * Also, 5788 chips cannot use tagged irq status.
-+	 *
-+	 * However, since etherboot does not use irqs avoid tagged irqs
-+	 * status  because the interrupt condition is more difficult to
-+	 * fully clear in that mode.
-+	 */
-+	
-+	/* Since some 5700_AX && 5700_BX have problems with 32BYTE
-+	 * coalesce_mode, and the rest work fine anything set.
-+	 * Don't enable HOST_CC_MODE_32BYTE in etherboot.
-+	 */
-+
-+	/* Initialize MAC MI mode, polling disabled. */
-+	tw32_carefully(MAC_MI_MODE, tp->mi_mode);
-+
-+	/* Initialize data/descriptor byte/word swapping. */
-+	tw32(GRC_MODE, tp->grc_mode);
-+
-+	tg3_switch_clocks(tp);
-+
-+	/* Clear this out for sanity. */
-+	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
-+
-+	/* Etherboot does not need to check if the PCIX_TARGET_HWBUG
-+	 * is needed.  It always uses it.
-+	 */
-+	
-+	udelay(50);
-+	tg3_nvram_init(tp);
-+
-+	/* The TX descriptors will reside in main memory.
-+	 */
-+
-+	/* See which board we are using.
-+	 */
-+	grc_misc_cfg = tr32(GRC_MISC_CFG);
-+	grc_misc_cfg &= GRC_MISC_CFG_BOARD_ID_MASK;
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704 &&
-+	    grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5704CIOBE) {
-+		tp->tg3_flags |= TG3_FLAG_SPLIT_MODE;
-+		tp->split_mode_max_reqs = SPLIT_MODE_5704_MAX_REQ;
-+	}
-+
-+	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-+	    (grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788 ||
-+	     grc_misc_cfg == GRC_MISC_CFG_BOARD_ID_5788M))
-+		tp->tg3_flags2 |= TG3_FLG2_IS_5788;
-+
-+	/* these are limited to 10/100 only */
-+	if (((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) &&
-+		    ((grc_misc_cfg == 0x8000) || (grc_misc_cfg == 0x4000))) ||
-+		((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) &&
-+			(tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM) &&
-+			((tp->pdev->dev_id == PCI_DEVICE_ID_TIGON3_5901) ||
-+				(tp->pdev->dev_id == PCI_DEVICE_ID_TIGON3_5901_2)))) {
-+		tp->tg3_flags |= TG3_FLAG_10_100_ONLY;
-+	}
-+
-+	err = tg3_phy_probe(tp);
-+	if (err) {
-+		printf("phy probe failed, err %d\n", err);
-+	}
-+
-+	tg3_read_partno(tp);
-+
-+
-+	/* 5700 BX chips need to have their TX producer index mailboxes
-+	 * written twice to workaround a bug.
-+	 * In etherboot we do this unconditionally to simplify things.
-+	 */
-+
-+	/* 5700 chips can get confused if TX buffers straddle the
-+	 * 4GB address boundary in some cases.
-+	 * 
-+	 * In etherboot we can ignore the problem as etherboot lives below 4GB.
-+	 */
-+
-+	/* In etherboot wake-on-lan is unconditionally disabled */
-+	return err;
-+}
-+
-+static int  tg3_get_device_address(struct tg3 *tp)
-+{
-+	struct nic *nic = tp->nic;
-+	uint32_t hi, lo, mac_offset;
-+
-+	if (PCI_FUNC(tp->pdev->devfn) == 0)
-+		mac_offset = 0x7c;
-+	else
-+		mac_offset = 0xcc;
-+
-+	/* First try to get it from MAC address mailbox. */
-+	tg3_read_mem(NIC_SRAM_MAC_ADDR_HIGH_MBOX, &hi);
-+	if ((hi >> 16) == 0x484b) {
-+		nic->node_addr[0] = (hi >>  8) & 0xff;
-+		nic->node_addr[1] = (hi >>  0) & 0xff;
-+
-+		tg3_read_mem(NIC_SRAM_MAC_ADDR_LOW_MBOX, &lo);
-+		nic->node_addr[2] = (lo >> 24) & 0xff;
-+		nic->node_addr[3] = (lo >> 16) & 0xff;
-+		nic->node_addr[4] = (lo >>  8) & 0xff;
-+		nic->node_addr[5] = (lo >>  0) & 0xff;
-+	}
-+	/* Next, try NVRAM. */
-+	else if (!tg3_nvram_read(tp, mac_offset + 0, &hi) &&
-+		 !tg3_nvram_read(tp, mac_offset + 4, &lo)) {
-+		nic->node_addr[0] = ((hi >> 16) & 0xff);
-+		nic->node_addr[1] = ((hi >> 24) & 0xff);
-+		nic->node_addr[2] = ((lo >>  0) & 0xff);
-+		nic->node_addr[3] = ((lo >>  8) & 0xff);
-+		nic->node_addr[4] = ((lo >> 16) & 0xff);
-+		nic->node_addr[5] = ((lo >> 24) & 0xff);
-+	}
-+	/* Finally just fetch it out of the MAC control regs. */
-+	else {
-+		hi = tr32(MAC_ADDR_0_HIGH);
-+		lo = tr32(MAC_ADDR_0_LOW);
-+
-+		nic->node_addr[5] = lo & 0xff;
-+		nic->node_addr[4] = (lo >> 8) & 0xff;
-+		nic->node_addr[3] = (lo >> 16) & 0xff;
-+		nic->node_addr[2] = (lo >> 24) & 0xff;
-+		nic->node_addr[1] = hi & 0xff;
-+		nic->node_addr[0] = (hi >> 8) & 0xff;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int tg3_setup_dma(struct tg3 *tp)
-+{
-+	tw32(TG3PCI_CLOCK_CTRL, 0);
-+
-+	if ((tp->tg3_flags & TG3_FLAG_PCIX_MODE) == 0) {
-+		tp->dma_rwctrl =
-+			(0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
-+			(0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT) |
-+			(0x7 << DMA_RWCTRL_WRITE_WATER_SHIFT) |
-+			(0x7 << DMA_RWCTRL_READ_WATER_SHIFT) |
-+			(0x0f << DMA_RWCTRL_MIN_DMA_SHIFT);
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
-+			tp->dma_rwctrl &= ~(DMA_RWCTRL_MIN_DMA << DMA_RWCTRL_MIN_DMA_SHIFT);
-+		}
-+	} else {
-+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)
-+			tp->dma_rwctrl =
-+				(0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
-+				(0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT) |
-+				(0x3 << DMA_RWCTRL_WRITE_WATER_SHIFT) |
-+				(0x7 << DMA_RWCTRL_READ_WATER_SHIFT) |
-+				(0x00 << DMA_RWCTRL_MIN_DMA_SHIFT);
-+		else
-+			tp->dma_rwctrl =
-+				(0x7 << DMA_RWCTRL_PCI_WRITE_CMD_SHIFT) |
-+				(0x6 << DMA_RWCTRL_PCI_READ_CMD_SHIFT) |
-+				(0x3 << DMA_RWCTRL_WRITE_WATER_SHIFT) |
-+				(0x3 << DMA_RWCTRL_READ_WATER_SHIFT) |
-+				(0x0f << DMA_RWCTRL_MIN_DMA_SHIFT);
-+
-+		/* Wheee, some more chip bugs... */
-+		if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
-+			(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)) {
-+			uint32_t ccval = tr32(TG3PCI_CLOCK_CTRL) & 0x1f;
-+
-+			if ((ccval == 0x6) || (ccval == 0x7)) {
-+				tp->dma_rwctrl |= DMA_RWCTRL_ONE_DMA;
-+			}
-+		}
-+	}
-+
-+	if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5703) ||
-+		(GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704)) {
-+		tp->dma_rwctrl &= ~(DMA_RWCTRL_MIN_DMA << DMA_RWCTRL_MIN_DMA_SHIFT);
-+	}
-+
-+	tp->dma_rwctrl |= DMA_RWCTRL_ASSERT_ALL_BE;
-+
-+	tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
-+
-+	return 0;
-+}
-+
-+static void tg3_init_link_config(struct tg3 *tp)
-+{
-+	tp->link_config.advertising =
-+		(ADVERTISED_10baseT_Half | ADVERTISED_10baseT_Full |
-+		 ADVERTISED_100baseT_Half | ADVERTISED_100baseT_Full |
-+		 ADVERTISED_1000baseT_Half | ADVERTISED_1000baseT_Full |
-+		 ADVERTISED_Autoneg | ADVERTISED_MII);
-+	tp->carrier_ok = 0;
-+	tp->link_config.active_speed = SPEED_INVALID;
-+	tp->link_config.active_duplex = DUPLEX_INVALID;
-+}
-+
-+
-+#if SUPPORT_PHY_STR
-+static const char * tg3_phy_string(struct tg3 *tp)
-+{
-+	switch (tp->phy_id & PHY_ID_MASK) {
-+	case PHY_ID_BCM5400:	return "5400";
-+	case PHY_ID_BCM5401:	return "5401";
-+	case PHY_ID_BCM5411:	return "5411";
-+	case PHY_ID_BCM5701:	return "5701";
-+	case PHY_ID_BCM5703:	return "5703";
-+	case PHY_ID_BCM5704:	return "5704";
-+	case PHY_ID_BCM8002:	return "8002";
-+	case PHY_ID_SERDES:	return "serdes";
-+	default:		return "unknown";
-+	};
-+}
-+#else
-+#define tg3_phy_string(TP) "?"
-+#endif
-+
-+
-+static void tg3_poll_link(struct tg3 *tp)
-+{
-+	uint32_t mac_stat;
-+
-+	mac_stat = tr32(MAC_STATUS);
-+	if (tp->phy_id == PHY_ID_SERDES) {
-+		if (tp->carrier_ok?
-+			(mac_stat & MAC_STATUS_LNKSTATE_CHANGED):
-+			(mac_stat & MAC_STATUS_PCS_SYNCED)) {
-+			tw32_carefully(MAC_MODE, tp->mac_mode & ~MAC_MODE_PORT_MODE_MASK);
-+			tw32_carefully(MAC_MODE, tp->mac_mode);
-+
-+			tg3_setup_phy(tp);
-+		}
-+	}
-+	else {
-+		if (mac_stat & MAC_STATUS_LNKSTATE_CHANGED) {
-+			tg3_setup_phy(tp);
-+		}
-+	}
-+}
-+
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static void tg3_ack_irqs(struct tg3 *tp)
-+{
-+	if (tp->hw_status->status & SD_STATUS_UPDATED) {
-+		/*
-+		 * writing any value to intr-mbox-0 clears PCI INTA# and
-+		 * chip-internal interrupt pending events.
-+		 * writing non-zero to intr-mbox-0 additional tells the
-+		 * NIC to stop sending us irqs, engaging "in-intr-handler"
-+		 * event coalescing.
-+		 */
-+		tw32_mailbox(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW, 
-+			0x00000001);
-+		/*
-+		 * Flush PCI write.  This also guarantees that our
-+		 * status block has been flushed to host memory.
-+		 */
-+		tr32(MAILBOX_INTERRUPT_0 + TG3_64BIT_REG_LOW);
-+		tp->hw_status->status &= ~SD_STATUS_UPDATED;
-+	}
-+}
-+
-+static int tg3_poll(struct nic *nic, int retrieve)
-+{
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+
-+	struct tg3 *tp = &tg3;
-+	int result;
-+
-+	result = 0;
-+
-+	if ( (tp->hw_status->idx[0].rx_producer != tp->rx_rcb_ptr) && !retrieve ) 
-+	  return 1;
-+
-+	tg3_ack_irqs(tp);
-+
-+	if (tp->hw_status->idx[0].rx_producer != tp->rx_rcb_ptr) {
-+		struct tg3_rx_buffer_desc *desc;
-+		unsigned int len;
-+		desc = &tp->rx_rcb[tp->rx_rcb_ptr];
-+		if ((desc->opaque & RXD_OPAQUE_RING_MASK) == RXD_OPAQUE_RING_STD) {
-+			len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - 4; /* omit crc */
-+			
-+			nic->packetlen = len;
-+			memcpy(nic->packet, bus_to_virt(desc->addr_lo), len);
-+			result = 1;
-+		}
-+		tp->rx_rcb_ptr = (tp->rx_rcb_ptr + 1) % TG3_RX_RCB_RING_SIZE;
-+		
-+		/* ACK the status ring */
-+		tw32_mailbox2(MAILBOX_RCVRET_CON_IDX_0 + TG3_64BIT_REG_LOW, tp->rx_rcb_ptr);
-+
-+		/* Refill RX ring. */
-+		if (result) {
-+			tp->rx_std_ptr = (tp->rx_std_ptr + 1) % TG3_RX_RING_SIZE;
-+			tw32_mailbox2(MAILBOX_RCV_STD_PROD_IDX + TG3_64BIT_REG_LOW, tp->rx_std_ptr);
-+		}
-+	}
-+	tg3_poll_link(tp);
-+	return result;
-+}
-+
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+#if 0
-+static void tg3_set_txd(struct tg3 *tp, int entry,
-+	dma_addr_t mapping, int len, uint32_t flags,
-+	uint32_t mss_and_is_end)
-+{
-+	struct tg3_tx_buffer_desc *txd =  &tp->tx_ring[entry];
-+	int is_end = (mss_and_is_end & 0x1);
-+	if (is_end) {
-+		flags |= TXD_FLAG_END;
-+	}
-+
-+	txd->addr_hi   = 0;
-+	txd->addr_lo   = mapping & 0xffffffff;
-+	txd->len_flags = (len << TXD_LEN_SHIFT) | flags;
-+	txd->vlan_tag  = 0 << TXD_VLAN_TAG_SHIFT;
-+}
-+#endif
-+
-+static void tg3_transmit(struct nic *nic, const char *dst_addr,
-+	unsigned int type, unsigned int size, const char *packet)
-+{
-+	static struct eth_frame {
-+		uint8_t  dst_addr[ETH_ALEN];
-+		uint8_t  src_addr[ETH_ALEN];
-+		uint16_t type;
-+		uint8_t  data [ETH_FRAME_LEN - ETH_HLEN];
-+	} frame[2];
-+	static int frame_idx;
-+	
-+	/* send the packet to destination */
-+	struct tg3_tx_buffer_desc *txd;
-+	struct tg3 *tp;
-+	uint32_t entry;
-+	int i;
-+
-+	/* Wait until there is a free packet frame */
-+	tp = &tg3;
-+	i = 0;
-+	entry = tp->tx_prod;
-+	while((tp->hw_status->idx[0].tx_consumer != entry) &&
-+		(tp->hw_status->idx[0].tx_consumer != PREV_TX(entry))) {
-+		mdelay(10);	/* give the nick a chance */
-+		poll_interruptions();
-+		if (++i > 500) { /* timeout 5s for transmit */
-+			printf("transmit timed out\n");
-+			tg3_halt(tp);
-+			tg3_setup_hw(tp);
-+			return;
-+		}
-+	}
-+	if (i != 0) {
-+		printf("#");
-+	}
-+	
-+	/* Copy the packet to the our local buffer */
-+	memcpy(&frame[frame_idx].dst_addr, dst_addr, ETH_ALEN);
-+	memcpy(&frame[frame_idx].src_addr, nic->node_addr, ETH_ALEN);
-+	frame[frame_idx].type = htons(type);
-+	memset(&frame[frame_idx].data, 0, sizeof(frame[frame_idx].data));
-+	memcpy(&frame[frame_idx].data, packet, size);
-+
-+	/* Setup the ring buffer entry to transmit */
-+	txd            = &tp->tx_ring[entry];
-+	txd->addr_hi   = 0; /* Etherboot runs under 4GB */
-+	txd->addr_lo   = virt_to_bus(&frame[frame_idx]);
-+	txd->len_flags = ((size + ETH_HLEN) << TXD_LEN_SHIFT) | TXD_FLAG_END;
-+	txd->vlan_tag  = 0 << TXD_VLAN_TAG_SHIFT;
-+
-+	/* Advance to the next entry */
-+	entry = NEXT_TX(entry);
-+	frame_idx ^= 1;
-+
-+	/* Packets are ready, update Tx producer idx local and on card */
-+	tw32_mailbox((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
-+	tw32_mailbox2((MAILBOX_SNDHOST_PROD_IDX_0 + TG3_64BIT_REG_LOW), entry);
-+	tp->tx_prod = entry;
-+}
-+
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+static void tg3_disable(struct dev *dev __unused)
-+{
-+	struct tg3 *tp = &tg3;
-+	/* put the card in its initial state */
-+	/* This function serves 3 purposes.
-+	 * This disables DMA and interrupts so we don't receive
-+	 *  unexpected packets or interrupts from the card after
-+	 *  etherboot has finished. 
-+	 * This frees resources so etherboot may use
-+	 *  this driver on another interface
-+	 * This allows etherboot to reinitialize the interface
-+	 *  if something is something goes wrong.
-+	 */
-+	tg3_halt(tp);
-+	tp->tg3_flags &= ~(TG3_FLAG_INIT_COMPLETE|TG3_FLAG_GOT_SERDES_FLOWCTL);
-+	tp->carrier_ok = 0;
-+	iounmap((void *)tp->regs);
-+}
-+
-+/**************************************************************************
-+IRQ - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void tg3_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+You should omit the last argument struct pci_device * for a non-PCI NIC
-+***************************************************************************/
-+static int tg3_probe(struct dev *dev, struct pci_device *pdev)
-+{
-+	struct nic *nic = (struct nic *)dev;
-+	struct tg3 *tp = &tg3;
-+	unsigned long tg3reg_base, tg3reg_len;
-+	int i, err, pm_cap;
-+
-+	if (pdev == 0)
-+		return 0;
-+
-+	memset(tp, 0, sizeof(*tp));
-+
-+	adjust_pci_device(pdev);
-+
-+	nic->irqno  = 0;
-+	nic->ioaddr = pdev->ioaddr & ~3;
-+
-+	/* Find power-management capability. */
-+	pm_cap = pci_find_capability(pdev, PCI_CAP_ID_PM);
-+	if (pm_cap == 0) {
-+		printf("Cannot find PowerManagement capability, aborting.\n");
-+		return 0;
-+	}
-+	tg3reg_base = pci_bar_start(pdev, PCI_BASE_ADDRESS_0);
-+	if (tg3reg_base == -1UL) {
-+		printf("Unuseable bar\n");
-+		return 0;
-+	}
-+	tg3reg_len  = pci_bar_size(pdev,  PCI_BASE_ADDRESS_0);
-+
-+	tp->pdev       = pdev;
-+	tp->nic        = nic;
-+	tp->pm_cap     = pm_cap;
-+	tp->rx_mode    = 0;
-+	tp->tx_mode    = 0;
-+	tp->mi_mode    = MAC_MI_MODE_BASE;
-+	tp->tg3_flags  = 0 & ~TG3_FLAG_INIT_COMPLETE; 
-+	
-+	/* The word/byte swap controls here control register access byte
-+	 * swapping.  DMA data byte swapping is controlled in the GRC_MODE
-+	 * setting below.
-+	 */
-+	tp->misc_host_ctrl =
-+		MISC_HOST_CTRL_MASK_PCI_INT |
-+		MISC_HOST_CTRL_WORD_SWAP |
-+		MISC_HOST_CTRL_INDIR_ACCESS |
-+		MISC_HOST_CTRL_PCISTATE_RW;
-+
-+	/* The NONFRM (non-frame) byte/word swap controls take effect
-+	 * on descriptor entries, anything which isn't packet data.
-+	 *
-+	 * The StrongARM chips on the board (one for tx, one for rx)
-+	 * are running in big-endian mode.
-+	 */
-+	tp->grc_mode = (GRC_MODE_WSWAP_DATA | GRC_MODE_BSWAP_DATA |
-+			GRC_MODE_WSWAP_NONFRM_DATA);
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+	tp->grc_mode |= GRC_MODE_BSWAP_NONFRM_DATA;
-+#endif
-+	tp->regs = (unsigned long) ioremap(tg3reg_base, tg3reg_len);
-+	if (tp->regs == 0UL) {
-+		printf("Cannot map device registers, aborting\n");
-+		return 0;
-+	}
-+
-+	tg3_init_link_config(tp);
-+
-+	err = tg3_get_invariants(tp);
-+	if (err) {
-+		printf("Problem fetching invariants of chip, aborting.\n");
-+		goto err_out_iounmap;
-+	}
-+
-+	err = tg3_get_device_address(tp);
-+	if (err) {
-+		printf("Could not obtain valid ethernet address, aborting.\n");
-+		goto err_out_iounmap;
-+	}
-+	printf("Ethernet addr: %!\n", nic->node_addr);
-+
-+	tg3_setup_dma(tp);
-+
-+	/* Now that we have fully setup the chip, save away a snapshot
-+	 * of the PCI config space.  We need to restore this after
-+	 * GRC_MISC_CFG core clock resets and some resume events.
-+	 */
-+	pci_save_state(tp->pdev, tp->pci_cfg_state);
-+
-+	printf("Tigon3 [partno(%s) rev %hx PHY(%s)] (PCI%s:%s:%s)\n",
-+		tp->board_part_number,
-+		tp->pci_chip_rev_id,
-+		tg3_phy_string(tp),
-+		((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "X" : ""),
-+		((tp->tg3_flags & TG3_FLAG_PCI_HIGH_SPEED) ?
-+			((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "133MHz" : "66MHz") :
-+			((tp->tg3_flags & TG3_FLAG_PCIX_MODE) ? "100MHz" : "33MHz")),
-+		((tp->tg3_flags & TG3_FLAG_PCI_32BIT) ? "32-bit" : "64-bit"));
-+
-+
-+	err = tg3_setup_hw(tp); 
-+	if (err) {
-+		goto err_out_disable;
-+	} 
-+	tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE;
-+
-+	/* Wait for a reasonable time for the link to come up */
-+	tg3_poll_link(tp);
-+	for(i = 0; !tp->carrier_ok && (i < VALID_LINK_TIMEOUT*100); i++) {
-+		mdelay(1);
-+		tg3_poll_link(tp);
-+	}
-+	if (!tp->carrier_ok){
-+		printf("Valid link not established\n");
-+		goto err_out_disable;
-+	}
-+
-+	dev->disable  = tg3_disable;
-+	nic->poll     = tg3_poll;
-+	nic->transmit = tg3_transmit;
-+	nic->irq      = tg3_irq;
-+
-+	return 1;
-+
-+ err_out_iounmap:
-+	iounmap((void *)tp->regs);
-+	return 0;
-+ err_out_disable:
-+	tg3_disable(dev);
-+	return 0;
-+}
-+
-+static struct pci_id tg3_nics[] = {
-+PCI_ROM(0x14e4, 0x1644, "tg3-5700",        "Broadcom Tigon 3 5700"),
-+PCI_ROM(0x14e4, 0x1645, "tg3-5701",        "Broadcom Tigon 3 5701"),
-+PCI_ROM(0x14e4, 0x1646, "tg3-5702",        "Broadcom Tigon 3 5702"),
-+PCI_ROM(0x14e4, 0x1647, "tg3-5703",        "Broadcom Tigon 3 5703"),
-+PCI_ROM(0x14e4, 0x1648, "tg3-5704",        "Broadcom Tigon 3 5704"),
-+PCI_ROM(0x14e4, 0x164d, "tg3-5702FE",      "Broadcom Tigon 3 5702FE"),
-+PCI_ROM(0x14e4, 0x1653, "tg3-5705",        "Broadcom Tigon 3 5705"),
-+PCI_ROM(0x14e4, 0x1654, "tg3-5705_2",      "Broadcom Tigon 3 5705_2"),
-+PCI_ROM(0x14e4, 0x165d, "tg3-5705M",       "Broadcom Tigon 3 5705M"),
-+PCI_ROM(0x14e4, 0x165e, "tg3-5705M_2",     "Broadcom Tigon 3 5705M_2"),
-+PCI_ROM(0x14e4, 0x1696, "tg3-5782",        "Broadcom Tigon 3 5782"),
-+PCI_ROM(0x14e4, 0x169c, "tg3-5788",        "Broadcom Tigon 3 5788"),
-+PCI_ROM(0x14e4, 0x16a6, "tg3-5702X",       "Broadcom Tigon 3 5702X"),
-+PCI_ROM(0x14e4, 0x16a7, "tg3-5703X",       "Broadcom Tigon 3 5703X"),
-+PCI_ROM(0x14e4, 0x16a8, "tg3-5704S",       "Broadcom Tigon 3 5704S"),
-+PCI_ROM(0x14e4, 0x16c6, "tg3-5702A3",      "Broadcom Tigon 3 5702A3"),
-+PCI_ROM(0x14e4, 0x16c7, "tg3-5703A3",      "Broadcom Tigon 3 5703A3"),
-+PCI_ROM(0x14e4, 0x170d, "tg3-5901",        "Broadcom Tigon 3 5901"),
-+PCI_ROM(0x14e4, 0x170e, "tg3-5901_2",      "Broadcom Tigon 3 5901_2"),
-+PCI_ROM(0x1148, 0x4400, "tg3-9DXX",        "Syskonnect 9DXX"),
-+PCI_ROM(0x1148, 0x4500, "tg3-9MXX",        "Syskonnect 9MXX"),
-+PCI_ROM(0x173b, 0x03e8, "tg3-ac1000",      "Altima AC1000"),
-+PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001"),
-+PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100"),
-+PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003"),
-+};
-+
-+struct pci_driver tg3_driver = {
-+	.type	  = NIC_DRIVER,
-+	.name	  = "TG3",
-+	.probe	  = tg3_probe,
-+	.ids	  = tg3_nics,
-+	.id_count = sizeof(tg3_nics)/sizeof(tg3_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/tg3.h
-===================================================================
---- /dev/null
-+++ b/netboot/tg3.h
-@@ -0,0 +1,2203 @@
-+/* $Id: grub-0.95-diskless-patch-2.patch,v 1.1.1.1 2005/06/14 08:18:50 wesolows Exp $
-+ * tg3.h: Definitions for Broadcom Tigon3 ethernet driver.
-+ *
-+ * Copyright (C) 2001, 2002 David S. Miller (davem@redhat.com)
-+ * Copyright (C) 2001 Jeff Garzik (jgarzik@mandrakesoft.com)
-+ */
-+
-+#ifndef _T3_H
-+#define _T3_H
-+
-+#include "stdint.h"
-+
-+typedef unsigned long dma_addr_t;
-+
-+/* From mii.h */
-+
-+/* Indicates what features are advertised by the interface. */
-+#define ADVERTISED_10baseT_Half		(1 << 0)
-+#define ADVERTISED_10baseT_Full		(1 << 1)
-+#define ADVERTISED_100baseT_Half	(1 << 2)
-+#define ADVERTISED_100baseT_Full	(1 << 3)
-+#define ADVERTISED_1000baseT_Half	(1 << 4)
-+#define ADVERTISED_1000baseT_Full	(1 << 5)
-+#define ADVERTISED_Autoneg		(1 << 6)
-+#define ADVERTISED_TP			(1 << 7)
-+#define ADVERTISED_AUI			(1 << 8)
-+#define ADVERTISED_MII			(1 << 9)
-+#define ADVERTISED_FIBRE		(1 << 10)
-+#define ADVERTISED_BNC			(1 << 11)
-+
-+/* The following are all involved in forcing a particular link
-+ * mode for the device for setting things.  When getting the
-+ * devices settings, these indicate the current mode and whether
-+ * it was foced up into this mode or autonegotiated.
-+ */
-+
-+/* The forced speed, 10Mb, 100Mb, gigabit. */
-+#define SPEED_10		0
-+#define SPEED_100		1
-+#define SPEED_1000		2
-+#define SPEED_INVALID           3
-+
-+
-+/* Duplex, half or full. */
-+#define DUPLEX_HALF		0x00
-+#define DUPLEX_FULL		0x01
-+#define DUPLEX_INVALID          0x02
-+
-+/* Which connector port. */
-+#define PORT_TP			0x00
-+#define PORT_AUI		0x01
-+#define PORT_MII		0x02
-+#define PORT_FIBRE		0x03
-+#define PORT_BNC		0x04
-+
-+/* Which tranceiver to use. */
-+#define XCVR_INTERNAL		0x00
-+#define XCVR_EXTERNAL		0x01
-+#define XCVR_DUMMY1		0x02
-+#define XCVR_DUMMY2		0x03
-+#define XCVR_DUMMY3		0x04
-+
-+/* Enable or disable autonegotiation.  If this is set to enable,
-+ * the forced link modes above are completely ignored.
-+ */
-+#define AUTONEG_DISABLE		0x00
-+#define AUTONEG_ENABLE		0x01
-+
-+/* Wake-On-Lan options. */
-+#define WAKE_PHY		(1 << 0)
-+#define WAKE_UCAST		(1 << 1)
-+#define WAKE_MCAST		(1 << 2)
-+#define WAKE_BCAST		(1 << 3)
-+#define WAKE_ARP		(1 << 4)
-+#define WAKE_MAGIC		(1 << 5)
-+#define WAKE_MAGICSECURE	(1 << 6) /* only meaningful if WAKE_MAGIC */
-+
-+/* Generic MII registers. */
-+
-+#define MII_BMCR            0x00        /* Basic mode control register */
-+#define MII_BMSR            0x01        /* Basic mode status register  */
-+#define MII_PHYSID1         0x02        /* PHYS ID 1                   */
-+#define MII_PHYSID2         0x03        /* PHYS ID 2                   */
-+#define MII_ADVERTISE       0x04        /* Advertisement control reg   */
-+#define MII_LPA             0x05        /* Link partner ability reg    */
-+#define MII_EXPANSION       0x06        /* Expansion register          */
-+#define MII_DCOUNTER        0x12        /* Disconnect counter          */
-+#define MII_FCSCOUNTER      0x13        /* False carrier counter       */
-+#define MII_NWAYTEST        0x14        /* N-way auto-neg test reg     */
-+#define MII_RERRCOUNTER     0x15        /* Receive error counter       */
-+#define MII_SREVISION       0x16        /* Silicon revision            */
-+#define MII_RESV1           0x17        /* Reserved...                 */
-+#define MII_LBRERROR        0x18        /* Lpback, rx, bypass error    */
-+#define MII_PHYADDR         0x19        /* PHY address                 */
-+#define MII_RESV2           0x1a        /* Reserved...                 */
-+#define MII_TPISTATUS       0x1b        /* TPI status for 10mbps       */
-+#define MII_NCONFIG         0x1c        /* Network interface config    */
-+
-+/* Basic mode control register. */
-+#define BMCR_RESV               0x007f  /* Unused...                   */
-+#define BMCR_CTST               0x0080  /* Collision test              */
-+#define BMCR_FULLDPLX           0x0100  /* Full duplex                 */
-+#define BMCR_ANRESTART          0x0200  /* Auto negotiation restart    */
-+#define BMCR_ISOLATE            0x0400  /* Disconnect DP83840 from MII */
-+#define BMCR_PDOWN              0x0800  /* Powerdown the DP83840       */
-+#define BMCR_ANENABLE           0x1000  /* Enable auto negotiation     */
-+#define BMCR_SPEED100           0x2000  /* Select 100Mbps              */
-+#define BMCR_LOOPBACK           0x4000  /* TXD loopback bits           */
-+#define BMCR_RESET              0x8000  /* Reset the DP83840           */
-+
-+/* Basic mode status register. */
-+#define BMSR_ERCAP              0x0001  /* Ext-reg capability          */
-+#define BMSR_JCD                0x0002  /* Jabber detected             */
-+#define BMSR_LSTATUS            0x0004  /* Link status                 */
-+#define BMSR_ANEGCAPABLE        0x0008  /* Able to do auto-negotiation */
-+#define BMSR_RFAULT             0x0010  /* Remote fault detected       */
-+#define BMSR_ANEGCOMPLETE       0x0020  /* Auto-negotiation complete   */
-+#define BMSR_RESV               0x07c0  /* Unused...                   */
-+#define BMSR_10HALF             0x0800  /* Can do 10mbps, half-duplex  */
-+#define BMSR_10FULL             0x1000  /* Can do 10mbps, full-duplex  */
-+#define BMSR_100HALF            0x2000  /* Can do 100mbps, half-duplex */
-+#define BMSR_100FULL            0x4000  /* Can do 100mbps, full-duplex */
-+#define BMSR_100BASE4           0x8000  /* Can do 100mbps, 4k packets  */
-+
-+/* Advertisement control register. */
-+#define ADVERTISE_SLCT          0x001f  /* Selector bits               */
-+#define ADVERTISE_CSMA          0x0001  /* Only selector supported     */
-+#define ADVERTISE_10HALF        0x0020  /* Try for 10mbps half-duplex  */
-+#define ADVERTISE_10FULL        0x0040  /* Try for 10mbps full-duplex  */
-+#define ADVERTISE_100HALF       0x0080  /* Try for 100mbps half-duplex */
-+#define ADVERTISE_100FULL       0x0100  /* Try for 100mbps full-duplex */
-+#define ADVERTISE_100BASE4      0x0200  /* Try for 100mbps 4k packets  */
-+#define ADVERTISE_RESV          0x1c00  /* Unused...                   */
-+#define ADVERTISE_RFAULT        0x2000  /* Say we can detect faults    */
-+#define ADVERTISE_LPACK         0x4000  /* Ack link partners response  */
-+#define ADVERTISE_NPAGE         0x8000  /* Next page bit               */
-+
-+#define ADVERTISE_FULL (ADVERTISE_100FULL | ADVERTISE_10FULL | \
-+			ADVERTISE_CSMA)
-+#define ADVERTISE_ALL (ADVERTISE_10HALF | ADVERTISE_10FULL | \
-+                       ADVERTISE_100HALF | ADVERTISE_100FULL)
-+
-+/* Link partner ability register. */
-+#define LPA_SLCT                0x001f  /* Same as advertise selector  */
-+#define LPA_10HALF              0x0020  /* Can do 10mbps half-duplex   */
-+#define LPA_10FULL              0x0040  /* Can do 10mbps full-duplex   */
-+#define LPA_100HALF             0x0080  /* Can do 100mbps half-duplex  */
-+#define LPA_100FULL             0x0100  /* Can do 100mbps full-duplex  */
-+#define LPA_100BASE4            0x0200  /* Can do 100mbps 4k packets   */
-+#define LPA_RESV                0x1c00  /* Unused...                   */
-+#define LPA_RFAULT              0x2000  /* Link partner faulted        */
-+#define LPA_LPACK               0x4000  /* Link partner acked us       */
-+#define LPA_NPAGE               0x8000  /* Next page bit               */
-+
-+#define LPA_DUPLEX		(LPA_10FULL | LPA_100FULL)
-+#define LPA_100			(LPA_100FULL | LPA_100HALF | LPA_100BASE4)
-+
-+/* Expansion register for auto-negotiation. */
-+#define EXPANSION_NWAY          0x0001  /* Can do N-way auto-nego      */
-+#define EXPANSION_LCWP          0x0002  /* Got new RX page code word   */
-+#define EXPANSION_ENABLENPAGE   0x0004  /* This enables npage words    */
-+#define EXPANSION_NPCAPABLE     0x0008  /* Link partner supports npage */
-+#define EXPANSION_MFAULTS       0x0010  /* Multiple faults detected    */
-+#define EXPANSION_RESV          0xffe0  /* Unused...                   */
-+
-+/* N-way test register. */
-+#define NWAYTEST_RESV1          0x00ff  /* Unused...                   */
-+#define NWAYTEST_LOOPBACK       0x0100  /* Enable loopback for N-way   */
-+#define NWAYTEST_RESV2          0xfe00  /* Unused...                   */
-+
-+
-+/* From tg3.h */
-+
-+#define TG3_64BIT_REG_HIGH		0x00UL
-+#define TG3_64BIT_REG_LOW		0x04UL
-+
-+/* Descriptor block info. */
-+#define TG3_BDINFO_HOST_ADDR		0x0UL /* 64-bit */
-+#define TG3_BDINFO_MAXLEN_FLAGS		0x8UL /* 32-bit */
-+#define  BDINFO_FLAGS_USE_EXT_RECV	 0x00000001 /* ext rx_buffer_desc */
-+#define  BDINFO_FLAGS_DISABLED		 0x00000002
-+#define  BDINFO_FLAGS_MAXLEN_MASK	 0xffff0000
-+#define  BDINFO_FLAGS_MAXLEN_SHIFT	 16
-+#define TG3_BDINFO_NIC_ADDR		0xcUL /* 32-bit */
-+#define TG3_BDINFO_SIZE			0x10UL
-+
-+#define RX_COPY_THRESHOLD  		256
-+
-+#define RX_STD_MAX_SIZE			1536
-+#define RX_STD_MAX_SIZE_5705		512
-+#define RX_JUMBO_MAX_SIZE		0xdeadbeef /* XXX */
-+
-+/* First 256 bytes are a mirror of PCI config space. */
-+#define TG3PCI_VENDOR			0x00000000
-+#define  TG3PCI_VENDOR_BROADCOM		 0x14e4
-+#define TG3PCI_DEVICE			0x00000002
-+#define  TG3PCI_DEVICE_TIGON3_1		 0x1644 /* BCM5700 */
-+#define  TG3PCI_DEVICE_TIGON3_2		 0x1645 /* BCM5701 */
-+#define  TG3PCI_DEVICE_TIGON3_3		 0x1646 /* BCM5702 */
-+#define  TG3PCI_DEVICE_TIGON3_4		 0x1647 /* BCM5703 */
-+#define TG3PCI_COMMAND			0x00000004
-+#define TG3PCI_STATUS			0x00000006
-+#define TG3PCI_CCREVID			0x00000008
-+#define TG3PCI_CACHELINESZ		0x0000000c
-+#define TG3PCI_LATTIMER			0x0000000d
-+#define TG3PCI_HEADERTYPE		0x0000000e
-+#define TG3PCI_BIST			0x0000000f
-+#define TG3PCI_BASE0_LOW		0x00000010
-+#define TG3PCI_BASE0_HIGH		0x00000014
-+/* 0x18 --> 0x2c unused */
-+#define TG3PCI_SUBSYSVENID		0x0000002c
-+#define TG3PCI_SUBSYSID			0x0000002e
-+#define TG3PCI_ROMADDR			0x00000030
-+#define TG3PCI_CAPLIST			0x00000034
-+/* 0x35 --> 0x3c unused */
-+#define TG3PCI_IRQ_LINE			0x0000003c
-+#define TG3PCI_IRQ_PIN			0x0000003d
-+#define TG3PCI_MIN_GNT			0x0000003e
-+#define TG3PCI_MAX_LAT			0x0000003f
-+#define TG3PCI_X_CAPS			0x00000040
-+#define  PCIX_CAPS_RELAXED_ORDERING	 0x00020000
-+#define  PCIX_CAPS_SPLIT_MASK		 0x00700000
-+#define  PCIX_CAPS_SPLIT_SHIFT		 20
-+#define  PCIX_CAPS_BURST_MASK		 0x000c0000
-+#define  PCIX_CAPS_BURST_SHIFT		 18
-+#define  PCIX_CAPS_MAX_BURST_CPIOB	 2
-+#define TG3PCI_PM_CAP_PTR		0x00000041
-+#define TG3PCI_X_COMMAND		0x00000042
-+#define TG3PCI_X_STATUS			0x00000044
-+#define TG3PCI_PM_CAP_ID		0x00000048
-+#define TG3PCI_VPD_CAP_PTR		0x00000049
-+#define TG3PCI_PM_CAPS			0x0000004a
-+#define TG3PCI_PM_CTRL_STAT		0x0000004c
-+#define TG3PCI_BR_SUPP_EXT		0x0000004e
-+#define TG3PCI_PM_DATA			0x0000004f
-+#define TG3PCI_VPD_CAP_ID		0x00000050
-+#define TG3PCI_MSI_CAP_PTR		0x00000051
-+#define TG3PCI_VPD_ADDR_FLAG		0x00000052
-+#define  VPD_ADDR_FLAG_WRITE		0x00008000
-+#define TG3PCI_VPD_DATA			0x00000054
-+#define TG3PCI_MSI_CAP_ID		0x00000058
-+#define TG3PCI_NXT_CAP_PTR		0x00000059
-+#define TG3PCI_MSI_CTRL			0x0000005a
-+#define TG3PCI_MSI_ADDR_LOW		0x0000005c
-+#define TG3PCI_MSI_ADDR_HIGH		0x00000060
-+#define TG3PCI_MSI_DATA			0x00000064
-+/* 0x66 --> 0x68 unused */
-+#define TG3PCI_MISC_HOST_CTRL		0x00000068
-+#define  MISC_HOST_CTRL_CLEAR_INT	 0x00000001
-+#define  MISC_HOST_CTRL_MASK_PCI_INT	 0x00000002
-+#define  MISC_HOST_CTRL_BYTE_SWAP	 0x00000004
-+#define  MISC_HOST_CTRL_WORD_SWAP	 0x00000008
-+#define  MISC_HOST_CTRL_PCISTATE_RW	 0x00000010
-+#define  MISC_HOST_CTRL_CLKREG_RW	 0x00000020
-+#define  MISC_HOST_CTRL_REGWORD_SWAP	 0x00000040
-+#define  MISC_HOST_CTRL_INDIR_ACCESS	 0x00000080
-+#define  MISC_HOST_CTRL_IRQ_MASK_MODE	 0x00000100
-+#define  MISC_HOST_CTRL_TAGGED_STATUS	 0x00000200
-+#define  MISC_HOST_CTRL_CHIPREV		 0xffff0000
-+#define  MISC_HOST_CTRL_CHIPREV_SHIFT	 16
-+#define  GET_CHIP_REV_ID(MISC_HOST_CTRL) \
-+	 (((MISC_HOST_CTRL) & MISC_HOST_CTRL_CHIPREV) >> \
-+	  MISC_HOST_CTRL_CHIPREV_SHIFT)
-+#define  CHIPREV_ID_5700_A0		 0x7000
-+#define  CHIPREV_ID_5700_A1		 0x7001
-+#define  CHIPREV_ID_5700_B0		 0x7100
-+#define  CHIPREV_ID_5700_B1		 0x7101
-+#define  CHIPREV_ID_5700_B3		 0x7102
-+#define  CHIPREV_ID_5700_ALTIMA		 0x7104
-+#define  CHIPREV_ID_5700_C0		 0x7200
-+#define  CHIPREV_ID_5701_A0		 0x0000
-+#define  CHIPREV_ID_5701_B0		 0x0100
-+#define  CHIPREV_ID_5701_B2		 0x0102
-+#define  CHIPREV_ID_5701_B5		 0x0105
-+#define  CHIPREV_ID_5703_A0		 0x1000
-+#define  CHIPREV_ID_5703_A1		 0x1001
-+#define  CHIPREV_ID_5703_A2		 0x1002
-+#define  CHIPREV_ID_5703_A3		 0x1003
-+#define  CHIPREV_ID_5704_A0		 0x2000
-+#define  CHIPREV_ID_5704_A1		 0x2001
-+#define  CHIPREV_ID_5704_A2		 0x2002
-+#define  CHIPREV_ID_5705_A0		 0x3000
-+#define  CHIPREV_ID_5705_A1		 0x3001
-+#define	 CHIPREV_ID_5705_A2              0x3002
-+#define  CHIPREV_ID_5705_A3              0x3003
-+#define  GET_ASIC_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 12)
-+#define   ASIC_REV_5700			 0x07
-+#define   ASIC_REV_5701			 0x00
-+#define   ASIC_REV_5703			 0x01
-+#define   ASIC_REV_5704			 0x02
-+#define   ASIC_REV_5705			 0x03
-+#define  GET_CHIP_REV(CHIP_REV_ID)	((CHIP_REV_ID) >> 8)
-+#define   CHIPREV_5700_AX		 0x70
-+#define   CHIPREV_5700_BX		 0x71
-+#define   CHIPREV_5700_CX		 0x72
-+#define   CHIPREV_5701_AX		 0x00
-+#define  GET_METAL_REV(CHIP_REV_ID)	((CHIP_REV_ID) & 0xff)
-+#define   METAL_REV_A0			 0x00
-+#define   METAL_REV_A1			 0x01
-+#define   METAL_REV_B0			 0x00
-+#define   METAL_REV_B1			 0x01
-+#define   METAL_REV_B2			 0x02
-+#define TG3PCI_DMA_RW_CTRL		0x0000006c
-+#define  DMA_RWCTRL_MIN_DMA		 0x000000ff
-+#define  DMA_RWCTRL_MIN_DMA_SHIFT	 0
-+#define  DMA_RWCTRL_READ_BNDRY_MASK	 0x00000700
-+#define  DMA_RWCTRL_READ_BNDRY_DISAB	 0x00000000
-+#define  DMA_RWCTRL_READ_BNDRY_16	 0x00000100
-+#define  DMA_RWCTRL_READ_BNDRY_32	 0x00000200
-+#define  DMA_RWCTRL_READ_BNDRY_64	 0x00000300
-+#define  DMA_RWCTRL_READ_BNDRY_128	 0x00000400
-+#define  DMA_RWCTRL_READ_BNDRY_256	 0x00000500
-+#define  DMA_RWCTRL_READ_BNDRY_512	 0x00000600
-+#define  DMA_RWCTRL_READ_BNDRY_1024	 0x00000700
-+#define  DMA_RWCTRL_WRITE_BNDRY_MASK	 0x00003800
-+#define  DMA_RWCTRL_WRITE_BNDRY_DISAB	 0x00000000
-+#define  DMA_RWCTRL_WRITE_BNDRY_16	 0x00000800
-+#define  DMA_RWCTRL_WRITE_BNDRY_32	 0x00001000
-+#define  DMA_RWCTRL_WRITE_BNDRY_64	 0x00001800
-+#define  DMA_RWCTRL_WRITE_BNDRY_128	 0x00002000
-+#define  DMA_RWCTRL_WRITE_BNDRY_256	 0x00002800
-+#define  DMA_RWCTRL_WRITE_BNDRY_512	 0x00003000
-+#define  DMA_RWCTRL_WRITE_BNDRY_1024	 0x00003800
-+#define  DMA_RWCTRL_ONE_DMA		 0x00004000
-+#define  DMA_RWCTRL_READ_WATER		 0x00070000
-+#define  DMA_RWCTRL_READ_WATER_SHIFT	 16
-+#define  DMA_RWCTRL_WRITE_WATER		 0x00380000
-+#define  DMA_RWCTRL_WRITE_WATER_SHIFT	 19
-+#define  DMA_RWCTRL_USE_MEM_READ_MULT	 0x00400000
-+#define  DMA_RWCTRL_ASSERT_ALL_BE	 0x00800000
-+#define  DMA_RWCTRL_PCI_READ_CMD	 0x0f000000
-+#define  DMA_RWCTRL_PCI_READ_CMD_SHIFT	 24
-+#define  DMA_RWCTRL_PCI_WRITE_CMD	 0xf0000000
-+#define  DMA_RWCTRL_PCI_WRITE_CMD_SHIFT	 28
-+#define TG3PCI_PCISTATE			0x00000070
-+#define  PCISTATE_FORCE_RESET		 0x00000001
-+#define  PCISTATE_INT_NOT_ACTIVE	 0x00000002
-+#define  PCISTATE_CONV_PCI_MODE		 0x00000004
-+#define  PCISTATE_BUS_SPEED_HIGH	 0x00000008
-+#define  PCISTATE_BUS_32BIT		 0x00000010
-+#define  PCISTATE_ROM_ENABLE		 0x00000020
-+#define  PCISTATE_ROM_RETRY_ENABLE	 0x00000040
-+#define  PCISTATE_FLAT_VIEW		 0x00000100
-+#define  PCISTATE_RETRY_SAME_DMA	 0x00002000
-+#define TG3PCI_CLOCK_CTRL		0x00000074
-+#define  CLOCK_CTRL_CORECLK_DISABLE	 0x00000200
-+#define  CLOCK_CTRL_RXCLK_DISABLE	 0x00000400
-+#define  CLOCK_CTRL_TXCLK_DISABLE	 0x00000800
-+#define  CLOCK_CTRL_ALTCLK		 0x00001000
-+#define  CLOCK_CTRL_PWRDOWN_PLL133	 0x00008000
-+#define  CLOCK_CTRL_44MHZ_CORE		 0x00040000
-+#define  CLOCK_CTRL_625_CORE		 0x00100000
-+#define  CLOCK_CTRL_FORCE_CLKRUN	 0x00200000
-+#define  CLOCK_CTRL_CLKRUN_OENABLE	 0x00400000
-+#define  CLOCK_CTRL_DELAY_PCI_GRANT	 0x80000000
-+#define TG3PCI_REG_BASE_ADDR		0x00000078
-+#define TG3PCI_MEM_WIN_BASE_ADDR	0x0000007c
-+#define TG3PCI_REG_DATA			0x00000080
-+#define TG3PCI_MEM_WIN_DATA		0x00000084
-+#define TG3PCI_MODE_CTRL		0x00000088
-+#define TG3PCI_MISC_CFG			0x0000008c
-+#define TG3PCI_MISC_LOCAL_CTRL		0x00000090
-+/* 0x94 --> 0x98 unused */
-+#define TG3PCI_STD_RING_PROD_IDX	0x00000098 /* 64-bit */
-+#define TG3PCI_RCV_RET_RING_CON_IDX	0x000000a0 /* 64-bit */
-+#define TG3PCI_SND_PROD_IDX		0x000000a8 /* 64-bit */
-+/* 0xb0 --> 0x100 unused */
-+
-+/* 0x100 --> 0x200 unused */
-+
-+/* Mailbox registers */
-+#define MAILBOX_INTERRUPT_0		0x00000200 /* 64-bit */
-+#define MAILBOX_INTERRUPT_1		0x00000208 /* 64-bit */
-+#define MAILBOX_INTERRUPT_2		0x00000210 /* 64-bit */
-+#define MAILBOX_INTERRUPT_3		0x00000218 /* 64-bit */
-+#define MAILBOX_GENERAL_0		0x00000220 /* 64-bit */
-+#define MAILBOX_GENERAL_1		0x00000228 /* 64-bit */
-+#define MAILBOX_GENERAL_2		0x00000230 /* 64-bit */
-+#define MAILBOX_GENERAL_3		0x00000238 /* 64-bit */
-+#define MAILBOX_GENERAL_4		0x00000240 /* 64-bit */
-+#define MAILBOX_GENERAL_5		0x00000248 /* 64-bit */
-+#define MAILBOX_GENERAL_6		0x00000250 /* 64-bit */
-+#define MAILBOX_GENERAL_7		0x00000258 /* 64-bit */
-+#define MAILBOX_RELOAD_STAT		0x00000260 /* 64-bit */
-+#define MAILBOX_RCV_STD_PROD_IDX	0x00000268 /* 64-bit */
-+#define MAILBOX_RCV_JUMBO_PROD_IDX	0x00000270 /* 64-bit */
-+#define MAILBOX_RCV_MINI_PROD_IDX	0x00000278 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_0	0x00000280 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_1	0x00000288 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_2	0x00000290 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_3	0x00000298 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_4	0x000002a0 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_5	0x000002a8 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_6	0x000002b0 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_7	0x000002b8 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_8	0x000002c0 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_9	0x000002c8 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_10	0x000002d0 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_11	0x000002d8 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_12	0x000002e0 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_13	0x000002e8 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_14	0x000002f0 /* 64-bit */
-+#define MAILBOX_RCVRET_CON_IDX_15	0x000002f8 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_0	0x00000300 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_1	0x00000308 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_2	0x00000310 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_3	0x00000318 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_4	0x00000320 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_5	0x00000328 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_6	0x00000330 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_7	0x00000338 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_8	0x00000340 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_9	0x00000348 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_10	0x00000350 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_11	0x00000358 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_12	0x00000360 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_13	0x00000368 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_14	0x00000370 /* 64-bit */
-+#define MAILBOX_SNDHOST_PROD_IDX_15	0x00000378 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_0	0x00000380 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_1	0x00000388 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_2	0x00000390 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_3	0x00000398 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_4	0x000003a0 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_5	0x000003a8 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_6	0x000003b0 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_7	0x000003b8 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_8	0x000003c0 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_9	0x000003c8 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_10	0x000003d0 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_11	0x000003d8 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_12	0x000003e0 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_13	0x000003e8 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_14	0x000003f0 /* 64-bit */
-+#define MAILBOX_SNDNIC_PROD_IDX_15	0x000003f8 /* 64-bit */
-+
-+/* MAC control registers */
-+#define MAC_MODE			0x00000400
-+#define  MAC_MODE_RESET			 0x00000001
-+#define  MAC_MODE_HALF_DUPLEX		 0x00000002
-+#define  MAC_MODE_PORT_MODE_MASK	 0x0000000c
-+#define  MAC_MODE_PORT_MODE_TBI		 0x0000000c
-+#define  MAC_MODE_PORT_MODE_GMII	 0x00000008
-+#define  MAC_MODE_PORT_MODE_MII		 0x00000004
-+#define  MAC_MODE_PORT_MODE_NONE	 0x00000000
-+#define  MAC_MODE_PORT_INT_LPBACK	 0x00000010
-+#define  MAC_MODE_TAGGED_MAC_CTRL	 0x00000080
-+#define  MAC_MODE_TX_BURSTING		 0x00000100
-+#define  MAC_MODE_MAX_DEFER		 0x00000200
-+#define  MAC_MODE_LINK_POLARITY		 0x00000400
-+#define  MAC_MODE_RXSTAT_ENABLE		 0x00000800
-+#define  MAC_MODE_RXSTAT_CLEAR		 0x00001000
-+#define  MAC_MODE_RXSTAT_FLUSH		 0x00002000
-+#define  MAC_MODE_TXSTAT_ENABLE		 0x00004000
-+#define  MAC_MODE_TXSTAT_CLEAR		 0x00008000
-+#define  MAC_MODE_TXSTAT_FLUSH		 0x00010000
-+#define  MAC_MODE_SEND_CONFIGS		 0x00020000
-+#define  MAC_MODE_MAGIC_PKT_ENABLE	 0x00040000
-+#define  MAC_MODE_ACPI_ENABLE		 0x00080000
-+#define  MAC_MODE_MIP_ENABLE		 0x00100000
-+#define  MAC_MODE_TDE_ENABLE		 0x00200000
-+#define  MAC_MODE_RDE_ENABLE		 0x00400000
-+#define  MAC_MODE_FHDE_ENABLE		 0x00800000
-+#define MAC_STATUS			0x00000404
-+#define  MAC_STATUS_PCS_SYNCED		 0x00000001
-+#define  MAC_STATUS_SIGNAL_DET		 0x00000002
-+#define  MAC_STATUS_RCVD_CFG		 0x00000004
-+#define  MAC_STATUS_CFG_CHANGED		 0x00000008
-+#define  MAC_STATUS_SYNC_CHANGED	 0x00000010
-+#define  MAC_STATUS_PORT_DEC_ERR	 0x00000400
-+#define  MAC_STATUS_LNKSTATE_CHANGED	 0x00001000
-+#define  MAC_STATUS_MI_COMPLETION	 0x00400000
-+#define  MAC_STATUS_MI_INTERRUPT	 0x00800000
-+#define  MAC_STATUS_AP_ERROR		 0x01000000
-+#define  MAC_STATUS_ODI_ERROR		 0x02000000
-+#define  MAC_STATUS_RXSTAT_OVERRUN	 0x04000000
-+#define  MAC_STATUS_TXSTAT_OVERRUN	 0x08000000
-+#define MAC_EVENT			0x00000408
-+#define  MAC_EVENT_PORT_DECODE_ERR	 0x00000400
-+#define  MAC_EVENT_LNKSTATE_CHANGED	 0x00001000
-+#define  MAC_EVENT_MI_COMPLETION	 0x00400000
-+#define  MAC_EVENT_MI_INTERRUPT		 0x00800000
-+#define  MAC_EVENT_AP_ERROR		 0x01000000
-+#define  MAC_EVENT_ODI_ERROR		 0x02000000
-+#define  MAC_EVENT_RXSTAT_OVERRUN	 0x04000000
-+#define  MAC_EVENT_TXSTAT_OVERRUN	 0x08000000
-+#define MAC_LED_CTRL			0x0000040c
-+#define  LED_CTRL_LNKLED_OVERRIDE	 0x00000001
-+#define  LED_CTRL_1000MBPS_ON		 0x00000002
-+#define  LED_CTRL_100MBPS_ON		 0x00000004
-+#define  LED_CTRL_10MBPS_ON		 0x00000008
-+#define  LED_CTRL_TRAFFIC_OVERRIDE	 0x00000010
-+#define  LED_CTRL_TRAFFIC_BLINK		 0x00000020
-+#define  LED_CTRL_TRAFFIC_LED		 0x00000040
-+#define  LED_CTRL_1000MBPS_STATUS	 0x00000080
-+#define  LED_CTRL_100MBPS_STATUS	 0x00000100
-+#define  LED_CTRL_10MBPS_STATUS		 0x00000200
-+#define  LED_CTRL_TRAFFIC_STATUS	 0x00000400
-+#define  LED_CTRL_MAC_MODE		 0x00000000
-+#define  LED_CTRL_PHY_MODE_1		 0x00000800
-+#define  LED_CTRL_PHY_MODE_2		 0x00001000
-+#define  LED_CTRL_BLINK_RATE_MASK	 0x7ff80000
-+#define  LED_CTRL_BLINK_RATE_SHIFT	 19
-+#define  LED_CTRL_BLINK_PER_OVERRIDE	 0x00080000
-+#define  LED_CTRL_BLINK_RATE_OVERRIDE	 0x80000000
-+#define MAC_ADDR_0_HIGH			0x00000410 /* upper 2 bytes */
-+#define MAC_ADDR_0_LOW			0x00000414 /* lower 4 bytes */
-+#define MAC_ADDR_1_HIGH			0x00000418 /* upper 2 bytes */
-+#define MAC_ADDR_1_LOW			0x0000041c /* lower 4 bytes */
-+#define MAC_ADDR_2_HIGH			0x00000420 /* upper 2 bytes */
-+#define MAC_ADDR_2_LOW			0x00000424 /* lower 4 bytes */
-+#define MAC_ADDR_3_HIGH			0x00000428 /* upper 2 bytes */
-+#define MAC_ADDR_3_LOW			0x0000042c /* lower 4 bytes */
-+#define MAC_ACPI_MBUF_PTR		0x00000430
-+#define MAC_ACPI_LEN_OFFSET		0x00000434
-+#define  ACPI_LENOFF_LEN_MASK		 0x0000ffff
-+#define  ACPI_LENOFF_LEN_SHIFT		 0
-+#define  ACPI_LENOFF_OFF_MASK		 0x0fff0000
-+#define  ACPI_LENOFF_OFF_SHIFT		 16
-+#define MAC_TX_BACKOFF_SEED		0x00000438
-+#define  TX_BACKOFF_SEED_MASK		 0x000003ff
-+#define MAC_RX_MTU_SIZE			0x0000043c
-+#define  RX_MTU_SIZE_MASK		 0x0000ffff
-+#define MAC_PCS_TEST			0x00000440
-+#define  PCS_TEST_PATTERN_MASK		 0x000fffff
-+#define  PCS_TEST_PATTERN_SHIFT		 0
-+#define  PCS_TEST_ENABLE		 0x00100000
-+#define MAC_TX_AUTO_NEG			0x00000444
-+#define  TX_AUTO_NEG_MASK		 0x0000ffff
-+#define  TX_AUTO_NEG_SHIFT		 0
-+#define MAC_RX_AUTO_NEG			0x00000448
-+#define  RX_AUTO_NEG_MASK		 0x0000ffff
-+#define  RX_AUTO_NEG_SHIFT		 0
-+#define MAC_MI_COM			0x0000044c
-+#define  MI_COM_CMD_MASK		 0x0c000000
-+#define  MI_COM_CMD_WRITE		 0x04000000
-+#define  MI_COM_CMD_READ		 0x08000000
-+#define  MI_COM_READ_FAILED		 0x10000000
-+#define  MI_COM_START			 0x20000000
-+#define  MI_COM_BUSY			 0x20000000
-+#define  MI_COM_PHY_ADDR_MASK		 0x03e00000
-+#define  MI_COM_PHY_ADDR_SHIFT		 21
-+#define  MI_COM_REG_ADDR_MASK		 0x001f0000
-+#define  MI_COM_REG_ADDR_SHIFT		 16
-+#define  MI_COM_DATA_MASK		 0x0000ffff
-+#define MAC_MI_STAT			0x00000450
-+#define  MAC_MI_STAT_LNKSTAT_ATTN_ENAB	 0x00000001
-+#define MAC_MI_MODE			0x00000454
-+#define  MAC_MI_MODE_CLK_10MHZ		 0x00000001
-+#define  MAC_MI_MODE_SHORT_PREAMBLE	 0x00000002
-+#define  MAC_MI_MODE_AUTO_POLL		 0x00000010
-+#define  MAC_MI_MODE_CORE_CLK_62MHZ	 0x00008000
-+#define  MAC_MI_MODE_BASE		 0x000c0000 /* XXX magic values XXX */
-+#define MAC_AUTO_POLL_STATUS		0x00000458
-+#define  MAC_AUTO_POLL_ERROR		 0x00000001
-+#define MAC_TX_MODE			0x0000045c
-+#define  TX_MODE_RESET			 0x00000001
-+#define  TX_MODE_ENABLE			 0x00000002
-+#define  TX_MODE_FLOW_CTRL_ENABLE	 0x00000010
-+#define  TX_MODE_BIG_BCKOFF_ENABLE	 0x00000020
-+#define  TX_MODE_LONG_PAUSE_ENABLE	 0x00000040
-+#define MAC_TX_STATUS			0x00000460
-+#define  TX_STATUS_XOFFED		 0x00000001
-+#define  TX_STATUS_SENT_XOFF		 0x00000002
-+#define  TX_STATUS_SENT_XON		 0x00000004
-+#define  TX_STATUS_LINK_UP		 0x00000008
-+#define  TX_STATUS_ODI_UNDERRUN		 0x00000010
-+#define  TX_STATUS_ODI_OVERRUN		 0x00000020
-+#define MAC_TX_LENGTHS			0x00000464
-+#define  TX_LENGTHS_SLOT_TIME_MASK	 0x000000ff
-+#define  TX_LENGTHS_SLOT_TIME_SHIFT	 0
-+#define  TX_LENGTHS_IPG_MASK		 0x00000f00
-+#define  TX_LENGTHS_IPG_SHIFT		 8
-+#define  TX_LENGTHS_IPG_CRS_MASK	 0x00003000
-+#define  TX_LENGTHS_IPG_CRS_SHIFT	 12
-+#define MAC_RX_MODE			0x00000468
-+#define  RX_MODE_RESET			 0x00000001
-+#define  RX_MODE_ENABLE			 0x00000002
-+#define  RX_MODE_FLOW_CTRL_ENABLE	 0x00000004
-+#define  RX_MODE_KEEP_MAC_CTRL		 0x00000008
-+#define  RX_MODE_KEEP_PAUSE		 0x00000010
-+#define  RX_MODE_ACCEPT_OVERSIZED	 0x00000020
-+#define  RX_MODE_ACCEPT_RUNTS		 0x00000040
-+#define  RX_MODE_LEN_CHECK		 0x00000080
-+#define  RX_MODE_PROMISC		 0x00000100
-+#define  RX_MODE_NO_CRC_CHECK		 0x00000200
-+#define  RX_MODE_KEEP_VLAN_TAG		 0x00000400
-+#define MAC_RX_STATUS			0x0000046c
-+#define  RX_STATUS_REMOTE_TX_XOFFED	 0x00000001
-+#define  RX_STATUS_XOFF_RCVD		 0x00000002
-+#define  RX_STATUS_XON_RCVD		 0x00000004
-+#define MAC_HASH_REG_0			0x00000470
-+#define MAC_HASH_REG_1			0x00000474
-+#define MAC_HASH_REG_2			0x00000478
-+#define MAC_HASH_REG_3			0x0000047c
-+#define MAC_RCV_RULE_0			0x00000480
-+#define MAC_RCV_VALUE_0			0x00000484
-+#define MAC_RCV_RULE_1			0x00000488
-+#define MAC_RCV_VALUE_1			0x0000048c
-+#define MAC_RCV_RULE_2			0x00000490
-+#define MAC_RCV_VALUE_2			0x00000494
-+#define MAC_RCV_RULE_3			0x00000498
-+#define MAC_RCV_VALUE_3			0x0000049c
-+#define MAC_RCV_RULE_4			0x000004a0
-+#define MAC_RCV_VALUE_4			0x000004a4
-+#define MAC_RCV_RULE_5			0x000004a8
-+#define MAC_RCV_VALUE_5			0x000004ac
-+#define MAC_RCV_RULE_6			0x000004b0
-+#define MAC_RCV_VALUE_6			0x000004b4
-+#define MAC_RCV_RULE_7			0x000004b8
-+#define MAC_RCV_VALUE_7			0x000004bc
-+#define MAC_RCV_RULE_8			0x000004c0
-+#define MAC_RCV_VALUE_8			0x000004c4
-+#define MAC_RCV_RULE_9			0x000004c8
-+#define MAC_RCV_VALUE_9			0x000004cc
-+#define MAC_RCV_RULE_10			0x000004d0
-+#define MAC_RCV_VALUE_10		0x000004d4
-+#define MAC_RCV_RULE_11			0x000004d8
-+#define MAC_RCV_VALUE_11		0x000004dc
-+#define MAC_RCV_RULE_12			0x000004e0
-+#define MAC_RCV_VALUE_12		0x000004e4
-+#define MAC_RCV_RULE_13			0x000004e8
-+#define MAC_RCV_VALUE_13		0x000004ec
-+#define MAC_RCV_RULE_14			0x000004f0
-+#define MAC_RCV_VALUE_14		0x000004f4
-+#define MAC_RCV_RULE_15			0x000004f8
-+#define MAC_RCV_VALUE_15		0x000004fc
-+#define  RCV_RULE_DISABLE_MASK		 0x7fffffff
-+#define MAC_RCV_RULE_CFG		0x00000500
-+#define  RCV_RULE_CFG_DEFAULT_CLASS	0x00000008
-+#define MAC_LOW_WMARK_MAX_RX_FRAME	0x00000504
-+/* 0x508 --> 0x520 unused */
-+#define MAC_HASHREGU_0			0x00000520
-+#define MAC_HASHREGU_1			0x00000524
-+#define MAC_HASHREGU_2			0x00000528
-+#define MAC_HASHREGU_3			0x0000052c
-+#define MAC_EXTADDR_0_HIGH		0x00000530
-+#define MAC_EXTADDR_0_LOW		0x00000534
-+#define MAC_EXTADDR_1_HIGH		0x00000538
-+#define MAC_EXTADDR_1_LOW		0x0000053c
-+#define MAC_EXTADDR_2_HIGH		0x00000540
-+#define MAC_EXTADDR_2_LOW		0x00000544
-+#define MAC_EXTADDR_3_HIGH		0x00000548
-+#define MAC_EXTADDR_3_LOW		0x0000054c
-+#define MAC_EXTADDR_4_HIGH		0x00000550
-+#define MAC_EXTADDR_4_LOW		0x00000554
-+#define MAC_EXTADDR_5_HIGH		0x00000558
-+#define MAC_EXTADDR_5_LOW		0x0000055c
-+#define MAC_EXTADDR_6_HIGH		0x00000560
-+#define MAC_EXTADDR_6_LOW		0x00000564
-+#define MAC_EXTADDR_7_HIGH		0x00000568
-+#define MAC_EXTADDR_7_LOW		0x0000056c
-+#define MAC_EXTADDR_8_HIGH		0x00000570
-+#define MAC_EXTADDR_8_LOW		0x00000574
-+#define MAC_EXTADDR_9_HIGH		0x00000578
-+#define MAC_EXTADDR_9_LOW		0x0000057c
-+#define MAC_EXTADDR_10_HIGH		0x00000580
-+#define MAC_EXTADDR_10_LOW		0x00000584
-+#define MAC_EXTADDR_11_HIGH		0x00000588
-+#define MAC_EXTADDR_11_LOW		0x0000058c
-+#define MAC_SERDES_CFG			0x00000590
-+#define MAC_SERDES_STAT			0x00000594
-+/* 0x598 --> 0x600 unused */
-+#define MAC_TX_MAC_STATE_BASE		0x00000600 /* 16 bytes */
-+#define MAC_RX_MAC_STATE_BASE		0x00000610 /* 20 bytes */
-+/* 0x624 --> 0x800 unused */
-+#define MAC_TX_STATS_OCTETS		0x00000800
-+#define MAC_TX_STATS_RESV1		0x00000804
-+#define MAC_TX_STATS_COLLISIONS		0x00000808
-+#define MAC_TX_STATS_XON_SENT		0x0000080c
-+#define MAC_TX_STATS_XOFF_SENT		0x00000810
-+#define MAC_TX_STATS_RESV2		0x00000814
-+#define MAC_TX_STATS_MAC_ERRORS		0x00000818
-+#define MAC_TX_STATS_SINGLE_COLLISIONS	0x0000081c
-+#define MAC_TX_STATS_MULT_COLLISIONS	0x00000820
-+#define MAC_TX_STATS_DEFERRED		0x00000824
-+#define MAC_TX_STATS_RESV3		0x00000828
-+#define MAC_TX_STATS_EXCESSIVE_COL	0x0000082c
-+#define MAC_TX_STATS_LATE_COL		0x00000830
-+#define MAC_TX_STATS_RESV4_1		0x00000834
-+#define MAC_TX_STATS_RESV4_2		0x00000838
-+#define MAC_TX_STATS_RESV4_3		0x0000083c
-+#define MAC_TX_STATS_RESV4_4		0x00000840
-+#define MAC_TX_STATS_RESV4_5		0x00000844
-+#define MAC_TX_STATS_RESV4_6		0x00000848
-+#define MAC_TX_STATS_RESV4_7		0x0000084c
-+#define MAC_TX_STATS_RESV4_8		0x00000850
-+#define MAC_TX_STATS_RESV4_9		0x00000854
-+#define MAC_TX_STATS_RESV4_10		0x00000858
-+#define MAC_TX_STATS_RESV4_11		0x0000085c
-+#define MAC_TX_STATS_RESV4_12		0x00000860
-+#define MAC_TX_STATS_RESV4_13		0x00000864
-+#define MAC_TX_STATS_RESV4_14		0x00000868
-+#define MAC_TX_STATS_UCAST		0x0000086c
-+#define MAC_TX_STATS_MCAST		0x00000870
-+#define MAC_TX_STATS_BCAST		0x00000874
-+#define MAC_TX_STATS_RESV5_1		0x00000878
-+#define MAC_TX_STATS_RESV5_2		0x0000087c
-+#define MAC_RX_STATS_OCTETS		0x00000880
-+#define MAC_RX_STATS_RESV1		0x00000884
-+#define MAC_RX_STATS_FRAGMENTS		0x00000888
-+#define MAC_RX_STATS_UCAST		0x0000088c
-+#define MAC_RX_STATS_MCAST		0x00000890
-+#define MAC_RX_STATS_BCAST		0x00000894
-+#define MAC_RX_STATS_FCS_ERRORS		0x00000898
-+#define MAC_RX_STATS_ALIGN_ERRORS	0x0000089c
-+#define MAC_RX_STATS_XON_PAUSE_RECVD	0x000008a0
-+#define MAC_RX_STATS_XOFF_PAUSE_RECVD	0x000008a4
-+#define MAC_RX_STATS_MAC_CTRL_RECVD	0x000008a8
-+#define MAC_RX_STATS_XOFF_ENTERED	0x000008ac
-+#define MAC_RX_STATS_FRAME_TOO_LONG	0x000008b0
-+#define MAC_RX_STATS_JABBERS		0x000008b4
-+#define MAC_RX_STATS_UNDERSIZE		0x000008b8
-+/* 0x8bc --> 0xc00 unused */
-+
-+/* Send data initiator control registers */
-+#define SNDDATAI_MODE			0x00000c00
-+#define  SNDDATAI_MODE_RESET		 0x00000001
-+#define  SNDDATAI_MODE_ENABLE		 0x00000002
-+#define  SNDDATAI_MODE_STAT_OFLOW_ENAB	 0x00000004
-+#define SNDDATAI_STATUS			0x00000c04
-+#define  SNDDATAI_STATUS_STAT_OFLOW	 0x00000004
-+#define SNDDATAI_STATSCTRL		0x00000c08
-+#define  SNDDATAI_SCTRL_ENABLE		 0x00000001
-+#define  SNDDATAI_SCTRL_FASTUPD		 0x00000002
-+#define  SNDDATAI_SCTRL_CLEAR		 0x00000004
-+#define  SNDDATAI_SCTRL_FLUSH		 0x00000008
-+#define  SNDDATAI_SCTRL_FORCE_ZERO	 0x00000010
-+#define SNDDATAI_STATSENAB		0x00000c0c
-+#define SNDDATAI_STATSINCMASK		0x00000c10
-+/* 0xc14 --> 0xc80 unused */
-+#define SNDDATAI_COS_CNT_0		0x00000c80
-+#define SNDDATAI_COS_CNT_1		0x00000c84
-+#define SNDDATAI_COS_CNT_2		0x00000c88
-+#define SNDDATAI_COS_CNT_3		0x00000c8c
-+#define SNDDATAI_COS_CNT_4		0x00000c90
-+#define SNDDATAI_COS_CNT_5		0x00000c94
-+#define SNDDATAI_COS_CNT_6		0x00000c98
-+#define SNDDATAI_COS_CNT_7		0x00000c9c
-+#define SNDDATAI_COS_CNT_8		0x00000ca0
-+#define SNDDATAI_COS_CNT_9		0x00000ca4
-+#define SNDDATAI_COS_CNT_10		0x00000ca8
-+#define SNDDATAI_COS_CNT_11		0x00000cac
-+#define SNDDATAI_COS_CNT_12		0x00000cb0
-+#define SNDDATAI_COS_CNT_13		0x00000cb4
-+#define SNDDATAI_COS_CNT_14		0x00000cb8
-+#define SNDDATAI_COS_CNT_15		0x00000cbc
-+#define SNDDATAI_DMA_RDQ_FULL_CNT	0x00000cc0
-+#define SNDDATAI_DMA_PRIO_RDQ_FULL_CNT	0x00000cc4
-+#define SNDDATAI_SDCQ_FULL_CNT		0x00000cc8
-+#define SNDDATAI_NICRNG_SSND_PIDX_CNT	0x00000ccc
-+#define SNDDATAI_STATS_UPDATED_CNT	0x00000cd0
-+#define SNDDATAI_INTERRUPTS_CNT		0x00000cd4
-+#define SNDDATAI_AVOID_INTERRUPTS_CNT	0x00000cd8
-+#define SNDDATAI_SND_THRESH_HIT_CNT	0x00000cdc
-+/* 0xce0 --> 0x1000 unused */
-+
-+/* Send data completion control registers */
-+#define SNDDATAC_MODE			0x00001000
-+#define  SNDDATAC_MODE_RESET		 0x00000001
-+#define  SNDDATAC_MODE_ENABLE		 0x00000002
-+/* 0x1004 --> 0x1400 unused */
-+
-+/* Send BD ring selector */
-+#define SNDBDS_MODE			0x00001400
-+#define  SNDBDS_MODE_RESET		 0x00000001
-+#define  SNDBDS_MODE_ENABLE		 0x00000002
-+#define  SNDBDS_MODE_ATTN_ENABLE	 0x00000004
-+#define SNDBDS_STATUS			0x00001404
-+#define  SNDBDS_STATUS_ERROR_ATTN	 0x00000004
-+#define SNDBDS_HWDIAG			0x00001408
-+/* 0x140c --> 0x1440 */
-+#define SNDBDS_SEL_CON_IDX_0		0x00001440
-+#define SNDBDS_SEL_CON_IDX_1		0x00001444
-+#define SNDBDS_SEL_CON_IDX_2		0x00001448
-+#define SNDBDS_SEL_CON_IDX_3		0x0000144c
-+#define SNDBDS_SEL_CON_IDX_4		0x00001450
-+#define SNDBDS_SEL_CON_IDX_5		0x00001454
-+#define SNDBDS_SEL_CON_IDX_6		0x00001458
-+#define SNDBDS_SEL_CON_IDX_7		0x0000145c
-+#define SNDBDS_SEL_CON_IDX_8		0x00001460
-+#define SNDBDS_SEL_CON_IDX_9		0x00001464
-+#define SNDBDS_SEL_CON_IDX_10		0x00001468
-+#define SNDBDS_SEL_CON_IDX_11		0x0000146c
-+#define SNDBDS_SEL_CON_IDX_12		0x00001470
-+#define SNDBDS_SEL_CON_IDX_13		0x00001474
-+#define SNDBDS_SEL_CON_IDX_14		0x00001478
-+#define SNDBDS_SEL_CON_IDX_15		0x0000147c
-+/* 0x1480 --> 0x1800 unused */
-+
-+/* Send BD initiator control registers */
-+#define SNDBDI_MODE			0x00001800
-+#define  SNDBDI_MODE_RESET		 0x00000001
-+#define  SNDBDI_MODE_ENABLE		 0x00000002
-+#define  SNDBDI_MODE_ATTN_ENABLE	 0x00000004
-+#define SNDBDI_STATUS			0x00001804
-+#define  SNDBDI_STATUS_ERROR_ATTN	 0x00000004
-+#define SNDBDI_IN_PROD_IDX_0		0x00001808
-+#define SNDBDI_IN_PROD_IDX_1		0x0000180c
-+#define SNDBDI_IN_PROD_IDX_2		0x00001810
-+#define SNDBDI_IN_PROD_IDX_3		0x00001814
-+#define SNDBDI_IN_PROD_IDX_4		0x00001818
-+#define SNDBDI_IN_PROD_IDX_5		0x0000181c
-+#define SNDBDI_IN_PROD_IDX_6		0x00001820
-+#define SNDBDI_IN_PROD_IDX_7		0x00001824
-+#define SNDBDI_IN_PROD_IDX_8		0x00001828
-+#define SNDBDI_IN_PROD_IDX_9		0x0000182c
-+#define SNDBDI_IN_PROD_IDX_10		0x00001830
-+#define SNDBDI_IN_PROD_IDX_11		0x00001834
-+#define SNDBDI_IN_PROD_IDX_12		0x00001838
-+#define SNDBDI_IN_PROD_IDX_13		0x0000183c
-+#define SNDBDI_IN_PROD_IDX_14		0x00001840
-+#define SNDBDI_IN_PROD_IDX_15		0x00001844
-+/* 0x1848 --> 0x1c00 unused */
-+
-+/* Send BD completion control registers */
-+#define SNDBDC_MODE			0x00001c00
-+#define SNDBDC_MODE_RESET		 0x00000001
-+#define SNDBDC_MODE_ENABLE		 0x00000002
-+#define SNDBDC_MODE_ATTN_ENABLE		 0x00000004
-+/* 0x1c04 --> 0x2000 unused */
-+
-+/* Receive list placement control registers */
-+#define RCVLPC_MODE			0x00002000
-+#define  RCVLPC_MODE_RESET		 0x00000001
-+#define  RCVLPC_MODE_ENABLE		 0x00000002
-+#define  RCVLPC_MODE_CLASS0_ATTN_ENAB	 0x00000004
-+#define  RCVLPC_MODE_MAPOOR_AATTN_ENAB	 0x00000008
-+#define  RCVLPC_MODE_STAT_OFLOW_ENAB	 0x00000010
-+#define RCVLPC_STATUS			0x00002004
-+#define  RCVLPC_STATUS_CLASS0		 0x00000004
-+#define  RCVLPC_STATUS_MAPOOR		 0x00000008
-+#define  RCVLPC_STATUS_STAT_OFLOW	 0x00000010
-+#define RCVLPC_LOCK			0x00002008
-+#define  RCVLPC_LOCK_REQ_MASK		 0x0000ffff
-+#define  RCVLPC_LOCK_REQ_SHIFT		 0
-+#define  RCVLPC_LOCK_GRANT_MASK		 0xffff0000
-+#define  RCVLPC_LOCK_GRANT_SHIFT	 16
-+#define RCVLPC_NON_EMPTY_BITS		0x0000200c
-+#define  RCVLPC_NON_EMPTY_BITS_MASK	 0x0000ffff
-+#define RCVLPC_CONFIG			0x00002010
-+#define RCVLPC_STATSCTRL		0x00002014
-+#define  RCVLPC_STATSCTRL_ENABLE	 0x00000001
-+#define  RCVLPC_STATSCTRL_FASTUPD	 0x00000002
-+#define RCVLPC_STATS_ENABLE		0x00002018
-+#define  RCVLPC_STATSENAB_LNGBRST_RFIX	 0x00400000
-+#define RCVLPC_STATS_INCMASK		0x0000201c
-+/* 0x2020 --> 0x2100 unused */
-+#define RCVLPC_SELLST_BASE		0x00002100 /* 16 16-byte entries */
-+#define  SELLST_TAIL			0x00000004
-+#define  SELLST_CONT			0x00000008
-+#define  SELLST_UNUSED			0x0000000c
-+#define RCVLPC_COS_CNTL_BASE		0x00002200 /* 16 4-byte entries */
-+#define RCVLPC_DROP_FILTER_CNT		0x00002240
-+#define RCVLPC_DMA_WQ_FULL_CNT		0x00002244
-+#define RCVLPC_DMA_HIPRIO_WQ_FULL_CNT	0x00002248
-+#define RCVLPC_NO_RCV_BD_CNT		0x0000224c
-+#define RCVLPC_IN_DISCARDS_CNT		0x00002250
-+#define RCVLPC_IN_ERRORS_CNT		0x00002254
-+#define RCVLPC_RCV_THRESH_HIT_CNT	0x00002258
-+/* 0x225c --> 0x2400 unused */
-+
-+/* Receive Data and Receive BD Initiator Control */
-+#define RCVDBDI_MODE			0x00002400
-+#define  RCVDBDI_MODE_RESET		 0x00000001
-+#define  RCVDBDI_MODE_ENABLE		 0x00000002
-+#define  RCVDBDI_MODE_JUMBOBD_NEEDED	 0x00000004
-+#define  RCVDBDI_MODE_FRM_TOO_BIG	 0x00000008
-+#define  RCVDBDI_MODE_INV_RING_SZ	 0x00000010
-+#define RCVDBDI_STATUS			0x00002404
-+#define  RCVDBDI_STATUS_JUMBOBD_NEEDED	 0x00000004
-+#define  RCVDBDI_STATUS_FRM_TOO_BIG	 0x00000008
-+#define  RCVDBDI_STATUS_INV_RING_SZ	 0x00000010
-+#define RCVDBDI_SPLIT_FRAME_MINSZ	0x00002408
-+/* 0x240c --> 0x2440 unused */
-+#define RCVDBDI_JUMBO_BD		0x00002440 /* TG3_BDINFO_... */
-+#define RCVDBDI_STD_BD			0x00002450 /* TG3_BDINFO_... */
-+#define RCVDBDI_MINI_BD			0x00002460 /* TG3_BDINFO_... */
-+#define RCVDBDI_JUMBO_CON_IDX		0x00002470
-+#define RCVDBDI_STD_CON_IDX		0x00002474
-+#define RCVDBDI_MINI_CON_IDX		0x00002478
-+/* 0x247c --> 0x2480 unused */
-+#define RCVDBDI_BD_PROD_IDX_0		0x00002480
-+#define RCVDBDI_BD_PROD_IDX_1		0x00002484
-+#define RCVDBDI_BD_PROD_IDX_2		0x00002488
-+#define RCVDBDI_BD_PROD_IDX_3		0x0000248c
-+#define RCVDBDI_BD_PROD_IDX_4		0x00002490
-+#define RCVDBDI_BD_PROD_IDX_5		0x00002494
-+#define RCVDBDI_BD_PROD_IDX_6		0x00002498
-+#define RCVDBDI_BD_PROD_IDX_7		0x0000249c
-+#define RCVDBDI_BD_PROD_IDX_8		0x000024a0
-+#define RCVDBDI_BD_PROD_IDX_9		0x000024a4
-+#define RCVDBDI_BD_PROD_IDX_10		0x000024a8
-+#define RCVDBDI_BD_PROD_IDX_11		0x000024ac
-+#define RCVDBDI_BD_PROD_IDX_12		0x000024b0
-+#define RCVDBDI_BD_PROD_IDX_13		0x000024b4
-+#define RCVDBDI_BD_PROD_IDX_14		0x000024b8
-+#define RCVDBDI_BD_PROD_IDX_15		0x000024bc
-+#define RCVDBDI_HWDIAG			0x000024c0
-+/* 0x24c4 --> 0x2800 unused */
-+
-+/* Receive Data Completion Control */
-+#define RCVDCC_MODE			0x00002800
-+#define  RCVDCC_MODE_RESET		 0x00000001
-+#define  RCVDCC_MODE_ENABLE		 0x00000002
-+#define  RCVDCC_MODE_ATTN_ENABLE	 0x00000004
-+/* 0x2804 --> 0x2c00 unused */
-+
-+/* Receive BD Initiator Control Registers */
-+#define RCVBDI_MODE			0x00002c00
-+#define  RCVBDI_MODE_RESET		 0x00000001
-+#define  RCVBDI_MODE_ENABLE		 0x00000002
-+#define  RCVBDI_MODE_RCB_ATTN_ENAB	 0x00000004
-+#define RCVBDI_STATUS			0x00002c04
-+#define  RCVBDI_STATUS_RCB_ATTN		 0x00000004
-+#define RCVBDI_JUMBO_PROD_IDX		0x00002c08
-+#define RCVBDI_STD_PROD_IDX		0x00002c0c
-+#define RCVBDI_MINI_PROD_IDX		0x00002c10
-+#define RCVBDI_MINI_THRESH		0x00002c14
-+#define RCVBDI_STD_THRESH		0x00002c18
-+#define RCVBDI_JUMBO_THRESH		0x00002c1c
-+/* 0x2c20 --> 0x3000 unused */
-+
-+/* Receive BD Completion Control Registers */
-+#define RCVCC_MODE			0x00003000
-+#define  RCVCC_MODE_RESET		 0x00000001
-+#define  RCVCC_MODE_ENABLE		 0x00000002
-+#define  RCVCC_MODE_ATTN_ENABLE		 0x00000004
-+#define RCVCC_STATUS			0x00003004
-+#define  RCVCC_STATUS_ERROR_ATTN	 0x00000004
-+#define RCVCC_JUMP_PROD_IDX		0x00003008
-+#define RCVCC_STD_PROD_IDX		0x0000300c
-+#define RCVCC_MINI_PROD_IDX		0x00003010
-+/* 0x3014 --> 0x3400 unused */
-+
-+/* Receive list selector control registers */
-+#define RCVLSC_MODE			0x00003400
-+#define  RCVLSC_MODE_RESET		 0x00000001
-+#define  RCVLSC_MODE_ENABLE		 0x00000002
-+#define  RCVLSC_MODE_ATTN_ENABLE	 0x00000004
-+#define RCVLSC_STATUS			0x00003404
-+#define  RCVLSC_STATUS_ERROR_ATTN	 0x00000004
-+/* 0x3408 --> 0x3800 unused */
-+
-+/* Mbuf cluster free registers */
-+#define MBFREE_MODE			0x00003800
-+#define  MBFREE_MODE_RESET		 0x00000001
-+#define  MBFREE_MODE_ENABLE		 0x00000002
-+#define MBFREE_STATUS			0x00003804
-+/* 0x3808 --> 0x3c00 unused */
-+
-+/* Host coalescing control registers */
-+#define HOSTCC_MODE			0x00003c00
-+#define  HOSTCC_MODE_RESET		 0x00000001
-+#define  HOSTCC_MODE_ENABLE		 0x00000002
-+#define  HOSTCC_MODE_ATTN		 0x00000004
-+#define  HOSTCC_MODE_NOW		 0x00000008
-+#define  HOSTCC_MODE_FULL_STATUS	 0x00000000
-+#define  HOSTCC_MODE_64BYTE		 0x00000080
-+#define  HOSTCC_MODE_32BYTE		 0x00000100
-+#define  HOSTCC_MODE_CLRTICK_RXBD	 0x00000200
-+#define  HOSTCC_MODE_CLRTICK_TXBD	 0x00000400
-+#define  HOSTCC_MODE_NOINT_ON_NOW	 0x00000800
-+#define  HOSTCC_MODE_NOINT_ON_FORCE	 0x00001000
-+#define HOSTCC_STATUS			0x00003c04
-+#define  HOSTCC_STATUS_ERROR_ATTN	 0x00000004
-+#define HOSTCC_RXCOL_TICKS		0x00003c08
-+#define  LOW_RXCOL_TICKS		 0x00000032
-+#define  DEFAULT_RXCOL_TICKS		 0x00000048
-+#define  HIGH_RXCOL_TICKS		 0x00000096
-+#define HOSTCC_TXCOL_TICKS		0x00003c0c
-+#define  LOW_TXCOL_TICKS		 0x00000096
-+#define  DEFAULT_TXCOL_TICKS		 0x0000012c
-+#define  HIGH_TXCOL_TICKS		 0x00000145
-+#define HOSTCC_RXMAX_FRAMES		0x00003c10
-+#define  LOW_RXMAX_FRAMES		 0x00000005
-+#define  DEFAULT_RXMAX_FRAMES		 0x00000008
-+#define  HIGH_RXMAX_FRAMES		 0x00000012
-+#define HOSTCC_TXMAX_FRAMES		0x00003c14
-+#define  LOW_TXMAX_FRAMES		 0x00000035
-+#define  DEFAULT_TXMAX_FRAMES		 0x0000004b
-+#define  HIGH_TXMAX_FRAMES		 0x00000052
-+#define HOSTCC_RXCOAL_TICK_INT		0x00003c18
-+#define  DEFAULT_RXCOAL_TICK_INT	 0x00000019
-+#define HOSTCC_TXCOAL_TICK_INT		0x00003c1c
-+#define  DEFAULT_TXCOAL_TICK_INT	 0x00000019
-+#define HOSTCC_RXCOAL_MAXF_INT		0x00003c20
-+#define  DEFAULT_RXCOAL_MAXF_INT	 0x00000005
-+#define HOSTCC_TXCOAL_MAXF_INT		0x00003c24
-+#define  DEFAULT_TXCOAL_MAXF_INT	 0x00000005
-+#define HOSTCC_STAT_COAL_TICKS		0x00003c28
-+#define  DEFAULT_STAT_COAL_TICKS	 0x000f4240
-+/* 0x3c2c --> 0x3c30 unused */
-+#define HOSTCC_STATS_BLK_HOST_ADDR	0x00003c30 /* 64-bit */
-+#define HOSTCC_STATUS_BLK_HOST_ADDR	0x00003c38 /* 64-bit */
-+#define HOSTCC_STATS_BLK_NIC_ADDR	0x00003c40
-+#define HOSTCC_STATUS_BLK_NIC_ADDR	0x00003c44
-+#define HOSTCC_FLOW_ATTN		0x00003c48
-+/* 0x3c4c --> 0x3c50 unused */
-+#define HOSTCC_JUMBO_CON_IDX		0x00003c50
-+#define HOSTCC_STD_CON_IDX		0x00003c54
-+#define HOSTCC_MINI_CON_IDX		0x00003c58
-+/* 0x3c5c --> 0x3c80 unused */
-+#define HOSTCC_RET_PROD_IDX_0		0x00003c80
-+#define HOSTCC_RET_PROD_IDX_1		0x00003c84
-+#define HOSTCC_RET_PROD_IDX_2		0x00003c88
-+#define HOSTCC_RET_PROD_IDX_3		0x00003c8c
-+#define HOSTCC_RET_PROD_IDX_4		0x00003c90
-+#define HOSTCC_RET_PROD_IDX_5		0x00003c94
-+#define HOSTCC_RET_PROD_IDX_6		0x00003c98
-+#define HOSTCC_RET_PROD_IDX_7		0x00003c9c
-+#define HOSTCC_RET_PROD_IDX_8		0x00003ca0
-+#define HOSTCC_RET_PROD_IDX_9		0x00003ca4
-+#define HOSTCC_RET_PROD_IDX_10		0x00003ca8
-+#define HOSTCC_RET_PROD_IDX_11		0x00003cac
-+#define HOSTCC_RET_PROD_IDX_12		0x00003cb0
-+#define HOSTCC_RET_PROD_IDX_13		0x00003cb4
-+#define HOSTCC_RET_PROD_IDX_14		0x00003cb8
-+#define HOSTCC_RET_PROD_IDX_15		0x00003cbc
-+#define HOSTCC_SND_CON_IDX_0		0x00003cc0
-+#define HOSTCC_SND_CON_IDX_1		0x00003cc4
-+#define HOSTCC_SND_CON_IDX_2		0x00003cc8
-+#define HOSTCC_SND_CON_IDX_3		0x00003ccc
-+#define HOSTCC_SND_CON_IDX_4		0x00003cd0
-+#define HOSTCC_SND_CON_IDX_5		0x00003cd4
-+#define HOSTCC_SND_CON_IDX_6		0x00003cd8
-+#define HOSTCC_SND_CON_IDX_7		0x00003cdc
-+#define HOSTCC_SND_CON_IDX_8		0x00003ce0
-+#define HOSTCC_SND_CON_IDX_9		0x00003ce4
-+#define HOSTCC_SND_CON_IDX_10		0x00003ce8
-+#define HOSTCC_SND_CON_IDX_11		0x00003cec
-+#define HOSTCC_SND_CON_IDX_12		0x00003cf0
-+#define HOSTCC_SND_CON_IDX_13		0x00003cf4
-+#define HOSTCC_SND_CON_IDX_14		0x00003cf8
-+#define HOSTCC_SND_CON_IDX_15		0x00003cfc
-+/* 0x3d00 --> 0x4000 unused */
-+
-+/* Memory arbiter control registers */
-+#define MEMARB_MODE			0x00004000
-+#define  MEMARB_MODE_RESET		 0x00000001
-+#define  MEMARB_MODE_ENABLE		 0x00000002
-+#define MEMARB_STATUS			0x00004004
-+#define MEMARB_TRAP_ADDR_LOW		0x00004008
-+#define MEMARB_TRAP_ADDR_HIGH		0x0000400c
-+/* 0x4010 --> 0x4400 unused */
-+
-+/* Buffer manager control registers */
-+#define BUFMGR_MODE			0x00004400
-+#define  BUFMGR_MODE_RESET		 0x00000001
-+#define  BUFMGR_MODE_ENABLE		 0x00000002
-+#define  BUFMGR_MODE_ATTN_ENABLE	 0x00000004
-+#define  BUFMGR_MODE_BM_TEST		 0x00000008
-+#define  BUFMGR_MODE_MBLOW_ATTN_ENAB	 0x00000010
-+#define BUFMGR_STATUS			0x00004404
-+#define  BUFMGR_STATUS_ERROR		 0x00000004
-+#define  BUFMGR_STATUS_MBLOW		 0x00000010
-+#define BUFMGR_MB_POOL_ADDR		0x00004408
-+#define BUFMGR_MB_POOL_SIZE		0x0000440c
-+#define BUFMGR_MB_RDMA_LOW_WATER	0x00004410
-+#define  DEFAULT_MB_RDMA_LOW_WATER	 0x00000050
-+#define  DEFAULT_MB_RDMA_LOW_WATER_5705	 0x00000000
-+#define  DEFAULT_MB_RDMA_LOW_WATER_JUMBO 0x00000130
-+#define BUFMGR_MB_MACRX_LOW_WATER	0x00004414
-+#define  DEFAULT_MB_MACRX_LOW_WATER	  0x00000020
-+#define  DEFAULT_MB_MACRX_LOW_WATER_5705  0x00000010
-+#define  DEFAULT_MB_MACRX_LOW_WATER_JUMBO 0x00000098
-+#define BUFMGR_MB_HIGH_WATER		0x00004418
-+#define  DEFAULT_MB_HIGH_WATER		 0x00000060
-+#define  DEFAULT_MB_HIGH_WATER_5705	 0x00000060
-+#define  DEFAULT_MB_HIGH_WATER_JUMBO	 0x0000017c
-+#define BUFMGR_RX_MB_ALLOC_REQ		0x0000441c
-+#define  BUFMGR_MB_ALLOC_BIT		 0x10000000
-+#define BUFMGR_RX_MB_ALLOC_RESP		0x00004420
-+#define BUFMGR_TX_MB_ALLOC_REQ		0x00004424
-+#define BUFMGR_TX_MB_ALLOC_RESP		0x00004428
-+#define BUFMGR_DMA_DESC_POOL_ADDR	0x0000442c
-+#define BUFMGR_DMA_DESC_POOL_SIZE	0x00004430
-+#define BUFMGR_DMA_LOW_WATER		0x00004434
-+#define  DEFAULT_DMA_LOW_WATER		 0x00000005
-+#define BUFMGR_DMA_HIGH_WATER		0x00004438
-+#define  DEFAULT_DMA_HIGH_WATER		 0x0000000a
-+#define BUFMGR_RX_DMA_ALLOC_REQ		0x0000443c
-+#define BUFMGR_RX_DMA_ALLOC_RESP	0x00004440
-+#define BUFMGR_TX_DMA_ALLOC_REQ		0x00004444
-+#define BUFMGR_TX_DMA_ALLOC_RESP	0x00004448
-+#define BUFMGR_HWDIAG_0			0x0000444c
-+#define BUFMGR_HWDIAG_1			0x00004450
-+#define BUFMGR_HWDIAG_2			0x00004454
-+/* 0x4458 --> 0x4800 unused */
-+
-+/* Read DMA control registers */
-+#define RDMAC_MODE			0x00004800
-+#define  RDMAC_MODE_RESET		 0x00000001
-+#define  RDMAC_MODE_ENABLE		 0x00000002
-+#define  RDMAC_MODE_TGTABORT_ENAB	 0x00000004
-+#define  RDMAC_MODE_MSTABORT_ENAB	 0x00000008
-+#define  RDMAC_MODE_PARITYERR_ENAB	 0x00000010
-+#define  RDMAC_MODE_ADDROFLOW_ENAB	 0x00000020
-+#define  RDMAC_MODE_FIFOOFLOW_ENAB	 0x00000040
-+#define  RDMAC_MODE_FIFOURUN_ENAB	 0x00000080
-+#define  RDMAC_MODE_FIFOOREAD_ENAB	 0x00000100
-+#define  RDMAC_MODE_LNGREAD_ENAB	 0x00000200
-+#define  RDMAC_MODE_SPLIT_ENABLE	 0x00000800
-+#define  RDMAC_MODE_SPLIT_RESET		 0x00001000
-+#define  RDMAC_MODE_FIFO_SIZE_128	 0x00020000
-+#define  RDMAC_MODE_FIFO_LONG_BURST	 0x00030000
-+#define RDMAC_STATUS			0x00004804
-+#define  RDMAC_STATUS_TGTABORT		 0x00000004
-+#define  RDMAC_STATUS_MSTABORT		 0x00000008
-+#define  RDMAC_STATUS_PARITYERR		 0x00000010
-+#define  RDMAC_STATUS_ADDROFLOW		 0x00000020
-+#define  RDMAC_STATUS_FIFOOFLOW		 0x00000040
-+#define  RDMAC_STATUS_FIFOURUN		 0x00000080
-+#define  RDMAC_STATUS_FIFOOREAD		 0x00000100
-+#define  RDMAC_STATUS_LNGREAD		 0x00000200
-+/* 0x4808 --> 0x4c00 unused */
-+
-+/* Write DMA control registers */
-+#define WDMAC_MODE			0x00004c00
-+#define  WDMAC_MODE_RESET		 0x00000001
-+#define  WDMAC_MODE_ENABLE		 0x00000002
-+#define  WDMAC_MODE_TGTABORT_ENAB	 0x00000004
-+#define  WDMAC_MODE_MSTABORT_ENAB	 0x00000008
-+#define  WDMAC_MODE_PARITYERR_ENAB	 0x00000010
-+#define  WDMAC_MODE_ADDROFLOW_ENAB	 0x00000020
-+#define  WDMAC_MODE_FIFOOFLOW_ENAB	 0x00000040
-+#define  WDMAC_MODE_FIFOURUN_ENAB	 0x00000080
-+#define  WDMAC_MODE_FIFOOREAD_ENAB	 0x00000100
-+#define  WDMAC_MODE_LNGREAD_ENAB	 0x00000200
-+#define  WDMAC_MODE_RX_ACCEL	 	 0x00000400
-+#define WDMAC_STATUS			0x00004c04
-+#define  WDMAC_STATUS_TGTABORT		 0x00000004
-+#define  WDMAC_STATUS_MSTABORT		 0x00000008
-+#define  WDMAC_STATUS_PARITYERR		 0x00000010
-+#define  WDMAC_STATUS_ADDROFLOW		 0x00000020
-+#define  WDMAC_STATUS_FIFOOFLOW		 0x00000040
-+#define  WDMAC_STATUS_FIFOURUN		 0x00000080
-+#define  WDMAC_STATUS_FIFOOREAD		 0x00000100
-+#define  WDMAC_STATUS_LNGREAD		 0x00000200
-+/* 0x4c08 --> 0x5000 unused */
-+
-+/* Per-cpu register offsets (arm9) */
-+#define CPU_MODE			0x00000000
-+#define  CPU_MODE_RESET			 0x00000001
-+#define  CPU_MODE_HALT			 0x00000400
-+#define CPU_STATE			0x00000004
-+#define CPU_EVTMASK			0x00000008
-+/* 0xc --> 0x1c reserved */
-+#define CPU_PC				0x0000001c
-+#define CPU_INSN			0x00000020
-+#define CPU_SPAD_UFLOW			0x00000024
-+#define CPU_WDOG_CLEAR			0x00000028
-+#define CPU_WDOG_VECTOR			0x0000002c
-+#define CPU_WDOG_PC			0x00000030
-+#define CPU_HW_BP			0x00000034
-+/* 0x38 --> 0x44 unused */
-+#define CPU_WDOG_SAVED_STATE		0x00000044
-+#define CPU_LAST_BRANCH_ADDR		0x00000048
-+#define CPU_SPAD_UFLOW_SET		0x0000004c
-+/* 0x50 --> 0x200 unused */
-+#define CPU_R0				0x00000200
-+#define CPU_R1				0x00000204
-+#define CPU_R2				0x00000208
-+#define CPU_R3				0x0000020c
-+#define CPU_R4				0x00000210
-+#define CPU_R5				0x00000214
-+#define CPU_R6				0x00000218
-+#define CPU_R7				0x0000021c
-+#define CPU_R8				0x00000220
-+#define CPU_R9				0x00000224
-+#define CPU_R10				0x00000228
-+#define CPU_R11				0x0000022c
-+#define CPU_R12				0x00000230
-+#define CPU_R13				0x00000234
-+#define CPU_R14				0x00000238
-+#define CPU_R15				0x0000023c
-+#define CPU_R16				0x00000240
-+#define CPU_R17				0x00000244
-+#define CPU_R18				0x00000248
-+#define CPU_R19				0x0000024c
-+#define CPU_R20				0x00000250
-+#define CPU_R21				0x00000254
-+#define CPU_R22				0x00000258
-+#define CPU_R23				0x0000025c
-+#define CPU_R24				0x00000260
-+#define CPU_R25				0x00000264
-+#define CPU_R26				0x00000268
-+#define CPU_R27				0x0000026c
-+#define CPU_R28				0x00000270
-+#define CPU_R29				0x00000274
-+#define CPU_R30				0x00000278
-+#define CPU_R31				0x0000027c
-+/* 0x280 --> 0x400 unused */
-+
-+#define RX_CPU_BASE			0x00005000
-+#define TX_CPU_BASE			0x00005400
-+
-+/* Mailboxes */
-+#define GRCMBOX_INTERRUPT_0		0x00005800 /* 64-bit */
-+#define GRCMBOX_INTERRUPT_1		0x00005808 /* 64-bit */
-+#define GRCMBOX_INTERRUPT_2		0x00005810 /* 64-bit */
-+#define GRCMBOX_INTERRUPT_3		0x00005818 /* 64-bit */
-+#define GRCMBOX_GENERAL_0		0x00005820 /* 64-bit */
-+#define GRCMBOX_GENERAL_1		0x00005828 /* 64-bit */
-+#define GRCMBOX_GENERAL_2		0x00005830 /* 64-bit */
-+#define GRCMBOX_GENERAL_3		0x00005838 /* 64-bit */
-+#define GRCMBOX_GENERAL_4		0x00005840 /* 64-bit */
-+#define GRCMBOX_GENERAL_5		0x00005848 /* 64-bit */
-+#define GRCMBOX_GENERAL_6		0x00005850 /* 64-bit */
-+#define GRCMBOX_GENERAL_7		0x00005858 /* 64-bit */
-+#define GRCMBOX_RELOAD_STAT		0x00005860 /* 64-bit */
-+#define GRCMBOX_RCVSTD_PROD_IDX		0x00005868 /* 64-bit */
-+#define GRCMBOX_RCVJUMBO_PROD_IDX	0x00005870 /* 64-bit */
-+#define GRCMBOX_RCVMINI_PROD_IDX	0x00005878 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_0	0x00005880 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_1	0x00005888 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_2	0x00005890 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_3	0x00005898 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_4	0x000058a0 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_5	0x000058a8 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_6	0x000058b0 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_7	0x000058b8 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_8	0x000058c0 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_9	0x000058c8 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_10	0x000058d0 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_11	0x000058d8 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_12	0x000058e0 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_13	0x000058e8 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_14	0x000058f0 /* 64-bit */
-+#define GRCMBOX_RCVRET_CON_IDX_15	0x000058f8 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_0	0x00005900 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_1	0x00005908 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_2	0x00005910 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_3	0x00005918 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_4	0x00005920 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_5	0x00005928 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_6	0x00005930 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_7	0x00005938 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_8	0x00005940 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_9	0x00005948 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_10	0x00005950 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_11	0x00005958 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_12	0x00005960 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_13	0x00005968 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_14	0x00005970 /* 64-bit */
-+#define GRCMBOX_SNDHOST_PROD_IDX_15	0x00005978 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_0	0x00005980 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_1	0x00005988 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_2	0x00005990 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_3	0x00005998 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_4	0x000059a0 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_5	0x000059a8 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_6	0x000059b0 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_7	0x000059b8 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_8	0x000059c0 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_9	0x000059c8 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_10	0x000059d0 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_11	0x000059d8 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_12	0x000059e0 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_13	0x000059e8 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_14	0x000059f0 /* 64-bit */
-+#define GRCMBOX_SNDNIC_PROD_IDX_15	0x000059f8 /* 64-bit */
-+#define GRCMBOX_HIGH_PRIO_EV_VECTOR	0x00005a00
-+#define GRCMBOX_HIGH_PRIO_EV_MASK	0x00005a04
-+#define GRCMBOX_LOW_PRIO_EV_VEC		0x00005a08
-+#define GRCMBOX_LOW_PRIO_EV_MASK	0x00005a0c
-+/* 0x5a10 --> 0x5c00 */
-+
-+/* Flow Through queues */
-+#define FTQ_RESET			0x00005c00
-+/* 0x5c04 --> 0x5c10 unused */
-+#define FTQ_DMA_NORM_READ_CTL		0x00005c10
-+#define FTQ_DMA_NORM_READ_FULL_CNT	0x00005c14
-+#define FTQ_DMA_NORM_READ_FIFO_ENQDEQ	0x00005c18
-+#define FTQ_DMA_NORM_READ_WRITE_PEEK	0x00005c1c
-+#define FTQ_DMA_HIGH_READ_CTL		0x00005c20
-+#define FTQ_DMA_HIGH_READ_FULL_CNT	0x00005c24
-+#define FTQ_DMA_HIGH_READ_FIFO_ENQDEQ	0x00005c28
-+#define FTQ_DMA_HIGH_READ_WRITE_PEEK	0x00005c2c
-+#define FTQ_DMA_COMP_DISC_CTL		0x00005c30
-+#define FTQ_DMA_COMP_DISC_FULL_CNT	0x00005c34
-+#define FTQ_DMA_COMP_DISC_FIFO_ENQDEQ	0x00005c38
-+#define FTQ_DMA_COMP_DISC_WRITE_PEEK	0x00005c3c
-+#define FTQ_SEND_BD_COMP_CTL		0x00005c40
-+#define FTQ_SEND_BD_COMP_FULL_CNT	0x00005c44
-+#define FTQ_SEND_BD_COMP_FIFO_ENQDEQ	0x00005c48
-+#define FTQ_SEND_BD_COMP_WRITE_PEEK	0x00005c4c
-+#define FTQ_SEND_DATA_INIT_CTL		0x00005c50
-+#define FTQ_SEND_DATA_INIT_FULL_CNT	0x00005c54
-+#define FTQ_SEND_DATA_INIT_FIFO_ENQDEQ	0x00005c58
-+#define FTQ_SEND_DATA_INIT_WRITE_PEEK	0x00005c5c
-+#define FTQ_DMA_NORM_WRITE_CTL		0x00005c60
-+#define FTQ_DMA_NORM_WRITE_FULL_CNT	0x00005c64
-+#define FTQ_DMA_NORM_WRITE_FIFO_ENQDEQ	0x00005c68
-+#define FTQ_DMA_NORM_WRITE_WRITE_PEEK	0x00005c6c
-+#define FTQ_DMA_HIGH_WRITE_CTL		0x00005c70
-+#define FTQ_DMA_HIGH_WRITE_FULL_CNT	0x00005c74
-+#define FTQ_DMA_HIGH_WRITE_FIFO_ENQDEQ	0x00005c78
-+#define FTQ_DMA_HIGH_WRITE_WRITE_PEEK	0x00005c7c
-+#define FTQ_SWTYPE1_CTL			0x00005c80
-+#define FTQ_SWTYPE1_FULL_CNT		0x00005c84
-+#define FTQ_SWTYPE1_FIFO_ENQDEQ		0x00005c88
-+#define FTQ_SWTYPE1_WRITE_PEEK		0x00005c8c
-+#define FTQ_SEND_DATA_COMP_CTL		0x00005c90
-+#define FTQ_SEND_DATA_COMP_FULL_CNT	0x00005c94
-+#define FTQ_SEND_DATA_COMP_FIFO_ENQDEQ	0x00005c98
-+#define FTQ_SEND_DATA_COMP_WRITE_PEEK	0x00005c9c
-+#define FTQ_HOST_COAL_CTL		0x00005ca0
-+#define FTQ_HOST_COAL_FULL_CNT		0x00005ca4
-+#define FTQ_HOST_COAL_FIFO_ENQDEQ	0x00005ca8
-+#define FTQ_HOST_COAL_WRITE_PEEK	0x00005cac
-+#define FTQ_MAC_TX_CTL			0x00005cb0
-+#define FTQ_MAC_TX_FULL_CNT		0x00005cb4
-+#define FTQ_MAC_TX_FIFO_ENQDEQ		0x00005cb8
-+#define FTQ_MAC_TX_WRITE_PEEK		0x00005cbc
-+#define FTQ_MB_FREE_CTL			0x00005cc0
-+#define FTQ_MB_FREE_FULL_CNT		0x00005cc4
-+#define FTQ_MB_FREE_FIFO_ENQDEQ		0x00005cc8
-+#define FTQ_MB_FREE_WRITE_PEEK		0x00005ccc
-+#define FTQ_RCVBD_COMP_CTL		0x00005cd0
-+#define FTQ_RCVBD_COMP_FULL_CNT		0x00005cd4
-+#define FTQ_RCVBD_COMP_FIFO_ENQDEQ	0x00005cd8
-+#define FTQ_RCVBD_COMP_WRITE_PEEK	0x00005cdc
-+#define FTQ_RCVLST_PLMT_CTL		0x00005ce0
-+#define FTQ_RCVLST_PLMT_FULL_CNT	0x00005ce4
-+#define FTQ_RCVLST_PLMT_FIFO_ENQDEQ	0x00005ce8
-+#define FTQ_RCVLST_PLMT_WRITE_PEEK	0x00005cec
-+#define FTQ_RCVDATA_INI_CTL		0x00005cf0
-+#define FTQ_RCVDATA_INI_FULL_CNT	0x00005cf4
-+#define FTQ_RCVDATA_INI_FIFO_ENQDEQ	0x00005cf8
-+#define FTQ_RCVDATA_INI_WRITE_PEEK	0x00005cfc
-+#define FTQ_RCVDATA_COMP_CTL		0x00005d00
-+#define FTQ_RCVDATA_COMP_FULL_CNT	0x00005d04
-+#define FTQ_RCVDATA_COMP_FIFO_ENQDEQ	0x00005d08
-+#define FTQ_RCVDATA_COMP_WRITE_PEEK	0x00005d0c
-+#define FTQ_SWTYPE2_CTL			0x00005d10
-+#define FTQ_SWTYPE2_FULL_CNT		0x00005d14
-+#define FTQ_SWTYPE2_FIFO_ENQDEQ		0x00005d18
-+#define FTQ_SWTYPE2_WRITE_PEEK		0x00005d1c
-+/* 0x5d20 --> 0x6000 unused */
-+
-+/* Message signaled interrupt registers */
-+#define MSGINT_MODE			0x00006000
-+#define  MSGINT_MODE_RESET		 0x00000001
-+#define  MSGINT_MODE_ENABLE		 0x00000002
-+#define MSGINT_STATUS			0x00006004
-+#define MSGINT_FIFO			0x00006008
-+/* 0x600c --> 0x6400 unused */
-+
-+/* DMA completion registers */
-+#define DMAC_MODE			0x00006400
-+#define  DMAC_MODE_RESET		 0x00000001
-+#define  DMAC_MODE_ENABLE		 0x00000002
-+/* 0x6404 --> 0x6800 unused */
-+
-+/* GRC registers */
-+#define GRC_MODE			0x00006800
-+#define  GRC_MODE_UPD_ON_COAL		0x00000001
-+#define  GRC_MODE_BSWAP_NONFRM_DATA	0x00000002
-+#define  GRC_MODE_WSWAP_NONFRM_DATA	0x00000004
-+#define  GRC_MODE_BSWAP_DATA		0x00000010
-+#define  GRC_MODE_WSWAP_DATA		0x00000020
-+#define  GRC_MODE_SPLITHDR		0x00000100
-+#define  GRC_MODE_NOFRM_CRACKING	0x00000200
-+#define  GRC_MODE_INCL_CRC		0x00000400
-+#define  GRC_MODE_ALLOW_BAD_FRMS	0x00000800
-+#define  GRC_MODE_NOIRQ_ON_SENDS	0x00002000
-+#define  GRC_MODE_NOIRQ_ON_RCV		0x00004000
-+#define  GRC_MODE_FORCE_PCI32BIT	0x00008000
-+#define  GRC_MODE_HOST_STACKUP		0x00010000
-+#define  GRC_MODE_HOST_SENDBDS		0x00020000
-+#define  GRC_MODE_NO_TX_PHDR_CSUM	0x00100000
-+#define  GRC_MODE_NO_RX_PHDR_CSUM	0x00800000
-+#define  GRC_MODE_IRQ_ON_TX_CPU_ATTN	0x01000000
-+#define  GRC_MODE_IRQ_ON_RX_CPU_ATTN	0x02000000
-+#define  GRC_MODE_IRQ_ON_MAC_ATTN	0x04000000
-+#define  GRC_MODE_IRQ_ON_DMA_ATTN	0x08000000
-+#define  GRC_MODE_IRQ_ON_FLOW_ATTN	0x10000000
-+#define  GRC_MODE_4X_NIC_SEND_RINGS	0x20000000
-+#define  GRC_MODE_MCAST_FRM_ENABLE	0x40000000
-+#define GRC_MISC_CFG			0x00006804
-+#define  GRC_MISC_CFG_CORECLK_RESET	0x00000001
-+#define  GRC_MISC_CFG_PRESCALAR_MASK	0x000000fe
-+#define  GRC_MISC_CFG_PRESCALAR_SHIFT	1
-+#define  GRC_MISC_CFG_BOARD_ID_MASK	0x0001e000
-+#define  GRC_MISC_CFG_BOARD_ID_5700	0x0001e000
-+#define  GRC_MISC_CFG_BOARD_ID_5701	0x00000000
-+#define  GRC_MISC_CFG_BOARD_ID_5702FE	0x00004000
-+#define  GRC_MISC_CFG_BOARD_ID_5703	0x00000000
-+#define  GRC_MISC_CFG_BOARD_ID_5703S	0x00002000
-+#define  GRC_MISC_CFG_BOARD_ID_5704	0x00000000
-+#define  GRC_MISC_CFG_BOARD_ID_5704CIOBE 0x00004000
-+#define  GRC_MISC_CFG_BOARD_ID_5704_A2	0x00008000
-+#define  GRC_MISC_CFG_BOARD_ID_5788	0x00010000
-+#define  GRC_MISC_CFG_BOARD_ID_5788M	0x00018000
-+#define  GRC_MISC_CFG_BOARD_ID_AC91002A1 0x00018000
-+#define  GRC_MISC_CFG_KEEP_GPHY_POWER	0x04000000
-+#define GRC_LOCAL_CTRL			0x00006808
-+#define  GRC_LCLCTRL_INT_ACTIVE		0x00000001
-+#define  GRC_LCLCTRL_CLEARINT		0x00000002
-+#define  GRC_LCLCTRL_SETINT		0x00000004
-+#define  GRC_LCLCTRL_INT_ON_ATTN	0x00000008
-+#define  GRC_LCLCTRL_GPIO_INPUT0	0x00000100
-+#define  GRC_LCLCTRL_GPIO_INPUT1	0x00000200
-+#define  GRC_LCLCTRL_GPIO_INPUT2	0x00000400
-+#define  GRC_LCLCTRL_GPIO_OE0		0x00000800
-+#define  GRC_LCLCTRL_GPIO_OE1		0x00001000
-+#define  GRC_LCLCTRL_GPIO_OE2		0x00002000
-+#define  GRC_LCLCTRL_GPIO_OUTPUT0	0x00004000
-+#define  GRC_LCLCTRL_GPIO_OUTPUT1	0x00008000
-+#define  GRC_LCLCTRL_GPIO_OUTPUT2	0x00010000
-+#define  GRC_LCLCTRL_EXTMEM_ENABLE	0x00020000
-+#define  GRC_LCLCTRL_MEMSZ_MASK		0x001c0000
-+#define  GRC_LCLCTRL_MEMSZ_256K		0x00000000
-+#define  GRC_LCLCTRL_MEMSZ_512K		0x00040000
-+#define  GRC_LCLCTRL_MEMSZ_1M		0x00080000
-+#define  GRC_LCLCTRL_MEMSZ_2M		0x000c0000
-+#define  GRC_LCLCTRL_MEMSZ_4M		0x00100000
-+#define  GRC_LCLCTRL_MEMSZ_8M		0x00140000
-+#define  GRC_LCLCTRL_MEMSZ_16M		0x00180000
-+#define  GRC_LCLCTRL_BANK_SELECT	0x00200000
-+#define  GRC_LCLCTRL_SSRAM_TYPE		0x00400000
-+#define  GRC_LCLCTRL_AUTO_SEEPROM	0x01000000
-+#define GRC_TIMER			0x0000680c
-+#define GRC_RX_CPU_EVENT		0x00006810
-+#define GRC_RX_TIMER_REF		0x00006814
-+#define GRC_RX_CPU_SEM			0x00006818
-+#define GRC_REMOTE_RX_CPU_ATTN		0x0000681c
-+#define GRC_TX_CPU_EVENT		0x00006820
-+#define GRC_TX_TIMER_REF		0x00006824
-+#define GRC_TX_CPU_SEM			0x00006828
-+#define GRC_REMOTE_TX_CPU_ATTN		0x0000682c
-+#define GRC_MEM_POWER_UP		0x00006830 /* 64-bit */
-+#define GRC_EEPROM_ADDR			0x00006838
-+#define  EEPROM_ADDR_WRITE		0x00000000
-+#define  EEPROM_ADDR_READ		0x80000000
-+#define  EEPROM_ADDR_COMPLETE		0x40000000
-+#define  EEPROM_ADDR_FSM_RESET		0x20000000
-+#define  EEPROM_ADDR_DEVID_MASK		0x1c000000
-+#define  EEPROM_ADDR_DEVID_SHIFT	26
-+#define  EEPROM_ADDR_START		0x02000000
-+#define  EEPROM_ADDR_CLKPERD_SHIFT	16
-+#define  EEPROM_ADDR_ADDR_MASK		0x0000ffff
-+#define  EEPROM_ADDR_ADDR_SHIFT		0
-+#define  EEPROM_DEFAULT_CLOCK_PERIOD	0x60
-+#define  EEPROM_CHIP_SIZE		(64 * 1024)
-+#define GRC_EEPROM_DATA			0x0000683c
-+#define GRC_EEPROM_CTRL			0x00006840
-+#define GRC_MDI_CTRL			0x00006844
-+#define GRC_SEEPROM_DELAY		0x00006848
-+/* 0x684c --> 0x6c00 unused */
-+
-+/* 0x6c00 --> 0x7000 unused */
-+
-+/* NVRAM Control registers */
-+#define NVRAM_CMD			0x00007000
-+#define  NVRAM_CMD_RESET		 0x00000001
-+#define  NVRAM_CMD_DONE			 0x00000008
-+#define  NVRAM_CMD_GO			 0x00000010
-+#define  NVRAM_CMD_WR			 0x00000020
-+#define  NVRAM_CMD_RD			 0x00000000
-+#define  NVRAM_CMD_ERASE		 0x00000040
-+#define  NVRAM_CMD_FIRST		 0x00000080
-+#define  NVRAM_CMD_LAST			 0x00000100
-+#define NVRAM_STAT			0x00007004
-+#define NVRAM_WRDATA			0x00007008
-+#define NVRAM_ADDR			0x0000700c
-+#define  NVRAM_ADDR_MSK			0x00ffffff
-+#define NVRAM_RDDATA			0x00007010
-+#define NVRAM_CFG1			0x00007014
-+#define  NVRAM_CFG1_FLASHIF_ENAB	 0x00000001
-+#define  NVRAM_CFG1_BUFFERED_MODE	 0x00000002
-+#define  NVRAM_CFG1_PASS_THRU		 0x00000004
-+#define  NVRAM_CFG1_BIT_BANG		 0x00000008
-+#define  NVRAM_CFG1_COMPAT_BYPASS	 0x80000000
-+#define NVRAM_CFG2			0x00007018
-+#define NVRAM_CFG3			0x0000701c
-+#define NVRAM_SWARB			0x00007020
-+#define  SWARB_REQ_SET0			 0x00000001
-+#define  SWARB_REQ_SET1			 0x00000002
-+#define  SWARB_REQ_SET2			 0x00000004
-+#define  SWARB_REQ_SET3			 0x00000008
-+#define  SWARB_REQ_CLR0			 0x00000010
-+#define  SWARB_REQ_CLR1			 0x00000020
-+#define  SWARB_REQ_CLR2			 0x00000040
-+#define  SWARB_REQ_CLR3			 0x00000080
-+#define  SWARB_GNT0			 0x00000100
-+#define  SWARB_GNT1			 0x00000200
-+#define  SWARB_GNT2			 0x00000400
-+#define  SWARB_GNT3			 0x00000800
-+#define  SWARB_REQ0			 0x00001000
-+#define  SWARB_REQ1			 0x00002000
-+#define  SWARB_REQ2			 0x00004000
-+#define  SWARB_REQ3			 0x00008000
-+#define    NVRAM_BUFFERED_PAGE_SIZE	   264
-+#define    NVRAM_BUFFERED_PAGE_POS	   9
-+/* 0x7024 --> 0x7400 unused */
-+
-+/* 0x7400 --> 0x8000 unused */
-+
-+/* 32K Window into NIC internal memory */
-+#define NIC_SRAM_WIN_BASE		0x00008000
-+
-+/* Offsets into first 32k of NIC internal memory. */
-+#define NIC_SRAM_PAGE_ZERO		0x00000000
-+#define NIC_SRAM_SEND_RCB		0x00000100 /* 16 * TG3_BDINFO_... */
-+#define NIC_SRAM_RCV_RET_RCB		0x00000200 /* 16 * TG3_BDINFO_... */
-+#define NIC_SRAM_STATS_BLK		0x00000300
-+#define NIC_SRAM_STATUS_BLK		0x00000b00
-+
-+#define NIC_SRAM_FIRMWARE_MBOX		0x00000b50
-+#define  NIC_SRAM_FIRMWARE_MBOX_MAGIC1	 0x4B657654
-+#define  NIC_SRAM_FIRMWARE_MBOX_MAGIC2	 0x4861764b /* !dma on linkchg */
-+
-+#define NIC_SRAM_DATA_SIG		0x00000b54
-+#define  NIC_SRAM_DATA_SIG_MAGIC	 0x4b657654 /* ascii for 'KevT' */
-+
-+#define NIC_SRAM_DATA_CFG			0x00000b58
-+#define  NIC_SRAM_DATA_CFG_LED_MODE_MASK	 0x0000000c
-+#define  NIC_SRAM_DATA_CFG_LED_MODE_UNKNOWN	 0x00000000
-+#define  NIC_SRAM_DATA_CFG_LED_TRIPLE_SPD	 0x00000004
-+#define  NIC_SRAM_DATA_CFG_LED_OPEN_DRAIN	 0x00000004
-+#define  NIC_SRAM_DATA_CFG_LED_LINK_SPD		 0x00000008
-+#define  NIC_SRAM_DATA_CFG_LED_OUTPUT		 0x00000008
-+#define  NIC_SRAM_DATA_CFG_PHY_TYPE_MASK	 0x00000030
-+#define  NIC_SRAM_DATA_CFG_PHY_TYPE_UNKNOWN	 0x00000000
-+#define  NIC_SRAM_DATA_CFG_PHY_TYPE_COPPER	 0x00000010
-+#define  NIC_SRAM_DATA_CFG_PHY_TYPE_FIBER	 0x00000020
-+#define  NIC_SRAM_DATA_CFG_WOL_ENABLE		 0x00000040
-+#define  NIC_SRAM_DATA_CFG_ASF_ENABLE		 0x00000080
-+#define  NIC_SRAM_DATA_CFG_EEPROM_WP		 0x00000100
-+#define  NIC_SRAM_DATA_CFG_MINI_PCI		 0x00001000
-+#define  NIC_SRAM_DATA_CFG_FIBER_WOL		 0x00004000
-+
-+#define NIC_SRAM_DATA_PHY_ID		0x00000b74
-+#define  NIC_SRAM_DATA_PHY_ID1_MASK	 0xffff0000
-+#define  NIC_SRAM_DATA_PHY_ID2_MASK	 0x0000ffff
-+
-+#define NIC_SRAM_FW_CMD_MBOX		0x00000b78
-+#define  FWCMD_NICDRV_ALIVE		 0x00000001
-+#define  FWCMD_NICDRV_PAUSE_FW		 0x00000002
-+#define  FWCMD_NICDRV_IPV4ADDR_CHG	 0x00000003
-+#define  FWCMD_NICDRV_IPV6ADDR_CHG	 0x00000004
-+#define  FWCMD_NICDRV_FIX_DMAR		 0x00000005
-+#define  FWCMD_NICDRV_FIX_DMAW		 0x00000006
-+#define NIC_SRAM_FW_CMD_LEN_MBOX	0x00000b7c
-+#define NIC_SRAM_FW_CMD_DATA_MBOX	0x00000b80
-+#define NIC_SRAM_FW_ASF_STATUS_MBOX	0x00000c00
-+#define NIC_SRAM_FW_DRV_STATE_MBOX	0x00000c04
-+#define  DRV_STATE_START		 0x00000001
-+#define  DRV_STATE_UNLOAD		 0x00000002
-+#define  DRV_STATE_WOL			 0x00000003
-+#define  DRV_STATE_SUSPEND		 0x00000004
-+
-+#define NIC_SRAM_FW_RESET_TYPE_MBOX	0x00000c08
-+
-+#define NIC_SRAM_MAC_ADDR_HIGH_MBOX	0x00000c14
-+#define NIC_SRAM_MAC_ADDR_LOW_MBOX	0x00000c18
-+
-+#define NIC_SRAM_RX_MINI_BUFFER_DESC	0x00001000
-+
-+#define NIC_SRAM_DMA_DESC_POOL_BASE	0x00002000
-+#define  NIC_SRAM_DMA_DESC_POOL_SIZE	 0x00002000
-+#define NIC_SRAM_TX_BUFFER_DESC		0x00004000 /* 512 entries */
-+#define NIC_SRAM_RX_BUFFER_DESC		0x00006000 /* 256 entries */
-+#define NIC_SRAM_RX_JUMBO_BUFFER_DESC	0x00007000 /* 256 entries */
-+#define NIC_SRAM_MBUF_POOL_BASE		0x00008000
-+#define  NIC_SRAM_MBUF_POOL_SIZE96	 0x00018000
-+#define  NIC_SRAM_MBUF_POOL_SIZE64	 0x00010000
-+#define  NIC_SRAM_MBUF_POOL_BASE5705	0x00010000
-+#define  NIC_SRAM_MBUF_POOL_SIZE5705	0x0000e000
-+
-+/* Currently this is fixed. */
-+#define PHY_ADDR		0x01
-+
-+/* Tigon3 specific PHY MII registers. */
-+#define  TG3_BMCR_SPEED1000		0x0040
-+
-+#define MII_TG3_CTRL			0x09 /* 1000-baseT control register */
-+#define  MII_TG3_CTRL_ADV_1000_HALF	0x0100
-+#define  MII_TG3_CTRL_ADV_1000_FULL	0x0200
-+#define  MII_TG3_CTRL_AS_MASTER		0x0800
-+#define  MII_TG3_CTRL_ENABLE_AS_MASTER	0x1000
-+
-+#define MII_TG3_EXT_CTRL		0x10 /* Extended control register */
-+#define  MII_TG3_EXT_CTRL_LNK3_LED_MODE	0x0002
-+#define  MII_TG3_EXT_CTRL_TBI		0x8000
-+
-+#define MII_TG3_EXT_STAT		0x11 /* Extended status register */
-+#define  MII_TG3_EXT_STAT_LPASS		0x0100
-+
-+#define MII_TG3_DSP_RW_PORT		0x15 /* DSP coefficient read/write port */
-+
-+#define MII_TG3_DSP_ADDRESS		0x17 /* DSP address register */
-+
-+#define MII_TG3_AUX_CTRL		0x18 /* auxilliary control register */
-+
-+#define MII_TG3_AUX_STAT		0x19 /* auxilliary status register */
-+#define MII_TG3_AUX_STAT_LPASS		0x0004
-+#define MII_TG3_AUX_STAT_SPDMASK	0x0700
-+#define MII_TG3_AUX_STAT_10HALF		0x0100
-+#define MII_TG3_AUX_STAT_10FULL		0x0200
-+#define MII_TG3_AUX_STAT_100HALF	0x0300
-+#define MII_TG3_AUX_STAT_100_4		0x0400
-+#define MII_TG3_AUX_STAT_100FULL	0x0500
-+#define MII_TG3_AUX_STAT_1000HALF	0x0600
-+#define MII_TG3_AUX_STAT_1000FULL	0x0700
-+
-+#define MII_TG3_ISTAT			0x1a /* IRQ status register */
-+#define MII_TG3_IMASK			0x1b /* IRQ mask register */
-+
-+/* ISTAT/IMASK event bits */
-+#define MII_TG3_INT_LINKCHG		0x0002
-+#define MII_TG3_INT_SPEEDCHG		0x0004
-+#define MII_TG3_INT_DUPLEXCHG		0x0008
-+#define MII_TG3_INT_ANEG_PAGE_RX	0x0400
-+
-+/* XXX Add this to mii.h */
-+#ifndef ADVERTISE_PAUSE
-+#define ADVERTISE_PAUSE_CAP		0x0400
-+#endif
-+#ifndef ADVERTISE_PAUSE_ASYM
-+#define ADVERTISE_PAUSE_ASYM		0x0800
-+#endif
-+#ifndef LPA_PAUSE
-+#define LPA_PAUSE_CAP			0x0400
-+#endif
-+#ifndef LPA_PAUSE_ASYM
-+#define LPA_PAUSE_ASYM			0x0800
-+#endif
-+
-+/* There are two ways to manage the TX descriptors on the tigon3.
-+ * Either the descriptors are in host DMA'able memory, or they
-+ * exist only in the cards on-chip SRAM.  All 16 send bds are under
-+ * the same mode, they may not be configured individually.
-+ *
-+ * The mode we use is controlled by TG3_FLAG_HOST_TXDS in tp->tg3_flags.
-+ *
-+ * To use host memory TX descriptors:
-+ *	1) Set GRC_MODE_HOST_SENDBDS in GRC_MODE register.
-+ *	   Make sure GRC_MODE_4X_NIC_SEND_RINGS is clear.
-+ *	2) Allocate DMA'able memory.
-+ *	3) In NIC_SRAM_SEND_RCB (of desired index) of on-chip SRAM:
-+ *	   a) Set TG3_BDINFO_HOST_ADDR to DMA address of memory
-+ *	      obtained in step 2
-+ *	   b) Set TG3_BDINFO_NIC_ADDR to NIC_SRAM_TX_BUFFER_DESC.
-+ *	   c) Set len field of TG3_BDINFO_MAXLEN_FLAGS to number
-+ *            of TX descriptors.  Leave flags field clear.
-+ *	4) Access TX descriptors via host memory.  The chip
-+ *	   will refetch into local SRAM as needed when producer
-+ *	   index mailboxes are updated.
-+ *
-+ * To use on-chip TX descriptors:
-+ *	1) Set GRC_MODE_4X_NIC_SEND_RINGS in GRC_MODE register.
-+ *	   Make sure GRC_MODE_HOST_SENDBDS is clear.
-+ *	2) In NIC_SRAM_SEND_RCB (of desired index) of on-chip SRAM:
-+ *	   a) Set TG3_BDINFO_HOST_ADDR to zero.
-+ *	   b) Set TG3_BDINFO_NIC_ADDR to NIC_SRAM_TX_BUFFER_DESC
-+ *	   c) TG3_BDINFO_MAXLEN_FLAGS is don't care.
-+ *	3) Access TX descriptors directly in on-chip SRAM
-+ *	   using normal {read,write}l().  (and not using
-+ *         pointer dereferencing of ioremap()'d memory like
-+ *	   the broken Broadcom driver does)
-+ *
-+ * Note that BDINFO_FLAGS_DISABLED should be set in the flags field of
-+ * TG3_BDINFO_MAXLEN_FLAGS of all unused SEND_RCB indices.
-+ */
-+struct tg3_tx_buffer_desc {
-+	uint32_t			addr_hi;
-+	uint32_t			addr_lo;
-+
-+	uint32_t			len_flags;
-+#define TXD_FLAG_TCPUDP_CSUM		0x0001
-+#define TXD_FLAG_IP_CSUM		0x0002
-+#define TXD_FLAG_END			0x0004
-+#define TXD_FLAG_IP_FRAG		0x0008
-+#define TXD_FLAG_IP_FRAG_END		0x0010
-+#define TXD_FLAG_VLAN			0x0040
-+#define TXD_FLAG_COAL_NOW		0x0080
-+#define TXD_FLAG_CPU_PRE_DMA		0x0100
-+#define TXD_FLAG_CPU_POST_DMA		0x0200
-+#define TXD_FLAG_ADD_SRC_ADDR		0x1000
-+#define TXD_FLAG_CHOOSE_SRC_ADDR	0x6000
-+#define TXD_FLAG_NO_CRC			0x8000
-+#define TXD_LEN_SHIFT			16
-+
-+	uint32_t			vlan_tag;
-+#define TXD_VLAN_TAG_SHIFT		0
-+#define TXD_MSS_SHIFT			16
-+};
-+
-+#define TXD_ADDR			0x00UL /* 64-bit */
-+#define TXD_LEN_FLAGS			0x08UL /* 32-bit (upper 16-bits are len) */
-+#define TXD_VLAN_TAG			0x0cUL /* 32-bit (upper 16-bits are tag) */
-+#define TXD_SIZE			0x10UL
-+
-+struct tg3_rx_buffer_desc {
-+	uint32_t			addr_hi;
-+	uint32_t			addr_lo;
-+
-+	uint32_t			idx_len;
-+#define RXD_IDX_MASK	0xffff0000
-+#define RXD_IDX_SHIFT	16
-+#define RXD_LEN_MASK	0x0000ffff
-+#define RXD_LEN_SHIFT	0
-+
-+	uint32_t			type_flags;
-+#define RXD_TYPE_SHIFT	16
-+#define RXD_FLAGS_SHIFT	0
-+
-+#define RXD_FLAG_END			0x0004
-+#define RXD_FLAG_MINI			0x0800
-+#define RXD_FLAG_JUMBO			0x0020
-+#define RXD_FLAG_VLAN			0x0040
-+#define RXD_FLAG_ERROR			0x0400
-+#define RXD_FLAG_IP_CSUM		0x1000
-+#define RXD_FLAG_TCPUDP_CSUM		0x2000
-+#define RXD_FLAG_IS_TCP			0x4000
-+
-+	uint32_t			ip_tcp_csum;
-+#define RXD_IPCSUM_MASK		0xffff0000
-+#define RXD_IPCSUM_SHIFT	16
-+#define RXD_TCPCSUM_MASK	0x0000ffff
-+#define RXD_TCPCSUM_SHIFT	0
-+
-+	uint32_t			err_vlan;
-+
-+#define RXD_VLAN_MASK			0x0000ffff
-+
-+#define RXD_ERR_BAD_CRC			0x00010000
-+#define RXD_ERR_COLLISION		0x00020000
-+#define RXD_ERR_LINK_LOST		0x00040000
-+#define RXD_ERR_PHY_DECODE		0x00080000
-+#define RXD_ERR_ODD_NIBBLE_RCVD_MII	0x00100000
-+#define RXD_ERR_MAC_ABRT		0x00200000
-+#define RXD_ERR_TOO_SMALL		0x00400000
-+#define RXD_ERR_NO_RESOURCES		0x00800000
-+#define RXD_ERR_HUGE_FRAME		0x01000000
-+#define RXD_ERR_MASK			0xffff0000
-+
-+	uint32_t			reserved;
-+	uint32_t			opaque;
-+#define RXD_OPAQUE_INDEX_MASK		0x0000ffff
-+#define RXD_OPAQUE_INDEX_SHIFT		0
-+#define RXD_OPAQUE_RING_STD		0x00010000
-+#define RXD_OPAQUE_RING_JUMBO		0x00020000
-+#define RXD_OPAQUE_RING_MINI		0x00040000
-+#define RXD_OPAQUE_RING_MASK		0x00070000
-+};
-+
-+struct tg3_ext_rx_buffer_desc {
-+	struct {
-+		uint32_t		addr_hi;
-+		uint32_t		addr_lo;
-+	}				addrlist[3];
-+	uint32_t			len2_len1;
-+	uint32_t			resv_len3;
-+	struct tg3_rx_buffer_desc	std;
-+};
-+
-+/* We only use this when testing out the DMA engine
-+ * at probe time.  This is the internal format of buffer
-+ * descriptors used by the chip at NIC_SRAM_DMA_DESCS.
-+ */
-+struct tg3_internal_buffer_desc {
-+	uint32_t			addr_hi;
-+	uint32_t			addr_lo;
-+	uint32_t			nic_mbuf;
-+	/* XXX FIX THIS */
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+	uint16_t			cqid_sqid;
-+	uint16_t			len;
-+#else
-+	uint16_t			len;
-+	uint16_t			cqid_sqid;
-+#endif
-+	uint32_t			flags;
-+	uint32_t			__cookie1;
-+	uint32_t			__cookie2;
-+	uint32_t			__cookie3;
-+};
-+
-+#define TG3_HW_STATUS_SIZE		0x50
-+struct tg3_hw_status {
-+	uint32_t			status;
-+#define SD_STATUS_UPDATED		0x00000001
-+#define SD_STATUS_LINK_CHG		0x00000002
-+#define SD_STATUS_ERROR			0x00000004
-+
-+	uint32_t			status_tag;
-+
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+	uint16_t			rx_consumer;
-+	uint16_t			rx_jumbo_consumer;
-+#else
-+	uint16_t			rx_jumbo_consumer;
-+	uint16_t			rx_consumer;
-+#endif
-+
-+#if __BYTE_ORDER ==  __BIG_ENDIAN
-+	uint16_t			reserved;
-+	uint16_t			rx_mini_consumer;
-+#else
-+	uint16_t			rx_mini_consumer;
-+	uint16_t			reserved;
-+#endif
-+	struct {
-+#if __BYTE_ORDER ==  __BIG_ENDIAN
-+		uint16_t		tx_consumer;
-+		uint16_t		rx_producer;
-+#else
-+		uint16_t		rx_producer;
-+		uint16_t		tx_consumer;
-+#endif
-+	}				idx[16];
-+};
-+
-+typedef struct {
-+	uint32_t high, low;
-+} tg3_stat64_t;
-+
-+struct tg3_hw_stats {
-+	uint8_t				__reserved0[0x400-0x300];
-+
-+	/* Statistics maintained by Receive MAC. */
-+	tg3_stat64_t			rx_octets;
-+	uint64_t			__reserved1;
-+	tg3_stat64_t			rx_fragments;
-+	tg3_stat64_t			rx_ucast_packets;
-+	tg3_stat64_t			rx_mcast_packets;
-+	tg3_stat64_t			rx_bcast_packets;
-+	tg3_stat64_t			rx_fcs_errors;
-+	tg3_stat64_t			rx_align_errors;
-+	tg3_stat64_t			rx_xon_pause_rcvd;
-+	tg3_stat64_t			rx_xoff_pause_rcvd;
-+	tg3_stat64_t			rx_mac_ctrl_rcvd;
-+	tg3_stat64_t			rx_xoff_entered;
-+	tg3_stat64_t			rx_frame_too_long_errors;
-+	tg3_stat64_t			rx_jabbers;
-+	tg3_stat64_t			rx_undersize_packets;
-+	tg3_stat64_t			rx_in_length_errors;
-+	tg3_stat64_t			rx_out_length_errors;
-+	tg3_stat64_t			rx_64_or_less_octet_packets;
-+	tg3_stat64_t			rx_65_to_127_octet_packets;
-+	tg3_stat64_t			rx_128_to_255_octet_packets;
-+	tg3_stat64_t			rx_256_to_511_octet_packets;
-+	tg3_stat64_t			rx_512_to_1023_octet_packets;
-+	tg3_stat64_t			rx_1024_to_1522_octet_packets;
-+	tg3_stat64_t			rx_1523_to_2047_octet_packets;
-+	tg3_stat64_t			rx_2048_to_4095_octet_packets;
-+	tg3_stat64_t			rx_4096_to_8191_octet_packets;
-+	tg3_stat64_t			rx_8192_to_9022_octet_packets;
-+
-+	uint64_t			__unused0[37];
-+
-+	/* Statistics maintained by Transmit MAC. */
-+	tg3_stat64_t			tx_octets;
-+	uint64_t			__reserved2;
-+	tg3_stat64_t			tx_collisions;
-+	tg3_stat64_t			tx_xon_sent;
-+	tg3_stat64_t			tx_xoff_sent;
-+	tg3_stat64_t			tx_flow_control;
-+	tg3_stat64_t			tx_mac_errors;
-+	tg3_stat64_t			tx_single_collisions;
-+	tg3_stat64_t			tx_mult_collisions;
-+	tg3_stat64_t			tx_deferred;
-+	uint64_t			__reserved3;
-+	tg3_stat64_t			tx_excessive_collisions;
-+	tg3_stat64_t			tx_late_collisions;
-+	tg3_stat64_t			tx_collide_2times;
-+	tg3_stat64_t			tx_collide_3times;
-+	tg3_stat64_t			tx_collide_4times;
-+	tg3_stat64_t			tx_collide_5times;
-+	tg3_stat64_t			tx_collide_6times;
-+	tg3_stat64_t			tx_collide_7times;
-+	tg3_stat64_t			tx_collide_8times;
-+	tg3_stat64_t			tx_collide_9times;
-+	tg3_stat64_t			tx_collide_10times;
-+	tg3_stat64_t			tx_collide_11times;
-+	tg3_stat64_t			tx_collide_12times;
-+	tg3_stat64_t			tx_collide_13times;
-+	tg3_stat64_t			tx_collide_14times;
-+	tg3_stat64_t			tx_collide_15times;
-+	tg3_stat64_t			tx_ucast_packets;
-+	tg3_stat64_t			tx_mcast_packets;
-+	tg3_stat64_t			tx_bcast_packets;
-+	tg3_stat64_t			tx_carrier_sense_errors;
-+	tg3_stat64_t			tx_discards;
-+	tg3_stat64_t			tx_errors;
-+
-+	uint64_t			__unused1[31];
-+
-+	/* Statistics maintained by Receive List Placement. */
-+	tg3_stat64_t			COS_rx_packets[16];
-+	tg3_stat64_t			COS_rx_filter_dropped;
-+	tg3_stat64_t			dma_writeq_full;
-+	tg3_stat64_t			dma_write_prioq_full;
-+	tg3_stat64_t			rxbds_empty;
-+	tg3_stat64_t			rx_discards;
-+	tg3_stat64_t			rx_errors;
-+	tg3_stat64_t			rx_threshold_hit;
-+
-+	uint64_t			__unused2[9];
-+
-+	/* Statistics maintained by Send Data Initiator. */
-+	tg3_stat64_t			COS_out_packets[16];
-+	tg3_stat64_t			dma_readq_full;
-+	tg3_stat64_t			dma_read_prioq_full;
-+	tg3_stat64_t			tx_comp_queue_full;
-+
-+	/* Statistics maintained by Host Coalescing. */
-+	tg3_stat64_t			ring_set_send_prod_index;
-+	tg3_stat64_t			ring_status_update;
-+	tg3_stat64_t			nic_irqs;
-+	tg3_stat64_t			nic_avoided_irqs;
-+	tg3_stat64_t			nic_tx_threshold_hit;
-+
-+	uint8_t				__reserved4[0xb00-0x9c0];
-+};
-+
-+enum phy_led_mode {
-+	led_mode_auto,
-+	led_mode_three_link,
-+	led_mode_link10
-+};
-+
-+#if 0
-+/* 'mapping' is superfluous as the chip does not write into
-+ * the tx/rx post rings so we could just fetch it from there.
-+ * But the cache behavior is better how we are doing it now.
-+ */
-+struct ring_info {
-+	struct sk_buff			*skb;
-+	DECLARE_PCI_UNMAP_ADDR(mapping)
-+};
-+
-+struct tx_ring_info {
-+	struct sk_buff			*skb;
-+	DECLARE_PCI_UNMAP_ADDR(mapping)
-+	uint32_t			prev_vlan_tag;
-+};
-+#endif
-+
-+struct tg3_config_info {
-+	uint32_t			flags;
-+};
-+
-+struct tg3_link_config {
-+	/* Describes what we're trying to get. */
-+	uint32_t			advertising;
-+#if 0
-+	uint16_t			speed;
-+	uint8_t				duplex;
-+	uint8_t				autoneg;
-+#define SPEED_INVALID		0xffff
-+#define DUPLEX_INVALID		0xff
-+#define AUTONEG_INVALID		0xff
-+#endif
-+
-+	/* Describes what we actually have. */
-+	uint8_t				active_speed;
-+	uint8_t				active_duplex;
-+
-+	/* When we go in and out of low power mode we need
-+	 * to swap with this state.
-+	 */
-+#if 0
-+	int				phy_is_low_power;
-+	uint16_t			orig_speed;
-+	uint8_t				orig_duplex;
-+	uint8_t				orig_autoneg;
-+#endif
-+};
-+
-+struct tg3_bufmgr_config {
-+	uint32_t		mbuf_read_dma_low_water;
-+	uint32_t		mbuf_mac_rx_low_water;
-+	uint32_t		mbuf_high_water;
-+
-+	uint32_t		mbuf_read_dma_low_water_jumbo;
-+	uint32_t		mbuf_mac_rx_low_water_jumbo;
-+	uint32_t		mbuf_high_water_jumbo;
-+
-+	uint32_t		dma_low_water;
-+	uint32_t		dma_high_water;
-+};
-+
-+struct tg3 {
-+#if 0
-+	/* SMP locking strategy:
-+	 *
-+	 * lock: Held during all operations except TX packet
-+	 *       processing.
-+	 *
-+	 * tx_lock: Held during tg3_start_xmit{,_4gbug} and tg3_tx
-+	 *
-+	 * If you want to shut up all asynchronous processing you must
-+	 * acquire both locks, 'lock' taken before 'tx_lock'.  IRQs must
-+	 * be disabled to take 'lock' but only softirq disabling is
-+	 * necessary for acquisition of 'tx_lock'.
-+	 */
-+	spinlock_t			lock;
-+	spinlock_t			tx_lock;
-+#endif
-+
-+	uint32_t			tx_prod;
-+#if 0
-+	uint32_t			tx_cons;
-+#endif
-+	uint32_t			rx_rcb_ptr;
-+	uint32_t			rx_std_ptr;
-+#if 0
-+	uint32_t			rx_jumbo_ptr;
-+	spinlock_t			indirect_lock;
-+
-+	struct net_device_stats		net_stats;
-+	struct net_device_stats		net_stats_prev;
-+#endif
-+	unsigned long			phy_crc_errors;
-+
-+#if 0
-+	uint32_t			rx_offset;
-+#endif
-+	uint32_t			tg3_flags;
-+#if 0
-+#define TG3_FLAG_HOST_TXDS		0x00000001
-+#endif
-+#define TG3_FLAG_TXD_MBOX_HWBUG		0x00000002
-+#define TG3_FLAG_RX_CHECKSUMS		0x00000004
-+#define TG3_FLAG_USE_LINKCHG_REG	0x00000008
-+#define TG3_FLAG_USE_MI_INTERRUPT	0x00000010
-+#define TG3_FLAG_ENABLE_ASF		0x00000020
-+#define TG3_FLAG_5701_REG_WRITE_BUG	0x00000040
-+#define TG3_FLAG_POLL_SERDES		0x00000080
-+#define TG3_FLAG_MBOX_WRITE_REORDER	0x00000100
-+#define TG3_FLAG_PCIX_TARGET_HWBUG	0x00000200
-+#define TG3_FLAG_WOL_SPEED_100MB	0x00000400
-+#define TG3_FLAG_WOL_ENABLE		0x00000800
-+#define TG3_FLAG_EEPROM_WRITE_PROT	0x00001000
-+#define TG3_FLAG_NVRAM			0x00002000
-+#define TG3_FLAG_NVRAM_BUFFERED		0x00004000
-+#define TG3_FLAG_RX_PAUSE		0x00008000
-+#define TG3_FLAG_TX_PAUSE		0x00010000
-+#define TG3_FLAG_PCIX_MODE		0x00020000
-+#define TG3_FLAG_PCI_HIGH_SPEED		0x00040000
-+#define TG3_FLAG_PCI_32BIT		0x00080000
-+#define TG3_FLAG_NO_TX_PSEUDO_CSUM	0x00100000
-+#define TG3_FLAG_NO_RX_PSEUDO_CSUM	0x00200000
-+#define TG3_FLAG_SERDES_WOL_CAP		0x00400000
-+#define TG3_FLAG_JUMBO_ENABLE		0x00800000
-+#define TG3_FLAG_10_100_ONLY		0x01000000
-+#define TG3_FLAG_PAUSE_AUTONEG		0x02000000
-+#define TG3_FLAG_PAUSE_RX		0x04000000
-+#define TG3_FLAG_PAUSE_TX		0x08000000
-+#define TG3_FLAG_BROKEN_CHECKSUMS	0x10000000
-+#define TG3_FLAG_GOT_SERDES_FLOWCTL	0x20000000
-+#define TG3_FLAG_SPLIT_MODE		0x40000000
-+#define TG3_FLAG_INIT_COMPLETE		0x80000000
-+
-+	uint32_t			tg3_flags2;
-+#define TG3_FLG2_RESTART_TIMER		0x00000001
-+#define TG3_FLG2_SUN_5704		0x00000002
-+#define TG3_FLG2_NO_ETH_WIRE_SPEED	0x00000004
-+#define TG3_FLG2_IS_5788		0x00000008
-+#define TG3_FLG2_MAX_RXPEND_64		0x00000010
-+#define TG3_FLG2_TSO_CAPABLE		0x00000020
-+
-+
-+
-+	uint32_t			split_mode_max_reqs;
-+#define SPLIT_MODE_5704_MAX_REQ		3
-+
-+#if 0
-+	struct timer_list		timer;
-+	uint16_t			timer_counter;
-+	uint16_t			timer_multiplier;
-+	uint32_t			timer_offset;
-+	uint16_t			asf_counter;
-+	uint16_t			asf_multiplier;
-+#endif
-+
-+	struct tg3_link_config		link_config;
-+	struct tg3_bufmgr_config	bufmgr_config;
-+
-+#if 0
-+	uint32_t			rx_pending;
-+	uint32_t			rx_jumbo_pending;
-+	uint32_t			tx_pending;
-+#endif
-+
-+	/* cache h/w values, often passed straight to h/w */
-+	uint32_t			rx_mode;
-+	uint32_t			tx_mode;
-+	uint32_t			mac_mode;
-+	uint32_t			mi_mode;
-+	uint32_t			misc_host_ctrl;
-+	uint32_t			grc_mode;
-+	uint32_t			grc_local_ctrl;
-+	uint32_t			dma_rwctrl;
-+#if 0
-+	uint32_t			coalesce_mode;
-+#endif
-+
-+	/* PCI block */
-+	uint16_t			pci_chip_rev_id;
-+#if 0
-+	uint8_t				pci_cacheline_sz;
-+	uint8_t				pci_lat_timer;
-+	uint8_t				pci_hdr_type;
-+	uint8_t				pci_bist;
-+#endif
-+	uint32_t			pci_cfg_state[64 / sizeof(uint32_t)];
-+
-+	int				pm_cap;
-+
-+	/* PHY info */
-+	uint32_t			phy_id;
-+#define PHY_ID_MASK			0xfffffff0
-+#define PHY_ID_BCM5400			0x60008040
-+#define PHY_ID_BCM5401			0x60008050
-+#define PHY_ID_BCM5411			0x60008070
-+#define PHY_ID_BCM5701			0x60008110
-+#define PHY_ID_BCM5703			0x60008160
-+#define PHY_ID_BCM5704			0x60008190
-+#define PHY_ID_BCM5705			0x600081a0
-+#define PHY_ID_BCM8002			0x60010140
-+#define PHY_ID_SERDES			0xfeedbee0
-+#define PHY_ID_INVALID			0xffffffff
-+#define PHY_ID_REV_MASK			0x0000000f
-+#define PHY_REV_BCM5401_B0		0x1
-+#define PHY_REV_BCM5401_B2		0x3
-+#define PHY_REV_BCM5401_C0		0x6
-+#define PHY_REV_BCM5411_X0		0x1 /* Found on Netgear GA302T */
-+
-+	enum phy_led_mode		led_mode;
-+
-+	char				board_part_number[24];
-+	uint32_t			nic_sram_data_cfg;
-+	uint32_t			pci_clock_ctrl;
-+#if 0
-+	struct pci_device		*pdev_peer;
-+#endif
-+
-+	/* This macro assumes the passed PHY ID is already masked
-+	 * with PHY_ID_MASK.
-+	 */
-+#define KNOWN_PHY_ID(X)		\
-+	((X) == PHY_ID_BCM5400 || (X) == PHY_ID_BCM5401 || \
-+	 (X) == PHY_ID_BCM5411 || (X) == PHY_ID_BCM5701 || \
-+	 (X) == PHY_ID_BCM5703 || (X) == PHY_ID_BCM5704 || \
-+	 (X) == PHY_ID_BCM5705 || \
-+	 (X) == PHY_ID_BCM8002 || (X) == PHY_ID_SERDES)
-+
-+	unsigned long			regs;
-+	struct pci_device		*pdev;
-+	struct nic			*nic;
-+#if 0
-+	struct net_device		*dev;
-+#endif
-+#if TG3_VLAN_TAG_USED
-+	struct vlan_group		*vlgrp;
-+#endif
-+
-+	struct tg3_rx_buffer_desc	*rx_std;
-+#if 0
-+	struct ring_info		*rx_std_buffers;
-+	dma_addr_t			rx_std_mapping;
-+	struct tg3_rx_buffer_desc	*rx_jumbo;
-+	struct ring_info		*rx_jumbo_buffers;
-+	dma_addr_t			rx_jumbo_mapping;
-+#endif
-+
-+	struct tg3_rx_buffer_desc	*rx_rcb;
-+#if 0
-+	dma_addr_t			rx_rcb_mapping;
-+#endif
-+
-+	/* TX descs are only used if TG3_FLAG_HOST_TXDS is set. */
-+	struct tg3_tx_buffer_desc	*tx_ring;
-+#if 0
-+	struct tx_ring_info		*tx_buffers;
-+	dma_addr_t			tx_desc_mapping;
-+#endif
-+
-+	struct tg3_hw_status		*hw_status;
-+#if 0
-+	dma_addr_t			status_mapping;
-+#endif
-+#if 0
-+	uint32_t			msg_enable;
-+#endif
-+
-+	struct tg3_hw_stats		*hw_stats;
-+#if 0
-+	dma_addr_t			stats_mapping;
-+#endif
-+
-+	int				carrier_ok;
-+	uint16_t			subsystem_vendor;
-+	uint16_t			subsystem_device;
-+};
-+
-+#endif /* !(_T3_H) */
-Index: b/netboot/tiara.c
-===================================================================
---- a/netboot/tiara.c
-+++ /dev/null
-@@ -1,255 +0,0 @@
--/**************************************************************************
--Etherboot -  BOOTP/TFTP Bootstrap Program
--
--TIARA (Fujitsu Etherstar) NIC driver for Etherboot
--Copyright (c) Ken Yap 1998
--
--Information gleaned from:
--
--TIARA.ASM Packet driver by Brian Fisher, Queens U, Kingston, Ontario
--Fujitsu MB86960 spec sheet (different chip but same family)
--***************************************************************************/
--
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
--/* to get some global routines like printf */
--#include "etherboot.h"
--/* to get the interface to the body of the program */
--#include "nic.h"
--#include "cards.h"
--
--/*
--	EtherStar I/O Register offsets
--*/
--
--/* Offsets of registers */
--#define	DLCR_XMIT_STAT	0x00
--#define	DLCR_XMIT_MASK	0x01
--#define	DLCR_RECV_STAT	0x02
--#define	DLCR_RECV_MASK	0x03
--#define	DLCR_XMIT_MODE	0x04
--#define	DLCR_RECV_MODE	0x05
--#define	DLCR_ENABLE	0x06
--#define	DLCR_TDR_LOW	0x07
--#define	DLCR_NODE_ID	0x08
--#define	DLCR_TDR_HIGH	0x0F
--#define	BMPR_MEM_PORT	0x10
--#define	BMPR_PKT_LEN	0x12
--#define	BMPR_DMA_ENABLE	0x14
--#define	PROM_ID		0x18
--
--#define	TMST		0x80
--#define	TMT_OK		0x80
--#define	TMT_16COLL	0x02
--#define	BUF_EMPTY	0x40
--
--#define	CARD_DISABLE	0x80	/* written to DLCR_ENABLE to disable card */
--#define	CARD_ENABLE	0	/* written to DLCR_ENABLE to enable card */
--
--#define	CLEAR_STATUS	0x0F	/* used to clear status info */
--/*
--	00001111B
--	!!!!!!!!--------
--	!!!!!!!+--------CLEAR BUS WRITE ERROR
--	!!!!!!+---------CLEAR 16 COLLISION
--	!!!!!+----------CLEAR COLLISION
--	!!!!+-----------CLEAR UNDERFLOW
--	!!!+------------NC
--	!!+-------------NC
--	!+--------------NC
--	+---------------NC
--*/
--
--#define	NO_TX_IRQS	0	/* written to clear transmit IRQs */
--
--#define	CLR_RCV_STATUS	0xCF	/* clears receive status */
--
--#define	EN_RCV_IRQS	0x80	/* enable receive interrupts */
--/*
--	10000000B
--	!!!!!!!!--------
--	!!!!!!!+--------ENABLE OVERFLOW
--	!!!!!!+---------ENABLE CRC
--	!!!!!+----------ENABLE ALIGN
--	!!!!+-----------ENABLE SHORT PKT
--	!!!+------------DISABLE REMOTE RESET
--	!!+-------------RESERVED
--	!+--------------RESERVED
--	+---------------ENABLE PKT READY
--*/
--
--#define	XMIT_MODE	0x02
--/*
--	00000010B
--	!!!!!!!!---------ENABLE CARRIER DETECT
--	!!!!!!!+---------DISABLE LOOPBACK
--*/
--
--#define	RECV_MODE	0x02
--/*
--	00000010B
--	!!!!!!!!---------ACCEPT ALL PACKETS
--	!!!!!!!+---------ACCEPT PHYSICAL, MULTICAST, AND
--	!!!!!!+----------BROADCAST PACKETS
--	!!!!!+-----------DISABLE REMOTE RESET
--	!!!!+------------DISABLE SHORT PACKETS
--	!!!+-------------USE 6 BYTE ADDRESS
--	!!+--------------NC
--	!+---------------NC
--	+----------------DISABLE CRC TEST MODE
--*/
--
--/* NIC specific static variables go here */
--
--static unsigned short	ioaddr;
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--static void tiara_reset(struct nic *nic)
--{
--	int		i;
--
--	outb(CARD_DISABLE, ioaddr + DLCR_ENABLE);
--	outb(CLEAR_STATUS, ioaddr + DLCR_XMIT_STAT);
--	outb(NO_TX_IRQS, ioaddr + DLCR_XMIT_MASK);
--	outb(CLR_RCV_STATUS, ioaddr + DLCR_RECV_STAT);
--	outb(XMIT_MODE, ioaddr + DLCR_XMIT_MODE);
--	outb(RECV_MODE, ioaddr + DLCR_RECV_MODE);
--	/* Vacuum recv buffer */
--	while ((inb(ioaddr + DLCR_RECV_MODE) & BUF_EMPTY) == 0)
--		inb(ioaddr + BMPR_MEM_PORT);
--	/* Set node address */
--	for (i = 0; i < ETH_ALEN; ++i)
--		outb(nic->node_addr[i], ioaddr + DLCR_NODE_ID + i);
--	outb(CLR_RCV_STATUS, ioaddr + DLCR_RECV_STAT);
--	outb(CARD_ENABLE, ioaddr + DLCR_ENABLE);
--}
--
--/**************************************************************************
--POLL - Wait for a frame
--***************************************************************************/
--static int tiara_poll(struct nic *nic)
--{
--	unsigned int		len;
--
--	if (inb(ioaddr + DLCR_RECV_MODE) & BUF_EMPTY)
--		return (0);
--	/* Ack packet */
--	outw(CLR_RCV_STATUS, ioaddr + DLCR_RECV_STAT);
--	len = inw(ioaddr + BMPR_MEM_PORT);		/* throw away status */
--	len = inw(ioaddr + BMPR_MEM_PORT);
--	/* Drop overlength packets */
--	if (len > ETH_FRAME_LEN)
--		return (0);		/* should we drain the buffer? */
--	insw(ioaddr + BMPR_MEM_PORT, nic->packet, len / 2);
--	/* If it's our own, drop it */
--	if (memcmp(nic->packet + ETH_ALEN, nic->node_addr, ETH_ALEN) == 0)
--		return (0);
--	nic->packetlen = len;
--	return (1);
--}
--
--/**************************************************************************
--TRANSMIT - Transmit a frame
--***************************************************************************/
--static void tiara_transmit(
--struct nic *nic,
--const char *d,			/* Destination */
--unsigned int t,			/* Type */
--unsigned int s,			/* size */
--const char *p)			/* Packet */
--{
--	unsigned int	len;
--	unsigned long	time;
--
--	len = s + ETH_HLEN;
--	if (len < ETH_ZLEN)
--		len = ETH_ZLEN;
--	t = htons(t);
--	outsw(ioaddr + BMPR_MEM_PORT, d, ETH_ALEN / 2);
--	outsw(ioaddr + BMPR_MEM_PORT, nic->node_addr, ETH_ALEN / 2);
--	outw(t, ioaddr + BMPR_MEM_PORT);
--	outsw(ioaddr + BMPR_MEM_PORT, p, s / 2);
--	if (s & 1)					/* last byte */
--		outb(p[s-1], ioaddr + BMPR_MEM_PORT);
--	while (s++ < ETH_ZLEN - ETH_HLEN)	/* pad */
--		outb(0, ioaddr + BMPR_MEM_PORT);
--	outw(len | (TMST << 8), ioaddr + BMPR_PKT_LEN);
--	/* wait for transmit complete */
--	time = currticks() + TICKS_PER_SEC;		/* wait one second */
--	while (currticks() < time && (inb(ioaddr) & (TMT_OK|TMT_16COLL)) == 0)
--		;
--	if ((inb(ioaddr) & (TMT_OK|TMT_16COLL)) == 0)
--		printf("Tiara timed out on transmit\n");
--	/* Do we need to ack the transmit? */
--}
--
--/**************************************************************************
--DISABLE - Turn off ethernet interface
--***************************************************************************/
--static void tiara_disable(struct nic *nic)
--{
--	/* Apparently only a power down can do this properly */
--	outb(CARD_DISABLE, ioaddr + DLCR_ENABLE);
--}
--
--static int tiara_probe1(struct nic *nic)
--{
--	/* Hope all the Tiara cards have this vendor prefix */
--	static char	vendor_prefix[] = { 0x08, 0x00, 0x1A };
--	static char	all_ones[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
--	int		i;
--
--	for (i = 0; i < ETH_ALEN; ++i)
--		nic->node_addr[i] = inb(ioaddr + PROM_ID + i);
--	if (memcmp(nic->node_addr, vendor_prefix, sizeof(vendor_prefix)) != 0)
--		return (0);
--	if (memcmp(nic->node_addr, all_ones, sizeof(all_ones)) == 0)
--		return (0);
--	printf("\nTiara ioaddr %#hX, addr %!\n", ioaddr, nic->node_addr);
--	return (1);
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--***************************************************************************/
--struct nic *tiara_probe(struct nic *nic, unsigned short *probe_addrs)
--{
--	/* missing entries are addresses usually already used */
--	static unsigned short	io_addrs[] = {
--		0x100, 0x120, 0x140, 0x160,
--		0x180, 0x1A0, 0x1C0, 0x1E0,
--		0x200, 0x220, 0x240, /*Par*/
--		0x280, 0x2A0, 0x2C0, /*Ser*/
--		0x300, 0x320, 0x340, /*Par*/
--		0x380, /*Vid,Par*/ 0x3C0, /*Ser*/
--		0x0
--	};
--	unsigned short		*p;
--
--	/* if probe_addrs is 0, then routine can use a hardwired default */
--	if (probe_addrs == 0)
--		probe_addrs = io_addrs;
--	for (p = probe_addrs; (ioaddr = *p) != 0; ++p)
--		if (tiara_probe1(nic))
--			break;
--	/* if board found */
--	if (ioaddr != 0)
--	{
--		tiara_reset(nic);
--		/* point to NIC specific routines */
--		nic->reset = tiara_reset;
--		nic->poll = tiara_poll;
--		nic->transmit = tiara_transmit;
--		nic->disable = tiara_disable;
--		return nic;
--	}
--	else
--		return (0);
--}
-Index: b/netboot/timer.c
-===================================================================
---- a/netboot/timer.c
-+++ b/netboot/timer.c
-@@ -6,122 +6,24 @@
-  * published by the Free Software Foundation; either version 2, or (at
-  * your option) any later version.
-  */
--
--#include	"etherboot.h"
-+#include        "grub.h"
- #include	"timer.h"
- 
--void load_timer2(unsigned int ticks)
--{
--	/* Set up the timer gate, turn off the speaker */
--	outb((inb(PPC_PORTB) & ~PPCB_SPKR) | PPCB_T2GATE, PPC_PORTB);
--	outb(TIMER2_SEL|WORD_ACCESS|MODE0|BINARY_COUNT, TIMER_MODE_PORT);
--	outb(ticks & 0xFF, TIMER2_PORT);
--	outb(ticks >> 8, TIMER2_PORT);
--}
--
--#if defined(CONFIG_TSC_CURRTICKS)
--#define rdtsc(low,high) \
--     __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
--
--#define rdtscll(val) \
--     __asm__ __volatile__ ("rdtsc" : "=A" (val))
--
--
--#define HZ TICKS_PER_SEC
--#define CLOCK_TICK_RATE	1193180U /* Underlying HZ */
--/* LATCH is used in the interval timer and ftape setup. */
--#define LATCH  ((CLOCK_TICK_RATE + HZ/2) / HZ)	/* For divider */
-+/* Machine Independant timer helper functions */
- 
--
--/* ------ Calibrate the TSC ------- 
-- * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset().
-- * Too much 64-bit arithmetic here to do this cleanly in C, and for
-- * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2)
-- * output busy loop as low as possible. We avoid reading the CTC registers
-- * directly because of the awkward 8-bit access mechanism of the 82C54
-- * device.
-- */
--
--#define CALIBRATE_LATCH	(5 * LATCH)
--
--static unsigned long long calibrate_tsc(void)
-+void mdelay(unsigned int msecs)
- {
--	/* Set the Gate high, disable speaker */
--	outb((inb(0x61) & ~0x02) | 0x01, 0x61);
--
--	/*
--	 * Now let's take care of CTC channel 2
--	 *
--	 * Set the Gate high, program CTC channel 2 for mode 0,
--	 * (interrupt on terminal count mode), binary count,
--	 * load 5 * LATCH count, (LSB and MSB) to begin countdown.
--	 */
--	outb(0xb0, 0x43);			/* binary, mode 0, LSB/MSB, Ch 2 */
--	outb(CALIBRATE_LATCH & 0xff, 0x42);	/* LSB of count */
--	outb(CALIBRATE_LATCH >> 8, 0x42);	/* MSB of count */
--
--	{
--		unsigned long startlow, starthigh;
--		unsigned long endlow, endhigh;
--		unsigned long count;
--
--		rdtsc(startlow,starthigh);
--		count = 0;
--		do {
--			count++;
--		} while ((inb(0x61) & 0x20) == 0);
--		rdtsc(endlow,endhigh);
--
--		/* Error: ECTCNEVERSET */
--		if (count <= 1)
--			goto bad_ctc;
--
--		/* 64-bit subtract - gcc just messes up with long longs */
--		__asm__("subl %2,%0\n\t"
--			"sbbl %3,%1"
--			:"=a" (endlow), "=d" (endhigh)
--			:"g" (startlow), "g" (starthigh),
--			 "0" (endlow), "1" (endhigh));
--
--		/* Error: ECPUTOOFAST */
--		if (endhigh)
--			goto bad_ctc;
--
--		endlow /= 5;
--		return endlow;
-+	unsigned int i;
-+	for(i = 0; i < msecs; i++) {
-+		udelay(1000);
-+		poll_interruptions();
- 	}
--
--	/*
--	 * The CTC wasn't reliable: we got a hit on the very first read,
--	 * or the CPU was so fast/slow that the quotient wouldn't fit in
--	 * 32 bits..
--	 */
--bad_ctc:
--	printf("bad_ctc\n");
--	return 0;
- }
- 
--
--unsigned long currticks(void)
-+void waiton_timer2(unsigned int ticks)
- {
--	static unsigned long clocks_per_tick;
--	unsigned long clocks_high, clocks_low;
--	unsigned long currticks;
--	if (!clocks_per_tick) {
--		clocks_per_tick = calibrate_tsc();
--		printf("clocks_per_tick = %d\n", clocks_per_tick);
-+	load_timer2(ticks);
-+	while(timer2_running()) {
-+		poll_interruptions();
- 	}
--
--	/* Read the Time Stamp Counter */
--	rdtsc(clocks_low, clocks_high);
--
--	/* currticks = clocks / clocks_per_tick; */
--	__asm__("divl %1"
--		:"=a" (currticks)
--		:"r" (clocks_per_tick), "0" (clocks_low), "d" (clocks_high));
--
--
--	return currticks;
- }
--
--#endif /* RTC_CURRTICKS */
-Index: b/netboot/timer.h
-===================================================================
---- a/netboot/timer.h
-+++ b/netboot/timer.h
-@@ -36,7 +36,8 @@
- #define	BCD_COUNT	0x01
- 
- /* Timers tick over at this rate */
--#define	TICKS_PER_MS	1193
-+#define CLOCK_TICK_RATE	1193180U
-+#define	TICKS_PER_MS	(CLOCK_TICK_RATE/1000)
- 
- /* Parallel Peripheral Controller Port B */
- #define	PPC_PORTB	0x61
-@@ -49,16 +50,19 @@
- /* Ticks must be between 0 and 65535 (0 == 65536)
-    because it is a 16 bit counter */
- extern void load_timer2(unsigned int ticks);
--extern inline int timer2_running(void)
--{
--	return ((inb(PPC_PORTB) & PPCB_T2OUT) == 0);
--}
--
--extern inline void waiton_timer2(unsigned int ticks)
--{
--	load_timer2(ticks);
--	while ((inb(PPC_PORTB) & PPCB_T2OUT) == 0)
--		;
--}
-+extern inline int timer2_running(void);
-+extern void waiton_timer2(unsigned int ticks);
-+extern void __load_timer2(unsigned int ticks);
-+
-+extern void setup_timers(void);
-+extern void ndelay(unsigned int nsecs);
-+extern void udelay(unsigned int usecs);
-+extern void mdelay(unsigned int msecs);
-+//extern unsigned long currticks(void);
-+
-+struct timeval {
-+	long tv_sec;
-+	long tv_usec;
-+};
- 
- #endif	/* TIMER_H */
-Index: b/netboot/tlan.c
-===================================================================
---- a/netboot/tlan.c
-+++ b/netboot/tlan.c
-@@ -1,3746 +1,1814 @@
-+#define EB51
-+
-+#ifdef EB50
-+#define __unused __attribute__((unused))
-+#endif
-+
- /**************************************************************************
--Etherboot -  BOOTP/TFTP Bootstrap Program
--TLAN driver for Etherboot
-+*
-+*    tlan.c -- Etherboot device driver for the Texas Instruments ThunderLAN
-+*    Written 2003-2003 by Timothy Legge <tlegge@rogers.com>
-+*
-+*    This program is free software; you can redistribute it and/or modify
-+*    it under the terms of the GNU General Public License as published by
-+*    the Free Software Foundation; either version 2 of the License, or
-+*    (at your option) any later version.
-+*
-+*    This program is distributed in the hope that it will be useful,
-+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+*    GNU General Public License for more details.
-+*
-+*    You should have received a copy of the GNU General Public License
-+*    along with this program; if not, write to the Free Software
-+*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*
-+*    Portions of this code based on:
-+*	lan.c: Linux ThunderLan Driver:
-+*
-+*	by James Banks
-+*
-+*  	(C) 1997-1998 Caldera, Inc.
-+*	(C) 1998 James Banks
-+*	(C) 1999-2001 Torben Mathiasen
-+*	(C) 2002 Samuel Chessman
-+*
-+*    REVISION HISTORY:
-+*    ================
-+*    v1.0	07-08-2003	timlegge	Initial not quite working version
-+*    v1.1	07-27-2003	timlegge	Sync 5.0 and 5.1 versions
-+*    v1.2	08-19-2003	timlegge	Implement Multicast Support
-+*    v1.3	08-23-2003	timlegge	Fix the transmit Function
-+*    v1.4	01-17-2004	timlegge	Initial driver output cleanup    
-+*    
-+*    Indent Options: indent -kr -i8
- ***************************************************************************/
- 
--/*
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License as
-- * published by the Free Software Foundation; either version 2, or (at
-- * your option) any later version.
-- */
--
- /* to get some global routines like printf */
- #include "etherboot.h"
- /* to get the interface to the body of the program */
- #include "nic.h"
- /* to get the PCI support functions, if this is a PCI NIC */
- #include "pci.h"
--/* to get our own prototype */
--#include "cards.h"
--
--	/*****************************************************************
--	 * TLan Definitions
--	 *
--	 ****************************************************************/
-+#include "timer.h"
-+#include "tlan.h"
- 
--#define TLAN_MIN_FRAME_SIZE	64
--#define TLAN_MAX_FRAME_SIZE	1600
-+#define drv_version "v1.4"
-+#define drv_date "01-17-2004"
- 
--#define TLAN_NUM_RX_LISTS	32
--#define TLAN_NUM_TX_LISTS	64
-+/* NIC specific static variables go here */
-+#define HZ 100
-+#define TX_TIME_OUT	  (6*HZ)
- 
--#define TLAN_IGNORE		0
--#define TLAN_RECORD		1
-+#ifdef EB50
-+#define	cpu_to_le32(val) (val)
-+#define	le32_to_cpu(val) (val)
-+#define	virt_to_bus(x) ((unsigned long) x)
-+#define	bus_to_virt(x) ((unsigned long) x)
-+#endif
- 
--#define TLAN_DBG(lvl, format, args...)	if (debug&lvl) printf("TLAN: " format, ##args );
--#define TLAN_DEBUG_GNRL		0x0001
--#define TLAN_DEBUG_TX		0x0002
--#define TLAN_DEBUG_RX		0x0004 
--#define TLAN_DEBUG_LIST		0x0008
--#define TLAN_DEBUG_PROBE	0x0010
-+/* Condensed operations for readability. */
-+#define virt_to_le32desc(addr)  cpu_to_le32(virt_to_bus(addr))
-+#define le32desc_to_virt(addr)  bus_to_virt(le32_to_cpu(addr))
- 
--#define MAX_TLAN_BOARDS		8	 /* Max number of boards installed at a time */
- 
--	/*****************************************************************
--	 * Device Identification Definitions
--	 *
--	 ****************************************************************/
--		
--#define PCI_DEVICE_ID_NETELLIGENT_10_T2			0xB012
--#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100	0xB030
--#ifndef PCI_DEVICE_ID_OLICOM_OC2183
--#define PCI_DEVICE_ID_OLICOM_OC2183			0x0013
--#endif
--#ifndef PCI_DEVICE_ID_OLICOM_OC2325
--#define PCI_DEVICE_ID_OLICOM_OC2325			0x0012
--#endif
--#ifndef PCI_DEVICE_ID_OLICOM_OC2326
--#define PCI_DEVICE_ID_OLICOM_OC2326			0x0014
--#endif
--#define TLAN_ADAPTER_NONE		0x00000000
--#define TLAN_ADAPTER_UNMANAGED_PHY	0x00000001
--#define TLAN_ADAPTER_BIT_RATE_PHY	0x00000002
--#define TLAN_ADAPTER_USE_INTERN_10	0x00000004
--#define TLAN_ADAPTER_ACTIVITY_LED	0x00000008
--#define TLAN_SPEED_DEFAULT	0
--#define TLAN_SPEED_10		10
--#define TLAN_SPEED_100		100
--#define TLAN_DUPLEX_DEFAULT	0
--#define TLAN_DUPLEX_HALF	1
--#define TLAN_DUPLEX_FULL	2
--#define TLAN_BUFFERS_PER_LIST	10
--#define TLAN_LAST_BUFFER	0x80000000
--#define TLAN_CSTAT_UNUSED	0x8000
--#define TLAN_CSTAT_FRM_CMP	0x4000
--#define TLAN_CSTAT_READY	0x3000
--#define TLAN_CSTAT_EOC		0x0800
--#define TLAN_CSTAT_RX_ERROR	0x0400
--#define TLAN_CSTAT_PASS_CRC	0x0200
--#define TLAN_CSTAT_DP_PR	0x0100
--
--	/*****************************************************************
--	 * PHY definitions
--	 *
--	 ****************************************************************/
--
--#define TLAN_PHY_MAX_ADDR	0x1F
--#define TLAN_PHY_NONE		0x20
--
--	/*****************************************************************
--	 * TLan Driver Timer Definitions
--	 *
--	 ****************************************************************/
--
--#define TLAN_TIMER_LINK_BEAT		1
--#define TLAN_TIMER_ACTIVITY		2
--#define TLAN_TIMER_PHY_PDOWN		3
--#define TLAN_TIMER_PHY_PUP		4
--#define TLAN_TIMER_PHY_RESET		5
--#define TLAN_TIMER_PHY_START_LINK	6
--#define TLAN_TIMER_PHY_FINISH_AN	7
--#define TLAN_TIMER_FINISH_RESET		8
--#define TLAN_TIMER_ACT_DELAY		(HZ/10)
--
--	/*****************************************************************
--	 * TLan Driver Eeprom Definitions
--	 *
--	 ****************************************************************/
--
--#define TLAN_EEPROM_ACK		0
--#define TLAN_EEPROM_STOP	1
--
--	/*****************************************************************
--	 * Host Register Offsets and Contents
--	 *
--	 ****************************************************************/
--
--#define TLAN_HOST_CMD			0x00
--#define 	TLAN_HC_GO		0x80000000
--#define		TLAN_HC_STOP		0x40000000
--#define		TLAN_HC_ACK		0x20000000
--#define		TLAN_HC_CS_MASK		0x1FE00000
--#define		TLAN_HC_EOC		0x00100000
--#define		TLAN_HC_RT		0x00080000
--#define		TLAN_HC_NES		0x00040000
--#define		TLAN_HC_AD_RST		0x00008000
--#define		TLAN_HC_LD_TMR		0x00004000
--#define		TLAN_HC_LD_THR		0x00002000
--#define		TLAN_HC_REQ_INT		0x00001000
--#define		TLAN_HC_INT_OFF		0x00000800
--#define		TLAN_HC_INT_ON		0x00000400
--#define		TLAN_HC_AC_MASK		0x000000FF
--#define TLAN_CH_PARM			0x04
--#define TLAN_DIO_ADR			0x08
--#define		TLAN_DA_ADR_INC		0x8000
--#define		TLAN_DA_RAM_ADR		0x4000
--#define TLAN_HOST_INT			0x0A
--#define		TLAN_HI_IV_MASK		0x1FE0
--#define		TLAN_HI_IT_MASK		0x001C
--#define TLAN_DIO_DATA			0x0C
--
--/* ThunderLAN Internal Register DIO Offsets */
--
--#define TLAN_NET_CMD			0x00
--#define		TLAN_NET_CMD_NRESET	0x80
--#define		TLAN_NET_CMD_NWRAP	0x40
--#define		TLAN_NET_CMD_CSF	0x20
--#define		TLAN_NET_CMD_CAF	0x10
--#define		TLAN_NET_CMD_NOBRX	0x08
--#define		TLAN_NET_CMD_DUPLEX	0x04
--#define		TLAN_NET_CMD_TRFRAM	0x02
--#define		TLAN_NET_CMD_TXPACE	0x01
--#define TLAN_NET_SIO			0x01
--#define 	TLAN_NET_SIO_MINTEN	0x80
--#define		TLAN_NET_SIO_ECLOK	0x40
--#define		TLAN_NET_SIO_ETXEN	0x20
--#define		TLAN_NET_SIO_EDATA	0x10
--#define		TLAN_NET_SIO_NMRST	0x08
--#define		TLAN_NET_SIO_MCLK	0x04
--#define		TLAN_NET_SIO_MTXEN	0x02
--#define		TLAN_NET_SIO_MDATA	0x01
--#define TLAN_NET_STS			0x02
--#define		TLAN_NET_STS_MIRQ	0x80
--#define		TLAN_NET_STS_HBEAT	0x40
--#define		TLAN_NET_STS_TXSTOP	0x20
--#define		TLAN_NET_STS_RXSTOP	0x10
--#define		TLAN_NET_STS_RSRVD	0x0F
--#define TLAN_NET_MASK			0x03
--#define		TLAN_NET_MASK_MASK7	0x80
--#define		TLAN_NET_MASK_MASK6	0x40
--#define		TLAN_NET_MASK_MASK5	0x20
--#define		TLAN_NET_MASK_MASK4	0x10
--#define		TLAN_NET_MASK_RSRVD	0x0F
--#define TLAN_NET_CONFIG			0x04
--#define 	TLAN_NET_CFG_RCLK	0x8000
--#define		TLAN_NET_CFG_TCLK	0x4000
--#define		TLAN_NET_CFG_BIT	0x2000
--#define		TLAN_NET_CFG_RXCRC	0x1000
--#define		TLAN_NET_CFG_PEF	0x0800
--#define		TLAN_NET_CFG_1FRAG	0x0400
--#define		TLAN_NET_CFG_1CHAN	0x0200
--#define		TLAN_NET_CFG_MTEST	0x0100
--#define		TLAN_NET_CFG_PHY_EN	0x0080
--#define		TLAN_NET_CFG_MSMASK	0x007F
--#define TLAN_MAN_TEST			0x06
--#define TLAN_DEF_VENDOR_ID		0x08
--#define TLAN_DEF_DEVICE_ID		0x0A
--#define TLAN_DEF_REVISION		0x0C
--#define TLAN_DEF_SUBCLASS		0x0D
--#define TLAN_DEF_MIN_LAT		0x0E
--#define TLAN_DEF_MAX_LAT		0x0F
--#define TLAN_AREG_0			0x10
--#define TLAN_AREG_1			0x16
--#define TLAN_AREG_2			0x1C
--#define TLAN_AREG_3			0x22
--#define TLAN_HASH_1			0x28
--#define TLAN_HASH_2			0x2C
--#define TLAN_GOOD_TX_FRMS		0x30
--#define TLAN_TX_UNDERUNS		0x33
--#define TLAN_GOOD_RX_FRMS		0x34
--#define TLAN_RX_OVERRUNS		0x37
--#define TLAN_DEFERRED_TX		0x38
--#define TLAN_CRC_ERRORS			0x3A
--#define TLAN_CODE_ERRORS		0x3B
--#define TLAN_MULTICOL_FRMS		0x3C
--#define TLAN_SINGLECOL_FRMS		0x3E
--#define TLAN_EXCESSCOL_FRMS		0x40
--#define TLAN_LATE_COLS			0x41
--#define TLAN_CARRIER_LOSS		0x42
--#define TLAN_ACOMMIT			0x43
--#define TLAN_LED_REG			0x44
--#define		TLAN_LED_ACT		0x10
--#define		TLAN_LED_LINK		0x01
--#define TLAN_BSIZE_REG			0x45
--#define TLAN_MAX_RX			0x46
--#define TLAN_INT_DIS			0x48
--#define		TLAN_ID_TX_EOC		0x04
--#define		TLAN_ID_RX_EOF		0x02
--#define		TLAN_ID_RX_EOC		0x01
--
--/* ThunderLAN Interrupt Codes */
--
--#define TLAN_INT_NUMBER_OF_INTS	8
--
--#define TLAN_INT_NONE			0x0000
--#define TLAN_INT_TX_EOF			0x0001
--#define TLAN_INT_STAT_OVERFLOW		0x0002
--#define TLAN_INT_RX_EOF			0x0003
--#define TLAN_INT_DUMMY			0x0004
--#define TLAN_INT_TX_EOC			0x0005
--#define TLAN_INT_STATUS_CHECK		0x0006
--#define TLAN_INT_RX_EOC			0x0007
--#define TLAN_TLPHY_ID			0x10
--#define TLAN_TLPHY_CTL			0x11
--#define 	TLAN_TC_IGLINK		0x8000
--#define		TLAN_TC_SWAPOL		0x4000
--#define		TLAN_TC_AUISEL		0x2000
--#define		TLAN_TC_SQEEN		0x1000
--#define		TLAN_TC_MTEST		0x0800
--#define		TLAN_TC_RESERVED	0x07F8
--#define		TLAN_TC_NFEW		0x0004
--#define		TLAN_TC_INTEN		0x0002
--#define		TLAN_TC_TINT		0x0001
--#define TLAN_TLPHY_STS			0x12
--#define		TLAN_TS_MINT		0x8000
--#define		TLAN_TS_PHOK		0x4000
--#define		TLAN_TS_POLOK		0x2000
--#define		TLAN_TS_TPENERGY	0x1000
--#define		TLAN_TS_RESERVED	0x0FFF
--#define TLAN_TLPHY_PAR			0x19
--#define		TLAN_PHY_CIM_STAT	0x0020
--#define		TLAN_PHY_SPEED_100	0x0040
--#define		TLAN_PHY_DUPLEX_FULL	0x0080
--#define		TLAN_PHY_AN_EN_STAT     0x0400
--
--
--/* ThunderLAN MII Registers */
--
--/* Generic MII/PHY Registers */
--
--#define MII_GEN_CTL			0x00
--#define 	MII_GC_RESET		0x8000
--#define		MII_GC_LOOPBK		0x4000
--#define		MII_GC_SPEEDSEL		0x2000
--#define		MII_GC_AUTOENB		0x1000
--#define		MII_GC_PDOWN		0x0800
--#define		MII_GC_ISOLATE		0x0400
--#define		MII_GC_AUTORSRT		0x0200
--#define		MII_GC_DUPLEX		0x0100
--#define		MII_GC_COLTEST		0x0080
--#define		MII_GC_RESERVED		0x007F
--#define MII_GEN_STS			0x01
--#define		MII_GS_100BT4		0x8000
--#define		MII_GS_100BTXFD		0x4000
--#define		MII_GS_100BTXHD		0x2000
--#define		MII_GS_10BTFD		0x1000
--#define		MII_GS_10BTHD		0x0800
--#define		MII_GS_RESERVED		0x07C0
--#define		MII_GS_AUTOCMPLT	0x0020
--#define		MII_GS_RFLT		0x0010
--#define		MII_GS_AUTONEG		0x0008
--#define		MII_GS_LINK		0x0004
--#define		MII_GS_JABBER		0x0002
--#define		MII_GS_EXTCAP		0x0001
--#define MII_GEN_ID_HI			0x02
--#define MII_GEN_ID_LO			0x03
--#define 	MII_GIL_OUI		0xFC00
--#define 	MII_GIL_MODEL		0x03F0
--#define 	MII_GIL_REVISION	0x000F
--#define MII_AN_ADV			0x04
--#define MII_AN_LPA			0x05
--#define MII_AN_EXP			0x06
--
--/* ThunderLAN Specific MII/PHY Registers */
--
--#define 	TLAN_TC_IGLINK		0x8000
--#define		TLAN_TC_SWAPOL		0x4000
--#define		TLAN_TC_AUISEL		0x2000
--#define		TLAN_TC_SQEEN		0x1000
--#define		TLAN_TC_MTEST		0x0800
--#define		TLAN_TC_RESERVED	0x07F8
--#define		TLAN_TC_NFEW		0x0004
--#define		TLAN_TC_INTEN		0x0002
--#define		TLAN_TC_TINT		0x0001
--#define		TLAN_TS_MINT		0x8000
--#define		TLAN_TS_PHOK		0x4000
--#define		TLAN_TS_POLOK		0x2000
--#define		TLAN_TS_TPENERGY	0x1000
--#define		TLAN_TS_RESERVED	0x0FFF
--#define		TLAN_PHY_CIM_STAT	0x0020
--#define		TLAN_PHY_SPEED_100	0x0040
--#define		TLAN_PHY_DUPLEX_FULL	0x0080
--#define		TLAN_PHY_AN_EN_STAT     0x0400
--
--/* National Sem. & Level1 PHY id's */
--#define NAT_SEM_ID1			0x2000
--#define NAT_SEM_ID2			0x5C01
--#define LEVEL1_ID1			0x7810
--#define LEVEL1_ID2			0x0000
--
--#define TLan_ClearBit( bit, port )	outb_p(inb_p(port) & ~bit, port)
--#define TLan_GetBit( bit, port )	((int) (inb_p(port) & bit))
--#define TLan_SetBit( bit, port )	outb_p(inb_p(port) | bit, port)
--
--typedef	unsigned int	u32;
--typedef	unsigned short	u16;
--typedef	unsigned char	u8;
-+static void TLan_ResetLists(struct nic *nic __unused);
-+static void TLan_ResetAdapter(struct nic *nic __unused);
-+static void TLan_FinishReset(struct nic *nic __unused);
- 
--/* Routines to access internal registers. */
-+static void TLan_EeSendStart(u16);
-+static int TLan_EeSendByte(u16, u8, int);
-+static void TLan_EeReceiveByte(u16, u8 *, int);
-+static int TLan_EeReadByte(u16 io_base, u8, u8 *);
- 
--inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
--{
--	outw(internal_addr, base_addr + TLAN_DIO_ADR);
--	return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)));
--	
--} /* TLan_DioRead8 */
-+static void TLan_PhyDetect(struct nic *nic);
-+static void TLan_PhyPowerDown(struct nic *nic);
-+static void TLan_PhyPowerUp(struct nic *nic);
- 
--inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
--{
--	outw(internal_addr, base_addr + TLAN_DIO_ADR);
--	return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2)));
- 
--} /* TLan_DioRead16 */
-+static void TLan_SetMac(struct nic *nic __unused, int areg, char *mac);
- 
--inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
--{
--	outw(internal_addr, base_addr + TLAN_DIO_ADR);
--	return (inl(base_addr + TLAN_DIO_DATA));
-+static void TLan_PhyReset(struct nic *nic);
-+static void TLan_PhyStartLink(struct nic *nic);
-+static void TLan_PhyFinishAutoNeg(struct nic *nic);
- 
--} /* TLan_DioRead32 */
-+#ifdef MONITOR
-+static void TLan_PhyMonitor(struct nic *nic);
-+#endif
- 
--inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
--{
--	outw(internal_addr, base_addr + TLAN_DIO_ADR);
--	outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
- 
--}
-+static void refill_rx(struct nic *nic __unused);
- 
--inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
--{
--	outw(internal_addr, base_addr + TLAN_DIO_ADR);
--	outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
-+static int TLan_MiiReadReg(struct nic *nic __unused, u16, u16, u16 *);
-+static void TLan_MiiSendData(u16, u32, unsigned);
-+static void TLan_MiiSync(u16);
-+static void TLan_MiiWriteReg(struct nic *nic __unused, u16, u16, u16);
- 
--}
- 
--inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
--{
--	outw(internal_addr, base_addr + TLAN_DIO_ADR);
--	outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
-+const char *media[] = {
-+	"10BaseT-HD ", "10BaseT-FD ", "100baseTx-HD ",
-+	"100baseTx-FD", "100baseT4", 0
-+};
- 
--}
-+/* This much match tlan_pci_tbl[]!  */
-+enum tlan_nics {
-+	NETEL10 = 0, NETEL100 = 1, NETFLEX3I = 2, THUNDER = 3, NETFLEX3B =
-+	    4, NETEL100PI = 5,
-+	NETEL100D = 6, NETEL100I = 7, OC2183 = 8, OC2325 = 9, OC2326 =
-+	    10, NETELLIGENT_10_100_WS_5100 = 11,
-+	NETELLIGENT_10_T2 = 12
-+};
- 
--/* NIC specific static variables go here */
-+struct pci_id_info {
-+	const char *name;
-+	int nic_id;
-+	struct match_info {
-+		u32 pci, pci_mask, subsystem, subsystem_mask;
-+		u32 revision, revision_mask;	/* Only 8 bits. */
-+	} id;
-+	u32 flags;
-+	u16 addrOfs;		/* Address Offset */
-+};
- 
--/*****************************************************************************
--******************************************************************************
-+static struct pci_id_info tlan_pci_tbl[] = {
-+	{"Compaq Netelligent 10 T PCI UTP", NETEL10,
-+	 {0xae340e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
-+	{"Compaq Netelligent 10/100 TX PCI UTP", NETEL100,
-+	 {0xae320e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
-+	{"Compaq Integrated NetFlex-3/P", NETFLEX3I,
-+	 {0xae350e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_NONE, 0x83},
-+	{"Compaq NetFlex-3/P", THUNDER,
-+	 {0xf1300e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83},
-+	{"Compaq NetFlex-3/P", NETFLEX3B,
-+	 {0xf1500e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_NONE, 0x83},
-+	{"Compaq Netelligent Integrated 10/100 TX UTP", NETEL100PI,
-+	 {0xae430e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
-+	{"Compaq Netelligent Dual 10/100 TX PCI UTP", NETEL100D,
-+	 {0xae400e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_NONE, 0x83},
-+	{"Compaq Netelligent 10/100 TX Embedded UTP", NETEL100I,
-+	 {0xb0110e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_NONE, 0x83},
-+	{"Olicom OC-2183/2185", OC2183,
-+	 {0x0013108d, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_USE_INTERN_10, 0x83},
-+	{"Olicom OC-2325", OC2325,
-+	 {0x0012108d, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_UNMANAGED_PHY, 0xF8},
-+	{"Olicom OC-2326", OC2326,
-+	 {0x0014108d, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_USE_INTERN_10, 0xF8},
-+	{"Compaq Netelligent 10/100 TX UTP", NETELLIGENT_10_100_WS_5100,
-+	 {0xb0300e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
-+	{"Compaq Netelligent 10 T/2 PCI UTP/Coax", NETELLIGENT_10_T2,
-+	 {0xb0120e11, 0xffffffff, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_NONE, 0x83},
-+	{"Compaq NetFlex-3/E", 0,	/* EISA card */
-+	 {0, 0, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_ACTIVITY_LED | TLAN_ADAPTER_UNMANAGED_PHY |
-+	 TLAN_ADAPTER_BIT_RATE_PHY, 0x83},
-+	{"Compaq NetFlex-3/E", 0,	/* EISA card */
-+	 {0, 0, 0, 0, 0, 0},
-+	 TLAN_ADAPTER_ACTIVITY_LED, 0x83},
-+	{0, 0,
-+	 {0, 0, 0, 0, 0, 0},
-+	 0, 0},
-+};
- 
--	ThunderLAN Driver Eeprom routines
- 
--	The Compaq Netelligent 10 and 10/100 cards use a Microchip 24C02A
--	EEPROM.  These functions are based on information in Microchip's
--	data sheet.  I don't know how well this functions will work with
--	other EEPROMs.
-+struct TLanList {
-+	u32 forward;
-+	u16 cStat;
-+	u16 frameSize;
-+	struct {
-+		u32 count;
-+		u32 address;
-+	} buffer[TLAN_BUFFERS_PER_LIST];
-+};
- 
--******************************************************************************
--*****************************************************************************/
- 
--	/***************************************************************
--	 *	TLan_EeSendStart
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:	
--	 *		io_base		The IO port base address for the
--	 *				TLAN device with the EEPROM to
--	 *				use.
--	 *
--	 *	This function sends a start cycle to an EEPROM attached
--	 *	to a TLAN chip.
--	 *
--	 **************************************************************/
- 
--static void TLan_EeSendStart( u16 io_base )
--{
--	u16	sio;
-+struct TLanList tx_ring[TLAN_NUM_TX_LISTS];
-+static unsigned char txb[TLAN_MAX_FRAME_SIZE * TLAN_NUM_TX_LISTS];
- 
--	outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
--	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
-+struct TLanList rx_ring[TLAN_NUM_RX_LISTS];
-+static unsigned char rxb[TLAN_MAX_FRAME_SIZE * TLAN_NUM_RX_LISTS];
- 
--	TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--	TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
--	TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
--	TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
--	TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
-+typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
- 
--} /* TLan_EeSendStart */
- 
--	/***************************************************************
--	 *	TLan_EeSendByte
--	 *
--	 *	Returns:
--	 *		If the correct ack was received, 0, otherwise 1
--	 *	Parms:	io_base		The IO port base address for the
--	 *				TLAN device with the EEPROM to
--	 *				use.
--	 *		data		The 8 bits of information to
--	 *				send to the EEPROM.
--	 *		stop		If TLAN_EEPROM_STOP is passed, a
--	 *				stop cycle is sent after the
--	 *				byte is sent after the ack is
--	 *				read.
--	 *
--	 *	This function sends a byte on the serial EEPROM line,
--	 *	driving the clock to send each bit. The function then
--	 *	reverses transmission direction and reads an acknowledge
--	 *	bit.
--	 *
--	 **************************************************************/
-+int chip_idx;
- 
--static int TLan_EeSendByte( u16 io_base, u8 data, int stop )
--{
--	int	err;
--	u8	place;
--	u16	sio;
- 
--	outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
--	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
-+/*****************************************************************
-+* TLAN Private Information Structure
-+*
-+****************************************************************/
-+struct tlan_private {
-+	unsigned short vendor_id;	/* PCI Vendor code */
-+	unsigned short dev_id;	/* PCI Device code */
-+	const char *nic_name;
-+	u8 *padBuffer;
-+	u8 *rxBuffer;
-+	struct TLanList *rx_head_desc;
-+	u32 rxHead;
-+	u32 rxTail;
-+	u32 rxEocCount;
-+	unsigned int cur_rx, dirty_rx;	/* Producer/consumer ring indicies */
-+	unsigned int cur_tx, dirty_tx;
-+	unsigned rx_buf_sz;	/* Based on mtu + Slack */
-+	struct TLanList *txList;
-+	struct TLanList *rxList;
-+	u8 *txBuffer;
-+	u32 txHead;
-+	u32 txInProgress;
-+	u32 txTail;
-+	int eoc;
-+	u32 txBusyCount;
-+	u32 phyOnline;
-+	u32 timerSetAt;
-+	u32 timerType;
-+	u32 adapterRev;
-+	u32 aui;
-+	u32 debug;
-+	u32 duplex;
-+	u32 phy[2];
-+	u32 phyNum;
-+	u32 speed;
-+	u8 tlanRev;
-+	u8 tlanFullDuplex;
-+	char devName[8];
-+	u8 link;
-+	u8 is_eisa;
-+	u8 neg_be_verbose;
-+} TLanPrivateInfo;
- 
--	/* Assume clock is low, tx is enabled; */
--	for ( place = 0x80; place != 0; place >>= 1 ) {
--		if ( place & data )
--			TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
--		else
--			TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );
--		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
--	}
--	TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
--	TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--	err = TLan_GetBit( TLAN_NET_SIO_EDATA, sio );
--	TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
--	TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
-+static struct tlan_private *priv;
- 
--	if ( ( ! err ) && stop ) {
--		TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );	/* STOP, raise data while clock is high */
--		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--		TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
--	}
-+u32 BASE;
- 
--	return ( err );
- 
--} /* TLan_EeSendByte */
- 
--	/***************************************************************
--	 *	TLan_EeReceiveByte
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		io_base		The IO port base address for the
--	 *				TLAN device with the EEPROM to
--	 *				use.
--	 *		data		An address to a char to hold the
--	 *				data sent from the EEPROM.
--	 *		stop		If TLAN_EEPROM_STOP is passed, a
--	 *				stop cycle is sent after the
--	 *				byte is received, and no ack is
--	 *				sent.
--	 *
--	 *	This function receives 8 bits of data from the EEPROM
--	 *	over the serial link.  It then sends and ack bit, or no
--	 *	ack and a stop bit.  This function is used to retrieve
--	 *	data after the address of a byte in the EEPROM has been
--	 *	sent.
--	 *
--	 **************************************************************/
-+/***************************************************************
-+*	TLan_ResetLists
-+*
-+*	Returns:
-+*		Nothing
-+*	Parms:
-+*		dev	The device structure with the list
-+*			stuctures to be reset.
-+*
-+*	This routine sets the variables associated with managing
-+*	the TLAN lists to their initial values.
-+*
-+**************************************************************/
- 
--static void TLan_EeReceiveByte( u16 io_base, u8 *data, int stop )
-+void TLan_ResetLists(struct nic *nic __unused)
- {
--	u8  place;
--	u16 sio;
- 
--	outw( TLAN_NET_SIO, io_base + TLAN_DIO_ADR );
--	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
--	*data = 0;
-+	int i;
-+	struct TLanList *list;
-+	priv->txHead = 0;
-+	priv->txTail = 0;
- 
--	/* Assume clock is low, tx is enabled; */
--	TLan_ClearBit( TLAN_NET_SIO_ETXEN, sio );
--	for ( place = 0x80; place; place >>= 1 ) {
--		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--		if ( TLan_GetBit( TLAN_NET_SIO_EDATA, sio ) )
--			*data |= place;
--		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
-+	for (i = 0; i < TLAN_NUM_TX_LISTS; i++) {
-+		list = &tx_ring[i];
-+		list->cStat = TLAN_CSTAT_UNUSED;
-+/*		list->buffer[0].address = 0; */
-+		list->buffer[0].address = virt_to_bus(txb + 
-+				(i * TLAN_MAX_FRAME_SIZE)); 
-+		list->buffer[2].count = 0;
-+		list->buffer[2].address = 0;
-+		list->buffer[9].address = 0;
-+/*		list->forward = 0; */
- 	}
- 
--	TLan_SetBit( TLAN_NET_SIO_ETXEN, sio );
--	if ( ! stop ) {
--		TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );	/* Ack = 0 */
--		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
--	} else {
--		TLan_SetBit( TLAN_NET_SIO_EDATA, sio );		/* No ack = 1 (?) */
--		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--		TLan_ClearBit( TLAN_NET_SIO_ECLOK, sio );
--		TLan_ClearBit( TLAN_NET_SIO_EDATA, sio );	/* STOP, raise data while clock is high */
--		TLan_SetBit( TLAN_NET_SIO_ECLOK, sio );
--		TLan_SetBit( TLAN_NET_SIO_EDATA, sio );
--	}
-+	priv->cur_rx = 0;
-+	priv->rx_buf_sz = (TLAN_MAX_FRAME_SIZE);
-+	priv->rx_head_desc = &rx_ring[0];
-+
-+	/* Initialize all the Rx descriptors */
-+	for (i = 0; i < TLAN_NUM_RX_LISTS; i++) {
-+		rx_ring[i].forward = virt_to_le32desc(&rx_ring[i + 1]);
-+		rx_ring[i].cStat = TLAN_CSTAT_READY;
-+		rx_ring[i].frameSize = TLAN_MAX_FRAME_SIZE;
-+		rx_ring[i].buffer[0].count =
-+		    TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
-+		rx_ring[i].buffer[0].address =
-+		    virt_to_le32desc(&rxb[i * TLAN_MAX_FRAME_SIZE]);
-+		rx_ring[i].buffer[1].count = 0;
-+		rx_ring[i].buffer[1].address = 0;
-+	}
-+
-+	/* Mark the last entry as wrapping the ring */
-+	rx_ring[i - 1].forward = virt_to_le32desc(&rx_ring[0]);
-+	priv->dirty_rx = (unsigned int) (i - TLAN_NUM_RX_LISTS);
- 
--} /* TLan_EeReceiveByte */
-+} /* TLan_ResetLists */
- 
--	/***************************************************************
--	 *	TLan_EeReadByte
--	 *
--	 *	Returns:
--	 *		No error = 0, else, the stage at which the error
--	 *		occurred.
--	 *	Parms:
--	 *		io_base		The IO port base address for the
--	 *				TLAN device with the EEPROM to
--	 *				use.
--	 *		ee_addr		The address of the byte in the
--	 *				EEPROM whose contents are to be
--	 *				retrieved.
--	 *		data		An address to a char to hold the
--	 *				data obtained from the EEPROM.
--	 *
--	 *	This function reads a byte of information from an byte
--	 *	cell in the EEPROM.
--	 *
--	 **************************************************************/
-+/***************************************************************
-+*	TLan_Reset
-+*
-+*	Returns:
-+*		0
-+*	Parms:
-+*		dev	Pointer to device structure of adapter
-+*			to be reset.
-+*
-+*	This function resets the adapter and it's physical
-+*	device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
-+*	Programmer's Guide" for details.  The routine tries to
-+*	implement what is detailed there, though adjustments
-+*	have been made.
-+*
-+**************************************************************/
- 
--static int TLan_EeReadByte( u16 io_base, u8 ee_addr, u8 *data )
-+void TLan_ResetAdapter(struct nic *nic __unused)
- {
--	int err;
--	unsigned long flags = 0;
--	int ret=0;
-+	int i;
-+	u32 addr;
-+	u32 data;
-+	u8 data8;
- 
--	TLan_EeSendStart( io_base );
--	err = TLan_EeSendByte( io_base, 0xA0, TLAN_EEPROM_ACK );
--	if (err)
--	{
--		ret=1;
--		goto fail;
--	}
--	err = TLan_EeSendByte( io_base, ee_addr, TLAN_EEPROM_ACK );
--	if (err)
--	{
--		ret=2;
--		goto fail;
--	}
--	TLan_EeSendStart( io_base );
--	err = TLan_EeSendByte( io_base, 0xA1, TLAN_EEPROM_ACK );
--	if (err)
--	{
--		ret=3;
--		goto fail;
--	}
--	TLan_EeReceiveByte( io_base, data, TLAN_EEPROM_STOP );
--fail:
-+	priv->tlanFullDuplex = FALSE;
-+	priv->phyOnline = 0;
-+/*  1.	Assert reset bit. */
- 
--	return ret;
-+	data = inl(BASE + TLAN_HOST_CMD);
-+	data |= TLAN_HC_AD_RST;
-+	outl(data, BASE + TLAN_HOST_CMD);
- 
--} /* TLan_EeReadByte */
-+	udelay(1000);
- 
--#if	0
--/* Not yet converted from Linux driver */
--/*****************************************************************************
--******************************************************************************
-+/*  2.	Turn off interrupts. ( Probably isn't necessary ) */
- 
--	ThunderLAN Driver PHY Layer Routines
-+	data = inl(BASE + TLAN_HOST_CMD);
-+	data |= TLAN_HC_INT_OFF;
-+	outl(data, BASE + TLAN_HOST_CMD);
-+/*  3.	Clear AREGs and HASHs. */
- 
--******************************************************************************
--*****************************************************************************/
-+	for (i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4) {
-+		TLan_DioWrite32(BASE, (u16) i, 0);
-+	}
- 
--	/*********************************************************************
--	 *	TLan_PhyPrint
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		dev	A pointer to the device structure of the
--	 *			TLAN device having the PHYs to be detailed.
--	 *				
--	 *	This function prints the registers a PHY (aka tranceiver).
--	 *
--	 ********************************************************************/
-+/*  4.	Setup NetConfig register. */
- 
--void TLan_PhyPrint( struct net_device *dev )
--{
--	TLanPrivateInfo *priv = dev->priv;
--	u16 i, data0, data1, data2, data3, phy;
-+	data =
-+	    TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
-+	TLan_DioWrite16(BASE, TLAN_NET_CONFIG, (u16) data);
- 
--	phy = priv->phy[priv->phyNum];
-+/*  5.	Load Ld_Tmr and Ld_Thr in HOST_CMD. */
- 
--	if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
--		printk( "TLAN:   Device %s, Unmanaged PHY.\n", dev->name );
--	} else if ( phy <= TLAN_PHY_MAX_ADDR ) {
--		printk( "TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy );
--		printk( "TLAN:      Off.  +0     +1     +2     +3 \n" );
--                for ( i = 0; i < 0x20; i+= 4 ) {
--			printk( "TLAN:      0x%02x", i );
--			TLan_MiiReadReg( dev, phy, i, &data0 );
--			printk( " 0x%04hx", data0 );
--			TLan_MiiReadReg( dev, phy, i + 1, &data1 );
--			printk( " 0x%04hx", data1 );
--			TLan_MiiReadReg( dev, phy, i + 2, &data2 );
--			printk( " 0x%04hx", data2 );
--			TLan_MiiReadReg( dev, phy, i + 3, &data3 );
--			printk( " 0x%04hx\n", data3 );
--		}
--	} else {
--		printk( "TLAN:   Device %s, Invalid PHY.\n", dev->name );
--	}
-+	outl(TLAN_HC_LD_TMR | 0x3f, BASE + TLAN_HOST_CMD);
-+	outl(TLAN_HC_LD_THR | 0x0, BASE + TLAN_HOST_CMD);
- 
--} /* TLan_PhyPrint */
-+/*  6.	Unreset the MII by setting NMRST (in NetSio) to 1. */
- 
--	/*********************************************************************
--	 *	TLan_PhyDetect
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		dev	A pointer to the device structure of the adapter
--	 *			for which the PHY needs determined.
--	 *
--	 *	So far I've found that adapters which have external PHYs
--	 *	may also use the internal PHY for part of the functionality.
--	 *	(eg, AUI/Thinnet).  This function finds out if this TLAN
--	 *	chip has an internal PHY, and then finds the first external
--	 *	PHY (starting from address 0) if it exists).
--	 *
--	 ********************************************************************/
-+	outw(TLAN_NET_SIO, BASE + TLAN_DIO_ADR);
-+	addr = BASE + TLAN_DIO_DATA + TLAN_NET_SIO;
-+	TLan_SetBit(TLAN_NET_SIO_NMRST, addr);
- 
--void TLan_PhyDetect( struct net_device *dev )
--{
--	TLanPrivateInfo *priv = dev->priv;
--	u16		control;
--	u16		hi;
--	u16		lo;
--	u32		phy;
-+/*  7.	Setup the remaining registers. */
- 
--	if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
--		priv->phyNum = 0xFFFF;
--		return;
-+	if (priv->tlanRev >= 0x30) {
-+		data8 = TLAN_ID_TX_EOC | TLAN_ID_RX_EOC;
-+		TLan_DioWrite8(BASE, TLAN_INT_DIS, data8);
- 	}
-+	TLan_PhyDetect(nic);
-+	data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN;
- 
--	TLan_MiiReadReg( dev, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi );
--	
--	if ( hi != 0xFFFF ) {
--		priv->phy[0] = TLAN_PHY_MAX_ADDR;
--	} else {
--		priv->phy[0] = TLAN_PHY_NONE;
-+	if (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_BIT_RATE_PHY) {
-+		data |= TLAN_NET_CFG_BIT;
-+		if (priv->aui == 1) {
-+			TLan_DioWrite8(BASE, TLAN_ACOMMIT, 0x0a);
-+		} else if (priv->duplex == TLAN_DUPLEX_FULL) {
-+			TLan_DioWrite8(BASE, TLAN_ACOMMIT, 0x00);
-+			priv->tlanFullDuplex = TRUE;
-+		} else {
-+			TLan_DioWrite8(BASE, TLAN_ACOMMIT, 0x08);
-+		}
- 	}
- 
--	priv->phy[1] = TLAN_PHY_NONE;
--	for ( phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++ ) {
--		TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &control );
--		TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &hi );
--		TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &lo );
--		if ( ( control != 0xFFFF ) || ( hi != 0xFFFF ) || ( lo != 0xFFFF ) ) {
--			TLAN_DBG( TLAN_DEBUG_GNRL, "PHY found at %02x %04x %04x %04x\n", phy, control, hi, lo );
--			if ( ( priv->phy[1] == TLAN_PHY_NONE ) && ( phy != TLAN_PHY_MAX_ADDR ) ) {
--				priv->phy[1] = phy;
--			}
--		}
-+	if (priv->phyNum == 0) {
-+		data |= TLAN_NET_CFG_PHY_EN;
- 	}
-+	TLan_DioWrite16(BASE, TLAN_NET_CONFIG, (u16) data);
- 
--	if ( priv->phy[1] != TLAN_PHY_NONE ) {
--		priv->phyNum = 1;
--	} else if ( priv->phy[0] != TLAN_PHY_NONE ) {
--		priv->phyNum = 0;
-+	if (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_UNMANAGED_PHY) {
-+		TLan_FinishReset(nic);
- 	} else {
--		printk( "TLAN:  Cannot initialize device, no PHY was found!\n" );
-+		TLan_PhyPowerDown(nic);
- 	}
- 
--} /* TLan_PhyDetect */
-+}	/* TLan_ResetAdapter */
- 
--void TLan_PhyPowerDown( struct net_device *dev )
-+void TLan_FinishReset(struct nic *nic)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	u16		value;
- 
--	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering down PHY(s).\n", dev->name );
--	value = MII_GC_PDOWN | MII_GC_LOOPBK | MII_GC_ISOLATE;
--	TLan_MiiSync( dev->base_addr );
--	TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
--	if ( ( priv->phyNum == 0 ) && ( priv->phy[1] != TLAN_PHY_NONE ) && ( ! ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) ) ) {
--		TLan_MiiSync( dev->base_addr );
--		TLan_MiiWriteReg( dev, priv->phy[1], MII_GEN_CTL, value );
-+	u8 data;
-+	u32 phy;
-+	u8 sio;
-+	u16 status;
-+	u16 partner;
-+	u16 tlphy_ctl;
-+	u16 tlphy_par;
-+	u16 tlphy_id1, tlphy_id2;
-+	int i;
-+
-+	phy = priv->phy[priv->phyNum];
-+
-+	data = TLAN_NET_CMD_NRESET | TLAN_NET_CMD_NWRAP;
-+	if (priv->tlanFullDuplex) {
-+		data |= TLAN_NET_CMD_DUPLEX;
- 	}
-+	TLan_DioWrite8(BASE, TLAN_NET_CMD, data);
-+	data = TLAN_NET_MASK_MASK4 | TLAN_NET_MASK_MASK5;
-+	if (priv->phyNum == 0) {
-+		data |= TLAN_NET_MASK_MASK7;
-+	}
-+	TLan_DioWrite8(BASE, TLAN_NET_MASK, data);
-+	TLan_DioWrite16(BASE, TLAN_MAX_RX, ((1536) + 7) & ~7);
-+	TLan_MiiReadReg(nic, phy, MII_GEN_ID_HI, &tlphy_id1);
-+	TLan_MiiReadReg(nic, phy, MII_GEN_ID_LO, &tlphy_id2);
- 
--	/* Wait for 50 ms and powerup
--	 * This is abitrary.  It is intended to make sure the
--	 * tranceiver settles.
--	 */
--	TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP );
-+	if ((tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_UNMANAGED_PHY)
-+	    || (priv->aui)) {
-+		status = MII_GS_LINK;
-+		printf("TLAN:  %s: Link forced.\n", priv->nic_name);
-+	} else {
-+		TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
-+		udelay(1000);
-+		TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
-+		if ((status & MII_GS_LINK) &&	/* We only support link info on Nat.Sem. PHY's */
-+		    (tlphy_id1 == NAT_SEM_ID1)
-+		    && (tlphy_id2 == NAT_SEM_ID2)) {
-+			TLan_MiiReadReg(nic, phy, MII_AN_LPA, &partner);
-+			TLan_MiiReadReg(nic, phy, TLAN_TLPHY_PAR,
-+					&tlphy_par);
- 
--} /* TLan_PhyPowerDown */
-+			printf("TLAN: %s: Link active with ",
-+			       priv->nic_name);
-+			if (!(tlphy_par & TLAN_PHY_AN_EN_STAT)) {
-+				printf("forced 10%sMbps %s-Duplex\n",
-+				       tlphy_par & TLAN_PHY_SPEED_100 ? ""
-+				       : "0",
-+				       tlphy_par & TLAN_PHY_DUPLEX_FULL ?
-+				       "Full" : "Half");
-+			} else {
-+				printf
-+				    ("AutoNegotiation enabled, at 10%sMbps %s-Duplex\n",
-+				     tlphy_par & TLAN_PHY_SPEED_100 ? "" :
-+				     "0",
-+				     tlphy_par & TLAN_PHY_DUPLEX_FULL ?
-+				     "Full" : "Half");
-+				printf("TLAN: Partner capability: ");
-+				for (i = 5; i <= 10; i++)
-+					if (partner & (1 << i))
-+						printf("%s", media[i - 5]);
-+				printf("\n");
-+			}
- 
--void TLan_PhyPowerUp( struct net_device *dev )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	u16		value;
-+			TLan_DioWrite8(BASE, TLAN_LED_REG, TLAN_LED_LINK);
-+#ifdef MONITOR
-+			/* We have link beat..for now anyway */
-+			priv->link = 1;
-+			/*Enabling link beat monitoring */
-+			/* TLan_SetTimer( nic, (10*HZ), TLAN_TIMER_LINK_BEAT ); */
-+			mdelay(10000);
-+			TLan_PhyMonitor(nic);
-+#endif
-+		} else if (status & MII_GS_LINK) {
-+			printf("TLAN: %s: Link active\n", priv->nic_name);
-+			TLan_DioWrite8(BASE, TLAN_LED_REG, TLAN_LED_LINK);
-+		}
-+	}
- 
--	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Powering up PHY.\n", dev->name );
--	TLan_MiiSync( dev->base_addr );
--	value = MII_GC_LOOPBK;
--	TLan_MiiWriteReg( dev, priv->phy[priv->phyNum], MII_GEN_CTL, value );
--	TLan_MiiSync(dev->base_addr);
--	/* Wait for 500 ms and reset the
--	 * tranceiver.  The TLAN docs say both 50 ms and
--	 * 500 ms, so do the longer, just in case.
--	 */
--	TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET );
-+	if (priv->phyNum == 0) {
-+		TLan_MiiReadReg(nic, phy, TLAN_TLPHY_CTL, &tlphy_ctl);
-+		tlphy_ctl |= TLAN_TC_INTEN;
-+		TLan_MiiWriteReg(nic, phy, TLAN_TLPHY_CTL, tlphy_ctl);
-+		sio = TLan_DioRead8(BASE, TLAN_NET_SIO);
-+		sio |= TLAN_NET_SIO_MINTEN;
-+		TLan_DioWrite8(BASE, TLAN_NET_SIO, sio);
-+	}
- 
--} /* TLan_PhyPowerUp */
-+	if (status & MII_GS_LINK) {
-+		TLan_SetMac(nic, 0, nic->node_addr);
-+		priv->phyOnline = 1;
-+		outb((TLAN_HC_INT_ON >> 8), BASE + TLAN_HOST_CMD + 1);
-+/*		if ( debug >= 1 && debug != TLAN_DEBUG_PROBE ) {
-+			outb( ( TLAN_HC_REQ_INT >> 8 ), BASE + TLAN_HOST_CMD + 1 );
-+		}
- 
--void TLan_PhyReset( struct net_device *dev )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	u16		phy;
--	u16		value;
-+		*/
-+		outl(virt_to_bus(&rx_ring), BASE + TLAN_CH_PARM);
-+		outl(TLAN_HC_GO | TLAN_HC_RT, BASE + TLAN_HOST_CMD);
-+	} else {
-+		printf
-+		    ("TLAN: %s: Link inactive, will retry in 10 secs...\n",
-+		     priv->nic_name);
-+		/* TLan_SetTimer( nic, (10*HZ), TLAN_TIMER_FINISH_RESET ); */
-+		mdelay(10000);
-+		TLan_FinishReset(nic);
-+		return;
- 
--	phy = priv->phy[priv->phyNum];
-+	}
- 
--	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Reseting PHY.\n", dev->name );
--	TLan_MiiSync( dev->base_addr );
--	value = MII_GC_LOOPBK | MII_GC_RESET;
--	TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, value );
--	TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
--	while ( value & MII_GC_RESET ) {
--		TLan_MiiReadReg( dev, phy, MII_GEN_CTL, &value );
--	}
--
--	/* Wait for 500 ms and initialize.
--	 * I don't remember why I wait this long.
--	 * I've changed this to 50ms, as it seems long enough.
--	 */
--	TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_START_LINK );
--
--} /* TLan_PhyReset */
--
--void TLan_PhyStartLink( struct net_device *dev )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	u16		ability;
--	u16		control;
--	u16		data;
--	u16		phy;
--	u16		status;
--	u16		tctl;
--
--	phy = priv->phy[priv->phyNum];
--	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Trying to activate link.\n", dev->name );
--	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
--	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &ability );
--
--	if ( ( status & MII_GS_AUTONEG ) && 
--	     ( ! priv->aui ) ) {
--		ability = status >> 11;
--		if ( priv->speed  == TLAN_SPEED_10 && 
--		     priv->duplex == TLAN_DUPLEX_HALF) {
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0000);
--		} else if ( priv->speed == TLAN_SPEED_10 &&
--			    priv->duplex == TLAN_DUPLEX_FULL) {
--			priv->tlanFullDuplex = TRUE;
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x0100);
--		} else if ( priv->speed == TLAN_SPEED_100 &&
--			    priv->duplex == TLAN_DUPLEX_HALF) {
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2000);
--		} else if ( priv->speed == TLAN_SPEED_100 &&
--			    priv->duplex == TLAN_DUPLEX_FULL) {
--			priv->tlanFullDuplex = TRUE;
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x2100);
--		} else {
--	
--			/* Set Auto-Neg advertisement */
--			TLan_MiiWriteReg( dev, phy, MII_AN_ADV, (ability << 5) | 1);
--			/* Enablee Auto-Neg */
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1000 );
--			/* Restart Auto-Neg */
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, 0x1200 );
--			/* Wait for 4 sec for autonegotiation
--		 	* to complete.  The max spec time is less than this
--		 	* but the card need additional time to start AN.
--		 	* .5 sec should be plenty extra.
--		 	*/
--			printk( "TLAN: %s: Starting autonegotiation.\n", dev->name );
--			TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN );
--			return;
--		}
--		
--	}	
--	
--	if ( ( priv->aui ) && ( priv->phyNum != 0 ) ) {
--		priv->phyNum = 0;
--		data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
--		TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
--		TLan_SetTimer( dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN );
--		return;
--	}  else if ( priv->phyNum == 0 ) {
--        	TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tctl );
--		if ( priv->aui ) {
--                	tctl |= TLAN_TC_AUISEL;
--		} else { 
--                	tctl &= ~TLAN_TC_AUISEL;
--			control = 0;
--			if ( priv->duplex == TLAN_DUPLEX_FULL ) {
--				control |= MII_GC_DUPLEX;
--				priv->tlanFullDuplex = TRUE;
--			}
--			if ( priv->speed == TLAN_SPEED_100 ) {
--				control |= MII_GC_SPEEDSEL;
--			}
--       			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, control );
--		}
--        	TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tctl );
--	}
--
--	/* Wait for 2 sec to give the tranceiver time
--	 * to establish link.
--	 */
--	TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET );
--
--} /* TLan_PhyStartLink */
--
--void TLan_PhyFinishAutoNeg( struct net_device *dev )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	u16		an_adv;
--	u16		an_lpa;
--	u16		data;
--	u16		mode;
--	u16		phy;
--	u16		status;
--	
--	phy = priv->phy[priv->phyNum];
--
--	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
--	udelay( 1000 );
--	TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
--
--	if ( ! ( status & MII_GS_AUTOCMPLT ) ) {
--		/* Wait for 8 sec to give the process
--		 * more time.  Perhaps we should fail after a while.
--		 */
--		 if (!priv->neg_be_verbose++) {
--			 printk(KERN_INFO "TLAN:  Giving autonegotiation more time.\n");
--		 	 printk(KERN_INFO "TLAN:  Please check that your adapter has\n");
--		 	 printk(KERN_INFO "TLAN:  been properly connected to a HUB or Switch.\n");
--			 printk(KERN_INFO "TLAN:  Trying to establish link in the background...\n");
--		 }
--		TLan_SetTimer( dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN );
--		return;
--	}
--
--	printk( "TLAN: %s: Autonegotiation complete.\n", dev->name );
--	TLan_MiiReadReg( dev, phy, MII_AN_ADV, &an_adv );
--	TLan_MiiReadReg( dev, phy, MII_AN_LPA, &an_lpa );
--	mode = an_adv & an_lpa & 0x03E0;
--	if ( mode & 0x0100 ) {
--		priv->tlanFullDuplex = TRUE;
--	} else if ( ! ( mode & 0x0080 ) && ( mode & 0x0040 ) ) {
--		priv->tlanFullDuplex = TRUE;
--	}
--
--	if ( ( ! ( mode & 0x0180 ) ) && ( priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10 ) && ( priv->phyNum != 0 ) ) {
--		priv->phyNum = 0;
--		data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
--		TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, data );
--		TLan_SetTimer( dev, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN );
--		return;
--	}
--
--	if ( priv->phyNum == 0 ) {
--		if ( ( priv->duplex == TLAN_DUPLEX_FULL ) || ( an_adv & an_lpa & 0x0040 ) ) {
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, MII_GC_AUTOENB | MII_GC_DUPLEX );
--			printk( "TLAN:  Starting internal PHY with FULL-DUPLEX\n" );
--		} else {
--			TLan_MiiWriteReg( dev, phy, MII_GEN_CTL, MII_GC_AUTOENB );
--			printk( "TLAN:  Starting internal PHY with HALF-DUPLEX\n" );
--		}
--	}
--
--	/* Wait for 100 ms.  No reason in partiticular.
--	 */
--	TLan_SetTimer( dev, (HZ/10), TLAN_TIMER_FINISH_RESET );
--		
--} /* TLan_PhyFinishAutoNeg */
--
--#ifdef MONITOR
--
--        /*********************************************************************
--        *
--        *      TLan_phyMonitor
--        *
--        *      Returns: 
--        *              None
--        *
--        *      Params:
--        *              dev             The device structure of this device.
--        *
--        *      
--        *      This function monitors PHY condition by reading the status
--        *      register via the MII bus. This can be used to give info
--        *      about link changes (up/down), and possible switch to alternate
--        *      media.
--        *
--        * ******************************************************************/
--
--void TLan_PhyMonitor( struct net_device *dev )
--{
--	TLanPrivateInfo *priv = dev->priv;
--	u16     phy;
--	u16     phy_status;
--
--	phy = priv->phy[priv->phyNum];
--
--        /* Get PHY status register */
--        TLan_MiiReadReg( dev, phy, MII_GEN_STS, &phy_status );
--
--        /* Check if link has been lost */
--        if (!(phy_status & MII_GS_LINK)) { 
-- 	       if (priv->link) {
--		      priv->link = 0;
--	              printk(KERN_DEBUG "TLAN: %s has lost link\n", dev->name);
--	              dev->flags &= ~IFF_RUNNING;
--		      TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
--		      return;
--		}
--	}
--
--        /* Link restablished? */
--        if ((phy_status & MII_GS_LINK) && !priv->link) {
-- 		priv->link = 1;
--        	printk(KERN_DEBUG "TLAN: %s has reestablished link\n", dev->name);
--        	dev->flags |= IFF_RUNNING;
--        }
--
--	/* Setup a new monitor */
--	TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT );
--}	
--
--#endif /* MONITOR */
--
--/*****************************************************************************
--******************************************************************************
--
--	ThunderLAN Driver MII Routines
--
--	These routines are based on the information in Chap. 2 of the
--	"ThunderLAN Programmer's Guide", pp. 15-24.
--
--******************************************************************************
--*****************************************************************************/
--
--	/***************************************************************
--	 *	TLan_MiiReadReg
--	 *
--	 *	Returns:
--	 *		0	if ack received ok
--	 *		1	otherwise.
--	 *
--	 *	Parms:
--	 *		dev		The device structure containing
--	 *				The io address and interrupt count
--	 *				for this device.
--	 *		phy		The address of the PHY to be queried.
--	 *		reg		The register whose contents are to be
--	 *				retreived.
--	 *		val		A pointer to a variable to store the
--	 *				retrieved value.
--	 *
--	 *	This function uses the TLAN's MII bus to retreive the contents
--	 *	of a given register on a PHY.  It sends the appropriate info
--	 *	and then reads the 16-bit register value from the MII bus via
--	 *	the TLAN SIO register.
--	 *
--	 **************************************************************/
--
--int TLan_MiiReadReg( struct net_device *dev, u16 phy, u16 reg, u16 *val )
--{
--	u8	nack;
--	u16	sio, tmp;
-- 	u32	i;
--	int	err;
--	int	minten;
--	TLanPrivateInfo *priv = dev->priv;
--	unsigned long flags = 0;
--
--	err = FALSE;
--	outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
--	sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
--	
--	if (!in_irq())
--		spin_lock_irqsave(&priv->lock, flags);
--
--	TLan_MiiSync(dev->base_addr);
--
--	minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
--	if ( minten )
--		TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
--
--	TLan_MiiSendData( dev->base_addr, 0x1, 2 );	/* Start ( 01b ) */
--	TLan_MiiSendData( dev->base_addr, 0x2, 2 );	/* Read  ( 10b ) */
--	TLan_MiiSendData( dev->base_addr, phy, 5 );	/* Device #      */
--	TLan_MiiSendData( dev->base_addr, reg, 5 );	/* Register #    */
--
--	TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);		/* Change direction */
--
--	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);		/* Clock Idle bit */
--	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
--	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);		/* Wait 300ns */
--
--	nack = TLan_GetBit(TLAN_NET_SIO_MDATA, sio);	/* Check for ACK */
--	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);		/* Finish ACK */
--	if (nack) {					/* No ACK, so fake it */
--		for (i = 0; i < 16; i++) {
--			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
--			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
--		}
--		tmp = 0xffff;
--		err = TRUE;
--	} else {					/* ACK, so read data */
--		for (tmp = 0, i = 0x8000; i; i >>= 1) {
--			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
--			if (TLan_GetBit(TLAN_NET_SIO_MDATA, sio))
--				tmp |= i;
--			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
--		}
--	}
--
--	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);		/* Idle cycle */
--	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
--
--	if ( minten )
--		TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
--
--	*val = tmp;
--	
--	if (!in_irq())
--		spin_unlock_irqrestore(&priv->lock, flags);
--
--	return err;
--
--} /* TLan_MiiReadReg */
--
--	/***************************************************************
--	 *	TLan_MiiSendData
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		base_port	The base IO port of the adapter	in
--	 *				question.
--	 *		dev		The address of the PHY to be queried.
--	 *		data		The value to be placed on the MII bus.
--	 *		num_bits	The number of bits in data that are to
--	 *				be placed on the MII bus.
--	 *
--	 *	This function sends on sequence of bits on the MII
--	 *	configuration bus.
--	 *
--	 **************************************************************/
--
--void TLan_MiiSendData( u16 base_port, u32 data, unsigned num_bits )
--{
--	u16 sio;
--	u32 i;
--
--	if ( num_bits == 0 )
--		return;
--
--	outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
--	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
--	TLan_SetBit( TLAN_NET_SIO_MTXEN, sio );
--
--	for ( i = ( 0x1 << ( num_bits - 1 ) ); i; i >>= 1 ) {
--		TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
--		(void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
--		if ( data & i )
--			TLan_SetBit( TLAN_NET_SIO_MDATA, sio );
--		else
--			TLan_ClearBit( TLAN_NET_SIO_MDATA, sio );
--		TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
--		(void) TLan_GetBit( TLAN_NET_SIO_MCLK, sio );
--	}
--
--} /* TLan_MiiSendData */
--
--	/***************************************************************
--	 *	TLan_MiiSync
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		base_port	The base IO port of the adapter in
--	 *				question.
--	 *
--	 *	This functions syncs all PHYs in terms of the MII configuration
--	 *	bus.
--	 *
--	 **************************************************************/
--
--void TLan_MiiSync( u16 base_port )
--{
--	int i;
--	u16 sio;
--
--	outw( TLAN_NET_SIO, base_port + TLAN_DIO_ADR );
--	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
--
--	TLan_ClearBit( TLAN_NET_SIO_MTXEN, sio );
--	for ( i = 0; i < 32; i++ ) {
--		TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );
--		TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
--	}
--
--} /* TLan_MiiSync */
--
--	/***************************************************************
--	 *	TLan_MiiWriteReg
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		dev		The device structure for the device
--	 *				to write to.
--	 *		phy		The address of the PHY to be written to.
--	 *		reg		The register whose contents are to be
--	 *				written.
--	 *		val		The value to be written to the register.
--	 *
--	 *	This function uses the TLAN's MII bus to write the contents of a
--	 *	given register on a PHY.  It sends the appropriate info and then
--	 *	writes the 16-bit register value from the MII configuration bus
--	 *	via the TLAN SIO register.
--	 *
--	 **************************************************************/
--
--void TLan_MiiWriteReg( struct net_device *dev, u16 phy, u16 reg, u16 val )
--{
--	u16	sio;
--	int	minten;
--	unsigned long flags = 0;
--	TLanPrivateInfo *priv = dev->priv;
--
--	outw(TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR);
--	sio = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
--	
--	if (!in_irq())
--		spin_lock_irqsave(&priv->lock, flags);
--
--	TLan_MiiSync( dev->base_addr );
--
--	minten = TLan_GetBit( TLAN_NET_SIO_MINTEN, sio );
--	if ( minten )
--		TLan_ClearBit( TLAN_NET_SIO_MINTEN, sio );
--
--	TLan_MiiSendData( dev->base_addr, 0x1, 2 );	/* Start ( 01b ) */
--	TLan_MiiSendData( dev->base_addr, 0x1, 2 );	/* Write ( 01b ) */
--	TLan_MiiSendData( dev->base_addr, phy, 5 );	/* Device #      */
--	TLan_MiiSendData( dev->base_addr, reg, 5 );	/* Register #    */
--
--	TLan_MiiSendData( dev->base_addr, 0x2, 2 );	/* Send ACK */
--	TLan_MiiSendData( dev->base_addr, val, 16 );	/* Send Data */
--
--	TLan_ClearBit( TLAN_NET_SIO_MCLK, sio );	/* Idle cycle */
--	TLan_SetBit( TLAN_NET_SIO_MCLK, sio );
--
--	if ( minten )
--		TLan_SetBit( TLAN_NET_SIO_MINTEN, sio );
--	
--	if (!in_irq())
--		spin_unlock_irqrestore(&priv->lock, flags);
--
--} /* TLan_MiiWriteReg */
--#endif
--
--/**************************************************************************
--RESET - Reset adapter
--***************************************************************************/
--static void skel_reset(struct nic *nic)
--{
--	/* put the card in its initial state */
--}
--
--/**************************************************************************
--POLL - Wait for a frame
--***************************************************************************/
--static int skel_poll(struct nic *nic)
--{
--	/* return true if there's an ethernet packet ready to read */
--	/* nic->packet should contain data on return */
--	/* nic->packetlen should contain length of data */
--	return (0);	/* initially as this is called to flush the input */
--}
--
--/**************************************************************************
--TRANSMIT - Transmit a frame
--***************************************************************************/
--static void skel_transmit(
--	struct nic *nic,
--	const char *d,			/* Destination */
--	unsigned int t,			/* Type */
--	unsigned int s,			/* size */
--	const char *p)			/* Packet */
--{
--	/* send the packet to destination */
--}
--
--/**************************************************************************
--DISABLE - Turn off ethernet interface
--***************************************************************************/
--static void skel_disable(struct nic *nic)
--{
--}
--
--/**************************************************************************
--PROBE - Look for an adapter, this routine's visible to the outside
--You should omit the last argument struct pci_device * for a non-PCI NIC
--***************************************************************************/
--struct nic *tlan_probe(struct nic *nic, unsigned short *probe_addrs,
--	struct pci_device *p)
--{
--	/* if probe_addrs is 0, then routine can use a hardwired default */
--	/* if board found */
--	{
--		/* point to NIC specific routines */
--		nic->reset = skel_reset;
--		nic->poll = skel_poll;
--		nic->transmit = skel_transmit;
--		nic->disable = skel_disable;
--		return nic;
--	}
--	/* else */
--	return 0;
--}
--
--#if	0
--#ifndef TLAN_H
--#define TLAN_H
--/********************************************************************
-- *
-- *  Linux ThunderLAN Driver
-- *
-- *  tlan.h
-- *  by James Banks
-- *
-- *  (C) 1997-1998 Caldera, Inc.
-- *  (C) 1999-2001 Torben Mathiasen
-- * 
-- *  This software may be used and distributed according to the terms
-- *  of the GNU General Public License, incorporated herein by reference.
-- *
-- ** This file is best viewed/edited with tabstop=4, colums>=132
-- *
-- *  
-- *  Dec 10, 1999	Torben Mathiasen <torben.mathiasen@compaq.com>
-- *			New Maintainer
-- *
-- ********************************************************************/
--
--#include <asm/io.h>
--#include <asm/types.h>
--#include <linux/netdevice.h>
--
--#define FALSE			0
--#define TRUE			1
--
--#define TX_TIMEOUT		(10*HZ)	 /* We need time for auto-neg */
--
--typedef struct tlan_adapter_entry {
--	u16	vendorId;
--	u16	deviceId;
--	char	*deviceLabel;
--	u32	flags;
--	u16	addrOfs;
--} TLanAdapterEntry;
--
--	/*****************************************************************
--	 * EISA Definitions
--	 *
--	 ****************************************************************/
--
--#define EISA_ID      0xc80   /* EISA ID Registers */ 
--#define EISA_ID0     0xc80   /* EISA ID Register 0 */ 
--#define EISA_ID1     0xc81   /* EISA ID Register 1 */ 
--#define EISA_ID2     0xc82   /* EISA ID Register 2 */ 
--#define EISA_ID3     0xc83   /* EISA ID Register 3 */ 
--#define EISA_CR      0xc84   /* EISA Control Register */
--#define EISA_REG0    0xc88   /* EISA Configuration Register 0 */
--#define EISA_REG1    0xc89   /* EISA Configuration Register 1 */
--#define EISA_REG2    0xc8a   /* EISA Configuration Register 2 */
--#define EISA_REG3    0xc8f   /* EISA Configuration Register 3 */
--#define EISA_APROM   0xc90   /* Ethernet Address PROM */
--
--	/*****************************************************************
--	 * Rx/Tx List Definitions
--	 *
--	 ****************************************************************/
--
--typedef struct tlan_buffer_ref_tag {
--	u32	count;
--	u32	address;
--} TLanBufferRef;
--
--typedef struct tlan_list_tag {
--	u32		forward;
--	u16		cStat;
--	u16		frameSize;
--	TLanBufferRef	buffer[TLAN_BUFFERS_PER_LIST];
--} TLanList;
--
--typedef u8 TLanBuffer[TLAN_MAX_FRAME_SIZE];
--
--	/*****************************************************************
--	 * TLAN Private Information Structure
--	 *
--	 ****************************************************************/
--
--typedef struct tlan_private_tag {
--	struct net_device       *nextDevice;
--	void			*dmaStorage;
--	u8			*padBuffer;
--	TLanList                *rxList;
--	u8			*rxBuffer;
--	u32                     rxHead;
--	u32                     rxTail;
--	u32			rxEocCount;
--	TLanList                *txList;
--	u8			*txBuffer;
--	u32                     txHead;
--	u32                     txInProgress;
--	u32                     txTail;
--	u32			txBusyCount;
--	u32                     phyOnline;
--	u32			timerSetAt;
--	u32			timerType;
--	struct timer_list	timer;
--	struct net_device_stats	stats;
--	struct board		*adapter;
--	u32			adapterRev;
--	u32			aui;
--	u32			debug;
--	u32			duplex;
--	u32			phy[2];
--	u32			phyNum;
--	u32			speed;
--	u8			tlanRev;
--	u8			tlanFullDuplex;
--	char                    devName[8];
--	spinlock_t		lock;
--	u8			link;
--	u8			is_eisa;
--	struct tq_struct	tlan_tqueue;
--	u8			neg_be_verbose;
--} TLanPrivateInfo;
--
--#define 	TLAN_HC_GO		0x80000000
--#define		TLAN_HC_STOP		0x40000000
--#define		TLAN_HC_ACK		0x20000000
--#define		TLAN_HC_CS_MASK		0x1FE00000
--#define		TLAN_HC_EOC		0x00100000
--#define		TLAN_HC_RT		0x00080000
--#define		TLAN_HC_NES		0x00040000
--#define		TLAN_HC_AD_RST		0x00008000
--#define		TLAN_HC_LD_TMR		0x00004000
--#define		TLAN_HC_LD_THR		0x00002000
--#define		TLAN_HC_REQ_INT		0x00001000
--#define		TLAN_HC_INT_OFF		0x00000800
--#define		TLAN_HC_INT_ON		0x00000400
--#define		TLAN_HC_AC_MASK		0x000000FF
--#define		TLAN_DA_ADR_INC		0x8000
--#define		TLAN_DA_RAM_ADR		0x4000
--#define		TLAN_HI_IV_MASK		0x1FE0
--#define		TLAN_HI_IT_MASK		0x001C
--
--#define		TLAN_NET_CMD_NRESET	0x80
--#define		TLAN_NET_CMD_NWRAP	0x40
--#define		TLAN_NET_CMD_CSF	0x20
--#define		TLAN_NET_CMD_CAF	0x10
--#define		TLAN_NET_CMD_NOBRX	0x08
--#define		TLAN_NET_CMD_DUPLEX	0x04
--#define		TLAN_NET_CMD_TRFRAM	0x02
--#define		TLAN_NET_CMD_TXPACE	0x01
--#define 	TLAN_NET_SIO_MINTEN	0x80
--#define		TLAN_NET_SIO_ECLOK	0x40
--#define		TLAN_NET_SIO_ETXEN	0x20
--#define		TLAN_NET_SIO_EDATA	0x10
--#define		TLAN_NET_SIO_NMRST	0x08
--#define		TLAN_NET_SIO_MCLK	0x04
--#define		TLAN_NET_SIO_MTXEN	0x02
--#define		TLAN_NET_SIO_MDATA	0x01
--#define		TLAN_NET_STS_MIRQ	0x80
--#define		TLAN_NET_STS_HBEAT	0x40
--#define		TLAN_NET_STS_TXSTOP	0x20
--#define		TLAN_NET_STS_RXSTOP	0x10
--#define		TLAN_NET_STS_RSRVD	0x0F
--#define		TLAN_NET_MASK_MASK7	0x80
--#define		TLAN_NET_MASK_MASK6	0x40
--#define		TLAN_NET_MASK_MASK5	0x20
--#define		TLAN_NET_MASK_MASK4	0x10
--#define		TLAN_NET_MASK_RSRVD	0x0F
--#define 	TLAN_NET_CFG_RCLK	0x8000
--#define		TLAN_NET_CFG_TCLK	0x4000
--#define		TLAN_NET_CFG_BIT	0x2000
--#define		TLAN_NET_CFG_RXCRC	0x1000
--#define		TLAN_NET_CFG_PEF	0x0800
--#define		TLAN_NET_CFG_1FRAG	0x0400
--#define		TLAN_NET_CFG_1CHAN	0x0200
--#define		TLAN_NET_CFG_MTEST	0x0100
--#define		TLAN_NET_CFG_PHY_EN	0x0080
--#define		TLAN_NET_CFG_MSMASK	0x007F
--#define		TLAN_LED_ACT		0x10
--#define		TLAN_LED_LINK		0x01
--#define		TLAN_ID_TX_EOC		0x04
--#define		TLAN_ID_RX_EOF		0x02
--#define		TLAN_ID_RX_EOC		0x01
--
--#define CIRC_INC( a, b ) if ( ++a >= b ) a = 0
--
--#ifdef I_LIKE_A_FAST_HASH_FUNCTION
--/* given 6 bytes, view them as 8 6-bit numbers and return the XOR of those */
--/* the code below is about seven times as fast as the original code */
--inline u32 TLan_HashFunc( u8 *a )
--{
--        u8     hash;
--
--        hash = (a[0]^a[3]);             /* & 077 */
--        hash ^= ((a[0]^a[3])>>6);       /* & 003 */
--        hash ^= ((a[1]^a[4])<<2);       /* & 074 */
--        hash ^= ((a[1]^a[4])>>4);       /* & 017 */
--        hash ^= ((a[2]^a[5])<<4);       /* & 060 */
--        hash ^= ((a[2]^a[5])>>2);       /* & 077 */
--
--        return (hash & 077);
--}
--
--#else /* original code */
--
--inline	u32	xor( u32 a, u32 b )
--{
--	return ( ( a && ! b ) || ( ! a && b ) );
--}
--#define XOR8( a, b, c, d, e, f, g, h )	xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
--#define DA( a, bit )					( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
--
--inline u32 TLan_HashFunc( u8 *a )
--{
--	u32	hash;
--
--	hash  = XOR8( DA(a,0), DA(a, 6), DA(a,12), DA(a,18), DA(a,24), DA(a,30), DA(a,36), DA(a,42) );
--	hash |= XOR8( DA(a,1), DA(a, 7), DA(a,13), DA(a,19), DA(a,25), DA(a,31), DA(a,37), DA(a,43) ) << 1;
--	hash |= XOR8( DA(a,2), DA(a, 8), DA(a,14), DA(a,20), DA(a,26), DA(a,32), DA(a,38), DA(a,44) ) << 2;
--	hash |= XOR8( DA(a,3), DA(a, 9), DA(a,15), DA(a,21), DA(a,27), DA(a,33), DA(a,39), DA(a,45) ) << 3;
--	hash |= XOR8( DA(a,4), DA(a,10), DA(a,16), DA(a,22), DA(a,28), DA(a,34), DA(a,40), DA(a,46) ) << 4;
--	hash |= XOR8( DA(a,5), DA(a,11), DA(a,17), DA(a,23), DA(a,29), DA(a,35), DA(a,41), DA(a,47) ) << 5;
--
--	return hash;
--
--} 
--
--#endif /* I_LIKE_A_FAST_HASH_FUNCTION */
--#endif
--/*******************************************************************************
-- *
-- *  Linux ThunderLAN Driver
-- *
-- *  tlan.c
-- *  by James Banks
-- *
-- *  (C) 1997-1998 Caldera, Inc.
-- *  (C) 1998 James Banks
-- *  (C) 1999-2001 Torben Mathiasen
-- *
-- *  This software may be used and distributed according to the terms
-- *  of the GNU General Public License, incorporated herein by reference.
-- *
-- ** This file is best viewed/edited with columns>=132.
-- *
-- ** Useful (if not required) reading:
-- *
-- *		Texas Instruments, ThunderLAN Programmer's Guide,
-- *			TI Literature Number SPWU013A
-- *			available in PDF format from www.ti.com
-- *		Level One, LXT901 and LXT970 Data Sheets
-- *			available in PDF format from www.level1.com
-- *		National Semiconductor, DP83840A Data Sheet
-- *			available in PDF format from www.national.com
-- *		Microchip Technology, 24C01A/02A/04A Data Sheet
-- *			available in PDF format from www.microchip.com
-- *
-- * Change History
-- *
-- *	Tigran Aivazian <tigran@sco.com>:	TLan_PciProbe() now uses
-- *						new PCI BIOS interface.
-- *	Alan Cox	<alan@redhat.com>:	Fixed the out of memory
-- *						handling.
-- *      
-- *	Torben Mathiasen <torben.mathiasen@compaq.com> New Maintainer!
-- *
-- *	v1.1 Dec 20, 1999    - Removed linux version checking
-- *			       Patch from Tigran Aivazian. 
-- *			     - v1.1 includes Alan's SMP updates.
-- *			     - We still have problems on SMP though,
-- *			       but I'm looking into that. 
-- *			
-- *	v1.2 Jan 02, 2000    - Hopefully fixed the SMP deadlock.
-- *			     - Removed dependency of HZ being 100.
-- *			     - We now allow higher priority timers to 
-- *			       overwrite timers like TLAN_TIMER_ACTIVITY
-- *			       Patch from John Cagle <john.cagle@compaq.com>.
-- *			     - Fixed a few compiler warnings.
-- *
-- *	v1.3 Feb 04, 2000    - Fixed the remaining HZ issues.
-- *			     - Removed call to pci_present(). 
-- *			     - Removed SA_INTERRUPT flag from irq handler.
-- *			     - Added __init and __initdata to reduce resisdent 
-- *			       code size.
-- *			     - Driver now uses module_init/module_exit.
-- *			     - Rewrote init_module and tlan_probe to
-- *			       share a lot more code. We now use tlan_probe
-- *			       with builtin and module driver.
-- *			     - Driver ported to new net API. 
-- *			     - tlan.txt has been reworked to reflect current 
-- *			       driver (almost)
-- *			     - Other minor stuff
-- *
-- *	v1.4 Feb 10, 2000    - Updated with more changes required after Dave's
-- *	                       network cleanup in 2.3.43pre7 (Tigran & myself)
-- *	                     - Minor stuff.
-- *
-- *	v1.5 March 22, 2000  - Fixed another timer bug that would hang the driver
-- *			       if no cable/link were present.
-- *			     - Cosmetic changes.
-- *			     - TODO: Port completely to new PCI/DMA API
-- *			     	     Auto-Neg fallback.
-- *
-- * 	v1.6 April 04, 2000  - Fixed driver support for kernel-parameters. Haven't
-- * 			       tested it though, as the kernel support is currently 
-- * 			       broken (2.3.99p4p3).
-- * 			     - Updated tlan.txt accordingly.
-- * 			     - Adjusted minimum/maximum frame length.
-- * 			     - There is now a TLAN website up at 
-- * 			       http://tlan.kernel.dk
-- *
-- * 	v1.7 April 07, 2000  - Started to implement custom ioctls. Driver now
-- * 			       reports PHY information when used with Donald
-- * 			       Beckers userspace MII diagnostics utility.
-- *
-- * 	v1.8 April 23, 2000  - Fixed support for forced speed/duplex settings.
-- * 			     - Added link information to Auto-Neg and forced
-- * 			       modes. When NIC operates with auto-neg the driver
-- * 			       will report Link speed & duplex modes as well as
-- * 			       link partner abilities. When forced link is used,
-- * 			       the driver will report status of the established
-- * 			       link.
-- * 			       Please read tlan.txt for additional information. 
-- * 			     - Removed call to check_region(), and used 
-- * 			       return value of request_region() instead.
-- *	
-- *	v1.8a May 28, 2000   - Minor updates.
-- *
-- *	v1.9 July 25, 2000   - Fixed a few remaining Full-Duplex issues.
-- *	                     - Updated with timer fixes from Andrew Morton.
-- *	                     - Fixed module race in TLan_Open.
-- *	                     - Added routine to monitor PHY status.
-- *	                     - Added activity led support for Proliant devices.
-- *
-- *	v1.10 Aug 30, 2000   - Added support for EISA based tlan controllers 
-- *			       like the Compaq NetFlex3/E. 
-- *			     - Rewrote tlan_probe to better handle multiple
-- *			       bus probes. Probing and device setup is now
-- *			       done through TLan_Probe and TLan_init_one. Actual
-- *			       hardware probe is done with kernel API and 
-- *			       TLan_EisaProbe.
-- *			     - Adjusted debug information for probing.
-- *			     - Fixed bug that would cause general debug information 
-- *			       to be printed after driver removal. 
-- *			     - Added transmit timeout handling.
-- *			     - Fixed OOM return values in tlan_probe. 
-- *			     - Fixed possible mem leak in tlan_exit 
-- *			       (now tlan_remove_one).
-- *			     - Fixed timer bug in TLan_phyMonitor.
-- *			     - This driver version is alpha quality, please
-- *			       send me any bug issues you may encounter.
-- *
-- *	v1.11 Aug 31, 2000   - Do not try to register irq 0 if no irq line was 
-- *			       set for EISA cards.
-- *			     - Added support for NetFlex3/E with nibble-rate
-- *			       10Base-T PHY. This is untestet as I haven't got
-- *			       one of these cards.
-- *			     - Fixed timer being added twice.
-- *			     - Disabled PhyMonitoring by default as this is
-- *			       work in progress. Define MONITOR to enable it.
-- *			     - Now we don't display link info with PHYs that
-- *			       doesn't support it (level1).
-- *			     - Incresed tx_timeout beacuse of auto-neg.
-- *			     - Adjusted timers for forced speeds.
-- *
-- *	v1.12 Oct 12, 2000   - Minor fixes (memleak, init, etc.)
-- *
-- * 	v1.13 Nov 28, 2000   - Stop flooding console with auto-neg issues
-- * 			       when link can't be established.
-- *			     - Added the bbuf option as a kernel parameter.
-- *			     - Fixed ioaddr probe bug.
-- *			     - Fixed stupid deadlock with MII interrupts.
-- *			     - Added support for speed/duplex selection with 
-- *			       multiple nics.
-- *			     - Added partly fix for TX Channel lockup with
-- *			       TLAN v1.0 silicon. This needs to be investigated
-- *			       further.
-- *
-- * 	v1.14 Dec 16, 2000   - Added support for servicing multiple frames per.
-- * 			       interrupt. Thanks goes to
-- * 			       Adam Keys <adam@ti.com>
-- * 			       Denis Beaudoin <dbeaudoin@ti.com>
-- * 			       for providing the patch.
-- * 			     - Fixed auto-neg output when using multiple
-- * 			       adapters.
-- * 			     - Converted to use new taskq interface.
-- *
-- * 	v1.14a Jan 6, 2001   - Minor adjustments (spinlocks, etc.)
-- *
-- *******************************************************************************/
--
--                                                                                
--#include <linux/module.h>
--
--#include "tlan.h"
--
--#include <linux/init.h>
--#include <linux/ioport.h>
--#include <linux/pci.h>
--#include <linux/etherdevice.h>
--#include <linux/delay.h>
--#include <linux/spinlock.h>
--#include <linux/mii.h>
--
--typedef u32 (TLanIntVectorFunc)( struct net_device *, u16 );
--
--/* For removing EISA devices */
--static	struct net_device	*TLan_Eisa_Devices;
--
--static	int		TLanDevicesInstalled;
--
--/* Set speed, duplex and aui settings */
--static  int aui[MAX_TLAN_BOARDS];
--static  int duplex[MAX_TLAN_BOARDS];
--static  int speed[MAX_TLAN_BOARDS];
--static  int boards_found;
--
--MODULE_AUTHOR("Maintainer: Torben Mathiasen <torben.mathiasen@compaq.com>");
--MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters");
--MODULE_LICENSE("GPL");
--
--MODULE_PARM(aui, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i");
--MODULE_PARM(duplex, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i");
--MODULE_PARM(speed, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i");
--MODULE_PARM(debug, "i");
--MODULE_PARM(bbuf, "i");
--MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)");
--MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)");
--MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)");
--MODULE_PARM_DESC(debug, "ThunderLAN debug mask");
--MODULE_PARM_DESC(bbuf, "ThunderLAN use big buffer (0-1)");
--EXPORT_NO_SYMBOLS;
--
--/* Define this to enable Link beat monitoring */
--#undef MONITOR
--
--/* Turn on debugging. See linux/Documentation/networking/tlan.txt for details */
--static  int		debug;
--
--static	int		bbuf;
--static	u8		*TLanPadBuffer;
--static	char		TLanSignature[] = "TLAN";
--static const char tlan_banner[] = "ThunderLAN driver v1.14a\n";
--static int tlan_have_pci;
--static int tlan_have_eisa;
--
--const char *media[] = {
--	"10BaseT-HD ", "10BaseT-FD ","100baseTx-HD ", 
--	"100baseTx-FD", "100baseT4", 0
--};
--
--int media_map[] = { 0x0020, 0x0040, 0x0080, 0x0100, 0x0200,};
--
--static struct board {
--	const char	*deviceLabel;
--	u32	   	flags;
--	u16	   	addrOfs;
--} board_info[] __devinitdata = {
--	{ "Compaq Netelligent 10 T PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
--	{ "Compaq Netelligent 10/100 TX PCI UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
--	{ "Compaq Integrated NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
--	{ "Compaq NetFlex-3/P", TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },
--	{ "Compaq NetFlex-3/P", TLAN_ADAPTER_NONE, 0x83 },
--	{ "Compaq Netelligent Integrated 10/100 TX UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
--	{ "Compaq Netelligent Dual 10/100 TX PCI UTP", TLAN_ADAPTER_NONE, 0x83 },
--	{ "Compaq Netelligent 10/100 TX Embedded UTP", TLAN_ADAPTER_NONE, 0x83 },
--	{ "Olicom OC-2183/2185", TLAN_ADAPTER_USE_INTERN_10, 0x83 },
--	{ "Olicom OC-2325", TLAN_ADAPTER_UNMANAGED_PHY, 0xF8 },
--	{ "Olicom OC-2326", TLAN_ADAPTER_USE_INTERN_10, 0xF8 },
--	{ "Compaq Netelligent 10/100 TX UTP", TLAN_ADAPTER_ACTIVITY_LED, 0x83 },
--	{ "Compaq Netelligent 10 T/2 PCI UTP/Coax", TLAN_ADAPTER_NONE, 0x83 },
--	{ "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED | 	/* EISA card */
--	                        TLAN_ADAPTER_UNMANAGED_PHY | TLAN_ADAPTER_BIT_RATE_PHY, 0x83 },	
--	{ "Compaq NetFlex-3/E", TLAN_ADAPTER_ACTIVITY_LED, 0x83 }, /* EISA card */
--};
--
--static struct pci_device_id tlan_pci_tbl[] __devinitdata = {
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL10,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3I,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_THUNDER,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETFLEX3B,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100PI,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100D,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_NETEL100I,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 7 },
--	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2183,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 8 },
--	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2325,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 9 },
--	{ PCI_VENDOR_ID_OLICOM, PCI_DEVICE_ID_OLICOM_OC2326,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 10 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 11 },
--	{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_NETELLIGENT_10_T2,
--		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 12 },
--	{ 0,}
--};
--MODULE_DEVICE_TABLE(pci, tlan_pci_tbl);		
--
--static void	TLan_EisaProbe( void );
--static void	TLan_Eisa_Cleanup( void );
--static int      TLan_Init( struct net_device * );
--static int	TLan_Open( struct net_device *dev );
--static int	TLan_StartTx( struct sk_buff *, struct net_device *);
--static void	TLan_HandleInterrupt( int, void *, struct pt_regs *);
--static int	TLan_Close( struct net_device *);
--static struct	net_device_stats *TLan_GetStats( struct net_device *);
--static void	TLan_SetMulticastList( struct net_device *);
--static int	TLan_ioctl( struct net_device *dev, struct ifreq *rq, int cmd);
--static int      TLan_probe1( struct pci_dev *pdev, long ioaddr, int irq, int rev, const struct pci_device_id *ent);
--static void	TLan_tx_timeout( struct net_device *dev);
--static int 	tlan_init_one( struct pci_dev *pdev, const struct pci_device_id *ent);
--
--static u32	TLan_HandleInvalid( struct net_device *, u16 );
--static u32	TLan_HandleTxEOF( struct net_device *, u16 );
--static u32	TLan_HandleStatOverflow( struct net_device *, u16 );
--static u32	TLan_HandleRxEOF( struct net_device *, u16 );
--static u32	TLan_HandleDummy( struct net_device *, u16 );
--static u32	TLan_HandleTxEOC( struct net_device *, u16 );
--static u32	TLan_HandleStatusCheck( struct net_device *, u16 );
--static u32	TLan_HandleRxEOC( struct net_device *, u16 );
--
--static void	TLan_Timer( unsigned long );
--
--static void	TLan_ResetLists( struct net_device * );
--static void	TLan_FreeLists( struct net_device * );
--static void	TLan_PrintDio( u16 );
--static void	TLan_PrintList( TLanList *, char *, int );
--static void	TLan_ReadAndClearStats( struct net_device *, int );
--static void	TLan_ResetAdapter( struct net_device * );
--static void	TLan_FinishReset( struct net_device * );
--static void	TLan_SetMac( struct net_device *, int areg, char *mac );
--
--static void	TLan_PhyPrint( struct net_device * );
--static void	TLan_PhyDetect( struct net_device * );
--static void	TLan_PhyPowerDown( struct net_device * );
--static void	TLan_PhyPowerUp( struct net_device * );
--static void	TLan_PhyReset( struct net_device * );
--static void	TLan_PhyStartLink( struct net_device * );
--static void	TLan_PhyFinishAutoNeg( struct net_device * );
--#ifdef MONITOR
--static void     TLan_PhyMonitor( struct net_device * );
--#endif
--
--/*
--static int	TLan_PhyNop( struct net_device * );
--static int	TLan_PhyInternalCheck( struct net_device * );
--static int	TLan_PhyInternalService( struct net_device * );
--static int	TLan_PhyDp83840aCheck( struct net_device * );
--*/
--
--static int	TLan_MiiReadReg( struct net_device *, u16, u16, u16 * );
--static void	TLan_MiiSendData( u16, u32, unsigned );
--static void	TLan_MiiSync( u16 );
--static void	TLan_MiiWriteReg( struct net_device *, u16, u16, u16 );
--
--static void	TLan_EeSendStart( u16 );
--static int	TLan_EeSendByte( u16, u8, int );
--static void	TLan_EeReceiveByte( u16, u8 *, int );
--static int	TLan_EeReadByte( struct net_device *, u8, u8 * );
--
--static TLanIntVectorFunc *TLanIntVector[TLAN_INT_NUMBER_OF_INTS] = {
--	TLan_HandleInvalid,
--	TLan_HandleTxEOF,
--	TLan_HandleStatOverflow,
--	TLan_HandleRxEOF,
--	TLan_HandleDummy,
--	TLan_HandleTxEOC,
--	TLan_HandleStatusCheck,
--	TLan_HandleRxEOC
--};
--
--static inline void
--TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
--{
--	TLanPrivateInfo *priv = dev->priv;
--	unsigned long flags = 0;
--	
--	if (!in_irq())
--		spin_lock_irqsave(&priv->lock, flags);
--	if ( priv->timer.function != NULL &&
--		priv->timerType != TLAN_TIMER_ACTIVITY ) { 
--		if (!in_irq())
--			spin_unlock_irqrestore(&priv->lock, flags);
--		return;
--	}
--	priv->timer.function = &TLan_Timer;
--	if (!in_irq())
--		spin_unlock_irqrestore(&priv->lock, flags);
--
--	priv->timer.data = (unsigned long) dev;
--	priv->timerSetAt = jiffies;
--	priv->timerType = type;
--	mod_timer(&priv->timer, jiffies + ticks);
--	
--} /* TLan_SetTimer */
--
--/*****************************************************************************
--******************************************************************************
--
--	ThunderLAN Driver Primary Functions
--
--	These functions are more or less common to all Linux network drivers.
--
--******************************************************************************
--*****************************************************************************/
--
--	/***************************************************************
--	 *	tlan_remove_one
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		None
--	 *
--	 *	Goes through the TLanDevices list and frees the device
--	 *	structs and memory associated with each device (lists
--	 *	and buffers).  It also ureserves the IO port regions
--	 *	associated with this device.
--	 *
--	 **************************************************************/
--
--static void __devexit tlan_remove_one( struct pci_dev *pdev)
--{
--	struct net_device *dev = pci_get_drvdata( pdev );
--	TLanPrivateInfo	*priv = dev->priv;
--	
--	unregister_netdev( dev );
--
--	if ( priv->dmaStorage ) {
--		kfree( priv->dmaStorage );
--	}
--
--	release_region( dev->base_addr, 0x10 );
--	
--	kfree( dev );
--		
--	pci_set_drvdata( pdev, NULL );
--} 
--
--static struct pci_driver tlan_driver = {
--	name:		"tlan",
--	id_table:	tlan_pci_tbl,
--	probe:		tlan_init_one,
--	remove:		tlan_remove_one,	
--};
--
--static int __init tlan_probe(void)
--{
--	static int	pad_allocated;
--	
--	printk(KERN_INFO "%s", tlan_banner);
--	
--	TLanPadBuffer = (u8 *) kmalloc(TLAN_MIN_FRAME_SIZE, 
--					GFP_KERNEL);
--
--	if (TLanPadBuffer == NULL) {
--		printk(KERN_ERR "TLAN: Could not allocate memory for pad buffer.\n");
--		return -ENOMEM;
--	}
--
--	memset(TLanPadBuffer, 0, TLAN_MIN_FRAME_SIZE);
--	pad_allocated = 1;
--
--	TLAN_DBG(TLAN_DEBUG_PROBE, "Starting PCI Probe....\n");
--	
--	/* Use new style PCI probing. Now the kernel will
--	   do most of this for us */
--	pci_register_driver(&tlan_driver);
--
--	TLAN_DBG(TLAN_DEBUG_PROBE, "Starting EISA Probe....\n");
--	TLan_EisaProbe();
--		
--	printk(KERN_INFO "TLAN: %d device%s installed, PCI: %d  EISA: %d\n", 
--		 TLanDevicesInstalled, TLanDevicesInstalled == 1 ? "" : "s",
--		 tlan_have_pci, tlan_have_eisa);
--
--	if (TLanDevicesInstalled == 0) {
--		pci_unregister_driver(&tlan_driver);
--		kfree(TLanPadBuffer);
--		return -ENODEV;
--	}
--	return 0;
--}
--	
--
--static int __devinit tlan_init_one( struct pci_dev *pdev,
--				    const struct pci_device_id *ent)
--{
--	return TLan_probe1( pdev, -1, -1, 0, ent);
--}
--
--/*
--	***************************************************************
--	 *	tlan_probe1
--	 *
--	 *	Returns:
--	 *		0 on success, error code on error
--	 *	Parms: 
--	 *		none
--	 *
--	 *	The name is lower case to fit in with all the rest of
--	 *	the netcard_probe names.  This function looks for 
--	 *	another TLan based adapter, setting it up with the
--	 *	allocated device struct if one is found.
--	 *	tlan_probe has been ported to the new net API and
--	 *	now allocates its own device structure. This function
--	 *	is also used by modules.
--	 *
--	 **************************************************************/
--
--static int __devinit TLan_probe1(struct pci_dev *pdev, 
--				long ioaddr, int irq, int rev, const struct pci_device_id *ent )
--{
--
--	struct net_device  *dev;
--	TLanPrivateInfo    *priv;
--	u8		   pci_rev;
--	u16		   device_id;
--	int		   reg;
--
--	if (pdev && pci_enable_device(pdev))
--		return -EIO;
--
--	dev = init_etherdev(NULL, sizeof(TLanPrivateInfo));
--	if (dev == NULL) {
--		printk(KERN_ERR "TLAN: Could not allocate memory for device.\n");
--		return -ENOMEM;
--	}
--	SET_MODULE_OWNER(dev);
--	
--	priv = dev->priv;
--
--	/* Is this a PCI device? */
--	if (pdev) {
--		u32 		   pci_io_base = 0;
--
--		priv->adapter = &board_info[ent->driver_data];
--
--		pci_read_config_byte ( pdev, PCI_REVISION_ID, &pci_rev);
--
--		for ( reg= 0; reg <= 5; reg ++ ) {
--			if (pci_resource_flags(pdev, reg) & IORESOURCE_IO) {
--				pci_io_base = pci_resource_start(pdev, reg);
--				TLAN_DBG( TLAN_DEBUG_GNRL, "IO mapping is available at %x.\n",
--						pci_io_base);
--				break;
--			}
--		}
--		if (!pci_io_base) {
--			printk(KERN_ERR "TLAN: No IO mappings available\n");
--			unregister_netdev(dev);
--			kfree(dev);
--			return -ENODEV;
--		}
--		
--		dev->base_addr = pci_io_base;
--		dev->irq = pdev->irq;
--		priv->adapterRev = pci_rev; 
--		pci_set_master(pdev);
--		pci_set_drvdata(pdev, dev);
--
--	} else	{     /* EISA card */
--		/* This is a hack. We need to know which board structure
--		 * is suited for this adapter */
--		device_id = inw(ioaddr + EISA_ID2);
--		priv->is_eisa = 1;
--		if (device_id == 0x20F1) {
--			priv->adapter = &board_info[13]; 	/* NetFlex-3/E */
--			priv->adapterRev = 23;			/* TLAN 2.3 */
--		} else {
--			priv->adapter = &board_info[14];
--			priv->adapterRev = 10;			/* TLAN 1.0 */
--		}
--		dev->base_addr = ioaddr;
--		dev->irq = irq;
--	}
--
--	/* Kernel parameters */
--	if (dev->mem_start) {
--		priv->aui    = dev->mem_start & 0x01;
--		priv->duplex = ((dev->mem_start & 0x06) == 0x06) ? 0 : (dev->mem_start & 0x06) >> 1;
--		priv->speed  = ((dev->mem_start & 0x18) == 0x18) ? 0 : (dev->mem_start & 0x18) >> 3;
--	
--		if (priv->speed == 0x1) {
--			priv->speed = TLAN_SPEED_10;
--		} else if (priv->speed == 0x2) {
--			priv->speed = TLAN_SPEED_100;
--		}
--		debug = priv->debug = dev->mem_end;
--	} else {
--		priv->aui    = aui[boards_found];
--		priv->speed  = speed[boards_found];
--		priv->duplex = duplex[boards_found];
--		priv->debug = debug;
--	}
--	
--	/* This will be used when we get an adapter error from
--	 * within our irq handler */
--	INIT_LIST_HEAD(&priv->tlan_tqueue.list);
--	priv->tlan_tqueue.sync = 0;
--	priv->tlan_tqueue.routine = (void *)(void*)TLan_tx_timeout;
--	priv->tlan_tqueue.data = dev;
--
--	spin_lock_init(&priv->lock);
--	
--	if (TLan_Init(dev)) {
--		printk(KERN_ERR "TLAN: Could not register device.\n");
--		unregister_netdev(dev);
--		kfree(dev);
--		return -EAGAIN;
--	} else {
--	
--	TLanDevicesInstalled++;
--	boards_found++;
--	
--	/* pdev is NULL if this is an EISA device */
--	if (pdev)
--		tlan_have_pci++;
--	else {
--		priv->nextDevice = TLan_Eisa_Devices;
--		TLan_Eisa_Devices = dev;
--		tlan_have_eisa++;
--	}
--	
--	printk(KERN_INFO "TLAN: %s irq=%2d, io=%04x, %s, Rev. %d\n",
--			dev->name,
--			(int) dev->irq,
--			(int) dev->base_addr,
--			priv->adapter->deviceLabel,
--			priv->adapterRev);
--	return 0;
--	}
--
--}
-+}	/* TLan_FinishReset */
- 
--static void TLan_Eisa_Cleanup(void)
--{
--	struct net_device *dev;
--	TLanPrivateInfo *priv;
--	
--	while( tlan_have_eisa ) {
--		dev = TLan_Eisa_Devices;
--		priv = dev->priv;
--		if (priv->dmaStorage) {
--			kfree(priv->dmaStorage);
--		}
--		release_region( dev->base_addr, 0x10);
--		unregister_netdev( dev );
--		TLan_Eisa_Devices = priv->nextDevice;
--		kfree( dev );
--		tlan_have_eisa--;
--	}
--}
--	
--		
--static void __exit tlan_exit(void)
--{
--	pci_unregister_driver(&tlan_driver);
--
--	if (tlan_have_eisa)
--		TLan_Eisa_Cleanup();
--
--	kfree( TLanPadBuffer );
--
--}
--
--/* Module loading/unloading */
--module_init(tlan_probe);
--module_exit(tlan_exit);
--
--	/**************************************************************
--	 * 	TLan_EisaProbe
--	 *
--	 *  	Returns: 0 on success, 1 otherwise
--	 *
--	 *  	Parms:	 None
--	 *
--	 *
--	 *  	This functions probes for EISA devices and calls 
--	 *  	TLan_probe1 when one is found. 
--	 *
--	 *************************************************************/
--
--static void  __init TLan_EisaProbe (void) 
-+/**************************************************************************
-+POLL - Wait for a frame
-+***************************************************************************/
-+static int tlan_poll(struct nic *nic, int retrieve)
- {
--	long 	ioaddr;
--	int 	rc = -ENODEV;
--	int 	irq;
--	u16	device_id;
--
--	if (!EISA_bus) {	
--		TLAN_DBG(TLAN_DEBUG_PROBE, "No EISA bus present\n");
--		return;
--	}
--	
--	/* Loop through all slots of the EISA bus */
--	for (ioaddr = 0x1000; ioaddr < 0x9000; ioaddr += 0x1000) {
--		
--	TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n", (int) ioaddr + 0xC80, inw(ioaddr + EISA_ID));	
--	TLAN_DBG(TLAN_DEBUG_PROBE,"EISA_ID 0x%4x: 0x%4x\n", (int) ioaddr + 0xC82, inw(ioaddr + EISA_ID2));
-+	/* return true if there's an ethernet packet ready to read */
-+	/* nic->packet should contain data on return */
-+	/* nic->packetlen should contain length of data */
-+	u32 framesize;
-+	u32 host_cmd = 0;
-+	u32 ack = 1;
-+	int eoc = 0;
-+	int entry = priv->cur_rx % TLAN_NUM_RX_LISTS;
-+	u16 tmpCStat = le32_to_cpu(rx_ring[entry].cStat);
-+	u16 host_int = inw(BASE + TLAN_HOST_INT);
- 
--		TLAN_DBG(TLAN_DEBUG_PROBE, "Probing for EISA adapter at IO: 0x%4x : ",
--				   	(int) ioaddr);
--		if (request_region(ioaddr, 0x10, TLanSignature) == NULL) 
--			goto out;
--
--		if (inw(ioaddr + EISA_ID) != 0x110E) {		
--			release_region(ioaddr, 0x10);
--			goto out;
--		}
--		
--		device_id = inw(ioaddr + EISA_ID2);
--		if (device_id !=  0x20F1 && device_id != 0x40F1) { 		
--			release_region (ioaddr, 0x10);
--			goto out;
--		}
--		
--	 	if (inb(ioaddr + EISA_CR) != 0x1) { 	/* Check if adapter is enabled */
--			release_region (ioaddr, 0x10);
--			goto out2;
--		}
--		
--		if (debug == 0x10)		
--			printk("Found one\n");
-+	if ((tmpCStat & TLAN_CSTAT_FRM_CMP) && !retrieve)
-+	  return 1;
- 
--		/* Get irq from board */
--		switch (inb(ioaddr + 0xCC0)) {
--			case(0x10):
--				irq=5;
--				break;
--			case(0x20):
--				irq=9;
--				break;
--			case(0x40):
--				irq=10;
--				break;
--			case(0x80):
--				irq=11;
--				break;
--			default:
--				goto out;
--		}               
--		
--		
--		/* Setup the newly found eisa adapter */
--		rc = TLan_probe1( NULL, ioaddr, irq,
--					12, NULL);
--		continue;
--		
--		out:
--			if (debug == 0x10)
--				printk("None found\n");
--			continue;
--
--		out2:	if (debug == 0x10)
--				printk("Card found but it is not enabled, skipping\n");
--			continue;
--		
--	}
-+	outw(host_int, BASE + TLAN_HOST_INT);
- 
--} /* TLan_EisaProbe */
-+	if (!(tmpCStat & TLAN_CSTAT_FRM_CMP))
-+		return 0;
- 
--	
-+	/* printf("PI-1: 0x%hX\n", host_int); */
-+	if (tmpCStat & TLAN_CSTAT_EOC)
-+		eoc = 1;
- 
--	/***************************************************************
--	 *	TLan_Init
--	 *
--	 *	Returns:
--	 *		0 on success, error code otherwise.
--	 *	Parms:
--	 *		dev	The structure of the device to be
--	 *			init'ed.
--	 *
--	 *	This function completes the initialization of the
--	 *	device structure and driver.  It reserves the IO
--	 *	addresses, allocates memory for the lists and bounce
--	 *	buffers, retrieves the MAC address from the eeprom
--	 *	and assignes the device's methods.
--	 *	
--	 **************************************************************/
-+	framesize = rx_ring[entry].frameSize;
- 
--static int TLan_Init( struct net_device *dev )
--{
--	int		dma_size;
--	int 		err;
--	int		i;
--	TLanPrivateInfo	*priv;
-+	nic->packetlen = framesize;
- 
--	priv = dev->priv;
--	
--	if (!priv->is_eisa)	/* EISA devices have already requested IO */
--		if (!request_region( dev->base_addr, 0x10, TLanSignature )) {
--			printk(KERN_ERR "TLAN: %s: IO port region 0x%lx size 0x%x in use.\n",
--				dev->name,
--				dev->base_addr,
--				0x10 );
--			return -EIO;
-+#ifdef EBDEBUG
-+     printf(".%d.", framesize); 
-+#endif
-+     
-+	memcpy(nic->packet, rxb +
-+	       (priv->cur_rx * TLAN_MAX_FRAME_SIZE), nic->packetlen);
-+
-+	rx_ring[entry].cStat = 0;
-+#ifdef EBDEBUG
-+	//hex_dump(nic->packet, nic->packetlen);
-+	printf("%d", entry);  
-+#endif
-+	entry = (entry + 1) % TLAN_NUM_RX_LISTS;
-+	priv->cur_rx = entry;
-+	if (eoc) {
-+		if ((rx_ring[entry].cStat & TLAN_CSTAT_READY) ==
-+		    TLAN_CSTAT_READY) {
-+			ack |= TLAN_HC_GO | TLAN_HC_RT;
-+			host_cmd = TLAN_HC_ACK | ack | 0x001C0000;
-+			outl(host_cmd, BASE + TLAN_HOST_CMD);
- 		}
--	
--	if ( bbuf ) {
--		dma_size = ( TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS )
--	           * ( sizeof(TLanList) + TLAN_MAX_FRAME_SIZE );
- 	} else {
--		dma_size = ( TLAN_NUM_RX_LISTS + TLAN_NUM_TX_LISTS )
--	           * ( sizeof(TLanList) );
--	}
--	priv->dmaStorage = kmalloc(dma_size, GFP_KERNEL | GFP_DMA);
--	if ( priv->dmaStorage == NULL ) {
--		printk(KERN_ERR "TLAN:  Could not allocate lists and buffers for %s.\n",
--			dev->name );
--		release_region( dev->base_addr, 0x10 );
--		return -ENOMEM;
--	}
--	memset( priv->dmaStorage, 0, dma_size );
--	priv->rxList = (TLanList *) 
--		       ( ( ( (u32) priv->dmaStorage ) + 7 ) & 0xFFFFFFF8 );
--	priv->txList = priv->rxList + TLAN_NUM_RX_LISTS;
--	if ( bbuf ) {
--		priv->rxBuffer = (u8 *) ( priv->txList + TLAN_NUM_TX_LISTS );
--		priv->txBuffer = priv->rxBuffer
--				 + ( TLAN_NUM_RX_LISTS * TLAN_MAX_FRAME_SIZE );
--	}
--
--	err = 0;
--	for ( i = 0;  i < 6 ; i++ )
--		err |= TLan_EeReadByte( dev,
--					(u8) priv->adapter->addrOfs + i,
--					(u8 *) &dev->dev_addr[i] );
--	if ( err ) {
--		printk(KERN_ERR "TLAN: %s: Error reading MAC from eeprom: %d\n",
--			dev->name,
--			err );
--	}
--	dev->addr_len = 6;
--	
--	/* Device methods */
--	dev->open = &TLan_Open;
--	dev->hard_start_xmit = &TLan_StartTx;
--	dev->stop = &TLan_Close;
--	dev->get_stats = &TLan_GetStats;
--	dev->set_multicast_list = &TLan_SetMulticastList;
--	dev->do_ioctl = &TLan_ioctl;
--	dev->tx_timeout = &TLan_tx_timeout;
--	dev->watchdog_timeo = TX_TIMEOUT;
--
--	return 0;
--
--} /* TLan_Init */
--
--	/***************************************************************
--	 *	TLan_Open
--	 *
--	 *	Returns:
--	 *		0 on success, error code otherwise.
--	 *	Parms:
--	 *		dev	Structure of device to be opened.
--	 *
--	 *	This routine puts the driver and TLAN adapter in a
--	 *	state where it is ready to send and receive packets.
--	 *	It allocates the IRQ, resets and brings the adapter
--	 *	out of reset, and allows interrupts.  It also delays
--	 *	the startup for autonegotiation or sends a Rx GO
--	 *	command to the adapter, as appropriate.
--	 *
--	 **************************************************************/
--
--static int TLan_Open( struct net_device *dev )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	int		err;
--	
--	priv->tlanRev = TLan_DioRead8( dev->base_addr, TLAN_DEF_REVISION );
--	err = request_irq( dev->irq, TLan_HandleInterrupt, SA_SHIRQ, TLanSignature, dev );
--	
--	if ( err ) {
--		printk(KERN_ERR "TLAN:  Cannot open %s because IRQ %d is already in use.\n", dev->name, dev->irq );
--		return err;
-+		host_cmd = TLAN_HC_ACK | ack | (0x000C0000);
-+		outl(host_cmd, BASE + TLAN_HOST_CMD);
-+#ifdef EBDEBUG
-+		printf("AC: 0x%hX\n", inw(BASE + TLAN_CH_PARM)); 
-+		host_int = inw(BASE + TLAN_HOST_INT);
-+		printf("PI-2: 0x%hX\n", host_int); 
-+#endif
- 	}
--	
--	init_timer(&priv->timer);
--	netif_start_queue(dev);
--	
--	/* NOTE: It might not be necessary to read the stats before a
--			 reset if you don't care what the values are.
--	*/
--	TLan_ResetLists( dev );
--	TLan_ReadAndClearStats( dev, TLAN_IGNORE );
--	TLan_ResetAdapter( dev );
--
--	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Opened.  TLAN Chip Rev: %x\n", dev->name, priv->tlanRev );
--
--	return 0;
--
--} /* TLan_Open */
--
--	/**************************************************************
--	 *	TLan_ioctl
--	 *	
--	 *	Returns:
--	 *		0 on success, error code otherwise
--	 *	Params:
--	 *		dev	structure of device to receive ioctl.
--	 *		
--	 *		rq	ifreq structure to hold userspace data.
--	 *
--	 *		cmd	ioctl command.
--	 *
--	 *
--	 *************************************************************/
-+	refill_rx(nic);
-+	return (1);		/* initially as this is called to flush the input */
-+}
- 
--static int TLan_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-+static void refill_rx(struct nic *nic __unused)
- {
--	TLanPrivateInfo *priv = dev->priv;
--	struct mii_ioctl_data *data = (struct mii_ioctl_data *)&rq->ifr_data;
--	u32 phy   = priv->phy[priv->phyNum];
--	
--	if (!priv->phyOnline)
--		return -EAGAIN;
--
--	switch(cmd) {
--	case SIOCGMIIPHY:		/* Get address of MII PHY in use. */
--	case SIOCDEVPRIVATE:		/* for binary compat, remove in 2.5 */
--			data->phy_id = phy;
--
--	case SIOCGMIIREG:		/* Read MII PHY register. */
--	case SIOCDEVPRIVATE+1:		/* for binary compat, remove in 2.5 */
--			TLan_MiiReadReg(dev, data->phy_id & 0x1f, data->reg_num & 0x1f, &data->val_out);
--			return 0;
--		
-+	int entry = 0;
- 
--	case SIOCSMIIREG:		/* Write MII PHY register. */
--	case SIOCDEVPRIVATE+2:		/* for binary compat, remove in 2.5 */
--			if (!capable(CAP_NET_ADMIN))
--				return -EPERM;
--			TLan_MiiWriteReg(dev, data->phy_id & 0x1f, data->reg_num & 0x1f, data->val_in);
--			return 0;
--		default:
--			return -EOPNOTSUPP;
-+	for (;
-+	     (priv->cur_rx - priv->dirty_rx +
-+	      TLAN_NUM_RX_LISTS) % TLAN_NUM_RX_LISTS > 0;
-+	     priv->dirty_rx = (priv->dirty_rx + 1) % TLAN_NUM_RX_LISTS) {
-+		entry = priv->dirty_rx % TLAN_NUM_TX_LISTS;
-+		rx_ring[entry].frameSize = TLAN_MAX_FRAME_SIZE;
-+		rx_ring[entry].cStat = TLAN_CSTAT_READY;
- 	}
--} /* tlan_ioctl */
--
--	/***************************************************************
--	 * 	TLan_tx_timeout
--	 *
--	 * 	Returns: nothing
--	 *
--	 * 	Params:
--	 * 		dev	structure of device which timed out 
--	 * 			during transmit.
--	 *
--	 **************************************************************/
--
--static void TLan_tx_timeout(struct net_device *dev)
--{
--	
--	TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Transmit timed out.\n", dev->name);
--	
--	/* Ok so we timed out, lets see what we can do about it...*/
--	TLan_FreeLists( dev );
--	TLan_ResetLists( dev );		
--	TLan_ReadAndClearStats( dev, TLAN_IGNORE );
--	TLan_ResetAdapter( dev );
--	dev->trans_start = jiffies;
--	netif_wake_queue( dev );	
- 
- }
--	
- 
--	/***************************************************************
--	 *	TLan_StartTx
--	 *  
--	 *	Returns:
--	 *		0 on success, non-zero on failure.
--	 *	Parms:
--	 *		skb	A pointer to the sk_buff containing the
--	 *			frame to be sent.
--	 *		dev	The device to send the data on.
--	 *
--	 *	This function adds a frame to the Tx list to be sent
--	 *	ASAP.  First it	verifies that the adapter is ready and
--	 *	there is room in the queue.  Then it sets up the next
--	 *	available list, copies the frame to the	corresponding
--	 *	buffer.  If the adapter Tx channel is idle, it gives
--	 *	the adapter a Tx Go command on the list, otherwise it
--	 *	sets the forward address of the previous list to point
--	 *	to this one.  Then it frees the sk_buff.
--	 *
--	 **************************************************************/
-+/* #define EBDEBUG */
-+/**************************************************************************
-+TRANSMIT - Transmit a frame
-+***************************************************************************/
-+static void tlan_transmit(struct nic *nic, const char *d,	/* Destination */
-+			  unsigned int t,	/* Type */
-+			  unsigned int s,	/* size */
-+			  const char *p)
-+{				/* Packet */
-+	u16 nstype;
-+	u32 to;
-+	struct TLanList *tail_list;
-+	struct TLanList *head_list;
-+	u8 *tail_buffer;
-+	u32 ack = 0;
-+	u32 host_cmd;
-+	int eoc = 0;
-+	u16 tmpCStat;
-+#ifdef EBDEBUG
-+	u16 host_int = inw(BASE + TLAN_HOST_INT);
-+#endif
-+	int entry = 0;
- 
--static int TLan_StartTx( struct sk_buff *skb, struct net_device *dev )
--{
--	TLanPrivateInfo *priv = dev->priv;
--	TLanList	*tail_list;
--	u8		*tail_buffer;
--	int		pad;
--	unsigned long	flags;
--
--	if ( ! priv->phyOnline ) {
--		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n", dev->name );
--		dev_kfree_skb_any(skb);
--		return 0;
-+#ifdef EBDEBUG
-+	printf("INT0-0x%hX\n", host_int);
-+#endif
-+
-+	if (!priv->phyOnline) {
-+		printf("TRANSMIT:  %s PHY is not ready\n", priv->nic_name);
-+		return;
- 	}
- 
- 	tail_list = priv->txList + priv->txTail;
--	
--	if ( tail_list->cStat != TLAN_CSTAT_UNUSED ) {
--		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s is busy (Head=%d Tail=%d)\n", dev->name, priv->txHead, priv->txTail );
--		netif_stop_queue(dev);
-+
-+	if (tail_list->cStat != TLAN_CSTAT_UNUSED) {
-+		printf("TRANSMIT: %s is busy (Head=%d Tail=%d)\n",
-+		       priv->nic_name, priv->txList, priv->txTail);
-+		tx_ring[entry].cStat = TLAN_CSTAT_UNUSED;
- 		priv->txBusyCount++;
--		return 1;
-+		return;
- 	}
- 
- 	tail_list->forward = 0;
- 
--	if ( bbuf ) {
--		tail_buffer = priv->txBuffer + ( priv->txTail * TLAN_MAX_FRAME_SIZE );
--		memcpy( tail_buffer, skb->data, skb->len );
--	} else {
--		tail_list->buffer[0].address = virt_to_bus( skb->data );
--		tail_list->buffer[9].address = (u32) skb;
--	}
-+	tail_buffer = txb + (priv->txTail * TLAN_MAX_FRAME_SIZE);
- 
--	pad = TLAN_MIN_FRAME_SIZE - skb->len;
--
--	if ( pad > 0 ) {
--		tail_list->frameSize = (u16) skb->len + pad;
--		tail_list->buffer[0].count = (u32) skb->len;
--		tail_list->buffer[1].count = TLAN_LAST_BUFFER | (u32) pad;
--		tail_list->buffer[1].address = virt_to_bus( TLanPadBuffer );
--	} else {
--		tail_list->frameSize = (u16) skb->len;
--		tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) skb->len;
--		tail_list->buffer[1].count = 0;
--		tail_list->buffer[1].address = 0;
--	}
-+	/* send the packet to destination */
-+	memcpy(tail_buffer, d, ETH_ALEN);
-+	memcpy(tail_buffer + ETH_ALEN, nic->node_addr, ETH_ALEN);
-+	nstype = htons((u16) t);
-+	memcpy(tail_buffer + 2 * ETH_ALEN, (u8 *) & nstype, 2);
-+	memcpy(tail_buffer + ETH_HLEN, p, s);
-+
-+	s += ETH_HLEN;
-+	s &= 0x0FFF;
-+	while (s < ETH_ZLEN)
-+		tail_buffer[s++] = '\0';
-+
-+	/*=====================================================*/
-+	/* Receive
-+	 * 0000 0000 0001 1100
-+	 * 0000 0000 0000 1100
-+	 * 0000 0000 0000 0011 = 0x0003
-+	 *
-+	 * 0000 0000 0000 0000 0000 0000 0000 0011
-+	 * 0000 0000 0000 1100 0000 0000 0000 0000 = 0x000C0000
-+	 *
-+	 * Transmit
-+	 * 0000 0000 0001 1100
-+	 * 0000 0000 0000 0100
-+	 * 0000 0000 0000 0001 = 0x0001
-+	 *
-+	 * 0000 0000 0000 0000 0000 0000 0000 0001
-+	 * 0000 0000 0000 0100 0000 0000 0000 0000 = 0x00040000
-+	 * */
-+
-+	/* Setup the transmit descriptor */
-+	tail_list->frameSize = (u16) s;
-+	tail_list->buffer[0].count = TLAN_LAST_BUFFER | (u32) s;
-+	tail_list->buffer[1].count = 0;
-+	tail_list->buffer[1].address = 0;
- 
--	spin_lock_irqsave(&priv->lock, flags);
- 	tail_list->cStat = TLAN_CSTAT_READY;
--	if ( ! priv->txInProgress ) {
-+
-+#ifdef EBDEBUG
-+	host_int = inw(BASE + TLAN_HOST_INT);
-+	printf("INT1-0x%hX\n", host_int);
-+#endif
-+
-+	if (!priv->txInProgress) {
- 		priv->txInProgress = 1;
--		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Starting TX on buffer %d\n", priv->txTail );
--		outl( virt_to_bus( tail_list ), dev->base_addr + TLAN_CH_PARM );
--		outl( TLAN_HC_GO, dev->base_addr + TLAN_HOST_CMD );
-+		outl(virt_to_le32desc(tail_list), BASE + TLAN_CH_PARM);
-+		outl(TLAN_HC_GO, BASE + TLAN_HOST_CMD);
- 	} else {
--		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Adding buffer %d to TX channel\n", priv->txTail );
--		if ( priv->txTail == 0 ) {
--			( priv->txList + ( TLAN_NUM_TX_LISTS - 1 ) )->forward = virt_to_bus( tail_list );
-+		if (priv->txTail == 0) {
-+#ifdef EBDEBUG
-+			printf("Out buffer\n");
-+#endif
-+			(priv->txList + (TLAN_NUM_TX_LISTS - 1))->forward =
-+			    virt_to_le32desc(tail_list);
- 		} else {
--			( priv->txList + ( priv->txTail - 1 ) )->forward = virt_to_bus( tail_list );
-+#ifdef EBDEBUG
-+			printf("Fix this \n");
-+#endif
-+			(priv->txList + (priv->txTail - 1))->forward =
-+			    virt_to_le32desc(tail_list);
- 		}
- 	}
--	spin_unlock_irqrestore(&priv->lock, flags);
--
--	CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS );
--
--	if ( bbuf )
--		dev_kfree_skb_any(skb);
--		
--	dev->trans_start = jiffies;
--	return 0;
--
--} /* TLan_StartTx */
--
--	/***************************************************************
--	 *	TLan_HandleInterrupt
--	 *  
--	 *	Returns:	
--	 *		Nothing
--	 *	Parms:
--	 *		irq	The line on which the interrupt
--	 *			occurred.
--	 *		dev_id	A pointer to the device assigned to
--	 *			this irq line.
--	 *		regs	???
--	 *
--	 *	This function handles an interrupt generated by its
--	 *	assigned TLAN adapter.  The function deactivates
--	 *	interrupts on its adapter, records the type of
--	 *	interrupt, executes the appropriate subhandler, and
--	 *	acknowdges the interrupt to the adapter (thus
--	 *	re-enabling adapter interrupts.
--	 *
--	 **************************************************************/
--
--static void TLan_HandleInterrupt(int irq, void *dev_id, struct pt_regs *regs)
--{
--	u32		ack;
--	struct net_device	*dev;
--	u32		host_cmd;
--	u16		host_int;
--	int		type;
--	TLanPrivateInfo *priv;
--
--	dev = dev_id;
--	priv = dev->priv;
--
--	spin_lock(&priv->lock);
--
--	host_int = inw( dev->base_addr + TLAN_HOST_INT );
--	outw( host_int, dev->base_addr + TLAN_HOST_INT );
-+	
-+	CIRC_INC(priv->txTail, TLAN_NUM_TX_LISTS);
- 
--	type = ( host_int & TLAN_HI_IT_MASK ) >> 2;
-+#ifdef EBDEBUG
-+	host_int = inw(BASE + TLAN_HOST_INT);
-+	printf("INT2-0x%hX\n", host_int);
-+#endif
- 
--	ack = TLanIntVector[type]( dev, host_int );
-+	to = currticks() + TX_TIME_OUT;
-+	while ((tail_list->cStat == TLAN_CSTAT_READY) && currticks() < to);
- 
--	if ( ack ) {
--		host_cmd = TLAN_HC_ACK | ack | ( type << 18 );
--		outl( host_cmd, dev->base_addr + TLAN_HOST_CMD );
-+	head_list = priv->txList + priv->txHead;
-+	while (((tmpCStat = head_list->cStat) & TLAN_CSTAT_FRM_CMP) 
-+			&& (ack < 255)) {
-+		ack++;
-+		if(tmpCStat & TLAN_CSTAT_EOC)
-+			eoc =1;
-+		head_list->cStat = TLAN_CSTAT_UNUSED;
-+		CIRC_INC(priv->txHead, TLAN_NUM_TX_LISTS);
-+		head_list = priv->txList + priv->txHead;
-+		
- 	}
-+	if(!ack)
-+		printf("Incomplete TX Frame\n");
- 
--	spin_unlock(&priv->lock);
--
--} /* TLan_HandleInterrupts */
--
--	/***************************************************************
--	 *	TLan_Close
--	 *  
--	 * 	Returns:
--	 *		An error code.
--	 *	Parms:
--	 *		dev	The device structure of the device to
--	 *			close.
--	 *
--	 *	This function shuts down the adapter.  It records any
--	 *	stats, puts the adapter into reset state, deactivates
--	 *	its time as needed, and	frees the irq it is using.
--	 *
--	 **************************************************************/
--
--static int TLan_Close(struct net_device *dev)
--{
--	TLanPrivateInfo *priv = dev->priv;
--
--	netif_stop_queue(dev);
--	priv->neg_be_verbose = 0;
--
--	TLan_ReadAndClearStats( dev, TLAN_RECORD );
--	outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
--	if ( priv->timer.function != NULL ) {
--		del_timer_sync( &priv->timer );
--		priv->timer.function = NULL;
-+	if(eoc) {
-+		head_list = priv->txList + priv->txHead;
-+		if ((head_list->cStat & TLAN_CSTAT_READY) == TLAN_CSTAT_READY) {
-+			outl(virt_to_le32desc(head_list), BASE + TLAN_CH_PARM);
-+			ack |= TLAN_HC_GO;
-+		} else {
-+			priv->txInProgress = 0;
-+		}
- 	}
--	
--	free_irq( dev->irq, dev );
--	TLan_FreeLists( dev );
--	TLAN_DBG( TLAN_DEBUG_GNRL, "Device %s closed.\n", dev->name );
--
--	return 0;
--
--} /* TLan_Close */
--
--	/***************************************************************
--	 *	TLan_GetStats
--	 *  
--	 *	Returns:
--	 *		A pointer to the device's statistics structure.
--	 *	Parms:
--	 *		dev	The device structure to return the
--	 *			stats for.
--	 *
--	 *	This function updates the devices statistics by reading
--	 *	the TLAN chip's onboard registers.  Then it returns the
--	 *	address of the statistics structure.
--	 *
--	 **************************************************************/
--
--static struct net_device_stats *TLan_GetStats( struct net_device *dev )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	int i;
--
--	/* Should only read stats if open ? */
--	TLan_ReadAndClearStats( dev, TLAN_RECORD );
--
--	TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  %s EOC count = %d\n", dev->name, priv->rxEocCount );
--	TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s Busy count = %d\n", dev->name, priv->txBusyCount );
--	if ( debug & TLAN_DEBUG_GNRL ) {
--		TLan_PrintDio( dev->base_addr );
--		TLan_PhyPrint( dev );		
--	}
--	if ( debug & TLAN_DEBUG_LIST ) {
--		for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ )
--			TLan_PrintList( priv->rxList + i, "RX", i );
--		for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ )
--			TLan_PrintList( priv->txList + i, "TX", i );
-+	if(ack) {
-+		host_cmd = TLAN_HC_ACK | ack;
-+		outl(host_cmd, BASE + TLAN_HOST_CMD);
- 	}
- 	
--	return ( &( (TLanPrivateInfo *) dev->priv )->stats );
--
--} /* TLan_GetStats */
--
--	/***************************************************************
--	 *	TLan_SetMulticastList
--	 *  
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		dev	The device structure to set the
--	 *			multicast list for.
--	 *
--	 *	This function sets the TLAN adaptor to various receive
--	 *	modes.  If the IFF_PROMISC flag is set, promiscuous
--	 *	mode is acitviated.  Otherwise,	promiscuous mode is
--	 *	turned off.  If the IFF_ALLMULTI flag is set, then
--	 *	the hash table is set to receive all group addresses.
--	 *	Otherwise, the first three multicast addresses are
--	 *	stored in AREG_1-3, and the rest are selected via the
--	 *	hash table, as necessary.
--	 *
--	 **************************************************************/
--
--static void TLan_SetMulticastList( struct net_device *dev )
--{	
--	struct dev_mc_list	*dmi = dev->mc_list;
--	u32			hash1 = 0;
--	u32			hash2 = 0;
--	int			i;
--	u32			offset;
--	u8			tmp;
--
--	if ( dev->flags & IFF_PROMISC ) {
--		tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
--		TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, tmp | TLAN_NET_CMD_CAF );
--	} else {
--		tmp = TLan_DioRead8( dev->base_addr, TLAN_NET_CMD );
--		TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF );
--		if ( dev->flags & IFF_ALLMULTI ) {
--			for ( i = 0; i < 3; i++ ) 
--				TLan_SetMac( dev, i + 1, NULL );
--			TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, 0xFFFFFFFF );
--			TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, 0xFFFFFFFF );
-+	if(priv->tlanRev < 0x30 ) {
-+		ack = 1;
-+		head_list = priv->txList + priv->txHead;
-+		if ((head_list->cStat & TLAN_CSTAT_READY) == TLAN_CSTAT_READY) {
-+			outl(virt_to_le32desc(head_list), BASE + TLAN_CH_PARM);
-+			ack |= TLAN_HC_GO;
- 		} else {
--			for ( i = 0; i < dev->mc_count; i++ ) {
--				if ( i < 3 ) {
--					TLan_SetMac( dev, i + 1, (char *) &dmi->dmi_addr );
--				} else {
--					offset = TLan_HashFunc( (u8 *) &dmi->dmi_addr );
--					if ( offset < 32 ) 
--						hash1 |= ( 1 << offset );
--					else
--						hash2 |= ( 1 << ( offset - 32 ) );
--				}
--				dmi = dmi->next;
--			}
--			for ( ; i < 3; i++ ) 
--				TLan_SetMac( dev, i + 1, NULL );
--			TLan_DioWrite32( dev->base_addr, TLAN_HASH_1, hash1 );
--			TLan_DioWrite32( dev->base_addr, TLAN_HASH_2, hash2 );
-+			priv->txInProgress = 0;
- 		}
-+		host_cmd = TLAN_HC_ACK | ack | 0x00140000;
-+		outl(host_cmd, BASE + TLAN_HOST_CMD);
-+		
- 	}
-+			
-+	if (currticks() >= to) {
-+		printf("TX Time Out");
-+	}
-+}
- 
--} /* TLan_SetMulticastList */
--
--/*****************************************************************************
--******************************************************************************
--
--        ThunderLAN Driver Interrupt Vectors and Table
--
--	Please see Chap. 4, "Interrupt Handling" of the "ThunderLAN
--	Programmer's Guide" for more informations on handling interrupts
--	generated by TLAN based adapters.  
--
--******************************************************************************
--*****************************************************************************/
--
--	/***************************************************************
--	 *	TLan_HandleInvalid
--	 *
--	 *	Returns:
--	 *		0
--	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This function handles invalid interrupts.  This should
--	 *	never happen unless some other adapter is trying to use
--	 *	the IRQ line assigned to the device.
--	 *
--	 **************************************************************/
--
--u32 TLan_HandleInvalid( struct net_device *dev, u16 host_int )
-+/**************************************************************************
-+DISABLE - Turn off ethernet interface
-+***************************************************************************/
-+#ifdef EB51
-+static void tlan_disable(struct dev *dev __unused)
-+#else
-+static void tlan_disable(struct nic *nic __unused)
-+#endif
- {
--	/* printk( "TLAN:  Invalid interrupt on %s.\n", dev->name ); */
--	return 0;
--
--} /* TLan_HandleInvalid */
--
--	/***************************************************************
--	 *	TLan_HandleTxEOF
--	 *
--	 *	Returns:
--	 *		1
--	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This function handles Tx EOF interrupts which are raised
--	 *	by the adapter when it has completed sending the
--	 *	contents of a buffer.  If detemines which list/buffer
--	 *	was completed and resets it.  If the buffer was the last
--	 *	in the channel (EOC), then the function checks to see if
--	 *	another buffer is ready to send, and if so, sends a Tx
--	 *	Go command.  Finally, the driver activates/continues the
--	 *	activity LED.
-+	/* put the card in its initial state */
-+	/* This function serves 3 purposes.
-+	 * This disables DMA and interrupts so we don't receive
-+	 *  unexpected packets or interrupts from the card after
-+	 *  etherboot has finished.
-+	 * This frees resources so etherboot may use
-+	 *  this driver on another interface
-+	 * This allows etherboot to reinitialize the interface
-+	 *  if something is something goes wrong.
- 	 *
--	 **************************************************************/
-+	 */
-+	outl(TLAN_HC_AD_RST, BASE + TLAN_HOST_CMD);
-+}
- 
--u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
-+/**************************************************************************
-+IRQ - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void tlan_irq(struct nic *nic __unused, irq_action_t action __unused)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	int		eoc = 0;
--	TLanList	*head_list;
--	u32		ack = 0;
--	u16		tmpCStat;
--	
--	TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOF (Head=%d Tail=%d)\n", priv->txHead, priv->txTail );
--	head_list = priv->txList + priv->txHead;
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
- 
--	while (((tmpCStat = head_list->cStat ) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
--		ack++;
--		if ( ! bbuf ) {
--			dev_kfree_skb_any( (struct sk_buff *) head_list->buffer[9].address );
--			head_list->buffer[9].address = 0;
--		}
--	
--		if ( tmpCStat & TLAN_CSTAT_EOC )
--			eoc = 1;
--			
--		priv->stats.tx_bytes += head_list->frameSize;
-+static void TLan_SetMulticastList(struct nic *nic) {
-+	int i;
-+	u8 tmp;
- 
--		head_list->cStat = TLAN_CSTAT_UNUSED;
--		netif_start_queue(dev);		
--		CIRC_INC( priv->txHead, TLAN_NUM_TX_LISTS ); 
--		head_list = priv->txList + priv->txHead;
--	}
-+	/* !IFF_PROMISC */
-+	tmp = TLan_DioRead8(BASE, TLAN_NET_CMD);
-+	TLan_DioWrite8(BASE, TLAN_NET_CMD, tmp & ~TLAN_NET_CMD_CAF);
-+
-+	/* IFF_ALLMULTI */
-+	for(i = 0; i< 3; i++)
-+		TLan_SetMac(nic, i + 1, NULL);
-+	TLan_DioWrite32(BASE, TLAN_HASH_1, 0xFFFFFFFF);
-+	TLan_DioWrite32(BASE, TLAN_HASH_2, 0xFFFFFFFF);
- 
--	if (!ack)
--		printk(KERN_INFO "TLAN: Received interrupt for uncompleted TX frame.\n");
--	
--	if ( eoc ) {
--		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d)\n", priv->txHead, priv->txTail );
--		head_list = priv->txList + priv->txHead;
--		if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
--			outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
--			ack |= TLAN_HC_GO;
--		} else {
--			priv->txInProgress = 0;
--		}
--	}
- 	
--	if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
--		TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
--		if ( priv->timer.function == NULL ) {
--			 priv->timer.function = &TLan_Timer;
--			 priv->timer.data = (unsigned long) dev;
--			 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
--			 priv->timerSetAt = jiffies;
--			 priv->timerType = TLAN_TIMER_ACTIVITY;
--			 add_timer(&priv->timer);
--		} else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
--			priv->timerSetAt = jiffies;
-+}
-+/**************************************************************************
-+PROBE - Look for an adapter, this routine's visible to the outside
-+***************************************************************************/
-+
-+#define board_found 1
-+#define valid_link 0
-+#ifdef EB51
-+static int tlan_probe(struct dev *dev, struct pci_device *pci)
-+{
-+	struct nic *nic = (struct nic *) dev;
-+#else
-+struct nic *tlan_probe(struct nic *nic, unsigned short *io_addrs, struct pci_device *pci)
-+{
-+#endif
-+		u16 data = 0;
-+	int err;
-+	int i;
-+
-+	if (pci->ioaddr == 0)
-+		return 0;
-+
-+	nic->irqno  = 0;
-+	nic->ioaddr = pci->ioaddr & ~3;
-+
-+	BASE = pci->ioaddr;
-+	printf("\n");
-+	printf("tlan.c: %s, %s\n", drv_version, drv_date);
-+	printf("%s: Probing for Vendor 0x%hX, Device 0x%hX",
-+	       pci->name, pci->vendor, pci->dev_id);
-+
-+
-+	/* I really must find out what this does */
-+	adjust_pci_device(pci);
-+
-+	/* Point to private storage */
-+	priv = &TLanPrivateInfo;
-+	/* Figure out which chip we're dealing with */
-+	i = 0;
-+	chip_idx = -1;
-+
-+	while (tlan_pci_tbl[i].name) {
-+		if ((((u32) pci->dev_id << 16) | pci->vendor) ==
-+		    (tlan_pci_tbl[i].id.pci & 0xffffffff)) {
-+			chip_idx = i;
-+			break;
- 		}
-+		i++;
- 	}
- 
--	return ack;
-+	priv->vendor_id = pci->vendor;
-+	priv->dev_id = pci->dev_id;
-+	priv->nic_name = pci->name;
-+	priv->eoc = 0;
- 
--} /* TLan_HandleTxEOF */
-+	err = 0;
-+	for (i = 0; i < 6; i++)
-+		err |= TLan_EeReadByte(BASE,
-+				       (u8) tlan_pci_tbl[chip_idx].
-+				       addrOfs + i,
-+				       (u8 *) & nic->node_addr[i]);
-+	if (err) {
-+		printf("TLAN: %s: Error reading MAC from eeprom: %d\n",
-+		       pci->name, err);
-+	} else
-+		printf("\nAddress: %!\n", nic->node_addr);
- 
--	/***************************************************************
--	 *	TLan_HandleStatOverflow
--	 *
--	 *	Returns:
--	 *		1
--	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This function handles the Statistics Overflow interrupt
--	 *	which means that one or more of the TLAN statistics
--	 *	registers has reached 1/2 capacity and needs to be read.
--	 *
--	 **************************************************************/
-+	priv->tlanRev = TLan_DioRead8(BASE, TLAN_DEF_REVISION);
-+	printf("\nRevision = 0x%hX\n", priv->tlanRev);
- 
--u32 TLan_HandleStatOverflow( struct net_device *dev, u16 host_int )
--{
--	TLan_ReadAndClearStats( dev, TLAN_RECORD );
-+	TLan_ResetLists(nic);
-+	TLan_ResetAdapter(nic);
-+/*
-+	data = inl(BASE + TLAN_HOST_CMD);
-+	data |= TLAN_HC_EOC;
-+	outw(data, BASE + TLAN_HOST_CMD);
-+*/
-+
-+	data = inl(BASE + TLAN_HOST_CMD);
-+	data |= TLAN_HC_INT_OFF;
-+	outw(data, BASE + TLAN_HOST_CMD);
- 
-+	TLan_SetMulticastList(nic);
-+	udelay(100); 
-+	priv->txList = tx_ring;
-+	priv->rxList = rx_ring;
-+/*	if (board_found && valid_link)
-+	{*/
-+	/* point to NIC specific routines */
-+#ifdef EB51
-+	dev->disable = tlan_disable;
-+	nic->poll = tlan_poll;
-+	nic->transmit = tlan_transmit;
-+	nic->irq    = tlan_irq;
- 	return 1;
-+#else
-+	nic->disable = tlan_disable;
-+	nic->poll = tlan_poll;
-+	nic->transmit = tlan_transmit;
-+	nic->irq    = tlan_irq;
-+	return nic;
-+#endif
-+}
-+
-+
-+/*****************************************************************************
-+******************************************************************************
-+
-+	ThunderLAN Driver Eeprom routines
-+
-+	The Compaq Netelligent 10 and 10/100 cards use a Microchip 24C02A
-+	EEPROM.  These functions are based on information in Microchip's
-+	data sheet.  I don't know how well this functions will work with
-+	other EEPROMs.
-+
-+******************************************************************************
-+*****************************************************************************/
- 
--} /* TLan_HandleStatOverflow */
- 
- 	/***************************************************************
--	 *	TLan_HandleRxEOF
-+	 *	TLan_EeSendStart
- 	 *
- 	 *	Returns:
--	 *		1
-+	 *		Nothing
- 	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This function handles the Rx EOF interrupt which
--	 *	indicates a frame has been received by the adapter from
--	 *	the net and the frame has been transferred to memory.
--	 *	The function determines the bounce buffer the frame has
--	 *	been loaded into, creates a new sk_buff big enough to
--	 *	hold the frame, and sends it to protocol stack.  It
--	 *	then resets the used buffer and appends it to the end
--	 *	of the list.  If the frame was the last in the Rx
--	 *	channel (EOC), the function restarts the receive channel
--	 *	by sending an Rx Go command to the adapter.  Then it
--	 *	activates/continues the activity LED.
-+	 *		io_base		The IO port base address for the
-+	 *				TLAN device with the EEPROM to
-+	 *				use.
-+	 *
-+	 *	This function sends a start cycle to an EEPROM attached
-+	 *	to a TLAN chip.
- 	 *
- 	 **************************************************************/
- 
--u32 TLan_HandleRxEOF( struct net_device *dev, u16 host_int )
-+void TLan_EeSendStart(u16 io_base)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	u32		ack = 0;
--	int		eoc = 0;
--	u8		*head_buffer;
--	TLanList	*head_list;
--	struct sk_buff	*skb;
--	TLanList	*tail_list;
--	void		*t;
--	u32		frameSize;
--	u16		tmpCStat;
--
--	TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOF (Head=%d Tail=%d)\n", priv->rxHead, priv->rxTail );
--	head_list = priv->rxList + priv->rxHead;
--	
--	while (((tmpCStat = head_list->cStat) & TLAN_CSTAT_FRM_CMP) && (ack < 255)) {
--		frameSize = head_list->frameSize;
--		ack++;
--		if (tmpCStat & TLAN_CSTAT_EOC)
--			eoc = 1;
--		
--		if (bbuf) {
--			skb = dev_alloc_skb(frameSize + 7);
--			if (skb == NULL)
--				printk(KERN_INFO "TLAN: Couldn't allocate memory for received data.\n");
--			else {
--				head_buffer = priv->rxBuffer + (priv->rxHead * TLAN_MAX_FRAME_SIZE);
--				skb->dev = dev;
--				skb_reserve(skb, 2);
--				t = (void *) skb_put(skb, frameSize);
--		
--				priv->stats.rx_bytes += head_list->frameSize;
--
--				memcpy( t, head_buffer, frameSize );
--				skb->protocol = eth_type_trans( skb, dev );
--				netif_rx( skb );
--			}
--		} else {
--			struct sk_buff *new_skb;
--		
--			/*
--		 	*	I changed the algorithm here. What we now do
--		 	*	is allocate the new frame. If this fails we
--		 	*	simply recycle the frame.
--		 	*/
--		
--			new_skb = dev_alloc_skb( TLAN_MAX_FRAME_SIZE + 7 );
--			
--			if ( new_skb != NULL ) {
--				/* If this ever happened it would be a problem */
--				/* not any more - ac */
--				skb = (struct sk_buff *) head_list->buffer[9].address;
--				skb_trim( skb, frameSize );
--
--				priv->stats.rx_bytes += frameSize;
-+	u16 sio;
- 
--				skb->protocol = eth_type_trans( skb, dev );
--				netif_rx( skb );
--	
--				new_skb->dev = dev;
--				skb_reserve( new_skb, 2 );
--				t = (void *) skb_put( new_skb, TLAN_MAX_FRAME_SIZE );
--				head_list->buffer[0].address = virt_to_bus( t );
--				head_list->buffer[8].address = (u32) t;
--				head_list->buffer[9].address = (u32) new_skb;
--			} else 
--				printk(KERN_WARNING "TLAN:  Couldn't allocate memory for received data.\n" );
--		}
-+	outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
-+	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
- 
--		head_list->forward = 0;
--		head_list->cStat = 0;
--		tail_list = priv->rxList + priv->rxTail;
--		tail_list->forward = virt_to_bus( head_list );
--
--		CIRC_INC( priv->rxHead, TLAN_NUM_RX_LISTS );
--		CIRC_INC( priv->rxTail, TLAN_NUM_RX_LISTS );
--		head_list = priv->rxList + priv->rxHead;
--	}
-+	TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+	TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
-+	TLan_SetBit(TLAN_NET_SIO_ETXEN, sio);
-+	TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);
-+	TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
- 
--	if (!ack)
--		printk(KERN_INFO "TLAN: Received interrupt for uncompleted RX frame.\n");
--	
-+}				/* TLan_EeSendStart */
- 
--	if ( eoc ) { 
--		TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOC (Head=%d Tail=%d)\n", priv->rxHead, priv->rxTail );
--		head_list = priv->rxList + priv->rxHead;
--		outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
--		ack |= TLAN_HC_GO | TLAN_HC_RT;
--		priv->rxEocCount++;
--	}
--
--	if ( priv->adapter->flags & TLAN_ADAPTER_ACTIVITY_LED ) {
--		TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
--		if ( priv->timer.function == NULL )  {
--			priv->timer.function = &TLan_Timer;
--			priv->timer.data = (unsigned long) dev;
--			priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
--			priv->timerSetAt = jiffies;
--			priv->timerType = TLAN_TIMER_ACTIVITY;
--			add_timer(&priv->timer);
--		} else if ( priv->timerType == TLAN_TIMER_ACTIVITY ) {
--			priv->timerSetAt = jiffies;
--		}
--	}
- 
--	dev->last_rx = jiffies;
--	
--	return ack;
- 
--} /* TLan_HandleRxEOF */
- 
- 	/***************************************************************
--	 *	TLan_HandleDummy
-+	 *	TLan_EeSendByte
- 	 *
- 	 *	Returns:
--	 *		1
--	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This function handles the Dummy interrupt, which is
--	 *	raised whenever a test interrupt is generated by setting
--	 *	the Req_Int bit of HOST_CMD to 1.
-+	 *		If the correct ack was received, 0, otherwise 1
-+	 *	Parms:	io_base		The IO port base address for the
-+	 *				TLAN device with the EEPROM to
-+	 *				use.
-+	 *		data		The 8 bits of information to
-+	 *				send to the EEPROM.
-+	 *		stop		If TLAN_EEPROM_STOP is passed, a
-+	 *				stop cycle is sent after the
-+	 *				byte is sent after the ack is
-+	 *				read.
-+	 *
-+	 *	This function sends a byte on the serial EEPROM line,
-+	 *	driving the clock to send each bit. The function then
-+	 *	reverses transmission direction and reads an acknowledge
-+	 *	bit.
- 	 *
- 	 **************************************************************/
- 
--u32 TLan_HandleDummy( struct net_device *dev, u16 host_int )
-+int TLan_EeSendByte(u16 io_base, u8 data, int stop)
- {
--	printk( "TLAN:  Test interrupt on %s.\n", dev->name );
--	return 1;
-+	int err;
-+	u8 place;
-+	u16 sio;
- 
--} /* TLan_HandleDummy */
-+	outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
-+	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
- 
--	/***************************************************************
--	 *	TLan_HandleTxEOC
--	 *
--	 *	Returns:
--	 *		1
--	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This driver is structured to determine EOC occurances by
--	 *	reading the CSTAT member of the list structure.  Tx EOC
--	 *	interrupts are disabled via the DIO INTDIS register.
--	 *	However, TLAN chips before revision 3.0 didn't have this
--	 *	functionality, so process EOC events if this is the
--	 *	case.
--	 *
--	 **************************************************************/
-+	/* Assume clock is low, tx is enabled; */
-+	for (place = 0x80; place != 0; place >>= 1) {
-+		if (place & data)
-+			TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
-+		else
-+			TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);
-+		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
-+	}
-+	TLan_ClearBit(TLAN_NET_SIO_ETXEN, sio);
-+	TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+	err = TLan_GetBit(TLAN_NET_SIO_EDATA, sio);
-+	TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
-+	TLan_SetBit(TLAN_NET_SIO_ETXEN, sio);
- 
--u32 TLan_HandleTxEOC( struct net_device *dev, u16 host_int )
--{
--	TLanPrivateInfo	*priv = dev->priv;
--	TLanList		*head_list;
--	u32			ack = 1;
--	
--	host_int = 0;
--	if ( priv->tlanRev < 0x30 ) {
--		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  Handling TX EOC (Head=%d Tail=%d) -- IRQ\n", priv->txHead, priv->txTail );
--		head_list = priv->txList + priv->txHead;
--		if ( ( head_list->cStat & TLAN_CSTAT_READY ) == TLAN_CSTAT_READY ) {
--			netif_stop_queue(dev);
--			outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
--			ack |= TLAN_HC_GO;
--		} else {
--			priv->txInProgress = 0;
--		}
-+	if ((!err) && stop) {
-+		TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);	/* STOP, raise data while clock is high */
-+		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+		TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
- 	}
- 
--	return ack;
-+	return (err);
-+
-+}				/* TLan_EeSendByte */
-+
-+
- 
--} /* TLan_HandleTxEOC */
- 
- 	/***************************************************************
--	 *	TLan_HandleStatusCheck
-+	 *	TLan_EeReceiveByte
- 	 *
- 	 *	Returns:
--	 *		0 if Adapter check, 1 if Network Status check.
-+	 *		Nothing
- 	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This function handles Adapter Check/Network Status
--	 *	interrupts generated by the adapter.  It checks the
--	 *	vector in the HOST_INT register to determine if it is
--	 *	an Adapter Check interrupt.  If so, it resets the
--	 *	adapter.  Otherwise it clears the status registers
--	 *	and services the PHY.
-+	 *		io_base		The IO port base address for the
-+	 *				TLAN device with the EEPROM to
-+	 *				use.
-+	 *		data		An address to a char to hold the
-+	 *				data sent from the EEPROM.
-+	 *		stop		If TLAN_EEPROM_STOP is passed, a
-+	 *				stop cycle is sent after the
-+	 *				byte is received, and no ack is
-+	 *				sent.
-+	 *
-+	 *	This function receives 8 bits of data from the EEPROM
-+	 *	over the serial link.  It then sends and ack bit, or no
-+	 *	ack and a stop bit.  This function is used to retrieve
-+	 *	data after the address of a byte in the EEPROM has been
-+	 *	sent.
- 	 *
- 	 **************************************************************/
- 
--u32 TLan_HandleStatusCheck( struct net_device *dev, u16 host_int )
--{	
--	TLanPrivateInfo	*priv = dev->priv;
--	u32		ack;
--	u32		error;
--	u8		net_sts;
--	u32		phy;
--	u16		tlphy_ctl;
--	u16		tlphy_sts;
--	
--	ack = 1;
--	if ( host_int & TLAN_HI_IV_MASK ) {
--		netif_stop_queue( dev );
--		error = inl( dev->base_addr + TLAN_CH_PARM );
--		printk( "TLAN:  %s: Adaptor Error = 0x%x\n", dev->name, error );
--		TLan_ReadAndClearStats( dev, TLAN_RECORD );
--		outl( TLAN_HC_AD_RST, dev->base_addr + TLAN_HOST_CMD );
--		
--		queue_task(&priv->tlan_tqueue, &tq_immediate);
--		mark_bh(IMMEDIATE_BH);
--		
--		netif_wake_queue(dev);
--		ack = 0;
--	} else {
--		TLAN_DBG( TLAN_DEBUG_GNRL, "%s: Status Check\n", dev->name );
--		phy = priv->phy[priv->phyNum];
-+void TLan_EeReceiveByte(u16 io_base, u8 * data, int stop)
-+{
-+	u8 place;
-+	u16 sio;
- 
--		net_sts = TLan_DioRead8( dev->base_addr, TLAN_NET_STS );
--		if ( net_sts ) {
--			TLan_DioWrite8( dev->base_addr, TLAN_NET_STS, net_sts );
--			TLAN_DBG( TLAN_DEBUG_GNRL, "%s:    Net_Sts = %x\n", dev->name, (unsigned) net_sts );
--		}
--		if ( ( net_sts & TLAN_NET_STS_MIRQ ) &&  ( priv->phyNum == 0 ) ) {
--			TLan_MiiReadReg( dev, phy, TLAN_TLPHY_STS, &tlphy_sts );
--			TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
--        		if ( ! ( tlphy_sts & TLAN_TS_POLOK ) && ! ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
--                		tlphy_ctl |= TLAN_TC_SWAPOL;
--                		TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
--        		} else if ( ( tlphy_sts & TLAN_TS_POLOK ) && ( tlphy_ctl & TLAN_TC_SWAPOL ) ) {
--                		tlphy_ctl &= ~TLAN_TC_SWAPOL;
--                		TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl);
--        		}
-+	outw(TLAN_NET_SIO, io_base + TLAN_DIO_ADR);
-+	sio = io_base + TLAN_DIO_DATA + TLAN_NET_SIO;
-+	*data = 0;
- 
--			if (debug) {
--				TLan_PhyPrint( dev );		
--			}
--		}
-+	/* Assume clock is low, tx is enabled; */
-+	TLan_ClearBit(TLAN_NET_SIO_ETXEN, sio);
-+	for (place = 0x80; place; place >>= 1) {
-+		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+		if (TLan_GetBit(TLAN_NET_SIO_EDATA, sio))
-+			*data |= place;
-+		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
-+	}
-+
-+	TLan_SetBit(TLAN_NET_SIO_ETXEN, sio);
-+	if (!stop) {
-+		TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);	/* Ack = 0 */
-+		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
-+	} else {
-+		TLan_SetBit(TLAN_NET_SIO_EDATA, sio);	/* No ack = 1 (?) */
-+		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+		TLan_ClearBit(TLAN_NET_SIO_ECLOK, sio);
-+		TLan_ClearBit(TLAN_NET_SIO_EDATA, sio);	/* STOP, raise data while clock is high */
-+		TLan_SetBit(TLAN_NET_SIO_ECLOK, sio);
-+		TLan_SetBit(TLAN_NET_SIO_EDATA, sio);
- 	}
- 
--	return ack;
-+}				/* TLan_EeReceiveByte */
-+
- 
--} /* TLan_HandleStatusCheck */
- 
- 	/***************************************************************
--	 *	TLan_HandleRxEOC
-+	 *	TLan_EeReadByte
- 	 *
- 	 *	Returns:
--	 *		1
-+	 *		No error = 0, else, the stage at which the error
-+	 *		occurred.
- 	 *	Parms:
--	 *		dev		Device assigned the IRQ that was
--	 *				raised.
--	 *		host_int	The contents of the HOST_INT
--	 *				port.
--	 *
--	 *	This driver is structured to determine EOC occurances by
--	 *	reading the CSTAT member of the list structure.  Rx EOC
--	 *	interrupts are disabled via the DIO INTDIS register.
--	 *	However, TLAN chips before revision 3.0 didn't have this
--	 *	CSTAT member or a INTDIS register, so if this chip is
--	 *	pre-3.0, process EOC interrupts normally.
-+	 *		io_base		The IO port base address for the
-+	 *				TLAN device with the EEPROM to
-+	 *				use.
-+	 *		ee_addr		The address of the byte in the
-+	 *				EEPROM whose contents are to be
-+	 *				retrieved.
-+	 *		data		An address to a char to hold the
-+	 *				data obtained from the EEPROM.
-+	 *
-+	 *	This function reads a byte of information from an byte
-+	 *	cell in the EEPROM.
- 	 *
- 	 **************************************************************/
- 
--u32 TLan_HandleRxEOC( struct net_device *dev, u16 host_int )
-+int TLan_EeReadByte(u16 io_base, u8 ee_addr, u8 * data)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	TLanList	*head_list;
--	u32		ack = 1;
-+	int err;
-+	int ret = 0;
- 
--	if (  priv->tlanRev < 0x30 ) {
--		TLAN_DBG( TLAN_DEBUG_RX, "RECEIVE:  Handling RX EOC (Head=%d Tail=%d) -- IRQ\n", priv->rxHead, priv->rxTail );
--		head_list = priv->rxList + priv->rxHead;
--		outl( virt_to_bus( head_list ), dev->base_addr + TLAN_CH_PARM );
--		ack |= TLAN_HC_GO | TLAN_HC_RT;
--		priv->rxEocCount++;
-+
-+	TLan_EeSendStart(io_base);
-+	err = TLan_EeSendByte(io_base, 0xA0, TLAN_EEPROM_ACK);
-+	if (err) {
-+		ret = 1;
-+		goto fail;
-+	}
-+	err = TLan_EeSendByte(io_base, ee_addr, TLAN_EEPROM_ACK);
-+	if (err) {
-+		ret = 2;
-+		goto fail;
-+	}
-+	TLan_EeSendStart(io_base);
-+	err = TLan_EeSendByte(io_base, 0xA1, TLAN_EEPROM_ACK);
-+	if (err) {
-+		ret = 3;
-+		goto fail;
- 	}
-+	TLan_EeReceiveByte(io_base, data, TLAN_EEPROM_STOP);
-+      fail:
- 
--	return ack;
-+	return ret;
-+
-+}				/* TLan_EeReadByte */
- 
--} /* TLan_HandleRxEOC */
- 
- /*****************************************************************************
- ******************************************************************************
- 
--	ThunderLAN Driver Timer Function
-+	ThunderLAN Driver MII Routines
-+
-+	These routines are based on the information in Chap. 2 of the
-+	"ThunderLAN Programmer's Guide", pp. 15-24.
- 
- ******************************************************************************
- *****************************************************************************/
- 
-+
- 	/***************************************************************
--	 *	TLan_Timer
-+	 *	TLan_MiiReadReg
- 	 *
- 	 *	Returns:
--	 *		Nothing
-+	 *		0	if ack received ok
-+	 *		1	otherwise.
-+	 *
- 	 *	Parms:
--	 *		data	A value given to add timer when
--	 *			add_timer was called.
-+	 *		dev		The device structure containing
-+	 *				The io address and interrupt count
-+	 *				for this device.
-+	 *		phy		The address of the PHY to be queried.
-+	 *		reg		The register whose contents are to be
-+	 *				retreived.
-+	 *		val		A pointer to a variable to store the
-+	 *				retrieved value.
- 	 *
--	 *	This function handles timed functionality for the
--	 *	TLAN driver.  The two current timer uses are for
--	 *	delaying for autonegotionation and driving the ACT LED.
--	 *	-	Autonegotiation requires being allowed about
--	 *		2 1/2 seconds before attempting to transmit a
--	 *		packet.  It would be a very bad thing to hang
--	 *		the kernel this long, so the driver doesn't
--	 *		allow transmission 'til after this time, for
--	 *		certain PHYs.  It would be much nicer if all
--	 *		PHYs were interrupt-capable like the internal
--	 *		PHY.
--	 *	-	The ACT LED, which shows adapter activity, is
--	 *		driven by the driver, and so must be left on
--	 *		for a short period to power up the LED so it
--	 *		can be seen.  This delay can be changed by
--	 *		changing the TLAN_TIMER_ACT_DELAY in tlan.h,
--	 *		if desired.  100 ms  produces a slightly
--	 *		sluggish response.
-+	 *	This function uses the TLAN's MII bus to retreive the contents
-+	 *	of a given register on a PHY.  It sends the appropriate info
-+	 *	and then reads the 16-bit register value from the MII bus via
-+	 *	the TLAN SIO register.
- 	 *
- 	 **************************************************************/
- 
--void TLan_Timer( unsigned long data )
-+int TLan_MiiReadReg(struct nic *nic __unused, u16 phy, u16 reg, u16 * val)
- {
--	struct net_device	*dev = (struct net_device *) data;
--	TLanPrivateInfo	*priv = dev->priv;
--	u32		elapsed;
--	unsigned long	flags = 0;
--
--	priv->timer.function = NULL;
--
--	switch ( priv->timerType ) {
--#ifdef MONITOR		
--		case TLAN_TIMER_LINK_BEAT:
--			TLan_PhyMonitor( dev );
--			break;
--#endif
--		case TLAN_TIMER_PHY_PDOWN:
--			TLan_PhyPowerDown( dev );
--			break;
--		case TLAN_TIMER_PHY_PUP:
--			TLan_PhyPowerUp( dev );
--			break;
--		case TLAN_TIMER_PHY_RESET:
--			TLan_PhyReset( dev );
--			break;
--		case TLAN_TIMER_PHY_START_LINK:
--			TLan_PhyStartLink( dev );
--			break;
--		case TLAN_TIMER_PHY_FINISH_AN:
--			TLan_PhyFinishAutoNeg( dev );
--			break;
--		case TLAN_TIMER_FINISH_RESET:
--			TLan_FinishReset( dev );
--			break;
--		case TLAN_TIMER_ACTIVITY:
--			spin_lock_irqsave(&priv->lock, flags);
--			if ( priv->timer.function == NULL ) {
--				elapsed = jiffies - priv->timerSetAt;
--				if ( elapsed >= TLAN_TIMER_ACT_DELAY ) {
--					TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
--				} else  {
--					priv->timer.function = &TLan_Timer;
--					priv->timer.expires = priv->timerSetAt + TLAN_TIMER_ACT_DELAY;
--					spin_unlock_irqrestore(&priv->lock, flags);
--					add_timer( &priv->timer );
--					break;
--				}
--			}
--			spin_unlock_irqrestore(&priv->lock, flags);
--			break;
--		default:
--			break;
-+	u8 nack;
-+	u16 sio, tmp;
-+	u32 i;
-+	int err;
-+	int minten;
-+
-+	err = FALSE;
-+	outw(TLAN_NET_SIO, BASE + TLAN_DIO_ADR);
-+	sio = BASE + TLAN_DIO_DATA + TLAN_NET_SIO;
-+
-+	TLan_MiiSync(BASE);
-+
-+	minten = TLan_GetBit(TLAN_NET_SIO_MINTEN, sio);
-+	if (minten)
-+		TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
-+
-+	TLan_MiiSendData(BASE, 0x1, 2);	/* Start ( 01b ) */
-+	TLan_MiiSendData(BASE, 0x2, 2);	/* Read  ( 10b ) */
-+	TLan_MiiSendData(BASE, phy, 5);	/* Device #      */
-+	TLan_MiiSendData(BASE, reg, 5);	/* Register #    */
-+
-+
-+	TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);	/* Change direction */
-+
-+	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Clock Idle bit */
-+	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
-+	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Wait 300ns */
-+
-+	nack = TLan_GetBit(TLAN_NET_SIO_MDATA, sio);	/* Check for ACK */
-+	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);	/* Finish ACK */
-+	if (nack) {		/* No ACK, so fake it */
-+		for (i = 0; i < 16; i++) {
-+			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
-+			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
-+		}
-+		tmp = 0xffff;
-+		err = TRUE;
-+	} else {		/* ACK, so read data */
-+		for (tmp = 0, i = 0x8000; i; i >>= 1) {
-+			TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
-+			if (TLan_GetBit(TLAN_NET_SIO_MDATA, sio))
-+				tmp |= i;
-+			TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
-+		}
- 	}
- 
--} /* TLan_Timer */
- 
--/*****************************************************************************
--******************************************************************************
-+	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Idle cycle */
-+	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
- 
--	ThunderLAN Driver Adapter Related Routines
-+	if (minten)
-+		TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
- 
--******************************************************************************
--*****************************************************************************/
-+	*val = tmp;
-+
-+	return err;
-+
-+}				/* TLan_MiiReadReg */
- 
- 	/***************************************************************
--	 *	TLan_ResetLists
--	 *  
-+	 *	TLan_MiiSendData
-+	 *
- 	 *	Returns:
- 	 *		Nothing
- 	 *	Parms:
--	 *		dev	The device structure with the list
--	 *			stuctures to be reset.
-+	 *		base_port	The base IO port of the adapter	in
-+	 *				question.
-+	 *		dev		The address of the PHY to be queried.
-+	 *		data		The value to be placed on the MII bus.
-+	 *		num_bits	The number of bits in data that are to
-+	 *				be placed on the MII bus.
- 	 *
--	 *	This routine sets the variables associated with managing
--	 *	the TLAN lists to their initial values.
-+	 *	This function sends on sequence of bits on the MII
-+	 *	configuration bus.
- 	 *
- 	 **************************************************************/
- 
--void TLan_ResetLists( struct net_device *dev )
-+void TLan_MiiSendData(u16 base_port, u32 data, unsigned num_bits)
- {
--	TLanPrivateInfo *priv = dev->priv;
--	int		i;
--	TLanList	*list;
--	struct sk_buff	*skb;
--	void		*t = NULL;
-+	u16 sio;
-+	u32 i;
- 
--	priv->txHead = 0;
--	priv->txTail = 0;
--	for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
--		list = priv->txList + i;
--		list->cStat = TLAN_CSTAT_UNUSED;
--		if ( bbuf ) {
--			list->buffer[0].address = virt_to_bus( priv->txBuffer + ( i * TLAN_MAX_FRAME_SIZE ) );
--		} else {
--			list->buffer[0].address = 0;
--		}
--		list->buffer[2].count = 0;
--		list->buffer[2].address = 0;
--		list->buffer[9].address = 0;
--	}
-+	if (num_bits == 0)
-+		return;
-+
-+	outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
-+	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
-+	TLan_SetBit(TLAN_NET_SIO_MTXEN, sio);
- 
--	priv->rxHead = 0;
--	priv->rxTail = TLAN_NUM_RX_LISTS - 1;
--	for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
--		list = priv->rxList + i;
--		list->cStat = TLAN_CSTAT_READY;
--		list->frameSize = TLAN_MAX_FRAME_SIZE;
--		list->buffer[0].count = TLAN_MAX_FRAME_SIZE | TLAN_LAST_BUFFER;
--		if ( bbuf ) {
--			list->buffer[0].address = virt_to_bus( priv->rxBuffer + ( i * TLAN_MAX_FRAME_SIZE ) );
--		} else {
--			skb = dev_alloc_skb( TLAN_MAX_FRAME_SIZE + 7 );
--			if ( skb == NULL ) {
--				printk( "TLAN:  Couldn't allocate memory for received data.\n" );
--				/* If this ever happened it would be a problem */
--			} else {
--				skb->dev = dev;
--				skb_reserve( skb, 2 );
--				t = (void *) skb_put( skb, TLAN_MAX_FRAME_SIZE );
--			}
--			list->buffer[0].address = virt_to_bus( t );
--			list->buffer[8].address = (u32) t;
--			list->buffer[9].address = (u32) skb;
--		}
--		list->buffer[1].count = 0;
--		list->buffer[1].address = 0;
--		if ( i < TLAN_NUM_RX_LISTS - 1 )
--			list->forward = virt_to_bus( list + 1 );
-+	for (i = (0x1 << (num_bits - 1)); i; i >>= 1) {
-+		TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
-+		(void) TLan_GetBit(TLAN_NET_SIO_MCLK, sio);
-+		if (data & i)
-+			TLan_SetBit(TLAN_NET_SIO_MDATA, sio);
- 		else
--			list->forward = 0;
-+			TLan_ClearBit(TLAN_NET_SIO_MDATA, sio);
-+		TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
-+		(void) TLan_GetBit(TLAN_NET_SIO_MCLK, sio);
- 	}
- 
--} /* TLan_ResetLists */
-+}				/* TLan_MiiSendData */
- 
--void TLan_FreeLists( struct net_device *dev )
--{
--	TLanPrivateInfo *priv = dev->priv;
--	int		i;
--	TLanList	*list;
--	struct sk_buff	*skb;
--
--	if ( ! bbuf ) {
--		for ( i = 0; i < TLAN_NUM_TX_LISTS; i++ ) {
--			list = priv->txList + i;
--			skb = (struct sk_buff *) list->buffer[9].address;
--			if ( skb ) {
--				dev_kfree_skb_any( skb );
--				list->buffer[9].address = 0;
--			}
--		}
- 
--		for ( i = 0; i < TLAN_NUM_RX_LISTS; i++ ) {
--			list = priv->rxList + i;
--			skb = (struct sk_buff *) list->buffer[9].address;
--			if ( skb ) {
--				dev_kfree_skb_any( skb );
--				list->buffer[9].address = 0;
--			}
--		}
--	}
- 
--} /* TLan_FreeLists */
- 
- 	/***************************************************************
--	 *	TLan_PrintDio
--	 *  
-+	 *	TLan_MiiSync
-+	 *
- 	 *	Returns:
- 	 *		Nothing
- 	 *	Parms:
--	 *		io_base		Base IO port of the device of
--	 *				which to print DIO registers.
-+	 *		base_port	The base IO port of the adapter in
-+	 *				question.
- 	 *
--	 *	This function prints out all the internal (DIO)
--	 *	registers of a TLAN chip.
-+	 *	This functions syncs all PHYs in terms of the MII configuration
-+	 *	bus.
- 	 *
- 	 **************************************************************/
- 
--void TLan_PrintDio( u16 io_base )
-+void TLan_MiiSync(u16 base_port)
- {
--	u32 data0, data1;
--	int	i;
-+	int i;
-+	u16 sio;
- 
--	printk( "TLAN:   Contents of internal registers for io base 0x%04hx.\n", io_base );
--	printk( "TLAN:      Off.  +0         +4\n" );
--	for ( i = 0; i < 0x4C; i+= 8 ) {
--		data0 = TLan_DioRead32( io_base, i );
--		data1 = TLan_DioRead32( io_base, i + 0x4 );
--		printk( "TLAN:      0x%02x  0x%08x 0x%08x\n", i, data0, data1 );
-+	outw(TLAN_NET_SIO, base_port + TLAN_DIO_ADR);
-+	sio = base_port + TLAN_DIO_DATA + TLAN_NET_SIO;
-+
-+	TLan_ClearBit(TLAN_NET_SIO_MTXEN, sio);
-+	for (i = 0; i < 32; i++) {
-+		TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);
-+		TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
- 	}
- 
--} /* TLan_PrintDio */
-+}				/* TLan_MiiSync */
-+
-+
-+
- 
- 	/***************************************************************
--	 *	TLan_PrintList
--	 *  
-+	 *	TLan_MiiWriteReg
-+	 *
- 	 *	Returns:
- 	 *		Nothing
- 	 *	Parms:
--	 *		list	A pointer to the TLanList structure to
--	 *			be printed.
--	 *		type	A string to designate type of list,
--	 *			"Rx" or "Tx".
--	 *		num	The index of the list.
-+	 *		dev		The device structure for the device
-+	 *				to write to.
-+	 *		phy		The address of the PHY to be written to.
-+	 *		reg		The register whose contents are to be
-+	 *				written.
-+	 *		val		The value to be written to the register.
- 	 *
--	 *	This function prints out the contents of the list
--	 *	pointed to by the list parameter.
-+	 *	This function uses the TLAN's MII bus to write the contents of a
-+	 *	given register on a PHY.  It sends the appropriate info and then
-+	 *	writes the 16-bit register value from the MII configuration bus
-+	 *	via the TLAN SIO register.
- 	 *
- 	 **************************************************************/
- 
--void TLan_PrintList( TLanList *list, char *type, int num)
-+void TLan_MiiWriteReg(struct nic *nic __unused, u16 phy, u16 reg, u16 val)
- {
--	int i;
-+	u16 sio;
-+	int minten;
-+
-+	outw(TLAN_NET_SIO, BASE + TLAN_DIO_ADR);
-+	sio = BASE + TLAN_DIO_DATA + TLAN_NET_SIO;
-+
-+	TLan_MiiSync(BASE);
-+
-+	minten = TLan_GetBit(TLAN_NET_SIO_MINTEN, sio);
-+	if (minten)
-+		TLan_ClearBit(TLAN_NET_SIO_MINTEN, sio);
-+
-+	TLan_MiiSendData(BASE, 0x1, 2);	/* Start ( 01b ) */
-+	TLan_MiiSendData(BASE, 0x1, 2);	/* Write ( 01b ) */
-+	TLan_MiiSendData(BASE, phy, 5);	/* Device #      */
-+	TLan_MiiSendData(BASE, reg, 5);	/* Register #    */
-+
-+	TLan_MiiSendData(BASE, 0x2, 2);	/* Send ACK */
-+	TLan_MiiSendData(BASE, val, 16);	/* Send Data */
-+
-+	TLan_ClearBit(TLAN_NET_SIO_MCLK, sio);	/* Idle cycle */
-+	TLan_SetBit(TLAN_NET_SIO_MCLK, sio);
-+
-+	if (minten)
-+		TLan_SetBit(TLAN_NET_SIO_MINTEN, sio);
- 
--	printk( "TLAN:   %s List %d at 0x%08x\n", type, num, (u32) list );
--	printk( "TLAN:      Forward    = 0x%08x\n",  list->forward );
--	printk( "TLAN:      CSTAT      = 0x%04hx\n", list->cStat );
--	printk( "TLAN:      Frame Size = 0x%04hx\n", list->frameSize );
--	/* for ( i = 0; i < 10; i++ ) { */
--	for ( i = 0; i < 2; i++ ) {
--		printk( "TLAN:      Buffer[%d].count, addr = 0x%08x, 0x%08x\n", i, list->buffer[i].count, list->buffer[i].address );
--	}
- 
--} /* TLan_PrintList */
-+}				/* TLan_MiiWriteReg */
- 
- 	/***************************************************************
--	 *	TLan_ReadAndClearStats
-+	 *	TLan_SetMac
- 	 *
- 	 *	Returns:
- 	 *		Nothing
- 	 *	Parms:
- 	 *		dev	Pointer to device structure of adapter
--	 *			to which to read stats.
--	 *		record	Flag indicating whether to add 
-+	 *			on which to change the AREG.
-+	 *		areg	The AREG to set the address in (0 - 3).
-+	 *		mac	A pointer to an array of chars.  Each
-+	 *			element stores one byte of the address.
-+	 *			IE, it isn't in ascii.
- 	 *
--	 *	This functions reads all the internal status registers
--	 *	of the TLAN chip, which clears them as a side effect.
--	 *	It then either adds the values to the device's status
--	 *	struct, or discards them, depending on whether record
--	 *	is TLAN_RECORD (!=0)  or TLAN_IGNORE (==0).
-+	 *	This function transfers a MAC address to one of the
-+	 *	TLAN AREGs (address registers).  The TLAN chip locks
-+	 *	the register on writing to offset 0 and unlocks the
-+	 *	register after writing to offset 5.  If NULL is passed
-+	 *	in mac, then the AREG is filled with 0's.
- 	 *
- 	 **************************************************************/
- 
--void TLan_ReadAndClearStats( struct net_device *dev, int record )
-+void TLan_SetMac(struct nic *nic __unused, int areg, char *mac)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	u32		tx_good, tx_under;
--	u32		rx_good, rx_over;
--	u32		def_tx, crc, code;
--	u32		multi_col, single_col;
--	u32		excess_col, late_col, loss;
--
--	outw( TLAN_GOOD_TX_FRMS, dev->base_addr + TLAN_DIO_ADR );
--	tx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
--	tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
--	tx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
--	tx_under = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
--
--	outw( TLAN_GOOD_RX_FRMS, dev->base_addr + TLAN_DIO_ADR );
--	rx_good  = inb( dev->base_addr + TLAN_DIO_DATA );
--	rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
--	rx_good += inb( dev->base_addr + TLAN_DIO_DATA + 2 ) << 16;
--	rx_over  = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
--		
--	outw( TLAN_DEFERRED_TX, dev->base_addr + TLAN_DIO_ADR );
--	def_tx  = inb( dev->base_addr + TLAN_DIO_DATA );
--	def_tx += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
--	crc     = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
--	code    = inb( dev->base_addr + TLAN_DIO_DATA + 3 );
--	
--	outw( TLAN_MULTICOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
--	multi_col   = inb( dev->base_addr + TLAN_DIO_DATA );
--	multi_col  += inb( dev->base_addr + TLAN_DIO_DATA + 1 ) << 8;
--	single_col  = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
--	single_col += inb( dev->base_addr + TLAN_DIO_DATA + 3 ) << 8;
--
--	outw( TLAN_EXCESSCOL_FRMS, dev->base_addr + TLAN_DIO_ADR );
--	excess_col = inb( dev->base_addr + TLAN_DIO_DATA );
--	late_col   = inb( dev->base_addr + TLAN_DIO_DATA + 1 );
--	loss       = inb( dev->base_addr + TLAN_DIO_DATA + 2 );
--
--	if ( record ) {
--		priv->stats.rx_packets += rx_good;
--		priv->stats.rx_errors  += rx_over + crc + code;
--		priv->stats.tx_packets += tx_good;
--		priv->stats.tx_errors  += tx_under + loss;
--		priv->stats.collisions += multi_col + single_col + excess_col + late_col;
--
--		priv->stats.rx_over_errors    += rx_over;
--		priv->stats.rx_crc_errors     += crc;
--		priv->stats.rx_frame_errors   += code;
-+	int i;
- 
--		priv->stats.tx_aborted_errors += tx_under;
--		priv->stats.tx_carrier_errors += loss;
-+	areg *= 6;
-+
-+	if (mac != NULL) {
-+		for (i = 0; i < 6; i++)
-+			TLan_DioWrite8(BASE, TLAN_AREG_0 + areg + i,
-+				       mac[i]);
-+	} else {
-+		for (i = 0; i < 6; i++)
-+			TLan_DioWrite8(BASE, TLAN_AREG_0 + areg + i, 0);
- 	}
--			
--} /* TLan_ReadAndClearStats */
- 
--	/***************************************************************
--	 *	TLan_Reset
-+}				/* TLan_SetMac */
-+
-+	/*********************************************************************
-+	 *	TLan_PhyDetect
- 	 *
- 	 *	Returns:
--	 *		0
-+	 *		Nothing
- 	 *	Parms:
--	 *		dev	Pointer to device structure of adapter
--	 *			to be reset.
-+	 *		dev	A pointer to the device structure of the adapter
-+	 *			for which the PHY needs determined.
- 	 *
--	 *	This function resets the adapter and it's physical
--	 *	device.  See Chap. 3, pp. 9-10 of the "ThunderLAN
--	 *	Programmer's Guide" for details.  The routine tries to
--	 *	implement what is detailed there, though adjustments
--	 *	have been made.
-+	 *	So far I've found that adapters which have external PHYs
-+	 *	may also use the internal PHY for part of the functionality.
-+	 *	(eg, AUI/Thinnet).  This function finds out if this TLAN
-+	 *	chip has an internal PHY, and then finds the first external
-+	 *	PHY (starting from address 0) if it exists).
- 	 *
--	 **************************************************************/
-+	 ********************************************************************/
- 
--void
--TLan_ResetAdapter( struct net_device *dev )
-+void TLan_PhyDetect(struct nic *nic)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	int		i;
--	u32		addr;
--	u32		data;
--	u8		data8;
-+	u16 control;
-+	u16 hi;
-+	u16 lo;
-+	u32 phy;
- 
--	priv->tlanFullDuplex = FALSE;
--	priv->phyOnline=0;
--/*  1.	Assert reset bit. */
-+	if (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_UNMANAGED_PHY) {
-+		priv->phyNum = 0xFFFF;
-+		return;
-+	}
- 
--	data = inl(dev->base_addr + TLAN_HOST_CMD);
--	data |= TLAN_HC_AD_RST;
--	outl(data, dev->base_addr + TLAN_HOST_CMD);
--	
--	udelay(1000);
-+	TLan_MiiReadReg(nic, TLAN_PHY_MAX_ADDR, MII_GEN_ID_HI, &hi);
- 
--/*  2.	Turn off interrupts. ( Probably isn't necessary ) */
-+	if (hi != 0xFFFF) {
-+		priv->phy[0] = TLAN_PHY_MAX_ADDR;
-+	} else {
-+		priv->phy[0] = TLAN_PHY_NONE;
-+	}
- 
--	data = inl(dev->base_addr + TLAN_HOST_CMD);
--	data |= TLAN_HC_INT_OFF;
--	outl(data, dev->base_addr + TLAN_HOST_CMD);
-+	priv->phy[1] = TLAN_PHY_NONE;
-+	for (phy = 0; phy <= TLAN_PHY_MAX_ADDR; phy++) {
-+		TLan_MiiReadReg(nic, phy, MII_GEN_CTL, &control);
-+		TLan_MiiReadReg(nic, phy, MII_GEN_ID_HI, &hi);
-+		TLan_MiiReadReg(nic, phy, MII_GEN_ID_LO, &lo);
-+		if ((control != 0xFFFF) || (hi != 0xFFFF)
-+		    || (lo != 0xFFFF)) {
-+			printf("PHY found at %hX %hX %hX %hX\n", phy,
-+			       control, hi, lo);
-+			if ((priv->phy[1] == TLAN_PHY_NONE)
-+			    && (phy != TLAN_PHY_MAX_ADDR)) {
-+				priv->phy[1] = phy;
-+			}
-+		}
-+	}
- 
--/*  3.	Clear AREGs and HASHs. */
-+	if (priv->phy[1] != TLAN_PHY_NONE) {
-+		priv->phyNum = 1;
-+	} else if (priv->phy[0] != TLAN_PHY_NONE) {
-+		priv->phyNum = 0;
-+	} else {
-+		printf
-+		    ("TLAN:  Cannot initialize device, no PHY was found!\n");
-+	}
-+
-+}				/* TLan_PhyDetect */
- 
-- 	for ( i = TLAN_AREG_0; i <= TLAN_HASH_2; i += 4 ) {
--		TLan_DioWrite32( dev->base_addr, (u16) i, 0 );
-+void TLan_PhyPowerDown(struct nic *nic)
-+{
-+
-+	u16 value;
-+	printf("%s: Powering down PHY(s).\n", priv->nic_name);
-+	value = MII_GC_PDOWN | MII_GC_LOOPBK | MII_GC_ISOLATE;
-+	TLan_MiiSync(BASE);
-+	TLan_MiiWriteReg(nic, priv->phy[priv->phyNum], MII_GEN_CTL, value);
-+	if ((priv->phyNum == 0) && (priv->phy[1] != TLAN_PHY_NONE)
-+	    &&
-+	    (!(tlan_pci_tbl[chip_idx].
-+	       flags & TLAN_ADAPTER_USE_INTERN_10))) {
-+		TLan_MiiSync(BASE);
-+		TLan_MiiWriteReg(nic, priv->phy[1], MII_GEN_CTL, value);
- 	}
- 
--/*  4.	Setup NetConfig register. */
-+	/* Wait for 50 ms and powerup
-+	 * This is abitrary.  It is intended to make sure the
-+	 * tranceiver settles.
-+	 */
-+	/* TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_PUP ); */
-+	mdelay(50);
-+	TLan_PhyPowerUp(nic);
- 
--	data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN | TLAN_NET_CFG_PHY_EN;
--	TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
-+}				/* TLan_PhyPowerDown */
- 
--/*  5.	Load Ld_Tmr and Ld_Thr in HOST_CMD. */
- 
-- 	outl( TLAN_HC_LD_TMR | 0x3f, dev->base_addr + TLAN_HOST_CMD );
-- 	outl( TLAN_HC_LD_THR | 0x9, dev->base_addr + TLAN_HOST_CMD );
-+void TLan_PhyPowerUp(struct nic *nic)
-+{
-+	u16 value;
- 
--/*  6.	Unreset the MII by setting NMRST (in NetSio) to 1. */
-+	printf("%s: Powering up PHY.\n", priv->nic_name);
-+	TLan_MiiSync(BASE);
-+	value = MII_GC_LOOPBK;
-+	TLan_MiiWriteReg(nic, priv->phy[priv->phyNum], MII_GEN_CTL, value);
-+	TLan_MiiSync(BASE);
-+	/* Wait for 500 ms and reset the
-+	 * tranceiver.  The TLAN docs say both 50 ms and
-+	 * 500 ms, so do the longer, just in case.
-+	 */
-+	mdelay(500);
-+	TLan_PhyReset(nic);
-+	/* TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_RESET ); */
- 
--	outw( TLAN_NET_SIO, dev->base_addr + TLAN_DIO_ADR );
--	addr = dev->base_addr + TLAN_DIO_DATA + TLAN_NET_SIO;
--	TLan_SetBit( TLAN_NET_SIO_NMRST, addr );
-+}				/* TLan_PhyPowerUp */
- 
--/*  7.	Setup the remaining registers. */
-+void TLan_PhyReset(struct nic *nic)
-+{
-+	u16 phy;
-+	u16 value;
- 
--	if ( priv->tlanRev >= 0x30 ) {
--		data8 = TLAN_ID_TX_EOC | TLAN_ID_RX_EOC;
--		TLan_DioWrite8( dev->base_addr, TLAN_INT_DIS, data8 );
-+	phy = priv->phy[priv->phyNum];
-+
-+	printf("%s: Reseting PHY.\n", priv->nic_name);
-+	TLan_MiiSync(BASE);
-+	value = MII_GC_LOOPBK | MII_GC_RESET;
-+	TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, value);
-+	TLan_MiiReadReg(nic, phy, MII_GEN_CTL, &value);
-+	while (value & MII_GC_RESET) {
-+		TLan_MiiReadReg(nic, phy, MII_GEN_CTL, &value);
- 	}
--	TLan_PhyDetect( dev );
--	data = TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN;
--	
--	if ( priv->adapter->flags & TLAN_ADAPTER_BIT_RATE_PHY ) {
--		data |= TLAN_NET_CFG_BIT;
--		if ( priv->aui == 1 ) {
--			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x0a );
--		} else if ( priv->duplex == TLAN_DUPLEX_FULL ) {
--			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x00 );
-+
-+	/* Wait for 500 ms and initialize.
-+	 * I don't remember why I wait this long.
-+	 * I've changed this to 50ms, as it seems long enough.
-+	 */
-+	/* TLan_SetTimer( dev, (HZ/20), TLAN_TIMER_PHY_START_LINK ); */
-+	mdelay(50);
-+	TLan_PhyStartLink(nic);
-+
-+}				/* TLan_PhyReset */
-+
-+
-+void TLan_PhyStartLink(struct nic *nic)
-+{
-+
-+	u16 ability;
-+	u16 control;
-+	u16 data;
-+	u16 phy;
-+	u16 status;
-+	u16 tctl;
-+
-+	phy = priv->phy[priv->phyNum];
-+	printf("%s: Trying to activate link.\n", priv->nic_name);
-+	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
-+	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &ability);
-+
-+	if ((status & MII_GS_AUTONEG) && (!priv->aui)) {
-+		ability = status >> 11;
-+		if (priv->speed == TLAN_SPEED_10 &&
-+		    priv->duplex == TLAN_DUPLEX_HALF) {
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x0000);
-+		} else if (priv->speed == TLAN_SPEED_10 &&
-+			   priv->duplex == TLAN_DUPLEX_FULL) {
-+			priv->tlanFullDuplex = TRUE;
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x0100);
-+		} else if (priv->speed == TLAN_SPEED_100 &&
-+			   priv->duplex == TLAN_DUPLEX_HALF) {
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x2000);
-+		} else if (priv->speed == TLAN_SPEED_100 &&
-+			   priv->duplex == TLAN_DUPLEX_FULL) {
- 			priv->tlanFullDuplex = TRUE;
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x2100);
- 		} else {
--			TLan_DioWrite8( dev->base_addr, TLAN_ACOMMIT, 0x08 );
-+
-+			/* Set Auto-Neg advertisement */
-+			TLan_MiiWriteReg(nic, phy, MII_AN_ADV,
-+					 (ability << 5) | 1);
-+			/* Enablee Auto-Neg */
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x1000);
-+			/* Restart Auto-Neg */
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, 0x1200);
-+			/* Wait for 4 sec for autonegotiation
-+			 * to complete.  The max spec time is less than this
-+			 * but the card need additional time to start AN.
-+			 * .5 sec should be plenty extra.
-+			 */
-+			printf("TLAN: %s: Starting autonegotiation.\n",
-+			       priv->nic_name);
-+			mdelay(4000);
-+			TLan_PhyFinishAutoNeg(nic);
-+			/* TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_PHY_FINISH_AN ); */
-+			return;
- 		}
--	}
- 
--	if ( priv->phyNum == 0 ) {
--		data |= TLAN_NET_CFG_PHY_EN;
- 	}
--	TLan_DioWrite16( dev->base_addr, TLAN_NET_CONFIG, (u16) data );
- 
--	if ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) {
--		TLan_FinishReset( dev );
--	} else {
--		TLan_PhyPowerDown( dev );
-+	if ((priv->aui) && (priv->phyNum != 0)) {
-+		priv->phyNum = 0;
-+		data =
-+		    TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN |
-+		    TLAN_NET_CFG_PHY_EN;
-+		TLan_DioWrite16(BASE, TLAN_NET_CONFIG, data);
-+		mdelay(50);
-+		/* TLan_SetTimer( dev, (40*HZ/1000), TLAN_TIMER_PHY_PDOWN ); */
-+		TLan_PhyPowerDown(nic);
-+		return;
-+	} else if (priv->phyNum == 0) {
-+		control = 0;
-+		TLan_MiiReadReg(nic, phy, TLAN_TLPHY_CTL, &tctl);
-+		if (priv->aui) {
-+			tctl |= TLAN_TC_AUISEL;
-+		} else {
-+			tctl &= ~TLAN_TC_AUISEL;
-+			if (priv->duplex == TLAN_DUPLEX_FULL) {
-+				control |= MII_GC_DUPLEX;
-+				priv->tlanFullDuplex = TRUE;
-+			}
-+			if (priv->speed == TLAN_SPEED_100) {
-+				control |= MII_GC_SPEEDSEL;
-+			}
-+		}
-+		TLan_MiiWriteReg(nic, phy, MII_GEN_CTL, control);
-+		TLan_MiiWriteReg(nic, phy, TLAN_TLPHY_CTL, tctl);
- 	}
- 
--} /* TLan_ResetAdapter */
-+	/* Wait for 2 sec to give the tranceiver time
-+	 * to establish link.
-+	 */
-+	/* TLan_SetTimer( dev, (4*HZ), TLAN_TIMER_FINISH_RESET ); */
-+	mdelay(2000);
-+	TLan_FinishReset(nic);
-+
-+}				/* TLan_PhyStartLink */
- 
--void
--TLan_FinishReset( struct net_device *dev )
-+void TLan_PhyFinishAutoNeg(struct nic *nic)
- {
--	TLanPrivateInfo	*priv = dev->priv;
--	u8		data;
--	u32		phy;
--	u8		sio;
--	u16		status;
--	u16		partner;
--	u16		tlphy_ctl;
--	u16 		tlphy_par;
--	u16		tlphy_id1, tlphy_id2;
--	int 		i;
-+
-+	u16 an_adv;
-+	u16 an_lpa;
-+	u16 data;
-+	u16 mode;
-+	u16 phy;
-+	u16 status;
- 
- 	phy = priv->phy[priv->phyNum];
- 
--	data = TLAN_NET_CMD_NRESET | TLAN_NET_CMD_NWRAP;
--	if ( priv->tlanFullDuplex ) {
--		data |= TLAN_NET_CMD_DUPLEX;
-+	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
-+	udelay(1000);
-+	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &status);
-+
-+	if (!(status & MII_GS_AUTOCMPLT)) {
-+		/* Wait for 8 sec to give the process
-+		 * more time.  Perhaps we should fail after a while.
-+		 */
-+		if (!priv->neg_be_verbose++) {
-+			printf
-+			    ("TLAN:  Giving autonegotiation more time.\n");
-+			printf
-+			    ("TLAN:  Please check that your adapter has\n");
-+			printf
-+			    ("TLAN:  been properly connected to a HUB or Switch.\n");
-+			printf
-+			    ("TLAN:  Trying to establish link in the background...\n");
-+		}
-+		mdelay(8000);
-+		TLan_PhyFinishAutoNeg(nic);
-+		/* TLan_SetTimer( dev, (8*HZ), TLAN_TIMER_PHY_FINISH_AN ); */
-+		return;
- 	}
--	TLan_DioWrite8( dev->base_addr, TLAN_NET_CMD, data );
--	data = TLAN_NET_MASK_MASK4 | TLAN_NET_MASK_MASK5; 
--	if ( priv->phyNum == 0 ) {
--		data |= TLAN_NET_MASK_MASK7; 
--	}
--	TLan_DioWrite8( dev->base_addr, TLAN_NET_MASK, data );
--	TLan_DioWrite16( dev->base_addr, TLAN_MAX_RX, ((1536)+7)&~7 );
--	TLan_MiiReadReg( dev, phy, MII_GEN_ID_HI, &tlphy_id1 );
--	TLan_MiiReadReg( dev, phy, MII_GEN_ID_LO, &tlphy_id2 );
--	
--	if ( ( priv->adapter->flags & TLAN_ADAPTER_UNMANAGED_PHY ) || ( priv->aui ) ) {
--		status = MII_GS_LINK;
--		printk( "TLAN:  %s: Link forced.\n", dev->name );
--	} else {
--		TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
--		udelay( 1000 );
--		TLan_MiiReadReg( dev, phy, MII_GEN_STS, &status );
--		if ( (status & MII_GS_LINK) &&	 /* We only support link info on Nat.Sem. PHY's */ 
--			(tlphy_id1 == NAT_SEM_ID1) &&
--			(tlphy_id2 == NAT_SEM_ID2) ) {
--			TLan_MiiReadReg( dev, phy, MII_AN_LPA, &partner );
--			TLan_MiiReadReg( dev, phy, TLAN_TLPHY_PAR, &tlphy_par );
--			
--			printk( "TLAN: %s: Link active with ", dev->name );
--			if (!(tlphy_par & TLAN_PHY_AN_EN_STAT)) {
--			      	 printk( "forced 10%sMbps %s-Duplex\n", 
--						tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
--						tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
--			} else {
--				printk( "AutoNegotiation enabled, at 10%sMbps %s-Duplex\n",
--						tlphy_par & TLAN_PHY_SPEED_100 ? "" : "0",
--						tlphy_par & TLAN_PHY_DUPLEX_FULL ? "Full" : "Half");
--				printk("TLAN: Partner capability: ");
--					for (i = 5; i <= 10; i++)
--						if (partner & (1<<i))
--							printk("%s", media[i-5]);
--							printk("\n");
--			}
- 
--			TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
--#ifdef MONITOR			
--			/* We have link beat..for now anyway */
--	        	priv->link = 1;
--	        	/*Enabling link beat monitoring */
--			TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_LINK_BEAT );
--#endif 
--		} else if (status & MII_GS_LINK)  {
--			printk( "TLAN: %s: Link active\n", dev->name );
--			TLan_DioWrite8( dev->base_addr, TLAN_LED_REG, TLAN_LED_LINK );
--		}
-+	printf("TLAN: %s: Autonegotiation complete.\n", priv->nic_name);
-+	TLan_MiiReadReg(nic, phy, MII_AN_ADV, &an_adv);
-+	TLan_MiiReadReg(nic, phy, MII_AN_LPA, &an_lpa);
-+	mode = an_adv & an_lpa & 0x03E0;
-+	if (mode & 0x0100) {
-+		printf("Full Duplex\n");
-+		priv->tlanFullDuplex = TRUE;
-+	} else if (!(mode & 0x0080) && (mode & 0x0040)) {
-+		priv->tlanFullDuplex = TRUE;
-+		printf("Full Duplex\n");
- 	}
- 
--	if ( priv->phyNum == 0 ) {
--        	TLan_MiiReadReg( dev, phy, TLAN_TLPHY_CTL, &tlphy_ctl );
--        	tlphy_ctl |= TLAN_TC_INTEN;
--        	TLan_MiiWriteReg( dev, phy, TLAN_TLPHY_CTL, tlphy_ctl );
--        	sio = TLan_DioRead8( dev->base_addr, TLAN_NET_SIO );
--        	sio |= TLAN_NET_SIO_MINTEN;
--        	TLan_DioWrite8( dev->base_addr, TLAN_NET_SIO, sio );
-+	if ((!(mode & 0x0180))
-+	    && (tlan_pci_tbl[chip_idx].flags & TLAN_ADAPTER_USE_INTERN_10)
-+	    && (priv->phyNum != 0)) {
-+		priv->phyNum = 0;
-+		data =
-+		    TLAN_NET_CFG_1FRAG | TLAN_NET_CFG_1CHAN |
-+		    TLAN_NET_CFG_PHY_EN;
-+		TLan_DioWrite16(BASE, TLAN_NET_CONFIG, data);
-+		/* TLan_SetTimer( nic, (400*HZ/1000), TLAN_TIMER_PHY_PDOWN ); */
-+		mdelay(400);
-+		TLan_PhyPowerDown(nic);
-+		return;
- 	}
- 
--	if ( status & MII_GS_LINK ) {
--		TLan_SetMac( dev, 0, dev->dev_addr );
--		priv->phyOnline = 1;
--		outb( ( TLAN_HC_INT_ON >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
--		if ( debug >= 1 && debug != TLAN_DEBUG_PROBE ) {
--			outb( ( TLAN_HC_REQ_INT >> 8 ), dev->base_addr + TLAN_HOST_CMD + 1 );
-+	if (priv->phyNum == 0) {
-+		if ((priv->duplex == TLAN_DUPLEX_FULL)
-+		    || (an_adv & an_lpa & 0x0040)) {
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL,
-+					 MII_GC_AUTOENB | MII_GC_DUPLEX);
-+			printf
-+			    ("TLAN:  Starting internal PHY with FULL-DUPLEX\n");
-+		} else {
-+			TLan_MiiWriteReg(nic, phy, MII_GEN_CTL,
-+					 MII_GC_AUTOENB);
-+			printf
-+			    ("TLAN:  Starting internal PHY with HALF-DUPLEX\n");
- 		}
--		outl( virt_to_bus( priv->rxList ), dev->base_addr + TLAN_CH_PARM );
--		outl( TLAN_HC_GO | TLAN_HC_RT, dev->base_addr + TLAN_HOST_CMD );
--	} else {
--		printk( "TLAN: %s: Link inactive, will retry in 10 secs...\n", dev->name );
--		TLan_SetTimer( dev, (10*HZ), TLAN_TIMER_FINISH_RESET );
--		return;
- 	}
- 
--} /* TLan_FinishReset */
-+	/* Wait for 100 ms.  No reason in partiticular.
-+	 */
-+	/* TLan_SetTimer( dev, (HZ/10), TLAN_TIMER_FINISH_RESET ); */
-+	mdelay(100);
-+	TLan_FinishReset(nic);
- 
--	/***************************************************************
--	 *	TLan_SetMac
--	 *
--	 *	Returns:
--	 *		Nothing
--	 *	Parms:
--	 *		dev	Pointer to device structure of adapter
--	 *			on which to change the AREG.
--	 *		areg	The AREG to set the address in (0 - 3).
--	 *		mac	A pointer to an array of chars.  Each
--	 *			element stores one byte of the address.
--	 *			IE, it isn't in ascii.
--	 *
--	 *	This function transfers a MAC address to one of the
--	 *	TLAN AREGs (address registers).  The TLAN chip locks
--	 *	the register on writing to offset 0 and unlocks the
--	 *	register after writing to offset 5.  If NULL is passed
--	 *	in mac, then the AREG is filled with 0's.
--	 *
--	 **************************************************************/
-+}				/* TLan_PhyFinishAutoNeg */
-+
-+#ifdef MONITOR
-+
-+	/*********************************************************************
-+        *
-+        *      TLan_phyMonitor
-+        *
-+        *      Returns:
-+        *              None
-+        *
-+        *      Params:
-+        *              dev             The device structure of this device.
-+        *
-+        *
-+        *      This function monitors PHY condition by reading the status
-+        *      register via the MII bus. This can be used to give info
-+        *      about link changes (up/down), and possible switch to alternate
-+        *      media.
-+        *
-+        * ******************************************************************/
- 
--void TLan_SetMac( struct net_device *dev, int areg, char *mac )
-+void TLan_PhyMonitor(struct net_device *dev)
- {
--	int i;
--			
--	areg *= 6;
-+	TLanPrivateInfo *priv = dev->priv;
-+	u16 phy;
-+	u16 phy_status;
- 
--	if ( mac != NULL ) {
--		for ( i = 0; i < 6; i++ )
--			TLan_DioWrite8( dev->base_addr, TLAN_AREG_0 + areg + i, mac[i] );
--	} else {
--		for ( i = 0; i < 6; i++ )
--			TLan_DioWrite8( dev->base_addr, TLAN_AREG_0 + areg + i, 0 );
-+	phy = priv->phy[priv->phyNum];
-+
-+	/* Get PHY status register */
-+	TLan_MiiReadReg(nic, phy, MII_GEN_STS, &phy_status);
-+
-+	/* Check if link has been lost */
-+	if (!(phy_status & MII_GS_LINK)) {
-+		if (priv->link) {
-+			priv->link = 0;
-+			printf("TLAN: %s has lost link\n", priv->nic_name);
-+			priv->flags &= ~IFF_RUNNING;
-+			mdelay(2000);
-+			TLan_PhyMonitor(nic);
-+			/* TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT ); */
-+			return;
-+		}
- 	}
- 
--} /* TLan_SetMac */
-+	/* Link restablished? */
-+	if ((phy_status & MII_GS_LINK) && !priv->link) {
-+		priv->link = 1;
-+		printf("TLAN: %s has reestablished link\n",
-+		       priv->nic_name);
-+		priv->flags |= IFF_RUNNING;
-+	}
-+
-+	/* Setup a new monitor */
-+	/* TLan_SetTimer( dev, (2*HZ), TLAN_TIMER_LINK_BEAT ); */
-+	mdelay(2000);
-+	TLan_PhyMonitor(nic);
-+}
- 
-+#endif				/* MONITOR */
-+
-+#ifdef EB51
-+static struct pci_id tlan_nics[] = {
-+	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP"),
-+	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP"),
-+	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P"),
-+	PCI_ROM(0x0e11, 0xf130, "thunder", "Compaq NetFlex-3/P"),
-+	PCI_ROM(0x0e11, 0xf150, "netflex3b", "Compaq NetFlex-3/P"),
-+	PCI_ROM(0x0e11, 0xae43, "netel100pi", "Compaq Netelligent Integrated 10/100 TX UTP"),
-+	PCI_ROM(0x0e11, 0xae40, "netel100d", "Compaq Netelligent Dual 10/100 TX PCI UTP"),
-+	PCI_ROM(0x0e11, 0xb011, "netel100i", "Compaq Netelligent 10/100 TX Embedded UTP"),
-+	PCI_ROM(0x108d, 0x0013, "oc2183", "Olicom OC-2183/2185"),
-+	PCI_ROM(0x108d, 0x0012, "oc2325", "Olicom OC-2325"),
-+	PCI_ROM(0x108d, 0x0014, "oc2326", "Olicom OC-2326"),
-+	PCI_ROM(0x0e11, 0xb030, "netelligent_10_100_ws_5100", "Compaq Netelligent 10/100 TX UTP"),
-+	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax"),
-+};
-+
-+struct pci_driver tlan_driver = {
-+	.type = NIC_DRIVER,
-+	.name = "TLAN/PCI",
-+	.probe = tlan_probe,
-+	.ids = tlan_nics,
-+	.id_count = sizeof(tlan_nics) / sizeof(tlan_nics[0]),
-+	.class = 0,
-+};
- #endif
-Index: b/netboot/tlan.h
-===================================================================
---- /dev/null
-+++ b/netboot/tlan.h
-@@ -0,0 +1,536 @@
-+/**************************************************************************
-+*
-+*    tlan.c -- Etherboot device driver for the Texas Instruments ThunderLAN
-+*    Written 2003-2003 by Timothy Legge <tlegge@rogers.com>
-+*
-+*    This program is free software; you can redistribute it and/or modify
-+*    it under the terms of the GNU General Public License as published by
-+*    the Free Software Foundation; either version 2 of the License, or
-+*    (at your option) any later version.
-+*
-+*    This program is distributed in the hope that it will be useful,
-+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+*    GNU General Public License for more details.
-+*
-+*    You should have received a copy of the GNU General Public License
-+*    along with this program; if not, write to the Free Software
-+*    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*
-+*    Portions of this code (almost all) based on:
-+*               tlan.c: Linux ThunderLan Driver:
-+*
-+*				by James Banks
-+*
-+*  				(C) 1997-1998 Caldera, Inc.
-+*			  	(C) 1998 James Banks
-+*				(C) 1999-2001 Torben Mathiasen
-+*				(C) 2002 Samuel Chessman
-+*
-+*    REVISION HISTORY:
-+*    ================
-+*    v1.0	07-08-2003	timlegge	Initial not quite working version
-+*
-+* Indent Style: indent -kr -i8
-+***************************************************************************/
-+
-+/*
-+#include <asm/io.h>
-+#include <asm/types.h>
-+#include <linux/netdevice.h>
-+*/
-+
-+typedef unsigned char u8;
-+typedef signed char s8;
-+typedef unsigned short u16;
-+typedef signed short s16;
-+typedef unsigned int u32;
-+typedef signed int s32;
-+	/*****************************************************************
-+	 * TLan Definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define FALSE			0
-+#define TRUE			1
-+
-+#define TLAN_MIN_FRAME_SIZE	64
-+#define TLAN_MAX_FRAME_SIZE	1600
-+
-+#define TLAN_NUM_RX_LISTS	4
-+#define TLAN_NUM_TX_LISTS	2
-+
-+#define TLAN_IGNORE		0
-+#define TLAN_RECORD		1
-+/*
-+#define TLAN_DBG(lvl, format, args...)	if (debug&lvl) printf("TLAN: " format, ##args );
-+*/
-+#define TLAN_DEBUG_GNRL		0x0001
-+#define TLAN_DEBUG_TX		0x0002
-+#define TLAN_DEBUG_RX		0x0004
-+#define TLAN_DEBUG_LIST		0x0008
-+#define TLAN_DEBUG_PROBE	0x0010
-+
-+#define TX_TIMEOUT		(10*HZ)	/* We need time for auto-neg */
-+#define MAX_TLAN_BOARDS		8	/* Max number of boards installed at a time */
-+
-+
-+	/*****************************************************************
-+	 * Device Identification Definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define PCI_DEVICE_ID_NETELLIGENT_10_T2			0xB012
-+#define PCI_DEVICE_ID_NETELLIGENT_10_100_WS_5100	0xB030
-+#ifndef PCI_DEVICE_ID_OLICOM_OC2183
-+#define PCI_DEVICE_ID_OLICOM_OC2183			0x0013
-+#endif
-+#ifndef PCI_DEVICE_ID_OLICOM_OC2325
-+#define PCI_DEVICE_ID_OLICOM_OC2325			0x0012
-+#endif
-+#ifndef PCI_DEVICE_ID_OLICOM_OC2326
-+#define PCI_DEVICE_ID_OLICOM_OC2326			0x0014
-+#endif
-+
-+typedef struct tlan_adapter_entry {
-+	u16 vendorId;
-+	u16 deviceId;
-+	char *deviceLabel;
-+	u32 flags;
-+	u16 addrOfs;
-+} TLanAdapterEntry;
-+
-+#define TLAN_ADAPTER_NONE		0x00000000
-+#define TLAN_ADAPTER_UNMANAGED_PHY	0x00000001
-+#define TLAN_ADAPTER_BIT_RATE_PHY	0x00000002
-+#define TLAN_ADAPTER_USE_INTERN_10	0x00000004
-+#define TLAN_ADAPTER_ACTIVITY_LED	0x00000008
-+
-+#define TLAN_SPEED_DEFAULT	0
-+#define TLAN_SPEED_10		10
-+#define TLAN_SPEED_100		100
-+
-+#define TLAN_DUPLEX_DEFAULT	0
-+#define TLAN_DUPLEX_HALF	1
-+#define TLAN_DUPLEX_FULL	2
-+
-+
-+
-+	/*****************************************************************
-+	 * EISA Definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define EISA_ID      0xc80	/* EISA ID Registers */
-+#define EISA_ID0     0xc80	/* EISA ID Register 0 */
-+#define EISA_ID1     0xc81	/* EISA ID Register 1 */
-+#define EISA_ID2     0xc82	/* EISA ID Register 2 */
-+#define EISA_ID3     0xc83	/* EISA ID Register 3 */
-+#define EISA_CR      0xc84	/* EISA Control Register */
-+#define EISA_REG0    0xc88	/* EISA Configuration Register 0 */
-+#define EISA_REG1    0xc89	/* EISA Configuration Register 1 */
-+#define EISA_REG2    0xc8a	/* EISA Configuration Register 2 */
-+#define EISA_REG3    0xc8f	/* EISA Configuration Register 3 */
-+#define EISA_APROM   0xc90	/* Ethernet Address PROM */
-+
-+
-+
-+	/*****************************************************************
-+	 * Rx/Tx List Definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define TLAN_BUFFERS_PER_LIST	10
-+#define TLAN_LAST_BUFFER	0x80000000
-+#define TLAN_CSTAT_UNUSED	0x8000
-+#define TLAN_CSTAT_FRM_CMP	0x4000
-+#define TLAN_CSTAT_READY	0x3000
-+#define TLAN_CSTAT_EOC		0x0800
-+#define TLAN_CSTAT_RX_ERROR	0x0400
-+#define TLAN_CSTAT_PASS_CRC	0x0200
-+#define TLAN_CSTAT_DP_PR	0x0100
-+
-+
-+
-+
-+
-+
-+	/*****************************************************************
-+	 * PHY definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define TLAN_PHY_MAX_ADDR	0x1F
-+#define TLAN_PHY_NONE		0x20
-+
-+
-+
-+	/*****************************************************************
-+	 * TLan Driver Timer Definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define TLAN_TIMER_LINK_BEAT		1
-+#define TLAN_TIMER_ACTIVITY		2
-+#define TLAN_TIMER_PHY_PDOWN		3
-+#define TLAN_TIMER_PHY_PUP		4
-+#define TLAN_TIMER_PHY_RESET		5
-+#define TLAN_TIMER_PHY_START_LINK	6
-+#define TLAN_TIMER_PHY_FINISH_AN	7
-+#define TLAN_TIMER_FINISH_RESET		8
-+
-+#define TLAN_TIMER_ACT_DELAY		(HZ/10)
-+
-+
-+
-+
-+	/*****************************************************************
-+	 * TLan Driver Eeprom Definitions
-+	 *
-+	 ****************************************************************/
-+
-+#define TLAN_EEPROM_ACK		0
-+#define TLAN_EEPROM_STOP	1
-+
-+
-+
-+
-+	/*****************************************************************
-+	 * Host Register Offsets and Contents
-+	 *
-+	 ****************************************************************/
-+
-+#define TLAN_HOST_CMD			0x00
-+#define 	TLAN_HC_GO		0x80000000
-+#define		TLAN_HC_STOP		0x40000000
-+#define		TLAN_HC_ACK		0x20000000
-+#define		TLAN_HC_CS_MASK		0x1FE00000
-+#define		TLAN_HC_EOC		0x00100000
-+#define		TLAN_HC_RT		0x00080000
-+#define		TLAN_HC_NES		0x00040000
-+#define		TLAN_HC_AD_RST		0x00008000
-+#define		TLAN_HC_LD_TMR		0x00004000
-+#define		TLAN_HC_LD_THR		0x00002000
-+#define		TLAN_HC_REQ_INT		0x00001000
-+#define		TLAN_HC_INT_OFF		0x00000800
-+#define		TLAN_HC_INT_ON		0x00000400
-+#define		TLAN_HC_AC_MASK		0x000000FF
-+#define TLAN_CH_PARM			0x04
-+#define TLAN_DIO_ADR			0x08
-+#define		TLAN_DA_ADR_INC		0x8000
-+#define		TLAN_DA_RAM_ADR		0x4000
-+#define TLAN_HOST_INT			0x0A
-+#define		TLAN_HI_IV_MASK		0x1FE0
-+#define		TLAN_HI_IT_MASK		0x001C
-+#define TLAN_DIO_DATA			0x0C
-+
-+
-+/* ThunderLAN Internal Register DIO Offsets */
-+
-+#define TLAN_NET_CMD			0x00
-+#define		TLAN_NET_CMD_NRESET	0x80
-+#define		TLAN_NET_CMD_NWRAP	0x40
-+#define		TLAN_NET_CMD_CSF	0x20
-+#define		TLAN_NET_CMD_CAF	0x10
-+#define		TLAN_NET_CMD_NOBRX	0x08
-+#define		TLAN_NET_CMD_DUPLEX	0x04
-+#define		TLAN_NET_CMD_TRFRAM	0x02
-+#define		TLAN_NET_CMD_TXPACE	0x01
-+#define TLAN_NET_SIO			0x01
-+#define 	TLAN_NET_SIO_MINTEN	0x80
-+#define		TLAN_NET_SIO_ECLOK	0x40
-+#define		TLAN_NET_SIO_ETXEN	0x20
-+#define		TLAN_NET_SIO_EDATA	0x10
-+#define		TLAN_NET_SIO_NMRST	0x08
-+#define		TLAN_NET_SIO_MCLK	0x04
-+#define		TLAN_NET_SIO_MTXEN	0x02
-+#define		TLAN_NET_SIO_MDATA	0x01
-+#define TLAN_NET_STS			0x02
-+#define		TLAN_NET_STS_MIRQ	0x80
-+#define		TLAN_NET_STS_HBEAT	0x40
-+#define		TLAN_NET_STS_TXSTOP	0x20
-+#define		TLAN_NET_STS_RXSTOP	0x10
-+#define		TLAN_NET_STS_RSRVD	0x0F
-+#define TLAN_NET_MASK			0x03
-+#define		TLAN_NET_MASK_MASK7	0x80
-+#define		TLAN_NET_MASK_MASK6	0x40
-+#define		TLAN_NET_MASK_MASK5	0x20
-+#define		TLAN_NET_MASK_MASK4	0x10
-+#define		TLAN_NET_MASK_RSRVD	0x0F
-+#define TLAN_NET_CONFIG			0x04
-+#define 	TLAN_NET_CFG_RCLK	0x8000
-+#define		TLAN_NET_CFG_TCLK	0x4000
-+#define		TLAN_NET_CFG_BIT	0x2000
-+#define		TLAN_NET_CFG_RXCRC	0x1000
-+#define		TLAN_NET_CFG_PEF	0x0800
-+#define		TLAN_NET_CFG_1FRAG	0x0400
-+#define		TLAN_NET_CFG_1CHAN	0x0200
-+#define		TLAN_NET_CFG_MTEST	0x0100
-+#define		TLAN_NET_CFG_PHY_EN	0x0080
-+#define		TLAN_NET_CFG_MSMASK	0x007F
-+#define TLAN_MAN_TEST			0x06
-+#define TLAN_DEF_VENDOR_ID		0x08
-+#define TLAN_DEF_DEVICE_ID		0x0A
-+#define TLAN_DEF_REVISION		0x0C
-+#define TLAN_DEF_SUBCLASS		0x0D
-+#define TLAN_DEF_MIN_LAT		0x0E
-+#define TLAN_DEF_MAX_LAT		0x0F
-+#define TLAN_AREG_0			0x10
-+#define TLAN_AREG_1			0x16
-+#define TLAN_AREG_2			0x1C
-+#define TLAN_AREG_3			0x22
-+#define TLAN_HASH_1			0x28
-+#define TLAN_HASH_2			0x2C
-+#define TLAN_GOOD_TX_FRMS		0x30
-+#define TLAN_TX_UNDERUNS		0x33
-+#define TLAN_GOOD_RX_FRMS		0x34
-+#define TLAN_RX_OVERRUNS		0x37
-+#define TLAN_DEFERRED_TX		0x38
-+#define TLAN_CRC_ERRORS			0x3A
-+#define TLAN_CODE_ERRORS		0x3B
-+#define TLAN_MULTICOL_FRMS		0x3C
-+#define TLAN_SINGLECOL_FRMS		0x3E
-+#define TLAN_EXCESSCOL_FRMS		0x40
-+#define TLAN_LATE_COLS			0x41
-+#define TLAN_CARRIER_LOSS		0x42
-+#define TLAN_ACOMMIT			0x43
-+#define TLAN_LED_REG			0x44
-+#define		TLAN_LED_ACT		0x10
-+#define		TLAN_LED_LINK		0x01
-+#define TLAN_BSIZE_REG			0x45
-+#define TLAN_MAX_RX			0x46
-+#define TLAN_INT_DIS			0x48
-+#define		TLAN_ID_TX_EOC		0x04
-+#define		TLAN_ID_RX_EOF		0x02
-+#define		TLAN_ID_RX_EOC		0x01
-+
-+
-+
-+/* ThunderLAN Interrupt Codes */
-+
-+#define TLAN_INT_NUMBER_OF_INTS	8
-+
-+#define TLAN_INT_NONE			0x0000
-+#define TLAN_INT_TX_EOF			0x0001
-+#define TLAN_INT_STAT_OVERFLOW		0x0002
-+#define TLAN_INT_RX_EOF			0x0003
-+#define TLAN_INT_DUMMY			0x0004
-+#define TLAN_INT_TX_EOC			0x0005
-+#define TLAN_INT_STATUS_CHECK		0x0006
-+#define TLAN_INT_RX_EOC			0x0007
-+
-+
-+
-+/* ThunderLAN MII Registers */
-+
-+/* Generic MII/PHY Registers */
-+
-+#define MII_GEN_CTL			0x00
-+#define 	MII_GC_RESET		0x8000
-+#define		MII_GC_LOOPBK		0x4000
-+#define		MII_GC_SPEEDSEL		0x2000
-+#define		MII_GC_AUTOENB		0x1000
-+#define		MII_GC_PDOWN		0x0800
-+#define		MII_GC_ISOLATE		0x0400
-+#define		MII_GC_AUTORSRT		0x0200
-+#define		MII_GC_DUPLEX		0x0100
-+#define		MII_GC_COLTEST		0x0080
-+#define		MII_GC_RESERVED		0x007F
-+#define MII_GEN_STS			0x01
-+#define		MII_GS_100BT4		0x8000
-+#define		MII_GS_100BTXFD		0x4000
-+#define		MII_GS_100BTXHD		0x2000
-+#define		MII_GS_10BTFD		0x1000
-+#define		MII_GS_10BTHD		0x0800
-+#define		MII_GS_RESERVED		0x07C0
-+#define		MII_GS_AUTOCMPLT	0x0020
-+#define		MII_GS_RFLT		0x0010
-+#define		MII_GS_AUTONEG		0x0008
-+#define		MII_GS_LINK		0x0004
-+#define		MII_GS_JABBER		0x0002
-+#define		MII_GS_EXTCAP		0x0001
-+#define MII_GEN_ID_HI			0x02
-+#define MII_GEN_ID_LO			0x03
-+#define 	MII_GIL_OUI		0xFC00
-+#define 	MII_GIL_MODEL		0x03F0
-+#define 	MII_GIL_REVISION	0x000F
-+#define MII_AN_ADV			0x04
-+#define MII_AN_LPA			0x05
-+#define MII_AN_EXP			0x06
-+
-+/* ThunderLAN Specific MII/PHY Registers */
-+
-+#define TLAN_TLPHY_ID			0x10
-+#define TLAN_TLPHY_CTL			0x11
-+#define 	TLAN_TC_IGLINK		0x8000
-+#define		TLAN_TC_SWAPOL		0x4000
-+#define		TLAN_TC_AUISEL		0x2000
-+#define		TLAN_TC_SQEEN		0x1000
-+#define		TLAN_TC_MTEST		0x0800
-+#define		TLAN_TC_RESERVED	0x07F8
-+#define		TLAN_TC_NFEW		0x0004
-+#define		TLAN_TC_INTEN		0x0002
-+#define		TLAN_TC_TINT		0x0001
-+#define TLAN_TLPHY_STS			0x12
-+#define		TLAN_TS_MINT		0x8000
-+#define		TLAN_TS_PHOK		0x4000
-+#define		TLAN_TS_POLOK		0x2000
-+#define		TLAN_TS_TPENERGY	0x1000
-+#define		TLAN_TS_RESERVED	0x0FFF
-+#define TLAN_TLPHY_PAR			0x19
-+#define		TLAN_PHY_CIM_STAT	0x0020
-+#define		TLAN_PHY_SPEED_100	0x0040
-+#define		TLAN_PHY_DUPLEX_FULL	0x0080
-+#define		TLAN_PHY_AN_EN_STAT     0x0400
-+
-+/* National Sem. & Level1 PHY id's */
-+#define NAT_SEM_ID1			0x2000
-+#define NAT_SEM_ID2			0x5C01
-+#define LEVEL1_ID1			0x7810
-+#define LEVEL1_ID2			0x0000
-+
-+#define CIRC_INC( a, b ) if ( ++a >= b ) a = 0
-+
-+/* Routines to access internal registers. */
-+
-+inline u8 TLan_DioRead8(u16 base_addr, u16 internal_addr)
-+{
-+	outw(internal_addr, base_addr + TLAN_DIO_ADR);
-+	return (inb((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x3)));
-+
-+}				/* TLan_DioRead8 */
-+
-+
-+
-+
-+inline u16 TLan_DioRead16(u16 base_addr, u16 internal_addr)
-+{
-+	outw(internal_addr, base_addr + TLAN_DIO_ADR);
-+	return (inw((base_addr + TLAN_DIO_DATA) + (internal_addr & 0x2)));
-+
-+}				/* TLan_DioRead16 */
-+
-+
-+
-+
-+inline u32 TLan_DioRead32(u16 base_addr, u16 internal_addr)
-+{
-+	outw(internal_addr, base_addr + TLAN_DIO_ADR);
-+	return (inl(base_addr + TLAN_DIO_DATA));
-+
-+}				/* TLan_DioRead32 */
-+
-+
-+
-+
-+inline void TLan_DioWrite8(u16 base_addr, u16 internal_addr, u8 data)
-+{
-+	outw(internal_addr, base_addr + TLAN_DIO_ADR);
-+	outb(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x3));
-+
-+}
-+
-+
-+
-+
-+inline void TLan_DioWrite16(u16 base_addr, u16 internal_addr, u16 data)
-+{
-+	outw(internal_addr, base_addr + TLAN_DIO_ADR);
-+	outw(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
-+
-+}
-+
-+
-+
-+
-+inline void TLan_DioWrite32(u16 base_addr, u16 internal_addr, u32 data)
-+{
-+	outw(internal_addr, base_addr + TLAN_DIO_ADR);
-+	outl(data, base_addr + TLAN_DIO_DATA + (internal_addr & 0x2));
-+
-+}
-+
-+
-+
-+#if 0
-+inline void TLan_ClearBit(u8 bit, u16 port)
-+{
-+	outb_p(inb_p(port) & ~bit, port);
-+}
-+
-+
-+
-+
-+inline int TLan_GetBit(u8 bit, u16 port)
-+{
-+	return ((int) (inb_p(port) & bit));
-+}
-+
-+
-+
-+
-+inline void TLan_SetBit(u8 bit, u16 port)
-+{
-+	outb_p(inb_p(port) | bit, port);
-+}
-+#endif
-+
-+#define TLan_ClearBit( bit, port )	outb_p(inb_p(port) & ~bit, port)
-+#define TLan_GetBit( bit, port )	((int) (inb_p(port) & bit))
-+#define TLan_SetBit( bit, port )	outb_p(inb_p(port) | bit, port)
-+
-+#ifdef I_LIKE_A_FAST_HASH_FUNCTION
-+/* given 6 bytes, view them as 8 6-bit numbers and return the XOR of those */
-+/* the code below is about seven times as fast as the original code */
-+inline u32 TLan_HashFunc(u8 * a)
-+{
-+	u8 hash;
-+
-+	hash = (a[0] ^ a[3]);	/* & 077 */
-+	hash ^= ((a[0] ^ a[3]) >> 6);	/* & 003 */
-+	hash ^= ((a[1] ^ a[4]) << 2);	/* & 074 */
-+	hash ^= ((a[1] ^ a[4]) >> 4);	/* & 017 */
-+	hash ^= ((a[2] ^ a[5]) << 4);	/* & 060 */
-+	hash ^= ((a[2] ^ a[5]) >> 2);	/* & 077 */
-+
-+	return (hash & 077);
-+}
-+
-+#else				/* original code */
-+
-+inline u32 xor(u32 a, u32 b)
-+{
-+	return ((a && !b) || (!a && b));
-+}
-+
-+#define XOR8( a, b, c, d, e, f, g, h )	xor( a, xor( b, xor( c, xor( d, xor( e, xor( f, xor( g, h ) ) ) ) ) ) )
-+#define DA( a, bit )					( ( (u8) a[bit/8] ) & ( (u8) ( 1 << bit%8 ) ) )
-+
-+inline u32 TLan_HashFunc(u8 * a)
-+{
-+	u32 hash;
-+
-+	hash =
-+	    XOR8(DA(a, 0), DA(a, 6), DA(a, 12), DA(a, 18), DA(a, 24),
-+		 DA(a, 30), DA(a, 36), DA(a, 42));
-+	hash |=
-+	    XOR8(DA(a, 1), DA(a, 7), DA(a, 13), DA(a, 19), DA(a, 25),
-+		 DA(a, 31), DA(a, 37), DA(a, 43)) << 1;
-+	hash |=
-+	    XOR8(DA(a, 2), DA(a, 8), DA(a, 14), DA(a, 20), DA(a, 26),
-+		 DA(a, 32), DA(a, 38), DA(a, 44)) << 2;
-+	hash |=
-+	    XOR8(DA(a, 3), DA(a, 9), DA(a, 15), DA(a, 21), DA(a, 27),
-+		 DA(a, 33), DA(a, 39), DA(a, 45)) << 3;
-+	hash |=
-+	    XOR8(DA(a, 4), DA(a, 10), DA(a, 16), DA(a, 22), DA(a, 28),
-+		 DA(a, 34), DA(a, 40), DA(a, 46)) << 4;
-+	hash |=
-+	    XOR8(DA(a, 5), DA(a, 11), DA(a, 17), DA(a, 23), DA(a, 29),
-+		 DA(a, 35), DA(a, 41), DA(a, 47)) << 5;
-+
-+	return hash;
-+
-+}
-+
-+#endif				/* I_LIKE_A_FAST_HASH_FUNCTION */
-Index: b/netboot/tulip.c
-===================================================================
---- a/netboot/tulip.c
-+++ b/netboot/tulip.c
-@@ -48,6 +48,7 @@
- /*********************************************************************/
- 
- /*
-+  07 Sep 2003  timlegge	Multicast Support Added
-   11 Apr 2001  mdc     [patch to etherboot 4.7.24]
-      Major rewrite to include Linux tulip driver media detection
-      code.  This driver should support a lot more cards now.
-@@ -98,7 +99,6 @@
-      and thinguin mailing lists.
- */
- 
--
- /*********************************************************************/
- /* Declarations                                                      */
- /*********************************************************************/
-@@ -106,31 +106,29 @@
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- 
- /* User settable parameters */
- 
--#undef   TULIP_DEBUG
--#undef   TULIP_DEBUG_WHERE
-+#undef	TULIP_DEBUG
-+#undef	TULIP_DEBUG_WHERE
-+#ifdef	TULIP_DEBUG
- static int tulip_debug = 2;             /* 1 normal messages, 0 quiet .. 7 verbose. */
-+#endif
- 
- #define TX_TIME_OUT       2*TICKS_PER_SEC
- 
--typedef unsigned char  u8;
--typedef   signed char  s8;
--typedef unsigned short u16;
--typedef   signed short s16;
--typedef unsigned int   u32;
--typedef   signed int   s32;
-+typedef uint8_t    u8;
-+typedef  int8_t    s8;
-+typedef uint16_t   u16;
-+typedef  int16_t   s16;
-+typedef uint32_t   u32;
-+typedef  int32_t   s32;
- 
- /* helpful macros if on a big_endian machine for changing byte order.
-    not strictly needed on Intel */
--#define le16_to_cpu(val) (val)
--#define cpu_to_le32(val) (val)
- #define get_unaligned(ptr) (*(ptr))
- #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
- #define get_u16(ptr) (*(u16 *)(ptr))
--#define virt_to_bus(x) ((unsigned long)x)
- #define virt_to_le32desc(addr)  virt_to_bus(addr)
- 
- #define TULIP_IOTYPE  PCI_USES_MASTER | PCI_USES_IO | PCI_ADDR0
-@@ -212,6 +210,8 @@
-       TULIP_IOTYPE, 256, PNIC2 },
-     { "ADMtek AN981 Comet", { 0x09811317, 0xffffffff, 0, 0, 0, 0 },
-       TULIP_IOTYPE, 256, COMET },
-+    { "ADMTek AN983 Comet", { 0x12161113, 0xffffffff, 0, 0, 0, 0 },
-+      TULIP_IOTYPE, 256, COMET },
-     { "ADMtek Centaur-P", { 0x09851317, 0xffffffff, 0, 0, 0, 0 },
-       TULIP_IOTYPE, 256, COMET },
-     { "ADMtek Centaur-C", { 0x19851317, 0xffffffff, 0, 0, 0, 0 },
-@@ -280,9 +280,13 @@
- static u16 t21041_csr14[] = { 0xFFFF, 0xF7FD, 0xF7FD, 0x7F3F, 0x7F3D, };
- static u16 t21041_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
- 
-+/* not used
- static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, };
-+*/
- static u16 t21142_csr14[] = { 0xFFFF, 0x0705, 0x0705, 0x0000, 0x7F3D, };
-+/* not used
- static u16 t21142_csr15[] = { 0x0008, 0x0006, 0x000E, 0x0008, 0x0008, };
-+*/
- 
- /* Offsets to the Command and Status Registers, "CSRs".  All accesses
-    must be longword instructions and quadword aligned. */
-@@ -300,6 +304,14 @@
-     TxFIFOUnderflow=0x20, TxJabber=0x08, TxNoBuf=0x04, TxDied=0x02, TxIntr=0x01,
- };
- 
-+/* The configuration bits in CSR6. */
-+enum csr6_mode_bits {
-+	TxOn=0x2000, RxOn=0x0002, FullDuplex=0x0200,
-+	AcceptBroadcast=0x0100, AcceptAllMulticast=0x0080,
-+	AcceptAllPhys=0x0040, AcceptRunt=0x0008,
-+};
-+
-+
- enum desc_status_bits {
-     DescOwnded=0x80000000, RxDescFatalErr=0x8000, RxWholePkt=0x0300,
- };
-@@ -384,21 +396,11 @@
- 
- #define TX_RING_SIZE	2
- static struct tulip_tx_desc tx_ring[TX_RING_SIZE] __attribute__ ((aligned(4)));
--
--#ifdef USE_LOWMEM_BUFFER
--#define txb ((char *)0x10000 - BUFLEN)
--#else
- static unsigned char txb[BUFLEN] __attribute__ ((aligned(4)));
--#endif
- 
- #define RX_RING_SIZE	4
- static struct tulip_rx_desc rx_ring[RX_RING_SIZE] __attribute__ ((aligned(4)));
--
--#ifdef USE_LOWMEM_BUFFER
--#define rxb ((char *)0x10000 - RX_RING_SIZE * BUFLEN - BUFLEN)
--#else
- static unsigned char rxb[RX_RING_SIZE * BUFLEN] __attribute__ ((aligned(4)));
--#endif
- 
- static struct tulip_private {
-     int cur_rx;
-@@ -471,7 +473,6 @@
- static const char * block_name[] = {"21140 non-MII", "21140 MII PHY",
-                                     "21142 Serial PHY", "21142 MII PHY", "21143 SYM PHY", "21143 reset method"};
- 
--
- /*********************************************************************/
- /* Function Prototypes                                               */
- /*********************************************************************/
-@@ -479,14 +480,13 @@
- static void mdio_write(struct nic *nic, int phy_id, int location, int value);
- static int read_eeprom(unsigned long ioaddr, int location, int addr_len);
- static void parse_eeprom(struct nic *nic);
--struct nic *tulip_probe(struct nic *nic, unsigned short *io_addrs,
--                        struct pci_device *pci);
-+static int tulip_probe(struct dev *dev, struct pci_device *pci);
- static void tulip_init_ring(struct nic *nic);
- static void tulip_reset(struct nic *nic);
- static void tulip_transmit(struct nic *nic, const char *d, unsigned int t,
-                            unsigned int s, const char *p);
--static int tulip_poll(struct nic *nic);
--static void tulip_disable(struct nic *nic);
-+static int tulip_poll(struct nic *nic, int retrieve);
-+static void tulip_disable(struct dev *dev);
- static void nway_start(struct nic *nic);
- static void pnic_do_nway(struct nic *nic);
- static void select_media(struct nic *nic, int startup);
-@@ -504,7 +504,6 @@
- static void tulip_more(void);
- #endif
- 
--
- /*********************************************************************/
- /* Utility Routines                                                  */
- /*********************************************************************/
-@@ -535,7 +534,6 @@
-         /* wait */ ;
- }
- 
--
- /*********************************************************************/
- /* Media Descriptor Code                                             */
- /*********************************************************************/
-@@ -565,7 +563,7 @@
-    MDIO protocol.  See the MII specifications or DP83840A data sheet
-    for details. */
- 
--int mdio_read(struct nic *nic, int phy_id, int location)
-+int mdio_read(struct nic *nic __unused, int phy_id, int location)
- {
-     int i;
-     int read_cmd = (0xf6 << 10) | (phy_id << 5) | location;
-@@ -626,7 +624,7 @@
-     return (retval>>1) & 0xffff;
- }
- 
--void mdio_write(struct nic *nic, int phy_id, int location, int value)
-+void mdio_write(struct nic *nic __unused, int phy_id, int location, int value)
- {
-     int i;
-     int cmd = (0x5002 << 16) | (phy_id << 23) | (location<<18) | value;
-@@ -682,7 +680,6 @@
-     }
- }
- 
--
- /*********************************************************************/
- /* EEPROM Reading Code                                               */
- /*********************************************************************/
-@@ -727,7 +724,6 @@
-     return retval;
- }
- 
--
- /*********************************************************************/
- /* EEPROM Parsing Code                                               */
- /*********************************************************************/
-@@ -895,11 +891,10 @@
-     }
- }
- 
--
- /*********************************************************************/
- /* tulip_init_ring - setup the tx and rx descriptors                */
- /*********************************************************************/
--static void tulip_init_ring(struct nic *nic)
-+static void tulip_init_ring(struct nic *nic __unused)
- {
-     int i;
- 
-@@ -935,7 +930,22 @@
-     /* Mark the last entry as wrapping the ring, though this should never happen */
-     tx_ring[1].length  = cpu_to_le32(DESC_RING_WRAP | BUFLEN);
- }
--
-+
-+static void set_rx_mode(struct nic *nic __unused) {
-+	int csr6 = inl(ioaddr + CSR6) & ~0x00D5;
-+
-+	tp->csr6 &= ~0x00D5;
-+ 
-+	/* !IFF_PROMISC */
-+	tp->csr6 |= AcceptAllMulticast;
-+	csr6 |= AcceptAllMulticast;
-+
-+	outl(csr6, ioaddr + CSR6);
-+
-+	
-+	
-+}
-+
- /*********************************************************************/
- /* eth_reset - Reset adapter                                         */
- /*********************************************************************/
-@@ -943,7 +953,6 @@
- {
-     int i;
-     unsigned long to;
--    u32 addr_low, addr_high;
- 
- #ifdef TULIP_DEBUG_WHERE
-     whereami("tulip_reset\n");
-@@ -956,7 +965,7 @@
-     if (tp->mii_cnt  ||  (tp->mtable  &&  tp->mtable->has_mii)) {
- 	outl(0x814C0000, ioaddr + CSR6);
-     }
--  
-+ 
-     /* Reset the chip, holding bit 0 set at least 50 PCI cycles. */
-     outl(0x00000001, ioaddr + CSR0);
-     tulip_wait(1);
-@@ -1022,8 +1031,8 @@
-     }
- 
-     /* Point to rx and tx descriptors */
--    outl((unsigned long)&rx_ring[0], ioaddr + CSR3);
--    outl((unsigned long)&tx_ring[0], ioaddr + CSR4);
-+    outl(virt_to_le32desc(&rx_ring[0]), ioaddr + CSR3);
-+    outl(virt_to_le32desc(&tx_ring[0]), ioaddr + CSR4);
- 
-     init_media(nic);
- 
-@@ -1049,11 +1058,12 @@
-     if (tp->chip_id == LC82C168)
- 	tulip_check_duplex(nic);
- 
-+    set_rx_mode(nic); 	
-+        
-     /* enable transmit and receive */
-     outl(tp->csr6 | 0x00002002, ioaddr + CSR6);
- }
- 
--
- /*********************************************************************/
- /* eth_transmit - Transmit a frame                                   */
- /*********************************************************************/
-@@ -1095,7 +1105,7 @@
-     tx_ring[0].status = cpu_to_le32(0x80000000);
- 
-     /* Point to transmit descriptor */
--    outl((u32)&tx_ring[0], ioaddr + CSR4);
-+    outl(virt_to_le32desc(&tx_ring[0]), ioaddr + CSR4);
- 
-     /* Enable Tx */
-     outl(csr6 | 0x00002000, ioaddr + CSR6);
-@@ -1113,11 +1123,11 @@
-     /* Disable Tx */
-     outl(csr6 & ~0x00002000, ioaddr + CSR6);
- }
--
-+
- /*********************************************************************/
- /* eth_poll - Wait for a frame                                       */
- /*********************************************************************/
--static int tulip_poll(struct nic *nic)
-+static int tulip_poll(struct nic *nic, int retrieve)
- {
- 
- #ifdef TULIP_DEBUG_WHERE
-@@ -1128,6 +1138,8 @@
-     if (rx_ring[tp->cur_rx].status & 0x80000000)
-         return 0;
- 
-+    if ( ! retrieve ) return 1;
-+
- #ifdef TULIP_DEBUG_WHERE
-     whereami("tulip_poll got one\n");
- #endif
-@@ -1151,17 +1163,20 @@
- 
-     return 1;
- }
--
-+
- /*********************************************************************/
- /* eth_disable - Disable the interface                               */
- /*********************************************************************/
--static void tulip_disable(struct nic *nic)
-+static void tulip_disable(struct dev *dev)
- {
--
-+    struct nic *nic = (struct nic *)dev;
- #ifdef TULIP_DEBUG_WHERE
-     whereami("tulip_disable\n");
- #endif
- 
-+    /* merge reset and disable */
-+    tulip_reset(nic);
-+
-     /* disable interrupts */
-     outl(0x00000000, ioaddr + CSR7);
- 
-@@ -1171,24 +1186,41 @@
-     /* Clear the missed-packet counter. */
-     (volatile unsigned long)inl(ioaddr + CSR8);
- }
--
-+
-+/*********************************************************************/
-+/*IRQ - Enable, Disable, or Force interrupts                         */
-+/*********************************************************************/
-+static void tulip_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
- /*********************************************************************/
- /* eth_probe - Look for an adapter                                   */
- /*********************************************************************/
--struct nic *tulip_probe(struct nic *nic, unsigned short *io_addrs,
--                        struct pci_device *pci)
-+static int tulip_probe(struct dev *dev, struct pci_device *pci)
- {
--    u32 i, l1, l2;
-+    struct nic *nic = (struct nic *)dev;
-+    u32 i;
-     u8  chip_rev;
-     u8 ee_data[EEPROM_SIZE];
-     unsigned short sum;
-     int chip_idx;
-     static unsigned char last_phys_addr[ETH_ALEN] = {0x00, 'L', 'i', 'n', 'u', 'x'};
- 
--    if (io_addrs == 0 || *io_addrs == 0)
-+    if (pci->ioaddr == 0)
-         return 0;
- 
--    ioaddr         = *io_addrs;
-+    ioaddr         = pci->ioaddr;
-+    nic->ioaddr    = pci->ioaddr & ~3;
-+    nic->irqno     = 0;
- 
-     /* point to private storage */
-     tp = &tpx;
-@@ -1378,15 +1410,15 @@
-     /* reset the device and make ready for tx and rx of packets */
-     tulip_reset(nic);
- 
--    nic->reset    = tulip_reset;
-+    dev->disable  = tulip_disable;
-     nic->poll     = tulip_poll;
-     nic->transmit = tulip_transmit;
--    nic->disable  = tulip_disable;
-+    nic->irq      = tulip_irq;
- 
-     /* give the board a chance to reset before returning */
-     tulip_wait(4*TICKS_PER_SEC);
- 
--    return nic;
-+    return 1;
- }
- 
- static void start_link(struct nic *nic)
-@@ -1508,7 +1540,7 @@
-     }
- }
- 
--static void nway_start(struct nic *nic)
-+static void nway_start(struct nic *nic __unused)
- {
-     int csr14 = ((tp->sym_advertise & 0x0780) << 9)  |
-         ((tp->sym_advertise&0x0020)<<1) | 0xffbf;
-@@ -1662,7 +1694,7 @@
-     }
- }
- 
--static void pnic_do_nway(struct nic *nic)
-+static void pnic_do_nway(struct nic *nic __unused)
- {
-     u32 phy_reg = inl(ioaddr + 0xB8);
-     u32 new_csr6 = tp->csr6 & ~0x40C40200;
-@@ -1886,8 +1918,8 @@
-         }
-     } else if (tp->chip_id == DC21040) {                                        /* 21040 */
-         /* Turn on the xcvr interface. */
--        int csr12 = inl(ioaddr + CSR12);
- #ifdef TULIP_DEBUG
-+        int csr12 = inl(ioaddr + CSR12);
-         if (tulip_debug > 1)
-             printf("%s: 21040 media type is %s, CSR12 is %hhX.\n",
-                    tp->nic_name, medianame[tp->if_port], csr12);
-@@ -1987,3 +2019,51 @@
- 
-         return 0;
- }
-+
-+static struct pci_id tulip_nics[] = {
-+PCI_ROM(0x1011, 0x0002, "dc21040",     "Digital Tulip"),
-+PCI_ROM(0x1011, 0x0009, "ds21140",     "Digital Tulip Fast"),
-+PCI_ROM(0x1011, 0x0014, "dc21041",     "Digital Tulip+"),
-+PCI_ROM(0x1011, 0x0019, "ds21142",     "Digital Tulip 21142"),
-+PCI_ROM(0x10b7, 0x9300, "3csoho100b-tx","3ComSOHO100B-TX"),
-+PCI_ROM(0x10b9, 0x5261, "ali1563",     "ALi 1563 integrated ethernet"),
-+PCI_ROM(0x10d9, 0x0512, "mx98713",     "Macronix MX987x3"),
-+PCI_ROM(0x10d9, 0x0531, "mx98715",     "Macronix MX987x5"),
-+PCI_ROM(0x1113, 0x1217, "mxic-98715",  "Macronix MX987x5"),
-+PCI_ROM(0x11ad, 0xc115, "lc82c115",    "LinkSys LNE100TX"),
-+PCI_ROM(0x11ad, 0x0002, "82c168",      "Netgear FA310TX"),
-+PCI_ROM(0x1282, 0x9100, "dm9100",      "Davicom 9100"),
-+PCI_ROM(0x1282, 0x9102, "dm9102",      "Davicom 9102"),
-+PCI_ROM(0x1282, 0x9009, "dm9009",      "Davicom 9009"),
-+PCI_ROM(0x1282, 0x9132, "dm9132",      "Davicom 9132"),
-+PCI_ROM(0x1317, 0x0985, "centaur-p",   "ADMtek Centaur-P"),
-+PCI_ROM(0x1317, 0x0981, "an981",       "ADMtek AN981 Comet"),		/* ADMTek Centaur-P (stmicro) */
-+PCI_ROM(0x1113, 0x1216, "an983",       "ADMTek AN983 Comet"),
-+PCI_ROM(0x1317, 0x9511, "an983b",      "ADMTek Comet 983b"),
-+PCI_ROM(0x1317, 0x1985, "centaur-c",   "ADMTek Centaur-C"),
-+PCI_ROM(0x8086, 0x0039, "intel21145",  "Intel Tulip"),
-+PCI_ROM(0x125b, 0x1400, "ax88140",     "ASIX AX88140"),
-+PCI_ROM(0x11f6, 0x9881, "rl100tx",     "Compex RL100-TX"),
-+PCI_ROM(0x115d, 0x0003, "xircomtulip", "Xircom Tulip"),
-+PCI_ROM(0x104a, 0x0981, "tulip-0981",  "Tulip 0x104a 0x0981"),
-+PCI_ROM(0x104a, 0x2774, "tulip-2774",  "Tulip 0x104a 0x2774"),
-+PCI_ROM(0x1113, 0x9511, "tulip-9511",  "Tulip 0x1113 0x9511"),
-+PCI_ROM(0x1186, 0x1561, "tulip-1561",  "Tulip 0x1186 0x1561"),
-+PCI_ROM(0x1259, 0xa120, "tulip-a120",  "Tulip 0x1259 0xa120"),
-+PCI_ROM(0x13d1, 0xab02, "tulip-ab02",  "Tulip 0x13d1 0xab02"),
-+PCI_ROM(0x13d1, 0xab03, "tulip-ab03",  "Tulip 0x13d1 0xab03"),
-+PCI_ROM(0x13d1, 0xab08, "tulip-ab08",  "Tulip 0x13d1 0xab08"),
-+PCI_ROM(0x14f1, 0x1803, "lanfinity",   "Conexant LANfinity"),
-+PCI_ROM(0x1626, 0x8410, "tulip-8410",  "Tulip 0x1626 0x8410"),
-+PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08"),
-+PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09"),
-+};
-+
-+struct pci_driver tulip_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "Tulip",
-+	.probe    = tulip_probe,
-+	.ids      = tulip_nics,
-+	.id_count = sizeof(tulip_nics)/sizeof(tulip_nics[0]),
-+	.class    = 0,
-+};
-Index: b/netboot/tulip.txt
-===================================================================
---- a/netboot/tulip.txt
-+++ /dev/null
-@@ -1,53 +0,0 @@
--This software may be used and distributed according to the terms of
--the GNU Public License, incorporated herein by reference.
--
--This is a tulip and clone driver for Etherboot.  See the revision
--history in the tulip.c file for information on changes.  This version
--of the driver incorporates changes from Bob Edwards and Paul Mackerras
--who cantributed changes to support the TRENDnet TE100-PCIA NIC which
--uses a genuine Intel 21143-PD chipset.  There are also various code
--cleanups to make time-based activities more reliable.
--
--Of course you have to have all the usual Etherboot environment
--(bootp/dhcp/NFS) set up, and you need a Linux kernel with v0.91g
--(7.16.99) or later of the tulip.c driver compiled in to support some
--MX98715 based cards.  That file is available at:
--
--  http://cesdis.gsfc.nasa.gov/linux/drivers/test/tulip.c
--
--NOTES
--
--I've tested this driver with a SOHOware Fast 10/100 Model SDA110A,
--a Linksys LNE100TX v2.0, and a Netgear FA310TX card, and it worked at
--both 10 and 100 mbits. Other cards based on the tulip family may work as
--well.
--
--These cards are about 20$US, are supported by Linux and now Etherboot,
--and being PCI, they auto-configure IRQ and IOADDR and auto-negotiate
--10/100 half/full duplex. It seems like a pretty good value compared to
--some of the pricier cards, and can lower the cost of building/adapting
--thin client workstations substantially while giving a considerable
--performance increase.
--
--On some PCI tulip clone chipsets (MX987x5, LC82C115, LC82C168) this driver 
--lets the card choose the fastest speed it can negotiate with the peer
--device.  On other cards, it chooses 10mbit half-duplex.
--
--I burned an AM27C256 (32KByte) EPROM with mx987x5.lzrom and it worked.
--According to the data sheet the MX98715A supports up to 64K (27C512)
--EPROMs, 
--
--I've liberally commented the code and header files in the hope that it
--will help the next person who hacks the code or needs to support some
--tulip clone card, or wishes to add functionality.
--
--Anyway, please test this if you can on your tulip based card, and let
--me (mdc@thinguin.org) and the netboot list (netboot@baghira.han.de)
--know how things go.  I also would appreciate code review by people who
--program.  I'm a strong believer in "another set of eyes".
--
--Regards,
--
--Marty Connor
--mdc@thinguin.org
--http://www.thinguin.org/
-Index: b/netboot/types.h
-===================================================================
---- /dev/null
-+++ b/netboot/types.h
-@@ -0,0 +1,44 @@
-+#ifndef _TYPES_H
-+#define _TYPES_H
-+
-+/* I'm architecture independed :-) */
-+
-+/* 
-+ * It's architecture depended headers for common integer types
-+ */
-+#include "stdint.h"
-+
-+/* 
-+ * Here are some RPC types define from linux /usr/include/rpc/types.h
-+ */
-+typedef int bool_t;
-+typedef int enum_t;
-+typedef uint32_t rpcprog_t;
-+typedef uint32_t rpcvers_t;
-+typedef uint32_t rpcproc_t;
-+typedef uint32_t rpcprot_t;
-+typedef uint32_t rpcport_t;
-+
-+/* For bool_t */
-+/* typedef enum { */
-+/*  	FALSE = 0, */
-+/*  	TRUE = 1 */
-+/* } boolean_t; */
-+
-+
-+
-+/* Some BSD or RPC style types */
-+typedef unsigned char u_char;
-+typedef unsigned short u_short;
-+typedef unsigned int u_int;
-+typedef unsigned long u_long;
-+typedef long long quad_t;
-+typedef unsigned long long u_quad_t;
-+typedef struct {
-+	int __val[2];
-+}fsid_t;			/* Type of file system IDs, from bits/types.h */
-+
-+typedef int daddr_t;		/* The type of a disk address, from bits/types.h */
-+typedef char * caddr_t;
-+
-+#endif /* _TYPES_H */
-Index: b/netboot/udp.h
-===================================================================
---- /dev/null
-+++ b/netboot/udp.h
-@@ -0,0 +1,30 @@
-+#ifndef	_UDP_H
-+#define	_UDP_H
-+
-+/* We need 'uint16_t' and 'uint8_t'  */
-+#include "types.h"
-+/* We need 'in_addr' */
-+#include "in.h"
-+
-+struct udp_pseudo_hdr {
-+	in_addr  src;
-+	in_addr  dest;
-+	uint8_t  unused;
-+	uint8_t  protocol;
-+	uint16_t len;
-+};
-+struct udphdr {
-+	uint16_t src;
-+	uint16_t dest;
-+	uint16_t len;
-+	uint16_t chksum;
-+};
-+
-+extern void build_udp_hdr(unsigned long __destip, unsigned int __srcsock, 
-+	      unsigned int __destsock, int __ttl, int __len, 
-+	      const void * __buf);
-+
-+extern int udp_transmit(unsigned long __destip, unsigned int __srcsock,
-+			unsigned int __destsock, int __len, const void * __buf);
-+
-+#endif	/* _UDP_H */
-Index: b/netboot/via-rhine.c
-===================================================================
---- a/netboot/via-rhine.c
-+++ b/netboot/via-rhine.c
-@@ -18,7 +18,7 @@
- 
- */
- 
--static const char *version = "rhine.c v1.0.0 2000-01-07\n";
-+static const char *version = "rhine.c v1.0.1 2003-02-06\n";
- 
- /* A few user-configurable values. */
- 
-@@ -46,7 +46,6 @@
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- 
- /* define all ioaddr */
- 
-@@ -103,6 +102,11 @@
- #define byCFGD				ioaddr + 0x7b
- #define wTallyCntMPA			ioaddr + 0x7c
- #define wTallyCntCRC			ioaddr + 0x7d
-+#define bySTICKHW			ioaddr + 0x83
-+#define byWOLcrClr			ioaddr + 0xA4
-+#define byWOLcgClr			ioaddr + 0xA7
-+#define byPwrcsrClr			ioaddr + 0xAC
-+
- /*---------------------  Exioaddr Definitions -------------------------*/
- 
- /*
-@@ -617,9 +621,6 @@
- 
- */
- 
--#define PCI_VENDOR_ID_FET		0x1106
--#define PCI_DEVICE_ID_FET_3043		0x3043
--
- /* The rest of these values should never change. */
- #define NUM_TX_DESC	2	/* Number of Tx descriptor registers. */
- 
-@@ -652,23 +653,19 @@
- }
- rhine;
- 
--static struct nic *rhine_probe1 (struct nic *dev, int ioaddr,
-+static void rhine_probe1 (struct nic *nic, int ioaddr,
- 				 int chip_id, int options);
- static int QueryAuto (int);
- static int ReadMII (int byMIIIndex, int);
- static void WriteMII (char, char, char, int);
- static void MIIDelay (void);
- static void rhine_init_ring (struct nic *dev);
--static void rhine_disable (struct nic *nic);
-+static void rhine_disable (struct dev *dev);
- static void rhine_reset (struct nic *nic);
--static int rhine_poll (struct nic *nic);
-+static int rhine_poll (struct nic *nic, int retreive);
- static void rhine_transmit (struct nic *nic, const char *d, unsigned int t,
- 			    unsigned int s, const char *p);
- 
--/* Linux support functions */
--#define virt_to_bus(x) ((unsigned long)x)
--#define bus_to_virt(x) ((void *)x)
--
- /* Initialize the Rx and Tx rings, along with various 'dev' bits. */
- static void
- rhine_init_ring (struct nic *nic)
-@@ -854,26 +851,99 @@
-     }
- }
- 
--struct nic *
--rhine_probe (struct nic *nic, unsigned short *probeaddrs,
--	       struct pci_device *pci)
-+/* Offsets to the device registers. */
-+enum register_offsets {
-+        StationAddr=0x00, RxConfig=0x06, TxConfig=0x07, ChipCmd=0x08,
-+        IntrStatus=0x0C, IntrEnable=0x0E,
-+        MulticastFilter0=0x10, MulticastFilter1=0x14,
-+        RxRingPtr=0x18, TxRingPtr=0x1C, GFIFOTest=0x54,
-+        MIIPhyAddr=0x6C, MIIStatus=0x6D, PCIBusConfig=0x6E,
-+        MIICmd=0x70, MIIRegAddr=0x71, MIIData=0x72, MACRegEEcsr=0x74,
-+        ConfigA=0x78, ConfigB=0x79, ConfigC=0x7A, ConfigD=0x7B,
-+        RxMissed=0x7C, RxCRCErrs=0x7E, MiscCmd=0x81,
-+        StickyHW=0x83, IntrStatus2=0x84, WOLcrClr=0xA4, WOLcgClr=0xA7,
-+        PwrcsrClr=0xAC,
-+};
-+
-+/* Bits in the interrupt status/mask registers. */
-+enum intr_status_bits {
-+        IntrRxDone=0x0001, IntrRxErr=0x0004, IntrRxEmpty=0x0020,
-+        IntrTxDone=0x0002, IntrTxError=0x0008, IntrTxUnderrun=0x0210,
-+        IntrPCIErr=0x0040,
-+        IntrStatsMax=0x0080, IntrRxEarly=0x0100,
-+        IntrRxOverflow=0x0400, IntrRxDropped=0x0800, IntrRxNoBuf=0x1000,
-+        IntrTxAborted=0x2000, IntrLinkChange=0x4000,
-+        IntrRxWakeUp=0x8000,
-+        IntrNormalSummary=0x0003, IntrAbnormalSummary=0xC260,
-+        IntrTxDescRace=0x080000,        /* mapped from IntrStatus2 */
-+        IntrTxErrSummary=0x082218,
-+};
-+#define DEFAULT_INTR (IntrRxDone | IntrRxErr | IntrRxEmpty| IntrRxOverflow | \
-+                   IntrRxDropped | IntrRxNoBuf) 
-+
-+/***************************************************************************
-+ IRQ - PXE IRQ Handler
-+***************************************************************************/
-+void rhine_irq ( struct nic *nic, irq_action_t action ) {
-+     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
-+     /* Enable interrupts by setting the interrupt mask. */
-+     unsigned int intr_status;
-+
-+     switch ( action ) {
-+          case DISABLE :
-+          case ENABLE :
-+               intr_status = inw(nic->ioaddr + IntrStatus);
-+               /* On Rhine-II, Bit 3 indicates Tx descriptor write-back race. */
-+               if (tp->chip_id == 0x3065)
-+                   intr_status |= inb(nic->ioaddr + IntrStatus2) << 16;
-+               intr_status = (intr_status & ~DEFAULT_INTR);
-+               if ( action == ENABLE ) 
-+                   intr_status = intr_status | DEFAULT_INTR;
-+               outw(intr_status, nic->ioaddr + IntrEnable);
-+               break;
-+         case FORCE :
-+               outw(0x0010, nic->ioaddr + 0x84);
-+               break;
-+         }
-+}
-+
-+static int
-+rhine_probe (struct dev *dev, struct pci_device *pci)
- {
-+    struct nic *nic = (struct nic *)dev;
-+    struct rhine_private *tp = &rhine;
-     if (!pci->ioaddr)
--	return NULL;
--    nic = rhine_probe1 (nic, pci->ioaddr, 0, -1);
-+	return 0;
-+    rhine_probe1 (nic, pci->ioaddr, pci->dev_id, -1);
- 
--    if (nic)
--	adjust_pci_device(pci);
--    nic->poll = rhine_poll;
--    nic->transmit = rhine_transmit;
--    nic->reset = rhine_reset;
--    nic->disable = rhine_disable;
-+    adjust_pci_device(pci);
-     rhine_reset (nic);
- 
--    return nic;
-+    dev->disable  = rhine_disable;
-+    nic->poll     = rhine_poll;
-+    nic->transmit = rhine_transmit;
-+    nic->irqno	  = pci->irq;
-+    nic->irq      = rhine_irq;
-+    nic->ioaddr   = tp->ioaddr;
-+
-+
-+    return 1;
-+}
-+
-+static void set_rx_mode(struct nic *nic __unused) {
-+    	struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
-+	unsigned char rx_mode;
-+    	int ioaddr = tp->ioaddr;
-+
-+	/* ! IFF_PROMISC */
-+	outl(0xffffffff, byMAR0);
-+	outl(0xffffffff, byMAR4);
-+	rx_mode = 0x0C;
-+
-+	outb(0x60 /* thresh */ | rx_mode, byRCR );
- }
- 
--static struct nic *
-+static void
- rhine_probe1 (struct nic *nic, int ioaddr, int chip_id, int options)
- {
-     struct rhine_private *tp;
-@@ -885,6 +955,29 @@
- 
-     if (rhine_debug > 0 && did_version++ == 0)
- 	printf (version);
-+
-+    /* D-Link provided reset code (with comment additions) */
-+    if((chip_id != 0x3043) && (chip_id != 0x6100)) {
-+	unsigned char byOrgValue;
-+	
-+	if(rhine_debug > 0)
-+		printf("Enabling Sticky Bit Workaround for Chip_id: 0x%hX\n"
-+				, chip_id);
-+	/* clear sticky bit before reset & read ethernet address */
-+	byOrgValue = inb(bySTICKHW);
-+	byOrgValue = byOrgValue & 0xFC;
-+	outb(byOrgValue, bySTICKHW);
-+
-+	/* (bits written are cleared?) */
-+	/* disable force PME-enable */
-+	outb(0x80, byWOLcgClr);
-+	/* disable power-event config bit */
-+	outb(0xFF, byWOLcrClr);
-+	/* clear power status (undocumented in vt6102 docs?) */
-+	outb(0xFF, byPwrcsrClr);
-+	
-+    }
-+
-     /* Perhaps this should be read from the EEPROM? */
-     for (i = 0; i < ETH_ALEN; i++)
- 	nic->node_addr[i] = inb (byPAR0 + i);
-@@ -920,6 +1013,7 @@
- 	}
- #endif
- 
-+    
-     /* query MII to know LineSpeed,duplex mode */
-     byMIIvalue = inb (ioaddr + 0x6d);
-     LineSpeed = byMIIvalue & MIISR_SPEED;
-@@ -971,15 +1065,19 @@
- 	if (tp->default_port)
- 	    tp->medialock = 1;
-     }
--    return nic;
-+    return;
- }
- 
--static void
--rhine_disable (struct nic *nic)
-+static void 
-+rhine_disable (struct dev *dev)
- {
-+    struct nic *nic = (struct nic *)dev;
-     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
-     int ioaddr = tp->ioaddr;
- 
-+    /* merge reset and disable */
-+    rhine_reset(nic);
-+
-     printf ("rhine disable\n");
-     /* Switch to loopback mode to avoid hardware races. */
-     writeb(0x60 | 0x01, byTCR);
-@@ -1002,17 +1100,10 @@
-     int rx_bufs_tmp, rx_bufs_tmp1;
-     int tx_bufs_tmp, tx_bufs_tmp1;
- 
--#ifdef	USE_LOWMEM_BUFFER
--#define buf1 (0x10000 - (RX_RING_SIZE * PKT_BUF_SZ + 32))
--#define buf2 (buf1 - (RX_RING_SIZE * PKT_BUF_SZ + 32))
--#define desc1 (buf2 - (TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32))
--#define desc2 (desc1 - (TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32))
--#else
-     static char buf1[RX_RING_SIZE * PKT_BUF_SZ + 32];
-     static char buf2[RX_RING_SIZE * PKT_BUF_SZ + 32];
-     static char desc1[TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32];
-     static char desc2[TX_RING_SIZE * sizeof (struct rhine_tx_desc) + 32];
--#endif
- 
-     /* printf ("rhine_reset\n"); */
-     /* Soft reset the chip. */
-@@ -1069,6 +1160,9 @@
-     outl (virt_to_bus (tp->rx_ring), dwCurrentRxDescAddr);
-     outl (virt_to_bus (tp->tx_ring), dwCurrentTxDescAddr);
- 
-+    /* Setup Multicast */	
-+    set_rx_mode(nic);
-+
-     /* close IMR */
-     outw (0x0000, byIMR0);
- 
-@@ -1093,15 +1187,34 @@
-     /*set IMR to work */
-     outw (IMRShadow, byIMR0);
- }
-+/* Beware of PCI posted writes */
-+#define IOSYNC  do { readb(nic->ioaddr + StationAddr); } while (0)
- 
- static int
--rhine_poll (struct nic *nic)
-+rhine_poll (struct nic *nic, int retreive)
- {
-     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
-     int rxstatus, good = 0;;
- 
-     if (tp->rx_ring[tp->cur_rx].rx_status.bits.own_bit == 0)
-     {
-+        unsigned int intr_status;
-+        /* There is a packet ready */
-+        if(!retreive)
-+            return 1;
-+
-+        intr_status = inw(nic->ioaddr + IntrStatus);
-+        /* On Rhine-II, Bit 3 indicates Tx descriptor write-back race. */
-+#if 0
-+	if (tp->chip_id == 0x3065)
-+	  intr_status |= inb(nic->ioaddr + IntrStatus2) << 16;
-+#endif
-+        /* Acknowledge all of the current interrupt sources ASAP. */
-+        if (intr_status & IntrTxDescRace)
-+           outb(0x08, nic->ioaddr + IntrStatus2);
-+        outw(intr_status & 0xffff, nic->ioaddr + IntrStatus);
-+	IOSYNC;
-+
- 	rxstatus = tp->rx_ring[tp->cur_rx].rx_status.lw;
- 	if ((rxstatus & 0x0300) != 0x0300)
- 	{
-@@ -1124,6 +1237,11 @@
- 	tp->cur_rx++;
- 	tp->cur_rx = tp->cur_rx % RX_RING_SIZE;
-     }
-+        /* Acknowledge all of the current interrupt sources ASAP. */
-+        outw(DEFAULT_INTR & ~IntrRxDone, nic->ioaddr + IntrStatus);
-+
-+        IOSYNC;
-+
-     return good;
- }
- 
-@@ -1152,7 +1270,7 @@
-     while (s < ETH_ZLEN)
- 	*((char *) tp->tx_buffs[entry] + ETH_HLEN + (s++)) = 0;
- 
--    tp->tx_ring[entry].tx_ctrl.bits.tx_buf_size = ETH_HLEN + s;
-+    tp->tx_ring[entry].tx_ctrl.bits.tx_buf_size = s;
- 
-     tp->tx_ring[entry].tx_status.bits.own_bit = 1;
- 
-@@ -1170,6 +1288,9 @@
-     /*printf("td4=[%X]",inl(dwCurrentTDSE3)); */
- 
-     outb (CR1bak, byCR1);
-+    /* Wait until transmit is finished */
-+    while (tp->tx_ring[entry].tx_status.bits.own_bit != 0)
-+	;
-     tp->cur_tx++;
- 
-     /*outw(IMRShadow,byIMR0); */
-@@ -1177,4 +1298,21 @@
-     /*tp->tx_skbuff[entry] = 0; */
- }
- 
-+static struct pci_id rhine_nics[] = {
-+PCI_ROM(0x1106, 0x3065, "dlink-530tx",     "VIA 6102"),
-+PCI_ROM(0x1106, 0x3106, "via-rhine-6105",  "VIA 6105"),
-+PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043"),		/* Rhine-I 86c100a */
-+PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M"),	
-+PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A"),	/* Rhine-II */
-+};
-+
-+struct pci_driver rhine_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "VIA 86C100",
-+	.probe    = rhine_probe,
-+	.ids      = rhine_nics,
-+	.id_count = sizeof(rhine_nics)/sizeof(rhine_nics[0]),
-+	.class    = 0,
-+};
-+
- /* EOF via-rhine.c */
-Index: b/netboot/w89c840.c
-===================================================================
---- a/netboot/w89c840.c
-+++ b/netboot/w89c840.c
-@@ -43,6 +43,9 @@
-  *                                       using timer2 routines. Proposed
-  *                                       by Ken Yap to eliminate CPU speed
-  *                                       dependency.
-+ *             Dec 12 2003  V0.94   timlegge	Fixed issues in 5.2, removed 
-+ *             					interrupt usage, enabled
-+ *             					multicast support
-  *
-  * This is the etherboot driver for cards based on Winbond W89c840F chip.
-  *
-@@ -77,10 +80,9 @@
- #include "etherboot.h"
- #include "nic.h"
- #include "pci.h"
--#include "cards.h"
- #include "timer.h"
- 
--static const char *w89c840_version = "diver Version 0.92 - August 27, 2000";
-+static const char *w89c840_version = "driver Version 0.94 - December 12, 2003";
- 
- typedef unsigned char  u8;
- typedef   signed char  s8;
-@@ -90,9 +92,6 @@
- typedef   signed int   s32;
- 
- /* Linux support functions */
--#define virt_to_bus(x) ((unsigned long)x)
--#define bus_to_virt(x) ((void *)x)
--
- #define virt_to_le32desc(addr)  virt_to_bus(addr)
- #define le32desc_to_virt(addr)  bus_to_virt(addr)
- 
-@@ -109,7 +108,6 @@
-    bonding and packet priority.
-    There are no ill effects from too-large receive rings. */
- #define TX_RING_SIZE    2
--
- #define RX_RING_SIZE    2
- 
- /* The presumed FIFO size for working around the Tx-FIFO-overflow bug.
-@@ -260,32 +258,20 @@
- 
- static int ioaddr;
- static unsigned short eeprom [0x40];
--
--#ifdef    USE_LOWMEM_BUFFER
--#define rx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE)
--#define tx_packet ((char *)0x10000 - PKT_BUF_SZ * RX_RING_SIZE - PKT_BUF_SZ * TX_RING_SIZE)
--#else
- static char        rx_packet[PKT_BUF_SZ * RX_RING_SIZE];
- static char        tx_packet[PKT_BUF_SZ * TX_RING_SIZE];
--#endif
- 
- static int  eeprom_read(long ioaddr, int location);
- static int  mdio_read(int base_address, int phy_id, int location);
-+#if 0
- static void mdio_write(int base_address, int phy_id, int location, int value);
-+#endif
- 
- static void check_duplex(void);
- static void set_rx_mode(void);
- static void init_ring(void);
- 
--/*
--static void wait_long_time(void)
--{
--    printf("Paused - please read output above this line\n");
--    sleep(3);
--}
--*/
--
--#if defined W89C840_DEBUG
-+#if defined(W89C840_DEBUG)
- static void decode_interrupt(u32 intr_status)
- {
-     printf("Interrupt status: ");
-@@ -349,15 +335,17 @@
-     check_duplex();
-     set_rx_mode();
- 
--    /* Clear and Enable interrupts by setting the interrupt mask. */
-+    /* Do not enable the interrupts Etherboot doesn't need them */
-+/*
-     writel(0x1A0F5, ioaddr + IntrStatus);
-     writel(0x1A0F5, ioaddr + IntrEnable);
--
-+*/
- #if defined(W89C840_DEBUG)
-     printf("winbond-840 : Done reset.\n");
- #endif
- }
- 
-+#if 0
- static void handle_intr(u32 intr_stat)
- {
-     if ((intr_stat & (NormalIntr|AbnormalIntr)) == 0) {
-@@ -372,7 +360,7 @@
-         /* There was an abnormal interrupt */
-         printf("\n-=- Abnormal interrupt.\n");
- 
--#if defined (W89C840_DEBUG)
-+#if defined(W89C840_DEBUG)
-         decode_interrupt(intr_stat);
- #endif
- 
-@@ -383,19 +371,21 @@
-         }
-     }
- }
-+#endif
- 
- /**************************************************************************
- w89c840_poll - Wait for a frame
- ***************************************************************************/
--static int w89c840_poll(struct nic *nic)
-+static int w89c840_poll(struct nic *nic, int retrieve)
- {
-     /* return true if there's an ethernet packet ready to read */
-     /* nic->packet should contain data on return */
-     /* nic->packetlen should contain length of data */
-     int packet_received = 0;
- 
-+#if defined(W89C840_DEBUG)
-     u32 intr_status = readl(ioaddr + IntrStatus);
--    /* handle_intr(intr_status); */ /* -- handled later */
-+#endif
- 
-     do {
-         /* Code from netdev_rx(dev) */
-@@ -411,6 +401,11 @@
-             break;
-         }
- 
-+        if ( !retrieve ) {
-+            packet_received = 1;
-+            break;
-+        }
-+
-         if ((status & 0x38008300) != 0x0300) {
-             if ((status & 0x38000300) != 0x0300) {
-                 /* Ingore earlier buffers. */
-@@ -478,11 +473,7 @@
-         entry = (++w840private.cur_rx) % RX_RING_SIZE;
-         w840private.rx_head_desc = &w840private.rx_ring[entry];
-     } while (0);
--
--    if (intr_status & (AbnormalIntr | TxFIFOUnderflow | IntrPCIErr |TimerInt | IntrTxStopped)) {
--        handle_intr(intr_status);
--    }
--
-+    
-     return packet_received;
- }
- 
-@@ -521,13 +512,13 @@
- 
-     w840private.tx_ring[entry].buffer1 = virt_to_le32desc(tx_packet);
- 
--    w840private.tx_ring[entry].length = (DescWholePkt | s);
-+    w840private.tx_ring[entry].length = (DescWholePkt | (u32) s);
-     if (entry >= TX_RING_SIZE-1)         /* Wrap ring */
-         w840private.tx_ring[entry].length |= (DescIntr | DescEndRing);
-     w840private.tx_ring[entry].status = (DescOwn);
-     w840private.cur_tx++;
- 
--    w840private.tx_q_bytes += s;
-+    w840private.tx_q_bytes = (u16) s;
-     writel(0, ioaddr + TxStartDemand);
- 
-     /* Work around horrible bug in the chip by marking the queue as full
-@@ -550,33 +541,29 @@
-     load_timer2(TX_TIMEOUT);
- 
-     {
-+#if defined W89C840_DEBUG
-         u32 intr_stat = 0;
--
-+#endif
-         while (1) {
- 
--            intr_stat = readl(ioaddr + IntrStatus);
- #if defined(W89C840_DEBUG)
--            decode_interrupt(intr_stat);
-+	      decode_interrupt(intr_stat);
- #endif
- 
--            if (intr_stat & (NormalIntr | IntrTxDone)) {
--
-                 while ( (transmit_status & DescOwn) && timer2_running()) {
- 
-                     transmit_status = w840private.tx_ring[entry].status;
-                 }
- 
--                writel(intr_stat & 0x0001ffff, ioaddr + IntrStatus);
-                 break;
--            }
-         }
-     }
- 
-     if ((transmit_status & DescOwn) == 0) {
- 
- #if defined(W89C840_DEBUG)
--        printf("winbond-840 : transmission complete after %d wait loop iterations, status %X\n",
--               TX_LOOP_COUNT - transmit_loop_counter, w840private.tx_ring[entry].status);
-+        printf("winbond-840 : transmission complete after wait loop iterations, status %X\n",
-+                w840private.tx_ring[entry].status);
- #endif
- 
-         return;
-@@ -592,8 +579,12 @@
- /**************************************************************************
- w89c840_disable - Turn off ethernet interface
- ***************************************************************************/
--static void w89c840_disable(struct nic *nic)
-+static void w89c840_disable(struct dev *dev)
- {
-+    struct nic *nic = (struct nic *)dev;
-+    /* merge reset and disable */
-+    w89c840_reset(nic);
-+
-     /* Don't know what to do to disable the board. Is this needed at all? */
-     /* Yes, a live NIC can corrupt the loaded memory later [Ken] */
-     /* Stop the chip's Tx and Rx processes. */
-@@ -601,20 +592,37 @@
- }
- 
- /**************************************************************************
-+w89c840_irq - Enable, Disable, or Force interrupts
-+***************************************************************************/
-+static void w89c840_irq(struct nic *nic __unused, irq_action_t action __unused)
-+{
-+  switch ( action ) {
-+  case DISABLE :
-+    break;
-+  case ENABLE :
-+    break;
-+  case FORCE :
-+    break;
-+  }
-+}
-+
-+/**************************************************************************
- w89c840_probe - Look for an adapter, this routine's visible to the outside
- ***************************************************************************/
--struct nic *w89c840_probe(struct nic *nic, unsigned short *probe_addrs, struct pci_device *p)
-+static int w89c840_probe(struct dev *dev, struct pci_device *p)
- {
-+    struct nic *nic = (struct nic *)dev;
-     u16 sum = 0;
--    int i, j, to;
-+    int i, j;
-     unsigned short value;
--    int options;
--    int promisc;
- 
--    if (probe_addrs == 0 || probe_addrs[0] == 0)
-+    if (p->ioaddr == 0)
-         return 0;
- 
--    ioaddr = probe_addrs[0]; /* Mask the bit that says "this is an io addr" */
-+    ioaddr      = p->ioaddr;
-+    nic->ioaddr = p->ioaddr & ~3;
-+    nic->irqno  = 0;
-+
- 
- #if defined(W89C840_DEBUG)
-     printf("winbond-840: PCI bus %hhX device function %hhX: I/O address: %hX\n", p->bus, p->devfn, ioaddr);
-@@ -622,8 +630,6 @@
- 
-     ioaddr = ioaddr & ~3; /* Mask the bit that says "this is an io addr" */
- 
--    /* if probe_addrs is 0, then routine can use a hardwired default */
--
-     /* From Matt Hortman <mbhortman@acpthinclient.com> */
-     if (p->vendor == PCI_VENDOR_ID_WINBOND2
-         && p->dev_id == PCI_DEVICE_ID_WINBOND2_89C840) {
-@@ -689,14 +695,14 @@
-     }
- 
-     /* point to NIC specific routines */
--    nic->reset = w89c840_reset;
--    nic->poll = w89c840_poll;
-+    dev->disable  = w89c840_disable;
-+    nic->poll     = w89c840_poll;
-     nic->transmit = w89c840_transmit;
--    nic->disable = w89c840_disable;
-+    nic->irq      = w89c840_irq;
- 
-     w89c840_reset(nic);
- 
--    return nic;
-+    return 1;
- }
- 
- /* Read the EEPROM and MII Management Data I/O (MDIO) interfaces.  These are
-@@ -814,6 +820,7 @@
-     return (retval>>1) & 0xffff;
- }
- 
-+#if 0
- static void mdio_write(int base_address, int phy_id, int location, int value)
- {
-     long mdio_addr = base_address + MIICtrl;
-@@ -844,6 +851,7 @@
-     }
-     return;
- }
-+#endif
- 
- static void check_duplex(void)
- {
-@@ -877,12 +885,10 @@
-     memset(mc_filter, 0xff, sizeof(mc_filter));
- 
- /*
-- * Actually, should work OK with multicast enabled. -- iko
-- */
--/*
-- *  rx_mode = AcceptBroadcast | AcceptMyPhys | AcceptMulticast;
-+ * works OK with multicast enabled. 
-  */
--    rx_mode = AcceptBroadcast | AcceptMyPhys;
-+
-+    rx_mode = AcceptBroadcast | AcceptMyPhys | AcceptMulticast;
- 
-     writel(mc_filter[0], ioaddr + MulticastFilter0);
-     writel(mc_filter[1], ioaddr + MulticastFilter1);
-@@ -932,3 +938,18 @@
-     }
-     return;
- }
-+
-+
-+static struct pci_id w89c840_nics[] = {
-+PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F"),
-+PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"),
-+};
-+
-+struct pci_driver w89c840_driver = {
-+	.type     = NIC_DRIVER,
-+	.name     = "W89C840F",
-+	.probe    = w89c840_probe,
-+	.ids      = w89c840_nics,
-+	.id_count = sizeof(w89c840_nics)/sizeof(w89c840_nics[0]),
-+	.class    = 0,
-+};
-Index: b/stage2/disk_io.c
-===================================================================
---- a/stage2/disk_io.c
-+++ b/stage2/disk_io.c
-@@ -25,6 +25,7 @@
- #ifdef SUPPORT_NETBOOT
- # define GRUB	1
- # include <etherboot.h>
-+# include <grub.h>
- #endif
- 
- #ifdef GRUB_UTIL
diff --git a/bsp/buildroot/boot/grub/grub.hash b/bsp/buildroot/boot/grub/grub.hash
deleted file mode 100644
index 566dec8c..00000000
--- a/bsp/buildroot/boot/grub/grub.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/g/grub/grub_0.97-68.dsc
-sha256	4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b	grub_0.97.orig.tar.gz
-sha256	a453489cf1fec5d311a0b76dea8c8b2ff67eee1a3eba6c06ab80864494d9773c	grub_0.97-68.diff.gz
diff --git a/bsp/buildroot/boot/grub/grub.mk b/bsp/buildroot/boot/grub/grub.mk
deleted file mode 100644
index ae687d6b..00000000
--- a/bsp/buildroot/boot/grub/grub.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-################################################################################
-#
-# grub
-#
-################################################################################
-
-GRUB_VERSION = 0.97
-GRUB_SOURCE = grub_$(GRUB_VERSION).orig.tar.gz
-GRUB_PATCH = grub_$(GRUB_VERSION)-68.diff.gz
-GRUB_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/g/grub
-
-GRUB_LICENSE = GPLv2+
-GRUB_LICENSE_FILES = COPYING
-
-# Passing -O0 since the default -O2 passed by Buildroot generates
-# non-working stage2.  Passing --build-id=none to the linker, because
-# the ".note.gnu.build-id" ELF sections generated by default confuse
-# objcopy when generating raw binaries. Passing -fno-stack-protector
-# to avoid undefined references to __stack_chk_fail.
-GRUB_CFLAGS = \
-	-DSUPPORT_LOOPDEV \
-	-O0 -Wl,--build-id=none \
-	-fno-stack-protector
-
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_SPLASH),--enable-graphics,--disable-graphics)
-
-GRUB_CONFIG-$(BR2_TARGET_GRUB_DISKLESS) += --enable-diskless
-GRUB_CONFIG-$(BR2_TARGET_GRUB_3c595) += --enable-3c595
-GRUB_CONFIG-$(BR2_TARGET_GRUB_3c90x) += --enable-3c90x
-GRUB_CONFIG-$(BR2_TARGET_GRUB_davicom) += --enable-davicom
-GRUB_CONFIG-$(BR2_TARGET_GRUB_e1000) += --enable-e1000
-GRUB_CONFIG-$(BR2_TARGET_GRUB_eepro100) += --enable-eepro100
-GRUB_CONFIG-$(BR2_TARGET_GRUB_epic100) += --enable-epic100
-GRUB_CONFIG-$(BR2_TARGET_GRUB_forcedeth) += --enable-forcedeth
-GRUB_CONFIG-$(BR2_TARGET_GRUB_natsemi) += --enable-natsemi
-GRUB_CONFIG-$(BR2_TARGET_GRUB_ns83820) += --enable-ns83820
-GRUB_CONFIG-$(BR2_TARGET_GRUB_ns8390) += --enable-ns8390
-GRUB_CONFIG-$(BR2_TARGET_GRUB_pcnet32) += --enable-pcnet32
-GRUB_CONFIG-$(BR2_TARGET_GRUB_pnic) += --enable-pnic
-GRUB_CONFIG-$(BR2_TARGET_GRUB_rtl8139) += --enable-rtl8139
-GRUB_CONFIG-$(BR2_TARGET_GRUB_r8169) += --enable-r8169
-GRUB_CONFIG-$(BR2_TARGET_GRUB_sis900) += --enable-sis900
-GRUB_CONFIG-$(BR2_TARGET_GRUB_tg3) += --enable-tg3
-GRUB_CONFIG-$(BR2_TARGET_GRUB_tulip) += --enable-tulip
-GRUB_CONFIG-$(BR2_TARGET_GRUB_tlan) += --enable-tlan
-GRUB_CONFIG-$(BR2_TARGET_GRUB_undi) += --enable-undi
-GRUB_CONFIG-$(BR2_TARGET_GRUB_via_rhine) += --enable-via-rhine
-GRUB_CONFIG-$(BR2_TARGET_GRUB_w89c840) += --enable-w89c840
-
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_EXT2),--enable-ext2fs,--disable-ext2fs)
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_FAT),--enable-fat,--disable-fat)
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_ISO9660),--enable-iso9660,--disable-iso9660)
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_JFS),--enable-jfs,--disable-jfs)
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_REISERFS),--enable-reiserfs,--disable-reiserfs)
-GRUB_CONFIG-y += $(if $(BR2_TARGET_GRUB_FS_XFS),--enable-xfs,--disable-xfs)
-GRUB_CONFIG-y += --disable-ffs --disable-ufs2 --disable-minix --disable-vstafs
-
-GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_EXT2),e2fs)
-GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_FAT),fat)
-GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_ISO9660),iso9660)
-GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_JFS),jfs)
-GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_REISERFS),reiserfs)
-GRUB_STAGE_1_5_TO_INSTALL += $(if $(BR2_TARGET_GRUB_FS_XFS),xfs)
-
-define GRUB_DEBIAN_PATCHES
-	# Apply the patches from the Debian patch
-	(cd $(@D) ; for f in `cat debian/patches/series | grep -v ^#` ; do \
-		cat debian/patches/$$f | patch -g0 -p1 ; \
-	done)
-endef
-
-GRUB_POST_PATCH_HOOKS += GRUB_DEBIAN_PATCHES
-
-GRUB_CONF_ENV = \
-	$(HOST_CONFIGURE_OPTS) \
-	CFLAGS="$(HOST_CFLAGS) $(GRUB_CFLAGS) -m32"
-
-GRUB_CONF_OPTS = \
-	--disable-auto-linux-mem-opt \
-	$(GRUB_CONFIG-y)
-
-ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
-define GRUB_INSTALL_SPLASH
-	$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz $(TARGET_DIR)/boot/grub/splash.xpm.gz
-endef
-else
-define GRUB_INSTALL_SPLASH
-	$(SED) '/^splashimage/d' $(TARGET_DIR)/boot/grub/menu.lst
-endef
-endif
-
-# We're cheating here as we're installing the grub binary not in the
-# target directory (where it is useless), but in the host
-# directory. This grub binary can be used to install grub into the MBR
-# of a disk or disk image.
-
-define GRUB_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/grub/grub $(HOST_DIR)/sbin/grub
-	$(INSTALL) -D -m 0755 $(@D)/stage1/stage1 $(TARGET_DIR)/boot/grub/stage1
-	for f in $(GRUB_STAGE_1_5_TO_INSTALL) ; do \
-		$(INSTALL) -D -m 0755 $(@D)/stage2/$${f}_stage1_5 \
-			$(TARGET_DIR)/boot/grub/$${f}_stage1_5 ; \
-	done
-	$(INSTALL) -D -m 0644 $(@D)/stage2/stage2 $(TARGET_DIR)/boot/grub/stage2
-	$(INSTALL) -D -m 0644 boot/grub/menu.lst $(TARGET_DIR)/boot/grub/menu.lst
-	$(GRUB_INSTALL_SPLASH)
-endef
-
-$(eval $(autotools-package))
diff --git a/bsp/buildroot/boot/grub/menu.lst b/bsp/buildroot/boot/grub/menu.lst
deleted file mode 100644
index 9f14da7d..00000000
--- a/bsp/buildroot/boot/grub/menu.lst
+++ /dev/null
@@ -1,16 +0,0 @@
-default		0
-timeout		10
-
-# Used when no splashimage is used
-color 		cyan/blue white/blue
-
-# Gets enabled/disabled depending on Grub support for splashimage
-splashimage	(hd0,0)/boot/grub/splash.xpm.gz
-
-# Used when a splashimage is enabled
-foreground 	000000
-background 	cccccc
-
-title Buildroot
-	root (hd0,0)
-	kernel /boot/bzImage rw root=/dev/sda1 rootwait
diff --git a/bsp/buildroot/boot/grub/splash.xpm.gz b/bsp/buildroot/boot/grub/splash.xpm.gz
deleted file mode 100644
index 6b30d3de..00000000
Binary files a/bsp/buildroot/boot/grub/splash.xpm.gz and /dev/null differ
diff --git a/bsp/buildroot/boot/grub2/0001-remove-gets.patch b/bsp/buildroot/boot/grub2/0001-remove-gets.patch
deleted file mode 100644
index 0da71b32..00000000
--- a/bsp/buildroot/boot/grub2/0001-remove-gets.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Upstream-Status: Pending
-Index: grub-1.99/grub-core/gnulib/stdio.in.h
-===================================================================
---- grub-1.99.orig/grub-core/gnulib/stdio.in.h	2010-12-01 06:45:43.000000000 -0800
-+++ grub-1.99/grub-core/gnulib/stdio.in.h	2012-07-04 12:25:02.057099107 -0700
-@@ -140,8 +140,10 @@
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/bsp/buildroot/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch b/bsp/buildroot/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch
deleted file mode 100644
index 94be0927..00000000
--- a/bsp/buildroot/boot/grub2/0002-grub-core-gettext-gettext.c-main_context-secondary_c.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f30c692c1f9ef0e93bee2b408a24baa017f1ca9d Mon Sep 17 00:00:00 2001
-From: Vladimir Serbinenko <phcoder@gmail.com>
-Date: Thu, 7 Nov 2013 01:01:47 +0100
-Subject: [PATCH] 	* grub-core/gettext/gettext.c (main_context),
- (secondary_context): 	Define after defining type and not before.
-
-[Thomas: backport from upstream commit
-f30c692c1f9ef0e93bee2b408a24baa017f1ca9d, and remove ChangeLog
-modifications to avoid conflicts.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- grub-core/gettext/gettext.c | 4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index df73570..4880cef 100644
---- a/grub-core/gettext/gettext.c
-+++ b/grub-core/gettext/gettext.c
-@@ -34,8 +34,6 @@ GRUB_MOD_LICENSE ("GPLv3+");
-    http://www.gnu.org/software/autoconf/manual/gettext/MO-Files.html .
- */
- 
--static struct grub_gettext_context main_context, secondary_context;
--
- static const char *(*grub_gettext_original) (const char *s);
- 
- struct grub_gettext_msg
-@@ -69,6 +67,8 @@ struct grub_gettext_context
-   struct grub_gettext_msg *grub_gettext_msg_list;
- };
- 
-+static struct grub_gettext_context main_context, secondary_context;
-+
- #define MO_MAGIC_NUMBER 		0x950412de
- 
- static grub_err_t
--- 
-2.7.4
-
diff --git a/bsp/buildroot/boot/grub2/Config.in b/bsp/buildroot/boot/grub2/Config.in
index 7dc5cae2..9a61b3b6 100644
--- a/bsp/buildroot/boot/grub2/Config.in
+++ b/bsp/buildroot/boot/grub2/Config.in
@@ -1,6 +1,12 @@
+config BR2_TARGET_GRUB2_ARCH_SUPPORTS
+	bool
+	default y if BR2_i386
+	default y if BR2_x86_64
+
 config BR2_TARGET_GRUB2
 	bool "grub2"
-	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
+	depends on BR2_USE_WCHAR
 	help
 	  GNU GRUB is a Multiboot boot loader. It was derived from
 	  GRUB, the GRand Unified Bootloader, which was originally
@@ -11,104 +17,8 @@ config BR2_TARGET_GRUB2
 	  Amongst others, GRUB2 offers EFI support, which GRUB Legacy
 	  doesn't provide.
 
-	  Notes on using Grub2 for BIOS-based platforms
-	  =============================================
-
-	  1. Create a disk image
-	     dd if=/dev/zero of=disk.img bs=1M count=32
-	  2. Partition it (either legacy or GPT style partitions work)
-	     cfdisk disk.img
-	      - Create one partition, type Linux, for the root
-		filesystem. The only constraint is to make sure there
-		is enough free space *before* the first partition to
-		store Grub2. Leaving 1 MB of free space is safe.
-	  3. Setup loop device and loop partitions
-	     sudo losetup -f disk.img
-	     sudo partx -a /dev/loop0
-	  4. Prepare the root partition
-	     sudo mkfs.ext3 -L root /dev/loop0p1
-	     sudo mount /dev/loop0p1 /mnt
-	     sudo tar -C /mnt -xf output/images/rootfs.tar
-	     sudo umount /mnt
-	  5. Install Grub2
-	     sudo ./output/host/usr/sbin/grub-bios-setup \
-			-b ./output/host/usr/lib/grub/i386-pc/boot.img \
-			-c ./output/images/grub.img -d . /dev/loop0
-	  6. Cleanup loop device
-	     sudo partx -d /dev/loop0
-	     sudo losetup -d /dev/loop0
-	  7. Your disk.img is ready!
-
-	  Using genimage
-	  --------------
-
-	  If you use genimage to generate your complete image,
-	  installing Grub can be tricky. Here is how to achieve Grub's
-	  installation with genimage:
-
-	  partition boot {
-	      in-partition-table = "no"
-	      image = "path_to_boot.img"
-	      offset = 0
-	      size = 512
-	  }
-	  partition grub {
-	      in-partition-table = "no"
-	      image = "path_to_grub.img"
-	      offset = 512
-	  }
-
-	  The result is not byte to byte identical to what
-	  grub-bios-setup does but it works anyway.
-
-	  To test your BIOS image in Qemu
-	  -------------------------------
-
-	  qemu-system-{i386,x86-64} -hda disk.img
-
-	  Notes on using Grub2 for EFI-based platforms
-	  ============================================
-
-	  1. Create a disk image
-	     dd if=/dev/zero of=disk.img bs=1M count=32
-	  2. Partition it with GPT partitions
-	     cgdisk disk.img
-	      - Create a first partition, type EF00, for the
-		bootloader and kernel image
-	      - Create a second partition, type 8300, for the root
-		filesystem.
-	  3. Setup loop device and loop partitions
-	     sudo losetup -f disk.img
-	     sudo partx -a /dev/loop0
-	  4. Prepare the boot partition
-	     sudo mkfs.vfat -n boot /dev/loop0p1
-	     sudo mount /dev/loop0p1 /mnt
-	     sudo cp -a output/images/efi-part/* /mnt/
-	     sudo cp output/images/bzImage /mnt/
-	     sudo umount /mnt
-	  5. Prepare the root partition
-	     sudo mkfs.ext3 -L root /dev/loop0p2
-	     sudo mount /dev/loop0p2 /mnt
-	     sudo tar -C /mnt -xf output/images/rootfs.tar
-	     sudo umount /mnt
-	  6  Cleanup loop device
-	     sudo partx -d /dev/loop0
-	     sudo losetup -d /dev/loop0
-	  7. Your disk.img is ready!
-
-	  To test your EFI image in Qemu
-	  ------------------------------
-
-	  1. Download the EFI BIOS for Qemu
-	     Version IA32 or X64 depending on the chosen Grub2
-	     platform (i386-efi vs. x86-64-efi)
-	     http://sourceforge.net/projects/edk2/files/OVMF/
-	  2. Extract, and rename OVMF.fd to bios.bin and
-	     CirrusLogic5446.rom to vgabios-cirrus.bin.
-	  3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
-	  4. Make sure to pass pci=nocrs to the kernel command line,
-	     to workaround a bug in the EFI BIOS regarding the
-	     EFI framebuffer.
+	  For additional notes on using Grub 2 with Buildroot, see
+	  boot/grub2/readme.txt
 
 	  http://www.gnu.org/software/grub/
 
@@ -167,3 +77,7 @@ config BR2_TARGET_GRUB2_BUILTIN_CONFIG
 	  entries cannot be described in this embedded configuration.
 
 endif # BR2_TARGET_GRUB2
+
+comment "grub2 needs a toolchain w/ wchar"
+	depends on BR2_TARGET_GRUB2_ARCH_SUPPORTS
+	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/boot/grub2/grub2.hash b/bsp/buildroot/boot/grub2/grub2.hash
index 88839056..7f0679fe 100644
--- a/bsp/buildroot/boot/grub2/grub2.hash
+++ b/bsp/buildroot/boot/grub2/grub2.hash
@@ -1,2 +1,2 @@
-# Locally calculated after checking pgp signature
-sha256	784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458	grub-2.00.tar.xz
+# Locally computed:
+sha256 810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f grub-2.02.tar.xz
diff --git a/bsp/buildroot/boot/grub2/grub2.mk b/bsp/buildroot/boot/grub2/grub2.mk
index 373bce1c..35aea412 100644
--- a/bsp/buildroot/boot/grub2/grub2.mk
+++ b/bsp/buildroot/boot/grub2/grub2.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GRUB2_VERSION = 2.00
-GRUB2_SITE = $(BR2_GNU_MIRROR)/grub
+GRUB2_VERSION = 2.02
+GRUB2_SITE = http://ftp.gnu.org/gnu/grub
 GRUB2_SOURCE = grub-$(GRUB2_VERSION).tar.xz
-GRUB2_LICENSE = GPLv3+
+GRUB2_LICENSE = GPL-3.0+
 GRUB2_LICENSE_FILES = COPYING
 GRUB2_DEPENDENCIES = host-bison host-flex
 
@@ -46,15 +46,15 @@ endif
 # bootloader itself; none of these are used to build the native
 # tools.
 #
-# NOTE: TARGET_STRIP is overridden by BR2_STRIP_none, so always
+# NOTE: TARGET_STRIP is overridden by !BR2_STRIP_strip, so always
 # use the cross compile variant to ensure grub2 builds
 
 GRUB2_CONF_ENV = \
 	$(HOST_CONFIGURE_OPTS) \
 	CPP="$(HOSTCC) -E" \
 	TARGET_CC="$(TARGET_CC)" \
-	TARGET_CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" \
-	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	TARGET_CFLAGS="$(TARGET_CFLAGS)" \
+	TARGET_CPPFLAGS="$(TARGET_CPPFLAGS) -fno-stack-protector" \
 	TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
 	NM="$(TARGET_NM)" \
 	OBJCOPY="$(TARGET_OBJCOPY)" \
@@ -63,6 +63,8 @@ GRUB2_CONF_ENV = \
 GRUB2_CONF_OPTS = \
 	--target=$(GRUB2_TARGET) \
 	--with-platform=$(GRUB2_PLATFORM) \
+	--prefix=/ \
+	--exec-prefix=/ \
 	--disable-grub-mkfont \
 	--enable-efiemu=no \
 	ac_cv_lib_lzma_lzma_code=no \
@@ -79,15 +81,15 @@ GRUB2_INSTALL_TARGET_OPTS = DESTDIR=$(HOST_DIR) install
 
 ifeq ($(BR2_TARGET_GRUB2_I386_PC),y)
 define GRUB2_IMAGE_INSTALL_ELTORITO
-	cat $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \
+	cat $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE)/cdboot.img $(GRUB2_IMAGE) > \
 		$(BINARIES_DIR)/grub-eltorito.img
 endef
 endif
 
 define GRUB2_IMAGE_INSTALLATION
 	mkdir -p $(dir $(GRUB2_IMAGE))
-	$(HOST_DIR)/usr/bin/grub-mkimage \
-		-d $(HOST_DIR)/usr/lib/grub/$(GRUB2_TUPLE) \
+	$(HOST_DIR)/bin/grub-mkimage \
+		-d $(HOST_DIR)/lib/grub/$(GRUB2_TUPLE) \
 		-O $(GRUB2_TUPLE) \
 		-o $(GRUB2_IMAGE) \
 		-p "$(GRUB2_PREFIX)" \
diff --git a/bsp/buildroot/boot/grub2/readme.txt b/bsp/buildroot/boot/grub2/readme.txt
new file mode 100644
index 00000000..f6fd4566
--- /dev/null
+++ b/bsp/buildroot/boot/grub2/readme.txt
@@ -0,0 +1,98 @@
+Notes on using Grub2 for BIOS-based platforms
+=============================================
+
+1. Create a disk image
+   dd if=/dev/zero of=disk.img bs=1M count=32
+2. Partition it (either legacy or GPT style partitions work)
+   cfdisk disk.img
+    - Create one partition, type Linux, for the root
+      filesystem. The only constraint is to make sure there
+      is enough free space *before* the first partition to
+      store Grub2. Leaving 1 MB of free space is safe.
+3. Setup loop device and loop partitions
+   sudo losetup -f disk.img
+   sudo partx -a /dev/loop0
+4. Prepare the root partition
+   sudo mkfs.ext3 -L root /dev/loop0p1
+   sudo mount /dev/loop0p1 /mnt
+   sudo tar -C /mnt -xf output/images/rootfs.tar
+   sudo umount /mnt
+5. Install Grub2
+   sudo ./output/host/sbin/grub-bios-setup \
+        -b ./output/host/lib/grub/i386-pc/boot.img \
+        -c ./output/images/grub.img -d . /dev/loop0
+6. Cleanup loop device
+   sudo partx -d /dev/loop0
+   sudo losetup -d /dev/loop0
+7. Your disk.img is ready!
+
+Using genimage
+--------------
+
+If you use genimage to generate your complete image,
+installing Grub can be tricky. Here is how to achieve Grub's
+installation with genimage:
+
+partition boot {
+    in-partition-table = "no"
+    image = "path_to_boot.img"
+    offset = 0
+    size = 512
+}
+partition grub {
+    in-partition-table = "no"
+    image = "path_to_grub.img"
+    offset = 512
+}
+
+The result is not byte to byte identical to what
+grub-bios-setup does but it works anyway.
+
+To test your BIOS image in Qemu
+-------------------------------
+
+qemu-system-{i386,x86-64} -hda disk.img
+
+Notes on using Grub2 for EFI-based platforms
+============================================
+
+1. Create a disk image
+   dd if=/dev/zero of=disk.img bs=1M count=32
+2. Partition it with GPT partitions
+   cgdisk disk.img
+    - Create a first partition, type EF00, for the
+      bootloader and kernel image
+    - Create a second partition, type 8300, for the root
+      filesystem.
+3. Setup loop device and loop partitions
+   sudo losetup -f disk.img
+   sudo partx -a /dev/loop0
+4. Prepare the boot partition
+   sudo mkfs.vfat -n boot /dev/loop0p1
+   sudo mount /dev/loop0p1 /mnt
+   sudo cp -a output/images/efi-part/* /mnt/
+   sudo cp output/images/bzImage /mnt/
+   sudo umount /mnt
+5. Prepare the root partition
+   sudo mkfs.ext3 -L root /dev/loop0p2
+   sudo mount /dev/loop0p2 /mnt
+   sudo tar -C /mnt -xf output/images/rootfs.tar
+   sudo umount /mnt
+6  Cleanup loop device
+   sudo partx -d /dev/loop0
+   sudo losetup -d /dev/loop0
+7. Your disk.img is ready!
+
+To test your EFI image in Qemu
+------------------------------
+
+1. Download the EFI BIOS for Qemu
+   Version IA32 or X64 depending on the chosen Grub2
+   platform (i386-efi vs. x86-64-efi)
+   http://sourceforge.net/projects/edk2/files/OVMF/
+2. Extract, and rename OVMF.fd to bios.bin and
+   CirrusLogic5446.rom to vgabios-cirrus.bin.
+3. qemu-system-{i386,x86-64} -L ovmf-dir/ -hda disk.img
+4. Make sure to pass pci=nocrs to the kernel command line,
+   to workaround a bug in the EFI BIOS regarding the
+   EFI framebuffer.
diff --git a/bsp/buildroot/boot/gummiboot/gummiboot.mk b/bsp/buildroot/boot/gummiboot/gummiboot.mk
index 02ad28b4..85a5daae 100644
--- a/bsp/buildroot/boot/gummiboot/gummiboot.mk
+++ b/bsp/buildroot/boot/gummiboot/gummiboot.mk
@@ -7,7 +7,7 @@
 GUMMIBOOT_SITE = http://cgit.freedesktop.org/gummiboot
 GUMMIBOOT_SITE_METHOD = git
 GUMMIBOOT_VERSION = 43
-GUMMIBOOT_LICENSE = LGPLv2.1+
+GUMMIBOOT_LICENSE = LGPL-2.1+
 GUMMIBOOT_LICENSE_FILES = LICENSE
 
 # The git archive does not have the autoconf/automake stuff generated.
diff --git a/bsp/buildroot/boot/mv-ddr-marvell/Config.in b/bsp/buildroot/boot/mv-ddr-marvell/Config.in
new file mode 100644
index 00000000..4ee8c95b
--- /dev/null
+++ b/bsp/buildroot/boot/mv-ddr-marvell/Config.in
@@ -0,0 +1,10 @@
+config BR2_TARGET_MV_DDR_MARVELL
+	bool "mv-ddr-marvell"
+	depends on BR2_aarch64
+	help
+	  Marvell keeps algorithms for DDR training in a separate
+	  repository. This code is not built separately, it is needed
+	  as a dependency to build ATF firmware for Marvell Armada 7040
+	  and 8040 SoCs.
+
+	  https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/
diff --git a/bsp/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash b/bsp/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash
new file mode 100644
index 00000000..b96d4d2b
--- /dev/null
+++ b/bsp/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 d413546367ffa3b5f4373a777b9efeb32dcc74d6106897c248935ecb79afc454 mv-ddr-marvell-656440a9690f3d07be9e3d2c39d7cf56fd96eb7b.tar.gz
diff --git a/bsp/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk b/bsp/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk
new file mode 100644
index 00000000..0f98fc2c
--- /dev/null
+++ b/bsp/buildroot/boot/mv-ddr-marvell/mv-ddr-marvell.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# mv-ddr-marvell
+#
+################################################################################
+
+MV_DDR_MARVELL_VERSION = 656440a9690f3d07be9e3d2c39d7cf56fd96eb7b
+MV_DDR_MARVELL_SITE = $(call github,MarvellEmbeddedProcessors,mv-ddr-marvell,$(MV_DDR_MARVELL_VERSION))
+MV_DDR_MARVELL_LICENSE = GPL-2.0+ or LGPL-2.1 with freertos-exception-2.0, BSD-3-Clause, Marvell Commercial
+MV_DDR_MARVELL_LICENSE_FILES = ddr3_init.c
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/boot/mxs-bootlets/mxs-bootlets.mk b/bsp/buildroot/boot/mxs-bootlets/mxs-bootlets.mk
index 17af6dc1..adc22767 100644
--- a/bsp/buildroot/boot/mxs-bootlets/mxs-bootlets.mk
+++ b/bsp/buildroot/boot/mxs-bootlets/mxs-bootlets.mk
@@ -13,6 +13,7 @@ else ifeq ($(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT),y)
 MXS_BOOTLETS_SITE = $(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_URL)
 MXS_BOOTLETS_SITE_METHOD = git
 MXS_BOOTLETS_VERSION = $(call qstrip,$(BR2_TARGET_MXS_BOOTLETS_CUSTOM_GIT_VERSION))
+BR_NO_CHECK_HASH_FOR += $(MXS_BOOTLETS_SOURCE)
 else
 MXS_BOOTLETS_VERSION = 10.12.01
 MXS_BOOTLETS_SITE = http://download.ossystems.com.br/bsp/freescale/source
@@ -35,7 +36,7 @@ MXS_BOOTLETS_ELFTOSB_OPTIONS += -f imx28
 endif
 
 MXS_BOOTLETS_DEPENDENCIES = host-elftosb
-MXS_BOOTLETS_LICENSE = GPLv2+
+MXS_BOOTLETS_LICENSE = GPL-2.0+
 
 ifeq ($(BR2_TARGET_MXS_BOOTLETS_BAREBOX),y)
 MXS_BOOTLETS_DEPENDENCIES += barebox
@@ -93,7 +94,7 @@ define MXS_BOOTLETS_BUILD_CMDS
 	$(MXS_BOOTLETS_SED_BAREBOX)
 	$(MXS_BOOTLETS_SED_LINUX)
 	$(MXS_BOOTLETS_SED_UBOOT)
-	$(HOST_DIR)/usr/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \
+	$(HOST_DIR)/bin/elftosb $(MXS_BOOTLETS_ELFTOSB_OPTIONS) \
 		-z -c $(@D)/$(MXS_BOOTLETS_BOOTDESC) \
 		-o $(@D)/$(MXS_BOOTLETS_BOOTSTREAM)
 endef
diff --git a/bsp/buildroot/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch b/bsp/buildroot/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch
deleted file mode 100644
index 83a87ee0..00000000
--- a/bsp/buildroot/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 61de7762389d460da7ffdd644f50c60175cce23b Mon Sep 17 00:00:00 2001
-From: Steve McIntyre <93sam@debian.org>
-Date: Wed, 5 Apr 2017 22:09:37 +0200
-Subject: [PATCH] Fix 'ldlinux.elf: Not enough room for program headers, try
- linking with -N'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix for https://bugs.debian.org/846679: syslinux: FTBFS: ld:
-ldlinux.elf: Not enough room for program headers, try linking with -N
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=846679;filename=syslinux_6.03%2Bdfsg-14.1.debdiff;msg=10
-
-Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
----
- core/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/Makefile b/core/Makefile
-index ad0acb5..58a3545 100644
---- a/core/Makefile
-+++ b/core/Makefile
-@@ -165,7 +165,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
- 
- %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
- 	$(LD) $(LDFLAGS) -Bsymbolic $(LD_PIE) -E --hash-style=gnu -T $(LDSCRIPT) -M -o $@ $< \
--		--start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group \
-+		--start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group --no-dynamic-linker \
- 		> $(@:.elf=.map)
- 	$(OBJDUMP) -h $@ > $(@:.elf=.sec)
- 	$(PERL) $(SRC)/lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst)
--- 
-2.7.4
-
diff --git a/bsp/buildroot/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch b/bsp/buildroot/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
similarity index 100%
rename from bsp/buildroot/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch
rename to bsp/buildroot/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
diff --git a/bsp/buildroot/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch b/bsp/buildroot/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
similarity index 100%
rename from bsp/buildroot/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch
rename to bsp/buildroot/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
diff --git a/bsp/buildroot/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch b/bsp/buildroot/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
similarity index 100%
rename from bsp/buildroot/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch
rename to bsp/buildroot/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
diff --git a/bsp/buildroot/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch b/bsp/buildroot/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
new file mode 100644
index 00000000..c3760102
--- /dev/null
+++ b/bsp/buildroot/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
@@ -0,0 +1,37 @@
+From 39274503292a6003b1b0c93f694e34f11e85ea44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
+Date: Fri, 9 Jun 2017 11:55:14 +0200
+Subject: [PATCH] The VPrint definition is now part of the exports of
+ gnu-efi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
+---
+ efi/fio.h | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/efi/fio.h b/efi/fio.h
+index 65fff8d..a1bfe68 100644
+--- a/efi/fio.h
++++ b/efi/fio.h
+@@ -11,15 +11,6 @@
+ #define MAX_EFI_ARGS		64
+ #define WS(c16)         (c16 == L' ' || c16 == CHAR_TAB)
+ 
+-/* VPrint is not in export declarations in gnu-efi lib yet
+- * although it is a global function; declare it here
+- */
+-extern UINTN
+-VPrint (
+-    IN CHAR16   *fmt,
+-    va_list     args
+-    );
+-
+ extern EFI_STATUS efi_errno;
+ 
+ void efi_memcpy(unsigned char *dst, unsigned char *src, size_t len);
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch b/bsp/buildroot/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
new file mode 100644
index 00000000..90d0b81f
--- /dev/null
+++ b/bsp/buildroot/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
@@ -0,0 +1,37 @@
+From 3bd5c2d951421a89f76b2423e5810862f53486c1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
+Date: Fri, 9 Jun 2017 11:59:43 +0200
+Subject: [PATCH] Update the longjump calls to fit the new declaration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
+---
+ efi/main.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/efi/main.c b/efi/main.c
+index 208fee4f..71d31a5c 100644
+--- a/efi/main.c
++++ b/efi/main.c
+@@ -10,7 +10,6 @@
+ #include <syslinux/firmware.h>
+ #include <syslinux/linux.h>
+ #include <sys/ansi.h>
+-#include <setjmp.h>
+ 
+ #include "efi.h"
+ #include "fio.h"
+@@ -30,7 +29,7 @@ uint32_t timer_irq;
+ __export uint8_t KbdMap[256];
+ char aux_seg[256];
+ 
+-static jmp_buf load_error_buf;
++static jmp_buf *load_error_buf;
+ 
+ static inline EFI_STATUS
+ efi_close_protocol(EFI_HANDLE handle, EFI_GUID *guid, EFI_HANDLE agent,
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch b/bsp/buildroot/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
new file mode 100644
index 00000000..9ec12a17
--- /dev/null
+++ b/bsp/buildroot/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
@@ -0,0 +1,32 @@
+From ca8aaded0c7c3900397029bd9520132b62629308 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
+Date: Mon, 12 Jun 2017 14:59:16 +0200
+Subject: [PATCH] efi/wrapper: build it with the host toolchain.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The wrapper program is executed on the build machine, so it should be
+built with CC_FOR_BUILD.
+
+Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
+---
+ efi/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/efi/Makefile b/efi/Makefile
+index d5443bd5..d24d16db 100644
+--- a/efi/Makefile
++++ b/efi/Makefile
+@@ -79,7 +79,7 @@ syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
+ #	cp $^ $@
+ 
+ wrapper: wrapper.c
+-	$(CC) $^ -o $@
++	$(CC_FOR_BUILD) $^ -o $@
+ 
+ #
+ # Build the wrapper app and wrap our .so to produce a .efi
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch b/bsp/buildroot/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch
new file mode 100644
index 00000000..916012f6
--- /dev/null
+++ b/bsp/buildroot/boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch
@@ -0,0 +1,295 @@
+From 76946dd67bc856eaf4fe69d0826547a794176f78 Mon Sep 17 00:00:00 2001
+From: Sylvain Gault <sylvain.gault@gmail.com>
+Date: Tue, 29 Sep 2015 04:45:09 +0200
+Subject: [PATCH] bios: Don't try to guess the sections alignment
+
+For the compression / decompression to succeed, the sections layout must
+be the same between the virtual memory and load memory. The section
+alignment was kept in sync by introducing aligment that should be
+greater or equal to the actual section alignment.
+
+This patch compute the load memory addresses of the sections so that
+the layout is the same as the virtual memory addresses.
+
+Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
+Tested-by: poma <pomidorabelisima@gmail.com>
+Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
+
+Upstream: 0cc9a99e560a2f52bcf052fd85b1efae35ee812f
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ core/i386/syslinux.ld   | 63 ++++++++++---------------------------------------
+ core/x86_64/syslinux.ld | 63 ++++++++++---------------------------------------
+ 2 files changed, 24 insertions(+), 102 deletions(-)
+
+diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld
+index 73904510..92b75b11 100644
+--- a/core/i386/syslinux.ld
++++ b/core/i386/syslinux.ld
+@@ -255,10 +255,9 @@ SECTIONS
+ 	. = 0x100000;
+ 
+ 	__pm_code_start = .;
++	__vma_to_lma = __pm_code_lma - __pm_code_start;
+ 
+-	__text_vma = .;
+-	__text_lma = __pm_code_lma;
+-	.text : AT(__text_lma) {
++	.text : AT(ADDR(.text) + __vma_to_lma) {
+ 		FILL(0x90909090)
+ 		__text_start = .;
+ 		*(.text)
+@@ -266,106 +265,68 @@ SECTIONS
+ 		__text_end = .;
+ 	}
+ 
+-	. = ALIGN(32);
+-
+-	__rodata_vma = .;
+-	__rodata_lma = __rodata_vma + __text_lma - __text_vma;
+-	.rodata : AT(__rodata_lma) {
++	.rodata : AT(ADDR(.rodata) + __vma_to_lma) {
+ 		__rodata_start = .;
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__ctors_vma = .;
+-	__ctors_lma = __ctors_vma + __text_lma - __text_vma;
+-	.ctors : AT(__ctors_lma) {
++	.ctors : AT(ADDR(.ctors) + __vma_to_lma) {
+ 		__ctors_start = .;
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+ 	}
+ 
+-	__dtors_vma = .;
+-	__dtors_lma = __dtors_vma + __text_lma - __text_vma;
+-	.dtors : AT(__dtors_lma) {
++	.dtors : AT(ADDR(.dtors) + __vma_to_lma) {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__dynsym_vma = .;
+-	__dynsym_lma = __dynsym_vma + __text_lma - __text_vma;
+-	.dynsym : AT(__dynsym_lma) {
++	.dynsym : AT(ADDR(.dynsym) + __vma_to_lma) {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+ 	}
+ 	__dynsym_len = __dynsym_end - __dynsym_start;
+ 
+-	. = ALIGN(4);
+-
+-	__dynstr_vma = .;
+-	__dynstr_lma = __dynstr_vma + __text_lma - __text_vma;
+-	.dynstr : AT(__dynstr_lma) {
++	.dynstr : AT(ADDR(.dynstr) + __vma_to_lma) {
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+ 	}
+ 	__dynstr_len = __dynstr_end - __dynstr_start;
+ 
+-	. = ALIGN(4);
+-
+-	__gnu_hash_vma = .;
+-	__gnu_hash_lma = __gnu_hash_vma + __text_lma - __text_vma;
+-	.gnu.hash : AT(__gnu_hash_lma) {
++	.gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) {
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+ 	}
+ 
+ 
+-	. = ALIGN(4);
+-
+-	__dynlink_vma = .;
+-	__dynlink_lma = __dynlink_vma + __text_lma - __text_vma;
+-	.dynlink : AT(__dynlink_lma) {
++	.dynlink : AT(ADDR(.dynlink) + __vma_to_lma) {
+ 		__dynlink_start = .;
+ 		*(.dynlink)
+ 		__dynlink_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__got_vma = .;
+-	__got_lma = __got_vma + __text_lma - __text_vma;
+-	.got : AT(__got_lma) {
++	.got : AT(ADDR(.got) + __vma_to_lma) {
+ 		__got_start = .;
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__dynamic_vma = .;
+-	__dynamic_lma = __dynamic_vma + __text_lma - __text_vma;
+-	.dynamic : AT(__dynamic_lma) {
++	.dynamic : AT(ADDR(.dynamic) + __vma_to_lma) {
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+ 	}
+ 
+-	. = ALIGN(32);
+-
+-	__data_vma = .;
+-	__data_lma = __data_vma + __text_lma - __text_vma;
+-	.data : AT(__data_lma) {
++	.data : AT(ADDR(.data) + __vma_to_lma) {
+ 		__data_start = .;
+ 		*(.data)
+ 		*(.data.*)
+diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld
+index bf815c46..70c6e00a 100644
+--- a/core/x86_64/syslinux.ld
++++ b/core/x86_64/syslinux.ld
+@@ -255,10 +255,9 @@ SECTIONS
+ 	. = 0x100000;
+ 
+ 	__pm_code_start = .;
++	__vma_to_lma = __pm_code_lma - __pm_code_start;
+ 
+-	__text_vma = .;
+-	__text_lma = __pm_code_lma;
+-	.text : AT(__text_lma) {
++	.text : AT(ADDR(.text) + __vma_to_lma) {
+ 		FILL(0x90909090)
+ 		__text_start = .;
+ 		*(.text)
+@@ -266,106 +265,68 @@ SECTIONS
+ 		__text_end = .;
+ 	}
+ 
+-	. = ALIGN(32);
+-
+-	__rodata_vma = .;
+-	__rodata_lma = __rodata_vma + __text_lma - __text_vma;
+-	.rodata : AT(__rodata_lma) {
++	.rodata : AT(ADDR(.rodata) + __vma_to_lma) {
+ 		__rodata_start = .;
+ 		*(.rodata)
+ 		*(.rodata.*)
+ 		__rodata_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__ctors_vma = .;
+-	__ctors_lma = __ctors_vma + __text_lma - __text_vma;
+-	.ctors : AT(__ctors_lma) {
++	.ctors : AT(ADDR(.ctors) + __vma_to_lma) {
+ 		__ctors_start = .;
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+ 		__ctors_end = .;
+ 	}
+ 
+-	__dtors_vma = .;
+-	__dtors_lma = __dtors_vma + __text_lma - __text_vma;
+-	.dtors : AT(__dtors_lma) {
++	.dtors : AT(ADDR(.dtors) + __vma_to_lma) {
+ 		__dtors_start = .;
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+ 		__dtors_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__dynsym_vma = .;
+-	__dynsym_lma = __dynsym_vma + __text_lma - __text_vma;
+-	.dynsym : AT(__dynsym_lma) {
++	.dynsym : AT(ADDR(.dynsym) + __vma_to_lma) {
+ 		__dynsym_start = .;
+ 		*(.dynsym)
+ 		__dynsym_end = .;
+ 	}
+ 	__dynsym_len = __dynsym_end - __dynsym_start;
+ 
+-	. = ALIGN(4);
+-
+-	__dynstr_vma = .;
+-	__dynstr_lma = __dynstr_vma + __text_lma - __text_vma;
+-	.dynstr : AT(__dynstr_lma) {
++	.dynstr : AT(ADDR(.dynstr) + __vma_to_lma) {
+ 		__dynstr_start = .;
+ 		*(.dynstr)
+ 		__dynstr_end = .;
+ 	}
+ 	__dynstr_len = __dynstr_end - __dynstr_start;
+ 
+-	. = ALIGN(4);
+-
+-	__gnu_hash_vma = .;
+-	__gnu_hash_lma = __gnu_hash_vma + __text_lma - __text_vma;
+-	.gnu.hash : AT(__gnu_hash_lma) {
++	.gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) {
+ 		__gnu_hash_start = .;
+ 		*(.gnu.hash)
+ 		__gnu_hash_end = .;
+ 	}
+ 
+ 
+-	. = ALIGN(4);
+-
+-	__dynlink_vma = .;
+-	__dynlink_lma = __dynlink_vma + __text_lma - __text_vma;
+-	.dynlink : AT(__dynlink_lma) {
++	.dynlink : AT(ADDR(.dynlink) + __vma_to_lma) {
+ 		__dynlink_start = .;
+ 		*(.dynlink)
+ 		__dynlink_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__got_vma = .;
+-	__got_lma = __got_vma + __text_lma - __text_vma;
+-	.got : AT(__got_lma) {
++	.got : AT(ADDR(.got) + __vma_to_lma) {
+ 		__got_start = .;
+ 		KEEP (*(.got.plt))
+ 		KEEP (*(.got))
+ 		__got_end = .;
+ 	}
+ 
+-	. = ALIGN(4);
+-
+-	__dynamic_vma = .;
+-	__dynamic_lma = __dynamic_vma + __text_lma - __text_vma;
+-	.dynamic : AT(__dynamic_lma) {
++	.dynamic : AT(ADDR(.dynamic) + __vma_to_lma) {
+ 		__dynamic_start = .;
+ 		*(.dynamic)
+ 		__dynamic_end = .;
+ 	}
+ 
+-	. = ALIGN(32);
+-
+-	__data_vma = .;
+-	__data_lma = __data_vma + __text_lma - __text_vma;
+-	.data : AT(__data_lma) {
++	.data : AT(ADDR(.data) + __vma_to_lma) {
+ 		__data_start = .;
+ 		*(.data)
+ 		*(.data.*)
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch b/bsp/buildroot/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch
new file mode 100644
index 00000000..8b6d5254
--- /dev/null
+++ b/bsp/buildroot/boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch
@@ -0,0 +1,622 @@
+From a14b1b3d3e375d2e8af8804171ef5e52574dbb2a Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin" <hpa@zytor.com>
+Date: Tue, 9 Feb 2016 18:15:50 -0800
+Subject: [PATCH] core: Clean up the i386-bios build
+
+Remove symbols and data structures not used in the i386-bios build,
+and clean up the linker script so that most internal symbols are
+HIDDEN.
+
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+
+Upstream: ff859050fa4e6535cae098dc35d88a265466448d
+
+This patch fixes the following build failure with i386 binutils 2.28.1:
+
+/builds/arnout/buildroot/output/host/bin/i586-buildroot-linux-uclibc-ld  -Bsymbolic -pie -E --hash-style=gnu -T
+/builds/arnout/buildroot/output/build/syslinux-6.03/core/i386/syslinux.ld -M -o ldlinux.elf ldlinux.o \
+	--start-group libcom32.a --whole-archive /builds/arnout/buildroot/output/build/syslinux-6.03/bios/com32/lib/libcom32core.a libldlinux.a --end-group -N
+--no-omagic \
+	> ldlinux.map
+/builds/arnout/buildroot/output/host/bin/i586-buildroot-linux-uclibc-ld: ldlinux.elf: Not enough room for program headers, try linking with -N
+/builds/arnout/buildroot/output/host/bin/i586-buildroot-linux-uclibc-ld: final link failed: Bad value
+/builds/arnout/buildroot/output/build/syslinux-6.03/core/Makefile:167: recipe for target 'ldlinux.elf' failed
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ core/extern.inc       |  17 +--
+ core/i386/syslinux.ld | 287 +++++++++++++++++++++++++-------------------------
+ core/layout.inc       |  11 --
+ 3 files changed, 143 insertions(+), 172 deletions(-)
+
+diff --git a/core/extern.inc b/core/extern.inc
+index af8eb04c..ce4abfab 100644
+--- a/core/extern.inc
++++ b/core/extern.inc
+@@ -12,27 +12,17 @@
+ 	; hello.c
+ 	extern hello
+ 
+-	;abort.c
+-	extern abort_load_new
+-
+ 	; elflink/load_env32.c
+ 	extern load_env32, pm_env32_run
+ 
+-	; memscan.c
+-	extern highmem_init
+-
+-	extern linux_kernel
+-
+ 	extern mp1, mp2, mp3, mp4, mp5
+ 
+-	extern hexdump, mydump
++	extern hexdump
+ 
+ 	extern mem_init
+ 
+ 	; fs.c
+-	extern pm_fs_init, pm_searchdir, getfssec, getfsbytes
+-	extern pm_mangle_name, pm_load_config
+-        extern pm_open_file, pm_close_file
++	extern pm_fs_init
+ 	extern SectorSize, SectorShift
+ 
+ 	; chdir.c
+@@ -41,9 +31,6 @@
+         ; readdir.c
+         extern opendir, readdir, closedir
+ 
+-	; newconfig.c
+-	extern pm_is_config_file
+-
+ 	; idle.c
+ 	extern __idle
+ 
+diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld
+index 92b75b11..39198d75 100644
+--- a/core/i386/syslinux.ld
++++ b/core/i386/syslinux.ld
+@@ -1,7 +1,7 @@
+ /* -----------------------------------------------------------------------
+  *   
+  *   Copyright 2008-2009 H. Peter Anvin - All Rights Reserved
+- *   Copyright 2009 Intel Corporation; author: H. Peter Anvin
++ *   Copyright 2009-2016 Intel Corporation; author: H. Peter Anvin
+  *
+  *   This program is free software; you can redistribute it and/or modify
+  *   it under the terms of the GNU General Public License as published by
+@@ -12,7 +12,7 @@
+  * ----------------------------------------------------------------------- */
+ 
+ /*
+- * Linker script for the SYSLINUX core
++ * Linker script for the SYSLINUX core when built for i386-bios
+  */
+ 
+ OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+@@ -26,7 +26,7 @@ SECTIONS
+ {
+ 	/* Prefix structure for the compression program */
+ 	. = 0;
+-	__module_start = .;
++	HIDDEN(__module_start = ABSOLUTE(.));
+ 	.prefix : {
+ 		*(.prefix)
+ 	}
+@@ -35,81 +35,82 @@ SECTIONS
+ 	. = 0x1000;
+ 
+ 	.earlybss (NOLOAD) : {
+-		__earlybss_start = .;
++		HIDDEN(__earlybss_start = .);
+ 		*(.earlybss)
+-		__earlybss_end = .;
++		HIDDEN(__earlybss_end = .);
+ 	}
+-	__earlybss_len = ABSOLUTE(__earlybss_end) - ABSOLUTE(__earlybss_start);
+-	__earlybss_dwords = (__earlybss_len + 3) >> 2;
++	HIDDEN(__earlybss_len = ABSOLUTE(__earlybss_end) - ABSOLUTE(__earlybss_start));
++	HIDDEN(__earlybss_dwords = (__earlybss_len + 3) >> 2);
+ 
+ 	. = ALIGN(4);
+ 	.bss16 (NOLOAD) : {
+-		__bss16_start = .;
++		HIDDEN(__bss16_start = .);
+ 		*(.bss16)
+-		__bss16_end = .;
++		HIDDEN(__bss16_end = .);
+ 	}
+-	__bss16_len = ABSOLUTE(__bss16_end) - ABSOLUTE(__bss16_start);
+-	__bss16_dwords = (__bss16_len + 3) >> 2;
++	HIDDEN(__bss16_len = ABSOLUTE(__bss16_end) - ABSOLUTE(__bss16_start));
++	HIDDEN(__bss16_dwords = (__bss16_len + 3) >> 2);
+ 
+ 	. = ALIGN(4);
+  	.config : AT (__config_lma) {
+-		__config_start = .;
++		HIDDEN(__config_start = .);
+ 		*(.config)
+-		__config_end = .;
++		HIDDEN(__config_end = .);
+ 	}
+-	__config_len = ABSOLUTE(__config_end) - ABSOLUTE(__config_start);
+-	__config_dwords = (__config_len + 3) >> 2;
++	HIDDEN(__config_len = ABSOLUTE(__config_end) - ABSOLUTE(__config_start));
++	HIDDEN(__config_dwords = (__config_len + 3) >> 2);
+ 
+ 	/* Generated and/or copied code */
+ 
+ 	. = ALIGN(128);		/* Minimum separation from mutable data */
+  	.replacestub : AT (__replacestub_lma) {
+-		__replacestub_start = .;
++		HIDDEN(__replacestub_start = .);
+ 		*(.replacestub)
+-		__replacestub_end = .;
++		HIDDEN(__replacestub_end = .);
+ 	}
+-	__replacestub_len = ABSOLUTE(__replacestub_end) - ABSOLUTE(__replacestub_start);
+-	__replacestub_dwords = (__replacestub_len + 3) >> 2;
++	HIDDEN(__replacestub_len = ABSOLUTE(__replacestub_end) - ABSOLUTE(__replacestub_start));
++	HIDDEN(__replacestub_dwords = (__replacestub_len + 3) >> 2);
+ 
+ 	. = ALIGN(16);
+-	__gentextnr_lma = .;
++	HIDDEN(__gentextnr_lma = .);
+ 	.gentextnr : AT(__gentextnr_lma) {
+-		__gentextnr_start = .;
++		HIDDEN(__gentextnr_start = .);
+ 		*(.gentextnr)
+-		__gentextnr_end = .;
++		HIDDEN(__gentextnr_end = .);
+ 	}
+-	__gentextnr_len = ABSOLUTE(__gentextnr_end) - ABSOLUTE(__gentextnr_start);
+-	__gentextnr_dwords = (__gentextnr_len + 3) >> 2;
++	HIDDEN(__gentextnr_len = ABSOLUTE(__gentextnr_end) - ABSOLUTE(__gentextnr_start));
++	HIDDEN(__gentextnr_dwords = (__gentextnr_len + 3) >> 2);
+ 
+ 	. = STACK_BASE;
+ 	.stack16 : AT(STACK_BASE) {
+-		__stack16_start = .;
++		HIDDEN(__stack16_start = .);
+ 		. += STACK_LEN;
+-		__stack16_end = .;
++		HIDDEN(__stack16_end = .);
+ 	}
+-	__stack16_len = ABSOLUTE(__stack16_end) - ABSOLUTE(__stack16_start);
+-	__stack16_dwords = (__stack16_len + 3) >> 2;
++	HIDDEN(__stack16_len = ABSOLUTE(__stack16_end) - ABSOLUTE(__stack16_start));
++	HIDDEN(__stack16_dwords = (__stack16_len + 3) >> 2);
+ 
+ 	/* Initialized sections */
+ 
+ 	. = 0x7c00;
+ 	.init : {
+ 		FILL(0x90909090)
+-		__init_start = .;
++		HIDDEN(__init_start = .);
+ 		*(.init)
+-		__init_end = .;
++		HIDDEN(__init_end = .);
+ 	}
+-	__init_len = ABSOLUTE(__init_end) - ABSOLUTE(__init_start);
+-	__init_dwords = (__init_len + 3) >> 2;
++	HIDDEN(__init_len = ABSOLUTE(__init_end) - ABSOLUTE(__init_start));
++	HIDDEN(__init_dwords = (__init_len + 3) >> 2);
+ 
++	. = ALIGN(4);
+ 	.text16 : {
+ 		FILL(0x90909090)
+-		__text16_start = .;
++		HIDDEN(__text16_start = .);
+ 		*(.text16)
+-		__text16_end = .;
++		HIDDEN(__text16_end = .);
+ 	}
+-	__text16_len = ABSOLUTE(__text16_end) - ABSOLUTE(__text16_start);
+-	__text16_dwords = (__text16_len + 3) >> 2;
++	HIDDEN(__text16_len = ABSOLUTE(__text16_end) - ABSOLUTE(__text16_start));
++	HIDDEN(__text16_dwords = (__text16_len + 3) >> 2);
+ 
+ 	/*
+ 	 * .textnr is used for 32-bit code that is used on the code
+@@ -118,99 +119,92 @@ SECTIONS
+ 	. = ALIGN(16);
+ 	.textnr : {
+ 		FILL(0x90909090)
+-		__textnr_start = .;
++		HIDDEN(__textnr_start = .);
+ 		*(.textnr)
+-		__textnr_end = .;
++		HIDDEN(__textnr_end = .);
+ 	}
+-	__textnr_len = ABSOLUTE(__textnr_end) - ABSOLUTE(__textnr_start);
+-	__textnr_dwords = (__textnr_len + 3) >> 2;
++	HIDDEN(__textnr_len = ABSOLUTE(__textnr_end) - ABSOLUTE(__textnr_start));
++	HIDDEN(__textnr_dwords = (__textnr_len + 3) >> 2);
+ 
+ 	. = ALIGN(16);
+-	__bcopyxx_start = .;
++	HIDDEN(__bcopyxx_start = .);
+ 
+ 	.bcopyxx.text : {
+ 		FILL(0x90909090)
+-		__bcopyxx_text_start = .;
++		HIDDEN(__bcopyxx_text_start = .);
+ 		*(.bcopyxx.text)
+-		__bcopyxx_text_end = .;
++		HIDDEN(__bcopyxx_text_end = .);
+ 	}
+-	__bcopyxx_text_len = ABSOLUTE(__bcopyxx_text_end) - ABSOLUTE(__bcopyxx_text_start);
+-	__bcopyxx_text_dwords = (__bcopyxx_text_len + 3) >> 2;
++	HIDDEN(__bcopyxx_text_len = ABSOLUTE(__bcopyxx_text_end) - ABSOLUTE(__bcopyxx_text_start));
++	HIDDEN(__bcopyxx_text_dwords = (__bcopyxx_text_len + 3) >> 2);
+ 
+ 	.bcopyxx.data : {
+-		__bcopyxx_data_start = .;
++		HIDDEN(__bcopyxx_data_start = .);
+ 		*(.bcopyxx.text)
+-		__bcopyxx_data_end = .;
++		HIDDEN(__bcopyxx_data_end = .);
+ 	}
+-	__bcopyxx_data_len = ABSOLUTE(__bcopyxx_data_end) - ABSOLUTE(__bcopyxx_data_start);
+-	__bcopyxx_data_dwords = (__bcopyxx_data_len + 3) >> 2;
++	HIDDEN(__bcopyxx_data_len = ABSOLUTE(__bcopyxx_data_end) - ABSOLUTE(__bcopyxx_data_start));
++	HIDDEN(__bcopyxx_data_dwords = (__bcopyxx_data_len + 3) >> 2);
+ 
+-	__bcopyxx_end = .;
+-	__bcopyxx_len = ABSOLUTE(__bcopyxx_end) - ABSOLUTE(__bcopyxx_start);
+-	__bcopyxx_dwords = (__bcopyxx_len + 3) >> 2;
++	HIDDEN(__bcopyxx_end = .);
++	HIDDEN(__bcopyxx_len = ABSOLUTE(__bcopyxx_end) - ABSOLUTE(__bcopyxx_start));
++	HIDDEN(__bcopyxx_dwords = (__bcopyxx_len + 3) >> 2);
+ 
+ 	. = ALIGN(4);
+ 	.data16 : {
+-	      __data16_start = .;
++	      HIDDEN(__data16_start = .);
+ 	      *(.data16)
+-	      __data16_end = .;
++	      HIDDEN(__data16_end = .);
+ 	}
+-	__data16_len = ABSOLUTE(__data16_end) - ABSOLUTE(__data16_start);
+-	__data16_dwords = (__data16_len + 3) >> 2;
++	HIDDEN(__data16_len = ABSOLUTE(__data16_end) - ABSOLUTE(__data16_start));
++	HIDDEN(__data16_dwords = (__data16_len + 3) >> 2);
+ 
+ 	. = ALIGN(4);
+-	__config_lma = .;
++	HIDDEN(__config_lma = ABSOLUTE(.));
+ 	. += SIZEOF(.config);
+ 
+ 	. = ALIGN(4);
+-	__replacestub_lma = .;
++	HIDDEN(__replacestub_lma = ABSOLUTE(.));
+ 	. += SIZEOF(.replacestub);
+ 
+ 	/* The 32-bit code loads above the non-progbits sections */
+ 
+ 	. = ALIGN(16);
+-	__pm_code_lma = .;
++	HIDDEN(__pm_code_lma = ABSOLUTE(.));
+ 
+-	__high_clear_start = .;
++	HIDDEN(__high_clear_start = .);
+ 
+ 	. = ALIGN(512);
+ 	.adv (NOLOAD) : {
+-		__adv_start = .;
++		HIDDEN(__adv_start = .);
+ 		*(.adv)
+-		__adv_end = .;
++		HIDDEN(__adv_end = .);
+ 	}
+-	__adv_len = ABSOLUTE(__adv_end) - ABSOLUTE(__adv_start);
+-	__adv_dwords = (__adv_len + 3) >> 2;
++	HIDDEN(__adv_len = ABSOLUTE(__adv_end) - ABSOLUTE(__adv_start));
++	HIDDEN(__adv_dwords = (__adv_len + 3) >> 2);
+ 
+ 	/* Late uninitialized sections */
+ 
+ 	. = ALIGN(4);
+ 	.uibss (NOLOAD) : {
+-		__uibss_start = .;
++		HIDDEN(__uibss_start = .);
+ 		*(.uibss)
+-		__uibss_end = .;
++		HIDDEN(__uibss_end = .);
+ 	}
+-	__uibss_len = ABSOLUTE(__uibss_end) - ABSOLUTE(__uibss_start);
+-	__uibss_dwords = (__uibss_len + 3) >> 2;
++	HIDDEN(__uibss_len = ABSOLUTE(__uibss_end) - ABSOLUTE(__uibss_start));
++	HIDDEN(__uibss_dwords = (__uibss_len + 3) >> 2);
+ 
+-	_end16 = .;
+-	__assert_end16 = ASSERT(_end16 <= 0x10000, "64K overflow");
++	HIDDEN(_end16 = .);
++	HIDDEN(__assert_end16 = ASSERT(_end16 <= 0x10000, "64K overflow"));
+ 
+ 	/*
+ 	 * Special 16-bit segments
+ 	 */
+-
+-	. = ALIGN(65536);
+-	.real_mode (NOLOAD) : {
+-		*(.real_mode)
+-	}
+-	real_mode_seg = core_real_mode >> 4;
+-
+ 	. = ALIGN(65536);
+ 	.xfer_buf (NOLOAD) : {
+ 		*(.xfer_buf)
+ 	}
+-	xfer_buf_seg = core_xfer_buf >> 4;
++	HIDDEN(xfer_buf_seg = core_xfer_buf >> 4);
+ 
+ 	/*
+ 	 * The auxilliary data segment is used by the 16-bit code
+@@ -219,33 +213,33 @@ SECTIONS
+ 
+ 	. = ALIGN(16);
+ 	.auxseg (NOLOAD) : {
+-		__auxseg_start = .;
++		HIDDEN(__auxseg_start = .);
+ 		*(.auxseg)
+-		__auxseg_end = .;
++		HIDDEN(__auxseg_end = .);
+ 	}
+-	__auxseg_len = ABSOLUTE(__auxseg_end) - ABSOLUTE(__auxseg_start);
+-	__auxseg_dwords = (__auxseg_len + 3) >> 2;
+-	aux_seg = __auxseg_start >> 4;
++	HIDDEN(__auxseg_len = ABSOLUTE(__auxseg_end) - ABSOLUTE(__auxseg_start));
++	HIDDEN(__auxseg_dwords = (__auxseg_len + 3) >> 2);
++	HIDDEN(aux_seg = __auxseg_start >> 4);
+ 
+ 	/*
+ 	 * Used to allocate lowmem buffers from 32-bit code
+ 	 */
+ 	.lowmem (NOLOAD) : {
+-		__lowmem_start = .;
++		HIDDEN(__lowmem_start = .);
+ 		*(.lowmem)
+-		__lowmem_end = .;
++		HIDDEN(__lowmem_end = .);
+ 	}
+-	__lowmem_len = ABSOLUTE(__lowmem_end) - ABSOLUTE(__lowmem_start);
+-	__lowmem_dwords = (__lowmem_len + 3) >> 2;
++	HIDDEN(__lowmem_len = ABSOLUTE(__lowmem_end) - ABSOLUTE(__lowmem_start));
++	HIDDEN(__lowmem_dwords = (__lowmem_len + 3) >> 2);
+ 
+-	__high_clear_end = .;
++	HIDDEN(__high_clear_end = .);
+ 
+-	__high_clear_len = ABSOLUTE(__high_clear_end) - ABSOLUTE(__high_clear_start);
+-	__high_clear_dwords = (__high_clear_len + 3) >> 2;
++	HIDDEN(__high_clear_len = ABSOLUTE(__high_clear_end) - ABSOLUTE(__high_clear_start));
++	HIDDEN(__high_clear_dwords = (__high_clear_len + 3) >> 2);
+ 
+ 	/* Start of the lowmem heap */
+ 	. = ALIGN(16);
+-	__lowmem_heap = .;
++	HIDDEN(__lowmem_heap = .);
+ 
+ 	/*
+ 	 * 32-bit code.  This is a hack for the moment due to the
+@@ -254,136 +248,137 @@ SECTIONS
+ 
+ 	. = 0x100000;
+ 
+-	__pm_code_start = .;
+-	__vma_to_lma = __pm_code_lma - __pm_code_start;
++	HIDDEN(__pm_code_start = .);
++	HIDDEN(__vma_to_lma = ABSOLUTE(__pm_code_lma - __pm_code_start));
+ 
+ 	.text : AT(ADDR(.text) + __vma_to_lma) {
+ 		FILL(0x90909090)
+-		__text_start = .;
++		HIDDEN(__text_start = .);
+ 		*(.text)
+ 		*(.text.*)
+-		__text_end = .;
++		HIDDEN(__text_end = .);
+ 	}
+ 
+ 	.rodata : AT(ADDR(.rodata) + __vma_to_lma) {
+-		__rodata_start = .;
++		HIDDEN(__rodata_start = .);
+ 		*(.rodata)
+ 		*(.rodata.*)
+-		__rodata_end = .;
++		HIDDEN(__rodata_end = .);
+ 	}
+ 
+ 	.ctors : AT(ADDR(.ctors) + __vma_to_lma) {
+-		__ctors_start = .;
++		HIDDEN(__ctors_start = .);
+ 		KEEP (*(SORT(.ctors.*)))
+ 		KEEP (*(.ctors))
+-		__ctors_end = .;
++		HIDDEN(__ctors_end = .);
+ 	}
+ 
+ 	.dtors : AT(ADDR(.dtors) + __vma_to_lma) {
+-		__dtors_start = .;
++		HIDDEN(__dtors_start = .);
+ 		KEEP (*(SORT(.dtors.*)))
+ 		KEEP (*(.dtors))
+-		__dtors_end = .;
++		HIDDEN(__dtors_end = .);
+ 	}
+ 
+ 	.dynsym : AT(ADDR(.dynsym) + __vma_to_lma) {
+-		__dynsym_start = .;
+-		*(.dynsym)
+-		__dynsym_end = .;
++		HIDDEN(__dynsym_start = .);
++		KEEP (*(.dynsym))
++		HIDDEN(__dynsym_end = .);
+ 	}
+-	__dynsym_len = __dynsym_end - __dynsym_start;
++	HIDDEN(__dynsym_len = __dynsym_end - __dynsym_start);
+ 
+ 	.dynstr : AT(ADDR(.dynstr) + __vma_to_lma) {
+-		__dynstr_start = .;
+-		*(.dynstr)
+-		__dynstr_end = .;
++		HIDDEN(__dynstr_start = .);
++		KEEP (*(.dynstr))
++		HIDDEN(__dynstr_end = .);
+ 	}
+-	__dynstr_len = __dynstr_end - __dynstr_start;
++	HIDDEN(__dynstr_len = __dynstr_end - __dynstr_start);
+ 
+ 	.gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) {
+-		__gnu_hash_start = .;
+-		*(.gnu.hash)
+-		__gnu_hash_end = .;
++		HIDDEN(__gnu_hash_start = .);
++		KEEP (*(.gnu.hash))
++		HIDDEN(__gnu_hash_end = .);
+ 	}
+ 
+ 
+ 	.dynlink : AT(ADDR(.dynlink) + __vma_to_lma) {
+-		__dynlink_start = .;
+-		*(.dynlink)
+-		__dynlink_end = .;
++		HIDDEN(__dynlink_start = .);
++		KEEP (*(.dynlink))
++		HIDDEN(__dynlink_end = .);
+ 	}
+ 
+ 	.got : AT(ADDR(.got) + __vma_to_lma) {
+-		__got_start = .;
+-		KEEP (*(.got.plt))
++		HIDDEN(__got_start = .);
+ 		KEEP (*(.got))
+-		__got_end = .;
++		KEEP (*(.got.plt))
++		HIDDEN(__got_end = .);
+ 	}
+ 
+ 	.dynamic : AT(ADDR(.dynamic) + __vma_to_lma) {
+-		__dynamic_start = .;
+-		*(.dynamic)
+-		__dynamic_end = .;
++		HIDDEN(__dynamic_start = .);
++		KEEP (*(.dynamic))
++		HIDDEN(__dynamic_end = .);
+ 	}
+ 
+ 	.data : AT(ADDR(.data) + __vma_to_lma) {
+-		__data_start = .;
++		HIDDEN(__data_start = .);
+ 		*(.data)
+ 		*(.data.*)
+-		__data_end = .;
++		HIDDEN(__data_end = .);
+ 	}
+ 
+-	__pm_code_end = .;
+-	__pm_code_len = ABSOLUTE(__pm_code_end) - ABSOLUTE(__pm_code_start);
+-	__pm_code_dwords = (__pm_code_len + 3) >> 2;
++	HIDDEN(__pm_code_end = .);
++	HIDDEN(__pm_code_len = ABSOLUTE(__pm_code_end) - ABSOLUTE(__pm_code_start));
++	HIDDEN(__pm_code_dwords = (__pm_code_len + 3) >> 2);
+ 
+ 	. = ALIGN(128);
+ 
+-	__bss_vma = .;
+-	__bss_lma = .;		/* Dummy */
++	HIDDEN(__bss_vma = .);
++	HIDDEN(__bss_lma = ABSOLUTE(.));		/* Dummy */
+ 	.bss (NOLOAD) : AT (__bss_lma) {
+-		__bss_start = .;
++		HIDDEN(__bss_start = .);
+ 		*(.bss)
+ 		*(.bss.*)
+ 		*(COMMON)
+-		__bss_end = .;
++		HIDDEN(__bss_end = .);
+ 	}
+-	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
+-	__bss_dwords = (__bss_len + 3) >> 2;
++	HIDDEN(__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start));
++	HIDDEN(__bss_dwords = (__bss_len + 3) >> 2);
+ 
+ 	/* Very large objects which don't need to be zeroed */
+ 
+-	__hugebss_vma = .;
+-	__hugebss_lma = .;		/* Dummy */
++	HIDDEN(__hugebss_vma = .);
++	HIDDEN(__hugebss_lma = ABSOLUTE(.));		/* Dummy */
+ 	.hugebss (NOLOAD) : AT (__hugebss_lma) {
+-		__hugebss_start = .;
++		HIDDEN(__hugebss_start = .);
+ 		*(.hugebss)
+ 		*(.hugebss.*)
+-		__hugebss_end = .;
++		HIDDEN(__hugebss_end = .);
+ 	}
+-	__hugebss_len = ABSOLUTE(__hugebss_end) - ABSOLUTE(__hugebss_start);
+-	__hugebss_dwords = (__hugebss_len + 3) >> 2;
++	HIDDEN(__hugebss_len = ABSOLUTE(__hugebss_end) - ABSOLUTE(__hugebss_start));
++	HIDDEN(__hugebss_dwords = (__hugebss_len + 3) >> 2);
+ 
+ 
+ 	/* XXX: This stack should be unified with the COM32 stack */
+-	__stack_vma = .;
+-	__stack_lma = .;	/* Dummy */
++	HIDDEN(__stack_vma = .);
++	HIDDEN(__stack_lma = ABSOLUTE(.));		/* Dummy */
+ 	.stack (NOLOAD) : AT(__stack_lma) {
+-		__stack_start = .;
++		HIDDEN(__stack_start = .);
+ 		*(.stack)
+-		__stack_end = .;
++		HIDDEN(__stack_end = .);
+ 	}
+-	__stack_len = ABSOLUTE(__stack_end) - ABSOLUTE(__stack_start);
+-	__stack_dwords = (__stack_len + 3) >> 2;
++	HIDDEN(__stack_len = ABSOLUTE(__stack_end) - ABSOLUTE(__stack_start));
++	HIDDEN(__stack_dwords = (__stack_len + 3) >> 2);
+ 
+-	_end = .;
++	HIDDEN(_end = .);
+ 
+ 	/* COM32R and kernels are loaded after our own PM code */
+ 	. = ALIGN(65536);
+-	free_high_memory = .;
++	HIDDEN(free_high_memory = .);
+ 
+ 	/* Stuff we don't need... */
+ 	/DISCARD/ : {
+ 		*(.eh_frame)
++		*(.interp)
+ 	}
+ }
+diff --git a/core/layout.inc b/core/layout.inc
+index 53ca783d..635df537 100644
+--- a/core/layout.inc
++++ b/core/layout.inc
+@@ -139,17 +139,6 @@ serial_buf_size	equ 4096		; Should be a power of 2
+ core_xfer_buf	resb 65536
+ 
+ ;
+-; Segment for the real mode code (needed as long as we have a in-kernel
+-; loader and/or COM16 support.
+-; One symbol for the segment number, one for the absolute address
+-;
+-		extern	real_mode_seg
+-		section .real_mode	write nobits align=65536
+-		global	core_real_mode:data hidden
+-core_real_mode	resb 65536
+-comboot_seg	equ real_mode_seg	; COMBOOT image loading zone
+-
+-;
+ ; At the very end, the lowmem heap
+ ;
+ 		extern __lowmem_heap
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/boot/syslinux/syslinux.mk b/bsp/buildroot/boot/syslinux/syslinux.mk
index f07e3b97..13496414 100644
--- a/bsp/buildroot/boot/syslinux/syslinux.mk
+++ b/bsp/buildroot/boot/syslinux/syslinux.mk
@@ -8,7 +8,7 @@ SYSLINUX_VERSION = 6.03
 SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
 SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
 
-SYSLINUX_LICENSE = GPLv2+
+SYSLINUX_LICENSE = GPL-2.0+
 SYSLINUX_LICENSE_FILES = COPYING
 
 SYSLINUX_INSTALL_IMAGES = YES
@@ -55,7 +55,7 @@ define SYSLINUX_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE1) \
 		CC="$(TARGET_CC)" \
 		LD="$(TARGET_LD)" \
-		NASM="$(HOST_DIR)/usr/bin/nasm" \
+		NASM="$(HOST_DIR)/bin/nasm" \
 		CC_FOR_BUILD="$(HOSTCC)" \
 		CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
 		LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
@@ -78,7 +78,7 @@ endef
 # However, buildroot makes no usage of it, so better delete it than have it
 # installed at the wrong place
 define SYSLINUX_POST_INSTALL_CLEANUP
-	rm -rf $(HOST_DIR)/usr/bin/syslinux
+	rm -rf $(HOST_DIR)/bin/syslinux
 endef
 SYSLINUX_POST_INSTALL_TARGET_HOOKS += SYSLINUX_POST_INSTALL_CLEANUP
 
@@ -97,7 +97,7 @@ define SYSLINUX_INSTALL_IMAGES_CMDS
 		$(INSTALL) -D -m 0755 $(@D)/$$i $(BINARIES_DIR)/syslinux/$${i##*/}; \
 	done
 	for i in $(SYSLINUX_C32); do \
-		$(INSTALL) -D -m 0755 $(HOST_DIR)/usr/share/syslinux/$${i} \
+		$(INSTALL) -D -m 0755 $(HOST_DIR)/share/syslinux/$${i} \
 			$(BINARIES_DIR)/syslinux/$${i}; \
 	done
 endef
diff --git a/bsp/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk b/bsp/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk
index 98620925..3dde6c6a 100644
--- a/bsp/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk
+++ b/bsp/buildroot/boot/ts4800-mbrboot/ts4800-mbrboot.mk
@@ -6,7 +6,7 @@
 
 TS4800_MBRBOOT_VERSION = cf8f7072ed5a4a4e48fcb9841b2e31e519ec5dca
 TS4800_MBRBOOT_SITE = $(call github,embeddedarm,ts4800-mbrboot,$(TS4800_MBRBOOT_VERSION))
-TS4800_MBRBOOT_LICENSE = BSD-2c
+TS4800_MBRBOOT_LICENSE = BSD-2-Clause
 TS4800_MBRBOOT_LICENSE_FILES = LICENSE
 TS4800_MBRBOOT_INSTALL_IMAGES = YES
 
diff --git a/bsp/buildroot/boot/uboot/Config.in b/bsp/buildroot/boot/uboot/Config.in
index 4e629c0e..264f3437 100644
--- a/bsp/buildroot/boot/uboot/Config.in
+++ b/bsp/buildroot/boot/uboot/Config.in
@@ -38,7 +38,7 @@ choice
 	  Select the specific U-Boot version you want to use
 
 config BR2_TARGET_UBOOT_LATEST_VERSION
-	bool "2017.01"
+	bool "2018.01"
 
 config BR2_TARGET_UBOOT_CUSTOM_VERSION
 	bool "Custom version"
@@ -86,7 +86,7 @@ endif
 
 config BR2_TARGET_UBOOT_VERSION
 	string
-	default "2017.01"	if BR2_TARGET_UBOOT_LATEST_VERSION
+	default "2018.01"	if BR2_TARGET_UBOOT_LATEST_VERSION
 	default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \
 		if BR2_TARGET_UBOOT_CUSTOM_VERSION
 	default "custom"	if BR2_TARGET_UBOOT_CUSTOM_TARBALL
@@ -129,6 +129,12 @@ config BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE
 	depends on BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG
 	help
 	  Path to the U-Boot configuration file.
+
+config BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES
+	string "Additional configuration fragment files"
+	help
+	  A space-separated list of configuration fragment files,
+	  that will be merged to the main U-Boot configuration file.
 endif
 
 config BR2_TARGET_UBOOT_NEEDS_DTC
@@ -138,6 +144,12 @@ config BR2_TARGET_UBOOT_NEEDS_DTC
 	  Select this option if your U-Boot board configuration
 	  requires the Device Tree compiler to be available.
 
+config BR2_TARGET_UBOOT_NEEDS_PYLIBFDT
+	bool "U-Boot needs pylibfdt"
+	help
+	  Select this option if your U-Boot board configuration
+	  requires the Python libfdt library to be available.
+
 config BR2_TARGET_UBOOT_NEEDS_OPENSSL
 	bool "U-Boot needs OpenSSL"
 	help
@@ -146,6 +158,18 @@ config BR2_TARGET_UBOOT_NEEDS_OPENSSL
 	  typically the case when the board configuration has
 	  CONFIG_FIT_SIGNATURE enabled.
 
+config BR2_TARGET_UBOOT_NEEDS_ATF_BL31
+	bool "U-Boot needs ATF BL31"
+	depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE
+	depends on !BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33
+	select BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31
+	help
+	  Some specific platforms (such as Allwinner A64/H5)
+	  encapsulate the BL31 part of ATF inside U-Boot. This option
+	  makes sure ATF gets built prior to U-Boot, and that the BL31
+	  variable pointing to ATF's BL31 binary, is passed during the
+	  Buildroot build.
+
 menu "U-Boot binary format"
 
 config BR2_TARGET_UBOOT_FORMAT_AIS
@@ -159,6 +183,9 @@ config BR2_TARGET_UBOOT_FORMAT_BIN
 	bool "u-boot.bin"
 	default y
 
+config BR2_TARGET_UBOOT_FORMAT_DTB_BIN
+	bool "u-boot-dtb.bin"
+
 config BR2_TARGET_UBOOT_FORMAT_DTB_IMG
 	bool "u-boot-dtb.img"
 
@@ -319,13 +346,14 @@ config BR2_TARGET_UBOOT_SPL
 	  into DDR.
 
 config BR2_TARGET_UBOOT_SPL_NAME
-	string "U-Boot SPL binary image name"
+	string "U-Boot SPL/TPL binary image name(s)"
 	default "spl/u-boot-spl.bin"
 	depends on BR2_TARGET_UBOOT_SPL
 	help
-	  A space-separated list of SPL binaries, generated during
-	  u-boot build. For most platform it is spl/u-boot-spl.bin
-	  but not always. It is MLO on OMAP for example.
+	  A space-separated list of SPL/TPL binaries, generated during
+	  u-boot build. For most platform SPL name is spl/u-boot-spl.bin
+	  and TPL name is tpl/u-boot-tpl.bin but not always. SPL name is
+	  MLO on OMAP and SPL on i.MX6 for example.
 
 config BR2_TARGET_UBOOT_ZYNQ_IMAGE
 	bool "Generate image for Xilinx Zynq"
@@ -340,13 +368,29 @@ config BR2_TARGET_UBOOT_ZYNQ_IMAGE
 	  to be set.
 
 config BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC
-	bool "CRC SPL image for Altera SoC FPGA"
+	bool "CRC image for Altera SoC FPGA (mkpimage)"
 	depends on BR2_arm
-	depends on BR2_TARGET_UBOOT_SPL
+	depends on BR2_TARGET_UBOOT_SPL || BR2_TARGET_UBOOT_FORMAT_DTB_BIN
 	help
-	  Generate SPL image fixed by the mkpimage tool to enable
+	  Pass the U-Boot image through the mkpimage tool to enable
 	  booting on the Altera SoC FPGA based platforms.
 
+	  On some platforms, it's the SPL that needs to be passed
+	  through mkpimage. On some other platforms there is no SPL
+	  because the internal SRAM is big enough to store the full
+	  U-Boot. In this case, it's directly the full U-Boot image
+	  that is passed through mkpimage.
+
+	  If BR2_TARGET_UBOOT_SPL is enabled then
+	  BR2_TARGET_UBOOT_SPL_NAME is converted by mkpimage using
+	  header version 0.
+
+	  Otherwise the full u-boot-dtb.bin is converted using
+	  mkpimage header version 1.
+
+	  In either case the resulting file will be given a .crc
+	  extension.
+
 menuconfig BR2_TARGET_UBOOT_ENVIMAGE
 	bool "Environment image"
 	help
@@ -388,4 +432,34 @@ config BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT
 
 endif # BR2_TARGET_UBOOT_ENVIMAGE
 
+config BR2_TARGET_UBOOT_BOOT_SCRIPT
+	bool "Generate a U-Boot boot script"
+	help
+	  Generate a U-Boot boot script, given a file listing U-Boot
+	  commands to be executed at boot time. The generated boot
+	  script will be called 'boot.scr'.
+
+if BR2_TARGET_UBOOT_BOOT_SCRIPT
+
+config BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE
+	string "U-Boot boot script source"
+	help
+	  Source file to generate the U-Boot boot script.
+
+endif
+
+if BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG
+
+config BR2_TARGET_UBOOT_CUSTOM_DTS_PATH
+	string "Device Tree Source file paths"
+	help
+	  Space-separated list of paths to device tree source files
+	  that will be copied to arch/ARCH/dts/ before starting the
+	  build.
+
+	  To use this device tree source file, the U-Boot configuration
+	  file must refer to it.
+
+endif
+
 endif # BR2_TARGET_UBOOT
diff --git a/bsp/buildroot/boot/uboot/uboot.hash b/bsp/buildroot/boot/uboot/uboot.hash
index 5473cfea..9425df3f 100644
--- a/bsp/buildroot/boot/uboot/uboot.hash
+++ b/bsp/buildroot/boot/uboot/uboot.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2  u-boot-2017.01.tar.bz2
+sha256  938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda  u-boot-2018.01.tar.bz2
diff --git a/bsp/buildroot/boot/uboot/uboot.mk b/bsp/buildroot/boot/uboot/uboot.mk
index 782609a5..27946d99 100644
--- a/bsp/buildroot/boot/uboot/uboot.mk
+++ b/bsp/buildroot/boot/uboot/uboot.mk
@@ -7,7 +7,7 @@
 UBOOT_VERSION = $(call qstrip,$(BR2_TARGET_UBOOT_VERSION))
 UBOOT_BOARD_NAME = $(call qstrip,$(BR2_TARGET_UBOOT_BOARDNAME))
 
-UBOOT_LICENSE = GPLv2+
+UBOOT_LICENSE = GPL-2.0+
 UBOOT_LICENSE_FILES = Licenses/gpl-2.0.txt
 
 UBOOT_INSTALL_IMAGES = YES
@@ -17,7 +17,6 @@ ifeq ($(UBOOT_VERSION),custom)
 UBOOT_TARBALL = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION))
 UBOOT_SITE = $(patsubst %/,%,$(dir $(UBOOT_TARBALL)))
 UBOOT_SOURCE = $(notdir $(UBOOT_TARBALL))
-BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE)
 else ifeq ($(BR2_TARGET_UBOOT_CUSTOM_GIT),y)
 UBOOT_SITE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_REPO_URL))
 UBOOT_SITE_METHOD = git
@@ -31,9 +30,10 @@ else
 # Handle stable official U-Boot versions
 UBOOT_SITE = ftp://ftp.denx.de/pub/u-boot
 UBOOT_SOURCE = u-boot-$(UBOOT_VERSION).tar.bz2
-ifeq ($(BR2_TARGET_UBOOT_CUSTOM_VERSION),y)
-BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE)
 endif
+
+ifeq ($(BR2_TARGET_UBOOT)$(BR2_TARGET_UBOOT_LATEST_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(UBOOT_SOURCE)
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_BIN),y)
@@ -74,6 +74,11 @@ UBOOT_BINS += u-boot-dtb.img
 UBOOT_MAKE_TARGET += u-boot-dtb.img
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_FORMAT_DTB_BIN),y)
+UBOOT_BINS += u-boot-dtb.bin
+UBOOT_MAKE_TARGET += u-boot-dtb.bin
+endif
+
 ifeq ($(BR2_TARGET_UBOOT_FORMAT_IMG),y)
 UBOOT_BINS += u-boot.img
 UBOOT_MAKE_TARGET += u-boot.img
@@ -126,13 +131,22 @@ endif
 UBOOT_MAKE_OPTS += \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	ARCH=$(UBOOT_ARCH) \
-	HOSTCC="$(HOSTCC) $(HOST_CFLAGS)" \
+	HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \
 	HOSTLDFLAGS="$(HOST_LDFLAGS)"
 
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_ATF_BL31),y)
+UBOOT_DEPENDENCIES += arm-trusted-firmware
+UBOOT_MAKE_OPTS += BL31=$(BINARIES_DIR)/bl31.bin
+endif
+
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y)
 UBOOT_DEPENDENCIES += host-dtc
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y)
+UBOOT_DEPENDENCIES += host-python host-swig
+endif
+
 ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSSL),y)
 UBOOT_DEPENDENCIES += host-openssl
 endif
@@ -148,6 +162,14 @@ endef
 UBOOT_POST_EXTRACT_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
 UBOOT_POST_RSYNC_HOOKS += UBOOT_COPY_OLD_LICENSE_FILE
 
+ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
+define UBOOT_XTENSA_OVERLAY_EXTRACT
+	$(call arch-xtensa-overlay-extract,$(@D),u-boot)
+endef
+UBOOT_POST_EXTRACT_HOOKS += UBOOT_XTENSA_OVERLAY_EXTRACT
+UBOOT_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
+endif
+
 # Analogous code exists in linux/linux.mk. Basically, the generic
 # package infrastructure handles downloading and applying remote
 # patches. Local patches are handled depending on whether they are
@@ -166,6 +188,18 @@ define UBOOT_APPLY_LOCAL_PATCHES
 endef
 UBOOT_POST_PATCH_HOOKS += UBOOT_APPLY_LOCAL_PATCHES
 
+# This is equivalent to upstream commit
+# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=e0d20dc1521e74b82dbd69be53a048847798a90a. It
+# fixes a build failure when libfdt-devel is installed system-wide.
+# This only works when scripts/dtc/libfdt exists (E.G. versions containing
+# http://git.denx.de/?p=u-boot.git;a=commitdiff;h=c0e032e0090d6541549b19cc47e06ccd1f302893)
+define UBOOT_FIXUP_LIBFDT_INCLUDE
+	if [ -d $(@D)/scripts/dtc/libfdt ]; then \
+		$(SED) 's%-I$$(srctree)/lib/libfdt%-I$$(srctree)/scripts/dtc/libfdt%' $(@D)/tools/Makefile; \
+	fi
+endef
+UBOOT_POST_PATCH_HOOKS += UBOOT_FIXUP_LIBFDT_INCLUDE
+
 ifeq ($(BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY),y)
 define UBOOT_CONFIGURE_CMDS
 	$(TARGET_CONFIGURE_OPTS) 	\
@@ -179,8 +213,17 @@ else ifeq ($(BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG),y)
 UBOOT_KCONFIG_FILE = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE))
 endif # BR2_TARGET_UBOOT_USE_DEFCONFIG
 
+UBOOT_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES))
 UBOOT_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
-UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS)
+
+# UBOOT_MAKE_OPTS overrides HOSTCC / HOSTLDFLAGS to allow the build to
+# find our host-openssl. However, this triggers a bug in the kconfig
+# build script that causes it to build with /usr/include/ncurses.h
+# (which is typically wchar) but link with
+# $(HOST_DIR)/lib/libncurses.so (which is not).  We don't actually
+# need any host-package for kconfig, so remove the HOSTCC/HOSTLDFLAGS
+# override again.
+UBOOT_KCONFIG_OPTS = $(UBOOT_MAKE_OPTS) HOSTCC="$(HOSTCC)" HOSTLDFLAGS=""
 define UBOOT_HELP_CMDS
 	@echo '  uboot-menuconfig       - Run U-Boot menuconfig'
 	@echo '  uboot-savedefconfig    - Run U-Boot savedefconfig'
@@ -189,7 +232,12 @@ define UBOOT_HELP_CMDS
 endef
 endif # BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY
 
+UBOOT_CUSTOM_DTS_PATH = $(call qstrip,$(BR2_TARGET_UBOOT_CUSTOM_DTS_PATH))
+
 define UBOOT_BUILD_CMDS
+	$(if $(UBOOT_CUSTOM_DTS_PATH),
+		cp -f $(UBOOT_CUSTOM_DTS_PATH) $(@D)/arch/$(UBOOT_ARCH)/dts/
+	)
 	$(TARGET_CONFIGURE_OPTS) 	\
 		$(MAKE) -C $(@D) $(UBOOT_MAKE_OPTS) 		\
 		$(UBOOT_MAKE_TARGET)
@@ -204,10 +252,22 @@ define UBOOT_BUILD_CMDS
 endef
 
 define UBOOT_BUILD_OMAP_IFT
-	$(HOST_DIR)/usr/bin/gpsign -f $(@D)/u-boot.bin \
+	$(HOST_DIR)/bin/gpsign -f $(@D)/u-boot.bin \
 		-c $(call qstrip,$(BR2_TARGET_UBOOT_OMAP_IFT_CONFIG))
 endef
 
+ifneq ($(BR2_TARGET_UBOOT_ENVIMAGE),)
+define UBOOT_GENERATE_ENV_IMAGE
+	cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) \
+		>$(@D)/buildroot-env.txt
+	$(HOST_DIR)/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
+		$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
+		$(if $(filter BIG,$(BR2_ENDIAN)),-b) \
+		-o $(BINARIES_DIR)/uboot-env.bin \
+		$(@D)/buildroot-env.txt
+endef
+endif
+
 define UBOOT_INSTALL_IMAGES_CMDS
 	$(foreach f,$(UBOOT_BINS), \
 			cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
@@ -219,12 +279,11 @@ define UBOOT_INSTALL_IMAGES_CMDS
 			cp -dpf $(@D)/$(f) $(BINARIES_DIR)/
 		)
 	)
-	$(if $(BR2_TARGET_UBOOT_ENVIMAGE),
-		cat $(call qstrip,$(BR2_TARGET_UBOOT_ENVIMAGE_SOURCE)) | \
-			$(HOST_DIR)/usr/bin/mkenvimage -s $(BR2_TARGET_UBOOT_ENVIMAGE_SIZE) \
-			$(if $(BR2_TARGET_UBOOT_ENVIMAGE_REDUNDANT),-r) \
-			$(if $(filter BIG,$(BR2_ENDIAN)),-b) \
-			-o $(BINARIES_DIR)/uboot-env.bin -)
+	$(UBOOT_GENERATE_ENV_IMAGE)
+	$(if $(BR2_TARGET_UBOOT_BOOT_SCRIPT),
+		$(HOST_DIR)/bin/mkimage -C none -A $(MKIMAGE_ARCH) -T script \
+			-d $(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)) \
+			$(BINARIES_DIR)/boot.scr)
 endef
 
 define UBOOT_INSTALL_OMAP_IFT_IMAGE
@@ -247,8 +306,8 @@ endif
 
 ifeq ($(BR2_TARGET_UBOOT_ZYNQ_IMAGE),y)
 define UBOOT_GENERATE_ZYNQ_IMAGE
-	$(HOST_DIR)/usr/bin/python2 \
-		$(HOST_DIR)/usr/bin/zynq-boot-bin.py \
+	$(HOST_DIR)/bin/python2 \
+		$(HOST_DIR)/bin/zynq-boot-bin.py \
 		-u $(@D)/$(firstword $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))) \
 		-o $(BINARIES_DIR)/BOOT.BIN
 endef
@@ -257,9 +316,17 @@ UBOOT_POST_INSTALL_IMAGES_HOOKS += UBOOT_GENERATE_ZYNQ_IMAGE
 endif
 
 ifeq ($(BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC),y)
+ifeq ($(BR2_TARGET_UBOOT_SPL),y)
+UBOOT_CRC_ALTERA_SOCFPGA_INPUT_IMAGES = $(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME))
+UBOOT_CRC_ALTERA_SOCFPGA_HEADER_VERSION = 0
+else
+UBOOT_CRC_ALTERA_SOCFPGA_INPUT_IMAGES = u-boot-dtb.bin
+UBOOT_CRC_ALTERA_SOCFPGA_HEADER_VERSION = 1
+endif
 define UBOOT_CRC_ALTERA_SOCFPGA_IMAGE
-	$(foreach f,$(call qstrip,$(BR2_TARGET_UBOOT_SPL_NAME)), \
-		$(HOST_DIR)/usr/bin/mkpimage \
+	$(foreach f,$(UBOOT_CRC_ALTERA_SOCFPGA_INPUT_IMAGES), \
+		$(HOST_DIR)/bin/mkpimage \
+			-v $(UBOOT_CRC_ALTERA_SOCFPGA_HEADER_VERSION) \
 			-o $(BINARIES_DIR)/$(notdir $(call qstrip,$(f))).crc \
 			$(@D)/$(call qstrip,$(f))
 	)
@@ -280,6 +347,15 @@ endif
 UBOOT_DEPENDENCIES += host-uboot-tools
 endif
 
+ifeq ($(BR2_TARGET_UBOOT_BOOT_SCRIPT),y)
+ifeq ($(BR_BUILDING),y)
+ifeq ($(call qstrip,$(BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE)),)
+$(error Please define a source file for Uboot boot script (BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE setting))
+endif
+endif
+UBOOT_DEPENDENCIES += host-uboot-tools
+endif
+
 ifeq ($(BR2_TARGET_UBOOT)$(BR_BUILDING),yy)
 
 #
diff --git a/bsp/buildroot/boot/vexpress-firmware/Config.in b/bsp/buildroot/boot/vexpress-firmware/Config.in
index 8479df3d..265fb4be 100644
--- a/bsp/buildroot/boot/vexpress-firmware/Config.in
+++ b/bsp/buildroot/boot/vexpress-firmware/Config.in
@@ -4,3 +4,5 @@ config BR2_TARGET_VEXPRESS_FIRMWARE
 	help
 	  Versatile Express firmware from ARM, with Linaro mods last
 	  change.
+
+	  https://git.linaro.org/arm/vexpress-firmware.git
diff --git a/bsp/buildroot/boot/xloader/Config.in b/bsp/buildroot/boot/xloader/Config.in
index c411be47..f687b897 100644
--- a/bsp/buildroot/boot/xloader/Config.in
+++ b/bsp/buildroot/boot/xloader/Config.in
@@ -5,6 +5,8 @@ config BR2_TARGET_XLOADER
 	  The x-loader bootloader. It is mainly used on OMAP-based
 	  platforms.
 
+	  http://omappedia.org/wiki/Linux_OMAP_Kernel_Main
+
 if BR2_TARGET_XLOADER
 config BR2_TARGET_XLOADER_BOARDNAME
 	string "x-loader board name"
diff --git a/bsp/buildroot/boot/xloader/xloader.mk b/bsp/buildroot/boot/xloader/xloader.mk
index c68dc81a..7e0b2866 100644
--- a/bsp/buildroot/boot/xloader/xloader.mk
+++ b/bsp/buildroot/boot/xloader/xloader.mk
@@ -8,7 +8,7 @@ XLOADER_VERSION = 6f3a26101303051e0f91b6213735b68ce804e94e
 XLOADER_SITE = git://gitorious.org/x-loader/x-loader.git
 XLOADER_BOARD_NAME = $(call qstrip,$(BR2_TARGET_XLOADER_BOARDNAME))
 
-XLOADER_LICENSE = GPLv2+
+XLOADER_LICENSE = GPL-2.0+
 XLOADER_LICENSE_FILES = README
 
 XLOADER_INSTALL_IMAGES = YES
diff --git a/bsp/buildroot/configs/altera_socdk_defconfig b/bsp/buildroot/configs/altera_socdk_defconfig
deleted file mode 100644
index f5a2fc7f..00000000
--- a/bsp/buildroot/configs/altera_socdk_defconfig
+++ /dev/null
@@ -1,33 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_NEON=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
-
-# Linux headers same as kernel, a 3.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
-
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
-
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="http://git.rocketboards.org/linux-socfpga.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
-BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socdk"
-
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_3=y
-
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.rocketboards.org/u-boot-socfpga.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_socfpga_v2013.01.01_14.02.02"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
diff --git a/bsp/buildroot/configs/altera_sockit_defconfig b/bsp/buildroot/configs/altera_sockit_defconfig
deleted file mode 100644
index 0addbde1..00000000
--- a/bsp/buildroot/configs/altera_sockit_defconfig
+++ /dev/null
@@ -1,37 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_FPU_NEON=y
-BR2_ARM_INSTRUCTIONS_THUMB2=y
-
-# Linux headers same as kernel, a 3.13 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_13=y
-
-BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/altera/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_LINUX_KERNEL_INTREE_DTS_NAME)"
-
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="http://git.rocketboards.org/linux-socfpga.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-3.13_14.02.02"
-BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_sockit"
-
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_3=y
-
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="socfpga_cyclone5"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="http://git.rocketboards.org/u-boot-socfpga.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_acds13.0sp1"
-BR2_TARGET_UBOOT_PATCH="board/altera/sockit"
-BR2_TARGET_UBOOT_FORMAT_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
diff --git a/bsp/buildroot/configs/arm_juno_defconfig b/bsp/buildroot/configs/arm_juno_defconfig
index 811524ff..98f25738 100644
--- a/bsp/buildroot/configs/arm_juno_defconfig
+++ b/bsp/buildroot/configs/arm_juno_defconfig
@@ -12,8 +12,10 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="arm/juno arm/juno-r1 arm/juno-r2"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.2"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.3"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/bsp/buildroot/configs/armadeus_apf27_defconfig b/bsp/buildroot/configs/armadeus_apf27_defconfig
index fd0ba501..6f78b74d 100644
--- a/bsp/buildroot/configs/armadeus_apf27_defconfig
+++ b/bsp/buildroot/configs/armadeus_apf27_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 3.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+# Linux headers same as kernel, a 4.12 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
 
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf27"
@@ -18,9 +18,9 @@ BR2_TARGET_ROOTFS_UBI=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.4"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-3.18.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf27/linux-4.12.config"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xA0008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/bsp/buildroot/configs/armadeus_apf28_defconfig b/bsp/buildroot/configs/armadeus_apf28_defconfig
index 31fb5289..51e05f59 100644
--- a/bsp/buildroot/configs/armadeus_apf28_defconfig
+++ b/bsp/buildroot/configs/armadeus_apf28_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # System
 BR2_TARGET_GENERIC_HOSTNAME="apf28"
@@ -13,9 +13,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.30"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/armadeus/apf28/linux-4.4.config"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.64"
+BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/bsp/buildroot/configs/armadeus_apf9328_defconfig b/bsp/buildroot/configs/armadeus_apf9328_defconfig
deleted file mode 100644
index fbc98643..00000000
--- a/bsp/buildroot/configs/armadeus_apf9328_defconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm920t=y
-
-# Toolchain
-BR2_PACKAGE_GDB=y
-BR2_PACKAGE_HOST_GDB=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
-BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-
-# Linux headers same as kernel, a 3.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
-
-# System
-BR2_TARGET_GENERIC_HOSTNAME="apf9328"
-BR2_TARGET_GENERIC_ISSUE="Welcome to Armadeus development platform !"
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# Filesystem
-BR2_TARGET_ROOTFS_JFFS2=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.29"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x08008000"
diff --git a/bsp/buildroot/configs/at91sam9x5ek_defconfig b/bsp/buildroot/configs/at91sam9x5ek_defconfig
index 69f9e75e..a5362303 100644
--- a/bsp/buildroot/configs/at91sam9x5ek_defconfig
+++ b/bsp/buildroot/configs/at91sam9x5ek_defconfig
@@ -1,11 +1,11 @@
 BR2_arm=y
 BR2_arm926t=y
 # Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
@@ -16,12 +16,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_SAM_BA=y
diff --git a/bsp/buildroot/configs/at91sam9x5ek_dev_defconfig b/bsp/buildroot/configs/at91sam9x5ek_dev_defconfig
new file mode 100644
index 00000000..3af4ba74
--- /dev/null
+++ b/bsp/buildroot/configs/at91sam9x5ek_dev_defconfig
@@ -0,0 +1,100 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Toolchain
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Needed for some packages
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+# Needed for gdb
+BR2_PTHREAD_DEBUG=y
+# Needed for some packages
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+# System Configuration
+# Needed for usb-utils
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
+
+# Packages
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_GPL=y
+BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_MPG123=y
+BR2_PACKAGE_BZIP2=y
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_UNZIP=y
+BR2_PACKAGE_XZ=y
+BR2_PACKAGE_ZIP=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_LMBENCH=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_WILC1000_FIRMWARE=y
+BR2_PACKAGE_DEVMEM2=y
+BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_SETSERIAL=y
+BR2_PACKAGE_SPI_TOOLS=y
+BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_LIBDRM=y
+BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_BRIDGE_UTILS=y
+BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_MII_DIAG=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_WGET=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_VIM=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_UBIFS=y
+BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x1f000
+BR2_TARGET_ROOTFS_UBI=y
+BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
+
+# Bootloaders
+BR2_TARGET_AT91BOOTSTRAP3=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eknf_uboot"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_nandflash"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+
+# Host packages
+BR2_PACKAGE_HOST_SAM_BA=y
diff --git a/bsp/buildroot/configs/at91sam9x5ek_mmc_defconfig b/bsp/buildroot/configs/at91sam9x5ek_mmc_defconfig
new file mode 100644
index 00000000..6964d581
--- /dev/null
+++ b/bsp/buildroot/configs/at91sam9x5ek_mmc_defconfig
@@ -0,0 +1,46 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Toolchain
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+# Creation of the SD card image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+
+# Bootloaders
+BR2_TARGET_AT91BOOTSTRAP3=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000"
+
+# Host packages
+# Needed to generate the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig b/bsp/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig
new file mode 100644
index 00000000..931cf7de
--- /dev/null
+++ b/bsp/buildroot/configs/at91sam9x5ek_mmc_dev_defconfig
@@ -0,0 +1,108 @@
+# Architecture
+BR2_arm=y
+BR2_arm926t=y
+
+# Toolchain
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Needed for some packages
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+# Needed for gdb
+BR2_PTHREAD_DEBUG=y
+# Needed for some packages
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+# System Configuration
+# Needed for usb-utils
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+# Creation of the SD card image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/at91sam9x5ek_mmc/genimage.cfg"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_DEFCONFIG="at91_dt"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91sam9g15ek at91sam9g25ek at91sam9g35ek at91sam9x25ek at91sam9x35ek"
+
+# Packages
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_GPL=y
+BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_MPG123=y
+BR2_PACKAGE_BZIP2=y
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_UNZIP=y
+BR2_PACKAGE_XZ=y
+BR2_PACKAGE_ZIP=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_LMBENCH=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_WILC1000_FIRMWARE=y
+BR2_PACKAGE_DEVMEM2=y
+BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_SETSERIAL=y
+BR2_PACKAGE_SPI_TOOLS=y
+BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_LIBDRM=y
+BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_BRIDGE_UTILS=y
+BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_MII_DIAG=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_WGET=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_VIM=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+
+# Bootloaders
+BR2_TARGET_AT91BOOTSTRAP3=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="at91sam9x5eksd_uboot"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000"
+
+# Host packages
+# Needed to generate the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig b/bsp/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig
new file mode 100644
index 00000000..37521292
--- /dev/null
+++ b/bsp/buildroot/configs/atmel_sama5d27_som1_ek_mmc_dev_defconfig
@@ -0,0 +1,86 @@
+BR2_arm=y
+BR2_cortex_a5=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_PTHREAD_DEBUG=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d27_som1_ek_mmc/genimage.cfg"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_LINUX_KERNEL_DEFCONFIG="sama5"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d27_som1_ek at91-sama5d27_som1_ek_pda4 at91-sama5d27_som1_ek_pda7 at91-sama5d27_som1_ek_pda7b"
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_ALSA_UTILS=y
+BR2_PACKAGE_ALSA_UTILS_ALSACONF=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+BR2_PACKAGE_FFMPEG=y
+BR2_PACKAGE_FFMPEG_GPL=y
+BR2_PACKAGE_FFMPEG_SWSCALE=y
+BR2_PACKAGE_MPG123=y
+BR2_PACKAGE_BZIP2=y
+BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_UNZIP=y
+BR2_PACKAGE_XZ=y
+BR2_PACKAGE_ZIP=y
+BR2_PACKAGE_GDB=y
+BR2_PACKAGE_LMBENCH=y
+BR2_PACKAGE_DOSFSTOOLS=y
+BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
+BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
+BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_MMC_UTILS=y
+BR2_PACKAGE_MTD=y
+BR2_PACKAGE_WILC1000_FIRMWARE=y
+BR2_PACKAGE_DEVMEM2=y
+BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_I2C_TOOLS=y
+BR2_PACKAGE_SETSERIAL=y
+BR2_PACKAGE_SPI_TOOLS=y
+BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_LIBDRM=y
+BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
+BR2_PACKAGE_DTC=y
+BR2_PACKAGE_DTC_PROGRAMS=y
+BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_BRIDGE_UTILS=y
+BR2_PACKAGE_CAN_UTILS=y
+BR2_PACKAGE_DROPBEAR=y
+BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPROUTE2=y
+BR2_PACKAGE_IPTABLES=y
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_LRZSZ=y
+BR2_PACKAGE_MII_DIAG=y
+BR2_PACKAGE_OPENSSH=y
+BR2_PACKAGE_WGET=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_BASH=y
+BR2_PACKAGE_HTOP=y
+BR2_PACKAGE_VIM=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_AT91BOOTSTRAP3=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
+BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d27_som1_eksd_uboot"
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d27_som1_ek_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig b/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig
index 13086af6..8889978d 100644
--- a/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_defconfig
@@ -3,12 +3,13 @@ BR2_cortex_a5=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b"
@@ -17,14 +18,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig b/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig
index a2250910..23a25820 100644
--- a/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d2_xplained_mmc_dev_defconfig
@@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
@@ -18,13 +18,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d2_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d2_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d2_xplained at91-sama5d2_xplained_pda4 at91-sama5d2_xplained_pda7 at91-sama5d2_xplained_pda7b"
@@ -89,14 +90,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d2_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d2_xplained_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 # Host packages
 # Needed to generate the SD card image
diff --git a/bsp/buildroot/configs/atmel_sama5d3_xplained_defconfig b/bsp/buildroot/configs/atmel_sama5d3_xplained_defconfig
index 307bbaae..b65c389a 100644
--- a/bsp/buildroot/configs/atmel_sama5d3_xplained_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d3_xplained_defconfig
@@ -2,11 +2,11 @@ BR2_arm=y
 BR2_cortex_a5=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -17,12 +17,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_SAM_BA=y
diff --git a/bsp/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig b/bsp/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig
index 4905148b..f403e230 100644
--- a/bsp/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d3_xplained_dev_defconfig
@@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
@@ -21,7 +21,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -88,14 +88,15 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=2048
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainednf_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_nandflash"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 # Host packages
 BR2_PACKAGE_HOST_SAM_BA=y
diff --git a/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig b/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig
index 0a44dc71..4ddb1714 100644
--- a/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_defconfig
@@ -2,12 +2,13 @@ BR2_arm=y
 BR2_cortex_a5=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -16,14 +17,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig b/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig
index 1fc84529..a3351482 100644
--- a/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d3_xplained_mmc_dev_defconfig
@@ -5,7 +5,7 @@ BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
@@ -17,13 +17,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d3_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d3_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d3_xplained at91-sama5d3_xplained_pda4 at91-sama5d3_xplained_pda7 at91-sama5d3_xplained_pda7b"
@@ -88,14 +89,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d3_xplainedsd_uboot"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d3_xplained_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 # Host packages
 # Needed to generate the SD card image
diff --git a/bsp/buildroot/configs/atmel_sama5d4_xplained_defconfig b/bsp/buildroot/configs/atmel_sama5d4_xplained_defconfig
index 5646723d..feedf1f5 100644
--- a/bsp/buildroot/configs/atmel_sama5d4_xplained_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d4_xplained_defconfig
@@ -3,11 +3,11 @@ BR2_cortex_a5=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -21,12 +21,13 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_SAM_BA=y
diff --git a/bsp/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig b/bsp/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig
index b3dc8159..7ebfde17 100644
--- a/bsp/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d4_xplained_dev_defconfig
@@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
@@ -22,7 +22,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -92,14 +92,15 @@ BR2_TARGET_ROOTFS_UBI_SUBSIZE=0
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainednf_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_nandflash"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 # Host packages
 BR2_PACKAGE_HOST_SAM_BA=y
diff --git a/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig b/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig
index 03055cff..b8b21e77 100644
--- a/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_defconfig
@@ -3,12 +3,13 @@ BR2_cortex_a5=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -17,14 +18,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig b/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig
index 1d4cfcbe..c31f15a1 100644
--- a/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig
+++ b/bsp/buildroot/configs/atmel_sama5d4_xplained_mmc_dev_defconfig
@@ -6,7 +6,7 @@ BR2_ARM_ENABLE_VFP=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 # Needed for some packages
 BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Needed for gdb
@@ -18,13 +18,14 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 # Needed for usb-utils
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 # Creation of the SD card image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/atmel/sama5d4_xplained_mmc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/atmel/sama5d4_xplained_mmc/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/linux4sam/linux-at91.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_LINUX_KERNEL_DEFCONFIG="sama5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="at91-sama5d4_xplained at91-sama5d4_xplained_hdmi at91-sama5d4_xplained_pda4 at91-sama5d4_xplained_pda7 at91-sama5d4_xplained_pda7b"
@@ -89,14 +90,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_AT91BOOTSTRAP3=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_GIT=y
 BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_URL="https://github.com/linux4sam/at91bootstrap.git"
-BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.7"
+BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_REPO_VERSION="v3.8.9"
 BR2_TARGET_AT91BOOTSTRAP3_DEFCONFIG="sama5d4_xplainedsd_uboot_secure"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.7"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sama5d4_xplained_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 # Host packages
 # Needed to generate the SD card image
diff --git a/bsp/buildroot/configs/bananapi_m1_defconfig b/bsp/buildroot/configs/bananapi_m1_defconfig
new file mode 100644
index 00000000..f8c66a33
--- /dev/null
+++ b/bsp/buildroot/configs/bananapi_m1_defconfig
@@ -0,0 +1,38 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_EABIHF=y
+
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapi"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m1/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.7"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapi"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M1"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m1/genimage.cfg"
diff --git a/bsp/buildroot/configs/bananapi_m2_plus_defconfig b/bsp/buildroot/configs/bananapi_m2_plus_defconfig
new file mode 100644
index 00000000..bbc3eb0e
--- /dev/null
+++ b/bsp/buildroot/configs/bananapi_m2_plus_defconfig
@@ -0,0 +1,29 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/sinovoip/m2-plus/boot.cmd"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/bananapi_m64_defconfig b/bsp/buildroot/configs/bananapi_m64_defconfig
new file mode 100644
index 00000000..7d1ed18f
--- /dev/null
+++ b/bsp/buildroot/configs/bananapi_m64_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M64"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m64/genimage.cfg"
diff --git a/bsp/buildroot/configs/bananapro_defconfig b/bsp/buildroot/configs/bananapro_defconfig
new file mode 100644
index 00000000..5a71d757
--- /dev/null
+++ b/bsp/buildroot/configs/bananapro_defconfig
@@ -0,0 +1,73 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_EABIHF=y
+BR2_ARM_FPU_NEON_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Toolchain
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="bananapro"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Banana Pro!"
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+BR2_ROOTFS_OVERLAY="board/lemaker/bananapro/rootfs_overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/lemaker/bananapro/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.11"
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-bananapro"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+
+# Wifi firmware for brcm43362
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX=y
+
+# Audio
+BR2_PACKAGE_ALSA_UTILS=y
+# BR2_PACKAGE_ALSA_UTILS_ALSAMIXER is not set
+BR2_PACKAGE_ALSA_UTILS_AMIXER=y
+BR2_PACKAGE_ALSA_UTILS_APLAY=y
+
+# For automatic firmware loading
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+
+# Wireless packages
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+
+# Host tools
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/beagleboardx15_defconfig b/bsp/buildroot/configs/beagleboardx15_defconfig
index 25ee21b8..393b29ee 100644
--- a/bsp/buildroot/configs/beagleboardx15_defconfig
+++ b/bsp/buildroot/configs/beagleboardx15_defconfig
@@ -1,5 +1,6 @@
 BR2_arm=y
 BR2_cortex_a15=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboardx15/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
diff --git a/bsp/buildroot/configs/beaglebone_defconfig b/bsp/buildroot/configs/beaglebone_defconfig
index 6fe3a5ec..611b6941 100644
--- a/bsp/buildroot/configs/beaglebone_defconfig
+++ b/bsp/buildroot/configs/beaglebone_defconfig
@@ -7,10 +7,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="adde2ca9f86797071f6e7b2b9e779fa5e4a8f3cd"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f9f6f0db2d5e4f9d2ff46eb31a5a05276a92ed7d"
 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
diff --git a/bsp/buildroot/configs/beaglebone_qt5_defconfig b/bsp/buildroot/configs/beaglebone_qt5_defconfig
index a9ab5a24..fb61bf54 100644
--- a/bsp/buildroot/configs/beaglebone_qt5_defconfig
+++ b/bsp/buildroot/configs/beaglebone_qt5_defconfig
@@ -3,6 +3,7 @@ BR2_cortex_a8=y
 BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_GCC_VERSION_5_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
@@ -17,7 +18,6 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-evmsk"
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
 BR2_PACKAGE_QT5BASE_EXAMPLES=y
 BR2_PACKAGE_QT5BASE_EGLFS=y
 BR2_PACKAGE_QT5QUICKCONTROLS=y
@@ -26,6 +26,7 @@ BR2_PACKAGE_TI_SGX_KM=y
 BR2_PACKAGE_TI_SGX_UM=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="124M"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
diff --git a/bsp/buildroot/configs/ci20_defconfig b/bsp/buildroot/configs/ci20_defconfig
index ecf3007a..f28dd4da 100644
--- a/bsp/buildroot/configs/ci20_defconfig
+++ b/bsp/buildroot/configs/ci20_defconfig
@@ -8,13 +8,18 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS4"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg"
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fbf929bc733b82b15f6996d4262a45870f19d214"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="7dff33297116643485ca37141d804eddd793e834"
 BR2_LINUX_KERNEL_DEFCONFIG="ci20"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # u-boot
 BR2_TARGET_UBOOT=y
@@ -22,8 +27,13 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y
 BR2_TARGET_UBOOT_BOARDNAME="ci20_mmc"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="a4f583551d0025eb957ee5c9cb68657a429e4914"
-BR2_TARGET_UBOOT_VERSION="a4f583551d0025eb957ee5c9cb68657a429e4914"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="32768"
+
+# host
+BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/bsp/buildroot/configs/csky_gx6605s_defconfig b/bsp/buildroot/configs/csky_gx6605s_defconfig
new file mode 100644
index 00000000..5f39c536
--- /dev/null
+++ b/bsp/buildroot/configs/csky_gx6605s_defconfig
@@ -0,0 +1,17 @@
+BR2_csky=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/c-sky/tools/raw/master/csky-linux-tools-x86_64-glibc-linux-4.9.2-20170227.tar.gz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="csky-linux"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_5=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/c-sky/linux-4.9.y/archive/314c498ddc8c43a66ca96ff3af7da98e10fa1cc6.tar.gz"
+BR2_LINUX_KERNEL_DEFCONFIG="gx66xx"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="gx6605s"
+BR2_TARGET_ROOTFS_EXT2=y
diff --git a/bsp/buildroot/configs/cubieboard2_defconfig b/bsp/buildroot/configs/cubieboard2_defconfig
index 353aaa5a..a0d23990 100644
--- a/bsp/buildroot/configs/cubieboard2_defconfig
+++ b/bsp/buildroot/configs/cubieboard2_defconfig
@@ -6,7 +6,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y
 BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/cubietech/cubieboard2/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
@@ -24,7 +23,8 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/cubietech/cubieboard2/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/engicam_imx6qdl_icore_defconfig b/bsp/buildroot/configs/engicam_imx6qdl_icore_defconfig
new file mode 100644
index 00000000..60903608
--- /dev/null
+++ b/bsp/buildroot/configs/engicam_imx6qdl_icore_defconfig
@@ -0,0 +1,43 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg"
diff --git a/bsp/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig b/bsp/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig
new file mode 100644
index 00000000..2da0a65c
--- /dev/null
+++ b/bsp/buildroot/configs/engicam_imx6qdl_icore_qt5_defconfig
@@ -0,0 +1,81 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore imx6q-icore imx6q-icore-ofcap10 imx6q-icore-ofcap12"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/engicam/icorem6/linux_qt5.fragment"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6/genimage.cfg"
+BR2_ROOTFS_OVERLAY="board/engicam/icorem6/rootfs_overlay"
+
+# qt5 dependencies
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+# qt5
+BR2_PACKAGE_QT5=y
+BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
+BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
+BR2_PACKAGE_QT5BASE_LINUXFB=y
+BR2_PACKAGE_QT5BASE_FONTCONFIG=y
+BR2_PACKAGE_QT5BASE_GIF=y
+BR2_PACKAGE_QT5BASE_JPEG=y
+
+# mesa3d
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
+
+# qt5 demo packages
+BR2_PACKAGE_GLMARK2=y
+BR2_PACKAGE_MESA3D_DEMOS=y
+BR2_PACKAGE_KMSCUBE=y
+BR2_PACKAGE_QT5CINEX=y
+BR2_PACKAGE_QT5CINEX_HD=y
+
+# fonts
+BR2_PACKAGE_BITSTREAM_VERA=y
+BR2_PACKAGE_CANTARELL=y
+BR2_PACKAGE_DEJAVU=y
+BR2_PACKAGE_FONT_AWESOME=y
+BR2_PACKAGE_GHOSTSCRIPT_FONTS=y
+BR2_PACKAGE_INCONSOLATA=y
+BR2_PACKAGE_LIBERATION=y
diff --git a/bsp/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig b/bsp/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig
new file mode 100644
index 00000000..4cea880b
--- /dev/null
+++ b/bsp/buildroot/configs/engicam_imx6qdl_icore_rqs_defconfig
@@ -0,0 +1,43 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6qdl_icore_rqs_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-icore-rqs imx6q-icore-rqs"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam i.CoreM6 Quad/Dual/DualLite/Solo RQS Starter Kit"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/icorem6_rqs/genimage.cfg"
diff --git a/bsp/buildroot/configs/engicam_imx6ul_geam_defconfig b/bsp/buildroot/configs/engicam_imx6ul_geam_defconfig
new file mode 100644
index 00000000..aac8432e
--- /dev/null
+++ b/bsp/buildroot/configs/engicam_imx6ul_geam_defconfig
@@ -0,0 +1,43 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_geam_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-geam-kit"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam GEAM6UL Starter Kit"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/geam6ul/genimage.cfg"
diff --git a/bsp/buildroot/configs/engicam_imx6ul_isiot_defconfig b/bsp/buildroot/configs/engicam_imx6ul_isiot_defconfig
new file mode 100644
index 00000000..78a5cae3
--- /dev/null
+++ b/bsp/buildroot/configs/engicam_imx6ul_isiot_defconfig
@@ -0,0 +1,43 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07-rc1"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx6ul_isiot_mmc"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
+BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x80008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-isiot-emmc"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Engicam Is.IoT eMMC Starter Kit"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/engicam/isiot/genimage.cfg"
diff --git a/bsp/buildroot/configs/firefly_rk3288_defconfig b/bsp/buildroot/configs/firefly_rk3288_defconfig
deleted file mode 100644
index 017a7ee6..00000000
--- a/bsp/buildroot/configs/firefly_rk3288_defconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-BR2_arm=y
-BR2_cortex_a17=y
-BR2_ARM_FPU_NEON_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288"
-BR2_TARGET_GENERIC_ISSUE="Welcome to FIREFLY RK3288!"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mmind/linux-rockchip.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4"
-BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="firefly-rk3288"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin"
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/firefly_rk3288_demo_defconfig b/bsp/buildroot/configs/firefly_rk3288_demo_defconfig
deleted file mode 100644
index 7dadc6bc..00000000
--- a/bsp/buildroot/configs/firefly_rk3288_demo_defconfig
+++ /dev/null
@@ -1,40 +0,0 @@
-BR2_arm=y
-BR2_cortex_a17=y
-BR2_ARM_FPU_NEON_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_TOOLCHAIN_BUILDROOT_CXX=y
-BR2_TARGET_GENERIC_HOSTNAME="firefly-rk3288"
-BR2_TARGET_GENERIC_ISSUE="Welcome to FIREFLY RK3288!"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/firefly/firefly-rk3288/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/firefly/firefly-rk3288/post-image.sh"
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mmind/linux-rockchip.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ccb89e9b5657b4911c16d08e1581121222ee12c4"
-BR2_LINUX_KERNEL_DEFCONFIG="rk3288_veyron"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-firefly"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
-BR2_PACKAGE_QT5=y
-BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
-BR2_PACKAGE_QT5BASE_EXAMPLES=y
-BR2_PACKAGE_QT5BASE_GUI=y
-BR2_PACKAGE_QT5BASE_EGLFS=y
-BR2_PACKAGE_MALI_T76X=y
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="firefly-rk3288"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
-BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin"
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/freescale_imx28evk_defconfig b/bsp/buildroot/configs/freescale_imx28evk_defconfig
index b2242e70..181c9ab9 100644
--- a/bsp/buildroot/configs/freescale_imx28evk_defconfig
+++ b/bsp/buildroot/configs/freescale_imx28evk_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
@@ -11,7 +11,7 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.8"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13"
 BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk"
@@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-evk"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx28evk"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_FORMAT_SD=y
 
 # Filesystem
diff --git a/bsp/buildroot/configs/freescale_imx31_3stack_defconfig b/bsp/buildroot/configs/freescale_imx31_3stack_defconfig
deleted file mode 100644
index 0476fc1b..00000000
--- a/bsp/buildroot/configs/freescale_imx31_3stack_defconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# architecture
-BR2_arm=y
-BR2_arm1136jf_s=y
-BR2_ARM_EABIHF=y
-
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
-
-# system
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx31_3stack/linux.fragment"
-BR2_TARGET_ROOTFS_CPIO_GZIP=y
-BR2_TARGET_ROOTFS_INITRAMFS=y
diff --git a/bsp/buildroot/configs/freescale_imx6dlsabreauto_defconfig b/bsp/buildroot/configs/freescale_imx6dlsabreauto_defconfig
index c946988f..55db461f 100644
--- a/bsp/buildroot/configs/freescale_imx6dlsabreauto_defconfig
+++ b/bsp/buildroot/configs/freescale_imx6dlsabreauto_defconfig
@@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -17,8 +17,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabreauto"
@@ -38,5 +38,6 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabreauto"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/freescale_imx6dlsabresd_defconfig b/bsp/buildroot/configs/freescale_imx6dlsabresd_defconfig
index 18cef00d..dc9b498a 100644
--- a/bsp/buildroot/configs/freescale_imx6dlsabresd_defconfig
+++ b/bsp/buildroot/configs/freescale_imx6dlsabresd_defconfig
@@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,8 +17,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-sabresd"
@@ -37,5 +37,6 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6dlsabresd"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/freescale_imx6qsabreauto_defconfig b/bsp/buildroot/configs/freescale_imx6qsabreauto_defconfig
index 9e8e0076..bc333e1a 100644
--- a/bsp/buildroot/configs/freescale_imx6qsabreauto_defconfig
+++ b/bsp/buildroot/configs/freescale_imx6qsabreauto_defconfig
@@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
@@ -17,8 +17,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto"
@@ -38,5 +38,6 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6qsabreauto"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/freescale_imx6qsabresd_defconfig b/bsp/buildroot/configs/freescale_imx6qsabresd_defconfig
index 824e1288..e0ef20c5 100644
--- a/bsp/buildroot/configs/freescale_imx6qsabresd_defconfig
+++ b/bsp/buildroot/configs/freescale_imx6qsabresd_defconfig
@@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,8 +17,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
@@ -38,5 +38,6 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/freescale_imx6sololiteevk_defconfig b/bsp/buildroot/configs/freescale_imx6sololiteevk_defconfig
deleted file mode 100644
index 0e81b2bd..00000000
--- a/bsp/buildroot/configs/freescale_imx6sololiteevk_defconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-# architecture
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
-
-# system
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk"
-
-# filesystem
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-
-# required tools to create the microSD image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6slevk"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
diff --git a/bsp/buildroot/configs/freescale_imx6sxsabresd_defconfig b/bsp/buildroot/configs/freescale_imx6sxsabresd_defconfig
index 4a40c263..eb11fb8a 100644
--- a/bsp/buildroot/configs/freescale_imx6sxsabresd_defconfig
+++ b/bsp/buildroot/configs/freescale_imx6sxsabresd_defconfig
@@ -8,8 +8,8 @@ BR2_ARM_FPU_VFPV3=y
 # patches
 BR2_GLOBAL_PATCH_DIR="board/freescale/imx6sabre/patches"
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -17,8 +17,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb"
@@ -36,6 +36,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/freescale_imx6ulevk_defconfig b/bsp/buildroot/configs/freescale_imx6ulevk_defconfig
deleted file mode 100644
index 3c5a9099..00000000
--- a/bsp/buildroot/configs/freescale_imx6ulevk_defconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-# architecture
-BR2_arm=y
-BR2_cortex_a7=y
-
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
-
-# system
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk"
-
-# bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-
-# required tools to create the microSD image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# filesystem / image
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
diff --git a/bsp/buildroot/configs/freescale_imx7dsabresd_defconfig b/bsp/buildroot/configs/freescale_imx7dsabresd_defconfig
index 97d3cde1..3563d1e1 100644
--- a/bsp/buildroot/configs/freescale_imx7dsabresd_defconfig
+++ b/bsp/buildroot/configs/freescale_imx7dsabresd_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_cortex_a7=y
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -11,8 +11,8 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.freescale.com/imx/linux-imx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb"
@@ -25,9 +25,10 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx7dsabresd"
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.freescale.com/imx/uboot-imx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.1.15_2.0.0_ga"
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.9.x_1.0.0_ga"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_NEEDS_DTC=y
 
 # required tools to create the microSD image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/bsp/buildroot/configs/freescale_mpc8315erdb_defconfig b/bsp/buildroot/configs/freescale_mpc8315erdb_defconfig
deleted file mode 100644
index de7e5613..00000000
--- a/bsp/buildroot/configs/freescale_mpc8315erdb_defconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-# Architecture
-BR2_powerpc=y
-BR2_powerpc_e300c3=y
-
-# Filesystem
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
-BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x200
-BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x4000
-BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
-
-# Linux headers same as kernel, a 4.5 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5.3"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-4.5.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb"
-
-# Serial port config
-BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
diff --git a/bsp/buildroot/configs/freescale_p1010rdb_pa_defconfig b/bsp/buildroot/configs/freescale_p1010rdb_pa_defconfig
deleted file mode 100644
index 3497275c..00000000
--- a/bsp/buildroot/configs/freescale_p1010rdb_pa_defconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# Architecture
-BR2_powerpc=y
-BR2_powerpc_8548=y
-
-# Filesystem
-# BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
-BR2_TARGET_ROOTFS_JFFS2_CUSTOM_PAGESIZE=0x20
-BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x20000
-
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-4.1.config"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb-pa"
-
-# Serial port config
-BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
diff --git a/bsp/buildroot/configs/friendlyarm_nanopi_a64_defconfig b/bsp/buildroot/configs/friendlyarm_nanopi_a64_defconfig
new file mode 100644
index 00000000..1b668be2
--- /dev/null
+++ b/bsp/buildroot/configs/friendlyarm_nanopi_a64_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_a64"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-nanopi-a64"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi A64"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-a64/genimage.cfg"
diff --git a/bsp/buildroot/configs/friendlyarm_nanopi_neo2_defconfig b/bsp/buildroot/configs/friendlyarm_nanopi_neo2_defconfig
new file mode 100644
index 00000000..f133e809
--- /dev/null
+++ b/bsp/buildroot/configs/friendlyarm_nanopi_neo2_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo2"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo2"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to FriendlyARM Nanopi NEO2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-neo2/genimage.cfg"
diff --git a/bsp/buildroot/configs/galileo_defconfig b/bsp/buildroot/configs/galileo_defconfig
index f0c308a1..72ab0ff0 100644
--- a/bsp/buildroot/configs/galileo_defconfig
+++ b/bsp/buildroot/configs/galileo_defconfig
@@ -1,8 +1,8 @@
 BR2_x86_x1000=y
+# Needed for TARGET_GRUB2
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 # Linux headers same as kernel, a 3.14 series
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
-# Binutils 2.25 is required as this enables stripping the LOCK prefix
-BR2_BINUTILS_VERSION_2_25_X=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
 BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
@@ -12,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/intel/galileo/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/mdr78/Linux-x1000.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="0feded4f96ddca9816c6c1b8a4780cb4065747b9"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8b3c9d8ce1656a26b1097d9091d53bfb39fef640"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/intel/galileo/linux-3.14.config"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/bsp/buildroot/configs/gdb_bfin_bf512_defconfig b/bsp/buildroot/configs/gdb_bfin_bf512_defconfig
index 37ee7288..6740647c 100644
--- a/bsp/buildroot/configs/gdb_bfin_bf512_defconfig
+++ b/bsp/buildroot/configs/gdb_bfin_bf512_defconfig
@@ -8,15 +8,15 @@ BR2_TARGET_ROOTFS_INITRAMFS=y
 
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/gdb/post-build.sh"
 
-# Linux headers same as kernel, a 4.6 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/gdb/bfin-bf512/linux-4.6.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/gdb/bfin-bf512/linux.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
@@ -31,4 +31,3 @@ BR2_PACKAGE_HOST_GDB=y
 # BR2_PACKAGE_HOST_GDB_TUI is not set
 # BR2_PACKAGE_HOST_GDB_PYTHON is not set
 BR2_PACKAGE_HOST_GDB_SIM=y
-
diff --git a/bsp/buildroot/configs/grinn_liteboard_defconfig b/bsp/buildroot/configs/grinn_liteboard_defconfig
index 11c240f4..70ec2964 100644
--- a/bsp/buildroot/configs/grinn_liteboard_defconfig
+++ b/bsp/buildroot/configs/grinn_liteboard_defconfig
@@ -1,13 +1,12 @@
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_GLOBAL_PATCH_DIR="board/grinn/liteboard/patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard"
diff --git a/bsp/buildroot/configs/imx6-sabreauto_defconfig b/bsp/buildroot/configs/imx6-sabreauto_defconfig
new file mode 100644
index 00000000..d9a08bbe
--- /dev/null
+++ b/bsp/buildroot/configs/imx6-sabreauto_defconfig
@@ -0,0 +1,38 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc3"
+
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6sabreauto"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabreauto imx6dl-sabreauto imx6qp-sabreauto"
diff --git a/bsp/buildroot/configs/imx6-sabresd_defconfig b/bsp/buildroot/configs/imx6-sabresd_defconfig
new file mode 100644
index 00000000..99995139
--- /dev/null
+++ b/bsp/buildroot/configs/imx6-sabresd_defconfig
@@ -0,0 +1,39 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
diff --git a/bsp/buildroot/configs/imx6-sabresd_qt5_defconfig b/bsp/buildroot/configs/imx6-sabresd_qt5_defconfig
new file mode 100644
index 00000000..8e6065db
--- /dev/null
+++ b/bsp/buildroot/configs/imx6-sabresd_qt5_defconfig
@@ -0,0 +1,97 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Additional features needed for packages
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="320M"
+BR2_ROOTFS_OVERLAY="board/freescale/imx6-sabresd/rootfs_overlay"
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6sabresd"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd imx6dl-sabresd imx6qp-sabresd"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6-sabresd/linux_qt5.fragment"
+
+# GL driver
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
+
+# Fonts
+BR2_PACKAGE_BITSTREAM_VERA=y
+BR2_PACKAGE_CANTARELL=y
+BR2_PACKAGE_DEJAVU=y
+BR2_PACKAGE_FONT_AWESOME=y
+BR2_PACKAGE_GHOSTSCRIPT_FONTS=y
+BR2_PACKAGE_INCONSOLATA=y
+BR2_PACKAGE_LIBERATION=y
+
+# GL demos
+BR2_PACKAGE_GLMARK2=y
+BR2_PACKAGE_KMSCUBE=y
+BR2_PACKAGE_LIBV4L=y
+BR2_PACKAGE_MESA3D_DEMOS=y
+
+# Qt5
+BR2_PACKAGE_QT5=y
+BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
+BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
+BR2_PACKAGE_QT5BASE_LINUXFB=y
+BR2_PACKAGE_QT5BASE_FONTCONFIG=y
+BR2_PACKAGE_QT5BASE_GIF=y
+BR2_PACKAGE_QT5BASE_JPEG=y
+BR2_PACKAGE_QT5CINEX=y
+BR2_PACKAGE_QT5CINEX_HD=y
+
+# NXP firmware package
+BR2_PACKAGE_FREESCALE_IMX=y
+BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q=y
+BR2_PACKAGE_FIRMWARE_IMX=y
+
+# libdrm tests
+BR2_PACKAGE_LIBDRM_INSTALL_TESTS=y
+
+# gstreamer-1.0
+BR2_PACKAGE_GSTREAMER1=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2=y
+BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE=y
+BR2_PACKAGE_GST1_PLUGINS_BAD=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS=y
+BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS=y
+
+# For automatic kernel module loading
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
diff --git a/bsp/buildroot/configs/imx6q-sabresd_defconfig b/bsp/buildroot/configs/imx6q-sabresd_defconfig
deleted file mode 100644
index cc37ecf2..00000000
--- a/bsp/buildroot/configs/imx6q-sabresd_defconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# System
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
-
-# required tools to create the SD card image
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Filesystem
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.7"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
diff --git a/bsp/buildroot/configs/imx6slevk_defconfig b/bsp/buildroot/configs/imx6slevk_defconfig
new file mode 100644
index 00000000..be4b42e8
--- /dev/null
+++ b/bsp/buildroot/configs/imx6slevk_defconfig
@@ -0,0 +1,26 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6slevk"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sl-evk"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/imx6sx-sdb_defconfig b/bsp/buildroot/configs/imx6sx-sdb_defconfig
new file mode 100644
index 00000000..a87bdf84
--- /dev/null
+++ b/bsp/buildroot/configs/imx6sx-sdb_defconfig
@@ -0,0 +1,26 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_VFPV3=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6sxsabresd"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.14"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-sdb imx6sx-sdb-reva"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/imx6ulevk_defconfig b/bsp/buildroot/configs/imx6ulevk_defconfig
new file mode 100644
index 00000000..069f8cfc
--- /dev/null
+++ b/bsp/buildroot/configs/imx6ulevk_defconfig
@@ -0,0 +1,38 @@
+# architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# system
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-14x14-evk"
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mx6ul_14x14_evk"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+
+# required tools to create the SD card image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# filesystem / image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
diff --git a/bsp/buildroot/configs/imx7dpico_defconfig b/bsp/buildroot/configs/imx7dpico_defconfig
new file mode 100644
index 00000000..b72d56bc
--- /dev/null
+++ b/bsp/buildroot/configs/imx7dpico_defconfig
@@ -0,0 +1,35 @@
+# architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_NEON_VFPV4=y
+
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+
+# system
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico"
+
+# bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+
+# required tools to create the eMMC image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# filesystem / image
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
diff --git a/bsp/buildroot/configs/lego_ev3_defconfig b/bsp/buildroot/configs/lego_ev3_defconfig
index 543a2274..02819241 100644
--- a/bsp/buildroot/configs/lego_ev3_defconfig
+++ b/bsp/buildroot/configs/lego_ev3_defconfig
@@ -2,26 +2,32 @@
 BR2_arm=y
 BR2_arm926t=y
 
+# Build options
+BR2_GLOBAL_PATCH_DIR="board/lego/ev3/patches"
+
 # system
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lego/ev3/post-image.sh"
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ev3dev/ev3dev-kernel.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="v4.4.19-15-ev3dev-ev3_1"
-BR2_LINUX_KERNEL_DEFCONFIG="ev3dev"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_DEFCONFIG="davinci_all"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lego/ev3/linux.fragment"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_EXT_EV3DEV_LINUX_DRIVERS=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0xc0008000"
+BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="da850-lego-ev3"
+
+# Target packages
+BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES="board/lego/ev3/busybox.fragment"
 
 # filesystem
 BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_3=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_SQUASHFS=y
 BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
 # BR2_TARGET_ROOTFS_TAR is not set
@@ -30,7 +36,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="legoev3"
 
 # host
diff --git a/bsp/buildroot/configs/linksprite_pcduino_defconfig b/bsp/buildroot/configs/linksprite_pcduino_defconfig
index fb82714e..dd9bcdc1 100644
--- a/bsp/buildroot/configs/linksprite_pcduino_defconfig
+++ b/bsp/buildroot/configs/linksprite_pcduino_defconfig
@@ -17,13 +17,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/linksprite/pcduino/post-image.sh"
 # For kernel modules autoloading
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun4i-a10-pcduino"
@@ -37,10 +37,11 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
 BR2_TARGET_UBOOT_USE_DEFCONFIG=y
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Linksprite_pcDuino"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
diff --git a/bsp/buildroot/configs/minnowboard_defconfig b/bsp/buildroot/configs/minnowboard_defconfig
deleted file mode 100644
index f4afc86b..00000000
--- a/bsp/buildroot/configs/minnowboard_defconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-# Architecture
-BR2_x86_64=y
-BR2_x86_atom=y
-
-# Misc
-BR2_TARGET_GENERIC_GETTY_PORT="ttyPCH0"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="minnowboard"
-
-# Linux headers same as kernel, a 3.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_8=y
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-
-# Linux kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.yoctoproject.org/linux-yocto-3.8"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ba1587b9b62c801d161897303aa6d22809485f9b"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-3.8.config"
-
-# Bootloader
-BR2_TARGET_GRUB2=y
-BR2_TARGET_GRUB2_I386_EFI=y
-
-# Filesystem image
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-# BR2_TARGET_ROOTFS_TAR is not set
diff --git a/bsp/buildroot/configs/minnowboard_max-graphical_defconfig b/bsp/buildroot/configs/minnowboard_max-graphical_defconfig
index 1b95d8e5..f05e791a 100644
--- a/bsp/buildroot/configs/minnowboard_max-graphical_defconfig
+++ b/bsp/buildroot/configs/minnowboard_max-graphical_defconfig
@@ -1,18 +1,19 @@
 # Architecture
 BR2_x86_64=y
-BR2_x86_atom=y
+BR2_x86_silvermont=y
 
 # Toolchain
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
+# needed for TARGET_GRUB2
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
 
 # System configuration
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_ROOTFS_OVERLAY="board/minnowboard/fs-overlay-graphical"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="minnowboard-max"
 
 # Host packages
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -22,9 +23,9 @@ BR2_PACKAGE_HOST_MTOOLS=y
 # Linux
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-4.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config"
 
 # Bootloader
 BR2_TARGET_GRUB2=y
@@ -47,7 +48,6 @@ BR2_PACKAGE_FB_TEST_APP=y
 # X
 BR2_PACKAGE_XORG7=y
 BR2_PACKAGE_XSERVER_XORG_SERVER=y
-BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX=y
 BR2_PACKAGE_XAPP_XRANDR=y
 BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV=y
 BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD=y
@@ -70,5 +70,5 @@ BR2_PACKAGE_STARTUP_NOTIFICATION=y
 # Filesystem image
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
-
diff --git a/bsp/buildroot/configs/minnowboard_max_defconfig b/bsp/buildroot/configs/minnowboard_max_defconfig
index 63190eaa..9495bf37 100644
--- a/bsp/buildroot/configs/minnowboard_max_defconfig
+++ b/bsp/buildroot/configs/minnowboard_max_defconfig
@@ -1,15 +1,17 @@
 # Architecture
 BR2_x86_64=y
-BR2_x86_atom=y
+BR2_x86_silvermont=y
 
 # Misc
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="minnowboard-max"
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+# Needed for grub2
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
@@ -21,9 +23,9 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169=y
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux-4.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/minnowboard/linux.config"
 
 # Bootloader
 BR2_TARGET_GRUB2=y
diff --git a/bsp/buildroot/configs/mx25pdk_defconfig b/bsp/buildroot/configs/mx25pdk_defconfig
index c97ba766..a88fb2ae 100644
--- a/bsp/buildroot/configs/mx25pdk_defconfig
+++ b/bsp/buildroot/configs/mx25pdk_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx25pdk"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.11"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v4_v5"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx25-pdk"
diff --git a/bsp/buildroot/configs/mx51evk_defconfig b/bsp/buildroot/configs/mx51evk_defconfig
index db82a36e..368e9bea 100644
--- a/bsp/buildroot/configs/mx51evk_defconfig
+++ b/bsp/buildroot/configs/mx51evk_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_cortex_a8=y
 
-# Linux headers same as kernel, a 4.6 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -22,13 +22,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx51evk"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx51-babbage"
diff --git a/bsp/buildroot/configs/mx53loco_defconfig b/bsp/buildroot/configs/mx53loco_defconfig
index a79cacd1..8bb40141 100644
--- a/bsp/buildroot/configs/mx53loco_defconfig
+++ b/bsp/buildroot/configs/mx53loco_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_cortex_a8=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -22,13 +22,14 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx53loco"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15.1"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx53-qsb imx53-qsrb"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
diff --git a/bsp/buildroot/configs/mx6cubox_defconfig b/bsp/buildroot/configs/mx6cubox_defconfig
index 9ce496d9..5cb44fd4 100644
--- a/bsp/buildroot/configs/mx6cubox_defconfig
+++ b/bsp/buildroot/configs/mx6cubox_defconfig
@@ -3,8 +3,8 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.7 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/mx6cubox/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/solidrun/mx6cubox/post-image.sh"
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx6cuboxi"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-cubox-i imx6dl-cubox-i imx6q-hummingboard imx6dl-hummingboard"
diff --git a/bsp/buildroot/configs/mx6sx_udoo_neo_defconfig b/bsp/buildroot/configs/mx6sx_udoo_neo_defconfig
index a465eb97..e2e36b90 100644
--- a/bsp/buildroot/configs/mx6sx_udoo_neo_defconfig
+++ b/bsp/buildroot/configs/mx6sx_udoo_neo_defconfig
@@ -3,23 +3,22 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/neo/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/neo/post-image.sh"
-BR2_GLOBAL_PATCH_DIR="board/udoo/neo/patches"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="udoo_neo"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended"
diff --git a/bsp/buildroot/configs/mx6udoo_defconfig b/bsp/buildroot/configs/mx6udoo_defconfig
index bf2a5966..86ad13bb 100644
--- a/bsp/buildroot/configs/mx6udoo_defconfig
+++ b/bsp/buildroot/configs/mx6udoo_defconfig
@@ -3,22 +3,22 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/udoo/mx6qdl/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="udoo"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/udoo/mx6qdl/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/bsp/buildroot/configs/nanopi_m1_defconfig b/bsp/buildroot/configs/nanopi_m1_defconfig
new file mode 100644
index 00000000..323015ee
--- /dev/null
+++ b/bsp/buildroot/configs/nanopi_m1_defconfig
@@ -0,0 +1,44 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1/boot.cmd"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1/genimage.cfg"
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Additional tools
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/nanopi_m1_plus_defconfig b/bsp/buildroot/configs/nanopi_m1_plus_defconfig
new file mode 100644
index 00000000..da707fd5
--- /dev/null
+++ b/bsp/buildroot/configs/nanopi_m1_plus_defconfig
@@ -0,0 +1,45 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="nanopi-m1-plus"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi M1 Plus"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_m1_plus"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_GLOBAL_PATCH_DIR="board/friendlyarm/nanopi-m1-plus/patches/"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-m1-plus"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-m1-plus/boot.cmd"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/friendlyarm/nanopi-m1-plus/genimage.cfg"
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Additional tools
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/nanopi_neo_defconfig b/bsp/buildroot/configs/nanopi_neo_defconfig
index ba4534a1..aa464917 100644
--- a/bsp/buildroot/configs/nanopi_neo_defconfig
+++ b/bsp/buildroot/configs/nanopi_neo_defconfig
@@ -2,19 +2,18 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
 
-# Cannot use same headers as the kernel, because kernel is 4.9
-# and we only know 4.8 at best so far
-BR2_KERNEL_HEADERS_4_8=y
-
 BR2_TARGET_GENERIC_HOSTNAME="nanopi-neo"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the NanoPi NEO"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/nanopi-neo/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nanopi-neo/post-image.sh"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/friendlyarm/nanopi-neo/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/friendlyarm/nanopi-neo/post-image.sh"
+
+# Linux headers same as kernel, a 4.10 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10=y
 
 # Use a -rc kernel to get the DTS
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9-rc3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.1"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo"
@@ -23,7 +22,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-nanopi-neo"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11-rc3"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
@@ -32,7 +31,7 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
 # Build an sdcard image
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=32768
+BR2_TARGET_ROOTFS_EXT2_SIZE="32M"
 BR2_TARGET_ROOTFS_EXT2_INODES=8192
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
diff --git a/bsp/buildroot/configs/nexbox_a95x_defconfig b/bsp/buildroot/configs/nexbox_a95x_defconfig
new file mode 100644
index 00000000..5fc00994
--- /dev/null
+++ b/bsp/buildroot/configs/nexbox_a95x_defconfig
@@ -0,0 +1,20 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_SYSTEM_DHCP="eth0"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/nexbox/a95x/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/nexbox/a95x/post-image.sh"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.4"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxbb-nexbox-a95x amlogic/meson-gxl-s905x-nexbox-a95x"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/nitrogen6sx_defconfig b/bsp/buildroot/configs/nitrogen6sx_defconfig
index 6bb9953a..b29adf29 100644
--- a/bsp/buildroot/configs/nitrogen6sx_defconfig
+++ b/bsp/buildroot/configs/nitrogen6sx_defconfig
@@ -17,22 +17,25 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="nitrogen6sx"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-# Last version of branch boundary-v2016.03
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/9cbdb79a.tar.gz"
+# Last version of branch boundary-v2017.07
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1530219d.tar.gz"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd"
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Last version of branch boundary-imx_4.1.15_2.0.0_ga
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/3c1c6149.tar.gz"
+# Last version of branch boundary-imx_4.9.x_1.0.0_ga
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/2aef1ef6.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/bsp/buildroot/configs/nitrogen6x_defconfig b/bsp/buildroot/configs/nitrogen6x_defconfig
index 48bb114a..5905a40e 100644
--- a/bsp/buildroot/configs/nitrogen6x_defconfig
+++ b/bsp/buildroot/configs/nitrogen6x_defconfig
@@ -17,23 +17,26 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="nitrogen6q"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-# Last version of branch boundary-v2016.03
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/9cbdb79a.tar.gz"
+# Last version of branch boundary-v2017.07
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1530219d.tar.gz"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd"
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Last version of branch boundary-imx_4.1.15_2.0.0_ga
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/3c1c6149.tar.gz"
+# Last version of branch boundary-imx_4.9.x_1.0.0_ga
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/2aef1ef6.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6q-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-nit6xlite imx6dl-nitrogen6_vm imx6dl-nitrogen6x imx6q-nitrogen6x imx6dl-nitrogen6_som2 imx6q-nitrogen6_som2 imx6qp-nitrogen6_som2 imx6q-nitrogen6_max imx6qp-nitrogen6_max imx6q-sabrelite"
diff --git a/bsp/buildroot/configs/nitrogen7_defconfig b/bsp/buildroot/configs/nitrogen7_defconfig
index b027fb7c..fa8f36c6 100644
--- a/bsp/buildroot/configs/nitrogen7_defconfig
+++ b/bsp/buildroot/configs/nitrogen7_defconfig
@@ -16,22 +16,25 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="nitrogen7"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
-# Last version of branch boundary-v2016.03
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/9cbdb79a.tar.gz"
+# Last version of branch boundary-v2017.07
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot-imx6/archive/1530219d.tar.gz"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7"
+BR2_TARGET_UBOOT_FORMAT_IMX=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd"
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Last version of branch boundary-imx_4.1.15_2.0.0_ga
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/3c1c6149.tar.gz"
+# Last version of branch boundary-imx_4.9.x_1.0.0_ga
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux-imx6/archive/2aef1ef6.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/bsp/buildroot/configs/odroidc2_defconfig b/bsp/buildroot/configs/odroidc2_defconfig
index f2d82296..f52f29ad 100644
--- a/bsp/buildroot/configs/odroidc2_defconfig
+++ b/bsp/buildroot/configs/odroidc2_defconfig
@@ -16,7 +16,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/hardkernel/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="a7fe6f2258e30c7a547908b5480bdbe6b56d6d3c"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="f966ebfc0e8dc88c7931b4640b8a1b4bc2e13faa"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidc2"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_BUILD_DEFAULT_DTS=y
@@ -28,7 +28,7 @@ BR2_LINUX_KERNEL_IMAGE=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/hardkernel/u-boot.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="eb5d2d16fd45f52ec49e9b4ff9d562630c08e61c"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="cff3edb675933ea2e2ecd659eab127a42f3777df"
 BR2_TARGET_UBOOT_BOARDNAME="odroidc2"
 
 # Required tools to create the SD image
diff --git a/bsp/buildroot/configs/olimex_a13_olinuxino_defconfig b/bsp/buildroot/configs/olimex_a13_olinuxino_defconfig
new file mode 100644
index 00000000..df2a7223
--- /dev/null
+++ b/bsp/buildroot/configs/olimex_a13_olinuxino_defconfig
@@ -0,0 +1,46 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a8=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="a13-olinuxino"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
+BR2_TARGET_GENERIC_GETTY=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A13-OLinuXino"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_BIN=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun5i-a13-olinuxino"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a13_olinuxino/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a13_olinuxino/genimage.cfg"
+
+# Additional tools
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig b/bsp/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig
index 807f41c5..509b0502 100644
--- a/bsp/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig
+++ b/bsp/buildroot/configs/olimex_a20_olinuxino_lime2_defconfig
@@ -1,34 +1,48 @@
+# Architecture
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
-# Linux headers same as kernel, a 4.1 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# System configuration
 BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
 BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
+BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
+
+# Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.1.4"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.12"
+BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-lime2"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
-BR2_PACKAGE_SUNXI_TOOLS=y
-BR2_PACKAGE_SUNXI_BOARDS=y
-BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex"
+
+# Filesystem
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
+
+# Bootloaders
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.05"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd"
+
+# Additional tools
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/olimex_a20_olinuxino_lime_defconfig b/bsp/buildroot/configs/olimex_a20_olinuxino_lime_defconfig
index 10ce44d4..6c926b5d 100644
--- a/bsp/buildroot/configs/olimex_a20_olinuxino_lime_defconfig
+++ b/bsp/buildroot/configs/olimex_a20_olinuxino_lime_defconfig
@@ -3,8 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_EABIHF=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
@@ -12,13 +12,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.12"
 BR2_LINUX_KERNEL_USE_DEFCONFIG=y
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -34,13 +34,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd"
 
 # Additional tools
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/olimex_a20_olinuxino_lime_mali_defconfig b/bsp/buildroot/configs/olimex_a20_olinuxino_lime_mali_defconfig
index dd5175b5..d240e79e 100644
--- a/bsp/buildroot/configs/olimex_a20_olinuxino_lime_mali_defconfig
+++ b/bsp/buildroot/configs/olimex_a20_olinuxino_lime_mali_defconfig
@@ -12,8 +12,8 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
 BR2_TARGET_GENERIC_GETTY=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot-mali.cmd $(TARGET_DIR)/boot"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
@@ -41,13 +41,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_BIN=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot-mali.cmd"
 
 # Additional tools
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/olimex_a20_olinuxino_micro_defconfig b/bsp/buildroot/configs/olimex_a20_olinuxino_micro_defconfig
index 17fe6cf3..a2aff0ca 100644
--- a/bsp/buildroot/configs/olimex_a20_olinuxino_micro_defconfig
+++ b/bsp/buildroot/configs/olimex_a20_olinuxino_micro_defconfig
@@ -3,8 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.12 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
 
 # System configuration
 BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino"
@@ -12,13 +12,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_SYSTEM_DHCP="eth0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/olimex/a20_olinuxino/post-image.sh"
-BR2_ROOTFS_POST_SCRIPT_ARGS="board/olimex/a20_olinuxino/boot.cmd $(TARGET_DIR)/boot"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-olinuxino-micro"
@@ -31,13 +31,15 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 
 # Bootloaders
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="A20-OLinuXino_MICRO"
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino_MICRO"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot.cmd"
 
 # Additional tools
 BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_UBOOT_TOOLS=y
diff --git a/bsp/buildroot/configs/olimex_a64_olinuxino_defconfig b/bsp/buildroot/configs/olimex_a64_olinuxino_defconfig
new file mode 100644
index 00000000..b12229fc
--- /dev/null
+++ b/bsp/buildroot/configs/olimex_a64_olinuxino_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="a64-olinuxino"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Olimex A64-OLinuXino"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a64-olinuxino/genimage.cfg"
diff --git a/bsp/buildroot/configs/olimex_imx233_olinuxino_defconfig b/bsp/buildroot/configs/olimex_imx233_olinuxino_defconfig
index e5e66053..89ab5952 100644
--- a/bsp/buildroot/configs/olimex_imx233_olinuxino_defconfig
+++ b/bsp/buildroot/configs/olimex_imx233_olinuxino_defconfig
@@ -2,8 +2,8 @@
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # System
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
@@ -14,7 +14,7 @@ BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
 BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/imx233_olinuxino/linux-wifi.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -40,7 +40,7 @@ BR2_TARGET_ROOTFS_EXT4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="mx23_olinuxino"
 BR2_TARGET_UBOOT_FORMAT_SD=y
  
diff --git a/bsp/buildroot/configs/openblocks_a6_defconfig b/bsp/buildroot/configs/openblocks_a6_defconfig
index c0522da8..c805ae9c 100644
--- a/bsp/buildroot/configs/openblocks_a6_defconfig
+++ b/bsp/buildroot/configs/openblocks_a6_defconfig
@@ -5,18 +5,19 @@ BR2_arm926t=y
 # system
 BR2_TARGET_GENERIC_HOSTNAME="openblocks-a6"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+BR2_SYSTEM_DHCP="eth0"
 
 # filesystem
 BR2_TARGET_ROOTFS_JFFS2=y
-BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_16K=y
 
-# Linux headers same as kernel, a 3.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.18.1"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13"
 BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5"
 BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
diff --git a/bsp/buildroot/configs/orangepi_lite_defconfig b/bsp/buildroot/configs/orangepi_lite_defconfig
new file mode 100644
index 00000000..1e5fca86
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_lite_defconfig
@@ -0,0 +1,37 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Lite"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Lite"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.4"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-lite/linux-extras.config"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-lite"
+BR2_PACKAGE_RTL8189FS=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_lite"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-lite/boot.cmd"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-lite/genimage.cfg"
diff --git a/bsp/buildroot/configs/orangepi_one_defconfig b/bsp/buildroot/configs/orangepi_one_defconfig
index 925ba9c4..3715f1dd 100644
--- a/bsp/buildroot/configs/orangepi_one_defconfig
+++ b/bsp/buildroot/configs/orangepi_one_defconfig
@@ -1,14 +1,13 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_One"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi One"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-one/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-one/post-image.sh"
+BR2_SYSTEM_DHCP="eth0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-one"
@@ -18,12 +17,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_one"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-one/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-one/genimage.cfg"
diff --git a/bsp/buildroot/configs/orangepi_pc2_defconfig b/bsp/buildroot/configs/orangepi_pc2_defconfig
new file mode 100644
index 00000000..83be9368
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_pc2_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc2"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-pc2"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi PC2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc2/genimage.cfg"
diff --git a/bsp/buildroot/configs/orangepi_pc_defconfig b/bsp/buildroot/configs/orangepi_pc_defconfig
index a3a5700f..aa559e74 100644
--- a/bsp/buildroot/configs/orangepi_pc_defconfig
+++ b/bsp/buildroot/configs/orangepi_pc_defconfig
@@ -1,14 +1,13 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC"
-BR2_ROOTFS_POST_BUILD_SCRIPT="board/orangepi/orangepi-pc/post-build.sh"
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/orangepi/orangepi-pc/post-image.sh"
+BR2_SYSTEM_DHCP="eth0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc"
@@ -18,12 +17,17 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc/genimage.cfg"
diff --git a/bsp/buildroot/configs/orangepi_pc_plus_defconfig b/bsp/buildroot/configs/orangepi_pc_plus_defconfig
new file mode 100644
index 00000000..edc3909a
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_pc_plus_defconfig
@@ -0,0 +1,49 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi_PC_Plus"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi PC Plus"
+BR2_SYSTEM_DHCP="eth0"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-pc-plus"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-pc-plus/linux-extras.config"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_pc_plus"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc-plus/boot.cmd"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-pc-plus/genimage.cfg"
+
+# wireless driver and firmware
+BR2_PACKAGE_RTL8189FS=y
+BR2_PACKAGE_LINUX_FIRMWARE=y
+BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
+
+# wireless tools
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
diff --git a/bsp/buildroot/configs/orangepi_plus_defconfig b/bsp/buildroot/configs/orangepi_plus_defconfig
new file mode 100644
index 00000000..cf725ef2
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_plus_defconfig
@@ -0,0 +1,42 @@
+# Architecture
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
+
+# System configuration
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Plus"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Plus"
+
+# Bootloaders
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_plus"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.5"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-orangepi-plus"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-plus/boot.cmd"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-plus/genimage.cfg"
+
+# Additional tools
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/orangepi_prime_defconfig b/bsp/buildroot/configs/orangepi_prime_defconfig
new file mode 100644
index 00000000..861fc216
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_prime_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_prime"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-prime"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Prime"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-prime/genimage.cfg"
diff --git a/bsp/buildroot/configs/orangepi_win_defconfig b/bsp/buildroot/configs/orangepi_win_defconfig
new file mode 100644
index 00000000..8aae6024
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_win_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_win"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-orangepi-win"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Win/Win Plus"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-win/genimage.cfg"
diff --git a/bsp/buildroot/configs/orangepi_zero_defconfig b/bsp/buildroot/configs/orangepi_zero_defconfig
new file mode 100644
index 00000000..fcf9b325
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_zero_defconfig
@@ -0,0 +1,53 @@
+BR2_arm=y
+BR2_cortex_a7=y
+BR2_ARM_FPU_VFPV4=y
+BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero/patches"
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+BR2_TARGET_GENERIC_HOSTNAME="OrangePi_Zero"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Orange Pi Zero"
+BR2_SYSTEM_DHCP="eth0"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-orangepi-zero"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/orangepi/orangepi-zero/linux-extras.config"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero/boot.cmd"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero/genimage.cfg"
+
+# wireless driver and firmware
+BR2_PACKAGE_XR819_XRADIO=y
+BR2_PACKAGE_ARMBIAN_FIRMWARE=y
+BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819=y
+
+# wireless support
+BR2_PACKAGE_IW=y
+BR2_PACKAGE_WIRELESS_TOOLS=y
+BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+
+# spi flash support
+BR2_PACKAGE_MTD=y
diff --git a/bsp/buildroot/configs/orangepi_zero_plus2_defconfig b/bsp/buildroot/configs/orangepi_zero_plus2_defconfig
new file mode 100644
index 00000000..5b1ff350
--- /dev/null
+++ b/bsp/buildroot/configs/orangepi_zero_plus2_defconfig
@@ -0,0 +1,50 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Patch dir
+BR2_GLOBAL_PATCH_DIR="board/orangepi/orangepi-zero-plus2/patches"
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-plus2/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/orangepi/orangepi-zero-plus2/genimage.cfg"
diff --git a/bsp/buildroot/configs/pandaboard_defconfig b/bsp/buildroot/configs/pandaboard_defconfig
index 49747e07..9b7c962d 100644
--- a/bsp/buildroot/configs/pandaboard_defconfig
+++ b/bsp/buildroot/configs/pandaboard_defconfig
@@ -20,7 +20,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="omap4_panda"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
diff --git a/bsp/buildroot/configs/pc_x86_64_bios_defconfig b/bsp/buildroot/configs/pc_x86_64_bios_defconfig
index 23462ad5..47787bc1 100644
--- a/bsp/buildroot/configs/pc_x86_64_bios_defconfig
+++ b/bsp/buildroot/configs/pc_x86_64_bios_defconfig
@@ -17,19 +17,20 @@ BR2_TARGET_GRUB2=y
 # Filesystem / image
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-bios.cfg"
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.9.config"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pc/linux-extras.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # Firmware
diff --git a/bsp/buildroot/configs/pc_x86_64_efi_defconfig b/bsp/buildroot/configs/pc_x86_64_efi_defconfig
index 136b7113..67ba5bcf 100644
--- a/bsp/buildroot/configs/pc_x86_64_efi_defconfig
+++ b/bsp/buildroot/configs/pc_x86_64_efi_defconfig
@@ -20,19 +20,20 @@ BR2_TARGET_GRUB2_X86_64_EFI=y
 # Filesystem / image
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pc/post-image.sh support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pc/genimage-efi.cfg"
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.9.config"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pc/linux-extras.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pc/linux.config"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # Firmware
diff --git a/bsp/buildroot/configs/pine64_defconfig b/bsp/buildroot/configs/pine64_defconfig
new file mode 100644
index 00000000..6e8eb15d
--- /dev/null
+++ b/bsp/buildroot/configs/pine64_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg"
diff --git a/bsp/buildroot/configs/pine64_sopine_defconfig b/bsp/buildroot/configs/pine64_sopine_defconfig
new file mode 100644
index 00000000..b076681a
--- /dev/null
+++ b/bsp/buildroot/configs/pine64_sopine_defconfig
@@ -0,0 +1,47 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="sopine_baseboard"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_BOOT_SCRIPT=y
+BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/sopine/boot.cmd"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-sopine-baseboard"
+
+# Filesystem
+BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64 SOPINE"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/sopine/genimage.cfg"
diff --git a/bsp/buildroot/configs/qemu_aarch64_virt_defconfig b/bsp/buildroot/configs/qemu_aarch64_virt_defconfig
index 222c69eb..c94c4ac7 100644
--- a/bsp/buildroot/configs/qemu_aarch64_virt_defconfig
+++ b/bsp/buildroot/configs/qemu_aarch64_virt_defconfig
@@ -6,15 +6,16 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 
 # Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
-BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.6"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux-4.13.config"
diff --git a/bsp/buildroot/configs/qemu_arm_versatile_defconfig b/bsp/buildroot/configs/qemu_arm_versatile_defconfig
index afeef75c..0423dc06 100644
--- a/bsp/buildroot/configs/qemu_arm_versatile_defconfig
+++ b/bsp/buildroot/configs/qemu_arm_versatile_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.13.config"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="versatile-pb"
diff --git a/bsp/buildroot/configs/qemu_arm_versatile_nommu_defconfig b/bsp/buildroot/configs/qemu_arm_versatile_nommu_defconfig
index 6cc646b2..9c48172e 100644
--- a/bsp/buildroot/configs/qemu_arm_versatile_nommu_defconfig
+++ b/bsp/buildroot/configs/qemu_arm_versatile_nommu_defconfig
@@ -27,6 +27,6 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.45"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.4.70"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-4.4-nommu.config"
diff --git a/bsp/buildroot/configs/qemu_arm_vexpress_defconfig b/bsp/buildroot/configs/qemu_arm_vexpress_defconfig
index f8dd5a09..faba6a6c 100644
--- a/bsp/buildroot/configs/qemu_arm_vexpress_defconfig
+++ b/bsp/buildroot/configs/qemu_arm_vexpress_defconfig
@@ -13,13 +13,13 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
diff --git a/bsp/buildroot/configs/qemu_m68k_mcf5208_defconfig b/bsp/buildroot/configs/qemu_m68k_mcf5208_defconfig
index a5ebf153..ccbdcfa3 100644
--- a/bsp/buildroot/configs/qemu_m68k_mcf5208_defconfig
+++ b/bsp/buildroot/configs/qemu_m68k_mcf5208_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_INITRAMFS=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux-4.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_m68k_q800_defconfig b/bsp/buildroot/configs/qemu_m68k_q800_defconfig
index 7bba7ef1..6dc50a7c 100644
--- a/bsp/buildroot/configs/qemu_m68k_q800_defconfig
+++ b/bsp/buildroot/configs/qemu_m68k_q800_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_microblazebe_mmu_defconfig b/bsp/buildroot/configs/qemu_microblazebe_mmu_defconfig
index 3af8ad90..ae736ff1 100644
--- a/bsp/buildroot/configs/qemu_microblazebe_mmu_defconfig
+++ b/bsp/buildroot/configs/qemu_microblazebe_mmu_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-4.11.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/xilinx-xemaclite.patch"
diff --git a/bsp/buildroot/configs/qemu_microblazeel_mmu_defconfig b/bsp/buildroot/configs/qemu_microblazeel_mmu_defconfig
index 6bda8cc7..3dedecf7 100644
--- a/bsp/buildroot/configs/qemu_microblazeel_mmu_defconfig
+++ b/bsp/buildroot/configs/qemu_microblazeel_mmu_defconfig
@@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyUL0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-4.11.config"
 BR2_LINUX_KERNEL_LINUX_BIN=y
 BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/xilinx-xemaclite.patch"
diff --git a/bsp/buildroot/configs/qemu_mips32r2_malta_defconfig b/bsp/buildroot/configs/qemu_mips32r2_malta_defconfig
index efac1f26..db408b0e 100644
--- a/bsp/buildroot/configs/qemu_mips32r2_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips32r2_malta_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_mips32r2el_malta_defconfig b/bsp/buildroot/configs/qemu_mips32r2el_malta_defconfig
index 066c8977..ccec419a 100644
--- a/bsp/buildroot/configs/qemu_mips32r2el_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips32r2el_malta_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r2el-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_mips32r6_malta_defconfig b/bsp/buildroot/configs/qemu_mips32r6_malta_defconfig
index 898477b3..3aee84c5 100644
--- a/bsp/buildroot/configs/qemu_mips32r6_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips32r6_malta_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Compiler
diff --git a/bsp/buildroot/configs/qemu_mips32r6el_malta_defconfig b/bsp/buildroot/configs/qemu_mips32r6el_malta_defconfig
index a082167c..aa43dce9 100644
--- a/bsp/buildroot/configs/qemu_mips32r6el_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips32r6el_malta_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips32r6el-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Compiler
diff --git a/bsp/buildroot/configs/qemu_mips64_malta_defconfig b/bsp/buildroot/configs/qemu_mips64_malta_defconfig
index 7c400633..52e42992 100644
--- a/bsp/buildroot/configs/qemu_mips64_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips64_malta_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-4.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_mips64el_malta_defconfig b/bsp/buildroot/configs/qemu_mips64el_malta_defconfig
index e9570456..2b35c1a0 100644
--- a/bsp/buildroot/configs/qemu_mips64el_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips64el_malta_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64el-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_mips64r6_malta_defconfig b/bsp/buildroot/configs/qemu_mips64r6_malta_defconfig
index dccdc169..06c0133f 100644
--- a/bsp/buildroot/configs/qemu_mips64r6_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips64r6_malta_defconfig
@@ -10,15 +10,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Compiler
diff --git a/bsp/buildroot/configs/qemu_mips64r6el_malta_defconfig b/bsp/buildroot/configs/qemu_mips64r6el_malta_defconfig
index 8bbc114a..e80e7284 100644
--- a/bsp/buildroot/configs/qemu_mips64r6el_malta_defconfig
+++ b/bsp/buildroot/configs/qemu_mips64r6el_malta_defconfig
@@ -10,15 +10,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64r6el-malta/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Compiler
diff --git a/bsp/buildroot/configs/qemu_nios2_10m50_defconfig b/bsp/buildroot/configs/qemu_nios2_10m50_defconfig
index 345a6e54..a9eaf080 100644
--- a/bsp/buildroot/configs/qemu_nios2_10m50_defconfig
+++ b/bsp/buildroot/configs/qemu_nios2_10m50_defconfig
@@ -1,10 +1,10 @@
 BR2_nios2=y
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_DEFCONFIG="10m50"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux-4.9.fragment"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/nios2-10m50/linux-4.11.fragment"
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
diff --git a/bsp/buildroot/configs/qemu_or1k_defconfig b/bsp/buildroot/configs/qemu_or1k_defconfig
index 4f70285d..c6671421 100644
--- a/bsp/buildroot/configs/qemu_or1k_defconfig
+++ b/bsp/buildroot/configs/qemu_or1k_defconfig
@@ -1,19 +1,16 @@
 # Architecture
 BR2_or1k=y
 
-# Patches
-BR2_GLOBAL_PATCH_DIR="board/qemu/or1k/patches"
-
 # Filesystem
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4,9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4,14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.2"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/or1k/linux.config"
diff --git a/bsp/buildroot/configs/qemu_ppc64_pseries_defconfig b/bsp/buildroot/configs/qemu_ppc64_pseries_defconfig
index c15de3bc..84076314 100644
--- a/bsp/buildroot/configs/qemu_ppc64_pseries_defconfig
+++ b/bsp/buildroot/configs/qemu_ppc64_pseries_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.1"
 BR2_LINUX_KERNEL_DEFCONFIG="pseries"
 BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/bsp/buildroot/configs/qemu_ppc64le_pseries_defconfig b/bsp/buildroot/configs/qemu_ppc64le_pseries_defconfig
new file mode 100644
index 00000000..62e729d3
--- /dev/null
+++ b/bsp/buildroot/configs/qemu_ppc64le_pseries_defconfig
@@ -0,0 +1,21 @@
+# Architecture
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+
+# System
+BR2_TARGET_GENERIC_GETTY_PORT="hvc0"
+BR2_SYSTEM_DHCP="eth0"
+
+# Filesystem
+BR2_TARGET_ROOTFS_EXT2=y
+# BR2_TARGET_ROOTFS_TAR is not set
+
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.1"
+BR2_LINUX_KERNEL_DEFCONFIG="pseries_le"
+BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/bsp/buildroot/configs/qemu_ppc_g3beige_defconfig b/bsp/buildroot/configs/qemu_ppc_g3beige_defconfig
index 58d4dfc8..9482aaa8 100644
--- a/bsp/buildroot/configs/qemu_ppc_g3beige_defconfig
+++ b/bsp/buildroot/configs/qemu_ppc_g3beige_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-g3beige/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_ppc_mpc8544ds_defconfig b/bsp/buildroot/configs/qemu_ppc_mpc8544ds_defconfig
index 0252da72..d2d92b66 100644
--- a/bsp/buildroot/configs/qemu_ppc_mpc8544ds_defconfig
+++ b/bsp/buildroot/configs/qemu_ppc_mpc8544ds_defconfig
@@ -9,15 +9,15 @@ BR2_SYSTEM_DHCP="eth0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/ppc-mpc8544ds/linux-4.11.config"
 BR2_LINUX_KERNEL_VMLINUX=y
 
 # Serial port config
diff --git a/bsp/buildroot/configs/qemu_sparc64_sun4u_defconfig b/bsp/buildroot/configs/qemu_sparc64_sun4u_defconfig
index ef2d22f7..072fba79 100644
--- a/bsp/buildroot/configs/qemu_sparc64_sun4u_defconfig
+++ b/bsp/buildroot/configs/qemu_sparc64_sun4u_defconfig
@@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc64-sun4u/linux-4.11.config"
diff --git a/bsp/buildroot/configs/qemu_sparc_ss10_defconfig b/bsp/buildroot/configs/qemu_sparc_ss10_defconfig
index 1d6c9517..8c6b563a 100644
--- a/bsp/buildroot/configs/qemu_sparc_ss10_defconfig
+++ b/bsp/buildroot/configs/qemu_sparc_ss10_defconfig
@@ -9,12 +9,12 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Linux kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.12"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux-4.11.config"
diff --git a/bsp/buildroot/configs/qemu_x86_64_defconfig b/bsp/buildroot/configs/qemu_x86_64_defconfig
index 7002d5ed..b92ae17a 100644
--- a/bsp/buildroot/configs/qemu_x86_64_defconfig
+++ b/bsp/buildroot/configs/qemu_x86_64_defconfig
@@ -9,12 +9,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-4.15.config"
diff --git a/bsp/buildroot/configs/qemu_x86_defconfig b/bsp/buildroot/configs/qemu_x86_defconfig
index 99ca6040..ed6c198a 100644
--- a/bsp/buildroot/configs/qemu_x86_defconfig
+++ b/bsp/buildroot/configs/qemu_x86_defconfig
@@ -10,12 +10,12 @@ BR2_TARGET_GENERIC_GETTY_PORT="tty1"
 BR2_TARGET_ROOTFS_EXT2=y
 # BR2_TARGET_ROOTFS_TAR is not set
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.9.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-4.15.config"
diff --git a/bsp/buildroot/configs/qemu_xtensa_lx60_defconfig b/bsp/buildroot/configs/qemu_xtensa_lx60_defconfig
index 54d844d7..d8614ef2 100644
--- a/bsp/buildroot/configs/qemu_xtensa_lx60_defconfig
+++ b/bsp/buildroot/configs/qemu_xtensa_lx60_defconfig
@@ -1,12 +1,7 @@
 # Architecture
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
-BR2_XTENSA_CUSTOM_NAME="dc233c"
-BR2_XTENSA_CORE_NAME="lx60"
-BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60"
-
-# Patches
-BR2_GLOBAL_PATCH_DIR="board/qemu/xtensa-lx60"
+BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
 
 # System
 BR2_SYSTEM_DHCP="eth0"
@@ -16,15 +11,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.8.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.11.config"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf"
-BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage"
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
diff --git a/bsp/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig b/bsp/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig
index 256cbeee..174ebd3d 100644
--- a/bsp/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig
+++ b/bsp/buildroot/configs/qemu_xtensa_lx60_nommu_defconfig
@@ -1,17 +1,12 @@
 # Architecture
 BR2_xtensa=y
 BR2_XTENSA_CUSTOM=y
-BR2_XTENSA_CUSTOM_NAME="dc233c"
-BR2_XTENSA_CORE_NAME="lx60"
-BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60"
+BR2_XTENSA_OVERLAY_FILE="https://github.com/jcmvbkbc/xtensa-toolchain-build/raw/95291b7c39e6f790d0b2f062c945a630290f2c81/overlays/xtensa_dc233c.tar.gz"
 
 # Toolchain
 BR2_PACKAGE_HOST_ELF2FLT=y
 # BR2_USE_MMU is not set
 
-# Patches
-BR2_GLOBAL_PATCH_DIR="board/qemu/xtensa-lx60"
-
 # System
 BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
@@ -20,15 +15,15 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_ROOTFS_INITRAMFS=y
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 4.11 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.17"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.8-nommu.config"
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/xtensa-lx60/linux-4.11-nommu.config"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_NAME="Image.elf"
-BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage"
+BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="Image"
diff --git a/bsp/buildroot/configs/raspberrypi0_defconfig b/bsp/buildroot/configs/raspberrypi0_defconfig
index 736143f0..0fb8a994 100644
--- a/bsp/buildroot/configs/raspberrypi0_defconfig
+++ b/bsp/buildroot/configs/raspberrypi0_defconfig
@@ -2,21 +2,21 @@ BR2_arm=y
 BR2_arm1176jzf_s=y
 BR2_ARM_EABIHF=y
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B from the kernel sources: the zero is the same
 # as the A+ model, just in a different form-factor
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus bcm2708-rpi-0-w"
 
 BR2_PACKAGE_RPI_FIRMWARE=y
 # BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
diff --git a/bsp/buildroot/configs/raspberrypi2_defconfig b/bsp/buildroot/configs/raspberrypi2_defconfig
index 1ec92e75..9c422a19 100644
--- a/bsp/buildroot/configs/raspberrypi2_defconfig
+++ b/bsp/buildroot/configs/raspberrypi2_defconfig
@@ -7,13 +7,13 @@ BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
@@ -31,6 +31,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 # Filesystem / image
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi2/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi2/post-image.sh"
diff --git a/bsp/buildroot/configs/raspberrypi3_64_defconfig b/bsp/buildroot/configs/raspberrypi3_64_defconfig
new file mode 100644
index 00000000..6a35ac36
--- /dev/null
+++ b/bsp/buildroot/configs/raspberrypi3_64_defconfig
@@ -0,0 +1,37 @@
+BR2_aarch64=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_VFPV4=y
+
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_SYSTEM_DHCP="eth0"
+
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114"
+BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi3"
+
+# Build the DTB from the kernel sources
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="broadcom/bcm2710-rpi-3-b broadcom/bcm2837-rpi-3-b"
+
+BR2_PACKAGE_RPI_FIRMWARE=y
+# BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS is not set
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3-64/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3-64/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--aarch64"
diff --git a/bsp/buildroot/configs/raspberrypi3_defconfig b/bsp/buildroot/configs/raspberrypi3_defconfig
index 6fceaa0b..359d549b 100644
--- a/bsp/buildroot/configs/raspberrypi3_defconfig
+++ b/bsp/buildroot/configs/raspberrypi3_defconfig
@@ -1,27 +1,25 @@
 BR2_arm=y
-BR2_cortex_a7=y
-BR2_ARM_EABIHF=y
+BR2_cortex_a53=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114"
 BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
 
 # Build the DTB from the kernel sources
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3"
 
 BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS=y
 
 # Required tools to create the SD image
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
@@ -31,6 +29,7 @@ BR2_PACKAGE_HOST_MTOOLS=y
 # Filesystem / image
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
diff --git a/bsp/buildroot/configs/raspberrypi3_qt5we_defconfig b/bsp/buildroot/configs/raspberrypi3_qt5we_defconfig
new file mode 100644
index 00000000..d4ada475
--- /dev/null
+++ b/bsp/buildroot/configs/raspberrypi3_qt5we_defconfig
@@ -0,0 +1,50 @@
+BR2_arm=y
+BR2_cortex_a53=y
+BR2_ARM_FPU_NEON_VFPV4=y
+
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+
+BR2_SYSTEM_DHCP="eth0"
+
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114"
+BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
+
+# Build the DTB from the kernel sources
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-cm3"
+
+# Build Qt5 WebEngine
+BR2_PACKAGE_LIBERATION=y
+BR2_PACKAGE_QT5=y
+BR2_PACKAGE_QT5BASE_EXAMPLES=y
+BR2_PACKAGE_QT5BASE_GIF=y
+BR2_PACKAGE_QT5BASE_JPEG=y
+BR2_PACKAGE_QT5BASE_PNG=y
+BR2_PACKAGE_QT5WEBENGINE=y
+BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
+BR2_PACKAGE_RPI_FIRMWARE=y
+BR2_PACKAGE_RPI_USERLAND=y
+BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_NTP=y
+
+# Required tools to create the SD image
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
+
+# Filesystem / image
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="360M"
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/raspberrypi3/post-build.sh"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/raspberrypi3/post-image.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="--add-pi3-miniuart-bt-overlay --gpu_mem_1024=200"
diff --git a/bsp/buildroot/configs/raspberrypi_defconfig b/bsp/buildroot/configs/raspberrypi_defconfig
index 6af9fb30..daca8362 100644
--- a/bsp/buildroot/configs/raspberrypi_defconfig
+++ b/bsp/buildroot/configs/raspberrypi_defconfig
@@ -4,15 +4,15 @@ BR2_ARM_EABIHF=y
 
 BR2_SYSTEM_DHCP="eth0"
 
-# Linux headers same as kernel, a 4.4 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+# Linux headers same as kernel, a 4.9 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/raspberrypi/linux.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="1ebe8d4a4c96cd6a90805c74233a468854960f67"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="33ee56d5927ceff630fbc87e3f5caa409b6ae114"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 
 # Build the DTBs for A/B, A+/B+ and compute module from the kernel sources
diff --git a/bsp/buildroot/configs/riotboard_defconfig b/bsp/buildroot/configs/riotboard_defconfig
deleted file mode 100644
index c2281058..00000000
--- a/bsp/buildroot/configs/riotboard_defconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-# architecture
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_NEON=y
-BR2_ARM_ENABLE_VFP=y
-BR2_ARM_FPU_VFPV3=y
-
-# system
-BR2_TARGET_GENERIC_GETTY=y
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
-
-# rootfs
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_2r1=y
-BR2_ROOTFS_OVERLAY="board/embest/riotboard/rootfs_overlay"
-
-# bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2015.10"
-BR2_TARGET_UBOOT_BOARDNAME="riotboard"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-
-# Linux headers same as kernel, a 4.2 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_2=y
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.2.6"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6dl-riotboard"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
diff --git a/bsp/buildroot/configs/sheevaplug_defconfig b/bsp/buildroot/configs/sheevaplug_defconfig
index 9d624442..edafffe0 100644
--- a/bsp/buildroot/configs/sheevaplug_defconfig
+++ b/bsp/buildroot/configs/sheevaplug_defconfig
@@ -11,8 +11,8 @@ BR2_SYSTEM_DHCP="eth0"
 BR2_TARGET_ROOTFS_JFFS2=y
 BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
 
-# Linux headers same as kernel, a 4.6 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
 
 # bootloader
 BR2_TARGET_UBOOT=y
@@ -26,7 +26,7 @@ BR2_TARGET_UBOOT_FORMAT_KWB=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.13"
 BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v5"
 BR2_LINUX_KERNEL_APPENDED_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
diff --git a/bsp/buildroot/configs/snps_arc700_axs101_defconfig b/bsp/buildroot/configs/snps_arc700_axs101_defconfig
new file mode 100644
index 00000000..0fefaf4a
--- /dev/null
+++ b/bsp/buildroot/configs/snps_arc700_axs101_defconfig
@@ -0,0 +1,27 @@
+# Architecture
+BR2_arcle=y
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="axs101"
+BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform"
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_SYSTEM_DHCP="eth0"
+BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
+
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_DEFCONFIG="axs101"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/snps_archs38_axs103_defconfig b/bsp/buildroot/configs/snps_archs38_axs103_defconfig
new file mode 100644
index 00000000..39ceeae4
--- /dev/null
+++ b/bsp/buildroot/configs/snps_archs38_axs103_defconfig
@@ -0,0 +1,29 @@
+# Architecture
+BR2_arcle=y
+BR2_archs38=y
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="axs103"
+BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform"
+BR2_TARGET_ROOTFS_INITRAMFS=y
+BR2_SYSTEM_DHCP="eth0"
+BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
+
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# Bootloader
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_PATCH="board/synopsys/axs10x/patches/u-boot"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/snps_archs38_haps_defconfig b/bsp/buildroot/configs/snps_archs38_haps_defconfig
new file mode 100644
index 00000000..6583c1ec
--- /dev/null
+++ b/bsp/buildroot/configs/snps_archs38_haps_defconfig
@@ -0,0 +1,18 @@
+# Architecture
+BR2_arcle=y
+BR2_archs38=y
+
+# System
+BR2_TARGET_GENERIC_HOSTNAME="zebu_hs"
+BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform"
+BR2_TARGET_ROOTFS_INITRAMFS=y
+
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_DEFCONFIG="haps_hs_smp"
+BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/bsp/buildroot/configs/snps_archs38_vdk_defconfig b/bsp/buildroot/configs/snps_archs38_vdk_defconfig
index d13fcb22..46b539be 100644
--- a/bsp/buildroot/configs/snps_archs38_vdk_defconfig
+++ b/bsp/buildroot/configs/snps_archs38_vdk_defconfig
@@ -8,13 +8,13 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to the HS38 VDK Software Development Platform"
 BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
 BR2_TARGET_ROOTFS_EXT2=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_KERNEL_HEADERS_4_9=y
+# Linux headers same as kernel, a 4.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
-BR2_LINUX_KERNEL_PATCH="board/synopsys/vdk/patches/linux"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
 BR2_LINUX_KERNEL_DEFCONFIG="vdk_hs38_smp"
 BR2_LINUX_KERNEL_VMLINUX=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
diff --git a/bsp/buildroot/configs/snps_archs38_zebu_defconfig b/bsp/buildroot/configs/snps_archs38_zebu_defconfig
deleted file mode 100644
index 96d941ac..00000000
--- a/bsp/buildroot/configs/snps_archs38_zebu_defconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Architecture
-BR2_arcle=y
-BR2_archs38=y
-
-# System
-BR2_TARGET_GENERIC_HOSTNAME="zebu_hs"
-BR2_TARGET_GENERIC_ISSUE="Welcome to the HAPS Development Platform"
-BR2_TARGET_ROOTFS_INITRAMFS=y
-
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
-BR2_LINUX_KERNEL_DEFCONFIG="zebu_hs_smp"
-BR2_LINUX_KERNEL_VMLINUX=y
diff --git a/bsp/buildroot/configs/snps_axs101_defconfig b/bsp/buildroot/configs/snps_axs101_defconfig
deleted file mode 100644
index 48372acc..00000000
--- a/bsp/buildroot/configs/snps_axs101_defconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# Architecture
-BR2_arcle=y
-
-# System
-BR2_TARGET_GENERIC_HOSTNAME="axs101"
-BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform"
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
-
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
-BR2_LINUX_KERNEL_DEFCONFIG="axs101"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs101"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/snps_axs103_defconfig b/bsp/buildroot/configs/snps_axs103_defconfig
deleted file mode 100644
index eb16b703..00000000
--- a/bsp/buildroot/configs/snps_axs103_defconfig
+++ /dev/null
@@ -1,27 +0,0 @@
-# Architecture
-BR2_arcle=y
-BR2_archs38=y
-
-# System
-BR2_TARGET_GENERIC_HOSTNAME="axs103"
-BR2_TARGET_GENERIC_ISSUE="Welcome to the ARC Software Development Platform"
-BR2_TARGET_ROOTFS_INITRAMFS=y
-BR2_SYSTEM_DHCP="eth0"
-BR2_ROOTFS_OVERLAY="board/synopsys/axs10x/fs-overlay"
-
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9.6"
-BR2_LINUX_KERNEL_DEFCONFIG="axs103_smp"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.11"
-BR2_TARGET_UBOOT_BOARD_DEFCONFIG="axs103"
-BR2_TARGET_UBOOT_NEEDS_DTC=y
diff --git a/bsp/buildroot/configs/socrates_cyclone5_defconfig b/bsp/buildroot/configs/socrates_cyclone5_defconfig
new file mode 100644
index 00000000..45355c1b
--- /dev/null
+++ b/bsp/buildroot/configs/socrates_cyclone5_defconfig
@@ -0,0 +1,33 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_ARM_FPU_NEON=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/altera/socrates_cyclone5/genimage.cfg"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/altera-opensource/linux-socfpga.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_socfpga-4.1.33-ltsi_17.07.02_pr"
+BR2_LINUX_KERNEL_DEFCONFIG="socfpga"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="socfpga_cyclone5_socrates"
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/altera-opensource/u-boot-socfpga.git"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2017.07"
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="socfpga_socrates"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_ALTERA_SOCFPGA_IMAGE_CRC=y
+BR2_TARGET_UBOOT_ENVIMAGE=y
+BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/altera/socrates_cyclone5/boot-env.txt"
+BR2_TARGET_UBOOT_ENVIMAGE_SIZE="8192"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/solidrun_macchiatobin_mainline_defconfig b/bsp/buildroot/configs/solidrun_macchiatobin_mainline_defconfig
new file mode 100644
index 00000000..17fb9d02
--- /dev/null
+++ b/bsp/buildroot/configs/solidrun_macchiatobin_mainline_defconfig
@@ -0,0 +1,43 @@
+BR2_aarch64=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y
+BR2_TARGET_GENERIC_HOSTNAME="mcbin"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="43965481990fd92e9666cf9371a8cf478055ec7c"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
+BR2_TARGET_BINARIES_MARVELL=y
+BR2_TARGET_BINARIES_MARVELL_8040=y
+BR2_TARGET_MV_DDR_MARVELL=y
+
+# U-Boot
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040"
+BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.01"
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15"
+BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin"
+BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/solidrun/macchiatobin/linux-extras.config"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
+
+# rootfs
+BR2_TARGET_ROOTFS_TAR=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build.sh"
diff --git a/bsp/buildroot/configs/solidrun_macchiatobin_marvell_defconfig b/bsp/buildroot/configs/solidrun_macchiatobin_marvell_defconfig
new file mode 100644
index 00000000..201562b9
--- /dev/null
+++ b/bsp/buildroot/configs/solidrun_macchiatobin_marvell_defconfig
@@ -0,0 +1,44 @@
+BR2_aarch64=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_TARGET_GENERIC_HOSTNAME="mcbin"
+BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for Marvell MacchiatoBin"
+
+# Firmware
+BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="43965481990fd92e9666cf9371a8cf478055ec7c"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
+BR2_TARGET_BINARIES_MARVELL=y
+BR2_TARGET_BINARIES_MARVELL_8040=y
+BR2_TARGET_MV_DDR_MARVELL=y
+
+# U-Boot
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_CUSTOM_GIT=y
+BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/u-boot-marvell"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="u-boot-2017.03-armada-17.10"
+BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040"
+BR2_TARGET_UBOOT_NEEDS_DTC=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/linux-marvell"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="linux-4.4.52-armada-17.10"
+BR2_LINUX_KERNEL_DEFCONFIG="mvebu_v8_lsp"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="marvell/armada-8040-mcbin"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+# rootfs
+BR2_TARGET_ROOTFS_TAR=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/solidrun/macchiatobin/genimage.cfg"
+BR2_ROOTFS_POST_BUILD_SCRIPT="board/solidrun/macchiatobin/post-build.sh"
diff --git a/bsp/buildroot/configs/stm32f429_disco_defconfig b/bsp/buildroot/configs/stm32f429_disco_defconfig
index 37997948..5237e9ad 100644
--- a/bsp/buildroot/configs/stm32f429_disco_defconfig
+++ b/bsp/buildroot/configs/stm32f429_disco_defconfig
@@ -1,11 +1,11 @@
 BR2_arm=y
 BR2_cortex_m4=y
 BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f429-disco/patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
 BR2_LINUX_KERNEL_DEFCONFIG="stm32"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
 BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage"
diff --git a/bsp/buildroot/configs/stm32f469_disco_defconfig b/bsp/buildroot/configs/stm32f469_disco_defconfig
index 327134d1..8b77d8c1 100644
--- a/bsp/buildroot/configs/stm32f469_disco_defconfig
+++ b/bsp/buildroot/configs/stm32f469_disco_defconfig
@@ -1,11 +1,11 @@
 BR2_arm=y
 BR2_cortex_m4=y
 BR2_GLOBAL_PATCH_DIR="board/stmicroelectronics/stm32f469-disco/patches"
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_5=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/stm32-post-build.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
 BR2_LINUX_KERNEL_DEFCONFIG="stm32"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(LINUX_DIR)/arch/arm/configs/dram_0x00000000.config"
 BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y
diff --git a/bsp/buildroot/configs/telit_evk_pro3_defconfig b/bsp/buildroot/configs/telit_evk_pro3_defconfig
deleted file mode 100644
index 946c2f04..00000000
--- a/bsp/buildroot/configs/telit_evk_pro3_defconfig
+++ /dev/null
@@ -1,29 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_arm926t=y
-
-# Linux headers same as kernel, a 3.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_9=y
-
-# Watchdog is armed by the first stage bootloader
-BR2_PACKAGE_BUSYBOX_WATCHDOG=y
-
-# Filesystem
-BR2_TARGET_ROOTFS_UBIFS=y
-BR2_TARGET_ROOTFS_UBI=y
-
-# Bootloader
-BR2_TARGET_BAREBOX=y
-BR2_TARGET_BAREBOX_CUSTOM_VERSION=y
-BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE="2013.04.0"
-BR2_TARGET_BAREBOX_CUSTOM_PATCH_DIR="board/telit/evk-pro3"
-BR2_TARGET_BAREBOX_BOARD_DEFCONFIG="telit_evk_pro3"
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.1"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/telit/evk-pro3/linux-3.9.config"
-BR2_LINUX_KERNEL_APPENDED_ZIMAGE=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="evk-pro3"
diff --git a/bsp/buildroot/configs/toradex_apalis_imx6_defconfig b/bsp/buildroot/configs/toradex_apalis_imx6_defconfig
index 74d1fb3b..b7ef9804 100644
--- a/bsp/buildroot/configs/toradex_apalis_imx6_defconfig
+++ b/bsp/buildroot/configs/toradex_apalis_imx6_defconfig
@@ -1,12 +1,12 @@
 BR2_arm=y
 BR2_cortex_a9=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/toradex/apalis-imx6/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.toradex.com/linux-toradex.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8f237ebe42f2cb911245369276a6b3043c2815f2"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="18717e2b1ca9b0fbf8bafa2717719e1f2c8f1114"
 BR2_LINUX_KERNEL_DEFCONFIG="apalis_imx6"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-apalis-eval imx6q-apalis-ixora imx6q-apalis_v1_0-eval imx6q-apalis_v1_0-ixora"
@@ -17,8 +17,9 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="git://git.toradex.com/u-boot-toradex.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="1ef4a29e8cea0239411dde64f9617ad76248fd02"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="30a1208727729dae22cb42f9ba9ba17efe5e6f77"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="apalis_imx6"
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.imx"
+BR2_TARGET_UBOOT_FORMAT_IMG=y
+BR2_TARGET_UBOOT_SPL=y
+BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/bsp/buildroot/configs/ts4900_defconfig b/bsp/buildroot/configs/ts4900_defconfig
index 7d5d02be..e7950cea 100644
--- a/bsp/buildroot/configs/ts4900_defconfig
+++ b/bsp/buildroot/configs/ts4900_defconfig
@@ -1,12 +1,11 @@
 BR2_arm=y
 BR2_cortex_a9=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_1=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/technologic/ts4900/post-image.sh"
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/embeddedarm/linux-3.10.17-imx6.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="70d1e85a22879e27cc9e36384438d5a9793e44b0"
-BR2_LINUX_KERNEL_DEFCONFIG="imx_v7"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12"
+BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
diff --git a/bsp/buildroot/configs/ts5500_defconfig b/bsp/buildroot/configs/ts5500_defconfig
new file mode 100644
index 00000000..871c02e9
--- /dev/null
+++ b/bsp/buildroot/configs/ts5500_defconfig
@@ -0,0 +1,26 @@
+# architecture
+BR2_i386=y
+BR2_x86_i586=y
+
+# Linux headers same as kernel, a 4.14 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+
+# system
+BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
+BR2_ROOTFS_OVERLAY="board/technologic/ts5500/fs-overlay"
+
+# kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5500/linux-4.14.config"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+
+# rootfs
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+
+# bootloader
+BR2_TARGET_SYSLINUX=y
+BR2_TARGET_SYSLINUX_MBR=y
diff --git a/bsp/buildroot/configs/ts5x00_defconfig b/bsp/buildroot/configs/ts5x00_defconfig
deleted file mode 100644
index 53108866..00000000
--- a/bsp/buildroot/configs/ts5x00_defconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-# architecture
-BR2_i386=y
-BR2_x86_i586=y
-
-# Linux headers same as kernel, a 3.17 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_17=y
-
-# system
-BR2_TARGET_GENERIC_GETTY_PORT="ttyS1"
-BR2_ROOTFS_OVERLAY="board/technologic/ts5x00/fs-overlay"
-
-# kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.17.8"
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/technologic/ts5x00/linux-3.17.config"
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
-
-# rootfs
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-
-# bootloader
-BR2_TARGET_SYSLINUX=y
-BR2_TARGET_SYSLINUX_MBR=y
diff --git a/bsp/buildroot/configs/ts7680_defconfig b/bsp/buildroot/configs/ts7680_defconfig
new file mode 100644
index 00000000..09629a73
--- /dev/null
+++ b/bsp/buildroot/configs/ts7680_defconfig
@@ -0,0 +1,17 @@
+BR2_arm=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
+BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
+BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg"
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_GIT=y
+BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/embeddedarm/linux-3.14.28-imx28.git"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ff01621df09b97d9fd546d1b49f4013060142892"
+BR2_LINUX_KERNEL_DEFCONFIG="ts76xx"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000"
+BR2_LINUX_KERNEL_DTS_SUPPORT=y
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-ts7680"
+BR2_LINUX_KERNEL_INSTALL_TARGET=y
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_PACKAGE_HOST_GENIMAGE=y
diff --git a/bsp/buildroot/configs/via_imx6_vab820_defconfig b/bsp/buildroot/configs/via_imx6_vab820_defconfig
deleted file mode 100644
index fa646f07..00000000
--- a/bsp/buildroot/configs/via_imx6_vab820_defconfig
+++ /dev/null
@@ -1,34 +0,0 @@
-# Architecture
-BR2_arm=y
-BR2_cortex_a9=y
-BR2_ARM_ENABLE_VFP=y
-
-# Linux headers same as kernel, a 3.10 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
-
-# Kernel
-BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_GIT=y
-BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/viaembedded/vab820-kernel-bsp.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="via_3.10.17_2.0.6"
-BR2_LINUX_KERNEL_DEFCONFIG="via_vab820"
-BR2_LINUX_KERNEL_UIMAGE=y
-BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x10008000"
-BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-vab820"
-
-# Bootloader
-BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="mx6qvab820"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/viaembedded/vab820-uboot-bsp.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="via_3.10.17_2.0.6"
-BR2_TARGET_UBOOT_FORMAT_IMX=y
-
-# Filesystem
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_PACKAGE_HOST_DOSFSTOOLS=y
-BR2_PACKAGE_HOST_GENIMAGE=y
-BR2_PACKAGE_HOST_MTOOLS=y
-BR2_ROOTFS_POST_IMAGE_SCRIPT="board/via/imx6_vab820/post-image.sh"
diff --git a/bsp/buildroot/configs/wandboard_defconfig b/bsp/buildroot/configs/wandboard_defconfig
index caa4c510..e6ba1d4e 100644
--- a/bsp/buildroot/configs/wandboard_defconfig
+++ b/bsp/buildroot/configs/wandboard_defconfig
@@ -3,8 +3,8 @@ BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
-# Linux headers same as kernel, a 4.7 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_7=y
+# Linux headers same as kernel, a 4.13 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh"
@@ -13,13 +13,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="wandboard"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="SPL"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.7.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-wandboard imx6dl-wandboard imx6q-wandboard-revb1 imx6dl-wandboard-revb1"
diff --git a/bsp/buildroot/configs/warp7_defconfig b/bsp/buildroot/configs/warp7_defconfig
index c18a7826..7de4bb5b 100644
--- a/bsp/buildroot/configs/warp7_defconfig
+++ b/bsp/buildroot/configs/warp7_defconfig
@@ -3,8 +3,8 @@ BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
-# Linux headers same as kernel, a 4.9 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+# Linux headers same as kernel, a 4.12 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -15,9 +15,8 @@ BR2_ROOTFS_OVERLAY="board/warp7/rootfs_overlay"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12.3"
 BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
-BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/warp7/linux.fragment"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp"
 
@@ -25,7 +24,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7s-warp"
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="warp7"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 
 # wifi firmware for brcm43430
diff --git a/bsp/buildroot/configs/zynq_microzed_defconfig b/bsp/buildroot/configs/zynq_microzed_defconfig
index dd580ab9..a6366ee0 100644
--- a/bsp/buildroot/configs/zynq_microzed_defconfig
+++ b/bsp/buildroot/configs/zynq_microzed_defconfig
@@ -2,12 +2,13 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.3"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -20,10 +21,13 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_microzed"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/zynq_zc706_defconfig b/bsp/buildroot/configs/zynq_zc706_defconfig
index 3f7fd8c4..06903402 100644
--- a/bsp/buildroot/configs/zynq_zc706_defconfig
+++ b/bsp/buildroot/configs/zynq_zc706_defconfig
@@ -2,13 +2,13 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.3"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -21,10 +21,13 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zc706"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/configs/zynq_zed_defconfig b/bsp/buildroot/configs/zynq_zed_defconfig
index 0febf825..d08f83db 100644
--- a/bsp/buildroot/configs/zynq_zed_defconfig
+++ b/bsp/buildroot/configs/zynq_zed_defconfig
@@ -2,12 +2,13 @@ BR2_arm=y
 BR2_cortex_a9=y
 BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/Xilinx/linux-xlnx.git"
-BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="xilinx-v2017.3"
 BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
@@ -20,10 +21,13 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_GIT=y
 BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/Xilinx/u-boot-xlnx.git"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2016.2"
+BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="xilinx-v2017.3"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zed"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/boot.bin"
+BR2_PACKAGE_HOST_DOSFSTOOLS=y
+BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTOOLS=y
diff --git a/bsp/buildroot/docs/manual/adding-packages-cargo.txt b/bsp/buildroot/docs/manual/adding-packages-cargo.txt
new file mode 100644
index 00000000..b7fc09ac
--- /dev/null
+++ b/bsp/buildroot/docs/manual/adding-packages-cargo.txt
@@ -0,0 +1,110 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+
+=== Integration of Cargo-based packages
+
+Cargo is the package manager for the Rust programming language. It allows the
+user to build programs or libraries written in Rust, but it also downloads and
+manages their dependencies, to ensure repeatable builds. Cargo packages are
+called "crates".
+
+[[cargo-package-tutorial]]
+
+==== Cargo-based package's +Config.in+ file
+
+The +Config.in+ file of Cargo-based package 'foo' should contain:
+
+---------------------------
+01: config BR2_PACKAGE_FOO
+02: 	bool "foo"
+03: 	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+04: 	select BR2_PACKAGE_HOST_CARGO
+05: 	help
+06: 	  This is a comment that explains what foo is.
+07:
+08: 	  http://foosoftware.org/foo/
+---------------------------
+
+==== Cargo-based package's +.mk+ file
+
+Buildroot does not (yet) provide a dedicated package infrastructure for
+Cargo-based packages. So, we will explain how to write a +.mk+ file for such a
+package. Let's start with an example:
+
+------------------------------
+01: ################################################################################
+02: #
+03: # foo
+04: #
+05: ################################################################################
+06:
+07: FOO_VERSION = 1.0
+08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+09: FOO_SITE = http://www.foosoftware.org/download
+10: FOO_LICENSE = GPL-3.0+
+11: FOO_LICENSE_FILES = COPYING
+12:
+13: FOO_DEPENDENCIES = host-cargo
+14:
+15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
+16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release)
+17:
+18: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE)
+19:
+20: FOO_CARGO_OPTS = \
+21:   --$(FOO_CARGO_MODE) \
+22: 	--target=$(RUSTC_TARGET_NAME) \
+23: 	--manifest-path=$(@D)/Cargo.toml
+24:
+25: define FOO_BUILD_CMDS
+26: 	$(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \
+27: 		cargo build $(FOO_CARGO_OPTS)
+28: endef
+29:
+30: define FOO_INSTALL_TARGET_CMDS
+31: 	$(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \
+32: 		$(TARGET_DIR)/usr/bin/foo
+33: endef
+34:
+35: $(eval $(generic-package))
+--------------------------------
+
+The Makefile starts with the definition of the standard variables for package
+declaration (lines 7 to 11).
+
+As seen in line 35, it is based on the
+xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines
+the variables required by this particular infrastructure, where Cargo is
+invoked:
+
+* +FOO_BUILD_CMDS+: Cargo is invoked to perform the build. The options required
+  to configure the cross-compilation of the package are passed via
+  +FOO_CONF_OPTS+.
+
+* +FOO_INSTALL_TARGET_CMDS+: The binary executable generated is installed on
+  the target.
+
+In order to have Cargo available for the build, +FOO_DEPENDENCIES+ needs to
+contain +host-cargo+.
+
+To sum it up, to add a new Cargo-based package, the Makefile example can be
+copied verbatim then edited to replace all occurences of +FOO+ with the
+uppercase name of the new package and update the values of the standard
+variables.
+
+==== About Dependencies Management
+
+A crate can depend on other libraries from crates.io or git repositories, listed
+in its Cargo.toml file. Before starting a build, Cargo usually downloads
+automatically them. This step can also be performed independently, via the
++cargo fetch+ command.
+
+Cargo maintains a local cache of the registry index and of git checkouts of the
+crates, whose location is given by +$CARGO_HOME+. As seen in the package
+Makefile example at line 15, this environment variable is set to
++$(HOST_DIR)/share/cargo+.
+
+This dependency download mechanism is not convenient when performing an offline
+build, as Cargo will fail to fetch the dependencies. In that case, it is advised
+to generate a tarball of the dependencies using the +cargo vendor+ and add it to
++FOO_EXTRA_DOWNLOADS+.
diff --git a/bsp/buildroot/docs/manual/adding-packages-directory.txt b/bsp/buildroot/docs/manual/adding-packages-directory.txt
index 5dba962b..c9857a80 100644
--- a/bsp/buildroot/docs/manual/adding-packages-directory.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-directory.txt
@@ -28,7 +28,8 @@ contain:
 config BR2_PACKAGE_LIBFOO
 	bool "libfoo"
 	help
-	  This is a comment that explains what libfoo is.
+	  This is a comment that explains what libfoo is. The help text
+	  should be wrapped.
 
 	  http://foosoftware.org/libfoo/
 ---------------------------
@@ -36,8 +37,9 @@ config BR2_PACKAGE_LIBFOO
 The +bool+ line, +help+ line and other metadata information about the
 configuration option must be indented with one tab. The help text
 itself should be indented with one tab and two spaces, lines should
-not be longer than 72 columns, and it must mention the upstream URL
-of the project.
+be wrapped to fit 72 columns, where tab counts for 8, so 62 characters
+in the text itself. The help text must mention the upstream URL of the
+project after an empty line.
 
 As a convention specific to Buildroot, the ordering of the attributes
 is as follows:
@@ -437,11 +439,13 @@ rules].
 [[adding-packages-hash]]
 === The +.hash+ file
 
-Optionally, you can add a third file, named +libfoo.hash+, that contains
-the hashes of the downloaded files for the +libfoo+ package.
+When possible, you must add a third file, named +libfoo.hash+, that
+contains the hashes of the downloaded files for the +libfoo+
+package. The only reason for not adding a +.hash+ file is when hash
+checking is not possible due to how the package is downloaded.
 
 The hashes stored in that file are used to validate the integrity of the
-downloaded files.
+downloaded files and of the license files.
 
 The format of this file is one line for each file for which to check the
 hash, each line being space-separated, with these three fields:
@@ -456,7 +460,10 @@ hash, each line being space-separated, with these three fields:
 ** for +sha256+, 64 hexadecimal characters
 ** for +sha384+, 96 hexadecimal characters
 ** for +sha512+, 128 hexadecimal characters
-* the name of the file, without any directory component
+* the name of the file:
+** for a source archive: the basename of the file, without any directory
+   component,
+** for a license file: the path as it appears in +FOO_LICENSE_FILES+.
 
 Lines starting with a +#+ sign are considered comments, and ignored. Empty
 lines are ignored.
@@ -473,6 +480,13 @@ provide any hash, or only provides an +md5+ hash, then compute at least one
 strong hash yourself (preferably +sha256+, but not +md5+), and mention
 this in a comment line above the hashes.
 
+.Note
+The hashes for license files are used to detect a license change when a
+package version is bumped. The hashes are checked during the make legal-info
+target run. For a package with multiple versions (like Qt5),
+create the hash file in a subdirectory +<packageversion>+ of that package
+(see also xref:patch-apply-order[]).
+
 .Note
 The number of spaces does not matter, so one can use spaces (or tabs) to
 properly align the different fields.
@@ -499,6 +513,10 @@ sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-f
 
 # No hash for 1234:
 none   xxx                                                              libfoo-1234.tar.gz
+
+# Hash for license files:
+sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8  COPYING
+sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55  doc/COPYING.LGPL
 ----
 
 If the +.hash+ file is present, and it contains one or more hashes for a
@@ -513,10 +531,17 @@ the downloaded file is left in the download directory since this
 typically indicates that the +.hash+ file is wrong but the downloaded
 file is probably OK.
 
-Sources that are downloaded from a version control system (git, subversion,
-etc...) can not have a hash, because the version control system and tar
-may not create exactly the same file (dates, files ordering...), so the
-hash could be wrong even for a valid download. Therefore, the hash check
-is entirely skipped for such sources.
+Hashes are currently checked for files fetched from http/ftp servers,
+Git repositories, files copied using scp and local files. Hashes are
+not checked for other version control systems (such as Subversion,
+CVS, etc.) because Buildroot currently does not generate reproducible
+tarballs when source code is fetched from such version control
+systems.
+
+Hashes should only be added in +.hash+ files for files that are
+guaranteed to be stable. For example, patches auto-generated by Github
+are not guaranteed to be stable, and therefore their hashes can change
+over time. Such patches should not be downloaded, and instead be added
+locally to the package folder.
 
 If the +.hash+ file is missing, then no check is done at all.
diff --git a/bsp/buildroot/docs/manual/adding-packages-generic.txt b/bsp/buildroot/docs/manual/adding-packages-generic.txt
index e5f165d9..1e9557c0 100644
--- a/bsp/buildroot/docs/manual/adding-packages-generic.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-generic.txt
@@ -22,7 +22,7 @@ system is based on hand-written Makefiles or shell scripts.
 07: LIBFOO_VERSION = 1.0
 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
 09: LIBFOO_SITE = http://www.foosoftware.org/download
-10: LIBFOO_LICENSE = GPLv3+
+10: LIBFOO_LICENSE = GPL-3.0+
 11: LIBFOO_LICENSE_FILES = COPYING
 12: LIBFOO_INSTALL_STAGING = YES
 13: LIBFOO_CONFIG_SCRIPTS = libfoo-config
@@ -197,12 +197,25 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_VERSION+, mandatory, must contain the version of the
   package. Note that if +HOST_LIBFOO_VERSION+ doesn't exist, it is
   assumed to be the same as +LIBFOO_VERSION+. It can also be a
-  revision number, branch or tag for packages that are fetched
-  directly from their revision control system. +
-  Examples: +
-    +LIBFOO_VERSION = 0.1.2+ +
-    +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+ +
-    +LIBFOO_VERSION = stable+
+  revision number or a tag for packages that are fetched directly
+  from their version control system. Examples:
+  ** a version for a release tarball: +LIBFOO_VERSION = 0.1.2+
+  ** a sha1 for a git tree: +LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057+
+  ** a tag for a git tree +LIBFOO_VERSION = v0.1.2+
++
+.Note:
+Using a branch name as +FOO_VERSION+ is not supported, because it does
+not and can not work as people would expect it should:
++
+  1. due to local caching, Buildroot will not re-fetch the repository,
+     so people who expect to be able to follow the remote repository
+     would be quite surprised and disappointed;
+  2. because two builds can never be perfectly simultaneous, and because
+     the remote repository may get new commits on the branch anytime,
+     two users, using the same Buildroot tree and building the same
+     configuration, may get different source, thus rendering the build
+     non reproducible, and people would be quite surprised and
+     disappointed.
 
 * +LIBFOO_SOURCE+ may contain the name of the tarball of the package,
   which Buildroot will use to download the tarball from
@@ -263,7 +276,7 @@ information is (assuming the package name is +libfoo+) :
   the file using this URL. Otherwise, Buildroot will assume the file
   to be downloaded is located at +LIBFOO_SITE+. Buildroot will not do
   anything with those additional files, except download them: it will
-  be up to the package recipe to use them from +$(BR2_DL_DIR)+.
+  be up to the package recipe to use them from +$(DL_DIR)+.
 
 * +LIBFOO_SITE_METHOD+ determines the method used to fetch or copy the
   package source code. In many cases, Buildroot guesses the method
@@ -399,8 +412,8 @@ information is (assuming the package name is +libfoo+) :
 * +LIBFOO_LICENSE+ defines the license (or licenses) under which the package
   is released.
   This name will appear in the manifest file produced by +make legal-info+.
-  If the license appears in xref:legal-info-list-licenses[the following list],
-  use the same string to make the manifest file uniform.
+  If the license appears in https://spdx.org/licenses/[the SPDX License List],
+  use the SPDX short identifier to make the manifest file uniform.
   Otherwise, describe the license in a precise and concise way, avoiding
   ambiguous names such as +BSD+ which actually name a family of licenses.
   This variable is optional. If it is not defined, +unknown+ will appear in
@@ -408,12 +421,12 @@ information is (assuming the package name is +libfoo+) :
   The expected format for this variable must comply with the following rules:
   ** If different parts of the package are released under different
   licenses, then +comma+ separate licenses (e.g. +`LIBFOO_LICENSE =
-  GPLv2+, LGPLv2.1+`+). If there is clear distinction between which
+  GPL-2.0+, LGPL-2.1+`+). If there is clear distinction between which
   component is licensed under what license, then annotate the license
   with that component, between parenthesis (e.g. +`LIBFOO_LICENSE =
-  GPLv2+ (programs), LGPLv2.1+ (libraries)`+).
+  GPL-2.0+ (programs), LGPL-2.1+ (libraries)`+).
   ** If the package is dual licensed, then separate licenses with the
-  +or+ keyword (e.g. +`LIBFOO_LICENSE = AFLv2.1 or GPLv2+`+).
+  +or+ keyword (e.g. +`LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+`+).
 
 * +LIBFOO_LICENSE_FILES+ is a space-separated list of files in the package
   tarball that contain the license(s) under which the package is released.
@@ -453,6 +466,13 @@ information is (assuming the package name is +libfoo+) :
   FLAT binary format is only 4k bytes. If the application consumes more stack,
   append the required number here.
 
+* +LIBFOO_BIN_ARCH_EXCLUDE+ is a space-separated list of paths (relative
+  to the target directory) to ignore when checking that the package
+  installs correctly cross-compiled binaries. You seldom need to set this
+  variable, unless the package installs binary blobs outside the default
+  locations, `/lib/firmware`, `/usr/lib/firmware`, `/lib/modules`,
+  `/usr/lib/modules`, and `/usr/share`, which are automatically excluded.
+
 The recommended way to define these variables is to use the following
 syntax:
 
@@ -540,6 +560,9 @@ In the action definitions, you can use the following variables:
 * +$(@D)+, which contains the directory in which the package source
   code has been uncompressed.
 
+* +$(DL_DIR)+ contains the path to the directory where all the downloads made
+  by Buildroot are stored.
+
 * +$(TARGET_CC)+, +$(TARGET_LD)+, etc. to get the target
   cross-compilation utilities
 
diff --git a/bsp/buildroot/docs/manual/adding-packages-gettext.txt b/bsp/buildroot/docs/manual/adding-packages-gettext.txt
index c955b1fa..e9c6968e 100644
--- a/bsp/buildroot/docs/manual/adding-packages-gettext.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-gettext.txt
@@ -7,52 +7,53 @@ Many packages that support internationalization use the gettext
 library. Dependencies for this library are fairly complicated and
 therefore, deserve some explanation.
 
-The 'uClibc' C library doesn't implement gettext functionality;
-therefore with this C library, a separate gettext must be compiled,
-which is provided by the additional +libintl+ library, part of the
+The 'glibc' C library integrates a full-blown implementation of
+'gettext', supporting translation. Native Language Support is
+therefore built-in in 'glibc'.
+
+On the other hand, the 'uClibc' and 'musl' C libraries only provide a
+stub implementation of the gettext functionality, which allows to
+compile libraries and programs using gettext functions, but without
+providing the translation capabilities of a full-blown gettext
+implementation. With such C libraries, if real Native Language Support
+is necessary, it can be provided by the +libintl+ library of the
 +gettext+ package.
 
-On the other hand, the 'glibc' C library does integrate its own
-gettext library functions, so it is not necessary to build a separate
-+libintl+ library.
-
-However, certain packages need some gettext utilities on the target,
-such as the +gettext+ program itself, which allows to retrieve
-translated strings, from the command line.
-
-Additionally, some packages (such as +libglib2+) do require gettext
-functions unconditionally, while other packages (in general, those who
-support +--disable-nls+) only require gettext functions when locale
-support is enabled.
-
-Therefore, Buildroot defines two configuration options:
-
-* +BR2_NEEDS_GETTEXT+, which is true as soon as the toolchain doesn't
-  provide its own gettext implementation
-
-* +BR2_NEEDS_GETTEXT_IF_LOCALE+, which is true if the toolchain
-  doesn't provide its own gettext implementation and if locale support
-  is enabled
-
-Packages that need gettext only when locale support is enabled should:
-
-* use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE+ in the
-  +Config.in+ file;
-
-* use +$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)+ in the package
-  +DEPENDENCIES+ variable in the +.mk+ file.
-
-Packages that unconditionally need gettext (which should be very rare)
+Due to this, and in order to make sure that Native Language Support is
+properly handled, packages in Buildroot that can use NLS support
 should:
 
-* use +select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT+ in the +Config.in+
-  file;
+1. Ensure NLS support is enabled when +BR2_SYSTEM_ENABLE_NLS=y+. This
+   is done automatically for 'autotools' packages and therefore should
+   only be done for packages using other package infrastructures.
 
-* use +$(if $(BR2_NEEDS_GETTEXT),gettext)+ in the package
-  +DEPENDENCIES+ variable in the +.mk+ file.
+1. Add +$(TARGET_NLS_DEPENDENCIES)+ to the package
+   +<pkg>_DEPENDENCIES+ variable. This addition should be done
+   unconditionally: the value of this variable is automatically
+   adjusted by the core infrastructure to contain the relevant list of
+   packages. If NLS support is disabled, this variable is empty. If
+   NLS support is enabled, this variable contains +host-gettext+ so
+   that tools needed to compile translation files are available on the
+   host. In addition, if 'uClibc' or 'musl' are used, this variable
+   also contains +gettext+ in order to get the full-blown 'gettext'
+   implementation.
 
-Packages that need the +gettext+ utilities on the target (should be
-rare) should:
+1. If needed, add +$(TARGET_NLS_LIBS)+ to the linker flags, so that
+   the package gets linked with +libintl+. This is generally not
+   needed with 'autotools' packages as they usually detect
+   automatically that they should link with +libintl+. However,
+   packages using other build systems, or problematic autotools-based
+   packages may need this. +$(TARGET_NLS_LIBS)+ should be added
+   unconditionally to the linker flags, as the core automatically
+   makes it empty or defined to +-lintl+ depending on the
+   configuration.
+
+No changes should be made to the +Config.in+ file to support NLS.
+
+Finally, certain packages need some gettext utilities on the target,
+such as the +gettext+ program itself, which allows to retrieve
+translated strings, from the command line. In such a case, the package
+should:
 
 * use +select BR2_PACKAGE_GETTEXT+ in their +Config.in+ file,
   indicating in a comment above that it's a runtime dependency only.
diff --git a/bsp/buildroot/docs/manual/adding-packages-kernel-module.txt b/bsp/buildroot/docs/manual/adding-packages-kernel-module.txt
index ffeeef51..b609ecc9 100644
--- a/bsp/buildroot/docs/manual/adding-packages-kernel-module.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-kernel-module.txt
@@ -24,7 +24,7 @@ builds a kernel module, and no other component:
 07: FOO_VERSION = 1.2.3
 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
 09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
 11: FOO_LICENSE_FILES = COPYING
 12: 
 13: $(eval $(kernel-module))
@@ -63,7 +63,7 @@ Let's look at a more complex example:
 07: FOO_VERSION = 1.2.3
 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
 09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
 11: FOO_LICENSE_FILES = COPYING
 12: 
 13: FOO_MODULE_SUBDIRS = driver/base
diff --git a/bsp/buildroot/docs/manual/adding-packages-linux-kernel-spec-infra.txt b/bsp/buildroot/docs/manual/adding-packages-linux-kernel-spec-infra.txt
index 6deb6d4c..b948e208 100644
--- a/bsp/buildroot/docs/manual/adding-packages-linux-kernel-spec-infra.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-linux-kernel-spec-infra.txt
@@ -40,8 +40,8 @@ Unlike other packages, the +linux-tools+ package options appear in the
 +linux+ kernel menu, under the `Linux Kernel Tools` sub-menu, not under
 the `Target packages` main menu.
 
-Then for each linux tool, add a new +.mk+ file named
-+package/linux-tools/linux-tool-foo.mk+. It would basically look like:
+Then for each linux tool, add a new +.mk.in+ file named
++package/linux-tools/linux-tool-foo.mk.in+. It would basically look like:
 
 ------------------------------
 01: ################################################################################
diff --git a/bsp/buildroot/docs/manual/adding-packages-luarocks.txt b/bsp/buildroot/docs/manual/adding-packages-luarocks.txt
index c914238f..ec3d4e7c 100644
--- a/bsp/buildroot/docs/manual/adding-packages-luarocks.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-luarocks.txt
@@ -13,34 +13,40 @@ with an example :
 ------------------------
 01: ################################################################################
 02: #
-03: # luafoo
+03: # lua-foo
 04: #
 05: ################################################################################
 06:
-07: LUAFOO_VERSION = 1.0.2-1
-08: LUAFOO_DEPENDENCIES = foo
-09:
-10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
-11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
-12: LUAFOO_LICENSE = luaFoo license
-13: LUAFOO_LICENSE_FILES = COPYING
-14:
-15: $(eval $(luarocks-package))
+07: LUA_FOO_VERSION = 1.0.2-1
+08: LUA_FOO_NAME_UPSTREAM = foo
+09: LUA_FOO_DEPENDENCIES = bar
+10:
+11: LUA_FOO_BUILD_OPTS += BAR_INCDIR=$(STAGING_DIR)/usr/include
+12: LUA_FOO_BUILD_OPTS += BAR_LIBDIR=$(STAGING_DIR)/usr/lib
+13: LUA_FOO_LICENSE = luaFoo license
+14: LUA_FOO_LICENSE_FILES = $(LUA_FOO_SUBDIR)/COPYING
+15:
+16: $(eval $(luarocks-package))
 ------------------------
 
 On line 7, we declare the version of the package (the same as in the rockspec,
 which is the concatenation of the upstream version and the rockspec revision,
 separated by a hyphen '-').
 
-On line 8, we declare our dependencies against native libraries, so that they
+On line 8, we declare that the package is called "foo" on LuaRocks. In
+Buildroot, we give Lua-related packages a name that starts with "lua", so the
+Buildroot name is different from the upstream name. +LUA_FOO_NAME_UPSTREAM+
+makes the link between the two names.
+
+On line 9, we declare our dependencies against native libraries, so that they
 are built before the build process of our package starts.
 
-On lines 10-11, we tell Buildroot to pass custom options to LuaRocks when it is
+On lines 11-12, we tell Buildroot to pass custom options to LuaRocks when it is
 building the package.
 
-On lines 12-13, we specify the licensing terms for the package.
+On lines 13-14, we specify the licensing terms for the package.
 
-Finally, on line 15, we invoke the +luarocks-package+
+Finally, on line 16, we invoke the +luarocks-package+
 macro that generates all the Makefile rules that actually allows the
 package to be built.
 
@@ -67,24 +73,29 @@ macro.
 
 First, all the package metadata information variables that exist in
 the generic infrastructure also exist in the LuaRocks infrastructure:
-+LUAFOO_VERSION+, +LUAFOO_SOURCE+, +LUAFOO_SITE+,
-+LUAFOO_DEPENDENCIES+, +LUAFOO_LICENSE+, +LUAFOO_LICENSE_FILES+.
++LUA_FOO_VERSION+, +LUA_FOO_SOURCE+, +LUA_FOO_SITE+,
++LUA_FOO_DEPENDENCIES+, +LUA_FOO_LICENSE+, +LUA_FOO_LICENSE_FILES+.
 
 Two of them are populated by the LuaRocks infrastructure (for the
 +download+ step). If your package is not hosted on the LuaRocks mirror
 +$(BR2_LUAROCKS_MIRROR)+, you can override them:
 
-* +LUAFOO_SITE+, which defaults to +$(BR2_LUAROCKS_MIRROR)+
+* +LUA_FOO_SITE+, which defaults to +$(BR2_LUAROCKS_MIRROR)+
 
-* +LUAFOO_SOURCE+, which defaults to +luafoo-$(LUAFOO_VERSION).src.rock+
+* +LUA_FOO_SOURCE+, which defaults to
+  +$(lowercase LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION).src.rock+
 
 A few additional variables, specific to the LuaRocks infrastructure, are
 also defined. They can be overridden in specific cases.
 
-* +LUAFOO_ROCKSPEC+, which defaults to +luafoo-$(LUAFOO_VERSION).rockspec+
+* +LUA_FOO_NAME_UPSTREAM+, which defaults to +lua-foo+, i.e. the Buildroot
+  package name
 
-* +LUAFOO_SUBDIR+, which defaults to
-  +luafoo-$(LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)+
+* +LUA_FOO_ROCKSPEC+, which defaults to
+  +$(lowercase LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION).rockspec+
 
-* +LUAFOO_BUILD_OPTS+ contains additional build options for the
+* +LUA_FOO_SUBDIR+, which defaults to
+  +$(LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION_WITHOUT_ROCKSPEC_REVISION)+
+
+* +LUA_FOO_BUILD_OPTS+ contains additional build options for the
   +luarocks build+ call.
diff --git a/bsp/buildroot/docs/manual/adding-packages-meson.txt b/bsp/buildroot/docs/manual/adding-packages-meson.txt
new file mode 100644
index 00000000..f8aa08fa
--- /dev/null
+++ b/bsp/buildroot/docs/manual/adding-packages-meson.txt
@@ -0,0 +1,101 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+
+=== Integration of Meson-based packages
+
+[[meson-package-tutorial]]
+
+==== +meson-package+ tutorial
+
+http://mesonbuild.com[Meson] is an open source build system meant to be both
+extremely fast, and, even more importantly, as user friendly as possible.
+
+Buildroot does not (yet) provide a dedicated package infrastructure for
+meson-based packages. So, we will explain how to write a +.mk+ file for such a
+package. Let's start with an example:
+
+------------------------------
+01: ################################################################################
+02: #
+03: # foo
+04: #
+05: ################################################################################
+06:
+07: FOO_VERSION = 1.0
+08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+09: FOO_SITE = http://www.foosoftware.org/download
+10: FOO_LICENSE = GPL-3.0+
+11: FOO_LICENSE_FILES = COPYING
+12: FOO_INSTALL_STAGING = YES
+13:
+14: FOO_DEPENDENCIES = host-meson host-pkgconf bar
+15:
+16: FOO_CONF_OPTS += \
+17: 	--prefix=/usr \
+18: 	--buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
+19: 	--cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf
+20:
+21: FOO_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS)
+22:
+23: ifeq ($(BR2_PACKAGE_BAZ),y)
+24: FOO_CONF_OPTS += -Dbaz
+25: endif
+26:
+27: define FOO_CONFIGURE_CMDS
+28: 	rm -rf $(@D)/build
+29: 	mkdir -p $(@D)/build
+30: 	$(TARGET_MAKE_ENV) meson $(FOO_CONF_OPTS) $(@D) $(@D)/build
+31: endef
+32:
+33: define FOO_BUILD_CMDS
+34: 	$(TARGET_MAKE_ENV) ninja $(FOO_NINJA_OPTS) -C $(@D)/build
+35: endef
+36:
+37: define FOO_INSTALL_TARGET_CMDS
+38: 	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(FOO_NINJA_OPTS) \
+39: 		-C $(@D)/build install
+40: endef
+41:
+42: define FOO_INSTALL_STAGING_CMDS
+43: 	$(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) ninja $(FOO_NINJA_OPTS) \
+44: 		-C $(@D)/build install
+45: endef
+46:
+47: $(eval $(generic-package))
+--------------------------------
+
+The Makefile starts with the definition of the standard variables for package
+declaration (lines 7 to 11).
+
+As seen in line 47, it is based on the
+xref:generic-package-tutorial[+generic-package+ infrastructure]. So, it defines
+the variables required by this particular infrastructure, where Meson and its
+companion tool, Ninja, are invoked:
+
+* +FOO_CONFIGURE_CMDS+: the build directory required by Meson is created, and
+  Meson is invoked to generate the Ninja build file. The options required to
+  configure the cross-compilation of the package are passed via
+  +FOO_CONF_OPTS+.
+
+* +FOO_BUILD_CMDS+: Ninja is invoked to perform the build.
+
+* +FOO_INSTALL_TARGET_CMDS+: Ninja is invoked to install the files generated
+  during the build step in the target directory.
+
+* +FOO_INSTALL_STAGING_CMDS+: Ninja is invoked to install the files generated
+  during the build step in the staging directory, as +FOO_INSTALL_STAGING+ is
+  set to "YES".
+
+In order to have Meson available for the build, +FOO_DEPENDENCIES+ needs to
+contain +host-meson+. In the example, +host-pkgconf+ and +bar+ are also
+declared as dependencies because the Meson build file of +foo+ uses `pkg-config`
+to determine the compilation flags and libraries of package +bar+.
+
+If the "baz" package is selected, then support for the "baz" feature in "foo"
+is activated by adding +-Dbaz+ to +FOO_CONF_OPTS+, as specified in the
++meson_options.txt+ file in "foo" source tree.
+
+To sum it up, to add a new meson-based package, the Makefile example can be
+copied verbatim then edited to replace all occurences of +FOO+ with the
+uppercase name of the new package and update the values of the standard
+variables.
diff --git a/bsp/buildroot/docs/manual/adding-packages-perl.txt b/bsp/buildroot/docs/manual/adding-packages-perl.txt
index 3476b628..eb14d9de 100644
--- a/bsp/buildroot/docs/manual/adding-packages-perl.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-perl.txt
@@ -21,7 +21,7 @@ with an example :
 08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz
 09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER
 10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures
-11: PERL_FOO_BAR_LICENSE = Artistic or GPLv1+
+11: PERL_FOO_BAR_LICENSE = Artistic or GPL-1.0+
 12: PERL_FOO_BAR_LICENSE_FILES = LICENSE
 13:
 14: $(eval $(perl-package))
@@ -46,7 +46,7 @@ built.
 
 Most of these data can be retrieved from https://metacpan.org/.
 So, this file and the Config.in can be generated by running
-the script +supports/scripts/scancpan Foo-Bar+ in the Buildroot directory
+the script +utils/scancpan Foo-Bar+ in the Buildroot directory
 (or in a br2-external tree).
 This script creates a Config.in file and foo-bar.mk file for the
 requested package, and also recursively for all dependencies specified by
diff --git a/bsp/buildroot/docs/manual/adding-packages-python.txt b/bsp/buildroot/docs/manual/adding-packages-python.txt
index 19d31e28..5eb6ba51 100644
--- a/bsp/buildroot/docs/manual/adding-packages-python.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-python.txt
@@ -24,7 +24,7 @@ with an example :
 07: PYTHON_FOO_VERSION = 1.0
 08: PYTHON_FOO_SOURCE = python-foo-$(PYTHON_FOO_VERSION).tar.xz
 09: PYTHON_FOO_SITE = http://www.foosoftware.org/download
-10: PYTHON_FOO_LICENSE = BSD-3c
+10: PYTHON_FOO_LICENSE = BSD-3-Clause
 11: PYTHON_FOO_LICENSE_FILES = LICENSE
 12: PYTHON_FOO_ENV = SOME_VAR=1
 13: PYTHON_FOO_DEPENDENCIES = libmad
@@ -167,7 +167,7 @@ possible to customize what is done in any particular step:
 
 If the Python package for which you would like to create a Buildroot
 package is available on PyPI, you may want to use the +scanpypi+ tool
-located in +support/scripts+ to automate the process.
+located in +utils/+ to automate the process.
 
 You can find the list of existing PyPI packages
 https://pypi.python.org[here].
@@ -178,7 +178,7 @@ your host.
 When at the root of your buildroot directory just do :
 
 -----------------------
-./support/scripts/scanpypi foo bar -o package
+utils/scanpypi foo bar -o package
 -----------------------
 
 This will generate packages +python-foo+ and +python-bar+ in the package
@@ -198,7 +198,7 @@ If your Buildroot package is not in the official Buildroot tree but in
 a br2-external tree, use the -o flag as follows:
 
 -----------------------
-./support/scripts/scanpypi foo bar -o other_package_dir
+utils/scanpypi foo bar -o other_package_dir
 -----------------------
 
 This will generate packages +python-foo+ and +python-bar+ in the
@@ -207,7 +207,7 @@ This will generate packages +python-foo+ and +python-bar+ in the
 Option +-h+ will list the available options:
 
 -----------------------
-./support/scripts/scanpypi -h
+utils/scanpypi -h
 -----------------------
 
 [[python-package-cffi-backend]]
diff --git a/bsp/buildroot/docs/manual/adding-packages-tips.txt b/bsp/buildroot/docs/manual/adding-packages-tips.txt
index 896be00b..19577fa8 100644
--- a/bsp/buildroot/docs/manual/adding-packages-tips.txt
+++ b/bsp/buildroot/docs/manual/adding-packages-tips.txt
@@ -32,6 +32,100 @@ using the following rules:
   with `.` and `-` characters substituted with `_` (e.g.:
   +FOO_BAR_BOO_VERSION+).
 
+[[testing-package]]
+==== How to test your package
+
+Once you have added your new package, it is important that you test it
+under various conditions: does it build for all architectures? Does it
+build with the different C libraries? Does it need threads, NPTL? And
+so on...
+
+Buildroot runs http://autobuild.buildroot.org/[autobuilders] which
+continuously test random configurations. However, these only build the
+`master` branch of the git tree, and your new fancy package is not yet
+there.
+
+Buildroot provides a script in +utils/test-pkg+ that uses the same base
+configurations as used by the autobuilders so you can test your package
+in the same conditions.
+
+First, create a config snippet that contains all the necessary options
+needed to enable your package, but without any architecture or toolchain
+option. For example, let's create a config snippet that just enables
++libcurl+, without any TLS backend:
+
+----
+$ cat libcurl.config
+BR2_PACKAGE_LIBCURL=y
+----
+
+If your package needs more configuration options, you can add them to the
+config snippet. For example, here's how you would test +libcurl+ with
++openssl+ as a TLS backend and the +curl+ program:
+
+----
+$ cat libcurl.config
+BR2_PACKAGE_LIBCURL=y
+BR2_PACKAGE_CURL=y
+BR2_PACKAGE_OPENSSL=y
+----
+
+Then run the +test-pkg+ script, by telling it what config snippet to use
+and what package to test:
+
+----
+$ ./utils/test-pkg -c libcurl.config -p libcurl
+----
+
+This will try to build your package against all the toolchains used
+by the autobuilders (except for the internal toolchains, because it takes
+too long to do so). The output lists all toolchains and the corresponding
+result (excerpt, results are fake):
+
+----
+$ ./utils/test-pkg -c libcurl.config -p libcurl
+                armv5-ctng-linux-gnueabi [ 1/11]: OK
+              armv7-ctng-linux-gnueabihf [ 2/11]: OK
+                        br-aarch64-glibc [ 3/11]: SKIPPED
+                           br-arcle-hs38 [ 4/11]: SKIPPED
+                            br-arm-basic [ 5/11]: FAILED
+                  br-arm-cortex-a9-glibc [ 6/11]: OK
+                   br-arm-cortex-a9-musl [ 7/11]: FAILED
+                   br-arm-cortex-m4-full [ 8/11]: OK
+                             br-arm-full [ 9/11]: OK
+                    br-arm-full-nothread [10/11]: FAILED
+                      br-arm-full-static [11/11]: OK
+11 builds, 2 skipped, 2 build failed, 1 legal-info failed
+----
+
+The results mean:
+
+* `OK`: the build was successful.
+* `SKIPPED`: one or more configuration options listed in the config
+  snippet were not present in the final configuration. This is due to
+  options having dependencies not satisfied by the toolchain, such as
+  for example a package that +depends on BR2_USE_MMU+ with a noMMU
+  toolchain. The missing options are reported in +missing.config+ in
+  the output build directory (+~/br-test-pkg/TOOLCHAIN_NAME/+ by
+  default).
+* `FAILED`: the build failed. Inspect the +logfile+ file in the output
+  build  directory to see what went wrong:
+** the actual build failed,
+** the legal-info failed,
+** one of the preliminary steps (downloading the config file, applying
+   the configuration, running `dirclean` for the package) failed.
+
+When there are failures, you can just re-run the script with the same
+options (after you fixed your package); the script will attempt to
+re-build the package specified with +-p+ for all toolchains, without
+the need to re-build all the dependencies of that package.
+
+The +test-pkg+ script accepts a few options, for which you can get some
+help by running:
+
+----
+$ ./utils/test-pkg -h
+----
 
 [[github-download-url]]
 ==== How to add a package from GitHub
diff --git a/bsp/buildroot/docs/manual/adding-packages.txt b/bsp/buildroot/docs/manual/adding-packages.txt
index 4595991f..e8d40dae 100644
--- a/bsp/buildroot/docs/manual/adding-packages.txt
+++ b/bsp/buildroot/docs/manual/adding-packages.txt
@@ -9,6 +9,9 @@ applications) can be integrated into Buildroot. It also shows how
 existing packages are integrated, which is needed for fixing issues or
 tuning their configuration.
 
+When you add a new package, be sure to test it in various conditions;
+see xref:testing-package[]
+
 include::adding-packages-directory.txt[]
 
 include::adding-packages-generic.txt[]
@@ -31,6 +34,10 @@ include::adding-packages-rebar.txt[]
 
 include::adding-packages-waf.txt[]
 
+include::adding-packages-meson.txt[]
+
+include::adding-packages-cargo.txt[]
+
 include::adding-packages-kernel-module.txt[]
 
 include::adding-packages-asciidoc.txt[]
diff --git a/bsp/buildroot/docs/manual/appendix.txt b/bsp/buildroot/docs/manual/appendix.txt
index 4d4bbecc..86afa4bd 100644
--- a/bsp/buildroot/docs/manual/appendix.txt
+++ b/bsp/buildroot/docs/manual/appendix.txt
@@ -3,4 +3,4 @@
 
 include::makedev-syntax.txt[]
 include::makeusers-syntax.txt[]
-include::br2-external-converting.txt[]
+include::migrating.txt[]
diff --git a/bsp/buildroot/docs/manual/br2-external-converting.txt b/bsp/buildroot/docs/manual/br2-external-converting.txt
deleted file mode 100644
index 831addf5..00000000
--- a/bsp/buildroot/docs/manual/br2-external-converting.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- mode:doc; -*-
-// vim: set syntax=asciidoc:
-
-[[br2-external-converting]]
-== Converting old br2-external trees
-
-Before Buildroot 2016.11, it was possible to use only one br2-external
-tree at once. With Buildroot 2016.11 came the possibility to use more
-than one simultaneously (for details, see xref:outside-br-custom[]).
-
-This however means that older br2-external trees are not usable as-is.
-A minor change has to be made: adding a name to your br2-external tree.
-
-This can be done very easily in just a few steps:
-
- * First, create a new file named +external.desc+, at the root of your
-   br2-external tree, with a single line defining the name of your
-   br2-external tree:
-+
-----
-$ echo 'name: NAME_OF_YOUR_TREE' >external.desc
-----
-+
-.Note
-Be careful when choosing a name: It has to be unique and be made
-with only ASCII characters from the set +[A-Za-z0-9_]+.
-
- * Then, change every occurence of +BR2_EXTERNAL+ in your br2-external
-   tree with the new variable:
-+
-----
-$ find . -type f | xargs sed -i 's/BR2_EXTERNAL/BR2_EXTERNAL_NAME_OF_YOUR_TREE_PATH/g'
-----
-
-Now, your br2-external tree can be used with Buildroot 2016.11 onward.
-
-.Note:
-This change makes your br2-external tree incompatible with Buildroot
-before 2016.11.
diff --git a/bsp/buildroot/docs/manual/common-usage.txt b/bsp/buildroot/docs/manual/common-usage.txt
index 8dd99a6d..a22da201 100644
--- a/bsp/buildroot/docs/manual/common-usage.txt
+++ b/bsp/buildroot/docs/manual/common-usage.txt
@@ -326,7 +326,7 @@ Buildroot release, use the +size-stats-compare+ script. It takes two
 Refer to the help text of this script for more details:
 
 ----------------
-support/scripts/size-stats-compare -h
+utils/size-stats-compare -h
 ----------------
 
 include::eclipse-integration.txt[]
diff --git a/bsp/buildroot/docs/manual/configure.txt b/bsp/buildroot/docs/manual/configure.txt
index 0739bc7c..008813c9 100644
--- a/bsp/buildroot/docs/manual/configure.txt
+++ b/bsp/buildroot/docs/manual/configure.txt
@@ -146,19 +146,17 @@ cross-compilation toolchains. Buildroot knows about a number of
 well-known cross-compilation toolchains (from
 http://www.linaro.org[Linaro] for ARM,
 http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/[Sourcery
-CodeBench] for ARM, x86, x86-64, PowerPC, MIPS and SuperH,
-https://blackfin.uclinux.org/gf/project/toolchain[Blackfin toolchains
-from Analog Devices], etc.) and is capable of downloading them
-automatically, or it can be pointed to a custom toolchain, either
-available for download or installed locally.
+CodeBench] for ARM, x86-64, PowerPC, and MIPS, and is capable of
+downloading them automatically, or it can be pointed to a custom
+toolchain, either available for download or installed locally.
 
 Then, you have three solutions to use an external toolchain:
 
 * Use a predefined external toolchain profile, and let Buildroot
   download, extract and install the toolchain. Buildroot already knows
-  about a few CodeSourcery, Linaro, Blackfin and Xilinx toolchains.
-  Just select the toolchain profile in +Toolchain+ from the
-  available ones. This is definitely the easiest solution.
+  about a few CodeSourcery and Linaro toolchains. Just select the
+  toolchain profile in +Toolchain+ from the available ones. This is
+  definitely the easiest solution.
 
 * Use a predefined external toolchain profile, but instead of having
   Buildroot download and extract the toolchain, you can tell Buildroot
@@ -221,8 +219,6 @@ Advantages of this backend:
   often very significant in the overall build time of an embedded
   Linux system.
 
-* Not limited to uClibc: glibc and eglibc toolchains are supported.
-
 Drawbacks of this backend:
 
 * If your pre-built external toolchain has a bug, may be hard to get a
diff --git a/bsp/buildroot/docs/manual/contribute.txt b/bsp/buildroot/docs/manual/contribute.txt
index c2c8a901..8bbc2b9e 100644
--- a/bsp/buildroot/docs/manual/contribute.txt
+++ b/bsp/buildroot/docs/manual/contribute.txt
@@ -227,7 +227,7 @@ Finally, the patch should be signed off. This is done by adding
 +Signed-off-by: Your Real Name <your@email.address>+ at the end of the
 commit message. +git commit -s+ does that for you, if configured
 properly. The +Signed-off-by+ tag means that you publish the patch
-under the Buildroot license (i.e. GPLv2, except for package patches,
+under the Buildroot license (i.e. GPL-2.0+, except for package patches,
 which have the upstream license), and that you are allowed to do so.
 See http://developercertificate.org/[the Developer Certificate of
 Origin] for details.
@@ -260,9 +260,9 @@ options that no longer exist or are no longer needed.
 
 If you are interested in getting notified of build failures and of
 further changes in the packages you added or modified, please add
-yourself to the DEVELOPERS file. This should be done in a separate
-patch of the series. See xref:DEVELOPERS[the DEVELOPERS file] for more
-information.
+yourself to the DEVELOPERS file. This should be done in the same patch
+creating or modifying the package. See xref:DEVELOPERS[the DEVELOPERS file]
+for more information.
 
 ==== Preparing a patch series
 
@@ -295,7 +295,7 @@ information). This tool reads your patches and outputs the appropriate
 +git send-email+ command to use:
 
 ---------------------
-$ ./support/scripts/get-developers outgoing/*
+$ ./utils/get-developers outgoing/*
 ---------------------
 
 Use the output of +get-developers+ to send your patches:
diff --git a/bsp/buildroot/docs/manual/developers.txt b/bsp/buildroot/docs/manual/developers.txt
index 3c31aa96..a0a3668d 100644
--- a/bsp/buildroot/docs/manual/developers.txt
+++ b/bsp/buildroot/docs/manual/developers.txt
@@ -26,7 +26,7 @@ to include in his patch the appropriate modification to the
 The +DEVELOPERS+ file format is documented in detail inside the file
 itself.
 
-The +get-developer+ tool, located in +support/scripts+ allows to use
+The +get-developer+ tool, located in +utils/+ allows to use
 the +DEVELOPERS+ file for various tasks:
 
 - When passing one or several patches as command line argument,
@@ -44,3 +44,5 @@ the +DEVELOPERS+ file for various tasks:
   list the ones that are not handled by any developer. The purpose of
   this option is to help completing the +DEVELOPERS+ file.
 
+- When using without any arguments, it validates the integrity of the
+  DEVELOPERS file and will note WARNINGS for items that don't match.
diff --git a/bsp/buildroot/docs/manual/faq-troubleshooting.txt b/bsp/buildroot/docs/manual/faq-troubleshooting.txt
index 825899b0..b144c9e7 100644
--- a/bsp/buildroot/docs/manual/faq-troubleshooting.txt
+++ b/bsp/buildroot/docs/manual/faq-troubleshooting.txt
@@ -127,7 +127,7 @@ installed what and remove it when the package is unselected. However, it
 is much more complicated than that:
 
  * It is not only about the +target/+ directory, but also the sysroot in
-   +host/usr/<tuple>/sysroot+ and the +host/+ directory itself. All files
+   +host/<tuple>/sysroot+ and the +host/+ directory itself. All files
    installed in those directories by various packages must be tracked.
 
  * When a package is unselected from the configuration, it is not
diff --git a/bsp/buildroot/docs/manual/known-issues.txt b/bsp/buildroot/docs/manual/known-issues.txt
index acfe4ff4..ae29a48b 100644
--- a/bsp/buildroot/docs/manual/known-issues.txt
+++ b/bsp/buildroot/docs/manual/known-issues.txt
@@ -7,26 +7,6 @@
   if such options contain a +$+ sign. For example, the following is known
   to break: +BR2_TARGET_LDFLAGS="-Wl,-rpath=\'$ORIGIN/../lib'"+
 
-* The +ltp-testsuite+ package does not build with the default uClibc
-  configuration used by the Buildroot toolchain backend. The LTP
-  testsuite uses several functions that are considered obsolete, such
-  as sigset() and others. uClibc configuration options such as
-  DO_XSI_MATH, UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and
-  UCLIBC_SV4_DEPRECATED are needed if one wants to build the
-  +ltp-testsuite+ package with uClibc. You need to either use a glibc
-  based toolchain, or enable the appropriate options in the uClibc
-  configuration.
-
-* The +xfsprogs+ package does not build with the default uClibc
-  configuration used by the Buildroot toolchain backend. You need to
-  either use a glibc based toolchain, or enable the appropriate
-  options in the uClibc configuration.
-
-* The +mrouted+ package does not build with the default uClibc
-  configuration used by the Buildroot toolchain backend. You need to
-  either use a glibc based toolchain, or enable the appropriate
-  options in the uClibc configuration.
-
 * The +libffi+ package is not supported on the SuperH 2 and ARC
   architectures.
 
diff --git a/bsp/buildroot/docs/manual/legal-notice.txt b/bsp/buildroot/docs/manual/legal-notice.txt
index c9b5211f..69753282 100644
--- a/bsp/buildroot/docs/manual/legal-notice.txt
+++ b/bsp/buildroot/docs/manual/legal-notice.txt
@@ -83,72 +83,6 @@ of +make legal-info+ before using it as your own compliance delivery. See
 the _NO WARRANTY_ clauses (clauses 11 and 12) in the +COPYING+ file at the
 root of the Buildroot distribution.
 
-[[legal-info-list-licenses]]
-=== License abbreviations
-
-Here is a list of the licenses that are most widely used by packages in
-Buildroot, with the name used in the manifest files:
-
-* `AGPLv3`:
-  http://www.gnu.org/licenses/agpl-3.0.en.html[
-  GNU Affero General Public License, version 3];
-* `GPLv2`:
-  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
-  GNU General Public License, version 2];
-* `GPLv2+`:
-  http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
-  GNU General Public License, version 2]
-  or (at your option) any later version;
-* `GPLv3`:
-  http://www.gnu.org/licenses/gpl.html[
-  GNU General Public License, version 3];
-* `GPLv3+`:
-  http://www.gnu.org/licenses/gpl.html[
-  GNU General Public License, version 3]
-  or (at your option) any later version;
-* `GPL`:
-  http://www.gnu.org/licenses/gpl.html[
-  GNU General Public License] (any version);
-* `LGPLv2`:
-  http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
-  GNU Library General Public License, version 2];
-* `LGPLv2+`:
-  http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html[
-  GNU Library General Public License, version 2]
-  or (at your option) any later version;
-* `LGPLv2.1`:
-  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
-  GNU Lesser General Public License, version 2.1];
-* `LGPLv2.1+`:
-  http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html[
-  GNU Lesser General Public License, version 2.1]
-  or (at your option) any later version;
-* `LGPLv3`:
-  http://www.gnu.org/licenses/lgpl.html[
-  GNU Lesser General Public License, version 3];
-* `LGPLv3+`:
-  http://www.gnu.org/licenses/lgpl.html[
-  GNU Lesser General Public License, version 3]
-  or (at your option) any later version;
-* `LGPL`:
-  http://www.gnu.org/licenses/lgpl.html[
-  GNU Lesser General Public License] (any version);
-* `BSD-4c`:
-  http://directory.fsf.org/wiki/License:BSD_4Clause[
-  Original BSD 4-clause license];
-* `BSD-3c`:
-  http://opensource.org/licenses/BSD-3-Clause[
-  BSD 3-clause license];
-* `BSD-2c`:
-  http://opensource.org/licenses/BSD-2-Clause[
-  BSD 2-clause license];
-* `MIT`:
-  http://opensource.org/licenses/mit-license.html[
-  MIT-style license];
-* `Apache-2.0`:
-  http://apache.org/licenses/LICENSE-2.0.html[
-  Apache License, version 2.0];
-
 [[legal-info-buildroot]]
 === Complying with the Buildroot license
 
diff --git a/bsp/buildroot/docs/manual/make-tips.txt b/bsp/buildroot/docs/manual/make-tips.txt
index 97a33024..ea1d825b 100644
--- a/bsp/buildroot/docs/manual/make-tips.txt
+++ b/bsp/buildroot/docs/manual/make-tips.txt
@@ -77,3 +77,57 @@ To delete all build products as well as the configuration:
 If +ccache+ is enabled, running +make clean+ or +distclean+ does
 not empty the compiler cache used by Buildroot. To delete it, refer
 to xref:ccache[].
+
+.Dumping the internal make variables:
+
+One can dump all the variables known to make, along with their values:
+
+----
+ $ make -s printvars
+ VARIABLE=value_of_variable
+ ...
+----
+
+It is possible to tweak the output using some variables:
+
+- +VARS+ will limit the listing to variables which names match the
+  specified make-pattern
+- +QUOTED_VARS+, if set to +YES+, will single-quote the value
+- +RAW_VARS+, if set to +YES+, will print the unexpanded value
+
+For example:
+
+----
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES
+ BUSYBOX_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_ALL_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=
+ BUSYBOX_RDEPENDENCIES=ncurses util-linux
+----
+
+----
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES QUOTED_VARS=YES
+ BUSYBOX_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_ALL_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=''
+ BUSYBOX_RDEPENDENCIES='ncurses util-linux'
+----
+
+----
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES RAW_VARS=YES
+ BUSYBOX_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_ALL_DEPENDENCIES=$(sort $(BUSYBOX_FINAL_DEPENDENCIES) $(BUSYBOX_FINAL_PATCH_DEPENDENCIES))
+ BUSYBOX_FINAL_DEPENDENCIES=$(sort $(BUSYBOX_DEPENDENCIES))
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=$(sort $(BUSYBOX_PATCH_DEPENDENCIES))
+ BUSYBOX_RDEPENDENCIES=ncurses util-linux
+----
+
+The output of quoted variables can be reused in shell scripts, for example:
+
+----
+ $ eval $(make -s printvars VARS=BUSYBOX_DEPENDENCIES QUOTED_VARS=YES)
+ $ echo $BUSYBOX_DEPENDENCIES
+ skeleton toolchain
+----
diff --git a/bsp/buildroot/docs/manual/manual.html b/bsp/buildroot/docs/manual/manual.html
index 3ce6fd96..5bfb0f96 100644
--- a/bsp/buildroot/docs/manual/manual.html
+++ b/bsp/buildroot/docs/manual/manual.html
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Buildroot user manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /></head><body><div xml:lang="en" class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="idm45919741564832"></a>The Buildroot user manual</h1></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="preface"><a href="#idm45919741563680"></a></span></dt><dt><span class="part"><a href="#_getting_started">I. Getting started</a></span></dt><dd><dl><dt><span class="chapter"><a href="#_about_buildroot">1. About Buildroot</a></span></dt><dt><span class="chapter"><a href="#requirement">2. System requirements</a></span></dt><dd><dl><dt><span class="section"><a href="#requirement-mandatory">2.1. Mandatory packages</a></span></dt><dt><span class="section"><a href="#requirement-optional">2.2. Optional packages</a></span></dt></dl></dd><dt><span class="chapter"><a href="#getting-buildroot">3. Getting Buildroot</a></span></dt><dt><span class="chapter"><a href="#_buildroot_quick_start">4. Buildroot quick start</a></span></dt><dt><span class="chapter"><a href="#community-resources">5. Community resources</a></span></dt></dl></dd><dt><span class="part"><a href="#_user_guide">II. User guide</a></span></dt><dd><dl><dt><span class="chapter"><a href="#configure">6. Buildroot configuration</a></span></dt><dd><dl><dt><span class="section"><a href="#_cross_compilation_toolchain">6.1. Cross-compilation toolchain</a></span></dt><dt><span class="section"><a href="#_dev_management">6.2. /dev management</a></span></dt><dt><span class="section"><a href="#_init_system">6.3. init system</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_configuration_of_other_components">7. Configuration of other components</a></span></dt><dt><span class="chapter"><a href="#_general_buildroot_usage">8. General Buildroot usage</a></span></dt><dd><dl><dt><span class="section"><a href="#make-tips">8.1. <span class="emphasis"><em>make</em></span> tips</a></span></dt><dt><span class="section"><a href="#full-rebuild">8.2. Understanding when a full rebuild is necessary</a></span></dt><dt><span class="section"><a href="#rebuild-pkg">8.3. Understanding how to rebuild packages</a></span></dt><dt><span class="section"><a href="#_offline_builds">8.4. Offline builds</a></span></dt><dt><span class="section"><a href="#_building_out_of_tree">8.5. Building out-of-tree</a></span></dt><dt><span class="section"><a href="#env-vars">8.6. Environment variables</a></span></dt><dt><span class="section"><a href="#_dealing_efficiently_with_filesystem_images">8.7. Dealing efficiently with filesystem images</a></span></dt><dt><span class="section"><a href="#_graphing_the_dependencies_between_packages">8.8. Graphing the dependencies between packages</a></span></dt><dt><span class="section"><a href="#_graphing_the_build_duration">8.9. Graphing the build duration</a></span></dt><dt><span class="section"><a href="#_graphing_the_filesystem_size_contribution_of_packages">8.10. Graphing the filesystem size contribution of packages</a></span></dt><dt><span class="section"><a href="#_integration_with_eclipse">8.11. Integration with Eclipse</a></span></dt><dt><span class="section"><a href="#_advanced_usage">8.12. Advanced usage</a></span></dt></dl></dd><dt><span class="chapter"><a href="#customize">9. Project-specific customization</a></span></dt><dd><dl><dt><span class="section"><a href="#customize-dir-structure">9.1. Recommended directory structure</a></span></dt><dt><span class="section"><a href="#outside-br-custom">9.2. Keeping customizations outside of Buildroot</a></span></dt><dt><span class="section"><a href="#customize-store-buildroot-config">9.3. Storing the Buildroot configuration</a></span></dt><dt><span class="section"><a href="#customize-store-package-config">9.4. Storing the configuration of other components</a></span></dt><dt><span class="section"><a href="#rootfs-custom">9.5. Customizing the generated target filesystem</a></span></dt><dt><span class="section"><a href="#customize-users">9.6. Adding custom user accounts</a></span></dt><dt><span class="section"><a href="#_customization_emphasis_after_emphasis_the_images_have_been_created">9.7. Customization <span class="emphasis"><em>after</em></span> the images have been created</a></span></dt><dt><span class="section"><a href="#customize-patches">9.8. Adding project-specific patches</a></span></dt><dt><span class="section"><a href="#customize-packages">9.9. Adding project-specific packages</a></span></dt><dt><span class="section"><a href="#_quick_guide_to_storing_your_project_specific_customizations">9.10. Quick guide to storing your project-specific customizations</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_frequently_asked_questions_amp_troubleshooting">10. Frequently Asked Questions &amp; Troubleshooting</a></span></dt><dd><dl><dt><span class="section"><a href="#faq-boot-hang-after-starting">10.1. The boot hangs after <span class="emphasis"><em>Starting network…</em></span></a></span></dt><dt><span class="section"><a href="#faq-no-compiler-on-target">10.2. Why is there no compiler on the target?</a></span></dt><dt><span class="section"><a href="#faq-no-dev-files-on-target">10.3. Why are there no development files on the target?</a></span></dt><dt><span class="section"><a href="#faq-no-doc-on-target">10.4. Why is there no documentation on the target?</a></span></dt><dt><span class="section"><a href="#faq-why-not-visible-package">10.5. Why are some packages not visible in the Buildroot config menu?</a></span></dt><dt><span class="section"><a href="#faq-why-not-use-target-as-chroot">10.6. Why not use the target directory as a chroot directory?</a></span></dt><dt><span class="section"><a href="#faq-no-binary-packages">10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?</a></span></dt><dt><span class="section"><a href="#faq-speeding-up-build">10.8. How to speed-up the build process?</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_known_issues">11. Known issues</a></span></dt><dt><span class="chapter"><a href="#legal-info">12. Legal notice and licensing</a></span></dt><dd><dl><dt><span class="section"><a href="#_complying_with_open_source_licenses">12.1. Complying with open source licenses</a></span></dt><dt><span class="section"><a href="#legal-info-list-licenses">12.2. License abbreviations</a></span></dt><dt><span class="section"><a href="#legal-info-buildroot">12.3. Complying with the Buildroot license</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_beyond_buildroot">13. Beyond Buildroot</a></span></dt><dd><dl><dt><span class="section"><a href="#_boot_the_generated_images">13.1. Boot the generated images</a></span></dt><dt><span class="section"><a href="#_chroot">13.2. Chroot</a></span></dt></dl></dd></dl></dd><dt><span class="part"><a href="#_developer_guide">III. Developer guide</a></span></dt><dd><dl><dt><span class="chapter"><a href="#_how_buildroot_works">14. How Buildroot works</a></span></dt><dt><span class="chapter"><a href="#_coding_style">15. Coding style</a></span></dt><dd><dl><dt><span class="section"><a href="#writing-rules-config-in">15.1. <code class="literal">Config.in</code> file</a></span></dt><dt><span class="section"><a href="#writing-rules-mk">15.2. The <code class="literal">.mk</code> file</a></span></dt><dt><span class="section"><a href="#_the_documentation">15.3. The documentation</a></span></dt></dl></dd><dt><span class="chapter"><a href="#adding-board-support">16. Adding support for a particular board</a></span></dt><dt><span class="chapter"><a href="#adding-packages">17. Adding new packages to Buildroot</a></span></dt><dd><dl><dt><span class="section"><a href="#_package_directory">17.1. Package directory</a></span></dt><dt><span class="section"><a href="#_config_files">17.2. Config files</a></span></dt><dt><span class="section"><a href="#_the_literal_mk_literal_file">17.3. The <code class="literal">.mk</code> file</a></span></dt><dt><span class="section"><a href="#adding-packages-hash">17.4. The <code class="literal">.hash</code> file</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_packages_with_specific_build_systems">17.5. Infrastructure for packages with specific build systems</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_autotools_based_packages">17.6. Infrastructure for autotools-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_cmake_based_packages">17.7. Infrastructure for CMake-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_python_packages">17.8. Infrastructure for Python packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_luarocks_based_packages">17.9. Infrastructure for LuaRocks-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_perl_cpan_packages">17.10. Infrastructure for Perl/CPAN packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_virtual_packages">17.11. Infrastructure for virtual packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_packages_using_kconfig_for_configuration_files">17.12. Infrastructure for packages using kconfig for configuration files</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_rebar_based_packages">17.13. Infrastructure for rebar-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_waf_based_packages">17.14. Infrastructure for Waf-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_packages_building_kernel_modules">17.15. Infrastructure for packages building kernel modules</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_asciidoc_documents">17.16. Infrastructure for asciidoc documents</a></span></dt><dt><span class="section"><a href="#linux-kernel-specific-infra">17.17. Infrastructure specific to the Linux kernel package</a></span></dt><dt><span class="section"><a href="#hooks">17.18. Hooks available in the various build steps</a></span></dt><dt><span class="section"><a href="#_gettext_integration_and_interaction_with_packages">17.19. Gettext integration and interaction with packages</a></span></dt><dt><span class="section"><a href="#_tips_and_tricks">17.20. Tips and tricks</a></span></dt><dt><span class="section"><a href="#_conclusion">17.21. Conclusion</a></span></dt></dl></dd><dt><span class="chapter"><a href="#patch-policy">18. Patching a package</a></span></dt><dd><dl><dt><span class="section"><a href="#_providing_patches">18.1. Providing patches</a></span></dt><dt><span class="section"><a href="#patch-apply-order">18.2. How patches are applied</a></span></dt><dt><span class="section"><a href="#_format_and_licensing_of_the_package_patches">18.3. Format and licensing of the package patches</a></span></dt><dt><span class="section"><a href="#_integrating_patches_found_on_the_web">18.4. Integrating patches found on the Web</a></span></dt></dl></dd><dt><span class="chapter"><a href="#download-infra">19. Download infrastructure</a></span></dt><dt><span class="chapter"><a href="#debugging-buildroot">20. Debugging Buildroot</a></span></dt><dt><span class="chapter"><a href="#_contributing_to_buildroot">21. Contributing to Buildroot</a></span></dt><dd><dl><dt><span class="section"><a href="#_reproducing_analyzing_and_fixing_bugs">21.1. Reproducing, analyzing and fixing bugs</a></span></dt><dt><span class="section"><a href="#_analyzing_and_fixing_autobuild_failures">21.2. Analyzing and fixing autobuild failures</a></span></dt><dt><span class="section"><a href="#_reviewing_and_testing_patches">21.3. Reviewing and testing patches</a></span></dt><dt><span class="section"><a href="#_work_on_items_from_the_todo_list">21.4. Work on items from the TODO list</a></span></dt><dt><span class="section"><a href="#submitting-patches">21.5. Submitting patches</a></span></dt><dt><span class="section"><a href="#reporting-bugs">21.6. Reporting issues/bugs or getting help</a></span></dt></dl></dd><dt><span class="chapter"><a href="#DEVELOPERS">22. DEVELOPERS file and get-developers</a></span></dt></dl></dd><dt><span class="part"><a href="#_appendix">IV. Appendix</a></span></dt><dd><dl><dt><span class="chapter"><a href="#makedev-syntax">23. Makedev syntax documentation</a></span></dt><dt><span class="chapter"><a href="#makeuser-syntax">24. Makeusers syntax documentation</a></span></dt><dt><span class="chapter"><a href="#br2-external-converting">25. Converting old br2-external trees</a></span></dt></dl></dd></dl></div><div class="list-of-examples"><p><strong>List of Examples</strong></p><dl><dt>17.1. <a href="#idm45919734426448">Config script: <span class="emphasis"><em>divine</em></span> package</a></dt><dt>17.2. <a href="#idm45919734423520">Config script: <span class="emphasis"><em>imagemagick</em></span> package:</a></dt></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a id="idm45919741563680"></a></h1></div></div></div><p>Buildroot 2017.02.11 manual generated on 2018-04-12
-15:01:48 UTC from git revision 8a0e4e865a</p><p>The Buildroot manual is written by the Buildroot developers.
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>The Buildroot user manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /></head><body><div xml:lang="en" class="book" lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="idm45849092039072"></a>The Buildroot user manual</h1></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="preface"><a href="#idm45849092037824"></a></span></dt><dt><span class="part"><a href="#_getting_started">I. Getting started</a></span></dt><dd><dl><dt><span class="chapter"><a href="#_about_buildroot">1. About Buildroot</a></span></dt><dt><span class="chapter"><a href="#requirement">2. System requirements</a></span></dt><dd><dl><dt><span class="section"><a href="#requirement-mandatory">2.1. Mandatory packages</a></span></dt><dt><span class="section"><a href="#requirement-optional">2.2. Optional packages</a></span></dt></dl></dd><dt><span class="chapter"><a href="#getting-buildroot">3. Getting Buildroot</a></span></dt><dt><span class="chapter"><a href="#_buildroot_quick_start">4. Buildroot quick start</a></span></dt><dt><span class="chapter"><a href="#community-resources">5. Community resources</a></span></dt></dl></dd><dt><span class="part"><a href="#_user_guide">II. User guide</a></span></dt><dd><dl><dt><span class="chapter"><a href="#configure">6. Buildroot configuration</a></span></dt><dd><dl><dt><span class="section"><a href="#_cross_compilation_toolchain">6.1. Cross-compilation toolchain</a></span></dt><dt><span class="section"><a href="#_dev_management">6.2. /dev management</a></span></dt><dt><span class="section"><a href="#_init_system">6.3. init system</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_configuration_of_other_components">7. Configuration of other components</a></span></dt><dt><span class="chapter"><a href="#_general_buildroot_usage">8. General Buildroot usage</a></span></dt><dd><dl><dt><span class="section"><a href="#make-tips">8.1. <span class="emphasis"><em>make</em></span> tips</a></span></dt><dt><span class="section"><a href="#full-rebuild">8.2. Understanding when a full rebuild is necessary</a></span></dt><dt><span class="section"><a href="#rebuild-pkg">8.3. Understanding how to rebuild packages</a></span></dt><dt><span class="section"><a href="#_offline_builds">8.4. Offline builds</a></span></dt><dt><span class="section"><a href="#_building_out_of_tree">8.5. Building out-of-tree</a></span></dt><dt><span class="section"><a href="#env-vars">8.6. Environment variables</a></span></dt><dt><span class="section"><a href="#_dealing_efficiently_with_filesystem_images">8.7. Dealing efficiently with filesystem images</a></span></dt><dt><span class="section"><a href="#_graphing_the_dependencies_between_packages">8.8. Graphing the dependencies between packages</a></span></dt><dt><span class="section"><a href="#_graphing_the_build_duration">8.9. Graphing the build duration</a></span></dt><dt><span class="section"><a href="#_graphing_the_filesystem_size_contribution_of_packages">8.10. Graphing the filesystem size contribution of packages</a></span></dt><dt><span class="section"><a href="#_integration_with_eclipse">8.11. Integration with Eclipse</a></span></dt><dt><span class="section"><a href="#_advanced_usage">8.12. Advanced usage</a></span></dt></dl></dd><dt><span class="chapter"><a href="#customize">9. Project-specific customization</a></span></dt><dd><dl><dt><span class="section"><a href="#customize-dir-structure">9.1. Recommended directory structure</a></span></dt><dt><span class="section"><a href="#outside-br-custom">9.2. Keeping customizations outside of Buildroot</a></span></dt><dt><span class="section"><a href="#customize-store-buildroot-config">9.3. Storing the Buildroot configuration</a></span></dt><dt><span class="section"><a href="#customize-store-package-config">9.4. Storing the configuration of other components</a></span></dt><dt><span class="section"><a href="#rootfs-custom">9.5. Customizing the generated target filesystem</a></span></dt><dt><span class="section"><a href="#customize-users">9.6. Adding custom user accounts</a></span></dt><dt><span class="section"><a href="#_customization_emphasis_after_emphasis_the_images_have_been_created">9.7. Customization <span class="emphasis"><em>after</em></span> the images have been created</a></span></dt><dt><span class="section"><a href="#customize-patches">9.8. Adding project-specific patches</a></span></dt><dt><span class="section"><a href="#customize-packages">9.9. Adding project-specific packages</a></span></dt><dt><span class="section"><a href="#_quick_guide_to_storing_your_project_specific_customizations">9.10. Quick guide to storing your project-specific customizations</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_frequently_asked_questions_amp_troubleshooting">10. Frequently Asked Questions &amp; Troubleshooting</a></span></dt><dd><dl><dt><span class="section"><a href="#faq-boot-hang-after-starting">10.1. The boot hangs after <span class="emphasis"><em>Starting network…</em></span></a></span></dt><dt><span class="section"><a href="#faq-no-compiler-on-target">10.2. Why is there no compiler on the target?</a></span></dt><dt><span class="section"><a href="#faq-no-dev-files-on-target">10.3. Why are there no development files on the target?</a></span></dt><dt><span class="section"><a href="#faq-no-doc-on-target">10.4. Why is there no documentation on the target?</a></span></dt><dt><span class="section"><a href="#faq-why-not-visible-package">10.5. Why are some packages not visible in the Buildroot config menu?</a></span></dt><dt><span class="section"><a href="#faq-why-not-use-target-as-chroot">10.6. Why not use the target directory as a chroot directory?</a></span></dt><dt><span class="section"><a href="#faq-no-binary-packages">10.7. Why doesn’t Buildroot generate binary packages (.deb, .ipkg…)?</a></span></dt><dt><span class="section"><a href="#faq-speeding-up-build">10.8. How to speed-up the build process?</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_known_issues">11. Known issues</a></span></dt><dt><span class="chapter"><a href="#legal-info">12. Legal notice and licensing</a></span></dt><dd><dl><dt><span class="section"><a href="#_complying_with_open_source_licenses">12.1. Complying with open source licenses</a></span></dt><dt><span class="section"><a href="#legal-info-buildroot">12.2. Complying with the Buildroot license</a></span></dt></dl></dd><dt><span class="chapter"><a href="#_beyond_buildroot">13. Beyond Buildroot</a></span></dt><dd><dl><dt><span class="section"><a href="#_boot_the_generated_images">13.1. Boot the generated images</a></span></dt><dt><span class="section"><a href="#_chroot">13.2. Chroot</a></span></dt></dl></dd></dl></dd><dt><span class="part"><a href="#_developer_guide">III. Developer guide</a></span></dt><dd><dl><dt><span class="chapter"><a href="#_how_buildroot_works">14. How Buildroot works</a></span></dt><dt><span class="chapter"><a href="#_coding_style">15. Coding style</a></span></dt><dd><dl><dt><span class="section"><a href="#writing-rules-config-in">15.1. <code class="literal">Config.in</code> file</a></span></dt><dt><span class="section"><a href="#writing-rules-mk">15.2. The <code class="literal">.mk</code> file</a></span></dt><dt><span class="section"><a href="#_the_documentation">15.3. The documentation</a></span></dt><dt><span class="section"><a href="#_support_scripts">15.4. Support scripts</a></span></dt></dl></dd><dt><span class="chapter"><a href="#adding-board-support">16. Adding support for a particular board</a></span></dt><dt><span class="chapter"><a href="#adding-packages">17. Adding new packages to Buildroot</a></span></dt><dd><dl><dt><span class="section"><a href="#_package_directory">17.1. Package directory</a></span></dt><dt><span class="section"><a href="#_config_files">17.2. Config files</a></span></dt><dt><span class="section"><a href="#_the_literal_mk_literal_file">17.3. The <code class="literal">.mk</code> file</a></span></dt><dt><span class="section"><a href="#adding-packages-hash">17.4. The <code class="literal">.hash</code> file</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_packages_with_specific_build_systems">17.5. Infrastructure for packages with specific build systems</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_autotools_based_packages">17.6. Infrastructure for autotools-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_cmake_based_packages">17.7. Infrastructure for CMake-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_python_packages">17.8. Infrastructure for Python packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_luarocks_based_packages">17.9. Infrastructure for LuaRocks-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_perl_cpan_packages">17.10. Infrastructure for Perl/CPAN packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_virtual_packages">17.11. Infrastructure for virtual packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_packages_using_kconfig_for_configuration_files">17.12. Infrastructure for packages using kconfig for configuration files</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_rebar_based_packages">17.13. Infrastructure for rebar-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_waf_based_packages">17.14. Infrastructure for Waf-based packages</a></span></dt><dt><span class="section"><a href="#_integration_of_meson_based_packages">17.15. Integration of Meson-based packages</a></span></dt><dt><span class="section"><a href="#_integration_of_cargo_based_packages">17.16. Integration of Cargo-based packages</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_packages_building_kernel_modules">17.17. Infrastructure for packages building kernel modules</a></span></dt><dt><span class="section"><a href="#_infrastructure_for_asciidoc_documents">17.18. Infrastructure for asciidoc documents</a></span></dt><dt><span class="section"><a href="#linux-kernel-specific-infra">17.19. Infrastructure specific to the Linux kernel package</a></span></dt><dt><span class="section"><a href="#hooks">17.20. Hooks available in the various build steps</a></span></dt><dt><span class="section"><a href="#_gettext_integration_and_interaction_with_packages">17.21. Gettext integration and interaction with packages</a></span></dt><dt><span class="section"><a href="#_tips_and_tricks">17.22. Tips and tricks</a></span></dt><dt><span class="section"><a href="#_conclusion">17.23. Conclusion</a></span></dt></dl></dd><dt><span class="chapter"><a href="#patch-policy">18. Patching a package</a></span></dt><dd><dl><dt><span class="section"><a href="#_providing_patches">18.1. Providing patches</a></span></dt><dt><span class="section"><a href="#patch-apply-order">18.2. How patches are applied</a></span></dt><dt><span class="section"><a href="#_format_and_licensing_of_the_package_patches">18.3. Format and licensing of the package patches</a></span></dt><dt><span class="section"><a href="#_integrating_patches_found_on_the_web">18.4. Integrating patches found on the Web</a></span></dt></dl></dd><dt><span class="chapter"><a href="#download-infra">19. Download infrastructure</a></span></dt><dt><span class="chapter"><a href="#debugging-buildroot">20. Debugging Buildroot</a></span></dt><dt><span class="chapter"><a href="#_contributing_to_buildroot">21. Contributing to Buildroot</a></span></dt><dd><dl><dt><span class="section"><a href="#_reproducing_analyzing_and_fixing_bugs">21.1. Reproducing, analyzing and fixing bugs</a></span></dt><dt><span class="section"><a href="#_analyzing_and_fixing_autobuild_failures">21.2. Analyzing and fixing autobuild failures</a></span></dt><dt><span class="section"><a href="#_reviewing_and_testing_patches">21.3. Reviewing and testing patches</a></span></dt><dt><span class="section"><a href="#_work_on_items_from_the_todo_list">21.4. Work on items from the TODO list</a></span></dt><dt><span class="section"><a href="#submitting-patches">21.5. Submitting patches</a></span></dt><dt><span class="section"><a href="#reporting-bugs">21.6. Reporting issues/bugs or getting help</a></span></dt></dl></dd><dt><span class="chapter"><a href="#DEVELOPERS">22. DEVELOPERS file and get-developers</a></span></dt></dl></dd><dt><span class="part"><a href="#_appendix">IV. Appendix</a></span></dt><dd><dl><dt><span class="chapter"><a href="#makedev-syntax">23. Makedev syntax documentation</a></span></dt><dt><span class="chapter"><a href="#makeuser-syntax">24. Makeusers syntax documentation</a></span></dt><dt><span class="chapter"><a href="#migrating-from-ol-versions">25. Migrating from older Buildroot versions</a></span></dt><dd><dl><dt><span class="section"><a href="#br2-external-converting">25.1. Migrating to 2016.11</a></span></dt><dt><span class="section"><a href="#migrating-host-usr">25.2. Migrating to 2017.08</a></span></dt></dl></dd></dl></dd></dl></div><div class="list-of-examples"><p><strong>List of Examples</strong></p><dl><dt>17.1. <a href="#idm45849084957440">Config script: <span class="emphasis"><em>divine</em></span> package</a></dt><dt>17.2. <a href="#idm45849084954512">Config script: <span class="emphasis"><em>imagemagick</em></span> package:</a></dt></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a id="idm45849092037824"></a></h1></div></div></div><p>Buildroot 2018.02.6 manual generated on 2018-10-07
+07:20:36 UTC from git revision 67d61cbef5</p><p>The Buildroot manual is written by the Buildroot developers.
 It is licensed under the GNU General Public License, version 2. Refer to the
-<a class="ulink" href="http://git.buildroot.org/buildroot/tree/COPYING" target="_top">COPYING</a> file in the Buildroot
-sources for the full text of this license.</p><p>Copyright © 2004-2018 The Buildroot developers</p><div class="informalfigure"><div class="mediaobject"><img src="logo.png" alt="logo.png" /></div></div></div><div class="part"><div class="titlepage"><div><div><h1 class="title"><a id="_getting_started"></a>Part I. Getting started</h1></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="_about_buildroot"></a>Chapter 1. About Buildroot</h2></div></div></div><p>Buildroot is a tool that simplifies and automates the process of
+<a class="ulink" href="http://git.buildroot.org/buildroot/tree/COPYING?id=67d61cbef5ff190b803745b332d0f7d7177210fc" target="_top">COPYING</a>
+file in the Buildroot sources for the full text of this license.</p><p>Copyright © 2004-2018 The Buildroot developers</p><div class="informalfigure"><div class="mediaobject"><img src="logo.png" alt="logo.png" /></div></div></div><div class="part"><div class="titlepage"><div><div><h1 class="title"><a id="_getting_started"></a>Part I. Getting started</h1></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="_about_buildroot"></a>Chapter 1. About Buildroot</h2></div></div></div><p>Buildroot is a tool that simplifies and automates the process of
 building a complete Linux system for an embedded system, using
 cross-compilation.</p><p>In order to achieve this, Buildroot is able to generate a
 cross-compilation toolchain, a root filesystem, a Linux kernel image
@@ -16,8 +16,8 @@ processors everyone is used to having in his PC. They can be PowerPC
 processors, MIPS processors, ARM processors, etc.</p><p>Buildroot supports numerous processors and their variants; it also
 comes with default configurations for several boards available
 off-the-shelf. Besides this, a number of third-party projects are based on,
-or develop their BSP <a href="#ftn.idm45919739093120" class="footnote" id="idm45919739093120"><sup class="footnote">[1]</sup></a> or
-SDK <a href="#ftn.idm45919738722656" class="footnote" id="idm45919738722656"><sup class="footnote">[2]</sup></a> on top of Buildroot.</p><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div id="ftn.idm45919739093120" class="footnote"><p><a href="#idm45919739093120" class="simpara"><sup class="simpara">[1] </sup></a>BSP: Board Support Package</p></div><div id="ftn.idm45919738722656" class="footnote"><p><a href="#idm45919738722656" class="simpara"><sup class="simpara">[2] </sup></a>SDK: Software Development Kit</p></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="requirement"></a>Chapter 2. System requirements</h2></div></div></div><p>Buildroot is designed to run on Linux systems.</p><p>While Buildroot itself will build most host packages it needs for the
+or develop their BSP <a href="#ftn.idm45849088859568" class="footnote" id="idm45849088859568"><sup class="footnote">[1]</sup></a> or
+SDK <a href="#ftn.idm45849088761008" class="footnote" id="idm45849088761008"><sup class="footnote">[2]</sup></a> on top of Buildroot.</p><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div id="ftn.idm45849088859568" class="footnote"><p><a href="#idm45849088859568" class="simpara"><sup class="simpara">[1] </sup></a>BSP: Board Support Package</p></div><div id="ftn.idm45849088761008" class="footnote"><p><a href="#idm45849088761008" class="simpara"><sup class="simpara">[2] </sup></a>SDK: Software Development Kit</p></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="requirement"></a>Chapter 2. System requirements</h2></div></div></div><p>Buildroot is designed to run on Linux systems.</p><p>While Buildroot itself will build most host packages it needs for the
 compilation, certain standard Linux utilities are expected to be
 already installed on the host system. Below you will find an overview of
 the mandatory and optional packages (note that package names may vary
@@ -34,9 +34,9 @@ Build tools:
 </li><li class="listitem">
 <code class="literal">build-essential</code> (only for Debian based systems)
 </li><li class="listitem">
-<code class="literal">gcc</code> (version 2.95 or any later)
+<code class="literal">gcc</code> (version 4.4 or any later)
 </li><li class="listitem">
-<code class="literal">g++</code> (version 2.95 or any later)
+<code class="literal">g++</code> (version 4.4 or any later)
 </li><li class="listitem">
 <code class="literal">bash</code>
 </li><li class="listitem">
@@ -272,7 +272,7 @@ processor. Under most Linux systems, the compilation toolchain uses
 the GNU libc (glibc) as the C standard library. This compilation
 toolchain is called the "host compilation toolchain". The machine on
 which it is running, and on which you’re working, is called the "host
-system" <a href="#ftn.idm45919735858752" class="footnote" id="idm45919735858752"><sup class="footnote">[3]</sup></a>.</p><p>The compilation toolchain is provided by your distribution, and
+system" <a href="#ftn.idm45849086369824" class="footnote" id="idm45849086369824"><sup class="footnote">[3]</sup></a>.</p><p>The compilation toolchain is provided by your distribution, and
 Buildroot has nothing to do with it (other than using it to build a
 cross-compilation toolchain and other tools that are run on the
 development host).</p><p>As said above, the compilation toolchain that comes with your system
@@ -348,16 +348,14 @@ cross-compilation toolchains. Buildroot knows about a number of
 well-known cross-compilation toolchains (from
 <a class="ulink" href="http://www.linaro.org" target="_top">Linaro</a> for ARM,
 <a class="ulink" href="http://www.mentor.com/embedded-software/sourcery-tools/sourcery-codebench/editions/lite-edition/" target="_top">Sourcery
-CodeBench</a> for ARM, x86, x86-64, PowerPC, MIPS and SuperH,
-<a class="ulink" href="https://blackfin.uclinux.org/gf/project/toolchain" target="_top">Blackfin toolchains
-from Analog Devices</a>, etc.) and is capable of downloading them
-automatically, or it can be pointed to a custom toolchain, either
-available for download or installed locally.</p><p>Then, you have three solutions to use an external toolchain:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+CodeBench</a> for ARM, x86-64, PowerPC, and MIPS, and is capable of
+downloading them automatically, or it can be pointed to a custom
+toolchain, either available for download or installed locally.</p><p>Then, you have three solutions to use an external toolchain:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 Use a predefined external toolchain profile, and let Buildroot
   download, extract and install the toolchain. Buildroot already knows
-  about a few CodeSourcery, Linaro, Blackfin and Xilinx toolchains.
-  Just select the toolchain profile in <code class="literal">Toolchain</code> from the
-  available ones. This is definitely the easiest solution.
+  about a few CodeSourcery and Linaro toolchains. Just select the
+  toolchain profile in <code class="literal">Toolchain</code> from the available ones. This is
+  definitely the easiest solution.
 </li><li class="listitem">
 Use a predefined external toolchain profile, but instead of having
   Buildroot download and extract the toolchain, you can tell Buildroot
@@ -409,8 +407,6 @@ Allows to use well-known and well-tested cross-compilation
 Avoids the build time of the cross-compilation toolchain, which is
   often very significant in the overall build time of an embedded
   Linux system.
-</li><li class="listitem">
-Not limited to uClibc: glibc and eglibc toolchains are supported.
 </li></ul></div><p>Drawbacks of this backend:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 If your pre-built external toolchain has a bug, may be hard to get a
   fix from the toolchain vendor, unless you build your external
@@ -551,7 +547,7 @@ The third solution is <span class="strong"><strong>systemd</strong></span>. <cod
    <a class="ulink" href="http://www.freedesktop.org/wiki/Software/systemd" target="_top">http://www.freedesktop.org/wiki/Software/systemd</a>.
 </li></ul></div><p>The solution recommended by Buildroot developers is to use the
 <span class="strong"><strong>BusyBox init</strong></span> as it is sufficient for most embedded
-systems. <span class="strong"><strong>systemd</strong></span> can be used for more complex situations.</p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div id="ftn.idm45919735858752" class="footnote"><p><a href="#idm45919735858752" class="simpara"><sup class="simpara">[3] </sup></a>This terminology differs from what is used by GNU
+systems. <span class="strong"><strong>systemd</strong></span> can be used for more complex situations.</p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div id="ftn.idm45849086369824" class="footnote"><p><a href="#idm45849086369824" class="simpara"><sup class="simpara">[3] </sup></a>This terminology differs from what is used by GNU
 configure, where the host is the machine on which the application will
 run (which is usually the same as target)</p></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="_configuration_of_other_components"></a>Chapter 7. Configuration of other components</h2></div></div></div><p>Before attempting to modify any of the components below, make sure you
 have already configured Buildroot itself, and have enabled the
@@ -619,7 +615,33 @@ A few tools are required to build the documentation (see:
   <a class="xref" href="#requirement-optional" title="2.2. Optional packages">Section 2.2, “Optional packages”</a>).
 </li></ul></div><p><strong>Resetting Buildroot for a new target: </strong>To delete all build products as well as the configuration:</p><pre class="screen"> $ make distclean</pre><p><strong>Notes. </strong>If <code class="literal">ccache</code> is enabled, running <code class="literal">make clean</code> or <code class="literal">distclean</code> does
 not empty the compiler cache used by Buildroot. To delete it, refer
-to <a class="xref" href="#ccache" title="8.12.3. Using ccache in Buildroot">Section 8.12.3, “Using <code class="literal">ccache</code> in Buildroot”</a>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="full-rebuild"></a>8.2. Understanding when a full rebuild is necessary</h2></div></div></div><p>Buildroot does not attempt to detect what parts of the system should
+to <a class="xref" href="#ccache" title="8.12.3. Using ccache in Buildroot">Section 8.12.3, “Using <code class="literal">ccache</code> in Buildroot”</a>.</p><p><strong>Dumping the internal make variables: </strong>One can dump all the variables known to make, along with their values:</p><pre class="screen"> $ make -s printvars
+ VARIABLE=value_of_variable
+ ...</pre><p>It is possible to tweak the output using some variables:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<code class="literal">VARS</code> will limit the listing to variables which names match the
+  specified make-pattern
+</li><li class="listitem">
+<code class="literal">QUOTED_VARS</code>, if set to <code class="literal">YES</code>, will single-quote the value
+</li><li class="listitem">
+<code class="literal">RAW_VARS</code>, if set to <code class="literal">YES</code>, will print the unexpanded value
+</li></ul></div><p>For example:</p><pre class="screen"> $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES
+ BUSYBOX_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_ALL_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=
+ BUSYBOX_RDEPENDENCIES=ncurses util-linux</pre><pre class="screen"> $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES QUOTED_VARS=YES
+ BUSYBOX_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_ALL_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=''
+ BUSYBOX_RDEPENDENCIES='ncurses util-linux'</pre><pre class="screen"> $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES RAW_VARS=YES
+ BUSYBOX_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_ALL_DEPENDENCIES=$(sort $(BUSYBOX_FINAL_DEPENDENCIES) $(BUSYBOX_FINAL_PATCH_DEPENDENCIES))
+ BUSYBOX_FINAL_DEPENDENCIES=$(sort $(BUSYBOX_DEPENDENCIES))
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=$(sort $(BUSYBOX_PATCH_DEPENDENCIES))
+ BUSYBOX_RDEPENDENCIES=ncurses util-linux</pre><p>The output of quoted variables can be reused in shell scripts, for example:</p><pre class="screen"> $ eval $(make -s printvars VARS=BUSYBOX_DEPENDENCIES QUOTED_VARS=YES)
+ $ echo $BUSYBOX_DEPENDENCIES
+ skeleton toolchain</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="full-rebuild"></a>8.2. Understanding when a full rebuild is necessary</h2></div></div></div><p>Buildroot does not attempt to detect what parts of the system should
 be rebuilt when the system configuration is changed through <code class="literal">make
 menuconfig</code>, <code class="literal">make xconfig</code> or one of the other configuration
 tools. In some cases, Buildroot should rebuild the entire system, in
@@ -886,7 +908,7 @@ graph-size</code>.</p><p>To compare the root filesystem size of two different Bu
 for example after adjusting the configuration or when switching to another
 Buildroot release, use the <code class="literal">size-stats-compare</code> script. It takes two
 <code class="literal">file-size-stats.csv</code> files (produced by <code class="literal">make graph-size</code>) as input.
-Refer to the help text of this script for more details:</p><pre class="screen">support/scripts/size-stats-compare -h</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_integration_with_eclipse"></a>8.11. Integration with Eclipse</h2></div></div></div><p>While a part of the embedded Linux developers like classical text
+Refer to the help text of this script for more details:</p><pre class="screen">utils/size-stats-compare -h</pre></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_integration_with_eclipse"></a>8.11. Integration with Eclipse</h2></div></div></div><p>While a part of the embedded Linux developers like classical text
 editors like Vim or Emacs, and command-line based interfaces, a number
 of other embedded Linux developers like richer graphical interfaces to
 do their development work. Eclipse being one of the most popular
@@ -912,13 +934,18 @@ described in detail at
 software that are not packaged in Buildroot. In order to do this you
 can use the toolchain that was generated by Buildroot.</p><p>The toolchain generated by Buildroot is located by default in
 <code class="literal">output/host/</code>. The simplest way to use it is to add
-<code class="literal">output/host/usr/bin/</code> to your PATH environment variable and then to
-use <code class="literal">ARCH-linux-gcc</code>, <code class="literal">ARCH-linux-objdump</code>, <code class="literal">ARCH-linux-ld</code>, etc.</p><p>It is possible to relocate the toolchain - but then <code class="literal">--sysroot</code> must
-be passed every time the compiler is called to tell where the
-libraries and header files are.</p><p>It is also possible to generate the Buildroot toolchain in a directory
-other than <code class="literal">output/host</code> by using the <code class="literal">Build options → Host dir</code>
-option. This could be useful if the toolchain must be shared with
-other users.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_using_literal_gdb_literal_in_buildroot"></a>8.12.2. Using <code class="literal">gdb</code> in Buildroot</h3></div></div></div><p>Buildroot allows to do cross-debugging, where the debugger runs on the
+<code class="literal">output/host/bin/</code> to your PATH environment variable and then to
+use <code class="literal">ARCH-linux-gcc</code>, <code class="literal">ARCH-linux-objdump</code>, <code class="literal">ARCH-linux-ld</code>, etc.</p><p>It is possible to relocate the toolchain, this allows to distribute
+the toolchain to other developers to build applications for your
+target. To achieve this:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+run <code class="literal">make sdk</code>, which prepares the toolchain to be relocatable;
+</li><li class="listitem">
+tarball the contents of the <code class="literal">output/host</code> directory;
+</li><li class="listitem">
+distribute the resulting tarball.
+</li></ul></div><p>Once the toolchain is installed to the new location, the user must run
+the <code class="literal">relocate-sdk.sh</code> script to make sure all paths are updated with
+the new location.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_using_literal_gdb_literal_in_buildroot"></a>8.12.2. Using <code class="literal">gdb</code> in Buildroot</h3></div></div></div><p>Buildroot allows to do cross-debugging, where the debugger runs on the
 build machine and communicates with <code class="literal">gdbserver</code> on the target to
 control the execution of the program.</p><p>To achieve this:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 If you are using an <span class="emphasis"><em>internal toolchain</em></span> (built by Buildroot), you
@@ -935,7 +962,7 @@ If you are using an <span class="emphasis"><em>external toolchain</em></span>, y
 </li></ul></div><p>Now, to start debugging a program called <code class="literal">foo</code>, you should run on the
 target:</p><pre class="screen">gdbserver :2345 foo</pre><p>This will cause <code class="literal">gdbserver</code> to listen on TCP port 2345 for a connection
 from the cross gdb.</p><p>Then, on the host, you should start the cross gdb using the following
-command line:</p><pre class="screen">&lt;buildroot&gt;/output/host/usr/bin/&lt;tuple&gt;-gdb -x &lt;buildroot&gt;/output/staging/usr/share/buildroot/gdbinit foo</pre><p>Of course, <code class="literal">foo</code> must be available in the current directory, built
+command line:</p><pre class="screen">&lt;buildroot&gt;/output/host/bin/&lt;tuple&gt;-gdb -x &lt;buildroot&gt;/output/staging/usr/share/buildroot/gdbinit foo</pre><p>Of course, <code class="literal">foo</code> must be available in the current directory, built
 with debugging symbols. Typically you start this command from the
 directory where <code class="literal">foo</code> is built (and not from <code class="literal">output/target/</code> as the
 binaries in that directory are stripped).</p><p>The <code class="literal">&lt;buildroot&gt;/output/staging/usr/share/buildroot/gdbinit</code> file will tell the
@@ -1177,7 +1204,7 @@ If it is passed as a relative path, it is important to note that it is
 interpreted relative to the main Buildroot source directory, <span class="strong"><strong>not</strong></span> to
 the Buildroot output directory.</p><p><strong>Note: </strong>If using an br2-external tree from before Buildroot 2016.11, you need to
 convert it before you can use it with Buildroot 2016.11 onward. See
-<a class="xref" href="#br2-external-converting" title="Chapter 25. Converting old br2-external trees">Chapter 25, <em>Converting old br2-external trees</em></a> for help on doing so.</p><p>Some examples:</p><pre class="screen">buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig</pre><p>From now on, definitions from the <code class="literal">/path/to/foo</code> br2-external tree
+<a class="xref" href="#br2-external-converting" title="25.1. Migrating to 2016.11">Section 25.1, “Migrating to 2016.11”</a> for help on doing so.</p><p>Some examples:</p><pre class="screen">buildroot/ $ make BR2_EXTERNAL=/path/to/foo menuconfig</pre><p>From now on, definitions from the <code class="literal">/path/to/foo</code> br2-external tree
 will be used:</p><pre class="screen">buildroot/ $ make
 buildroot/ $ make legal-info</pre><p>We can switch to another br2-external tree at any time:</p><pre class="screen">buildroot/ $ make BR2_EXTERNAL=/where/we/have/bar xconfig</pre><p>We can also use multiple br2-external trees:</p><pre class="screen">buildroot/ $ make BR2_EXTERNAL=/path/to/foo:/where/we/have/bar menuconfig</pre><p>Or disable the usage of any br2-external tree:</p><pre class="screen">buildroot/ $ make BR2_EXTERNAL= xconfig</pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_layout_of_a_br2_external_tree"></a>9.2.1. Layout of a br2-external tree</h3></div></div></div><p>A br2-external tree must contain at least those three files, described
 in the following chapters:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
@@ -1750,7 +1777,7 @@ being able to generate binary packages (ipk or other format) that
 installed what and remove it when the package is unselected. However, it
 is much more complicated than that:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 It is not only about the <code class="literal">target/</code> directory, but also the sysroot in
-   <code class="literal">host/usr/&lt;tuple&gt;/sysroot</code> and the <code class="literal">host/</code> directory itself. All files
+   <code class="literal">host/&lt;tuple&gt;/sysroot</code> and the <code class="literal">host/</code> directory itself. All files
    installed in those directories by various packages must be tracked.
 </li><li class="listitem">
 When a package is unselected from the configuration, it is not
@@ -1858,26 +1885,6 @@ It is not possible to pass extra linker options via <code class="literal">BR2_TA
   if such options contain a <code class="literal">$</code> sign. For example, the following is known
   to break: <code class="literal">BR2_TARGET_LDFLAGS="-Wl,-rpath='$ORIGIN/../lib'"</code>
 </li><li class="listitem">
-The <code class="literal">ltp-testsuite</code> package does not build with the default uClibc
-  configuration used by the Buildroot toolchain backend. The LTP
-  testsuite uses several functions that are considered obsolete, such
-  as sigset() and others. uClibc configuration options such as
-  DO_XSI_MATH, UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and
-  UCLIBC_SV4_DEPRECATED are needed if one wants to build the
-  <code class="literal">ltp-testsuite</code> package with uClibc. You need to either use a glibc
-  based toolchain, or enable the appropriate options in the uClibc
-  configuration.
-</li><li class="listitem">
-The <code class="literal">xfsprogs</code> package does not build with the default uClibc
-  configuration used by the Buildroot toolchain backend. You need to
-  either use a glibc based toolchain, or enable the appropriate
-  options in the uClibc configuration.
-</li><li class="listitem">
-The <code class="literal">mrouted</code> package does not build with the default uClibc
-  configuration used by the Buildroot toolchain backend. You need to
-  either use a glibc based toolchain, or enable the appropriate
-  options in the uClibc configuration.
-</li><li class="listitem">
 The <code class="literal">libffi</code> package is not supported on the SuperH 2 and ARC
   architectures.
 </li><li class="listitem">
@@ -1945,85 +1952,7 @@ well possible that those declarative statements are not all fully accurate
 nor exhaustive. You (or your legal department) <span class="emphasis"><em>have</em></span> to check the output
 of <code class="literal">make legal-info</code> before using it as your own compliance delivery. See
 the <span class="emphasis"><em>NO WARRANTY</em></span> clauses (clauses 11 and 12) in the <code class="literal">COPYING</code> file at the
-root of the Buildroot distribution.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="legal-info-list-licenses"></a>12.2. License abbreviations</h2></div></div></div><p>Here is a list of the licenses that are most widely used by packages in
-Buildroot, with the name used in the manifest files:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<code class="literal">AGPLv3</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/agpl-3.0.en.html" target="_top">
-  GNU Affero General Public License, version 3</a>;
-</li><li class="listitem">
-<code class="literal">GPLv2</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">
-  GNU General Public License, version 2</a>;
-</li><li class="listitem">
-<code class="literal">GPLv2+</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">
-  GNU General Public License, version 2</a>
-  or (at your option) any later version;
-</li><li class="listitem">
-<code class="literal">GPLv3</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/gpl.html" target="_top">
-  GNU General Public License, version 3</a>;
-</li><li class="listitem">
-<code class="literal">GPLv3+</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/gpl.html" target="_top">
-  GNU General Public License, version 3</a>
-  or (at your option) any later version;
-</li><li class="listitem">
-<code class="literal">GPL</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/gpl.html" target="_top">
-  GNU General Public License</a> (any version);
-</li><li class="listitem">
-<code class="literal">LGPLv2</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html" target="_top">
-  GNU Library General Public License, version 2</a>;
-</li><li class="listitem">
-<code class="literal">LGPLv2+</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html" target="_top">
-  GNU Library General Public License, version 2</a>
-  or (at your option) any later version;
-</li><li class="listitem">
-<code class="literal">LGPLv2.1</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_top">
-  GNU Lesser General Public License, version 2.1</a>;
-</li><li class="listitem">
-<code class="literal">LGPLv2.1+</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_top">
-  GNU Lesser General Public License, version 2.1</a>
-  or (at your option) any later version;
-</li><li class="listitem">
-<code class="literal">LGPLv3</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/lgpl.html" target="_top">
-  GNU Lesser General Public License, version 3</a>;
-</li><li class="listitem">
-<code class="literal">LGPLv3+</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/lgpl.html" target="_top">
-  GNU Lesser General Public License, version 3</a>
-  or (at your option) any later version;
-</li><li class="listitem">
-<code class="literal">LGPL</code>:
-  <a class="ulink" href="http://www.gnu.org/licenses/lgpl.html" target="_top">
-  GNU Lesser General Public License</a> (any version);
-</li><li class="listitem">
-<code class="literal">BSD-4c</code>:
-  <a class="ulink" href="http://directory.fsf.org/wiki/License:BSD_4Clause" target="_top">
-  Original BSD 4-clause license</a>;
-</li><li class="listitem">
-<code class="literal">BSD-3c</code>:
-  <a class="ulink" href="http://opensource.org/licenses/BSD-3-Clause" target="_top">
-  BSD 3-clause license</a>;
-</li><li class="listitem">
-<code class="literal">BSD-2c</code>:
-  <a class="ulink" href="http://opensource.org/licenses/BSD-2-Clause" target="_top">
-  BSD 2-clause license</a>;
-</li><li class="listitem">
-<code class="literal">MIT</code>:
-  <a class="ulink" href="http://opensource.org/licenses/mit-license.html" target="_top">
-  MIT-style license</a>;
-</li><li class="listitem">
-<code class="literal">Apache-2.0</code>:
-  <a class="ulink" href="http://apache.org/licenses/LICENSE-2.0.html" target="_top">
-  Apache License, version 2.0</a>;
-</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="legal-info-buildroot"></a>12.3. Complying with the Buildroot license</h2></div></div></div><p>Buildroot itself is an open source software, released under the
+root of the Buildroot distribution.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="legal-info-buildroot"></a>12.2. Complying with the Buildroot license</h2></div></div></div><p>Buildroot itself is an open source software, released under the
 <a class="ulink" href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">GNU General
 Public License, version 2</a> or (at your option) any later version, with
 the exception of the package patches detailed below.
@@ -2042,7 +1971,7 @@ of the executable</em></span>".
 Buildroot is part of the <span class="emphasis"><em>scripts used to control compilation and
 installation of the executable</em></span>, and as such it is considered part of the
 material that must be redistributed.</p><p>Keep in mind that this is only the Buildroot developers' opinion, and you
-should consult your legal department or lawyer in case of any doubt.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_patches_to_packages"></a>12.3.1. Patches to packages</h3></div></div></div><p>Buildroot also bundles patch files, which are applied to the sources
+should consult your legal department or lawyer in case of any doubt.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_patches_to_packages"></a>12.2.1. Patches to packages</h3></div></div></div><p>Buildroot also bundles patch files, which are applied to the sources
 of the various packages. Those patches are not covered by the license
 of Buildroot. Instead, they are covered by the license of the software
 to which the patches are applied. When said software is available
@@ -2134,7 +2063,8 @@ Buildroot.</p><p>An entry has the following pattern:</p><pre class="screen">conf
         depends on BR2_PACKAGE_LIBBAZ
         select BR2_PACKAGE_LIBBAR
         help
-          This is a comment that explains what libfoo is.
+          This is a comment that explains what libfoo is. The help text
+          should be wrapped.
 
           http://foosoftware.org/libfoo/</pre><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 The <code class="literal">bool</code>, <code class="literal">depends on</code>, <code class="literal">select</code> and <code class="literal">help</code> lines are indented
@@ -2143,7 +2073,8 @@ The <code class="literal">bool</code>, <code class="literal">depends on</code>,
 The help text itself should be indented with one tab and two
   spaces.
 </li><li class="listitem">
-The help text should be wrapped to fit 72 columns.
+The help text should be wrapped to fit 72 columns, where tab counts
+  for 8, so 62 characters in the text itself.
 </li></ul></div><p>The <code class="literal">Config.in</code> files are the input for the configuration tool
 used in Buildroot, which is the regular <span class="emphasis"><em>Kconfig</em></span>. For further
 details about the <span class="emphasis"><em>Kconfig</em></span> language, refer to
@@ -2192,7 +2123,9 @@ ifneq ($(BR2_LIBFOO_INSTALL_DATA),y)
 LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA
 endif</pre></li></ul></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_the_documentation"></a>15.3. The documentation</h2></div></div></div><p>The documentation uses the
 <a class="ulink" href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a> format.</p><p>For further details about the <a class="ulink" href="http://www.methods.co.nz/asciidoc/" target="_top">asciidoc</a>
-syntax, refer to <a class="ulink" href="http://www.methods.co.nz/asciidoc/userguide.html" target="_top">http://www.methods.co.nz/asciidoc/userguide.html</a>.</p></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="adding-board-support"></a>Chapter 16. Adding support for a particular board</h2></div></div></div><p>Buildroot contains basic configurations for several publicly available
+syntax, refer to <a class="ulink" href="http://www.methods.co.nz/asciidoc/userguide.html" target="_top">http://www.methods.co.nz/asciidoc/userguide.html</a>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_support_scripts"></a>15.4. Support scripts</h2></div></div></div><p>Some scripts in the <code class="literal">support/</code> and <code class="literal">utils/</code> directories are written in
+Python and should follow the
+<a class="ulink" href="https://www.python.org/dev/peps/pep-0008/" target="_top">PEP8 Style Guide for Python Code</a>.</p></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="adding-board-support"></a>Chapter 16. Adding support for a particular board</h2></div></div></div><p>Buildroot contains basic configurations for several publicly available
 hardware boards, so that users of such a board can easily build a system
 that is known to work. You are welcome to add support for other boards
 to Buildroot too.</p><p>To do so, you need to create a normal Buildroot configuration that
@@ -2218,7 +2151,8 @@ and configurations in these directories, and reference them from the main
 Buildroot configuration. Refer to <a class="xref" href="#customize" title="Chapter 9. Project-specific customization">Chapter 9, <em>Project-specific customization</em></a> for more details.</p></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="adding-packages"></a>Chapter 17. Adding new packages to Buildroot</h2></div></div></div><p>This section covers how new packages (userspace libraries or
 applications) can be integrated into Buildroot. It also shows how
 existing packages are integrated, which is needed for fixing issues or
-tuning their configuration.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_package_directory"></a>17.1. Package directory</h2></div></div></div><p>First of all, create a directory under the <code class="literal">package</code> directory for
+tuning their configuration.</p><p>When you add a new package, be sure to test it in various conditions;
+see <a class="xref" href="#testing-package" title="17.22.2. How to test your package">Section 17.22.2, “How to test your package”</a></p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_package_directory"></a>17.1. Package directory</h2></div></div></div><p>First of all, create a directory under the <code class="literal">package</code> directory for
 your software, for example <code class="literal">libfoo</code>.</p><p>Some packages have been grouped by topic in a sub-directory:
 <code class="literal">x11r7</code>, <code class="literal">qt5</code> and <code class="literal">gstreamer</code>. If your package fits in
 one of these categories, then create your package directory in these.
@@ -2230,13 +2164,15 @@ that will be used and displayed in the configuration tool. It should basically
 contain:</p><pre class="screen">config BR2_PACKAGE_LIBFOO
         bool "libfoo"
         help
-          This is a comment that explains what libfoo is.
+          This is a comment that explains what libfoo is. The help text
+          should be wrapped.
 
           http://foosoftware.org/libfoo/</pre><p>The <code class="literal">bool</code> line, <code class="literal">help</code> line and other metadata information about the
 configuration option must be indented with one tab. The help text
 itself should be indented with one tab and two spaces, lines should
-not be longer than 72 columns, and it must mention the upstream URL
-of the project.</p><p>As a convention specific to Buildroot, the ordering of the attributes
+be wrapped to fit 72 columns, where tab counts for 8, so 62 characters
+in the text itself. The help text must mention the upstream URL of the
+project after an empty line.</p><p>As a convention specific to Buildroot, the ordering of the attributes
 is as follows:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
 The type of option: <code class="literal">bool</code>, <code class="literal">string</code>… with the prompt
 </li><li class="listitem">
@@ -2541,9 +2477,11 @@ different way, using different infrastructures:</p><div class="itemizedlist"><ul
 <a class="xref" href="#luarocks-package-reference" title="17.9.2. luarocks-package reference">Section 17.9.2, “<code class="literal">luarocks-package</code> reference”</a>.
 </li></ul></div><p>Further formatting details: see <a class="link" href="#writing-rules-mk" title="15.2. The .mk file">the writing
 rules</a>
-<a class="xref" href="#writing-rules-mk" title="15.2. The .mk file">Section 15.2, “The <code class="literal">.mk</code> file”</a>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="adding-packages-hash"></a>17.4. The <code class="literal">.hash</code> file</h2></div></div></div><p>Optionally, you can add a third file, named <code class="literal">libfoo.hash</code>, that contains
-the hashes of the downloaded files for the <code class="literal">libfoo</code> package.</p><p>The hashes stored in that file are used to validate the integrity of the
-downloaded files.</p><p>The format of this file is one line for each file for which to check the
+<a class="xref" href="#writing-rules-mk" title="15.2. The .mk file">Section 15.2, “The <code class="literal">.mk</code> file”</a>.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="adding-packages-hash"></a>17.4. The <code class="literal">.hash</code> file</h2></div></div></div><p>When possible, you must add a third file, named <code class="literal">libfoo.hash</code>, that
+contains the hashes of the downloaded files for the <code class="literal">libfoo</code>
+package. The only reason for not adding a <code class="literal">.hash</code> file is when hash
+checking is not possible due to how the package is downloaded.</p><p>The hashes stored in that file are used to validate the integrity of the
+downloaded files and of the license files.</p><p>The format of this file is one line for each file for which to check the
 hash, each line being space-separated, with these three fields:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p class="simpara">
 the type of hash, one of:
 </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
@@ -2564,9 +2502,14 @@ for <code class="literal">sha256</code>, 64 hexadecimal characters
 for <code class="literal">sha384</code>, 96 hexadecimal characters
 </li><li class="listitem">
 for <code class="literal">sha512</code>, 128 hexadecimal characters
-</li></ul></div></li><li class="listitem">
-the name of the file, without any directory component
-</li></ul></div><p>Lines starting with a <code class="literal">#</code> sign are considered comments, and ignored. Empty
+</li></ul></div></li><li class="listitem"><p class="simpara">
+the name of the file:
+</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+for a source archive: the basename of the file, without any directory
+   component,
+</li><li class="listitem">
+for a license file: the path as it appears in <code class="literal">FOO_LICENSE_FILES</code>.
+</li></ul></div></li></ul></div><p>Lines starting with a <code class="literal">#</code> sign are considered comments, and ignored. Empty
 lines are ignored.</p><p>There can be more than one hash for a single file, each on its own line. In
 this case, all hashes must match.</p><p><strong>Note. </strong>Ideally, the hashes stored in this file should match the hashes published by
 upstream, e.g. on their website, in the e-mail announcement… If upstream
@@ -2574,7 +2517,11 @@ provides more than one type of hash (e.g. <code class="literal">sha1</code> and
 best to add all those hashes in the <code class="literal">.hash</code> file. If upstream does not
 provide any hash, or only provides an <code class="literal">md5</code> hash, then compute at least one
 strong hash yourself (preferably <code class="literal">sha256</code>, but not <code class="literal">md5</code>), and mention
-this in a comment line above the hashes.</p><p><strong>Note. </strong>The number of spaces does not matter, so one can use spaces (or tabs) to
+this in a comment line above the hashes.</p><p><strong>Note. </strong>The hashes for license files are used to detect a license change when a
+package version is bumped. The hashes are checked during the make legal-info
+target run. For a package with multiple versions (like Qt5),
+create the hash file in a subdirectory <code class="literal">&lt;packageversion&gt;</code> of that package
+(see also <a class="xref" href="#patch-apply-order" title="18.2. How patches are applied">Section 18.2, “How patches are applied”</a>).</p><p><strong>Note. </strong>The number of spaces does not matter, so one can use spaces (or tabs) to
 properly align the different fields.</p><p>The <code class="literal">none</code> hash type is reserved to those archives downloaded from a
 repository, like a <span class="emphasis"><em>git clone</em></span>, a <span class="emphasis"><em>subversion checkout</em></span>…</p><p>The example below defines a <code class="literal">sha1</code> and a <code class="literal">sha256</code> published by upstream for
 the main <code class="literal">libfoo-1.2.3.tar.bz2</code> tarball, an <code class="literal">md5</code> from upstream and a
@@ -2591,7 +2538,11 @@ sha256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b libfoo-d
 sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-fix-blabla.patch
 
 # No hash for 1234:
-none   xxx                                                              libfoo-1234.tar.gz</pre><p>If the <code class="literal">.hash</code> file is present, and it contains one or more hashes for a
+none   xxx                                                              libfoo-1234.tar.gz
+
+# Hash for license files:
+sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8  COPYING
+sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55  doc/COPYING.LGPL</pre><p>If the <code class="literal">.hash</code> file is present, and it contains one or more hashes for a
 downloaded file, the hash(es) computed by Buildroot (after download) must
 match the hash(es) stored in the <code class="literal">.hash</code> file. If one or more hashes do
 not match, Buildroot considers this an error, deletes the downloaded file,
@@ -2599,11 +2550,16 @@ and aborts.</p><p>If the <code class="literal">.hash</code> file is present, but
 downloaded file, Buildroot considers this an error and aborts. However,
 the downloaded file is left in the download directory since this
 typically indicates that the <code class="literal">.hash</code> file is wrong but the downloaded
-file is probably OK.</p><p>Sources that are downloaded from a version control system (git, subversion,
-etc…) can not have a hash, because the version control system and tar
-may not create exactly the same file (dates, files ordering…), so the
-hash could be wrong even for a valid download. Therefore, the hash check
-is entirely skipped for such sources.</p><p>If the <code class="literal">.hash</code> file is missing, then no check is done at all.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_packages_with_specific_build_systems"></a>17.5. Infrastructure for packages with specific build systems</h2></div></div></div><p>By <span class="emphasis"><em>packages with specific build systems</em></span> we mean all the packages
+file is probably OK.</p><p>Hashes are currently checked for files fetched from http/ftp servers,
+Git repositories, files copied using scp and local files. Hashes are
+not checked for other version control systems (such as Subversion,
+CVS, etc.) because Buildroot currently does not generate reproducible
+tarballs when source code is fetched from such version control
+systems.</p><p>Hashes should only be added in <code class="literal">.hash</code> files for files that are
+guaranteed to be stable. For example, patches auto-generated by Github
+are not guaranteed to be stable, and therefore their hashes can change
+over time. Such patches should not be downloaded, and instead be added
+locally to the package folder.</p><p>If the <code class="literal">.hash</code> file is missing, then no check is done at all.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_packages_with_specific_build_systems"></a>17.5. Infrastructure for packages with specific build systems</h2></div></div></div><p>By <span class="emphasis"><em>packages with specific build systems</em></span> we mean all the packages
 whose build system is not one of the standard ones, such as
 <span class="emphasis"><em>autotools</em></span> or <span class="emphasis"><em>CMake</em></span>. This typically includes packages whose build
 system is based on hand-written Makefiles or shell scripts.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="generic-package-tutorial"></a>17.5.1. <code class="literal">generic-package</code> tutorial</h3></div></div></div><pre class="screen">01: ################################################################################
@@ -2615,7 +2571,7 @@ system is based on hand-written Makefiles or shell scripts.</p><div class="secti
 07: LIBFOO_VERSION = 1.0
 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
 09: LIBFOO_SITE = http://www.foosoftware.org/download
-10: LIBFOO_LICENSE = GPLv3+
+10: LIBFOO_LICENSE = GPL-3.0+
 11: LIBFOO_LICENSE_FILES = COPYING
 12: LIBFOO_INSTALL_STAGING = YES
 13: LIBFOO_CONFIG_SCRIPTS = libfoo-config
@@ -2673,7 +2629,7 @@ flags.
 The argument to be given to <code class="literal">LIBFOO_CONFIG_SCRIPTS</code> is the file name(s)
 of the shell script(s) needing fixing. All these names are relative to
 <span class="emphasis"><em>$(STAGING_DIR)/usr/bin</em></span> and if needed multiple names can be given.</p><p>In addition, the scripts listed in <code class="literal">LIBFOO_CONFIG_SCRIPTS</code> are removed
-from <code class="literal">$(TARGET_DIR)/usr/bin</code>, since they are not needed on the target.</p><div class="example"><a id="idm45919734426448"></a><p class="title"><strong>Example 17.1. Config script: <span class="emphasis"><em>divine</em></span> package</strong></p><div class="example-contents"><p>Package divine installs shell script <span class="emphasis"><em>$(STAGING_DIR)/usr/bin/divine-config</em></span>.</p><p>So its fixup would be:</p><pre class="screen">DIVINE_CONFIG_SCRIPTS = divine-config</pre></div></div><br class="example-break" /><div class="example"><a id="idm45919734423520"></a><p class="title"><strong>Example 17.2. Config script: <span class="emphasis"><em>imagemagick</em></span> package:</strong></p><div class="example-contents"><p>Package imagemagick installs the following scripts:
+from <code class="literal">$(TARGET_DIR)/usr/bin</code>, since they are not needed on the target.</p><div class="example"><a id="idm45849084957440"></a><p class="title"><strong>Example 17.1. Config script: <span class="emphasis"><em>divine</em></span> package</strong></p><div class="example-contents"><p>Package divine installs shell script <span class="emphasis"><em>$(STAGING_DIR)/usr/bin/divine-config</em></span>.</p><p>So its fixup would be:</p><pre class="screen">DIVINE_CONFIG_SCRIPTS = divine-config</pre></div></div><br class="example-break" /><div class="example"><a id="idm45849084954512"></a><p class="title"><strong>Example 17.2. Config script: <span class="emphasis"><em>imagemagick</em></span> package:</strong></p><div class="example-contents"><p>Package imagemagick installs the following scripts:
 <span class="emphasis"><em>$(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config</em></span></p><p>So it’s fixup would be:</p><pre class="screen">IMAGEMAGICK_CONFIG_SCRIPTS = \
    Magick-config Magick++-config \
    MagickCore-config MagickWand-config Wand-config</pre></div></div><br class="example-break" /><p>On line 14, we specify the list of dependencies this package relies
@@ -2716,17 +2672,31 @@ exist, the package infrastructure uses the corresponding variable
 prefixed by <code class="literal">LIBFOO_</code>. This is done for variables that are likely to
 have the same value for both the target and host packages. See below
 for details.</p><p>The list of variables that can be set in a <code class="literal">.mk</code> file to give metadata
-information is (assuming the package name is <code class="literal">libfoo</code>) :</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+information is (assuming the package name is <code class="literal">libfoo</code>) :</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p class="simpara">
 <code class="literal">LIBFOO_VERSION</code>, mandatory, must contain the version of the
   package. Note that if <code class="literal">HOST_LIBFOO_VERSION</code> doesn’t exist, it is
   assumed to be the same as <code class="literal">LIBFOO_VERSION</code>. It can also be a
-  revision number, branch or tag for packages that are fetched
-  directly from their revision control system.
-  Examples:
-    <code class="literal">LIBFOO_VERSION = 0.1.2</code>
-    <code class="literal">LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057</code>
-    <code class="literal">LIBFOO_VERSION = stable</code>
+  revision number or a tag for packages that are fetched directly
+  from their version control system. Examples:
+</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+a version for a release tarball: <code class="literal">LIBFOO_VERSION = 0.1.2</code>
 </li><li class="listitem">
+a sha1 for a git tree: <code class="literal">LIBFOO_VERSION = cb9d6aa9429e838f0e54faa3d455bcbab5eef057</code>
+</li><li class="listitem"><p class="simpara">
+a tag for a git tree <code class="literal">LIBFOO_VERSION = v0.1.2</code>
+</p><p><strong>Note: </strong>Using a branch name as <code class="literal">FOO_VERSION</code> is not supported, because it does
+not and can not work as people would expect it should:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
+due to local caching, Buildroot will not re-fetch the repository,
+     so people who expect to be able to follow the remote repository
+     would be quite surprised and disappointed;
+</li><li class="listitem">
+because two builds can never be perfectly simultaneous, and because
+     the remote repository may get new commits on the branch anytime,
+     two users, using the same Buildroot tree and building the same
+     configuration, may get different source, thus rendering the build
+     non reproducible, and people would be quite surprised and
+     disappointed.
+</li></ol></div></li></ul></div></li><li class="listitem">
 <code class="literal">LIBFOO_SOURCE</code> may contain the name of the tarball of the package,
   which Buildroot will use to download the tarball from
   <code class="literal">LIBFOO_SITE</code>. If <code class="literal">HOST_LIBFOO_SOURCE</code> is not specified, it defaults
@@ -2757,7 +2727,7 @@ information is (assuming the package name is <code class="literal">libfoo</code>
   and Bazaar are supported URL types for retrieving packages directly
   from source code management systems. There is a helper function to make
   it easier to download source tarballs from GitHub (refer to
-  <a class="xref" href="#github-download-url" title="17.20.2. How to add a package from GitHub">Section 17.20.2, “How to add a package from GitHub”</a> for details). A filesystem path may be used
+  <a class="xref" href="#github-download-url" title="17.22.3. How to add a package from GitHub">Section 17.22.3, “How to add a package from GitHub”</a> for details). A filesystem path may be used
   to specify either a tarball or a directory containing the package
   source code. See <code class="literal">LIBFOO_SITE_METHOD</code> below for more details on how
   retrieval works.
@@ -2787,7 +2757,7 @@ information is (assuming the package name is <code class="literal">libfoo</code>
   the file using this URL. Otherwise, Buildroot will assume the file
   to be downloaded is located at <code class="literal">LIBFOO_SITE</code>. Buildroot will not do
   anything with those additional files, except download them: it will
-  be up to the package recipe to use them from <code class="literal">$(BR2_DL_DIR)</code>.
+  be up to the package recipe to use them from <code class="literal">$(DL_DIR)</code>.
 </li><li class="listitem"><p class="simpara">
 <code class="literal">LIBFOO_SITE_METHOD</code> determines the method used to fetch or copy the
   package source code. In many cases, Buildroot guesses the method
@@ -2851,7 +2821,7 @@ information is (assuming the package name is <code class="literal">libfoo</code>
      source directory into the package’s build directory. Note that
      for <code class="literal">local</code> packages, no patches are applied. If you need to
      still patch the source code, use <code class="literal">LIBFOO_POST_RSYNC_HOOKS</code>, see
-     <a class="xref" href="#hooks-rsync" title="17.18.1. Using the POST_RSYNC hook">Section 17.18.1, “Using the <code class="literal">POST_RSYNC</code> hook”</a>.
+     <a class="xref" href="#hooks-rsync" title="17.20.1. Using the POST_RSYNC hook">Section 17.20.1, “Using the <code class="literal">POST_RSYNC</code> hook”</a>.
 </li></ul></div></li><li class="listitem">
 <code class="literal">LIBFOO_GIT_SUBMODULES</code> can be set to <code class="literal">YES</code> to create an archive
   with the git submodules in the repository.  This is only available
@@ -2932,9 +2902,8 @@ information is (assuming the package name is <code class="literal">libfoo</code>
 <code class="literal">LIBFOO_LICENSE</code> defines the license (or licenses) under which the package
   is released.
   This name will appear in the manifest file produced by <code class="literal">make legal-info</code>.
-  If the license appears in <a class="link" href="#legal-info-list-licenses" title="12.2. License abbreviations">the following list</a>
-<a class="xref" href="#legal-info-list-licenses" title="12.2. License abbreviations">Section 12.2, “License abbreviations”</a>,
-  use the same string to make the manifest file uniform.
+  If the license appears in <a class="ulink" href="https://spdx.org/licenses/" target="_top">the SPDX License List</a>,
+  use the SPDX short identifier to make the manifest file uniform.
   Otherwise, describe the license in a precise and concise way, avoiding
   ambiguous names such as <code class="literal">BSD</code> which actually name a family of licenses.
   This variable is optional. If it is not defined, <code class="literal">unknown</code> will appear in
@@ -2943,13 +2912,13 @@ information is (assuming the package name is <code class="literal">libfoo</code>
 </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
 If different parts of the package are released under different
   licenses, then <code class="literal">comma</code> separate licenses (e.g. <code class="literal"><code class="literal">LIBFOO_LICENSE =
-  GPLv2+, LGPLv2.1+</code></code>). If there is clear distinction between which
+  GPL-2.0+, LGPL-2.1+</code></code>). If there is clear distinction between which
   component is licensed under what license, then annotate the license
   with that component, between parenthesis (e.g. <code class="literal"><code class="literal">LIBFOO_LICENSE =
-  GPLv2+ (programs), LGPLv2.1+ (libraries)</code></code>).
+  GPL-2.0+ (programs), LGPL-2.1+ (libraries)</code></code>).
 </li><li class="listitem">
 If the package is dual licensed, then separate licenses with the
-  <code class="literal">or</code> keyword (e.g. <code class="literal"><code class="literal">LIBFOO_LICENSE = AFLv2.1 or GPLv2+</code></code>).
+  <code class="literal">or</code> keyword (e.g. <code class="literal"><code class="literal">LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+</code></code>).
 </li></ul></div></li><li class="listitem">
 <code class="literal">LIBFOO_LICENSE_FILES</code> is a space-separated list of files in the package
   tarball that contain the license(s) under which the package is released.
@@ -2988,6 +2957,13 @@ If the package is dual licensed, then separate licenses with the
   processors can’t be enlarged at run time. The default stack size for the
   FLAT binary format is only 4k bytes. If the application consumes more stack,
   append the required number here.
+</li><li class="listitem">
+<code class="literal">LIBFOO_BIN_ARCH_EXCLUDE</code> is a space-separated list of paths (relative
+  to the target directory) to ignore when checking that the package
+  installs correctly cross-compiled binaries. You seldom need to set this
+  variable, unless the package installs binary blobs outside the default
+  locations, <code class="literal">/lib/firmware</code>, <code class="literal">/usr/lib/firmware</code>, <code class="literal">/lib/modules</code>,
+  <code class="literal">/usr/lib/modules</code>, and <code class="literal">/usr/share</code>, which are automatically excluded.
 </li></ul></div><p>The recommended way to define these variables is to use the following
 syntax:</p><pre class="screen">LIBFOO_VERSION = 2.32</pre><p>Now, the variables that define what should be performed at the
 different steps of the build process.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
@@ -3060,6 +3036,9 @@ endef</pre><p>In the action definitions, you can use the following variables:</p
 <code class="literal">$(@D)</code>, which contains the directory in which the package source
   code has been uncompressed.
 </li><li class="listitem">
+<code class="literal">$(DL_DIR)</code> contains the path to the directory where all the downloads made
+  by Buildroot are stored.
+</li><li class="listitem">
 <code class="literal">$(TARGET_CC)</code>, <code class="literal">$(TARGET_LD)</code>, etc. to get the target
   cross-compilation utilities
 </li><li class="listitem">
@@ -3067,7 +3046,7 @@ endef</pre><p>In the action definitions, you can use the following variables:</p
 </li><li class="listitem">
 Of course the <code class="literal">$(HOST_DIR)</code>, <code class="literal">$(STAGING_DIR)</code> and <code class="literal">$(TARGET_DIR)</code>
   variables to install the packages properly.
-</li></ul></div><p>Finally, you can also use hooks. See <a class="xref" href="#hooks" title="17.18. Hooks available in the various build steps">Section 17.18, “Hooks available in the various build steps”</a> for more information.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_autotools_based_packages"></a>17.6. Infrastructure for autotools-based packages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="autotools-package-tutorial"></a>17.6.1. <code class="literal">autotools-package</code> tutorial</h3></div></div></div><p>First, let’s see how to write a <code class="literal">.mk</code> file for an autotools-based
+</li></ul></div><p>Finally, you can also use hooks. See <a class="xref" href="#hooks" title="17.20. Hooks available in the various build steps">Section 17.20, “Hooks available in the various build steps”</a> for more information.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_autotools_based_packages"></a>17.6. Infrastructure for autotools-based packages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="autotools-package-tutorial"></a>17.6.1. <code class="literal">autotools-package</code> tutorial</h3></div></div></div><p>First, let’s see how to write a <code class="literal">.mk</code> file for an autotools-based
 package, with an example :</p><pre class="screen">01: ################################################################################
 02: #
 03: # libfoo
@@ -3192,7 +3171,7 @@ and install the packages are already defined, and they generally work
 well for most autotools-based packages. However, when required, it is
 still possible to customize what is done in any particular step:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 By adding a post-operation hook (after extract, patch, configure,
-  build or install). See <a class="xref" href="#hooks" title="17.18. Hooks available in the various build steps">Section 17.18, “Hooks available in the various build steps”</a> for details.
+  build or install). See <a class="xref" href="#hooks" title="17.20. Hooks available in the various build steps">Section 17.20, “Hooks available in the various build steps”</a> for details.
 </li><li class="listitem">
 By overriding one of the steps. For example, even if the autotools
   infrastructure is used, if the package <code class="literal">.mk</code> file defines its
@@ -3308,7 +3287,7 @@ install the packages are already defined, and they generally work well
 for most CMake-based packages. However, when required, it is still
 possible to customize what is done in any particular step:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 By adding a post-operation hook (after extract, patch, configure,
-  build or install). See <a class="xref" href="#hooks" title="17.18. Hooks available in the various build steps">Section 17.18, “Hooks available in the various build steps”</a> for details.
+  build or install). See <a class="xref" href="#hooks" title="17.20. Hooks available in the various build steps">Section 17.20, “Hooks available in the various build steps”</a> for details.
 </li><li class="listitem">
 By overriding one of the steps. For example, even if the CMake
   infrastructure is used, if the package <code class="literal">.mk</code> file defines its own
@@ -3327,7 +3306,7 @@ with an example :</p><pre class="screen">01: ###################################
 07: PYTHON_FOO_VERSION = 1.0
 08: PYTHON_FOO_SOURCE = python-foo-$(PYTHON_FOO_VERSION).tar.xz
 09: PYTHON_FOO_SITE = http://www.foosoftware.org/download
-10: PYTHON_FOO_LICENSE = BSD-3c
+10: PYTHON_FOO_LICENSE = BSD-3-Clause
 11: PYTHON_FOO_LICENSE_FILES = LICENSE
 12: PYTHON_FOO_ENV = SOME_VAR=1
 13: PYTHON_FOO_DEPENDENCIES = libmad
@@ -3419,7 +3398,7 @@ install the packages are already defined, and they generally work well
 for most Python-based packages. However, when required, it is still
 possible to customize what is done in any particular step:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 By adding a post-operation hook (after extract, patch, configure,
-  build or install). See <a class="xref" href="#hooks" title="17.18. Hooks available in the various build steps">Section 17.18, “Hooks available in the various build steps”</a> for details.
+  build or install). See <a class="xref" href="#hooks" title="17.20. Hooks available in the various build steps">Section 17.20, “Hooks available in the various build steps”</a> for details.
 </li><li class="listitem">
 By overriding one of the steps. For example, even if the Python
   infrastructure is used, if the package <code class="literal">.mk</code> file defines its own
@@ -3428,9 +3407,9 @@ By overriding one of the steps. For example, even if the Python
   to very specific cases. Do not use it in the general case.
 </li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="scanpypi"></a>17.8.3. Generating a <code class="literal">python-package</code> from a PyPI repository</h3></div></div></div><p>If the Python package for which you would like to create a Buildroot
 package is available on PyPI, you may want to use the <code class="literal">scanpypi</code> tool
-located in <code class="literal">support/scripts</code> to automate the process.</p><p>You can find the list of existing PyPI packages
+located in <code class="literal">utils/</code> to automate the process.</p><p>You can find the list of existing PyPI packages
 <a class="ulink" href="https://pypi.python.org" target="_top">here</a>.</p><p><code class="literal">scanpypi</code> requires Python’s <code class="literal">setuptools</code> package to be installed on
-your host.</p><p>When at the root of your buildroot directory just do :</p><pre class="screen">./support/scripts/scanpypi foo bar -o package</pre><p>This will generate packages <code class="literal">python-foo</code> and <code class="literal">python-bar</code> in the package
+your host.</p><p>When at the root of your buildroot directory just do :</p><pre class="screen">utils/scanpypi foo bar -o package</pre><p>This will generate packages <code class="literal">python-foo</code> and <code class="literal">python-bar</code> in the package
 folder if they exist on <a class="ulink" href="https://pypi.python.org" target="_top">https://pypi.python.org</a>.</p><p>Find the <code class="literal">external python modules</code> menu and insert your package inside.
 Keep in mind that the items inside a menu should be in alphabetical order.</p><p>Please keep in mind that you’ll most likely have to manually check the
 package for any mistakes as there are things that cannot be guessed by
@@ -3438,8 +3417,8 @@ the generator (e.g.  dependencies on any of the python core modules
 such as BR2_PACKAGE_PYTHON_ZLIB).  Also, please take note that the
 license and license files are guessed and must be checked. You also
 need to manually add the package to the <code class="literal">package/Config.in</code> file.</p><p>If your Buildroot package is not in the official Buildroot tree but in
-a br2-external tree, use the -o flag as follows:</p><pre class="screen">./support/scripts/scanpypi foo bar -o other_package_dir</pre><p>This will generate packages <code class="literal">python-foo</code> and <code class="literal">python-bar</code> in the
-<code class="literal">other_package_directory</code> instead of <code class="literal">package</code>.</p><p>Option <code class="literal">-h</code> will list the available options:</p><pre class="screen">./support/scripts/scanpypi -h</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="python-package-cffi-backend"></a>17.8.4. <code class="literal">python-package</code> CFFI backend</h3></div></div></div><p>C Foreign Function Interface for Python (CFFI) provides a convenient
+a br2-external tree, use the -o flag as follows:</p><pre class="screen">utils/scanpypi foo bar -o other_package_dir</pre><p>This will generate packages <code class="literal">python-foo</code> and <code class="literal">python-bar</code> in the
+<code class="literal">other_package_directory</code> instead of <code class="literal">package</code>.</p><p>Option <code class="literal">-h</code> will list the available options:</p><pre class="screen">utils/scanpypi -h</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="python-package-cffi-backend"></a>17.8.4. <code class="literal">python-package</code> CFFI backend</h3></div></div></div><p>C Foreign Function Interface for Python (CFFI) provides a convenient
 and reliable way to call compiled C code from Python using interface
 declarations written in C. Python packages relying on this backend can
 be identified by the appearance of a <code class="literal">cffi</code> dependency in the
@@ -3466,23 +3445,27 @@ PYTHON_FOO_DEPENDENCIES = host-python-cffi
 $(eval $(python-package))</pre></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_luarocks_based_packages"></a>17.9. Infrastructure for LuaRocks-based packages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="luarocks-package-tutorial"></a>17.9.1. <code class="literal">luarocks-package</code> tutorial</h3></div></div></div><p>First, let’s see how to write a <code class="literal">.mk</code> file for a LuaRocks-based package,
 with an example :</p><pre class="screen">01: ################################################################################
 02: #
-03: # luafoo
+03: # lua-foo
 04: #
 05: ################################################################################
 06:
-07: LUAFOO_VERSION = 1.0.2-1
-08: LUAFOO_DEPENDENCIES = foo
-09:
-10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
-11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
-12: LUAFOO_LICENSE = luaFoo license
-13: LUAFOO_LICENSE_FILES = COPYING
-14:
-15: $(eval $(luarocks-package))</pre><p>On line 7, we declare the version of the package (the same as in the rockspec,
+07: LUA_FOO_VERSION = 1.0.2-1
+08: LUA_FOO_NAME_UPSTREAM = foo
+09: LUA_FOO_DEPENDENCIES = bar
+10:
+11: LUA_FOO_BUILD_OPTS += BAR_INCDIR=$(STAGING_DIR)/usr/include
+12: LUA_FOO_BUILD_OPTS += BAR_LIBDIR=$(STAGING_DIR)/usr/lib
+13: LUA_FOO_LICENSE = luaFoo license
+14: LUA_FOO_LICENSE_FILES = $(LUA_FOO_SUBDIR)/COPYING
+15:
+16: $(eval $(luarocks-package))</pre><p>On line 7, we declare the version of the package (the same as in the rockspec,
 which is the concatenation of the upstream version and the rockspec revision,
-separated by a hyphen <span class="emphasis"><em>-</em></span>).</p><p>On line 8, we declare our dependencies against native libraries, so that they
-are built before the build process of our package starts.</p><p>On lines 10-11, we tell Buildroot to pass custom options to LuaRocks when it is
-building the package.</p><p>On lines 12-13, we specify the licensing terms for the package.</p><p>Finally, on line 15, we invoke the <code class="literal">luarocks-package</code>
+separated by a hyphen <span class="emphasis"><em>-</em></span>).</p><p>On line 8, we declare that the package is called "foo" on LuaRocks. In
+Buildroot, we give Lua-related packages a name that starts with "lua", so the
+Buildroot name is different from the upstream name. <code class="literal">LUA_FOO_NAME_UPSTREAM</code>
+makes the link between the two names.</p><p>On line 9, we declare our dependencies against native libraries, so that they
+are built before the build process of our package starts.</p><p>On lines 11-12, we tell Buildroot to pass custom options to LuaRocks when it is
+building the package.</p><p>On lines 13-14, we specify the licensing terms for the package.</p><p>Finally, on line 16, we invoke the <code class="literal">luarocks-package</code>
 macro that generates all the Makefile rules that actually allows the
 package to be built.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="luarocks-package-reference"></a>17.9.2. <code class="literal">luarocks-package</code> reference</h3></div></div></div><p>LuaRocks is a deployment and management system for Lua modules, and supports
 various <code class="literal">build.type</code>: <code class="literal">builtin</code>, <code class="literal">make</code> and <code class="literal">cmake</code>. In the context of
@@ -3497,21 +3480,26 @@ supported, so the macro <code class="literal">host-luarocks-package</code> is no
 by defining a number of variables before calling the <code class="literal">luarocks-package</code>
 macro.</p><p>First, all the package metadata information variables that exist in
 the generic infrastructure also exist in the LuaRocks infrastructure:
-<code class="literal">LUAFOO_VERSION</code>, <code class="literal">LUAFOO_SOURCE</code>, <code class="literal">LUAFOO_SITE</code>,
-<code class="literal">LUAFOO_DEPENDENCIES</code>, <code class="literal">LUAFOO_LICENSE</code>, <code class="literal">LUAFOO_LICENSE_FILES</code>.</p><p>Two of them are populated by the LuaRocks infrastructure (for the
+<code class="literal">LUA_FOO_VERSION</code>, <code class="literal">LUA_FOO_SOURCE</code>, <code class="literal">LUA_FOO_SITE</code>,
+<code class="literal">LUA_FOO_DEPENDENCIES</code>, <code class="literal">LUA_FOO_LICENSE</code>, <code class="literal">LUA_FOO_LICENSE_FILES</code>.</p><p>Two of them are populated by the LuaRocks infrastructure (for the
 <code class="literal">download</code> step). If your package is not hosted on the LuaRocks mirror
 <code class="literal">$(BR2_LUAROCKS_MIRROR)</code>, you can override them:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<code class="literal">LUAFOO_SITE</code>, which defaults to <code class="literal">$(BR2_LUAROCKS_MIRROR)</code>
+<code class="literal">LUA_FOO_SITE</code>, which defaults to <code class="literal">$(BR2_LUAROCKS_MIRROR)</code>
 </li><li class="listitem">
-<code class="literal">LUAFOO_SOURCE</code>, which defaults to <code class="literal">luafoo-$(LUAFOO_VERSION).src.rock</code>
+<code class="literal">LUA_FOO_SOURCE</code>, which defaults to
+  <code class="literal">$(lowercase LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION).src.rock</code>
 </li></ul></div><p>A few additional variables, specific to the LuaRocks infrastructure, are
 also defined. They can be overridden in specific cases.</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<code class="literal">LUAFOO_ROCKSPEC</code>, which defaults to <code class="literal">luafoo-$(LUAFOO_VERSION).rockspec</code>
+<code class="literal">LUA_FOO_NAME_UPSTREAM</code>, which defaults to <code class="literal">lua-foo</code>, i.e. the Buildroot
+  package name
 </li><li class="listitem">
-<code class="literal">LUAFOO_SUBDIR</code>, which defaults to
-  <code class="literal">luafoo-$(LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)</code>
+<code class="literal">LUA_FOO_ROCKSPEC</code>, which defaults to
+  <code class="literal">$(lowercase LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION).rockspec</code>
 </li><li class="listitem">
-<code class="literal">LUAFOO_BUILD_OPTS</code> contains additional build options for the
+<code class="literal">LUA_FOO_SUBDIR</code>, which defaults to
+  <code class="literal">$(LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION_WITHOUT_ROCKSPEC_REVISION)</code>
+</li><li class="listitem">
+<code class="literal">LUA_FOO_BUILD_OPTS</code> contains additional build options for the
   <code class="literal">luarocks build</code> call.
 </li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_perl_cpan_packages"></a>17.10. Infrastructure for Perl/CPAN packages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="perl-package-tutorial"></a>17.10.1. <code class="literal">perl-package</code> tutorial</h3></div></div></div><p>First, let’s see how to write a <code class="literal">.mk</code> file for a Perl/CPAN package,
 with an example :</p><pre class="screen">01: ################################################################################
@@ -3524,7 +3512,7 @@ with an example :</p><pre class="screen">01: ###################################
 08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz
 09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER
 10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures
-11: PERL_FOO_BAR_LICENSE = Artistic or GPLv1+
+11: PERL_FOO_BAR_LICENSE = Artistic or GPL-1.0+
 12: PERL_FOO_BAR_LICENSE_FILES = LICENSE
 13:
 14: $(eval $(perl-package))</pre><p>On line 7, we declare the version of the package.</p><p>On line 8 and 9, we declare the name of the tarball and the location
@@ -3536,7 +3524,7 @@ license on line 11, and the file containing the license text on line
 generates all the Makefile rules that actually allow the package to be
 built.</p><p>Most of these data can be retrieved from <a class="ulink" href="https://metacpan.org/" target="_top">https://metacpan.org/</a>.
 So, this file and the Config.in can be generated by running
-the script <code class="literal">supports/scripts/scancpan Foo-Bar</code> in the Buildroot directory
+the script <code class="literal">utils/scancpan Foo-Bar</code> in the Buildroot directory
 (or in a br2-external tree).
 This script creates a Config.in file and foo-bar.mk file for the
 requested package, and also recursively for all dependencies specified by
@@ -3768,7 +3756,7 @@ and install the packages are already defined, and they generally work
 well for most rebar-based packages. However, when required, it is
 still possible to customize what is done in any particular step:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 By adding a post-operation hook (after extract, patch, configure,
-  build or install). See <a class="xref" href="#hooks" title="17.18. Hooks available in the various build steps">Section 17.18, “Hooks available in the various build steps”</a> for details.
+  build or install). See <a class="xref" href="#hooks" title="17.20. Hooks available in the various build steps">Section 17.20, “Hooks available in the various build steps”</a> for details.
 </li><li class="listitem">
 By overriding one of the steps. For example, even if the rebar
   infrastructure is used, if the package <code class="literal">.mk</code> file defines its
@@ -3825,10 +3813,157 @@ also be defined.</p><div class="itemizedlist"><ul class="itemizedlist" style="li
 <code class="literal">LIBFOO_INSTALL_TARGET_OPTS</code>, to specify additional options to pass
   to the <code class="literal">waf</code> script during the target installation step.  By default,
   empty.
-</li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_packages_building_kernel_modules"></a>17.15. Infrastructure for packages building kernel modules</h2></div></div></div><p>Buildroot offers a helper infrastructure to make it easy to write packages that
+</li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_integration_of_meson_based_packages"></a>17.15. Integration of Meson-based packages</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="meson-package-tutorial"></a>17.15.1. <code class="literal">meson-package</code> tutorial</h3></div></div></div><p><a class="ulink" href="http://mesonbuild.com" target="_top">Meson</a> is an open source build system meant to be both
+extremely fast, and, even more importantly, as user friendly as possible.</p><p>Buildroot does not (yet) provide a dedicated package infrastructure for
+meson-based packages. So, we will explain how to write a <code class="literal">.mk</code> file for such a
+package. Let’s start with an example:</p><pre class="screen">01: ################################################################################
+02: #
+03: # foo
+04: #
+05: ################################################################################
+06:
+07: FOO_VERSION = 1.0
+08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+09: FOO_SITE = http://www.foosoftware.org/download
+10: FOO_LICENSE = GPL-3.0+
+11: FOO_LICENSE_FILES = COPYING
+12: FOO_INSTALL_STAGING = YES
+13:
+14: FOO_DEPENDENCIES = host-meson host-pkgconf bar
+15:
+16: FOO_CONF_OPTS += \
+17:     --prefix=/usr \
+18:     --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
+19:     --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf
+20:
+21: FOO_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS)
+22:
+23: ifeq ($(BR2_PACKAGE_BAZ),y)
+24: FOO_CONF_OPTS += -Dbaz
+25: endif
+26:
+27: define FOO_CONFIGURE_CMDS
+28:     rm -rf $(@D)/build
+29:     mkdir -p $(@D)/build
+30:     $(TARGET_MAKE_ENV) meson $(FOO_CONF_OPTS) $(@D) $(@D)/build
+31: endef
+32:
+33: define FOO_BUILD_CMDS
+34:     $(TARGET_MAKE_ENV) ninja $(FOO_NINJA_OPTS) -C $(@D)/build
+35: endef
+36:
+37: define FOO_INSTALL_TARGET_CMDS
+38:     $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(FOO_NINJA_OPTS) \
+39:             -C $(@D)/build install
+40: endef
+41:
+42: define FOO_INSTALL_STAGING_CMDS
+43:     $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) ninja $(FOO_NINJA_OPTS) \
+44:             -C $(@D)/build install
+45: endef
+46:
+47: $(eval $(generic-package))</pre><p>The Makefile starts with the definition of the standard variables for package
+declaration (lines 7 to 11).</p><p>As seen in line 47, it is based on the
+<a class="link" href="#generic-package-tutorial" title="17.5.1. generic-package tutorial"><code class="literal">generic-package</code> infrastructure</a>
+<a class="xref" href="#generic-package-tutorial" title="17.5.1. generic-package tutorial">Section 17.5.1, “<code class="literal">generic-package</code> tutorial”</a>. So, it defines
+the variables required by this particular infrastructure, where Meson and its
+companion tool, Ninja, are invoked:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<code class="literal">FOO_CONFIGURE_CMDS</code>: the build directory required by Meson is created, and
+  Meson is invoked to generate the Ninja build file. The options required to
+  configure the cross-compilation of the package are passed via
+  <code class="literal">FOO_CONF_OPTS</code>.
+</li><li class="listitem">
+<code class="literal">FOO_BUILD_CMDS</code>: Ninja is invoked to perform the build.
+</li><li class="listitem">
+<code class="literal">FOO_INSTALL_TARGET_CMDS</code>: Ninja is invoked to install the files generated
+  during the build step in the target directory.
+</li><li class="listitem">
+<code class="literal">FOO_INSTALL_STAGING_CMDS</code>: Ninja is invoked to install the files generated
+  during the build step in the staging directory, as <code class="literal">FOO_INSTALL_STAGING</code> is
+  set to "YES".
+</li></ul></div><p>In order to have Meson available for the build, <code class="literal">FOO_DEPENDENCIES</code> needs to
+contain <code class="literal">host-meson</code>. In the example, <code class="literal">host-pkgconf</code> and <code class="literal">bar</code> are also
+declared as dependencies because the Meson build file of <code class="literal">foo</code> uses <code class="literal">pkg-config</code>
+to determine the compilation flags and libraries of package <code class="literal">bar</code>.</p><p>If the "baz" package is selected, then support for the "baz" feature in "foo"
+is activated by adding <code class="literal">-Dbaz</code> to <code class="literal">FOO_CONF_OPTS</code>, as specified in the
+<code class="literal">meson_options.txt</code> file in "foo" source tree.</p><p>To sum it up, to add a new meson-based package, the Makefile example can be
+copied verbatim then edited to replace all occurences of <code class="literal">FOO</code> with the
+uppercase name of the new package and update the values of the standard
+variables.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_integration_of_cargo_based_packages"></a>17.16. Integration of Cargo-based packages</h2></div></div></div><p>Cargo is the package manager for the Rust programming language. It allows the
+user to build programs or libraries written in Rust, but it also downloads and
+manages their dependencies, to ensure repeatable builds. Cargo packages are
+called "crates".</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="cargo-package-tutorial"></a>17.16.1. Cargo-based package’s <code class="literal">Config.in</code> file</h3></div></div></div><p>The <code class="literal">Config.in</code> file of Cargo-based package <span class="emphasis"><em>foo</em></span> should contain:</p><pre class="screen">01: config BR2_PACKAGE_FOO
+02:     bool "foo"
+03:     depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+04:     select BR2_PACKAGE_HOST_CARGO
+05:     help
+06:       This is a comment that explains what foo is.
+07:
+08:       http://foosoftware.org/foo/</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_cargo_based_package_8217_s_literal_mk_literal_file"></a>17.16.2. Cargo-based package’s <code class="literal">.mk</code> file</h3></div></div></div><p>Buildroot does not (yet) provide a dedicated package infrastructure for
+Cargo-based packages. So, we will explain how to write a <code class="literal">.mk</code> file for such a
+package. Let’s start with an example:</p><pre class="screen">01: ################################################################################
+02: #
+03: # foo
+04: #
+05: ################################################################################
+06:
+07: FOO_VERSION = 1.0
+08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+09: FOO_SITE = http://www.foosoftware.org/download
+10: FOO_LICENSE = GPL-3.0+
+11: FOO_LICENSE_FILES = COPYING
+12:
+13: FOO_DEPENDENCIES = host-cargo
+14:
+15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
+16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release)
+17:
+18: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE)
+19:
+20: FOO_CARGO_OPTS = \
+21:   --$(FOO_CARGO_MODE) \
+22:     --target=$(RUSTC_TARGET_NAME) \
+23:     --manifest-path=$(@D)/Cargo.toml
+24:
+25: define FOO_BUILD_CMDS
+26:     $(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \
+27:             cargo build $(FOO_CARGO_OPTS)
+28: endef
+29:
+30: define FOO_INSTALL_TARGET_CMDS
+31:     $(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \
+32:             $(TARGET_DIR)/usr/bin/foo
+33: endef
+34:
+35: $(eval $(generic-package))</pre><p>The Makefile starts with the definition of the standard variables for package
+declaration (lines 7 to 11).</p><p>As seen in line 35, it is based on the
+<a class="link" href="#generic-package-tutorial" title="17.5.1. generic-package tutorial"><code class="literal">generic-package</code> infrastructure</a>
+<a class="xref" href="#generic-package-tutorial" title="17.5.1. generic-package tutorial">Section 17.5.1, “<code class="literal">generic-package</code> tutorial”</a>. So, it defines
+the variables required by this particular infrastructure, where Cargo is
+invoked:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<code class="literal">FOO_BUILD_CMDS</code>: Cargo is invoked to perform the build. The options required
+  to configure the cross-compilation of the package are passed via
+  <code class="literal">FOO_CONF_OPTS</code>.
+</li><li class="listitem">
+<code class="literal">FOO_INSTALL_TARGET_CMDS</code>: The binary executable generated is installed on
+  the target.
+</li></ul></div><p>In order to have Cargo available for the build, <code class="literal">FOO_DEPENDENCIES</code> needs to
+contain <code class="literal">host-cargo</code>.</p><p>To sum it up, to add a new Cargo-based package, the Makefile example can be
+copied verbatim then edited to replace all occurences of <code class="literal">FOO</code> with the
+uppercase name of the new package and update the values of the standard
+variables.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_about_dependencies_management"></a>17.16.3. About Dependencies Management</h3></div></div></div><p>A crate can depend on other libraries from crates.io or git repositories, listed
+in its Cargo.toml file. Before starting a build, Cargo usually downloads
+automatically them. This step can also be performed independently, via the
+<code class="literal">cargo fetch</code> command.</p><p>Cargo maintains a local cache of the registry index and of git checkouts of the
+crates, whose location is given by <code class="literal">$CARGO_HOME</code>. As seen in the package
+Makefile example at line 15, this environment variable is set to
+<code class="literal">$(HOST_DIR)/share/cargo</code>.</p><p>This dependency download mechanism is not convenient when performing an offline
+build, as Cargo will fail to fetch the dependencies. In that case, it is advised
+to generate a tarball of the dependencies using the <code class="literal">cargo vendor</code> and add it to
+<code class="literal">FOO_EXTRA_DOWNLOADS</code>.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_packages_building_kernel_modules"></a>17.17. Infrastructure for packages building kernel modules</h2></div></div></div><p>Buildroot offers a helper infrastructure to make it easy to write packages that
 build and install Linux kernel modules. Some packages only contain a kernel
 module, other packages contain programs and libraries in addition to kernel
-modules. Buildroot’s helper infrastructure supports either case.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="kernel-module-tutorial"></a>17.15.1. <code class="literal">kernel-module</code> tutorial</h3></div></div></div><p>Let’s start with an example on how to prepare a simple package that only
+modules. Buildroot’s helper infrastructure supports either case.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="kernel-module-tutorial"></a>17.17.1. <code class="literal">kernel-module</code> tutorial</h3></div></div></div><p>Let’s start with an example on how to prepare a simple package that only
 builds a kernel module, and no other component:</p><pre class="screen">01: ################################################################################
 02: #
 03: # foo
@@ -3838,7 +3973,7 @@ builds a kernel module, and no other component:</p><pre class="screen">01: #####
 07: FOO_VERSION = 1.2.3
 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
 09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
 11: FOO_LICENSE_FILES = COPYING
 12:
 13: $(eval $(kernel-module))
@@ -3862,7 +3997,7 @@ not sufficient; another package infrastructure <span class="strong"><strong>must
 07: FOO_VERSION = 1.2.3
 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
 09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
 11: FOO_LICENSE_FILES = COPYING
 12:
 13: FOO_MODULE_SUBDIRS = driver/base
@@ -3881,7 +4016,7 @@ not sufficient; another package infrastructure <span class="strong"><strong>must
 the kernel module located in sub-directory <code class="literal">driver/base</code> and, if libbar
 is enabled, the kernel module located in sub-directory <code class="literal">driver/bar</code>, and
 defines the variable <code class="literal">KVERSION</code> to be passed to the Linux buildsystem
-when building the module(s).</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="kernel-module-reference"></a>17.15.2. <code class="literal">kernel-module</code> reference</h3></div></div></div><p>The main macro for the  kernel module infrastructure is <code class="literal">kernel-module</code>.
+when building the module(s).</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="kernel-module-reference"></a>17.17.2. <code class="literal">kernel-module</code> reference</h3></div></div></div><p>The main macro for the  kernel module infrastructure is <code class="literal">kernel-module</code>.
 Unlike other package infrastructures, it is not stand-alone, and requires
 any of the other <code class="literal">*-package</code> macros be called after it.</p><p>The <code class="literal">kernel-module</code> macro defines post-build and post-target-install
 hooks to build the kernel modules. If the package’s <code class="literal">.mk</code> needs access
@@ -3917,7 +4052,7 @@ configure the build of the kernel module:</p><div class="itemizedlist"><ul class
 </li><li class="listitem">
 <code class="literal">KERNEL_ARCH</code> contains the name of the current architecture, like <code class="literal">arm</code>,
    <code class="literal">mips</code>…
-</li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_asciidoc_documents"></a>17.16. Infrastructure for asciidoc documents</h2></div></div></div><p><a id="asciidoc-documents-tutorial"></a>The Buildroot manual, which you are currently reading, is entirely written
+</li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_infrastructure_for_asciidoc_documents"></a>17.18. Infrastructure for asciidoc documents</h2></div></div></div><p><a id="asciidoc-documents-tutorial"></a>The Buildroot manual, which you are currently reading, is entirely written
 using the <a class="ulink" href="http://asciidoc.org/" target="_top">AsciiDoc</a> mark-up syntax. The manual is then
 rendered to many formats:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 html
@@ -3935,7 +4070,7 @@ AsciiDoc syntax.</p><p>Also as for packages, the AsciiDoc infrastructure is avai
 <a class="link" href="#outside-br-custom" title="9.2. Keeping customizations outside of Buildroot">br2-external tree</a>
 <a class="xref" href="#outside-br-custom" title="9.2. Keeping customizations outside of Buildroot">Section 9.2, “Keeping customizations outside of Buildroot”</a>. This allows documentation for
 a br2-external tree to match the Buildroot documentation, as it will be
-rendered to the same formats and use the same layout and theme.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_literal_asciidoc_document_literal_tutorial"></a>17.16.1. <code class="literal">asciidoc-document</code> tutorial</h3></div></div></div><p>Whereas package infrastructures are suffixed with <code class="literal">-package</code>, the document
+rendered to the same formats and use the same layout and theme.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_literal_asciidoc_document_literal_tutorial"></a>17.18.1. <code class="literal">asciidoc-document</code> tutorial</h3></div></div></div><p>Whereas package infrastructures are suffixed with <code class="literal">-package</code>, the document
 infrastructures are suffixed with <code class="literal">-document</code>. So, the AsciiDoc infrastructure
 is named <code class="literal">asciidoc-document</code>.</p><p>Here is an example to render a simple AsciiDoc document.</p><pre class="screen">01: ################################################################################
 02: #
@@ -3949,7 +4084,7 @@ Currently, it is expected that the document’s sources are only local;
 Buildroot will not attempt to download anything to render a document.
 Thus, you must indicate where the sources are. Usually, the string
 above is sufficient for a document with no sub-directory structure.</p><p>On line 8, we call the <code class="literal">asciidoc-document</code> function, which generates all
-the Makefile code necessary to render the document.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_literal_asciidoc_document_literal_reference"></a>17.16.2. <code class="literal">asciidoc-document</code> reference</h3></div></div></div><p>The list of variables that can be set in a <code class="literal">.mk</code> file to give metadata
+the Makefile code necessary to render the document.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_literal_asciidoc_document_literal_reference"></a>17.18.2. <code class="literal">asciidoc-document</code> reference</h3></div></div></div><p>The list of variables that can be set in a <code class="literal">.mk</code> file to give metadata
 information is (assuming the document name is <code class="literal">foo</code>) :</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 <code class="literal">FOO_SOURCES</code>, mandatory, defines the source files for the document.
 </li><li class="listitem">
@@ -3961,7 +4096,7 @@ information is (assuming the document name is <code class="literal">foo</code>)
   host-packages) that must be built before building this document.
   If a hook of your document needs to access the <span class="emphasis"><em>Kconfig</em></span> structure,
   you may add <code class="literal">prepare-kconfig</code> to the list of dependencies.
-</li></ul></div><p>There are also additional hooks (see <a class="xref" href="#hooks" title="17.18. Hooks available in the various build steps">Section 17.18, “Hooks available in the various build steps”</a> for general information
+</li></ul></div><p>There are also additional hooks (see <a class="xref" href="#hooks" title="17.20. Hooks available in the various build steps">Section 17.20, “Hooks available in the various build steps”</a> for general information
 on hooks), that a document may set to define extra actions to be done at
 various steps:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 <code class="literal">FOO_POST_RSYNC_HOOKS</code> to run additional commands after the sources
@@ -4008,8 +4143,8 @@ various steps:</p><div class="itemizedlist"><ul class="itemizedlist" style="list
 28: endef
 29: FOO_CHECK_DEPENDENCIES_PDF_HOOKS += FOO_CHECK_MY_OTHER_PROG
 30:
-31: $(eval $(call asciidoc-document))</pre></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="linux-kernel-specific-infra"></a>17.17. Infrastructure specific to the Linux kernel package</h2></div></div></div><p>The Linux kernel package can use some specific infrastructures based on package
-hooks for building Linux kernel tools or/and building Linux kernel extensions.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="linux-kernel-tools"></a>17.17.1. linux-kernel-tools</h3></div></div></div><p>Buildroot offers a helper infrastructure to build some userspace tools
+31: $(eval $(call asciidoc-document))</pre></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="linux-kernel-specific-infra"></a>17.19. Infrastructure specific to the Linux kernel package</h2></div></div></div><p>The Linux kernel package can use some specific infrastructures based on package
+hooks for building Linux kernel tools or/and building Linux kernel extensions.</p><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="linux-kernel-tools"></a>17.19.1. linux-kernel-tools</h3></div></div></div><p>Buildroot offers a helper infrastructure to build some userspace tools
 for the target available within the Linux kernel sources. Since their
 source code is part of the kernel source code, a special package,
 <code class="literal">linux-tools</code>, exists and re-uses the sources of the Linux kernel that
@@ -4026,8 +4161,8 @@ displayed in the configuration tool. It would basically look like:</p><pre class
 07:       http://foosoftware.org/foo/</pre><p>The name of the option starts with the prefix <code class="literal">BR2_PACKAGE_LINUX_TOOLS_</code>,
 followed by the uppercase name of the tool (like is done for packages).</p><p><strong>Note. </strong>Unlike other packages, the <code class="literal">linux-tools</code> package options appear in the
 <code class="literal">linux</code> kernel menu, under the <code class="literal">Linux Kernel Tools</code> sub-menu, not under
-the <code class="literal">Target packages</code> main menu.</p><p>Then for each linux tool, add a new <code class="literal">.mk</code> file named
-<code class="literal">package/linux-tools/linux-tool-foo.mk</code>. It would basically look like:</p><pre class="screen">01: ################################################################################
+the <code class="literal">Target packages</code> main menu.</p><p>Then for each linux tool, add a new <code class="literal">.mk.in</code> file named
+<code class="literal">package/linux-tools/linux-tool-foo.mk.in</code>. It would basically look like:</p><pre class="screen">01: ################################################################################
 02: #
 03: # foo
 04: #
@@ -4061,7 +4196,7 @@ different steps of the Linux tool build process like for a
 used only when the <code class="literal">foo</code> tool is selected. The only supported commands are
 <code class="literal">_BUILD_CMDS</code>, <code class="literal">_INSTALL_STAGING_CMDS</code> and <code class="literal">_INSTALL_TARGET_CMDS</code>.</p><p><strong>Note. </strong>One <span class="strong"><strong>must not</strong></span> call <code class="literal">$(eval $(generic-package))</code> or any other
 package infrastructure! Linux tools are not packages by themselves,
-they are part of the <code class="literal">linux-tools</code> package.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="linux-kernel-ext"></a>17.17.2. linux-kernel-extensions</h3></div></div></div><p>Some packages provide new features that require the Linux kernel tree
+they are part of the <code class="literal">linux-tools</code> package.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="linux-kernel-ext"></a>17.19.2. linux-kernel-extensions</h3></div></div></div><p>Some packages provide new features that require the Linux kernel tree
 to be modified. This can be in the form of patches to be applied on
 the kernel tree, or in the form of new files to be added to the
 tree. The Buildroot’s Linux kernel extensions infrastructure provides
@@ -4099,7 +4234,7 @@ use the variables defined by the <code class="literal">foo</code> package, like:
 <code class="literal">$(FOO_VERSION)</code>… as well as all the Linux variables, like:
 <code class="literal">$(LINUX_VERSION)</code> or <code class="literal">$(LINUX_VERSION_PROBED)</code>, <code class="literal">$(KERNEL_ARCH)</code>…
 See the <a class="link" href="#kernel-variables">definition of those kernel variables</a>
-<a class="xref" href="#kernel-variables">Section 17.15.2, “<code class="literal">kernel-module</code> reference”</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="hooks"></a>17.18. Hooks available in the various build steps</h2></div></div></div><p>The generic infrastructure (and as a result also the derived autotools
+<a class="xref" href="#kernel-variables">Section 17.17.2, “<code class="literal">kernel-module</code> reference”</a>.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="hooks"></a>17.20. Hooks available in the various build steps</h2></div></div></div><p>The generic infrastructure (and as a result also the derived autotools
 and cmake infrastructures) allow packages to specify hooks.
 These define further actions to perform after existing steps.
 Most hooks aren’t really useful for generic packages, since the <code class="literal">.mk</code>
@@ -4155,7 +4290,7 @@ registered at a given hook point. Here is an example:</p><pre class="screen">def
         action2
 endef
 
-LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP</pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="hooks-rsync"></a>17.18.1. Using the <code class="literal">POST_RSYNC</code> hook</h3></div></div></div><p>The <code class="literal">POST_RSYNC</code> hook is run only for packages that use a local source,
+LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP</pre><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="hooks-rsync"></a>17.20.1. Using the <code class="literal">POST_RSYNC</code> hook</h3></div></div></div><p>The <code class="literal">POST_RSYNC</code> hook is run only for packages that use a local source,
 either through the <code class="literal">local</code> site method or the <code class="literal">OVERRIDE_SRCDIR</code>
 mechanism. In this case, package sources are copied using <code class="literal">rsync</code> from
 the local location into the buildroot build directory. The <code class="literal">rsync</code>
@@ -4170,49 +4305,56 @@ others, use the following variables:</p><div class="itemizedlist"><ul class="ite
 <code class="literal">$(SRCDIR)</code>: the path to the overridden source directory
 </li><li class="listitem">
 <code class="literal">$(@D)</code>: the path to the build directory
-</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_target_finalize_hook"></a>17.18.2. Target-finalize hook</h3></div></div></div><p>Packages may also register hooks in <code class="literal">LIBFOO_TARGET_FINALIZE_HOOKS</code>.
+</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_target_finalize_hook"></a>17.20.2. Target-finalize hook</h3></div></div></div><p>Packages may also register hooks in <code class="literal">LIBFOO_TARGET_FINALIZE_HOOKS</code>.
 These hooks are run after all packages are built, but before the
 filesystem images are generated. They are seldom used, and your
-package probably do not need them.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_gettext_integration_and_interaction_with_packages"></a>17.19. Gettext integration and interaction with packages</h2></div></div></div><p>Many packages that support internationalization use the gettext
+package probably do not need them.</p></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_gettext_integration_and_interaction_with_packages"></a>17.21. Gettext integration and interaction with packages</h2></div></div></div><p>Many packages that support internationalization use the gettext
 library. Dependencies for this library are fairly complicated and
-therefore, deserve some explanation.</p><p>The <span class="emphasis"><em>uClibc</em></span> C library doesn’t implement gettext functionality;
-therefore with this C library, a separate gettext must be compiled,
-which is provided by the additional <code class="literal">libintl</code> library, part of the
-<code class="literal">gettext</code> package.</p><p>On the other hand, the <span class="emphasis"><em>glibc</em></span> C library does integrate its own
-gettext library functions, so it is not necessary to build a separate
-<code class="literal">libintl</code> library.</p><p>However, certain packages need some gettext utilities on the target,
+therefore, deserve some explanation.</p><p>The <span class="emphasis"><em>glibc</em></span> C library integrates a full-blown implementation of
+<span class="emphasis"><em>gettext</em></span>, supporting translation. Native Language Support is
+therefore built-in in <span class="emphasis"><em>glibc</em></span>.</p><p>On the other hand, the <span class="emphasis"><em>uClibc</em></span> and <span class="emphasis"><em>musl</em></span> C libraries only provide a
+stub implementation of the gettext functionality, which allows to
+compile libraries and programs using gettext functions, but without
+providing the translation capabilities of a full-blown gettext
+implementation. With such C libraries, if real Native Language Support
+is necessary, it can be provided by the <code class="literal">libintl</code> library of the
+<code class="literal">gettext</code> package.</p><p>Due to this, and in order to make sure that Native Language Support is
+properly handled, packages in Buildroot that can use NLS support
+should:</p><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem">
+Ensure NLS support is enabled when <code class="literal">BR2_SYSTEM_ENABLE_NLS=y</code>. This
+   is done automatically for <span class="emphasis"><em>autotools</em></span> packages and therefore should
+   only be done for packages using other package infrastructures.
+</li><li class="listitem">
+Add <code class="literal">$(TARGET_NLS_DEPENDENCIES)</code> to the package
+   <code class="literal">&lt;pkg&gt;_DEPENDENCIES</code> variable. This addition should be done
+   unconditionally: the value of this variable is automatically
+   adjusted by the core infrastructure to contain the relevant list of
+   packages. If NLS support is disabled, this variable is empty. If
+   NLS support is enabled, this variable contains <code class="literal">host-gettext</code> so
+   that tools needed to compile translation files are available on the
+   host. In addition, if <span class="emphasis"><em>uClibc</em></span> or <span class="emphasis"><em>musl</em></span> are used, this variable
+   also contains <code class="literal">gettext</code> in order to get the full-blown <span class="emphasis"><em>gettext</em></span>
+   implementation.
+</li><li class="listitem">
+If needed, add <code class="literal">$(TARGET_NLS_LIBS)</code> to the linker flags, so that
+   the package gets linked with <code class="literal">libintl</code>. This is generally not
+   needed with <span class="emphasis"><em>autotools</em></span> packages as they usually detect
+   automatically that they should link with <code class="literal">libintl</code>. However,
+   packages using other build systems, or problematic autotools-based
+   packages may need this. <code class="literal">$(TARGET_NLS_LIBS)</code> should be added
+   unconditionally to the linker flags, as the core automatically
+   makes it empty or defined to <code class="literal">-lintl</code> depending on the
+   configuration.
+</li></ol></div><p>No changes should be made to the <code class="literal">Config.in</code> file to support NLS.</p><p>Finally, certain packages need some gettext utilities on the target,
 such as the <code class="literal">gettext</code> program itself, which allows to retrieve
-translated strings, from the command line.</p><p>Additionally, some packages (such as <code class="literal">libglib2</code>) do require gettext
-functions unconditionally, while other packages (in general, those who
-support <code class="literal">--disable-nls</code>) only require gettext functions when locale
-support is enabled.</p><p>Therefore, Buildroot defines two configuration options:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<code class="literal">BR2_NEEDS_GETTEXT</code>, which is true as soon as the toolchain doesn’t
-  provide its own gettext implementation
-</li><li class="listitem">
-<code class="literal">BR2_NEEDS_GETTEXT_IF_LOCALE</code>, which is true if the toolchain
-  doesn’t provide its own gettext implementation and if locale support
-  is enabled
-</li></ul></div><p>Packages that need gettext only when locale support is enabled should:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-use <code class="literal">select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE</code> in the
-  <code class="literal">Config.in</code> file;
-</li><li class="listitem">
-use <code class="literal">$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)</code> in the package
-  <code class="literal">DEPENDENCIES</code> variable in the <code class="literal">.mk</code> file.
-</li></ul></div><p>Packages that unconditionally need gettext (which should be very rare)
+translated strings, from the command line. In such a case, the package
 should:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-use <code class="literal">select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT</code> in the <code class="literal">Config.in</code>
-  file;
-</li><li class="listitem">
-use <code class="literal">$(if $(BR2_NEEDS_GETTEXT),gettext)</code> in the package
-  <code class="literal">DEPENDENCIES</code> variable in the <code class="literal">.mk</code> file.
-</li></ul></div><p>Packages that need the <code class="literal">gettext</code> utilities on the target (should be
-rare) should:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 use <code class="literal">select BR2_PACKAGE_GETTEXT</code> in their <code class="literal">Config.in</code> file,
   indicating in a comment above that it’s a runtime dependency only.
 </li><li class="listitem">
 not add any <code class="literal">gettext</code> dependency in the <code class="literal">DEPENDENCIES</code> variable of
   their <code class="literal">.mk</code> file.
-</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_tips_and_tricks"></a>17.20. Tips and tricks</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="package-name-variable-relation"></a>17.20.1. Package name, config entry name and makefile variable relationship</h3></div></div></div><p>In Buildroot, there is some relationship between:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_tips_and_tricks"></a>17.22. Tips and tricks</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="package-name-variable-relation"></a>17.22.1. Package name, config entry name and makefile variable relationship</h3></div></div></div><p>In Buildroot, there is some relationship between:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 the <span class="emphasis"><em>package name</em></span>, which is the package directory name (and the
   name of the <code class="literal">*.mk</code> file);
 </li><li class="listitem">
@@ -4234,7 +4376,64 @@ the config entry is the upper case <span class="emphasis"><em>package name</em><
 the <code class="literal">*.mk</code> file variable prefix is the upper case <span class="emphasis"><em>package name</em></span>
   with <code class="literal">.</code> and <code class="literal">-</code> characters substituted with <code class="literal">_</code> (e.g.:
   <code class="literal">FOO_BAR_BOO_VERSION</code>).
-</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="github-download-url"></a>17.20.2. How to add a package from GitHub</h3></div></div></div><p>Packages on GitHub often don’t have a download area with release tarballs.
+</li></ul></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="testing-package"></a>17.22.2. How to test your package</h3></div></div></div><p>Once you have added your new package, it is important that you test it
+under various conditions: does it build for all architectures? Does it
+build with the different C libraries? Does it need threads, NPTL? And
+so on…</p><p>Buildroot runs <a class="ulink" href="http://autobuild.buildroot.org/" target="_top">autobuilders</a> which
+continuously test random configurations. However, these only build the
+<code class="literal">master</code> branch of the git tree, and your new fancy package is not yet
+there.</p><p>Buildroot provides a script in <code class="literal">utils/test-pkg</code> that uses the same base
+configurations as used by the autobuilders so you can test your package
+in the same conditions.</p><p>First, create a config snippet that contains all the necessary options
+needed to enable your package, but without any architecture or toolchain
+option. For example, let’s create a config snippet that just enables
+<code class="literal">libcurl</code>, without any TLS backend:</p><pre class="screen">$ cat libcurl.config
+BR2_PACKAGE_LIBCURL=y</pre><p>If your package needs more configuration options, you can add them to the
+config snippet. For example, here’s how you would test <code class="literal">libcurl</code> with
+<code class="literal">openssl</code> as a TLS backend and the <code class="literal">curl</code> program:</p><pre class="screen">$ cat libcurl.config
+BR2_PACKAGE_LIBCURL=y
+BR2_PACKAGE_CURL=y
+BR2_PACKAGE_OPENSSL=y</pre><p>Then run the <code class="literal">test-pkg</code> script, by telling it what config snippet to use
+and what package to test:</p><pre class="screen">$ ./utils/test-pkg -c libcurl.config -p libcurl</pre><p>This will try to build your package against all the toolchains used
+by the autobuilders (except for the internal toolchains, because it takes
+too long to do so). The output lists all toolchains and the corresponding
+result (excerpt, results are fake):</p><pre class="screen">$ ./utils/test-pkg -c libcurl.config -p libcurl
+                armv5-ctng-linux-gnueabi [ 1/11]: OK
+              armv7-ctng-linux-gnueabihf [ 2/11]: OK
+                        br-aarch64-glibc [ 3/11]: SKIPPED
+                           br-arcle-hs38 [ 4/11]: SKIPPED
+                            br-arm-basic [ 5/11]: FAILED
+                  br-arm-cortex-a9-glibc [ 6/11]: OK
+                   br-arm-cortex-a9-musl [ 7/11]: FAILED
+                   br-arm-cortex-m4-full [ 8/11]: OK
+                             br-arm-full [ 9/11]: OK
+                    br-arm-full-nothread [10/11]: FAILED
+                      br-arm-full-static [11/11]: OK
+11 builds, 2 skipped, 2 build failed, 1 legal-info failed</pre><p>The results mean:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<code class="literal">OK</code>: the build was successful.
+</li><li class="listitem">
+<code class="literal">SKIPPED</code>: one or more configuration options listed in the config
+  snippet were not present in the final configuration. This is due to
+  options having dependencies not satisfied by the toolchain, such as
+  for example a package that <code class="literal">depends on BR2_USE_MMU</code> with a noMMU
+  toolchain. The missing options are reported in <code class="literal">missing.config</code> in
+  the output build directory (<code class="literal">~/br-test-pkg/TOOLCHAIN_NAME/</code> by
+  default).
+</li><li class="listitem"><p class="simpara">
+<code class="literal">FAILED</code>: the build failed. Inspect the <code class="literal">logfile</code> file in the output
+  build  directory to see what went wrong:
+</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem">
+the actual build failed,
+</li><li class="listitem">
+the legal-info failed,
+</li><li class="listitem">
+one of the preliminary steps (downloading the config file, applying
+   the configuration, running <code class="literal">dirclean</code> for the package) failed.
+</li></ul></div></li></ul></div><p>When there are failures, you can just re-run the script with the same
+options (after you fixed your package); the script will attempt to
+re-build the package specified with <code class="literal">-p</code> for all toolchains, without
+the need to re-build all the dependencies of that package.</p><p>The <code class="literal">test-pkg</code> script accepts a few options, for which you can get some
+help by running:</p><pre class="screen">$ ./utils/test-pkg -h</pre></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="github-download-url"></a>17.22.3. How to add a package from GitHub</h3></div></div></div><p>Packages on GitHub often don’t have a download area with release tarballs.
 However, it is possible to download tarballs directly from the repository
 on GitHub. As GitHub is known to have changed download mechanisms in the
 past, the <span class="emphasis"><em>github</em></span> helper function should be used as shown below.</p><pre class="screen"># Use a tag or a full commit ID
@@ -4261,7 +4460,7 @@ If it looks like the image above then it was uploaded by the
 On the other hand, if there’s is <span class="strong"><strong>only</strong></span> the "Source code" link, then
   it’s an automatically generated tarball and you should use the
   <span class="emphasis"><em>github</em></span> helper function.
-</li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_conclusion"></a>17.21. Conclusion</h2></div></div></div><p>As you can see, adding a software package to Buildroot is simply a
+</li></ul></div></div></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_conclusion"></a>17.23. Conclusion</h2></div></div></div><p>As you can see, adding a software package to Buildroot is simply a
 matter of writing a Makefile using an existing example and modifying it
 according to the compilation process required by the package.</p><p>If you package software that might be useful for other people, don’t
 forget to send a patch to the Buildroot mailing list (see
@@ -4271,9 +4470,12 @@ Buildroot.</p><p>Buildroot offers an infrastructure to automatically handle this
 the builds. It supports three ways of applying patch sets: downloaded patches,
 patches supplied within buildroot and patches located in a user-defined
 global patch directory.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_providing_patches"></a>18.1. Providing patches</h2></div></div></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_downloaded"></a>18.1.1. Downloaded</h3></div></div></div><p>If it is necessary to apply a patch that is available for download, then add it
-to the <code class="literal">&lt;packagename&gt;_PATCH</code> variable. It is downloaded from the same site
-as the package itself. It can be a single patch, or a tarball containing a
-patch series.</p><p>This method is typically used for packages from Debian.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_within_buildroot"></a>18.1.2. Within Buildroot</h3></div></div></div><p>Most patches are provided within Buildroot, in the package
+to the <code class="literal">&lt;packagename&gt;_PATCH</code> variable. If an entry contains <code class="literal">://</code>,
+then Buildroot will assume it is a full URL and download the patch
+from this location. Otherwise, Buildroot will assume that the patch should be
+downloaded from <code class="literal">&lt;packagename&gt;_SITE</code>. It can be a single patch,
+or a tarball containing a patch series.</p><p>Like for all downloads, a hash should be added to the <code class="literal">&lt;packagename&gt;.hash</code>
+file.</p><p>This method is typically used for packages from Debian.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_within_buildroot"></a>18.1.2. Within Buildroot</h3></div></div></div><p>Most patches are provided within Buildroot, in the package
 directory; these typically aim to fix cross-compilation, libc support,
 or other such issues.</p><p>These patch files should be named <code class="literal">&lt;number&gt;-&lt;description&gt;.patch</code>.</p><div class="itemizedlist"><p class="title"><strong>Notes</strong></p><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 The patch files coming with Buildroot should not contain any package version
@@ -4323,7 +4525,7 @@ If <code class="literal">BR2_GLOBAL_PATCH_DIR</code> is defined, the directories
 </li><li class="listitem">
 Run the <code class="literal">&lt;packagename&gt;_POST_PATCH_HOOKS</code> commands if defined.
 </li></ol></div><p>If something goes wrong in the steps <span class="emphasis"><em>3</em></span> or <span class="emphasis"><em>4</em></span>, then the build fails.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="_format_and_licensing_of_the_package_patches"></a>18.3. Format and licensing of the package patches</h2></div></div></div><p>Patches are released under the same license as the software they apply
-to (see <a class="xref" href="#legal-info-buildroot" title="12.3. Complying with the Buildroot license">Section 12.3, “Complying with the Buildroot license”</a>).</p><p>A message explaining what the patch does, and why it is needed, should
+to (see <a class="xref" href="#legal-info-buildroot" title="12.2. Complying with the Buildroot license">Section 12.2, “Complying with the Buildroot license”</a>).</p><p>A message explaining what the patch does, and why it is needed, should
 be added in the header commentary of the patch.</p><p>You should add a <code class="literal">Signed-off-by</code> statement in the header of the each
 patch to help with keeping track of the changes and to certify that the
 patch is released under the same license as the software that is modified.</p><p>If the software is under version control, it is recommended to use the
@@ -4551,7 +4753,7 @@ Git book</a>. Sometimes, it is even easier to discard you history with
 <code class="literal">Signed-off-by: Your Real Name &lt;<a class="ulink" href="mailto:your@email.address" target="_top">your@email.address</a>&gt;</code> at the end of the
 commit message. <code class="literal">git commit -s</code> does that for you, if configured
 properly. The <code class="literal">Signed-off-by</code> tag means that you publish the patch
-under the Buildroot license (i.e. GPLv2, except for package patches,
+under the Buildroot license (i.e. GPL-2.0+, except for package patches,
 which have the upstream license), and that you are allowed to do so.
 See <a class="ulink" href="http://developercertificate.org/" target="_top">the Developer Certificate of
 Origin</a> for details.</p><p>When adding new packages, you should submit every package in a
@@ -4578,10 +4780,10 @@ removed, preferably with the upstream commit ID. Also any other
 required changes should be explained explicitly, like configure
 options that no longer exist or are no longer needed.</p><p>If you are interested in getting notified of build failures and of
 further changes in the packages you added or modified, please add
-yourself to the DEVELOPERS file. This should be done in a separate
-patch of the series. See <a class="link" href="#DEVELOPERS" title="Chapter 22. DEVELOPERS file and get-developers">the DEVELOPERS file</a>
-<a class="xref" href="#DEVELOPERS" title="Chapter 22. DEVELOPERS file and get-developers">Chapter 22, <em>DEVELOPERS file and get-developers</em></a> for more
-information.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_preparing_a_patch_series"></a>21.5.2. Preparing a patch series</h3></div></div></div><p>Starting from the changes committed in your local git view, <span class="emphasis"><em>rebase</em></span>
+yourself to the DEVELOPERS file. This should be done in the same patch
+creating or modifying the package. See <a class="link" href="#DEVELOPERS" title="Chapter 22. DEVELOPERS file and get-developers">the DEVELOPERS file</a>
+<a class="xref" href="#DEVELOPERS" title="Chapter 22. DEVELOPERS file and get-developers">Chapter 22, <em>DEVELOPERS file and get-developers</em></a>
+for more information.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_preparing_a_patch_series"></a>21.5.2. Preparing a patch series</h3></div></div></div><p>Starting from the changes committed in your local git view, <span class="emphasis"><em>rebase</em></span>
 your development branch on top of the upstream tree before generating
 a patch set. To do so, run:</p><pre class="screen">$ git fetch --all --tags
 $ git rebase origin/master</pre><p>Now, you are ready to generate then submit your patch set.</p><p>To generate it, run:</p><pre class="screen">$ git format-patch -M -n -s -o outgoing origin/master</pre><p>This will generate patch files in the <code class="literal">outgoing</code> subdirectory,
@@ -4589,7 +4791,7 @@ automatically adding the <code class="literal">Signed-off-by</code> line.</p><p>
 before submitting them, using your favorite text editor.</p><p>Buildroot provides a handy tool to know to whom your patches should be
 sent, called <code class="literal">get-developers</code> (see <a class="xref" href="#DEVELOPERS" title="Chapter 22. DEVELOPERS file and get-developers">Chapter 22, <em>DEVELOPERS file and get-developers</em></a> for more
 information). This tool reads your patches and outputs the appropriate
-<code class="literal">git send-email</code> command to use:</p><pre class="screen">$ ./support/scripts/get-developers outgoing/*</pre><p>Use the output of <code class="literal">get-developers</code> to send your patches:</p><pre class="screen">$ git send-email --to buildroot@buildroot.org --cc bob --cc alice outgoing/*</pre><p>Note that <code class="literal">git</code> should be configured to use your mail account.
+<code class="literal">git send-email</code> command to use:</p><pre class="screen">$ ./utils/get-developers outgoing/*</pre><p>Use the output of <code class="literal">get-developers</code> to send your patches:</p><pre class="screen">$ git send-email --to buildroot@buildroot.org --cc bob --cc alice outgoing/*</pre><p>Note that <code class="literal">git</code> should be configured to use your mail account.
 To configure <code class="literal">git</code>, see <code class="literal">man git-send-email</code> or google it.</p><p>If you do not use <code class="literal">git send-email</code>, make sure posted <span class="strong"><strong>patches are not
 line-wrapped</strong></span>, otherwise they cannot easily be applied. In such a case,
 fix your e-mail client, or better yet, learn to use <code class="literal">git send-email</code>.</p></div><div class="section"><div class="titlepage"><div><div><h3 class="title"><a id="_cover_letter"></a>21.5.3. Cover letter</h3></div></div></div><p>If you want to present the whole patch set in a separate mail, add
@@ -4601,7 +4803,7 @@ large number of commits in the series;
 </li><li class="listitem">
 deep impact of the changes in the rest of the project;
 </li><li class="listitem">
-RFC <a href="#ftn.idm45919733192272" class="footnote" id="idm45919733192272"><sup class="footnote">[4]</sup></a>;
+RFC <a href="#ftn.idm45849083614640" class="footnote" id="idm45849083614640"><sup class="footnote">[4]</sup></a>;
 </li><li class="listitem">
 whenever you feel it will help presenting your work, your choices,
   the review process, etc.
@@ -4683,7 +4885,7 @@ pastebin service. Note that not all available pastebin services will
 preserve Unix-style line terminators when downloading raw pastes.
 Following pastebin services are known to work correctly:
 - <a class="ulink" href="https://gist.github.com/" target="_top">https://gist.github.com/</a>
-- <a class="ulink" href="http://code.bulix.org/" target="_top">http://code.bulix.org/</a></p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div id="ftn.idm45919733192272" class="footnote"><p><a href="#idm45919733192272" class="simpara"><sup class="simpara">[4] </sup></a>RFC: (Request for comments) change proposal</p></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="DEVELOPERS"></a>Chapter 22. DEVELOPERS file and get-developers</h2></div></div></div><p>The main Buildroot directory contains a file named <code class="literal">DEVELOPERS</code> that
+- <a class="ulink" href="http://code.bulix.org/" target="_top">http://code.bulix.org/</a></p></div><div class="footnotes"><br /><hr style="width:100; text-align:left;margin-left: 0" /><div id="ftn.idm45849083614640" class="footnote"><p><a href="#idm45849083614640" class="simpara"><sup class="simpara">[4] </sup></a>RFC: (Request for comments) change proposal</p></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="DEVELOPERS"></a>Chapter 22. DEVELOPERS file and get-developers</h2></div></div></div><p>The main Buildroot directory contains a file named <code class="literal">DEVELOPERS</code> that
 lists the developers involved with various areas of Buildroot. Thanks
 to this file, the <code class="literal">get-developer</code> tool allows to:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 Calculate the list of developers to whom patches should be sent, by
@@ -4699,7 +4901,7 @@ functionality in Buildroot, to register themselves in the <code class="literal">
 file. As an example, we expect a developer contributing a new package
 to include in his patch the appropriate modification to the
 <code class="literal">DEVELOPERS</code> file.</p><p>The <code class="literal">DEVELOPERS</code> file format is documented in detail inside the file
-itself.</p><p>The <code class="literal">get-developer</code> tool, located in <code class="literal">support/scripts</code> allows to use
+itself.</p><p>The <code class="literal">get-developer</code> tool, located in <code class="literal">utils/</code> allows to use
 the <code class="literal">DEVELOPERS</code> file for various tasks:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 When passing one or several patches as command line argument,
   <code class="literal">get-developer</code> will return the appropriate <code class="literal">git send-email</code>
@@ -4715,6 +4917,9 @@ When using the <code class="literal">-c</code> command line option, <code class=
   at all files under version control in the Buildroot repository, and
   list the ones that are not handled by any developer. The purpose of
   this option is to help completing the <code class="literal">DEVELOPERS</code> file.
+</li><li class="listitem">
+When using without any arguments, it validates the integrity of the
+  DEVELOPERS file and will note WARNINGS for items that don’t match.
 </li></ul></div></div></div><div class="part"><div class="titlepage"><div><div><h1 class="title"><a id="_appendix"></a>Part IV. Appendix</h1></div></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="makedev-syntax"></a>Chapter 23. Makedev syntax documentation</h2></div></div></div><p>The makedev syntax is used in several places in Buildroot to
 define changes to be made for permissions, or which device files to
 create and how to create them, in order to avoid calls to mknod.</p><p>This syntax is derived from the makedev utility, and more complete
@@ -4854,7 +5059,9 @@ main group <code class="literal">gid</code> is computed by Buildroot, and will u
 </li><li class="listitem">
 <code class="literal">comment</code> is: <code class="literal">Test user</code>
 
-</li></ul></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="br2-external-converting"></a>Chapter 25. Converting old br2-external trees</h2></div></div></div><p>Before Buildroot 2016.11, it was possible to use only one br2-external
+</li></ul></div></div><div class="chapter"><div class="titlepage"><div><div><h2 class="title"><a id="migrating-from-ol-versions"></a>Chapter 25. Migrating from older Buildroot versions</h2></div></div></div><p>Some versions have introduced backward incompatibilities. This section
+explains those incompatibilities, and for each explains what to do to
+complete the migration.</p><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="br2-external-converting"></a>25.1. Migrating to 2016.11</h2></div></div></div><p>Before Buildroot 2016.11, it was possible to use only one br2-external
 tree at once. With Buildroot 2016.11 came the possibility to use more
 than one simultaneously (for details, see <a class="xref" href="#outside-br-custom" title="9.2. Keeping customizations outside of Buildroot">Section 9.2, “Keeping customizations outside of Buildroot”</a>).</p><p>This however means that older br2-external trees are not usable as-is.
 A minor change has to be made: adding a name to your br2-external tree.</p><p>This can be done very easily in just a few steps:</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p class="simpara">
@@ -4866,4 +5073,7 @@ with only ASCII characters from the set <code class="literal">[A-Za-z0-9_]</code
 Then, change every occurence of <code class="literal">BR2_EXTERNAL</code> in your br2-external
    tree with the new variable:
 </p><pre class="screen">$ find . -type f | xargs sed -i 's/BR2_EXTERNAL/BR2_EXTERNAL_NAME_OF_YOUR_TREE_PATH/g'</pre></li></ul></div><p>Now, your br2-external tree can be used with Buildroot 2016.11 onward.</p><p><strong>Note: </strong>This change makes your br2-external tree incompatible with Buildroot
-before 2016.11.</p></div></div></div></body></html>
\ No newline at end of file
+before 2016.11.</p></div><div class="section"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="migrating-host-usr"></a>25.2. Migrating to 2017.08</h2></div></div></div><p>Before Buildroot 2017.08, host packages were installed in <code class="literal">$(HOST_DIR)/usr</code>
+(with e.g. the autotools' <code class="literal">--prefix=$(HOST_DIR)/usr</code>). With Buildroot
+2017.08, they are now installed directly in <code class="literal">$(HOST_DIR)</code>.</p><p>Whenever a package installs an executable that is linked with a library
+in <code class="literal">$(HOST_DIR)/lib</code>, it must have an RPATH pointing to that directory.</p><p>An RPATH pointing to <code class="literal">$(HOST_DIR)/usr/lib</code> is no longer accepted.</p></div></div></div></div></body></html>
\ No newline at end of file
diff --git a/bsp/buildroot/docs/manual/manual.pdf b/bsp/buildroot/docs/manual/manual.pdf
index cb588f0c..167521c5 100644
Binary files a/bsp/buildroot/docs/manual/manual.pdf and b/bsp/buildroot/docs/manual/manual.pdf differ
diff --git a/bsp/buildroot/docs/manual/manual.text b/bsp/buildroot/docs/manual/manual.text
index a10dcc1e..9c7c4fb8 100644
--- a/bsp/buildroot/docs/manual/manual.text
+++ b/bsp/buildroot/docs/manual/manual.text
@@ -76,8 +76,7 @@ II. User guide
     12. Legal notice and licensing
 
         12.1. Complying with open source licenses
-        12.2. License abbreviations
-        12.3. Complying with the Buildroot license
+        12.2. Complying with the Buildroot license
 
     13. Beyond Buildroot
 
@@ -92,6 +91,7 @@ III. Developer guide
         15.1. Config.in file
         15.2. The .mk file
         15.3. The documentation
+        15.4. Support scripts
 
     16. Adding support for a particular board
     17. Adding new packages to Buildroot
@@ -111,13 +111,15 @@ III. Developer guide
             configuration files
         17.13. Infrastructure for rebar-based packages
         17.14. Infrastructure for Waf-based packages
-        17.15. Infrastructure for packages building kernel modules
-        17.16. Infrastructure for asciidoc documents
-        17.17. Infrastructure specific to the Linux kernel package
-        17.18. Hooks available in the various build steps
-        17.19. Gettext integration and interaction with packages
-        17.20. Tips and tricks
-        17.21. Conclusion
+        17.15. Integration of Meson-based packages
+        17.16. Integration of Cargo-based packages
+        17.17. Infrastructure for packages building kernel modules
+        17.18. Infrastructure for asciidoc documents
+        17.19. Infrastructure specific to the Linux kernel package
+        17.20. Hooks available in the various build steps
+        17.21. Gettext integration and interaction with packages
+        17.22. Tips and tricks
+        17.23. Conclusion
 
     18. Patching a package
 
@@ -143,7 +145,10 @@ IV. Appendix
 
     23. Makedev syntax documentation
     24. Makeusers syntax documentation
-    25. Converting old br2-external trees
+    25. Migrating from older Buildroot versions
+
+        25.1. Migrating to 2016.11
+        25.2. Migrating to 2017.08
 
 List of Examples
 
@@ -155,13 +160,14 @@ List of Examples
 
 ---------------------------------------------------------------------
 
-Buildroot 2017.02.11 manual generated on 2018-04-12 15:01:53 UTC from
-git revision 8a0e4e865a
+Buildroot 2018.02.6 manual generated on 2018-10-07 07:20:42 UTC from
+git revision 67d61cbef5
 
 The Buildroot manual is written by the Buildroot developers. It is
 licensed under the GNU General Public License, version 2. Refer to
-the COPYING [http://git.buildroot.org/buildroot/tree/COPYING] file in
-the Buildroot sources for the full text of this license.
+the COPYING [http://git.buildroot.org/buildroot/tree/COPYING?id=
+67d61cbef5ff190b803745b332d0f7d7177210fc] file in the Buildroot
+sources for the full text of this license.
 
 Copyright © 2004-2018 The Buildroot developers
 
@@ -228,8 +234,8 @@ vary between distributions).
       + make (version 3.81 or any later)
       + binutils
       + build-essential (only for Debian based systems)
-      + gcc (version 2.95 or any later)
-      + g++ (version 2.95 or any later)
+      + gcc (version 4.4 or any later)
+      + g++ (version 4.4 or any later)
       + bash
       + patch
       + gzip
@@ -558,8 +564,7 @@ Table of Contents
 12. Legal notice and licensing
 
     12.1. Complying with open source licenses
-    12.2. License abbreviations
-    12.3. Complying with the Buildroot license
+    12.2. Complying with the Buildroot license
 
 13. Beyond Buildroot
 
@@ -702,19 +707,17 @@ cross-compilation toolchains. Buildroot knows about a number of
 well-known cross-compilation toolchains (from Linaro [http://
 www.linaro.org] for ARM, Sourcery CodeBench [http://www.mentor.com/
 embedded-software/sourcery-tools/sourcery-codebench/editions/
-lite-edition/] for ARM, x86, x86-64, PowerPC, MIPS and SuperH,
-Blackfin toolchains from Analog Devices [https://blackfin.uclinux.org
-/gf/project/toolchain], etc.) and is capable of downloading them
-automatically, or it can be pointed to a custom toolchain, either
-available for download or installed locally.
+lite-edition/] for ARM, x86-64, PowerPC, and MIPS, and is capable of
+downloading them automatically, or it can be pointed to a custom
+toolchain, either available for download or installed locally.
 
 Then, you have three solutions to use an external toolchain:
 
   * Use a predefined external toolchain profile, and let Buildroot
     download, extract and install the toolchain. Buildroot already
-    knows about a few CodeSourcery, Linaro, Blackfin and Xilinx
-    toolchains. Just select the toolchain profile in Toolchain from
-    the available ones. This is definitely the easiest solution.
+    knows about a few CodeSourcery and Linaro toolchains. Just select
+    the toolchain profile in Toolchain from the available ones. This
+    is definitely the easiest solution.
   * Use a predefined external toolchain profile, but instead of
     having Buildroot download and extract the toolchain, you can tell
     Buildroot where your toolchain is already installed on your
@@ -772,7 +775,6 @@ Advantages of this backend:
   * Avoids the build time of the cross-compilation toolchain, which
     is often very significant in the overall build time of an
     embedded Linux system.
-  * Not limited to uClibc: glibc and eglibc toolchains are supported.
 
 Drawbacks of this backend:
 
@@ -1053,6 +1055,50 @@ Notes. If ccache is enabled, running make clean or distclean does not
 empty the compiler cache used by Buildroot. To delete it, refer to
 Section 8.12.3, “Using ccache in Buildroot”.
 
+Dumping the internal make variables: One can dump all the variables
+known to make, along with their values:
+
+ $ make -s printvars
+ VARIABLE=value_of_variable
+ ...
+
+It is possible to tweak the output using some variables:
+
+  * VARS will limit the listing to variables which names match the
+    specified make-pattern
+  * QUOTED_VARS, if set to YES, will single-quote the value
+  * RAW_VARS, if set to YES, will print the unexpanded value
+
+For example:
+
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES
+ BUSYBOX_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_ALL_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=
+ BUSYBOX_RDEPENDENCIES=ncurses util-linux
+
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES QUOTED_VARS=YES
+ BUSYBOX_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_ALL_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_DEPENDENCIES='skeleton toolchain'
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=''
+ BUSYBOX_RDEPENDENCIES='ncurses util-linux'
+
+ $ make -s printvars VARS=BUSYBOX_%DEPENDENCIES RAW_VARS=YES
+ BUSYBOX_DEPENDENCIES=skeleton toolchain
+ BUSYBOX_FINAL_ALL_DEPENDENCIES=$(sort $(BUSYBOX_FINAL_DEPENDENCIES) $(BUSYBOX_FINAL_PATCH_DEPENDENCIES))
+ BUSYBOX_FINAL_DEPENDENCIES=$(sort $(BUSYBOX_DEPENDENCIES))
+ BUSYBOX_FINAL_PATCH_DEPENDENCIES=$(sort $(BUSYBOX_PATCH_DEPENDENCIES))
+ BUSYBOX_RDEPENDENCIES=ncurses util-linux
+
+The output of quoted variables can be reused in shell scripts, for
+example:
+
+ $ eval $(make -s printvars VARS=BUSYBOX_DEPENDENCIES QUOTED_VARS=YES)
+ $ echo $BUSYBOX_DEPENDENCIES
+ skeleton toolchain
+
 8.2. Understanding when a full rebuild is necessary
 
 Buildroot does not attempt to detect what parts of the system should
@@ -1438,7 +1484,7 @@ script. It takes two file-size-stats.csv files (produced by make
 graph-size) as input. Refer to the help text of this script for more
 details:
 
-support/scripts/size-stats-compare -h
+utils/size-stats-compare -h
 
 8.11. Integration with Eclipse
 
@@ -1477,18 +1523,21 @@ software that are not packaged in Buildroot. In order to do this you
 can use the toolchain that was generated by Buildroot.
 
 The toolchain generated by Buildroot is located by default in output/
-host/. The simplest way to use it is to add output/host/usr/bin/ to
-your PATH environment variable and then to use ARCH-linux-gcc,
+host/. The simplest way to use it is to add output/host/bin/ to your
+PATH environment variable and then to use ARCH-linux-gcc,
 ARCH-linux-objdump, ARCH-linux-ld, etc.
 
-It is possible to relocate the toolchain - but then --sysroot must be
-passed every time the compiler is called to tell where the libraries
-and header files are.
+It is possible to relocate the toolchain, this allows to distribute
+the toolchain to other developers to build applications for your
+target. To achieve this:
 
-It is also possible to generate the Buildroot toolchain in a
-directory other than output/host by using the Build options → Host
-dir option. This could be useful if the toolchain must be shared with
-other users.
+  * run make sdk, which prepares the toolchain to be relocatable;
+  * tarball the contents of the output/host directory;
+  * distribute the resulting tarball.
+
+Once the toolchain is installed to the new location, the user must
+run the relocate-sdk.sh script to make sure all paths are updated
+with the new location.
 
 8.12.2. Using gdb in Buildroot
 
@@ -1521,7 +1570,7 @@ from the cross gdb.
 Then, on the host, you should start the cross gdb using the following
 command line:
 
-<buildroot>/output/host/usr/bin/<tuple>-gdb -x <buildroot>/output/staging/usr/share/buildroot/gdbinit foo
+<buildroot>/output/host/bin/<tuple>-gdb -x <buildroot>/output/staging/usr/share/buildroot/gdbinit foo
 
 Of course, foo must be available in the current directory, built with
 debugging symbols. Typically you start this command from the
@@ -1932,8 +1981,8 @@ directory, not to the Buildroot output directory.
 
 Note: If using an br2-external tree from before Buildroot 2016.11,
 you need to convert it before you can use it with Buildroot 2016.11
-onward. See Chapter 25, Converting old br2-external trees for help on
-doing so.
+onward. See Section 25.1, “Migrating to 2016.11” for help on doing
+so.
 
 Some examples:
 
@@ -2761,8 +2810,8 @@ package installed what and remove it when the package is unselected.
 However, it is much more complicated than that:
 
   * It is not only about the target/ directory, but also the sysroot
-    in host/usr/<tuple>/sysroot and the host/ directory itself. All
-    files installed in those directories by various packages must be
+    in host/<tuple>/sysroot and the host/ directory itself. All files
+    installed in those directories by various packages must be
     tracked.
   * When a package is unselected from the configuration, it is not
     sufficient to remove just the files it installed. One must also
@@ -2878,23 +2927,6 @@ Chapter 11. Known issues
     BR2_TARGET_LDFLAGS if such options contain a $ sign. For example,
     the following is known to break: BR2_TARGET_LDFLAGS="-Wl,-rpath=
     '$ORIGIN/../lib'"
-  * The ltp-testsuite package does not build with the default uClibc
-    configuration used by the Buildroot toolchain backend. The LTP
-    testsuite uses several functions that are considered obsolete,
-    such as sigset() and others. uClibc configuration options such as
-    DO_XSI_MATH, UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and
-    UCLIBC_SV4_DEPRECATED are needed if one wants to build the
-    ltp-testsuite package with uClibc. You need to either use a glibc
-    based toolchain, or enable the appropriate options in the uClibc
-    configuration.
-  * The xfsprogs package does not build with the default uClibc
-    configuration used by the Buildroot toolchain backend. You need
-    to either use a glibc based toolchain, or enable the appropriate
-    options in the uClibc configuration.
-  * The mrouted package does not build with the default uClibc
-    configuration used by the Buildroot toolchain backend. You need
-    to either use a glibc based toolchain, or enable the appropriate
-    options in the uClibc configuration.
   * The libffi package is not supported on the SuperH 2 and ARC
     architectures.
   * The prboom package triggers a compiler failure with the SuperH 4
@@ -2979,53 +3011,7 @@ check the output of make legal-info before using it as your own
 compliance delivery. See the NO WARRANTY clauses (clauses 11 and 12)
 in the COPYING file at the root of the Buildroot distribution.
 
-12.2. License abbreviations
-
-Here is a list of the licenses that are most widely used by packages
-in Buildroot, with the name used in the manifest files:
-
-  * AGPLv3: GNU Affero General Public License, version 3 [http://
-    www.gnu.org/licenses/agpl-3.0.en.html];
-  * GPLv2: GNU General Public License, version 2 [http://www.gnu.org/
-    licenses/old-licenses/gpl-2.0.html];
-  * GPLv2+: GNU General Public License, version 2 [http://www.gnu.org
-    /licenses/old-licenses/gpl-2.0.html] or (at your option) any
-    later version;
-  * GPLv3: GNU General Public License, version 3 [http://www.gnu.org/
-    licenses/gpl.html];
-  * GPLv3+: GNU General Public License, version 3 [http://www.gnu.org
-    /licenses/gpl.html] or (at your option) any later version;
-  * GPL: GNU General Public License [http://www.gnu.org/licenses/
-    gpl.html] (any version);
-  * LGPLv2: GNU Library General Public License, version 2 [http://
-    www.gnu.org/licenses/old-licenses/lgpl-2.0.html];
-  * LGPLv2+: GNU Library General Public License, version 2 [http://
-    www.gnu.org/licenses/old-licenses/lgpl-2.0.html] or (at your
-    option) any later version;
-  * LGPLv2.1: GNU Lesser General Public License, version 2.1 [http://
-    www.gnu.org/licenses/old-licenses/lgpl-2.1.html];
-  * LGPLv2.1+: GNU Lesser General Public License, version 2.1 [http:/
-    /www.gnu.org/licenses/old-licenses/lgpl-2.1.html] or (at your
-    option) any later version;
-  * LGPLv3: GNU Lesser General Public License, version 3 [http://
-    www.gnu.org/licenses/lgpl.html];
-  * LGPLv3+: GNU Lesser General Public License, version 3 [http://
-    www.gnu.org/licenses/lgpl.html] or (at your option) any later
-    version;
-  * LGPL: GNU Lesser General Public License [http://www.gnu.org/
-    licenses/lgpl.html] (any version);
-  * BSD-4c: Original BSD 4-clause license [http://directory.fsf.org/
-    wiki/License:BSD_4Clause];
-  * BSD-3c: BSD 3-clause license [http://opensource.org/licenses/
-    BSD-3-Clause];
-  * BSD-2c: BSD 2-clause license [http://opensource.org/licenses/
-    BSD-2-Clause];
-  * MIT: MIT-style license [http://opensource.org/licenses/
-    mit-license.html];
-  * Apache-2.0: Apache License, version 2.0 [http://apache.org/
-    licenses/LICENSE-2.0.html];
-
-12.3. Complying with the Buildroot license
+12.2. Complying with the Buildroot license
 
 Buildroot itself is an open source software, released under the GNU
 General Public License, version 2 [http://www.gnu.org/licenses/
@@ -3052,7 +3038,7 @@ Keep in mind that this is only the Buildroot developers' opinion, and
 you should consult your legal department or lawyer in case of any
 doubt.
 
-12.3.1. Patches to packages
+12.2.1. Patches to packages
 
 Buildroot also bundles patch files, which are applied to the sources
 of the various packages. Those patches are not covered by the license
@@ -3128,6 +3114,7 @@ Table of Contents
     15.1. Config.in file
     15.2. The .mk file
     15.3. The documentation
+    15.4. Support scripts
 
 16. Adding support for a particular board
 17. Adding new packages to Buildroot
@@ -3147,13 +3134,15 @@ Table of Contents
         configuration files
     17.13. Infrastructure for rebar-based packages
     17.14. Infrastructure for Waf-based packages
-    17.15. Infrastructure for packages building kernel modules
-    17.16. Infrastructure for asciidoc documents
-    17.17. Infrastructure specific to the Linux kernel package
-    17.18. Hooks available in the various build steps
-    17.19. Gettext integration and interaction with packages
-    17.20. Tips and tricks
-    17.21. Conclusion
+    17.15. Integration of Meson-based packages
+    17.16. Integration of Cargo-based packages
+    17.17. Infrastructure for packages building kernel modules
+    17.18. Infrastructure for asciidoc documents
+    17.19. Infrastructure specific to the Linux kernel package
+    17.20. Hooks available in the various build steps
+    17.21. Gettext integration and interaction with packages
+    17.22. Tips and tricks
+    17.23. Conclusion
 
 18. Patching a package
 
@@ -3257,7 +3246,8 @@ config BR2_PACKAGE_LIBFOO
         depends on BR2_PACKAGE_LIBBAZ
         select BR2_PACKAGE_LIBBAR
         help
-          This is a comment that explains what libfoo is.
+          This is a comment that explains what libfoo is. The help text
+          should be wrapped.
 
           http://foosoftware.org/libfoo/
 
@@ -3265,7 +3255,8 @@ config BR2_PACKAGE_LIBFOO
     tab.
   * The help text itself should be indented with one tab and two
     spaces.
-  * The help text should be wrapped to fit 72 columns.
+  * The help text should be wrapped to fit 72 columns, where tab
+    counts for 8, so 62 characters in the text itself.
 
 The Config.in files are the input for the configuration tool used in
 Buildroot, which is the regular Kconfig. For further details about
@@ -3351,6 +3342,12 @@ For further details about the asciidoc [http://www.methods.co.nz/
 asciidoc/] syntax, refer to http://www.methods.co.nz/asciidoc/
 userguide.html.
 
+15.4. Support scripts
+
+Some scripts in the support/ and utils/ directories are written in
+Python and should follow the PEP8 Style Guide for Python Code [https:
+//www.python.org/dev/peps/pep-0008/].
+
 Chapter 16. Adding support for a particular board
 
 Buildroot contains basic configurations for several publicly
@@ -3394,6 +3391,9 @@ applications) can be integrated into Buildroot. It also shows how
 existing packages are integrated, which is needed for fixing issues
 or tuning their configuration.
 
+When you add a new package, be sure to test it in various conditions;
+see Section 17.22.2, “How to test your package”
+
 17.1. Package directory
 
 First of all, create a directory under the package directory for your
@@ -3420,15 +3420,17 @@ It should basically contain:
 config BR2_PACKAGE_LIBFOO
         bool "libfoo"
         help
-          This is a comment that explains what libfoo is.
+          This is a comment that explains what libfoo is. The help text
+          should be wrapped.
 
           http://foosoftware.org/libfoo/
 
 The bool line, help line and other metadata information about the
 configuration option must be indented with one tab. The help text
 itself should be indented with one tab and two spaces, lines should
-not be longer than 72 columns, and it must mention the upstream URL
-of the project.
+be wrapped to fit 72 columns, where tab counts for 8, so 62
+characters in the text itself. The help text must mention the
+upstream URL of the project after an empty line.
 
 As a convention specific to Buildroot, the ordering of the attributes
 is as follows:
@@ -3801,11 +3803,13 @@ Further formatting details: see the writing rules Section 15.2, “The
 
 17.4. The .hash file
 
-Optionally, you can add a third file, named libfoo.hash, that
+When possible, you must add a third file, named libfoo.hash, that
 contains the hashes of the downloaded files for the libfoo package.
+The only reason for not adding a .hash file is when hash checking is
+not possible due to how the package is downloaded.
 
 The hashes stored in that file are used to validate the integrity of
-the downloaded files.
+the downloaded files and of the license files.
 
 The format of this file is one line for each file for which to check
 the hash, each line being space-separated, with these three fields:
@@ -3823,7 +3827,12 @@ the hash, each line being space-separated, with these three fields:
       + for sha256, 64 hexadecimal characters
       + for sha384, 96 hexadecimal characters
       + for sha512, 128 hexadecimal characters
-  * the name of the file, without any directory component
+  * the name of the file:
+
+      + for a source archive: the basename of the file, without any
+        directory component,
+      + for a license file: the path as it appears in
+        FOO_LICENSE_FILES.
 
 Lines starting with a # sign are considered comments, and ignored.
 Empty lines are ignored.
@@ -3840,6 +3849,13 @@ an md5 hash, then compute at least one strong hash yourself
 (preferably sha256, but not md5), and mention this in a comment line
 above the hashes.
 
+Note. The hashes for license files are used to detect a license
+change when a package version is bumped. The hashes are checked
+during the make legal-info target run. For a package with multiple
+versions (like Qt5), create the hash file in a subdirectory
+<packageversion> of that package (see also Section 18.2, “How patches
+are applied”).
+
 Note. The number of spaces does not matter, so one can use spaces (or
 tabs) to properly align the different fields.
 
@@ -3865,6 +3881,10 @@ sha256 ff52101fb90bbfc3fe9475e425688c660f46216d7e751c4bbdb1dc85cdccacb9 libfoo-f
 # No hash for 1234:
 none   xxx                                                              libfoo-1234.tar.gz
 
+# Hash for license files:
+sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8  COPYING
+sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55  doc/COPYING.LGPL
+
 If the .hash file is present, and it contains one or more hashes for
 a downloaded file, the hash(es) computed by Buildroot (after
 download) must match the hash(es) stored in the .hash file. If one or
@@ -3877,11 +3897,18 @@ However, the downloaded file is left in the download directory since
 this typically indicates that the .hash file is wrong but the
 downloaded file is probably OK.
 
-Sources that are downloaded from a version control system (git,
-subversion, etc…) can not have a hash, because the version control
-system and tar may not create exactly the same file (dates, files
-ordering…), so the hash could be wrong even for a valid download.
-Therefore, the hash check is entirely skipped for such sources.
+Hashes are currently checked for files fetched from http/ftp servers,
+Git repositories, files copied using scp and local files. Hashes are
+not checked for other version control systems (such as Subversion,
+CVS, etc.) because Buildroot currently does not generate reproducible
+tarballs when source code is fetched from such version control
+systems.
+
+Hashes should only be added in .hash files for files that are
+guaranteed to be stable. For example, patches auto-generated by
+Github are not guaranteed to be stable, and therefore their hashes
+can change over time. Such patches should not be downloaded, and
+instead be added locally to the package folder.
 
 If the .hash file is missing, then no check is done at all.
 
@@ -3903,7 +3930,7 @@ based on hand-written Makefiles or shell scripts.
 07: LIBFOO_VERSION = 1.0
 08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz
 09: LIBFOO_SITE = http://www.foosoftware.org/download
-10: LIBFOO_LICENSE = GPLv3+
+10: LIBFOO_LICENSE = GPL-3.0+
 11: LIBFOO_LICENSE_FILES = COPYING
 12: LIBFOO_INSTALL_STAGING = YES
 13: LIBFOO_CONFIG_SCRIPTS = libfoo-config
@@ -4066,10 +4093,29 @@ information is (assuming the package name is libfoo) :
   * LIBFOO_VERSION, mandatory, must contain the version of the
     package. Note that if HOST_LIBFOO_VERSION doesn’t exist, it is
     assumed to be the same as LIBFOO_VERSION. It can also be a
-    revision number, branch or tag for packages that are fetched
-    directly from their revision control system. Examples:
-    LIBFOO_VERSION = 0.1.2 LIBFOO_VERSION =
-    cb9d6aa9429e838f0e54faa3d455bcbab5eef057 LIBFOO_VERSION = stable
+    revision number or a tag for packages that are fetched directly
+    from their version control system. Examples:
+
+      + a version for a release tarball: LIBFOO_VERSION = 0.1.2
+      + a sha1 for a git tree: LIBFOO_VERSION =
+        cb9d6aa9429e838f0e54faa3d455bcbab5eef057
+      + a tag for a git tree LIBFOO_VERSION = v0.1.2
+
+        Note: Using a branch name as FOO_VERSION is not supported,
+        because it does not and can not work as people would expect
+        it should:
+
+         1. due to local caching, Buildroot will not re-fetch the
+            repository, so people who expect to be able to follow the
+            remote repository would be quite surprised and
+            disappointed;
+         2. because two builds can never be perfectly simultaneous,
+            and because the remote repository may get new commits on
+            the branch anytime, two users, using the same Buildroot
+            tree and building the same configuration, may get
+            different source, thus rendering the build non
+            reproducible, and people would be quite surprised and
+            disappointed.
   * LIBFOO_SOURCE may contain the name of the tarball of the package,
     which Buildroot will use to download the tarball from
     LIBFOO_SITE. If HOST_LIBFOO_SOURCE is not specified, it defaults
@@ -4097,7 +4143,7 @@ information is (assuming the package name is libfoo) :
     Mercurial, and Bazaar are supported URL types for retrieving
     packages directly from source code management systems. There is a
     helper function to make it easier to download source tarballs
-    from GitHub (refer to Section 17.20.2, “How to add a package from
+    from GitHub (refer to Section 17.22.3, “How to add a package from
     GitHub” for details). A filesystem path may be used to specify
     either a tarball or a directory containing the package source
     code. See LIBFOO_SITE_METHOD below for more details on how
@@ -4122,7 +4168,7 @@ information is (assuming the package name is libfoo) :
     file to be downloaded is located at LIBFOO_SITE. Buildroot will
     not do anything with those additional files, except download
     them: it will be up to the package recipe to use them from $
-    (BR2_DL_DIR).
+    (DL_DIR).
   * LIBFOO_SITE_METHOD determines the method used to fetch or copy
     the package source code. In many cases, Buildroot guesses the
     method from the contents of LIBFOO_SITE and setting
@@ -4174,7 +4220,7 @@ information is (assuming the package name is libfoo) :
         source directory into the package’s build directory. Note
         that for local packages, no patches are applied. If you need
         to still patch the source code, use LIBFOO_POST_RSYNC_HOOKS,
-        see Section 17.18.1, “Using the POST_RSYNC hook”.
+        see Section 17.20.1, “Using the POST_RSYNC hook”.
   * LIBFOO_GIT_SUBMODULES can be set to YES to create an archive with
     the git submodules in the repository. This is only available for
     packages downloaded with git (i.e. when LIBFOO_SITE_METHOD=git).
@@ -4243,25 +4289,25 @@ information is (assuming the package name is libfoo) :
     syntax documentation. This variable is optional.
   * LIBFOO_LICENSE defines the license (or licenses) under which the
     package is released. This name will appear in the manifest file
-    produced by make legal-info. If the license appears in the
-    following list Section 12.2, “License abbreviations”, use the
-    same string to make the manifest file uniform. Otherwise,
-    describe the license in a precise and concise way, avoiding
-    ambiguous names such as BSD which actually name a family of
-    licenses. This variable is optional. If it is not defined,
-    unknown will appear in the license field of the manifest file for
-    this package. The expected format for this variable must comply
-    with the following rules:
+    produced by make legal-info. If the license appears in the SPDX
+    License List [https://spdx.org/licenses/], use the SPDX short
+    identifier to make the manifest file uniform. Otherwise, describe
+    the license in a precise and concise way, avoiding ambiguous
+    names such as BSD which actually name a family of licenses. This
+    variable is optional. If it is not defined, unknown will appear
+    in the license field of the manifest file for this package. The
+    expected format for this variable must comply with the following
+    rules:
 
       + If different parts of the package are released under
         different licenses, then comma separate licenses (e.g.
-        LIBFOO_LICENSE = GPLv2+, LGPLv2.1+). If there is clear
+        LIBFOO_LICENSE = GPL-2.0+, LGPL-2.1+). If there is clear
         distinction between which component is licensed under what
         license, then annotate the license with that component,
-        between parenthesis (e.g. LIBFOO_LICENSE = GPLv2+ (programs),
-        LGPLv2.1+ (libraries)).
+        between parenthesis (e.g. LIBFOO_LICENSE = GPL-2.0+
+        (programs), LGPL-2.1+ (libraries)).
       + If the package is dual licensed, then separate licenses with
-        the or keyword (e.g. LIBFOO_LICENSE = AFLv2.1 or GPLv2+).
+        the or keyword (e.g. LIBFOO_LICENSE = AFL-2.1 or GPL-2.0+).
   * LIBFOO_LICENSE_FILES is a space-separated list of files in the
     package tarball that contain the license(s) under which the
     package is released. make legal-info copies all of these files in
@@ -4298,6 +4344,13 @@ information is (assuming the package name is libfoo) :
     The default stack size for the FLAT binary format is only 4k
     bytes. If the application consumes more stack, append the
     required number here.
+  * LIBFOO_BIN_ARCH_EXCLUDE is a space-separated list of paths
+    (relative to the target directory) to ignore when checking that
+    the package installs correctly cross-compiled binaries. You
+    seldom need to set this variable, unless the package installs
+    binary blobs outside the default locations, /lib/firmware, /usr/
+    lib/firmware, /lib/modules, /usr/lib/modules, and /usr/share,
+    which are automatically excluded.
 
 The recommended way to define these variables is to use the following
 syntax:
@@ -4373,13 +4426,15 @@ In the action definitions, you can use the following variables:
     runtime configuration file, a splashscreen image…
   * $(@D), which contains the directory in which the package source
     code has been uncompressed.
+  * $(DL_DIR) contains the path to the directory where all the
+    downloads made by Buildroot are stored.
   * $(TARGET_CC), $(TARGET_LD), etc. to get the target
     cross-compilation utilities
   * $(TARGET_CROSS) to get the cross-compilation toolchain prefix
   * Of course the $(HOST_DIR), $(STAGING_DIR) and $(TARGET_DIR)
     variables to install the packages properly.
 
-Finally, you can also use hooks. See Section 17.18, “Hooks available
+Finally, you can also use hooks. See Section 17.20, “Hooks available
 in the various build steps” for more information.
 
 17.6. Infrastructure for autotools-based packages
@@ -4524,7 +4579,7 @@ well for most autotools-based packages. However, when required, it is
 still possible to customize what is done in any particular step:
 
   * By adding a post-operation hook (after extract, patch, configure,
-    build or install). See Section 17.18, “Hooks available in the
+    build or install). See Section 17.20, “Hooks available in the
     various build steps” for details.
   * By overriding one of the steps. For example, even if the
     autotools infrastructure is used, if the package .mk file defines
@@ -4663,7 +4718,7 @@ well for most CMake-based packages. However, when required, it is
 still possible to customize what is done in any particular step:
 
   * By adding a post-operation hook (after extract, patch, configure,
-    build or install). See Section 17.18, “Hooks available in the
+    build or install). See Section 17.20, “Hooks available in the
     various build steps” for details.
   * By overriding one of the steps. For example, even if the CMake
     infrastructure is used, if the package .mk file defines its own
@@ -4692,7 +4747,7 @@ an example :
 07: PYTHON_FOO_VERSION = 1.0
 08: PYTHON_FOO_SOURCE = python-foo-$(PYTHON_FOO_VERSION).tar.xz
 09: PYTHON_FOO_SITE = http://www.foosoftware.org/download
-10: PYTHON_FOO_LICENSE = BSD-3c
+10: PYTHON_FOO_LICENSE = BSD-3-Clause
 11: PYTHON_FOO_LICENSE_FILES = LICENSE
 12: PYTHON_FOO_ENV = SOME_VAR=1
 13: PYTHON_FOO_DEPENDENCIES = libmad
@@ -4816,7 +4871,7 @@ well for most Python-based packages. However, when required, it is
 still possible to customize what is done in any particular step:
 
   * By adding a post-operation hook (after extract, patch, configure,
-    build or install). See Section 17.18, “Hooks available in the
+    build or install). See Section 17.20, “Hooks available in the
     various build steps” for details.
   * By overriding one of the steps. For example, even if the Python
     infrastructure is used, if the package .mk file defines its own
@@ -4829,7 +4884,7 @@ still possible to customize what is done in any particular step:
 
 If the Python package for which you would like to create a Buildroot
 package is available on PyPI, you may want to use the scanpypi tool
-located in support/scripts to automate the process.
+located in utils/ to automate the process.
 
 You can find the list of existing PyPI packages here [https://
 pypi.python.org].
@@ -4839,7 +4894,7 @@ host.
 
 When at the root of your buildroot directory just do :
 
-./support/scripts/scanpypi foo bar -o package
+utils/scanpypi foo bar -o package
 
 This will generate packages python-foo and python-bar in the package
 folder if they exist on https://pypi.python.org.
@@ -4858,14 +4913,14 @@ also need to manually add the package to the package/Config.in file.
 If your Buildroot package is not in the official Buildroot tree but
 in a br2-external tree, use the -o flag as follows:
 
-./support/scripts/scanpypi foo bar -o other_package_dir
+utils/scanpypi foo bar -o other_package_dir
 
 This will generate packages python-foo and python-bar in the
 other_package_directory instead of package.
 
 Option -h will list the available options:
 
-./support/scripts/scanpypi -h
+utils/scanpypi -h
 
 17.8.4. python-package CFFI backend
 
@@ -4910,33 +4965,39 @@ package, with an example :
 
 01: ################################################################################
 02: #
-03: # luafoo
+03: # lua-foo
 04: #
 05: ################################################################################
 06:
-07: LUAFOO_VERSION = 1.0.2-1
-08: LUAFOO_DEPENDENCIES = foo
-09:
-10: LUAFOO_BUILD_OPTS += FOO_INCDIR=$(STAGING_DIR)/usr/include
-11: LUAFOO_BUILD_OPTS += FOO_LIBDIR=$(STAGING_DIR)/usr/lib
-12: LUAFOO_LICENSE = luaFoo license
-13: LUAFOO_LICENSE_FILES = COPYING
-14:
-15: $(eval $(luarocks-package))
+07: LUA_FOO_VERSION = 1.0.2-1
+08: LUA_FOO_NAME_UPSTREAM = foo
+09: LUA_FOO_DEPENDENCIES = bar
+10:
+11: LUA_FOO_BUILD_OPTS += BAR_INCDIR=$(STAGING_DIR)/usr/include
+12: LUA_FOO_BUILD_OPTS += BAR_LIBDIR=$(STAGING_DIR)/usr/lib
+13: LUA_FOO_LICENSE = luaFoo license
+14: LUA_FOO_LICENSE_FILES = $(LUA_FOO_SUBDIR)/COPYING
+15:
+16: $(eval $(luarocks-package))
 
 On line 7, we declare the version of the package (the same as in the
 rockspec, which is the concatenation of the upstream version and the
 rockspec revision, separated by a hyphen -).
 
-On line 8, we declare our dependencies against native libraries, so
+On line 8, we declare that the package is called "foo" on LuaRocks.
+In Buildroot, we give Lua-related packages a name that starts with
+"lua", so the Buildroot name is different from the upstream name.
+LUA_FOO_NAME_UPSTREAM makes the link between the two names.
+
+On line 9, we declare our dependencies against native libraries, so
 that they are built before the build process of our package starts.
 
-On lines 10-11, we tell Buildroot to pass custom options to LuaRocks
+On lines 11-12, we tell Buildroot to pass custom options to LuaRocks
 when it is building the package.
 
-On lines 12-13, we specify the licensing terms for the package.
+On lines 13-14, we specify the licensing terms for the package.
 
-Finally, on line 15, we invoke the luarocks-package macro that
+Finally, on line 16, we invoke the luarocks-package macro that
 generates all the Makefile rules that actually allows the package to
 be built.
 
@@ -4962,25 +5023,27 @@ luarocks-package macro.
 
 First, all the package metadata information variables that exist in
 the generic infrastructure also exist in the LuaRocks infrastructure:
-LUAFOO_VERSION, LUAFOO_SOURCE, LUAFOO_SITE, LUAFOO_DEPENDENCIES,
-LUAFOO_LICENSE, LUAFOO_LICENSE_FILES.
+LUA_FOO_VERSION, LUA_FOO_SOURCE, LUA_FOO_SITE, LUA_FOO_DEPENDENCIES,
+LUA_FOO_LICENSE, LUA_FOO_LICENSE_FILES.
 
 Two of them are populated by the LuaRocks infrastructure (for the
 download step). If your package is not hosted on the LuaRocks mirror
 $(BR2_LUAROCKS_MIRROR), you can override them:
 
-  * LUAFOO_SITE, which defaults to $(BR2_LUAROCKS_MIRROR)
-  * LUAFOO_SOURCE, which defaults to luafoo-$
-    (LUAFOO_VERSION).src.rock
+  * LUA_FOO_SITE, which defaults to $(BR2_LUAROCKS_MIRROR)
+  * LUA_FOO_SOURCE, which defaults to $(lowercase
+    LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION).src.rock
 
 A few additional variables, specific to the LuaRocks infrastructure,
 are also defined. They can be overridden in specific cases.
 
-  * LUAFOO_ROCKSPEC, which defaults to luafoo-$
-    (LUAFOO_VERSION).rockspec
-  * LUAFOO_SUBDIR, which defaults to luafoo-$
-    (LUAFOO_VERSION_WITHOUT_ROCKSPEC_REVISION)
-  * LUAFOO_BUILD_OPTS contains additional build options for the
+  * LUA_FOO_NAME_UPSTREAM, which defaults to lua-foo, i.e. the
+    Buildroot package name
+  * LUA_FOO_ROCKSPEC, which defaults to $(lowercase
+    LUA_FOO_NAME_UPSTREAM)-$(LUA_FOO_VERSION).rockspec
+  * LUA_FOO_SUBDIR, which defaults to $(LUA_FOO_NAME_UPSTREAM)-$
+    (LUA_FOO_VERSION_WITHOUT_ROCKSPEC_REVISION)
+  * LUA_FOO_BUILD_OPTS contains additional build options for the
     luarocks build call.
 
 17.10. Infrastructure for Perl/CPAN packages
@@ -5000,7 +5063,7 @@ with an example :
 08: PERL_FOO_BAR_SOURCE = Foo-Bar-$(PERL_FOO_BAR_VERSION).tar.gz
 09: PERL_FOO_BAR_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MO/MONGER
 10: PERL_FOO_BAR_DEPENDENCIES = perl-strictures
-11: PERL_FOO_BAR_LICENSE = Artistic or GPLv1+
+11: PERL_FOO_BAR_LICENSE = Artistic or GPL-1.0+
 12: PERL_FOO_BAR_LICENSE_FILES = LICENSE
 13:
 14: $(eval $(perl-package))
@@ -5023,7 +5086,7 @@ all the Makefile rules that actually allow the package to be built.
 
 Most of these data can be retrieved from https://metacpan.org/. So,
 this file and the Config.in can be generated by running the script
-supports/scripts/scancpan Foo-Bar in the Buildroot directory (or in a
+utils/scancpan Foo-Bar in the Buildroot directory (or in a
 br2-external tree). This script creates a Config.in file and
 foo-bar.mk file for the requested package, and also recursively for
 all dependencies specified by CPAN. You should still manually edit
@@ -5383,7 +5446,7 @@ well for most rebar-based packages. However, when required, it is
 still possible to customize what is done in any particular step:
 
   * By adding a post-operation hook (after extract, patch, configure,
-    build or install). See Section 17.18, “Hooks available in the
+    build or install). See Section 17.20, “Hooks available in the
     various build steps” for details.
   * By overriding one of the steps. For example, even if the rebar
     infrastructure is used, if the package .mk file defines its own
@@ -5464,7 +5527,202 @@ be defined.
     to the waf script during the target installation step. By
     default, empty.
 
-17.15. Infrastructure for packages building kernel modules
+17.15. Integration of Meson-based packages
+
+17.15.1. meson-package tutorial
+
+Meson [http://mesonbuild.com] is an open source build system meant to
+be both extremely fast, and, even more importantly, as user friendly
+as possible.
+
+Buildroot does not (yet) provide a dedicated package infrastructure
+for meson-based packages. So, we will explain how to write a .mk file
+for such a package. Let’s start with an example:
+
+01: ################################################################################
+02: #
+03: # foo
+04: #
+05: ################################################################################
+06:
+07: FOO_VERSION = 1.0
+08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+09: FOO_SITE = http://www.foosoftware.org/download
+10: FOO_LICENSE = GPL-3.0+
+11: FOO_LICENSE_FILES = COPYING
+12: FOO_INSTALL_STAGING = YES
+13:
+14: FOO_DEPENDENCIES = host-meson host-pkgconf bar
+15:
+16: FOO_CONF_OPTS += \
+17:     --prefix=/usr \
+18:     --buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
+19:     --cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf
+20:
+21: FOO_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS)
+22:
+23: ifeq ($(BR2_PACKAGE_BAZ),y)
+24: FOO_CONF_OPTS += -Dbaz
+25: endif
+26:
+27: define FOO_CONFIGURE_CMDS
+28:     rm -rf $(@D)/build
+29:     mkdir -p $(@D)/build
+30:     $(TARGET_MAKE_ENV) meson $(FOO_CONF_OPTS) $(@D) $(@D)/build
+31: endef
+32:
+33: define FOO_BUILD_CMDS
+34:     $(TARGET_MAKE_ENV) ninja $(FOO_NINJA_OPTS) -C $(@D)/build
+35: endef
+36:
+37: define FOO_INSTALL_TARGET_CMDS
+38:     $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja $(FOO_NINJA_OPTS) \
+39:             -C $(@D)/build install
+40: endef
+41:
+42: define FOO_INSTALL_STAGING_CMDS
+43:     $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) ninja $(FOO_NINJA_OPTS) \
+44:             -C $(@D)/build install
+45: endef
+46:
+47: $(eval $(generic-package))
+
+The Makefile starts with the definition of the standard variables for
+package declaration (lines 7 to 11).
+
+As seen in line 47, it is based on the generic-package infrastructure
+Section 17.5.1, “generic-package tutorial”. So, it defines the
+variables required by this particular infrastructure, where Meson and
+its companion tool, Ninja, are invoked:
+
+  * FOO_CONFIGURE_CMDS: the build directory required by Meson is
+    created, and Meson is invoked to generate the Ninja build file.
+    The options required to configure the cross-compilation of the
+    package are passed via FOO_CONF_OPTS.
+  * FOO_BUILD_CMDS: Ninja is invoked to perform the build.
+  * FOO_INSTALL_TARGET_CMDS: Ninja is invoked to install the files
+    generated during the build step in the target directory.
+  * FOO_INSTALL_STAGING_CMDS: Ninja is invoked to install the files
+    generated during the build step in the staging directory, as
+    FOO_INSTALL_STAGING is set to "YES".
+
+In order to have Meson available for the build, FOO_DEPENDENCIES
+needs to contain host-meson. In the example, host-pkgconf and bar are
+also declared as dependencies because the Meson build file of foo
+uses pkg-config to determine the compilation flags and libraries of
+package bar.
+
+If the "baz" package is selected, then support for the "baz" feature
+in "foo" is activated by adding -Dbaz to FOO_CONF_OPTS, as specified
+in the meson_options.txt file in "foo" source tree.
+
+To sum it up, to add a new meson-based package, the Makefile example
+can be copied verbatim then edited to replace all occurences of FOO
+with the uppercase name of the new package and update the values of
+the standard variables.
+
+17.16. Integration of Cargo-based packages
+
+Cargo is the package manager for the Rust programming language. It
+allows the user to build programs or libraries written in Rust, but
+it also downloads and manages their dependencies, to ensure
+repeatable builds. Cargo packages are called "crates".
+
+17.16.1. Cargo-based package’s Config.in file
+
+The Config.in file of Cargo-based package foo should contain:
+
+01: config BR2_PACKAGE_FOO
+02:     bool "foo"
+03:     depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+04:     select BR2_PACKAGE_HOST_CARGO
+05:     help
+06:       This is a comment that explains what foo is.
+07:
+08:       http://foosoftware.org/foo/
+
+17.16.2. Cargo-based package’s .mk file
+
+Buildroot does not (yet) provide a dedicated package infrastructure
+for Cargo-based packages. So, we will explain how to write a .mk file
+for such a package. Let’s start with an example:
+
+01: ################################################################################
+02: #
+03: # foo
+04: #
+05: ################################################################################
+06:
+07: FOO_VERSION = 1.0
+08: FOO_SOURCE = foo-$(FOO_VERSION).tar.gz
+09: FOO_SITE = http://www.foosoftware.org/download
+10: FOO_LICENSE = GPL-3.0+
+11: FOO_LICENSE_FILES = COPYING
+12:
+13: FOO_DEPENDENCIES = host-cargo
+14:
+15: FOO_CARGO_ENV = CARGO_HOME=$(HOST_DIR)/share/cargo
+16: FOO_CARGO_MODE = $(if $(BR2_ENABLE_DEBUG),debug,release)
+17:
+18: FOO_BIN_DIR = target/$(RUSTC_TARGET_NAME)/$(FOO_CARGO_MODE)
+19:
+20: FOO_CARGO_OPTS = \
+21:   --$(FOO_CARGO_MODE) \
+22:     --target=$(RUSTC_TARGET_NAME) \
+23:     --manifest-path=$(@D)/Cargo.toml
+24:
+25: define FOO_BUILD_CMDS
+26:     $(TARGET_MAKE_ENV) $(FOO_CARGO_ENV) \
+27:             cargo build $(FOO_CARGO_OPTS)
+28: endef
+29:
+30: define FOO_INSTALL_TARGET_CMDS
+31:     $(INSTALL) -D -m 0755 $(@D)/$(FOO_BIN_DIR)/foo \
+32:             $(TARGET_DIR)/usr/bin/foo
+33: endef
+34:
+35: $(eval $(generic-package))
+
+The Makefile starts with the definition of the standard variables for
+package declaration (lines 7 to 11).
+
+As seen in line 35, it is based on the generic-package infrastructure
+Section 17.5.1, “generic-package tutorial”. So, it defines the
+variables required by this particular infrastructure, where Cargo is
+invoked:
+
+  * FOO_BUILD_CMDS: Cargo is invoked to perform the build. The
+    options required to configure the cross-compilation of the
+    package are passed via FOO_CONF_OPTS.
+  * FOO_INSTALL_TARGET_CMDS: The binary executable generated is
+    installed on the target.
+
+In order to have Cargo available for the build, FOO_DEPENDENCIES
+needs to contain host-cargo.
+
+To sum it up, to add a new Cargo-based package, the Makefile example
+can be copied verbatim then edited to replace all occurences of FOO
+with the uppercase name of the new package and update the values of
+the standard variables.
+
+17.16.3. About Dependencies Management
+
+A crate can depend on other libraries from crates.io or git
+repositories, listed in its Cargo.toml file. Before starting a build,
+Cargo usually downloads automatically them. This step can also be
+performed independently, via the cargo fetch command.
+
+Cargo maintains a local cache of the registry index and of git
+checkouts of the crates, whose location is given by $CARGO_HOME. As
+seen in the package Makefile example at line 15, this environment
+variable is set to $(HOST_DIR)/share/cargo.
+
+This dependency download mechanism is not convenient when performing
+an offline build, as Cargo will fail to fetch the dependencies. In
+that case, it is advised to generate a tarball of the dependencies
+using the cargo vendor and add it to FOO_EXTRA_DOWNLOADS.
+
+17.17. Infrastructure for packages building kernel modules
 
 Buildroot offers a helper infrastructure to make it easy to write
 packages that build and install Linux kernel modules. Some packages
@@ -5472,7 +5730,7 @@ only contain a kernel module, other packages contain programs and
 libraries in addition to kernel modules. Buildroot’s helper
 infrastructure supports either case.
 
-17.15.1. kernel-module tutorial
+17.17.1. kernel-module tutorial
 
 Let’s start with an example on how to prepare a simple package that
 only builds a kernel module, and no other component:
@@ -5486,7 +5744,7 @@ only builds a kernel module, and no other component:
 07: FOO_VERSION = 1.2.3
 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
 09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
 11: FOO_LICENSE_FILES = COPYING
 12:
 13: $(eval $(kernel-module))
@@ -5525,7 +5783,7 @@ Let’s look at a more complex example:
 07: FOO_VERSION = 1.2.3
 08: FOO_SOURCE = foo-$(FOO_VERSION).tar.xz
 09: FOO_SITE = http://www.foosoftware.org/download
-10: FOO_LICENSE = GPLv2
+10: FOO_LICENSE = GPL-2.0
 11: FOO_LICENSE_FILES = COPYING
 12:
 13: FOO_MODULE_SUBDIRS = driver/base
@@ -5548,7 +5806,7 @@ libbar is enabled, the kernel module located in sub-directory driver/
 bar, and defines the variable KVERSION to be passed to the Linux
 buildsystem when building the module(s).
 
-17.15.2. kernel-module reference
+17.17.2. kernel-module reference
 
 The main macro for the kernel module infrastructure is kernel-module.
 Unlike other package infrastructures, it is not stand-alone, and
@@ -5596,7 +5854,7 @@ You may also reference (but you may not set!) those variables:
   * KERNEL_ARCH contains the name of the current architecture, like
     arm, mips…
 
-17.16. Infrastructure for asciidoc documents
+17.18. Infrastructure for asciidoc documents
 
 The Buildroot manual, which you are currently reading, is entirely
 written using the AsciiDoc [http://asciidoc.org/] mark-up syntax. The
@@ -5618,7 +5876,7 @@ Buildroot”. This allows documentation for a br2-external tree to
 match the Buildroot documentation, as it will be rendered to the same
 formats and use the same layout and theme.
 
-17.16.1. asciidoc-document tutorial
+17.18.1. asciidoc-document tutorial
 
 Whereas package infrastructures are suffixed with -package, the
 document infrastructures are suffixed with -document. So, the
@@ -5645,7 +5903,7 @@ structure.
 On line 8, we call the asciidoc-document function, which generates
 all the Makefile code necessary to render the document.
 
-17.16.2. asciidoc-document reference
+17.18.2. asciidoc-document reference
 
 The list of variables that can be set in a .mk file to give metadata
 information is (assuming the document name is foo) :
@@ -5660,7 +5918,7 @@ information is (assuming the document name is foo) :
     If a hook of your document needs to access the Kconfig structure,
     you may add prepare-kconfig to the list of dependencies.
 
-There are also additional hooks (see Section 17.18, “Hooks available
+There are also additional hooks (see Section 17.20, “Hooks available
 in the various build steps” for general information on hooks), that a
 document may set to define extra actions to be done at various steps:
 
@@ -5713,13 +5971,13 @@ Here is a complete example that uses all variables and all hooks:
 30:
 31: $(eval $(call asciidoc-document))
 
-17.17. Infrastructure specific to the Linux kernel package
+17.19. Infrastructure specific to the Linux kernel package
 
 The Linux kernel package can use some specific infrastructures based
 on package hooks for building Linux kernel tools or/and building
 Linux kernel extensions.
 
-17.17.1. linux-kernel-tools
+17.19.1. linux-kernel-tools
 
 Buildroot offers a helper infrastructure to build some userspace
 tools for the target available within the Linux kernel sources. Since
@@ -5749,8 +6007,8 @@ Note. Unlike other packages, the linux-tools package options appear
 in the linux kernel menu, under the Linux Kernel Tools sub-menu, not
 under the Target packages main menu.
 
-Then for each linux tool, add a new .mk file named package/
-linux-tools/linux-tool-foo.mk. It would basically look like:
+Then for each linux tool, add a new .mk.in file named package/
+linux-tools/linux-tool-foo.mk.in. It would basically look like:
 
 01: ################################################################################
 02: #
@@ -5796,7 +6054,7 @@ Note. One must not call $(eval $(generic-package)) or any other
 package infrastructure! Linux tools are not packages by themselves,
 they are part of the linux-tools package.
 
-17.17.2. linux-kernel-extensions
+17.19.2. linux-kernel-extensions
 
 Some packages provide new features that require the Linux kernel tree
 to be modified. This can be in the form of patches to be applied on
@@ -5851,10 +6109,10 @@ modify the Linux kernel tree; this is specific to the linux extension
 and can use the variables defined by the foo package, like: $
 (FOO_DIR) or $(FOO_VERSION)… as well as all the Linux variables,
 like: $(LINUX_VERSION) or $(LINUX_VERSION_PROBED), $(KERNEL_ARCH)…
-See the definition of those kernel variables Section 17.15.2,
+See the definition of those kernel variables Section 17.17.2,
 “kernel-module reference”.
 
-17.18. Hooks available in the various build steps
+17.20. Hooks available in the various build steps
 
 The generic infrastructure (and as a result also the derived
 autotools and cmake infrastructures) allow packages to specify hooks.
@@ -5899,7 +6157,7 @@ endef
 
 LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP
 
-17.18.1. Using the POST_RSYNC hook
+17.20.1. Using the POST_RSYNC hook
 
 The POST_RSYNC hook is run only for packages that use a local source,
 either through the local site method or the OVERRIDE_SRCDIR
@@ -5919,63 +6177,63 @@ among others, use the following variables:
   * $(SRCDIR): the path to the overridden source directory
   * $(@D): the path to the build directory
 
-17.18.2. Target-finalize hook
+17.20.2. Target-finalize hook
 
 Packages may also register hooks in LIBFOO_TARGET_FINALIZE_HOOKS.
 These hooks are run after all packages are built, but before the
 filesystem images are generated. They are seldom used, and your
 package probably do not need them.
 
-17.19. Gettext integration and interaction with packages
+17.21. Gettext integration and interaction with packages
 
 Many packages that support internationalization use the gettext
 library. Dependencies for this library are fairly complicated and
 therefore, deserve some explanation.
 
-The uClibc C library doesn’t implement gettext functionality;
-therefore with this C library, a separate gettext must be compiled,
-which is provided by the additional libintl library, part of the
-gettext package.
+The glibc C library integrates a full-blown implementation of gettext
+, supporting translation. Native Language Support is therefore
+built-in in glibc.
 
-On the other hand, the glibc C library does integrate its own gettext
-library functions, so it is not necessary to build a separate libintl
-library.
+On the other hand, the uClibc and musl C libraries only provide a
+stub implementation of the gettext functionality, which allows to
+compile libraries and programs using gettext functions, but without
+providing the translation capabilities of a full-blown gettext
+implementation. With such C libraries, if real Native Language
+Support is necessary, it can be provided by the libintl library of
+the gettext package.
 
-However, certain packages need some gettext utilities on the target,
-such as the gettext program itself, which allows to retrieve
-translated strings, from the command line.
-
-Additionally, some packages (such as libglib2) do require gettext
-functions unconditionally, while other packages (in general, those
-who support --disable-nls) only require gettext functions when locale
-support is enabled.
-
-Therefore, Buildroot defines two configuration options:
-
-  * BR2_NEEDS_GETTEXT, which is true as soon as the toolchain doesn’t
-    provide its own gettext implementation
-  * BR2_NEEDS_GETTEXT_IF_LOCALE, which is true if the toolchain
-    doesn’t provide its own gettext implementation and if locale
-    support is enabled
-
-Packages that need gettext only when locale support is enabled
+Due to this, and in order to make sure that Native Language Support
+is properly handled, packages in Buildroot that can use NLS support
 should:
 
-  * use select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE in
-    the Config.in file;
-  * use $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) in the package
-    DEPENDENCIES variable in the .mk file.
+ 1. Ensure NLS support is enabled when BR2_SYSTEM_ENABLE_NLS=y. This
+    is done automatically for autotools packages and therefore should
+    only be done for packages using other package infrastructures.
+ 2. Add $(TARGET_NLS_DEPENDENCIES) to the package <pkg>_DEPENDENCIES
+    variable. This addition should be done unconditionally: the value
+    of this variable is automatically adjusted by the core
+    infrastructure to contain the relevant list of packages. If NLS
+    support is disabled, this variable is empty. If NLS support is
+    enabled, this variable contains host-gettext so that tools needed
+    to compile translation files are available on the host. In
+    addition, if uClibc or musl are used, this variable also contains
+    gettext in order to get the full-blown gettext implementation.
+ 3. If needed, add $(TARGET_NLS_LIBS) to the linker flags, so that
+    the package gets linked with libintl. This is generally not
+    needed with autotools packages as they usually detect
+    automatically that they should link with libintl. However,
+    packages using other build systems, or problematic
+    autotools-based packages may need this. $(TARGET_NLS_LIBS) should
+    be added unconditionally to the linker flags, as the core
+    automatically makes it empty or defined to -lintl depending on
+    the configuration.
 
-Packages that unconditionally need gettext (which should be very
-rare) should:
+No changes should be made to the Config.in file to support NLS.
 
-  * use select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT in the
-    Config.in file;
-  * use $(if $(BR2_NEEDS_GETTEXT),gettext) in the package
-    DEPENDENCIES variable in the .mk file.
-
-Packages that need the gettext utilities on the target (should be
-rare) should:
+Finally, certain packages need some gettext utilities on the target,
+such as the gettext program itself, which allows to retrieve
+translated strings, from the command line. In such a case, the
+package should:
 
   * use select BR2_PACKAGE_GETTEXT in their Config.in file,
     indicating in a comment above that it’s a runtime dependency
@@ -5983,9 +6241,9 @@ rare) should:
   * not add any gettext dependency in the DEPENDENCIES variable of
     their .mk file.
 
-17.20. Tips and tricks
+17.22. Tips and tricks
 
-17.20.1. Package name, config entry name and makefile variable
+17.22.1. Package name, config entry name and makefile variable
 relationship
 
 In Buildroot, there is some relationship between:
@@ -6009,7 +6267,93 @@ the following rules:
     . and - characters substituted with _ (e.g.:
     FOO_BAR_BOO_VERSION).
 
-17.20.2. How to add a package from GitHub
+17.22.2. How to test your package
+
+Once you have added your new package, it is important that you test
+it under various conditions: does it build for all architectures?
+Does it build with the different C libraries? Does it need threads,
+NPTL? And so on…
+
+Buildroot runs autobuilders [http://autobuild.buildroot.org/] which
+continuously test random configurations. However, these only build
+the master branch of the git tree, and your new fancy package is not
+yet there.
+
+Buildroot provides a script in utils/test-pkg that uses the same base
+configurations as used by the autobuilders so you can test your
+package in the same conditions.
+
+First, create a config snippet that contains all the necessary
+options needed to enable your package, but without any architecture
+or toolchain option. For example, let’s create a config snippet that
+just enables libcurl, without any TLS backend:
+
+$ cat libcurl.config
+BR2_PACKAGE_LIBCURL=y
+
+If your package needs more configuration options, you can add them to
+the config snippet. For example, here’s how you would test libcurl
+with openssl as a TLS backend and the curl program:
+
+$ cat libcurl.config
+BR2_PACKAGE_LIBCURL=y
+BR2_PACKAGE_CURL=y
+BR2_PACKAGE_OPENSSL=y
+
+Then run the test-pkg script, by telling it what config snippet to
+use and what package to test:
+
+$ ./utils/test-pkg -c libcurl.config -p libcurl
+
+This will try to build your package against all the toolchains used
+by the autobuilders (except for the internal toolchains, because it
+takes too long to do so). The output lists all toolchains and the
+corresponding result (excerpt, results are fake):
+
+$ ./utils/test-pkg -c libcurl.config -p libcurl
+                armv5-ctng-linux-gnueabi [ 1/11]: OK
+              armv7-ctng-linux-gnueabihf [ 2/11]: OK
+                        br-aarch64-glibc [ 3/11]: SKIPPED
+                           br-arcle-hs38 [ 4/11]: SKIPPED
+                            br-arm-basic [ 5/11]: FAILED
+                  br-arm-cortex-a9-glibc [ 6/11]: OK
+                   br-arm-cortex-a9-musl [ 7/11]: FAILED
+                   br-arm-cortex-m4-full [ 8/11]: OK
+                             br-arm-full [ 9/11]: OK
+                    br-arm-full-nothread [10/11]: FAILED
+                      br-arm-full-static [11/11]: OK
+11 builds, 2 skipped, 2 build failed, 1 legal-info failed
+
+The results mean:
+
+  * OK: the build was successful.
+  * SKIPPED: one or more configuration options listed in the config
+    snippet were not present in the final configuration. This is due
+    to options having dependencies not satisfied by the toolchain,
+    such as for example a package that depends on BR2_USE_MMU with a
+    noMMU toolchain. The missing options are reported in
+    missing.config in the output build directory (~/br-test-pkg/
+    TOOLCHAIN_NAME/ by default).
+  * FAILED: the build failed. Inspect the logfile file in the output
+    build directory to see what went wrong:
+
+      + the actual build failed,
+      + the legal-info failed,
+      + one of the preliminary steps (downloading the config file,
+        applying the configuration, running dirclean for the package)
+        failed.
+
+When there are failures, you can just re-run the script with the same
+options (after you fixed your package); the script will attempt to
+re-build the package specified with -p for all toolchains, without
+the need to re-build all the dependencies of that package.
+
+The test-pkg script accepts a few options, for which you can get some
+help by running:
+
+$ ./utils/test-pkg -h
+
+17.22.3. How to add a package from GitHub
 
 Packages on GitHub often don’t have a download area with release
 tarballs. However, it is possible to download tarballs directly from
@@ -6049,7 +6393,7 @@ tag:
     then it’s an automatically generated tarball and you should use
     the github helper function.
 
-17.21. Conclusion
+17.23. Conclusion
 
 As you can see, adding a software package to Buildroot is simply a
 matter of writing a Makefile using an existing example and modifying
@@ -6075,9 +6419,14 @@ located in a user-defined global patch directory.
 18.1.1. Downloaded
 
 If it is necessary to apply a patch that is available for download,
-then add it to the <packagename>_PATCH variable. It is downloaded
-from the same site as the package itself. It can be a single patch,
-or a tarball containing a patch series.
+then add it to the <packagename>_PATCH variable. If an entry contains
+://, then Buildroot will assume it is a full URL and download the
+patch from this location. Otherwise, Buildroot will assume that the
+patch should be downloaded from <packagename>_SITE. It can be a
+single patch, or a tarball containing a patch series.
+
+Like for all downloads, a hash should be added to the
+<packagename>.hash file.
 
 This method is typically used for packages from Debian.
 
@@ -6140,7 +6489,7 @@ If something goes wrong in the steps 3 or 4, then the build fails.
 18.3. Format and licensing of the package patches
 
 Patches are released under the same license as the software they
-apply to (see Section 12.3, “Complying with the Buildroot license”).
+apply to (see Section 12.2, “Complying with the Buildroot license”).
 
 A message explaining what the patch does, and why it is needed,
 should be added in the header commentary of the patch.
@@ -6472,10 +6821,10 @@ Finally, the patch should be signed off. This is done by adding
 Signed-off-by: Your Real Name <> at the end of the commit message.
 git commit -s does that for you, if configured properly. The
 Signed-off-by tag means that you publish the patch under the
-Buildroot license (i.e. GPLv2, except for package patches, which have
-the upstream license), and that you are allowed to do so. See the
-Developer Certificate of Origin [http://developercertificate.org/]
-for details.
+Buildroot license (i.e. GPL-2.0+, except for package patches, which
+have the upstream license), and that you are allowed to do so. See
+the Developer Certificate of Origin [http://developercertificate.org
+/] for details.
 
 When adding new packages, you should submit every package in a
 separate patch. This patch should have the update to package/
@@ -6505,9 +6854,9 @@ options that no longer exist or are no longer needed.
 
 If you are interested in getting notified of build failures and of
 further changes in the packages you added or modified, please add
-yourself to the DEVELOPERS file. This should be done in a separate
-patch of the series. See the DEVELOPERS file Chapter 22, DEVELOPERS
-file and get-developers for more information.
+yourself to the DEVELOPERS file. This should be done in the same
+patch creating or modifying the package. See the DEVELOPERS file
+Chapter 22, DEVELOPERS file and get-developers for more information.
 
 21.5.2. Preparing a patch series
 
@@ -6535,7 +6884,7 @@ be sent, called get-developers (see Chapter 22, DEVELOPERS file and
 get-developers for more information). This tool reads your patches
 and outputs the appropriate git send-email command to use:
 
-$ ./support/scripts/get-developers outgoing/*
+$ ./utils/get-developers outgoing/*
 
 Use the output of get-developers to send your patches:
 
@@ -6703,7 +7052,7 @@ DEVELOPERS file.
 The DEVELOPERS file format is documented in detail inside the file
 itself.
 
-The get-developer tool, located in support/scripts allows to use the
+The get-developer tool, located in utils/ allows to use the
 DEVELOPERS file for various tasks:
 
   * When passing one or several patches as command line argument,
@@ -6718,6 +7067,9 @@ DEVELOPERS file for various tasks:
     all files under version control in the Buildroot repository, and
     list the ones that are not handled by any developer. The purpose
     of this option is to help completing the DEVELOPERS file.
+  * When using without any arguments, it validates the integrity of
+    the DEVELOPERS file and will note WARNINGS for items that don’t
+    match.
 
 Part IV. Appendix
 
@@ -6725,7 +7077,10 @@ Table of Contents
 
 23. Makedev syntax documentation
 24. Makeusers syntax documentation
-25. Converting old br2-external trees
+25. Migrating from older Buildroot versions
+
+    25.1. Migrating to 2016.11
+    25.2. Migrating to 2017.08
 
 Chapter 23. Makedev syntax documentation
 
@@ -6901,7 +7256,13 @@ This will create this user:
   * test is not a member of any additional groups
   * comment is: Test user
 
-Chapter 25. Converting old br2-external trees
+Chapter 25. Migrating from older Buildroot versions
+
+Some versions have introduced backward incompatibilities. This
+section explains those incompatibilities, and for each explains what
+to do to complete the migration.
+
+25.1. Migrating to 2016.11
 
 Before Buildroot 2016.11, it was possible to use only one
 br2-external tree at once. With Buildroot 2016.11 came the
@@ -6934,3 +7295,15 @@ onward.
 Note: This change makes your br2-external tree incompatible with
 Buildroot before 2016.11.
 
+25.2. Migrating to 2017.08
+
+Before Buildroot 2017.08, host packages were installed in $(HOST_DIR)
+/usr (with e.g. the autotools' --prefix=$(HOST_DIR)/usr). With
+Buildroot 2017.08, they are now installed directly in $(HOST_DIR).
+
+Whenever a package installs an executable that is linked with a
+library in $(HOST_DIR)/lib, it must have an RPATH pointing to that
+directory.
+
+An RPATH pointing to $(HOST_DIR)/usr/lib is no longer accepted.
+
diff --git a/bsp/buildroot/docs/manual/manual.txt b/bsp/buildroot/docs/manual/manual.txt
index afb53d04..9d507604 100644
--- a/bsp/buildroot/docs/manual/manual.txt
+++ b/bsp/buildroot/docs/manual/manual.txt
@@ -9,8 +9,8 @@ Buildroot {sys:echo $\{BR2_VERSION%%-git*\}} manual generated on {localdate}
 
 The Buildroot manual is written by the Buildroot developers.
 It is licensed under the GNU General Public License, version 2. Refer to the
-http://git.buildroot.org/buildroot/tree/COPYING[COPYING] file in the Buildroot
-sources for the full text of this license.
+http://git.buildroot.org/buildroot/tree/COPYING?id={sys:git rev-parse HEAD}[COPYING]
+file in the Buildroot sources for the full text of this license.
 
 Copyright (C) 2004-2018 The Buildroot developers
 
diff --git a/bsp/buildroot/docs/manual/migrating.txt b/bsp/buildroot/docs/manual/migrating.txt
new file mode 100644
index 00000000..92e487c7
--- /dev/null
+++ b/bsp/buildroot/docs/manual/migrating.txt
@@ -0,0 +1,58 @@
+// -*- mode:doc; -*-
+// vim: set syntax=asciidoc:
+
+[[migrating-from-ol-versions]]
+== Migrating from older Buildroot versions
+
+Some versions have introduced backward incompatibilities. This section
+explains those incompatibilities, and for each explains what to do to
+complete the migration.
+
+[[br2-external-converting]]
+=== Migrating to 2016.11
+
+Before Buildroot 2016.11, it was possible to use only one br2-external
+tree at once. With Buildroot 2016.11 came the possibility to use more
+than one simultaneously (for details, see xref:outside-br-custom[]).
+
+This however means that older br2-external trees are not usable as-is.
+A minor change has to be made: adding a name to your br2-external tree.
+
+This can be done very easily in just a few steps:
+
+ * First, create a new file named +external.desc+, at the root of your
+   br2-external tree, with a single line defining the name of your
+   br2-external tree:
++
+----
+$ echo 'name: NAME_OF_YOUR_TREE' >external.desc
+----
++
+.Note
+Be careful when choosing a name: It has to be unique and be made
+with only ASCII characters from the set +[A-Za-z0-9_]+.
+
+ * Then, change every occurence of +BR2_EXTERNAL+ in your br2-external
+   tree with the new variable:
++
+----
+$ find . -type f | xargs sed -i 's/BR2_EXTERNAL/BR2_EXTERNAL_NAME_OF_YOUR_TREE_PATH/g'
+----
+
+Now, your br2-external tree can be used with Buildroot 2016.11 onward.
+
+.Note:
+This change makes your br2-external tree incompatible with Buildroot
+before 2016.11.
+
+[[migrating-host-usr]]
+=== Migrating to 2017.08
+
+Before Buildroot 2017.08, host packages were installed in +$(HOST_DIR)/usr+
+(with e.g. the autotools' +--prefix=$(HOST_DIR)/usr+). With Buildroot
+2017.08, they are now installed directly in +$(HOST_DIR)+.
+
+Whenever a package installs an executable that is linked with a library
+in +$(HOST_DIR)/lib+, it must have an RPATH pointing to that directory.
+
+An RPATH pointing to +$(HOST_DIR)/usr/lib+ is no longer accepted.
diff --git a/bsp/buildroot/docs/manual/patch-policy.txt b/bsp/buildroot/docs/manual/patch-policy.txt
index e1df8b00..e704a0d3 100644
--- a/bsp/buildroot/docs/manual/patch-policy.txt
+++ b/bsp/buildroot/docs/manual/patch-policy.txt
@@ -19,9 +19,14 @@ global patch directory.
 ==== Downloaded
 
 If it is necessary to apply a patch that is available for download, then add it
-to the +<packagename>_PATCH+ variable. It is downloaded from the same site
-as the package itself. It can be a single patch, or a tarball containing a
-patch series.
+to the +<packagename>_PATCH+ variable. If an entry contains +://+,
+then Buildroot will assume it is a full URL and download the patch
+from this location. Otherwise, Buildroot will assume that the patch should be
+downloaded from +<packagename>_SITE+. It can be a single patch,
+or a tarball containing a patch series.
+
+Like for all downloads, a hash should be added to the +<packagename>.hash+
+file.
 
 This method is typically used for packages from Debian.
 
diff --git a/bsp/buildroot/docs/manual/prerequisite.txt b/bsp/buildroot/docs/manual/prerequisite.txt
index 110fab41..66e1b88f 100644
--- a/bsp/buildroot/docs/manual/prerequisite.txt
+++ b/bsp/buildroot/docs/manual/prerequisite.txt
@@ -23,8 +23,8 @@ between distributions).
 ** +make+ (version 3.81 or any later)
 ** +binutils+
 ** +build-essential+ (only for Debian based systems)
-** +gcc+ (version 2.95 or any later)
-** `g++` (version 2.95 or any later)
+** +gcc+ (version 4.4 or any later)
+** `g++` (version 4.4 or any later)
 ** +bash+
 ** +patch+
 ** +gzip+
diff --git a/bsp/buildroot/docs/manual/using-buildroot-debugger.txt b/bsp/buildroot/docs/manual/using-buildroot-debugger.txt
index b5063ca9..d5293beb 100644
--- a/bsp/buildroot/docs/manual/using-buildroot-debugger.txt
+++ b/bsp/buildroot/docs/manual/using-buildroot-debugger.txt
@@ -35,7 +35,7 @@ Then, on the host, you should start the cross gdb using the following
 command line:
 
 ----------------------------
-<buildroot>/output/host/usr/bin/<tuple>-gdb -x <buildroot>/output/staging/usr/share/buildroot/gdbinit foo
+<buildroot>/output/host/bin/<tuple>-gdb -x <buildroot>/output/staging/usr/share/buildroot/gdbinit foo
 ----------------------------
 
 Of course, +foo+ must be available in the current directory, built
diff --git a/bsp/buildroot/docs/manual/using-buildroot-toolchain.txt b/bsp/buildroot/docs/manual/using-buildroot-toolchain.txt
index 9a98628f..3246dc24 100644
--- a/bsp/buildroot/docs/manual/using-buildroot-toolchain.txt
+++ b/bsp/buildroot/docs/manual/using-buildroot-toolchain.txt
@@ -9,14 +9,18 @@ can use the toolchain that was generated by Buildroot.
 
 The toolchain generated by Buildroot is located by default in
 +output/host/+. The simplest way to use it is to add
-+output/host/usr/bin/+ to your PATH environment variable and then to
++output/host/bin/+ to your PATH environment variable and then to
 use +ARCH-linux-gcc+, +ARCH-linux-objdump+, +ARCH-linux-ld+, etc.
 
-It is possible to relocate the toolchain - but then +--sysroot+ must
-be passed every time the compiler is called to tell where the
-libraries and header files are.
+It is possible to relocate the toolchain, this allows to distribute
+the toolchain to other developers to build applications for your
+target. To achieve this:
+
+* run +make sdk+, which prepares the toolchain to be relocatable;
+* tarball the contents of the +output/host+ directory;
+* distribute the resulting tarball.
+
+Once the toolchain is installed to the new location, the user must run
+the +relocate-sdk.sh+ script to make sure all paths are updated with
+the new location.
 
-It is also possible to generate the Buildroot toolchain in a directory
-other than +output/host+ by using the +Build options -> Host dir+
-option. This could be useful if the toolchain must be shared with
-other users.
diff --git a/bsp/buildroot/docs/manual/writing-rules.txt b/bsp/buildroot/docs/manual/writing-rules.txt
index ec1ddb19..ca432722 100644
--- a/bsp/buildroot/docs/manual/writing-rules.txt
+++ b/bsp/buildroot/docs/manual/writing-rules.txt
@@ -29,7 +29,8 @@ config BR2_PACKAGE_LIBFOO
 	depends on BR2_PACKAGE_LIBBAZ
 	select BR2_PACKAGE_LIBBAR
 	help
-	  This is a comment that explains what libfoo is.
+	  This is a comment that explains what libfoo is. The help text
+	  should be wrapped.
 
 	  http://foosoftware.org/libfoo/
 ---------------------
@@ -40,7 +41,8 @@ config BR2_PACKAGE_LIBFOO
 * The help text itself should be indented with one tab and two
   spaces.
 
-* The help text should be wrapped to fit 72 columns.
+* The help text should be wrapped to fit 72 columns, where tab counts
+  for 8, so 62 characters in the text itself.
 
 The +Config.in+ files are the input for the configuration tool
 used in Buildroot, which is the regular _Kconfig_. For further
@@ -141,3 +143,9 @@ http://www.methods.co.nz/asciidoc/[asciidoc] format.
 
 For further details about the http://www.methods.co.nz/asciidoc/[asciidoc]
 syntax, refer to http://www.methods.co.nz/asciidoc/userguide.html[].
+
+=== Support scripts
+
+Some scripts in the +support/+ and +utils/+ directories are written in
+Python and should follow the
+https://www.python.org/dev/peps/pep-0008/[PEP8 Style Guide for Python Code].
diff --git a/bsp/buildroot/docs/website/.htaccess b/bsp/buildroot/docs/website/.htaccess
new file mode 100644
index 00000000..b02beb88
--- /dev/null
+++ b/bsp/buildroot/docs/website/.htaccess
@@ -0,0 +1,62 @@
+# BEGIN Compress text files
+<ifModule mod_deflate.c>
+  <filesMatch ".(css|js|x?html?|php)$">
+    SetOutputFilter DEFLATE
+  </filesMatch>
+</ifModule>
+# END Compress text files
+
+# BEGIN Expire headers
+<ifModule mod_expires.c>
+  ExpiresActive On
+  ExpiresDefault "access plus 1 seconds"
+  ExpiresByType image/x-icon "access plus 2592000 seconds"
+  ExpiresByType image/jpeg "access plus 2592000 seconds"
+  ExpiresByType image/png "access plus 2592000 seconds"
+  ExpiresByType image/gif "access plus 2592000 seconds"
+  ExpiresByType application/x-shockwave-flash "access plus 2592000 seconds"
+  ExpiresByType text/css "access plus 604800 seconds"
+  ExpiresByType text/javascript "access plus 216000 seconds"
+  ExpiresByType application/javascript "access plus 216000 seconds"
+  ExpiresByType application/x-javascript "access plus 216000 seconds"
+  ExpiresByType text/html "access plus 600 seconds"
+  ExpiresByType application/xhtml+xml "access plus 600 seconds"
+</ifModule>
+# END Expire headers
+
+# BEGIN Cache-Control Headers
+<ifModule mod_headers.c>
+  <filesMatch ".(ico|jpe?g|png|gif|swf)$">
+    Header set Cache-Control "max-age=2592000, public"
+  </filesMatch>
+  <filesMatch ".(css)$">
+    Header set Cache-Control "max-age=604800, public"
+  </filesMatch>
+  <filesMatch ".(js)$">
+    Header set Cache-Control "max-age=216000, private"
+  </filesMatch>
+  <filesMatch ".(x?html?|php)$">
+    Header set Cache-Control "max-age=600, private, must-revalidate"
+  </filesMatch>
+</ifModule>
+# END Cache-Control Headers
+
+# BEGIN Turn ETags Off
+<ifModule mod_headers.c>
+  Header unset ETag
+</ifModule>
+FileETag None
+# END Turn ETags Off
+
+# BEGIN gzip
+<ifModule mod_gzip.c>
+mod_gzip_on Yes
+mod_gzip_dechunk Yes
+mod_gzip_item_include file .(html?|txt|css|js)$
+mod_gzip_item_include handler ^cgi-script$
+mod_gzip_item_include mime ^text/.*
+mod_gzip_item_include mime ^application/x-javascript.*
+mod_gzip_item_exclude mime ^image/.*
+mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.*
+</ifModule>
+# END gzip
diff --git a/bsp/buildroot/docs/website/docs.html b/bsp/buildroot/docs/website/docs.html
index 9cee36da..9ef202ff 100644
--- a/bsp/buildroot/docs/website/docs.html
+++ b/bsp/buildroot/docs/website/docs.html
@@ -78,8 +78,8 @@
   <div class="panel panel-primary">
     <div class="panel-heading">Training</div>
     <div class="panel-body">
-      <p><a href="http://www.free-electrons.com">Free Electrons</a> offers a
-	complete <a href="http://free-electrons.com/training/buildroot/">3-days
+      <p><a href="http://www.bootlin.com">Bootlin</a> (formerly Free Electrons)
+	offers a complete <a href="http://bootlin.com/training/buildroot/">3-days
 	  training course on Buildroot</a>. They also make the training
 	materials freely available:</p>
 
@@ -89,7 +89,7 @@
 	    <div class="panel-heading">Slides preview</div>
 	    <div class="panel-body">
 	      <div id="slides" style="width: 100%; padding-bottom: 75%; position: relative">
-		<a href="http://free-electrons.com/doc/training/buildroot/buildroot-slides.pdf"><img src="images/buildroot-slides.png" alt="buildroot slides" style="position:absolute; width:100%; height:100%; top:0; left:0;"></a>
+		<a href="http://bootlin.com/doc/training/buildroot/buildroot-slides.pdf"><img src="images/buildroot-slides.png" alt="buildroot slides" style="position:absolute; width:100%; height:100%; top:0; left:0;"></a>
 	      </div>
 	    </div>
 	  </div>
@@ -100,9 +100,9 @@
 	    <div class="panel-heading">Training materials</div>
 	    <div class="panel-body">
 	      <ul>
-		<li><a href="http://free-electrons.com/doc/training/buildroot/buildroot-slides.pdf">slides (PDF)</a></li>
-		<li><a href="http://free-electrons.com/doc/training/buildroot/buildroot-labs.pdf">practical labs (PDF)</a></li>
-		<li><a href="http://free-electrons.com/doc/training/buildroot/buildroot-labs.tar.xz">practical labs data (.tar.xz)</a></li>
+		<li><a href="http://bootlin.com/doc/training/buildroot/buildroot-slides.pdf">slides (PDF)</a></li>
+		<li><a href="http://bootlin.com/doc/training/buildroot/buildroot-labs.pdf">practical labs (PDF)</a></li>
+		<li><a href="http://bootlin.com/doc/training/buildroot/buildroot-labs.tar.xz">practical labs data (.tar.xz)</a></li>
 	      </ul>
 	    </div>
 	  </div>
diff --git a/bsp/buildroot/docs/website/download.html b/bsp/buildroot/docs/website/download.html
index 929557f5..cf99b22c 100644
--- a/bsp/buildroot/docs/website/download.html
+++ b/bsp/buildroot/docs/website/download.html
@@ -8,71 +8,105 @@
     <div class="panel-heading">Download</div>
     <div class="panel-body">
 
-      <h3 style="text-align: center;">Latest stable release: <b>2017.02</b></h3>
+      <h3 style="text-align: center;">Latest stable / long term support release: <b>2018.02</b></h3>
 
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2017.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
-	  <h3><a href="/downloads/buildroot-2017.02.tar.gz">buildroot-2017.02.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2017.02.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2018.02.tar.gz">buildroot-2018.02.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2018.02.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2017.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2018.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2017.02.tar.bz2">buildroot-2017.02.tar.bz2</a></h3>
-	  <p><a href="/downloads/buildroot-2017.02.tar.bz2.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2018.02.tar.bz2">buildroot-2018.02.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2018.02.tar.bz2.sign">PGP signature</a></p>
 	</div>
       </div>
 <!--
-      <h3 style="text-align: center;">Latest release candidate: <b>2017.02-rc3</b></h3>
+      <h3 style="text-align: center;">Latest stable release: <b>2017.11.2</b></h3>
+
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2017.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2017.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2017.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2017.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
-
-	  <h3><a href="/downloads/buildroot-2017.02-rc3.tar.gz">buildroot-2017.02-rc3.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2017.02-rc3.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2017.11.2.tar.gz">buildroot-2017.11.2.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2017.11.2.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2017.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2017.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2017.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2017.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2017.02-rc3.tar.bz2">buildroot-2017.02-rc3.tar.bz2</a></h3>
-	  <p><a href="/downloads/buildroot-2017.02-rc3.tar.bz2.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2017.11.2.tar.bz2">buildroot-2017.11.2.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2017.11.2.tar.bz2.sign">PGP signature</a></p>
+	</div>
+      </div>
+
+      <h3 style="text-align: center;">Latest release candidate: <b>2018.02-rc3</b></h3>
+      <div class="row mt centered">
+	<div class="col-sm-6">
+	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
+	    <div class="flipper">
+	      <div class="front">
+		<a href="/downloads/buildroot-2018.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+	      </div>
+	      <div class="back">
+		<a href="/downloads/buildroot-2018.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+	      </div>
+	    </div>
+	  </div>
+
+	  <h3><a href="/downloads/buildroot-2018.02-rc3.tar.gz">buildroot-2018.02-rc3.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2018.02-rc3.tar.gz.sign">PGP signature</a></p>
+	</div>
+	<div class="col-sm-6">
+	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
+	    <div class="flipper">
+	      <div class="front">
+		<a href="/downloads/buildroot-2018.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+	      </div>
+	      <div class="back">
+		<a href="/downloads/buildroot-2018.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+	      </div>
+	    </div>
+	  </div>
+
+	  <h3><a href="/downloads/buildroot-2018.02-rc3.tar.bz2">buildroot-2018.02-rc3.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2018.02-rc3.tar.bz2.sign">PGP signature</a></p>
 	</div>
       </div>
 -->
diff --git a/bsp/buildroot/docs/website/index.html b/bsp/buildroot/docs/website/index.html
index f0d0175b..300adbb8 100644
--- a/bsp/buildroot/docs/website/index.html
+++ b/bsp/buildroot/docs/website/index.html
@@ -78,7 +78,7 @@
 	</div>
       </div>
 
-      <h4>Supports hundreds of packages</h4>
+      <h4>Supports several thousand packages</h4>
       <p>X.org stack, Gtk3, Qt 5, GStreamer, Webkit, Kodi, a large number of network-related and system-related utilities are supported.</p>
 
     </div><!--/col-lg-4 -->
diff --git a/bsp/buildroot/docs/website/js/buildroot.js b/bsp/buildroot/docs/website/js/buildroot.js
index a30da633..ec28cbb7 100644
--- a/bsp/buildroot/docs/website/js/buildroot.js
+++ b/bsp/buildroot/docs/website/js/buildroot.js
@@ -90,5 +90,5 @@ jQuery(document).ready(function($) {
     load_activity("http://buildroot-busybox.2317881.n4.nabble.com/Buildroot-busybox-ft2.xml", "mailing-list-activity");
     load_activity("http://git.buildroot.org/buildroot/atom/?h=master", "commit-activity");
 
-    $('#slides').html('<iframe src="https://docs.google.com/gview?url=http://free-electrons.com/doc/training/buildroot/buildroot-slides.pdf&embedded=true" style="position:absolute; width:100%; height:100%; top:0; left:0;" frameborder="0"></iframe>')
+    $('#slides').html('<iframe src="https://docs.google.com/gview?url=http://bootlin.com/doc/training/buildroot/buildroot-slides.pdf&embedded=true" style="position:absolute; width:100%; height:100%; top:0; left:0;" frameborder="0"></iframe>')
 });
diff --git a/bsp/buildroot/docs/website/news.html b/bsp/buildroot/docs/website/news.html
index 6b32a80b..f729a595 100644
--- a/bsp/buildroot/docs/website/news.html
+++ b/bsp/buildroot/docs/website/news.html
@@ -9,6 +9,663 @@
 <h2>News</h2>
 <ul class="timeline">
 
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.02 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 March 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2018.02 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.02">CHANGES</a>
+	  file for more details
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2018.02.tar.bz2">2018.02 release</a>.</p>
+
+	  <p>Notice that this is a long term support release which will be
+	  supported with security and other important fixes until February 2019.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.02-rc3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>27 February 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>Release candidate 3 is out with more cleanups and security
+	  / build fixes. See
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.02-rc3">CHANGES</a>
+	  file for details.</p>
+	<p>Head to the <a href="/downloads/">downloads page</a> to
+	  pick up
+	  the <a href="/downloads/buildroot-2018.02-rc3.tar.bz2">2018.02-rc3
+	    release candidate</a>, and report any problems found to
+	  the <a href="support.html">mailing list</a>
+	  or <a href="https://bugs.uclibc.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.02-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>15 February 2018</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups
+          and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.02-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2018.02-rc2.tar.bz2">2018.02-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2018.02-rc1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>5 February 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>We have a new release candidate! Lots of changes all over the
+	  tree, see the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.02-rc1">CHANGES</a>
+	  file for details and read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2018-February/213171.html">announcement</a>.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2018.02-rc1.tar.bz2">2018.02-rc1
+	    release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.10 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>31 January 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.10 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.9 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.10">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2018-January/212844.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.10.tar.bz2">2017.02.10 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.11.2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>21 January 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.11.2 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.11.1 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.11.2">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2018-January/212069.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.11.2.tar.bz2">2017.11.2 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.9 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 January 2018</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.9 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.8 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.9">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2018-January/210559.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.9.tar.bz2">2017.02.9 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.11.1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>31 December 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.11.1 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.11 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.11.1">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-December/210505.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.11.1.tar.bz2">2017.11.1 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.11 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>30 November 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2017.11 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.11">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-December/208338.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.11.tar.bz2">2017.11 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.08.2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>29 November 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.08.2 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.08.1 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08.2">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-November/208174.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.08.2.tar.bz2">2017.08.2 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.8 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>27 November 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.8 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.7 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.8">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-November/208113.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.8.tar.bz2">2017.02.8 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.11-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>13 November 2017</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups
+          and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.11-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.11-rc2.tar.bz2">2017.11-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.11-rc1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>6 November 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>We have a new release candidate! Lots of changes all over
+	  the tree, see
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.11-rc1">CHANGES</a>
+	  file for details.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.11-rc1.tar.bz2">2017.11-rc1
+	    release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.7 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 October 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.7 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.6 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.7">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-October/205628.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.7.tar.bz2">2017.02.7 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.08.1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 October 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.08.1 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.08 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08.1">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-October/205323.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.08.1.tar.bz2">2017.08.1 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.6 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>24 September 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.6 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.5 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.6">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-September/203197.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.6.tar.bz2">2017.02.6 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.08 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 September 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2017.08 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08">CHANGES</a>
+	  file for more details
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.08.tar.bz2">2017.08 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.08-rc3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 August 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>Another release candidate, on the road to the final 2017.08
+	  release. A number of fixes and cleanups in various packages
+	  and defconfigs. See
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08-rc3">CHANGES</a>
+	  file for details.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.08-rc3.tar.bz2">2017.08-rc3
+	    release candidate</a>, and report any
+	  problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.08-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>11 August 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>Another release candidate, on the road to the final 2017.08
+	  release. A number of fixes and cleanups in various packages
+	  and defconfigs. See
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08-rc2">CHANGES</a>
+	  file for details.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.08-rc2.tar.bz2">2017.08-rc2
+	    release candidate</a>, and report any
+	  problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.08-rc1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>2 August 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>We have a new release candidate! Lots of changes all over
+	  the tree, see
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.08-rc1">CHANGES</a>
+	  file for details.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.08-rc1.tar.bz2">2017.08-rc1
+	    release candidate</a>, and report any
+	  problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05.2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>27 July 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.05.2 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.05.1 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05.2">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-July/199284.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.05.2.tar.bz2">2017.05.2 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.5 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>27 July 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.5 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.4 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.5">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-July/199281.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.5.tar.bz2">2017.02.5 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05.1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 July 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.05.1 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.05 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05.1">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-July/196743.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.05.1.tar.bz2">2017.05.1 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.4 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 July 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.4 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.3 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.4">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-July/196719.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.4.tar.bz2">2017.02.4 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>2 June 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.3 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.2 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.3">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-June/193485.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.3.tar.bz2">2017.02.3 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>31 May 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2017.05 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-June/193164.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.05.tar.bz2">2017.05 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05-rc3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>30 May 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>Release candidate 3 is out with more cleanups and security
+	  / build fixes. See
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05-rc3">CHANGES</a>
+	  file for details.</p>
+	<p>Head to the <a href="/downloads/">downloads page</a> to
+	  pick up
+	  the <a href="/downloads/buildroot-2017.05-rc3.tar.bz2">2017.05-rc3
+	    release candidate</a>, and report any problems found to
+	  the <a href="support.html">mailing list</a>
+	  or <a href="https://bugs.uclibc.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>17 May 2017</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups
+          and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.05-rc2.tar.bz2">2017.05-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05-rc1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>8 May 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>We have a new release candidate! Lots of changes all over
+	  the tree, see
+	  the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05-rc1">CHANGES</a>
+	  file for details.
+	</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.05-rc1.tar.bz2">2017.05-rc1
+	    release candidate</a>, and report any
+	  problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 May 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.2 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02.1 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.2">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-May/191062.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.2.tar.bz2">2017.02.2 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.02.1 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 April 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2017.02.1 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2017.02 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02.1">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-April/188708.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.02.1.tar.bz2">2017.02.1 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2016.11.3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>10 March 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The 2016.11.3 bugfix release is out, fixing a number of important /
+	  security related issues discovered since the 2016.11.2 release. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2016.11.3">CHANGES</a>
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-March/186418.html">announcement</a>
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2016.11.3.tar.bz2">2016.11.3 release</a>.</p>
+	  <p>Notice that this is the final 2016.11.x release. Users are
+	  urged to migrate to the 2017.02.x series instead.</p>
+      </div>
+    </div>
+  </li>
+
   <li>
     <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
     <div class="timeline-panel">
@@ -20,9 +677,13 @@
 	<p>The stable 2017.02 release is out - Thanks to everyone
 	  contributing and testing the release candidates. See the
 	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.02">CHANGES</a>
-	  file for more details
+	  file for more details, read the
+	  <a href="http://lists.busybox.net/pipermail/buildroot/2017-February/185228.html">announcement</a>
 	  and go to the <a href="/downloads/">downloads page</a> to pick up the
 	  <a href="/downloads/buildroot-2017.02.tar.bz2">2017.02 release</a>.</p>
+
+	  <p>Notice that this is a long term support release which will be
+	  supported with security and other important fixes until February 2018.</p>
       </div>
     </div>
   </li>
diff --git a/bsp/buildroot/docs/website/sponsors.html b/bsp/buildroot/docs/website/sponsors.html
index e0f1aab2..13ff6cc5 100644
--- a/bsp/buildroot/docs/website/sponsors.html
+++ b/bsp/buildroot/docs/website/sponsors.html
@@ -21,8 +21,8 @@
 	      <div class="col-sm-8">
 		<a href="http://www.google.com">Google</a> is
 		sponsoring
-		the <a href="http://elinux.org/Buildroot:DeveloperDaysFOSDEM2017">Buildroot
-		  Developers Meeting at FOSDEM 2017</a> in Brussels, by
+		the <a href="http://elinux.org/Buildroot:DeveloperDaysFOSDEM2018">Buildroot
+		  Developers Meeting at FOSDEM 2018</a> in Brussels, by
 		providing logistics for the meeting: a free meeting
 		room and lunch for the participants.
 	      </div>
@@ -39,8 +39,8 @@
 		</div>
 		<div class="col-sm-8">
 		  As it did in previous years, <a href="http://www.mind.be">Mind</a>
-		  is sponsoring the Monday night dinner at the <a href="http://elinux.org/Buildroot:DeveloperDaysFOSDEM2017">Buildroot
-		    Developers Meeting at FOSDEM 2017</a> in Brussels.
+		  is sponsoring the Monday night dinner at the <a href="http://elinux.org/Buildroot:DeveloperDaysFOSDEM2018">Buildroot
+		    Developers Meeting at FOSDEM 2018</a> in Brussels.
 		</div>
 	      </div>
 	    </div>
@@ -83,9 +83,9 @@
 	      <div class="col-sm-12">
 		<a href="http://www.mind.be">Mind</a> sponsored the
 		dinner of the FOSDEM 2014, 2015, 2016 and 2017
-		Developers Meeting (Brussels) and ELCE 2016 (Berlin),
-		the meeting room and the dinner for the ELCE 2014
-		Developers Meeting (Düsseldorf).
+		Developers Meeting (Brussels) and ELCE 2016 (Berlin)
+                and 2017 (Prague), and the meeting room and the dinner for
+                the ELCE 2014 Developers Meeting (Düsseldorf).
 	      </div>
 	    </div>
 	  </div>
@@ -101,8 +101,8 @@
 	      <div class="col-sm-12">
 		<p><a href="http://www.google.com">Google</a> provided
 		  the logistics for the FOSDEM 2013, FOSDEM 2014,
-		  FOSDEM 2015 and FOSDEM 2016 Developer Days in
-		  Brussels, Belgium.</p>
+		  FOSDEM 2015, FOSDEM 2016 and FOSDEM 2017 Developer Days
+		  in Brussels, Belgium.</p>
 	      </div>
 	    </div>
 	  </div>
diff --git a/bsp/buildroot/docs/website/support.html b/bsp/buildroot/docs/website/support.html
index a1184c8b..23a5db79 100644
--- a/bsp/buildroot/docs/website/support.html
+++ b/bsp/buildroot/docs/website/support.html
@@ -72,7 +72,7 @@
 		  <img class="img-responsive" src="images/bug-buddy.png" style="max-width:50px; margin-bottom:10px;">
 		</div>
 		<div class="col-sm-11">
-		  <p>If you encounter any problem while using Buildroot, you can use the
+		  <p>If you think you found a bug in Buildroot, you can use the
 		    <a href="https://bugs.buildroot.org/">Bug Tracker</a> to post your bugs and/or
 		    participate to find solutions to existing problems.</p>
 
diff --git a/bsp/buildroot/fs/Config.in b/bsp/buildroot/fs/Config.in
index 51ccf281..c25b01c3 100644
--- a/bsp/buildroot/fs/Config.in
+++ b/bsp/buildroot/fs/Config.in
@@ -11,6 +11,7 @@ source "fs/jffs2/Config.in"
 source "fs/romfs/Config.in"
 source "fs/squashfs/Config.in"
 source "fs/tar/Config.in"
+source "fs/ubi/Config.in"
 source "fs/ubifs/Config.in"
 source "fs/yaffs2/Config.in"
 
diff --git a/bsp/buildroot/fs/axfs/axfs.mk b/bsp/buildroot/fs/axfs/axfs.mk
index 05d6e5d3..4b93df55 100644
--- a/bsp/buildroot/fs/axfs/axfs.mk
+++ b/bsp/buildroot/fs/axfs/axfs.mk
@@ -7,7 +7,7 @@
 ROOTFS_AXFS_DEPENDENCIES = host-axfsutils
 
 define ROOTFS_AXFS_CMD
-	$(HOST_DIR)/usr/bin/mkfs.axfs -s -a $(TARGET_DIR) $@
+	$(HOST_DIR)/bin/mkfs.axfs -s -a $(TARGET_DIR) $@
 endef
 
-$(eval $(call ROOTFS_TARGET,axfs))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/cloop/cloop.mk b/bsp/buildroot/fs/cloop/cloop.mk
index 9e42a3a2..17749c5a 100644
--- a/bsp/buildroot/fs/cloop/cloop.mk
+++ b/bsp/buildroot/fs/cloop/cloop.mk
@@ -7,8 +7,8 @@
 ROOTFS_CLOOP_DEPENDENCIES = host-cloop host-cdrkit
 
 define ROOTFS_CLOOP_CMD
-	$(HOST_DIR)/usr/bin/genisoimage -r $(TARGET_DIR) | \
-		$(HOST_DIR)/usr/bin/create_compressed_fs - 65536 > $@
+	$(HOST_DIR)/bin/genisoimage -r $(TARGET_DIR) | \
+		$(HOST_DIR)/bin/create_compressed_fs - 65536 > $@
 endef
 
-$(eval $(call ROOTFS_TARGET,cloop))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/common.mk b/bsp/buildroot/fs/common.mk
index 396b1c2b..6d579db8 100644
--- a/bsp/buildroot/fs/common.mk
+++ b/bsp/buildroot/fs/common.mk
@@ -19,10 +19,6 @@
 #  ROOTFS_$(FSTYPE)_POST_GEN_HOOKS, a list of hooks to call after
 #  generating the filesystem image
 #
-#  ROOTFS_$(FSTYPE)_POST_TARGETS, the list of targets that should be
-#  run after running the main filesystem target. This is useful for
-#  initramfs, to rebuild the kernel once the initramfs is generated.
-#
 # In terms of configuration option, this macro assumes that the
 # BR2_TARGET_ROOTFS_$(FSTYPE) config option allows to enable/disable
 # the generation of a filesystem image of a particular type. If
@@ -31,16 +27,17 @@
 # BR2_TARGET_ROOTFS_$(FSTYPE)_LZMA exist and are enabled, then the
 # macro will automatically generate a compressed filesystem image.
 
-FAKEROOT_SCRIPT = $(BUILD_DIR)/_fakeroot.fs
-FULL_DEVICE_TABLE = $(BUILD_DIR)/_device_table.txt
+FS_DIR = $(BUILD_DIR)/buildroot-fs
+FAKEROOT_SCRIPT = $(FS_DIR)/fakeroot.fs
+FULL_DEVICE_TABLE = $(FS_DIR)/device_table.txt
 ROOTFS_DEVICE_TABLES = $(call qstrip,$(BR2_ROOTFS_DEVICE_TABLE) \
 	$(BR2_ROOTFS_STATIC_DEVICE_TABLE))
-USERS_TABLE = $(BUILD_DIR)/_users_table.txt
+USERS_TABLE = $(FS_DIR)/users_table.txt
 ROOTFS_USERS_TABLES = $(call qstrip,$(BR2_ROOTFS_USERS_TABLES))
 
 # Since this function will be called from within an $(eval ...)
 # all variable references except the arguments must be $$-quoted.
-define ROOTFS_TARGET_INTERNAL
+define inner-rootfs
 
 # extra deps
 ROOTFS_$(2)_DEPENDENCIES += host-fakeroot host-makedevs \
@@ -59,6 +56,11 @@ ROOTFS_$(2)_DEPENDENCIES += host-lzma
 ROOTFS_$(2)_COMPRESS_EXT = .lzma
 ROOTFS_$(2)_COMPRESS_CMD = $$(LZMA) -9 -c
 endif
+ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZ4),y)
+ROOTFS_$(2)_DEPENDENCIES += host-lz4
+ROOTFS_$(2)_COMPRESS_EXT = .lz4
+ROOTFS_$(2)_COMPRESS_CMD = lz4 -l -9 -c
+endif
 ifeq ($$(BR2_TARGET_ROOTFS_$(2)_LZO),y)
 ROOTFS_$(2)_DEPENDENCIES += host-lzop
 ROOTFS_$(2)_COMPRESS_EXT = .lzo
@@ -72,10 +74,9 @@ endif
 
 $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
 	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
+	rm -rf $(FS_DIR)
+	mkdir -p $(FS_DIR)
 	$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
-	rm -f $$(FAKEROOT_SCRIPT)
-	rm -f $$(TARGET_DIR_WARNING_FILE)
-	rm -f $$(USERS_TABLE)
 	echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
 	echo "set -e" >> $$(FAKEROOT_SCRIPT)
 	echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
@@ -91,18 +92,22 @@ ifeq ($$(BR2_ROOTFS_DEVICE_CREATION_STATIC),y)
 endif
 endif
 	$$(call PRINTF,$$(PACKAGES_PERMISSIONS_TABLE)) >> $$(FULL_DEVICE_TABLE)
-	echo "$$(HOST_DIR)/usr/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
+	echo "$$(HOST_DIR)/bin/makedevs -d $$(FULL_DEVICE_TABLE) $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
 	$$(foreach s,$$(call qstrip,$$(BR2_ROOTFS_POST_FAKEROOT_SCRIPT)),\
 		echo "echo '$$(TERM_BOLD)>>>   Executing fakeroot script $$(s)$$(TERM_RESET)'" >> $$(FAKEROOT_SCRIPT); \
-		echo $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
+		echo $$(EXTRA_ENV) $$(s) $$(TARGET_DIR) $$(BR2_ROOTFS_POST_SCRIPT_ARGS) >> $$(FAKEROOT_SCRIPT)$$(sep))
+	$$(foreach hook,$$(ROOTFS_PRE_CMD_HOOKS),\
+		$$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep))
 ifeq ($$(BR2_REPRODUCIBLE),y)
 	echo "find $$(TARGET_DIR) -print0 | xargs -0 -r touch -hd @$$(SOURCE_DATE_EPOCH)" >> $$(FAKEROOT_SCRIPT)
 endif
 	$$(call PRINTF,$$(ROOTFS_$(2)_CMD)) >> $$(FAKEROOT_SCRIPT)
+	$$(foreach hook,$$(ROOTFS_POST_CMD_HOOKS),\
+		$$(call PRINTF,$$($$(hook))) >> $$(FAKEROOT_SCRIPT)$$(sep))
 	chmod a+x $$(FAKEROOT_SCRIPT)
-	PATH=$$(BR_PATH) $$(HOST_DIR)/usr/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
+	rm -f $$(TARGET_DIR_WARNING_FILE)
+	PATH=$$(BR_PATH) $$(HOST_DIR)/bin/fakeroot -- $$(FAKEROOT_SCRIPT)
 	$$(INSTALL) -m 0644 support/misc/target-dir-warning.txt $$(TARGET_DIR_WARNING_FILE)
-	-@rm -f $$(FAKEROOT_SCRIPT) $$(FULL_DEVICE_TABLE)
 ifneq ($$(ROOTFS_$(2)_COMPRESS_CMD),)
 	PATH=$$(BR_PATH) $$(ROOTFS_$(2)_COMPRESS_CMD) $$@ > $$@$$(ROOTFS_$(2)_COMPRESS_EXT)
 endif
@@ -111,7 +116,7 @@ endif
 rootfs-$(1)-show-depends:
 	@echo $$(ROOTFS_$(2)_DEPENDENCIES)
 
-rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1) $$(ROOTFS_$(2)_POST_TARGETS)
+rootfs-$(1): $$(BINARIES_DIR)/rootfs.$(1)
 
 .PHONY: rootfs-$(1) rootfs-$(1)-show-depends
 
@@ -119,10 +124,16 @@ ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
 TARGETS_ROOTFS += rootfs-$(1)
 PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES))
 endif
+
+# Check for legacy POST_TARGETS rules
+ifneq ($$(ROOTFS_$(2)_POST_TARGETS),)
+$$(error Filesystem $(1) uses post-target rules, which are no longer supported.\
+	Update $(1) to use post-gen hooks instead)
+endif
+
 endef
 
-define ROOTFS_TARGET
-	$(call ROOTFS_TARGET_INTERNAL,$(1),$(call UPPERCASE,$(1)))
-endef
+# $(pkgname) also works well to return the filesystem name
+rootfs = $(call inner-rootfs,$(pkgname),$(call UPPERCASE,$(pkgname)))
 
 include $(sort $(wildcard fs/*/*.mk))
diff --git a/bsp/buildroot/fs/cpio/Config.in b/bsp/buildroot/fs/cpio/Config.in
index 206baca6..679959d2 100644
--- a/bsp/buildroot/fs/cpio/Config.in
+++ b/bsp/buildroot/fs/cpio/Config.in
@@ -31,6 +31,11 @@ config BR2_TARGET_ROOTFS_CPIO_BZIP2
 	help
 	  Do compress the cpio filesystem with bzip2.
 
+config BR2_TARGET_ROOTFS_CPIO_LZ4
+	bool "lz4"
+	help
+	  Do compress the cpio filesystem with lz4.
+
 config BR2_TARGET_ROOTFS_CPIO_LZMA
 	bool "lzma"
 	help
diff --git a/bsp/buildroot/fs/cpio/cpio.mk b/bsp/buildroot/fs/cpio/cpio.mk
index e82167e5..aa4d947f 100644
--- a/bsp/buildroot/fs/cpio/cpio.mk
+++ b/bsp/buildroot/fs/cpio/cpio.mk
@@ -31,12 +31,13 @@ define ROOTFS_CPIO_CMD
 	cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
 endef
 
-$(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools
-	$(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
-		-C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@
-
 ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
-ROOTFS_CPIO_POST_TARGETS += $(BINARIES_DIR)/rootfs.cpio.uboot
+ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools
+define ROOTFS_CPIO_UBOOT_MKIMAGE
+	$(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
+		-C none -d $@$(ROOTFS_CPIO_COMPRESS_EXT) $@.uboot
+endef
+ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE
 endif
 
-$(eval $(call ROOTFS_TARGET,cpio))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/cpio/init b/bsp/buildroot/fs/cpio/init
index a2754821..dbe09ac6 100755
--- a/bsp/buildroot/fs/cpio/init
+++ b/bsp/buildroot/fs/cpio/init
@@ -4,4 +4,4 @@
 exec 0</dev/console
 exec 1>/dev/console
 exec 2>/dev/console
-exec /sbin/init $*
+exec /sbin/init "$@"
diff --git a/bsp/buildroot/fs/cramfs/cramfs.mk b/bsp/buildroot/fs/cramfs/cramfs.mk
index 74723729..f8808719 100644
--- a/bsp/buildroot/fs/cramfs/cramfs.mk
+++ b/bsp/buildroot/fs/cramfs/cramfs.mk
@@ -11,9 +11,9 @@ CRAMFS_OPTS = -l
 endif
 
 define ROOTFS_CRAMFS_CMD
-	$(HOST_DIR)/usr/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
+	$(HOST_DIR)/bin/mkcramfs $(CRAMFS_OPTS) $(TARGET_DIR) $@
 endef
 
 ROOTFS_CRAMFS_DEPENDENCIES = host-cramfs
 
-$(eval $(call ROOTFS_TARGET,cramfs))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/ext2/Config.in b/bsp/buildroot/fs/ext2/Config.in
index b8eeed25..27ad69fd 100644
--- a/bsp/buildroot/fs/ext2/Config.in
+++ b/bsp/buildroot/fs/ext2/Config.in
@@ -1,6 +1,6 @@
 config BR2_TARGET_ROOTFS_EXT2
 	bool "ext2/3/4 root filesystem"
-	select BR2_PACKAGE_HOST_MKE2IMG
+	select BR2_PACKAGE_HOST_E2FSPROGS
 	help
 	  Build an ext2/3/4 root filesystem
 
@@ -44,33 +44,48 @@ config BR2_TARGET_ROOTFS_EXT2_REV
 config BR2_TARGET_ROOTFS_EXT2_LABEL
 	string "filesystem label"
 
-config BR2_TARGET_ROOTFS_EXT2_BLOCKS
-	int "exact size in blocks (leave at 0 for auto calculation)"
-	default 0
+config BR2_TARGET_ROOTFS_EXT2_SIZE
+	string "exact size"
+	default BR2_TARGET_ROOTFS_EXT2_BLOCKS if BR2_TARGET_ROOTFS_EXT2_BLOCKS_WRAP # legacy 2017.08
+	default "60M"
+	help
+	  The size of the filesystem image. If it does not have a suffix,
+	  it is interpreted as power-of-two kilobytes. If it is suffixed
+	  by 'k', 'm', 'g', 't' (either upper-case or lower-case), then
+	  it is interpreted in power-of-two kilobytes, megabytes,
+	  gigabytes, terabytes, etc.
 
 config BR2_TARGET_ROOTFS_EXT2_INODES
 	int "exact number of inodes (leave at 0 for auto calculation)"
 	default 0
 
-config BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS
-	int "extra size in blocks" if BR2_TARGET_ROOTFS_EXT2_BLOCKS = 0
-	default 0
-	help
-	  Enter here the number of extra blocks of free space you
-	  want on your filesystem. By default, Buildroot will not
-	  leave much space free.
-
-config BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES
-	int "extra inodes" if BR2_TARGET_ROOTFS_EXT2_INODES = 0
-	default 0
-	help
-	  Enter here the number of extra free inodes you want on
-	  your filesystem. By default, Buildroot will not leave
-	  many free inodes.
-
 config BR2_TARGET_ROOTFS_EXT2_RESBLKS
 	int "reserved blocks percentage"
-	default 0
+	default 5
+	help
+	  The number of blocks on the filesystem (as a percentage of the
+	  total number of blocks), that are reserved for use by root.
+	  Traditionally, this has been 5%, and all ext-related tools still
+	  default to reserving 5% when creating a new ext filesystem.
+
+config BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS
+	string "additional mke2fs options"
+	default "-O ^64bit"
+	help
+	  Specify a space-separated list of mke2fs options, including any
+	  ext2/3/4 filesystem features.
+
+	  For more information about the mke2fs options, see the manual
+	  page mke2fs(8).
+
+	  For more information about the ext2/3/4 features which can be
+	  set, see the manual page ext4(5).
+
+	  The default is "-O ^64bit", i.e. disable 64-bit filesystem
+	  support. This default value has been chosen because U-Boot
+	  versions before 2017.02 don't support this filesystem
+	  option: using it may make the filesystem unreadable by
+	  U-Boot.
 
 choice
 	prompt "Compression method"
@@ -93,6 +108,11 @@ config BR2_TARGET_ROOTFS_EXT2_BZIP2
 	help
 	  Do compress the ext2/3/4 filesystem with bzip2.
 
+config BR2_TARGET_ROOTFS_EXT2_LZ4
+	bool "lz4"
+	help
+	  Do compress the ext2 filesystem with lz4.
+
 config BR2_TARGET_ROOTFS_EXT2_LZMA
 	bool "lzma"
 	help
diff --git a/bsp/buildroot/fs/ext2/ext2.mk b/bsp/buildroot/fs/ext2/ext2.mk
index cfb34c45..6bb4b1c7 100644
--- a/bsp/buildroot/fs/ext2/ext2.mk
+++ b/bsp/buildroot/fs/ext2/ext2.mk
@@ -4,42 +4,43 @@
 #
 ################################################################################
 
-EXT2_OPTS = -G $(BR2_TARGET_ROOTFS_EXT2_GEN) -R $(BR2_TARGET_ROOTFS_EXT2_REV)
-
-ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)),0)
-EXT2_OPTS += -b $(BR2_TARGET_ROOTFS_EXT2_BLOCKS)
+EXT2_SIZE = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_SIZE))
+ifeq ($(BR2_TARGET_ROOTFS_EXT2)-$(EXT2_SIZE),y-)
+$(error BR2_TARGET_ROOTFS_EXT2_SIZE cannot be empty)
 endif
-EXT2_OPTS += -B $(BR2_TARGET_ROOTFS_EXT2_EXTRA_BLOCKS)
 
-ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_INODES)),0)
-EXT2_OPTS += -i $(BR2_TARGET_ROOTFS_EXT2_INODES)
-endif
-EXT2_OPTS += -I $(BR2_TARGET_ROOTFS_EXT2_EXTRA_INODES)
-
-ifneq ($(strip $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)),0)
-EXT2_OPTS += -r $(BR2_TARGET_ROOTFS_EXT2_RESBLKS)
-endif
+EXT2_MKFS_OPTS = $(call qstrip,$(BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS))
 
 # qstrip results in stripping consecutive spaces into a single one. So the
 # variable is not qstrip-ed to preserve the integrity of the string value.
 EXT2_LABEL := $(subst ",,$(BR2_TARGET_ROOTFS_EXT2_LABEL))
-ifneq ($(EXT2_LABEL),)
-EXT2_OPTS += -l "$(EXT2_LABEL)"
-endif
+#" Syntax highlighting... :-/ )
 
-ROOTFS_EXT2_DEPENDENCIES = host-mke2img
+EXT2_OPTS = \
+	-d $(TARGET_DIR) \
+	-r $(BR2_TARGET_ROOTFS_EXT2_REV) \
+	-N $(BR2_TARGET_ROOTFS_EXT2_INODES) \
+	-m $(BR2_TARGET_ROOTFS_EXT2_RESBLKS) \
+	-L "$(EXT2_LABEL)" \
+	$(EXT2_MKFS_OPTS)
+
+ROOTFS_EXT2_DEPENDENCIES = host-e2fsprogs
 
 define ROOTFS_EXT2_CMD
-	PATH=$(BR_PATH) mke2img -d $(TARGET_DIR) $(EXT2_OPTS) -o $@
+	rm -f $@
+	$(HOST_DIR)/sbin/mkfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN) $(EXT2_OPTS) $@ \
+		"$(EXT2_SIZE)" \
+	|| { ret=$$?; \
+	     echo "*** Maybe you need to increase the filesystem size (BR2_TARGET_ROOTFS_EXT2_SIZE)" 1>&2; \
+	     exit $$ret; \
+	}
 endef
 
-rootfs-ext2-symlink:
-	ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT)
-
-.PHONY: rootfs-ext2-symlink
-
 ifneq ($(BR2_TARGET_ROOTFS_EXT2_GEN),2)
-ROOTFS_EXT2_POST_TARGETS += rootfs-ext2-symlink
+define ROOTFS_EXT2_SYMLINK
+	ln -sf rootfs.ext2$(ROOTFS_EXT2_COMPRESS_EXT) $(BINARIES_DIR)/rootfs.ext$(BR2_TARGET_ROOTFS_EXT2_GEN)$(ROOTFS_EXT2_COMPRESS_EXT)
+endef
+ROOTFS_EXT2_POST_GEN_HOOKS += ROOTFS_EXT2_SYMLINK
 endif
 
-$(eval $(call ROOTFS_TARGET,ext2))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/initramfs/initramfs.mk b/bsp/buildroot/fs/initramfs/initramfs.mk
index db508122..b8dee18e 100644
--- a/bsp/buildroot/fs/initramfs/initramfs.mk
+++ b/bsp/buildroot/fs/initramfs/initramfs.mk
@@ -5,17 +5,25 @@
 #
 ################################################################################
 
-ROOTFS_INITRAMFS_DEPENDENCIES += rootfs-cpio
-
-ROOTFS_INITRAMFS_POST_TARGETS += linux-rebuild-with-initramfs
-
-
 # The generic fs infrastructure isn't very useful here.
+#
+# The initramfs image does not actually build an image; its only purpose is:
+# 1- to ensure rootfs.cpio is generated,
+# 2- to then rebuild the kernel with rootfs.cpio as initramfs
+#
+# Note: ordering of the dependencies is not guaranteed here, but in
+# linux/linux.mk, via the linux-rebuild-with-initramfs rule, which depends
+# on the rootfs-cpio filesystem rule.
+#
+# Note: the trick here is that we directly depend on rebuilding the Linux
+# kernel image (which itself depends on the rootfs-cpio rule), while we
+# advertise that our dependency is on the rootfs-cpio rule, which is
+# cleaner in the dependency graph.
 
-rootfs-initramfs: $(ROOTFS_INITRAMFS_DEPENDENCIES) $(ROOTFS_INITRAMFS_POST_TARGETS)
+rootfs-initramfs: linux-rebuild-with-initramfs
 
 rootfs-initramfs-show-depends:
-	@echo $(ROOTFS_INITRAMFS_DEPENDENCIES)
+	@echo rootfs-cpio
 
 .PHONY: rootfs-initramfs rootfs-initramfs-show-depends
 
diff --git a/bsp/buildroot/fs/iso9660/Config.in b/bsp/buildroot/fs/iso9660/Config.in
index d162586f..6f001c06 100644
--- a/bsp/buildroot/fs/iso9660/Config.in
+++ b/bsp/buildroot/fs/iso9660/Config.in
@@ -2,8 +2,7 @@ config BR2_TARGET_ROOTFS_ISO9660
 	bool "iso image"
 	depends on (BR2_i386 || BR2_x86_64)
 	depends on BR2_LINUX_KERNEL
-	depends on BR2_TARGET_GRUB || \
-		BR2_TARGET_GRUB2_I386_PC || \
+	depends on BR2_TARGET_GRUB2_I386_PC || \
 		BR2_TARGET_SYSLINUX_ISOLINUX
 	select BR2_LINUX_KERNEL_INSTALL_TARGET \
 	       if (!BR2_TARGET_ROOTFS_ISO9660_INITRD && !BR2_TARGET_ROOTFS_INITRAMFS)
@@ -26,11 +25,6 @@ if BR2_TARGET_ROOTFS_ISO9660
 choice
 	prompt "Bootloader"
 
-config BR2_TARGET_ROOTFS_ISO9660_GRUB
-	bool "grub"
-	depends on BR2_TARGET_GRUB
-	select BR2_TARGET_GRUB_FS_ISO9660
-
 config BR2_TARGET_ROOTFS_ISO9660_GRUB2
 	bool "grub2"
 	depends on BR2_TARGET_GRUB2_I386_PC
@@ -48,13 +42,11 @@ endchoice
 
 config BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU
 	string "Boot menu config file"
-	default "fs/iso9660/menu.lst" if BR2_TARGET_ROOTFS_ISO9660_GRUB
 	default "fs/iso9660/grub.cfg" if BR2_TARGET_ROOTFS_ISO9660_GRUB2
 	default "fs/iso9660/isolinux.cfg" if BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
 	help
 	  Use this option to provide a custom bootloader configuration
-	  file (menu.lst for Grub, grub.cfg for Grub 2, isolinux.cfg for
-	  isolinux).
+	  file (grub.cfg for Grub 2, isolinux.cfg for isolinux).
 
 	  Note that the strings __KERNEL_PATH__ and __INITRD_PATH__
 	  will automatically be replaced by the path to the kernel and
@@ -71,6 +63,15 @@ config BR2_TARGET_ROOTFS_ISO9660_INITRD
 	  contain a kernel image, an initrd image (unless an initramfs
 	  linked into the kernel is used) and the bootloader.
 
+config BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION
+	bool "transparent compression"
+	depends on !BR2_TARGET_ROOTFS_ISO9660_INITRD
+	depends on !BR2_TARGET_ROOTFS_INITRAMFS
+	help
+	  Say 'y' to enable use of transparent (de)compression. Files
+	  are stored compressed and will be decompressed on-the-fly
+	  upon access at runtime.
+
 config BR2_TARGET_ROOTFS_ISO9660_HYBRID
 	bool "Build hybrid image"
 	depends on BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
@@ -82,7 +83,7 @@ config BR2_TARGET_ROOTFS_ISO9660_HYBRID
 
 endif
 
-comment "iso image needs a Linux kernel and one of grub, grub2 i386-pc or isolinux to be built"
+comment "iso image needs a Linux kernel and either grub2 i386-pc or isolinux to be built"
 	depends on BR2_i386 || BR2_x86_64
 	depends on !BR2_LINUX_KERNEL || \
-		!(BR2_TARGET_GRUB || BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_SYSLINUX_ISOLINUX)
+		!(BR2_TARGET_GRUB2_I386_PC || BR2_TARGET_SYSLINUX_ISOLINUX)
diff --git a/bsp/buildroot/fs/iso9660/iso9660.mk b/bsp/buildroot/fs/iso9660/iso9660.mk
index ee98ecfa..207c6aa3 100644
--- a/bsp/buildroot/fs/iso9660/iso9660.mk
+++ b/bsp/buildroot/fs/iso9660/iso9660.mk
@@ -35,26 +35,29 @@ ROOTFS_ISO9660_USE_INITRD = YES
 endif
 
 ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
-ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/rootfs.iso9660.tmp
+ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
 define ROOTFS_ISO9660_CREATE_TEMPDIR
 	$(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
 	mkdir -p $(ROOTFS_ISO9660_TARGET_DIR)
 endef
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR
+else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION),y)
+ROOTFS_ISO9660_DEPENDENCIES += host-zisofs-tools
+ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
+# This must be early, before we copy the bootloader files.
+define ROOTFS_ISO9660_MKZFTREE
+	$(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
+	$(HOST_DIR)/bin/mkzftree -X -z 9 -p $(PARALLEL_JOBS) \
+		$(TARGET_DIR) \
+		$(ROOTFS_ISO9660_TARGET_DIR)
+endef
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_MKZFTREE
+ROOTFS_ISO9660_GENISOIMAGE_OPTS += -z
 else
 ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
 endif
 
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
-ROOTFS_ISO9660_DEPENDENCIES += grub
-ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
-	$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
-ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/stage2_eltorito
-define ROOTFS_ISO9660_INSTALL_BOOTLOADER
-	$(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
-		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
-endef
-else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y)
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y)
 ROOTFS_ISO9660_DEPENDENCIES += grub2
 ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
 	$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub.cfg
@@ -71,7 +74,7 @@ ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin
 define ROOTFS_ISO9660_INSTALL_BOOTLOADER
 	$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \
 		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/
-	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/syslinux/ldlinux.c32 \
+	$(INSTALL) -D -m 0644 $(HOST_DIR)/share/syslinux/ldlinux.c32 \
 		$(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32
 endef
 endif
@@ -86,39 +89,17 @@ endef
 
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
 
-# Grub splash screen disabling
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
-ifeq ($(BR2_TARGET_GRUB_SPLASH),)
-define ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
-	$(SED) '/^splashimage/d' $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
-endef
-ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_SPLASHSCREEN
-endif
-endif
-
 define ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
 	$(SED) '/__INITRD_PATH__/d'  $(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
 endef
 
-ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
-
-# Copy Grub splashscreen to temporary filesystem
-ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB),y)
-ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
-define ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
-	$(INSTALL) -D -m 0644 $(TARGET_DIR)/boot/grub/splash.xpm.gz \
-		$(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/splash.xpm.gz
-endef
-ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_INSTALL_SPLASHSCREEN
-endif
-endif
-
 # Copy the kernel to temporary filesystem
 define ROOTFS_ISO9660_COPY_KERNEL
 	$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \
 		$(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
 endef
 
+ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_KERNEL
 
 # If initramfs is used, disable loading the initrd as the rootfs is
@@ -138,6 +119,10 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_INITRD
 endif
 
 else # ROOTFS_ISO9660_USE_INITRD
+ifeq ($(BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION),y)
+# We must use the uncompressed kernel image
+ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_COPY_KERNEL
+endif
 
 ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_DISABLE_EXTERNAL_INITRD
 
@@ -145,17 +130,18 @@ endif # ROOTFS_ISO9660_USE_INITRD
 
 
 define ROOTFS_ISO9660_CMD
-	$(HOST_DIR)/usr/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
+	$(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
 		-no-emul-boot -boot-load-size 4 -boot-info-table \
+		$(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \
 		-o $@ $(ROOTFS_ISO9660_TARGET_DIR)
 endef
 
 ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y)
 define ROOTFS_ISO9660_GEN_HYBRID
-	$(HOST_DIR)/usr/bin/isohybrid -t 0x96 $@
+	$(HOST_DIR)/bin/isohybrid -t 0x96 $@
 endef
 
 ROOTFS_ISO9660_POST_GEN_HOOKS += ROOTFS_ISO9660_GEN_HYBRID
 endif
 
-$(eval $(call ROOTFS_TARGET,iso9660))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/iso9660/menu.lst b/bsp/buildroot/fs/iso9660/menu.lst
deleted file mode 100644
index eb1ecef5..00000000
--- a/bsp/buildroot/fs/iso9660/menu.lst
+++ /dev/null
@@ -1,20 +0,0 @@
-default		0
-timeout		10
-
-# Used when no splashimage is used
-color 		cyan/blue white/blue
-
-# Gets enabled/disabled depending on Grub support for splashimage
-splashimage	/boot/grub/splash.xpm.gz
-
-# Used when a splashimage is enabled
-foreground 	000000
-background 	cccccc
-
-title		Buildroot ISO9660 image
-kernel		__KERNEL_PATH__ root=/dev/sr0
-initrd		__INITRD_PATH__
-
-title		Hard Drive (first partition)
-rootnoverify	(hd0)
-chainloader	+1
diff --git a/bsp/buildroot/fs/jffs2/jffs2.mk b/bsp/buildroot/fs/jffs2/jffs2.mk
index 9a36a75f..740ab3e0 100644
--- a/bsp/buildroot/fs/jffs2/jffs2.mk
+++ b/bsp/buildroot/fs/jffs2/jffs2.mk
@@ -49,4 +49,4 @@ define ROOTFS_JFFS2_CMD
 endef
 endif
 
-$(eval $(call ROOTFS_TARGET,jffs2))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/romfs/romfs.mk b/bsp/buildroot/fs/romfs/romfs.mk
index 2738b6b2..163751b4 100644
--- a/bsp/buildroot/fs/romfs/romfs.mk
+++ b/bsp/buildroot/fs/romfs/romfs.mk
@@ -7,7 +7,7 @@
 ROOTFS_ROMFS_DEPENDENCIES = host-genromfs
 
 define ROOTFS_ROMFS_CMD
-	$(HOST_DIR)/usr/bin/genromfs -d $(TARGET_DIR) -f $@
+	$(HOST_DIR)/bin/genromfs -d $(TARGET_DIR) -f $@
 endef
 
-$(eval $(call ROOTFS_TARGET,romfs))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/squashfs/squashfs.mk b/bsp/buildroot/fs/squashfs/squashfs.mk
index c4d9ca50..51abd5d7 100644
--- a/bsp/buildroot/fs/squashfs/squashfs.mk
+++ b/bsp/buildroot/fs/squashfs/squashfs.mk
@@ -6,27 +6,22 @@
 
 ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
 
+ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS)
+
 ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y)
 ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc
-else
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
+else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
 ROOTFS_SQUASHFS_ARGS += -comp lzo
-else
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y)
+else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZMA),y)
 ROOTFS_SQUASHFS_ARGS += -comp lzma
-else
-ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y)
+else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_XZ),y)
 ROOTFS_SQUASHFS_ARGS += -comp xz
 else
 ROOTFS_SQUASHFS_ARGS += -comp gzip
 endif
-endif
-endif
-endif
 
 define ROOTFS_SQUASHFS_CMD
-	$(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $@ -noappend \
-		$(ROOTFS_SQUASHFS_ARGS)
+	$(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ $(ROOTFS_SQUASHFS_ARGS)
 endef
 
-$(eval $(call ROOTFS_TARGET,squashfs))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/tar/Config.in b/bsp/buildroot/fs/tar/Config.in
index 63663ecd..2116edf1 100644
--- a/bsp/buildroot/fs/tar/Config.in
+++ b/bsp/buildroot/fs/tar/Config.in
@@ -26,6 +26,11 @@ config BR2_TARGET_ROOTFS_TAR_BZIP2
 	help
 	  Do compress the tarball with bzip2.
 
+config BR2_TARGET_ROOTFS_TAR_LZ4
+	bool "lz4"
+	help
+	  Do compress the tarball with lz4.
+
 config BR2_TARGET_ROOTFS_TAR_LZMA
 	bool "lzma"
 	help
diff --git a/bsp/buildroot/fs/tar/tar.mk b/bsp/buildroot/fs/tar/tar.mk
index 0e3eacbe..e39c2fdb 100644
--- a/bsp/buildroot/fs/tar/tar.mk
+++ b/bsp/buildroot/fs/tar/tar.mk
@@ -11,4 +11,4 @@ define ROOTFS_TAR_CMD
 		tar $(TAR_OPTS) -cf $@ --null --no-recursion -T - --numeric-owner)
 endef
 
-$(eval $(call ROOTFS_TARGET,tar))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/ubi/Config.in b/bsp/buildroot/fs/ubi/Config.in
new file mode 100644
index 00000000..5fa2f1f6
--- /dev/null
+++ b/bsp/buildroot/fs/ubi/Config.in
@@ -0,0 +1,51 @@
+config BR2_TARGET_ROOTFS_UBI
+	bool "ubi image containing an ubifs root filesystem"
+	select BR2_TARGET_ROOTFS_UBIFS
+	help
+	  Build an ubi image from the ubifs one (with ubinize).
+
+if BR2_TARGET_ROOTFS_UBI
+
+config BR2_TARGET_ROOTFS_UBI_PEBSIZE
+	hex "physical eraseblock size"
+	default 0x20000
+	help
+	  Tells ubinize the physical eraseblock (PEB) size of the
+	  flash chip the ubi image is created for. The value provided
+	  here is passed to the -p/--peb-size option of ubinize.
+
+config BR2_TARGET_ROOTFS_UBI_SUBSIZE
+	int "sub-page size"
+	default 512
+	help
+	  Tells ubinize that the flash supports sub-pages and the sub-page
+	  size. Use 0 if sub-pages are not supported on flash chip.
+	  The value provided here is passed to the -s/--sub-page-size
+	  option of ubinize.
+
+config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
+	bool "Use custom config file"
+	help
+	  Select this option to use a custom ubinize configuration file,
+	  rather than the default configuration used by Buildroot (which
+	  defines a single dynamic volume marked as auto-resize).  Passing
+	  a custom ubinize configuration file allows you to create several
+	  volumes, specify volume types, etc.
+
+	  As a convenience, buildroot replaces the string
+	  "BR2_ROOTFS_UBIFS_PATH" with the path to the built ubifs file.
+	  So the volume defined for the root filesystem can specify the
+	  image path as:  image=BR2_ROOTFS_UBIFS_PATH
+
+config BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE
+	string "Configuration file path"
+	depends on BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
+	help
+	  Path to the ubinize configuration file.
+
+config BR2_TARGET_ROOTFS_UBI_OPTS
+	string "Additional ubinize options"
+	help
+	  Any additional ubinize options you may want to include.
+
+endif # BR2_TARGET_ROOTFS_UBI
diff --git a/bsp/buildroot/fs/ubifs/ubi.mk b/bsp/buildroot/fs/ubi/ubi.mk
similarity index 85%
rename from bsp/buildroot/fs/ubifs/ubi.mk
rename to bsp/buildroot/fs/ubi/ubi.mk
index e488cb5f..c78feda5 100644
--- a/bsp/buildroot/fs/ubifs/ubi.mk
+++ b/bsp/buildroot/fs/ubi/ubi.mk
@@ -17,7 +17,7 @@ ROOTFS_UBI_DEPENDENCIES = rootfs-ubifs
 ifeq ($(BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG),y)
 UBINIZE_CONFIG_FILE_PATH = $(call qstrip,$(BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE))
 else
-UBINIZE_CONFIG_FILE_PATH = fs/ubifs/ubinize.cfg
+UBINIZE_CONFIG_FILE_PATH = fs/ubi/ubinize.cfg
 endif
 
 # don't use sed -i as it misbehaves on systems with SELinux enabled when this is
@@ -25,8 +25,8 @@ endif
 define ROOTFS_UBI_CMD
 	sed 's;BR2_ROOTFS_UBIFS_PATH;$@fs;' \
 		$(UBINIZE_CONFIG_FILE_PATH) > $(BUILD_DIR)/ubinize.cfg
-	$(HOST_DIR)/usr/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
+	$(HOST_DIR)/sbin/ubinize -o $@ $(UBI_UBINIZE_OPTS) $(BUILD_DIR)/ubinize.cfg
 	rm $(BUILD_DIR)/ubinize.cfg
 endef
 
-$(eval $(call ROOTFS_TARGET,ubi))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/ubifs/ubinize.cfg b/bsp/buildroot/fs/ubi/ubinize.cfg
similarity index 100%
rename from bsp/buildroot/fs/ubifs/ubinize.cfg
rename to bsp/buildroot/fs/ubi/ubinize.cfg
diff --git a/bsp/buildroot/fs/ubifs/Config.in b/bsp/buildroot/fs/ubifs/Config.in
index ff604c5c..e79ab9a1 100644
--- a/bsp/buildroot/fs/ubifs/Config.in
+++ b/bsp/buildroot/fs/ubifs/Config.in
@@ -95,55 +95,4 @@ config BR2_TARGET_ROOTFS_UBIFS_OPTS
 	help
 	  Any additional mkfs.ubifs options you may want to include.
 
-config BR2_TARGET_ROOTFS_UBI
-	bool "Embed into an UBI image"
-	help
-	  Build an ubi image from the ubifs one (with ubinize).
-
-if BR2_TARGET_ROOTFS_UBI
-
-config BR2_TARGET_ROOTFS_UBI_PEBSIZE
-	hex "physical eraseblock size"
-	default 0x20000
-	help
-	  Tells ubinize the physical eraseblock (PEB) size of the
-	  flash chip the ubi image is created for. The value provided
-	  here is passed to the -p/--peb-size option of ubinize.
-
-config BR2_TARGET_ROOTFS_UBI_SUBSIZE
-	int "sub-page size"
-	default 512
-	help
-	  Tells ubinize that the flash supports sub-pages and the sub-page
-	  size. Use 0 if sub-pages are not supported on flash chip.
-	  The value provided here is passed to the -s/--sub-page-size
-	  option of ubinize.
-
-config BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
-	bool "Use custom config file"
-	help
-	  Select this option to use a custom ubinize configuration file,
-	  rather than the default configuration used by Buildroot (which
-	  defines a single dynamic volume marked as auto-resize).  Passing
-	  a custom ubinize configuration file allows you to create several
-	  volumes, specify volume types, etc.
-
-	  As a convenience, buildroot replaces the string
-	  "BR2_ROOTFS_UBIFS_PATH" with the path to the built ubifs file.
-	  So the volume defined for the root filesystem can specify the
-	  image path as:  image=BR2_ROOTFS_UBIFS_PATH
-
-config BR2_TARGET_ROOTFS_UBI_CUSTOM_CONFIG_FILE
-	string "Configuration file path"
-	depends on BR2_TARGET_ROOTFS_UBI_USE_CUSTOM_CONFIG
-	help
-	  Path to the ubinize configuration file.
-
-config BR2_TARGET_ROOTFS_UBI_OPTS
-	string "Additional ubinize options"
-	help
-	  Any additional ubinize options you may want to include.
-
-endif # BR2_TARGET_ROOTFS_UBI
-
 endif # BR2_TARGET_ROOTFS_UBIFS
diff --git a/bsp/buildroot/fs/ubifs/ubifs.mk b/bsp/buildroot/fs/ubifs/ubifs.mk
index f1e4126e..2cfc397a 100644
--- a/bsp/buildroot/fs/ubifs/ubifs.mk
+++ b/bsp/buildroot/fs/ubifs/ubifs.mk
@@ -4,7 +4,10 @@
 #
 ################################################################################
 
-UBIFS_OPTS := -e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) -c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) -m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
+UBIFS_OPTS = \
+	-e $(BR2_TARGET_ROOTFS_UBIFS_LEBSIZE) \
+	-c $(BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT) \
+	-m $(BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE)
 
 ifeq ($(BR2_TARGET_ROOTFS_UBIFS_RT_ZLIB),y)
 UBIFS_OPTS += -x zlib
@@ -21,7 +24,7 @@ UBIFS_OPTS += $(call qstrip,$(BR2_TARGET_ROOTFS_UBIFS_OPTS))
 ROOTFS_UBIFS_DEPENDENCIES = host-mtd
 
 define ROOTFS_UBIFS_CMD
-	$(HOST_DIR)/usr/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
+	$(HOST_DIR)/sbin/mkfs.ubifs -d $(TARGET_DIR) $(UBIFS_OPTS) -o $@
 endef
 
-$(eval $(call ROOTFS_TARGET,ubifs))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/fs/yaffs2/yaffs.mk b/bsp/buildroot/fs/yaffs2/yaffs.mk
index 19bdbe84..9cba27af 100644
--- a/bsp/buildroot/fs/yaffs2/yaffs.mk
+++ b/bsp/buildroot/fs/yaffs2/yaffs.mk
@@ -7,7 +7,7 @@
 ROOTFS_YAFFS2_DEPENDENCIES = host-yaffs2utils
 
 define ROOTFS_YAFFS2_CMD
-	$(HOST_DIR)/usr/bin/mkyaffs2 --all-root $(TARGET_DIR) $@
+	$(HOST_DIR)/bin/mkyaffs2 --all-root $(TARGET_DIR) $@
 endef
 
-$(eval $(call ROOTFS_TARGET,yaffs2))
+$(eval $(rootfs))
diff --git a/bsp/buildroot/linux/Config.in b/bsp/buildroot/linux/Config.in
index fe9445a0..e931bd41 100644
--- a/bsp/buildroot/linux/Config.in
+++ b/bsp/buildroot/linux/Config.in
@@ -8,6 +8,10 @@ config BR2_LINUX_KERNEL
 
 if BR2_LINUX_KERNEL
 
+comment "Linux kernel in thumb mode may be broken with binutils >= 2.29"
+	depends on BR2_arm || BR2_armeb
+	depends on !BR2_BINUTILS_VERSION_2_28_X
+
 # Packages that need to have a kernel with support for loadable modules,
 # but do not use the kernel-modules infrastructure, should select that
 # option.
@@ -26,7 +30,26 @@ choice
 	prompt "Kernel version"
 
 config BR2_LINUX_KERNEL_LATEST_VERSION
-	bool "Latest version (4.9.13)"
+	bool "Latest version (4.15)"
+
+config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
+	bool "Latest CIP SLTS version (v4.4.138-cip25)"
+	help
+	  CIP launched in the spring of 2016 to address the needs of
+	  organizations in industries such as power generation and
+	  distribution, water, oil and gas, transportation, building
+	  automation and more for reliable and secure Linux-based
+	  embedded systems that can be sustained over a period of
+	  10 to as many as 60 years.
+	  The project's goal is to provide an open source base layer
+	  of industrial-grade software that permits the use and
+	  implementation of software building blocks that meet
+	  these requirements.
+
+	  The CIP community plans to maintain 4.4 for security and
+	  bug fixes for more than 10 years.
+
+	  https://www.cip-project.org
 
 config BR2_LINUX_KERNEL_CUSTOM_VERSION
 	bool "Custom version"
@@ -97,7 +120,8 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "4.9.13" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "4.15.16" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "v4.4.138-cip25" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
@@ -167,9 +191,6 @@ config BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES
 # Binary format
 #
 
-config BR2_LINUX_KERNEL_UBOOT_IMAGE
-	bool
-
 choice
 	prompt "Kernel binary format"
 	default BR2_LINUX_KERNEL_ZIMAGE if BR2_arm || BR2_armeb
@@ -179,15 +200,15 @@ config BR2_LINUX_KERNEL_UIMAGE
 	depends on BR2_arc || BR2_arm || BR2_armeb || BR2_bfin || \
 		   BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
 		   BR2_sh || BR2_mips || BR2_mipsel || \
-		   BR2_mips64 || BR2_mips64el
-	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+		   BR2_mips64 || BR2_mips64el || BR2_xtensa
+	select BR2_PACKAGE_HOST_UBOOT_TOOLS
 
 config BR2_LINUX_KERNEL_APPENDED_UIMAGE
 	bool "uImage with appended DT"
 	depends on BR2_arm || BR2_armeb
 	select BR2_LINUX_KERNEL_DTS_SUPPORT
 	select BR2_LINUX_KERNEL_APPENDED_DTB
-	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_PACKAGE_HOST_UBOOT_TOOLS
 
 config BR2_LINUX_KERNEL_BZIMAGE
 	bool "bzImage"
@@ -212,14 +233,14 @@ config BR2_LINUX_KERNEL_APPENDED_ZIMAGE
 config BR2_LINUX_KERNEL_CUIMAGE
 	bool "cuImage"
 	depends on BR2_powerpc
-	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_PACKAGE_HOST_UBOOT_TOOLS
 	select BR2_LINUX_KERNEL_DTS_SUPPORT
 	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 
 config BR2_LINUX_KERNEL_SIMPLEIMAGE
 	bool "simpleImage"
 	depends on BR2_microblaze
-	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_PACKAGE_HOST_UBOOT_TOOLS
 	select BR2_LINUX_KERNEL_DTS_SUPPORT
 	select BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 
@@ -230,7 +251,7 @@ config BR2_LINUX_KERNEL_IMAGE
 config BR2_LINUX_KERNEL_LINUX_BIN
 	bool "linux.bin"
 	depends on BR2_microblaze
-	select BR2_LINUX_KERNEL_UBOOT_IMAGE
+	select BR2_PACKAGE_HOST_UBOOT_TOOLS
 
 config BR2_LINUX_KERNEL_VMLINUX_BIN
 	bool "vmlinux.bin"
@@ -346,40 +367,19 @@ config BR2_LINUX_KERNEL_DTB_IS_SELF_BUILT
 config BR2_LINUX_KERNEL_APPENDED_DTB
 	bool
 
-choice
-	prompt "Device tree source"
-	default BR2_LINUX_KERNEL_USE_INTREE_DTS
-
-config BR2_LINUX_KERNEL_USE_INTREE_DTS
-	bool "Use a device tree present in the kernel."
-	help
-	  Use a device tree source distributed with
-	  the kernel sources. The dts files are located
-	  in the arch/<arch>/boot/dts folder.
-
-config BR2_LINUX_KERNEL_USE_CUSTOM_DTS
-	bool "Use a custom device tree file"
-	help
-	  Use a custom device tree file, i.e, a device
-	  tree file that does not belong to the kernel
-	  source tree.
-endchoice
-
 config BR2_LINUX_KERNEL_INTREE_DTS_NAME
-	string "Device Tree Source file names"
-	depends on BR2_LINUX_KERNEL_USE_INTREE_DTS
+	string "In-tree Device Tree Source file names"
 	help
-	  Name of the device tree source file, without
+	  Name of in-tree device tree source file, without
 	  the trailing .dts. You can provide a list of
 	  dts files to build, separated by spaces.
 
 config BR2_LINUX_KERNEL_CUSTOM_DTS_PATH
-	string "Device Tree Source file paths"
-	depends on BR2_LINUX_KERNEL_USE_CUSTOM_DTS
+	string "Out-of-tree Device Tree Source file paths"
 	help
-	  Path to the device tree source files. You can
-	  provide a list of dts paths to copy and build,
-	  separated by spaces.
+	  Path to to out-of-tree device tree source files.
+	  You can provide a list of dts paths to copy and
+	  build, separated by spaces.
 
 endif
 
@@ -395,6 +395,32 @@ config BR2_LINUX_KERNEL_INSTALL_TARGET
 	  /boot if DTBs have been generated by the kernel build
 	  process.
 
+config BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL
+	bool "Needs host OpenSSL"
+	help
+	  Some Linux kernel configuration options (such as
+	  CONFIG_SYSTEM_TRUSTED_KEYRING) require building a host
+	  program called extract-cert, which itself needs
+	  OpenSSL. Enabling this option will ensure host-openssl gets
+	  built before the Linux kernel.
+
+	  Enable this option if you get a Linux kernel build failure
+	  such as "scripts/extract-cert.c:21:25: fatal error:
+	  openssl/bio.h: No such file or directory".
+
+config BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF
+	bool "Needs host libelf"
+	help
+	  Some Linux kernel configuration options (such as
+	  CONFIG_UNWINDER_ORC) require building a host program that
+	  needs libelf. Enabling this option will ensure host-elfutils
+	  (which provides libelf) gets built before the Linux kernel.
+
+	  Enable this option if you get a Linux kernel build failure
+	  such as "Cannot generate ORC metadata for
+	  CONFIG_UNWINDER_ORC=y, please install libelf-dev,
+	  libelf-devel or elfutils-libelf-devel".
+
 # Linux extensions
 source "linux/Config.ext.in"
 
diff --git a/bsp/buildroot/linux/linux-ext-rtai.mk b/bsp/buildroot/linux/linux-ext-rtai.mk
index 0cc1232b..fb483aa8 100644
--- a/bsp/buildroot/linux/linux-ext-rtai.mk
+++ b/bsp/buildroot/linux/linux-ext-rtai.mk
@@ -20,8 +20,8 @@ endif
 define RTAI_PREPARE_KERNEL
 	kver=`$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelversion` ; \
 	if test -f $(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/hal-linux-$${kver}-*patch ; then \
-		$(APPLY_PATCHES) $(LINUX_DIR)		 		\
-			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/ 	\
+		$(APPLY_PATCHES) $(LINUX_DIR)				\
+			$(RTAI_DIR)/base/arch/$(RTAI_ARCH)/patches/	\
 			hal-linux-$${kver}-*patch ; \
 	else \
 		echo "No RTAI patch for your kernel version" ; \
diff --git a/bsp/buildroot/linux/linux.mk b/bsp/buildroot/linux/linux.mk
index 131489ac..cc5aeb69 100644
--- a/bsp/buildroot/linux/linux.mk
+++ b/bsp/buildroot/linux/linux.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LINUX_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
-LINUX_LICENSE = GPLv2
+LINUX_LICENSE = GPL-2.0
 LINUX_LICENSE_FILES = COPYING
 
 define LINUX_HELP_CMDS
@@ -20,7 +20,6 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y)
 LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
 LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL)))
 LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
-BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
 LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_SITE_METHOD = git
@@ -30,11 +29,14 @@ LINUX_SITE_METHOD = hg
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y)
 LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_SITE_METHOD = svn
+else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION),y)
+LINUX_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/bwh/linux-cip.git
+else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
+# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for
+# older -rc kernels.
+LINUX_SITE = https://git.kernel.org/torvalds/t
 else
 LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz
-ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
-BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
-endif
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
 # to use the $(word) function. We support versions such as 4.0, 3.1,
 # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
@@ -45,10 +47,10 @@ LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
 else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.)
 LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
 endif
-# release candidates are in testing/ subdir
-ifneq ($(findstring -rc,$(LINUX_VERSION)),)
-LINUX_SITE := $(LINUX_SITE)/testing
-endif # -rc
+endif
+
+ifeq ($(BR2_LINUX_KERNEL)$(BR2_LINUX_KERNEL_LATEST_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(LINUX_SOURCE)
 endif
 
 LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
@@ -72,19 +74,36 @@ LINUX_DEPENDENCIES += host-lzop
 else ifeq ($(BR2_LINUX_KERNEL_XZ),y)
 LINUX_DEPENDENCIES += host-xz
 endif
-LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_GZIP) = CONFIG_KERNEL_GZIP
-LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZ4) = CONFIG_KERNEL_LZ4
-LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) = CONFIG_KERNEL_LZMA
-LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) = CONFIG_KERNEL_LZO
-LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) = CONFIG_KERNEL_XZ
+LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_GZIP) += CONFIG_KERNEL_GZIP
+LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZ4) += CONFIG_KERNEL_LZ4
+LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZMA) += CONFIG_KERNEL_LZMA
+LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_LZO) += CONFIG_KERNEL_LZO
+LINUX_COMPRESSION_OPT_$(BR2_LINUX_KERNEL_XZ) += CONFIG_KERNEL_XZ
 
-ifeq ($(BR2_LINUX_KERNEL_UBOOT_IMAGE),y)
+ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL),y)
+LINUX_DEPENDENCIES += host-openssl
+endif
+
+ifeq ($(BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF),y)
+LINUX_DEPENDENCIES += host-elfutils
+endif
+
+# If host-uboot-tools is selected by the user, assume it is needed to
+# create a custom image
+ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS),y)
 LINUX_DEPENDENCIES += host-uboot-tools
 endif
 
+ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
+define LINUX_XTENSA_OVERLAY_EXTRACT
+	$(call arch-xtensa-overlay-extract,$(@D),linux)
+endef
+LINUX_POST_EXTRACT_HOOKS += LINUX_XTENSA_OVERLAY_EXTRACT
+LINUX_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
+endif
+
 LINUX_MAKE_FLAGS = \
-	HOSTCC="$(HOSTCC)" \
-	HOSTCFLAGS="$(HOSTCFLAGS)" \
+	HOSTCC="$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS)" \
 	ARCH=$(KERNEL_ARCH) \
 	INSTALL_MOD_PATH=$(TARGET_DIR) \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -106,15 +125,13 @@ endif
 # going to be installed in the target filesystem.
 LINUX_VERSION_PROBED = `$(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) --no-print-directory -s kernelrelease 2>/dev/null`
 
-ifeq ($(BR2_LINUX_KERNEL_USE_INTREE_DTS),y)
-KERNEL_DTS_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
-else ifeq ($(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),y)
+KERNEL_DTS_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_NAME))
+
 # We keep only the .dts files, so that the user can specify both .dts
 # and .dtsi files in BR2_LINUX_KERNEL_CUSTOM_DTS_PATH. Both will be
 # copied to arch/<arch>/boot/dts, but only the .dts files will
 # actually be generated as .dtb.
-KERNEL_DTS_NAME = $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
-endif
+KERNEL_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)))))
 
 KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
 
@@ -138,9 +155,9 @@ LINUX_IMAGE_NAME = zImage.epapr
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_ZIMAGE),y)
 LINUX_IMAGE_NAME = zImage
 else ifeq ($(BR2_LINUX_KERNEL_CUIMAGE),y)
-LINUX_IMAGE_NAME = cuImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = cuImage.$(firstword $(KERNEL_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_SIMPLEIMAGE),y)
-LINUX_IMAGE_NAME = simpleImage.$(KERNEL_DTS_NAME)
+LINUX_IMAGE_NAME = simpleImage.$(firstword $(KERNEL_DTS_NAME))
 else ifeq ($(BR2_LINUX_KERNEL_IMAGE),y)
 LINUX_IMAGE_NAME = Image
 else ifeq ($(BR2_LINUX_KERNEL_LINUX_BIN),y)
@@ -218,7 +235,14 @@ LINUX_KCONFIG_FILE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE))
 endif
 LINUX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES))
 LINUX_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig
-LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS)
+
+# LINUX_MAKE_FLAGS overrides HOSTCC to allow the kernel build to find our
+# host-openssl and host-libelf. However, this triggers a bug in the kconfig
+# build script that causes it to build with /usr/include/ncurses.h (which is
+# typically wchar) but link with $(HOST_DIR)/lib/libncurses.so (which is not).
+# We don't actually need any host-package for kconfig, so remove the HOSTCC
+# override again.
+LINUX_KCONFIG_OPTS = $(LINUX_MAKE_FLAGS) HOSTCC="$(HOSTCC)"
 
 # If no package has yet set it, set it from the Kconfig option
 LINUX_NEEDS_MODULES ?= $(BR2_LINUX_NEEDS_MODULES)
@@ -240,7 +264,7 @@ endif
 define LINUX_KCONFIG_FIXUP_CMDS
 	$(if $(LINUX_NEEDS_MODULES),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_MODULES,$(@D)/.config))
-	$(call KCONFIG_ENABLE_OPT,$(LINUX_COMPRESSION_OPT_y),$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,$(strip $(LINUX_COMPRESSION_OPT_y)),$(@D)/.config)
 	$(foreach opt, $(LINUX_COMPRESSION_OPT_),
 		$(call KCONFIG_DISABLE_OPT,$(opt),$(@D)/.config)
 	)
@@ -268,6 +292,8 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER,$(@D)/.config))
+	$(if $(BR2_PACKAGE_LINUX_TOOLS_PERF),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config))
 	$(if $(BR2_PACKAGE_SYSTEMD),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)
@@ -288,6 +314,12 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config))
+	$(if $(BR2_PACKAGE_WIREGUARD),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_INET,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_NET,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO,$(@D)/.config)
+		$(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER,$(@D)/.config))
 	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB,$(@D)/.config))
 	$(if $(BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV),
@@ -344,10 +376,11 @@ endif
 # Compilation. We make sure the kernel gets rebuilt when the
 # configuration has changed.
 define LINUX_BUILD_CMDS
-	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
-		cp -f $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)) $(KERNEL_ARCH_PATH)/boot/dts/)
+	@for dts in $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)); do \
+		cp -f $${dts} $(KERNEL_ARCH_PATH)/boot/dts/ ;   \
+	done
 	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then	\
 		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi
 	$(LINUX_BUILD_DTB)
@@ -378,10 +411,10 @@ endif
 
 define LINUX_INSTALL_HOST_TOOLS
 	# Installing dtc (device tree compiler) as host tool, if selected
-	if grep -q "CONFIG_DTC=y" $(@D)/.config; then 	\
-		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/usr/bin/linux-dtc ;	\
-		if [ ! -e $(HOST_DIR)/usr/bin/dtc ]; then	\
-			ln -sf linux-dtc $(HOST_DIR)/usr/bin/dtc ;	\
+	if grep -q "CONFIG_DTC=y" $(@D)/.config; then	\
+		$(INSTALL) -D -m 0755 $(@D)/scripts/dtc/dtc $(HOST_DIR)/bin/linux-dtc ;	\
+		if [ ! -e $(HOST_DIR)/bin/dtc ]; then	\
+			ln -sf linux-dtc $(HOST_DIR)/bin/dtc ;	\
 		fi	\
 	fi
 endef
@@ -400,7 +433,7 @@ define LINUX_INSTALL_TARGET_CMDS
 	$(LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET)
 	# Install modules and remove symbolic links pointing to build
 	# directories, not relevant on the target
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
+	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then	\
 		$(LINUX_MAKE_ENV) $(MAKE1) $(LINUX_MAKE_FLAGS) -C $(@D) modules_install; \
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/build ;		\
 		rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/source ;	\
@@ -456,9 +489,9 @@ $(error No kernel configuration file specified, check your BR2_LINUX_KERNEL_CUST
 endif
 endif
 
-ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT)$(KERNEL_DTS_NAME),y)
+ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT):$(strip $(KERNEL_DTS_NAME)),y:)
 $(error No kernel device tree source specified, check your \
-BR2_LINUX_KERNEL_USE_INTREE_DTS / BR2_LINUX_KERNEL_USE_CUSTOM_DTS settings)
+BR2_LINUX_KERNEL_INTREE_DTS_NAME / BR2_LINUX_KERNEL_CUSTOM_DTS_PATH settings)
 endif
 
 endif # BR_BUILDING
@@ -466,18 +499,17 @@ endif # BR_BUILDING
 $(eval $(kconfig-package))
 
 # Support for rebuilding the kernel after the cpio archive has
-# been generated in $(BINARIES_DIR)/rootfs.cpio.
-$(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio
+# been generated.
+.PHONY: linux-rebuild-with-initramfs
+linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_target_installed
+linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_images_installed
+linux-rebuild-with-initramfs: rootfs-cpio
+linux-rebuild-with-initramfs:
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
 	# Build the kernel.
-	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(LINUX_DIR) $(LINUX_TARGET_NAME)
 	$(LINUX_APPEND_DTB)
 	# Copy the kernel image(s) to its(their) final destination
 	$(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
 	# If there is a .ub file copy it to the final destination
 	test ! -f $(LINUX_IMAGE_PATH).ub || cp $(LINUX_IMAGE_PATH).ub $(BINARIES_DIR)
-	$(Q)touch $@
-
-# The initramfs building code must make sure this target gets called
-# after it generated the initramfs list of files.
-linux-rebuild-with-initramfs: $(LINUX_DIR)/.stamp_initramfs_rebuilt
diff --git a/bsp/buildroot/package/4th/4th.mk b/bsp/buildroot/package/4th/4th.mk
index 0d82614f..f272e028 100644
--- a/bsp/buildroot/package/4th/4th.mk
+++ b/bsp/buildroot/package/4th/4th.mk
@@ -7,9 +7,9 @@
 4TH_VERSION = 3.62.4
 4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
 4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
-4TH_LICENSE = GPLv3+, LGPLv3+
-# The COPYING file only contains the text of the LGPLv3, but the
-# source code really contains parts under GPLv3+.
+4TH_LICENSE = GPL-3.0+, LGPL-3.0+
+# The COPYING file only contains the text of the LGPL-3.0, but the
+# source code really contains parts under GPL-3.0+.
 4TH_LICENSE_FILES = COPYING
 4TH_DEPENDENCIES = host-4th
 4TH_INSTALL_STAGING = YES
@@ -27,7 +27,7 @@ define 4TH_BUILD_CMDS
 	$(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources all \
 		CROSS="$(TARGET_CROSS)" \
 		CFLAGS="$(4TH_CFLAGS)" \
-		FOURTH=$(HOST_DIR)/usr/bin/4th
+		FOURTH=$(HOST_DIR)/bin/4th
 endef
 
 define 4TH_INSTALL_STAGING_CMDS
@@ -59,11 +59,11 @@ define HOST_4TH_BUILD_CMDS
 endef
 
 define HOST_4TH_INSTALL_CMDS
-	mkdir -p $(HOST_DIR)/usr/bin
-	mkdir -p $(HOST_DIR)/usr/lib
+	mkdir -p $(HOST_DIR)/bin
+	mkdir -p $(HOST_DIR)/lib
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \
-		BINARIES=$(HOST_DIR)/usr/bin \
-		LIBRARIES=$(HOST_DIR)/usr/lib
+		BINARIES=$(HOST_DIR)/bin \
+		LIBRARIES=$(HOST_DIR)/lib
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/Config.in b/bsp/buildroot/package/Config.in
index deff0fe2..456d5443 100644
--- a/bsp/buildroot/package/Config.in
+++ b/bsp/buildroot/package/Config.in
@@ -2,9 +2,15 @@ menu "Target packages"
 
 	source "package/busybox/Config.in"
 	source "package/skeleton/Config.in"
+	source "package/skeleton-custom/Config.in"
+	source "package/skeleton-init-common/Config.in"
+	source "package/skeleton-init-none/Config.in"
+	source "package/skeleton-init-systemd/Config.in"
+	source "package/skeleton-init-sysv/Config.in"
 
 menu "Audio and video applications"
 	source "package/alsa-utils/Config.in"
+	source "package/atest/Config.in"
 	source "package/aumix/Config.in"
 	source "package/bellagio/Config.in"
 	source "package/dvblast/Config.in"
@@ -48,6 +54,7 @@ menu "Audio and video applications"
 	source "package/udpxy/Config.in"
 	source "package/upmpdcli/Config.in"
 	source "package/v4l2grab/Config.in"
+	source "package/v4l2loopback/Config.in"
 	source "package/vlc/Config.in"
 	source "package/vorbis-tools/Config.in"
 	source "package/wavpack/Config.in"
@@ -56,16 +63,19 @@ menu "Audio and video applications"
 endmenu
 
 menu "Compressors and decompressors"
+	source "package/brotli/Config.in"
 	source "package/bzip2/Config.in"
 	source "package/gzip/Config.in"
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
 	source "package/p7zip/Config.in"
+	source "package/pixz/Config.in"
 	source "package/unrar/Config.in"
 	source "package/unzip/Config.in"
 	source "package/xz/Config.in"
 	source "package/zip/Config.in"
+	source "package/zstd/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
@@ -73,6 +83,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/bonnie/Config.in"
 	source "package/cache-calibrator/Config.in"
 	source "package/dhrystone/Config.in"
+	source "package/dieharder/Config.in"
 	source "package/dmalloc/Config.in"
 	source "package/dropwatch/Config.in"
 	source "package/dstat/Config.in"
@@ -114,6 +125,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/stress-ng/Config.in"
 	source "package/sysdig/Config.in"
 	source "package/sysprof/Config.in"
+	source "package/tcf-agent/Config.in"
 	source "package/tinymembench/Config.in"
 	source "package/trace-cmd/Config.in"
 	source "package/trinity/Config.in"
@@ -141,6 +153,7 @@ menu "Development tools"
 	source "package/git-crypt/Config.in"
 	source "package/gperf/Config.in"
 	source "package/grep/Config.in"
+	source "package/jo/Config.in"
 	source "package/jq/Config.in"
 	source "package/libtool/Config.in"
 	source "package/make/Config.in"
@@ -169,6 +182,7 @@ menu "Filesystem and flash utilities"
 	source "package/exfat-utils/Config.in"
 	source "package/f2fs-tools/Config.in"
 	source "package/flashbench/Config.in"
+	source "package/fscryptctl/Config.in"
 	source "package/fwup/Config.in"
 	source "package/genext2fs/Config.in"
 	source "package/genpart/Config.in"
@@ -177,8 +191,8 @@ menu "Filesystem and flash utilities"
 	source "package/mtd/Config.in"
 	source "package/mtools/Config.in"
 	source "package/nfs-utils/Config.in"
+	source "package/nilfs-utils/Config.in"
 	source "package/ntfs-3g/Config.in"
-	source "package/simicsfs/Config.in"
 	source "package/sp-oops-extract/Config.in"
 	source "package/squashfs/Config.in"
 	source "package/sshfs/Config.in"
@@ -222,12 +236,17 @@ menu "Games"
 	source "package/gnuchess/Config.in"
 	source "package/lbreakout2/Config.in"
 	source "package/ltris/Config.in"
+	source "package/lugaru/Config.in"
+	source "package/minetest/Config.in"
+	source "package/minetest-game/Config.in"
 	source "package/opentyrian/Config.in"
 	source "package/opentyrian-data/Config.in"
 	source "package/prboom/Config.in"
 	source "package/rubix/Config.in"
 	source "package/sl/Config.in"
+	source "package/solarus/Config.in"
 	source "package/stella/Config.in"
+	source "package/supertux/Config.in"
 	source "package/supertuxkart/Config.in"
 endmenu
 
@@ -236,12 +255,17 @@ menu "Graphic libraries and applications (graphic/text)"
 comment "Graphic applications"
 	source "package/expedite/Config.in"
 	source "package/fswebcam/Config.in"
+	source "package/ghostscript/Config.in"
 	source "package/glmark2/Config.in"
 	source "package/gnuplot/Config.in"
 	source "package/jhead/Config.in"
+	source "package/kmscube/Config.in"
+	source "package/libva-utils/Config.in"
 	source "package/mesa3d-demos/Config.in"
+	source "package/pngquant/Config.in"
 	source "package/qt5cinex/Config.in"
 	source "package/rrdtool/Config.in"
+	source "package/tesseract-ocr/Config.in"
 
 comment "Graphic libraries"
 	source "package/cegui06/Config.in"
@@ -272,6 +296,8 @@ comment "Graphic libraries"
 	source "package/sdl2/Config.in"
 	source "package/sdl2_gfx/Config.in"
 	source "package/sdl2_image/Config.in"
+	source "package/sdl2_mixer/Config.in"
+	source "package/sdl2_net/Config.in"
 	source "package/sdl2_ttf/Config.in"
 
 comment "Other GUIs"
@@ -330,18 +356,23 @@ comment "X window managers"
 	source "package/matchbox/Config.in"
 	source "package/metacity/Config.in"
 	source "package/openbox/Config.in"
+	source "package/ratpoison/Config.in"
 endmenu
 
 menu "Hardware handling"
 menu "Firmware"
 	source "package/am33x-cm3/Config.in"
+	source "package/armbian-firmware/Config.in"
 	source "package/b43-firmware/Config.in"
 	source "package/linux-firmware/Config.in"
+	source "package/rpi-bt-firmware/Config.in"
 	source "package/rpi-firmware/Config.in"
+	source "package/rpi-wifi-firmware/Config.in"
 	source "package/sunxi-boards/Config.in"
 	source "package/ts4900-fpga/Config.in"
 	source "package/ux500-firmware/Config.in"
 	source "package/wilc1000-firmware/Config.in"
+	source "package/wilink-bt-firmware/Config.in"
 	source "package/zd1211-firmware/Config.in"
 endmenu
 	source "package/a10disp/Config.in"
@@ -354,24 +385,29 @@ endmenu
 	source "package/avrdude/Config.in"
 	source "package/bcache-tools/Config.in"
 	source "package/biosdevname/Config.in"
+	source "package/brltty/Config.in"
 	source "package/cbootimage/Config.in"
 	source "package/cc-tool/Config.in"
 	source "package/cdrkit/Config.in"
 	source "package/cryptsetup/Config.in"
 	source "package/cwiid/Config.in"
+	source "package/dahdi-linux/Config.in"
+	source "package/dahdi-tools/Config.in"
 	source "package/dbus/Config.in"
 	source "package/dbus-cpp/Config.in"
 	source "package/dbus-glib/Config.in"
 	source "package/dbus-python/Config.in"
 	source "package/dbus-triggerd/Config.in"
 	source "package/devmem2/Config.in"
+	source "package/dfu-util/Config.in"
 	source "package/dmidecode/Config.in"
 	source "package/dmraid/Config.in"
+	source "package/dt-utils/Config.in"
 	source "package/dtv-scan-tables/Config.in"
+	source "package/dump1090/Config.in"
 	source "package/dvb-apps/Config.in"
 	source "package/dvbsnoop/Config.in"
 	source "package/edid-decode/Config.in"
-	source "package/eeprog/Config.in"
 	source "package/eudev/Config.in"
 	source "package/ev3dev-linux-drivers/Config.in"
 	source "package/evemu/Config.in"
@@ -395,7 +431,6 @@ endmenu
 	source "package/i2c-tools/Config.in"
 	source "package/i7z/Config.in"
 	source "package/input-event-daemon/Config.in"
-	source "package/input-tools/Config.in"
 	source "package/intel-microcode/Config.in"
 	source "package/iostat/Config.in"
 	source "package/ipmitool/Config.in"
@@ -407,16 +442,20 @@ endmenu
 	source "package/lcdproc/Config.in"
 	source "package/libuio/Config.in"
 	source "package/libump/Config.in"
+	source "package/linuxconsoletools/Config.in"
 	source "package/linux-backports/Config.in"
 	source "package/lirc-tools/Config.in"
 	source "package/lm-sensors/Config.in"
 	source "package/lshw/Config.in"
+	source "package/lsscsi/Config.in"
 	source "package/lsuio/Config.in"
+	source "package/luksmeta/Config.in"
 	source "package/lvm2/Config.in"
 	source "package/mali-t76x/Config.in"
 	source "package/mdadm/Config.in"
 	source "package/memtest86/Config.in"
 	source "package/memtester/Config.in"
+	source "package/memtool/Config.in"
 	source "package/minicom/Config.in"
 	source "package/msr-tools/Config.in"
 	source "package/nanocom/Config.in"
@@ -427,7 +466,6 @@ endmenu
 	source "package/odroid-mali/Config.in"
 	source "package/odroid-scripts/Config.in"
 	source "package/ofono/Config.in"
-	source "package/ola/Config.in"
 	source "package/on2-8170-modules/Config.in"
 	source "package/open2300/Config.in"
 	source "package/openipmi/Config.in"
@@ -444,13 +482,14 @@ endmenu
 	source "package/pru-software-support/Config.in"
 	source "package/pulseview/Config.in"
 	source "package/read-edid/Config.in"
-	source "package/rfkill/Config.in"
 	source "package/rng-tools/Config.in"
 	source "package/rpi-userland/Config.in"
 	source "package/rs485conf/Config.in"
 	source "package/rtl8188eu/Config.in"
 	source "package/rtl8723bs/Config.in"
+	source "package/rtl8723bu/Config.in"
 	source "package/rtl8821au/Config.in"
+	source "package/rtl8189fs/Config.in"
 	source "package/sane-backends/Config.in"
 	source "package/sdparm/Config.in"
 	source "package/setserial/Config.in"
@@ -476,8 +515,10 @@ endmenu
 	source "package/triggerhappy/Config.in"
 	source "package/uboot-tools/Config.in"
 	source "package/ubus/Config.in"
+	source "package/uccp420wlan/Config.in"
 	source "package/udev/Config.in"
 	source "package/udisks/Config.in"
+	source "package/uhubctl/Config.in"
 	source "package/upower/Config.in"
 	source "package/usb_modeswitch/Config.in"
 	source "package/usb_modeswitch_data/Config.in"
@@ -487,6 +528,7 @@ endmenu
 	source "package/wf111/Config.in"
 	source "package/wipe/Config.in"
 	source "package/xorriso/Config.in"
+	source "package/xr819-xradio/Config.in"
 endmenu
 
 menu "Interpreter languages and scripting"
@@ -496,19 +538,23 @@ menu "Interpreter languages and scripting"
 if BR2_PACKAGE_ERLANG
 menu "Erlang libraries/modules"
 	source "package/erlang-goldrush/Config.in"
+	source "package/erlang-jiffy/Config.in"
 	source "package/erlang-lager/Config.in"
 	source "package/erlang-p1-cache-tab/Config.in"
 	source "package/erlang-p1-iconv/Config.in"
+	source "package/erlang-p1-oauth2/Config.in"
 	source "package/erlang-p1-sip/Config.in"
 	source "package/erlang-p1-stringprep/Config.in"
 	source "package/erlang-p1-stun/Config.in"
 	source "package/erlang-p1-tls/Config.in"
 	source "package/erlang-p1-utils/Config.in"
 	source "package/erlang-p1-xml/Config.in"
+	source "package/erlang-p1-xmpp/Config.in"
 	source "package/erlang-p1-yaml/Config.in"
 	source "package/erlang-p1-zlib/Config.in"
 endmenu
 endif
+	source "package/execline/Config.in"
 	source "package/ficl/Config.in"
 	source "package/gauche/Config.in"
 	source "package/guile/Config.in"
@@ -521,10 +567,13 @@ endif
 if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS
 # lua modules are dynamically loaded, so not available on static builds
 menu "Lua libraries/modules"
+# When adding lua packages, make sure the name start with "lua". If the
+# upstream package is "luafoo", call it "luafoo" in Buildroot; if the upstream
+# package is "foo", call it "lua-foo". Many packages currently don't follow
+# this convention, but that's historical accident.
 	source "package/argparse/Config.in"
 	source "package/cgilua/Config.in"
 	source "package/copas/Config.in"
-	source "package/cosmo/Config.in"
 	source "package/coxpcall/Config.in"
 	source "package/dado/Config.in"
 	source "package/easydbus/Config.in"
@@ -535,28 +584,49 @@ menu "Lua libraries/modules"
 	source "package/lpty/Config.in"
 	source "package/lrandom/Config.in"
 	source "package/lsqlite3/Config.in"
+	source "package/lua-basexx/Config.in"
+	source "package/lua-bit32/Config.in"
 	source "package/lua-cjson/Config.in"
 	source "package/lua-coat/Config.in"
 	source "package/lua-coatpersistent/Config.in"
+	source "package/lua-compat53/Config.in"
+	source "package/lua-cqueues/Config.in"
 	source "package/lua-csnappy/Config.in"
+	source "package/lua-curl/Config.in"
+	source "package/lua-datafile/Config.in"
 	source "package/lua-ev/Config.in"
+	source "package/lua-fifo/Config.in"
+	source "package/lua-flu/Config.in"
+	source "package/lua-http/Config.in"
 	source "package/lua-iconv/Config.in"
+	source "package/lua-lpeg-patterns/Config.in"
+	source "package/lua-markdown/Config.in"
 	source "package/lua-messagepack/Config.in"
 	source "package/lua-msgpack-native/Config.in"
 	source "package/lua-periphery/Config.in"
+	source "package/lua-sdl2/Config.in"
+	source "package/lua-stdlib/Config.in"
 	source "package/lua-testmore/Config.in"
+	source "package/lua-utf8/Config.in"
 	source "package/luabitop/Config.in"
 	source "package/luacrypto/Config.in"
+	source "package/luadbi/Config.in"
+	source "package/luadbi-sqlite3/Config.in"
 	source "package/luaexpat/Config.in"
 	source "package/luaexpatutils/Config.in"
 	source "package/luafilesystem/Config.in"
 	source "package/luajson/Config.in"
 	source "package/lualogging/Config.in"
+	source "package/luaossl/Config.in"
 	source "package/luaposix/Config.in"
+	source "package/lua-resty-http/Config.in"
+	source "package/lua-sailor/Config.in"
 	source "package/luasec/Config.in"
 	source "package/luasocket/Config.in"
 	source "package/luasql-sqlite3/Config.in"
+	source "package/lua-valua/Config.in"
 	source "package/lunit/Config.in"
+	source "package/lutok/Config.in"
 	source "package/luv/Config.in"
 	source "package/luvi/Config.in"
 	source "package/lzlib/Config.in"
@@ -564,10 +634,11 @@ menu "Lua libraries/modules"
 	source "package/rings/Config.in"
 	source "package/turbolua/Config.in"
 	source "package/wsapi/Config.in"
+	source "package/wsapi-fcgi/Config.in"
+	source "package/wsapi-xavante/Config.in"
 	source "package/xavante/Config.in"
 endmenu
 endif
-	source "package/lutok/Config.in"
 	source "package/micropython/Config.in"
 	source "package/micropython-lib/Config.in"
 	source "package/moarvm/Config.in"
@@ -647,13 +718,18 @@ endif
 	source "package/python3/Config.in"
 if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 menu "External python modules"
+	source "package/python-aiocoap/Config.in"
 	source "package/python-alsaaudio/Config.in"
 	source "package/python-argh/Config.in"
 	source "package/python-arrow/Config.in"
+	source "package/python-asn1crypto/Config.in"
 	source "package/python-attrs/Config.in"
 	source "package/python-autobahn/Config.in"
+	source "package/python-automat/Config.in"
 	source "package/python-babel/Config.in"
 	source "package/python-backports-abc/Config.in"
+	source "package/python-backports-shutil-get-terminal-size/Config.in"
+	source "package/python-bcrypt/Config.in"
 	source "package/python-beautifulsoup4/Config.in"
 	source "package/python-bitstring/Config.in"
 	source "package/python-bottle/Config.in"
@@ -664,6 +740,7 @@ menu "External python modules"
 	source "package/python-characteristic/Config.in"
 	source "package/python-chardet/Config.in"
 	source "package/python-cheetah/Config.in"
+	source "package/python-cheroot/Config.in"
 	source "package/python-cherrypy/Config.in"
 	source "package/python-click/Config.in"
 	source "package/python-coherence/Config.in"
@@ -680,6 +757,7 @@ menu "External python modules"
 	source "package/python-daemon/Config.in"
 	source "package/python-dataproperty/Config.in"
 	source "package/python-dateutil/Config.in"
+	source "package/python-decorator/Config.in"
 	source "package/python-dialog/Config.in"
 	source "package/python-dialog3/Config.in"
 	source "package/python-dicttoxml/Config.in"
@@ -693,16 +771,23 @@ menu "External python modules"
 	source "package/python-enum/Config.in"
 	source "package/python-enum34/Config.in"
 	source "package/python-flask/Config.in"
+	source "package/python-flask-cors/Config.in"
 	source "package/python-flask-babel/Config.in"
 	source "package/python-flask-jsonrpc/Config.in"
 	source "package/python-flask-login/Config.in"
 	source "package/python-flup/Config.in"
+	source "package/python-functools32/Config.in"
 	source "package/python-futures/Config.in"
 	source "package/python-gobject/Config.in"
 	source "package/python-gunicorn/Config.in"
+	source "package/python-h2/Config.in"
+	source "package/python-hpack/Config.in"
 	source "package/python-html5lib/Config.in"
 	source "package/python-httplib2/Config.in"
 	source "package/python-humanize/Config.in"
+	source "package/python-hyperframe/Config.in"
+	source "package/python-hyperlink/Config.in"
+	source "package/python-ibmiotf/Config.in"
 	source "package/python-id3/Config.in"
 	source "package/python-idna/Config.in"
 	source "package/python-incremental/Config.in"
@@ -712,7 +797,10 @@ menu "External python modules"
 	source "package/python-ipaddress/Config.in"
 	source "package/python-ipy/Config.in"
 	source "package/python-ipython/Config.in"
+	source "package/python-ipython-genutils/Config.in"
+	source "package/python-iso8601/Config.in"
 	source "package/python-itsdangerous/Config.in"
+	source "package/python-jaraco-classes/Config.in"
 	source "package/python-jinja2/Config.in"
 	source "package/python-jsonschema/Config.in"
 	source "package/python-json-schema-validator/Config.in"
@@ -721,6 +809,7 @@ menu "External python modules"
 	source "package/python-lmdb/Config.in"
 	source "package/python-logbook/Config.in"
 	source "package/python-lxml/Config.in"
+	source "package/python-m2r/Config.in"
 	source "package/python-mad/Config.in"
 	source "package/python-mako/Config.in"
 	source "package/python-markdown/Config.in"
@@ -729,6 +818,7 @@ menu "External python modules"
 	source "package/python-mbstrdecoder/Config.in"
 	source "package/python-meld3/Config.in"
 	source "package/python-mistune/Config.in"
+	source "package/python-more-itertools/Config.in"
 	source "package/python-msgpack/Config.in"
 	source "package/python-mutagen/Config.in"
 	source "package/python-mwclient/Config.in"
@@ -739,15 +829,20 @@ menu "External python modules"
 	source "package/python-networkmanager/Config.in"
 	source "package/python-nfc/Config.in"
 	source "package/python-numpy/Config.in"
+	source "package/python-oauthlib/Config.in"
 	source "package/python-paho-mqtt/Config.in"
 	source "package/python-pam/Config.in"
 	source "package/python-paramiko/Config.in"
+	source "package/python-pathlib2/Config.in"
 	source "package/python-pathpy/Config.in"
 	source "package/python-pathtools/Config.in"
 	source "package/python-pathvalidate/Config.in"
 	source "package/python-pexpect/Config.in"
+	source "package/python-pickleshare/Config.in"
 	source "package/python-pillow/Config.in"
+	source "package/python-portend/Config.in"
 	source "package/python-posix-ipc/Config.in"
+	source "package/python-priority/Config.in"
 	source "package/python-prompt-toolkit/Config.in"
 	source "package/python-protobuf/Config.in"
 	source "package/python-psutil/Config.in"
@@ -765,6 +860,7 @@ menu "External python modules"
 	source "package/python-pygments/Config.in"
 	source "package/python-pyicu/Config.in"
 	source "package/python-pyinotify/Config.in"
+	source "package/python-pylibftdi/Config.in"
 	source "package/python-pylru/Config.in"
 	source "package/python-pymysql/Config.in"
 	source "package/python-pynacl/Config.in"
@@ -793,12 +889,19 @@ menu "External python modules"
 	source "package/python-pyxb/Config.in"
 	source "package/python-pyyaml/Config.in"
 	source "package/python-pyzmq/Config.in"
+	source "package/python-raven/Config.in"
+	source "package/python-remi/Config.in"
 	source "package/python-requests/Config.in"
+	source "package/python-requests-oauthlib/Config.in"
 	source "package/python-requests-toolbelt/Config.in"
 	source "package/python-rpi-gpio/Config.in"
 	source "package/python-rtslib-fb/Config.in"
+	source "package/python-scandir/Config.in"
 	source "package/python-scapy3k/Config.in"
+	source "package/python-schedule/Config.in"
 	source "package/python-sdnotify/Config.in"
+	source "package/python-secretstorage/Config.in"
+	source "package/python-see/Config.in"
 	source "package/python-serial/Config.in"
 	source "package/python-service-identity/Config.in"
 	source "package/python-setproctitle/Config.in"
@@ -806,21 +909,30 @@ menu "External python modules"
 	source "package/python-sh/Config.in"
 	source "package/python-shutilwhich/Config.in"
 	source "package/python-simpleaudio/Config.in"
+	source "package/python-simplegeneric/Config.in"
 	source "package/python-simplejson/Config.in"
+	source "package/python-simplesqlite/Config.in"
 	source "package/python-singledispatch/Config.in"
 	source "package/python-sip/Config.in"
 	source "package/python-six/Config.in"
 	source "package/python-slob/Config.in"
 	source "package/python-smbus-cffi/Config.in"
 	source "package/python-socketio/Config.in"
+	source "package/python-sortedcontainers//Config.in"
 	source "package/python-spidev/Config.in"
+	source "package/python-systemd/Config.in"
+	source "package/python-tabledata/Config.in"
+	source "package/python-tempora/Config.in"
+	source "package/python-typepy/Config.in"
 	source "package/python-thrift/Config.in"
 	source "package/python-tomako/Config.in"
 	source "package/python-toml/Config.in"
 	source "package/python-tornado/Config.in"
+	source "package/python-traitlets/Config.in"
 	source "package/python-treq/Config.in"
 	source "package/python-twisted/Config.in"
 	source "package/python-txaio/Config.in"
+	source "package/python-txtorcon/Config.in"
 	source "package/python-u-msgpack/Config.in"
 	source "package/python-ubjson/Config.in"
 	source "package/python-ujson/Config.in"
@@ -831,14 +943,17 @@ menu "External python modules"
 	source "package/python-wcwidth/Config.in"
 	source "package/python-web2py/Config.in"
 	source "package/python-webpy/Config.in"
+	source "package/python-websockets/Config.in"
 	source "package/python-werkzeug/Config.in"
 	source "package/python-whoosh/Config.in"
 	source "package/python-ws4py/Config.in"
 	source "package/python-wsaccel/Config.in"
+	source "package/python-xlib/Config.in"
 	source "package/python-xlrd/Config.in"
 	source "package/python-xlsxwriter/Config.in"
 	source "package/python-xlutils/Config.in"
 	source "package/python-xlwt/Config.in"
+	source "package/python-xmltodict/Config.in"
 	source "package/python-zope-interface/Config.in"
 endmenu
 endif
@@ -858,6 +973,7 @@ menu "Audio/Sound"
 	source "package/alsa-lib/Config.in"
 	source "package/aubio/Config.in"
 	source "package/audiofile/Config.in"
+	source "package/bcg729/Config.in"
 	source "package/celt051/Config.in"
 	source "package/fdk-aac/Config.in"
 	source "package/libao/Config.in"
@@ -924,10 +1040,12 @@ menu "Crypto"
 	source "package/libgcrypt/Config.in"
 	source "package/libgpg-error/Config.in"
 	source "package/libgpgme/Config.in"
+	source "package/libkcapi/Config.in"
 	source "package/libksba/Config.in"
 	source "package/libmcrypt/Config.in"
 	source "package/libmhash/Config.in"
 	source "package/libnss/Config.in"
+	source "package/libscrypt/Config.in"
 	source "package/libsecret/Config.in"
 	source "package/libsha1/Config.in"
 	source "package/libsodium/Config.in"
@@ -938,10 +1056,11 @@ menu "Crypto"
 	source "package/mbedtls/Config.in"
 	source "package/nettle/Config.in"
 	source "package/openssl/Config.in"
-	source "package/polarssl/Config.in"
+	source "package/rhash/Config.in"
 	source "package/tinydtls/Config.in"
 	source "package/trousers/Config.in"
 	source "package/ustream-ssl/Config.in"
+	source "package/wolfssl/Config.in"
 endmenu
 
 menu "Database"
@@ -970,6 +1089,7 @@ menu "Filesystem"
 	source "package/libnfs/Config.in"
 	source "package/libsysfs/Config.in"
 	source "package/lockdev/Config.in"
+	source "package/physfs/Config.in"
 endmenu
 
 menu "Graphics"
@@ -994,10 +1114,13 @@ menu "Graphics"
 	source "package/harfbuzz/Config.in"
 	source "package/ijs/Config.in"
 	source "package/imlib2/Config.in"
+	source "package/irrlicht/Config.in"
 	source "package/jasper/Config.in"
 	source "package/jpeg/Config.in"
 	source "package/kmsxx/Config.in"
 	source "package/lcms2/Config.in"
+	source "package/lensfun/Config.in"
+	source "package/leptonica/Config.in"
 	source "package/lesstif/Config.in"
 	source "package/libart/Config.in"
 	source "package/libdmtx/Config.in"
@@ -1015,8 +1138,10 @@ menu "Graphics"
 	source "package/libglew/Config.in"
 	source "package/libglfw/Config.in"
 	source "package/libglu/Config.in"
+	source "package/libgta/Config.in"
 	source "package/libgtk2/Config.in"
 	source "package/libgtk3/Config.in"
+	source "package/libmediaart/Config.in"
 	source "package/libmng/Config.in"
 	source "package/libpng/Config.in"
 	source "package/libqrencode/Config.in"
@@ -1043,8 +1168,10 @@ menu "Graphics"
 	source "package/tiff/Config.in"
 	source "package/wayland/Config.in"
 	source "package/wayland-protocols/Config.in"
+	source "package/waylandpp/Config.in"
 	source "package/webkitgtk/Config.in"
 	source "package/webp/Config.in"
+	source "package/woff2/Config.in"
 	source "package/zbar/Config.in"
 	source "package/zxing-cpp/Config.in"
 endmenu
@@ -1058,12 +1185,14 @@ menu "Hardware handling"
 	source "package/gnu-efi/Config.in"
 	source "package/hidapi/Config.in"
 	source "package/lcdapi/Config.in"
+	source "package/let-me-create/Config.in"
 	source "package/libaio/Config.in"
 	source "package/libatasmart/Config.in"
 	source "package/libcec/Config.in"
 	source "package/libfreefare/Config.in"
 	source "package/libftdi/Config.in"
 	source "package/libftdi1/Config.in"
+	source "package/libgphoto2/Config.in"
 	source "package/libgpiod/Config.in"
 	source "package/libgudev/Config.in"
 	source "package/libhid/Config.in"
@@ -1075,6 +1204,7 @@ menu "Hardware handling"
 	source "package/libnfc/Config.in"
 	source "package/libpciaccess/Config.in"
 	source "package/libphidget/Config.in"
+	source "package/libpri/Config.in"
 	source "package/libqmi/Config.in"
 	source "package/libraw1394/Config.in"
 	source "package/librtas/Config.in"
@@ -1084,6 +1214,7 @@ menu "Hardware handling"
 	source "package/libsigrok/Config.in"
 	source "package/libsigrokdecode/Config.in"
 	source "package/libsoc/Config.in"
+	source "package/libss7/Config.in"
 	source "package/libusb/Config.in"
 	source "package/libusb-compat/Config.in"
 	source "package/libusbgx/Config.in"
@@ -1133,10 +1264,13 @@ menu "JSON/XML"
 	source "package/expat/Config.in"
 	source "package/ezxml/Config.in"
 	source "package/jansson/Config.in"
+	source "package/jose/Config.in"
 	source "package/jsmn/Config.in"
 	source "package/json-c/Config.in"
+	source "package/json-for-modern-cpp/Config.in"
 	source "package/json-glib/Config.in"
 	source "package/jsoncpp/Config.in"
+	source "package/libbson/Config.in"
 	source "package/libfastjson/Config.in"
 	source "package/libjson/Config.in"
 	source "package/libroxml/Config.in"
@@ -1167,11 +1301,13 @@ menu "Logging"
 	source "package/log4cplus/Config.in"
 	source "package/log4cpp/Config.in"
 	source "package/log4cxx/Config.in"
+	source "package/opentracing-cpp/Config.in"
 	source "package/zlog/Config.in"
 endmenu
 
 menu "Multimedia"
 	source "package/bitstream/Config.in"
+	source "package/kvazaar/Config.in"
 	source "package/libaacs/Config.in"
 	source "package/libamcodec/Config.in"
 	source "package/libass/Config.in"
@@ -1208,12 +1344,16 @@ menu "Networking"
 	source "package/alljoyn-base/Config.in"
 	source "package/alljoyn-tcl/Config.in"
 	source "package/alljoyn-tcl-base/Config.in"
+	source "package/azmq/Config.in"
+	source "package/azure-iot-sdk-c/Config.in"
 	source "package/batman-adv/Config.in"
 	source "package/c-ares/Config.in"
 	source "package/canfestival/Config.in"
 	source "package/cgic/Config.in"
 	source "package/cppzmq/Config.in"
+	source "package/curlpp/Config.in"
 	source "package/czmq/Config.in"
+	source "package/daq/Config.in"
 	source "package/filemq/Config.in"
 	source "package/flickcurl/Config.in"
 	source "package/fmlib/Config.in"
@@ -1229,6 +1369,7 @@ menu "Networking"
 	source "package/libcgi/Config.in"
 	source "package/libcgicc/Config.in"
 	source "package/libcoap/Config.in"
+	source "package/libcpprestsdk/Config.in"
 	source "package/libcurl/Config.in"
 	source "package/libdnet/Config.in"
 	source "package/libeXosip2/Config.in"
@@ -1238,6 +1379,7 @@ menu "Networking"
 	source "package/libidn/Config.in"
 	source "package/libiscsi/Config.in"
 	source "package/libldns/Config.in"
+	source "package/libmaxminddb/Config.in"
 	source "package/libmbus/Config.in"
 	source "package/libmemcached/Config.in"
 	source "package/libmicrohttpd/Config.in"
@@ -1272,6 +1414,7 @@ menu "Networking"
 	source "package/libtirpc/Config.in"
 	source "package/libtorrent/Config.in"
 	source "package/libupnp/Config.in"
+	source "package/libupnp18/Config.in"
 	source "package/libupnpp/Config.in"
 	source "package/liburiparser/Config.in"
 	source "package/libvncserver/Config.in"
@@ -1279,6 +1422,7 @@ menu "Networking"
 	source "package/libwebsockets/Config.in"
 	source "package/lksctp-tools/Config.in"
 	source "package/mongoose/Config.in"
+	source "package/nanomsg/Config.in"
 	source "package/neon/Config.in"
 	source "package/norm/Config.in"
 	source "package/nss-mdns/Config.in"
@@ -1316,16 +1460,18 @@ menu "Other"
 	source "package/clapack/Config.in"
 	source "package/classpath/Config.in"
 	source "package/cppcms/Config.in"
+	source "package/cracklib/Config.in"
 	source "package/dawgdic/Config.in"
 	source "package/ding-libs/Config.in"
 	source "package/eigen/Config.in"
 	source "package/elfutils/Config.in"
 	source "package/fftw/Config.in"
 	source "package/flann/Config.in"
+	source "package/flatbuffers/Config.in"
+	source "package/gconf/Config.in"
 	source "package/gflags/Config.in"
 	source "package/glibmm/Config.in"
 	source "package/glm/Config.in"
-	source "package/gmock/Config.in"
 	source "package/gmp/Config.in"
 	source "package/gsl/Config.in"
 	source "package/gtest/Config.in"
@@ -1333,6 +1479,7 @@ menu "Other"
 	source "package/lapack/Config.in"
 	source "package/libargtable2/Config.in"
 	source "package/libatomic_ops/Config.in"
+	source "package/libb64/Config.in"
 	source "package/libbsd/Config.in"
 	source "package/libcap/Config.in"
 	source "package/libcap-ng/Config.in"
@@ -1340,6 +1487,7 @@ menu "Other"
 	source "package/libcofi/Config.in"
 	source "package/libcroco/Config.in"
 	source "package/libcrossguid/Config.in"
+	source "package/libcsv/Config.in"
 	source "package/libdaemon/Config.in"
 	source "package/libee/Config.in"
 	source "package/libev/Config.in"
@@ -1352,15 +1500,19 @@ menu "Other"
 	source "package/libical/Config.in"
 	source "package/libite/Config.in"
 	source "package/liblinear/Config.in"
+	source "package/libloki/Config.in"
+	source "package/libnpth/Config.in"
 	source "package/libnspr/Config.in"
 	source "package/libpfm4/Config.in"
 	source "package/libplatform/Config.in"
 	source "package/libplist/Config.in"
 	source "package/libpthread-stubs/Config.in"
 	source "package/libpthsem/Config.in"
+	source "package/libpwquality/Config.in"
 	source "package/libseccomp/Config.in"
 	source "package/libsigc/Config.in"
 	source "package/libsigsegv/Config.in"
+	source "package/libspatialindex/Config.in"
 	source "package/libtasn1/Config.in"
 	source "package/libtommath/Config.in"
 	source "package/libtpl/Config.in"
@@ -1381,6 +1533,7 @@ endif
 	source "package/mpc/Config.in"
 	source "package/mpdecimal/Config.in"
 	source "package/mpfr/Config.in"
+	source "package/mpir/Config.in"
 	source "package/msgpack/Config.in"
 	source "package/mtdev2tuio/Config.in"
 	source "package/musl-compat-headers/Config.in"
@@ -1406,10 +1559,13 @@ menu "Security"
 	source "package/libselinux/Config.in"
 	source "package/libsemanage/Config.in"
 	source "package/libsepol/Config.in"
+	source "package/safeclib/Config.in"
 endmenu
 
 menu "Text and terminal handling"
+	source "package/augeas/Config.in"
 	source "package/enchant/Config.in"
+	source "package/fmt/Config.in"
 	source "package/icu/Config.in"
 	source "package/libcli/Config.in"
 	source "package/libedit/Config.in"
@@ -1422,6 +1578,7 @@ menu "Text and terminal handling"
 	source "package/ncurses/Config.in"
 	source "package/newt/Config.in"
 	source "package/pcre/Config.in"
+	source "package/pcre2/Config.in"
 	source "package/popt/Config.in"
 	source "package/readline/Config.in"
 	source "package/slang/Config.in"
@@ -1451,12 +1608,14 @@ menu "Miscellaneous"
 	source "package/empty/Config.in"
 	source "package/gnuradio/Config.in"
 	source "package/googlefontdirectory/Config.in"
+	source "package/gqrx/Config.in"
 	source "package/gr-osmosdr/Config.in"
 	source "package/gsettings-desktop-schemas/Config.in"
 	source "package/haveged/Config.in"
 	source "package/linux-syscall-support/Config.in"
 	source "package/mcrypt/Config.in"
 	source "package/mobile-broadband-provider-info/Config.in"
+	source "package/proj/Config.in"
 	source "package/qemu/Config.in"
 	source "package/qpdf/Config.in"
 	source "package/shared-mime-info/Config.in"
@@ -1466,11 +1625,13 @@ menu "Miscellaneous"
 endmenu
 
 menu "Networking applications"
-	source "package/aiccu/Config.in"
 	source "package/aircrack-ng/Config.in"
+	source "package/aoetools/Config.in"
 	source "package/apache/Config.in"
 	source "package/argus/Config.in"
+	source "package/arp-scan/Config.in"
 	source "package/arptables/Config.in"
+	source "package/asterisk/Config.in"
 	source "package/atftp/Config.in"
 	source "package/autossh/Config.in"
 	source "package/avahi/Config.in"
@@ -1480,10 +1641,12 @@ menu "Networking applications"
 	source "package/batctl/Config.in"
 	source "package/bcusdk/Config.in"
 	source "package/bind/Config.in"
+	source "package/bluez-tools/Config.in"
 	source "package/bluez_utils/Config.in"
 	source "package/bluez5_utils/Config.in"
 	source "package/bmon/Config.in"
 	source "package/boa/Config.in"
+	source "package/boinc/Config.in"
 	source "package/bridge-utils/Config.in"
 	source "package/bwm-ng/Config.in"
 	source "package/c-icap/Config.in"
@@ -1498,6 +1661,7 @@ menu "Networking applications"
 	source "package/crda/Config.in"
 	source "package/ctorrent/Config.in"
 	source "package/cups/Config.in"
+	source "package/cups-filters/Config.in"
 	source "package/dante/Config.in"
 	source "package/darkhttpd/Config.in"
 	source "package/dhcp/Config.in"
@@ -1516,7 +1680,9 @@ menu "Networking applications"
 	source "package/fmc/Config.in"
 	source "package/fping/Config.in"
 	source "package/freeswitch/Config.in"
+	source "package/freeswitch-mod-bcg729/Config.in"
 	source "package/gesftpserver/Config.in"
+	source "package/glorytun/Config.in"
 	source "package/gupnp-tools/Config.in"
 	source "package/gutenprint/Config.in"
 	source "package/hans/Config.in"
@@ -1530,6 +1696,7 @@ menu "Networking applications"
 	source "package/ifplugd/Config.in"
 	source "package/iftop/Config.in"
 	source "package/ifupdown/Config.in"
+	source "package/ifupdown-scripts/Config.in"
 	source "package/igd2-for-linux/Config.in"
 	source "package/igh-ethercat/Config.in"
 	source "package/igmpproxy/Config.in"
@@ -1546,6 +1713,7 @@ menu "Networking applications"
 	source "package/irssi/Config.in"
 	source "package/iw/Config.in"
 	source "package/janus-gateway/Config.in"
+	source "package/keepalived/Config.in"
 	source "package/kismet/Config.in"
 	source "package/knock/Config.in"
 	source "package/leafnode2/Config.in"
@@ -1556,8 +1724,10 @@ menu "Networking applications"
 	source "package/links/Config.in"
 	source "package/linphone/Config.in"
 	source "package/linux-zigbee/Config.in"
+	source "package/linuxptp/Config.in"
 	source "package/lldpd/Config.in"
 	source "package/lrzsz/Config.in"
+	source "package/lynx/Config.in"
 	source "package/macchanger/Config.in"
 	source "package/memcached/Config.in"
 	source "package/mii-diag/Config.in"
@@ -1602,6 +1772,7 @@ endif
 	source "package/odhcp6c/Config.in"
 	source "package/odhcploc/Config.in"
 	source "package/olsr/Config.in"
+	source "package/open-lldp/Config.in"
 	source "package/open-plc-utils/Config.in"
 	source "package/openntpd/Config.in"
 	source "package/openobex/Config.in"
@@ -1610,12 +1781,14 @@ endif
 	source "package/openvpn/Config.in"
 	source "package/p910nd/Config.in"
 	source "package/phidgetwebservice/Config.in"
-	source "package/portmap/Config.in"
+	source "package/phytool/Config.in"
+	source "package/pimd/Config.in"
 	source "package/pound/Config.in"
 	source "package/pppd/Config.in"
 	source "package/pptp-linux/Config.in"
 	source "package/privoxy/Config.in"
 	source "package/proftpd/Config.in"
+	source "package/prosody/Config.in"
 	source "package/proxychains-ng/Config.in"
 	source "package/ptpd/Config.in"
 	source "package/ptpd2/Config.in"
@@ -1630,6 +1803,9 @@ endif
 	source "package/rsync/Config.in"
 	source "package/rtorrent/Config.in"
 	source "package/rtptools/Config.in"
+	source "package/rygel/Config.in"
+	source "package/s6-dns/Config.in"
+	source "package/s6-networking/Config.in"
 	source "package/samba4/Config.in"
 	source "package/sconeserver/Config.in"
 	source "package/ser2net/Config.in"
@@ -1657,6 +1833,7 @@ endif
 	source "package/tinyhttpd/Config.in"
 	source "package/tn5250/Config.in"
 	source "package/tor/Config.in"
+	source "package/traceroute/Config.in"
 	source "package/transmission/Config.in"
 	source "package/tunctl/Config.in"
 	source "package/tvheadend/Config.in"
@@ -1675,6 +1852,7 @@ endif
 	source "package/wavemon/Config.in"
 	source "package/wget/Config.in"
 	source "package/whois/Config.in"
+	source "package/wireguard/Config.in"
 	source "package/wireless-regdb/Config.in"
 	source "package/wireless_tools/Config.in"
 	source "package/wireshark/Config.in"
@@ -1709,7 +1887,13 @@ menu "Real-Time"
 endmenu
 
 menu "Security"
+	source "package/checkpolicy/Config.in"
+	source "package/paxtest/Config.in"
 	source "package/policycoreutils/Config.in"
+	source "package/refpolicy/Config.in"
+	source "package/restorecond/Config.in"
+	source "package/selinux-python/Config.in"
+	source "package/semodule-utils/Config.in"
 	source "package/setools/Config.in"
 endmenu
 
@@ -1725,6 +1909,7 @@ comment "Utilities"
 	source "package/crudini/Config.in"
 	source "package/dialog/Config.in"
 	source "package/dtach/Config.in"
+	source "package/easy-rsa/Config.in"
 	source "package/file/Config.in"
 	source "package/gnupg/Config.in"
 	source "package/gnupg2/Config.in"
@@ -1732,6 +1917,7 @@ comment "Utilities"
 	source "package/lockfile-progs/Config.in"
 	source "package/logrotate/Config.in"
 	source "package/logsurfer/Config.in"
+	source "package/pdmenu/Config.in"
 	source "package/pinentry/Config.in"
 	source "package/ranger/Config.in"
 	source "package/screen/Config.in"
@@ -1755,11 +1941,14 @@ menu "System tools"
 	source "package/circus/Config.in"
 	source "package/coreutils/Config.in"
 	source "package/cpuload/Config.in"
+	source "package/daemon/Config.in"
+	source "package/dc3dd/Config.in"
 	source "package/dcron/Config.in"
 	source "package/ddrescue/Config.in"
 	source "package/debianutils/Config.in"
 	source "package/docker-containerd/Config.in"
 	source "package/docker-engine/Config.in"
+	source "package/docker-proxy/Config.in"
 	source "package/dsp-tools/Config.in"
 	source "package/efibootmgr/Config.in"
 	source "package/efivar/Config.in"
@@ -1774,6 +1963,7 @@ menu "System tools"
 	source "package/keyutils/Config.in"
 	source "package/kmod/Config.in"
 	source "package/kvmtool/Config.in"
+	source "package/libostree/Config.in"
 	source "package/lxc/Config.in"
 	source "package/monit/Config.in"
 	source "package/ncdu/Config.in"
@@ -1787,8 +1977,14 @@ menu "System tools"
 	source "package/psmisc/Config.in"
 	source "package/pwgen/Config.in"
 	source "package/quota/Config.in"
+	source "package/rauc/Config.in"
 	source "package/rsyslog/Config.in"
 	source "package/runc/Config.in"
+	source "package/s6/Config.in"
+	source "package/s6-linux-init/Config.in"
+	source "package/s6-linux-utils/Config.in"
+	source "package/s6-portable-utils/Config.in"
+	source "package/s6-rc/Config.in"
 	source "package/scrub/Config.in"
 	source "package/scrypt/Config.in"
 	source "package/smack/Config.in"
diff --git a/bsp/buildroot/package/Config.in.host b/bsp/buildroot/package/Config.in.host
index 8da79c30..199a8e98 100644
--- a/bsp/buildroot/package/Config.in.host
+++ b/bsp/buildroot/package/Config.in.host
@@ -2,9 +2,12 @@ menu "Host utilities"
 
 	source "package/aespipe/Config.in.host"
 	source "package/android-tools/Config.in.host"
+	source "package/cargo/Config.in.host"
 	source "package/cbootimage/Config.in.host"
 	source "package/checkpolicy/Config.in.host"
+	source "package/cmake/Config.in.host"
 	source "package/cramfs/Config.in.host"
+	source "package/cryptsetup/Config.in.host"
 	source "package/dfu-util/Config.in.host"
 	source "package/dos2unix/Config.in.host"
 	source "package/dosfstools/Config.in.host"
@@ -16,7 +19,10 @@ menu "Host utilities"
 	source "package/genext2fs/Config.in.host"
 	source "package/genimage/Config.in.host"
 	source "package/genpart/Config.in.host"
+	source "package/gnupg/Config.in.host"
 	source "package/go/Config.in.host"
+	source "package/go-bootstrap/Config.in.host"
+	source "package/google-breakpad/Config.in.host"
 	source "package/gptfdisk/Config.in.host"
 	source "package/imx-usb-loader/Config.in.host"
 	source "package/jq/Config.in.host"
@@ -24,7 +30,6 @@ menu "Host utilities"
 	source "package/lpc3250loader/Config.in.host"
 	source "package/lttng-babeltrace/Config.in.host"
 	source "package/mfgtools/Config.in.host"
-	source "package/mke2img/Config.in.host"
 	source "package/mkpasswd/Config.in.host"
 	source "package/mtd/Config.in.host"
 	source "package/mtools/Config.in.host"
@@ -34,10 +39,16 @@ menu "Host utilities"
 	source "package/opkg-utils/Config.in.host"
 	source "package/parted/Config.in.host"
 	source "package/patchelf/Config.in.host"
+	source "package/pkgconf/Config.in.host"
 	source "package/pru-software-support/Config.in.host"
 	source "package/pwgen/Config.in.host"
+	source "package/python-lxml/Config.in.host"
+	source "package/python-six/Config.in.host"
 	source "package/qemu/Config.in.host"
 	source "package/raspberrypi-usbboot/Config.in.host"
+	source "package/rauc/Config.in.host"
+	source "package/rustc/Config.in.host"
+	source "package/s6-rc/Config.in.host"
 	source "package/sam-ba/Config.in.host"
 	source "package/squashfs/Config.in.host"
 	source "package/sunxi-tools/Config.in.host"
diff --git a/bsp/buildroot/package/Makefile.in b/bsp/buildroot/package/Makefile.in
index 523cc678..58af2ef2 100644
--- a/bsp/buildroot/package/Makefile.in
+++ b/bsp/buildroot/package/Makefile.in
@@ -107,7 +107,7 @@ ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy)
 TARGET_ABI += -matomic
 endif
 
-STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot
+STAGING_SUBDIR = $(GNU_TARGET_NAME)/sysroot
 STAGING_DIR    = $(HOST_DIR)/$(STAGING_SUBDIR)
 
 ifeq ($(BR2_OPTIMIZE_0),y)
@@ -138,11 +138,37 @@ ifeq ($(BR2_DEBUG_3),y)
 TARGET_DEBUGGING = -g3
 endif
 
+TARGET_CFLAGS_RELRO = -Wl,-z,relro
+TARGET_CFLAGS_RELRO_FULL = -Wl,-z,now $(TARGET_CFLAGS_RELRO)
+
+TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
+
+ifeq ($(BR2_SSP_REGULAR),y)
+TARGET_CPPFLAGS += -fstack-protector
+else ifeq ($(BR2_SSP_STRONG),y)
+TARGET_CPPFLAGS += -fstack-protector-strong
+else ifeq ($(BR2_SSP_ALL),y)
+TARGET_CPPFLAGS += -fstack-protector-all
+endif
+
+ifeq ($(BR2_RELRO_PARTIAL),y)
+TARGET_CPPFLAGS += $(TARGET_CFLAGS_RELRO)
+TARGET_LDFLAGS += $(TARGET_CFLAGS_RELRO)
+else ifeq ($(BR2_RELRO_FULL),y)
+TARGET_CPPFLAGS += -fPIE $(TARGET_CFLAGS_RELRO_FULL)
+TARGET_LDFLAGS += -pie
+endif
+
+ifeq ($(BR2_FORTIFY_SOURCE_1),y)
+TARGET_CPPFLAGS += -D_FORTIFY_SOURCE=1
+else ifeq ($(BR2_FORTIFY_SOURCE_2),y)
+TARGET_CPPFLAGS += -D_FORTIFY_SOURCE=2
+endif
+
 TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING)
-TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS))
 
 ifeq ($(BR2_BINFMT_FLAT),y)
 TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
@@ -167,24 +193,10 @@ TARGET_FCFLAGS += -msep-data
 TARGET_CXXFLAGS += -msep-data
 endif
 
-ifeq ($(BR2_SSP_REGULAR),y)
-TARGET_CFLAGS += -fstack-protector
-TARGET_CXXFLAGS += -fstack-protector
-TARGET_FCFLAGS += -fstack-protector
-else ifeq ($(BR2_SSP_STRONG),y)
-TARGET_CFLAGS += -fstack-protector-strong
-TARGET_CXXFLAGS += -fstack-protector-strong
-TARGET_FCFLAGS += -fstack-protector-strong
-else ifeq ($(BR2_SSP_ALL),y)
-TARGET_CFLAGS += -fstack-protector-all
-TARGET_CXXFLAGS += -fstack-protector-all
-TARGET_FCFLAGS += -fstack-protector-all
-endif
-
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
-TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-
+TARGET_CROSS = $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-
 else
-TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
+TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
 endif
 
 # Define TARGET_xx variables for all common binutils/gcc
@@ -205,8 +217,7 @@ ifeq ($(BR2_STRIP_strip),y)
 STRIP_STRIP_DEBUG := --strip-debug
 TARGET_STRIP = $(TARGET_CROSS)strip
 STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
-endif
-ifeq ($(BR2_STRIP_none),y)
+else
 TARGET_STRIP = /bin/true
 STRIPCMD = $(TARGET_STRIP)
 endif
@@ -215,13 +226,13 @@ FLEX := $(shell which flex || type -p flex)
 BISON := $(shell which bison || type -p bison)
 UNZIP := $(shell which unzip || type -p unzip) -q
 
-APPLY_PATCHES = PATH=$(HOST_DIR)/usr/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s)
+APPLY_PATCHES = PATH=$(HOST_DIR)/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s)
 
-HOST_CPPFLAGS  = -I$(HOST_DIR)/usr/include
+HOST_CPPFLAGS  = -I$(HOST_DIR)/include
 HOST_CFLAGS   ?= -O2
 HOST_CFLAGS   += $(HOST_CPPFLAGS)
 HOST_CXXFLAGS += $(HOST_CFLAGS)
-HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib
+HOST_LDFLAGS  += -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib
 
 # The macros below are taken from linux 4.11 and adapted slightly.
 # Copy more when needed.
@@ -231,7 +242,7 @@ HOST_LDFLAGS  += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/
 # Exit code chooses option. "$$TMP" is can be used as temporary file and
 # is automatically cleaned up.
 try-run = $(shell set -e;               \
-	TMP="$$(tempfile)";             \
+	TMP="$$(mktemp)";               \
 	if ($(1)) >/dev/null 2>&1;      \
 	then echo "$(2)";               \
 	else echo "$(3)";               \
@@ -246,14 +257,14 @@ host-cc-option = $(call try-run,\
 
 # host-intltool should be executed with the system perl, so we save
 # the path to the system perl, before a host-perl built by Buildroot
-# might get installed into $(HOST_DIR)/usr/bin and therefore appears
+# might get installed into $(HOST_DIR)/bin and therefore appears
 # in our PATH. This system perl will be used as INTLTOOL_PERL.
 export PERL=$(shell which perl)
 
 # host-intltool needs libxml-parser-perl, which Buildroot installs in
-# $(HOST_DIR)/usr/lib/perl, so we must make sure that the system perl
+# $(HOST_DIR)/lib/perl, so we must make sure that the system perl
 # finds this perl module by exporting the proper value for PERL5LIB.
-export PERL5LIB=$(HOST_DIR)/usr/lib/perl
+export PERL5LIB=$(HOST_DIR)/lib/perl
 
 TARGET_MAKE_ENV = PATH=$(BR_PATH)
 
@@ -304,7 +315,7 @@ HOST_MAKE_ENV = \
 	PKG_CONFIG_SYSROOT_DIR="/" \
 	PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
 	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
-	PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig"
+	PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
 
 HOST_CONFIGURE_OPTS = \
 	$(HOST_MAKE_ENV) \
@@ -331,7 +342,8 @@ HOST_CONFIGURE_OPTS = \
 EXTRA_ENV = \
 	PATH=$(BR_PATH) \
 	BR2_DL_DIR=$(BR2_DL_DIR) \
-	BUILD_DIR=$(BUILD_DIR)
+	BUILD_DIR=$(BUILD_DIR) \
+	O=$(CANONICAL_O)
 
 ################################################################################
 # settings we need to pass to configure
@@ -360,7 +372,12 @@ endif
 # AM_GNU_GETTEXT misdetects musl gettext support.
 # musl currently implements api level 1 and 2 (basic + ngettext)
 # http://www.openwall.com/lists/musl/2015/04/16/3
-ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
+#
+# These autoconf variables should only be pre-seeded when the minimal
+# gettext implementation of musl is used. When the full blown
+# implementation provided by gettext libintl is used, auto-detection
+# works fine, and pre-seeding those values is actually wrong.
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y:)
 BR2_GT_CV_FUNC_GNUGETTEXT_LIBC = \
 	gt_cv_func_gnugettext1_libc=yes \
 	gt_cv_func_gnugettext2_libc=yes
@@ -381,14 +398,27 @@ TARGET_CONFIGURE_ARGS = \
 
 ################################################################################
 
-ifeq ($(BR2_ENABLE_LOCALE),y)
-DISABLE_NLS :=
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+NLS_OPTS = --enable-nls
+TARGET_NLS_DEPENDENCIES = host-gettext
+ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
+TARGET_NLS_DEPENDENCIES += gettext
+TARGET_NLS_LIBS += -lintl
+endif
 else
-DISABLE_NLS :=--disable-nls
+NLS_OPTS = --disable-nls
 endif
 
+# We need anything that is invalid. Traditionally, we'd have used 'false' (and
+# we did so in the past). However, that breaks libtool for packages that have
+# optional C++ support (e.g. gnutls), because libtool will *require* a *valid*
+# C++ preprocessor as long as CXX is not 'no'.
+# Now, whether we use 'no' or 'false' for CXX as the same side effect: it is an
+# invalid C++ compiler, and thus will cause detection of C++ to fail (which is
+# expected and what we want), while at the same time taming libtool into
+# silence.
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
-TARGET_CONFIGURE_OPTS += CXX=false CXXCPP=cpp
+TARGET_CONFIGURE_OPTS += CXX=no
 endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/a10disp/Config.in b/bsp/buildroot/package/a10disp/Config.in
index 18e2d8fc..99ae0aad 100644
--- a/bsp/buildroot/package/a10disp/Config.in
+++ b/bsp/buildroot/package/a10disp/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_A10DISP
 	depends on BR2_arm
 	depends on BR2_LINUX_KERNEL
 	help
-	  Program to change the display mode of Allwinner ARM SOCs running
-	  the linux-sunxi kernel (and not the mainline kernel.)
+	  Program to change the display mode of Allwinner ARM SOCs
+	  running the linux-sunxi kernel (and not the mainline kernel.)
 
 	  http://github.com/hglm/a10disp
 
diff --git a/bsp/buildroot/package/acl/0001-Build-with-old-GCC-versions.patch b/bsp/buildroot/package/acl/0001-Build-with-old-GCC-versions.patch
new file mode 100644
index 00000000..a05ff5d9
--- /dev/null
+++ b/bsp/buildroot/package/acl/0001-Build-with-old-GCC-versions.patch
@@ -0,0 +1,32 @@
+From a42519dceef0493ece45538375ae1791313f16d3 Mon Sep 17 00:00:00 2001
+From: Hollis Blanchard <hollis_blanchard@mentor.com>
+Date: Mon, 30 Jul 2018 14:29:46 -0700
+Subject: [PATCH] Remove pragmas inside functions
+
+GCC 4.4.7, as found in RHEL6, reports:
+    libacl/acl_from_text.c:307: error: #pragma GCC diagnostic not allowed inside functions
+
+Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>
+---
+ libacl/acl_from_text.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c
+index 09790c9..fb6bc07 100644
+--- a/libacl/acl_from_text.c
++++ b/libacl/acl_from_text.c
+@@ -304,11 +304,8 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
+ create_entry:
+ 	if (acl_create_entry(acl_p, &entry_d) != 0)
+ 		return -1;
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Waddress"
+ 	if (acl_copy_entry(entry_d, int2ext(&entry_obj)) != 0)
+ 		return -1;
+-#pragma GCC diagnostic pop
+ 	return 0;
+ 
+ fail:
+-- 
+2.13.0
+
diff --git a/bsp/buildroot/package/acl/0001-support-static-installation.patch b/bsp/buildroot/package/acl/0001-support-static-installation.patch
deleted file mode 100644
index 4cb473ff..00000000
--- a/bsp/buildroot/package/acl/0001-support-static-installation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Support installation of .a file when doing static linking
-
-When doing static linking (i.e ENABLE_SHARED != yes), the acl build
-logic wasn't installing any library at all, not even the .a file which
-is needed for static linking. This patch fixes that.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/include/buildmacros
-===================================================================
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -97,7 +97,15 @@
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	fi
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
diff --git a/bsp/buildroot/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch b/bsp/buildroot/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
deleted file mode 100644
index f9a5d9bd..00000000
--- a/bsp/buildroot/package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
+++ /dev/null
@@ -1,292 +0,0 @@
-From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 12 Aug 2014 08:37:25 -0400
-Subject: [PATCH] add __acl_ prefixes to internal symbols
-
-When static linking libacl, people sometimes run into symbol collisions
-because their own code defines symbols like "quote".  So for acl internal
-symbols, use an __acl_ prefix.
-
-[Rahul Bedarkar: backported from upstream 
-  http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ]
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- exports                    | 12 ++----------
- getfacl/getfacl.c          |  4 ++--
- include/misc.h             |  8 ++++----
- libacl/__acl_to_any_text.c |  4 ++--
- libacl/acl_from_text.c     |  4 ++--
- libmisc/high_water_alloc.c |  2 +-
- libmisc/next_line.c        |  6 +++---
- libmisc/quote.c            |  4 ++--
- libmisc/unquote.c          |  2 +-
- setfacl/parse.c            | 10 +++++-----
- setfacl/setfacl.c          |  4 ++--
- 11 files changed, 26 insertions(+), 34 deletions(-)
-
-diff --git a/exports b/exports
-index 7d8e69e..bf15d84 100644
---- a/exports
-+++ b/exports
-@@ -59,22 +59,14 @@ ACL_1.0 {
- 	acl_to_any_text;
- 
-     local:
--    	# Library internal stuff
-+	# Library internal stuff
- 	__new_var_obj_p;
- 	__new_obj_p_here;
- 	__free_obj_p;
- 	__check_obj_p;
- 	__ext2int_and_check;
--	__acl_reorder_entry_obj_p;
--	__acl_reorder_obj_p;
--	__acl_init_obj;
--	__acl_create_entry_obj;
--	__acl_free_acl_obj;
--	__acl_to_any_text;
-+	__acl_*;
- 	__apply_mask_to_mode;
--
--	quote;
--	unquote;
- };
- 
- ACL_1.1 {
-diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c
-index f8eaf25..af9e225 100644
---- a/getfacl/getfacl.c
-+++ b/getfacl/getfacl.c
-@@ -90,7 +90,7 @@ int opt_numeric;  /* don't convert id's to symbolic names */
- 
- static const char *xquote(const char *str, const char *quote_chars)
- {
--	const char *q = quote(str, quote_chars);
-+	const char *q = __acl_quote(str, quote_chars);
- 	if (q == NULL) {
- 		fprintf(stderr, "%s: %s\n", progname, strerror(errno));
- 		exit(1);
-@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
- 	do {
- 		if (optind == argc ||
- 		    strcmp(argv[optind], "-") == 0) {
--			while ((line = next_line(stdin)) != NULL) {
-+			while ((line = __acl_next_line(stdin)) != NULL) {
- 				if (*line == '\0')
- 					continue;
- 
-diff --git a/include/misc.h b/include/misc.h
-index 0c5fdcc..c25accf 100644
---- a/include/misc.h
-+++ b/include/misc.h
-@@ -15,9 +15,9 @@
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
--extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
-+extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize);
- 
--extern const char *quote(const char *str, const char *quote_chars);
--extern char *unquote(char *str);
-+extern const char *__acl_quote(const char *str, const char *quote_chars);
-+extern char *__acl_unquote(char *str);
- 
--extern char *next_line(FILE *file);
-+extern char *__acl_next_line(FILE *file);
-diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c
-index a4f9c34..19f1ccc 100644
---- a/libacl/__acl_to_any_text.c
-+++ b/libacl/__acl_to_any_text.c
-@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
- 				if (options & TEXT_NUMERIC_IDS)
- 					str = NULL;
- 				else
--					str = quote(user_name(
-+					str = __acl_quote(user_name(
- 						entry_obj_p->eid.qid), ":, \t\n\r");
- 				if (str != NULL) {
- 					strncpy(text_p, str, size);
-@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size,
- 				if (options & TEXT_NUMERIC_IDS)
- 					str = NULL;
- 				else
--					str = quote(group_name(
-+					str = __acl_quote(group_name(
- 						entry_obj_p->eid.qid), ":, \t\n\r");
- 				if (str != NULL) {
- 					strncpy(text_p, str, size);
-diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c
-index 1e05322..f6165be 100644
---- a/libacl/acl_from_text.c
-+++ b/libacl/acl_from_text.c
-@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
- 			str = get_token(text_p);
- 			if (str) {
- 				entry_obj.etag = ACL_USER;
--				error = get_uid(unquote(str),
-+				error = get_uid(__acl_unquote(str),
- 						&entry_obj.eid.qid);
- 				free(str);
- 				if (error) {
-@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p)
- 			str = get_token(text_p);
- 			if (str) {
- 				entry_obj.etag = ACL_GROUP;
--				error = get_gid(unquote(str),
-+				error = get_gid(__acl_unquote(str),
- 						&entry_obj.eid.qid);
- 				free(str);
- 				if (error) {
-diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c
-index c127dc1..951f4bb 100644
---- a/libmisc/high_water_alloc.c
-+++ b/libmisc/high_water_alloc.c
-@@ -21,7 +21,7 @@
- #include <stdlib.h>
- #include "misc.h"
- 
--int high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
-+int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize)
- {
- #define CHUNK_SIZE	256
- 	/*
-diff --git a/libmisc/next_line.c b/libmisc/next_line.c
-index 0566d7a..126a364 100644
---- a/libmisc/next_line.c
-+++ b/libmisc/next_line.c
-@@ -23,7 +23,7 @@
- 
- #define LINE_SIZE getpagesize()
- 
--char *next_line(FILE *file)
-+char *__acl_next_line(FILE *file)
- {
- 	static char *line;
- 	static size_t line_size;
-@@ -31,7 +31,7 @@ char *next_line(FILE *file)
- 	int eol = 0;
- 
- 	if (!line) {
--		if (high_water_alloc((void **)&line, &line_size, LINE_SIZE))
-+		if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE))
- 			return NULL;
- 	}
- 	c = line;
-@@ -47,7 +47,7 @@ char *next_line(FILE *file)
- 		if (feof(file))
- 			break;
- 		if (!eol) {
--			if (high_water_alloc((void **)&line, &line_size,
-+			if (__acl_high_water_alloc((void **)&line, &line_size,
- 					     2 * line_size))
- 				return NULL;
- 			c = strrchr(line, '\0');
-diff --git a/libmisc/quote.c b/libmisc/quote.c
-index bf8f9eb..a28800c 100644
---- a/libmisc/quote.c
-+++ b/libmisc/quote.c
-@@ -23,7 +23,7 @@
- #include <string.h>
- #include "misc.h"
- 
--const char *quote(const char *str, const char *quote_chars)
-+const char *__acl_quote(const char *str, const char *quote_chars)
- {
- 	static char *quoted_str;
- 	static size_t quoted_str_len;
-@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars)
- 	if (nonpr == 0)
- 		return str;
- 
--	if (high_water_alloc((void **)&quoted_str, &quoted_str_len,
-+	if (__acl_high_water_alloc((void **)&quoted_str, &quoted_str_len,
- 			     (s - (unsigned char *)str) + nonpr * 3 + 1))
- 		return NULL;
- 	for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) {
-diff --git a/libmisc/unquote.c b/libmisc/unquote.c
-index bffebf9..4f4ce7c 100644
---- a/libmisc/unquote.c
-+++ b/libmisc/unquote.c
-@@ -22,7 +22,7 @@
- #include <ctype.h>
- #include "misc.h"
- 
--char *unquote(char *str)
-+char *__acl_unquote(char *str)
- {
- 	unsigned char *s, *t;
- 
-diff --git a/setfacl/parse.c b/setfacl/parse.c
-index e7e6add..7433459 100644
---- a/setfacl/parse.c
-+++ b/setfacl/parse.c
-@@ -226,7 +226,7 @@ user_entry:
- 			str = get_token(text_p);
- 			if (str) {
- 				cmd->c_tag = ACL_USER;
--				error = get_uid(unquote(str), &cmd->c_id);
-+				error = get_uid(__acl_unquote(str), &cmd->c_id);
- 				free(str);
- 				if (error) {
- 					*text_p = backup;
-@@ -245,7 +245,7 @@ user_entry:
- 			str = get_token(text_p);
- 			if (str) {
- 				cmd->c_tag = ACL_GROUP;
--				error = get_gid(unquote(str), &cmd->c_id); 
-+				error = get_gid(__acl_unquote(str), &cmd->c_id);
- 				free(str);
- 				if (error) {
- 					*text_p = backup;
-@@ -466,7 +466,7 @@ read_acl_comments(
- 		if (strncmp(cp, "file:", 5) == 0) {
- 			cp += 5;
- 			SKIP_WS(cp);
--			cp = unquote(cp);
-+			cp = __acl_unquote(cp);
- 			
- 			if (path_p) {
- 				if (*path_p)
-@@ -483,7 +483,7 @@ read_acl_comments(
- 			if (uid_p) {
- 				if (*uid_p != ACL_UNDEFINED_ID)
- 					goto fail;
--				if (get_uid(unquote(cp), uid_p) != 0)
-+				if (get_uid(__acl_unquote(cp), uid_p) != 0)
- 					continue;
- 			}
- 		} else if (strncmp(cp, "group:", 6) == 0) {
-@@ -493,7 +493,7 @@ read_acl_comments(
- 			if (gid_p) {
- 				if (*gid_p != ACL_UNDEFINED_ID)
- 					goto fail;
--				if (get_gid(unquote(cp), gid_p) != 0)
-+				if (get_gid(__acl_unquote(cp), gid_p) != 0)
- 					continue;
- 			}
- 		} else if (strncmp(cp, "flags:", 6) == 0) {
-diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c
-index 81062a6..fb2d172 100644
---- a/setfacl/setfacl.c
-+++ b/setfacl/setfacl.c
-@@ -92,7 +92,7 @@ int promote_warning;
- 
- static const char *xquote(const char *str, const char *quote_chars)
- {
--	const char *q = quote(str, quote_chars);
-+	const char *q = __acl_quote(str, quote_chars);
- 	if (q == NULL) {
- 		fprintf(stderr, "%s: %s\n", progname, strerror(errno));
- 		exit(1);
-@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq)
- 	args.seq = seq;
- 
- 	if (strcmp(arg, "-") == 0) {
--		while ((line = next_line(stdin)))
-+		while ((line = __acl_next_line(stdin)))
- 			errors = walk_tree(line, walk_flags, 0, do_set, &args);
- 		if (!feof(stdin)) {
- 			fprintf(stderr, _("%s: Standard input: %s\n"),
--- 
-2.6.2
-
diff --git a/bsp/buildroot/package/acl/acl.hash b/bsp/buildroot/package/acl/acl.hash
index 3f9d7900..091092a1 100644
--- a/bsp/buildroot/package/acl/acl.hash
+++ b/bsp/buildroot/package/acl/acl.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23	acl-2.2.52.src.tar.gz
+sha256  06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7  acl-2.2.53.tar.gz
diff --git a/bsp/buildroot/package/acl/acl.mk b/bsp/buildroot/package/acl/acl.mk
index e1462b60..038bc7a0 100644
--- a/bsp/buildroot/package/acl/acl.mk
+++ b/bsp/buildroot/package/acl/acl.mk
@@ -4,54 +4,18 @@
 #
 ################################################################################
 
-ACL_VERSION = 2.2.52
-ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz
+ACL_VERSION = 2.2.53
 ACL_SITE = http://download.savannah.gnu.org/releases/acl
-ACL_INSTALL_STAGING = YES
-ACL_DEPENDENCIES = attr
-ACL_CONF_OPTS = --enable-gettext=no
-ACL_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
-# While the configuration system uses autoconf, the Makefiles are
-# hand-written and do not use automake. Therefore, we have to hack
-# around their deficiencies by:
-# - explicitly passing CFLAGS (LDFLAGS are passed on from configure,
-#   CFLAGS are not).
-# - explicitly passing the installation prefix, not using DESTDIR.
-
-ACL_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS)"
-
-ACL_INSTALL_STAGING_OPTS = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
-	install-dev install-lib
-
-ACL_INSTALL_TARGET_OPTS = \
-	prefix=$(TARGET_DIR)/usr \
-	exec_prefix=$(TARGET_DIR)/usr \
-	install install-lib
-
-# The libdir variable in libacl.la is empty, so let's fix it. This is
-# probably due to acl not using automake, and not doing fully the
-# right thing with libtool.
-define ACL_FIX_LIBTOOL_LA_LIBDIR
-	$(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \
-		$(STAGING_DIR)/usr/lib/libacl.la
-endef
-
-ACL_POST_INSTALL_STAGING_HOOKS += ACL_FIX_LIBTOOL_LA_LIBDIR
-
+ACL_DEPENDENCIES = attr
 HOST_ACL_DEPENDENCIES = host-attr
-HOST_ACL_CONF_OPTS = --enable-gettext=no
-HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)"
-HOST_ACL_INSTALL_OPTS = \
-	prefix=$(HOST_DIR)/usr \
-	exec_prefix=$(HOST_DIR)/usr \
-	PKG_DEVLIB_DIR=$(HOST_DIR)/usr/lib \
-	install-dev install-lib
-# For the host, libacl.la is correct, no fixup needed.
+
+ACL_INSTALL_STAGING = YES
+
+ACL_CONF_OPTS = --disable-nls
+HOST_ACL_CONF_OPTS = --disable-nls
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/acpica/0001-build-do-not-use-Werror.patch b/bsp/buildroot/package/acpica/0001-build-do-not-use-Werror.patch
index 4ccb4d4d..e7449e98 100644
--- a/bsp/buildroot/package/acpica/0001-build-do-not-use-Werror.patch
+++ b/bsp/buildroot/package/acpica/0001-build-do-not-use-Werror.patch
@@ -9,17 +9,20 @@ newer versions that introduce new warnings.
 
 Remove use of -Werror.
 
+[Vincent: tweak patch for 20170531 release]
+
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: "Vicente Olivert Riera" <Vincent.Riera@imgtec.com>
 ---
  generate/unix/Makefile.config |  1 -
  generate/unix/iasl/Makefile   | 12 ++++++------
  2 files changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config
-index da0f61d..1476e27 100644
+index 4d4f182..a7120e3 100644
 --- a/generate/unix/Makefile.config
 +++ b/generate/unix/Makefile.config
-@@ -185,7 +185,6 @@ CWARNINGFLAGS = \
+@@ -194,7 +194,6 @@ CWARNINGFLAGS = \
      -Wall\
      -Wbad-function-cast\
      -Wdeclaration-after-statement\
@@ -28,35 +31,37 @@ index da0f61d..1476e27 100644
      -Wmissing-declarations\
      -Wmissing-prototypes\
 diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile
-index a3759cc..c2dc8f0 100644
+index 156c23a..28ffc06 100644
 --- a/generate/unix/iasl/Makefile
 +++ b/generate/unix/iasl/Makefile
-@@ -320,19 +320,19 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h :       $(ASL_COMPILER)/prparse
- # by the utilities above and they are not necessarily ANSI C, etc.
+@@ -335,24 +335,24 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h :       $(ASL_COMPILER)/prparse
  #
  $(OBJDIR)/aslcompilerlex.o :   $(OBJDIR)/aslcompilerlex.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) -Wall -o$@ $<
  
  $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) -Wall -o$@ $<
  
  $(OBJDIR)/dtparserlex.o :      $(OBJDIR)/dtparserlex.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) -Wall -o$@ $<
  
  $(OBJDIR)/dtparserparse.o :    $(OBJDIR)/dtparserparse.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) -Wall -o$@ $<
  
  $(OBJDIR)/prparserlex.o :      $(OBJDIR)/prparserlex.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $<
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) -Wall -o$@ $<
  
  $(OBJDIR)/prparserparse.o :    $(OBJDIR)/prparserparse.c
--	$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
-+	$(CC) -c $(CFLAGS) -Wall -o$@ $<
--- 
-2.7.4
-
+ 	@echo "- " "Intermediate" $<
+-	@$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $<
++	@$(CC) -c $(CFLAGS) -Wall -o$@ $<
diff --git a/bsp/buildroot/package/acpica/acpica.hash b/bsp/buildroot/package/acpica/acpica.hash
index 8f1c08a6..4942fe45 100644
--- a/bsp/buildroot/package/acpica/acpica.hash
+++ b/bsp/buildroot/package/acpica/acpica.hash
@@ -1,3 +1,2 @@
 # locally computed hash
-sha256 dfb33db5599bd48134dbd6e50c8804099be0cf1c35d98975a6cb84dabca78b67 acpica-unix2-20161117.tar.gz
-
+sha256 0b979b778bcf711a2b8702b1831affd7dac4a776235d7877fd185651b6a390a3  acpica-unix2-20170531.tar.gz
diff --git a/bsp/buildroot/package/acpica/acpica.mk b/bsp/buildroot/package/acpica/acpica.mk
index f76c948c..57cc37f8 100644
--- a/bsp/buildroot/package/acpica/acpica.mk
+++ b/bsp/buildroot/package/acpica/acpica.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ACPICA_VERSION = 20161117
+ACPICA_VERSION = 20170531
 ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz
 ACPICA_SITE = https://acpica.org/sites/acpica/files
-ACPICA_LICENSE = BSD-3c or GPLv2
+ACPICA_LICENSE = BSD-3-Clause or GPL-2.0
 ACPICA_LICENSE_FILES = source/include/acpi.h
 ACPICA_DEPENDENCIES = host-bison host-flex
 
@@ -17,10 +17,22 @@ define ACPICA_BUILD_CMDS
 		all
 endef
 
+define HOST_ACPICA_BUILD_CMDS
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		all
+endef
+
 define ACPICA_INSTALL_TARGET_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		HARDWARE_NAME=$(BR2_ARCH) DESTDIR="$(TARGET_DIR)" \
 		INSTALLFLAGS=-m755 install
 endef
 
+define HOST_ACPICA_INSTALL_CMDS
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		PREFIX="$(HOST_DIR)" \
+		INSTALLFLAGS=-m755 install
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/acpid/Config.in b/bsp/buildroot/package/acpid/Config.in
index 5aec7f13..2bd83ea8 100644
--- a/bsp/buildroot/package/acpid/Config.in
+++ b/bsp/buildroot/package/acpid/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_ACPID
 	help
 	  Advanced Configuration and Power Interface event daemon.
 
-	  Acpid is designed to notify user-space programs of ACPI events,
-	  and allows you to configure specific actions for specific events.
+	  Acpid is designed to notify user-space programs of ACPI
+	  events, and allows you to configure specific actions for
+	  specific events.
 
 	  http://sourceforge.net/projects/acpid2/
diff --git a/bsp/buildroot/package/acpid/acpid.mk b/bsp/buildroot/package/acpid/acpid.mk
index f561b908..87378d81 100644
--- a/bsp/buildroot/package/acpid/acpid.mk
+++ b/bsp/buildroot/package/acpid/acpid.mk
@@ -7,7 +7,7 @@
 ACPID_VERSION = 2.0.28
 ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
 ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
-ACPID_LICENSE = GPLv2+
+ACPID_LICENSE = GPL-2.0+
 ACPID_LICENSE_FILES = COPYING
 
 define ACPID_INSTALL_INIT_SYSV
@@ -15,9 +15,15 @@ define ACPID_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S02acpid
 endef
 
+ifeq ($(BR2_INIT_SYSV)$(BR2_INIT_SYSTEMD),y)
+ACPID_POWEROFF_CMD = /sbin/shutdown -hP now
+else
+ACPID_POWEROFF_CMD = /sbin/poweroff
+endif
+
 define ACPID_SET_EVENTS
 	mkdir -p $(TARGET_DIR)/etc/acpi/events
-	printf "event=button[ /]power\naction=/sbin/poweroff\n" \
+	printf 'event=button[ /]power\naction=%s\n' '$(ACPID_POWEROFF_CMD)' \
 		>$(TARGET_DIR)/etc/acpi/events/powerbtn
 endef
 
diff --git a/bsp/buildroot/package/acpitool/acpitool.mk b/bsp/buildroot/package/acpitool/acpitool.mk
index f663fbb9..547da375 100644
--- a/bsp/buildroot/package/acpitool/acpitool.mk
+++ b/bsp/buildroot/package/acpitool/acpitool.mk
@@ -7,7 +7,7 @@
 ACPITOOL_VERSION = 0.5.1
 ACPITOOL_SOURCE = acpitool-$(ACPITOOL_VERSION).tar.bz2
 ACPITOOL_SITE = http://downloads.sourceforge.net/sourceforge/acpitool
-ACPITOOL_LICENSE = GPLv2+
+ACPITOOL_LICENSE = GPL-2.0+
 ACPITOOL_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/acsccid/acsccid.hash b/bsp/buildroot/package/acsccid/acsccid.hash
index 1bfe9e4b..24d2fa73 100644
--- a/bsp/buildroot/package/acsccid/acsccid.hash
+++ b/bsp/buildroot/package/acsccid/acsccid.hash
@@ -1,3 +1,3 @@
-# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.1/
-sha1 ae340256bbba36032a903c9f89883297a31ca340 acsccid-1.1.1.tar.bz2
-md5 26dc34141188e64fa2b3545032060357 acsccid-1.1.1.tar.bz2
+# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.4/
+sha1 8c0b42ff79032289731916d18a2698b258dfd6a2 acsccid-1.1.4.tar.bz2
+md5 ac77b3aeae0a11723c96c7f98769490e acsccid-1.1.4.tar.bz2
diff --git a/bsp/buildroot/package/acsccid/acsccid.mk b/bsp/buildroot/package/acsccid/acsccid.mk
index c2e7d215..06a04185 100644
--- a/bsp/buildroot/package/acsccid/acsccid.mk
+++ b/bsp/buildroot/package/acsccid/acsccid.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ACSCCID_VERSION = 1.1.1
+ACSCCID_VERSION = 1.1.4
 ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2
 ACSCCID_SITE = http://downloads.sourceforge.net/acsccid
-ACSCCID_LICENSE = LGPLv2.1+
+ACSCCID_LICENSE = LGPL-2.1+
 ACSCCID_LICENSE_FILES = COPYING
 ACSCCID_INSTALL_STAGING = YES
 ACSCCID_DEPENDENCIES = pcsc-lite host-flex host-pkgconf libusb
diff --git a/bsp/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk b/bsp/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk
index fdf66c8e..8c9dec14 100644
--- a/bsp/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk
+++ b/bsp/buildroot/package/adwaita-icon-theme/adwaita-icon-theme.mk
@@ -9,7 +9,7 @@ ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0
 ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
 ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
 ADWAITA_ICON_THEME_INSTALL_STAGING = YES
-ADWAITA_ICON_THEME_LICENSE = LGPLv3 or CC-BY-SA-3.0
+ADWAITA_ICON_THEME_LICENSE = LGPL-3.0 or CC-BY-SA-3.0
 ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3
 ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3
 
diff --git a/bsp/buildroot/package/aer-inject/aer-inject.hash b/bsp/buildroot/package/aer-inject/aer-inject.hash
new file mode 100644
index 00000000..6329de6d
--- /dev/null
+++ b/bsp/buildroot/package/aer-inject/aer-inject.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 49a44b7a9e3983dc15fdc5bacd0e095df650296024f43f9d6c080ad54de0b07f  aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41.tar.gz
diff --git a/bsp/buildroot/package/aer-inject/aer-inject.mk b/bsp/buildroot/package/aer-inject/aer-inject.mk
index 69189b16..72495bbe 100644
--- a/bsp/buildroot/package/aer-inject/aer-inject.mk
+++ b/bsp/buildroot/package/aer-inject/aer-inject.mk
@@ -6,8 +6,7 @@
 
 AER_INJECT_VERSION = 9bd5e2c7886fca72f139cd8402488a2235957d41
 AER_INJECT_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git
-AER_INJECT_SITE_METHOD = git
-AER_INJECT_LICENSE = GPLv2
+AER_INJECT_LICENSE = GPL-2.0
 AER_INJECT_LICENSE_FILES = README
 AER_INJECT_DEPENDENCIES = host-flex host-bison
 
diff --git a/bsp/buildroot/package/aespipe/Config.in b/bsp/buildroot/package/aespipe/Config.in
index df99523b..2c2ff5cd 100644
--- a/bsp/buildroot/package/aespipe/Config.in
+++ b/bsp/buildroot/package/aespipe/Config.in
@@ -2,9 +2,10 @@ config BR2_PACKAGE_AESPIPE
 	bool "aespipe"
 	depends on BR2_USE_MMU # fork()
 	help
-	  aespipe program is AES encrypting or decrypting pipe. It reads from
-	  standard input and writes to standard output. It can be used to
-	  create and restore encrypted tar or cpio archives. It can be used to
-	  encrypt and decrypt loop-AES compatible encrypted disk images.
+	  aespipe program is AES encrypting or decrypting pipe. It reads
+	  from standard input and writes to standard output. It can be
+	  used to create and restore encrypted tar or cpio archives.
+	  It can be used to encrypt and decrypt loop-AES compatible
+	  encrypted disk images.
 
 	  http://koti.tnnet.fi/jari.ruusu/linux/
diff --git a/bsp/buildroot/package/agentpp/Config.in b/bsp/buildroot/package/agentpp/Config.in
index 4b70a1a7..8c6b11d6 100644
--- a/bsp/buildroot/package/agentpp/Config.in
+++ b/bsp/buildroot/package/agentpp/Config.in
@@ -1,17 +1,18 @@
 config BR2_PACKAGE_AGENTPP
 	bool "agent++"
-	select BR2_PACKAGE_SNMPPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # snmp++
 	depends on !BR2_STATIC_LIBS # snmp++
+	select BR2_PACKAGE_SNMPPP
 	help
-	  AGENT++ is a set of C++ classes which provides a complete protocol
-	  engine and dispatch table for the development of SNMP agents.
-	  AGENT++ is a multilingual API which supports SNMPv1, SNMPv2c, and
-	  SNMPv3. It provides various C++ classes implementing prototypes for
-	  scalar and table SNMP managed objects that can be customized by
-	  derivation. Additional classes support the development of proxy
-	  agents as well as sending notifications.
+	  AGENT++ is a set of C++ classes which provides a complete
+	  protocol engine and dispatch table for the development of
+	  SNMP agents. AGENT++ is a multilingual API which supports
+	  SNMPv1, SNMPv2c, and SNMPv3. It provides various C++ classes
+	  implementing prototypes for scalar and table SNMP managed
+	  objects that can be customized by derivation. Additional
+	  classes support the development of proxy agents as well as
+	  sending notifications.
 
 	  SNMPv3 support is enabled if SNMP++ enables it.
 
diff --git a/bsp/buildroot/package/aiccu/0001-gnutls.patch b/bsp/buildroot/package/aiccu/0001-gnutls.patch
deleted file mode 100644
index 462179ee..00000000
--- a/bsp/buildroot/package/aiccu/0001-gnutls.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-aiccu.h, common.c, common.h: fixes for deprecated GNUTLS functions and types
-
-Signed-off-by: Michael Rommel <rommel@layer-7.net>
-
-diff -purN aiccu_20070115.orig/common/aiccu.h aiccu_20070115/common/aiccu.h
---- aiccu_20070115.orig/common/aiccu.h	2007-01-15 13:01:43.000000000 +0100
-+++ aiccu_20070115/common/aiccu.h	2013-08-31 23:50:53.651936146 +0200
-@@ -111,7 +111,7 @@ struct AICCU_conf
- #endif
- 
- #ifdef AICCU_GNUTLS
--	gnutls_certificate_credentials	tls_cred;	/* GNUTLS credentials */
-+	gnutls_certificate_credentials_t tls_cred;	/* GNUTLS credentials */
- #endif
- 
- 	bool		daemonize;		/* Daemonize? */
-diff -purN aiccu_20070115.orig/common/common.c aiccu_20070115/common/common.c
---- aiccu_20070115.orig/common/common.c	2006-12-21 15:08:50.000000000 +0100
-+++ aiccu_20070115/common/common.c	2013-09-01 01:21:36.031396740 +0200
-@@ -271,9 +271,8 @@ TLSSOCKET sock_alloc(void);
- TLSSOCKET sock_alloc(void)
- {
- #ifdef AICCU_GNUTLS
--	/* Allow connections to servers that have OpenPGP keys as well */
--	const int	cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 };
- 	int		ret;
-+	const char	*err;
- #endif /* AICCU_GNUTLS*/
- 
- 	TLSSOCKET	sock;	
-@@ -297,11 +296,16 @@ TLSSOCKET sock_alloc(void)
- 	}
- 
- 	/* Use default priorities */
--	gnutls_set_default_priority(sock->session);
--	/* XXX: Return value is not documented in GNUTLS documentation! */
--
--	gnutls_certificate_type_set_priority(sock->session, cert_type_priority);
--	/* XXX: Return value is not documented in GNUTLS documentation! */
-+	ret = gnutls_priority_set_direct(sock->session, "NORMAL", &err); 
-+	if (ret < 0)
-+	{
-+		if (ret == GNUTLS_E_INVALID_REQUEST)
-+		{
-+			dolog( LOG_ERR, "TLS set priority failed, syntax error at: %s\n", err);
-+		}
-+		free(sock);
-+		return NULL;
-+	}
- 
- 	/* Configure the x509 credentials for the current session */
- 	gnutls_credentials_set(sock->session, GNUTLS_CRD_CERTIFICATE, g_aiccu->tls_cred);
-@@ -474,7 +478,7 @@ bool sock_gotls(TLSSOCKET sock)
- 	}
- 
- 	/* Set the transport */
--	gnutls_transport_set_ptr(sock->session, (gnutls_transport_ptr)sock->socket);
-+	gnutls_transport_set_ptr(sock->session, (gnutls_transport_ptr_t) sock->socket);
- 
- 	/* Perform the TLS handshake */
- 	ret = gnutls_handshake(sock->session);
-diff -purN aiccu_20070115.orig/common/common.h aiccu_20070115/common/common.h
---- aiccu_20070115.orig/common/common.h	2007-01-11 15:50:51.000000000 +0100
-+++ aiccu_20070115/common/common.h	2013-08-31 23:26:13.683659455 +0200
-@@ -381,7 +381,7 @@ struct tlssocket
- 	SOCKET			socket;
- #ifdef AICCU_GNUTLS
- 	bool			tls_active;	/* TLS active? */
--	gnutls_session		session;	/* The GnuTLS sesision */
-+	gnutls_session_t	session;	/* The GnuTLS sesision */
- #endif
- };
- 
diff --git a/bsp/buildroot/package/aiccu/0002-makefile-reorder-linked-libraries.patch b/bsp/buildroot/package/aiccu/0002-makefile-reorder-linked-libraries.patch
deleted file mode 100644
index 22f04a91..00000000
--- a/bsp/buildroot/package/aiccu/0002-makefile-reorder-linked-libraries.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Makefile: change LDFLAGS order on the compile line for --static
-
-Signed-off-by: Michael Rommel <rommel@layer-7.net>
-
---- aiccu_20070115.orig/unix-console/Makefile	2007-01-15 12:04:27.000000000 +0100
-+++ aiccu_20070115/unix-console/Makefile	2013-09-29 22:54:42.742963861 +0200
-@@ -144,7 +144,7 @@ endif
- all: aiccu
- 
- aiccu:	$(OBJS) ${SRCS} ${INCS}
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
-+	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- ifeq ($(shell echo $(CFLAGS) | grep -c "DEBUG"),0)
- ifeq ($(shell echo "$(RPM_OPT_FLAGS)" | wc -c),1)
- 	strip $@
diff --git a/bsp/buildroot/package/aiccu/0003-clock-suite-functions-fix.patch b/bsp/buildroot/package/aiccu/0003-clock-suite-functions-fix.patch
deleted file mode 100644
index 365e72a2..00000000
--- a/bsp/buildroot/package/aiccu/0003-clock-suite-functions-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-aiccu: fix undefined reference to clock_* functions
-
-Since glibc 2.17 the clock_* suite functions are available directly in 
-the main C library. For previous versions we still need -lrt to link.
-
-Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
-
---- aiccu/unix-console/Makefile.orig	2014-01-14 10:17:20.204602513 +0000
-+++ aiccu/unix-console/Makefile	2014-01-14 10:17:31.435777359 +0000
-@@ -42,7 +42,7 @@ CFLAGS	+= -D AICCU_CONSOLE
- # Currently defaultly builds only on Linux, but other platforms might easily also support it
- ifeq ($(shell uname | grep -c "Linux"),1)
- CFLAGS	+= -D AICCU_GNUTLS
--LDFLAGS += -lgnutls
-+LDFLAGS += -lgnutls -lrt
- endif
- 
- # Linux
diff --git a/bsp/buildroot/package/aiccu/0004-if-ether-header.patch b/bsp/buildroot/package/aiccu/0004-if-ether-header.patch
deleted file mode 100644
index 48e8ceb6..00000000
--- a/bsp/buildroot/package/aiccu/0004-if-ether-header.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-musl does not allow using <netinet/*> together with <linux/*> headers.
-Since there are both netinet/if_ether.h and linux/if_ether.h providing
-the same definitions, use linux/if_ether.h whenever other linux/*
-headers are included.
-
-Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
-
---- aiccu/common/common.h
-+++ aiccu/common/common.h
-@@ -91,11 +91,12 @@
- 	#include <sys/select.h>
- 
- 	#include <net/if.h>
--	#include <netinet/if_ether.h>
- #ifdef linux
- 	#include <netpacket/packet.h>
-+	#include <linux/if_ether.h>
- 	#include <linux/if_tun.h>
- #else
-+	#include <netinet/if_ether.h>
- #ifdef _DFBSD
- 	#include <net/tun/if_tun.h>
- #else
diff --git a/bsp/buildroot/package/aiccu/0005-res-ninit.patch b/bsp/buildroot/package/aiccu/0005-res-ninit.patch
deleted file mode 100644
index faf38df0..00000000
--- a/bsp/buildroot/package/aiccu/0005-res-ninit.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-res_ninit is available in glibc but not in uclibc or musl.
-
-Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
-
---- aiccu/common/resolver.c
-+++ aiccu/common/resolver.c
-@@ -26,7 +26,7 @@
- 
- int getrrs(const char *label, int rrtype, void gotrec(unsigned int num, int type, const char *record))
- {
--#ifdef _LINUX
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	struct __res_state	res;
- #endif
- 	unsigned char		answer[8192];
-@@ -38,7 +38,7 @@ int getrrs(const char *label, int rrtype
- 	uint16_t		type = 0, class = 0;
- 	uint32_t		ttl = 0;
- 
--#ifdef _LINUX
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	memset(&res, 0, sizeof(res));
- 	res.options = RES_DEBUG;
- 	res_ninit(&res);
-@@ -47,7 +47,7 @@ int getrrs(const char *label, int rrtype
- #endif
- 
- 	memset(answer, 0, sizeof(answer));
--#ifdef _LINUX
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
- 	ret = res_nquery(&res, label, C_IN, rrtype, answer, sizeof(answer));
- #else
- 	ret = res_query(label, C_IN, rrtype, answer, sizeof(answer));
diff --git a/bsp/buildroot/package/aiccu/Config.in b/bsp/buildroot/package/aiccu/Config.in
deleted file mode 100644
index b346328d..00000000
--- a/bsp/buildroot/package/aiccu/Config.in
+++ /dev/null
@@ -1,23 +0,0 @@
-config BR2_PACKAGE_AICCU
-	bool "aiccu"
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GNUTLS
-	help
-	  SixXS Automatic IPv6 Connectivity Client Utility
-
-	  AICCU (Automatic IPv6 Connectivity Client Utility) makes it
-	  easy for users to get IPv6 connectivity. After having
-	  requested an account, tunnel and optionally a subnet, AICCU
-	  can be used to automatically configure the tunnel. AICCU
-	  supports TIC (Tunnel Information & Control protocol), which it
-	  uses for retrieving the tunnel configuration information,
-	  AYIYA, which allows tunnels to be created even behind
-	  firewalls and NAT's.
-
-	  http://www.sixxs.net/tools/aiccu/
-
-comment "aiccu needs a toolchain w/ wchar, threads"
-	depends on BR2_USE_MMU
-	depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
diff --git a/bsp/buildroot/package/aiccu/aiccu.hash b/bsp/buildroot/package/aiccu/aiccu.hash
deleted file mode 100644
index 26c4081f..00000000
--- a/bsp/buildroot/package/aiccu/aiccu.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://www.sixxs.net/archive/sixxs/aiccu/unix/
-md5	c9bcc83644ed788e22a7c3f3d4021350  aiccu_20070115.tar.gz
diff --git a/bsp/buildroot/package/aiccu/aiccu.mk b/bsp/buildroot/package/aiccu/aiccu.mk
deleted file mode 100644
index 60d65dd0..00000000
--- a/bsp/buildroot/package/aiccu/aiccu.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-################################################################################
-#
-# aiccu
-#
-################################################################################
-
-AICCU_VERSION = 20070115
-AICCU_SOURCE = aiccu_$(AICCU_VERSION).tar.gz
-AICCU_SITE = http://www.sixxs.net/archive/sixxs/aiccu/unix
-AICCU_LICENSE = SixXS License, concise redistribution license
-AICCU_LICENSE_FILES = doc/LICENSE
-AICCU_DEPENDENCIES = gnutls
-
-AICCU_LFDLAGS = $(TARGET_LDFLAGS)
-
-# aiccu forgets to link with gnutls' dependencies breaking the build when
-# linking statically
-ifeq ($(BR2_STATIC_LIBS),y)
-AICCU_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs gnutls`
-endif
-
-# dummy RPM_OPT_FLAGS to disable stripping
-define AICCU_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AICCU_LDFLAGS)" $(MAKE) \
-		CC="$(TARGET_CC)" RPM_OPT_FLAGS=1 -C $(@D)/unix-console all
-endef
-
-define AICCU_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/unix-console/aiccu \
-		$(TARGET_DIR)/usr/sbin/aiccu
-	$(INSTALL) -D -m 0644 $(@D)/doc/aiccu.conf \
-		$(TARGET_DIR)/etc/aiccu.conf
-endef
-
-define AICCU_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 $(@D)/doc/aiccu.init \
-		$(TARGET_DIR)/etc/init.d/S50aiccu
-endef
-
-$(eval $(generic-package))
diff --git a/bsp/buildroot/package/aircrack-ng/0001-Makefile-use-pkg-config-to-find-libpcre-it-s-more-cros.patch b/bsp/buildroot/package/aircrack-ng/0001-Makefile-use-pkg-config-to-find-libpcre-it-s-more-cros.patch
deleted file mode 100644
index 733e0c06..00000000
--- a/bsp/buildroot/package/aircrack-ng/0001-Makefile-use-pkg-config-to-find-libpcre-it-s-more-cros.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 98149c7664e99cc8ce9c9b1abf2fa90d9cd68e0d Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 5 Nov 2014 09:38:12 -0300
-Subject: [PATCH] Makefile: use pkg-config to find libpcre, it's more
- cross-compile friendly
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: Upstream http://trac.aircrack-ng.org/ticket/1526
-
-diff --git a/common.mak b/common.mak
-index 6e5694b..d875708 100644
---- a/common.mak
-+++ b/common.mak
-@@ -39,7 +39,7 @@ PCRE            = true
- endif
- 
- ifeq ($(PCRE), true)
--COMMON_CFLAGS += $(shell pcre-config --cflags) -DHAVE_PCRE
-+COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcre) -DHAVE_PCRE
- endif
- 
- ifeq ($(OSNAME), cygwin)
-diff --git a/src/Makefile b/src/Makefile
-index f9217f9..14350b6 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -16,7 +16,7 @@ BINFILES        = aircrack-ng$(EXE) airdecap-ng$(EXE) packetforge-ng$(EXE) \
- 
- LIBPCRE		=
- ifeq ($(PCRE), true)
--	LIBPCRE	= $(shell pcre-config --libs)
-+	LIBPCRE = $(shell $(PKG_CONFIG) --libs libpcre)
- endif
- 
- ifneq ($(OSNAME), cygwin) #There is yet no libpcap support for windows, so we skip the crawler
--- 
-2.0.4
-
diff --git a/bsp/buildroot/package/aircrack-ng/0001-stack-protector.patch b/bsp/buildroot/package/aircrack-ng/0001-stack-protector.patch
new file mode 100644
index 00000000..5f2bd1b1
--- /dev/null
+++ b/bsp/buildroot/package/aircrack-ng/0001-stack-protector.patch
@@ -0,0 +1,58 @@
+Added option to disable stack-protector support auto-detection in gcc.
+
+Downloaded from upstream commit:
+http://trac.aircrack-ng.org/changeset/2889/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+Index: /trunk/INSTALLING
+===================================================================
+--- trunk/INSTALLING	(revision 2888)
++++ trunk/INSTALLING	(revision 2889)
+@@ -83,4 +83,6 @@
+ * macport:  Set this flag to true to compile on OS X with macports.
+ 
++* stackprotector: Allows to enable/disable auto-detection of stack-protector support in gcc
++
+ Example:
+ 
+Index: /trunk/common.mak
+===================================================================
+--- trunk/common.mak	(revision 2888)
++++ trunk/common.mak	(revision 2889)
+@@ -64,4 +64,13 @@
+ ifeq ($(PCRE), true)
+ COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcre) -DHAVE_PCRE
++endif
++
++STACK_PROTECTOR	= true
++ifeq ($(stackprotector), false)
++	STACK_PROTECTOR	= false
++endif
++
++ifeq ($(STACKPROTECTOR), false)
++	STACK_PROTECTOR	= false
+ endif
+ 
+@@ -235,12 +244,14 @@
+ endif
+ 
+-ifeq ($(GCC_OVER49), 0)
+-	ifeq ($(GCC_OVER41), 1)
+-		COMMON_CFLAGS += -fstack-protector
++ifeq ($(STACK_PROTECTOR), true)
++	ifeq ($(GCC_OVER49), 0)
++		ifeq ($(GCC_OVER41), 1)
++			COMMON_CFLAGS += -fstack-protector
++		endif
+ 	endif
+-endif
+-
+-ifeq ($(GCC_OVER49), 1)
+-	COMMON_CFLAGS += -fstack-protector-strong
++
++	ifeq ($(GCC_OVER49), 1)
++		COMMON_CFLAGS += -fstack-protector-strong
++	endif
+ endif
+ 
diff --git a/bsp/buildroot/package/aircrack-ng/0002-Optionally-use-LIBPCAP-for-required-libpcap-libraries.patch b/bsp/buildroot/package/aircrack-ng/0002-Optionally-use-LIBPCAP-for-required-libpcap-libraries.patch
deleted file mode 100644
index c92bb8df..00000000
--- a/bsp/buildroot/package/aircrack-ng/0002-Optionally-use-LIBPCAP-for-required-libpcap-libraries.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1abf7a6aad3d7931de2c01b578f62986b75de2f5 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 11 Nov 2014 16:23:42 -0300
-Subject: [PATCH] Optionally use LIBPCAP for required libpcap libraries
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: Reported http://trac.aircrack-ng.org/ticket/1528
-
-diff --git a/src/Makefile b/src/Makefile
-index 14350b6..7bd4271 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -23,6 +23,7 @@ ifneq ($(OSNAME), cygwin) #There is yet no libpcap support for windows, so we sk
- 	HAVE_PCAP	= $(shell ld -lpcap 2> /dev/null && echo yes)
- 	ifeq ($(HAVE_PCAP), yes) #cannot link with -lpcap, skip crawler
- 		BINFILES	+= besside-ng-crawler$(EXE)
-+		LIBPCAP		= -lpcap
- 	endif
- endif
- 
-@@ -168,7 +169,7 @@ besside-ng$(EXE): $(OBJS_BS) $(LIBOSD)
- 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BS) -o $(@) $(LIBS) $(LIBSSL) -lz $(LIBPCRE)
- 
- besside-ng-crawler$(EXE): $(OBJS_BC)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BC) -o $(@) -lpcap
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BC) -o $(@) $(LIBPCAP)
- 
- makeivs-ng$(EXE): $(OBJS_MI)
- 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_MI) -o $(@) $(LDFLAGS)
--- 
-2.0.4
-
diff --git a/bsp/buildroot/package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch b/bsp/buildroot/package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch
deleted file mode 100644
index a10ee454..00000000
--- a/bsp/buildroot/package/aircrack-ng/0003-Wesside-ng-Use-termios-instead-of-sys-termios.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 42de9f800056601443ac12edbba7bd5802740db2 Mon Sep 17 00:00:00 2001
-From: Thomas d'Otreppe <tdotreppe@aircrack-ng.org>
-Date: Wed, 8 Apr 2015 01:25:07 +0000
-Subject: [PATCH] Wesside-ng: Use termios instead of sys/termios.
-
-git-svn-id: http://svn.aircrack-ng.org/trunk@2533 28c6078b-6c39-48e3-add9-af49d547ecab
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- src/wesside-ng.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/wesside-ng.c b/src/wesside-ng.c
-index 711d8b7..f44438a 100644
---- a/src/wesside-ng.c
-+++ b/src/wesside-ng.c
-@@ -33,7 +33,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
--#include <sys/termios.h>
-+#include <termios.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/aircrack-ng/Config.in b/bsp/buildroot/package/aircrack-ng/Config.in
index 00ce4e48..12fda1cb 100644
--- a/bsp/buildroot/package/aircrack-ng/Config.in
+++ b/bsp/buildroot/package/aircrack-ng/Config.in
@@ -1,20 +1,21 @@
 config BR2_PACKAGE_AIRCRACK_NG
 	bool "aircrack-ng"
 	depends on BR2_USE_MMU # uses fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
 	# libnl has issues when linking statically
 	# they need fixing in libnl itself
 	select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  A set of tools for auditing wireless networks
 
-	  For complete functionality, also select ethtool, iw, rfkill,
-	  util-linux utilities, and wireless_tools.
+	  For complete functionality, also select ethtool, iw,
+	  util-linux (utilities and rfkill), and wireless_tools.
 
 	  http://www.aircrack-ng.org/
 
-comment "aircrack-ng needs a toolchain w/ threads"
+comment "aircrack-ng needs a toolchain w/ threads, C++"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/aircrack-ng/aircrack-ng.hash b/bsp/buildroot/package/aircrack-ng/aircrack-ng.hash
index 1ed27fc4..e210ad2e 100644
--- a/bsp/buildroot/package/aircrack-ng/aircrack-ng.hash
+++ b/bsp/buildroot/package/aircrack-ng/aircrack-ng.hash
@@ -1,3 +1,3 @@
 # From http://www.aircrack-ng.org/downloads.html
-sha1	b5ff7d0fffb72095311bbe8824ab98aaac62db8f	aircrack-ng-1.2-rc1.tar.gz
-md5	c2f8648c92f7e46051c86c618d4fb0d5	aircrack-ng-1.2-rc1.tar.gz
+sha1 2b2fbe50fedb606b3bd96a34d49f07760e8e618a aircrack-ng-1.2-rc4.tar.gz
+md5 3bbc7d5035a98ec01e78774d05c3fcce aircrack-ng-1.2-rc4.tar.gz
diff --git a/bsp/buildroot/package/aircrack-ng/aircrack-ng.mk b/bsp/buildroot/package/aircrack-ng/aircrack-ng.mk
index 7e5464d3..6b384c07 100644
--- a/bsp/buildroot/package/aircrack-ng/aircrack-ng.mk
+++ b/bsp/buildroot/package/aircrack-ng/aircrack-ng.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-AIRCRACK_NG_VERSION = 1.2-rc1
+AIRCRACK_NG_VERSION = 1.2-rc4
 AIRCRACK_NG_SITE = http://download.aircrack-ng.org
-AIRCRACK_NG_LICENSE = GPLv2+
+AIRCRACK_NG_LICENSE = GPL-2.0+
 AIRCRACK_NG_LICENSE_FILES = LICENSE
 AIRCRACK_NG_DEPENDENCIES = openssl zlib host-pkgconf
 # Enable buddy-ng, easside-ng, tkiptun-ng, wesside-ng
@@ -24,6 +24,12 @@ AIRCRACK_NG_MAKE_OPTS += libnl=true
 AIRCRACK_NG_DEPENDENCIES += libnl
 endif
 
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y)
+AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=true
+else
+AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=false
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPCAP),y)
 AIRCRACK_NG_DEPENDENCIES += libpcap
 AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \
@@ -47,6 +53,12 @@ else
 AIRCRACK_NG_MAKE_OPTS += sqlite=false
 endif
 
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+AIRCRACK_NG_MAKE_OPTS += NEWSSE=true
+else
+AIRCRACK_NG_MAKE_OPTS += NEWSSE=false
+endif
+
 define AIRCRACK_NG_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AIRCRACK_NG_LDFLAGS)" \
 		$(MAKE) -C $(@D) $(AIRCRACK_NG_MAKE_OPTS)
diff --git a/bsp/buildroot/package/alsa-lib/0001-musl-pcm-h.patch b/bsp/buildroot/package/alsa-lib/0001-musl-pcm-h.patch
deleted file mode 100644
index ce1528c5..00000000
--- a/bsp/buildroot/package/alsa-lib/0001-musl-pcm-h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix musl-related build errors in packages depending on alsa, in our case
-this fixes openal.
-
-Downloaded from
-http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib_pcm_h.patch
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
---- alsa-lib-1.0.25/include/pcm.h
-+++ alsa-lib-1.0.25.patched/include/pcm.h
-@@ -33,6 +33,7 @@
- extern "C" {
- #endif
- 
-+#include <stdint.h>
- /**
-  *  \defgroup PCM PCM Interface
-  *  See the \ref pcm page for more details.
-@@ -941,10 +942,10 @@
- int snd_pcm_format_physical_width(snd_pcm_format_t format);		/* in bits */
- snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
- ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
--u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
--u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
--u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
--u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
-+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
-+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
-+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
- int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
- 
- snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
diff --git a/bsp/buildroot/package/alsa-lib/0002-no-mmu.patch b/bsp/buildroot/package/alsa-lib/0001-no-mmu.patch
similarity index 100%
rename from bsp/buildroot/package/alsa-lib/0002-no-mmu.patch
rename to bsp/buildroot/package/alsa-lib/0001-no-mmu.patch
diff --git a/bsp/buildroot/package/alsa-lib/0003-dlmisc.patch b/bsp/buildroot/package/alsa-lib/0002-dlmisc.patch
similarity index 100%
rename from bsp/buildroot/package/alsa-lib/0003-dlmisc.patch
rename to bsp/buildroot/package/alsa-lib/0002-dlmisc.patch
diff --git a/bsp/buildroot/package/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch b/bsp/buildroot/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch
similarity index 100%
rename from bsp/buildroot/package/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch
rename to bsp/buildroot/package/alsa-lib/0003-conditional-enabling-of-libdl-in-m4.patch
diff --git a/bsp/buildroot/package/alsa-lib/0005-remove-powerpc64-workaround.patch b/bsp/buildroot/package/alsa-lib/0005-remove-powerpc64-workaround.patch
deleted file mode 100644
index 57a369e0..00000000
--- a/bsp/buildroot/package/alsa-lib/0005-remove-powerpc64-workaround.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Linking currently fails on powerpc64 and powerpc64le when configured
-with --without-versioned, as follows:
-../src/.libs/libasound.so: undefined reference to `.__snd_pcm_hw_params_set_format_first'
-(And many similar messages.)
-
-This appears to be due to a very old (2003) workaround for powerpc64,
-(introduced by commit 06221f86) in include/alsa-symbols.h which alters
-symbol names. While it was probably necessary at the time, it does not
-appear to be necessary now and removing it fixes the build.
-
-Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
----
- include/alsa-symbols.h | 25 ++++---------------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/include/alsa-symbols.h b/include/alsa-symbols.h
-index 51cb982..0cb0b9f 100644
---- a/include/alsa-symbols.h
-+++ b/include/alsa-symbols.h
-@@ -29,19 +29,10 @@
- #define INTERNAL_CONCAT2_2(Pre, Post) Pre##Post
- #define INTERNAL(Name) INTERNAL_CONCAT2_2(__, Name)
- 
--#ifdef __powerpc64__
--# define symbol_version(real, name, version) 			\
--	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version);	\
--	__asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@" #version)
--# define default_symbol_version(real, name, version) 		\
--	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version);	\
--	__asm__ (".symver ." ASM_NAME(#real) ",." ASM_NAME(#name) "@@" #version)
--#else
--# define symbol_version(real, name, version) \
--	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
--# define default_symbol_version(real, name, version) \
--	__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
--#endif
-+#define symbol_version(real, name, version) \
-+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@" #version)
-+#define default_symbol_version(real, name, version) \
-+__asm__ (".symver " ASM_NAME(#real) "," ASM_NAME(#name) "@@" #version)
- 
- #ifdef USE_VERSIONED_SYMBOLS
- #define use_symbol_version(real, name, version) \
-@@ -50,13 +41,6 @@
- 		default_symbol_version(real, name, version)
- #else
- #define use_symbol_version(real, name, version) /* nothing */
--#ifdef __powerpc64__
--#define use_default_symbol_version(real, name, version) \
--	__asm__ (".weak " ASM_NAME(#name)); 			\
--	__asm__ (".weak ." ASM_NAME(#name)); 			\
--	__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real));		\
--	__asm__ (".set ." ASM_NAME(#name) ",." ASM_NAME(#real))
--#else
- #if defined(__alpha__) || defined(__mips__)
- #define use_default_symbol_version(real, name, version) \
-         __asm__ (".weak " ASM_NAME(#name)); \
-@@ -67,6 +51,5 @@
- 	__asm__ (".set " ASM_NAME(#name) "," ASM_NAME(#real))
- #endif
- #endif
--#endif
- 
- #endif /* __ALSA_SYMBOLS_H */
--- 
-2.10.0.297.gf6727b0
-
diff --git a/bsp/buildroot/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch b/bsp/buildroot/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch
deleted file mode 100644
index b47dedb3..00000000
--- a/bsp/buildroot/package/alsa-lib/0006-ucm-parser-needs-limits.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 13a796b4bd00defa9f9297fd23d508b430682aed Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Wed, 21 Dec 2016 19:41:26 -0300
-Subject: [PATCH] ucm: parser needs limits.h
-
-It's using PATH_MAX which is defined there, otherwise the build fails on
-musl libc.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Patch status: sent to alsa-devel ML.
-
- src/ucm/parser.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/ucm/parser.c b/src/ucm/parser.c
-index c98373a..f520abc 100644
---- a/src/ucm/parser.c
-+++ b/src/ucm/parser.c
-@@ -32,6 +32,7 @@
- 
- #include "ucm_local.h"
- #include <dirent.h>
-+#include <limits.h>
- 
- /** The name of the environment variable containing the UCM directory */
- #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM"
--- 
-2.10.2
-
diff --git a/bsp/buildroot/package/alsa-lib/Config.in b/bsp/buildroot/package/alsa-lib/Config.in
index 97e84897..995d3791 100644
--- a/bsp/buildroot/package/alsa-lib/Config.in
+++ b/bsp/buildroot/package/alsa-lib/Config.in
@@ -3,18 +3,18 @@ comment "alsa-lib needs a toolchain w/ threads"
 
 menuconfig BR2_PACKAGE_ALSA_LIB
 	bool "alsa-lib"
-	# Temporary until
-	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
-	# is fixed
-	select BR2_PACKAGE_ALSA_LIB_PCM
 	# Even though some parts of alsa-lib use threads only when
 	# available, some PCM plugins use them unconditionally. Since
 	# the usage of alsa-lib on no-thread systems is pretty
 	# unlikely, just require thread support globally for alsa-lib.
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# Temporary until
+	# https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913
+	# is fixed
+	select BR2_PACKAGE_ALSA_LIB_PCM
 	help
-	  The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
-	  functionality to the Linux operating system.
+	  The Advanced Linux Sound Architecture (ALSA) provides audio
+	  and MIDI functionality to the Linux operating system.
 
 	  http://www.alsa-project.org/
 
@@ -68,8 +68,8 @@ config BR2_PACKAGE_ALSA_LIB_SEQ
 
 config BR2_PACKAGE_ALSA_LIB_ALISP
 	bool "alisp"
-	depends on BR2_USE_MMU
 	default y
+	depends on BR2_USE_MMU
 
 config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS
 	bool "old-symbols"
diff --git a/bsp/buildroot/package/alsa-lib/alsa-lib.hash b/bsp/buildroot/package/alsa-lib/alsa-lib.hash
index 6f56a767..88530938 100644
--- a/bsp/buildroot/package/alsa-lib/alsa-lib.hash
+++ b/bsp/buildroot/package/alsa-lib/alsa-lib.hash
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256 71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c  alsa-lib-1.1.3.tar.bz2
+sha256 f4f68ad3c6da36b0b5241ac3c798a7a71e0e97d51f972e9f723b3f20a9650ae6  alsa-lib-1.1.5.tar.bz2
+sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7  COPYING
+sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced  aserver/COPYING
diff --git a/bsp/buildroot/package/alsa-lib/alsa-lib.mk b/bsp/buildroot/package/alsa-lib/alsa-lib.mk
index 5957568a..32355020 100644
--- a/bsp/buildroot/package/alsa-lib/alsa-lib.mk
+++ b/bsp/buildroot/package/alsa-lib/alsa-lib.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ALSA_LIB_VERSION = 1.1.3
+ALSA_LIB_VERSION = 1.1.5
 ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
 ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
-ALSA_LIB_LICENSE = LGPLv2.1+ (library), GPLv2+ (aserver)
+ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
 ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING
 ALSA_LIB_INSTALL_STAGING = YES
 ALSA_LIB_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/alsa-utils/Config.in b/bsp/buildroot/package/alsa-utils/Config.in
index adc0aabd..1a48fc03 100644
--- a/bsp/buildroot/package/alsa-utils/Config.in
+++ b/bsp/buildroot/package/alsa-utils/Config.in
@@ -8,7 +8,6 @@ menuconfig BR2_PACKAGE_ALSA_UTILS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	depends on !BR2_STATIC_LIBS # uses dlfcn.h
 	select BR2_PACKAGE_ALSA_LIB
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  This package contains the command line utilities for the ALSA
 	  project.
@@ -33,10 +32,10 @@ config BR2_PACKAGE_ALSA_UTILS_ALSALOOP
 
 config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
 	bool "alsamixer"
+	default y
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_ALSA_LIB_MIXER
-	depends on BR2_USE_WCHAR
-	default y
 
 comment "alsamixer needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
@@ -50,7 +49,6 @@ config BR2_PACKAGE_ALSA_UTILS_ALSATPLG
 config BR2_PACKAGE_ALSA_UTILS_AMIDI
 	bool "amidi"
 	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
-	select BR2_PACKAGE_ALSA_LIB_SEQ
 
 config BR2_PACKAGE_ALSA_UTILS_AMIXER
 	bool "amixer"
diff --git a/bsp/buildroot/package/alsa-utils/alsa-utils.hash b/bsp/buildroot/package/alsa-utils/alsa-utils.hash
index 1add17e0..41cf946b 100644
--- a/bsp/buildroot/package/alsa-utils/alsa-utils.hash
+++ b/bsp/buildroot/package/alsa-utils/alsa-utils.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c  alsa-utils-1.1.3.tar.bz2
+sha256 320bd285e91db6e7fd7db3c9ec6f55b02f35449ff273c7844780ac6a5a3de2e8  alsa-utils-1.1.5.tar.bz2
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
diff --git a/bsp/buildroot/package/alsa-utils/alsa-utils.mk b/bsp/buildroot/package/alsa-utils/alsa-utils.mk
index a72191e9..2d3407d4 100644
--- a/bsp/buildroot/package/alsa-utils/alsa-utils.mk
+++ b/bsp/buildroot/package/alsa-utils/alsa-utils.mk
@@ -4,33 +4,30 @@
 #
 ################################################################################
 
-ALSA_UTILS_VERSION = 1.1.3
+ALSA_UTILS_VERSION = 1.1.5
 ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
 ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils
-ALSA_UTILS_LICENSE = GPLv2
+ALSA_UTILS_LICENSE = GPL-2.0
 ALSA_UTILS_LICENSE_FILES = COPYING
 ALSA_UTILS_INSTALL_STAGING = YES
-ALSA_UTILS_DEPENDENCIES = host-gettext host-pkgconf alsa-lib \
+ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \
 	$(if $(BR2_PACKAGE_NCURSES),ncurses) \
-	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate)
+	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
+	$(TARGET_NLS_DEPENDENCIES)
 # Regenerate aclocal.m4 to pick the patched
 # version of alsa.m4 from alsa-lib
 ALSA_UTILS_AUTORECONF = YES
 ALSA_UTILS_GETTEXTIZE = YES
 
 ALSA_UTILS_CONF_ENV = \
-	ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
+	ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \
+	LIBS=$(TARGET_NLS_LIBS)
 
 ALSA_UTILS_CONF_OPTS = \
 	--disable-xmlto \
 	--disable-rst2man \
 	--with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses)
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-ALSA_UTILS_DEPENDENCIES += gettext
-ALSA_UTILS_CONF_ENV += LIBS=-lintl
-endif
-
 ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSALOOP),y)
 ALSA_UTILS_CONF_OPTS += --enable-alsaloop
 else
diff --git a/bsp/buildroot/package/alsamixergui/Config.in b/bsp/buildroot/package/alsamixergui/Config.in
index 5b61f386..2016a28a 100644
--- a/bsp/buildroot/package/alsamixergui/Config.in
+++ b/bsp/buildroot/package/alsamixergui/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_ALSAMIXERGUI
+	bool "alsamixergui"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # fltk fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	select BR2_PACKAGE_FLTK
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_PCM
 	select BR2_PACKAGE_ALSA_LIB_MIXER
-	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
-	bool "alsamixergui"
 	help
 	  A nice GUI mixer for Alsa using fltk
 
diff --git a/bsp/buildroot/package/alsamixergui/alsamixergui.mk b/bsp/buildroot/package/alsamixergui/alsamixergui.mk
index dba3ddd0..24e2497f 100644
--- a/bsp/buildroot/package/alsamixergui/alsamixergui.mk
+++ b/bsp/buildroot/package/alsamixergui/alsamixergui.mk
@@ -7,6 +7,8 @@
 ALSAMIXERGUI_VERSION = 0.9.0rc2-1
 ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz
 ALSAMIXERGUI_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui
+ALSAMIXERGUI_LICENSE = GPL-2.0+
+ALSAMIXERGUI_LICENSE_FILES = debian/copyright
 ALSAMIXERGUI_AUTORECONF = YES
 
 ALSAMIXERGUI_CONF_ENV = \
diff --git a/bsp/buildroot/package/am335x-pru-package/am335x-pru-package.mk b/bsp/buildroot/package/am335x-pru-package/am335x-pru-package.mk
index d6bffb4f..24a5df48 100644
--- a/bsp/buildroot/package/am335x-pru-package/am335x-pru-package.mk
+++ b/bsp/buildroot/package/am335x-pru-package/am335x-pru-package.mk
@@ -6,21 +6,21 @@
 
 AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096
 AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION))
-AM335X_PRU_PACKAGE_LICENSE = BSD-3c
+AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause
 AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt
 AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package
 AM335X_PRU_PACKAGE_INSTALL_STAGING = YES
 
 # The default 'all' rule builds everything, when we just need the library
 ifeq ($(BR2_ENABLE_DEBUG),y)
-AM335X_MAKE_TARGET = debug $(if $(BR2_STATIC_LIBS),,sodebug)
+AM335X_PRU_PACKAGE_MAKE_TARGET = debug $(if $(BR2_STATIC_LIBS),,sodebug)
 else
-AM335X_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease)
+AM335X_PRU_PACKAGE_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease)
 endif
 
 define AM335X_PRU_PACKAGE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
-		-C $(@D)/pru_sw/app_loader/interface $(AM335X_MAKE_TARGET)
+		-C $(@D)/pru_sw/app_loader/interface $(AM335X_PRU_PACKAGE_MAKE_TARGET)
 endef
 
 # 'install' installs whatever was built, and our patch removes the dependency
@@ -67,7 +67,7 @@ define HOST_AM335X_PRU_PACKAGE_BUILD_CMDS
 endef
 
 define HOST_AM335X_PRU_PACKAGE_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/pru_sw/utils/pasm $(HOST_DIR)/usr/bin/pasm
+	$(INSTALL) -m 0755 -D $(@D)/pru_sw/utils/pasm $(HOST_DIR)/bin/pasm
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/am33x-cm3/am33x-cm3.hash b/bsp/buildroot/package/am33x-cm3/am33x-cm3.hash
new file mode 100644
index 00000000..bb8c2f66
--- /dev/null
+++ b/bsp/buildroot/package/am33x-cm3/am33x-cm3.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 a722098b362f58f4dfb2a7c30afd604424d435b3d5ebe6ebf5d76ad942f796d0  am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365.tar.gz
diff --git a/bsp/buildroot/package/amd-catalyst/amd-catalyst.mk b/bsp/buildroot/package/amd-catalyst/amd-catalyst.mk
index 5636f81c..b9396e11 100644
--- a/bsp/buildroot/package/amd-catalyst/amd-catalyst.mk
+++ b/bsp/buildroot/package/amd-catalyst/amd-catalyst.mk
@@ -16,7 +16,6 @@ AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64)
 AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)
 AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64)
 
-
 define AMD_CATALYST_EXTRACT_CMDS
 	unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D)
 	$(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D)
@@ -24,7 +23,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y)
 AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x
-AMD_CATALYST_MODULE_MAKE_OPTS =  \
+AMD_CATALYST_MODULE_MAKE_OPTS = \
 	CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space"
 
 define AMD_CATALYST_PREPARE_MODULE
@@ -102,7 +101,6 @@ define AMD_CATALYST_INSTALL_XORG
 	$(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \
 		$(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf
 
-
 	# Common files: containing binary profiles about GPUs,
 	# required by the fglrx_drv xorg driver
 	$(INSTALL) -d $(TARGET_DIR)/etc/ati
diff --git a/bsp/buildroot/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch b/bsp/buildroot/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
new file mode 100644
index 00000000..77b457f6
--- /dev/null
+++ b/bsp/buildroot/package/android-tools/0008-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
@@ -0,0 +1,42 @@
+usb_linux.c: fix minor()/major() build failure due to glibc 2.28
+
+glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
+and therefore <sys/sysmacros.h> must be included explicitly when
+major()/minor() are used.
+
+This commit adds a patch to directly include <sys/sysmacros.h> into
+all usb_linux.c files where minor() and major() macros are used.
+
+diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c
+--- host-android-tools-4.2.2+git20130218.orig/core/adb/usb_linux.c	2013-02-18 15:49:03.000000000 +0100
++++ host-android-tools-4.2.2+git20130218/core/adb/usb_linux.c	2018-09-09 11:47:16.476292546 +0200
+@@ -20,6 +20,7 @@
+ #include <string.h>
+ 
+ #include <sys/ioctl.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <dirent.h>
+diff -urpN host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c
+--- host-android-tools-4.2.2+git20130218.orig/core/adbd/usb_linux.c	2018-09-09 02:32:57.154503866 +0200
++++ host-android-tools-4.2.2+git20130218/core/adbd/usb_linux.c	2018-09-09 11:47:28.148353880 +0200
+@@ -20,6 +20,7 @@
+ #include <string.h>
+ 
+ #include <sys/ioctl.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <dirent.h>
+diff -urpN host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c
+--- host-android-tools-4.2.2+git20130218.orig/core/fastboot/usb_linux.c	2013-02-18 15:49:03.000000000 +0100
++++ host-android-tools-4.2.2+git20130218/core/fastboot/usb_linux.c	2018-09-09 11:46:53.028169154 +0200
+@@ -33,6 +33,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <fcntl.h>
diff --git a/bsp/buildroot/package/android-tools/Config.in b/bsp/buildroot/package/android-tools/Config.in
index 19772ad4..478f1392 100644
--- a/bsp/buildroot/package/android-tools/Config.in
+++ b/bsp/buildroot/package/android-tools/Config.in
@@ -15,6 +15,8 @@ config BR2_PACKAGE_ANDROID_TOOLS
 	  can be used to interact with target devices using of these
 	  protocols.
 
+	  https://wiki.debian.org/AndroidTools#Original_android-tools_package
+
 if BR2_PACKAGE_ANDROID_TOOLS
 
 # We need kernel headers that support the __SANE_USERSPACE_TYPES__
@@ -34,13 +36,13 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
 
 config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT
 	bool "fastboot"
-	select BR2_PACKAGE_LIBSELINUX
-	select BR2_PACKAGE_ZLIB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
 	depends on !BR2_STATIC_LIBS # libselinux
 	depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
 	depends on !BR2_arc # libselinux
 	depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
+	select BR2_PACKAGE_LIBSELINUX
+	select BR2_PACKAGE_ZLIB
 	help
 	  This option will build and install the fastboot utility for
 	  the target, which can be used to reflash other target devices
diff --git a/bsp/buildroot/package/android-tools/android-tools.mk b/bsp/buildroot/package/android-tools/android-tools.mk
index 45103923..f6c6913a 100644
--- a/bsp/buildroot/package/android-tools/android-tools.mk
+++ b/bsp/buildroot/package/android-tools/android-tools.mk
@@ -73,7 +73,7 @@ endef
 
 define HOST_ANDROID_TOOLS_INSTALL_CMDS
 	$(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\
-		$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/usr/bin/$(t)$(sep))
+		$(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/bin/$(t)$(sep))
 endef
 
 define ANDROID_TOOLS_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/angularjs/angularjs.hash b/bsp/buildroot/package/angularjs/angularjs.hash
index 100b6dc6..918c049c 100644
--- a/bsp/buildroot/package/angularjs/angularjs.hash
+++ b/bsp/buildroot/package/angularjs/angularjs.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 a99e3c22b54178b7646856efd95e825650d32d3125904a28216aeba52e221bad angular-1.4.3.zip
+sha256	4d4e87d24c7d522f4ee765e4f7d454b9cf2a0f6407248545528064e66ad7b085	angular-1.6.7.zip
+sha256	cec36623ceba33c503784164917c206047079159bf88f51a695a4dfb9d9b7ede	angular.js
diff --git a/bsp/buildroot/package/angularjs/angularjs.mk b/bsp/buildroot/package/angularjs/angularjs.mk
index 08a4b608..60702a26 100644
--- a/bsp/buildroot/package/angularjs/angularjs.mk
+++ b/bsp/buildroot/package/angularjs/angularjs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ANGULARJS_VERSION = 1.4.3
+ANGULARJS_VERSION = 1.6.7
 ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip
 ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION)
 ANGULARJS_LICENSE = MIT
diff --git a/bsp/buildroot/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch b/bsp/buildroot/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch
new file mode 100644
index 00000000..00b24c89
--- /dev/null
+++ b/bsp/buildroot/package/aoetools/0001-Change-shell-script-interpreter-from-bin-bash-to-bin.patch
@@ -0,0 +1,26 @@
+From 4ef42740538cefd3c1554aa4df5bcb1388ac927b Mon Sep 17 00:00:00 2001
+From: Sergio Prado <sergio.prado@e-labworks.com>
+Date: Tue, 16 Jan 2018 22:28:32 -0200
+Subject: [PATCH] Change shell script interpreter from /bin/bash to /bin/sh
+
+This will make the script more portable, making it possible to run on
+systems that do not have bash.
+
+Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
+---
+ aoe-stat.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aoe-stat.in b/aoe-stat.in
+index 50e6ac674169..0c1d6f5ebe1e 100755
+--- a/aoe-stat.in
++++ b/aoe-stat.in
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! /bin/sh
+ # aoe-stat - collate and present information about AoE storage
+ # Copyright 2012, CORAID, Inc., and licensed under GPL v.2.
+ 
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/aoetools/Config.in b/bsp/buildroot/package/aoetools/Config.in
new file mode 100644
index 00000000..70a838f6
--- /dev/null
+++ b/bsp/buildroot/package/aoetools/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_AOETOOLS
+	bool "aoetools"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  The aoetools are programs for users of the ATA over Ethernet
+	  (AoE) network storage protocol, a simple protocol for using
+	  storage over an ethernet LAN.
+
+	  http://aoetools.sourceforge.net/
+
+comment "aoetools needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/aoetools/aoetools.hash b/bsp/buildroot/package/aoetools/aoetools.hash
new file mode 100644
index 00000000..76c30562
--- /dev/null
+++ b/bsp/buildroot/package/aoetools/aoetools.hash
@@ -0,0 +1,5 @@
+# Locally computed:
+sha256 477e796f5c18e8c0e61b5d88e1759c68249e8e0210c2f3de2b98680e2cc63e32  aoetools-37.tar.gz
+
+# Hash for license files:
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/bsp/buildroot/package/aoetools/aoetools.mk b/bsp/buildroot/package/aoetools/aoetools.mk
new file mode 100644
index 00000000..3f6340ff
--- /dev/null
+++ b/bsp/buildroot/package/aoetools/aoetools.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# aoetools
+#
+################################################################################
+
+AOETOOLS_VERSION = 37
+AOETOOLS_SITE = $(call github,OpenAoE,aoetools,aoetools-$(AOETOOLS_VERSION))
+AOETOOLS_LICENSE = GPL-2.0
+AOETOOLS_LICENSE_FILES = COPYING
+
+define AOETOOLS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define AOETOOLS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) \
+		-C $(@D) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/apache/Config.in b/bsp/buildroot/package/apache/Config.in
index 511876d2..693ee20a 100644
--- a/bsp/buildroot/package/apache/Config.in
+++ b/bsp/buildroot/package/apache/Config.in
@@ -1,16 +1,17 @@
 config BR2_PACKAGE_APACHE
 	bool "apache"
-	select BR2_PACKAGE_APR_UTIL
-	select BR2_PACKAGE_PCRE
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # apr
+	select BR2_PACKAGE_APR_UTIL
+	select BR2_PACKAGE_PCRE
 	help
-	  The Apache HTTP Server Project is an effort to develop and maintain an
-	  open-source HTTP server for modern operating systems including UNIX
-	  and Windows NT. The goal of this project is to provide a secure,
-	  efficient and extensible server that provides HTTP services in sync
-	  with the current HTTP standards.
+	  The Apache HTTP Server Project is an effort to develop and
+	  maintain an open-source HTTP server for modern operating
+	  systems including UNIX and Windows NT. The goal of this
+	  project is to provide a secure, efficient and extensible
+	  server that provides HTTP services in sync with the current
+	  HTTP standards.
 
 	  http://httpd.apache.org
 
diff --git a/bsp/buildroot/package/apache/apache.hash b/bsp/buildroot/package/apache/apache.hash
index 76c7c766..32743656 100644
--- a/bsp/buildroot/package/apache/apache.hash
+++ b/bsp/buildroot/package/apache/apache.hash
@@ -1,3 +1,4 @@
-# From http://archive.apache.org/dist/httpd/httpd-2.4.33.tar.bz2.sha256
-sha256 de02511859b00d17845b9abdd1f975d5ccb5d0b280c567da5bf2ad4b70846f05 httpd-2.4.33.tar.bz2
+# From http://archive.apache.org/dist/httpd/httpd-2.4.35.tar.bz2.sha256
+sha256 2607c6fdd4d12ac3f583127629291e9432b247b782396a563bec5678aae69b56 httpd-2.4.35.tar.bz2
+# Locally computed
 sha256 c49c0819a726b70142621715dae3159c47b0349c2bc9db079070f28dadac0229 LICENSE
diff --git a/bsp/buildroot/package/apache/apache.mk b/bsp/buildroot/package/apache/apache.mk
index eaf7b9c5..982c6de7 100644
--- a/bsp/buildroot/package/apache/apache.mk
+++ b/bsp/buildroot/package/apache/apache.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APACHE_VERSION = 2.4.33
+APACHE_VERSION = 2.4.35
 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
 APACHE_SITE = http://archive.apache.org/dist/httpd
 APACHE_LICENSE = Apache-2.0
diff --git a/bsp/buildroot/package/apitrace/Config.in b/bsp/buildroot/package/apitrace/Config.in
index 7fdd35af..b622823c 100644
--- a/bsp/buildroot/package/apitrace/Config.in
+++ b/bsp/buildroot/package/apitrace/Config.in
@@ -1,13 +1,13 @@
-comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.6"
+comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.9"
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 config BR2_PACKAGE_APITRACE
 	bool "apitrace"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_USES_GLIBC # uses glibc specific __libc_dlsym
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_LIBPNG
diff --git a/bsp/buildroot/package/apitrace/apitrace.hash b/bsp/buildroot/package/apitrace/apitrace.hash
index eac470b0..1daaa46e 100644
--- a/bsp/buildroot/package/apitrace/apitrace.hash
+++ b/bsp/buildroot/package/apitrace/apitrace.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 21d0cc765b84e537c5a3a117073818942653b85685b9633d364836ccfe0b9fd5  apitrace-7.0.tar.gz
+sha256 0aae8902696ad23ba91d61c57007861a3f6e3c2d4f0f43b783b4b7a58e3f9172  apitrace-15d7f975f9688372467ebd63d2a57d3957823f93.tar.gz
diff --git a/bsp/buildroot/package/apitrace/apitrace.mk b/bsp/buildroot/package/apitrace/apitrace.mk
index fbd957c6..c66f6b3e 100644
--- a/bsp/buildroot/package/apitrace/apitrace.mk
+++ b/bsp/buildroot/package/apitrace/apitrace.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-APITRACE_VERSION = 7.0
+APITRACE_VERSION = 15d7f975f9688372467ebd63d2a57d3957823f93
 APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION))
 APITRACE_LICENSE = MIT
 APITRACE_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/apr-util/Config.in b/bsp/buildroot/package/apr-util/Config.in
index 1d7db2bd..6c5e3bbd 100644
--- a/bsp/buildroot/package/apr-util/Config.in
+++ b/bsp/buildroot/package/apr-util/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_APR_UTIL
 	bool "apr-util"
-	select BR2_PACKAGE_APR
-	select BR2_PACKAGE_EXPAT
 	# apr really needs shared library support
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # apr
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_EXPAT
 	help
 	  The utility library for the apache runtime project
 
diff --git a/bsp/buildroot/package/apr-util/apr-util.mk b/bsp/buildroot/package/apr-util/apr-util.mk
index c44cef00..b006964c 100644
--- a/bsp/buildroot/package/apr-util/apr-util.mk
+++ b/bsp/buildroot/package/apr-util/apr-util.mk
@@ -47,6 +47,17 @@ else
 APR_UTIL_CONF_OPTS += --without-sqlite3
 endif
 
+ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+APR_UTIL_CONF_ENV += ac_cv_ldap_set_rebind_proc_style=three
+APR_UTIL_CONF_OPTS += \
+	--with-ldap \
+	--with-ldap-include="$(STAGING_DIR)/usr/include/" \
+	--with-ldap-lib="$(STAGING_DIR)/usr/lib"
+APR_UTIL_DEPENDENCIES += openldap
+else
+APR_UTIL_CONF_OPTS += --without-ldap
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 APR_UTIL_CONF_OPTS += --with-crypto --with-openssl="$(STAGING_DIR)/usr"
 APR_UTIL_DEPENDENCIES += openssl
@@ -54,6 +65,13 @@ else
 APR_UTIL_CONF_OPTS += --without-crypto
 endif
 
+ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
+APR_UTIL_CONF_OPTS += --with-pgsql="$(STAGING_DIR)/usr"
+APR_UTIL_DEPENDENCIES += postgresql
+else
+APR_UTIL_CONF_OPTS += --without-pgsql
+endif
+
 ifeq ($(BR2_PACKAGE_UNIXODBC),y)
 APR_UTIL_CONF_OPTS += --with-odbc="$(STAGING_DIR)/usr"
 # avoid using target binary $(STAGING_DIR)/usr/bin/odbc_config
diff --git a/bsp/buildroot/package/apr/Config.in b/bsp/buildroot/package/apr/Config.in
index 57572724..67de9254 100644
--- a/bsp/buildroot/package/apr/Config.in
+++ b/bsp/buildroot/package/apr/Config.in
@@ -4,9 +4,10 @@ config BR2_PACKAGE_APR
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # fork() in apr_proc_fork()
 	help
-	  The mission of the Apache Portable Runtime (APR) project is to create
-	  and maintain software libraries that provide a predictable and
-	  consistent interface to underlying platform-specific implementations
+	  The mission of the Apache Portable Runtime (APR) project is to
+	  create and maintain software libraries that provide a
+	  predictable and consistent interface to underlying
+	  platform-specific implementations
 
 	  http://apr.apache.org/
 
diff --git a/bsp/buildroot/package/argp-standalone/argp-standalone.mk b/bsp/buildroot/package/argp-standalone/argp-standalone.mk
index f043936e..977b9547 100644
--- a/bsp/buildroot/package/argp-standalone/argp-standalone.mk
+++ b/bsp/buildroot/package/argp-standalone/argp-standalone.mk
@@ -7,7 +7,7 @@
 ARGP_STANDALONE_VERSION = 1.3
 ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
 ARGP_STANDALONE_INSTALL_STAGING = YES
-ARGP_STANDALONE_LICENSE = LGPLv2+
+ARGP_STANDALONE_LICENSE = LGPL-2.0+
 
 ARGP_STANDALONE_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline"
diff --git a/bsp/buildroot/package/argus/argus.mk b/bsp/buildroot/package/argus/argus.mk
index bd1c5590..941f439f 100644
--- a/bsp/buildroot/package/argus/argus.mk
+++ b/bsp/buildroot/package/argus/argus.mk
@@ -9,7 +9,7 @@ ARGUS_SITE = http://qosient.com/argus/src
 ARGUS_DEPENDENCIES = libpcap
 ARGUS_CONF_ENV = arg_cv_sys_errlist=yes
 # Code is really v2+ though COPYING is v3 so ship README to avoid confusion
-ARGUS_LICENSE = GPLv2+
+ARGUS_LICENSE = GPL-2.0+
 ARGUS_LICENSE_FILES = README
 
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
diff --git a/bsp/buildroot/package/armadillo/armadillo.hash b/bsp/buildroot/package/armadillo/armadillo.hash
index 4149a777..6b3c4a85 100644
--- a/bsp/buildroot/package/armadillo/armadillo.hash
+++ b/bsp/buildroot/package/armadillo/armadillo.hash
@@ -1,5 +1,7 @@
 # From http://sourceforge.net/projects/arma/files/?source=navbar
-md5	a39f27197d24b3d25437fab6bb1d118f		armadillo-6.500.4.tar.gz
-sha1	68166e67521a720c72917d196b0807bc6cab8b2e	armadillo-6.500.4.tar.gz
+md5 5ef71763bd429a3d481499878351f3be  armadillo-7.900.1.tar.xz
+sha1 8118faf1c6a7a39c55a1103a1f90e85e613cc377  armadillo-7.900.1.tar.xz
 # Locally computed:
-sha256	813de85fa61ba5077ed871d801ba7070d369e7e9742002e4c11474c75ff6d1c6	armadillo-6.500.4.tar.gz
+sha256 33eec7013990b5477ccc5ad3abc68bc2326c7a7a2790014d625cfcf37c0e07d3  armadillo-7.900.1.tar.xz
+# License files, locally calculated
+sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  LICENSE.txt
diff --git a/bsp/buildroot/package/armadillo/armadillo.mk b/bsp/buildroot/package/armadillo/armadillo.mk
index 00ba08a1..b5fe403a 100644
--- a/bsp/buildroot/package/armadillo/armadillo.mk
+++ b/bsp/buildroot/package/armadillo/armadillo.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-ARMADILLO_VERSION = 6.500.4
-# upstream removed tarball from
-# http://downloads.sourceforge.net/project/arma
-ARMADILLO_SITE = https://ftp.fau.de/macports/distfiles/armadillo
+ARMADILLO_VERSION = 7.900.1
+ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz
+ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma
 ARMADILLO_DEPENDENCIES = clapack
 ARMADILLO_INSTALL_STAGING = YES
-ARMADILLO_LICENSE = MPLv2.0
+ARMADILLO_LICENSE = MPL-2.0
 ARMADILLO_LICENSE_FILES = LICENSE.txt
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/armbian-firmware/Config.in b/bsp/buildroot/package/armbian-firmware/Config.in
new file mode 100644
index 00000000..761c3166
--- /dev/null
+++ b/bsp/buildroot/package/armbian-firmware/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_ARMBIAN_FIRMWARE
+	bool "armbian-firmware"
+	help
+	  This package enables access to various firmware
+	  blobs from the Armbian firmware repository.
+
+	  https://github.com/armbian/firmware
+
+if BR2_PACKAGE_ARMBIAN_FIRMWARE
+
+config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819
+	bool "XR819 WiFi"
+	help
+	  Firmware files for XR819 WiFi SDIO chip.
+
+config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212
+	bool "AP6212 WiFi/BT"
+	help
+	  Firmware files for AP6212 WiFi/BT combo chip.
+
+endif
diff --git a/bsp/buildroot/package/armbian-firmware/armbian-firmware.hash b/bsp/buildroot/package/armbian-firmware/armbian-firmware.hash
new file mode 100644
index 00000000..0f3858de
--- /dev/null
+++ b/bsp/buildroot/package/armbian-firmware/armbian-firmware.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 876958ce6ba8a4a01a424f2b4455208b7a989eaba96015649c774340553f0c35 armbian-firmware-455d6b6701178dafe7fd0168eb4a4ef78a8d24a3.tar.gz
diff --git a/bsp/buildroot/package/armbian-firmware/armbian-firmware.mk b/bsp/buildroot/package/armbian-firmware/armbian-firmware.mk
new file mode 100644
index 00000000..77e51854
--- /dev/null
+++ b/bsp/buildroot/package/armbian-firmware/armbian-firmware.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# armbian-firmware
+#
+################################################################################
+
+ARMBIAN_FIRMWARE_VERSION = 455d6b6701178dafe7fd0168eb4a4ef78a8d24a3
+ARMBIAN_FIRMWARE_SITE = https://github.com/armbian/firmware
+ARMBIAN_FIRMWARE_SITE_METHOD = git
+
+# XR819 WiFi firmware
+ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819),y)
+ARMBIAN_FIRMWARE_FILES += \
+	xr819/boot_xr819.bin \
+	xr819/fw_xr819.bin \
+	xr819/sdd_xr819.bin
+endif
+
+# AP6212 WiFi/BT combo firmware
+ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6212),y)
+ARMBIAN_FIRMWARE_DIRS += ap6212
+endif
+
+ifneq ($(ARMBIAN_FIRMWARE_FILES),)
+define ARMBIAN_FIRMWARE_INSTALL_FILES
+	cd $(@D) && \
+		$(TAR) cf install.tar $(sort $(ARMBIAN_FIRMWARE_FILES)) && \
+		$(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware
+endef
+endif
+
+ifneq ($(ARMBIAN_FIRMWARE_DIRS),)
+# We need to rm -rf the destination directory to avoid copying
+# into it in itself, should we re-install the package.
+define ARMBIAN_FIRMWARE_INSTALL_DIRS
+	$(foreach d,$(ARMBIAN_FIRMWARE_DIRS), \
+		rm -rf $(TARGET_DIR)/lib/firmware/$(d); \
+		cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep))
+endef
+endif
+
+ifneq ($(ARMBIAN_FIRMWARE_FILES)$(ARMBIAN_FIRMWARE_DIRS),)
+ARMBIAN_FIRMWARE_LICENSE = PROPRIETARY
+ARMBIAN_FIRMWARE_REDISTRIBUTE = NO
+endif
+
+define ARMBIAN_FIRMWARE_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware
+	$(ARMBIAN_FIRMWARE_INSTALL_FILES)
+	$(ARMBIAN_FIRMWARE_INSTALL_DIRS)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/arp-scan/0001-configure-try-linking-to-detect-stack-protector-supp.patch b/bsp/buildroot/package/arp-scan/0001-configure-try-linking-to-detect-stack-protector-supp.patch
new file mode 100644
index 00000000..8eb9d6ef
--- /dev/null
+++ b/bsp/buildroot/package/arp-scan/0001-configure-try-linking-to-detect-stack-protector-supp.patch
@@ -0,0 +1,39 @@
+From f406041b58eadc716d6227408d3af553d566ffeb Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Tue, 4 Apr 2017 17:31:29 +0200
+Subject: [PATCH] configure: try linking to detect stack-protector support
+
+Even if gcc accepts the -fstack-protector argument, it is possible that
+the libssp support library is missing. Detect this by linking instead
+of just compiling.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ acinclude.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 3c84118..4725154 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -243,7 +243,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CC],[
+     AC_MSG_CHECKING([whether ${CC} accepts -fstack-protector])
+     ssp_old_cflags="$CFLAGS"
+     CFLAGS="$CFLAGS -fstack-protector"
+-    AC_TRY_COMPILE(,,, ssp_cc=no)
++    AC_TRY_LINK(,,, ssp_cc=no)
+     echo $ssp_cc
+     if test "X$ssp_cc" = "Xno"; then
+       CFLAGS="$ssp_old_cflags"
+@@ -259,7 +259,7 @@ AC_DEFUN([GCC_STACK_PROTECT_CXX],[
+     AC_MSG_CHECKING([whether ${CXX} accepts -fstack-protector])
+     ssp_old_cxxflags="$CXXFLAGS"
+     CXXFLAGS="$CXXFLAGS -fstack-protector"
+-    AC_TRY_COMPILE(,,, ssp_cxx=no)
++    AC_TRY_LINK(,,, ssp_cxx=no)
+     echo $ssp_cxx
+     if test "X$ssp_cxx" = "Xno"; then
+         CXXFLAGS="$ssp_old_cxxflags"
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/arp-scan/Config.in b/bsp/buildroot/package/arp-scan/Config.in
new file mode 100644
index 00000000..ed70b395
--- /dev/null
+++ b/bsp/buildroot/package/arp-scan/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_ARP_SCAN
+	bool "arp-scan"
+	select BR2_PACKAGE_LIBPCAP
+	help
+	  The ARP scanner
+
+	  arp-scan is a command-line tool that uses the ARP protocol to
+	  discover and fingerprint IP hosts on the local network.
+
+	  https://github.com/royhills/arp-scan
diff --git a/bsp/buildroot/package/arp-scan/arp-scan.hash b/bsp/buildroot/package/arp-scan/arp-scan.hash
new file mode 100644
index 00000000..4b2ddf18
--- /dev/null
+++ b/bsp/buildroot/package/arp-scan/arp-scan.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	ce908ac71c48e85dddf6dd4fe5151d13c7528b1f49717a98b2a2535bd797d892	arp-scan-1.9.tar.gz
diff --git a/bsp/buildroot/package/arp-scan/arp-scan.mk b/bsp/buildroot/package/arp-scan/arp-scan.mk
new file mode 100644
index 00000000..b46e941d
--- /dev/null
+++ b/bsp/buildroot/package/arp-scan/arp-scan.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# arp-scan
+#
+################################################################################
+
+ARP_SCAN_VERSION = 1.9
+ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION)
+ARP_SCAN_LICENSE = GPL-3.0+
+ARP_SCAN_LICENSE_FILES = COPYING
+ARP_SCAN_DEPENDENCIES = libpcap
+
+# 0001-configure-try-linking-to-detect-stack-protector-supp.patch touches acinclude.m4
+ARP_SCAN_AUTORECONF = YES
+
+ifeq ($(BR2_STATIC_LIBS),y)
+ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
+endif
+
+ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld'
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/arptables/arptables.mk b/bsp/buildroot/package/arptables/arptables.mk
index 888d396e..257b636d 100644
--- a/bsp/buildroot/package/arptables/arptables.mk
+++ b/bsp/buildroot/package/arptables/arptables.mk
@@ -7,7 +7,7 @@
 ARPTABLES_VERSION = 0.0.4
 ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz
 ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION)
-ARPTABLES_LICENSE = GPLv2+
+ARPTABLES_LICENSE = GPL-2.0+
 
 define ARPTABLES_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
diff --git a/bsp/buildroot/package/assimp/Config.in b/bsp/buildroot/package/assimp/Config.in
index 93020f72..41c1bb34 100644
--- a/bsp/buildroot/package/assimp/Config.in
+++ b/bsp/buildroot/package/assimp/Config.in
@@ -8,9 +8,10 @@ config BR2_PACKAGE_ASSIMP
 	select BR2_PACKAGE_ZLIB
 	help
 	  Open Asset Import Library (assimp) is a portable Open Source
-	  library to import various well-known 3D model formats in a uniform
-	  manner. The most recent version also knows how to export 3d files
-	  and is therefore suitable as a general-purpose 3D model converter.
+	  library to import various well-known 3D model formats in a
+	  uniform manner. The most recent version also knows how to
+	  export 3d files and is therefore suitable as a general-purpose
+	  3D model converter.
 
 	  http://www.assimp.org
 
diff --git a/bsp/buildroot/package/assimp/assimp.mk b/bsp/buildroot/package/assimp/assimp.mk
index acd3701a..4d447487 100644
--- a/bsp/buildroot/package/assimp/assimp.mk
+++ b/bsp/buildroot/package/assimp/assimp.mk
@@ -6,7 +6,7 @@
 
 ASSIMP_VERSION = v3.2
 ASSIMP_SITE = $(call github,assimp,assimp,$(ASSIMP_VERSION))
-ASSIMP_LICENSE = BSD-3c
+ASSIMP_LICENSE = BSD-3-Clause
 ASSIMP_LICENSE_FILES = LICENSE
 ASSIMP_DEPENDENCIES = zlib
 ASSIMP_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/asterisk/0001-configure-do-not-configure-in-menuselect.patch b/bsp/buildroot/package/asterisk/0001-configure-do-not-configure-in-menuselect.patch
new file mode 100644
index 00000000..d6d02d2c
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/0001-configure-do-not-configure-in-menuselect.patch
@@ -0,0 +1,58 @@
+From cc5daff874779475742bdb89a9328bb4fc4c4e09 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 27 Dec 2016 11:20:19 +0100
+Subject: [PATCH] configure: do not configure in menuselect
+
+When cross-compiling, the arguments and environment for ./configure are
+different for the host and the target, and we want menuselect to be
+compiled for the build machine, not the target.
+
+Although we do not pass any option to ./configure for menuselect, the
+environment may still reference variables for the target, like CC or
+CFLAGS and so on... We can not build menuselect with those variables.
+
+Instead, just assume that menuselect will be pre-compiled.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ configure    | 16 ----------------
+ configure.ac | 16 ----------------
+ 2 files changed, 32 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 66c8971..121dd93 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2662,12 +2662,6 @@ fi
+ 
+ AC_SUBST([PBX_SYSLOG])
+ 
+-if test -f makeopts; then
+-	${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak
+-else
+-	touch makeopts.acbak
+-fi
+-
+ AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
+ AST_CHECK_MANDATORY
+ 
+@@ -2683,16 +2677,6 @@ fi
+ 
+ AC_OUTPUT
+ 
+-${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
+-if test "x${ac_cv_path_CMP}" = "x:"; then
+-	( cd `pwd`/menuselect && ./configure )
+-else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
+-	( cd `pwd`/menuselect && ./configure )
+-fi ; fi
+-
+-rm makeopts.acbak makeopts.acbak2
+-
+-
+ if test "x${silent}" != "xyes" ; then
+ echo
+ echo "               .\$\$\$\$\$\$\$\$\$\$\$\$\$\$\$=..      "
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/asterisk/0002-sounds-do-not-download-and-check-sha1s.patch b/bsp/buildroot/package/asterisk/0002-sounds-do-not-download-and-check-sha1s.patch
new file mode 100644
index 00000000..8412843d
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/0002-sounds-do-not-download-and-check-sha1s.patch
@@ -0,0 +1,52 @@
+From 3e8a9e9a1c7eae515eb628778c3c8a04338b3bb3 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 27 Dec 2016 11:21:09 +0100
+Subject: [PATCH] sounds: do not download and check sha1s
+
+To validate the sound archives, the corresponding sha1s are also
+downloaded from the same location, and that download is done at install
+time.
+
+However, that poses at least two problems:
+
+  - in Buildroot, we already have validated the downloads with the sha1s
+    anyway, and trying to download anything at install time is not
+    always possible (e.g. for off-line builds);
+
+  - since the download scheme is not secured (plain http), a
+    man-in-the-middle for the sounds will also be able to MITM the
+    download of the sha1s, so there is absolutely no additional safety
+    in doing so.
+
+So we just do without the sha1 download and checks.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ sounds/Makefile | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/sounds/Makefile b/sounds/Makefile
+index 84d0f45..7a80d56 100644
+--- a/sounds/Makefile
++++ b/sounds/Makefile
+@@ -100,17 +100,7 @@ ifneq ($(SOUNDS_CACHE_DIR),)
+ 	  if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@"; then \
+ 	    (cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@); \
+ 	  fi; \
+-	  if test ! -f "$$(SOUNDS_CACHE_DIR)/$$@.sha1"; then \
+-	    (cd "$$(SOUNDS_CACHE_DIR)"; $$(DOWNLOAD) $$(SOUNDS_URL)/$$@.sha1); \
+-	  fi; \
+ 	  $$(LN) -sf "$$(SOUNDS_CACHE_DIR)/$$@" .; \
+-	  $$(LN) -sf "$$(SOUNDS_CACHE_DIR)/$$@.sha1" .; \
+-	  $$(SHA1SUM) -c --status $$@.sha1 || \
+-	    ( \
+-	      rm -f "$$(SOUNDS_CACHE_DIR)/$$@" "$$(SOUNDS_CACHE_DIR)/$$@.sha1" $$@ $$@.sha1; \
+-	      echo "Bad checksum: $$@" 1>&2; \
+-	      exit 1; \
+-	    ) || exit 1; \
+ 	fi
+ else
+ 	$(CMD_PREFIX) \
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/asterisk/0003-configure-fix-detection-of-libcrypt.patch b/bsp/buildroot/package/asterisk/0003-configure-fix-detection-of-libcrypt.patch
new file mode 100644
index 00000000..d82f5084
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/0003-configure-fix-detection-of-libcrypt.patch
@@ -0,0 +1,43 @@
+From 8996503f6c55e55f326ab11c18278954ad7abaf3 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 27 Dec 2016 11:21:57 +0100
+Subject: [PATCH] configure: fix detection of libcrypt
+
+The crypt() function is searched in two locations: -lcrypt and the
+standard C library.
+
+The result of the former is stored in the LIBCRYPT 'scheme' while that
+of the latter is stored in the 'SYSCRYPT' scheme.
+
+However, the check for mandatory modules looks at the CRYPT 'scheme',
+and thus concludes that crypt is missing when it was successfully found.
+
+Fix that by also storing the result of either check in the 'CRYPT'
+scheme.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ configure    | 2 ++
+ configure.ac | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 121dd93..d459ff5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2406,10 +2406,12 @@ AC_CHECK_FUNC([crypt], [SYSCRYPT=true], [SYSCRYPT=""])
+ if test "x$LIBCRYPT_LIB" != "x" ; then
+     CRYPT_LIB="$LIBCRYPT_LIB"
+     CRYPT_INCLUDE="$LIBCRYPT_INCLUDE"
++    PBX_CRYPT=1
+     AC_DEFINE([HAVE_CRYPT], [1], [Define to 1 if you have the 'crypt' function.])
+ elif test "x$SYSCRYPT" != "x" ; then
+     CRYPT_LIB=""
+     CRYPT_INCLUDE=""
++    PBX_CRYPT=1
+     AC_DEFINE([HAVE_CRYPT], [1], [Define to 1 if you have the 'crypt' function.])
+ fi
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/asterisk/0004-build-ensure-target-directory-for-modules-exists.patch b/bsp/buildroot/package/asterisk/0004-build-ensure-target-directory-for-modules-exists.patch
new file mode 100644
index 00000000..20cfc938
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/0004-build-ensure-target-directory-for-modules-exists.patch
@@ -0,0 +1,32 @@
+From 933b2554a40f932571bdbdbb5217cda3e35fd61f Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Mon, 27 Nov 2017 12:52:52 +0100
+Subject: [PATCH] build: ensure target directory for modules exists
+
+Currently, in highly-parallel builds, it is possible that installing
+modules fails because the target directory does not exist yet.
+
+We fix that by instructing $(INSTALL) to create the destination directory
+first.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ Makefile.moddir_rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.moddir_rules b/Makefile.moddir_rules
+index 59190bece9..b73153a9a5 100644
+--- a/Makefile.moddir_rules
++++ b/Makefile.moddir_rules
+@@ -110,7 +110,7 @@ clean::
+ 
+ install:: all
+ 	@echo "Installing modules from `basename $(CURDIR)`..."
+-	@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x "$(DESTDIR)$(ASTMODDIR)" ; done
++	@for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -D -m 755 $$x "$(DESTDIR)$(ASTMODDIR)" ; done
+ ifneq ($(findstring :,$(XMLSTARLET)$(BASH)),:)
+ 	@if [ -f .moduleinfo ] ; then \
+ 		declare -A DISABLED_MODS ;\
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/asterisk/0005-install-samples-need-the-data-files.patch b/bsp/buildroot/package/asterisk/0005-install-samples-need-the-data-files.patch
new file mode 100644
index 00000000..a9560e82
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/0005-install-samples-need-the-data-files.patch
@@ -0,0 +1,35 @@
+From 05680ea9899c2246c23d11860c2c8e10aa8f80c7 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Fri, 1 Dec 2017 11:08:16 +0100
+Subject: [PATCH] install: samples need the data files
+
+When installing samples, "sample voicemail" is generated from the
+already-installed sound files.
+
+However, when doing the install and the samples at the same time in a
+parallel install, it is possible that the sound files are not already
+installed at the time we try to generate the voicemail data.
+
+Ensure the needed dependency.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index f29c07f680..b58f707b61 100644
+--- a/Makefile
++++ b/Makefile
+@@ -779,7 +779,7 @@ adsi:
+ 		$(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+ 	done
+ 
+-samples: adsi
++samples: adsi datafiles
+ 	@echo Installing other config files...
+ 	$(call INSTALL_CONFIGS,samples,.sample)
+ 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/asterisk/0006-build-fix-issues-building-without-ssl.patch b/bsp/buildroot/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
new file mode 100644
index 00000000..b02031e5
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/0006-build-fix-issues-building-without-ssl.patch
@@ -0,0 +1,57 @@
+From 999e0c17d7e4139d36730752a34fbfde18a4f9f1 Mon Sep 17 00:00:00 2001
+From: Corey Farrell <git@cfware.com>
+Date: Sun, 19 Nov 2017 14:52:59 -0500
+Subject: [PATCH] Build: Fix issues building without SSL.
+
+* Fix conditional in libasteriskssl.
+* Use variables produced by configure to link the SSL and uuid libraries
+  into libasteriskpj.so instead of hard-coding them.
+
+ASTERISK-27431
+
+Change-Id: I3977931fd3ef8c4e4376349ccddb354eb839b58d
+
+Downloaded from upstream master branch
+https://github.com/asterisk/asterisk/commit/999e0c17d7e4139d36730752a34fbfde18a4f9f1
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ main/Makefile         | 4 ++--
+ main/libasteriskssl.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/main/Makefile b/main/Makefile
+index 08d1f65580e..c724e2012b0 100644
+--- a/main/Makefile
++++ b/main/Makefile
+@@ -273,7 +273,7 @@ endif
+ 
+ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTLDFLAGS+=-Wl,-soname=$(ASTPJ_LIB).$(ASTPJ_SO_VERSION) $(PJ_LDFLAGS)
+ $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" -DAST_NOT_MODULE $(PJ_CFLAGS)
+-$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
++$(ASTPJ_LIB).$(ASTPJ_SO_VERSION): LIBS+=$(PJPROJECT_LDLIBS) $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+ ifeq ($(GNU_LD),1)
+     $(ASTPJ_LIB).$(ASTPJ_SO_VERSION): SO_SUPPRESS_SYMBOLS=-Wl,--version-script,libasteriskpj.exports,--warn-common
+ endif
+@@ -298,7 +298,7 @@ ASTPJ_LIB:=libasteriskpj.dylib
+ # /lib or /usr/lib
+ $(ASTPJ_LIB): _ASTLDFLAGS+=-dynamiclib -install_name $(ASTLIBDIR)/$(ASTPJ_LIB) $(PJ_LDFLAGS)
+ $(ASTPJ_LIB): _ASTCFLAGS+=-fPIC -DAST_MODULE=\"asteriskpj\" $(PJ_CFLAGS) -DAST_NOT_MODULE
+-$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  -lssl -lcrypto -luuid -lm -lpthread $(RT_LIB)
++$(ASTPJ_LIB): LIBS+=$(PJPROJECT_LIBS)  $(OPENSSL_LIB) $(UUID_LIB) -lm -lpthread $(RT_LIB)
+ $(ASTPJ_LIB): SOLINK=$(DYLINK)
+ 
+ # Special rules for building a shared library (not a dynamically loadable module)
+diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
+index 8b19e247da9..e2e256f8ffe 100644
+--- a/main/libasteriskssl.c
++++ b/main/libasteriskssl.c
+@@ -37,7 +37,7 @@
+ #endif
+ 
+ #if defined(HAVE_OPENSSL) && \
+-	!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++	(!defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ 
+ #include <dlfcn.h>
+ 
diff --git a/bsp/buildroot/package/asterisk/Config.in b/bsp/buildroot/package/asterisk/Config.in
new file mode 100644
index 00000000..17ac22bf
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/Config.in
@@ -0,0 +1,26 @@
+config BR2_PACKAGE_ASTERISK
+	bool "asterisk"
+	# Uses glibc resolver function res_nsearch()
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_JANSSON
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBILBC
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	help
+	  Asterisk is an open source framework for building
+	  communications applications. Asterisk turns an ordinary
+	  computer into a communications server. Asterisk powers IP PBX
+	  systems, VoIP gateways, conference servers and other custom
+	  solutions. It is used by small businesses, large businesses,
+	  call centers, carriers and government agencies, worldwide.
+	  Asterisk is free and open source.
+
+	  http://www.asterisk.org/
+
+comment "asterisk needs a glibc toolchain w/ C++"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/asterisk/asterisk.hash b/bsp/buildroot/package/asterisk/asterisk.hash
new file mode 100644
index 00000000..a3e9d10a
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/asterisk.hash
@@ -0,0 +1,15 @@
+# Locally computed
+sha256  249cf223ef4dd7aea01f0d250a6b9cad661ebd78910c73adb7f59c1c46f9fed8  asterisk-14.7.6.tar.gz
+
+# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
+# sha256 locally computed
+sha1    65ee068462c6645ed14a28d6b34eb0e9aa7a6c8d                          asterisk-core-sounds-en-gsm-1.5.tar.gz
+sha256  8d1118c6e0a0c614fafe297e3789f924ef5b04285cf6a8cffb8501dfcf5bbf07  asterisk-core-sounds-en-gsm-1.5.tar.gz
+sha1    f40fd6ea03dfe8d72ada2540b2288bfdc006381d                          asterisk-moh-opsound-wav-2.03.tar.gz
+sha256  449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538  asterisk-moh-opsound-wav-2.03.tar.gz
+
+# License files, locally computed
+sha256  82af40ed7f49c08685360811993d9396320842f021df828801d733e8fdc0312f  COPYING
+sha256  ac5571f00e558e3b7c9b3f13f421b874cc12cf4250c4f70094c71544cf486312  main/sha1.c
+sha256  0fcdb946955d20c2819a51f3fe613d8f22da2ea793bd50acb30ce156499acc88  codecs/speex/speex_resampler.h
+sha256  e6e7b7204d34a3dcdf17389a9c8cf64721ec0d15a797fd51c8c1ed8517cc3038  utils/db1-ast/include/db.h
diff --git a/bsp/buildroot/package/asterisk/asterisk.mk b/bsp/buildroot/package/asterisk/asterisk.mk
new file mode 100644
index 00000000..28b85da5
--- /dev/null
+++ b/bsp/buildroot/package/asterisk/asterisk.mk
@@ -0,0 +1,316 @@
+################################################################################
+#
+# asterisk
+#
+################################################################################
+
+ASTERISK_VERSION = 14.7.6
+# Use the github mirror: it's an official mirror maintained by Digium, and
+# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
+ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))
+
+ASTERISK_SOUNDS_BASE_URL = http://downloads.asterisk.org/pub/telephony/sounds/releases
+ASTERISK_EXTRA_DOWNLOADS = \
+	$(ASTERISK_SOUNDS_BASE_URL)/asterisk-core-sounds-en-gsm-1.5.tar.gz \
+	$(ASTERISK_SOUNDS_BASE_URL)/asterisk-moh-opsound-wav-2.03.tar.gz
+
+ASTERISK_LICENSE = GPL-2.0, BSD-3c (SHA1, resample), BSD-4c (db1-ast)
+ASTERISK_LICENSE_FILES = \
+	COPYING \
+	main/sha1.c \
+	codecs/speex/speex_resampler.h \
+	utils/db1-ast/include/db.h
+
+# For patches 0001, 0003 and 0004
+ASTERISK_AUTORECONF = YES
+ASTERISK_AUTORECONF_OPTS = -Iautoconf -Ithird-party -Ithird-party/pjproject
+
+ASTERISK_DEPENDENCIES = \
+	host-asterisk \
+	jansson \
+	libcurl \
+	libxml2 \
+	ncurses \
+	sqlite \
+	util-linux
+
+# Asterisk wants to run its menuselect tool (a highly tweaked derivative of
+# kconfig), but builds it using the target tools. So we build it in the host
+# variant (see below), and copy the full build tree of menuselect.
+define ASTERISK_COPY_MENUSELECT
+	rm -rf $(@D)/menuselect
+	cp -a $(HOST_ASTERISK_DIR)/menuselect $(@D)/menuselect
+endef
+ASTERISK_PRE_CONFIGURE_HOOKS += ASTERISK_COPY_MENUSELECT
+
+ASTERISK_CONF_OPTS = \
+	--disable-xmldoc \
+	--disable-internal-poll \
+	--disable-asteriskssl \
+	--disable-rpath \
+	--without-bfd \
+	--without-cap \
+	--without-cpg \
+	--without-curses \
+	--without-gtk2 \
+	--without-gmime \
+	--without-h323 \
+	--without-hoard \
+	--without-iconv \
+	--without-iksemel \
+	--without-imap \
+	--without-inotify \
+	--without-iodbc \
+	--without-isdnnet \
+	--without-jack \
+	--without-uriparser \
+	--without-kqueue \
+	--without-libedit \
+	--without-libxslt \
+	--without-ltdl \
+	--without-lua \
+	--without-misdn \
+	--without-mysqlclient \
+	--without-nbs \
+	--without-neon29 \
+	--without-newt \
+	--without-openr2 \
+	--without-osptk \
+	--without-oss \
+	--without-postgres \
+	--without-pjproject \
+	--without-popt \
+	--without-pwlib \
+	--without-resample \
+	--without-sdl \
+	--without-SDL_image \
+	--without-spandsp \
+	--without-sqlite \
+	--without-suppserv \
+	--without-tds \
+	--without-termcap \
+	--without-timerfd \
+	--without-tinfo \
+	--without-unbound \
+	--without-unixodbc \
+	--without-vpb \
+	--without-x11 \
+	--with-crypt \
+	--with-jansson \
+	--with-libcurl \
+	--with-ilbc \
+	--with-libxml2 \
+	--with-ncurses="$(STAGING_DIR)/usr" \
+	--with-sqlite3="$(STAGING_DIR)/usr" \
+	--with-sounds-cache=$(BR2_DL_DIR)
+
+# avcodec are from ffmpeg. There is virtually zero chance this could
+# even work; asterisk is looking for ffmpeg/avcodec.h which has not
+# been installed in this location since early 2007 (~10 years ago at
+# the time of this writing).
+ASTERISK_CONF_OPTS += --without-avcodec
+
+ASTERISK_CONF_ENV = \
+	ac_cv_path_CONFIG_LIBXML2=$(STAGING_DIR)/usr/bin/xml2-config
+
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+ASTERISK_CONF_OPTS += --with-execinfo
+else
+ASTERISK_CONF_OPTS += --without-execinfo
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGSM),y)
+ASTERISK_DEPENDENCIES += libgsm
+ASTERISK_CONF_OPTS += --with-gsm
+else
+ASTERISK_CONF_OPTS += --without-gsm
+endif
+
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+ASTERISK_DEPENDENCIES += alsa-lib
+ASTERISK_CONF_OPTS += --with-asound
+else
+ASTERISK_CONF_OPTS += --without-asound
+endif
+
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+ASTERISK_DEPENDENCIES += bluez_utils
+ASTERISK_CONF_OPTS += --with-bluetooth
+else
+ASTERISK_CONF_OPTS += --without-bluetooth
+endif
+
+ifeq ($(BR2_PACKAGE_LIBICAL),y)
+ASTERISK_DEPENDENCIES += libical
+ASTERISK_CONF_OPTS += --with-ical
+else
+ASTERISK_CONF_OPTS += --without-ical
+endif
+
+ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+ASTERISK_DEPENDENCIES += openldap
+ASTERISK_CONF_OPTS += --with-ldap
+else
+ASTERISK_CONF_OPTS += --without-ldap
+endif
+
+ifeq ($(BR2_PACKAGE_NEON),y)
+ASTERISK_DEPENDENCIES += neon
+ASTERISK_CONF_OPTS += --with-neon
+ASTERISK_CONF_ENV += \
+	ac_cv_path_CONFIG_NEON=$(STAGING_DIR)/usr/bin/neon-config
+else
+ASTERISK_CONF_OPTS += --without-neon
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+ASTERISK_DEPENDENCIES += netsnmp
+ASTERISK_CONF_OPTS += --with-netsnmp=$(STAGING_DIR)/usr
+else
+ASTERISK_CONF_OPTS += --without-netsnmp
+endif
+
+ifeq ($(BR2_PACKAGE_LIBOGG),y)
+ASTERISK_DEPENDENCIES += libogg
+ASTERISK_CONF_OPTS += --with-ogg
+else
+ASTERISK_CONF_OPTS += --without-ogg
+endif
+
+ifeq ($(BR2_PACKAGE_OPUS),y)
+ASTERISK_DEPENDENCIES += opus
+ASTERISK_CONF_OPTS += --with-opus
+else
+ASTERISK_CONF_OPTS += --without-opus
+endif
+
+ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
+ASTERISK_DEPENDENCIES += portaudio
+ASTERISK_CONF_OPTS += --with-portaudio
+else
+ASTERISK_CONF_OPTS += --without-portaudio
+endif
+
+ifeq ($(BR2_PACKAGE_FREERADIUS_CLIENT),y)
+ASTERISK_DEPENDENCIES += freeradius-client
+ASTERISK_CONF_OPTS += --with-radius
+else
+ASTERISK_CONF_OPTS += --without-radius
+endif
+
+ifeq ($(BR2_PACKAGE_DAHDI_LINUX)$(BR2_PACKAGE_DAHDI_TOOLS),yy)
+ASTERISK_DEPENDENCIES += dahdi-linux dahdi-tools
+ASTERISK_CONF_OPTS += --with-dahdi --with-tonezone
+
+ifeq ($(BR2_PACKAGE_LIBPRI),y)
+ASTERISK_DEPENDENCIES += libpri
+ASTERISK_CONF_OPTS += --with-pri
+else
+ASTERISK_CONF_OPTS += --without-pri
+endif # PRI
+
+ifeq ($(BR2_PACKAGE_LIBSS7),y)
+ASTERISK_DEPENDENCIES += libss7
+ASTERISK_CONF_OPTS += --with-ss7
+else
+ASTERISK_CONF_OPTS += --without-ss7
+endif # SS7
+
+else
+ASTERISK_CONF_OPTS += \
+	--without-dahdi --without-tonezone \
+	--without-pri --without-ss7
+endif # DAHDI
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ASTERISK_DEPENDENCIES += openssl
+ASTERISK_CONF_OPTS += --with-ssl
+else
+ASTERISK_CONF_OPTS += --without-ssl
+endif
+
+ifeq ($(BR2_PACKAGE_SPEEX),y)
+ASTERISK_DEPENDENCIES += speex
+ASTERISK_CONF_OPTS += --with-speex --with-speexdsp
+else
+ASTERISK_CONF_OPTS += --without-speex  --without-speexdsp
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSRTP),y)
+ASTERISK_DEPENDENCIES += libsrtp
+ASTERISK_CONF_OPTS += --with-srtp
+else
+ASTERISK_CONF_OPTS += --without-srtp
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVORBIS),y)
+ASTERISK_DEPENDENCIES += libvorbis
+ASTERISK_CONF_OPTS += --with-vorbis
+else
+ASTERISK_CONF_OPTS += --without-vorbis
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+ASTERISK_DEPENDENCIES += zlib
+ASTERISK_CONF_OPTS += --with-z
+else
+ASTERISK_CONF_OPTS += --without-z
+endif
+
+ASTERISK_DIRS = \
+	ASTVARLIBDIR="/usr/lib/asterisk" \
+	ASTDATADIR="/usr/lib/asterisk" \
+	ASTKEYDIR="/usr/lib/asterisk" \
+	ASTDBDIR="/usr/lib/asterisk"
+
+ASTERISK_MAKE_OPTS = $(ASTERISK_DIRS)
+
+# We want to install sample configuration files, too.
+ASTERISK_INSTALL_TARGET_OPTS = \
+	$(ASTERISK_DIRS) \
+	DESTDIR=$(TARGET_DIR) \
+	LDCONFIG=true \
+	install samples
+
+$(eval $(autotools-package))
+
+#-------------------------------------------------------------------------------
+# This part deals with building the menuselect tool as a host package
+
+HOST_ASTERISK_DEPENDENCIES = host-pkgconf host-libxml2 host-ncurses
+HOST_ASTERISK_SUBDIR = menuselect
+
+HOST_ASTERISK_LICENSE = GPL-2.0
+HOST_ASTERISK_LICENSE_FILES = COPYING
+
+# No need to autoreconf for the host variant,
+# so do not inherit the target setup.
+HOST_ASTERISK_AUTORECONF = NO
+
+HOST_ASTERISK_CONF_ENV = CONFIG_LIBXML2=$(HOST_DIR)/bin/xml2-config
+
+HOST_ASTERISK_CONF_OPTS = \
+	--without-newt \
+	--without-curses \
+	--with-ncurses=$(HOST_DIR)/usr
+
+# Not an automake package, so does not inherit LDFLAGS et al. from
+# the configure run.
+HOST_ASTERISK_MAKE_ENV = $(HOST_CONFIGURE_OPTS)
+
+# Even though menuselect is an autotools package, it is not an automake
+# package and does not have an 'install' rule, as asterisk does expect
+# it to be in a sub-directory of its source tree. We do so by copying
+# the full menuselect build tree as a pre-configure hook in the target
+# variant.
+# However, the sanity checks on host packages are not run on menuselect.
+# But we still want to catch that menuselect has the proper rpath set,
+# for example, as it uses host libraries that we do build, like
+# host-libxml2.
+# So we do manually install the menuselect tool.
+define HOST_ASTERISK_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/menuselect/menuselect \
+		$(HOST_DIR)/bin/asterisk-menuselect
+endef
+
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/at/at.mk b/bsp/buildroot/package/at/at.mk
index 88653604..058ebac5 100644
--- a/bsp/buildroot/package/at/at.mk
+++ b/bsp/buildroot/package/at/at.mk
@@ -11,7 +11,7 @@ AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a
 AT_MAKE = $(MAKE1)
 AT_AUTORECONF = YES
 AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex
-AT_LICENSE = GPLv2+, GPLv3+, ISC
+AT_LICENSE = GPL-2.0+, GPL-3.0+, ISC
 AT_LICENSE_FILES = Copyright COPYING
 
 AT_CONF_OPTS = \
diff --git a/bsp/buildroot/package/atest/Config.in b/bsp/buildroot/package/atest/Config.in
new file mode 100644
index 00000000..9a2e342a
--- /dev/null
+++ b/bsp/buildroot/package/atest/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_ATEST
+	bool "atest"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
+	depends on !BR2_bfin # libev
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_LIBEV
+	help
+	  atest is a test software for checking ALSA Asoc drivers
+	  concerning the proper frame generation and capture.
+
+	  https://github.com/amouiche/atest
+
+comment "atest needs a toolchain w/ threads"
+	depends on !BR2_bfin
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/atest/atest.hash b/bsp/buildroot/package/atest/atest.hash
new file mode 100644
index 00000000..78e3ff8e
--- /dev/null
+++ b/bsp/buildroot/package/atest/atest.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 91da5a6d4d0b0a8d4bae156a40e91a6dccf62863bfa7acae948efbbd2b4154ca  atest-895b0183a89c15f5e2305a6795bb1667753cd3f0.tar.gz
diff --git a/bsp/buildroot/package/atest/atest.mk b/bsp/buildroot/package/atest/atest.mk
new file mode 100644
index 00000000..2effda57
--- /dev/null
+++ b/bsp/buildroot/package/atest/atest.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# atest
+#
+################################################################################
+
+ATEST_VERSION = 895b0183a89c15f5e2305a6795bb1667753cd3f0
+ATEST_SITE = $(call github,amouiche,atest,$(ATEST_VERSION))
+ATEST_LICENSE = GPL-2.0+
+ATEST_LICENSE_FILES = COPYING
+ATEST_DEPENDENCIES = host-pkgconf libev alsa-lib
+# Fetched from Github, with no configure script
+ATEST_AUTORECONF = YES
+
+# Autoreconf requires an existing m4 directory
+define ATEST_PATCH_M4
+	mkdir -p $(@D)/m4
+endef
+ATEST_POST_PATCH_HOOKS += ATEST_PATCH_M4
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/atf/atf.mk b/bsp/buildroot/package/atf/atf.mk
index ed2080e2..9630cf1a 100644
--- a/bsp/buildroot/package/atf/atf.mk
+++ b/bsp/buildroot/package/atf/atf.mk
@@ -7,7 +7,7 @@
 ATF_VERSION = 0.21
 ATF_SITE = https://github.com/jmmv/atf/releases/download/atf-$(ATF_VERSION)
 ATF_INSTALL_STAGING = YES
-ATF_LICENSE = BSD-2c, BSD-3c
+ATF_LICENSE = BSD-2-Clause, BSD-3-Clause
 ATF_LICENSE_FILES = COPYING
 # Ships a beta libtool version hence our patch doesn't apply.
 ATF_AUTORECONF = YES
diff --git a/bsp/buildroot/package/atftp/atftp.mk b/bsp/buildroot/package/atftp/atftp.mk
index 615b6ead..e1c257cb 100644
--- a/bsp/buildroot/package/atftp/atftp.mk
+++ b/bsp/buildroot/package/atftp/atftp.mk
@@ -6,7 +6,7 @@
 
 ATFTP_VERSION = 0.7.1
 ATFTP_SITE = http://sourceforge.net/projects/atftp/files
-ATFTP_LICENSE = GPLv2+
+ATFTP_LICENSE = GPL-2.0+
 ATFTP_LICENSE_FILES = LICENSE
 ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp
 # For static we need to explicitly link against libpthread
diff --git a/bsp/buildroot/package/atk/Config.in b/bsp/buildroot/package/atk/Config.in
index 1120a94d..c9806149 100644
--- a/bsp/buildroot/package/atk/Config.in
+++ b/bsp/buildroot/package/atk/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_ATK
 	bool "atk"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  The ATK accessibility toolkit, needed to build GTK+-2.x.
 
diff --git a/bsp/buildroot/package/atk/atk.mk b/bsp/buildroot/package/atk/atk.mk
index 90d329ae..88cf5fbc 100644
--- a/bsp/buildroot/package/atk/atk.mk
+++ b/bsp/buildroot/package/atk/atk.mk
@@ -8,7 +8,7 @@ ATK_VERSION_MAJOR = 2.22
 ATK_VERSION = $(ATK_VERSION_MAJOR).0
 ATK_SOURCE = atk-$(ATK_VERSION).tar.xz
 ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR)
-ATK_LICENSE = LGPLv2+
+ATK_LICENSE = LGPL-2.0+
 ATK_LICENSE_FILES = COPYING
 ATK_INSTALL_STAGING = YES
 ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
diff --git a/bsp/buildroot/package/atkmm/Config.in b/bsp/buildroot/package/atkmm/Config.in
index 2091eabe..ce1e24d4 100644
--- a/bsp/buildroot/package/atkmm/Config.in
+++ b/bsp/buildroot/package/atkmm/Config.in
@@ -1,20 +1,20 @@
 config BR2_PACKAGE_ATKMM
 	bool "atkmm"
-	select BR2_PACKAGE_ATK
-	select BR2_PACKAGE_GLIBMM
-	select BR2_PACKAGE_LIBSIGC
 	depends on BR2_INSTALL_LIBSTDCPP # glibmm
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2
 	depends on BR2_USE_MMU # atk/glibmm -> libglib2
 	depends on BR2_USE_WCHAR # atk/glibmm -> libglib2
+	select BR2_PACKAGE_ATK
+	select BR2_PACKAGE_GLIBMM
+	select BR2_PACKAGE_LIBSIGC
 
 	help
 	  The atkmm package is a set of C++ bindings for Atk.
 
 	  http://www.gtkmm.org/
 
-comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8"
+comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/atkmm/atkmm.mk b/bsp/buildroot/package/atkmm/atkmm.mk
index 2c070f25..234a937b 100644
--- a/bsp/buildroot/package/atkmm/atkmm.mk
+++ b/bsp/buildroot/package/atkmm/atkmm.mk
@@ -8,7 +8,7 @@ ATKMM_VERSION_MAJOR = 2.24
 ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2
 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz
 ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR)
-ATKMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 ATKMM_LICENSE_FILES = COPYING COPYING.tools
 ATKMM_INSTALL_STAGING = YES
 ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf
diff --git a/bsp/buildroot/package/atop/0001-remove-unused-include-of-termio.h.patch b/bsp/buildroot/package/atop/0001-remove-unused-include-of-termio.h.patch
deleted file mode 100644
index 3a04b05e..00000000
--- a/bsp/buildroot/package/atop/0001-remove-unused-include-of-termio.h.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-remove unused include of termio.h
-
-This header is not provided by musl, leading to build failures.
-
-Patch status: accepted upstream.
-
-Signed-off-by: Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
----
-diff -purN atop-2.2-3.orig/showgeneric.c atop-2.2-3/showgeneric.c
---- atop-2.2-3.orig/showgeneric.c	2016-07-19 22:07:43.275324499 -0300
-+++ atop-2.2-3/showgeneric.c	2016-07-19 22:08:16.171453283 -0300
-@@ -268,7 +268,6 @@ static const char rcsid[] = "$Id: showge
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>
--#include <termio.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
-diff -purN atop-2.2-3.orig/showlinux.c atop-2.2-3/showlinux.c
---- atop-2.2-3.orig/showlinux.c	2016-07-19 22:07:43.275324499 -0300
-+++ atop-2.2-3/showlinux.c	2016-07-19 22:08:20.979472459 -0300
-@@ -274,7 +274,6 @@ static const char rcsid[] = "$Id: showli
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <termio.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
-diff -purN atop-2.2-3.orig/showprocs.c atop-2.2-3/showprocs.c
---- atop-2.2-3.orig/showprocs.c	2016-07-19 22:07:43.275324499 -0300
-+++ atop-2.2-3/showprocs.c	2016-07-19 22:08:25.083488900 -0300
-@@ -94,7 +94,6 @@ static const char rcsid[] = "$Id: showpr
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <termio.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
-diff -purN atop-2.2-3.orig/showsys.c atop-2.2-3/showsys.c
---- atop-2.2-3.orig/showsys.c	2016-07-19 22:07:43.275324499 -0300
-+++ atop-2.2-3/showsys.c	2016-07-19 22:08:29.099505047 -0300
-@@ -80,7 +80,6 @@ static const char rcsid[] = "XXXXXX";
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <termio.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
diff --git a/bsp/buildroot/package/atop/atop.hash b/bsp/buildroot/package/atop/atop.hash
index bbf268d0..9ee0d62b 100644
--- a/bsp/buildroot/package/atop/atop.hash
+++ b/bsp/buildroot/package/atop/atop.hash
@@ -1,2 +1,5 @@
 # Locally computed:
-sha256  c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d  atop-2.2-3.tar.gz
+sha256  73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264  atop-2.3.0.tar.gz
+
+# Hash for license file:
+sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
diff --git a/bsp/buildroot/package/atop/atop.mk b/bsp/buildroot/package/atop/atop.mk
index 27e1f821..2cc0da6a 100644
--- a/bsp/buildroot/package/atop/atop.mk
+++ b/bsp/buildroot/package/atop/atop.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-ATOP_VERSION = 2.2-3
+ATOP_VERSION = 2.3.0
 ATOP_SITE = http://www.atoptool.nl/download
-ATOP_LICENSE = GPLv2+
+ATOP_LICENSE = GPL-2.0+
 ATOP_LICENSE_FILES = COPYING
 ATOP_DEPENDENCIES = ncurses zlib
 
diff --git a/bsp/buildroot/package/attr/0001-build-with-older-GCCs.patch b/bsp/buildroot/package/attr/0001-build-with-older-GCCs.patch
new file mode 100644
index 00000000..22cfac2c
--- /dev/null
+++ b/bsp/buildroot/package/attr/0001-build-with-older-GCCs.patch
@@ -0,0 +1,87 @@
+From 3ac428794ea0f95c854166c9c0cffb0267c5e98b Mon Sep 17 00:00:00 2001
+From: Hollis Blanchard <hollis_blanchard@mentor.com>
+Date: Mon, 30 Jul 2018 14:17:21 -0700
+Subject: [PATCH] Remove messages in "deprecated" gcc attributes
+
+GCC versions up through 4.4.7 (which is used in RHEL 6) do not accept
+any argument for the deprecated attribute. GCC 4.5 and later say the
+"msg" argument is optional. We don't need the messages during
+Buildroot builds anyways.
+
+Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>
+---
+ include/attributes.h | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/include/attributes.h b/include/attributes.h
+index 14beb8f..23c39c8 100644
+--- a/include/attributes.h
++++ b/include/attributes.h
+@@ -127,10 +127,10 @@ typedef struct attr_multiop {
+  */
+ EXPORT int attr_get (const char *__path, const char *__attrname,
+ 			char *__attrvalue, int *__valuelength, int __flags)
+-	__attribute__ ((deprecated ("Use getxattr or lgetxattr instead")));
++	__attribute__ ((deprecated));
+ EXPORT int attr_getf (int __fd, const char *__attrname, char *__attrvalue,
+ 			int *__valuelength, int __flags)
+-	__attribute__ ((deprecated ("Use fgetxattr instead")));
++	__attribute__ ((deprecated));
+ 
+ /*
+  * Set the value of an attribute, creating the attribute if necessary.
+@@ -139,11 +139,11 @@ EXPORT int attr_getf (int __fd, const char *__attrname, char *__attrvalue,
+ EXPORT int attr_set (const char *__path, const char *__attrname,
+ 			const char *__attrvalue, const int __valuelength,
+ 			int __flags)
+-	__attribute__ ((deprecated ("Use setxattr or lsetxattr instead")));
++	__attribute__ ((deprecated));
+ EXPORT int attr_setf (int __fd, const char *__attrname,
+ 			const char *__attrvalue, const int __valuelength,
+ 			int __flags)
+-	__attribute__ ((deprecated ("Use fsetxattr instead")));
++	__attribute__ ((deprecated));
+ 
+ /*
+  * Remove an attribute.
+@@ -151,9 +151,9 @@ EXPORT int attr_setf (int __fd, const char *__attrname,
+  */
+ EXPORT int attr_remove (const char *__path, const char *__attrname,
+ 			int __flags)
+-	__attribute__ ((deprecated ("Use removexattr or lremovexattr instead")));
++	__attribute__ ((deprecated));
+ EXPORT int attr_removef (int __fd, const char *__attrname, int __flags)
+-	__attribute__ ((deprecated ("Use fremovexattr instead")));
++	__attribute__ ((deprecated));
+ 
+ /*
+  * List the names and sizes of the values of all the attributes of an object.
+@@ -164,10 +164,10 @@ EXPORT int attr_removef (int __fd, const char *__attrname, int __flags)
+  */
+ EXPORT int attr_list(const char *__path, char *__buffer, const int __buffersize,
+ 		int __flags, attrlist_cursor_t *__cursor)
+-	__attribute__ ((deprecated ("Use listxattr or llistxattr instead")));
++	__attribute__ ((deprecated));
+ EXPORT int attr_listf(int __fd, char *__buffer, const int __buffersize,
+ 		int __flags, attrlist_cursor_t *__cursor)
+-	__attribute__ ((deprecated ("Use flistxattr instead")));
++	__attribute__ ((deprecated));
+ 
+ /*
+  * Operate on multiple attributes of the same object simultaneously.
+@@ -188,10 +188,10 @@ EXPORT int attr_listf(int __fd, char *__buffer, const int __buffersize,
+  */
+ EXPORT int attr_multi (const char *__path, attr_multiop_t *__oplist,
+ 			int __count, int __flags)
+-	__attribute__ ((deprecated ("Use getxattr, setxattr, listxattr, removexattr instead")));
++	__attribute__ ((deprecated));
+ EXPORT int attr_multif (int __fd, attr_multiop_t *__oplist,
+ 			int __count, int __flags)
+-	__attribute__ ((deprecated ("Use getxattr, setxattr, listxattr, removexattr instead")));
++	__attribute__ ((deprecated));
+ 
+ #ifdef __cplusplus
+ }
+-- 
+2.13.0
+
diff --git a/bsp/buildroot/package/attr/0001-support-static-installation.patch b/bsp/buildroot/package/attr/0001-support-static-installation.patch
deleted file mode 100644
index 87858ac7..00000000
--- a/bsp/buildroot/package/attr/0001-support-static-installation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Support installation of .a file when doing static linking
-
-When doing static linking (i.e ENABLE_SHARED != yes), the attr build
-logic wasn't installing any library at all, not even the .a file which
-is needed for static linking. This patch fixes that.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/include/buildmacros
-===================================================================
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -97,7 +97,15 @@
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	fi
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
diff --git a/bsp/buildroot/package/attr/0002-avoid-glibc-specific-decls-defines.patch b/bsp/buildroot/package/attr/0002-avoid-glibc-specific-decls-defines.patch
deleted file mode 100644
index 8c71678c..00000000
--- a/bsp/buildroot/package/attr/0002-avoid-glibc-specific-decls-defines.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 10 Jan 2014 13:56:37 +0000
-Subject: avoid glibc-specific DECLS defines
-
-This matches what we do in all the other headers.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-diff --git a/include/xattr.h b/include/xattr.h
-index 70a84be..070d7c5 100644
---- a/include/xattr.h
-+++ b/include/xattr.h
-@@ -30,8 +30,9 @@
- #define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
- #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
- 
--
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- extern int setxattr (const char *__path, const char *__name,
- 		      const void *__value, size_t __size, int __flags) __THROW;
-@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW;
- extern int lremovexattr (const char *__path, const char *__name) __THROW;
- extern int fremovexattr (int __filedes,   const char *__name) __THROW;
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif	/* __XATTR_H__ */
---
-cgit v0.9.0.2
diff --git a/bsp/buildroot/package/attr/0003-portability-fixes.patch b/bsp/buildroot/package/attr/0003-portability-fixes.patch
deleted file mode 100644
index c5dc8c86..00000000
--- a/bsp/buildroot/package/attr/0003-portability-fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001
-From: Emmanuel Dreyfus <manu@netbsd.org>
-Date: Mon, 30 Jun 2014 13:06:05 +0000
-Subject: Portability fixes
-
-- <features.h>  is Linux specific
-- Define __THROW for non glibc based systems
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-(limited to 'include/xattr.h')
-
-diff --git a/include/xattr.h b/include/xattr.h
-index 070d7c5..fd1f268 100644
---- a/include/xattr.h
-+++ b/include/xattr.h
-@@ -20,7 +20,18 @@
- #ifndef __XATTR_H__
- #define __XATTR_H__
- 
-+#if defined(linux)
- #include <features.h>
-+#endif
-+
-+/* Portability non glibc c++ build systems */
-+#ifndef __THROW
-+# if defined __cplusplus
-+#  define __THROW       throw ()
-+# else
-+#  define __THROW
-+# endif
-+#endif
- 
- #include <errno.h>
- #ifndef ENOATTR
---
-cgit v0.9.0.2
diff --git a/bsp/buildroot/package/attr/attr.hash b/bsp/buildroot/package/attr/attr.hash
index d2d1c2ed..88adf44e 100644
--- a/bsp/buildroot/package/attr/attr.hash
+++ b/bsp/buildroot/package/attr/attr.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859	attr-2.4.47.src.tar.gz
+sha256  5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7  attr-2.4.48.tar.gz
diff --git a/bsp/buildroot/package/attr/attr.mk b/bsp/buildroot/package/attr/attr.mk
index 4d5a07df..348dcd2f 100644
--- a/bsp/buildroot/package/attr/attr.mk
+++ b/bsp/buildroot/package/attr/attr.mk
@@ -4,43 +4,15 @@
 #
 ################################################################################
 
-ATTR_VERSION = 2.4.47
-ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
+ATTR_VERSION = 2.4.48
 ATTR_SITE = http://download.savannah.gnu.org/releases/attr
-ATTR_INSTALL_STAGING = YES
-ATTR_CONF_OPTS = --enable-gettext=no
-HOST_ATTR_CONF_OPTS = --enable-gettext=no
-ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
-# While the configuration system uses autoconf, the Makefiles are
-# hand-written and do not use automake. Therefore, we have to hack
-# around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPTS = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
-	install-dev install-lib
+ATTR_INSTALL_STAGING = YES
 
-ATTR_INSTALL_TARGET_OPTS = \
-	prefix=$(TARGET_DIR)/usr \
-	exec_prefix=$(TARGET_DIR)/usr \
-	install install-lib
-
-HOST_ATTR_INSTALL_OPTS = \
-	prefix=$(HOST_DIR)/usr \
-	exec_prefix=$(HOST_DIR)/usr \
-	install-dev install-lib
-
-# The libdir variable in libattr.la is empty, so let's fix it. This is
-# probably due to attr not using automake, and not doing fully the
-# right thing with libtool.
-define ATTR_FIX_LIBTOOL_LA_LIBDIR
-	$(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \
-		$(STAGING_DIR)/usr/lib/libattr.la
-endef
-
-ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR
+ATTR_CONF_OPTS = --disable-nls
+HOST_ATTR_CONF_OPTS = --disable-nls
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/aubio/Config.in b/bsp/buildroot/package/aubio/Config.in
index c4c60db2..18e7c4cc 100644
--- a/bsp/buildroot/package/aubio/Config.in
+++ b/bsp/buildroot/package/aubio/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_AUBIO
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  aubio is a tool designed for the extraction of annotations from
-	  audio signals. Its features include segmenting a sound file
-	  before each of its attacks, performing pitch detection, tapping
-	  the beat and producing midi streams from live audio.
+	  aubio is a tool designed for the extraction of annotations
+	  from audio signals. Its features include segmenting a sound
+	  file before each of its attacks, performing pitch detection,
+	  tapping the beat and producing midi streams from live audio.
 
 	  Because these tasks are difficult, we thought it was important
 	  to gather them in a dedicated library. To increase the fun, we
diff --git a/bsp/buildroot/package/aubio/aubio.hash b/bsp/buildroot/package/aubio/aubio.hash
index e4478477..b4233aee 100644
--- a/bsp/buildroot/package/aubio/aubio.hash
+++ b/bsp/buildroot/package/aubio/aubio.hash
@@ -1,2 +1,2 @@
-# From https://aubio.org/pub/aubio-0.4.3.tar.bz2.sha256
-sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab  aubio-0.4.3.tar.bz2
+# From https://aubio.org/pub/aubio-0.4.5.tar.bz2.sha256
+sha256 70c2804e6f4fbf0ebc0fb9ac8cc9d465ef4a4d438311c074c9a7364e98827af6  aubio-0.4.5.tar.bz2
diff --git a/bsp/buildroot/package/aubio/aubio.mk b/bsp/buildroot/package/aubio/aubio.mk
index f3330c2b..2a09ebb3 100644
--- a/bsp/buildroot/package/aubio/aubio.mk
+++ b/bsp/buildroot/package/aubio/aubio.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-AUBIO_VERSION = 0.4.3
+AUBIO_VERSION = 0.4.5
 AUBIO_SITE = https://aubio.org/pub
 AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
-AUBIO_LICENSE = GPLv3+
+AUBIO_LICENSE = GPL-3.0+
 AUBIO_LICENSE_FILES = COPYING
 AUBIO_INSTALL_STAGING = YES
 
@@ -26,7 +26,8 @@ else
 AUBIO_CONF_OPTS += --disable-sndfile
 endif
 
-ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+# Could not compile aubio in double precision mode with libsamplerate
+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE)$(BR2_PACKAGE_FFTW_PRECISION_SINGLE),yy)
 AUBIO_DEPENDENCIES += libsamplerate
 AUBIO_CONF_OPTS += --enable-samplerate
 else
diff --git a/bsp/buildroot/package/audiofile/audiofile.mk b/bsp/buildroot/package/audiofile/audiofile.mk
index ee3f833a..2f2e8902 100644
--- a/bsp/buildroot/package/audiofile/audiofile.mk
+++ b/bsp/buildroot/package/audiofile/audiofile.mk
@@ -12,7 +12,7 @@ AUDIOFILE_CONF_OPTS = --disable-examples
 AUDIOFILE_DEPENDENCIES = host-pkgconf
 # configure is outdated and has old bugs because of it
 AUDIOFILE_AUTORECONF = YES
-AUDIOFILE_LICENSE = GPLv2+, LGPLv2.1+
+AUDIOFILE_LICENSE = GPL-2.0+, LGPL-2.1+
 AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL
 
 ifeq ($(BR2_PACKAGE_FLAC),y)
diff --git a/bsp/buildroot/package/audit/audit.hash b/bsp/buildroot/package/audit/audit.hash
index 2ae8f99b..fb375777 100644
--- a/bsp/buildroot/package/audit/audit.hash
+++ b/bsp/buildroot/package/audit/audit.hash
@@ -1,2 +1,4 @@
 #Locally computed
-sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz
+sha256 67b59b2b77afee9ed87afa4d80ffc8e6f3a1f4bbedd5f2871f387c952147bcba audit-2.8.2.tar.gz
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
+sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB
diff --git a/bsp/buildroot/package/audit/audit.mk b/bsp/buildroot/package/audit/audit.mk
index 298ef20b..2f6e6653 100644
--- a/bsp/buildroot/package/audit/audit.mk
+++ b/bsp/buildroot/package/audit/audit.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-AUDIT_VERSION = 2.7.1
+AUDIT_VERSION = 2.8.2
 AUDIT_SITE = http://people.redhat.com/sgrubb/audit
-AUDIT_LICENSE = GPLv2+ (programs), unclear (libraries)
-AUDIT_LICENSE_FILES = COPYING
+AUDIT_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
+AUDIT_LICENSE_FILES = COPYING COPYING.LIB
 
 AUDIT_INSTALL_STAGING = YES
 
@@ -51,8 +51,8 @@ define AUDIT_INSTALL_INIT_SYSTEMD
 endef
 
 define AUDIT_INSTALL_CLEANUP
-	$(RM) -rf $(TARGET_DIR)/etc/rc.d
-	$(RM) -rf $(TARGET_DIR)/etc/sysconfig
+	$(RM) $(TARGET_DIR)/etc/rc.d/init.d/auditd
+	$(RM) $(TARGET_DIR)/etc/sysconfig/auditd
 endef
 AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP
 
diff --git a/bsp/buildroot/package/aufs-util/Config.in b/bsp/buildroot/package/aufs-util/Config.in
index 93999fb6..a426343f 100644
--- a/bsp/buildroot/package/aufs-util/Config.in
+++ b/bsp/buildroot/package/aufs-util/Config.in
@@ -28,7 +28,8 @@ config BR2_PACKAGE_AUFS_UTIL_VERSION
 	  Usually, the sha1 of the cset you want to use; avoid using a
 	  branch name as this yields non-reproducible builds.
 
-	  See the following resources to see what versions are available:
+	  See the following resources to see what versions are
+	  available:
 
 	  https://sourceforge.net/p/aufs/aufs-util/ci/master/tree/
 
diff --git a/bsp/buildroot/package/aufs-util/aufs-util.mk b/bsp/buildroot/package/aufs-util/aufs-util.mk
index d41b4ac4..d954f029 100644
--- a/bsp/buildroot/package/aufs-util/aufs-util.mk
+++ b/bsp/buildroot/package/aufs-util/aufs-util.mk
@@ -8,7 +8,7 @@
 AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION))
 AUFS_UTIL_SITE = http://git.code.sf.net/p/aufs/aufs-util
 AUFS_UTIL_SITE_METHOD = git
-AUFS_UTIL_LICENSE = GPLv2
+AUFS_UTIL_LICENSE = GPL-2.0
 AUFS_UTIL_LICENSE_FILES = COPYING
 
 AUFS_UTIL_DEPENDENCIES = linux
diff --git a/bsp/buildroot/package/aufs/aufs.mk b/bsp/buildroot/package/aufs/aufs.mk
index 1ba5508a..55dbf942 100644
--- a/bsp/buildroot/package/aufs/aufs.mk
+++ b/bsp/buildroot/package/aufs/aufs.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION))
-AUFS_LICENSE = GPLv2
+AUFS_LICENSE = GPL-2.0
 AUFS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_AUFS_SERIES),3)
diff --git a/bsp/buildroot/package/augeas/Config.in b/bsp/buildroot/package/augeas/Config.in
new file mode 100644
index 00000000..df8c5174
--- /dev/null
+++ b/bsp/buildroot/package/augeas/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_AUGEAS
+	bool "augeas"
+	# ARC toolchain issue:
+	# https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/issues/108
+	depends on !BR2_arc
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_READLINE
+	help
+	  Augeas is a configuration editing tool. It parses
+	  configuration files in their native formats and transforms
+	  them into a tree. Configuration changes are made by
+	  manipulating this tree and saving it back into native config
+	  files.
+
+	  http://augeas.net
+
+comment "augeas needs a toolchain w/ wchar"
+	depends on !BR2_arc
+	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/augeas/augeas.hash b/bsp/buildroot/package/augeas/augeas.hash
new file mode 100644
index 00000000..46b99dd8
--- /dev/null
+++ b/bsp/buildroot/package/augeas/augeas.hash
@@ -0,0 +1,4 @@
+# Locally calculated after checking pgp signature from
+# http://download.augeas.net/augeas-1.10.1.tar.gz.sig
+sha256  52db256afab261d31cc147eaa1a71795a5fec59e888dfd0b65a84c7aacd6364d  augeas-1.10.1.tar.gz
+sha256  ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532  COPYING
diff --git a/bsp/buildroot/package/augeas/augeas.mk b/bsp/buildroot/package/augeas/augeas.mk
new file mode 100644
index 00000000..c4b8b7e6
--- /dev/null
+++ b/bsp/buildroot/package/augeas/augeas.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# augeas
+#
+################################################################################
+
+AUGEAS_VERSION = 1.10.1
+AUGEAS_SITE = http://download.augeas.net
+AUGEAS_INSTALL_STAGING = YES
+AUGEAS_LICENSE = LGPL-2.1+
+AUGEAS_LICENSE_FILES = COPYING
+AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
+
+# patching examples/Makefile.am, can be removed when updating from version 1.9.0
+AUGEAS_AUTORECONF = YES
+
+AUGEAS_CONF_OPTS = --disable-gnulib-tests
+
+# Remove the test lenses which occupy about 1.4 MB on the target
+define AUGEAS_REMOVE_TEST_LENSES
+	rm -rf $(TARGET_DIR)/usr/share/augeas/lenses/dist/tests
+endef
+AUGEAS_POST_INSTALL_TARGET_HOOKS += AUGEAS_REMOVE_TEST_LENSES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/aumix/aumix.mk b/bsp/buildroot/package/aumix/aumix.mk
index eae34d0f..9bcc19a3 100644
--- a/bsp/buildroot/package/aumix/aumix.mk
+++ b/bsp/buildroot/package/aumix/aumix.mk
@@ -9,7 +9,7 @@ AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2
 AUMIX_SITE = http://jpj.net/~trevor/aumix/releases
 AUMIX_AUTORECONF = YES
 AUMIX_GETTEXTIZE = YES
-AUMIX_LICENSE = GPLv2+
+AUMIX_LICENSE = GPL-2.0+
 AUMIX_LICENSE_FILES = COPYING
 
 AUMIX_CONF_OPTS = \
diff --git a/bsp/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch b/bsp/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch
index 6d345d34..c0efeb33 100644
--- a/bsp/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch
+++ b/bsp/buildroot/package/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch
@@ -17,6 +17,8 @@ fi
 Remove the [] on the third part of AS_IF.
 
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+(rebased against version 2017.03.21)
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 ---
  m4/ax_tls.m4 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -29,8 +31,8 @@ index 809b761..2135dd2 100644
  #   modified version of the Autoconf Macro, you may extend this special
  #   exception to the GPL to apply to your modified version as well.
  
--#serial 11
-+#serial 12
+-#serial 13
++#serial 14
  
  AC_DEFUN([AX_TLS], [
    AC_MSG_CHECKING([for thread local storage (TLS) class])
diff --git a/bsp/buildroot/package/autoconf-archive/autoconf-archive.hash b/bsp/buildroot/package/autoconf-archive/autoconf-archive.hash
index 6982a4dd..2c537b33 100644
--- a/bsp/buildroot/package/autoconf-archive/autoconf-archive.hash
+++ b/bsp/buildroot/package/autoconf-archive/autoconf-archive.hash
@@ -1,2 +1,2 @@
 # Computed locally
-sha256 88fb2efff640eddd28a52ae550ff5561bca3bd2bba09e1d7b0580e719875e437  autoconf-archive-2016.03.20.tar.xz
+sha256 386ad455f12bdeb3a7d19280441a5ab77355142349200ff11040a8d9d455d765  autoconf-archive-2017.03.21.tar.xz
diff --git a/bsp/buildroot/package/autoconf-archive/autoconf-archive.mk b/bsp/buildroot/package/autoconf-archive/autoconf-archive.mk
index 86956eb6..8a6d5957 100644
--- a/bsp/buildroot/package/autoconf-archive/autoconf-archive.mk
+++ b/bsp/buildroot/package/autoconf-archive/autoconf-archive.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-AUTOCONF_ARCHIVE_VERSION = 2016.03.20
+AUTOCONF_ARCHIVE_VERSION = 2017.03.21
 AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz
 AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive
-AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception
+AUTOCONF_ARCHIVE_LICENSE = GPL-3.0+ with exception
 AUTOCONF_ARCHIVE_LICENSE_FILES = COPYING COPYING.EXCEPTION
-HOST_AUTOCONF_ARCHIVE_INSTALL_OPTS = aclocaldir=$(HOST_DIR)/usr/share/autoconf-archive install
+HOST_AUTOCONF_ARCHIVE_INSTALL_OPTS = aclocaldir=$(HOST_DIR)/share/autoconf-archive install
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/autoconf/autoconf.mk b/bsp/buildroot/package/autoconf/autoconf.mk
index fd91961e..e5f474c7 100644
--- a/bsp/buildroot/package/autoconf/autoconf.mk
+++ b/bsp/buildroot/package/autoconf/autoconf.mk
@@ -8,12 +8,12 @@ AUTOCONF_VERSION = 2.69
 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
-AUTOCONF_LICENSE = GPLv3+ with exceptions
+AUTOCONF_LICENSE = GPL-3.0+ with exceptions
 AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION
 
 HOST_AUTOCONF_CONF_ENV = \
 	EMACS="no" \
-	ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+	ac_cv_path_M4=$(HOST_DIR)/bin/m4 \
 	ac_cv_prog_gnu_m4_gnu=no
 
 HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
@@ -21,6 +21,6 @@ HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool
 $(eval $(host-autotools-package))
 
 # variables used by other packages
-AUTOCONF = $(HOST_DIR)/usr/bin/autoconf
-AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader
-AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
+AUTOCONF = $(HOST_DIR)/bin/autoconf
+AUTOHEADER = $(HOST_DIR)/bin/autoheader
+AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)"
diff --git a/bsp/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch b/bsp/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch
index 26e86c32..26f22653 100644
--- a/bsp/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch
+++ b/bsp/buildroot/package/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch
@@ -1,5 +1,3 @@
-Upstream-Status: Pending
-
 From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001
 From: Andreas Oberritter <obi@opendreambox.org>
 Date: Wed, 13 Mar 2013 16:17:08 +0100
@@ -11,6 +9,7 @@ other linux/nfs*.h files directly.
 
 Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Upstream-Status: Pending
 ---
  include/rpc_subs.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/buildroot/package/autofs/0002-autofs-build-check-for-clock_gettime-in-librt.patch b/bsp/buildroot/package/autofs/0002-autofs-build-check-for-clock_gettime-in-librt.patch
deleted file mode 100644
index ade6d1cd..00000000
--- a/bsp/buildroot/package/autofs/0002-autofs-build-check-for-clock_gettime-in-librt.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a38ab6c0f2790e047fc64867865eb2a073135618 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Sun, 19 Jun 2016 00:17:41 -0300
-Subject: [PATCH] autofs: build: check for clock_gettime in librt
-
-Glibc versions older than 2.17 define clock_gettime() in librt, so add a
-check for this.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Patch status: sent to autofs@ mailing list
-
- Makefile.conf.in | 3 +++
- Makefile.rules   | 2 ++
- configure.in     | 4 ++++
- 3 files changed, 9 insertions(+)
-
-diff --git a/Makefile.conf.in b/Makefile.conf.in
-index cb53e66..2bc3202 100644
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -11,6 +11,9 @@
- DAEMON_CFLAGS  = @DAEMON_CFLAGS@
- DAEMON_LDFLAGS = @DAEMON_LDFLAGS@
- 
-+# Glibc < 2.17 requires librt for clock_gettime()
-+LIBCLOCK_GETTIME = @LIBCLOCK_GETTIME@
-+
- # Special parameters for glibc (libc 6)
- LIBNSL    = @LIBNSL@
- LIBRESOLV = @LIBRESOLV@
-diff --git a/Makefile.rules b/Makefile.rules
-index 6fa3e02..7d1af2e 100644
---- a/Makefile.rules
-+++ b/Makefile.rules
-@@ -56,6 +56,8 @@ endif
- 
- LIBS += $(LIBNSL)
- 
-+LIBS += $(LIBCLOCK_GETTIME)
-+
- # Standard rules
- 
- .SUFFIXES: .c .o .s .so
-diff --git a/configure.in b/configure.in
-index 25d7c4e..a4318e8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -177,6 +177,10 @@ if test "$ac_cv_search_versionsort" = "no"; then
- 		[Define if your C library does not provide versionsort])
- fi
- 
-+# glibc < 2.17 needs librt for clock_gettime()
-+AC_CHECK_LIB(rt, clock_gettime, LIBCLOCK_GETTIME="-lrt")
-+AC_SUBST(LIBCLOCK_GETTIME)
-+
- #
- # glibc/libc 6 new libraries
- #
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/autofs/0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch b/bsp/buildroot/package/autofs/0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch
deleted file mode 100644
index 93f3f9cf..00000000
--- a/bsp/buildroot/package/autofs/0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From bb5cc9cee1963362fe56b4fac65fed4912da4215 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 30 Jul 2016 22:30:01 +0200
-Subject: [PATCH] configure: add cache variable for Linux proc filesystem check
-
-When cross-compiling, whether the /proc filesystem is available in the
-build environment does not give any indication as to whether it will
-be available in the execution environment.
-
-This commit therefore adjust the AF_LINUX_PROCFS macro to use
-AC_CACHE_CHECK(), so that an ac_cv_linux_procfs variable can be
-preseeded in the environment to force the result of this check.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- aclocal.m4 | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index 2115204..333699c 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -80,16 +80,11 @@ dnl
- dnl Check for the Linux /proc filesystem
- dnl --------------------------------------------------------------------------
- AC_DEFUN(AF_LINUX_PROCFS,
--[AC_MSG_CHECKING(for Linux proc filesystem)
--if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux"
--then
--	linux_procfs=yes
--else
--	linux_procfs=no
--fi
--AC_MSG_RESULT($linux_procfs)
--if test $linux_procfs = yes
--then
-+[AC_CACHE_CHECK([for Linux proc filesystem], [ac_cv_linux_procfs],
-+	[ac_cv_linux_procfs=no
-+	 test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" && ac_cv_linux_procfs=yes])
-+ if test $ac_cv_linux_procfs = yes
-+ then
- 	AC_DEFINE(HAVE_LINUX_PROCFS, 1,
- 		[Define if you have the Linux /proc filesystem.])
- fi])
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/autofs/autofs.hash b/bsp/buildroot/package/autofs/autofs.hash
index 72b13785..1f2060bd 100644
--- a/bsp/buildroot/package/autofs/autofs.hash
+++ b/bsp/buildroot/package/autofs/autofs.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc
-sha256 88b7de39088aead983e02072a7b753d5ee52ce419c8913f7a3d4ff5521313f0c  autofs-5.1.2.tar.xz
+sha256 8fce30ee51ffd528fe1a4e8374ef57f43367e1f123030e175fb1b1cf15bc1722  autofs-5.1.4.tar.xz
diff --git a/bsp/buildroot/package/autofs/autofs.mk b/bsp/buildroot/package/autofs/autofs.mk
index 23e68368..befee154 100644
--- a/bsp/buildroot/package/autofs/autofs.mk
+++ b/bsp/buildroot/package/autofs/autofs.mk
@@ -4,15 +4,12 @@
 #
 ################################################################################
 
-AUTOFS_VERSION = 5.1.2
+AUTOFS_VERSION = 5.1.4
 AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz
 AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5
-AUTOFS_LICENSE = GPLv2+
+AUTOFS_LICENSE = GPL-2.0+
 AUTOFS_LICENSE_FILES = COPYING COPYRIGHT
-AUTOFS_DEPENDENCIES = host-flex host-bison
-# For 0002-autofs-configure-check-for-clock_gettime-in-librt.patch and
-# 0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch.
-AUTOFS_AUTORECONF = YES
+AUTOFS_DEPENDENCIES = host-flex host-bison host-nfs-utils
 
 # autofs looks on the build machine for the path of modprobe, so tell
 # it explicitly where it will be located on the target.
diff --git a/bsp/buildroot/package/automake/0002-port-to-perl-5.22-and-later.patch b/bsp/buildroot/package/automake/0002-port-to-perl-5.22-and-later.patch
deleted file mode 100644
index 207039be..00000000
--- a/bsp/buildroot/package/automake/0002-port-to-perl-5.22-and-later.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu, 31 Mar 2016 16:35:29 -0700
-Subject: [PATCH] automake: port to Perl 5.22 and later
-
-Without this change, Perl 5.22 complains "Unescaped left brace in
-regex is deprecated" and this is planned to become a hard error in
-Perl 5.26.  See:
-http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern
-* bin/automake.in (substitute_ac_subst_variables): Escape left brace.
-
-[Backported from:
- http://git.savannah.gnu.org/cgit/automake.git/commit/?id=13f00eb4493c217269b76614759e452d8302955e]
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index a3a0aa3..2c8f31e 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables
- {
-   my ($text) = @_;
--  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+  $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-   return $text;
- }
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/automake/automake.hash b/bsp/buildroot/package/automake/automake.hash
index 83aca905..b194c3c2 100644
--- a/bsp/buildroot/package/automake/automake.hash
+++ b/bsp/buildroot/package/automake/automake.hash
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256  9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636  automake-1.15.tar.xz
+sha256 af6ba39142220687c500f79b4aa2f181d9b24e4f8d8ec497cea4ba26c64bedaf  automake-1.15.1.tar.xz
+# License files, locally calculated
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/bsp/buildroot/package/automake/automake.mk b/bsp/buildroot/package/automake/automake.mk
index 84f05dce..27033771 100644
--- a/bsp/buildroot/package/automake/automake.mk
+++ b/bsp/buildroot/package/automake/automake.mk
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-AUTOMAKE_VERSION = 1.15
+AUTOMAKE_VERSION = 1.15.1
 AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
-AUTOMAKE_LICENSE = GPLv2+
+AUTOMAKE_LICENSE = GPL-2.0+
 AUTOMAKE_LICENSE_FILES = COPYING
 
 HOST_AUTOMAKE_DEPENDENCIES = host-autoconf
 
-ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal
+ACLOCAL_HOST_DIR = $(HOST_DIR)/share/aclocal
 
 define GTK_DOC_M4_INSTALL
 	$(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \
@@ -30,6 +30,6 @@ HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL
 $(eval $(host-autotools-package))
 
 # variables used by other packages
-AUTOMAKE = $(HOST_DIR)/usr/bin/automake
+AUTOMAKE = $(HOST_DIR)/bin/automake
 ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal
-ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR)
+ACLOCAL = $(HOST_DIR)/bin/aclocal -I $(ACLOCAL_DIR)
diff --git a/bsp/buildroot/package/autossh/Config.in b/bsp/buildroot/package/autossh/Config.in
index 6d1a0853..351e23ff 100644
--- a/bsp/buildroot/package/autossh/Config.in
+++ b/bsp/buildroot/package/autossh/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_AUTOSSH
 	depends on BR2_PACKAGE_DROPBEAR || BR2_PACKAGE_OPENSSH
 	help
 	  autossh is a program to start a copy of ssh and monitor it,
-	  restarting it as necessary should it die or stop passing traffic.
+	  restarting it as necessary should it die or stop passing
+	  traffic.
 
 	  http://www.harding.motd.ca/autossh/
diff --git a/bsp/buildroot/package/avahi/Config.in b/bsp/buildroot/package/avahi/Config.in
index a6b4ac83..5e303d04 100644
--- a/bsp/buildroot/package/avahi/Config.in
+++ b/bsp/buildroot/package/avahi/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_AVAHI
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Avahi is a system which facilitates service
 	  discovery on a local network.
diff --git a/bsp/buildroot/package/avahi/avahi.hash b/bsp/buildroot/package/avahi/avahi.hash
index 09c5d424..b4d36ffe 100644
--- a/bsp/buildroot/package/avahi/avahi.hash
+++ b/bsp/buildroot/package/avahi/avahi.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256  d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454	avahi-0.6.32.tar.gz
+sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804  avahi-0.7.tar.gz
+sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  LICENSE
diff --git a/bsp/buildroot/package/avahi/avahi.mk b/bsp/buildroot/package/avahi/avahi.mk
index 069b45a9..c8f1af9a 100644
--- a/bsp/buildroot/package/avahi/avahi.mk
+++ b/bsp/buildroot/package/avahi/avahi.mk
@@ -4,16 +4,9 @@
 #
 ################################################################################
 
-#
-# This program is free software; you can redistribute it
-# and/or modify it under the terms of the GNU Lesser General
-# Public License as published by the Free Software Foundation
-# either version 2.1 of the License, or (at your option) any
-# later version.
-
-AVAHI_VERSION = 0.6.32
+AVAHI_VERSION = 0.7
 AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION)
-AVAHI_LICENSE = LGPLv2.1+
+AVAHI_LICENSE = LGPL-2.1+
 AVAHI_LICENSE_FILES = LICENSE
 AVAHI_INSTALL_STAGING = YES
 
@@ -84,7 +77,7 @@ AVAHI_CONF_OPTS = \
 	--disable-gtk \
 	--disable-gtk3 \
 	--disable-gdbm \
-	--disable-pygtk \
+	--disable-pygobject \
 	--disable-mono \
 	--disable-monodoc \
 	--disable-stack-protector \
@@ -97,8 +90,8 @@ AVAHI_CONF_OPTS = \
 	--with-autoipd-group=avahi
 
 AVAHI_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \
-	host-pkgconf host-gettext
+	host-intltool host-pkgconf \
+	$(TARGET_NLS_DEPENDENCIES)
 
 AVAHI_CFLAGS = $(TARGET_CFLAGS)
 
@@ -168,7 +161,7 @@ endif
 
 AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)"
 
-AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
+AVAHI_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS)
 
 define AVAHI_USERS
 	avahi -1 avahi -1 * - - -
diff --git a/bsp/buildroot/package/avrdude/Config.in b/bsp/buildroot/package/avrdude/Config.in
index 8aca8412..3757f17a 100644
--- a/bsp/buildroot/package/avrdude/Config.in
+++ b/bsp/buildroot/package/avrdude/Config.in
@@ -1,14 +1,14 @@
 config BR2_PACKAGE_AVRDUDE
 	bool "avrdude"
-	select BR2_PACKAGE_ELFUTILS
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-	select BR2_PACKAGE_NCURSES
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
 	depends on !BR2_bfin # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
+	select BR2_PACKAGE_ELFUTILS
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
+	select BR2_PACKAGE_NCURSES
 	help
 	  avrdude is a programmer for Atmel AVR microcontrollers
 	  this package provides a version with new linuxspi driver
diff --git a/bsp/buildroot/package/avrdude/avrdude.hash b/bsp/buildroot/package/avrdude/avrdude.hash
index b2c61259..b203d4d1 100644
--- a/bsp/buildroot/package/avrdude/avrdude.hash
+++ b/bsp/buildroot/package/avrdude/avrdude.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 b32128f4812d5e852cfba2e863d950ec30e0f72f09bc14fb41c02528bbc5dd18 avrdude-ad04c429a90f4c34f000ea4ae11db2705915a31f.tar.gz
+sha256 cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz
diff --git a/bsp/buildroot/package/avrdude/avrdude.mk b/bsp/buildroot/package/avrdude/avrdude.mk
index 27a74de1..0e34076e 100644
--- a/bsp/buildroot/package/avrdude/avrdude.mk
+++ b/bsp/buildroot/package/avrdude/avrdude.mk
@@ -4,17 +4,18 @@
 #
 ################################################################################
 
-AVRDUDE_VERSION = ad04c429a90f4c34f000ea4ae11db2705915a31f
+AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
 AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
-AVRDUDE_LICENSE = GPLv2+
+AVRDUDE_LICENSE = GPL-2.0+
 AVRDUDE_LICENSE_FILES = avrdude/COPYING
 AVRDUDE_SUBDIR = avrdude
 # Sources coming from git, without generated configure and Makefile.in
 # files.
 AVRDUDE_AUTORECONF = YES
+AVRDUDE_CONF_OPTS = --enable-linuxgpio
 AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
 	host-flex host-bison
-AVRDUDE_LICENSE = GPLv2+
+AVRDUDE_LICENSE = GPL-2.0+
 AVRDUDE_LICENSE_FILES = avrdude/COPYING
 
 ifeq ($(BR2_PACKAGE_LIBFTDI1),y)
diff --git a/bsp/buildroot/package/axel/Config.in b/bsp/buildroot/package/axel/Config.in
index aa93f2a1..4507855f 100644
--- a/bsp/buildroot/package/axel/Config.in
+++ b/bsp/buildroot/package/axel/Config.in
@@ -1,11 +1,10 @@
 config BR2_PACKAGE_AXEL
 	bool "axel"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  HTTP/FTP download accelerator.
 
-	  http://axel.alioth.debian.org/
+	  https://github.com/axel-download-accelerator/axel/
 
 comment "axel needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/axel/axel.hash b/bsp/buildroot/package/axel/axel.hash
index 89576701..c317fb88 100644
--- a/bsp/buildroot/package/axel/axel.hash
+++ b/bsp/buildroot/package/axel/axel.hash
@@ -1,2 +1 @@
-# Locally calculated
-sha256	359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036  axel-2.4.tar.gz
+sha256 d34094eb63eaebc989f96eabdda091dcfb28e840bb8d274a5f216775941f59e4  axel-2.16.1.tar.xz
diff --git a/bsp/buildroot/package/axel/axel.mk b/bsp/buildroot/package/axel/axel.mk
index 6cf0fa8d..129ea295 100644
--- a/bsp/buildroot/package/axel/axel.mk
+++ b/bsp/buildroot/package/axel/axel.mk
@@ -4,39 +4,24 @@
 #
 ################################################################################
 
-AXEL_VERSION = 2.4
-AXEL_SITE = http://sources.buildroot.net
-AXEL_LICENSE = GPLv2+
+AXEL_VERSION = 2.16.1
+AXEL_SITE = https://github.com/axel-download-accelerator/axel/releases/download/v$(AXEL_VERSION)
+AXEL_SOURCE = axel-$(AXEL_VERSION).tar.xz
+AXEL_LICENSE = GPL-2.0+
 AXEL_LICENSE_FILES = COPYING
+AXEL_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-AXEL_DEPENDENCIES += gettext
-AXEL_LDFLAGS += -lintl
+# ac_cv_prog_cc_c99 is required for BR2_USE_WCHAR=n because the C99 test
+# provided by autoconf relies on wchar_t.
+AXEL_CONF_OPTS = \
+	ac_cv_prog_cc_c99=-std=c99 \
+	CFLAGS="$(TARGET_CFLAGS)"
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+AXEL_CONF_OPTS += --with-ssl
+AXEL_DEPENDENCIES += openssl
+else
+AXEL_CONF_OPTS += --without-ssl
 endif
 
-# -lintl may use symbols from -lpthread
-AXEL_LDFLAGS += -lpthread
-
-ifneq ($(BR2_ENABLE_LOCALE),y)
-AXEL_DISABLE_I18N = --i18n=0
-endif
-
-define AXEL_CONFIGURE_CMDS
-	(cd $(@D); \
-		./configure \
-			--prefix=/usr \
-			--debug=1 \
-			$(AXEL_DISABLE_I18N) \
-	)
-endef
-
-define AXEL_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-	LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D)
-endef
-
-define AXEL_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/axfsutils/0001-fix-cflags.patch b/bsp/buildroot/package/axfsutils/0001-fix-cflags.patch
deleted file mode 100644
index 0415d82f..00000000
--- a/bsp/buildroot/package/axfsutils/0001-fix-cflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile: complement CFLAGS provided by the user
-
-In some circumstances, the user may want to pass its own CFLAGS,
-like for when the zlib headers are not located in the standard gcc
-search paths.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN a/mkfs.axfs-legacy/Makefile b/mkfs.axfs-legacy/Makefile
---- a/mkfs.axfs-legacy/Makefile
-+++ b/mkfs.axfs-legacy/Makefile
-@@ -1,5 +1,5 @@
--INC = -I./
--CFLAGS = -g $(INC) -O0
-+INC += -I./
-+CFLAGS += -g $(INC) -O0
- 
- MKFSOBJS = mkfs.axfs.o
- 
diff --git a/bsp/buildroot/package/axfsutils/0002-use-ldflags.patch b/bsp/buildroot/package/axfsutils/0002-use-ldflags.patch
deleted file mode 100644
index 20e03a9b..00000000
--- a/bsp/buildroot/package/axfsutils/0002-use-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Makefile: use LDFLAGS as provided by the user
-
-In some circumstances, the user may want to pass some LDFLAGS, like
--L flags to point to the zlib location if it was not installed in a
-standard location.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN a/mkfs.axfs-legacy/Makefile b/mkfs.axfs-legacy/Makefile
---- a/mkfs.axfs-legacy/Makefile
-+++ b/mkfs.axfs-legacy/Makefile
-@@ -6,7 +6,7 @@
- all:   mkfs.axfs
- 
- mkfs.axfs: $(MKFSOBJS)
--	$(CC) $(CFLAGS) -o mkfs.axfs $(MKFSOBJS) -lz
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o mkfs.axfs $(MKFSOBJS) -lz
- 
- clean_mkfs.axfs:
- 	rm -rf $(MKFSOBJS) mkfs.axfs
diff --git a/bsp/buildroot/package/axfsutils/axfsutils.hash b/bsp/buildroot/package/axfsutils/axfsutils.hash
index bde94a0b..3ef5c587 100644
--- a/bsp/buildroot/package/axfsutils/axfsutils.hash
+++ b/bsp/buildroot/package/axfsutils/axfsutils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 80dd97305b005262643e9fad04ec03b860430ea2c58666ce5b007897afbc9693 axfsutils-64886703fdff6cfc64eb20fbe7d7295bbeec867b.tar.gz
+sha256 7d8c0febaf6f104c2b179475ea1ee6d361688ad7fa4c98dfdf7395fcff2be685 axfsutils-384a1ea214c8cf8359faba00a12513ee7ae1a9f5.tar.gz
diff --git a/bsp/buildroot/package/axfsutils/axfsutils.mk b/bsp/buildroot/package/axfsutils/axfsutils.mk
index 1bd62809..88792216 100644
--- a/bsp/buildroot/package/axfsutils/axfsutils.mk
+++ b/bsp/buildroot/package/axfsutils/axfsutils.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-AXFSUTILS_VERSION = 64886703fdff6cfc64eb20fbe7d7295bbeec867b
+AXFSUTILS_VERSION = 384a1ea214c8cf8359faba00a12513ee7ae1a9f5
 AXFSUTILS_SITE = $(call github,jaredeh,axfs,$(AXFSUTILS_VERSION))
-AXFSUTILS_LICENSE = GPLv2
+AXFSUTILS_LICENSE = GPL-2.0
 AXFSUTILS_LICENSE_FILES = mkfs.axfs-legacy/COPYING
 HOST_AXFSUTILS_DEPENDENCIES = host-zlib
 
@@ -18,7 +18,7 @@ endef
 
 define HOST_AXFSUTILS_INSTALL_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/mkfs.axfs-legacy/mkfs.axfs \
-		$(HOST_DIR)/usr/bin/mkfs.axfs
+		$(HOST_DIR)/bin/mkfs.axfs
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch b/bsp/buildroot/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch
new file mode 100644
index 00000000..98975d27
--- /dev/null
+++ b/bsp/buildroot/package/azmq/0001-Conditionally-disable-test-and-doc-builds.patch
@@ -0,0 +1,43 @@
+From d960f93fb52e373f76cfedbee5f4fb0c5276856a Mon Sep 17 00:00:00 2001
+From: RJ Ascani <rj.ascani@gmail.com>
+Date: Thu, 20 Jul 2017 15:53:40 -0700
+Subject: [PATCH] Conditionally disable test and doc builds
+
+Signed-off-by: RJ Ascani <rj.ascani@gmail.com>
+---
+ CMakeLists.txt | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b5b9cc..97006a4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -49,7 +49,9 @@ include_directories(${Boost_INCLUDE_DIRS}
+                     ${ZeroMQ_INCLUDE_DIRS}
+                     ${PROJECT_SOURCE_DIR})
+
+-enable_testing()
++if (BUILD_TESTING)
++    enable_testing()
++endif()
+
+ macro(add_catch_test name)
+     if (TEST_REPORT_FORMAT)
+@@ -59,8 +61,12 @@ macro(add_catch_test name)
+     endif()
+ endmacro()
+
+-add_subdirectory(test)
+-add_subdirectory(doc)
++if (BUILD_TESTING)
++    add_subdirectory(test)
++endif()
++if (BUILD_DOC)
++    add_subdirectory(doc)
++endif()
+
+ install(DIRECTORY ${PROJECT_SOURCE_DIR}/azmq
+         DESTINATION include)
+--
+2.13.3
+
diff --git a/bsp/buildroot/package/azmq/Config.in b/bsp/buildroot/package/azmq/Config.in
new file mode 100644
index 00000000..eeafa2ad
--- /dev/null
+++ b/bsp/buildroot/package/azmq/Config.in
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_AZMQ
+	bool "azmq"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_ATOMIC
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # boost-log
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_USE_WCHAR # boost
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+	select BR2_PACKAGE_ZEROMQ
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_CHRONO
+	select BR2_PACKAGE_BOOST_DATE_TIME
+	select BR2_PACKAGE_BOOST_LOG
+	select BR2_PACKAGE_BOOST_RANDOM
+	select BR2_PACKAGE_BOOST_REGEX
+	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_BOOST_THREAD
+	help
+	  This library provides Boost Asio style bindings for ZeroMQ.
+
+	  https://github.com/zeromq/azmq
+
+comment "azmq needs a toolchain w/ C++11, wchar and NTPL"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
+		&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL)
+
+comment "azmq needs exception_ptr"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/bsp/buildroot/package/azmq/azmq.hash b/bsp/buildroot/package/azmq/azmq.hash
new file mode 100644
index 00000000..d3993f49
--- /dev/null
+++ b/bsp/buildroot/package/azmq/azmq.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+# https://github.com/zeromq/azmq/archive/v1.0.tar.gz
+sha256 c204c731bcb7810ca3a2c5515e88974ef2ff8d0589e60a897dc238b369180e7b  azmq-v1.0.tar.gz
diff --git a/bsp/buildroot/package/azmq/azmq.mk b/bsp/buildroot/package/azmq/azmq.mk
new file mode 100644
index 00000000..427ad0f5
--- /dev/null
+++ b/bsp/buildroot/package/azmq/azmq.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# azmq
+#
+################################################################################
+
+AZMQ_VERSION = v1.0
+AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION))
+AZMQ_DEPENDENCIES = boost zeromq
+AZMQ_LICENSE = BSL-1.0
+AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0
+
+# AZMQ is a header only library, so it does not need to be installed on the
+# target.
+AZMQ_INSTALL_STAGING = YES
+AZMQ_INSTALL_TARGET = NO
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/azure-iot-sdk-c/Config.in b/bsp/buildroot/package/azure-iot-sdk-c/Config.in
new file mode 100644
index 00000000..c554d2fb
--- /dev/null
+++ b/bsp/buildroot/package/azure-iot-sdk-c/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_AZURE_IOT_SDK_C
+	bool "azure-iot-sdk-c"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	help
+	  Microsoft Azure IoT Hub device SDK for C is used
+	  to connect devices running C code to Azure IoT Hub.
+
+	  https://github.com/Azure/azure-iot-sdk-c
+
+comment "azure-iot-sdk-c needs a toolchain w/ C++ and NPTL"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/bsp/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk b/bsp/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
new file mode 100644
index 00000000..18c3e249
--- /dev/null
+++ b/bsp/buildroot/package/azure-iot-sdk-c/azure-iot-sdk-c.mk
@@ -0,0 +1,51 @@
+################################################################################
+#
+# azure-iot-sdk-c
+#
+################################################################################
+
+AZURE_IOT_SDK_C_VERSION = 2017-06-30
+AZURE_IOT_SDK_C_SITE = https://github.com/Azure/azure-iot-sdk-c
+AZURE_IOT_SDK_C_SITE_METHOD = git
+AZURE_IOT_SDK_C_GIT_SUBMODULES = YES
+AZURE_IOT_SDK_C_LICENSE = MIT
+AZURE_IOT_SDK_C_LICENSE_FILES = LICENSE
+AZURE_IOT_SDK_C_INSTALL_STAGING = YES
+AZURE_IOT_SDK_C_DEPENDENCIES = libxml2 openssl libcurl util-linux
+AZURE_IOT_SDK_C_CONF_OPTS = -Dskip_samples=ON
+
+# The project only supports building one kind of library.
+# Further the install target installs the wrong files, so we do it here:
+ifeq ($(BR2_STATIC_LIBS),y)
+AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.a c-utility/libaziotsharedutil.a \
+	iothub_client/libiothub_client.a iothub_client/libiothub_client_mqtt_ws_transport.a \
+	iothub_client/libiothub_client_amqp_ws_transport.a \
+	iothub_client/libiothub_client_http_transport.a \
+	iothub_client/libiothub_client_amqp_transport.a \
+	iothub_client/libiothub_client_mqtt_transport.a \
+	iothub_service_client/libiothub_service_client.a serializer/libserializer.a umqtt/libumqtt.a
+else
+AZURE_IOT_SDK_C_LIBS += uamqp/libuamqp.so c-utility/libaziotsharedutil.so \
+	iothub_client/libiothub_client.so iothub_client/libiothub_client_mqtt_ws_transport.so \
+	iothub_client/libiothub_client_amqp_ws_transport.so \
+	iothub_client/libiothub_client_http_transport.so \
+	iothub_client/libiothub_client_amqp_transport.so \
+	iothub_client/libiothub_client_mqtt_transport.so \
+	iothub_service_client/libiothub_service_client.so serializer/libserializer.so umqtt/libumqtt.so
+endif
+
+define AZURE_IOT_SDK_C_INSTALL_STAGING_CMDS
+	$(foreach l,$(AZURE_IOT_SDK_C_LIBS), \
+		$(INSTALL) -D -m 0755 $(@D)/$(l) $(STAGING_DIR)/usr/lib/
+	)
+	cp -a $(@D)/c-utility/inc/* $(STAGING_DIR)/usr/include/
+	cp -a $(@D)/iothub_client/inc/* $(STAGING_DIR)/usr/include/
+endef
+
+define AZURE_IOT_SDK_C_INSTALL_TARGET_CMDS
+	$(foreach l,$(AZURE_IOT_SDK_C_LIBS), \
+		$(INSTALL) -D -m 0755 $(@D)/$(l) $(TARGET_DIR)/usr/lib/
+	)
+endef
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/b43-firmware/Config.in b/bsp/buildroot/package/b43-firmware/Config.in
index bc69bbcb..7cef0239 100644
--- a/bsp/buildroot/package/b43-firmware/Config.in
+++ b/bsp/buildroot/package/b43-firmware/Config.in
@@ -14,11 +14,11 @@ choice
 	  kernel >= 3.2 need a different firmware than the b43 drivers
 	  from kernel < 3.2.
 
-	config BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2
-		bool ">= 3.2"
+config BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2
+	bool ">= 3.2"
 
-	config BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2
-		bool "< 3.2"
+config BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2
+	bool "< 3.2"
 
 endchoice
 
diff --git a/bsp/buildroot/package/b43-firmware/b43-firmware.mk b/bsp/buildroot/package/b43-firmware/b43-firmware.mk
index 601ab666..8e9e8776 100644
--- a/bsp/buildroot/package/b43-firmware/b43-firmware.mk
+++ b/bsp/buildroot/package/b43-firmware/b43-firmware.mk
@@ -23,7 +23,7 @@ B43_FIRMWARE_DEPENDENCIES = host-b43-fwcutter
 
 define B43_FIRMWARE_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/
-	$(HOST_DIR)/usr/bin/b43-fwcutter -w $(TARGET_DIR)/lib/firmware/ $(@D)/$(B43_FIRMWARE_DRIVER_FILE)
+	$(HOST_DIR)/bin/b43-fwcutter -w $(TARGET_DIR)/lib/firmware/ $(@D)/$(B43_FIRMWARE_DRIVER_FILE)
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/b43-fwcutter/b43-fwcutter.mk b/bsp/buildroot/package/b43-fwcutter/b43-fwcutter.mk
index d264b649..91ba3dc7 100644
--- a/bsp/buildroot/package/b43-fwcutter/b43-fwcutter.mk
+++ b/bsp/buildroot/package/b43-fwcutter/b43-fwcutter.mk
@@ -7,7 +7,7 @@
 B43_FWCUTTER_VERSION = 015
 B43_FWCUTTER_SITE = http://bues.ch/b43/fwcutter
 B43_FWCUTTER_SOURCE = b43-fwcutter-$(B43_FWCUTTER_VERSION).tar.bz2
-B43_FWCUTTER_LICENSE = BSD-2c
+B43_FWCUTTER_LICENSE = BSD-2-Clause
 B43_FWCUTTER_LICENSE_FILES = COPYING
 
 define HOST_B43_FWCUTTER_BUILD_CMDS
@@ -15,7 +15,7 @@ define HOST_B43_FWCUTTER_BUILD_CMDS
 endef
 
 define HOST_B43_FWCUTTER_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/b43-fwcutter $(HOST_DIR)/usr/bin/b43-fwcutter
+	$(INSTALL) -D -m 0755 $(@D)/b43-fwcutter $(HOST_DIR)/bin/b43-fwcutter
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/babeld/Config.in b/bsp/buildroot/package/babeld/Config.in
index 5d08c084..c7010e1f 100644
--- a/bsp/buildroot/package/babeld/Config.in
+++ b/bsp/buildroot/package/babeld/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BABELD
 	bool "babeld"
 	depends on BR2_USE_MMU # fork()
 	help
-	  Babel is a loop-avoiding distance-vector routing protocol for IPv6
-	  and IPv4 with fast convergence properties.
+	  Babel is a loop-avoiding distance-vector routing protocol for
+	  IPv6 and IPv4 with fast convergence properties.
 
 	  http://www.pps.univ-paris-diderot.fr/~jch/software/babel/
diff --git a/bsp/buildroot/package/bandwidthd/Config.in b/bsp/buildroot/package/bandwidthd/Config.in
index b4a47f2e..8a19733c 100644
--- a/bsp/buildroot/package/bandwidthd/Config.in
+++ b/bsp/buildroot/package/bandwidthd/Config.in
@@ -25,15 +25,17 @@ config BR2_PACKAGE_BANDWIDTHD
 	  available on github that works on making BandwidthD's build
 	  process more compatible with buildroot's.
 
-	  Upstream: http://bandwidthd.sourceforge.net/
-	  Github fork: http://github.com/nroach44/bandwidthd
+	  Upstream:
+	  http://bandwidthd.sourceforge.net/
+	  Github fork:
+	  http://github.com/nroach44/bandwidthd
 
 if BR2_PACKAGE_BANDWIDTHD
 
 config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL
 	bool "enable postgresql log target support"
-	select BR2_PACKAGE_POSTGRESQL
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_POSTGRESQL
 	help
 	  Enable support for logging the bandwidthd data to a remote
 	  (or local) postgresql server. This data can then be viewed
diff --git a/bsp/buildroot/package/bash/Config.in b/bsp/buildroot/package/bash/Config.in
index 783e4b38..5a9ebb8d 100644
--- a/bsp/buildroot/package/bash/Config.in
+++ b/bsp/buildroot/package/bash/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_BASH
 	bool "bash"
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
 	# uses fork()
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_READLINE
 	help
 	  The standard GNU Bourne again shell.
 
diff --git a/bsp/buildroot/package/bash/bash.hash b/bsp/buildroot/package/bash/bash.hash
index adbd6086..4e2e48f3 100644
--- a/bsp/buildroot/package/bash/bash.hash
+++ b/bsp/buildroot/package/bash/bash.hash
@@ -1,2 +1,4 @@
-# Locally calculated after checking pgp signature
-sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb  bash-4.4.tar.gz
+# Locally calculated after checking pgp signature from
+# http://ftp.gnu.org/gnu/bash/bash-4.4.12.tar.gz.sig
+sha256 57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331	bash-4.4.12.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/bsp/buildroot/package/bash/bash.mk b/bsp/buildroot/package/bash/bash.mk
index 0f42fd16..6e58f0fd 100644
--- a/bsp/buildroot/package/bash/bash.mk
+++ b/bsp/buildroot/package/bash/bash.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-BASH_VERSION = 4.4
+BASH_VERSION = 4.4.12
 BASH_SITE = $(BR2_GNU_MIRROR)/bash
 # Build after since bash is better than busybox shells
 BASH_DEPENDENCIES = ncurses readline host-bison \
 	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
 BASH_CONF_OPTS = --with-installed-readline --without-bash-malloc
-BASH_LICENSE = GPLv3+
+BASH_LICENSE = GPL-3.0+
 BASH_LICENSE_FILES = COPYING
 
 BASH_CONF_ENV += \
@@ -25,6 +25,7 @@ BASH_CONF_ENV += \
 # The static build needs some trickery
 ifeq ($(BR2_STATIC_LIBS),y)
 BASH_CONF_OPTS += --enable-static-link
+BASH_CONF_ENV += SHOBJ_STATUS=unsupported
 # bash wants to redefine the getenv() function. To check whether this is
 # possible, AC_TRY_RUN is used which is not possible in
 # cross-compilation.
@@ -38,7 +39,6 @@ BASH_CONF_ENV += bash_cv_getenv_redef=yes
 endif
 endif
 
-# Make /bin/sh -> bash (no other shell, better than busybox shells)
 define BASH_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
 		DESTDIR=$(TARGET_DIR) exec_prefix=/ install
diff --git a/bsp/buildroot/package/bash/bash44-001.patch b/bsp/buildroot/package/bash/bash44-001.patch
deleted file mode 100644
index 842aea43..00000000
--- a/bsp/buildroot/package/bash/bash44-001.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-001
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-001
-
-Bug-Reported-by:	Sean Zha <freeman_cha@hotmail.com>
-Bug-Reference-ID:	<BN3PR01MB13657D9303EB94BF6E54216E8CCA0@BN3PR01MB1365.prod.exchangelabs.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html
-
-Bug-Description:
-
-Bash-4.4 changed the way the history list is initially allocated to reduce
-the number of reallocations and copies.  Users who set HISTSIZE to a very
-large number to essentially unlimit the size of the history list will get
-memory allocation errors 
-
-Patch (apply with `patch -p0'):
-
-*** a/bash-4.4/lib/readline/history.c	2015-12-28 13:50:31.000000000 -0500
---- b/lib/readline/history.c	2016-09-30 14:28:40.000000000 -0400
-***************
-*** 58,61 ****
---- 58,63 ----
-  #define DEFAULT_HISTORY_INITIAL_SIZE	502
-  
-+ #define MAX_HISTORY_INITIAL_SIZE	8192
-+ 
-  /* The number of slots to increase the_history by. */
-  #define DEFAULT_HISTORY_GROW_SIZE 50
-***************
-*** 308,312 ****
-  	{
-  	  if (history_stifled && history_max_entries > 0)
-! 	    history_size = history_max_entries + 2;
-  	  else
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
---- 310,316 ----
-  	{
-  	  if (history_stifled && history_max_entries > 0)
-! 	    history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE)
-! 				? MAX_HISTORY_INITIAL_SIZE
-! 				: history_max_entries + 2;
-  	  else
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
-*** a/bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 0
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-002.patch b/bsp/buildroot/package/bash/bash44-002.patch
deleted file mode 100644
index 6f4a809f..00000000
--- a/bsp/buildroot/package/bash/bash44-002.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-002
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-002
-
-Bug-Reported-by:	Eric Pruitt <eric.pruitt@gmail.com>
-Bug-Reference-ID:	<20160916055120.GA28272@sinister.codevat.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html
-
-Bug-Description:
-
-Bash-4.4 warns when discarding NUL bytes in command substitution output
-instead of silently dropping them.  This patch changes the warnings from
-one per NUL byte encountered to one warning per command substitution.
-
-Patch (apply with `patch -p0'):
-
-*** a/bash-4.4/subst.c	2016-08-30 16:46:38.000000000 -0400
---- b/subst.c	2016-09-26 10:20:19.000000000 -0400
-***************
-*** 5932,5935 ****
---- 5933,5937 ----
-    int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul;
-    ssize_t bufn;
-+   int nullbyte;
-  
-    istring = (char *)NULL;
-***************
-*** 5939,5942 ****
---- 5941,5946 ----
-      skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL;
-  
-+   nullbyte = 0;
-+ 
-    /* Read the output of the command through the pipe.  This may need to be
-       changed to understand multibyte characters in the future. */
-***************
-*** 5957,5961 ****
-  	{
-  #if 1
-! 	  internal_warning ("%s", _("command substitution: ignored null byte in input"));
-  #endif
-  	  continue;
---- 5961,5969 ----
-  	{
-  #if 1
-! 	  if (nullbyte == 0)
-! 	    {
-! 	      internal_warning ("%s", _("command substitution: ignored null byte in input"));
-! 	      nullbyte = 1;
-! 	    }
-  #endif
-  	  continue;
-*** a/bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 1
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-003.patch b/bsp/buildroot/package/bash/bash44-003.patch
deleted file mode 100644
index cdfc206f..00000000
--- a/bsp/buildroot/package/bash/bash44-003.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-003
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-003
-
-Bug-Reported-by:	op7ic \x00 <op7ica@gmail.com>
-Bug-Reference-ID:	<CAFHyJTopWC5Jx+U7WcvxSZKu+KrqSf+_3sHPiRWo=VzXSiPq=w@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html
-
-Bug-Description:
-
-Specially-crafted input, in this case an incomplete pathname expansion
-bracket expression containing an invalid collating symbol, can cause the
-shell to crash.
-
-Patch (apply with `patch -p0'):
-
-*** a/bash-4.4/lib/glob/sm_loop.c	2016-04-10 11:23:21.000000000 -0400
---- b/lib/glob/sm_loop.c	2016-11-02 14:03:34.000000000 -0400
-***************
-*** 331,334 ****
---- 331,340 ----
-      if (p[pc] == L('.') && p[pc+1] == L(']'))
-        break;
-+    if (p[pc] == 0)
-+     {
-+       if (vp)
-+ 	*vp = INVALID;
-+       return (p + pc);
-+     }
-     val = COLLSYM (p, pc);
-     if (vp)
-***************
-*** 484,487 ****
---- 490,496 ----
-        c = FOLD (c);
-  
-+       if (c == L('\0'))
-+ 	return ((test == L('[')) ? savep : (CHAR *)0);
-+ 
-        if ((flags & FNM_PATHNAME) && c == L('/'))
-  	/* [/] can never match when matching a pathname.  */
-*** a/bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 2
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-004.patch b/bsp/buildroot/package/bash/bash44-004.patch
deleted file mode 100644
index ba6ff626..00000000
--- a/bsp/buildroot/package/bash/bash44-004.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-004
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-004
-
-Bug-Reported-by:	Christian Weisgerber <naddy@mips.inka.de>
-Bug-Reference-ID:	<20161101160302.GB54856@lorvorc.mips.inka.de>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html
-
-Bug-Description:
-
-There is a race condition that can result in bash referencing freed memory
-when freeing data associated with the last process substitution.
-
-Patch (apply with `patch -p0'):
-
-*** a/bash-4.4/jobs.c	2016-08-23 16:38:44.000000000 -0400
---- b/jobs.c	2016-11-02 18:24:45.000000000 -0400
-***************
-*** 454,457 ****
---- 454,472 ----
-  }
-  
-+ void
-+ discard_last_procsub_child ()
-+ {
-+   PROCESS *disposer;
-+   sigset_t set, oset;
-+ 
-+   BLOCK_CHILD (set, oset);
-+   disposer = last_procsub_child;
-+   last_procsub_child = (PROCESS *)NULL;
-+   UNBLOCK_CHILD (oset);
-+ 
-+   if (disposer)
-+     discard_pipeline (disposer);
-+ }
-+ 
-  struct pipeline_saver *
-  alloc_pipeline_saver ()
-*** a/bash-4.4/jobs.h	2016-04-27 10:35:51.000000000 -0400
---- b/jobs.h	2016-11-02 18:25:08.000000000 -0400
-***************
-*** 191,194 ****
---- 191,195 ----
-  extern void stop_making_children __P((void));
-  extern void cleanup_the_pipeline __P((void));
-+ extern void discard_last_procsub_child __P((void));
-  extern void save_pipeline __P((int));
-  extern PROCESS *restore_pipeline __P((int));
-*** a/bash-4.4/subst.c	2016-08-30 16:46:38.000000000 -0400
---- b/subst.c	2016-11-02 18:23:24.000000000 -0400
-***************
-*** 5809,5816 ****
-  #if defined (JOB_CONTROL)
-        if (last_procsub_child)
-! 	{
-! 	  discard_pipeline (last_procsub_child);
-! 	  last_procsub_child = (PROCESS *)NULL;
-! 	}
-        last_procsub_child = restore_pipeline (0);
-  #endif
---- 5834,5838 ----
-  #if defined (JOB_CONTROL)
-        if (last_procsub_child)
-! 	discard_last_procsub_child ();
-        last_procsub_child = restore_pipeline (0);
-  #endif
-*** a/bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 3
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-005.patch b/bsp/buildroot/package/bash/bash44-005.patch
deleted file mode 100644
index 0278e31d..00000000
--- a/bsp/buildroot/package/bash/bash44-005.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-005
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-005
-
-Bug-Reported-by:	Dr. Werner Fink <werner@suse.de>
-Bug-Reference-ID:	<20161107100936.ajnojd7dspirdflf@noether.suse.de>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html
-
-Bug-Description:
-
-Under certain circumstances, a simple command is optimized to eliminate a
-fork, resulting in an EXIT trap not being executed.
-
-Patch (apply with `patch -p0'):
-
-*** a/bash-4.4/builtins/evalstring.c	2016-08-11 14:18:51.000000000 -0400
---- b/builtins/evalstring.c	2016-11-08 15:05:07.000000000 -0500
-***************
-*** 105,114 ****
-  	  *bash_input.location.string == '\0' &&
-  	  command->type == cm_simple &&
-- #if 0
-  	  signal_is_trapped (EXIT_TRAP) == 0 &&
-  	  signal_is_trapped (ERROR_TRAP) == 0 &&
-- #else
-  	  any_signals_trapped () < 0 &&
-- #endif
-  	  command->redirects == 0 && command->value.Simple->redirects == 0 &&
-  	  ((command->flags & CMD_TIME_PIPELINE) == 0) &&
---- 105,111 ----
-*** a/bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 4
-  
-  #endif /* _PATCHLEVEL_H_ */
---- 26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-006.patch b/bsp/buildroot/package/bash/bash44-006.patch
deleted file mode 100644
index ba58ed40..00000000
--- a/bsp/buildroot/package/bash/bash44-006.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-006
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-006
-
-Bug-Reported-by:	<fernando@null-life.com>
-Bug-Reference-ID:	<CAEr-gPFPvqheiAeENmMkEwWRd4U=1iqCsYmR3sLdULOqL++_tQ@mail.gmail.com>
-Bug-Reference-URL:	
-
-Bug-Description:
-
-Out-of-range negative offsets to popd can cause the shell to crash attempting
-to free an invalid memory block.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/builtins/pushd.def	2016-01-25 13:31:49.000000000 -0500
---- b/builtins/pushd.def	2016-10-28 10:46:49.000000000 -0400
-***************
-*** 366,370 ****
-      }
-  
-!   if (which > directory_list_offset || (directory_list_offset == 0 && which == 0))
-      {
-        pushd_error (directory_list_offset, which_word ? which_word : "");
---- b/366,370 ----
-      }
-  
-!   if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0))
-      {
-        pushd_error (directory_list_offset, which_word ? which_word : "");
-***************
-*** 388,391 ****
---- b/388,396 ----
-  	 of the list into place. */
-        i = (direction == '+') ? directory_list_offset - which : which;
-+       if (i < 0 || i > directory_list_offset)
-+ 	{
-+ 	  pushd_error (directory_list_offset, which_word ? which_word : "");
-+ 	  return (EXECUTION_FAILURE);
-+ 	}
-        free (pushd_directory_list[i]);
-        directory_list_offset--;
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 5
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-007.patch b/bsp/buildroot/package/bash/bash44-007.patch
deleted file mode 100644
index 71e771d6..00000000
--- a/bsp/buildroot/package/bash/bash44-007.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-007
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-007
-
-Bug-Reported-by:	Jens Heyens <jens.heyens@cispa.saarland>
-Bug-Reference-ID:	
-Bug-Reference-URL:	https://savannah.gnu.org/support/?109224
-
-Bug-Description:
-
-When performing filename completion, bash dequotes the directory name being
-completed, which can result in match failures and potential unwanted
-expansion.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/bashline.c	2016-08-05 21:44:05.000000000 -0400
---- b/bashline.c	2017-01-19 13:15:51.000000000 -0500
-***************
-*** 143,147 ****
-  static void restore_directory_hook __P((rl_icppfunc_t));
-  
-! static int directory_exists __P((const char *));
-  
-  static void cleanup_expansion_error __P((void));
---- b/144,148 ----
-  static void restore_directory_hook __P((rl_icppfunc_t));
-  
-! static int directory_exists __P((const char *, int));
-  
-  static void cleanup_expansion_error __P((void));
-***************
-*** 3103,3111 ****
-  }
-  
-! /* Check whether not the (dequoted) version of DIRNAME, with any trailing slash
-!    removed, exists. */
-  static int
-! directory_exists (dirname)
-       const char *dirname;
-  {
-    char *new_dirname;
---- b/3107,3116 ----
-  }
-  
-! /* Check whether not DIRNAME, with any trailing slash removed, exists.  If
-!    SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */
-  static int
-! directory_exists (dirname, should_dequote)
-       const char *dirname;
-+      int should_dequote;
-  {
-    char *new_dirname;
-***************
-*** 3113,3118 ****
-    struct stat sb;
-  
-!   /* First, dequote the directory name */
-!   new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character);
-    dirlen = STRLEN (new_dirname);
-    if (new_dirname[dirlen - 1] == '/')
---- b/3118,3124 ----
-    struct stat sb;
-  
-!   /* We save the string and chop the trailing slash because stat/lstat behave
-!      inconsistently if one is present. */
-!   new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname);
-    dirlen = STRLEN (new_dirname);
-    if (new_dirname[dirlen - 1] == '/')
-***************
-*** 3146,3150 ****
-      should_expand_dirname = '`';
-  
-!   if (should_expand_dirname && directory_exists (local_dirname))
-      should_expand_dirname = 0;
-    
---- b/3152,3156 ----
-      should_expand_dirname = '`';
-  
-!   if (should_expand_dirname && directory_exists (local_dirname, 0))
-      should_expand_dirname = 0;
-    
-***************
-*** 3156,3160 ****
-        global_nounset = unbound_vars_is_error;
-        unbound_vars_is_error = 0;
-!       wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE);	/* does the right thing */
-        unbound_vars_is_error = global_nounset;
-        if (wl)
---- b/3162,3166 ----
-        global_nounset = unbound_vars_is_error;
-        unbound_vars_is_error = 0;
-!       wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE);	/* does the right thing */
-        unbound_vars_is_error = global_nounset;
-        if (wl)
-***************
-*** 3245,3249 ****
-      }
-  
-!   if (should_expand_dirname && directory_exists (local_dirname))
-      should_expand_dirname = 0;
-  
---- b/3262,3266 ----
-      }
-  
-!   if (should_expand_dirname && directory_exists (local_dirname, 1))
-      should_expand_dirname = 0;
-  
-***************
-*** 3251,3255 ****
-      {
-        new_dirname = savestring (local_dirname);
-!       wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE);	/* does the right thing */
-        if (wl)
-  	{
---- b/3268,3272 ----
-      {
-        new_dirname = savestring (local_dirname);
-!       wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE);	/* does the right thing */
-        if (wl)
-  	{
-*** bash-4.4/subst.c	2016-08-30 16:46:38.000000000 -0400
---- b/subst.c	2017-01-19 07:09:57.000000000 -0500
-***************
-*** 9459,9462 ****
---- b/9459,9466 ----
-  	      if (word->flags & W_COMPLETE)
-  		tword->flags |= W_COMPLETE;	/* for command substitutions */
-+ 	      if (word->flags & W_NOCOMSUB)
-+ 		tword->flags |= W_NOCOMSUB;
-+ 	      if (word->flags & W_NOPROCSUB)
-+ 		tword->flags |= W_NOPROCSUB;
-  
-  	      temp = (char *)NULL;
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 6
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-008.patch b/bsp/buildroot/package/bash/bash44-008.patch
deleted file mode 100644
index 931033c5..00000000
--- a/bsp/buildroot/package/bash/bash44-008.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-008
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-008
-
-Bug-Reported-by:	Koichi MURASE <myoga.murase@gmail.com>
-Bug-Reference-ID:	<CAFLRLk-V+1AeQ2k=pY7ih6V+MfQ_w8EF3YWL2E+wmLfgKBtzXA@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html
-
-Bug-Description:
-
-Under certain circumstances, bash will evaluate arithmetic expressions as
-part of reading an expression token even when evaluation is suppressed. This
-happens while evaluating a conditional expression and skipping over the
-failed branch of the expression.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/expr.c	2015-10-11 14:46:36.000000000 -0400
---- b/expr.c	2016-11-08 11:55:46.000000000 -0500
-***************
-*** 579,585 ****
-    if (curtok == QUES)		/* found conditional expr */
-      {
--       readtok ();
--       if (curtok == 0 || curtok == COL)
-- 	evalerror (_("expression expected"));
-        if (cval == 0)
-  	{
---- b/579,582 ----
-***************
-*** 588,591 ****
---- b/585,592 ----
-  	}
-  
-+       readtok ();
-+       if (curtok == 0 || curtok == COL)
-+ 	evalerror (_("expression expected"));
-+ 
-        val1 = EXP_HIGHEST ();
-  
-***************
-*** 594,600 ****
-        if (curtok != COL)
-  	evalerror (_("`:' expected for conditional expression"));
-!       readtok ();
-!       if (curtok == 0)
-! 	evalerror (_("expression expected"));
-        set_noeval = 0;
-        if (cval)
---- b/595,599 ----
-        if (curtok != COL)
-  	evalerror (_("`:' expected for conditional expression"));
-! 
-        set_noeval = 0;
-        if (cval)
-***************
-*** 604,608 ****
---- b/603,611 ----
-   	}
-  
-+       readtok ();
-+       if (curtok == 0)
-+ 	evalerror (_("expression expected"));
-        val2 = expcond ();
-+ 
-        if (set_noeval)
-  	noeval--;
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 7
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-009.patch b/bsp/buildroot/package/bash/bash44-009.patch
deleted file mode 100644
index 3ba1b3fe..00000000
--- a/bsp/buildroot/package/bash/bash44-009.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-009
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-009
-
-Bug-Reported-by:	Hong Cho <hong.cho@citrix.com>
-Bug-Reference-ID:	<c30b5fe62b2543af8297e47ca487c29c@SJCPEX02CL02.citrite.net>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-12/msg00043.html
-
-Bug-Description:
-
-There is a race condition in add_history() that can be triggered by a fatal
-signal arriving between the time the history length is updated and the time
-the history list update is completed. A later attempt to reference an
-invalid history entry can cause a crash.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/lib/readline/history.c	2016-11-11 13:42:49.000000000 -0500
---- b/lib/readline/history.c	2016-12-05 10:37:51.000000000 -0500
-***************
-*** 280,283 ****
---- b/280,284 ----
-  {
-    HIST_ENTRY *temp;
-+   int new_length;
-  
-    if (history_stifled && (history_length == history_max_entries))
-***************
-*** 296,306 ****
-        /* Copy the rest of the entries, moving down one slot.  Copy includes
-  	 trailing NULL.  */
-- #if 0
--       for (i = 0; i < history_length; i++)
-- 	the_history[i] = the_history[i + 1];
-- #else
-        memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
-- #endif
-  
-        history_base++;
-      }
---- b/297,303 ----
-        /* Copy the rest of the entries, moving down one slot.  Copy includes
-  	 trailing NULL.  */
-        memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *));
-  
-+       new_length = history_length;
-        history_base++;
-      }
-***************
-*** 316,320 ****
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
-  	  the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
-! 	  history_length = 1;
-  	}
-        else
---- b/313,317 ----
-  	    history_size = DEFAULT_HISTORY_INITIAL_SIZE;
-  	  the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *));
-! 	  new_length = 1;
-  	}
-        else
-***************
-*** 326,330 ****
-  		xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
-  	    }
-! 	  history_length++;
-  	}
-      }
---- b/323,327 ----
-  		xrealloc (the_history, history_size * sizeof (HIST_ENTRY *));
-  	    }
-! 	  new_length = history_length + 1;
-  	}
-      }
-***************
-*** 332,337 ****
-    temp = alloc_history_entry ((char *)string, hist_inittime ());
-  
-!   the_history[history_length] = (HIST_ENTRY *)NULL;
-!   the_history[history_length - 1] = temp;
-  }
-  
---- b/329,335 ----
-    temp = alloc_history_entry ((char *)string, hist_inittime ());
-  
-!   the_history[new_length] = (HIST_ENTRY *)NULL;
-!   the_history[new_length - 1] = temp;
-!   history_length = new_length;
-  }
-  
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 8
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-010.patch b/bsp/buildroot/package/bash/bash44-010.patch
deleted file mode 100644
index 8da1ec5b..00000000
--- a/bsp/buildroot/package/bash/bash44-010.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-010
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-010
-
-Bug-Reported-by:	Clark Wang <dearvoid@gmail.com>
-Bug-Reference-ID:	<CADv8-og092RvvUUHy46=BPKChCXw5g=GOOqgN0V3f4a3TpLebQ@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00104.html
-
-Bug-Description:
-
-Depending on compiler optimizations and behavior, the `read' builtin may not
-save partial input when a timeout occurs.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/builtins/read.def	2016-05-16 14:24:56.000000000 -0400
---- b/builtins/read.def	2016-11-25 12:37:56.000000000 -0500
-***************
-*** 182,186 ****
-  {
-    register char *varname;
-!   int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
-    int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
-    int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
---- b/182,187 ----
-  {
-    register char *varname;
-!   int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
-!   volatile int i;
-    int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
-    int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno;
-
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 9
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 10
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-011.patch b/bsp/buildroot/package/bash/bash44-011.patch
deleted file mode 100644
index cca66aad..00000000
--- a/bsp/buildroot/package/bash/bash44-011.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-011
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-011
-
-Bug-Reported-by:	Russell King <rmk@armlinux.org.uk>
-Bug-Reference-ID:	<E1cNnFx-0007G2-S2@flint.armlinux.org.uk>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2017-01/msg00000.html
-
-Bug-Description:
-
-Subshells begun to run command and process substitutions may attempt to
-set the terminal's process group to an incorrect value if they receive
-a fatal signal.  This depends on the behavior of the process that starts
-the shell.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/sig.c	2016-02-11 15:02:45.000000000 -0500
---- b/sig.c	2017-01-04 09:09:47.000000000 -0500
-***************
-*** 586,590 ****
-    if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
-      hangup_all_jobs ();
-!   end_job_control ();
-  #endif /* JOB_CONTROL */
-  
---- b/571,576 ----
-    if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
-      hangup_all_jobs ();
-!   if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0)
-!     end_job_control ();
-  #endif /* JOB_CONTROL */
-  
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 10
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 11
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/bash/bash44-012.patch b/bsp/buildroot/package/bash/bash44-012.patch
deleted file mode 100644
index ef081f91..00000000
--- a/bsp/buildroot/package/bash/bash44-012.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-012
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-			     BASH PATCH REPORT
-			     =================
-
-Bash-Release:	4.4
-Patch-ID:	bash44-012
-
-Bug-Reported-by:	Clark Wang <dearvoid@gmail.com>
-Bug-Reference-ID:	<CADv8-ojttPUFOZXqbjsvy83LfaJtQKZ5qejGdF6j0VJ3vtrYOA@mail.gmail.com>
-Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html
-
-Bug-Description:
-
-When -N is used, the input is not supposed to be split using $IFS, but
-leading and trailing IFS whitespace was still removed.
-
-Patch (apply with `patch -p0'):
-
-*** bash-4.4-patched/subst.c	2017-01-20 14:22:01.000000000 -0500
---- b/subst.c	2017-01-25 13:43:22.000000000 -0500
-***************
-*** 2826,2834 ****
-  /* Parse a single word from STRING, using SEPARATORS to separate fields.
-     ENDPTR is set to the first character after the word.  This is used by
-!    the `read' builtin.  This is never called with SEPARATORS != $IFS;
-!    it should be simplified.
-  
-     XXX - this function is very similar to list_string; they should be
-  	 combined - XXX */
-  char *
-  get_word_from_string (stringp, separators, endptr)
---- b/2826,2838 ----
-  /* Parse a single word from STRING, using SEPARATORS to separate fields.
-     ENDPTR is set to the first character after the word.  This is used by
-!    the `read' builtin.
-!    
-!    This is never called with SEPARATORS != $IFS, and takes advantage of that.
-  
-     XXX - this function is very similar to list_string; they should be
-  	 combined - XXX */
-+ 
-+ #define islocalsep(c)	(local_cmap[(unsigned char)(c)] != 0)
-+ 
-  char *
-  get_word_from_string (stringp, separators, endptr)
-***************
-*** 2838,2841 ****
---- b/2842,2846 ----
-    char *current_word;
-    int sindex, sh_style_split, whitesep, xflags;
-+   unsigned char local_cmap[UCHAR_MAX+1];	/* really only need single-byte chars here */
-    size_t slen;
-  
-***************
-*** 2847,2854 ****
-  				 separators[2] == '\n' &&
-  				 separators[3] == '\0';
-!   for (xflags = 0, s = ifs_value; s && *s; s++)
-      {
-        if (*s == CTLESC) xflags |= SX_NOCTLESC;
-        if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
-      }
-  
---- b/2852,2861 ----
-  				 separators[2] == '\n' &&
-  				 separators[3] == '\0';
-!   memset (local_cmap, '\0', sizeof (local_cmap));
-!   for (xflags = 0, s = separators; s && *s; s++)
-      {
-        if (*s == CTLESC) xflags |= SX_NOCTLESC;
-        if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL;
-+       local_cmap[(unsigned char)*s] = 1;	/* local charmap of separators */
-      }
-  
-***************
-*** 2857,2864 ****
-  
-    /* Remove sequences of whitespace at the beginning of STRING, as
-!      long as those characters appear in IFS. */
-!   if (sh_style_split || !separators || !*separators)
-      {
-!       for (; *s && spctabnl (*s) && isifs (*s); s++);
-  
-        /* If the string is nothing but whitespace, update it and return. */
---- b/2864,2872 ----
-  
-    /* Remove sequences of whitespace at the beginning of STRING, as
-!      long as those characters appear in SEPARATORS.  This happens if
-!      SEPARATORS == $' \t\n' or if IFS is unset. */
-!   if (sh_style_split || separators == 0)
-      {
-!       for (; *s && spctabnl (*s) && islocalsep (*s); s++);
-  
-        /* If the string is nothing but whitespace, update it and return. */
-***************
-*** 2879,2885 ****
-       This obeys the field splitting rules in Posix.2. */
-    sindex = 0;
-!   /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim
-!      unless multibyte chars are possible. */
-!   slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1;
-    current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
-  
---- b/2887,2893 ----
-       This obeys the field splitting rules in Posix.2. */
-    sindex = 0;
-!   /* Don't need string length in ADVANCE_CHAR unless multibyte chars are
-!      possible, but need it in string_extract_verbatim for bounds checking */
-!   slen = STRLEN (s);
-    current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags);
-  
-***************
-*** 2900,2904 ****
-    /* Now skip sequences of space, tab, or newline characters if they are
-       in the list of separators. */
-!   while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
-      sindex++;
-  
---- b/2908,2912 ----
-    /* Now skip sequences of space, tab, or newline characters if they are
-       in the list of separators. */
-!   while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex]))
-      sindex++;
-  
-***************
-*** 2907,2916 ****
-       delimiter, not a separate delimiter that would result in an empty field.
-       Look at POSIX.2, 3.6.5, (3)(b). */
-!   if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex]))
-      {
-        sindex++;
-        /* An IFS character that is not IFS white space, along with any adjacent
-  	 IFS white space, shall delimit a field. */
-!       while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex]))
-  	sindex++;
-      }
---- b/2915,2924 ----
-       delimiter, not a separate delimiter that would result in an empty field.
-       Look at POSIX.2, 3.6.5, (3)(b). */
-!   if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex]))
-      {
-        sindex++;
-        /* An IFS character that is not IFS white space, along with any adjacent
-  	 IFS white space, shall delimit a field. */
-!       while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex]))
-  	sindex++;
-      }
-*** bash-4.4/patchlevel.h	2016-06-22 14:51:03.000000000 -0400
---- b/patchlevel.h	2016-10-01 11:01:28.000000000 -0400
-***************
-*** 26,30 ****
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 11
-  
-  #endif /* _PATCHLEVEL_H_ */
---- b/26,30 ----
-     looks for to find the patch level (for the sccs version string). */
-  
-! #define PATCHLEVEL 12
-  
-  #endif /* _PATCHLEVEL_H_ */
diff --git a/bsp/buildroot/package/batctl/batctl.hash b/bsp/buildroot/package/batctl/batctl.hash
index 5920ff09..257e1ff2 100644
--- a/bsp/buildroot/package/batctl/batctl.hash
+++ b/bsp/buildroot/package/batctl/batctl.hash
@@ -1,4 +1,4 @@
-# http://downloads.open-mesh.org/batman/releases/batman-adv-2016.1/batctl-2016.1.tar.gz.sha1
-sha1 72b974bde707594e2cf0cc122d7d7da0f1f65160 batctl-2016.1.tar.gz
+# From https://downloads.open-mesh.org/batman/releases/batman-adv-2017.0/batctl-2017.0.tar.gz.sha1
+sha1 0fbc329b56b465fa4f674cfecd7348144609f8e5  batctl-2017.0.tar.gz
 # Locally calculated
-sha256 c854397b2ddd2cb8d15d1e65839819380648ccb37507d0303e133011fe6f03c9  batctl-2016.1.tar.gz
+sha256 c0bb1127d6070b46abeb8d6a63d1150d71fa85f87f9a846873b649a21934c686  batctl-2017.0.tar.gz
diff --git a/bsp/buildroot/package/batctl/batctl.mk b/bsp/buildroot/package/batctl/batctl.mk
index ed1b06ca..122263e4 100644
--- a/bsp/buildroot/package/batctl/batctl.mk
+++ b/bsp/buildroot/package/batctl/batctl.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-BATCTL_VERSION = 2016.1
+BATCTL_VERSION = 2017.0
 BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION)
-BATCTL_LICENSE = GPLv2
+BATCTL_LICENSE = GPL-2.0
 BATCTL_DEPENDENCIES = libnl host-pkgconf
 
 define BATCTL_BUILD_CMDS
diff --git a/bsp/buildroot/package/batman-adv/Config.in b/bsp/buildroot/package/batman-adv/Config.in
index fbef0d8d..9d3d7967 100644
--- a/bsp/buildroot/package/batman-adv/Config.in
+++ b/bsp/buildroot/package/batman-adv/Config.in
@@ -28,7 +28,8 @@ config BR2_PACKAGE_BATMAN_ADV_BATMAN_V
 	bool "enable B.A.T.M.A.N. V protocol (experimental)"
 	help
 	  Enables B.A.T.M.A.N. V network protocol.
-	  This is the next-gen protocol and is experimental at this time.
+	  This is the next-gen protocol and is experimental at this
+	  time.
 
 	  https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V
 
diff --git a/bsp/buildroot/package/batman-adv/batman-adv.hash b/bsp/buildroot/package/batman-adv/batman-adv.hash
index 6c0e5cac..0599b919 100644
--- a/bsp/buildroot/package/batman-adv/batman-adv.hash
+++ b/bsp/buildroot/package/batman-adv/batman-adv.hash
@@ -1,2 +1,3 @@
-# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2016.1.tar.gz.sha1
-sha1 c9ca52c913fbf81aca266695a77359ecdbcc8bd8 batman-adv-2016.1.tar.gz
+# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.0.1.tar.gz.{md5,sha1}
+md5  ce14f7f1bbc037691bbbc611e16f0360         batman-adv-2017.0.1.tar.gz
+sha1 593cecc015b876caa5b21fbb4d0f6186742a1abb batman-adv-2017.0.1.tar.gz
diff --git a/bsp/buildroot/package/batman-adv/batman-adv.mk b/bsp/buildroot/package/batman-adv/batman-adv.mk
index 256781f0..51799186 100644
--- a/bsp/buildroot/package/batman-adv/batman-adv.mk
+++ b/bsp/buildroot/package/batman-adv/batman-adv.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-BATMAN_ADV_VERSION = 2016.1
+BATMAN_ADV_VERSION = 2017.0.1
 BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv
-BATMAN_ADV_LICENSE = GPLv2
+BATMAN_ADV_LICENSE = GPL-2.0
 
 # Bridge Loop Avoidance, Distributed Arp Table are always enabled
 BATMAN_ADV_CFLAGS = \
diff --git a/bsp/buildroot/package/bc/Config.in b/bsp/buildroot/package/bc/Config.in
index a28978d2..54c4422f 100644
--- a/bsp/buildroot/package/bc/Config.in
+++ b/bsp/buildroot/package/bc/Config.in
@@ -6,9 +6,10 @@ config BR2_PACKAGE_BC
 	  areas. It supports interactive execution of statements. 'Bc'
 	  is a utility included in the POSIX P1003.2/D11 draft standard.
 	  This version does not use the historical method of having bc
-	  be a compiler for the dc calculator (the POSIX document doesn't
-	  specify how bc must be implemented). This version has a single
-	  executable that both compiles the language and runs the resulting
-	  'byte code.' The byte code is not the dc language.
+	  be a compiler for the dc calculator (the POSIX document
+	  doesn't specify how bc must be implemented).
+	  This version has a single executable that both compiles the
+	  language and runs the resulting 'byte code.' The byte code is
+	  not the dc language.
 
 	  http://www.gnu.org/software/bc
diff --git a/bsp/buildroot/package/bc/bc.mk b/bsp/buildroot/package/bc/bc.mk
index 8f3e08dd..a6446cef 100644
--- a/bsp/buildroot/package/bc/bc.mk
+++ b/bsp/buildroot/package/bc/bc.mk
@@ -8,7 +8,7 @@ BC_VERSION = 1.06.95
 BC_SOURCE = bc-$(BC_VERSION).tar.bz2
 BC_SITE = http://alpha.gnu.org/gnu/bc
 BC_DEPENDENCIES = host-flex
-BC_LICENSE = GPLv2+, LGPLv2.1+
+BC_LICENSE = GPL-2.0+, LGPL-2.1+
 BC_LICENSE_FILES = COPYING COPYING.LIB
 
 # Build after busybox so target ends up with bc's "dc" version
diff --git a/bsp/buildroot/package/bcache-tools/Config.in b/bsp/buildroot/package/bcache-tools/Config.in
index 7e6319bc..c8e3f6d1 100644
--- a/bsp/buildroot/package/bcache-tools/Config.in
+++ b/bsp/buildroot/package/bcache-tools/Config.in
@@ -7,13 +7,14 @@ config BR2_PACKAGE_BCACHE_TOOLS
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	help
 	  Bcache is a Linux kernel block layer cache. It allows one or
-	  more fast disk drives such as flash-based solid state drives (SSDs)
-	  to act as a cache for one or more slower hard disk drives.
+	  more fast disk drives such as flash-based solid state drives
+	  (SSDs) to act as a cache for one or more slower hard disk
+	  drives.
 
 	  http://bcache.evilpiepirate.org/
 
-	  This is the user space bcache tools, required to setup the linux
-	  bcache feature of the Linux kernel.
+	  This is the user space bcache tools, required to setup the
+	  linux bcache feature of the Linux kernel.
 
 comment "bcache-tools needs udev /dev management"
 	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/bcache-tools/bcache-tools.mk b/bsp/buildroot/package/bcache-tools/bcache-tools.mk
index 09604f6b..0e7a2821 100644
--- a/bsp/buildroot/package/bcache-tools/bcache-tools.mk
+++ b/bsp/buildroot/package/bcache-tools/bcache-tools.mk
@@ -6,7 +6,7 @@
 
 BCACHE_TOOLS_VERSION = v1.0.8
 BCACHE_TOOLS_SITE = $(call github,g2p,bcache-tools,$(BCACHE_TOOLS_VERSION))
-BCACHE_TOOLS_LICENSE = GPLv2
+BCACHE_TOOLS_LICENSE = GPL-2.0
 BCACHE_TOOLS_LICENSE_FILES = COPYING
 BCACHE_TOOLS_DEPENDENCIES = host-pkgconf util-linux
 
diff --git a/bsp/buildroot/package/bcg729/Config.in b/bsp/buildroot/package/bcg729/Config.in
new file mode 100644
index 00000000..8e9bcfe6
--- /dev/null
+++ b/bsp/buildroot/package/bcg729/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_BCG729
+	bool "bcg729"
+	help
+	  Bcg729 is an opensource implementation of both encoder and
+	  decoder of the ITU G729 Annex A/B speech codec.
+
+	  http://www.linphone.org/technical-corner/bcg729/overview
diff --git a/bsp/buildroot/package/bcg729/bcg729.hash b/bsp/buildroot/package/bcg729/bcg729.hash
new file mode 100644
index 00000000..4dbfbbbb
--- /dev/null
+++ b/bsp/buildroot/package/bcg729/bcg729.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 94b3542a06cbd96306efc19f959f9febae62806a22599063f82a8c33e989d48b  bcg729-1.0.4.tar.gz
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/bsp/buildroot/package/bcg729/bcg729.mk b/bsp/buildroot/package/bcg729/bcg729.mk
new file mode 100644
index 00000000..426cfd90
--- /dev/null
+++ b/bsp/buildroot/package/bcg729/bcg729.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# bcg729
+#
+################################################################################
+
+BCG729_VERSION = 1.0.4
+BCG729_SITE = $(call github,BelledonneCommunications,bcg729,$(BCG729_VERSION))
+BCG729_LICENSE = GPL-2.0+
+BCG729_LICENSE_FILES = COPYING
+BCG729_INSTALL_STAGING = YES
+
+ifeq ($(BR2_STATIC_LIBS),y)
+BCG729_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+BCG729_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+BCG729_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/bcm2835/bcm2835.mk b/bsp/buildroot/package/bcm2835/bcm2835.mk
index c111a0ad..e24c819c 100644
--- a/bsp/buildroot/package/bcm2835/bcm2835.mk
+++ b/bsp/buildroot/package/bcm2835/bcm2835.mk
@@ -6,7 +6,7 @@
 
 BCM2835_VERSION = 1.48
 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835
-BCM2835_LICENSE = GPLv2
+BCM2835_LICENSE = GPL-2.0
 BCM2835_LICENSE_FILES = COPYING
 BCM2835_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/bctoolbox/Config.in b/bsp/buildroot/package/bctoolbox/Config.in
index e9e69205..048d0128 100644
--- a/bsp/buildroot/package/bctoolbox/Config.in
+++ b/bsp/buildroot/package/bctoolbox/Config.in
@@ -6,8 +6,7 @@ config BR2_PACKAGE_BCTOOLBOX
 	  Utilities library used by Belledonne Communications
 	  softwares like belle-sip, mediastreamer2 and linphone.
 
-	  Select BR2_PACKAGE_MBEDTLS (preferred) or
-	  BR2_PACKAGE_POLARSSL for crypto support.
+	  Select BR2_PACKAGE_MBEDTLS for crypto support.
 
 	  https://github.com/BelledonneCommunications/bctoolbox
 
diff --git a/bsp/buildroot/package/bctoolbox/bctoolbox.mk b/bsp/buildroot/package/bctoolbox/bctoolbox.mk
index 78269751..281a0bf2 100644
--- a/bsp/buildroot/package/bctoolbox/bctoolbox.mk
+++ b/bsp/buildroot/package/bctoolbox/bctoolbox.mk
@@ -6,21 +6,20 @@
 
 BCTOOLBOX_VERSION = 0.4.0
 BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
-BCTOOLBOX_LICENSE = GPLv2+
+BCTOOLBOX_LICENSE = GPL-2.0+
 BCTOOLBOX_LICENSE_FILES = COPYING
 BCTOOLBOX_INSTALL_STAGING = YES
 
 # Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to
 # shared library.
 BCTOOLBOX_CONF_OPTS = \
+	-DENABLE_POLARSSL=OFF \
 	-DENABLE_STRICT=OFF \
 	-DENABLE_TESTS_COMPONENT=OFF \
 	-DENABLE_TESTS=OFF \
 	-DGIT_EXECUTABLE=OFF \
 	-DCMAKE_SKIP_RPATH=ON
 
-# bctoolbox can be build with mbedTLS or PolarSSL support. If both
-# libraries are present, mbedTLS is preferred over PolarSSL.
 ifeq ($(BR2_PACKAGE_MBEDTLS),y)
 BCTOOLBOX_DEPENDENCIES += mbedtls
 BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
@@ -28,13 +27,6 @@ else
 BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_POLARSSL),y)
-BCTOOLBOX_DEPENDENCIES += polarssl
-BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=ON
-else
-BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=OFF
-endif
-
 ifeq ($(BR2_STATIC_LIBS),y)
 BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON
 else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/bcusdk/bcusdk.mk b/bsp/buildroot/package/bcusdk/bcusdk.mk
index 697b5ce2..ff5becd8 100644
--- a/bsp/buildroot/package/bcusdk/bcusdk.mk
+++ b/bsp/buildroot/package/bcusdk/bcusdk.mk
@@ -7,13 +7,14 @@
 BCUSDK_VERSION = 0.0.5
 BCUSDK_SOURCE = bcusdk_$(BCUSDK_VERSION).tar.gz
 BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib
-BCUSDK_LICENSE = GPLv2+
+BCUSDK_LICENSE = GPL-2.0+
 BCUSDK_LICENSE_FILES = COPYING
 BCUSDK_INSTALL_STAGING = YES
 BCUSDK_CONF_OPTS = \
 	--enable-onlyeibd \
 	--enable-ft12 \
 	--enable-pei16 \
+	--enable-tpuarts \
 	--enable-eibnetip \
 	--enable-eibnetipserver \
 	--enable-eibnetiptunnel \
@@ -24,7 +25,6 @@ BCUSDK_DEPENDENCIES = \
 	libpthsem \
 	$(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
 
-
 define BCUSDK_REMOVE_EXAMPLES
 	$(RM) -rf $(TARGET_DIR)/usr/share/bcusdk
 endef
diff --git a/bsp/buildroot/package/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch b/bsp/buildroot/package/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch
deleted file mode 100644
index 40c90631..00000000
--- a/bsp/buildroot/package/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c887470e0e3310c81ecdb7e736bc5d2ead45db2a Mon Sep 17 00:00:00 2001
-From: Ivan Maidanski <ivmai@mail.ru>
-Date: Mon, 6 Apr 2015 20:06:47 +0300
-Subject: [PATCH 1/1] Do not include sigcontext.h and asm/sigcontext.h (these
- Linux headers define sigcontext which is no longer used as replaced with
- ucontext_t in GC 7.0alpha1)
-
-* os_dep.c: Do not include linux/version.h (do not test
-LINUX_VERSION_CODE), asm/signal.h, sigcontext.h, asm/sigcontext.h
-since struct sigcontext not used in GC v7+.
-
-Signed-off-by: Brendan Heading <brendanheading@gmail.com>
-Upstream-status: backport
----
- os_dep.c | 30 ------------------------------
- 1 file changed, 30 deletions(-)
-
-diff --git a/os_dep.c b/os_dep.c
-index f62d4ed..a1bafbd 100644
---- a/os_dep.c
-+++ b/os_dep.c
-@@ -16,36 +16,6 @@
- 
- #include "private/gc_priv.h"
- 
--#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H)
--# include <linux/version.h>
--# if (LINUX_VERSION_CODE <= 0x10400)
--    /* Ugly hack to get struct sigcontext_struct definition.  Required  */
--    /* for some early 1.3.X releases.  Will hopefully go away soon.     */
--    /* in some later Linux releases, asm/sigcontext.h may have to       */
--    /* be included instead.                                             */
--#   define __KERNEL__
--#   include <asm/signal.h>
--#   undef __KERNEL__
--# else
--    /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */
--    /* struct sigcontext.  libc6 (glibc2) uses "struct sigcontext" in     */
--    /* prototypes, so we have to include the top-level sigcontext.h to    */
--    /* make sure the former gets defined to be the latter if appropriate. */
--#   include <features.h>
--#   if 2 <= __GLIBC__
--#     if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
--        /* glibc 2.1 no longer has sigcontext.h.  But signal.h          */
--        /* has the right declaration for glibc 2.1.                     */
--#       include <sigcontext.h>
--#     endif /* 0 == __GLIBC_MINOR__ */
--#   else /* __GLIBC__ < 2 */
--      /* libc5 doesn't have <sigcontext.h>: go directly with the kernel   */
--      /* one.  Check LINUX_VERSION_CODE to see which we should reference. */
--#     include <asm/sigcontext.h>
--#   endif /* __GLIBC__ < 2 */
--# endif
--#endif /* LINUX && !POWERPC */
--
- #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \
-     && !defined(MSWINCE) && !defined(__CC_ARM)
- # include <sys/types.h>
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/bdwgc/0002-Fix-size-of-tv-is-unknown-error-in-brief_async_signa.patch b/bsp/buildroot/package/bdwgc/0002-Fix-size-of-tv-is-unknown-error-in-brief_async_signa.patch
new file mode 100644
index 00000000..e17ed846
--- /dev/null
+++ b/bsp/buildroot/package/bdwgc/0002-Fix-size-of-tv-is-unknown-error-in-brief_async_signa.patch
@@ -0,0 +1,35 @@
+From 31eef02317d59b4d204624efbddaea641e861390 Mon Sep 17 00:00:00 2001
+From: Mikael Djurfeldt <mikael@djurfeldt.com>
+Date: Sun, 26 Feb 2017 20:09:56 +0100
+Subject: [PATCH] Fix 'size of tv is unknown' error in
+ brief_async_signal_safe_sleep (musl) (fix commits 62097c3, 9f48082)
+
+Include <sys/time.h> to get struct timeval defined and select() declared.
+
+* pthread_stop_world.c [GC_ENABLE_SUSPEND_THREAD]: Include sys/time.h
+before GC_brief_async_signal_safe_sleep definition.
+
+Upstream status: upstream
+commit ffad61d3bbe86c09ffe062dab393fcb0e4940580
+
+[Romain: backported to 7.6.0]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ pthread_stop_world.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pthread_stop_world.c b/pthread_stop_world.c
+index dad1fdc..8c76944 100644
+--- a/pthread_stop_world.c
++++ b/pthread_stop_world.c
+@@ -391,6 +391,7 @@ STATIC void GC_restart_handler(int sig)
+ #   ifndef GC_TIME_LIMIT
+ #     define GC_TIME_LIMIT 50
+ #   endif
++#   include <sys/time.h>
+ 
+     STATIC void GC_brief_async_signal_safe_sleep(void)
+     {
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch b/bsp/buildroot/package/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch
deleted file mode 100644
index 03af6a39..00000000
--- a/bsp/buildroot/package/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch
+++ /dev/null
@@ -1,424 +0,0 @@
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-From 5e756d4d8df2949cb3b6e51532d3016cbb276fd7 Mon Sep 17 00:00:00 2001
-From: Ivan Maidanski <ivmai@mail.ru>
-Date: Fri, 27 Feb 2015 21:32:22 +0300
-Subject: [PATCH 004/135] Revert "Move asm machine-dependent files to 'src'
- folder" (partly)
-
-Asm files moved back to base folder to avoid build issues (reported
-for NetBSD and Solaris on Sparc).  Alternative way is to adjust
-configure.ac and Makefile.am properly but it requires more efforts
-(including testing).
-
-* Makefile.am (EXTRA_libgc_la_SOURCES): Remove "src/" prefix.
-* Makefile.direct (SRCS, mach_dep.o): Likewise.
-* src/ia64_save_regs_in_stack.s: Move to base folder.
-* src/sparc_mach_dep.S: Likewise.
-* src/sparc_netbsd_mach_dep.s: Likewise.
-* src/sparc_sunos4_mach_dep.s: Likewise.
-
----
- Makefile.am                   |    4 +--
- Makefile.direct               |   20 +++++++-------
- ia64_save_regs_in_stack.s     |   11 ++++++++
- sparc_mach_dep.S              |   61 +++++++++++++++++++++++++++++++++++++++++
- sparc_netbsd_mach_dep.s       |   34 +++++++++++++++++++++++
- sparc_sunos4_mach_dep.s       |   32 +++++++++++++++++++++
- src/ia64_save_regs_in_stack.s |   11 --------
- src/sparc_mach_dep.S          |   61 -----------------------------------------
- src/sparc_netbsd_mach_dep.s   |   34 -----------------------
- src/sparc_sunos4_mach_dep.s   |   32 ---------------------
- 11 files changed, 151 insertions(+), 151 deletions(-)
- create mode 100644 ia64_save_regs_in_stack.s
- create mode 100644 sparc_mach_dep.S
- create mode 100644 sparc_netbsd_mach_dep.s
- create mode 100644 sparc_sunos4_mach_dep.s
- delete mode 100644 src/ia64_save_regs_in_stack.s
- delete mode 100644 src/sparc_mach_dep.S
- delete mode 100644 src/sparc_netbsd_mach_dep.s
- delete mode 100644 src/sparc_sunos4_mach_dep.s
-
-diff --git a/Makefile.am b/Makefile.am
-index f8057db..1688be2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -100,8 +100,8 @@ libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS)
- libgc_la_DEPENDENCIES = @addobjs@
- libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined
- 
--EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
--    src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s
-+EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \
-+    sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s
- 
- 
- # C++ Interface
-diff --git a/Makefile.direct b/Makefile.direct
-index d64598b..8ab80e8 100644
---- a/Makefile.direct
-+++ b/Makefile.direct
-@@ -108,8 +108,8 @@ SRCS= $(CSRCS) \
-   include/gc_config_macros.h include/private/pthread_support.h \
-   include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
-   include/private/darwin_stop_world.h include/private/thread_local_alloc.h \
--  src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
--  src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS)
-+  ia64_save_regs_in_stack.s sparc_mach_dep.S \
-+  sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s $(CORD_SRCS)
- 
- DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.OS2 \
-   doc/README.amiga doc/README.cords doc/debugging.html \
-@@ -309,17 +309,17 @@ dyn_test:
- # 	gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo
- #	touch liblinuxgc.so
- 
--mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/src/sparc_mach_dep.S \
--	    $(srcdir)/src/sparc_sunos4_mach_dep.s \
--	    $(srcdir)/src/ia64_save_regs_in_stack.s \
--	    $(srcdir)/src/sparc_netbsd_mach_dep.s $(UTILS)
-+mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/sparc_mach_dep.S \
-+	    $(srcdir)/sparc_sunos4_mach_dep.s \
-+	    $(srcdir)/ia64_save_regs_in_stack.s \
-+	    $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS)
- 	rm -f mach_dep.o
--	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/src/sparc_mach_dep.S
--	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_sunos4_mach_dep.s
--	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_netbsd_mach_dep.s
-+	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
-+	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
-+	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
- 	./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
--	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/src/ia64_save_regs_in_stack.s
-+	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
- 	./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o
- 	./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
-diff --git a/ia64_save_regs_in_stack.s b/ia64_save_regs_in_stack.s
-new file mode 100644
-index 0000000..2b81edf
---- /dev/null
-+++ b/ia64_save_regs_in_stack.s
-@@ -0,0 +1,11 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .body
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-diff --git a/sparc_mach_dep.S b/sparc_mach_dep.S
-new file mode 100644
-index 0000000..d204dc4
---- /dev/null
-+++ b/sparc_mach_dep.S
-@@ -0,0 +1,61 @@
-+!	SPARCompiler 3.0 and later apparently no longer handles
-+!	asm outside functions.  So we need a separate .s file
-+!	This is only set up for SunOS 5, not SunOS 4.
-+!	Assumes this is called before the stack contents are
-+!	examined.
-+
-+	.seg 	"text"
-+	.globl	GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+#if defined(__arch64__) || defined(__sparcv9)
-+	save	%sp,-128,%sp
-+	flushw
-+	ret
-+	  restore %sp,2047+128,%o0
-+#else /* 32 bit SPARC */
-+	ta	0x3   ! ST_FLUSH_WINDOWS
-+	mov	%sp,%o0
-+	retl
-+	nop
-+#endif /* 32 bit SPARC */
-+.GC_save_regs_in_stack_end:
-+	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack
-+
-+! GC_clear_stack_inner(arg, limit) clears stack area up to limit and
-+! returns arg.  Stack clearing is crucial on SPARC, so we supply
-+! an assembly version that s more careful.  Assumes limit is hotter
-+! than sp, and limit is 8 byte aligned.
-+	.globl	GC_clear_stack_inner
-+GC_clear_stack_inner:
-+#if defined(__arch64__) || defined(__sparcv9)
-+	mov %sp,%o2		! Save sp
-+	add %sp,2047-8,%o3	! p = sp+bias-8
-+	add %o1,-2047-192,%sp	! Move sp out of the way,
-+  				! so that traps still work.
-+  				! Includes some extra words
-+  				! so we can be sloppy below.
-+loop:
-+	stx %g0,[%o3]		! *(long *)p = 0
-+	cmp %o3,%o1
-+	bgu,pt %xcc, loop	! if (p > limit) goto loop
-+          add %o3,-8,%o3	! p -= 8 (delay slot)
-+	retl
-+    	  mov %o2,%sp		! Restore sp., delay slot
-+#else  /* 32 bit SPARC */
-+	mov	%sp,%o2		! Save sp
-+	add	%sp,-8,%o3	! p = sp-8
-+	clr	%g1		! [g0,g1] = 0
-+	add	%o1,-0x60,%sp	! Move sp out of the way,
-+				! so that traps still work.
-+				! Includes some extra words
-+				! so we can be sloppy below.
-+loop:
-+	std	%g0,[%o3]	! *(long long *)p = 0
-+	cmp	%o3,%o1
-+	bgu	loop		! if (p > limit) goto loop
-+	  add	%o3,-8,%o3	! p -= 8 (delay slot)
-+	retl
-+	  mov	%o2,%sp		! Restore sp., delay slot
-+#endif  /* 32 bit SPARC */
-+.GC_clear_stack_inner_end:
-+      	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner
-diff --git a/sparc_netbsd_mach_dep.s b/sparc_netbsd_mach_dep.s
-new file mode 100644
-index 0000000..14feb15
---- /dev/null
-+++ b/sparc_netbsd_mach_dep.s
-@@ -0,0 +1,34 @@
-+!	SPARCompiler 3.0 and later apparently no longer handles
-+!	asm outside functions.  So we need a separate .s file
-+!	This is only set up for SunOS 4.
-+!	Assumes this is called before the stack contents are
-+!	examined.
-+
-+#include "machine/asm.h"
-+
-+	.seg 	"text"
-+	.globl	_C_LABEL(GC_save_regs_in_stack)
-+	.globl 	_C_LABEL(GC_push_regs)
-+_C_LABEL(GC_save_regs_in_stack):
-+_C_LABEL(GC_push_regs):
-+	ta	0x3   ! ST_FLUSH_WINDOWS
-+	mov	%sp,%o0
-+	retl
-+	nop
-+
-+	.globl	_C_LABEL(GC_clear_stack_inner)
-+_C_LABEL(GC_clear_stack_inner):
-+	mov	%sp,%o2		! Save sp
-+	add	%sp,-8,%o3	! p = sp-8
-+	clr	%g1		! [g0,g1] = 0
-+	add	%o1,-0x60,%sp	! Move sp out of the way,
-+				! so that traps still work.
-+				! Includes some extra words
-+				! so we can be sloppy below.
-+loop:
-+	std	%g0,[%o3]	! *(long long *)p = 0
-+	cmp	%o3,%o1
-+	bgu	loop		! if (p > limit) goto loop
-+	add	%o3,-8,%o3	! p -= 8 (delay slot)
-+	retl
-+	mov	%o2,%sp		! Restore sp., delay slot
-diff --git a/sparc_sunos4_mach_dep.s b/sparc_sunos4_mach_dep.s
-new file mode 100644
-index 0000000..923f5ea
---- /dev/null
-+++ b/sparc_sunos4_mach_dep.s
-@@ -0,0 +1,32 @@
-+!	SPARCompiler 3.0 and later apparently no longer handles
-+!	asm outside functions.  So we need a separate .s file
-+!	This is only set up for SunOS 4.
-+!	Assumes this is called before the stack contents are
-+!	examined.
-+
-+	.seg 	"text"
-+	.globl	_GC_save_regs_in_stack
-+	.globl 	_GC_push_regs
-+_GC_save_regs_in_stack:
-+_GC_push_regs:
-+	ta	0x3   ! ST_FLUSH_WINDOWS
-+	mov	%sp,%o0
-+	retl
-+	nop
-+
-+	.globl	_GC_clear_stack_inner
-+_GC_clear_stack_inner:
-+	mov	%sp,%o2		! Save sp
-+	add	%sp,-8,%o3	! p = sp-8
-+	clr	%g1		! [g0,g1] = 0
-+	add	%o1,-0x60,%sp	! Move sp out of the way,
-+				! so that traps still work.
-+				! Includes some extra words
-+				! so we can be sloppy below.
-+loop:
-+	std	%g0,[%o3]	! *(long long *)p = 0
-+	cmp	%o3,%o1
-+	bgu	loop		! if (p > limit) goto loop
-+	  add	%o3,-8,%o3	! p -= 8 (delay slot)
-+	retl
-+	  mov	%o2,%sp		! Restore sp., delay slot
-diff --git a/src/ia64_save_regs_in_stack.s b/src/ia64_save_regs_in_stack.s
-deleted file mode 100644
-index 2b81edf..0000000
---- a/src/ia64_save_regs_in_stack.s
-+++ /dev/null
-@@ -1,11 +0,0 @@
--        .text
--        .align 16
--        .global GC_save_regs_in_stack
--        .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
--        .body
--        flushrs
--        ;;
--        mov r8=ar.bsp
--        br.ret.sptk.few rp
--        .endp GC_save_regs_in_stack
-diff --git a/src/sparc_mach_dep.S b/src/sparc_mach_dep.S
-deleted file mode 100644
-index d204dc4..0000000
---- a/src/sparc_mach_dep.S
-+++ /dev/null
-@@ -1,61 +0,0 @@
--!	SPARCompiler 3.0 and later apparently no longer handles
--!	asm outside functions.  So we need a separate .s file
--!	This is only set up for SunOS 5, not SunOS 4.
--!	Assumes this is called before the stack contents are
--!	examined.
--
--	.seg 	"text"
--	.globl	GC_save_regs_in_stack
--GC_save_regs_in_stack:
--#if defined(__arch64__) || defined(__sparcv9)
--	save	%sp,-128,%sp
--	flushw
--	ret
--	  restore %sp,2047+128,%o0
--#else /* 32 bit SPARC */
--	ta	0x3   ! ST_FLUSH_WINDOWS
--	mov	%sp,%o0
--	retl
--	nop
--#endif /* 32 bit SPARC */
--.GC_save_regs_in_stack_end:
--	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack
--
--! GC_clear_stack_inner(arg, limit) clears stack area up to limit and
--! returns arg.  Stack clearing is crucial on SPARC, so we supply
--! an assembly version that s more careful.  Assumes limit is hotter
--! than sp, and limit is 8 byte aligned.
--	.globl	GC_clear_stack_inner
--GC_clear_stack_inner:
--#if defined(__arch64__) || defined(__sparcv9)
--	mov %sp,%o2		! Save sp
--	add %sp,2047-8,%o3	! p = sp+bias-8
--	add %o1,-2047-192,%sp	! Move sp out of the way,
--  				! so that traps still work.
--  				! Includes some extra words
--  				! so we can be sloppy below.
--loop:
--	stx %g0,[%o3]		! *(long *)p = 0
--	cmp %o3,%o1
--	bgu,pt %xcc, loop	! if (p > limit) goto loop
--          add %o3,-8,%o3	! p -= 8 (delay slot)
--	retl
--    	  mov %o2,%sp		! Restore sp., delay slot
--#else  /* 32 bit SPARC */
--	mov	%sp,%o2		! Save sp
--	add	%sp,-8,%o3	! p = sp-8
--	clr	%g1		! [g0,g1] = 0
--	add	%o1,-0x60,%sp	! Move sp out of the way,
--				! so that traps still work.
--				! Includes some extra words
--				! so we can be sloppy below.
--loop:
--	std	%g0,[%o3]	! *(long long *)p = 0
--	cmp	%o3,%o1
--	bgu	loop		! if (p > limit) goto loop
--	  add	%o3,-8,%o3	! p -= 8 (delay slot)
--	retl
--	  mov	%o2,%sp		! Restore sp., delay slot
--#endif  /* 32 bit SPARC */
--.GC_clear_stack_inner_end:
--      	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner
-diff --git a/src/sparc_netbsd_mach_dep.s b/src/sparc_netbsd_mach_dep.s
-deleted file mode 100644
-index 14feb15..0000000
---- a/src/sparc_netbsd_mach_dep.s
-+++ /dev/null
-@@ -1,34 +0,0 @@
--!	SPARCompiler 3.0 and later apparently no longer handles
--!	asm outside functions.  So we need a separate .s file
--!	This is only set up for SunOS 4.
--!	Assumes this is called before the stack contents are
--!	examined.
--
--#include "machine/asm.h"
--
--	.seg 	"text"
--	.globl	_C_LABEL(GC_save_regs_in_stack)
--	.globl 	_C_LABEL(GC_push_regs)
--_C_LABEL(GC_save_regs_in_stack):
--_C_LABEL(GC_push_regs):
--	ta	0x3   ! ST_FLUSH_WINDOWS
--	mov	%sp,%o0
--	retl
--	nop
--
--	.globl	_C_LABEL(GC_clear_stack_inner)
--_C_LABEL(GC_clear_stack_inner):
--	mov	%sp,%o2		! Save sp
--	add	%sp,-8,%o3	! p = sp-8
--	clr	%g1		! [g0,g1] = 0
--	add	%o1,-0x60,%sp	! Move sp out of the way,
--				! so that traps still work.
--				! Includes some extra words
--				! so we can be sloppy below.
--loop:
--	std	%g0,[%o3]	! *(long long *)p = 0
--	cmp	%o3,%o1
--	bgu	loop		! if (p > limit) goto loop
--	add	%o3,-8,%o3	! p -= 8 (delay slot)
--	retl
--	mov	%o2,%sp		! Restore sp., delay slot
-diff --git a/src/sparc_sunos4_mach_dep.s b/src/sparc_sunos4_mach_dep.s
-deleted file mode 100644
-index 923f5ea..0000000
---- a/src/sparc_sunos4_mach_dep.s
-+++ /dev/null
-@@ -1,32 +0,0 @@
--!	SPARCompiler 3.0 and later apparently no longer handles
--!	asm outside functions.  So we need a separate .s file
--!	This is only set up for SunOS 4.
--!	Assumes this is called before the stack contents are
--!	examined.
--
--	.seg 	"text"
--	.globl	_GC_save_regs_in_stack
--	.globl 	_GC_push_regs
--_GC_save_regs_in_stack:
--_GC_push_regs:
--	ta	0x3   ! ST_FLUSH_WINDOWS
--	mov	%sp,%o0
--	retl
--	nop
--
--	.globl	_GC_clear_stack_inner
--_GC_clear_stack_inner:
--	mov	%sp,%o2		! Save sp
--	add	%sp,-8,%o3	! p = sp-8
--	clr	%g1		! [g0,g1] = 0
--	add	%o1,-0x60,%sp	! Move sp out of the way,
--				! so that traps still work.
--				! Includes some extra words
--				! so we can be sloppy below.
--loop:
--	std	%g0,[%o3]	! *(long long *)p = 0
--	cmp	%o3,%o1
--	bgu	loop		! if (p > limit) goto loop
--	  add	%o3,-8,%o3	! p -= 8 (delay slot)
--	retl
--	  mov	%o2,%sp		! Restore sp., delay slot
--- 
-1.7.10.4
-
diff --git a/bsp/buildroot/package/bdwgc/0004-configure-match-uclinux-pattern.patch b/bsp/buildroot/package/bdwgc/0004-configure-match-uclinux-pattern.patch
deleted file mode 100644
index 78bad1c5..00000000
--- a/bsp/buildroot/package/bdwgc/0004-configure-match-uclinux-pattern.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f8ecc7fb09adf34a23d324f373e667c81311fc1c Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 6 Aug 2016 23:24:35 +0200
-Subject: [PATCH] configure: match uclinux pattern
-
-bdwgc does not recognize "uclinux" as a valid OS part of the target
-tuple which is used by some arm cortex-M toolchains.
-
-Fixes:
-http://autobuild.buildroot.net/results/94f/94fbc1e5afe183e5b071d1e869b2d780025389e2
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index b1ce2b2..a69d101 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -186,7 +186,7 @@ case "$THREADS" in
-         AC_DEFINE(THREAD_LOCAL_ALLOC)
-         AC_MSG_WARN("Explicit GC_INIT() calls may be required.");
-         ;;
--     *-*-linux*)
-+     *-*-*linux*)
-         AC_DEFINE(GC_LINUX_THREADS)
-         AC_DEFINE(_REENTRANT)
-         ;;
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/bdwgc/bdwgc.hash b/bsp/buildroot/package/bdwgc/bdwgc.hash
index 44414e4e..0ebc41c7 100644
--- a/bsp/buildroot/package/bdwgc/bdwgc.hash
+++ b/bsp/buildroot/package/bdwgc/bdwgc.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256	63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2	gc-7.4.2.tar.gz
+sha256 bd112005563d787675163b5afff02c364fc8deb13a99c03f4e80fdf6608ad41e  gc-7.6.2.tar.gz
+sha256 9944acfcee6cca308d974933977c1608804f5ad4345aac7cb8608137104e3742  README.QUICK
diff --git a/bsp/buildroot/package/bdwgc/bdwgc.mk b/bsp/buildroot/package/bdwgc/bdwgc.mk
index 0e9054df..5603df8d 100644
--- a/bsp/buildroot/package/bdwgc/bdwgc.mk
+++ b/bsp/buildroot/package/bdwgc/bdwgc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BDWGC_VERSION = 7.4.2
+BDWGC_VERSION = 7.6.2
 BDWGC_SOURCE = gc-$(BDWGC_VERSION).tar.gz
 BDWGC_SITE = http://www.hboehm.info/gc/gc_source
 BDWGC_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/beecrypt/0003-build-system.patch b/bsp/buildroot/package/beecrypt/0002-build-system.patch
similarity index 100%
rename from bsp/buildroot/package/beecrypt/0003-build-system.patch
rename to bsp/buildroot/package/beecrypt/0002-build-system.patch
diff --git a/bsp/buildroot/package/beecrypt/0002-icu-check-cross-compile.patch b/bsp/buildroot/package/beecrypt/0002-icu-check-cross-compile.patch
deleted file mode 100644
index cc021165..00000000
--- a/bsp/buildroot/package/beecrypt/0002-icu-check-cross-compile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-configure: Use AC_COMPILE_IFELSE for ICU check for cross compilation compat
-
-AC_RUN_IFELSE doesn't work when cross compiling, but we can do the
-check in the preprocessor instead, so use AC_COMPILE_IFELSE instead.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure.ac |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: beecrypt-4.2.1/configure.ac
-===================================================================
---- beecrypt-4.2.1.orig/configure.ac
-+++ beecrypt-4.2.1/configure.ac
-@@ -295,13 +295,13 @@
- if test "$ac_with_cplusplus" = yes; then
-   AC_MSG_CHECKING([for IBM's ICU library version >= 2.8])
-   AC_LANG_PUSH(C)
--  AC_RUN_IFELSE([
-+  AC_COMPILE_IFELSE([
-     AC_LANG_PROGRAM([[#include <unicode/uversion.h>]],[[
-       #if U_ICU_VERSION_MAJOR_NUM < 2
--      exit(1);
-+      #error too old
-       #elif U_ICU_VERSION_MAJOR_NUM == 2
-       # if U_ICU_VERSION_MINOR_NUM < 8
--      exit(1);
-+      #error too old
-       # else
-       exit(0);
-       # endif
diff --git a/bsp/buildroot/package/beecrypt/0004-gcc-4.7.patch b/bsp/buildroot/package/beecrypt/0004-gcc-4.7.patch
deleted file mode 100644
index 767f7890..00000000
--- a/bsp/buildroot/package/beecrypt/0004-gcc-4.7.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Really fixes gcc-4.7 related compile error:
-../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive]
-
-Downloaded from upstream bugtracker:
-http://sourceforge.net/p/beecrypt/patches/10/
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
---- a/include/beecrypt/c++/util/AbstractSet.h
-+++ b/include/beecrypt/c++/util/AbstractSet.h
-@@ -56,7 +56,7 @@
- 					if (c->size() != size())
- 						return false;
- 
--					return containsAll(*c);
-+					return this->containsAll(*c);
- 				}
- 				return false;
- 			}
diff --git a/bsp/buildroot/package/beecrypt/Config.in b/bsp/buildroot/package/beecrypt/Config.in
index 069f3d5c..9aec85af 100644
--- a/bsp/buildroot/package/beecrypt/Config.in
+++ b/bsp/buildroot/package/beecrypt/Config.in
@@ -8,22 +8,3 @@ config BR2_PACKAGE_BEECRYPT
 	  Beecrypt is a general-purpose cryptography library.
 
 	  http://beecrypt.sf.net
-
-if BR2_PACKAGE_BEECRYPT
-
-config BR2_PACKAGE_BEECRYPT_CPP
-	bool "C++ support"
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_WCHAR # icu
-	depends on !BR2_BINFMT_FLAT # icu
-	depends on !BR2_STATIC_LIBS
-	select BR2_PACKAGE_ICU
-	help
-	  Enable C++ support. This pulls in the (large) icu package.
-
-comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries"
-	depends on !BR2_BINFMT_FLAT
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \
-		|| BR2_STATIC_LIBS
-
-endif # BR2_PACKAGE_BEECRYPT
diff --git a/bsp/buildroot/package/beecrypt/beecrypt.mk b/bsp/buildroot/package/beecrypt/beecrypt.mk
index bd29b3b2..f13f72c8 100644
--- a/bsp/buildroot/package/beecrypt/beecrypt.mk
+++ b/bsp/buildroot/package/beecrypt/beecrypt.mk
@@ -8,14 +8,15 @@ BEECRYPT_VERSION = 4.2.1
 BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION)
 BEECRYPT_AUTORECONF = YES
 BEECRYPT_INSTALL_STAGING = YES
-BEECRYPT_LICENSE = LGPLv2.1+
+BEECRYPT_LICENSE = LGPL-2.1+
 BEECRYPT_LICENSE_FILES = COPYING.LIB
 
 BEECRYPT_CONF_OPTS = \
 	--disable-expert-mode \
 	--without-java \
 	--without-python \
-	--disable-openmp
+	--disable-openmp \
+	--without-cplusplus
 
 # disable optimized m68k assembly as it doesn't compile for coldfire
 ifeq ($(BR2_m68k_cf),y)
@@ -27,19 +28,11 @@ ifeq ($(BR2_arm):$(BR2_ARM_CPU_HAS_ARM),y:)
 BEECRYPT_CONF_OPTS += --enable-debug
 endif
 
-ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y)
-BEECRYPT_DEPENDENCIES += icu
-BEECRYPT_CONF_OPTS += --with-cplusplus
-else
-BEECRYPT_CONF_OPTS += --without-cplusplus
-
 # automake/libtool uses the C++ compiler to link libbeecrypt because of
 # (the optional) cppglue.cxx. Force it to use the C compiler instead.
 define BEECRYPT_LINK_WITH_CC
 	$(SED) 's/--tag=CXX/--tag=CC/g' $(@D)/Makefile
 endef
-
 BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC
-endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/bellagio/bellagio.mk b/bsp/buildroot/package/bellagio/bellagio.mk
index 6db753d5..4e5c6912 100644
--- a/bsp/buildroot/package/bellagio/bellagio.mk
+++ b/bsp/buildroot/package/bellagio/bellagio.mk
@@ -9,7 +9,7 @@ BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz
 BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION)
 BELLAGIO_AUTORECONF = YES
 BELLAGIO_INSTALL_STAGING = YES
-BELLAGIO_LICENSE = LGPLv2.1+
+BELLAGIO_LICENSE = LGPL-2.1+
 BELLAGIO_LICENSE_FILES = COPYING
 BELLAGIO_PROVIDES = libopenmax
 
diff --git a/bsp/buildroot/package/benejson/benejson.hash b/bsp/buildroot/package/benejson/benejson.hash
index 1dfda90d..696dc4f3 100644
--- a/bsp/buildroot/package/benejson/benejson.hash
+++ b/bsp/buildroot/package/benejson/benejson.hash
@@ -1,2 +1,2 @@
-# Localy computed
+# Locally computed
 sha256  2ce5f3c2323500bdf651e7fcaecbd1011997141e6067567b8d2caa4cf7182f4a  benejson-0.9.7.tar.gz
diff --git a/bsp/buildroot/package/berkeleydb/Config.in b/bsp/buildroot/package/berkeleydb/Config.in
index 5531b044..f32d13ab 100644
--- a/bsp/buildroot/package/berkeleydb/Config.in
+++ b/bsp/buildroot/package/berkeleydb/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_BERKELEYDB
 	bool "berkeleydb"
 	help
-	  The Berkeley database. A very common library for database
-	  applications.
+	  The Berkeley database. A very common library for
+	  database applications.
 
 	  http://www.sleepycat.com/products/db.shtml
 
@@ -16,6 +16,7 @@ config BR2_PACKAGE_BERKELEYDB_COMPAT185
 config BR2_PACKAGE_BERKELEYDB_TOOLS
 	bool "install tools"
 	help
-	  Install berkeleydb tools, mostly useful for debugging purposes.
+	  Install berkeleydb tools, mostly useful for debugging
+	  purposes.
 
 endif
diff --git a/bsp/buildroot/package/bind/Config.in b/bsp/buildroot/package/bind/Config.in
index a580f0ee..049a90cb 100644
--- a/bsp/buildroot/package/bind/Config.in
+++ b/bsp/buildroot/package/bind/Config.in
@@ -4,14 +4,16 @@ config BR2_PACKAGE_BIND
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	help
-	  BIND (Berkeley Internet Name Domain) is an implementation of
-	  the Domain Name System (DNS) protocols and provides an openly
-	  redistributable reference implementation of the major
-	  components of the Domain Name System, including:
+	  BIND (Berkeley Internet Name Domain) is an
+	  implementation of the Domain Name System (DNS) protocols
+	  and provides an openly redistributable reference
+	  implementation of the major components of the Domain
+	  Name System, including:
 
 	    * a Domain Name System server (named)
 	    * a Domain Name System resolver library
-	    * tools for verifying the proper operation of the DNS server
+	    * tools for verifying the proper operation of the DNS
+	      server
 
 	  The BIND DNS Server is used on the vast majority of name
 	  serving machines on the Internet, providing a robust and
@@ -19,7 +21,8 @@ config BR2_PACKAGE_BIND
 	  architecture can be built. The resolver library included in
 	  the BIND distribution provides the standard APIs for
 	  translation between domain names and Internet addresses and is
-	  intended to be linked with applications requiring name service.
+	  intended to be linked with applications requiring name
+	  service.
 
 	  http://www.isc.org/sw/bind/
 
diff --git a/bsp/buildroot/package/bind/bind.hash b/bsp/buildroot/package/bind/bind.hash
index 199db704..19d5f61f 100644
--- a/bsp/buildroot/package/bind/bind.hash
+++ b/bsp/buildroot/package/bind/bind.hash
@@ -1,3 +1,4 @@
-# Verified from http://ftp.isc.org/isc/bind9/9.11.2-P1/bind-9.11.2-P1.tar.gz.sha256.asc
-sha256 cec31548832fca3f85d95178d4019b7d702039e8595d4c93914feba337df1212 bind-9.11.2-P1.tar.gz
-sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT
+# Verified from https://ftp.isc.org/isc/bind9/9.11.4-P1/bind-9.11.4-P1.tar.gz.asc
+# with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57
+sha256 a85af7b629109d41285c7adeae1515daac638bbe4d5dc30d1f4b343dff09d811 bind-9.11.4-P2.tar.gz
+sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT
diff --git a/bsp/buildroot/package/bind/bind.mk b/bsp/buildroot/package/bind/bind.mk
index 570f719d..4b80eaf0 100644
--- a/bsp/buildroot/package/bind/bind.mk
+++ b/bsp/buildroot/package/bind/bind.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-BIND_VERSION = 9.11.2-P1
+BIND_VERSION = 9.11.4-P2
 BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 # bind does not support parallel builds.
 BIND_MAKE = $(MAKE1)
 BIND_INSTALL_STAGING = YES
 BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh
-BIND_LICENSE = MPLv2.0
+BIND_LICENSE = MPL-2.0
 BIND_LICENSE_FILES = COPYRIGHT
 BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage
 BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke
@@ -33,7 +33,7 @@ BIND_CONF_OPTS = \
 	--enable-filter-aaaa
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
-BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr/include
+BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
 BIND_DEPENDENCIES += zlib
 else
 BIND_CONF_OPTS += --without-zlib
@@ -61,7 +61,9 @@ BIND_CONF_ENV += \
 	ac_cv_func_EVP_sha512=yes
 BIND_CONF_OPTS += \
 	--with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \
-	--with-ecdsa=yes
+	--with-ecdsa=yes \
+	--with-eddsa=no \
+	--with-aes=yes
 # GOST cipher support requires openssl extra engines
 ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
 BIND_CONF_OPTS += --with-gost=yes
diff --git a/bsp/buildroot/package/binutils/2.25.1/120-sh-conf.patch b/bsp/buildroot/package/binutils/2.25.1/120-sh-conf.patch
deleted file mode 100644
index ea3d1b60..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/120-sh-conf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
-
-Likewise, binutils has no idea about any of these new targets either, so we 
-fix that up too.. now we're able to actually build a real toolchain for 
-sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
-inept targets than that one, really. Go look, I promise).
-
---- a/configure
-+++ b/configure
-@@ -1495,7 +1495,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
---- a/configure.ac
-+++ b/configure.ac
-@@ -712,7 +712,7 @@
-   mips*-*-*)
-     noconfigdirs="$noconfigdirs gprof"
-     ;;
--  sh-*-* | sh64-*-*)
-+  sh*-*-* | sh64-*-*)
-     case "${target}" in
-       sh*-*-elf)
-          ;;
diff --git a/bsp/buildroot/package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/bsp/buildroot/package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch
deleted file mode 100644
index 30103ee0..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/131-xtensa-fix-memory-corruption-by-broken-sysregs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 2 Aug 2017 00:36:05 -0700
-Subject: [PATCH] xtensa: fix memory corruption by broken sysregs
-
-In some xtensa configurations there may be system/user registers in
-xtensa-modules with negative index. ISA initialization for such config
-may clobber heap and result in program termination.
-Don't update lookup table entries for register with negative indices.
-They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this
-change should not affect processing of valid assembly/binary code.
-
-bfd/
-2017-08-02  Max Filippov  <jcmvbkbc@gmail.com>
-
-	* xtensa-isa.c (xtensa_isa_init): Don't update lookup table
-	entries for sysregs with negative indices.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a
-
- bfd/xtensa-isa.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c
-index 8da75bea8109..8c6ee88fdeae 100644
---- a/bfd/xtensa-isa.c
-+++ b/bfd/xtensa-isa.c
-@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p)
-       xtensa_sysreg_internal *sreg = &isa->sysregs[n];
-       is_user = sreg->is_user;
- 
--      isa->sysreg_table[is_user][sreg->number] = n;
-+      if (sreg->number >= 0)
-+	isa->sysreg_table[is_user][sreg->number] = n;
-     }
- 
-   /* Set up the interface lookup table.  */
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/300-001_ld_makefile_patch.patch b/bsp/buildroot/package/binutils/2.25.1/300-001_ld_makefile_patch.patch
deleted file mode 100644
index 5cb0f614..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/300-001_ld_makefile_patch.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am
---- binutils-2.17.50.0.17.oorig/ld/Makefile.am	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.am	2007-06-25 10:00:36.000000000 +0200
-@@ -18,7 +18,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in
---- binutils-2.17.50.0.17.oorig/ld/Makefile.in	2007-06-18 19:29:29.000000000 +0200
-+++ binutils-2.17.50.0.17/ld/Makefile.in	2007-06-25 10:00:36.000000000 +0200
-@@ -287,7 +287,7 @@
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
diff --git a/bsp/buildroot/package/binutils/2.25.1/300-012_check_ldrunpath_length.patch b/bsp/buildroot/package/binutils/2.25.1/300-012_check_ldrunpath_length.patch
deleted file mode 100644
index df783109..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/300-012_check_ldrunpath_length.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em
---- binutils-2.21.orig/ld/emultempl/elf32.em	2010-10-29 09:10:36.000000000 -0300
-+++ binutils-2.21/ld/emultempl/elf32.em	2010-12-10 09:26:56.746102724 -0300
-@@ -1270,6 +1270,8 @@
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1497,6 +1499,8 @@
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/bsp/buildroot/package/binutils/2.25.1/500-sysroot.patch b/bsp/buildroot/package/binutils/2.25.1/500-sysroot.patch
deleted file mode 100644
index e49c7953..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/500-sysroot.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -308,18 +308,25 @@
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/bsp/buildroot/package/binutils/2.25.1/600-poison-system-directories.patch b/bsp/buildroot/package/binutils/2.25.1/600-poison-system-directories.patch
deleted file mode 100644
index ec3622bc..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/600-poison-system-directories.patch
+++ /dev/null
@@ -1,276 +0,0 @@
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-[Gustavo: adapt to binutils 2.25]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.ac (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-diff -Nura a/ld/config.in b/ld/config.in
---- a/ld/config.in	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/config.in	2014-12-24 08:07:28.997918918 -0300
-@@ -11,6 +11,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-diff -Nura a/ld/configure b/ld/configure
---- a/ld/configure	2014-12-23 11:22:07.000000000 -0300
-+++ b/ld/configure	2014-12-24 08:07:29.002919088 -0300
-@@ -783,6 +783,7 @@
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_werror
-@@ -1439,6 +1440,8 @@
-   --disable-largefile     omit support for large files
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -15487,7 +15490,18 @@
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-diff -Nura a/ld/configure.ac b/ld/configure.ac
---- a/ld/configure.ac	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/configure.ac	2014-12-24 08:07:29.002919088 -0300
-@@ -94,6 +94,16 @@
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-diff -Nura a/ld/ldfile.c b/ld/ldfile.c
---- a/ld/ldfile.c	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ldfile.c	2014-12-24 08:07:29.002919088 -0300
-@@ -114,6 +114,23 @@
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-diff -Nura a/ld/ld.h b/ld/ld.h
---- a/ld/ld.h	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ld.h	2014-12-24 08:07:29.003919122 -0300
-@@ -161,6 +161,14 @@
-   /* If TRUE we'll just print the default output on stdout.  */
-   bfd_boolean print_output_format;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-diff -Nura a/ld/ldlex.h b/ld/ldlex.h
---- a/ld/ldlex.h	2014-11-04 06:54:41.000000000 -0300
-+++ b/ld/ldlex.h	2014-12-24 08:09:47.477644294 -0300
-@@ -140,6 +140,8 @@
-   OPTION_IGNORE_UNRESOLVED_SYMBOL,
-   OPTION_PUSH_STATE,
-   OPTION_POP_STATE,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
-diff -Nura a/ld/ldmain.c b/ld/ldmain.c
---- a/ld/ldmain.c	2014-10-14 04:32:04.000000000 -0300
-+++ b/ld/ldmain.c	2014-12-24 08:07:29.003919122 -0300
-@@ -266,6 +266,8 @@
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff -Nura a/ld/ld.texinfo b/ld/ld.texinfo
---- a/ld/ld.texinfo	2014-12-23 05:47:10.000000000 -0300
-+++ b/ld/ld.texinfo	2014-12-24 08:07:29.005919191 -0300
-@@ -2212,6 +2212,18 @@
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-diff -Nura a/ld/lexsup.c b/ld/lexsup.c
---- a/ld/lexsup.c	2014-11-04 06:54:41.000000000 -0300
-+++ b/ld/lexsup.c	2014-12-24 08:48:50.136583414 -0300
-@@ -513,6 +513,14 @@
-   { {"pop-state", no_argument, NULL, OPTION_POP_STATE},
-     '\0', NULL, N_("Pop state of flags governing input file handling"),
-     TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -525,6 +533,7 @@
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1458,6 +1467,14 @@
-           }
-           break;
- 
-+	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.poison_system_directories = FALSE;
-+	  break;
-+
-+	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.error_poison_system_directories = TRUE;
-+	  break;
-+
- 	case OPTION_PUSH_STATE:
- 	  input_flags.pushed = xmemdup (&input_flags,
- 					sizeof (input_flags),
-@@ -1483,6 +1500,10 @@
-       command_line.soname = NULL;
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
diff --git a/bsp/buildroot/package/binutils/2.25.1/800-microblaze-musl.patch b/bsp/buildroot/package/binutils/2.25.1/800-microblaze-musl.patch
deleted file mode 100644
index 34e69fd5..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/800-microblaze-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix the genetation of GOT entries for the Microblaze target.
-
-PR target/19516
-* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol):
-Always produce a RELATIVE reloc for a local symbol.
-
-[Taken from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=47993b4af18c6ef1cad300f6393bf896d3cb5e5c.]
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c
---- binutils-2.25.1.orig/bfd/elf32-microblaze.c	2015-07-21 10:20:58.000000000 +0200
-+++ binutils-2.25.1/bfd/elf32-microblaze.c	2016-02-14 11:38:45.822387506 +0100
-@@ -3293,8 +3293,7 @@
-          The entry in the global offset table will already have been
-          initialized in the relocate_section function.  */
-       if (info->shared
--          && (info->symbolic || h->dynindx == -1)
--          && h->def_regular)
-+          && ((info->symbolic && h->def_regular) || h->dynindx == -1))
-         {
-           asection *sec = h->root.u.def.section;
-           microblaze_elf_output_dynamic_relocation (output_bfd,
diff --git a/bsp/buildroot/package/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch b/bsp/buildroot/package/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
deleted file mode 100644
index 8aeb0642..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 415480d6471e67aef97c0241d451ef2423a1da9d Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 25 Nov 2014 21:33:21 +0300
-Subject: [PATCH] Fix trampolines search code for conditional branches
-
-For conditional branches that need more than one trampoline to reach its
-target assembler couldn't always find suitable trampoline because
-post-loop condition check was placed inside the loop, resulting in
-premature loop termination. Move check outside the loop.
-
-This fixes the following build errors seen when assembling huge files
-produced by gcc:
-    Error: jump target out of range; no usable trampoline found
-    Error: operand 1 of 'j' has out of range value '307307'
-
-2014-11-25  Max Filippov  <jcmvbkbc@gmail.com>
-
-gas/
-	* config/tc-xtensa.c (search_trampolines): Move post-loop
-	condition check outside the search loop.
-
-gas/testsuite/
-	* gas/xtensa/trampoline.d: Add expected output for branches.
-	* gas/xtensa/trampoline.s: Add test case for branches.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3
-Changes to ChangeLogs are dropped.
-
- gas/config/tc-xtensa.c                | 8 ++++----
- gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++
- gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++
- 3 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d11b0c7..f23ccf8 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only)
- 	      if (next_addr == 0 || addr - next_addr > J_RANGE)
- 		break;
- 	    }
--	  if (abs (addr - this_addr) < J_RANGE)
--	    return tf;
--
--	  return NULL;
- 	}
-+      if (abs (addr - this_addr) < J_RANGE)
-+	return tf;
-+
-+      return NULL;
-     }
-   for ( ; tf; tf = tf->next)
-     {
-diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d
-index b4f65dc..5ae32a6 100644
---- a/gas/testsuite/gas/xtensa/trampoline.d
-+++ b/gas/testsuite/gas/xtensa/trampoline.d
-@@ -24,3 +24,12 @@
- .*33462:.*j.0x49407
- #...
- .*49407:.*j.0x49407
-+.*4940a:.*beqz.n.a2,.0x4940f
-+.*4940c:.*j.0x693d1
-+#...
-+.*693d1:.*j.0x7ddd4
-+#...
-+.*7ddd4:.*j.0x927f5
-+#...
-+.*927f5:.*j.0x927f5
-+#...
-diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s
-index 259a3bb..4465786 100644
---- a/gas/testsuite/gas/xtensa/trampoline.s
-+++ b/gas/testsuite/gas/xtensa/trampoline.s
-@@ -19,3 +19,10 @@
- 	.endr
- 3:
- 	j	3b
-+	bnez	a2, 4f
-+	.rep	50000
-+	and	a2, a2, a3
-+	_ret
-+	.endr
-+4:
-+	j	4b
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/bsp/buildroot/package/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
deleted file mode 100644
index 8a211004..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch
+++ /dev/null
@@ -1,502 +0,0 @@
-From 20c79baf82273a0b368587f761f152c4d3a593a4 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 27 Mar 2015 07:13:55 +0300
-Subject: [PATCH 1/4] xtensa: optimize check_section_ebb_pcrels_fit
-
-The original check_section_ebb_pcrels_fit algorithm checks that text
-actions proposed for current EBB are OK for every relocation in a
-section. There's no need to check every relocation, because text actions
-for EBB can only change size of that EBB, thus only affecting
-relocations that in any way cross that EBB. In addition EBBs are
-iterated in ascending order of their VMA, making it easier to track
-relevant relocations.
-
-Introduce a structure that can track relocations that cross the range of
-VMAs of EBB and use it to only check relocations relevant to current EBB
-in check_section_ebb_pcrels_fit.
-It takes O(N log N) operations to build it and O(N) operations to move
-current EBB VMA window through its entire range, where N is the number
-of relocations in a section. The resulting complexity of
-compute_text_actions is thus reduced from O(N^2) to O(N log N + N * M),
-where M is the average number of relocations crossing each EBB.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-         44.26   71.53    6429/6429        compute_text_actions
-  50.2   44.26   71.53    6429         check_section_ebb_pcrels_fit
-          1.16   20.12 347506666/347576152     pcrel_reloc_fits
-          2.95   16.52 347506666/348104944     get_relocation_opnd
-          2.01    9.74 347575100/361252208     r_reloc_init
-          0.55    7.53 347575100/363381467     r_reloc_get_section
-          5.76    0.02 695013332/695013332     xlate_offset_with_removed_text
-          0.68    3.89 347575100/363483827     bfd_octets_per_byte
-          0.32    0.00 347506666/349910253     is_alt_relocation
-          0.18    0.11    6391/6391        build_xlate_map
-          0.00    0.00    6429/19417168     get_xtensa_relax_info
-          0.00    0.00    6391/6391        free_xlate_map
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          2.56    3.08    6429/6429        compute_text_actions
-   8.2    2.56    3.08    6429         check_section_ebb_pcrels_fit
-          0.08    0.91 17721075/17790561     pcrel_reloc_fits
-          0.17    0.47 17721075/31685977     r_reloc_init
-          0.43    0.00 35442150/35442150     xlate_offset_with_removed_text
-          0.02    0.37 17721075/33815236     r_reloc_get_section
-          0.22    0.11    6391/6391        build_xlate_map
-          0.05    0.22 17721075/33917596     bfd_octets_per_byte
-          0.03    0.00 17721075/20405299     is_alt_relocation
-          0.01    0.00    6429/6429        reloc_range_list_update_range
-          0.00    0.00    6429/19417168     get_xtensa_relax_info
-          0.00    0.00    6391/6391        free_xlate_map
------------------------------------------
-
-2015-04-01  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (reloc_range_list, reloc_range_list_entry,
-	reloc_range): new typedef.
-	(reloc_range_list_struct, reloc_range_list_entry_struct,
-	reloc_range_struct): new structures.
-	(reloc_range_compare, build_reloc_ranges,
-	reloc_range_list_append, reloc_range_list_remove,
-	reloc_range_list_update_range, free_reloc_range_list): new
-	functions.
-	(compute_text_actions): precompute relocation opcodes before the
-	loop. Add relevant_relocs variable, initialize it before the
-	loop, pass it to the check_section_ebb_pcrels_fit.
-	(check_section_ebb_pcrels_fit): add new parameter:
-	relevant_relocs. Update address range in the relevant_relocs if
-	it's non-NULL and iterate only over relevant relocations.
-
-Backported from: b2b326d246f839ee218192ac88da2384d929a072
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 298 insertions(+), 23 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 0b6f584..872370b 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions
-   (bfd *, asection *, struct bfd_link_info *);
- static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *);
- static bfd_boolean compute_ebb_actions (ebb_constraint *);
-+typedef struct reloc_range_list_struct reloc_range_list;
- static bfd_boolean check_section_ebb_pcrels_fit
--  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, const ebb_constraint *,
-+  (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *,
-+   reloc_range_list *, const ebb_constraint *,
-    const xtensa_opcode *);
- static bfd_boolean check_section_ebb_reduces (const ebb_constraint *);
- static void text_action_add_proposed
-@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd,
-   return reloc_opcodes;
- }
- 
-+struct reloc_range_struct
-+{
-+  bfd_vma addr;
-+  bfd_boolean add; /* TRUE if start of a range, FALSE otherwise.  */
-+  /* Original irel index in the array of relocations for a section.  */
-+  unsigned irel_index;
-+};
-+typedef struct reloc_range_struct reloc_range;
-+
-+typedef struct reloc_range_list_entry_struct reloc_range_list_entry;
-+struct reloc_range_list_entry_struct
-+{
-+  reloc_range_list_entry *next;
-+  reloc_range_list_entry *prev;
-+  Elf_Internal_Rela *irel;
-+  xtensa_opcode opcode;
-+  int opnum;
-+};
-+
-+struct reloc_range_list_struct
-+{
-+  /* The rest of the structure is only meaningful when ok is TRUE.  */
-+  bfd_boolean ok;
-+
-+  unsigned n_range; /* Number of range markers.  */
-+  reloc_range *range; /* Sorted range markers.  */
-+
-+  unsigned first; /* Index of a first range element in the list.  */
-+  unsigned last; /* One past index of a last range element in the list.  */
-+
-+  unsigned n_list; /* Number of list elements.  */
-+  reloc_range_list_entry *reloc; /*  */
-+  reloc_range_list_entry list_root;
-+};
-+
-+static int
-+reloc_range_compare (const void *a, const void *b)
-+{
-+  const reloc_range *ra = a;
-+  const reloc_range *rb = b;
-+
-+  if (ra->addr != rb->addr)
-+    return ra->addr < rb->addr ? -1 : 1;
-+  if (ra->add != rb->add)
-+    return ra->add ? -1 : 1;
-+  return 0;
-+}
-+
-+static void
-+build_reloc_ranges (bfd *abfd, asection *sec,
-+		    bfd_byte *contents,
-+		    Elf_Internal_Rela *internal_relocs,
-+		    xtensa_opcode *reloc_opcodes,
-+		    reloc_range_list *list)
-+{
-+  unsigned i;
-+  size_t n = 0;
-+  size_t max_n = 0;
-+  reloc_range *ranges = NULL;
-+  reloc_range_list_entry *reloc =
-+    bfd_malloc (sec->reloc_count * sizeof (*reloc));
-+
-+  memset (list, 0, sizeof (*list));
-+  list->ok = TRUE;
-+
-+  for (i = 0; i < sec->reloc_count; i++)
-+    {
-+      Elf_Internal_Rela *irel = &internal_relocs[i];
-+      int r_type = ELF32_R_TYPE (irel->r_info);
-+      reloc_howto_type *howto = &elf_howto_table[r_type];
-+      r_reloc r_rel;
-+
-+      if (r_type == R_XTENSA_ASM_SIMPLIFY
-+	  || r_type == R_XTENSA_32_PCREL
-+	  || !howto->pc_relative)
-+	continue;
-+
-+      r_reloc_init (&r_rel, abfd, irel, contents,
-+		    bfd_get_section_limit (abfd, sec));
-+
-+      if (r_reloc_get_section (&r_rel) != sec)
-+	continue;
-+
-+      if (n + 2 > max_n)
-+	{
-+	  max_n = (max_n + 2) * 2;
-+	  ranges = bfd_realloc (ranges, max_n * sizeof (*ranges));
-+	}
-+
-+      ranges[n].addr = irel->r_offset;
-+      ranges[n + 1].addr = r_rel.target_offset;
-+
-+      ranges[n].add = ranges[n].addr < ranges[n + 1].addr;
-+      ranges[n + 1].add = !ranges[n].add;
-+
-+      ranges[n].irel_index = i;
-+      ranges[n + 1].irel_index = i;
-+
-+      n += 2;
-+
-+      reloc[i].irel = irel;
-+
-+      /* Every relocation won't possibly be checked in the optimized version of
-+         check_section_ebb_pcrels_fit, so this needs to be done here.  */
-+      if (is_alt_relocation (ELF32_R_TYPE (irel->r_info)))
-+	{
-+	  /* None of the current alternate relocs are PC-relative,
-+	     and only PC-relative relocs matter here.  */
-+	}
-+      else
-+	{
-+	  xtensa_opcode opcode;
-+	  int opnum;
-+
-+	  if (reloc_opcodes)
-+	    opcode = reloc_opcodes[i];
-+	  else
-+	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
-+
-+	  if (opcode == XTENSA_UNDEFINED)
-+	    {
-+	      list->ok = FALSE;
-+	      break;
-+	    }
-+
-+	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
-+	  if (opnum == XTENSA_UNDEFINED)
-+	    {
-+	      list->ok = FALSE;
-+	      break;
-+	    }
-+
-+	  /* Record relocation opcode and opnum as we've calculated them
-+	     anyway and they won't change.  */
-+	  reloc[i].opcode = opcode;
-+	  reloc[i].opnum = opnum;
-+	}
-+    }
-+
-+  if (list->ok)
-+    {
-+      ranges = bfd_realloc (ranges, n * sizeof (*ranges));
-+      qsort (ranges, n, sizeof (*ranges), reloc_range_compare);
-+
-+      list->n_range = n;
-+      list->range = ranges;
-+      list->reloc = reloc;
-+      list->list_root.prev = &list->list_root;
-+      list->list_root.next = &list->list_root;
-+    }
-+  else
-+    {
-+      free (ranges);
-+      free (reloc);
-+    }
-+}
-+
-+static void reloc_range_list_append (reloc_range_list *list,
-+				     unsigned irel_index)
-+{
-+  reloc_range_list_entry *entry = list->reloc + irel_index;
-+
-+  entry->prev = list->list_root.prev;
-+  entry->next = &list->list_root;
-+  entry->prev->next = entry;
-+  entry->next->prev = entry;
-+  ++list->n_list;
-+}
-+
-+static void reloc_range_list_remove (reloc_range_list *list,
-+				     unsigned irel_index)
-+{
-+  reloc_range_list_entry *entry = list->reloc + irel_index;
-+
-+  entry->next->prev = entry->prev;
-+  entry->prev->next = entry->next;
-+  --list->n_list;
-+}
-+
-+/* Update relocation list object so that it lists all relocations that cross
-+   [first; last] range.  Range bounds should not decrease with successive
-+   invocations.  */
-+static void reloc_range_list_update_range (reloc_range_list *list,
-+					   bfd_vma first, bfd_vma last)
-+{
-+  /* This should not happen: EBBs are iterated from lower addresses to higher.
-+     But even if that happens there's no need to break: just flush current list
-+     and start from scratch.  */
-+  if ((list->last > 0 && list->range[list->last - 1].addr > last) ||
-+      (list->first > 0 && list->range[list->first - 1].addr >= first))
-+    {
-+      list->first = 0;
-+      list->last = 0;
-+      list->n_list = 0;
-+      list->list_root.next = &list->list_root;
-+      list->list_root.prev = &list->list_root;
-+      fprintf (stderr, "%s: move backwards requested\n", __func__);
-+    }
-+
-+  for (; list->last < list->n_range &&
-+       list->range[list->last].addr <= last; ++list->last)
-+    if (list->range[list->last].add)
-+      reloc_range_list_append (list, list->range[list->last].irel_index);
-+
-+  for (; list->first < list->n_range &&
-+       list->range[list->first].addr < first; ++list->first)
-+    if (!list->range[list->first].add)
-+      reloc_range_list_remove (list, list->range[list->first].irel_index);
-+}
-+
-+static void free_reloc_range_list (reloc_range_list *list)
-+{
-+  free (list->range);
-+  free (list->reloc);
-+}
- 
- /* The compute_text_actions function will build a list of potential
-    transformation actions for code in the extended basic block of each
-@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd,
-   property_table_entry *prop_table = 0;
-   int ptblsize = 0;
-   bfd_size_type sec_size;
-+  reloc_range_list relevant_relocs;
- 
-   relax_info = get_xtensa_relax_info (sec);
-   BFD_ASSERT (relax_info);
-@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd,
-       goto error_return;
-     }
- 
-+  /* Precompute the opcode for each relocation.  */
-+  reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, internal_relocs);
-+
-+  build_reloc_ranges (abfd, sec, contents, internal_relocs, reloc_opcodes,
-+		      &relevant_relocs);
-+
-   for (i = 0; i < sec->reloc_count; i++)
-     {
-       Elf_Internal_Rela *irel = &internal_relocs[i];
-@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd,
-       ebb->start_reloc_idx = i;
-       ebb->end_reloc_idx = i;
- 
--      /* Precompute the opcode for each relocation.  */
--      if (reloc_opcodes == NULL)
--	reloc_opcodes = build_reloc_opcodes (abfd, sec, contents,
--					     internal_relocs);
--
-       if (!extend_ebb_bounds (ebb)
- 	  || !compute_ebb_proposed_actions (&ebb_table)
- 	  || !compute_ebb_actions (&ebb_table)
- 	  || !check_section_ebb_pcrels_fit (abfd, sec, contents,
--					    internal_relocs, &ebb_table,
--					    reloc_opcodes)
-+					    internal_relocs,
-+					    &relevant_relocs,
-+					    &ebb_table, reloc_opcodes)
- 	  || !check_section_ebb_reduces (&ebb_table))
- 	{
- 	  /* If anything goes wrong or we get unlucky and something does
-@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd,
-       free_ebb_constraint (&ebb_table);
-     }
- 
-+  free_reloc_range_list (&relevant_relocs);
-+
- #if DEBUG
-   if (relax_info->action_list.head)
-     print_action_list (stderr, &relax_info->action_list);
-@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 			      asection *sec,
- 			      bfd_byte *contents,
- 			      Elf_Internal_Rela *internal_relocs,
-+			      reloc_range_list *relevant_relocs,
- 			      const ebb_constraint *constraint,
- 			      const xtensa_opcode *reloc_opcodes)
- {
-   unsigned i, j;
-+  unsigned n = sec->reloc_count;
-   Elf_Internal_Rela *irel;
-   xlate_map_t *xmap = NULL;
-   bfd_boolean ok = TRUE;
-   xtensa_relax_info *relax_info;
-+  reloc_range_list_entry *entry = NULL;
- 
-   relax_info = get_xtensa_relax_info (sec);
- 
-@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 	 can still be used.  */
-     }
- 
--  for (i = 0; i < sec->reloc_count; i++)
-+  if (relevant_relocs && constraint->action_count)
-+    {
-+      if (!relevant_relocs->ok)
-+	{
-+	  ok = FALSE;
-+	  n = 0;
-+	}
-+      else
-+	{
-+	  bfd_vma min_offset, max_offset;
-+	  min_offset = max_offset = constraint->actions[0].offset;
-+
-+	  for (i = 1; i < constraint->action_count; ++i)
-+	    {
-+	      proposed_action *action = &constraint->actions[i];
-+	      bfd_vma offset = action->offset;
-+
-+	      if (offset < min_offset)
-+		min_offset = offset;
-+	      if (offset > max_offset)
-+		max_offset = offset;
-+	    }
-+	  reloc_range_list_update_range (relevant_relocs, min_offset,
-+					 max_offset);
-+	  n = relevant_relocs->n_list;
-+	  entry = &relevant_relocs->list_root;
-+	}
-+    }
-+  else
-+    {
-+      relevant_relocs = NULL;
-+    }
-+
-+  for (i = 0; i < n; i++)
-     {
-       r_reloc r_rel;
-       bfd_vma orig_self_offset, orig_target_offset;
-@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd,
-       reloc_howto_type *howto;
-       int self_removed_bytes, target_removed_bytes;
- 
--      irel = &internal_relocs[i];
-+      if (relevant_relocs)
-+	{
-+	  entry = entry->next;
-+	  irel = entry->irel;
-+	}
-+      else
-+	{
-+	  irel = internal_relocs + i;
-+	}
-       r_type = ELF32_R_TYPE (irel->r_info);
- 
-       howto = &elf_howto_table[r_type];
-@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd,
- 	  xtensa_opcode opcode;
- 	  int opnum;
- 
--	  if (reloc_opcodes)
--	    opcode = reloc_opcodes[i];
--	  else
--	    opcode = get_relocation_opcode (abfd, sec, contents, irel);
--	  if (opcode == XTENSA_UNDEFINED)
-+	  if (relevant_relocs)
- 	    {
--	      ok = FALSE;
--	      break;
-+	      opcode = entry->opcode;
-+	      opnum = entry->opnum;
- 	    }
--
--	  opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
--	  if (opnum == XTENSA_UNDEFINED)
-+	  else
- 	    {
--	      ok = FALSE;
--	      break;
-+	      if (reloc_opcodes)
-+		opcode = reloc_opcodes[relevant_relocs ?
-+		  (unsigned)(entry - relevant_relocs->reloc) : i];
-+	      else
-+		opcode = get_relocation_opcode (abfd, sec, contents, irel);
-+	      if (opcode == XTENSA_UNDEFINED)
-+		{
-+		  ok = FALSE;
-+		  break;
-+		}
-+
-+	      opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info));
-+	      if (opnum == XTENSA_UNDEFINED)
-+		{
-+		  ok = FALSE;
-+		  break;
-+		}
- 	    }
- 
- 	  if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset))
-@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec,
-   /* Check all of the PC-relative relocations to make sure they still fit.  */
-   relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec,
- 					     target_sec_cache->contents,
--					     target_sec_cache->relocs,
-+					     target_sec_cache->relocs, NULL,
- 					     &ebb_table, NULL);
- 
-   if (!relocs_fit)
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch b/bsp/buildroot/package/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
deleted file mode 100644
index 9df80653..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-From 3e3f60207399ab29dd55af109e5ae9facc7d8e83 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 28 Mar 2015 08:46:28 +0300
-Subject: [PATCH 2/4] xtensa: optimize removed_by_actions
-
-The function removed_by_actions iterates through text actions to
-calculate an offset applied by text actions to a given VMA. Although it
-has a parameter p_start_action that allows for incremental offset
-calculation, in many places it's used with p_start_action explicitly set
-to the first action. After the first relaxation pass when the list of
-text actions is finalized, an array of offsets sorted by VMA may be used
-to speed up this function.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-          0.35    0.00   33872/4808961     relax_section_symbols
-          3.32    0.00  326022/4808961     relax_property_section
-         12.83    0.00 1259379/4808961     offset_with_removed_text
-         32.50    0.00 3189688/4808961     translate_reloc
-  71.5   49.00    0.00 4808961         removed_by_actions
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00   33872/4808537     relax_section_symbols
-          0.01    0.00  326022/4808537     relax_property_section
-          0.05    0.00 1258955/4808537     offset_with_removed_text_map
-          0.13    0.00 3189688/4808537     translate_reloc
-   1.0    0.20    0.00 4808537         removed_by_actions_map
-          0.00    0.00     120/120         map_removal_by_action
------------------------------------------
-
-2015-04-01  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (removal_by_action_entry_struct,
-	removal_by_action_map_struct): new structures.
-	(removal_by_action_entry, removal_by_action_map): new typedefs.
-	(text_action_list_struct): add new field: map.
-	(map_removal_by_action, removed_by_actions_map,
-	offset_with_removed_text_map): new functions.
-	(relax_section): replace offset_with_removed_text with
-	offset_with_removed_text_map.
-	(translate_reloc, relax_property_section, relax_section_symbols):
-	replace removed_by_actions with removed_by_actions_map.
-
-Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 156 insertions(+), 25 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 872370b..21b2871 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -5420,11 +5420,28 @@ struct text_action_struct
-   text_action *next;
- };
- 
-+struct removal_by_action_entry_struct
-+{
-+  bfd_vma offset;
-+  int removed;
-+  int eq_removed;
-+  int eq_removed_before_fill;
-+};
-+typedef struct removal_by_action_entry_struct removal_by_action_entry;
-+
-+struct removal_by_action_map_struct
-+{
-+  unsigned n_entries;
-+  removal_by_action_entry *entry;
-+};
-+typedef struct removal_by_action_map_struct removal_by_action_map;
-+
- 
- /* List of all of the actions taken on a text section.  */
- struct text_action_list_struct
- {
-   text_action *head;
-+  removal_by_action_map map;
- };
- 
- 
-@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list)
-   return count;
- }
- 
-+static void
-+map_removal_by_action (text_action_list *action_list)
-+{
-+  text_action *r;
-+  int removed = 0;
-+  removal_by_action_map map;
-+  bfd_boolean eq_complete;
-+
-+  map.n_entries = 0;
-+  map.entry = bfd_malloc (action_list_count (action_list) *
-+			  sizeof (removal_by_action_entry));
-+  eq_complete = FALSE;
-+
-+  for (r = action_list->head; r;)
-+    {
-+      removal_by_action_entry *ientry = map.entry + map.n_entries;
-+
-+      if (map.n_entries && (ientry - 1)->offset == r->offset)
-+	{
-+	  --ientry;
-+	}
-+      else
-+	{
-+	  ++map.n_entries;
-+	  eq_complete = FALSE;
-+	  ientry->offset = r->offset;
-+	  ientry->eq_removed_before_fill = removed;
-+	}
-+
-+      if (!eq_complete)
-+	{
-+	  if (r->action != ta_fill || r->removed_bytes >= 0)
-+	    {
-+	      ientry->eq_removed = removed;
-+	      eq_complete = TRUE;
-+	    }
-+	  else
-+	    ientry->eq_removed = removed + r->removed_bytes;
-+	}
-+
-+      removed += r->removed_bytes;
-+      ientry->removed = removed;
-+      r = r->next;
-+    }
-+  action_list->map = map;
-+}
-+
-+static int
-+removed_by_actions_map (text_action_list *action_list, bfd_vma offset,
-+			bfd_boolean before_fill)
-+{
-+  unsigned a, b;
-+
-+  if (!action_list->map.entry)
-+    map_removal_by_action (action_list);
-+
-+  if (!action_list->map.n_entries)
-+    return 0;
-+
-+  a = 0;
-+  b = action_list->map.n_entries;
-+
-+  while (b - a > 1)
-+    {
-+      unsigned c = (a + b) / 2;
-+
-+      if (action_list->map.entry[c].offset <= offset)
-+	a = c;
-+      else
-+	b = c;
-+    }
-+
-+  if (action_list->map.entry[a].offset < offset)
-+    {
-+      return action_list->map.entry[a].removed;
-+    }
-+  else if (action_list->map.entry[a].offset == offset)
-+    {
-+      return before_fill ?
-+	action_list->map.entry[a].eq_removed_before_fill :
-+	action_list->map.entry[a].eq_removed;
-+    }
-+  else
-+    {
-+      return 0;
-+    }
-+}
-+
-+static bfd_vma
-+offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
-+{
-+  int removed = removed_by_actions_map (action_list, offset, FALSE);
-+  return offset - removed;
-+}
-+
- 
- /* The find_insn_action routine will only find non-fill actions.  */
- 
-@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec)
- 
-   relax_info->action_list.head = NULL;
- 
-+  relax_info->action_list.map.n_entries = 0;
-+  relax_info->action_list.map.entry = NULL;
-+
-   relax_info->fix_list = NULL;
-   relax_info->fix_array = NULL;
-   relax_info->fix_array_count = 0;
-@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		  if (elf_hash_table (link_info)->dynamic_sections_created)
- 		    shrink_dynamic_reloc_sections (link_info, abfd, sec, irel);
- 		  irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE);
--		  irel->r_offset = offset_with_removed_text
-+		  irel->r_offset = offset_with_removed_text_map
- 		    (&relax_info->action_list, irel->r_offset);
- 		  continue;
- 		}
-@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		    }
- 		}
- 
--	      source_offset = offset_with_removed_text
-+	      source_offset = offset_with_removed_text_map
- 		(&relax_info->action_list, irel->r_offset);
- 	      irel->r_offset = source_offset;
- 	    }
-@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 		      break;
- 		    }
- 
--		  new_end_offset = offset_with_removed_text
-+		  new_end_offset = offset_with_removed_text_map
- 		    (&target_relax_info->action_list,
- 		     r_rel.target_offset + diff_value);
- 		  diff_value = new_end_offset - new_reloc.target_offset;
-@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
-   xtensa_relax_info *relax_info;
-   removed_literal *removed;
-   bfd_vma target_offset, base_offset;
--  text_action *act;
- 
-   *new_rel = *orig_rel;
- 
-@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec)
-      offset.  */
- 
-   base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend;
--  act = relax_info->action_list.head;
-   if (base_offset <= target_offset)
-     {
--      int base_removed = removed_by_actions (&act, base_offset, FALSE);
--      int addend_removed = removed_by_actions (&act, target_offset, FALSE);
-+      int base_removed = removed_by_actions_map (&relax_info->action_list,
-+						 base_offset, FALSE);
-+      int addend_removed = removed_by_actions_map (&relax_info->action_list,
-+						   target_offset, FALSE) -
-+	base_removed;
-+
-       new_rel->target_offset = target_offset - base_removed - addend_removed;
-       new_rel->rela.r_addend -= addend_removed;
-     }
-   else
-     {
-       /* Handle a negative addend.  The base offset comes first.  */
--      int tgt_removed = removed_by_actions (&act, target_offset, FALSE);
--      int addend_removed = removed_by_actions (&act, base_offset, FALSE);
-+      int tgt_removed = removed_by_actions_map (&relax_info->action_list,
-+						target_offset, FALSE);
-+      int addend_removed = removed_by_actions_map (&relax_info->action_list,
-+						   base_offset, FALSE) -
-+	tgt_removed;
-+
-       new_rel->target_offset = target_offset - tgt_removed;
-       new_rel->rela.r_addend += addend_removed;
-     }
-@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd,
- 	      bfd_vma old_offset = val.r_rel.target_offset;
- 	      bfd_vma new_offset;
- 	      long old_size, new_size;
--	      text_action *act = target_relax_info->action_list.head;
--	      new_offset = old_offset -
--		removed_by_actions (&act, old_offset, FALSE);
-+	      int removed_by_old_offset =
-+		removed_by_actions_map (&target_relax_info->action_list,
-+					old_offset, FALSE);
-+	      new_offset = old_offset - removed_by_old_offset;
- 
- 	      /* Assert that we are not out of bounds.  */
- 	      old_size = bfd_get_32 (abfd, size_p);
-@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd,
- 
- 		      /* Recompute the new_offset, but this time don't
- 			 include any fill inserted by relaxation.  */
--		      act = target_relax_info->action_list.head;
--		      new_offset = old_offset -
--			removed_by_actions (&act, old_offset, TRUE);
-+		      removed_by_old_offset =
-+			removed_by_actions_map (&target_relax_info->action_list,
-+						old_offset, TRUE);
-+		      new_offset = old_offset - removed_by_old_offset;
- 
- 		      /* If it is not unreachable and we have not yet
- 			 seen an unreachable at this address, place it
-@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd,
- 		    }
- 		}
- 	      else
--		new_size -=
--		    removed_by_actions (&act, old_offset + old_size, TRUE);
-+		{
-+		  int removed_by_old_offset_size =
-+		    removed_by_actions_map (&target_relax_info->action_list,
-+					    old_offset + old_size, TRUE);
-+		  new_size -= removed_by_old_offset_size - removed_by_old_offset;
-+		}
- 
- 	      if (new_size != old_size)
- 		{
-@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec)
- 
-       if (isym->st_shndx == sec_shndx)
- 	{
--	  text_action *act = relax_info->action_list.head;
- 	  bfd_vma orig_addr = isym->st_value;
-+	  int removed = removed_by_actions_map (&relax_info->action_list,
-+						orig_addr, FALSE);
- 
--	  isym->st_value -= removed_by_actions (&act, orig_addr, FALSE);
--
-+	  isym->st_value -= removed;
- 	  if (ELF32_ST_TYPE (isym->st_info) == STT_FUNC)
- 	    isym->st_size -=
--	      removed_by_actions (&act, orig_addr + isym->st_size, FALSE);
-+	      removed_by_actions_map (&relax_info->action_list,
-+				      orig_addr + isym->st_size, FALSE) -
-+	      removed;
- 	}
-     }
- 
-@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec)
- 	   || sym_hash->root.type == bfd_link_hash_defweak)
- 	  && sym_hash->root.u.def.section == sec)
- 	{
--	  text_action *act = relax_info->action_list.head;
- 	  bfd_vma orig_addr = sym_hash->root.u.def.value;
-+	  int removed = removed_by_actions_map (&relax_info->action_list,
-+						orig_addr, FALSE);
- 
--	  sym_hash->root.u.def.value -=
--	    removed_by_actions (&act, orig_addr, FALSE);
-+	  sym_hash->root.u.def.value -= removed;
- 
- 	  if (sym_hash->type == STT_FUNC)
- 	    sym_hash->size -=
--	      removed_by_actions (&act, orig_addr + sym_hash->size, FALSE);
-+	      removed_by_actions_map (&relax_info->action_list,
-+				      orig_addr + sym_hash->size, FALSE) -
-+	      removed;
- 	}
-     }
- 
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch b/bsp/buildroot/package/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
deleted file mode 100644
index 96d526fe..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 288c2b709e5e6841484e1a129eaccd299db36877 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 4 Apr 2015 14:49:42 +0300
-Subject: [PATCH 3/4] xtensa: optimize find_removed_literal
-
-find_removed_literal uses linear search to find removed literal by its
-VMA. The list of literals is fixed at that point, build an ordered index
-array and use binary search instead.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-         56.72    0.00  297578/669392      translate_reloc
-         70.86    0.00  371814/669392      relax_section
-  67.9  127.58    0.00  669392         find_removed_literal
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00  297578/669392      translate_reloc
-          0.00    0.00  371814/669392      relax_section
-   0.0    0.00    0.00  669392         find_removed_literal
-          0.00    0.00   23838/23838       map_removed_literal
------------------------------------------
-
-2015-04-03  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (removed_literal_map_entry): new typedef.
-	(removed_literal_map_entry_struct): new structure.
-	(removed_literal_list_struct): add new fields: n_map and map.
-	(map_removed_literal, removed_literal_compare): new functions.
-	(find_removed_literal): build index array for literals ordered
-	by VMA, use binary search to find removed literal.
-
-Backported from: 3439c466273378021821473d3fc84990e089ae34
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 58 insertions(+), 6 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 21b2871..51733ad 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
-    by the "from" offset field.  */
- 
- typedef struct removed_literal_struct removed_literal;
-+typedef struct removed_literal_map_entry_struct removed_literal_map_entry;
- typedef struct removed_literal_list_struct removed_literal_list;
- 
- struct removed_literal_struct
-@@ -5841,10 +5842,19 @@ struct removed_literal_struct
-   removed_literal *next;
- };
- 
-+struct removed_literal_map_entry_struct
-+{
-+  bfd_vma addr;
-+  removed_literal *literal;
-+};
-+
- struct removed_literal_list_struct
- {
-   removed_literal *head;
-   removed_literal *tail;
-+
-+  unsigned n_map;
-+  removed_literal_map_entry *map;
- };
- 
- 
-@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list,
-     }
- }
- 
-+static void
-+map_removed_literal (removed_literal_list *removed_list)
-+{
-+  unsigned n_map = 0;
-+  unsigned i;
-+  removed_literal_map_entry *map = NULL;
-+  removed_literal *r = removed_list->head;
-+
-+  for (i = 0; r; ++i, r = r->next)
-+    {
-+      if (i == n_map)
-+	{
-+	  n_map = (n_map * 2) + 2;
-+	  map = bfd_realloc (map, n_map * sizeof (*map));
-+	}
-+      map[i].addr = r->from.target_offset;
-+      map[i].literal = r;
-+    }
-+  removed_list->map = map;
-+  removed_list->n_map = i;
-+}
-+
-+static int
-+removed_literal_compare (const void *a, const void *b)
-+{
-+  const removed_literal_map_entry *pa = a;
-+  const removed_literal_map_entry *pb = b;
-+
-+  if (pa->addr == pb->addr)
-+    return 0;
-+  else
-+    return pa->addr < pb->addr ? -1 : 1;
-+}
- 
- /* Check if the list of removed literals contains an entry for the
-    given address.  Return the entry if found.  */
-@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list,
- static removed_literal *
- find_removed_literal (removed_literal_list *removed_list, bfd_vma addr)
- {
--  removed_literal *r = removed_list->head;
--  while (r && r->from.target_offset < addr)
--    r = r->next;
--  if (r && r->from.target_offset == addr)
--    return r;
--  return NULL;
-+  removed_literal_map_entry *p;
-+  removed_literal *r = NULL;
-+
-+  if (removed_list->map == NULL)
-+    map_removed_literal (removed_list);
-+
-+  p = bsearch (&addr, removed_list->map, removed_list->n_map,
-+	       sizeof (*removed_list->map), removed_literal_compare);
-+  if (p)
-+    {
-+      while (p != removed_list->map && (p - 1)->addr == addr)
-+	--p;
-+      r = p->literal;
-+    }
-+  return r;
- }
- 
- 
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch b/bsp/buildroot/package/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
deleted file mode 100644
index 3090cc21..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch
+++ /dev/null
@@ -1,826 +0,0 @@
-From e5409aedd3ee2192855018a564650ffb75c26e60 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 5 Apr 2015 17:04:22 +0300
-Subject: [PATCH 4/4] xtensa: replace action list with splay tree
-
-text_action_add uses linear list search to order text actions list by
-action VMA. The list is used at the first relaxation pass, when it's not
-fixed yet.
-Replace the list with splay tree from libiberty.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00      14/158225      compute_text_actions
-          3.62    0.00   25211/158225      remove_dead_literal
-          8.42    0.00   58645/158225      coalesce_shared_literal
-         10.68    0.00   74355/158225      text_action_add_proposed
-  38.8   22.73    0.00  158225         text_action_add
-          0.00    0.00  144527/293246      bfd_zmalloc
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.00    0.00      14/158225      compute_text_actions
-          0.00    0.00   25211/158225      remove_dead_literal
-          0.00    0.01   58645/158225      coalesce_shared_literal
-          0.00    0.01   74355/158225      text_action_add_proposed
-   0.1    0.00    0.02  158225         text_action_add
-          0.01    0.00  144527/144527      splay_tree_insert
-          0.00    0.00  144527/195130      splay_tree_lookup
-          0.00    0.00  144527/293246      bfd_zmalloc
------------------------------------------
-
-2015-04-03  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (splay-tree.h): include header.
-	(text_action_struct): drop next pointer.
-	(text_action_list_struct): drop head pointer, add count and
-	tree fields.
-	(find_fill_action): instead of linear search in text_action_list
-	search in the tree.
-	(text_action_compare, action_first, action_next): new functions.
-	(text_action_add, text_action_add_literal): instead of linear
-	search and insertion insert new node into the tree.
-	(removed_by_actions): pass additional parameter: action_list,
-	use it to traverse the tree.
-	(offset_with_removed_text): pass additional action_list parameter
-	to removed_by_actions.
-	(map_action_fn_context): new typedef.
-	(map_action_fn_context_struct): new structure.
-	(map_action_fn): new function.
-	(map_removal_by_action): use splay_tree_foreach to build map.
-	(find_insn_action): replace linear search in text_action_list
-	with series of splay_tree_lookups.
-	(print_action, print_action_list_fn): new functions.
-	(print_action_list): use splay_tree_foreach.
-	(init_xtensa_relax_info): drop action_list.head initialization.
-	Initialize the tree.
-	(compute_text_actions): use non-zero action_list_count instead of
-	non-NULL action list.
-	(xlate_map_context): new typedef.
-	(xlate_map_context_struct): new structure.
-	(xlate_map_fn): new function.
-	(build_xlate_map): use splay_tree_foreach to build map.
-	(action_remove_bytes_fn): new function.
-	(relax_section): use zero action_list_count instead of NULL
-	action list. Use splay_tree_foreach to count final section size.
-	Drop unused variable 'removed'.
-
-Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++----------------------
- 1 file changed, 282 insertions(+), 206 deletions(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 51733ad..53af1c6 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -28,6 +28,7 @@
- #include "libbfd.h"
- #include "elf-bfd.h"
- #include "elf/xtensa.h"
-+#include "splay-tree.h"
- #include "xtensa-isa.h"
- #include "xtensa-config.h"
- 
-@@ -5416,8 +5417,6 @@ struct text_action_struct
-   bfd_vma virtual_offset;  /* Zero except for adding literals.  */
-   int removed_bytes;
-   literal_value value;	/* Only valid when adding literals.  */
--
--  text_action *next;
- };
- 
- struct removal_by_action_entry_struct
-@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map;
- /* List of all of the actions taken on a text section.  */
- struct text_action_list_struct
- {
--  text_action *head;
-+  unsigned count;
-+  splay_tree tree;
-   removal_by_action_map map;
- };
- 
-@@ -5448,20 +5448,18 @@ struct text_action_list_struct
- static text_action *
- find_fill_action (text_action_list *l, asection *sec, bfd_vma offset)
- {
--  text_action **m_p;
-+  text_action a;
- 
-   /* It is not necessary to fill at the end of a section.  */
-   if (sec->size == offset)
-     return NULL;
- 
--  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
--    {
--      text_action *t = *m_p;
--      /* When the action is another fill at the same address,
--	 just increase the size.  */
--      if (t->offset == offset && t->action == ta_fill)
--	return t;
--    }
-+  a.offset = offset;
-+  a.action = ta_fill;
-+
-+  splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a);
-+  if (node)
-+    return (text_action *)node->value;
-   return NULL;
- }
- 
-@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff)
- }
- 
- 
-+static int
-+text_action_compare (splay_tree_key a, splay_tree_key b)
-+{
-+  text_action *pa = (text_action *)a;
-+  text_action *pb = (text_action *)b;
-+  static const int action_priority[] =
-+    {
-+      [ta_fill] = 0,
-+      [ta_none] = 1,
-+      [ta_convert_longcall] = 2,
-+      [ta_narrow_insn] = 3,
-+      [ta_remove_insn] = 4,
-+      [ta_remove_longcall] = 5,
-+      [ta_remove_literal] = 6,
-+      [ta_widen_insn] = 7,
-+      [ta_add_literal] = 8,
-+    };
-+
-+  if (pa->offset == pb->offset)
-+    {
-+      if (pa->action == pb->action)
-+	  return 0;
-+      return action_priority[pa->action] - action_priority[pb->action];
-+    }
-+  else
-+    return pa->offset < pb->offset ? -1 : 1;
-+}
-+
-+static text_action *
-+action_first (text_action_list *action_list)
-+{
-+  splay_tree_node node = splay_tree_min (action_list->tree);
-+  return node ? (text_action *)node->value : NULL;
-+}
-+
-+static text_action *
-+action_next (text_action_list *action_list, text_action *action)
-+{
-+  splay_tree_node node = splay_tree_successor (action_list->tree,
-+					       (splay_tree_key)action);
-+  return node ? (text_action *)node->value : NULL;
-+}
-+
- /* Add a modification action to the text.  For the case of adding or
-    removing space, modify any current fill and assume that
-    "unreachable_space" bytes can be freely contracted.  Note that a
-@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l,
- 		 bfd_vma offset,
- 		 int removed)
- {
--  text_action **m_p;
-   text_action *ta;
-+  text_action a;
- 
-   /* It is not necessary to fill at the end of a section.  */
-   if (action == ta_fill && sec->size == offset)
-@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l,
-   if (action == ta_fill && removed == 0)
-     return;
- 
--  for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next)
-+  a.action = action;
-+  a.offset = offset;
-+
-+  if (action == ta_fill)
-     {
--      text_action *t = *m_p;
-+      splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a);
- 
--      if (action == ta_fill)
-+      if (node)
- 	{
--	  /* When the action is another fill at the same address,
--	     just increase the size.  */
--	  if (t->offset == offset && t->action == ta_fill)
--	    {
--	      t->removed_bytes += removed;
--	      return;
--	    }
--	  /* Fills need to happen before widens so that we don't
--	     insert fill bytes into the instruction stream.  */
--	  if (t->offset == offset && t->action == ta_widen_insn)
--	    break;
-+	  ta = (text_action *)node->value;
-+	  ta->removed_bytes += removed;
-+	  return;
- 	}
-     }
-+  else
-+    BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)&a) == NULL);
- 
--  /* Create a new record and fill it up.  */
-   ta = (text_action *) bfd_zmalloc (sizeof (text_action));
-   ta->action = action;
-   ta->sec = sec;
-   ta->offset = offset;
-   ta->removed_bytes = removed;
--  ta->next = (*m_p);
--  *m_p = ta;
-+  splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta);
-+  ++l->count;
- }
- 
- 
-@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l,
- 			 const literal_value *value,
- 			 int removed)
- {
--  text_action **m_p;
-   text_action *ta;
-   asection *sec = r_reloc_get_section (loc);
-   bfd_vma offset = loc->target_offset;
-@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l,
- 
-   BFD_ASSERT (action == ta_add_literal);
- 
--  for (m_p = &l->head; *m_p != NULL; m_p = &(*m_p)->next)
--    {
--      if ((*m_p)->offset > offset
--	  && ((*m_p)->offset != offset
--	      || (*m_p)->virtual_offset > virtual_offset))
--	break;
--    }
--
-   /* Create a new record and fill it up.  */
-   ta = (text_action *) bfd_zmalloc (sizeof (text_action));
-   ta->action = action;
-@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l,
-   ta->virtual_offset = virtual_offset;
-   ta->value = *value;
-   ta->removed_bytes = removed;
--  ta->next = (*m_p);
--  *m_p = ta;
-+
-+  BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)ta) == NULL);
-+  splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta);
-+  ++l->count;
- }
- 
- 
-@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l,
-    so that each search may begin where the previous one left off.  */
- 
- static int
--removed_by_actions (text_action **p_start_action,
-+removed_by_actions (text_action_list *action_list,
-+		    text_action **p_start_action,
- 		    bfd_vma offset,
- 		    bfd_boolean before_fill)
- {
-@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action,
-   int removed = 0;
- 
-   r = *p_start_action;
-+  if (r)
-+    {
-+      splay_tree_node node = splay_tree_lookup (action_list->tree,
-+						(splay_tree_key)r);
-+      BFD_ASSERT (node != NULL && r == (text_action *)node->value);
-+    }
-+
-   while (r)
-     {
-       if (r->offset > offset)
-@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action,
- 
-       removed += r->removed_bytes;
- 
--      r = r->next;
-+      r = action_next (action_list, r);
-     }
- 
-   *p_start_action = r;
-@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action,
- static bfd_vma
- offset_with_removed_text (text_action_list *action_list, bfd_vma offset)
- {
--  text_action *r = action_list->head;
--  return offset - removed_by_actions (&r, offset, FALSE);
-+  text_action *r = action_first (action_list);
-+
-+  return offset - removed_by_actions (action_list, &r, offset, FALSE);
- }
- 
- 
- static unsigned
- action_list_count (text_action_list *action_list)
- {
--  text_action *r = action_list->head;
--  unsigned count = 0;
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      count++;
--    }
--  return count;
-+  return action_list->count;
- }
- 
--static void
--map_removal_by_action (text_action_list *action_list)
-+typedef struct map_action_fn_context_struct map_action_fn_context;
-+struct map_action_fn_context_struct
- {
--  text_action *r;
--  int removed = 0;
-+  int removed;
-   removal_by_action_map map;
-   bfd_boolean eq_complete;
-+};
- 
--  map.n_entries = 0;
--  map.entry = bfd_malloc (action_list_count (action_list) *
--			  sizeof (removal_by_action_entry));
--  eq_complete = FALSE;
-+static int
-+map_action_fn (splay_tree_node node, void *p)
-+{
-+  map_action_fn_context *ctx = p;
-+  text_action *r = (text_action *)node->value;
-+  removal_by_action_entry *ientry = ctx->map.entry + ctx->map.n_entries;
- 
--  for (r = action_list->head; r;)
-+  if (ctx->map.n_entries && (ientry - 1)->offset == r->offset)
-     {
--      removal_by_action_entry *ientry = map.entry + map.n_entries;
-+      --ientry;
-+    }
-+  else
-+    {
-+      ++ctx->map.n_entries;
-+      ctx->eq_complete = FALSE;
-+      ientry->offset = r->offset;
-+      ientry->eq_removed_before_fill = ctx->removed;
-+    }
- 
--      if (map.n_entries && (ientry - 1)->offset == r->offset)
-+  if (!ctx->eq_complete)
-+    {
-+      if (r->action != ta_fill || r->removed_bytes >= 0)
- 	{
--	  --ientry;
-+	  ientry->eq_removed = ctx->removed;
-+	  ctx->eq_complete = TRUE;
- 	}
-       else
--	{
--	  ++map.n_entries;
--	  eq_complete = FALSE;
--	  ientry->offset = r->offset;
--	  ientry->eq_removed_before_fill = removed;
--	}
-+	ientry->eq_removed = ctx->removed + r->removed_bytes;
-+    }
- 
--      if (!eq_complete)
--	{
--	  if (r->action != ta_fill || r->removed_bytes >= 0)
--	    {
--	      ientry->eq_removed = removed;
--	      eq_complete = TRUE;
--	    }
--	  else
--	    ientry->eq_removed = removed + r->removed_bytes;
--	}
-+  ctx->removed += r->removed_bytes;
-+  ientry->removed = ctx->removed;
-+  return 0;
-+}
- 
--      removed += r->removed_bytes;
--      ientry->removed = removed;
--      r = r->next;
--    }
--  action_list->map = map;
-+static void
-+map_removal_by_action (text_action_list *action_list)
-+{
-+  map_action_fn_context ctx;
-+
-+  ctx.removed = 0;
-+  ctx.map.n_entries = 0;
-+  ctx.map.entry = bfd_malloc (action_list_count (action_list) *
-+			      sizeof (removal_by_action_entry));
-+  ctx.eq_complete = FALSE;
-+
-+  splay_tree_foreach (action_list->tree, map_action_fn, &ctx);
-+  action_list->map = ctx.map;
- }
- 
- static int
-@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset)
- static text_action *
- find_insn_action (text_action_list *action_list, bfd_vma offset)
- {
--  text_action *t;
--  for (t = action_list->head; t; t = t->next)
-+  static const text_action_t action[] =
-     {
--      if (t->offset == offset)
--	{
--	  switch (t->action)
--	    {
--	    case ta_none:
--	    case ta_fill:
--	      break;
--	    case ta_remove_insn:
--	    case ta_remove_longcall:
--	    case ta_convert_longcall:
--	    case ta_narrow_insn:
--	    case ta_widen_insn:
--	      return t;
--	    case ta_remove_literal:
--	    case ta_add_literal:
--	      BFD_ASSERT (0);
--	      break;
--	    }
--	}
-+      ta_convert_longcall,
-+      ta_remove_longcall,
-+      ta_widen_insn,
-+      ta_narrow_insn,
-+      ta_remove_insn,
-+    };
-+  text_action a;
-+  unsigned i;
-+
-+  a.offset = offset;
-+  for (i = 0; i < sizeof (action) / sizeof (*action); ++i)
-+    {
-+      splay_tree_node node;
-+
-+      a.action = action[i];
-+      node = splay_tree_lookup (action_list->tree, (splay_tree_key)&a);
-+      if (node)
-+	return (text_action *)node->value;
-     }
-   return NULL;
- }
-@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset)
- #if DEBUG
- 
- static void
--print_action_list (FILE *fp, text_action_list *action_list)
-+print_action (FILE *fp, text_action *r)
-+{
-+  const char *t = "unknown";
-+  switch (r->action)
-+    {
-+    case ta_remove_insn:
-+      t = "remove_insn"; break;
-+    case ta_remove_longcall:
-+      t = "remove_longcall"; break;
-+    case ta_convert_longcall:
-+      t = "convert_longcall"; break;
-+    case ta_narrow_insn:
-+      t = "narrow_insn"; break;
-+    case ta_widen_insn:
-+      t = "widen_insn"; break;
-+    case ta_fill:
-+      t = "fill"; break;
-+    case ta_none:
-+      t = "none"; break;
-+    case ta_remove_literal:
-+      t = "remove_literal"; break;
-+    case ta_add_literal:
-+      t = "add_literal"; break;
-+    }
-+
-+  fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
-+	   r->sec->owner->filename,
-+	   r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
-+}
-+
-+static int
-+print_action_list_fn (splay_tree_node node, void *p)
- {
--  text_action *r;
-+  text_action *r = (text_action *)node->value;
- 
--  fprintf (fp, "Text Action\n");
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      const char *t = "unknown";
--      switch (r->action)
--	{
--	case ta_remove_insn:
--	  t = "remove_insn"; break;
--	case ta_remove_longcall:
--	  t = "remove_longcall"; break;
--	case ta_convert_longcall:
--	  t = "convert_longcall"; break;
--	case ta_narrow_insn:
--	  t = "narrow_insn"; break;
--	case ta_widen_insn:
--	  t = "widen_insn"; break;
--	case ta_fill:
--	  t = "fill"; break;
--	case ta_none:
--	  t = "none"; break;
--	case ta_remove_literal:
--	  t = "remove_literal"; break;
--	case ta_add_literal:
--	  t = "add_literal"; break;
--	}
-+  print_action (p, r);
-+  return 0;
-+}
- 
--      fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
--	       r->sec->owner->filename,
--	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
--    }
-+static void
-+print_action_list (FILE *fp, text_action_list *action_list)
-+{
-+  fprintf (fp, "Text Action\n");
-+  splay_tree_foreach (action_list->tree, print_action_list_fn, fp);
- }
- 
- #endif /* DEBUG */
-@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec)
-   relax_info->removed_list.head = NULL;
-   relax_info->removed_list.tail = NULL;
- 
--  relax_info->action_list.head = NULL;
--
-+  relax_info->action_list.tree = splay_tree_new (text_action_compare,
-+						 NULL, NULL);
-   relax_info->action_list.map.n_entries = 0;
-   relax_info->action_list.map.entry = NULL;
- 
-@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd,
-   free_reloc_range_list (&relevant_relocs);
- 
- #if DEBUG
--  if (relax_info->action_list.head)
-+  if (action_list_count (&relax_info->action_list))
-     print_action_list (stderr, &relax_info->action_list);
- #endif
- 
-@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
-   return e->new_address - e->orig_address + offset;
- }
- 
-+typedef struct xlate_map_context_struct xlate_map_context;
-+struct xlate_map_context_struct
-+{
-+  xlate_map_t *map;
-+  xlate_map_entry_t *current_entry;
-+  int removed;
-+};
-+
-+static int
-+xlate_map_fn (splay_tree_node node, void *p)
-+{
-+  text_action *r = (text_action *)node->value;
-+  xlate_map_context *ctx = p;
-+  unsigned orig_size = 0;
-+
-+  switch (r->action)
-+    {
-+    case ta_none:
-+    case ta_remove_insn:
-+    case ta_convert_longcall:
-+    case ta_remove_literal:
-+    case ta_add_literal:
-+      break;
-+    case ta_remove_longcall:
-+      orig_size = 6;
-+      break;
-+    case ta_narrow_insn:
-+      orig_size = 3;
-+      break;
-+    case ta_widen_insn:
-+      orig_size = 2;
-+      break;
-+    case ta_fill:
-+      break;
-+    }
-+  ctx->current_entry->size =
-+    r->offset + orig_size - ctx->current_entry->orig_address;
-+  if (ctx->current_entry->size != 0)
-+    {
-+      ctx->current_entry++;
-+      ctx->map->entry_count++;
-+    }
-+  ctx->current_entry->orig_address = r->offset + orig_size;
-+  ctx->removed += r->removed_bytes;
-+  ctx->current_entry->new_address = r->offset + orig_size - ctx->removed;
-+  ctx->current_entry->size = 0;
-+  return 0;
-+}
- 
- /* Build a binary searchable offset translation map from a section's
-    action list.  */
-@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map,
- static xlate_map_t *
- build_xlate_map (asection *sec, xtensa_relax_info *relax_info)
- {
--  xlate_map_t *map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
-   text_action_list *action_list = &relax_info->action_list;
-   unsigned num_actions = 0;
--  text_action *r;
--  int removed;
--  xlate_map_entry_t *current_entry;
-+  xlate_map_context ctx;
- 
--  if (map == NULL)
-+  ctx.map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t));
-+
-+  if (ctx.map == NULL)
-     return NULL;
- 
-   num_actions = action_list_count (action_list);
--  map->entry = (xlate_map_entry_t *)
-+  ctx.map->entry = (xlate_map_entry_t *)
-     bfd_malloc (sizeof (xlate_map_entry_t) * (num_actions + 1));
--  if (map->entry == NULL)
-+  if (ctx.map->entry == NULL)
-     {
--      free (map);
-+      free (ctx.map);
-       return NULL;
-     }
--  map->entry_count = 0;
-+  ctx.map->entry_count = 0;
- 
--  removed = 0;
--  current_entry = &map->entry[0];
-+  ctx.removed = 0;
-+  ctx.current_entry = &ctx.map->entry[0];
- 
--  current_entry->orig_address = 0;
--  current_entry->new_address = 0;
--  current_entry->size = 0;
-+  ctx.current_entry->orig_address = 0;
-+  ctx.current_entry->new_address = 0;
-+  ctx.current_entry->size = 0;
- 
--  for (r = action_list->head; r != NULL; r = r->next)
--    {
--      unsigned orig_size = 0;
--      switch (r->action)
--	{
--	case ta_none:
--	case ta_remove_insn:
--	case ta_convert_longcall:
--	case ta_remove_literal:
--	case ta_add_literal:
--	  break;
--	case ta_remove_longcall:
--	  orig_size = 6;
--	  break;
--	case ta_narrow_insn:
--	  orig_size = 3;
--	  break;
--	case ta_widen_insn:
--	  orig_size = 2;
--	  break;
--	case ta_fill:
--	  break;
--	}
--      current_entry->size =
--	r->offset + orig_size - current_entry->orig_address;
--      if (current_entry->size != 0)
--	{
--	  current_entry++;
--	  map->entry_count++;
--	}
--      current_entry->orig_address = r->offset + orig_size;
--      removed += r->removed_bytes;
--      current_entry->new_address = r->offset + orig_size - removed;
--      current_entry->size = 0;
--    }
-+  splay_tree_foreach (action_list->tree, xlate_map_fn, &ctx);
- 
--  current_entry->size = (bfd_get_section_limit (sec->owner, sec)
--			 - current_entry->orig_address);
--  if (current_entry->size != 0)
--    map->entry_count++;
-+  ctx.current_entry->size = (bfd_get_section_limit (sec->owner, sec)
-+			     - ctx.current_entry->orig_address);
-+  if (ctx.current_entry->size != 0)
-+    ctx.map->entry_count++;
- 
--  return map;
-+  return ctx.map;
- }
- 
- 
-@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec,
- 
- /* Second relaxation pass.  */
- 
-+static int
-+action_remove_bytes_fn (splay_tree_node node, void *p)
-+{
-+  bfd_size_type *final_size = p;
-+  text_action *action = (text_action *)node->value;
-+
-+  *final_size -= action->removed_bytes;
-+  return 0;
-+}
-+
- /* Modify all of the relocations to point to the right spot, and if this
-    is a relaxable section, delete the unwanted literals and fix the
-    section size.  */
-@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 
-   internal_relocs = retrieve_internal_relocs (abfd, sec,
- 					      link_info->keep_memory);
--  if (!internal_relocs && !relax_info->action_list.head)
-+  if (!internal_relocs && !action_list_count (&relax_info->action_list))
-     return TRUE;
- 
-   contents = retrieve_contents (abfd, sec, link_info->keep_memory);
-@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 			}
- 		      /* Update the action so that the code that moves
- 			 the contents will do the right thing.  */
-+		      /* ta_remove_longcall and ta_remove_insn actions are
-+		         grouped together in the tree as well as
-+			 ta_convert_longcall and ta_none, so that changes below
-+			 can be done w/o removing and reinserting action into
-+			 the tree.  */
-+
- 		      if (action->action == ta_remove_longcall)
- 			action->action = ta_remove_insn;
- 		      else
-@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 
-   if ((relax_info->is_relaxable_literal_section
-        || relax_info->is_relaxable_asm_section)
--      && relax_info->action_list.head)
-+      && action_list_count (&relax_info->action_list))
-     {
-       /* Walk through the planned actions and build up a table
- 	 of move, copy and fill records.  Use the move, copy and
- 	 fill records to perform the actions once.  */
- 
--      int removed = 0;
-       bfd_size_type final_size, copy_size, orig_insn_size;
-       bfd_byte *scratch = NULL;
-       bfd_byte *dup_contents = NULL;
-@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
-       bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot.  */
-       bfd_vma dup_dot = 0;
- 
--      text_action *action = relax_info->action_list.head;
-+      text_action *action;
- 
-       final_size = sec->size;
--      for (action = relax_info->action_list.head; action;
--	   action = action->next)
--	{
--	  final_size -= action->removed_bytes;
--	}
- 
-+      splay_tree_foreach (relax_info->action_list.tree,
-+			  action_remove_bytes_fn, &final_size);
-       scratch = (bfd_byte *) bfd_zmalloc (final_size);
-       dup_contents = (bfd_byte *) bfd_zmalloc (final_size);
- 
-@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
-       print_action_list (stderr, &relax_info->action_list);
- #endif
- 
--      for (action = relax_info->action_list.head; action;
--	   action = action->next)
-+      for (action = action_first (&relax_info->action_list); action;
-+	   action = action_next (&relax_info->action_list, action))
- 	{
- 	  virtual_action = FALSE;
- 	  if (action->offset > orig_dot)
-@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info)
- 	      break;
- 	    }
- 
--	  removed += action->removed_bytes;
- 	  BFD_ASSERT (dup_dot <= final_size);
- 	  BFD_ASSERT (orig_dot <= orig_size);
- 	}
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch b/bsp/buildroot/package/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
deleted file mode 100644
index 043ff4df..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch
+++ /dev/null
@@ -1,345 +0,0 @@
-From cbe53e134d4c3a656880a906738ce19fdcd38e8b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 1 May 2015 11:39:12 +0300
-Subject: [PATCH] xtensa: optimize trampolines relaxation
-
-Currently every fixup in the current segment is checked when relaxing
-trampoline frag. This is very expensive. Make a searchable array of
-fixups pointing at potentially oversized jumps at the beginning of every
-relaxation pass and only check subset of this cache in the reach of
-single jump from the trampoline frag currently being relaxed.
-
-Original profile:
-
-% time    self  children    called     name
------------------------------------------
-        370.16  593.38 12283048/12283048     relax_segment
-  98.4  370.16  593.38 12283048         xtensa_relax_frag
-         58.91  269.26 2691463834/2699602236     xtensa_insnbuf_from_chars
-         68.35   68.17 811266668/813338977     S_GET_VALUE
-         36.85   29.51 2684369246/2685538060     xtensa_opcode_decode
-         28.34    8.84 2684369246/2685538060     xtensa_format_get_slot
-         12.39    5.94 2691463834/2699775044     xtensa_format_decode
-          0.03    4.60 4101109/4101109     relax_frag_for_align
-          0.18    1.76  994617/994617      relax_frag_immed
-          0.07    0.09 24556277/24851220     new_logical_line
-          0.06    0.00 12283048/14067410     as_where
-          0.04    0.00 7094588/15460506     xtensa_format_num_slots
-          0.00    0.00       1/712477      xtensa_insnbuf_alloc
------------------------------------------
-
-Same data, after optimization:
-
-% time    self  children    called     name
------------------------------------------
-          0.51    7.47 12283048/12283048     relax_segment
-  58.0    0.51    7.47 12283048         xtensa_relax_frag
-          0.02    4.08 4101109/4101109     relax_frag_for_align
-          0.18    1.39  994617/994617      relax_frag_immed
-          0.01    0.98     555/555         xtensa_cache_relaxable_fixups
-          0.21    0.25 7094588/16693271     xtensa_insnbuf_from_chars
-          0.06    0.12 24556277/24851220     new_logical_line
-          0.06    0.00 7094588/15460506     xtensa_format_num_slots
-          0.02    0.04 7094588/16866079     xtensa_format_decode
-          0.05    0.00 12283048/14067410     as_where
-          0.00    0.00       1/712477      xtensa_insnbuf_alloc
-          0.00    0.00   93808/93808       xtensa_find_first_cached_fixup
------------------------------------------
-
-2015-05-02  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (cached_fixupS, fixup_cacheS): New typedefs.
-	(struct cached_fixup, struct fixup_cache): New structures.
-	(fixup_order, xtensa_make_cached_fixup),
-	(xtensa_realloc_fixup_cache, xtensa_cache_relaxable_fixups),
-	(xtensa_find_first_cached_fixup, xtensa_delete_cached_fixup),
-	(xtensa_add_cached_fixup): New functions.
-	(xtensa_relax_frag): Cache fixups pointing at potentially
-	oversized jumps at the beginning of every relaxation pass. Only
-	check subset of this cache in the reach of single jump from the
-	trampoline frag currently being relaxed.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 194 insertions(+), 26 deletions(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 3e85b69..31c0b6b 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long);
- static long relax_frag_immed
-   (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean);
- 
-+typedef struct cached_fixup cached_fixupS;
-+struct cached_fixup
-+{
-+  int addr;
-+  int target;
-+  int delta;
-+  fixS *fixP;
-+};
-+
-+typedef struct fixup_cache fixup_cacheS;
-+struct fixup_cache
-+{
-+  cached_fixupS *fixups;
-+  unsigned n_fixups;
-+  unsigned n_max;
-+
-+  segT seg;
-+  fragS *first_frag;
-+};
-+
-+static int fixup_order (const void *a, const void *b)
-+{
-+  const cached_fixupS *pa = a;
-+  const cached_fixupS *pb = b;
-+
-+  if (pa->addr == pb->addr)
-+    {
-+      if (pa->target == pb->target)
-+	{
-+	  if (pa->fixP->fx_r_type == pb->fixP->fx_r_type)
-+	    return 0;
-+	  return pa->fixP->fx_r_type < pb->fixP->fx_r_type ?  -1 : 1;
-+	}
-+      return pa->target - pb->target;
-+    }
-+  return pa->addr - pb->addr;
-+}
-+
-+static bfd_boolean xtensa_make_cached_fixup (cached_fixupS *o, fixS *fixP)
-+{
-+  xtensa_isa isa = xtensa_default_isa;
-+  int addr = fixP->fx_frag->fr_address;
-+  int target;
-+  int delta;
-+  symbolS *s = fixP->fx_addsy;
-+  int slot;
-+  xtensa_format fmt;
-+  xtensa_opcode opcode;
-+
-+  if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
-+      fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
-+    return FALSE;
-+  target = S_GET_VALUE (s);
-+  delta = target - addr;
-+
-+  if (abs(delta) < J_RANGE / 2)
-+    return FALSE;
-+
-+  xtensa_insnbuf_from_chars (isa, trampoline_buf,
-+			     (unsigned char *) fixP->fx_frag->fr_literal +
-+			     fixP->fx_where, 0);
-+  fmt = xtensa_format_decode (isa, trampoline_buf);
-+  gas_assert (fmt != XTENSA_UNDEFINED);
-+  slot = fixP->tc_fix_data.slot;
-+  xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
-+  opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
-+  if (opcode != xtensa_j_opcode)
-+    return FALSE;
-+
-+  o->addr = addr;
-+  o->target = target;
-+  o->delta = delta;
-+  o->fixP = fixP;
-+
-+  return TRUE;
-+}
-+
-+static void xtensa_realloc_fixup_cache (fixup_cacheS *cache, unsigned add)
-+{
-+  if (cache->n_fixups + add > cache->n_max)
-+    {
-+      cache->n_max = (cache->n_fixups + add) * 2;
-+      cache->fixups = xrealloc (cache->fixups,
-+				sizeof (*cache->fixups) * cache->n_max);
-+    }
-+}
-+
-+static void xtensa_cache_relaxable_fixups (fixup_cacheS *cache,
-+					   segment_info_type *seginfo)
-+{
-+  fixS *fixP;
-+
-+  cache->n_fixups = 0;
-+
-+  for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+    {
-+      xtensa_realloc_fixup_cache (cache, 1);
-+
-+      if (xtensa_make_cached_fixup (cache->fixups + cache->n_fixups, fixP))
-+	++cache->n_fixups;
-+    }
-+  qsort (cache->fixups, cache->n_fixups, sizeof (*cache->fixups), fixup_order);
-+}
-+
-+static unsigned xtensa_find_first_cached_fixup (const fixup_cacheS *cache,
-+						int addr)
-+{
-+  unsigned a = 0;
-+  unsigned b = cache->n_fixups;
-+
-+  while (b - a > 1)
-+    {
-+      unsigned c = (a + b) / 2;
-+
-+      if (cache->fixups[c].addr < addr)
-+	a = c;
-+      else
-+	b = c;
-+    }
-+  return a;
-+}
-+
-+static void xtensa_delete_cached_fixup (fixup_cacheS *cache, unsigned i)
-+{
-+  memmove (cache->fixups + i, cache->fixups + i + 1,
-+	   (cache->n_fixups - i - 1) * sizeof (*cache->fixups));
-+  --cache->n_fixups;
-+}
-+
-+static bfd_boolean xtensa_add_cached_fixup (fixup_cacheS *cache, fixS *fixP)
-+{
-+  cached_fixupS o;
-+  unsigned i;
-+
-+  if (!xtensa_make_cached_fixup (&o, fixP))
-+    return FALSE;
-+  xtensa_realloc_fixup_cache (cache, 1);
-+  i = xtensa_find_first_cached_fixup (cache, o.addr);
-+  if (i < cache->n_fixups)
-+    {
-+      ++i;
-+      memmove (cache->fixups + i + 1, cache->fixups + i,
-+	       (cache->n_fixups - i) * sizeof (*cache->fixups));
-+    }
-+  cache->fixups[i] = o;
-+  ++cache->n_fixups;
-+  return TRUE;
-+}
- 
- /* Return the number of bytes added to this fragment, given that the
-    input has been stretched already by "stretch".  */
-@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
-     case RELAX_TRAMPOLINE:
-       if (fragP->tc_frag_data.relax_seen)
-         {
--          segment_info_type *seginfo = seg_info (now_seg);
--          fragS *fP; /* The out-of-range jump.  */
--          fixS *fixP;
-+	  static fixup_cacheS fixup_cache;
-+	  segment_info_type *seginfo = seg_info (now_seg);
-+	  int trampaddr = fragP->fr_address + fragP->fr_fix;
-+	  int searchaddr = trampaddr < J_RANGE ? 0 : trampaddr - J_RANGE;
-+	  unsigned i;
-+
-+	  if (now_seg != fixup_cache.seg ||
-+	      fragP == fixup_cache.first_frag ||
-+	      fixup_cache.first_frag == NULL)
-+	    {
-+	      xtensa_cache_relaxable_fixups (&fixup_cache, seginfo);
-+	      fixup_cache.seg = now_seg;
-+	      fixup_cache.first_frag = fragP;
-+	    }
- 
-           /* Scan for jumps that will not reach.  */
--          for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next)
-+          for (i = xtensa_find_first_cached_fixup (&fixup_cache, searchaddr);
-+	       i < fixup_cache.n_fixups; ++i)
-+
-             {
--              symbolS *s = fixP->fx_addsy;
--	      xtensa_opcode opcode;
--              int target;
--              int addr;
--              int delta;
--
--              if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP ||
--                  fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP)
--                continue;
--	      xtensa_insnbuf_from_chars (isa, trampoline_buf,
--					 (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where,
--					 0);
--	      fmt = xtensa_format_decode (isa, trampoline_buf);
--	      gas_assert (fmt != XTENSA_UNDEFINED);
--	      slot = fixP->tc_fix_data.slot;
--	      xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf);
--	      opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf);
--	      if (opcode != xtensa_j_opcode)
-+	      fixS *fixP = fixup_cache.fixups[i].fixP;
-+	      int target = fixup_cache.fixups[i].target;
-+	      int addr = fixup_cache.fixups[i].addr;
-+	      int delta = fixup_cache.fixups[i].delta + stretch;
-+
-+	      trampaddr = fragP->fr_address + fragP->fr_fix;
-+
-+	      if (addr + J_RANGE < trampaddr)
- 		continue;
--              target = S_GET_VALUE (s);
--              addr = fixP->fx_frag->fr_address;
--              delta = target - addr + stretch;
-+	      if (addr > trampaddr + J_RANGE)
-+		break;
-+	      if (abs (delta) < J_RANGE)
-+		continue;
-+
-+	      slot = fixP->tc_fix_data.slot;
-+
-               if (delta > J_RANGE  || delta < -1 * J_RANGE)
-                 { /* Found an out-of-range jump; scan the list of trampolines for the best match.  */
- 		  struct trampoline_seg *ts = find_trampoline_seg (now_seg);
-@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 		    }
- 		  if (tf->fragP == fragP)
- 		    {
--		      int trampaddr = fragP->fr_address + fragP->fr_fix;
--
- 		      if (abs (addr - trampaddr) < J_RANGE)
- 			{ /* The trampoline is in range of original; fix it!  */
- 			  fixS *newfixP;
- 			  int offset;
- 			  TInsn insn;
- 			  symbolS *lsym;
-+			  fragS *fP; /* The out-of-range jump.  */
- 
- 			  new_stretch += init_trampoline_frag (tf);
- 			  offset = fragP->fr_fix; /* Where to assemble the j insn.  */
-@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 			  newfixP->tc_fix_data.X_add_symbol = lsym;
- 			  newfixP->tc_fix_data.X_add_number = offset;
- 			  newfixP->tc_fix_data.slot = slot;
-+
-+			  xtensa_delete_cached_fixup (&fixup_cache, i);
-+			  xtensa_add_cached_fixup (&fixup_cache, newfixP);
-+
- 			  /* Move the fix-up from the original j insn to this one.  */
- 			  fixP->fx_frag = fragP;
- 			  fixP->fx_where = fragP->fr_fix - 3;
- 			  fixP->tc_fix_data.slot = 0;
-+
-+			  xtensa_add_cached_fixup (&fixup_cache, fixP);
-+
-+			  /* re-do current fixup */
-+			  --i;
-+
- 			  /* Adjust the jump around this trampoline (if present).  */
- 			  if (tf->fixP != NULL)
- 			    {
-@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
- 			      fragP->fr_subtype = 0;
- 			      /* Remove from the trampoline_list.  */
- 			      prev->next = tf->next;
-+			      if (fragP == fixup_cache.first_frag)
-+				fixup_cache.first_frag = NULL;
- 			      break;
- 			    }
- 			}
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/bsp/buildroot/package/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
deleted file mode 100644
index 9ad6b3be..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 8ec76b16f62d1bf386fb2c39af5f66c3afddc5cb Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 14 May 2015 05:22:55 +0300
-Subject: [PATCH] xtensa: fix localized symbol refcounting with --gc-sections
-
-elf_xtensa_gc_sweep_hook doesn't correctly unreference symbols that were
-made local, that results in link failure with the following message:
-
-  BFD (GNU Binutils) 2.24 internal error, aborting at elf32-xtensa.c line
-  3372 in elf_xtensa_finish_dynamic_sections
-
-elf_xtensa_gc_sweep_hook determines symbol reference type (PLT or GOT) by
-relocation type. Relocation types are not changed when symbol becomes
-local, but its PLT references are added to GOT references and
-plt.refcount is set to 0. Such symbol cannot be unreferences in the
-elf_xtensa_gc_sweep_hook and its extra references make calculated GOT
-relocations section size not match number of GOT relocations.
-
-Fix it by treating PLT reference as GOT reference when plt.refcount is
-not positive.
-
-2015-05-14  Max Filippov  <jcmvbkbc@gmail.com>
-bfd/
-	* elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Treat PLT reference
-	as GOT reference when plt.refcount is not positive.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388
-Changes to ChangeLog are dropped.
-
- bfd/elf32-xtensa.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
-index 53af1c6..2523670 100644
---- a/bfd/elf32-xtensa.c
-+++ b/bfd/elf32-xtensa.c
-@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd,
- 	{
- 	  if (is_plt)
- 	    {
-+	      /* If the symbol has been localized its plt.refcount got moved
-+	         to got.refcount.  Handle it as GOT.  */
- 	      if (h->plt.refcount > 0)
- 		h->plt.refcount--;
-+	      else
-+		is_got = TRUE;
- 	    }
--	  else if (is_got)
-+	  if (is_got)
- 	    {
- 	      if (h->got.refcount > 0)
- 		h->got.refcount--;
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/bsp/buildroot/package/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
deleted file mode 100644
index 4a3de2c8..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2d0522e76e4afeeb2e104e0a4332d94fa0d2fbf6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sun, 17 May 2015 06:46:15 +0300
-Subject: [PATCH] xtensa: fix gas segfault with --text-section-literals
-
-When --text-section-literals is used and code in the .init or .fini
-emits literal in the absence of .literal_position, xtensa_move_literals
-segfaults.
-
-Check that search_frag is non-NULL in the xtensa_move_literals and
-report error otherwise.
-
-2015-05-26  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Check that
-	search_frag is non-NULL. Report error if literal frag is not
-	found.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4
-Changes to ChangeLog are dropped.
-
- gas/config/tc-xtensa.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 31c0b6b..18307c1 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -10808,13 +10808,21 @@ xtensa_move_literals (void)
-       frchain_to = NULL;
-       frag_splice = &(frchain_from->frch_root);
- 
--      while (!search_frag->tc_frag_data.literal_frag)
-+      while (search_frag && !search_frag->tc_frag_data.literal_frag)
- 	{
- 	  gas_assert (search_frag->fr_fix == 0
- 		  || search_frag->fr_type == rs_align);
- 	  search_frag = search_frag->fr_next;
- 	}
- 
-+      if (!search_frag)
-+	{
-+	  search_frag = frchain_from->frch_root;
-+	  as_bad_where (search_frag->fr_file, search_frag->fr_line,
-+			_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	  continue;
-+	}
-+
-       gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype
- 	      == RELAX_LITERAL_POOL_BEGIN);
-       xtensa_switch_section_emit_state (&state, segment->seg, 0);
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch b/bsp/buildroot/package/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch
deleted file mode 100644
index 3ed9af12..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch
+++ /dev/null
@@ -1,699 +0,0 @@
-From 978adaaa4cd3921842e2be8a31c05f081fb17fcf Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 29 Jul 2015 17:42:54 +0300
-Subject: [PATCH] xtensa: add --auto-litpools option
-
-Auto-litpools is the automated version of text-section-literals: literal
-pool candidate frags are planted every N frags and during relaxation
-they are turned into actual literal pools where literals are moved to
-become reachable for their first reference by L32R instruction.
-
-2015-08-12  David Weatherford  <weath@cadence.com>
-gas/
-	* config/tc-xtensa.c (struct litpool_frag, struct litpool_seg):
-	New structures.
-	(xtensa_maybe_create_literal_pool_frag): New function.
-	(litpool_seg_list, auto_litpools, auto_litpool_limit)
-	(litpool_buf, litpool_slotbuf): New static variables.
-	(option_auto_litpools, option_no_auto_litpools)
-	(option_auto_litpool_limit): New enum identifiers.
-	(md_longopts): Add entries for auto-litpools, no-auto-litpools
-	and auto-litpool-limit.
-	(md_parse_option): Handle option_auto_litpools,
-	option_no_auto_litpools and option_auto_litpool_limit.
-	(md_show_usage): Add help for --[no-]auto-litpools and
-	--auto-litpool-limit.
-	(xtensa_mark_literal_pool_location): Record a place for literal
-	pool with a call to xtensa_maybe_create_literal_pool_frag.
-	(get_literal_pool_location): Find highest priority literal pool
-	or convert candidate to literal pool when auto-litpools are used.
-	(xg_assemble_vliw_tokens): Create literal pool after jump
-	instruction.
-	(xtensa_check_frag_count): Create candidate literal pool every
-	auto_litpool_limit frags.
-	(xtensa_relax_frag): Add jump around literals to non-empty
-	literal pool.
-	(xtensa_move_literals): Estimate literal pool addresses and move
-	unreachable literals closer to their users, converting candidate
-	to literal pool if needed.
-	(xtensa_switch_to_non_abs_literal_fragment): Only emit error
-	about missing .literal_position in case auto-litpools are not
-	used.
-	* config/tc-xtensa.h (xtensa_relax_statesE): New relaxation
-	state: RELAX_LITERAL_POOL_CANDIDATE_BEGIN.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gas/testsuite/
-	* gas/xtensa/all.exp: Add auto-litpools to the list of xtensa
-	tests.
-	* gas/xtensa/auto-litpools.s: New file: auto-litpools test.
-	* gas/xtensa/auto-litpools.s: New file: auto-litpools test
-	result pattern.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5
-Changes to ChangeLogs and documentation are dropped.
-
- gas/config/tc-xtensa.c                   | 432 ++++++++++++++++++++++++++++++-
- gas/config/tc-xtensa.h                   |   1 +
- gas/testsuite/gas/xtensa/all.exp         |   1 +
- gas/testsuite/gas/xtensa/auto-litpools.d |  12 +
- gas/testsuite/gas/xtensa/auto-litpools.s |  13 +
- 5 files changed, 454 insertions(+), 5 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d
- create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 7311a05..b8b1e7d 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -440,6 +440,29 @@ bfd_boolean directive_state[] =
- #endif
- };
- 
-+/* A circular list of all potential and actual literal pool locations
-+   in a segment.  */
-+struct litpool_frag
-+{
-+  struct litpool_frag *next;
-+  struct litpool_frag *prev;
-+  fragS *fragP;
-+  addressT addr;
-+  short priority; /* 1, 2, or 3 -- 1 is highest  */
-+  short original_priority;
-+};
-+
-+/* Map a segment to its litpool_frag list.  */
-+struct litpool_seg
-+{
-+  struct litpool_seg *next;
-+  asection *seg;
-+  struct litpool_frag frag_list;
-+  int frag_count; /* since last litpool location  */
-+};
-+
-+static struct litpool_seg litpool_seg_list;
-+
- 
- /* Directive functions.  */
- 
-@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean);
- static void xtensa_maybe_create_trampoline_frag (void);
- struct trampoline_frag;
- static int init_trampoline_frag (struct trampoline_frag *);
-+static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean);
-+static bfd_boolean auto_litpools = FALSE;
-+static int auto_litpool_limit = 10000;
- 
- /* Alignment Functions.  */
- 
-@@ -698,6 +724,10 @@ enum
- 
-   option_trampolines,
-   option_no_trampolines,
-+
-+  option_auto_litpools,
-+  option_no_auto_litpools,
-+  option_auto_litpool_limit,
- };
- 
- const char *md_shortopts = "";
-@@ -773,6 +803,10 @@ struct option md_longopts[] =
-   { "trampolines", no_argument, NULL, option_trampolines },
-   { "no-trampolines", no_argument, NULL, option_no_trampolines },
- 
-+  { "auto-litpools", no_argument, NULL, option_auto_litpools },
-+  { "no-auto-litpools", no_argument, NULL, option_no_auto_litpools },
-+  { "auto-litpool-limit", required_argument, NULL, option_auto_litpool_limit },
-+
-   { NULL, no_argument, NULL, 0 }
- };
- 
-@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg)
-       use_trampolines = FALSE;
-       return 1;
- 
-+    case option_auto_litpools:
-+      auto_litpools = TRUE;
-+      use_literal_section = FALSE;
-+      return 1;
-+
-+    case option_no_auto_litpools:
-+      auto_litpools = FALSE;
-+      auto_litpool_limit = -1;
-+      return 1;
-+
-+    case option_auto_litpool_limit:
-+      {
-+	int value = 0;
-+	if (auto_litpool_limit < 0)
-+	  as_fatal (_("no-auto-litpools is incompatible with auto-litpool-limit"));
-+	if (*arg == 0 || *arg == '-')
-+	  as_fatal (_("invalid auto-litpool-limit argument"));
-+	value = strtol (arg, &arg, 10);
-+	if (*arg != 0)
-+	  as_fatal (_("invalid auto-litpool-limit argument"));
-+	if (value < 100 || value > 10000)
-+	  as_fatal (_("invalid auto-litpool-limit argument (range is 100-10000)"));
-+	auto_litpool_limit = value;
-+	auto_litpools = TRUE;
-+	use_literal_section = FALSE;
-+	return 1;
-+      }
-+
-     default:
-       return 0;
-     }
-@@ -986,7 +1048,12 @@ Xtensa options:\n\
-                           flix bundles\n\
-   --rename-section old=new Rename section 'old' to 'new'\n\
-   --[no-]trampolines      [Do not] generate trampolines (jumps to jumps)\n\
--                          when jumps do not reach their targets\n", stream);
-+                          when jumps do not reach their targets\n\
-+  --[no-]auto-litpools    [Do not] automatically create literal pools\n\
-+  --auto-litpool-limit=<value>\n\
-+                          (range 100-10000) Maximum number of blocks of\n\
-+                          instructions to emit between literal pool\n\
-+                          locations; implies --auto-litpools flag\n", stream);
- }
- 
- 
-@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void)
-   pool_location = frag_now;
-   frag_now->tc_frag_data.lit_frchain = frchain_now;
-   frag_now->tc_frag_data.literal_frag = frag_now;
-+  /* Just record this frag.  */
-+  xtensa_maybe_create_literal_pool_frag (FALSE, FALSE);
-   frag_variant (rs_machine_dependent, 0, 0,
- 		RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL);
-   xtensa_set_frag_assembly_state (frag_now);
-@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode)
- static fragS *
- get_literal_pool_location (segT seg)
- {
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  struct litpool_frag *lpf;
-+  for ( ; lps && lps->seg->id != seg->id; lps = lps->next)
-+    ;
-+  if (lps)
-+    {
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{ /* Skip "candidates" for now.  */
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN &&
-+	      lpf->priority == 1)
-+	    return lpf->fragP;
-+	}
-+      /* Must convert a lower-priority pool.  */
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN)
-+	    return lpf->fragP;
-+	}
-+      /* Still no match -- try for a low priority pool.  */
-+      for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev)
-+	{
-+	  if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN)
-+	    return lpf->fragP;
-+	}
-+    }
-   return seg_info (seg)->tc_segment_info_data.literal_pool_loc;
- }
- 
-@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
-       frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol;
-       frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset;
-       frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag;
-+      if (tinsn->opcode == xtensa_l32r_opcode)
-+	{
-+	  frag_now->tc_frag_data.literal_frags[slot] =
-+		  tinsn->tok[1].X_add_symbol->sy_frag;
-+	}
-       if (tinsn->literal_space != 0)
- 	xg_assemble_literal_space (tinsn->literal_space, slot);
-       frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg;
-@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn)
- 		    frag_now->fr_symbol, frag_now->fr_offset, NULL);
- 	  xtensa_set_frag_assembly_state (frag_now);
- 	  xtensa_maybe_create_trampoline_frag ();
-+	  /* Always create one here.  */
-+	  xtensa_maybe_create_literal_pool_frag (TRUE, FALSE);
- 	}
-       else if (is_branch && do_align_targets ())
- 	{
-@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void)
-       clear_frag_count ();
-       unreachable_count = 0;
-     }
-+
-+  /* We create an area for a possible literal pool every N (default 5000)
-+     frags or so.  */
-+  xtensa_maybe_create_literal_pool_frag (TRUE, TRUE);
- }
- 
- static xtensa_insnbuf trampoline_buf = NULL;
- static xtensa_insnbuf trampoline_slotbuf = NULL;
- 
-+static xtensa_insnbuf litpool_buf = NULL;
-+static xtensa_insnbuf litpool_slotbuf = NULL;
-+
- #define TRAMPOLINE_FRAG_SIZE 3000
- 
- static void
-@@ -7410,6 +7518,135 @@ dump_trampolines (void)
-     }
- }
- 
-+static void dump_litpools (void) __attribute__ ((unused));
-+
-+static void
-+dump_litpools (void)
-+{
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  struct litpool_frag *lpf;
-+
-+  for ( ; lps ; lps = lps->next )
-+    {
-+      printf("litpool seg %s\n", lps->seg->name);
-+      for ( lpf = lps->frag_list.next; lpf->fragP; lpf = lpf->next )
-+	{
-+	  fragS *litfrag = lpf->fragP->fr_next;
-+	  int count = 0;
-+	  while (litfrag && litfrag->fr_subtype != RELAX_LITERAL_POOL_END)
-+	    {
-+	      if (litfrag->fr_fix == 4)
-+		count++;
-+	      litfrag = litfrag->fr_next;
-+	    }
-+	  printf("   %ld <%d:%d> (%d) [%d]: ",
-+		 lpf->addr, lpf->priority, lpf->original_priority,
-+		 lpf->fragP->fr_line, count);
-+	  //dump_frag(lpf->fragP);
-+	}
-+    }
-+}
-+
-+static void
-+xtensa_maybe_create_literal_pool_frag (bfd_boolean create,
-+				       bfd_boolean only_if_needed)
-+{
-+  struct litpool_seg *lps = litpool_seg_list.next;
-+  fragS *fragP;
-+  struct litpool_frag *lpf;
-+  bfd_boolean needed = FALSE;
-+
-+  if (use_literal_section || !auto_litpools)
-+    return;
-+
-+  for ( ; lps ; lps = lps->next )
-+    {
-+      if (lps->seg == now_seg)
-+	break;
-+    }
-+
-+  if (lps == NULL)
-+    {
-+      lps = (struct litpool_seg *)xcalloc (sizeof (struct litpool_seg), 1);
-+      lps->next = litpool_seg_list.next;
-+      litpool_seg_list.next = lps;
-+      lps->seg = now_seg;
-+      lps->frag_list.next = &lps->frag_list;
-+      lps->frag_list.prev = &lps->frag_list;
-+    }
-+
-+  lps->frag_count++;
-+
-+  if (create)
-+    {
-+      if (only_if_needed)
-+	{
-+	  if (past_xtensa_end || !use_transform() ||
-+	      frag_now->tc_frag_data.is_no_transform)
-+	    {
-+	      return;
-+	    }
-+	  if (auto_litpool_limit <= 0)
-+	    {
-+	      /* Don't create a litpool based only on frag count.  */
-+	      return;
-+	    }
-+	  else if (lps->frag_count > auto_litpool_limit)
-+	    {
-+	      needed = TRUE;
-+	    }
-+	  else
-+	    {
-+	      return;
-+	    }
-+	}
-+      else
-+	{
-+	  needed = TRUE;
-+	}
-+    }
-+
-+  if (needed)
-+    {
-+      int size = (only_if_needed) ? 3 : 0; /* Space for a "j" insn.  */
-+      /* Create a potential site for a literal pool.  */
-+      frag_wane (frag_now);
-+      frag_new (0);
-+      xtensa_set_frag_assembly_state (frag_now);
-+      fragP = frag_now;
-+      fragP->tc_frag_data.lit_frchain = frchain_now;
-+      fragP->tc_frag_data.literal_frag = fragP;
-+      frag_var (rs_machine_dependent, size, size,
-+		    (only_if_needed) ?
-+		        RELAX_LITERAL_POOL_CANDIDATE_BEGIN :
-+		        RELAX_LITERAL_POOL_BEGIN,
-+		    NULL, 0, NULL);
-+      frag_now->tc_frag_data.lit_seg = now_seg;
-+      frag_variant (rs_machine_dependent, 0, 0,
-+		    RELAX_LITERAL_POOL_END, NULL, 0, NULL);
-+      xtensa_set_frag_assembly_state (frag_now);
-+    }
-+  else
-+    {
-+      /* RELAX_LITERAL_POOL_BEGIN frag is being created;
-+	 just record it here.  */
-+      fragP = frag_now;
-+    }
-+
-+  lpf = (struct litpool_frag *)xmalloc(sizeof (struct litpool_frag));
-+  /* Insert at tail of circular list.  */
-+  lpf->addr = 0;
-+  lps->frag_list.prev->next = lpf;
-+  lpf->next = &lps->frag_list;
-+  lpf->prev = lps->frag_list.prev;
-+  lps->frag_list.prev = lpf;
-+  lpf->fragP = fragP;
-+  lpf->priority = (needed) ? (only_if_needed) ? 3 : 2 : 1;
-+  lpf->original_priority = lpf->priority;
-+
-+  lps->frag_count = 0;
-+}
-+
- static void
- xtensa_cleanup_align_frags (void)
- {
-@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p)
-       break;
- 
-     case RELAX_LITERAL_POOL_BEGIN:
-+      if (fragP->fr_var != 0)
-+	{
-+	  /* We have a converted "candidate" literal pool;
-+	     assemble a jump around it.  */
-+	  TInsn insn;
-+	  if (!litpool_slotbuf)
-+	    {
-+	      litpool_buf = xtensa_insnbuf_alloc (isa);
-+	      litpool_slotbuf = xtensa_insnbuf_alloc (isa);
-+	    }
-+	  new_stretch += 3;
-+	  fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass.  */
-+	  fragP->tc_frag_data.is_insn = TRUE;
-+	  tinsn_init (&insn);
-+	  insn.insn_type = ITYPE_INSN;
-+	  insn.opcode = xtensa_j_opcode;
-+	  insn.ntok = 1;
-+	  set_expr_symbol_offset (&insn.tok[0], fragP->fr_symbol,
-+				  fragP->fr_fix);
-+	  fmt = xg_get_single_format (xtensa_j_opcode);
-+	  tinsn_to_slotbuf (fmt, 0, &insn, litpool_slotbuf);
-+	  xtensa_format_set_slot (isa, fmt, 0, litpool_buf, litpool_slotbuf);
-+	  xtensa_insnbuf_to_chars (isa, litpool_buf,
-+				   (unsigned char *)fragP->fr_literal +
-+				   fragP->fr_fix, 3);
-+	  fragP->fr_fix += 3;
-+	  fragP->fr_var -= 3;
-+	  /* Add a fix-up.  */
-+	  fix_new (fragP, 0, 3, fragP->fr_symbol, 0, TRUE,
-+		   BFD_RELOC_XTENSA_SLOT0_OP);
-+	}
-+      break;
-+
-     case RELAX_LITERAL_POOL_END:
-+    case RELAX_LITERAL_POOL_CANDIDATE_BEGIN:
-     case RELAX_MAYBE_UNREACHABLE:
-     case RELAX_MAYBE_DESIRE_ALIGN:
-       /* No relaxation required.  */
-@@ -10789,12 +11060,115 @@ xtensa_move_literals (void)
-   segT dest_seg;
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-+  struct litpool_seg *lps;
- 
-   mark_literal_frags (literal_head->next);
- 
-   if (use_literal_section)
-     return;
- 
-+  /* Assign addresses (rough estimates) to the potential literal pool locations
-+     and create new ones if the gaps are too large.  */
-+
-+  for (lps = litpool_seg_list.next; lps; lps = lps->next)
-+    {
-+      frchainS *frchP = seg_info (lps->seg)->frchainP;
-+      struct litpool_frag *lpf = lps->frag_list.next;
-+      addressT addr = 0;
-+
-+      for ( ; frchP; frchP = frchP->frch_next)
-+	{
-+	  fragS *fragP;
-+	  for (fragP = frchP->frch_root; fragP; fragP = fragP->fr_next)
-+	    {
-+	      if (lpf && fragP == lpf->fragP)
-+		{
-+		  gas_assert(fragP->fr_type == rs_machine_dependent &&
-+			     (fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN ||
-+			      fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN));
-+		  /* Found a litpool location.  */
-+		  lpf->addr = addr;
-+		  lpf = lpf->next;
-+		}
-+	      if (fragP->fr_type == rs_machine_dependent &&
-+		  fragP->fr_subtype == RELAX_SLOTS)
-+		{
-+		  int slot;
-+		  for (slot = 0; slot < MAX_SLOTS; slot++)
-+		    {
-+		      if (fragP->tc_frag_data.literal_frags[slot])
-+			{
-+			  /* L32R; point its literal to the nearest litpool
-+			     preferring non-"candidate" positions to avoid
-+			     the jump-around.  */
-+			  fragS *litfrag = fragP->tc_frag_data.literal_frags[slot];
-+			  struct litpool_frag *lp = lpf->prev;
-+			  if (!lp->fragP)
-+			    {
-+			      break;
-+			    }
-+			  while (lp->fragP->fr_subtype ==
-+				 RELAX_LITERAL_POOL_CANDIDATE_BEGIN)
-+			    {
-+			      lp = lp->prev;
-+			      if (lp->fragP == NULL)
-+				{
-+				  /* End of list; have to bite the bullet.
-+				     Take the nearest.  */
-+				  lp = lpf->prev;
-+				  break;
-+				}
-+			      /* Does it (conservatively) reach?  */
-+			      if (addr - lp->addr <= 128 * 1024)
-+				{
-+				  if (lp->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN)
-+				    {
-+				      /* Found a good one.  */
-+				      break;
-+				    }
-+				  else if (lp->prev->fragP &&
-+					   addr - lp->prev->addr > 128 * 1024)
-+				    {
-+				      /* This is still a "candidate" but the next one
-+				         will be too far away, so revert to the nearest
-+					 one, convert it and add the jump around.  */
-+				      fragS *poolbeg;
-+				      fragS *poolend;
-+				      symbolS *lsym;
-+				      char label[10 + 2 * sizeof (fragS *)];
-+				      lp = lpf->prev;
-+				      poolbeg = lp->fragP;
-+				      lp->priority = 1;
-+				      poolbeg->fr_subtype = RELAX_LITERAL_POOL_BEGIN;
-+				      poolend = poolbeg->fr_next;
-+				      gas_assert (poolend->fr_type == rs_machine_dependent &&
-+						  poolend->fr_subtype == RELAX_LITERAL_POOL_END);
-+				      /* Create a local symbol pointing to the
-+				         end of the pool.  */
-+				      sprintf (label, ".L0_LT_%p", poolbeg);
-+				      lsym = (symbolS *)local_symbol_make (label, lps->seg,
-+									   0, poolend);
-+				      poolbeg->fr_symbol = lsym;
-+				      /* Rest is done in xtensa_relax_frag.  */
-+				    }
-+				}
-+			    }
-+			  if (! litfrag->tc_frag_data.literal_frag)
-+			    {
-+			      /* Take earliest use of this literal to avoid
-+				 forward refs.  */
-+			      litfrag->tc_frag_data.literal_frag = lp->fragP;
-+			    }
-+			}
-+		    }
-+		}
-+	      addr += fragP->fr_fix;
-+	      if (fragP->fr_type == rs_fill)
-+		addr += fragP->fr_offset;
-+	    }
-+	}
-+    }
-+
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-       /* Keep the literals for .init and .fini in separate sections.  */
-@@ -10839,9 +11213,6 @@ xtensa_move_literals (void)
-       while (search_frag != frag_now)
- 	{
- 	  next_frag = search_frag->fr_next;
--
--	  /* First, move the frag out of the literal section and
--	     to the appropriate place.  */
- 	  if (search_frag->tc_frag_data.literal_frag)
- 	    {
- 	      literal_pool = search_frag->tc_frag_data.literal_frag;
-@@ -10849,8 +11220,56 @@ xtensa_move_literals (void)
- 	      frchain_to = literal_pool->tc_frag_data.lit_frchain;
- 	      gas_assert (frchain_to);
- 	    }
-+
-+	  if (search_frag->fr_type == rs_fill && search_frag->fr_fix == 0)
-+	    {
-+	      /* Skip empty fill frags.  */
-+	      *frag_splice = next_frag;
-+	      search_frag = next_frag;
-+	      continue;
-+	    }
-+
-+	  if (search_frag->fr_type == rs_align)
-+	    {
-+	      /* Skip alignment frags, because the pool as a whole will be
-+	         aligned if used, and we don't want to force alignment if the
-+		 pool is unused.  */
-+	      *frag_splice = next_frag;
-+	      search_frag = next_frag;
-+	      continue;
-+	    }
-+
-+	  /* First, move the frag out of the literal section and
-+	     to the appropriate place.  */
-+
-+	  /* Insert an aligmnent frag at start of pool.  */
-+	  if (literal_pool->fr_next->fr_type == rs_machine_dependent &&
-+	      literal_pool->fr_next->fr_subtype == RELAX_LITERAL_POOL_END)
-+	    {
-+	      segT pool_seg = literal_pool->fr_next->tc_frag_data.lit_seg;
-+	      emit_state prev_state;
-+	      fragS *prev_frag;
-+	      fragS *align_frag;
-+	      xtensa_switch_section_emit_state (&prev_state, pool_seg, 0);
-+	      prev_frag = frag_now;
-+	      frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL);
-+	      align_frag = frag_now;
-+	      frag_align (2, 0, 0);
-+	      /* Splice it into the right place.  */
-+	      prev_frag->fr_next = align_frag->fr_next;
-+	      align_frag->fr_next = literal_pool->fr_next;
-+	      literal_pool->fr_next = align_frag;
-+	      /* Insert after this one.  */
-+	      literal_pool->tc_frag_data.literal_frag = align_frag;
-+	      xtensa_restore_emit_state (&prev_state);
-+	    }
- 	  insert_after = literal_pool->tc_frag_data.literal_frag;
- 	  dest_seg = insert_after->fr_next->tc_frag_data.lit_seg;
-+	  /* Skip align frag.  */
-+	  if (insert_after->fr_next->fr_type == rs_align)
-+	    {
-+	      insert_after = insert_after->fr_next;
-+	    }
- 
- 	  *frag_splice = next_frag;
- 	  search_frag->fr_next = insert_after->fr_next;
-@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result)
-       && !recursive
-       && !is_init && ! is_fini)
-     {
--      as_bad (_("literal pool location required for text-section-literals; specify with .literal_position"));
-+      if (!auto_litpools)
-+	{
-+	  as_bad (_("literal pool location required for text-section-literals; specify with .literal_position"));
-+	}
- 
-       /* When we mark a literal pool location, we want to put a frag in
- 	 the literal pool that points to it.  But to do that, we want to
-diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h
-index b2e43fa..290d902 100644
---- a/gas/config/tc-xtensa.h
-+++ b/gas/config/tc-xtensa.h
-@@ -124,6 +124,7 @@ enum xtensa_relax_statesE
- 
-   RELAX_LITERAL_POOL_BEGIN,
-   RELAX_LITERAL_POOL_END,
-+  RELAX_LITERAL_POOL_CANDIDATE_BEGIN,
-   /* Technically these are not relaxations at all but mark a location
-      to store literals later.  Note that fr_var stores the frchain for
-      BEGIN frags and fr_var stores now_seg for END frags.  */
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index d197ec8..db39629 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -100,6 +100,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "jlong"
-     run_dump_test "trampoline"
-     run_dump_test "first_frag_align"
-+    run_dump_test "auto-litpools"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d
-new file mode 100644
-index 0000000..4d1a690
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/auto-litpools.d
-@@ -0,0 +1,12 @@
-+#as: --auto-litpools
-+#objdump: -d
-+#name: auto literal pool placement
-+
-+.*: +file format .*xtensa.*
-+#...
-+.*4:.*l32r.a2, 0 .*
-+#...
-+.*3e437:.*j.3e440 .*
-+#...
-+.*40750:.*l32r.a2, 3e43c .*
-+#...
-diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s
-new file mode 100644
-index 0000000..9a5b26b
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/auto-litpools.s
-@@ -0,0 +1,13 @@
-+	.text
-+	.align	4
-+	.literal	.L0, 0x12345
-+	.literal	.L1, 0x12345
-+
-+f:
-+	l32r	a2, .L0
-+	.rep	44000
-+	_nop
-+	_nop
-+	.endr
-+	l32r	a2, .L1
-+	ret
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch b/bsp/buildroot/package/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch
deleted file mode 100644
index bd751661..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 2 Feb 2016 17:11:38 +0300
-Subject: [PATCH] xtensa: fix signedness of gas relocations
-
-Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation
-offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations
-substituted for BFD_RELOC_*. This made it impossible to encode arbitrary
-8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc
-directive. Revert this part and add test.
-
-gas/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF*
-	substitutions for BFD_RELOC_* as unsigned.
-
-gas/testsuite/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* gas/xtensa/all.exp: Add loc to list of xtensa tests.
-	* gas/xtensa/loc.d: New file: loc test result patterns.
-	* gas/xtensa/loc.s: New file: loc test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gas/config/tc-xtensa.c           |  6 +++---
- gas/testsuite/gas/xtensa/all.exp |  1 +
- gas/testsuite/gas/xtensa/loc.d   | 10 ++++++++++
- gas/testsuite/gas/xtensa/loc.s   |  7 +++++++
- 4 files changed, 21 insertions(+), 3 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/loc.d
- create mode 100644 gas/testsuite/gas/xtensa/loc.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index a119871..36a06cc 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    default:
- 	      break;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 31b725b..7ff7bd7 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "trampoline"
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-+    run_dump_test "loc"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
-new file mode 100644
-index 0000000..71983cc
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.d
-@@ -0,0 +1,10 @@
-+#as:
-+#objdump: -r
-+#name: .loc directive relocs
-+
-+.*: +file format .*xtensa.*
-+
-+RELOCATION RECORDS FOR \[\.debug_line\]:
-+#...
-+.*R_XTENSA_DIFF16.*\.text\+0x00009c42
-+#...
-diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s
-new file mode 100644
-index 0000000..029e14e
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.s
-@@ -0,0 +1,7 @@
-+	.text
-+	.file 1 "loc.s"
-+	.loc 1 3
-+	nop
-+	.space 40000
-+	.loc 1 5
-+	nop
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch b/bsp/buildroot/package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch
deleted file mode 100644
index 6ae9d9af..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From d07f38875f37f4608e8ecb761619d84716896f14 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Wed, 10 Feb 2016 11:25:59 +0000
-Subject: [PATCH] Correct assertion in NIOS2 linker to allow signed 16-buit
- immediate values.
-
-	PR 19405
-	* elf32-nios2.c (nios2_elf32_install_imm16): Allow for signed
-	immediate values.
-	* elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Limit the
-	number of messages about FDE encoding preventing .eh_frame_hdr
-	generation.
-
-[Romain: rebase on 2.25.1]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- bfd/elf-eh-frame.c | 18 +++++++++++++++---
- bfd/elf32-nios2.c  |  2 +-
- 2 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
-index 002932d..22430f9 100644
---- a/bfd/elf-eh-frame.c
-+++ b/bfd/elf-eh-frame.c
-@@ -1181,14 +1181,26 @@ _bfd_elf_discard_section_eh_frame
- 		     && ent->make_relative == 0)
- 		    || (ent->fde_encoding & 0x70) == DW_EH_PE_aligned))
- 	      {
-+		static int num_warnings_issued = 0;
-+
- 		/* If a shared library uses absolute pointers
- 		   which we cannot turn into PC relative,
- 		   don't create the binary search table,
- 		   since it is affected by runtime relocations.  */
- 		hdr_info->table = FALSE;
--		(*info->callbacks->einfo)
--		  (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr"
--		     " table being created.\n"), abfd, sec);
-+		if (num_warnings_issued < 10)
-+		  {
-+		    (*info->callbacks->einfo)
-+		      (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr"
-+			 " table being created.\n"), abfd, sec);
-+		    num_warnings_issued ++;
-+		  }
-+		else if (num_warnings_issued == 10)
-+		  {
-+		    (*info->callbacks->einfo)
-+		      (_("%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation dropped.\n"));
-+		    num_warnings_issued ++;
-+		  }
- 	      }
- 	    ent->removed = 0;
- 	    hdr_info->fde_count++;
-diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
-index 0105b70..726647d 100644
---- a/bfd/elf32-nios2.c
-+++ b/bfd/elf32-nios2.c
-@@ -1035,7 +1035,7 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value)
- {
-   bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset);
- 
--  BFD_ASSERT(value <= 0xffff);
-+  BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff);
- 
-   bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6),
- 	      sec->contents + offset);
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch b/bsp/buildroot/package/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch
deleted file mode 100644
index ead3e42b..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 16 Feb 2016 02:23:28 +0300
-Subject: [PATCH] xtensa: fix .init/.fini literals moving
-
-Despite the documentation and the comment in xtensa_move_literals, in
-the presence of --text-section-literals and --auto-litpools literals are
-moved from the separate literal sections into .init and .fini, because
-the check in the xtensa_move_literals is incorrect.
-
-This moving was broken with introduction of auto litpools: some literals
-now may be lost. This happens because literal frags emitted from .init
-and .fini are not closed when new .literal_position marks new literal
-pool. Then frag_align(2, 0, 0) changes type of the last literal frag to
-rs_align. rs_align frags are skipped in the xtensa_move_literals. As a
-result fixups against such literals are not moved out of .init.literal/
-.fini.literal sections producing the following assembler error:
-
-  test.S: Warning: fixes not all moved from .init.literal
-  test.S: Internal error!
-
-Fix check for .init.literal/.fini.literal in the xtensa_move_literals
-and don't let it move literals from there in the presence of
---text-section-literals or --auto-litpools.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Fix check for
-	.init.literal/.fini.literal section name.
-	* testsuite/gas/xtensa/all.exp: Add init-fini-literals to the
-	list of xtensa tests.
-	* testsuite/gas/xtensa/init-fini-literals.d: New file:
-	init-fini-literals test result patterns.
-	* testsuite/gas/xtensa/init-fini-literals.s: New file:
-	init-fini-literals test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
-
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- gas/testsuite/gas/xtensa/all.exp              |  1 +
- gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++
- gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++
- 4 files changed, 54 insertions(+), 2 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-   struct litpool_seg *lps;
-+  const char *init_name = INIT_SECTION_NAME;
-+  const char *fini_name = FINI_SECTION_NAME;
-+  int init_name_len = strlen(init_name);
-+  int fini_name_len = strlen(fini_name);
- 
-   mark_literal_frags (literal_head->next);
- 
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
- 
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-+      const char *seg_name = segment_name (segment->seg);
-+
-       /* Keep the literals for .init and .fini in separate sections.  */
--      if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME)
--	  || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME))
-+      if ((!memcmp (seg_name, init_name, init_name_len) &&
-+	   !strcmp (seg_name + init_name_len, ".literal")) ||
-+	  (!memcmp (seg_name, fini_name, fini_name_len) &&
-+	   !strcmp (seg_name + fini_name_len, ".literal")))
- 	continue;
- 
-       frchain_from = seg_info (segment->seg)->frchainP;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 7ff7bd7..6b67320 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-     run_dump_test "loc"
-+    run_dump_test "init-fini-literals"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d
-new file mode 100644
-index 0000000..19ed121
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d
-@@ -0,0 +1,24 @@
-+#as: --text-section-literals
-+#objdump: -r
-+#name: check that literals for .init and .fini always go to separate sections
-+
-+.*: +file format .*xtensa.*
-+#...
-+RELOCATION RECORDS FOR \[\.init\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      init
-+#...
-+RELOCATION RECORDS FOR \[\.fini\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      fini
-+#...
-+RELOCATION RECORDS FOR \[\.init\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.init\.literal
-+.* R_XTENSA_SLOT0_OP  \.init\.literal\+0x00000004
-+#...
-+RELOCATION RECORDS FOR \[\.fini\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal\+0x00000004
-+#...
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s
-new file mode 100644
-index 0000000..7c9ec17
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s
-@@ -0,0 +1,19 @@
-+	.section	.init,"ax",@progbits
-+	.literal_position
-+	.literal .LC0, init@PLT
-+	.literal_position
-+	.literal .LC1, 1
-+	.align	4
-+
-+	l32r	a2, .LC0
-+	l32r	a2, .LC1
-+
-+	.section	.fini,"ax",@progbits
-+	.literal_position
-+	.literal .LC2, fini@PLT
-+	.literal_position
-+	.literal .LC3, 1
-+	.align	4
-+
-+	l32r	a2, .LC2
-+	l32r	a2, .LC3
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.25.1/916-microblaze-pr21180.patch b/bsp/buildroot/package/binutils/2.25.1/916-microblaze-pr21180.patch
deleted file mode 100644
index 2ffae49f..00000000
--- a/bsp/buildroot/package/binutils/2.25.1/916-microblaze-pr21180.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Fix ld segfault for microblaze when --gc-sections is used
-Upstream: pending
-https://sourceware.org/bugzilla/show_bug.cgi?id=21180
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c
---- binutils-2.25.1.orig/bfd/elf32-microblaze.c	2015-07-21 10:20:58.000000000 +0200
-+++ binutils-2.25.1/bfd/elf32-microblaze.c	2017-02-23 19:43:24.560776208 +0100
-@@ -3297,13 +3297,20 @@
-           && h->def_regular)
-         {
-           asection *sec = h->root.u.def.section;
-+	  bfd_vma value;
-+
-+	  value = h->root.u.def.value;
-+	  if (sec->output_section != NULL)
-+	    /* PR 21180: If the output section is NULL, then the symbol is no
-+	       longer needed, and in theory the GOT entry is redundant.  But
-+	       it is too late to change our minds now...  */
-+	    value += sec->output_section->vma + sec->output_offset;
-+
-           microblaze_elf_output_dynamic_relocation (output_bfd,
-                                                     srela, srela->reloc_count++,
-                                                     /* symindex= */ 0,
-                                                     R_MICROBLAZE_REL, offset,
--                                                    h->root.u.def.value
--                                                    + sec->output_section->vma
--                                                    + sec->output_offset);
-+                                                    value);
-         }
-       else
-         {
diff --git a/bsp/buildroot/package/binutils/2.26.1/0300-ld-makefile.patch b/bsp/buildroot/package/binutils/2.26.1/0300-ld-makefile.patch
deleted file mode 100644
index 73cc0980..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0300-ld-makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:40:53 +0100
-Subject: [PATCH] ld-makefile
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- ld/Makefile.am | 2 +-
- ld/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 0b3b049..3871c74 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -57,7 +57,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index ed98f87..530e4c9 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0301-check-ldrunpath-length.patch b/bsp/buildroot/package/binutils/2.26.1/0301-check-ldrunpath-length.patch
deleted file mode 100644
index 3b4c204c..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0301-check-ldrunpath-length.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:41:47 +0100
-Subject: [PATCH] check-ldrunpath-length
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- ld/emultempl/elf32.em | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 0405d4f..efd3300 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1242,6 +1242,8 @@ fragment <<EOF
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void)
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch b/bsp/buildroot/package/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch
deleted file mode 100644
index f67a43ef..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:42:48 +0100
-Subject: [PATCH] add sysroot fix from bug #3049
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- ld/ldfile.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..1439309 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch,
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0600-poison-system-directories.patch b/bsp/buildroot/package/binutils/2.26.1/0600-poison-system-directories.patch
deleted file mode 100644
index d16994ec..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0600-poison-system-directories.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:45:38 +0100
-Subject: [PATCH] poison-system-directories
-
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-[Gustavo: adapt to binutils 2.25]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.ac (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
----
- ld/config.in    |  3 +++
- ld/configure    | 14 ++++++++++++++
- ld/configure.ac | 10 ++++++++++
- ld/ld.h         |  8 ++++++++
- ld/ld.texinfo   | 12 ++++++++++++
- ld/ldfile.c     | 17 +++++++++++++++++
- ld/ldlex.h      |  2 ++
- ld/ldmain.c     |  2 ++
- ld/lexsup.c     | 21 +++++++++++++++++++++
- 9 files changed, 89 insertions(+)
-
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -14,6 +14,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -786,6 +786,7 @@ with_lib_path
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_compressed_debug_sections
-@@ -1442,6 +1443,8 @@ Optional Features:
-   --disable-largefile     omit support for large files
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -15491,7 +15494,18 @@ else
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
---- a/ld/ld.h
-+++ b/ld/ld.h
-@@ -164,6 +164,14 @@ typedef struct {
-   /* If set, display the target memory usage (per memory region).  */
-   bfd_boolean print_memory_usage;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change.
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 1439309..086b354 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
---- a/ld/ldlex.h
-+++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
-   OPTION_PRINT_MEMORY_USAGE,
-   OPTION_REQUIRE_DEFINED_SYMBOL,
-   OPTION_ORPHAN_HANDLING,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
---- a/ld/lexsup.c
-+++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
-   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
-     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
-     TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
-           }
-           break;
- 
-+	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.poison_system_directories = FALSE;
-+	  break;
-+
-+	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.error_poison_system_directories = TRUE;
-+	  break;
-+
- 	case OPTION_PUSH_STATE:
- 	  input_flags.pushed = xmemdup (&input_flags,
- 					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
-       command_line.soname = NULL;
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0800-microblaze-musl.patch b/bsp/buildroot/package/binutils/2.26.1/0800-microblaze-musl.patch
deleted file mode 100644
index 5e45058f..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0800-microblaze-musl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix the genetation of GOT entries for the Microblaze target.
-
-PR target/19516
-* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol):
-Always produce a RELATIVE reloc for a local symbol.
-
-[Taken from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=47993b4af18c6ef1cad300f6393bf896d3cb5e5c.]
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c
---- binutils-2.26.1.orig/bfd/elf32-microblaze.c	2015-11-13 09:27:40.000000000 +0100
-+++ binutils-2.26.1/bfd/elf32-microblaze.c	2016-10-20 19:06:58.655565765 +0200
-@@ -3296,8 +3296,8 @@
-          The entry in the global offset table will already have been
-          initialized in the relocate_section function.  */
-       if (bfd_link_pic (info)
--          && (info->symbolic || h->dynindx == -1)
--          && h->def_regular)
-+	  && ((info->symbolic && h->def_regular)
-+		|| h->dynindx == -1))
-         {
-           asection *sec = h->root.u.def.section;
-           microblaze_elf_output_dynamic_relocation (output_bfd,
diff --git a/bsp/buildroot/package/binutils/2.26.1/0900-Correct-nios2-_gp-address-computation.patch b/bsp/buildroot/package/binutils/2.26.1/0900-Correct-nios2-_gp-address-computation.patch
deleted file mode 100644
index 81986f51..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0900-Correct-nios2-_gp-address-computation.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 5eeb7401eed2f26d5fc255de816ca70a2cb9374e Mon Sep 17 00:00:00 2001
-From: Sandra Loosemore <sandra@codesourcery.com>
-Date: Sun, 27 Dec 2015 12:30:26 -0800
-Subject: [PATCH 900/901] Correct nios2 _gp address computation.
-
-2015-12-27  Sandra Loosemore  <sandra@codesourcery.com>
-
-	bfd/
-	* elf32-nios2.c (nios2_elf_assign_gp): Correct computation of _gp
-	address.
-	(nios2_elf32_relocate_section): Tidy code for R_NIOS2_GPREL error
-	messages.
-
-[Romain:
-  - backport upstream patch on 2.26
-  - drop bfd/ChangeLog entry]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- bfd/elf32-nios2.c | 31 +++++++++++++++++++++----------
- 1 file changed, 21 insertions(+), 10 deletions(-)
-
-diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
-index 6b29d8b..01ebd6e 100644
---- a/bfd/elf32-nios2.c
-+++ b/bfd/elf32-nios2.c
-@@ -3086,7 +3086,15 @@ lookup:
- 	case bfd_link_hash_defined:
- 	case bfd_link_hash_defweak:
- 	  gp_found = TRUE;
--	  *pgp = lh->u.def.value;
-+	  {
-+	    asection *sym_sec = lh->u.def.section;
-+	    bfd_vma sym_value = lh->u.def.value;
-+
-+	    if (sym_sec->output_section)
-+	      sym_value = (sym_value + sym_sec->output_offset
-+			   + sym_sec->output_section->vma);
-+	    *pgp = sym_value;
-+	  }
- 	  break;
- 	case bfd_link_hash_indirect:
- 	case bfd_link_hash_warning:
-@@ -3719,7 +3727,6 @@ nios2_elf32_relocate_section (bfd *output_bfd,
-       struct elf32_nios2_link_hash_entry *eh;
-       bfd_vma relocation;
-       bfd_vma gp;
--      bfd_vma reloc_address;
-       bfd_reloc_status_type r = bfd_reloc_ok;
-       const char *name = NULL;
-       int r_type;
-@@ -3762,12 +3769,6 @@ nios2_elf32_relocate_section (bfd *output_bfd,
-       if (bfd_link_relocatable (info))
- 	continue;
- 
--      if (sec && sec->output_section)
--	reloc_address = (sec->output_section->vma + sec->output_offset
--			 + rel->r_offset);
--      else
--	reloc_address = 0;
--
-       if (howto)
- 	{
- 	  switch (howto->type)
-@@ -3816,6 +3817,15 @@ nios2_elf32_relocate_section (bfd *output_bfd,
- 	      /* Turns an absolute address into a gp-relative address.  */
- 	      if (!nios2_elf_assign_gp (output_bfd, &gp, info))
- 		{
-+		  bfd_vma reloc_address;
-+
-+		  if (sec && sec->output_section)
-+		    reloc_address = (sec->output_section->vma
-+				     + sec->output_offset
-+				     + rel->r_offset);
-+		  else
-+		    reloc_address = 0;
-+
- 		  format = _("global pointer relative relocation at address "
- 			     "0x%08x when _gp not defined\n");
- 		  sprintf (msgbuf, format, reloc_address);
-@@ -3825,7 +3835,7 @@ nios2_elf32_relocate_section (bfd *output_bfd,
- 	      else
- 		{
- 		  bfd_vma symbol_address = rel->r_addend + relocation;
--		  relocation = relocation + rel->r_addend - gp;
-+		  relocation = symbol_address - gp;
- 		  rel->r_addend = 0;
- 		  if (((signed) relocation < -32768
- 		       || (signed) relocation > 32767)
-@@ -3833,6 +3843,8 @@ nios2_elf32_relocate_section (bfd *output_bfd,
- 			  || h->root.type == bfd_link_hash_defined
- 			  || h->root.type == bfd_link_hash_defweak))
- 		    {
-+		      if (h)
-+			name = h->root.root.string;
- 		      format = _("Unable to reach %s (at 0x%08x) from the "
- 				 "global pointer (at 0x%08x) because the "
- 				 "offset (%d) is out of the allowed range, "
-@@ -3848,7 +3860,6 @@ nios2_elf32_relocate_section (bfd *output_bfd,
- 						  rel->r_offset, relocation,
- 						  rel->r_addend);
- 		}
--
- 	      break;
- 	    case R_NIOS2_UJMP:
- 	      r = nios2_elf32_do_ujmp_relocate (input_bfd, howto,
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0901-Fix-assertion-reduce-number-of-messages-about-FDE-en.patch b/bsp/buildroot/package/binutils/2.26.1/0901-Fix-assertion-reduce-number-of-messages-about-FDE-en.patch
deleted file mode 100644
index a490780f..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0901-Fix-assertion-reduce-number-of-messages-about-FDE-en.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 39c481c2fb0e7fb127a15facf70b55d517462809 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 6 Feb 2016 00:35:31 +0100
-Subject: [PATCH 901/901] Fix assertion, reduce number of messages about FDE
- encoding
-
-Patch by Nick Clifton [1]
-
-[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19405
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- bfd/elf-eh-frame.c | 17 ++++++++++++++---
- bfd/elf32-nios2.c  |  4 ++--
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c
-index e303189..e79bff0 100644
---- a/bfd/elf-eh-frame.c
-+++ b/bfd/elf-eh-frame.c
-@@ -1369,14 +1369,25 @@ _bfd_elf_discard_section_eh_frame
- 		     && ent->make_relative == 0)
- 		    || (ent->fde_encoding & 0x70) == DW_EH_PE_aligned))
- 	      {
-+		static int num_warnings_issued = 0;
- 		/* If a shared library uses absolute pointers
- 		   which we cannot turn into PC relative,
- 		   don't create the binary search table,
- 		   since it is affected by runtime relocations.  */
- 		hdr_info->u.dwarf.table = FALSE;
--		(*info->callbacks->einfo)
--		  (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr"
--		     " table being created.\n"), abfd, sec);
-+		if (num_warnings_issued < 10)
-+		  {
-+		    (*info->callbacks->einfo)
-+		      (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr"
-+			 " table being created.\n"), abfd, sec);
-+		    num_warnings_issued ++;
-+		  }
-+		else if (num_warnings_issued == 10)
-+		  {
-+		    (*info->callbacks->einfo)
-+		      (_("%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation dropped.\n"));
-+		    num_warnings_issued ++;
-+		  }
- 	      }
- 	    ent->removed = 0;
- 	    hdr_info->u.dwarf.fde_count++;
-diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c
-index 01ebd6e..d1b7f83 100644
---- a/bfd/elf32-nios2.c
-+++ b/bfd/elf32-nios2.c
-@@ -1905,8 +1905,8 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value)
- {
-   bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset);
- 
--  BFD_ASSERT(value <= 0xffff);
--
-+  BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff);
-+  
-   bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6),
- 	      sec->contents + offset);
- }
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0902-xtensa-fix-signedness-of-gas-relocations.patch b/bsp/buildroot/package/binutils/2.26.1/0902-xtensa-fix-signedness-of-gas-relocations.patch
deleted file mode 100644
index 4ba2f75c..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0902-xtensa-fix-signedness-of-gas-relocations.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From eb3e02b484ff75f4a2f54192422a88baa275bdfc Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 2 Feb 2016 17:11:38 +0300
-Subject: [PATCH] xtensa: fix signedness of gas relocations
-
-Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation
-offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations
-substituted for BFD_RELOC_*. This made it impossible to encode arbitrary
-8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc
-directive. Revert this part and add test.
-
-gas/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF*
-	substitutions for BFD_RELOC_* as unsigned.
-
-gas/testsuite/
-2016-02-03  Max Filippov  <jcmvbkbc@gmail.com>
-	* gas/xtensa/all.exp: Add loc to list of xtensa tests.
-	* gas/xtensa/loc.d: New file: loc test result patterns.
-	* gas/xtensa/loc.s: New file: loc test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
-[Rebase on 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- gas/config/tc-xtensa.c           |  6 +++---
- gas/testsuite/gas/xtensa/all.exp |  1 +
- gas/testsuite/gas/xtensa/loc.d   | 10 ++++++++++
- gas/testsuite/gas/xtensa/loc.s   |  7 +++++++
- 4 files changed, 21 insertions(+), 3 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/loc.d
- create mode 100644 gas/testsuite/gas/xtensa/loc.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index d707da8..f623add 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg)
- 	    {
- 	    case BFD_RELOC_8:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_16:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    case BFD_RELOC_32:
- 	      fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32;
--	      fixP->fx_signed = 1;
-+	      fixP->fx_signed = 0;
- 	      break;
- 	    default:
- 	      break;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index db39629..4daeff2 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "trampoline"
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-+    run_dump_test "loc"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d
-new file mode 100644
-index 0000000..71983cc
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.d
-@@ -0,0 +1,10 @@
-+#as:
-+#objdump: -r
-+#name: .loc directive relocs
-+
-+.*: +file format .*xtensa.*
-+
-+RELOCATION RECORDS FOR \[\.debug_line\]:
-+#...
-+.*R_XTENSA_DIFF16.*\.text\+0x00009c42
-+#...
-diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s
-new file mode 100644
-index 0000000..029e14e
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/loc.s
-@@ -0,0 +1,7 @@
-+	.text
-+	.file 1 "loc.s"
-+	.loc 1 3
-+	nop
-+	.space 40000
-+	.loc 1 5
-+	nop
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0903-xtensa-fix-.init-.fini-literals-moving.patch b/bsp/buildroot/package/binutils/2.26.1/0903-xtensa-fix-.init-.fini-literals-moving.patch
deleted file mode 100644
index ead3e42b..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0903-xtensa-fix-.init-.fini-literals-moving.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 16 Feb 2016 02:23:28 +0300
-Subject: [PATCH] xtensa: fix .init/.fini literals moving
-
-Despite the documentation and the comment in xtensa_move_literals, in
-the presence of --text-section-literals and --auto-litpools literals are
-moved from the separate literal sections into .init and .fini, because
-the check in the xtensa_move_literals is incorrect.
-
-This moving was broken with introduction of auto litpools: some literals
-now may be lost. This happens because literal frags emitted from .init
-and .fini are not closed when new .literal_position marks new literal
-pool. Then frag_align(2, 0, 0) changes type of the last literal frag to
-rs_align. rs_align frags are skipped in the xtensa_move_literals. As a
-result fixups against such literals are not moved out of .init.literal/
-.fini.literal sections producing the following assembler error:
-
-  test.S: Warning: fixes not all moved from .init.literal
-  test.S: Internal error!
-
-Fix check for .init.literal/.fini.literal in the xtensa_move_literals
-and don't let it move literals from there in the presence of
---text-section-literals or --auto-litpools.
-
-2016-02-17  Max Filippov  <jcmvbkbc@gmail.com>
-gas/
-	* config/tc-xtensa.c (xtensa_move_literals): Fix check for
-	.init.literal/.fini.literal section name.
-	* testsuite/gas/xtensa/all.exp: Add init-fini-literals to the
-	list of xtensa tests.
-	* testsuite/gas/xtensa/init-fini-literals.d: New file:
-	init-fini-literals test result patterns.
-	* testsuite/gas/xtensa/init-fini-literals.s: New file:
-	init-fini-literals test.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: 4111950f363221c4641dc2f33bea61cc94f34906
-
- gas/config/tc-xtensa.c                        | 12 ++++++++++--
- gas/testsuite/gas/xtensa/all.exp              |  1 +
- gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++
- gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++
- 4 files changed, 54 insertions(+), 2 deletions(-)
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d
- create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s
-
-diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
-index 36a06cc..5773634 100644
---- a/gas/config/tc-xtensa.c
-+++ b/gas/config/tc-xtensa.c
-@@ -11061,6 +11061,10 @@ xtensa_move_literals (void)
-   fixS *fix, *next_fix, **fix_splice;
-   sym_list *lit;
-   struct litpool_seg *lps;
-+  const char *init_name = INIT_SECTION_NAME;
-+  const char *fini_name = FINI_SECTION_NAME;
-+  int init_name_len = strlen(init_name);
-+  int fini_name_len = strlen(fini_name);
- 
-   mark_literal_frags (literal_head->next);
- 
-@@ -11171,9 +11175,13 @@ xtensa_move_literals (void)
- 
-   for (segment = literal_head->next; segment; segment = segment->next)
-     {
-+      const char *seg_name = segment_name (segment->seg);
-+
-       /* Keep the literals for .init and .fini in separate sections.  */
--      if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME)
--	  || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME))
-+      if ((!memcmp (seg_name, init_name, init_name_len) &&
-+	   !strcmp (seg_name + init_name_len, ".literal")) ||
-+	  (!memcmp (seg_name, fini_name, fini_name_len) &&
-+	   !strcmp (seg_name + fini_name_len, ".literal")))
- 	continue;
- 
-       frchain_from = seg_info (segment->seg)->frchainP;
-diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp
-index 7ff7bd7..6b67320 100644
---- a/gas/testsuite/gas/xtensa/all.exp
-+++ b/gas/testsuite/gas/xtensa/all.exp
-@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then {
-     run_dump_test "first_frag_align"
-     run_dump_test "auto-litpools"
-     run_dump_test "loc"
-+    run_dump_test "init-fini-literals"
- }
- 
- if [info exists errorInfo] then {
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d
-new file mode 100644
-index 0000000..19ed121
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d
-@@ -0,0 +1,24 @@
-+#as: --text-section-literals
-+#objdump: -r
-+#name: check that literals for .init and .fini always go to separate sections
-+
-+.*: +file format .*xtensa.*
-+#...
-+RELOCATION RECORDS FOR \[\.init\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      init
-+#...
-+RELOCATION RECORDS FOR \[\.fini\.literal\]:
-+#...
-+00000000 R_XTENSA_PLT      fini
-+#...
-+RELOCATION RECORDS FOR \[\.init\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.init\.literal
-+.* R_XTENSA_SLOT0_OP  \.init\.literal\+0x00000004
-+#...
-+RELOCATION RECORDS FOR \[\.fini\]:
-+#...
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal
-+.* R_XTENSA_SLOT0_OP  \.fini\.literal\+0x00000004
-+#...
-diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s
-new file mode 100644
-index 0000000..7c9ec17
---- /dev/null
-+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s
-@@ -0,0 +1,19 @@
-+	.section	.init,"ax",@progbits
-+	.literal_position
-+	.literal .LC0, init@PLT
-+	.literal_position
-+	.literal .LC1, 1
-+	.align	4
-+
-+	l32r	a2, .LC0
-+	l32r	a2, .LC1
-+
-+	.section	.fini,"ax",@progbits
-+	.literal_position
-+	.literal .LC2, fini@PLT
-+	.literal_position
-+	.literal .LC3, 1
-+	.align	4
-+
-+	l32r	a2, .LC2
-+	l32r	a2, .LC3
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/binutils/2.26.1/0904-bfin-fdpic-upstream.patch b/bsp/buildroot/package/binutils/2.26.1/0904-bfin-fdpic-upstream.patch
deleted file mode 100644
index ffbacc4c..00000000
--- a/bsp/buildroot/package/binutils/2.26.1/0904-bfin-fdpic-upstream.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ed3056ebdb9795446157af03d3e08fbb93c1b01d Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Tue, 29 Mar 2016 10:24:16 +0100
-Subject: [PATCH] Relax assertion in BFIN linker to allow for discard GOT relocs.
-
-	PR 17334
-	* elf32-bfin.c (elf32_bfinfdpic_finish_dynamic_sections): Relax
-	assertion on the size of the got section to allow it to be bigger
-	than the number of relocs.
-diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
-index 7cc8b6d..b2fcf38 100644
---- a/bfd/elf32-bfin.c
-+++ b/bfd/elf32-bfin.c
-@@ -4457,7 +4457,13 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
-   if (bfinfdpic_got_section (info))
-     {
-       BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
--		  == (bfinfdpic_gotrel_section (info)->reloc_count
-+		  /* PR 17334: It appears that the GOT section can end up
-+		     being bigger than the number of relocs.  Presumably
-+		     because some relocs have been deleted.  A test case has
-+		     yet to be generated for verify this, but in the meantime
-+		     the test below has been changed from == to >= so that
-+		     applications can continue to be built.  */
-+		  >= (bfinfdpic_gotrel_section (info)->reloc_count
- 		      * sizeof (Elf32_External_Rel)));
- 
-       if (bfinfdpic_gotfixup_section (info))
--- 
-1.7.1
diff --git a/bsp/buildroot/package/binutils/2.26.1/0120-sh-conf.patch b/bsp/buildroot/package/binutils/2.28.1/0120-sh-conf.patch
similarity index 93%
rename from bsp/buildroot/package/binutils/2.26.1/0120-sh-conf.patch
rename to bsp/buildroot/package/binutils/2.28.1/0120-sh-conf.patch
index cc14ef40..f7759983 100644
--- a/bsp/buildroot/package/binutils/2.26.1/0120-sh-conf.patch
+++ b/bsp/buildroot/package/binutils/2.28.1/0120-sh-conf.patch
@@ -19,7 +19,7 @@ diff --git a/configure b/configure
 index 34b66f7..905bc7b 100755
 --- a/configure
 +++ b/configure
-@@ -3939,7 +3939,7 @@ case "${target}" in
+@@ -3943,7 +3943,7 @@ case "${target}" in
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
@@ -32,7 +32,7 @@ diff --git a/configure.ac b/configure.ac
 index 4977d97..1e69ee2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1276,7 +1276,7 @@ case "${target}" in
+@@ -1279,7 +1279,7 @@ case "${target}" in
    or1k*-*-*)
      noconfigdirs="$noconfigdirs gdb"
      ;;
diff --git a/bsp/buildroot/package/binutils/2.26.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/bsp/buildroot/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch
similarity index 100%
rename from bsp/buildroot/package/binutils/2.26.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch
rename to bsp/buildroot/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch
diff --git a/bsp/buildroot/package/binutils/2.28.1/0300-ld-makefile.patch b/bsp/buildroot/package/binutils/2.28.1/0300-ld-makefile.patch
new file mode 100644
index 00000000..67101957
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.28.1/0300-ld-makefile.patch
@@ -0,0 +1,41 @@
+From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:40:53 +0100
+Subject: [PATCH] ld-makefile
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/Makefile.am | 2 +-
+ ld/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 0b3b049..3871c74 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index ed98f87..530e4c9 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -452,7 +452,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
+-- 
+2.4.3
+
diff --git a/bsp/buildroot/package/binutils/2.28.1/0301-check-ldrunpath-length.patch b/bsp/buildroot/package/binutils/2.28.1/0301-check-ldrunpath-length.patch
new file mode 100644
index 00000000..8d673dcf
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.28.1/0301-check-ldrunpath-length.patch
@@ -0,0 +1,36 @@
+From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:41:47 +0100
+Subject: [PATCH] check-ldrunpath-length
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/emultempl/elf32.em | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 0405d4f..efd3300 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1411,6 +1411,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((lib_path) && (strlen (lib_path) == 0))
++	      	lib_path = NULL;
+ 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ 						      force))
+ 		break;
+@@ -1692,6 +1694,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+-- 
+2.4.3
+
diff --git a/bsp/buildroot/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch b/bsp/buildroot/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch
new file mode 100644
index 00000000..03310886
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch
@@ -0,0 +1,48 @@
+From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:42:48 +0100
+Subject: [PATCH] add sysroot fix from bug #3049
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/ldfile.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/ld/ldfile.c diff --git b/ld/ldfile.c
+--- a/ld/ldfile.c	2017-03-02 03:23:54.000000000 -0500
++++ b/ld/ldfile.c	2017-03-20 09:52:27.687415942 -0400
+@@ -336,18 +336,24 @@
+      directory first.  */
+   if (!entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++     /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++     entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++     if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++     && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
+
diff --git a/bsp/buildroot/package/binutils/2.28.1/0600-poison-system-directories.patch b/bsp/buildroot/package/binutils/2.28.1/0600-poison-system-directories.patch
new file mode 100644
index 00000000..bb1a7b43
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.28.1/0600-poison-system-directories.patch
@@ -0,0 +1,306 @@
+From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:45:38 +0100
+Subject: [PATCH] poison-system-directories
+
+Patch adapted to binutils 2.23.2 and extended to use
+BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Gustavo: adapt to binutils 2.25]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+
+Patch originally created by Mark Hatle, forward-ported to
+binutils 2.21 by Scott Garman.
+
+purpose:  warn for uses of system directories when cross linking
+
+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * ld.h (args_type): Add error_poison_system_directories.
+    * ld.texinfo (--error-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.error_poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.error_poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --error-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * config.in: Regenerate.
+    * ld.h (args_type): Add poison_system_directories.
+    * ld.texinfo (--no-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --no-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+    Merge from Sourcery G++ binutils 2.17:
+
+    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+    ld/
+    * configure.ac (--enable-poison-system-directories): New option.
+    * configure, config.in: Regenerate.
+    * ldfile.c (ldfile_add_library_path): If
+    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+---
+ ld/config.in    |  3 +++
+ ld/configure    | 14 ++++++++++++++
+ ld/configure.ac | 10 ++++++++++
+ ld/ld.h         |  8 ++++++++
+ ld/ld.texinfo   | 12 ++++++++++++
+ ld/ldfile.c     | 17 +++++++++++++++++
+ ld/ldlex.h      |  2 ++
+ ld/ldmain.c     |  2 ++
+ ld/lexsup.c     | 21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
+diff --git a/ld/config.in b/ld/config.in
+index 276fb77..35c58eb 100644
+--- a/ld/config.in
++++ b/ld/config.in
+@@ -17,6 +17,9 @@
+    language is requested. */
+ #undef ENABLE_NLS
+ 
++/* Define to warn for use of native system library directories */
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++
+ /* Additional extension a shared object might have. */
+ #undef EXTRA_SHLIB_EXTENSION
+ 
+diff --git a/ld/configure b/ld/configure
+index a446283..d1f9504 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -789,6 +789,7 @@ with_lib_path
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_gold
+ enable_got
+ enable_compressed_debug_sections
+@@ -1446,6 +1447,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+@@ -15499,7 +15502,18 @@ else
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
+ 
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
+ 
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 188172d..2cd8443 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ 
++AC_ARG_ENABLE([poison-system-directories],
++         AS_HELP_STRING([--enable-poison-system-directories],
++                [warn for use of native system library directories]),,
++         [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++       [1],
++       [Define to warn for use of native system library directories])
++fi
++
+ dnl Use --enable-gold to decide if this linker should be the default.
+ dnl "install_as_default" is set to false if gold is the default linker.
+ dnl "installed_linker" is the installed BFD linker name.
+diff --git a/ld/ld.h b/ld/ld.h
+index d84ec4e..3476b26 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -172,6 +172,14 @@ typedef struct {
+   /* If set, display the target memory usage (per memory region).  */
+   bfd_boolean print_memory_usage;
+ 
++  /* If TRUE (the default) warn for uses of system directories when
++     cross linking.  */
++  bfd_boolean poison_system_directories;
++
++  /* If TRUE (default FALSE) give an error for uses of system
++     directories when cross linking instead of a warning.  */
++  bfd_boolean error_poison_system_directories;
++
+   /* Big or little endian as set on command line.  */
+   enum endian_enum endian;
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index 1dd7492..fb1438e 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2403,6 +2403,18 @@ string identifying the original linked file does not change.
+ 
+ Passing @code{none} for @var{style} disables the setting from any
+ @code{--build-id} options earlier on the command line.
++
++@kindex --no-poison-system-directories
++@item --no-poison-system-directories
++Do not warn for @option{-L} options using system directories such as
++@file{/usr/lib} when cross linking.  This option is intended for use
++in chroot environments when such directories contain the correct
++libraries for the target system rather than the host.
++
++@kindex --error-poison-system-directories
++@item --error-poison-system-directories
++Give an error instead of a warning for @option{-L} options using
++system directories when cross linking.
+ @end table
+ 
+ @c man end
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 1439309..086b354 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 6f11e7b..0ca3110 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -146,6 +146,8 @@ enum option_values
+   OPTION_PRINT_MEMORY_USAGE,
+   OPTION_REQUIRE_DEFINED_SYMBOL,
+   OPTION_ORPHAN_HANDLING,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index bb0b9cc..a23c56c 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -270,6 +270,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 4cad209..be7d584 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -535,6 +535,14 @@ static const struct ld_option ld_options[] =
+   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
+     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
+     TWO_DASHES },
++  { {"no-poison-system-directories", no_argument, NULL,
++    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Do not warn for -L options using system directories"),
++    TWO_DASHES },
++  { {"error-poison-system-directories", no_argument, NULL,
++    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Give an error for -L options using system directories"),
++    TWO_DASHES },
+ };
+ 
+ #define OPTION_COUNT ARRAY_SIZE (ld_options)
+@@ -547,6 +555,7 @@ parse_args (unsigned argc, char **argv)
+   int ingroup = 0;
+   char *default_dirlist = NULL;
+   char *shortopts;
++  char *BR_paranoid_env;
+   struct option *longopts;
+   struct option *really_longopts;
+   int last_optind;
+@@ -1528,6 +1537,14 @@ parse_args (unsigned argc, char **argv)
+           }
+           break;
+ 
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
++
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
++
+ 	case OPTION_PUSH_STATE:
+ 	  input_flags.pushed = xmemdup (&input_flags,
+ 					sizeof (input_flags),
+@@ -1571,6 +1588,10 @@ parse_args (unsigned argc, char **argv)
+       command_line.soname = NULL;
+     }
+ 
++  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
++  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
++    command_line.error_poison_system_directories = TRUE;
++
+   while (ingroup)
+     {
+       lang_leave_group ();
+-- 
+2.4.3
+
diff --git a/bsp/buildroot/package/binutils/2.26.1/0905-bfin-rofixup-bug.patch b/bsp/buildroot/package/binutils/2.28.1/0905-bfin-rofixup-bug.patch
similarity index 97%
rename from bsp/buildroot/package/binutils/2.26.1/0905-bfin-rofixup-bug.patch
rename to bsp/buildroot/package/binutils/2.28.1/0905-bfin-rofixup-bug.patch
index da9d5865..5733b219 100644
--- a/bsp/buildroot/package/binutils/2.26.1/0905-bfin-rofixup-bug.patch
+++ b/bsp/buildroot/package/binutils/2.28.1/0905-bfin-rofixup-bug.patch
@@ -9,7 +9,7 @@ Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 diff -Nur binutils-2.26.1.orig/bfd/elf32-bfin.c binutils-2.26.1/bfd/elf32-bfin.c
 --- binutils-2.26.1.orig/bfd/elf32-bfin.c	2015-11-13 09:27:40.000000000 +0100
 +++ binutils-2.26.1/bfd/elf32-bfin.c	2016-07-31 00:50:48.357995132 +0200
-@@ -4879,7 +4879,8 @@
+@@ -4845,7 +4845,8 @@
  
  	case R_BFIN_FUNCDESC:
  	  picrel->fd++;
diff --git a/bsp/buildroot/package/binutils/2.26.1/0906-microblaze-pr21180.patch b/bsp/buildroot/package/binutils/2.28.1/0906-microblaze-pr21180.patch
similarity index 79%
rename from bsp/buildroot/package/binutils/2.26.1/0906-microblaze-pr21180.patch
rename to bsp/buildroot/package/binutils/2.28.1/0906-microblaze-pr21180.patch
index 8104db34..52ac4fdd 100644
--- a/bsp/buildroot/package/binutils/2.26.1/0906-microblaze-pr21180.patch
+++ b/bsp/buildroot/package/binutils/2.28.1/0906-microblaze-pr21180.patch
@@ -4,11 +4,11 @@ https://sourceware.org/bugzilla/show_bug.cgi?id=21180
 
 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
 
-diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c
---- binutils-2.26.1.orig/bfd/elf32-microblaze.c	2015-11-13 09:27:40.000000000 +0100
-+++ binutils-2.26.1/bfd/elf32-microblaze.c	2017-02-23 19:43:18.536542964 +0100
-@@ -3300,13 +3300,20 @@
-           && h->def_regular)
+diff -Nur a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
+--- a/bfd/elf32-microblaze.c	2016-08-03 09:36:50.000000000 +0200
++++ b/bfd/elf32-microblaze.c	2017-02-23 19:43:12.612313590 +0100
+@@ -3233,13 +3233,20 @@
+ 	      || h->dynindx == -1))
          {
            asection *sec = h->root.u.def.section;
 +	  bfd_vma value;
diff --git a/bsp/buildroot/package/binutils/2.29.1/0001-sh-conf.patch b/bsp/buildroot/package/binutils/2.29.1/0001-sh-conf.patch
new file mode 100644
index 00000000..3c9ef62e
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.29.1/0001-sh-conf.patch
@@ -0,0 +1,48 @@
+From fdb0d1d63d8dc30b319db174f2a90e681d8cd2ed Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:38:13 +0100
+Subject: [PATCH] sh-conf
+
+Likewise, binutils has no idea about any of these new targets either, so we
+fix that up too.. now we're able to actually build a real toolchain for
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more
+inept targets than that one, really. Go look, I promise).
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Thomas: rebase on top of 2.29, in which sh64 support was removed.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index be9dd89..3c0f4c6 100755
+--- a/configure
++++ b/configure
+@@ -3844,7 +3844,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+diff --git a/configure.ac b/configure.ac
+index 532c5c2..4f40318 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1178,7 +1178,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/2.29.1/0002-ld-makefile.patch b/bsp/buildroot/package/binutils/2.29.1/0002-ld-makefile.patch
new file mode 100644
index 00000000..a7cd71e6
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.29.1/0002-ld-makefile.patch
@@ -0,0 +1,41 @@
+From d4e18ebc6ad810167a2de84b185a5f0d65b9ec2d Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:40:53 +0100
+Subject: [PATCH] ld-makefile
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/Makefile.am | 2 +-
+ ld/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 625347f..d5334d2 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index ba25177..a2cf228 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/2.29.1/0003-check-ldrunpath-length.patch b/bsp/buildroot/package/binutils/2.29.1/0003-check-ldrunpath-length.patch
new file mode 100644
index 00000000..3fbc5031
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.29.1/0003-check-ldrunpath-length.patch
@@ -0,0 +1,36 @@
+From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:41:47 +0100
+Subject: [PATCH] check-ldrunpath-length
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/emultempl/elf32.em | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index d2551b6..70fcb56 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1463,6 +1463,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((path) && (strlen (path) == 0))
++	        path = NULL;
+ 	      if (path
+ 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
+ 		break;
+@@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++    rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch b/bsp/buildroot/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch
new file mode 100644
index 00000000..9e11840c
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch
@@ -0,0 +1,51 @@
+From 378bda0e19d279535b3f4a0e448a658a534a5d67 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:42:48 +0100
+Subject: [PATCH] add sysroot fix from bug #3049
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/ldfile.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 3b37a0a..f7e5473 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
+      directory first.  */
+   if (!entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++     /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++     entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++     if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++     && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/2.29.1/0005-poison-system-directories.patch b/bsp/buildroot/package/binutils/2.29.1/0005-poison-system-directories.patch
new file mode 100644
index 00000000..a7c2761a
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.29.1/0005-poison-system-directories.patch
@@ -0,0 +1,306 @@
+From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:45:38 +0100
+Subject: [PATCH] poison-system-directories
+
+Patch adapted to binutils 2.23.2 and extended to use
+BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Gustavo: adapt to binutils 2.25]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+
+Patch originally created by Mark Hatle, forward-ported to
+binutils 2.21 by Scott Garman.
+
+purpose:  warn for uses of system directories when cross linking
+
+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * ld.h (args_type): Add error_poison_system_directories.
+    * ld.texinfo (--error-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.error_poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.error_poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --error-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * config.in: Regenerate.
+    * ld.h (args_type): Add poison_system_directories.
+    * ld.texinfo (--no-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --no-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+    Merge from Sourcery G++ binutils 2.17:
+
+    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+    ld/
+    * configure.ac (--enable-poison-system-directories): New option.
+    * configure, config.in: Regenerate.
+    * ldfile.c (ldfile_add_library_path): If
+    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+---
+ ld/config.in    |  3 +++
+ ld/configure    | 14 ++++++++++++++
+ ld/configure.ac | 10 ++++++++++
+ ld/ld.h         |  8 ++++++++
+ ld/ld.texinfo   | 12 ++++++++++++
+ ld/ldfile.c     | 17 +++++++++++++++++
+ ld/ldlex.h      |  2 ++
+ ld/ldmain.c     |  2 ++
+ ld/lexsup.c     | 21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
+diff --git a/ld/config.in b/ld/config.in
+index 5d91380..ffe84a7 100644
+--- a/ld/config.in
++++ b/ld/config.in
+@@ -21,6 +21,9 @@
+    language is requested. */
+ #undef ENABLE_NLS
+ 
++/* Define to warn for use of native system library directories */
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++
+ /* Additional extension a shared object might have. */
+ #undef EXTRA_SHLIB_EXTENSION
+ 
+diff --git a/ld/configure b/ld/configure
+index da20ab5..63e3da7 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -785,6 +785,7 @@ with_lib_path
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_gold
+ enable_got
+ enable_compressed_debug_sections
+@@ -1443,6 +1444,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+@@ -15497,7 +15500,18 @@ else
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
+ 
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
+ 
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 34315e6..5ade9a0 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ 
++AC_ARG_ENABLE([poison-system-directories],
++         AS_HELP_STRING([--enable-poison-system-directories],
++                [warn for use of native system library directories]),,
++         [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++       [1],
++       [Define to warn for use of native system library directories])
++fi
++
+ dnl Use --enable-gold to decide if this linker should be the default.
+ dnl "install_as_default" is set to false if gold is the default linker.
+ dnl "installed_linker" is the installed BFD linker name.
+diff --git a/ld/ld.h b/ld/ld.h
+index 162e156..7d6d7ef 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -177,6 +177,14 @@ typedef struct
+      in the linker script.  */
+   bfd_boolean force_group_allocation;
+ 
++  /* If TRUE (the default) warn for uses of system directories when
++     cross linking.  */
++  bfd_boolean poison_system_directories;
++
++  /* If TRUE (default FALSE) give an error for uses of system
++     directories when cross linking instead of a warning.  */
++  bfd_boolean error_poison_system_directories;
++
+   /* Big or little endian as set on command line.  */
+   enum endian_enum endian;
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index bb5f719..78501e4 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change.
+ 
+ Passing @code{none} for @var{style} disables the setting from any
+ @code{--build-id} options earlier on the command line.
++
++@kindex --no-poison-system-directories
++@item --no-poison-system-directories
++Do not warn for @option{-L} options using system directories such as
++@file{/usr/lib} when cross linking.  This option is intended for use
++in chroot environments when such directories contain the correct
++libraries for the target system rather than the host.
++
++@kindex --error-poison-system-directories
++@item --error-poison-system-directories
++Give an error instead of a warning for @option{-L} options using
++system directories when cross linking.
+ @end table
+ 
+ @c man end
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index f7e5473..2cd84d3 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 5aa7f6b..cb655e0 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -147,6 +147,8 @@ enum option_values
+   OPTION_REQUIRE_DEFINED_SYMBOL,
+   OPTION_ORPHAN_HANDLING,
+   OPTION_FORCE_GROUP_ALLOCATION,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index ee5ab11..5f6effd 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -270,6 +270,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 08106bc..d619d50 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
+   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
+     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
+     TWO_DASHES },
++  { {"no-poison-system-directories", no_argument, NULL,
++    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Do not warn for -L options using system directories"),
++    TWO_DASHES },
++  { {"error-poison-system-directories", no_argument, NULL,
++    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Give an error for -L options using system directories"),
++    TWO_DASHES },
+ };
+ 
+ #define OPTION_COUNT ARRAY_SIZE (ld_options)
+@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv)
+   int ingroup = 0;
+   char *default_dirlist = NULL;
+   char *shortopts;
++  char *BR_paranoid_env;
+   struct option *longopts;
+   struct option *really_longopts;
+   int last_optind;
+@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv)
+           }
+           break;
+ 
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
++
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
++
+ 	case OPTION_PUSH_STATE:
+ 	  input_flags.pushed = xmemdup (&input_flags,
+ 					sizeof (input_flags),
+@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv)
+       command_line.soname = NULL;
+     }
+ 
++  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
++  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
++    command_line.error_poison_system_directories = TRUE;
++
+   while (ingroup)
+     {
+       lang_leave_group ();
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/2.29.1/0006-Fixes-LINKER-BUG-.rofixup-section-size-mismatch.patch b/bsp/buildroot/package/binutils/2.29.1/0006-Fixes-LINKER-BUG-.rofixup-section-size-mismatch.patch
new file mode 100644
index 00000000..e5409efe
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.29.1/0006-Fixes-LINKER-BUG-.rofixup-section-size-mismatch.patch
@@ -0,0 +1,31 @@
+From 122de3b633f4273826a2d01702d7c515f93ec2be Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sat, 29 Jul 2017 14:08:20 +0200
+Subject: [PATCH] Fixes: LINKER BUG: .rofixup section size mismatch
+
+Workaround from adi-toolchain commit:
+af414ec1fb628ddb1562f062f3db49823ca14ca2
+[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ bfd/elf32-bfin.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
+index b3e09bd..660eec5 100644
+--- a/bfd/elf32-bfin.c
++++ b/bfd/elf32-bfin.c
+@@ -4845,7 +4845,8 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 
+ 	case R_BFIN_FUNCDESC:
+ 	  picrel->fd++;
+-	  picrel->relocsfd++;
++	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
++	    picrel->relocsfd++;
+ 	  break;
+ 
+         /* This relocation describes the C++ object vtable hierarchy.
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/2.30/0001-sh-conf.patch b/bsp/buildroot/package/binutils/2.30/0001-sh-conf.patch
new file mode 100644
index 00000000..80cf35b1
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.30/0001-sh-conf.patch
@@ -0,0 +1,48 @@
+From b30ec72417164a2e990bc986eb0da05b7ef054fa Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:38:13 +0100
+Subject: [PATCH] sh-conf
+
+Likewise, binutils has no idea about any of these new targets either, so we
+fix that up too.. now we're able to actually build a real toolchain for
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more
+inept targets than that one, really. Go look, I promise).
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Thomas: rebase on top of 2.29, in which sh64 support was removed.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 2d615a9996..18d74ab96e 100755
+--- a/configure
++++ b/configure
+@@ -3835,7 +3835,7 @@ case "${target}" in
+   nvptx*-*-*)
+     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+diff --git a/configure.ac b/configure.ac
+index aae94501e4..b530e54926 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1166,7 +1166,7 @@ case "${target}" in
+   nvptx*-*-*)
+     noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/binutils/2.30/0002-ld-makefile.patch b/bsp/buildroot/package/binutils/2.30/0002-ld-makefile.patch
new file mode 100644
index 00000000..992ffaee
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.30/0002-ld-makefile.patch
@@ -0,0 +1,41 @@
+From bf6f72c4e3c57864417ac1f917404cc83af8ec14 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:40:53 +0100
+Subject: [PATCH] ld-makefile
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/Makefile.am | 2 +-
+ ld/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 6243c12528..3c5d6c8202 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index 760c037f9d..6dea692869 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/binutils/2.30/0003-check-ldrunpath-length.patch b/bsp/buildroot/package/binutils/2.30/0003-check-ldrunpath-length.patch
new file mode 100644
index 00000000..7af98749
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.30/0003-check-ldrunpath-length.patch
@@ -0,0 +1,36 @@
+From c18554e56d2534cbb37d2d065d3782ce4ef2533c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:41:47 +0100
+Subject: [PATCH] check-ldrunpath-length
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/emultempl/elf32.em | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index c0925fc9b9..0ce16d73a5 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1470,6 +1470,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((path) && (strlen (path) == 0))
++	        path = NULL;
+ 	      if (path
+ 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
+ 		break;
+@@ -1750,6 +1752,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++    rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch b/bsp/buildroot/package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch
new file mode 100644
index 00000000..a110cf19
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.30/0004-add-sysroot-fix-from-bug-3049.patch
@@ -0,0 +1,51 @@
+From 20fff697c52e24700e76d64d202ad7a9228b630e Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:42:48 +0100
+Subject: [PATCH] add sysroot fix from bug #3049
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/ldfile.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 6532a57d96..eefc2ebefb 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
+      directory first.  */
+   if (!entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++     /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++     entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++     if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++     && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/binutils/2.30/0005-poison-system-directories.patch b/bsp/buildroot/package/binutils/2.30/0005-poison-system-directories.patch
new file mode 100644
index 00000000..4007be96
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.30/0005-poison-system-directories.patch
@@ -0,0 +1,306 @@
+From 28e0da3dede55d02eb64e015d363747772694566 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:45:38 +0100
+Subject: [PATCH] poison-system-directories
+
+Patch adapted to binutils 2.23.2 and extended to use
+BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Gustavo: adapt to binutils 2.25]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+
+Patch originally created by Mark Hatle, forward-ported to
+binutils 2.21 by Scott Garman.
+
+purpose:  warn for uses of system directories when cross linking
+
+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * ld.h (args_type): Add error_poison_system_directories.
+    * ld.texinfo (--error-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.error_poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.error_poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --error-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * config.in: Regenerate.
+    * ld.h (args_type): Add poison_system_directories.
+    * ld.texinfo (--no-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --no-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+    Merge from Sourcery G++ binutils 2.17:
+
+    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+    ld/
+    * configure.ac (--enable-poison-system-directories): New option.
+    * configure, config.in: Regenerate.
+    * ldfile.c (ldfile_add_library_path): If
+    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+---
+ ld/config.in    |  3 +++
+ ld/configure    | 14 ++++++++++++++
+ ld/configure.ac | 10 ++++++++++
+ ld/ld.h         |  8 ++++++++
+ ld/ld.texinfo   | 12 ++++++++++++
+ ld/ldfile.c     | 17 +++++++++++++++++
+ ld/ldlex.h      |  2 ++
+ ld/ldmain.c     |  2 ++
+ ld/lexsup.c     | 21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
+diff --git a/ld/config.in b/ld/config.in
+index a846743da6..df3cd5fb60 100644
+--- a/ld/config.in
++++ b/ld/config.in
+@@ -27,6 +27,9 @@
+    language is requested. */
+ #undef ENABLE_NLS
+ 
++/* Define to warn for use of native system library directories */
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++
+ /* Additional extension a shared object might have. */
+ #undef EXTRA_SHLIB_EXTENSION
+ 
+diff --git a/ld/configure b/ld/configure
+index 066b5146c6..11e7402909 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -785,6 +785,7 @@ with_lib_path
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_gold
+ enable_got
+ enable_compressed_debug_sections
+@@ -1444,6 +1445,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+@@ -15500,7 +15503,18 @@ else
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
+ 
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
+ 
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+diff --git a/ld/configure.ac b/ld/configure.ac
+index bada1b50b0..d074a3820b 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ 
++AC_ARG_ENABLE([poison-system-directories],
++         AS_HELP_STRING([--enable-poison-system-directories],
++                [warn for use of native system library directories]),,
++         [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++       [1],
++       [Define to warn for use of native system library directories])
++fi
++
+ dnl Use --enable-gold to decide if this linker should be the default.
+ dnl "install_as_default" is set to false if gold is the default linker.
+ dnl "installed_linker" is the installed BFD linker name.
+diff --git a/ld/ld.h b/ld/ld.h
+index ba914b921e..9df17dab6c 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -180,6 +180,14 @@ typedef struct
+      in the linker script.  */
+   bfd_boolean force_group_allocation;
+ 
++  /* If TRUE (the default) warn for uses of system directories when
++     cross linking.  */
++  bfd_boolean poison_system_directories;
++
++  /* If TRUE (default FALSE) give an error for uses of system
++     directories when cross linking instead of a warning.  */
++  bfd_boolean error_poison_system_directories;
++
+   /* Big or little endian as set on command line.  */
+   enum endian_enum endian;
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c89915f1aa..df430837e2 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2498,6 +2498,18 @@ string identifying the original linked file does not change.
+ 
+ Passing @code{none} for @var{style} disables the setting from any
+ @code{--build-id} options earlier on the command line.
++
++@kindex --no-poison-system-directories
++@item --no-poison-system-directories
++Do not warn for @option{-L} options using system directories such as
++@file{/usr/lib} when cross linking.  This option is intended for use
++in chroot environments when such directories contain the correct
++libraries for the target system rather than the host.
++
++@kindex --error-poison-system-directories
++@item --error-poison-system-directories
++Give an error instead of a warning for @option{-L} options using
++system directories when cross linking.
+ @end table
+ 
+ @c man end
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index eefc2ebefb..bf7063ae8c 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 140ed1d9da..9965cbc04f 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -147,6 +147,8 @@ enum option_values
+   OPTION_REQUIRE_DEFINED_SYMBOL,
+   OPTION_ORPHAN_HANDLING,
+   OPTION_FORCE_GROUP_ALLOCATION,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index e02fd3f1ff..5dfe9ba7e8 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -261,6 +261,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index f2191602d4..037a27a24a 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
+   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
+     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
+     TWO_DASHES },
++  { {"no-poison-system-directories", no_argument, NULL,
++    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Do not warn for -L options using system directories"),
++    TWO_DASHES },
++  { {"error-poison-system-directories", no_argument, NULL,
++    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Give an error for -L options using system directories"),
++    TWO_DASHES },
+ };
+ 
+ #define OPTION_COUNT ARRAY_SIZE (ld_options)
+@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv)
+   int ingroup = 0;
+   char *default_dirlist = NULL;
+   char *shortopts;
++  char *BR_paranoid_env;
+   struct option *longopts;
+   struct option *really_longopts;
+   int last_optind;
+@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv)
+ 	  }
+ 	  break;
+ 
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
++
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
++
+ 	case OPTION_PUSH_STATE:
+ 	  input_flags.pushed = xmemdup (&input_flags,
+ 					sizeof (input_flags),
+@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv)
+       command_line.soname = NULL;
+     }
+ 
++  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
++  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
++    command_line.error_poison_system_directories = TRUE;
++
+   while (ingroup)
+     {
+       lang_leave_group ();
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/binutils/2.30/0006-Fixes-LINKER-BUG-.rofixup-section-size-mismatch.patch b/bsp/buildroot/package/binutils/2.30/0006-Fixes-LINKER-BUG-.rofixup-section-size-mismatch.patch
new file mode 100644
index 00000000..0ce2cf22
--- /dev/null
+++ b/bsp/buildroot/package/binutils/2.30/0006-Fixes-LINKER-BUG-.rofixup-section-size-mismatch.patch
@@ -0,0 +1,31 @@
+From c3bd478ac1b7e83765230505eb08a0acf2fe3867 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sat, 29 Jul 2017 14:08:20 +0200
+Subject: [PATCH] Fixes: LINKER BUG: .rofixup section size mismatch
+
+Workaround from adi-toolchain commit:
+af414ec1fb628ddb1562f062f3db49823ca14ca2
+[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ bfd/elf32-bfin.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
+index 478b8d4731..a38519b585 100644
+--- a/bfd/elf32-bfin.c
++++ b/bfd/elf32-bfin.c
+@@ -4655,7 +4655,8 @@ bfinfdpic_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ 
+ 	case R_BFIN_FUNCDESC:
+ 	  picrel->fd++;
+-	  picrel->relocsfd++;
++	  if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
++	    picrel->relocsfd++;
+ 	  break;
+ 
+ 	/* This relocation describes the C++ object vtable hierarchy.
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/binutils/Config.in b/bsp/buildroot/package/binutils/Config.in
index fdfdfe90..e17a8ec6 100644
--- a/bsp/buildroot/package/binutils/Config.in
+++ b/bsp/buildroot/package/binutils/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_BINUTILS
 	bool "binutils"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on !BR2_nios2
 	depends on BR2_USE_WCHAR
 	help
diff --git a/bsp/buildroot/package/binutils/Config.in.host b/bsp/buildroot/package/binutils/Config.in.host
index 99a4a965..bc0e223e 100644
--- a/bsp/buildroot/package/binutils/Config.in.host
+++ b/bsp/buildroot/package/binutils/Config.in.host
@@ -2,30 +2,34 @@ comment "Binutils Options"
 
 choice
 	prompt "Binutils Version"
-	depends on !BR2_arc
-	default BR2_BINUTILS_VERSION_2_26_X
+	default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB
+	default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB2
+	default BR2_BINUTILS_VERSION_2_29_X if !BR2_arc
+	default BR2_BINUTILS_VERSION_ARC if BR2_arc
 	help
 	  Select the version of binutils you wish to use.
 
-	config BR2_BINUTILS_VERSION_2_25_X
-		bool "binutils 2.25.1"
-		# supported but broken on Blackfin
-		depends on !BR2_bfin
+config BR2_BINUTILS_VERSION_2_28_X
+	bool "binutils 2.28.1"
+	depends on !BR2_arc
 
-	config BR2_BINUTILS_VERSION_2_26_X
-		bool "binutils 2.26.1"
+config BR2_BINUTILS_VERSION_2_29_X
+	bool "binutils 2.29.1"
 
-	config BR2_BINUTILS_VERSION_2_27_X
-		bool "binutils 2.27"
+config BR2_BINUTILS_VERSION_2_30_X
+	bool "binutils 2.30"
 
+config BR2_BINUTILS_VERSION_ARC
+	bool "binutils arc (2.29)"
+	depends on BR2_arc
 endchoice
 
 config BR2_BINUTILS_VERSION
 	string
-	default "arc-2016.09-release"	if BR2_arc
-	default "2.25.1"	if BR2_BINUTILS_VERSION_2_25_X
-	default "2.26.1"	if BR2_BINUTILS_VERSION_2_26_X
-	default "2.27"		if BR2_BINUTILS_VERSION_2_27_X
+	default "arc-2017.09-release"	if BR2_BINUTILS_VERSION_ARC
+	default "2.28.1"	if BR2_BINUTILS_VERSION_2_28_X
+	default "2.29.1"	if BR2_BINUTILS_VERSION_2_29_X
+	default "2.30"		if BR2_BINUTILS_VERSION_2_30_X
 
 config BR2_BINUTILS_ENABLE_LTO
 	bool
diff --git a/bsp/buildroot/package/binutils/arc-2016.09-release/0300-ld-makefile.patch b/bsp/buildroot/package/binutils/arc-2016.09-release/0300-ld-makefile.patch
deleted file mode 100644
index 73cc0980..00000000
--- a/bsp/buildroot/package/binutils/arc-2016.09-release/0300-ld-makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:40:53 +0100
-Subject: [PATCH] ld-makefile
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- ld/Makefile.am | 2 +-
- ld/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/ld/Makefile.am b/ld/Makefile.am
-index 0b3b049..3871c74 100644
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -57,7 +57,7 @@ endif
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- 
- EMUL = @EMUL@
- EMULATION_OFILES = @EMULATION_OFILES@
-diff --git a/ld/Makefile.in b/ld/Makefile.in
-index ed98f87..530e4c9 100644
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
- # We put the scripts in the directory $(scriptdir)/ldscripts.
- # We can't put the scripts in $(datadir) because the SEARCH_DIR
- # directives need to be different for native and cross linkers.
--scriptdir = $(tooldir)/lib
-+scriptdir = $(libdir)
- BASEDIR = $(srcdir)/..
- BFDDIR = $(BASEDIR)/bfd
- INCDIR = $(BASEDIR)/include
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch b/bsp/buildroot/package/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch
deleted file mode 100644
index 3b4c204c..00000000
--- a/bsp/buildroot/package/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:41:47 +0100
-Subject: [PATCH] check-ldrunpath-length
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- ld/emultempl/elf32.em | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
-index 0405d4f..efd3300 100644
---- a/ld/emultempl/elf32.em
-+++ b/ld/emultempl/elf32.em
-@@ -1242,6 +1242,8 @@ fragment <<EOF
- 	      && command_line.rpath == NULL)
- 	    {
- 	      lib_path = (const char *) getenv ("LD_RUN_PATH");
-+	      if ((lib_path) && (strlen (lib_path) == 0))
-+	      	lib_path = NULL;
- 	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
- 						      force))
- 		break;
-@@ -1523,6 +1525,8 @@ gld${EMULATION_NAME}_before_allocation (void)
-   rpath = command_line.rpath;
-   if (rpath == NULL)
-     rpath = (const char *) getenv ("LD_RUN_PATH");
-+  if ((rpath) && (strlen (rpath) == 0))
-+  	rpath = NULL;
- 
-   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
-     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch b/bsp/buildroot/package/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch
deleted file mode 100644
index f67a43ef..00000000
--- a/bsp/buildroot/package/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:42:48 +0100
-Subject: [PATCH] add sysroot fix from bug #3049
-
-Always try to prepend the sysroot prefix to absolute filenames first.
-
-http://bugs.gentoo.org/275666
-http://sourceware.org/bugzilla/show_bug.cgi?id=10340
-
-Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- ld/ldfile.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 96f9ecc..1439309 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch,
-      directory first.  */
-   if (! entry->flags.maybe_archive)
-     {
--      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
-+      /* For absolute pathnames, try to always open the file in the
-+	 sysroot first. If this fails, try to open the file at the
-+	 given location.  */
-+      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
-+      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
-+	  && ld_sysroot)
- 	{
- 	  char *name = concat (ld_sysroot, entry->filename,
- 			       (const char *) NULL);
- 	  if (ldfile_try_open_bfd (name, entry))
- 	    {
- 	      entry->filename = name;
-+	      entry->flags.sysrooted = TRUE;
- 	      return TRUE;
- 	    }
- 	  free (name);
- 	}
--      else if (ldfile_try_open_bfd (entry->filename, entry))
-+
-+      if (ldfile_try_open_bfd (entry->filename, entry))
- 	return TRUE;
- 
-       if (IS_ABSOLUTE_PATH (entry->filename))
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/arc-2016.09-release/0600-poison-system-directories.patch b/bsp/buildroot/package/binutils/arc-2016.09-release/0600-poison-system-directories.patch
deleted file mode 100644
index d16994ec..00000000
--- a/bsp/buildroot/package/binutils/arc-2016.09-release/0600-poison-system-directories.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Fri, 25 Dec 2015 11:45:38 +0100
-Subject: [PATCH] poison-system-directories
-
-Patch adapted to binutils 2.23.2 and extended to use
-BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
-
-[Romain: rebase on top of 2.26]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
-[Gustavo: adapt to binutils 2.25]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-Patch originally created by Mark Hatle, forward-ported to
-binutils 2.21 by Scott Garman.
-
-purpose:  warn for uses of system directories when cross linking
-
-Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
-
-2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * ld.h (args_type): Add error_poison_system_directories.
-    * ld.texinfo (--error-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.error_poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.error_poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --error-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-
-    ld/
-    * config.in: Regenerate.
-    * ld.h (args_type): Add poison_system_directories.
-    * ld.texinfo (--no-poison-system-directories): Document.
-    * ldfile.c (ldfile_add_library_path): Check
-    command_line.poison_system_directories.
-    * ldmain.c (main): Initialize
-    command_line.poison_system_directories.
-    * lexsup.c (enum option_values): Add
-    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
-    (ld_options): Add --no-poison-system-directories.
-    (parse_args): Handle new option.
-
-2007-04-20  Joseph Myers  <joseph@codesourcery.com>
-
-    Merge from Sourcery G++ binutils 2.17:
-
-    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
-    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
-    ld/
-    * configure.ac (--enable-poison-system-directories): New option.
-    * configure, config.in: Regenerate.
-    * ldfile.c (ldfile_add_library_path): If
-    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
-    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
----
- ld/config.in    |  3 +++
- ld/configure    | 14 ++++++++++++++
- ld/configure.ac | 10 ++++++++++
- ld/ld.h         |  8 ++++++++
- ld/ld.texinfo   | 12 ++++++++++++
- ld/ldfile.c     | 17 +++++++++++++++++
- ld/ldlex.h      |  2 ++
- ld/ldmain.c     |  2 ++
- ld/lexsup.c     | 21 +++++++++++++++++++++
- 9 files changed, 89 insertions(+)
-
-diff --git a/ld/config.in b/ld/config.in
-index 276fb77..35c58eb 100644
---- a/ld/config.in
-+++ b/ld/config.in
-@@ -14,6 +14,9 @@
-    language is requested. */
- #undef ENABLE_NLS
- 
-+/* Define to warn for use of native system library directories */
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+
- /* Additional extension a shared object might have. */
- #undef EXTRA_SHLIB_EXTENSION
- 
-diff --git a/ld/configure b/ld/configure
-index a446283..d1f9504 100755
---- a/ld/configure
-+++ b/ld/configure
-@@ -786,6 +786,7 @@ with_lib_path
- enable_targets
- enable_64_bit_bfd
- with_sysroot
-+enable_poison_system_directories
- enable_gold
- enable_got
- enable_compressed_debug_sections
-@@ -1442,6 +1443,8 @@ Optional Features:
-   --disable-largefile     omit support for large files
-   --enable-targets        alternative target configurations
-   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
-+  --enable-poison-system-directories
-+                          warn for use of native system library directories
-   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
-   --enable-got=<type>     GOT handling scheme (target, single, negative,
-                           multigot)
-@@ -15491,7 +15494,18 @@ else
- fi
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
- 
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
- 
- # Check whether --enable-got was given.
- if test "${enable_got+set}" = set; then :
-diff --git a/ld/configure.ac b/ld/configure.ac
-index 188172d..2cd8443 100644
---- a/ld/configure.ac
-+++ b/ld/configure.ac
-@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
- AC_SUBST(TARGET_SYSTEM_ROOT)
- AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+         AS_HELP_STRING([--enable-poison-system-directories],
-+                [warn for use of native system library directories]),,
-+         [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+       [1],
-+       [Define to warn for use of native system library directories])
-+fi
-+
- dnl Use --enable-gold to decide if this linker should be the default.
- dnl "install_as_default" is set to false if gold is the default linker.
- dnl "installed_linker" is the installed BFD linker name.
-diff --git a/ld/ld.h b/ld/ld.h
-index d84ec4e..3476b26 100644
---- a/ld/ld.h
-+++ b/ld/ld.h
-@@ -164,6 +164,14 @@ typedef struct {
-   /* If set, display the target memory usage (per memory region).  */
-   bfd_boolean print_memory_usage;
- 
-+  /* If TRUE (the default) warn for uses of system directories when
-+     cross linking.  */
-+  bfd_boolean poison_system_directories;
-+
-+  /* If TRUE (default FALSE) give an error for uses of system
-+     directories when cross linking instead of a warning.  */
-+  bfd_boolean error_poison_system_directories;
-+
-   /* Big or little endian as set on command line.  */
-   enum endian_enum endian;
- 
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index 1dd7492..fb1438e 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change.
- 
- Passing @code{none} for @var{style} disables the setting from any
- @code{--build-id} options earlier on the command line.
-+
-+@kindex --no-poison-system-directories
-+@item --no-poison-system-directories
-+Do not warn for @option{-L} options using system directories such as
-+@file{/usr/lib} when cross linking.  This option is intended for use
-+in chroot environments when such directories contain the correct
-+libraries for the target system rather than the host.
-+
-+@kindex --error-poison-system-directories
-+@item --error-poison-system-directories
-+Give an error instead of a warning for @option{-L} options using
-+system directories when cross linking.
- @end table
- 
- @c man end
-diff --git a/ld/ldfile.c b/ld/ldfile.c
-index 1439309..086b354 100644
---- a/ld/ldfile.c
-+++ b/ld/ldfile.c
-@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
-     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
-   else
-     new_dirs->name = xstrdup (name);
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (command_line.poison_system_directories
-+  && ((!strncmp (name, "/lib", 4))
-+      || (!strncmp (name, "/usr/lib", 8))
-+      || (!strncmp (name, "/usr/local/lib", 14))
-+      || (!strncmp (name, "/usr/X11R6/lib", 14))))
-+   {
-+     if (command_line.error_poison_system_directories)
-+       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+     else
-+       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
-+            "cross-compilation\n"), name);
-+   }
-+#endif
-+
- }
- 
- /* Try to open a BFD for a lang_input_statement.  */
-diff --git a/ld/ldlex.h b/ld/ldlex.h
-index 6f11e7b..0ca3110 100644
---- a/ld/ldlex.h
-+++ b/ld/ldlex.h
-@@ -144,6 +144,8 @@ enum option_values
-   OPTION_PRINT_MEMORY_USAGE,
-   OPTION_REQUIRE_DEFINED_SYMBOL,
-   OPTION_ORPHAN_HANDLING,
-+  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
-+  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
- };
- 
- /* The initial parser states.  */
-diff --git a/ld/ldmain.c b/ld/ldmain.c
-index bb0b9cc..a23c56c 100644
---- a/ld/ldmain.c
-+++ b/ld/ldmain.c
-@@ -257,6 +257,8 @@ main (int argc, char **argv)
-   command_line.warn_mismatch = TRUE;
-   command_line.warn_search_mismatch = TRUE;
-   command_line.check_section_addresses = -1;
-+  command_line.poison_system_directories = TRUE;
-+  command_line.error_poison_system_directories = FALSE;
- 
-   /* We initialize DEMANGLING based on the environment variable
-      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
-diff --git a/ld/lexsup.c b/ld/lexsup.c
-index 4cad209..be7d584 100644
---- a/ld/lexsup.c
-+++ b/ld/lexsup.c
-@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
-   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
-     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
-     TWO_DASHES },
-+  { {"no-poison-system-directories", no_argument, NULL,
-+    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Do not warn for -L options using system directories"),
-+    TWO_DASHES },
-+  { {"error-poison-system-directories", no_argument, NULL,
-+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
-+    '\0', NULL, N_("Give an error for -L options using system directories"),
-+    TWO_DASHES },
- };
- 
- #define OPTION_COUNT ARRAY_SIZE (ld_options)
-@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
-   int ingroup = 0;
-   char *default_dirlist = NULL;
-   char *shortopts;
-+  char *BR_paranoid_env;
-   struct option *longopts;
-   struct option *really_longopts;
-   int last_optind;
-@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
-           }
-           break;
- 
-+	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.poison_system_directories = FALSE;
-+	  break;
-+
-+	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
-+	  command_line.error_poison_system_directories = TRUE;
-+	  break;
-+
- 	case OPTION_PUSH_STATE:
- 	  input_flags.pushed = xmemdup (&input_flags,
- 					sizeof (input_flags),
-@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
-       command_line.soname = NULL;
-     }
- 
-+  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
-+  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
-+    command_line.error_poison_system_directories = TRUE;
-+
-   while (ingroup)
-     {
-       lang_leave_group ();
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/binutils/arc-2017.09-release/0002-ld-makefile.patch b/bsp/buildroot/package/binutils/arc-2017.09-release/0002-ld-makefile.patch
new file mode 100644
index 00000000..a7cd71e6
--- /dev/null
+++ b/bsp/buildroot/package/binutils/arc-2017.09-release/0002-ld-makefile.patch
@@ -0,0 +1,41 @@
+From d4e18ebc6ad810167a2de84b185a5f0d65b9ec2d Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:40:53 +0100
+Subject: [PATCH] ld-makefile
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/Makefile.am | 2 +-
+ ld/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 625347f..d5334d2 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -57,7 +57,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index ba25177..a2cf228 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/arc-2017.09-release/0003-check-ldrunpath-length.patch b/bsp/buildroot/package/binutils/arc-2017.09-release/0003-check-ldrunpath-length.patch
new file mode 100644
index 00000000..3fbc5031
--- /dev/null
+++ b/bsp/buildroot/package/binutils/arc-2017.09-release/0003-check-ldrunpath-length.patch
@@ -0,0 +1,36 @@
+From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:41:47 +0100
+Subject: [PATCH] check-ldrunpath-length
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/emultempl/elf32.em | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index d2551b6..70fcb56 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1463,6 +1463,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((path) && (strlen (path) == 0))
++	        path = NULL;
+ 	      if (path
+ 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
+ 		break;
+@@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (strlen (rpath) == 0))
++    rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/arc-2017.09-release/0004-add-sysroot-fix-from-bug-3049.patch b/bsp/buildroot/package/binutils/arc-2017.09-release/0004-add-sysroot-fix-from-bug-3049.patch
new file mode 100644
index 00000000..9e11840c
--- /dev/null
+++ b/bsp/buildroot/package/binutils/arc-2017.09-release/0004-add-sysroot-fix-from-bug-3049.patch
@@ -0,0 +1,51 @@
+From 378bda0e19d279535b3f4a0e448a658a534a5d67 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:42:48 +0100
+Subject: [PATCH] add sysroot fix from bug #3049
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ ld/ldfile.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 3b37a0a..f7e5473 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch,
+      directory first.  */
+   if (!entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++     /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++     entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++     if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++     && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/arc-2017.09-release/0005-poison-system-directories.patch b/bsp/buildroot/package/binutils/arc-2017.09-release/0005-poison-system-directories.patch
new file mode 100644
index 00000000..a7c2761a
--- /dev/null
+++ b/bsp/buildroot/package/binutils/arc-2017.09-release/0005-poison-system-directories.patch
@@ -0,0 +1,306 @@
+From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 25 Dec 2015 11:45:38 +0100
+Subject: [PATCH] poison-system-directories
+
+Patch adapted to binutils 2.23.2 and extended to use
+BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
+
+[Romain: rebase on top of 2.26]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Gustavo: adapt to binutils 2.25]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+
+Patch originally created by Mark Hatle, forward-ported to
+binutils 2.21 by Scott Garman.
+
+purpose:  warn for uses of system directories when cross linking
+
+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * ld.h (args_type): Add error_poison_system_directories.
+    * ld.texinfo (--error-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.error_poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.error_poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --error-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * config.in: Regenerate.
+    * ld.h (args_type): Add poison_system_directories.
+    * ld.texinfo (--no-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --no-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+    Merge from Sourcery G++ binutils 2.17:
+
+    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+    ld/
+    * configure.ac (--enable-poison-system-directories): New option.
+    * configure, config.in: Regenerate.
+    * ldfile.c (ldfile_add_library_path): If
+    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+---
+ ld/config.in    |  3 +++
+ ld/configure    | 14 ++++++++++++++
+ ld/configure.ac | 10 ++++++++++
+ ld/ld.h         |  8 ++++++++
+ ld/ld.texinfo   | 12 ++++++++++++
+ ld/ldfile.c     | 17 +++++++++++++++++
+ ld/ldlex.h      |  2 ++
+ ld/ldmain.c     |  2 ++
+ ld/lexsup.c     | 21 +++++++++++++++++++++
+ 9 files changed, 89 insertions(+)
+
+diff --git a/ld/config.in b/ld/config.in
+index 5d91380..ffe84a7 100644
+--- a/ld/config.in
++++ b/ld/config.in
+@@ -21,6 +21,9 @@
+    language is requested. */
+ #undef ENABLE_NLS
+ 
++/* Define to warn for use of native system library directories */
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++
+ /* Additional extension a shared object might have. */
+ #undef EXTRA_SHLIB_EXTENSION
+ 
+diff --git a/ld/configure b/ld/configure
+index da20ab5..63e3da7 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -785,6 +785,7 @@ with_lib_path
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_gold
+ enable_got
+ enable_compressed_debug_sections
+@@ -1443,6 +1444,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+@@ -15497,7 +15500,18 @@ else
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
+ 
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
+ 
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 34315e6..5ade9a0 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ 
++AC_ARG_ENABLE([poison-system-directories],
++         AS_HELP_STRING([--enable-poison-system-directories],
++                [warn for use of native system library directories]),,
++         [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++       [1],
++       [Define to warn for use of native system library directories])
++fi
++
+ dnl Use --enable-gold to decide if this linker should be the default.
+ dnl "install_as_default" is set to false if gold is the default linker.
+ dnl "installed_linker" is the installed BFD linker name.
+diff --git a/ld/ld.h b/ld/ld.h
+index 162e156..7d6d7ef 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -177,6 +177,14 @@ typedef struct
+      in the linker script.  */
+   bfd_boolean force_group_allocation;
+ 
++  /* If TRUE (the default) warn for uses of system directories when
++     cross linking.  */
++  bfd_boolean poison_system_directories;
++
++  /* If TRUE (default FALSE) give an error for uses of system
++     directories when cross linking instead of a warning.  */
++  bfd_boolean error_poison_system_directories;
++
+   /* Big or little endian as set on command line.  */
+   enum endian_enum endian;
+ 
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index bb5f719..78501e4 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change.
+ 
+ Passing @code{none} for @var{style} disables the setting from any
+ @code{--build-id} options earlier on the command line.
++
++@kindex --no-poison-system-directories
++@item --no-poison-system-directories
++Do not warn for @option{-L} options using system directories such as
++@file{/usr/lib} when cross linking.  This option is intended for use
++in chroot environments when such directories contain the correct
++libraries for the target system rather than the host.
++
++@kindex --error-poison-system-directories
++@item --error-poison-system-directories
++Give an error instead of a warning for @option{-L} options using
++system directories when cross linking.
+ @end table
+ 
+ @c man end
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index f7e5473..2cd84d3 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 5aa7f6b..cb655e0 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -147,6 +147,8 @@ enum option_values
+   OPTION_REQUIRE_DEFINED_SYMBOL,
+   OPTION_ORPHAN_HANDLING,
+   OPTION_FORCE_GROUP_ALLOCATION,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index ee5ab11..5f6effd 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -270,6 +270,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 08106bc..d619d50 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] =
+   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
+     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
+     TWO_DASHES },
++  { {"no-poison-system-directories", no_argument, NULL,
++    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Do not warn for -L options using system directories"),
++    TWO_DASHES },
++  { {"error-poison-system-directories", no_argument, NULL,
++    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Give an error for -L options using system directories"),
++    TWO_DASHES },
+ };
+ 
+ #define OPTION_COUNT ARRAY_SIZE (ld_options)
+@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv)
+   int ingroup = 0;
+   char *default_dirlist = NULL;
+   char *shortopts;
++  char *BR_paranoid_env;
+   struct option *longopts;
+   struct option *really_longopts;
+   int last_optind;
+@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv)
+           }
+           break;
+ 
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
++
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
++
+ 	case OPTION_PUSH_STATE:
+ 	  input_flags.pushed = xmemdup (&input_flags,
+ 					sizeof (input_flags),
+@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv)
+       command_line.soname = NULL;
+     }
+ 
++  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
++  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
++    command_line.error_poison_system_directories = TRUE;
++
+   while (ingroup)
+     {
+       lang_leave_group ();
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/binutils/binutils.hash b/bsp/buildroot/package/binutils/binutils.hash
index cf56b1ab..4578a7f5 100644
--- a/bsp/buildroot/package/binutils/binutils.hash
+++ b/bsp/buildroot/package/binutils/binutils.hash
@@ -1,8 +1,7 @@
 # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
-sha512  5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12  binutils-2.24.tar.bz2
-sha512  0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d  binutils-2.25.1.tar.bz2
-sha512  9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67  binutils-2.26.1.tar.bz2
-sha512	cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb  binutils-2.27.tar.bz2
+sha512	dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b029a43f308a7938a7299b1928d385205d0a2245674a621649032a138d  binutils-2.28.1.tar.xz
+sha512  d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0  binutils-2.29.1.tar.xz
+sha512  e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839  binutils-2.30.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  b94f43bd084aef1cbe75da947775c7d9ad1873fb27f7b0b99244813c97bb44cd7fd4c11855418d74b731aa889bff615694777f41f4cd68429d8136d9bac2a239  binutils-arc-2016.09-release.tar.gz
+sha512  cefff7521dc4ebd8b9773af4f173821ad82dcb3f1fbd0bfdf03e148ba8cec1262b876b221da628ff5db16c30b18c6cbf5ffbec0fddb4677182524684c4c232c1  binutils-arc-2017.09-release.tar.gz
diff --git a/bsp/buildroot/package/binutils/binutils.mk b/bsp/buildroot/package/binutils/binutils.mk
index d8ca5d66..ac4575b6 100644
--- a/bsp/buildroot/package/binutils/binutils.mk
+++ b/bsp/buildroot/package/binutils/binutils.mk
@@ -9,23 +9,24 @@
 BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
 ifeq ($(BINUTILS_VERSION),)
 ifeq ($(BR2_arc),y)
-BINUTILS_VERSION = arc-2016.09-release
+BINUTILS_VERSION = arc-2017.09-release
 else
-BINUTILS_VERSION = 2.25.1
+BINUTILS_VERSION = 2.29.1
 endif
 endif # BINUTILS_VERSION
 
-ifeq ($(BR2_arc),y)
+ifeq ($(BINUTILS_VERSION),arc-2017.09-release)
 BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION))
 BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
 BINUTILS_FROM_GIT = y
 endif
 BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
-BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2
+BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz
 BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
 BINUTILS_INSTALL_STAGING = YES
-BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+
+BINUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+BINUTILS_MAKE_OPTS = LIBS=$(TARGET_NLS_LIBS)
+BINUTILS_LICENSE = GPL-3.0+, libiberty LGPL-2.1+
 BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB
 
 ifeq ($(BINUTILS_FROM_GIT),y)
@@ -64,10 +65,10 @@ HOST_BINUTILS_CONF_ENV += MAKEINFO=true
 HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true
 HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true install
 
-# gcc bug with Os/O2/O3, PR77311
+# gcc bug with Os/O1/O2/O3, PR77311
 # error: unable to find a register to spill in class 'CCREGS'
 ifeq ($(BR2_bfin),y)
-BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1"
+BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0"
 endif
 
 # Workaround a build issue with -Os for ARM Cortex-M cpus.
@@ -121,19 +122,32 @@ define BINUTILS_INSTALL_TARGET_CMDS
 endef
 endif
 
-XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME))
-ifneq ($(XTENSA_CORE_NAME),)
-define BINUTILS_XTENSA_PRE_PATCH
-	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
-		-C $(@D) --strip-components=1 binutils
+ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
+define BINUTILS_XTENSA_OVERLAY_EXTRACT
+	$(call arch-xtensa-overlay-extract,$(@D),binutils)
 endef
-BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
-HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
+BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT
+BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
+HOST_BINUTILS_POST_EXTRACT_HOOKS += BINUTILS_XTENSA_OVERLAY_EXTRACT
+HOST_BINUTILS_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
 endif
 
 ifeq ($(BR2_BINUTILS_ENABLE_LTO),y)
 HOST_BINUTILS_CONF_OPTS += --enable-plugins --enable-lto
 endif
 
+# Hardlinks between binaries in different directories cause a problem
+# with rpath fixup, so we de-hardlink those binaries, and replace them
+# with copies instead.
+BINUTILS_TOOLS = ar as ld ld.bfd nm objcopy objdump ranlib readelf strip
+define HOST_BINUTILS_FIXUP_HARDLINKS
+	$(foreach tool,$(BINUTILS_TOOLS),\
+		rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \
+		cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \
+			$(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool)
+	)
+endef
+HOST_BINUTILS_POST_INSTALL_HOOKS += HOST_BINUTILS_FIXUP_HARDLINKS
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/biosdevname/Config.in b/bsp/buildroot/package/biosdevname/Config.in
index f9202ac4..70471679 100644
--- a/bsp/buildroot/package/biosdevname/Config.in
+++ b/bsp/buildroot/package/biosdevname/Config.in
@@ -5,11 +5,11 @@ config BR2_PACKAGE_BIOSDEVNAME
 	select BR2_PACKAGE_PCIUTILS
 	select BR2_PACKAGE_ZLIB
 	help
-	  Biosdevname is a udev helper that looks at various BIOS tables to
-	  figure out what the actual hardware names are for Ethernet ports
-	  and renames the ports accordingly. This has the advantage of
-	  always referring to the same port regardless of system or
-	  hardware changes that might otherwise alter the typical ethX
-	  naming.
+	  Biosdevname is a udev helper that looks at various BIOS tables
+	  to figure out what the actual hardware names are for Ethernet
+	  ports and renames the ports accordingly. This has the
+	  advantage of always referring to the same port regardless of
+	  system or hardware changes that might otherwise alter the
+	  typical ethX naming.
 
 	  http://linux.dell.com/biosdevname/
diff --git a/bsp/buildroot/package/biosdevname/biosdevname.hash b/bsp/buildroot/package/biosdevname/biosdevname.hash
index a0007771..57946ea0 100644
--- a/bsp/buildroot/package/biosdevname/biosdevname.hash
+++ b/bsp/buildroot/package/biosdevname/biosdevname.hash
@@ -1,3 +1,2 @@
 # Locally computed hashes, not provided by upstream
-sha1   a926961d6adb673aed062683ab8b80e6418523ea  biosdevname-0.6.0.tar.gz
-sha256 c75bf92d3184f7dd1973af002de152498145021efdd5de46d6bf796acef43914 biosdevname-0.6.0.tar.gz
+sha256 954575f482ff5de2d49c335b563990859a3eb3506e8fa976f6915eba870d71f6  biosdevname-0.7.2.tar.gz
diff --git a/bsp/buildroot/package/biosdevname/biosdevname.mk b/bsp/buildroot/package/biosdevname/biosdevname.mk
index 82f3338a..e0de8ef6 100644
--- a/bsp/buildroot/package/biosdevname/biosdevname.mk
+++ b/bsp/buildroot/package/biosdevname/biosdevname.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BIOSDEVNAME_VERSION = 0.6.0
+BIOSDEVNAME_VERSION = 0.7.2
 BIOSDEVNAME_SITE = http://linux.dell.com/biosdevname/biosdevname-$(BIOSDEVNAME_VERSION)
 BIOSDEVNAME_LICENSE = GPL
 BIOSDEVNAME_LICENSE_FILES = COPYING
diff --git a/bsp/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/bsp/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 00000000..e9dee48a
--- /dev/null
+++ b/bsp/buildroot/package/bison/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,50 @@
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH 1/1] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+ lib/fseterr.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index 82649c3ac..adb637256 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/bsp/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch
new file mode 100644
index 00000000..035f8282
--- /dev/null
+++ b/bsp/buildroot/package/bison/0002-fflush-be-more-paranoid-about-libio.h-change.patch
@@ -0,0 +1,46 @@
+From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+---
+ lib/fseterr.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index adb637256..fd9da6338 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,8 @@ fseterr (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/bison/bison.hash b/bsp/buildroot/package/bison/bison.hash
index 16913f28..2c332085 100644
--- a/bsp/buildroot/package/bison/bison.hash
+++ b/bsp/buildroot/package/bison/bison.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
 sha256	a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1	bison-3.0.4.tar.xz
+# License files, locally calculated
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/bsp/buildroot/package/bison/bison.mk b/bsp/buildroot/package/bison/bison.mk
index 5779673e..e4fc5041 100644
--- a/bsp/buildroot/package/bison/bison.mk
+++ b/bsp/buildroot/package/bison/bison.mk
@@ -7,7 +7,7 @@
 BISON_VERSION = 3.0.4
 BISON_SOURCE = bison-$(BISON_VERSION).tar.xz
 BISON_SITE = $(BR2_GNU_MIRROR)/bison
-BISON_LICENSE = GPLv3+
+BISON_LICENSE = GPL-3.0+
 BISON_LICENSE_FILES = COPYING
 HOST_BISON_DEPENDENCIES = host-m4
 
diff --git a/bsp/buildroot/package/bitstream/bitstream.hash b/bsp/buildroot/package/bitstream/bitstream.hash
index 7a3b7f86..a62f733d 100644
--- a/bsp/buildroot/package/bitstream/bitstream.hash
+++ b/bsp/buildroot/package/bitstream/bitstream.hash
@@ -1,4 +1,4 @@
-# from https://get.videolan.org/bitstream/1.1/bitstream-1.1.tar.bz2.md5
-md5 88e6e786242196b4d73a5b6075aeb1a2 bitstream-1.1.tar.bz2
-# locally calculated
-sha256 90b65f619895d31e652386d5d7d2d2d62cccd44383c1fac9145d659013a2de9e bitstream-1.1.tar.bz2
+# From https://get.videolan.org/bitstream/1.2/bitstream-1.2.tar.bz2
+sha256 ccfbb438711606de1fad881b58c8f134e2d82b4d53a88ea48f2d1bcb49ca5ad2  bitstream-1.2.tar.bz2
+# From https://get.videolan.org/bitstream/1.2/bitstream-1.2.tar.bz2.md5
+md5 c4b2dbd84eb5799f1525eb9a4e01dc56  bitstream-1.2.tar.bz2
diff --git a/bsp/buildroot/package/bitstream/bitstream.mk b/bsp/buildroot/package/bitstream/bitstream.mk
index 9c8c6f5c..0b28ffe7 100644
--- a/bsp/buildroot/package/bitstream/bitstream.mk
+++ b/bsp/buildroot/package/bitstream/bitstream.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BITSTREAM_VERSION = 1.1
+BITSTREAM_VERSION = 1.2
 BITSTREAM_SOURCE = bitstream-$(BITSTREAM_VERSION).tar.bz2
 BITSTREAM_SITE = https://get.videolan.org/bitstream/$(BITSTREAM_VERSION)
 BITSTREAM_LICENSE = MIT
diff --git a/bsp/buildroot/package/blktrace/blktrace.mk b/bsp/buildroot/package/blktrace/blktrace.mk
index de583cf8..bc29c250 100644
--- a/bsp/buildroot/package/blktrace/blktrace.mk
+++ b/bsp/buildroot/package/blktrace/blktrace.mk
@@ -7,7 +7,7 @@
 BLKTRACE_VERSION = 1.1.0
 BLKTRACE_SITE = http://brick.kernel.dk/snaps
 BLKTRACE_DEPENDENCIES = libaio
-BLKTRACE_LICENSE = GPLv2+
+BLKTRACE_LICENSE = GPL-2.0+
 BLKTRACE_LICENSE_FILES = COPYING
 
 define BLKTRACE_BUILD_CMDS
diff --git a/bsp/buildroot/package/bluez-tools/Config.in b/bsp/buildroot/package/bluez-tools/Config.in
new file mode 100644
index 00000000..5a1b7d04
--- /dev/null
+++ b/bsp/buildroot/package/bluez-tools/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_BLUEZ_TOOLS
+	bool "bluez-tools"
+	depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
+	depends on BR2_USE_MMU # dbus, libglib2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_READLINE if BR2_PACKAGE_BLUEZ5_UTILS
+	help
+	  A set of tools to manage bluetooth devices for linux
+
+	  https://github.com/khvzak/bluez-tools
+
+comment "bluez-tools needs a toolchain w/ wchar, threads"
+	depends on BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/bluez-tools/bluez-tools.hash b/bsp/buildroot/package/bluez-tools/bluez-tools.hash
new file mode 100644
index 00000000..214fa5bd
--- /dev/null
+++ b/bsp/buildroot/package/bluez-tools/bluez-tools.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 56204ddd1cc7890d60f6a47507755f786fa3ee28f1da370a32ca7d7e0795a953  bluez-tools-171181b6ef6c94aefc828dc7fd8de136b9f97532.tar.gz
+sha256 62ca98af63d2ae142dbc77995c6bd4c259eaba4a5832daa33ae9e3d585b9205f  bluez-tools-97efd293491ad7ec96a655665339908f2478b3d1.tar.gz
diff --git a/bsp/buildroot/package/bluez-tools/bluez-tools.mk b/bsp/buildroot/package/bluez-tools/bluez-tools.mk
new file mode 100644
index 00000000..49891bd2
--- /dev/null
+++ b/bsp/buildroot/package/bluez-tools/bluez-tools.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# bluez-tools
+#
+################################################################################
+
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+# this is the last version compatible with BlueZ 4 API
+BLUEZ_TOOLS_VERSION = 171181b6ef6c94aefc828dc7fd8de136b9f97532
+else
+BLUEZ_TOOLS_VERSION = 97efd293491ad7ec96a655665339908f2478b3d1
+endif
+BLUEZ_TOOLS_SITE = $(call github,khvzak,bluez-tools,$(BLUEZ_TOOLS_VERSION))
+
+# sources fetched from github, no configure script)
+BLUEZ_TOOLS_AUTORECONF = YES
+BLUEZ_TOOLS_DEPENDENCIES = host-pkgconf dbus dbus-glib
+BLUEZ_TOOLS_LICENSE = GPL-2.0+
+BLUEZ_TOOLS_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
+BLUEZ_TOOLS_DEPENDENCIES += bluez_utils
+# readline is an optional dependency when used with bluez_utils
+# obex support depends on readline so enable it optionally
+ifeq ($(BR2_PACKAGE_READLINE),y)
+BLUEZ_TOOLS_CONF_OPTS += --enable-obex
+BLUEZ_TOOLS_DEPENDENCIES += readline
+else
+BLUEZ_TOOLS_CONF_OPTS += --disable-obex
+endif
+else
+# readline is a hard dependency when used with bluez5_utils
+BLUEZ_TOOLS_DEPENDENCIES += bluez5_utils readline
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/bluez5_utils/0002-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch b/bsp/buildroot/package/bluez5_utils/0002-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch
new file mode 100644
index 00000000..394742b6
--- /dev/null
+++ b/bsp/buildroot/package/bluez5_utils/0002-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch
@@ -0,0 +1,32 @@
+From 654444dd8faf02b46f41d81f3d9c623d57bdd399 Mon Sep 17 00:00:00 2001
+From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
+Date: Fri, 20 Apr 2018 16:04:17 +0200
+Subject: [PATCH] bt_shell APIs shall only be build if readline is present on
+ the system since it currently depend on it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Upstream-status: https://marc.info/?l=linux-bluetooth&m=152422938306592&w=2
+---
+ Makefile.am | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index daf34b6ca..9c3c17139 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -119,7 +119,11 @@ shared_sources = src/shared/io.h src/shared/timeout.h \
+ 			src/shared/gatt-server.h src/shared/gatt-server.c \
+ 			src/shared/gatt-db.h src/shared/gatt-db.c \
+ 			src/shared/gap.h src/shared/gap.c \
+-			src/shared/tty.h src/shared/shell.c src/shared/shell.h
++			src/shared/tty.h
++
++if READLINE
++shared_sources += src/shared/shell.c src/shared/shell.h
++endif
+ 
+ src_libshared_glib_la_SOURCES = $(shared_sources) \
+ 				src/shared/io-glib.c \
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch b/bsp/buildroot/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch
deleted file mode 100644
index a73c372e..00000000
--- a/bsp/buildroot/package/bluez5_utils/0002-sdp-Fix-Out-of-bounds-heap-read-in-service_search_at.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9e009647b14e810e06626dde7f1bb9ea3c375d09 Mon Sep 17 00:00:00 2001
-From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-Date: Wed, 13 Sep 2017 10:01:40 +0300
-Subject: [PATCH] sdp: Fix Out-of-bounds heap read in service_search_attr_req
- function
-
-Check if there is enough data to continue otherwise return an error.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/sdpd-request.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sdpd-request.c b/src/sdpd-request.c
-index 1eefdce1a..318d04467 100644
---- a/src/sdpd-request.c
-+++ b/src/sdpd-request.c
-@@ -917,7 +917,7 @@ static int service_search_attr_req(sdp_req_t *req, sdp_buf_t *buf)
- 	} else {
- 		/* continuation State exists -> get from cache */
- 		sdp_buf_t *pCache = sdp_get_cached_rsp(cstate);
--		if (pCache) {
-+		if (pCache && cstate->cStateValue.maxBytesSent < pCache->data_size) {
- 			uint16_t sent = MIN(max, pCache->data_size - cstate->cStateValue.maxBytesSent);
- 			pResponse = pCache->data;
- 			memcpy(buf->data, pResponse + cstate->cStateValue.maxBytesSent, sent);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/bluez5_utils/Config.in b/bsp/buildroot/package/bluez5_utils/Config.in
index a7c0ee4b..55831e9b 100644
--- a/bsp/buildroot/package/bluez5_utils/Config.in
+++ b/bsp/buildroot/package/bluez5_utils/Config.in
@@ -29,8 +29,8 @@ if BR2_PACKAGE_BLUEZ5_UTILS
 
 config BR2_PACKAGE_BLUEZ5_UTILS_OBEX
 	bool "build OBEX support"
-	select BR2_PACKAGE_LIBICAL
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBICAL
 	help
 	  Enable the OBEX support in Bluez 5.x.
 
@@ -39,36 +39,51 @@ comment "OBEX support needs a toolchain w/ C++"
 
 config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
 	bool "build CLI client"
-	# wordexp support not in our uClibc configuration
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC
 	select BR2_PACKAGE_READLINE
 	help
 	  Enable the Bluez 5.x command line client.
 
-comment "bluez5-utils client needs a glibc or musl toolchain"
-	depends on BR2_TOOLCHAIN_USES_UCLIBC
-
-config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL
-	bool "install GATT tool"
+config BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
+	bool "install deprecated tool"
 	depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
 	help
-	  Generic Attribute Profile (GATT) support. This provides
-	  profile discovery and description services for Bluetooth Low
-	  Energy. This will install the gatttool utility.
-
-	  It is always built with BlueZ 5.x, but upstream choose not
-	  to install it by default.
+	  Build BlueZ 5.x deprecated tools. These currently include:
+	  hciattach, hciconfig, hcitool, hcidump, rfcomm, sdptool,
+	  ciptool, gatttool.
 
 config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL
-	bool "build experimental plugins"
+	bool "build experimental obexd plugin"
 	help
-	  Build BlueZ 5.x experimental plugins (SAP, NFC, ...).
+	  Build BlueZ 5.x experimental Nokia OBEX PC Suite plugin
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH
+	bool "build health plugin"
+	help
+	  Build BlueZ 5.x health plugin
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI
+	bool "build midi profile"
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	help
+	  Build BlueZ 5.x midi plugin
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_NFC
+	bool "build nfc plugin"
+	help
+	  Build BlueZ 5.x nfc plugin
+
+config BR2_PACKAGE_BLUEZ5_PLUGINS_SAP
+	bool "build sap plugin"
+	help
+	  Build BlueZ 5.x sap plugin
 
 config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS
 	bool "build sixaxis plugin"
 	depends on BR2_PACKAGE_HAS_UDEV
 	help
-	  Build BlueZ 5.x sixaxis plugin (support Sony Dualshock controller)
+	  Build BlueZ 5.x sixaxis plugin (support Sony Dualshock
+	  controller)
 
 comment "sixaxis plugin needs udev /dev management"
 	depends on !BR2_PACKAGE_HAS_UDEV
diff --git a/bsp/buildroot/package/bluez5_utils/bluez5_utils.hash b/bsp/buildroot/package/bluez5_utils/bluez5_utils.hash
index b030f1a0..dc331b5a 100644
--- a/bsp/buildroot/package/bluez5_utils/bluez5_utils.hash
+++ b/bsp/buildroot/package/bluez5_utils/bluez5_utils.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
-sha256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15  bluez-5.43.tar.xz
+sha256 b9a8723072ef66bae7ec301c774902ebcb444c9c5b149b5a199e60a1ba970e90  bluez-5.48.tar.xz
diff --git a/bsp/buildroot/package/bluez5_utils/bluez5_utils.mk b/bsp/buildroot/package/bluez5_utils/bluez5_utils.mk
index 66c3eab1..c6086376 100644
--- a/bsp/buildroot/package/bluez5_utils/bluez5_utils.mk
+++ b/bsp/buildroot/package/bluez5_utils/bluez5_utils.mk
@@ -4,17 +4,19 @@
 #
 ################################################################################
 
-BLUEZ5_UTILS_VERSION = 5.43
+BLUEZ5_UTILS_VERSION = 5.48
 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz
 BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 BLUEZ5_UTILS_INSTALL_STAGING = YES
 BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2
-BLUEZ5_UTILS_LICENSE = GPLv2+, LGPLv2.1+
+BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
 BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
+# 0001-bt_shell-APIs-shall-only-be-build-if-readline-is-pre.patch
+BLUEZ5_UTILS_AUTORECONF = YES
 
-BLUEZ5_UTILS_CONF_OPTS = 	\
-	--enable-tools 		\
-	--enable-library 	\
+BLUEZ5_UTILS_CONF_OPTS = \
+	--enable-tools \
+	--enable-library \
 	--disable-cups
 
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y)
@@ -38,6 +40,35 @@ else
 BLUEZ5_UTILS_CONF_OPTS += --disable-experimental
 endif
 
+# enable health plugin
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_HEALTH),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-health
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-health
+endif
+
+# enable midi profile
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_MIDI),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-midi
+BLUEZ5_UTILS_DEPENDENCIES += alsa-lib
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-midi
+endif
+
+# enable nfc plugin
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_NFC),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-nfc
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-nfc
+endif
+
+# enable sap plugin
+ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SAP),y)
+BLUEZ5_UTILS_CONF_OPTS += --enable-sap
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-sap
+endif
+
 # enable sixaxis plugin
 ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y)
 BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis
@@ -46,11 +77,18 @@ BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis
 endif
 
 # install gatttool (For some reason upstream choose not to do it by default)
-ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL),y)
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED),y)
 define BLUEZ5_UTILS_INSTALL_GATTTOOL
 	$(INSTALL) -D -m 0755 $(@D)/attrib/gatttool $(TARGET_DIR)/usr/bin/gatttool
 endef
 BLUEZ5_UTILS_POST_INSTALL_TARGET_HOOKS += BLUEZ5_UTILS_INSTALL_GATTTOOL
+# hciattach_bcm43xx defines default firmware path in `/etc/firmware`, but
+# Broadcom firmware blobs are usually located in `/lib/firmware`.
+BLUEZ5_UTILS_CONF_ENV += \
+	CPPFLAGS='$(TARGET_CPPFLAGS) -DFIRMWARE_DIR=\"/lib/firmware\"'
+BLUEZ5_UTILS_CONF_OPTS += --enable-deprecated
+else
+BLUEZ5_UTILS_CONF_OPTS += --disable-deprecated
 endif
 
 # enable test
@@ -80,7 +118,7 @@ define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants
 	ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
 		$(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service
-	ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \
+	ln -fs ../../../usr/lib/systemd/system/bluetooth.service \
 		$(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service
 endef
 
diff --git a/bsp/buildroot/package/bluez_utils/Config.in b/bsp/buildroot/package/bluez_utils/Config.in
index 86c9085e..327d26bc 100644
--- a/bsp/buildroot/package/bluez_utils/Config.in
+++ b/bsp/buildroot/package/bluez_utils/Config.in
@@ -37,8 +37,9 @@ config BR2_PACKAGE_BLUEZ_UTILS_GATT
 	bool "GATT support"
 	select BR2_PACKAGE_READLINE
 	help
-	  Generic Attribute Profile (GATT) support. This provides profile
-	  discovery and description services for Bluetooth Low Energy.
+	  Generic Attribute Profile (GATT) support. This provides
+	  profile discovery and description services for Bluetooth Low
+	  Energy.
 	  This will install the gatttool utility.
 endif
 
diff --git a/bsp/buildroot/package/bluez_utils/bluez_utils.hash b/bsp/buildroot/package/bluez_utils/bluez_utils.hash
index 09b7b21d..39e750ea 100644
--- a/bsp/buildroot/package/bluez_utils/bluez_utils.hash
+++ b/bsp/buildroot/package/bluez_utils/bluez_utils.hash
@@ -1,2 +1,5 @@
 # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc:
 sha256	41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d  bluez-4.101.tar.xz
+# License files, locally calculated
+sha256	b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
+sha256	ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  COPYING.LIB
diff --git a/bsp/buildroot/package/bluez_utils/bluez_utils.mk b/bsp/buildroot/package/bluez_utils/bluez_utils.mk
index bd12cd55..256f012d 100644
--- a/bsp/buildroot/package/bluez_utils/bluez_utils.mk
+++ b/bsp/buildroot/package/bluez_utils/bluez_utils.mk
@@ -11,29 +11,29 @@ BLUEZ_UTILS_INSTALL_STAGING = YES
 BLUEZ_UTILS_DEPENDENCIES = host-pkgconf check dbus libglib2
 BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools
 BLUEZ_UTILS_AUTORECONF = YES
-BLUEZ_UTILS_LICENSE = GPLv2+, LGPLv2.1+
+BLUEZ_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
 BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB
 
 # BlueZ 3.x compatibility
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--enable-hidd	\
-	--enable-pand	\
-	--enable-sdp	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--enable-hidd \
+	--enable-pand \
+	--enable-sdp \
 	--enable-dund
 endif
 
 # audio support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
-BLUEZ_UTILS_DEPENDENCIES +=	\
-	alsa-lib		\
+BLUEZ_UTILS_DEPENDENCIES += \
+	alsa-lib \
 	libsndfile
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--enable-alsa	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--enable-alsa \
 	--enable-audio
 else
-BLUEZ_UTILS_CONF_OPTS +=	\
-	--disable-alsa	\
+BLUEZ_UTILS_CONF_OPTS += \
+	--disable-alsa \
 	--disable-audio
 endif
 
@@ -47,10 +47,10 @@ endif
 # USB support
 ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
 BLUEZ_UTILS_DEPENDENCIES += libusb
-BLUEZ_UTILS_CONF_OPTS +=	\
+BLUEZ_UTILS_CONF_OPTS += \
 	--enable-usb
 else
-BLUEZ_UTILS_CONF_OPTS +=	\
+BLUEZ_UTILS_CONF_OPTS += \
 	--disable-usb
 endif
 
diff --git a/bsp/buildroot/package/bmon/Config.in b/bsp/buildroot/package/bmon/Config.in
index bb796936..cb83cc28 100644
--- a/bsp/buildroot/package/bmon/Config.in
+++ b/bsp/buildroot/package/bmon/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_BMON
 	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_NCURSES
 	help
-	  bmon is a bandwidth monitor capable of retrieving statistics from
-	  various input modules. It provides various output methods
+	  bmon is a bandwidth monitor capable of retrieving statistics
+	  from various input modules. It provides various output methods
 	  including a curses based interface.
 
 	  https://github.com/tgraf/bmon/
diff --git a/bsp/buildroot/package/bmon/bmon.mk b/bsp/buildroot/package/bmon/bmon.mk
index 32889a69..84dab703 100644
--- a/bsp/buildroot/package/bmon/bmon.mk
+++ b/bsp/buildroot/package/bmon/bmon.mk
@@ -8,7 +8,7 @@ BMON_VERSION = 4.0
 BMON_SITE = https://github.com/tgraf/bmon/releases/download/v$(BMON_VERSION)
 BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses
 BMON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-BMON_LICENSE = BSD-2c, MIT
+BMON_LICENSE = BSD-2-Clause, MIT
 BMON_LICENSE_FILES = LICENSE.BSD LICENSE.MIT
 
 # link dynamically unless explicitly requested otherwise
diff --git a/bsp/buildroot/package/boa/boa.mk b/bsp/buildroot/package/boa/boa.mk
index ab23d901..d8bcaa12 100644
--- a/bsp/buildroot/package/boa/boa.mk
+++ b/bsp/buildroot/package/boa/boa.mk
@@ -6,7 +6,7 @@
 
 BOA_VERSION = 0.94.14rc21
 BOA_SITE = http://www.boa.org
-BOA_LICENSE = GPLv2+
+BOA_LICENSE = GPL-2.0+
 BOA_LICENSE_FILES = COPYING
 
 define BOA_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/boinc/Config.in b/bsp/buildroot/package/boinc/Config.in
new file mode 100644
index 00000000..5239019a
--- /dev/null
+++ b/bsp/buildroot/package/boinc/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_BOINC
+	bool "boinc"
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS # dlfcn.h
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Open-source software for volunteer computing and grid
+	  computing.
+
+	  Use the idle time on your computer to cure diseases, study
+	  global warming, discover pulsars, and do many other types of
+	  scientific research.
+
+	  https://boinc.berkeley.edu
+
+comment "boinc needs a toolchain w/ dynamic library, C++, threads"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \
+		|| !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/boinc/S99boinc-client b/bsp/buildroot/package/boinc/S99boinc-client
new file mode 100644
index 00000000..f4b2a2c7
--- /dev/null
+++ b/bsp/buildroot/package/boinc/S99boinc-client
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+NAME=boinc_client
+PIDFILE=/var/run/$NAME.pid
+DAEMON=/usr/bin/$NAME
+
+start() {
+	printf "Starting $NAME: "
+	start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+stop() {
+	printf "Stopping $NAME: "
+	start-stop-daemon -K -q -p $PIDFILE
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+esac
+
+exit $?
diff --git a/bsp/buildroot/package/boinc/boinc-client.service b/bsp/buildroot/package/boinc/boinc-client.service
new file mode 100644
index 00000000..9de940e9
--- /dev/null
+++ b/bsp/buildroot/package/boinc/boinc-client.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=BOINC client
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/boinc_client
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bsp/buildroot/package/boinc/boinc.hash b/bsp/buildroot/package/boinc/boinc.hash
new file mode 100644
index 00000000..8f449822
--- /dev/null
+++ b/bsp/buildroot/package/boinc/boinc.hash
@@ -0,0 +1,4 @@
+# Locally computed:
+sha256 ed5f3dcdc8d1cc5277529afb701377e77d1ff89711368a7456553bf249940bad  boinc-7.8.6.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
+sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c  COPYING.LESSER
diff --git a/bsp/buildroot/package/boinc/boinc.mk b/bsp/buildroot/package/boinc/boinc.mk
new file mode 100644
index 00000000..01050345
--- /dev/null
+++ b/bsp/buildroot/package/boinc/boinc.mk
@@ -0,0 +1,60 @@
+################################################################################
+#
+# boinc
+#
+################################################################################
+
+BOINC_VERSION_MAJOR = 7.8
+BOINC_VERSION = $(BOINC_VERSION_MAJOR).6
+# client_release can be used to build the Client and Manager but not the Server
+# part. The Server currently has no versioning (see
+# https://github.com/BOINC/boinc/pull/1798).
+BOINC_SITE = \
+	$(call github,BOINC,boinc,client_release/$(BOINC_VERSION_MAJOR)/$(BOINC_VERSION))
+BOINC_LICENSE = LGPL-3.0+
+BOINC_LICENSE_FILES = COPYING COPYING.LESSER
+BOINC_DEPENDENCIES = host-pkgconf libcurl openssl
+BOINC_AUTORECONF = YES
+BOINC_CONF_OPTS = \
+	--disable-apps \
+	--disable-boinczip \
+	--disable-manager \
+	--disable-server \
+	--enable-client \
+	--enable-dynamic-client-linkage \
+	--enable-libraries \
+	--with-pkg-config=$(PKG_CONFIG_HOST_BINARY) \
+	--with-libcurl=$(STAGING_DIR)/usr
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+BOINC_DEPENDENCIES += freetype
+endif
+
+ifeq ($(BR2_PACKAGE_LIBFCGI),y)
+BOINC_DEPENDENCIES += libfcgi
+BOINC_CONF_OPTS += --enable-fcgi
+else
+BOINC_CONF_OPTS += --disable-fcgi
+endif
+
+# Remove boinc-client because it is incompatible with buildroot
+define BOINC_REMOVE_UNNEEDED_FILE
+	$(RM) $(TARGET_DIR)/etc/init.d/boinc-client
+endef
+
+BOINC_POST_INSTALL_TARGET_HOOKS += BOINC_REMOVE_UNNEEDED_FILE
+
+define BOINC_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/boinc/S99boinc-client \
+		$(TARGET_DIR)/etc/init.d/S99boinc-client
+endef
+
+define BOINC_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/boinc/boinc-client.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/boinc-client.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/boinc-client.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/boinc-client.service
+endef
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/bonnie/bonnie.mk b/bsp/buildroot/package/bonnie/bonnie.mk
index 787d1804..e5c8640d 100644
--- a/bsp/buildroot/package/bonnie/bonnie.mk
+++ b/bsp/buildroot/package/bonnie/bonnie.mk
@@ -7,7 +7,7 @@
 BONNIE_VERSION = 1.03e
 BONNIE_SOURCE = bonnie++-$(BONNIE_VERSION).tgz
 BONNIE_SITE = http://www.coker.com.au/bonnie++
-BONNIE_LICENSE = GPLv2
+BONNIE_LICENSE = GPL-2.0
 BONNIE_LICENSE_FILES = copyright.txt
 
 define BONNIE_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch b/bsp/buildroot/package/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch
deleted file mode 100644
index 960f0ea2..00000000
--- a/bsp/buildroot/package/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4f1c6784b37a11c78fe84bb238fb7cc377ce0d36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Wed, 30 Mar 2016 23:28:33 +0200
-Subject: [PATCH] Fix for uClibc and gcc <= 4.8.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-getchar() is defined as a macro in uClibc. This hits gcc bug 58952 [1] for all
-gcc version <= 4.8.2 and building boost/test fails:
-
-./boost/test/impl/unit_test_main.ipp: In function 'int boost::unit_test::unit_test_main(boost::unit_test::init_unit_test_func, int, char**)':
-./boost/test/impl/unit_test_main.ipp:194:18: error: expected unqualified-id before '(' token
-
-To allow building boost/test with uClibc based toolchains with gcc <= 4.8.2 use
-parenthesis for std::getchar.
-
-[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58952
-
-Upstream status: Pending
-https://github.com/boostorg/test/pull/97
-
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- include/boost/test/impl/unit_test_main.ipp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/boost/test/impl/unit_test_main.ipp b/boost/test/impl/unit_test_main.ipp
-index 1f30c02..db61930 100644
---- a/boost/test/impl/unit_test_main.ipp
-+++ b/boost/test/impl/unit_test_main.ipp
-@@ -191,7 +191,9 @@ unit_test_main( init_unit_test_func init_func, int argc, char* argv[] )
-         if( runtime_config::get<bool>( runtime_config::WAIT_FOR_DEBUGGER ) ) {
-             results_reporter::get_stream() << "Press any key to continue..." << std::endl;
- 
--            std::getchar();
-+            // getchar is defined as a macro in uClibc. Use parenthesis to fix
-+            // gcc bug 58952 for gcc <= 4.8.2.
-+            (std::getchar)();
-             results_reporter::get_stream() << "Continuing..." << std::endl;
-         }
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/boost/0004-workaround-musl-bug.patch b/bsp/buildroot/package/boost/0004-workaround-musl-bug.patch
new file mode 100644
index 00000000..8613f2fe
--- /dev/null
+++ b/bsp/buildroot/package/boost/0004-workaround-musl-bug.patch
@@ -0,0 +1,26 @@
+From 0506e46640989e1f919388ad36890bd6063cd43a Mon Sep 17 00:00:00 2001
+From: Zach van Rijn <me@zv.io>
+Date: Sat, 26 Aug 2017 01:32:56 -0400
+Subject: [PATCH] explicitly include <string.h> for memset()
+
+[Thomas: taken from
+https://github.com/boostorg/fiber/pull/142/commits/0506e46640989e1f919388ad36890bd6063cd43a. It
+is not going to be applied upstream because the actual bug is in musl,
+but it's a good enough workaround for now.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libs/fiber/src/numa/linux/pin_thread.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libs/fiber/src/numa/linux/pin_thread.cpp b/libs/fiber/src/numa/linux/pin_thread.cpp
+index ae696be3..e9b3c423 100644
+--- a/libs/fiber/src/numa/linux/pin_thread.cpp
++++ b/libs/fiber/src/numa/linux/pin_thread.cpp
+@@ -9,6 +9,7 @@
+ extern "C" {
+ #include <pthread.h>
+ #include <sched.h>
++#include <string.h>
+ }
+ 
+ #include <system_error>
diff --git a/bsp/buildroot/package/boost/0005-fix-build-with-g-5.patch b/bsp/buildroot/package/boost/0005-fix-build-with-g-5.patch
new file mode 100644
index 00000000..49149e6e
--- /dev/null
+++ b/bsp/buildroot/package/boost/0005-fix-build-with-g-5.patch
@@ -0,0 +1,32 @@
+From da2793fcde5c4e3ff448b4b21348ef8b1482c678 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 16 Jan 2018 14:51:32 +0100
+Subject: [PATCH] fix build with g++5
+
+Patch needed to build domoticz
+
+Patch fetch from one of the answer of
+ https://github.com/domoticz/domoticz/issues/2034:
+ workaround suggested to the boost developers
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ boost/asio/detail/consuming_buffers.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/boost/asio/detail/consuming_buffers.hpp b/boost/asio/detail/consuming_buffers.hpp
+index a429f97..b7a887c 100644
+--- a/boost/asio/detail/consuming_buffers.hpp
++++ b/boost/asio/detail/consuming_buffers.hpp
+@@ -102,7 +102,7 @@ public:
+ 
+     std::advance(next, next_elem_);
+     std::size_t elem_offset = next_elem_offset_;
+-    while (next != end && max_size > 0 && result.count < result.max_buffers)
++    while (next != end && max_size > 0 && (result.count) < result.max_buffers)
+     {
+       Buffer next_buf = Buffer(*next) + elem_offset;
+       result.elems[result.count] = boost::asio::buffer(next_buf, max_size);
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/boost/Config.in b/bsp/buildroot/package/boost/Config.in
index 403bbf31..0755d9c0 100644
--- a/bsp/buildroot/package/boost/Config.in
+++ b/bsp/buildroot/package/boost/Config.in
@@ -52,12 +52,18 @@ config BR2_PACKAGE_BOOST_LAYOUT
 
 config BR2_PACKAGE_BOOST_ATOMIC
 	bool "boost-atomic"
+	help
+	  C++11-style atomic<>.
 
 config BR2_PACKAGE_BOOST_CHRONO
 	bool "boost-chrono"
+	help
+	  Useful time utilities. C++11.
 
 config BR2_PACKAGE_BOOST_CONTAINER
 	bool "boost-container"
+	help
+	  Standard library containers and extensions.
 
 # see
 # http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html
@@ -67,38 +73,87 @@ config BR2_PACKAGE_BOOST_CONTEXT
 	bool "boost-context"
 	depends on ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
 		BR2_i386 || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_x86_64
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
+	help
+	  C++11 context switching library.
 
 config BR2_PACKAGE_BOOST_COROUTINE
 	bool "boost-coroutine"
 	depends on BR2_PACKAGE_BOOST_CONTEXT
-
-config BR2_PACKAGE_BOOST_COROUTINE2
-	bool "boost-coroutine2"
-	depends on BR2_PACKAGE_BOOST_CONTEXT
+	help
+	  deprecated coroutine library, the non-depricated coroutine2
+	  library is a header-only library and does not need to be
+	  selected.
 
 config BR2_PACKAGE_BOOST_DATE_TIME
 	bool "boost-date_time"
+	help
+	  A set of date-time libraries based on generic programming
+	  concepts.
 
 config BR2_PACKAGE_BOOST_EXCEPTION
 	bool "boost-exception"
+	help
+	  The Boost Exception library supports transporting of arbitrary
+	  data in exception objects, and transporting of exceptions
+	  between threads.
+
+config BR2_PACKAGE_BOOST_FIBER
+	bool "boost-fiber"
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	# mips support uses the "pause" instruction, only available
+	# since mips32r2/mips64r2.
+	depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64
+	help
+	  C++11 userland threads library.
+
+comment "boost-fiber needs a toolchain w/ NPTL"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 config BR2_PACKAGE_BOOST_FILESYSTEM
 	bool "boost-filesystem"
+	help
+	  The Boost Filesystem Library provides portable facilities to
+	  query and manipulate paths, files, and directories.
 
 config BR2_PACKAGE_BOOST_GRAPH
 	bool "boost-graph"
+	help
+	  The BGL graph interface and graph components are generic, in
+	  the same sense as the the Standard Template Library (STL).
 
 config BR2_PACKAGE_BOOST_GRAPH_PARALLEL
 	bool "boost-graph_parallel"
+	help
+	  The PBGL graph interface and graph components are generic, in
+	  the same sense as the the Standard Template Library (STL).
 
 config BR2_PACKAGE_BOOST_IOSTREAMS
 	bool "boost-iostreams"
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_ZLIB
+	help
+	  Boost.IOStreams provides a framework for defining streams,
+	  stream buffers and i/o filters.
 
 config BR2_PACKAGE_BOOST_LOCALE
 	bool "boost-locale"
+	# When boost-locale is enabled with icu support, Boost no
+	# longer supports building the libboost_* libraries as static
+	# libraries, causing build failures when other boost features
+	# than boost-locale are enabled. To work around this, we
+	# prevent using boost-locale on static linking configurations
+	# with icu enabled. See
+	# https://svn.boost.org/trac/boost/ticket/9685 for more
+	# details.
+	depends on !(BR2_STATIC_LIBS && BR2_PACKAGE_ICU)
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  Provide localization and Unicode handling tools for C++.
+
+comment "boost-locale needs a toolchain w/ dynamic library"
+	depends on BR2_PACKAGE_ICU
+	depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_BOOST_LOG
 	bool "boost-log"
@@ -106,6 +161,8 @@ config BR2_PACKAGE_BOOST_LOG
 	# for some reason, uClibc on PowerPC fails to build the boost
 	# log module
 	depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC)
+	help
+	  Logging library.
 
 comment "boost-log needs a toolchain w/ NPTL"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
@@ -113,54 +170,118 @@ comment "boost-log needs a toolchain w/ NPTL"
 
 config BR2_PACKAGE_BOOST_MATH
 	bool "boost-math"
+	help
+	  Boost.Math includes several contributions in the domain of
+	  mathematics:
 
-config BR2_PACKAGE_BOOST_METAPARSE
-	depends on BR2_USE_MMU # boost-test
-	select BR2_PACKAGE_BOOST_TEST
-	bool "boost-metaparse"
+	  The Greatest Common Divisor and Least Common
+	  Multiple library provides run-time and compile-time evaluation
+	  of the greatest common divisor (GCD) or least common multiple
+	  (LCM) of two integers.
+
+	  The Special Functions library currently provides eight
+	  templated special functions, in namespace boost.
+
+	  The Complex Number Inverse Trigonometric Functions are the
+	  inverses of trigonometric functions currently present in the
+	  C++ standard.
+
+	  Quaternions are a relative of complex numbers often used to
+	  parameterise rotations in three dimentional space.
+
+	  Octonions, like quaternions, are a relative of complex
+	  numbers.
 
 config BR2_PACKAGE_BOOST_MPI
 	bool "boost-mpi"
+	help
+	  Message Passing Interface library, for use in
+	  distributed-memory parallel application programming.
 
 config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
 	bool "boost-program_options"
+	help
+	  The program_options library allows program developers to
+	  obtain program options, that is (name, value) pairs from the
+	  user, via conventional methods such as command line and config
+	  file.
 
 config BR2_PACKAGE_BOOST_PYTHON
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	bool "boost-python"
+	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	help
+	  The Boost Python Library is a framework for interfacing Python
+	  and C++. It allows you to quickly and seamlessly expose C++
+	  classes functions and objects to Python, and vice-versa,
+	  using no special tools -- just your C++ compiler.
 
 config BR2_PACKAGE_BOOST_RANDOM
 	bool "boost-random"
+	help
+	  A complete system for random number generation.
 
 config BR2_PACKAGE_BOOST_REGEX
 	bool "boost-regex"
+	help
+	  A new infrastructure for generic algorithms that builds on top
+	  of the new iterator concepts.
 
 config BR2_PACKAGE_BOOST_SERIALIZATION
 	bool "boost-serialization"
+	help
+	  Serialization for persistence and marshalling.
 
 config BR2_PACKAGE_BOOST_SIGNALS
 	bool "boost-signals"
+	help
+	  Managed signals & slots callback implementation.
+
+config BR2_PACKAGE_BOOST_STACKTRACE
+	bool "boost-stacktrace"
+	depends on !BR2_STATIC_LIBS
+	help
+	  Gather, store, copy and print backtraces.
+
+comment "boost-stacktrace needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_BOOST_SYSTEM
 	bool "boost-system"
+	help
+	  Operating system support, including the diagnostics support
+	  that will be part of the C++0x standard library.
 
 config BR2_PACKAGE_BOOST_TEST
 	bool "boost-test"
 	depends on BR2_USE_MMU # fork()
+	help
+	  Support for simple program testing, full unit testing, and for
+	  program execution monitoring.
 
 config BR2_PACKAGE_BOOST_THREAD
 	bool "boost-thread"
+	help
+	  Portable C++ multi-threading. C++11, C++14.
 
 config BR2_PACKAGE_BOOST_TIMER
 	bool "boost-timer"
+	help
+	  Event timer, progress timer, and progress display classes.
 
 config BR2_PACKAGE_BOOST_TYPE_ERASURE
 	bool "boost-type_erasure"
+	help
+	  Runtime polymorphism based on concepts.
 
 config BR2_PACKAGE_BOOST_WAVE
 	bool "boost-wave"
 	# limitation of assembler for coldfire
 	# error: Tried to convert PC relative branch to absolute jump
 	depends on !BR2_m68k_cf
+	help
+	  The Boost.Wave library is a Standards conformant, and highly
+	  configurable implementation of the mandated C99/C++
+	  preprocessor functionality packed behind an easy to use
+	  iterator interface.
 
 endif
diff --git a/bsp/buildroot/package/boost/boost.hash b/bsp/buildroot/package/boost/boost.hash
index c4af22e5..7eb675d5 100644
--- a/bsp/buildroot/package/boost/boost.hash
+++ b/bsp/buildroot/package/boost/boost.hash
@@ -1,3 +1,5 @@
-# From http://sourceforge.net/projects/boost/files/boost/1.61.0/
-md5	6095876341956f65f9d35939ccea1a9f	boost_1_61_0.tar.bz2
-sha1	f84b1a1ce764108ec3c2b7bd7704cf8dfd3c9d01	boost_1_61_0.tar.bz2
+# From http://www.boost.org/users/history/version_1_66_0.html
+sha256 5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9  boost_1_66_0.tar.bz2
+
+# Locally computed
+sha256 c9bff75738922193e67fa726fa225535870d2aa1059f91452c411736284ad566  LICENSE_1_0.txt
diff --git a/bsp/buildroot/package/boost/boost.mk b/bsp/buildroot/package/boost/boost.mk
index bb8d799c..9ad83d5a 100644
--- a/bsp/buildroot/package/boost/boost.mk
+++ b/bsp/buildroot/package/boost/boost.mk
@@ -4,19 +4,19 @@
 #
 ################################################################################
 
-BOOST_VERSION = 1.61.0
+BOOST_VERSION = 1.66.0
 BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES
-BOOST_LICENSE = Boost Software License 1.0
+BOOST_LICENSE = BSL-1.0
 BOOST_LICENSE_FILES = LICENSE_1_0.txt
 
 # keep host variant as minimal as possible
-HOST_BOOST_FLAGS = --without-icu \
+HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \
 	--without-libraries=$(subst $(space),$(comma),atomic chrono context \
-	coroutine coroutine2 date_time exception filesystem graph \
-	graph_parallel iostreams locale log math mpi program_options python \
-	random regex serialization signals system test thread timer type_erasure \
+	coroutine date_time exception filesystem graph graph_parallel iostreams \
+	locale log math mpi program_options python random regex serialization \
+	signals system test thread timer type_erasure \
 	wave)
 
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic)
@@ -24,9 +24,9 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE2),,coroutine2)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FIBER),,fiber)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel)
@@ -34,7 +34,6 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOG),,log)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math)
-BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_METAPARSE),,metaparse)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python)
@@ -42,6 +41,7 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals)
+BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_STACKTRACE),,stacktrace)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test)
 BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread)
@@ -51,6 +51,8 @@ BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave)
 
 BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS)
 
+BOOST_FLAGS = --with-toolset=gcc
+
 ifeq ($(BR2_PACKAGE_ICU),y)
 BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr
 BOOST_DEPENDENCIES += icu
@@ -65,11 +67,11 @@ endif
 ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y)
 BOOST_FLAGS += --with-python-root=$(HOST_DIR)
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
-BOOST_FLAGS += --with-python=$(HOST_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)
+BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR)
 BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m
 BOOST_DEPENDENCIES += python3
 else
-BOOST_FLAGS += --with-python=$(HOST_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)
+BOOST_FLAGS += --with-python=$(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR)
 BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
 BOOST_DEPENDENCIES += python
 endif
@@ -167,14 +169,14 @@ define HOST_BOOST_BUILD_CMDS
 	--user-config=$(@D)/user-config.jam \
 	$(HOST_BOOST_OPTS) \
 	--ignore-site-config \
-	--prefix=$(HOST_DIR)/usr )
+	--prefix=$(HOST_DIR) )
 endef
 
 define HOST_BOOST_INSTALL_CMDS
 	(cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \
 	--user-config=$(@D)/user-config.jam \
 	$(HOST_BOOST_OPTS) \
-	--prefix=$(HOST_DIR)/usr \
+	--prefix=$(HOST_DIR) \
 	--ignore-site-config \
 	--layout=$(BOOST_LAYOUT) install )
 endef
diff --git a/bsp/buildroot/package/bootstrap/bootstrap.hash b/bsp/buildroot/package/bootstrap/bootstrap.hash
index acb06b42..32ef9c4b 100644
--- a/bsp/buildroot/package/bootstrap/bootstrap.hash
+++ b/bsp/buildroot/package/bootstrap/bootstrap.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256  95ca4a02aff37570660c81a87065b53ebc281c33fa86b91a6a7a650eee10678f  bootstrap-3.3.1-dist.zip
+sha256	fa1caaaf640c32c553d0b323da1036f2232703d64a1d22c3a2ec84ace68c791a	bootstrap-4.0.0-dist.zip
+sha256	8c1a4c25634d5841924aab1848acc9dcbc3d5672183053c8b71ff2139b65d7c3	css/bootstrap.css
diff --git a/bsp/buildroot/package/bootstrap/bootstrap.mk b/bsp/buildroot/package/bootstrap/bootstrap.mk
index 17752ce0..61d6c826 100644
--- a/bsp/buildroot/package/bootstrap/bootstrap.mk
+++ b/bsp/buildroot/package/bootstrap/bootstrap.mk
@@ -4,23 +4,21 @@
 #
 ################################################################################
 
-BOOTSTRAP_VERSION = 3.3.1
+BOOTSTRAP_VERSION = 4.0.0
 BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAP_VERSION)
 BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip
 BOOTSTRAP_LICENSE = MIT
+BOOTSTRAP_LICENSE_FILES = css/bootstrap.css
 
 define BOOTSTRAP_EXTRACT_CMDS
 	$(UNZIP) $(DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D)
 endef
 
 define BOOTSTRAP_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap-theme.min.css \
-		$(TARGET_DIR)/var/www/bootstrap/css/bootstrap-theme.min.css
-	$(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap.min.css \
+	$(INSTALL) -m 0644 -D $(@D)/css/bootstrap.min.css \
 		$(TARGET_DIR)/var/www/bootstrap/css/bootstrap.min.css
-	$(INSTALL) -m 0644 -D $(@D)/dist/js/bootstrap.min.js \
+	$(INSTALL) -m 0644 -D $(@D)/js/bootstrap.min.js \
 		$(TARGET_DIR)/var/www/bootstrap/js/bootstrap.min.js
-	cp -r $(@D)/dist/fonts $(TARGET_DIR)/var/www/bootstrap/
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/bootutils/Config.in b/bsp/buildroot/package/bootutils/Config.in
index af4a170c..30d647ab 100644
--- a/bsp/buildroot/package/bootutils/Config.in
+++ b/bsp/buildroot/package/bootutils/Config.in
@@ -2,9 +2,9 @@ config BR2_PACKAGE_BOOTUTILS
 	bool "bootutils"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  BootUtils is a collection of utilities to facilitate booting of
-	  Linux 2.6-based systems. The process of finding the root volume
-	  either by label or explicit label= on the kernel command line,
-	  mounting it, and 'switchroot'ing is automated.
+	  BootUtils is a collection of utilities to facilitate booting
+	  of Linux 2.6-based systems. The process of finding the root
+	  volume either by label or explicit label= on the kernel
+	  command line, mounting it, and 'switchroot'ing is automated.
 
 	  http://bootutils.sourceforge.net/
diff --git a/bsp/buildroot/package/bootutils/bootutils.mk b/bsp/buildroot/package/bootutils/bootutils.mk
index eb3cb4f4..bc4b3e84 100644
--- a/bsp/buildroot/package/bootutils/bootutils.mk
+++ b/bsp/buildroot/package/bootutils/bootutils.mk
@@ -7,7 +7,7 @@
 BOOTUTILS_VERSION = 1.0.0
 BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION)
 BOOTUTILS_CONF_OPTS = --prefix=/ --exec-prefix=/
-BOOTUTILS_LICENSE = GPLv2+
+BOOTUTILS_LICENSE = GPL-2.0+
 BOOTUTILS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/botan/botan.mk b/bsp/buildroot/package/botan/botan.mk
index 28295524..e42bb61c 100644
--- a/bsp/buildroot/package/botan/botan.mk
+++ b/bsp/buildroot/package/botan/botan.mk
@@ -7,7 +7,7 @@
 BOTAN_VERSION = 1.10.16
 BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz
 BOTAN_SITE = http://botan.randombit.net/releases
-BOTAN_LICENSE = BSD-2c
+BOTAN_LICENSE = BSD-2-Clause
 BOTAN_LICENSE_FILES = doc/license.txt
 
 BOTAN_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/bridge-utils/Config.in b/bsp/buildroot/package/bridge-utils/Config.in
index fb9c7df4..bc614b07 100644
--- a/bsp/buildroot/package/bridge-utils/Config.in
+++ b/bsp/buildroot/package/bridge-utils/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_BRIDGE_UTILS
 	bool "bridge-utils"
 	help
-	  Manage ethernet bridging; a way to connect networks together to
-	  form a larger network.
+	  Manage ethernet bridging; a way to connect networks together
+	  to form a larger network.
 
 	  https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/
diff --git a/bsp/buildroot/package/bridge-utils/bridge-utils.mk b/bsp/buildroot/package/bridge-utils/bridge-utils.mk
index efe57cd9..25192274 100644
--- a/bsp/buildroot/package/bridge-utils/bridge-utils.mk
+++ b/bsp/buildroot/package/bridge-utils/bridge-utils.mk
@@ -8,8 +8,11 @@ BRIDGE_UTILS_VERSION = 1.6
 BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils
 BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz
 BRIDGE_UTILS_AUTORECONF = YES
-BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR)
-BRIDGE_UTILS_LICENSE = GPLv2+
+BRIDGE_UTILS_LICENSE = GPL-2.0+
 BRIDGE_UTILS_LICENSE_FILES = COPYING
 
+# Avoid using the host's headers. Location is not important as
+# required headers will anyway be found from within the sysroot.
+BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(STAGING_DIR)/usr/include
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/brltty/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch b/bsp/buildroot/package/brltty/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch
new file mode 100644
index 00000000..e6a2005d
--- /dev/null
+++ b/bsp/buildroot/package/brltty/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch
@@ -0,0 +1,28 @@
+From 3ea213e47c6771b7e2481f64a98f30c02fcb4867 Mon Sep 17 00:00:00 2001
+From: Mario Lang <mlang@delysid.org>
+Date: Thu, 30 Nov 2017 13:14:47 +0100
+Subject: [PATCH] Prevent scancodes from generating spurious log messages. (ml)
+
+Signed-off-by: Mario Lang <mlang@blind.guru>
+---
+This patch was taken from upstream, and can be removed when 5.6 is out.
+
+ Drivers/Braille/HandyTech/braille.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c
+index ef95fd15b..f7e605c1a 100644
+--- a/Drivers/Braille/HandyTech/braille.c
++++ b/Drivers/Braille/HandyTech/braille.c
+@@ -1560,7 +1560,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
+                   case HT_EXTPKT_Scancode: {
+                     while (length--)
+                       enqueueCommand(BRL_CMD_BLK(PASSAT) | BRL_ARG_PUT(*bytes++));
+-                    break;
++                    continue;
+                   }
+ 
+                   case HT_EXTPKT_GetRTC: {
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/brltty/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch b/bsp/buildroot/package/brltty/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
new file mode 100644
index 00000000..3dbacb3b
--- /dev/null
+++ b/bsp/buildroot/package/brltty/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
@@ -0,0 +1,31 @@
+From 28dde6749327fd15a1b8b7bcf5cc74a95598582a Mon Sep 17 00:00:00 2001
+From: Mario Lang <mlang@delysid.org>
+Date: Fri, 29 Dec 2017 10:35:05 +0100
+Subject: [PATCH] Check for ioperm to make sure the platform supports ports
+ I/O. (ml)
+
+Signed-off-by: Mario Lang <mlang@blind.guru>
+---
+This patch was taken from upstream, and can be removed when 5.6 is out.
+
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5e94d33bd..07119dd9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1446,7 +1446,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl
+       ports_package="kfreebsd"
+       ;;
+    linux*)
+-      ports_package="glibc"
++      AC_CHECK_FUNC([ioperm], [
++         ports_package="glibc"
++      ])
+       ;;
+    mingw*)
+       ports_package="windows"
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch b/bsp/buildroot/package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch
new file mode 100644
index 00000000..c1980417
--- /dev/null
+++ b/bsp/buildroot/package/brltty/0003-Remove-MKOBJ-in-favour-of-MKMOD.patch
@@ -0,0 +1,64 @@
+From b3b0e47015e9162f519730789976157c7cc38178 Mon Sep 17 00:00:00 2001
+From: Mario Lang <mlang@delysid.org>
+Date: Fri, 29 Dec 2017 14:52:37 +0100
+Subject: [PATCH] Remove MKOBJ in favour of MKMOD. (ml)
+
+Calling ld directly can lead to problems when cross-compiling.
+
+Upstream: https://github.com/brltty/brltty/commit/4c8aba42e246b96d10ffcbd57653682375499e46
+Signed-off-by: Mario Lang <mlang@blind.guru>
+---
+ Drivers/Braille/EuroBraille/Makefile.in |  2 +-
+ config.mk.in                            |  1 -
+ configure.ac                            | 10 ----------
+ 3 files changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in
+index 0500aa70e..ce8a3d1a4 100644
+--- a/Drivers/Braille/EuroBraille/Makefile.in
++++ b/Drivers/Braille/EuroBraille/Makefile.in
+@@ -28,7 +28,7 @@ SRC_FILES = eu_braille.c eu_clio.c eu_esysiris.c
+ OBJ_FILES = $(SRC_FILES:.c=.$O)
+ 
+ braille.$O: $(OBJ_FILES)
+-	$(MKOBJ)  $@ $(OBJ_FILES)
++	$(MKMOD)  $@ $(OBJ_FILES)
+ 
+ %.$O: $(SRC_DIR)/%.c
+ 	$(CC) $(BRL_CFLAGS) -o $@ -c $<
+diff --git a/config.mk.in b/config.mk.in
+index 686f547e6..8d1da79b4 100644
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -250,7 +250,6 @@ LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
+ 
+-MKOBJ = @MKOBJ@
+ MKMOD = @MKMOD@
+ MKLIB = @MKLIB@
+ CONFLIBDIR = @CONFLIBDIR@
+diff --git a/configure.ac b/configure.ac
+index 07119dd9f..ad80b8d60 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -428,16 +428,6 @@ AC_SUBST([can_make_manual])
+ test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes
+ AC_SUBST([can_make_BrlAPIref])
+ 
+-AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_mkobj], [dnl
+-case "${host_os}"
+-in
+-   *)
+-      brltty_cv_prog_mkobj="\$(LD) -r -o"
+-      ;;
+-esac])
+-MKOBJ="${brltty_cv_prog_mkobj}"
+-AC_SUBST([MKOBJ])
+-
+ AC_CACHE_CHECK([for loadable module creation command], [brltty_cv_prog_mkmod], [dnl
+ case "${host_os}"
+ in
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/brltty/0004-buildsys-fix-cross-compilation.patch b/bsp/buildroot/package/brltty/0004-buildsys-fix-cross-compilation.patch
new file mode 100644
index 00000000..9a10d464
--- /dev/null
+++ b/bsp/buildroot/package/brltty/0004-buildsys-fix-cross-compilation.patch
@@ -0,0 +1,41 @@
+From 088666535a045dae71bd2fcc6b3a1553023106ce Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Wed, 22 Aug 2018 10:10:19 +0200
+Subject: [PATCH] buildsys: fix cross-compilation
+
+Some identifiers for includes and libs paths may contain digit, e.g.
+X11_PACKAGE or ATSPI2_PACKAGE or GLIB2_PACKAGE...
+
+Also detect those identifiers when doing cros-compilation, so that the
+_FOR_BUILD variants are really created and do not clash with the target
+variants.
+
+Fixes:
+    http://autobuild.buildroot.org/results/a37/a37782b3cfc1a96cc129db8fade20a36a7b2d470/build-end.log
+    http://autobuild.buildroot.org/results/97e/97edc6a47d2140968e84b409cdc960604e5896f2/build-end.log
+    [...]
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Upstram status: submitted
+https://github.com/brltty/brltty/pull/142
+---
+ mk4build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk4build b/mk4build
+index db90c86a9..551283825 100755
+--- a/mk4build
++++ b/mk4build
+@@ -112,7 +112,7 @@ fi
+ 
+ sedScript="${outputName}.${sedExtension}"
+ sed -n -e '
+-s/^ *\([A-Za-z][A-Za-z_]*\) *=.*$/\1/
++s/^ *\([A-Za-z][A-Za-z0-9_]*\) *=.*$/\1/
+ t found
+ d
+ :found
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/brltty/Config.in b/bsp/buildroot/package/brltty/Config.in
new file mode 100644
index 00000000..48ceb04c
--- /dev/null
+++ b/bsp/buildroot/package/brltty/Config.in
@@ -0,0 +1,22 @@
+config BR2_PACKAGE_BRLTTY
+	bool "brltty"
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_MMU # fork()
+	help
+	  A daemon providing access to the Linux console for a blind
+	  person using a refreshable braille display.
+
+	  http://brltty.com/
+
+if BR2_PACKAGE_BRLTTY
+
+config BR2_PACKAGE_BRLTTY_TEXT_TABLE
+	string "text-table"
+
+endif
+
+comment "brltty needs a toolchain w/ dynamic lib, threads, wchar"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/brltty/S10brltty b/bsp/buildroot/package/brltty/S10brltty
new file mode 100644
index 00000000..18e274dc
--- /dev/null
+++ b/bsp/buildroot/package/brltty/S10brltty
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# brltty        Starts brltty.
+#
+
+start() {
+	printf "Starting brltty: "
+	start-stop-daemon -S -q -p /var/run/brltty.pid \
+		--exec /usr/bin/brltty -- -P /var/run/brltty.pid "$@"
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+stop() {
+	printf "Stopping brltty: "
+	start-stop-daemon -K -q -p /var/run/brltty.pid
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+restart() {
+	stop
+	start "$@"
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  force-reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|force-reload}"
+	exit 1
+esac
+
+exit $?
diff --git a/bsp/buildroot/package/brltty/brltty.hash b/bsp/buildroot/package/brltty/brltty.hash
new file mode 100644
index 00000000..3bc2f9cf
--- /dev/null
+++ b/bsp/buildroot/package/brltty/brltty.hash
@@ -0,0 +1,3 @@
+sha256 4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36 brltty-5.5.tar.xz
+sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad LICENSE-GPL
+sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL
diff --git a/bsp/buildroot/package/brltty/brltty.mk b/bsp/buildroot/package/brltty/brltty.mk
new file mode 100644
index 00000000..eb91ef8f
--- /dev/null
+++ b/bsp/buildroot/package/brltty/brltty.mk
@@ -0,0 +1,110 @@
+################################################################################
+#
+# brltty
+#
+################################################################################
+
+BRLTTY_VERSION = 5.5
+BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz
+BRLTTY_SITE = http://brltty.com/archive
+BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
+BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
+BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL
+
+BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf host-pkgconf
+
+BRLTTY_CONF_OPTS = \
+	--disable-java-bindings \
+	--disable-lisp-bindings \
+	--disable-ocaml-bindings \
+	--disable-python-bindings \
+	--disable-tcl-bindings \
+	--disable-x \
+	--without-midi-package \
+	--without-mikropuhe --without-speechd --without-swift \
+	--without-theta --without-viavoice
+
+# Autoreconf is needed because we're patching configure.ac in
+# 0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch. However,
+# a plain autoreconf doesn't work, because this package is only
+# autoconf-based.
+define BRLTTY_AUTOCONF
+	cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
+endef
+
+BRLTTY_PRE_CONFIGURE_HOOKS += BRLTTY_AUTOCONF
+
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
+BRLTTY_DEPENDENCIES += bluez5_utils
+BRLTTY_CONF_OPTS += --with-bluetooth-package
+else
+BRLTTY_CONF_OPTS += --without-bluetooth-package
+endif
+
+ifeq ($(BR2_PACKAGE_ESPEAK),y)
+BRLTTY_DEPENDENCIES += espeak
+BRLTTY_CONF_OPTS += --with-espeak=$(TARGET_DIR)/usr
+else
+BRLTTY_CONF_OPTS += --without-espeak
+endif
+
+ifeq ($(BR2_PACKAGE_FLITE),y)
+BRLTTY_DEPENDENCIES += flite
+BRLTTY_CONF_OPTS += --with-flite=$(STAGING_DIR)/usr
+else
+BRLTTY_CONF_OPTS += --without-flite
+endif
+
+ifeq ($(BR2_PACKAGE_ICU),y)
+BRLTTY_DEPENDENCIES += icu
+BRLTTY_CONF_OPTS += --enable-icu
+else
+BRLTTY_CONF_OPTS += --disable-icu
+endif
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+BRLTTY_DEPENDENCIES += ncurses
+BRLTTY_CONF_OPTS += --with-curses
+else
+BRLTTY_CONF_OPTS += --without-curses
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+BRLTTY_DEPENDENCIES += systemd
+BRLTTY_CONF_OPTS += --with-service-package
+else
+BRLTTY_CONF_OPTS += --without-service-package
+endif
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+BRLTTY_CONF_OPTS += --enable-i18n
+else
+BRLTTY_CONF_OPTS += --disable-i18n
+endif
+
+BRLTTY_TEXT_TABLE = $(call qstrip,$(BR2_PACKAGE_BRLTTY_TEXT_TABLE))
+ifneq ($(BRLTTY_TEXT_TABLE),)
+BRLTTY_CONF_OPTS += --with-text-table=$(BRLTTY_TEXT_TABLE)
+endif
+
+define BRLTTY_INSTALL_CONF
+	$(INSTALL) -D -m 644 $(@D)/Documents/brltty.conf $(TARGET_DIR)/etc/brltty.conf
+endef
+
+BRLTTY_POST_INSTALL_TARGET_HOOKS += BRLTTY_INSTALL_CONF
+
+define BRLTTY_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/brltty/S10brltty \
+		   $(TARGET_DIR)/etc/init.d/S10brltty
+endef
+
+define BRLTTY_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 package/brltty/brltty.service \
+		   $(TARGET_DIR)/usr/lib/systemd/system/brltty.service
+
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
+	ln -fs  ../../../../usr/lib/systemd/system/brltty.service \
+		$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/brltty.service
+endef
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/brltty/brltty.service b/bsp/buildroot/package/brltty/brltty.service
new file mode 100644
index 00000000..070ec94b
--- /dev/null
+++ b/bsp/buildroot/package/brltty/brltty.service
@@ -0,0 +1,23 @@
+[Unit]
+Description=Braille Device Support
+Documentation=man:brltty(1)
+Documentation=http://brltty.com/
+
+DefaultDependencies=no
+Before=sysinit.target
+After=systemd-udev-settle.service
+Wants=systemd-udev-settle.service
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/brltty --no-daemon
+TimeoutStartSec=5
+TimeoutStopSec=10
+Restart=always
+RestartSec=30
+Nice=-10
+OOMScoreAdjust=-900
+
+[Install]
+WantedBy=sysinit.target
+
diff --git a/bsp/buildroot/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch b/bsp/buildroot/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch
new file mode 100644
index 00000000..33b9bb70
--- /dev/null
+++ b/bsp/buildroot/package/brotli/0001-CMake-Allow-using-BUILD_SHARED_LIBS-to-choose-static.patch
@@ -0,0 +1,144 @@
+From b60b613e7c2c9bf7a142c3c486ac6e77ad93f5d1 Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Mon, 26 Mar 2018 19:08:31 +0100
+Subject: [PATCH] CMake: Allow using BUILD_SHARED_LIBS to choose static/shared
+ libs
+
+By convention projects using CMake which can build either static or
+shared libraries use a BUILD_SHARED_LIBS flag to allow selecting between
+both: the add_library() command automatically switches between both using
+this variable when the library kind is not passed to add_library(). It
+is also usual to expose the BUILD_SHARED_LIBS as an user-facing setting
+with the option() command.
+
+This way, the following will both work as expected:
+
+   % cmake -DBUILD_SHARED_LIBS=OFF ...
+   % cmake -DBUILS_SHARED_LIBS=ON ...
+
+This is helpful for distributions which need (or want) to build only
+static libraries.
+---
+ CMakeLists.txt        | 42 ++++++++++++++----------------------------
+ c/fuzz/test_fuzzer.sh |  6 +++---
+ 2 files changed, 17 insertions(+), 31 deletions(-)
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream-Status: Submitted [https://github.com/google/brotli/pull/655]
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 99b9258..3867931 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -6,6 +6,8 @@ cmake_minimum_required(VERSION 2.8.6)
+ 
+ project(brotli C)
+ 
++option(BUILD_SHARED_LIBS "Build shared libraries" ON)
++
+ # If Brotli is being bundled in another project, we don't want to
+ # install anything.  However, we want to let people override this, so
+ # we'll use the BROTLI_BUNDLED_MODE variable to let them do that; just
+@@ -114,10 +116,6 @@ set(BROTLI_LIBRARIES_CORE brotlienc brotlidec brotlicommon)
+ set(BROTLI_LIBRARIES ${BROTLI_LIBRARIES_CORE} ${LIBM_LIBRARY})
+ mark_as_advanced(BROTLI_LIBRARIES)
+ 
+-set(BROTLI_LIBRARIES_CORE_STATIC brotlienc-static brotlidec-static brotlicommon-static)
+-set(BROTLI_LIBRARIES_STATIC ${BROTLI_LIBRARIES_CORE_STATIC} ${LIBM_LIBRARY})
+-mark_as_advanced(BROTLI_LIBRARIES_STATIC)
+-
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+   add_definitions(-DOS_LINUX)
+ elseif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+@@ -137,24 +135,22 @@ endfunction()
+ transform_sources_list("scripts/sources.lst" "${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake")
+ include("${CMAKE_CURRENT_BINARY_DIR}/sources.lst.cmake")
+ 
+-add_library(brotlicommon SHARED ${BROTLI_COMMON_C})
+-add_library(brotlidec SHARED ${BROTLI_DEC_C})
+-add_library(brotlienc SHARED ${BROTLI_ENC_C})
+-
+-add_library(brotlicommon-static STATIC ${BROTLI_COMMON_C})
+-add_library(brotlidec-static STATIC ${BROTLI_DEC_C})
+-add_library(brotlienc-static STATIC ${BROTLI_ENC_C})
++add_library(brotlicommon ${BROTLI_COMMON_C})
++add_library(brotlidec ${BROTLI_DEC_C})
++add_library(brotlienc ${BROTLI_ENC_C})
+ 
+ # Older CMake versions does not understand INCLUDE_DIRECTORIES property.
+ include_directories(${BROTLI_INCLUDE_DIRS})
+ 
++if(BUILD_SHARED_LIBS)
++  foreach(lib brotlicommon brotlidec brotlienc)
++    target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" )
++    string(TOUPPER "${lib}" LIB)
++    set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION" )
++  endforeach()
++endif()
++
+ foreach(lib brotlicommon brotlidec brotlienc)
+-  target_compile_definitions(${lib} PUBLIC "BROTLI_SHARED_COMPILATION" )
+-  string(TOUPPER "${lib}" LIB)
+-  set_target_properties (${lib} PROPERTIES DEFINE_SYMBOL "${LIB}_SHARED_COMPILATION" )
+-endforeach()
+-
+-foreach(lib brotlicommon brotlidec brotlienc brotlicommon-static brotlidec-static brotlienc-static)
+   target_link_libraries(${lib} ${LIBM_LIBRARY})
+   set_property(TARGET ${lib} APPEND PROPERTY INCLUDE_DIRECTORIES ${BROTLI_INCLUDE_DIRS})
+   set_target_properties(${lib} PROPERTIES
+@@ -167,9 +163,6 @@ endforeach()
+ target_link_libraries(brotlidec brotlicommon)
+ target_link_libraries(brotlienc brotlicommon)
+ 
+-target_link_libraries(brotlidec-static brotlicommon-static)
+-target_link_libraries(brotlienc-static brotlicommon-static)
+-
+ # For projects stuck on older versions of CMake, this will set the
+ # BROTLI_INCLUDE_DIRS and BROTLI_LIBRARIES variables so they still
+ # have a relatively easy way to use Brotli:
+@@ -183,7 +176,7 @@ endif()
+ 
+ # Build the brotli executable
+ add_executable(brotli ${BROTLI_CLI_C})
+-target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC})
++target_link_libraries(brotli ${BROTLI_LIBRARIES})
+ 
+ # Installation
+ if(NOT BROTLI_BUNDLED_MODE)
+@@ -199,13 +192,6 @@ if(NOT BROTLI_BUNDLED_MODE)
+     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+   )
+ 
+-  install(
+-    TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-  )
+-
+   install(
+     DIRECTORY ${BROTLI_INCLUDE_DIRS}/brotli
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+diff --git a/c/fuzz/test_fuzzer.sh b/c/fuzz/test_fuzzer.sh
+index 5c754e1..e85e12f 100755
+--- a/c/fuzz/test_fuzzer.sh
++++ b/c/fuzz/test_fuzzer.sh
+@@ -14,12 +14,12 @@ mkdir bin
+ cd bin
+ 
+ cmake $BROTLI -DCMAKE_C_COMPILER="$CC" -DCMAKE_CXX_COMPILER="$CXX" \
+-    -DBUILD_TESTING=OFF -DENABLE_SANITIZER=address
+-make -j$(nproc) brotlidec-static
++    -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_SANITIZER=address
++make -j$(nproc) brotlidec
+ 
+ ${CXX} -o run_decode_fuzzer -std=c++11 -fsanitize=address -I$SRC/include \
+     $SRC/fuzz/decode_fuzzer.cc $SRC/fuzz/run_decode_fuzzer.cc \
+-    ./libbrotlidec-static.a ./libbrotlicommon-static.a
++    ./libbrotlidec.a ./libbrotlicommon.a
+ 
+ mkdir decode_corpora
+ unzip $BROTLI/java/org/brotli/integration/fuzz_data.zip -d decode_corpora
+-- 
+2.16.3
+
diff --git a/bsp/buildroot/package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch b/bsp/buildroot/package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch
new file mode 100644
index 00000000..410de283
--- /dev/null
+++ b/bsp/buildroot/package/brotli/0001-Tell-CMake-to-not-check-for-a-C-compiler.patch
@@ -0,0 +1,31 @@
+From fea0b1e46c486225d57e730cc0f94fa06b5b93fc Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Mon, 26 Mar 2018 12:12:00 +0100
+Subject: [PATCH] Tell CMake to not check for a C++ compiler
+
+By default CMake checks both for C and C++ compilers, while the latter
+is not needed. Setting the list of languages to just "C" in the call to
+project() removes the unneeded check.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream-Status: Submitted [https://github.com/google/brotli/pull/653]
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2dc7232..3fbcbfb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ # support 2.8.7.
+ cmake_minimum_required(VERSION 2.8.6)
+ 
+-project(brotli)
++project(brotli LANGUAGES C)
+ 
+ # If Brotli is being bundled in another project, we don't want to
+ # install anything.  However, we want to let people override this, so
+-- 
+2.16.3
+
diff --git a/bsp/buildroot/package/brotli/Config.in b/bsp/buildroot/package/brotli/Config.in
new file mode 100644
index 00000000..e40f5b6b
--- /dev/null
+++ b/bsp/buildroot/package/brotli/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_BROTLI
+	bool "brotli"
+	help
+	  Generic-purpose lossless compression library. The algorithm
+	  compresses data using a combination of a modern variant of
+	  the LZ77 algorithm, Huffman coding and 2nd order context
+	  modeling, with a compression ratio comparable to the best
+	  currently available general-purpose compression methods. It
+	  is similar in speed with deflate but offers more dense
+	  compression.
+
+	  https://github.com/google/brotli
diff --git a/bsp/buildroot/package/brotli/brotli.hash b/bsp/buildroot/package/brotli/brotli.hash
new file mode 100644
index 00000000..954d44eb
--- /dev/null
+++ b/bsp/buildroot/package/brotli/brotli.hash
@@ -0,0 +1,5 @@
+# Locally generated:
+sha512  93adcf437d730ac403e444285ac8aefbb2c8a6b5e1b064e8ee33684c067287a8159e0ee73d2217c167881e87da73fa494792d963a15508fd42b2ac4a5b52823c  v1.0.3.tar.gz
+
+# Hash for license files:
+sha512  bae78184c2f50f86d8c727826d3982c469454c42b9af81f4ef007e39036434fa894cf5be3bf5fc65b7de2301f0a72d067a8186e303327db8a96bd14867e0a3a8  LICENSE
diff --git a/bsp/buildroot/package/brotli/brotli.mk b/bsp/buildroot/package/brotli/brotli.mk
new file mode 100644
index 00000000..cf1e8115
--- /dev/null
+++ b/bsp/buildroot/package/brotli/brotli.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# brotli
+#
+################################################################################
+
+BROTLI_VERSION = 1.0.3
+BROTLI_SOURCE = v$(BROTLI_VERSION).tar.gz
+BROTLI_SITE = https://github.com/google/brotli/archive
+BROTLI_LICENSE = MIT
+BROTLI_LICENSE_FILES = LICENSE
+BROTLI_INSTALL_STAGING = YES
+BROTLI_CONF_OPTS = \
+	-DBROTLI_DISABLE_TESTS=ON \
+	-DBROTLI_BUNDLED_MODE=OFF
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/bsdiff/bsdiff.mk b/bsp/buildroot/package/bsdiff/bsdiff.mk
index eb903e05..9030284a 100644
--- a/bsp/buildroot/package/bsdiff/bsdiff.mk
+++ b/bsp/buildroot/package/bsdiff/bsdiff.mk
@@ -7,7 +7,7 @@
 BSDIFF_VERSION = 4.3
 BSDIFF_SITE = http://www.daemonology.net/bsdiff
 BSDIFF_DEPENDENCIES = bzip2
-BSDIFF_LICENSE = BSD-2c
+BSDIFF_LICENSE = BSD-2-Clause
 BSDIFF_LICENSE_FILES = bsdiff.c
 
 define BSDIFF_BUILD_CMDS
diff --git a/bsp/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch b/bsp/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
new file mode 100644
index 00000000..ba65ac41
--- /dev/null
+++ b/bsp/buildroot/package/btrfs-progs/0001-Makefile-install-static-library-and-headers-in-insta.patch
@@ -0,0 +1,49 @@
+From ff93866eb119cedb791894814780c0e44db35715 Mon Sep 17 00:00:00 2001
+From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Date: Fri, 10 Mar 2017 14:56:17 +0000
+Subject: [PATCH] Makefile: install static library and headers in
+ install-static
+
+Currently, the install-static target only installs the statically
+compiled tools. However, some programs outside of btrfs-progs (for
+example docker) link with the btrfs libraries. If such programs want to
+link statically against the btrfs-progs library, then this library
+should be installed by "install-static". Indeed, "make install" cannot
+be used if the support for shared library is not enabled.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Gustavo: Rebase for btrfs-progs 4.7.2]
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Vincent: Rebase for btrfs-progs 4.10]
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 67fbc48..d9e34be 100644
+--- a/Makefile
++++ b/Makefile
+@@ -308,7 +308,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz test-cli
+ # NOTE: For static compiles, you need to have all the required libs
+ # 	static equivalent available
+ #
+-static: $(progs_static)
++static: $(progs_static) $(libs_static)
+ 
+ version.h: version.sh version.h.in configure.ac
+ 	@echo "    [SH]     $@"
+@@ -537,6 +537,10 @@ install-static: $(progs_static) $(INSTALLDIRS)
+ 	$(INSTALL) $(progs_static) $(DESTDIR)$(bindir)
+ 	# btrfsck is a link to btrfs in the src tree, make it so for installed file as well
+ 	$(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
++	$(INSTALL) -m755 -d $(DESTDIR)$(libdir)
++	$(INSTALL) $(libs_static) $(DESTDIR)$(libdir)
++	$(INSTALL) -m755 -d $(DESTDIR)$(incdir)
++	$(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
+ 
+ $(INSTALLDIRS):
+ 	@echo "Making install in $(patsubst install-%,%,$@)"
+-- 
+2.10.2
+
diff --git a/bsp/buildroot/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch b/bsp/buildroot/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch
deleted file mode 100644
index d861dfc8..00000000
--- a/bsp/buildroot/package/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 2c2c2d992c3b298793983317588f73cf41675652 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 27 Jul 2016 22:49:58 +0200
-Subject: [PATCH] Makefile.in: install static library and headers in
- install-static
-
-Currently, the install-static target only installs the statically
-compiled tools. However, some programs outside of btrfs-progs (for
-example docker) link with the btrfs libraries. If such programs want
-to link statically against the btrfs-progs library, then this library
-should be installed by "install-static". Indeed, "make install" cannot
-be used if the support for shared library is not enabled.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: Rebase for btrfs-progs 4.7.2]
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- Makefile.in | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 19697ff..5870a58 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -219,7 +219,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz
- # NOTE: For static compiles, you need to have all the required libs
- # 	static equivalent available
- #
--static: $(progs_static)
-+static: $(progs_static) $(libs_static)
- 
- version.h: version.sh version.h.in configure.ac
- 	@echo "    [SH]     $@"
-@@ -384,6 +384,10 @@ install-static: $(progs_static) $(INSTALLDIRS)
- 	done
- 	# btrfsck is a link to btrfs in the src tree, make it so for installed file as well
- 	$(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static
-+	$(INSTALL) -m755 -d $(DESTDIR)$(libdir)
-+	$(INSTALL) $(libs_static) $(DESTDIR)$(libdir)
-+	$(INSTALL) -m755 -d $(DESTDIR)$(incdir)
-+	$(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir)
- 
- $(INSTALLDIRS):
- 	@echo "Making install in $(patsubst install-%,%,$@)"
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch b/bsp/buildroot/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch
new file mode 100644
index 00000000..7b09f278
--- /dev/null
+++ b/bsp/buildroot/package/btrfs-progs/0003-btrfs-progs-convert-add-missing-types-header.patch
@@ -0,0 +1,39 @@
+From dda485a3d788c47bb6849218f695db7b51822872 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 31 Oct 2017 14:51:51 +0200
+Subject: [PATCH] btrfs-progs: convert: add missing types header
+
+Build with musl libc needs the sys/types.h header for the dev_t type,
+since this header is not included indirectly. This fixes the following
+build failure:
+
+In file included from convert/source-fs.c:23:0:
+./convert/source-fs.h:112:1: error: unknown type name ‘dev_t’
+ dev_t decode_dev(u32 dev);
+ ^~~~~
+convert/source-fs.c:31:1: error: unknown type name ‘dev_t’
+ dev_t decode_dev(u32 dev)
+ ^~~~~
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://marc.info/?l=linux-btrfs&m=150945479718731&w=2
+
+ convert/source-fs.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/convert/source-fs.h b/convert/source-fs.h
+index 23f33567b42d..4e5babefe6a2 100644
+--- a/convert/source-fs.h
++++ b/convert/source-fs.h
+@@ -19,6 +19,7 @@
+ 
+ #include "kerncompat.h"
+ #include <linux/kdev_t.h>
++#include <sys/types.h>
+ #include <pthread.h>
+ 
+ #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/btrfs-progs/btrfs-progs.hash b/bsp/buildroot/package/btrfs-progs/btrfs-progs.hash
index f9809289..bdcb8bad 100644
--- a/bsp/buildroot/package/btrfs-progs/btrfs-progs.hash
+++ b/bsp/buildroot/package/btrfs-progs/btrfs-progs.hash
@@ -1,2 +1,4 @@
 # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
-sha256 464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede  btrfs-progs-v4.9.1.tar.xz
+sha256 805bdb0031c21a0a5d2ba295a8c9bdd8ba831a68c3fa801aab85677ec902d783  btrfs-progs-v4.13.3.tar.xz
+# Locally computed
+sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15  COPYING
diff --git a/bsp/buildroot/package/btrfs-progs/btrfs-progs.mk b/bsp/buildroot/package/btrfs-progs/btrfs-progs.mk
index f73397ca..96c4350d 100644
--- a/bsp/buildroot/package/btrfs-progs/btrfs-progs.mk
+++ b/bsp/buildroot/package/btrfs-progs/btrfs-progs.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-BTRFS_PROGS_VERSION = 4.9.1
+BTRFS_PROGS_VERSION = 4.13.3
 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs
 BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz
 BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib
 BTRFS_PROGS_CONF_OPTS = --disable-backtrace
-BTRFS_PROGS_LICENSE = GPLv2
+BTRFS_PROGS_LICENSE = GPL-2.0
 BTRFS_PROGS_LICENSE_FILES = COPYING
 BTRFS_PROGS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/bullet/bullet.hash b/bsp/buildroot/package/bullet/bullet.hash
index cccc4258..c6a45c2a 100644
--- a/bsp/buildroot/package/bullet/bullet.hash
+++ b/bsp/buildroot/package/bullet/bullet.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 6e157c0b50373bc0e860de27f06397827bb28a4205bc568ae79d76a0f919ed62  bullet-2.85.1.tar.gz
+sha256 c058b2e4321ba6adaa656976c1a138c07b18fc03b29f5b82880d5d8228fbf059  bullet-2.86.1.tar.gz
diff --git a/bsp/buildroot/package/bullet/bullet.mk b/bsp/buildroot/package/bullet/bullet.mk
index 99ff4236..3e8fae3a 100644
--- a/bsp/buildroot/package/bullet/bullet.mk
+++ b/bsp/buildroot/package/bullet/bullet.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-BULLET_VERSION = 2.85.1
+BULLET_VERSION = 2.86.1
 BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION))
 BULLET_INSTALL_STAGING = YES
-BULLET_LICENSE = zlib license
+BULLET_LICENSE = Zlib
 BULLET_LICENSE_FILES = LICENSE.txt
 
 # Disable demos apps and unit tests.
diff --git a/bsp/buildroot/package/bustle/Config.in b/bsp/buildroot/package/bustle/Config.in
index f213da50..109ebdee 100644
--- a/bsp/buildroot/package/bustle/Config.in
+++ b/bsp/buildroot/package/bustle/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_BUSTLE
 	bool "bustle"
-	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_PACKAGE_DBUS # runtime
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Bustle is a better dbus-monitor! It records and draws
 	  sequence diagrams of D-Bus activity, showing signal
diff --git a/bsp/buildroot/package/bustle/bustle.hash b/bsp/buildroot/package/bustle/bustle.hash
index 9c6df567..49890f74 100644
--- a/bsp/buildroot/package/bustle/bustle.hash
+++ b/bsp/buildroot/package/bustle/bustle.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	6c76cb5182c20b8ce7d6911f8aebc4fae43f919e747a003f1a66698628b27682  bustle-0.4.3.tar.gz
+sha256 921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14  bustle-0.5.4.tar.gz
diff --git a/bsp/buildroot/package/bustle/bustle.mk b/bsp/buildroot/package/bustle/bustle.mk
index 0b85536e..ffbfbe40 100644
--- a/bsp/buildroot/package/bustle/bustle.mk
+++ b/bsp/buildroot/package/bustle/bustle.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-BUSTLE_VERSION = 0.4.3
+BUSTLE_VERSION = 0.5.4
 BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION)
-BUSTLE_LICENSE = LGPLv2.1+
+BUSTLE_LICENSE = LGPL-2.1+
 BUSTLE_LICENSE_FILES = LICENSE
 BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf
 
diff --git a/bsp/buildroot/package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch b/bsp/buildroot/package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch
new file mode 100644
index 00000000..610ca399
--- /dev/null
+++ b/bsp/buildroot/package/busybox/0003-Makefile-include-per-arch-Makefile-before-Makefile.f.patch
@@ -0,0 +1,46 @@
+From 2c240f131ae5cc981702b45397be3b311c67a9ee Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 14 Jul 2017 22:23:46 +0200
+Subject: [PATCH] Makefile: include per-arch Makefile before Makefile.flags
+
+Makefile.flags contains:
+
+ARCH_FPIC ?= -fpic
+ARCH_FPIE ?= -fpie
+
+However, arch/$(ARCH)/Makefile gets included *after* Makefile.flags,
+and therefore doesn't get the chance to provide its own value.
+
+Fix this by including arch/$(ARCH)/Makefile *before* Makefile.flags.
+
+[Submitted upstream: http://lists.busybox.net/pipermail/busybox/2017-July/085632.html]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 971e68e..fe85070 100644
+--- a/Makefile
++++ b/Makefile
+@@ -508,6 +508,8 @@ ifeq ($(dot-config),1)
+ # To avoid any implicit rule to kick in, define an empty command
+ .config .kconfig.d: ;
+ 
++-include $(srctree)/arch/$(ARCH)/Makefile
++
+ # Now we can define CFLAGS etc according to .config
+ include $(srctree)/Makefile.flags
+ 
+@@ -531,8 +533,6 @@ endif
+ # Defaults busybox but it is usually overridden in the arch makefile
+ all: busybox doc
+ 
+--include $(srctree)/arch/$(ARCH)/Makefile
+-
+ # arch Makefile may override CC so keep this after arch Makefile is included
+ #bbox# NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
+ CHECKFLAGS += $(NOSTDINC_FLAGS)
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch b/bsp/buildroot/package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch
new file mode 100644
index 00000000..b4870353
--- /dev/null
+++ b/bsp/buildroot/package/busybox/0004-arch-sparc-sparc64-Makefile-define-ARCH_FPIC.patch
@@ -0,0 +1,79 @@
+From 43593d65827f4e7f848fc410321b0b2deed986fc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 14 Jul 2017 21:54:37 +0200
+Subject: [PATCH] arch/{sparc,sparc64}/Makefile: define ARCH_FPIC
+
+Building Busybox on SPARC or SPARC64 with CONFIG_BUILD_LIBBUSYBOX=y
+currently fails with:
+
+miscutils/lib.a(i2c_tools.o): In function `i2c_dev_open':
+i2c_tools.c:(.text.i2c_dev_open+0x14): relocation truncated to fit: R_SPARC_GOT13 against `.LC0'
+i2c_tools.c:(.text.i2c_dev_open+0x38): relocation truncated to fit: R_SPARC_GOT13 against symbol `bb_errno' defined in COMMON section in libbb/lib.a(ptr_to_globals.o)
+i2c_tools.c:(.text.i2c_dev_open+0x6c): relocation truncated to fit: R_SPARC_GOT13 against `.LC1'
+miscutils/lib.a(i2c_tools.o): In function `check_funcs_test_end':
+i2c_tools.c:(.text.check_funcs_test_end+0x24): relocation truncated to fit: R_SPARC_GOT13 against `.LC2'
+i2c_tools.c:(.text.check_funcs_test_end+0x2c): relocation truncated to fit: R_SPARC_GOT13 against `.LC3'
+miscutils/lib.a(i2c_tools.o): In function `check_read_funcs':
+i2c_tools.c:(.text.check_read_funcs+0x30): relocation truncated to fit: R_SPARC_GOT13 against `.LC10'
+i2c_tools.c:(.text.check_read_funcs+0x80): relocation truncated to fit: R_SPARC_GOT13 against `.LC4'
+i2c_tools.c:(.text.check_read_funcs+0x98): relocation truncated to fit: R_SPARC_GOT13 against `.LC5'
+i2c_tools.c:(.text.check_read_funcs+0xc0): relocation truncated to fit: R_SPARC_GOT13 against `.LC6'
+i2c_tools.c:(.text.check_read_funcs+0xe0): relocation truncated to fit: R_SPARC_GOT13 against `.LC7'
+i2c_tools.c:(.text.check_read_funcs+0xf8): additional relocation overflows omitted from the output
+
+As stated by the gcc documentation, the SPARC architecture has a
+limited GOT size, which prevents moderately large binaries to be built
+with -fpic, and -fPIC is necessary. From gcc's documentation:
+
+'-fpic'
+     Generate position-independent code (PIC) suitable for use in a
+     shared library, if supported for the target machine.  Such code
+     accesses all constant addresses through a global offset table
+     (GOT).  The dynamic loader resolves the GOT entries when the
+     program starts (the dynamic loader is not part of GCC; it is part
+     of the operating system).  If the GOT size for the linked
+     executable exceeds a machine-specific maximum size, you get an
+     error message from the linker indicating that '-fpic' does not
+     work; in that case, recompile with '-fPIC' instead.  (These
+     maximums are 8k on the SPARC, 28k on AArch64 and 32k on the m68k
+     and RS/6000.  The x86 has no such limit.)
+
+'-fPIC'
+     If supported for the target machine, emit position-independent
+     code, suitable for dynamic linking and avoiding any limit on the
+     size of the global offset table.  This option makes a difference on
+     AArch64, m68k, PowerPC and SPARC.
+
+With a limit of 8KB on SPARC, we quickly reach this limit, and we hit
+it when building Busybox on SPARC/SPARC64 with the
+CONFIG_BUILD_LIBBUSYBOX=y option enabled.
+
+Therefore, this commit redefines ARCH_FPIC as -fPIC on sparc and
+sparc64 to solve this issue.
+
+[Submitted upstream: http://lists.busybox.net/pipermail/busybox/2017-July/085633.html]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ arch/sparc/Makefile   | 1 +
+ arch/sparc64/Makefile | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 100644 arch/sparc/Makefile
+ create mode 100644 arch/sparc64/Makefile
+
+diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
+new file mode 100644
+index 0000000..4d6c5fb
+--- /dev/null
++++ b/arch/sparc/Makefile
+@@ -0,0 +1 @@
++ARCH_FPIC = -fPIC
+diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile
+new file mode 100644
+index 0000000..4d6c5fb
+--- /dev/null
++++ b/arch/sparc64/Makefile
+@@ -0,0 +1 @@
++ARCH_FPIC = -fPIC
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/busybox/Config.in b/bsp/buildroot/package/busybox/Config.in
index 504cd8a6..ca8fe68e 100644
--- a/bsp/buildroot/package/busybox/Config.in
+++ b/bsp/buildroot/package/busybox/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_BUSYBOX
 	bool "BusyBox"
 	default y
 	help
-	  The Swiss Army Knife of embedded Linux. It slices, it dices, it
-	  makes Julian Fries.
+	  The Swiss Army Knife of embedded Linux. It slices, it dices,
+	  it makes Julian Fries.
 
 	  http://busybox.net/
 
@@ -15,10 +15,12 @@ config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
 	default "package/busybox/busybox.config"
 	help
-	  Some people may wish to use their own modified BusyBox configuration
-	  file, and will specify their config file location with this option.
+	  Some people may wish to use their own modified BusyBox
+	  configuration file, and will specify their config file
+	  location with this option.
 
-	  Most people will just use the default BusyBox configuration file.
+	  Most people will just use the default BusyBox configuration
+	  file.
 
 config BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES
 	string "Additional BusyBox configuration fragment files"
@@ -35,12 +37,12 @@ config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	  by busybox.
 
 config BR2_PACKAGE_BUSYBOX_SELINUX
-	select BR2_PACKAGE_LIBSELINUX
+	bool "Enable SELinux support"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on !BR2_arc
-	bool "Enable SELinux support"
+	select BR2_PACKAGE_LIBSELINUX
 	help
 	  Enable SELinux support in BusyBox. Please note that
 	  depending on your BusyBox configuration and the SELinux
@@ -54,6 +56,22 @@ config BR2_PACKAGE_BUSYBOX_SELINUX
 	  crond, then individual binaries have to be enabled for the
 	  SELinux type transitions to occur properly.
 
+config BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES
+	bool "Individual binaries"
+	depends on !BR2_STATIC_LIBS
+	depends on !BR2_bfin # libbusybox.so link issue
+	help
+	  By default (i.e with this option disabled), Busybox is
+	  installed as a single binary in /bin/busybox and all applets
+	  are a symbolic link to /bin/busybox.
+
+	  With this option enabled, each applet is a separate binary,
+	  which is needed for proper operation with SELinux.
+
+comment "Busybox individual binaries need a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+	depends on !BR2_bfin
+
 config BR2_PACKAGE_BUSYBOX_WATCHDOG
 	bool "Install the watchdog daemon startup script"
 	help
diff --git a/bsp/buildroot/package/busybox/S01logging b/bsp/buildroot/package/busybox/S01logging
index 4632a4cc..fcb3e7d2 100644
--- a/bsp/buildroot/package/busybox/S01logging
+++ b/bsp/buildroot/package/busybox/S01logging
@@ -33,7 +33,7 @@ case "$1" in
 	start
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart|reload}"
 	exit 1
 esac
 
diff --git a/bsp/buildroot/package/busybox/S10mdev b/bsp/buildroot/package/busybox/S10mdev
index 63ca955b..7075b770 100644
--- a/bsp/buildroot/package/busybox/S10mdev
+++ b/bsp/buildroot/package/busybox/S10mdev
@@ -9,7 +9,8 @@ case "$1" in
 	echo /sbin/mdev >/proc/sys/kernel/hotplug
 	/sbin/mdev -s
 	# coldplug modules
-	find /sys/ -name modalias -print0 | xargs -0 sort -u -z | xargs -0 modprobe -abq
+	find /sys/ -name modalias -print0 | xargs -0 sort -u | tr '\n' '\0' | \
+	    xargs -0 modprobe -abq
 	;;
   stop)
 	;;
diff --git a/bsp/buildroot/package/busybox/busybox.hash b/bsp/buildroot/package/busybox/busybox.hash
index 14d7d1c4..3e1956d0 100644
--- a/bsp/buildroot/package/busybox/busybox.hash
+++ b/bsp/buildroot/package/busybox/busybox.hash
@@ -1,3 +1,5 @@
 # From https://busybox.net/downloads/busybox-1.27.2.tar.bz2.sign
 md5	476186f4bab81781dab2369bfd42734e	busybox-1.27.2.tar.bz2
 sha1	11669e223cc38de646ce26080e91ca29b8d42ad9	busybox-1.27.2.tar.bz2
+# License files, locally calculated
+sha256	bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548	LICENSE
diff --git a/bsp/buildroot/package/busybox/busybox.mk b/bsp/buildroot/package/busybox/busybox.mk
index 1b9e06b2..f17c20bf 100644
--- a/bsp/buildroot/package/busybox/busybox.mk
+++ b/bsp/buildroot/package/busybox/busybox.mk
@@ -7,7 +7,7 @@
 BUSYBOX_VERSION = 1.27.2
 BUSYBOX_SITE = http://www.busybox.net/downloads
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
-BUSYBOX_LICENSE = GPLv2
+BUSYBOX_LICENSE = GPL-2.0
 BUSYBOX_LICENSE_FILES = LICENSE
 
 define BUSYBOX_HELP_CMDS
@@ -52,7 +52,7 @@ BUSYBOX_MAKE_OPTS = \
 	SKIP_STRIP=y
 
 ifndef BUSYBOX_CONFIG_FILE
-	BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
+BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
 endif
 
 BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE)
@@ -60,9 +60,32 @@ BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAG
 BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig
 BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS)
 
+ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y)
+define BUSYBOX_PERMISSIONS
+# Set permissions on all applets with BB_SUID_REQUIRE and BB_SUID_MAYBE.
+# 12 Applets are pulled from applets.h using grep command :
+#  grep -r -e "APPLET.*BB_SUID_REQUIRE\|APPLET.*BB_SUID_MAYBE" \
+#  $(@D)/include/applets.h
+# These applets are added to the device table and the makedev file
+# ignores the files with type 'F' ( optional files).
+	/usr/bin/wall 			 F 4755 0  0 - - - - -
+	/bin/ping 			 F 4755 0  0 - - - - -
+	/bin/ping6 			 F 4755 0  0 - - - - -
+	/usr/bin/crontab 		 F 4755 0  0 - - - - -
+	/sbin/findfs 			 F 4755 0  0 - - - - -
+	/bin/login 			 F 4755 0  0 - - - - -
+	/bin/mount 			 F 4755 0  0 - - - - -
+	/usr/bin/passwd 		 F 4755 0  0 - - - - -
+	/bin/su 			 F 4755 0  0 - - - - -
+	/usr/bin/traceroute 		 F 4755 0  0 - - - - -
+	/usr/bin/traceroute6 		 F 4755 0  0 - - - - -
+	/usr/bin/vlock 			 F 4755 0  0 - - - - -
+endef
+else
 define BUSYBOX_PERMISSIONS
 	/bin/busybox                     f 4755 0  0 - - - - -
 endef
+endif
 
 # If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d
 ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y)
@@ -158,10 +181,22 @@ define BUSYBOX_INSTALL_UDHCPC_SCRIPT
 endef
 
 ifeq ($(BR2_INIT_BUSYBOX),y)
+
 define BUSYBOX_SET_INIT
 	$(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG))
 endef
-endif
+
+ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
+define BUSYBOX_SET_GETTY
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(SYSTEM_GETTY_PORT)::respawn:/sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) #~' \
+		$(TARGET_DIR)/etc/inittab
+endef
+BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_SET_GETTY
+endif # BR2_TARGET_GENERIC_GETTY
+
+BUSYBOX_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
+
+endif # BR2_INIT_BUSYBOX
 
 ifeq ($(BR2_PACKAGE_BUSYBOX_SELINUX),y)
 BUSYBOX_DEPENDENCIES += host-pkgconf libselinux libsepol
@@ -171,6 +206,17 @@ define BUSYBOX_SET_SELINUX
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES),y)
+define BUSYBOX_SET_INDIVIDUAL_BINARIES
+	$(call KCONFIG_ENABLE_OPT,CONFIG_BUILD_LIBBUSYBOX,$(BUSYBOX_BUILD_CONFIG))
+	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_INDIVIDUAL,$(BUSYBOX_BUILD_CONFIG))
+endef
+
+define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES
+	rm -f $(TARGET_DIR)/bin/busybox
+endef
+endif
+
 define BUSYBOX_INSTALL_LOGGING_SCRIPT
 	if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
 		$(INSTALL) -m 0755 -D package/busybox/S01logging \
@@ -202,6 +248,10 @@ define BUSYBOX_LINUX_PAM
 	$(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG))
 endef
 BUSYBOX_DEPENDENCIES += linux-pam
+else
+define BUSYBOX_LINUX_PAM
+	$(call KCONFIG_DISABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG))
+endef
 endif
 
 # Telnet support
@@ -228,6 +278,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS
 	$(BUSYBOX_SET_INIT)
 	$(BUSYBOX_SET_WATCHDOG)
 	$(BUSYBOX_SET_SELINUX)
+	$(BUSYBOX_SET_INDIVIDUAL_BINARIES)
 	$(BUSYBOX_MUSL_TWEAKS)
 endef
 
@@ -251,6 +302,7 @@ define BUSYBOX_INSTALL_INIT_SYSV
 	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
 	$(BUSYBOX_INSTALL_WATCHDOG_SCRIPT)
 	$(BUSYBOX_INSTALL_TELNET_SCRIPT)
+	$(BUSYBOX_INSTALL_INDIVIDUAL_BINARIES)
 endef
 
 # Checks to give errors that the user can understand
diff --git a/bsp/buildroot/package/busybox/inittab b/bsp/buildroot/package/busybox/inittab
index 3f49f6bd..ff1725c7 100644
--- a/bsp/buildroot/package/busybox/inittab
+++ b/bsp/buildroot/package/busybox/inittab
@@ -16,9 +16,13 @@
 # Startup the system
 ::sysinit:/bin/mount -t proc proc /proc
 ::sysinit:/bin/mount -o remount,rw /
-::sysinit:/bin/mkdir -p /dev/pts
-::sysinit:/bin/mkdir -p /dev/shm
+::sysinit:/bin/mkdir -p /dev/pts /dev/shm
 ::sysinit:/bin/mount -a
+::sysinit:/sbin/swapon -a
+null::sysinit:/bin/ln -sf /proc/self/fd /dev/fd
+null::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin
+null::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout
+null::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr
 ::sysinit:/bin/hostname -F /etc/hostname
 # now run any rc scripts
 ::sysinit:/etc/init.d/rcS
diff --git a/bsp/buildroot/package/bwm-ng/bwm-ng.hash b/bsp/buildroot/package/bwm-ng/bwm-ng.hash
index 1d3a240a..4c12b0d8 100644
--- a/bsp/buildroot/package/bwm-ng/bwm-ng.hash
+++ b/bsp/buildroot/package/bwm-ng/bwm-ng.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0  bwm-ng-0.6.1.tar.gz
+sha256  4b34a8ac2eae2d204d6dea8258c5e34b37094259086f8c9169391409a9311fb5  bwm-ng-f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef.tar.gz
diff --git a/bsp/buildroot/package/bwm-ng/bwm-ng.mk b/bsp/buildroot/package/bwm-ng/bwm-ng.mk
index e285422b..587ffbea 100644
--- a/bsp/buildroot/package/bwm-ng/bwm-ng.mk
+++ b/bsp/buildroot/package/bwm-ng/bwm-ng.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-BWM_NG_VERSION = 0.6.1
-BWM_NG_SITE = http://www.gropp.org/bwm-ng
+BWM_NG_VERSION = f54b3fad2c80bfe63f920c9b5e7c1d80389c57ef
+BWM_NG_SITE = $(call github,vgropp,bwm-ng,$(BWM_NG_VERSION))
 BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
-BWM_NG_LICENSE = GPLv2
+BWM_NG_LICENSE = GPL-2.0
 BWM_NG_LICENSE_FILES = COPYING
+BWM_NG_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 BWM_NG_CONF_OPTS += --with-ncurses
diff --git a/bsp/buildroot/package/bzip2/Config.in b/bsp/buildroot/package/bzip2/Config.in
index dbc82496..ca447bbb 100644
--- a/bsp/buildroot/package/bzip2/Config.in
+++ b/bsp/buildroot/package/bzip2/Config.in
@@ -5,5 +5,3 @@ config BR2_PACKAGE_BZIP2
 	  It typically compresses files to within 10% to 15% of the best
 	  available techniques, while being around twice as fast at
 	  compression and six times faster at decompression.
-
-	  http://www.bzip.org
diff --git a/bsp/buildroot/package/bzip2/bzip2.mk b/bsp/buildroot/package/bzip2/bzip2.mk
index e07b0ed0..a3af3229 100644
--- a/bsp/buildroot/package/bzip2/bzip2.mk
+++ b/bsp/buildroot/package/bzip2/bzip2.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 BZIP2_VERSION = 1.0.6
-BZIP2_SITE = http://www.bzip.org/$(BZIP2_VERSION)
+BZIP2_SITE = http://sources.buildroot.net
 BZIP2_INSTALL_STAGING = YES
 BZIP2_LICENSE = bzip2 license
 BZIP2_LICENSE_FILES = LICENSE
@@ -60,9 +60,9 @@ endef
 
 define HOST_BZIP2_INSTALL_CMDS
 	$(HOST_MAKE_ENV) \
-		$(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install
+		$(MAKE) PREFIX=$(HOST_DIR) -C $(@D) install
 	$(HOST_MAKE_ENV) \
-		$(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR)/usr -C $(@D) install
+		$(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR) -C $(@D) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/c-ares/c-ares.hash b/bsp/buildroot/package/c-ares/c-ares.hash
index 79928ae8..832c4dfc 100644
--- a/bsp/buildroot/package/c-ares/c-ares.hash
+++ b/bsp/buildroot/package/c-ares/c-ares.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256 03f708f1b14a26ab26c38abd51137640cb444d3ec72380b21b20f1a8d2861da7 c-ares-1.13.0.tar.gz
+sha256 45d3c1fd29263ceec2afc8ff9cd06d5f8f889636eb4e80ce3cc7f0eaf7aadc6e c-ares-1.14.0.tar.gz
diff --git a/bsp/buildroot/package/c-ares/c-ares.mk b/bsp/buildroot/package/c-ares/c-ares.mk
index 72019a04..67254244 100644
--- a/bsp/buildroot/package/c-ares/c-ares.mk
+++ b/bsp/buildroot/package/c-ares/c-ares.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_ARES_VERSION = 1.13.0
+C_ARES_VERSION = 1.14.0
 C_ARES_SITE = http://c-ares.haxx.se/download
 C_ARES_INSTALL_STAGING = YES
 C_ARES_CONF_OPTS = --with-random=/dev/urandom
diff --git a/bsp/buildroot/package/c-icap-modules/c-icap-modules.hash b/bsp/buildroot/package/c-icap-modules/c-icap-modules.hash
index 5df14498..a9fee87e 100644
--- a/bsp/buildroot/package/c-icap-modules/c-icap-modules.hash
+++ b/bsp/buildroot/package/c-icap-modules/c-icap-modules.hash
@@ -1,3 +1,3 @@
 # From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/
-md5	5acd9487679ed47fbee00270d436718d	c_icap_modules-0.4.2.tar.gz
-sha1	e5f4203980b732b9de165c1e83c4703734c3e0e2	c_icap_modules-0.4.2.tar.gz
+md5 1a7eaa7a34ff35c2440cf303f7b45f22  c_icap_modules-0.4.5.tar.gz
+sha1 515145e6d29413aff8543937504dc5c419043fd5  c_icap_modules-0.4.5.tar.gz
diff --git a/bsp/buildroot/package/c-icap-modules/c-icap-modules.mk b/bsp/buildroot/package/c-icap-modules/c-icap-modules.mk
index cf388aaa..d7543789 100644
--- a/bsp/buildroot/package/c-icap-modules/c-icap-modules.mk
+++ b/bsp/buildroot/package/c-icap-modules/c-icap-modules.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-C_ICAP_MODULES_VERSION = 0.4.2
+C_ICAP_MODULES_VERSION = 0.4.5
 C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz
 C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap
-C_ICAP_MODULES_LICENSE = GPLv2+
+C_ICAP_MODULES_LICENSE = GPL-2.0+
 C_ICAP_MODULES_LICENSE_FILES = COPYING
 C_ICAP_MODULES_DEPENDENCIES = c-icap
 
diff --git a/bsp/buildroot/package/c-icap/c-icap.mk b/bsp/buildroot/package/c-icap/c-icap.mk
index 3078721b..c722098c 100644
--- a/bsp/buildroot/package/c-icap/c-icap.mk
+++ b/bsp/buildroot/package/c-icap/c-icap.mk
@@ -7,13 +7,11 @@
 C_ICAP_VERSION = 0.4.2
 C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz
 C_ICAP_SITE = http://downloads.sourceforge.net/c-icap
-C_ICAP_LICENSE = LGPLv2.1+
+C_ICAP_LICENSE = LGPL-2.1+
 C_ICAP_LICENSE_FILES = COPYING
 C_ICAP_INSTALL_STAGING = YES
 C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config
 C_ICAP_CONF_OPTS = \
-	--with-process-mutexes=posix \
-	--without-ldap \
 	--without-perl \
 	--enable-large-files \
 	--enable-ipv6
@@ -29,17 +27,45 @@ C_ICAP_CONF_ENV = ac_cv_10031b_ipc_sem=yes ac_cv_fcntl=yes
 C_ICAP_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
-C_ICAP_CONF_OPTS += --with-berkeleydb
+C_ICAP_CONF_OPTS += --with-bdb
 C_ICAP_DEPENDENCIES += berkeleydb
 else
-C_ICAP_CONF_OPTS += --without-berkeleydb
+C_ICAP_CONF_OPTS += --without-bdb
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-C_ICAP_CONF_OPTS += --with-bzip2
+C_ICAP_CONF_OPTS += --with-bzlib
 C_ICAP_DEPENDENCIES += bzip2
 else
-C_ICAP_CONF_OPTS += --without-bzip2
+C_ICAP_CONF_OPTS += --without-bzlib
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y)
+C_ICAP_CONF_OPTS += --with-memcached
+C_ICAP_DEPENDENCIES += libmemcached
+else
+C_ICAP_CONF_OPTS += --without-memcached
+endif
+
+ifeq ($(BR2_PACKAGE_OPENLDAP),y)
+C_ICAP_CONF_OPTS += --with-ldap
+C_ICAP_DEPENDENCIES += openldap
+else
+C_ICAP_CONF_OPTS += --without-ldap
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+C_ICAP_CONF_OPTS += --with-openssl
+C_ICAP_DEPENDENCIES += openssl
+else
+C_ICAP_CONF_OPTS += --without-openssl
+endif
+
+ifeq ($(BR2_PACKAGE_PCRE),y)
+C_ICAP_CONF_OPTS += --with-pcre
+C_ICAP_DEPENDENCIES += pcre
+else
+C_ICAP_CONF_OPTS += --without-pcre
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
diff --git a/bsp/buildroot/package/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch b/bsp/buildroot/package/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch
deleted file mode 100644
index 108297c9..00000000
--- a/bsp/buildroot/package/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 8 Aug 2015 22:42:39 +0200
-Subject: [PATCH] Add missing header for musl compatibility
-
-<linux/ioctl.h> is needed to get the definition of _IOC_SIZEBITS and
-solve the following build failure:
-
-src/spi.c: In function 'spi_transfer':
-src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function)
-     if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1)
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/spi.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/spi.c b/src/spi.c
-index 52a8d3d..1a6b17c 100644
---- a/src/spi.c
-+++ b/src/spi.c
-@@ -16,6 +16,7 @@
- #include <errno.h>
- 
- #include <sys/ioctl.h>
-+#include <linux/ioctl.h>
- #include <linux/spi/spidev.h>
- 
- #include "spi.h"
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/c-periphery/0002-Fix-build-on-SPARC.patch b/bsp/buildroot/package/c-periphery/0002-Fix-build-on-SPARC.patch
deleted file mode 100644
index e491f6f7..00000000
--- a/bsp/buildroot/package/c-periphery/0002-Fix-build-on-SPARC.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 295316c3f44c3e779e85d7453424496a3bb4bc48 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 8 Aug 2015 22:56:09 +0200
-Subject: [PATCH] Fix build on SPARC
-
-On SPARC, the definitions of B2500000, B3000000, B3500000 and B4000000
-are not necessarily available, so use those values only if defined in
-the kernel headers.
-
-It fixes SPARC build failures such as:
-
-src/serial.c: In function '_serial_baudrate_to_bits':
-src/serial.c:73:30: error: 'B2500000' undeclared (first use in this function)
-         case 2500000: return B2500000;
-                              ^
-src/serial.c:73:30: note: each undeclared identifier is reported only once for each function it appears in
-src/serial.c:74:30: error: 'B3000000' undeclared (first use in this function)
-         case 3000000: return B3000000;
-                              ^
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/serial.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/src/serial.c b/src/serial.c
-index e385309..efd425e 100644
---- a/src/serial.c
-+++ b/src/serial.c
-@@ -70,10 +70,18 @@ static int _serial_baudrate_to_bits(uint32_t baudrate) {
-         case 1152000: return B1152000;
-         case 1500000: return B1500000;
-         case 2000000: return B2000000;
-+#ifdef B2500000
-         case 2500000: return B2500000;
-+#endif
-+#ifdef B3000000
-         case 3000000: return B3000000;
-+#endif
-+#ifdef B3500000
-         case 3500000: return B3500000;
-+#endif
-+#ifdef B4000000
-         case 4000000: return B4000000;
-+#endif
-         default: return -1;
-     }
- }
-@@ -107,10 +115,18 @@ static int _serial_bits_to_baudrate(uint32_t bits) {
-         case B1152000: return 1152000;
-         case B1500000: return 1500000;
-         case B2000000: return 2000000;
-+#ifdef B2500000
-         case B2500000: return 2500000;
-+#endif
-+#ifdef B3000000
-         case B3000000: return 3000000;
-+#endif
-+#ifdef B3500000
-         case B3500000: return 3500000;
-+#endif
-+#ifdef B4000000
-         case B4000000: return 4000000;
-+#endif
-         default: return -1;
-     }
- }
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/c-periphery/c-periphery.hash b/bsp/buildroot/package/c-periphery/c-periphery.hash
index 516d340d..524925ff 100644
--- a/bsp/buildroot/package/c-periphery/c-periphery.hash
+++ b/bsp/buildroot/package/c-periphery/c-periphery.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5ae4c3f9de0e64d8153ee58b85c4a5defb9f755c6ae215f11b46719bbbac1335  c-periphery-v1.0.3.tar.gz
+sha256 c6cfaae7496ff6500b747106571de6b4ca7d80a383297e592ffcfa3413b66321  c-periphery-v1.1.1.tar.gz
diff --git a/bsp/buildroot/package/c-periphery/c-periphery.mk b/bsp/buildroot/package/c-periphery/c-periphery.mk
index 730b3bc3..359c860e 100644
--- a/bsp/buildroot/package/c-periphery/c-periphery.mk
+++ b/bsp/buildroot/package/c-periphery/c-periphery.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-C_PERIPHERY_VERSION = v1.0.3
+C_PERIPHERY_VERSION = v1.1.1
 C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,$(C_PERIPHERY_VERSION))
 C_PERIPHERY_INSTALL_STAGING = YES
 # only a static library
diff --git a/bsp/buildroot/package/ca-certificates/Config.in b/bsp/buildroot/package/ca-certificates/Config.in
index a278a620..6bb71820 100644
--- a/bsp/buildroot/package/ca-certificates/Config.in
+++ b/bsp/buildroot/package/ca-certificates/Config.in
@@ -6,6 +6,7 @@ config BR2_PACKAGE_CA_CERTIFICATES
 	  connections.
 
 	  It includes, among others, certificate authorities used by the
-	  Debian infrastructure and those shipped with Mozilla's browsers.
+	  Debian infrastructure and those shipped with Mozilla's
+	  browsers.
 
 	  http://anonscm.debian.org/gitweb/?p=collab-maint/ca-certificates.git
diff --git a/bsp/buildroot/package/ca-certificates/ca-certificates.hash b/bsp/buildroot/package/ca-certificates/ca-certificates.hash
index ecedba4f..00296e2a 100644
--- a/bsp/buildroot/package/ca-certificates/ca-certificates.hash
+++ b/bsp/buildroot/package/ca-certificates/ca-certificates.hash
@@ -1,3 +1,3 @@
 # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
-sha1   b190ca8849697e842e69401b28d4ee27130d8c4d                         ca-certificates_20161130.tar.xz
-sha256 04bca9e142a90a834aca0311f7ced237368d71fee7bd5c9f68ef7f4611aee471 ca-certificates_20161130.tar.xz
+sha1   4c093ceee1f1428d5aa7e9a5324b92961c0c0f06                         ca-certificates_20170717.tar.xz
+sha256 e487639b641fa75445174734dd6e9d600373e3248b3d86a7e3c6d0f6977decd2 ca-certificates_20170717.tar.xz
diff --git a/bsp/buildroot/package/ca-certificates/ca-certificates.mk b/bsp/buildroot/package/ca-certificates/ca-certificates.mk
index d077a196..cb0e9614 100644
--- a/bsp/buildroot/package/ca-certificates/ca-certificates.mk
+++ b/bsp/buildroot/package/ca-certificates/ca-certificates.mk
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-CA_CERTIFICATES_VERSION = 20161130
+CA_CERTIFICATES_VERSION = 20170717
 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
-CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20161205T153846Z/pool/main/c/ca-certificates
+CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20170814T210836Z/pool/main/c/ca-certificates
 CA_CERTIFICATES_DEPENDENCIES = host-openssl
 # ca-certificates can be built with either python 2 or python 3
 # but it must be at least python 2.7
 CA_CERTIFICATES_DEPENDENCIES += \
 	$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python)
-CA_CERTIFICATES_LICENSE = GPLv2+ (script), MPLv2.0 (data)
+CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data)
 CA_CERTIFICATES_LICENSE_FILES = debian/copyright
 
 define CA_CERTIFICATES_BUILD_CMDS
@@ -37,7 +37,7 @@ define CA_CERTIFICATES_INSTALL_TARGET_CMDS
 	done
 
 	# Create symlinks to the certificates by their hash values
-	$(HOST_DIR)/usr/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs
+	$(HOST_DIR)/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/cache-calibrator/cache-calibrator.hash b/bsp/buildroot/package/cache-calibrator/cache-calibrator.hash
index df61d17e..a4b4b70c 100644
--- a/bsp/buildroot/package/cache-calibrator/cache-calibrator.hash
+++ b/bsp/buildroot/package/cache-calibrator/cache-calibrator.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 2018ed8fa733155d44ceb1c0066c5cf8df7771cdf7cfca0a07b8dd9bebd9c221 calibrator.c
+sha256 a853663f5b4fb3ad77bf2790ab53146f456b8d9b9ddf83b99fe28c0bdec42514 calibrator.c.license
diff --git a/bsp/buildroot/package/cache-calibrator/cache-calibrator.mk b/bsp/buildroot/package/cache-calibrator/cache-calibrator.mk
index d0620655..6f12d119 100644
--- a/bsp/buildroot/package/cache-calibrator/cache-calibrator.mk
+++ b/bsp/buildroot/package/cache-calibrator/cache-calibrator.mk
@@ -7,12 +7,17 @@
 CACHE_CALIBRATOR_SOURCE = calibrator.c
 CACHE_CALIBRATOR_SITE = http://homepages.cwi.nl/~manegold/Calibrator/src
 CACHE_CALIBRATOR_LICENSE = Cache calibrator license
-CACHE_CALIBRATOR_LICENSE_FILES = calibrator.c
+CACHE_CALIBRATOR_LICENSE_FILES = calibrator.c.license
 
 define CACHE_CALIBRATOR_EXTRACT_CMDS
 	cp $(DL_DIR)/$(CACHE_CALIBRATOR_SOURCE) $(@D)
 endef
 
+define CACHE_CALIBRATOR_EXTRACT_LICENSE
+	head -n 38 $(@D)/calibrator.c >$(@D)/calibrator.c.license
+endef
+CACHE_CALIBRATOR_PRE_PATCH_HOOKS += CACHE_CALIBRATOR_EXTRACT_LICENSE
+
 define CACHE_CALIBRATOR_BUILD_CMDS
 	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(@D)/calibrator.c -o $(@D)/cache_calibrator -lm
 endef
diff --git a/bsp/buildroot/package/cairo/cairo.hash b/bsp/buildroot/package/cairo/cairo.hash
index dd5365ba..f3aa01f2 100644
--- a/bsp/buildroot/package/cairo/cairo.hash
+++ b/bsp/buildroot/package/cairo/cairo.hash
@@ -1,4 +1,4 @@
-# From http://cairographics.org/releases/cairo-1.14.8.tar.xz.sha1
-sha1	c6f7b99986f93c9df78653c3e6a3b5043f65145e	cairo-1.14.8.tar.xz
+# From http://cairographics.org/releases/cairo-1.14.10.tar.xz.sha1
+sha1	28c59d85d6b790c21b8b59ece73a6a1dda28d69a	cairo-1.14.10.tar.xz
 # Calculated based on the hash above
-sha256	d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20	cairo-1.14.8.tar.xz
+sha256	7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09	cairo-1.14.10.tar.xz
diff --git a/bsp/buildroot/package/cairo/cairo.mk b/bsp/buildroot/package/cairo/cairo.mk
index ac91a56f..97490567 100644
--- a/bsp/buildroot/package/cairo/cairo.mk
+++ b/bsp/buildroot/package/cairo/cairo.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CAIRO_VERSION = 1.14.8
+CAIRO_VERSION = 1.14.10
 CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
-CAIRO_LICENSE = LGPLv2.1 or MPLv1.1 (library)
+CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library)
 CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
 CAIRO_SITE = http://cairographics.org/releases
 CAIRO_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/cairomm/Config.in b/bsp/buildroot/package/cairomm/Config.in
index c0d5ccd1..840549b4 100644
--- a/bsp/buildroot/package/cairomm/Config.in
+++ b/bsp/buildroot/package/cairomm/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_CAIROMM
 	bool "cairomm"
-	select BR2_PACKAGE_CAIRO
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBSIGC
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBSIGC
 	help
 	  The cairomm package is a set of C++ bindings for Cairo.
 
diff --git a/bsp/buildroot/package/cairomm/cairomm.mk b/bsp/buildroot/package/cairomm/cairomm.mk
index 7a56a682..07aae971 100644
--- a/bsp/buildroot/package/cairomm/cairomm.mk
+++ b/bsp/buildroot/package/cairomm/cairomm.mk
@@ -6,7 +6,7 @@
 
 CAIROMM_VERSION_MAJOR = 1.12
 CAIROMM_VERSION = $(CAIROMM_VERSION_MAJOR).0
-CAIROMM_LICENSE = LGPLv2+
+CAIROMM_LICENSE = LGPL-2.0+
 CAIROMM_LICENSE_FILES = COPYING
 CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz
 CAIROMM_SITE = http://ftp.gnome.org/pub/gnome/sources/cairomm/$(CAIROMM_VERSION_MAJOR)
diff --git a/bsp/buildroot/package/can-utils/can-utils.mk b/bsp/buildroot/package/can-utils/can-utils.mk
index 6be41a62..45d5e29f 100644
--- a/bsp/buildroot/package/can-utils/can-utils.mk
+++ b/bsp/buildroot/package/can-utils/can-utils.mk
@@ -6,6 +6,7 @@
 
 CAN_UTILS_VERSION = c3305fdd515464153d20199db232b6124bc962c0
 CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION))
+CAN_UTILS_LICENSE = BSD-3-Clause or GPL-2.0, GPL-2.0+
 CAN_UTILS_AUTORECONF = YES
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/canfestival/Config.in b/bsp/buildroot/package/canfestival/Config.in
index ca949565..8300e265 100644
--- a/bsp/buildroot/package/canfestival/Config.in
+++ b/bsp/buildroot/package/canfestival/Config.in
@@ -16,8 +16,8 @@ config BR2_PACKAGE_CANFESTIVAL
 	depends on !BR2_STATIC_LIBS
 	help
 	  CanFestival is an OpenSource CANOpen framework, licensed under
-	  LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan and
-	  copcican_comedi).
+	  LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan
+	  and copcican_comedi).
 
 	  http://www.canfestival.org
 
@@ -78,9 +78,9 @@ config BR2_PACKAGE_CANFESTIVAL_DRIVER
 config BR2_PACKAGE_CANFESTIVAL_ADDITIONAL_OPTIONS
 	string "additional configure options"
 	help
-	  Additional options can be passed directly to the configure script
-	  (e.g.: --MAX_CAN_BUS_ID=..., --SDO_MAX_LENGTH_TRANSFER=...,
-	  --SDO_BLOCK_SIZE=...).
+	  Additional options can be passed directly to the configure
+	  script (e.g.: --MAX_CAN_BUS_ID=...,
+	  --SDO_MAX_LENGTH_TRANSFER=..., --SDO_BLOCK_SIZE=...).
 
 config BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES
 	bool "install examples"
diff --git a/bsp/buildroot/package/canfestival/canfestival.hash b/bsp/buildroot/package/canfestival/canfestival.hash
new file mode 100644
index 00000000..dc32bd9a
--- /dev/null
+++ b/bsp/buildroot/package/canfestival/canfestival.hash
@@ -0,0 +1,3 @@
+# License files, locally calculated
+sha256	b5c45f160093a6c2fb7bd0078f50c62f4b4089b6206b0e90b0f122b40a2fe110  COPYING
+sha256	d4594b82f4d50840df6a7e9d14132a8c0a3cc05d0ac46d15310a264a1f75447e  LICENCE
diff --git a/bsp/buildroot/package/canfestival/canfestival.mk b/bsp/buildroot/package/canfestival/canfestival.mk
index 61578d31..760f14ae 100644
--- a/bsp/buildroot/package/canfestival/canfestival.mk
+++ b/bsp/buildroot/package/canfestival/canfestival.mk
@@ -7,7 +7,7 @@
 CANFESTIVAL_VERSION = 7740ac6fdedc23e1ed6908d3d7db54833c88572b
 CANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3
 CANFESTIVAL_SITE_METHOD = hg
-CANFESTIVAL_LICENSE = LGPLv2.1+
+CANFESTIVAL_LICENSE = LGPL-2.1+
 CANFESTIVAL_LICENSE_FILES = COPYING LICENCE
 CANFESTIVAL_INSTALL_STAGING = YES
 CANFESTIVAL_INSTALLED-y = src drivers
@@ -37,13 +37,13 @@ endef
 
 define CANFESTIVAL_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) all \
-		PYTHON=$(HOST_DIR)/usr/bin/python2
+		PYTHON=$(HOST_DIR)/bin/python2
 endef
 
 define CANFESTIVAL_INSTALL_TARGET_CMDS
 	for d in $(CANFESTIVAL_INSTALLED-y) ; do \
 		$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/$$d install \
-			PYTHON=$(HOST_DIR)/usr/bin/python2 \
+			PYTHON=$(HOST_DIR)/bin/python2 \
 			DESTDIR=$(TARGET_DIR) || exit 1 ; \
 	done
 endef
@@ -51,7 +51,7 @@ endef
 define CANFESTIVAL_INSTALL_STAGING_CMDS
 	for d in $(CANFESTIVAL_INSTALLED-y) ; do \
 		$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/$$d install \
-			PYTHON=$(HOST_DIR)/usr/bin/python2 \
+			PYTHON=$(HOST_DIR)/bin/python2 \
 			DESTDIR=$(STAGING_DIR) || exit 1 ; \
 	done
 endef
diff --git a/bsp/buildroot/package/cannelloni/cannelloni.mk b/bsp/buildroot/package/cannelloni/cannelloni.mk
index fffdb4ba..cc99c54a 100644
--- a/bsp/buildroot/package/cannelloni/cannelloni.mk
+++ b/bsp/buildroot/package/cannelloni/cannelloni.mk
@@ -6,7 +6,7 @@
 
 CANNELLONI_VERSION = 20160414
 CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION))
-CANNELLONI_LICENSE = GPLv2
+CANNELLONI_LICENSE = GPL-2.0
 CANNELLONI_LICENSE_FILES = gpl-2.0.txt
 
 ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y)
diff --git a/bsp/buildroot/package/cantarell/cantarell.mk b/bsp/buildroot/package/cantarell/cantarell.mk
index 3cdf600d..2769b35c 100644
--- a/bsp/buildroot/package/cantarell/cantarell.mk
+++ b/bsp/buildroot/package/cantarell/cantarell.mk
@@ -9,7 +9,7 @@ CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25
 CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR)
 CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz
 CANTARELL_DEPENDENCIES = host-pkgconf
-CANTARELL_LICENSE = OFLv1.1
+CANTARELL_LICENSE = OFL-1.1
 CANTARELL_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/cargo-bin/cargo-bin.hash b/bsp/buildroot/package/cargo-bin/cargo-bin.hash
new file mode 100644
index 00000000..ea121547
--- /dev/null
+++ b/bsp/buildroot/package/cargo-bin/cargo-bin.hash
@@ -0,0 +1,8 @@
+# From https://static.rust-lang.org/dist/cargo-0.24.0-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 6ffc847e0ee2a1273223ce500f7b212d051e99a6d234e34585d0c55e21a963ea  cargo-0.24.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/cargo-0.24.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 93b953c8c7a2088aef952de8dccd7f6ccf9b21bf94b735d3909961ffe831da8c  cargo-0.24.0-x86_64-unknown-linux-gnu.tar.xz
+# Locally generated
+sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
+sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
+sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880  LICENSE-THIRD-PARTY
diff --git a/bsp/buildroot/package/cargo-bin/cargo-bin.mk b/bsp/buildroot/package/cargo-bin/cargo-bin.mk
new file mode 100644
index 00000000..3c834d90
--- /dev/null
+++ b/bsp/buildroot/package/cargo-bin/cargo-bin.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# cargo-bin
+#
+################################################################################
+
+CARGO_BIN_VERSION = 0.24.0
+CARGO_BIN_SITE = https://static.rust-lang.org/dist
+CARGO_BIN_SOURCE = cargo-$(CARGO_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
+CARGO_BIN_LICENSE = Apache-2.0 or MIT
+CARGO_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/cargo/Config.in.host b/bsp/buildroot/package/cargo/Config.in.host
new file mode 100644
index 00000000..0f1ca305
--- /dev/null
+++ b/bsp/buildroot/package/cargo/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_CARGO
+	bool "host cargo"
+	depends on BR2_PACKAGE_HAS_HOST_RUSTC
+	help
+	  Cargo is the package manager for the Rust programming
+	  language.
+
+	  https://crates.io/
diff --git a/bsp/buildroot/package/cargo/cargo.hash b/bsp/buildroot/package/cargo/cargo.hash
new file mode 100644
index 00000000..2a24e2e1
--- /dev/null
+++ b/bsp/buildroot/package/cargo/cargo.hash
@@ -0,0 +1,8 @@
+# Locally generated
+sha256 a9d4291254a1d622d3c3cb942aaa56ab4059b8d04915c3af234f0362f14722e8  cargo-0.24.0.tar.gz
+sha256 dc7240d60a869fa24a68c8734fb7c810c27cca0a6dad52df6279865e4e8e7fae  rust-installer-4f994850808a572e2cc8d43f968893c8e942e9bf.tar.gz
+sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
+sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
+sha256 8bd89f9222dc80292f4107347103b693ac66f3a083371f0629ccf42338abe880  LICENSE-THIRD-PARTY
+# From https://src.fedoraproject.org/repo/pkgs/cargo/cargo-0.24.0-vendor.tar.xz/sha512
+sha512 60c12ce49a53cf986490f5a5fdf606f0374677902edfdc4d48ab1ba6094f3f23efc59626cd3776649c9386a9cab2a60332e5693aad6acbcbb92132efdcf9fe21  cargo-0.24.0-vendor.tar.xz
diff --git a/bsp/buildroot/package/cargo/cargo.mk b/bsp/buildroot/package/cargo/cargo.mk
new file mode 100644
index 00000000..3fd088d7
--- /dev/null
+++ b/bsp/buildroot/package/cargo/cargo.mk
@@ -0,0 +1,91 @@
+################################################################################
+#
+# cargo
+#
+################################################################################
+
+CARGO_VERSION = 0.24.0
+CARGO_SITE = $(call github,rust-lang,cargo,$(CARGO_VERSION))
+CARGO_LICENSE = Apache-2.0 or MIT
+CARGO_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+
+CARGO_DEPS_SHA512 = 60c12ce49a53cf986490f5a5fdf606f0374677902edfdc4d48ab1ba6094f3f23efc59626cd3776649c9386a9cab2a60332e5693aad6acbcbb92132efdcf9fe21
+CARGO_DEPS_SITE = https://src.fedoraproject.org/repo/pkgs/cargo/$(CARGO_DEPS_SOURCE)/sha512/$(CARGO_DEPS_SHA512)
+CARGO_DEPS_SOURCE = cargo-$(CARGO_VERSION)-vendor.tar.xz
+
+CARGO_INSTALLER_VERSION = 4f994850808a572e2cc8d43f968893c8e942e9bf
+CARGO_INSTALLER_SITE = $(call github,rust-lang,rust-installer,$(CARGO_INSTALLER_VERSION))
+CARGO_INSTALLER_SOURCE = rust-installer-$(CARGO_INSTALLER_VERSION).tar.gz
+
+HOST_CARGO_EXTRA_DOWNLOADS = \
+	$(CARGO_DEPS_SITE)/$(CARGO_DEPS_SOURCE) \
+	$(CARGO_INSTALLER_SITE)/$(CARGO_INSTALLER_SOURCE)
+
+HOST_CARGO_DEPENDENCIES = \
+	$(BR2_CMAKE_HOST_DEPENDENCY) \
+	host-pkgconf \
+	host-openssl \
+	host-libhttpparser \
+	host-libssh2 \
+	host-libcurl \
+	host-rustc \
+	host-cargo-bin
+
+HOST_CARGO_SNAP_BIN = $(HOST_CARGO_BIN_DIR)/cargo/bin/cargo
+HOST_CARGO_HOME = $(HOST_DIR)/share/cargo
+
+define HOST_CARGO_EXTRACT_DEPS
+	@mkdir -p $(@D)/vendor
+	$(call suitable-extractor,$(CARGO_DEPS_SOURCE)) \
+		$(DL_DIR)/$(CARGO_DEPS_SOURCE) | \
+		$(TAR) --strip-components=1 -C $(@D)/vendor $(TAR_OPTIONS) -
+endef
+
+HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_DEPS
+
+define HOST_CARGO_EXTRACT_INSTALLER
+	@mkdir -p $(@D)/src/rust-installer
+	$(call suitable-extractor,$(CARGO_INSTALLER_SOURCE)) \
+		$(DL_DIR)/$(CARGO_INSTALLER_SOURCE) | \
+		$(TAR) --strip-components=1 -C $(@D)/src/rust-installer $(TAR_OPTIONS) -
+endef
+
+HOST_CARGO_POST_EXTRACT_HOOKS += HOST_CARGO_EXTRACT_INSTALLER
+
+define HOST_CARGO_SETUP_DEPS
+	mkdir -p $(@D)/.cargo
+	( \
+		echo "[source.crates-io]"; \
+		echo "registry = 'https://github.com/rust-lang/crates.io-index'"; \
+		echo "replace-with = 'vendored-sources'"; \
+		echo "[source.vendored-sources]"; \
+		echo "directory = '$(@D)/vendor'"; \
+	) > $(@D)/.cargo/config
+endef
+
+HOST_CARGO_PRE_CONFIGURE_HOOKS += HOST_CARGO_SETUP_DEPS
+
+HOST_CARGO_SNAP_OPTS = \
+	--release \
+	$(if $(VERBOSE),--verbose)
+
+HOST_CARGO_ENV = \
+	RUSTFLAGS="-Clink-arg=-Wl,-rpath,$(HOST_DIR)/lib" \
+	CARGO_HOME=$(HOST_CARGO_HOME)
+
+define HOST_CARGO_BUILD_CMDS
+	(cd $(@D); $(HOST_MAKE_ENV) $(HOST_CARGO_ENV) $(HOST_CARGO_SNAP_BIN) \
+		build $(HOST_CARGO_SNAP_OPTS))
+endef
+
+define HOST_CARGO_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/target/release/cargo $(HOST_DIR)/bin/cargo
+	$(INSTALL) -D package/cargo/config.in \
+		$(HOST_DIR)/share/cargo/config
+	$(SED) 's/@RUSTC_TARGET_NAME@/$(RUSTC_TARGET_NAME)/' \
+		$(HOST_DIR)/share/cargo/config
+	$(SED) 's/@CROSS_PREFIX@/$(notdir $(TARGET_CROSS))/' \
+		$(HOST_DIR)/share/cargo/config
+endef
+
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/cargo/config.in b/bsp/buildroot/package/cargo/config.in
new file mode 100644
index 00000000..47fad026
--- /dev/null
+++ b/bsp/buildroot/package/cargo/config.in
@@ -0,0 +1,2 @@
+[target.@RUSTC_TARGET_NAME@]
+linker = "@CROSS_PREFIX@gcc"
diff --git a/bsp/buildroot/package/cbootimage/cbootimage.mk b/bsp/buildroot/package/cbootimage/cbootimage.mk
index 1b5672db..40a248ae 100644
--- a/bsp/buildroot/package/cbootimage/cbootimage.mk
+++ b/bsp/buildroot/package/cbootimage/cbootimage.mk
@@ -6,10 +6,9 @@
 
 CBOOTIMAGE_VERSION = v1.7
 CBOOTIMAGE_SITE = $(call github,NVIDIA,cbootimage,$(CBOOTIMAGE_VERSION))
-CBOOTIMAGE_LICENSE = GPLv2
+CBOOTIMAGE_LICENSE = GPL-2.0
 CBOOTIMAGE_LICENSE_FILES = COPYING
 CBOOTIMAGE_AUTORECONF = YES
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
-
diff --git a/bsp/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch b/bsp/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
new file mode 100644
index 00000000..31a64cae
--- /dev/null
+++ b/bsp/buildroot/package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
@@ -0,0 +1,50 @@
+From af3098e05535ddb93bb065770d87738e46089efc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 20 Aug 2017 15:06:01 +0200
+Subject: [PATCH] Makefile.am: do not overwrite LIBS
+
+LIBS is meant to be passed on the command line with additional
+libraries, it should not be overwritten by Makefile.am.
+
+Instead:
+
+ - Use LDADD to link with external libraries
+
+ - Use <target>_LDFLAGS for additional, non-libraries, linker flags
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Upstream: https://github.com/dashesy/cc-tool/commit/553f9c601646af0c6e3f6150d0fa3bc63ff56416
+---
+ Makefile.am | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index e79e47b..ed83d91 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -10,14 +10,12 @@ AM_LDFLAGS = \
+ 
+ #	$(BOOST_THREADS_LDFLAGS)
+       
+-LDADD = $(LIBUSB_LIBS) 
+-
+-LIBS = -s \
++LDADD = $(LIBUSB_LIBS) \
+ 	$(BOOST_FILESYSTEM_LIBS) \
+ 	$(BOOST_REGEX_LIBS) \
+ 	$(BOOST_SYSTEM_LIBS) \
+ 	$(BOOST_PROGRAM_OPTIONS_LIBS)
+-   
++
+ #	$(BOOST_THREADS_LIBS)
+ 
+ bin_PROGRAMS=cc-tool
+@@ -30,4 +28,4 @@ cc_tool_SOURCES=src/main.cpp src/application/cc_flasher.cpp src/application/cc_b
+ 		src/programmer/cc_253x_254x.cpp src/programmer/cc_251x_111x.cpp \
+ 		src/programmer/cc_243x.cpp src/programmer/cc_programmer.cpp \
+ 		src/programmer/cc_unit_driver.cpp src/programmer/cc_unit_info.cpp
+-
++cc_tool_LDFLAGS=-s
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch b/bsp/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch
new file mode 100644
index 00000000..acff1074
--- /dev/null
+++ b/bsp/buildroot/package/cc-tool/0004-m4-boost.m4-fix-rpath-option-check-for-static-linkin.patch
@@ -0,0 +1,44 @@
+From 5e74a15ce1e093b4d8e83cdade60a43b09d698de Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 20 Aug 2017 15:25:06 +0200
+Subject: [PATCH] m4/boost.m4: fix rpath option check for static linking
+
+When statically linking, the order in which -l options are passed is
+important. The contents of the LIBS option passed to the configure
+environment should be passed *after* other -l options used internally
+by the package.
+
+For example, libboost_program_options may used symbols from the
+libatomic library, and in this case, one need to pass LIBS="-latomic"
+to cc-tool's configure script. When using dynamic linking, this works
+fine, because the rpath test does "-latomic
+-lboost_program_options". However, when statically linking, this
+doesn't work because libboost_program_options uses symbols from
+libatomic, so -latomic must be passed *after* -lboost_program_options.
+
+Therefore, this commit inverts the list of variables used to construct
+LIBS before doing the _BOOST_AC_LINK_IFELSE() test detecting the rpath
+option to be used. Indeed, $boost_save_LIBS contains the previously
+saved LIBS variable, and should be passed after $Boost_lib_LIBS.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ m4/boost.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/m4/boost.m4 b/m4/boost.m4
+index be470a7..f1825ba 100644
+--- a/m4/boost.m4
++++ b/m4/boost.m4
+@@ -479,7 +479,7 @@ dnl generated only once above (before we start the for loops).
+            *)
+             for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
+               LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+-              LIBS="$boost_save_LIBS $Boost_lib_LIBS"
++              LIBS="$Boost_lib_LIBS $boost_save_LIBS"
+               _BOOST_AC_LINK_IFELSE([],
+                 [boost_rpath_link_ldflag_found=yes
+                 break],
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/cc-tool/cc-tool.mk b/bsp/buildroot/package/cc-tool/cc-tool.mk
index d8df0415..e170e06a 100644
--- a/bsp/buildroot/package/cc-tool/cc-tool.mk
+++ b/bsp/buildroot/package/cc-tool/cc-tool.mk
@@ -7,7 +7,7 @@
 CC_TOOL_VERSION = 0.26
 CC_TOOL_SITE = http://downloads.sourceforge.net/project/cctool
 CC_TOOL_SOURCE = cc-tool-$(CC_TOOL_VERSION)-src.tgz
-CC_TOOL_LICENSE = GPLv2
+CC_TOOL_LICENSE = GPL-2.0
 CC_TOOL_LICENSE_FILES = COPYING
 CC_TOOL_DEPENDENCIES = boost libusb
 
@@ -16,11 +16,16 @@ CC_TOOL_AUTORECONF = YES
 
 # Configure script "discovers" boost in /usr/local if not given explicitly
 CC_TOOL_CONF_OPTS = --with-boost=$(STAGING_DIR)/usr
+CC_TOOL_CONF_ENV = LIBS="$(CC_TOOL_LIBS)"
 
 # Help boost.m4 find the Boost Regex library, which needs the pthread
 # library, but isn't detected using a modern (pkg-config) mechanism.
 ifeq ($(BR2_STATIC_LIBS),y)
-CC_TOOL_CONF_ENV += LIBS="-lpthread"
+CC_TOOL_LIBS += -lpthread
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+CC_TOOL_LIBS += -latomic
 endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ccache/ccache.mk b/bsp/buildroot/package/ccache/ccache.mk
index 6af2d8e5..552a611f 100644
--- a/bsp/buildroot/package/ccache/ccache.mk
+++ b/bsp/buildroot/package/ccache/ccache.mk
@@ -7,7 +7,7 @@
 CCACHE_VERSION = 3.3.5
 CCACHE_SITE = https://www.samba.org/ftp/ccache
 CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz
-CCACHE_LICENSE = GPLv3+, others
+CCACHE_LICENSE = GPL-3.0+, others
 CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
 # Force ccache to use its internal zlib. The problem is that without
diff --git a/bsp/buildroot/package/ccid/Config.in b/bsp/buildroot/package/ccid/Config.in
index f5bb5830..dfb57e82 100644
--- a/bsp/buildroot/package/ccid/Config.in
+++ b/bsp/buildroot/package/ccid/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_CCID
 	bool "ccid"
-	select BR2_PACKAGE_PCSC_LITE
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	depends on BR2_USE_MMU # pcsc-lite
 	depends on !BR2_STATIC_LIBS # pcsc-lite
+	select BR2_PACKAGE_PCSC_LITE
+	select BR2_PACKAGE_LIBUSB
 	help
 	  PC/SC driver for USB CCID smart card readers
 
diff --git a/bsp/buildroot/package/ccid/ccid.hash b/bsp/buildroot/package/ccid/ccid.hash
index a0e91da4..a7d4875c 100644
--- a/bsp/buildroot/package/ccid/ccid.hash
+++ b/bsp/buildroot/package/ccid/ccid.hash
@@ -1,2 +1,3 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/ccid/ccid_1.4.18-1.dsc
-sha256	5fdba97a2d2eb1c652b7dd4aa0bb8cee4814bab0cf61aecb84b32b57272541aa	ccid_1.4.18.orig.tar.bz2
+# From http://cdn-fastly.deb.debian.org/debian/pool/main/c/ccid/ccid_1.4.27-1.dsc
+sha1 d72ee816422183a86006e0083ccd643236b4e12a  ccid_1.4.27.tar.bz2
+sha256 a660e269606986cb94840ad5ba802ffb0cd23dd12b98f69a35035e0deb9dd137  ccid_1.4.27.tar.bz2
diff --git a/bsp/buildroot/package/ccid/ccid.mk b/bsp/buildroot/package/ccid/ccid.mk
index 18653d35..e566afe0 100644
--- a/bsp/buildroot/package/ccid/ccid.mk
+++ b/bsp/buildroot/package/ccid/ccid.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-CCID_VERSION = 1.4.18
-CCID_SOURCE = ccid_$(CCID_VERSION).orig.tar.bz2
-CCID_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/ccid
-CCID_LICENSE = LGPLv2.1+
+CCID_VERSION = 1.4.27
+CCID_SOURCE = ccid_$(CCID_VERSION).tar.bz2
+CCID_SITE = https://alioth.debian.org/frs/download.php/file/4218
+CCID_LICENSE = LGPL-2.1+
 CCID_LICENSE_FILES = COPYING
 CCID_INSTALL_STAGING = YES
 CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb
diff --git a/bsp/buildroot/package/ccrypt/Config.in b/bsp/buildroot/package/ccrypt/Config.in
index ef5a7eef..109271ae 100644
--- a/bsp/buildroot/package/ccrypt/Config.in
+++ b/bsp/buildroot/package/ccrypt/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_CCRYPT
 	bool "ccrypt"
 	help
-	  ccrypt is a utility for encrypting and decrypting files and streams.
+	  ccrypt is a utility for encrypting and decrypting files and
+	  streams.
 
 	  http://ccrypt.sourceforge.net/
diff --git a/bsp/buildroot/package/ccrypt/ccrypt.mk b/bsp/buildroot/package/ccrypt/ccrypt.mk
index 3beff408..d27e3461 100644
--- a/bsp/buildroot/package/ccrypt/ccrypt.mk
+++ b/bsp/buildroot/package/ccrypt/ccrypt.mk
@@ -7,7 +7,7 @@
 CCRYPT_VERSION = 1.10
 CCRYPT_SITE = http://ccrypt.sourceforge.net/download
 
-CCRYPT_LICENSE = GPLv2+
+CCRYPT_LICENSE = GPL-2.0+
 CCRYPT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/cdrkit/Config.in b/bsp/buildroot/package/cdrkit/Config.in
index af18ba93..7b5b8865 100644
--- a/bsp/buildroot/package/cdrkit/Config.in
+++ b/bsp/buildroot/package/cdrkit/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_CDRKIT
+	bool "cdrkit"
+	depends on BR2_USE_MMU # fork
 	# Needed for libbz
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_LIBCAP
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_USE_MMU # fork
-	bool "cdrkit"
 	help
 	  cdrkit is a suite of programs for recording CDs and DVDs,
 	  blanking CD-RW media, creating ISO-9660 filesystem images,
diff --git a/bsp/buildroot/package/cdrkit/cdrkit.mk b/bsp/buildroot/package/cdrkit/cdrkit.mk
index 10d118c4..f49d5150 100644
--- a/bsp/buildroot/package/cdrkit/cdrkit.mk
+++ b/bsp/buildroot/package/cdrkit/cdrkit.mk
@@ -9,7 +9,7 @@ CDRKIT_SOURCE = cdrkit_$(CDRKIT_VERSION).orig.tar.gz
 CDRKIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit
 CDRKIT_DEPENDENCIES = libcap bzip2 zlib
 HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib
-CDRKIT_LICENSE = GPLv2
+CDRKIT_LICENSE = GPL-2.0
 CDRKIT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_ENDIAN),"BIG")
diff --git a/bsp/buildroot/package/cegui06/Config.in b/bsp/buildroot/package/cegui06/Config.in
index e6a024a3..0139d324 100644
--- a/bsp/buildroot/package/cegui06/Config.in
+++ b/bsp/buildroot/package/cegui06/Config.in
@@ -10,11 +10,11 @@ config BR2_PACKAGE_CEGUI06
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_PCRE
 	help
-	  Crazy Eddie's GUI System is a free library providing windowing and
-	  widgets for graphics APIs / engines where such functionality is not
-	  natively available, or severely lacking. The library is object
-	  orientated, written in C++, and targeted at games developers who
-	  should be spending their time creating great games, not building
-	  GUI sub-systems!
+	  Crazy Eddie's GUI System is a free library providing windowing
+	  and widgets for graphics APIs / engines where such
+	  functionality is not natively available, or severely lacking.
+	  The library is object orientated, written in C++, and targeted
+	  at games developers who should be spending their time creating
+	  great games, not building GUI sub-systems!
 
 	  http://www.cegui.org.uk/
diff --git a/bsp/buildroot/package/cegui06/cegui06.mk b/bsp/buildroot/package/cegui06/cegui06.mk
index 43d3b09d..d3da3ebc 100644
--- a/bsp/buildroot/package/cegui06/cegui06.mk
+++ b/bsp/buildroot/package/cegui06/cegui06.mk
@@ -13,24 +13,24 @@ CEGUI06_LICENSE = MIT
 CEGUI06_LICENSE_FILES = COPYING
 CEGUI06_INSTALL_STAGING = YES
 
-CEGUI06_DEPENDENCIES =              \
-	expat                       \
-	freetype                    \
-	pcre                        \
+CEGUI06_DEPENDENCIES = \
+	expat \
+	freetype \
+	pcre
 
-CEGUI06_CONF_OPTS =                 \
-	--enable-expat              \
-	--disable-external-tinyxml  \
-	--disable-xerces-c          \
-	--disable-libxml            \
-	--disable-tinyxml           \
-	--disable-opengl-renderer   \
-	--disable-external-glew     \
+CEGUI06_CONF_OPTS = \
+	--enable-expat \
+	--disable-external-tinyxml \
+	--disable-xerces-c \
+	--disable-libxml \
+	--disable-tinyxml \
+	--disable-opengl-renderer \
+	--disable-external-glew \
 	--disable-irrlicht-renderer \
 	--disable-directfb-renderer \
-	--disable-samples           \
-	--disable-lua-module        \
-	--disable-toluacegui        \
-	--disable-external-toluapp  \
+	--disable-samples \
+	--disable-lua-module \
+	--disable-toluacegui \
+	--disable-external-toluapp
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/celt051/Config.in b/bsp/buildroot/package/celt051/Config.in
index 035e262d..e1513190 100644
--- a/bsp/buildroot/package/celt051/Config.in
+++ b/bsp/buildroot/package/celt051/Config.in
@@ -5,10 +5,10 @@ config BR2_PACKAGE_CELT051
 	  The CELT ultra-low delay audio codec
 
 	  The CELT codec is a compression algorithm for audio. Like MP3,
-	  Vorbis, and AAC it is suitable for transmitting music with high
-	  quality. Unlike these formats CELT imposes very little delay on
-	  the signal, even less than is typical for speech centric formats
-	  like Speex, GSM, or G.729.
+	  Vorbis, and AAC it is suitable for transmitting music with
+	  high quality. Unlike these formats CELT imposes very little
+	  delay on the signal, even less than is typical for speech
+	  centric formats like Speex, GSM, or G.729.
 
 	  Note: this is version 0.5.1.3 of celt.
 
diff --git a/bsp/buildroot/package/celt051/celt051.mk b/bsp/buildroot/package/celt051/celt051.mk
index 9e257818..01da5c93 100644
--- a/bsp/buildroot/package/celt051/celt051.mk
+++ b/bsp/buildroot/package/celt051/celt051.mk
@@ -9,7 +9,7 @@
 CELT051_VERSION = 0.5.1.3
 CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz
 CELT051_SITE = http://downloads.xiph.org/releases/celt
-CELT051_LICENSE = BSD-2c
+CELT051_LICENSE = BSD-2-Clause
 CELT051_LICENSE_FILES = COPYING
 CELT051_INSTALL_STAGING = YES
 CELT051_DEPENDENCIES = libogg
@@ -18,13 +18,13 @@ CELT051_DEPENDENCIES = libogg
 # if target is the same kind as host (ie. same arch, same bitness,
 # same endianness, so that /usr/lib contains libraries linkable by
 # our cross-compiler)
-CELT051_CONF_OPTS =                       \
-	--enable-fixed-point              \
-	--disable-fixed-point-debug       \
+CELT051_CONF_OPTS = \
+	--enable-fixed-point \
+	--disable-fixed-point-debug \
 	--disable-experimental-postfilter \
-	--disable-static-modes            \
-	--disable-assertions              \
-	--disable-oggtest                 \
-	--with-ogg=$(STAGING_DIR)/usr     \
+	--disable-static-modes \
+	--disable-assertions \
+	--disable-oggtest \
+	--with-ogg=$(STAGING_DIR)/usr
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/cgic/cgic.hash b/bsp/buildroot/package/cgic/cgic.hash
index 6c0fee61..fa1d0bc9 100644
--- a/bsp/buildroot/package/cgic/cgic.hash
+++ b/bsp/buildroot/package/cgic/cgic.hash
@@ -1,2 +1,2 @@
-# Localy computed
-sha256  9562e0b6af59ebc2090107eab5946ce0788a1de36146ad181970cf53e9be7a33  cgic206.tar.gz
+# Locally computed
+sha256 1e8834642a4b89528bb7bde2f287e133c6b07e210e68681a34137c436d59d320  cgic207.tar.gz
diff --git a/bsp/buildroot/package/cgic/cgic.mk b/bsp/buildroot/package/cgic/cgic.mk
index f07c62e9..cd084130 100644
--- a/bsp/buildroot/package/cgic/cgic.mk
+++ b/bsp/buildroot/package/cgic/cgic.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CGIC_VERSION = 2.06
-CGIC_SOURCE = cgic206.tar.gz
+CGIC_VERSION = 2.07
+CGIC_SOURCE = cgic207.tar.gz
 CGIC_SITE = http://boutell.com/cgic
 CGIC_LICENSE = Custom
 CGIC_LICENSE_FILES = license.txt
diff --git a/bsp/buildroot/package/cgilua/cgilua.hash b/bsp/buildroot/package/cgilua/cgilua.hash
index 786791d3..b932e80c 100644
--- a/bsp/buildroot/package/cgilua/cgilua.hash
+++ b/bsp/buildroot/package/cgilua/cgilua.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	8e9ef583f8e1c5b600ebc6bb04924a61f72320130410191a9c56d7295fb02be1  cgilua-5.1.4-2.src.rock
+sha256 7d4883e6a89b3463a1d35b8084a6e2afbbb584af7aca1169380e92af0f848413  cgilua-5.2.1-1.src.rock
diff --git a/bsp/buildroot/package/cgilua/cgilua.mk b/bsp/buildroot/package/cgilua/cgilua.mk
index 5934ffda..cd78841f 100644
--- a/bsp/buildroot/package/cgilua/cgilua.mk
+++ b/bsp/buildroot/package/cgilua/cgilua.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-CGILUA_VERSION = 5.1.4-2
+CGILUA_VERSION = 5.2.1-1
 CGILUA_LICENSE = MIT
+CGILUA_LICENSE_FILES = $(CGILUA_SUBDIR)/doc/us/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash b/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash
index 34f51676..926a031d 100644
--- a/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash
+++ b/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	  fb32a8d9de491358d28f56ab76a56e1a611b90d5b6326910d3a69395fa539027	cgroupfs-mount-7285bf44402029394808339f69f4f293730fc2c6.tar.gz
+sha256 d6c8aff7af59c7d0082ee3018c97f73b0421e81a49bb28ad9f66a36da5cd6ec7  cgroupfs-mount-1.4.tar.gz
diff --git a/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk b/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk
index b3756050..9a767999 100644
--- a/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk
+++ b/bsp/buildroot/package/cgroupfs-mount/cgroupfs-mount.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CGROUPFS_MOUNT_VERSION = 7285bf44402029394808339f69f4f293730fc2c6
+CGROUPFS_MOUNT_VERSION = 1.4
 CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION))
-CGROUPFS_MOUNT_LICENSE = GPLv3+
+CGROUPFS_MOUNT_LICENSE = GPL-3.0+
 CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright
 
 define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS
@@ -17,7 +17,6 @@ endef
 define CGROUPFS_MOUNT_INSTALL_INIT_SYSV
 	$(INSTALL) -m 0755 -D $(CGROUPFS_MOUNT_PKGDIR)/S30cgroupfs \
 		$(TARGET_DIR)/etc/init.d/S30cgroupfs
-
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/check/Config.in b/bsp/buildroot/package/check/Config.in
index 04682e14..2312fbf8 100644
--- a/bsp/buildroot/package/check/Config.in
+++ b/bsp/buildroot/package/check/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_CHECK
 	help
 	  Check is a unit testing framework for C.
 
-	  http://check.sourceforge.net/
+	  https://libcheck.github.io/check/
diff --git a/bsp/buildroot/package/check/check.hash b/bsp/buildroot/package/check/check.hash
index 0c3a924b..3c41a961 100644
--- a/bsp/buildroot/package/check/check.hash
+++ b/bsp/buildroot/package/check/check.hash
@@ -1,3 +1,4 @@
-# From http://sourceforge.net/projects/check/files/check/0.10.0/
-md5	53c5e5c77d090e103a17f3ed7fd7d8b8	check-0.10.0.tar.gz
-sha1	35d3a53446aea7b21a770faedb358d0fc7cba76d	check-0.10.0.tar.gz
+# Locally computed
+sha256	24f7a48aae6b74755bcbe964ce8bc7240f6ced2141f8d9cf480bc3b3de0d5616	check-0.11.0.tar.gz
+# License files, locally calculated
+sha256	a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861	COPYING.LESSER
diff --git a/bsp/buildroot/package/check/check.mk b/bsp/buildroot/package/check/check.mk
index 92dd0336..047beba6 100644
--- a/bsp/buildroot/package/check/check.mk
+++ b/bsp/buildroot/package/check/check.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-CHECK_VERSION = 0.10.0
-CHECK_SITE = http://downloads.sourceforge.net/project/check/check/$(CHECK_VERSION)
+CHECK_VERSION = 0.11.0
+CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION)
 CHECK_INSTALL_STAGING = YES
 CHECK_DEPENDENCIES = host-pkgconf
-CHECK_LICENSE = LGPLv2.1+
+CHECK_LICENSE = LGPL-2.1+
 CHECK_LICENSE_FILES = COPYING.LESSER
 
 # Having checkmk in the target makes no sense
diff --git a/bsp/buildroot/package/checkpolicy/Config.in b/bsp/buildroot/package/checkpolicy/Config.in
new file mode 100644
index 00000000..97ad0b77
--- /dev/null
+++ b/bsp/buildroot/package/checkpolicy/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_CHECKPOLICY
+	bool "checkpolicy"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
+	depends on !BR2_STATIC_LIBS # libselinux
+	depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
+	depends on !BR2_arc # libselinux
+	select BR2_PACKAGE_LIBSELINUX
+	select BR2_PACKAGE_FLEX
+	help
+	  checkpolicy is the SELinux policy compiler. It uses libsepol
+	  to generate the binary policy. checkpolicy uses the static
+	  libsepol since it deals with low level details of the policy
+	  that have not been encapsulated/abstracted by a proper
+	  shared library interface.
+
+	  http://selinuxproject.org/page/Main_Page
+
+comment "checkpolicy needs a glibc toolchain w/ threads, dynamic library"
+	depends on !BR2_arc
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
+		!BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/checkpolicy/checkpolicy.hash b/bsp/buildroot/package/checkpolicy/checkpolicy.hash
index 6208d774..7397393a 100644
--- a/bsp/buildroot/package/checkpolicy/checkpolicy.hash
+++ b/bsp/buildroot/package/checkpolicy/checkpolicy.hash
@@ -1,2 +1,2 @@
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 0bebd18688ca8027b1b3b4ff1532c0626f1fe49883ae6cb74d9d385940e74157  checkpolicy-2.6.tar.gz
+sha256 5413479f1dcde866c19896b4dbfec315d822aa431606e1d03c944408984c3201  checkpolicy-2.7.tar.gz
diff --git a/bsp/buildroot/package/checkpolicy/checkpolicy.mk b/bsp/buildroot/package/checkpolicy/checkpolicy.mk
index 8328b39a..52f81609 100644
--- a/bsp/buildroot/package/checkpolicy/checkpolicy.mk
+++ b/bsp/buildroot/package/checkpolicy/checkpolicy.mk
@@ -4,24 +4,47 @@
 #
 ################################################################################
 
-CHECKPOLICY_VERSION = 2.6
-CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-CHECKPOLICY_LICENSE = GPLv2
+CHECKPOLICY_VERSION = 2.7
+CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+CHECKPOLICY_LICENSE = GPL-2.0
 CHECKPOLICY_LICENSE_FILES = COPYING
 
+CHECKPOLICY_DEPENDENCIES = libselinux flex host-flex host-bison
+
+CHECKPOLICY_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
+	LEX="$(HOST_DIR)/bin/flex" \
+	YACC="$(HOST_DIR)/bin/bison -y"
+
+# DESTDIR is used at build time to find libselinux
+define CHECKPOLICY_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR)
+endef
+
+define CHECKPOLICY_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
+
+endef
+
+define CHECKPOLICY_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(CHECKPOLICY_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+endef
+
 HOST_CHECKPOLICY_DEPENDENCIES = host-libselinux host-flex host-bison
 
-HOST_CHECKPOLICY_MAKE_OPTS = $(HOST_CONFIGURE_OPTS) \
-	LEX="$(HOST_DIR)/usr/bin/flex" \
-	YACC="$(HOST_DIR)/usr/bin/bison -y"
+# PREFIX is used at build time to find host-libselinux
+HOST_CHECKPOLICY_MAKE_OPTS = \
+	$(HOST_CONFIGURE_OPTS) \
+	PREFIX=$(HOST_DIR) \
+	LEX="$(HOST_DIR)/bin/flex" \
+	YACC="$(HOST_DIR)/bin/bison -y"
 
-# DESTDIR is used at build time to find host-libselinux
 define HOST_CHECKPOLICY_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR)
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS)
 endef
 
 define HOST_CHECKPOLICY_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) install
 endef
 
+$(eval $(generic-package))
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch b/bsp/buildroot/package/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch
deleted file mode 100644
index bff8e3ec..00000000
--- a/bsp/buildroot/package/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d9c517d9a4e168c1f7ed28ad0eb9365d69f5ceb2 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Thu, 22 Oct 2015 11:29:55 -0200
-Subject: [PATCH] Fix "`gcc_struct' attribute directive ignored" warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Compilation for target architectures other than i386, x86_64 or PowerPC
-(e.g. ARM) caused multiple warnings like the following to appear:
-
-  doomdata.h:75:1: warning: ‘gcc_struct’ attribute directive ignored
-   } PACKEDATTR mapsidedef_t;
-   ^
-
-This was due to 'gcc_struct' being undefined for these architectures.
-Since that attribute was actually introduced by commit 87db726b9a9ae61ca
-to address the fact that -mms-bitfields became the default for GCC on
-Windows, limit it to that case.
-
-Upstream-status: accepted, not yet released.
-https://github.com/chocolate-doom/chocolate-doom/pull/629
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- src/doomtype.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/doomtype.h b/src/doomtype.h
-index bf0a40e..77c026c 100644
---- a/src/doomtype.h
-+++ b/src/doomtype.h
-@@ -52,10 +52,10 @@
- 
- #ifdef __GNUC__
- 
--#ifdef __clang__
--#define PACKEDATTR __attribute__((packed))
--#else
-+#if defined(_WIN32) && !defined(__clang__)
- #define PACKEDATTR __attribute__((packed,gcc_struct))
-+#else
-+#define PACKEDATTR __attribute__((packed))
- #endif
- 
- #else
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch b/bsp/buildroot/package/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch
deleted file mode 100644
index f4d09f55..00000000
--- a/bsp/buildroot/package/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From fd12fa91aa8e35dbd3ffa5bfe055baf6bde0cd63 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Thu, 22 Oct 2015 15:28:11 -0200
-Subject: [PATCH] configure: fix --with-PACKAGE option checks
-
-Options of the form --with-PACKAGE[=yes] (e.g. --with-libpng), when
-passed to configure, were being treated as though --without-PACKAGE had
-been given.
-
-Although the intention is to have configure check and use PACKAGE by
-default if it's available, thus requiring the user to pass an option
-only if PACKAGE must NOT be used, there are times when the opposite
-might be desired (i.e. the user wants to indicate PACKAGE MUST be used).
-Moreover, allowing --with-PACKAGE and behaving as if --without-PACKAGE
-had been specified is in itself quite confusing.
-
-Fix that by testing the result of 'with_PACKAGE' in configure.ac and
-acting accordingly instead of blindly assuming a 'no'.
-
-Upstream-status: accepted, not yet released.
-https://github.com/chocolate-doom/chocolate-doom/pull/630
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ee97fe2..7b03485 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -80,7 +80,14 @@ AC_SDL_MAIN_WORKAROUND([
-         [Build without libsamplerate @<:@default=check@:>@]),
-     [],
-     [
--        AC_CHECK_LIB(samplerate, src_new)
-+        [with_libsamplerate=check]
-+    ])
-+    AS_IF([test "x$with_libsamplerate" != xno], [
-+        AC_CHECK_LIB(samplerate, src_new, [], [
-+            AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE(
-+                [--with-libsamplerate was given, but test for libsamplerate failed])
-+            ])
-+        ])
-     ])
-     # Check for libpng.
-     AC_ARG_WITH([libpng],
-@@ -88,8 +95,15 @@ AC_SDL_MAIN_WORKAROUND([
-         [Build without libpng @<:@default=check@:>@]),
-     [],
-     [
-+        [with_libpng=check]
-+    ])
-+    AS_IF([test "x$with_libpng" != xno], [
-         AC_CHECK_LIB(z, zlibVersion)
--        AC_CHECK_LIB(png, png_get_io_ptr)
-+        AC_CHECK_LIB(png, png_get_io_ptr, [], [
-+            AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE(
-+                [--with-libpng was given, but test for libpng failed])
-+            ])
-+        ])
-     ])
-     AC_CHECK_LIB(m, log)
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch b/bsp/buildroot/package/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch
deleted file mode 100644
index 860f563d..00000000
--- a/bsp/buildroot/package/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 87c7399305b30045a856d737bbfd8f59b8f52392 Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Fri, 6 Nov 2015 12:14:01 -0200
-Subject: [PATCH] opl: limit use of ioperm/inb/outb to x86 architecture
-
-The use of I/O ports in the Linux driver to directly control OPL chips
-is x86 specific and only really makes sense for x86-based PC's with
-compatible hardware.
-
-For some architectures (e.g. ARM), ioperm, inb and outb do exist and are
-detected by the configure script (via AC_CHECK_FUNCS(ioperm)), but their
-use is inappropriate in these cases and should be avoided.
-
-In some other scenarios, like when using a GNU toolchain + uClibc for
-PowerPC, the build even fails with the following error:
-
-  opl_linux.c:26:20: fatal error: sys/io.h: No such file or directory
-
-That is so because ioperm() is exported by uClibc and gets detected by
-configure, which enables the "Linux" driver via definition of
-HAVE_IOPERM, but in practice 'sys/io.h' is missing for ppc (inb/outb is
-not implemented, and the call to ioperm() would return EIO anyway).
-
-So, besides testing for HAVE_IOPERM, also test if either __i386__ or
-__x86_64__ are defined before enabling this OPL driver.
-
-Upstream-status: accepted, not yet released.
-https://github.com/chocolate-doom/chocolate-doom/pull/638
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- opl/opl.c       | 4 ++--
- opl/opl_linux.c | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/opl/opl.c b/opl/opl.c
-index 60f027d..0d25689 100644
---- a/opl/opl.c
-+++ b/opl/opl.c
-@@ -27,7 +27,7 @@
- 
- //#define OPL_DEBUG_TRACE
- 
--#ifdef HAVE_IOPERM
-+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
- extern opl_driver_t opl_linux_driver;
- #endif
- #if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64)
-@@ -40,7 +40,7 @@ extern opl_driver_t opl_sdl_driver;
- 
- static opl_driver_t *drivers[] =
- {
--#ifdef HAVE_IOPERM
-+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
-     &opl_linux_driver,
- #endif
- #if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64)
-diff --git a/opl/opl_linux.c b/opl/opl_linux.c
-index 5df5d46..19e4c3e 100644
---- a/opl/opl_linux.c
-+++ b/opl/opl_linux.c
-@@ -17,7 +17,7 @@
- 
- #include "config.h"
- 
--#ifdef HAVE_IOPERM
-+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM)
- 
- #include <stdio.h>
- #include <string.h>
-@@ -99,5 +99,5 @@ opl_driver_t opl_linux_driver =
-     OPL_Timer_AdjustCallbacks,
- };
- 
--#endif /* #ifdef HAVE_IOPERM */
-+#endif /* #if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) */
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/chocolate-doom/chocolate-doom.hash b/bsp/buildroot/package/chocolate-doom/chocolate-doom.hash
index bdf56982..6751c7d2 100644
--- a/bsp/buildroot/package/chocolate-doom/chocolate-doom.hash
+++ b/bsp/buildroot/package/chocolate-doom/chocolate-doom.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	ad11e2871667c6fa0658abf2dcba0cd9b26fbd651ee8df55adfdc18ad8fd674a	chocolate-doom-2.2.1.tar.gz
+sha256	3e6d1a82ac5c8b025a9695ce1e47d0dc6ed142ebb1129b1e4a70e2740f79150c	chocolate-doom-2.3.0.tar.gz
diff --git a/bsp/buildroot/package/chocolate-doom/chocolate-doom.mk b/bsp/buildroot/package/chocolate-doom/chocolate-doom.mk
index dad73528..54121c43 100644
--- a/bsp/buildroot/package/chocolate-doom/chocolate-doom.mk
+++ b/bsp/buildroot/package/chocolate-doom/chocolate-doom.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CHOCOLATE_DOOM_VERSION = 2.2.1
+CHOCOLATE_DOOM_VERSION = 2.3.0
 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION)
-CHOCOLATE_DOOM_LICENSE = GPLv2+
+CHOCOLATE_DOOM_LICENSE = GPL-2.0+
 CHOCOLATE_DOOM_LICENSE_FILES = COPYING
 CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl sdl_mixer sdl_net
 
diff --git a/bsp/buildroot/package/chrony/0001-ntp-fix-build-with-musl-libc.patch b/bsp/buildroot/package/chrony/0001-ntp-fix-build-with-musl-libc.patch
new file mode 100644
index 00000000..c927b343
--- /dev/null
+++ b/bsp/buildroot/package/chrony/0001-ntp-fix-build-with-musl-libc.patch
@@ -0,0 +1,39 @@
+From 1e64bc4c4379ae3e55be3c518e0e3e22c8c4ae77 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 14 Nov 2017 13:23:57 +0200
+Subject: [PATCH] ntp: fix build with musl libc
+
+The configure script enables HAVE_LINUX_TIMESTAMPING_OPT_PKTINFO based
+on the existence of struct scm_ts_pktinfo and
+SOF_TIMESTAMPING_OPT_PKTINFO that were introduced in Linux kernel v4.13
+in the linux/net_tstamp.h kernel header. But this feature also requires
+SCM_TIMESTAMPING_PKTINFO that is defined in the socket.h header. musl
+libc provides its own version of socket.h, and as of musl version 1.1.16
+this macro is missing. Define this macro in the code as a temporary
+measure until musl is updated to its latest version.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: not upstreamable
+---
+ ntp_io_linux.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/ntp_io_linux.c b/ntp_io_linux.c
+index 00caed06f7ba..2214a6f6f6c5 100644
+--- a/ntp_io_linux.c
++++ b/ntp_io_linux.c
+@@ -574,6 +574,10 @@ extract_udp_data(unsigned char *msg, NTP_Remote_Address *remote_addr, int len)
+ 
+ /* ================================================== */
+ 
++#ifndef SCM_TIMESTAMPING_PKTINFO
++#define SCM_TIMESTAMPING_PKTINFO 58
++#endif
++
+ int
+ NIO_Linux_ProcessMessage(NTP_Remote_Address *remote_addr, NTP_Local_Address *local_addr,
+                          NTP_Local_Timestamp *local_ts, struct msghdr *hdr, int length)
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch b/bsp/buildroot/package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch
new file mode 100644
index 00000000..d71685e5
--- /dev/null
+++ b/bsp/buildroot/package/chrony/0002-util-fall-back-to-reading-dev-urandom-when-getrandom.patch
@@ -0,0 +1,42 @@
+From 7c5bd948bb7e21fa0ee22f29e97748b2d0360319 Mon Sep 17 00:00:00 2001
+From: Miroslav Lichvar <mlichvar@redhat.com>
+Date: Thu, 17 May 2018 14:16:58 +0200
+Subject: [PATCH] util: fall back to reading /dev/urandom when getrandom()
+ blocks
+
+With recent changes in the Linux kernel, the getrandom() system call may
+block for a long time after boot on machines that don't have enough
+entropy. It blocks the chronyd's initialization before it can detach
+from the terminal and may cause a chronyd service to fail to start due
+to a timeout.
+
+At least for now, enable the GRND_NONBLOCK flag to make the system call
+non-blocking and let the code fall back to reading /dev/urandom (which
+never blocks) if the system call failed with EAGAIN or any other error.
+
+This makes the start of chronyd non-deterministic with respect to files
+that it needs to open and possibly also makes it slightly easier to
+guess the transmit/receive timestamp in client requests until the
+urandom source is fully initialized.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util.c b/util.c
+index 4b3e455..76417d5 100644
+--- a/util.c
++++ b/util.c
+@@ -1224,7 +1224,7 @@ get_random_bytes_getrandom(char *buf, unsigned int len)
+       if (disabled)
+         break;
+ 
+-      if (getrandom(rand_buf, sizeof (rand_buf), 0) != sizeof (rand_buf)) {
++      if (getrandom(rand_buf, sizeof (rand_buf), GRND_NONBLOCK) != sizeof (rand_buf)) {
+         disabled = 1;
+         break;
+       }
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/chrony/chrony.hash b/bsp/buildroot/package/chrony/chrony.hash
index 66ec0603..38f15342 100644
--- a/bsp/buildroot/package/chrony/chrony.hash
+++ b/bsp/buildroot/package/chrony/chrony.hash
@@ -1,3 +1,5 @@
-# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2016/11/msg00000.html
-md5  d08dd5a7d79a89891d119adcccb4397d  chrony-2.4.1.tar.gz
-sha1 b412375ca90dbef653ad00534f8b73b825e396d4  chrony-2.4.1.tar.gz
+# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2017/09/msg00000.html
+md5 f4c4eb0dc92f35ee4bb7d3dcd8029ecb  chrony-3.2.tar.gz
+sha1 64db6c31e013222cc0a2b66322192b4cedf6e048  chrony-3.2.tar.gz
+# Locally calculated
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/bsp/buildroot/package/chrony/chrony.mk b/bsp/buildroot/package/chrony/chrony.mk
index 0dca2eef..8868e848 100644
--- a/bsp/buildroot/package/chrony/chrony.mk
+++ b/bsp/buildroot/package/chrony/chrony.mk
@@ -4,16 +4,15 @@
 #
 ################################################################################
 
-CHRONY_VERSION = 2.4.1
+CHRONY_VERSION = 3.2
 CHRONY_SITE = http://download.tuxfamily.org/chrony
-CHRONY_LICENSE = GPLv2
+CHRONY_LICENSE = GPL-2.0
 CHRONY_LICENSE_FILES = COPYING
 
 CHRONY_CONF_OPTS = \
 	--host-system=Linux \
 	--host-machine=$(BR2_ARCH) \
 	--prefix=/usr \
-	--without-seccomp \
 	--without-tomcrypt
 
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
@@ -28,6 +27,13 @@ else
 CHRONY_CONF_OPTS += --without-nss
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+CHRONY_CONF_OPTS += --enable-scfilter
+CHRONY_DEPENDENCIES += libseccomp
+else
+CHRONY_CONF_OPTS += --without-seccomp
+endif
+
 ifeq ($(BR2_PACKAGE_READLINE),y)
 CHRONY_DEPENDENCIES += readline
 else
diff --git a/bsp/buildroot/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch b/bsp/buildroot/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch
new file mode 100644
index 00000000..65360765
--- /dev/null
+++ b/bsp/buildroot/package/cifs-utils/0001-mount.cifs-Remove-data_blob.h-include.patch
@@ -0,0 +1,32 @@
+From 272d523a57a4e8791d625a479128613be5e401f5 Mon Sep 17 00:00:00 2001
+From: Thomas Witt <pyromaniac@exherbo.org>
+Date: Wed, 15 Mar 2017 20:20:44 +0000
+Subject: [PATCH] mount.cifs: Remove data_blob.h include
+
+data_blob.h includes talloc.h from libtalloc, but that is only marked as
+a dependency for cifs.upcall. No symbols from that header are used by
+cifs.mount, so remove it to avoid the libtalloc dependency
+
+Signed-off-by: Thomas Witt <pyromaniac@exherbo.org>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit 272d523a57a4
+
+ mount.cifs.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/mount.cifs.c b/mount.cifs.c
+index 13b71ef50303..2612feb4d591 100644
+--- a/mount.cifs.c
++++ b/mount.cifs.c
+@@ -61,7 +61,6 @@
+ #include "mount.h"
+ #include "util.h"
+ #include "resolve_host.h"
+-#include "data_blob.h"
+ 
+ #ifndef MS_MOVE 
+ #define MS_MOVE 8192 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/cifs-utils/cifs-utils.hash b/bsp/buildroot/package/cifs-utils/cifs-utils.hash
index 61ffbd9e..ebc9c43e 100644
--- a/bsp/buildroot/package/cifs-utils/cifs-utils.hash
+++ b/bsp/buildroot/package/cifs-utils/cifs-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125	cifs-utils-6.6.tar.bz2
+sha256	b2f21612474ab012e75accd167aab607a0614ff67efb56ea0f36789fa785cfab	cifs-utils-6.7.tar.bz2
diff --git a/bsp/buildroot/package/cifs-utils/cifs-utils.mk b/bsp/buildroot/package/cifs-utils/cifs-utils.mk
index fdb17790..e0efb3bf 100644
--- a/bsp/buildroot/package/cifs-utils/cifs-utils.mk
+++ b/bsp/buildroot/package/cifs-utils/cifs-utils.mk
@@ -4,15 +4,18 @@
 #
 ################################################################################
 
-CIFS_UTILS_VERSION = 6.6
+CIFS_UTILS_VERSION = 6.7
 CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2
 CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils
-CIFS_UTILS_LICENSE = GPLv3+
+CIFS_UTILS_LICENSE = GPL-3.0+
 CIFS_UTILS_LICENSE_FILES = COPYING
+# Missing install-sh in release tarball
+CIFS_UTILS_AUTORECONF = YES
+CIFS_UTILS_DEPENDENCIES = host-pkgconf
 
-ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
-CIFS_UTILS_CONF_OPTS += --disable-pie
-endif
+# Let's disable PIE unconditionally. We want PIE to be enabled only by
+# the global BR2_RELRO_FULL option.
+CIFS_UTILS_CONF_OPTS = --disable-pie --disable-man
 
 ifeq ($(BR2_PACKAGE_KEYUTILS),y)
 CIFS_UTILS_DEPENDENCIES += keyutils
diff --git a/bsp/buildroot/package/circus/Config.in b/bsp/buildroot/package/circus/Config.in
index 52765130..f1cd93c7 100644
--- a/bsp/buildroot/package/circus/Config.in
+++ b/bsp/buildroot/package/circus/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CIRCUS
 	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq
-	depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
 	select BR2_PACKAGE_PYTHON_IOWAIT # runtime
 	select BR2_PACKAGE_PYTHON_PSUTIL # runtime
 	select BR2_PACKAGE_PYTHON_PYZMQ # runtime
@@ -15,7 +14,6 @@ config BR2_PACKAGE_CIRCUS
 
 	  https://circus.readthedocs.org/en/latest/
 
-comment "circus needs Python and a uClibc or glibc toolchain w/ C++, threads"
+comment "circus needs Python and a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-		BR2_TOOLCHAIN_USES_MUSL || \
 		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
diff --git a/bsp/buildroot/package/circus/circus.hash b/bsp/buildroot/package/circus/circus.hash
index 728cad52..877ae21c 100644
--- a/bsp/buildroot/package/circus/circus.hash
+++ b/bsp/buildroot/package/circus/circus.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/circus/json, sha256 locally computed
-md5	cddd4a8844907d8b6b402ca9c713d176  circus-0.13.0.tar.gz
-sha256	6201800a5fb05144b5e6c5ac9eb901b914305e8beaeb01f8edf54ab6ab1a295a  circus-0.13.0.tar.gz
+md5	48e6b220fb0cafca46e3ae1f6ec4bce8  circus-0.14.0.tar.gz
+sha256	b8ca91d8bd87b350fda199488ac9ddff91a546b0c6214a28a2f13393713cf062  circus-0.14.0.tar.gz
+sha256  3df739c05a4eed7efdf4987142658d2a4f1243e5f08e72a5ecedac5749c92a49  LICENSE
diff --git a/bsp/buildroot/package/circus/circus.mk b/bsp/buildroot/package/circus/circus.mk
index 35051c47..8b863aa6 100644
--- a/bsp/buildroot/package/circus/circus.mk
+++ b/bsp/buildroot/package/circus/circus.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CIRCUS_VERSION = 0.13.0
-CIRCUS_SITE = https://pypi.python.org/packages/source/c/circus
+CIRCUS_VERSION = 0.14.0
+CIRCUS_SITE = https://pypi.python.org/packages/68/41/02c6f5edea2df80b133a12753aee3e698e9130a5c878a9b0bffcf1e17e65
 CIRCUS_SETUP_TYPE = setuptools
 CIRCUS_LICENSE = Apache-2.0
 CIRCUS_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/cjson/Config.in b/bsp/buildroot/package/cjson/Config.in
index 04eff4ca..ee18fced 100644
--- a/bsp/buildroot/package/cjson/Config.in
+++ b/bsp/buildroot/package/cjson/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CJSON
 	bool "cJSON"
 	help
-	  An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C
-	  compliant JSON parser, under MIT license.
+	  An ultra-lightweight, portable, single-file, simple-as-can-be
+	  ANSI-C compliant JSON parser, under MIT license.
 
 	  https://github.com/DaveGamble/cJSON
diff --git a/bsp/buildroot/package/cjson/cjson.hash b/bsp/buildroot/package/cjson/cjson.hash
index 903880f7..ea2ecbb7 100644
--- a/bsp/buildroot/package/cjson/cjson.hash
+++ b/bsp/buildroot/package/cjson/cjson.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 1d976ca423d714b7e836cfbc1980b56f49962d0dfe654edb3c2ffa5c713af242  cjson-v1.2.1.tar.gz
+sha256 28ef8c069db19010b9af247b86b05f0f879ac914a4620997c3e5181465170b40  cjson-v1.7.1.tar.gz
+sha256 a36dda207c36db5818729c54e7ad4e8b0c6fba847491ba64f372c1a2037b6d5c  LICENSE
diff --git a/bsp/buildroot/package/cjson/cjson.mk b/bsp/buildroot/package/cjson/cjson.mk
index 11c34c5d..88a33a2c 100644
--- a/bsp/buildroot/package/cjson/cjson.mk
+++ b/bsp/buildroot/package/cjson/cjson.mk
@@ -4,10 +4,24 @@
 #
 ################################################################################
 
-CJSON_VERSION = v1.2.1
+CJSON_VERSION = v1.7.1
 CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION))
 CJSON_INSTALL_STAGING = YES
 CJSON_LICENSE = MIT
 CJSON_LICENSE_FILES = LICENSE
+# Set ENABLE_CUSTOM_COMPILER_FLAGS to OFF in particular to disable
+# -fstack-protector-strong which depends on BR2_TOOLCHAIN_HAS_SSP
+CJSON_CONF_OPTS += \
+	-DENABLE_CJSON_TEST=OFF \
+	-DENABLE_CUSTOM_COMPILER_FLAGS=OFF
+
+# If BUILD_SHARED_AND_STATIC_LIBS is set to OFF, cjson uses the
+# standard BUILD_SHARED_LIBS option which is passed by the
+# cmake-package infrastructure.
+ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=ON
+else
+CJSON_CONF_OPTS += -DBUILD_SHARED_AND_STATIC_LIBS=OFF
+endif
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch b/bsp/buildroot/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch
new file mode 100644
index 00000000..daac677e
--- /dev/null
+++ b/bsp/buildroot/package/clamav/0001-clamdscan-proto.c-fix-build-error-due-to-missing-soc.patch
@@ -0,0 +1,34 @@
+From 52fda6e6689e22866a39ec4273713fb6035c38b2 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Mon, 7 May 2018 23:14:46 +0200
+Subject: [PATCH] clamdscan/proto.c: fix build error due to missing sockaddr_un
+ definition
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+proto.c: In function ‘dconnect’:
+proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’
+             if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Upstream-status: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html
+---
+ clamdscan/proto.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/clamdscan/proto.c b/clamdscan/proto.c
+index 0205f6da0..d3396732f 100644
+--- a/clamdscan/proto.c
++++ b/clamdscan/proto.c
+@@ -42,6 +42,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/un.h>
+ #ifdef HAVE_SYS_SELECT_H
+ #include <sys/select.h>
+ #endif
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/clamav/0001-clamdscan.patch b/bsp/buildroot/package/clamav/0001-clamdscan.patch
deleted file mode 100644
index c395ae16..00000000
--- a/bsp/buildroot/package/clamav/0001-clamdscan.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fixes build error
-
-proto.c: In function ‘dconnect’:
-proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’
-             if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0)
-
-Patch sent upstream: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr clamav-0.98.3.org/clamdscan/proto.c clamav-0.98.3/clamdscan/proto.c
---- clamav-0.98.3.org/clamdscan/proto.c	2014-05-06 20:39:56.000000000 +0200
-+++ clamav-0.98.3/clamdscan/proto.c	2014-05-10 10:41:44.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/types.h>
-+#include <sys/un.h>
- #ifdef HAVE_SYS_SELECT_H
- #include <sys/select.h>
- #endif
diff --git a/bsp/buildroot/package/clamav/0002-backtrace-uClibc.patch b/bsp/buildroot/package/clamav/0002-backtrace-uClibc.patch
deleted file mode 100644
index 82ad6730..00000000
--- a/bsp/buildroot/package/clamav/0002-backtrace-uClibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-mbox: do not use backtrace if using uClibc without backtrace support
-
-Since uClibc can be configured without support for backtrace, disable
-the backtrace if we are building with a uClibc that was built without
-backtrace.
-
-This is a bit hacky, and would greatly benefit from a test in ./configure
-instead, but does nicely as a quick fix for now.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c
---- clamav-0.98.4.orig/libclamav/mbox.c	2014-05-21 17:25:05.000000000 +0200
-+++ clamav-0.98.4/libclamav/mbox.c	2014-11-16 17:21:04.885383286 +0100
-@@ -83,7 +83,7 @@
- #include <features.h>
- #endif
- 
--#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
-+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__)
- #define HAVE_BACKTRACE
- #endif
- #endif
diff --git a/bsp/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch b/bsp/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
new file mode 100644
index 00000000..e99a9742
--- /dev/null
+++ b/bsp/buildroot/package/clamav/0002-mbox-do-not-use-backtrace-if-using-uClibc-without-ba.patch
@@ -0,0 +1,34 @@
+From 053bac34b9f0f947c58fcdf80ac03d5a6b05aa12 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Mon, 7 May 2018 23:15:58 +0200
+Subject: [PATCH] mbox: do not use backtrace if using uClibc without backtrace
+ support
+
+Since uClibc can be configured without support for backtrace, disable
+the backtrace if we are building with a uClibc that was built without
+backtrace.
+
+This is a bit hacky, and would greatly benefit from a test in ./configure
+instead, but does nicely as a quick fix for now.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ libclamav/mbox.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libclamav/mbox.c b/libclamav/mbox.c
+index 71f540c0a..4851297a9 100644
+--- a/libclamav/mbox.c
++++ b/libclamav/mbox.c
+@@ -98,7 +98,7 @@
+ #include <features.h>
+ #endif
+ 
+-#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1
++#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__)
+ #define HAVE_BACKTRACE
+ #endif
+ #endif
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch b/bsp/buildroot/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
new file mode 100644
index 00000000..1d26b099
--- /dev/null
+++ b/bsp/buildroot/package/clamav/0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
@@ -0,0 +1,75 @@
+From 6b6ff53b5931c162be13504a1efc53fc5212f9d1 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Mon, 7 May 2018 22:57:34 +0200
+Subject: [PATCH] m4/reorganization/libs/curl.m4: fix curl-config detection
+ logic
+
+The current logic in curl.m4 doesn't behave properly when
+--without-libcurl is passed to the ./configure script.
+
+Indeed, in this case what happens is that:
+
+ (1) Since --without-libcurl is passed, LIBCURL_HOME is set to nothing
+
+ (2) find_curl is set to "no"
+
+ (3) Due to find_curl being "no", LIBCURL_HOME is not set to
+     /usr/local and remains empty
+
+ (4) We test if $LIBCURL_HOME/bin/curl_config exists, which is
+     equivalent to testing if /bin/curl-config exists. So curl.m4 is
+     looking at /bin/curl-config, which is irrelevant in a
+     cross-compilation context: it is not because the build machine
+     has libcurl installed that it is available for the target.
+
+     Due to this mistake, it sets have_curl="yes"
+
+Due to this, the ./configure script assumes it can build the
+clamsubmit program, which fails at build time because curl/curl.h
+doesn't exist.
+
+To fix this, this commit rewrites the curl-config detection logic with
+a simpler loop. If find_curl=yes, it means we have to find libcurl
+ourselves, so we iterate over /usr/local and /usr, and check if a
+bin/curl-config binary is available there. If so, we use this path as
+LIBCURL_HOME and set have_curl="yes".
+
+This preserves the existing behavior, while fixing the situation where
+--without-libcurl is passed, but /bin/curl-config exists.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Upstream-status: https://github.com/Cisco-Talos/clamav-devel/pull/87
+---
+ m4/reorganization/libs/curl.m4 | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/m4/reorganization/libs/curl.m4 b/m4/reorganization/libs/curl.m4
+index 2a5966ee7..b6a9c2137 100644
+--- a/m4/reorganization/libs/curl.m4
++++ b/m4/reorganization/libs/curl.m4
+@@ -19,17 +19,12 @@ fi
+ [find_curl="yes"])
+ 
+ if test "X$find_curl" = "Xyes"; then
+-    LIBCURL_HOME=/usr/local
+-fi
+-if test -f "$LIBCURL_HOME/bin/curl-config"; then
+-    have_curl="yes"
+-else
+-    if test "X$find_curl" = "Xyes"; then
+-        LIBCURL_HOME=/usr
+-        if test -f "$LIBCURL_HOME/bin/curl-config"; then
+-            have_curl="yes"
++    for p in /usr/local /usr ; do
++        if test -f "${p}/bin/curl-config"; then
++           LIBCURL_HOME=$p
++           have_curl="yes"
+         fi
+-    fi
++    done
+ fi
+ 
+ if test "X$have_curl" = "Xyes"; then
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/clamav/Config.in b/bsp/buildroot/package/clamav/Config.in
index f832341a..bc934ea4 100644
--- a/bsp/buildroot/package/clamav/Config.in
+++ b/bsp/buildroot/package/clamav/Config.in
@@ -1,14 +1,13 @@
 config BR2_PACKAGE_CLAMAV
 	bool "clamav"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBTOOL
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
 	help
-	  ClamAV is an open source antivirus engine for detecting trojans,
-	  viruses, malware & other malicious threats.
+	  ClamAV is an open source antivirus engine for detecting
+	  trojans, viruses, malware & other malicious threats.
 
 	  http://www.clamav.net
 
diff --git a/bsp/buildroot/package/clamav/clamav.hash b/bsp/buildroot/package/clamav/clamav.hash
index 76c633f9..390251fc 100644
--- a/bsp/buildroot/package/clamav/clamav.hash
+++ b/bsp/buildroot/package/clamav/clamav.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 d72ac3273bde8d2e5e28ec9978373ee3ab4529fd868bc3fc4d2d2671228f2461  clamav-0.99.4.tar.gz
+sha256 4a2e4f0cd41e62adb5a713b4a1857c49145cd09a69957e6d946ecad575206dd6  clamav-0.100.2.tar.gz
 sha256 0c4fd2fa9733fc9122503797648710851e4ee6d9e4969dd33fcbd8c63cd2f584  COPYING
 sha256 d72a145c90918184a05ef65a04c9e6f7466faa59bc1b82c8f6a8ddc7ddcb9bed  COPYING.bzip2
 sha256 dfb818a0d41411c6fb1c193c68b73018ceadd1994bda41ad541cbff292894bc6  COPYING.file
diff --git a/bsp/buildroot/package/clamav/clamav.mk b/bsp/buildroot/package/clamav/clamav.mk
index 4caff123..50990aba 100644
--- a/bsp/buildroot/package/clamav/clamav.mk
+++ b/bsp/buildroot/package/clamav/clamav.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-CLAMAV_VERSION = 0.99.4
+CLAMAV_VERSION = 0.100.2
 CLAMAV_SITE = https://www.clamav.net/downloads/production
-CLAMAV_LICENSE = GPLv2
+CLAMAV_LICENSE = GPL-2.0
 CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \
 	COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \
 	COPYING.unrar COPYING.zlib
@@ -15,7 +15,9 @@ CLAMAV_DEPENDENCIES = \
 	libtool \
 	openssl \
 	zlib \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	$(TARGET_NLS_DEPENDENCIES)
+# 0003-m4-reorganization-libs-curl.m4-fix-curl-config-detec.patch
+CLAMAV_AUTORECONF = YES
 
 # mmap cannot be detected when cross-compiling, needed for mempool support
 CLAMAV_CONF_ENV = \
diff --git a/bsp/buildroot/package/clapack/Config.in b/bsp/buildroot/package/clapack/Config.in
index 7d1f9401..e5be0b64 100644
--- a/bsp/buildroot/package/clapack/Config.in
+++ b/bsp/buildroot/package/clapack/Config.in
@@ -23,10 +23,11 @@ config BR2_PACKAGE_CLAPACK_ARITH_H
 	string "Custom BLAS arith.h"
 	depends on BR2_PACKAGE_CLAPACK
 	help
-	  To optimize BLAS library for the hardware, an 'arith.h' header should
-	  be provided.
+	  To optimize BLAS library for the hardware, an 'arith.h' header
+	  should be provided.
 
 	  If empty, the library will not be optimized by the compiler.
 
-	  In any case an 'arithchk' program is built (but not installed), to be run
-	  on the target to generate this arith.h header.
+	  In any case an 'arithchk' program is built
+	  (but not installed), to be run on the target to generate this
+	  arith.h header.
diff --git a/bsp/buildroot/package/clapack/clapack.hash b/bsp/buildroot/package/clapack/clapack.hash
index 08657fc5..ad586fac 100644
--- a/bsp/buildroot/package/clapack/clapack.hash
+++ b/bsp/buildroot/package/clapack/clapack.hash
@@ -1,2 +1,5 @@
 # Locally calculated
 sha256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a clapack-3.2.1-CMAKE.tgz
+# License files, locally calculated
+sha256 23014869214a231525b38c39fdb5f82364fa24154ac80fdcab2a79671460fd09 COPYING
+sha256 44561c447e91203ddc747beeca5cc2794d95ee982c17c578670e4f0408bc3904 F2CLIBS/libf2c/Notice
diff --git a/bsp/buildroot/package/clapack/clapack.mk b/bsp/buildroot/package/clapack/clapack.mk
index c3841f2d..9a083f32 100644
--- a/bsp/buildroot/package/clapack/clapack.mk
+++ b/bsp/buildroot/package/clapack/clapack.mk
@@ -10,7 +10,7 @@ CLAPACK_SOURCE = clapack-$(CLAPACK_VERSION)-CMAKE.tgz
 # - libf2c.a (not installed)
 # - libblas (statically linked with libf2c.a)
 # - liblapack (statically linked with libf2c.a)
-CLAPACK_LICENSE = HPND (libf2c), BSD-3c (libblas and liblapack)
+CLAPACK_LICENSE = HPND (libf2c), BSD-3-Clause (libblas and liblapack)
 CLAPACK_LICENSE_FILES = F2CLIBS/libf2c/Notice COPYING
 CLAPACK_SITE = http://www.netlib.org/clapack
 CLAPACK_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/classpath/0001-fix-gmp-include.patch b/bsp/buildroot/package/classpath/0001-fix-gmp-include.patch
deleted file mode 100644
index f7a39209..00000000
--- a/bsp/buildroot/package/classpath/0001-fix-gmp-include.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-The GMP include is hardcoded to /usr/include causing obvious problems.
-
-From classpath CVS:
-http://cvs.savannah.gnu.org/viewvc/classpath/configure.ac?root=classpath&r1=1.245&r2=1.246
-
-[Gustavo: ditch -L or libtool complains loudly]
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- a/configure.ac	2010/01/30 01:33:50	1.245
-+++ b/configure.ac	2010/05/04 12:29:23	1.246
-@@ -752,10 +752,32 @@
-   dnl __gmpz_mul_si for earlier versions (>= 3.1).
-   dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to
-   dnl change the name of the corresponding ac_ variable on lines 860...
-+  AC_ARG_WITH(gmp, [  --with-gmp=PATH         specify prefix directory for the installed GMP package.
-+                          Equivalent to --with-gmp-include=PATH/include
-+                          plus --with-gmp-lib=PATH/lib])
-+  AC_ARG_WITH(gmp_include, [  --with-gmp-include=PATH specify directory for installed GMP include files])
-+  AC_ARG_WITH(gmp_lib, [  --with-gmp-lib=PATH     specify directory for the installed GMP library])
-+
-   if test "x${COMPILE_GMP}" = xyes; then
-+    AC_MSG_CHECKING([for GMP directories])
-+    if test "x$with_gmp" != x; then
-+       gmplibs="-lgmp"
-+       gmpinc="-I$with_gmp/include"
-+       if test "x$with_gmp_include" != x; then
-+       	  gmpinc="-I$with_gmp_include $gmpinc"
-+       fi
-+       if test "x$with_gmp_lib" != x; then
-+       	  gmplibs="$gmplibs"
-+       fi
-+    else
-+        with_gmp="/usr"
-+	gmplibs="-lgmp"
-+    	gmpinc="-I/usr/include"
-+    fi
-+    AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc])
-     AC_CHECK_LIB(gmp, __gmpz_mul_si,
--      [GMP_CFLAGS=-I/usr/include
--       GMP_LIBS=-lgmp ],
-+      [GMP_CFLAGS="$gmpinc"
-+       GMP_LIBS="$gmplibs" ],
-       [GMP_CFLAGS=
-        GMP_LIBS= ])
-     AC_SUBST(GMP_CFLAGS)
diff --git a/bsp/buildroot/package/classpath/0002-add-config-rpath.patch b/bsp/buildroot/package/classpath/0002-add-config-rpath.patch
deleted file mode 100644
index 3a8a7d09..00000000
--- a/bsp/buildroot/package/classpath/0002-add-config-rpath.patch
+++ /dev/null
@@ -1,680 +0,0 @@
-Add config.rpath from upstream CVS to avoid (re)autoconfiguring errors.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura classpath-0.98.orig/config.rpath classpath-0.98/config.rpath
---- classpath-0.98.orig/config.rpath	1969-12-31 21:00:00.000000000 -0300
-+++ classpath-0.98/config.rpath	2013-07-10 09:36:51.894281025 -0300
-@@ -0,0 +1,672 @@
-+#! /bin/sh
-+# Output a system dependent set of variables, describing how to set the
-+# run time search path of shared libraries in an executable.
-+#
-+#   Copyright 1996-2010 Free Software Foundation, Inc.
-+#   Taken from GNU libtool, 2001
-+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-+#
-+#   This file is free software; the Free Software Foundation gives
-+#   unlimited permission to copy and/or distribute it, with or without
-+#   modifications, as long as this notice is preserved.
-+#
-+# The first argument passed to this file is the canonical host specification,
-+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or
-+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
-+# should be set by the caller.
-+#
-+# The set of defined variables is at the end of this script.
-+
-+# Known limitations:
-+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
-+#   than 256 bytes, otherwise the compiler driver will dump core. The only
-+#   known workaround is to choose shorter directory names for the build
-+#   directory and/or the installation directory.
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+shrext=.so
-+
-+host="$1"
-+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+
-+# Code taken from libtool.m4's _LT_CC_BASENAME.
-+
-+for cc_temp in $CC""; do
-+  case $cc_temp in
-+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
-+
-+# Code taken from libtool.m4's _LT_COMPILER_PIC.
-+
-+wl=
-+if test "$GCC" = yes; then
-+  wl='-Wl,'
-+else
-+  case "$host_os" in
-+    aix*)
-+      wl='-Wl,'
-+      ;;
-+    darwin*)
-+      case $cc_basename in
-+        xlc*)
-+          wl='-Wl,'
-+          ;;
-+      esac
-+      ;;
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      ;;
-+    hpux9* | hpux10* | hpux11*)
-+      wl='-Wl,'
-+      ;;
-+    irix5* | irix6* | nonstopux*)
-+      wl='-Wl,'
-+      ;;
-+    newsos6)
-+      ;;
-+    linux* | k*bsd*-gnu)
-+      case $cc_basename in
-+        ecc*)
-+          wl='-Wl,'
-+          ;;
-+        icc* | ifort*)
-+          wl='-Wl,'
-+          ;;
-+        lf95*)
-+          wl='-Wl,'
-+          ;;
-+        pgcc | pgf77 | pgf90)
-+          wl='-Wl,'
-+          ;;
-+        ccc*)
-+          wl='-Wl,'
-+          ;;
-+        como)
-+          wl='-lopt='
-+          ;;
-+        *)
-+          case `$CC -V 2>&1 | sed 5q` in
-+            *Sun\ C*)
-+              wl='-Wl,'
-+              ;;
-+          esac
-+          ;;
-+      esac
-+      ;;
-+    osf3* | osf4* | osf5*)
-+      wl='-Wl,'
-+      ;;
-+    rdos*)
-+      ;;
-+    solaris*)
-+      wl='-Wl,'
-+      ;;
-+    sunos4*)
-+      wl='-Qoption ld '
-+      ;;
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      wl='-Wl,'
-+      ;;
-+    sysv4*MP*)
-+      ;;
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      wl='-Wl,'
-+      ;;
-+    unicos*)
-+      wl='-Wl,'
-+      ;;
-+    uts4*)
-+      ;;
-+  esac
-+fi
-+
-+# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
-+
-+hardcode_libdir_flag_spec=
-+hardcode_libdir_separator=
-+hardcode_direct=no
-+hardcode_minus_L=no
-+
-+case "$host_os" in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+esac
-+
-+ld_shlibs=yes
-+if test "$with_gnu_ld" = yes; then
-+  # Set some defaults for GNU ld with shared library support. These
-+  # are reset later if shared libraries are not supported. Putting them
-+  # here allows them to be overridden if necessary.
-+  # Unlike libtool, we use -rpath here, not --rpath, since the documented
-+  # option of GNU ld is called -rpath, not --rpath.
-+  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+  case "$host_os" in
-+    aix[3-9]*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    amigaos*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we cannot use
-+      # them.
-+      ld_shlibs=no
-+      ;;
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    interix[3-9]*)
-+      hardcode_direct=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      ;;
-+    gnu* | linux* | k*bsd*-gnu)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    netbsd*)
-+      ;;
-+    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+        ld_shlibs=no
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+          ld_shlibs=no
-+          ;;
-+        *)
-+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+          else
-+            ld_shlibs=no
-+          fi
-+          ;;
-+      esac
-+      ;;
-+    sunos4*)
-+      hardcode_direct=yes
-+      ;;
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        :
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+  esac
-+  if test "$ld_shlibs" = no; then
-+    hardcode_libdir_flag_spec=
-+  fi
-+else
-+  case "$host_os" in
-+    aix3*)
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes; then
-+        # Neither direct hardcoding nor static linking is supported with a
-+        # broken collect2.
-+        hardcode_direct=unsupported
-+      fi
-+      ;;
-+    aix[4-9]*)
-+      if test "$host_cpu" = ia64; then
-+        # On IA64, the linker does run time linking by default, so we don't
-+        # have to do anything special.
-+        aix_use_runtimelinking=no
-+      else
-+        aix_use_runtimelinking=no
-+        # Test if we are trying to use run time linking or normal
-+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+        # need to do runtime linking.
-+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-+          for ld_flag in $LDFLAGS; do
-+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+              aix_use_runtimelinking=yes
-+              break
-+            fi
-+          done
-+          ;;
-+        esac
-+      fi
-+      hardcode_direct=yes
-+      hardcode_libdir_separator=':'
-+      if test "$GCC" = yes; then
-+        case $host_os in aix4.[012]|aix4.[012].*)
-+          collect2name=`${CC} -print-prog-name=collect2`
-+          if test -f "$collect2name" && \
-+            strings "$collect2name" | grep resolve_lib_name >/dev/null
-+          then
-+            # We have reworked collect2
-+            :
-+          else
-+            # We have old collect2
-+            hardcode_direct=unsupported
-+            hardcode_minus_L=yes
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_libdir_separator=
-+          fi
-+          ;;
-+        esac
-+      fi
-+      # Begin _LT_AC_SYS_LIBPATH_AIX.
-+      echo 'int main () { return 0; }' > conftest.c
-+      ${CC} ${LDFLAGS} conftest.c -o conftest
-+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+      if test -z "$aix_libpath"; then
-+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+      fi
-+      if test -z "$aix_libpath"; then
-+        aix_libpath="/usr/lib:/lib"
-+      fi
-+      rm -f conftest.c conftest
-+      # End _LT_AC_SYS_LIBPATH_AIX.
-+      if test "$aix_use_runtimelinking" = yes; then
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+      else
-+        if test "$host_cpu" = ia64; then
-+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+        else
-+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        fi
-+      fi
-+      ;;
-+    amigaos*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      # see comment about different semantics on the GNU ld section
-+      ld_shlibs=no
-+      ;;
-+    bsdi[45]*)
-+      ;;
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      hardcode_libdir_flag_spec=' '
-+      libext=lib
-+      ;;
-+    darwin* | rhapsody*)
-+      hardcode_direct=no
-+      if test "$GCC" = yes ; then
-+        :
-+      else
-+        case $cc_basename in
-+          xlc*)
-+            ;;
-+          *)
-+            ld_shlibs=no
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    dgux*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      ;;
-+    freebsd1*)
-+      ld_shlibs=no
-+      ;;
-+    freebsd2.2*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    freebsd2*)
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      ;;
-+    freebsd* | dragonfly*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    hpux9*)
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      ;;
-+    hpux10*)
-+      if test "$with_gnu_ld" = no; then
-+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator=:
-+        hardcode_direct=yes
-+        # hardcode_minus_L: Not really in the search PATH,
-+        # but as the default location of the library.
-+        hardcode_minus_L=yes
-+      fi
-+      ;;
-+    hpux11*)
-+      if test "$with_gnu_ld" = no; then
-+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator=:
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            hardcode_direct=no
-+            ;;
-+          *)
-+            hardcode_direct=yes
-+            # hardcode_minus_L: Not really in the search PATH,
-+            # but as the default location of the library.
-+            hardcode_minus_L=yes
-+            ;;
-+        esac
-+      fi
-+      ;;
-+    irix5* | irix6* | nonstopux*)
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    netbsd*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      ;;
-+    newsos6)
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+        hardcode_direct=yes
-+        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+          hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        else
-+          case "$host_os" in
-+            openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+              hardcode_libdir_flag_spec='-R$libdir'
-+              ;;
-+            *)
-+              hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+              ;;
-+          esac
-+        fi
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      ;;
-+    osf3*)
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
-+    osf4* | osf5*)
-+      if test "$GCC" = yes; then
-+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+        # Both cc and cxx compiler support -rpath directly
-+        hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      hardcode_libdir_separator=:
-+      ;;
-+    solaris*)
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      ;;
-+    sunos4*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      ;;
-+    sysv4)
-+      case $host_vendor in
-+        sni)
-+          hardcode_direct=yes # is this really true???
-+          ;;
-+        siemens)
-+          hardcode_direct=no
-+          ;;
-+        motorola)
-+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+          ;;
-+      esac
-+      ;;
-+    sysv4.3*)
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+        ld_shlibs=yes
-+      fi
-+      ;;
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      ;;
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator=':'
-+      ;;
-+    uts4*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      ;;
-+    *)
-+      ld_shlibs=no
-+      ;;
-+  esac
-+fi
-+
-+# Check dynamic linker characteristics
-+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
-+# Unlike libtool.m4, here we don't care about _all_ names of the library, but
-+# only about the one the linker finds when passed -lNAME. This is the last
-+# element of library_names_spec in libtool.m4, or possibly two of them if the
-+# linker has special search rules.
-+library_names_spec=      # the last element of library_names_spec in libtool.m4
-+libname_spec='lib$name'
-+case "$host_os" in
-+  aix3*)
-+    library_names_spec='$libname.a'
-+    ;;
-+  aix[4-9]*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  amigaos*)
-+    library_names_spec='$libname.a'
-+    ;;
-+  beos*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  bsdi[45]*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    shrext=.dll
-+    library_names_spec='$libname.dll.a $libname.lib'
-+    ;;
-+  darwin* | rhapsody*)
-+    shrext=.dylib
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  dgux*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  freebsd1*)
-+    ;;
-+  freebsd* | dragonfly*)
-+    case "$host_os" in
-+      freebsd[123]*)
-+        library_names_spec='$libname$shrext$versuffix' ;;
-+      *)
-+        library_names_spec='$libname$shrext' ;;
-+    esac
-+    ;;
-+  gnu*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  hpux9* | hpux10* | hpux11*)
-+    case $host_cpu in
-+      ia64*)
-+        shrext=.so
-+        ;;
-+      hppa*64*)
-+        shrext=.sl
-+        ;;
-+      *)
-+        shrext=.sl
-+        ;;
-+    esac
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  interix[3-9]*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  irix5* | irix6* | nonstopux*)
-+    library_names_spec='$libname$shrext'
-+    case "$host_os" in
-+      irix5* | nonstopux*)
-+        libsuff= shlibsuff=
-+        ;;
-+      *)
-+        case $LD in
-+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
-+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
-+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
-+          *) libsuff= shlibsuff= ;;
-+        esac
-+        ;;
-+    esac
-+    ;;
-+  linux*oldld* | linux*aout* | linux*coff*)
-+    ;;
-+  linux* | k*bsd*-gnu)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  knetbsd*-gnu)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  netbsd*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  newsos6)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  nto-qnx*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  openbsd*)
-+    library_names_spec='$libname$shrext$versuffix'
-+    ;;
-+  os2*)
-+    libname_spec='$name'
-+    shrext=.dll
-+    library_names_spec='$libname.a'
-+    ;;
-+  osf3* | osf4* | osf5*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  rdos*)
-+    ;;
-+  solaris*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  sunos4*)
-+    library_names_spec='$libname$shrext$versuffix'
-+    ;;
-+  sysv4 | sysv4.3*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  sysv4*MP*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+  uts4*)
-+    library_names_spec='$libname$shrext'
-+    ;;
-+esac
-+
-+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
-+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
-+
-+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
-+
-+# How to pass a linker flag through the compiler.
-+wl="$escaped_wl"
-+
-+# Static library suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally "so").
-+shlibext="$shlibext"
-+
-+# Format of library name prefix.
-+libname_spec="$escaped_libname_spec"
-+
-+# Library names that the linker finds when passed -lNAME.
-+library_names_spec="$escaped_library_names_spec"
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator="$hardcode_libdir_separator"
-+
-+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct="$hardcode_direct"
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L="$hardcode_minus_L"
-+
-+EOF
diff --git a/bsp/buildroot/package/classpath/Config.in b/bsp/buildroot/package/classpath/Config.in
index c49ff7a6..0385ccd4 100644
--- a/bsp/buildroot/package/classpath/Config.in
+++ b/bsp/buildroot/package/classpath/Config.in
@@ -3,13 +3,13 @@ config BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k \
 		|| BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el \
 		|| BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le \
-		|| BR2_sh || BR2_x86_64
+		|| BR2_sparc || BR2_sparc64 || BR2_sh || BR2_x86_64
 
 config BR2_PACKAGE_CLASSPATH
 	bool "classpath"
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	select BR2_NEEDS_HOST_JAR
 	select BR2_NEEDS_HOST_JAVAC
-	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	help
 	  GNU Classpath, Essential Libraries for Java, is a GNU
 	  project to create free core class libraries for use with
diff --git a/bsp/buildroot/package/classpath/classpath.hash b/bsp/buildroot/package/classpath/classpath.hash
index 25d3e8cb..d1c5b5c1 100644
--- a/bsp/buildroot/package/classpath/classpath.hash
+++ b/bsp/buildroot/package/classpath/classpath.hash
@@ -1,2 +1,2 @@
-# From http://www.gnu.org/software/classpath/announce/20090205.html
-sha1	1d6e8d1b3542a35bbd1013c61fab3cfae083decb	classpath-0.98.tar.gz
+# From https://www.gnu.org/software/classpath/announce/20120307.html
+sha256	f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8	classpath-0.99.tar.gz
diff --git a/bsp/buildroot/package/classpath/classpath.mk b/bsp/buildroot/package/classpath/classpath.mk
index 3825c76d..6bba6948 100644
--- a/bsp/buildroot/package/classpath/classpath.mk
+++ b/bsp/buildroot/package/classpath/classpath.mk
@@ -4,22 +4,21 @@
 #
 ################################################################################
 
-CLASSPATH_VERSION = 0.98
+CLASSPATH_VERSION = 0.99
 CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
 CLASSPATH_CONF_OPTS = \
 	--disable-examples \
-	--disable-plugin \
 	--disable-rpath \
 	--disable-Werror \
 	--disable-gconf-peer \
-	--disable-tools
+	--disable-gjdoc \
+	--enable-tools
 
 # classpath assumes qt runs on top of X11, but we
 # don't support qt4 on X11
 CLASSPATH_CONF_OPTS += --disable-qt-peer
 CLASSPATH_DEPENDENCIES = host-pkgconf
-CLASSPATH_AUTORECONF = YES
-CLASSPATH_LICENSE = GPLv2+ with exception
+CLASSPATH_LICENSE = GPL-2.0+ with exception
 CLASSPATH_LICENSE_FILES = COPYING
 
 # Needs ALSA pcm and sequencer (midi) support
@@ -53,7 +52,7 @@ else
 CLASSPATH_CONF_OPTS += --disable-gtk-peer --disable-gstreamer-peer
 endif
 
-ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
+ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT)$(BR2_TOOLCHAIN_HAS_THREADS),yyy)
 CLASSPATH_CONF_OPTS += --enable-xmlj
 CLASSPATH_DEPENDENCIES += libxml2 libxslt
 else
diff --git a/bsp/buildroot/package/cloog/cloog.hash b/bsp/buildroot/package/cloog/cloog.hash
deleted file mode 100644
index 7368c9e9..00000000
--- a/bsp/buildroot/package/cloog/cloog.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256	325adf3710ce2229b7eeb9e84d3b539556d093ae860027185e7af8a8b00a750e	cloog-0.18.4.tar.gz
diff --git a/bsp/buildroot/package/cloog/cloog.mk b/bsp/buildroot/package/cloog/cloog.mk
deleted file mode 100644
index ef666d0c..00000000
--- a/bsp/buildroot/package/cloog/cloog.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# cloog
-#
-################################################################################
-
-CLOOG_VERSION = 0.18.4
-CLOOG_SITE = http://www.bastoul.net/cloog/pages/download
-CLOOG_LICENSE = LGPLv2.1+
-HOST_CLOOG_DEPENDENCIES = host-gmp host-isl
-# Our libtool patch doesn't apply, and since this package is only
-# built for the host, we don't really care about it.
-CLOOG_LIBTOOL_PATCH = NO
-
-HOST_CLOOG_CONF_OPTS = --with-isl=system --with-polylib=no
-
-$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/cloop/cloop.mk b/bsp/buildroot/package/cloop/cloop.mk
index caed3f49..ad50d0a9 100644
--- a/bsp/buildroot/package/cloop/cloop.mk
+++ b/bsp/buildroot/package/cloop/cloop.mk
@@ -7,7 +7,7 @@
 CLOOP_VERSION = 2.634-1
 CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.gz
 CLOOP_SITE = http://debian-knoppix.alioth.debian.org/packages/sources/cloop
-CLOOP_LICENSE = GPLv2 (module), GPLv2+ (advancecomp)
+CLOOP_LICENSE = GPL-2.0 (module), GPL-2.0+ (advancecomp)
 CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING
 
 HOST_CLOOP_DEPENDENCIES = host-zlib
@@ -17,9 +17,9 @@ define HOST_CLOOP_BUILD_CMDS
 endef
 
 define HOST_CLOOP_INSTALL_CMDS
-	$(INSTALL) -m 0755 -d $(HOST_DIR)/usr/bin
-	$(INSTALL) -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin
-	$(INSTALL) -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin
+	$(INSTALL) -m 0755 -d $(HOST_DIR)/bin
+	$(INSTALL) -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/bin
+	$(INSTALL) -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/bin
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/cmake/Config.in b/bsp/buildroot/package/cmake/Config.in
index 6f04a4ad..e7bd14e6 100644
--- a/bsp/buildroot/package/cmake/Config.in
+++ b/bsp/buildroot/package/cmake/Config.in
@@ -12,6 +12,14 @@ config BR2_PACKAGE_CMAKE
 
 config BR2_PACKAGE_CMAKE_CTEST
 	bool "ctest"
+	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
+	depends on BR2_USE_WCHAR # libarchive
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
+	depends on BR2_USE_MMU # libuv
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
 	select BR2_PACKAGE_CMAKE
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_JSONCPP
@@ -20,11 +28,8 @@ config BR2_PACKAGE_CMAKE_CTEST
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_XZ
-	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp
-	depends on BR2_USE_WCHAR # libarchive
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBUV
+	select BR2_PACKAGE_RHASH
 	help
 	  CTest is a testing tool distributed as a part of CMake. It
 	  can be used to automate updating (using CVS for example),
@@ -34,7 +39,10 @@ config BR2_PACKAGE_CMAKE_CTEST
 
 	  http://www.cmake.org/
 
-comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7"
+comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, NPTL"
 	depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/bsp/buildroot/package/cmake/Config.in.host b/bsp/buildroot/package/cmake/Config.in.host
new file mode 100644
index 00000000..b2e210ee
--- /dev/null
+++ b/bsp/buildroot/package/cmake/Config.in.host
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_HOST_CMAKE
+	bool "host cmake"
+	help
+	  CMake is an open-source, cross-platform family of tools
+	  designed to build, test and package software. CMake is used
+	  to control the software compilation process using simple
+	  platform and compiler independent configuration files, and
+	  generate native makefiles and workspaces that can be used in
+	  the compiler environment of your choice.
+
+	  http://www.cmake.org/
diff --git a/bsp/buildroot/package/cmake/cmake.hash b/bsp/buildroot/package/cmake/cmake.hash
index f846dc95..f138ac79 100644
--- a/bsp/buildroot/package/cmake/cmake.hash
+++ b/bsp/buildroot/package/cmake/cmake.hash
@@ -1,2 +1,2 @@
-# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt
-sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe  cmake-3.6.3.tar.gz
+# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
+sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d  cmake-3.8.2.tar.gz
diff --git a/bsp/buildroot/package/cmake/cmake.mk b/bsp/buildroot/package/cmake/cmake.mk
index 69ddbb9b..a00691a1 100644
--- a/bsp/buildroot/package/cmake/cmake.mk
+++ b/bsp/buildroot/package/cmake/cmake.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 3.6
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3
+CMAKE_VERSION_MAJOR = 3.8
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR)
-CMAKE_LICENSE = BSD-3c
+CMAKE_LICENSE = BSD-3-Clause
 CMAKE_LICENSE_FILES = Copyright.txt
 
 # CMake is a particular package:
@@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt
 #   the system-wide libraries instead of rebuilding and statically
 #   linking with the ones bundled into the CMake sources.
 
-CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz
+CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv rhash
 
 CMAKE_CONF_OPTS = \
 	-DKWSYS_LFS_WORKS=TRUE \
@@ -32,7 +32,7 @@ CMAKE_CONF_OPTS = \
 	-DBUILD_CursesDialog=OFF
 
 # Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a
-# header available in $(HOST_DIR)/usr/include is used instead of a
+# header available in $(HOST_DIR)/include is used instead of a
 # CMake internal header, e.g. lzma* headers of the xz package
 HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
 HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%")
@@ -41,7 +41,7 @@ define HOST_CMAKE_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CMAKE_CFLAGS)" \
-		./bootstrap --prefix=$(HOST_DIR)/usr \
+		./bootstrap --prefix=$(HOST_DIR) \
 			--parallel=$(PARALLEL_JOBS) -- \
 			-DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \
 			-DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \
diff --git a/bsp/buildroot/package/collectd/Config.in b/bsp/buildroot/package/collectd/Config.in
index 47bfe95d..ccd3fbe1 100644
--- a/bsp/buildroot/package/collectd/Config.in
+++ b/bsp/buildroot/package/collectd/Config.in
@@ -89,8 +89,8 @@ config BR2_PACKAGE_COLLECTD_SYSLOG
 config BR2_PACKAGE_COLLECTD_THRESHOLD
 	bool "threshold"
 	help
-	  Checks values against configured thresholds and creates notifications
-	  if values are out of bounds.
+	  Checks values against configured thresholds and creates
+	  notifications if values are out of bounds.
 
 endmenu
 
@@ -140,17 +140,20 @@ config BR2_PACKAGE_COLLECTD_CGROUPS
 config BR2_PACKAGE_COLLECTD_CONNTRACK
 	bool "conntrack"
 	help
-	  Collects the number of entries in Linux's connection tracking table.
+	  Collects the number of entries in Linux's connection tracking
+	  table.
 
 config BR2_PACKAGE_COLLECTD_CONTEXTSWITCH
 	bool "contextswitch"
 	help
-	  Collects the number of context switches done by the operating system.
+	  Collects the number of context switches done by the operating
+	  system.
 
 config BR2_PACKAGE_COLLECTD_CPU
 	bool "cpu"
 	help
-	  Collects the amount of time spent by the CPU in various states.
+	  Collects the amount of time spent by the CPU in various
+	  states.
 
 config BR2_PACKAGE_COLLECTD_CPUFREQ
 	bool "cpufreq"
@@ -229,7 +232,8 @@ config BR2_PACKAGE_COLLECTD_FHCOUNT
 config BR2_PACKAGE_COLLECTD_FILECOUNT
 	bool "filecount"
 	help
-	  Counts the number of files in a directory and all its subdirectories.
+	  Counts the number of files in a directory and all its
+	  subdirectories.
 
 config BR2_PACKAGE_COLLECTD_FSCACHE
 	bool "fscache"
@@ -323,7 +327,8 @@ config BR2_PACKAGE_COLLECTD_MYSQL
 	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
 	select BR2_PACKAGE_MYSQL
 	help
-	  Connects to a MySQL database and issues a "show status" command.
+	  Connects to a MySQL database and issues a "show status"
+	  command.
 
 config BR2_PACKAGE_COLLECTD_NETLINK
 	bool "netlink"
@@ -334,7 +339,8 @@ config BR2_PACKAGE_COLLECTD_NETLINK
 config BR2_PACKAGE_COLLECTD_NFS
 	bool "nfs"
 	help
-	  Collects information about the usage of the Network File System.
+	  Collects information about the usage of the Network File
+	  System.
 
 config BR2_PACKAGE_COLLECTD_NGINX
 	bool "nginx"
@@ -358,7 +364,8 @@ config BR2_PACKAGE_COLLECTD_OPENLDAP
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_OPENLDAP
 	help
-	  Read monitoring information from OpenLDAP's cn=Monitor subtree.
+	  Read monitoring information from OpenLDAP's cn=Monitor
+	  subtree.
 
 comment "openldap support needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
@@ -409,8 +416,8 @@ config BR2_PACKAGE_COLLECTD_SMART
 	depends on BR2_PACKAGE_HAS_UDEV # libatasmart
 	select BR2_PACKAGE_LIBATASMART
 	help
-	  Collect SMART statistics, notably load cycle count, temperature
-	  and bad sectors.
+	  Collect SMART statistics, notably load cycle count,
+	  temperature and bad sectors.
 
 comment "SMART requires udev to be enabled"
 	depends on !BR2_PACKAGE_HAS_UDEV
@@ -445,8 +452,8 @@ config BR2_PACKAGE_COLLECTD_TAIL
 config BR2_PACKAGE_COLLECTD_TAIL_CSV
 	bool "tail csv"
 	help
-	  Follows (tails) files in CSV format, parses each line and submits
-	  extracted values.
+	  Follows (tails) files in CSV format, parses each line and
+	  submits extracted values.
 
 config BR2_PACKAGE_COLLECTD_TCPCONNS
 	bool "tcpconns"
@@ -516,7 +523,8 @@ comment "Select at least one for collectd to be useful"
 config BR2_PACKAGE_COLLECTD_CSV
 	bool "csv"
 	help
-	  Writes values to a plain-text file in Comma Separated Values format.
+	  Writes values to a plain-text file in Comma Separated Values
+	  format.
 
 config BR2_PACKAGE_COLLECTD_GRAPHITE
 	bool "graphite"
@@ -548,13 +556,15 @@ comment "rrdtool support needs a toolchain w/ wchar"
 
 config BR2_PACKAGE_COLLECTD_RIEMANN
 	bool "riemann"
-	depends on BR2_INSTALL_LIBSTDCPP # protobuf
-	# protobuf-c -> host-protobuf
+	# riemann-c-client -> protobuf-c
+	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_HOST_GCC_AT_LEAST_4_5
 	select BR2_PACKAGE_RIEMANN_C_CLIENT
 	select BR2_PACKAGE_LIBTOOL
 	help
-	  Sends data to Riemann, a stream processing and monitoring system.
+	  Sends data to Riemann, a stream processing and monitoring
+	  system.
 
 config BR2_PACKAGE_COLLECTD_UNIXSOCK
 	bool "unixsock"
@@ -566,7 +576,8 @@ config BR2_PACKAGE_COLLECTD_WRITEHTTP
 	bool "write_http"
 	select BR2_PACKAGE_LIBCURL
 	help
-	  Sends values collected to a web-server using HTTP POST and PUTVAL.
+	  Sends values collected to a web-server using HTTP POST and
+	  PUTVAL.
 
 config BR2_PACKAGE_COLLECTD_WRITELOG
 	bool "write_log"
@@ -577,27 +588,28 @@ config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS
 	bool "write_prometheus"
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
+	depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf-c
 	select BR2_PACKAGE_LIBMICROHTTPD
 	select BR2_PACKAGE_PROTOBUF_C
 	help
 	  Publishes values using an embedded HTTP server, in a format
 	  compatible with Prometheus' collectd_exporter.
 
-comment "write_prometheus needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "write_prometheus needs a toolchain w/ C++, host gcc >= 4.5"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_5
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 
 config BR2_PACKAGE_COLLECTD_WRITESENSU
 	bool "write_sensu"
 	help
-	  Sends data to Sensu, a stream processing and monitoring system,
-	  via the Sensu client local TCP socket.
+	  Sends data to Sensu, a stream processing and monitoring
+	  system, via the Sensu client local TCP socket.
 
 config BR2_PACKAGE_COLLECTD_WRITETSDB
 	bool "write_tsdb"
 	help
-	  Sends data OpenTSDB, a scalable no master, no shared state time
-	  series database.
+	  Sends data OpenTSDB, a scalable no master, no shared state
+	  time series database.
 
 endmenu
 
diff --git a/bsp/buildroot/package/collectd/collectd.hash b/bsp/buildroot/package/collectd/collectd.hash
index be2f646c..cf7e0b83 100644
--- a/bsp/buildroot/package/collectd/collectd.hash
+++ b/bsp/buildroot/package/collectd/collectd.hash
@@ -1,2 +1,6 @@
 # From https://collectd.org/files/SHA256SUM
 sha256	7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501	collectd-5.7.1.tar.bz2
+
+# Hash for license files
+sha256	ed0409b2b1c30566dab5fcdaf46ee70e140c99788e22f0267645a9357b476ae4	COPYING
+sha256	f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa	libltdl/COPYING.LIB
diff --git a/bsp/buildroot/package/collectd/collectd.mk b/bsp/buildroot/package/collectd/collectd.mk
index 1b61b068..ef45f342 100644
--- a/bsp/buildroot/package/collectd/collectd.mk
+++ b/bsp/buildroot/package/collectd/collectd.mk
@@ -9,8 +9,8 @@ COLLECTD_SITE = http://collectd.org/files
 COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2
 COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes
 COLLECTD_INSTALL_STAGING = YES
-COLLECTD_LICENSE = GPLv2, LGPLv2.1
-COLLECTD_LICENSE_FILES = COPYING
+COLLECTD_LICENSE = MIT (daemon, plugins), GPL-2.0 (plugins), LGPL-2.1 (plugins)
+COLLECTD_LICENSE_FILES = COPYING libltdl/COPYING.LIB
 
 # These require unmet dependencies, are fringe, pointless or deprecated
 COLLECTD_PLUGINS_DISABLE = \
diff --git a/bsp/buildroot/package/comix-cursors/comix-cursors.mk b/bsp/buildroot/package/comix-cursors/comix-cursors.mk
index f8e82840..6cc73764 100644
--- a/bsp/buildroot/package/comix-cursors/comix-cursors.mk
+++ b/bsp/buildroot/package/comix-cursors/comix-cursors.mk
@@ -7,7 +7,7 @@
 COMIX_CURSORS_VERSION = 0.8.2
 COMIX_CURSORS_SITE = http://limitland.de/downloads/comixcursors
 COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2
-COMIX_CURSORS_LICENSE = GPLv3
+COMIX_CURSORS_LICENSE = GPL-3.0
 COMIX_CURSORS_STRIP_COMPONENTS = 0
 
 define COMIX_CURSORS_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/connman-gtk/connman-gtk.mk b/bsp/buildroot/package/connman-gtk/connman-gtk.mk
index 2c9c1314..9888fcd4 100644
--- a/bsp/buildroot/package/connman-gtk/connman-gtk.mk
+++ b/bsp/buildroot/package/connman-gtk/connman-gtk.mk
@@ -9,7 +9,7 @@ CONNMAN_GTK_SITE = https://github.com/jgke/connman-gtk/releases/download/v$(CONN
 CONNMAN_GTK_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2
 CONNMAN_GTK_INSTALL_STAGING = YES
 CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3
-CONNMAN_GTK_LICENSE = GPLv2+
+CONNMAN_GTK_LICENSE = GPL-2.0+
 CONNMAN_GTK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/connman/0001-tethering-Reorder-header-includes.patch b/bsp/buildroot/package/connman/0001-tethering-Reorder-header-includes.patch
new file mode 100644
index 00000000..4955df1c
--- /dev/null
+++ b/bsp/buildroot/package/connman/0001-tethering-Reorder-header-includes.patch
@@ -0,0 +1,37 @@
+From bdfb3526466f8fb8f13d9259037d8f42c782ce24 Mon Sep 17 00:00:00 2001
+From: Daniel Wagner <wagi@monom.org>
+Date: Wed, 17 Jan 2018 23:42:50 +0100
+Subject: [PATCH] tethering: Reorder header includes
+
+Avoid compile errors due to unsupported header include order with
+newer kernels (>=4.15). We should import the libc header files first
+and then the Linux header files in user space applications.
+
+Reported by Neil MacLeod <neil@nmacleod.com>. Fix probosal by Jonas
+Bonn <jonas@southpole.se> and Hauke Mehrtens <hauke@hauke-m.de>.
+
+Signed-off-by: Martin Bark <martin@barkynet.com>
+---
+ src/tethering.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/tethering.c b/src/tethering.c
+index c929ba7..4b20236 100644
+--- a/src/tethering.c
++++ b/src/tethering.c
+@@ -31,11 +31,11 @@
+ #include <stdio.h>
+ #include <sys/ioctl.h>
+ #include <net/if.h>
+-#include <linux/sockios.h>
+ #include <string.h>
+ #include <fcntl.h>
+-#include <linux/if_tun.h>
+ #include <netinet/in.h>
++#include <linux/sockios.h>
++#include <linux/if_tun.h>
+ #include <linux/if_bridge.h>
+
+ #include "connman.h"
+--
+2.7.4
diff --git a/bsp/buildroot/package/connman/Config.in b/bsp/buildroot/package/connman/Config.in
index 6ed40bea..5177c939 100644
--- a/bsp/buildroot/package/connman/Config.in
+++ b/bsp/buildroot/package/connman/Config.in
@@ -1,20 +1,20 @@
 config BR2_PACKAGE_CONNMAN
 	bool "connman"
-	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_IPTABLES
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus, libglib2
 	depends on !BR2_STATIC_LIBS # needs dlopen()
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers
+	depends on !BR2_TOOLCHAIN_USES_MUSL # missing res_ninit()
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_IPTABLES
 	help
 	  The Connection Manager (ConnMan) project provides a daemon
 	  for managing internet connections within embedded devices
 	  running the Linux operating system.
 
-	  For more information, see https://01.org/connman
+	  https://01.org/connman
 
 if BR2_PACKAGE_CONNMAN
 
@@ -33,12 +33,16 @@ config BR2_PACKAGE_CONNMAN_WIFI
 
 config BR2_PACKAGE_CONNMAN_WISPR
 	bool "enable WISPr support"
+	depends on !BR2_STATIC_LIBS # gnutls
 	select BR2_PACKAGE_GNUTLS
 	help
 	  Enable support for Wireless Internet Service Provider
 	  roaming (WISPr). A RADIUS server is used to authenticate the
 	  subscriber's credentials.
 
+comment "connman WISPr needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_CONNMAN_BLUETOOTH
 	bool "enable Bluetooth support"
 	help
@@ -50,8 +54,8 @@ config BR2_PACKAGE_CONNMAN_LOOPBACK
 
 config BR2_PACKAGE_CONNMAN_NEARD
 	bool "enable neard support"
-	select BR2_PACKAGE_NEARD
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # neard
+	select BR2_PACKAGE_NEARD
 
 config BR2_PACKAGE_CONNMAN_OFONO
 	bool "enable ofono support"
diff --git a/bsp/buildroot/package/connman/connman.mk b/bsp/buildroot/package/connman/connman.mk
index 741da9be..52c45451 100644
--- a/bsp/buildroot/package/connman/connman.mk
+++ b/bsp/buildroot/package/connman/connman.mk
@@ -9,16 +9,16 @@ CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables
 CONNMAN_INSTALL_STAGING = YES
-CONNMAN_LICENSE = GPLv2
+CONNMAN_LICENSE = GPL-2.0
 CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CONF_OPTS += \
 	--with-dbusconfdir=/etc \
-	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug)		\
-	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet)	\
-	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi)			\
+	$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
+	$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
+	$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
 	$(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
-	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth)	\
-	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback)	\
+	$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
+	$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
 	$(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
 	$(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
 	$(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
diff --git a/bsp/buildroot/package/conntrack-tools/conntrack-tools.mk b/bsp/buildroot/package/conntrack-tools/conntrack-tools.mk
index b73aa7f4..2f4ea5f2 100644
--- a/bsp/buildroot/package/conntrack-tools/conntrack-tools.mk
+++ b/bsp/buildroot/package/conntrack-tools/conntrack-tools.mk
@@ -10,7 +10,7 @@ CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files
 CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \
 	libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \
 	libnetfilter_queue host-bison host-flex
-CONNTRACK_TOOLS_LICENSE = GPLv2+
+CONNTRACK_TOOLS_LICENSE = GPL-2.0+
 CONNTRACK_TOOLS_LICENSE_FILES = COPYING
 
 CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/copas/Config.in b/bsp/buildroot/package/copas/Config.in
index 21dd0eb8..d7800b6d 100644
--- a/bsp/buildroot/package/copas/Config.in
+++ b/bsp/buildroot/package/copas/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_COPAS
 	bool "copas"
 	# Runtime dependency only
-	select BR2_PACKAGE_COXPCALL
+	select BR2_PACKAGE_COXPCALL if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	select BR2_PACKAGE_LUASOCKET
 	help
-	  Copas is a dispatcher based on coroutines that
-	  can be used by TCP/IP servers.
+	  Copas is a dispatcher based on coroutines that can be used
+	  for asynchronous networking. For example TCP or UDP based
+	  servers. But it also features timers and client support for
+	  http(s), ftp and smtp requests.
 
 	  http://keplerproject.github.com/copas/
diff --git a/bsp/buildroot/package/copas/copas.hash b/bsp/buildroot/package/copas/copas.hash
index 27e33166..d894b865 100644
--- a/bsp/buildroot/package/copas/copas.hash
+++ b/bsp/buildroot/package/copas/copas.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  c94890bdc8899d05163ca963dadf4b74b2ad7a5795ea3923a792b6e928ec142a  copas-2.0.1-1.src.rock
+sha256 efeded4f4633bc71551175b239199304640ef918ae8ea9dc9c5047359ae07107  copas-2.0.2-1.src.rock
diff --git a/bsp/buildroot/package/copas/copas.mk b/bsp/buildroot/package/copas/copas.mk
index 132b5d96..988692c4 100644
--- a/bsp/buildroot/package/copas/copas.mk
+++ b/bsp/buildroot/package/copas/copas.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-COPAS_VERSION = 2.0.1-1
-COPAS_SUBDIR = copas-2_0_1
+COPAS_VERSION = 2.0.2-1
+COPAS_SUBDIR = copas-2_0_2
 COPAS_LICENSE = MIT
+COPAS_LICENSE_FILES = $(COPAS_SUBDIR)/doc/us/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/coreutils/coreutils.hash b/bsp/buildroot/package/coreutils/coreutils.hash
index 37d630bb..472cab55 100644
--- a/bsp/buildroot/package/coreutils/coreutils.hash
+++ b/bsp/buildroot/package/coreutils/coreutils.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e	coreutils-8.26.tar.xz
+sha256 8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b  coreutils-8.27.tar.xz
diff --git a/bsp/buildroot/package/coreutils/coreutils.mk b/bsp/buildroot/package/coreutils/coreutils.mk
index 4e0b1f7b..8259f42f 100644
--- a/bsp/buildroot/package/coreutils/coreutils.mk
+++ b/bsp/buildroot/package/coreutils/coreutils.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-COREUTILS_VERSION = 8.26
+COREUTILS_VERSION = 8.27
 COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils
 COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz
-COREUTILS_LICENSE = GPLv3+
+COREUTILS_LICENSE = GPL-3.0+
 COREUTILS_LICENSE_FILES = COPYING
 
 # coreutils-01-fix-for-dummy-man-usage.patch triggers autoreconf on build
@@ -77,10 +77,11 @@ else
 COREUTILS_CONF_OPTS += --disable-xattr
 endif
 
+COREUTILS_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
+
 # It otherwise fails to link properly, not mandatory though
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
+ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
 COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr
-COREUTILS_DEPENDENCIES += gettext
 endif
 
 ifeq ($(BR2_PACKAGE_GMP),y)
@@ -123,7 +124,4 @@ endef
 
 COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP
 
-# If both coreutils and busybox are selected, the corresponding applets
-# may need to be reinstated by the clean targets.
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/cosmo/Config.in b/bsp/buildroot/package/cosmo/Config.in
deleted file mode 100644
index 869a1072..00000000
--- a/bsp/buildroot/package/cosmo/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_COSMO
-	bool "cosmo"
-	# run-time dependency
-	select BR2_PACKAGE_LPEG
-	# upstream site does not provide a valid archive
-	depends on BROKEN
-	help
-	  Cosmo is a "safe templates" engine for Lua.
-
-	  http://mascarenhas.github.io/cosmo/
diff --git a/bsp/buildroot/package/cosmo/cosmo.hash b/bsp/buildroot/package/cosmo/cosmo.hash
deleted file mode 100644
index ff885764..00000000
--- a/bsp/buildroot/package/cosmo/cosmo.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# locally computed
-sha256  4e81c1bba7ab3b4633c8d6dadfc8332c59c818829436435b4d5a2ec76adfbb87  cosmo-14.03.04-1.src.rock
diff --git a/bsp/buildroot/package/cosmo/cosmo.mk b/bsp/buildroot/package/cosmo/cosmo.mk
deleted file mode 100644
index 0ab53245..00000000
--- a/bsp/buildroot/package/cosmo/cosmo.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-################################################################################
-#
-# cosmo
-#
-################################################################################
-
-COSMO_VERSION = 14.03.04-1
-COSMO_LICENSE = MIT
-
-$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/coxpcall/Config.in b/bsp/buildroot/package/coxpcall/Config.in
index 1237482f..37350179 100644
--- a/bsp/buildroot/package/coxpcall/Config.in
+++ b/bsp/buildroot/package/coxpcall/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_COXPCALL
 	bool "coxpcall"
 	help
 	  Coxpcall encapsulates the protected calls with a coroutine
-	  based loop, so errors can be dealed without the usual
-	  pcall/xpcall issues with coroutines.
+	  based loop, so errors can be handled without the usual
+	  pcall/xpcall issues with coroutines for Lua 5.1.
 
-	  http://coxpcall.luaforge.net/
+	  http://keplerproject.github.io/coxpcall/
diff --git a/bsp/buildroot/package/coxpcall/coxpcall.hash b/bsp/buildroot/package/coxpcall/coxpcall.hash
index d7a02c20..e037af9e 100644
--- a/bsp/buildroot/package/coxpcall/coxpcall.hash
+++ b/bsp/buildroot/package/coxpcall/coxpcall.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	ff93d30e0a6cd64bb4e66739757e7eda9f226187829a075747b2ca5d3cfd1075	coxpcall-1.15.0-1.src.rock
+sha256 c1488ee08e5d25d59a11e19cb0322edae509202b246d0c93cb2de1676dbfdf2b  coxpcall-1.16.0-1.src.rock
diff --git a/bsp/buildroot/package/coxpcall/coxpcall.mk b/bsp/buildroot/package/coxpcall/coxpcall.mk
index 9c211437..3af81f2c 100644
--- a/bsp/buildroot/package/coxpcall/coxpcall.mk
+++ b/bsp/buildroot/package/coxpcall/coxpcall.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-COXPCALL_VERSION = 1.15.0-1
+COXPCALL_VERSION = 1.16.0-1
 COXPCALL_SUBDIR = coxpcall
 COXPCALL_LICENSE = MIT
+COXPCALL_LICENSE_FILES = $(COXPCALL_SUBDIR)/doc/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/cpio/Config.in b/bsp/buildroot/package/cpio/Config.in
index 1210a0bd..3ef0402c 100644
--- a/bsp/buildroot/package/cpio/Config.in
+++ b/bsp/buildroot/package/cpio/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_CPIO
 	bool "cpio"
+	depends on BR2_USE_WCHAR
 	# Need argp.h support
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_USE_WCHAR
 	help
 	  cpio archive utility for creation and extraction.
 
diff --git a/bsp/buildroot/package/cpio/cpio.mk b/bsp/buildroot/package/cpio/cpio.mk
index b0b8fa6f..7e8549db 100644
--- a/bsp/buildroot/package/cpio/cpio.mk
+++ b/bsp/buildroot/package/cpio/cpio.mk
@@ -8,7 +8,7 @@ CPIO_VERSION = 2.12
 CPIO_SITE = $(BR2_GNU_MIRROR)/cpio
 CPIO_CONF_OPTS = --bindir=/bin
 CPIO_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-CPIO_LICENSE = GPLv3+
+CPIO_LICENSE = GPL-3.0+
 CPIO_LICENSE_FILES = COPYING
 
 # cpio uses argp.h which is not provided by uclibc or musl by default.
diff --git a/bsp/buildroot/package/cppcms/Config.in b/bsp/buildroot/package/cppcms/Config.in
index 2cf70052..d7b7fa89 100644
--- a/bsp/buildroot/package/cppcms/Config.in
+++ b/bsp/buildroot/package/cppcms/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_CPPCMS
 	bool "cppcms"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_PCRE
-	select BR2_PACKAGE_LIBGCRYPT
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_LIBGCRYPT
 	help
 	  CppCMS is a Free High Performance Web Development Framework
 	  (not a CMS) aimed for Rapid Web Application Development. It
@@ -27,11 +27,17 @@ if BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
 	bool "enable icu support"
 	depends on !BR2_BINFMT_FLAT # icu
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
 	select BR2_PACKAGE_ICU
 	help
 	  Using ICU allows advanced localization features into CppCMS,
 	  in another hand ICU is heavier than iconv.
 
+comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
+	depends on !BR2_BINFMT_FLAT
+	depends on !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
 endif
 
 comment "cppcms needs a toolchain w/ C++, NPTL, wchar, dynamic library"
diff --git a/bsp/buildroot/package/cppcms/cppcms.hash b/bsp/buildroot/package/cppcms/cppcms.hash
index 28e998c6..6bfc680a 100644
--- a/bsp/buildroot/package/cppcms/cppcms.hash
+++ b/bsp/buildroot/package/cppcms/cppcms.hash
@@ -3,3 +3,5 @@ sha1	15f21897c14acfd4b0c74622e49d95857f2fe939	cppcms-1.0.5.tar.bz2
 md5	d668c201dd31fff8090380ebdc0bcc2b	cppcms-1.0.5.tar.bz2
 # Locally computed:
 sha256	84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865	cppcms-1.0.5.tar.bz2
+sha256	2ff22bab712c46dbadf9bae0f759bbc95d5d87614cacb7ebc3d5a50910603d6a	COPYING.TXT
+sha256	70fbf0194bee0f444c57ecd47e7d976a3e5a890e4421a21aab49f2d214267e69	THIRD_PARTY_SOFTWARE.TXT
diff --git a/bsp/buildroot/package/cppcms/cppcms.mk b/bsp/buildroot/package/cppcms/cppcms.mk
index d908d7ba..5fb6375d 100644
--- a/bsp/buildroot/package/cppcms/cppcms.mk
+++ b/bsp/buildroot/package/cppcms/cppcms.mk
@@ -6,20 +6,26 @@
 
 CPPCMS_VERSION = 1.0.5
 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2
-CPPCMS_LICENSE = LGPLv3
-CPPCMS_LICENSE_FILES = COPYING.TXT
+CPPCMS_LICENSE = LGPL-3.0, BSL-1.0 (boost), MIT (base64.cpp), Public Domain (json2.js), Zlib (md5)
+CPPCMS_LICENSE_FILES = COPYING.TXT THIRD_PARTY_SOFTWARE.TXT
 CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION)
 CPPCMS_INSTALL_STAGING = YES
+CPPCMS_CXXFLAGS = $(TARGET_CXXFLAGS)
 
 # disable rpath to avoid getting /usr/lib added to the link search
 # path
-CPPCMS_CONF_OPTS = -DCMAKE_SKIP_RPATH=ON
+CPPCMS_CONF_OPTS = \
+	-DCMAKE_SKIP_RPATH=ON \
+	-DCMAKE_CXX_FLAGS="$(CPPCMS_CXXFLAGS)"
 
 CPPCMS_DEPENDENCIES = zlib pcre libgcrypt
 
 ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y)
-CPPCMS_CONF_OPTS += -DDISABLE_ICONV=ON
+CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=OFF
 CPPCMS_DEPENDENCIES += icu
+CPPCMS_CXXFLAGS += "`$(STAGING_DIR)/usr/bin/icu-config --cxxflags`"
+else
+CPPCMS_CONF_OPTS += -DDISABLE_ICU_LOCALE=ON
 endif
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
@@ -31,7 +37,7 @@ endif
 # needed for compiling packages using cppcms. And it is not worth
 # creating a host package just for a python script.
 define CPPCMS_INSTALL_HOST_TOOLS
-	cp $(STAGING_DIR)/usr/bin/cppcms_tmpl_cc $(HOST_DIR)/usr/bin/cppcms_tmpl_cc
+	cp $(STAGING_DIR)/usr/bin/cppcms_tmpl_cc $(HOST_DIR)/bin/cppcms_tmpl_cc
 endef
 CPPCMS_POST_INSTALL_STAGING_HOOKS += CPPCMS_INSTALL_HOST_TOOLS
 
diff --git a/bsp/buildroot/package/cppdb/Config.in b/bsp/buildroot/package/cppdb/Config.in
index 9037a7a0..ceff0ab7 100644
--- a/bsp/buildroot/package/cppdb/Config.in
+++ b/bsp/buildroot/package/cppdb/Config.in
@@ -7,9 +7,10 @@ config BR2_PACKAGE_CPPDB
 	# Can be built without them but it's useless
 	depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE
 	help
-	  CppDB is an SQL connectivity library that is designed to provide
-	  platform and Database independent connectivity API similarly
-	  to what JDBC, ODBC and other connectivity libraries do.
+	  CppDB is an SQL connectivity library that is designed to
+	  provide platform and Database independent connectivity API
+	  similarly to what JDBC, ODBC and other connectivity libraries
+	  do.
 
 	  http://cppcms.com/sql/cppdb/
 
diff --git a/bsp/buildroot/package/cppdb/cppdb.mk b/bsp/buildroot/package/cppdb/cppdb.mk
index 2c26c909..e73f04e1 100644
--- a/bsp/buildroot/package/cppdb/cppdb.mk
+++ b/bsp/buildroot/package/cppdb/cppdb.mk
@@ -9,7 +9,7 @@ CPPDB_SOURCE = cppdb-$(CPPDB_VERSION).tar.bz2
 CPPDB_SITE = http://downloads.sourceforge.net/project/cppcms/cppdb/$(CPPDB_VERSION)
 CPPDB_INSTALL_STAGING = YES
 CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite)
-CPPDB_LICENSE = Boost-v1.0 or MIT
+CPPDB_LICENSE = BSL-1.0 or MIT
 CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt
 
 ifeq ($(BR2_PACKAGE_MYSQL),y)
diff --git a/bsp/buildroot/package/cppunit/cppunit.mk b/bsp/buildroot/package/cppunit/cppunit.mk
index b8251c29..db01b70b 100644
--- a/bsp/buildroot/package/cppunit/cppunit.mk
+++ b/bsp/buildroot/package/cppunit/cppunit.mk
@@ -7,7 +7,7 @@
 CPPUNIT_VERSION = 1.13.2
 CPPUNIT_SITE = http://dev-www.libreoffice.org/src
 CPPUNIT_INSTALL_STAGING = YES
-CPPUNIT_LICENSE = LGPLv2.1
+CPPUNIT_LICENSE = LGPL-2.1
 CPPUNIT_LICENSE_FILES = COPYING
 CPPUNIT_CONF_OPTS = --disable-doxygen
 
diff --git a/bsp/buildroot/package/cpuload/Config.in b/bsp/buildroot/package/cpuload/Config.in
index 82bc450a..9a7b4e9f 100644
--- a/bsp/buildroot/package/cpuload/Config.in
+++ b/bsp/buildroot/package/cpuload/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_CPULOAD
 	bool "cpuload"
 	help
-	  cpuload is a simple tool to obtain intuitive vision of CPU load
-	  (including total, user, system, irq and softirq) within a certain
-	  time, which is especially useful for embedded system without GUI.
+	  cpuload is a simple tool to obtain intuitive vision of CPU
+	  load (including total, user, system, irq and softirq) within a
+	  certain time, which is especially useful for embedded system
+	  without GUI.
 
 	  https://github.com/kelvincheung/cpuload
diff --git a/bsp/buildroot/package/cpuload/cpuload.mk b/bsp/buildroot/package/cpuload/cpuload.mk
index 30c3db6a..e792952a 100644
--- a/bsp/buildroot/package/cpuload/cpuload.mk
+++ b/bsp/buildroot/package/cpuload/cpuload.mk
@@ -6,7 +6,7 @@
 
 CPULOAD_VERSION = v0.3
 CPULOAD_SITE = $(call github,kelvincheung,cpuload,$(CPULOAD_VERSION))
-CPULOAD_LICENSE = GPLv2
+CPULOAD_LICENSE = GPL-2.0
 CPULOAD_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch b/bsp/buildroot/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
new file mode 100644
index 00000000..6180c4ba
--- /dev/null
+++ b/bsp/buildroot/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch
@@ -0,0 +1,106 @@
+From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001
+From: Jan Dittberner <jan@dittberner.info>
+Date: Thu, 25 Aug 2016 17:13:49 +0200
+Subject: [PATCH] Apply patch to fix CVE-2016-6318
+
+This patch fixes an issue with a stack-based buffer overflow whne
+parsing large GECOS field. See
+https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and
+https://security-tracker.debian.org/tracker/CVE-2016-6318 for more
+information.
+
+Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
+---
+
+Status: upstream, not yet released.
+
+ lib/fascist.c | 57 ++++++++++++++++++++++++++++++++-----------------------
+ 2 files changed, 34 insertions(+), 24 deletions(-)
+
+diff --git a/lib/fascist.c b/lib/fascist.c
+index a996509..d4deb15 100644
+--- a/lib/fascist.c
++++ b/lib/fascist.c
+@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
+     char gbuffer[STRINGSIZE];
+     char tbuffer[STRINGSIZE];
+     char *uwords[STRINGSIZE];
+-    char longbuffer[STRINGSIZE * 2];
++    char longbuffer[STRINGSIZE];
+ 
+     if (gecos == NULL)
+ 	gecos = "";
+@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos)
+     {
+ 	for (i = 0; i < j; i++)
+ 	{
+-	    strcpy(longbuffer, uwords[i]);
+-	    strcat(longbuffer, uwords[j]);
+-
+-	    if (GTry(longbuffer, password))
++	    if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE)
+ 	    {
+-		return _("it is derived from your password entry");
+-	    }
++		strcpy(longbuffer, uwords[i]);
++		strcat(longbuffer, uwords[j]);
+ 
+-	    strcpy(longbuffer, uwords[j]);
+-	    strcat(longbuffer, uwords[i]);
++		if (GTry(longbuffer, password))
++		{
++		    return _("it is derived from your password entry");
++		}
+ 
+-	    if (GTry(longbuffer, password))
+-	    {
+-		return _("it's derived from your password entry");
+-	    }
++		strcpy(longbuffer, uwords[j]);
++		strcat(longbuffer, uwords[i]);
+ 
+-	    longbuffer[0] = uwords[i][0];
+-	    longbuffer[1] = '\0';
+-	    strcat(longbuffer, uwords[j]);
++		if (GTry(longbuffer, password))
++		{
++		   return _("it's derived from your password entry");
++		}
++	    }
+ 
+-	    if (GTry(longbuffer, password))
++	    if (strlen(uwords[j]) < STRINGSIZE - 1)
+ 	    {
+-		return _("it is derivable from your password entry");
++		longbuffer[0] = uwords[i][0];
++		longbuffer[1] = '\0';
++		strcat(longbuffer, uwords[j]);
++
++		if (GTry(longbuffer, password))
++		{
++		    return _("it is derivable from your password entry");
++		}
+ 	    }
+ 
+-	    longbuffer[0] = uwords[j][0];
+-	    longbuffer[1] = '\0';
+-	    strcat(longbuffer, uwords[i]);
+-
+-	    if (GTry(longbuffer, password))
++	    if (strlen(uwords[i]) < STRINGSIZE - 1)
+ 	    {
+-		return _("it's derivable from your password entry");
++		longbuffer[0] = uwords[j][0];
++		longbuffer[1] = '\0';
++		strcat(longbuffer, uwords[i]);
++
++		if (GTry(longbuffer, password))
++		{
++		    return _("it's derivable from your password entry");
++		}
+ 	    }
+ 	}
+     }
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch b/bsp/buildroot/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch
new file mode 100644
index 00000000..63525cc7
--- /dev/null
+++ b/bsp/buildroot/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch
@@ -0,0 +1,40 @@
+From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001
+From: Jan Dittberner <jan@dittberner.info>
+Date: Thu, 25 Aug 2016 17:17:53 +0200
+Subject: [PATCH] Fix a buffer overflow processing long words
+
+A buffer overflow processing long words has been discovered. This commit
+applies the patch from
+https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch
+by Howard Guo.
+
+See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and
+http://www.openwall.com/lists/oss-security/2016/08/23/8
+
+Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
+---
+
+Status: upstream, not yet released.
+
+ lib/rules.c | 5 ++---
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/rules.c b/lib/rules.c
+index d193cc0..3a2aa46 100644
+--- a/lib/rules.c
++++ b/lib/rules.c
+@@ -434,9 +434,8 @@ Mangle(input, control)		/* returns a pointer to a controlled Mangle */
+ {
+     int limit;
+     register char *ptr;
+-    static char area[STRINGSIZE];
+-    char area2[STRINGSIZE];
+-    area[0] = '\0';
++    static char area[STRINGSIZE * 2] = {0};
++    char area2[STRINGSIZE * 2] = {0};
+     strcpy(area, input);
+ 
+     for (ptr = control; *ptr; ptr++)
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch b/bsp/buildroot/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch
new file mode 100644
index 00000000..b05a69ca
--- /dev/null
+++ b/bsp/buildroot/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch
@@ -0,0 +1,30 @@
+From d27062fe7a520d5791f7a56d175a5cb6a39bae61 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
+Date: Tue, 18 Apr 2017 12:00:39 +0200
+Subject: [PATCH] Force grep to treat the input as text when formatting word
+ files.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
+---
+ util/cracklib-format | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/cracklib-format b/util/cracklib-format
+index 1d7be5b..b1de8e8 100644
+--- a/util/cracklib-format
++++ b/util/cracklib-format
+@@ -4,7 +4,7 @@
+ # into cracklib-packer
+ #
+ gzip -cdf "$@" |
+-    grep -v '^\(#\|$\)' |
++    grep -a -v '^\(#\|$\)' |
+     tr '[A-Z]' '[a-z]' |
+     tr -cd '\012[a-z][0-9]' |
+     env LC_ALL=C sort -u
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/cracklib/Config.in b/bsp/buildroot/package/cracklib/Config.in
new file mode 100644
index 00000000..4a0f43f4
--- /dev/null
+++ b/bsp/buildroot/package/cracklib/Config.in
@@ -0,0 +1,28 @@
+config BR2_PACKAGE_CRACKLIB
+	bool "cracklib"
+	help
+	  CrackLib tests passwords to determine whether they match
+	  certain security-oriented characteristics, with the purpose
+	  of stopping users from choosing passwords that are easy to
+	  guess. CrackLib performs several tests on passwords: it
+	  tries to generate words from a username and gecos entry and
+	  checks those words against the password; it checks for
+	  simplistic patterns in passwords; and it checks for the
+	  password in a dictionary.
+
+	  https://github.com/cracklib/cracklib
+
+if BR2_PACKAGE_CRACKLIB
+
+config BR2_PACKAGE_CRACKLIB_TOOLS
+	bool "install tools"
+	help
+	  Install cracklib command line tools for creating dicts.
+
+config BR2_PACKAGE_CRACKLIB_FULL_DICT
+	bool "full dict"
+	help
+	  Install the full cracklib dict (requires about 8Mb extra
+	  target space).
+
+endif
diff --git a/bsp/buildroot/package/cracklib/cracklib.hash b/bsp/buildroot/package/cracklib/cracklib.hash
new file mode 100644
index 00000000..3038a47a
--- /dev/null
+++ b/bsp/buildroot/package/cracklib/cracklib.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256	17cf76943de272fd579ed831a1fd85339b393f8d00bf9e0d17c91e972f583343	cracklib-2.9.6.tar.gz
+sha256	27973245225eeb9d0090e97f3dea4197dec99b64d9d3a791a60298f3b021824c	cracklib-words-2.9.6.gz
diff --git a/bsp/buildroot/package/cracklib/cracklib.mk b/bsp/buildroot/package/cracklib/cracklib.mk
new file mode 100644
index 00000000..2fa3d3b4
--- /dev/null
+++ b/bsp/buildroot/package/cracklib/cracklib.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# cracklib
+#
+################################################################################
+
+CRACKLIB_VERSION = 2.9.6
+CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-$(CRACKLIB_VERSION)
+CRACKLIB_LICENSE = LGPL-2.1
+CRACKLIB_LICENSE_FILES = COPYING.LIB
+CRACKLIB_INSTALL_STAGING = YES
+CRACKLIB_DEPENDENCIES = host-cracklib
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+CRACKLIB_CONF_OPTS += --with-zlib
+CRACKLIB_DEPENDENCIES += zlib
+else
+CRACKLIB_CONF_OPTS += --without-zlib
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+CRACKLIB_CONF_OPTS += --with-python
+CRACKLIB_DEPENDENCIES += python
+else
+CRACKLIB_CONF_OPTS += --without-python
+endif
+
+HOST_CRACKLIB_CONF_OPTS += --without-python --without-zlib
+
+ifeq ($(BR2_PACKAGE_CRACKLIB_FULL_DICT),y)
+CRACKLIB_EXTRA_DOWNLOADS = cracklib-words-$(CRACKLIB_VERSION).gz
+CRACKLIB_DICT_SOURCE = $(DL_DIR)/cracklib-words-$(CRACKLIB_VERSION).gz
+else
+CRACKLIB_DICT_SOURCE = $(@D)/dicts/cracklib-small
+endif
+
+ifeq ($(BR2_PACKAGE_CRACKLIB_TOOLS),)
+define CRACKLIB_REMOVE_TOOLS
+	rm -f $(TARGET_DIR)/usr/sbin/*cracklib*
+endef
+CRACKLIB_POST_INSTALL_TARGET_HOOKS += CRACKLIB_REMOVE_TOOLS
+endif
+
+define CRACKLIB_BUILD_DICT
+	$(HOST_MAKE_ENV) cracklib-format $(CRACKLIB_DICT_SOURCE) | \
+		$(HOST_MAKE_ENV) cracklib-packer $(TARGET_DIR)/usr/share/cracklib/pw_dict
+	rm $(TARGET_DIR)/usr/share/cracklib/cracklib-small
+endef
+CRACKLIB_POST_INSTALL_TARGET_HOOKS += CRACKLIB_BUILD_DICT
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/cramfs/0004-Include-sysmacros.h-to-compile-with-glibc-2.28.patch b/bsp/buildroot/package/cramfs/0004-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
new file mode 100644
index 00000000..6096cf36
--- /dev/null
+++ b/bsp/buildroot/package/cramfs/0004-Include-sysmacros.h-to-compile-with-glibc-2.28.patch
@@ -0,0 +1,33 @@
+Fix minor()/major() build failure due to glibc 2.28
+
+glibc 2.28 no longer includes <sys/sysmacros.h> from <sys/types.h>,
+and therefore <sys/sysmacros.h> must be included explicitly when
+major()/minor() are used.
+
+This commit directly includes <sys/sysmacros.h> into cramfsck.c and
+mkcramfs.c files where minor() and major() macros are used.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+---
+diff -urpN host-cramfs-1.1.orig/cramfsck.c host-cramfs-1.1/cramfsck.c
+--- host-cramfs-1.1.orig/cramfsck.c	2018-09-27 16:48:09.704782201 +0200
++++ host-cramfs-1.1/cramfsck.c	2018-09-27 16:49:12.841138657 +0200
+@@ -38,6 +38,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <sys/stat.h>
+diff -urpN host-cramfs-1.1.orig/mkcramfs.c host-cramfs-1.1/mkcramfs.c
+--- host-cramfs-1.1.orig/mkcramfs.c	2018-09-27 16:48:09.712782246 +0200
++++ host-cramfs-1.1/mkcramfs.c	2018-09-27 16:48:59.777064921 +0200
+@@ -24,6 +24,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <stdio.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/bsp/buildroot/package/cramfs/cramfs.mk b/bsp/buildroot/package/cramfs/cramfs.mk
index 3cbe2744..70010e8e 100644
--- a/bsp/buildroot/package/cramfs/cramfs.mk
+++ b/bsp/buildroot/package/cramfs/cramfs.mk
@@ -6,7 +6,7 @@
 
 CRAMFS_VERSION = 1.1
 CRAMFS_SITE = http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION)
-CRAMFS_LICENSE = GPLv2+
+CRAMFS_LICENSE = GPL-2.0+
 CRAMFS_LICENSE_FILES = COPYING
 
 CRAMFS_DEPENDENCIES = zlib
@@ -26,8 +26,8 @@ define HOST_CRAMFS_BUILD_CMDS
 endef
 
 define HOST_CRAMFS_INSTALL_CMDS
-	$(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs
-	$(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck
+	$(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/bin/mkcramfs
+	$(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/bin/cramfsck
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/crda/Config.in b/bsp/buildroot/package/crda/Config.in
index 2cb04037..469fa77f 100644
--- a/bsp/buildroot/package/crda/Config.in
+++ b/bsp/buildroot/package/crda/Config.in
@@ -12,10 +12,10 @@ config BR2_PACKAGE_CRDA
 
 	  This package provides a Central Regulatory Domain Agent (CRDA)
 	  to be used by the Linux kernel cf80211 wireless subsystem to
-	  query and apply the regulatory domain settings wireless devices
-	  may operate within for a given location.
+	  query and apply the regulatory domain settings wireless
+	  devices may operate within for a given location.
 
-	  http://linuxwireless.org/en/developers/Regulatory/CRDA
+	  https://wireless.wiki.kernel.org/en/developers/regulatory/crda
 
 comment "crda needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/crudini/crudini.hash b/bsp/buildroot/package/crudini/crudini.hash
index 2796e7a8..9279847b 100644
--- a/bsp/buildroot/package/crudini/crudini.hash
+++ b/bsp/buildroot/package/crudini/crudini.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0664fa2f9d36e411e839b5394d8c2951, sha256 locally computed
-md5    0664fa2f9d36e411e839b5394d8c2951 crudini-0.8.tar.gz
-sha256 effdf8feb7efe252af87143c8756bbc69e2679afb6173083d38be02284385e5f  crudini-0.8.tar.gz
+# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9b8500c90467f0a61c714fbe852c2a66, sha256 locally computed
+md5    9b8500c90467f0a61c714fbe852c2a66 crudini-0.9.tar.gz
+sha256 10512a5a2f7b54b42e48a1d00f0c6398947c2ba6c264b9fdef86677f0e949fd3  crudini-0.9.tar.gz
diff --git a/bsp/buildroot/package/crudini/crudini.mk b/bsp/buildroot/package/crudini/crudini.mk
index 501c9e01..c03f55c3 100644
--- a/bsp/buildroot/package/crudini/crudini.mk
+++ b/bsp/buildroot/package/crudini/crudini.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-CRUDINI_VERSION = 0.8
-CRUDINI_SITE = https://pypi.python.org/packages/23/4a/934b05bbe5af4fd390207c5e935efbae6439809aad65ab0702e236c1b5f5
+CRUDINI_VERSION = 0.9
+CRUDINI_SITE = https://pypi.python.org/packages/b5/65/5588903472f30fa01ca4951be00c03a317b27bac4cd1e945bd16b2c1b6d3
 CRUDINI_SETUP_TYPE = setuptools
-CRUDINI_LICENSE = GPLv2
+CRUDINI_LICENSE = GPL-2.0
 CRUDINI_LICENSE_FILES = COPYING
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.hash b/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.hash
index 6d9efcae..48d608e1 100644
--- a/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.hash
+++ b/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 a87e354e1218e6a2e3083f7be6a3e351c42ec55515f1aff1b50bd301cee7d8dd cryptodev-linux-2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8.tar.gz
+sha256 90a4c5e46d7d5fcc0c6155f1add824e73c27de9b1ff0b7fe2017a104cf9398dd cryptodev-linux-0a54e38b264d9a3bed74c642a61b88191660d0f8.tar.gz
diff --git a/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.mk b/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.mk
index 709c6ed0..dacb29da 100644
--- a/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.mk
+++ b/bsp/buildroot/package/cryptodev-linux/cryptodev-linux.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-CRYPTODEV_LINUX_VERSION = 2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8
+CRYPTODEV_LINUX_VERSION = 0a54e38b264d9a3bed74c642a61b88191660d0f8
 CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION))
 CRYPTODEV_LINUX_INSTALL_STAGING = YES
-CRYPTODEV_LINUX_LICENSE = GPLv2+
+CRYPTODEV_LINUX_LICENSE = GPL-2.0+
 CRYPTODEV_LINUX_LICENSE_FILES = COPYING
 
 CRYPTODEV_LINUX_PROVIDES = cryptodev
diff --git a/bsp/buildroot/package/cryptodev/Config.in b/bsp/buildroot/package/cryptodev/Config.in
index 9f9df02f..d1e64498 100644
--- a/bsp/buildroot/package/cryptodev/Config.in
+++ b/bsp/buildroot/package/cryptodev/Config.in
@@ -31,8 +31,8 @@ config BR2_PACKAGE_OCF_LINUX
 	select BR2_PACKAGE_HAS_CRYPTODEV
 	help
 	  OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
-	  Framework (OCF). This port aims to bring full asynchronous HW/SW
-	  crypto acceleration to the Linux kernel and applications
+	  Framework (OCF). This port aims to bring full asynchronous
+	  HW/SW crypto acceleration to the Linux kernel and applications
 	  running under Linux.
 
 	  http://ocf-linux.sourceforge.net/
diff --git a/bsp/buildroot/package/cryptopp/cryptopp.mk b/bsp/buildroot/package/cryptopp/cryptopp.mk
index 456876c4..4b121aef 100644
--- a/bsp/buildroot/package/cryptopp/cryptopp.mk
+++ b/bsp/buildroot/package/cryptopp/cryptopp.mk
@@ -7,7 +7,7 @@
 CRYPTOPP_VERSION = 5.6.5
 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip
 CRYPTOPP_SITE = http://cryptopp.com/
-CRYPTOPP_LICENSE = Boost-v1.0
+CRYPTOPP_LICENSE = BSL-1.0
 CRYPTOPP_LICENSE_FILES = License.txt
 CRYPTOPP_INSTALL_STAGING = YES
 
@@ -24,7 +24,7 @@ define HOST_CRYPTOPP_BUILD_CMDS
 endef
 
 define HOST_CRYPTOPP_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch b/bsp/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch
new file mode 100644
index 00000000..fa865314
--- /dev/null
+++ b/bsp/buildroot/package/cryptsetup/0001-Remove-json_object-typedef.patch
@@ -0,0 +1,46 @@
+From 567e7f8664c621f8aeaa95d9f4ab4b590574f572 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Wed, 15 Aug 2018 14:13:46 +0300
+Subject: [PATCH] Remove json_object typedef
+
+The json-c header already defines the same typedef. While C11 allows
+typedef redefinition to the same type, older versions of gcc disallow
+that.
+
+In file included from lib/luks2/luks2_internal.h:32,
+                 from lib/luks2/luks2_disk_metadata.c:24:
+lib/luks2/luks2.h:86: error: redefinition of typedef 'json_object'
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ lib/luks2/luks2.h | 1 -
+ lib/setup.c       | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h
+index ee57b41ba974..25e36190da45 100644
+--- a/lib/luks2/luks2.h
++++ b/lib/luks2/luks2.h
+@@ -83,7 +83,6 @@ struct luks2_hdr_disk {
+ /*
+  * LUKS2 header in-memory.
+  */
+-typedef struct json_object json_object;
+ struct luks2_hdr {
+ 	size_t		hdr_size;
+ 	uint64_t	seqid;
+diff --git a/lib/setup.c b/lib/setup.c
+index fddbe7ef7897..856f6e80f465 100644
+--- a/lib/setup.c
++++ b/lib/setup.c
+@@ -28,6 +28,7 @@
+ #include <sys/utsname.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <json-c/json.h>
+ 
+ #include "libcryptsetup.h"
+ #include "luks.h"
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/cryptsetup/0001-mkdir.patch b/bsp/buildroot/package/cryptsetup/0001-mkdir.patch
deleted file mode 100644
index d4d70521..00000000
--- a/bsp/buildroot/package/cryptsetup/0001-mkdir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead.
-Upstream should really gettextize with a newer version before packing up.
-
-[base on a similar patch from Gustavo Zacarias for Linux-PAM-1.1.7]
-Signed-off-by: Axel Lin <axel.lin@ingics.com>
-
-diff -Nura cryptsetup-1.6.3.ori/po/Makefile.in.in cryptsetup-1.6.3/po/Makefile.in.in
---- cryptsetup-1.6.3.ori/po/Makefile.in.in	2013-12-30 11:53:22.731942516 +0800
-+++ cryptsetup-1.6.3/po/Makefile.in.in	2014-01-09 09:46:13.594071188 +0800
-@@ -31,7 +31,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- mkinstalldirs = $(SHELL) @install_sh@ -d
--mkdir_p = @mkdir_p@
-+mkdir_p = @MKDIR_P@
- 
- GMSGFMT_ = @GMSGFMT@
- GMSGFMT_no = @GMSGFMT@
diff --git a/bsp/buildroot/package/cryptsetup/Config.in b/bsp/buildroot/package/cryptsetup/Config.in
index 3ca23ba7..7322a4ba 100644
--- a/bsp/buildroot/package/cryptsetup/Config.in
+++ b/bsp/buildroot/package/cryptsetup/Config.in
@@ -3,19 +3,19 @@ config BR2_PACKAGE_CRYPTSETUP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
 	depends on BR2_USE_MMU # lvm2
 	depends on !BR2_STATIC_LIBS # lvm2
-	depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_LVM2
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
+	select BR2_PACKAGE_JSON_C
 	help
 	  This tool helps manipulate dm-crypt and luks partitions for
 	  on-disk encryption.
 
 	  https://gitlab.com/cryptsetup/cryptsetup
 
-comment "cryptsetup needs a glibc or uClibc toolchain w/ threads, dynamic library"
+comment "cryptsetup needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/cryptsetup/Config.in.host b/bsp/buildroot/package/cryptsetup/Config.in.host
new file mode 100644
index 00000000..9e31df55
--- /dev/null
+++ b/bsp/buildroot/package/cryptsetup/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_CRYPTSETUP
+	bool "host cryptsetup"
+	select BR2_PACKAGE_HOST_UTIL_LINUX
+	help
+	  This tool helps manipulate dm-crypt and luks partitions for
+	  on-disk encryption.
+
+	  https://gitlab.com/cryptsetup/cryptsetup
diff --git a/bsp/buildroot/package/cryptsetup/cryptsetup.hash b/bsp/buildroot/package/cryptsetup/cryptsetup.hash
index b8c0d2b4..1573d530 100644
--- a/bsp/buildroot/package/cryptsetup/cryptsetup.hash
+++ b/bsp/buildroot/package/cryptsetup/cryptsetup.hash
@@ -1,2 +1,4 @@
-# From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc
-sha256 af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02  cryptsetup-1.7.3.tar.xz
+# From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.0/sha256sums.asc
+sha256 4d6cca04c1f5ff4a68d045d190efb2623087eda0274ded92f92a4b6911e501d4  cryptsetup-2.0.3.tar.xz
+sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33  COPYING
+sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5  COPYING.LGPL
diff --git a/bsp/buildroot/package/cryptsetup/cryptsetup.mk b/bsp/buildroot/package/cryptsetup/cryptsetup.mk
index 50bf5f2a..d81aa7b3 100644
--- a/bsp/buildroot/package/cryptsetup/cryptsetup.mk
+++ b/bsp/buildroot/package/cryptsetup/cryptsetup.mk
@@ -4,18 +4,16 @@
 #
 ################################################################################
 
-CRYPTSETUP_VERSION_MAJOR = 1.7
+CRYPTSETUP_VERSION_MAJOR = 2.0
 CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3
 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz
 CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)
-CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf json-c \
+	$(TARGET_NLS_DEPENDENCIES)
+CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
 CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
-
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl"
-endif
+CRYPTSETUP_INSTALL_STAGING = YES
+CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
 
 # cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL
 # or kernel crypto modules instead
@@ -30,4 +28,16 @@ else
 CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel
 endif
 
+HOST_CRYPTSETUP_DEPENDENCIES = \
+	host-pkgconf \
+	host-lvm2 \
+	host-popt \
+	host-util-linux \
+	host-json-c \
+	host-openssl
+
+HOST_CRYPTSETUP_CONF_OPTS = --with-crypto_backend=openssl \
+	--disable-kernel_crypto
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/ctorrent/ctorrent.mk b/bsp/buildroot/package/ctorrent/ctorrent.mk
index 55fc95e7..959e543f 100644
--- a/bsp/buildroot/package/ctorrent/ctorrent.mk
+++ b/bsp/buildroot/package/ctorrent/ctorrent.mk
@@ -6,7 +6,7 @@
 
 CTORRENT_VERSION = dnh3.3.2
 CTORRENT_SITE = http://www.rahul.net/dholmes/ctorrent
-CTORRENT_LICENSE = GPLv2
+CTORRENT_LICENSE = GPL-2.0
 CTORRENT_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/bsp/buildroot/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch b/bsp/buildroot/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch
new file mode 100644
index 00000000..e4b35cda
--- /dev/null
+++ b/bsp/buildroot/package/cups-filters/0001-Replace-relative-linking-with-absolute-linking.patch
@@ -0,0 +1,46 @@
+From c26b4c3550557442890f2f790d4f8b61a3734c1f Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Thu, 8 Mar 2018 12:32:23 +0200
+Subject: [PATCH] install: don't use ln -r
+
+Oldish enterprise-class distributions have too old versions of
+coreutils, with ln not supporting -r.
+
+So we fake it.
+
+ln -r would create minimalist relative paths, but they are not
+trivial to generate. Instead, we always create paths relative to the
+root, i.e.:
+
+    ln -s -r /usr/bin/foo /usr/sbin/foo
+
+would create:  /usr/sbin/foo -> ../bin/foo
+while we do :  /usr/sbin/foo -> ../../usr/bin/foo
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ Makefile.am | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d959227..b49914a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -998,11 +998,11 @@ install-exec-hook:
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(pkgfilterdir)
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(pkgbackenddir)
+ if ENABLE_FOOMATIC
+-	$(LN_S) -r -f $(DESTDIR)$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
++	$(LN_S) -f ../..$(pkgfilterdir)/foomatic-rip $(DESTDIR)$(bindir)
+ endif
+ if ENABLE_DRIVERLESS
+-	$(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
+-	$(LN_S) -r -f $(DESTDIR)$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
++	$(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(bindir)
++	$(LN_S) -f ../..$(pkgppdgendir)/driverless $(DESTDIR)$(pkgbackenddir)
+ endif
+ if ENABLE_BRAILLE
+ 	$(LN_S) -f imagetobrf $(DESTDIR)$(pkgfilterdir)/imagetoubrl
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/cups-filters/Config.in b/bsp/buildroot/package/cups-filters/Config.in
new file mode 100644
index 00000000..5badf0e1
--- /dev/null
+++ b/bsp/buildroot/package/cups-filters/Config.in
@@ -0,0 +1,38 @@
+config BR2_PACKAGE_CUPS_FILTERS
+	bool "cups-filters"
+	# needs fork()
+	depends on BR2_USE_MMU
+	depends on BR2_INSTALL_LIBSTDCPP # qpdf
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_PACKAGE_CUPS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_FREETYPE
+	select BR2_PACKAGE_LCMS2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_QPDF
+	help
+	  This project provides backends, filters, and other software
+	  that was once part of the core CUPS distribution but is no
+	  longer maintained by Apple Inc. In addition it contains
+	  additional filters and software developed independently of
+	  Apple, especially filters for the PDF-centric printing
+	  workflow introduced by OpenPrinting and a daemon to browse
+	  Bonjour broadcasts of remote CUPS printers to make these
+	  printers available locally and to provide backward
+	  compatibility to the old CUPS broadcasting and browsing of
+	  CUPS 1.5.x and older.  From CUPS 1.6.0 on, this package is
+	  required for using printer drivers with CUPS under Linux.
+	  With CUPS 1.5.x and earlier this package can be used
+	  optionally to switch over to PDF-based printing.
+
+	  http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
+
+comment "cups-filters needs a toolchain w/ wchar, C++, threads and dynamic library, gcc >= 4.8"
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/bsp/buildroot/package/cups-filters/cups-filters.hash b/bsp/buildroot/package/cups-filters/cups-filters.hash
new file mode 100644
index 00000000..7bb00818
--- /dev/null
+++ b/bsp/buildroot/package/cups-filters/cups-filters.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256 aad95e35033154f54639923b439e0657fc9f616b9eac7490df89514362551f98  cups-filters-1.20.3.tar.gz
+sha256 24cc91478ca68d6d982dfd86181210ad5f0931ec431bdb740793e3d6555fdcd8  COPYING
diff --git a/bsp/buildroot/package/cups-filters/cups-filters.mk b/bsp/buildroot/package/cups-filters/cups-filters.mk
new file mode 100644
index 00000000..131e5824
--- /dev/null
+++ b/bsp/buildroot/package/cups-filters/cups-filters.mk
@@ -0,0 +1,72 @@
+################################################################################
+#
+# cups-filters
+#
+################################################################################
+
+CUPS_FILTERS_VERSION = 1.20.3
+CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
+CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
+CUPS_FILTERS_LICENSE_FILES = COPYING
+
+CUPS_FILTERS_DEPENDENCIES = cups libglib2 lcms2 qpdf fontconfig freetype jpeg
+
+CUPS_FILTERS_CONF_OPTS = --disable-imagefilters \
+	--disable-mutool \
+	--disable-foomatic \
+	--with-cups-config=$(STAGING_DIR)/usr/bin/cups-config \
+	--with-sysroot=$(STAGING_DIR) \
+	--with-pdftops=pdftops \
+	--with-jpeg
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+CUPS_FILTERS_CONF_OPTS += --with-png
+CUPS_FILTERS_DEPENDENCIES += libpng
+else
+CUPS_FILTERS_CONF_OPTS += --without-png
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+CUPS_FILTERS_CONF_OPTS += --with-tiff
+CUPS_FILTERS_DEPENDENCIES += tiff
+else
+CUPS_FILTERS_CONF_OPTS += --without-tiff
+endif
+
+ifeq ($(BR2_PACKAGE_DBUS),y)
+CUPS_FILTERS_CONF_OPTS += --enable-dbus
+CUPS_FILTERS_DEPENDENCIES += dbus
+else
+CUPS_FILTERS_CONF_OPTS += --disable-dbus
+endif
+
+# avahi support requires avahi-client, which needs avahi-daemon and dbus
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+CUPS_FILTERS_DEPENDENCIES += avahi
+CUPS_FILTERS_CONF_OPTS += --enable-avahi
+else
+CUPS_FILTERS_CONF_OPTS += --disable-avahi
+endif
+
+ifeq ($(BR2_PACKAGE_GHOSTSCRIPT),y)
+CUPS_FILTERS_DEPENDENCIES += ghostscript
+CUPS_FILTERS_CONF_OPTS += --enable-ghostscript
+else
+CUPS_FILTERS_CONF_OPTS += --disable-ghostscript
+endif
+
+ifeq ($(BR2_PACKAGE_IJS),y)
+CUPS_FILTERS_DEPENDENCIES += ijs
+CUPS_FILTERS_CONF_OPTS += --enable-ijs
+else
+CUPS_FILTERS_CONF_OPTS += --disable-ijs
+endif
+
+ifeq ($(BR2_PACKAGE_POPPLER),y)
+CUPS_FILTERS_DEPENDENCIES += poppler
+CUPS_FILTERS_CONF_OPTS += --enable-poppler
+else
+CUPS_FILTERS_CONF_OPTS += --disable-poppler
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/cups/0003-Sanitize-the-installation-process.patch b/bsp/buildroot/package/cups/0003-Sanitize-the-installation-process.patch
index bf81f682..75a68487 100644
--- a/bsp/buildroot/package/cups/0003-Sanitize-the-installation-process.patch
+++ b/bsp/buildroot/package/cups/0003-Sanitize-the-installation-process.patch
@@ -18,10 +18,10 @@ cross-compiling:
    prevent overwriting those files/directories, which meant calling
    "make install" twice was failing.
 
-[Vincent: tweak the patch for 2.2.2 release]
+[Olivier: tweak the patch for 2.2.4 release]
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
 ---
  Makedefs.in        | 12 ++++++------
  conf/Makefile      |  6 +++---
@@ -37,18 +37,18 @@ index 3afef0a..3e4f1bd 100644
  # Installation programs...
  #
  
--INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 -INSTALL_COMPDATA =	$(INSTALL) -c -m 444 @INSTALL_GZIP@
-+INSTALL_BIN	=	$(LIBTOOL) $(INSTALL) -c -m 755
++INSTALL_BIN	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m 755
 +INSTALL_COMPDATA =	$(INSTALL) -c -m 644 @INSTALL_GZIP@
  INSTALL_CONFIG	=	$(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
 -INSTALL_DATA	=	$(INSTALL) -c -m 444
 +INSTALL_DATA	=	$(INSTALL) -c -m 644
  INSTALL_DIR	=	$(INSTALL) -d
--INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
+-INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
 -INSTALL_MAN	=	$(INSTALL) -c -m 444
--INSTALL_SCRIPT	=	$(INSTALL) -c -m 555
-+INSTALL_LIB	=	$(LIBTOOL) $(INSTALL) -c -m 755
+-INSTALL_SCRIPT	=	$(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
++INSTALL_LIB	=	@LIBTOOL_INSTALL@ $(INSTALL) -c -m 755
 +INSTALL_MAN	=	$(INSTALL) -c -m 644
 +INSTALL_SCRIPT	=	$(INSTALL) -c -m 755
  
diff --git a/bsp/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch b/bsp/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch
index 492418f7..ea4f0b4a 100644
--- a/bsp/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch
+++ b/bsp/buildroot/package/cups/0004-Remove-PIE-flags-from-the-build.patch
@@ -7,7 +7,10 @@ Generating a statically linked binary built with PIE requires the
 Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To
 solve this, we simply disable the PIE flags.
 
+[olivier tweak patch for 2.2.4]
+
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
 ---
  Makedefs.in | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -16,13 +19,13 @@ diff --git a/Makedefs.in b/Makedefs.in
 index 3afef0a..299b297 100644
 --- a/Makedefs.in
 +++ b/Makedefs.in
-@@ -142,7 +142,7 @@ IPPFIND_BIN	=	@IPPFIND_BIN@
+@@ -148,7 +148,7 @@ IPPFIND_BIN	=	@IPPFIND_BIN@
  IPPFIND_MAN	=	@IPPFIND_MAN@
  LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
  			-L../scheduler @LDARCHFLAGS@ \
 -			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
 +			@LDFLAGS@ @RELROFLAGS@ $(OPTIM)
- LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+ LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
  LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
  LIBS		=	$(LINKCUPS) $(COMMONLIBS)
 -- 
diff --git a/bsp/buildroot/package/cups/0005-Fix-static-linking-with-GnuTLS.patch b/bsp/buildroot/package/cups/0005-Fix-static-linking-with-GnuTLS.patch
deleted file mode 100644
index 5702caae..00000000
--- a/bsp/buildroot/package/cups/0005-Fix-static-linking-with-GnuTLS.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 79a2389f590f4d16885bdd0715f3f04fd9fa6cc5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Sun, 28 Feb 2016 16:35:56 +0100
-Subject: [PATCH] Fix static linking with GnuTLS
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cups forgets to link against the libs found by pkg-config if it is build with
-GnuTLS support.
-
-Otherwise, static build fails with:
-../cups/libcups.a(tls.o): In function `http_gnutls_create_credential':
-cups-2.1.2/cups/tls-gnutls.c:762: undefined reference to `gnutls_x509_crt_init'
-[..]
-
-Status upstream: Pending
-
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- Makedefs.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makedefs.in b/Makedefs.in
-index 299b297..ce9d535 100644
---- a/Makedefs.in
-+++ b/Makedefs.in
-@@ -143,7 +143,7 @@ IPPFIND_MAN	=	@IPPFIND_MAN@
- LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
- 			-L../scheduler @LDARCHFLAGS@ \
- 			@LDFLAGS@ @RELROFLAGS@ $(OPTIM)
--LINKCUPS	=	@LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
-+LINKCUPS	=	@LINKCUPS@ $(SSLLIBS) $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
- LINKCUPSIMAGE	=	@LINKCUPSIMAGE@
- LIBS		=	$(LINKCUPS) $(COMMONLIBS)
- ONDEMANDFLAGS	=	@ONDEMANDFLAGS@
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/cups/Config.in b/bsp/buildroot/package/cups/Config.in
index 3f5460c1..e23f069a 100644
--- a/bsp/buildroot/package/cups/Config.in
+++ b/bsp/buildroot/package/cups/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_CUPS
 	bool "cups"
 	# needs libstdcpp for ppdc
 	depends on BR2_INSTALL_LIBSTDCPP
+	# needs threads for ippserver
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# needs fork()
 	depends on BR2_USE_MMU
 	help
@@ -9,5 +11,5 @@ config BR2_PACKAGE_CUPS
 
 	  http://www.cups.org
 
-comment "cups needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "cups needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/cups/cups.hash b/bsp/buildroot/package/cups/cups.hash
index 08c8c3c2..d4f20b60 100644
--- a/bsp/buildroot/package/cups/cups.hash
+++ b/bsp/buildroot/package/cups/cups.hash
@@ -1,2 +1,2 @@
 # Locally calculated:
-sha256 f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6  cups-2.2.2-source.tar.gz
+sha256 a8795e2aa54dcfbdc9ff254a770f0d7154e35c981bca5b3369050c5193ab5a21  cups-2.2.5-source.tar.gz
diff --git a/bsp/buildroot/package/cups/cups.mk b/bsp/buildroot/package/cups/cups.mk
index ae3b9caa..0726d8a3 100644
--- a/bsp/buildroot/package/cups/cups.mk
+++ b/bsp/buildroot/package/cups/cups.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-CUPS_VERSION = 2.2.2
+CUPS_VERSION = 2.2.5
 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
 CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
-CUPS_LICENSE = GPLv2, LGPLv2
+CUPS_LICENSE = GPL-2.0, LGPL-2.0
 CUPS_LICENSE_FILES = LICENSE.txt
 CUPS_INSTALL_STAGING = YES
 CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install
@@ -15,7 +15,7 @@ CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install
 
 # Using autoconf, not autoheader, so we cannot use AUTORECONF = YES.
 define CUPS_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/usr/bin/autoconf -f
+	cd $(@D); $(HOST_DIR)/bin/autoconf -f
 endef
 CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF
 
diff --git a/bsp/buildroot/package/curlftpfs/Config.in b/bsp/buildroot/package/curlftpfs/Config.in
index ad3ac241..c8c432f2 100644
--- a/bsp/buildroot/package/curlftpfs/Config.in
+++ b/bsp/buildroot/package/curlftpfs/Config.in
@@ -1,18 +1,17 @@
 config BR2_PACKAGE_CURLFTPFS
 	bool "curlftpfs (FUSE)"
-	select BR2_PACKAGE_LIBFUSE
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_LIBCURL
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
 	depends on BR2_USE_MMU # libfuse, glib2
 	depends on !BR2_STATIC_LIBS # libfuse
+	select BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBCURL
 	help
-	  CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE
-	  and libcurl.
+	  CurlFtpFS is a filesystem for accessing FTP hosts based on
+	  FUSE and libcurl.
 
 	  http://curlftpfs.sourceforge.net/
 
diff --git a/bsp/buildroot/package/curlftpfs/curlftpfs.mk b/bsp/buildroot/package/curlftpfs/curlftpfs.mk
index 8ec3e4c5..584d01a6 100644
--- a/bsp/buildroot/package/curlftpfs/curlftpfs.mk
+++ b/bsp/buildroot/package/curlftpfs/curlftpfs.mk
@@ -7,11 +7,11 @@
 CURLFTPFS_VERSION = 0.9.2
 CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION)
 CURLFTPFS_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config
-CURLFTPFS_LICENSE = GPLv2
+CURLFTPFS_LICENSE = GPL-2.0
 CURLFTPFS_LICENSE_FILES = COPYING
 CURLFTPFS_DEPENDENCIES = \
 	libglib2 libfuse openssl libcurl \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv)
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/curlpp/Config.in b/bsp/buildroot/package/curlpp/Config.in
new file mode 100644
index 00000000..a23e5d93
--- /dev/null
+++ b/bsp/buildroot/package/curlpp/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_CURLPP
+	bool "curlpp"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBCURL
+	help
+	  cURLpp is a C++ wrapper for libcURL.
+
+	  http://www.curlpp.org/
+
+comment "curlpp needs a toolchain w/ C++, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/curlpp/curlpp.hash b/bsp/buildroot/package/curlpp/curlpp.hash
new file mode 100644
index 00000000..2b14a235
--- /dev/null
+++ b/bsp/buildroot/package/curlpp/curlpp.hash
@@ -0,0 +1,5 @@
+# Locally computed:
+sha256 97e3819bdcffc3e4047b6ac57ca14e04af85380bd93afe314bee9dd5c7f46a0a  v0.8.1.tar.gz
+
+# Hash for license files:
+sha256 8b9e3afd4d06ad3c169e788e5187a3e9f4f35671e9a7322f7e74bea9643b5b5a  doc/LICENSE
diff --git a/bsp/buildroot/package/curlpp/curlpp.mk b/bsp/buildroot/package/curlpp/curlpp.mk
new file mode 100644
index 00000000..7528855a
--- /dev/null
+++ b/bsp/buildroot/package/curlpp/curlpp.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# curlpp
+#
+################################################################################
+
+CURLPP_VERSION = 0.8.1
+CURLPP_SITE = https://github.com/jpbarrette/curlpp/archive
+CURLPP_SOURCE = v$(CURLPP_VERSION).tar.gz
+CURLPP_LICENSE = MIT
+CURLPP_LICENSE_FILES = doc/LICENSE
+CURLPP_INSTALL_STAGING = YES
+CURLPP_DEPENDENCIES = libcurl
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/cvs/Config.in b/bsp/buildroot/package/cvs/Config.in
index 00369616..e8f0606e 100644
--- a/bsp/buildroot/package/cvs/Config.in
+++ b/bsp/buildroot/package/cvs/Config.in
@@ -5,7 +5,8 @@ config BR2_PACKAGE_CVS
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_NCURSES
 	help
-	  Concurrent Versions System - source code revision control tools.
+	  Concurrent Versions System - source code revision control
+	  tools.
 
 	  http://www.nongnu.org/cvs/
 
diff --git a/bsp/buildroot/package/cwiid/0001-fix-link-options-for-as-needed-90.patch b/bsp/buildroot/package/cwiid/0001-fix-link-options-for-as-needed-90.patch
deleted file mode 100644
index 806ddaa3..00000000
--- a/bsp/buildroot/package/cwiid/0001-fix-link-options-for-as-needed-90.patch
+++ /dev/null
@@ -1,166 +0,0 @@
-From 6af678616531eb1f3d3d0a052313ef9d8125bac7 Mon Sep 17 00:00:00 2001
-From: "L. Donnie Smith" <donnie.smith@gatech.edu>
-Date: Thu, 4 Feb 2010 22:53:41 -0500
-Subject: [PATCH] fix link options for --as-needed (#90)
-
-also fix a couple of includes
----
- common/include/app.mak    | 2 +-
- common/include/lib.mak.in | 4 ++--
- common/include/plugin.mak | 2 +-
- lswm/Makefile.in          | 2 +-
- python/Makefile.in        | 2 +-
- python/Wiimote.c          | 2 +-
- python/cwiidmodule.c      | 2 +-
- wmdemo/wmdemo.c           | 1 +
- wmgui/Makefile.in         | 2 +-
- wminput/Makefile.in       | 2 +-
- wminput/main.c            | 1 +
- 11 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/common/include/app.mak b/common/include/app.mak
-index f00cf12..c26d0ff 100644
---- a/common/include/app.mak
-+++ b/common/include/app.mak
-@@ -10,7 +10,7 @@ DEST_INST_DIR = $(ROOTDIR)$(INST_DIR)
- all: $(APP_NAME)
- 
- $(APP_NAME): $(OBJECTS)
--	$(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS)
-+	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS)
- 
- install: $(APP_NAME)
- 	install -D $(APP_NAME) $(DEST_INST_DIR)/$(APP_NAME)
-diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in
-index 5e81ff3..3afbb14 100644
---- a/common/include/lib.mak.in
-+++ b/common/include/lib.mak.in
-@@ -25,8 +25,8 @@ $(STATIC_LIB): $(OBJECTS)
- 	ar rcs $(STATIC_LIB) $(OBJECTS)
- 
- $(SHARED_LIB): $(OBJECTS)
--	$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) $(LDLIBS) \
--	      -o $(SHARED_LIB) $(OBJECTS)
-+	$(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \
-+	      $(OBJECTS) $(LDLIBS)
- 
- install: install_header install_static install_shared
- 
-diff --git a/common/include/plugin.mak b/common/include/plugin.mak
-index 0f61502..a2d5c85 100644
---- a/common/include/plugin.mak
-+++ b/common/include/plugin.mak
-@@ -16,7 +16,7 @@ DEST_INST_DIR = $(INST_DIR)
- all: $(LIB_NAME)
- 
- $(LIB_NAME): $(OBJECTS)
--	$(CC) -shared $(LDFLAGS) $(LDLIBS) -o $(LIB_NAME) $(OBJECTS)
-+	$(CC) -shared $(LDFLAGS) -o $(LIB_NAME) $(OBJECTS) $(LDLIBS)
- 
- install: $(LIB_NAME)
- 	install -D $(LIB_NAME) $(DEST_INST_DIR)/$(LIB_NAME)
-diff --git a/lswm/Makefile.in b/lswm/Makefile.in
-index 79e8b5b..017104f 100644
---- a/lswm/Makefile.in
-+++ b/lswm/Makefile.in
-@@ -8,7 +8,7 @@ SOURCES = lswm.c
- 
- CFLAGS += -I@top_builddir@/libcwiid
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += -lcwiid
-+LDLIBS += -lcwiid -lbluetooth
- INST_DIR = @bindir@
- 
- include $(COMMON)/include/app.mak
-diff --git a/python/Makefile.in b/python/Makefile.in
-index 0d7efdf..0ca57ca 100644
---- a/python/Makefile.in
-+++ b/python/Makefile.in
-@@ -7,7 +7,7 @@ ifdef ROOTDIR
- endif
- 
- all:
--	$(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid
-+	$(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid -lbluetooth
- 
- install:
- 	$(PYTHON) setup.py install --install-lib=${libdir}/python@PYTHON_VERSION@/site-packages $(SET_ROOT_DIR)
-diff --git a/python/Wiimote.c b/python/Wiimote.c
-index 794e7e2..523185e 100644
---- a/python/Wiimote.c
-+++ b/python/Wiimote.c
-@@ -24,7 +24,7 @@
- #include "structmember.h"
- #include <errno.h>
- #include <bluetooth/bluetooth.h>
--#include "cwiid.h"
-+#include <cwiid.h>
- 
- #if (PY_VERSION_HEX < 0x02050000)
-   #ifndef PY_SSIZE_T_MIN
-diff --git a/python/cwiidmodule.c b/python/cwiidmodule.c
-index f6a8f33..a01ed82 100644
---- a/python/cwiidmodule.c
-+++ b/python/cwiidmodule.c
-@@ -24,7 +24,7 @@
- 
- #include <stdlib.h>
- 
--#include "cwiid.h"
-+#include <cwiid.h>
- #include "structmember.h"
- 
- /* externally defined types */
-diff --git a/wmdemo/wmdemo.c b/wmdemo/wmdemo.c
-index 70a25a1..b7aaa7f 100644
---- a/wmdemo/wmdemo.c
-+++ b/wmdemo/wmdemo.c
-@@ -2,6 +2,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- 
-+#include <bluetooth/bluetooth.h>
- #include <cwiid.h>
- 
- /* This is a sample program written to demonstrate basic CWiid libwiimote
-diff --git a/wmgui/Makefile.in b/wmgui/Makefile.in
-index 41b205e..14d1c1e 100644
---- a/wmgui/Makefile.in
-+++ b/wmgui/Makefile.in
-@@ -8,7 +8,7 @@ SOURCES = main.c interface.c support.c
- 
- CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid
- LDFLAGS += -L@top_builddir@/libcwiid
--LDLIBS += @GTK_LIBS@ -lm -lcwiid
-+LDLIBS += @GTK_LIBS@ -lcwiid -lbluetooth -lm
- INST_DIR = @bindir@
- 
- include $(COMMON)/include/app.mak
-diff --git a/wminput/Makefile.in b/wminput/Makefile.in
-index 009d4d5..d3c3679 100644
---- a/wminput/Makefile.in
-+++ b/wminput/Makefile.in
-@@ -14,7 +14,7 @@ CFLAGS += -I@top_builddir@/libcwiid \
- 	-DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \
- 	-DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\"
- 
--LDLIBS += -lcwiid -ldl
-+LDLIBS += -lcwiid -lbluetooth -ldl -lpthread
- LDFLAGS += -L@top_builddir@/libcwiid -rdynamic
- INST_DIR = @bindir@
- 
-diff --git a/wminput/main.c b/wminput/main.c
-index c3a7445..bbc98d9 100644
---- a/wminput/main.c
-+++ b/wminput/main.c
-@@ -30,6 +30,7 @@
- #include <signal.h>
- #include <sys/types.h>
- #include <unistd.h>
-+#include <bluetooth/bluetooth.h>
- 
- #include <cwiid.h>
- 
--- 
-1.8.5.2
-
diff --git a/bsp/buildroot/package/cwiid/0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch b/bsp/buildroot/package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch
similarity index 100%
rename from bsp/buildroot/package/cwiid/0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch
rename to bsp/buildroot/package/cwiid/0001-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch
diff --git a/bsp/buildroot/package/cwiid/0002-Update-for-BlueZ-changes.patch b/bsp/buildroot/package/cwiid/0002-Update-for-BlueZ-changes.patch
deleted file mode 100644
index c0d78a8a..00000000
--- a/bsp/buildroot/package/cwiid/0002-Update-for-BlueZ-changes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c5dd7d4a9af5a7d8ead8ad26d9e5e0f8f8292d29 Mon Sep 17 00:00:00 2001
-From: "L. Donnie Smith" <donnie.smith@gatech.edu>
-Date: Sun, 30 Nov 2008 22:34:08 +0000
-Subject: [PATCH] Update for BlueZ changes.
-
-git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@183 918edb2d-ff29-0410-9de2-eb38e7f22bc7
----
- libcwiid/bluetooth.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libcwiid/bluetooth.c b/libcwiid/bluetooth.c
-index 63284a8..e986f75 100644
---- a/libcwiid/bluetooth.c
-+++ b/libcwiid/bluetooth.c
-@@ -122,8 +122,8 @@ int cwiid_get_bdinfo_array(int dev_id, unsigned int timeout, int max_bdinfo,
- 		}
- 
- 		/* timeout (10000) in milliseconds */
--		if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
--		                    (*bdinfo)[bdinfo_count].name, 10000)) {
-+		if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
-+		                         (*bdinfo)[bdinfo_count].name, 10000)) {
- 			cwiid_err(NULL, "Bluetooth name read error");
- 			err = 1;
- 			goto CODA;
--- 
-1.8.5.2
-
diff --git a/bsp/buildroot/package/cwiid/0004-configure-make-wmgui-build-optional.patch b/bsp/buildroot/package/cwiid/0002-configure-make-wmgui-build-optional.patch
similarity index 100%
rename from bsp/buildroot/package/cwiid/0004-configure-make-wmgui-build-optional.patch
rename to bsp/buildroot/package/cwiid/0002-configure-make-wmgui-build-optional.patch
diff --git a/bsp/buildroot/package/cwiid/Config.in b/bsp/buildroot/package/cwiid/Config.in
index 03b7dbbc..50c05ebd 100644
--- a/bsp/buildroot/package/cwiid/Config.in
+++ b/bsp/buildroot/package/cwiid/Config.in
@@ -6,8 +6,8 @@ config BR2_PACKAGE_CWIID
 	depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
-	  A collection of Linux tools written in C for interfacing to the
-	  Nintendo Wiimote.
+	  A collection of Linux tools written in C for interfacing to
+	  the Nintendo Wiimote.
 
 	  http://abstrakraft.org/cwiid/
 
diff --git a/bsp/buildroot/package/cwiid/cwiid.hash b/bsp/buildroot/package/cwiid/cwiid.hash
index 749c9c3c..6446b802 100644
--- a/bsp/buildroot/package/cwiid/cwiid.hash
+++ b/bsp/buildroot/package/cwiid/cwiid.hash
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256	8880378303d872ea65b037184ad6c96bc68f87764b503c152032f56344b5e81d	cwiid-0.6.00.tgz
+sha256 3adf3bf018721dee3c47e12ba4dd71810a239918dce925aa4079cb2a98bca5fe  cwiid-fadf11e89b579bcc0336a0692ac15c93785f3f82.tar.gz
+# License files, locally calculated
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
diff --git a/bsp/buildroot/package/cwiid/cwiid.mk b/bsp/buildroot/package/cwiid/cwiid.mk
index 0cfc7747..c092e401 100644
--- a/bsp/buildroot/package/cwiid/cwiid.mk
+++ b/bsp/buildroot/package/cwiid/cwiid.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-CWIID_VERSION = 0.6.00
-CWIID_SOURCE = cwiid-$(CWIID_VERSION).tgz
-CWIID_SITE = http://abstrakraft.org/cwiid/downloads
-CWIID_LICENSE = GPLv2+
+CWIID_VERSION = fadf11e89b579bcc0336a0692ac15c93785f3f82
+CWIID_SITE = $(call github,abstrakraft,cwiid,$(CWIID_VERSION))
+CWIID_LICENSE = GPL-2.0+
 CWIID_LICENSE_FILES = COPYING
 
 CWIID_AUTORECONF = YES
diff --git a/bsp/buildroot/package/cxxtest/cxxtest.hash b/bsp/buildroot/package/cxxtest/cxxtest.hash
index f552e803..be2cbd32 100644
--- a/bsp/buildroot/package/cxxtest/cxxtest.hash
+++ b/bsp/buildroot/package/cxxtest/cxxtest.hash
@@ -1,2 +1,5 @@
 # Locally computed:
 sha256	1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8	cxxtest-4.4.tar.gz
+
+# Hash for license file:
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  COPYING
diff --git a/bsp/buildroot/package/cxxtest/cxxtest.mk b/bsp/buildroot/package/cxxtest/cxxtest.mk
index 93bdd8b8..7d494c8f 100644
--- a/bsp/buildroot/package/cxxtest/cxxtest.mk
+++ b/bsp/buildroot/package/cxxtest/cxxtest.mk
@@ -1,12 +1,12 @@
-#######################################################################################
+################################################################################
 #
 # cxxtest
 #
-#######################################################################################
+################################################################################
 
 CXXTEST_VERSION = 4.4
 CXXTEST_SITE = https://github.com/CxxTest/cxxtest/releases/download/$(CXXTEST_VERSION)
-CXXTEST_LICENSE = LGPLv3
+CXXTEST_LICENSE = LGPL-3.0
 CXXTEST_LICENSE_FILES = COPYING
 CXXTEST_INSTALL_STAGING = YES
 CXXTEST_INSTALL_TARGET = NO
diff --git a/bsp/buildroot/package/czmq/Config.in b/bsp/buildroot/package/czmq/Config.in
index cfa51529..71389fce 100644
--- a/bsp/buildroot/package/czmq/Config.in
+++ b/bsp/buildroot/package/czmq/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_CZMQ
 	bool "czmq"
-	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
+	select BR2_PACKAGE_ZEROMQ
 	help
 	  High-level C Binding for 0MQ
 
diff --git a/bsp/buildroot/package/czmq/czmq.mk b/bsp/buildroot/package/czmq/czmq.mk
index 8c4de718..5305789d 100644
--- a/bsp/buildroot/package/czmq/czmq.mk
+++ b/bsp/buildroot/package/czmq/czmq.mk
@@ -11,7 +11,7 @@ CZMQ_SITE = $(call github,zeromq,czmq,$(CZMQ_VERSION))
 CZMQ_AUTORECONF = YES
 CZMQ_INSTALL_STAGING = YES
 CZMQ_DEPENDENCIES = zeromq host-pkgconf
-CZMQ_LICENSE = MPLv2.0
+CZMQ_LICENSE = MPL-2.0
 CZMQ_LICENSE_FILES = LICENSE
 
 # asciidoc is a python script that imports unicodedata, which is not in
diff --git a/bsp/buildroot/package/dado/dado.hash b/bsp/buildroot/package/dado/dado.hash
index 3f17f083..973bdb3f 100644
--- a/bsp/buildroot/package/dado/dado.hash
+++ b/bsp/buildroot/package/dado/dado.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	b7a68583c36643ad9040937d7e2b99230af7da83c7cbd13c9923881f1eb7490f  dado-1.6.0-1.src.rock
+sha256 5a10ed7ff7be34ac004d10d6ea62ee8efc2b594c50ffc93e840e7fb7a2e6b4d0  dado-1.8.3-1.src.rock
diff --git a/bsp/buildroot/package/dado/dado.mk b/bsp/buildroot/package/dado/dado.mk
index a09dd6da..e4375a3a 100644
--- a/bsp/buildroot/package/dado/dado.mk
+++ b/bsp/buildroot/package/dado/dado.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-DADO_VERSION = 1.6.0-1
+DADO_VERSION = 1.8.3-1
 DADO_LICENSE = MIT
+DADO_LICENSE_FILES = $(DADO_SUBDIR)/doc/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/daemon/0001-fix-musl.patch b/bsp/buildroot/package/daemon/0001-fix-musl.patch
new file mode 100644
index 00000000..9454d72a
--- /dev/null
+++ b/bsp/buildroot/package/daemon/0001-fix-musl.patch
@@ -0,0 +1,18 @@
+daemon: fix build with musl
+
+musl requires the ttydefaults.h to be included explicitly for CEOF.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+diff -Nuar daemon-0.6.4-orig/daemon.c daemon-0.6.4/daemon.c
+--- daemon-0.6.4-orig/daemon.c	2010-06-12 16:37:00.000000000 +0300
++++ daemon-0.6.4/daemon.c	2017-05-01 22:02:17.721413468 +0300
+@@ -665,6 +665,7 @@
+ #ifdef _RESTORE_POSIX_SOURCE
+ #define _POSIX_SOURCE
+ #endif
++#include <sys/ttydefaults.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/select.h>
diff --git a/bsp/buildroot/package/daemon/Config.in b/bsp/buildroot/package/daemon/Config.in
new file mode 100644
index 00000000..b97f8cff
--- /dev/null
+++ b/bsp/buildroot/package/daemon/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_DAEMON
+	bool "daemon"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Daemon turns other process into daemons.
+
+	  http://www.libslack.org/daemon/
+
+comment "daemon needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/daemon/daemon.hash b/bsp/buildroot/package/daemon/daemon.hash
new file mode 100644
index 00000000..32308ea3
--- /dev/null
+++ b/bsp/buildroot/package/daemon/daemon.hash
@@ -0,0 +1,3 @@
+# md5 from http://www.libslack.org/daemon/; sha256 locally calculated
+md5 6cd0a28630a29ac279bc501f39baec66 daemon-0.6.4.tar.gz
+sha256 c4b9ea4aa74d55ea618c34f1e02c080ddf368549037cb239ee60c83191035ca1 daemon-0.6.4.tar.gz
diff --git a/bsp/buildroot/package/daemon/daemon.mk b/bsp/buildroot/package/daemon/daemon.mk
new file mode 100644
index 00000000..79cf3f7a
--- /dev/null
+++ b/bsp/buildroot/package/daemon/daemon.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# daemon
+#
+################################################################################
+
+DAEMON_VERSION = 0.6.4
+DAEMON_SITE = http://libslack.org/daemon/download
+DAEMON_LICENSE = GPL-2.0+
+DAEMON_LICENSE_FILES = LICENSE
+
+define DAEMON_CONFIGURE_CMDS
+	(cd $(@D); ./config)
+endef
+
+define DAEMON_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) ready
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define DAEMON_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) DEB_BUILD_OPTIONS=nostrip \
+		$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) \
+		install-daemon-bin
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/dahdi-linux/Config.in b/bsp/buildroot/package/dahdi-linux/Config.in
new file mode 100644
index 00000000..f2a37091
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-linux/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_DAHDI_LINUX
+	bool "dhadi-linux"
+	depends on BR2_LINUX_KERNEL
+	help
+	  DAHDI (Digium/Asterisk Hardware Device Interface) is the open
+	  source device interface technology used to control Digium and
+	  other legacy telephony interface cards.
+
+	  DAHDI Linux is the open source device driver framework used to
+	  interface Asterisk with telephony hardware.
+
+	  http://www.asterisk.org/downloads/dahdi
+
+	  Note: DAHDI Linux drivers won't build on a kernel v4.0 or more
+	  recent, because they use internals that have been removed in
+	  v4.0.
+
+comment "dahdi-linux needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/dahdi-linux/dahdi-linux.hash b/bsp/buildroot/package/dahdi-linux/dahdi-linux.hash
new file mode 100644
index 00000000..c362f8ea
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-linux/dahdi-linux.hash
@@ -0,0 +1,27 @@
+# sha1 from: http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
+# sha256 locally computed
+sha1    8cbd55b8611c6ed80bcdf84d537566b4934f3def  dahdi-linux-2.11.1.tar.gz
+sha256  f59f382365118205e77d2874f1c0e1546e936247bcc45f07a43bc21778bee9df  dahdi-linux-2.11.1.tar.gz
+
+# Firmware files have no upstream hash, so sha56 locally computed
+sha256  3ff26cf80555fd7470b43a87c51d03c1db2a75abcd4561d79f69b6c48298e4a1  dahdi-fwload-vpmadt032-1.25.0.tar.gz
+sha256  d5b6ab6851e431afcfec2ecc39d95fa88fe3939ffdb2e3d4f28a43cabf30e95b  dahdi-fw-a4a-a0017.tar.gz
+sha256  e039af8bec36407b74e1dd9ebdd49ba077469eda79d4e6093721ed2836d4536f  dahdi-fw-a4b-d001e.tar.gz
+sha256  5064f9877b8aec99b19fd57988216fe1a9c0b7c07853dd3b32b5a55ab7b418e6  dahdi-fw-a8a-1d0017.tar.gz
+sha256  09a8992786309e025aa60b400a2c7d21226ac9bb6f1b66f562a5e7e9dc892b03  dahdi-fw-a8b-1f001e.tar.gz
+sha256  449ab3fd03d55d808e999efb7677cd04de202b92c9fcb039539a7e48a39a80f5  dahdi-fw-hx8-2.06.tar.gz
+sha256  7a006073202d67e45f1d5ff1e9c6e8663e6056cef9dc4c5abae86a1018db349c  dahdi-fw-oct6114-032-1.05.01.tar.gz
+sha256  56bac1f2024c76ecf9b6f40992eeea29a1fbee676bb2a37a058179bacfbb1c91  dahdi-fw-oct6114-064-1.05.01.tar.gz
+sha256  e1146749d205c41603b9b76852c3f8104dac233d0025d700db24504d10c99775  dahdi-fw-oct6114-128-1.05.01.tar.gz
+sha256  5fe5036a2766cf0e8a968b0c58b700507d86e1cde9296ca437170cc626a9c79c  dahdi-fw-oct6114-256-1.05.01.tar.gz
+sha256  11dd8d009809e41fc9a3a36766f59ff73d29075eede5b8724331d9a6e5259774  dahdi-fw-tc400m-MR6.12.tar.gz
+sha256  511c1966295a20df673bb87af30245f0ad165efd6ccb92b4d8ed535ca7f5ac65  dahdi-fw-te133-7a001e.tar.gz
+sha256  99f7c410bf47d2a5ae687d717e51448ce5b52aca902830bf39bffe683150fa2d  dahdi-fw-te134-780017.tar.gz
+sha256  c8f55d57cc0bf332e8d96cdf9ff6dd0e322f33581e1efc24c2b9a0e0c5eb7ee4  dahdi-fw-te435-13001e.tar.gz
+sha256  0980f4a8d191c6872aa27d971758046f0e7827ac161549f2cc1b0eeab0ae9333  dahdi-fw-te436-10017.tar.gz
+sha256  5b823e25828e2c1c6548886ad408b2e31dbc8cd17170c52592792d9c754a199c  dahdi-fw-te820-1.76.tar.gz
+sha256  6b199cf836f150f9cb35f763f0f502fb52cfa2724a449b500429c746973904ad  dahdi-fw-vpmoct032-1.12.0.tar.gz
+
+# License files, locally computed
+sha256  fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7  LICENSE
+sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  LICENSE.LGPL
diff --git a/bsp/buildroot/package/dahdi-linux/dahdi-linux.mk b/bsp/buildroot/package/dahdi-linux/dahdi-linux.mk
new file mode 100644
index 00000000..c042a14e
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-linux/dahdi-linux.mk
@@ -0,0 +1,88 @@
+################################################################################
+#
+# dahdi-linux
+#
+################################################################################
+
+DAHDI_LINUX_VERSION = 2.11.1
+DAHDI_LINUX_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
+
+# We need to download all thoe firmware blobs ourselves, otherwise
+# dahdi-linux will try to download them at install time.
+DAHDI_LINUX_FW_SITE = http://downloads.digium.com/pub/telephony/firmware/releases
+DAHDI_LINUX_FW_FILES = \
+	dahdi-fwload-vpmadt032-1.25.0.tar.gz \
+	dahdi-fw-oct6114-032-1.05.01.tar.gz \
+	dahdi-fw-oct6114-064-1.05.01.tar.gz \
+	dahdi-fw-oct6114-128-1.05.01.tar.gz \
+	dahdi-fw-oct6114-256-1.05.01.tar.gz \
+	dahdi-fw-tc400m-MR6.12.tar.gz \
+	dahdi-fw-hx8-2.06.tar.gz \
+	dahdi-fw-vpmoct032-1.12.0.tar.gz \
+	dahdi-fw-te820-1.76.tar.gz \
+	dahdi-fw-te133-7a001e.tar.gz \
+	dahdi-fw-te134-780017.tar.gz \
+	dahdi-fw-a8b-1f001e.tar.gz \
+	dahdi-fw-a8a-1d0017.tar.gz \
+	dahdi-fw-a4b-d001e.tar.gz \
+	dahdi-fw-a4a-a0017.tar.gz \
+	dahdi-fw-te435-13001e.tar.gz \
+	dahdi-fw-te436-10017.tar.gz
+
+DAHDI_LINUX_EXTRA_DOWNLOADS = \
+	$(patsubst %,$(DAHDI_LINUX_FW_SITE)/%,$(DAHDI_LINUX_FW_FILES))
+
+# dahdi-linux claims to be GPLv2 with parts LGPLv2.1 (not 'or later'),
+# but there are the so-called firmware files (downloaded above) for
+# which the license is unclear: the header claims to be GPLv2, the
+# 'loader-wrapper' claims to be GPLv2, but there are two so-called
+# 'firmware' binary-only .o blobs for which the license is not
+# explicited, which look like they end up as part of a kernel module,
+# and for which the source is nowhere to be found on the upstream site
+# (they are only for x86/x86_64, but we still list them unconditionally).
+DAHDI_LINUX_LICENSE = GPL-2.0, LGPL-2.1, unknown (firmware files)
+DAHDI_LINUX_LICENSE_FILES = LICENSE LICENSE.LGPL
+
+DAHDI_LINUX_INSTALL_STAGING = YES
+
+DAHDI_LINUX_MODULE_SUBDIRS = drivers/dahdi
+
+DAHDI_LINUX_MODULE_MAKE_OPTS = \
+	KSRC=$(LINUX_DIR) \
+	KVERS=$(LINUX_VERSION_PROBED) \
+	DAHDI_BUILD_ALL=m \
+	DAHDI_INCLUDE=$(@D)/include \
+	INSTALL_MOD_DIR=dahdi
+
+define DAHDI_LINUX_EXTRACT_FW
+	$(foreach f,$(DAHDI_LINUX_FW_FILES),\
+		cp $(BR2_DL_DIR)/$(f) $(@D)/drivers/dahdi/firmware/$(f)$(sep))
+endef
+DAHDI_LINUX_POST_EXTRACT_HOOKS += DAHDI_LINUX_EXTRACT_FW
+
+# Need to pass the same options as for building the modules, because
+# it wants to scan Linux' .config file to check whether some options
+# are set or not (like CONFIG_FW_LOADER).
+define DAHDI_LINUX_CONFIGURE_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(DAHDI_LINUX_MODULE_MAKE_OPTS) \
+		prereq
+endef
+
+define DAHDI_LINUX_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(DAHDI_LINUX_MODULE_MAKE_OPTS) \
+		DESTDIR=$(STAGING_DIR) \
+		install-include
+endef
+
+define DAHDI_LINUX_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(DAHDI_LINUX_MODULE_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) \
+		install-firmware \
+		install-xpp-firm
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/dahdi-tools/0001-no-build-docs.patch b/bsp/buildroot/package/dahdi-tools/0001-no-build-docs.patch
new file mode 100644
index 00000000..311a129e
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-tools/0001-no-build-docs.patch
@@ -0,0 +1,16 @@
+Do not build the documentation.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN dahdi-tools-2.11.0.orig/Makefile.am dahdi-tools-2.11.0/Makefile.am
+--- dahdi-tools-2.11.0.orig/Makefile.am	2015-12-22 21:19:12.000000000 +0100
++++ dahdi-tools-2.11.0/Makefile.am	2016-01-04 23:23:34.201304133 +0100
+@@ -17,7 +17,7 @@
+ 	#-Wformat=2
+ endif
+ 
+-SUBDIRS	= xpp doc hotplug
++SUBDIRS	= xpp hotplug
+ 
+ if PPPD
+ SUBDIRS	+= ppp
diff --git a/bsp/buildroot/package/dahdi-tools/0002-no-perl-manpages.patch b/bsp/buildroot/package/dahdi-tools/0002-no-perl-manpages.patch
new file mode 100644
index 00000000..dae1b6c3
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-tools/0002-no-perl-manpages.patch
@@ -0,0 +1,37 @@
+xpp: do not try to install the manpages for the perl tools
+
+The man pages are generated neither at build time nor at install time,
+so the install step fails.
+
+Just disable them.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durN dahdi-tools-2.11.0.orig/xpp/Makefile.am dahdi-tools-2.11.0/xpp/Makefile.am
+--- dahdi-tools-2.11.0.orig/xpp/Makefile.am	2015-12-22 21:19:12.000000000 +0100
++++ dahdi-tools-2.11.0/xpp/Makefile.am	2016-01-04 23:56:31.851820973 +0100
+@@ -3,7 +3,6 @@
+ 
+ SUBDIRS		=
+ 
+-man_MANS	=
+ 
+ 
+ # FIXME: try to improve code, so we can use $(PEDANTIC)
+@@ -59,7 +58,6 @@
+ udevrules_DATA	= xpp.rules
+ 
+ dist_sbin_SCRIPTS	= $(perl_scripts)
+-man_MANS		+= $(perl_mans)
+ CLEANFILES		= $(perl_checks) $(perl_mans)
+ 
+ if	PBX_USB
+@@ -147,8 +145,6 @@
+ 		astribank_allow.8 \
+ 		astribank_is_starting.8
+ 
+-man_MANS	+= $(man_pages)
+-
+ endif
+ 
+ EXTRA_DIST	= \
diff --git a/bsp/buildroot/package/dahdi-tools/Config.in b/bsp/buildroot/package/dahdi-tools/Config.in
new file mode 100644
index 00000000..a5f145df
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-tools/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_DAHDI_TOOLS
+	bool "dahdi-tools"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_LINUX_KERNEL # dahdi-linux
+	depends on BR2_USE_MMU # perl
+	select BR2_PACKAGE_DAHDI_LINUX
+	select BR2_PACKAGE_PERL
+	help
+	  DAHDI (Digium/Asterisk Hardware Device Interface) is the open
+	  source device interface technology used to control Digium and
+	  other legacy telephony interface cards.
+
+	  DAHDI Tools is a package of utilities for managing and
+	  monitoring DAHDI devices.
+
+	  http://www.asterisk.org/downloads/dahdi
+
+comment "dahdi-tools needs a toolchain w/ threads and a Linux kernel to be built"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/dahdi-tools/dahdi-tools.hash b/bsp/buildroot/package/dahdi-tools/dahdi-tools.hash
new file mode 100644
index 00000000..7b668c60
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-tools/dahdi-tools.hash
@@ -0,0 +1,8 @@
+# sha1 from http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
+# sha256 locally computed
+sha1    5da944e6d59a977f814230253f3ddf2847e7f31b                          dahdi-tools-2.11.1.tar.gz
+sha256  53ffeb333f3e44b0c88e5b17475cdbf87d3f652eb81a6422de76250c061e2909  dahdi-tools-2.11.1.tar.gz
+
+# License files, locally computed
+sha256  fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7  LICENSE
+sha256  ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5  LICENSE.LGPL
diff --git a/bsp/buildroot/package/dahdi-tools/dahdi-tools.mk b/bsp/buildroot/package/dahdi-tools/dahdi-tools.mk
new file mode 100644
index 00000000..e97d944c
--- /dev/null
+++ b/bsp/buildroot/package/dahdi-tools/dahdi-tools.mk
@@ -0,0 +1,32 @@
+################################################################################
+#
+# dahdi-tools
+#
+################################################################################
+
+DAHDI_TOOLS_VERSION = 2.11.1
+DAHDI_TOOLS_SITE = http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
+
+DAHDI_TOOLS_LICENSE = GPLv2, LGPLv2.1
+DAHDI_TOOLS_LICENSE_FILES = LICENSE LICENSE.LGPL
+
+DAHDI_TOOLS_DEPENDENCIES = dahdi-linux perl
+
+DAHDI_TOOLS_INSTALL_STAGING = YES
+DAHDI_TOOLS_AUTORECONF = YES
+
+# Buildroot globally exports PERL with the value it has on the host, so we need
+# to override it with the location where it will be on the target.
+DAHDI_TOOLS_CONF_ENV = PERL=/usr/bin/perl
+
+DAHDI_TOOLS_CONF_OPTS = \
+	--without-newt \
+	--without-usb \
+	--without-pcap \
+	--without-libusbx \
+	--without-libusb \
+	--without-selinux \
+	--without-ppp \
+	--with-perllib=/usr/lib/perl5/$(PERL_VERSION)
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/dante/dante.mk b/bsp/buildroot/package/dante/dante.mk
index 1bab648b..687567e1 100644
--- a/bsp/buildroot/package/dante/dante.mk
+++ b/bsp/buildroot/package/dante/dante.mk
@@ -6,7 +6,7 @@
 
 DANTE_VERSION = 1.4.1
 DANTE_SITE = http://www.inet.no/dante/files
-DANTE_LICENSE = BSD-3c
+DANTE_LICENSE = BSD-3-Clause
 DANTE_LICENSE_FILES = LICENSE
 
 # Dante uses a *VERY* old configure.ac
diff --git a/bsp/buildroot/package/daq/0001-Fix-build-against-the-musl-C-library.patch b/bsp/buildroot/package/daq/0001-Fix-build-against-the-musl-C-library.patch
new file mode 100644
index 00000000..25f2f9c4
--- /dev/null
+++ b/bsp/buildroot/package/daq/0001-Fix-build-against-the-musl-C-library.patch
@@ -0,0 +1,54 @@
+From 42efa6d76a3b52f35e576a6b941a9afb5b3879e9 Mon Sep 17 00:00:00 2001
+From: Sergio Prado <sergio.prado@e-labworks.com>
+Date: Tue, 9 Jan 2018 21:39:27 -0200
+Subject: [PATCH] Fix build against the musl C library
+
+Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
+---
+ os-daq-modules/daq_ipfw.c | 2 +-
+ os-daq-modules/daq_ipq.c  | 2 +-
+ os-daq-modules/daq_nfq.c  | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/os-daq-modules/daq_ipfw.c b/os-daq-modules/daq_ipfw.c
+index 016beb06ad61..98f67717f646 100644
+--- a/os-daq-modules/daq_ipfw.c
++++ b/os-daq-modules/daq_ipfw.c
+@@ -26,7 +26,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ 
+ #include <netinet/in.h>
+ #include <sys/socket.h>
+diff --git a/os-daq-modules/daq_ipq.c b/os-daq-modules/daq_ipq.c
+index 77ec6e9505e5..b15e5cf82af0 100644
+--- a/os-daq-modules/daq_ipq.c
++++ b/os-daq-modules/daq_ipq.c
+@@ -27,7 +27,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ 
+ #include <netinet/ip.h>
+ 
+diff --git a/os-daq-modules/daq_nfq.c b/os-daq-modules/daq_nfq.c
+index 33021c0ec991..0df1e61c74c4 100644
+--- a/os-daq-modules/daq_nfq.c
++++ b/os-daq-modules/daq_nfq.c
+@@ -27,7 +27,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/time.h>
+-#include <sys/unistd.h>
++#include <unistd.h>
+ 
+ #include <netinet/ip.h>
+ 
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/daq/Config.in b/bsp/buildroot/package/daq/Config.in
new file mode 100644
index 00000000..ad294abd
--- /dev/null
+++ b/bsp/buildroot/package/daq/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_DAQ
+	bool "daq"
+	depends on !BR2_STATIC_LIBS # dlfcn.h
+	help
+	  DAQ is a Data Acquisition library for packet I/O from the
+	  Snort project.
+
+	  https://www.snort.org
+
+comment "daq needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/daq/daq.hash b/bsp/buildroot/package/daq/daq.hash
new file mode 100644
index 00000000..6a0cb5ed
--- /dev/null
+++ b/bsp/buildroot/package/daq/daq.hash
@@ -0,0 +1,5 @@
+# Locally computed:
+sha256 d41da5f7793e66044e6927dd868c0525e7ee4ec1a3515bf74ef9a30cd9273af0  daq-2.0.6.tar.gz
+
+# Hash for license files:
+sha256 07f28289c09fd9eb5a6ff7bc710ff40363601b1bbc6f3637d8ed412150e90819  COPYING
diff --git a/bsp/buildroot/package/daq/daq.mk b/bsp/buildroot/package/daq/daq.mk
new file mode 100644
index 00000000..a23a9dc5
--- /dev/null
+++ b/bsp/buildroot/package/daq/daq.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# daq
+#
+################################################################################
+
+DAQ_VERSION = 2.0.6
+DAQ_SITE = https://www.snort.org/downloads/snort
+DAQ_LICENSE = GPL-2.0
+DAQ_LICENSE_FILES = COPYING
+DAQ_INSTALL_STAGING = YES
+DAQ_DEPENDENCIES = host-bison host-flex
+
+# package does not build in parallel due to improper make rules
+# related to the generation of the tokdefs.h header file
+DAQ_MAKE = $(MAKE1)
+
+# disable ipq module as libipq is deprecated
+DAQ_CONF_OPTS += --disable-ipq-module
+
+ifeq ($(BR2_PACKAGE_LIBDNET)$(BR2_PACKAGE_LIBNETFILTER_QUEUE),yy)
+DAQ_DEPENDENCIES += libdnet libnetfilter_queue
+DAQ_CONF_OPTS += --enable-nfq-module
+else
+DAQ_CONF_OPTS += --disable-nfq-module
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPCAP),y)
+DAQ_DEPENDENCIES += libpcap
+# assume these flags are available to prevent configure from running
+# test programs while cross compiling
+DAQ_CONF_ENV += \
+	ac_cv_lib_pcap_pcap_lib_version=yes \
+	daq_cv_libpcap_version_1x=yes
+DAQ_CONF_OPTS += --enable-pcap-module
+else
+DAQ_CONF_OPTS += --disable-pcap-module
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/dash/0002-histedit-fix-build-with-musl-libc.patch b/bsp/buildroot/package/dash/0002-histedit-fix-build-with-musl-libc.patch
new file mode 100644
index 00000000..a9e4c5ae
--- /dev/null
+++ b/bsp/buildroot/package/dash/0002-histedit-fix-build-with-musl-libc.patch
@@ -0,0 +1,35 @@
+From 2da5b72c704fed10f1b04b5432ac6b078d016fae Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 2 Mar 2018 08:25:36 +0200
+Subject: [PATCH] histedit: fix build with musl libc
+
+musl libc defines the optreset BSD extension only in getopt.h. This
+fixes the following build failure:
+
+histedit.c: In function 'histcmd':
+histedit.c:220:2: error: 'optreset' undeclared (first use in this function)
+  optreset = 1; optind = 1; /* initialize getopt */
+  ^~~~~~~~
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://www.mail-archive.com/dash@vger.kernel.org/msg01389.html
+
+ src/histedit.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/histedit.c b/src/histedit.c
+index 94465d785cc9..f5c90aba873b 100644
+--- a/src/histedit.c
++++ b/src/histedit.c
+@@ -39,6 +39,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <getopt.h>
+ /*
+  * Editline and history functions (and glue).
+  */
+-- 
+2.16.1
+
diff --git a/bsp/buildroot/package/dash/Config.in b/bsp/buildroot/package/dash/Config.in
index af8fba40..b816ac78 100644
--- a/bsp/buildroot/package/dash/Config.in
+++ b/bsp/buildroot/package/dash/Config.in
@@ -3,7 +3,10 @@ config BR2_PACKAGE_DASH
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  The Debian/Linux port of the NetBSD version of
-	  ash (the Almquist SHell).
+	  DASH is a POSIX-compliant implementation of /bin/sh that
+	  aims to be as small as possible. It does this without
+	  sacrificing speed where possible. In fact, it is
+	  significantly faster than bash (the GNU Bourne-Again SHell)
+	  for most tasks.
 
 	  http://gondor.apana.org.au/~herbert/dash
diff --git a/bsp/buildroot/package/dash/dash.hash b/bsp/buildroot/package/dash/dash.hash
index 0198cd83..b5a37b61 100644
--- a/bsp/buildroot/package/dash/dash.hash
+++ b/bsp/buildroot/package/dash/dash.hash
@@ -1,3 +1,2 @@
-# From http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.8-1.dsc
-sha256	c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f	dash_0.5.8.orig.tar.gz
-sha256	d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9	dash_0.5.8-1.diff.gz
+# From http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.9.1.tar.gz.sha256sum
+sha256	5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659	dash-0.5.9.1.tar.gz
diff --git a/bsp/buildroot/package/dash/dash.mk b/bsp/buildroot/package/dash/dash.mk
index ed8525ce..2d415558 100644
--- a/bsp/buildroot/package/dash/dash.mk
+++ b/bsp/buildroot/package/dash/dash.mk
@@ -4,13 +4,29 @@
 #
 ################################################################################
 
-DASH_VERSION = 0.5.8
-DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz
-DASH_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash
-DASH_PATCH = dash_$(DASH_VERSION)-1.diff.gz
-DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c)
+DASH_VERSION = 0.5.9.1
+DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files
+DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c)
 DASH_LICENSE_FILES = COPYING
 
+# dash does not build in parallel
+DASH_MAKE = $(MAKE1)
+
+ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+DASH_DEPENDENCIES += libedit host-pkgconf
+DASH_CONF_OPTS += --with-libedit
+DASH_CONF_ENV += LIBS=`pkg-config --libs libedit`
+
+# Enable line editing, Emacs style
+define DASH_INSTALL_PROFILE
+	mkdir -p $(TARGET_DIR)/etc/profile.d
+	echo 'set -E' > $(TARGET_DIR)/etc/profile.d/dash.sh
+endef
+DASH_POST_INSTALL_TARGET_HOOKS += DASH_INSTALL_PROFILE
+else
+DASH_CONF_OPTS += --without-libedit
+endif
+
 define DASH_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash
 endef
diff --git a/bsp/buildroot/package/dawgdic/dawgdic.mk b/bsp/buildroot/package/dawgdic/dawgdic.mk
index 2f0a53b1..443782c9 100644
--- a/bsp/buildroot/package/dawgdic/dawgdic.mk
+++ b/bsp/buildroot/package/dawgdic/dawgdic.mk
@@ -6,7 +6,7 @@
 
 DAWGDIC_VERSION = 16ac537ba9883ff01b63b6d1fdc3072150c68fee
 DAWGDIC_SITE = $(call github,stil,dawgdic,$(DAWGDIC_VERSION))
-DAWGDIC_LICENSE = BSD-3c
+DAWGDIC_LICENSE = BSD-3-Clause
 DAWGDIC_LICENSE_FILES = COPYING
 DAWGDIC_AUTORECONF = YES
 DAWGDIC_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch b/bsp/buildroot/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch
new file mode 100644
index 00000000..6f3e6242
--- /dev/null
+++ b/bsp/buildroot/package/dbus-cpp/0003-src-pipe.c-fix-build-error-with-gcc-7.x.patch
@@ -0,0 +1,36 @@
+From 167042116f523f90911f3a28c4ec065918d56cc9 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 22 Aug 2017 00:02:52 +0200
+Subject: [PATCH] src/pipe.c: fix build error with gcc 7.x
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The write function takes a char* as argument, not a char.
+
+Fixes:
+
+pipe.cpp: In member function ‘void DBus::Pipe::signal()’:
+pipe.cpp:86:29: error: invalid conversion from ‘char’ to ‘const void*’ [-fpermissive]
+   ::write(_fd_write, '\0', 1);
+                             ^
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/pipe.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pipe.cpp b/src/pipe.cpp
+index 01211b3..d0572c7 100644
+--- a/src/pipe.cpp
++++ b/src/pipe.cpp
+@@ -83,5 +83,5 @@ ssize_t Pipe::read(void *buffer, unsigned int &nbytes)
+ void Pipe::signal()
+ {
+   // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
+-  ::write(_fd_write, '\0', 1);
++  ::write(_fd_write, "\0", 1);
+ }
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/dbus-cpp/dbus-cpp.mk b/bsp/buildroot/package/dbus-cpp/dbus-cpp.mk
index 0b519670..d8468ab8 100644
--- a/bsp/buildroot/package/dbus-cpp/dbus-cpp.mk
+++ b/bsp/buildroot/package/dbus-cpp/dbus-cpp.mk
@@ -23,7 +23,7 @@ HOST_DBUS_CPP_CONF_OPTS = \
 	--disable-ecore \
 	--disable-glib
 DBUS_CPP_AUTORECONF = YES
-DBUS_CPP_LICENSE = LGPLv2.1+
+DBUS_CPP_LICENSE = LGPL-2.1+
 DBUS_CPP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_EFL),y)
diff --git a/bsp/buildroot/package/dbus-glib/dbus-glib.mk b/bsp/buildroot/package/dbus-glib/dbus-glib.mk
index 5a6f5a08..2257c8e4 100644
--- a/bsp/buildroot/package/dbus-glib/dbus-glib.mk
+++ b/bsp/buildroot/package/dbus-glib/dbus-glib.mk
@@ -7,7 +7,7 @@
 DBUS_GLIB_VERSION = 0.108
 DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib
 DBUS_GLIB_INSTALL_STAGING = YES
-DBUS_GLIB_LICENSE = AFLv2.1 or GPLv2+
+DBUS_GLIB_LICENSE = AFL-2.1 or GPL-2.0+
 DBUS_GLIB_LICENSE_FILES = COPYING
 
 DBUS_GLIB_CONF_ENV = \
@@ -39,4 +39,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # dbus-glib for the host
-DBUS_GLIB_HOST_BINARY = $(HOST_DIR)/usr/bin/dbus-binding-tool
+DBUS_GLIB_HOST_BINARY = $(HOST_DIR)/bin/dbus-binding-tool
diff --git a/bsp/buildroot/package/dbus-python/dbus-python.mk b/bsp/buildroot/package/dbus-python/dbus-python.mk
index 599d0198..da04b740 100644
--- a/bsp/buildroot/package/dbus-python/dbus-python.mk
+++ b/bsp/buildroot/package/dbus-python/dbus-python.mk
@@ -16,14 +16,14 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
 DBUS_PYTHON_DEPENDENCIES += python host-python
 
 DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	PYTHON=$(HOST_DIR)/bin/python2 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
 	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`"
 else
 DBUS_PYTHON_DEPENDENCIES += python3 host-python3
 
 DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/usr/bin/python3 \
+	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`"
 endif
diff --git a/bsp/buildroot/package/dbus-triggerd/Config.in b/bsp/buildroot/package/dbus-triggerd/Config.in
index a39f911f..331c4147 100644
--- a/bsp/buildroot/package/dbus-triggerd/Config.in
+++ b/bsp/buildroot/package/dbus-triggerd/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_DBUS_TRIGGERD
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_PACKAGE_DBUS
 	help
-	  dbus-triggerd is a tool to trigger shell-commands upon receiving
-	  a given dbus-signal.
+	  dbus-triggerd is a tool to trigger shell-commands upon
+	  receiving a given dbus-signal.
 
 	  http://gareus.org/oss/dbustriggerd/start
 
diff --git a/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.hash b/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.hash
new file mode 100644
index 00000000..aa4ad979
--- /dev/null
+++ b/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 3c6d865427bf1b93b16323c796ed6957ce6b2b6fd53f518b1b082d03b939102c  dbus-triggerd-ba3dbec805cb707c94c54de21666bf18b79bcc09.tar.gz
diff --git a/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.mk b/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.mk
index 0d693b48..7d73a6c9 100644
--- a/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.mk
+++ b/bsp/buildroot/package/dbus-triggerd/dbus-triggerd.mk
@@ -6,7 +6,7 @@
 
 DBUS_TRIGGERD_VERSION = ba3dbec805cb707c94c54de21666bf18b79bcc09
 DBUS_TRIGGERD_SITE = git://rg42.org/dbustriggerd.git
-DBUS_TRIGGERD_LICENSE = GPLv2+
+DBUS_TRIGGERD_LICENSE = GPL-2.0+
 DBUS_TRIGGERD_LICENSE_FILES = dbus-triggerd.c
 DBUS_TRIGGERD_DEPENDENCIES = host-pkgconf dbus
 
diff --git a/bsp/buildroot/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch b/bsp/buildroot/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
deleted file mode 100644
index fd9e01da..00000000
--- a/bsp/buildroot/package/dbus/0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1252dc1d1f465b8ab6b36ff7252e395e66a040cf Mon Sep 17 00:00:00 2001
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 21 Jul 2017 10:46:39 +0100
-Subject: [PATCH 1/2] config-loader-expat: Tell Expat not to defend against
- hash collisions
-
-By default, Expat uses cryptographic-quality random numbers as a salt for
-its hash algorithm, and since 2.2.1 it gets them from the getrandom
-syscall on Linux. That syscall refuses to return any entropy until the
-kernel's CSPRNG (random pool) has been initialized. Unfortunately, this
-can take as long as 40 seconds on embedded devices with few entropy
-sources, which is too long: if the system dbus-daemon blocks for that
-length of time, important D-Bus clients like systemd and systemd-logind
-time out and fail to connect to it.
-
-We're parsing small configuration files here, and we trust them
-completely, so we don't need to defend against hash collisions: nobody
-is going to be crafting them to cause pathological performance.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101858
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Tested-by: Christopher Hewitt <hewitt@ieee.org>
-Reviewed-by: Philip Withnall <withnall@endlessm.com>
-
-Upstream commit 1252dc1d1f465b8ab6b36ff7252e395e66a040cf
-Signed-off-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
----
- bus/config-loader-expat.c | 14 ++++++++++++++
- configure.ac              |  8 ++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c
-index b571fda3..27cbe2d0 100644
---- a/bus/config-loader-expat.c
-+++ b/bus/config-loader-expat.c
-@@ -203,6 +203,20 @@ bus_config_load (const DBusString      *file,
-       goto failed;
-     }
- 
-+  /* We do not need protection against hash collisions (CVE-2012-0876)
-+   * because we are only parsing trusted XML; and if we let Expat block
-+   * waiting for the CSPRNG to be initialized, as it does by default to
-+   * defeat CVE-2012-0876, it can cause timeouts during early boot on
-+   * entropy-starved embedded devices.
-+   *
-+   * TODO: When Expat gets a more explicit API for this than
-+   * XML_SetHashSalt, check for that too, and use it preferentially.
-+   * https://github.com/libexpat/libexpat/issues/91 */
-+#if defined(HAVE_XML_SETHASHSALT)
-+  /* Any nonzero number will do. https://xkcd.com/221/ */
-+  XML_SetHashSalt (expat, 4);
-+#endif
-+
-   if (!_dbus_string_get_dirname (file, &dirname))
-     {
-       dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
-diff --git a/configure.ac b/configure.ac
-index 52da11fb..c4022ed7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -938,6 +938,14 @@ XML_CFLAGS=
- AC_SUBST([XML_CFLAGS])
- AC_SUBST([XML_LIBS])
- 
-+save_cflags="$CFLAGS"
-+save_libs="$LIBS"
-+CFLAGS="$CFLAGS $XML_CFLAGS"
-+LIBS="$LIBS $XML_LIBS"
-+AC_CHECK_FUNCS([XML_SetHashSalt])
-+CFLAGS="$save_cflags"
-+LIBS="$save_libs"
-+
- # Thread lib detection
- AC_ARG_VAR([THREAD_LIBS])
- save_libs="$LIBS"
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/dbus/dbus.hash b/bsp/buildroot/package/dbus/dbus.hash
index af8143d3..1aa5aa44 100644
--- a/bsp/buildroot/package/dbus/dbus.hash
+++ b/bsp/buildroot/package/dbus/dbus.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388  dbus-1.10.16.tar.gz
+# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.2.tar.gz.asc
+sha256	272bb5091770b047c8188b926d5e6038fa4fe6745488b2add96b23e2d9a83d88  dbus-1.12.2.tar.gz
+# Locally calculated
+sha256	0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1  COPYING
diff --git a/bsp/buildroot/package/dbus/dbus.mk b/bsp/buildroot/package/dbus/dbus.mk
index 09e261e4..22ba22e1 100644
--- a/bsp/buildroot/package/dbus/dbus.mk
+++ b/bsp/buildroot/package/dbus/dbus.mk
@@ -4,11 +4,9 @@
 #
 ################################################################################
 
-DBUS_VERSION = 1.10.16
-DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
-DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools)
-# 0001-config-loader-expat-Tell-Expat-not-to-defend-against.patch
-DBUS_AUTORECONF = YES
+DBUS_VERSION = 1.12.2
+DBUS_SITE = https://dbus.freedesktop.org/releases/dbus
+DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools)
 DBUS_LICENSE_FILES = COPYING
 DBUS_INSTALL_STAGING = YES
 
@@ -22,20 +20,15 @@ endef
 
 DBUS_DEPENDENCIES = host-pkgconf expat
 
-DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes
 DBUS_CONF_OPTS = \
 	--with-dbus-user=dbus \
 	--disable-tests \
 	--disable-asserts \
-	--enable-abstract-sockets \
-	--disable-selinux \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
-	--disable-dnotify \
 	--with-xml=expat \
 	--with-system-socket=/var/run/dbus/system_bus_socket \
-	--with-system-pid-file=/var/run/messagebus.pid \
-	--with-init-scripts=none
+	--with-system-pid-file=/var/run/messagebus.pid
 
 ifeq ($(BR2_STATIC_LIBS),y)
 DBUS_CONF_OPTS += LIBS='-pthread'
@@ -111,11 +104,9 @@ HOST_DBUS_CONF_OPTS = \
 	--with-dbus-user=dbus \
 	--disable-tests \
 	--disable-asserts \
-	--enable-abstract-sockets \
 	--disable-selinux \
 	--disable-xml-docs \
 	--disable-doxygen-docs \
-	--enable-dnotify \
 	--without-x \
 	--with-xml=expat
 
@@ -123,7 +114,7 @@ HOST_DBUS_CONF_OPTS = \
 DBUS_HOST_INTROSPECT = $(HOST_DBUS_DIR)/introspect.xml
 
 HOST_DBUS_GEN_INTROSPECT = \
-	$(HOST_DIR)/usr/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT)
+	$(HOST_DIR)/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT)
 
 HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT
 
diff --git a/bsp/buildroot/package/dc3dd/0001-no_man.patch b/bsp/buildroot/package/dc3dd/0001-no_man.patch
new file mode 100644
index 00000000..9fefc8ca
--- /dev/null
+++ b/bsp/buildroot/package/dc3dd/0001-no_man.patch
@@ -0,0 +1,15 @@
+Remove the man directory to the subdirs to prevent building the man pages
+
+Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
+
+--- a/Makefile.am	2017-03-27 09:53:19.988820588 +0200
++++ b/Makefile.am	2017-03-27 09:54:14.325817466 +0200
+@@ -15,7 +15,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-SUBDIRS = lib src man po
++SUBDIRS = lib src po
+ EXTRA_DIST = cfg.mk maint.mk \
+   .prev-version THANKS-to-translators THANKStt.in \
+   .version \
diff --git a/bsp/buildroot/package/dc3dd/0002-fix-autoreconf.patch b/bsp/buildroot/package/dc3dd/0002-fix-autoreconf.patch
new file mode 100644
index 00000000..85e0a365
--- /dev/null
+++ b/bsp/buildroot/package/dc3dd/0002-fix-autoreconf.patch
@@ -0,0 +1,32 @@
+Remove use of AM_C_PROTOTYPES to fix autoreconf
+
+The AM_C_PROTOTYPES macro no longer exists since automake 1.12. It
+existed to support de-ANSI-fication of code using ansi2knr. It was
+simply removed from coreutils m4/jm-macros.m4 in commit
+88873501cff9ed937edf969cedd693517ab0a293, but this change was not
+propagated to dc3dd, causing an autoreconf failure:
+
+configure.ac:45: error: automatic de-ANSI-fication support has been removed
+/home/peko/autobuild/instance-0/output/host/usr/share/aclocal-1.15/obsolete.m4:26: AM_C_PROTOTYPES is expanded from...
+m4/jm-macros.m4:124: gl_CHECK_ALL_TYPES is expanded from...
+m4/jm-macros.m4:22: coreutils_MACROS is expanded from...
+configure.ac:45: the top level
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/m4/jm-macros.m4
+===================================================================
+--- a/m4/jm-macros.m4
++++ b/m4/jm-macros.m4
+@@ -128,11 +128,6 @@
+   dnl whether functions and headers are available, whether they work, etc.
+   AC_REQUIRE([AC_SYS_LARGEFILE])
+ 
+-  dnl This test must precede tests of compiler characteristics like
+-  dnl that for the inline keyword, since it may change the degree to
+-  dnl which the compiler supports such features.
+-  AC_REQUIRE([AM_C_PROTOTYPES])
+-
+   dnl Checks for typedefs, structures, and compiler characteristics.
+   AC_REQUIRE([AC_C_BIGENDIAN])
+   AC_REQUIRE([AC_C_VOLATILE])
diff --git a/bsp/buildroot/package/dc3dd/Config.in b/bsp/buildroot/package/dc3dd/Config.in
new file mode 100644
index 00000000..0383897c
--- /dev/null
+++ b/bsp/buildroot/package/dc3dd/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_DC3DD
+	bool "dc3dd"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_USES_MUSL
+	help
+	  dc3dd is a patch to the GNU dd program, this version has
+	  several features intended for forensic acquisition of data.
+	  Highlights include hashing on-the-fly, split output files,
+	  pattern writing, a progress meter, and file verification.
+
+	  https://sourceforge.net/projects/dc3dd/
+
+comment "dc3dd needs a glibc or uClibc toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_TOOLCHAIN_USES_MUSL
diff --git a/bsp/buildroot/package/dc3dd/dc3dd.hash b/bsp/buildroot/package/dc3dd/dc3dd.hash
new file mode 100644
index 00000000..5490d8d3
--- /dev/null
+++ b/bsp/buildroot/package/dc3dd/dc3dd.hash
@@ -0,0 +1,4 @@
+# From https://sourceforge.net/projects/dc3dd/files/dc3dd/7.2/
+sha1 1bfe81a921a8473a6ecb46f328ecaab761afb55d dc3dd-7.2.641.tar.xz
+# Locally computed
+sha256 7f50aadc38649845ab11014d11013928411c9d2128c941e9630939d4c28cae6d  dc3dd-7.2.641.tar.xz
diff --git a/bsp/buildroot/package/dc3dd/dc3dd.mk b/bsp/buildroot/package/dc3dd/dc3dd.mk
new file mode 100644
index 00000000..cc89bb63
--- /dev/null
+++ b/bsp/buildroot/package/dc3dd/dc3dd.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# dc3dd
+#
+################################################################################
+
+DC3DD_VERSION_MAJOR = 7.2
+DC3DD_VERSION = $(DC3DD_VERSION_MAJOR).641
+DC3DD_SOURCE = dc3dd-$(DC3DD_VERSION).tar.xz
+DC3DD_SITE = https://downloads.sourceforge.net/project/dc3dd/dc3dd/$(DC3DD_VERSION_MAJOR)
+DC3DD_LICENSE = GPL-3.0+
+DC3DD_LICENSE_FILES = COPYING
+# We are patching Makefile.am, so we need to autoreconf. We also need to
+# enable gettextize as dc3dd comes with an old gettext infra.
+DC3DD_AUTORECONF = YES
+DC3DD_GETTEXTIZE = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ddrescue/Config.in b/bsp/buildroot/package/ddrescue/Config.in
index 2ec3e7e3..a58561cb 100644
--- a/bsp/buildroot/package/ddrescue/Config.in
+++ b/bsp/buildroot/package/ddrescue/Config.in
@@ -2,9 +2,9 @@ config BR2_PACKAGE_DDRESCUE
 	bool "ddrescue"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  GNU ddrescue is a data recovery tool. It copies data from one file
-	  or block device (hard disc, cdrom, etc) to another, trying to
-	  rescue the good parts first in case of read errors.
+	  GNU ddrescue is a data recovery tool. It copies data from one
+	  file or block device (hard disc, cdrom, etc) to another,
+	  trying to rescue the good parts first in case of read errors.
 
 	  http://www.gnu.org/software/ddrescue/ddrescue.html
 
diff --git a/bsp/buildroot/package/ddrescue/ddrescue.mk b/bsp/buildroot/package/ddrescue/ddrescue.mk
index 4e244e6b..9432e7a1 100644
--- a/bsp/buildroot/package/ddrescue/ddrescue.mk
+++ b/bsp/buildroot/package/ddrescue/ddrescue.mk
@@ -7,7 +7,7 @@
 DDRESCUE_VERSION = 1.22
 DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz
 DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue
-DDRESCUE_LICENSE = GPLv2+
+DDRESCUE_LICENSE = GPL-2.0+
 DDRESCUE_LICENSE_FILES = COPYING
 
 define DDRESCUE_CONFIGURE_CMDS
diff --git a/bsp/buildroot/package/debianutils/debianutils.mk b/bsp/buildroot/package/debianutils/debianutils.mk
index 83cf7444..86f201da 100644
--- a/bsp/buildroot/package/debianutils/debianutils.mk
+++ b/bsp/buildroot/package/debianutils/debianutils.mk
@@ -10,7 +10,7 @@ DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/po
 DEBIANUTILS_CONF_OPTS = --exec-prefix=/
 # Make sure we override the busybox tools, such as which
 DEBIANUTILS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-DEBIANUTILS_LICENSE = GPLv2+, SMAIL (savelog)
+DEBIANUTILS_LICENSE = GPL-2.0+, SMAIL (savelog)
 DEBIANUTILS_LICENSE_FILES = debian/copyright
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/dejavu/dejavu.hash b/bsp/buildroot/package/dejavu/dejavu.hash
index 37868c13..db7365a1 100644
--- a/bsp/buildroot/package/dejavu/dejavu.hash
+++ b/bsp/buildroot/package/dejavu/dejavu.hash
@@ -1,2 +1,2 @@
-# From http://dejavu-fonts.org/wiki/Download
-sha256	f6d7965586101ff3a8a5c3ec503e082bb6a9604ff53413e10702e5917c194d88	dejavu-fonts-ttf-2.35.tar.bz2
+# From https://dejavu-fonts.github.io/Download.html
+sha256 fa9ca4d13871dd122f61258a80d01751d603b4d3ee14095d65453b4e846e17d7  dejavu-fonts-ttf-2.37.tar.bz2
diff --git a/bsp/buildroot/package/dejavu/dejavu.mk b/bsp/buildroot/package/dejavu/dejavu.mk
index 3dbcc94e..9b57f099 100644
--- a/bsp/buildroot/package/dejavu/dejavu.mk
+++ b/bsp/buildroot/package/dejavu/dejavu.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DEJAVU_VERSION = 2.35
-DEJAVU_SITE = http://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION)
+DEJAVU_VERSION = 2.37
+DEJAVU_SITE = https://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION)
 DEJAVU_SOURCE = dejavu-fonts-ttf-$(DEJAVU_VERSION).tar.bz2
 DEJAVU_LICENSE_FILES = LICENSE
 
diff --git a/bsp/buildroot/package/devmem2/devmem2.hash b/bsp/buildroot/package/devmem2/devmem2.hash
index fff5306b..aa638d63 100644
--- a/bsp/buildroot/package/devmem2/devmem2.hash
+++ b/bsp/buildroot/package/devmem2/devmem2.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639  devmem2.c
+sha256 560913d09310d446920c16bd0aca1ff21d3b6fedd527195bacfc832ce343e0ae  devmem2.c.license
diff --git a/bsp/buildroot/package/devmem2/devmem2.mk b/bsp/buildroot/package/devmem2/devmem2.mk
index 7f0594e2..eb92db60 100644
--- a/bsp/buildroot/package/devmem2/devmem2.mk
+++ b/bsp/buildroot/package/devmem2/devmem2.mk
@@ -7,13 +7,18 @@
 DEVMEM2_SITE = http://free-electrons.com/pub/mirror
 DEVMEM2_SOURCE = devmem2.c
 DEVMEM2_VERSION = 1
-DEVMEM2_LICENSE = GPLv2+
-DEVMEM2_LICENSE_FILES = devmem2.c
+DEVMEM2_LICENSE = GPL-2.0+
+DEVMEM2_LICENSE_FILES = devmem2.c.license
 
 define DEVMEM2_EXTRACT_CMDS
 	cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
 endef
 
+define DEVMEM2_EXTRACT_LICENSE
+	head -n 38 $(@D)/devmem2.c >$(@D)/devmem2.c.license
+endef
+DEVMEM2_PRE_PATCH_HOOKS += DEVMEM2_EXTRACT_LICENSE
+
 define DEVMEM2_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) devmem2
 endef
diff --git a/bsp/buildroot/package/dfu-util/Config.in b/bsp/buildroot/package/dfu-util/Config.in
new file mode 100644
index 00000000..201c8a7c
--- /dev/null
+++ b/bsp/buildroot/package/dfu-util/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_DFU_UTIL
+	bool "dfu-util"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Dfu-util is the host side implementation of the DFU 1.0
+	  specification of the USB forum. DFU is intended to download
+	  and upload firmware to devices connected over USB.
+
+	  http://dfu-util.sourceforge.net/
+
+comment "dfu-util needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/dfu-util/dfu-util.mk b/bsp/buildroot/package/dfu-util/dfu-util.mk
index 079f8759..5e8ba5a8 100644
--- a/bsp/buildroot/package/dfu-util/dfu-util.mk
+++ b/bsp/buildroot/package/dfu-util/dfu-util.mk
@@ -6,9 +6,11 @@
 
 DFU_UTIL_VERSION = 0.9
 DFU_UTIL_SITE = http://dfu-util.sourceforge.net/releases
-DFU_UTIL_LICENSE = GPLv2+
+DFU_UTIL_LICENSE = GPL-2.0+
 DFU_UTIL_LICENSE_FILES = COPYING
 
+DFU_UTIL_DEPENDENCIES = libusb
 HOST_DFU_UTIL_DEPENDENCIES = host-libusb
 
+$(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/dhcp/Config.in b/bsp/buildroot/package/dhcp/Config.in
index 398b9754..53408309 100644
--- a/bsp/buildroot/package/dhcp/Config.in
+++ b/bsp/buildroot/package/dhcp/Config.in
@@ -27,7 +27,6 @@ config BR2_PACKAGE_DHCP_RELAY
 	help
 	  DHCP relay agent from the ISC DHCP distribution.
 
-
 config BR2_PACKAGE_DHCP_CLIENT
 	bool "dhcp client"
 	help
diff --git a/bsp/buildroot/package/dhcpcd/S41dhcpcd b/bsp/buildroot/package/dhcpcd/S41dhcpcd
new file mode 100755
index 00000000..a2e87ca0
--- /dev/null
+++ b/bsp/buildroot/package/dhcpcd/S41dhcpcd
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Start/stop dhcpcd
+#
+
+DAEMON=/sbin/dhcpcd
+CONFIG=/etc/dhcpcd.conf
+PIDFILE=/var/run/dhcpcd.pid
+
+[ -x $DAEMON ] || exit 0
+[ -f $CONFIG ] || exit 0
+
+case "$1" in
+  start)
+	echo "Starting dhcpcd..."
+	start-stop-daemon -S -x "$DAEMON" -p "$PIDFILE" -- -f "$CONFIG"
+	;;
+  stop)
+	echo "Stopping dhcpcd..."
+	start-stop-daemon -K -x "$DAEMON" -p "$PIDFILE" -o
+	;;
+  reload|force-reload)
+	echo "Reloading dhcpcd configuration..."
+	"$DAEMON" -s reload
+	;;
+  restart)
+	"$0" stop
+	sleep 1 # Prevent race condition: ensure dhcpcd stops before start.
+	"$0" start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}"
+	exit 1
+esac
diff --git a/bsp/buildroot/package/dhcpcd/dhcpcd.mk b/bsp/buildroot/package/dhcpcd/dhcpcd.mk
index 2d446fb7..dc5c69b8 100644
--- a/bsp/buildroot/package/dhcpcd/dhcpcd.mk
+++ b/bsp/buildroot/package/dhcpcd/dhcpcd.mk
@@ -8,7 +8,7 @@ DHCPCD_VERSION = 6.11.5
 DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz
 DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
 DHCPCD_DEPENDENCIES = host-pkgconf
-DHCPCD_LICENSE = BSD-2c
+DHCPCD_LICENSE = BSD-2-Clause
 DHCPCD_LICENSE_FILES = dhcpcd.c
 
 ifeq ($(BR2_STATIC_LIBS),y)
@@ -36,6 +36,19 @@ define DHCPCD_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
 endef
 
+define DHCPCD_INSTALL_INIT_SYSV
+	$(INSTALL) -m 755 -D package/dhcpcd/S41dhcpcd \
+		$(TARGET_DIR)/etc/init.d/S41dhcpcd
+endef
+
+define DHCPCD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 package/dhcpcd/dhcpcd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/dhcpcd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/dhcpcd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpcd.service
+endef
+
 # NOTE: Even though this package has a configure script, it is not generated
 # using the autotools, so we have to use the generic package infrastructure.
 
diff --git a/bsp/buildroot/package/dhcpcd/dhcpcd.service b/bsp/buildroot/package/dhcpcd/dhcpcd.service
new file mode 100644
index 00000000..0552b5c7
--- /dev/null
+++ b/bsp/buildroot/package/dhcpcd/dhcpcd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=DHCP client
+After=network.target
+
+[Service]
+Type=forking
+EnvironmentFile=-/etc/default/dhcpcd
+PIDFile=/var/run/dhcpcd.pid
+ExecStart=/sbin/dhcpcd $DAEMON_ARGS
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bsp/buildroot/package/dhcpdump/dhcpdump.mk b/bsp/buildroot/package/dhcpdump/dhcpdump.mk
index 3584f4f2..96f23196 100644
--- a/bsp/buildroot/package/dhcpdump/dhcpdump.mk
+++ b/bsp/buildroot/package/dhcpdump/dhcpdump.mk
@@ -7,7 +7,7 @@
 DHCPDUMP_VERSION = 1.8
 DHCPDUMP_SITE = http://www.mavetju.org/download
 DHCPDUMP_DEPENDENCIES = libpcap
-DHCPDUMP_LICENSE = BSD-2c
+DHCPDUMP_LICENSE = BSD-2-Clause
 DHCPDUMP_LICENSE_FILES = LICENSE
 
 DHCPDUMP_LIBS = -lpcap
diff --git a/bsp/buildroot/package/dialog/Config.in b/bsp/buildroot/package/dialog/Config.in
index 73b71766..830427e5 100644
--- a/bsp/buildroot/package/dialog/Config.in
+++ b/bsp/buildroot/package/dialog/Config.in
@@ -6,8 +6,9 @@ config BR2_PACKAGE_DIALOG
 	help
 	  dialog - display dialog boxes from shell scripts
 
-	  This application provides a method of displaying several different
-	  types of dialog boxes from shell scripts. This allows a developer
-	  of a script to interact with the user in a much friendlier manner.
+	  This application provides a method of displaying several
+	  different types of dialog boxes from shell scripts. This
+	  allows a developer of a script to interact with the user in a
+	  much friendlier manner.
 
 	  http://invisible-island.net/dialog/dialog.html
diff --git a/bsp/buildroot/package/dialog/dialog.hash b/bsp/buildroot/package/dialog/dialog.hash
index 75a79189..ac427846 100644
--- a/bsp/buildroot/package/dialog/dialog.hash
+++ b/bsp/buildroot/package/dialog/dialog.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	1d98ec7cc81f11f9019fa0b90f1afdaa86579cae1ce8869a6fd61deb9d4b887a	dialog-1.2-20150125.tgz
+sha256 2ff1ba74c632b9d13a0d0d2c942295dd4e8909694eeeded7908a467d0bcd4756  dialog-1.3-20170509.tgz
diff --git a/bsp/buildroot/package/dialog/dialog.mk b/bsp/buildroot/package/dialog/dialog.mk
index 13187709..73fabe07 100644
--- a/bsp/buildroot/package/dialog/dialog.mk
+++ b/bsp/buildroot/package/dialog/dialog.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-DIALOG_VERSION = 1.2-20150125
+DIALOG_VERSION = 1.3-20170509
 DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz
 DIALOG_SITE = ftp://ftp.invisible-island.net/dialog
 DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \
 	--disable-rpath-hack
 DIALOG_DEPENDENCIES = host-pkgconf ncurses
-DIALOG_LICENSE = LGPLv2.1
+DIALOG_LICENSE = LGPL-2.1
 DIALOG_LICENSE_FILES = COPYING
 
 ifneq ($(BR2_ENABLE_LOCALE),y)
diff --git a/bsp/buildroot/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch b/bsp/buildroot/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch
new file mode 100644
index 00000000..b475e5c4
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/0001-Do-not-use-includedir-as-include-search-path-for-bui.patch
@@ -0,0 +1,62 @@
+From fbc9b7c3b83a99ac996c0a268487d1f800630328 Mon Sep 17 00:00:00 2001
+From: Julien Viard de Galbert <julien@vdg.name>
+Date: Wed, 8 Feb 2017 21:26:58 +0100
+Subject: [PATCH] Do not use includedir as include search path for build
+
+--includedir is not used to specify where a program should
+look for headers of libraries, but to tell where it should
+install its own headers.
+
+Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
+---
+ configure.ac             | 6 +++---
+ dieharder/Makefile.am    | 2 +-
+ libdieharder/Makefile.am | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b336115..91f7c64 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,9 +96,9 @@ AC_TYPE_SIZE_T
+ AC_C_VOLATILE
+ AC_C_INLINE
+ 
+-DIEHARDER_CFLAGS="-I$includedir"
+-dieharder_CFLAGS="-std=c99 -Wall -pedantic -I$includedir"
+-libdieharder_lo_CFLAGS="-Wall -pedantic -I$includedir"
++DIEHARDER_CFLAGS=""
++dieharder_CFLAGS="-std=c99 -Wall -pedantic"
++libdieharder_lo_CFLAGS="-Wall -pedantic"
+ DIEHARDER_LIBS="-L$libdir -ldieharder"
+ ACLOCAL_AMFLAGS="-I m4"
+ 
+diff --git a/dieharder/Makefile.am b/dieharder/Makefile.am
+index e6fbff2..7bdac5c 100644
+--- a/dieharder/Makefile.am
++++ b/dieharder/Makefile.am
+@@ -64,7 +64,7 @@ DEFINES = -DVERSION=$(VERSION)
+ # CC = gcc
+ 
+ # Compile flags (use fairly standard -O3 as default)
+-AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES) -I ${includedir}
++AM_CPPFLAGS = -I ${top_srcdir}/include $(DEFINES)
+ AM_CFLAGS = -O3
+ 
+ # Load flags (optional)
+diff --git a/libdieharder/Makefile.am b/libdieharder/Makefile.am
+index 5fd3396..0873f9c 100644
+--- a/libdieharder/Makefile.am
++++ b/libdieharder/Makefile.am
+@@ -114,7 +114,7 @@ DEFINES = -DVERSION=$(VERSION) -DLITTLE_ENDIAN=$(LITTLE_ENDIAN)
+ # CC = gcc
+ 
+ # Compile flags (use fairly standard -O3 as default)
+-AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include -I ${includedir}
++AM_CPPFLAGS = $(DEFINES) -I ${top_srcdir}/include
+ AM_CFLAGS = -O3 -Wall -pedantic -Wno-unused-variable 
+ 
+ #========================================================================
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/dieharder/0002-Fix-missing-type-intptr_t.patch b/bsp/buildroot/package/dieharder/0002-Fix-missing-type-intptr_t.patch
new file mode 100644
index 00000000..12ea5e7f
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/0002-Fix-missing-type-intptr_t.patch
@@ -0,0 +1,27 @@
+From 6f550841943f19612af064b3d3a1db134078e03c Mon Sep 17 00:00:00 2001
+From: Julien Viard de Galbert <julien@vdg.name>
+Date: Sat, 14 Jan 2017 14:18:10 +0100
+Subject: [PATCH] Fix missing type intptr_t
+
+With glibc-2.23 unistd.h need intptr_t when __USE_MISC is defined.
+
+Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
+---
+ include/dieharder/libdieharder.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h
+index 2138ebf..d98b758 100644
+--- a/include/dieharder/libdieharder.h
++++ b/include/dieharder/libdieharder.h
+@@ -17,6 +17,7 @@
+ 
+ /* This turns on uint macro in c99 */
+ #define __USE_MISC 1
++#include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch b/bsp/buildroot/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch
new file mode 100644
index 00000000..d71cd574
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/0003-Add-_GNU_SOURCE-for-uint-and-M_PI-with-musl-libc.patch
@@ -0,0 +1,28 @@
+From 526510a27ef47a16699dd34a2373ad9b6bb5e8f3 Mon Sep 17 00:00:00 2001
+From: Julien Viard de Galbert <julien@vdg.name>
+Date: Sat, 14 Jan 2017 14:19:47 +0100
+Subject: [PATCH] Add _GNU_SOURCE for uint and M_PI with musl libc
+
+When building with musl libc _GNU_SOURCE need to be defined
+to provide uint type and M_PI macro
+
+Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
+---
+ include/dieharder/libdieharder.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/dieharder/libdieharder.h b/include/dieharder/libdieharder.h
+index d98b758..c1a5023 100644
+--- a/include/dieharder/libdieharder.h
++++ b/include/dieharder/libdieharder.h
+@@ -17,6 +17,7 @@
+ 
+ /* This turns on uint macro in c99 */
+ #define __USE_MISC 1
++#define _GNU_SOURCE 1
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/dieharder/0004-Add-static-to-inline-functions.patch b/bsp/buildroot/package/dieharder/0004-Add-static-to-inline-functions.patch
new file mode 100644
index 00000000..64cde1d2
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/0004-Add-static-to-inline-functions.patch
@@ -0,0 +1,65 @@
+From 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001
+From: Julien Viard de Galbert <julien@vdg.name>
+Date: Tue, 27 Jun 2017 00:16:11 +0200
+Subject: [PATCH] Add static to inline functions
+
+This is needed to avoid a link error where the inline functions appear
+missing at link time.
+From c99 standard inline function should either be declared static or
+have an extern instance in a c file for linking.
+This fix is necessary to build with gcc 7; for some reason it was not
+trigerred before.
+
+Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
+---
+ libdieharder/dab_filltree.c  | 4 ++--
+ libdieharder/dab_filltree2.c | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c
+index 9cc5ce7..a377c3d 100644
+--- a/libdieharder/dab_filltree.c
++++ b/libdieharder/dab_filltree.c
+@@ -34,7 +34,7 @@ static double targetData[] = {
+ 0.0, 0.0, 0.0, 0.0, 0.13333333, 0.20000000, 0.20634921, 0.17857143, 0.13007085, 0.08183633, 0.04338395, 0.01851828, 0.00617270, 0.00151193, 0.00023520, 0.00001680, 0.00000000, 0.00000000, 0.00000000, 0.00000000
+ };
+ 
+-inline int insert(double x, double *array, unsigned int startVal);
++static inline int insert(double x, double *array, unsigned int startVal);
+ 
+ int dab_filltree(Test **test,int irun) {
+  int size = (ntuple == 0) ? 32 : ntuple;
+@@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) {
+ }
+ 
+ 
+-inline int insert(double x, double *array, unsigned int startVal) {
++static inline int insert(double x, double *array, unsigned int startVal) {
+  uint d = (startVal + 1) / 2;
+  uint i = startVal;
+  while (d > 0) {
+diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c
+index 1e33af2..59cbd52 100644
+--- a/libdieharder/dab_filltree2.c
++++ b/libdieharder/dab_filltree2.c
+@@ -92,7 +92,7 @@ static double targetData[128] = {  // size=128, generated from 6e9 samples
+ 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,
+ };
+ 
+-inline int insertBit(uint x, uchar *array, uint *i, uint *d);
++static inline int insertBit(uint x, uchar *array, uint *i, uint *d);
+ 
+ int dab_filltree2(Test **test, int irun) {
+  int size = (ntuple == 0) ? 128 : ntuple;
+@@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) {
+  * The function returns >= 0 if the path went too deep; the
+  * returned value is the last position of the path.
+  */
+-inline int insertBit(uint x, uchar *array, uint *i, uint *d) {
++static inline int insertBit(uint x, uchar *array, uint *i, uint *d) {
+  if (x != 0) {
+    *i += *d;
+  } else {
+-- 
+2.13.2
+
diff --git a/bsp/buildroot/package/dieharder/Config.in b/bsp/buildroot/package/dieharder/Config.in
new file mode 100644
index 00000000..e7a9f546
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_DIEHARDER
+	bool "dieharder"
+	select BR2_PACKAGE_GSL
+	help
+	  dieharder is a fairly involved random number/uniform deviate
+	  generator tester. It is thus suitable for use in testing
+	  both software RNG's and hardware RNG's.
+
+	  http://www.phy.duke.edu/~rgb/General/dieharder.php
diff --git a/bsp/buildroot/package/dieharder/dieharder.hash b/bsp/buildroot/package/dieharder/dieharder.hash
new file mode 100644
index 00000000..eefe4b71
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/dieharder.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 6cff0ff8394c553549ac7433359ccfc955fb26794260314620dfa5e4cd4b727f dieharder-3.31.1.tgz
diff --git a/bsp/buildroot/package/dieharder/dieharder.mk b/bsp/buildroot/package/dieharder/dieharder.mk
new file mode 100644
index 00000000..c3eee645
--- /dev/null
+++ b/bsp/buildroot/package/dieharder/dieharder.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# dieharder
+#
+################################################################################
+
+DIEHARDER_VERSION = 3.31.1
+DIEHARDER_SITE = http://www.phy.duke.edu/~rgb/General/dieharder
+DIEHARDER_SOURCE = dieharder-$(DIEHARDER_VERSION).tgz
+DIEHARDER_STRIP_COMPONENTS = 2
+DIEHARDER_LICENSE = GPL-2.0 with beverage clause
+DIEHARDER_LICENSE_FILES = COPYING
+DIEHARDER_DEPENDENCIES = gsl
+
+# The original configure does not use variables provided in the
+# environment so _CONF_ENV does not work. (_CONF_OPTS does).
+#
+# Finally, we patch configure.ac and some Makefile.am so we need to
+# autoreconf anyway
+DIEHARDER_AUTORECONF = YES
+
+# The m4/*.m4 files are symlinks to /usr/share, which clearly doesn't
+# work, and doing an autoreconf does not replace them.
+define DIEHARDER_M4_CLEAN
+	rm -f $(@D)/m4/*.m4
+endef
+DIEHARDER_POST_PATCH_HOOKS += DIEHARDER_M4_CLEAN
+
+# fix endianness detection
+ifeq ($(BR2_ENDIAN),"BIG")
+DIEHARDER_CONF_ENV = ac_cv_c_endian=big
+else
+DIEHARDER_CONF_ENV = ac_cv_c_endian=little
+endif
+
+# parallel build fail, disable it
+DIEHARDER_MAKE = $(MAKE1)
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/diffutils/Config.in b/bsp/buildroot/package/diffutils/Config.in
index 97cb38b8..3c38f25f 100644
--- a/bsp/buildroot/package/diffutils/Config.in
+++ b/bsp/buildroot/package/diffutils/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_DIFFUTILS
 	bool "diffutils"
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  GNU diff. Compare files per line.
 
diff --git a/bsp/buildroot/package/diffutils/diffutils.hash b/bsp/buildroot/package/diffutils/diffutils.hash
index 7e99f1fc..5506ab27 100644
--- a/bsp/buildroot/package/diffutils/diffutils.hash
+++ b/bsp/buildroot/package/diffutils/diffutils.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533	diffutils-3.5.tar.xz
+sha256 d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6  diffutils-3.6.tar.xz
diff --git a/bsp/buildroot/package/diffutils/diffutils.mk b/bsp/buildroot/package/diffutils/diffutils.mk
index d3e608ce..79785d6f 100644
--- a/bsp/buildroot/package/diffutils/diffutils.mk
+++ b/bsp/buildroot/package/diffutils/diffutils.mk
@@ -4,13 +4,19 @@
 #
 ################################################################################
 
-DIFFUTILS_VERSION = 3.5
+DIFFUTILS_VERSION = 3.6
 DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz
 DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
-DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-DIFFUTILS_LICENSE = GPLv3+
+DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+DIFFUTILS_LICENSE = GPL-3.0+
 DIFFUTILS_LICENSE_FILES = COPYING
 
+# Since glibc >= 2.26, don't try to use getopt_long replacement bundled
+# with diffutils. It will conflict with the one from glibc.
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
+DIFFUTILS_CONF_ENV += gl_cv_func_getopt_gnu=yes
+endif
+
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 DIFFUTILS_DEPENDENCIES += busybox
 endif
diff --git a/bsp/buildroot/package/dillo/dillo.mk b/bsp/buildroot/package/dillo/dillo.mk
index 01ab4f5c..a6885f5c 100644
--- a/bsp/buildroot/package/dillo/dillo.mk
+++ b/bsp/buildroot/package/dillo/dillo.mk
@@ -7,7 +7,7 @@
 DILLO_VERSION = 3.0.5
 DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2
 DILLO_SITE = http://www.dillo.org/download
-DILLO_LICENSE = GPLv3+
+DILLO_LICENSE = GPL-3.0+
 DILLO_LICENSE_FILES = COPYING
 # configure.ac gets patched, so autoreconf is necessary
 DILLO_AUTORECONF = YES
diff --git a/bsp/buildroot/package/ding-libs/Config.in b/bsp/buildroot/package/ding-libs/Config.in
index 7af75b7b..6dc2a80f 100644
--- a/bsp/buildroot/package/ding-libs/Config.in
+++ b/bsp/buildroot/package/ding-libs/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_DING_LIBS
 	bool "ding-libs"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT
 	help
 	  The ding-libs packages contain a set of libraries used by
 	  the System Security Services Daemon (SSSD) and other
@@ -16,7 +14,3 @@ config BR2_PACKAGE_DING_LIBS
 	  structure (libini_config).
 
 	  https://git.fedorahosted.org/git/ding-libs.git
-
-comment "ding-libs needs a toolchain w/ wchar"
-	depends on BR2_NEEDS_GETTEXT
-	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/ding-libs/ding-libs.mk b/bsp/buildroot/package/ding-libs/ding-libs.mk
index 5b842ffa..e9508ccf 100644
--- a/bsp/buildroot/package/ding-libs/ding-libs.mk
+++ b/bsp/buildroot/package/ding-libs/ding-libs.mk
@@ -8,10 +8,10 @@ DING_LIBS_VERSION = 0_4_0
 DING_LIBS_SOURCE = ding_libs-$(DING_LIBS_VERSION).tar.xz
 DING_LIBS_SITE = https://git.fedorahosted.org/cgit/ding-libs.git/snapshot
 DING_LIBS_DEPENDENCIES = host-pkgconf \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 DING_LIBS_INSTALL_STAGING = YES
-DING_LIBS_LICENSE = LGPLv3+ (library),GPLv3+ (test programs)
+DING_LIBS_LICENSE = LGPL-3.0+ (library),GPL-3.0+ (test programs)
 DING_LIBS_LICENSE_FILES = COPYING COPYING.LESSER
 
 # autoconf/automake generated files not present in tarball
diff --git a/bsp/buildroot/package/directfb-examples/Config.in b/bsp/buildroot/package/directfb-examples/Config.in
index eef9f5c0..216e0365 100644
--- a/bsp/buildroot/package/directfb-examples/Config.in
+++ b/bsp/buildroot/package/directfb-examples/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_DIRECTFB_EXAMPLES
 	bool "directfb examples"
 	depends on BR2_PACKAGE_DIRECTFB
 	help
-	  The DirectFB-examples package contains a set of simple DirectFB
-	  applications that can be used to test and demonstrate various
-	  DirectFB features.
+	  The DirectFB-examples package contains a set of simple
+	  DirectFB applications that can be used to test and demonstrate
+	  various DirectFB features.
 
 	  http://directfb.org/downloads/Extras/README.DirectFB-examples
diff --git a/bsp/buildroot/package/directfb/Config.in b/bsp/buildroot/package/directfb/Config.in
index 6a3d7186..20481f56 100644
--- a/bsp/buildroot/package/directfb/Config.in
+++ b/bsp/buildroot/package/directfb/Config.in
@@ -9,11 +9,13 @@ config BR2_PACKAGE_DIRECTFB
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_ZLIB
 	help
-	  DirectFB (Direct Frame Buffer) is a set of graphics APIs implemented
-	  on top of the Linux Frame Buffer (fbdev) abstraction layer. It is an
-	  alternative to X11 with a smaller memory footprint that still has an
-	  integrated windowing system. As of 4 October 2015, DirectFB's website
-	  http://www.directfb.org/ is down. See alternative site listed below.
+	  DirectFB (Direct Frame Buffer) is a set of graphics APIs
+	  implemented on top of the Linux Frame Buffer (fbdev)
+	  abstraction layer. It is an alternative to X11 with a smaller
+	  memory footprint that still has an integrated windowing
+	  system. As of 4 October 2015, DirectFB's website
+	  http://www.directfb.org/ is down. See alternative site listed
+	  below.
 
 	  http://elinux.org/DirectFB
 
@@ -21,9 +23,9 @@ if BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_DIRECTFB_MULTI
 	bool "directfb multi application"
-	select BR2_PACKAGE_LINUX_FUSION
 	depends on BR2_USE_MMU # madvise()
 	depends on BR2_LINUX_KERNEL
+	select BR2_PACKAGE_LINUX_FUSION
 	help
 	  Enable use of multiple concurrent DirectFB applications
 
@@ -113,13 +115,9 @@ config BR2_PACKAGE_DIRECTFB_SERIALMOUSE
 
 config BR2_PACKAGE_DIRECTFB_TSLIB
 	bool "enable touchscreen support"
-	depends on !BR2_STATIC_LIBS # tslib
 	default y
 	select BR2_PACKAGE_TSLIB
 
-comment "touchscreen support needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-
 config BR2_PACKAGE_DIRECTFB_GIF
 	bool "enable GIF support"
 	default y
@@ -130,8 +128,8 @@ config BR2_PACKAGE_DIRECTFB_TIFF
 
 config BR2_PACKAGE_DIRECTFB_IMLIB2
 	bool "enable IMLIB2 support"
-	select BR2_PACKAGE_IMLIB2
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_IMLIB2
 
 comment "imlib2 support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/directfb/directfb.mk b/bsp/buildroot/package/directfb/directfb.mk
index 595d5906..0b32162d 100644
--- a/bsp/buildroot/package/directfb/directfb.mk
+++ b/bsp/buildroot/package/directfb/directfb.mk
@@ -8,7 +8,7 @@ DIRECTFB_VERSION_MAJOR = 1.7
 DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7
 DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR)
 DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz
-DIRECTFB_LICENSE = LGPLv2.1+
+DIRECTFB_LICENSE = LGPL-2.1+
 DIRECTFB_LICENSE_FILES = COPYING
 DIRECTFB_INSTALL_STAGING = YES
 DIRECTFB_AUTORECONF = YES
@@ -70,7 +70,7 @@ DIRECTFB_GFX = \
 	$(if $(BR2_PACKAGE_DIRECTFB_CYBER5K),cyber5k) \
 	$(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \
 	$(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \
-	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830)	\
+	$(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \
 	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)
 
 ifeq ($(strip $(DIRECTFB_GFX)),)
@@ -164,10 +164,10 @@ HOST_DIRECTFB_BUILD_CMDS = \
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools directfb-csource
 
 HOST_DIRECTFB_INSTALL_CMDS = \
-	$(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/usr/bin
+	$(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/bin
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # directfb-csource for the host
-DIRECTFB_HOST_BINARY = $(HOST_DIR)/usr/bin/directfb-csource
+DIRECTFB_HOST_BINARY = $(HOST_DIR)/bin/directfb-csource
diff --git a/bsp/buildroot/package/dmalloc/Config.in b/bsp/buildroot/package/dmalloc/Config.in
index 03d9f975..e5be1093 100644
--- a/bsp/buildroot/package/dmalloc/Config.in
+++ b/bsp/buildroot/package/dmalloc/Config.in
@@ -5,9 +5,9 @@ config BR2_PACKAGE_DMALLOC
 	# different segments".
 	depends on !(BR2_microblaze && BR2_ENABLE_DEBUG)
 	help
-	  A debug memory allocation library which is a drop in replacement for
-	  the system's malloc, realloc, calloc, free and other memory management
-	  routines while providing powerful debugging facilities configurable at
-	  runtime.
+	  A debug memory allocation library which is a drop in
+	  replacement for the system's malloc, realloc, calloc, free and
+	  other memory management routines while providing powerful
+	  debugging facilities configurable at runtime.
 
 	  http://dmalloc.com/
diff --git a/bsp/buildroot/package/dmidecode/Config.in b/bsp/buildroot/package/dmidecode/Config.in
index 22272ed2..58e7a785 100644
--- a/bsp/buildroot/package/dmidecode/Config.in
+++ b/bsp/buildroot/package/dmidecode/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_DMIDECODE
 	bool "dmidecode"
-	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_aarch64 || BR2_i386 || BR2_x86_64
 	help
 	  Dmidecode reports information about your system's hardware
 	  as described in your system BIOS according to the SMBIOS/DMI
diff --git a/bsp/buildroot/package/dmidecode/dmidecode.hash b/bsp/buildroot/package/dmidecode/dmidecode.hash
index 307c306a..1e8154b3 100644
--- a/bsp/buildroot/package/dmidecode/dmidecode.hash
+++ b/bsp/buildroot/package/dmidecode/dmidecode.hash
@@ -1,2 +1,2 @@
-# http://http.debian.net/debian/pool/main/d/dmidecode/dmidecode_3.0-2.dsc
-sha256	7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45	dmidecode-3.0.tar.xz
+# Locally computed
+sha256 d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0  dmidecode-3.1.tar.xz
diff --git a/bsp/buildroot/package/dmidecode/dmidecode.mk b/bsp/buildroot/package/dmidecode/dmidecode.mk
index cd30aa7d..b6f96b6d 100644
--- a/bsp/buildroot/package/dmidecode/dmidecode.mk
+++ b/bsp/buildroot/package/dmidecode/dmidecode.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-DMIDECODE_VERSION = 3.0
+DMIDECODE_VERSION = 3.1
 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz
 DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
-DMIDECODE_LICENSE = GPLv2+
+DMIDECODE_LICENSE = GPL-2.0+
 DMIDECODE_LICENSE_FILES = LICENSE
 
 define DMIDECODE_BUILD_CMDS
diff --git a/bsp/buildroot/package/dmraid/Config.in b/bsp/buildroot/package/dmraid/Config.in
index 583f3f27..aa98c853 100644
--- a/bsp/buildroot/package/dmraid/Config.in
+++ b/bsp/buildroot/package/dmraid/Config.in
@@ -3,16 +3,15 @@ config BR2_PACKAGE_DMRAID
 	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2
 	depends on BR2_USE_MMU # lvm2
 	depends on !BR2_STATIC_LIBS # lvm2
-	depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
 	select BR2_PACKAGE_LVM2
 	help
-	  dmraid discovers, activates, deactivates and displays properties
-	  of software RAID sets (eg, ATARAID) and contained DOS partitions.
+	  dmraid discovers, activates, deactivates and displays
+	  properties of software RAID sets (eg, ATARAID) and contained
+	  DOS partitions.
 
 	  dmraid uses the Linux device-mapper to create devices with
 	  respective mappings for the ATARAID sets discovered.
 
-comment "dmraid needs a glibc or uClibc toolchain w/ threads, dynamic library"
+comment "dmraid needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/dmraid/dmraid.mk b/bsp/buildroot/package/dmraid/dmraid.mk
index fbb23871..0382cd4d 100644
--- a/bsp/buildroot/package/dmraid/dmraid.mk
+++ b/bsp/buildroot/package/dmraid/dmraid.mk
@@ -11,7 +11,7 @@ DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid
 # lib and tools race with parallel make
 DMRAID_MAKE = $(MAKE1)
 DMRAID_INSTALL_STAGING = YES
-DMRAID_LICENSE = GPLv2
+DMRAID_LICENSE = GPL-2.0
 DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE
 
 DMRAID_DEPENDENCIES = lvm2
diff --git a/bsp/buildroot/package/dnsmasq/Config.in b/bsp/buildroot/package/dnsmasq/Config.in
index 960a495f..262aca68 100644
--- a/bsp/buildroot/package/dnsmasq/Config.in
+++ b/bsp/buildroot/package/dnsmasq/Config.in
@@ -31,10 +31,10 @@ config BR2_PACKAGE_DNSMASQ_IDN
 	bool "IDN support"
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBIDN
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Enable IDN support in dnsmasq.
-	  This option is a big space taker since it pulls in many libraries.
+	  This option is a big space taker since it pulls in many
+	  libraries.
 
 config BR2_PACKAGE_DNSMASQ_LUA
 	bool "Lua scripting support"
diff --git a/bsp/buildroot/package/dnsmasq/dnsmasq.mk b/bsp/buildroot/package/dnsmasq/dnsmasq.mk
index a4657e2a..9f96030e 100644
--- a/bsp/buildroot/package/dnsmasq/dnsmasq.mk
+++ b/bsp/buildroot/package/dnsmasq/dnsmasq.mk
@@ -11,7 +11,7 @@ DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 DNSMASQ_DEPENDENCIES = host-pkgconf
-DNSMASQ_LICENSE = GPLv2 or GPLv3
+DNSMASQ_LICENSE = GPL-2.0 or GPL-3.0
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
 ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
@@ -32,10 +32,10 @@ endif
 
 # NLS requires IDN so only enable it (i18n) when IDN is true
 ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
-DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext
-DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+DNSMASQ_DEPENDENCIES += libidn $(TARGET_NLS_DEPENDENCIES)
+DNSMASQ_MAKE_OPTS += LIBS+=$(TARGET_NLS_LIBS)
 DNSMASQ_COPTS += -DHAVE_IDN
-DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n)
+DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n)
 endif
 
 ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y)
diff --git a/bsp/buildroot/package/doc-asciidoc.mk b/bsp/buildroot/package/doc-asciidoc.mk
index cb6e6166..be92496c 100644
--- a/bsp/buildroot/package/doc-asciidoc.mk
+++ b/bsp/buildroot/package/doc-asciidoc.mk
@@ -1,5 +1,6 @@
 # we can't use suitable-host-package here because that's not available in
 # the context of 'make release'
+.PHONY: asciidoc-check-dependencies
 asciidoc-check-dependencies:
 	$(Q)if [ -z "$(shell support/dependencies/check-host-asciidoc.sh)" ]; then \
 		echo "You need a sufficiently recent asciidoc on your host" \
@@ -58,8 +59,9 @@ $(1): $(1)-$(5)
 .PHONY: $(1)-$(5)
 $(1)-$(5): $$(O)/docs/$(1)/$(1).$(6)
 
-# Single line, because splitting a foreach is not easy...
 asciidoc-check-dependencies-$(5):
+.PHONY: $(1)-check-dependencies-$(5)
+# Single line, because splitting a foreach is not easy...
 $(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5)
 	$$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep))
 
@@ -141,6 +143,7 @@ endef
 ################################################################################
 define ASCIIDOC
 # Single line, because splitting a foreach is not easy...
+.PHONY: $(1)-check-dependencies
 $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES)
 	$$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_HOOKS),$$(call $$(hook))$$(sep))
 
@@ -153,6 +156,7 @@ $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced:
 	$$(Q)rsync -a $(3) $$(@D)
 	$$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep))
 
+.PHONY: $(1)-prepare-sources
 $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced
 
 $(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf
diff --git a/bsp/buildroot/package/docker-containerd/docker-containerd.hash b/bsp/buildroot/package/docker-containerd/docker-containerd.hash
index f27e38ed..992eb5b0 100644
--- a/bsp/buildroot/package/docker-containerd/docker-containerd.hash
+++ b/bsp/buildroot/package/docker-containerd/docker-containerd.hash
@@ -1,2 +1,2 @@
 # Computed locally
-sha256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be  docker-containerd-v0.2.5.tar.gz
+sha256	da89086a7c643702a2ddecec67a45d3d8e4b0d610dd19036be63e6bd54cc1a85	docker-containerd-9048e5e50717ea4497b757314bad98ea3763c145.tar.gz
diff --git a/bsp/buildroot/package/docker-containerd/docker-containerd.mk b/bsp/buildroot/package/docker-containerd/docker-containerd.mk
index c04552a6..ffbadb0c 100644
--- a/bsp/buildroot/package/docker-containerd/docker-containerd.mk
+++ b/bsp/buildroot/package/docker-containerd/docker-containerd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DOCKER_CONTAINERD_VERSION = v0.2.5
+DOCKER_CONTAINERD_VERSION = 9048e5e50717ea4497b757314bad98ea3763c145
 DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION))
 DOCKER_CONTAINERD_LICENSE = Apache-2.0
 DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code
@@ -33,7 +33,7 @@ endef
 
 define DOCKER_CONTAINERD_BUILD_CMDS
 	$(foreach d,ctr containerd containerd-shim,\
-		cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/usr/bin/go build \
+		cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/bin/go build \
 			-v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep))
 endef
 
diff --git a/bsp/buildroot/package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch b/bsp/buildroot/package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch
deleted file mode 100644
index 413cfd6f..00000000
--- a/bsp/buildroot/package/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-From 8d6f2e3fe8851b581309da25fc4c32f8be675932 Mon Sep 17 00:00:00 2001
-From: Brian Goff <cpuguy83@gmail.com>
-Date: Mon, 11 Jul 2016 16:31:42 -0400
-Subject: [PATCH] Fix issues with tailing rotated jsonlog file
-
-Fixes a race where the log reader would get events for both an actual
-rotation as we from fsnotify (`fsnotify.Rename`).
-This issue becomes extremely apparent when rotations are fast, for
-example:
-
-```
-$ docker run -d --name test --log-opt max-size=1 --log-opt max-file=2
-busybox sh -c 'while true; do echo hello; usleep 100000; done'
-```
-
-With this change the log reader for jsonlogs can handle rotations that
-happen as above.
-
-Instead of listening for both fs events AND rotation events
-simultaneously, potentially meaning we see 2 rotations for only a single
-rotation due to channel buffering, only listen for fs events (like
-`Rename`) and then wait to be notified about rotation by the logger.
-This makes sure that we don't see 2 rotations for 1, and that we don't
-start trying to read until the logger is actually ready for us to.
-
-Signed-off-by: Brian Goff <cpuguy83@gmail.com>
-
-This commit is pending upstream commit fixing broken log tailing. The
-original commit can be found in the PR here:
-
-  - https://github.com/docker/docker/pull/24514
-
-Signed-off-by: Christian Stewart <christian@paral.in>
----
- daemon/logger/jsonfilelog/read.go | 180 +++++++++++++++++++++++++-------------
- 1 file changed, 119 insertions(+), 61 deletions(-)
-
-diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go
-index bea83dd..0cb44af 100644
---- a/daemon/logger/jsonfilelog/read.go
-+++ b/daemon/logger/jsonfilelog/read.go
-@@ -3,11 +3,14 @@ package jsonfilelog
- import (
- 	"bytes"
- 	"encoding/json"
-+	"errors"
- 	"fmt"
- 	"io"
- 	"os"
- 	"time"
- 
-+	"gopkg.in/fsnotify.v1"
-+
- 	"github.com/Sirupsen/logrus"
- 	"github.com/docker/docker/daemon/logger"
- 	"github.com/docker/docker/pkg/filenotify"
-@@ -44,6 +47,10 @@ func (l *JSONFileLogger) ReadLogs(config logger.ReadConfig) *logger.LogWatcher {
- func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.ReadConfig) {
- 	defer close(logWatcher.Msg)
- 
-+	// lock so the read stream doesn't get corrupted do to rotations or other log data written while we read
-+	// This will block writes!!!
-+	l.mu.Lock()
-+
- 	pth := l.writer.LogPath()
- 	var files []io.ReadSeeker
- 	for i := l.writer.MaxFiles(); i > 1; i-- {
-@@ -61,6 +68,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
- 	latestFile, err := os.Open(pth)
- 	if err != nil {
- 		logWatcher.Err <- err
-+		l.mu.Unlock()
- 		return
- 	}
- 
-@@ -80,6 +88,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
- 		if err := latestFile.Close(); err != nil {
- 			logrus.Errorf("Error closing file: %v", err)
- 		}
-+		l.mu.Unlock()
- 		return
- 	}
- 
-@@ -87,7 +96,6 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
- 		latestFile.Seek(0, os.SEEK_END)
- 	}
- 
--	l.mu.Lock()
- 	l.readers[logWatcher] = struct{}{}
- 	l.mu.Unlock()
- 
-@@ -128,92 +136,142 @@ func tailFile(f io.ReadSeeker, logWatcher *logger.LogWatcher, tail int, since ti
- 	}
- }
- 
-+func watchFile(name string) (filenotify.FileWatcher, error) {
-+	fileWatcher, err := filenotify.New()
-+	if err != nil {
-+		return nil, err
-+	}
-+
-+	if err := fileWatcher.Add(name); err != nil {
-+		logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err)
-+		fileWatcher.Close()
-+		fileWatcher = filenotify.NewPollingWatcher()
-+
-+		if err := fileWatcher.Add(name); err != nil {
-+			fileWatcher.Close()
-+			logrus.Debugf("error watching log file for modifications: %v", err)
-+			return nil, err
-+		}
-+	}
-+	return fileWatcher, nil
-+}
-+
- func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan interface{}, since time.Time) {
- 	dec := json.NewDecoder(f)
- 	l := &jsonlog.JSONLog{}
- 
--	fileWatcher, err := filenotify.New()
-+	name := f.Name()
-+	fileWatcher, err := watchFile(name)
- 	if err != nil {
- 		logWatcher.Err <- err
-+		return
- 	}
- 	defer func() {
- 		f.Close()
- 		fileWatcher.Close()
- 	}()
--	name := f.Name()
- 
--	if err := fileWatcher.Add(name); err != nil {
--		logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err)
--		fileWatcher.Close()
--		fileWatcher = filenotify.NewPollingWatcher()
-+	var retries int
-+	handleRotate := func() error {
-+		f.Close()
-+		fileWatcher.Remove(name)
- 
-+		// retry when the file doesn't exist
-+		for retries := 0; retries <= 5; retries++ {
-+			f, err = os.Open(name)
-+			if err == nil || !os.IsNotExist(err) {
-+				break
-+			}
-+		}
-+		if err != nil {
-+			return err
-+		}
- 		if err := fileWatcher.Add(name); err != nil {
--			logrus.Debugf("error watching log file for modifications: %v", err)
--			logWatcher.Err <- err
--			return
-+			return err
- 		}
-+		dec = json.NewDecoder(f)
-+		return nil
- 	}
- 
--	var retries int
--	for {
--		msg, err := decodeLogLine(dec, l)
--		if err != nil {
--			if err != io.EOF {
--				// try again because this shouldn't happen
--				if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry {
--					dec = json.NewDecoder(f)
--					retries++
--					continue
-+	errRetry := errors.New("retry")
-+	errDone := errors.New("done")
-+	waitRead := func() error {
-+		select {
-+		case e := <-fileWatcher.Events():
-+			switch e.Op {
-+			case fsnotify.Write:
-+				dec = json.NewDecoder(f)
-+				return nil
-+			case fsnotify.Rename, fsnotify.Remove:
-+				<-notifyRotate
-+				if err := handleRotate(); err != nil {
-+					return err
- 				}
--
--				// io.ErrUnexpectedEOF is returned from json.Decoder when there is
--				// remaining data in the parser's buffer while an io.EOF occurs.
--				// If the json logger writes a partial json log entry to the disk
--				// while at the same time the decoder tries to decode it, the race condition happens.
--				if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry {
--					reader := io.MultiReader(dec.Buffered(), f)
--					dec = json.NewDecoder(reader)
--					retries++
--					continue
-+				return nil
-+			}
-+			return errRetry
-+		case err := <-fileWatcher.Errors():
-+			logrus.Debug("logger got error watching file: %v", err)
-+			// Something happened, let's try and stay alive and create a new watcher
-+			if retries <= 5 {
-+				fileWatcher, err = watchFile(name)
-+				if err != nil {
-+					return err
- 				}
--
--				return
-+				retries++
-+				return errRetry
- 			}
-+			return err
-+		case <-logWatcher.WatchClose():
-+			fileWatcher.Remove(name)
-+			return errDone
-+		}
-+	}
- 
--			select {
--			case <-fileWatcher.Events():
--				dec = json.NewDecoder(f)
--				continue
--			case <-fileWatcher.Errors():
--				logWatcher.Err <- err
--				return
--			case <-logWatcher.WatchClose():
--				fileWatcher.Remove(name)
--				return
--			case <-notifyRotate:
--				f.Close()
--				fileWatcher.Remove(name)
--
--				// retry when the file doesn't exist
--				for retries := 0; retries <= 5; retries++ {
--					f, err = os.Open(name)
--					if err == nil || !os.IsNotExist(err) {
--						break
--					}
-+	handleDecodeErr := func(err error) error {
-+		if err == io.EOF {
-+			for err := waitRead(); err != nil; {
-+				if err == errRetry {
-+					// retry the waitRead
-+					continue
- 				}
-+				return err
-+			}
-+			return nil
-+		}
-+		// try again because this shouldn't happen
-+		if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry {
-+			dec = json.NewDecoder(f)
-+			retries++
-+			return nil
-+		}
-+		// io.ErrUnexpectedEOF is returned from json.Decoder when there is
-+		// remaining data in the parser's buffer while an io.EOF occurs.
-+		// If the json logger writes a partial json log entry to the disk
-+		// while at the same time the decoder tries to decode it, the race condition happens.
-+		if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry {
-+			reader := io.MultiReader(dec.Buffered(), f)
-+			dec = json.NewDecoder(reader)
-+			retries++
-+			return nil
-+		}
-+		return err
-+	}
- 
--				if err = fileWatcher.Add(name); err != nil {
--					logWatcher.Err <- err
--					return
--				}
--				if err != nil {
--					logWatcher.Err <- err
-+	// main loop
-+	for {
-+		msg, err := decodeLogLine(dec, l)
-+		if err != nil {
-+			if err := handleDecodeErr(err); err != nil {
-+				if err == errDone {
- 					return
- 				}
--
--				dec = json.NewDecoder(f)
--				continue
-+				// we got an unrecoverable error, so return
-+				logWatcher.Err <- err
-+				return
- 			}
-+			// ready to try again
-+			continue
- 		}
- 
- 		retries = 0 // reset retries since we've succeeded
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/docker-engine/Config.in b/bsp/buildroot/package/docker-engine/Config.in
index 1879a56f..8feb11b4 100644
--- a/bsp/buildroot/package/docker-engine/Config.in
+++ b/bsp/buildroot/package/docker-engine/Config.in
@@ -13,11 +13,12 @@ if BR2_PACKAGE_DOCKER_ENGINE
 
 config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
 	bool "docker daemon"
+	default y
 	depends on BR2_USE_MMU # docker-containerd
 	select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
+	select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
 	select BR2_PACKAGE_IPTABLES # runtime dependency
 	select BR2_PACKAGE_SQLITE # runtime dependency
-	default y
 	help
 	  Build the Docker system daemon.
 	  If not selected, will build client only.
@@ -25,6 +26,12 @@ config BR2_PACKAGE_DOCKER_ENGINE_DAEMON
 config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL
 	bool "build experimental features"
 
+config BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT
+	bool "build static client"
+	depends on !BR2_STATIC_LIBS
+	help
+	  Build a static docker client.
+
 if BR2_PACKAGE_DOCKER_ENGINE_DAEMON
 
 config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS
diff --git a/bsp/buildroot/package/docker-engine/docker-engine.hash b/bsp/buildroot/package/docker-engine/docker-engine.hash
index 5e09453e..6c0ed338 100644
--- a/bsp/buildroot/package/docker-engine/docker-engine.hash
+++ b/bsp/buildroot/package/docker-engine/docker-engine.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e  docker-engine-v1.12.6.tar.gz
+sha256	4716df117d867b82ddab2e82395cd40aa3d0925a689eedcec8919729e4c9f121	docker-engine-v17.05.0-ce.tar.gz
diff --git a/bsp/buildroot/package/docker-engine/docker-engine.mk b/bsp/buildroot/package/docker-engine/docker-engine.mk
index d575662d..8928f072 100644
--- a/bsp/buildroot/package/docker-engine/docker-engine.mk
+++ b/bsp/buildroot/package/docker-engine/docker-engine.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-DOCKER_ENGINE_VERSION = v1.12.6
-DOCKER_ENGINE_COMMIT = 78d18021ecba00c00730dec9d56de6896f9e708d
+DOCKER_ENGINE_VERSION = v17.05.0-ce
+DOCKER_ENGINE_COMMIT = 89658bed64c2a8fe05a978e5b87dbec409d57a0f
 DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION))
 
 DOCKER_ENGINE_LICENSE = Apache-2.0
@@ -13,7 +13,7 @@ DOCKER_ENGINE_LICENSE_FILES = LICENSE
 
 DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf
 
-DOCKER_ENGINE_GOPATH = "$(@D)/vendor"
+DOCKER_ENGINE_GOPATH = "$(@D)/gopath"
 DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
 	CGO_ENABLED=1 \
 	CGO_NO_EMULATION=1 \
@@ -28,6 +28,10 @@ DOCKER_ENGINE_GLDFLAGS = \
 
 ifeq ($(BR2_STATIC_LIBS),y)
 DOCKER_ENGINE_GLDFLAGS += -extldflags '-static'
+else
+ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_STATIC_CLIENT),y)
+DOCKER_ENGINE_GLDFLAGS_DOCKER += -extldflags '-static'
+endif
 endif
 
 DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen
@@ -38,6 +42,11 @@ DOCKER_ENGINE_BUILD_TAGS += seccomp
 DOCKER_ENGINE_DEPENDENCIES += libseccomp
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+DOCKER_ENGINE_BUILD_TAGS += journald
+DOCKER_ENGINE_DEPENDENCIES += systemd
+endif
+
 ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y)
 DOCKER_ENGINE_BUILD_TAGS += daemon
 DOCKER_ENGINE_BUILD_TARGETS += dockerd
@@ -66,6 +75,7 @@ DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs
 endif
 
 define DOCKER_ENGINE_CONFIGURE_CMDS
+	mkdir -p $(DOCKER_ENGINE_GOPATH)/src/github.com/docker
 	ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker
 	cd $(@D) && \
 		GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \
@@ -95,12 +105,13 @@ endif
 
 define DOCKER_ENGINE_BUILD_CMDS
 	$(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \
-		cd $(@D); $(DOCKER_ENGINE_MAKE_ENV) \
-		$(HOST_DIR)/usr/bin/go build -v \
+		cd $(@D)/gopath/src/github.com/docker/docker; \
+		$(DOCKER_ENGINE_MAKE_ENV) \
+		$(HOST_DIR)/bin/go build -v \
 			-o $(@D)/bin/$(target) \
 			-tags "$(DOCKER_ENGINE_BUILD_TAGS)" \
-			-ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \
-			./cmd/$(target)
+			-ldflags "$(DOCKER_ENGINE_GLDFLAGS) $(DOCKER_ENGINE_GLDFLAGS_$(call UPPERCASE,$(target)))" \
+			github.com/docker/docker/cmd/$(target)
 	)
 endef
 
diff --git a/bsp/buildroot/package/docker-proxy/Config.in b/bsp/buildroot/package/docker-proxy/Config.in
new file mode 100644
index 00000000..596e18a3
--- /dev/null
+++ b/bsp/buildroot/package/docker-proxy/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_DOCKER_PROXY
+	bool "docker-proxy"
+	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Libnetwork is a Container Network Model that provides a
+	  consistent programming interface and the required network
+	  abstractions for applications.
+
+	  This package provides docker-proxy, a run-time dependency of
+	  Docker.
+
+	  https://github.com/docker/libnetwork
+
+comment "docker-proxy needs a toolchain w/ threads"
+	depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/docker-proxy/docker-proxy.hash b/bsp/buildroot/package/docker-proxy/docker-proxy.hash
new file mode 100644
index 00000000..3ec184f5
--- /dev/null
+++ b/bsp/buildroot/package/docker-proxy/docker-proxy.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	2eee331b6ded567a36e7db708405b34032b93938682cf049025f48b96d755bf6	docker-proxy-7b2b1feb1de4817d522cc372af149ff48d25028e.tar.gz
diff --git a/bsp/buildroot/package/docker-proxy/docker-proxy.mk b/bsp/buildroot/package/docker-proxy/docker-proxy.mk
new file mode 100644
index 00000000..3bf6546d
--- /dev/null
+++ b/bsp/buildroot/package/docker-proxy/docker-proxy.mk
@@ -0,0 +1,46 @@
+################################################################################
+#
+# docker-proxy
+#
+################################################################################
+
+DOCKER_PROXY_VERSION = 7b2b1feb1de4817d522cc372af149ff48d25028e
+DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
+
+DOCKER_PROXY_LICENSE = Apache-2.0
+DOCKER_PROXY_LICENSE_FILES = LICENSE
+
+DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf
+
+DOCKER_PROXY_GOPATH = "$(@D)/gopath"
+DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
+	CGO_ENABLED=1 \
+	CGO_NO_EMULATION=1 \
+	GOBIN="$(@D)/bin" \
+	GOPATH="$(DOCKER_PROXY_GOPATH)" \
+	PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+	$(TARGET_MAKE_ENV)
+
+ifeq ($(BR2_STATIC_LIBS),y)
+DOCKER_PROXY_GLDFLAGS += -extldflags '-static'
+endif
+
+define DOCKER_PROXY_CONFIGURE_CMDS
+	mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker
+	ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork
+endef
+
+define DOCKER_PROXY_BUILD_CMDS
+	cd $(@D)/gopath/src/github.com/docker/libnetwork; \
+	$(DOCKER_PROXY_MAKE_ENV) \
+	$(HOST_DIR)/usr/bin/go build -v \
+		-o $(@D)/bin/docker-proxy \
+		-ldflags "$(DOCKER_PROXY_GLDFLAGS)" \
+		github.com/docker/libnetwork/cmd/proxy
+endef
+
+define DOCKER_PROXY_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/docker/docker.mk b/bsp/buildroot/package/docker/docker.mk
index 9a9d26bb..4a8c6fcd 100644
--- a/bsp/buildroot/package/docker/docker.mk
+++ b/bsp/buildroot/package/docker/docker.mk
@@ -8,7 +8,7 @@ DOCKER_VERSION = 1.5
 DOCKER_SITE = http://icculus.org/openbox/2/docker
 DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11
 
-DOCKER_LICENSE = GPLv2+
+DOCKER_LICENSE = GPL-2.0+
 # The 'or later' is specified at the end of the README, so include that one too.
 DOCKER_LICENSE_FILES = COPYING README
 
diff --git a/bsp/buildroot/package/domoticz/0001-Fix-compilation-with-boost-1.66.patch b/bsp/buildroot/package/domoticz/0001-Fix-compilation-with-boost-1.66.patch
new file mode 100644
index 00000000..d73ea4f0
--- /dev/null
+++ b/bsp/buildroot/package/domoticz/0001-Fix-compilation-with-boost-1.66.patch
@@ -0,0 +1,56 @@
+From b9481d3382d416d72f523a0442d662e49b4192d1 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 14 Jan 2018 18:18:32 +0100
+Subject: [PATCH] Fix compilation with boost 1.66
+
+Patch fetch from one of the answer of
+ https://github.com/domoticz/domoticz/issues/2034
+(issue still opened, no official PR sent upstream)
+
+Boost asio changed its API:
+ - http://www.boost.org/doc/libs/1_66_0/doc/html/boost_asio/net_ts.html
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ webserver/proxyclient.cpp | 2 +-
+ webserver/server.cpp      | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/webserver/proxyclient.cpp b/webserver/proxyclient.cpp
+index 203ee619..efc9815a 100644
+--- a/webserver/proxyclient.cpp
++++ b/webserver/proxyclient.cpp
+@@ -639,7 +639,7 @@ namespace http {
+ 		void CProxyManager::StartThread()
+ 		{
+ 			try {
+-				boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
++				boost::asio::ssl::context ctx(boost::asio::ssl::context::sslv23);
+ 				ctx.set_verify_mode(boost::asio::ssl::verify_none);
+ 
+ 				proxyclient.reset(new CProxyClient(io_service, ctx, m_pWebEm));
+diff --git a/webserver/server.cpp b/webserver/server.cpp
+index 5255aa34..0c1af08a 100644
+--- a/webserver/server.cpp
++++ b/webserver/server.cpp
+@@ -148,7 +148,7 @@ void server::handle_accept(const boost::system::error_code& e) {
+ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler & user_request_handler) :
+ 		server_base(ssl_settings, user_request_handler),
+ 		settings_(ssl_settings),
+-		context_(io_service_, ssl_settings.get_ssl_method())
++		context_(ssl_settings.get_ssl_method())
+ {
+ #ifdef DEBUG_WWW
+ 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str());
+@@ -161,7 +161,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler
+ ssl_server::ssl_server(const server_settings & settings, request_handler & user_request_handler) :
+ 		server_base(settings, user_request_handler),
+ 		settings_(dynamic_cast<ssl_server_settings const &>(settings)),
+-		context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
++		context_(dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
+ #ifdef DEBUG_WWW
+ 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str());
+ #endif
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/domoticz/Config.in b/bsp/buildroot/package/domoticz/Config.in
index c6550d2a..530027f2 100644
--- a/bsp/buildroot/package/domoticz/Config.in
+++ b/bsp/buildroot/package/domoticz/Config.in
@@ -3,12 +3,12 @@ config BR2_PACKAGE_DOMOTICZ
 	depends on BR2_USE_MMU # mosquitto
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto
 	depends on !BR2_STATIC_LIBS # mosquitto
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# pthread_condattr_setclock
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3
-	# These result in internal compiler error
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_DATE_TIME
 	select BR2_PACKAGE_BOOST_SYSTEM
@@ -27,10 +27,13 @@ config BR2_PACKAGE_DOMOTICZ
 
 	  http://domoticz.com
 
-comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, threads, wchar, dynamic library"
+comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, NPTL, wchar, dynamic library"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
 		!(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3)
+
+comment "domoticz needs exception_ptr"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/bsp/buildroot/package/domoticz/domoticz.hash b/bsp/buildroot/package/domoticz/domoticz.hash
index 7feab8fb..00dcf713 100644
--- a/bsp/buildroot/package/domoticz/domoticz.hash
+++ b/bsp/buildroot/package/domoticz/domoticz.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256	fb88edbe428851a7a337a85faa93f6da00713b3ad086ff6957031dc9b3b58bba	domoticz-3.5877.tar.gz
+sha256	5ea8f37f2ef900e9bd17b1b5375e75bfdec4f09001e3e2e0b647a260989d014c	domoticz-3.8153.tar.gz
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	License.txt
diff --git a/bsp/buildroot/package/domoticz/domoticz.mk b/bsp/buildroot/package/domoticz/domoticz.mk
index 48cdbc41..bd25708a 100644
--- a/bsp/buildroot/package/domoticz/domoticz.mk
+++ b/bsp/buildroot/package/domoticz/domoticz.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DOMOTICZ_VERSION = 3.5877
+DOMOTICZ_VERSION = 3.8153
 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
-DOMOTICZ_LICENSE = GPLv3
+DOMOTICZ_LICENSE = GPL-3.0
 DOMOTICZ_LICENSE_FILES = License.txt
 DOMOTICZ_DEPENDENCIES = \
 	boost \
@@ -59,6 +59,13 @@ DOMOTICZ_DEPENDENCIES += openzwave
 DOMOTICZ_CONF_OPTS += -DUSE_STATIC_OPENZWAVE=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+DOMOTICZ_DEPENDENCIES += python3
+DOMOTICZ_CONF_OPTS += -DUSE_PYTHON=ON
+else
+DOMOTICZ_CONF_OPTS += -DUSE_PYTHON=OFF
+endif
+
 # Install domoticz in a dedicated directory (/opt/domoticz) as
 # domoticz expects by default that all its subdirectories (www,
 # Config, scripts, ...) are in the binary directory.
diff --git a/bsp/buildroot/package/doom-wad/Config.in b/bsp/buildroot/package/doom-wad/Config.in
index edd299b5..6f51cfb9 100644
--- a/bsp/buildroot/package/doom-wad/Config.in
+++ b/bsp/buildroot/package/doom-wad/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_DOOM_WAD
 	bool "shareware Doom WAD file"
 	depends on BR2_PACKAGE_CHOCOLATE_DOOM || BR2_PACKAGE_PRBOOM
 	help
-	  This will install the shareware wad data file for the doom game.
+	  This will install the shareware wad data file for the doom
+	  game.
 
-	  The wad file will be placed in the /usr/share/games/doom directory.
+	  The wad file will be placed in the /usr/share/games/doom
+	  directory.
diff --git a/bsp/buildroot/package/dos2unix/Config.in b/bsp/buildroot/package/dos2unix/Config.in
index 0a4f5e2f..cfb5ba4b 100644
--- a/bsp/buildroot/package/dos2unix/Config.in
+++ b/bsp/buildroot/package/dos2unix/Config.in
@@ -1,5 +1,4 @@
 config BR2_PACKAGE_DOS2UNIX
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	bool "dos2unix"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
diff --git a/bsp/buildroot/package/dos2unix/dos2unix.hash b/bsp/buildroot/package/dos2unix/dos2unix.hash
index 1169592f..80b73949 100644
--- a/bsp/buildroot/package/dos2unix/dos2unix.hash
+++ b/bsp/buildroot/package/dos2unix/dos2unix.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5	dos2unix-7.3.4.tar.gz
+# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.4.0.tar.gz.asc
+sha256	bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a	dos2unix-7.4.0.tar.gz
+sha256	49224e841621b52a72aa38d8ac895a396cd3fa1395190bdfc9252378001eb3c0	COPYING.txt
diff --git a/bsp/buildroot/package/dos2unix/dos2unix.mk b/bsp/buildroot/package/dos2unix/dos2unix.mk
index df2094e4..5001397f 100644
--- a/bsp/buildroot/package/dos2unix/dos2unix.mk
+++ b/bsp/buildroot/package/dos2unix/dos2unix.mk
@@ -4,27 +4,30 @@
 #
 ################################################################################
 
-DOS2UNIX_VERSION = 7.3.4
+DOS2UNIX_VERSION = 7.4.0
 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix
-DOS2UNIX_LICENSE = BSD-2c
+DOS2UNIX_LICENSE = BSD-2-Clause
 DOS2UNIX_LICENSE_FILES = COPYING.txt
-DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+DOS2UNIX_DEPENDENCIES = \
+	$(if $(BR2_PACKAGE_BUSYBOX),busybox) \
+	$(TARGET_NLS_DEPENDENCIES)
 
-ifeq ($(BR2_ENABLE_LOCALE),y)
-DOS2UNIX_DEPENDENCIES += host-gettext
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+DOS2UNIX_MAKE_OPTS += ENABLE_NLS=1
+DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=$(TARGET_NLS_LIBS)
 else
+# Should be defined to empty to disable NLS support
 DOS2UNIX_MAKE_OPTS += ENABLE_NLS=
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-DOS2UNIX_DEPENDENCIES += gettext
-DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=-lintl
-endif
-
 ifeq ($(BR2_USE_WCHAR),)
 DOS2UNIX_MAKE_OPTS += UCS=
 endif
 
+ifeq ($(BR2_STATIC_LIBS),y)
+DOS2UNIX_MAKE_OPTS += LDFLAGS_USER=-static
+endif
+
 define DOS2UNIX_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS)
 endef
@@ -39,7 +42,7 @@ define HOST_DOS2UNIX_BUILD_CMDS
 endef
 
 define HOST_DOS2UNIX_INSTALL_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) ENABLE_NLS= \
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) ENABLE_NLS= \
 		install
 endef
 
diff --git a/bsp/buildroot/package/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch b/bsp/buildroot/package/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch
deleted file mode 100644
index ff3c3ffa..00000000
--- a/bsp/buildroot/package/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1e76e5778a1885452939a79d9145b80634a5b023 Mon Sep 17 00:00:00 2001
-From: Andreas Bombe <aeb@debian.org>
-Date: Wed, 11 May 2016 03:44:58 +0200
-Subject: [PATCH] mkfs: Default to 64/32 heads/sectors for targets smaller than
- 512 MB
-
-This may put defaults in certain use cases a little bit more in line
-with the old defaults in versions up to 3.0.28. It has mostly aesthetic
-value in most cases.
-
-Signed-off-by: Andreas Bombe <aeb@debian.org>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Patch status: upstream
-
- src/mkfs.fat.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c
-index 8a320fd..bad492b 100644
---- a/src/mkfs.fat.c
-+++ b/src/mkfs.fat.c
-@@ -519,6 +519,16 @@ static void establish_params(struct device_info *info)
-     unsigned int cluster_size = 4;  /* starting point for FAT12 and FAT16 */
-     int def_root_dir_entries = 512;
- 
-+    if (info->size < 512 * 1024 * 1024) {
-+	/*
-+	 * These values are more or less meaningless, but we can at least
-+	 * use less extreme values for smaller filesystems where the large
-+	 * dummy values signifying LBA only access are not needed.
-+	 */
-+	sec_per_track = 32;
-+	heads = 64;
-+    }
-+
-     if (info->type != TYPE_FIXED) {
- 	/* enter default parameters for floppy disks if the size matches */
- 	switch (info->size / 1024) {
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch b/bsp/buildroot/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch
deleted file mode 100644
index 97403046..00000000
--- a/bsp/buildroot/package/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 06ce096dabd8a29c72dc0bc5110d2c4867baa490 Mon Sep 17 00:00:00 2001
-From: Alessio Sergi <al3hex@gmail.com>
-Date: Fri, 6 May 2016 18:18:18 +0200
-Subject: [PATCH] src/device_info.c: Fix undefined PATH_MAX under musl
-
-In musl libc, PATH_MAX is defined in <limits.h>.
-
-Status: pending
-https://github.com/dosfstools/dosfstools/pull/27
-
-[Romain: add patch status]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- src/device_info.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/device_info.c b/src/device_info.c
-index f5d11ac..cd57388 100644
---- a/src/device_info.c
-+++ b/src/device_info.c
-@@ -17,6 +17,7 @@
- */
- 
- 
-+#include <limits.h>
- #include <stdint.h>
- #include <stdbool.h>
- #include <sys/types.h>
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/dosfstools/dosfstools.hash b/bsp/buildroot/package/dosfstools/dosfstools.hash
index 777b8d9e..2515ea68 100644
--- a/bsp/buildroot/package/dosfstools/dosfstools.hash
+++ b/bsp/buildroot/package/dosfstools/dosfstools.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf	dosfstools-4.0.tar.xz
+sha256 e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173  dosfstools-4.1.tar.xz
diff --git a/bsp/buildroot/package/dosfstools/dosfstools.mk b/bsp/buildroot/package/dosfstools/dosfstools.mk
index 67c6f731..6eb0851d 100644
--- a/bsp/buildroot/package/dosfstools/dosfstools.mk
+++ b/bsp/buildroot/package/dosfstools/dosfstools.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-DOSFSTOOLS_VERSION = 4.0
+DOSFSTOOLS_VERSION = 4.1
 DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz
 DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION)
-DOSFSTOOLS_LICENSE = GPLv3+
+DOSFSTOOLS_LICENSE = GPL-3.0+
 DOSFSTOOLS_LICENSE_FILES = COPYING
 DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/
 HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks
diff --git a/bsp/buildroot/package/dovecot-pigeonhole/Config.in b/bsp/buildroot/package/dovecot-pigeonhole/Config.in
index 83f52876..bd6826b4 100644
--- a/bsp/buildroot/package/dovecot-pigeonhole/Config.in
+++ b/bsp/buildroot/package/dovecot-pigeonhole/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_DOVECOT_PIGEONHOLE
 	bool "dovecot-pigeonhole"
 	help
-	  Pigeonhole is the name of the project that adds support for the Sieve
-	  language (RFC 5228) and the ManageSieve protocol (RFC 5804) to the
-	  Dovecot Secure IMAP Server.
+	  Pigeonhole is the name of the project that adds support for
+	  the Sieve language (RFC 5228) and the ManageSieve protocol
+	  (RFC 5804) to the Dovecot Secure IMAP Server.
 
 	  http://pigeonhole.dovecot.org
diff --git a/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
index 95325a95..a2b7eba9 100644
--- a/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
+++ b/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.hash
@@ -1,2 +1,3 @@
 # Locally computed after checking signature
-sha256 8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234  dovecot-2.2-pigeonhole-0.4.16.tar.gz
+sha256 4ae09cb788c5334d167f5a89ee70b0616c3231e5904ad258ce408e4953cfdd6a  dovecot-2.2-pigeonhole-0.4.21.tar.gz
+sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a  COPYING
diff --git a/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
index 846e7f97..ea8b0077 100644
--- a/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
+++ b/bsp/buildroot/package/dovecot-pigeonhole/dovecot-pigeonhole.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-DOVECOT_PIGEONHOLE_VERSION = 0.4.16
+DOVECOT_PIGEONHOLE_VERSION = 0.4.21
 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz
 DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2
-DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1
+DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1
 DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING
 DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
 
diff --git a/bsp/buildroot/package/dovecot/Config.in b/bsp/buildroot/package/dovecot/Config.in
index d1ff7bce..377fd4db 100644
--- a/bsp/buildroot/package/dovecot/Config.in
+++ b/bsp/buildroot/package/dovecot/Config.in
@@ -5,11 +5,11 @@ config BR2_PACKAGE_DOVECOT
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	help
-	  Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-
-	  like systems, written with security primarily in mind. Dovecot is an
-	  excellent choice for both small and large installations. It's fast,
-	  simple to set up, requires no special administration and it uses very
-	  little memory.
+	  Dovecot is an open source IMAP and POP3 email server for
+	  Linux/UNIX- like systems, written with security primarily in
+	  mind. Dovecot is an excellent choice for both small and large
+	  installations. It's fast, simple to set up, requires no
+	  special administration and it uses very little memory.
 
 	  http://www.dovecot.org
 
@@ -17,9 +17,9 @@ if BR2_PACKAGE_DOVECOT
 
 config BR2_PACKAGE_DOVECOT_MYSQL
 	bool "mysql support"
-	select BR2_PACKAGE_MYSQL
 	depends on BR2_INSTALL_LIBSTDCPP # mysql
 	depends on BR2_TOOLCHAIN_HAS_THREADS # mysql
+	select BR2_PACKAGE_MYSQL
 	help
 	  Enable MySQL support.
 
diff --git a/bsp/buildroot/package/dovecot/dovecot.mk b/bsp/buildroot/package/dovecot/dovecot.mk
index d9703a61..e1b4bb21 100644
--- a/bsp/buildroot/package/dovecot/dovecot.mk
+++ b/bsp/buildroot/package/dovecot/dovecot.mk
@@ -8,7 +8,7 @@ DOVECOT_VERSION_MAJOR = 2.2
 DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).34
 DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
 DOVECOT_INSTALL_STAGING = YES
-DOVECOT_LICENSE = LGPLv2.1
+DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
 DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
 DOVECOT_DEPENDENCIES = \
 	host-pkgconf \
diff --git a/bsp/buildroot/package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch b/bsp/buildroot/package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch
new file mode 100644
index 00000000..b64158ca
--- /dev/null
+++ b/bsp/buildroot/package/doxygen/0001-Bug-776791-1.8.13-Regression-Segfault-building-the-b.patch
@@ -0,0 +1,30 @@
+From 0f02761a158a5e9ddbd5801682482af8986dbc35 Mon Sep 17 00:00:00 2001
+From: albert-github <albert.tests@gmail.com>
+Date: Wed, 4 Jan 2017 12:24:55 +0100
+Subject: [PATCH] Bug 776791 - [1.8.13 Regression] Segfault building the
+ breathe docs
+
+Protected against NULL pointer of variable al
+
+[Romain: backport from upstream]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/xmlgen.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
+index fe95c7a..70e198a 100644
+--- a/src/xmlgen.cpp
++++ b/src/xmlgen.cpp
+@@ -620,7 +620,7 @@ static void generateXMLForMember(MemberDef *md,FTextStream &ti,FTextStream &t,De
+     if (md->isInline()) t << "yes"; else t << "no";
+     t << "\"";
+ 
+-    if (al->refQualifier!=RefQualifierNone)
++    if (al!=0 && al->refQualifier!=RefQualifierNone)
+     {
+       t << " refqual=\"";
+       if (al->refQualifier==RefQualifierLValue) t << "lvalue"; else t << "rvalue";
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch b/bsp/buildroot/package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch
new file mode 100644
index 00000000..282b2bdc
--- /dev/null
+++ b/bsp/buildroot/package/doxygen/0002-build-fix-the-way-lang_cfg.h-is-generated.patch
@@ -0,0 +1,58 @@
+From f9a3aa72c2bf15726bcdafd140fd21f790de555d Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <brgl@bgdev.pl>
+Date: Wed, 21 Jun 2017 14:32:25 +0200
+Subject: [PATCH] build: fix the way lang_cfg.h is generated
+
+This header is generated by running cmake/lang_cfg.cmake and
+redirecting its stderr. If any warning is emitted by this script, it
+ends up in the generated header and breaks the build.
+
+To avoid such problems: pass the path to the header as an argument to
+the cmake script and use the cmake 'file' command instead of 'message'.
+
+We can't even use message(STATUS...) as - although it prints to stdout
+as opposed to other types of messages - it prepends all output with
+a double hyphen.
+
+Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+---
+ cmake/lang_cfg.cmake | 10 +++++-----
+ src/CMakeLists.txt   |  2 +-
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/lang_cfg.cmake b/cmake/lang_cfg.cmake
+index c57d3ed..86c2d9a 100644
+--- a/cmake/lang_cfg.cmake
++++ b/cmake/lang_cfg.cmake
+@@ -1,10 +1,10 @@
+-if(${CMAKE_ARGC} GREATER 1)
+-	if ("${CMAKE_ARGV3}" STREQUAL "ENONLY")
+-		message("#define ENGLISH_ONLY")
++if(${CMAKE_ARGC} GREATER 2)
++	if ("${CMAKE_ARGV4}" STREQUAL "ENONLY")
++		file(APPEND ${CMAKE_ARGV3} " #define ENGLISH_ONLY")
+ 	else()
+ 		math(EXPR UPTO ${CMAKE_ARGC}-1)
+-		foreach(i RANGE 3 ${UPTO})
+-			message("#define LANG_${CMAKE_ARGV${i}}")
++		foreach(i RANGE 4 ${UPTO})
++			file(APPEND ${CMAKE_ARGV3} " #define LANG_${CMAKE_ARGV${i}}")
+ 		endforeach()
+ 	endif()
+ endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 08c8439..dcf4ef8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -73,7 +73,7 @@ set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1)
+ # lang_cfg.h
+ add_custom_command(
+     COMMENT  "Generating ${GENERATED_SRC}/lang_cfg.h"
+-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h
++    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${GENERATED_SRC}/lang_cfg.h ${LANG_CODES}
+     DEPENDS ${LANGUAGE_FILES}
+     OUTPUT ${GENERATED_SRC}/lang_cfg.h
+ )
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/doxygen/doxygen.hash b/bsp/buildroot/package/doxygen/doxygen.hash
index 40cfe16a..4cf53e7a 100644
--- a/bsp/buildroot/package/doxygen/doxygen.hash
+++ b/bsp/buildroot/package/doxygen/doxygen.hash
@@ -1,2 +1,2 @@
 # Computed locally
-sha256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec  doxygen-1.8.9.1.src.tar.gz
+sha256 af667887bd7a87dc0dbf9ac8d86c96b552dfb8ca9c790ed1cbffaa6131573f6b  doxygen-1.8.13.src.tar.gz
diff --git a/bsp/buildroot/package/doxygen/doxygen.mk b/bsp/buildroot/package/doxygen/doxygen.mk
index cf7dfee2..10cdcf97 100644
--- a/bsp/buildroot/package/doxygen/doxygen.mk
+++ b/bsp/buildroot/package/doxygen/doxygen.mk
@@ -4,26 +4,11 @@
 #
 ################################################################################
 
-DOXYGEN_VERSION = 1.8.9.1
+DOXYGEN_VERSION = 1.8.13
 DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz
 DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri
-DOXYGEN_LICENSE = GPLv2
+DOXYGEN_LICENSE = GPL-2.0
 DOXYGEN_LICENSE_FILES = LICENSE
 HOST_DOXYGEN_DEPENDENCIES = host-flex host-bison
 
-define HOST_DOXYGEN_CONFIGURE_CMDS
-	(cd $(@D); $(HOST_MAKE_ENV) ./configure --shared --prefix=$(HOST_DIR)/usr)
-endef
-
-define HOST_DOXYGEN_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define HOST_DOXYGEN_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
-endef
-
-# Doxygen's configure is a handwritten script, not an autotools-generated one.
-# It doesn't accept host-autotools-package default arguments, so we have to
-# call host-generic-package here.
-$(eval $(host-generic-package))
+$(eval $(host-cmake-package))
diff --git a/bsp/buildroot/package/drbd-utils/drbd-utils.hash b/bsp/buildroot/package/drbd-utils/drbd-utils.hash
index ebd13ef0..bcbed1ee 100644
--- a/bsp/buildroot/package/drbd-utils/drbd-utils.hash
+++ b/bsp/buildroot/package/drbd-utils/drbd-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	38929279d1bf549fd1ade4ce6773a6fe209db51bbb0efe7bf6d2b7871ba0afbc	drbd-utils-8.9.4.tar.gz
+sha256 11299b555b703440ef0af2c74b69cf6dfb833e050b87cfdc3b93d0b71d8820a6  drbd-utils-9.2.0.tar.gz
diff --git a/bsp/buildroot/package/drbd-utils/drbd-utils.mk b/bsp/buildroot/package/drbd-utils/drbd-utils.mk
index eb6042d2..bb28729b 100644
--- a/bsp/buildroot/package/drbd-utils/drbd-utils.mk
+++ b/bsp/buildroot/package/drbd-utils/drbd-utils.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DRBD_UTILS_VERSION = 8.9.4
-DRBD_UTILS_SITE = http://oss.linbit.com/drbd
-DRBD_UTILS_LICENSE = GPLv2+
+DRBD_UTILS_VERSION = 9.2.0
+DRBD_UTILS_SITE = http://www.linbit.com/downloads/drbd/utils
+DRBD_UTILS_LICENSE = GPL-2.0+
 DRBD_UTILS_LICENSE_FILES = COPYING
 DRBD_UTILS_DEPENDENCIES = host-flex
 
diff --git a/bsp/buildroot/package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch b/bsp/buildroot/package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch
new file mode 100644
index 00000000..1467e3bc
--- /dev/null
+++ b/bsp/buildroot/package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch
@@ -0,0 +1,113 @@
+# HG changeset patch
+# User Matt Johnston <matt@ucc.asn.au>
+# Date 1520519133 -28800
+# Node ID 0dc3103a5900971d1d06d9101e062ddbd1112436
+# Parent  0f149d63068d90705db7fb52c8dea15ff32eedd7
+Only advertise a single server ecdsa key when -R (generate as required) is
+specified. Fixes -R now that default ecdsa key size has changed.
+
+Upstream-URL: https://secure.ucc.asn.au/hg/dropbear/rev/0dc3103a5900
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+diff -r 0f149d63068d -r 0dc3103a5900 svr-runopts.c
+--- a/svr-runopts.c	Thu Mar 08 22:22:11 2018 +0800
++++ b/svr-runopts.c	Thu Mar 08 22:25:33 2018 +0800
+@@ -526,8 +526,10 @@
+ 
+ void load_all_hostkeys() {
+ 	int i;
+-	int disable_unset_keys = 1;
+ 	int any_keys = 0;
++#ifdef DROPBEAR_ECDSA
++	int loaded_any_ecdsa = 0;
++#endif
+ 
+ 	svr_opts.hostkey = new_sign_key();
+ 
+@@ -552,14 +554,8 @@
+ #endif
+ 	}
+ 
+-#if DROPBEAR_DELAY_HOSTKEY
+-	if (svr_opts.delay_hostkey) {
+-		disable_unset_keys = 0;
+-	}
+-#endif
+-
+ #if DROPBEAR_RSA
+-	if (disable_unset_keys && !svr_opts.hostkey->rsakey) {
++	if (!svr_opts.delay_hostkey && !svr_opts.hostkey->rsakey) {
+ 		disablekey(DROPBEAR_SIGNKEY_RSA);
+ 	} else {
+ 		any_keys = 1;
+@@ -567,39 +563,54 @@
+ #endif
+ 
+ #if DROPBEAR_DSS
+-	if (disable_unset_keys && !svr_opts.hostkey->dsskey) {
++	if (!svr_opts.delay_hostkey && !svr_opts.hostkey->dsskey) {
+ 		disablekey(DROPBEAR_SIGNKEY_DSS);
+ 	} else {
+ 		any_keys = 1;
+ 	}
+ #endif
+ 
++#if DROPBEAR_ECDSA
++	/* We want to advertise a single ecdsa algorithm size.
++	- If there is a ecdsa hostkey at startup we choose that that size.
++	- If we generate at runtime we choose the default ecdsa size.
++	- Otherwise no ecdsa keys will be advertised */
+ 
+-#if DROPBEAR_ECDSA
++	/* check if any keys were loaded at startup */
++	loaded_any_ecdsa = 
++		0
+ #if DROPBEAR_ECC_256
+-	if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 256)
+-		&& !svr_opts.hostkey->ecckey256) {
++		|| svr_opts.hostkey->ecckey256
++#endif
++#if DROPBEAR_ECC_384
++		|| svr_opts.hostkey->ecckey384
++#endif
++#if DROPBEAR_ECC_521
++		|| svr_opts.hostkey->ecckey521
++#endif
++		;
++	any_keys |= loaded_any_ecdsa;
++
++	/* Or an ecdsa key could be generated at runtime */
++	any_keys |= svr_opts.delay_hostkey;
++
++	/* At most one ecdsa key size will be left enabled */
++#if DROPBEAR_ECC_256
++	if (!svr_opts.hostkey->ecckey256
++		&& (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 256 )) {
+ 		disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256);
+-	} else {
+-		any_keys = 1;
+ 	}
+ #endif
+-
+ #if DROPBEAR_ECC_384
+-	if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 384)
+-		&& !svr_opts.hostkey->ecckey384) {
++	if (!svr_opts.hostkey->ecckey384
++		&& (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 384 )) {
+ 		disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384);
+-	} else {
+-		any_keys = 1;
+ 	}
+ #endif
+-
+ #if DROPBEAR_ECC_521
+-	if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 521)
+-		&& !svr_opts.hostkey->ecckey521) {
++	if (!svr_opts.hostkey->ecckey521
++		&& (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 521 )) {
+ 		disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521);
+-	} else {
+-		any_keys = 1;
+ 	}
+ #endif
+ #endif /* DROPBEAR_ECDSA */
+
diff --git a/bsp/buildroot/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch b/bsp/buildroot/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch
new file mode 100644
index 00000000..958ac992
--- /dev/null
+++ b/bsp/buildroot/package/dropbear/0002-Wait-to-fail-invalid-usernames.patch
@@ -0,0 +1,236 @@
+From 52adbb34c32d3e2e1bcdb941e20a6f81138b8248 Mon Sep 17 00:00:00 2001
+From: Matt Johnston <matt@ucc.asn.au>
+Date: Thu, 23 Aug 2018 23:43:12 +0800
+Subject: [PATCH] Wait to fail invalid usernames
+
+[hg: https://secure.ucc.asn.au/hg/dropbear/rev/5d2d1021ca00]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ auth.h           |  6 +++---
+ svr-auth.c       | 19 +++++--------------
+ svr-authpam.c    | 26 ++++++++++++++++++++++----
+ svr-authpasswd.c | 27 ++++++++++++++-------------
+ svr-authpubkey.c | 11 ++++++++++-
+ 5 files changed, 54 insertions(+), 35 deletions(-)
+
+diff --git a/auth.h b/auth.h
+index da498f5..98f5468 100644
+--- a/auth.h
++++ b/auth.h
+@@ -37,9 +37,9 @@ void recv_msg_userauth_request(void);
+ void send_msg_userauth_failure(int partial, int incrfail);
+ void send_msg_userauth_success(void);
+ void send_msg_userauth_banner(const buffer *msg);
+-void svr_auth_password(void);
+-void svr_auth_pubkey(void);
+-void svr_auth_pam(void);
++void svr_auth_password(int valid_user);
++void svr_auth_pubkey(int valid_user);
++void svr_auth_pam(int valid_user);
+ 
+ #if DROPBEAR_SVR_PUBKEY_OPTIONS_BUILT
+ int svr_pubkey_allows_agentfwd(void);
+diff --git a/svr-auth.c b/svr-auth.c
+index c19c090..edde86b 100644
+--- a/svr-auth.c
++++ b/svr-auth.c
+@@ -149,10 +149,8 @@ void recv_msg_userauth_request() {
+ 		if (methodlen == AUTH_METHOD_PASSWORD_LEN &&
+ 				strncmp(methodname, AUTH_METHOD_PASSWORD,
+ 					AUTH_METHOD_PASSWORD_LEN) == 0) {
+-			if (valid_user) {
+-				svr_auth_password();
+-				goto out;
+-			}
++			svr_auth_password(valid_user);
++			goto out;
+ 		}
+ 	}
+ #endif
+@@ -164,10 +162,8 @@ void recv_msg_userauth_request() {
+ 		if (methodlen == AUTH_METHOD_PASSWORD_LEN &&
+ 				strncmp(methodname, AUTH_METHOD_PASSWORD,
+ 					AUTH_METHOD_PASSWORD_LEN) == 0) {
+-			if (valid_user) {
+-				svr_auth_pam();
+-				goto out;
+-			}
++			svr_auth_pam(valid_user);
++			goto out;
+ 		}
+ 	}
+ #endif
+@@ -177,12 +173,7 @@ void recv_msg_userauth_request() {
+ 	if (methodlen == AUTH_METHOD_PUBKEY_LEN &&
+ 			strncmp(methodname, AUTH_METHOD_PUBKEY,
+ 				AUTH_METHOD_PUBKEY_LEN) == 0) {
+-		if (valid_user) {
+-			svr_auth_pubkey();
+-		} else {
+-			/* pubkey has no failure delay */
+-			send_msg_userauth_failure(0, 0);
+-		}
++		svr_auth_pubkey(valid_user);
+ 		goto out;
+ 	}
+ #endif
+diff --git a/svr-authpam.c b/svr-authpam.c
+index 05e4f3e..d201bc9 100644
+--- a/svr-authpam.c
++++ b/svr-authpam.c
+@@ -178,13 +178,14 @@ pamConvFunc(int num_msg,
+  * Keyboard interactive would be a lot nicer, but since PAM is synchronous, it
+  * gets very messy trying to send the interactive challenges, and read the
+  * interactive responses, over the network. */
+-void svr_auth_pam() {
++void svr_auth_pam(int valid_user) {
+ 
+ 	struct UserDataS userData = {NULL, NULL};
+ 	struct pam_conv pamConv = {
+ 		pamConvFunc,
+ 		&userData /* submitted to pamvConvFunc as appdata_ptr */ 
+ 	};
++	const char* printable_user = NULL;
+ 
+ 	pam_handle_t* pamHandlep = NULL;
+ 
+@@ -204,12 +205,23 @@ void svr_auth_pam() {
+ 
+ 	password = buf_getstring(ses.payload, &passwordlen);
+ 
++	/* We run the PAM conversation regardless of whether the username is valid
++	in case the conversation function has an inherent delay.
++	Use ses.authstate.username rather than ses.authstate.pw_name.
++	After PAM succeeds we then check the valid_user flag too */
++
+ 	/* used to pass data to the PAM conversation function - don't bother with
+ 	 * strdup() etc since these are touched only by our own conversation
+ 	 * function (above) which takes care of it */
+-	userData.user = ses.authstate.pw_name;
++	userData.user = ses.authstate.username;
+ 	userData.passwd = password;
+ 
++	if (ses.authstate.pw_name) {
++		printable_user = ses.authstate.pw_name;
++	} else {
++		printable_user = "<invalid username>";
++	}
++
+ 	/* Init pam */
+ 	if ((rc = pam_start("sshd", NULL, &pamConv, &pamHandlep)) != PAM_SUCCESS) {
+ 		dropbear_log(LOG_WARNING, "pam_start() failed, rc=%d, %s", 
+@@ -242,7 +254,7 @@ void svr_auth_pam() {
+ 				rc, pam_strerror(pamHandlep, rc));
+ 		dropbear_log(LOG_WARNING,
+ 				"Bad PAM password attempt for '%s' from %s",
+-				ses.authstate.pw_name,
++				printable_user,
+ 				svr_ses.addrstring);
+ 		send_msg_userauth_failure(0, 1);
+ 		goto cleanup;
+@@ -253,12 +265,18 @@ void svr_auth_pam() {
+ 				rc, pam_strerror(pamHandlep, rc));
+ 		dropbear_log(LOG_WARNING,
+ 				"Bad PAM password attempt for '%s' from %s",
+-				ses.authstate.pw_name,
++				printable_user,
+ 				svr_ses.addrstring);
+ 		send_msg_userauth_failure(0, 1);
+ 		goto cleanup;
+ 	}
+ 
++	if (!valid_user) {
++		/* PAM auth succeeded but the username isn't allowed in for another reason
++		(checkusername() failed) */
++		send_msg_userauth_failure(0, 1);
++	}
++
+ 	/* successful authentication */
+ 	dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s' from %s",
+ 			ses.authstate.pw_name,
+diff --git a/svr-authpasswd.c b/svr-authpasswd.c
+index bdee2aa..69c7d8a 100644
+--- a/svr-authpasswd.c
++++ b/svr-authpasswd.c
+@@ -48,22 +48,14 @@ static int constant_time_strcmp(const char* a, const char* b) {
+ 
+ /* Process a password auth request, sending success or failure messages as
+  * appropriate */
+-void svr_auth_password() {
++void svr_auth_password(int valid_user) {
+ 	
+ 	char * passwdcrypt = NULL; /* the crypt from /etc/passwd or /etc/shadow */
+ 	char * testcrypt = NULL; /* crypt generated from the user's password sent */
+-	char * password;
++	char * password = NULL;
+ 	unsigned int passwordlen;
+-
+ 	unsigned int changepw;
+ 
+-	passwdcrypt = ses.authstate.pw_passwd;
+-
+-#ifdef DEBUG_HACKCRYPT
+-	/* debugging crypt for non-root testing with shadows */
+-	passwdcrypt = DEBUG_HACKCRYPT;
+-#endif
+-
+ 	/* check if client wants to change password */
+ 	changepw = buf_getbool(ses.payload);
+ 	if (changepw) {
+@@ -73,12 +65,21 @@ void svr_auth_password() {
+ 	}
+ 
+ 	password = buf_getstring(ses.payload, &passwordlen);
+-
+-	/* the first bytes of passwdcrypt are the salt */
+-	testcrypt = crypt(password, passwdcrypt);
++	if (valid_user) {
++		/* the first bytes of passwdcrypt are the salt */
++		passwdcrypt = ses.authstate.pw_passwd;
++		testcrypt = crypt(password, passwdcrypt);
++	}
+ 	m_burn(password, passwordlen);
+ 	m_free(password);
+ 
++	/* After we have got the payload contents we can exit if the username
++	is invalid. Invalid users have already been logged. */
++	if (!valid_user) {
++		send_msg_userauth_failure(0, 1);
++		return;
++	}
++
+ 	if (testcrypt == NULL) {
+ 		/* crypt() with an invalid salt like "!!" */
+ 		dropbear_log(LOG_WARNING, "User account '%s' is locked",
+diff --git a/svr-authpubkey.c b/svr-authpubkey.c
+index aa6087c..ff481c8 100644
+--- a/svr-authpubkey.c
++++ b/svr-authpubkey.c
+@@ -79,7 +79,7 @@ static int checkfileperm(char * filename);
+ 
+ /* process a pubkey auth request, sending success or failure message as
+  * appropriate */
+-void svr_auth_pubkey() {
++void svr_auth_pubkey(int valid_user) {
+ 
+ 	unsigned char testkey; /* whether we're just checking if a key is usable */
+ 	char* algo = NULL; /* pubkey algo */
+@@ -102,6 +102,15 @@ void svr_auth_pubkey() {
+ 	keybloblen = buf_getint(ses.payload);
+ 	keyblob = buf_getptr(ses.payload, keybloblen);
+ 
++	if (!valid_user) {
++		/* Return failure once we have read the contents of the packet
++		required to validate a public key. 
++		Avoids blind user enumeration though it isn't possible to prevent
++		testing for user existence if the public key is known */
++		send_msg_userauth_failure(0, 0);
++		goto out;
++	}
++
+ 	/* check if the key is valid */
+ 	if (checkpubkey(algo, algolen, keyblob, keybloblen) == DROPBEAR_FAILURE) {
+ 		send_msg_userauth_failure(0, 0);
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/dropbear/Config.in b/bsp/buildroot/package/dropbear/Config.in
index d92361fa..5d6b83b6 100644
--- a/bsp/buildroot/package/dropbear/Config.in
+++ b/bsp/buildroot/package/dropbear/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DROPBEAR
 	bool "dropbear"
 	select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
+	select BR2_PACKAGE_LIBTOMCRYPT if !BR2_PACKAGE_DROPBEAR_SMALL
 	help
 	  A small SSH 2 server designed for small memory environments.
 
@@ -13,7 +14,7 @@ config BR2_PACKAGE_DROPBEAR
 	  Alternatively, mount a persistent unionfs over your root
 	  filesystem.
 
-	  http://matt.ucc.asn.au/dropbear/dropbear.html
+	  https://matt.ucc.asn.au/dropbear/dropbear.html
 
 if BR2_PACKAGE_DROPBEAR
 
diff --git a/bsp/buildroot/package/dropbear/dropbear.hash b/bsp/buildroot/package/dropbear/dropbear.hash
index 98776e71..ef2011d9 100644
--- a/bsp/buildroot/package/dropbear/dropbear.hash
+++ b/bsp/buildroot/package/dropbear/dropbear.hash
@@ -1,2 +1,2 @@
 # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
-sha256 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c dropbear-2017.75.tar.bz2
+sha256 f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 dropbear-2018.76.tar.bz2
diff --git a/bsp/buildroot/package/dropbear/dropbear.mk b/bsp/buildroot/package/dropbear/dropbear.mk
index 144619f2..fc41a84c 100644
--- a/bsp/buildroot/package/dropbear/dropbear.mk
+++ b/bsp/buildroot/package/dropbear/dropbear.mk
@@ -4,14 +4,19 @@
 #
 ################################################################################
 
-DROPBEAR_VERSION = 2017.75
-DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
+DROPBEAR_VERSION = 2018.76
+DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
-DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c
+DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
 DROPBEAR_LICENSE_FILES = LICENSE
 DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp
 DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS)
 
+# Disable hardening flags added by dropbear configure.ac, and let
+# Buildroot add them when the relevant options are enabled. This
+# prevents dropbear from using SSP support when not available.
+DROPBEAR_CONF_OPTS = --disable-harden
+
 ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y)
 # Build dbclient, and create a convenience symlink named ssh
 DROPBEAR_PROGRAMS += dbclient
@@ -22,33 +27,34 @@ DROPBEAR_MAKE = \
 	$(MAKE) MULTI=1 SCPPROGRESS=1 \
 	PROGRAMS="$(DROPBEAR_PROGRAMS)"
 
-ifeq ($(BR2_STATIC_LIBS),y)
-DROPBEAR_MAKE += STATIC=1
+# With BR2_SHARED_STATIC_LIBS=y the generic infrastructure adds a
+# --enable-static flags causing dropbear to be built as a static
+# binary. Adding a --disable-static reverts this
+ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+DROPBEAR_CONF_OPTS += --disable-static
 endif
 
-define DROPBEAR_FIX_XAUTH
-	$(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h
+# Ensure that dropbear doesn't use crypt() when it's not available
+define DROPBEAR_SVR_PASSWORD_AUTH
+	echo '#if !HAVE_CRYPT'                          >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0'     >> $(@D)/localoptions.h
+	echo '#endif'                                   >> $(@D)/localoptions.h
 endef
-
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH
 
 define DROPBEAR_ENABLE_REVERSE_DNS
-	$(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
-endef
-
-define DROPBEAR_BUILD_SMALL
-	$(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
+	echo '#define DO_HOST_LOOKUP 1'                 >> $(@D)/localoptions.h
 endef
 
 define DROPBEAR_BUILD_FEATURED
-	$(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
+	echo '#define DROPBEAR_SMALL_CODE 0'            >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_BLOWFISH 1'              >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_TWOFISH128 1'            >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_TWOFISH256 1'            >> $(@D)/localoptions.h
 endef
 
 define DROPBEAR_DISABLE_STANDALONE
-	$(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
+	echo '#define NON_INETD_MODE 0'                 >> $(@D)/localoptions.h
 endef
 
 define DROPBEAR_INSTALL_INIT_SYSTEMD
@@ -73,11 +79,11 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
 endif
 
 ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
-DROPBEAR_CONF_OPTS += --disable-zlib
+DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
 else
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
-DROPBEAR_DEPENDENCIES += zlib
+DROPBEAR_DEPENDENCIES += zlib libtomcrypt
+DROPBEAR_CONF_OPTS += --disable-bundled-libtom
 endif
 
 ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)
diff --git a/bsp/buildroot/package/dropwatch/0001-binutils-2.23.1.patch b/bsp/buildroot/package/dropwatch/0001-binutils-2.23.1.patch
new file mode 100644
index 00000000..f9f090c0
--- /dev/null
+++ b/bsp/buildroot/package/dropwatch/0001-binutils-2.23.1.patch
@@ -0,0 +1,92 @@
+From c89cc908ba7f9f41aba4f61f58103d0fc64fa19f Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Fri, 16 Jun 2017 08:50:03 +0200
+Subject: [PATCH] Fix for binutils 2.23.1
+
+libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf.
+Patch from https://fedorahosted.org/dropwatch/ticket/5
+Upstream status: new.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ src/lookup.c     | 2 +-
+ src/lookup.h     | 3 +++
+ src/lookup_bfd.c | 2 +-
+ src/lookup_kas.c | 2 +-
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/lookup.c b/src/lookup.c
+index ba54991..809981b 100644
+--- a/src/lookup.c
++++ b/src/lookup.c
+@@ -27,13 +27,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ extern struct lookup_methods bfd_methods;
+ extern struct lookup_methods kallsym_methods;
+diff --git a/src/lookup.h b/src/lookup.h
+index e6568d8..47a7b56 100644
+--- a/src/lookup.h
++++ b/src/lookup.h
+@@ -28,6 +28,9 @@
+ #include <stdlib.h>
+ #include <asm/types.h>
+ 
++// satisfy PR 14072 in bfd.h
++#define PACKAGE 1
++#define PACKAGE_VERSION 1
+ 
+ /*
+  * Initalization routine
+diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c
+index cc7010b..271d426 100644
+--- a/src/lookup_bfd.c
++++ b/src/lookup_bfd.c
+@@ -25,13 +25,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ 
+ static int lookup_bfd_init(void)
+diff --git a/src/lookup_kas.c b/src/lookup_kas.c
+index 16e639f..556cb62 100644
+--- a/src/lookup_kas.c
++++ b/src/lookup_kas.c
+@@ -25,7 +25,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <sys/utsname.h>
+-#include <bfd.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
+@@ -33,6 +32,7 @@
+ #include <sys/queue.h>
+ 
+ #include "lookup.h"
++#include <bfd.h>
+ 
+ struct symbol_entry {
+ 	char *sym_name;
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/dropwatch/0001-build.patch b/bsp/buildroot/package/dropwatch/0001-build.patch
deleted file mode 100644
index eed43e8d..00000000
--- a/bsp/buildroot/package/dropwatch/0001-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001
-From: Tzu-Jung Lee <tjlee@ambarella.com>
-Date: Fri, 12 Jul 2013 20:00:57 +0800
-Subject: [PATCH] build: modify hardcoded gcc to support buildroot
-
-Signed-off-by: Tzu-Jung Lee <tjlee@ambarella.com>
-
-diff --git a/src/Makefile b/src/Makefile
-index 026b6ba..b87ae9f 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -5,10 +5,10 @@ OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
-+	$(CC) -g -o dropwatch $(OBJFILES) $(LDFLAGS)
- 
- %.o: %.c
--	gcc $(CFLAGS) $<
-+	$(CC) $(CFLAGS) $<
- clean:
- 	rm -f dropwatch *.o
- 
--- 
-1.8.3.2
-
diff --git a/bsp/buildroot/package/dropwatch/0002-binutils-2.23.1.patch b/bsp/buildroot/package/dropwatch/0002-binutils-2.23.1.patch
deleted file mode 100644
index 4d43356a..00000000
--- a/bsp/buildroot/package/dropwatch/0002-binutils-2.23.1.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf.
-Patch from https://fedorahosted.org/dropwatch/ticket/5
-Upstream status: new.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -aurd src.orig/lookup.c src/lookup.c
---- a/src/lookup.c	2011-10-03 22:51:38.000000000 +0400
-+++ b/src/lookup.c	2013-02-18 09:13:56.683214438 +0400
-@@ -27,13 +27,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-
- #include "lookup.h"
-+#include <bfd.h>
-
- extern struct lookup_methods bfd_methods;
- extern struct lookup_methods kallsym_methods;
-diff -aurd src.orig/lookup.h src/lookup.h
---- a/src/lookup.h	2011-10-03 22:51:38.000000000 +0400
-+++ b/src/lookup.h	2013-02-18 09:11:00.506895026 +0400
-@@ -28,6 +28,9 @@
- #include <stdlib.h>
- #include <asm/types.h>
-
-+// satisfy PR 14072 in bfd.h
-+#define PACKAGE 1
-+#define PACKAGE_VERSION 1
-
- /*
-  * Initalization routine
-diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c
---- a/src/lookup_bfd.c	2012-01-16 22:34:11.000000000 +0400
-+++ b/src/lookup_bfd.c	2013-02-18 09:14:02.472984310 +0400
-@@ -25,13 +25,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-
- #include "lookup.h"
-+#include <bfd.h>
-
-
- static int lookup_bfd_init(void)
-diff -aurd src.orig/lookup_kas.c src/lookup_kas.c
---- a/src/lookup_kas.c	2012-05-31 02:43:23.000000000 +0400
-+++ b/src/lookup_kas.c	2013-02-18 09:14:07.906101713 +0400
-@@ -25,7 +25,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -33,6 +32,7 @@
- #include <sys/queue.h>
-
- #include "lookup.h"
-+#include <bfd.h>
-
- struct symbol_entry {
- 	char *sym_name;
diff --git a/bsp/buildroot/package/dropwatch/0002-remove-werror.patch b/bsp/buildroot/package/dropwatch/0002-remove-werror.patch
new file mode 100644
index 00000000..4b6c9893
--- /dev/null
+++ b/bsp/buildroot/package/dropwatch/0002-remove-werror.patch
@@ -0,0 +1,31 @@
+From 2462baf55939ee53bb28ff5f9474761f2a888add Mon Sep 17 00:00:00 2001
+From: Markos Chandras <markos.chandras@imgtec.com>
+Date: Fri, 16 Jun 2017 08:53:31 +0200
+Subject: [PATCH] remove werror
+
+-Werror shouldn't be used in released code since it can
+cause random build failures on moderate warnings. It also
+depends on the used toolchain since different toolchains may
+or may not print the same warnings.
+
+Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 5bc6aaa..527c1da 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,7 +1,7 @@
+ all: dropwatch
+ 
+ CPPFLAGS += -D_GNU_SOURCE
+-CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0)
++CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0)
+ LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3
+ 
+ OBJFILES := main.o lookup.o\
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/dropwatch/0003-remove-werror.patch b/bsp/buildroot/package/dropwatch/0003-remove-werror.patch
deleted file mode 100644
index 97b26b74..00000000
--- a/bsp/buildroot/package/dropwatch/0003-remove-werror.patch
+++ /dev/null
@@ -1,18 +0,0 @@
--Werror shouldn't be used in released code since it can
-cause random build failures on moderate warnings. It also
-depends on the used toolchain since different toolchains may
-or may not print the same warnings.
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-
-Index: dropwatch-1.4/src/Makefile
-===================================================================
---- dropwatch-1.4.orig/src/Makefile
-+++ dropwatch-1.4/src/Makefile
-@@ -1,5 +1,5 @@
- all: dropwatch
--CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
-+CFLAGS+=-c -g -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
- LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
diff --git a/bsp/buildroot/package/dropwatch/Config.in b/bsp/buildroot/package/dropwatch/Config.in
index 6f04c85d..f470f1b5 100644
--- a/bsp/buildroot/package/dropwatch/Config.in
+++ b/bsp/buildroot/package/dropwatch/Config.in
@@ -1,16 +1,16 @@
 config BR2_PACKAGE_DROPWATCH
 	bool "dropwatch"
-	select BR2_PACKAGE_BINUTILS
 	depends on !BR2_nios2 # binutils
 	depends on BR2_USE_WCHAR # binutils
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
+	select BR2_PACKAGE_BINUTILS
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_LIBNL
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	help
 	  Dropwatch is an interactive utility for monitoring and
 	  recording packets that are dropped by the kernel
 
-	  https://fedorahosted.org/dropwatch/
+	  http://git.infradead.org/users/nhorman/dropwatch.git
 
 comment "dropwatch needs a toolchain w/ threads, wchar"
 	depends on !BR2_nios2
diff --git a/bsp/buildroot/package/dropwatch/dropwatch.hash b/bsp/buildroot/package/dropwatch/dropwatch.hash
index 3f15c84e..585b035d 100644
--- a/bsp/buildroot/package/dropwatch/dropwatch.hash
+++ b/bsp/buildroot/package/dropwatch/dropwatch.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 c2348b8d72781ab0f3ca52b8415d78ea98808280e14e7d68e76605f196bb5c4a  dropwatch-1.4.tar.xz
+sha256 4937007da3d0071c9a37ee0360cfd1657b342fd2a327d83ba992fbf3e0ea51b5  dropwatch-7c33d8a8ed105b07a46b55d71d93b36ed34c16db.tar.gz
diff --git a/bsp/buildroot/package/dropwatch/dropwatch.mk b/bsp/buildroot/package/dropwatch/dropwatch.mk
index 3565927e..692a6e8c 100644
--- a/bsp/buildroot/package/dropwatch/dropwatch.mk
+++ b/bsp/buildroot/package/dropwatch/dropwatch.mk
@@ -4,26 +4,22 @@
 #
 ################################################################################
 
-DROPWATCH_VERSION = 1.4
-DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.xz
-DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot
-DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf
-DROPWATCH_LICENSE = GPLv2
+DROPWATCH_VERSION = 7c33d8a8ed105b07a46b55d71d93b36ed34c16db
+DROPWATCH_SITE = git://git.infradead.org/users/nhorman/dropwatch.git
+DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf \
+	$(TARGET_NLS_DEPENDENCIES)
+DROPWATCH_LICENSE = GPL-2.0
 DROPWATCH_LICENSE_FILES = COPYING
 
 # libbfd may be linked to libintl
-# Ugly... but LDFLAGS are hardcoded anyway
-DROPWATCH_LDFLAGS = \
-	$(TARGET_LDFLAGS) -lbfd -lreadline -lnl-3 -lnl-genl-3 \
-		-lpthread -lncurses -lm
-
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-DROPWATCH_LDFLAGS += -lintl
-endif
+# Ugly... but LDLIBS are hardcoded anyway
+DROPWATCH_LDLIBS = \
+	-lbfd -lreadline -lnl-3 -lnl-genl-3 -lpthread -lncurses -lm \
+	$(TARGET_NLS_LIBS)
 
 define DROPWATCH_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		LDFLAGS="$(DROPWATCH_LDFLAGS)" build
+		LDLIBS="$(DROPWATCH_LDLIBS)" build
 endef
 
 define DROPWATCH_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/dsp-tools/dsp-tools.mk b/bsp/buildroot/package/dsp-tools/dsp-tools.mk
index c91ed206..ec63bcd1 100644
--- a/bsp/buildroot/package/dsp-tools/dsp-tools.mk
+++ b/bsp/buildroot/package/dsp-tools/dsp-tools.mk
@@ -7,7 +7,7 @@
 DSP_TOOLS_VERSION = v2.0
 DSP_TOOLS_SITE = $(call github,felipec,dsp-tools,$(DSP_TOOLS_VERSION))
 DSP_TOOLS_DEPENDENCIES = tidsp-binaries
-DSP_TOOLS_LICENSE = LGPLv2.1
+DSP_TOOLS_LICENSE = LGPL-2.1
 DSP_TOOLS_LICENSE_FILES = LICENSE
 
 define DSP_TOOLS_BUILD_CMDS
diff --git a/bsp/buildroot/package/dstat/Config.in b/bsp/buildroot/package/dstat/Config.in
index 6536a5e5..110aee84 100644
--- a/bsp/buildroot/package/dstat/Config.in
+++ b/bsp/buildroot/package/dstat/Config.in
@@ -6,19 +6,20 @@ config BR2_PACKAGE_DSTAT
 	depends on !BR2_STATIC_LIBS # python
 	select BR2_PACKAGE_PYTHON
 	help
-	  Dstat, written in Python, is a versatile replacement for vmstat,
-	  iostat, netstat and ifstat. Dstat overcomes some of their limitations
-	  and adds some extra features, more counters and flexibility. Dstat is
-	  handy for monitoring systems during performance tuning tests,
-	  benchmarks or troubleshooting.
-	  Dstat allows you to view all of your system resources in real-time,
-	  you can e.g. compare disk utilization in combination with interrupts
-	  from your IDE controller, or compare the network bandwidth numbers
-	  directly with the disk throughput (in the same interval).
+	  Dstat, written in Python, is a versatile replacement for
+	  vmstat, iostat, netstat and ifstat. Dstat overcomes some of
+	  their limitations and adds some extra features, more counters
+	  and flexibility. Dstat is handy for monitoring systems during
+	  performance tuning tests, benchmarks or troubleshooting.
+	  Dstat allows you to view all of your system resources in
+	  real-time, you can e.g. compare disk utilization in
+	  combination with interrupts from your IDE controller, or
+	  compare the network bandwidth numbers directly with the disk
+	  throughput (in the same interval).
 
-	  Note that to get proper output, your terminal size should be known by
-	  the termios subsystem. This can be done by running the 'resize'
-	  utility of busybox.
+	  Note that to get proper output, your terminal size should be
+	  known by the termios subsystem. This can be done by running
+	  the 'resize' utility of busybox.
 
 	  http://dag.wieers.com/home-made/dstat/
 
diff --git a/bsp/buildroot/package/dstat/dstat.hash b/bsp/buildroot/package/dstat/dstat.hash
index f7015617..a4dbcc98 100644
--- a/bsp/buildroot/package/dstat/dstat.hash
+++ b/bsp/buildroot/package/dstat/dstat.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  34a986d9d7c028bd9dcb6b2ef1c740f7220de5c9cf976870a2b62aca23b33bae  dstat-0.7.2.tar.bz2
+sha256 46e63821857b69fbc60cb2c7d893ccdd6f31cd9ef24b8bb0b68951e1c7374898  dstat-0.7.3.tar.gz
diff --git a/bsp/buildroot/package/dstat/dstat.mk b/bsp/buildroot/package/dstat/dstat.mk
index 180031f2..9c4b4457 100644
--- a/bsp/buildroot/package/dstat/dstat.mk
+++ b/bsp/buildroot/package/dstat/dstat.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-DSTAT_VERSION = 0.7.2
-DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2
-DSTAT_SITE = http://dag.wieers.com/home-made/dstat
-DSTAT_LICENSE = GPLv2
+DSTAT_VERSION = 0.7.3
+DSTAT_SITE = $(call github,dagwieers,dstat,$(DSTAT_VERSION))
+DSTAT_LICENSE = GPL-2.0
 DSTAT_LICENSE_FILES = COPYING
 
 define DSTAT_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch b/bsp/buildroot/package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch
new file mode 100644
index 00000000..79c43d6a
--- /dev/null
+++ b/bsp/buildroot/package/dt-utils/0001-common-Rename-strlcpy-to-DT_strlcpy.patch
@@ -0,0 +1,58 @@
+From 3d229cc0f8dc81335c53b1f7471ef82ef2f6e570 Mon Sep 17 00:00:00 2001
+From: Marcin Niestroj <m.niestroj@grinn-global.com>
+Date: Fri, 23 Jun 2017 11:11:04 +0200
+Subject: [PATCH] common: Rename strlcpy to DT_strlcpy
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+strlcpy function is defined in uClibc library, causing "static
+declaration of ‘strlcpy’ follows non-static declaration" build
+errors.
+
+Rename internal strlcpy function to DT_strlcpy to avoid conflicts.
+
+Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
+---
+ src/dt/common.h | 4 ++--
+ src/libdt.c     | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/dt/common.h b/src/dt/common.h
+index f6bad44..992e28f 100644
+--- a/src/dt/common.h
++++ b/src/dt/common.h
+@@ -168,7 +168,7 @@ static inline char *barebox_asprintf(const char *fmt, ...)
+ #define basprintf(fmt, arg...) barebox_asprintf(fmt, ##arg)
+ 
+ /**
+- * strlcpy - Copy a %NUL terminated string into a sized buffer
++ * DT_strlcpy - Copy a %NUL terminated string into a sized buffer
+  * @dest: Where to copy the string to
+  * @src: Where to copy the string from
+  * @size: size of destination buffer
+@@ -178,7 +178,7 @@ static inline char *barebox_asprintf(const char *fmt, ...)
+  * of course, the buffer size is zero). It does not pad
+  * out the result like strncpy() does.
+  */
+-static inline size_t strlcpy(char *dest, const char *src, size_t size)
++static inline size_t DT_strlcpy(char *dest, const char *src, size_t size)
+ {
+ 	size_t ret = strlen(src);
+ 
+diff --git a/src/libdt.c b/src/libdt.c
+index 4db5160..3adeed2 100644
+--- a/src/libdt.c
++++ b/src/libdt.c
+@@ -1503,7 +1503,7 @@ int of_modalias_node(struct device_node *node, char *modalias, int len)
+ 	if (!compatible || strlen(compatible) > cplen)
+ 		return -ENODEV;
+ 	p = strchr(compatible, ',');
+-	strlcpy(modalias, p ? p + 1 : compatible, len);
++	DT_strlcpy(modalias, p ? p + 1 : compatible, len);
+ 	return 0;
+ }
+ 
+-- 
+2.13.1
+
diff --git a/bsp/buildroot/package/dt-utils/0002-common-Include-sys-types.h-header.patch b/bsp/buildroot/package/dt-utils/0002-common-Include-sys-types.h-header.patch
new file mode 100644
index 00000000..a49d4686
--- /dev/null
+++ b/bsp/buildroot/package/dt-utils/0002-common-Include-sys-types.h-header.patch
@@ -0,0 +1,38 @@
+From b8bc4e83bf447b6330ece54e94a1684d12ecdd0b Mon Sep 17 00:00:00 2001
+From: Marcin Niestroj <m.niestroj@grinn-global.com>
+Date: Fri, 23 Jun 2017 12:00:30 +0200
+Subject: [PATCH] common: Include sys/types.h header
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Build with musl library fails with following error:
+
+In file included from src/crypto/sha1.c:21:0:
+./src/digest.h:95:10: error: unknown type name ‘ulong’
+          ulong start, ulong size);
+...
+
+Fix that by including sys/types.h header in common.h, so ulong type
+is defined with musl library.
+
+Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
+---
+ src/dt/common.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/dt/common.h b/src/dt/common.h
+index 992e28f..1425c53 100644
+--- a/src/dt/common.h
++++ b/src/dt/common.h
+@@ -13,6 +13,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/types.h>
+ 
+ #include <mtd/mtd-abi.h>
+ 
+-- 
+2.13.1
+
diff --git a/bsp/buildroot/package/dt-utils/Config.in b/bsp/buildroot/package/dt-utils/Config.in
new file mode 100644
index 00000000..7c9a1dee
--- /dev/null
+++ b/bsp/buildroot/package/dt-utils/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_DT_UTILS
+	bool "dt-utils"
+	depends on BR2_PACKAGE_HAS_UDEV
+	help
+	  Tools for flattened device-tree dumping and barebox state
+	  manipulation.
+
+	  https://git.pengutronix.de/cgit/tools/dt-utils/
+
+comment "dt-utils needs udev /dev management"
+	depends on !BR2_PACKAGE_HAS_UDEV
diff --git a/bsp/buildroot/package/dt-utils/dt-utils.mk b/bsp/buildroot/package/dt-utils/dt-utils.mk
new file mode 100644
index 00000000..5b137505
--- /dev/null
+++ b/bsp/buildroot/package/dt-utils/dt-utils.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# dt-utils
+#
+################################################################################
+
+DT_UTILS_VERSION = v2017.03.0
+DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils
+DT_UTILS_SITE_METHOD = git
+DT_UTILS_LICENSE = GPL-2.0
+DT_UTILS_LICENSE_FILES = COPYING
+DT_UTILS_DEPENDENCIES = udev
+DT_UTILS_AUTORECONF = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/dtach/Config.in b/bsp/buildroot/package/dtach/Config.in
index bea112b3..3e6e4934 100644
--- a/bsp/buildroot/package/dtach/Config.in
+++ b/bsp/buildroot/package/dtach/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_DTACH
 	bool "dtach"
 	depends on BR2_USE_MMU # fork()
 	help
-	  dtach is a tiny program that emulates the detach feature of screen,
-	  allowing you to run a program in an environment that is protected
-	  from the controlling terminal and attach to it later.
+	  dtach is a tiny program that emulates the detach feature of
+	  screen, allowing you to run a program in an environment that
+	  is protected from the controlling terminal and attach to it
+	  later.
 
 	  http://dtach.sourceforge.net/
diff --git a/bsp/buildroot/package/dtach/dtach.mk b/bsp/buildroot/package/dtach/dtach.mk
index 75c44347..571481cd 100644
--- a/bsp/buildroot/package/dtach/dtach.mk
+++ b/bsp/buildroot/package/dtach/dtach.mk
@@ -6,7 +6,7 @@
 
 DTACH_VERSION = v0.9
 DTACH_SITE = $(call github,crigler,dtach,$(DTACH_VERSION))
-DTACH_LICENSE = GPLv2+
+DTACH_LICENSE = GPL-2.0+
 DTACH_LICENSE_FILES = COPYING
 
 # The Makefile does not have an install target.
diff --git a/bsp/buildroot/package/dtc/0002-extra-cflags.patch b/bsp/buildroot/package/dtc/0002-extra-cflags.patch
deleted file mode 100644
index f070692c..00000000
--- a/bsp/buildroot/package/dtc/0002-extra-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Makefile: append the CFLAGS to existing ones
-
-Allow the user to pass custom CFLAGS (eg. optimisation flags).
-
-Do not use EXTRA_CFLAGS, append to existing CFLAGS with +=  (Arnout)
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Cc: Arnout Vandecappelle <arnout@mind.be>
-
----
-Patch not sent upstream.
-
-Although not specific to buildroot, I am not sure this is the best
-way to handle user-supplied CFLAGS.
-
-diff --git a/Makefile b/Makefile
-index 962f94eba661..bf6b317158cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,9 +16,10 @@ LOCAL_VERSION =
- CONFIG_LOCALVERSION =
- 
- CPPFLAGS = -I libfdt -I .
--WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
-+WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \
- 	-Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow
--CFLAGS = -g -Os -fPIC -Werror $(WARNINGS)
-+CFLAGS ?= -g -Os
-+CFLAGS += -fPIC $(WARNINGS)
- 
- BISON = bison
- LEX = flex
diff --git a/bsp/buildroot/package/dtc/Config.in b/bsp/buildroot/package/dtc/Config.in
index 39223f72..73bd3688 100644
--- a/bsp/buildroot/package/dtc/Config.in
+++ b/bsp/buildroot/package/dtc/Config.in
@@ -6,7 +6,8 @@ config BR2_PACKAGE_DTC
 	  a given format and outputs a device-tree in another format.
 
 	  Note that only the library is installed.
-	  If you want the programs, say 'y' here, and to "dtc programs", below.
+	  If you want the programs, say 'y' here, and to "dtc programs",
+	  below.
 
 	  https://git.kernel.org/cgit/utils/dtc/dtc.git
 
@@ -19,13 +20,14 @@ config BR2_PACKAGE_DTC_PROGRAMS
 	    - convert-dtsv0     convert from version 0 to version 1
 	    - dtc               the device tree compiler
 	    - dtdiff            compare two device trees (needs bash)
-	    - fdtdump           print a readable version of a flat device tree
+	    - fdtdump           print a readable version of a
+	                        flat device tree
 	    - fdtget            read values from device tree
 	    - fdtput            write a property value to a device tree
 
-	  Note: dtdiff requires bash, so if bash is not selected, dtdiff will
-	        be removed from the target file system. Enable bash if you
-	        need dtdiff on the target.
+	  Note: dtdiff requires bash, so if bash is not selected, dtdiff
+	  will be removed from the target file system. Enable bash if
+	  you need dtdiff on the target.
 
 comment "dtdiff will not be installed: it requires bash"
 	depends on BR2_PACKAGE_DTC_PROGRAMS
diff --git a/bsp/buildroot/package/dtc/Config.in.host b/bsp/buildroot/package/dtc/Config.in.host
index cbabf0a2..f80a49bb 100644
--- a/bsp/buildroot/package/dtc/Config.in.host
+++ b/bsp/buildroot/package/dtc/Config.in.host
@@ -4,6 +4,7 @@ config BR2_PACKAGE_HOST_DTC
 	  The Device Tree Compiler, dtc, takes as input a device-tree in
 	  a given format and outputs a device-tree in another format.
 
-	  Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and fdtput.
+	  Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and
+	  fdtput.
 
 	  https://git.kernel.org/cgit/utils/dtc/dtc.git
diff --git a/bsp/buildroot/package/dtc/dtc.hash b/bsp/buildroot/package/dtc/dtc.hash
index 8b3af331..75c2e40e 100644
--- a/bsp/buildroot/package/dtc/dtc.hash
+++ b/bsp/buildroot/package/dtc/dtc.hash
@@ -1,2 +1,2 @@
 # from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc
-sha256 77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94  dtc-1.4.1.tar.xz
+sha256 470731d5c015b160d26a96645dbb1c7337d6e7b8c98244612002b66bedf6cffb  dtc-1.4.4.tar.xz
diff --git a/bsp/buildroot/package/dtc/dtc.mk b/bsp/buildroot/package/dtc/dtc.mk
index f6800f36..1bcee29b 100644
--- a/bsp/buildroot/package/dtc/dtc.mk
+++ b/bsp/buildroot/package/dtc/dtc.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-DTC_VERSION = 1.4.1
+DTC_VERSION = 1.4.4
 DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz
 DTC_SITE = https://www.kernel.org/pub/software/utils/dtc
-DTC_LICENSE = GPLv2+ or BSD-2c (library)
+DTC_LICENSE = GPL-2.0+ or BSD-2-Clause (library)
 DTC_LICENSE_FILES = README.license GPL
 DTC_INSTALL_STAGING = YES
 DTC_DEPENDENCIES = host-bison host-flex
@@ -19,7 +19,7 @@ endef
 
 ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y)
 
-DTC_LICENSE := $(DTC_LICENSE), GPLv2+ (programs)
+DTC_LICENSE := $(DTC_LICENSE), GPL-2.0+ (programs)
 DTC_INSTALL_GOAL = install
 ifeq ($(BR2_PACKAGE_BASH),)
 DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF
@@ -32,7 +32,7 @@ DTC_INSTALL_GOAL = install-lib
 endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y
 
 define DTC_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(TARGET_CFLAGS) -fPIC" -C $(@D) PREFIX=/usr
 endef
 
 # For staging, only the library is needed
@@ -47,11 +47,11 @@ endef
 
 # host build
 define HOST_DTC_BUILD_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr
+	$(HOST_CONFIGURE_OPTS) $(MAKE) CFLAGS="$(HOST_CFLAGS) -fPIC" -C $(@D) PREFIX=$(HOST_DIR)
 endef
 
 define HOST_DTC_INSTALL_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash b/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash
new file mode 100644
index 00000000..02f086dc
--- /dev/null
+++ b/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 ec64aa81a207372340a04d3e9e950ff2f8b4f404580f21480cdbf06019057a9f  dtv-scan-tables-ceb11833b35f05813b1f0397a60e0f3b99430aab.tar.gz
diff --git a/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk b/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk
index 8a782cb4..3c546ed8 100644
--- a/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk
+++ b/bsp/buildroot/package/dtv-scan-tables/dtv-scan-tables.mk
@@ -12,9 +12,9 @@ DTV_SCAN_TABLES_SITE_METHOD = git
 # as per traditional copyright, but just a collection of 'facts', so there's
 # probably no license to apply to these data files.
 # However, the package prominently contains the COPYING and COPYING.LIB
-# license files (respectively for the GPLv2 and the LGPLv2.1), so we use
+# license files (respectively for the GPL-2.0 and the LGPL-2.1), so we use
 # that as the licensing information.
-DTV_SCAN_TABLES_LICENSE = GPLv2, LGPLv2.1
+DTV_SCAN_TABLES_LICENSE = GPL-2.0, LGPL-2.1
 DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL
 
 # In order to avoid issues with file name encodings, we rename the
diff --git a/bsp/buildroot/package/duma/duma.mk b/bsp/buildroot/package/duma/duma.mk
index cd7f33ed..0e8a623b 100644
--- a/bsp/buildroot/package/duma/duma.mk
+++ b/bsp/buildroot/package/duma/duma.mk
@@ -7,7 +7,7 @@
 DUMA_VERSION = 2.5.15
 DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz
 DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION)
-DUMA_LICENSE = GPLv2+, LGPLv2.1+
+DUMA_LICENSE = GPL-2.0+, LGPL-2.1+
 DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL
 
 DUMA_INSTALL_STAGING = YES
@@ -18,9 +18,9 @@ DUMA_OPTIONS = \
 # The dependency of some source files in duma_config.h, which is generated at
 # build time, is not specified in the Makefile. Force non-parallel build.
 define DUMA_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS)       \
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \
 		OS=linux \
-		DUMA_OPTIONS="$(DUMA_OPTIONS)"   \
+		DUMA_OPTIONS="$(DUMA_OPTIONS)" \
 		$(DUMA_CPP) -C $(@D)
 endef
 
diff --git a/bsp/buildroot/package/dump1090/Config.in b/bsp/buildroot/package/dump1090/Config.in
new file mode 100644
index 00000000..c796faef
--- /dev/null
+++ b/bsp/buildroot/package/dump1090/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_DUMP1090
+	bool "dump1090"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # librtlsdr
+	select BR2_PACKAGE_LIBRTLSDR
+	help
+	  Dump1090 is a simple Mode S decoder for RTLSDR devices
+
+	  https://github.com/MalcolmRobb/dump1090
+
+comment "dump1090 needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/dump1090/dump1090.hash b/bsp/buildroot/package/dump1090/dump1090.hash
new file mode 100644
index 00000000..fbbf21a0
--- /dev/null
+++ b/bsp/buildroot/package/dump1090/dump1090.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 72c1a94f3e6788af1e72b8cac13bb53e0989fe02cd13e191133f5519d2a2fefb  dump1090-bff92c4ad772a0a8d433f788d39dae97e00e4dbe.tar.gz
+sha256 29046ef7ee0b7b127bcc64faf135035820906dea2b379b2efcfc119131a39f7a  anet.h
diff --git a/bsp/buildroot/package/dump1090/dump1090.mk b/bsp/buildroot/package/dump1090/dump1090.mk
new file mode 100644
index 00000000..69fd6794
--- /dev/null
+++ b/bsp/buildroot/package/dump1090/dump1090.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# dump1090
+#
+################################################################################
+
+DUMP1090_VERSION = bff92c4ad772a0a8d433f788d39dae97e00e4dbe
+DUMP1090_SITE = $(call github,MalcolmRobb,dump1090,$(DUMP1090_VERSION))
+DUMP1090_LICENSE = BSD-3-Clause
+# no real license file
+DUMP1090_LICENSE_FILES = anet.h
+DUMP1090_DEPENDENCIES = host-pkgconf librtlsdr
+
+define DUMP1090_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr -C $(@D)
+endef
+
+define DUMP1090_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/dump1090 $(TARGET_DIR)/usr/bin/dump1090
+	$(INSTALL) -m 0755 -D $(@D)/view1090 $(TARGET_DIR)/usr/bin/view1090
+	$(INSTALL) -d $(TARGET_DIR)/usr/share/dump1090
+	cp -r $(@D)/public_html/* $(TARGET_DIR)/usr/share/dump1090
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch b/bsp/buildroot/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch
new file mode 100644
index 00000000..279cdecb
--- /dev/null
+++ b/bsp/buildroot/package/dvb-apps/0005-utils-fix-build-with-kernel-headers-4.14.patch
@@ -0,0 +1,52 @@
+# HG changeset patch
+# User "Yann E. MORIN" <yann.morin.1998@free.fr>
+# Date 1511772629 -3600
+#      Mon Nov 27 09:50:29 2017 +0100
+# Branch yem/fixes
+# Node ID 0848fa96c6eb13cf37249d317eff12cbd2f59ff7
+# Parent  3d43b280298c39a67d1d889e01e173f52c12da35
+utils: fix build with kernel headers >= 4.14
+
+In kernel 4.14, CA_SET_PID was removed, in commit 833ff5e7feda (media:
+ca.h: get rid of CA_SET_PID).
+
+Fix dst-util to not fail the build when this is missing.
+
+Fiuxes build failures such as:
+    http://autobuild.buildroot.org/results/708/708f11809b2cafc2a3375dc515803c87b376ed4d/build-end.log
+    http://autobuild.buildroot.org/results/e39/e3939d44376e92e8a35fb179d9890510334d8304/build-end.log
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/util/dst-utils/dst_test.c b/util/dst-utils/dst_test.c
+--- a/util/dst-utils/dst_test.c
++++ b/util/dst-utils/dst_test.c
+@@ -111,6 +111,7 @@
+ 	return 0;
+ }
+ 
++#if defined CA_SET_PID
+ static int dst_set_pid(int cafd)
+ {
+ 	if ((ioctl(cafd, CA_SET_PID)) < 0) {
+@@ -120,6 +121,7 @@
+ 
+ 	return 0;
+ }
++#endif
+ 
+ static int dst_get_descr(int cafd)
+ {
+@@ -230,8 +232,12 @@
+ 				dst_reset(cafd);
+ 				break;
+ 			case 'p':
++#if defined CA_SET_PID
+ 				printf("%s: PID\n", __FUNCTION__);
+ 				dst_set_pid(cafd);
++#else
++				printf("%s: PID not supported\n", __FUNCTION__);
++#endif
+ 				break;
+ 			case 'g':
+ 				printf("%s: Get Desc\n", __FUNCTION__);
diff --git a/bsp/buildroot/package/dvb-apps/dvb-apps.mk b/bsp/buildroot/package/dvb-apps/dvb-apps.mk
index fdd2643d..ffab0db6 100644
--- a/bsp/buildroot/package/dvb-apps/dvb-apps.mk
+++ b/bsp/buildroot/package/dvb-apps/dvb-apps.mk
@@ -7,7 +7,7 @@
 DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35
 DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps
 DVB_APPS_SITE_METHOD = hg
-DVB_APPS_LICENSE = GPLv2, GPLv2+, LGPLv2.1+
+DVB_APPS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1+
 DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL
 
 ifeq ($(BR2_ENABLE_LOCALE),)
diff --git a/bsp/buildroot/package/dvblast/Config.in b/bsp/buildroot/package/dvblast/Config.in
index b7f0c065..c358531e 100644
--- a/bsp/buildroot/package/dvblast/Config.in
+++ b/bsp/buildroot/package/dvblast/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_DVBLAST
 	bool "dvblast"
+	depends on !BR2_bfin  # libev
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
 	select BR2_PACKAGE_BITSTREAM
 	select BR2_PACKAGE_LIBEV
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on !BR2_bfin  # libev
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
 	help
 	  DVBlast is a simple and powerful MPEG-2/TS demux and
 	  streaming application.
diff --git a/bsp/buildroot/package/dvblast/dvblast.hash b/bsp/buildroot/package/dvblast/dvblast.hash
index 198549f4..d6ec4cb0 100644
--- a/bsp/buildroot/package/dvblast/dvblast.hash
+++ b/bsp/buildroot/package/dvblast/dvblast.hash
@@ -1,4 +1,2 @@
-# from https://get.videolan.org/dvblast/3.0/dvblast-3.0.tar.bz2.md5
-md5 89ea9ffb16476d47b8853e52a8a3ee63 dvblast-3.0.tar.bz2
-# locally calculated
-sha256 4fc3eb2a3d3545cb76a5c515a16671d1c34fe2f5dad57b71e89bd54c14c3045e dvblast-3.0.tar.bz2
+# From https://get.videolan.org/dvblast/3.1/dvblast-3.1.tar.bz2
+sha256 3159e8666a3b1822aeccd01684bdcad712a0da88d758bef6b7e2c396f27fd3e0  dvblast-3.1.tar.bz2
diff --git a/bsp/buildroot/package/dvblast/dvblast.mk b/bsp/buildroot/package/dvblast/dvblast.mk
index ef9a6669..3cf24df2 100644
--- a/bsp/buildroot/package/dvblast/dvblast.mk
+++ b/bsp/buildroot/package/dvblast/dvblast.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-DVBLAST_VERSION = 3.0
+DVBLAST_VERSION = 3.1
 DVBLAST_SOURCE = dvblast-$(DVBLAST_VERSION).tar.bz2
 DVBLAST_SITE = https://get.videolan.org/dvblast/$(DVBLAST_VERSION)
-DVBLAST_LICENSE = GPLv2+, WTFPL
+DVBLAST_LICENSE = GPL-2.0+, WTFPL
 DVBLAST_LICENSE_FILES = COPYING COPYING.WTFPL
 DVBLAST_DEPENDENCIES = bitstream libev
 
diff --git a/bsp/buildroot/package/dvbsnoop/Config.in b/bsp/buildroot/package/dvbsnoop/Config.in
index fc34c349..fb63fa4e 100644
--- a/bsp/buildroot/package/dvbsnoop/Config.in
+++ b/bsp/buildroot/package/dvbsnoop/Config.in
@@ -1,21 +1,21 @@
 config BR2_PACKAGE_DVBSNOOP
 	bool "dvbsnoop"
 	help
-	  Dvbsnoop is just a simple tool to analyze, view or debug a transport
-	  stream (TS), program elementary stream (PES) or even a program stream
-	  (PS). Dvbsnoop is trying to get input mostly direct from a frontend
-	  (satellite or cable tuner inside a set-top box for example) via DVB
-	  APIv3 to view into a TS, or a demux to view PES or PS (also mostly
-	  inside the set-top box or even PCI Card or USB Plug) but also from a
-	  file (recorded TS).
-	  Dvbsnoop is working well on SD transport streams but may have some
-	  limited functionality on HD transport streams (DVB-{C,S,T}2 because
-	  of missing knowledge how to handle it.
+	  Dvbsnoop is just a simple tool to analyze, view or debug a
+	  transport stream (TS), program elementary stream (PES) or even
+	  a program stream (PS). Dvbsnoop is trying to get input mostly
+	  direct from a frontend (satellite or cable tuner inside a
+	  set-top box for example) via DVB APIv3 to view into a TS, or a
+	  demux to view PES or PS (also mostly inside the set-top box or
+	  even PCI Card or USB Plug) but also from a file (recorded TS).
+	  Dvbsnoop is working well on SD transport streams but may have
+	  some limited functionality on HD transport streams
+	  (DVB-{C,S,T}2 because of missing knowledge how to handle it.
 
-	  Dvbsnoop itself doesn't do the tuning on the frontend, this has to be
-	  done by external helpers or manually driver call.
-	  The dvbsnoop tool was written while developing the software Neutrino
-	  on the set-top box DBox2.
+	  Dvbsnoop itself doesn't do the tuning on the frontend, this
+	  has to be done by external helpers or manually driver call.
+	  The dvbsnoop tool was written while developing the software
+	  Neutrino on the set-top box DBox2.
 
 	  http://dvbsnoop.sourceforge.net
 	  http://en.wikipedia.org/wiki/DBox2
diff --git a/bsp/buildroot/package/dvbsnoop/dvbsnoop.mk b/bsp/buildroot/package/dvbsnoop/dvbsnoop.mk
index 3bd8f819..fdc483d2 100644
--- a/bsp/buildroot/package/dvbsnoop/dvbsnoop.mk
+++ b/bsp/buildroot/package/dvbsnoop/dvbsnoop.mk
@@ -6,7 +6,7 @@
 
 DVBSNOOP_VERSION = 1.4.50
 DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION)
-DVBSNOOP_LICENSE = GPLv2
+DVBSNOOP_LICENSE = GPL-2.0
 DVBSNOOP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/dvdauthor/0001-configure.ac-fix-static-build.patch b/bsp/buildroot/package/dvdauthor/0001-configure.ac-fix-static-build.patch
deleted file mode 100644
index 0e016b8c..00000000
--- a/bsp/buildroot/package/dvdauthor/0001-configure.ac-fix-static-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From da77704c575f0583fa871ff02bd52906a7979576 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Sun, 15 Feb 2015 11:05:43 +0100
-Subject: [PATCH] configure.ac: fix static build
-
-Add LT_INIT macro to handle --enable-shared option.
-
-If enable-shared=no then add --static flag to resolve FREETYPE_LIBS.
-
-Otherwise, dvdauthor forget to link witk -lbz2 when linking with freetype2.
-
-Fixes:
-http://autobuild.buildroot.net/results/1d8/1d83390a3dd9f6bb595e9fc7b321500b4dc533a8/
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- configure.ac | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c43df92..d78d56a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,6 +4,7 @@ AM_CONFIG_HEADER(src/config.h)
- AC_CONFIG_AUX_DIR(autotools)
- 
- AM_INIT_AUTOMAKE
-+LT_INIT
- 
- AC_PROG_INSTALL
- 
-@@ -39,6 +40,11 @@ PKG_CHECK_MODULES(LIBPNG, [libpng])
- AC_SUBST(LIBPNG_CFLAGS)
- AC_SUBST(LIBPNG_LIBS)
- 
-+config_static=''
-+if test "$enable_shared" = 'no'; then
-+    config_static='--static'
-+fi
-+
- usemagick=0
- 
- AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config])
-@@ -95,7 +101,7 @@ AC_SUBST(FRIBIDI_LIBS)
- AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
- if test -n "$FREETYPECONFIG"; then
-     FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`"
--    FREETYPE_LIBS="`$FREETYPECONFIG --libs`"
-+    FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`"
-     AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available])
- 
-     ac_save_CPPFLAGS="$CPPFLAGS"
--- 
-1.9.3
-
diff --git a/bsp/buildroot/package/dvdauthor/Config.in b/bsp/buildroot/package/dvdauthor/Config.in
index 8b2bcb3d..9ba5411d 100644
--- a/bsp/buildroot/package/dvdauthor/Config.in
+++ b/bsp/buildroot/package/dvdauthor/Config.in
@@ -4,11 +4,12 @@ config BR2_PACKAGE_DVDAUTHOR
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LIBPNG
 	help
-	  DVDAuthor is a set of tools to help you author the file and directory
-	  structure of a DVD-Video disc, including programmatic commands for
-	  implementing interactive behaviour. It is driven by command lines and
-	  XML control files, though there are other programs that provide
-	  GUI-based front ends if you prefer
+	  DVDAuthor is a set of tools to help you author the file and
+	  directory structure of a DVD-Video disc, including
+	  programmatic commands for implementing interactive behaviour.
+	  It is driven by command lines and XML control files, though
+	  there are other programs that provide GUI-based front ends
+	  if you prefer
 
 	  http://dvdauthor.sourceforge.net
 
diff --git a/bsp/buildroot/package/dvdauthor/dvdauthor.hash b/bsp/buildroot/package/dvdauthor/dvdauthor.hash
index fe92b29c..36d5d0e6 100644
--- a/bsp/buildroot/package/dvdauthor/dvdauthor.hash
+++ b/bsp/buildroot/package/dvdauthor/dvdauthor.hash
@@ -1,2 +1,5 @@
+# From https://sourceforge.net/projects/dvdauthor/files
+md5 1173dcb8d40e74fc90c0f3a25dbd642d  dvdauthor-0.7.2.tar.gz
+sha1 0e605642140576bfb3e963414d77630d1c073a51  dvdauthor-0.7.2.tar.gz
 # Locally computed
-sha256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 dvdauthor-0.7.1.tar.gz
+sha256 3020a92de9f78eb36f48b6f22d5a001c47107826634a785a62dfcd080f612eb7  dvdauthor-0.7.2.tar.gz
diff --git a/bsp/buildroot/package/dvdauthor/dvdauthor.mk b/bsp/buildroot/package/dvdauthor/dvdauthor.mk
index e982a40e..3f9c2186 100644
--- a/bsp/buildroot/package/dvdauthor/dvdauthor.mk
+++ b/bsp/buildroot/package/dvdauthor/dvdauthor.mk
@@ -4,21 +4,16 @@
 #
 ################################################################################
 
-DVDAUTHOR_VERSION = 0.7.1
-DVDAUTHOR_SITE = http://sourceforge.net/projects/dvdauthor/files/dvdauthor/$(DVDAUTHOR_VERSION)
+DVDAUTHOR_VERSION = 0.7.2
+DVDAUTHOR_SITE = https://sourceforge.net/projects/dvdauthor/files
 DVDAUTHOR_DEPENDENCIES = host-pkgconf libxml2 freetype libpng
-DVDAUTHOR_LICENSE = GPLv2+
+DVDAUTHOR_LICENSE = GPL-2.0+
 DVDAUTHOR_LICENSE_FILES = COPYING
 DVDAUTHOR_CONF_ENV = \
 	ac_cv_prog_FREETYPECONFIG=$(STAGING_DIR)/usr/bin/freetype-config \
 	ac_cv_path_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config \
 	ac_cv_prog_GMAGICKCONFIG=
 
-# configure.ac patched by 0001-configure.ac-fix-static-build.patch
-DVDAUTHOR_AUTORECONF = YES
-# add host-gettext for AM_ICONV macro
-DVDAUTHOR_DEPENDENCIES += host-gettext
-
 ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y)
 DVDAUTHOR_DEPENDENCIES += imagemagick
 DVDAUTHOR_CONF_ENV += \
diff --git a/bsp/buildroot/package/dvdrw-tools/dvdrw-tools.mk b/bsp/buildroot/package/dvdrw-tools/dvdrw-tools.mk
index 24daac1b..5dab5466 100644
--- a/bsp/buildroot/package/dvdrw-tools/dvdrw-tools.mk
+++ b/bsp/buildroot/package/dvdrw-tools/dvdrw-tools.mk
@@ -7,7 +7,7 @@
 DVDRW_TOOLS_VERSION = 7.1
 DVDRW_TOOLS_SOURCE = dvd+rw-tools-$(DVDRW_TOOLS_VERSION).tar.gz
 DVDRW_TOOLS_SITE = http://fy.chalmers.se/~appro/linux/DVD+RW/tools
-DVDRW_TOOLS_LICENSE = GPLv2
+DVDRW_TOOLS_LICENSE = GPL-2.0
 DVDRW_TOOLS_LICENSE_FILES = LICENSE
 DVDRW_TOOLS_DEPENDENCIES = host-m4
 
diff --git a/bsp/buildroot/package/e2fsprogs/0001-sem-init-libs.patch b/bsp/buildroot/package/e2fsprogs/0001-sem-init-libs.patch
deleted file mode 100644
index 56f1cc2c..00000000
--- a/bsp/buildroot/package/e2fsprogs/0001-sem-init-libs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- e2fsprogs-1.41.9/MCONFIG.in.orig	2009-10-07 20:25:07.000000000 +0800
-+++ e2fsprogs-1.41.9/MCONFIG.in	2009-10-07 20:21:41.000000000 +0800
-@@ -85,7 +85,7 @@
- #
- LIB = $(top_builddir)/lib
- LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
--LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
-+LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @SEM_INIT_LIB@
- LIBE2P = $(LIB)/libe2p@LIB_EXT@
- LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
- LIBUUID = @LIBUUID@ @SOCKET_LIB@
diff --git a/bsp/buildroot/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch b/bsp/buildroot/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch
deleted file mode 100644
index bd86c4e2..00000000
--- a/bsp/buildroot/package/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b5baf15b36107925186d89af9097b4b8e2d7cad6 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 21 Sep 2016 08:38:21 +0200
-Subject: [PATCH] MCONFIG.in: handle CLOCK_GETTIME_LIB
-
-Commit 62bc243f1bfe623312a350e4cd0d2e17a69aac45 ("fuse2fs: might need
-librt") added a check for the clock_gettime() to verify whether linking
-with the librt library is needed or not to use this function.
-
-However, this commit forgot the change in MCONFIG.in that allows to
-define the make variable CLOCK_GETTIME_LIB from the CLOCK_GETTIME_LIB
-variable substituted by the configure script. Due to this, from a make
-perspective $(CLOCK_GETTIME_LIB) is always empty, and we get link
-failure on platforms where clock_gettime() is available in librt.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- MCONFIG.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/MCONFIG.in b/MCONFIG.in
-index e82963d..9ba9ce2 100644
---- a/MCONFIG.in
-+++ b/MCONFIG.in
-@@ -125,6 +125,7 @@ LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@
- LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
- LIBINTL = @LIBINTL@
- SYSLIBS = @LIBS@
-+CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@
- DEPLIBSS = $(LIB)/libss@LIB_EXT@
- DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
- DEPLIBUUID = @DEPLIBUUID@
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch b/bsp/buildroot/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch
deleted file mode 100644
index c58fcb32..00000000
--- a/bsp/buildroot/package/e2fsprogs/0002-include-sys-sysmacros.h-as-needed.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From 3fb715b55426875902dfef3056b2cf7335953178 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 19 May 2017 13:25:59 -0400
-Subject: [PATCH] include sys/sysmacros.h as needed
-
-The minor/major/makedev macros are not entirely standard.  glibc has had
-the definitions in sys/sysmacros.h since the start, and wants to move away
-from always defining them implicitly via sys/types.h (as this pollutes the
-namespace in violation of POSIX).  Other C libraries have already dropped
-them.  Since the configure script already checks for this header, use that
-to pull in the header in files that use these macros.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-
-Upstream commit 3fb715b55426875902dfef3056b2cf7335953178
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- debugfs/debugfs.c      | 3 +++
- lib/blkid/devname.c    | 3 +++
- lib/blkid/devno.c      | 3 +++
- lib/ext2fs/finddev.c   | 3 +++
- lib/ext2fs/ismounted.c | 3 +++
- misc/create_inode.c    | 4 ++++
- misc/mk_hugefiles.c    | 3 +++
- 7 files changed, 22 insertions(+)
-
-diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
-index 059ddc39..453f5b52 100644
---- a/debugfs/debugfs.c
-+++ b/debugfs/debugfs.c
-@@ -26,6 +26,9 @@ extern char *optarg;
- #include <errno.h>
- #endif
- #include <fcntl.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "debugfs.h"
- #include "uuid/uuid.h"
-diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
-index 3e2efa9d..671e781f 100644
---- a/lib/blkid/devname.c
-+++ b/lib/blkid/devname.c
-@@ -36,6 +36,9 @@
- #if HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>
- #endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- #include <time.h>
- 
- #include "blkidP.h"
-diff --git a/lib/blkid/devno.c b/lib/blkid/devno.c
-index aa6eb907..480030f2 100644
---- a/lib/blkid/devno.c
-+++ b/lib/blkid/devno.c
-@@ -31,6 +31,9 @@
- #if HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>
- #endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "blkidP.h"
- 
-diff --git a/lib/ext2fs/finddev.c b/lib/ext2fs/finddev.c
-index 311608de..62fa0dbe 100644
---- a/lib/ext2fs/finddev.c
-+++ b/lib/ext2fs/finddev.c
-@@ -31,6 +31,9 @@
- #if HAVE_SYS_MKDEV_H
- #include <sys/mkdev.h>
- #endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "ext2_fs.h"
- #include "ext2fs.h"
-diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
-index bcac0f15..7d524715 100644
---- a/lib/ext2fs/ismounted.c
-+++ b/lib/ext2fs/ismounted.c
-@@ -49,6 +49,9 @@
- #if HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- 
- #include "ext2_fs.h"
- #include "ext2fs.h"
-diff --git a/misc/create_inode.c b/misc/create_inode.c
-index ae22ff6f..8ce3fafa 100644
---- a/misc/create_inode.c
-+++ b/misc/create_inode.c
-@@ -22,6 +22,10 @@
- #include <attr/xattr.h>
- #endif
- #include <sys/ioctl.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
-+
- #include <ext2fs/ext2fs.h>
- #include <ext2fs/ext2_types.h>
- #include <ext2fs/fiemap.h>
-diff --git a/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
-index 049c6f41..5882394d 100644
---- a/misc/mk_hugefiles.c
-+++ b/misc/mk_hugefiles.c
-@@ -35,6 +35,9 @@ extern int optind;
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h>
-+#endif
- #include <libgen.h>
- #include <limits.h>
- #include <blkid/blkid.h>
--- 
-2.13.3
-
diff --git a/bsp/buildroot/package/e2fsprogs/Config.in b/bsp/buildroot/package/e2fsprogs/Config.in
index d1914a99..b3d12b4a 100644
--- a/bsp/buildroot/package/e2fsprogs/Config.in
+++ b/bsp/buildroot/package/e2fsprogs/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_E2FSPROGS
+menuconfig BR2_PACKAGE_E2FSPROGS
 	bool "e2fsprogs"
 	depends on BR2_USE_MMU # util-linux/libblkid
 	select BR2_PACKAGE_UTIL_LINUX
@@ -7,95 +7,63 @@ config BR2_PACKAGE_E2FSPROGS
 	help
 	  The EXT2 file system utilities.
 
-	  http://e2fsprogs.sf.net
+	  The following programs are always built and installed:
+	  badblocks chattr debugfs dumpe2fs e2freefrag e2fsck e2image
+	  e2undo e4crypt e4defrag filefrag fsck fuse2fs logsave lsattr
+	  mke2fs mklost+found resize2fs tune2fs
+
+	  The uuid utilities (uuidd, uuidgen) are not built. Use the
+	  ones from util-linux, instead.
+
+	  Other programs can be selected individually.
+
+	  http://e2fsprogs.sourceforge.net
 
 if BR2_PACKAGE_E2FSPROGS
 
-config BR2_PACKAGE_E2FSPROGS_BADBLOCKS
-	bool "badblocks"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_CHATTR
-	bool "chattr"
-	default y
-
 config BR2_PACKAGE_E2FSPROGS_DEBUGFS
 	bool "debugfs"
-
-config BR2_PACKAGE_E2FSPROGS_DUMPE2FS
-	bool "dumpe2fs"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG
-	bool "e2freefrag"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_E2FSCK
-	bool "e2fsck"
-	default y
+	help
+	  ext2/ext3/ext4 file system debugger
 
 config BR2_PACKAGE_E2FSPROGS_E2IMAGE
 	bool "e2image"
-
-config BR2_PACKAGE_E2FSPROGS_E2LABEL
-	bool "e2label"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_E2UNDO
-	bool "e2undo"
-	default y
+	help
+	  Save critical ext2/ext3/ext4 filesystem metadata to a file
 
 config BR2_PACKAGE_E2FSPROGS_E4DEFRAG
 	bool "e4defrag"
 	depends on !BR2_nios2 # fallocate not implemented
 	depends on !BR2_TOOLCHAIN_USES_UCLIBC # sync_file_range not impl
+	help
+	  Online defragmenter for ext4 filesystem
 
 comment "e4defrag needs a glibc or musl toolchain"
+	depends on !BR2_nios2
 	depends on BR2_TOOLCHAIN_USES_UCLIBC
 
-config BR2_PACKAGE_E2FSPROGS_FILEFRAG
-	bool "filefrag"
-	default y
-
 config BR2_PACKAGE_E2FSPROGS_FSCK
 	bool "fsck"
 	default y
+	depends on !BR2_PACKAGE_UTIL_LINUX_FSCK
+	help
+	  Check and repair a Linux file system. This is a wrapper around
+	  the filesystem-specific fsck tools.
 
 config BR2_PACKAGE_E2FSPROGS_FUSE2FS
 	bool "fuse2fs"
 	depends on !BR2_STATIC_LIBS # libfuse
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	select BR2_PACKAGE_LIBFUSE
+	help
+	  FUSE file system client for ext2/ext3/ext4 file systems
 
 comment "fuse2fs needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
-config BR2_PACKAGE_E2FSPROGS_LOGSAVE
-	bool "logsave"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_LSATTR
-	bool "lsattr"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_MKE2FS
-	bool "mke2fs"
-	default y
-
-config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND
-	bool "mklost+found"
-	default y
-
 config BR2_PACKAGE_E2FSPROGS_RESIZE2FS
 	bool "resize2fs"
-
-config BR2_PACKAGE_E2FSPROGS_TUNE2FS
-	bool "tune2fs"
-	default y
-	select BR2_PACKAGE_E2FSPROGS_E2LABEL
-
-config BR2_PACKAGE_E2FSPROGS_UUIDGEN
-	bool "uuidgen"
-	default y
+	help
+	  ext2/ext3/ext4 file system resizer
 
 endif
diff --git a/bsp/buildroot/package/e2fsprogs/Config.in.host b/bsp/buildroot/package/e2fsprogs/Config.in.host
index de9148e3..7591bbcb 100644
--- a/bsp/buildroot/package/e2fsprogs/Config.in.host
+++ b/bsp/buildroot/package/e2fsprogs/Config.in.host
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOST_E2FSPROGS
 	bool "host e2fsprogs"
+	select BR2_PACKAGE_HOST_UTIL_LINUX
 	help
 	  The EXT2/3/4 file system utilities.
 
diff --git a/bsp/buildroot/package/e2fsprogs/e2fsprogs.hash b/bsp/buildroot/package/e2fsprogs/e2fsprogs.hash
index 5fd9f3d6..3def51f9 100644
--- a/bsp/buildroot/package/e2fsprogs/e2fsprogs.hash
+++ b/bsp/buildroot/package/e2fsprogs/e2fsprogs.hash
@@ -1,2 +1,6 @@
-# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.3/sha256sums.asc
-sha256 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37  e2fsprogs-1.43.3.tar.xz
+# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.9/sha256sums.asc
+sha256 926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f  e2fsprogs-1.43.9.tar.xz
+# Locally calculated
+sha256 680f852df303874fe9c722283a7da571ae9a0477768df8af1e363298e2adc51e  NOTICE
+sha256 032989b508f1a72ebee5b3417e55d06d473f9ee203e45ab11864a7e49cdec63d  lib/ss/mit-sipb-copyright.h
+sha256 47182fe6631a32f271a15bbe210751b3825b7199f588879aac7d4804fc8b4b8f  lib/et/internal.h
diff --git a/bsp/buildroot/package/e2fsprogs/e2fsprogs.mk b/bsp/buildroot/package/e2fsprogs/e2fsprogs.mk
index 3829053d..99019c73 100644
--- a/bsp/buildroot/package/e2fsprogs/e2fsprogs.mk
+++ b/bsp/buildroot/package/e2fsprogs/e2fsprogs.mk
@@ -4,34 +4,55 @@
 #
 ################################################################################
 
-E2FSPROGS_VERSION = 1.43.3
+E2FSPROGS_VERSION = 1.43.9
 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz
 E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION)
-E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet)
-E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h
+E2FSPROGS_LICENSE = GPL-2.0, MIT-like with advertising clause (libss and libet)
+E2FSPROGS_LICENSE_FILES = NOTICE lib/ss/mit-sipb-copyright.h lib/et/internal.h
 E2FSPROGS_INSTALL_STAGING = YES
+
+# Use libblkid and libuuid from util-linux for host and target packages.
+# This prevents overriding them with e2fsprogs' ones, which may cause
+# problems for other packages.
 E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux
-# we don't have a host-util-linux
-HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf
+HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf host-util-linux
+
+# If both e2fsprogs and busybox are selected, make certain e2fsprogs
+# wins the fight over who gets to have their utils actually installed
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+E2FSPROGS_DEPENDENCIES += busybox
+endif
 
 # e4defrag doesn't build on older systems like RHEL5.x, and we don't
 # need it on the host anyway.
 # Disable fuse2fs as well to avoid carrying over deps, and it's unused
-HOST_E2FSPROGS_CONF_OPTS += --disable-defrag --disable-fuse2fs
+HOST_E2FSPROGS_CONF_OPTS = \
+	--disable-defrag \
+	--disable-e2initrd-helper \
+	--disable-fuse2fs \
+	--disable-libblkid \
+	--disable-libuuid \
+	--enable-symlink-install \
+	--disable-testio-debug
 
+# Set the binary directories to "/bin" and "/sbin" to override programs
+# installed by busybox.
 E2FSPROGS_CONF_OPTS = \
-	$(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \
-	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
-	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
-	$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \
-	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
+	--bindir=/bin \
+	--sbindir=/sbin \
+	$(if $(BR2_STATIC_LIBS),--disable-elf-shlibs,--enable-elf-shlibs) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),--enable-debugfs,--disable-debugfs) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),--enable-imager,--disable-imager) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),--enable-defrag,--disable-defrag) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_FSCK),--enable-fsck,--disable-fsck) \
+	$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),--enable-resizer,--disable-resizer) \
 	--disable-uuidd \
 	--disable-libblkid \
 	--disable-libuuid \
-	--enable-fsck \
 	--disable-e2initrd-helper \
 	--disable-testio-debug \
-	--disable-rpath
+	--disable-rpath \
+	--enable-symlink-install
 
 ifeq ($(BR2_PACKAGE_E2FSPROGS_FUSE2FS),y)
 E2FSPROGS_CONF_OPTS += --enable-fuse2fs
@@ -56,17 +77,13 @@ HOST_E2FSPROGS_CONF_ENV += \
 	ac_cv_header_magic_h=no \
 	ac_cv_lib_magic_magic_file=no
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-# util-linux libuuid pulls in libintl if needed, so ensure we also
-# link against it, otherwise static linking fails
-E2FSPROGS_CONF_ENV += LIBS=-lintl
-endif
-
 E2FSPROGS_MAKE_OPTS = LDCONFIG=true
+
 E2FSPROGS_INSTALL_STAGING_OPTS = \
 	DESTDIR=$(STAGING_DIR) \
 	LDCONFIG=true \
 	install-libs
+
 E2FSPROGS_INSTALL_TARGET_OPTS = \
 	DESTDIR=$(TARGET_DIR) \
 	LDCONFIG=true \
@@ -76,90 +93,5 @@ define HOST_E2FSPROGS_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs
 endef
 
-# binaries to keep or remove
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_CHATTR) += usr/bin/chattr
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += usr/sbin/dumpe2fs
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen
-
-# files to remove
-E2FSPROGS_TXTTARGETS_ = \
-	usr/sbin/mkfs.ext[234] \
-	usr/sbin/mkfs.ext4dev \
-	usr/sbin/fsck.ext[234] \
-	usr/sbin/fsck.ext4dev \
-	usr/sbin/tune2fs
-
-define E2FSPROGS_TARGET_REMOVE_UNNEEDED
-	rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_))
-	rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_))
-endef
-
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_REMOVE_UNNEEDED
-
-define E2FSPROGS_TARGET_MKE2FS_SYMLINKS
-	ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext2
-	ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext3
-	ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4
-	ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4dev
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_MKE2FS_SYMLINKS
-endif
-
-define E2FSPROGS_TARGET_E2FSCK_SYMLINKS
-	ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext2
-	ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext3
-	ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4
-	ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4dev
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS
-endif
-
-# If BusyBox is included, its configuration may supply its own variant
-# of ext2-related tools. Since Buildroot desires having full blown
-# variants take precedence (in this case, e2fsprogs), we want to remove
-# BusyBox's variant of e2fsprogs provided binaries. e2fsprogs targets
-# /usr/{bin,sbin} where BusyBox targets /{bin,sbin}. We will attempt to
-# remove BusyBox-generated ext2-related tools from /{bin,sbin}. We need
-# to do this in the pre-install stage to ensure we do not accidentally
-# remove e2fsprogs's binaries in usr-merged environments (ie. if they
-# are removed, they would be re-installed in this package's install
-# stage).
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-E2FSPROGS_DEPENDENCIES += busybox
-
-define E2FSPROGS_REMOVE_BUSYBOX_APPLETS
-	$(RM) -f $(TARGET_DIR)/bin/chattr
-	$(RM) -f $(TARGET_DIR)/bin/lsattr
-	$(RM) -f $(TARGET_DIR)/sbin/fsck
-	$(RM) -f $(TARGET_DIR)/sbin/tune2fs
-	$(RM) -f $(TARGET_DIR)/sbin/e2label
-endef
-E2FSPROGS_PRE_INSTALL_TARGET_HOOKS += E2FSPROGS_REMOVE_BUSYBOX_APPLETS
-endif
-
-define E2FSPROGS_TARGET_TUNE2FS_SYMLINK
-	ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/e2tools/Config.in b/bsp/buildroot/package/e2tools/Config.in
index 75029f74..e4a35e27 100644
--- a/bsp/buildroot/package/e2tools/Config.in
+++ b/bsp/buildroot/package/e2tools/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_E2TOOLS
 	bool "e2tools"
-	select BR2_PACKAGE_E2FSPROGS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR # uses wchar_t
 	depends on BR2_USE_MMU # e2fsprogs
+	select BR2_PACKAGE_E2FSPROGS
 	help
 	  E2tools is a simple set of GPL'ed utilities to read, write,
 	  and manipulate files in an ext2/ext3 filesystem. These
diff --git a/bsp/buildroot/package/e2tools/e2tools.mk b/bsp/buildroot/package/e2tools/e2tools.mk
index 1f3bb5cf..266d9091 100644
--- a/bsp/buildroot/package/e2tools/e2tools.mk
+++ b/bsp/buildroot/package/e2tools/e2tools.mk
@@ -9,7 +9,7 @@ E2TOOLS_SITE = $(call github,ndim,e2tools,$(E2TOOLS_VERSION))
 
 # Source coming from GitHub, no configure included.
 E2TOOLS_AUTORECONF = YES
-E2TOOLS_LICENSE = GPLv2
+E2TOOLS_LICENSE = GPL-2.0
 E2TOOLS_LICENSE_FILES = COPYING
 E2TOOLS_DEPENDENCIES = e2fsprogs
 E2TOOLS_CONF_ENV = LIBS="-lpthread"
diff --git a/bsp/buildroot/package/easy-rsa/Config.in b/bsp/buildroot/package/easy-rsa/Config.in
new file mode 100644
index 00000000..883d679e
--- /dev/null
+++ b/bsp/buildroot/package/easy-rsa/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_EASY_RSA
+	bool "easy-rsa"
+	select BR2_PACKAGE_OPENSSL # runtime
+	select BR2_PACKAGE_OPENSSL_BIN
+	help
+	  Simple shell based CA utility
+
+	  This package eases the creation of certificates, for example
+	  for openvpn clients.
+
+	  This was formerly part of the openvpn package.
+
+	  easy-rsa is a wrapper script around OpenSSL binaries.
+
+	  https://github.com/OpenVPN/easy-rsa
diff --git a/bsp/buildroot/package/easy-rsa/easy-rsa.hash b/bsp/buildroot/package/easy-rsa/easy-rsa.hash
new file mode 100644
index 00000000..e2d658ac
--- /dev/null
+++ b/bsp/buildroot/package/easy-rsa/easy-rsa.hash
@@ -0,0 +1,2 @@
+# Locally computed: (after verifying gpg sig)
+sha512 d20f646e33ec803444dfcd446553f1d6001227fedec93280c212b34cccee11b184599f1b2ae6a3ce9cf6c9ac52f2b840ebb645536df6ddf55382fa25c22df81f EasyRSA-3.0.1.tgz
diff --git a/bsp/buildroot/package/easy-rsa/easy-rsa.mk b/bsp/buildroot/package/easy-rsa/easy-rsa.mk
new file mode 100644
index 00000000..8ed5741c
--- /dev/null
+++ b/bsp/buildroot/package/easy-rsa/easy-rsa.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# easy-rsa
+#
+################################################################################
+
+EASY_RSA_VERSION = 3.0.1
+EASY_RSA_SOURCE = EasyRSA-$(EASY_RSA_VERSION).tgz
+EASY_RSA_SITE = https://github.com/OpenVPN/easy-rsa/releases/download/$(EASY_RSA_VERSION)
+EASY_RSA_LICENSE = GPL-2.0
+EASY_RSA_LICENSE_FILES = COPYING gpl-2.0.txt
+
+# shell script, so no build step
+
+define EASY_RSA_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/easyrsa $(TARGET_DIR)/usr/bin/easyrsa
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/easy-rsa/x509-types
+	$(INSTALL) -m 0644 -t $(TARGET_DIR)/etc/easy-rsa/x509-types $(@D)/x509-types/*
+	$(INSTALL) -D -m 0644 $(@D)/openssl-1.0.cnf $(TARGET_DIR)/etc/easy-rsa/openssl-1.0.cnf
+	$(INSTALL) -D -m 0644 $(@D)/vars.example $(TARGET_DIR)/etc/easy-rsa/vars
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/easydbus/Config.in b/bsp/buildroot/package/easydbus/Config.in
index 51519d61..1fe8689c 100644
--- a/bsp/buildroot/package/easydbus/Config.in
+++ b/bsp/buildroot/package/easydbus/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_EASYDBUS
 	bool "easydbus"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Easy to use DBus library for Lua.
 
diff --git a/bsp/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch b/bsp/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
new file mode 100644
index 00000000..bd7bead0
--- /dev/null
+++ b/bsp/buildroot/package/ebtables/0001-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch
@@ -0,0 +1,50 @@
+From f8079671326e9fd079391d24911a9a8a77f1d6fd Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sat, 16 May 2015 12:31:58 +0200
+Subject: [PATCH] ethernetdb.h: Remove C++ specific compiler hint macro _THROW
+
+Fixes compilation with musl libc
+
+Signed-off-by: Felix Janda <felix.janda@posteo.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit f8079671326e9fd0
+
+ include/ethernetdb.h | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/include/ethernetdb.h b/include/ethernetdb.h
+index 46d8bfd1b7e5..1683abe01987 100644
+--- a/include/ethernetdb.h
++++ b/include/ethernetdb.h
+@@ -38,21 +38,20 @@ struct ethertypeent {
+ 
+ /* Open ethertype data base files and mark them as staying open even
+    after a later search if STAY_OPEN is non-zero.  */
+-extern void setethertypeent(int __stay_open) __THROW;
++extern void setethertypeent(int __stay_open);
+ 
+ /* Close ethertype data base files and clear `stay open' flag.  */
+-extern void endethertypeent(void) __THROW;
++extern void endethertypeent(void);
+ 
+ /* Get next entry from ethertype data base file.  Open data base if
+    necessary.  */
+-extern struct ethertypeent *getethertypeent(void) __THROW;
++extern struct ethertypeent *getethertypeent(void);
+ 
+ /* Return entry from ethertype data base for network with NAME.  */
+-extern struct ethertypeent *getethertypebyname(__const char *__name)
+-    __THROW;
++extern struct ethertypeent *getethertypebyname(__const char *__name);
+ 
+ /* Return entry from ethertype data base which number is PROTO.  */
+-extern struct ethertypeent *getethertypebynumber(int __ethertype) __THROW;
++extern struct ethertypeent *getethertypebynumber(int __ethertype);
+ 
+ 
+ #endif				/* ethernetdb.h */
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch b/bsp/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch
new file mode 100644
index 00000000..5e9f534b
--- /dev/null
+++ b/bsp/buildroot/package/ebtables/0002-Fix-musl-compatibility.patch
@@ -0,0 +1,30 @@
+From 138e7efdc8cad6453620c6366e6fa5e786593f7f Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 16 Feb 2017 14:41:48 +0200
+Subject: [PATCH] Fix musl compatibility
+
+Include netinet/ether.h before kernel headers to suppress the conflicting
+definition of struct ethhdr.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: not upstreamable; depends on Buildroot local musl patch
+---
+ include/ebtables_u.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/ebtables_u.h b/include/ebtables_u.h
+index 35a5bcc54c86..268b1fd599d2 100644
+--- a/include/ebtables_u.h
++++ b/include/ebtables_u.h
+@@ -24,6 +24,7 @@
+ #ifndef EBTABLES_U_H
+ #define EBTABLES_U_H
+ #include <netinet/in.h>
++#include <netinet/ether.h>
+ #include <linux/netfilter_bridge/ebtables.h>
+ #include <linux/netfilter/x_tables.h>
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/ebtables/Config.in b/bsp/buildroot/package/ebtables/Config.in
index fa123b19..3f7566a6 100644
--- a/bsp/buildroot/package/ebtables/Config.in
+++ b/bsp/buildroot/package/ebtables/Config.in
@@ -1,12 +1,7 @@
 config BR2_PACKAGE_EBTABLES
 	bool "ebtables"
-	depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers
 	depends on BR2_USE_MMU # fork()
 	help
 	  Ethernet bridge frame table administration
 
 	  http://ebtables.netfilter.org/
-
-comment "ebtables needs a glibc or uClibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/ebtables/ebtables.mk b/bsp/buildroot/package/ebtables/ebtables.mk
index 63959307..aae0c91a 100644
--- a/bsp/buildroot/package/ebtables/ebtables.mk
+++ b/bsp/buildroot/package/ebtables/ebtables.mk
@@ -7,7 +7,7 @@
 EBTABLES_VERSION = 2.0.10-4
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables
-EBTABLES_LICENSE = GPLv2+
+EBTABLES_LICENSE = GPL-2.0+
 EBTABLES_LICENSE_FILES = COPYING
 EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static)
 EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32)
diff --git a/bsp/buildroot/package/ecryptfs-utils/Config.in b/bsp/buildroot/package/ecryptfs-utils/Config.in
index cb70e000..bb4cc644 100644
--- a/bsp/buildroot/package/ecryptfs-utils/Config.in
+++ b/bsp/buildroot/package/ecryptfs-utils/Config.in
@@ -1,12 +1,5 @@
 config BR2_PACKAGE_ECRYPTFS_UTILS
 	bool "ecryptfs-utils"
-	select BR2_PACKAGE_KEYUTILS
-	select BR2_PACKAGE_LIBNSS
-	# runtime dependency only, some scripts are using the
-	# 'gettext' program to get translations
-	select BR2_PACKAGE_GETTEXT
-	# runtime dependency only
-	select BR2_PACKAGE_GETENT
 	depends on BR2_USE_WCHAR # gettext
 	depends on BR2_USE_MMU # keyutils
 	depends on !BR2_microblaze # keyutils
@@ -14,22 +7,29 @@ config BR2_PACKAGE_ECRYPTFS_UTILS
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr
 	depends on !BR2_MIPS_NABI32 # libnss
 	depends on !BR2_STATIC_LIBS # libnss, keyutils
+	select BR2_PACKAGE_KEYUTILS
+	select BR2_PACKAGE_LIBNSS
+	# runtime dependency only, some scripts are using the
+	# 'gettext' program to get translations
+	select BR2_PACKAGE_GETTEXT
+	# runtime dependency only
+	select BR2_PACKAGE_GETENT
 	help
 	  eCryptfs is a POSIX-compliant enterprise cryptographic
 	  filesystem for Linux. It is stacked on top of any other
-	  Linux filesystem, it stores cryptographic metadata in the header
-	  of each file written.
+	  Linux filesystem, it stores cryptographic metadata in the
+	  header of each file written.
 
 	  The eCryptfs kernel module is available in all Linux kernels
-	  since version 2.6.19. This package provides userspace utilities
-	  needed to mount eCryptfs.
+	  since version 2.6.19. This package provides userspace
+	  utilities needed to mount eCryptfs.
 
-	  Files are encrypted using a passphrase. Consider building openssl
-	  for another method.
+	  Files are encrypted using a passphrase. Consider building
+	  openssl for another method.
 
 	  http://ecryptfs.org
 
-comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynamic library"
+comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynami library"
 	depends on !BR2_microblaze
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT
 	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash b/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash
index 40cc17cd..1e08661e 100644
--- a/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash
+++ b/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.hash
@@ -1,2 +1,4 @@
-# From https://launchpad.net/ecryptfs/trunk/109/+download/ecryptfs-utils_109.orig.tar.gz/+md5
-md5	8e33f096c8cb8288f9c29a9936cd0d28	ecryptfs-utils_109.orig.tar.gz
+# From https://launchpad.net/ecryptfs/trunk/111/+download/ecryptfs-utils_111.orig.tar.gz/+md5
+md5 83513228984f671930752c3518cac6fd  ecryptfs-utils_111.orig.tar.gz
+# Locally computed
+sha256 112cb3e37e81a1ecd8e39516725dec0ce55c5f3df6284e0f4cc0f118750a987f  ecryptfs-utils_111.orig.tar.gz
diff --git a/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk b/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk
index 81a4b4bd..eb3194b6 100644
--- a/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk
+++ b/bsp/buildroot/package/ecryptfs-utils/ecryptfs-utils.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ECRYPTFS_UTILS_VERSION = 109
+ECRYPTFS_UTILS_VERSION = 111
 ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz
 ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download
-ECRYPTFS_UTILS_LICENSE = GPLv2+
+ECRYPTFS_UTILS_LICENSE = GPL-2.0+
 ECRYPTFS_UTILS_LICENSE_FILES = COPYING
 
 ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool
diff --git a/bsp/buildroot/package/ed/ed.hash b/bsp/buildroot/package/ed/ed.hash
index 22c1e671..1aa00c04 100644
--- a/bsp/buildroot/package/ed/ed.hash
+++ b/bsp/buildroot/package/ed/ed.hash
@@ -1,4 +1,2 @@
-# From http://lists.gnu.org/archive/html/bug-ed/2017-01/msg00002.html
-sha1	a91f785f7e16dc68e1c9c86d532ebd9698171ba0	ed-1.14.1.tar.lz
-# Locally computed
-sha256	ffb97eb8f2a2b5a71a9b97e3872adce953aa1b8958e04c5b7bf11d556f32552a	ed-1.14.1.tar.lz
+# From http://lists.gnu.org/archive/html/bug-ed/2017-02/msg00005.html
+sha256	f57962ba930d70d02fc71d6be5c5f2346b16992a455ab9c43be7061dec9810db	ed-1.14.2.tar.lz
diff --git a/bsp/buildroot/package/ed/ed.mk b/bsp/buildroot/package/ed/ed.mk
index 6b9f65ec..ada0316a 100644
--- a/bsp/buildroot/package/ed/ed.mk
+++ b/bsp/buildroot/package/ed/ed.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-ED_VERSION = 1.14.1
+ED_VERSION = 1.14.2
 ED_SITE = $(BR2_GNU_MIRROR)/ed
 ED_SOURCE = ed-$(ED_VERSION).tar.lz
 ED_CONF_OPTS = \
 	CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)"
-ED_LICENSE = GPLv3+
+ED_LICENSE = GPL-3.0+
 ED_LICENSE_FILES = COPYING
 
 define ED_CONFIGURE_CMDS
diff --git a/bsp/buildroot/package/edid-decode/Config.in b/bsp/buildroot/package/edid-decode/Config.in
index 64297b49..701c7003 100644
--- a/bsp/buildroot/package/edid-decode/Config.in
+++ b/bsp/buildroot/package/edid-decode/Config.in
@@ -3,4 +3,4 @@ config BR2_PACKAGE_EDID_DECODE
 	help
 	  Decode EDID data in human-readable format.
 
-	  http://cgit.freedesktop.org/xorg/app/edid-decode/
+	  https://git.linuxtv.org/edid-decode.git/
diff --git a/bsp/buildroot/package/edid-decode/edid-decode.hash b/bsp/buildroot/package/edid-decode/edid-decode.hash
new file mode 100644
index 00000000..437dcf4a
--- /dev/null
+++ b/bsp/buildroot/package/edid-decode/edid-decode.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 94f43f93285eb5cf8133061295bcdf72b6897bf5372879c2e4032a08d359af12  edid-decode-f56f329ed23a25d002352dedba1e8f092a47286f.tar.gz
diff --git a/bsp/buildroot/package/edid-decode/edid-decode.mk b/bsp/buildroot/package/edid-decode/edid-decode.mk
index 243ccfbe..b412a77a 100644
--- a/bsp/buildroot/package/edid-decode/edid-decode.mk
+++ b/bsp/buildroot/package/edid-decode/edid-decode.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-EDID_DECODE_VERSION = 681153145d5e05ee15032ea792e967cda06e7622
-EDID_DECODE_SITE = git://anongit.freedesktop.org/git/xorg/app/edid-decode.git
+EDID_DECODE_VERSION = f56f329ed23a25d002352dedba1e8f092a47286f
+EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git
 EDID_DECODE_LICENSE = MIT
 EDID_DECODE_LICENSE_FILES = edid-decode.c
 
diff --git a/bsp/buildroot/package/eeprog/Config.in b/bsp/buildroot/package/eeprog/Config.in
deleted file mode 100644
index 73582c70..00000000
--- a/bsp/buildroot/package/eeprog/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_EEPROG
-	bool "eeprog"
-	help
-	  Simple tool to read/write i2c eeprom chips.
-
-	  http://www.codesink.org/eeprog.html
diff --git a/bsp/buildroot/package/eeprog/eeprog.hash b/bsp/buildroot/package/eeprog/eeprog.hash
deleted file mode 100644
index c91be723..00000000
--- a/bsp/buildroot/package/eeprog/eeprog.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256	35155cc3844d2c3ae8ed6935fda72768c7f24fddc4a0fca89e4ffbb34880d9ef	eeprog-0.7.6.tar.gz
diff --git a/bsp/buildroot/package/eeprog/eeprog.mk b/bsp/buildroot/package/eeprog/eeprog.mk
deleted file mode 100644
index 93aeb5e3..00000000
--- a/bsp/buildroot/package/eeprog/eeprog.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#
-# eeprog
-#
-################################################################################
-
-EEPROG_VERSION = 0.7.6
-EEPROG_SITE = http://www.codesink.org/download
-EEPROG_LICENSE = GPLv2+
-EEPROG_LICENSE_FILES = eeprog.c
-
-define EEPROG_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
-endef
-
-define EEPROG_INSTALL_TARGET_CMDS
-	$(INSTALL) -D $(@D)/eeprog $(TARGET_DIR)/usr/bin/eeprog
-endef
-
-$(eval $(generic-package))
diff --git a/bsp/buildroot/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch b/bsp/buildroot/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch
new file mode 100644
index 00000000..abafcec5
--- /dev/null
+++ b/bsp/buildroot/package/efibootmgr/0001-dont-use-fshort-wchar-when-building.patch
@@ -0,0 +1,28 @@
+From 3466fd05c8c6f1052e0426d64eed40f8a88fd78f Mon Sep 17 00:00:00 2001
+From: steve-mcintyre <steve-github@einval.com>
+Date: Fri, 6 Jan 2017 18:18:47 +0000
+Subject: [PATCH] Don't use -fshort-wchar when building (#63)
+
+It's not needed and is causing build failures with gcc 6. Closes
+Debian bug #849651
+
+Signed-off-by: Steve McIntyre <steve@einval.com>
+[Upstream commit: https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Make.defaults | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.defaults b/Make.defaults
+index 50f1f4d..0ac50ef 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -26,7 +26,7 @@ clang_cflags =
+ gcc_cflags =
+ cflags	= $(CFLAGS) $(SUBDIR_CFLAGS) \
+ 	-Werror -Wall -Wextra -Wsign-compare -Wstrict-aliasing \
+-	-std=gnu11 -fshort-wchar -fPIC \
++	-std=gnu11 -fPIC \
+ 	-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DLOCALEDIR=\"$(localedir)\" \
+ 	-DEFIBOOTMGR_VERSION="\"$(VERSION)\"" \
+ 	$(if $(findstring clang,$(CC)),$(clang_cflags),) \
diff --git a/bsp/buildroot/package/efibootmgr/0001-Allow-build-with-uClibc.patch b/bsp/buildroot/package/efibootmgr/0002-Allow-build-with-uClibc.patch
similarity index 100%
rename from bsp/buildroot/package/efibootmgr/0001-Allow-build-with-uClibc.patch
rename to bsp/buildroot/package/efibootmgr/0002-Allow-build-with-uClibc.patch
diff --git a/bsp/buildroot/package/efibootmgr/Config.in b/bsp/buildroot/package/efibootmgr/Config.in
index 57874fc4..0d36ffd6 100644
--- a/bsp/buildroot/package/efibootmgr/Config.in
+++ b/bsp/buildroot/package/efibootmgr/Config.in
@@ -6,22 +6,19 @@ config BR2_PACKAGE_EFIBOOTMGR
 	depends on !BR2_TOOLCHAIN_USES_MUSL # efivar
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
-	depends on BR2_USE_WCHAR # gettext
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_EFIVAR
 	help
 	  A Linux user-space application to modify the Intel Extensible
-	  Firmware Interface (EFI) Boot Manager. This application can create
-	  and destroy boot entries, change the boot order, change the next
-	  running boot option, and more.
+	  Firmware Interface (EFI) Boot Manager. This application can
+	  create and destroy boot entries, change the boot order, change
+	  the next running boot option, and more.
 
 	  https://github.com/rhinstaller/efibootmgr
 
-comment "efibootmgr needs a glibc or uClibc toolchain w/ wchar, dynamic library, headers >= 3.12, gcc >= 4.9"
+comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
 	depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
 	depends on BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
 		BR2_TOOLCHAIN_USES_MUSL || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
-		!BR2_USE_WCHAR
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
diff --git a/bsp/buildroot/package/efibootmgr/efibootmgr.hash b/bsp/buildroot/package/efibootmgr/efibootmgr.hash
index 3f934bad..f71dced5 100644
--- a/bsp/buildroot/package/efibootmgr/efibootmgr.hash
+++ b/bsp/buildroot/package/efibootmgr/efibootmgr.hash
@@ -1,3 +1,2 @@
 # locally computed hash
 sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz
-sha256 8e91f16927d296ffebd4f7fafda2f84c0f6201aba089a35e8090abd5aacdc58e	3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch
diff --git a/bsp/buildroot/package/efibootmgr/efibootmgr.mk b/bsp/buildroot/package/efibootmgr/efibootmgr.mk
index 7f5f4940..b32d9cbc 100644
--- a/bsp/buildroot/package/efibootmgr/efibootmgr.mk
+++ b/bsp/buildroot/package/efibootmgr/efibootmgr.mk
@@ -6,13 +6,10 @@
 
 EFIBOOTMGR_VERSION = 14
 EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION))
-# Patch fixes the build with gcc 6.x.
-EFIBOOTMGR_PATCH = \
-	https://github.com/rhinstaller/efibootmgr/commit/3466fd05c8c6f1052e0426d64eed40f8a88fd78f.patch
-EFIBOOTMGR_LICENSE = GPLv2+
+EFIBOOTMGR_LICENSE = GPL-2.0+
 EFIBOOTMGR_LICENSE_FILES = COPYING
-EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext)
-EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl)
+EFIBOOTMGR_DEPENDENCIES = efivar $(TARGET_NLS_DEPENDENCIES)
+EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
 
 define EFIBOOTMSR_PATCH_HEADER_PATH
 	$(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile
@@ -21,12 +18,12 @@ endef
 EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH
 
 define EFIBOOTMGR_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS)			\
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
 		LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D)
 endef
 
 define EFIBOOTMGR_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)	\
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		DESTDIR=$(TARGET_DIR) install
 endef
 
diff --git a/bsp/buildroot/package/efivar/Config.in b/bsp/buildroot/package/efivar/Config.in
index 0ec83600..0fa9adf3 100644
--- a/bsp/buildroot/package/efivar/Config.in
+++ b/bsp/buildroot/package/efivar/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
 	bool
+	default y
 	depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 \
 		|| BR2_powerpc64le || BR2_mipsel || BR2_mips64el
-	default y
 
 config BR2_PACKAGE_EFIVAR
 	bool "efivar"
diff --git a/bsp/buildroot/package/efivar/efivar.mk b/bsp/buildroot/package/efivar/efivar.mk
index c31d87b8..d06192ed 100644
--- a/bsp/buildroot/package/efivar/efivar.mk
+++ b/bsp/buildroot/package/efivar/efivar.mk
@@ -6,7 +6,7 @@
 
 EFIVAR_VERSION = 30
 EFIVAR_SITE = $(call github,rhinstaller,efivar,$(EFIVAR_VERSION))
-EFIVAR_LICENSE = LGPLv2.1
+EFIVAR_LICENSE = LGPL-2.1
 EFIVAR_LICENSE_FILES = COPYING
 EFIVAR_DEPENDENCIES = popt
 EFIVAR_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/efl/Config.in b/bsp/buildroot/package/efl/Config.in
index a91609d5..aa5749db 100644
--- a/bsp/buildroot/package/efl/Config.in
+++ b/bsp/buildroot/package/efl/Config.in
@@ -26,8 +26,8 @@ if BR2_PACKAGE_EFL
 
 config BR2_PACKAGE_EFL_BULLET
 	bool "Enable bullet support (recommended)"
-	select BR2_PACKAGE_BULLET
 	default y
+	select BR2_PACKAGE_BULLET
 	help
 	  If you have chosen to disable physics support, this disables
 	  lots of core functionality and is effectively never
@@ -38,8 +38,8 @@ config BR2_PACKAGE_EFL_BULLET
 
 config BR2_PACKAGE_EFL_EEZE
 	bool "Enable eeze (udev) support (recommended)"
-	depends on BR2_PACKAGE_HAS_UDEV # libudev
 	default y
+	depends on BR2_PACKAGE_HAS_UDEV # libudev
 	help
 	  Eeze is EFL's hardware abstraction layer on top of udev.
 	  Having it off will disable some hardware detection, such as
@@ -51,8 +51,8 @@ comment "eeze needs udev /dev management"
 
 config BR2_PACKAGE_EFL_FONTCONFIG
 	bool "Enable fontconfig support (recommended)"
-	select BR2_PACKAGE_FONTCONFIG
 	default y
+	select BR2_PACKAGE_FONTCONFIG
 	help
 	  If fontconfig is disabled, this is going to make general
 	  font searching not work, and only some very direct 'load
@@ -64,9 +64,9 @@ config BR2_PACKAGE_EFL_FONTCONFIG
 
 config BR2_PACKAGE_EFL_GSTREAMER1
 	bool "Enable gstreamer1 support (recommended)"
+	default y
 	select BR2_PACKAGE_GSTREAMER1
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
-	default y
 	help
 	  If Gstreamer 1.x support is disabled, it will heavily limit
 	  your media support options and render some functionality as
@@ -74,8 +74,8 @@ config BR2_PACKAGE_EFL_GSTREAMER1
 
 config BR2_PACKAGE_EFL_LIBFRIBIDI
 	bool "Enable libfribidi support (recommended)"
-	select BR2_PACKAGE_LIBFRIBIDI
 	default y
+	select BR2_PACKAGE_LIBFRIBIDI
 	help
 	  Fribidi is used for handling right-to-left text (like
 	  Arabic, Hebrew, Farsi, Persian etc.) and is very likely not
@@ -87,8 +87,8 @@ config BR2_PACKAGE_EFL_LIBFRIBIDI
 
 config BR2_PACKAGE_EFL_LIBSNDFILE
 	bool "Enable libsndfile support (recommended)"
-	select BR2_PACKAGE_LIBSNDFILE
 	default y
+	select BR2_PACKAGE_LIBSNDFILE
 	help
 	  If you disabled audio support in Ecore, this is not tested
 	  and may create bugs for you due to it creating untested code
@@ -96,9 +96,13 @@ config BR2_PACKAGE_EFL_LIBSNDFILE
 
 config BR2_PACKAGE_EFL_PULSEAUDIO
 	bool "Enable pulseaudio support (recommended)"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
-	select BR2_PACKAGE_PULSEAUDIO
 	default y
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_MMU
+	select BR2_PACKAGE_PULSEAUDIO
 	help
 	  The only audio output method supported by Ecore right now is
 	  via Pulseaudio. You have disabled that and likely have
@@ -110,12 +114,12 @@ config BR2_PACKAGE_EFL_PULSEAUDIO
 
 config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
 	bool "Enable libmount support (recommended)"
+	default y
 	depends on BR2_PACKAGE_EFL_EEZE
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	# libblkid is part of required tools, see EFL's README.
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
-	default y
 	help
 	  Libmount is used heavily inside Eeze for support of removable
 	  devices etc... and disabling this will hurt support for
@@ -135,7 +139,6 @@ config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG
 		BR2_PACKAGE_EFL_PULSEAUDIO && \
 		BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT
 
-
 comment "Warning: one of the recommended option for EFL is not enabled"
 	depends on !BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG
 
@@ -145,8 +148,8 @@ config BR2_PACKAGE_EFL_EOLIAN_CPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # Eolian needs C++11
 	help
 	  Eolian is an EO object parser and code generator.
-	  With this option enabled Eolian will handle automatic generation
-	  of EFL bindings for the C++11 language.
+	  With this option enabled Eolian will handle automatic
+	  generation of EFL bindings for the C++11 language.
 
 comment "Eolian needs host and target gcc >= 4.8"
 	depends on !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
@@ -179,8 +182,9 @@ config BR2_PACKAGE_EFL_WAYLAND
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine
 	depends on BR2_PACKAGE_EFL_EEZE # efl drm
 	depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only
-	depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- libinput
+	depends on BR2_ENABLE_LOCALE # efl-drm <- efl-elput <- linput
 	select BR2_PACKAGE_EFL_DRM
+	select BR2_PACKAGE_WAYLAND_PROTOCOLS
 
 comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, threads, locales"
 	depends on BR2_PACKAGE_WAYLAND
@@ -191,8 +195,8 @@ comment "Wayland support needs udev /dev management (eeze), OpenGL ES w/ EGL, th
 choice
 	bool "OpenGL support"
 	help
-	  libevas can be configured to use HW acceleration with OpenGL or
-	  OpenGL ES.
+	  libevas can be configured to use HW acceleration with OpenGL
+	  or OpenGL ES.
 
 config BR2_PACKAGE_EFL_OPENGL
 	bool "OpenGL"
@@ -223,10 +227,11 @@ config BR2_PACKAGE_EFL_ELPUT
 	select BR2_PACKAGE_LIBINPUT
 	select BR2_PACKAGE_LIBXKBCOMMON
 	help
-	  The elput library is an efl abstraction for the libinput library
-	  which can be used by various other subsystems (ecore_fb,
-	  ecore_drm, etc) to handle interfacing with libinput without
-	  having to duplicate the code in each subsystem.
+	  The elput library is an efl abstraction for the libinput
+	  library which can be used by various other subsystems
+	  (ecore_fb, ecore_drm, etc) to handle interfacing with
+	  libinput without having to duplicate the code in each
+	  subsystem.
 
 comment "Elput support needs udev /dev management (eeze), locales"
 	depends on !BR2_PACKAGE_EFL_EEZE || !BR2_ENABLE_LOCALE
@@ -256,16 +261,6 @@ config BR2_PACKAGE_EFL_PNG
 	  This enables the loader code that loads png files using
 	  libpng.
 
-# JP2K support require openjpeg 1.x (libopenjpeg1.pc) which is not
-# available in Buildroot anymore.
-config BR2_PACKAGE_EFL_JP2K
-	bool "libevas jp2k loader"
-	select BR2_PACKAGE_OPENJPEG
-	depends on BROKEN # require openjpeg 1.x
-	help
-	  This enables the loader code that loads jp2k files using
-	  openjpeg.
-
 config BR2_PACKAGE_EFL_JPEG
 	bool "libevas jpeg loader"
 	help
diff --git a/bsp/buildroot/package/efl/efl.hash b/bsp/buildroot/package/efl/efl.hash
index 5d7a90d6..5507bda3 100644
--- a/bsp/buildroot/package/efl/efl.hash
+++ b/bsp/buildroot/package/efl/efl.hash
@@ -1,2 +1,10 @@
-# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.4.tar.xz.sha256
-sha256	39ebc07e37437d6ecdeb0f645783484e28a882b38f7e619ad12c2bf9b5548025	efl-1.18.4.tar.xz
+# From https://download.enlightenment.org/rel/libs/efl/efl-1.20.6.tar.xz.sha256
+sha256	56c67ea77435753a4f324a0a13488ba58f4ed7eb35a97c1a354fdc79c39a32c1	efl-1.20.6.tar.xz
+sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341  COMPLIANCE
+sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37  COPYING
+sha256 781ee841d15835b393bfe7d4c6497dc1b05217479abd40daceaf7aa102a758e1  licenses/COPYING.BSD
+sha256 e60d07dfb2c5264f9f405fa52bf0d4f85429dd9ae1bc2ffcff8af1924ef720d1  licenses/COPYING.FTL
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  licenses/COPYING.GPL
+sha256 89f79ccd2c35ba220ddeba70ee36ca867226c41fc210bc5e7f1e9032c5b16d5f  licenses/COPYING.LGPL
+sha256 2996a1c43ee757f9c997a829d82bdd584052323e73cf02ff8126c6fbd95c2d87  licenses/COPYING.NGINX-MIT
+sha256 48f124212f8fc024392a2d1d011fbb96c7ab8f89c0b72c671c33e9e1cb1d0790  licenses/COPYING.SMALL
diff --git a/bsp/buildroot/package/efl/efl.mk b/bsp/buildroot/package/efl/efl.mk
index 1e54f728..70857967 100644
--- a/bsp/buildroot/package/efl/efl.mk
+++ b/bsp/buildroot/package/efl/efl.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-EFL_VERSION = 1.18.4
+EFL_VERSION = 1.20.6
 EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
 EFL_SITE = http://download.enlightenment.org/rel/libs/efl
-EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+
+EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
 EFL_LICENSE_FILES = \
 	COMPLIANCE \
 	COPYING \
@@ -15,6 +15,7 @@ EFL_LICENSE_FILES = \
 	licenses/COPYING.FTL \
 	licenses/COPYING.GPL \
 	licenses/COPYING.LGPL \
+	licenses/COPYING.NGINX-MIT \
 	licenses/COPYING.SMALL
 
 EFL_INSTALL_STAGING = YES
@@ -24,26 +25,28 @@ EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \
 
 # Configure options:
 # --disable-lua-old: build elua for the target.
-# --disable-poppler: disable poppler image loader.
 # --disable-sdl: disable sdl2 support.
 # --disable-spectre: disable spectre image loader.
 # --disable-xinput22: disable X11 XInput v2.2+ support.
+# --disable-vnc-server: remove libvncserver dependency.
 # --enable-liblz4: use liblz4 from lz4 package.
+# --with-net-control=none: disable connman networkmanager.
 # --with-doxygen: disable doxygen documentation
 EFL_CONF_OPTS = \
-	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
-	--with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
-	--with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \
-	--with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \
-	--with-elua=$(HOST_DIR)/usr/bin/elua \
-	--with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \
+	--with-edje-cc=$(HOST_DIR)/bin/edje_cc \
+	--with-eet-eet=$(HOST_DIR)/bin/eet \
+	--with-eldbus_codegen=$(HOST_DIR)/bin/eldbus-codegen \
+	--with-elementary-codegen=$(HOST_DIR)/bin/elementary_codegen \
+	--with-elm-prefs-cc=$(HOST_DIR)/bin/elm_prefs_cc \
+	--with-elua=$(HOST_DIR)/bin/elua \
+	--with-eolian-gen=$(HOST_DIR)/bin/eolian_gen \
+	--disable-image-loader-jp2k \
+	--with-net-control=none \
 	--disable-lua-old \
-	--disable-poppler \
 	--disable-sdl \
 	--disable-spectre \
 	--disable-xinput22 \
-	--disable-wayland \
+	--disable-vnc-server \
 	--enable-liblz4 \
 	--with-doxygen=no
 
@@ -54,7 +57,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y)
 EFL_CONF_OPTS += --enable-cxx-bindings \
-	--with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx
+	--with-eolian-cxx=$(HOST_DIR)/bin/eolian_cxx
 else
 EFL_CONF_OPTS += --disable-cxx-bindings
 endif
@@ -212,7 +215,7 @@ endif
 # which depends on wayland-client to build.
 # So enable gl_drm only when wayland support is selected.
 ifeq ($(BR2_PACKAGE_EFL_WAYLAND),y)
-EFL_DEPENDENCIES += wayland
+EFL_DEPENDENCIES += wayland wayland-protocols
 EFL_CONF_OPTS += --enable-wayland --enable-gl-drm
 else
 EFL_CONF_OPTS += --disable-wayland --disable-gl-drm
@@ -251,13 +254,6 @@ else
 EFL_CONF_OPTS += --disable-image-loader-tiff
 endif
 
-ifeq ($(BR2_PACKAGE_EFL_JP2K),y)
-EFL_CONF_OPTS += --enable-image-loader-jp2k=yes
-EFL_DEPENDENCIES += openjpeg
-else
-EFL_CONF_OPTS += --disable-image-loader-jp2k
-endif
-
 ifeq ($(BR2_PACKAGE_EFL_WEBP),y)
 EFL_CONF_OPTS += --enable-image-loader-webp=yes
 EFL_DEPENDENCIES += webp
@@ -265,6 +261,13 @@ else
 EFL_CONF_OPTS += --disable-image-loader-webp
 endif
 
+ifeq ($(BR2_PACKAGE_POPPLER),y)
+EFL_DEPENDENCIES += poppler
+EFL_CONF_OPTS += --enable-poppler
+else
+EFL_CONF_OPTS += --disable-poppler
+endif
+
 ifeq ($(BR2_PACKAGE_EFL_LIBRAW),y)
 EFL_DEPENDENCIES += libraw
 EFL_CONF_OPTS += --enable-libraw
@@ -291,6 +294,10 @@ endef
 EFL_POST_INSTALL_TARGET_HOOKS = EFL_HOOK_REMOVE_UPOWER
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
+EFL_DEPENDENCIES += libunwind
+endif
+
 $(eval $(autotools-package))
 
 ################################################################################
@@ -330,10 +337,13 @@ HOST_EFL_DEPENDENCIES = \
 # --disable-physics: remove Bullet dependency.
 # --disable-poppler: disable poppler image loader.
 # --disable-spectre: disable spectre image loader.
+# --disable-systemd: disable systemd dependency.
+# --disable-vnc-server: remove libvncserver dependency.
 # --enable-image-loader-gif=no: disable Gif dependency.
 # --enable-image-loader-tiff=no: disable Tiff dependency.
 # --with-crypto=none: remove dependencies on openssl or gnutls.
 # --with-doxygen: disable doxygen documentation
+# --with-net-control=none: disable connman networkmanager.
 # --with-x11=none: remove dependency on X.org.
 #   Yes I really know what I am doing.
 HOST_EFL_CONF_OPTS += \
@@ -350,7 +360,9 @@ HOST_EFL_CONF_OPTS += \
 	--disable-physics \
 	--disable-poppler \
 	--disable-spectre \
+	--disable-systemd \
 	--disable-xcf \
+	--disable-vnc-server \
 	--enable-image-loader-gif=no \
 	--enable-image-loader-jpeg=yes \
 	--enable-image-loader-png=yes \
@@ -358,6 +370,7 @@ HOST_EFL_CONF_OPTS += \
 	--with-crypto=none \
 	--with-doxygen=no \
 	--with-glib=yes \
+	--with-net-control=none \
 	--with-opengl=none \
 	--with-x11=none \
 	--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb
@@ -376,7 +389,7 @@ endif
 # system bus which is non-existent and does not contain
 # any upower service in it.
 define HOST_EFL_HOOK_REMOVE_UPOWER
-	rm -fr $(HOST_DIR)/usr/lib/ecore/system/upower
+	rm -fr $(HOST_DIR)/lib/ecore/system/upower
 endef
 HOST_EFL_POST_INSTALL_HOOKS = HOST_EFL_HOOK_REMOVE_UPOWER
 
diff --git a/bsp/buildroot/package/eigen/Config.in b/bsp/buildroot/package/eigen/Config.in
index 03d65b19..48752e0c 100644
--- a/bsp/buildroot/package/eigen/Config.in
+++ b/bsp/buildroot/package/eigen/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_EIGEN
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Eigen is a C++ template library for linear algebra: vectors,
-	  matrices, and related algorithms. It is versatile, fast, elegant
-	  and works on many platforms (OS/Compilers).
+	  matrices, and related algorithms. It is versatile, fast,
+	  elegant and works on many platforms (OS/Compilers).
 
 	  This package only installs header files to the include path.
 	  If you just want to use Eigen, you can use the header files
diff --git a/bsp/buildroot/package/eigen/eigen.hash b/bsp/buildroot/package/eigen/eigen.hash
new file mode 100644
index 00000000..4a1bcdf9
--- /dev/null
+++ b/bsp/buildroot/package/eigen/eigen.hash
@@ -0,0 +1,8 @@
+# Locally computed
+sha256 dd254beb0bafc695d0f62ae1a222ff85b52dbaa3a16f76e781dce22d0d20a4a6 3.3.4.tar.bz2
+sha256 4f877e5ae4672568ef82cfd0023e2cef4a7cf55d867ab249efc9569a7eb9e5b1 COPYING.BSD
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.GPL
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
+sha256 f5b330efdad110cdd84d585ec61220b0650461fa599e36b13e1726c9346dcfb9 COPYING.MINPACK
+sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 COPYING.MPL2
+sha256 c83230b770f17ef1386ea1fd3681271dd98aa93646bdbfb5bff3a1b7050fff9d COPYING.README
diff --git a/bsp/buildroot/package/eigen/eigen.mk b/bsp/buildroot/package/eigen/eigen.mk
index 730bb5ff..27c4e212 100644
--- a/bsp/buildroot/package/eigen/eigen.mk
+++ b/bsp/buildroot/package/eigen/eigen.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-EIGEN_VERSION = 3.2.5
-EIGEN_SITE = https://bitbucket.org/eigen/eigen
-EIGEN_SITE_METHOD = hg
-EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1
+EIGEN_VERSION = 3.3.4
+EIGEN_SOURCE = $(EIGEN_VERSION).tar.bz2
+EIGEN_SITE = https://bitbucket.org/eigen/eigen/get
+EIGEN_LICENSE = MPL2, BSD-3-Clause, LGPL-2.1
 EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README
 EIGEN_INSTALL_STAGING = YES
 EIGEN_INSTALL_TARGET = NO
@@ -23,7 +23,8 @@ endif
 # Generate the .pc file at build time
 define EIGEN_BUILD_CMDS
 	sed -r -e 's,^Version: .*,Version: $(EIGEN_VERSION),' \
-		-e 's,^Cflags: .*,Cflags: -I$(EIGEN_DEST_DIR),' \
+		-e 's,^Cflags: .*,Cflags: -I$$\{prefix\}/include/eigen3,' \
+		-e 's,^prefix.*,prefix=/usr,' \
 		$(@D)/eigen3.pc.in >$(@D)/eigen3.pc
 endef
 
diff --git a/bsp/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch b/bsp/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch
index 6917f71f..f012140a 100644
--- a/bsp/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch
+++ b/bsp/buildroot/package/ejabberd/0001-remove-make-targets-for-deps.patch
@@ -7,26 +7,24 @@ Without this patch, dependencies would be downloaded and compiled
 using rebar at build time.
 
 Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
----
- Makefile.in | 26 +++-----------------------
- 1 file changed, 3 insertions(+), 23 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 08cd837..2a6457c 100644
+index df2abfdc..8c8fd714 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -77,26 +77,11 @@ else
+@@ -86,27 +86,11 @@ else
    INIT_USER=$(INSTALLUSER)
  endif
- 
+
 -all: deps src
 +all: src
- 
+
 -deps: deps/.got
 -
 -deps/.got:
 -	rm -rf deps/.got
 -	rm -rf deps/.built
+-	mkdir -p deps
 -	$(REBAR) get-deps && :> deps/.got
 -
 -deps/.built: deps/.got
@@ -35,7 +33,7 @@ index 08cd837..2a6457c 100644
 -src: deps/.built
 +src:
  	$(REBAR) skip_deps=true compile
- 
+
 -update:
 -	rm -rf deps/.got
 -	rm -rf deps/.built
@@ -43,34 +41,3 @@ index 08cd837..2a6457c 100644
 -
  xref: all
  	$(REBAR) skip_deps=true xref
- 
-@@ -152,16 +137,13 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template,
- $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))):
- 	$(INSTALL) -d $@
- 
--$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/)
--	$(INSTALL) -m 750 $(O_USER) $< $@
--
- $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql)
- 	$(INSTALL) -m 644 $< $@
- 
- $(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin)
- 	$(INSTALL) -m 750 $(O_USER) $< $@
- 
--copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
-+copy-files-sub2: $(call TO_DEST,$(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql)
- 
- endif
- 
-@@ -287,8 +269,6 @@ TAGS:
- 
- Makefile: Makefile.in
- 
--deps := $(wildcard deps/*/ebin)
--
- dialyzer/erlang.plt:
- 	@mkdir -p dialyzer
- 	@dialyzer --build_plt --output_plt dialyzer/erlang.plt \
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch b/bsp/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch
index 9dcea1c3..154c7bff 100644
--- a/bsp/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch
+++ b/bsp/buildroot/package/ejabberd/0002-remove-dependencies-from-rebar-config.patch
@@ -1,85 +1,106 @@
-From d399ecdd99e62b5554210a3b5c733e738e4d54be Mon Sep 17 00:00:00 2001
-From: Philipp Huebner <debalance@debian.org>
-Date: Wed, 20 Jan 2016 08:08:42 -0500
+From 8674f61701da41cc53c532b5fa3a516838a2c5d4 Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <johan.oudinet@gmail.com>
+Date: Wed, 10 Jan 2018 15:14:56 +0100
 Subject: [PATCH] remove dependencies from rebar config
 
-Without this patch, dependencies would be downloaded and compiled
-by rebar at build time.
+Without this patch, dependencies would be downloaded and compiled by
+rebar at build time.
 
-Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
 ---
- rebar.config | 51 ---------------------------------------------------
- 1 file changed, 51 deletions(-)
+ rebar.config | 72 ------------------------------------------------------------
+ 1 file changed, 72 deletions(-)
 
 diff --git a/rebar.config b/rebar.config
-index 30c0360..d6a5b4d 100644
+index d6ad5e7b..0b246b92 100644
 --- a/rebar.config
 +++ b/rebar.config
-@@ -7,48 +7,6 @@
- %%% Created :  1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
- %%%-------------------------------------------------------------------
+@@ -18,68 +18,6 @@
+ %%%
+ %%%----------------------------------------------------------------------
  
--{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}},
--        {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}},
--        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}},
--        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}},
--        {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}},
--        {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}},
--        {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}},
--        {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}},
--        {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}},
--        {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}},
--        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}},
--        {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}},
--        {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}},
--        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}},
--        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}},
--        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}},
--        {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}},
--        {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}},
--        {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}},  % for riak_pb-2.1.0.7
--        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
--        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}},
--        {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
--        {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}},
--        {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}},
--        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}.
+-{deps, [{lager, ".*", {git, "https://github.com/erlang-lager/lager",
+-                       {tag, {if_version_above, "17", "3.4.2", "3.2.1"}}}},
+-        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}},
+-        {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.12"}}},
+-        {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
+-        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
+-        {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}},
+-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.16"}}},
+-        {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.12"}}},
+-        {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
+-        {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.2"}}},
+-        {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
+-	{jose, ".*", {git, "git://github.com/potatosalad/erlang-jose.git", {tag, "1.8.4"}}},
+-	{fs, ".*", {git, "https://github.com/synrc/fs.git", {tag, "2.12.0"}}},
+-	{if_var_true, stun, {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}}},
+-	{if_var_true, sip, {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.17"}}}},
+-        {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
+-                                               {tag, "1.0.4"}}}},
+-        {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
+-                                               {tag, "1.1.4"}}}},
+-        {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
+-                                               {tag, "1.1.5"}}}},
+-        {if_var_true, pam, {epam, ".*", {git, "https://github.com/processone/epam",
+-                                           {tag, "1.0.3"}}}},
+-        {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
+-                                           {tag, "1.0.3"}}}},
+-        {if_var_true, riak, {riakc, ".*", {git, "https://github.com/processone/riak-erlang-client.git",
+-                                           {tag, {if_version_above, "19", "develop", "2.5.3"}}}}},
+-	{if_var_true, graphics, {eimp, ".*", {git, "https://github.com/processone/eimp.git", {tag, "1.0.2"}}}},
+-	%% Elixir support, needed to run tests
+-        {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
+-                                              {tag, {if_version_above, "17", "v1.4.4", "v1.1.1"}}}}},
+-        %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
+-	{if_not_rebar3, {if_var_true, elixir, {rebar_elixir_plugin, ".*",
+-					       {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}},
+-        {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
+-                                            {tag, "1.0.6"}}}},
+-        {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
+-                                              {tag, "0.8.4"}}}},
+-        {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
+-                                           {tag, "1.0.5c"}}}},
+-        {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
+-                                             {tag, "v1.0.8"}}}}]}.
 -
 -{if_var_true, latest_deps,
-- {floating_deps, [p1_logger,
--                  cache_tab,
--                  p1_tls,
--                  p1_stringprep,
--                  p1_xml,
+- {floating_deps, [cache_tab,
+-                  fast_tls,
+-                  stringprep,
+-                  fast_xml,
 -                  esip,
--                  p1_stun,
--                  p1_yaml,
+-                  stun,
+-                  fast_yaml,
+-		  xmpp,
 -                  p1_utils,
 -                  p1_mysql,
 -                  p1_pgsql,
--                  p1_pam,
--                  p1_zlib,
--                  p1_iconv]}}.
+-                  p1_oauth2,
+-                  epam,
+-                  ezlib,
+-		  eimp,
+-                  iconv]}}.
 -
+ {erl_first_files, ["src/ejabberd_config.erl", "src/gen_mod.erl", "src/mod_muc_room.erl", "src/mod_push.erl"]}.
+ 
  {erl_opts, [nowarn_deprecated_function,
-             {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
-             {if_var_match, db_type, mssql, {d, 'mssql'}},
-@@ -92,15 +50,6 @@
+@@ -153,16 +91,6 @@
+ {if_version_above, "17", {cover_enabled, true}}.
+ {cover_export_enabled, true}.
  
- {eunit_compile_opts, [{i, "tools"}]}.
- 
--{post_hook_configure, [{"p1_tls", []},
--                       {"p1_stringprep", []},
--                       {"p1_yaml", []},
--                       {"esip", []},
--                       {"p1_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
--                       {if_var_true, pam, {"p1_pam", []}},
--                       {if_var_true, zlib, {"p1_zlib", []}},
--                       {if_var_true, iconv, {"p1_iconv", []}}]}.
+-{post_hook_configure, [{"fast_tls", []},
+-                       {"stringprep", []},
+-                       {"fast_yaml", []},
+-                       {if_var_true, sip, {"esip", []}},
+-                       {"fast_xml", [{if_var_true, full_xml, "--enable-full-xml"}]},
+-                       {if_var_true, pam, {"epam", []}},
+-                       {if_var_true, zlib, {"ezlib", []}},
+-		       {if_var_true, graphics, {"eimp", []}},
+-                       {if_var_true, iconv, {"iconv", []}}]}.
 -
  {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}.
  
  {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
 -- 
-2.5.0
+2.14.1
 
diff --git a/bsp/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch b/bsp/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch
index ebcdd546..da3bf2a8 100644
--- a/bsp/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch
+++ b/bsp/buildroot/package/ejabberd/0003-remove-checking-erlang-version.patch
@@ -6,6 +6,8 @@ Subject: [PATCH] remove checking erlang version
 Without this patch, the configure will try to run erlang to simply check
 if the version is supported by ejabberd. Instead, we do this test
 statically.
+
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
 ---
  configure.ac | 2 --
  1 file changed, 2 deletions(-)
diff --git a/bsp/buildroot/package/ejabberd/0004-correct-include.patch b/bsp/buildroot/package/ejabberd/0004-correct-include.patch
deleted file mode 100644
index fd1dee28..00000000
--- a/bsp/buildroot/package/ejabberd/0004-correct-include.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 705a9ad229de49cd9cce226a2025716902455663 Mon Sep 17 00:00:00 2001
-From: Philipp Huebner <debalance@debian.org>
-Date: Wed, 20 Jan 2016 08:13:21 -0500
-Subject: [PATCH] correct include
-
-This part of the code was moved into it's own project and was packaged
-separately by me. To make the build process work, this small fix is
-necessary.
----
- src/mod_sip.erl           | 2 +-
- src/mod_sip_proxy.erl     | 2 +-
- src/mod_sip_registrar.erl | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/mod_sip.erl b/src/mod_sip.erl
-index c8c9533..7f188a0 100644
---- a/src/mod_sip.erl
-+++ b/src/mod_sip.erl
-@@ -38,7 +38,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include_lib("esip/include/esip.hrl").
-+-include_lib("p1_sip/include/esip.hrl").
- 
- %%%===================================================================
- %%% API
-diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl
-index bf297bc..d8b65cd 100644
---- a/src/mod_sip_proxy.erl
-+++ b/src/mod_sip_proxy.erl
-@@ -40,7 +40,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include_lib("esip/include/esip.hrl").
-+-include_lib("p1_sip/include/esip.hrl").
- 
- -define(SIGN_LIFETIME, 300). %% in seconds.
- 
-diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl
-index 44091ed..4d2ec82 100644
---- a/src/mod_sip_registrar.erl
-+++ b/src/mod_sip_registrar.erl
-@@ -37,7 +37,7 @@
- 
- -include("ejabberd.hrl").
- -include("logger.hrl").
---include_lib("esip/include/esip.hrl").
-+-include_lib("p1_sip/include/esip.hrl").
- 
- -define(CALL_TIMEOUT, timer:seconds(30)).
- -define(DEFAULT_EXPIRES, 3600).
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/ejabberd/0004-correct-includes.patch b/bsp/buildroot/package/ejabberd/0004-correct-includes.patch
new file mode 100644
index 00000000..f8f827a4
--- /dev/null
+++ b/bsp/buildroot/package/ejabberd/0004-correct-includes.patch
@@ -0,0 +1,1919 @@
+From 0487178693143955ff57e3c9371fb6e7b164294c Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <johan.oudinet@gmail.com>
+Date: Thu, 11 Jan 2018 12:49:38 +0100
+Subject: [PATCH] correct includes
+
+Use include_lib() instead of include() for files from external
+libraries. See https://github.com/processone/ejabberd/pull/1446
+
+Note: Philipp Huebner has a similar patch in Debian's port of ejabberd
+but it was easier to redo this patch from scratch with the following sed
+command on ejabberd git repository than adapting Huebner's patch format:
+for f in src/*.erl include/*.hrl; do
+    sed -i -e 's,esip/include,s1_sip/include,g' \
+    -e 's,include("ns.hrl,include_lib("p1_xmpp/include/ns.hrl,g' \
+    -e 's,include("fxml.hrl,include_lib("p1_xml/include/fxml.hrl,g' \
+    -e 's,include("xmpp\.hrl,include_lib("p1_xmpp/include/xmpp.hrl,g' \
+    -e 's,include("jid\.hrl,include_lib("p1_xmpp/include/jid.hrl,g' \
+    "$f"
+done
+
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
+---
+ include/jlib.hrl                  | 4 ++--
+ src/acl.erl                       | 2 +-
+ src/acme_challenge.erl            | 2 +-
+ src/ejabberd_acme.erl             | 2 +-
+ src/ejabberd_acme_comm.erl        | 2 +-
+ src/ejabberd_auth_anonymous.erl   | 2 +-
+ src/ejabberd_bosh.erl             | 2 +-
+ src/ejabberd_c2s.erl              | 2 +-
+ src/ejabberd_captcha.erl          | 2 +-
+ src/ejabberd_http.erl             | 2 +-
+ src/ejabberd_http_ws.erl          | 2 +-
+ src/ejabberd_iq.erl               | 2 +-
+ src/ejabberd_local.erl            | 2 +-
+ src/ejabberd_oauth.erl            | 2 +-
+ src/ejabberd_oauth_rest.erl       | 2 +-
+ src/ejabberd_oauth_sql.erl        | 2 +-
+ src/ejabberd_piefxis.erl          | 2 +-
+ src/ejabberd_router.erl           | 2 +-
+ src/ejabberd_router_multicast.erl | 2 +-
+ src/ejabberd_s2s.erl              | 2 +-
+ src/ejabberd_s2s_in.erl           | 2 +-
+ src/ejabberd_s2s_out.erl          | 2 +-
+ src/ejabberd_service.erl          | 2 +-
+ src/ejabberd_sm.erl               | 2 +-
+ src/ejabberd_socket.erl           | 2 +-
+ src/ejabberd_system_monitor.erl   | 2 +-
+ src/ejabberd_web.erl              | 2 +-
+ src/ejabberd_web_admin.erl        | 2 +-
+ src/ejabberd_websocket.erl        | 2 +-
+ src/ejabberd_xmlrpc.erl           | 2 +-
+ src/gen_iq_handler.erl            | 2 +-
+ src/gen_pubsub_node.erl           | 2 +-
+ src/gen_pubsub_nodetree.erl       | 2 +-
+ src/jd2ejd.erl                    | 2 +-
+ src/mod_adhoc.erl                 | 2 +-
+ src/mod_admin_extra.erl           | 2 +-
+ src/mod_admin_update_sql.erl      | 2 +-
+ src/mod_announce.erl              | 2 +-
+ src/mod_announce_mnesia.erl       | 2 +-
+ src/mod_announce_riak.erl         | 2 +-
+ src/mod_announce_sql.erl          | 2 +-
+ src/mod_avatar.erl                | 2 +-
+ src/mod_block_strangers.erl       | 2 +-
+ src/mod_blocking.erl              | 2 +-
+ src/mod_bosh.erl                  | 2 +-
+ src/mod_caps.erl                  | 2 +-
+ src/mod_carboncopy.erl            | 2 +-
+ src/mod_client_state.erl          | 2 +-
+ src/mod_configure.erl             | 2 +-
+ src/mod_delegation.erl            | 2 +-
+ src/mod_disco.erl                 | 2 +-
+ src/mod_echo.erl                  | 2 +-
+ src/mod_fail2ban.erl              | 2 +-
+ src/mod_http_api.erl              | 2 +-
+ src/mod_http_upload.erl           | 2 +-
+ src/mod_http_upload_quota.erl     | 2 +-
+ src/mod_irc.erl                   | 2 +-
+ src/mod_irc_connection.erl        | 2 +-
+ src/mod_irc_mnesia.erl            | 2 +-
+ src/mod_irc_riak.erl              | 2 +-
+ src/mod_irc_sql.erl               | 2 +-
+ src/mod_last.erl                  | 2 +-
+ src/mod_legacy_auth.erl           | 2 +-
+ src/mod_mam.erl                   | 2 +-
+ src/mod_mam_mnesia.erl            | 2 +-
+ src/mod_mam_sql.erl               | 2 +-
+ src/mod_metrics.erl               | 2 +-
+ src/mod_mix.erl                   | 2 +-
+ src/mod_muc.erl                   | 2 +-
+ src/mod_muc_admin.erl             | 2 +-
+ src/mod_muc_log.erl               | 2 +-
+ src/mod_muc_mnesia.erl            | 2 +-
+ src/mod_muc_riak.erl              | 2 +-
+ src/mod_muc_room.erl              | 2 +-
+ src/mod_muc_sql.erl               | 2 +-
+ src/mod_multicast.erl             | 2 +-
+ src/mod_offline.erl               | 2 +-
+ src/mod_offline_mnesia.erl        | 2 +-
+ src/mod_offline_riak.erl          | 2 +-
+ src/mod_offline_sql.erl           | 2 +-
+ src/mod_ping.erl                  | 2 +-
+ src/mod_pres_counter.erl          | 2 +-
+ src/mod_privacy.erl               | 2 +-
+ src/mod_privacy_mnesia.erl        | 2 +-
+ src/mod_privacy_riak.erl          | 2 +-
+ src/mod_privacy_sql.erl           | 2 +-
+ src/mod_private.erl               | 2 +-
+ src/mod_private_mnesia.erl        | 2 +-
+ src/mod_private_riak.erl          | 2 +-
+ src/mod_private_sql.erl           | 2 +-
+ src/mod_privilege.erl             | 2 +-
+ src/mod_proxy65_service.erl       | 2 +-
+ src/mod_pubsub.erl                | 2 +-
+ src/mod_push.erl                  | 2 +-
+ src/mod_push_keepalive.erl        | 2 +-
+ src/mod_push_mnesia.erl           | 2 +-
+ src/mod_push_sql.erl              | 2 +-
+ src/mod_register.erl              | 2 +-
+ src/mod_register_web.erl          | 2 +-
+ src/mod_roster.erl                | 2 +-
+ src/mod_s2s_dialback.erl          | 2 +-
+ src/mod_service_log.erl           | 2 +-
+ src/mod_shared_roster.erl         | 2 +-
+ src/mod_shared_roster_ldap.erl    | 2 +-
+ src/mod_shared_roster_mnesia.erl  | 2 +-
+ src/mod_shared_roster_riak.erl    | 2 +-
+ src/mod_shared_roster_sql.erl     | 2 +-
+ src/mod_sic.erl                   | 2 +-
+ src/mod_sip.erl                   | 2 +-
+ src/mod_sip_proxy.erl             | 2 +-
+ src/mod_sip_registrar.erl         | 2 +-
+ src/mod_stats.erl                 | 2 +-
+ src/mod_stream_mgmt.erl           | 2 +-
+ src/mod_time.erl                  | 2 +-
+ src/mod_vcard.erl                 | 2 +-
+ src/mod_vcard_ldap.erl            | 2 +-
+ src/mod_vcard_mnesia.erl          | 2 +-
+ src/mod_vcard_riak.erl            | 2 +-
+ src/mod_vcard_sql.erl             | 2 +-
+ src/mod_vcard_xupdate.erl         | 2 +-
+ src/mod_version.erl               | 2 +-
+ src/node_dag.erl                  | 2 +-
+ src/node_dispatch.erl             | 2 +-
+ src/node_flat.erl                 | 2 +-
+ src/node_flat_sql.erl             | 2 +-
+ src/node_online.erl               | 2 +-
+ src/nodetree_dag.erl              | 2 +-
+ src/nodetree_tree.erl             | 2 +-
+ src/nodetree_tree_sql.erl         | 2 +-
+ src/prosody2ejabberd.erl          | 2 +-
+ src/pubsub_subscription.erl       | 2 +-
+ src/pubsub_subscription_sql.erl   | 2 +-
+ src/xmpp_stream_in.erl            | 2 +-
+ src/xmpp_stream_out.erl           | 2 +-
+ src/xmpp_stream_pkix.erl          | 2 +-
+ 135 files changed, 136 insertions(+), 136 deletions(-)
+
+diff --git a/include/jlib.hrl b/include/jlib.hrl
+index cd5fedbf..293fcc0e 100644
+--- a/include/jlib.hrl
++++ b/include/jlib.hrl
+@@ -18,8 +18,8 @@
+ %%%
+ %%%----------------------------------------------------------------------
+ 
+--include("ns.hrl").
+--include("fxml.hrl").
++-include_lib("p1_xmpp/include/ns.hrl").
++-include_lib("p1_xml/include/fxml.hrl").
+ 
+ -define(STANZA_ERROR(Code, Type, Condition),
+ 	#xmlel{name = <<"error">>,
+diff --git a/src/acl.erl b/src/acl.erl
+index 2d848b99..88df4625 100644
+--- a/src/acl.erl
++++ b/src/acl.erl
+@@ -45,7 +45,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ -record(acl, {aclname, aclspec}).
+ -record(access, {name       :: aclname(),
+diff --git a/src/acme_challenge.erl b/src/acme_challenge.erl
+index f4fde4e7..45fc6d8f 100644
+--- a/src/acme_challenge.erl
++++ b/src/acme_challenge.erl
+@@ -16,7 +16,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_http.hrl").
+ -include("ejabberd_acme.hrl").
+ 
+diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl
+index a5166b45..eee74092 100644
+--- a/src/ejabberd_acme.erl
++++ b/src/ejabberd_acme.erl
+@@ -21,7 +21,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_commands.hrl").
+ -include("ejabberd_acme.hrl").
+ -include_lib("public_key/include/public_key.hrl").
+diff --git a/src/ejabberd_acme_comm.erl b/src/ejabberd_acme_comm.erl
+index a5668d08..02acd1c4 100644
+--- a/src/ejabberd_acme_comm.erl
++++ b/src/ejabberd_acme_comm.erl
+@@ -24,7 +24,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_acme.hrl").
+ -include_lib("public_key/include/public_key.hrl").
+diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl
+index a4f3ac1c..697b3e08 100644
+--- a/src/ejabberd_auth_anonymous.erl
++++ b/src/ejabberd_auth_anonymous.erl
+@@ -46,7 +46,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ start(Host) ->
+     ejabberd_hooks:add(sm_register_connection_hook, Host,
+diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl
+index 1df6681f..e8cc5f9b 100644
+--- a/src/ejabberd_bosh.erl
++++ b/src/ejabberd_bosh.erl
+@@ -47,7 +47,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
+index a94d065f..a56d9041 100644
+--- a/src/ejabberd_c2s.erl
++++ b/src/ejabberd_c2s.erl
+@@ -52,7 +52,7 @@
+ 	 host_up/1, host_down/1]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_roster.hrl").
+ 
+diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl
+index 76af5278..3a950786 100644
+--- a/src/ejabberd_captcha.erl
++++ b/src/ejabberd_captcha.erl
+@@ -43,7 +43,7 @@
+ 	 is_feature_available/0, create_captcha_x/5,
+ 	 opt_type/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_http.hrl").
+diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
+index 0bc0d8fc..d39a585d 100644
+--- a/src/ejabberd_http.erl
++++ b/src/ejabberd_http.erl
+@@ -39,7 +39,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
+index f9f7b07e..5c0e6ea1 100644
+--- a/src/ejabberd_http_ws.erl
++++ b/src/ejabberd_http_ws.erl
+@@ -39,7 +39,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl
+index 7d2751dc..76a6b056 100644
+--- a/src/ejabberd_iq.erl
++++ b/src/ejabberd_iq.erl
+@@ -34,7 +34,7 @@
+ -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+ 	 terminate/2, code_change/3]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -record(state, {expire = infinity :: timeout()}).
+diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl
+index cc1d6a2e..f72fd43b 100644
+--- a/src/ejabberd_local.erl
++++ b/src/ejabberd_local.erl
+@@ -50,7 +50,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state, {}).
+ 
+diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl
+index df4e4bc2..34bf24f8 100644
+--- a/src/ejabberd_oauth.erl
++++ b/src/ejabberd_oauth.erl
+@@ -52,7 +52,7 @@
+ 
+ -export([oauth_issue_token/3, oauth_list_tokens/0, oauth_revoke_token/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl
+index 206fab43..1a7287ee 100644
+--- a/src/ejabberd_oauth_rest.erl
++++ b/src/ejabberd_oauth_rest.erl
+@@ -37,7 +37,7 @@
+ -include("ejabberd.hrl").
+ -include("ejabberd_oauth.hrl").
+ -include("logger.hrl").
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ init() ->
+     rest:start(?MYNAME),
+diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl
+index 14eaca6a..fcd105ba 100644
+--- a/src/ejabberd_oauth_sql.erl
++++ b/src/ejabberd_oauth_sql.erl
+@@ -36,7 +36,7 @@
+ -include("ejabberd_oauth.hrl").
+ -include("ejabberd.hrl").
+ -include("ejabberd_sql_pt.hrl").
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("logger.hrl").
+ 
+ init() ->
+diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl
+index ecb4908a..7331f442 100644
+--- a/src/ejabberd_piefxis.erl
++++ b/src/ejabberd_piefxis.erl
+@@ -42,7 +42,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("mod_roster.hrl").
+ 
+diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl
+index e2901483..315505ec 100644
+--- a/src/ejabberd_router.erl
++++ b/src/ejabberd_router.erl
+@@ -71,7 +71,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_router.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -callback init() -> any().
+ -callback register_route(binary(), binary(), local_hint(),
+diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl
+index 5d5acfca..3f206ef2 100644
+--- a/src/ejabberd_router_multicast.erl
++++ b/src/ejabberd_router_multicast.erl
+@@ -43,7 +43,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(route_multicast, {domain = <<"">> :: binary() | '_',
+ 			  pid = self() :: pid()}).
+diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
+index 0626d62f..e2fc34c9 100644
+--- a/src/ejabberd_s2s.erl
++++ b/src/ejabberd_s2s.erl
+@@ -57,7 +57,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_commands.hrl").
+ 
+diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
+index a949e83d..3d8e100e 100644
+--- a/src/ejabberd_s2s_in.erl
++++ b/src/ejabberd_s2s_in.erl
+@@ -45,7 +45,7 @@
+ 	 host_up/1, host_down/1]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -type state() :: map().
+diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
+index fea5d816..c035731f 100644
+--- a/src/ejabberd_s2s_out.erl
++++ b/src/ejabberd_s2s_out.erl
+@@ -43,7 +43,7 @@
+ 	 route/2, establish/1, update_state/2, host_up/1, host_down/1]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -type state() :: map().
+diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl
+index 7b5f945d..895fed09 100644
+--- a/src/ejabberd_service.erl
++++ b/src/ejabberd_service.erl
+@@ -37,7 +37,7 @@
+ -export([send/2]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -type state() :: map().
+diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl
+index 3df1d88e..e8087c48 100644
+--- a/src/ejabberd_sm.erl
++++ b/src/ejabberd_sm.erl
+@@ -89,7 +89,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_commands.hrl").
+ -include("ejabberd_sm.hrl").
+diff --git a/src/ejabberd_socket.erl b/src/ejabberd_socket.erl
+index 9953a76a..0dd1c4ff 100644
+--- a/src/ejabberd_socket.erl
++++ b/src/ejabberd_socket.erl
+@@ -52,7 +52,7 @@
+ 	 sockname/1, peername/1]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -type sockmod() :: ejabberd_bosh |
+diff --git a/src/ejabberd_system_monitor.erl b/src/ejabberd_system_monitor.erl
+index 773104f9..46e641b7 100644
+--- a/src/ejabberd_system_monitor.erl
++++ b/src/ejabberd_system_monitor.erl
+@@ -41,7 +41,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state, {}).
+ 
+diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl
+index 7a40d2c7..aa1abc9b 100644
+--- a/src/ejabberd_web.erl
++++ b/src/ejabberd_web.erl
+@@ -34,7 +34,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
+index b3d72c19..cdd951b6 100644
+--- a/src/ejabberd_web_admin.erl
++++ b/src/ejabberd_web_admin.erl
+@@ -38,7 +38,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
+index 9926c20c..fabf2293 100644
+--- a/src/ejabberd_websocket.erl
++++ b/src/ejabberd_websocket.erl
+@@ -47,7 +47,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl
+index 213aef7a..f5b51894 100644
+--- a/src/ejabberd_xmlrpc.erl
++++ b/src/ejabberd_xmlrpc.erl
+@@ -42,7 +42,7 @@
+ -include("ejabberd_http.hrl").
+ -include("mod_roster.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state,
+ 	{access_commands = [] :: list(),
+diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl
+index d34db358..ab04a252 100644
+--- a/src/gen_iq_handler.erl
++++ b/src/gen_iq_handler.erl
+@@ -45,7 +45,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state, {host, module, function}).
+ 
+diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl
+index 4f516bd5..83de80a8 100644
+--- a/src/gen_pubsub_node.erl
++++ b/src/gen_pubsub_node.erl
+@@ -25,7 +25,7 @@
+ 
+ -module(gen_pubsub_node).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -type(host() :: mod_pubsub:host()).
+ -type(nodeId() :: mod_pubsub:nodeId()).
+diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl
+index bf7140aa..4267b9a1 100644
+--- a/src/gen_pubsub_nodetree.erl
++++ b/src/gen_pubsub_nodetree.erl
+@@ -36,7 +36,7 @@
+ 	ServerHost :: binary(),
+ 	Opts :: [any()]) -> atom().
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -callback terminate(Host :: host(), ServerHost :: binary()) -> atom().
+ 
+diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl
+index ae293698..bbe9bc6d 100644
+--- a/src/jd2ejd.erl
++++ b/src/jd2ejd.erl
+@@ -32,7 +32,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%----------------------------------------------------------------------
+ %%% API
+diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl
+index e6df3904..0f3ada11 100644
+--- a/src/mod_adhoc.erl
++++ b/src/mod_adhoc.erl
+@@ -39,7 +39,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, Opts) ->
+     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
+diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl
+index 799f0079..9fd8531b 100644
+--- a/src/mod_admin_extra.erl
++++ b/src/mod_admin_extra.erl
+@@ -84,7 +84,7 @@
+ -include("mod_roster.hrl").
+ -include("mod_privacy.hrl").
+ -include("ejabberd_sm.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%
+ %%% gen_mod
+diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl
+index 2f105d97..cace1b94 100644
+--- a/src/mod_admin_update_sql.erl
++++ b/src/mod_admin_update_sql.erl
+@@ -38,7 +38,7 @@
+ -include("logger.hrl").
+ -include("ejabberd.hrl").
+ -include("ejabberd_commands.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ 
+ %%%
+diff --git a/src/mod_announce.erl b/src/mod_announce.erl
+index b259aced..146b6a35 100644
+--- a/src/mod_announce.erl
++++ b/src/mod_announce.erl
+@@ -52,7 +52,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ 
+ -callback init(binary(), gen_mod:opts()) -> any().
+diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl
+index f2e5c1c4..cecd68cc 100644
+--- a/src/mod_announce_mnesia.erl
++++ b/src/mod_announce_mnesia.erl
+@@ -31,7 +31,7 @@
+ 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
+ -export([need_transform/1, transform/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ -include("logger.hrl").
+ 
+diff --git a/src/mod_announce_riak.erl b/src/mod_announce_riak.erl
+index 04a29a68..a3dac3e9 100644
+--- a/src/mod_announce_riak.erl
++++ b/src/mod_announce_riak.erl
+@@ -30,7 +30,7 @@
+ -export([init/2, set_motd_users/2, set_motd/2, delete_motd/1,
+ 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl
+index c5c9eb58..b243d05d 100644
+--- a/src/mod_announce_sql.erl
++++ b/src/mod_announce_sql.erl
+@@ -33,7 +33,7 @@
+ 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3,
+ 	 export/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("logger.hrl").
+diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl
+index dde58abf..ffc31c94 100644
+--- a/src/mod_avatar.erl
++++ b/src/mod_avatar.erl
+@@ -28,7 +28,7 @@
+ %% Hooks
+ -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("pubsub.hrl").
+ 
+diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl
+index b2c56f36..429c0ab2 100644
+--- a/src/mod_block_strangers.erl
++++ b/src/mod_block_strangers.erl
+@@ -34,7 +34,7 @@
+ 
+ -export([filter_packet/1, filter_offline_msg/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
+index 738c5e16..479b34ea 100644
+--- a/src/mod_blocking.erl
++++ b/src/mod_blocking.erl
+@@ -35,7 +35,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("mod_privacy.hrl").
+ 
+diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl
+index 6ee58047..e49ab960 100644
+--- a/src/mod_bosh.erl
++++ b/src/mod_bosh.erl
+@@ -41,7 +41,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_http.hrl").
+ -include("bosh.hrl").
+ 
+diff --git a/src/mod_caps.erl b/src/mod_caps.erl
+index edc93bbf..6ead4230 100644
+--- a/src/mod_caps.erl
++++ b/src/mod_caps.erl
+@@ -53,7 +53,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_caps.hrl").
+ 
+ -define(BAD_HASH_LIFETIME, 600).
+diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl
+index 307d6154..c3a998d8 100644
+--- a/src/mod_carboncopy.erl
++++ b/src/mod_carboncopy.erl
+@@ -40,7 +40,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_carboncopy.hrl").
+ 
+ -type direction() :: sent | received.
+diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl
+index f7adb1c6..09507b73 100644
+--- a/src/mod_client_state.erl
++++ b/src/mod_client_state.erl
+@@ -42,7 +42,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(CSI_QUEUE_MAX, 100).
+ 
+diff --git a/src/mod_configure.erl b/src/mod_configure.erl
+index 31f7a9c8..6ea5bd37 100644
+--- a/src/mod_configure.erl
++++ b/src/mod_configure.erl
+@@ -40,7 +40,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sm.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+ 
+diff --git a/src/mod_delegation.erl b/src/mod_delegation.erl
+index 27e00768..c93912d6 100644
+--- a/src/mod_delegation.erl
++++ b/src/mod_delegation.erl
+@@ -42,7 +42,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -type disco_acc() :: {error, stanza_error()} | {result, [binary()]} | empty.
+ -record(state, {server_host = <<"">> :: binary(),
+diff --git a/src/mod_disco.erl b/src/mod_disco.erl
+index 76be408f..5bea1fb7 100644
+--- a/src/mod_disco.erl
++++ b/src/mod_disco.erl
+@@ -42,7 +42,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("mod_roster.hrl").
+ 
+diff --git a/src/mod_echo.erl b/src/mod_echo.erl
+index 79dd5996..38199d3c 100644
+--- a/src/mod_echo.erl
++++ b/src/mod_echo.erl
+@@ -41,7 +41,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state, {hosts = [] :: [binary()]}).
+ 
+diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl
+index 5e931853..01bdfe2f 100644
+--- a/src/mod_fail2ban.erl
++++ b/src/mod_fail2ban.erl
+@@ -39,7 +39,7 @@
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(C2S_AUTH_BAN_LIFETIME, 3600). %% 1 hour
+ -define(C2S_MAX_AUTH_FAILURES, 20).
+diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl
+index ef881d14..f7cd10bf 100644
+--- a/src/mod_http_api.erl
++++ b/src/mod_http_api.erl
+@@ -77,7 +77,7 @@
+ -export([start/2, stop/1, reload/3, process/2, mod_opt_type/1, depends/2]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl
+index c3c295f6..d3bd4e84 100644
+--- a/src/mod_http_upload.erl
++++ b/src/mod_http_upload.erl
+@@ -89,7 +89,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("ejabberd_http.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -record(state,
+diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl
+index 10243ac0..cda5c563 100644
+--- a/src/mod_http_upload_quota.erl
++++ b/src/mod_http_upload_quota.erl
+@@ -50,7 +50,7 @@
+ %% ejabberd_hooks callback.
+ -export([handle_slot_request/5]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("logger.hrl").
+ -include_lib("kernel/include/file.hrl").
+ 
+diff --git a/src/mod_irc.erl b/src/mod_irc.erl
+index 92093507..9b9becc8 100644
+--- a/src/mod_irc.erl
++++ b/src/mod_irc.erl
+@@ -43,7 +43,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_irc.hrl").
+ 
+ -define(DEFAULT_IRC_ENCODING, <<"iso8859-15">>).
+diff --git a/src/mod_irc_connection.erl b/src/mod_irc_connection.erl
+index 59336591..ca81358f 100644
+--- a/src/mod_irc_connection.erl
++++ b/src/mod_irc_connection.erl
+@@ -41,7 +41,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(SETS, gb_sets).
+ 
+diff --git a/src/mod_irc_mnesia.erl b/src/mod_irc_mnesia.erl
+index eb982e1f..510ce09d 100644
+--- a/src/mod_irc_mnesia.erl
++++ b/src/mod_irc_mnesia.erl
+@@ -30,7 +30,7 @@
+ -export([init/2, get_data/3, set_data/4, import/2]).
+ -export([need_transform/1, transform/1]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_irc.hrl").
+ -include("logger.hrl").
+ 
+diff --git a/src/mod_irc_riak.erl b/src/mod_irc_riak.erl
+index 23f2a2c3..d236bfa7 100644
+--- a/src/mod_irc_riak.erl
++++ b/src/mod_irc_riak.erl
+@@ -29,7 +29,7 @@
+ %% API
+ -export([init/2, get_data/3, set_data/4, import/2]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_irc.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_irc_sql.erl b/src/mod_irc_sql.erl
+index 1f8d7d16..5f784fdc 100644
+--- a/src/mod_irc_sql.erl
++++ b/src/mod_irc_sql.erl
+@@ -31,7 +31,7 @@
+ %% API
+ -export([init/2, get_data/3, set_data/4, import/1, import/2, export/1]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_irc.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ 
+diff --git a/src/mod_last.erl b/src/mod_last.erl
+index e97ef43f..34498e26 100644
+--- a/src/mod_last.erl
++++ b/src/mod_last.erl
+@@ -40,7 +40,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("mod_privacy.hrl").
+ -include("mod_last.hrl").
+diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl
+index 722a0573..c6644386 100644
+--- a/src/mod_legacy_auth.erl
++++ b/src/mod_legacy_auth.erl
+@@ -29,7 +29,7 @@
+ %% hooks
+ -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -type c2s_state() :: ejabberd_c2s:state().
+ 
+diff --git a/src/mod_mam.erl b/src/mod_mam.erl
+index eb839ea1..abc461db 100644
+--- a/src/mod_mam.erl
++++ b/src/mod_mam.erl
+@@ -41,7 +41,7 @@
+ 	 delete_old_messages/2, get_commands_spec/0, msg_to_el/4,
+ 	 get_room_config/4, set_room_option/3, offline_message/1, export/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_muc_room.hrl").
+ -include("ejabberd_commands.hrl").
+diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl
+index 71f1f701..a3a7eb5f 100644
+--- a/src/mod_mam_mnesia.erl
++++ b/src/mod_mam_mnesia.erl
+@@ -31,7 +31,7 @@
+ 	 extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6]).
+ 
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_mam.hrl").
+ 
+diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl
+index 40aa9836..b4fab39b 100644
+--- a/src/mod_mam_sql.erl
++++ b/src/mod_mam_sql.erl
+@@ -33,7 +33,7 @@
+ 	 extended_fields/0, store/8, write_prefs/4, get_prefs/2, select/6, export/1]).
+ 
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_mam.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl
+index 73a68a8d..1b0d2e1b 100644
+--- a/src/mod_metrics.erl
++++ b/src/mod_metrics.erl
+@@ -30,7 +30,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([start/2, stop/1, mod_opt_type/1, depends/2, reload/3]).
+ 
+diff --git a/src/mod_mix.erl b/src/mod_mix.erl
+index 90507665..627363f3 100644
+--- a/src/mod_mix.erl
++++ b/src/mod_mix.erl
+@@ -37,7 +37,7 @@
+ 	 terminate/2, code_change/3]).
+ 
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(NODES, [?NS_MIX_NODES_MESSAGES,
+ 		?NS_MIX_NODES_PRESENCE,
+diff --git a/src/mod_muc.erl b/src/mod_muc.erl
+index f7d5303f..f01cde16 100644
+--- a/src/mod_muc.erl
++++ b/src/mod_muc.erl
+@@ -73,7 +73,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_muc.hrl").
+ 
+ -record(state,
+diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
+index e41f62b5..4d18d068 100644
+--- a/src/mod_muc_admin.erl
++++ b/src/mod_muc_admin.erl
+@@ -43,7 +43,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_muc.hrl").
+ -include("mod_muc_room.hrl").
+ -include("ejabberd_http.hrl").
+diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl
+index f2685aaa..abb55c42 100644
+--- a/src/mod_muc_log.erl
++++ b/src/mod_muc_log.erl
+@@ -44,7 +44,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_muc_room.hrl").
+ 
+ -define(T(Text), translate:translate(Lang, Text)).
+diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl
+index aa59038c..7334aca4 100644
+--- a/src/mod_muc_mnesia.erl
++++ b/src/mod_muc_mnesia.erl
+@@ -44,7 +44,7 @@
+ 
+ -include("mod_muc.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+ 
+ -record(state, {}).
+diff --git a/src/mod_muc_riak.erl b/src/mod_muc_riak.erl
+index 57d9666b..4ebd2949 100644
+--- a/src/mod_muc_riak.erl
++++ b/src/mod_muc_riak.erl
+@@ -38,7 +38,7 @@
+ -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
+ 	 get_affiliations/3, search_affiliation/4]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_muc.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl
+index bafa938d..d8b5e288 100644
+--- a/src/mod_muc_room.erl
++++ b/src/mod_muc_room.erl
+@@ -51,7 +51,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("mod_muc_room.hrl").
+ 
+diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl
+index 8aa6071c..71d79b02 100644
+--- a/src/mod_muc_sql.erl
++++ b/src/mod_muc_sql.erl
+@@ -41,7 +41,7 @@
+ -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
+ 	 get_affiliations/3, search_affiliation/4]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_muc.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl
+index 7b772521..7c1cab3b 100644
+--- a/src/mod_multicast.erl
++++ b/src/mod_multicast.erl
+@@ -45,7 +45,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state,
+ 	{lserver, lservice, access, service_limits}).
+diff --git a/src/mod_offline.erl b/src/mod_offline.erl
+index 5b95fe4b..8146ffdc 100644
+--- a/src/mod_offline.erl
++++ b/src/mod_offline.erl
+@@ -70,7 +70,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl
+index a725ab00..126fd1bb 100644
+--- a/src/mod_offline_mnesia.erl
++++ b/src/mod_offline_mnesia.erl
+@@ -32,7 +32,7 @@
+ 	 remove_all_messages/2, count_messages/2, import/1]).
+ -export([need_transform/1, transform/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_offline.hrl").
+ -include("logger.hrl").
+ 
+diff --git a/src/mod_offline_riak.erl b/src/mod_offline_riak.erl
+index 5d0fd1af..607a78ba 100644
+--- a/src/mod_offline_riak.erl
++++ b/src/mod_offline_riak.erl
+@@ -31,7 +31,7 @@
+ 	 read_message/3, remove_message/3, read_all_messages/2,
+ 	 remove_all_messages/2, count_messages/2, import/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_offline.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl
+index 53a0d345..50fa83bc 100644
+--- a/src/mod_offline_sql.erl
++++ b/src/mod_offline_sql.erl
+@@ -33,7 +33,7 @@
+ 	 read_message/3, remove_message/3, read_all_messages/2,
+ 	 remove_all_messages/2, count_messages/2, import/1, export/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_offline.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+diff --git a/src/mod_ping.erl b/src/mod_ping.erl
+index 02357181..7d51f4dc 100644
+--- a/src/mod_ping.erl
++++ b/src/mod_ping.erl
+@@ -36,7 +36,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(DEFAULT_SEND_PINGS, false).
+ 
+diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl
+index 875aeef3..ffa95576 100644
+--- a/src/mod_pres_counter.erl
++++ b/src/mod_pres_counter.erl
+@@ -33,7 +33,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(pres_counter,
+ 	{dir, start, count, logged = false}).
+diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl
+index 64ae9620..034a56e4 100644
+--- a/src/mod_privacy.erl
++++ b/src/mod_privacy.erl
+@@ -42,7 +42,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ 
+ -define(PRIVACY_CACHE, privacy_cache).
+diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl
+index 7449262b..201b92ec 100644
+--- a/src/mod_privacy_mnesia.erl
++++ b/src/mod_privacy_mnesia.erl
+@@ -32,7 +32,7 @@
+ 	 remove_list/3, use_cache/1, import/1]).
+ -export([need_transform/1, transform/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("logger.hrl").
+ 
+diff --git a/src/mod_privacy_riak.erl b/src/mod_privacy_riak.erl
+index 0cd39c11..88f294f8 100644
+--- a/src/mod_privacy_riak.erl
++++ b/src/mod_privacy_riak.erl
+@@ -33,7 +33,7 @@
+ 
+ -export([privacy_schema/0]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl
+index 7939cbb2..6141feda 100644
+--- a/src/mod_privacy_sql.erl
++++ b/src/mod_privacy_sql.erl
+@@ -35,7 +35,7 @@
+ 
+ -export([item_to_raw/1, raw_to_item/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+diff --git a/src/mod_private.erl b/src/mod_private.erl
+index cb167468..0b84d071 100644
+--- a/src/mod_private.erl
++++ b/src/mod_private.erl
+@@ -37,7 +37,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ 
+ -define(PRIVATE_CACHE, private_cache).
+diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl
+index 04c1a04a..6a9dee68 100644
+--- a/src/mod_private_mnesia.erl
++++ b/src/mod_private_mnesia.erl
+@@ -31,7 +31,7 @@
+ 	 use_cache/1, import/3]).
+ -export([need_transform/1, transform/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ -include("logger.hrl").
+ 
+diff --git a/src/mod_private_riak.erl b/src/mod_private_riak.erl
+index be175f07..f97c2dd8 100644
+--- a/src/mod_private_riak.erl
++++ b/src/mod_private_riak.erl
+@@ -30,7 +30,7 @@
+ -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
+ 	 import/3]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl
+index 5ed584c3..da4974ce 100644
+--- a/src/mod_private_sql.erl
++++ b/src/mod_private_sql.erl
+@@ -30,7 +30,7 @@
+ -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
+ 	 import/3, export/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("logger.hrl").
+diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl
+index dab7a619..695c8acf 100644
+--- a/src/mod_privilege.erl
++++ b/src/mod_privilege.erl
+@@ -41,7 +41,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state, {server_host = <<"">> :: binary(),
+ 		permissions = dict:new() :: ?TDICT}).
+diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl
+index fb34ba55..f42aa461 100644
+--- a/src/mod_proxy65_service.erl
++++ b/src/mod_proxy65_service.erl
+@@ -39,7 +39,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(PROCNAME, ejabberd_mod_proxy65_service).
+ 
+diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
+index d2e1f6c5..b7cd6644 100644
+--- a/src/mod_pubsub.erl
++++ b/src/mod_pubsub.erl
+@@ -41,7 +41,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("pubsub.hrl").
+ -include("mod_roster.hrl").
+ 
+diff --git a/src/mod_push.erl b/src/mod_push.erl
+index 1eaec6ad..ac4ed89e 100644
+--- a/src/mod_push.erl
++++ b/src/mod_push.erl
+@@ -52,7 +52,7 @@
+ -include("ejabberd.hrl").
+ -include("ejabberd_commands.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(PUSH_CACHE, push_cache).
+ 
+diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl
+index bcdc0c25..d979eaec 100644
+--- a/src/mod_push_keepalive.erl
++++ b/src/mod_push_keepalive.erl
+@@ -36,7 +36,7 @@
+ 	 c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]).
+ 
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(PUSH_BEFORE_TIMEOUT_SECS, 120).
+ 
+diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl
+index ff12150f..866b5630 100644
+--- a/src/mod_push_mnesia.erl
++++ b/src/mod_push_mnesia.erl
+@@ -35,7 +35,7 @@
+ 
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_push.hrl").
+ 
+ %%%-------------------------------------------------------------------
+diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl
+index c82d9fc0..79fedba4 100644
+--- a/src/mod_push_sql.erl
++++ b/src/mod_push_sql.erl
+@@ -32,7 +32,7 @@
+ 	 lookup_sessions/3, lookup_sessions/2, lookup_sessions/1,
+ 	 delete_session/3, delete_old_sessions/2, export/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("mod_push.hrl").
+diff --git a/src/mod_register.erl b/src/mod_register.erl
+index 77557ee0..8ad27fcf 100644
+--- a/src/mod_register.erl
++++ b/src/mod_register.erl
+@@ -41,7 +41,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, Opts) ->
+     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
+diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl
+index b7bc2edc..a7bb83f5 100644
+--- a/src/mod_register_web.erl
++++ b/src/mod_register_web.erl
+@@ -60,7 +60,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+diff --git a/src/mod_roster.erl b/src/mod_roster.erl
+index a86b50d9..57f5fdce 100644
+--- a/src/mod_roster.erl
++++ b/src/mod_roster.erl
+@@ -54,7 +54,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("mod_roster.hrl").
+ 
+diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl
+index b4c2ed9d..645ab37f 100644
+--- a/src/mod_s2s_dialback.erl
++++ b/src/mod_s2s_dialback.erl
+@@ -33,7 +33,7 @@
+ 	 s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl
+index 1c6e5fe8..c295aa45 100644
+--- a/src/mod_service_log.erl
++++ b/src/mod_service_log.erl
+@@ -35,7 +35,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, _Opts) ->
+     ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
+diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl
+index 5f95266b..db641dbb 100644
+--- a/src/mod_shared_roster.erl
++++ b/src/mod_shared_roster.erl
+@@ -44,7 +44,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("mod_roster.hrl").
+ 
+diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl
+index 66cbebd9..4b431fc4 100644
+--- a/src/mod_shared_roster_ldap.erl
++++ b/src/mod_shared_roster_ldap.erl
+@@ -46,7 +46,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_roster.hrl").
+ -include("eldap.hrl").
+ 
+diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl
+index adfbac68..bdd87030 100644
+--- a/src/mod_shared_roster_mnesia.erl
++++ b/src/mod_shared_roster_mnesia.erl
+@@ -37,7 +37,7 @@
+ -include("mod_roster.hrl").
+ -include("mod_shared_roster.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%===================================================================
+ %%% API
+diff --git a/src/mod_shared_roster_riak.erl b/src/mod_shared_roster_riak.erl
+index 441aafd0..d5545eb1 100644
+--- a/src/mod_shared_roster_riak.erl
++++ b/src/mod_shared_roster_riak.erl
+@@ -35,7 +35,7 @@
+ 
+ -include("mod_roster.hrl").
+ -include("mod_shared_roster.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%===================================================================
+ %%% API
+diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl
+index 488e0ec7..f952347a 100644
+--- a/src/mod_shared_roster_sql.erl
++++ b/src/mod_shared_roster_sql.erl
+@@ -36,7 +36,7 @@
+ 	 add_user_to_group/3, remove_user_from_group/3, import/3,
+ 	 export/1]).
+ 
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_roster.hrl").
+ -include("mod_shared_roster.hrl").
+ -include("ejabberd_sql_pt.hrl").
+diff --git a/src/mod_sic.erl b/src/mod_sic.erl
+index a2b3256e..da61b2c2 100644
+--- a/src/mod_sic.erl
++++ b/src/mod_sic.erl
+@@ -36,7 +36,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, Opts) ->
+     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
+diff --git a/src/mod_sip.erl b/src/mod_sip.erl
+index 01327c77..70159d17 100644
+--- a/src/mod_sip.erl
++++ b/src/mod_sip.erl
+@@ -52,7 +52,7 @@ mod_opt_type(_) ->
+ 	 locate/1, mod_opt_type/1, depends/2]).
+ 
+ -include("ejabberd.hrl").
+--include_lib("esip/include/esip.hrl").
++-include_lib("s1_sip/include/esip.hrl").
+ 
+ %%%===================================================================
+ %%% API
+diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl
+index d600da3d..c3dfe874 100644
+--- a/src/mod_sip_proxy.erl
++++ b/src/mod_sip_proxy.erl
+@@ -40,7 +40,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include_lib("esip/include/esip.hrl").
++-include_lib("s1_sip/include/esip.hrl").
+ 
+ -define(SIGN_LIFETIME, 300). %% in seconds.
+ 
+diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl
+index a47de697..f89d3cab 100644
+--- a/src/mod_sip_registrar.erl
++++ b/src/mod_sip_registrar.erl
+@@ -42,7 +42,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include_lib("esip/include/esip.hrl").
++-include_lib("s1_sip/include/esip.hrl").
+ 
+ -define(CALL_TIMEOUT, timer:seconds(30)).
+ -define(DEFAULT_EXPIRES, 3600).
+diff --git a/src/mod_stats.erl b/src/mod_stats.erl
+index 2bdbdbd3..2969fbd2 100644
+--- a/src/mod_stats.erl
++++ b/src/mod_stats.erl
+@@ -35,7 +35,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, Opts) ->
+     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
+diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl
+index 658bd504..46b00993 100644
+--- a/src/mod_stream_mgmt.erl
++++ b/src/mod_stream_mgmt.erl
+@@ -37,7 +37,7 @@
+ -export([get_resume_timeout/1, set_resume_timeout/2]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("p1_queue.hrl").
+ 
+diff --git a/src/mod_time.erl b/src/mod_time.erl
+index c54f3d27..20321d36 100644
+--- a/src/mod_time.erl
++++ b/src/mod_time.erl
+@@ -38,7 +38,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, Opts) ->
+     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
+diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
+index 378b9430..10618c96 100644
+--- a/src/mod_vcard.erl
++++ b/src/mod_vcard.erl
+@@ -44,7 +44,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ 
+ -define(JUD_MATCHES, 30).
+diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
+index 88621fc0..e2c741c5 100644
+--- a/src/mod_vcard_ldap.erl
++++ b/src/mod_vcard_ldap.erl
+@@ -41,7 +41,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ -include("eldap.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(PROCNAME, ejabberd_mod_vcard_ldap).
+diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl
+index 3e742ec1..6e9e0e50 100644
+--- a/src/mod_vcard_mnesia.erl
++++ b/src/mod_vcard_mnesia.erl
+@@ -33,7 +33,7 @@
+ -export([need_transform/1, transform/1]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+diff --git a/src/mod_vcard_riak.erl b/src/mod_vcard_riak.erl
+index e5ad1b3d..5427ec7f 100644
+--- a/src/mod_vcard_riak.erl
++++ b/src/mod_vcard_riak.erl
+@@ -31,7 +31,7 @@
+ 	 search_fields/1, search_reported/1, import/3, stop/1]).
+ -export([is_search_supported/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ 
+ %%%===================================================================
+diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl
+index 07d90b69..1dc5d40f 100644
+--- a/src/mod_vcard_sql.erl
++++ b/src/mod_vcard_sql.erl
+@@ -33,7 +33,7 @@
+ 	 search_fields/1, search_reported/1, import/3, export/1]).
+ -export([is_search_supported/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl
+index 7643fed4..19148654 100644
+--- a/src/mod_vcard_xupdate.erl
++++ b/src/mod_vcard_xupdate.erl
+@@ -35,7 +35,7 @@
+ 
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache).
+ 
+diff --git a/src/mod_version.erl b/src/mod_version.erl
+index 5f613e02..23ac02cd 100644
+--- a/src/mod_version.erl
++++ b/src/mod_version.erl
+@@ -37,7 +37,7 @@
+ -include("ejabberd.hrl").
+ -include("logger.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, Opts) ->
+     IQDisc = gen_mod:get_opt(iqdisc, Opts, gen_iq_handler:iqdisc(Host)),
+diff --git a/src/node_dag.erl b/src/node_dag.erl
+index 9829c27c..5f399357 100644
+--- a/src/node_dag.erl
++++ b/src/node_dag.erl
+@@ -28,7 +28,7 @@
+ -author('bjc@kublai.com').
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([init/3, terminate/2, options/0, features/0,
+     create_node_permission/6, create_node/2, delete_node/1,
+diff --git a/src/node_dispatch.erl b/src/node_dispatch.erl
+index 92a655b8..00eb55d9 100644
+--- a/src/node_dispatch.erl
++++ b/src/node_dispatch.erl
+@@ -34,7 +34,7 @@
+ -author('christophe.romain@process-one.net').
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([init/3, terminate/2, options/0, features/0,
+     create_node_permission/6, create_node/2, delete_node/1,
+diff --git a/src/node_flat.erl b/src/node_flat.erl
+index bc529e14..571b1b16 100644
+--- a/src/node_flat.erl
++++ b/src/node_flat.erl
+@@ -34,7 +34,7 @@
+ -author('christophe.romain@process-one.net').
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([init/3, terminate/2, options/0, features/0,
+     create_node_permission/6, create_node/2, delete_node/1,
+diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl
+index afbc050a..ae279c4c 100644
+--- a/src/node_flat_sql.erl
++++ b/src/node_flat_sql.erl
+@@ -36,7 +36,7 @@
+ -compile([{parse_transform, ejabberd_sql_pt}]).
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ 
+ -export([init/3, terminate/2, options/0, features/0,
+diff --git a/src/node_online.erl b/src/node_online.erl
+index 39b08d99..ce71fdb0 100644
+--- a/src/node_online.erl
++++ b/src/node_online.erl
+@@ -28,7 +28,7 @@
+ -author('christophe.romain@process-one.net').
+ 
+ -include("pubsub.hrl").
+--include("jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ -export([init/3, terminate/2, options/0, features/0,
+     create_node_permission/6, create_node/2, delete_node/1,
+diff --git a/src/nodetree_dag.erl b/src/nodetree_dag.erl
+index a44e7155..0c5609c4 100644
+--- a/src/nodetree_dag.erl
++++ b/src/nodetree_dag.erl
+@@ -30,7 +30,7 @@
+ -include_lib("stdlib/include/qlc.hrl").
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([init/3, terminate/2, options/0, set_node/1,
+     get_node/3, get_node/2, get_node/1, get_nodes/2,
+diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl
+index 31724036..0fe1f5e0 100644
+--- a/src/nodetree_tree.erl
++++ b/src/nodetree_tree.erl
+@@ -40,7 +40,7 @@
+ -include_lib("stdlib/include/qlc.hrl").
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([init/3, terminate/2, options/0, set_node/1,
+     get_node/3, get_node/2, get_node/1, get_nodes/2,
+diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl
+index b310dd2d..19ff1786 100644
+--- a/src/nodetree_tree_sql.erl
++++ b/src/nodetree_tree_sql.erl
+@@ -40,7 +40,7 @@
+ -compile([{parse_transform, ejabberd_sql_pt}]).
+ 
+ -include("pubsub.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ 
+ -export([init/3, terminate/2, options/0, set_node/1,
+diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
+index 2c7dabb4..b6ba864c 100644
+--- a/src/prosody2ejabberd.erl
++++ b/src/prosody2ejabberd.erl
+@@ -28,7 +28,7 @@
+ -export([from_dir/1]).
+ 
+ -include("ejabberd.hrl").
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_roster.hrl").
+ -include("mod_offline.hrl").
+diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl
+index 746e39e3..59ee734b 100644
+--- a/src/pubsub_subscription.erl
++++ b/src/pubsub_subscription.erl
+@@ -39,7 +39,7 @@
+ 
+ -include("pubsub.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
+ -define(PUBSUB_DIGEST, <<"pubsub#digest">>).
+diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl
+index 3315748c..5700c100 100644
+--- a/src/pubsub_subscription_sql.erl
++++ b/src/pubsub_subscription_sql.erl
+@@ -35,7 +35,7 @@
+ 
+ -include("pubsub.hrl").
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
+ -define(PUBSUB_DIGEST, <<"pubsub#digest">>).
+diff --git a/src/xmpp_stream_in.erl b/src/xmpp_stream_in.erl
+index 329ebad6..4ce8760c 100644
+--- a/src/xmpp_stream_in.erl
++++ b/src/xmpp_stream_in.erl
+@@ -42,7 +42,7 @@
+ -define(FSMOPTS, []).
+ -endif.
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -type state() :: map().
+ -type stop_reason() :: {stream, reset | {in | out, stream_error()}} |
+ 		       {tls, inet:posix() | atom() | binary()} |
+diff --git a/src/xmpp_stream_out.erl b/src/xmpp_stream_out.erl
+index 7ddc183b..8095bd86 100644
+--- a/src/xmpp_stream_out.erl
++++ b/src/xmpp_stream_out.erl
+@@ -44,7 +44,7 @@
+ 
+ -define(TCP_SEND_TIMEOUT, 15000).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("kernel/include/inet.hrl").
+ 
+ -type state() :: map().
+diff --git a/src/xmpp_stream_pkix.erl b/src/xmpp_stream_pkix.erl
+index 8361999f..a6fe728c 100644
+--- a/src/xmpp_stream_pkix.erl
++++ b/src/xmpp_stream_pkix.erl
+@@ -24,7 +24,7 @@
+ %% API
+ -export([authenticate/1, authenticate/2, get_cert_domains/1, format_error/1]).
+ 
+--include("xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("public_key/include/public_key.hrl").
+ -include("XmppAddr.hrl").
+ 
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch b/bsp/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
index 4b68f5ff..09b35621 100644
--- a/bsp/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
+++ b/bsp/buildroot/package/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch
@@ -5,6 +5,8 @@ Subject: [PATCH] disable ERLANG_DEPRECATED_CHECK
 
 Without this patch, the configure will try to execute erlang to check
 if it uses deprecated types. Assume the answer is false.
+
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/buildroot/package/ejabberd/0006-fix-install-permissions.patch b/bsp/buildroot/package/ejabberd/0006-fix-install-permissions.patch
index 4d770449..9a0073f5 100644
--- a/bsp/buildroot/package/ejabberd/0006-fix-install-permissions.patch
+++ b/bsp/buildroot/package/ejabberd/0006-fix-install-permissions.patch
@@ -8,15 +8,12 @@ files with incompatible permissions for ejabberd, which run as an
 ejabberd user.
 
 Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
----
- Makefile.in | 38 +++++---------------------------------
- 1 file changed, 5 insertions(+), 33 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 2a6457c..0be4c50 100644
+index a0b4553d..2cae2db4 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -155,10 +155,8 @@ copy-files-sub: copy-files-sub2
+@@ -169,10 +169,8 @@ copy-files-sub: copy-files-sub2
  install: all copy-files
  	#
  	# Configuration files
@@ -26,12 +23,12 @@ index 2a6457c..0be4c50 100644
 -		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
 +	$(INSTALL) -d $(ETCDIR)
 +	$(INSTALL) -b -m 644 ejabberd.yml.example $(ETCDIR)/ejabberd.yml
- 	$(SED) -e "s*{{rootdir}}*@prefix@*" \
- 		-e "s*{{installuser}}*@INSTALLUSER@*" \
- 		-e "s*{{bindir}}*@bindir@*" \
-@@ -168,14 +166,11 @@ install: all copy-files
- 		-e "s*{{docdir}}*@docdir@*" \
- 		-e "s*{{erl}}*@ERL@*" ejabberdctl.template \
+ 	$(SED) -e "s*{{rootdir}}*@prefix@*g" \
+ 		-e "s*{{installuser}}*@INSTALLUSER@*g" \
+ 		-e "s*{{bindir}}*@bindir@*g" \
+@@ -183,53 +181,16 @@ install: all copy-files
+ 		-e "s*{{erl}}*@ERL@*g" \
+ 		-e "s*{{epmd}}*@EPMD@*g" ejabberdctl.template \
  		> ejabberdctl.example
 -	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
 -		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
@@ -47,10 +44,19 @@ index 2a6457c..0be4c50 100644
  	# Elixir binaries
  	[ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR)
  	[ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true
-@@ -187,29 +182,6 @@ install: all copy-files
- 		-e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \
- 		> ejabberd.init
- 	chmod 755 ejabberd.init
+ 	[ -f deps/elixir/bin/elixir ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/elixir $(BINDIR)/elixir || true
+ 	[ -f deps/elixir/bin/mix ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/mix $(BINDIR)/mix || true
+-	#
+-	# Init script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
+-		-e "s*@installuser@*$(INIT_USER)*g" ejabberd.init.template \
+-		> ejabberd.init
+-	chmod 755 ejabberd.init
+-	#
+-	# Service script
+-	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
+-		> ejabberd.service
+-	chmod 644 ejabberd.service
 -	#
 -	# Spool directory
 -	$(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR)
@@ -74,9 +80,5 @@ index 2a6457c..0be4c50 100644
 -		&& $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \
 -		|| echo "Documentation not included in sources"
 -	$(INSTALL) -m 644 COPYING $(DOCDIR)
- 
- uninstall: uninstall-binary
- 
--- 
-2.5.0
 
+ uninstall: uninstall-binary
diff --git a/bsp/buildroot/package/ejabberd/0007-fix-ejabberdctl.patch b/bsp/buildroot/package/ejabberd/0007-fix-ejabberdctl.patch
index 36aa3a70..090fcc52 100644
--- a/bsp/buildroot/package/ejabberd/0007-fix-ejabberdctl.patch
+++ b/bsp/buildroot/package/ejabberd/0007-fix-ejabberdctl.patch
@@ -1,9 +1,9 @@
-From 53d7d654026afa163a55b860e33c6901129e8dc1 Mon Sep 17 00:00:00 2001
+From 168d5840dc2a541ec16385e666c1932cf02907e9 Mon Sep 17 00:00:00 2001
 From: Johan Oudinet <johan.oudinet@gmail.com>
-Date: Wed, 20 Jan 2016 09:35:07 -0500
+Date: Wed, 10 Jan 2018 15:00:07 +0100
 Subject: [PATCH] fix ejabberdctl
 
-Change default values so ejabberdctl run commands as ejabberd user
+Change default values so ejabberdctl run commands as ejabberd user.
 Also add a way for the user to change default values.
 
 Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
@@ -12,23 +12,21 @@ Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/ejabberdctl.template b/ejabberdctl.template
-index f65c21f..ff9225f 100755
+index 83637766..5a8a8795 100755
 --- a/ejabberdctl.template
 +++ b/ejabberdctl.template
-@@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd`
- ERL={{erl}}
- IEX={{bindir}}/iex
- EPMD={{bindir}}/epmd
--INSTALLUSER={{installuser}}
+@@ -15,7 +15,10 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd)
+ ERL="{{erl}}"
+ IEX="{{bindir}}/iex"
+ EPMD="{{epmd}}"
+-INSTALLUSER="{{installuser}}"
 +INSTALLUSER=ejabberd
- ERL_LIBS={{libdir}}
- 
++
 +# Read default configuration file if present
 +[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd
-+
- # check the proper system user is used if defined
- if [ "$INSTALLUSER" != "" ] ; then
-     EXEC_CMD="false"
+ 
+ # check the proper system user is used
+ case $(id -un) in
 -- 
-2.5.0
+2.14.1
 
diff --git a/bsp/buildroot/package/ejabberd/0008-handle-error-case-from-lib_dir.patch b/bsp/buildroot/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
new file mode 100644
index 00000000..f7931b4e
--- /dev/null
+++ b/bsp/buildroot/package/ejabberd/0008-handle-error-case-from-lib_dir.patch
@@ -0,0 +1,32 @@
+From d0bfcbbfd8a6e7ee6213112e4078b020e4e1d15d Mon Sep 17 00:00:00 2001
+From: Paweł Chmielowski <pchmielowski@process-one.net>
+Date: Wed, 10 Jan 2018 16:34:01 +0100
+Subject: [PATCH] Handle error case from code:lib_dir in ResolveDepPath in
+ rebar.config.script
+
+This patch have already been applied in upstream/master.
+
+Signed-off-by: Paweł Chmielowski <pchmielowski@process-one.net>
+
+---
+ rebar.config.script | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 85f918fffd..ba374e5c5f 100644
+--- a/rebar.config.script
++++ b/rebar.config.script
+@@ -233,9 +233,10 @@ ResolveDepPath = case {SystemDeps, IsRebar3} of
+ 		     {true, _} ->
+ 			 fun("deps/" ++ Rest) ->
+ 				 Slash = string:str(Rest, "/"),
+-				 code:lib_dir(
+-				   string:sub_string(Rest, 1, Slash -1)) ++
+-				     string:sub_string(Rest, Slash);
++				 case code:lib_dir(string:sub_string(Rest, 1, Slash -1)) of
++				     {error, _} -> Rest;
++				     V -> V ++ string:sub_string(Rest, Slash)
++				 end;
+ 			    (Path) ->
+ 				 Path
+ 			 end;
diff --git a/bsp/buildroot/package/ejabberd/0009-disable-mod_avatar.patch b/bsp/buildroot/package/ejabberd/0009-disable-mod_avatar.patch
new file mode 100644
index 00000000..ab89ba1a
--- /dev/null
+++ b/bsp/buildroot/package/ejabberd/0009-disable-mod_avatar.patch
@@ -0,0 +1,32 @@
+From e6eac74e82975e7d87b1f59c50eb007ab04c1392 Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <johan.oudinet@gmail.com>
+Date: Tue, 16 Jan 2018 14:29:56 +0100
+Subject: [PATCH] disable mod_avatar
+
+This module requires to compile with graphics enabled.
+
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
+---
+ ejabberd.yml.example | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ejabberd.yml.example b/ejabberd.yml.example
+index e178e956..7c12b76c 100644
+--- a/ejabberd.yml.example
++++ b/ejabberd.yml.example
+@@ -796,9 +796,9 @@ modules:
+     search: false
+   mod_vcard_xupdate: {}
+   ## Convert all avatars posted by Android clients from WebP to JPEG
+-  mod_avatar:
+-    convert:
+-      webp: jpeg
++  ## mod_avatar:
++  ##   convert:
++  ##     webp: jpeg
+   mod_version: {}
+   mod_stream_mgmt: {}
+   ##   Non-SASL Authentication (XEP-0078) is now disabled by default
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/ejabberd/Config.in b/bsp/buildroot/package/ejabberd/Config.in
index 5d176c3a..a7542cd1 100644
--- a/bsp/buildroot/package/ejabberd/Config.in
+++ b/bsp/buildroot/package/ejabberd/Config.in
@@ -1,13 +1,19 @@
 config BR2_PACKAGE_EJABBERD
 	bool "ejabberd"
 	depends on BR2_PACKAGE_ERLANG
-	depends on BR2_INSTALL_LIBSTDCPP # stringprep
+	depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
+	select BR2_PACKAGE_ERLANG_JIFFY
 	select BR2_PACKAGE_ERLANG_LAGER
 	select BR2_PACKAGE_ERLANG_P1_CACHE_TAB
 	select BR2_PACKAGE_ERLANG_P1_ICONV
+	select BR2_PACKAGE_ERLANG_P1_OAUTH2
 	select BR2_PACKAGE_ERLANG_P1_SIP
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
+	select BR2_PACKAGE_ERLANG_P1_STUN
+	select BR2_PACKAGE_ERLANG_P1_TLS
+	select BR2_PACKAGE_ERLANG_P1_UTILS
 	select BR2_PACKAGE_ERLANG_P1_XML
+	select BR2_PACKAGE_ERLANG_P1_XMPP
 	select BR2_PACKAGE_ERLANG_P1_YAML
 	select BR2_PACKAGE_ERLANG_P1_ZLIB
 	select BR2_PACKAGE_GETENT
diff --git a/bsp/buildroot/package/ejabberd/ejabberd.hash b/bsp/buildroot/package/ejabberd/ejabberd.hash
index 4284eec8..6fb90a23 100644
--- a/bsp/buildroot/package/ejabberd/ejabberd.hash
+++ b/bsp/buildroot/package/ejabberd/ejabberd.hash
@@ -1,4 +1,2 @@
-# From https://www.process-one.net/downloads/ejabberd/16.01/ejabberd-16.01.tgz.md5
-md5 5e525c25c8f04287217b8a9522d7c942 ejabberd-16.01.tgz
 # Locally computed
-sha256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 ejabberd-16.01.tgz
+sha256 bd16b33a2f1345e5847fd05b70a5fa992181bac756cd6d5d621de9c18cb76801 ejabberd-17.11.tgz
diff --git a/bsp/buildroot/package/ejabberd/ejabberd.mk b/bsp/buildroot/package/ejabberd/ejabberd.mk
index 1140eb17..0f7af9b8 100644
--- a/bsp/buildroot/package/ejabberd/ejabberd.mk
+++ b/bsp/buildroot/package/ejabberd/ejabberd.mk
@@ -4,14 +4,16 @@
 #
 ################################################################################
 
-EJABBERD_VERSION = 16.01
+EJABBERD_VERSION = 17.11
 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
 EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION)
-EJABBERD_LICENSE = GPLv2+ with OpenSSL exception
+EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
 EJABBERD_LICENSE_FILES = COPYING
 EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \
 	erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \
-	erlang-p1-stringprep erlang-p1-xml erlang-p1-yaml erlang-p1-zlib
+	erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \
+	erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
+	erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp
 
 # 0001-remove-make-targets-for-deps.patch updates Makefile.in
 EJABBERD_USE_AUTOCONF = YES
@@ -21,22 +23,38 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 EJABBERD_DEPENDENCIES += linux-pam
 endif
 
-EJABBERD_ERLANG_LIBS = sasl crypto public_key ssl mnesia inets compiler
+# Install check-erlang-lib script to the directory in which the
+# package has been uncompressed, so it is available during the
+# configure step.
+define EJABBERD_INSTALL_CHECK_ERLANG_LIB
+	$(INSTALL) -m 0755 $(EJABBERD_PKGDIR)/check-erlang-lib \
+		$(@D)/check-erlang-lib
+endef
+
+EJABBERD_POST_EXTRACT_HOOKS += EJABBERD_INSTALL_CHECK_ERLANG_LIB
+
+EJABBERD_ERLANG_LIBS = sasl public_key mnesia inets compiler
 
 # Guess answers for these tests, configure will bail out otherwise
 # saying error: cannot run test program while cross compiling.
 EJABBERD_CONF_ENV = \
-	ac_cv_erlang_root_dir="$(HOST_DIR)/usr/lib/erlang" \
+	ac_cv_erlang_root_dir="$(HOST_DIR)/lib/erlang" \
 	$(foreach lib,$(EJABBERD_ERLANG_LIBS), \
-		ac_cv_erlang_lib_dir_$(lib)="`package/ejabberd/check-erlang-lib $(lib)`")
+		ac_cv_erlang_lib_dir_$(lib)="`./check-erlang-lib $(lib)`")
+
+EJABBERD_CONF_OPTS = \
+	--enable-system-deps \
+	--disable-erlang-version-check \
+	--disable-graphics
 
 define EJABBERD_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D)
 endef
 
-# Delete HOST_DIR prefix from ERL path in ejabberctl script.
+# Replace HOST_DIR prefix to /usr in environment variables of
+# ejabberctl script.
 define EJABBERD_FIX_EJABBERDCTL
-	$(SED) 's,ERL=$(HOST_DIR),ERL=,' '$(TARGET_DIR)/usr/sbin/ejabberdctl'
+	$(SED) 's,="$(HOST_DIR),="/usr,' '$(TARGET_DIR)/usr/sbin/ejabberdctl'
 endef
 
 EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_FIX_EJABBERDCTL
diff --git a/bsp/buildroot/package/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch b/bsp/buildroot/package/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch
deleted file mode 100644
index b9615ab3..00000000
--- a/bsp/buildroot/package/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From dedce8765d203c1c162a57e6259375e0b457173f Mon Sep 17 00:00:00 2001
-From: Greg Ungerer <gerg@linux-m68k.org>
-Date: Fri, 19 Aug 2016 23:49:51 +1000
-Subject: [PATCH] elf2flt: fix relocation support for R_ARM_TARGET types
-
-R_ARM_TARGET1 (and I think R_ARM_TARGET2) relocation types should be
-treated in the same way as R_ARM_ABS32. Fix them to write out the addend
-to the flat binary in network byte order.
-
-Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-Tested-by: Waldemar Brodkorb <wbx@openadk.org>
-
----
- elf2flt.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/elf2flt.c b/elf2flt.c
-index 5ae7dd9..3f31569 100644
---- a/elf2flt.c
-+++ b/elf2flt.c
-@@ -1505,7 +1505,9 @@ DIS29_RELOCATION:
- 					(((*p)->howto->type != R_ARM_PC24) &&
- 					((*p)->howto->type != R_ARM_PLT32)))
- 					tmp.c[i3] = (hl >> 24) & 0xff;
--				if ((*p)->howto->type == R_ARM_ABS32)
-+				if (((*p)->howto->type == R_ARM_ABS32) ||
-+				    ((*p)->howto->type == R_ARM_TARGET1) ||
-+				    ((*p)->howto->type == R_ARM_TARGET2))
- 					*(uint32_t *)r_mem = htonl(hl);
- 				else
- 					*(uint32_t *)r_mem = tmp.l;
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch b/bsp/buildroot/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch
new file mode 100644
index 00000000..a27c4913
--- /dev/null
+++ b/bsp/buildroot/package/elf2flt/0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch
@@ -0,0 +1,79 @@
+From b31e9b1bff6832063816b972395179859d1d4619 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 13 Aug 2017 16:03:20 +0200
+Subject: [PATCH] ld-elf2flt: behave properly when called with a name different
+ from TARGET_ALIAS
+
+ld-elf2flt currently handles two cases:
+
+ 1 It is called as the wrapper for <TARGET_ALIAS>-ld, generally
+   installed in the bin/ directory of a toolchain.
+
+ 2 It is called as the wrapper for "ld", generally installed in the
+   TARGET_ALIAS/bin/ directory of a toolchain.
+
+Unfortunately, if for some reason it gets called using a FOOBAR-ld
+name that is different from <TARGET_ALIAS>-ld, it assumes it is in
+case (2), while it really is in case (1). Due to this, the path
+mangling logic doesn't work, and it doesn't find ld.real.
+
+This happens for example when the binary program in bin/ is named
+arm-buildroot-uclinux-uclibcgnueabi-ld, but also has a simpler symlink
+named arm-linux-ld. In this case,
+arm-buildroot-uclinux-uclibcgnueabi-ld is recognized by ld-elf2flt as
+containing TARGET_ALIAS, and therefore the proper logic to find
+ld.real is applied. However, when arm-linux-ld is used, ld-elf2flt
+doesn't find TARGET_ALIAS, and therefore assumes we're being called as
+TARGET_ALIAS/bin/ld.. and searches for a program called ld.real in
+bin/, which doesn't exist.
+
+See:
+
+$ ./output/host/bin/arm-buildroot-uclinux-uclibcgnueabi-ld
+/home/thomas/buildroot/buildroot/output/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: no input files
+
+$ ./output/host/bin/arm-linux-ld
+arm-linux-ld (ld-elf2flt): error trying to exec '/home/thomas/buildroot/buildroot/output/host/bin/ld.real': execvp: No such file or directory
+
+$ ./output/host/arm-buildroot-uclinux-uclibcgnueabi/bin/ld
+/home/thomas/buildroot/buildroot/output/host/arm-buildroot-uclinux-uclibcgnueabi/bin/ld.real: no input files
+
+This commit fixes that by inverting the logic: if we're being called
+as just "ld", then we assume it's the program in
+TARGET_ALIAS/bin/. Otherwise, we're called through some variant of
+TARGET-ld.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Submitted-upstream: https://github.com/uclinux-dev/elf2flt/pull/8
+---
+ ld-elf2flt.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/ld-elf2flt.c b/ld-elf2flt.c
+index de39fe0..c187c2e 100644
+--- a/ld-elf2flt.c
++++ b/ld-elf2flt.c
+@@ -506,15 +506,15 @@ int main(int argc, char *argv[])
+ 	   the host while those in <TARGET_ALIAS>/lib are for the target.
+ 	   Make bindir point to the bin dir for bin/<TARGET_ALIAS>-foo.
+ 	   Make tooldir point to the bin dir for <TARGET_ALIAS>/bin/foo.  */
+-	if (streqn(elf2flt_progname, TARGET_ALIAS)) {
+-		tmp = concat(argv0_dir, "../" TARGET_ALIAS "/bin", NULL);
++	if (streqn(elf2flt_progname, "ld")) {
++		tmp = concat(argv0_dir, "../../bin", NULL);
+ 		if (stat(tmp, &buf) == 0 && S_ISDIR(buf.st_mode)) {
+-			tooldir = concat(tmp, "/", NULL);
++			bindir = concat(tmp, "/", NULL);
+ 		}
+ 	} else {
+-		tmp = concat(argv0_dir, "../../bin", NULL);
++		tmp = concat(argv0_dir, "../" TARGET_ALIAS "/bin", NULL);
+ 		if (stat(tmp, &buf) == 0 && S_ISDIR(buf.st_mode)) {
+-			bindir = concat(tmp, "/", NULL);
++			tooldir = concat(tmp, "/", NULL);
+ 		}
+ 	}
+ 
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/elf2flt/elf2flt.hash b/bsp/buildroot/package/elf2flt/elf2flt.hash
index 9c18ba5d..40df62c8 100644
--- a/bsp/buildroot/package/elf2flt/elf2flt.hash
+++ b/bsp/buildroot/package/elf2flt/elf2flt.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 6a45a787a08da64f0f3036d3ae1865bc13f8f40d13f07511a2bf1b736acc4808 elf2flt-9dbc458c6122c495bbdec8dc975a15c9d39e5ff2.tar.gz
+sha256 7713bd1debd24a94b795b7fc698dc97e306e7cbcc1d0580856c79fe70aac9c45  elf2flt-6d80ab6c93409e796f85da404bde84b841231531.tar.gz
diff --git a/bsp/buildroot/package/elf2flt/elf2flt.mk b/bsp/buildroot/package/elf2flt/elf2flt.mk
index bd15ea2a..557f94d3 100644
--- a/bsp/buildroot/package/elf2flt/elf2flt.mk
+++ b/bsp/buildroot/package/elf2flt/elf2flt.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-ELF2FLT_VERSION = 9dbc458c6122c495bbdec8dc975a15c9d39e5ff2
+ELF2FLT_VERSION = 6d80ab6c93409e796f85da404bde84b841231531
 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION))
-ELF2FLT_LICENSE = GPLv2+
+ELF2FLT_LICENSE = GPL-2.0+
 ELF2FLT_LICENSE_FILES = LICENSE.TXT
 
 HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
@@ -29,4 +29,20 @@ endif
 
 HOST_ELF2FLT_CONF_ENV = LIBS="$(HOST_ELF2FLT_LIBS)"
 
+# Hardlinks between binaries in different directories cause a problem
+# with rpath fixup, so we de-hardlink those binaries, and replace them
+# with copies instead. Note that elf2flt will rename ld to ld.real
+# before installing its own ld, but we already took care of the
+# original ld from binutils so that it is already de-hardlinked. So
+# ld is now the one from elf2flt, and we want to de-hardlinke it.
+ELF2FLT_TOOLS = elf2flt flthdr ld
+define HOST_ELF2FLT_FIXUP_HARDLINKS
+	$(foreach tool,$(ELF2FLT_TOOLS),\
+		rm -f $(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool) && \
+		cp -a $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-$(tool) \
+			$(HOST_DIR)/$(GNU_TARGET_NAME)/bin/$(tool)
+	)
+endef
+HOST_ELF2FLT_POST_INSTALL_HOOKS += HOST_ELF2FLT_FIXUP_HARDLINKS
+
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/elftosb/elftosb.mk b/bsp/buildroot/package/elftosb/elftosb.mk
index ac9aa325..44eb98c8 100644
--- a/bsp/buildroot/package/elftosb/elftosb.mk
+++ b/bsp/buildroot/package/elftosb/elftosb.mk
@@ -6,7 +6,7 @@
 
 ELFTOSB_VERSION = 10.12.01
 ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION)
-ELFTOSB_LICENSE = BSD-3c
+ELFTOSB_LICENSE = BSD-3-Clause
 ELFTOSB_LICENSE_FILES = COPYING
 
 define HOST_ELFTOSB_BUILD_CMDS
@@ -14,9 +14,9 @@ define HOST_ELFTOSB_BUILD_CMDS
 endef
 
 define HOST_ELFTOSB_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/bld/linux/elftosb $(HOST_DIR)/usr/bin/elftosb
-	$(INSTALL) -D -m 0755 $(@D)/bld/linux/keygen $(HOST_DIR)/usr/bin/keygen
-	$(INSTALL) -D -m 0755 $(@D)/bld/linux/sbtool $(HOST_DIR)/usr/bin/sbtool
+	$(INSTALL) -D -m 0755 $(@D)/bld/linux/elftosb $(HOST_DIR)/bin/elftosb
+	$(INSTALL) -D -m 0755 $(@D)/bld/linux/keygen $(HOST_DIR)/bin/keygen
+	$(INSTALL) -D -m 0755 $(@D)/bld/linux/sbtool $(HOST_DIR)/bin/sbtool
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/elfutils/Config.in b/bsp/buildroot/package/elfutils/Config.in
index 7db84724..ad86c313 100644
--- a/bsp/buildroot/package/elfutils/Config.in
+++ b/bsp/buildroot/package/elfutils/Config.in
@@ -5,9 +5,6 @@ comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library"
 
 config BR2_PACKAGE_ELFUTILS
 	bool "elfutils"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS
 	# Only glibc and uClibc implement the myriad of required GNUisms
@@ -15,6 +12,8 @@ config BR2_PACKAGE_ELFUTILS
 	# build issue caused by the _ prefix used on blackfin for
 	# assembly symbols
 	depends on !BR2_bfin
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC
 	help
 	  Libraries/utilities to handle ELF objects (drop in
 	  replacement for libelf).
diff --git a/bsp/buildroot/package/elfutils/elfutils.mk b/bsp/buildroot/package/elfutils/elfutils.mk
index ed5cf772..5570a3b3 100644
--- a/bsp/buildroot/package/elfutils/elfutils.mk
+++ b/bsp/buildroot/package/elfutils/elfutils.mk
@@ -8,9 +8,9 @@ ELFUTILS_VERSION = 0.169
 ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2
 ELFUTILS_SITE = https://sourceware.org/elfutils/ftp/$(ELFUTILS_VERSION)
 ELFUTILS_INSTALL_STAGING = YES
-ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library)
+ELFUTILS_LICENSE = GPL-2.0+ or LGPL-3.0+ (library)
 ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3
-ELFUTILS_DEPENDENCIES = zlib
+ELFUTILS_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
 HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz
 
 # We patch configure.ac
@@ -40,13 +40,8 @@ ELFUTILS_CONF_ENV += \
 	CFLAGS="$(ELFUTILS_CFLAGS)" \
 	CPPFLAGS="$(ELFUTILS_CPPFLAGS)"
 
-ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS)
-
-# Unconditionnally requires gettext.
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-ELFUTILS_DEPENDENCIES += gettext
-ELFUTILS_LDFLAGS += -lintl
-endif
+ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) \
+	$(TARGET_NLS_LIBS)
 
 ELFUTILS_CONF_ENV += \
 	LDFLAGS="$(ELFUTILS_LDFLAGS)"
@@ -72,7 +67,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y)
 ELFUTILS_CONF_OPTS += --enable-progs
-ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs)
+ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPL-3.0+ (programs)
 ELFUTILS_LICENSE_FILES += COPYING
 else
 ELFUTILS_CONF_OPTS += --disable-progs
diff --git a/bsp/buildroot/package/emlog/emlog.hash b/bsp/buildroot/package/emlog/emlog.hash
index e9469175..9d81d47e 100644
--- a/bsp/buildroot/package/emlog/emlog.hash
+++ b/bsp/buildroot/package/emlog/emlog.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 0d82f06301b8486c54e5e36f304d5a83c2347c23b93c1344eacb0b5b3044485a  emlog-576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1.tar.gz
+sha256 9f791a00c86215306597b761ef5c5ad267efee5f01efbe23cfcc04e583aa402d  emlog-emlog-0.60.tar.gz
diff --git a/bsp/buildroot/package/emlog/emlog.mk b/bsp/buildroot/package/emlog/emlog.mk
index bf0bcf77..e0926e6c 100644
--- a/bsp/buildroot/package/emlog/emlog.mk
+++ b/bsp/buildroot/package/emlog/emlog.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-EMLOG_VERSION = 576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1
+EMLOG_VERSION = emlog-0.60
 EMLOG_SITE = $(call github,nicupavel,emlog,$(EMLOG_VERSION))
-EMLOG_LICENSE = GPLv2
+EMLOG_LICENSE = GPL-2.0
 EMLOG_LICENSE_FILES = COPYING
 
 define EMLOG_BUILD_CMDS
diff --git a/bsp/buildroot/package/empty/0002-fix-non-thread-build.patch b/bsp/buildroot/package/empty/0002-fix-non-thread-build.patch
deleted file mode 100644
index a7e8d90a..00000000
--- a/bsp/buildroot/package/empty/0002-fix-non-thread-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-empty uses SysV semaphores, so the ifdef is wrong here.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
---- empty-0.6.19b.orig/empty.c	2012-09-19 13:24:05.000000000 +0200
-+++ empty-0.6.19b/empty.c	2015-07-09 02:00:09.000000000 +0200
-@@ -179,25 +179,23 @@ int main (int argc, char *argv[]) {
- 					   2 - unknown */
- 	
- /* semaphores */
--#ifdef _POSIX_SEMAPHORES
--	#if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
--		/* union semun is defined by including <sys/sem.h> */
--	#else
--		union semun {
--			int val;
--			struct semid_ds *buf;
--		#ifdef __SVR4
--			ushort_t	*array;
--		#endif
--		#ifdef __hpux__
--			ushort		*array;
--		#endif
--		#ifdef __linux__
--			unsigned short *array;
--			struct seminfo *__buf;		/* buffer for IPC_INFO */
--		#endif
--		};
--  	#endif
-+#if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
-+	/* union semun is defined by including <sys/sem.h> */
-+#else
-+	union semun {
-+		int val;
-+		struct semid_ds *buf;
-+	#ifdef __SVR4
-+		ushort_t	*array;
-+	#endif
-+	#ifdef __hpux__
-+		ushort		*array;
-+	#endif
-+	#ifdef __linux__
-+		unsigned short *array;
-+		struct seminfo *__buf;		/* buffer for IPC_INFO */
-+	#endif
-+	};
- #endif
- 	union semun semu;
- 	
diff --git a/bsp/buildroot/package/empty/Config.in b/bsp/buildroot/package/empty/Config.in
index 7fd0877c..f73bce89 100644
--- a/bsp/buildroot/package/empty/Config.in
+++ b/bsp/buildroot/package/empty/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_EMPTY
 	bool "empty"
 	depends on BR2_USE_MMU # uses fork()
 	help
-	  Run processes and applications under pseudo-terminal (PTY) sessions.
+	  Run processes and applications under pseudo-terminal (PTY)
+	  sessions.
 
 	  http://empty.sourceforge.net/
diff --git a/bsp/buildroot/package/empty/empty.hash b/bsp/buildroot/package/empty/empty.hash
index 91402889..e6293968 100644
--- a/bsp/buildroot/package/empty/empty.hash
+++ b/bsp/buildroot/package/empty/empty.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  05b7cb361ef815774abda325c09c573f8c9039ccbb71eedc743439e4637c314a  empty-0.6.19b.tgz
+sha256  7e6636e400856984c4405ce7bd0843aaa3329fa3efd20c58df8400a9eaa35f09  empty-0.6.20b.tgz
diff --git a/bsp/buildroot/package/empty/empty.mk b/bsp/buildroot/package/empty/empty.mk
index 3339ff6b..5e3ed42b 100644
--- a/bsp/buildroot/package/empty/empty.mk
+++ b/bsp/buildroot/package/empty/empty.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-EMPTY_VERSION = 0.6.19b
+EMPTY_VERSION = 0.6.20b
 EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz
 EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION)
-EMPTY_LICENSE = BSD-3c
+EMPTY_LICENSE = BSD-3-Clause
 EMPTY_LICENSE_FILES = COPYRIGHT
 
 define EMPTY_BUILD_CMDS
diff --git a/bsp/buildroot/package/enchant/enchant.mk b/bsp/buildroot/package/enchant/enchant.mk
index 4a232938..69402c1a 100644
--- a/bsp/buildroot/package/enchant/enchant.mk
+++ b/bsp/buildroot/package/enchant/enchant.mk
@@ -8,7 +8,7 @@ ENCHANT_VERSION = 1.6.0
 ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION)
 ENCHANT_INSTALL_STAGING = YES
 ENCHANT_DEPENDENCIES = libglib2 host-pkgconf
-ENCHANT_LICENSE = LGPLv2.1+
+ENCHANT_LICENSE = LGPL-2.1+
 ENCHANT_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/enlightenment/enlightenment.hash b/bsp/buildroot/package/enlightenment/enlightenment.hash
index 1548f200..10e8facf 100644
--- a/bsp/buildroot/package/enlightenment/enlightenment.hash
+++ b/bsp/buildroot/package/enlightenment/enlightenment.hash
@@ -1,2 +1,3 @@
-# From https://www.enlightenment.org/news/e-0.21.5-release
-sha256	f0745a660f70851c4ada9866b2a525185bfc5cd1685aa86e4cdb68f2c1c154bb 	enlightenment-0.21.5.tar.xz
+# From https://www.enlightenment.org/news/e0.22.1_release
+sha256	207b6b88dafc4932ab007a835510823c5a1dd8c191876ac037628176ca77a7e0	enlightenment-0.22.1.tar.xz
+sha256	34dbd501ec9d1c8dcc569c01db9cf9a4b7ee5981614cc9f8f613a97463d27350	COPYING
diff --git a/bsp/buildroot/package/enlightenment/enlightenment.mk b/bsp/buildroot/package/enlightenment/enlightenment.mk
index 7037afe1..0d87119b 100644
--- a/bsp/buildroot/package/enlightenment/enlightenment.mk
+++ b/bsp/buildroot/package/enlightenment/enlightenment.mk
@@ -4,39 +4,57 @@
 #
 ################################################################################
 
-ENLIGHTENMENT_VERSION = 0.21.5
+ENLIGHTENMENT_VERSION = 0.22.1
 ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
 ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
-ENLIGHTENMENT_LICENSE = BSD-2c
+ENLIGHTENMENT_LICENSE = BSD-2-Clause
 ENLIGHTENMENT_LICENSE_FILES = COPYING
 
 ENLIGHTENMENT_DEPENDENCIES = \
 	host-pkgconf \
 	host-efl \
+	host-meson \
 	efl \
 	xcb-util-keysyms
 
-ENLIGHTENMENT_CONF_OPTS = \
-	--with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
-	--with-eet-eet=$(HOST_DIR)/usr/bin/eet \
-	--with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \
-	--disable-pam \
-	--disable-rpath
+ENLIGHTENMENT_MESON_OPTS += \
+	--prefix=/usr \
+	--buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \
+	--cross-file=$(HOST_DIR)/etc/meson/cross-compilation.conf \
+	-Dedje-cc=$(HOST_DIR)/bin/edje_cc \
+	-Deet=$(HOST_DIR)/bin/eet \
+	-Deldbus-codegen=$(HOST_DIR)/bin/eldbus-codegen \
+	-Dpam=false
 
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
-ENLIGHTENMENT_CONF_OPTS += --enable-systemd
+ENLIGHTENMENT_MESON_OPTS += -Dsystemd=true
 ENLIGHTENMENT_DEPENDENCIES += systemd
 else
-ENLIGHTENMENT_CONF_OPTS += --disable-systemd
+ENLIGHTENMENT_MESON_OPTS += -Dsystemd=false
 endif
 
 # alsa backend needs mixer support
 ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+ENLIGHTENMENT_MESON_OPTS += -Dmixer=true
 ENLIGHTENMENT_DEPENDENCIES += alsa-lib
 else
-ENLIGHTENMENT_CONF_ENV += enable_alsa=no
+ENLIGHTENMENT_MESON_OPTS += -Dmixer=false
 endif
 
+define ENLIGHTENMENT_CONFIGURE_CMDS
+	rm -rf $(@D)/build
+	mkdir -p $(@D)/build
+	$(TARGET_MAKE_ENV) meson $(ENLIGHTENMENT_MESON_OPTS) $(@D) $(@D)/build
+endef
+
+define ENLIGHTENMENT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) ninja -C $(@D)/build
+endef
+
+define ENLIGHTENMENT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) ninja -C $(@D)/build install
+endef
+
 define ENLIGHTENMENT_REMOVE_DOCUMENTATION
 	rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/
 	rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING
@@ -44,4 +62,4 @@ define ENLIGHTENMENT_REMOVE_DOCUMENTATION
 endef
 ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION
 
-$(eval $(autotools-package))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/enscript/Config.in b/bsp/buildroot/package/enscript/Config.in
index 26c45e1e..b95bd92a 100644
--- a/bsp/buildroot/package/enscript/Config.in
+++ b/bsp/buildroot/package/enscript/Config.in
@@ -1,11 +1,13 @@
 config BR2_PACKAGE_ENSCRIPT
 	bool "enscript"
 	help
-	  GNU Enscript is a free replacement for Adobe's enscript program.
+	  GNU Enscript is a free replacement for Adobe's enscript
+	  program.
 
-	  GNU Enscript converts ASCII files to PostScript, HTML, or RTF and
-	  stores generated output to a file or sends it directly to the
-	  printer. It includes features for `pretty-printing' (language-
-	  sensitive code highlighting) in several programming languages.
+	  GNU Enscript converts ASCII files to PostScript, HTML, or RTF
+	  and stores generated output to a file or sends it directly to
+	  the printer. It includes features for `pretty-printing'
+	  (language-sensitive code highlighting) in several programming
+	  languages.
 
 	  http://www.gnu.org/software/enscript
diff --git a/bsp/buildroot/package/enscript/enscript.mk b/bsp/buildroot/package/enscript/enscript.mk
index fc2cd415..fbc9e69d 100644
--- a/bsp/buildroot/package/enscript/enscript.mk
+++ b/bsp/buildroot/package/enscript/enscript.mk
@@ -6,7 +6,7 @@
 
 ENSCRIPT_VERSION = 1.6.6
 ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript
-ENSCRIPT_LICENSE = GPLv3+
+ENSCRIPT_LICENSE = GPL-3.0+
 ENSCRIPT_LICENSE_FILES = COPYING
 
 # Enable pthread threads if toolchain supports threads
diff --git a/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.hash b/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.hash
index 00ccb43c..d575aa49 100644
--- a/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.hash
+++ b/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 739d8ce15049c54f7e00528edbf536f63a24fdb9dfa053d176e6f97a9832b834 erlang-goldrush-0.1.8.tar.gz
+sha256 6fb8ac6345d940396ecf89d4ce6b9b809039f336d85d7a54239e85106a807612 erlang-goldrush-0.1.9.tar.gz
diff --git a/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.mk b/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.mk
index 2fa88107..e95b09cd 100644
--- a/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.mk
+++ b/bsp/buildroot/package/erlang-goldrush/erlang-goldrush.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_GOLDRUSH_VERSION = 0.1.8
+ERLANG_GOLDRUSH_VERSION = 0.1.9
 ERLANG_GOLDRUSH_SITE = $(call github,DeadZen,goldrush,$(ERLANG_GOLDRUSH_VERSION))
 ERLANG_GOLDRUSH_LICENSE = ISC
 ERLANG_GOLDRUSH_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/erlang-jiffy/Config.in b/bsp/buildroot/package/erlang-jiffy/Config.in
new file mode 100644
index 00000000..d65f42c9
--- /dev/null
+++ b/bsp/buildroot/package/erlang-jiffy/Config.in
@@ -0,0 +1,10 @@
+comment "erlang-jiffy needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_ERLANG_JIFFY
+	bool "erlang-jiffy"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  JSON NIFs for Erlang.
+
+	  https://github.com/davisp/jiffy
diff --git a/bsp/buildroot/package/erlang-jiffy/erlang-jiffy.hash b/bsp/buildroot/package/erlang-jiffy/erlang-jiffy.hash
new file mode 100644
index 00000000..4a201fe5
--- /dev/null
+++ b/bsp/buildroot/package/erlang-jiffy/erlang-jiffy.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz
diff --git a/bsp/buildroot/package/erlang-jiffy/erlang-jiffy.mk b/bsp/buildroot/package/erlang-jiffy/erlang-jiffy.mk
new file mode 100644
index 00000000..9a688f7c
--- /dev/null
+++ b/bsp/buildroot/package/erlang-jiffy/erlang-jiffy.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# erlang-jiffy
+#
+################################################################################
+
+ERLANG_JIFFY_VERSION = 0.14.11
+ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
+ERLANG_JIFFY_LICENSE = MIT (core), \
+	BSD-3-Clause (Google double conversion library), \
+	BSD-3-Clause (tests)
+ERLANG_JIFFY_LICENSE_FILES = LICENSE
+
+$(eval $(rebar-package))
diff --git a/bsp/buildroot/package/erlang-lager/erlang-lager.hash b/bsp/buildroot/package/erlang-lager/erlang-lager.hash
index e436fdc7..144cef6d 100644
--- a/bsp/buildroot/package/erlang-lager/erlang-lager.hash
+++ b/bsp/buildroot/package/erlang-lager/erlang-lager.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 168a8e48646b04bcee1ab0c97c1ff63563bd7fd25638f1504b8d8f674d2ddd1b erlang-lager-2.2.0.tar.gz
+sha256 c5f532dd236e07dad27976abcf12b9c90fcf33ffd6fe1b1d34639c06171c36ea erlang-lager-3.4.2.tar.gz
diff --git a/bsp/buildroot/package/erlang-lager/erlang-lager.mk b/bsp/buildroot/package/erlang-lager/erlang-lager.mk
index b55b6f7b..790288a4 100644
--- a/bsp/buildroot/package/erlang-lager/erlang-lager.mk
+++ b/bsp/buildroot/package/erlang-lager/erlang-lager.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-ERLANG_LAGER_VERSION = 2.2.0
-ERLANG_LAGER_SITE = $(call github,basho,lager,$(ERLANG_LAGER_VERSION))
+ERLANG_LAGER_VERSION = 3.4.2
+ERLANG_LAGER_SITE = $(call github,erlang-lager,lager,$(ERLANG_LAGER_VERSION))
 ERLANG_LAGER_LICENSE = Apache-2.0
 ERLANG_LAGER_LICENSE_FILES = LICENSE
 ERLANG_LAGER_DEPENDENCIES = erlang-goldrush
diff --git a/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
index d8b09f95..9425bcda 100644
--- a/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
+++ b/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 752b649f695e9f2777efd6b2d8dfdcc1f435104b4e363f5f0454b99fd009015c erlang-p1-cache-tab-1.0.1.tar.gz
+sha256 5ef27d3be0ef2e8dc06468ec39dc3a43506d6f85af0edc21b9c14db860669d38 erlang-p1-cache-tab-1.0.12.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
index 8f131237..ae96103e 100644
--- a/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
+++ b/bsp/buildroot/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_CACHE_TAB_VERSION = 1.0.1
+ERLANG_P1_CACHE_TAB_VERSION = 1.0.12
 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION))
 ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0
 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt
diff --git a/bsp/buildroot/package/erlang-p1-iconv/Config.in b/bsp/buildroot/package/erlang-p1-iconv/Config.in
index 98efb217..cec17d06 100644
--- a/bsp/buildroot/package/erlang-p1-iconv/Config.in
+++ b/bsp/buildroot/package/erlang-p1-iconv/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ERLANG_P1_ICONV
 	bool "erlang-p1-iconv"
+	select BR2_PACKAGE_ERLANG_P1_UTILS
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Erlang interface to libiconv
diff --git a/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash b/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash
index a284189a..0f0a2316 100644
--- a/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash
+++ b/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 3ef1fb814fdf23e8ad8a210efb66681fa67cd42753be536521bf9686158880d3 erlang-p1-iconv-0.9.0.tar.gz
+sha256 c7214ea7503c3de1edf3bdd72b37187aa3a9a36d7cf7f5945a067ae8d262d3fb erlang-p1-iconv-1.0.6.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk b/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk
index d2d2626d..6b22431c 100644
--- a/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk
+++ b/bsp/buildroot/package/erlang-p1-iconv/erlang-p1-iconv.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-ERLANG_P1_ICONV_VERSION = 0.9.0
-ERLANG_P1_ICONV_SITE = $(call github,processone,eiconv,$(ERLANG_P1_ICONV_VERSION))
-ERLANG_P1_ICONV_LICENSE = GPLv2+
-ERLANG_P1_ICONV_LICENSE_FILES = COPYING
+ERLANG_P1_ICONV_VERSION = 1.0.6
+ERLANG_P1_ICONV_SITE = $(call github,processone,iconv,$(ERLANG_P1_ICONV_VERSION))
+ERLANG_P1_ICONV_LICENSE = Apache-2.0
+ERLANG_P1_ICONV_LICENSE_FILES = LICENSE.txt
+ERLANG_P1_ICONV_DEPENDENCIES = erlang-p1-utils
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 ERLANG_P1_ICONV_DEPENDENCIES += libiconv
diff --git a/bsp/buildroot/package/erlang-p1-oauth2/Config.in b/bsp/buildroot/package/erlang-p1-oauth2/Config.in
new file mode 100644
index 00000000..32e79ec9
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-oauth2/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_ERLANG_P1_OAUTH2
+	bool "erlang-p1-oauth2"
+	help
+	  OAuth2 library for Erlang
+
+	  https://github.com/processone/p1_oauth2
diff --git a/bsp/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/bsp/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
new file mode 100644
index 00000000..29fae126
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 aea823ccc49b20f7e27f1893c7edf231339f56b16ba21ce78a60f735b6211718 erlang-p1-oauth2-0.6.2.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/bsp/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
new file mode 100644
index 00000000..5c27393a
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# erlang-p1-oauth2
+#
+################################################################################
+
+ERLANG_P1_OAUTH2_VERSION = 0.6.2
+ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION))
+ERLANG_P1_OAUTH2_LICENSE = MIT
+ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE
+ERLANG_P1_OAUTH2_INSTALL_STAGING = YES
+
+$(eval $(rebar-package))
diff --git a/bsp/buildroot/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch b/bsp/buildroot/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
new file mode 100644
index 00000000..da860769
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-sip/0002-remove-dependencies-from-rebar-config.patch
@@ -0,0 +1,20 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/rebar.config b/rebar.config
+index ed93134..5b32788 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -31,10 +31,6 @@
+
+ {port_specs, [{"priv/lib/esip_drv.so", ["c_src/esip_codec.c"]}]}.
+
+-{deps, [{stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.16"}}},
+-	{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
+-	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
+-
+ {clean_files, ["c_src/esip_codec.gcda", "c_src/esip_codec.gcno"]}.
+
+ {cover_enabled, true}.
diff --git a/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash b/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
index 74382cca..4d41b988 100644
--- a/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
+++ b/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 2d6dfad997931668eb83a0cb127ccca8c51f8a383d76f9dea393c0b3a4eabae7 erlang-p1-sip-1.0.0.tar.gz
+sha256 6ac36594921561d0d5502bb824b7408223a3f53560a9d2fa4b0f685c0441baf0 erlang-p1-sip-1.0.17.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk b/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
index 24075a7a..a9f572df 100644
--- a/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
+++ b/bsp/buildroot/package/erlang-p1-sip/erlang-p1-sip.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_SIP_VERSION = 1.0.0
-ERLANG_P1_SIP_SITE = $(call github,processone,p1_sip,$(ERLANG_P1_SIP_VERSION))
-ERLANG_P1_SIP_LICENSE = GPLv2 with OpenSSL exception
-ERLANG_P1_SIP_LICENSE_FILES = COPYING
+ERLANG_P1_SIP_VERSION = 1.0.17
+ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION))
+ERLANG_P1_SIP_LICENSE = Apache-2.0
+ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils
 ERLANG_P1_SIP_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch b/bsp/buildroot/package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch
deleted file mode 100644
index 7385503b..00000000
--- a/bsp/buildroot/package/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f5a2b8b78afb253630ee8833f16f131b3b52701e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= <pchmielowski@process-one.net>
-Date: Mon, 29 Feb 2016 10:56:32 +0100
-Subject: [PATCH] Stdint is required on windows
-
-[Backport from upstream commit
-4fc5cae81122540fff983e40dda1fa905c329fd0, which happens to not only
-fix the build on Windows, but also with the musl C library.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- c_src/stringprep.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/c_src/stringprep.cpp b/c_src/stringprep.cpp
-index 461cf09..26215cf 100644
---- a/c_src/stringprep.cpp
-+++ b/c_src/stringprep.cpp
-@@ -19,6 +19,7 @@
-  */
- 
- #include <string.h>
-+#include <stdint.h>
- #include <erl_nif.h>
- 
- #include "uni_data.c"
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
index 23bc6fbd..769e2180 100644
--- a/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
+++ b/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5a74277e7bfb18b8f35838fa78fcde83f0acdb5b2a5b90c4b6d2470a33f7911e erlang-p1-stringprep-1.0.0.tar.gz
+sha256 baef9e6bd59e00c9d2600e8db87078c19d76cbf66d5068efeaf1df740ee306ce erlang-p1-stringprep-1.0.10.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
index 3bc8c729..f104a2ce 100644
--- a/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
+++ b/bsp/buildroot/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_STRINGPREP_VERSION = 1.0.0
+ERLANG_P1_STRINGPREP_VERSION = 1.0.10
 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION))
 ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest)
 ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt
diff --git a/bsp/buildroot/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch b/bsp/buildroot/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch
new file mode 100644
index 00000000..7e6b4b53
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-stun/0001-remove-dependencies-from-rebar-config.patch
@@ -0,0 +1,16 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+diff --git a/rebar.config b/rebar.config
+index f02ea40..d0af863 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -22,9 +22,6 @@
+
+ {erl_opts, [debug_info, {i, "include"}]}.
+
+-{deps, [{fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.17"}}},
+-	{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
+-
+ {cover_enabled, true}.
+ {cover_export_enabled, true}.
diff --git a/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash b/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
index be566080..ee32834e 100644
--- a/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
+++ b/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 ca33833f4b6ef70a7628e6f3697d15cb4e26d32ef4e5a31bbddee86cabe19c50 erlang-p1-stun-0.9.0.tar.gz
+sha256 8efe2f47c2460b1e0d68a680dcfcd938a2bc98c85abb5b100c15246fe6a25506 erlang-p1-stun-1.0.16.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk b/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
index 4d26f917..42bbc758 100644
--- a/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
+++ b/bsp/buildroot/package/erlang-p1-stun/erlang-p1-stun.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_STUN_VERSION = 0.9.0
+ERLANG_P1_STUN_VERSION = 1.0.16
 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION))
-ERLANG_P1_STUN_LICENSE = GPLv2+
-ERLANG_P1_STUN_LICENSE_FILES = COPYING
+ERLANG_P1_STUN_LICENSE = Apache-2.0
+ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils
 ERLANG_P1_STUN_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/erlang-p1-tls/Config.in b/bsp/buildroot/package/erlang-p1-tls/Config.in
index 0df33482..a684fbb6 100644
--- a/bsp/buildroot/package/erlang-p1-tls/Config.in
+++ b/bsp/buildroot/package/erlang-p1-tls/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_ERLANG_P1_TLS
 	bool "erlang-p1-tls"
+	select BR2_PACKAGE_ERLANG_P1_UTILS
 	select BR2_PACKAGE_OPENSSL
 	help
 	  Erlang interface to OpenSSL
diff --git a/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash b/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
index fd8d801f..b5b800b2 100644
--- a/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
+++ b/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8e8b848a112ff6bf146df34b4f6bc50160a8858a18499a7a6124193b37237a40 erlang-p1-tls-1.0.0.tar.gz
+sha256 ca9670b7f78a025b101e3fee6255d7472d6b52abc46444cc45616c3d1bd75b9b erlang-p1-tls-1.0.17.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk b/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
index 77f06e6b..ad7317dc 100644
--- a/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
+++ b/bsp/buildroot/package/erlang-p1-tls/erlang-p1-tls.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-ERLANG_P1_TLS_VERSION = 1.0.0
-ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION))
-ERLANG_P1_TLS_LICENSE = GPLv2+ with OpenSSL exception
-ERLANG_P1_TLS_LICENSE_FILES = COPYING
+ERLANG_P1_TLS_VERSION = 1.0.17
+ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION))
+ERLANG_P1_TLS_LICENSE = Apache-2.0
+ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_TLS_INSTALL_STAGING = YES
-ERLANG_P1_TLS_DEPENDENCIES = openssl
+ERLANG_P1_TLS_DEPENDENCIES = openssl erlang-p1-utils
 
 $(eval $(rebar-package))
diff --git a/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash b/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
index c41e5ef5..950a5540 100644
--- a/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
+++ b/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 9c7e9fa2990edd419953a6ae609ffed0b90e671b57c468d97c0d85d866d80210 erlang-p1-utils-1.0.3.tar.gz
+sha256 57bfc575179733a723717f4fecb65b9f7fd056595f798b52e7bc0206e8a9333f erlang-p1-utils-1.0.10.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk b/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
index 733cf87f..6a492073 100644
--- a/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
+++ b/bsp/buildroot/package/erlang-p1-utils/erlang-p1-utils.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-ERLANG_P1_UTILS_VERSION = 1.0.3
+ERLANG_P1_UTILS_VERSION = 1.0.10
 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION))
-ERLANG_P1_UTILS_LICENSE = GPLv2+
+ERLANG_P1_UTILS_LICENSE = Apache-2.0
 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_UTILS_INSTALL_STAGING = YES
 
 $(eval $(rebar-package))
+$(eval $(host-rebar-package))
diff --git a/bsp/buildroot/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch b/bsp/buildroot/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch
new file mode 100644
index 00000000..b58db3f2
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-xml/0001-remove-dependencies-from-rebar-config.patch
@@ -0,0 +1,18 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/rebar.config b/rebar.config
+index 99f5047..ac2f3b2 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -32,8 +32,6 @@
+ {port_specs, [{"priv/lib/fxml.so", ["c_src/fxml.c"]},
+               {"priv/lib/fxml_stream.so", ["c_src/fxml_stream.c"]}]}.
+
+-{deps, [{p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
+-
+ {clean_files, ["c_src/fxml.gcda", "c_src/fxml.gcno", "c_src/fxml_stream.gcda", "c_src/fxml_stream.gcno"]}.
+
+ {cover_enabled, true}.
diff --git a/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash b/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
index 8e4a79fe..ae3f3241 100644
--- a/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
+++ b/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4c163c5b9572baa93eb97e03544db57dc751c7995a5279081a0d56f5fdaa2521 erlang-p1-xml-1.1.1.tar.gz
+sha256 aeda4051c08b78e2f036d82705433a667d03736f07ff0054862e82105435e285 erlang-p1-xml-1.1.25.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk b/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
index 31bab231..ff999983 100644
--- a/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
+++ b/bsp/buildroot/package/erlang-p1-xml/erlang-p1-xml.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-ERLANG_P1_XML_VERSION = 1.1.1
-ERLANG_P1_XML_SITE = $(call github,processone,xml,$(ERLANG_P1_XML_VERSION))
+ERLANG_P1_XML_VERSION = 1.1.25
+ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION))
 ERLANG_P1_XML_LICENSE = Apache-2.0
 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils
+HOST_ERLANG_P1_XML_DEPENDENCIES = host-expat host-erlang-p1-utils
 ERLANG_P1_XML_INSTALL_STAGING = YES
 
 ERLANG_P1_XML_USE_AUTOCONF = YES
 
 $(eval $(rebar-package))
+$(eval $(host-rebar-package))
diff --git a/bsp/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch b/bsp/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch
new file mode 100644
index 00000000..d0a267b7
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-xmpp/0001-fix-includes.patch
@@ -0,0 +1,16 @@
+Without this patch, rebar fails to find include file fxml.hrl.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/include/xmpp.hrl b/include/xmpp.hrl
+index afa5f61..678858e 100644
+--- a/include/xmpp.hrl
++++ b/include/xmpp.hrl
+@@ -26,7 +26,7 @@
+ -include("ns.hrl").
+ -include("jid.hrl").
+ -include("xmpp_codec.hrl").
+--include("fxml.hrl").
++-include_lib("p1_xml/include/fxml.hrl").
+
+ -type stanza() :: iq() | presence() | message().
diff --git a/bsp/buildroot/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch b/bsp/buildroot/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
new file mode 100644
index 00000000..fed44f62
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-xmpp/0002-remove-dependencies-from-rebar-config.patch
@@ -0,0 +1,19 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/rebar.config b/rebar.config
+--- a/rebar.config	2017-11-30 14:24:52.348695123 +0100
++++ b/rebar.config	2017-11-30 14:35:11.816407195 +0100
+@@ -29,10 +29,6 @@
+
+ {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}.
+
+-{deps, [{fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.25"}}},
+-        {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.10"}}},
+-        {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
+-
+ {clean_files, ["c_src/jid.gcda", "c_src/jid.gcno"]}.
+
+ {cover_enabled, true}.
diff --git a/bsp/buildroot/package/erlang-p1-xmpp/Config.in b/bsp/buildroot/package/erlang-p1-xmpp/Config.in
new file mode 100644
index 00000000..9b33e0c6
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-xmpp/Config.in
@@ -0,0 +1,13 @@
+comment "erlang-p1-xmpp needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+config BR2_PACKAGE_ERLANG_P1_XMPP
+	bool "erlang-p1-xmpp"
+	depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep
+	select BR2_PACKAGE_ERLANG_P1_XML
+	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
+	select BR2_PACKAGE_ERLANG_P1_UTILS
+	help
+	  XMPP library for Erlang.
+
+	  https://github.com/processone/xmpp
diff --git a/bsp/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/bsp/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
new file mode 100644
index 00000000..d3d2dafb
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 558e8d8734052bdbe679cf10165a63944c208940ab84be78c97ba661dfcf3cb2 erlang-p1-xmpp-1.1.16.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/bsp/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
new file mode 100644
index 00000000..096876ca
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# erlang-p1-xmpp
+#
+################################################################################
+
+ERLANG_P1_XMPP_VERSION = 1.1.16
+ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
+ERLANG_P1_XMPP_LICENSE = Apache-2.0
+ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
+ERLANG_P1_XMPP_INSTALL_STAGING = YES
+ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \
+	erlang-p1-utils host-erlang-p1-xml
+
+$(eval $(rebar-package))
+$(eval $(host-rebar-package))
diff --git a/bsp/buildroot/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch b/bsp/buildroot/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch
new file mode 100644
index 00000000..4dfdb929
--- /dev/null
+++ b/bsp/buildroot/package/erlang-p1-yaml/0001-remove-dependencies-from-rebar-config.patch
@@ -0,0 +1,18 @@
+Without this patch, dependencies would be downloaded and compiled
+by rebar at build time.
+
+Signed-off-by: Christophe Romain <cromain@process-one.net>
+
+diff --git a/rebar.config b/rebar.config
+index e09d08d..651a829 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -24,8 +24,6 @@
+ {port_env, [{"CFLAGS", "$CFLAGS"}, {"LDFLAGS", "$LDFLAGS -lyaml"}]}.
+ {port_specs, [{"priv/lib/fast_yaml.so", ["c_src/fast_yaml.c"]}]}.
+
+-{deps, [{p1_utils, ".*", {git, "git://github.com/processone/p1_utils", {tag, "1.0.10"}}}]}.
+-
+ {clean_files, ["c_src/fast_yaml.gcda", "c_src/fast_yaml.gcno"]}.
+
+ {cover_enabled, true}.
diff --git a/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash b/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
index 0e11e450..24282e6c 100644
--- a/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
+++ b/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8eaaddda056f1ebb515a5456ba2be855e5b71b9b6eb35788527f39c6600ac6b4 erlang-p1-yaml-1.0.0.tar.gz
+sha256 5a6499a47cdd1f753a527cb8b79074312354063535adc0ca0fd7f72c2a015e3a erlang-p1-yaml-1.0.12.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk b/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
index 22fcda43..de138a9f 100644
--- a/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
+++ b/bsp/buildroot/package/erlang-p1-yaml/erlang-p1-yaml.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_YAML_VERSION = 1.0.0
-ERLANG_P1_YAML_SITE = $(call github,processone,p1_yaml,$(ERLANG_P1_YAML_VERSION))
+ERLANG_P1_YAML_VERSION = 1.0.12
+ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION))
 ERLANG_P1_YAML_LICENSE = Apache-2.0
-ERLANG_P1_YAML_LICENSE_FILES = COPYING
+ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils
 
 $(eval $(rebar-package))
diff --git a/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash b/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
index 488e7529..dc14dd07 100644
--- a/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
+++ b/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 cb534ee8d8746e38027ada0ccd7e910daa025c74461286ded60ffaa933e3cf7b erlang-p1-zlib-1.0.0.tar.gz
+sha256 8396f9cb17fdb195d9a2537ad76327bf930d66118b87b7108f27e5ed28b7cde6 erlang-p1-zlib-1.0.3.tar.gz
diff --git a/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk b/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
index 1f8ae006..bc53efcc 100644
--- a/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
+++ b/bsp/buildroot/package/erlang-p1-zlib/erlang-p1-zlib.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ERLANG_P1_ZLIB_VERSION = 1.0.0
-ERLANG_P1_ZLIB_SITE = $(call github,processone,zlib,$(ERLANG_P1_ZLIB_VERSION))
-ERLANG_P1_ZLIB_LICENSE = GPLv2+
-ERLANG_P1_ZLIB_LICENSE_FILES = COPYING
+ERLANG_P1_ZLIB_VERSION = 1.0.3
+ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION))
+ERLANG_P1_ZLIB_LICENSE = Apache-2.0
+ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt
 ERLANG_P1_ZLIB_DEPENDENCIES = zlib
 
 $(eval $(rebar-package))
diff --git a/bsp/buildroot/package/erlang-rebar/erlang-rebar.mk b/bsp/buildroot/package/erlang-rebar/erlang-rebar.mk
index 031ff474..ce082dc6 100644
--- a/bsp/buildroot/package/erlang-rebar/erlang-rebar.mk
+++ b/bsp/buildroot/package/erlang-rebar/erlang-rebar.mk
@@ -25,7 +25,7 @@ define HOST_ERLANG_REBAR_BUILD_CMDS
 endef
 
 define HOST_ERLANG_REBAR_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/rebar $(HOST_DIR)/usr/bin/rebar
+	$(INSTALL) -m 0755 -D $(@D)/rebar $(HOST_DIR)/bin/rebar
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/erlang/0001-build-fix.patch b/bsp/buildroot/package/erlang/0001-build-fix.patch
deleted file mode 100644
index ff821c9f..00000000
--- a/bsp/buildroot/package/erlang/0001-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-apply-patches.sh deletes this file from the source directory.
-
---- erlang-R15B01.old/lib/tools/emacs/Makefile	2012-04-04
-+++ erlang-R15B01/lib/tools/emacs/Makefile	2012-04-04 15:55:16.978957307 +0100
-@@ -51,7 +51,7 @@
-
- ELC_FILES = $(EMACS_FILES:%=%.elc)
-
--TEST_FILES = test.erl.indented test.erl.orig
-+TEST_FILES = test.erl.indented
-
- # ----------------------------------------------------
- # Targets
diff --git a/bsp/buildroot/package/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/bsp/buildroot/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
similarity index 100%
rename from bsp/buildroot/package/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
rename to bsp/buildroot/package/erlang/0001-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch
diff --git a/bsp/buildroot/package/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch b/bsp/buildroot/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
similarity index 100%
rename from bsp/buildroot/package/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch
rename to bsp/buildroot/package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch
diff --git a/bsp/buildroot/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch b/bsp/buildroot/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch
new file mode 100644
index 00000000..ad0bb6b4
--- /dev/null
+++ b/bsp/buildroot/package/erlang/0003-Link-with-LDLIBS-instead-of-LIBS-for-DED.patch
@@ -0,0 +1,42 @@
+From 011752ec7b31e3dde376270fc65c7ee70644f6e7 Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <johan.oudinet@gmail.com>
+Date: Wed, 6 Dec 2017 15:01:17 +0100
+Subject: [PATCH] Link with LDLIBS instead of LIBS for DED
+
+Fix ERL-529 by avoiding to link with libz for no reason.
+
+Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
+---
+ lib/asn1/c_src/Makefile             | 2 +-
+ lib/runtime_tools/c_src/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
+index 1f714df357..f7c6b8b9bc 100644
+--- a/lib/asn1/c_src/Makefile
++++ b/lib/asn1/c_src/Makefile
+@@ -126,7 +126,7 @@ $(NIF_LIB_FILE): $(NIF_STATIC_OBJ_FILES)
+ 	$(V_RANLIB) $@
+ 
+ $(NIF_SHARED_OBJ_FILE): $(NIF_OBJ_FILES)
+-	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LIBS)
++	$(V_LD) $(LDFLAGS) -o $(NIF_SHARED_OBJ_FILE) $(NIF_OBJ_FILES) $(CLIB_FLAGS) $(LDLIBS)
+ 
+ # ----------------------------------------------------
+ # Release Target
+diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
+index 4530a83aee..4e13e0d789 100644
+--- a/lib/runtime_tools/c_src/Makefile.in
++++ b/lib/runtime_tools/c_src/Makefile.in
+@@ -95,7 +95,7 @@ $(OBJDIR)/%$(TYPEMARKER).o: %.c dyntrace_lttng.h
+ 	$(V_CC) -c -o $@ $(ALL_CFLAGS) $<
+ 
+ $(LIBDIR)/%$(TYPEMARKER).@DED_EXT@: $(OBJDIR)/%$(TYPEMARKER).o
+-	$(V_LD) $(LDFLAGS) -o $@ $^ $(LIBS)
++	$(V_LD) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+ 
+ clean:
+ 	rm -f $(TRACE_LIBS)
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/erlang/Config.in b/bsp/buildroot/package/erlang/Config.in
index 11407db1..bf745555 100644
--- a/bsp/buildroot/package/erlang/Config.in
+++ b/bsp/buildroot/package/erlang/Config.in
@@ -1,9 +1,16 @@
+config BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
+	bool
+	default y if BR2_HOSTARCH = "x86_64"
+	default y if BR2_HOSTARCH = "x86"
+
 config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
 	bool
 	# see HOWTO/INSTALL.md for Erlang's supported platforms
 	# when using its native atomic ops implementation
 	default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || \
 		BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel
+	# erlang needs host-erlang
+	depends on BR2_PACKAGE_HOST_ERLANG_ARCH_SUPPORTS
 
 comment "erlang needs a toolchain w/ dynamic library"
 	depends on BR2_USE_MMU # fork()
@@ -16,31 +23,23 @@ config BR2_PACKAGE_ERLANG
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS
 	help
-	  Erlang is a programming language used to build massively scalable
-	  soft real-time systems with requirements on high availability.
-	  Some of its uses are in telecoms, banking, e-commerce, computer
-	  telephony and instant messaging. Erlang's runtime system has
-	  built-in support for concurrency, distribution and fault tolerance.
+	  Erlang is a programming language used to build massively
+	  scalable soft real-time systems with requirements on high
+	  availability. Some of its uses are in telecoms, banking,
+	  e-commerce, computer telephony and instant messaging.
+	  Erlang's runtime system has built-in support for
+	  concurrency, distribution and fault tolerance.
 
 	  http://www.erlang.org
 
 if BR2_PACKAGE_ERLANG
 
-config BR2_PACKAGE_ERLANG_SMP
-	bool "enable SMP support"
-	help
-	  Erlang provides both a UP and an SMP emulator. The UP emulator
-	  is always built, and this option enables compilation of the SMP
-	  emulator. The choice of which emulator to use is made at runtime.
-	  If you do not need SMP support, turning this option off reduces
-	  compile time and the size of the Erlang installation.
-
 config BR2_PACKAGE_ERLANG_MEGACO
 	bool "install megaco application"
 	help
-	  The Megaco application is a framework for building applications
-	  on top of the Megaco/H.248 protocol. It is approximately 14MB in
-	  size so if you do not need it then it is recommended not to
-	  enable it.
+	  The Megaco application is a framework for building
+	  applications on top of the Megaco/H.248 protocol. It is
+	  approximately 14MB in size so if you do not need it then
+	  it is recommended not to enable it.
 
 endif # BR2_PACKAGE_ERLANG
diff --git a/bsp/buildroot/package/erlang/erlang.hash b/bsp/buildroot/package/erlang/erlang.hash
index c39c26e3..f5ff7402 100644
--- a/bsp/buildroot/package/erlang/erlang.hash
+++ b/bsp/buildroot/package/erlang/erlang.hash
@@ -1,3 +1,4 @@
 # md5 from http://www.erlang.org/download/MD5, sha256 locally computed
-md5	7e4ff32f97c36fb3dab736f8d481830b	otp_src_18.3.tar.gz
-sha256	fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3	otp_src_18.3.tar.gz
+md5 a683c8c0aacfe0305c4bf47b3abfde6a  otp_src_20.3.tar.gz
+sha256 4e19e6c403d5255531c0b870f19511c8b8e3b080618e4f9efcb44d905935b2a1  otp_src_20.3.tar.gz
+sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE.txt
diff --git a/bsp/buildroot/package/erlang/erlang.mk b/bsp/buildroot/package/erlang/erlang.mk
index 364085c4..b7fdb6b9 100644
--- a/bsp/buildroot/package/erlang/erlang.mk
+++ b/bsp/buildroot/package/erlang/erlang.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # See note below when updating Erlang
-ERLANG_VERSION = 18.3
+ERLANG_VERSION = 20.3
 ERLANG_SITE = http://www.erlang.org/download
 ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz
 ERLANG_DEPENDENCIES = host-erlang
@@ -19,7 +19,7 @@ ERLANG_AUTORECONF = YES
 
 # Whenever updating Erlang, this value should be updated as well, to the
 # value of EI_VSN in the file lib/erl_interface/vsn.mk
-ERLANG_EI_VSN = 3.8.2
+ERLANG_EI_VSN = 3.10.1
 
 # The configure checks for these functions fail incorrectly
 ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes
@@ -39,7 +39,7 @@ HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D)
 # erlang uses openssl for all things crypto. Since the host tools (such as
 # rebar) uses crypto, we need to build host-erlang with support for openssl.
 HOST_ERLANG_DEPENDENCIES = host-openssl
-HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)/usr
+HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)
 
 HOST_ERLANG_CONF_OPTS += --without-termcap
 
@@ -74,10 +74,6 @@ ERLANG_CONF_OPTS += --enable-shared-zlib
 ERLANG_DEPENDENCIES += zlib
 endif
 
-ifeq ($(BR2_PACKAGE_ERLANG_SMP),)
-ERLANG_CONF_OPTS += --disable-smp-support
-endif
-
 # Remove source, example, gs and wx files from staging and target.
 ERLANG_REMOVE_PACKAGES = gs wx
 
diff --git a/bsp/buildroot/package/espeak/Config.in b/bsp/buildroot/package/espeak/Config.in
index aed627af..5f9007a1 100644
--- a/bsp/buildroot/package/espeak/Config.in
+++ b/bsp/buildroot/package/espeak/Config.in
@@ -27,12 +27,15 @@ config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE
 
 config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA
 	bool "alsa via portaudio"
+	# Selecting portaudio generates spurious "unmet dependencies"
+	# warnings. Unless you are changing the dependencies of espeak
+	# or portaudio, just ignore those spurious warnings.
 	select BR2_PACKAGE_PORTAUDIO
 	select BR2_PACKAGE_PORTAUDIO_CXX
 
 config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO
 	bool "pulseaudio"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
 	select BR2_PACKAGE_PULSEAUDIO
 
 endchoice
diff --git a/bsp/buildroot/package/espeak/espeak.mk b/bsp/buildroot/package/espeak/espeak.mk
index 734ec30e..226f17fc 100644
--- a/bsp/buildroot/package/espeak/espeak.mk
+++ b/bsp/buildroot/package/espeak/espeak.mk
@@ -8,7 +8,7 @@ ESPEAK_VERSION_MAJOR = 1.48
 ESPEAK_VERSION = $(ESPEAK_VERSION_MAJOR).04
 ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip
 ESPEAK_SITE = http://downloads.sourceforge.net/project/espeak/espeak/espeak-$(ESPEAK_VERSION_MAJOR)
-ESPEAK_LICENSE = GPLv3+
+ESPEAK_LICENSE = GPL-3.0+
 ESPEAK_LICENSE_FILES = License.txt
 
 ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA),y)
diff --git a/bsp/buildroot/package/ethtool/Config.in b/bsp/buildroot/package/ethtool/Config.in
index 48c6062a..48173bfe 100644
--- a/bsp/buildroot/package/ethtool/Config.in
+++ b/bsp/buildroot/package/ethtool/Config.in
@@ -4,4 +4,12 @@ config BR2_PACKAGE_ETHTOOL
 	  ethtool is a small utility for examining and tuning your
 	  ethernet-based network interface.
 
-	  http://sourceforge.net/projects/gkernel/
+	  https://www.kernel.org/pub/software/network/ethtool/
+
+config BR2_PACKAGE_ETHTOOL_PRETTY_PRINT
+	bool "enable pretty printing"
+	default y
+	depends on BR2_PACKAGE_ETHTOOL
+	help
+	  Enables ethtool's pretty printing for drivers
+	  and SFP modules.
diff --git a/bsp/buildroot/package/ethtool/ethtool.hash b/bsp/buildroot/package/ethtool/ethtool.hash
index 7deb92ad..39e10ff3 100644
--- a/bsp/buildroot/package/ethtool/ethtool.hash
+++ b/bsp/buildroot/package/ethtool/ethtool.hash
@@ -1,2 +1,4 @@
 # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc
-sha256	403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43	ethtool-4.8.tar.xz
+sha256	b7c1a380007d30eaf261a63b3cfc000f9d93f9eb7626dcd48b5d2a733af99cba	ethtool-4.13.tar.xz
+# Locally calculated
+sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
diff --git a/bsp/buildroot/package/ethtool/ethtool.mk b/bsp/buildroot/package/ethtool/ethtool.mk
index bb3ed926..d8ebba5f 100644
--- a/bsp/buildroot/package/ethtool/ethtool.mk
+++ b/bsp/buildroot/package/ethtool/ethtool.mk
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-ETHTOOL_VERSION = 4.8
+ETHTOOL_VERSION = 4.13
 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz
 ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool
-ETHTOOL_LICENSE = GPLv2
+ETHTOOL_LICENSE = GPL-2.0
 ETHTOOL_LICENSE_FILES = COPYING
+ETHTOOL_CONF_OPTS = \
+	$(if $(BR2_PACKAGE_ETHTOOL_PRETTY_PRINT),--enable-pretty-dump,--disable-pretty-dump)
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/eudev/0002-missing-defines-for-old-kernels.patch b/bsp/buildroot/package/eudev/0002-missing-defines-for-old-kernels.patch
deleted file mode 100644
index 6966b07f..00000000
--- a/bsp/buildroot/package/eudev/0002-missing-defines-for-old-kernels.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c0f63850ad29ec978d070a08b816dc2bfca337e3 Mon Sep 17 00:00:00 2001
-From: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
-Date: Fri, 30 Dec 2016 11:28:41 -0200
-Subject: [PATCH] udev-builtin-input_id.c: add missing kernel header defines.
-
-Add missing defines so eudev builds for older kernels such as 2.6
-
-Signed-off-by: Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
----
- src/shared/missing.h             | 8 ++++++++
- src/udev/udev-builtin-input_id.c | 1 +
- 2 files changed, 9 insertions(+)
-
-diff --git a/src/shared/missing.h b/src/shared/missing.h
-index 5ad599795..bebbb42be 100644
---- a/src/shared/missing.h
-+++ b/src/shared/missing.h
-@@ -171,3 +171,11 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle
-     (char *)memcpy(__new, __old, __len); \
-   })
- #endif
-+
-+#ifndef BTN_TRIGGER_HAPPY
-+#define BTN_TRIGGER_HAPPY 0x2c0
-+#endif
-+
-+#ifndef INPUT_PROP_MAX
-+#define INPUT_PROP_MAX 0x1f
-+#endif
-diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
-index b14190e42..ca545be5d 100644
---- a/src/udev/udev-builtin-input_id.c
-+++ b/src/udev/udev-builtin-input_id.c
-@@ -32,6 +32,7 @@
- 
- #include "udev.h"
- #include "util.h"
-+#include "missing.h"
- 
- /* we must use this kernel-compatible implementation */
- #define BITS_PER_LONG (sizeof(unsigned long) * 8)
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/eudev/Config.in b/bsp/buildroot/package/eudev/Config.in
index 02fcc7e1..2220265a 100644
--- a/bsp/buildroot/package/eudev/Config.in
+++ b/bsp/buildroot/package/eudev/Config.in
@@ -9,10 +9,10 @@ config BR2_PACKAGE_EUDEV
 	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
 	select BR2_PACKAGE_KMOD
 	help
-	  eudev is a fork of systemd-udev with the goal of obtaining better
-	  compatibility with existing software such as OpenRC and Upstart,
-	  older kernels, various toolchains and anything else required by
-	  users and various distributions.
+	  eudev is a fork of systemd-udev with the goal of obtaining
+	  better compatibility with existing software such as OpenRC and
+	  Upstart, older kernels, various toolchains and anything else
+	  required by users and various distributions.
 
 	  https://wiki.gentoo.org/wiki/Project:Eudev
 
diff --git a/bsp/buildroot/package/eudev/S10udev b/bsp/buildroot/package/eudev/S10udev
index 640fec62..47c715c8 100755
--- a/bsp/buildroot/package/eudev/S10udev
+++ b/bsp/buildroot/package/eudev/S10udev
@@ -28,7 +28,7 @@ test -r $UDEV_CONFIG || exit 6
 case "$1" in
     start)
         printf "Populating %s using udev: " "${udev_root:-/dev}"
-        printf '\000\000\000\000' > /proc/sys/kernel/hotplug
+        [ -e /proc/sys/kernel/hotplug ] && printf '\000\000\000\000' > /proc/sys/kernel/hotplug
         $UDEV_BIN -d || { echo "FAIL"; exit 1; }
         udevadm trigger --type=subsystems --action=add
         udevadm trigger --type=devices --action=add
diff --git a/bsp/buildroot/package/eudev/eudev.hash b/bsp/buildroot/package/eudev/eudev.hash
index 108b0c6e..3fa47980 100644
--- a/bsp/buildroot/package/eudev/eudev.hash
+++ b/bsp/buildroot/package/eudev/eudev.hash
@@ -1,4 +1,5 @@
 # From http://dev.gentoo.org/~blueness/eudev/
-md5 49f71f6c271ffa95b3c20d757d45c2e5  eudev-3.2.1.tar.gz
+md5 6ca08c0e14380f87df8e8aceac123671  eudev-3.2.5.tar.gz
 # Locally calculated
-sha256 57e3d9e51cfefbdad431848ea0ad8ae1cde04928da42474f44bd200b12f5fe19  eudev-3.2.1.tar.gz
+sha256 49c2d04105cad2526302627e040fa24b1916a9a3e059539bc8bb919b973890af  eudev-3.2.5.tar.gz
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/bsp/buildroot/package/eudev/eudev.mk b/bsp/buildroot/package/eudev/eudev.mk
index 2f5bd6cf..d08b9bb0 100644
--- a/bsp/buildroot/package/eudev/eudev.mk
+++ b/bsp/buildroot/package/eudev/eudev.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-EUDEV_VERSION = 3.2.1
+EUDEV_VERSION = 3.2.5
 EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev
-EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries)
+EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 EUDEV_LICENSE_FILES = COPYING
 EUDEV_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk b/bsp/buildroot/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
index 55e26f04..92e89278 100644
--- a/bsp/buildroot/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
+++ b/bsp/buildroot/package/ev3dev-linux-drivers/ev3dev-linux-drivers.mk
@@ -6,6 +6,6 @@
 
 EV3DEV_LINUX_DRIVERS_VERSION = 0e551eb25ae8600c1f178814781bfb42dc835496
 EV3DEV_LINUX_DRIVERS_SITE = $(call github,ev3dev,lego-linux-drivers,$(EV3DEV_LINUX_DRIVERS_VERSION))
-EV3DEV_LINUX_DRIVERS_LICENSE = GPLv2
+EV3DEV_LINUX_DRIVERS_LICENSE = GPL-2.0
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch b/bsp/buildroot/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch
new file mode 100644
index 00000000..04a0cc6b
--- /dev/null
+++ b/bsp/buildroot/package/evemu/0001-Include-limits.h-for-PATH_MAX.patch
@@ -0,0 +1,35 @@
+From e80a13776e6d6df29fd704cd63e0744200c3df1b Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sun, 1 Oct 2017 19:54:53 +0200
+Subject: [PATCH] Include limits.h for PATH_MAX.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following compile failure when building with musl:
+
+  find_event_devices.c: In function ‘find_event_devices’:
+  find_event_devices.c:60:14: error: ‘PATH_MAX’ undeclared (first use in this function)
+     char fname[PATH_MAX];
+                ^~~~~~~~
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ tools/find_event_devices.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/find_event_devices.c b/tools/find_event_devices.c
+index 2a43d54..3a74096 100644
+--- a/tools/find_event_devices.c
++++ b/tools/find_event_devices.c
+@@ -24,6 +24,7 @@
+ 
+ #define _GNU_SOURCE
+ #include <linux/input.h>
++#include <limits.h>
+ #include <dirent.h>
+ #include <string.h>
+ #include <stdio.h>
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/evemu/evemu.hash b/bsp/buildroot/package/evemu/evemu.hash
index 5e653f7d..7d45eb3e 100644
--- a/bsp/buildroot/package/evemu/evemu.hash
+++ b/bsp/buildroot/package/evemu/evemu.hash
@@ -1,2 +1,2 @@
-# Hash from https://lists.freedesktop.org/archives/input-tools/2016-September/001330.html
-sha256 541cc138f0215b7d0cd4ad5e6bb1402518ffc5e31294c36bb67b4ff1791bb27f evemu-2.5.0.tar.xz
+# From https://lists.freedesktop.org/archives/input-tools/2017-September/001416.html
+sha256 78c9400d55eeeb5ab75161360543f9376438c4da4934cb34cdda5b46021ae379 evemu-2.7.0.tar.xz
diff --git a/bsp/buildroot/package/evemu/evemu.mk b/bsp/buildroot/package/evemu/evemu.mk
index 4f59789a..02e5abdb 100644
--- a/bsp/buildroot/package/evemu/evemu.mk
+++ b/bsp/buildroot/package/evemu/evemu.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-EVEMU_VERSION = 2.5.0
+EVEMU_VERSION = 2.7.0
 EVEMU_SITE = http://www.freedesktop.org/software/evemu
 EVEMU_SOURCE = evemu-$(EVEMU_VERSION).tar.xz
-EVEMU_LICENSE = LGPLv3 (library), GPLv3 (tools)
+EVEMU_LICENSE = LGPL-3.0 (library), GPL-3.0 (tools)
 EVEMU_LICENSE_FILES = COPYING
 
 # asciidoc used to generate manpages, which we don't need, and if it's
diff --git a/bsp/buildroot/package/eventlog/eventlog.mk b/bsp/buildroot/package/eventlog/eventlog.mk
index 76da002e..72536571 100644
--- a/bsp/buildroot/package/eventlog/eventlog.mk
+++ b/bsp/buildroot/package/eventlog/eventlog.mk
@@ -8,7 +8,7 @@ EVENTLOG_VERSION_MAJOR = 0.2
 EVENTLOG_VERSION = $(EVENTLOG_VERSION_MAJOR).12
 EVENTLOG_SOURCE = eventlog_$(EVENTLOG_VERSION).tar.gz
 EVENTLOG_SITE = https://my.balabit.com/downloads/eventlog/$(EVENTLOG_VERSION_MAJOR)
-EVENTLOG_LICENSE = BSD-3c
+EVENTLOG_LICENSE = BSD-3-Clause
 EVENTLOG_LICENSE_FILES = COPYING
 EVENTLOG_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/evtest/evtest.mk b/bsp/buildroot/package/evtest/evtest.mk
index 5ff2bf3d..d00d4cb6 100644
--- a/bsp/buildroot/package/evtest/evtest.mk
+++ b/bsp/buildroot/package/evtest/evtest.mk
@@ -6,7 +6,7 @@
 
 EVTEST_VERSION = 1.33
 EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot
-EVTEST_LICENSE = GPLv2+
+EVTEST_LICENSE = GPL-2.0+
 EVTEST_LICENSE_FILES = COPYING
 EVTEST_DEPENDENCIES = host-pkgconf
 # needed because source package contains no generated files
diff --git a/bsp/buildroot/package/execline/Config.in b/bsp/buildroot/package/execline/Config.in
new file mode 100644
index 00000000..7a2278fa
--- /dev/null
+++ b/bsp/buildroot/package/execline/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_EXECLINE
+	bool "execline"
+	depends on BR2_USE_MMU # skalibs
+	select BR2_PACKAGE_SKALIBS
+	help
+	  execline is a (non-interactive) scripting language, like sh;
+	  but its syntax is quite different from a traditional shell
+	  syntax. The execlineb program is meant to be used as an
+	  interpreter for a text file; the other commands are
+	  essentially useful inside an execlineb script.
+
+	  http://skarnet.org/software/execline/
diff --git a/bsp/buildroot/package/execline/execline.hash b/bsp/buildroot/package/execline/execline.hash
new file mode 100644
index 00000000..afead5cd
--- /dev/null
+++ b/bsp/buildroot/package/execline/execline.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 e4bb8fc8f20cca96f4bac9f0f74ebce5081b4b687bb11c79c843faf12507a64b  execline-2.3.0.4.tar.gz
+sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f  COPYING
diff --git a/bsp/buildroot/package/execline/execline.mk b/bsp/buildroot/package/execline/execline.mk
new file mode 100644
index 00000000..68131b8f
--- /dev/null
+++ b/bsp/buildroot/package/execline/execline.mk
@@ -0,0 +1,72 @@
+################################################################################
+#
+# execline
+#
+################################################################################
+
+EXECLINE_VERSION = 2.3.0.4
+EXECLINE_SITE = http://skarnet.org/software/execline
+EXECLINE_LICENSE = ISC
+EXECLINE_LICENSE_FILES = COPYING
+EXECLINE_INSTALL_STAGING = YES
+EXECLINE_DEPENDENCIES = skalibs
+
+EXECLINE_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define EXECLINE_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(EXECLINE_CONF_OPTS))
+endef
+
+define EXECLINE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define EXECLINE_REMOVE_STATIC_LIB_DIR
+	rm -rf $(TARGET_DIR)/usr/lib/execline
+endef
+
+EXECLINE_POST_INSTALL_TARGET_HOOKS += EXECLINE_REMOVE_STATIC_LIB_DIR
+
+define EXECLINE_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define EXECLINE_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+HOST_EXECLINE_DEPENDENCIES = host-skalibs
+
+# Set --shebangdir to /usr/bin, as this value is used by the host variant of
+# s6-rc when generating execline scripts for the target.
+HOST_EXECLINE_CONF_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--shebangdir=/usr/bin \
+	--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
+	--with-include=$(HOST_DIR)/include \
+	--with-dynlib=$(HOST_DIR)/lib \
+	--disable-static \
+	--enable-shared \
+	--disable-allstatic
+
+define HOST_EXECLINE_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_EXECLINE_CONF_OPTS))
+endef
+
+define HOST_EXECLINE_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_EXECLINE_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/exfat-utils/exfat-utils.hash b/bsp/buildroot/package/exfat-utils/exfat-utils.hash
index b40e632a..f0d6b642 100644
--- a/bsp/buildroot/package/exfat-utils/exfat-utils.hash
+++ b/bsp/buildroot/package/exfat-utils/exfat-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	6aa51926416b9d0977b456902f4c4cd10bcce4b2d160859a7a2fc9ca6bcbbb11	exfat-utils-1.2.4.tar.gz
+sha256 b96b6692cf92a629c9eca0fe8c782646e20479524c7d2a99b7e9b43c3cf8ac43  exfat-utils-1.2.6.tar.gz
diff --git a/bsp/buildroot/package/exfat-utils/exfat-utils.mk b/bsp/buildroot/package/exfat-utils/exfat-utils.mk
index 259c2dab..c1b5a935 100644
--- a/bsp/buildroot/package/exfat-utils/exfat-utils.mk
+++ b/bsp/buildroot/package/exfat-utils/exfat-utils.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-EXFAT_UTILS_VERSION = 1.2.4
+EXFAT_UTILS_VERSION = 1.2.6
 EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION)
-EXFAT_UTILS_LICENSE = GPLv3+
+EXFAT_UTILS_LICENSE = GPL-3.0+
 EXFAT_UTILS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/exfat/exfat.hash b/bsp/buildroot/package/exfat/exfat.hash
index cf3aab19..15b67f00 100644
--- a/bsp/buildroot/package/exfat/exfat.hash
+++ b/bsp/buildroot/package/exfat/exfat.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	9312d23a5d82543ad2e9ab7f0a0b471aea53eeb8eae664451c881b46d849756e	fuse-exfat-1.2.4.tar.gz
+sha256 e1105256d75860c0678f98bbae0b8fe465d4c96ed187b7035556097f152478e7  fuse-exfat-1.2.6.tar.gz
diff --git a/bsp/buildroot/package/exfat/exfat.mk b/bsp/buildroot/package/exfat/exfat.mk
index 84b6001d..f5ed13e2 100644
--- a/bsp/buildroot/package/exfat/exfat.mk
+++ b/bsp/buildroot/package/exfat/exfat.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-EXFAT_VERSION = 1.2.4
+EXFAT_VERSION = 1.2.6
 EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION)
 EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz
 EXFAT_DEPENDENCIES = libfuse host-pkgconf
-EXFAT_LICENSE = GPLv3+
+EXFAT_LICENSE = GPL-3.0+
 EXFAT_LICENSE_FILES = COPYING
 EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99
 
diff --git a/bsp/buildroot/package/exim/0001-Build-buildconfig-for-the-host.patch b/bsp/buildroot/package/exim/0001-Build-buildconfig-for-the-host.patch
index a926fbda..87eb5279 100644
--- a/bsp/buildroot/package/exim/0001-Build-buildconfig-for-the-host.patch
+++ b/bsp/buildroot/package/exim/0001-Build-buildconfig-for-the-host.patch
@@ -17,7 +17,7 @@ index 29a6ad3..420ba60 100644
 -	@echo "$(CC) buildconfig.c"
 -	$(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
 +	@echo "$(HOSTCC) buildconfig.c"
-+	$(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS)
++	$(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c
  
  
  # Target for the exicyclog utility script
diff --git a/bsp/buildroot/package/exim/Config.in b/bsp/buildroot/package/exim/Config.in
index 230ac86f..aa50a867 100644
--- a/bsp/buildroot/package/exim/Config.in
+++ b/bsp/buildroot/package/exim/Config.in
@@ -8,8 +8,9 @@ config BR2_PACKAGE_EXIM
 	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_BERKELEYDB
 	help
-	  Exim is a message transfer agent (MTA) developed at the University of
-	  Cambridge for use on Unix systems connected to the Internet.
+	  Exim is a message transfer agent (MTA) developed at the
+	  University of Cambridge for use on Unix systems connected to
+	  the Internet.
 
 	  http://www.exim.org/
 
diff --git a/bsp/buildroot/package/exim/exim.mk b/bsp/buildroot/package/exim/exim.mk
index 7cba8f3d..37eab501 100644
--- a/bsp/buildroot/package/exim/exim.mk
+++ b/bsp/buildroot/package/exim/exim.mk
@@ -7,7 +7,7 @@
 EXIM_VERSION = 4.89.1
 EXIM_SOURCE = exim-$(EXIM_VERSION).tar.xz
 EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4
-EXIM_LICENSE = GPLv2+
+EXIM_LICENSE = GPL-2.0+
 EXIM_LICENSE_FILES = LICENCE
 EXIM_DEPENDENCIES = pcre berkeleydb host-pkgconf
 
diff --git a/bsp/buildroot/package/exiv2/Config.in b/bsp/buildroot/package/exiv2/Config.in
index 8ca95ebc..acce81c5 100644
--- a/bsp/buildroot/package/exiv2/Config.in
+++ b/bsp/buildroot/package/exiv2/Config.in
@@ -1,11 +1,14 @@
-comment "exiv2 needs a toolchain w/ C++, wchar, dynamic library"
+comment "exiv2 needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library, threads"
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \
-		|| !BR2_USE_WCHAR
+		|| !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| BR2_TOOLCHAIN_USES_MUSL
 
 config BR2_PACKAGE_EXIV2
 	bool "exiv2"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_USES_MUSL # PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
 	depends on BR2_USE_WCHAR
 	help
 	  Exiv2 is a C++ library and a command line utility to manage
@@ -40,13 +43,9 @@ config BR2_PACKAGE_EXIV2_PNG
 config BR2_PACKAGE_EXIV2_XMP
 	bool "XMP support"
 	select BR2_PACKAGE_EXPAT
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Build with XMP support
 
-comment "xmp support needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
 config BR2_PACKAGE_EXIV2_LENSDATA
 	bool "Nikon lens name database"
 	depends on !BR2_PACKAGE_EXIV2_COMMERCIAL
diff --git a/bsp/buildroot/package/exiv2/exiv2.hash b/bsp/buildroot/package/exiv2/exiv2.hash
index b1e78d2c..e30cbfaa 100644
--- a/bsp/buildroot/package/exiv2/exiv2.hash
+++ b/bsp/buildroot/package/exiv2/exiv2.hash
@@ -1,4 +1,2 @@
-# From http://www.exiv2.org/download.html
-md5 258d4831b30f75a01e0234065c6c2806 exiv2-0.25.tar.gz
 # Locally calculated
-sha256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 exiv2-0.25.tar.gz
+sha256 290cb6208f143b9bd5074d790fc8924409f28e5813356c143d739a3311d8ad76  exiv2-910f3507795e1930ae216c9febee0bf9a88e99c0.tar.gz
diff --git a/bsp/buildroot/package/exiv2/exiv2.mk b/bsp/buildroot/package/exiv2/exiv2.mk
index 45f92891..32029bab 100644
--- a/bsp/buildroot/package/exiv2/exiv2.mk
+++ b/bsp/buildroot/package/exiv2/exiv2.mk
@@ -4,12 +4,16 @@
 #
 ################################################################################
 
-EXIV2_VERSION = 0.25
-EXIV2_SITE = http://www.exiv2.org
+EXIV2_VERSION = 910f3507795e1930ae216c9febee0bf9a88e99c0
+EXIV2_SITE = $(call github,Exiv2,exiv2,$(EXIV2_VERSION))
 EXIV2_INSTALL_STAGING = YES
 
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF
 
+# The following CMake variable disables a TRY_RUN call in the -pthread
+# test which is not allowed when cross-compiling.
+EXIV2_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
+
 ifeq ($(BR2_PACKAGE_EXIV2_LENSDATA),)
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_LENSDATA=OFF
 endif
@@ -20,7 +24,7 @@ EXIV2_LICENSE = commercial
 # of the translated texts.
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_COMMERCIAL=ON -DEXIV2_ENABLE_NLS=OFF
 else
-EXIV2_LICENSE = GPLv2+
+EXIV2_LICENSE = GPL-2.0+
 EXIV2_LICENSE_FILES = COPYING
 endif
 
@@ -38,7 +42,9 @@ else
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_XMP=OFF -DEXIV2_ENABLE_LIBXMP=OFF
 endif
 
-ifeq ($(BR2_ENABLE_LOCALE),y)
+EXIV2_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=ON
 else
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_NLS=OFF
diff --git a/bsp/buildroot/package/expat/expat.hash b/bsp/buildroot/package/expat/expat.hash
index f1e19193..945e1023 100644
--- a/bsp/buildroot/package/expat/expat.hash
+++ b/bsp/buildroot/package/expat/expat.hash
@@ -1,5 +1,7 @@
-# From https://sourceforge.net/projects/expat/files/expat/2.2.2/
-md5	1ede9a41223c78528b8c5d23e69a2667	expat-2.2.2.tar.bz2
-sha1	891cee988b38d5d66953f62f94c3150b8810a70a	expat-2.2.2.tar.bz2
-# Calculated based on the hashes above
-sha256	4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046	expat-2.2.2.tar.bz2
+# From https://sourceforge.net/projects/expat/files/expat/2.2.5/
+md5	789e297f547980fc9ecc036f9a070d49		expat-2.2.5.tar.bz2
+sha1	490659abd7d6c6d4cb4e60c945a15fbf081564f6	expat-2.2.5.tar.bz2
+
+# Locally calculated
+sha256	d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6	expat-2.2.5.tar.bz2
+sha256	46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76	COPYING
diff --git a/bsp/buildroot/package/expat/expat.mk b/bsp/buildroot/package/expat/expat.mk
index a78d326d..69c457da 100644
--- a/bsp/buildroot/package/expat/expat.mk
+++ b/bsp/buildroot/package/expat/expat.mk
@@ -4,25 +4,14 @@
 #
 ################################################################################
 
-EXPAT_VERSION = 2.2.2
+EXPAT_VERSION = 2.2.5
 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
 EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
 EXPAT_INSTALL_STAGING = YES
-EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib
-EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib
 EXPAT_DEPENDENCIES = host-pkgconf
 HOST_EXPAT_DEPENDENCIES = host-pkgconf
 EXPAT_LICENSE = MIT
 EXPAT_LICENSE_FILES = COPYING
 
-# Kernel versions older than 3.17 do not support getrandom()
-ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17),)
-EXPAT_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DXML_POOR_ENTROPY"
-endif
-
-# Make build succeed on host kernel older than 3.17. getrandom() will still
-# be used on newer kernels.
-HOST_EXPAT_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -DXML_POOR_ENTROPY"
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/expect/expect.hash b/bsp/buildroot/package/expect/expect.hash
new file mode 100644
index 00000000..c89f3239
--- /dev/null
+++ b/bsp/buildroot/package/expect/expect.hash
@@ -0,0 +1,4 @@
+# From https://sourceforge.net/projects/expect/files/Expect/5.45.3/expect5.45.3.tar.gz.SHA256
+sha256  c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9  expect5.45.3.tar.gz
+# Locally calculated
+sha256  b2415b17dc8d9a287f4509047ef5ac3436baef7ba7c50faef5222dcdf61a2bab  README
diff --git a/bsp/buildroot/package/expect/expect.mk b/bsp/buildroot/package/expect/expect.mk
index d78ff6c2..ccde33a7 100644
--- a/bsp/buildroot/package/expect/expect.mk
+++ b/bsp/buildroot/package/expect/expect.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-# Version 5.45.3
-EXPECT_VERSION = 2014-05-02
-EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect
+EXPECT_VERSION = 5.45.3
+EXPECT_SITE = https://sourceforge.net/projects/expect/files/Expect/$(EXPECT_VERSION)
+EXPECT_SOURCE = expect$(EXPECT_VERSION).tar.gz
 EXPECT_LICENSE = Public domain
 EXPECT_LICENSE_FILES = README
 
+# 0001-enable-cross-compilation.patch
 EXPECT_AUTORECONF = YES
 EXPECT_DEPENDENCIES = tcl
 EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix
diff --git a/bsp/buildroot/package/expedite/Config.in b/bsp/buildroot/package/expedite/Config.in
index 0bcf3434..fdfc6719 100644
--- a/bsp/buildroot/package/expedite/Config.in
+++ b/bsp/buildroot/package/expedite/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_EXPEDITE
 	depends on BR2_PACKAGE_EFL
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Expedite is the official Evas benchmark tool. It can test different
-	  engines, such as X11, XRender, OpenGL (also ES variant), SDL,
-	  DirectFB and so on. Its tests are quite extensive, trying to
-	  reproduce real world usage cases.
+	  Expedite is the official Evas benchmark tool. It can test
+	  different engines, such as X11, XRender, OpenGL (also ES
+	  variant), SDL, DirectFB and so on. Its tests are quite
+	  extensive, trying to reproduce real world usage cases.
 
 comment "expedite needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/expedite/expedite.hash b/bsp/buildroot/package/expedite/expedite.hash
index 85c4444e..828ee055 100644
--- a/bsp/buildroot/package/expedite/expedite.hash
+++ b/bsp/buildroot/package/expedite/expedite.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256 a8690a714c16d6b67e7fd6d70973e9805c3569a9131900b1feaf183220496831  expedite-ffa005ea3de26b4219f32c285cb1665bb1366163.tar.gz
+sha256 56e1dbd9826d932f0ef72a10dfdf32b6e0f680ab6830f8a8cfc60644ac69dbf1 expedite-e7b11dd328d9db82b49cde795944a721beaf0112.tar.gz
diff --git a/bsp/buildroot/package/expedite/expedite.mk b/bsp/buildroot/package/expedite/expedite.mk
index 0b2901d8..6bd4b007 100644
--- a/bsp/buildroot/package/expedite/expedite.mk
+++ b/bsp/buildroot/package/expedite/expedite.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-EXPEDITE_VERSION = ffa005ea3de26b4219f32c285cb1665bb1366163
+EXPEDITE_VERSION = e7b11dd328d9db82b49cde795944a721beaf0112
 EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git
 EXPEDITE_SITE_METHOD = git
-EXPEDITE_LICENSE = BSD-2c
+EXPEDITE_LICENSE = BSD-2-Clause
 EXPEDITE_LICENSE_FILES = COPYING
 
 EXPEDITE_DEPENDENCIES = host-efl host-pkgconf efl
diff --git a/bsp/buildroot/package/ezxml/Config.in b/bsp/buildroot/package/ezxml/Config.in
index 285c7a5d..8a1643b1 100644
--- a/bsp/buildroot/package/ezxml/Config.in
+++ b/bsp/buildroot/package/ezxml/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_EZXML
 	bool "ezxml"
 	help
-	  ezXML is a XML parser C library that is simple and easy to use.
+	  ezXML is a XML parser C library that is simple and easy to
+	  use.
 
 	  http://ezxml.sf.net
diff --git a/bsp/buildroot/package/f2fs-tools/Config.in b/bsp/buildroot/package/f2fs-tools/Config.in
index ab81734d..e3730963 100644
--- a/bsp/buildroot/package/f2fs-tools/Config.in
+++ b/bsp/buildroot/package/f2fs-tools/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_F2FS_TOOLS
 	bool "f2fs-tools"
+	depends on BR2_USE_WCHAR # uses wchar_t
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	depends on BR2_USE_WCHAR # uses wchar_t
 	help
 	  Tools for Flash-Friendly File System (F2FS)
 
-	  http://sourceforge.net/projects/f2fs-tools/
+	  https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
 
 comment "f2fs-tools needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/f2fs-tools/f2fs-tools.hash b/bsp/buildroot/package/f2fs-tools/f2fs-tools.hash
new file mode 100644
index 00000000..36c3b115
--- /dev/null
+++ b/bsp/buildroot/package/f2fs-tools/f2fs-tools.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 aefd2a67e8ddf9db92145dde41b4a697d1c498ff2e113fbfd26ce1efa6cc3f2d  f2fs-tools-v1.8.0.tar.gz
diff --git a/bsp/buildroot/package/f2fs-tools/f2fs-tools.mk b/bsp/buildroot/package/f2fs-tools/f2fs-tools.mk
index d3956c44..9b827df0 100644
--- a/bsp/buildroot/package/f2fs-tools/f2fs-tools.mk
+++ b/bsp/buildroot/package/f2fs-tools/f2fs-tools.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-F2FS_TOOLS_VERSION = v1.6.1
+F2FS_TOOLS_VERSION = v1.8.0
 F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git
 F2FS_TOOLS_SITE_METHOD = git
 F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no
@@ -12,7 +12,7 @@ F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux
 # GIT version, shipped without configure
 F2FS_TOOLS_AUTORECONF = YES
 F2FS_TOOLS_INSTALL_STAGING = YES
-F2FS_TOOLS_LICENSE = GPLv2
+F2FS_TOOLS_LICENSE = GPL-2.0
 F2FS_TOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/faad2/0001-getopt-fix-strncmp-declaration.patch b/bsp/buildroot/package/faad2/0001-getopt-fix-strncmp-declaration.patch
deleted file mode 100644
index 0e5f27e5..00000000
--- a/bsp/buildroot/package/faad2/0001-getopt-fix-strncmp-declaration.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6787914efad562e4097a153988109c5c7158abf7 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Wed, 16 Aug 2017 13:35:57 +0300
-Subject: [PATCH] getopt: fix strncmp() declaration
-
-The strncmp() declaration does not conform with the standard as to the
-type of the 'n' parameter. Fix this to avoid the following build failure
-with musl libc:
-
-n file included from main.c:61:0:
-getopt.c:175:13: error: conflicting types for 'strncmp'
- extern int  strncmp(const char *s1, const char *s2, unsigned int n);
-             ^~~~~~~
-In file included from main.c:49:0:
-.../host/x86_64-buildroot-linux-musl/sysroot/usr/include/string.h:38:5: note: previous declaration of 'strncmp' was here
- int strncmp (const char *, const char *, size_t);
-     ^~~~~~~
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: https://sourceforge.net/p/faac/bugs/217/
-
- frontend/getopt.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/frontend/getopt.c b/frontend/getopt.c
-index 185d49b804dd..40c7a2242551 100644
---- a/frontend/getopt.c
-+++ b/frontend/getopt.c
-@@ -172,7 +172,7 @@ static enum
- #if __STDC__ || defined(PROTO)
- extern char *getenv(const char *name);
- extern int  strcmp (const char *s1, const char *s2);
--extern int  strncmp(const char *s1, const char *s2, unsigned int n);
-+extern int  strncmp(const char *s1, const char *s2, size_t n);
- 
- static int my_strlen(const char *s);
- static char *my_index (const char *str, int chr);
--- 
-2.14.1
-
diff --git a/bsp/buildroot/package/faad2/faad2.hash b/bsp/buildroot/package/faad2/faad2.hash
index d298e909..2c6acee3 100644
--- a/bsp/buildroot/package/faad2/faad2.hash
+++ b/bsp/buildroot/package/faad2/faad2.hash
@@ -1,4 +1,6 @@
 # From http://sourceforge.net/projects/faac/files/faad2-src/faad2-2.8.0/ (used by upstream):
-sha1	a5caa71cd915acd502d96cba56f38296277f2350  faad2-2.8.1.tar.bz2
+md5	28f6116efdbe9378269f8a6221767d1f  faad2-2.8.8.tar.gz
+sha1	0d49c516d4a83c39053a9bd214fddba72cbc34ad  faad2-2.8.8.tar.gz
 # Locally computed
-sha256  f4042496f6b0a60f5ded6acd11093230044ef8a2fd965360c1bbd5b58780933d  faad2-2.8.1.tar.bz2
+sha256  985c3fadb9789d2815e50f4ff714511c79c2710ac27a4aaaf5c0c2662141426d  faad2-2.8.8.tar.gz
+sha256  d3baf3a54943cf12a994c85867a18dec84f810901b2f2878ddfd77efcc3c150f  COPYING
diff --git a/bsp/buildroot/package/faad2/faad2.mk b/bsp/buildroot/package/faad2/faad2.mk
index 67c52933..27daadfc 100644
--- a/bsp/buildroot/package/faad2/faad2.mk
+++ b/bsp/buildroot/package/faad2/faad2.mk
@@ -5,13 +5,10 @@
 ################################################################################
 
 FAAD2_VERSION_MAJOR = 2.8
-FAAD2_VERSION = $(FAAD2_VERSION_MAJOR).1
+FAAD2_VERSION = $(FAAD2_VERSION_MAJOR).8
 FAAD2_SITE = http://downloads.sourceforge.net/project/faac/faad2-src/faad2-$(FAAD2_VERSION_MAJOR).0
-FAAD2_SOURCE = faad2-$(FAAD2_VERSION).tar.bz2
-FAAD2_LICENSE = GPLv2
+FAAD2_LICENSE = GPL-2.0
 FAAD2_LICENSE_FILES = COPYING
-# No configure script in upstream tarball
-FAAD2_AUTORECONF = YES
 # frontend/faad calls frexp()
 FAAD2_CONF_ENV = LIBS=-lm
 FAAD2_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/faifa/Config.in b/bsp/buildroot/package/faifa/Config.in
index de2cc797..753abc67 100644
--- a/bsp/buildroot/package/faifa/Config.in
+++ b/bsp/buildroot/package/faifa/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_FAIFA
 	bool "faifa"
-	select BR2_PACKAGE_LIBPCAP
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBPCAP
 	help
 	  Faifa can configure any Intellon-based Power Line
 	  Communication device using Intellon INT5000 and INT6000
diff --git a/bsp/buildroot/package/faifa/faifa.mk b/bsp/buildroot/package/faifa/faifa.mk
index a56a8c03..af7a1741 100644
--- a/bsp/buildroot/package/faifa/faifa.mk
+++ b/bsp/buildroot/package/faifa/faifa.mk
@@ -8,7 +8,7 @@ FAIFA_VERSION = v0.1
 FAIFA_SITE = $(call github,ffainelli,faifa,$(FAIFA_VERSION))
 FAIFA_INSTALL_STAGING = YES
 FAIFA_DEPENDENCIES = libpcap host-autoconf
-FAIFA_LICENSE = BSD-3c
+FAIFA_LICENSE = BSD-3-Clause
 FAIFA_LICENSE_FILES = COPYING
 
 FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION)
diff --git a/bsp/buildroot/package/fakedate/fakedate b/bsp/buildroot/package/fakedate/fakedate
index 4a9b9b5e..a64d9b9c 100755
--- a/bsp/buildroot/package/fakedate/fakedate
+++ b/bsp/buildroot/package/fakedate/fakedate
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # vim: set sw=4 expandtab:
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,18 +18,12 @@
 # Copyright (C) 2016 Jérôme Pouiller <jezz@sysmic.org>
 #
 
-# Sanity check
-if ! readlink -f "$0" | grep -q fakedate; then
-    echo "fakedate: Please name this script \`fakedate'"
-    exit 1
-fi
-
 DATE_BIN=false
 # Do not call `date' directly since it will produce an infinite recursion.
 # Instead, find path of true `date' binary.
 for P in `echo $PATH | tr ':' ' '`; do
     if [ -x "$P/date" ]; then
-        if readlink -f "$P/date" | grep -qv fakedate; then
+        if ! [ "$P/date" -ef "$0" ]; then
             DATE_BIN="$P/date"
             break;
         fi
@@ -50,8 +44,8 @@ if [ -n "$SOURCE_DATE_EPOCH" ]; then
     done
     if [ $FORCE_EPOCH -eq 1 ]; then
         echo "date: Warning: using \$SOURCE_DATE_EPOCH instead of true time" >&2
-        exec $DATE_BIN -d "@$SOURCE_DATE_EPOCH" "$@"
+        ARGS="-d @$SOURCE_DATE_EPOCH"
     fi
 fi
 
-exec $DATE_BIN "$@"
+exec $DATE_BIN $ARGS "$@"
diff --git a/bsp/buildroot/package/fakedate/fakedate.mk b/bsp/buildroot/package/fakedate/fakedate.mk
index 61d4bd70..99ea748e 100644
--- a/bsp/buildroot/package/fakedate/fakedate.mk
+++ b/bsp/buildroot/package/fakedate/fakedate.mk
@@ -5,11 +5,10 @@
 ################################################################################
 
 # source included in buildroot
-HOST_FAKEDATE_LICENSE = GPLv2+
+HOST_FAKEDATE_LICENSE = GPL-2.0+
 
 define HOST_FAKEDATE_INSTALL_CMDS
-	$(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/usr/bin/fakedate
-	ln -sfn fakedate $(HOST_DIR)/usr/bin/date
+	$(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/bin/date
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/fakeroot/fakeroot.hash b/bsp/buildroot/package/fakeroot/fakeroot.hash
index f0d436e5..d1d959df 100644
--- a/bsp/buildroot/package/fakeroot/fakeroot.hash
+++ b/bsp/buildroot/package/fakeroot/fakeroot.hash
@@ -2,3 +2,5 @@
 sha1	367040df07043edb630942b21939e493f3fad888	fakeroot_1.20.2.orig.tar.bz2
 # Calculated based on the hash above
 sha256	7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c	fakeroot_1.20.2.orig.tar.bz2
+# License files, locally calculated
+sha256	fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7	COPYING
diff --git a/bsp/buildroot/package/fakeroot/fakeroot.mk b/bsp/buildroot/package/fakeroot/fakeroot.mk
index 731b06a5..4aa27a1b 100644
--- a/bsp/buildroot/package/fakeroot/fakeroot.mk
+++ b/bsp/buildroot/package/fakeroot/fakeroot.mk
@@ -16,7 +16,7 @@ HOST_FAKEROOT_CONF_ENV = \
 	ac_cv_header_sys_capability_h=no \
 	ac_cv_func_capset=no
 
-FAKEROOT_LICENSE = GPLv3+
+FAKEROOT_LICENSE = GPL-3.0+
 FAKEROOT_LICENSE_FILES = COPYING
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/faketime/0002-src-Makefile-disable-Werror.patch b/bsp/buildroot/package/faketime/0002-src-Makefile-disable-Werror.patch
new file mode 100644
index 00000000..e1e3b321
--- /dev/null
+++ b/bsp/buildroot/package/faketime/0002-src-Makefile-disable-Werror.patch
@@ -0,0 +1,32 @@
+From bcde6e6f34c3cf78a254315c5caa530db91802fb Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Thu, 17 May 2018 23:41:03 +0200
+Subject: [PATCH] src/Makefile: disable -Werror
+
+gcc 8.x has enabled additional warnings that break the build due to
+-Werror, so let's drop -Werror for now. A set of patches has been
+submitted upstream (https://github.com/wolfcw/libfaketime/pull/161) to
+properly fix the gcc 8.x issues, but in the mean time, disabling
+-Werror is a simpler option.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index bbbd476..6b0d2cd 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -67,7 +67,7 @@ INSTALL ?= install
+ PREFIX ?= /usr/local
+ LIBDIRNAME ?= /lib/faketime
+ 
+-CFLAGS += -std=gnu99 -Wall -Wextra -Werror -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
++CFLAGS += -std=gnu99 -Wall -Wextra -Wno-nonnull-compare -DFAKE_STAT -DFAKE_SLEEP -DFAKE_TIMERS -DFAKE_INTERNAL_CALLS -fPIC -DPREFIX='"'$(PREFIX)'"' -DLIBDIRNAME='"'$(LIBDIRNAME)'"'
+ LIB_LDFLAGS += -shared
+ LDFLAGS += -Wl,--version-script=libfaketime.map -lpthread
+ LDADD += -ldl -lm -lrt
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/faketime/faketime.mk b/bsp/buildroot/package/faketime/faketime.mk
index 292fe175..6c88a71a 100644
--- a/bsp/buildroot/package/faketime/faketime.mk
+++ b/bsp/buildroot/package/faketime/faketime.mk
@@ -6,15 +6,15 @@
 
 FAKETIME_VERSION = v0.9.6
 FAKETIME_SITE = $(call github,wolfcw,libfaketime,$(FAKETIME_VERSION))
-FAKETIME_LICENSE = GPLv2
+FAKETIME_LICENSE = GPL-2.0
 FAKETIME_LICENSE_FILES = COPYING
 
 define HOST_FAKETIME_BUILD_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)
 endef
 
 define HOST_FAKETIME_INSTALL_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/fan-ctrl/fan-ctrl.mk b/bsp/buildroot/package/fan-ctrl/fan-ctrl.mk
index 42322861..53533a8a 100644
--- a/bsp/buildroot/package/fan-ctrl/fan-ctrl.mk
+++ b/bsp/buildroot/package/fan-ctrl/fan-ctrl.mk
@@ -8,7 +8,7 @@
 FAN_CTRL_VERSION = 1.3
 FAN_CTRL_SOURCE = fan-ctrl.c?revision=$(FAN_CTRL_VERSION)
 FAN_CTRL_SITE = http://fan-ctrl.cvs.sourceforge.net/viewvc/fan-ctrl/fan-ctrl
-FAN_CTRL_LICENSE = GPLv2+
+FAN_CTRL_LICENSE = GPL-2.0+
 FAN_CTRL_LICENSE_FILES = fan-ctrl.c
 
 define FAN_CTRL_EXTRACT_CMDS
diff --git a/bsp/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch b/bsp/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch
new file mode 100644
index 00000000..88c1953d
--- /dev/null
+++ b/bsp/buildroot/package/fastd/0002-CMakeList-do-not-overwrite-module-path.patch
@@ -0,0 +1,56 @@
+From a925a4cab1b722a2a24b0c1d2a1925f3b766de61 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Thu, 2 Mar 2017 21:43:39 +0100
+Subject: [PATCH] CMakeList: do not overwrite module path
+
+Currently, the CMakeList.txt completely overwrites the CMAKE_MODULE_PATH
+variable.
+
+This is problematic when an upper-layer buildsystem wants to set its own
+module path to use custom modules.
+
+For example, Buldroot [0] provides a custom platform description [1] to fix
+cross-compilation issue. Overwriting the module path means that this
+custom platform description is not found [2].
+
+Providing such a custom platform description is what the upstream cmake
+devs suggest [3], quoting:
+
+    If a toolchain file specifies CMAKE_SYSTEM_NAME such that a custom
+    `Platform/MySystem.cmake` file is loaded then the latter can set
+    them [*] as needed for the target platform.
+
+[*] offending settings causing RPATH issues during cross-compilation.
+
+So we need to append our source tree to the module path, not replace it
+blindly.
+
+[0] https://buildroot.org/
+[1] https://git.buildroot.org/buildroot/tree/support/misc/Buildroot.cmake
+[2] http://autobuild.buildroot.net/results/69f/69fb2e3b549a069e2898506db918423e6742c589/build-end.log
+[3] http://public.kitware.com/pipermail/cmake/2017-February/065063.html
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Patch applied upstream:
+https://git.universe-factory.net/fastd/commit/?id=a925a4cab1b722a2a24b0c1d2a1925f3b766de61
+
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61689b1..2c9c61a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8.8)
+ 
+-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
++list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ cmake_policy(SET CMP0017 OLD) # Prefer modules in our module directory
+ 
+ project(FASTD C ASM)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch b/bsp/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
new file mode 100644
index 00000000..854b3e74
--- /dev/null
+++ b/bsp/buildroot/package/fastd/0003-cipher-remove-aes128-ctr-NaCl-implementation.patch
@@ -0,0 +1,137 @@
+From 4b8c4f54bbd70849fc91679bea44b4e1dfb0526d Mon Sep 17 00:00:00 2001
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Wed, 18 Oct 2017 20:11:30 +0200
+Subject: [PATCH] cipher: remove aes128-ctr NaCl implementation
+
+New versions of libsodium have dropped support for aes128-ctr. AES support
+is only available with OpenSSL now.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit 4b8c4f54bb
+
+ doc/source/manual/config.rst                       |  1 -
+ src/crypto/cipher/aes128_ctr/CMakeLists.txt        |  1 -
+ src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt   |  6 --
+ .../aes128_ctr/nacl/cipher_aes128_ctr_nacl.c       | 76 ----------------------
+ 4 files changed, 84 deletions(-)
+ delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+ delete mode 100644 src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
+
+diff --git a/doc/source/manual/config.rst b/doc/source/manual/config.rst
+index 0abebeb4c245..94d7a9495ef0 100644
+--- a/doc/source/manual/config.rst
++++ b/doc/source/manual/config.rst
+@@ -70,7 +70,6 @@ Example config:
+   * ``aes128-ctr``: AES128 in counter mode
+ 
+     - ``openssl``: Use implementation from OpenSSL's libcrypto
+-    - ``nacl``: Use implementation from NaCl or libsodium
+ 
+   * ``null``: No encryption (for authenticated-only methods using composed_gmac)
+ 
+diff --git a/src/crypto/cipher/aes128_ctr/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/CMakeLists.txt
+index 0588fed798e2..58e8c6b3371c 100644
+--- a/src/crypto/cipher/aes128_ctr/CMakeLists.txt
++++ b/src/crypto/cipher/aes128_ctr/CMakeLists.txt
+@@ -1,3 +1,2 @@
+ fastd_cipher(aes128-ctr aes128_ctr.c)
+ add_subdirectory(openssl)
+-add_subdirectory(nacl)
+diff --git a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt b/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
+deleted file mode 100644
+index 676aa5d48ec4..000000000000
+--- a/src/crypto/cipher/aes128_ctr/nacl/CMakeLists.txt
++++ /dev/null
+@@ -1,6 +0,0 @@
+-fastd_cipher_impl(aes128-ctr nacl
+-  cipher_aes128_ctr_nacl.c
+-)
+-fastd_cipher_impl_include_directories(aes128-ctr nacl ${NACL_INCLUDE_DIRS})
+-fastd_cipher_impl_link_libraries(aes128-ctr nacl ${NACL_LIBRARIES})
+-fastd_cipher_impl_require(aes128-ctr nacl NACL)
+diff --git a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c b/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
+deleted file mode 100644
+index ead632640414..000000000000
+--- a/src/crypto/cipher/aes128_ctr/nacl/cipher_aes128_ctr_nacl.c
++++ /dev/null
+@@ -1,76 +0,0 @@
+-/*
+-  Copyright (c) 2012-2016, Matthias Schiffer <mschiffer@universe-factory.net>
+-  All rights reserved.
+-
+-  Redistribution and use in source and binary forms, with or without
+-  modification, are permitted provided that the following conditions are met:
+-
+-    1. Redistributions of source code must retain the above copyright notice,
+-       this list of conditions and the following disclaimer.
+-    2. Redistributions in binary form must reproduce the above copyright notice,
+-       this list of conditions and the following disclaimer in the documentation
+-       and/or other materials provided with the distribution.
+-
+-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-*/
+-
+-/**
+-   \file
+-
+-   The aes128-ctr implementation from NaCl
+-*/
+-
+-
+-#include "../../../../crypto.h"
+-#include "../../../../alloc.h"
+-
+-#include <crypto_stream_aes128ctr.h>
+-
+-
+-/** The cipher state */
+-struct __attribute__((aligned(16))) fastd_cipher_state {
+-	uint8_t d[crypto_stream_aes128ctr_BEFORENMBYTES] __attribute__((aligned(16))); /**< The unpacked AES key */
+-};
+-
+-
+-/** Initializes the cipher state */
+-static fastd_cipher_state_t * aes128_ctr_init(const uint8_t *key) {
+-	fastd_block128_t k;
+-	memcpy(k.b, key, sizeof(fastd_block128_t));
+-
+-	fastd_cipher_state_t *state = fastd_new_aligned(fastd_cipher_state_t, 16);
+-	crypto_stream_aes128ctr_beforenm(state->d, k.b);
+-
+-	return state;
+-}
+-
+-/** XORs data with the aes128-ctr cipher stream */
+-static bool aes128_ctr_crypt(const fastd_cipher_state_t *state, fastd_block128_t *out, const fastd_block128_t *in, size_t len, const uint8_t *iv) {
+-	crypto_stream_aes128ctr_xor_afternm(out->b, in->b, len, iv, state->d);
+-	return true;
+-}
+-
+-/** Frees the cipher state */
+-static void aes128_ctr_free(fastd_cipher_state_t *state) {
+-	if (state) {
+-		secure_memzero(state, sizeof(*state));
+-		free(state);
+-	}
+-}
+-
+-
+-/** The nacl aes128-ctr implementation */
+-const fastd_cipher_t fastd_cipher_aes128_ctr_nacl = {
+-	.init = aes128_ctr_init,
+-	.crypt = aes128_ctr_crypt,
+-	.free = aes128_ctr_free,
+-};
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/fastd/Config.in b/bsp/buildroot/package/fastd/Config.in
index 546d4494..47c76b5a 100644
--- a/bsp/buildroot/package/fastd/Config.in
+++ b/bsp/buildroot/package/fastd/Config.in
@@ -16,8 +16,8 @@ if BR2_PACKAGE_FASTD
 config BR2_PACKAGE_FASTD_STATUS_SOCKET
 	bool "status socket support"
 	default y
-	select BR2_PACKAGE_JSON_C
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
+	select BR2_PACKAGE_JSON_C
 	help
 	  Enable support for a socket to get fastd's status.
 
diff --git a/bsp/buildroot/package/fastd/fastd.mk b/bsp/buildroot/package/fastd/fastd.mk
index 0e510db8..e67acdbf 100644
--- a/bsp/buildroot/package/fastd/fastd.mk
+++ b/bsp/buildroot/package/fastd/fastd.mk
@@ -7,7 +7,7 @@
 FASTD_VERSION = 18
 FASTD_SITE = https://projects.universe-factory.net/attachments/download/86
 FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz
-FASTD_LICENSE = BSD-2c
+FASTD_LICENSE = BSD-2-Clause
 FASTD_LICENSE_FILES = COPYRIGHT
 FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON
 FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium libcap
diff --git a/bsp/buildroot/package/fb-test-app/fb-test-app.mk b/bsp/buildroot/package/fb-test-app/fb-test-app.mk
index 9cd0aece..1ab7b2f2 100644
--- a/bsp/buildroot/package/fb-test-app/fb-test-app.mk
+++ b/bsp/buildroot/package/fb-test-app/fb-test-app.mk
@@ -6,7 +6,7 @@
 
 FB_TEST_APP_VERSION = rosetta-1.1.0
 FB_TEST_APP_SITE = $(call github,prpplague,fb-test-app,$(FB_TEST_APP_VERSION))
-FB_TEST_APP_LICENSE = GPLv2
+FB_TEST_APP_LICENSE = GPL-2.0
 FB_TEST_APP_LICENSE_FILES = COPYING
 
 define FB_TEST_APP_BUILD_CMDS
diff --git a/bsp/buildroot/package/fbdump/Config.in b/bsp/buildroot/package/fbdump/Config.in
index 982448dd..c102fe27 100644
--- a/bsp/buildroot/package/fbdump/Config.in
+++ b/bsp/buildroot/package/fbdump/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_FBDUMP
 	bool "fbdump (Framebuffer Capture Tool)"
 	help
-	  fbdump is a simple tool to capture snapshots from the Linux kernel
-	  framebuffer  device and write them out as a PPM file. Currently,
-	  most packed-pixel framebuffer formats and the vga16 framebuffer
-	  are supported.
+	  fbdump is a simple tool to capture snapshots from the Linux
+	  kernel framebuffer  device and write them out as a PPM file.
+	  Currently, most packed-pixel framebuffer formats and the vga16
+	  framebuffer are supported.
 
 	  http://www.rcdrummond.net/fbdump
diff --git a/bsp/buildroot/package/fbdump/fbdump.mk b/bsp/buildroot/package/fbdump/fbdump.mk
index 9295acd0..301dd4fa 100644
--- a/bsp/buildroot/package/fbdump/fbdump.mk
+++ b/bsp/buildroot/package/fbdump/fbdump.mk
@@ -6,7 +6,7 @@
 
 FBDUMP_VERSION = 0.4.2
 FBDUMP_SITE = http://www.rcdrummond.net/fbdump
-FBDUMP_LICENSE = GPLv2
+FBDUMP_LICENSE = GPL-2.0
 FBDUMP_LICENSE_FILES = COPYING
 
 # The VGA16 specific feature of fbdump doesn't make much sense outside
diff --git a/bsp/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch b/bsp/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch
new file mode 100644
index 00000000..8cff7ef8
--- /dev/null
+++ b/bsp/buildroot/package/fbgrab/0100-fix-pixfmt-report.patch
@@ -0,0 +1,24 @@
+Fix pixel format report
+
+When fbgrab tells about the framebuffer pixel format, blue and green
+are accidentally swapped in 'length' and 'msb_right' columns. Let's
+order everything as RGB.
+
+Upstream-Status: Submitted [Gunnar Monell <gmo@linux.nu>]
+
+Signed-off-by: Timo Ketola <timo.ketola@exertus.fi>
+
+diff -u a/fbgrab.c b/fbgrab.c
+--- a/fbgrab.c	2018-03-07 11:42:04.739250433 +0200
++++ b/fbgrab.c	2018-03-07 11:43:26.128043877 +0200
+@@ -169,8 +169,8 @@
+         fprintf(stderr, "bits_per_pixel: %i\n", fb_varinfo_p->bits_per_pixel);
+         fprintf(stderr, "grayscale: %s\n", fb_varinfo_p->grayscale ? "true" : "false");
+         fprintf(stderr, "red:   offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->red.offset, fb_varinfo_p->red.length, fb_varinfo_p->red.msb_right);
+-        fprintf(stderr, "blue:  offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right);
+-        fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right);
++        fprintf(stderr, "green: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->green.offset, fb_varinfo_p->green.length, fb_varinfo_p->green.msb_right);
++        fprintf(stderr, "blue:  offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->blue.offset, fb_varinfo_p->blue.length, fb_varinfo_p->blue.msb_right);
+         fprintf(stderr, "alpha: offset: %i, length: %i, msb_right: %i\n", fb_varinfo_p->transp.offset, fb_varinfo_p->transp.length, fb_varinfo_p->transp.msb_right);
+         fprintf(stderr, "pixel format: %s\n", fb_varinfo_p->nonstd == 0 ? "standard" : "non-standard");
+     }
diff --git a/bsp/buildroot/package/fbgrab/Config.in b/bsp/buildroot/package/fbgrab/Config.in
index f3b29d9f..d1e9e69b 100644
--- a/bsp/buildroot/package/fbgrab/Config.in
+++ b/bsp/buildroot/package/fbgrab/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_FBGRAB
 	bool "fbgrab"
 	select BR2_PACKAGE_LIBPNG
 	help
-	  FBGrab is a framebuffer screenshot program, capturing the linux
-	  frambuffer and converting it to a png-picture.
+	  FBGrab is a framebuffer screenshot program, capturing the
+	  linux frambuffer and converting it to a png-picture.
 
 	  http://fbgrab.monells.se/
diff --git a/bsp/buildroot/package/fbgrab/fbgrab.mk b/bsp/buildroot/package/fbgrab/fbgrab.mk
index 5cdf0282..d81a5ee2 100644
--- a/bsp/buildroot/package/fbgrab/fbgrab.mk
+++ b/bsp/buildroot/package/fbgrab/fbgrab.mk
@@ -7,7 +7,7 @@
 FBGRAB_VERSION = 1.3
 FBGRAB_SITE = http://fbgrab.monells.se
 FBGRAB_DEPENDENCIES = libpng
-FBGRAB_LICENSE = GPLv2
+FBGRAB_LICENSE = GPL-2.0
 FBGRAB_LICENSE_FILES = COPYING
 
 define FBGRAB_BUILD_CMDS
diff --git a/bsp/buildroot/package/fbset/Config.in b/bsp/buildroot/package/fbset/Config.in
index c3f8d0ba..b4ef41f0 100644
--- a/bsp/buildroot/package/fbset/Config.in
+++ b/bsp/buildroot/package/fbset/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_FBSET
 	bool "fbset"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  Fbset is a system utility to show or change the settings of the frame
-	  buffer device. The frame buffer device provides a simple and unique
-	  interface to access different kinds of graphic displays.
+	  Fbset is a system utility to show or change the settings of
+	  the frame buffer device. The frame buffer device provides a
+	  simple and unique interface to access different kinds of
+	  graphic displays.
 
 	  http://users.telenet.be/geertu/Linux/fbdev/
diff --git a/bsp/buildroot/package/fbset/fbset.mk b/bsp/buildroot/package/fbset/fbset.mk
index 16581c41..d6ee104a 100644
--- a/bsp/buildroot/package/fbset/fbset.mk
+++ b/bsp/buildroot/package/fbset/fbset.mk
@@ -7,7 +7,7 @@
 FBSET_VERSION = 2.1
 FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
 FBSET_DEPENDENCIES = host-bison host-flex
-FBSET_LICENSE = GPLv2
+FBSET_LICENSE = GPL-2.0
 
 # Make sure full fbset wins over busybox fbset
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
diff --git a/bsp/buildroot/package/fbterm/fbterm.mk b/bsp/buildroot/package/fbterm/fbterm.mk
index be3cbe24..712d4f97 100644
--- a/bsp/buildroot/package/fbterm/fbterm.mk
+++ b/bsp/buildroot/package/fbterm/fbterm.mk
@@ -6,7 +6,7 @@
 
 FBTERM_VERSION = 1.7.0
 FBTERM_SITE = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm
-FBTERM_LICENSE = GPLv2+
+FBTERM_LICENSE = GPL-2.0+
 FBTERM_LICENSE_FILES = COPYING
 FBTERM_DEPENDENCIES = fontconfig liberation
 
diff --git a/bsp/buildroot/package/fbtft/fbtft.mk b/bsp/buildroot/package/fbtft/fbtft.mk
index 913627df..b935e741 100644
--- a/bsp/buildroot/package/fbtft/fbtft.mk
+++ b/bsp/buildroot/package/fbtft/fbtft.mk
@@ -6,6 +6,6 @@
 
 FBTFT_VERSION = 274035404701245e7491c0c6471c5b72ade4d491
 FBTFT_SITE = $(call github,notro,fbtft,$(FBTFT_VERSION))
-FBTFT_LICENSE = GPLv2
+FBTFT_LICENSE = GPL-2.0
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/fbv/Config.in b/bsp/buildroot/package/fbv/Config.in
index 3160a855..22062763 100644
--- a/bsp/buildroot/package/fbv/Config.in
+++ b/bsp/buildroot/package/fbv/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_FBV
 	bool "fbv"
 	help
-	  fbv is a very simple graphic file viewer for the framebuffer console,
-	  capable of displaying GIF, JPEG, PNG and BMP files using libungif,
-	  libjpeg and libpng.
+	  fbv is a very simple graphic file viewer for the framebuffer
+	  console, capable of displaying GIF, JPEG, PNG and BMP files
+	  using libungif, libjpeg and libpng.
 
 	  http://freshmeat.net/projects/fbv/
 
diff --git a/bsp/buildroot/package/fbv/fbv.mk b/bsp/buildroot/package/fbv/fbv.mk
index d12b9f45..a69e4ad5 100644
--- a/bsp/buildroot/package/fbv/fbv.mk
+++ b/bsp/buildroot/package/fbv/fbv.mk
@@ -7,7 +7,7 @@
 FBV_VERSION = 1.0b
 FBV_SITE = http://s-tech.elsat.net.pl/fbv
 
-FBV_LICENSE = GPLv2
+FBV_LICENSE = GPL-2.0
 FBV_LICENSE_FILES = COPYING
 
 ### image format dependencies and configure options
diff --git a/bsp/buildroot/package/fconfig/fconfig.mk b/bsp/buildroot/package/fconfig/fconfig.mk
index 509fc2c7..1e6fbb40 100644
--- a/bsp/buildroot/package/fconfig/fconfig.mk
+++ b/bsp/buildroot/package/fconfig/fconfig.mk
@@ -8,7 +8,7 @@ FCONFIG_VERSION = 20080329
 # Real upstream location has been disabled
 # FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig
 FCONFIG_SITE = http://sources.buildroot.net
-FCONFIG_LICENSE = GPLv2+
+FCONFIG_LICENSE = GPL-2.0+
 FCONFIG_LICENSE_FILES = fconfig.c
 
 define FCONFIG_BUILD_CMDS
diff --git a/bsp/buildroot/package/fdk-aac/Config.in b/bsp/buildroot/package/fdk-aac/Config.in
index f51c5ab1..111de41c 100644
--- a/bsp/buildroot/package/fdk-aac/Config.in
+++ b/bsp/buildroot/package/fdk-aac/Config.in
@@ -10,9 +10,9 @@ config BR2_PACKAGE_FDK_AAC
 	depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec")
-	  is software that implements the MPEG Advanced Audio Coding ("AAC")
-	  encoding and decoding scheme for digital audio
+	  The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC
+	  Codec") is software that implements the MPEG Advanced Audio
+	  Coding ("AAC") encoding and decoding scheme for digital audio
 
 	  http://sourceforge.net/projects/opencore-amr/files/fdk-aac/
 
diff --git a/bsp/buildroot/package/fdk-aac/fdk-aac.hash b/bsp/buildroot/package/fdk-aac/fdk-aac.hash
index 28a1eeeb..cd2e8684 100644
--- a/bsp/buildroot/package/fdk-aac/fdk-aac.hash
+++ b/bsp/buildroot/package/fdk-aac/fdk-aac.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  5910fe788677ca13532e3f47b7afaa01d72334d46a2d5e1d1f080f1173ff15ab  fdk-aac-0.1.4.tar.gz
+sha256  2164592a67b467e5b20fdcdaf5bd4c50685199067391c6fcad4fa5521c9b4dd7  fdk-aac-0.1.5.tar.gz
diff --git a/bsp/buildroot/package/fdk-aac/fdk-aac.mk b/bsp/buildroot/package/fdk-aac/fdk-aac.mk
index 45a3cf5e..0c9662ef 100644
--- a/bsp/buildroot/package/fdk-aac/fdk-aac.mk
+++ b/bsp/buildroot/package/fdk-aac/fdk-aac.mk
@@ -4,14 +4,11 @@
 #
 ################################################################################
 
-FDK_AAC_VERSION = 0.1.4
+FDK_AAC_VERSION = 0.1.5
 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac
 FDK_AAC_LICENSE = fdk-aac license
 FDK_AAC_LICENSE_FILES = NOTICE
 
 FDK_AAC_INSTALL_STAGING = YES
 
-# Not compatible with GCC 6 which defaults to GNU++14
-FDK_AAC_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++98"
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/feh/feh.hash b/bsp/buildroot/package/feh/feh.hash
index faca43db..0f8ac8c0 100644
--- a/bsp/buildroot/package/feh/feh.hash
+++ b/bsp/buildroot/package/feh/feh.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256  a9e818a4ad6ab427597e1799527a7576856c233525e67afb1eb2cb3ae709d853  feh-2.17.1.tar.bz2
+sha256 05a81fbe0997f6274c7617efc351647be38e5244c2624bd203459025c9a68ecd  feh-2.22.2.tar.bz2
diff --git a/bsp/buildroot/package/feh/feh.mk b/bsp/buildroot/package/feh/feh.mk
index 03651cdb..311cef3a 100644
--- a/bsp/buildroot/package/feh/feh.mk
+++ b/bsp/buildroot/package/feh/feh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FEH_VERSION = 2.17.1
+FEH_VERSION = 2.22.2
 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2
 FEH_SITE = http://feh.finalrewind.org
 FEH_DEPENDENCIES = libcurl imlib2 libpng xlib_libXinerama xlib_libXt
@@ -12,13 +12,12 @@ FEH_LICENSE = MIT
 FEH_LICENSE_FILES = COPYING
 
 define FEH_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \
-		-C $(@D) all
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \
+		$(MAKE) -C $(@D) all
 endef
 
 define FEH_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \
-		PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
+	$(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/fetchmail/Config.in b/bsp/buildroot/package/fetchmail/Config.in
index 1eb03590..a4bf5a7c 100644
--- a/bsp/buildroot/package/fetchmail/Config.in
+++ b/bsp/buildroot/package/fetchmail/Config.in
@@ -1,12 +1,11 @@
 config BR2_PACKAGE_FETCHMAIL
 	bool "fetchmail"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_CA_CERTIFICATES
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	depends on BR2_USE_MMU # fork()
 	help
 	  Fetchmail - the mail-retrieval daemon
-	  Client daemon to move mail from POP and IMAP to your local computer
+	  Client daemon to move mail from POP and IMAP to your local
+	  computer
 
 	  http://www.fetchmail.info/
diff --git a/bsp/buildroot/package/fetchmail/fetchmail.mk b/bsp/buildroot/package/fetchmail/fetchmail.mk
index 6aa0a2c9..37bbeabf 100644
--- a/bsp/buildroot/package/fetchmail/fetchmail.mk
+++ b/bsp/buildroot/package/fetchmail/fetchmail.mk
@@ -8,12 +8,16 @@ FETCHMAIL_VERSION_MAJOR = 6.3
 FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).26
 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz
 FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR)
-FETCHMAIL_LICENSE = GPLv2; some exceptions are mentioned in COPYING
+FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING
 FETCHMAIL_LICENSE_FILES = COPYING
 FETCHMAIL_AUTORECONF = YES
 FETCHMAIL_GETTEXTIZE = YES
 
+# needed to help fetchmail detecting the availability of openssl,
+# because it doesn't use pkg-config
+ifeq ($(BR2_STATIC_LIBS),y)
 FETCHMAIL_CONF_ENV += LIBS="-lz"
+endif
 
 FETCHMAIL_CONF_OPTS = \
 	--with-ssl=$(STAGING_DIR)/usr
@@ -21,7 +25,7 @@ FETCHMAIL_CONF_OPTS = \
 FETCHMAIL_DEPENDENCIES = \
 	ca-certificates \
 	openssl \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	$(TARGET_NLS_DEPENDENCIES)
 
 # fetchmailconf.py script is not (yet) python3-compliant.
 # Prevent the pyc-compilation with python-3 from failing by removing this
diff --git a/bsp/buildroot/package/ffmpeg/0002-ffmpeg-pthreads.patch b/bsp/buildroot/package/ffmpeg/0002-ffmpeg-pthreads.patch
new file mode 100644
index 00000000..c6d75d22
--- /dev/null
+++ b/bsp/buildroot/package/ffmpeg/0002-ffmpeg-pthreads.patch
@@ -0,0 +1,34 @@
+From patchwork Wed Oct 25 13:32:36 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [FFmpeg-devel] configure: v4l2_m2m depends on pthreads
+From: Mark Thompson <sw@jkqxz.net>
+X-Patchwork-Id: 5688
+Message-Id: <27e5b360-1210-d550-c8de-a761f8e9f326@jkqxz.net>
+To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
+Date: Wed, 25 Oct 2017 14:32:36 +0100
+
+Fixes build with --disable-pthreads.
+
+Downloaded from upstream patchworks:
+https://patchwork.ffmpeg.org/patch/5688/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index c86e578..76523c8 100755
+--- a/configure
++++ b/configure
+@@ -2780,7 +2780,7 @@ omx_rpi_select="omx"
+ qsvdec_select="qsv"
+ qsvenc_select="qsv"
+ vaapi_encode_deps="vaapi"
+-v4l2_m2m_deps_any="linux_videodev2_h"
++v4l2_m2m_deps="linux_videodev2_h pthreads"
+ 
+ hwupload_cuda_filter_deps="cuda"
+ scale_npp_filter_deps="cuda libnpp"
diff --git a/bsp/buildroot/package/ffmpeg/Config.in b/bsp/buildroot/package/ffmpeg/Config.in
index b5850db7..2d94c571 100644
--- a/bsp/buildroot/package/ffmpeg/Config.in
+++ b/bsp/buildroot/package/ffmpeg/Config.in
@@ -1,16 +1,28 @@
 config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	bool
+	default y
+	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW
+	depends on !(BR2_archs38 && BR2_TOOLCHAIN_USES_GLIBC)
 	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
+	depends on !BR2_nios2
 	# No support for ARMv7-M in the ARM assembly logic
+	depends on !BR2_ARM_CPU_ARMV7M
 	# Microblaze build affected by gcc PR71124 (infinite loop)
-	default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze
+	depends on !BR2_microblaze
+	# m68k coldfire causes a build failure, because the check for
+	# atomics (atomic_store) succeeds, which causes ffmpeg to
+	# think atomic intrinsics are available, while they are
+	# not. See https://patchwork.ozlabs.org/patch/756664/ and
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more
+	# details.
+	depends on !BR2_m68k_cf
 
 menuconfig BR2_PACKAGE_FFMPEG
 	bool "ffmpeg"
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	help
-	  FFmpeg is a complete, cross-platform solution to record, convert
-	  and stream audio and video.
+	  FFmpeg is a complete, cross-platform solution to record,
+	  convert and stream audio and video.
 
 	  http://www.ffmpeg.org
 
@@ -40,9 +52,9 @@ config BR2_PACKAGE_FFMPEG_FFMPEG
 
 config BR2_PACKAGE_FFMPEG_FFPLAY
 	bool "Build ffplay"
+	depends on !BR2_STATIC_LIBS # sdl2
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_SDL2
-	depends on !BR2_STATIC_LIBS # sdl2
 	help
 	  FFplay is a very simple and portable media player using the
 	  FFmpeg libraries and the SDL library.
diff --git a/bsp/buildroot/package/ffmpeg/ffmpeg.hash b/bsp/buildroot/package/ffmpeg/ffmpeg.hash
index cf41f39e..7d64d844 100644
--- a/bsp/buildroot/package/ffmpeg/ffmpeg.hash
+++ b/bsp/buildroot/package/ffmpeg/ffmpeg.hash
@@ -1,2 +1,5 @@
 # Locally calculated
-sha256 1131d37890ed3dcbc3970452b200a56ceb36b73eaa51d1c23c770c90f928537f  ffmpeg-3.2.9.tar.xz
+sha256 386f7601e865df6bddde05bb6927119b5a853f0b92e2e9834f59c125a17d3fc6  ffmpeg-3.4.4.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING.GPLv2
+sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe  COPYING.LGPLv2.1
+sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff  LICENSE.md
diff --git a/bsp/buildroot/package/ffmpeg/ffmpeg.mk b/bsp/buildroot/package/ffmpeg/ffmpeg.mk
index f914f4e4..0b34aa0f 100644
--- a/bsp/buildroot/package/ffmpeg/ffmpeg.mk
+++ b/bsp/buildroot/package/ffmpeg/ffmpeg.mk
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-FFMPEG_VERSION = 3.2.9
+FFMPEG_VERSION = 3.4.4
 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
 
-FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
+FFMPEG_LICENSE = LGPL-2.1+, libjpeg license
 FFMPEG_LICENSE_FILES = LICENSE.md COPYING.LGPLv2.1
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
-FFMPEG_LICENSE += and GPLv2+
+FFMPEG_LICENSE += and GPL-2.0+
 FFMPEG_LICENSE_FILES += COPYING.GPLv2
 endif
 
@@ -26,7 +26,6 @@ FFMPEG_CONF_OPTS = \
 	--enable-avdevice \
 	--enable-avcodec \
 	--enable-avformat \
-	--disable-x11grab \
 	--enable-network \
 	--disable-gray \
 	--enable-swscale-alpha \
@@ -39,7 +38,6 @@ FFMPEG_CONF_OPTS = \
 	--disable-dxva2 \
 	--enable-runtime-cpudetect \
 	--disable-hardcoded-tables \
-	--disable-memalign-hack \
 	--disable-mipsdsp \
 	--disable-mipsdspr2 \
 	--disable-msa \
@@ -55,14 +53,11 @@ FFMPEG_CONF_OPTS = \
 	--disable-libdc1394 \
 	--disable-libgsm \
 	--disable-libilbc \
-	--disable-libnut \
-	--disable-libopenjpeg \
-	--disable-libschroedinger \
 	--disable-libvo-amrwbenc \
 	--disable-symver \
 	--disable-doc
 
-FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
+FFMPEG_DEPENDENCIES += host-pkgconf
 
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 FFMPEG_CONF_OPTS += --enable-gpl
@@ -163,7 +158,10 @@ endif
 ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
 FFMPEG_CONF_OPTS += --enable-indevs
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+FFMPEG_CONF_OPTS += --enable-alsa
 FFMPEG_DEPENDENCIES += alsa-lib
+else
+FFMPEG_CONF_OPTS += --disable-alsa
 endif
 else
 FFMPEG_CONF_OPTS += --disable-indevs
@@ -210,13 +208,13 @@ FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl
 FFMPEG_DEPENDENCIES += gnutls
 else
 FFMPEG_CONF_OPTS += --disable-gnutls
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
 # openssl isn't license compatible with GPL
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
 FFMPEG_CONF_OPTS += --disable-openssl
 else
 FFMPEG_CONF_OPTS += --enable-openssl
-FFMPEG_DEPENDENCIES += openssl
+FFMPEG_DEPENDENCIES += libopenssl
 endif
 else
 FFMPEG_CONF_OPTS += --disable-openssl
@@ -227,6 +225,13 @@ ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy)
 FFMPEG_DEPENDENCIES += libebur128
 endif
 
+ifeq ($(BR2_PACKAGE_LIBDRM),y)
+FFMPEG_CONF_OPTS += --enable-libdrm
+FFMPEG_DEPENDENCIES += libdrm
+else
+FFMPEG_CONF_OPTS += --disable-libdrm
+endif
+
 ifeq ($(BR2_PACKAGE_LIBOPENH264),y)
 FFMPEG_CONF_OPTS += --enable-libopenh264
 FFMPEG_DEPENDENCIES += libopenh264
@@ -256,6 +261,14 @@ else
 FFMPEG_CONF_OPTS += --disable-vdpau
 endif
 
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \
+	--extra-cflags=-I$(STAGING_DIR)/usr/include/IL
+FFMPEG_DEPENDENCIES += rpi-userland
+else
+FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi
+endif
+
 # To avoid a circular dependency only use opencv if opencv itself does
 # not depend on ffmpeg.
 ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx)
@@ -338,6 +351,13 @@ else
 FFMPEG_CONF_OPTS += --disable-libwavpack
 endif
 
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+FFMPEG_CONF_OPTS += --enable-iconv
+FFMPEG_DEPENDENCIES += libiconv
+else
+FFMPEG_CONF_OPTS += --disable-iconv
+endif
+
 # ffmpeg freetype support require fenv.h which is only
 # available/working on glibc.
 # The microblaze variant doesn't provide the needed exceptions
@@ -355,6 +375,13 @@ else
 FFMPEG_CONF_OPTS += --disable-fontconfig
 endif
 
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+FFMPEG_CONF_OPTS += --enable-libopenjpeg
+FFMPEG_DEPENDENCIES += openjpeg
+else
+FFMPEG_CONF_OPTS += --disable-libopenjpeg
+endif
+
 ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
 FFMPEG_CONF_OPTS += --enable-libx264
 FFMPEG_DEPENDENCIES += x264
@@ -370,15 +397,10 @@ FFMPEG_CONF_OPTS += --disable-libx265
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
-FFMPEG_CONF_OPTS += --enable-yasm
-FFMPEG_DEPENDENCIES += host-yasm
+FFMPEG_CONF_OPTS += --enable-x86asm
+FFMPEG_DEPENDENCIES += host-nasm
 else
-ifeq ($(BR2_x86_i586),y)
-# Needed to work around a bug with gcc 5.x:
-# error: 'asm' operand has impossible constraints
-FFMPEG_CONF_OPTS += --disable-inline-asm
-endif
-FFMPEG_CONF_OPTS += --disable-yasm
+FFMPEG_CONF_OPTS += --disable-x86asm
 FFMPEG_CONF_OPTS += --disable-mmx
 endif
 
@@ -448,6 +470,8 @@ FFMPEG_CONF_OPTS += --disable-vfp
 endif
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 FFMPEG_CONF_OPTS += --enable-neon
+else ifeq ($(BR2_aarch64),y)
+FFMPEG_CONF_OPTS += --enable-neon
 else
 FFMPEG_CONF_OPTS += --disable-neon
 endif
@@ -466,6 +490,11 @@ else
 FFMPEG_CONF_OPTS += --disable-altivec
 endif
 
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+FFMPEG_CONF_OPTS += --extra-libs=-latomic
+endif
+
 ifeq ($(BR2_STATIC_LIBS),)
 FFMPEG_CONF_OPTS += --enable-pic
 else
@@ -482,7 +511,6 @@ else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),)
 FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH)
 endif
 
-
 FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
 
 # Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others
@@ -505,4 +533,9 @@ define FFMPEG_CONFIGURE_CMDS
 	)
 endef
 
+define FFMPEG_REMOVE_EXAMPLE_SRC_FILES
+	rm -rf $(TARGET_DIR)/usr/share/ffmpeg/examples
+endef
+FFMPEG_POST_INSTALL_TARGET_HOOKS += FFMPEG_REMOVE_EXAMPLE_SRC_FILES
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/fftw/Config.in b/bsp/buildroot/package/fftw/Config.in
index ef113849..d51f8f3c 100644
--- a/bsp/buildroot/package/fftw/Config.in
+++ b/bsp/buildroot/package/fftw/Config.in
@@ -33,15 +33,15 @@ config BR2_PACKAGE_FFTW_PRECISION_SINGLE
 	select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
 	select BR2_PACKAGE_FFTW_USE_NEON if BR2_ARM_CPU_HAS_NEON && !BR2_ARM_SOFT_FLOAT
 	help
-	  Compile fftw in single precision, i.e. use 'float' for floating
-	  point type.
+	  Compile fftw in single precision, i.e. use 'float' for
+	  floating point type.
 
 config BR2_PACKAGE_FFTW_PRECISION_DOUBLE
 	bool "double"
 	select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2
 	help
-	  Compile fftw in double precision (the default), i.e. use 'double'
-	  for floating point type.
+	  Compile fftw in double precision (the default), i.e. use
+	  'double' for floating point type.
 
 config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE
 	bool "long double"
diff --git a/bsp/buildroot/package/fftw/fftw.hash b/bsp/buildroot/package/fftw/fftw.hash
index 62b8f0f0..faf4b904 100644
--- a/bsp/buildroot/package/fftw/fftw.hash
+++ b/bsp/buildroot/package/fftw/fftw.hash
@@ -1,2 +1,5 @@
-# From http://www.fftw.org/fftw-3.3.4.tar.gz.md5sum
-md5	2edab8c06b24feeb3b82bbb3ebf3e7b3	fftw-3.3.4.tar.gz
+# From http://www.fftw.org/fftw-3.3.7.tar.gz.md5sum
+md5 0d5915d7d39b3253c1cc05030d79ac47  fftw-3.3.7.tar.gz
+# Locally computed
+sha256 3b609b7feba5230e8f6dd8d245ddbefac324c5a6ae4186947670d9ac2cd25573	fftw-3.3.7.tar.gz
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c	COPYING
diff --git a/bsp/buildroot/package/fftw/fftw.mk b/bsp/buildroot/package/fftw/fftw.mk
index 5bd39a8f..b3aa4b6b 100644
--- a/bsp/buildroot/package/fftw/fftw.mk
+++ b/bsp/buildroot/package/fftw/fftw.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-FFTW_VERSION = 3.3.4
+FFTW_VERSION = 3.3.7
 FFTW_SITE = http://www.fftw.org
 FFTW_INSTALL_STAGING = YES
-FFTW_LICENSE = GPLv2+
+FFTW_LICENSE = GPL-2.0+
 FFTW_LICENSE_FILES = COPYING
 
 # fortran support only enables generation and installation of fortran sources
diff --git a/bsp/buildroot/package/ficl/Config.in b/bsp/buildroot/package/ficl/Config.in
index 3445a642..4d9ab4a5 100644
--- a/bsp/buildroot/package/ficl/Config.in
+++ b/bsp/buildroot/package/ficl/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_FICL
 	bool "ficl"
 	help
-	  Ficl is a programming language interpreter designed to be embedded
-	  into other systems as a command, macro, and development
-	  prototyping language.
+	  Ficl is a programming language interpreter designed to be
+	  embedded into other systems as a command, macro, and
+	  development prototyping language.
 	  Ficl is an acronym for "Forth Inspired Command Language".
 
 	  http://ficl.sourceforge.net
diff --git a/bsp/buildroot/package/ficl/ficl.mk b/bsp/buildroot/package/ficl/ficl.mk
index 65df1467..af900fa2 100644
--- a/bsp/buildroot/package/ficl/ficl.mk
+++ b/bsp/buildroot/package/ficl/ficl.mk
@@ -7,7 +7,7 @@
 FICL_VERSION_MAJOR = 4.1
 FICL_VERSION = $(FICL_VERSION_MAJOR).0
 FICL_SITE = http://downloads.sourceforge.net/project/ficl/ficl-all/ficl$(FICL_VERSION_MAJOR)
-FICL_LICENSE = BSD-2c
+FICL_LICENSE = BSD-2-Clause
 FICL_LICENSE_FILES = ReadMe.txt
 FICL_INSTALL_STAGING = YES
 
@@ -39,7 +39,7 @@ endif
 
 define FICL_BUILD_CMDS
 	$(MAKE) -C $(@D) -f Makefile.linux $(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -fPIC -I. -Dlinux" CPPFLAGS="" $(FICL_BUILD_TARGETS)
+		CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline -fPIC -I. -Dlinux" CPPFLAGS="" $(FICL_BUILD_TARGETS)
 endef
 
 define FICL_INSTALL_STAGING_CMDS
diff --git a/bsp/buildroot/package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch b/bsp/buildroot/package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch
new file mode 100644
index 00000000..daff8666
--- /dev/null
+++ b/bsp/buildroot/package/file/0001-Avoid-reading-past-the-end-of-buffer-Rui-Reis.patch
@@ -0,0 +1,30 @@
+From a642587a9c9e2dd7feacdf513c3643ce26ad3c22 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos@zoulas.com>
+Date: Sat, 9 Jun 2018 16:00:06 +0000
+Subject: [PATCH] Avoid reading past the end of buffer (Rui Reis)
+
+[baruch: drop file version string update hunk]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit a642587a9c9 in github mirror
+
+ src/readelf.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/readelf.c b/src/readelf.c
+index 79c83f9f5048..1f41b46113c3 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type,
+ 
+ 				cname = (unsigned char *)
+ 				    &nbuf[doff + prpsoffsets(i)];
+-				for (cp = cname; *cp && isprint(*cp); cp++)
++				for (cp = cname; cp < nbuf + size && *cp
++				    && isprint(*cp); cp++)
+ 					continue;
+ 				/*
+ 				 * Linux apparently appends a space at the end
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/file/file.hash b/bsp/buildroot/package/file/file.hash
index fee516c8..a6b40be3 100644
--- a/bsp/buildroot/package/file/file.hash
+++ b/bsp/buildroot/package/file/file.hash
@@ -1,2 +1,5 @@
 # Locally calculated
-sha256 8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50  file-5.32.tar.gz
+sha256 1c52c8c3d271cd898d5511c36a68059cda94036111ab293f01f83c3525b737c6  file-5.33.tar.gz
+sha256 3c0ad13c36f891a9b4f951e59eb2fc108065a46f849697cc6fd3cdb41cc23a3d  COPYING
+sha256 d98ee4d8d95e7d021a5dfc41f137ecc3b624a7b98e8bd793130202d12a21ed57  src/mygetopt.h
+sha256 85e358d575ad4ac5b38b623a25b24246ccff3c7e680d930c0a9ff5228fe434b6  src/vasprintf.c
diff --git a/bsp/buildroot/package/file/file.mk b/bsp/buildroot/package/file/file.mk
index 26d3c5f2..422e29b1 100644
--- a/bsp/buildroot/package/file/file.mk
+++ b/bsp/buildroot/package/file/file.mk
@@ -4,14 +4,21 @@
 #
 ################################################################################
 
-FILE_VERSION = 5.32
+FILE_VERSION = 5.33
 FILE_SITE = ftp://ftp.astron.com/pub/file
 FILE_DEPENDENCIES = host-file zlib
 HOST_FILE_DEPENDENCIES = host-zlib
 FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 FILE_INSTALL_STAGING = YES
-FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3c (one file)
+FILE_LICENSE = BSD-2-Clause, BSD-4-Clause (one file), BSD-3-Clause (one file)
 FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c
 
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+FILE_CONF_OPTS += --enable-libseccomp
+FILE_DEPENDENCIES += libseccomp
+else
+FILE_CONF_OPTS += --disable-libseccomp
+endif
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/filemq/Config.in b/bsp/buildroot/package/filemq/Config.in
index e06a2674..b4720c1d 100644
--- a/bsp/buildroot/package/filemq/Config.in
+++ b/bsp/buildroot/package/filemq/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_FILEMQ
 	bool "filemq"
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_CZMQ
-	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on BR2_USE_MMU # czmq
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_CZMQ
+	select BR2_PACKAGE_ZEROMQ
 	help
 	  FileMQ is a publish-subscribe file service based on 0MQ.
 
diff --git a/bsp/buildroot/package/filemq/filemq.hash b/bsp/buildroot/package/filemq/filemq.hash
index 1a7997ed..d1df1ff2 100644
--- a/bsp/buildroot/package/filemq/filemq.hash
+++ b/bsp/buildroot/package/filemq/filemq.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 c373eddd5154cfe63f6cc6b3255ec20dca1f70c1f1881b611930931df47babad  filemq-e59951489045825d6fc5bdc6a5a5ecf1abf51943.tar.gz
+sha256 f3764e1adacfbf7fd09fb9c553e796a80d8159f1ace689fb68307afbc1746d4c  filemq-8940f34e0f1c8f25c1c693ed8db069f58fbc5ad0.tar.gz
diff --git a/bsp/buildroot/package/filemq/filemq.mk b/bsp/buildroot/package/filemq/filemq.mk
index 62ddfaf4..75d8bd99 100644
--- a/bsp/buildroot/package/filemq/filemq.mk
+++ b/bsp/buildroot/package/filemq/filemq.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-FILEMQ_VERSION = e59951489045825d6fc5bdc6a5a5ecf1abf51943
+FILEMQ_VERSION = 8940f34e0f1c8f25c1c693ed8db069f58fbc5ad0
 FILEMQ_SITE = $(call github,zeromq,filemq,$(FILEMQ_VERSION))
 
 FILEMQ_AUTORECONF = YES
 FILEMQ_CONF_ENV = filemq_have_asciidoc=no
 FILEMQ_INSTALL_STAGING = YES
 FILEMQ_DEPENDENCIES = czmq openssl zeromq
-FILEMQ_LICENSE = MPLv2.0
+FILEMQ_LICENSE = MPL-2.0
 FILEMQ_LICENSE_FILES = LICENSE
 
 define FILEMQ_CREATE_CONFIG_DIR
diff --git a/bsp/buildroot/package/findutils/findutils.mk b/bsp/buildroot/package/findutils/findutils.mk
index 8f6b0990..6ca00629 100644
--- a/bsp/buildroot/package/findutils/findutils.mk
+++ b/bsp/buildroot/package/findutils/findutils.mk
@@ -6,7 +6,7 @@
 
 FINDUTILS_VERSION = 4.6.0
 FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils
-FINDUTILS_LICENSE = GPLv3+
+FINDUTILS_LICENSE = GPL-3.0+
 FINDUTILS_LICENSE_FILES = COPYING
 FINDUTILS_CONF_ENV = \
 	gl_cv_func_stdin=yes \
diff --git a/bsp/buildroot/package/fio/Config.in b/bsp/buildroot/package/fio/Config.in
index 89f54f99..8da227db 100644
--- a/bsp/buildroot/package/fio/Config.in
+++ b/bsp/buildroot/package/fio/Config.in
@@ -4,12 +4,6 @@ config BR2_PACKAGE_FIO
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	# fio uses posix_madvise(), which is not part of any official
-	# release of uClibc, but is part of uClibc Git, and backported
-	# in Buildroot patch set of uClibc 0.9.33. Therefore, we
-	# disable the build of fio for external uClibc toolchains
-	# (which use an unknown uClibc version)
-	depends on !BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	# fio uses fallocate() which becomes fallocate64() while compiling with
 	# largefile support, but fallocate64() is not available on nios2
 	depends on !BR2_nios2
diff --git a/bsp/buildroot/package/fio/fio.hash b/bsp/buildroot/package/fio/fio.hash
new file mode 100644
index 00000000..d136fd59
--- /dev/null
+++ b/bsp/buildroot/package/fio/fio.hash
@@ -0,0 +1,4 @@
+# Locally computed
+sha256 1952db4d534221e6e8454f851dfcc38328b0ed4a3f499ea25a51ca2b5ccc8136  fio-fio-2.20.tar.gz
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
+sha256 8a240c1ad13d1fe3e58588643d81d0695899be4a669fe6d8fafa76ca6a89db2c  MORAL-LICENSE
diff --git a/bsp/buildroot/package/fio/fio.mk b/bsp/buildroot/package/fio/fio.mk
index 5c02bc92..aabdff99 100644
--- a/bsp/buildroot/package/fio/fio.mk
+++ b/bsp/buildroot/package/fio/fio.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-FIO_VERSION = fio-2.13
+FIO_VERSION = fio-2.20
 FIO_SITE = git://git.kernel.dk/fio.git
-FIO_LICENSE = GPLv2 + special obligations
-FIO_LICENSE_FILES = COPYING
+FIO_LICENSE = GPL-2.0
+FIO_LICENSE_FILES = COPYING MORAL-LICENSE
 
 ifeq ($(BR2_PACKAGE_LIBAIO),y)
 FIO_DEPENDENCIES += libaio
diff --git a/bsp/buildroot/package/fis/fis.mk b/bsp/buildroot/package/fis/fis.mk
index f559bdf7..6db06bf7 100644
--- a/bsp/buildroot/package/fis/fis.mk
+++ b/bsp/buildroot/package/fis/fis.mk
@@ -7,7 +7,7 @@
 FIS_SITE = http://svn.chezphil.org/utils/trunk
 FIS_SITE_METHOD = svn
 FIS_VERSION = 2892
-FIS_LICENSE = GPLv2+
+FIS_LICENSE = GPL-2.0+
 FIS_LICENSE_FILES = fis.c
 
 define FIS_BUILD_CMDS
diff --git a/bsp/buildroot/package/flac/flac.mk b/bsp/buildroot/package/flac/flac.mk
index 43e0410d..34482133 100644
--- a/bsp/buildroot/package/flac/flac.mk
+++ b/bsp/buildroot/package/flac/flac.mk
@@ -9,7 +9,7 @@ FLAC_SITE = http://downloads.xiph.org/releases/flac
 FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz
 FLAC_INSTALL_STAGING = YES
 FLAC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-FLAC_LICENSE = Xiph BSD-like (libFLAC), GPLv2+ (tools), LGPLv2.1+ (other libraries)
+FLAC_LICENSE = Xiph BSD-like (libFLAC), GPL-2.0+ (tools), LGPL-2.1+ (other libraries)
 FLAC_LICENSE_FILES = COPYING.Xiph COPYING.GPL COPYING.LGPL
 # 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac
 FLAC_AUTORECONF = YES
diff --git a/bsp/buildroot/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch b/bsp/buildroot/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch
new file mode 100644
index 00000000..b37bedcf
--- /dev/null
+++ b/bsp/buildroot/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch
@@ -0,0 +1,80 @@
+From fa5ec96a94646492a3f908e12905b3e48a8e800b Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Wed, 18 Apr 2018 20:24:13 +0200
+Subject: [PATCH] src/cpp: fix cmake >= 3.11 build
+
+CMake < 3.11 doesn't support add_library() without any source file
+(i.e add_library(foo SHARED)). But flann CMake use a trick that use
+an empty string "" as source list (i.e add_library(foo SHARED "")).
+This look like a bug in CMake < 3.11.
+
+With CMake >= 3.11, the new behaviour of add_library() break the
+existing flann CMake code.
+
+From CMake Changelog [1]:
+"add_library() and add_executable() commands can now be called without
+ any sources and will not complain as long as sources are added later
+ via the target_sources() command."
+
+Note: flann CMake code doesn't use target_sources() since no source file
+are provided intentionally since the flann shared library is created by
+linking with the flann_cpp_s static library with this line:
+
+target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+
+If you try to use "add_library(flann_cpp SHARED ${CPP_SOURCES})" (as it should
+be normally done), the link fail due to already defined symbol.
+
+They are building the shared version using the static library "to speedup the
+build time" [3]
+
+This issue is already reported upstream [2] with a proposed solution.
+
+Upstream status: Pending
+
+Fixes:
+http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7454
+
+[1] https://cmake.org/cmake/help/v3.11/release/3.11.html
+[2] https://github.com/mariusmuja/flann/issues/369
+[3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/cpp/CMakeLists.txt | 4 ++--
+ src/cpp/empty.cpp      | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+ create mode 100644 src/cpp/empty.cpp
+
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index b44a735..a816863 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -29,7 +29,7 @@ if (BUILD_CUDA_LIB)
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+-    add_library(flann_cpp SHARED "")
++    add_library(flann_cpp SHARED "empty.cpp")
+     set_target_properties(flann_cpp PROPERTIES LINKER_LANGUAGE CXX)
+     target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)
+ 
+@@ -85,7 +85,7 @@ if (BUILD_C_BINDINGS)
+     set_property(TARGET flann_s PROPERTY COMPILE_DEFINITIONS FLANN_STATIC)
+ 
+     if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_COMPILER_IS_GNUCC)
+-        add_library(flann SHARED "")
++        add_library(flann SHARED "empty.cpp")
+         set_target_properties(flann PROPERTIES LINKER_LANGUAGE CXX)
+         target_link_libraries(flann -Wl,-whole-archive flann_s -Wl,-no-whole-archive)
+     else()
+diff --git a/src/cpp/empty.cpp b/src/cpp/empty.cpp
+new file mode 100644
+index 0000000..40a8c17
+--- /dev/null
++++ b/src/cpp/empty.cpp
+@@ -0,0 +1 @@
++/* empty */
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/flann/flann.hash b/bsp/buildroot/package/flann/flann.hash
index 08242eb2..c2c41beb 100644
--- a/bsp/buildroot/package/flann/flann.hash
+++ b/bsp/buildroot/package/flann/flann.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 3fec86866987c792c3fce7ecc8ba9d09a003f5d2d1a1ad94864550aad73a5c0b  flann-3645f0c30a47267e56e5acdecfc7bac2b76bc3d5.tar.gz
+sha256 b23b5f4e71139faa3bcb39e6bbcc76967fbaf308c4ee9d4f5bfbeceaa76cc5d3  flann-1.9.1.tar.gz
diff --git a/bsp/buildroot/package/flann/flann.mk b/bsp/buildroot/package/flann/flann.mk
index 90d2ddcb..ef61815b 100644
--- a/bsp/buildroot/package/flann/flann.mk
+++ b/bsp/buildroot/package/flann/flann.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-FLANN_VERSION = 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5
+FLANN_VERSION = 1.9.1
 FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION))
 FLANN_INSTALL_STAGING = YES
-FLANN_LICENSE = BSD-3c
+FLANN_LICENSE = BSD-3-Clause
 FLANN_LICENSE_FILES = COPYING
 FLANN_CONF_OPTS = \
 	-DBUILD_C_BINDINGS=ON \
diff --git a/bsp/buildroot/package/flannel/flannel.mk b/bsp/buildroot/package/flannel/flannel.mk
index 18c0af16..bbb2c72a 100644
--- a/bsp/buildroot/package/flannel/flannel.mk
+++ b/bsp/buildroot/package/flannel/flannel.mk
@@ -20,7 +20,7 @@ FLANNEL_MAKE_ENV = \
 	CGO_ENABLED=1
 
 FLANNEL_GLDFLAGS = \
-	-X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) \
+	-X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION)
 
 ifeq ($(BR2_STATIC_LIBS),y)
 FLANNEL_GLDFLAGS += -extldflags '-static'
@@ -33,7 +33,7 @@ define FLANNEL_CONFIGURE_CMDS
 endef
 
 define FLANNEL_BUILD_CMDS
-	cd $(@D) && $(FLANNEL_MAKE_ENV) $(HOST_DIR)/usr/bin/go \
+	cd $(@D) && $(FLANNEL_MAKE_ENV) $(HOST_DIR)/bin/go \
 		build -v -o $(@D)/bin/flanneld -ldflags "$(FLANNEL_GLDFLAGS)" .
 endef
 
diff --git a/bsp/buildroot/package/flashbench/flashbench.hash b/bsp/buildroot/package/flashbench/flashbench.hash
new file mode 100644
index 00000000..a5eb388c
--- /dev/null
+++ b/bsp/buildroot/package/flashbench/flashbench.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 12e2dcb6f041ef1a303fc5bc84642ed637c24d77ed6c667a2187f21d54555731  flashbench-2e30b1968a66147412f21002ea844122a0d5e2f0.tar.gz
diff --git a/bsp/buildroot/package/flashbench/flashbench.mk b/bsp/buildroot/package/flashbench/flashbench.mk
index 6759338a..cbcf9ea2 100644
--- a/bsp/buildroot/package/flashbench/flashbench.mk
+++ b/bsp/buildroot/package/flashbench/flashbench.mk
@@ -6,7 +6,7 @@
 
 FLASHBENCH_VERSION = 2e30b1968a66147412f21002ea844122a0d5e2f0
 FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git
-FLASHBENCH_LICENSE = GPLv2
+FLASHBENCH_LICENSE = GPL-2.0
 FLASHBENCH_LICENSE_FILES = COPYING
 
 FLASHBENCH_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/flashrom/Config.in b/bsp/buildroot/package/flashrom/Config.in
index adc068cb..e7844a0a 100644
--- a/bsp/buildroot/package/flashrom/Config.in
+++ b/bsp/buildroot/package/flashrom/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_FLASHROM
 	bool "flashrom"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_PCIUTILS
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	select BR2_PACKAGE_LIBFTDI
 	# dmidecode is only a runtime dependency
 	select BR2_PACKAGE_DMIDECODE
-	depends on BR2_i386 || BR2_x86_64
-	depends on BR2_TOOLCHAIN_HAS_THREADS 	# libusb
 	help
 	  flashrom is a utility for identifying, reading, writing,
 	  verifying and erasing flash chips. It is designed to flash
diff --git a/bsp/buildroot/package/flashrom/flashrom.mk b/bsp/buildroot/package/flashrom/flashrom.mk
index c155d404..f9ab6294 100644
--- a/bsp/buildroot/package/flashrom/flashrom.mk
+++ b/bsp/buildroot/package/flashrom/flashrom.mk
@@ -8,7 +8,7 @@ FLASHROM_VERSION = 0.9.9
 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
 FLASHROM_SITE = http://download.flashrom.org/releases
 FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf
-FLASHROM_LICENSE = GPLv2+
+FLASHROM_LICENSE = GPL-2.0+
 FLASHROM_LICENSE_FILES = COPYING
 
 define FLASHROM_BUILD_CMDS
diff --git a/bsp/buildroot/package/flatbuffers/Config.in b/bsp/buildroot/package/flatbuffers/Config.in
new file mode 100644
index 00000000..99273828
--- /dev/null
+++ b/bsp/buildroot/package/flatbuffers/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_FLATBUFFERS
+	bool "flatbuffers"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  FlatBuffers is an efficient cross platform serialization
+	  library for C++, C#, C, Go, Java, JavaScript, PHP, and
+	  Python. It was originally created at Google for game
+	  development and other performance-critical applications.
+
+	  http://google.github.io/flatbuffers/
+
+comment "flatbuffers needs a toolchain w/ C++, gcc >= 4.7"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
diff --git a/bsp/buildroot/package/flatbuffers/flatbuffers.hash b/bsp/buildroot/package/flatbuffers/flatbuffers.hash
new file mode 100644
index 00000000..bd39ca38
--- /dev/null
+++ b/bsp/buildroot/package/flatbuffers/flatbuffers.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256	c45029c0a0f1a88d416af143e34de96b3091642722aa2d8c090916c6d1498c2e	flatbuffers-v1.8.0.tar.gz
+sha256	7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3	LICENSE.txt
diff --git a/bsp/buildroot/package/flatbuffers/flatbuffers.mk b/bsp/buildroot/package/flatbuffers/flatbuffers.mk
new file mode 100644
index 00000000..2b640ecc
--- /dev/null
+++ b/bsp/buildroot/package/flatbuffers/flatbuffers.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# flatbuffers
+#
+################################################################################
+
+FLATBUFFERS_VERSION = v1.8.0
+FLATBUFFERS_SITE = $(call github,google,flatbuffers,$(FLATBUFFERS_VERSION))
+FLATBUFFERS_LICENSE = Apache-2.0
+FLATBUFFERS_LICENSE_FILES = LICENSE.txt
+FLATBUFFERS_INSTALL_STAGING = YES
+
+FLATBUFFERS_CONF_OPTS += \
+	-DCMAKE_CXX_FLAGS="-std=c++11" \
+	-DFLATBUFFERS_BUILD_TESTS=OFF
+
+ifeq ($(BR2_STATIC_LIBS),y)
+FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=OFF
+else
+FLATBUFFERS_CONF_OPTS += -DFLATBUFFERS_BUILD_SHAREDLIB=ON
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch b/bsp/buildroot/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
new file mode 100644
index 00000000..06747a36
--- /dev/null
+++ b/bsp/buildroot/package/flex/0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
@@ -0,0 +1,35 @@
+From ffa886a580929f26fd5e5a40c9c5334955c48553 Mon Sep 17 00:00:00 2001
+From: Explorer09 <explorer09@gmail.com>
+Date: Mon, 4 Sep 2017 10:47:33 +0800
+Subject: [PATCH] build: AC_USE_SYSTEM_EXTENSIONS in configure.ac.
+
+This would, e.g. define _GNU_SOURCE in config.h, enabling the
+reallocarray() prototype in glibc 2.26+ on Linux systems with that
+version of glibc.
+
+Fixes #241.
+
+Backported from: 24fd0551333e7eded87b64dd36062da3df2f6380
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 55e774b..c879fe1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,8 +25,10 @@
+ # autoconf requirements and initialization
+ 
+ AC_INIT([the fast lexical analyser generator],[2.6.4],[flex-help@lists.sourceforge.net],[flex])
++AC_PREREQ([2.60])
+ AC_CONFIG_SRCDIR([src/scan.l])
+ AC_CONFIG_AUX_DIR([build-aux])
++AC_USE_SYSTEM_EXTENSIONS
+ LT_INIT
+ AM_INIT_AUTOMAKE([1.11.3 -Wno-portability foreign check-news std-options dist-lzip parallel-tests subdir-objects])
+ AC_CONFIG_HEADER([src/config.h])
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/flex/0001-prog-ar.patch b/bsp/buildroot/package/flex/0001-prog-ar.patch
deleted file mode 100644
index e0626ff9..00000000
--- a/bsp/buildroot/package/flex/0001-prog-ar.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in
---- flex-2.5.33.orig/Makefile.in	2007-01-18 17:29:25.000000000 +0100
-+++ flex-2.5.33/Makefile.in	2007-01-18 18:28:22.000000000 +0100
-@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- 	"$(DESTDIR)$(includedir)"
- libLIBRARIES_INSTALL = $(INSTALL_DATA)
- LIBRARIES = $(lib_LIBRARIES)
--AR = ar
- ARFLAGS = cru
- libfl_a_AR = $(AR) $(ARFLAGS)
- libfl_a_LIBADD =
diff --git a/bsp/buildroot/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch b/bsp/buildroot/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
new file mode 100644
index 00000000..19f5a772
--- /dev/null
+++ b/bsp/buildroot/package/flex/0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
@@ -0,0 +1,76 @@
+From da21733178b34eea303964db5a05e8a3ee4095b4 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 26 Aug 2017 15:17:06 +0200
+Subject: [PATCH] build: make it possible to disable the build of the flex
+ program
+
+The flex program uses fork(), which isn't available on noMMU
+systems. However, the libfl library does not use fork(), and be used
+by other programs/libraries.
+
+Therefore, it makes sense to provide an option to disable the build of
+the flex program.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Submitted-upstream: https://github.com/westes/flex/pull/256
+Refused. We'll have to adapt when they do a new release...
+---
+ Makefile.am     | 2 ++
+ configure.ac    | 6 ++++++
+ doc/Makefile.am | 4 ++++
+ src/Makefile.am | 3 +++
+ 4 files changed, 15 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index e790e9d..8b57bc9 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,8 +62,10 @@ ChangeLog: $(srcdir)/tools/git2cl
+ indent:
+ 	cd src && $(MAKE) $(AM_MAKEFLAGS) indent
+ 
++if ENABLE_PROGRAM
+ install-exec-hook:
+ 	cd $(DESTDIR)$(bindir) && \
+ 		$(LN_S) -f flex$(EXEEXT) flex++$(EXEEXT)
++endif
+ 
+ .PHONY: ChangeLog indent
+diff --git a/configure.ac b/configure.ac
+index 8882016..f49872b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -75,6 +75,12 @@ AC_ARG_ENABLE([libfl],
+   [], [enable_libfl=yes])
+ AM_CONDITIONAL([ENABLE_LIBFL], [test "x$enable_libfl" = xyes])
+ 
++AC_ARG_ENABLE([program],
++  [AS_HELP_STRING([--disable-program],
++                  [do not build the flex program, only the libfl library])],
++  [], [enable_program=yes])
++AM_CONDITIONAL([ENABLE_PROGRAM], [test "x$enable_program" = xyes])
++
+ # --disable-bootstrap is intended only to workaround problems with bootstrap
+ # (e.g. when cross-compiling flex or when bootstrapping has bugs).
+ # Ideally we should be able to bootstrap even when cross-compiling.
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0d13a5a..c73bc17 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -4,7 +4,10 @@ LIBS = @LIBS@
+ 
+ m4 = @M4@
+ 
++if ENABLE_PROGRAM
+ bin_PROGRAMS = flex
++endif
++
+ if ENABLE_BOOTSTRAP
+ noinst_PROGRAMS = stage1flex
+ endif
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/flex/0002-fix-CVE-2016-6354.patch b/bsp/buildroot/package/flex/0002-fix-CVE-2016-6354.patch
deleted file mode 100644
index b0c780b9..00000000
--- a/bsp/buildroot/package/flex/0002-fix-CVE-2016-6354.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001
-From: Will Estes <westes575@gmail.com>
-Date: Sat, 27 Feb 2016 11:56:05 -0500
-Subject: [PATCH] Fixed incorrect integer type
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: upstream
-
- flex.skl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/flex.skl b/src/flex.skl
-index 36a526a..64f853d 100644
---- a/flex.skl
-+++ b/flex.skl
-@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer()
- 
- 	else
- 		{
--			yy_size_t num_to_read =
-+			int num_to_read =
- 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
- 
- 		while ( num_to_read <= 0 )
diff --git a/bsp/buildroot/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch b/bsp/buildroot/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
new file mode 100644
index 00000000..ffe30d36
--- /dev/null
+++ b/bsp/buildroot/package/flex/0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
@@ -0,0 +1,58 @@
+From b89b8475a5b2f9444c32f7d254b35968da3c8a23 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Fri, 29 Sep 2017 18:03:51 +0200
+Subject: [PATCH] build: make it possible to disable the build of the
+ documentation
+
+When targetting embedded evices, the documentation is not needed.
+
+Building the documentation default to whether the program is built.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am  | 8 +++++++-
+ configure.ac | 6 ++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index fce30b2..ee75b64 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -41,9 +41,15 @@ EXTRA_DIST = \
+ 	.indent.pro \
+ 	autogen.sh
+ 
++MAYBE_SUBDIRS =
++
++if ENABLE_DOC
++MAYBE_SUBDIRS += doc
++endif
++
+ SUBDIRS = \
+ 	src \
+-	doc \
++	$(MAYBE_SUBDIRS) \
+ 	examples \
+ 	po \
+ 	tests \
+diff --git a/configure.ac b/configure.ac
+index c54e98f..b3ae450 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,12 @@ AC_ARG_ENABLE([program],
+   [], [enable_program=yes])
+ AM_CONDITIONAL([ENABLE_PROGRAM], [test "x$enable_program" = xyes])
+ 
++AC_ARG_ENABLE([doc],
++  [AS_HELP_STRING([--disable-doc],
++                  [do not build the documentation])],
++  [], [enable_doc=${enable_program}])
++AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = xyes -a "x$enable_program" = xyes])
++
+ # --disable-bootstrap is intended only to workaround problems with bootstrap
+ # (e.g. when cross-compiling flex or when bootstrapping has bugs).
+ # Ideally we should be able to bootstrap even when cross-compiling.
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/flex/Config.in b/bsp/buildroot/package/flex/Config.in
index 0a70a1c6..0690777a 100644
--- a/bsp/buildroot/package/flex/Config.in
+++ b/bsp/buildroot/package/flex/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_FLEX
 	bool "flex"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A fast lexical analyser generator. A tool for generating
 	  programs that perform pattern-matching on text.
 
-	  http://flex.sourceforge.net/
+	  Only the library is available.
+
+	  https://github.com/westes/flex/
diff --git a/bsp/buildroot/package/flex/flex.hash b/bsp/buildroot/package/flex/flex.hash
index b91ab57d..ee905739 100644
--- a/bsp/buildroot/package/flex/flex.hash
+++ b/bsp/buildroot/package/flex/flex.hash
@@ -1,2 +1,4 @@
 # Locally computed:
-sha256  bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3  flex-2.5.37.tar.gz
+sha256 e87aae032bf07c26f85ac0ed3250998c37621d95f8bd748b31f15b33c45ee995  flex-2.6.4.tar.gz
+# License files, locally calculated
+sha256 97fd685958d93be7f8dab939bb8161dbd6afb0718c63bfc337c24321aea44273  COPYING
diff --git a/bsp/buildroot/package/flex/flex.mk b/bsp/buildroot/package/flex/flex.mk
index 9a3f840b..6ce768c3 100644
--- a/bsp/buildroot/package/flex/flex.mk
+++ b/bsp/buildroot/package/flex/flex.mk
@@ -4,27 +4,28 @@
 #
 ################################################################################
 
-FLEX_VERSION = 2.5.37
-FLEX_SITE = http://download.sourceforge.net/project/flex
+FLEX_VERSION = 2.6.4
+FLEX_SITE = https://github.com/westes/flex/files/981163
 FLEX_INSTALL_STAGING = YES
 FLEX_LICENSE = FLEX
 FLEX_LICENSE_FILES = COPYING
-FLEX_DEPENDENCIES = \
-	$(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4
-FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4
-# we don't have a host-gettext/libintl
+FLEX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-m4
 HOST_FLEX_DEPENDENCIES = host-m4
 
-define FLEX_DISABLE_PROGRAM
-	$(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in
-endef
-FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM
+# 0001-build-AC_USE_SYSTEM_EXTENSIONS-in-configure.ac.patch
+# 0002-build-make-it-possible-to-disable-the-build-of-the-f.patch
+# 0003-build-make-it-possible-to-disable-the-build-of-the-d.patch
+FLEX_AUTORECONF = YES
+FLEX_GETTEXTIZE = YES
+FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 \
+	ac_cv_func_reallocarray=no
 
-# flex++ symlink is broken when flex binary is not installed
-define FLEX_REMOVE_BROKEN_SYMLINK
-	rm -f $(TARGET_DIR)/usr/bin/flex++
-endef
-FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK
+# Don't enable programs, they are not needed on the target, and
+# require MMU support.
+# Don't enable the doc, it's not needed on the target and requires
+# special tools (help2man) to build.
+FLEX_CONF_OPTS += --disable-program --disable-doc
+HOST_FLEX_CONF_OPTS = --disable-doc
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/flickcurl/flickcurl.mk b/bsp/buildroot/package/flickcurl/flickcurl.mk
index ce836f76..610b81f4 100644
--- a/bsp/buildroot/package/flickcurl/flickcurl.mk
+++ b/bsp/buildroot/package/flickcurl/flickcurl.mk
@@ -6,7 +6,7 @@
 
 FLICKCURL_VERSION = 1.26
 FLICKCURL_SITE = http://download.dajobe.org/flickcurl
-FLICKCURL_LICENSE = LGPLv2.1+ or GPLv2+ or Apache 2.0+
+FLICKCURL_LICENSE = LGPL-2.1+ or GPL-2.0+ or Apache-2.0+
 FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
 FLICKCURL_INSTALL_STAGING = YES
 FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
diff --git a/bsp/buildroot/package/flite/flite.hash b/bsp/buildroot/package/flite/flite.hash
index e4dd0c63..67d6941e 100644
--- a/bsp/buildroot/package/flite/flite.hash
+++ b/bsp/buildroot/package/flite/flite.hash
@@ -1,2 +1,4 @@
 # locally computed hash
 sha256 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c flite-1.4-release.tar.bz2
+# License files, locally calculated
+sha256 4cbeaee8c9a8f23f251f0ce56e9212d244d9ea6b0dbe48601623d920054249a1 flite-1.4-release/COPYING
diff --git a/bsp/buildroot/package/flite/flite.mk b/bsp/buildroot/package/flite/flite.mk
index 611e3345..72376e56 100644
--- a/bsp/buildroot/package/flite/flite.mk
+++ b/bsp/buildroot/package/flite/flite.mk
@@ -24,7 +24,7 @@ FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION)
 # build in flite-1.4-release/
 FLITE_STRIP_COMPONENTS = 0
 FLITE_SUBDIR = flite-$(FLITE_VERSION)-release
-FLITE_LICENSE = BSD-4c
+FLITE_LICENSE = BSD-4-Clause
 FLITE_LICENSE_FILES = $(FLITE_SUBDIR)/COPYING
 
 FLITE_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/flot/Config.in b/bsp/buildroot/package/flot/Config.in
index 4c0d3ec3..40448720 100644
--- a/bsp/buildroot/package/flot/Config.in
+++ b/bsp/buildroot/package/flot/Config.in
@@ -44,7 +44,8 @@ config BR2_PACKAGE_FLOT_ERRORBARS
 config BR2_PACKAGE_FLOT_FILLBETWEEN
 	bool "fillbetween"
 	help
-	  Flot plugin for computing bottoms for filled line and bar charts
+	  Flot plugin for computing bottoms for filled line and bar
+	  charts
 
 config BR2_PACKAGE_FLOT_IMAGE
 	bool "image"
@@ -54,7 +55,8 @@ config BR2_PACKAGE_FLOT_IMAGE
 config BR2_PACKAGE_FLOT_NAVIGATE
 	bool "navigate"
 	help
-	  Flot plugin for adding panning and zooming capabilities to a plot
+	  Flot plugin for adding panning and zooming capabilities to a
+	  plot
 
 config BR2_PACKAGE_FLOT_PIE
 	bool "pie"
diff --git a/bsp/buildroot/package/fltk/0002-jpeg-9.patch b/bsp/buildroot/package/fltk/0002-jpeg-9.patch
deleted file mode 100644
index 11ae85ee..00000000
--- a/bsp/buildroot/package/fltk/0002-jpeg-9.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From http://www.fltk.org/str.php?L2920
-However it's not yet applied apparently until bundled jpeg is upgraded.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx fltk-1.3.2/src/Fl_JPEG_Image.cxx
---- fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx	2014-07-03 12:56:27.731197463 -0300
-+++ fltk-1.3.2/src/Fl_JPEG_Image.cxx	2014-07-03 12:56:57.907218257 -0300
-@@ -155,7 +155,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_stdio_src(&dinfo, fp);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
-@@ -333,7 +333,7 @@
-   
-   jpeg_create_decompress(&dinfo);
-   jpeg_mem_src(&dinfo, data);
--  jpeg_read_header(&dinfo, 1);
-+  jpeg_read_header(&dinfo, TRUE);
-   
-   dinfo.quantize_colors      = (boolean)FALSE;
-   dinfo.out_color_space      = JCS_RGB;
diff --git a/bsp/buildroot/package/fltk/fltk.hash b/bsp/buildroot/package/fltk/fltk.hash
index 7b9b67dc..af968aac 100644
--- a/bsp/buildroot/package/fltk/fltk.hash
+++ b/bsp/buildroot/package/fltk/fltk.hash
@@ -1,4 +1,4 @@
-# From http://www.fltk.org/software.php?VERSION=1.3.3
-md5	9ccdb0d19dc104b87179bd9fd10822e3	fltk-1.3.3-source.tar.gz
+# From http://www.fltk.org/software.php?VERSION=1.3.4
+md5 d7fcd27ab928648e1a1366dd2e273970 fltk-1.3.4-1-source.tar.gz
 # Locally generated
-sha256	f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97	fltk-1.3.3-source.tar.gz
+sha256 7fb2c8882433ce694e6900c94fda505e8f4ed3fa9c7e597007098a33b85c53f4  fltk-1.3.4-1-source.tar.gz
diff --git a/bsp/buildroot/package/fltk/fltk.mk b/bsp/buildroot/package/fltk/fltk.mk
index 9b67bd32..611d79da 100644
--- a/bsp/buildroot/package/fltk/fltk.mk
+++ b/bsp/buildroot/package/fltk/fltk.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-FLTK_VERSION = 1.3.3
-FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz
+FLTK_VERSION = 1.3.4
+FLTK_SOURCE = fltk-$(FLTK_VERSION)-1-source.tar.gz
 FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION)
 FLTK_INSTALL_STAGING = YES
 # We force --libdir=/usr/lib, because by default, it is set to
@@ -19,7 +19,7 @@ FLTK_CONF_OPTS = --enable-threads --with-x --disable-gl \
 	--libdir=/usr/lib
 FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt
 FLTK_CONFIG_SCRIPTS = fltk-config
-FLTK_LICENSE = LGPLv2 with exceptions
+FLTK_LICENSE = LGPL-2.0 with exceptions
 FLTK_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_CAIRO),y)
diff --git a/bsp/buildroot/package/fmc/Config.in b/bsp/buildroot/package/fmc/Config.in
index b7398e2b..4399aa2c 100644
--- a/bsp/buildroot/package/fmc/Config.in
+++ b/bsp/buildroot/package/fmc/Config.in
@@ -15,11 +15,11 @@ config BR2_PACKAGE_FMC
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_FMLIB
 	help
-	  The Frame Manager Configuration tool is Freescale PowerPC platform
-	  software package whose primary purpose is converting
+	  The Frame Manager Configuration tool is Freescale PowerPC
+	  platform software package whose primary purpose is converting
 	  Parse-Classify-Police-Distribute (PCD) descriptions of network
 	  packets flow into hardware configuration. The tool provides an
-	  abstraction layer between the end customer's vision of the PCD task
-	  definition and real hardware implementation.
+	  abstraction layer between the end customer's vision of the PCD
+	  task definition and real hardware implementation.
 
 	  http://cache.freescale.com/files/32bit/doc/app_note/AN4760.pdf
diff --git a/bsp/buildroot/package/fmlib/Config.in b/bsp/buildroot/package/fmlib/Config.in
index d399cabe..df4ae440 100644
--- a/bsp/buildroot/package/fmlib/Config.in
+++ b/bsp/buildroot/package/fmlib/Config.in
@@ -7,10 +7,11 @@ config BR2_PACKAGE_FMLIB
 	depends on BR2_powerpc_e500mc || BR2_powerpc_e6500
 	depends on BR2_LINUX_KERNEL
 	help
-	  The Frame Manager library provides Freescale PowerPC platforms an
-	  API on top of the Frame Manager driver ioctl calls, that provides
-	  a user space application with a simple way to configure driver
-	  parameters and PCD (parse - classify - distribute) rules.
+	  The Frame Manager library provides Freescale PowerPC platforms
+	  an API on top of the Frame Manager driver ioctl calls, that
+	  provides a user space application with a simple way to
+	  configure driver parameters and PCD (parse - classify -
+	  distribute) rules.
 
 	  http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README
 
diff --git a/bsp/buildroot/package/fmlib/fmlib.mk b/bsp/buildroot/package/fmlib/fmlib.mk
index 16e81769..e67ab1e5 100644
--- a/bsp/buildroot/package/fmlib/fmlib.mk
+++ b/bsp/buildroot/package/fmlib/fmlib.mk
@@ -6,7 +6,7 @@
 
 FMLIB_VERSION = fsl-sdk-v2.0
 FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git
-FMLIB_LICENSE = BSD-3c, GPLv2+
+FMLIB_LICENSE = BSD-3-Clause, GPL-2.0+
 FMLIB_LICENSE_FILES = COPYING
 FMLIB_DEPENDENCIES = linux
 FMLIB_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/fmt/Config.in b/bsp/buildroot/package/fmt/Config.in
new file mode 100644
index 00000000..69a6fb80
--- /dev/null
+++ b/bsp/buildroot/package/fmt/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FMT
+	bool "fmt"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	help
+	  fmt is an open-source formatting library for C++. It can be
+	  used as a safe alternative to printf or as a fast alternative
+	  to IOStreams.
+
+comment "fmt needs a toolchain w/ C++, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/fmt/fmt.hash b/bsp/buildroot/package/fmt/fmt.hash
new file mode 100644
index 00000000..47087a41
--- /dev/null
+++ b/bsp/buildroot/package/fmt/fmt.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 35300a0d356529447a79ed5ccf419239d8b34f916e5d4625f046fd37afa3650a  fmt-4.0.0.tar.gz
diff --git a/bsp/buildroot/package/fmt/fmt.mk b/bsp/buildroot/package/fmt/fmt.mk
new file mode 100644
index 00000000..c47b03e8
--- /dev/null
+++ b/bsp/buildroot/package/fmt/fmt.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# fmt
+#
+################################################################################
+
+FMT_VERSION = 4.0.0
+FMT_SITE = $(call github,fmtlib,fmt,$(FMT_VERSION))
+FMT_LICENSE = BSD-2-Clause
+FMT_LICENSE_FILES = LICENSE.rst
+FMT_INSTALL_STAGING = YES
+
+FMT_CONF_OPTS = \
+	-DHAVE_OPEN=ON \
+	-DFMT_INSTALL=ON \
+	-DFMT_TEST=OFF
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/fmtools/fmtools.mk b/bsp/buildroot/package/fmtools/fmtools.mk
index 4b1b64fc..890fae1d 100644
--- a/bsp/buildroot/package/fmtools/fmtools.mk
+++ b/bsp/buildroot/package/fmtools/fmtools.mk
@@ -6,7 +6,7 @@
 
 FMTOOLS_VERSION = 2.0.7
 FMTOOLS_SITE = http://benpfaff.org/fmtools
-FMTOOLS_LICENSE = GPLv2+
+FMTOOLS_LICENSE = GPL-2.0+
 FMTOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/font-awesome/font-awesome.hash b/bsp/buildroot/package/font-awesome/font-awesome.hash
index 9f3715e5..e266168a 100644
--- a/bsp/buildroot/package/font-awesome/font-awesome.hash
+++ b/bsp/buildroot/package/font-awesome/font-awesome.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  7813f416057da622b16229b10fef550e1dc64c5bb59871cd38fa86e76dfdbae8  font-awesome-v4.5.0.tar.gz
+sha256 de512ba0e1dead382bbfce372cde74b3f18971d876fffb635ee9333f0db05d43  font-awesome-v4.7.0.tar.gz
diff --git a/bsp/buildroot/package/font-awesome/font-awesome.mk b/bsp/buildroot/package/font-awesome/font-awesome.mk
index 3d2cccae..f3940104 100644
--- a/bsp/buildroot/package/font-awesome/font-awesome.mk
+++ b/bsp/buildroot/package/font-awesome/font-awesome.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-FONT_AWESOME_VERSION = v4.5.0
+FONT_AWESOME_VERSION = v4.7.0
 FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,$(FONT_AWESOME_VERSION))
-FONT_AWESOME_LICENSE = OFLv1.1 (font), MIT (CSS, LESS and Sass files)
+FONT_AWESOME_LICENSE = OFL-1.1 (font), MIT (CSS, LESS and Sass files)
 FONT_AWESOME_DIRECTORIES_LIST = css fonts less scss
 
 define FONT_AWESOME_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/fontconfig/Config.in b/bsp/buildroot/package/fontconfig/Config.in
index 1c54a433..218fdb2e 100644
--- a/bsp/buildroot/package/fontconfig/Config.in
+++ b/bsp/buildroot/package/fontconfig/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_EXPAT
 	help
-	  Fontconfig is a library for configuring and customizing font access.
+	  Fontconfig is a library for configuring and customizing font
+	  access.
 
 	  http://www.fontconfig.org/
diff --git a/bsp/buildroot/package/fontconfig/fontconfig.hash b/bsp/buildroot/package/fontconfig/fontconfig.hash
index ad358255..e9963f6f 100644
--- a/bsp/buildroot/package/fontconfig/fontconfig.hash
+++ b/bsp/buildroot/package/fontconfig/fontconfig.hash
@@ -1,2 +1,2 @@
-# From https://lists.freedesktop.org/archives/fontconfig/2016-August/005794.html
-sha256	b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3	fontconfig-2.12.1.tar.bz2
+# From https://lists.freedesktop.org/archives/fontconfig/2017-July/005961.html
+sha256 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c  fontconfig-2.12.4.tar.bz2
diff --git a/bsp/buildroot/package/fontconfig/fontconfig.mk b/bsp/buildroot/package/fontconfig/fontconfig.mk
index 93f2a159..71a0b457 100644
--- a/bsp/buildroot/package/fontconfig/fontconfig.mk
+++ b/bsp/buildroot/package/fontconfig/fontconfig.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-FONTCONFIG_VERSION = 2.12.1
+FONTCONFIG_VERSION = 2.12.4
 FONTCONFIG_SITE = http://fontconfig.org/release
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
 FONTCONFIG_INSTALL_STAGING = YES
-FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
-HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf
+FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf
+HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf host-gperf
 FONTCONFIG_LICENSE = fontconfig license
 FONTCONFIG_LICENSE_FILES = COPYING
 
diff --git a/bsp/buildroot/package/fping/fping.hash b/bsp/buildroot/package/fping/fping.hash
index 99c01cfa..e97709ca 100644
--- a/bsp/buildroot/package/fping/fping.hash
+++ b/bsp/buildroot/package/fping/fping.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	d86f2281bda4653c7049e6ba8fce24ba67edbf9193b7bb1cf6219b0c8ddce4e6	fping-3.12.tar.gz
+sha256 67eb4152b98ad34f99d2eec4e1098a0bb52caf13c0c89cd147349d08190fe8ce  fping-4.0.tar.gz
diff --git a/bsp/buildroot/package/fping/fping.mk b/bsp/buildroot/package/fping/fping.mk
index c576dd1a..5af46c67 100644
--- a/bsp/buildroot/package/fping/fping.mk
+++ b/bsp/buildroot/package/fping/fping.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FPING_VERSION = 3.12
+FPING_VERSION = 4.0
 FPING_SITE = http://fping.org/dist
 FPING_LICENSE = BSD-like
 FPING_LICENSE_FILES = COPYING
diff --git a/bsp/buildroot/package/freeradius-client/freeradius-client.mk b/bsp/buildroot/package/freeradius-client/freeradius-client.mk
index 0ed7fbeb..981ed163 100644
--- a/bsp/buildroot/package/freeradius-client/freeradius-client.mk
+++ b/bsp/buildroot/package/freeradius-client/freeradius-client.mk
@@ -6,7 +6,7 @@
 
 FREERADIUS_CLIENT_VERSION = 1.1.7
 FREERADIUS_CLIENT_SITE = ftp://ftp.freeradius.org/pub/freeradius
-FREERADIUS_CLIENT_LICENSE = BSD-2c
+FREERADIUS_CLIENT_LICENSE = BSD-2-Clause
 FREERADIUS_CLIENT_LICENSE_FILES = COPYRIGHT
 FREERADIUS_CLIENT_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/freerdp/0001-Fix-gstreamer-1.0-detection.patch b/bsp/buildroot/package/freerdp/0001-Fix-gstreamer-1.0-detection.patch
new file mode 100644
index 00000000..fadfe117
--- /dev/null
+++ b/bsp/buildroot/package/freerdp/0001-Fix-gstreamer-1.0-detection.patch
@@ -0,0 +1,28 @@
+From 368989526c32cdf9d680a397fede3cb773fa2609 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 28 Jul 2017 16:31:41 -0400
+Subject: [PATCH 1/1] Fix gstreamer-1.0 detection
+
+[yann.morin.1998@free.fr: backport from upstream]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+ cmake/FindGStreamer_1_0.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/FindGStreamer_1_0.cmake b/cmake/FindGStreamer_1_0.cmake
+index 3aa8fc6dc..6fbc0ecc5 100644
+--- a/cmake/FindGStreamer_1_0.cmake
++++ b/cmake/FindGStreamer_1_0.cmake
+@@ -59,7 +59,7 @@ macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _library)
+ 
+     string(REGEX MATCH "(.*)>=(.*)" _dummy "${_pkgconfig_name}")
+     if ("${CMAKE_MATCH_2}" STREQUAL "")
+-        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GStreamer_FIND_VERSION}")
++        pkg_check_modules(PC_${_component_prefix} "${_pkgconfig_name} >= ${GSTREAMER_1_0_MINIMUM_VERSION}")
+     else ()
+         pkg_check_modules(PC_${_component_prefix} ${_pkgconfig_name})
+     endif ()
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/freerdp/0001-fix-building-shared-libs.patch b/bsp/buildroot/package/freerdp/0001-fix-building-shared-libs.patch
deleted file mode 100644
index 8922cb15..00000000
--- a/bsp/buildroot/package/freerdp/0001-fix-building-shared-libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-winpr/tools: fix building shared libs
-
-libwinpr-makecert-tool.a is used to build libxfreerdp-server.so, so even
-if we are building a static libwinpr-makecert-tool.a library, we need to
-build it with -fPIC.
-
-Patch and commit log suggested by Samuel MARTIN.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Cc: Samuel Martin <s.martin49@gmail.com>
-
-diff -durN freerdp-440916eae2e07463912d5fe507677e67096eb083.orig/winpr/tools/makecert/CMakeLists.txt freerdp-440916eae2e07463912d5fe507677e67096eb083/winpr/tools/makecert/CMakeLists.txt
---- freerdp-440916eae2e07463912d5fe507677e67096eb083.orig/winpr/tools/makecert/CMakeLists.txt	2014-08-25 06:52:43.000000000 -0700
-+++ freerdp-440916eae2e07463912d5fe507677e67096eb083/winpr/tools/makecert/CMakeLists.txt	2014-10-24 15:39:39.600319523 -0700
-@@ -37,4 +37,11 @@
- add_subdirectory(cli)
- 
- set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
-+
-+if(BUILD_SHARED_LIBS)
-+	# build libwinpr-makecert-tool.a with PIC because it is used to build
-+	# the shared library libxfreerdp-server.so.
-+	set_property(TARGET ${MODULE_NAME} PROPERTY POSITION_INDEPENDENT_CODE TRUE)
-+endif()
-+
- export_complex_library(LIBNAME ${MODULE_NAME})
diff --git a/bsp/buildroot/package/freerdp/0002-add-support-for-tz-package.patch b/bsp/buildroot/package/freerdp/0002-add-support-for-tz-package.patch
deleted file mode 100644
index 93e4afde..00000000
--- a/bsp/buildroot/package/freerdp/0002-add-support-for-tz-package.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 605d0a85183d2f9d5b0da5629cbadf01173bbb2f Mon Sep 17 00:00:00 2001
-From: Scott Fan <fancp2007@gmail.com>
-Date: Mon, 13 Jul 2015 15:01:17 +0800
-Subject: [PATCH] Add support for tz package
-
-Fixes error message while freerdp connected the remote desktop:
-Unable to detect time zone
-
-Signed-off-by: Scott Fan <fancp2007@gmail.com>
----
- libfreerdp/locale/timezone.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c
-index 3070f1f..4a06786 100644
---- a/libfreerdp/locale/timezone.c
-+++ b/libfreerdp/locale/timezone.c
-@@ -1539,7 +1539,8 @@ char* freerdp_get_unix_timezone_identifier()
- 	 * America/Montreal for example.
- 	 */
- 	
--	if ((len = readlink("/etc/localtime", buf, sizeof(buf) - 1)) != -1)
-+	if ((len = readlink("/etc/localtime", buf, sizeof(buf) - 1)) != -1 ||
-+	    (len = readlink("/etc/TZ", buf, sizeof(buf) - 1)) != -1)
- 	{
- 		int num = 0;
- 		int pos = len;
--- 
-2.4.5
-
diff --git a/bsp/buildroot/package/freerdp/0003-add-missing-define.patch b/bsp/buildroot/package/freerdp/0003-add-missing-define.patch
deleted file mode 100644
index a8f669e1..00000000
--- a/bsp/buildroot/package/freerdp/0003-add-missing-define.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-libwinpr/comm_seria: fix missing define
-
-FreeRDP uses CMSPAR, which is defined by glibc in bits/termios.h .
-
-glibc has two flavours of bits/termios.h: a genmeric one and an
-architecture-specific one. When installing, glibc will install the
-architecture-specific file if it exists, otherwise it installs the
-generic file. Only Alpha, MIPS, PPC and Sparc have their own
-bits/termios.h.
-
-The generic bits/termios.h, as well as the Alpha, PPC and Sparc flavours
-do define CMSPAR. However, the MIPS flavour does not define it.
-
-Define CMSPAR to the value from the generic value, which is also the
-value known to the Linux kernel for MIPS.
-
-Fixes:
-    http://autobuild.buildroot.org/results/0b4/0b4793f0bf9f4c57933897f3480054a4e06528ad/
-    http://autobuild.buildroot.org/results/7a2/7a2284d0a2987158fa2e78f789b07c8c6fcdb974/
-    http://autobuild.buildroot.org/results/387/3874088c3ccd4bbf76ea0c911ca1ef64c7dc9d1c/
-    ...
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Cc: Peter Korsgaard <jacmet@uclibc.org>
-Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-diff -durN freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.orig/winpr/libwinpr/comm/comm_serial_sys.c freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16/winpr/libwinpr/comm/comm_serial_sys.c
---- freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.orig/winpr/libwinpr/comm/comm_serial_sys.c	2015-09-04 16:20:17.000000000 +0100
-+++ freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16/winpr/libwinpr/comm/comm_serial_sys.c	2015-10-04 11:07:41.868513726 +0100
-@@ -27,6 +27,14 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <termios.h>
-+
-+/* glibc for MIPS has its own bits/termios.h which does not define
-+ * CMSPAR, so we vampirise the value from the generic bits/termios.h
-+ */
-+#ifndef CMSPAR
-+#define CMSPAR 010000000000
-+#endif
-+
- #include <unistd.h>
- 
- #include "comm_serial_sys.h"
diff --git a/bsp/buildroot/package/freerdp/0004-ffmpeg30.patch b/bsp/buildroot/package/freerdp/0004-ffmpeg30.patch
deleted file mode 100644
index a7998b78..00000000
--- a/bsp/buildroot/package/freerdp/0004-ffmpeg30.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From b7b66968f93f6ce75dd06d12638e14029bf3717b Mon Sep 17 00:00:00 2001
-From: Alexis Ballier <aballier@gentoo.org>
-Date: Thu, 17 Sep 2015 10:36:44 +0200
-Subject: [PATCH] channels/tsmf/client/ffmpeg: Fix build with ffmpeg git
- master.
-
-Replace old, deprecated and now removed, APIs with their new equivalent while retaining backward compatibility with old ffmpeg versions.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Downloaded from upstream commit:
- https://github.com/FreeRDP/FreeRDP/commit/f8ceb3f6061583c650bd4f6cddc10bc0471f2076]
----
- channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-index d0880e7..e1b9f83 100644
---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
-@@ -61,6 +61,9 @@
- #define AV_CODEC_ID_AC3 CODEC_ID_AC3
- #endif
- 
-+#if LIBAVUTIL_VERSION_MAJOR < 52
-+#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
-+#endif
- 
- typedef struct _TSMFFFmpegDecoder
- {
-@@ -102,7 +105,11 @@ static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_MED
- 	mdecoder->codec_context->bit_rate = media_type->BitRate;
- 	mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator;
- 	mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 	mdecoder->frame = avcodec_alloc_frame();
-+#else
-+	mdecoder->frame = av_frame_alloc();
-+#endif
- 	return TRUE;
- }
- 
-@@ -328,7 +335,11 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE *data, UI
- 		if (!mdecoder->decoded_data)
- 			return FALSE;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 		frame = avcodec_alloc_frame();
-+#else
-+		frame = av_frame_alloc();
-+#endif
- 		avpicture_fill((AVPicture*) frame, mdecoder->decoded_data,
- 					   mdecoder->codec_context->pix_fmt,
- 					   mdecoder->codec_context->width, mdecoder->codec_context->height);
-@@ -400,7 +411,11 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE *data, UI
- 									(int16_t *) dst, &frame_size, src, src_size);
- #else
- 		{
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- 			AVFrame *decoded_frame = avcodec_alloc_frame();
-+#else
-+			AVFrame *decoded_frame = av_frame_alloc();
-+#endif
- 			int got_frame = 0;
- 			AVPacket pkt;
- 			av_init_packet(&pkt);
-@@ -480,7 +495,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder)
- 
- 	switch (mdecoder->codec_context->pix_fmt)
- 	{
--		case PIX_FMT_YUV420P:
-+		case AV_PIX_FMT_YUV420P:
- 			return RDP_PIXFMT_I420;
- 		default:
- 			WLog_ERR(TAG, "unsupported pixel format %u",
diff --git a/bsp/buildroot/package/freerdp/Config.in b/bsp/buildroot/package/freerdp/Config.in
index 9dd2505a..59bc18b6 100644
--- a/bsp/buildroot/package/freerdp/Config.in
+++ b/bsp/buildroot/package/freerdp/Config.in
@@ -81,6 +81,7 @@ config BR2_PACKAGE_FREERDP_CLIENT_WL
 	bool "wayland client"
 	default y
 	depends on BR2_PACKAGE_WAYLAND
+	select BR2_PACKAGE_LIBXKBCOMMON
 
 endif
 
diff --git a/bsp/buildroot/package/freerdp/freerdp.hash b/bsp/buildroot/package/freerdp/freerdp.hash
index 2ced373b..f54a03e9 100644
--- a/bsp/buildroot/package/freerdp/freerdp.hash
+++ b/bsp/buildroot/package/freerdp/freerdp.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 1db496cca391f76382ef284db2d0306d5c15bf515ee2c964319c22272d969a32  freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.tar.gz
+sha256 68e0e3db638a9cc00b978815d9eabedffc23f4410dcaa7a7548bb751766d5b3e  freerdp-2.0.0-rc0.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE
diff --git a/bsp/buildroot/package/freerdp/freerdp.mk b/bsp/buildroot/package/freerdp/freerdp.mk
index c3a3e55d..0ceef576 100644
--- a/bsp/buildroot/package/freerdp/freerdp.mk
+++ b/bsp/buildroot/package/freerdp/freerdp.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-# Changeset on the master branch
-FREERDP_VERSION = 17834af7bb378f85a3b3cc4dcadaa5125a337e16
+FREERDP_VERSION = 2.0.0-rc0
 FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION))
 FREERDP_DEPENDENCIES = libglib2 openssl zlib
 FREERDP_LICENSE = Apache-2.0
@@ -17,7 +16,7 @@ FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev
 
 ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y)
 FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON
-FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 host-pkgconf
+FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2
 else
 FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF
 endif
@@ -57,6 +56,14 @@ else
 FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF
 endif
 
+# For the systemd journal
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+FREERDP_CONF_OPTS += -DWITH_LIBSYSTEMD=ON
+FREERDP_DEPENDENCIES += systemd
+else
+FREERDP_CONF_OPTS += -DWITH_LIBSYSTEMD=OFF
+endif
+
 ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
 FREERDP_CONF_OPTS += -DWITH_NEON=ON
 else
@@ -191,9 +198,11 @@ else
 FREERDP_CONF_OPTS += -DWITH_XV=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_WAYLAND),y)
-FREERDP_DEPENDENCIES += wayland
-FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON
+ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y)
+FREERDP_DEPENDENCIES += wayland libxkbcommon
+FREERDP_CONF_OPTS += \
+	-DWITH_WAYLAND=ON \
+	-DWAYLAND_SCANNER=$(HOST_DIR)/bin/wayland-scanner
 else
 FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF
 endif
diff --git a/bsp/buildroot/package/freescale-imx/Config.in b/bsp/buildroot/package/freescale-imx/Config.in
index 056728ff..e33a90d9 100644
--- a/bsp/buildroot/package/freescale-imx/Config.in
+++ b/bsp/buildroot/package/freescale-imx/Config.in
@@ -2,8 +2,9 @@ menuconfig BR2_PACKAGE_FREESCALE_IMX
 	bool "Freescale i.MX libraries"
 	depends on BR2_arm
 	help
-	  Those packages provide hardware acceleration for GPU or VPU, hardware
-	  optimization or some hardware tools for Freescale i.MX platforms.
+	  Those packages provide hardware acceleration for GPU or VPU,
+	  hardware optimization or some hardware tools for Freescale
+	  i.MX platforms.
 
 if BR2_PACKAGE_FREESCALE_IMX
 choice
@@ -28,7 +29,16 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
 	bool "imx53"
 
 config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
-	bool "imx6q"
+	bool "imx6q/imx6dl"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S
+	bool "imx6sl/imx6sx"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
+	bool "imx6ul/imx6ull"
+
+config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
+	bool "imx7d/imx7ulp"
 
 endchoice
 
@@ -41,6 +51,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM
 	default "IMX51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51
 	default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53
 	default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+	default "IMX6S" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S
+	default "IMX6UL" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6UL
+	default "IMX7" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
 
 config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
 	bool
@@ -49,9 +62,16 @@ config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
 		BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 || \
 		BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
 
+config BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
+	bool
+	default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q || \
+		BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6S || \
+		BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7
+
 source "package/freescale-imx/imx-codec/Config.in"
 source "package/freescale-imx/imx-kobs/Config.in"
 source "package/freescale-imx/imx-lib/Config.in"
+source "package/freescale-imx/imx-m4fwloader/Config.in"
 source "package/freescale-imx/imx-parser/Config.in"
 source "package/freescale-imx/imx-uuc/Config.in"
 source "package/freescale-imx/imx-vpu/Config.in"
@@ -61,7 +81,8 @@ if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFO
 source "package/freescale-imx/gpu-amd-bin-mx51/Config.in"
 source "package/freescale-imx/libz160/Config.in"
 endif
-if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q
+if BR2_PACKAGE_FREESCALE_IMX_HAS_VIV_GPU
+source "package/freescale-imx/imx-gpu-g2d/Config.in"
 source "package/freescale-imx/imx-gpu-viv/Config.in"
 source "package/freescale-imx/kernel-module-imx-gpu-viv/Config.in"
 endif
diff --git a/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash b/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
index a6e5bd58..ca8556fa 100644
--- a/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
+++ b/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.hash
@@ -1 +1,4 @@
-sha256 c5bd4bff48cce9715a5d6d2c190ff3cd2262c7196f7facb9b0eda231c92cc223  firmware-imx-5.4.bin
+# Locally calculated
+sha256 3e107d83ed2367c9565250d6ff3903cc604bf4d9aa505391260ead0f51ceb8d9  firmware-imx-7.2.bin
+sha256 faf01d10e484879247963eb97d96622a980232e22a35e487dfe53b13708b686a  EULA
+sha256 0f34f6175247762e2e1c38319aadf657a53f00ce124e569dfc61b30451549e7a  COPYING
diff --git a/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk b/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
index 08fb4636..630afcaa 100644
--- a/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
+++ b/bsp/buildroot/package/freescale-imx/firmware-imx/firmware-imx.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FIRMWARE_IMX_VERSION = 5.4
+FIRMWARE_IMX_VERSION = 7.2
 FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE)
 FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin
 
@@ -26,7 +26,6 @@ define FIRMWARE_IMX_INSTALL_TARGET_CMDS
 	cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx
 	mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \
 		$(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw
-	rm $(TARGET_DIR)/lib/firmware/imx/epdc/fsl-epdc.mk
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/freescale-imx/gpu-amd-bin-mx51/Config.in b/bsp/buildroot/package/freescale-imx/gpu-amd-bin-mx51/Config.in
index 337713c7..cd66c737 100644
--- a/bsp/buildroot/package/freescale-imx/gpu-amd-bin-mx51/Config.in
+++ b/bsp/buildroot/package/freescale-imx/gpu-amd-bin-mx51/Config.in
@@ -5,12 +5,12 @@ comment "gpu-amd-bin-mx51 needs a glibc EABI toolchain w/ C++"
 
 config BR2_PACKAGE_GPU_AMD_BIN_MX51
 	bool "gpu-amd-bin-mx51 (also imx53)"
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
-	select BR2_PACKAGE_HAS_LIBOPENVG
 	depends on BR2_ARM_EABI
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_HAS_LIBEGL
+	select BR2_PACKAGE_HAS_LIBGLES
+	select BR2_PACKAGE_HAS_LIBOPENVG
 	help
 	  Freescale libraries, headers and executables for the
 	  AMD GPU on i.MX5x, containing OpenGL/ES, OpenVG
@@ -26,6 +26,7 @@ choice
 	  Choose here which version to install.
 
 config BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11
+	bool "X11"
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XLIB_LIBX11
@@ -33,7 +34,6 @@ config BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11
 	select BR2_PACKAGE_XLIB_LIBXRENDER
 	select BR2_PACKAGE_XLIB_LIBXDMCP
 	select BR2_PACKAGE_XLIB_LIBXAU
-	bool "X11"
 
 comment "X11 backend needs X.org enabled"
 	depends on !BR2_PACKAGE_XORG7
diff --git a/bsp/buildroot/package/freescale-imx/imx-codec/Config.in b/bsp/buildroot/package/freescale-imx/imx-codec/Config.in
index df248b0c..0ecb92bf 100644
--- a/bsp/buildroot/package/freescale-imx/imx-codec/Config.in
+++ b/bsp/buildroot/package/freescale-imx/imx-codec/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_IMX_CODEC
 	bool "imx-codec"
-	depends on BR2_arm # Only relevant for i.MX
+	depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX
 	depends on BR2_TOOLCHAIN_USES_GLIBC # prebuilt binaries
 	help
 	  Binary codec libraries for the NXP i.MX SoCs.
@@ -9,5 +9,5 @@ config BR2_PACKAGE_IMX_CODEC
 	  an upstream.
 
 comment "imx-codec needs a glibc toolchain"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_aarch64
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.hash b/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.hash
index 2bb7a242..53d8f71c 100644
--- a/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256	98fe71cb44f7e858c64c5eda81741ed02f40afaadc3d4ed1e693c7d1e684b81d  imx-codec-4.1.4.bin
+sha256	20d3f9b4187fcd9e7007c94558a00bab1191513eee74b6f0d8c7b43f874e06ed  imx-codec-4.2.1.bin
diff --git a/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.mk b/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.mk
index 911ad8b1..ea4d9011 100644
--- a/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-codec/imx-codec.mk
@@ -4,15 +4,19 @@
 #
 ################################################################################
 
-IMX_CODEC_VERSION = 4.1.4
+IMX_CODEC_VERSION = 4.2.1
 IMX_CODEC_SITE = $(FREESCALE_IMX_SITE)
 IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin
 IMX_CODEC_INSTALL_STAGING = YES
 
-IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3c (flac, ogg headers)
+IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3-Clause (flac, ogg headers)
 IMX_CODEC_LICENSE_FILES = EULA COPYING
 IMX_CODEC_REDISTRIBUTE = NO
 
+ifeq ($(BR2_aarch64),y)
+IMX_CODEC_CONF_OPTS += --enable-armv8
+endif
+
 ifeq ($(BR2_ARM_EABIHF),y)
 IMX_CODEC_CONF_OPTS += --enable-fhw
 endif
diff --git a/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in b/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in
new file mode 100644
index 00000000..47375788
--- /dev/null
+++ b/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/Config.in
@@ -0,0 +1,25 @@
+comment "imx-gpu-g2d needs a glibc toolchain with armhf enabled"
+	depends on BR2_arm
+	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF
+
+config BR2_PACKAGE_IMX_GPU_G2D
+	bool "imx-gpu-g2d"
+	# Pre-built binaries only available for ARM EABIhf
+	depends on BR2_ARM_EABIHF
+	# Library binaries are linked against libc.so.6
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_IMX_GPU_VIV
+	help
+	  Userspace 2D libraries for Vivante GPU on i.MX platforms.
+
+	  This library is provided by NXP as-is and doesn't have an
+	  upstream.
+
+if BR2_PACKAGE_IMX_GPU_G2D
+
+config BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES
+	bool "install examples"
+	help
+	  Copy the Vivante G2D examples to the target.
+
+endif
diff --git a/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash b/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
new file mode 100644
index 00000000..299ec703
--- /dev/null
+++ b/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.hash
@@ -0,0 +1 @@
+sha256	070a95aa9942bd67e8ba4012962df74143bffb9998301ac097dab5e1437000d8  imx-gpu-g2d-6.2.2.p0.bin
diff --git a/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk b/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
new file mode 100644
index 00000000..0c92b826
--- /dev/null
+++ b/bsp/buildroot/package/freescale-imx/imx-gpu-g2d/imx-gpu-g2d.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# imx-gpu-g2d
+#
+################################################################################
+
+IMX_GPU_G2D_VERSION = 6.2.2.p0
+IMX_GPU_G2D_SITE = $(FREESCALE_IMX_SITE)
+IMX_GPU_G2D_SOURCE = imx-gpu-g2d-$(IMX_GPU_G2D_VERSION).bin
+IMX_GPU_G2D_DEPENDENCIES = imx-gpu-viv
+IMX_GPU_G2D_INSTALL_STAGING = YES
+
+IMX_GPU_G2D_LICENSE = NXP Semiconductor Software License Agreement
+IMX_GPU_G2D_LICENSE_FILES = EULA COPYING
+IMX_GPU_G2D_REDISTRIBUTE = NO
+
+define IMX_GPU_G2D_EXTRACT_CMDS
+	$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_G2D_SOURCE))
+endef
+
+define IMX_GPU_G2D_INSTALL_STAGING_CMDS
+	cp -a $(@D)/g2d/usr/* $(STAGING_DIR)/usr
+endef
+
+ifeq ($(BR2_PACKAGE_IMX_GPU_G2D_EXAMPLES),y)
+define IMX_GPU_G2D_INSTALL_EXAMPLES
+	mkdir -p $(TARGET_DIR)/usr/share/examples/
+	cp -a $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/
+endef
+endif
+
+define IMX_GPU_G2D_INSTALL_TARGET_CMDS
+	$(IMX_GPU_G2D_INSTALL_EXAMPLES)
+	cp -a $(@D)/g2d/usr/lib $(TARGET_DIR)/usr
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/freescale-imx/imx-gpu-viv/Config.in b/bsp/buildroot/package/freescale-imx/imx-gpu-viv/Config.in
index effb24b3..cf58ad47 100644
--- a/bsp/buildroot/package/freescale-imx/imx-gpu-viv/Config.in
+++ b/bsp/buildroot/package/freescale-imx/imx-gpu-viv/Config.in
@@ -4,13 +4,13 @@ comment "imx-gpu-viv needs a glibc toolchain with armhf enabled"
 
 config BR2_PACKAGE_IMX_GPU_VIV
 	bool "imx-gpu-viv"
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
-	select BR2_PACKAGE_HAS_LIBOPENVG
 	# Pre-built binaries only available for ARM EABIhf
 	depends on BR2_ARM_EABIHF
 	# Library binaries are linked against libc.so.6
 	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_HAS_LIBEGL
+	select BR2_PACKAGE_HAS_LIBGLES
+	select BR2_PACKAGE_HAS_LIBOPENVG
 	help
 	  Userspace libraries for Vivante GPU on i.MX6 platforms
 
@@ -60,17 +60,6 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
 config BR2_PACKAGE_PROVIDES_LIBOPENVG
 	default "imx-gpu-viv"
 
-config BR2_PACKAGE_IMX_GPU_VIV_APITRACE
-	bool "install apitrace tools"
-	select BR2_PACKAGE_IMX_GPU_VIV_G2D
-	select BR2_PACKAGE_LIBPNG
-	help
-	  Copy the apitrace tool to the target. Apitrace consists
-	  of a set of tools to trace, replay and/or inspect OpenGL,
-	  OpenGL ES APIs calls
-
-	  http://apitrace.github.io/
-
 config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES
 	bool "install examples"
 	help
@@ -78,11 +67,6 @@ config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES
 
 	  Warning: examples take approximately 150 MB of disk space.
 
-config BR2_PACKAGE_IMX_GPU_VIV_G2D
-	bool "install G2D libraries"
-	help
-	  Copy the GPU2D libraries to the target.
-
 config BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO
 	bool "install gmem_info tool"
 	help
diff --git a/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
index 6c526c58..894bc90d 100644
--- a/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash
@@ -1 +1 @@
-sha256	caaabd59a259e29aa5b7f9d1d7f3fe71cff9336ba44904485d258baef276351f  imx-gpu-viv-5.0.11.p8.6-hfp.bin
+sha256	4f93a4412c93ca5959aa2437bfed2ecbaf983b5b272be5977f76a967de5db150  imx-gpu-viv-6.2.2.p0-aarch32.bin
diff --git a/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
index 961f574c..9104750c 100644
--- a/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMX_GPU_VIV_VERSION = 5.0.11.p8.6-hfp
+IMX_GPU_VIV_VERSION = 6.2.2.p0-aarch32
 IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE)
 IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin
 
@@ -43,8 +43,8 @@ define IMX_GPU_VIV_BUILD_CMDS
 	ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so
 	ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2
 	ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0
-	ln -sf libVIVANTE-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so
 	ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so
+	ln -sf libVDK-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVDK.so
 endef
 
 ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
@@ -52,43 +52,35 @@ define IMX_GPU_VIV_FIXUP_FB_HEADERS
 	$(SED) '39i\
 		#if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\
 		#define EGL_API_FB \n\
-		#endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h
+		#endif' $(STAGING_DIR)/usr/include/EGL/eglplatform.h
 endef
 endif
 
-ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y)
-define IMX_GPU_VIV_INSTALL_G2D_STAGING
-	cp -dpfr $(@D)/g2d/usr/include/* $(STAGING_DIR)/usr/include/
-	cp -dpfr $(@D)/g2d/usr/lib/* $(STAGING_DIR)/usr/lib/
+ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb)
+define IMX_GPU_VIV_FIXUP_PKGCONFIG
+	ln -sf egl_linuxfb.pc $(@D)/gpu-core/usr/lib/pkgconfig/egl.pc
+endef
+endif
+
+ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
+define IMX_GPU_VIV_FIXUP_PKGCONFIG
+	for lib in egl gbm glesv1_cm glesv2 vg; do \
+		ln -sf $${lib}_x11.pc $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc || exit 1; \
+	done
 endef
 endif
 
 define IMX_GPU_VIV_INSTALL_STAGING_CMDS
 	cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr
 	$(IMX_GPU_VIV_FIXUP_FB_HEADERS)
-	$(IMX_GPU_VIV_INSTALL_G2D_STAGING)
-	for lib in egl glesv2 vg; do \
+	$(IMX_GPU_VIV_FIXUP_PKGCONFIG)
+	for lib in egl gbm glesv1_cm glesv2 vg; do \
 		$(INSTALL) -m 0644 -D \
 			$(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \
 			$(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \
 	done
 endef
 
-ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_APITRACE),y)
-IMX_GPU_VIV_DEPENDENCIES += libpng
-ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
-define IMX_GPU_VIV_INSTALL_APITRACE
-	cp -dpfr $(@D)/apitrace/x11/usr/bin/* $(TARGET_DIR)/usr/bin/
-	cp -dpfr $(@D)/apitrace/x11/usr/lib/* $(TARGET_DIR)/usr/lib/
-endef
-else
-define IMX_GPU_VIV_INSTALL_APITRACE
-	cp -dpfr $(@D)/apitrace/non-x11/usr/bin/* $(TARGET_DIR)/usr/bin/
-	cp -dpfr $(@D)/apitrace/non-x11/usr/lib/* $(TARGET_DIR)/usr/lib/
-endef
-endif
-endif
-
 ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y)
 define IMX_GPU_VIV_INSTALL_EXAMPLES
 	mkdir -p $(TARGET_DIR)/usr/share/examples/
@@ -96,12 +88,6 @@ define IMX_GPU_VIV_INSTALL_EXAMPLES
 endef
 endif
 
-ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y)
-define IMX_GPU_VIV_INSTALL_G2D
-	cp -dpfr $(@D)/g2d/usr/lib/* $(TARGET_DIR)/usr/lib/
-endef
-endif
-
 ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO),y)
 define IMX_GPU_VIV_INSTALL_GMEM_INFO
 	cp -dpfr $(@D)/gpu-tools/gmem-info/usr/bin/* $(TARGET_DIR)/usr/bin/
@@ -112,12 +98,10 @@ endif
 # Note that this is _required_, else ldconfig may create symlinks
 # to the wrong library
 define IMX_GPU_VIV_INSTALL_TARGET_CMDS
-	$(IMX_GPU_VIV_INSTALL_APITRACE)
 	$(IMX_GPU_VIV_INSTALL_EXAMPLES)
-	$(IMX_GPU_VIV_INSTALL_G2D)
 	$(IMX_GPU_VIV_INSTALL_GMEM_INFO)
 	cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr
-	for lib in EGL GAL VIVANTE GLESv2; do \
+	for lib in EGL GAL GLESv2 VDK; do \
 		for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \
 			case $$f in \
 				*-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \
diff --git a/bsp/buildroot/package/freescale-imx/imx-kobs/Config.in b/bsp/buildroot/package/freescale-imx/imx-kobs/Config.in
index fc2344ed..61be9f26 100644
--- a/bsp/buildroot/package/freescale-imx/imx-kobs/Config.in
+++ b/bsp/buildroot/package/freescale-imx/imx-kobs/Config.in
@@ -7,4 +7,3 @@ config BR2_PACKAGE_IMX_KOBS
 
 	  This library is provided by Freescale as-is and doesn't have
 	  an upstream.
-
diff --git a/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash b/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash
index 258d08c7..2ede0a9b 100644
--- a/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.hash
@@ -1 +1 @@
-sha256	5b040de6e3db5d47371b311e7068380926827a7a6ef02e45fb2ba08b680d0ec5  imx-kobs-b402243a04e5a6760a860445e5ff6a931d86f794.tar.gz
+sha256	5855c8964f908ad30e5d4500180ee57c51af68186289ef1bdf8553ee60d3b1f5  imx-kobs-a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b.tar.gz
diff --git a/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.mk b/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.mk
index 8f490c24..d6a250cf 100644
--- a/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-kobs/imx-kobs.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-IMX_KOBS_VERSION = b402243a04e5a6760a860445e5ff6a931d86f794
-IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION))
-IMX_KOBS_LICENSE = GPLv2+
+IMX_KOBS_VERSION = a0e9adce2fb7fcd57e794d7f9a5deba0f94f521b
+IMX_KOBS_SITE = $(call github,codeauroraforum,imx-kobs,$(IMX_KOBS_VERSION))
+IMX_KOBS_LICENSE = GPL-2.0+
 IMX_KOBS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/freescale-imx/imx-lib/Config.in b/bsp/buildroot/package/freescale-imx/imx-lib/Config.in
index 3b0f7a92..746788e4 100644
--- a/bsp/buildroot/package/freescale-imx/imx-lib/Config.in
+++ b/bsp/buildroot/package/freescale-imx/imx-lib/Config.in
@@ -7,10 +7,9 @@ config BR2_PACKAGE_IMX_LIB
 	depends on BR2_arm # Only relevant for i.MX
 	help
 	  Library of userspace helpers specific for the Freescale i.MX
-	  platform. It wraps the kernel interfaces for some i.MX platform
-	  specific drivers. It requires a kernel that includes the i.MX
-	  specific headers to be built.
+	  platform. It wraps the kernel interfaces for some i.MX
+	  platform specific drivers. It requires a kernel that
+	  includes the i.MX specific headers to be built.
 
 	  This library is provided by Freescale as-is and doesn't have
 	  an upstream.
-
diff --git a/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.hash b/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.hash
index 76dcb23f..b3fce59d 100644
--- a/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256 8d12c4a0a44d29569f1ead3a36adc28402b9c4036b53e11dd3ebf2295e3ce1d0  imx-lib-5.4.tar.gz
+sha256 245ace9b2c50d6c13a804d9c4492a5a850c626e7537f0d0bad81670b2824892f  imx-lib-rel_imx_4.9.x_1.0.0_ga.tar.gz
diff --git a/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.mk b/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.mk
index d3603ca9..e8236858 100644
--- a/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-lib/imx-lib.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-IMX_LIB_VERSION = 5.4
-IMX_LIB_SITE = $(FREESCALE_IMX_SITE)
-IMX_LIB_LICENSE = LGPLv2.1+
+IMX_LIB_VERSION = rel_imx_4.9.x_1.0.0_ga
+IMX_LIB_SITE = https://source.codeaurora.org/external/imx/imx-lib
+IMX_LIB_SITE_METHOD = git
+IMX_LIB_LICENSE = LGPL-2.1+
 IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1
 
 IMX_LIB_INSTALL_STAGING = YES
@@ -14,8 +15,6 @@ IMX_LIB_INSTALL_STAGING = YES
 # imx-lib needs access to imx-specific kernel headers
 IMX_LIB_DEPENDENCIES += linux
 IMX_LIB_INCLUDE = \
-	-I$(LINUX_DIR)/drivers/mxc/security/rng/include \
-	-I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \
 	-idirafter $(LINUX_DIR)/include/uapi
 
 IMX_LIB_MAKE_ENV = \
diff --git a/bsp/buildroot/package/freescale-imx/imx-m4fwloader/Config.in b/bsp/buildroot/package/freescale-imx/imx-m4fwloader/Config.in
new file mode 100644
index 00000000..937f82f9
--- /dev/null
+++ b/bsp/buildroot/package/freescale-imx/imx-m4fwloader/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_IMX_M4FWLOADER
+	bool "imx-m4fwloader"
+	depends on BR2_arm # Only relevant for i.MX
+	help
+	  This package provides a tool to load a firmware to the
+	  Cortex-M4 core available in some i.MX processors.
+
+	  https://github.com/codeauroraforum/imx-m4fwloader
diff --git a/bsp/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash b/bsp/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash
new file mode 100644
index 00000000..2bf3f15d
--- /dev/null
+++ b/bsp/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 fb6334900972fe389e808845417dd9045fb0f7eb47952fc22a00f4cdaf94af1a  imx-m4fwloader-8cf4d17a09ba23250d43381b49ba00d92406fad9.tar.gz
+sha256 c03cea027b4b40e4402fabd08557736727ec3d5bc54ad64ab6472de432198cad  LICENSE
diff --git a/bsp/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk b/bsp/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
new file mode 100644
index 00000000..cc484933
--- /dev/null
+++ b/bsp/buildroot/package/freescale-imx/imx-m4fwloader/imx-m4fwloader.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# imx-m4fwloader
+#
+################################################################################
+
+IMX_M4FWLOADER_VERSION = 8cf4d17a09ba23250d43381b49ba00d92406fad9
+IMX_M4FWLOADER_SITE = $(call github,codeauroraforum,imx-m4fwloader,$(IMX_M4FWLOADER_VERSION))
+IMX_M4FWLOADER_LICENSE = GPL-2.0+
+IMX_M4FWLOADER_LICENSE_FILES = LICENSE
+
+define IMX_M4FWLOADER_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o $(@D)/imx-m4fwloader \
+		$(@D)/m4fwloader.c
+endef
+
+define IMX_M4FWLOADER_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/imx-m4fwloader \
+		$(TARGET_DIR)/usr/sbin/imx-m4fwloader
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/freescale-imx/imx-parser/Config.in b/bsp/buildroot/package/freescale-imx/imx-parser/Config.in
index 526f0663..028b2bf6 100644
--- a/bsp/buildroot/package/freescale-imx/imx-parser/Config.in
+++ b/bsp/buildroot/package/freescale-imx/imx-parser/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_IMX_PARSER
 	bool "imx-parser"
-	depends on BR2_arm # Only relevant for i.MX
+	depends on BR2_arm || BR2_aarch64 # Only relevant for i.MX
 	help
 	  Binary parser libraries for the NXP i.MX SoCs.
 
diff --git a/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.hash b/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.hash
index f6e82338..3266f481 100644
--- a/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256	d3a03e60780bbbd0c92932f60bd34d2fe14ffecf6aa6b810723c3edf798cad1f  imx-parser-4.1.4.bin
+sha256	36d3ae7285f3a83a87abf680b8a52b3c07df869d2443de844fb5f0ff528ca862  imx-parser-4.2.1.bin
diff --git a/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.mk b/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.mk
index a57647c0..d79a4444 100644
--- a/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-parser/imx-parser.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMX_PARSER_VERSION = 4.1.4
+IMX_PARSER_VERSION = 4.2.1
 IMX_PARSER_SITE = $(FREESCALE_IMX_SITE)
 IMX_PARSER_SOURCE = imx-parser-$(IMX_PARSER_VERSION).bin
 IMX_PARSER_INSTALL_STAGING = YES
@@ -13,6 +13,10 @@ IMX_PARSER_LICENSE = NXP Semiconductor Software License Agreement
 IMX_PARSER_LICENSE_FILES = EULA COPYING
 IMX_PARSER_REDISTRIBUTE = NO
 
+ifeq ($(BR2_aarch64),y)
+IMX_PARSER_CONF_OPTS += --enable-armv8
+endif
+
 ifeq ($(BR2_ARM_EABIHF),y)
 IMX_PARSER_CONF_OPTS += --enable-fhw
 else
diff --git a/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash b/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash
index d6e4d97e..c9c29f86 100644
--- a/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 eac0c3e288c845cd9b82d02993f8358731a7a03e51591b27feeb453b143beb73  imx-uuc-3440b1108373e79669cc17ba1d2be91a123a2053.tar.gz
+sha256 1463e855d1229e6b6c02df2085f6bff5974bc061d13a61646b63675c160cba99  imx-uuc-2ae634281a39c82b6a8ee0fdcfbfbe42183ceb53.tar.gz
diff --git a/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk b/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk
index 12d93121..5e0bb3be 100644
--- a/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-uuc/imx-uuc.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-IMX_UUC_VERSION = 3440b1108373e79669cc17ba1d2be91a123a2053
-IMX_UUC_SITE = $(call github,NXPmicro,imx-uuc,$(IMX_UUC_VERSION))
-IMX_UUC_LICENSE = GPLv2+
+IMX_UUC_VERSION = 2ae634281a39c82b6a8ee0fdcfbfbe42183ceb53
+IMX_UUC_SITE = $(call github,codeauroraforum,imx-uuc,$(IMX_UUC_VERSION))
+IMX_UUC_LICENSE = GPL-2.0+
 IMX_UUC_LICENSE_FILES = COPYING
 
 # mkfs.vfat is needed to create a FAT partition used by g_mass_storage
@@ -21,7 +21,7 @@ define IMX_UUC_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 755 $(@D)/uuc $(TARGET_DIR)/usr/bin/uuc
 	$(INSTALL) -D -m 755 $(@D)/sdimage $(TARGET_DIR)/usr/bin/sdimage
 	dd if=/dev/zero of=$(TARGET_DIR)/fat bs=1M count=1
-	$(HOST_DIR)/usr/sbin/mkfs.vfat $(TARGET_DIR)/fat
+	$(HOST_DIR)/sbin/mkfs.vfat $(TARGET_DIR)/fat
 endef
 
 define IMX_UUC_INSTALL_INIT_SYSV
diff --git a/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash b/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
index b3d617de..0ac0f3d0 100644
--- a/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
+++ b/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	e1d6550426dfc59e4fd0352f1d312ea7eff5dcf18974f923ed7a85007cb40e27  imx-vpu-5.4.35.bin
+sha256	ee265e88d17c7369bd9cb917e7cce035b8c7ee2ba4491645fdab9f382f54beb0  imx-vpu-5.4.37.bin
diff --git a/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk b/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk
index 0b464d85..e3a1ee66 100644
--- a/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk
+++ b/bsp/buildroot/package/freescale-imx/imx-vpu/imx-vpu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMX_VPU_VERSION = 5.4.35
+IMX_VPU_VERSION = 5.4.37
 IMX_VPU_SITE = $(FREESCALE_IMX_SITE)
 IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin
 
diff --git a/bsp/buildroot/package/freescale-imx/imx-vpuwrap/Config.in b/bsp/buildroot/package/freescale-imx/imx-vpuwrap/Config.in
index 35095955..bdfa1478 100644
--- a/bsp/buildroot/package/freescale-imx/imx-vpuwrap/Config.in
+++ b/bsp/buildroot/package/freescale-imx/imx-vpuwrap/Config.in
@@ -13,7 +13,8 @@ config BR2_PACKAGE_IMX_VPUWRAP
 	depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU
 	select BR2_PACKAGE_IMX_VPU
 	help
-	  Wrapper library for the vpu library, giving it a different API.
+	  Wrapper library for the vpu library, giving it a different
+	  API.
 
 	  This library is provided by NXP as-is and doesn't have
 	  an upstream.
diff --git a/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in b/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
index bcc55175..038bd4d4 100644
--- a/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
+++ b/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/Config.in
@@ -7,8 +7,10 @@ config BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV
 	help
 	  Kernel loadable module for Vivante GPU.
 
-	  This package uses an exact copy of the GPU kernel driver source code
-	  of the same version as base and include fixes and improvements
-	  developed by FSL Community
+	  This package uses an exact copy of the GPU kernel driver
+	  source code of the same version as base and include fixes
+	  and improvements developed by FSL Community.
+
+	  This module is only meant for NXP-based kernel up to 4.1.x.
 
 	  https://github.com/Freescale/kernel-module-imx-gpu-viv
diff --git a/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
index 9c43ea39..c6204aff 100644
--- a/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
+++ b/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256	51dd137bd67ae991fa58fff4151c6bd7dd46bafd613f43e83d8403ec37217a90  kernel-module-imx-gpu-viv-bfa78b095a892705a09afe9514fc5d236b3124d2.tar.gz
+sha256	35db597ae0dd8e9e80511e5e9d882a01e4c178b83ffc192c8dd6a1a35859aa13  kernel-module-imx-gpu-viv-3b9e057f29853fd29364aa666328a92b807007d7.tar.gz
diff --git a/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
index bcbd8d25..2e6744c4 100644
--- a/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
+++ b/bsp/buildroot/package/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-KERNEL_MODULE_IMX_GPU_VIV_VERSION = bfa78b095a892705a09afe9514fc5d236b3124d2
+KERNEL_MODULE_IMX_GPU_VIV_VERSION = 3b9e057f29853fd29364aa666328a92b807007d7
 KERNEL_MODULE_IMX_GPU_VIV_SITE = \
 	$(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION))
-KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPLv2
+KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPL-2.0
 KERNEL_MODULE_IMX_GPU_VIV_LICENSE_FILES = COPYING
 
 KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \
diff --git a/bsp/buildroot/package/freescale-imx/libz160/Config.in b/bsp/buildroot/package/freescale-imx/libz160/Config.in
index 012efb9e..a40ecdc7 100644
--- a/bsp/buildroot/package/freescale-imx/libz160/Config.in
+++ b/bsp/buildroot/package/freescale-imx/libz160/Config.in
@@ -3,8 +3,9 @@ config BR2_PACKAGE_LIBZ160
 	depends on BR2_ARM_EABI
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
-	  An API for user space programs to perform 2D accelerated graphics
-	  operations on AMD GPU (included for examples in iMX5x chipsets)
+	  An API for user space programs to perform 2D accelerated
+	  graphics operations on AMD GPU (included for examples in
+	  iMX5x chipsets)
 
 comment "libz160 needs an EABI toolchain w/ glibc"
 	depends on !BR2_ARM_EABI || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/freeswitch-mod-bcg729/Config.in b/bsp/buildroot/package/freeswitch-mod-bcg729/Config.in
new file mode 100644
index 00000000..e75e2acb
--- /dev/null
+++ b/bsp/buildroot/package/freeswitch-mod-bcg729/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_FREESWITCH_MOD_BCG729
+	bool "freeswitch-mod-bcg729"
+	depends on BR2_PACKAGE_FREESWITCH
+	depends on !BR2_STATIC_LIBS # freeswitch
+	select BR2_PACKAGE_BCG729
+	help
+	  FreeSWITCH G.729A module using the opensource bcg729
+	  implementation by Belledonne Communications.
+
+	  https://github.com/xadhoom/mod_bcg729
diff --git a/bsp/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash b/bsp/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash
new file mode 100644
index 00000000..67804883
--- /dev/null
+++ b/bsp/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 135f545ad0eef49d1228f8d66a4e66f1ff5f1f8fdf115e88c1df3df8df49fdcb  freeswitch-mod-bcg729-c504eea91f225014380ae17c00b35e7173e316ad.tar.gz
+sha256 bb4680b13c3190429464a8308a07d7d891e6454349fb7be856e02405b25b1195  LICENSE
diff --git a/bsp/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk b/bsp/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk
new file mode 100644
index 00000000..15f9375f
--- /dev/null
+++ b/bsp/buildroot/package/freeswitch-mod-bcg729/freeswitch-mod-bcg729.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# freeswitch-mod-bcg729
+#
+################################################################################
+
+FREESWITCH_MOD_BCG729_VERSION = c504eea91f225014380ae17c00b35e7173e316ad
+FREESWITCH_MOD_BCG729_SITE = $(call github,xadhoom,mod_bcg729,$(FREESWITCH_MOD_BCG729_VERSION))
+FREESWITCH_MOD_BCG729_LICENSE = MPL-1.1
+FREESWITCH_MOD_BCG729_LICENSE_FILES = LICENSE
+FREESWITCH_MOD_BCG729_DEPENDENCIES = freeswitch bcg729
+
+# instead of patching the not cross-compile friendly Makefile from
+# upstream we issue the necessary build commands ourselves
+define FREESWITCH_MOD_BCG729_BUILD_CMDS
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		-I$(STAGING_DIR)/usr/include/freeswitch \
+		-fPIC -fomit-frame-pointer -fno-exceptions \
+		-c $(@D)/mod_bcg729.c -o $(@D)/mod_bcg729.o
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+		-fPIC -fomit-frame-pointer -fno-exceptions \
+		-shared -Xlinker -x -lm -lbcg729 -Wl,-Bdynamic \
+		-o $(@D)/mod_bcg729.so $(@D)/mod_bcg729.o
+endef
+
+define FREESWITCH_MOD_BCG729_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 $(@D)/mod_bcg729.so $(TARGET_DIR)/usr/lib/freeswitch/mod/mod_bcg729.so
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/freeswitch/freeswitch.hash b/bsp/buildroot/package/freeswitch/freeswitch.hash
index 6412511d..25421de9 100644
--- a/bsp/buildroot/package/freeswitch/freeswitch.hash
+++ b/bsp/buildroot/package/freeswitch/freeswitch.hash
@@ -1,2 +1,17 @@
-# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.14.tar.xz.sha256
-sha256 759cb79800c02b9476fcec4c88822942ed6183d9c2686015e4c293e22790cf35  freeswitch-1.6.14.tar.xz
+# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.20.tar.xz.md5
+md5 e9890a2d6ca6f58dd3fa440fdfbf91a0  freeswitch-1.6.20.tar.xz
+# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.20.tar.xz.sha1
+sha1 ce284b805e262504cbb1f74796785b4dfa70d5ac  freeswitch-1.6.20.tar.xz
+# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.20.tar.xz.sha256
+sha256 dbb0f73109171bd381772b247b8ef581f6a176964619082a1fe031b004086f6b  freeswitch-1.6.20.tar.xz
+# Locally computed
+sha256 10299420c1e8602c0daf5a59d022621cd72a9148d1f0f33501edb3db3445c7fe  COPYING
+sha256 e8e26b16da14aa3e6ed5c22c705fdc1f45d6225fca461ea9f7314bcdfdc414c4  libs/apr/LICENSE
+sha256 1eefb2ea1db0af7729a9d8a27d7c65d8a37ab185393f935b029aac6828ce315a  libs/apr-util/LICENSE
+sha256 7d72a8aee2c4b1a084200487992a5d86f5df6b535727a14c1874918e99d24600  libs/libzrtp/src/zrtp_legal.c
+sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60  libs/sofia-sip/COPYING
+sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556  libs/sofia-sip/COPYRIGHTS
+sha256 366576cb0b869cd9e95a4882878607314650488ac635e5df0692180382e9666a  libs/spandsp/COPYING
+sha256 8defed37d52096ae14b60adc499c33d43975109bc265552ee67e9a888c634b93  libs/srtp/LICENSE
+sha256 fbd6fed7938541d2c809c0826225fc85e551fdbfa8732b10f0c87e0847acafd7  libs/tiff-4.0.2/COPYRIGHT
+sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482  src/mod/codecs/mod_isac/LICENSE
diff --git a/bsp/buildroot/package/freeswitch/freeswitch.mk b/bsp/buildroot/package/freeswitch/freeswitch.mk
index 8c107e99..98f2f483 100644
--- a/bsp/buildroot/package/freeswitch/freeswitch.mk
+++ b/bsp/buildroot/package/freeswitch/freeswitch.mk
@@ -4,15 +4,17 @@
 #
 ################################################################################
 
-FREESWITCH_VERSION = 1.6.14
+FREESWITCH_VERSION = 1.6.20
 FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz
 FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases
-FREESWITCH_LICENSE = MPLv1.1, \
-	GPLv3+ with font exception (fonts), \
+# External modules need headers/libs from staging
+FREESWITCH_INSTALL_STAGING = YES
+FREESWITCH_LICENSE = MPL-1.1, \
+	GPL-3.0+ with font exception (fonts), \
 	Apache-2.0 (apr, apr-util), \
-	LGPLv2+ (sofia-sip), \
-	LGPLv2.1, GPLv2 (spandsp), \
-	BSD-3c (libsrtp), \
+	LGPL-2.0+ (sofia-sip), \
+	LGPL-2.1, GPL-2.0 (spandsp), \
+	BSD-3-Clause (libsrtp), \
 	tiff license
 
 FREESWITCH_LICENSE_FILES = \
@@ -37,6 +39,10 @@ FREESWITCH_DEPENDENCIES = \
 	util-linux \
 	zlib
 
+# disable display of ClueCon banner in fs_cli
+FREESWITCH_CONF_ENV += \
+	disable_cc=yes
+
 # we neither need host-perl nor host-php
 FREESWITCH_CONF_ENV += \
 	ac_cv_prog_PERL=false \
@@ -110,7 +116,6 @@ FREESWITCH_ENABLED_MODULES += \
 	applications/mod_valet_parking \
 	applications/mod_voicemail \
 	codecs/mod_g723_1 \
-	codecs/mod_g729 \
 	dialplans/mod_dialplan_asterisk \
 	dialplans/mod_dialplan_xml \
 	endpoints/mod_loopback \
@@ -159,7 +164,7 @@ FREESWITCH_PRE_CONFIGURE_HOOKS += FREESWITCH_ENABLE_MODULES
 # mod_isac supports a limited set of archs
 # src/mod/codecs/mod_isac/typedefs.h
 ifeq ($(BR2_i386)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_x86_64),y)
-FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3c (mod_isac)
+FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3-Clause (mod_isac)
 FREESWITCH_LICENSE_FILES += src/mod/codecs/mod_isac/LICENSE
 FREESWITCH_ENABLED_MODULES += codecs/mod_isac
 endif
@@ -169,6 +174,12 @@ FREESWITCH_DEPENDENCIES += alsa-lib
 FREESWITCH_ENABLED_MODULES += endpoints/mod_alsa
 endif
 
+# Use the pass-through g729 module provided by freeswitch instead of
+# the external mod_bcg729 provided by freeswitch-mod-bcg729.
+ifeq ($(BR2_PACKAGE_FREESWITCH_MOD_BCG729),)
+FREESWITCH_ENABLED_MODULES += codecs/mod_g729
+endif
+
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 FREESWITCH_DEPENDENCIES += freetype
 endif
@@ -278,7 +289,7 @@ FREESWITCH_DEPENDENCIES += xz
 endif
 
 ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8)$(BR2_PACKAGE_FFMPEG),yy)
-FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3c (libvpx, libyuv)
+FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3-Clause (libvpx, libyuv)
 FREESWITCH_LICENSE_FILES += libs/libvpx/LICENSE libs/libyuv/LICENSE
 FREESWITCH_CONF_OPTS += --enable-libvpx --enable-libyuv
 FREESWITCH_DEPENDENCIES += host-yasm ffmpeg
diff --git a/bsp/buildroot/package/freetype/0001-psaux-Better-protect-flex-handling.patch b/bsp/buildroot/package/freetype/0001-psaux-Better-protect-flex-handling.patch
deleted file mode 100644
index a59f5b34..00000000
--- a/bsp/buildroot/package/freetype/0001-psaux-Better-protect-flex-handling.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Fri, 24 Mar 2017 09:15:10 +0100
-Subject: [PATCH] [psaux] Better protect `flex' handling.
-
-Reported as
-
-  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935
-
-* src/psaux/t1decode.c (t1_decoder_parse_charstrings)
-<callothersubr>: Since there is not a single flex operator but a
-series of subroutine calls, malformed fonts can call arbitrary other
-operators after the start of a flex, possibly adding points.  For
-this reason we have to check the available number of points before
-inserting a point.
-
-Fixes CVE-2017-8105
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
-diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
-index af7b465e..7dd45135 100644
---- a/src/psaux/t1decode.c
-+++ b/src/psaux/t1decode.c
-@@ -780,10 +780,19 @@
-             /* point without adding any point to the outline    */
-             idx = decoder->num_flex_vectors++;
-             if ( idx > 0 && idx < 7 )
-+            {
-+              /* in malformed fonts it is possible to have other */
-+              /* opcodes in the middle of a flex (which don't    */
-+              /* increase `num_flex_vectors'); we thus have to   */
-+              /* check whether we can add a point                */
-+              if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
-+                goto Syntax_Error;
-+
-               t1_builder_add_point( builder,
-                                     x,
-                                     y,
-                                     (FT_Byte)( idx == 3 || idx == 6 ) );
-+            }
-           }
-           break;
- 
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch b/bsp/buildroot/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch
deleted file mode 100644
index 1b9d90a7..00000000
--- a/bsp/buildroot/package/freetype/0002-src-psaux-psobjs.c-t1_builder_close_contour-Add-safe.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
-From: Werner Lemberg <wl@gnu.org>
-Date: Sun, 26 Mar 2017 08:32:09 +0200
-Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety
- guard.
-
-Reported as
-
-  https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
-
-Fixes CVE-2017-8287
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
-index d18e821a..0baf8368 100644
---- a/src/psaux/psobjs.c
-+++ b/src/psaux/psobjs.c
-@@ -1718,6 +1718,14 @@
-     first = outline->n_contours <= 1
-             ? 0 : outline->contours[outline->n_contours - 2] + 1;
- 
-+    /* in malformed fonts it can happen that a contour was started */
-+    /* but no points were added                                    */
-+    if ( outline->n_contours && first == outline->n_points )
-+    {
-+      outline->n_contours--;
-+      return;
-+    }
-+
-     /* We must not include the last point in the path if it */
-     /* is located on the first point.                       */
-     if ( outline->n_points > 1 )
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/freetype/freetype.hash b/bsp/buildroot/package/freetype/freetype.hash
index b2cec04d..51d01846 100644
--- a/bsp/buildroot/package/freetype/freetype.hash
+++ b/bsp/buildroot/package/freetype/freetype.hash
@@ -1,2 +1,9 @@
-# Locally calculated after checking pgp signature
-sha256	3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88	freetype-2.7.1.tar.bz2
+# From https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/
+md5	bf0a210b6fe781228fa0e4a80691a521		freetype-2.8.1.tar.bz2
+sha1	417bb3747c4ac95b6f2652024a53fad45581fa1c	freetype-2.8.1.tar.bz2
+
+# Locally calculated
+sha256	e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78	freetype-2.8.1.tar.bz2
+sha256	fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb	docs/LICENSE.TXT
+sha256	4a9a548027a2c1d37788519dea833294c9c81f1ebc280e817f41f50d0c642d78	docs/FTL.TXT
+sha256	c4120c6752c910c299e3bd9cb3a46ff262c268303ca2069b61f92f10a5656c18	docs/GPLv2.TXT
diff --git a/bsp/buildroot/package/freetype/freetype.mk b/bsp/buildroot/package/freetype/freetype.mk
index fce94d27..10286647 100644
--- a/bsp/buildroot/package/freetype/freetype.mk
+++ b/bsp/buildroot/package/freetype/freetype.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-FREETYPE_VERSION = 2.7.1
+FREETYPE_VERSION = 2.8.1
 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2
 FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
-FREETYPE_LICENSE = Dual FTL/GPLv2+
+FREETYPE_LICENSE = Dual FTL/GPL-2.0+
 FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf
 FREETYPE_CONFIG_SCRIPTS = freetype-config
diff --git a/bsp/buildroot/package/fscryptctl/Config.in b/bsp/buildroot/package/fscryptctl/Config.in
new file mode 100644
index 00000000..91b9ba8e
--- /dev/null
+++ b/bsp/buildroot/package/fscryptctl/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_FSCRYPTCTL
+	bool "fscryptctl"
+	help
+	  fscryptctl is a low-level tool written in C that handles raw
+	  keys and manages policies for Linux filesystem encryption.
+
+	  Notice: Fscrypt support on EXT4 requires a kernel with
+	  CONFIG_EXT4_ENCRYPTION=y and a file system with the
+	  encryption option and block size equal to CPU page size
+	  (BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O encrypt -b 4096")
+
+	  https://github.com/google/fscryptctl
diff --git a/bsp/buildroot/package/fscryptctl/fscryptctl.hash b/bsp/buildroot/package/fscryptctl/fscryptctl.hash
new file mode 100644
index 00000000..b06b96c1
--- /dev/null
+++ b/bsp/buildroot/package/fscryptctl/fscryptctl.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 970a8febbcbf315313711d8a7ee3d954dea593d8087744d3cba65f6cb4bebcc1  fscryptctl-f037dcf4354ce8f25d0f371b58dfe7a7ac27576f.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/bsp/buildroot/package/fscryptctl/fscryptctl.mk b/bsp/buildroot/package/fscryptctl/fscryptctl.mk
new file mode 100644
index 00000000..4275bf2b
--- /dev/null
+++ b/bsp/buildroot/package/fscryptctl/fscryptctl.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# fscryptctl
+#
+################################################################################
+
+FSCRYPTCTL_VERSION = f037dcf4354ce8f25d0f371b58dfe7a7ac27576f
+FSCRYPTCTL_SITE = $(call github,google,fscryptctl,$(FSCRYPTCTL_VERSION))
+FSCRYPTCTL_LICENSE = Apache-2.0
+FSCRYPTCTL_LICENSE_FILES = LICENSE
+
+define FSCRYPTCTL_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) fscryptctl
+endef
+
+define FSCRYPTCTL_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0755 -D $(@D)/fscryptctl $(TARGET_DIR)/usr/bin/fscryptctl
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/fswebcam/fswebcam.hash b/bsp/buildroot/package/fswebcam/fswebcam.hash
index 3822a273..1e75f237 100644
--- a/bsp/buildroot/package/fswebcam/fswebcam.hash
+++ b/bsp/buildroot/package/fswebcam/fswebcam.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199	fswebcam-20140113.tar.gz
+sha256	444d6a8a82102e09e935540c64a731021de36db03e1e74181f41ca6f39aa6474	fswebcam-20140113.tar.xz
diff --git a/bsp/buildroot/package/fswebcam/fswebcam.mk b/bsp/buildroot/package/fswebcam/fswebcam.mk
index 8cb40d69..8f823f4d 100644
--- a/bsp/buildroot/package/fswebcam/fswebcam.mk
+++ b/bsp/buildroot/package/fswebcam/fswebcam.mk
@@ -5,8 +5,9 @@
 ################################################################################
 
 FSWEBCAM_VERSION = 20140113
+FSWEBCAM_SOURCE = fswebcam-$(FSWEBCAM_VERSION).tar.xz
 FSWEBCAM_SITE = http://www.firestorm.cx/fswebcam/files
-FSWEBCAM_LICENSE = GPLv2
+FSWEBCAM_LICENSE = GPL-2.0
 FSWEBCAM_LICENSE_FILES = LICENSE
 
 FSWEBCAM_DEPENDENCIES += freetype jpeg libpng gd
diff --git a/bsp/buildroot/package/ftop/Config.in b/bsp/buildroot/package/ftop/Config.in
index aefe4f51..bee70bfd 100644
--- a/bsp/buildroot/package/ftop/Config.in
+++ b/bsp/buildroot/package/ftop/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_FTOP
 	select BR2_PACKAGE_NCURSES
 	help
 	  Ftop is to files what top is to processes.
-	  The progress of all open files and file systems can be monitored.
+	  The progress of all open files and file systems can be
+	  monitored.
 
 	  https://sourceforge.net/projects/ftop/
diff --git a/bsp/buildroot/package/ftop/ftop.mk b/bsp/buildroot/package/ftop/ftop.mk
index a7515609..5498fb52 100644
--- a/bsp/buildroot/package/ftop/ftop.mk
+++ b/bsp/buildroot/package/ftop/ftop.mk
@@ -8,7 +8,7 @@ FTOP_VERSION = 1.0
 FTOP_SOURCE = ftop-$(FTOP_VERSION).tar.bz2
 FTOP_SITE = https://sourceforge.net/projects/ftop/files/ftop/$(FTOP_VERSION)
 FTOP_DEPENDENCIES = ncurses
-FTOP_LICENSE = GPLv3+
+FTOP_LICENSE = GPL-3.0+
 FTOP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/fwts/fwts.mk b/bsp/buildroot/package/fwts/fwts.mk
index 984e368f..8b0c5b0e 100644
--- a/bsp/buildroot/package/fwts/fwts.mk
+++ b/bsp/buildroot/package/fwts/fwts.mk
@@ -7,7 +7,7 @@
 FWTS_VERSION = V16.11.00
 FWTS_SITE = http://fwts.ubuntu.com/release
 FWTS_STRIP_COMPONENTS = 0
-FWTS_LICENSE = GPLv2, LGPLv2.1, Custom
+FWTS_LICENSE = GPL-2.0, LGPL-2.1, Custom
 FWTS_LICENSE_FILES = debian/copyright
 FWTS_AUTORECONF = YES
 FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 \
diff --git a/bsp/buildroot/package/fwup/fwup.hash b/bsp/buildroot/package/fwup/fwup.hash
index e21eff0a..32398bf4 100644
--- a/bsp/buildroot/package/fwup/fwup.hash
+++ b/bsp/buildroot/package/fwup/fwup.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256   64c3a0ac38dc11c0c05b2588a89638cbc37f5552ac0f1c290f7ee5365f2bba49      fwup-v0.8.2.tar.gz
+sha256 852e255bd65f9db473a06184abb3e94e3b6b86be7bf66169e8df8146d5966ae1  fwup-v0.15.4.tar.gz
diff --git a/bsp/buildroot/package/fwup/fwup.mk b/bsp/buildroot/package/fwup/fwup.mk
index d87bdca9..c6a18c29 100644
--- a/bsp/buildroot/package/fwup/fwup.mk
+++ b/bsp/buildroot/package/fwup/fwup.mk
@@ -1,10 +1,10 @@
-#############################################################
+################################################################################
 #
 # fwup
 #
-#############################################################
+################################################################################
 
-FWUP_VERSION = v0.8.2
+FWUP_VERSION = v0.15.4
 FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION))
 FWUP_LICENSE = Apache-2.0
 FWUP_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/fxload/Config.in b/bsp/buildroot/package/fxload/Config.in
index ac190f04..88cc6d1e 100644
--- a/bsp/buildroot/package/fxload/Config.in
+++ b/bsp/buildroot/package/fxload/Config.in
@@ -1,9 +1,14 @@
 config BR2_PACKAGE_FXLOAD
 	bool "fxload"
+	# Hits gcc PR63261 on Microblaze with debugging symbols
+	# enabled. Since this package is unlikely to be useful on
+	# Microblaze, just disable it on this architecture.
+	depends on !BR2_microblaze
 	help
-	  This program is conveniently able to download firmware into FX, FX2,
-	  and FX2LP EZ-USB devices, as well as the original AnchorChips EZ-USB.
-	  It is intended to be invoked by hotplug scripts when the unprogrammed
-	  device appears on the bus.
+	  This program is conveniently able to download firmware into
+	  FX, FX2, and FX2LP EZ-USB devices, as well as the original
+	  AnchorChips EZ-USB.
+	  It is intended to be invoked by hotplug scripts when the
+	  unprogrammed device appears on the bus.
 
 	  http://sourceforge.net/projects/linux-hotplug/
diff --git a/bsp/buildroot/package/fxload/fxload.mk b/bsp/buildroot/package/fxload/fxload.mk
index b34dccd7..94b11d0f 100644
--- a/bsp/buildroot/package/fxload/fxload.mk
+++ b/bsp/buildroot/package/fxload/fxload.mk
@@ -6,7 +6,7 @@
 
 FXLOAD_VERSION = 2008_10_13
 FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION)
-FXLOAD_LICENSE = GPLv2+
+FXLOAD_LICENSE = GPL-2.0+
 FXLOAD_LICENSE_FILES = COPYING
 
 define FXLOAD_BUILD_CMDS
diff --git a/bsp/buildroot/package/gamin/gamin.mk b/bsp/buildroot/package/gamin/gamin.mk
index d908b90d..4621b164 100644
--- a/bsp/buildroot/package/gamin/gamin.mk
+++ b/bsp/buildroot/package/gamin/gamin.mk
@@ -8,7 +8,7 @@ GAMIN_VERSION = 0.1.10
 GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources
 GAMIN_AUTORECONF = YES
 GAMIN_INSTALL_STAGING = YES
-GAMIN_LICENSE = LGPLv2+
+GAMIN_LICENSE = LGPL-2.0+
 GAMIN_LICENSE_FILES = COPYING
 
 # python support broken
diff --git a/bsp/buildroot/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch b/bsp/buildroot/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch
new file mode 100644
index 00000000..61a3f1aa
--- /dev/null
+++ b/bsp/buildroot/package/gauche/0003-Fix-missing-libc-version.h-build-error-uClibc-x86-_6.patch
@@ -0,0 +1,46 @@
+From 4b9692c93d658015087f19016b2bd0c9dfbccee6 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 28 May 2017 20:21:09 +0200
+Subject: [PATCH] Fix 'missing libc-version.h' build error (uClibc/x86[_64])
+ (fix commit 3d34255)
+
+uClibc defines __GLIBC__ but does not contain libc-version.h file.
+
+* include/private/gcconfig.h [(I386 || X86_64) && LINUX && __GLIBC__]
+(GLIBC_2_19_TSX_BUG): Do not define (and do not include
+gnu/libc-version.h) if __UCLIBC__.
+
+[baruch: cherry pick from upstream bdwgc commit 047230b71d42140]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: patch applied to bdwgc; will propagate to gauche on the next
+synch of its bundled bdwgc
+
+ gc/include/private/gcconfig.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gc/include/private/gcconfig.h b/gc/include/private/gcconfig.h
+index 80920e5af570..f063664c3f52 100644
+--- a/gc/include/private/gcconfig.h
++++ b/gc/include/private/gcconfig.h
+@@ -1420,7 +1420,7 @@
+ #         define GC_PREFETCH_FOR_WRITE(x) \
+             __asm__ __volatile__ ("prefetchw %0" : : "m"(*(char *)(x)))
+ #       endif
+-#       if defined(__GLIBC__)
++#       if defined(__GLIBC__) && !defined(__UCLIBC__)
+           /* Workaround lock elision implementation for some glibc.     */
+ #         define GLIBC_2_19_TSX_BUG
+ #         include <gnu/libc-version.h> /* for gnu_get_libc_version() */
+@@ -2431,7 +2431,7 @@
+           /* FIXME: This seems to be fixed in GLibc v2.14.              */
+ #         define GETCONTEXT_FPU_EXCMASK_BUG
+ #       endif
+-#       if defined(__GLIBC__)
++#       if defined(__GLIBC__) && !defined(__UCLIBC__)
+           /* Workaround lock elision implementation for some glibc.     */
+ #         define GLIBC_2_19_TSX_BUG
+ #         include <gnu/libc-version.h> /* for gnu_get_libc_version() */
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gauche/gauche.hash b/bsp/buildroot/package/gauche/gauche.hash
index 975e958a..8f45ef99 100644
--- a/bsp/buildroot/package/gauche/gauche.hash
+++ b/bsp/buildroot/package/gauche/gauche.hash
@@ -1,3 +1,5 @@
+# From https://sourceforge.net/projects/gauche/files/Gauche/
+sha1 c3e1ea21f3acc66fd26eced117caab3f86531db4  Gauche-0.9.5.tgz
+md5 8bac7cbd99a91f6f2c037ac6988db14d  Gauche-0.9.5.tgz
 # Locally calculated
-sha256 7b18bcd70beaced1e004594be46c8cff95795318f6f5830dd2a8a700410fc149  Gauche-0.9.4.tgz
-sha256 0ff5986540d8ad89eee595de766810f09e489a6a3363b47a65ce7ad18701ee01  13a196557848f22a1607a300643131345e9f32b3.patch
+sha256 4c8a53213de112708bbda5fa9648c21497d43ebf809ed5b32b15f21266b4e73c  Gauche-0.9.5.tgz
diff --git a/bsp/buildroot/package/gauche/gauche.mk b/bsp/buildroot/package/gauche/gauche.mk
index 85fcc718..1e1ee390 100644
--- a/bsp/buildroot/package/gauche/gauche.mk
+++ b/bsp/buildroot/package/gauche/gauche.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-GAUCHE_VERSION = 0.9.4
+GAUCHE_VERSION = 0.9.5
 GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz
 GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche
-GAUCHE_LICENSE = BSD-3c, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm)
+GAUCHE_LICENSE = BSD-3-Clause, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm)
 GAUCHE_LICENSE_FILES = COPYING
 GAUCHE_DEPENDENCIES = host-gauche
-GAUCHE_PATCH = https://github.com/shirok/Gauche/commit/13a196557848f22a1607a300643131345e9f32b3.patch
 
 HOST_GAUCHE_CONF_OPTS = --without-zlib
 GAUCHE_CONF_OPTS = --without-libatomic-ops
diff --git a/bsp/buildroot/package/gawk/Config.in b/bsp/buildroot/package/gawk/Config.in
index 36e70eb7..a065243b 100644
--- a/bsp/buildroot/package/gawk/Config.in
+++ b/bsp/buildroot/package/gawk/Config.in
@@ -6,8 +6,8 @@ config BR2_PACKAGE_GAWK
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
 	  A special-purpose programming language which is data driven
-	  rather than procedural. Allows for simple data-reformatting jobs
-	  with just a few lines of code.
+	  rather than procedural. Allows for simple data-reformatting
+	  jobs with just a few lines of code.
 
 	  http://www.gnu.org/software/gawk/
 
diff --git a/bsp/buildroot/package/gawk/gawk.mk b/bsp/buildroot/package/gawk/gawk.mk
index 7c6689b3..823aa274 100644
--- a/bsp/buildroot/package/gawk/gawk.mk
+++ b/bsp/buildroot/package/gawk/gawk.mk
@@ -8,7 +8,7 @@ GAWK_VERSION = 4.1.4
 GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz
 GAWK_SITE = $(BR2_GNU_MIRROR)/gawk
 GAWK_DEPENDENCIES = host-gawk
-GAWK_LICENSE = GPLv3+
+GAWK_LICENSE = GPL-3.0+
 GAWK_LICENSE_FILES = COPYING
 
 # Prefer full-blown gawk over busybox awk
@@ -39,7 +39,7 @@ endif
 HOST_GAWK_CONF_OPTS = --without-readline --without-mpfr
 
 define GAWK_CREATE_SYMLINK
-	ln -sf /usr/bin/gawk $(TARGET_DIR)/usr/bin/awk
+	ln -sf gawk $(TARGET_DIR)/usr/bin/awk
 endef
 
 GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK
diff --git a/bsp/buildroot/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/bsp/buildroot/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
deleted file mode 100644
index d8c6723e..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From edb9057c195c41dd7bcd8603e5fd420359edd520 Mon Sep 17 00:00:00 2001
-From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 23 Nov 2015 15:17:55 +0000
-Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for
- printing fatal error
-
-libgcc/
-	PR target/68059
-	* config/arm/linux-atomic-64bit.c (__write): Rename to...
-	(write): ...this and fix the return type.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- libgcc/config/arm/linux-atomic-64bit.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c
-index 7aa8dfc..570b4ce 100644
---- a/libgcc/config/arm/linux-atomic-64bit.c
-+++ b/libgcc/config/arm/linux-atomic-64bit.c
-@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-    kernels; we check for that in an init section and bail out rather
-    unceremoneously.  */
- 
--extern unsigned int __write (int fd, const void *buf, unsigned int count);
-+extern int write (int fd, const void *buf, unsigned int count);
- extern void abort (void);
- 
- /* Kernel helper for compare-and-exchange.  */
-@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void)
- 	 for the user - I'm not sure I can rely on much else being
- 	 available at this point, so do the same as generic-morestack.c
- 	 write () and abort ().  */
--      __write (2 /* stderr.  */, err, sizeof (err));
-+      write (2 /* stderr.  */, err, sizeof (err));
-       abort ();
-     }
- };
--- 
-2.10.2
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/100-uclibc-conf.patch b/bsp/buildroot/package/gcc/4.8.5/100-uclibc-conf.patch
deleted file mode 100644
index d56bf0a1..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/100-uclibc-conf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: gcc-4.8.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh	2009-04-09 17:00:19.000000000 +0200
-+++ gcc-4.8.0/contrib/regression/objs-gcc.sh	2013-03-23 17:39:04.000000000 +0100
-@@ -106,6 +106,10 @@
-  then
-   make all-gdb all-dejagnu all-ld || exit 1
-   make install-gdb install-dejagnu install-ld || exit 1
-+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
-+ then
-+  make all-gdb all-dejagnu all-ld || exit 1
-+  make install-gdb install-dejagnu install-ld || exit 1
- elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
-   make bootstrap || exit 1
-   make install || exit 1
diff --git a/bsp/buildroot/package/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional b/bsp/buildroot/package/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional
deleted file mode 100644
index b7094fe6..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional
+++ /dev/null
@@ -1,122 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html
-
-On glibc the libc.so carries a copy of the math function copysignl() but
-on uClibc math functions like copysignl() live in libm. Since libgcc_s
-contains unresolved symbols, any attempt to link against libgcc_s
-without explicitely specifying -lm fails, resulting in a broken
-bootstrap of the compiler.
-
-Forward port to gcc 4.5.1 by Gustavo Zacarias <gustavo@zacarias.com.ar>
-
----
- libgcc/Makefile.in  |    4 +++-
- libgcc/configure    |   32 ++++++++++++++++++++++++++++++++
- libgcc/configure.ac |   21 +++++++++++++++++++++
- 3 files changed, 56 insertions(+), 1 deletion(-)
-
-Index: gcc-4.8.0/libgcc/Makefile.in
-===================================================================
---- gcc-4.8.0.orig/libgcc/Makefile.in	2013-02-04 20:06:20.000000000 +0100
-+++ gcc-4.8.0/libgcc/Makefile.in	2013-03-24 09:12:43.000000000 +0100
-@@ -41,6 +41,7 @@
- decimal_float = @decimal_float@
- enable_decimal_float = @enable_decimal_float@
- fixed_point = @fixed_point@
-+LIBGCC_LIBM = @LIBGCC_LIBM@
- 
- host_noncanonical = @host_noncanonical@
- target_noncanonical = @target_noncanonical@
-@@ -927,9 +928,10 @@
- 		@multilib_dir@,$(MULTIDIR),$(subst \
- 		@shlib_objs@,$(objects) libgcc.a,$(subst \
- 		@shlib_base_name@,libgcc_s,$(subst \
-+		@libgcc_libm@,$(LIBGCC_LIBM),$(subst \
- 		@shlib_map_file@,$(mapfile),$(subst \
- 		@shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \
--		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))
-+		@shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))))
- 
- libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts)
- 	# @multilib_flags@ is still needed because this may use
-Index: gcc-4.8.0/libgcc/configure
-===================================================================
---- gcc-4.8.0.orig/libgcc/configure	2012-11-05 00:08:42.000000000 +0100
-+++ gcc-4.8.0/libgcc/configure	2013-03-24 09:12:43.000000000 +0100
-@@ -564,6 +564,7 @@
- tmake_file
- sfp_machine_header
- set_use_emutls
-+LIBGCC_LIBM
- set_have_cc_tls
- vis_hide
- fixed_point
-@@ -4481,6 +4482,37 @@
- 	fi
- fi
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+echo "$as_me:$LINENO: checking for library containing copysignl" >&5
-+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6
-+if test "${libgcc_cv_copysignl_lib+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+
-+fi
-+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5
-+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
- 
- # Conditionalize the makefile for this target machine.
- tmake_file_=
-Index: gcc-4.8.0/libgcc/configure.ac
-===================================================================
---- gcc-4.8.0.orig/libgcc/configure.ac	2012-10-15 15:10:30.000000000 +0200
-+++ gcc-4.8.0/libgcc/configure.ac	2013-03-24 09:12:43.000000000 +0100
-@@ -326,6 +326,27 @@
- fi
- AC_SUBST(set_have_cc_tls)
- 
-+# On powerpc libgcc_s references copysignl which is a libm function but
-+# glibc apparently also provides it via libc as opposed to uClibc where
-+# it lives in libm.
-+AC_CACHE_CHECK
-+  libgcc_cv_copysignl_lib,
-+    echo '#include <features.h>' > conftest.c
-+    echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c
-+    libgcc_cv_copysignl_lib="-lc"
-+    if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD)
-+    then
-+       libgcc_cv_copysignl_lib="-lm"
-+    fi
-+    rm -f conftest.*
-+  ])
-+
-+case /${libgcc_cv_copysignl_lib}/ in
-+  /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;;
-+  *) LIBGCC_LIBM= ;;
-+esac
-+AC_SUBST(LIBGCC_LIBM)
-+
- # See if we have emulated thread-local storage.
- GCC_CHECK_EMUTLS
- set_use_emutls=
diff --git a/bsp/buildroot/package/gcc/4.8.5/111-pr65730.patch b/bsp/buildroot/package/gcc/4.8.5/111-pr65730.patch
deleted file mode 100644
index f195e308..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/111-pr65730.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 10 Apr 2015 17:46:30 +0300
-Subject: [PATCH] Fix PR target/65730
-
-2015-05-20  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (init_alignment_context): Replace MULT
-	by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT).
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452
-Changes to ChangeLog are dropped.
-
- gcc/config/xtensa/xtensa.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..7296e36 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem)
-   if (ac->shift != NULL_RTX)
-     {
-       /* Shift is the byte count, but we need the bitcount.  */
--      ac->shift = expand_simple_binop (SImode, MULT, ac->shift,
--				       GEN_INT (BITS_PER_UNIT),
-+      gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0);
-+      ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift,
-+				       GEN_INT (exact_log2 (BITS_PER_UNIT)),
- 				       NULL_RTX, 1, OPTAB_DIRECT);
-       ac->modemask = expand_simple_binop (SImode, ASHIFT,
- 					  GEN_INT (GET_MODE_MASK (mode)),
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/130-fix_build_with_gcc-6.patch b/bsp/buildroot/package/gcc/4.8.5/130-fix_build_with_gcc-6.patch
deleted file mode 100644
index 62ac3cbd..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/130-fix_build_with_gcc-6.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001
-From: edlinger <edlinger@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Thu, 25 Feb 2016 15:33:50 +0000
-Subject: [PATCH 1/1] 2016-02-25  Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-        Backported from mainline
-        2016-02-19  Jakub Jelinek  <jakub@redhat.com>
-                    Bernd Edlinger  <bernd.edlinger@hotmail.de>
-
-        * Make-lang.in: Invoke gperf with -L C++.
-        * cfns.gperf: Remove prototypes for hash and libc_name_p
-        inlines.
-        * cfns.h: Regenerated.
-        * except.c (nothrow_libfn_p): Adjust.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- gcc/cp/Make-lang.in |    2 +-
- gcc/cp/cfns.gperf   |   10 ++--------
- gcc/cp/cfns.h       |   41 ++++++++++++++---------------------------
- gcc/cp/except.c     |    3 ++-
- 5 files changed, 31 insertions(+), 37 deletions(-)
-
-diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
-index e98beb1..b09fb02 100644
---- a/gcc/cp/Make-lang.in
-+++ b/gcc/cp/Make-lang.in
-@@ -111,7 +111,7 @@ else
- # deleting the $(srcdir)/cp/cfns.h file.
- $(srcdir)/cp/cfns.h:
- endif
--	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \
-+	gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \
- 		$(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h
- 
- #
-diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf
-index 68acd3d..214ecf6 100644
---- a/gcc/cp/cfns.gperf
-+++ b/gcc/cp/cfns.gperf
-@@ -1,3 +1,5 @@
-+%language=C++
-+%define class-name libc_name
- %{
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
- 
-@@ -16,14 +18,6 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- %}
- %%
- # The standard C library functions, for feeding to gperf; the result is used
-diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h
-index 1c6665d..596f413 100644
---- a/gcc/cp/cfns.h
-+++ b/gcc/cp/cfns.h
-@@ -1,5 +1,5 @@
--/* ANSI-C code produced by gperf version 3.0.3 */
--/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf  */
-+/* C++ code produced by gperf version 3.0.4 */
-+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf  */
- 
- #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-@@ -28,7 +28,7 @@
- #error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
- #endif
- 
--#line 1 "cfns.gperf"
-+#line 3 "cfns.gperf"
- 
- /* Copyright (C) 2000-2015 Free Software Foundation, Inc.
- 
-@@ -47,25 +47,18 @@ for more details.
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#ifdef __GNUC__
--__inline
--#endif
--static unsigned int hash (const char *, unsigned int);
--#ifdef __GNUC__
--__inline
--#endif
--const char * libc_name_p (const char *, unsigned int);
- /* maximum key range = 391, duplicates = 0 */
- 
--#ifdef __GNUC__
--__inline
--#else
--#ifdef __cplusplus
--inline
--#endif
--#endif
--static unsigned int
--hash (register const char *str, register unsigned int len)
-+class libc_name
-+{
-+private:
-+  static inline unsigned int hash (const char *str, unsigned int len);
-+public:
-+  static const char *libc_name_p (const char *str, unsigned int len);
-+};
-+
-+inline unsigned int
-+libc_name::hash (register const char *str, register unsigned int len)
- {
-   static const unsigned short asso_values[] =
-     {
-@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len)
-   return hval + asso_values[(unsigned char)str[len - 1]];
- }
- 
--#ifdef __GNUC__
--__inline
--#ifdef __GNUC_STDC_INLINE__
--__attribute__ ((__gnu_inline__))
--#endif
--#endif
- const char *
--libc_name_p (register const char *str, register unsigned int len)
-+libc_name::libc_name_p (register const char *str, register unsigned int len)
- {
-   enum
-     {
-diff --git a/gcc/cp/except.c b/gcc/cp/except.c
-index 3ff1ce6..2f2e396 100644
---- a/gcc/cp/except.c
-+++ b/gcc/cp/except.c
-@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn)
-      unless the system headers are playing rename tricks, and if
-      they are, we don't want to be confused by them.  */
-   id = DECL_NAME (fn);
--  return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id));
-+  return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id),
-+				   IDENTIFIER_LENGTH (id));
- }
- 
- /* Returns nonzero if an exception of type FROM will be caught by a
--- 
-1.7.1
diff --git a/bsp/buildroot/package/gcc/4.8.5/130-pr43538.patch b/bsp/buildroot/package/gcc/4.8.5/130-pr43538.patch
deleted file mode 100644
index 19e57bb0..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/130-pr43538.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001
-From: glisse <glisse@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Fri, 25 Apr 2014 08:03:08 +0000
-Subject: [PATCH] 2014-04-25  Marc Glisse  <marc.glisse@inria.fr>
-
-	PR target/43538
-	* mt-gnu: Don't reset CXXFLAGS_FOR_TARGET.
-
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- config/mt-gnu    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/mt-gnu b/config/mt-gnu
-index 15bf417..5c696f5 100644
---- a/config/mt-gnu
-+++ b/config/mt-gnu
-@@ -1 +1 @@
--CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
-+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/301-missing-execinfo_h.patch b/bsp/buildroot/package/gcc/4.8.5/301-missing-execinfo_h.patch
deleted file mode 100644
index 00efda24..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc-4.8.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.8.0.orig/boehm-gc/include/gc.h	2007-04-23 23:10:09.000000000 +0200
-+++ gcc-4.8.0/boehm-gc/include/gc.h	2013-03-23 17:39:20.000000000 +0100
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/bsp/buildroot/package/gcc/4.8.5/305-libmudflap-susv3-legacy.patch b/bsp/buildroot/package/gcc/4.8.5/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 35d5f502..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: gcc-4.8.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c	2013-02-03 18:48:05.000000000 +0100
-+++ gcc-4.8.0/libmudflap/mf-hooks2.c	2013-03-23 17:39:43.000000000 +0100
-@@ -424,7 +424,7 @@
- {
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
--  bzero (s, n);
-+  memset (s, 0, n);
- }
- 
- 
-@@ -434,7 +434,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
-   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
--  bcopy (src, dest, n);
-+  memmove (dest, src, n);
- }
- 
- 
-@@ -444,7 +444,7 @@
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
-   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
--  return bcmp (s1, s2, n);
-+  return n == 0 ? 0 : memcmp (s1, s2, n);
- }
- 
- 
-@@ -453,7 +453,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
--  return index (s, c);
-+  return strchr (s, c);
- }
- 
- 
-@@ -462,7 +462,7 @@
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
--  return rindex (s, c);
-+  return strrchr (s, c);
- }
- 
- /* XXX:  stpcpy, memccpy */
diff --git a/bsp/buildroot/package/gcc/4.8.5/810-arm-softfloat-libgcc.patch b/bsp/buildroot/package/gcc/4.8.5/810-arm-softfloat-libgcc.patch
deleted file mode 100644
index c8cb377d..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/810-arm-softfloat-libgcc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: gcc-4.8.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h	2013-01-10 21:38:27.000000000 +0100
-+++ gcc-4.8.0/gcc/config/arm/linux-elf.h	2013-03-23 17:40:00.000000000 +0100
-@@ -55,7 +55,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: gcc-4.8.0/libgcc/config/arm/t-linux
-===================================================================
---- gcc-4.8.0.orig/libgcc/config/arm/t-linux	2012-03-22 16:14:46.000000000 +0100
-+++ gcc-4.8.0/libgcc/config/arm/t-linux	2013-03-23 17:40:54.000000000 +0100
-@@ -1,6 +1,11 @@
- LIB1ASMSRC = arm/lib1funcs.S
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
-+	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_addsubdf3 _arm_addsubsf3 \
-+	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
-+	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
-+	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
-+	_arm_fixsfsi _arm_fixunssfsi
- 
- # Just for these, we omit the frame pointer since it makes such a big
- # difference.
diff --git a/bsp/buildroot/package/gcc/4.8.5/830-arm_unbreak_armv4t.patch b/bsp/buildroot/package/gcc/4.8.5/830-arm_unbreak_armv4t.patch
deleted file mode 100644
index 37f8f2a5..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/830-arm_unbreak_armv4t.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://sourceware.org/ml/crossgcc/2008-05/msg00009.html
-
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -45,7 +45,7 @@
-    The ARM10TDMI core is the default for armv5t, so set
-    SUBTARGET_CPU_DEFAULT to achieve this.  */
- #undef  SUBTARGET_CPU_DEFAULT
--#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
-+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
- 
- /* TARGET_BIG_ENDIAN_DEFAULT is set in
-    config.gcc for big endian configurations.  */
diff --git a/bsp/buildroot/package/gcc/4.8.5/841-PR57717-E500v2.patch b/bsp/buildroot/package/gcc/4.8.5/841-PR57717-E500v2.patch
deleted file mode 100644
index a011e241..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/841-PR57717-E500v2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717
-
-Upstream-Status: Backport
-Signed-off-by: Julian Brown <Julian_Brown@mentor.com>
-[Gustavo: Update for gcc 4.8.3]
-
-fix for PR57717 (PowerPC E500v2)
-http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html
-
-diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c
---- gcc-4.8.3/gcc/config/rs6000/rs6000.c	2014-05-04 23:18:35.000000000 -0300
-+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c	2014-05-22 15:20:12.554270919 -0300
-@@ -7343,9 +7343,7 @@
-       && GET_CODE (XEXP (x, 1)) == CONST_INT
-       && reg_offset_p
-       && !SPE_VECTOR_MODE (mode)
--      && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode
--				  || mode == DDmode || mode == TDmode
--				  || mode == DImode))
-+      && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD)
-       && (!VECTOR_MODE_P (mode) || VECTOR_MEM_NONE_P (mode)))
-     {
-       HOST_WIDE_INT val = INTVAL (XEXP (x, 1));
diff --git a/bsp/buildroot/package/gcc/4.8.5/842-PR60155.patch b/bsp/buildroot/package/gcc/4.8.5/842-PR60155.patch
deleted file mode 100644
index 7bc2122f..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/842-PR60155.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From gcc bugzilla https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155
-Upstream status: in trunk.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- trunk/gcc/gcse.c	2014/02/12 14:50:06	207726
-+++ trunk/gcc/gcse.c	2014/04/04 22:25:51	209134
-@@ -2502,6 +2502,65 @@
-       }
- }
- 
-+struct set_data
-+{
-+  rtx insn;
-+  const_rtx set;
-+  int nsets;
-+};
-+
-+/* Increment number of sets and record set in DATA.  */
-+
-+static void
-+record_set_data (rtx dest, const_rtx set, void *data)
-+{
-+  struct set_data *s = (struct set_data *)data;
-+
-+  if (GET_CODE (set) == SET)
-+    {
-+      /* We allow insns having multiple sets, where all but one are
-+	 dead as single set insns.  In the common case only a single
-+	 set is present, so we want to avoid checking for REG_UNUSED
-+	 notes unless necessary.  */
-+      if (s->nsets == 1
-+	  && find_reg_note (s->insn, REG_UNUSED, SET_DEST (s->set))
-+	  && !side_effects_p (s->set))
-+	s->nsets = 0;
-+
-+      if (!s->nsets)
-+	{
-+	  /* Record this set.  */
-+	  s->nsets += 1;
-+	  s->set = set;
-+	}
-+      else if (!find_reg_note (s->insn, REG_UNUSED, dest)
-+	       || side_effects_p (set))
-+	s->nsets += 1;
-+    }
-+}
-+
-+static const_rtx
-+single_set_gcse (rtx insn)
-+{
-+  struct set_data s;
-+  rtx pattern;
-+  
-+  gcc_assert (INSN_P (insn));
-+
-+  /* Optimize common case.  */
-+  pattern = PATTERN (insn);
-+  if (GET_CODE (pattern) == SET)
-+    return pattern;
-+
-+  s.insn = insn;
-+  s.nsets = 0;
-+  note_stores (pattern, record_set_data, &s);
-+
-+  /* Considered invariant insns have exactly one set.  */
-+  gcc_assert (s.nsets == 1);
-+  return s.set;
-+}
-+
- /* Emit move from SRC to DEST noting the equivalence with expression computed
-    in INSN.  */
- 
-@@ -2509,7 +2568,8 @@
- gcse_emit_move_after (rtx dest, rtx src, rtx insn)
- {
-   rtx new_rtx;
--  rtx set = single_set (insn), set2;
-+  const_rtx set = single_set_gcse (insn);
-+  rtx set2;
-   rtx note;
-   rtx eqv = NULL_RTX;
- 
-@@ -3369,13 +3429,12 @@
- 	      FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr)
- 		{
- 		  rtx insn;
--		  rtx set;
-+		  const_rtx set;
- 
- 		  gcc_assert (!occr->deleted_p);
- 
- 		  insn = occr->insn;
--		  set = single_set (insn);
--		  gcc_assert (set);
-+		  set = single_set_gcse (insn);
- 
- 		  /* Create a pseudo-reg to store the result of reaching
- 		     expressions into.  Get the mode for the new pseudo
-@@ -3456,10 +3515,8 @@
- {
-   rtx reg;
-   enum reg_class pressure_class;
--  rtx set = single_set (insn);
-+  const_rtx set = single_set_gcse (insn);
- 
--  /* Considered invariant insns have only one set.  */
--  gcc_assert (set != NULL_RTX);
-   reg = SET_DEST (set);
-   if (GET_CODE (reg) == SUBREG)
-     reg = SUBREG_REG (reg);
diff --git a/bsp/buildroot/package/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch b/bsp/buildroot/package/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch
deleted file mode 100644
index afa650c8..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 845478644ba54a6947e9b224f2e5cd342e8257a9 Mon Sep 17 00:00:00 2001
-From: Andrew Hsieh <andrewhsieh@google.com>
-Date: Wed, 25 Jun 2014 22:13:48 -0700
-Subject: [PATCH] Fix a typo in vmlaq_lane_s32
-
-BUG=15526898
-
-Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
-
-diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h
-index 73c7e7d..92b0119 100644
---- a/gcc/config/aarch64/arm_neon.h
-+++ b/gcc/config/aarch64/arm_neon.h
-@@ -9984,7 +9984,7 @@
- #define vmlaq_lane_s32(a, b, c, d)                                      \
-   __extension__                                                         \
-     ({                                                                  \
--       int32x4_t c_ = (c);                                              \
-+       int32x2_t c_ = (c);                                              \
-        int32x4_t b_ = (b);                                              \
-        int32x4_t a_ = (a);                                              \
-        int32x4_t result;                                                \
diff --git a/bsp/buildroot/package/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch b/bsp/buildroot/package/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch
deleted file mode 100644
index 792976fd..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-Allow C99-depending features of libstdc++ with uClibc
-
-The libstdc++ code is fairly restrictive on how it checks for C99
-compatibility: it requires *complete* C99 support to enable certain
-features. For example, uClibc provides a good number of C99 features,
-but not C99 complex number support. For this reason, libstdc++
-completely disables many the standard C++ methods that can in fact
-work because uClibc provides the necessary functions.
-
-This patch is similar and highly inspired from
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in
-a way that doesn't involve changing the configure.ac script, as
-autoreconfiguring gcc is complicated. It simply relies on the fact
-that uClibc defines the __UCLIBC__ definition.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/generic/c_locale.h
-+++ b/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -70,7 +70,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/config/locale/gnu/c_locale.h
-===================================================================
---- a/libstdc++-v3/config/locale/gnu/c_locale.h
-+++ b/libstdc++-v3/config/locale/gnu/c_locale.h
-@@ -88,7 +88,7 @@
-     __builtin_va_list __args;
-     __builtin_va_start(__args, __fmt);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-     const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args);
- #else
-     const int __ret = __builtin_vsprintf(__out, __fmt, __args);
-Index: b/libstdc++-v3/include/bits/basic_string.h
-===================================================================
---- a/libstdc++-v3/include/bits/basic_string.h
-+++ b/libstdc++-v3/include/bits/basic_string.h
-@@ -2809,7 +2809,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) \
-      && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF))
- 
- #include <ext/string_conversions.h>
-Index: b/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -987,7 +987,7 @@
- 	char __fbuf[16];
- 	__num_base::_S_format_float(__io, __fbuf, __mod);
- 
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 	// First try a buffer perhaps big enough (most probably sufficient
- 	// for non-ios_base::fixed outputs)
- 	int __cs_size = __max_digits * 3;
-Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-===================================================================
---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc
-@@ -572,7 +572,7 @@
-     {
-       const locale __loc = __io.getloc();
-       const ctype<_CharT>& __ctype = use_facet<ctype<_CharT> >(__loc);
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       // First try a buffer perhaps big enough.
-       int __cs_size = 64;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-Index: b/libstdc++-v3/include/c_compatibility/math.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/math.h
-+++ b/libstdc++-v3/include/c_compatibility/math.h
-@@ -56,7 +56,7 @@
- using std::floor;
- using std::fmod;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::fpclassify;
- using std::isfinite;
- using std::isinf;
-Index: b/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- a/libstdc++-v3/include/c_compatibility/wchar.h
-+++ b/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -103,7 +103,7 @@
- using std::wmemset;
- using std::wcsftime;
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- using std::wcstold;
- using std::wcstoll;
- using std::wcstoull;
-Index: b/libstdc++-v3/include/c_global/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdlib
-+++ b/libstdc++-v3/include/c_global/cstdlib
-@@ -182,7 +182,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_global/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_global/cwchar
-+++ b/libstdc++-v3/include/c_global/cwchar
-@@ -232,7 +232,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-@@ -289,7 +289,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdio
-+++ b/libstdc++-v3/include/c_std/cstdio
-@@ -139,7 +139,7 @@
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
-Index: b/libstdc++-v3/include/c_std/cstdlib
-===================================================================
---- a/libstdc++-v3/include/c_std/cstdlib
-+++ b/libstdc++-v3/include/c_std/cstdlib
-@@ -180,7 +180,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef _Exit
- #undef llabs
-Index: b/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- a/libstdc++-v3/include/c_std/cwchar
-+++ b/libstdc++-v3/include/c_std/cwchar
-@@ -228,7 +228,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef wcstold
- #undef wcstoll
-Index: b/libstdc++-v3/include/ext/vstring.h
-===================================================================
---- a/libstdc++-v3/include/ext/vstring.h
-+++ b/libstdc++-v3/include/ext/vstring.h
-@@ -2571,7 +2571,7 @@
- _GLIBCXX_END_NAMESPACE_VERSION
- } // namespace
- 
--#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99))
-+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)))
- 
- #include <ext/string_conversions.h>
- 
-Index: b/libstdc++-v3/include/tr1/cstdio
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdio
-+++ b/libstdc++-v3/include/tr1/cstdio
-@@ -33,7 +33,7 @@
- 
- #include <cstdio>
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cstdlib
-===================================================================
---- a/libstdc++-v3/include/tr1/cstdlib
-+++ b/libstdc++-v3/include/tr1/cstdlib
-@@ -35,7 +35,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
-Index: b/libstdc++-v3/include/tr1/cwchar
-===================================================================
---- a/libstdc++-v3/include/tr1/cwchar
-+++ b/libstdc++-v3/include/tr1/cwchar
-@@ -52,7 +52,7 @@
-   using std::vwscanf;
- #endif
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-   using std::wcstold;
-   using std::wcstoll;
-   using std::wcstoull;
-Index: b/libstdc++-v3/include/tr1/stdlib.h
-===================================================================
---- a/libstdc++-v3/include/tr1/stdlib.h
-+++ b/libstdc++-v3/include/tr1/stdlib.h
-@@ -33,7 +33,7 @@
- 
- #if _GLIBCXX_HOSTED
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- using std::tr1::atoll;
- using std::tr1::strtoll;
-Index: b/libstdc++-v3/src/c++11/debug.cc
-===================================================================
---- a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -787,7 +787,7 @@
- 				     int __n __attribute__ ((__unused__)), 
- 				     const char* __fmt, _Tp __s) const throw ()
-     {
--#ifdef _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
-       std::snprintf(__buf, __n, __fmt, __s);
- #else
-       std::sprintf(__buf, __fmt, __s);
-Index: b/libstdc++-v3/include/c_global/cstdio
-===================================================================
---- a/libstdc++-v3/include/c_global/cstdio
-+++ b/libstdc++-v3/include/c_global/cstdio
-@@ -139,7 +139,7 @@
-   using ::vsprintf;
- } // namespace
- 
--#if _GLIBCXX_USE_C99
-+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/bsp/buildroot/package/gcc/4.8.5/851-PR-other-56780.patch b/bsp/buildroot/package/gcc/4.8.5/851-PR-other-56780.patch
deleted file mode 100644
index feb43392..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/851-PR-other-56780.patch
+++ /dev/null
@@ -1,244 +0,0 @@
-From afe990251bd9b3a063f03da31a3b8d139d033bc3 Mon Sep 17 00:00:00 2001
-From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 1 Jun 2013 00:20:49 +0000
-Subject: [PATCH] PR other/56780
-
-* libiberty/configure.ac: Move test for --enable-install-libiberty
-outside of the 'with_target_subdir' test so that it actually gets
-run.  Add output messages to show the test result.
-* libiberty/configure: Regenerate.
-* libiberty/Makefile.in (install_to_libdir): Place the
-installation of the libiberty library in the same guard as that
-used for the headers to prevent it being installed unless
-requested via --enable-install-libiberty.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4
-
-libiberty: fix --enable-install-libiberty flag [PR 56780]
-
-Commit 199570 fixed the --disable-install-libiberty behavior, but it also
-added a bug where the enable path never works because the initial clear
-of target_header_dir wasn't deleted.  So we end up initializing properly
-at the top only to reset it at the end all the time.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4
-
-[Romain
-  squash the two upstream commits
-  Remove the ChangeLog]
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- libiberty/Makefile.in  | 24 ++++++++++-----------
- libiberty/configure    | 57 +++++++++++++++++++++++++++-----------------------
- libiberty/configure.ac | 47 ++++++++++++++++++++++-------------------
- 3 files changed, 68 insertions(+), 60 deletions(-)
-
-diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
-index f6a3ebd..75ff82d 100644
---- a/libiberty/Makefile.in
-+++ b/libiberty/Makefile.in
-@@ -355,19 +355,19 @@ install-strip: install
- # since it will be passed the multilib flags.
- MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory`
- install_to_libdir: all
--	${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR)
--	$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n
--	( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n )
--	mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)
- 	if test -n "${target_header_dir}"; then \
--	  case "${target_header_dir}" in \
--	    /*)    thd=${target_header_dir};; \
--	    *)     thd=${includedir}/${target_header_dir};; \
--	  esac; \
--	  ${mkinstalldirs} $(DESTDIR)$${thd}; \
--	  for h in ${INSTALLED_HEADERS}; do \
--	    ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
--	  done; \
-+		${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \
-+		$(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \
-+		( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \
-+		mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \
-+		case "${target_header_dir}" in \
-+		  /*)    thd=${target_header_dir};; \
-+		  *)     thd=${includedir}/${target_header_dir};; \
-+		esac; \
-+		${mkinstalldirs} $(DESTDIR)$${thd}; \
-+		for h in ${INSTALLED_HEADERS}; do \
-+		  ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \
-+		done; \
- 	fi
- 	@$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install
- 
-diff --git a/libiberty/configure b/libiberty/configure
-index 5367027..4feb95a 100755
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -675,8 +675,8 @@ with_cross_host
- with_newlib
- enable_maintainer_mode
- enable_multilib
--enable_largefile
- enable_install_libiberty
-+enable_largefile
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1303,8 +1303,8 @@ Optional Features:
-                           enable make rules and dependencies not useful
-                           (and sometimes confusing) to the casual installer
-   --enable-multilib       build many library versions (default)
-+  --enable-install-libiberty       Install headers and library for end users
-   --disable-largefile     omit support for large files
--  --enable-install-libiberty       Install headers for end users
- 
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \
-    cross_compiling=maybe
- fi
- 
-+# We may wish to install the target headers somewhere.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5
-+$as_echo_n "checking whether to install libiberty headers and static library... " >&6; }
-+
-+# Check whether --enable-install-libiberty was given.
-+if test "${enable_install_libiberty+set}" = set; then :
-+  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
-+else
-+  enable_install_libiberty=no
-+fi
-+
-+# Option parsed, now set things appropriately.
-+case x"$enable_install_libiberty" in
-+  xyes|x)
-+    target_header_dir=libiberty
-+    ;;
-+  xno)
-+    target_header_dir=
-+    ;;
-+  *)
-+    # This could be sanity-checked in various ways...
-+    target_header_dir="${enable_install_libiberty}"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5
-+$as_echo "$enable_install_libiberty" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5
-+$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;}
-+
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -5476,7 +5505,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -5759,29 +5787,6 @@ _ACEOF
- 
-   esac
- 
--  # We may wish to install the target headers somewhere.
--  # Check whether --enable-install-libiberty was given.
--if test "${enable_install_libiberty+set}" = set; then :
--  enableval=$enable_install_libiberty; enable_install_libiberty=$enableval
--else
--  enable_install_libiberty=no
--fi
--
--  # Option parsed, now set things appropriately.
--  case x"$enable_install_libiberty" in
--    xyes|x)
--      target_header_dir=libiberty
--      ;;
--    xno)
--      target_header_dir=
--      ;;
--    *)
--      # This could be sanity-checked in various ways...
--      target_header_dir="${enable_install_libiberty}"
--      ;;
--  esac
--
--
- else
- 
-    # Not a target library, so we set things up to run the test suite.
-diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index c763894..f17e6b6 100644
---- a/libiberty/configure.ac
-+++ b/libiberty/configure.ac
-@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \
-    cross_compiling=maybe
- fi
- 
-+# We may wish to install the target headers somewhere.
-+AC_MSG_CHECKING([whether to install libiberty headers and static library])
-+dnl install-libiberty is disabled by default
-+
-+AC_ARG_ENABLE(install-libiberty,
-+[  --enable-install-libiberty       Install headers and library for end users],
-+enable_install_libiberty=$enableval,
-+enable_install_libiberty=no)dnl
-+
-+# Option parsed, now set things appropriately.
-+case x"$enable_install_libiberty" in
-+  xyes|x)
-+    target_header_dir=libiberty
-+    ;;
-+  xno)   
-+    target_header_dir=
-+    ;;
-+  *) 
-+    # This could be sanity-checked in various ways...
-+    target_header_dir="${enable_install_libiberty}"
-+    ;;
-+esac
-+AC_MSG_RESULT($enable_install_libiberty)
-+AC_MSG_NOTICE([target_header_dir = $target_header_dir])
-+
- GCC_NO_EXECUTABLES
- AC_PROG_CC
- AC_SYS_LARGEFILE
-@@ -380,7 +405,6 @@ fi
- 
- setobjs=
- CHECK=
--target_header_dir=
- if test -n "${with_target_subdir}"; then
- 
-   # We are being configured as a target library.  AC_REPLACE_FUNCS
-@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then
- 
-   esac
- 
--  # We may wish to install the target headers somewhere.
--  AC_ARG_ENABLE(install-libiberty,
--  [  --enable-install-libiberty       Install headers for end users],
--  enable_install_libiberty=$enableval,
--  enable_install_libiberty=no)dnl
--  
--  # Option parsed, now set things appropriately.
--  case x"$enable_install_libiberty" in
--    xyes|x)
--      target_header_dir=libiberty
--      ;;
--    xno)   
--      target_header_dir=
--      ;;
--    *) 
--      # This could be sanity-checked in various ways...
--      target_header_dir="${enable_install_libiberty}"
--      ;;
--  esac
--
--
- else
- 
-    # Not a target library, so we set things up to run the test suite.
--- 
-1.9.3
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch b/bsp/buildroot/package/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch
deleted file mode 100644
index abc7a08e..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 10 Aug 2015 21:35:20 +0300
-Subject: [PATCH 1/3] xtensa: reimplement register spilling
-
-Spilling windowed registers in userspace is much easier, more portable,
-less error-prone and equally effective as in kernel. Now that register
-spilling syscall is considered obsolete in the xtensa linux kernel
-replace it with CALL12 followed by series of ENTRY in libgcc.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use
-	CALL12 followed by series of ENTRY to spill windowed registers.
-	(__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill
-	instead of making linux spill syscall.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226962
-
- libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++-------
- 1 file changed, 23 insertions(+), 7 deletions(-)
-
-diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S
-index 3ac8c1d..2e678af 100644
---- a/libgcc/config/xtensa/lib2funcs.S
-+++ b/libgcc/config/xtensa/lib2funcs.S
-@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
- 	.global	__xtensa_libgcc_window_spill
- 	.type	__xtensa_libgcc_window_spill,@function
- __xtensa_libgcc_window_spill:
--	entry	sp, 32
--	movi	a2, 0
--	syscall
-+	entry	sp, 48
-+#if XCHAL_NUM_AREGS > 16
-+	call12	1f
-+	retw
-+	.align	4
-+1:
-+	.rept	(XCHAL_NUM_AREGS - 24) / 12
-+	_entry	sp, 48
-+	mov	a12, a0
-+	.endr
-+	_entry	sp, 16
-+#if XCHAL_NUM_AREGS % 12 == 0
-+	mov	a4, a4
-+#elif XCHAL_NUM_AREGS % 12 == 4
-+	mov	a8, a8
-+#elif XCHAL_NUM_AREGS % 12 == 8
-+	mov	a12, a12
-+#endif
-+	retw
-+#else
-+	mov	a8, a8
- 	retw
-+#endif
- 	.size	__xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill
- 
- 
-@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto:
- 	entry	sp, 32
- 
- 	/* Flush registers.  */
--	mov	a5, a2
--	movi	a2, 0
--	syscall
--	mov	a2, a5
-+	call8	__xtensa_libgcc_window_spill
- 
- 	/* Because the save area for a0-a3 is stored one frame below
- 	   the one identified by a2, the only way to restore those
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/bsp/buildroot/package/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index f23a5c07..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-xtensa | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa
-index 27399e6..66d0eb3 100644
---- a/libgcc/config/xtensa/t-xtensa
-+++ b/libgcc/config/xtensa/t-xtensa
-@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \
- LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S
- 
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch b/bsp/buildroot/package/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index dc405132..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 35f7797..ef6b900 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch b/bsp/buildroot/package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch
deleted file mode 100644
index a6d1df99..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/875-xtensa-fix-PR-target-82181.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 65a3028024a5963d9b988d70fe7ebe116c731310 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 11 Sep 2017 21:53:38 +0000
-Subject: [PATCH] xtensa: fix PR target/82181
-
-2017-09-11  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	Backport from mainline
-	* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
-	words of DImode object are reachable by xtensa_uimm8x4 access.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index f08854729f50..4b94179636e0 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -599,6 +599,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
-     case HImode:
-       return xtensa_uimm8x2 (v);
- 
-+    case DImode:
-     case DFmode:
-       return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/4.8.5/890-fix-m68k-compile.patch b/bsp/buildroot/package/gcc/4.8.5/890-fix-m68k-compile.patch
deleted file mode 100644
index 124e8427..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/890-fix-m68k-compile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-remove unused header, which breaks the toolchain building
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.8.5.orig/libgcc/config/m68k/linux-atomic.c gcc-4.8.5/libgcc/config/m68k/linux-atomic.c
---- gcc-4.8.5.orig/libgcc/config/m68k/linux-atomic.c	2013-02-04 20:06:20.000000000 +0100
-+++ gcc-4.8.5/libgcc/config/m68k/linux-atomic.c	2016-03-19 00:18:12.000000000 +0100
-@@ -33,7 +33,6 @@
-    using the kernel helper defined below.  There is no support for
-    64-bit operations yet.  */
- 
--#include <asm/unistd.h>
- #include <stdbool.h>
- 
- #ifndef __NR_atomic_cmpxchg_32
diff --git a/bsp/buildroot/package/gcc/4.8.5/891-fix-m68k-uclinux.patch b/bsp/buildroot/package/gcc/4.8.5/891-fix-m68k-uclinux.patch
deleted file mode 100644
index 37c7ac40..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/891-fix-m68k-uclinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-avoids internal compiler error while compiling linux-atomic.c
-See here:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.8.5.orig/libgcc/config.host gcc-4.8.5/libgcc/config.host
---- gcc-4.8.5.orig/libgcc/config.host	2014-03-20 17:12:30.000000000 +0100
-+++ gcc-4.8.5/libgcc/config.host	2016-04-27 15:04:01.521171537 +0200
-@@ -689,7 +689,7 @@
- m68k*-*-openbsd*)
- 	;;
- m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
--	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
-+	tmake_file="$tmake_file m68k/t-floatlib"
- 	md_unwind_header=m68k/linux-unwind.h
- 	;;
- m68k-*-linux*)			# Motorola m68k's running GNU/Linux
diff --git a/bsp/buildroot/package/gcc/4.8.5/900-musl-support.patch b/bsp/buildroot/package/gcc/4.8.5/900-musl-support.patch
deleted file mode 100644
index 6840fcce..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/900-musl-support.patch
+++ /dev/null
@@ -1,648 +0,0 @@
-Add musl support to gcc
-
-This patch comes from the musl-cross project at
-https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version:
-
- * the config.sub modifications have been removed, because Buildroot
-   already overwrites all config.sub with a more recent config.sub
-   that has musl support.
-
- * change to ensure that a dummy dynamic linker path
-   MUSL_DYNAMIC_LINKER<foo> is defined for all architectures,
-   otherwise building gcc for architectures not supported by musl was
-   causing build failure. Bug reported upstream at
-   https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on.
-
- * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic
-   and only add the musl one as an addition, not as a replacement. Not
-   doing this breaks C++ exception handling with glibc, because
-   USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script
-   not testing dl_iterate_phdr() on any system except Solaris.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[Gustavo: Update for gcc 4.8.3]
-
-Index: b/fixincludes/mkfixinc.sh
-===================================================================
---- a/fixincludes/mkfixinc.sh
-+++ b/fixincludes/mkfixinc.sh
-@@ -19,7 +19,8 @@
-     powerpc-*-eabi*    | \
-     powerpc-*-rtems*   | \
-     powerpcle-*-eabisim* | \
--    powerpcle-*-eabi* )
-+    powerpcle-*-eabi* | \
-+    *-musl* )
- 	#  IF there is no include fixing,
- 	#  THEN create a no-op fixer and exit
- 	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-Index: b/gcc/config/aarch64/aarch64-linux.h
-===================================================================
---- a/gcc/config/aarch64/aarch64-linux.h
-+++ b/gcc/config/aarch64/aarch64-linux.h
-@@ -21,7 +21,12 @@
- #ifndef GCC_AARCH64_LINUX_H
- #define GCC_AARCH64_LINUX_H
- 
-+/* The AArch64 port currently supports two dynamic linkers:
-+   - ld-linux-aarch64.so.1 - GLIBC dynamic linker
-+   - ld-musl-aarch64.so.1 - musl libc dynamic linker  */
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1"
- 
- #define CPP_SPEC "%{pthread:-D_REENTRANT}"
- 
-Index: b/gcc/config/arm/linux-eabi.h
-===================================================================
---- a/gcc/config/arm/linux-eabi.h
-+++ b/gcc/config/arm/linux-eabi.h
-@@ -77,6 +77,23 @@
-     %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \
-     %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}"
- 
-+/* For ARM musl currently supports four dynamic linkers:
-+   - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI
-+   - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI
-+   - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB
-+   - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB
-+   musl does not support the legacy OABI mode.
-+   All the dynamic linkers live in /lib.
-+   We default to soft-float, EL. */
-+#undef  MUSL_DYNAMIC_LINKER
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}"
-+#endif
-+#define MUSL_DYNAMIC_LINKER \
-+  "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
-+
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
- #undef  LINK_SPEC
-Index: b/gcc/config/i386/linux64.h
-===================================================================
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -30,3 +30,10 @@
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-+
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
-+#undef MUSL_DYNAMIC_LINKERX32
-+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-Index: b/gcc/config/i386/linux.h
-===================================================================
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -21,3 +21,5 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-Index: b/gcc/config/linux.h
-===================================================================
---- a/gcc/config/linux.h
-+++ b/gcc/config/linux.h
-@@ -32,10 +32,12 @@
- #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
- #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
- #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC)
-+#define OPTION_MUSL   (DEFAULT_LIBC == LIBC_MUSL)
- #else
- #define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
- #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC)
- #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
-+#define OPTION_MUSL   (linux_libc == LIBC_MUSL)
- #endif
- 
- #define GNU_USER_TARGET_OS_CPP_BUILTINS()			\
-@@ -53,18 +55,21 @@
-    uClibc or Bionic is the default C library and whether
-    -muclibc or -mglibc or -mbionic has been passed to change the default.  */
- 
--#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3)	\
--  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}"
-+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4)	\
-+  "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}"
- 
- #if DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M)
- #elif DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M)
- #elif DEFAULT_LIBC == LIBC_BIONIC
--#define CHOOSE_DYNAMIC_LINKER(G, U, B) \
--  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U)
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M)
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \
-+  CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B)
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif /* DEFAULT_LIBC */
-@@ -82,23 +87,32 @@
- #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
- #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32"
- 
-+/* Musl dynamic linker paths must be defined on a per-architecture
-+   basis, for each architecture supported by Musl. However, in order
-+   to let other architectures continue to build with other C
-+   libraries, we provide a dummy definition of the following defines. */
-+#define MUSL_DYNAMIC_LINKER "invalid"
-+#define MUSL_DYNAMIC_LINKER32 "invalid"
-+#define MUSL_DYNAMIC_LINKER64 "invalid"
-+#define MUSL_DYNAMIC_LINKERX32 "invalid"
-+
- #define GNU_USER_DYNAMIC_LINKER						\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,	\
--			 BIONIC_DYNAMIC_LINKER)
-+			 BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- #define GNU_USER_DYNAMIC_LINKER32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
--			 BIONIC_DYNAMIC_LINKER32)
-+			 BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
--			 BIONIC_DYNAMIC_LINKER64)
-+			 BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- #define GNU_USER_DYNAMIC_LINKERX32					\
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \
--			 BIONIC_DYNAMIC_LINKERX32)
-+			 BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32)
- 
- /* Determine whether the entire c99 runtime
-    is present in the runtime library.  */
- #undef TARGET_C99_FUNCTIONS
--#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
-+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL)
- 
- /* Whether we have sincos that follows the GNU extension.  */
- #undef TARGET_HAS_SINCOS
-@@ -107,3 +121,74 @@
- /* Whether we have Bionic libc runtime */
- #undef TARGET_HAS_BIONIC
- #define TARGET_HAS_BIONIC (OPTION_BIONIC)
-+
-+/* musl avoids problematic includes by rearranging the include directories.
-+ * Unfortunately, this is mostly duplicated from cppdefault.c */
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define INCLUDE_DEFAULTS_MUSL_GPP			\
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },		\
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,		\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },		\
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,	\
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
-+
-+#ifdef LOCAL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL			\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },		\
-+    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_LOCAL
-+#endif
-+
-+#ifdef PREFIX_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_PREFIX
-+#endif
-+
-+#ifdef CROSS_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_CROSS			\
-+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#ifdef TOOL_INCLUDE_DIR
-+#define INCLUDE_DEFAULTS_MUSL_TOOL			\
-+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0},
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_TOOL
-+#endif
-+
-+#ifdef NATIVE_SYSTEM_HEADER_DIR
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 },	\
-+    { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 },
-+#else
-+#define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#endif
-+
-+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
-+# undef INCLUDE_DEFAULTS_MUSL_LOCAL
-+# define INCLUDE_DEFAULTS_MUSL_LOCAL
-+# undef INCLUDE_DEFAULTS_MUSL_NATIVE
-+# define INCLUDE_DEFAULTS_MUSL_NATIVE
-+#else
-+# undef INCLUDE_DEFAULTS_MUSL_CROSS
-+# define INCLUDE_DEFAULTS_MUSL_CROSS
-+#endif
-+
-+#undef INCLUDE_DEFAULTS
-+#define INCLUDE_DEFAULTS				\
-+  {							\
-+    INCLUDE_DEFAULTS_MUSL_GPP				\
-+    INCLUDE_DEFAULTS_MUSL_PREFIX			\
-+    INCLUDE_DEFAULTS_MUSL_CROSS				\
-+    INCLUDE_DEFAULTS_MUSL_TOOL				\
-+    INCLUDE_DEFAULTS_MUSL_NATIVE			\
-+    { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 },		\
-+    { 0, 0, 0, 0, 0, 0 }				\
-+  }
-+#endif
-Index: b/gcc/config/linux.opt
-===================================================================
---- a/gcc/config/linux.opt
-+++ b/gcc/config/linux.opt
-@@ -30,3 +30,7 @@
- muclibc
- Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
- Use uClibc C library
-+
-+mmusl
-+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc)
-+Use musl C library
-Index: b/gcc/config/microblaze/linux.h
-===================================================================
---- a/gcc/config/microblaze/linux.h
-+++ b/gcc/config/microblaze/linux.h
-@@ -25,7 +25,23 @@
- #undef TLS_NEEDS_GOT
- #define TLS_NEEDS_GOT 1
- 
--#define DYNAMIC_LINKER "/lib/ld.so.1"
-+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if DEFAULT_LIBC == LIBC_MUSL
-+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER
-+#else
-+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER
-+#endif
-+
-+
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-   { "dynamic_linker", DYNAMIC_LINKER }
-Index: b/gcc/config/mips/linux64.h
-===================================================================
---- a/gcc/config/mips/linux64.h
-+++ b/gcc/config/mips/linux64.h
-@@ -29,4 +29,4 @@
- #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
- #define GNU_USER_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
--			 BIONIC_DYNAMIC_LINKERN32)
-+			 BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER)
-Index: b/gcc/config/mips/linux.h
-===================================================================
---- a/gcc/config/mips/linux.h
-+++ b/gcc/config/mips/linux.h
-@@ -18,3 +18,11 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+
-+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
-+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}"
-+#endif
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
-Index: b/gcc/config/rs6000/linux64.h
-===================================================================
---- a/gcc/config/rs6000/linux64.h
-+++ b/gcc/config/rs6000/linux64.h
-@@ -374,17 +374,23 @@
- #endif
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#undef MUSL_DYNAMIC_LINKER32
-+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1"
-+#undef MUSL_DYNAMIC_LINKER64
-+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
- #elif DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER32 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32)
- #define GNU_USER_DYNAMIC_LINKER64 \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64)
- 
- #undef  DEFAULT_ASM_ENDIAN
- #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN)
-Index: b/gcc/config/rs6000/secureplt.h
-===================================================================
---- a/gcc/config/rs6000/secureplt.h
-+++ b/gcc/config/rs6000/secureplt.h
-@@ -18,3 +18,4 @@
- <http://www.gnu.org/licenses/>.  */
- 
- #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt"
-+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
-Index: b/gcc/config/rs6000/sysv4.h
-===================================================================
---- a/gcc/config/rs6000/sysv4.h
-+++ b/gcc/config/rs6000/sysv4.h
-@@ -537,6 +537,9 @@
- #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
- #define CC1_SECURE_PLT_DEFAULT_SPEC ""
- #endif
-+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC
-+#define LINK_SECURE_PLT_DEFAULT_SPEC ""
-+#endif
- 
- /* Pass -G xxx to the compiler.  */
- #define	CC1_SPEC "%{G*} %(cc1_cpu)" \
-@@ -585,7 +588,8 @@
- 
- /* Override the default target of the linker.  */
- #define	LINK_TARGET_SPEC \
--  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "")
-+  ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \
-+  "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}"
- 
- /* Any specific OS flags.  */
- #define LINK_OS_SPEC "\
-@@ -763,15 +767,18 @@
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1"
- #if DEFAULT_LIBC == LIBC_UCLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"
-+#elif DEFAULT_LIBC == LIBC_MUSL
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}"
- #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
--#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}"
- #else
- #error "Unsupported DEFAULT_LIBC"
- #endif
- #define GNU_USER_DYNAMIC_LINKER \
--  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER)
- 
- #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
-@@ -894,6 +901,7 @@
-   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
-   { "link_os_default",		LINK_OS_DEFAULT_SPEC },			\
-   { "cc1_secure_plt_default",	CC1_SECURE_PLT_DEFAULT_SPEC },		\
-+  { "link_secure_plt_default",	LINK_SECURE_PLT_DEFAULT_SPEC },		\
-   { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
-   { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
-   { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-Index: b/gcc/config/sh/linux.h
-===================================================================
---- a/gcc/config/sh/linux.h
-+++ b/gcc/config/sh/linux.h
-@@ -43,7 +43,15 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
-+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */
-+#define MUSL_DYNAMIC_LINKER_E "eb"
-+#else
-+#define MUSL_DYNAMIC_LINKER_E
-+#endif
-+
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#undef MUSL_DYNAMIC_LINKER
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-Index: b/gcc/config.gcc
-===================================================================
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -550,7 +550,7 @@
- esac
- 
- # Common C libraries.
--tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3"
-+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4"
- 
- # Common parts for widely ported systems.
- case ${target} in
-@@ -653,6 +653,9 @@
-     *-*-*uclibc*)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC"
-       ;;
-+    *-*-*musl*)
-+      tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL"
-+      ;;
-     *)
-       tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
-       ;;
-@@ -2135,6 +2138,10 @@
- 	    powerpc*-*-linux*paired*)
- 		tm_file="${tm_file} rs6000/750cl.h" ;;
- 	esac
-+        case ${target} in
-+            *-linux*-musl*)
-+                enable_secureplt=yes ;;
-+        esac
- 	if test x${enable_secureplt} = xyes; then
- 		tm_file="rs6000/secureplt.h ${tm_file}"
- 	fi
-Index: b/gcc/configure
-===================================================================
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -26936,6 +26940,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- 
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/configure.ac
-===================================================================
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -4848,6 +4852,9 @@
-       gcc_cv_target_dl_iterate_phdr=no
-     fi
-     ;;
-+  *-linux-musl*)
-+    gcc_cv_target_dl_iterate_phdr=yes
-+    ;;
- esac
- GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
- if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
-Index: b/gcc/ginclude/stddef.h
-===================================================================
---- a/gcc/ginclude/stddef.h
-+++ b/gcc/ginclude/stddef.h
-@@ -181,6 +181,7 @@
- #ifndef _GCC_SIZE_T
- #ifndef _SIZET_
- #ifndef __size_t
-+#ifndef __DEFINED_size_t /* musl */
- #define __size_t__	/* BeOS */
- #define __SIZE_T__	/* Cray Unicos/Mk */
- #define _SIZE_T
-@@ -197,6 +198,7 @@
- #define ___int_size_t_h
- #define _GCC_SIZE_T
- #define _SIZET_
-+#define __DEFINED_size_t /* musl */
- #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
-   || defined(__FreeBSD_kernel__)
- /* __size_t is a typedef on FreeBSD 5, must not trash it. */
-@@ -214,6 +216,7 @@
- typedef long ssize_t;
- #endif /* __BEOS__ */
- #endif /* !(defined (__GNUG__) && defined (size_t)) */
-+#endif /* __DEFINED_size_t */
- #endif /* __size_t */
- #endif /* _SIZET_ */
- #endif /* _GCC_SIZE_T */
-Index: b/libgcc/unwind-dw2-fde-dip.c
-===================================================================
---- a/libgcc/unwind-dw2-fde-dip.c
-+++ b/libgcc/unwind-dw2-fde-dip.c
-@@ -75,6 +75,13 @@
- # define USE_PT_GNU_EH_FRAME
- #endif
- 
-+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure
-+   script. */
-+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-+    && defined(TARGET_DL_ITERATE_PHDR)
-+# define USE_PT_GNU_EH_FRAME
-+#endif
-+
- #if defined(USE_PT_GNU_EH_FRAME)
- 
- #include <link.h>
-Index: b/libgomp/config/posix/time.c
-===================================================================
---- a/libgomp/config/posix/time.c
-+++ b/libgomp/config/posix/time.c
-@@ -28,6 +28,8 @@
-    The following implementation uses the most simple POSIX routines.
-    If present, POSIX 4 clocks should be used instead.  */
- 
-+#define _POSIX_C_SOURCE 199309L /* for clocks */
-+
- #include "libgomp.h"
- #include <unistd.h>
- #if TIME_WITH_SYS_TIME
-Index: b/libitm/config/arm/hwcap.cc
-===================================================================
---- a/libitm/config/arm/hwcap.cc
-+++ b/libitm/config/arm/hwcap.cc
-@@ -40,7 +40,11 @@
- 
- #ifdef __linux__
- #include <unistd.h>
-+#ifdef __GLIBC__
- #include <sys/fcntl.h>
-+#else
-+#include <fcntl.h>
-+#endif
- #include <elf.h>
- 
- static void __attribute__((constructor))
-Index: b/libitm/config/linux/x86/tls.h
-===================================================================
---- a/libitm/config/linux/x86/tls.h
-+++ b/libitm/config/linux/x86/tls.h
-@@ -25,16 +25,19 @@
- #ifndef LIBITM_X86_TLS_H
- #define LIBITM_X86_TLS_H 1
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- /* Use slots in the TCB head rather than __thread lookups.
-    GLIBC has reserved words 10 through 13 for TM.  */
- #define HAVE_ARCH_GTM_THREAD 1
- #define HAVE_ARCH_GTM_THREAD_DISP 1
- #endif
-+#endif
- 
- #include "config/generic/tls.h"
- 
--#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
-+#if defined(__GLIBC_PREREQ)
-+#if __GLIBC_PREREQ(2, 10)
- namespace GTM HIDDEN {
- 
- #ifdef __x86_64__
-@@ -101,5 +104,6 @@
- 
- } // namespace GTM
- #endif /* >= GLIBC 2.10 */
-+#endif
- 
- #endif // LIBITM_X86_TLS_H
-Index: b/libstdc++-v3/configure.host
-===================================================================
---- a/libstdc++-v3/configure.host
-+++ b/libstdc++-v3/configure.host
-@@ -264,6 +264,13 @@
-     os_include_dir="os/bsd/freebsd"
-     ;;
-   gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
-+    # check for musl by target
-+    case "${host_os}" in
-+      *-musl*)
-+        os_include_dir="os/generic"
-+        ;;
-+      *)
-+
-     if [ "$uclibc" = "yes" ]; then
-       os_include_dir="os/uclibc"
-     elif [ "$bionic" = "yes" ]; then
-@@ -272,6 +279,9 @@
-       os_include_dir="os/gnu-linux"
-     fi
-     ;;
-+
-+    esac
-+    ;;
-   hpux*)
-     os_include_dir="os/hpux"
-     ;;
diff --git a/bsp/buildroot/package/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch b/bsp/buildroot/package/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch
deleted file mode 100644
index 7799c128..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-disable split-stack for non-thread builds
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.8.5.orig/libgcc/config/t-stack gcc-4.8.5/libgcc/config/t-stack
---- gcc-4.8.5.orig/libgcc/config/t-stack	2010-10-01 21:31:49.000000000 +0200
-+++ gcc-4.8.5/libgcc/config/t-stack	2016-03-07 05:28:12.000000000 +0100
-@@ -1,4 +1,6 @@
- # Makefile fragment to provide generic support for -fsplit-stack.
- # This should be used in config.host for any host which supports
- # -fsplit-stack.
-+ifeq ($(enable_threads),yes)
- LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c
-+endif
diff --git a/bsp/buildroot/package/gcc/4.8.5/940-uclinux-enable-threads.patch b/bsp/buildroot/package/gcc/4.8.5/940-uclinux-enable-threads.patch
deleted file mode 100644
index e58e8249..00000000
--- a/bsp/buildroot/package/gcc/4.8.5/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-4.8.5.orig/gcc/config.gcc gcc-4.8.5/gcc/config.gcc
---- gcc-4.8.5.orig/gcc/config.gcc	2015-05-21 22:57:29.000000000 +0200
-+++ gcc-4.8.5/gcc/config.gcc	2016-07-02 20:35:24.107644834 +0200
-@@ -741,6 +741,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/bsp/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch b/bsp/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch
index 3d7f8c10..266e659c 100644
--- a/bsp/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch
+++ b/bsp/buildroot/package/gcc/4.9.4/875-xtensa-fix-PR-target-82181.patch
@@ -1,4 +1,4 @@
-From 672910e3d1215b781cf0e4757e473f6a25ebf756 Mon Sep 17 00:00:00 2001
+From 8dd3af97bb6ccb3dfd6cbe20c5a28ce80fcd0de7 Mon Sep 17 00:00:00 2001
 From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
 Date: Mon, 11 Sep 2017 21:53:38 +0000
 Subject: [PATCH] xtensa: fix PR target/82181
@@ -15,7 +15,7 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 67b369f015ad..3d1d981f885d 100644
+index 3c0096113775..3eb4db85b971 100644
 --- a/gcc/config/xtensa/xtensa.c
 +++ b/gcc/config/xtensa/xtensa.c
 @@ -612,6 +612,7 @@ xtensa_mem_offset (unsigned v, enum machine_mode mode)
diff --git a/bsp/buildroot/package/gcc/4.9.4/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/bsp/buildroot/package/gcc/4.9.4/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
new file mode 100644
index 00000000..526346c6
--- /dev/null
+++ b/bsp/buildroot/package/gcc/4.9.4/943-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -0,0 +1,190 @@
+From b7e85069238c40eae54d0ca03ab6d5470d1815f9 Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 4 Jul 2017 10:25:10 +0000
+Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
+
+Current glibc no longer gives the ucontext_t type the tag struct
+ucontext, to conform with POSIX namespace rules.  This requires
+various linux-unwind.h files in libgcc, that were previously using
+struct ucontext, to be fixed to use ucontext_t instead.  This is
+similar to the removal of the struct siginfo tag from siginfo_t some
+years ago.
+
+This patch changes those files to use ucontext_t instead.  As the
+standard name that should be unconditionally safe, so this is not
+restricted to architectures supported by glibc, or conditioned on the
+glibc version.
+
+Tested compilation together with current glibc with glibc's
+build-many-glibcs.py.
+
+	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
+	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
+	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
+	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
+	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
+	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
+	config/pa/linux-unwind.h (pa32_fallback_frame_state),
+	config/sh/linux-unwind.h (sh_fallback_frame_state),
+	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
+	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
+	ucontext_t instead of struct ucontext.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
+[Romain backport from gcc-5-branch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libgcc/config/aarch64/linux-unwind.h | 2 +-
+ libgcc/config/alpha/linux-unwind.h   | 2 +-
+ libgcc/config/bfin/linux-unwind.h    | 2 +-
+ libgcc/config/i386/linux-unwind.h    | 4 ++--
+ libgcc/config/m68k/linux-unwind.h    | 2 +-
+ libgcc/config/nios2/linux-unwind.h   | 2 +-
+ libgcc/config/pa/linux-unwind.h      | 2 +-
+ libgcc/config/sh/linux-unwind.h      | 2 +-
+ libgcc/config/tilepro/linux-unwind.h | 2 +-
+ libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ 10 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
+index 6b5b3cd..d13dc34 100644
+--- a/libgcc/config/aarch64/linux-unwind.h
++++ b/libgcc/config/aarch64/linux-unwind.h
+@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe
+   {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   };
+ 
+   struct rt_sigframe *rt_;
+diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
+index b5bfd1c..166d3d2 100644
+--- a/libgcc/config/alpha/linux-unwind.h
++++ b/libgcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
+index dc58f0a..8b94568 100644
+--- a/libgcc/config/bfin/linux-unwind.h
++++ b/libgcc/config/bfin/linux-unwind.h
+@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+ 	void *puc;
+ 	char retcode[8];
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+ 
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
+index 7986928..a9d621c 100644
+--- a/libgcc/config/i386/linux-unwind.h
++++ b/libgcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
+index 1ba2a0c4..d67767e 100644
+--- a/libgcc/config/m68k/linux-unwind.h
++++ b/libgcc/config/m68k/linux-unwind.h
+@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* <sys/ucontext.h> is unfortunately broken right now.  */
+ struct uw_ucontext {
+ 	unsigned long	  uc_flags;
+-	struct ucontext  *uc_link;
++	ucontext_t	 *uc_link;
+ 	stack_t		  uc_stack;
+ 	mcontext_t	  uc_mcontext;
+ 	unsigned long	  uc_filler[80];
+diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
+index ba4bd80..8978868 100644
+--- a/libgcc/config/nios2/linux-unwind.h
++++ b/libgcc/config/nios2/linux-unwind.h
+@@ -38,7 +38,7 @@ struct nios2_mcontext {
+ 
+ struct nios2_ucontext {
+   unsigned long uc_flags;
+-  struct ucontext *uc_link;
++  ucontext_t *uc_link;
+   stack_t uc_stack;
+   struct nios2_mcontext uc_mcontext;
+   sigset_t uc_sigmask;	/* mask last for extensibility */
+diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
+index 4a3cfff..d2ac437 100644
+--- a/libgcc/config/pa/linux-unwind.h
++++ b/libgcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
+index 4875706..671bde7 100644
+--- a/libgcc/config/sh/linux-unwind.h
++++ b/libgcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
+index 27481cf..c24d58c 100644
+--- a/libgcc/config/tilepro/linux-unwind.h
++++ b/libgcc/config/tilepro/linux-unwind.h
+@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe {
+     unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* Return if this is not a signal handler.  */
+diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
+index 6832d0b..cb15b4c 100644
+--- a/libgcc/config/xtensa/linux-unwind.h
++++ b/libgcc/config/xtensa/linux-unwind.h
+@@ -63,7 +63,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+ 
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* movi a2, __NR_rt_sigreturn; syscall */
+-- 
+2.9.5
+
diff --git a/bsp/buildroot/package/gcc/4.9.4/944-sanitizer-linux.patch b/bsp/buildroot/package/gcc/4.9.4/944-sanitizer-linux.patch
new file mode 100644
index 00000000..caadf2de
--- /dev/null
+++ b/bsp/buildroot/package/gcc/4.9.4/944-sanitizer-linux.patch
@@ -0,0 +1,88 @@
+From f9a35ba5c150da2e381c4cab01f8f12bcd6af5d2 Mon Sep 17 00:00:00 2001
+From: jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Mon, 17 Jul 2017 19:41:08 +0000
+Subject: [PATCH] 	Backported from mainline 	2017-07-14  Jakub
+ Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/81066
+	* sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.
+	* sanitizer_common/sanitizer_linux.cc: Likewise.
+	* sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.
+	* tsan/tsan_platform_linux.cc: Likewise.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@250287 138bc75d-0d04-0410-961f-82ee72b054a4
+(cherry picked from commit 72edc2c02f8b4768ad660f46a1c7e2400c0a8e06)
+[Romain backport to 4.9.4]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libsanitizer/sanitizer_common/sanitizer_linux.cc                      | 3 +--
+ libsanitizer/sanitizer_common/sanitizer_linux.h                       | 4 +---
+ libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-
+ libsanitizer/tsan/tsan_platform_linux.cc                              | 2 +-
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+index 69c9c10..8e53673 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
+   return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5);
+ }
+ 
+-uptr internal_sigaltstack(const struct sigaltstack *ss,
+-                         struct sigaltstack *oss) {
++uptr internal_sigaltstack(const void *ss, void *oss) {
+   return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss);
+ }
+ 
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
+index 6422df1..8e111d1 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
+@@ -18,7 +18,6 @@
+ #include "sanitizer_platform_limits_posix.h"
+ 
+ struct link_map;  // Opaque type returned by dlopen().
+-struct sigaltstack;
+ 
+ namespace __sanitizer {
+ // Dirent structure for getdents(). Note that this structure is different from
+@@ -28,8 +27,7 @@ struct linux_dirent;
+ // Syscall wrappers.
+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
+ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5);
+-uptr internal_sigaltstack(const struct sigaltstack* ss,
+-                          struct sigaltstack* oss);
++uptr internal_sigaltstack(const void* ss, void* oss);
+ uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act,
+     __sanitizer_kernel_sigaction_t *oldact);
+ uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set,
+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+index 6ee63ec..50c21a3 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+@@ -238,7 +238,7 @@ static int TracerThread(void* argument) {
+ 
+   // Alternate stack for signal handling.
+   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
+-  struct sigaltstack handler_stack;
++  stack_t handler_stack;
+   internal_memset(&handler_stack, 0, sizeof(handler_stack));
+   handler_stack.ss_sp = handler_stack_memory.data();
+   handler_stack.ss_size = kHandlerStackSize;
+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
+index fe69430..49f5270 100644
+--- a/libsanitizer/tsan/tsan_platform_linux.cc
++++ b/libsanitizer/tsan/tsan_platform_linux.cc
+@@ -351,7 +351,7 @@ bool IsGlobalVar(uptr addr) {
+ // closes within glibc. The code is a pure hack.
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+   int cnt = 0;
+-  __res_state *statp = (__res_state*)state;
++  struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
+       fds[cnt++] = statp->_u._ext.nssocks[i];
+-- 
+2.9.5
+
diff --git a/bsp/buildroot/package/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/bsp/buildroot/package/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
deleted file mode 100644
index c11ad35a..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 6 Nov 2015 14:27:23 +0100
-Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit
-
-Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate
-64-bit binaries by default.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- gcc/config.gcc | 2 +-
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 4a7cbd2..9cc765e 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -439,7 +439,7 @@ powerpc*-*-*)
- 	cpu_type=rs6000
- 	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
- 	case x$with_cpu in
--	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500)
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500)
- 		cpu_is_64bit=yes
- 		;;
- 	esac
--- 
-2.6.2
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch b/bsp/buildroot/package/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch
deleted file mode 100644
index aa1376c4..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Thu, 6 Aug 2015 01:16:02 +0300
-Subject: [PATCH] xtensa: add -mauto-litpools option
-
-With support from assembler this option allows compiling huge functions,
-where single literal pool at the beginning of a function may not be
-reachable by L32R instructions at its end.
-
-Currently assembler --auto-litpools option cannot deal with literals
-used from multiple locations separated by more than 256 KBytes of code.
-Don't turn constants into literals, instead use MOVI instruction to load
-them into registers and let the assembler turn them into literals as
-necessary.
-
-2015-08-12  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/constraints.md (define_constraint "Y"): New
-	constraint.
-	* config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools.
-	* config/xtensa/linux.h (ASM_SPEC): Likewise.
-	* config/xtensa/predicates.md (move_operand): Match constants
-	and symbols in the presence of TARGET_AUTO_LITPOOLS.
-	* config/xtensa/xtensa.c (xtensa_valid_move): Don't allow
-	immediate references to TLS data.
-	(xtensa_emit_move_sequence): Don't force constants to memory in
-	the presence of TARGET_AUTO_LITPOOLS.
-	(print_operand): Add 'y' format, same as default, but capable of
-	printing SF mode constants as well.
-	* config/xtensa/xtensa.md (movsi_internal, movhi_internal)
-	(movsf_internal): Add movi pattern that loads literal.
-	(movsf, movdf): Don't force constants to memory in the presence
-	of TARGET_AUTO_LITPOOLS.
-	(movdf_internal): Add 'Y' constraint.
-	* config/xtensa/xtensa.opt (mauto-litpools): New option.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226828
-Changes to ChangeLogs and documentation are dropped.
-
- gcc/config/xtensa/constraints.md |  5 +++++
- gcc/config/xtensa/elf.h          |  4 +++-
- gcc/config/xtensa/linux.h        |  4 +++-
- gcc/config/xtensa/predicates.md  |  3 ++-
- gcc/config/xtensa/xtensa.c       | 19 ++++++++++++++++++-
- gcc/config/xtensa/xtensa.md      | 35 +++++++++++++++++++----------------
- gcc/config/xtensa/xtensa.opt     |  4 ++++
- 7 files changed, 54 insertions(+), 20 deletions(-)
-
-diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md
-index 30f4c1f..773d4f9 100644
---- a/gcc/config/xtensa/constraints.md
-+++ b/gcc/config/xtensa/constraints.md
-@@ -111,6 +111,11 @@
-  (and (match_code "const_int")
-       (match_test "xtensa_mask_immediate (ival)")))
- 
-+(define_constraint "Y"
-+ "A constant that can be used in relaxed MOVI instructions."
-+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
-+      (match_test "TARGET_AUTO_LITPOOLS")))
-+
- ;; Memory constraints.  Do not use define_memory_constraint here.  Doing so
- ;; causes reload to force some constants into the constant pool, but since
- ;; the Xtensa constant pool can only be accessed with L32R instructions, it
-diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
-index e59bede..12056f7 100644
---- a/gcc/config/xtensa/elf.h
-+++ b/gcc/config/xtensa/elf.h
-@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
-diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
-index 675aacf..5b0243a 100644
---- a/gcc/config/xtensa/linux.h
-+++ b/gcc/config/xtensa/linux.h
-@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3.  If not see
-   %{mtarget-align:--target-align} \
-   %{mno-target-align:--no-target-align} \
-   %{mlongcalls:--longcalls} \
--  %{mno-longcalls:--no-longcalls}"
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md
-index e02209e..d7dfa11 100644
---- a/gcc/config/xtensa/predicates.md
-+++ b/gcc/config/xtensa/predicates.md
-@@ -142,7 +142,8 @@
- 	       (match_test "GET_MODE_CLASS (mode) == MODE_INT
- 			    && xtensa_simm12b (INTVAL (op))"))
- 	  (and (match_code "const_int,const_double,const,symbol_ref,label_ref")
--	       (match_test "TARGET_CONST16 && CONSTANT_P (op)
-+	       (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS)
-+			    && CONSTANT_P (op)
- 			    && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0")))))
- 
- ;; Accept the floating point constant 1 in the appropriate mode.
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index eb039ba..206ff80 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands)
-     {
-       int dst_regnum = xt_true_regnum (operands[0]);
- 
-+      if (xtensa_tls_referenced_p (operands[1]))
-+	return FALSE;
-+
-       /* The stack pointer can only be assigned with a MOVSP opcode.  */
-       if (dst_regnum == STACK_POINTER_REGNUM)
- 	return !TARGET_WINDOWED_ABI
-@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode)
- 	  return 1;
- 	}
- 
--      if (! TARGET_CONST16)
-+      if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16)
- 	{
- 	  src = force_const_mem (SImode, src);
- 	  operands[1] = src;
-@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter)
- 	}
-       break;
- 
-+    case 'y':
-+      if (GET_CODE (x) == CONST_DOUBLE &&
-+	  GET_MODE (x) == SFmode)
-+	{
-+	  REAL_VALUE_TYPE r;
-+	  long l;
-+	  REAL_VALUE_FROM_CONST_DOUBLE (r, x);
-+	  REAL_VALUE_TO_TARGET_SINGLE (r, l);
-+	  fprintf (file, "0x%08lx", l);
-+	  break;
-+	}
-+
-+      /* fall through */
-+
-     default:
-       if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG)
- 	fprintf (file, "%s", reg_names[xt_true_regnum (x)]);
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index 6d84384..0e673a3 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -761,8 +761,8 @@
- })
- 
- (define_insn "movsi_internal"
--  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A")
--	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))]
-+  [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A")
-+	(match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))]
-   "xtensa_valid_move (SImode, operands)"
-   "@
-    movi.n\t%0, %x1
-@@ -774,15 +774,16 @@
-    mov\t%0, %1
-    movsp\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr")
-+  [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr")
-    (set_attr "mode"	"SI")
--   (set_attr "length"	"2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")])
- 
- ;; 16-bit Integer moves
- 
-@@ -796,21 +797,22 @@
- })
- 
- (define_insn "movhi_internal"
--  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A")
--	(match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))]
-+  [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A")
-+	(match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))]
-   "xtensa_valid_move (HImode, operands)"
-   "@
-    movi.n\t%0, %x1
-    mov.n\t%0, %1
-    mov\t%0, %1
-    movi\t%0, %x1
-+   movi\t%0, %1
-    %v1l16ui\t%0, %1
-    %v0s16i\t%1, %0
-    rsr\t%0, ACCLO
-    wsr\t%1, ACCLO"
--  [(set_attr "type"	"move,move,move,move,load,store,rsr,wsr")
-+  [(set_attr "type"	"move,move,move,move,move,load,store,rsr,wsr")
-    (set_attr "mode"	"HI")
--   (set_attr "length"	"2,2,3,3,3,3,3,3")])
-+   (set_attr "length"	"2,2,3,3,3,3,3,3,3")])
- 
- ;; 8-bit Integer moves
- 
-@@ -881,7 +883,7 @@
- 	(match_operand:SF 1 "general_operand" ""))]
-   ""
- {
--  if (!TARGET_CONST16 && CONSTANT_P (operands[1]))
-+  if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1]))
-     operands[1] = force_const_mem (SFmode, operands[1]);
- 
-   if ((!register_operand (operands[0], SFmode)
-@@ -896,8 +898,8 @@
- })
- 
- (define_insn "movsf_internal"
--  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U")
--	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))]
-+  [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U")
-+	(match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))]
-   "((register_operand (operands[0], SFmode)
-      || register_operand (operands[1], SFmode))
-     && !(FP_REG_P (xt_true_regnum (operands[0]))
-@@ -912,13 +914,14 @@
-    mov\t%0, %1
-    wfr\t%0, %1
-    rfr\t%0, %1
-+   movi\t%0, %y1
-    const16\t%0, %t1\;const16\t%0, %b1
-    %v1l32r\t%0, %1
-    %v1l32i\t%0, %1
-    %v0s32i\t%1, %0"
--  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store")
-+  [(set_attr "type"	"farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store")
-    (set_attr "mode"	"SF")
--   (set_attr "length"	"3,3,3,2,2,2,3,3,3,6,3,3,3")])
-+   (set_attr "length"	"3,3,3,2,2,2,3,3,3,3,6,3,3,3")])
- 
- (define_insn "*lsiu"
-   [(set (match_operand:SF 0 "register_operand" "=f")
-@@ -991,7 +994,7 @@
- 	(match_operand:DF 1 "general_operand" ""))]
-   ""
- {
--  if (CONSTANT_P (operands[1]) && !TARGET_CONST16)
-+  if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS)
-     operands[1] = force_const_mem (DFmode, operands[1]);
- 
-   if (!register_operand (operands[0], DFmode)
-@@ -1002,8 +1005,8 @@
- })
- 
- (define_insn_and_split "movdf_internal"
--  [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U")
--	(match_operand:DF 1 "move_operand" "r,iF,T,U,r"))]
-+  [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U")
-+	(match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))]
-   "register_operand (operands[0], DFmode)
-    || register_operand (operands[1], DFmode)"
-   "#"
-diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt
-index 2fd6cee..21c6e96 100644
---- a/gcc/config/xtensa/xtensa.opt
-+++ b/gcc/config/xtensa/xtensa.opt
-@@ -38,6 +38,10 @@ mtext-section-literals
- Target
- Intersperse literal pools with code in the text section
- 
-+mauto-litpools
-+Target Report Mask(AUTO_LITPOOLS)
-+Relax literals in assembler and place them automatically in the text section
-+
- mserialize-volatile
- Target Report Mask(SERIALIZE_VOLATILE)
- -mno-serialize-volatile	Do not serialize volatile memory references with MEMW instructions
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/bsp/buildroot/package/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
deleted file mode 100644
index 9707f688..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7d7a85f75ba218df4a4226e95865fc8fa561cb86 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Fri, 14 Aug 2015 02:45:02 +0300
-Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde
-
-This allows having exception cleanup code in binaries that don't
-register their unwind tables.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde
-	with unwind-dw2-fde-dip.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226963
-
- libgcc/config/xtensa/t-windowed | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed
-index 7d9e9db..a99156c 100644
---- a/libgcc/config/xtensa/t-windowed
-+++ b/libgcc/config/xtensa/t-windowed
-@@ -1,2 +1,2 @@
- LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \
--   $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
-+   $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch b/bsp/buildroot/package/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch
deleted file mode 100644
index 2d8eb7c7..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b33905dc310f475ddbde4c9fb7230724b2068a2b Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 15 Aug 2015 05:12:11 +0300
-Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA
-
-Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame
-higher than what was actually used by code at context->ra. This results
-in invalid CFA value in signal frames and premature unwinding completion
-in forced unwinding used by uClibc NPTL thread cancellation.
-Returning context->sp from _Unwind_GetCFA makes all CFA values valid and
-matching code that used them.
-
-2015-08-18  Max Filippov  <jcmvbkbc@gmail.com>
-libgcc/
-	* config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return
-	context->sp instead of context->cfa.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r226964
-
- libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-index 82b0e63..8e579c7 100644
---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c
-+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c
-@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
- _Unwind_Word
- _Unwind_GetCFA (struct _Unwind_Context *context)
- {
--  return (_Unwind_Ptr) context->cfa;
-+  return (_Unwind_Ptr) context->sp;
- }
- 
- /* Overwrite the saved value for register INDEX in CONTEXT with VAL.  */
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/874-xtensa-add-uclinux-support.patch b/bsp/buildroot/package/gcc/5.4.0/874-xtensa-add-uclinux-support.patch
deleted file mode 100644
index 23db3d86..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/874-xtensa-add-uclinux-support.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Sat, 22 Aug 2015 08:44:26 +0300
-Subject: [PATCH] xtensa: add uclinux support
-
-2015-10-03  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config.gcc (xtensa*-*-uclinux*): New configuration.
-	* config/xtensa/uclinux.h: New file.
-	* config/xtensa/uclinux.opt: New file.
-
-libgcc/
-	* config.host (xtensa*-*-uclinux*): New configuration.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r228450
-
- gcc/config.gcc                |  5 ++++
- gcc/config/xtensa/uclinux.h   | 69 +++++++++++++++++++++++++++++++++++++++++++
- gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++
- libgcc/config.host            |  5 ++++
- 4 files changed, 111 insertions(+)
- create mode 100644 gcc/config/xtensa/uclinux.h
- create mode 100644 gcc/config/xtensa/uclinux.opt
-
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index c52f5a8..56797bd 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
-@@ -2995,6 +2995,11 @@ xtensa*-*-linux*)
- 	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h"
- 	tmake_file="${tmake_file} xtensa/t-xtensa"
- 	;;
-+xtensa*-*-uclinux*)
-+	tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h"
-+	tmake_file="${tmake_file} xtensa/t-xtensa"
-+	extra_options="${extra_options} xtensa/uclinux.opt"
-+	;;
- am33_2.0-*-linux*)
- 	tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h"
- 	gas=yes gnu_ld=yes
-diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
-new file mode 100644
-index 0000000..4606020
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.h
-@@ -0,0 +1,69 @@
-+/* Xtensa uClinux configuration.
-+   Derived from the configuration for GCC for Intel i386 running Linux.
-+   Copyright (C) 2001-2015 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify it under
-+the terms of the GNU General Public License as published by the Free
-+Software Foundation; either version 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#undef TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()				\
-+  do								\
-+    {								\
-+      GNU_USER_TARGET_OS_CPP_BUILTINS ();			\
-+      builtin_define ("__uClinux__");				\
-+    }								\
-+  while (0)
-+
-+#undef SUBTARGET_CPP_SPEC
-+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
-+
-+#undef SIZE_TYPE
-+#define SIZE_TYPE "unsigned int"
-+
-+#undef PTRDIFF_TYPE
-+#define PTRDIFF_TYPE "int"
-+
-+#undef WCHAR_TYPE
-+#define WCHAR_TYPE "long int"
-+
-+#undef WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+#undef ASM_SPEC
-+#define ASM_SPEC \
-+ "%{mtext-section-literals:--text-section-literals} \
-+  %{mno-text-section-literals:--no-text-section-literals} \
-+  %{mtarget-align:--target-align} \
-+  %{mno-target-align:--no-target-align} \
-+  %{mlongcalls:--longcalls} \
-+  %{mno-longcalls:--no-longcalls} \
-+  %{mauto-litpools:--auto-litpools} \
-+  %{mno-auto-litpools:--no-auto-litpools}"
-+
-+#undef LINK_SPEC
-+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}"
-+
-+#undef LOCAL_LABEL_PREFIX
-+#define LOCAL_LABEL_PREFIX	"."
-+
-+/* Always enable "-fpic" for Xtensa Linux.  */
-+#define XTENSA_ALWAYS_PIC 1
-+
-+#undef TARGET_LIBC_HAS_FUNCTION
-+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
-+
-+#undef DBX_REGISTER_NUMBER
-+
-diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt
-new file mode 100644
-index 0000000..95ef777
---- /dev/null
-+++ b/gcc/config/xtensa/uclinux.opt
-@@ -0,0 +1,32 @@
-+; Xtensa uClinux options.
-+
-+; Copyright (C) 2015 Free Software Foundation, Inc.
-+;
-+; This file is part of GCC.
-+;
-+; GCC is free software; you can redistribute it and/or modify it under
-+; the terms of the GNU General Public License as published by the Free
-+; Software Foundation; either version 3, or (at your option) any later
-+; version.
-+;
-+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+; for more details.
-+;
-+; You should have received a copy of the GNU General Public License
-+; along with GCC; see the file COPYING3.  If not see
-+; <http://www.gnu.org/licenses/>.
-+
-+; See the GCC internals manual (options.texi) for a description of
-+; this file's format.
-+
-+; Please try to keep this file in ASCII collating order.
-+
-+elf2flt
-+Driver
-+
-+elf2flt=
-+Driver JoinedOrMissing
-+
-+; This comment is to ensure we retain the blank line above.
-diff --git a/libgcc/config.host b/libgcc/config.host
-index 2c64756..2ee92c1 100644
---- a/libgcc/config.host
-+++ b/libgcc/config.host
-@@ -1295,6 +1295,11 @@ xtensa*-*-linux*)
- 	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
- 	md_unwind_header=xtensa/linux-unwind.h
- 	;;
-+xtensa*-*-uclinux*)
-+	tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc"
-+	md_unwind_header=xtensa/linux-unwind.h
-+	extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o"
-+	;;
- am33_2.0-*-linux*)
- 	# Don't need crtbeginT.o from *-*-linux* default.
- 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
--- 
-1.8.1.4
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch b/bsp/buildroot/package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch
deleted file mode 100644
index 628268ad..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e178289a12a829ec47dc5038d91401f65381e71d Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 29 Nov 2016 13:09:17 -0800
-Subject: [PATCH 8/8] xtensa: Fix PR target/78603
-
-2016-11-29  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
-	overhead loop start between a call and its CALL_ARG_LOCATION
-	note.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r242979
-
- gcc/config/xtensa/xtensa.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 206ff80..36ab1e3 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop)
-       entry_after = BB_END (entry_bb);
-       while (DEBUG_INSN_P (entry_after)
-              || (NOTE_P (entry_after)
--                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
-+		 /* Make sure we don't split a call and its corresponding
-+		    CALL_ARG_LOCATION note.  */
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
-         entry_after = PREV_INSN (entry_after);
- 
-       emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch b/bsp/buildroot/package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch
deleted file mode 100644
index ed91d22e..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/877-xtensa-fix-PR-target-82181.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 329c471661493e48e0fc65fa6c17ef86517483ed Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 11 Sep 2017 21:53:38 +0000
-Subject: [PATCH] xtensa: fix PR target/82181
-
-2017-09-11  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	Backport from mainline
-	* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
-	words of DImode object are reachable by xtensa_uimm8x4 access.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 36ab1e370853..bf02fceb416e 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -637,6 +637,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
-     case HImode:
-       return xtensa_uimm8x2 (v);
- 
-+    case DImode:
-     case DFmode:
-       return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch b/bsp/buildroot/package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch
deleted file mode 100644
index 5f00c04d..00000000
--- a/bsp/buildroot/package/gcc/5.4.0/942-asan-fix-missing-include-signal-h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 205aa8e97bab553e5e6fe45896325e97962de704 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eb@emlix.com>
-Date: Wed, 8 Feb 2017 11:42:52 +0100
-Subject: [PATCH] asan: fix missing include of signal.h
-
-This breaks when building gcc 4.9.4 / 5.4.0 with
-target_platform=powerpc-unknown-linux-gnu with glibc 2.25:
-
-../../../../gcc-host/libsanitizer/asan/asan_linux.cc: In function 'bool __asan::AsanInterceptsSignal(int)':
-../../../../gcc-host/libsanitizer/asan/asan_linux.cc:222:20: error: 'SIGSEGV' was not declared in this scope
-   return signum == SIGSEGV && common_flags()->handle_segv;
-
-This has been verified to apply to at least 4.9.4 and up to 5.4,
-the code has been reworked for gcc 6.
-
-Resolves (Buildroot) Bug: https://bugs.busybox.net/show_bug.cgi?id=10061
-
-Upstream: https://patchwork.ozlabs.org/patch/725596/
-
-Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
----
- libsanitizer/asan/asan_linux.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc
-index c504168..59087b9 100644
---- a/libsanitizer/asan/asan_linux.cc
-+++ b/libsanitizer/asan/asan_linux.cc
-@@ -29,6 +29,7 @@
- #include <dlfcn.h>
- #include <fcntl.h>
- #include <pthread.h>
-+#include <signal.h>
- #include <stdio.h>
- #include <unistd.h>
- #include <unwind.h>
diff --git a/bsp/buildroot/package/gcc/5.4.0/100-uclibc-conf.patch b/bsp/buildroot/package/gcc/5.5.0/100-uclibc-conf.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/100-uclibc-conf.patch
rename to bsp/buildroot/package/gcc/5.5.0/100-uclibc-conf.patch
diff --git a/bsp/buildroot/package/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/bsp/buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
rename to bsp/buildroot/package/gcc/5.5.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/301-missing-execinfo_h.patch b/bsp/buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/301-missing-execinfo_h.patch
rename to bsp/buildroot/package/gcc/5.5.0/301-missing-execinfo_h.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/810-arm-softfloat-libgcc.patch b/bsp/buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/810-arm-softfloat-libgcc.patch
rename to bsp/buildroot/package/gcc/5.5.0/810-arm-softfloat-libgcc.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/830-arm_unbreak_armv4t.patch b/bsp/buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/830-arm_unbreak_armv4t.patch
rename to bsp/buildroot/package/gcc/5.5.0/830-arm_unbreak_armv4t.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/bsp/buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
rename to bsp/buildroot/package/gcc/5.5.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch b/bsp/buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/840-microblaze-enable-dwarf-eh-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch b/bsp/buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch
rename to bsp/buildroot/package/gcc/5.5.0/850-libstdcxx-uclibc-c99.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/860-cilk-wchar.patch b/bsp/buildroot/package/gcc/5.5.0/860-cilk-wchar.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/860-cilk-wchar.patch
rename to bsp/buildroot/package/gcc/5.5.0/860-cilk-wchar.patch
diff --git a/bsp/buildroot/package/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch b/bsp/buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch
rename to bsp/buildroot/package/gcc/5.5.0/870-xtensa-add-mauto-litpools-option.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch b/bsp/buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch
rename to bsp/buildroot/package/gcc/5.5.0/871-xtensa-reimplement-register-spilling.patch
diff --git a/bsp/buildroot/package/gcc/4.8.5/874-xtensa-add-uclinux-support.patch b/bsp/buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/4.8.5/874-xtensa-add-uclinux-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/874-xtensa-add-uclinux-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch b/bsp/buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch
rename to bsp/buildroot/package/gcc/5.5.0/875-xtensa-implement-trap-pattern.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch b/bsp/buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch
rename to bsp/buildroot/package/gcc/5.5.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/890-fix-m68k-compile.patch b/bsp/buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/890-fix-m68k-compile.patch
rename to bsp/buildroot/package/gcc/5.5.0/890-fix-m68k-compile.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/891-fix-m68k-uclinux.patch b/bsp/buildroot/package/gcc/5.5.0/891-fix-m68k-uclinux.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/891-fix-m68k-uclinux.patch
rename to bsp/buildroot/package/gcc/5.5.0/891-fix-m68k-uclinux.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/901-fixincludes-update-for-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/902-unwind-fix-for-musl.patch b/bsp/buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/902-unwind-fix-for-musl.patch
rename to bsp/buildroot/package/gcc/5.5.0/902-unwind-fix-for-musl.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/bsp/buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
rename to bsp/buildroot/package/gcc/5.5.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/904-musl-libc-config.patch b/bsp/buildroot/package/gcc/5.5.0/904-musl-libc-config.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/904-musl-libc-config.patch
rename to bsp/buildroot/package/gcc/5.5.0/904-musl-libc-config.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/905-add-musl-support-to-gcc.patch b/bsp/buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/905-add-musl-support-to-gcc.patch
rename to bsp/buildroot/package/gcc/5.5.0/905-add-musl-support-to-gcc.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/906-mips-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/906-mips-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/906-mips-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/906-mips-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/907-x86-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/907-x86-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/907-x86-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/907-x86-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/908-arm-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/908-arm-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/908-arm-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/908-arm-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/909-aarch64-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/909-aarch64-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/909-aarch64-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch b/bsp/buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch
rename to bsp/buildroot/package/gcc/5.5.0/910-microblaze-musl-and-uclibc.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/911-ppc-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/911-ppc-musl-support.patch
rename to bsp/buildroot/package/gcc/5.5.0/911-ppc-musl-support.patch
diff --git a/bsp/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch b/bsp/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch
new file mode 100644
index 00000000..6fdfacc6
--- /dev/null
+++ b/bsp/buildroot/package/gcc/5.5.0/912-sh-musl-support.patch
@@ -0,0 +1,50 @@
+From 6e9cad5fc3bdd0a1fa24ae172d4d4c1e3179a51c Mon Sep 17 00:00:00 2001
+From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 20 Oct 2015 18:13:15 +0000
+Subject: [PATCH] musl support for sh
+
+	* config/sh/linux.h (MUSL_DYNAMIC_LINKER): Define.
+	(MUSL_DYNAMIC_LINKER_E, MUSL_DYNAMIC_LINKER_FP): Define.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@229095 138bc75d-0d04-0410-961f-82ee72b054a4
+[Thomas: backport from gcc 6.x]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gcc/config/sh/linux.h | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
+index 0f5d614..61cf777 100644
+--- a/gcc/config/sh/linux.h
++++ b/gcc/config/sh/linux.h
+@@ -43,6 +43,27 @@ along with GCC; see the file COPYING3.  If not see
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+ 
++#if TARGET_ENDIAN_DEFAULT == MASK_LITTLE_ENDIAN
++#define MUSL_DYNAMIC_LINKER_E "%{mb:eb}"
++#else
++#define MUSL_DYNAMIC_LINKER_E "%{!ml:eb}"
++#endif
++
++#if TARGET_CPU_DEFAULT & (MASK_HARD_SH2A_DOUBLE | MASK_SH4)
++/* "-nofpu" if any nofpu option is specified.  */
++#define MUSL_DYNAMIC_LINKER_FP \
++  "%{m1|m2|m2a-nofpu|m3|m4-nofpu|m4-100-nofpu|m4-200-nofpu|m4-300-nofpu|" \
++  "m4-340|m4-400|m4-500|m4al:-nofpu}"
++#else
++/* "-nofpu" if none of the hard fpu options are specified.  */
++#define MUSL_DYNAMIC_LINKER_FP "%{m2a|m4|m4-100|m4-200|m4-300|m4a:;:-nofpu}"
++#endif
++
++#undef MUSL_DYNAMIC_LINKER
++#define MUSL_DYNAMIC_LINKER \
++  "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
++  "%{mfdpic:-fdpic}.so.1"
++
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+ #undef SUBTARGET_LINK_EMUL_SUFFIX
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/bsp/buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch
rename to bsp/buildroot/package/gcc/5.5.0/930-libgcc-disable-split-stack-nothreads.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/940-uclinux-enable-threads.patch b/bsp/buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/940-uclinux-enable-threads.patch
rename to bsp/buildroot/package/gcc/5.5.0/940-uclinux-enable-threads.patch
diff --git a/bsp/buildroot/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch b/bsp/buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch
rename to bsp/buildroot/package/gcc/5.5.0/941-mips-Add-support-for-mips-r6-musl.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch b/bsp/buildroot/package/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch
deleted file mode 100644
index 0598c76c..00000000
--- a/bsp/buildroot/package/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From 0d2556fa652cc85b3d042e862a38dd07d454175a Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Wed, 26 Oct 2016 08:02:51 +0000
-Subject: [PATCH 1/2] xtensa: Fix PR target/78118
-
-It started failing after the following commit: 32e90dc6a0cda45 ("PR
-rtl-optimization/61047").
-
-The change that made xtensa backend go ICE looks completely unrelated,
-and indeed, the issue is caused by the side effect of
-compute_frame_size() function call hidden in the
-INITIAL_ELIMINATION_OFFSET macro. This call updates the value of the
-xtensa_current_frame_size static variable, used in "return" instruction
-predicate. Prior to the change the value of xtensa_current_frame_size was
-set to 0 after the end of epilogue generation, which enabled the "return"
-instruction for the CALL0 ABI, but after the change the additional
-INITIAL_ELIMINATION_OFFSET calls make xtensa_current_frame_size non-zero
-and "return" pattern unavailable.
-
-Get rid of the global xtensa_current_frame_size and
-xtensa_callee_save_size variables by moving them into the
-machine_function structure. Implement predicate for the "return" pattern
-as a function. Don't communicate completion of epilogue generation
-through zeroing of xtensa_current_frame_size, add explicit epilogue_done
-variable to the machine_function structure. Don't update stack frame
-layout after the completion of reload.
-
-2016-10-26  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa-protos.h
-	(xtensa_use_return_instruction_p): New prototype.
-	* config/xtensa/xtensa.c (xtensa_current_frame_size,
-	xtensa_callee_save_size): Remove.
-	(struct machine_function): Add new fields: current_frame_size,
-	callee_save_size, frame_laid_out and epilogue_done.
-	(compute_frame_size, xtensa_expand_prologue,
-	xtensa_expand_epilogue): Replace xtensa_callee_save_size with
-	cfun->machine->callee_save_size and xtensa_current_frame_size
-	with cfun->machine->current_frame_size.
-	(compute_frame_size): Update cfun->machine->frame_laid_out and
-	don't update frame layout after reload completion.
-	(xtensa_expand_epilogue): Set cfun->machine->epilogue_done
-	instead of zeroing xtensa_current_frame_size.
-	(xtensa_use_return_instruction_p): New function.
-	* config/xtensa/xtensa.h (xtensa_current_frame_size): Remove
-	declaration.
-	(INITIAL_ELIMINATION_OFFSET): Use return value of
-	compute_frame_size instead of xtensa_current_frame_size value.
-	* config/xtensa/xtensa.md ("return" pattern): Use new predicate
-	function xtensa_use_return_instruction_p instead of inline code.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r241748
-
- gcc/config/xtensa/xtensa-protos.h |  1 +
- gcc/config/xtensa/xtensa.c        | 82 ++++++++++++++++++++++++---------------
- gcc/config/xtensa/xtensa.h        |  6 +--
- gcc/config/xtensa/xtensa.md       |  2 +-
- 4 files changed, 55 insertions(+), 36 deletions(-)
-
-diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h
-index f2ca526..873557f 100644
---- a/gcc/config/xtensa/xtensa-protos.h
-+++ b/gcc/config/xtensa/xtensa-protos.h
-@@ -68,6 +68,7 @@ extern rtx xtensa_return_addr (int, rtx);
- extern void xtensa_setup_frame_addresses (void);
- extern int xtensa_dbx_register_number (int);
- extern long compute_frame_size (int);
-+extern bool xtensa_use_return_instruction_p (void);
- extern void xtensa_expand_prologue (void);
- extern void xtensa_expand_epilogue (void);
- extern void order_regs_for_local_alloc (void);
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 64d089b..e49f784 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -78,11 +78,6 @@ enum internal_test
-    can support a given mode.  */
- char xtensa_hard_regno_mode_ok[(int) MAX_MACHINE_MODE][FIRST_PSEUDO_REGISTER];
- 
--/* Current frame size calculated by compute_frame_size.  */
--unsigned xtensa_current_frame_size;
--/* Callee-save area size in the current frame calculated by compute_frame_size. */
--int xtensa_callee_save_size;
--
- /* Largest block move to handle in-line.  */
- #define LARGEST_MOVE_RATIO 15
- 
-@@ -94,6 +89,13 @@ struct GTY(()) machine_function
-   bool vararg_a7;
-   rtx vararg_a7_copy;
-   rtx_insn *set_frame_ptr_insn;
-+  /* Current frame size calculated by compute_frame_size.  */
-+  unsigned current_frame_size;
-+  /* Callee-save area size in the current frame calculated by
-+     compute_frame_size.  */
-+  int callee_save_size;
-+  bool frame_laid_out;
-+  bool epilogue_done;
- };
- 
- /* Vector, indexed by hard register number, which contains 1 for a
-@@ -2628,24 +2630,29 @@ compute_frame_size (int size)
- {
-   int regno;
- 
-+  if (reload_completed && cfun->machine->frame_laid_out)
-+    return cfun->machine->current_frame_size;
-+
-   /* Add space for the incoming static chain value.  */
-   if (cfun->static_chain_decl != NULL)
-     size += (1 * UNITS_PER_WORD);
- 
--  xtensa_callee_save_size = 0;
-+  cfun->machine->callee_save_size = 0;
-   for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno)
-     {
-       if (xtensa_call_save_reg(regno))
--	xtensa_callee_save_size += UNITS_PER_WORD;
-+	cfun->machine->callee_save_size += UNITS_PER_WORD;
-     }
- 
--  xtensa_current_frame_size =
-+  cfun->machine->current_frame_size =
-     XTENSA_STACK_ALIGN (size
--			+ xtensa_callee_save_size
-+			+ cfun->machine->callee_save_size
- 			+ crtl->outgoing_args_size
- 			+ (WINDOW_SIZE * UNITS_PER_WORD));
--  xtensa_callee_save_size = XTENSA_STACK_ALIGN (xtensa_callee_save_size);
--  return xtensa_current_frame_size;
-+  cfun->machine->callee_save_size =
-+    XTENSA_STACK_ALIGN (cfun->machine->callee_save_size);
-+  cfun->machine->frame_laid_out = true;
-+  return cfun->machine->current_frame_size;
- }
- 
- 
-@@ -2696,6 +2703,7 @@ xtensa_expand_prologue (void)
-     {
-       int regno;
-       HOST_WIDE_INT offset = 0;
-+      int callee_save_size = cfun->machine->callee_save_size;
- 
-       /* -128 is a limit of single addi instruction. */
-       if (total_size > 0 && total_size <= 128)
-@@ -2709,7 +2717,7 @@ xtensa_expand_prologue (void)
- 	  add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
- 	  offset = total_size - UNITS_PER_WORD;
- 	}
--      else if (xtensa_callee_save_size)
-+      else if (callee_save_size)
- 	{
- 	  /* 1020 is maximal s32i offset, if the frame is bigger than that
- 	   * we move sp to the end of callee-saved save area, save and then
-@@ -2717,13 +2725,13 @@ xtensa_expand_prologue (void)
- 	  if (total_size > 1024)
- 	    {
- 	      insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
--					    GEN_INT (-xtensa_callee_save_size)));
-+					    GEN_INT (-callee_save_size)));
- 	      RTX_FRAME_RELATED_P (insn) = 1;
- 	      note_rtx = gen_rtx_SET (stack_pointer_rtx,
- 				      plus_constant (Pmode, stack_pointer_rtx,
--						     -xtensa_callee_save_size));
-+						     -callee_save_size));
- 	      add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
--	      offset = xtensa_callee_save_size - UNITS_PER_WORD;
-+	      offset = callee_save_size - UNITS_PER_WORD;
- 	    }
- 	  else
- 	    {
-@@ -2759,13 +2767,13 @@ xtensa_expand_prologue (void)
- 	{
- 	  rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
- 	  emit_move_insn (tmp_reg, GEN_INT (total_size -
--					    xtensa_callee_save_size));
-+					    callee_save_size));
- 	  insn = emit_insn (gen_subsi3 (stack_pointer_rtx,
- 					stack_pointer_rtx, tmp_reg));
- 	  RTX_FRAME_RELATED_P (insn) = 1;
- 	  note_rtx = gen_rtx_SET (stack_pointer_rtx,
- 				  plus_constant (Pmode, stack_pointer_rtx,
--						 xtensa_callee_save_size -
-+						 callee_save_size -
- 						 total_size));
- 	  add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx);
- 	}
-@@ -2833,21 +2841,21 @@ xtensa_expand_epilogue (void)
-       int regno;
-       HOST_WIDE_INT offset;
- 
--      if (xtensa_current_frame_size > (frame_pointer_needed ? 127 : 1024))
-+      if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024))
- 	{
- 	  rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
--	  emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size -
--					    xtensa_callee_save_size));
-+	  emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size -
-+					    cfun->machine->callee_save_size));
- 	  emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ?
- 				 hard_frame_pointer_rtx : stack_pointer_rtx,
- 				 tmp_reg));
--	  offset = xtensa_callee_save_size - UNITS_PER_WORD;
-+	  offset = cfun->machine->callee_save_size - UNITS_PER_WORD;
- 	}
-       else
- 	{
- 	  if (frame_pointer_needed)
- 	    emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx);
--	  offset = xtensa_current_frame_size - UNITS_PER_WORD;
-+	  offset = cfun->machine->current_frame_size - UNITS_PER_WORD;
- 	}
- 
-       /* Prevent reordering of saved a0 update and loading it back from
-@@ -2867,16 +2875,16 @@ xtensa_expand_epilogue (void)
- 	    }
- 	}
- 
--      if (xtensa_current_frame_size > 0)
-+      if (cfun->machine->current_frame_size > 0)
- 	{
- 	  if (frame_pointer_needed || /* always reachable with addi */
--	      xtensa_current_frame_size > 1024 ||
--	      xtensa_current_frame_size <= 127)
-+	      cfun->machine->current_frame_size > 1024 ||
-+	      cfun->machine->current_frame_size <= 127)
- 	    {
--	      if (xtensa_current_frame_size <= 127)
--		offset = xtensa_current_frame_size;
-+	      if (cfun->machine->current_frame_size <= 127)
-+		offset = cfun->machine->current_frame_size;
- 	      else
--		offset = xtensa_callee_save_size;
-+		offset = cfun->machine->callee_save_size;
- 
- 	      emit_insn (gen_addsi3 (stack_pointer_rtx,
- 				     stack_pointer_rtx,
-@@ -2885,7 +2893,8 @@ xtensa_expand_epilogue (void)
- 	  else
- 	    {
- 	      rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG);
--	      emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size));
-+	      emit_move_insn (tmp_reg,
-+			      GEN_INT (cfun->machine->current_frame_size));
- 	      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx,
- 				     tmp_reg));
- 	    }
-@@ -2896,11 +2905,22 @@ xtensa_expand_epilogue (void)
- 				  stack_pointer_rtx,
- 				  EH_RETURN_STACKADJ_RTX));
-     }
--  xtensa_current_frame_size = 0;
--  xtensa_callee_save_size = 0;
-+  cfun->machine->epilogue_done = true;
-   emit_jump_insn (gen_return ());
- }
- 
-+bool
-+xtensa_use_return_instruction_p (void)
-+{
-+  if (!reload_completed)
-+    return false;
-+  if (TARGET_WINDOWED_ABI)
-+    return true;
-+  if (compute_frame_size (get_frame_size ()) == 0)
-+    return true;
-+  return cfun->machine->epilogue_done;
-+}
-+
- void
- xtensa_set_return_address (rtx address, rtx scratch)
- {
-diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h
-index 82e9900..58eb1b2 100644
---- a/gcc/config/xtensa/xtensa.h
-+++ b/gcc/config/xtensa/xtensa.h
-@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3.  If not see
- 
- /* External variables defined in xtensa.c.  */
- 
--extern unsigned xtensa_current_frame_size;
--
- /* Macros used in the machine description to select various Xtensa
-    configuration options.  */
- #ifndef XCHAL_HAVE_MUL32_HIGH
-@@ -477,14 +475,14 @@ enum reg_class
- /* Specify the initial difference between the specified pair of registers.  */
- #define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET)			\
-   do {									\
--    compute_frame_size (get_frame_size ());				\
-+    long frame_size = compute_frame_size (get_frame_size ());		\
-     switch (FROM)							\
-       {									\
-       case FRAME_POINTER_REGNUM:					\
-         (OFFSET) = 0;							\
- 	break;								\
-       case ARG_POINTER_REGNUM:						\
--        (OFFSET) = xtensa_current_frame_size;				\
-+        (OFFSET) = frame_size;						\
- 	break;								\
-       default:								\
- 	gcc_unreachable ();						\
-diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
-index db54a12..fcdb6c8 100644
---- a/gcc/config/xtensa/xtensa.md
-+++ b/gcc/config/xtensa/xtensa.md
-@@ -1663,7 +1663,7 @@
- (define_insn "return"
-   [(return)
-    (use (reg:SI A0_REG))]
--  "(TARGET_WINDOWED_ABI || !xtensa_current_frame_size) && reload_completed"
-+  "xtensa_use_return_instruction_p ()"
- {
-   return TARGET_WINDOWED_ABI ?
-       (TARGET_DENSITY ? "retw.n" : "retw") :
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch b/bsp/buildroot/package/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch
deleted file mode 100644
index 03318143..00000000
--- a/bsp/buildroot/package/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 59cce7b304a8cbbb508ba21ab2f9052d3ee9a9e3 Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Tue, 29 Nov 2016 13:09:17 -0800
-Subject: [PATCH 2/2] xtensa: Fix PR target/78603
-
-2016-11-29  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	* config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero
-	overhead loop start between a call and its CALL_ARG_LOCATION
-	note.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
-Backported from: r242979
-
- gcc/config/xtensa/xtensa.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index e49f784..70f698a 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -4158,7 +4158,10 @@ hwloop_optimize (hwloop_info loop)
-       entry_after = BB_END (entry_bb);
-       while (DEBUG_INSN_P (entry_after)
-              || (NOTE_P (entry_after)
--                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK))
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK
-+		 /* Make sure we don't split a call and its corresponding
-+		    CALL_ARG_LOCATION note.  */
-+                 && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION))
-         entry_after = PREV_INSN (entry_after);
- 
-       emit_insn_after (seq, entry_after);
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch b/bsp/buildroot/package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch
deleted file mode 100644
index c16feee1..00000000
--- a/bsp/buildroot/package/gcc/6.3.0/872-xtensa-fix-PR-target-82181.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dc90c186f755e726a097c9bb8bf6c4e7a45d8a07 Mon Sep 17 00:00:00 2001
-From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Mon, 11 Sep 2017 21:53:38 +0000
-Subject: [PATCH] xtensa: fix PR target/82181
-
-2017-09-11  Max Filippov  <jcmvbkbc@gmail.com>
-gcc/
-	Backport from mainline
-	* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
-	words of DImode object are reachable by xtensa_uimm8x4 access.
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- gcc/config/xtensa/xtensa.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
-index 70f698aba0ae..750b685b23e7 100644
---- a/gcc/config/xtensa/xtensa.c
-+++ b/gcc/config/xtensa/xtensa.c
-@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
-     case HImode:
-       return xtensa_uimm8x2 (v);
- 
-+    case DImode:
-     case DFmode:
-       return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch b/bsp/buildroot/package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch
deleted file mode 100644
index 98e62705..00000000
--- a/bsp/buildroot/package/gcc/6.3.0/942-ubsan-fix-check-empty-string.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001
-From: kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 3 Sep 2016 10:57:05 +0000
-Subject: [PATCH] gcc/ubsan.c: Fix check for empty string
-
-Building host-gcc-initial with GCC7 on the host fails due to the
-comparison of a pointer to an integer in ubsan_use_new_style_p, which
-is forbidden by ISO C++:
-
-ubsan.c:1474:23: error: ISO C++ forbids comparison between pointer and
-integer [-fpermissive]
-       || xloc.file == '\0' || xloc.file[0] == '\xff'
-
-Backport the fix from upstream GCC to enable the build with GCC 7.
-
-Backported from:
-https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=239971
-
-Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-[Add commit log from [1]]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-
-[1] https://patchwork.openembedded.org/patch/138884/
----
- gcc/ubsan.c   | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-Index: gcc-6.3.0/gcc/ubsan.c
-===================================================================
---- gcc-6.3.0.orig/gcc/ubsan.c
-+++ gcc-6.3.0/gcc/ubsan.c
-@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
- 
-   expanded_location xloc = expand_location (loc);
-   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
--      || xloc.file == '\0' || xloc.file[0] == '\xff'
-+      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
-       || xloc.file[1] == '\xff')
-     return false;
- 
diff --git a/bsp/buildroot/package/gcc/6.4.0/0002-fix-building-on-ppc64.patch b/bsp/buildroot/package/gcc/6.4.0/0002-fix-building-on-ppc64.patch
new file mode 100644
index 00000000..ee096cfc
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/0002-fix-building-on-ppc64.patch
@@ -0,0 +1,38 @@
+From 765527ad3725c5f3e82ab2b8e5031120b409983d Mon Sep 17 00:00:00 2001
+From: marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 15 Jun 2018 08:51:28 +0000
+Subject: [PATCH] Partial backport r256656
+
+2018-06-15  Martin Liska  <mliska@suse.cz>
+
+	Backport from mainline
+	2018-01-10  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	* lex.c (search_line_fast): Remove illegal coercion of an
+	unaligned pointer value to vector pointer type and replace with
+	use of __builtin_vec_vsx_ld () built-in function, which operates
+	on unaligned pointer values.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@261621 138bc75d-0d04-0410-961f-82ee72b054a4
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ libcpp/lex.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcpp/lex.c b/libcpp/lex.c
+index e5a0397f3099..b789686f1c49 100644
+--- a/libcpp/lex.c
++++ b/libcpp/lex.c
+@@ -568,7 +568,7 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
+     {
+       vc m_nl, m_cr, m_bs, m_qm;
+ 
+-      data = *((const vc *)s);
++      data = __builtin_vec_vsx_ld (0, s);
+       s += 16;
+ 
+       m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl);
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/gcc/6.3.0/100-uclibc-conf.patch b/bsp/buildroot/package/gcc/6.4.0/100-uclibc-conf.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/100-uclibc-conf.patch
rename to bsp/buildroot/package/gcc/6.4.0/100-uclibc-conf.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/301-missing-execinfo_h.patch b/bsp/buildroot/package/gcc/6.4.0/301-missing-execinfo_h.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/301-missing-execinfo_h.patch
rename to bsp/buildroot/package/gcc/6.4.0/301-missing-execinfo_h.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/810-arm-softfloat-libgcc.patch b/bsp/buildroot/package/gcc/6.4.0/810-arm-softfloat-libgcc.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/810-arm-softfloat-libgcc.patch
rename to bsp/buildroot/package/gcc/6.4.0/810-arm-softfloat-libgcc.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/830-arm_unbreak_armv4t.patch b/bsp/buildroot/package/gcc/6.4.0/830-arm_unbreak_armv4t.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/830-arm_unbreak_armv4t.patch
rename to bsp/buildroot/package/gcc/6.4.0/830-arm_unbreak_armv4t.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/bsp/buildroot/package/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
rename to bsp/buildroot/package/gcc/6.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/860-cilk-wchar.patch b/bsp/buildroot/package/gcc/6.4.0/860-cilk-wchar.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/860-cilk-wchar.patch
rename to bsp/buildroot/package/gcc/6.4.0/860-cilk-wchar.patch
diff --git a/bsp/buildroot/package/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch b/bsp/buildroot/package/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch
new file mode 100644
index 00000000..5fe38414
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/870-xtensa-fix-PR-target-82181.patch
@@ -0,0 +1,31 @@
+From 3bc2ee6886f1619bc6a2257a0775142526b1a57a Mon Sep 17 00:00:00 2001
+From: jcmvbkbc <jcmvbkbc@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Mon, 11 Sep 2017 21:53:38 +0000
+Subject: [PATCH] xtensa: fix PR target/82181
+
+2017-09-11  Max Filippov  <jcmvbkbc@gmail.com>
+gcc/
+	Backport from mainline
+	* config/xtensa/xtensa.c (xtensa_mem_offset): Check that both
+	words of DImode object are reachable by xtensa_uimm8x4 access.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+ gcc/config/xtensa/xtensa.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
+index 2bdf5ccef979..92fdeb08046d 100644
+--- a/gcc/config/xtensa/xtensa.c
++++ b/gcc/config/xtensa/xtensa.c
+@@ -601,6 +601,7 @@ xtensa_mem_offset (unsigned v, machine_mode mode)
+     case HImode:
+       return xtensa_uimm8x2 (v);
+ 
++    case DImode:
+     case DFmode:
+       return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
+ 
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch b/bsp/buildroot/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch
new file mode 100644
index 00000000..7ead5754
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/871-xtensa-fix-PR-target-65416.patch
@@ -0,0 +1,101 @@
+From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sun, 17 Jun 2018 21:18:39 -0700
+Subject: [PATCH] xtensa: fix PR target/65416
+
+The issue is caused by reordering of stack pointer update after stack
+space allocation with instructions that write to the allocated stack
+space. In windowed ABI register spill area for the previous call frame
+is located just below the stack pointer and may be reloaded back into
+the register file on movsp.
+Implement allocate_stack pattern for windowed ABI configuration and
+insert an instruction that prevents reordering of frame memory access
+and stack pointer update.
+
+gcc/
+2018-06-19  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec
+	constant.
+	(allocate_stack, frame_blockage, *frame_blockage): New patterns.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: r261755
+---
+ gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
+index 84967dbedc08..209f839cfb0f 100644
+--- a/gcc/config/xtensa/xtensa.md
++++ b/gcc/config/xtensa/xtensa.md
+@@ -38,6 +38,7 @@
+   (UNSPEC_MEMW		11)
+   (UNSPEC_LSETUP_START  12)
+   (UNSPEC_LSETUP_END    13)
++  (UNSPEC_FRAME_BLOCKAGE 14)
+ 
+   (UNSPECV_SET_FP	1)
+   (UNSPECV_ENTRY	2)
+@@ -1676,6 +1677,32 @@
+ 
+ ;; Miscellaneous instructions.
+ 
++;; In windowed ABI stack pointer adjustment must happen before any access
++;; to the space allocated on stack is allowed, otherwise register spill
++;; area may be clobbered.  That's what frame blockage is supposed to enforce.
++
++(define_expand "allocate_stack"
++  [(set (match_operand 0 "nonimmed_operand")
++        (minus (reg A1_REG) (match_operand 1 "add_operand")))
++   (set (reg A1_REG)
++        (minus (reg A1_REG) (match_dup 1)))]
++  "TARGET_WINDOWED_ABI"
++{
++  if (CONST_INT_P (operands[1]))
++    {
++      rtx neg_op0 = GEN_INT (-INTVAL (operands[1]));
++      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0));
++    }
++  else
++    {
++      emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
++			     operands[1]));
++    }
++  emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
++  emit_insn (gen_frame_blockage ());
++  DONE;
++})
++
+ (define_expand "prologue"
+   [(const_int 0)]
+   ""
+@@ -1767,6 +1794,25 @@
+   [(set_attr "length" "0")
+    (set_attr "type" "nop")])
+ 
++;; Do not schedule instructions accessing memory before this point.
++
++(define_expand "frame_blockage"
++  [(set (match_dup 0)
++        (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))]
++  ""
++{
++  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++  MEM_VOLATILE_P (operands[0]) = 1;
++  operands[1] = stack_pointer_rtx;
++})
++
++(define_insn "*frame_blockage"
++  [(set (match_operand:BLK 0 "" "")
++        (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))]
++  ""
++  ""
++  [(set_attr "length" "0")])
++
+ (define_insn "trap"
+   [(trap_if (const_int 1) (const_int 0))]
+   ""
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/bsp/buildroot/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
new file mode 100644
index 00000000..d62d7c15
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
@@ -0,0 +1,39 @@
+From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Tue, 4 Sep 2018 00:39:32 -0700
+Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
+
+NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
+That fixes libatomic tests atomic-op-{1,2}.
+
+gcc/
+2018-09-04  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
+	XOR operations in NAND case.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: r264087
+---
+ gcc/config/xtensa/xtensa.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
+index 7cfe64d42895..080bb4ad765d 100644
+--- a/gcc/config/xtensa/xtensa.c
++++ b/gcc/config/xtensa/xtensa.c
+@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
+       break;
+ 
+     case MULT: /* NAND */
+-      tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
++      tmp = expand_simple_binop (SImode, AND, old, val,
+ 				 NULL_RTX, 1, OPTAB_DIRECT);
+-      tmp = expand_simple_binop (SImode, AND, tmp, val,
++      tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
+ 				 new_rtx, 1, OPTAB_DIRECT);
+       break;
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gcc/6.3.0/890-fix-m68k-compile.patch b/bsp/buildroot/package/gcc/6.4.0/890-fix-m68k-compile.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/890-fix-m68k-compile.patch
rename to bsp/buildroot/package/gcc/6.4.0/890-fix-m68k-compile.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/891-fix-m68k-uclinux.patch b/bsp/buildroot/package/gcc/6.4.0/891-fix-m68k-uclinux.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/891-fix-m68k-uclinux.patch
rename to bsp/buildroot/package/gcc/6.4.0/891-fix-m68k-uclinux.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch b/bsp/buildroot/package/gcc/6.4.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
rename to bsp/buildroot/package/gcc/6.4.0/892-libgcc-mkmap-symver-support-skip_underscore.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/bsp/buildroot/package/gcc/6.4.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
rename to bsp/buildroot/package/gcc/6.4.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/bsp/buildroot/package/gcc/6.4.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
rename to bsp/buildroot/package/gcc/6.4.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/895-bfin-define-REENTRANT.patch b/bsp/buildroot/package/gcc/6.4.0/895-bfin-define-REENTRANT.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/895-bfin-define-REENTRANT.patch
rename to bsp/buildroot/package/gcc/6.4.0/895-bfin-define-REENTRANT.patch
diff --git a/bsp/buildroot/package/gcc/6.4.0/896-microblaze-Revert.patch b/bsp/buildroot/package/gcc/6.4.0/896-microblaze-Revert.patch
new file mode 100644
index 00000000..7026d0ef
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/896-microblaze-Revert.patch
@@ -0,0 +1,40 @@
+From 707a69dfb56a2976e2b5c010f0e5cb2ac9905a07 Mon Sep 17 00:00:00 2001
+From: eager <eager@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 27 May 2017 18:29:40 +0000
+Subject: [PATCH] 	Revert: 	2016-01-21  Ajit Agarwal 
+ <ajitkum@xilinx.com>
+
+	See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html.
+
+	* config/microblaze/microblaze.h
+	(FIXED_REGISTERS): Update in macro.
+	(CALL_USED_REGISTERS): Update in macro.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
+index 66e4ef5..2c9ece1 100644
+--- a/gcc/config/microblaze/microblaze.h
++++ b/gcc/config/microblaze/microblaze.h
+@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe;
+ #define FIXED_REGISTERS							\
+ {									\
+   1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,			\
+-  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
++  1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
+   1, 1, 1, 1 								\
+ }
+ 
+ #define CALL_USED_REGISTERS						\
+ {									\
+   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,			\
+-  1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
++  1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
+   1, 1, 1, 1								\
+ }
+ #define GP_REG_FIRST    0
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/gcc/6.4.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch b/bsp/buildroot/package/gcc/6.4.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch
new file mode 100644
index 00000000..1f2dcabe
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/897-Make-MicroBlaze-support-DWARF-EH-old-Xilinx-patch-ne.patch
@@ -0,0 +1,178 @@
+From 81aab124bc697a87ad492d4cd3380599c0e0747e Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 6 Jan 2017 20:54:34 +0000
+Subject: [PATCH] Make MicroBlaze support DWARF EH (old Xilinx patch, needed
+ for glibc build).
+
+This patch, taken from
+<https://git.busybox.net/buildroot/tree/package/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch>
+and with a few formatting cleanups and an update for the removal of
+gen_rtx_raw_REG, enables DWARF EH support for MicroBlaze.
+
+This is needed for building glibc with a compiler that includes shared
+libgcc; right now all glibc builds for MicroBlaze are failing with my
+bot for lack of this support.  (It's dubious if we should have glibc
+ports at all where required support is missing in FSF GCC.)
+
+Tested building glibc with build-many-glibcs.py.  I have *not* done
+any other testing or any execution testing for MicroBlaze.
+
+2017-01-06  Edgar E. Iglesias <edgar.iglesias@xilinx.com>
+	    David Holsgrove <david.holsgrove@xilinx.com>
+
+	* common/config/microblaze/microblaze-common.c
+	(TARGET_EXCEPT_UNWIND_INFO): Remove.
+	* config/microblaze/microblaze-protos.h (microblaze_eh_return):
+	New prototype.
+	* config/microblaze/microblaze.c (microblaze_must_save_register)
+	(microblaze_expand_epilogue, microblaze_return_addr): Handle
+	calls_eh_return.
+	(microblaze_eh_return): New function.
+	* config/microblaze/microblaze.h (RETURN_ADDR_OFFSET)
+	(EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM)
+	(EH_RETURN_STACKADJ_RTX, ASM_PREFERRED_EH_DATA_FORMAT): New macros.
+	* config/microblaze/microblaze.md (eh_return): New pattern.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244183 138bc75d-0d04-0410-961f-82ee72b054a4
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ gcc/common/config/microblaze/microblaze-common.c |  3 ---
+ gcc/config/microblaze/microblaze-protos.h        |  1 +
+ gcc/config/microblaze/microblaze.c               | 27 ++++++++++++++++++++----
+ gcc/config/microblaze/microblaze.h               | 16 ++++++++++++++
+ gcc/config/microblaze/microblaze.md              | 10 +++++++++
+ 6 files changed, 66 insertions(+), 7 deletions(-)
+
+diff --git a/gcc/common/config/microblaze/microblaze-common.c b/gcc/common/config/microblaze/microblaze-common.c
+index 57a3099..4975663 100644
+--- a/gcc/common/config/microblaze/microblaze-common.c
++++ b/gcc/common/config/microblaze/microblaze-common.c
+@@ -37,7 +37,4 @@ static const struct default_options microblaze_option_optimization_table[] =
+ #undef  TARGET_OPTION_OPTIMIZATION_TABLE
+ #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table
+ 
+-#undef TARGET_EXCEPT_UNWIND_INFO
+-#define TARGET_EXCEPT_UNWIND_INFO  sjlj_except_unwind_info
+-
+ struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
+diff --git a/gcc/config/microblaze/microblaze-protos.h b/gcc/config/microblaze/microblaze-protos.h
+index 6fb3066..9ba8f2d 100644
+--- a/gcc/config/microblaze/microblaze-protos.h
++++ b/gcc/config/microblaze/microblaze-protos.h
+@@ -57,6 +57,7 @@ extern bool microblaze_tls_referenced_p (rtx);
+ extern int symbol_mentioned_p (rtx);
+ extern int label_mentioned_p (rtx);
+ extern bool microblaze_cannot_force_const_mem (machine_mode, rtx);
++extern void microblaze_eh_return (rtx op0);
+ #endif  /* RTX_CODE */
+ 
+ /* Declare functions in microblaze-c.c.  */
+diff --git a/gcc/config/microblaze/microblaze.c b/gcc/config/microblaze/microblaze.c
+index 03b70e1..746bef1 100644
+--- a/gcc/config/microblaze/microblaze.c
++++ b/gcc/config/microblaze/microblaze.c
+@@ -1926,6 +1926,10 @@ microblaze_must_save_register (int regno)
+   if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM))
+     return 1;
+ 
++  if (crtl->calls_eh_return
++      && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
++    return 1;
++
+   if (!crtl->is_leaf)
+     {
+       if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM)
+@@ -1953,6 +1957,11 @@ microblaze_must_save_register (int regno)
+ 	return 1;
+     }
+ 
++  if (crtl->calls_eh_return
++      && (regno == EH_RETURN_DATA_REGNO (0)
++          || regno == EH_RETURN_DATA_REGNO (1)))
++    return 1;
++
+   return 0;
+ }
+ 
+@@ -3029,6 +3038,12 @@ microblaze_expand_epilogue (void)
+       emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx));
+     }
+ 
++  if (crtl->calls_eh_return)
++    emit_insn (gen_addsi3 (stack_pointer_rtx,
++                           stack_pointer_rtx,
++                           gen_raw_REG (SImode,
++					MB_EH_STACKADJ_REGNUM)));
++
+   emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST +
+ 						    MB_ABI_SUB_RETURN_ADDR_REGNUM)));
+ }
+@@ -3326,10 +3341,14 @@ microblaze_return_addr (int count, rtx frame ATTRIBUTE_UNUSED)
+   if (count != 0)
+     return NULL_RTX;
+ 
+-  return gen_rtx_PLUS (Pmode,
+-		       get_hard_reg_initial_val (Pmode,
+-						 MB_ABI_SUB_RETURN_ADDR_REGNUM),
+-		       GEN_INT (8));
++  return get_hard_reg_initial_val (Pmode,
++                                   MB_ABI_SUB_RETURN_ADDR_REGNUM);
++}
++
++void
++microblaze_eh_return (rtx op0)
++{
++  emit_insn (gen_movsi (gen_rtx_MEM (Pmode, stack_pointer_rtx), op0));
+ }
+ 
+ /* Queue an .ident string in the queue of top-level asm statements.
+diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
+index 527f4d3..8fdadbf 100644
+--- a/gcc/config/microblaze/microblaze.h
++++ b/gcc/config/microblaze/microblaze.h
+@@ -184,6 +184,22 @@ extern enum pipeline_type microblaze_pipe;
+ #define INCOMING_RETURN_ADDR_RTX  			\
+   gen_rtx_REG (Pmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM)
+ 
++/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC.  */
++#define RETURN_ADDR_OFFSET (8)
++
++/* Describe how we implement __builtin_eh_return.  */
++#define EH_RETURN_DATA_REGNO(N)					\
++  (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM)
++
++#define MB_EH_STACKADJ_REGNUM  MB_ABI_INT_RETURN_VAL2_REGNUM
++#define EH_RETURN_STACKADJ_RTX  gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM)
++
++/* Select a format to encode pointers in exception handling data.  CODE
++   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
++   true if the symbol may be affected by dynamic relocations.  */
++#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \
++  ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr)
++
+ /* Use DWARF 2 debugging information by default.  */
+ #define DWARF2_DEBUGGING_INFO
+ #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+diff --git a/gcc/config/microblaze/microblaze.md b/gcc/config/microblaze/microblaze.md
+index 8f83daa..66ebc1e 100644
+--- a/gcc/config/microblaze/microblaze.md
++++ b/gcc/config/microblaze/microblaze.md
+@@ -2324,4 +2324,14 @@
+   (set_attr "mode"      "SI")
+   (set_attr "length"    "4")])
+ 
++; This is used in compiling the unwind routines.
++(define_expand "eh_return"
++  [(use (match_operand 0 "general_operand" ""))]
++  ""
++  "
++{
++  microblaze_eh_return (operands[0]);
++  DONE;
++}")
++
+ (include "sync.md")
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/gcc/6.3.0/940-uclinux-enable-threads.patch b/bsp/buildroot/package/gcc/6.4.0/940-uclinux-enable-threads.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/940-uclinux-enable-threads.patch
rename to bsp/buildroot/package/gcc/6.4.0/940-uclinux-enable-threads.patch
diff --git a/bsp/buildroot/package/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch b/bsp/buildroot/package/gcc/6.4.0/941-mips-Add-support-for-mips-r6-musl.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch
rename to bsp/buildroot/package/gcc/6.4.0/941-mips-Add-support-for-mips-r6-musl.patch
diff --git a/bsp/buildroot/package/gcc/6.4.0/942-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch b/bsp/buildroot/package/gcc/6.4.0/942-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
new file mode 100644
index 00000000..a2a2ea0f
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/942-Use-ucontext_t-not-struct-ucontext-in-linux-unwind.h.patch
@@ -0,0 +1,192 @@
+From 35d8ca22047f101a700abb29cffbf03b81278a2b Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 4 Jul 2017 10:23:57 +0000
+Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
+
+Current glibc no longer gives the ucontext_t type the tag struct
+ucontext, to conform with POSIX namespace rules.  This requires
+various linux-unwind.h files in libgcc, that were previously using
+struct ucontext, to be fixed to use ucontext_t instead.  This is
+similar to the removal of the struct siginfo tag from siginfo_t some
+years ago.
+
+This patch changes those files to use ucontext_t instead.  As the
+standard name that should be unconditionally safe, so this is not
+restricted to architectures supported by glibc, or conditioned on the
+glibc version.
+
+Tested compilation together with current glibc with glibc's
+build-many-glibcs.py.
+
+	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
+	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
+	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
+	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
+	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
+	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
+	config/pa/linux-unwind.h (pa32_fallback_frame_state),
+	config/sh/linux-unwind.h (sh_fallback_frame_state),
+	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
+	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
+	ucontext_t instead of struct ucontext.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4
+
+(cherry picked from commit b685411208e0aaa79190d54faf945763514706b8)
+[Romain rebase on gcc 6.4]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libgcc/config/aarch64/linux-unwind.h | 2 +-
+ libgcc/config/alpha/linux-unwind.h   | 2 +-
+ libgcc/config/bfin/linux-unwind.h    | 2 +-
+ libgcc/config/i386/linux-unwind.h    | 4 ++--
+ libgcc/config/m68k/linux-unwind.h    | 2 +-
+ libgcc/config/nios2/linux-unwind.h   | 2 +-
+ libgcc/config/pa/linux-unwind.h      | 2 +-
+ libgcc/config/sh/linux-unwind.h      | 2 +-
+ libgcc/config/tilepro/linux-unwind.h | 2 +-
+ libgcc/config/xtensa/linux-unwind.h  | 2 +-
+ 10 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h
+index 4512efb..06de45a 100644
+--- a/libgcc/config/aarch64/linux-unwind.h
++++ b/libgcc/config/aarch64/linux-unwind.h
+@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe
+   {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   };
+ 
+   struct rt_sigframe *rt_;
+diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
+index bdbba4a..e84812e 100644
+--- a/libgcc/config/alpha/linux-unwind.h
++++ b/libgcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h
+index 77b7c23..8bf5e82 100644
+--- a/libgcc/config/bfin/linux-unwind.h
++++ b/libgcc/config/bfin/linux-unwind.h
+@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
+ 	void *puc;
+ 	char retcode[8];
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+ 
+       /* The void * cast is necessary to avoid an aliasing warning.
+diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
+index 540a0a2..29efbe3 100644
+--- a/libgcc/config/i386/linux-unwind.h
++++ b/libgcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h
+index 75b7cf7..f964e24 100644
+--- a/libgcc/config/m68k/linux-unwind.h
++++ b/libgcc/config/m68k/linux-unwind.h
+@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+ /* <sys/ucontext.h> is unfortunately broken right now.  */
+ struct uw_ucontext {
+ 	unsigned long	  uc_flags;
+-	struct ucontext  *uc_link;
++	ucontext_t	 *uc_link;
+ 	stack_t		  uc_stack;
+ 	mcontext_t	  uc_mcontext;
+ 	unsigned long	  uc_filler[80];
+diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h
+index 2304142..30f25ea 100644
+--- a/libgcc/config/nios2/linux-unwind.h
++++ b/libgcc/config/nios2/linux-unwind.h
+@@ -38,7 +38,7 @@ struct nios2_mcontext {
+ 
+ struct nios2_ucontext {
+   unsigned long uc_flags;
+-  struct ucontext *uc_link;
++  ucontext_t *uc_link;
+   stack_t uc_stack;
+   struct nios2_mcontext uc_mcontext;
+   sigset_t uc_sigmask;	/* mask last for extensibility */
+diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
+index 9a2657f..e47493d 100644
+--- a/libgcc/config/pa/linux-unwind.h
++++ b/libgcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
+index e389cac..0bf43ba 100644
+--- a/libgcc/config/sh/linux-unwind.h
++++ b/libgcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h
+index 796e976..75f8890 100644
+--- a/libgcc/config/tilepro/linux-unwind.h
++++ b/libgcc/config/tilepro/linux-unwind.h
+@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
+   struct rt_sigframe {
+     unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* Return if this is not a signal handler.  */
+diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h
+index 9872492..586a9d4 100644
+--- a/libgcc/config/xtensa/linux-unwind.h
++++ b/libgcc/config/xtensa/linux-unwind.h
+@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
+ 
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *rt_;
+ 
+   /* movi a2, __NR_rt_sigreturn; syscall */
+-- 
+2.9.5
+
diff --git a/bsp/buildroot/package/gcc/6.4.0/943-sanitizer-linux.patch b/bsp/buildroot/package/gcc/6.4.0/943-sanitizer-linux.patch
new file mode 100644
index 00000000..640d68c8
--- /dev/null
+++ b/bsp/buildroot/package/gcc/6.4.0/943-sanitizer-linux.patch
@@ -0,0 +1,91 @@
+From a3e3d1b5f73380a99126c4937a95225ba3bd214b Mon Sep 17 00:00:00 2001
+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 7 Sep 2017 07:15:24 +0000
+Subject: [PATCH] 2017-09-07  Matthias Klose  <doko@ubuntu.com>
+
+        Backported from mainline
+        2017-07-14  Jakub Jelinek  <jakub@redhat.com>
+
+        PR sanitizer/81066
+        * sanitizer_common/sanitizer_linux.h: Cherry-pick upstream r307969.
+        * sanitizer_common/sanitizer_linux.cc: Likewise.
+        * sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc: Likewise.
+        * tsan/tsan_platform_linux.cc: Likewise.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@251828 138bc75d-0d04-0410-961f-82ee72b054a4
+
+(cherry picked from commit 8937b94d1a643fd9760714642296d034a45254a8)
+[Romain rebase on gcc 6.4]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libsanitizer/sanitizer_common/sanitizer_linux.cc                      | 3 +--
+ libsanitizer/sanitizer_common/sanitizer_linux.h                       | 4 +---
+ libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc | 2 +-
+ libsanitizer/tsan/tsan_platform_linux.cc                              | 2 +-
+ 4 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+index 2cefa20..223d9c6 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc
+@@ -546,8 +546,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
+ }
+ #endif
+ 
+-uptr internal_sigaltstack(const struct sigaltstack *ss,
+-                         struct sigaltstack *oss) {
++uptr internal_sigaltstack(const void *ss, void *oss) {
+   return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
+ }
+ 
+diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h
+index 4497702..1594058 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_linux.h
++++ b/libsanitizer/sanitizer_common/sanitizer_linux.h
+@@ -19,7 +19,6 @@
+ #include "sanitizer_platform_limits_posix.h"
+ 
+ struct link_map;  // Opaque type returned by dlopen().
+-struct sigaltstack;
+ 
+ namespace __sanitizer {
+ // Dirent structure for getdents(). Note that this structure is different from
+@@ -28,8 +27,7 @@ struct linux_dirent;
+ 
+ // Syscall wrappers.
+ uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
+-uptr internal_sigaltstack(const struct sigaltstack* ss,
+-                          struct sigaltstack* oss);
++uptr internal_sigaltstack(const void* ss, void* oss);
+ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
+     __sanitizer_sigset_t *oldset);
+ void internal_sigfillset(__sanitizer_sigset_t *set);
+diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+index c919e4f..014162af 100644
+--- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+@@ -267,7 +267,7 @@ static int TracerThread(void* argument) {
+ 
+   // Alternate stack for signal handling.
+   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
+-  struct sigaltstack handler_stack;
++  stack_t handler_stack;
+   internal_memset(&handler_stack, 0, sizeof(handler_stack));
+   handler_stack.ss_sp = handler_stack_memory.data();
+   handler_stack.ss_size = kHandlerStackSize;
+diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc
+index 09cec5f..908f4fe 100644
+--- a/libsanitizer/tsan/tsan_platform_linux.cc
++++ b/libsanitizer/tsan/tsan_platform_linux.cc
+@@ -291,7 +291,7 @@ bool IsGlobalVar(uptr addr) {
+ int ExtractResolvFDs(void *state, int *fds, int nfd) {
+ #if SANITIZER_LINUX
+   int cnt = 0;
+-  __res_state *statp = (__res_state*)state;
++  struct __res_state *statp = (struct __res_state*)state;
+   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
+     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
+       fds[cnt++] = statp->_u._ext.nssocks[i];
+-- 
+2.9.5
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0002-fix-building-on-ppc64.patch b/bsp/buildroot/package/gcc/7.3.0/0002-fix-building-on-ppc64.patch
new file mode 100644
index 00000000..78a028c2
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0002-fix-building-on-ppc64.patch
@@ -0,0 +1,40 @@
+From aa65a43516da1d48011ef621ed5988289711d99b Mon Sep 17 00:00:00 2001
+From: marxin <marxin@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Fri, 29 Jun 2018 09:31:30 +0000
+Subject: [PATCH] Partial backport r256656
+
+2018-06-29  Martin Liska  <mliska@suse.cz>
+
+	Backport from mainline
+	2018-01-10  Kelvin Nilsen  <kelvin@gcc.gnu.org>
+
+	* lex.c (search_line_fast): Remove illegal coercion of an
+	unaligned pointer value to vector pointer type and replace with
+	use of __builtin_vec_vsx_ld () built-in function, which operates
+	on unaligned pointer values.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@261621 138bc75d-0d04-0410-961f-82ee72b054a4
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@262243 138bc75d-0d04-0410-961f-82ee72b054a4
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ libcpp/lex.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libcpp/lex.c b/libcpp/lex.c
+index 097c78002cbb..e0fb9e822c44 100644
+--- a/libcpp/lex.c
++++ b/libcpp/lex.c
+@@ -568,7 +568,7 @@ search_line_fast (const uchar *s, const uchar *end ATTRIBUTE_UNUSED)
+     {
+       vc m_nl, m_cr, m_bs, m_qm;
+ 
+-      data = *((const vc *)s);
++      data = __builtin_vec_vsx_ld (0, s);
+       s += 16;
+ 
+       m_nl = (vc) __builtin_vec_cmpeq(data, repl_nl);
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch b/bsp/buildroot/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch
new file mode 100644
index 00000000..7ead5754
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0002-xtensa-fix-PR-target-65416.patch
@@ -0,0 +1,101 @@
+From 87fda0741d210727672cba5e54a37a189e8ac04e Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Sun, 17 Jun 2018 21:18:39 -0700
+Subject: [PATCH] xtensa: fix PR target/65416
+
+The issue is caused by reordering of stack pointer update after stack
+space allocation with instructions that write to the allocated stack
+space. In windowed ABI register spill area for the previous call frame
+is located just below the stack pointer and may be reloaded back into
+the register file on movsp.
+Implement allocate_stack pattern for windowed ABI configuration and
+insert an instruction that prevents reordering of frame memory access
+and stack pointer update.
+
+gcc/
+2018-06-19  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* config/xtensa/xtensa.md (UNSPEC_FRAME_BLOCKAGE): New unspec
+	constant.
+	(allocate_stack, frame_blockage, *frame_blockage): New patterns.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: r261755
+---
+ gcc/config/xtensa/xtensa.md | 46 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md
+index 84967dbedc08..209f839cfb0f 100644
+--- a/gcc/config/xtensa/xtensa.md
++++ b/gcc/config/xtensa/xtensa.md
+@@ -38,6 +38,7 @@
+   (UNSPEC_MEMW		11)
+   (UNSPEC_LSETUP_START  12)
+   (UNSPEC_LSETUP_END    13)
++  (UNSPEC_FRAME_BLOCKAGE 14)
+ 
+   (UNSPECV_SET_FP	1)
+   (UNSPECV_ENTRY	2)
+@@ -1676,6 +1677,32 @@
+ 
+ ;; Miscellaneous instructions.
+ 
++;; In windowed ABI stack pointer adjustment must happen before any access
++;; to the space allocated on stack is allowed, otherwise register spill
++;; area may be clobbered.  That's what frame blockage is supposed to enforce.
++
++(define_expand "allocate_stack"
++  [(set (match_operand 0 "nonimmed_operand")
++        (minus (reg A1_REG) (match_operand 1 "add_operand")))
++   (set (reg A1_REG)
++        (minus (reg A1_REG) (match_dup 1)))]
++  "TARGET_WINDOWED_ABI"
++{
++  if (CONST_INT_P (operands[1]))
++    {
++      rtx neg_op0 = GEN_INT (-INTVAL (operands[1]));
++      emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, neg_op0));
++    }
++  else
++    {
++      emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
++			     operands[1]));
++    }
++  emit_move_insn (operands[0], virtual_stack_dynamic_rtx);
++  emit_insn (gen_frame_blockage ());
++  DONE;
++})
++
+ (define_expand "prologue"
+   [(const_int 0)]
+   ""
+@@ -1767,6 +1794,25 @@
+   [(set_attr "length" "0")
+    (set_attr "type" "nop")])
+ 
++;; Do not schedule instructions accessing memory before this point.
++
++(define_expand "frame_blockage"
++  [(set (match_dup 0)
++        (unspec:BLK [(match_dup 1)] UNSPEC_FRAME_BLOCKAGE))]
++  ""
++{
++  operands[0] = gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (Pmode));
++  MEM_VOLATILE_P (operands[0]) = 1;
++  operands[1] = stack_pointer_rtx;
++})
++
++(define_insn "*frame_blockage"
++  [(set (match_operand:BLK 0 "" "")
++        (unspec:BLK [(match_operand:SI 1 "" "")] UNSPEC_FRAME_BLOCKAGE))]
++  ""
++  ""
++  [(set_attr "length" "0")])
++
+ (define_insn "trap"
+   [(trap_if (const_int 1) (const_int 0))]
+   ""
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch b/bsp/buildroot/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
new file mode 100644
index 00000000..d62d7c15
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
@@ -0,0 +1,39 @@
+From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Tue, 4 Sep 2018 00:39:32 -0700
+Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
+
+NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
+That fixes libatomic tests atomic-op-{1,2}.
+
+gcc/
+2018-09-04  Max Filippov  <jcmvbkbc@gmail.com>
+
+	* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
+	XOR operations in NAND case.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Backported from: r264087
+---
+ gcc/config/xtensa/xtensa.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
+index 7cfe64d42895..080bb4ad765d 100644
+--- a/gcc/config/xtensa/xtensa.c
++++ b/gcc/config/xtensa/xtensa.c
+@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
+       break;
+ 
+     case MULT: /* NAND */
+-      tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
++      tmp = expand_simple_binop (SImode, AND, old, val,
+ 				 NULL_RTX, 1, OPTAB_DIRECT);
+-      tmp = expand_simple_binop (SImode, AND, tmp, val,
++      tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
+ 				 new_rtx, 1, OPTAB_DIRECT);
+       break;
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0100-uclibc-conf.patch b/bsp/buildroot/package/gcc/7.3.0/0100-uclibc-conf.patch
new file mode 100644
index 00000000..d354baf8
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0100-uclibc-conf.patch
@@ -0,0 +1,29 @@
+From 326b880b20e5f8187dbda736b4c4c662cbfb00ca Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Tue, 2 May 2017 22:36:15 +0200
+Subject: [PATCH] uclibc-conf
+
+[Romain: convert to git patch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ contrib/regression/objs-gcc.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
+index 60b0497..6dc7ead 100755
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ]
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0810-arm-softfloat-libgcc.patch b/bsp/buildroot/package/gcc/7.3.0/0810-arm-softfloat-libgcc.patch
new file mode 100644
index 00000000..63880dd0
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0810-arm-softfloat-libgcc.patch
@@ -0,0 +1,45 @@
+From 420a304ac0daa29d66da6ed5b0b49fc4c482d522 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Tue, 2 May 2017 22:46:18 +0200
+Subject: [PATCH] arm softfloat libgcc
+
+[Romain: convert to git patch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gcc/config/arm/linux-elf.h | 2 +-
+ libgcc/config/arm/t-linux  | 7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
+index 3d62367..dad0b97 100644
+--- a/gcc/config/arm/linux-elf.h
++++ b/gcc/config/arm/linux-elf.h
+@@ -58,7 +58,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+ 
+diff --git a/libgcc/config/arm/t-linux b/libgcc/config/arm/t-linux
+index 3d520de..e7bc042 100644
+--- a/libgcc/config/arm/t-linux
++++ b/libgcc/config/arm/t-linux
+@@ -1,6 +1,11 @@
+ LIB1ASMSRC = arm/lib1funcs.S
+ LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
+-	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3
++	_ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \
++	_arm_addsubdf3 _arm_addsubsf3 \
++	_arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \
++	_arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \
++	_arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \
++	_arm_fixsfsi _arm_fixunssfsi
+ 
+ # Just for these, we omit the frame pointer since it makes such a big
+ # difference.
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0860-cilk-fix-build-without-wchar.patch b/bsp/buildroot/package/gcc/7.3.0/0860-cilk-fix-build-without-wchar.patch
new file mode 100644
index 00000000..61ab01c7
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0860-cilk-fix-build-without-wchar.patch
@@ -0,0 +1,64 @@
+From 714739e69ead1d9823233af40645277f6d4633ea Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Tue, 2 May 2017 23:21:46 +0200
+Subject: [PATCH] cilk: fix build without wchar
+
+When building against uClibc with wchar support disabled, WCHAR_MIN and
+WCHAR_MAX are not defined leading to compilation errors.
+
+Fix it by only including the wchar code if available.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+[Romain: convert to git patch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h
+index 641aa82..4f8e010 100644
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
+@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
+@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
+@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0891-fix-m68k-uclinux.patch b/bsp/buildroot/package/gcc/7.3.0/0891-fix-m68k-uclinux.patch
new file mode 100644
index 00000000..e84fd924
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0891-fix-m68k-uclinux.patch
@@ -0,0 +1,30 @@
+From c2773170a1b0e2728f71f2275a99fd177ba2cef4 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Tue, 2 May 2017 23:25:17 +0200
+Subject: [PATCH] fix m68k uclinux avoids internal compiler error while
+ compiling linux-atomic.c See here:
+ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+[Romain: convert to git patch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libgcc/config.host | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libgcc/config.host b/libgcc/config.host
+index b279a64..04fe183 100644
+--- a/libgcc/config.host
++++ b/libgcc/config.host
+@@ -820,7 +820,7 @@ m68k*-*-netbsdelf*)
+ m68k*-*-openbsd*)
+ 	;;
+ m68k-*-uclinux*)	# Motorola m68k/ColdFire running uClinux with uClibc
+-	tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux"
++	tmake_file="$tmake_file m68k/t-floatlib"
+ 	md_unwind_header=m68k/linux-unwind.h
+ 	;;
+ m68k-*-linux*)			# Motorola m68k's running GNU/Linux
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0892-microblaze-Revert.patch b/bsp/buildroot/package/gcc/7.3.0/0892-microblaze-Revert.patch
new file mode 100644
index 00000000..7026d0ef
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0892-microblaze-Revert.patch
@@ -0,0 +1,40 @@
+From 707a69dfb56a2976e2b5c010f0e5cb2ac9905a07 Mon Sep 17 00:00:00 2001
+From: eager <eager@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 27 May 2017 18:29:40 +0000
+Subject: [PATCH] 	Revert: 	2016-01-21  Ajit Agarwal 
+ <ajitkum@xilinx.com>
+
+	See https://gcc.gnu.org/ml/gcc/2017-05/msg00221.html.
+
+	* config/microblaze/microblaze.h
+	(FIXED_REGISTERS): Update in macro.
+	(CALL_USED_REGISTERS): Update in macro.
+
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@248540 138bc75d-0d04-0410-961f-82ee72b054a4
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h
+index 66e4ef5..2c9ece1 100644
+--- a/gcc/config/microblaze/microblaze.h
++++ b/gcc/config/microblaze/microblaze.h
+@@ -269,14 +269,14 @@ extern enum pipeline_type microblaze_pipe;
+ #define FIXED_REGISTERS							\
+ {									\
+   1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1,			\
+-  1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
++  1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
+   1, 1, 1, 1 								\
+ }
+ 
+ #define CALL_USED_REGISTERS						\
+ {									\
+   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,			\
+-  1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
++  1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,			\
+   1, 1, 1, 1								\
+ }
+ #define GP_REG_FIRST    0
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/0900-remove-selftests.patch b/bsp/buildroot/package/gcc/7.3.0/0900-remove-selftests.patch
new file mode 100644
index 00000000..a3bc7a57
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/0900-remove-selftests.patch
@@ -0,0 +1,111 @@
+From 63f0917d90eb83d267dc517fdfb6523a74b1917c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Wed, 3 May 2017 00:37:06 +0200
+Subject: [PATCH] remove selftests
+
+When the gcc archive is extracted by the gcc.mk, the gcc/testsuite
+is excluded:
+
+HOST_GCC_EXCLUDES = \
+	libjava/* libgo/* \
+	gcc/testsuite/* libstdc++-v3/testsuite/*
+
+The new Makefile target from the "Selftest framework" [1] added a dependency
+on the gcc/testsuite/Makefile.
+Revert partially the commit [1] to allow building gcc without selftest.
+
+[1] https://github.com/gcc-mirror/gcc/commit/99b4f3a2d5bf2c137de9731e27b483eb6b462fd9
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gcc/Makefile.in | 46 +++++-----------------------------------------
+ 1 file changed, 5 insertions(+), 41 deletions(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 74d1912..652a554 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -1581,14 +1581,13 @@ OBJS = \
+ OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \
+ 	edit-context.o \
+ 	pretty-print.o intl.o \
+-	vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \
+-	selftest.o
++	vec.o input.o version.o hash-table.o ggc-none.o memory-block.o
+ 
+ # Objects in libcommon-target.a, used by drivers and by the core
+ # compiler and containing target-dependent code.
+ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \
+ 	opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \
+-	hash-table.o file-find.o spellcheck.o selftest.o
++	hash-table.o file-find.o spellcheck.o
+ 
+ # This lists all host objects for the front ends.
+ ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
+@@ -1865,10 +1864,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc
+ quickstrap: all
+ 	cd $(toplevel_builddir) && $(MAKE) all-target-libgcc
+ 
+-all.internal: start.encap rest.encap doc selftest
++all.internal: start.encap rest.encap doc
+ # This is what to compile if making a cross-compiler.
+ all.cross: native gcc-cross$(exeext) cpp$(exeext) specs \
+-	libgcc-support lang.all.cross doc selftest @GENINSRC@ srcextra
++	libgcc-support lang.all.cross doc @GENINSRC@ srcextra
+ # This is what must be made before installing GCC and converting libraries.
+ start.encap: native xgcc$(exeext) cpp$(exeext) specs \
+ 	libgcc-support lang.start.encap @GENINSRC@ srcextra
+@@ -1888,41 +1887,6 @@ endif
+ # This does the things that can't be done on the host machine.
+ rest.cross: specs
+ 
+-# GCC's selftests.
+-# Specify a dummy input file to placate the driver.
+-# Specify -nostdinc to work around missing WIND_BASE environment variable
+-# required for *-wrs-vxworks-* targets.
+-# Specify -o /dev/null so the output of -S is discarded. More importantly
+-# It does not try to create a file with the name "null.s" on POSIX and
+-# "nul.s" on Windows. Because on Windows "nul" is a reserved file name.
+-# Specify the path to gcc/testsuite/selftests within the srcdir
+-# as an argument to -fself-test.
+-SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -o /dev/null \
+-	-fself-test=$(srcdir)/testsuite/selftests
+-
+-# Run the selftests during the build once we have a driver and a cc1,
+-# so that self-test failures are caught as early as possible.
+-# Use "s-selftest" to ensure that we only run the selftests if the
+-# driver, cc1, or selftest data change.
+-.PHONY: selftest
+-selftest: s-selftest
+-s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs \
+-  $(srcdir)/testsuite/selftests
+-	$(GCC_FOR_TARGET) $(SELFTEST_FLAGS)
+-	$(STAMP) $@
+-
+-# Convenience method for running selftests under gdb:
+-.PHONY: selftest-gdb
+-selftest-gdb: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs
+-	$(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \
+-	  -wrapper gdb,--args
+-
+-# Convenience method for running selftests under valgrind:
+-.PHONY: selftest-valgrind
+-selftest-valgrind: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs
+-	$(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \
+-	  -wrapper valgrind,--leak-check=full
+-
+ # Recompile all the language-independent object files.
+ # This is used only if the user explicitly asks for it.
+ compilations: $(BACKEND)
+@@ -2076,7 +2040,7 @@ gcc-nm.c: gcc-ar.c
+ 	cp $^ $@
+ 
+ COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \
+-  collect-utils.o file-find.o hash-table.o selftest.o
++  collect-utils.o file-find.o hash-table.o
+ COLLECT2_LIBS = @COLLECT2_LIBS@
+ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS)
+ # Don't try modifying collect2 (aka ld) in place--it might be linking this.
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch b/bsp/buildroot/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
new file mode 100644
index 00000000..37acc8b6
--- /dev/null
+++ b/bsp/buildroot/package/gcc/7.3.0/1000-arm-PR-target-81497-Fix-arm_acle.h-for-C.patch
@@ -0,0 +1,324 @@
+From 1a259ac3e39bf87e6e6a5eface8b0ebc6b2a0dfe Mon Sep 17 00:00:00 2001
+From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 5 Jun 2018 09:50:16 +0000
+Subject: [PATCH] [arm] PR target/81497: Fix arm_acle.h for C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+When trying to compile something with arm_acle.h using G++ we get a number of nasty errors:
+arm_acle.h:48:49: error: invalid conversion from ‘const void*’ to ‘const int*’ [-fpermissive]
+    return __builtin_arm_ldc (__coproc, __CRd, __p);
+
+This is because the intrinsics that are supposed to be void return the "result" of their builtin,
+which is void. C lets that slide but C++ complains.
+
+After fixing that we run into further errors:
+arm_acle.h:48:46: error: invalid conversion from 'const void*' to 'const int*' [-fpermissive]
+    return __builtin_arm_ldc (__coproc, __CRd, __p);
+                                               ^~~
+Because the pointer arguments in these intrinsics are void pointers but the builtin
+expects int pointers. So this patch introduces new qualifiers for void pointers and their
+const-qualified versions and uses that in the specification of these intrinsics.
+
+This gives us the opportunity of creating an arm subdirectory in g++.dg and inaugurates it
+with the first arm-specific C++ tests (in that directory).
+
+
+	PR target/81497
+	* config/arm/arm-builtins.c (arm_type_qualifiers): Add
+	qualifier_void_pointer and qualifier_const_void_pointer.
+	(arm_ldc_qualifiers, arm_stc_qualifiers): Use the above.
+	(arm_init_builtins): Handle the above.
+	* config/arm/arm_acle.h (__arm_cdp, __arm_ldc, __arm_ldcl, __arm_stc,
+	__arm_stcl, __arm_mcr, __arm_cdp2, __arm_ldc2, __arm_ldcl2, __arm_stc2,
+	__arm_stcl2,__arm_mcr2, __arm_mcrr, __arm_mcrr2): Remove return for
+	void intrinsics.
+
+	* g++.target/arm/arm.exp: New file.
+	* g++.target/arm/pr81497.C: Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@261191 138bc75d-0d04-0410-961f-82ee72b054a4
+Upstream-Status: Merged (gcc-8-branch)
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+[gportay: drop gcc/{,testsuite/}ChangeLog changes]
+---
+ gcc/config/arm/arm-builtins.c          | 42 +++++++++++++---------
+ gcc/config/arm/arm_acle.h              | 28 +++++++--------
+ gcc/testsuite/g++.target/arm/arm.exp   | 50 ++++++++++++++++++++++++++
+ gcc/testsuite/g++.target/arm/pr81497.C |  9 +++++
+ 4 files changed, 99 insertions(+), 30 deletions(-)
+ create mode 100644 gcc/testsuite/g++.target/arm/arm.exp
+ create mode 100644 gcc/testsuite/g++.target/arm/pr81497.C
+
+diff --git a/gcc/config/arm/arm-builtins.c b/gcc/config/arm/arm-builtins.c
+index 7fde7a04672..183a7b907f6 100644
+--- a/gcc/config/arm/arm-builtins.c
++++ b/gcc/config/arm/arm-builtins.c
+@@ -78,7 +78,11 @@ enum arm_type_qualifiers
+   /* Lane indices - must be within range of previous argument = a vector.  */
+   qualifier_lane_index = 0x200,
+   /* Lane indices for single lane structure loads and stores.  */
+-  qualifier_struct_load_store_lane_index = 0x400
++  qualifier_struct_load_store_lane_index = 0x400,
++  /* A void pointer.  */
++  qualifier_void_pointer = 0x800,
++  /* A const void pointer.  */
++  qualifier_const_void_pointer = 0x802
+ };
+ 
+ /*  The qualifier_internal allows generation of a unary builtin from
+@@ -202,7 +206,7 @@ arm_cdp_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+ static enum arm_type_qualifiers
+ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+   = { qualifier_void, qualifier_unsigned_immediate,
+-      qualifier_unsigned_immediate, qualifier_const_pointer };
++      qualifier_unsigned_immediate, qualifier_const_void_pointer };
+ #define LDC_QUALIFIERS \
+   (arm_ldc_qualifiers)
+ 
+@@ -210,7 +214,7 @@ arm_ldc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+ static enum arm_type_qualifiers
+ arm_stc_qualifiers[SIMD_MAX_BUILTIN_ARGS]
+   = { qualifier_void, qualifier_unsigned_immediate,
+-      qualifier_unsigned_immediate, qualifier_pointer };
++      qualifier_unsigned_immediate, qualifier_void_pointer };
+ #define STC_QUALIFIERS \
+   (arm_stc_qualifiers)
+ 
+@@ -1095,19 +1099,25 @@ arm_init_builtin (unsigned int fcode, arm_builtin_datum *d,
+       if (qualifiers & qualifier_pointer && VECTOR_MODE_P (op_mode))
+ 	op_mode = GET_MODE_INNER (op_mode);
+ 
+-      eltype = arm_simd_builtin_type
+-	(op_mode,
+-	 (qualifiers & qualifier_unsigned) != 0,
+-	 (qualifiers & qualifier_poly) != 0);
+-      gcc_assert (eltype != NULL);
+-
+-      /* Add qualifiers.  */
+-      if (qualifiers & qualifier_const)
+-	eltype = build_qualified_type (eltype, TYPE_QUAL_CONST);
+-
+-      if (qualifiers & qualifier_pointer)
+-	eltype = build_pointer_type (eltype);
+-
++      /* For void pointers we already have nodes constructed by the midend.  */
++      if (qualifiers & qualifier_void_pointer)
++	eltype = qualifiers & qualifier_const
++		 ? const_ptr_type_node : ptr_type_node;
++      else
++	{
++	  eltype
++	    = arm_simd_builtin_type (op_mode,
++				     (qualifiers & qualifier_unsigned) != 0,
++				     (qualifiers & qualifier_poly) != 0);
++	  gcc_assert (eltype != NULL);
++
++	  /* Add qualifiers.  */
++	  if (qualifiers & qualifier_const)
++	    eltype = build_qualified_type (eltype, TYPE_QUAL_CONST);
++
++	  if (qualifiers & qualifier_pointer)
++	    eltype = build_pointer_type (eltype);
++	}
+       /* If we have reached arg_num == 0, we are at a non-void
+ 	 return type.  Otherwise, we are still processing
+ 	 arguments.  */
+diff --git a/gcc/config/arm/arm_acle.h b/gcc/config/arm/arm_acle.h
+index 9a2f0ba30dc..c0f6ea2d156 100644
+--- a/gcc/config/arm/arm_acle.h
++++ b/gcc/config/arm/arm_acle.h
+@@ -38,35 +38,35 @@ __arm_cdp (const unsigned int __coproc, const unsigned int __opc1,
+ 	   const unsigned int __CRd, const unsigned int __CRn,
+ 	   const unsigned int __CRm, const unsigned int __opc2)
+ {
+-  return __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2);
++  __builtin_arm_cdp (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_ldc (const unsigned int __coproc, const unsigned int __CRd,
+ 	   const void * __p)
+ {
+-  return __builtin_arm_ldc (__coproc, __CRd, __p);
++  __builtin_arm_ldc (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_ldcl (const unsigned int __coproc, const unsigned int __CRd,
+ 	    const void * __p)
+ {
+-  return __builtin_arm_ldcl (__coproc, __CRd, __p);
++  __builtin_arm_ldcl (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_stc (const unsigned int __coproc, const unsigned int __CRd,
+ 	   void * __p)
+ {
+-  return __builtin_arm_stc (__coproc, __CRd, __p);
++  __builtin_arm_stc (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_stcl (const unsigned int __coproc, const unsigned int __CRd,
+ 	    void * __p)
+ {
+-  return __builtin_arm_stcl (__coproc, __CRd, __p);
++  __builtin_arm_stcl (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+@@ -74,7 +74,7 @@ __arm_mcr (const unsigned int __coproc, const unsigned int __opc1,
+ 	   uint32_t __value, const unsigned int __CRn, const unsigned int __CRm,
+ 	   const unsigned int __opc2)
+ {
+-  return __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2);
++  __builtin_arm_mcr (__coproc, __opc1, __value, __CRn, __CRm, __opc2);
+ }
+ 
+ __extension__ static __inline uint32_t __attribute__ ((__always_inline__))
+@@ -90,35 +90,35 @@ __arm_cdp2 (const unsigned int __coproc, const unsigned int __opc1,
+ 	    const unsigned int __CRd, const unsigned int __CRn,
+ 	    const unsigned int __CRm, const unsigned int __opc2)
+ {
+-  return __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2);
++  __builtin_arm_cdp2 (__coproc, __opc1, __CRd, __CRn, __CRm, __opc2);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_ldc2 (const unsigned int __coproc, const unsigned int __CRd,
+ 	    const void * __p)
+ {
+-  return __builtin_arm_ldc2 (__coproc, __CRd, __p);
++  __builtin_arm_ldc2 (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_ldc2l (const unsigned int __coproc, const unsigned int __CRd,
+ 	     const void * __p)
+ {
+-  return __builtin_arm_ldc2l (__coproc, __CRd, __p);
++  __builtin_arm_ldc2l (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_stc2 (const unsigned int __coproc, const unsigned int __CRd,
+ 	    void * __p)
+ {
+-  return __builtin_arm_stc2 (__coproc, __CRd, __p);
++  __builtin_arm_stc2 (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_stc2l (const unsigned int __coproc, const unsigned int __CRd,
+ 	     void * __p)
+ {
+-  return __builtin_arm_stc2l (__coproc, __CRd, __p);
++  __builtin_arm_stc2l (__coproc, __CRd, __p);
+ }
+ 
+ __extension__ static __inline void __attribute__ ((__always_inline__))
+@@ -126,7 +126,7 @@ __arm_mcr2 (const unsigned int __coproc, const unsigned int __opc1,
+ 	    uint32_t __value, const unsigned int __CRn,
+ 	    const unsigned int __CRm, const unsigned int __opc2)
+ {
+-  return __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2);
++  __builtin_arm_mcr2 (__coproc, __opc1, __value, __CRn, __CRm, __opc2);
+ }
+ 
+ __extension__ static __inline uint32_t __attribute__ ((__always_inline__))
+@@ -143,7 +143,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_mcrr (const unsigned int __coproc, const unsigned int __opc1,
+ 	    uint64_t __value, const unsigned int __CRm)
+ {
+-  return __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm);
++  __builtin_arm_mcrr (__coproc, __opc1, __value, __CRm);
+ }
+ 
+ __extension__ static __inline uint64_t __attribute__ ((__always_inline__))
+@@ -159,7 +159,7 @@ __extension__ static __inline void __attribute__ ((__always_inline__))
+ __arm_mcrr2 (const unsigned int __coproc, const unsigned int __opc1,
+ 	    uint64_t __value, const unsigned int __CRm)
+ {
+-  return __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm);
++  __builtin_arm_mcrr2 (__coproc, __opc1, __value, __CRm);
+ }
+ 
+ __extension__ static __inline uint64_t __attribute__ ((__always_inline__))
+diff --git a/gcc/testsuite/g++.target/arm/arm.exp b/gcc/testsuite/g++.target/arm/arm.exp
+new file mode 100644
+index 00000000000..1a169d2f220
+--- /dev/null
++++ b/gcc/testsuite/g++.target/arm/arm.exp
+@@ -0,0 +1,50 @@
++#  Specific regression driver for arm.
++#  Copyright (C) 2009-2018 Free Software Foundation, Inc.
++#
++#  This file is part of GCC.
++#
++#  GCC is free software; you can redistribute it and/or modify it
++#  under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 3, or (at your option)
++#  any later version.
++#
++#  GCC is distributed in the hope that it will be useful, but
++#  WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#  General Public License for more details.
++#
++#  You should have received a copy of the GNU General Public License
++#  along with GCC; see the file COPYING3.  If not see
++#  <http://www.gnu.org/licenses/>.  */
++
++# GCC testsuite that uses the `dg.exp' driver.
++
++# Exit immediately if this isn't an arm target.
++if {![istarget arm*-*-*] } then {
++  return
++}
++
++# Load support procs.
++load_lib g++-dg.exp
++
++global DEFAULT_CXXFLAGS
++if ![info exists DEFAULT_CXXFLAGS] then {
++    set DEFAULT_CXXFLAGS " -pedantic-errors"
++}
++
++
++global dg_runtest_extra_prunes
++set dg_runtest_extra_prunes ""
++lappend dg_runtest_extra_prunes "warning: switch -m(cpu|arch)=.* conflicts with -m(cpu|arch)=.* switch"
++
++# Initialize `dg'.
++dg-init
++
++# Main loop.
++dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.C]] \
++        "" $DEFAULT_CXXFLAGS
++
++# All done.
++set dg_runtest_extra_prunes ""
++dg-finish
++
+diff --git a/gcc/testsuite/g++.target/arm/pr81497.C b/gcc/testsuite/g++.target/arm/pr81497.C
+new file mode 100644
+index 00000000000..0519a3a3045
+--- /dev/null
++++ b/gcc/testsuite/g++.target/arm/pr81497.C
+@@ -0,0 +1,9 @@
++/* { dg-do compile } */
++/* { dg-require-effective-target arm_thumb2_ok } */
++
++#include <arm_acle.h>
++
++int main ()
++{
++  return 0;
++}
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/gcc/Config.in.host b/bsp/buildroot/package/gcc/Config.in.host
index eb41aa46..309ddf57 100644
--- a/bsp/buildroot/package/gcc/Config.in.host
+++ b/bsp/buildroot/package/gcc/Config.in.host
@@ -4,88 +4,62 @@ choice
 	prompt "GCC compiler Version"
 	default BR2_GCC_VERSION_ARC if BR2_arc
 	default BR2_GCC_VERSION_OR1K if BR2_or1k
-	default BR2_GCC_VERSION_5_X
+	default BR2_GCC_VERSION_6_X
 	help
 	  Select the version of gcc you wish to use.
 
-	config BR2_GCC_VERSION_4_8_X
-		bool "gcc 4.8.x"
-		# Broken or unsupported architectures
-		depends on !BR2_microblaze && !BR2_arc && !BR2_or1k \
-			&& !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin
-		# Broken or unsupported ARM cores
-		depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8
-		# Broken or unsupported PPC cores
-		depends on !BR2_powerpc_power8
-		# Unsupported MIPS cores
-		depends on !BR2_mips_interaptiv
-		# gcc-4.8.x + binutils-2.25 is broken for MIPS
-		depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X)
-		# Unsupported for MIPS R5
-		depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
-		# Unsupported for MIPS R6
-		depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
-		# musl ppc64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
-		# musl mips64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+config BR2_GCC_VERSION_ARC
+	bool "gcc arc (7.x)"
+	# Only supported architecture
+	depends on BR2_arc
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
 
-	config BR2_GCC_VERSION_ARC
-		bool "gcc arc (6.x)"
-		# Only supported architecture
-		depends on BR2_arc
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+config BR2_GCC_VERSION_OR1K
+	bool "gcc or1k (5.x)"
+	# Only supported architecture
+	depends on BR2_or1k
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
-	config BR2_GCC_VERSION_OR1K
-		bool "gcc or1k (5.x)"
-		# Only supported architecture
-		depends on BR2_or1k
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_5
+config BR2_GCC_VERSION_4_9_X
+	bool "gcc 4.9.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+	# Broken or unsupported architectures
+	depends on !BR2_arc
+	depends on !BR2_or1k
+	# musl on microblaze, ppc64 and mips64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
+	# glibc >= 2.26 needs gcc >= 6.2
+	depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le)
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
-	config BR2_GCC_VERSION_4_9_X
-		bool "gcc 4.9.x"
-		# Broken or unsupported architectures
-		depends on !BR2_arc && !BR2_bfin && !BR2_or1k
-		# Broken or unsupported ARM cores
-		depends on !BR2_cortex_a17 && !BR2_cortex_a72
-		# Unsupported MIPS cores
-		depends on !BR2_mips_interaptiv
-		# Unsupported for MIPS R5
-		depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5
-		# Unsupported for MIPS R6
-		depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
-		# musl microblaze unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
-		# musl ppc64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
-		# musl mips64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		# PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+config BR2_GCC_VERSION_5_X
+	bool "gcc 5.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+	# Broken or unsupported architectures
+	depends on !BR2_arc
+	depends on !BR2_or1k
+	# musl on ppc64 and mips64 unsupported
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
+	depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
+	# glibc >= 2.26 needs gcc >= 6.2
+	depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le)
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
-	config BR2_GCC_VERSION_5_X
-		bool "gcc 5.x"
-		# Broken or unsupported architectures
-		depends on !BR2_arc && !BR2_bfin && !BR2_or1k
-		# musl ppc64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
-		# Unsupported MIPS cores
-		depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \
-			!BR2_mips_m6250 && !BR2_mips_i6400 && !BR2_mips_p6600
-		# musl mips64 unsupported
-		depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el))
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_5
+config BR2_GCC_VERSION_6_X
+	bool "gcc 6.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+	# Broken or unsupported architectures
+	depends on !BR2_arc
+	depends on !BR2_or1k
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
-	config BR2_GCC_VERSION_6_X
-		bool "gcc 6.x"
-		# Broken or unsupported architectures
-		depends on !BR2_arc
-		depends on !BR2_microblaze
-		depends on !BR2_or1k
-		# Unsupported MIPS cores
-		depends on !BR2_mips_m6250 && !BR2_mips_p6600
-		select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+config BR2_GCC_VERSION_7_X
+	bool "gcc 7.x"
+	# Broken or unsupported architectures
+	depends on !BR2_or1k
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
 
 endchoice
 
@@ -102,12 +76,12 @@ config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE
 
 config BR2_GCC_VERSION
 	string
-	default "4.8.5"     if BR2_GCC_VERSION_4_8_X
 	default "4.9.4"     if BR2_GCC_VERSION_4_9_X
-	default "5.4.0"     if BR2_GCC_VERSION_5_X
-	default "6.3.0"     if BR2_GCC_VERSION_6_X
-	default "arc-2016.09-release" if BR2_GCC_VERSION_ARC
-	default "musl-5.4.0" if BR2_GCC_VERSION_OR1K
+	default "5.5.0"     if BR2_GCC_VERSION_5_X
+	default "6.4.0"     if BR2_GCC_VERSION_6_X
+	default "7.3.0"     if BR2_GCC_VERSION_7_X
+	default "arc-2017.09-release" if BR2_GCC_VERSION_ARC
+	default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
 
 config BR2_EXTRA_GCC_CONFIG_OPTIONS
 	string "Additional gcc options"
@@ -171,6 +145,10 @@ config BR2_GCC_ENABLE_LIBMUDFLAP
 
 config BR2_GCC_ENABLE_GRAPHITE
 	bool "Enable graphite support"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
 	help
 	  This option enables the graphite optimizations in the
 	  compiler.
+
+comment "graphite support needs gcc >= 5.x"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5
diff --git a/bsp/buildroot/package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch b/bsp/buildroot/package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch
deleted file mode 100644
index ee9add53..00000000
--- a/bsp/buildroot/package/gcc/arc-2016.09-release/895-arc-define-_REENTRANT-when-pthread-is-passed.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 4c6367c99461fdd7bd5613483f2582d7f08fba87 Mon Sep 17 00:00:00 2001
-From: Vlad Zakharov <vzakhar@synopsys.com>
-Date: Tue, 28 Feb 2017 17:41:11 +0300
-Subject: [PATCH] arc: define _REENTRANT when -pthread is passed
-
-The compiler is supposed to have the builtin defined _REENTRANT defined
-when -pthread is passed, which wasn't done on the ARC architecture.
-
-When _REENTRANT is not passed, the C library will not use reentrant
-functions, and the latest version of ax_pthread.m4 from the
-autoconf-archive will no longer detect that thread support is
-available (see https://savannah.gnu.org/patch/?8186).
-
-Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- gcc/config/arc/arc.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gcc/config/arc/arc.h b/gcc/config/arc/arc.h
-index 611ef54..fdd4b5d 100644
---- a/gcc/config/arc/arc.h
-+++ b/gcc/config/arc/arc.h
-@@ -93,6 +93,7 @@ along with GCC; see the file COPYING3.  If not see
- %{mdsp-packa:-D__Xdsp_packa} %{mcrc:-D__Xcrc} %{mdvbf:-D__Xdvbf} \
- %{mtelephony:-D__Xtelephony} %{mxy:-D__Xxy} %{mmul64: -D__Xmult32} \
- %{mlock:-D__Xlock} %{mswape:-D__Xswape} %{mrtsc:-D__Xrtsc} \
-+%{pthread:-D_REENTRANT} \
- %{mcpu=nps400:-D__NPS400__}"
-
- #define CC1_SPEC "\
---
-2.7.4
-
diff --git a/bsp/buildroot/package/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch b/bsp/buildroot/package/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch
deleted file mode 100644
index 55326567..00000000
--- a/bsp/buildroot/package/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Enable POSIX threads for uClinux targets
-Reported upstream:
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur gcc-6.1.0.orig/gcc/config.gcc gcc-6.1.0/gcc/config.gcc
---- gcc-6.1.0.orig/gcc/config.gcc	2016-04-11 12:14:59.000000000 +0200
-+++ gcc-6.1.0/gcc/config.gcc	2016-07-02 20:04:25.732169982 +0200
-@@ -833,6 +833,9 @@
- *-*-uclinux*)
-   extra_options="$extra_options gnu-user.opt"
-   use_gcc_stdint=wrap
-+  case ${enable_threads} in
-+    "" | yes | posix) thread_file='posix' ;;
-+  esac
-   tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC"
-   ;;
- *-*-rdos*)
diff --git a/bsp/buildroot/package/gcc/arc-2017.09-release/0001-fix-checking-for-jumps.patch b/bsp/buildroot/package/gcc/arc-2017.09-release/0001-fix-checking-for-jumps.patch
new file mode 100644
index 00000000..ce78fac2
--- /dev/null
+++ b/bsp/buildroot/package/gcc/arc-2017.09-release/0001-fix-checking-for-jumps.patch
@@ -0,0 +1,49 @@
+From c2694d3739d90ea3350b42252638b604a2c122b7 Mon Sep 17 00:00:00 2001
+From: Claudiu Zissulescu <claziss@gmail.com>
+Date: Tue, 7 Nov 2017 20:16:41 +0200
+Subject: [PATCH] [FIX][ZOL] fix checking for jumps
+
+Signed-off-by: Evgeniy Didin <didin@synopsys.com>
+---
+ gcc/config/arc/arc.c                  |  3 ++-
+ gcc/testsuite/gcc.target/arc/loop-4.c | 14 ++++++++++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.target/arc/loop-4.c
+
+diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
+index 22eeb34a371..5d367499d03 100644
+--- a/gcc/config/arc/arc.c
++++ b/gcc/config/arc/arc.c
+@@ -7505,7 +7505,8 @@ hwloop_optimize (hwloop_info loop)
+       && INSN_P (last_insn)
+       && (JUMP_P (last_insn) || CALL_P (last_insn)
+ 	  || GET_CODE (PATTERN (last_insn)) == SEQUENCE
+-	  || JUMP_P (prev_active_insn (last_insn))
++	  || (prev_active_insn (last_insn)
++	      && JUMP_P (prev_active_insn (last_insn)))
+ 	  /* At this stage we can have (insn (clobber (mem:BLK
+ 	     (reg)))) instructions, ignpre them.  */
+ 	  || (GET_CODE (PATTERN (last_insn)) != CLOBBER
+diff --git a/gcc/testsuite/gcc.target/arc/loop-4.c b/gcc/testsuite/gcc.target/arc/loop-4.c
+new file mode 100644
+index 00000000000..99a93a74d1e
+--- /dev/null
++++ b/gcc/testsuite/gcc.target/arc/loop-4.c
+@@ -0,0 +1,14 @@
++/* { dg-do assemble } */
++/* { dg-do compile } */
++/* { dg-options "-Os" } */
++
++
++void fn1(void *p1, int p2, int p3)
++{
++  char *d = p1;
++  do
++    *d++ = p2;
++  while (--p3);
++}
++
++/* { dg-final { scan-assembler "lp_count" } } */
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gcc/arc-2017.09-release/0100-uclibc-conf.patch b/bsp/buildroot/package/gcc/arc-2017.09-release/0100-uclibc-conf.patch
new file mode 100644
index 00000000..d354baf8
--- /dev/null
+++ b/bsp/buildroot/package/gcc/arc-2017.09-release/0100-uclibc-conf.patch
@@ -0,0 +1,29 @@
+From 326b880b20e5f8187dbda736b4c4c662cbfb00ca Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Tue, 2 May 2017 22:36:15 +0200
+Subject: [PATCH] uclibc-conf
+
+[Romain: convert to git patch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ contrib/regression/objs-gcc.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/contrib/regression/objs-gcc.sh b/contrib/regression/objs-gcc.sh
+index 60b0497..6dc7ead 100755
+--- a/contrib/regression/objs-gcc.sh
++++ b/contrib/regression/objs-gcc.sh
+@@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-gnu ]
+  then
+   make all-gdb all-dejagnu all-ld || exit 1
+   make install-gdb install-dejagnu install-ld || exit 1
++elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]
++ then
++  make all-gdb all-dejagnu all-ld || exit 1
++  make install-gdb install-dejagnu install-ld || exit 1
+ elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
+   make bootstrap || exit 1
+   make install || exit 1
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/arc-2017.09-release/0860-cilk-fix-build-without-wchar.patch b/bsp/buildroot/package/gcc/arc-2017.09-release/0860-cilk-fix-build-without-wchar.patch
new file mode 100644
index 00000000..61ab01c7
--- /dev/null
+++ b/bsp/buildroot/package/gcc/arc-2017.09-release/0860-cilk-fix-build-without-wchar.patch
@@ -0,0 +1,64 @@
+From 714739e69ead1d9823233af40645277f6d4633ea Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Tue, 2 May 2017 23:21:46 +0200
+Subject: [PATCH] cilk: fix build without wchar
+
+When building against uClibc with wchar support disabled, WCHAR_MIN and
+WCHAR_MAX are not defined leading to compilation errors.
+
+Fix it by only including the wchar code if available.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+[Romain: convert to git patch]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/libcilkrts/include/cilk/reducer_min_max.h b/libcilkrts/include/cilk/reducer_min_max.h
+index 641aa82..4f8e010 100644
+--- a/libcilkrts/include/cilk/reducer_min_max.h
++++ b/libcilkrts/include/cilk/reducer_min_max.h
+@@ -3289,7 +3289,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
+@@ -3441,7 +3443,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
++#ifdef WCHAR_MIN
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
++#endif
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
+ CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
+@@ -3567,7 +3571,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
+@@ -3719,7 +3725,9 @@ __CILKRTS_BEGIN_EXTERN_C
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
++#ifdef WCHAR_MAX
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
++#endif
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
+ CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/arc-2017.09-release/0900-remove-selftests.patch b/bsp/buildroot/package/gcc/arc-2017.09-release/0900-remove-selftests.patch
new file mode 100644
index 00000000..a3bc7a57
--- /dev/null
+++ b/bsp/buildroot/package/gcc/arc-2017.09-release/0900-remove-selftests.patch
@@ -0,0 +1,111 @@
+From 63f0917d90eb83d267dc517fdfb6523a74b1917c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Wed, 3 May 2017 00:37:06 +0200
+Subject: [PATCH] remove selftests
+
+When the gcc archive is extracted by the gcc.mk, the gcc/testsuite
+is excluded:
+
+HOST_GCC_EXCLUDES = \
+	libjava/* libgo/* \
+	gcc/testsuite/* libstdc++-v3/testsuite/*
+
+The new Makefile target from the "Selftest framework" [1] added a dependency
+on the gcc/testsuite/Makefile.
+Revert partially the commit [1] to allow building gcc without selftest.
+
+[1] https://github.com/gcc-mirror/gcc/commit/99b4f3a2d5bf2c137de9731e27b483eb6b462fd9
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gcc/Makefile.in | 46 +++++-----------------------------------------
+ 1 file changed, 5 insertions(+), 41 deletions(-)
+
+diff --git a/gcc/Makefile.in b/gcc/Makefile.in
+index 74d1912..652a554 100644
+--- a/gcc/Makefile.in
++++ b/gcc/Makefile.in
+@@ -1581,14 +1581,13 @@ OBJS = \
+ OBJS-libcommon = diagnostic.o diagnostic-color.o diagnostic-show-locus.o \
+ 	edit-context.o \
+ 	pretty-print.o intl.o \
+-	vec.o input.o version.o hash-table.o ggc-none.o memory-block.o \
+-	selftest.o
++	vec.o input.o version.o hash-table.o ggc-none.o memory-block.o
+ 
+ # Objects in libcommon-target.a, used by drivers and by the core
+ # compiler and containing target-dependent code.
+ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \
+ 	opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \
+-	hash-table.o file-find.o spellcheck.o selftest.o
++	hash-table.o file-find.o spellcheck.o
+ 
+ # This lists all host objects for the front ends.
+ ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS))
+@@ -1865,10 +1864,10 @@ config.status: $(srcdir)/configure $(srcdir)/config.gcc
+ quickstrap: all
+ 	cd $(toplevel_builddir) && $(MAKE) all-target-libgcc
+ 
+-all.internal: start.encap rest.encap doc selftest
++all.internal: start.encap rest.encap doc
+ # This is what to compile if making a cross-compiler.
+ all.cross: native gcc-cross$(exeext) cpp$(exeext) specs \
+-	libgcc-support lang.all.cross doc selftest @GENINSRC@ srcextra
++	libgcc-support lang.all.cross doc @GENINSRC@ srcextra
+ # This is what must be made before installing GCC and converting libraries.
+ start.encap: native xgcc$(exeext) cpp$(exeext) specs \
+ 	libgcc-support lang.start.encap @GENINSRC@ srcextra
+@@ -1888,41 +1887,6 @@ endif
+ # This does the things that can't be done on the host machine.
+ rest.cross: specs
+ 
+-# GCC's selftests.
+-# Specify a dummy input file to placate the driver.
+-# Specify -nostdinc to work around missing WIND_BASE environment variable
+-# required for *-wrs-vxworks-* targets.
+-# Specify -o /dev/null so the output of -S is discarded. More importantly
+-# It does not try to create a file with the name "null.s" on POSIX and
+-# "nul.s" on Windows. Because on Windows "nul" is a reserved file name.
+-# Specify the path to gcc/testsuite/selftests within the srcdir
+-# as an argument to -fself-test.
+-SELFTEST_FLAGS = -nostdinc -x c /dev/null -S -o /dev/null \
+-	-fself-test=$(srcdir)/testsuite/selftests
+-
+-# Run the selftests during the build once we have a driver and a cc1,
+-# so that self-test failures are caught as early as possible.
+-# Use "s-selftest" to ensure that we only run the selftests if the
+-# driver, cc1, or selftest data change.
+-.PHONY: selftest
+-selftest: s-selftest
+-s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs \
+-  $(srcdir)/testsuite/selftests
+-	$(GCC_FOR_TARGET) $(SELFTEST_FLAGS)
+-	$(STAMP) $@
+-
+-# Convenience method for running selftests under gdb:
+-.PHONY: selftest-gdb
+-selftest-gdb: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs
+-	$(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \
+-	  -wrapper gdb,--args
+-
+-# Convenience method for running selftests under valgrind:
+-.PHONY: selftest-valgrind
+-selftest-valgrind: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs
+-	$(GCC_FOR_TARGET) $(SELFTEST_FLAGS) \
+-	  -wrapper valgrind,--leak-check=full
+-
+ # Recompile all the language-independent object files.
+ # This is used only if the user explicitly asks for it.
+ compilations: $(BACKEND)
+@@ -2076,7 +2040,7 @@ gcc-nm.c: gcc-ar.c
+ 	cp $^ $@
+ 
+ COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \
+-  collect-utils.o file-find.o hash-table.o selftest.o
++  collect-utils.o file-find.o hash-table.o
+ COLLECT2_LIBS = @COLLECT2_LIBS@
+ collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS)
+ # Don't try modifying collect2 (aka ld) in place--it might be linking this.
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/gcc/gcc-final/gcc-final.mk b/bsp/buildroot/package/gcc/gcc-final/gcc-final.mk
index c9ee476f..213f3d7b 100644
--- a/bsp/buildroot/package/gcc/gcc-final/gcc-final.mk
+++ b/bsp/buildroot/package/gcc/gcc-final/gcc-final.mk
@@ -15,8 +15,9 @@ HOST_GCC_FINAL_DEPENDENCIES = \
 HOST_GCC_FINAL_EXCLUDES = $(HOST_GCC_EXCLUDES)
 HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
-ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
 HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
+HOST_GCC_FINAL_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
 endif
 
 HOST_GCC_FINAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
@@ -43,14 +44,13 @@ define  HOST_GCC_FINAL_CONFIGURE_CMDS
 		LDFLAGS="$(HOST_LDFLAGS)" \
 		$(HOST_GCC_FINAL_CONF_ENV) \
 		./configure \
-		--prefix="$(HOST_DIR)/usr" \
+		--prefix="$(HOST_DIR)" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 		--enable-static \
 		$(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \
 	)
 endef
 
-
 # Languages supported by the cross-compiler
 GCC_FINAL_CROSS_LANGUAGES-y = c
 GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++
@@ -60,24 +60,29 @@ GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGE
 HOST_GCC_FINAL_CONF_OPTS = \
 	$(HOST_GCC_COMMON_CONF_OPTS) \
 	--enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \
-	--with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin
+	--with-build-time-tools=$(HOST_DIR)/$(GNU_TARGET_NAME)/bin
 
-HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*
+HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib*
 # The kernel wants to use the -m4-nofpu option to make sure that it
 # doesn't use floating point operations.
 ifeq ($(BR2_sh4)$(BR2_sh4eb),y)
 HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu"
-HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib/!m4*
+HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4*
 endif
 ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y)
 HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu"
-HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib/!m4*
+HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/$(GNU_TARGET_NAME)/lib/!m4*
 endif
 
 ifeq ($(BR2_bfin),y)
 HOST_GCC_FINAL_CONF_OPTS += --disable-symvers
 endif
 
+# libcilkrts does not support v8
+ifeq ($(BR2_sparc),y)
+HOST_GCC_FINAL_CONF_OPTS += --disable-libcilkrts
+endif
+
 # Disable shared libs like libstdc++ if we do static since it confuses linking
 # In that case also disable libcilkrts as there is no static version
 ifeq ($(BR2_STATIC_LIBS),y)
@@ -104,9 +109,9 @@ HOST_GCC_FINAL_MAKE_OPTS += $(HOST_GCC_COMMON_MAKE_OPTS)
 
 # Make sure we have 'cc'
 define HOST_GCC_FINAL_CREATE_CC_SYMLINKS
-	if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \
-		ln -f $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc \
-			$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc; \
+	if [ ! -e $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-cc ]; then \
+		ln -f $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-gcc \
+			$(HOST_DIR)/bin/$(GNU_TARGET_NAME)-cc; \
 	fi
 endef
 
diff --git a/bsp/buildroot/package/gcc/gcc-initial/gcc-initial.mk b/bsp/buildroot/package/gcc/gcc-initial/gcc-initial.mk
index a51e29cf..c476b2fa 100644
--- a/bsp/buildroot/package/gcc/gcc-initial/gcc-initial.mk
+++ b/bsp/buildroot/package/gcc/gcc-initial/gcc-initial.mk
@@ -13,8 +13,9 @@ HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES)
 HOST_GCC_INITIAL_EXCLUDES = $(HOST_GCC_EXCLUDES)
 HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE
 
-ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
+ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
 HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT
+HOST_GCC_INITIAL_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
 endif
 
 HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES
diff --git a/bsp/buildroot/package/gcc/gcc.hash b/bsp/buildroot/package/gcc/gcc.hash
index 4376db41..fd38cfaa 100644
--- a/bsp/buildroot/package/gcc/gcc.hash
+++ b/bsp/buildroot/package/gcc/gcc.hash
@@ -1,17 +1,13 @@
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/sha512.sum
-sha512  78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115  gcc-4.5.4.tar.bz2
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.7.4/sha512.sum
-sha512  dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189  gcc-4.7.4.tar.bz2
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.8.5/sha512.sum
-sha512  47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea  gcc-4.8.5.tar.bz2
 # From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/sha512.sum
 sha512  93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe  gcc-4.9.4.tar.bz2
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum
-sha512  2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b  gcc-5.4.0.tar.bz2
-# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum
-sha512  234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78  gcc-6.3.0.tar.bz2
+# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.5.0/sha512.sum
+sha512  670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe76426eaa1424cfddca937bed377680700eadc04d76b9180d462364fa1  gcc-5.5.0.tar.xz
+# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.4.0/sha512.sum
+sha512  02c60e54527c7adf584798d5251f8a0b80c93d5deafce82501b2c28e6692e0bd783927bbfc4bc527a863c0cccc025150a34740a9e29badb02d4b48e56a8aba90  gcc-6.4.0.tar.xz
+# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.3.0/sha512.sum
+sha512  ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4  gcc-7.3.0.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  faae6dc3f7843412068a52de5919797cd23e6ed1b8d140c230d0381f13fd38af67baaa4a09e581c03602127da3dd2fab6f9f5d7ac5d4270585bd079c673dda9a  gcc-arc-2016.09-release.tar.gz
+sha512  c30addd3c4dc66b90749a0f99b257c8a8e7966d27f286057b6b66f4a70ca22a1ee50d92882c4db13307d769a6fb28e1e2a2bab749a692cf3f89ef0c38f145efa  gcc-arc-2017.09-release.tar.gz
 # Locally calculated (fetched from Github)
-sha512  841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f  gcc-musl-5.4.0.tar.gz
+sha512  2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1  gcc-or1k-musl-5.4.0-20170218.tar.gz
diff --git a/bsp/buildroot/package/gcc/gcc.mk b/bsp/buildroot/package/gcc/gcc.mk
index 241f3575..27fc1e98 100644
--- a/bsp/buildroot/package/gcc/gcc.mk
+++ b/bsp/buildroot/package/gcc/gcc.mk
@@ -10,7 +10,7 @@
 
 GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION))
 
-ifeq ($(BR2_arc),y)
+ifeq ($(BR2_GCC_VERSION_ARC),y)
 GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
 else ifeq ($(BR2_or1k),y)
@@ -18,17 +18,20 @@ GCC_SITE = $(call github,openrisc,or1k-gcc,$(GCC_VERSION))
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
 else
 GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
+# From version 5.5.0, 6.4.0 and 7.2.0 a bz2 release tarball is not
+# provided anymore. Use the xz tarball instead.
+ifeq ($(BR2_GCC_VERSION_5_X)$(BR2_GCC_VERSION_6_X)$(BR2_GCC_VERSION_7_X),y)
+GCC_SOURCE = gcc-$(GCC_VERSION).tar.xz
+else
 GCC_SOURCE = gcc-$(GCC_VERSION).tar.bz2
+endif # BR2_GCC_VERSION_6_X
 endif
 
 #
 # Xtensa special hook
 #
-
-HOST_GCC_XTENSA_OVERLAY_TAR = $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,$(BR2_XTENSA_CORE_NAME)).tar
-
 define HOST_GCC_XTENSA_OVERLAY_EXTRACT
-	tar xf $(HOST_GCC_XTENSA_OVERLAY_TAR) -C $(@D) --strip-components=1 gcc
+	$(call arch-xtensa-overlay-extract,$(@D),gcc)
 endef
 
 #
@@ -95,9 +98,9 @@ HOST_GCC_COMMON_CONF_OPTS = \
 	--with-gnu-ld \
 	--disable-libssp \
 	--disable-multilib \
-	--with-gmp=$(HOST_DIR)/usr \
-	--with-mpc=$(HOST_DIR)/usr \
-	--with-mpfr=$(HOST_DIR)/usr \
+	--with-gmp=$(HOST_DIR) \
+	--with-mpc=$(HOST_DIR) \
+	--with-mpfr=$(HOST_DIR) \
 	--with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \
 	--with-bugurl="http://bugs.buildroot.net/"
 
@@ -170,15 +173,12 @@ else
 HOST_GCC_COMMON_CONF_OPTS += --enable-threads
 endif
 
+# gcc 5 doesn't need cloog any more, see
+# https://gcc.gnu.org/gcc-5/changes.html and we don't support graphite
+# on GCC 4.9.x, so only isl is needed.
 ifeq ($(BR2_GCC_ENABLE_GRAPHITE),y)
 HOST_GCC_COMMON_DEPENDENCIES += host-isl
-HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)/usr
-# gcc 5 doesn't need cloog any more, see
-# https://gcc.gnu.org/gcc-5/changes.html
-ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),)
-HOST_GCC_COMMON_DEPENDENCIES += host-cloog
-HOST_GCC_COMMON_CONF_OPTS += --with-cloog=$(HOST_DIR)/usr
-endif
+HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)
 else
 HOST_GCC_COMMON_CONF_OPTS += --without-isl --without-cloog
 endif
@@ -207,6 +207,14 @@ endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),)
 HOST_GCC_COMMON_CONF_OPTS += --with-abi=$(BR2_GCC_TARGET_ABI)
 endif
+ifeq ($(BR2_TOOLCHAIN_HAS_MNAN_OPTION),y)
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_NAN)),)
+HOST_GCC_COMMON_CONF_OPTS += --with-nan=$(BR2_GCC_TARGET_NAN)
+endif
+endif
+ifneq ($(call qstrip,$(BR2_GCC_TARGET_FP32_MODE)),)
+HOST_GCC_COMMON_CONF_OPTS += --with-fp-32=$(BR2_GCC_TARGET_FP32_MODE)
+endif
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),)
 ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
 HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION))
@@ -248,6 +256,14 @@ HOST_GCC_COMMON_CONF_OPTS += \
 	--without-long-double-128
 endif
 
+# Since glibc >= 2.26, poerpc64le requires double/long double which
+# requires at least gcc 6.2.
+# See sysdeps/powerpc/powerpc64le/configure.ac
+ifeq ($(BR2_TOOLCHAIN_USES_GLIBC)$(BR2_TOOLCHAIN_GCC_AT_LEAST_6)$(BR2_powerpc64le),yyy)
+HOST_GCC_COMMON_CONF_OPTS += \
+	--with-long-double-128
+endif
+
 HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"'
 ifeq ($(BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS),)
 ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),)
@@ -257,6 +273,8 @@ HOST_GCC_COMMON_WRAPPER_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_
 endif
 HOST_GCC_COMMON_WRAPPER_TARGET_ARCH := $(call qstrip,$(BR2_GCC_TARGET_ARCH))
 HOST_GCC_COMMON_WRAPPER_TARGET_ABI := $(call qstrip,$(BR2_GCC_TARGET_ABI))
+HOST_GCC_COMMON_WRAPPER_TARGET_NAN := $(call qstrip,$(BR2_GCC_TARGET_NAN))
+HOST_GCC_COMMON_WRAPPER_TARGET_FP32_MODE := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE))
 HOST_GCC_COMMON_WRAPPER_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU))
 HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
 HOST_GCC_COMMON_WRAPPER_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE))
@@ -270,6 +288,12 @@ endif
 ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_ABI),)
 HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_ABI)"'
 endif
+ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_NAN),)
+HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_NAN='"$(HOST_GCC_COMMON_WRAPPER_TARGET_NAN)"'
+endif
+ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FP32_MODE),)
+HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FP32_MODE='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FP32_MODE)"'
+endif
 ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FPU),)
 HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FPU)"'
 endif
@@ -307,7 +331,7 @@ HOST_GCC_COMMON_CCACHE_HASH_FILES += \
 		$(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
 		$(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))))
 ifeq ($(BR2_xtensa),y)
-HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_XTENSA_OVERLAY_TAR)
+HOST_GCC_COMMON_CCACHE_HASH_FILES += $(ARCH_XTENSA_OVERLAY_TAR)
 endif
 ifeq ($(ARCH),powerpc)
 ifneq ($(BR2_SOFT_FLOAT),)
@@ -336,7 +360,7 @@ endif # BR2_CCACHE
 # Avoid that a .br_real is symlinked a second time.
 # Also create <arch>-linux-<tool> symlinks.
 define HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS
-	$(Q)cd $(HOST_DIR)/usr/bin; \
+	$(Q)cd $(HOST_DIR)/bin; \
 	for i in $(GNU_TARGET_NAME)-*; do \
 		case "$$i" in \
 		*.br_real) \
diff --git a/bsp/buildroot/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch b/bsp/buildroot/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
deleted file mode 100644
index 2d0e7baa..00000000
--- a/bsp/buildroot/package/gcc/musl-5.4.0/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/boehm-gc/include/gc.h
-===================================================================
---- a/boehm-gc/include/gc.h
-+++ b/boehm-gc/include/gc.h
-@@ -503,7 +503,7 @@
- #if defined(__linux__) || defined(__GLIBC__)
- # include <features.h>
- # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
--     && !defined(__ia64__)
-+     && !defined(__ia64__) && !defined(__UCLIBC__)
- #   ifndef GC_HAVE_BUILTIN_BACKTRACE
- #     define GC_HAVE_BUILTIN_BACKTRACE
- #   endif
diff --git a/bsp/buildroot/package/gcc/musl-5.4.0/860-cilk-wchar.patch b/bsp/buildroot/package/gcc/musl-5.4.0/860-cilk-wchar.patch
deleted file mode 100644
index 1d9916f5..00000000
--- a/bsp/buildroot/package/gcc/musl-5.4.0/860-cilk-wchar.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-[PATCH] cilk: fix build without wchar
-
-When building against uClibc with wchar support disabled, WCHAR_MIN and
-WCHAR_MAX are not defined leading to compilation errors.
-
-Fix it by only including the wchar code if available.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- libcilkrts/include/cilk/reducer_min_max.h |    8 ++++++++
- 1 file changed, 8 insertions(+)
-
-Index: b/libcilkrts/include/cilk/reducer_min_max.h
-===================================================================
---- a/libcilkrts/include/cilk/reducer_min_max.h
-+++ b/libcilkrts/include/cilk/reducer_min_max.h
-@@ -3154,7 +3154,9 @@
- CILK_C_REDUCER_MAX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INSTANCE(int,                int,        INT_MIN)
-@@ -3306,7 +3308,9 @@
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(char,               char,       CHAR_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char,      uchar,      0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char,        schar,      SCHAR_MIN)
-+#ifdef WCHAR_MIN
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MIN)
-+#endif
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(short,              short,      SHRT_MIN)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short,     ushort,     0)
- CILK_C_REDUCER_MAX_INDEX_INSTANCE(int,                int,        INT_MIN)
-@@ -3432,7 +3436,9 @@
- CILK_C_REDUCER_MIN_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INSTANCE(int,                int,        INT_MAX)
-@@ -3584,7 +3590,9 @@
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(char,               char,       CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char,      uchar,      CHAR_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char,        schar,      SCHAR_MAX)
-+#ifdef WCHAR_MAX
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t,            wchar_t,    WCHAR_MAX)
-+#endif
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(short,              short,      SHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short,     ushort,     USHRT_MAX)
- CILK_C_REDUCER_MIN_INDEX_INSTANCE(int,                int,        INT_MAX)
diff --git a/bsp/buildroot/package/gcc/musl-5.4.0/100-uclibc-conf.patch b/bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/musl-5.4.0/100-uclibc-conf.patch
rename to bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/100-uclibc-conf.patch
diff --git a/bsp/buildroot/package/gcc/arc-2016.09-release/301-missing-execinfo_h.patch b/bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/arc-2016.09-release/301-missing-execinfo_h.patch
rename to bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/301-missing-execinfo_h.patch
diff --git a/bsp/buildroot/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch b/bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch
rename to bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/850-libstdcxx-uclibc-c99.patch
diff --git a/bsp/buildroot/package/gcc/arc-2016.09-release/860-cilk-wchar.patch b/bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/arc-2016.09-release/860-cilk-wchar.patch
rename to bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/860-cilk-wchar.patch
diff --git a/bsp/buildroot/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch
similarity index 100%
rename from bsp/buildroot/package/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch
rename to bsp/buildroot/package/gcc/or1k-musl-5.4.0-20170218/930-libgcc-disable-split-stack-nothreads.patch
diff --git a/bsp/buildroot/package/gconf/Config.in b/bsp/buildroot/package/gconf/Config.in
new file mode 100644
index 00000000..a2371b3f
--- /dev/null
+++ b/bsp/buildroot/package/gconf/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_GCONF
+	bool "gconf"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
+	depends on BR2_USE_MMU # dbus, libglib2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBXML2
+	help
+	  GConf was a system used by the GNOME desktop environment for
+	  storing configuration settings for the desktop and
+	  applications. It is similar to the Windows Registry.
+
+	  https://projects.gnome.org/gconf/
+
+comment "gconf needs a toolchain w/ threads, wchar, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR \
+		|| BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/gconf/gconf.hash b/bsp/buildroot/package/gconf/gconf.hash
new file mode 100644
index 00000000..24d0cf9b
--- /dev/null
+++ b/bsp/buildroot/package/gconf/gconf.hash
@@ -0,0 +1,4 @@
+# http://ftp.acc.umu.se/pub/gnome/sources/GConf/3.2/GConf-3.2.6.sha256sum
+sha256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c  GConf-3.2.6.tar.xz
+# License files, locally calculated
+sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23  COPYING
diff --git a/bsp/buildroot/package/gconf/gconf.mk b/bsp/buildroot/package/gconf/gconf.mk
new file mode 100644
index 00000000..39df95fb
--- /dev/null
+++ b/bsp/buildroot/package/gconf/gconf.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# gconf
+#
+################################################################################
+
+GCONF_VERSION = 3.2.6
+GCONF_SOURCE = GConf-${GCONF_VERSION}.tar.xz
+GCONF_SITE = http://ftp.gnome.org/pub/gnome/sources/GConf/3.2
+GCONF_CONF_OPTS = --disable-orbit
+GCONF_DEPENDENCIES = dbus dbus-glib libglib2 libxml2 \
+	host-intltool $(TARGET_NLS_DEPENDENCIES)
+GCONF_LICENSE = LGPL-2.0+
+GCONF_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gcr/gcr.mk b/bsp/buildroot/package/gcr/gcr.mk
index d8cb667d..7cb35af8 100644
--- a/bsp/buildroot/package/gcr/gcr.mk
+++ b/bsp/buildroot/package/gcr/gcr.mk
@@ -15,7 +15,7 @@ GCR_CONF_OPTS = \
 	--disable-gtk-doc \
 	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
 # Even though COPYING is v2 the code states v2.1+
-GCR_LICENSE = LGPLv2.1+
+GCR_LICENSE = LGPL-2.1+
 GCR_LICENSE_FILES = COPYING
 
 # Only the X11 backend is supported for the simple GUI
diff --git a/bsp/buildroot/package/gdb/7.10.1/0007-Sync-proc_service-definition-with-GLIBC.patch b/bsp/buildroot/package/gdb/7.10.1/0007-Sync-proc_service-definition-with-GLIBC.patch
new file mode 100644
index 00000000..2a537787
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.10.1/0007-Sync-proc_service-definition-with-GLIBC.patch
@@ -0,0 +1,287 @@
+From ccc18e0b2dc77a6619df31fd4fadfb3a37401616 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Sun, 26 Mar 2017 23:06:45 +0200
+Subject: [PATCH] Sync proc_service definition with GLIBC
+
+GLIBC BZ#20311 [1] proc_service.h install patch also remove 'const'
+attributes from ps_get_thread_area and comment #15 discuss why to remove
+the const attribute (basically since it a callback with the struct
+ps_prochandle owned by the client it should be able to modify it if
+it the case).
+
+On default build this is not the issue and current g++ does not trigger
+any issue with this mismatch declaration.  However, on some bootstrap
+build configuration where gdbserver is build with gcc instead this
+triggers:
+
+error: conflicting types for 'ps_get_thread_area'
+
+This patch fixes it by syncing the declaration with GLIBC.
+
+[1] https://sourceware.org/bugzilla/show_bug.cgi?id=20311
+
+gdb/ChangeLog:
+
+2016-08-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* aarch64-linux-nat.c (ps_get_thread_area): Remove const from
+	struct ps_prochandle.
+	* amd64-linux-nat.c (ps_get_thread_area): Likewise.
+	* arm-linux-nat.c (ps_get_thread_area): Likewise.
+	* gdb_proc_service.h (ps_get_thread_area): Likewise.
+	* i386-linux-nat.c (ps_get_thread_area): Likewise.
+	* m68klinux-nat.c (ps_get_thread_area): Likewise.
+	* mips-linux-nat.c (ps_get_thread_area): Likewise.
+	* nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
+	* nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
+	* xtensa-linux-nat.c (ps_get_thread_area): Likewise.
+
+gdb/gdbserver/ChangeLog:
+
+2016-08-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	PR server/20491
+	* gdb_proc_service.h (ps_get_thread_area): Remove const from struct
+	ps_prochandle.
+	* linux-aarch64-low.c (ps_get_thread_area): Likewise.
+	* linux-arm-low.c (ps_get_thread_area): Likewise.
+	* linux-crisv32-low.c (ps_get_thread_area): Likewise.
+	* linux-m68k-low.c (ps_get_thread_area): Likewise.
+	* linux-mips-low.c (ps_get_thread_area): Likewise.
+	* linux-nios2-low.c (ps_get_thread_area): Likewise.
+	* linux-tic6x-low.c (ps_get_thread_area): Likewise.
+	* linux-x86-low.c (ps_get_thread_area): Likewise.
+	* linux-xtensa-low.c (ps_get_thread_area): Likewise.
+
+(cherry picked from commit 140bf80050b34f0947b34dba93b830ea2bfc5040)
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ gdb/aarch64-linux-nat.c           | 2 +-
+ gdb/amd64-linux-nat.c             | 2 +-
+ gdb/arm-linux-nat.c               | 2 +-
+ gdb/gdb_proc_service.h            | 2 +-
+ gdb/gdbserver/gdb_proc_service.h  | 2 +-
+ gdb/gdbserver/linux-aarch64-low.c | 2 +-
+ gdb/gdbserver/linux-arm-low.c     | 2 +-
+ gdb/gdbserver/linux-crisv32-low.c | 2 +-
+ gdb/gdbserver/linux-m68k-low.c    | 2 +-
+ gdb/gdbserver/linux-mips-low.c    | 2 +-
+ gdb/gdbserver/linux-nios2-low.c   | 2 +-
+ gdb/gdbserver/linux-tic6x-low.c   | 2 +-
+ gdb/gdbserver/linux-x86-low.c     | 2 +-
+ gdb/i386-linux-nat.c              | 2 +-
+ gdb/m68klinux-nat.c               | 2 +-
+ gdb/mips-linux-nat.c              | 2 +-
+ 16 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
+index 9959b81a2d..aa0f8d76bd 100644
+--- a/gdb/aarch64-linux-nat.c
++++ b/gdb/aarch64-linux-nat.c
+@@ -734,7 +734,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
+    storage (or its descriptor).  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   struct iovec iovec;
+diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
+index 2e1b081b0f..7f076a9148 100644
+--- a/gdb/amd64-linux-nat.c
++++ b/gdb/amd64-linux-nat.c
+@@ -244,7 +244,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops,
+    a request for a thread's local storage address.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
+diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
+index c167bce18b..8462655139 100644
+--- a/gdb/arm-linux-nat.c
++++ b/gdb/arm-linux-nat.c
+@@ -778,7 +778,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
+index e7369911a1..91fbc29a76 100644
+--- a/gdb/gdb_proc_service.h
++++ b/gdb/gdb_proc_service.h
+@@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
+ /* Fetch the special per-thread address associated with the given LWP.
+    This call is only used on a few platforms (most use a normal register).
+    The meaning of the `int' parameter is machine-dependent.  */
+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
+ 				    lwpid_t, int, psaddr_t *);
+ 
+ 
+diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
+index cbafbf3206..7f9b1e4de0 100644
+--- a/gdb/gdbserver/gdb_proc_service.h
++++ b/gdb/gdbserver/gdb_proc_service.h
+@@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
+ /* Fetch the special per-thread address associated with the given LWP.
+    This call is only used on a few platforms (most use a normal register).
+    The meaning of the `int' parameter is machine-dependent.  */
+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
+ 				    lwpid_t, int, psaddr_t *);
+ 
+ 
+diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
+index 8a30b00029..a0ac35620d 100644
+--- a/gdb/gdbserver/linux-aarch64-low.c
++++ b/gdb/gdbserver/linux-aarch64-low.c
+@@ -1089,7 +1089,7 @@ aarch64_stopped_by_watchpoint (void)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   struct iovec iovec;
+diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
+index dd77b48ecd..560e7d8496 100644
+--- a/gdb/gdbserver/linux-arm-low.c
++++ b/gdb/gdbserver/linux-arm-low.c
+@@ -334,7 +334,7 @@ arm_reinsert_addr (void)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
+index 65e6c09df2..fd5e627123 100644
+--- a/gdb/gdbserver/linux-crisv32-low.c
++++ b/gdb/gdbserver/linux-crisv32-low.c
+@@ -336,7 +336,7 @@ cris_stopped_data_address (void)
+ }
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
+index 4501904e39..7415930360 100644
+--- a/gdb/gdbserver/linux-m68k-low.c
++++ b/gdb/gdbserver/linux-m68k-low.c
+@@ -160,7 +160,7 @@ m68k_breakpoint_at (CORE_ADDR pc)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c
+index 1695c4cf0d..acc2468bce 100644
+--- a/gdb/gdbserver/linux-mips-low.c
++++ b/gdb/gdbserver/linux-mips-low.c
+@@ -640,7 +640,7 @@ mips_stopped_data_address (void)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c
+index 7bd3c9795d..719883edef 100644
+--- a/gdb/gdbserver/linux-nios2-low.c
++++ b/gdb/gdbserver/linux-nios2-low.c
+@@ -150,7 +150,7 @@ nios2_breakpoint_at (CORE_ADDR where)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c
+index 0a0d220c34..26c4dee999 100644
+--- a/gdb/gdbserver/linux-tic6x-low.c
++++ b/gdb/gdbserver/linux-tic6x-low.c
+@@ -266,7 +266,7 @@ tic6x_breakpoint_at (CORE_ADDR where)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
+index 484eadba05..15f25d71d5 100644
+--- a/gdb/gdbserver/linux-x86-low.c
++++ b/gdb/gdbserver/linux-x86-low.c
+@@ -231,7 +231,7 @@ is_64bit_tdesc (void)
+ /* Called by libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+ #ifdef __x86_64__
+diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
+index 349ce68f5c..80d6a516ea 100644
+--- a/gdb/i386-linux-nat.c
++++ b/gdb/i386-linux-nat.c
+@@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
+    storage (or its descriptor).  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   unsigned int base_addr;
+diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
+index 8f89d7b87a..6e528b4e91 100644
+--- a/gdb/m68klinux-nat.c
++++ b/gdb/m68klinux-nat.c
+@@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops,
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph, 
++ps_get_thread_area (struct ps_prochandle *ph, 
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0)
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index a36bb6356f..9f6d6975a0 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gdb/7.10.1/0008-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/bsp/buildroot/package/gdb/7.10.1/0008-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
new file mode 100644
index 00000000..c280831a
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.10.1/0008-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -0,0 +1,53 @@
+From 3964e15443c5cdfca6723987c8ef1ef6cf984d41 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2016 17:32:50 -0700
+Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/gdbserver/linux-ppc-low.c | 6 ++++++
+ gdb/nat/ppc-linux.h           | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
+index 188fac0..f71d5ab 100644
+--- a/gdb/gdbserver/linux-ppc-low.c
++++ b/gdb/gdbserver/linux-ppc-low.c
+@@ -21,7 +21,13 @@
+ #include "linux-low.h"
+ 
+ #include <elf.h>
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ 
+ #include "nat/ppc-linux.h"
+ 
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index 0ff2223..c978daa 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef PPC_LINUX_H
+ #define PPC_LINUX_H 1
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ #include <asm/cputable.h>
+ 
+ /* This sometimes isn't defined.  */
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.10.1/0009-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/bsp/buildroot/package/gdb/7.10.1/0009-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
new file mode 100644
index 00000000..50f9512b
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.10.1/0009-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
@@ -0,0 +1,41 @@
+From 1662a42e980c3f605000b23fda86ab24ceb69d32 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 3 Jun 2017 21:23:52 +0200
+Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC
+ systems
+
+Fixes a pt_{dsp,}regs redefinition when building with the musl C library
+on SuperH.
+
+Inspired by
+http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch,
+adapted for SuperH.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/gdbserver/linux-sh-low.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
+index 218d4d3..c4ada84 100644
+--- a/gdb/gdbserver/linux-sh-low.c
++++ b/gdb/gdbserver/linux-sh-low.c
+@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh;
+ #include <sys/reg.h>
+ #endif
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++# define pt_dspregs uapi_pt_dspregs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++# undef pt_dspregs
++#endif
+ 
+ #define sh_num_regs 41
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.10.1/0010-Fix-gdbserver-build-on-uClibc-noMMU.patch b/bsp/buildroot/package/gdb/7.10.1/0010-Fix-gdbserver-build-on-uClibc-noMMU.patch
new file mode 100644
index 00000000..3f877b33
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.10.1/0010-Fix-gdbserver-build-on-uClibc-noMMU.patch
@@ -0,0 +1,32 @@
+From 6de192acd4807d7fd57caf451567f09308bd8350 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 9 Jun 2017 10:19:32 +0200
+Subject: [PATCH] Fix gdbserver build on uClibc/noMMU
+
+The noMMU specific code requires including <sched.h>.
+
+Originally from
+https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/nat/linux-ptrace.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index be6c395..c9f85aa 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -23,7 +23,8 @@ struct buffer;
+ #include <sys/ptrace.h>
+ 
+ #ifdef __UCLIBC__
+-#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
++#include <sched.h>
++#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
+ /* PTRACE_TEXT_ADDR and friends.  */
+ #include <asm/ptrace.h>
+ #define HAS_NOMMU
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.11.1/0002-Sync-proc_service-definition-with-GLIBC.patch b/bsp/buildroot/package/gdb/7.11.1/0002-Sync-proc_service-definition-with-GLIBC.patch
new file mode 100644
index 00000000..b3f723a8
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.11.1/0002-Sync-proc_service-definition-with-GLIBC.patch
@@ -0,0 +1,389 @@
+From 140bf80050b34f0947b34dba93b830ea2bfc5040 Mon Sep 17 00:00:00 2001
+From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date: Thu, 25 Aug 2016 08:42:03 +0100
+Subject: [PATCH] Sync proc_service definition with GLIBC
+
+GLIBC BZ#20311 [1] proc_service.h install patch also remove 'const'
+attributes from ps_get_thread_area and comment #15 discuss why to remove
+the const attribute (basically since it a callback with the struct
+ps_prochandle owned by the client it should be able to modify it if
+it the case).
+
+On default build this is not the issue and current g++ does not trigger
+any issue with this mismatch declaration.  However, on some bootstrap
+build configuration where gdbserver is build with gcc instead this
+triggers:
+
+error: conflicting types for 'ps_get_thread_area'
+
+This patch fixes it by syncing the declaration with GLIBC.
+
+[1] https://sourceware.org/bugzilla/show_bug.cgi?id=20311
+
+gdb/ChangeLog:
+
+2016-08-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* aarch64-linux-nat.c (ps_get_thread_area): Remove const from
+	struct ps_prochandle.
+	* amd64-linux-nat.c (ps_get_thread_area): Likewise.
+	* arm-linux-nat.c (ps_get_thread_area): Likewise.
+	* gdb_proc_service.h (ps_get_thread_area): Likewise.
+	* i386-linux-nat.c (ps_get_thread_area): Likewise.
+	* m68klinux-nat.c (ps_get_thread_area): Likewise.
+	* mips-linux-nat.c (ps_get_thread_area): Likewise.
+	* nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
+	* nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
+	* xtensa-linux-nat.c (ps_get_thread_area): Likewise.
+
+gdb/gdbserver/ChangeLog:
+
+2016-08-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	PR server/20491
+	* gdb_proc_service.h (ps_get_thread_area): Remove const from struct
+	ps_prochandle.
+	* linux-aarch64-low.c (ps_get_thread_area): Likewise.
+	* linux-arm-low.c (ps_get_thread_area): Likewise.
+	* linux-crisv32-low.c (ps_get_thread_area): Likewise.
+	* linux-m68k-low.c (ps_get_thread_area): Likewise.
+	* linux-mips-low.c (ps_get_thread_area): Likewise.
+	* linux-nios2-low.c (ps_get_thread_area): Likewise.
+	* linux-tic6x-low.c (ps_get_thread_area): Likewise.
+	* linux-x86-low.c (ps_get_thread_area): Likewise.
+	* linux-xtensa-low.c (ps_get_thread_area): Likewise.
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ gdb/ChangeLog                     | 14 ++++++++++++++
+ gdb/aarch64-linux-nat.c           |  2 +-
+ gdb/amd64-linux-nat.c             |  2 +-
+ gdb/arm-linux-nat.c               |  2 +-
+ gdb/gdb_proc_service.h            |  2 +-
+ gdb/gdbserver/ChangeLog           | 15 +++++++++++++++
+ gdb/gdbserver/gdb_proc_service.h  |  2 +-
+ gdb/gdbserver/linux-aarch64-low.c |  2 +-
+ gdb/gdbserver/linux-arm-low.c     |  2 +-
+ gdb/gdbserver/linux-crisv32-low.c |  2 +-
+ gdb/gdbserver/linux-m68k-low.c    |  2 +-
+ gdb/gdbserver/linux-mips-low.c    |  2 +-
+ gdb/gdbserver/linux-nios2-low.c   |  2 +-
+ gdb/gdbserver/linux-tic6x-low.c   |  2 +-
+ gdb/gdbserver/linux-x86-low.c     |  2 +-
+ gdb/gdbserver/linux-xtensa-low.c  |  2 +-
+ gdb/i386-linux-nat.c              |  2 +-
+ gdb/m68klinux-nat.c               |  2 +-
+ gdb/mips-linux-nat.c              |  2 +-
+ gdb/nat/aarch64-linux.c           |  2 +-
+ gdb/nat/aarch64-linux.h           |  2 +-
+ gdb/xtensa-linux-nat.c            |  2 +-
+ 22 files changed, 49 insertions(+), 20 deletions(-)
+
+diff --git a/gdb/ChangeLog b/gdb/ChangeLog
+index 9b6562502e..a03afdb82f 100644
+--- a/gdb/ChangeLog
++++ b/gdb/ChangeLog
+@@ -1,3 +1,17 @@
++2016-08-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
++
++	* aarch64-linux-nat.c (ps_get_thread_area): Remove const from
++	struct ps_prochandle.
++	* amd64-linux-nat.c (ps_get_thread_area): Likewise.
++	* arm-linux-nat.c (ps_get_thread_area): Likewise.
++	* gdb_proc_service.h (ps_get_thread_area): Likewise.
++	* i386-linux-nat.c (ps_get_thread_area): Likewise.
++	* m68klinux-nat.c (ps_get_thread_area): Likewise.
++	* mips-linux-nat.c (ps_get_thread_area): Likewise.
++	* nat/aarch64-linux.c (aarch64_ps_get_thread_area): Likewise.
++	* nat/aarch64-linux.h (aarch64_ps_get_thread_area): Likewise.
++	* xtensa-linux-nat.c (ps_get_thread_area): Likewise.
++
+ 2016-06-01  Joel Brobecker  <brobecker@adacore.com>
+ 
+ 	* version.in: Set GDB version number to 7.11.1.DATE-git.
+diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
+index fe1631dbbb..5166eebd33 100644
+--- a/gdb/aarch64-linux-nat.c
++++ b/gdb/aarch64-linux-nat.c
+@@ -457,7 +457,7 @@ aarch64_linux_new_fork (struct lwp_info *parent, pid_t child_pid)
+    storage (or its descriptor).  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   int is_64bit_p
+diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
+index 391a646992..9da36fd1ba 100644
+--- a/gdb/amd64-linux-nat.c
++++ b/gdb/amd64-linux-nat.c
+@@ -245,7 +245,7 @@ amd64_linux_store_inferior_registers (struct target_ops *ops,
+    a request for a thread's local storage address.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (gdbarch_bfd_arch_info (target_gdbarch ())->bits_per_word == 32)
+diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
+index d77ca93498..d11bdc6e22 100644
+--- a/gdb/arm-linux-nat.c
++++ b/gdb/arm-linux-nat.c
+@@ -477,7 +477,7 @@ supply_fpregset (struct regcache *regcache, const gdb_fpregset_t *fpregsetp)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
+index 04d3c03884..a1a8eb5b2f 100644
+--- a/gdb/gdb_proc_service.h
++++ b/gdb/gdb_proc_service.h
+@@ -124,7 +124,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
+ /* Fetch the special per-thread address associated with the given LWP.
+    This call is only used on a few platforms (most use a normal register).
+    The meaning of the `int' parameter is machine-dependent.  */
+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
+ 				    lwpid_t, int, psaddr_t *);
+ 
+ 
+diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
+index 08fef5b06e..ea278b1250 100644
+--- a/gdb/gdbserver/ChangeLog
++++ b/gdb/gdbserver/ChangeLog
+@@ -1,3 +1,18 @@
++2016-08-25  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
++
++	PR server/20491
++	* gdb_proc_service.h (ps_get_thread_area): Remove const from struct
++	ps_prochandle.
++	* linux-aarch64-low.c (ps_get_thread_area): Likewise.
++	* linux-arm-low.c (ps_get_thread_area): Likewise.
++	* linux-crisv32-low.c (ps_get_thread_area): Likewise.
++	* linux-m68k-low.c (ps_get_thread_area): Likewise.
++	* linux-mips-low.c (ps_get_thread_area): Likewise.
++	* linux-nios2-low.c (ps_get_thread_area): Likewise.
++	* linux-tic6x-low.c (ps_get_thread_area): Likewise.
++	* linux-x86-low.c (ps_get_thread_area): Likewise.
++	* linux-xtensa-low.c (ps_get_thread_area): Likewise.
++
+ 2016-04-15  Pedro Alves  <palves@redhat.com>
+ 
+ 	* linux-low.c (check_stopped_by_breakpoint): Rename to ...
+diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
+index 99bf226b01..cec9231ee5 100644
+--- a/gdb/gdbserver/gdb_proc_service.h
++++ b/gdb/gdbserver/gdb_proc_service.h
+@@ -107,7 +107,7 @@ extern pid_t ps_getpid (struct ps_prochandle *);
+ /* Fetch the special per-thread address associated with the given LWP.
+    This call is only used on a few platforms (most use a normal register).
+    The meaning of the `int' parameter is machine-dependent.  */
+-extern ps_err_e ps_get_thread_area (const struct ps_prochandle *,
++extern ps_err_e ps_get_thread_area (struct ps_prochandle *,
+ 				    lwpid_t, int, psaddr_t *);
+ 
+ 
+diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c
+index 806a76260f..b86f210390 100644
+--- a/gdb/gdbserver/linux-aarch64-low.c
++++ b/gdb/gdbserver/linux-aarch64-low.c
+@@ -421,7 +421,7 @@ aarch64_stopped_by_watchpoint (void)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   return aarch64_ps_get_thread_area (ph, lwpid, idx, base,
+diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c
+index 0f627069e0..9f043878c7 100644
+--- a/gdb/gdbserver/linux-arm-low.c
++++ b/gdb/gdbserver/linux-arm-low.c
+@@ -269,7 +269,7 @@ get_next_pcs_read_memory_unsigned_integer (CORE_ADDR memaddr,
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-crisv32-low.c b/gdb/gdbserver/linux-crisv32-low.c
+index 16c1f72015..fea6d5bf9b 100644
+--- a/gdb/gdbserver/linux-crisv32-low.c
++++ b/gdb/gdbserver/linux-crisv32-low.c
+@@ -309,7 +309,7 @@ cris_stopped_data_address (void)
+ }
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
+index df3d7c6d9c..78a340fa8f 100644
+--- a/gdb/gdbserver/linux-m68k-low.c
++++ b/gdb/gdbserver/linux-m68k-low.c
+@@ -152,7 +152,7 @@ m68k_breakpoint_at (CORE_ADDR pc)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c
+index 30a03d5f43..9356bb3d99 100644
+--- a/gdb/gdbserver/linux-mips-low.c
++++ b/gdb/gdbserver/linux-mips-low.c
+@@ -637,7 +637,7 @@ mips_stopped_data_address (void)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-nios2-low.c b/gdb/gdbserver/linux-nios2-low.c
+index ea0ded1f1e..98a85ed8e3 100644
+--- a/gdb/gdbserver/linux-nios2-low.c
++++ b/gdb/gdbserver/linux-nios2-low.c
+@@ -145,7 +145,7 @@ nios2_breakpoint_at (CORE_ADDR where)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c
+index e40a3aff51..6b90560dc4 100644
+--- a/gdb/gdbserver/linux-tic6x-low.c
++++ b/gdb/gdbserver/linux-tic6x-low.c
+@@ -274,7 +274,7 @@ tic6x_breakpoint_at (CORE_ADDR where)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
+index 0c4954a58d..8bac10a54b 100644
+--- a/gdb/gdbserver/linux-x86-low.c
++++ b/gdb/gdbserver/linux-x86-low.c
+@@ -236,7 +236,7 @@ is_64bit_tdesc (void)
+ /* Called by libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+ #ifdef __x86_64__
+diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c
+index 6e945eac17..431082c01f 100644
+--- a/gdb/gdbserver/linux-xtensa-low.c
++++ b/gdb/gdbserver/linux-xtensa-low.c
+@@ -177,7 +177,7 @@ xtensa_breakpoint_at (CORE_ADDR where)
+ /* Called by libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   xtensa_elf_gregset_t regs;
+diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
+index a41ee21081..70d954fdc0 100644
+--- a/gdb/i386-linux-nat.c
++++ b/gdb/i386-linux-nat.c
+@@ -603,7 +603,7 @@ i386_linux_store_inferior_registers (struct target_ops *ops,
+    storage (or its descriptor).  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   unsigned int base_addr;
+diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c
+index 24b6242ba3..5b8684b719 100644
+--- a/gdb/m68klinux-nat.c
++++ b/gdb/m68klinux-nat.c
+@@ -508,7 +508,7 @@ m68k_linux_store_inferior_registers (struct target_ops *ops,
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph, 
++ps_get_thread_area (struct ps_prochandle *ph, 
+ 		    lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) < 0)
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index bfe9fcbe68..0f20f16814 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -152,7 +152,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store)
+ /* Fetch the thread-local storage pointer for libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   if (ptrace (PTRACE_GET_THREAD_AREA, lwpid, NULL, base) != 0)
+diff --git a/gdb/nat/aarch64-linux.c b/gdb/nat/aarch64-linux.c
+index 5ae5aa8602..1828977e28 100644
+--- a/gdb/nat/aarch64-linux.c
++++ b/gdb/nat/aarch64-linux.c
+@@ -205,7 +205,7 @@ aarch64_siginfo_from_compat_siginfo (siginfo_t *to, compat_siginfo_t *from)
+    storage (or its descriptor).  */
+ 
+ ps_err_e
+-aarch64_ps_get_thread_area (const struct ps_prochandle *ph,
++aarch64_ps_get_thread_area (struct ps_prochandle *ph,
+ 			    lwpid_t lwpid, int idx, void **base,
+ 			    int is_64bit_p)
+ {
+diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h
+index 7221982b78..aac7c68c06 100644
+--- a/gdb/nat/aarch64-linux.h
++++ b/gdb/nat/aarch64-linux.h
+@@ -122,7 +122,7 @@ void aarch64_linux_prepare_to_resume (struct lwp_info *lwp);
+ 
+ void aarch64_linux_new_thread (struct lwp_info *lwp);
+ 
+-ps_err_e aarch64_ps_get_thread_area (const struct ps_prochandle *ph,
++ps_err_e aarch64_ps_get_thread_area (struct ps_prochandle *ph,
+ 				       lwpid_t lwpid, int idx, void **base,
+ 				       int is_64bit_p);
+ 
+diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
+index 54da83791a..836d3f80ee 100644
+--- a/gdb/xtensa-linux-nat.c
++++ b/gdb/xtensa-linux-nat.c
+@@ -286,7 +286,7 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops,
+ /* Called by libthread_db.  */
+ 
+ ps_err_e
+-ps_get_thread_area (const struct ps_prochandle *ph,
++ps_get_thread_area (struct ps_prochandle *ph,
+                     lwpid_t lwpid, int idx, void **base)
+ {
+   xtensa_elf_gregset_t regs;
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/gdb/7.11.1/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/bsp/buildroot/package/gdb/7.11.1/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
new file mode 100644
index 00000000..1e7f6b6c
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.11.1/0003-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -0,0 +1,53 @@
+From 7438f3e5a41adf54cf82cd82d3d52244e77d7d05 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2016 17:32:50 -0700
+Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/gdbserver/linux-ppc-low.c | 6 ++++++
+ gdb/nat/ppc-linux.h           | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
+index 2145c50..777905d 100644
+--- a/gdb/gdbserver/linux-ppc-low.c
++++ b/gdb/gdbserver/linux-ppc-low.c
+@@ -21,7 +21,13 @@
+ #include "linux-low.h"
+ 
+ #include <elf.h>
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ 
+ #include "nat/ppc-linux.h"
+ 
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index 85fbcd8..cbec9c5 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef PPC_LINUX_H
+ #define PPC_LINUX_H 1
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ #include <asm/cputable.h>
+ 
+ /* This sometimes isn't defined.  */
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.11.1/0004-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/bsp/buildroot/package/gdb/7.11.1/0004-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
new file mode 100644
index 00000000..f8c9e59b
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.11.1/0004-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
@@ -0,0 +1,41 @@
+From b7cbde12595599768bf2831e311a8ab265322313 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 3 Jun 2017 21:23:52 +0200
+Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC
+ systems
+
+Fixes a pt_{dsp,}regs redefinition when building with the musl C library
+on SuperH.
+
+Inspired by
+http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch,
+adapted for SuperH.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/gdbserver/linux-sh-low.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
+index 38612e2..3195d0d 100644
+--- a/gdb/gdbserver/linux-sh-low.c
++++ b/gdb/gdbserver/linux-sh-low.c
+@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh;
+ #include <sys/reg.h>
+ #endif
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++# define pt_dspregs uapi_pt_dspregs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++# undef pt_dspregs
++#endif
+ 
+ #define sh_num_regs 41
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.11.1/0005-Fix-gdbserver-build-on-uClibc-noMMU.patch b/bsp/buildroot/package/gdb/7.11.1/0005-Fix-gdbserver-build-on-uClibc-noMMU.patch
new file mode 100644
index 00000000..fc8b3ac6
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.11.1/0005-Fix-gdbserver-build-on-uClibc-noMMU.patch
@@ -0,0 +1,32 @@
+From d6bf0c57a6bf361ac53887653aa1878e60d56335 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 9 Jun 2017 10:19:32 +0200
+Subject: [PATCH] Fix gdbserver build on uClibc/noMMU
+
+The noMMU specific code requires including <sched.h>.
+
+Originally from
+https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/nat/linux-ptrace.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 0a23bcb..35b7cbb 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -23,7 +23,8 @@ struct buffer;
+ #include "nat/gdb_ptrace.h"
+ 
+ #ifdef __UCLIBC__
+-#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
++#include <sched.h>
++#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
+ /* PTRACE_TEXT_ADDR and friends.  */
+ #include <asm/ptrace.h>
+ #define HAS_NOMMU
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.12.1/0001-Remove-const-in-xtensa-linux-nat.c-fetch_gregs.patch b/bsp/buildroot/package/gdb/7.12.1/0001-Remove-const-in-xtensa-linux-nat.c-fetch_gregs.patch
new file mode 100644
index 00000000..bb3d99d6
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.12.1/0001-Remove-const-in-xtensa-linux-nat.c-fetch_gregs.patch
@@ -0,0 +1,39 @@
+From d274ecf4ddf76768af57e27f654b9ce6784b391c Mon Sep 17 00:00:00 2001
+From: Simon Marchi <simon.marchi@ericsson.com>
+Date: Mon, 6 Mar 2017 16:06:42 -0500
+Subject: [PATCH] Remove const in xtensa-linux-nat.c:fetch_gregs
+
+Fixes:
+
+/home/emaisin/src/binutils-gdb/gdb/xtensa-linux-nat.c: In function 'void fetch_gregs(regcache*, ptid_t, int)':
+/home/emaisin/src/binutils-gdb/gdb/xtensa-linux-nat.c:178:23: error: uninitialized const 'regs' [-fpermissive]
+   const gdb_gregset_t regs;
+                       ^
+
+gdb/ChangeLog:
+
+	* xtensa-linux-nat.c (fetch_gregs): Remove const.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+Backported from: d274ecf4ddf76768af57e27f654b9ce6784b391c
+
+ gdb/xtensa-linux-nat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
+index afe15f6..c29f0c7 100644
+--- a/gdb/xtensa-linux-nat.c
++++ b/gdb/xtensa-linux-nat.c
+@@ -175,7 +175,7 @@ static void
+ fetch_gregs (struct regcache *regcache, int regnum)
+ {
+   int tid = ptid_get_lwp (inferior_ptid);
+-  const gdb_gregset_t regs;
++  gdb_gregset_t regs;
+   int areg;
+   
+   if (ptrace (PTRACE_GETREGS, tid, 0, (long) &regs) < 0)
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/gdb/7.12.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/bsp/buildroot/package/gdb/7.12.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
new file mode 100644
index 00000000..f6ec1d78
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.12.1/0002-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -0,0 +1,53 @@
+From c45f07aec83ccb732ece970cb387f2db8b6896e4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2016 17:32:50 -0700
+Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/gdbserver/linux-ppc-low.c | 6 ++++++
+ gdb/nat/ppc-linux.h           | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
+index 33a9feb..1a9141f 100644
+--- a/gdb/gdbserver/linux-ppc-low.c
++++ b/gdb/gdbserver/linux-ppc-low.c
+@@ -21,7 +21,13 @@
+ #include "linux-low.h"
+ 
+ #include <elf.h>
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ 
+ #include "nat/ppc-linux.h"
+ #include "linux-ppc-tdesc.h"
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index 5837ea1..7233929 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef PPC_LINUX_H
+ #define PPC_LINUX_H 1
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ #include <asm/cputable.h>
+ 
+ /* This sometimes isn't defined.  */
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.12.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/bsp/buildroot/package/gdb/7.12.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
new file mode 100644
index 00000000..4f142ecf
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.12.1/0003-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
@@ -0,0 +1,41 @@
+From 00a0ba059f01784e8da5cec3439ea2d6c4a2ef40 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 3 Jun 2017 21:23:52 +0200
+Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on !GLIBC
+ systems
+
+Fixes a pt_{dsp,}regs redefinition when building with the musl C library
+on SuperH.
+
+Inspired by
+http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch,
+adapted for SuperH.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/gdbserver/linux-sh-low.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
+index ac084c9..08e104a 100644
+--- a/gdb/gdbserver/linux-sh-low.c
++++ b/gdb/gdbserver/linux-sh-low.c
+@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh;
+ #include <sys/reg.h>
+ #endif
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++# define pt_dspregs uapi_pt_dspregs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++# undef pt_dspregs
++#endif
+ 
+ #define sh_num_regs 41
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.12.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch b/bsp/buildroot/package/gdb/7.12.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch
new file mode 100644
index 00000000..cbdfc4de
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.12.1/0004-Fix-gdbserver-build-on-uClibc-noMMU.patch
@@ -0,0 +1,32 @@
+From 430ab62f356d9e45e2231b0483ee33eaf3af5df3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 9 Jun 2017 10:19:32 +0200
+Subject: [PATCH] Fix gdbserver build on uClibc/noMMU
+
+The noMMU specific code requires including <sched.h>.
+
+Originally from
+https://cgit.openadk.org/cgi/cgit/openadk.git/plain/package/gdbserver/patches/nommu.patch.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gdb/nat/linux-ptrace.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
+index 5954945..80bb674 100644
+--- a/gdb/nat/linux-ptrace.h
++++ b/gdb/nat/linux-ptrace.h
+@@ -23,7 +23,8 @@ struct buffer;
+ #include "nat/gdb_ptrace.h"
+ 
+ #ifdef __UCLIBC__
+-#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
++#include <sched.h>
++#if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_USE_MMU__))
+ /* PTRACE_TEXT_ADDR and friends.  */
+ #include <asm/ptrace.h>
+ #define HAS_NOMMU
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gdb/7.12.1/0005-use-asm-sgidefs.h.patch b/bsp/buildroot/package/gdb/7.12.1/0005-use-asm-sgidefs.h.patch
new file mode 100644
index 00000000..d3033690
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.12.1/0005-use-asm-sgidefs.h.patch
@@ -0,0 +1,40 @@
+From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <amccurdy@gmail.com>
+Date: Sat, 30 Apr 2016 15:29:06 -0700
+Subject: [PATCH] use <asm/sgidefs.h>
+
+Build fix for MIPS with musl libc
+
+The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
+but not by musl. Regardless of the libc, the kernel headers provide
+<asm/sgidefs.h> which provides the same definitions, so use that
+instead.
+
+Upstream-Status: Pending
+
+[Vincent:
+Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ gdb/mips-linux-nat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index f2df1b9907..d24664cb56 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
+-- 
+2.13.1
+
diff --git a/bsp/buildroot/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch b/bsp/buildroot/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch
new file mode 100644
index 00000000..451bed31
--- /dev/null
+++ b/bsp/buildroot/package/gdb/7.12.1/0007-gdbserver-fix-build-for-m68k.patch
@@ -0,0 +1,62 @@
+From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 22 Jun 2018 22:40:26 +0200
+Subject: [PATCH] gdbserver: fix build for m68k
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As for strace [1], when <sys/reg.h> is included after <linux/ptrace.h>,
+the build fails on m68k with the following diagnostics:
+
+In file included from ./../nat/linux-ptrace.h:28:0,
+                 from linux-low.h:27,
+                 from linux-m68k-low.c:20:
+[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant
+   PT_D1 = 0,
+   ^
+[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant
+[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant
+In file included from linux-m68k-low.c:27:0:
+[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token
+ };
+ ^
+
+Fix this by moving <sys/reg.h> on top of "linux-low.h".
+
+[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gdb/gdbserver/linux-m68k-low.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
+index 5594f10f927..19b4ef7b259 100644
+--- a/gdb/gdbserver/linux-m68k-low.c
++++ b/gdb/gdbserver/linux-m68k-low.c
+@@ -17,16 +17,17 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #include "server.h"
++
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ #include "linux-low.h"
+ 
+ /* Defined in auto-generated file reg-m68k.c.  */
+ void init_registers_m68k (void);
+ extern const struct target_desc *tdesc_m68k;
+ 
+-#ifdef HAVE_SYS_REG_H
+-#include <sys/reg.h>
+-#endif
+-
+ #define m68k_num_regs 29
+ #define m68k_num_gregs 18
+ 
+-- 
+2.14.4
+
diff --git a/bsp/buildroot/package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/bsp/buildroot/package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
new file mode 100644
index 00000000..9e011c72
--- /dev/null
+++ b/bsp/buildroot/package/gdb/8.0.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch
@@ -0,0 +1,55 @@
+From 2acd9d3eb703b9a64ac92b3880ed546bec92af95 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 6 Aug 2016 17:32:50 -0700
+Subject: [PATCH] ppc/ptrace: Define pt_regs uapi_pt_regs on !GLIBC systems
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Rebase on gdb 8.0]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gdb/gdbserver/linux-ppc-low.c | 6 ++++++
+ gdb/nat/ppc-linux.h           | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
+index 33a9feb..1a9141f 100644
+--- a/gdb/gdbserver/linux-ppc-low.c
++++ b/gdb/gdbserver/linux-ppc-low.c
+@@ -21,7 +21,13 @@
+ #include "linux-low.h"
+ 
+ #include <elf.h>
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ 
+ #include "nat/ppc-linux.h"
+ #include "linux-ppc-tdesc.h"
+diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
+index 5837ea1..7233929 100644
+--- a/gdb/nat/ppc-linux.h
++++ b/gdb/nat/ppc-linux.h
+@@ -18,7 +18,13 @@
+ #ifndef PPC_LINUX_H
+ #define PPC_LINUX_H 1
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++#endif
+ #include <asm/cputable.h>
+ 
+ /* This sometimes isn't defined.  */
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/bsp/buildroot/package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
new file mode 100644
index 00000000..d31e5dd1
--- /dev/null
+++ b/bsp/buildroot/package/gdb/8.0.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch
@@ -0,0 +1,43 @@
+From dfe4a40bc9d2fc1fd1b1a11ed733a0c0a1f59f3c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 3 Jun 2017 21:23:52 +0200
+Subject: [PATCH] sh/ptrace: Define pt_{dsp,}regs uapi_pt_{dsp,}regs on
+ !GLIBC systems
+
+Fixes a pt_{dsp,}regs redefinition when building with the musl C library
+on SuperH.
+
+Inspired by
+http://git.yoctoproject.org/clean/cgit.cgi/poky/plain/meta/recipes-devtools/gdb/gdb/0004-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch,
+adapted for SuperH.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Rebase	on gdb 8.0]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gdb/gdbserver/linux-sh-low.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
+index ac084c9..08e104a 100644
+--- a/gdb/gdbserver/linux-sh-low.c
++++ b/gdb/gdbserver/linux-sh-low.c
+@@ -27,7 +27,15 @@ extern const struct target_desc *tdesc_sh;
+ #include <sys/reg.h>
+ #endif
+ 
++#if !defined(__GLIBC__)
++# define pt_regs uapi_pt_regs
++# define pt_dspregs uapi_pt_dspregs
++#endif
+ #include <asm/ptrace.h>
++#if !defined(__GLIBC__)
++# undef pt_regs
++# undef pt_dspregs
++#endif
+ 
+ #define sh_num_regs 41
+ 
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch b/bsp/buildroot/package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch
new file mode 100644
index 00000000..d3033690
--- /dev/null
+++ b/bsp/buildroot/package/gdb/8.0.1/0003-use-asm-sgidefs.h.patch
@@ -0,0 +1,40 @@
+From 12a0b8d81e1fda6ba98abdce8d6f09f9555ebcf5 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <amccurdy@gmail.com>
+Date: Sat, 30 Apr 2016 15:29:06 -0700
+Subject: [PATCH] use <asm/sgidefs.h>
+
+Build fix for MIPS with musl libc
+
+The MIPS specific header <sgidefs.h> is provided by glibc and uclibc
+but not by musl. Regardless of the libc, the kernel headers provide
+<asm/sgidefs.h> which provides the same definitions, so use that
+instead.
+
+Upstream-Status: Pending
+
+[Vincent:
+Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070]
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ gdb/mips-linux-nat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
+index f2df1b9907..d24664cb56 100644
+--- a/gdb/mips-linux-nat.c
++++ b/gdb/mips-linux-nat.c
+@@ -31,7 +31,7 @@
+ #include "gdb_proc_service.h"
+ #include "gregset.h"
+ 
+-#include <sgidefs.h>
++#include <asm/sgidefs.h>
+ #include "nat/gdb_ptrace.h"
+ #include <asm/ptrace.h>
+ #include "inf-ptrace.h"
+-- 
+2.13.1
+
diff --git a/bsp/buildroot/package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch b/bsp/buildroot/package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch
new file mode 100644
index 00000000..4eb72e40
--- /dev/null
+++ b/bsp/buildroot/package/gdb/8.0.1/0004-nat-linux-ptrace.c-add-missing-gdb_byte-cast.patch
@@ -0,0 +1,41 @@
+From 09a2c3e0164545324a1ddee70f5c9fdee71e2079 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 18 Jun 2017 23:09:43 +0200
+Subject: [PATCH] nat/linux-ptrace.c: add missing gdb_byte* cast
+
+On noMMU platforms, the following code gets compiled:
+
+  child_stack = xmalloc (STACK_SIZE * 4);
+
+Where child_stack is a gdb_byte*, and xmalloc() returns a void*. While
+the lack of cast is valid in C, it is not in C++, causing the
+following build failure:
+
+../nat/linux-ptrace.c: In function 'int linux_fork_to_function(gdb_byte*, int (*)(void*))':
+../nat/linux-ptrace.c:273:29: error: invalid conversion from 'void*' to 'gdb_byte* {aka unsigned char*}' [-fpermissive]
+       child_stack = xmalloc (STACK_SIZE * 4);
+
+Therefore, this commit adds the appropriate cast.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Upstream commit: ffce45d2243e5f52f411e314fc4e1a69f431a81f]
+---
+ gdb/nat/linux-ptrace.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
+index 3447e07..33833e2 100644
+--- a/gdb/nat/linux-ptrace.c
++++ b/gdb/nat/linux-ptrace.c
+@@ -270,7 +270,7 @@ linux_fork_to_function (gdb_byte *child_stack, int (*function) (void *))
+ #define STACK_SIZE 4096
+ 
+     if (child_stack == NULL)
+-      child_stack = xmalloc (STACK_SIZE * 4);
++      child_stack = (gdb_byte*) xmalloc (STACK_SIZE * 4);
+ 
+     /* Use CLONE_VM instead of fork, to support uClinux (no MMU).  */
+ #ifdef __ia64__
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch b/bsp/buildroot/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch
new file mode 100644
index 00000000..451bed31
--- /dev/null
+++ b/bsp/buildroot/package/gdb/8.0.1/0005-gdbserver-fix-build-for-m68k.patch
@@ -0,0 +1,62 @@
+From 80c60ea9fb3634272a98ec526eabff25f5255bae Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Fri, 22 Jun 2018 22:40:26 +0200
+Subject: [PATCH] gdbserver: fix build for m68k
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+As for strace [1], when <sys/reg.h> is included after <linux/ptrace.h>,
+the build fails on m68k with the following diagnostics:
+
+In file included from ./../nat/linux-ptrace.h:28:0,
+                 from linux-low.h:27,
+                 from linux-m68k-low.c:20:
+[...]/usr/include/sys/reg.h:26:3: error: expected identifier before numeric constant
+   PT_D1 = 0,
+   ^
+[...]usr/include/sys/reg.h:26:3: error: expected « } » before numeric constant
+[...]usr/include/sys/reg.h:26:3: error: expected unqualified-id before numeric constant
+In file included from linux-m68k-low.c:27:0:
+[...]usr/include/sys/reg.h:99:1: error: expected declaration before « } » token
+ };
+ ^
+
+Fix this by moving <sys/reg.h> on top of "linux-low.h".
+
+[1] https://github.com/strace/strace/commit/6ebf6c4f9e5ebca123a5b5f24afe67cf0473cf92
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ gdb/gdbserver/linux-m68k-low.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/gdb/gdbserver/linux-m68k-low.c b/gdb/gdbserver/linux-m68k-low.c
+index 5594f10f927..19b4ef7b259 100644
+--- a/gdb/gdbserver/linux-m68k-low.c
++++ b/gdb/gdbserver/linux-m68k-low.c
+@@ -17,16 +17,17 @@
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ #include "server.h"
++
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ #include "linux-low.h"
+ 
+ /* Defined in auto-generated file reg-m68k.c.  */
+ void init_registers_m68k (void);
+ extern const struct target_desc *tdesc_m68k;
+ 
+-#ifdef HAVE_SYS_REG_H
+-#include <sys/reg.h>
+-#endif
+-
+ #define m68k_num_regs 29
+ #define m68k_num_gregs 18
+ 
+-- 
+2.14.4
+
diff --git a/bsp/buildroot/package/gdb/Config.in b/bsp/buildroot/package/gdb/Config.in
index 809e02d0..af020f40 100644
--- a/bsp/buildroot/package/gdb/Config.in
+++ b/bsp/buildroot/package/gdb/Config.in
@@ -1,16 +1,25 @@
+config BR2_PACKAGE_GDB_ARCH_SUPPORTS
+	bool
+	default y
+	depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT)
+	depends on !BR2_bfin
+	depends on !BR2_microblaze
+	depends on !BR2_nios2
+	depends on !BR2_or1k
+
 comment "gdb/gdbserver needs a toolchain w/ threads, threads debug"
-	depends on !BR2_nios2 && !BR2_bfin
+	depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 
 config BR2_PACKAGE_GDB
 	bool "gdb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
+	depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS
 	# When the external toolchain gdbserver is copied to the
 	# target, we don't allow building a separate gdbserver. The
 	# one from the external toolchain should be used.
 	select BR2_PACKAGE_GDB_SERVER if \
 		(!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)
-	depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	depends on !BR2_nios2 && !BR2_bfin
 	help
 	  GDB, the GNU Project debugger, allows you to see what is
 	  going on `inside' another program while it executes -- or
@@ -38,12 +47,12 @@ config BR2_PACKAGE_GDB_SERVER
 
 config BR2_PACKAGE_GDB_DEBUGGER
 	bool "full debugger"
-	select BR2_PACKAGE_NCURSES
 	depends on BR2_USE_WCHAR
-	depends on !BR2_sh && !BR2_microblaze
+	depends on !BR2_sh
+	select BR2_PACKAGE_NCURSES
 
 comment "full gdb on target needs a toolchain w/ wchar"
-	depends on !BR2_sh && !BR2_microblaze
+	depends on !BR2_sh
 	depends on !BR2_USE_WCHAR
 
 if BR2_PACKAGE_GDB_DEBUGGER
diff --git a/bsp/buildroot/package/gdb/Config.in.host b/bsp/buildroot/package/gdb/Config.in.host
index 24e2274c..99e1cae5 100644
--- a/bsp/buildroot/package/gdb/Config.in.host
+++ b/bsp/buildroot/package/gdb/Config.in.host
@@ -1,4 +1,17 @@
+config BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS
+	bool
+	default y
+	# The ARC version needs C++11, thus gcc >= 4.8, like gdb-8.0.x
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_arc
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_arc
+	depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT)
+	depends on !BR2_microblaze
+	depends on !BR2_nios2
+	depends on !BR2_or1k
+
 comment "Host GDB Options"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
+	depends on BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS
 
 config BR2_PACKAGE_HOST_GDB
 	bool "Build cross gdb for the host"
@@ -6,7 +19,7 @@ config BR2_PACKAGE_HOST_GDB
 	# allow to build a cross-gdb, as the one of the external
 	# toolchain should be used.
 	depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY
-	depends on !BR2_nios2
+	depends on BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS
 	help
 	  Build a cross gdb that runs on the host machine and debugs
 	  programs running on the target. It requires 'gdbserver'
@@ -27,26 +40,32 @@ config BR2_PACKAGE_HOST_GDB_PYTHON
 
 config BR2_PACKAGE_HOST_GDB_SIM
 	bool "Simulator support"
-	depends on !BR2_arc && !BR2_microblaze
+	depends on !BR2_arc
 	help
 	  This option enables the simulator support in the cross gdb.
 
 choice
 	prompt "GDB debugger Version"
-	depends on !BR2_arc
-	depends on !BR2_microblaze
 	default BR2_GDB_VERSION_7_11
+	depends on !BR2_arc
 	help
 	  Select the version of gdb you wish to use.
 
-	config BR2_GDB_VERSION_7_10
-		bool "gdb 7.10.x"
+config BR2_GDB_VERSION_7_10
+	bool "gdb 7.10.x"
 
-	config BR2_GDB_VERSION_7_11
-		bool "gdb 7.11.x"
+config BR2_GDB_VERSION_7_11
+	bool "gdb 7.11.x"
 
-	config BR2_GDB_VERSION_7_12
-		bool "gdb 7.12.x"
+config BR2_GDB_VERSION_7_12
+	bool "gdb 7.12.x"
+
+config BR2_GDB_VERSION_8_0
+	bool "gdb 8.0.x"
+	# Needs a C++11 compiler
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 
 endchoice
 
@@ -55,9 +74,9 @@ endif
 # If cross-gdb is not enabled, the latest working version is chosen.
 config BR2_GDB_VERSION
 	string
-	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
-	default "arc-2016.09-release-gdb" if BR2_arc
-	default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze
+	default "arc-2017.09-release-gdb" if BR2_arc
 	default "7.10.1"   if BR2_GDB_VERSION_7_10
 	default "7.11.1"   if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB
 	default "7.12.1"   if BR2_GDB_VERSION_7_12
+	default "8.0.1"    if BR2_GDB_VERSION_8_0
+	depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB
diff --git a/bsp/buildroot/package/gdb/gdb.hash b/bsp/buildroot/package/gdb/gdb.hash
index 1e205dbe..62edd937 100644
--- a/bsp/buildroot/package/gdb/gdb.hash
+++ b/bsp/buildroot/package/gdb/gdb.hash
@@ -2,7 +2,7 @@
 sha512	17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010	gdb-7.10.1.tar.xz
 sha512  f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360	gdb-7.11.1.tar.xz
 sha512  0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8	gdb-7.12.1.tar.xz
+sha512  5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1	gdb-8.0.1.tar.xz
 
 # Locally calculated (fetched from Github)
-sha512  0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7	gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz
-sha512  3b204108821ba687974e61bb47f0ab91621ac233503cec6c82913bcb665a8c0cea0c8b992177b2fb6befade774c2491d94c72a1bf859f9b79d44755be05dcd64  gdb-arc-2016.09-release-gdb.tar.gz
+sha512  e57582766e7d510b26bea63606429e6289414c31c60e28fef24d3d82fa20fb5a1f92b3831fde53e4f7c178c9e099609d3292628cf921a99109e297af4e5f83d9 	gdb-arc-2017.09-release-gdb.tar.gz
diff --git a/bsp/buildroot/package/gdb/gdb.mk b/bsp/buildroot/package/gdb/gdb.mk
index e52f42b0..0981b6ef 100644
--- a/bsp/buildroot/package/gdb/gdb.mk
+++ b/bsp/buildroot/package/gdb/gdb.mk
@@ -14,13 +14,7 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
 GDB_FROM_GIT = y
 endif
 
-ifeq ($(BR2_microblaze),y)
-GDB_SITE = $(call github,Xilinx,gdb,$(GDB_VERSION))
-GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
-GDB_FROM_GIT = y
-endif
-
-GDB_LICENSE = GPLv2+, LGPLv2+, GPLv3+, LGPLv3+
+GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+
 GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
 
 # We only want gdbserver and not the entire debugger.
@@ -44,14 +38,14 @@ HOST_GDB_MAKE_OPTS += MAKEINFO=true
 HOST_GDB_INSTALL_OPTS += MAKEINFO=true install
 
 # Apply the Xtensa specific patches
-XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME))
-ifneq ($(XTENSA_CORE_NAME),)
-define GDB_XTENSA_PRE_PATCH
-	tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
-		-C $(@D) --strip-components=1 gdb
+ifneq ($(ARCH_XTENSA_OVERLAY_FILE),)
+define GDB_XTENSA_OVERLAY_EXTRACT
+	$(call arch-xtensa-overlay-extract,$(@D),gdb)
 endef
-GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
-HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH
+GDB_POST_EXTRACT_HOOKS += GDB_XTENSA_OVERLAY_EXTRACT
+GDB_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
+HOST_GDB_POST_EXTRACT_HOOKS += GDB_XTENSA_OVERLAY_EXTRACT
+HOST_GDB_EXTRA_DOWNLOADS += $(ARCH_XTENSA_OVERLAY_URL)
 endif
 
 ifeq ($(GDB_FROM_GIT),y)
@@ -91,7 +85,21 @@ GDB_CONF_ENV = \
 # not get passed to the configure script of nested packages while
 # building gdbserver with full debugger.
 GDB_CONF_ENV += gl_cv_func_gettimeofday_clobber=no
-GDB_MAKE_ENV = gl_cv_func_gettimeofday_clobber=no
+GDB_MAKE_ENV += gl_cv_func_gettimeofday_clobber=no
+
+# Starting with glibc 2.25, the proc_service.h header has been copied
+# from gdb to glibc so other tools can use it. However, that makes it
+# necessary to make sure that declaration of prfpregset_t declaration
+# is consistent between gdb and glibc. In gdb, however, there is a
+# workaround for a broken prfpregset_t declaration in glibc 2.3 which
+# uses AC_TRY_RUN to detect if it's needed, which doesn't work in
+# cross-compilation. So pass the cache option to configure.
+# It needs to be passed to GDB_CONF_ENV to build gdbserver only but
+# also to GDB_MAKE_ENV, because otherwise it does not get passed to the
+# configure script of nested packages while building gdbserver with full
+# debugger.
+GDB_CONF_ENV += gdb_cv_prfpregset_t_broken=no
+GDB_MAKE_ENV += gdb_cv_prfpregset_t_broken=no
 
 # The shared only build is not supported by gdb, so enable static build for
 # build-in libraries with --enable-static.
@@ -101,7 +109,7 @@ GDB_CONF_OPTS = \
 	--without-x \
 	--disable-sim \
 	$(GDB_DISABLE_BINUTILS_CONF_OPTS) \
-	$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \
+	$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver,--disable-gdbserver) \
 	--with-curses \
 	--without-included-gettext \
 	--disable-werror \
@@ -156,6 +164,7 @@ else
 GDB_CONF_OPTS += --without-zlib
 endif
 
+ifeq ($(BR2_PACKAGE_GDB_PYTHON),)
 # This removes some unneeded Python scripts and XML target description
 # files that are not useful for a normal usage of the debugger.
 define GDB_REMOVE_UNNEEDED_FILES
@@ -163,6 +172,7 @@ define GDB_REMOVE_UNNEEDED_FILES
 endef
 
 GDB_POST_INSTALL_TARGET_HOOKS += GDB_REMOVE_UNNEEDED_FILES
+endif
 
 # This installs the gdbserver somewhere into the $(HOST_DIR) so that
 # it becomes an integral part of the SDK, if the toolchain generated
@@ -171,7 +181,7 @@ GDB_POST_INSTALL_TARGET_HOOKS += GDB_REMOVE_UNNEEDED_FILES
 # does.
 define GDB_SDK_INSTALL_GDBSERVER
 	$(INSTALL) -D -m 0755 $(TARGET_DIR)/usr/bin/gdbserver \
-		$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/debug-root/usr/bin/gdbserver
+		$(HOST_DIR)/$(GNU_TARGET_NAME)/debug-root/usr/bin/gdbserver
 endef
 
 ifeq ($(BR2_PACKAGE_GDB_SERVER),y)
@@ -201,7 +211,7 @@ HOST_GDB_CONF_OPTS += --disable-tui
 endif
 
 ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y)
-HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/usr/bin/python2
+HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/bin/python2
 HOST_GDB_DEPENDENCIES += host-python
 else
 HOST_GDB_CONF_OPTS += --without-python
@@ -223,7 +233,7 @@ endif
 
 # legacy $arch-linux-gdb symlink
 define HOST_GDB_ADD_SYMLINK
-	cd $(HOST_DIR)/usr/bin && \
+	cd $(HOST_DIR)/bin && \
 		ln -snf $(GNU_TARGET_NAME)-gdb $(ARCH)-linux-gdb
 endef
 
diff --git a/bsp/buildroot/package/gdbm/Config.in b/bsp/buildroot/package/gdbm/Config.in
index 8ad0fc6c..3646bd05 100644
--- a/bsp/buildroot/package/gdbm/Config.in
+++ b/bsp/buildroot/package/gdbm/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_GDBM
 	bool "gdbm"
 	help
-	  GNU dbm is a set of database routines that use extensible hashing.
-	  It works similar to the standard UNIX dbm routines.
+	  GNU dbm is a set of database routines that use extensible
+	  hashing. It works similar to the standard UNIX dbm routines.
 
 	  http://www.gnu.org/software/gdbm/gdbm.html
diff --git a/bsp/buildroot/package/gdbm/gdbm.hash b/bsp/buildroot/package/gdbm/gdbm.hash
index 9759d870..cab712e1 100644
--- a/bsp/buildroot/package/gdbm/gdbm.hash
+++ b/bsp/buildroot/package/gdbm/gdbm.hash
@@ -1,3 +1,5 @@
-# From http://lists.gnu.org/archive/html/info-gnu/2016-05/msg00009.html
-md5	9ce96ff4c99e74295ea19040931c8fb9	gdbm-1.12.tar.gz
-sha1	86513e8871bb376bc014e9e5a2d18a8e0a8ea2f5	gdbm-1.12.tar.gz
+# From http://www.gnu.org.ua/software/gdbm/download.html
+md5 8929dcda2a8de3fd2367bdbf66769376  gdbm-1.13.tar.gz
+sha1 7f2a8301497bbcac91808b011ca533380914fd21  gdbm-1.13.tar.gz
+# Locally computed
+sha256 9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253  gdbm-1.13.tar.gz
diff --git a/bsp/buildroot/package/gdbm/gdbm.mk b/bsp/buildroot/package/gdbm/gdbm.mk
index 55ece880..acd8cd2a 100644
--- a/bsp/buildroot/package/gdbm/gdbm.mk
+++ b/bsp/buildroot/package/gdbm/gdbm.mk
@@ -4,14 +4,18 @@
 #
 ################################################################################
 
-GDBM_VERSION = 1.12
+GDBM_VERSION = 1.13
 GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm
-GDBM_LICENSE = GPLv3+
+GDBM_LICENSE = GPL-3.0+
 GDBM_LICENSE_FILES = COPYING
 GDBM_INSTALL_STAGING = YES
+GDBM_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-GDBM_DEPENDENCIES += gettext
+ifeq ($(BR2_PACKAGE_READLINE),y)
+GDBM_CONF_OPTS += --with-readline
+GDBM_DEPENDENCIES += readline
+else
+GDBM_CONF_OPTS += --without-readline
 endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk b/bsp/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk
index 5e8bb417..33de2e3d 100644
--- a/bsp/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/bsp/buildroot/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -8,7 +8,7 @@ GDK_PIXBUF_VERSION_MAJOR = 2.36
 GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).10
 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
 GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
-GDK_PIXBUF_LICENSE = LGPLv2+
+GDK_PIXBUF_LICENSE = LGPL-2.0+
 GDK_PIXBUF_LICENSE_FILES = COPYING
 GDK_PIXBUF_INSTALL_STAGING = YES
 GDK_PIXBUF_DEPENDENCIES = \
@@ -61,10 +61,10 @@ endif
 # need to sanitize (strip) them.
 ifeq ($(BR2_STATIC_LIBS),)
 define GDK_PIXBUF_UPDATE_CACHE
-	GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders \
-		$(HOST_DIR)/usr/bin/gdk-pixbuf-query-loaders \
+	GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders \
+		$(HOST_DIR)/bin/gdk-pixbuf-query-loaders \
 		> $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
-	$(SED) "s,$(HOST_DIR),,g" \
+	$(SED) "s,$(HOST_DIR)/lib,/usr/lib,g" \
 		$(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
 endef
 GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE
@@ -80,7 +80,7 @@ GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
 # thumbnailer. Use the host-built since it matches the target options
 # regarding mime types (which is the used information).
 define GDK_PIXBUF_COPY_LOADERS_CACHE
-	cp -f $(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+	cp -f $(HOST_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
 		$(@D)/gdk-pixbuf
 endef
 GDK_PIXBUF_PRE_BUILD_HOOKS += GDK_PIXBUF_COPY_LOADERS_CACHE
diff --git a/bsp/buildroot/package/genext2fs/genext2fs.mk b/bsp/buildroot/package/genext2fs/genext2fs.mk
index 528912e9..dd907c8b 100644
--- a/bsp/buildroot/package/genext2fs/genext2fs.mk
+++ b/bsp/buildroot/package/genext2fs/genext2fs.mk
@@ -6,7 +6,7 @@
 
 GENEXT2FS_VERSION = 1.4.1
 GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION)
-GENEXT2FS_LICENSE = GPLv2
+GENEXT2FS_LICENSE = GPL-2.0
 GENEXT2FS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gengetopt/gengetopt.mk b/bsp/buildroot/package/gengetopt/gengetopt.mk
index b7cbc7f6..e7c49ba5 100644
--- a/bsp/buildroot/package/gengetopt/gengetopt.mk
+++ b/bsp/buildroot/package/gengetopt/gengetopt.mk
@@ -6,7 +6,7 @@
 
 GENGETOPT_VERSION = 2.22.6
 GENGETOPT_SITE = $(BR2_GNU_MIRROR)/gengetopt
-GENGETOPT_LICENSE = GPLv3+
+GENGETOPT_LICENSE = GPL-3.0+
 GENGETOPT_LICENSE_FILES = COPYING LICENSE
 
 # Parallel build broken
diff --git a/bsp/buildroot/package/genimage/Config.in.host b/bsp/buildroot/package/genimage/Config.in.host
index 5c5a8a8a..cf831a14 100644
--- a/bsp/buildroot/package/genimage/Config.in.host
+++ b/bsp/buildroot/package/genimage/Config.in.host
@@ -10,4 +10,4 @@ config BR2_PACKAGE_HOST_GENIMAGE
 	  environment variables, the config file or commandline
 	  switches.
 
-	  http://www.pengutronix.de/software/genimage/
+	  https://github.com/pengutronix/genimage
diff --git a/bsp/buildroot/package/genimage/genimage.mk b/bsp/buildroot/package/genimage/genimage.mk
index 4343d14d..8d11c66a 100644
--- a/bsp/buildroot/package/genimage/genimage.mk
+++ b/bsp/buildroot/package/genimage/genimage.mk
@@ -6,9 +6,9 @@
 
 GENIMAGE_VERSION = 9
 GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
-GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download
+GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION)
 HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse
-GENIMAGE_LICENSE = GPLv2
+GENIMAGE_LICENSE = GPL-2.0
 GENIMAGE_LICENSE_FILES = COPYING
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/genpart/Config.in b/bsp/buildroot/package/genpart/Config.in
index 8d9ec795..64288452 100644
--- a/bsp/buildroot/package/genpart/Config.in
+++ b/bsp/buildroot/package/genpart/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GENPART
 	bool "genpart"
 	help
-	  Generate a 16 byte partition table entry defined by command line
-	  arguments and dump it to stdout. No CHS magic is done, only lba
-	  entries are filled out.
+	  Generate a 16 byte partition table entry defined by command
+	  line arguments and dump it to stdout. No CHS magic is done,
+	  only lba entries are filled out.
 
 	  http://www.pengutronix.de/software/genpart/index_en.html
diff --git a/bsp/buildroot/package/genpart/Config.in.host b/bsp/buildroot/package/genpart/Config.in.host
index 6cc2a59a..d8b9eb61 100644
--- a/bsp/buildroot/package/genpart/Config.in.host
+++ b/bsp/buildroot/package/genpart/Config.in.host
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_HOST_GENPART
 	bool "host genpart"
 	help
-	  Generate a 16 byte partition table entry defined by command line
-	  arguments and dump it to stdout. No CHS magic is done, only lba
-	  entries are filled out.
+	  Generate a 16 byte partition table entry defined by command
+	  line arguments and dump it to stdout. No CHS magic is done,
+	  only lba entries are filled out.
 
 	  http://www.pengutronix.de/software/genpart/index_en.html
diff --git a/bsp/buildroot/package/genromfs/genromfs.mk b/bsp/buildroot/package/genromfs/genromfs.mk
index 8db08998..fd696b45 100644
--- a/bsp/buildroot/package/genromfs/genromfs.mk
+++ b/bsp/buildroot/package/genromfs/genromfs.mk
@@ -6,7 +6,7 @@
 
 GENROMFS_VERSION = 0.5.2
 GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION)
-GENROMFS_LICENSE = GPLv2+
+GENROMFS_LICENSE = GPL-2.0+
 GENROMFS_LICENSE_FILES = COPYING
 
 define GENROMFS_BUILD_CMDS
@@ -16,6 +16,8 @@ define GENROMFS_BUILD_CMDS
 		LDFLAGS="$(TARGET_LDFLAGS)"
 endef
 
+# "PREFIX" is the equivalent of DESTDIR in autotools, "prefix" is the
+# traditional prefix. "prefix" defaults to /usr so no need to set it.
 define GENROMFS_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install
 endef
@@ -25,7 +27,7 @@ define HOST_GENROMFS_BUILD_CMDS
 endef
 
 define HOST_GENROMFS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/geoip/geoip.hash b/bsp/buildroot/package/geoip/geoip.hash
index 505c38f9..2b1f7433 100644
--- a/bsp/buildroot/package/geoip/geoip.hash
+++ b/bsp/buildroot/package/geoip/geoip.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  4b446491843de67c1af9b887da17a3e5939e0aeed4826923a5f4bf09d845096f  GeoIP-1.6.9.tar.gz
+sha256 b0e5a92200b5ab540d118983f7b7191caf4faf1ae879c44afa3ff2a2abcdb0f5  GeoIP-1.6.11.tar.gz
diff --git a/bsp/buildroot/package/geoip/geoip.mk b/bsp/buildroot/package/geoip/geoip.mk
index cf3bc1a0..030c7b36 100644
--- a/bsp/buildroot/package/geoip/geoip.mk
+++ b/bsp/buildroot/package/geoip/geoip.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GEOIP_VERSION = 1.6.9
+GEOIP_VERSION = 1.6.11
 GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
 GEOIP_SITE = https://github.com/maxmind/geoip-api-c/releases/download/v$(GEOIP_VERSION)
 GEOIP_INSTALL_STAGING = YES
-GEOIP_LICENSE = LGPLv2.1+
+GEOIP_LICENSE = LGPL-2.1+
 GEOIP_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gesftpserver/Config.in b/bsp/buildroot/package/gesftpserver/Config.in
index 81cbce9f..bce47700 100644
--- a/bsp/buildroot/package/gesftpserver/Config.in
+++ b/bsp/buildroot/package/gesftpserver/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_GESFTPSERVER
 	bool "gesftpserver"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  Green End SFTP Server
 
diff --git a/bsp/buildroot/package/gesftpserver/gesftpserver.mk b/bsp/buildroot/package/gesftpserver/gesftpserver.mk
index 2fadfe5c..58c6270a 100644
--- a/bsp/buildroot/package/gesftpserver/gesftpserver.mk
+++ b/bsp/buildroot/package/gesftpserver/gesftpserver.mk
@@ -7,7 +7,7 @@
 GESFTPSERVER_VERSION = 0.2.2
 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz
 GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver
-GESFTPSERVER_LICENSE = GPLv2+
+GESFTPSERVER_LICENSE = GPL-2.0+
 GESFTPSERVER_LICENSE_FILES = COPYING
 # forgets to link against pthread when cross compiling
 GESFTPSERVER_CONF_ENV = LIBS=-lpthread
diff --git a/bsp/buildroot/package/getent/getent.mk b/bsp/buildroot/package/getent/getent.mk
index ed249e8d..4e3eaea0 100644
--- a/bsp/buildroot/package/getent/getent.mk
+++ b/bsp/buildroot/package/getent/getent.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GETENT_LICENSE = LGPLv2.1+
+GETENT_LICENSE = LGPL-2.1+
 
 # For glibc toolchains, we use the getent program built/installed by
 # the C library. For other toolchains, we use the wrapper script
diff --git a/bsp/buildroot/package/gettext/0002-Update-after-gnulib-changed.patch b/bsp/buildroot/package/gettext/0002-Update-after-gnulib-changed.patch
new file mode 100644
index 00000000..5f5e5f6c
--- /dev/null
+++ b/bsp/buildroot/package/gettext/0002-Update-after-gnulib-changed.patch
@@ -0,0 +1,86 @@
+From a6f9caf8cc7614665d1be694485dd7bc30399e0f Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Tue, 16 May 2017 00:27:57 +0200
+Subject: [PATCH] Update after gnulib changed.
+
+For buildroot we only need to update wint_t.m4 to fix autoreconf with
+certain packages which already contain the updated version of this file.
+Otherwise autoreconf will break:
+
+http://git.net/ml/bug-gnulib-gnu/2017-01/msg00067.html
+https://git.busybox.net/buildroot/commit/package/wget?id=c36f0d65ad63589f1b21833ef53d429c018b6f8a
+
+Patch backported from upstream commit:
+http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=a6f9caf8cc7614665d1be694485dd7bc30399e0f
+
+Needed for coreutils bump to 8.27
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff --git a/gettext-runtime/m4/wint_t.m4 b/gettext-runtime/m4/wint_t.m4
+index 8ff2a5b5a..d30b8bcf8 100644
+--- a/gettext-runtime/m4/wint_t.m4
++++ b/gettext-runtime/m4/wint_t.m4
+@@ -1,11 +1,12 @@
+-# wint_t.m4 serial 5 (gettext-0.18.2)
+-dnl Copyright (C) 2003, 2007-2016 Free Software Foundation, Inc.
++# wint_t.m4 serial 7
++dnl Copyright (C) 2003, 2007-2017 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ 
+ dnl From Bruno Haible.
+-dnl Test whether <wchar.h> has the 'wint_t' type.
++dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's
++dnl <wchar.h> or <wctype.h> would, if present, override 'wint_t'.
+ dnl Prerequisite: AC_PROG_CC
+ 
+ AC_DEFUN([gt_TYPE_WINT_T],
+@@ -28,5 +29,46 @@ AC_DEFUN([gt_TYPE_WINT_T],
+        [gt_cv_c_wint_t=no])])
+   if test $gt_cv_c_wint_t = yes; then
+     AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.])
++
++    dnl Determine whether gnulib's <wchar.h> or <wctype.h> would, if present,
++    dnl override 'wint_t'.
++    AC_CACHE_CHECK([whether wint_t is too small],
++      [gl_cv_type_wint_t_too_small],
++      [AC_COMPILE_IFELSE(
++           [AC_LANG_PROGRAM([[
++/* Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before
++   <wchar.h>.
++   BSD/OS 4.0.1 has a bug: <stddef.h>, <stdio.h> and <time.h> must be
++   included before <wchar.h>.  */
++#if !(defined __GLIBC__ && !defined __UCLIBC__)
++# include <stddef.h>
++# include <stdio.h>
++# include <time.h>
++#endif
++#include <wchar.h>
++              int verify[sizeof (wint_t) < sizeof (int) ? -1 : 1];
++              ]])],
++           [gl_cv_type_wint_t_too_small=no],
++           [gl_cv_type_wint_t_too_small=yes])])
++    if test $gl_cv_type_wint_t_too_small = yes; then
++      GNULIB_OVERRIDES_WINT_T=1
++    else
++      GNULIB_OVERRIDES_WINT_T=0
++    fi
++  else
++    GNULIB_OVERRIDES_WINT_T=0
++  fi
++  AC_SUBST([GNULIB_OVERRIDES_WINT_T])
++])
++
++dnl Prerequisites of the 'wint_t' override.
++AC_DEFUN([gl_TYPE_WINT_T_PREREQ],
++[
++  AC_CHECK_HEADERS_ONCE([crtdefs.h])
++  if test $ac_cv_header_crtdefs_h = yes; then
++    HAVE_CRTDEFS_H=1
++  else
++    HAVE_CRTDEFS_H=0
+   fi
++  AC_SUBST([HAVE_CRTDEFS_H])
+ ])
diff --git a/bsp/buildroot/package/gettext/Config.in b/bsp/buildroot/package/gettext/Config.in
index 7871a480..e55663b1 100644
--- a/bsp/buildroot/package/gettext/Config.in
+++ b/bsp/buildroot/package/gettext/Config.in
@@ -12,6 +12,14 @@ config BR2_PACKAGE_GETTEXT
 
 	  http://www.gnu.org/software/gettext/
 
+if BR2_PACKAGE_GETTEXT
+
+config BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL
+	bool
+	default y if BR2_SYSTEM_ENABLE_NLS
+	depends on !BR2_TOOLCHAIN_HAS_FULL_GETTEXT
+
+endif
+
 comment "gettext needs a toolchain w/ wchar"
-	depends on BR2_NEEDS_GETTEXT
 	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/gettext/gettext.hash b/bsp/buildroot/package/gettext/gettext.hash
index cff6eb10..a2ab2987 100644
--- a/bsp/buildroot/package/gettext/gettext.hash
+++ b/bsp/buildroot/package/gettext/gettext.hash
@@ -1,3 +1,5 @@
 # From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html
 md5	df3f5690eaa30fd228537b00cb7b7590	gettext-0.19.8.1.tar.xz
 sha1	e0fe90ede22f7f16bbde7bdea791a835f2773fc9	gettext-0.19.8.1.tar.xz
+# License files, locally calculated
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/bsp/buildroot/package/gettext/gettext.mk b/bsp/buildroot/package/gettext/gettext.mk
index 1435388e..ec9588f8 100644
--- a/bsp/buildroot/package/gettext/gettext.mk
+++ b/bsp/buildroot/package/gettext/gettext.mk
@@ -8,9 +8,10 @@ GETTEXT_VERSION = 0.19.8.1
 GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext
 GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz
 GETTEXT_INSTALL_STAGING = YES
-GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPLv3+ (the rest)
+GETTEXT_LICENSE = LGPL-2.1+ (libintl), GPL-3.0+ (the rest)
 GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB
-
+# 0002-Update-after-gnulib-changed.patch
+GETTEXT_AUTORECONF = YES
 GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 # Avoid using the bundled subset of libxml2
@@ -38,6 +39,14 @@ HOST_GETTEXT_CONF_OPTS = \
 	--disable-relocatable \
 	--without-emacs
 
+# Force the build of libintl, even if the C library provides a stub
+# gettext implementation
+ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
+GETTEXT_CONF_OPTS += --with-included-gettext
+else
+GETTEXT_CONF_OPTS += --without-included-gettext
+endif
+
 # For the target version, we only need the runtime, and for the host
 # version, we only need the tools.
 GETTEXT_SUBDIR = gettext-runtime
@@ -71,7 +80,7 @@ endif
 
 # Disable interactive confirmation in host gettextize for package fixups
 define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
-	$(SED) '/read dummy/d' $(HOST_DIR)/usr/bin/gettextize
+	$(SED) '/read dummy/d' $(HOST_DIR)/bin/gettextize
 endef
 HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
 
@@ -80,12 +89,12 @@ HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION
 # host, so do it manually
 define HOST_GETTEXT_ADD_ABOUT_NLS
 	$(INSTALL) -m 0644 $(@D)/$(HOST_GETTEXT_SUBDIR)/ABOUT-NLS \
-		$(HOST_DIR)/usr/share/gettext/ABOUT-NLS
+		$(HOST_DIR)/share/gettext/ABOUT-NLS
 endef
 
 HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_ADD_ABOUT_NLS
 
-GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/usr/bin/autom4te $(HOST_DIR)/usr/bin/gettextize -f
+GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/bin/autom4te $(HOST_DIR)/bin/gettextize -f
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/gflags/gflags.hash b/bsp/buildroot/package/gflags/gflags.hash
index 5b224113..3cae2b03 100644
--- a/bsp/buildroot/package/gflags/gflags.hash
+++ b/bsp/buildroot/package/gflags/gflags.hash
@@ -1,2 +1,5 @@
 # Locally computed
-sha256	d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662	gflags-v2.1.2.tar.gz
+sha256	466c36c6508a451734e4f4d76825cf9cd9b8716d2b70ef36479ae40f08271f88	gflags-v2.2.0.tar.gz
+
+# Hash for license file:
+sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5  COPYING.txt
diff --git a/bsp/buildroot/package/gflags/gflags.mk b/bsp/buildroot/package/gflags/gflags.mk
index 89111ed9..45186a33 100644
--- a/bsp/buildroot/package/gflags/gflags.mk
+++ b/bsp/buildroot/package/gflags/gflags.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GFLAGS_VERSION = v2.1.2
+GFLAGS_VERSION = v2.2.0
 GFLAGS_SITE = $(call github,gflags,gflags,$(GFLAGS_VERSION))
 GFLAGS_INSTALL_STAGING = YES
-GFLAGS_LICENSE = BSD-3c
+GFLAGS_LICENSE = BSD-3-Clause
 GFLAGS_LICENSE_FILES = COPYING.txt
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
diff --git a/bsp/buildroot/package/ghostscript-fonts/Config.in b/bsp/buildroot/package/ghostscript-fonts/Config.in
index 80bfbd03..9b9b8d0c 100644
--- a/bsp/buildroot/package/ghostscript-fonts/Config.in
+++ b/bsp/buildroot/package/ghostscript-fonts/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GHOSTSCRIPT_FONTS
 	bool "ghostscript-fonts"
 	help
-	  Fonts and font metrics customarily distributed with Ghostscript.
-	  Currently includes the 35 standard PostScript fonts and a
-	  grab-bag of others.
+	  Fonts and font metrics customarily distributed with
+	  Ghostscript. Currently includes the 35 standard PostScript
+	  fonts and a grab-bag of others.
 
 	  http://sourceforge.net/projects/gs-fonts
diff --git a/bsp/buildroot/package/ghostscript-fonts/ghostscript-fonts.mk b/bsp/buildroot/package/ghostscript-fonts/ghostscript-fonts.mk
index fa5c4b7e..156eb4c3 100644
--- a/bsp/buildroot/package/ghostscript-fonts/ghostscript-fonts.mk
+++ b/bsp/buildroot/package/ghostscript-fonts/ghostscript-fonts.mk
@@ -7,7 +7,7 @@
 GHOSTSCRIPT_FONTS_VERSION = 8.11
 GHOSTSCRIPT_FONTS_SITE = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29
 GHOSTSCRIPT_FONTS_SOURCE = ghostscript-fonts-std-$(GHOSTSCRIPT_FONTS_VERSION).tar.gz
-GHOSTSCRIPT_FONTS_LICENSE = GPLv2
+GHOSTSCRIPT_FONTS_LICENSE = GPL-2.0
 GHOSTSCRIPT_FONTS_LICENSE_FILES = COPYING
 
 GHOSTSCRIPT_FONTS_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/gs
diff --git a/bsp/buildroot/package/ghostscript/0001-Fix-cross-compilation-issue.patch b/bsp/buildroot/package/ghostscript/0001-Fix-cross-compilation-issue.patch
new file mode 100644
index 00000000..a13c7f83
--- /dev/null
+++ b/bsp/buildroot/package/ghostscript/0001-Fix-cross-compilation-issue.patch
@@ -0,0 +1,36 @@
+From 5fed765abb8ff07c381cc3ebb9367e9560f7a658 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Mon, 20 Mar 2017 23:43:03 +0100
+Subject: [PATCH] Fix cross compilation issue
+
+Without this patch unsafe paths are used:
+x86_64-linux-gcc: ERROR: unsafe header/library path used in cross-compilation: '/libtiff'
+
+Downloaded from
+http://bugs.ghostscript.com/show_bug.cgi?id=696508#c3
+
+Slightly updated to work with 9.23
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d0f62d7..0d49344 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1173,7 +1173,7 @@ XPSWRITEDEVICE=''
+ 
+ 
+ LIBTIFFDIR='src'
+-LIBTIFFCONFDIR=''
++LIBTIFFCONFDIR='src'
+ TIFFCFLAGS=''
+ 
+ TIFFDEVS_ALL='tiffs tiff12nc tiff24nc tiff48nc tiff32nc tiff64nc tiffcrle tifflzw tiffpack tiffgray tiffsep tiffsep1 tiffscaled tiffscaled4 tiffscaled8 tiffscaled24 tiffscaled32'
+ FAX_DEVS_ALL='cfax dfaxlow dfaxhigh fax faxg3 faxg32d faxg4 tiffg3 tiffg32d tiffg4 tfax'
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch b/bsp/buildroot/package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch
deleted file mode 100644
index becdc660..00000000
--- a/bsp/buildroot/package/ghostscript/0003-Bug-697799-have-.eqproc-check-its-parameters.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4f83478c88c2e05d6e8d79ca4557eb039354d2f3 Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Thu, 27 Apr 2017 13:03:33 +0100
-Subject: [PATCH] Bug 697799: have .eqproc check its parameters
-
-The Ghostscript custom operator .eqproc was not check the number or type of
-the parameters it was given.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- psi/zmisc3.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/psi/zmisc3.c b/psi/zmisc3.c
-index 54b304246..37293ff4b 100644
---- a/psi/zmisc3.c
-+++ b/psi/zmisc3.c
-@@ -56,6 +56,12 @@ zeqproc(i_ctx_t *i_ctx_p)
-     ref2_t stack[MAX_DEPTH + 1];
-     ref2_t *top = stack;
- 
-+    if (ref_stack_count(&o_stack) < 2)
-+        return_error(gs_error_stackunderflow);
-+    if (!r_is_array(op - 1) || !r_is_array(op)) {
-+        return_error(gs_error_typecheck);
-+    }
-+
-     make_array(&stack[0].proc1, 0, 1, op - 1);
-     make_array(&stack[0].proc2, 0, 1, op);
-     for (;;) {
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch b/bsp/buildroot/package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch
deleted file mode 100644
index 9ba170b3..00000000
--- a/bsp/buildroot/package/ghostscript/0004-Bug-697799-have-.rsdparams-check-its-parameters.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 04b37bbce174eed24edec7ad5b920eb93db4d47d Mon Sep 17 00:00:00 2001
-From: Chris Liddell <chris.liddell@artifex.com>
-Date: Thu, 27 Apr 2017 13:21:31 +0100
-Subject: [PATCH] Bug 697799: have .rsdparams check its parameters
-
-The Ghostscript internal operator .rsdparams wasn't checking the number or
-type of the operands it was being passed. Do so.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- psi/zfrsd.c | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/psi/zfrsd.c b/psi/zfrsd.c
-index 191107d8a..950588d69 100644
---- a/psi/zfrsd.c
-+++ b/psi/zfrsd.c
-@@ -49,13 +49,20 @@ zrsdparams(i_ctx_t *i_ctx_p)
-     ref *pFilter;
-     ref *pDecodeParms;
-     int Intent = 0;
--    bool AsyncRead;
-+    bool AsyncRead = false;
-     ref empty_array, filter1_array, parms1_array;
-     uint i;
--    int code;
-+    int code = 0;
-+
-+    if (ref_stack_count(&o_stack) < 1)
-+        return_error(gs_error_stackunderflow);
-+    if (!r_has_type(op, t_dictionary) && !r_has_type(op, t_null)) {
-+        return_error(gs_error_typecheck);
-+    }
- 
-     make_empty_array(&empty_array, a_readonly);
--    if (dict_find_string(op, "Filter", &pFilter) > 0) {
-+    if (r_has_type(op, t_dictionary)
-+        && dict_find_string(op, "Filter", &pFilter) > 0) {
-         if (!r_is_array(pFilter)) {
-             if (!r_has_type(pFilter, t_name))
-                 return_error(gs_error_typecheck);
-@@ -94,12 +101,13 @@ zrsdparams(i_ctx_t *i_ctx_p)
-                 return_error(gs_error_typecheck);
-         }
-     }
--    code = dict_int_param(op, "Intent", 0, 3, 0, &Intent);
-+    if (r_has_type(op, t_dictionary))
-+        code = dict_int_param(op, "Intent", 0, 3, 0, &Intent);
-     if (code < 0 && code != gs_error_rangecheck) /* out-of-range int is ok, use 0 */
-         return code;
--    if ((code = dict_bool_param(op, "AsyncRead", false, &AsyncRead)) < 0
--        )
--        return code;
-+    if (r_has_type(op, t_dictionary))
-+        if ((code = dict_bool_param(op, "AsyncRead", false, &AsyncRead)) < 0)
-+            return code;
-     push(1);
-     op[-1] = *pFilter;
-     if (pDecodeParms)
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/ghostscript/Config.in b/bsp/buildroot/package/ghostscript/Config.in
new file mode 100644
index 00000000..023ef5f2
--- /dev/null
+++ b/bsp/buildroot/package/ghostscript/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_GHOSTSCRIPT
+	bool "ghostscript"
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_GHOSTSCRIPT_FONTS
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LCMS2
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_TIFF
+	help
+	  Ghostscript is an interpreter for PostScript and Portable
+	  Document Format (PDF) files.
+
+	  http://ghostscript.com
diff --git a/bsp/buildroot/package/ghostscript/ghostscript.hash b/bsp/buildroot/package/ghostscript/ghostscript.hash
new file mode 100644
index 00000000..f8ca6c8d
--- /dev/null
+++ b/bsp/buildroot/package/ghostscript/ghostscript.hash
@@ -0,0 +1,5 @@
+# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925/SHA512SUMS
+sha512 7a1c0b7546ed523f50c1452d4a1c13fcf043d6060fc9708bbc4b543f66ecb1b619b6e71998094ac702ef44a2fd159b6523271de19b1cae352981ef51fb637651  ghostscript-9.25.tar.xz
+
+# Hash for license file:
+sha256 6f852249f975287b3efd43a5883875e47fa9f3125e2f1b18b5c09517ac30ecf2  LICENSE
diff --git a/bsp/buildroot/package/ghostscript/ghostscript.mk b/bsp/buildroot/package/ghostscript/ghostscript.mk
new file mode 100644
index 00000000..b1f5e1ed
--- /dev/null
+++ b/bsp/buildroot/package/ghostscript/ghostscript.mk
@@ -0,0 +1,64 @@
+################################################################################
+#
+# ghostscript
+#
+################################################################################
+
+GHOSTSCRIPT_VERSION = 9.25
+GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs925
+GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz
+GHOSTSCRIPT_LICENSE = AGPL-3.0
+GHOSTSCRIPT_LICENSE_FILES = LICENSE
+# 0001-Fix-cross-compilation-issue.patch
+GHOSTSCRIPT_AUTORECONF = YES
+GHOSTSCRIPT_DEPENDENCIES = \
+	host-lcms2 \
+	host-libjpeg \
+	host-pkgconf \
+	host-zlib \
+	fontconfig \
+	ghostscript-fonts \
+	jpeg \
+	lcms2 \
+	libpng \
+	tiff
+
+# Ghostscript includes (old) copies of several libraries, delete them.
+# Inspired by linuxfromscratch:
+# http://www.linuxfromscratch.org/blfs/view/svn/pst/gs.html
+define GHOSTSCRIPT_REMOVE_LIBS
+	rm -rf $(@D)/freetype $(@D)/ijs $(@D)/jpeg $(@D)/lcms2mt \
+		$(@D)/libpng $(@D)/tiff $(@D)/zlib
+endef
+GHOSTSCRIPT_POST_PATCH_HOOKS += GHOSTSCRIPT_REMOVE_LIBS
+
+GHOSTSCRIPT_CONF_ENV = \
+	CCAUX="$(HOSTCC)" \
+	CFLAGSAUX="$(HOST_CFLAGS) $(HOST_LDFLAGS)"
+
+GHOSTSCRIPT_CONF_OPTS = \
+	--disable-compile-inits \
+	--disable-cups \
+	--enable-fontconfig \
+	--with-fontpath=/usr/share/fonts \
+	--enable-freetype \
+	--disable-gtk \
+	--without-jbig2dec \
+	--without-libpaper \
+	--with-system-libtiff
+
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+GHOSTSCRIPT_DEPENDENCIES += libidn
+GHOSTSCRIPT_CONF_OPTS += --with-libidn
+else
+GHOSTSCRIPT_CONF_OPTS += --without-libidn
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
+GHOSTSCRIPT_DEPENDENCIES += xlib_libX11
+GHOSTSCRIPT_CONF_OPTS += --with-x
+else
+GHOSTSCRIPT_CONF_OPTS += --without-x
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/giflib/giflib.mk b/bsp/buildroot/package/giflib/giflib.mk
index 799ae732..c1471de4 100644
--- a/bsp/buildroot/package/giflib/giflib.mk
+++ b/bsp/buildroot/package/giflib/giflib.mk
@@ -13,8 +13,8 @@ GIFLIB_LICENSE_FILES = COPYING
 
 GIFLIB_BINS = \
 	gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifbuild gifburst gifclip \
-	gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip  \
-	gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat     \
+	gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip \
+	gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \
 	gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \
 	text2gif
 
diff --git a/bsp/buildroot/package/git-crypt/git-crypt.mk b/bsp/buildroot/package/git-crypt/git-crypt.mk
index 7785ddcf..6cae456f 100644
--- a/bsp/buildroot/package/git-crypt/git-crypt.mk
+++ b/bsp/buildroot/package/git-crypt/git-crypt.mk
@@ -7,7 +7,7 @@
 GIT_CRYPT_VERSION = 0.5.0
 GIT_CRYPT_SITE = https://www.agwa.name/projects/git-crypt/downloads
 GIT_CRYPT_DEPENDENCIES = host-pkgconf openssl
-GIT_CRYPT_LICENSE = GPLv3+, MIT
+GIT_CRYPT_LICENSE = GPL-3.0+, MIT
 GIT_CRYPT_LICENSE_FILES = COPYING parse_options.hpp
 
 GIT_CRYPT_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl`
diff --git a/bsp/buildroot/package/git/Config.in b/bsp/buildroot/package/git/Config.in
index 9babbecf..d53921d7 100644
--- a/bsp/buildroot/package/git/Config.in
+++ b/bsp/buildroot/package/git/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_GIT
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
-	  Git is a free and open source distributed version control system
-	  designed to handle everything from small to very large projects.
+	  Git is a free and open source distributed version control
+	  system designed to handle everything from small to very large
+	  projects.
 
 	  http://git-scm.com
diff --git a/bsp/buildroot/package/git/git.hash b/bsp/buildroot/package/git/git.hash
index bc81f23a..4bcc5ee5 100644
--- a/bsp/buildroot/package/git/git.hash
+++ b/bsp/buildroot/package/git/git.hash
@@ -1,2 +1,4 @@
 # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc
-sha256 a8c3b3c7dd9202d0e80f824ceb74b4340b60aa8f1ec4ffdde3e982fa5ae16eab  git-2.12.5.tar.xz
+sha256 6e69b0e9c487e5da52a14d4829f0b6a28b2c18a0bb6fb67c0dc8b5b5658bd532  git-2.16.4.tar.xz
+sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e  COPYING
+sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a  LGPL-2.1
diff --git a/bsp/buildroot/package/git/git.mk b/bsp/buildroot/package/git/git.mk
index 8ce29fca..ac7b8f2e 100644
--- a/bsp/buildroot/package/git/git.mk
+++ b/bsp/buildroot/package/git/git.mk
@@ -4,16 +4,12 @@
 #
 ################################################################################
 
-GIT_VERSION = 2.12.5
+GIT_VERSION = 2.16.4
 GIT_SOURCE = git-$(GIT_VERSION).tar.xz
-GIT_SITE = https://www.kernel.org/pub/software/scm/git
-GIT_LICENSE = GPLv2, LGPLv2.1+
+GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git
+GIT_LICENSE = GPL-2.0, LGPL-2.1+
 GIT_LICENSE_FILES = COPYING LGPL-2.1
-GIT_DEPENDENCIES = zlib host-gettext
-
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-GIT_DEPENDENCIES += gettext
-endif
+GIT_DEPENDENCIES = zlib $(TARGET_NLS_DEPENDENCIES)
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 GIT_DEPENDENCIES += openssl
@@ -23,9 +19,13 @@ else
 GIT_CONF_OPTS += --without-openssl
 endif
 
-ifeq ($(BR2_PACKAGE_PCRE),y)
+ifeq ($(BR2_PACKAGE_PCRE2),y)
+GIT_DEPENDENCIES += pcre2
+GIT_CONF_OPTS += --with-libpcre2
+else ifeq ($(BR2_PACKAGE_PCRE),y)
 GIT_DEPENDENCIES += pcre
-GIT_CONF_OPTS += --with-libpcre
+GIT_CONF_OPTS += --with-libpcre1
+GIT_MAKE_OPTS += NO_LIBPCRE1_JIT=1
 else
 GIT_CONF_OPTS += --without-libpcre
 endif
@@ -33,7 +33,7 @@ endif
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 GIT_DEPENDENCIES += libcurl
 GIT_CONF_OPTS += --with-curl
-GIT_CONF_ENV +=	\
+GIT_CONF_ENV += \
 	ac_cv_prog_curl_config=$(STAGING_DIR)/usr/bin/$(LIBCURL_CONFIG_SCRIPTS)
 else
 GIT_CONF_OPTS += --without-curl
@@ -61,6 +61,12 @@ else
 GIT_CONF_OPTS += --without-tcltk
 endif
 
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
+GIT_MAKE_OPTS += NO_GETTEXT=1
+endif
+
+GIT_INSTALL_TARGET_OPTS = $(GIT_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+
 # assume yes for these tests, configure will bail out otherwise
 # saying error: cannot run test program while cross compiling
 GIT_CONF_ENV += \
diff --git a/bsp/buildroot/package/glib-networking/Config.in b/bsp/buildroot/package/glib-networking/Config.in
index 01d8552f..ec296239 100644
--- a/bsp/buildroot/package/glib-networking/Config.in
+++ b/bsp/buildroot/package/glib-networking/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_GLIB_NETWORKING
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  Network-related GIO modules for glib.
 
diff --git a/bsp/buildroot/package/glib-networking/glib-networking.mk b/bsp/buildroot/package/glib-networking/glib-networking.mk
index d3077e9a..10a3b706 100644
--- a/bsp/buildroot/package/glib-networking/glib-networking.mk
+++ b/bsp/buildroot/package/glib-networking/glib-networking.mk
@@ -10,13 +10,13 @@ GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(
 GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
 GLIB_NETWORKING_INSTALL_STAGING = YES
 GLIB_NETWORKING_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	host-intltool \
 	libglib2
 GLIB_NETWORKING_CONF_OPTS = \
 	--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
-GLIB_NETWORKING_LICENSE = LGPLv2+
+GLIB_NETWORKING_LICENSE = LGPL-2.0+
 GLIB_NETWORKING_LICENSE_FILES = COPYING
 GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
 	GIO_MODULE_DIR=/usr/lib/gio/modules install
diff --git a/bsp/buildroot/package/glibc/2.22/0001-fix-CVE-2015-7547.patch b/bsp/buildroot/package/glibc/2.22/0001-fix-CVE-2015-7547.patch
deleted file mode 100644
index 19b8b6eb..00000000
--- a/bsp/buildroot/package/glibc/2.22/0001-fix-CVE-2015-7547.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-Fetched from gentoo glibc patchball
-Original patch filename: 10_all_glibc-CVE-2015-7547.patch
-Based on: https://sourceware.org/ml/libc-alpha/2016-02/msg00416.html
-
-Fixes:
-CVE-2015-7547 - glibc getaddrinfo stack-based buffer overflow.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
-   int h_namelen = 0;
- 
-   if (ancount == 0)
--    return NSS_STATUS_NOTFOUND;
-+    {
-+      *h_errnop = HOST_NOT_FOUND;
-+      return NSS_STATUS_NOTFOUND;
-+    }
- 
-   while (ancount-- > 0 && cp < end_of_message && had_error == 0)
-     {
-@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
-   /* Special case here: if the resolver sent a result but it only
-      contains a CNAME while we are looking for a T_A or T_AAAA record,
-      we fail with NOTFOUND instead of TRYAGAIN.  */
--  return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
-+  if (canon != NULL)
-+    {
-+      *h_errnop = HOST_NOT_FOUND;
-+      return NSS_STATUS_NOTFOUND;
-+    }
-+
-+  *h_errnop = NETDB_INTERNAL;
-+  return NSS_STATUS_TRYAGAIN;
- }
- 
- 
-@@ -1242,8 +1252,15 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2,
- 						     &pat, &buffer, &buflen,
- 						     errnop, h_errnop, ttlp,
- 						     &first);
-+      /* Use the second response status in some cases.  */
-       if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
- 	status = status2;
-+      /* Do not return a truncated second response (unless it was
-+         unavoidable e.g. unrecoverable TRYAGAIN).  */
-+      if (status == NSS_STATUS_SUCCESS
-+	  && (status2 == NSS_STATUS_TRYAGAIN
-+	      && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
-+	status = NSS_STATUS_TRYAGAIN;
-     }
- 
-   return status;
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp,
- 		  {
- 		    free (*answerp2);
- 		    *answerp2 = NULL;
-+		    *nanswerp2 = 0;
- 		    *answerp2_malloced = 0;
- 		  }
- 	}
-@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp,
- 			  {
- 			    free (*answerp2);
- 			    *answerp2 = NULL;
-+			    *nanswerp2 = 0;
- 			    *answerp2_malloced = 0;
- 			  }
- 
-@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp,
- 	  {
- 	    free (*answerp2);
- 	    *answerp2 = NULL;
-+	    *nanswerp2 = 0;
- 	    *answerp2_malloced = 0;
- 	  }
- 	if (saved_herrno != -1)
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -639,11 +639,7 @@ send_vc(res_state statp,
- {
- 	const HEADER *hp = (HEADER *) buf;
- 	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
--	// XXX REMOVE
--	// int anssiz = *anssizp;
--	HEADER *anhp = (HEADER *) ans;
-+	HEADER *anhp = (HEADER *) *ansp;
- 	struct sockaddr *nsap = get_nsaddr (statp, ns);
- 	int truncating, connreset, n;
- 	/* On some architectures compiler might emit a warning indicating
-@@ -767,35 +763,6 @@ send_vc(res_state statp,
- 		assert (anscp != NULL || ansp2 == NULL);
- 		thisresplenp = &resplen;
- 	} else {
--		if (*anssizp != MAXPACKET) {
--			/* No buffer allocated for the first
--			   reply.  We can try to use the rest
--			   of the user-provided buffer.  */
--#if __GNUC_PREREQ (4, 7)
--			DIAG_PUSH_NEEDS_COMMENT;
--			DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
--#endif
--#if _STRING_ARCH_unaligned
--			*anssizp2 = orig_anssizp - resplen;
--			*ansp2 = *ansp + resplen;
--#else
--			int aligned_resplen
--			  = ((resplen + __alignof__ (HEADER) - 1)
--			     & ~(__alignof__ (HEADER) - 1));
--			*anssizp2 = orig_anssizp - aligned_resplen;
--			*ansp2 = *ansp + aligned_resplen;
--#endif
--#if __GNUC_PREREQ (4, 7)
--			DIAG_POP_NEEDS_COMMENT;
--#endif
--		} else {
--			/* The first reply did not fit into the
--			   user-provided buffer.  Maybe the second
--			   answer will.  */
--			*anssizp2 = orig_anssizp;
--			*ansp2 = *ansp;
--		}
--
- 		thisanssizp = anssizp2;
- 		thisansp = ansp2;
- 		thisresplenp = resplen2;
-@@ -804,10 +771,14 @@ send_vc(res_state statp,
- 	anhp = (HEADER *) *thisansp;
- 
- 	*thisresplenp = rlen;
--	if (rlen > *thisanssizp) {
--		/* Yes, we test ANSCP here.  If we have two buffers
--		   both will be allocatable.  */
--		if (__glibc_likely (anscp != NULL))       {
-+	/* Is the answer buffer too small?  */
-+	if (*thisanssizp < rlen) {
-+		/* If the current buffer is not the the static
-+		   user-supplied buffer then we can reallocate
-+		   it.  */
-+		if (thisansp != NULL && thisansp != ansp) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *newp = malloc (MAXPACKET);
- 			if (newp == NULL) {
- 				*terrno = ENOMEM;
-@@ -957,8 +928,6 @@ send_dg(res_state statp,
- {
- 	const HEADER *hp = (HEADER *) buf;
- 	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
- 	struct timespec now, timeout, finish;
- 	struct pollfd pfd[1];
- 	int ptimeout;
-@@ -1154,50 +1123,48 @@ send_dg(res_state statp,
- 			assert (anscp != NULL || ansp2 == NULL);
- 			thisresplenp = &resplen;
- 		} else {
--			if (*anssizp != MAXPACKET) {
--				/* No buffer allocated for the first
--				   reply.  We can try to use the rest
--				   of the user-provided buffer.  */
--#if _STRING_ARCH_unaligned
--				*anssizp2 = orig_anssizp - resplen;
--				*ansp2 = *ansp + resplen;
--#else
--				int aligned_resplen
--				  = ((resplen + __alignof__ (HEADER) - 1)
--				     & ~(__alignof__ (HEADER) - 1));
--				*anssizp2 = orig_anssizp - aligned_resplen;
--				*ansp2 = *ansp + aligned_resplen;
--#endif
--			} else {
--				/* The first reply did not fit into the
--				   user-provided buffer.  Maybe the second
--				   answer will.  */
--				*anssizp2 = orig_anssizp;
--				*ansp2 = *ansp;
--			}
--
- 			thisanssizp = anssizp2;
- 			thisansp = ansp2;
- 			thisresplenp = resplen2;
- 		}
- 
- 		if (*thisanssizp < MAXPACKET
--		    /* Yes, we test ANSCP here.  If we have two buffers
--		       both will be allocatable.  */
--		    && anscp
-+		    /* If the current buffer is not the the static
-+		       user-supplied buffer then we can reallocate
-+		       it.  */
-+		    && (thisansp != NULL && thisansp != ansp)
- #ifdef FIONREAD
-+		    /* Is the size too small?  */
- 		    && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
- 			|| *thisanssizp < *thisresplenp)
- #endif
-                     ) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *newp = malloc (MAXPACKET);
- 			if (newp != NULL) {
--				*anssizp = MAXPACKET;
--				*thisansp = ans = newp;
-+				*thisanssizp = MAXPACKET;
-+				*thisansp = newp;
- 				if (thisansp == ansp2)
- 				  *ansp2_malloced = 1;
- 			}
- 		}
-+		/* We could end up with truncation if anscp was NULL
-+		   (not allowed to change caller's buffer) and the
-+		   response buffer size is too small.  This isn't a
-+		   reliable way to detect truncation because the ioctl
-+		   may be an inaccurate report of the UDP message size.
-+		   Therefore we use this only to issue debug output.
-+		   To do truncation accurately with UDP we need
-+		   MSG_TRUNC which is only available on Linux.  We
-+		   can abstract out the Linux-specific feature in the
-+		   future to detect truncation.  */
-+		if (__glibc_unlikely (*thisanssizp < *thisresplenp)) {
-+			Dprint(statp->options & RES_DEBUG,
-+			       (stdout, ";; response may be truncated (UDP)\n")
-+			);
-+		}
-+
- 		HEADER *anhp = (HEADER *) *thisansp;
- 		socklen_t fromlen = sizeof(struct sockaddr_in6);
- 		assert (sizeof(from) <= fromlen);
diff --git a/bsp/buildroot/package/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch b/bsp/buildroot/package/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch
deleted file mode 100644
index 28f4b6e0..00000000
--- a/bsp/buildroot/package/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8415fb8d4f05c023b9d79e44dff197cc285fd1e5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 6 Aug 2015 02:10:46 -0400
-Subject: [PATCH] microblaze: include unix/sysdep.h
-
-The semi-recent SYSCALL_CANCEL inclusion broke microblaze due to the
-sysdep.h header not including the unix/sysdep.h header.  Include it
-here like all other ports.
-
-(cherry picked from commit 5d5de49c3ccd69f65b801f1ca490a0112d1cbd7d)
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[edited to remove ChangeLog modifications, which cause conflicts.]
----
- sysdeps/unix/sysv/linux/microblaze/sysdep.h | 7 ++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
-index 83c0340..9d5c542 100644
---- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h
-@@ -16,8 +16,11 @@
-    License along with the GNU C Library; if not, see
-    <http://www.gnu.org/licenses/>.  */
- 
-+#ifndef _LINUX_MICROBLAZE_SYSDEP_H
-+#define _LINUX_MICROBLAZE_SYSDEP_H 1
-+
-+#include <sysdeps/unix/sysdep.h>
- #include <sysdeps/microblaze/sysdep.h>
--#include <sys/syscall.h>
- 
- /* Defines RTLD_PRIVATE_ERRNO.  */
- #include <dl-sysdep.h>
-@@ -305,3 +308,5 @@ SYSCALL_ERROR_LABEL_DCL:                            \
- # define PTR_DEMANGLE(var) (void) (var)
- 
- #endif /* not __ASSEMBLER__ */
-+
-+#endif /* _LINUX_MICROBLAZE_SYSDEP_H */
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/glibc/2.22/0003-fix-CVE-2016-3075.patch b/bsp/buildroot/package/glibc/2.22/0003-fix-CVE-2016-3075.patch
deleted file mode 100644
index 1ceb1f62..00000000
--- a/bsp/buildroot/package/glibc/2.22/0003-fix-CVE-2016-3075.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 883dceebc8f11921a9890211a4e202e5be17562f Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 29 Mar 2016 12:57:56 +0200
-Subject: [PATCH 1/1] CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879]
-
-The defensive copy is not needed because the name may not alias the
-output buffer.
-
-(cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4)
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(downloaded from upstream git repo and removed changes to Changelog:
- https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=883dceebc8f11921a9890211a4e202e5be17562f;hp=5a1a5f0dd2744044801c91bf2588444c29cda533)
----
- ChangeLog                    |    7 +++++++
- resolv/nss_dns/dns-network.c |    5 +----
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
-index 00f4490..89f8783 100644
---- a/resolv/nss_dns/dns-network.c
-+++ b/resolv/nss_dns/dns-network.c
-@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
-   } net_buffer;
-   querybuf *orig_net_buffer;
-   int anslen;
--  char *qbuf;
-   enum nss_status status;
- 
-   if (__res_maybe_init (&_res, 0) == -1)
-     return NSS_STATUS_UNAVAIL;
- 
--  qbuf = strdupa (name);
--
-   net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
- 
--  anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,
-+  anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf,
- 			       1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);
-   if (anslen < 0)
-     {
--- 
-1.7.1
-
diff --git a/bsp/buildroot/package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/bsp/buildroot/package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch
deleted file mode 100644
index 740b3221..00000000
--- a/bsp/buildroot/package/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Sat, 18 Jun 2016 19:11:23 +0200
-Subject: [PATCH] MIPS, SPARC: fix wrong vfork aliases in libpthread.so
-
-With recent binutils versions the GNU libc fails to build on at least
-MISP and SPARC, with this kind of error:
-
-  /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0'
-  /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here
-
-It appears that on these architectures pt-vfork.S includes vfork.S
-(through the alpha version of pt-vfork.S) and that the __vfork aliases
-are not conditionalized on IS_IN (libc) like on other architectures.
-Therefore the aliases are also wrongly included in libpthread.so.
-
-Fix this by properly conditionalizing the aliases like on other
-architectures.
-
-Changelog:
-	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize
-	hidden_def, weak_alias and strong_alias on [IS_IN (libc)].
-	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
-	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
-
-[Vincent: do not patch ChangeLog]
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- sysdeps/unix/sysv/linux/mips/vfork.S          | 2 ++
- sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 2 ++
- sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
-index 8c66151..c0c0ce6 100644
---- a/sysdeps/unix/sysv/linux/mips/vfork.S
-+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
-@@ -106,6 +106,8 @@ L(error):
- #endif
- 	END(__vfork)
- 
-+#if IS_IN (libc)
- libc_hidden_def(__vfork)
- weak_alias (__vfork, vfork)
- strong_alias (__vfork, __libc_vfork)
-+#endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-index dc32e0a..94f2c8d 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-@@ -44,6 +44,8 @@ ENTRY(__vfork)
- 	 nop
- END(__vfork)
- 
-+#if IS_IN (libc)
- libc_hidden_def (__vfork)
- weak_alias (__vfork, vfork)
- strong_alias (__vfork, __libc_vfork)
-+#endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-index 05be3c2..a7479e9 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-@@ -44,6 +44,8 @@ ENTRY(__vfork)
- 	 nop
- END(__vfork)
- 
-+#if IS_IN (libc)
- libc_hidden_def (__vfork)
- weak_alias (__vfork, vfork)
- strong_alias (__vfork, __libc_vfork)
-+#endif
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/bsp/buildroot/package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch
deleted file mode 100644
index 3c53f6d0..00000000
--- a/bsp/buildroot/package/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Tue, 21 Jun 2016 23:59:37 +0200
-Subject: [PATCH] MIPS, SPARC: more fixes to the vfork aliases in libpthread.so
-
-Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS
-and SPARC, but failed to do it correctly, introducing an ABI change.
-
-This patch does the remaining changes needed to align the MIPS and SPARC
-vfork implementations with the other architectures. That way the the
-alpha version of pt-vfork.S works correctly for MIPS and SPARC. The
-changes for alpha were done in 82aab97c.
-
-Changelog:
-	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into
-	__libc_vfork.
-	(__vfork) [IS_IN (libc)]: Remove alias.
-	(__libc_vfork) [IS_IN (libc)]: Define as an alias.
-	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
-	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
-
-[Vincent: do not patch ChangeLog]
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- sysdeps/unix/sysv/linux/mips/vfork.S          | 12 ++++++------
- sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S |  8 ++++----
- sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S |  8 ++++----
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
-index c0c0ce6..1867c86 100644
---- a/sysdeps/unix/sysv/linux/mips/vfork.S
-+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
-@@ -31,13 +31,13 @@
- LOCALSZ= 1
- FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
- GPOFF= FRAMESZ-(1*SZREG)
--NESTED(__vfork,FRAMESZ,sp)
-+NESTED(__libc_vfork,FRAMESZ,sp)
- #ifdef __PIC__
- 	SETUP_GP
- #endif
- 	PTR_SUBU sp, FRAMESZ
- 	cfi_adjust_cfa_offset (FRAMESZ)
--	SETUP_GP64_REG (a5, __vfork)
-+	SETUP_GP64_REG (a5, __libc_vfork)
- #ifdef __PIC__
- 	SAVE_GP (GPOFF)
- #endif
-@@ -104,10 +104,10 @@ L(error):
- 	RESTORE_GP64_REG
- 	j		__syscall_error
- #endif
--	END(__vfork)
-+	END(__libc_vfork)
- 
- #if IS_IN (libc)
--libc_hidden_def(__vfork)
--weak_alias (__vfork, vfork)
--strong_alias (__vfork, __libc_vfork)
-+weak_alias (__libc_vfork, vfork)
-+strong_alias (__libc_vfork, __vfork)
-+libc_hidden_def (__vfork)
- #endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-index 94f2c8d..0d0a3b5 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-@@ -21,7 +21,7 @@
- 
- 	.text
- 	.globl		__syscall_error
--ENTRY(__vfork)
-+ENTRY(__libc_vfork)
- 	ld	[%g7 + PID], %o5
- 	cmp	%o5, 0
- 	bne	1f
-@@ -42,10 +42,10 @@ ENTRY(__vfork)
- 	 st	%o5, [%g7 + PID]
- 1:	retl
- 	 nop
--END(__vfork)
-+END(__libc_vfork)
- 
- #if IS_IN (libc)
-+weak_alias (__libc_vfork, vfork)
-+strong_alias (__libc_vfork, __vfork)
- libc_hidden_def (__vfork)
--weak_alias (__vfork, vfork)
--strong_alias (__vfork, __libc_vfork)
- #endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-index a7479e9..0818eba 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-@@ -21,7 +21,7 @@
- 
- 	.text
- 	.globl	__syscall_error
--ENTRY(__vfork)
-+ENTRY(__libc_vfork)
- 	ld	[%g7 + PID], %o5
- 	sethi	%hi(0x80000000), %o3
- 	cmp	%o5, 0
-@@ -42,10 +42,10 @@ ENTRY(__vfork)
- 	 st	%o5, [%g7 + PID]
- 1:	retl
- 	 nop
--END(__vfork)
-+END(__libc_vfork)
- 
- #if IS_IN (libc)
-+weak_alias (__libc_vfork, vfork)
-+strong_alias (__libc_vfork, __vfork)
- libc_hidden_def (__vfork)
--weak_alias (__vfork, vfork)
--strong_alias (__vfork, __libc_vfork)
- #endif
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/bsp/buildroot/package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
deleted file mode 100644
index d701294d..00000000
--- a/bsp/buildroot/package/glibc/2.22/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 17:09:55 +0200
-Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1
- programs [BZ #21624]
-
-LD_LIBRARY_PATH can only be used to reorder system search paths, which
-is not useful functionality.
-
-This makes an exploitable unbounded alloca in _dl_init_paths unreachable
-for AT_SECURE=1 programs.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 3 ++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2446a87680..2269dbec81 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep)
- 
- 	case 12:
- 	  /* The library search path.  */
--	  if (memcmp (envline, "LIBRARY_PATH", 12) == 0)
-+	  if (!__libc_enable_secure
-+	      && memcmp (envline, "LIBRARY_PATH", 12) == 0)
- 	    {
- 	      library_path = &envline[13];
- 	      break;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/bsp/buildroot/package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
deleted file mode 100644
index df410931..00000000
--- a/bsp/buildroot/package/glibc/2.22/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:31:04 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 72 insertions(+), 16 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2269dbec81..86ae20c83f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local
- strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
- #endif
- 
-+/* Length limits for names and paths, to protect the dynamic linker,
-+   particularly when __libc_enable_secure is active.  */
-+#ifdef NAME_MAX
-+# define SECURE_NAME_LIMIT NAME_MAX
-+#else
-+# define SECURE_NAME_LIMIT 255
-+#endif
-+#ifdef PATH_MAX
-+# define SECURE_PATH_LIMIT PATH_MAX
-+#else
-+# define SECURE_PATH_LIMIT 1024
-+#endif
-+
-+/* Check that AT_SECURE=0, or that the passed name does not contain
-+   directories and is not overly long.  Reject empty names
-+   unconditionally.  */
-+static bool
-+dso_name_valid_for_suid (const char *p)
-+{
-+  if (__glibc_unlikely (__libc_enable_secure))
-+    {
-+      /* Ignore pathnames with directories for AT_SECURE=1
-+	 programs, and also skip overlong names.  */
-+      size_t len = strlen (p);
-+      if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL)
-+	return false;
-+    }
-+  return *p != '\0';
-+}
- 
- /* List of auditing DSOs.  */
- static struct audit_list
-@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro;
- /* Nonzero if information about versions has to be printed.  */
- static int version_info attribute_relro;
- 
-+/* The LD_PRELOAD environment variable gives list of libraries
-+   separated by white space or colons that are loaded before the
-+   executable's dependencies and prepended to the global scope list.
-+   (If the binary is running setuid all elements containing a '/' are
-+   ignored since it is insecure.)  Return the number of preloads
-+   performed.  */
-+unsigned int
-+handle_ld_preload (const char *preloadlist, struct link_map *main_map)
-+{
-+  unsigned int npreloads = 0;
-+  const char *p = preloadlist;
-+  char fname[SECURE_PATH_LIMIT];
-+
-+  while (*p != '\0')
-+    {
-+      /* Split preload list at space/colon.  */
-+      size_t len = strcspn (p, " :");
-+      if (len > 0 && len < sizeof (fname))
-+	{
-+	  memcpy (fname, p, len);
-+	  fname[len] = '\0';
-+	}
-+      else
-+	fname[0] = '\0';
-+
-+      /* Skip over the substring and the following delimiter.  */
-+      p += len;
-+      if (*p != '\0')
-+	++p;
-+
-+      if (dso_name_valid_for_suid (fname))
-+	npreloads += do_preload (fname, main_map, "LD_PRELOAD");
-+    }
-+  return npreloads;
-+}
-+
- static void
- dl_main (const ElfW(Phdr) *phdr,
- 	 ElfW(Word) phnum,
-@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 
-   if (__glibc_unlikely (preloadlist != NULL))
-     {
--      /* The LD_PRELOAD environment variable gives list of libraries
--	 separated by white space or colons that are loaded before the
--	 executable's dependencies and prepended to the global scope
--	 list.  If the binary is running setuid all elements
--	 containing a '/' are ignored since it is insecure.  */
--      char *list = strdupa (preloadlist);
--      char *p;
--
-       HP_TIMING_NOW (start);
--
--      /* Prevent optimizing strsep.  Speed is not important here.  */
--      while ((p = (strsep) (&list, " :")) != NULL)
--	if (p[0] != '\0'
--	    && (__builtin_expect (! __libc_enable_secure, 1)
--		|| strchr (p, '/') == NULL))
--	  npreloads += do_preload (p, main_map, "LD_PRELOAD");
--
-+      npreloads += handle_ld_preload (preloadlist, main_map);
-       HP_TIMING_NOW (stop);
-       HP_TIMING_DIFF (diff, start, stop);
-       HP_TIMING_ACCUM_NT (load_time, diff);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/bsp/buildroot/package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
deleted file mode 100644
index 25e937bd..00000000
--- a/bsp/buildroot/package/glibc/2.22/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:32:12 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements
-
-Also only process the last LD_AUDIT entry.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 105 insertions(+), 15 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 86ae20c83f..65647fb1c8 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p)
-   return *p != '\0';
- }
- 
--/* List of auditing DSOs.  */
-+/* LD_AUDIT variable contents.  Must be processed before the
-+   audit_list below.  */
-+const char *audit_list_string;
-+
-+/* Cyclic list of auditing DSOs.  audit_list->next is the first
-+   element.  */
- static struct audit_list
- {
-   const char *name;
-   struct audit_list *next;
- } *audit_list;
- 
-+/* Iterator for audit_list_string followed by audit_list.  */
-+struct audit_list_iter
-+{
-+  /* Tail of audit_list_string still needing processing, or NULL.  */
-+  const char *audit_list_tail;
-+
-+  /* The list element returned in the previous iteration.  NULL before
-+     the first element.  */
-+  struct audit_list *previous;
-+
-+  /* Scratch buffer for returning a name which is part of
-+     audit_list_string.  */
-+  char fname[SECURE_NAME_LIMIT];
-+};
-+
-+/* Initialize an audit list iterator.  */
-+static void
-+audit_list_iter_init (struct audit_list_iter *iter)
-+{
-+  iter->audit_list_tail = audit_list_string;
-+  iter->previous = NULL;
-+}
-+
-+/* Iterate through both audit_list_string and audit_list.  */
-+static const char *
-+audit_list_iter_next (struct audit_list_iter *iter)
-+{
-+  if (iter->audit_list_tail != NULL)
-+    {
-+      /* First iterate over audit_list_string.  */
-+      while (*iter->audit_list_tail != '\0')
-+	{
-+	  /* Split audit list at colon.  */
-+	  size_t len = strcspn (iter->audit_list_tail, ":");
-+	  if (len > 0 && len < sizeof (iter->fname))
-+	    {
-+	      memcpy (iter->fname, iter->audit_list_tail, len);
-+	      iter->fname[len] = '\0';
-+	    }
-+	  else
-+	    /* Do not return this name to the caller.  */
-+	    iter->fname[0] = '\0';
-+
-+	  /* Skip over the substring and the following delimiter.  */
-+	  iter->audit_list_tail += len;
-+	  if (*iter->audit_list_tail == ':')
-+	    ++iter->audit_list_tail;
-+
-+	  /* If the name is valid, return it.  */
-+	  if (dso_name_valid_for_suid (iter->fname))
-+	    return iter->fname;
-+	  /* Otherwise, wrap around and try the next name.  */
-+	}
-+      /* Fall through to the procesing of audit_list.  */
-+    }
-+
-+  if (iter->previous == NULL)
-+    {
-+      if (audit_list == NULL)
-+	/* No pre-parsed audit list.  */
-+	return NULL;
-+      /* Start of audit list.  The first list element is at
-+	 audit_list->next (cyclic list).  */
-+      iter->previous = audit_list->next;
-+      return iter->previous->name;
-+    }
-+  if (iter->previous == audit_list)
-+    /* Cyclic list wrap-around.  */
-+    return NULL;
-+  iter->previous = iter->previous->next;
-+  return iter->previous->name;
-+}
-+
- #ifndef HAVE_INLINED_SYSCALLS
- /* Set nonzero during loading and initialization of executable and
-    libraries, cleared before the executable's entry point runs.  This
-@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\
-     GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid ();
- 
-   /* If we have auditing DSOs to load, do it now.  */
--  if (__glibc_unlikely (audit_list != NULL))
-+  bool need_security_init = true;
-+  if (__glibc_unlikely (audit_list != NULL)
-+      || __glibc_unlikely (audit_list_string != NULL))
-     {
--      /* Iterate over all entries in the list.  The order is important.  */
-       struct audit_ifaces *last_audit = NULL;
--      struct audit_list *al = audit_list->next;
-+      struct audit_list_iter al_iter;
-+      audit_list_iter_init (&al_iter);
- 
-       /* Since we start using the auditing DSOs right away we need to
- 	 initialize the data structures now.  */
-@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	 use different values (especially the pointer guard) and will
- 	 fail later on.  */
-       security_init ();
-+      need_security_init = false;
- 
--      do
-+      while (true)
- 	{
-+	  const char *name = audit_list_iter_next (&al_iter);
-+	  if (name == NULL)
-+	    break;
-+
- 	  int tls_idx = GL(dl_tls_max_dtv_idx);
- 
- 	  /* Now it is time to determine the layout of the static TLS
-@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	     no DF_STATIC_TLS bit is set.  The reason is that we know
- 	     glibc will use the static model.  */
- 	  struct dlmopen_args dlmargs;
--	  dlmargs.fname = al->name;
-+	  dlmargs.fname = name;
- 	  dlmargs.map = NULL;
- 
- 	  const char *objname;
-@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	    not_loaded:
- 	      _dl_error_printf ("\
- ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
--				al->name, err_str);
-+				name, err_str);
- 	      if (malloced)
- 		free ((char *) err_str);
- 	    }
-@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 		  goto not_loaded;
- 		}
- 	    }
--
--	  al = al->next;
- 	}
--      while (al != audit_list->next);
- 
-       /* If we have any auditing modules, announce that we already
- 	 have two objects loaded.  */
-@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-   if (tcbp == NULL)
-     tcbp = init_tls ();
- 
--  if (__glibc_likely (audit_list == NULL))
-+  if (__glibc_likely (need_security_init))
-     /* Initialize security features.  But only if we have not done it
-        earlier.  */
-     security_init ();
-@@ -2346,9 +2428,7 @@ process_dl_audit (char *str)
-   char *p;
- 
-   while ((p = (strsep) (&str, ":")) != NULL)
--    if (p[0] != '\0'
--	&& (__builtin_expect (! __libc_enable_secure, 1)
--	    || strchr (p, '/') == NULL))
-+    if (dso_name_valid_for_suid (p))
-       {
- 	/* This is using the local malloc, not the system malloc.  The
- 	   memory can never be freed.  */
-@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep)
- 	      break;
- 	    }
- 	  if (memcmp (envline, "AUDIT", 5) == 0)
--	    process_dl_audit (&envline[6]);
-+	    audit_list_string = &envline[6];
- 	  break;
- 
- 	case 7:
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.23/0001-fix-CVE-2016-3075.patch b/bsp/buildroot/package/glibc/2.23/0001-fix-CVE-2016-3075.patch
deleted file mode 100644
index 6b07116c..00000000
--- a/bsp/buildroot/package/glibc/2.23/0001-fix-CVE-2016-3075.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 146b58d11fddbef15b888906e3be4f33900c416f Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Tue, 29 Mar 2016 12:57:56 +0200
-Subject: [PATCH 1/1] CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879]
-
-The defensive copy is not needed because the name may not alias the
-output buffer.
-
-(cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4)
-(cherry picked from commit 883dceebc8f11921a9890211a4e202e5be17562f)
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(downloaded from upstream git repo and removed changes to files
- Changelog and NEWS:
- https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=146b58d11fddbef15b888906e3be4f33900c416f;hp=0eb234232eaf925fe4dca3bd60a3e1b4a7ab2882)
----
- ChangeLog                    |    7 +++++++
- NEWS                         |   10 ++++++++--
- resolv/nss_dns/dns-network.c |    5 +----
- 3 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c
-index 2eb2f67..8f301a7 100644
---- a/resolv/nss_dns/dns-network.c
-+++ b/resolv/nss_dns/dns-network.c
-@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result,
-   } net_buffer;
-   querybuf *orig_net_buffer;
-   int anslen;
--  char *qbuf;
-   enum nss_status status;
- 
-   if (__res_maybe_init (&_res, 0) == -1)
-     return NSS_STATUS_UNAVAIL;
- 
--  qbuf = strdupa (name);
--
-   net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024);
- 
--  anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf,
-+  anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf,
- 			       1024, &net_buffer.ptr, NULL, NULL, NULL, NULL);
-   if (anslen < 0)
-     {
--- 
-1.7.1
-
diff --git a/bsp/buildroot/package/glibc/2.23/0002-gcc6.patch b/bsp/buildroot/package/glibc/2.23/0002-gcc6.patch
deleted file mode 100644
index f831cae2..00000000
--- a/bsp/buildroot/package/glibc/2.23/0002-gcc6.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 5769d5d17cdb4770f1e08167b76c1684ad4e1f73 Mon Sep 17 00:00:00 2001
-From: Yvan Roux <yvan.roux@linaro.org>
-Date: Fri, 15 Apr 2016 13:29:26 +0200
-Subject: [PATCH 1/1] Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses
-
-(cherry picked from commit df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c)
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(downloaded from upstream git repo and removed changes to Changelog:
- https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5769d5d17cdb4770f1e08167b76c1684ad4e1f73;hp=f1e182acaaa84e844eb96462a92ba532e1c1fff4)
----
- ChangeLog       |    5 +++++
- nis/nis_call.c  |   20 +++++++++++---------
- stdlib/setenv.c |   26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
---- a/nis/nis_call.c
-+++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
-   /* Choose which entry should be evicted from the cache.  */
-   loc = &nis_server_cache[0];
-   if (*loc != NULL)
--    for (i = 1; i < 16; ++i)
--      if (nis_server_cache[i] == NULL)
--	{
-+    {
-+      for (i = 1; i < 16; ++i)
-+	if (nis_server_cache[i] == NULL)
-+	  {
-+	    loc = &nis_server_cache[i];
-+	    break;
-+	  }
-+	else if ((*loc)->uses > nis_server_cache[i]->uses
-+		 || ((*loc)->uses == nis_server_cache[i]->uses
-+		     && (*loc)->expires > nis_server_cache[i]->expires))
- 	  loc = &nis_server_cache[i];
--	  break;
--	}
--      else if ((*loc)->uses > nis_server_cache[i]->uses
--	       || ((*loc)->uses == nis_server_cache[i]->uses
--		   && (*loc)->expires > nis_server_cache[i]->expires))
--	loc = &nis_server_cache[i];
-+    }
-   old = *loc;
-   *loc = new;
- 
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
---- a/stdlib/setenv.c
-+++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
-   ep = __environ;
-   if (ep != NULL)
-     while (*ep != NULL)
--      if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
--	{
--	  /* Found it.  Remove this pointer by moving later ones back.  */
--	  char **dp = ep;
--
--	  do
--	    dp[0] = dp[1];
--	  while (*dp++);
--	  /* Continue the loop in case NAME appears again.  */
--	}
--      else
--	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
-+	    do
-+		dp[0] = dp[1];
-+	    while (*dp++);
-+	    /* Continue the loop in case NAME appears again.  */
-+	  }
-+	else
-+	  ++ep;
-+      }
- 
-   UNLOCK;
- 
--- 
-1.7.1
-
diff --git a/bsp/buildroot/package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/bsp/buildroot/package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch
deleted file mode 100644
index 740b3221..00000000
--- a/bsp/buildroot/package/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Sat, 18 Jun 2016 19:11:23 +0200
-Subject: [PATCH] MIPS, SPARC: fix wrong vfork aliases in libpthread.so
-
-With recent binutils versions the GNU libc fails to build on at least
-MISP and SPARC, with this kind of error:
-
-  /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0'
-  /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here
-
-It appears that on these architectures pt-vfork.S includes vfork.S
-(through the alpha version of pt-vfork.S) and that the __vfork aliases
-are not conditionalized on IS_IN (libc) like on other architectures.
-Therefore the aliases are also wrongly included in libpthread.so.
-
-Fix this by properly conditionalizing the aliases like on other
-architectures.
-
-Changelog:
-	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize
-	hidden_def, weak_alias and strong_alias on [IS_IN (libc)].
-	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
-	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
-
-[Vincent: do not patch ChangeLog]
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- sysdeps/unix/sysv/linux/mips/vfork.S          | 2 ++
- sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 2 ++
- sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
-index 8c66151..c0c0ce6 100644
---- a/sysdeps/unix/sysv/linux/mips/vfork.S
-+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
-@@ -106,6 +106,8 @@ L(error):
- #endif
- 	END(__vfork)
- 
-+#if IS_IN (libc)
- libc_hidden_def(__vfork)
- weak_alias (__vfork, vfork)
- strong_alias (__vfork, __libc_vfork)
-+#endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-index dc32e0a..94f2c8d 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-@@ -44,6 +44,8 @@ ENTRY(__vfork)
- 	 nop
- END(__vfork)
- 
-+#if IS_IN (libc)
- libc_hidden_def (__vfork)
- weak_alias (__vfork, vfork)
- strong_alias (__vfork, __libc_vfork)
-+#endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-index 05be3c2..a7479e9 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-@@ -44,6 +44,8 @@ ENTRY(__vfork)
- 	 nop
- END(__vfork)
- 
-+#if IS_IN (libc)
- libc_hidden_def (__vfork)
- weak_alias (__vfork, vfork)
- strong_alias (__vfork, __libc_vfork)
-+#endif
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/bsp/buildroot/package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch
deleted file mode 100644
index 3c53f6d0..00000000
--- a/bsp/buildroot/package/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001
-From: Aurelien Jarno <aurelien@aurel32.net>
-Date: Tue, 21 Jun 2016 23:59:37 +0200
-Subject: [PATCH] MIPS, SPARC: more fixes to the vfork aliases in libpthread.so
-
-Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS
-and SPARC, but failed to do it correctly, introducing an ABI change.
-
-This patch does the remaining changes needed to align the MIPS and SPARC
-vfork implementations with the other architectures. That way the the
-alpha version of pt-vfork.S works correctly for MIPS and SPARC. The
-changes for alpha were done in 82aab97c.
-
-Changelog:
-	* sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into
-	__libc_vfork.
-	(__vfork) [IS_IN (libc)]: Remove alias.
-	(__libc_vfork) [IS_IN (libc)]: Define as an alias.
-	* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
-	* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
-
-[Vincent: do not patch ChangeLog]
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- sysdeps/unix/sysv/linux/mips/vfork.S          | 12 ++++++------
- sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S |  8 ++++----
- sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S |  8 ++++----
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S
-index c0c0ce6..1867c86 100644
---- a/sysdeps/unix/sysv/linux/mips/vfork.S
-+++ b/sysdeps/unix/sysv/linux/mips/vfork.S
-@@ -31,13 +31,13 @@
- LOCALSZ= 1
- FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
- GPOFF= FRAMESZ-(1*SZREG)
--NESTED(__vfork,FRAMESZ,sp)
-+NESTED(__libc_vfork,FRAMESZ,sp)
- #ifdef __PIC__
- 	SETUP_GP
- #endif
- 	PTR_SUBU sp, FRAMESZ
- 	cfi_adjust_cfa_offset (FRAMESZ)
--	SETUP_GP64_REG (a5, __vfork)
-+	SETUP_GP64_REG (a5, __libc_vfork)
- #ifdef __PIC__
- 	SAVE_GP (GPOFF)
- #endif
-@@ -104,10 +104,10 @@ L(error):
- 	RESTORE_GP64_REG
- 	j		__syscall_error
- #endif
--	END(__vfork)
-+	END(__libc_vfork)
- 
- #if IS_IN (libc)
--libc_hidden_def(__vfork)
--weak_alias (__vfork, vfork)
--strong_alias (__vfork, __libc_vfork)
-+weak_alias (__libc_vfork, vfork)
-+strong_alias (__libc_vfork, __vfork)
-+libc_hidden_def (__vfork)
- #endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-index 94f2c8d..0d0a3b5 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S
-@@ -21,7 +21,7 @@
- 
- 	.text
- 	.globl		__syscall_error
--ENTRY(__vfork)
-+ENTRY(__libc_vfork)
- 	ld	[%g7 + PID], %o5
- 	cmp	%o5, 0
- 	bne	1f
-@@ -42,10 +42,10 @@ ENTRY(__vfork)
- 	 st	%o5, [%g7 + PID]
- 1:	retl
- 	 nop
--END(__vfork)
-+END(__libc_vfork)
- 
- #if IS_IN (libc)
-+weak_alias (__libc_vfork, vfork)
-+strong_alias (__libc_vfork, __vfork)
- libc_hidden_def (__vfork)
--weak_alias (__vfork, vfork)
--strong_alias (__vfork, __libc_vfork)
- #endif
-diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-index a7479e9..0818eba 100644
---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S
-@@ -21,7 +21,7 @@
- 
- 	.text
- 	.globl	__syscall_error
--ENTRY(__vfork)
-+ENTRY(__libc_vfork)
- 	ld	[%g7 + PID], %o5
- 	sethi	%hi(0x80000000), %o3
- 	cmp	%o5, 0
-@@ -42,10 +42,10 @@ ENTRY(__vfork)
- 	 st	%o5, [%g7 + PID]
- 1:	retl
- 	 nop
--END(__vfork)
-+END(__libc_vfork)
- 
- #if IS_IN (libc)
-+weak_alias (__libc_vfork, vfork)
-+strong_alias (__libc_vfork, __vfork)
- libc_hidden_def (__vfork)
--weak_alias (__vfork, vfork)
--strong_alias (__vfork, __libc_vfork)
- #endif
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch b/bsp/buildroot/package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch
deleted file mode 100644
index fa43add3..00000000
--- a/bsp/buildroot/package/glibc/2.23/0005-sh-Fix-building-with-gcc5-6.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From dbb9ecfaac8db022292791936733e0841a0aa447 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 8 Feb 2017 16:00:57 -0200
-Subject: [PATCH] sh: Fix building with gcc5/6
-
-Build glibc for sh4-unknown-linux-gnu currently fails if one's
-using GCC5/6: in dl-conflict.c, the elf_machine_rela() function
-is called with NULL as its 3rd argument, sym. The implementation
-of that function in sysdeps/sh/dl-machine.h dereferences that pointer:
-
-const Elf32_Sym *const refsym = sym;
-...
-if (map == &GL(dl_rtld_map))
-  value -= map->l_addr + refsym->st_value + reloc->r_addend;
-
-GCC discovers a null pointer dereference, and in accordance with
--fdelete-null-pointer-checks (which is enabled in -O2) replaces this
-code with a trap - which, as SH does not implement a trap pattern in
-GCC, evaluates to an abort() call. This abort() call pulls many more
-objects from libc_nonshared.a, eventually resulting in link failure
-due to multiple definitions for a number of symbols.
-
-As far as I see, the conditional before this code is always false in
-rtld: _dl_resolve_conflicts() is called with main_map as the first
-argument, not GL(_dl_rtld_map), but since that call is in yet another
-compilation unit, GCC does not know about it. Patch that wraps this
-conditional into !defined RESOLVE_CONFLICT_FIND_MAP attached.
-
-	* sysdeps/sh/dl-machine.h (elf_machine_rela): The condition
-	in R_SH_DIR32 case is always false when inlined from
-	dl-conflict.c. Ifdef out to prevent GCC from insertin an
-	abort() call.
-
-[Waldemar: backport of
-https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01.]
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- sysdeps/sh/dl-machine.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
-index 5bb37d0..6509055 100644
---- a/sysdeps/sh/dl-machine.h
-+++ b/sysdeps/sh/dl-machine.h
-@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- 	  break;
- 	case R_SH_DIR32:
- 	  {
--#ifndef RTLD_BOOTSTRAP
-+#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
- 	   /* This is defined in rtld.c, but nowhere in the static
- 	      libc.a; make the reference weak so static programs can
- 	      still link.  This declaration cannot be done when
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/bsp/buildroot/package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
deleted file mode 100644
index d701294d..00000000
--- a/bsp/buildroot/package/glibc/2.23/0006-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 17:09:55 +0200
-Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1
- programs [BZ #21624]
-
-LD_LIBRARY_PATH can only be used to reorder system search paths, which
-is not useful functionality.
-
-This makes an exploitable unbounded alloca in _dl_init_paths unreachable
-for AT_SECURE=1 programs.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 3 ++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2446a87680..2269dbec81 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep)
- 
- 	case 12:
- 	  /* The library search path.  */
--	  if (memcmp (envline, "LIBRARY_PATH", 12) == 0)
-+	  if (!__libc_enable_secure
-+	      && memcmp (envline, "LIBRARY_PATH", 12) == 0)
- 	    {
- 	      library_path = &envline[13];
- 	      break;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/bsp/buildroot/package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
deleted file mode 100644
index df410931..00000000
--- a/bsp/buildroot/package/glibc/2.23/0007-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:31:04 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 72 insertions(+), 16 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2269dbec81..86ae20c83f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local
- strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
- #endif
- 
-+/* Length limits for names and paths, to protect the dynamic linker,
-+   particularly when __libc_enable_secure is active.  */
-+#ifdef NAME_MAX
-+# define SECURE_NAME_LIMIT NAME_MAX
-+#else
-+# define SECURE_NAME_LIMIT 255
-+#endif
-+#ifdef PATH_MAX
-+# define SECURE_PATH_LIMIT PATH_MAX
-+#else
-+# define SECURE_PATH_LIMIT 1024
-+#endif
-+
-+/* Check that AT_SECURE=0, or that the passed name does not contain
-+   directories and is not overly long.  Reject empty names
-+   unconditionally.  */
-+static bool
-+dso_name_valid_for_suid (const char *p)
-+{
-+  if (__glibc_unlikely (__libc_enable_secure))
-+    {
-+      /* Ignore pathnames with directories for AT_SECURE=1
-+	 programs, and also skip overlong names.  */
-+      size_t len = strlen (p);
-+      if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL)
-+	return false;
-+    }
-+  return *p != '\0';
-+}
- 
- /* List of auditing DSOs.  */
- static struct audit_list
-@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro;
- /* Nonzero if information about versions has to be printed.  */
- static int version_info attribute_relro;
- 
-+/* The LD_PRELOAD environment variable gives list of libraries
-+   separated by white space or colons that are loaded before the
-+   executable's dependencies and prepended to the global scope list.
-+   (If the binary is running setuid all elements containing a '/' are
-+   ignored since it is insecure.)  Return the number of preloads
-+   performed.  */
-+unsigned int
-+handle_ld_preload (const char *preloadlist, struct link_map *main_map)
-+{
-+  unsigned int npreloads = 0;
-+  const char *p = preloadlist;
-+  char fname[SECURE_PATH_LIMIT];
-+
-+  while (*p != '\0')
-+    {
-+      /* Split preload list at space/colon.  */
-+      size_t len = strcspn (p, " :");
-+      if (len > 0 && len < sizeof (fname))
-+	{
-+	  memcpy (fname, p, len);
-+	  fname[len] = '\0';
-+	}
-+      else
-+	fname[0] = '\0';
-+
-+      /* Skip over the substring and the following delimiter.  */
-+      p += len;
-+      if (*p != '\0')
-+	++p;
-+
-+      if (dso_name_valid_for_suid (fname))
-+	npreloads += do_preload (fname, main_map, "LD_PRELOAD");
-+    }
-+  return npreloads;
-+}
-+
- static void
- dl_main (const ElfW(Phdr) *phdr,
- 	 ElfW(Word) phnum,
-@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 
-   if (__glibc_unlikely (preloadlist != NULL))
-     {
--      /* The LD_PRELOAD environment variable gives list of libraries
--	 separated by white space or colons that are loaded before the
--	 executable's dependencies and prepended to the global scope
--	 list.  If the binary is running setuid all elements
--	 containing a '/' are ignored since it is insecure.  */
--      char *list = strdupa (preloadlist);
--      char *p;
--
-       HP_TIMING_NOW (start);
--
--      /* Prevent optimizing strsep.  Speed is not important here.  */
--      while ((p = (strsep) (&list, " :")) != NULL)
--	if (p[0] != '\0'
--	    && (__builtin_expect (! __libc_enable_secure, 1)
--		|| strchr (p, '/') == NULL))
--	  npreloads += do_preload (p, main_map, "LD_PRELOAD");
--
-+      npreloads += handle_ld_preload (preloadlist, main_map);
-       HP_TIMING_NOW (stop);
-       HP_TIMING_DIFF (diff, start, stop);
-       HP_TIMING_ACCUM_NT (load_time, diff);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/bsp/buildroot/package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
deleted file mode 100644
index 25e937bd..00000000
--- a/bsp/buildroot/package/glibc/2.23/0008-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:32:12 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements
-
-Also only process the last LD_AUDIT entry.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 105 insertions(+), 15 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 86ae20c83f..65647fb1c8 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p)
-   return *p != '\0';
- }
- 
--/* List of auditing DSOs.  */
-+/* LD_AUDIT variable contents.  Must be processed before the
-+   audit_list below.  */
-+const char *audit_list_string;
-+
-+/* Cyclic list of auditing DSOs.  audit_list->next is the first
-+   element.  */
- static struct audit_list
- {
-   const char *name;
-   struct audit_list *next;
- } *audit_list;
- 
-+/* Iterator for audit_list_string followed by audit_list.  */
-+struct audit_list_iter
-+{
-+  /* Tail of audit_list_string still needing processing, or NULL.  */
-+  const char *audit_list_tail;
-+
-+  /* The list element returned in the previous iteration.  NULL before
-+     the first element.  */
-+  struct audit_list *previous;
-+
-+  /* Scratch buffer for returning a name which is part of
-+     audit_list_string.  */
-+  char fname[SECURE_NAME_LIMIT];
-+};
-+
-+/* Initialize an audit list iterator.  */
-+static void
-+audit_list_iter_init (struct audit_list_iter *iter)
-+{
-+  iter->audit_list_tail = audit_list_string;
-+  iter->previous = NULL;
-+}
-+
-+/* Iterate through both audit_list_string and audit_list.  */
-+static const char *
-+audit_list_iter_next (struct audit_list_iter *iter)
-+{
-+  if (iter->audit_list_tail != NULL)
-+    {
-+      /* First iterate over audit_list_string.  */
-+      while (*iter->audit_list_tail != '\0')
-+	{
-+	  /* Split audit list at colon.  */
-+	  size_t len = strcspn (iter->audit_list_tail, ":");
-+	  if (len > 0 && len < sizeof (iter->fname))
-+	    {
-+	      memcpy (iter->fname, iter->audit_list_tail, len);
-+	      iter->fname[len] = '\0';
-+	    }
-+	  else
-+	    /* Do not return this name to the caller.  */
-+	    iter->fname[0] = '\0';
-+
-+	  /* Skip over the substring and the following delimiter.  */
-+	  iter->audit_list_tail += len;
-+	  if (*iter->audit_list_tail == ':')
-+	    ++iter->audit_list_tail;
-+
-+	  /* If the name is valid, return it.  */
-+	  if (dso_name_valid_for_suid (iter->fname))
-+	    return iter->fname;
-+	  /* Otherwise, wrap around and try the next name.  */
-+	}
-+      /* Fall through to the procesing of audit_list.  */
-+    }
-+
-+  if (iter->previous == NULL)
-+    {
-+      if (audit_list == NULL)
-+	/* No pre-parsed audit list.  */
-+	return NULL;
-+      /* Start of audit list.  The first list element is at
-+	 audit_list->next (cyclic list).  */
-+      iter->previous = audit_list->next;
-+      return iter->previous->name;
-+    }
-+  if (iter->previous == audit_list)
-+    /* Cyclic list wrap-around.  */
-+    return NULL;
-+  iter->previous = iter->previous->next;
-+  return iter->previous->name;
-+}
-+
- #ifndef HAVE_INLINED_SYSCALLS
- /* Set nonzero during loading and initialization of executable and
-    libraries, cleared before the executable's entry point runs.  This
-@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\
-     GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid ();
- 
-   /* If we have auditing DSOs to load, do it now.  */
--  if (__glibc_unlikely (audit_list != NULL))
-+  bool need_security_init = true;
-+  if (__glibc_unlikely (audit_list != NULL)
-+      || __glibc_unlikely (audit_list_string != NULL))
-     {
--      /* Iterate over all entries in the list.  The order is important.  */
-       struct audit_ifaces *last_audit = NULL;
--      struct audit_list *al = audit_list->next;
-+      struct audit_list_iter al_iter;
-+      audit_list_iter_init (&al_iter);
- 
-       /* Since we start using the auditing DSOs right away we need to
- 	 initialize the data structures now.  */
-@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	 use different values (especially the pointer guard) and will
- 	 fail later on.  */
-       security_init ();
-+      need_security_init = false;
- 
--      do
-+      while (true)
- 	{
-+	  const char *name = audit_list_iter_next (&al_iter);
-+	  if (name == NULL)
-+	    break;
-+
- 	  int tls_idx = GL(dl_tls_max_dtv_idx);
- 
- 	  /* Now it is time to determine the layout of the static TLS
-@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	     no DF_STATIC_TLS bit is set.  The reason is that we know
- 	     glibc will use the static model.  */
- 	  struct dlmopen_args dlmargs;
--	  dlmargs.fname = al->name;
-+	  dlmargs.fname = name;
- 	  dlmargs.map = NULL;
- 
- 	  const char *objname;
-@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	    not_loaded:
- 	      _dl_error_printf ("\
- ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
--				al->name, err_str);
-+				name, err_str);
- 	      if (malloced)
- 		free ((char *) err_str);
- 	    }
-@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 		  goto not_loaded;
- 		}
- 	    }
--
--	  al = al->next;
- 	}
--      while (al != audit_list->next);
- 
-       /* If we have any auditing modules, announce that we already
- 	 have two objects loaded.  */
-@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-   if (tcbp == NULL)
-     tcbp = init_tls ();
- 
--  if (__glibc_likely (audit_list == NULL))
-+  if (__glibc_likely (need_security_init))
-     /* Initialize security features.  But only if we have not done it
-        earlier.  */
-     security_init ();
-@@ -2346,9 +2428,7 @@ process_dl_audit (char *str)
-   char *p;
- 
-   while ((p = (strsep) (&str, ":")) != NULL)
--    if (p[0] != '\0'
--	&& (__builtin_expect (! __libc_enable_secure, 1)
--	    || strchr (p, '/') == NULL))
-+    if (dso_name_valid_for_suid (p))
-       {
- 	/* This is using the local malloc, not the system malloc.  The
- 	   memory can never be freed.  */
-@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep)
- 	      break;
- 	    }
- 	  if (memcmp (envline, "AUDIT", 5) == 0)
--	    process_dl_audit (&envline[6]);
-+	    audit_list_string = &envline[6];
- 	  break;
- 
- 	case 7:
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch b/bsp/buildroot/package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch
deleted file mode 100644
index 821f2c65..00000000
--- a/bsp/buildroot/package/glibc/2.24/0001-sh-Fix-building-with-gcc5-6.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 98cadd4b9fa8e32d1d0dea8e46b5ba829af4e8a2 Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Wed, 8 Feb 2017 16:00:57 -0200
-Subject: [PATCH] sh: Fix building with gcc5/6
-
-Build glibc for sh4-unknown-linux-gnu currently fails if one's
-using GCC5/6: in dl-conflict.c, the elf_machine_rela() function
-is called with NULL as its 3rd argument, sym. The implementation
-of that function in sysdeps/sh/dl-machine.h dereferences that pointer:
-
-const Elf32_Sym *const refsym = sym;
-...
-if (map == &GL(dl_rtld_map))
-  value -= map->l_addr + refsym->st_value + reloc->r_addend;
-
-GCC discovers a null pointer dereference, and in accordance with
--fdelete-null-pointer-checks (which is enabled in -O2) replaces this
-code with a trap - which, as SH does not implement a trap pattern in
-GCC, evaluates to an abort() call. This abort() call pulls many more
-objects from libc_nonshared.a, eventually resulting in link failure
-due to multiple definitions for a number of symbols.
-
-As far as I see, the conditional before this code is always false in
-rtld: _dl_resolve_conflicts() is called with main_map as the first
-argument, not GL(_dl_rtld_map), but since that call is in yet another
-compilation unit, GCC does not know about it. Patch that wraps this
-conditional into !defined RESOLVE_CONFLICT_FIND_MAP attached.
-
-	* sysdeps/sh/dl-machine.h (elf_machine_rela): The condition
-	in R_SH_DIR32 case is always false when inlined from
-	dl-conflict.c. Ifdef out to prevent GCC from insertin an
-	abort() call.
-
-[Waldemar: backport of
-https://sourceware.org/git/?p=glibc.git;a=commit;h=d40dbe722f004f999b589de776f7e57e564dda01.]
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- sysdeps/sh/dl-machine.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
-index 5bb37d0..6509055 100644
---- a/sysdeps/sh/dl-machine.h
-+++ b/sysdeps/sh/dl-machine.h
-@@ -389,7 +389,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
- 	  break;
- 	case R_SH_DIR32:
- 	  {
--#ifndef RTLD_BOOTSTRAP
-+#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
- 	   /* This is defined in rtld.c, but nowhere in the static
- 	      libc.a; make the reference weak so static programs can
- 	      still link.  This declaration cannot be done when
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/bsp/buildroot/package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
deleted file mode 100644
index d701294d..00000000
--- a/bsp/buildroot/package/glibc/2.24/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 17:09:55 +0200
-Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1
- programs [BZ #21624]
-
-LD_LIBRARY_PATH can only be used to reorder system search paths, which
-is not useful functionality.
-
-This makes an exploitable unbounded alloca in _dl_init_paths unreachable
-for AT_SECURE=1 programs.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 3 ++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2446a87680..2269dbec81 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep)
- 
- 	case 12:
- 	  /* The library search path.  */
--	  if (memcmp (envline, "LIBRARY_PATH", 12) == 0)
-+	  if (!__libc_enable_secure
-+	      && memcmp (envline, "LIBRARY_PATH", 12) == 0)
- 	    {
- 	      library_path = &envline[13];
- 	      break;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/bsp/buildroot/package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
deleted file mode 100644
index df410931..00000000
--- a/bsp/buildroot/package/glibc/2.24/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:31:04 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 72 insertions(+), 16 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2269dbec81..86ae20c83f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local
- strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
- #endif
- 
-+/* Length limits for names and paths, to protect the dynamic linker,
-+   particularly when __libc_enable_secure is active.  */
-+#ifdef NAME_MAX
-+# define SECURE_NAME_LIMIT NAME_MAX
-+#else
-+# define SECURE_NAME_LIMIT 255
-+#endif
-+#ifdef PATH_MAX
-+# define SECURE_PATH_LIMIT PATH_MAX
-+#else
-+# define SECURE_PATH_LIMIT 1024
-+#endif
-+
-+/* Check that AT_SECURE=0, or that the passed name does not contain
-+   directories and is not overly long.  Reject empty names
-+   unconditionally.  */
-+static bool
-+dso_name_valid_for_suid (const char *p)
-+{
-+  if (__glibc_unlikely (__libc_enable_secure))
-+    {
-+      /* Ignore pathnames with directories for AT_SECURE=1
-+	 programs, and also skip overlong names.  */
-+      size_t len = strlen (p);
-+      if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL)
-+	return false;
-+    }
-+  return *p != '\0';
-+}
- 
- /* List of auditing DSOs.  */
- static struct audit_list
-@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro;
- /* Nonzero if information about versions has to be printed.  */
- static int version_info attribute_relro;
- 
-+/* The LD_PRELOAD environment variable gives list of libraries
-+   separated by white space or colons that are loaded before the
-+   executable's dependencies and prepended to the global scope list.
-+   (If the binary is running setuid all elements containing a '/' are
-+   ignored since it is insecure.)  Return the number of preloads
-+   performed.  */
-+unsigned int
-+handle_ld_preload (const char *preloadlist, struct link_map *main_map)
-+{
-+  unsigned int npreloads = 0;
-+  const char *p = preloadlist;
-+  char fname[SECURE_PATH_LIMIT];
-+
-+  while (*p != '\0')
-+    {
-+      /* Split preload list at space/colon.  */
-+      size_t len = strcspn (p, " :");
-+      if (len > 0 && len < sizeof (fname))
-+	{
-+	  memcpy (fname, p, len);
-+	  fname[len] = '\0';
-+	}
-+      else
-+	fname[0] = '\0';
-+
-+      /* Skip over the substring and the following delimiter.  */
-+      p += len;
-+      if (*p != '\0')
-+	++p;
-+
-+      if (dso_name_valid_for_suid (fname))
-+	npreloads += do_preload (fname, main_map, "LD_PRELOAD");
-+    }
-+  return npreloads;
-+}
-+
- static void
- dl_main (const ElfW(Phdr) *phdr,
- 	 ElfW(Word) phnum,
-@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 
-   if (__glibc_unlikely (preloadlist != NULL))
-     {
--      /* The LD_PRELOAD environment variable gives list of libraries
--	 separated by white space or colons that are loaded before the
--	 executable's dependencies and prepended to the global scope
--	 list.  If the binary is running setuid all elements
--	 containing a '/' are ignored since it is insecure.  */
--      char *list = strdupa (preloadlist);
--      char *p;
--
-       HP_TIMING_NOW (start);
--
--      /* Prevent optimizing strsep.  Speed is not important here.  */
--      while ((p = (strsep) (&list, " :")) != NULL)
--	if (p[0] != '\0'
--	    && (__builtin_expect (! __libc_enable_secure, 1)
--		|| strchr (p, '/') == NULL))
--	  npreloads += do_preload (p, main_map, "LD_PRELOAD");
--
-+      npreloads += handle_ld_preload (preloadlist, main_map);
-       HP_TIMING_NOW (stop);
-       HP_TIMING_DIFF (diff, start, stop);
-       HP_TIMING_ACCUM_NT (load_time, diff);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/bsp/buildroot/package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
deleted file mode 100644
index 25e937bd..00000000
--- a/bsp/buildroot/package/glibc/2.24/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:32:12 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements
-
-Also only process the last LD_AUDIT entry.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 105 insertions(+), 15 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 86ae20c83f..65647fb1c8 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p)
-   return *p != '\0';
- }
- 
--/* List of auditing DSOs.  */
-+/* LD_AUDIT variable contents.  Must be processed before the
-+   audit_list below.  */
-+const char *audit_list_string;
-+
-+/* Cyclic list of auditing DSOs.  audit_list->next is the first
-+   element.  */
- static struct audit_list
- {
-   const char *name;
-   struct audit_list *next;
- } *audit_list;
- 
-+/* Iterator for audit_list_string followed by audit_list.  */
-+struct audit_list_iter
-+{
-+  /* Tail of audit_list_string still needing processing, or NULL.  */
-+  const char *audit_list_tail;
-+
-+  /* The list element returned in the previous iteration.  NULL before
-+     the first element.  */
-+  struct audit_list *previous;
-+
-+  /* Scratch buffer for returning a name which is part of
-+     audit_list_string.  */
-+  char fname[SECURE_NAME_LIMIT];
-+};
-+
-+/* Initialize an audit list iterator.  */
-+static void
-+audit_list_iter_init (struct audit_list_iter *iter)
-+{
-+  iter->audit_list_tail = audit_list_string;
-+  iter->previous = NULL;
-+}
-+
-+/* Iterate through both audit_list_string and audit_list.  */
-+static const char *
-+audit_list_iter_next (struct audit_list_iter *iter)
-+{
-+  if (iter->audit_list_tail != NULL)
-+    {
-+      /* First iterate over audit_list_string.  */
-+      while (*iter->audit_list_tail != '\0')
-+	{
-+	  /* Split audit list at colon.  */
-+	  size_t len = strcspn (iter->audit_list_tail, ":");
-+	  if (len > 0 && len < sizeof (iter->fname))
-+	    {
-+	      memcpy (iter->fname, iter->audit_list_tail, len);
-+	      iter->fname[len] = '\0';
-+	    }
-+	  else
-+	    /* Do not return this name to the caller.  */
-+	    iter->fname[0] = '\0';
-+
-+	  /* Skip over the substring and the following delimiter.  */
-+	  iter->audit_list_tail += len;
-+	  if (*iter->audit_list_tail == ':')
-+	    ++iter->audit_list_tail;
-+
-+	  /* If the name is valid, return it.  */
-+	  if (dso_name_valid_for_suid (iter->fname))
-+	    return iter->fname;
-+	  /* Otherwise, wrap around and try the next name.  */
-+	}
-+      /* Fall through to the procesing of audit_list.  */
-+    }
-+
-+  if (iter->previous == NULL)
-+    {
-+      if (audit_list == NULL)
-+	/* No pre-parsed audit list.  */
-+	return NULL;
-+      /* Start of audit list.  The first list element is at
-+	 audit_list->next (cyclic list).  */
-+      iter->previous = audit_list->next;
-+      return iter->previous->name;
-+    }
-+  if (iter->previous == audit_list)
-+    /* Cyclic list wrap-around.  */
-+    return NULL;
-+  iter->previous = iter->previous->next;
-+  return iter->previous->name;
-+}
-+
- #ifndef HAVE_INLINED_SYSCALLS
- /* Set nonzero during loading and initialization of executable and
-    libraries, cleared before the executable's entry point runs.  This
-@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\
-     GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid ();
- 
-   /* If we have auditing DSOs to load, do it now.  */
--  if (__glibc_unlikely (audit_list != NULL))
-+  bool need_security_init = true;
-+  if (__glibc_unlikely (audit_list != NULL)
-+      || __glibc_unlikely (audit_list_string != NULL))
-     {
--      /* Iterate over all entries in the list.  The order is important.  */
-       struct audit_ifaces *last_audit = NULL;
--      struct audit_list *al = audit_list->next;
-+      struct audit_list_iter al_iter;
-+      audit_list_iter_init (&al_iter);
- 
-       /* Since we start using the auditing DSOs right away we need to
- 	 initialize the data structures now.  */
-@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	 use different values (especially the pointer guard) and will
- 	 fail later on.  */
-       security_init ();
-+      need_security_init = false;
- 
--      do
-+      while (true)
- 	{
-+	  const char *name = audit_list_iter_next (&al_iter);
-+	  if (name == NULL)
-+	    break;
-+
- 	  int tls_idx = GL(dl_tls_max_dtv_idx);
- 
- 	  /* Now it is time to determine the layout of the static TLS
-@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	     no DF_STATIC_TLS bit is set.  The reason is that we know
- 	     glibc will use the static model.  */
- 	  struct dlmopen_args dlmargs;
--	  dlmargs.fname = al->name;
-+	  dlmargs.fname = name;
- 	  dlmargs.map = NULL;
- 
- 	  const char *objname;
-@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	    not_loaded:
- 	      _dl_error_printf ("\
- ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
--				al->name, err_str);
-+				name, err_str);
- 	      if (malloced)
- 		free ((char *) err_str);
- 	    }
-@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 		  goto not_loaded;
- 		}
- 	    }
--
--	  al = al->next;
- 	}
--      while (al != audit_list->next);
- 
-       /* If we have any auditing modules, announce that we already
- 	 have two objects loaded.  */
-@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-   if (tcbp == NULL)
-     tcbp = init_tls ();
- 
--  if (__glibc_likely (audit_list == NULL))
-+  if (__glibc_likely (need_security_init))
-     /* Initialize security features.  But only if we have not done it
-        earlier.  */
-     security_init ();
-@@ -2346,9 +2428,7 @@ process_dl_audit (char *str)
-   char *p;
- 
-   while ((p = (strsep) (&str, ":")) != NULL)
--    if (p[0] != '\0'
--	&& (__builtin_expect (! __libc_enable_secure, 1)
--	    || strchr (p, '/') == NULL))
-+    if (dso_name_valid_for_suid (p))
-       {
- 	/* This is using the local malloc, not the system malloc.  The
- 	   memory can never be freed.  */
-@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep)
- 	      break;
- 	    }
- 	  if (memcmp (envline, "AUDIT", 5) == 0)
--	    process_dl_audit (&envline[6]);
-+	    audit_list_string = &envline[6];
- 	  break;
- 
- 	case 7:
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch b/bsp/buildroot/package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
deleted file mode 100644
index d701294d..00000000
--- a/bsp/buildroot/package/glibc/2.25/0002-CVE-2017-1000366-Ignore-LD_LIBRARY_PATH-for-AT_SECUR.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f6110a8fee2ca36f8e2d2abecf3cba9fa7b8ea7d Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 17:09:55 +0200
-Subject: [PATCH] CVE-2017-1000366: Ignore LD_LIBRARY_PATH for AT_SECURE=1
- programs [BZ #21624]
-
-LD_LIBRARY_PATH can only be used to reorder system search paths, which
-is not useful functionality.
-
-This makes an exploitable unbounded alloca in _dl_init_paths unreachable
-for AT_SECURE=1 programs.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 3 ++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2446a87680..2269dbec81 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2422,7 +2422,8 @@ process_envvars (enum mode *modep)
- 
- 	case 12:
- 	  /* The library search path.  */
--	  if (memcmp (envline, "LIBRARY_PATH", 12) == 0)
-+	  if (!__libc_enable_secure
-+	      && memcmp (envline, "LIBRARY_PATH", 12) == 0)
- 	    {
- 	      library_path = &envline[13];
- 	      break;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch b/bsp/buildroot/package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
deleted file mode 100644
index df410931..00000000
--- a/bsp/buildroot/package/glibc/2.25/0003-ld.so-Reject-overly-long-LD_PRELOAD-path-elements.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 6d0ba622891bed9d8394eef1935add53003b12e8 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:31:04 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_PRELOAD path elements
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 72 insertions(+), 16 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2269dbec81..86ae20c83f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -99,6 +99,35 @@ uintptr_t __pointer_chk_guard_local
- strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
- #endif
- 
-+/* Length limits for names and paths, to protect the dynamic linker,
-+   particularly when __libc_enable_secure is active.  */
-+#ifdef NAME_MAX
-+# define SECURE_NAME_LIMIT NAME_MAX
-+#else
-+# define SECURE_NAME_LIMIT 255
-+#endif
-+#ifdef PATH_MAX
-+# define SECURE_PATH_LIMIT PATH_MAX
-+#else
-+# define SECURE_PATH_LIMIT 1024
-+#endif
-+
-+/* Check that AT_SECURE=0, or that the passed name does not contain
-+   directories and is not overly long.  Reject empty names
-+   unconditionally.  */
-+static bool
-+dso_name_valid_for_suid (const char *p)
-+{
-+  if (__glibc_unlikely (__libc_enable_secure))
-+    {
-+      /* Ignore pathnames with directories for AT_SECURE=1
-+	 programs, and also skip overlong names.  */
-+      size_t len = strlen (p);
-+      if (len >= SECURE_NAME_LIMIT || memchr (p, '/', len) != NULL)
-+	return false;
-+    }
-+  return *p != '\0';
-+}
- 
- /* List of auditing DSOs.  */
- static struct audit_list
-@@ -718,6 +747,42 @@ static const char *preloadlist attribute_relro;
- /* Nonzero if information about versions has to be printed.  */
- static int version_info attribute_relro;
- 
-+/* The LD_PRELOAD environment variable gives list of libraries
-+   separated by white space or colons that are loaded before the
-+   executable's dependencies and prepended to the global scope list.
-+   (If the binary is running setuid all elements containing a '/' are
-+   ignored since it is insecure.)  Return the number of preloads
-+   performed.  */
-+unsigned int
-+handle_ld_preload (const char *preloadlist, struct link_map *main_map)
-+{
-+  unsigned int npreloads = 0;
-+  const char *p = preloadlist;
-+  char fname[SECURE_PATH_LIMIT];
-+
-+  while (*p != '\0')
-+    {
-+      /* Split preload list at space/colon.  */
-+      size_t len = strcspn (p, " :");
-+      if (len > 0 && len < sizeof (fname))
-+	{
-+	  memcpy (fname, p, len);
-+	  fname[len] = '\0';
-+	}
-+      else
-+	fname[0] = '\0';
-+
-+      /* Skip over the substring and the following delimiter.  */
-+      p += len;
-+      if (*p != '\0')
-+	++p;
-+
-+      if (dso_name_valid_for_suid (fname))
-+	npreloads += do_preload (fname, main_map, "LD_PRELOAD");
-+    }
-+  return npreloads;
-+}
-+
- static void
- dl_main (const ElfW(Phdr) *phdr,
- 	 ElfW(Word) phnum,
-@@ -1464,23 +1529,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 
-   if (__glibc_unlikely (preloadlist != NULL))
-     {
--      /* The LD_PRELOAD environment variable gives list of libraries
--	 separated by white space or colons that are loaded before the
--	 executable's dependencies and prepended to the global scope
--	 list.  If the binary is running setuid all elements
--	 containing a '/' are ignored since it is insecure.  */
--      char *list = strdupa (preloadlist);
--      char *p;
--
-       HP_TIMING_NOW (start);
--
--      /* Prevent optimizing strsep.  Speed is not important here.  */
--      while ((p = (strsep) (&list, " :")) != NULL)
--	if (p[0] != '\0'
--	    && (__builtin_expect (! __libc_enable_secure, 1)
--		|| strchr (p, '/') == NULL))
--	  npreloads += do_preload (p, main_map, "LD_PRELOAD");
--
-+      npreloads += handle_ld_preload (preloadlist, main_map);
-       HP_TIMING_NOW (stop);
-       HP_TIMING_DIFF (diff, start, stop);
-       HP_TIMING_ACCUM_NT (load_time, diff);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch b/bsp/buildroot/package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
deleted file mode 100644
index 25e937bd..00000000
--- a/bsp/buildroot/package/glibc/2.25/0004-ld.so-Reject-overly-long-LD_AUDIT-path-elements.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From 81b82fb966ffbd94353f793ad17116c6088dedd9 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Mon, 19 Jun 2017 22:32:12 +0200
-Subject: [PATCH] ld.so: Reject overly long LD_AUDIT path elements
-
-Also only process the last LD_AUDIT entry.
-
-[Peter: Drop ChangeLog modification]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- elf/rtld.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 105 insertions(+), 15 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 86ae20c83f..65647fb1c8 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -129,13 +129,91 @@ dso_name_valid_for_suid (const char *p)
-   return *p != '\0';
- }
- 
--/* List of auditing DSOs.  */
-+/* LD_AUDIT variable contents.  Must be processed before the
-+   audit_list below.  */
-+const char *audit_list_string;
-+
-+/* Cyclic list of auditing DSOs.  audit_list->next is the first
-+   element.  */
- static struct audit_list
- {
-   const char *name;
-   struct audit_list *next;
- } *audit_list;
- 
-+/* Iterator for audit_list_string followed by audit_list.  */
-+struct audit_list_iter
-+{
-+  /* Tail of audit_list_string still needing processing, or NULL.  */
-+  const char *audit_list_tail;
-+
-+  /* The list element returned in the previous iteration.  NULL before
-+     the first element.  */
-+  struct audit_list *previous;
-+
-+  /* Scratch buffer for returning a name which is part of
-+     audit_list_string.  */
-+  char fname[SECURE_NAME_LIMIT];
-+};
-+
-+/* Initialize an audit list iterator.  */
-+static void
-+audit_list_iter_init (struct audit_list_iter *iter)
-+{
-+  iter->audit_list_tail = audit_list_string;
-+  iter->previous = NULL;
-+}
-+
-+/* Iterate through both audit_list_string and audit_list.  */
-+static const char *
-+audit_list_iter_next (struct audit_list_iter *iter)
-+{
-+  if (iter->audit_list_tail != NULL)
-+    {
-+      /* First iterate over audit_list_string.  */
-+      while (*iter->audit_list_tail != '\0')
-+	{
-+	  /* Split audit list at colon.  */
-+	  size_t len = strcspn (iter->audit_list_tail, ":");
-+	  if (len > 0 && len < sizeof (iter->fname))
-+	    {
-+	      memcpy (iter->fname, iter->audit_list_tail, len);
-+	      iter->fname[len] = '\0';
-+	    }
-+	  else
-+	    /* Do not return this name to the caller.  */
-+	    iter->fname[0] = '\0';
-+
-+	  /* Skip over the substring and the following delimiter.  */
-+	  iter->audit_list_tail += len;
-+	  if (*iter->audit_list_tail == ':')
-+	    ++iter->audit_list_tail;
-+
-+	  /* If the name is valid, return it.  */
-+	  if (dso_name_valid_for_suid (iter->fname))
-+	    return iter->fname;
-+	  /* Otherwise, wrap around and try the next name.  */
-+	}
-+      /* Fall through to the procesing of audit_list.  */
-+    }
-+
-+  if (iter->previous == NULL)
-+    {
-+      if (audit_list == NULL)
-+	/* No pre-parsed audit list.  */
-+	return NULL;
-+      /* Start of audit list.  The first list element is at
-+	 audit_list->next (cyclic list).  */
-+      iter->previous = audit_list->next;
-+      return iter->previous->name;
-+    }
-+  if (iter->previous == audit_list)
-+    /* Cyclic list wrap-around.  */
-+    return NULL;
-+  iter->previous = iter->previous->next;
-+  return iter->previous->name;
-+}
-+
- #ifndef HAVE_INLINED_SYSCALLS
- /* Set nonzero during loading and initialization of executable and
-    libraries, cleared before the executable's entry point runs.  This
-@@ -1305,11 +1383,13 @@ of this helper program; chances are you did not intend to run this program.\n\
-     GL(dl_rtld_map).l_tls_modid = _dl_next_tls_modid ();
- 
-   /* If we have auditing DSOs to load, do it now.  */
--  if (__glibc_unlikely (audit_list != NULL))
-+  bool need_security_init = true;
-+  if (__glibc_unlikely (audit_list != NULL)
-+      || __glibc_unlikely (audit_list_string != NULL))
-     {
--      /* Iterate over all entries in the list.  The order is important.  */
-       struct audit_ifaces *last_audit = NULL;
--      struct audit_list *al = audit_list->next;
-+      struct audit_list_iter al_iter;
-+      audit_list_iter_init (&al_iter);
- 
-       /* Since we start using the auditing DSOs right away we need to
- 	 initialize the data structures now.  */
-@@ -1320,9 +1400,14 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	 use different values (especially the pointer guard) and will
- 	 fail later on.  */
-       security_init ();
-+      need_security_init = false;
- 
--      do
-+      while (true)
- 	{
-+	  const char *name = audit_list_iter_next (&al_iter);
-+	  if (name == NULL)
-+	    break;
-+
- 	  int tls_idx = GL(dl_tls_max_dtv_idx);
- 
- 	  /* Now it is time to determine the layout of the static TLS
-@@ -1331,7 +1416,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	     no DF_STATIC_TLS bit is set.  The reason is that we know
- 	     glibc will use the static model.  */
- 	  struct dlmopen_args dlmargs;
--	  dlmargs.fname = al->name;
-+	  dlmargs.fname = name;
- 	  dlmargs.map = NULL;
- 
- 	  const char *objname;
-@@ -1344,7 +1429,7 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	    not_loaded:
- 	      _dl_error_printf ("\
- ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
--				al->name, err_str);
-+				name, err_str);
- 	      if (malloced)
- 		free ((char *) err_str);
- 	    }
-@@ -1448,10 +1533,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- 		  goto not_loaded;
- 		}
- 	    }
--
--	  al = al->next;
- 	}
--      while (al != audit_list->next);
- 
-       /* If we have any auditing modules, announce that we already
- 	 have two objects loaded.  */
-@@ -1715,7 +1797,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-   if (tcbp == NULL)
-     tcbp = init_tls ();
- 
--  if (__glibc_likely (audit_list == NULL))
-+  if (__glibc_likely (need_security_init))
-     /* Initialize security features.  But only if we have not done it
-        earlier.  */
-     security_init ();
-@@ -2346,9 +2428,7 @@ process_dl_audit (char *str)
-   char *p;
- 
-   while ((p = (strsep) (&str, ":")) != NULL)
--    if (p[0] != '\0'
--	&& (__builtin_expect (! __libc_enable_secure, 1)
--	    || strchr (p, '/') == NULL))
-+    if (dso_name_valid_for_suid (p))
-       {
- 	/* This is using the local malloc, not the system malloc.  The
- 	   memory can never be freed.  */
-@@ -2412,7 +2492,7 @@ process_envvars (enum mode *modep)
- 	      break;
- 	    }
- 	  if (memcmp (envline, "AUDIT", 5) == 0)
--	    process_dl_audit (&envline[6]);
-+	    audit_list_string = &envline[6];
- 	  break;
- 
- 	case 7:
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/glibc/Config.in b/bsp/buildroot/package/glibc/Config.in
index 85aace6e..57a2e833 100644
--- a/bsp/buildroot/package/glibc/Config.in
+++ b/bsp/buildroot/package/glibc/Config.in
@@ -6,33 +6,4 @@ config BR2_PACKAGE_GLIBC
 	select BR2_PACKAGE_LINUX_HEADERS
 	select BR2_TOOLCHAIN_HAS_SSP
 
-choice
-	prompt "glibc version"
-	default BR2_GLIBC_VERSION_2_23
-
-config BR2_GLIBC_VERSION_2_22
-	bool "2.22"
-	# Too old to build with gcc >= 6.x
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6
-
-config BR2_GLIBC_VERSION_2_23
-	bool "2.23"
-
-config BR2_GLIBC_VERSION_2_24
-	bool "2.24"
-	# Linux 3.2 or later kernel headers are required on all arches.
-	# See: https://sourceware.org/ml/libc-alpha/2016-08/msg00212.html
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-
-comment "glibc-2.24 needs kernel headers >= 3.2"
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
-
-endchoice
-
 endif
-
-config BR2_GLIBC_VERSION_STRING
-	string
-	default "2.22" if BR2_GLIBC_VERSION_2_22
-	default "2.23" if BR2_GLIBC_VERSION_2_23
-	default "2.24" if BR2_GLIBC_VERSION_2_24
diff --git a/bsp/buildroot/package/glibc/glibc.hash b/bsp/buildroot/package/glibc/glibc.hash
index befe80c3..bfe40f1f 100644
--- a/bsp/buildroot/package/glibc/glibc.hash
+++ b/bsp/buildroot/package/glibc/glibc.hash
@@ -1,4 +1,4 @@
-# Locally calculated after checking pgp signature (glibc)
-sha256	eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948	glibc-2.22.tar.xz
-sha256	94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9	glibc-2.23.tar.xz
-sha256	99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3	glibc-2.24.tar.xz
+# Locally calculated (fetched from Github)
+sha256   acbec224e69f29c9c59c34f15f0fbb19eecf3fce347eba8bb928fac507ae86c6    glibc-glibc-2.26-175-gc5c90b480e4f21ed1d28e0e6d942b06b8d9e8bd7.tar.gz
+# Locally calculated (fetched from Github)
+sha256  5aa9adeac09727db0b8a52794186563771e74d70410e9fd86431e339953fd4bb     glibc-arc-2017.09-release.tar.gz
diff --git a/bsp/buildroot/package/glibc/glibc.mk b/bsp/buildroot/package/glibc/glibc.mk
index ee525396..2e93593b 100644
--- a/bsp/buildroot/package/glibc/glibc.mk
+++ b/bsp/buildroot/package/glibc/glibc.mk
@@ -4,12 +4,25 @@
 #
 ################################################################################
 
-GLIBC_VERSION = $(call qstrip,$(BR2_GLIBC_VERSION_STRING))
-GLIBC_SITE = $(BR2_GNU_MIRROR)/libc
-GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz
+ifeq ($(BR2_arc),y)
+GLIBC_VERSION =  arc-2017.09-release
+GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
+else
+# Generate version string using:
+#   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master
+GLIBC_VERSION = glibc-2.26-175-gc5c90b480e4f21ed1d28e0e6d942b06b8d9e8bd7
+# Upstream doesn't officially provide an https download link.
+# There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
+# sometimes the connection times out. So use an unofficial github mirror.
+# When updating the version, check it on the official repository;
+# *NEVER* decide on a version string by looking at the mirror.
+# Then check that the mirror has been synced already (happens once a day.)
+GLIBC_SITE = $(call github,bminor,glibc,$(GLIBC_VERSION))
+endif
+
 GLIBC_SRC_SUBDIR = .
 
-GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library)
+GLIBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+, BSD-3-Clause, MIT (library)
 GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES)
 
 # glibc is part of the toolchain so disable the toolchain dependency
@@ -94,7 +107,6 @@ define GLIBC_CONFIGURE_CMDS
 	$(GLIBC_ADD_MISSING_STUB_H)
 endef
 
-
 #
 # We also override the install to target commands since we only want
 # to install the libraries, and nothing more.
@@ -110,39 +122,9 @@ GLIBC_LIBS_LIB += libthread_db.so.*
 endif
 
 define GLIBC_INSTALL_TARGET_CMDS
-	for libs in $(GLIBC_LIBS_LIB); do \
-		$(call copy_toolchain_lib_root,$$libs) ; \
+	for libpattern in $(GLIBC_LIBS_LIB); do \
+		$(call copy_toolchain_lib_root,$$libpattern) ; \
 	done
 endef
 
-# MIPS R6 requires to have NaN2008 support which is currently not
-# supported by the Linux kernel. In order to prevent building the
-# glibc against kernels not having NaN2008 support on platforms that
-# requires it, glibc currently checks for an (inexisting) 10.0.0
-# kernel headers version.
-#
-# Since in practice the kernel support for NaN2008 is not really
-# required for things to work properly, we adjust the glibc check to
-# make it believe that NaN2008 support was added in the kernel
-# starting from version 4.0.0.
-#
-# In general the compatibility issues introduced by mis-matched NaN
-# encodings will not cause a problem as signalling NaNs are rarely used
-# in average code. For MIPS R6 there isn't actually any compatibility
-# issue as the hardware is always NaN2008 and software is always
-# NaN2008. The problem only comes from when older MIPS code is linked in
-# via a DSO and multiple NaN encodings are introduced. Since Buildroot
-# is intended to have all code built from source then this scenario is
-# highly unlikely. The failure mode, if it ever occurs, would be either
-# that a signalling NaN fails to raise an invalid operation exception or
-# (more likely) an ordinary NaN raises an invalid operation exception.
-ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
-define GLIBC_FIX_MIPS_R6
-	$(SED) 's#10.0.0#4.0.0#' \
-		$(@D)/sysdeps/unix/sysv/linux/mips/configure \
-		$(@D)/sysdeps/unix/sysv/linux/mips/configure.ac
-endef
-GLIBC_POST_EXTRACT_HOOKS += GLIBC_FIX_MIPS_R6
-endif
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/glibmm/Config.in b/bsp/buildroot/package/glibmm/Config.in
index fdbb4381..c7b4082e 100644
--- a/bsp/buildroot/package/glibmm/Config.in
+++ b/bsp/buildroot/package/glibmm/Config.in
@@ -1,18 +1,18 @@
 config BR2_PACKAGE_GLIBMM
 	bool "glibmm"
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBSIGC
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # regex_replace
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBSIGC
 	help
 	  The GLibmm package is a set of C++ bindings for GLib.
 
 	  http://www.gtkmm.org/
 
-comment "glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8"
+comment "glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/glibmm/glibmm.hash b/bsp/buildroot/package/glibmm/glibmm.hash
index fbcf8556..570192e2 100644
--- a/bsp/buildroot/package/glibmm/glibmm.hash
+++ b/bsp/buildroot/package/glibmm/glibmm.hash
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.50/glibmm-2.50.0.sha256sum
-sha256	df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94	glibmm-2.50.0.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.54/glibmm-2.54.1.sha256sum
+sha256	7cc28c732b04d70ed34f0c923543129083cfb90580ea4a2b4be5b38802bf6a4a glibmm-2.54.1.tar.xz
diff --git a/bsp/buildroot/package/glibmm/glibmm.mk b/bsp/buildroot/package/glibmm/glibmm.mk
index 0daca585..7fa13f21 100644
--- a/bsp/buildroot/package/glibmm/glibmm.mk
+++ b/bsp/buildroot/package/glibmm/glibmm.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GLIBMM_VERSION_MAJOR = 2.50
-GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0
-GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+GLIBMM_VERSION_MAJOR = 2.54
+GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).1
+GLIBMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 GLIBMM_LICENSE_FILES = COPYING COPYING.tools
 GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz
 GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR)
diff --git a/bsp/buildroot/package/glm/glm.hash b/bsp/buildroot/package/glm/glm.hash
index 30bb9237..c87d4ca2 100644
--- a/bsp/buildroot/package/glm/glm.hash
+++ b/bsp/buildroot/package/glm/glm.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 39c7ee0db54289f78350c7629ea2531664d71c6a494bbb86db48a86536de9ff2  glm-0.9.5.4.tar.gz
+sha256 a220e60f8711265595be3221e530d632d5823641ecd46a3a54bc174933bff14c  glm-0.9.8.4.tar.gz
diff --git a/bsp/buildroot/package/glm/glm.mk b/bsp/buildroot/package/glm/glm.mk
index ff9423da..1f23146d 100644
--- a/bsp/buildroot/package/glm/glm.mk
+++ b/bsp/buildroot/package/glm/glm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GLM_VERSION = 0.9.5.4
+GLM_VERSION = 0.9.8.4
 GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION))
 GLM_LICENSE = MIT
 GLM_LICENSE_FILES = copying.txt
diff --git a/bsp/buildroot/package/glmark2/glmark2.hash b/bsp/buildroot/package/glmark2/glmark2.hash
index 92c53e54..aeb8a785 100644
--- a/bsp/buildroot/package/glmark2/glmark2.hash
+++ b/bsp/buildroot/package/glmark2/glmark2.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 ea59bd267a88e2c773423eec43f7cb90b0ca1c369762e836dec575ebdcdcc012 glmark2-7215c0f337dae0b232535549c37fca441747a891.tar.gz
+sha256 8800f3cab0575df217adc166b181930e1f881efb6f764f35872993ee78dea5f0 glmark2-9b1070fe9c5cf908f323909d3c8cbed08022abe8.tar.gz
diff --git a/bsp/buildroot/package/glmark2/glmark2.mk b/bsp/buildroot/package/glmark2/glmark2.mk
index c7cefeb1..4eeaec79 100644
--- a/bsp/buildroot/package/glmark2/glmark2.mk
+++ b/bsp/buildroot/package/glmark2/glmark2.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891
+GLMARK2_VERSION = 9b1070fe9c5cf908f323909d3c8cbed08022abe8
 GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION))
-GLMARK2_LICENSE = GPLv3+, SGIv1
+GLMARK2_LICENSE = GPL-3.0+, SGIv1
 GLMARK2_LICENSE_FILES = COPYING COPYING.SGI
 GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \
 	$(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \
diff --git a/bsp/buildroot/package/glog/glog.hash b/bsp/buildroot/package/glog/glog.hash
index 4548ebac..909e072b 100644
--- a/bsp/buildroot/package/glog/glog.hash
+++ b/bsp/buildroot/package/glog/glog.hash
@@ -1,2 +1,5 @@
 # Locally computed
-sha256	ce99d58dce74458f7656a68935d7a0c048fa7b4626566a71b7f4e545920ceb10	glog-v0.3.4.tar.gz
+sha256 7580e408a2c0b5a89ca214739978ce6ff480b5e7d8d7698a2aa92fadc484d1e0  glog-v0.3.5.tar.gz
+
+# Hash for License file:
+sha256 0fc497129c5c69ff6f22da6933c7e4aaef082fde8437fd57680c2780100772a4  COPYING
diff --git a/bsp/buildroot/package/glog/glog.mk b/bsp/buildroot/package/glog/glog.mk
index aa7cacbd..3f17529f 100644
--- a/bsp/buildroot/package/glog/glog.mk
+++ b/bsp/buildroot/package/glog/glog.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GLOG_VERSION = v0.3.4
+GLOG_VERSION = v0.3.5
 GLOG_SITE = $(call github,google,glog,$(GLOG_VERSION))
 GLOG_INSTALL_STAGING = YES
-GLOG_LICENSE = BSD-3c
+GLOG_LICENSE = BSD-3-Clause
 GLOG_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_GFLAGS),y)
diff --git a/bsp/buildroot/package/glorytun/Config.in b/bsp/buildroot/package/glorytun/Config.in
new file mode 100644
index 00000000..82d248f7
--- /dev/null
+++ b/bsp/buildroot/package/glorytun/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GLORYTUN
+	bool "glorytun"
+	select BR2_PACKAGE_LIBSODIUM
+	help
+	  A small, simple and secure VPN.
+
+	  https://github.com/angt/glorytun
diff --git a/bsp/buildroot/package/glorytun/glorytun.hash b/bsp/buildroot/package/glorytun/glorytun.hash
new file mode 100644
index 00000000..891af207
--- /dev/null
+++ b/bsp/buildroot/package/glorytun/glorytun.hash
@@ -0,0 +1,2 @@
+sha256 76849b1568119cf0834749db56d4882966863d31351c21c1b22f373f0c97a498  glorytun-0.0.93-mud.tar.gz
+sha256 bd418f8ef7d62f2c89e3aa1e5dc41c7d7a6212eb1cdb4d39a26a5bd333e1b4a3  LICENSE
diff --git a/bsp/buildroot/package/glorytun/glorytun.mk b/bsp/buildroot/package/glorytun/glorytun.mk
new file mode 100644
index 00000000..233e1fea
--- /dev/null
+++ b/bsp/buildroot/package/glorytun/glorytun.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# glorytun
+#
+################################################################################
+
+GLORYTUN_VERSION = 0.0.93-mud
+GLORYTUN_SITE = https://github.com/angt/glorytun/releases/download/v$(GLORYTUN_VERSION)
+GLORYTUN_DEPENDENCIES = libsodium host-pkgconf
+GLORYTUN_LICENSE = BSD-2-clause
+GLORYTUN_LICENSE_FILES = LICENSE
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gmock/0001-force-use-python2.patch b/bsp/buildroot/package/gmock/0001-force-use-python2.patch
deleted file mode 100644
index 5dcb2311..00000000
--- a/bsp/buildroot/package/gmock/0001-force-use-python2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Force use of Python 2 even when Python 3 is the default Python interpreter.
-
-Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
-
---- ./gtest/scripts/fuse_gtest_files.py.orig	2013-09-18 14:48:30.000000000 -0300
-+++ ./gtest/scripts/fuse_gtest_files.py	2015-07-22 15:42:53.291591205 -0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright 2009, Google Inc.
- # All rights reserved.
---- ./scripts/generator/gmock_gen.py.orig	2013-09-18 14:50:15.000000000 -0300
-+++ ./scripts/generator/gmock_gen.py	2015-07-22 17:06:51.071815634 -0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- #
- # Copyright 2008 Google Inc. All Rights Reserved.
- #
diff --git a/bsp/buildroot/package/gmock/Config.in b/bsp/buildroot/package/gmock/Config.in
deleted file mode 100644
index ec3eb921..00000000
--- a/bsp/buildroot/package/gmock/Config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-config BR2_PACKAGE_GMOCK
-	bool "gmock"
-	select BR2_PACKAGE_GTEST
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_USE_MMU # fork()
-	help
-	  Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s
-	  specifics in mind, Google C++ Mocking Framework (or Google Mock for
-	  short) is a library for writing and using C++ mock classes.
-
-	  Google Mock:
-
-	    * lets you create mock classes trivially using simple macros,
-	    * supports a rich set of matchers and actions,
-	    * handles unordered, partially ordered, or completely ordered
-	      expectations,
-	    * is extensible by users, and
-	    * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and
-	      Symbian.
-
-	    http://code.google.com/p/googlemock/
-
-	  There are both host and target packages. The target one has include
-	  files required to compile the tests and the static libraries required
-	  to link/run them. The host package installs gmock_gen, a Python script
-	  used to generate code mocks.
-
-comment "gmock needs a toolchain w/ C++, wchar, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/gmock/gmock.hash b/bsp/buildroot/package/gmock/gmock.hash
deleted file mode 100644
index 2b717398..00000000
--- a/bsp/buildroot/package/gmock/gmock.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b  gmock-1.7.0.zip
diff --git a/bsp/buildroot/package/gmock/gmock.mk b/bsp/buildroot/package/gmock/gmock.mk
deleted file mode 100644
index 4f04422a..00000000
--- a/bsp/buildroot/package/gmock/gmock.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-################################################################################
-#
-# gmock
-#
-################################################################################
-
-# Make sure this remains the same version as the gtest one
-GMOCK_VERSION = 1.7.0
-GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip
-GMOCK_SITE = http://googlemock.googlecode.com/files
-GMOCK_INSTALL_STAGING = YES
-GMOCK_INSTALL_TARGET = NO
-GMOCK_LICENSE = BSD-3c
-GMOCK_LICENSE_FILES = LICENSE
-GMOCK_DEPENDENCIES = gtest host-gmock
-
-# GMock 1.7.0 relies on Python 2.7 syntax which is NOT compatible with Python3.
-HOST_GMOCK_DEPENDENCIES = host-python
-HOST_GMOCK_PYTHONPATH=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-
-# Static linking is required in order to keep the GMock package completely
-# separated from GTest. According to GMock's README file:
-#
-#   "Google Mock can be used as a DLL, but the same DLL must contain Google
-#    Test as well.  See Google Test's README file for instructions on how to
-#    set up necessary compiler settings".
-GMOCK_CONF_OPTS = --enable-static --disable-shared
-
-define GMOCK_EXTRACT_CMDS
-	$(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(BUILD_DIR)
-endef
-
-# We can't use the default rule for autotools-package staging because it fails
-# because it tries to rebuild/install gtest stuff and fails after this error:
-#    "'make install' is dangerous and not supported. Instead, see README for
-#      how to integrate Google Test into your build system."
-define GMOCK_INSTALL_STAGING_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock.a $(STAGING_DIR)/usr/lib/libgmock.a
-	$(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock_main.a $(STAGING_DIR)/usr/lib/libgmock_main.a
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gmock/
-	cp -rp $(@D)/include/gmock/* $(STAGING_DIR)/usr/include/gmock/
-	$(INSTALL) -D -m 0755 package/gmock/gmock.pc \
-		$(STAGING_DIR)/usr/lib/pkgconfig/gmock.pc
-endef
-
-# Unzipping inside $(@D) and moving everything from the created subdirectory is
-# required because unzipping directly in $(BUILD_DIR) would cause host-gmock to
-# overwrite the gmock subdir instead of unzipping in a host-gmock subdir.
-define HOST_GMOCK_EXTRACT_CMDS
-	$(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(@D)
-	mv $(@D)/gmock-$(GMOCK_VERSION)/* $(@D)
-	rmdir $(@D)/gmock-$(GMOCK_VERSION)
-endef
-
-define HOST_GMOCK_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/scripts/generator/gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen.py
-	ln -sf gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen
-	cp -rp $(@D)/scripts/generator/cpp $(HOST_GMOCK_PYTHONPATH)
-endef
-
-$(eval $(autotools-package))
-# The host package does not build anything, just installs gmock_gen stuff, so
-# it does not need to be a host-autotools-package.
-$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/gmp/gmp.mk b/bsp/buildroot/package/gmp/gmp.mk
index 33b5d542..7236e37b 100644
--- a/bsp/buildroot/package/gmp/gmp.mk
+++ b/bsp/buildroot/package/gmp/gmp.mk
@@ -8,14 +8,14 @@ GMP_VERSION = 6.1.2
 GMP_SITE = $(BR2_GNU_MIRROR)/gmp
 GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz
 GMP_INSTALL_STAGING = YES
-GMP_LICENSE = LGPLv3+ or GPLv2+
+GMP_LICENSE = LGPL-3.0+ or GPL-2.0+
 GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
 GMP_DEPENDENCIES = host-m4
 HOST_GMP_DEPENDENCIES = host-m4
 
 # GMP doesn't support assembly for coldfire or mips r6 ISA yet
 # Disable for ARM v7m since it has different asm constraints
-ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M)$(BR2_arc),y)
+ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M),y)
 GMP_CONF_OPTS += --disable-assembly
 endif
 
diff --git a/bsp/buildroot/package/gmpc/Config.in b/bsp/buildroot/package/gmpc/Config.in
index 43bc642d..1aa74251 100644
--- a/bsp/buildroot/package/gmpc/Config.in
+++ b/bsp/buildroot/package/gmpc/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_GMPC
 	depends on BR2_USE_MMU # glib2
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBMPD
 	select BR2_PACKAGE_LIBSOUP
diff --git a/bsp/buildroot/package/gmpc/gmpc.mk b/bsp/buildroot/package/gmpc/gmpc.mk
index 03d95d45..40b77eb1 100644
--- a/bsp/buildroot/package/gmpc/gmpc.mk
+++ b/bsp/buildroot/package/gmpc/gmpc.mk
@@ -8,11 +8,11 @@ GMPC_VERSION = 11.8.16
 GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION)
 GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY)
 GMPC_CONF_OPTS = --disable-mmkeys --disable-unique
-GMPC_LICENSE = GPLv2+
+GMPC_LICENSE = GPL-2.0+
 GMPC_LICENSE_FILES = COPYING
 GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \
 	libglib2 libgtk2 libmpd libsoup sqlite \
 	xlib_libICE xlib_libSM xlib_libX11 \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	$(TARGET_NLS_DEPENDENCIES)
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gmrender-resurrect/Config.in b/bsp/buildroot/package/gmrender-resurrect/Config.in
index 631c407f..db655ad7 100644
--- a/bsp/buildroot/package/gmrender-resurrect/Config.in
+++ b/bsp/buildroot/package/gmrender-resurrect/Config.in
@@ -3,8 +3,6 @@ config BR2_PACKAGE_GMRENDER_RESURRECT
 	depends on BR2_USE_WCHAR # gstreamer1 -> libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2, libupnp
 	depends on BR2_USE_MMU # gstreamer1
-	# uses <error.h>
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_GSTREAMER1
 	select BR2_PACKAGE_GST1_PLUGINS_BASE # run-time only
 	select BR2_PACKAGE_LIBUPNP
@@ -13,7 +11,6 @@ config BR2_PACKAGE_GMRENDER_RESURRECT
 
 	  https://github.com/hzeller/gmrender-resurrect
 
-comment "gmrender-resurrect needs a glibc or uClibc toolchain w/ wchar, threads"
+comment "gmrender-resurrect needs a toolchain w/ wchar, threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-		BR2_TOOLCHAIN_USES_MUSL
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash b/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash
index ba4561ea..522bd2ae 100644
--- a/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash
+++ b/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8cd9eae3e6be75684c9b7c4d29702fcbbeead0ded1d4f7cf8fb65fe1dc718596 gmrender-resurrect-48caaa4f6c386fd1586126c801cd326f96d5fa5c.tar.gz
+sha256 dcbde3601c3389e8dd21fe1842a92abf4cc06f6e3a375f1df63fdbf784a6650b  gmrender-resurrect-33600ab663f181c4f4f5c48aba25bf961760a300.tar.gz
diff --git a/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk b/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk
index 24608a1c..2b6a56f0 100644
--- a/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk
+++ b/bsp/buildroot/package/gmrender-resurrect/gmrender-resurrect.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-GMRENDER_RESURRECT_VERSION = 48caaa4f6c386fd1586126c801cd326f96d5fa5c
+GMRENDER_RESURRECT_VERSION = 33600ab663f181c4f4f5c48aba25bf961760a300
 GMRENDER_RESURRECT_SITE = $(call github,hzeller,gmrender-resurrect,$(GMRENDER_RESURRECT_VERSION))
 # Original distribution does not have default configure,
 # so we need to autoreconf:
 GMRENDER_RESURRECT_AUTORECONF = YES
-GMRENDER_RESURRECT_LICENSE = GPLv2+
+GMRENDER_RESURRECT_LICENSE = GPL-2.0+
 GMRENDER_RESURRECT_LICENSE_FILES = COPYING
 GMRENDER_RESURRECT_DEPENDENCIES = gstreamer1 libupnp
 
diff --git a/bsp/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch b/bsp/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch
index eee0a9a2..11507388 100644
--- a/bsp/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch
+++ b/bsp/buildroot/package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch
@@ -11,18 +11,24 @@ flags passed by Buildroot.
 
 [Romain:
  - rebase on top of 3.0.1 release]
+[Bernd:
+ - rebase on top of 3.0.5 release]
+[Benoît:
+ - rebase on top of 3.0.6 release]
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
 ---
- Make.defaults | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
+ Make.defaults |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/Make.defaults b/Make.defaults
-index 169273d..b0ddea0 100644
+index 51bd7d8..7d7e8e7 100755
 --- a/Make.defaults
 +++ b/Make.defaults
-@@ -80,14 +80,14 @@ endif
+@@ -85,14 +85,14 @@ OBJDIR       := $(TOPDIR)/$(ARCH)
  #
  
  # Arch-specific compilation flags
@@ -40,20 +46,31 @@ index 169273d..b0ddea0 100644
    ifeq ($(HOSTARCH),x86_64)
      ARCH3264 = -m32
    endif
-@@ -103,10 +103,10 @@ ifeq ($(ARCH),x86_64)
+@@ -109,19 +109,19 @@ ifeq ($(ARCH),x86_64)
                                   && [ $(GCCMINOR) -ge "7" ] ) ) \
                            && echo 1)
    ifeq ($(GCCNEWENOUGH),1)
 -    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
 +    override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
+   else ifeq ($(USING_CLANG),clang)
+-    CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
++    override CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
    endif
  
--  CFLAGS += -mno-red-zone -mno-mmx -mno-sse
-+  override CFLAGS += -mno-red-zone -mno-mmx -mno-sse
+-  CFLAGS += -mno-red-zone
++  override CFLAGS += -mno-red-zone
    ifeq ($(HOSTARCH),ia32)
      ARCH3264 = -m64
    endif
-@@ -127,7 +127,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
+ endif
+ 
+ ifeq ($(ARCH),mips64el)
+-  CFLAGS += -march=mips64r2
++  override CFLAGS += -march=mips64r2
+   ARCH3264 = -mabi=64
+ endif
+ 
+@@ -142,7 +142,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264)
  endif
  
  ifeq ($(ARCH),arm)
@@ -62,19 +79,25 @@ index 169273d..b0ddea0 100644
  endif
  
  # Generic compilation flags
-@@ -135,10 +135,10 @@ INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
-            -I$(TOPDIR)/inc/protocol
+@@ -152,15 +152,15 @@ INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -
+ # Only enable -fpic for non MinGW compilers (unneeded on MinGW)
+ GCCMACHINE := $(shell $(CC) -dumpmachine)
+ ifneq (mingw32,$(findstring mingw32, $(GCCMACHINE)))
+-  CFLAGS += -fpic
++  override CFLAGS += -fpic
+ endif
  
  ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
--CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
-+override CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
+-CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
++override CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
+            -fshort-wchar -fno-strict-aliasing \
             -ffreestanding -fno-stack-protector
  else
--CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
-+override CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
-            -fno-merge-constants -ffreestanding -fno-stack-protector       \
+-CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
++override CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
+            -fshort-wchar -fno-strict-aliasing \
+            -fno-merge-all-constants -ffreestanding -fno-stack-protector \
             -fno-stack-check
- endif
 -- 
-1.9.3
+2.11.0
 
diff --git a/bsp/buildroot/package/gnu-efi/0002-Fix-parallel-make-failure-for-archives.patch b/bsp/buildroot/package/gnu-efi/0002-Fix-parallel-make-failure-for-archives.patch
deleted file mode 100644
index 6e12388d..00000000
--- a/bsp/buildroot/package/gnu-efi/0002-Fix-parallel-make-failure-for-archives.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 7e9a26b0fc0bd8ed64a5eced5ea78bcea8ae3bbc Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Sat, 17 Jan 2015 18:44:04 +0100
-Subject: [PATCH 2/2] Fix parallel make failure for archives
-
-Upstream-Status: Pending
-
-The lib and gnuefi makefiles were using the lib.a() form which compiles
-and ar's as a pair instead of compiling all and then ar'ing which can
-parallelize better. This was resulting in build failures on larger values
-of -j.
-
-See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105
-for details.
-
-[Romain:
- - rebase on top of 3.0.1 release]
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- gnuefi/Makefile | 3 ++-
- lib/Makefile    | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/gnuefi/Makefile b/gnuefi/Makefile
-index d234ac0..d29575d 100644
---- a/gnuefi/Makefile
-+++ b/gnuefi/Makefile
-@@ -54,7 +54,8 @@ TARGETS	= crt0-efi-$(ARCH).o libgnuefi.a
- 
- all:	$(TARGETS)
- 
--libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS))
-+libgnuefi.a: $(OBJS)
-+	$(AR) rv $@ $(OBJS)
- 
- clean:
- 	rm -f $(TARGETS) *~ *.o $(OBJS)
-diff --git a/lib/Makefile b/lib/Makefile
-index 019ad57..c6abcae 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -73,7 +73,8 @@ all: libsubdirs libefi.a
- libsubdirs:
- 	for sdir in $(SUBDIRS); do mkdir -p $$sdir; done
- 
--libefi.a: $(patsubst %,libefi.a(%),$(OBJS))
-+libefi.a: $(OBJS)
-+	$(AR) rv $@ $(OBJS)
- 
- clean:
- 	rm -f libefi.a *~ $(OBJS) */*.o
--- 
-1.9.3
-
diff --git a/bsp/buildroot/package/gnu-efi/Config.in b/bsp/buildroot/package/gnu-efi/Config.in
index 982102fa..d8d92c2c 100644
--- a/bsp/buildroot/package/gnu-efi/Config.in
+++ b/bsp/buildroot/package/gnu-efi/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_GNU_EFI
 	bool "gnu-efi"
-	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_ARM_CPU_HAS_ARM || BR2_aarch64 || \
+		BR2_aarch64_be || BR2_i386 || BR2_x86_64
 	help
-	  Develop EFI applications for IA-64 (IPF), IA-32 (x86), and
-	  x86_64 platforms using the GNU toolchain and the EFI
-	  development environment.
+	  Develop EFI applications for ARM-64, ARM-32, x86_64, IA-64
+	  (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain
+	  and the EFI development environment.
 
 	  http://gnu-efi.sourceforge.net/
diff --git a/bsp/buildroot/package/gnu-efi/gnu-efi.hash b/bsp/buildroot/package/gnu-efi/gnu-efi.hash
index 21033bdd..1bd0f8c5 100644
--- a/bsp/buildroot/package/gnu-efi/gnu-efi.hash
+++ b/bsp/buildroot/package/gnu-efi/gnu-efi.hash
@@ -1,3 +1,5 @@
 # From http://sourceforge.net/projects/gnu-efi/files
-md5 c4099c443b6b0c2b04dedc33e7814ec0 gnu-efi-3.0.1.tar.bz2
-sha1 07eea4d72f7ecb7229aaa77ddd411de5673c67b6 gnu-efi-3.0.1.tar.bz2
+md5 46f633758a8a37db9fd6909fe270c26b gnu-efi-3.0.6.tar.bz2
+sha1 9f0f75b64c84423f3386da6f3200f5ed7471d9cb gnu-efi-3.0.6.tar.bz2
+# Locally computed
+sha256 21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91 gnu-efi-3.0.6.tar.bz2
diff --git a/bsp/buildroot/package/gnu-efi/gnu-efi.mk b/bsp/buildroot/package/gnu-efi/gnu-efi.mk
index a11ff819..d55e0274 100644
--- a/bsp/buildroot/package/gnu-efi/gnu-efi.mk
+++ b/bsp/buildroot/package/gnu-efi/gnu-efi.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GNU_EFI_VERSION = 3.0.1
+GNU_EFI_VERSION = 3.0.6
 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
 GNU_EFI_INSTALL_STAGING = YES
-GNU_EFI_LICENSE = BSD-3c and/or GPLv2+ (gnuefi), BSD-3c (efilib)
+GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib)
 GNU_EFI_LICENSE_FILES = README.efilib
 
 # gnu-efi is a set of library and header files used to build
@@ -20,6 +20,10 @@ ifeq ($(BR2_i386),y)
 GNU_EFI_PLATFORM = ia32
 else ifeq ($(BR2_x86_64),y)
 GNU_EFI_PLATFORM = x86_64
+else ifeq ($(BR2_arm)$(BR2_armeb),y)
+GNU_EFI_PLATFORM = arm
+else ifeq ($(BR2_aarch64)$(BR2_aarch64_be),y)
+GNU_EFI_PLATFORM = aarch64
 endif
 
 define GNU_EFI_BUILD_CMDS
diff --git a/bsp/buildroot/package/gnuchess/0001-fix-static-build-with-uClibc.patch b/bsp/buildroot/package/gnuchess/0001-fix-static-build-with-uClibc.patch
deleted file mode 100644
index 20a0835e..00000000
--- a/bsp/buildroot/package/gnuchess/0001-fix-static-build-with-uClibc.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 5bb2bc6384024c2344ef5cc6785131b382c38170 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Sun, 10 May 2015 22:19:03 +0200
-Subject: [PATCH] fix static build with uClibc
-
-uClibc doesn't provide lintl which should be provided
-by gettext. If gnuchess is linked statically, -lintl should
-be placed after libfrontend.a libadapter.a libengine.a.
-
-Fixes:
-http://autobuild.buildroot.net/results/dcb/dcb1c0eb7212bd8d1e0d8b51fd517b73b7569cea/
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- src/Makefile.am | 2 +-
- src/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ba90bce..fc02543 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -34,7 +34,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
- DISTCLEANFILES = *~
- 
- SUBDIRS = frontend adapter engine
--gnuchess_LDADD = $(LIBINTL) frontend/libfrontend.a adapter/libadapter.a engine/libengine.a
-+gnuchess_LDADD = frontend/libfrontend.a adapter/libadapter.a engine/libengine.a $(LIBINTL)
- 
- configmake.h: Makefile
- 	rm -f $@-t $@
-diff --git a/src/Makefile.in b/src/Makefile.in
-index 9460bfd..424da52 100644
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -395,7 +395,7 @@ AM_LDFLAGS = $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS)
- AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib
- DISTCLEANFILES = *~
- SUBDIRS = frontend adapter engine
--gnuchess_LDADD = $(LIBINTL) frontend/libfrontend.a adapter/libadapter.a engine/libengine.a
-+gnuchess_LDADD = frontend/libfrontend.a adapter/libadapter.a engine/libengine.a $(LIBINTL)
- BUILT_SOURCES = configmake.h
- CLEANFILES = configmake.h configmake.h-t
- all: $(BUILT_SOURCES) config.h
--- 
-1.9.3
-
diff --git a/bsp/buildroot/package/gnuchess/Config.in b/bsp/buildroot/package/gnuchess/Config.in
index 4993b1ad..0ddd2882 100644
--- a/bsp/buildroot/package/gnuchess/Config.in
+++ b/bsp/buildroot/package/gnuchess/Config.in
@@ -3,9 +3,9 @@ config BR2_PACKAGE_GNUCHESS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_FLEX
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  GNU Chess lets most modern computers play a full game of chess.
+	  GNU Chess lets most modern computers play a full game of
+	  chess.
 
 	  http://ftp.gnu.org/pub/gnu/chess
 
diff --git a/bsp/buildroot/package/gnuchess/gnuchess.mk b/bsp/buildroot/package/gnuchess/gnuchess.mk
index e066b01f..1465ab0a 100644
--- a/bsp/buildroot/package/gnuchess/gnuchess.mk
+++ b/bsp/buildroot/package/gnuchess/gnuchess.mk
@@ -6,11 +6,11 @@
 
 GNUCHESS_VERSION = 6.2.4
 GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
-GNUCHESS_LICENSE = GPLv2+
+GNUCHESS_LICENSE = GPL-2.0+
 GNUCHESS_LICENSE_FILES = COPYING
 
 GNUCHESS_DEPENDENCIES = host-flex flex
 GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline) \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	$(TARGET_NLS_DEPENDENCIES)
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gnupg/Config.in b/bsp/buildroot/package/gnupg/Config.in
index 30f215fe..2db46318 100644
--- a/bsp/buildroot/package/gnupg/Config.in
+++ b/bsp/buildroot/package/gnupg/Config.in
@@ -1,8 +1,7 @@
 config BR2_PACKAGE_GNUPG
 	bool "gnupg"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_NCURSES
 	depends on !BR2_PACKAGE_GNUPG2
+	select BR2_PACKAGE_ZLIB
 	help
 	  GnuPG is the GNU project's complete and free implementation
 	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
diff --git a/bsp/buildroot/package/gnupg/Config.in.host b/bsp/buildroot/package/gnupg/Config.in.host
new file mode 100644
index 00000000..36864157
--- /dev/null
+++ b/bsp/buildroot/package/gnupg/Config.in.host
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_HOST_GNUPG
+	bool "host gnupg"
+	help
+	  GnuPG is the GNU project's complete and free implementation
+	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
+	  to encrypt and sign your data and communication, features a
+	  versatile key management system as well as access modules
+	  for all kinds of public key directories. GnuPG, also known
+	  as GPG, is a command line tool with features for easy
+	  integration with other applications.
+
+	  http://gnupg.org/
diff --git a/bsp/buildroot/package/gnupg/gnupg.hash b/bsp/buildroot/package/gnupg/gnupg.hash
index abd76cde..3bacdf65 100644
--- a/bsp/buildroot/package/gnupg/gnupg.hash
+++ b/bsp/buildroot/package/gnupg/gnupg.hash
@@ -1,3 +1,3 @@
 # Locally computed based on signature
-# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.22.tar.bz2.sig
-sha256	9594a24bec63a21568424242e3f198b9d9828dea5ff0c335e47b06f835f930b4	gnupg-1.4.22.tar.bz2
+# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.23.tar.bz2.sig
+sha256	c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba	gnupg-1.4.23.tar.bz2
diff --git a/bsp/buildroot/package/gnupg/gnupg.mk b/bsp/buildroot/package/gnupg/gnupg.mk
index 29c46669..bedcf6c9 100644
--- a/bsp/buildroot/package/gnupg/gnupg.mk
+++ b/bsp/buildroot/package/gnupg/gnupg.mk
@@ -4,14 +4,31 @@
 #
 ################################################################################
 
-GNUPG_VERSION = 1.4.22
+GNUPG_VERSION = 1.4.23
 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2
 GNUPG_SITE = https://gnupg.org/ftp/gcrypt/gnupg
-GNUPG_LICENSE = GPLv3+
+GNUPG_LICENSE = GPL-3.0+
 GNUPG_LICENSE_FILES = COPYING
-GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+GNUPG_DEPENDENCIES = zlib $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no
-GNUPG_CONF_OPTS = --disable-rpath --enable-minimal --disable-regex
+GNUPG_CONF_OPTS = \
+	--disable-rpath \
+	--enable-minimal \
+	--disable-regex \
+	--enable-sha256 \
+	--enable-sha512
+
+HOST_GNUPG_DEPENDENCIES = host-zlib
+HOST_GNUPG_CONF_OPTS = \
+	--disable-rpath \
+	--enable-minimal \
+	--disable-regex \
+	--enable-sha256 \
+	--enable-sha512 \
+	--enable-aes \
+	--enable-rsa \
+	--without-libcurl \
+	--without-readline
 
 # gnupg doesn't support assembly for coldfire
 ifeq ($(BR2_m68k_cf),y)
@@ -63,3 +80,4 @@ GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGSPLIT
 endif
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/gnupg2/0001-fix-pth-config-usage.patch b/bsp/buildroot/package/gnupg2/0001-fix-pth-config-usage.patch
deleted file mode 100644
index 756d3513..00000000
--- a/bsp/buildroot/package/gnupg2/0001-fix-pth-config-usage.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix usage of PTH_CONFIG to work with pthsem
-
-The pthsem re-implement of pth provides a compatibility layer for pth,
-but its pth-config script behaves slightly differently than the
-original one when reporting the version number. This patch to gnupg2's
-configure script adjusts the version checking to support this
-difference, since Buildroot uses pth-config from pthsem.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[yann.morin.1998@free.fr: adapt to patch m4 macro for autoreconfiguring]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN gnupg2-2.0.29.orig/m4/gnupg-pth.m4 gnupg2-2.0.29/m4/gnupg-pth.m4
---- gnupg2-2.0.29.orig/m4/gnupg-pth.m4	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/m4/gnupg-pth.m4	2015-12-16 18:30:54.336513493 +0100
-@@ -17,7 +17,7 @@
- # Taken and modified from the m4 macros which come with Pth.
- AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
-   [
--    _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
-+    _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]2}'`
-     _req_version="ifelse([$1],,1.2.0,$1)"
- 
-     AC_MSG_CHECKING(for PTH - version >= $_req_version)
diff --git a/bsp/buildroot/package/gnupg2/0002-missing-include.patch b/bsp/buildroot/package/gnupg2/0002-missing-include.patch
deleted file mode 100644
index f20994ce..00000000
--- a/bsp/buildroot/package/gnupg2/0002-missing-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-tools/watchgnupg: select() is from sys/select.h
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN gnupg2-2.0.29.orig/tools/watchgnupg.c gnupg2-2.0.29/tools/watchgnupg.c
---- gnupg2-2.0.29.orig/tools/watchgnupg.c	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/tools/watchgnupg.c	2015-12-16 18:17:17.758057787 +0100
-@@ -32,6 +32,7 @@
- #include <sys/un.h>
- #include <fcntl.h>
- #include <time.h>
-+#include <sys/select.h>
- 
- #define PGM "watchgnupg"
- 
diff --git a/bsp/buildroot/package/gnupg2/0003-dont-run-tests.patch b/bsp/buildroot/package/gnupg2/0003-dont-run-tests.patch
deleted file mode 100644
index 1858a0de..00000000
--- a/bsp/buildroot/package/gnupg2/0003-dont-run-tests.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-tests: really don't run tests in cross-compilation
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN gnupg2-2.0.29.orig/tests/Makefile.am gnupg2-2.0.29/tests/Makefile.am
---- gnupg2-2.0.29.orig/tests/Makefile.am	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/tests/Makefile.am	2015-12-16 18:27:55.778227183 +0100
-@@ -64,6 +64,7 @@
- asschk_SOURCES = asschk.c
- 
- 
-+if RUN_GPG_TESTS
- all-local: inittests.stamp
- 
- clean-local:
-@@ -72,4 +73,5 @@
- inittests.stamp: inittests
- 	srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests
- 	echo timestamp >./inittests.stamp
-+endif # RUN_GPG_TESTS
- 
-diff -durN gnupg2-2.0.29.orig/tests/pkits/Makefile.am gnupg2-2.0.29/tests/pkits/Makefile.am
---- gnupg2-2.0.29.orig/tests/pkits/Makefile.am	2015-09-01 08:52:21.000000000 +0200
-+++ gnupg2-2.0.29/tests/pkits/Makefile.am	2015-12-16 18:44:06.422655594 +0100
-@@ -52,6 +52,7 @@
- 
- DISTCLEANFILES = pubring.kbx~ random_seed
- 
-+if RUN_GPG_TESTS
- all-local: inittests.stamp
- 
- clean-local:
-@@ -71,5 +72,5 @@
-            elif test $$? -eq 77; then echo "- SKIP $$tst"; \
- 	   fi; \
-          done
--
-+endif # RUN_GPG_TESTS
- 
diff --git a/bsp/buildroot/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch b/bsp/buildroot/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch
deleted file mode 100644
index 5eaefe4b..00000000
--- a/bsp/buildroot/package/gnupg2/0004-silence-git-when-not-in-git-tree.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-configure: silence autoreconf when not in a git tree
-
-When autoreconfiguring ourside of a git tree, the output is verbose
-with git errors.
-
-Silence that by consigning stderr to oblivion.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN gnupg2-2.0.29.orig/configure.ac gnupg2-2.0.29/configure.ac
---- gnupg2-2.0.29.orig/configure.ac	2015-09-08 14:39:24.000000000 +0200
-+++ gnupg2-2.0.29/configure.ac	2015-12-16 18:34:47.099493863 +0100
-@@ -33,11 +33,11 @@
- # flag indicating a development version (mym4_isgit).  Note that the
- # m4 processing is done by autoconf and not during the configure run.
- m4_define([mym4_revision],
--          m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
-+          m4_esyscmd([git rev-parse --short HEAD 2>/dev/null | tr -d '\n\r']))
- m4_define([mym4_revision_dec],
-           m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))]))
- m4_define([mym4_betastring],
--          m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long|\
-+          m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long 2>/dev/null |\
-                         awk -F- '$3!=0{print"-beta"$3}']))
- m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
- m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
diff --git a/bsp/buildroot/package/gnupg2/Config.in b/bsp/buildroot/package/gnupg2/Config.in
index ba2a6bcf..ef1817ef 100644
--- a/bsp/buildroot/package/gnupg2/Config.in
+++ b/bsp/buildroot/package/gnupg2/Config.in
@@ -1,20 +1,20 @@
-comment "gnupg2 needs a toolchain w/ dynamic library"
+comment "gnupg2 needs a toolchain w/ threads and dynamic library support"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GNUPG2
 	bool "gnupg2"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnpth
+	depends on BR2_USE_MMU # libassuan, libnpth
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LIBGPG_ERROR
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBASSUAN
 	select BR2_PACKAGE_LIBKSBA
-	select BR2_PACKAGE_LIBPTHSEM
-	select BR2_PACKAGE_LIBPTHSEM_COMPAT
+	select BR2_PACKAGE_LIBNPTH
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
-	depends on BR2_USE_MMU # libassuan
-	depends on !BR2_STATIC_LIBS
 	help
 	  GnuPG is the GNU project's complete and free implementation
 	  of the OpenPGP standard as defined by RFC4880. GnuPG allows
@@ -28,10 +28,10 @@ config BR2_PACKAGE_GNUPG2
 
 if BR2_PACKAGE_GNUPG2
 
-config BR2_PACKAGE_GNUPG2_GPGV2
-	bool "gpgv2"
+config BR2_PACKAGE_GNUPG2_GPGV
+	bool "gpgv"
 	help
-	  gpgv2 is an OpenPGP signature verification tool.
+	  gpgv is an OpenPGP signature verification tool.
 
 	  This program is actually a stripped-down version of gpg
 	  which is only able to check signatures. It is somewhat
diff --git a/bsp/buildroot/package/gnupg2/gnupg2.hash b/bsp/buildroot/package/gnupg2/gnupg2.hash
index 67f7d9da..f5890c5e 100644
--- a/bsp/buildroot/package/gnupg2/gnupg2.hash
+++ b/bsp/buildroot/package/gnupg2/gnupg2.hash
@@ -1,4 +1,6 @@
-# From https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html
-sha1	a9f024588c356a55e2fd413574bfb55b2e18794a	gnupg-2.0.30.tar.bz2
-# Calculated based on the hash above
-sha256	e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71	gnupg-2.0.30.tar.bz2
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000425.html
+sha1 d87553a125832ea90e8aeb3ceeecf24f88de56fb  gnupg-2.2.8.tar.bz2
+# Calculated based on the hash above and signature
+# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.8.tar.bz2.sig
+sha256 777b4cb8ced21965a5053d4fa20fe11484f0a478f3d011cef508a1a49db50dcd  gnupg-2.2.8.tar.bz2
+sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357  COPYING
diff --git a/bsp/buildroot/package/gnupg2/gnupg2.mk b/bsp/buildroot/package/gnupg2/gnupg2.mk
index 763e9454..3151860f 100644
--- a/bsp/buildroot/package/gnupg2/gnupg2.mk
+++ b/bsp/buildroot/package/gnupg2/gnupg2.mk
@@ -4,31 +4,27 @@
 #
 ################################################################################
 
-GNUPG2_VERSION = 2.0.30
+GNUPG2_VERSION = 2.2.8
 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2
-GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg
-GNUPG2_LICENSE = GPLv3+
+GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg
+GNUPG2_LICENSE = GPL-3.0+
 GNUPG2_LICENSE_FILES = COPYING
-GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libpthsem \
-	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-
-# Patching configure.ac and m4 macros, as well as Makefile.am
-GNUPG2_AUTORECONF = YES
+GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libnpth \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
 
 GNUPG2_CONF_OPTS = \
-	--disable-rpath --disable-regex --disable-doc \
+	--disable-rpath --disable-regex \
 	--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
 	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 	--with-libassuan-prefix=$(STAGING_DIR)/usr \
 	--with-ksba-prefix=$(STAGING_DIR)/usr \
-	--with-pth-prefix=$(STAGING_DIR)/usr
-GNUPG2_CONF_ENV = gl_cv_header_working_stdint_h=yes
+	--with-npth-prefix=$(STAGING_DIR)/usr
 
-ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y)
-define GNUPG2_REMOVE_GPGV2
-	rm -f $(TARGET_DIR)/usr/bin/gpgv2
+ifneq ($(BR2_PACKAGE_GNUPG2_GPGV),y)
+define GNUPG2_REMOVE_GPGV
+	rm -f $(TARGET_DIR)/usr/bin/gpgv
 endef
-GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2
+GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
@@ -38,9 +34,17 @@ else
 GNUPG2_CONF_OPTS += --disable-bzip2
 endif
 
-ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+GNUPG2_CONF_OPTS += --enable-gnutls
+GNUPG2_DEPENDENCIES += gnutls
+else
+GNUPG2_CONF_OPTS += --disable-gnutls
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+GNUPG2_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/libusb-1.0"
 GNUPG2_CONF_OPTS += --enable-ccid-driver
-GNUPG2_DEPENDENCIES += libusb-compat
+GNUPG2_DEPENDENCIES += libusb
 else
 GNUPG2_CONF_OPTS += --disable-ccid-driver
 endif
@@ -52,4 +56,11 @@ else
 GNUPG2_CONF_OPTS += --without-readline
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+GNUPG2_CONF_OPTS += --enable-sqlite
+GNUPG2_DEPENDENCIES += sqlite
+else
+GNUPG2_CONF_OPTS += --disable-sqlite
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gnuplot/gnuplot.hash b/bsp/buildroot/package/gnuplot/gnuplot.hash
index a71d0065..1ea8c285 100644
--- a/bsp/buildroot/package/gnuplot/gnuplot.hash
+++ b/bsp/buildroot/package/gnuplot/gnuplot.hash
@@ -1,3 +1,5 @@
-# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.5/
-md5 c5e96fca73afbee4f57cbc1bfce6b3b8  gnuplot-5.0.5.tar.gz
-sha1 c35f55657fdc33217dd70bbf3148578563ecaad1  gnuplot-5.0.5.tar.gz
+# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.6/
+md5 8ec46520a86a61163a701b00404faf1a  gnuplot-5.0.6.tar.gz
+sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0  gnuplot-5.0.6.tar.gz
+# Locally computed
+sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460  gnuplot-5.0.6.tar.gz
diff --git a/bsp/buildroot/package/gnuplot/gnuplot.mk b/bsp/buildroot/package/gnuplot/gnuplot.mk
index 3e00eefe..d59605c5 100644
--- a/bsp/buildroot/package/gnuplot/gnuplot.mk
+++ b/bsp/buildroot/package/gnuplot/gnuplot.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GNUPLOT_VERSION = 5.0.5
+GNUPLOT_VERSION = 5.0.6
 GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
 GNUPLOT_LICENSE = gnuplot license (open source)
 GNUPLOT_LICENSE_FILES = Copyright
diff --git a/bsp/buildroot/package/gnuradio/0002-fix_cmake_3_5_0_build_failure.patch b/bsp/buildroot/package/gnuradio/0002-fix_cmake_3_5_0_build_failure.patch
deleted file mode 100644
index 15d7dea7..00000000
--- a/bsp/buildroot/package/gnuradio/0002-fix_cmake_3_5_0_build_failure.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Changing CMAKE_{SOURCE,BINARY}_DIR like volk does in its top-level
-CMakeLists.txt no longer works with CMake 3.5.0.
-
-Use PROJECT_{BINARY,SOURCE}_DIR instead.
-
-Obtained from: http://pkgs.fedoraproject.org/cgit/rpms/gnuradio.git/commit/?id=b50c7e66f6e3a1e6a84e25505d3fd873756c2027
-Upstream patch and discussion: https://github.com/gnuradio/volk/pull/65
-
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
----
- apps/CMakeLists.txt | 12 ++++++------
- lib/CMakeLists.txt  | 48 ++++++++++++++++++++++++------------------------
- 2 files changed, 30 insertions(+), 30 deletions(-)
-
-diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt
-index 74ed18d..f9ef6e0 100644
---- a/volk/apps/CMakeLists.txt
-+++ b/volk/apps/CMakeLists.txt
-@@ -19,23 +19,23 @@
- # Setup profiler
- ########################################################################
- if(MSVC)
--    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
-+    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
- endif(MSVC)
- 
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}
-     ${CMAKE_CURRENT_BINARY_DIR}
--    ${CMAKE_SOURCE_DIR}/include
--    ${CMAKE_BINARY_DIR}/include
--    ${CMAKE_SOURCE_DIR}/lib
--    ${CMAKE_BINARY_DIR}/lib
-+    ${PROJECT_SOURCE_DIR}/include
-+    ${PROJECT_BINARY_DIR}/include
-+    ${PROJECT_SOURCE_DIR}/lib
-+    ${PROJECT_BINARY_DIR}/lib
-     ${Boost_INCLUDE_DIRS}
- )
- 
- # MAKE volk_profile
- add_executable(volk_profile
-     ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
--    ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
-+    ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
- )
- 
- 
-diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt
-index 35b67dc..f00200a 100644
---- a/volk/lib/CMakeLists.txt
-+++ b/volk/lib/CMakeLists.txt
-@@ -90,7 +90,7 @@ endif()
- ########################################################################
- execute_process(
-     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
-     --mode "arch_flags" --compiler "${COMPILER_NAME}"
-     OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -278,7 +278,7 @@ message(STATUS "Available architectures: ${available_archs}")
- ########################################################################
- execute_process(
-     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
-     --mode "machines" --archs "${available_archs}"
-     OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
- )
-@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${available_machines}")
- ########################################################################
- 
- #dependencies are all python, xml, and header implementation files
--file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
--file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
--file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
-+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
-+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
-+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
- 
- macro(gen_template tmpl output)
-     list(APPEND volk_gen_sources ${output})
-@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
-         OUTPUT ${output}
-         DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
-         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--        ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
-+        ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
-         --input ${tmpl} --output ${output} ${ARGN}
-     )
- endmacro(gen_template)
- 
--make_directory(${CMAKE_BINARY_DIR}/include/volk)
-+make_directory(${PROJECT_BINARY_DIR}/include/volk)
- 
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h              ${CMAKE_BINARY_DIR}/include/volk/volk.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c              ${CMAKE_BINARY_DIR}/lib/volk.c)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
--gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h              ${PROJECT_BINARY_DIR}/include/volk/volk.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c              ${PROJECT_BINARY_DIR}/lib/volk.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
-+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
- 
- set(BASE_CFLAGS NONE)
- string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
-@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:::${CMAKE_C_FLAGS_${GRCBTU}} ${CMAKE_C_FL
- foreach(machine_name ${available_machines})
-     #generate machine source
-     set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
--    gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
-+    gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
- 
-     #determine machine flags
-     execute_process(
-         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
--        ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
-+        ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
-         --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
-         OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
-     )
-@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ${COMPILER_INFO})
- # Set local include directories first
- ########################################################################
- include_directories(
--    ${CMAKE_BINARY_DIR}/include
--    ${CMAKE_SOURCE_DIR}/include
--    ${CMAKE_SOURCE_DIR}/kernels
-+    ${PROJECT_BINARY_DIR}/include
-+    ${PROJECT_SOURCE_DIR}/include
-+    ${PROJECT_SOURCE_DIR}/kernels
-     ${CMAKE_CURRENT_BINARY_DIR}
-     ${CMAKE_CURRENT_SOURCE_DIR}
- )
-@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9")
-       # setup architecture specific assembler flags
-       set(ARCH_ASM_FLAGS "-mfpu=neon -g")
-       # then add the files
--      include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
--      file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
-+      include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
-+      file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
-       foreach(asm_file ${asm_files})
-         list(APPEND volk_sources ${asm_file})
-         message(STATUS "Adding source file: ${asm_file}")
-@@ -453,7 +453,7 @@ if(ORC_FOUND)
-     list(APPEND volk_libraries ${ORC_LIBRARIES})
- 
-     #setup orc functions
--    file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
-+    file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
-     foreach(orc_file ${orc_files})
- 
-         #extract the name for the generated c source from the orc file
-@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machine_defs}")
- 
- if(MSVC)
-     #add compatibility includes for stdint types
--    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
-+    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
-     add_definitions(-DHAVE_CONFIG_H)
-     #compile the sources as C++ due to the lack of complex.h under MSVC
-     set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/gnuradio/0003-fix_compilation_in_gcc-6.patch b/bsp/buildroot/package/gnuradio/0003-fix_compilation_in_gcc-6.patch
deleted file mode 100644
index f50af856..00000000
--- a/bsp/buildroot/package/gnuradio/0003-fix_compilation_in_gcc-6.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit a1cf11937665392bcfa223a5095ff903eb44c69b
-Author: Jaroslav #karvada <jskarvad@redhat.com>
-Date:   Fri Feb 12 18:29:13 2016 +0100
-
-Backport patch from
-http://gnuradio.org/redmine/projects/gnuradio/repository/revisions/a1cf11937665392bcfa223a5095ff903eb44c69b
-
-Fix compilation in gcc-6
-	    
-Signed-off-by: Jaroslav #karvada <jskarvad@redhat.com>
-Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
----
-diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
-index b0ecb85..a39ee4f 100644
---- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
-+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
-@@ -28,6 +28,10 @@
- #include <gnuradio/fec/generic_decoder.h>
- #include <gnuradio/fec/polar_common.h>
- 
-+#ifndef BOOST_CONSTEXPR_OR_CONST
-+#define BOOST_CONSTEXPR_OR_CONST const
-+#endif
-+
- namespace gr {
-   namespace fec {
-     namespace code {
-@@ -64,7 +68,7 @@ namespace gr {
-         bool set_frame_size(unsigned int frame_size){return false;};
- 
-       private:
--        static const float D_LLR_FACTOR = -2.19722458f;
-+        static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f;
-         unsigned int d_frozen_bit_counter;
- 
-       protected:
diff --git a/bsp/buildroot/package/gnuradio/Config.in b/bsp/buildroot/package/gnuradio/Config.in
index 8301afe8..178bdc88 100644
--- a/bsp/buildroot/package/gnuradio/Config.in
+++ b/bsp/buildroot/package/gnuradio/Config.in
@@ -14,6 +14,7 @@ config BR2_PACKAGE_GNURADIO
 	select BR2_PACKAGE_BOOST_DATE_TIME
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	select BR2_PACKAGE_BOOST_REGEX
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_THREAD
 	help
@@ -32,7 +33,7 @@ if BR2_PACKAGE_GNURADIO
 
 config BR2_PACKAGE_GNURADIO_AUDIO
 	bool "gr-audio"
-	depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO
+	select BR2_PACKAGE_ALSA_LIB if !BR2_PACKAGE_PORTAUDIO
 	help
 	  Add audio source/sink to GNU Radio
 
diff --git a/bsp/buildroot/package/gnuradio/gnuradio.hash b/bsp/buildroot/package/gnuradio/gnuradio.hash
index bb934e2b..86944f48 100644
--- a/bsp/buildroot/package/gnuradio/gnuradio.hash
+++ b/bsp/buildroot/package/gnuradio/gnuradio.hash
@@ -1,2 +1,2 @@
 # From http://gnuradio.org/releases/gnuradio/sha256sums
-sha256	9c06f0f1ec14113203e0486fd526dd46ecef216dfe42f12d78d9b781b1ef967e	gnuradio-3.7.9.1.tar.gz
+sha256 87d9ba3183858efdbb237add3f9de40f7d65f25e16904a9bc8d764a7287252d4  gnuradio-3.7.11.tar.gz
diff --git a/bsp/buildroot/package/gnuradio/gnuradio.mk b/bsp/buildroot/package/gnuradio/gnuradio.mk
index f1817f61..a55c1161 100644
--- a/bsp/buildroot/package/gnuradio/gnuradio.mk
+++ b/bsp/buildroot/package/gnuradio/gnuradio.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GNURADIO_VERSION = 3.7.9.1
+GNURADIO_VERSION = 3.7.11
 GNURADIO_SITE = http://gnuradio.org/releases/gnuradio
-GNURADIO_LICENSE = GPLv3+
+GNURADIO_LICENSE = GPL-3.0+
 GNURADIO_LICENSE_FILES = COPYING
 
 GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO
@@ -30,6 +30,10 @@ GNURADIO_CONF_OPTS = \
 # compile time.
 GNURADIO_INSTALL_STAGING = YES
 
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+GNURADIO_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
+endif
+
 # Yes, this is silly, because -march is already known by the compiler
 # with the internal toolchain, and passed by the external wrapper for
 # external toolchains. Nonetheless, gnuradio does some matching on the
diff --git a/bsp/buildroot/package/gnutls/Config.in b/bsp/buildroot/package/gnutls/Config.in
index cfb7cb3f..176951a3 100644
--- a/bsp/buildroot/package/gnutls/Config.in
+++ b/bsp/buildroot/package/gnutls/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
+	# https://gitlab.com/gnutls/gnutls/issues/203
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_LIBTASN1
 	select BR2_PACKAGE_LIBUNISTRING
 	select BR2_PACKAGE_NETTLE
 	select BR2_PACKAGE_PCRE
-	depends on BR2_USE_WCHAR
 	help
 	  GnuTLS is a secure communications library implementing the SSL
 	  and TLS protocols and technologies around them.
@@ -18,9 +20,10 @@ config BR2_PACKAGE_GNUTLS_TOOLS
 	select BR2_PACKAGE_ARGP_STANDALONE \
 		if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	help
-	  Install GnuTLS command line tools for various cryptographic tasks.
+	  Install GnuTLS command line tools for various cryptographic
+	  tasks.
 
 endif
 
-comment "gnutls needs a toolchain w/ wchar"
-	depends on !BR2_USE_WCHAR
+comment "gnutls needs a toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/gnutls/gnutls.hash b/bsp/buildroot/package/gnutls/gnutls.hash
index f6997168..bbcd5bd4 100644
--- a/bsp/buildroot/package/gnutls/gnutls.hash
+++ b/bsp/buildroot/package/gnutls/gnutls.hash
@@ -1,2 +1,6 @@
 # Locally calculated after checking pgp signature
-sha256	79f5480ad198dad5bc78e075f4a40c4a315a1b2072666919d2d05a08aec13096	gnutls-3.5.13.tar.xz
+# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.5/gnutls-3.5.19.tar.xz.sig
+sha256	1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44	gnutls-3.5.19.tar.xz
+# Locally calculated
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	doc/COPYING
+sha256	6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3	doc/COPYING.LESSER
diff --git a/bsp/buildroot/package/gnutls/gnutls.mk b/bsp/buildroot/package/gnutls/gnutls.mk
index 4d8981ae..1cf1f281 100644
--- a/bsp/buildroot/package/gnutls/gnutls.mk
+++ b/bsp/buildroot/package/gnutls/gnutls.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 GNUTLS_VERSION_MAJOR = 3.5
-GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).13
+GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).19
 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz
 GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR)
-GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library)
+GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library)
 GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER
 GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre
 GNUTLS_CONF_OPTS = \
diff --git a/bsp/buildroot/package/go-bootstrap/Config.in.host b/bsp/buildroot/package/go-bootstrap/Config.in.host
new file mode 100644
index 00000000..fab80d24
--- /dev/null
+++ b/bsp/buildroot/package/go-bootstrap/Config.in.host
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS
+	bool
+	# See src/cmd/dist/unix.c for the list of support
+	# architectures
+	default y if BR2_HOSTARCH = "x86"
+	default y if BR2_HOSTARCH = "x86_64"
+	default y if BR2_HOSTARCH = "arm"
diff --git a/bsp/buildroot/package/go-bootstrap/go-bootstrap.mk b/bsp/buildroot/package/go-bootstrap/go-bootstrap.mk
index f403f784..6710e315 100644
--- a/bsp/buildroot/package/go-bootstrap/go-bootstrap.mk
+++ b/bsp/buildroot/package/go-bootstrap/go-bootstrap.mk
@@ -8,7 +8,7 @@ GO_BOOTSTRAP_VERSION = 1.4.3
 GO_BOOTSTRAP_SITE = https://storage.googleapis.com/golang
 GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).src.tar.gz
 
-GO_BOOTSTRAP_LICENSE = BSD-3c
+GO_BOOTSTRAP_LICENSE = BSD-3-Clause
 GO_BOOTSTRAP_LICENSE_FILES = LICENSE
 
 # To build programs that need cgo support the toolchain needs to be
@@ -17,7 +17,7 @@ GO_BOOTSTRAP_LICENSE_FILES = LICENSE
 # host-go-bootstrap.
 HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain
 
-HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/usr/lib/go-$(GO_BOOTSTRAP_VERSION)
+HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_VERSION)
 
 # The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE
 # here.  See https://github.com/golang/go/issues/11685.
diff --git a/bsp/buildroot/package/go/Config.in.host b/bsp/buildroot/package/go/Config.in.host
index a210033e..c871ac41 100644
--- a/bsp/buildroot/package/go/Config.in.host
+++ b/bsp/buildroot/package/go/Config.in.host
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
 	bool
 	default y
+	depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS
 	depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \
 		|| BR2_i386 || BR2_x86_64 || BR2_powerpc64le \
 		|| BR2_mips64 || BR2_mips64el
diff --git a/bsp/buildroot/package/go/go.hash b/bsp/buildroot/package/go/go.hash
index e50f0041..445a0b7c 100644
--- a/bsp/buildroot/package/go/go.hash
+++ b/bsp/buildroot/package/go/go.hash
@@ -1,2 +1,2 @@
-# Locally computed:
-sha256 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc  go1.7.4.src.tar.gz
+# From https://golang.org/dl/
+sha256	a4ab229028ed167ba1986825751463605264e44868362ca8e7accc8be057e993	go1.9.src.tar.gz
diff --git a/bsp/buildroot/package/go/go.mk b/bsp/buildroot/package/go/go.mk
index a5ac74b5..23facbdd 100644
--- a/bsp/buildroot/package/go/go.mk
+++ b/bsp/buildroot/package/go/go.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GO_VERSION = 1.7.4
+GO_VERSION = 1.9
 GO_SITE = https://storage.googleapis.com/golang
 GO_SOURCE = go$(GO_VERSION).src.tar.gz
 
-GO_LICENSE = BSD-3c
+GO_LICENSE = BSD-3-Clause
 GO_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_arm),y)
@@ -37,7 +37,7 @@ GO_GOARCH = mips64le
 endif
 
 HOST_GO_DEPENDENCIES = host-go-bootstrap
-HOST_GO_ROOT = $(HOST_DIR)/usr/lib/go
+HOST_GO_ROOT = $(HOST_DIR)/lib/go
 
 # For the convienience of target packages.
 HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)
@@ -101,8 +101,8 @@ define HOST_GO_INSTALL_CMDS
 	$(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/go $(HOST_GO_ROOT)/bin/go
 	$(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt
 
-	ln -sf ../lib/go/bin/go $(HOST_DIR)/usr/bin/
-	ln -sf ../lib/go/bin/gofmt $(HOST_DIR)/usr/bin/
+	ln -sf ../lib/go/bin/go $(HOST_DIR)/bin/
+	ln -sf ../lib/go/bin/gofmt $(HOST_DIR)/bin/
 
 	cp -a $(@D)/lib $(HOST_GO_ROOT)/
 
diff --git a/bsp/buildroot/package/gob2/gob2.mk b/bsp/buildroot/package/gob2/gob2.mk
index 04d02e11..fe606738 100644
--- a/bsp/buildroot/package/gob2/gob2.mk
+++ b/bsp/buildroot/package/gob2/gob2.mk
@@ -12,4 +12,4 @@ HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2
 $(eval $(host-autotools-package))
 
 # gob2 for the host
-GOB2_HOST_BINARY = $(HOST_DIR)/usr/bin/gob2
+GOB2_HOST_BINARY = $(HOST_DIR)/bin/gob2
diff --git a/bsp/buildroot/package/google-breakpad/Config.in b/bsp/buildroot/package/google-breakpad/Config.in
index e0e91068..91ec9ce3 100644
--- a/bsp/buildroot/package/google-breakpad/Config.in
+++ b/bsp/buildroot/package/google-breakpad/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC)
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT
 	help
 	  Google-Breakpad is a library and tool suite that allows you
@@ -36,6 +37,7 @@ config BR2_PACKAGE_GOOGLE_BREAKPAD
 
 comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8"
 	depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS || \
 		!(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \
diff --git a/bsp/buildroot/package/google-breakpad/Config.in.host b/bsp/buildroot/package/google-breakpad/Config.in.host
new file mode 100644
index 00000000..28d30476
--- /dev/null
+++ b/bsp/buildroot/package/google-breakpad/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_GOOGLE_BREAKPAD_ARCH_SUPPORTS
+	bool
+	default y if BR2_HOSTARCH = "x86_64"
+	default y if BR2_HOSTARCH = "x86"
+	default y if BR2_HOSTARCH = "arm"
+	default y if BR2_HOSTARCH = "aarch64"
+	default y if BR2_HOSTARCH = "mips"
+	default y if BR2_HOSTARCH = "mipsel"
diff --git a/bsp/buildroot/package/google-breakpad/google-breakpad.mk b/bsp/buildroot/package/google-breakpad/google-breakpad.mk
index 68ff853a..8ae5f99b 100644
--- a/bsp/buildroot/package/google-breakpad/google-breakpad.mk
+++ b/bsp/buildroot/package/google-breakpad/google-breakpad.mk
@@ -11,16 +11,16 @@ GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools
 # Only a static library is installed
 GOOGLE_BREAKPAD_INSTALL_TARGET = NO
 GOOGLE_BREAKPAD_INSTALL_STAGING = YES
-GOOGLE_BREAKPAD_LICENSE = BSD-3c
+GOOGLE_BREAKPAD_LICENSE = BSD-3-Clause
 GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE
 GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support
 
-HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support 
+HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support
 
 # Avoid using depot-tools to download this file.
 define HOST_GOOGLE_BREAKPAD_LSS
 	$(INSTALL) -D -m 0644 \
-		$(HOST_DIR)/usr/include/linux_syscall_support.h \
+		$(HOST_DIR)/include/linux_syscall_support.h \
 		$(@D)/src/third_party/lss/linux_syscall_support.h
 endef
 HOST_GOOGLE_BREAKPAD_PRE_CONFIGURE_HOOKS += HOST_GOOGLE_BREAKPAD_LSS
diff --git a/bsp/buildroot/package/google-material-design-icons/Config.in b/bsp/buildroot/package/google-material-design-icons/Config.in
index a2004298..775f258f 100644
--- a/bsp/buildroot/package/google-material-design-icons/Config.in
+++ b/bsp/buildroot/package/google-material-design-icons/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS
 	bool "google-material-design-icons"
 	help
-	  Material design icons are the official icon set from Google that
-	  are designed under the material design guidelines.
+	  Material design icons are the official icon set from Google
+	  that are designed under the material design guidelines.
 
 	  https://github.com/google/material-design-icons
 
diff --git a/bsp/buildroot/package/googlefontdirectory/googlefontdirectory.mk b/bsp/buildroot/package/googlefontdirectory/googlefontdirectory.mk
index 0e60892b..c34de3b0 100644
--- a/bsp/buildroot/package/googlefontdirectory/googlefontdirectory.mk
+++ b/bsp/buildroot/package/googlefontdirectory/googlefontdirectory.mk
@@ -7,7 +7,7 @@
 GOOGLEFONTDIRECTORY_SITE = \
 	https://s3.amazonaws.com/joemaller_google_webfonts
 GOOGLEFONTDIRECTORY_SOURCE = googlewebfonts.tgz
-GOOGLEFONTDIRECTORY_LICENSE = OFLv1.1
+GOOGLEFONTDIRECTORY_LICENSE = OFL-1.1
 
 GOOGLEFONTDIRECTORY_FONTS = \
 	$(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS))
diff --git a/bsp/buildroot/package/gperf/gperf.mk b/bsp/buildroot/package/gperf/gperf.mk
index 8ce3c95f..2a6192a4 100644
--- a/bsp/buildroot/package/gperf/gperf.mk
+++ b/bsp/buildroot/package/gperf/gperf.mk
@@ -6,7 +6,7 @@
 
 GPERF_VERSION = 3.0.4
 GPERF_SITE = $(BR2_GNU_MIRROR)/gperf
-GPERF_LICENSE = GPLv3+
+GPERF_LICENSE = GPL-3.0+
 GPERF_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/bsp/buildroot/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch
new file mode 100644
index 00000000..01c7424a
--- /dev/null
+++ b/bsp/buildroot/package/gpm/0004-Use-sigemptyset-API-instead-of-__sigemptyset.patch
@@ -0,0 +1,33 @@
+From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 25 Jun 2017 07:25:33 -0700
+Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
+
+__sigemptyset has been removed from glibc public
+API headers in upcoming (2.26) release onwards
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+---
+ src/prog/gpm-root.y | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
+index 5126c65..76c896c 100644
+--- a/src/prog/gpm-root.y
++++ b/src/prog/gpm-root.y
+@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
+                                                         LOG_DAEMON : LOG_USER);
+    /* reap your zombies */
+    childaction.sa_handler=reap_children;
+-#if defined(__GLIBC__)
+-   __sigemptyset(&childaction.sa_mask);
+-#else /* __GLIBC__ */
+    sigemptyset(&childaction.sa_mask);
+-#endif /* __GLIBC__ */
+    childaction.sa_flags=0;
+    sigaction(SIGCHLD,&childaction,NULL);
+ 
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/gpm/Config.in b/bsp/buildroot/package/gpm/Config.in
index 2d0d366d..11584799 100644
--- a/bsp/buildroot/package/gpm/Config.in
+++ b/bsp/buildroot/package/gpm/Config.in
@@ -3,11 +3,11 @@ config BR2_PACKAGE_GPM
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # fork()
 	help
-	  "gpm" means general purpose mouse (server) and provides mouse support
-	  for Linux virtual consoles.
-	  gpm-root (to draw menus in current virtual console; config file in
-	  /etc/gpm-root.conf) and disable-paste (to disable paste buffer for
-	  security reasons), will also be installed.
+	  "gpm" means general purpose mouse (server) and provides mouse
+	  support for Linux virtual consoles.
+	  gpm-root (to draw menus in current virtual console; config
+	  file in /etc/gpm-root.conf) and disable-paste (to disable
+	  paste buffer for security reasons), will also be installed.
 
 	  http://www.nico.schottelius.org/software/gpm/
 
diff --git a/bsp/buildroot/package/gpm/gpm.mk b/bsp/buildroot/package/gpm/gpm.mk
index ed4c1fd3..f59d059a 100644
--- a/bsp/buildroot/package/gpm/gpm.mk
+++ b/bsp/buildroot/package/gpm/gpm.mk
@@ -7,7 +7,7 @@
 GPM_VERSION = 1.20.7
 GPM_SOURCE = gpm-$(GPM_VERSION).tar.lzma
 GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives
-GPM_LICENSE = GPLv2+
+GPM_LICENSE = GPL-2.0+
 GPM_LICENSE_FILES = COPYING
 GPM_INSTALL_STAGING = YES
 GPM_DEPENDENCIES = host-bison
diff --git a/bsp/buildroot/package/gpsd/0002-SConstruct-do-not-force-O2-by-default.patch b/bsp/buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch
similarity index 100%
rename from bsp/buildroot/package/gpsd/0002-SConstruct-do-not-force-O2-by-default.patch
rename to bsp/buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch
diff --git a/bsp/buildroot/package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch b/bsp/buildroot/package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch
deleted file mode 100644
index 9e91a02e..00000000
--- a/bsp/buildroot/package/gpsd/0001-do-not-interact-with-systemctl-when-cross-compiling.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 777cb3737ae85b13642fff48eabb601c4d40f527 Mon Sep 17 00:00:00 2001
-From: James Knight <james.d.knight@live.com>
-Date: Tue, 16 Feb 2016 23:51:08 -0500
-Subject: [PATCH] do not interact with systemctl when cross-compiling
-
-The installation process for GPSd on a systemd environment will attempt
-to reload systemd's manager configuration (systemctl daemon-reload).
-This is to allow the system to take advantage of the newly installed
-GPSd services. When cross-compiling, the installation process should not
-attempt to interact with the build environment's systemd instance (if
-any). The following change checks if the build is not cross compiling
-(via 'not env["sysroot"]') before attempting to do a systemd reload.
-
-Signed-off-by: James Knight <james.d.knight@live.com>
-[yann.morin.1998@free.fr: tweak to apply on 3.16]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- SConstruct | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index c3bfd0d1..97c1b3a9 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -1909,10 +1909,12 @@ udev_install = Utility('udev-install', 'install', [
-     ] + hotplug_wrapper_install)
- 
- if env['systemd']:
-+    env.Requires(udev_install, systemd_install)
-+
-+if env['systemd'] and not env["sysroot"]:
-     systemctl_daemon_reload = Utility('systemctl-daemon-reload', '', [ 'systemctl daemon-reload || true'])
-     env.AlwaysBuild(systemctl_daemon_reload)
-     env.Precious(systemctl_daemon_reload)
--    env.Requires(udev_install, systemd_install)
-     env.Requires(systemctl_daemon_reload, systemd_install)
-     env.Requires(udev_install, systemctl_daemon_reload)
- 
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch b/bsp/buildroot/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch
new file mode 100644
index 00000000..1dfa9607
--- /dev/null
+++ b/bsp/buildroot/package/gpsd/0002-Fix-isync-build-when-ublox-not-selected-too.patch
@@ -0,0 +1,36 @@
+From 98c8f5f4429ac3bfc09eee235fee08b9aaff8c52 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Tue, 30 Jan 2018 19:58:54 -0800
+Subject: [PATCH] Fix isync build when ublox not selected too.
+
+The isync support uses the ublox driver, but if the ublox support is
+disabled while isync is enabled, the build will fail.
+
+
+Upstream commit:
+http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=98c8f5f4429ac3bfc09eee235fee08b9aaff8c52
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ SConstruct | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/SConstruct b/SConstruct
+index 1c1a215..c6a309e 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -334,6 +334,11 @@ for driver in ('ashtech',
+         env['nmea0183'] = True
+         break
+ 
++
++# iSync uses ublox underneath, so we force to enable it
++if env['isync']:
++    env['ublox'] = True
++
+ opts.Save('.scons-option-cache', env)
+ env.SConsignFile(".sconsign.dblite")
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/gpsd/Config.in b/bsp/buildroot/package/gpsd/Config.in
index 876ab9b0..849d22ff 100644
--- a/bsp/buildroot/package/gpsd/Config.in
+++ b/bsp/buildroot/package/gpsd/Config.in
@@ -10,10 +10,11 @@ menuconfig BR2_PACKAGE_GPSD
 	# Always tries to build a shared library
 	depends on !BR2_STATIC_LIBS
 	help
-	  gpsd is a service daemon that monitors one or more GPSes or AIS
-	  receivers attached to a host computer through serial or USB ports,
-	  making all data on the location/course/velocity of the sensors
-	  available to be queried on TCP port 2947 of the host computer.
+	  gpsd is a service daemon that monitors one or more GPSes or
+	  AIS receivers attached to a host computer through serial or
+	  USB ports, making all data on the location/course/velocity of
+	  the sensors available to be queried on TCP port 2947 of the
+	  host computer.
 
 	  The D-Bus interface is included if dbus-glib is enabled.
 
@@ -37,6 +38,8 @@ config BR2_PACKAGE_GPSD_PROFILING
 	bool "profiling support"
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on !BR2_aarch64
+	# Needs glibc for ARC arc-2018.03-eng007+ for correct __mcount linking
+	depends on !BR2_arc
 
 comment "profiling support not available with uClibc-based toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
@@ -151,6 +154,11 @@ config BR2_PACKAGE_GPSD_GPSCLOCK
 	help
 	  GPSClock support
 
+config BR2_PACKAGE_GPSD_ISYNC
+	bool "iSync"
+	help
+	  Spectratime iSync LNRClok/GRCLOK support
+
 config BR2_PACKAGE_GPSD_ITRAX
 	bool "iTrax"
 	help
diff --git a/bsp/buildroot/package/gpsd/gpsd.hash b/bsp/buildroot/package/gpsd/gpsd.hash
index 3083af24..805c298b 100644
--- a/bsp/buildroot/package/gpsd/gpsd.hash
+++ b/bsp/buildroot/package/gpsd/gpsd.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029	gpsd-3.16.tar.gz
+sha256	68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a	gpsd-3.17.tar.gz
+sha256	71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832	COPYING
diff --git a/bsp/buildroot/package/gpsd/gpsd.mk b/bsp/buildroot/package/gpsd/gpsd.mk
index 7c2d37be..8c8023e8 100644
--- a/bsp/buildroot/package/gpsd/gpsd.mk
+++ b/bsp/buildroot/package/gpsd/gpsd.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GPSD_VERSION = 3.16
+GPSD_VERSION = 3.17
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
-GPSD_LICENSE = BSD-3c
+GPSD_LICENSE = BSD-3-Clause
 GPSD_LICENSE_FILES = COPYING
 GPSD_INSTALL_STAGING = YES
 
@@ -111,6 +111,9 @@ endif
 ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
 GPSD_SCONS_OPTS += gpsclock=no
 endif
+ifneq ($(BR2_PACKAGE_GPSD_ISYNC),y)
+GPSD_SCONS_OPTS += isync=no
+endif
 ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y)
 GPSD_SCONS_OPTS += itrax=no
 endif
diff --git a/bsp/buildroot/package/gptfdisk/Config.in b/bsp/buildroot/package/gptfdisk/Config.in
index 22dc4014..ede72f3b 100644
--- a/bsp/buildroot/package/gptfdisk/Config.in
+++ b/bsp/buildroot/package/gptfdisk/Config.in
@@ -10,9 +10,10 @@ config BR2_PACKAGE_GPTFDISK
 		!(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK)
 	help
 	  GPT fdisk (consisting of the gdisk and sgdisk programs) is a
-	  text-mode partitioning tool that works on Globally Unique Identifier
-	  (GUID) Partition Table (GPT) disks, rather than on the more common
-	  (through 2010) Master Boot Record (MBR) partition tables.
+	  text-mode partitioning tool that works on Globally Unique
+	  Identifier (GUID) Partition Table (GPT) disks, rather than on
+	  the more common (through 2010) Master Boot Record (MBR)
+	  partition tables.
 
 	  http://www.rodsbooks.com/gdisk/
 
@@ -22,23 +23,24 @@ config BR2_PACKAGE_GPTFDISK_GDISK
 	bool "interactive gdisk"
 	help
 	  Install the interactive GUID partition table (GPT) manipulator
-	  /usr/sbin/gdisk which is modelled after and quite similar in use
-	  to the traditional MBR based fdisk tool.
+	  /usr/sbin/gdisk which is modelled after and quite similar in
+	  use to the traditional MBR based fdisk tool.
 
 config BR2_PACKAGE_GPTFDISK_SGDISK
 	bool "command line sgdisk"
 	select BR2_PACKAGE_POPT
 	help
-	  Install the command-line GUID partition table (GPT) manipulator
-	  /usr/sbin/sgdisk which is named after the traditional MBR based
-	  sfdisk tool albeit with an entirely different option syntax.
+	  Install the command-line GUID partition table (GPT)
+	  manipulator /usr/sbin/sgdisk which is named after the
+	  traditional MBR based sfdisk tool albeit with an entirely
+	  different option syntax.
 
 config BR2_PACKAGE_GPTFDISK_CGDISK
 	bool "ncurses cgdisk"
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
 	depends on BR2_USE_WCHAR # ncurses wchar
 	depends on !(BR2_bfin && BR2_BINFMT_FLAT) # ncurses wchar support
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16
 	help
 	  Install the ncurses-based GUID partition table (GPT)
 	  manipulator /usr/sbin/cgdisk.
diff --git a/bsp/buildroot/package/gptfdisk/gptfdisk.hash b/bsp/buildroot/package/gptfdisk/gptfdisk.hash
index 0a72e0d9..d55797c0 100644
--- a/bsp/buildroot/package/gptfdisk/gptfdisk.hash
+++ b/bsp/buildroot/package/gptfdisk/gptfdisk.hash
@@ -1,3 +1,5 @@
-# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.0/
-md5	2061f917af084215898d4fea04d8388f	gptfdisk-1.0.0.tar.gz
-sha1	97f25db2def1c1939ed3954520bfd9948806d95a	gptfdisk-1.0.0.tar.gz
+# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.3/
+md5 07b625a583b66c8c5840be5923f3e3fe  gptfdisk-1.0.3.tar.gz
+sha1 9a74bbe7805d562316e92417f71e4b03155308e6  gptfdisk-1.0.3.tar.gz
+# Locally computed
+sha256 89fd5aec35c409d610a36cb49c65b442058565ed84042f767bba614b8fc91b5c  gptfdisk-1.0.3.tar.gz
diff --git a/bsp/buildroot/package/gptfdisk/gptfdisk.mk b/bsp/buildroot/package/gptfdisk/gptfdisk.mk
index 274591c7..b669e22a 100644
--- a/bsp/buildroot/package/gptfdisk/gptfdisk.mk
+++ b/bsp/buildroot/package/gptfdisk/gptfdisk.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GPTFDISK_VERSION = 1.0.0
+GPTFDISK_VERSION = 1.0.3
 GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk
-GPTFDISK_LICENSE = GPLv2+
+GPTFDISK_LICENSE = GPL-2.0+
 GPTFDISK_LICENSE_FILES = COPYING
 
 GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk
@@ -22,13 +22,8 @@ GPTFDISK_DEPENDENCIES += ncurses
 endif
 
 ifeq ($(BR2_STATIC_LIBS),y)
-# gptfdisk dependencies may link against libintl/libiconv, so we need
-# to do so as well when linking statically
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-GPTFDISK_DEPENDENCIES += gettext
-GPTFDISK_LDLIBS += -lintl
-endif
-
+# gptfdisk dependencies may link against libiconv, so we need to do so
+# as well when linking statically
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 GPTFDISK_DEPENDENCIES += libiconv
 GPTFDISK_LDLIBS += -liconv
@@ -53,7 +48,7 @@ define HOST_GPTFDISK_BUILD_CMDS
 endef
 
 define HOST_GPTFDISK_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/sgdisk $(HOST_DIR)/usr/sbin/sgdisk
+	$(INSTALL) -D -m 0755 $(@D)/sgdisk $(HOST_DIR)/sbin/sgdisk
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/gqrx/0001-fix_compilation_in_gcc-6.patch b/bsp/buildroot/package/gqrx/0001-fix_compilation_in_gcc-6.patch
new file mode 100644
index 00000000..22ec1eff
--- /dev/null
+++ b/bsp/buildroot/package/gqrx/0001-fix_compilation_in_gcc-6.patch
@@ -0,0 +1,34 @@
+From e6baaee4968345a53e977f593362267a91041cff Mon Sep 17 00:00:00 2001
+From: Valentin Ochs <a@0au.de>
+Date: Fri, 21 Oct 2016 20:12:50 +0200
+Subject: [PATCH] Cosmetic & readability changes
+
+Backport patch from
+https://github.com/csete/gqrx/commit/e6baaee4968345a53e977f593362267a91041cff
+
+Fix compilation in gcc-6
+
+Signed-off-by: Valentin Ochs <a@0au.de>
+Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
+---
+diff --git a/src/qtgui/plotter.cpp b/src/qtgui/plotter.cpp
+index e491632..b877546 100644
+--- a/src/qtgui/plotter.cpp
++++ b/src/qtgui/plotter.cpp
+@@ -1336,8 +1336,11 @@ void CPlotter::drawOverlay()
+ #endif
+ 
+             int level = 0;
+-            for (; level < nLevels && tagEnd[level] > x; level++);
+-                level %= nLevels;
++            while(level < nLevels && tagEnd[level] > x)
++                level++;
++            
++            if(level == nLevels)
++                level = 0;
+ 
+             tagEnd[level] = x + nameWidth + slant - 1;
+             m_BookmarkTags.append(qMakePair<QRect, qint64>(QRect(x, level * levelHeight, nameWidth + slant, fontHeight), bookmarks[i].frequency));
+-- 
+2.10.2
+
diff --git a/bsp/buildroot/package/gqrx/Config.in b/bsp/buildroot/package/gqrx/Config.in
new file mode 100644
index 00000000..1dc40c6d
--- /dev/null
+++ b/bsp/buildroot/package/gqrx/Config.in
@@ -0,0 +1,42 @@
+comment "gqrx needs a toolchain w/ C++, threads, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_USE_WCHAR
+
+comment "gqrx needs qt5, gnuradio, fftw's single precision"
+	depends on !BR2_PACKAGE_GNURADIO || !BR2_PACKAGE_FFTW_PRECISION_SINGLE || \
+		!BR2_PACKAGE_QT5
+
+config BR2_PACKAGE_GQRX
+	bool "gqrx"
+	depends on BR2_PACKAGE_FFTW_PRECISION_SINGLE # gnuradio
+	depends on BR2_PACKAGE_GNURADIO
+	depends on BR2_PACKAGE_QT5
+	depends on BR2_INSTALL_LIBSTDCPP # boost
+	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
+	depends on BR2_USE_WCHAR # boost
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
+	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_GNURADIO_ANALOG
+	select BR2_PACKAGE_GNURADIO_AUDIO
+	select BR2_PACKAGE_GNURADIO_BLOCKS
+	select BR2_PACKAGE_GNURADIO_DIGITAL
+	select BR2_PACKAGE_GNURADIO_FFT
+	select BR2_PACKAGE_GNURADIO_FILTER
+	select BR2_PACKAGE_GR_OSMOSDR
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	select BR2_PACKAGE_QT5SVG
+	help
+	  Gqrx is an open source software defined radio (SDR) receiver
+	  implemented using GNU Radio and the Qt GUI
+	  toolkit. Currently it works on Linux and Mac with hardware
+	  supported by gr-osmosdr, including Funcube Dongle, RTL-SDR,
+	  Airspy, HackRF, BladeRF, RFSpace, USRP and SoapySDR.
+
+	  Gqrx can operate as an AM/FM/SSB receiver with audio output
+	  or as an FFT-only instrument. There are also various hooks
+	  for interacting with external application using network
+	  sockets.
+
+	  http://gqrx.dk/
diff --git a/bsp/buildroot/package/gqrx/gqrx.hash b/bsp/buildroot/package/gqrx/gqrx.hash
new file mode 100644
index 00000000..bb52a616
--- /dev/null
+++ b/bsp/buildroot/package/gqrx/gqrx.hash
@@ -0,0 +1,2 @@
+# Locally calculated:
+sha256 2736a963dac4051ca8ae91a440ee6643ef7d26c9de5b9c83a369d5fc9328d453  gqrx-v2.6.1.tar.gz
diff --git a/bsp/buildroot/package/gqrx/gqrx.mk b/bsp/buildroot/package/gqrx/gqrx.mk
new file mode 100644
index 00000000..2a7651c2
--- /dev/null
+++ b/bsp/buildroot/package/gqrx/gqrx.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# gqrx
+#
+################################################################################
+
+GQRX_VERSION = v2.6.1
+GQRX_SITE = $(call github,csete,gqrx,$(GQRX_VERSION))
+GQRX_LICENSE = GPL-3.0+, Apache-2.0
+GQRX_LICENSE_FILES = COPYING LICENSE-CTK
+GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg
+
+GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/gqview/gqview.mk b/bsp/buildroot/package/gqview/gqview.mk
index 89620258..08376308 100644
--- a/bsp/buildroot/package/gqview/gqview.mk
+++ b/bsp/buildroot/package/gqview/gqview.mk
@@ -8,7 +8,7 @@ GQVIEW_VERSION = 2.1.5
 GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview
 GQVIEW_DEPENDENCIES = host-pkgconf libgtk2
 GQVIEW_CONF_ENV = LIBS="-lm"
-GQVIEW_LICENSE = GPLv2
+GQVIEW_LICENSE = GPL-2.0
 GQVIEW_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gr-osmosdr/gr-osmosdr.mk b/bsp/buildroot/package/gr-osmosdr/gr-osmosdr.mk
index d7c3d624..55e043ef 100644
--- a/bsp/buildroot/package/gr-osmosdr/gr-osmosdr.mk
+++ b/bsp/buildroot/package/gr-osmosdr/gr-osmosdr.mk
@@ -6,7 +6,7 @@
 
 GR_OSMOSDR_VERSION = 164a09fc11cec2d8b15b38e8b512fa542d6cecc7
 GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION))
-GR_OSMOSDR_LICENSE = GPLv3+
+GR_OSMOSDR_LICENSE = GPL-3.0+
 GR_OSMOSDR_LICENSE_FILES = COPYING
 
 # gr-osmosdr prevents doing an in-source-tree build
diff --git a/bsp/buildroot/package/granite/granite.hash b/bsp/buildroot/package/granite/granite.hash
index e073307d..b9ed2874 100644
--- a/bsp/buildroot/package/granite/granite.hash
+++ b/bsp/buildroot/package/granite/granite.hash
@@ -1,4 +1,4 @@
-# From https://launchpad.net/granite/0.4/0.4.0.1/+download/granite-0.4.0.1.tar.xz/+md5
-md5	db41150ca6e77162392362686e848086	granite-0.4.0.1.tar.xz
+# From https://launchpad.net/granite/0.4/0.4.1/+download/granite-0.4.1.tar.xz/+md5
+md5 b1002c0488bb9ade0ef89730c4f84393 granite-0.4.1.tar.xz
 # Calculated based on the hash above
-sha256	95a142a8befeedc35a089d638e759b657905508dc3007036d6c1fa3efe94c4dd	granite-0.4.0.1.tar.xz
+sha256 8bb411523e6cd5685c928dbfe08893892189cedf9fad5f537aa76182032cf09c  granite-0.4.1.tar.xz
diff --git a/bsp/buildroot/package/granite/granite.mk b/bsp/buildroot/package/granite/granite.mk
index 3faedf9c..f824ba7f 100644
--- a/bsp/buildroot/package/granite/granite.mk
+++ b/bsp/buildroot/package/granite/granite.mk
@@ -5,12 +5,12 @@
 ################################################################################
 
 GRANITE_VERSION_MAJOR = 0.4
-GRANITE_VERSION = $(GRANITE_VERSION_MAJOR).0.1
+GRANITE_VERSION = $(GRANITE_VERSION_MAJOR).1
 GRANITE_SITE = https://launchpad.net/granite/$(GRANITE_VERSION_MAJOR)/$(GRANITE_VERSION)/+download
 GRANITE_SOURCE = granite-$(GRANITE_VERSION).tar.xz
 GRANITE_DEPENDENCIES = host-pkgconf host-vala libgee libglib2 libgtk3
 GRANITE_INSTALL_STAGING = YES
-GRANITE_LICENSE = LGPLv3+
+GRANITE_LICENSE = LGPL-3.0+
 GRANITE_LICENSE_FILES = COPYING
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/grantlee/grantlee.mk b/bsp/buildroot/package/grantlee/grantlee.mk
index f921d7b9..575b63fe 100644
--- a/bsp/buildroot/package/grantlee/grantlee.mk
+++ b/bsp/buildroot/package/grantlee/grantlee.mk
@@ -3,10 +3,11 @@
 # grantlee
 #
 ################################################################################
+
 GRANTLEE_VERSION = 5.1.0
 GRANTLEE_SITE = http://downloads.grantlee.org
 GRANTLEE_INSTALL_STAGING = YES
-GRANTLEE_LICENSE = LGPLv2.1+
+GRANTLEE_LICENSE = LGPL-2.1+
 GRANTLEE_LICENSE_FILES = COPYING.LIB
 GRANTLEE_DEPENDENCIES = qt5base qt5script
 
diff --git a/bsp/buildroot/package/graphite2/0001-disable-double-promotion.patch b/bsp/buildroot/package/graphite2/0001-disable-double-promotion.patch
index 3bda3d7c..888d8623 100644
--- a/bsp/buildroot/package/graphite2/0001-disable-double-promotion.patch
+++ b/bsp/buildroot/package/graphite2/0001-disable-double-promotion.patch
@@ -5,14 +5,16 @@ so just disable it.
 
 Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
 [Gustavo: update for 1.3.5]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: update for 1.3.10]
 
 diff -Nura graphite2-1.3.5.orig/src/CMakeLists.txt graphite2-1.3.5/src/CMakeLists.txt
 --- graphite2-1.3.5.orig/src/CMakeLists.txt	2016-02-15 11:46:45.941906112 -0300
 +++ graphite2-1.3.5/src/CMakeLists.txt	2016-02-15 11:46:54.237194222 -0300
 @@ -111,9 +111,6 @@
-         COMPILE_FLAGS   "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector"
-         LINK_FLAGS      "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" 
-         LINKER_LANGUAGE C)
+     if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
+         add_definitions(-mfpmath=sse -msse2)
+     endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86|i.86")
 -    if (CMAKE_COMPILER_IS_GNUCXX)
 -        add_definitions(-Wdouble-promotion)
 -    endif (CMAKE_COMPILER_IS_GNUCXX)
diff --git a/bsp/buildroot/package/graphite2/graphite2.hash b/bsp/buildroot/package/graphite2/graphite2.hash
index 86be69e1..ecf082b0 100644
--- a/bsp/buildroot/package/graphite2/graphite2.hash
+++ b/bsp/buildroot/package/graphite2/graphite2.hash
@@ -1,3 +1,5 @@
 # From http://sourceforge.net/projects/silgraphite/files/graphite2
-md5	17e6a3b1a88c100c9e3fc0763c85d269	graphite2-1.3.9.tgz
-sha1	0693e9eef87edf1792db247dd38794211666a1b9	graphite2-1.3.9.tgz
+md5 b39d5ed21195f8b709bcee548c87e2b5  graphite2-1.3.10.tgz
+sha1 668f3bce96fc02d90ea875b401ed36b2e8957d2f  graphite2-1.3.10.tgz
+# Locally computed
+sha256 90fde3b2f9ea95d68ffb19278d07d9b8a7efa5ba0e413bebcea802ce05cda1ae  graphite2-1.3.10.tgz
diff --git a/bsp/buildroot/package/graphite2/graphite2.mk b/bsp/buildroot/package/graphite2/graphite2.mk
index 5f6848fa..2bb4f463 100644
--- a/bsp/buildroot/package/graphite2/graphite2.mk
+++ b/bsp/buildroot/package/graphite2/graphite2.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GRAPHITE2_VERSION = 1.3.9
+GRAPHITE2_VERSION = 1.3.10
 GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz
 GRAPHITE2_SITE = http://downloads.sourceforge.net/project/silgraphite/graphite2
 GRAPHITE2_INSTALL_STAGING = YES
-GRAPHITE2_LICENSE = LGPLv2.1+
+GRAPHITE2_LICENSE = LGPL-2.1+
 GRAPHITE2_LICENSE_FILES = LICENSE
 
 # Avoid building docs and tests to save time
diff --git a/bsp/buildroot/package/grep/Config.in b/bsp/buildroot/package/grep/Config.in
index 64276506..5b0471b4 100644
--- a/bsp/buildroot/package/grep/Config.in
+++ b/bsp/buildroot/package/grep/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GREP
 	bool "grep"
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  The GNU regular expression matcher.
 
diff --git a/bsp/buildroot/package/grep/grep.hash b/bsp/buildroot/package/grep/grep.hash
index 326737a2..10a5e320 100644
--- a/bsp/buildroot/package/grep/grep.hash
+++ b/bsp/buildroot/package/grep/grep.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking signature
-sha256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb  grep-2.27.tar.xz
+# http://ftp.gnu.org/gnu/grep/grep-3.1.tar.xz.sig
+sha256 db625c7ab3bb3ee757b3926a5cfa8d9e1c3991ad24707a83dde8a5ef2bf7a07e  grep-3.1.tar.xz
+sha256 ca372a7d92560b1fa9f6d832b440e8bcd62d9adfa8870c98287deab66d98310e  COPYING
diff --git a/bsp/buildroot/package/grep/grep.mk b/bsp/buildroot/package/grep/grep.mk
index 7615f30b..6e44a189 100644
--- a/bsp/buildroot/package/grep/grep.mk
+++ b/bsp/buildroot/package/grep/grep.mk
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-GREP_VERSION = 2.27
+GREP_VERSION = 3.1
 GREP_SITE = $(BR2_GNU_MIRROR)/grep
 GREP_SOURCE = grep-$(GREP_VERSION).tar.xz
-GREP_LICENSE = GPLv3+
+GREP_LICENSE = GPL-3.0+
 GREP_LICENSE_FILES = COPYING
-GREP_CONF_OPTS = --disable-perl-regexp \
-	$(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex)
-GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+GREP_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 # link with iconv if enabled
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
@@ -23,6 +21,8 @@ endif
 ifeq ($(BR2_PACKAGE_PCRE),y)
 GREP_CONF_OPTS += --enable-perl-regexp
 GREP_DEPENDENCIES += pcre
+else
+GREP_CONF_OPTS += --disable-perl-regexp
 endif
 
 # Full grep preferred over busybox grep
diff --git a/bsp/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/bsp/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
index 7fa61817..420ceda8 100644
--- a/bsp/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
+++ b/bsp/buildroot/package/gsettings-desktop-schemas/gsettings-desktop-schemas.mk
@@ -10,7 +10,7 @@ GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP
 GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR)
 GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES
 GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-intltool host-pkgconf libglib2
-GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPLv2.1+
+GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPL-2.1+
 GSETTINGS_DESKTOP_SCHEMAS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gsl/gsl.hash b/bsp/buildroot/package/gsl/gsl.hash
index bc33e4e2..f7b1d533 100644
--- a/bsp/buildroot/package/gsl/gsl.hash
+++ b/bsp/buildroot/package/gsl/gsl.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53	gsl-1.16.tar.gz
+sha256 562500b789cd599b3a4f88547a7a3280538ab2ff4939504c8b4ac4ca25feadfb  gsl-2.3.tar.gz
diff --git a/bsp/buildroot/package/gsl/gsl.mk b/bsp/buildroot/package/gsl/gsl.mk
index 0ad5377e..41379f43 100644
--- a/bsp/buildroot/package/gsl/gsl.mk
+++ b/bsp/buildroot/package/gsl/gsl.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GSL_VERSION = 1.16
+GSL_VERSION = 2.3
 GSL_SITE = $(BR2_GNU_MIRROR)/gsl
 GSL_INSTALL_STAGING = YES
-GSL_LICENSE = GPLv3
+GSL_LICENSE = GPL-3.0
 GSL_LICENSE_FILES = COPYING
 GSL_CONFIG_SCRIPTS = gsl-config
 
diff --git a/bsp/buildroot/package/gssdp/Config.in b/bsp/buildroot/package/gssdp/Config.in
index 83149718..80c5edff 100644
--- a/bsp/buildroot/package/gssdp/Config.in
+++ b/bsp/buildroot/package/gssdp/Config.in
@@ -6,7 +6,8 @@ config BR2_PACKAGE_GSSDP
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBSOUP
 	help
-	  GSSDP implements resource discovery and announcement over SSDP.
+	  GSSDP implements resource discovery and announcement over
+	  SSDP.
 
 	  http://www.gupnp.org
 
diff --git a/bsp/buildroot/package/gssdp/gssdp.hash b/bsp/buildroot/package/gssdp/gssdp.hash
index b646d185..acf6b3ab 100644
--- a/bsp/buildroot/package/gssdp/gssdp.hash
+++ b/bsp/buildroot/package/gssdp/gssdp.hash
@@ -1,2 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.1.sha256sum:
-sha256	601d67f40bc28c067742b7c46f3018da96b364fd3e83f30ddac6e190e323d2e1	gssdp-1.0.1.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.2.sha256sum:
+sha256 a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc  gssdp-1.0.2.tar.xz
+
+# Hash for license file:
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
diff --git a/bsp/buildroot/package/gssdp/gssdp.mk b/bsp/buildroot/package/gssdp/gssdp.mk
index fa44a2ca..2ce1f9b0 100644
--- a/bsp/buildroot/package/gssdp/gssdp.mk
+++ b/bsp/buildroot/package/gssdp/gssdp.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 GSSDP_VERSION_MAJOR = 1.0
-GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).1
+GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).2
 GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz
 GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR)
-GSSDP_LICENSE = LGPLv2+
+GSSDP_LICENSE = LGPL-2.0+
 GSSDP_LICENSE_FILES = COPYING
 GSSDP_INSTALL_STAGING = YES
 GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup
diff --git a/bsp/buildroot/package/gstreamer/gst-ffmpeg/Config.in b/bsp/buildroot/package/gstreamer/gst-ffmpeg/Config.in
index 2164ea2e..32bfdd53 100644
--- a/bsp/buildroot/package/gstreamer/gst-ffmpeg/Config.in
+++ b/bsp/buildroot/package/gstreamer/gst-ffmpeg/Config.in
@@ -7,12 +7,12 @@ config BR2_PACKAGE_GST_FFMPEG
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	help
-	  GStreamer plugin containing one plugin with a set of elements using
-	  the Libav library. It contains most popular decoders as well as
-	  colorspace conversion elements.
+	  GStreamer plugin containing one plugin with a set of
+	  elements using the Libav library. It contains most popular
+	  decoders as well as colorspace conversion elements.
 
-	  This package is configured to use an internal copy of the Libav
-	  library.
+	  This package is configured to use an internal copy of the
+	  Libav library.
 
 	  http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html
 
diff --git a/bsp/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/bsp/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index 3992fdf3..6f41efb0 100644
--- a/bsp/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/bsp/buildroot/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -12,11 +12,11 @@ GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
 
 ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y)
 GST_FFMPEG_CONF_OPTS += --disable-lgpl
-GST_FFMPEG_LICENSE = GPLv2+ (gst-ffmpeg), GPLv2+/GPLv3+ (libav)
+GST_FFMPEG_LICENSE = GPL-2.0+ (gst-ffmpeg), GPL-2.0+/GPL-3.0+ (libav)
 GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
 else
 GST_FFMPEG_CONF_OPTS += --enable-lgpl
-GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPLv2.1+/LGPLv3+ (libav)
+GST_FFMPEG_LICENSE = LGPL-2.0+ (gst-ffmpeg), LGPL-2.1+/LGPL-3.0+ (libav)
 GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3
 endif
 
diff --git a/bsp/buildroot/package/gstreamer/gst-fsl-plugins/Config.in b/bsp/buildroot/package/gstreamer/gst-fsl-plugins/Config.in
index 8921aa33..a2ff11ec 100644
--- a/bsp/buildroot/package/gstreamer/gst-fsl-plugins/Config.in
+++ b/bsp/buildroot/package/gstreamer/gst-fsl-plugins/Config.in
@@ -18,17 +18,18 @@ config BR2_PACKAGE_GST_FSL_PLUGINS
 	select BR2_PACKAGE_FREESCALE_IMX
 	help
 	  GStreamer plugins for hardware-accelerated audio and video
-	  parsers and codecs on i.MX platforms. It requires a kernel that
-	  includes the i.MX specific headers to be built.
+	  parsers and codecs on i.MX platforms. It requires a kernel
+	  that includes the i.MX specific headers to be built.
 
-	  To use the VPU, its firmware blob must be installed as well. This
-	  can be found in the firmware-imx package in the "Hardware handling"
-	  menu.
+	  To use the VPU, its firmware blob must be installed as
+	  well. This can be found in the firmware-imx package in the
+	  "Hardware handling" menu.
 
 	  This library is provided by Freescale as-is and doesn't have
 	  an upstream. Pengutronix maintains gst-fsl-plugins at
-	  git://git.pengutronix.de/git/imx/gst-plugins-fsl-vpu.git
-	  but it diverges heavily from Freescale's original implementation.
+	  git://git.pengutronix.de/git/imx/gst-plugins-fsl-vpu.git but
+	  it diverges heavily from Freescale's original
+	  implementation.
 
 if BR2_PACKAGE_GST_FSL_PLUGINS
 choice
@@ -45,12 +46,12 @@ config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233
 	bool "imx233"
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
 	bool "imx25"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
 	bool "imx27"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28
 	bool "imx28"
@@ -62,28 +63,28 @@ config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35
 	bool "imx35"
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
 	bool "imx37"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
 	bool "imx50"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
 	bool "imx51"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
 	bool "imx53"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X
 	bool "imx5X"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X
 
 config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6
-	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
 	bool "imx6"
+	select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q
 
 endchoice
 
diff --git a/bsp/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/bsp/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
index 65993a27..547d253e 100644
--- a/bsp/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
+++ b/bsp/buildroot/package/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk
@@ -7,9 +7,9 @@
 GST_FSL_PLUGINS_VERSION = 4.0.3
 GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE)
 
-# Most is LGPLv2+, but some sources are copied from upstream and are
-# LGPLv2.1+, which essentially makes it LGPLv2.1+
-GST_FSL_PLUGINS_LICENSE = LGPLv2+, LGPLv2.1+, PROPRIETARY (asf.h)
+# Most is LGPL-2.0+, but some sources are copied from upstream and are
+# LGPL-2.1+, which essentially makes it LGPL-2.1+
+GST_FSL_PLUGINS_LICENSE = LGPL-2.0+, LGPL-2.1+, PROPRIETARY (asf.h)
 GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2
 
 GST_FSL_PLUGINS_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/gstreamer/gst-plugin-x170/Config.in b/bsp/buildroot/package/gstreamer/gst-plugin-x170/Config.in
index 30036705..d0ba763a 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugin-x170/Config.in
+++ b/bsp/buildroot/package/gstreamer/gst-plugin-x170/Config.in
@@ -6,8 +6,8 @@ config BR2_PACKAGE_GST_PLUGIN_X170
 	depends on BR2_LINUX_KERNEL # on2-8170-libs
 	select BR2_PACKAGE_ON2_8170_LIBS
 	help
-	  GStreamer plug-in to use the Hantro X170 video decoder present on
-	  ATMEL AT91SAM9M10 SoC.
+	  GStreamer plug-in to use the Hantro X170 video decoder
+	  present on ATMEL AT91SAM9M10 SoC.
 
 	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 
diff --git a/bsp/buildroot/package/gstreamer/gst-plugins-bad/Config.in b/bsp/buildroot/package/gstreamer/gst-plugins-bad/Config.in
index d54415a1..939fc7a7 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugins-bad/Config.in
+++ b/bsp/buildroot/package/gstreamer/gst-plugins-bad/Config.in
@@ -57,8 +57,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 	bool "debugutils"
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK
-	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
+	depends on BR2_INSTALL_LIBSTDCPP
 
 comment "decklink needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
@@ -261,8 +261,8 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
-	depends on BR2_PACKAGE_DIRECTFB
 	default y
+	depends on BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
diff --git a/bsp/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/bsp/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
index 98e5c1cf..b9416db3 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
+++ b/bsp/buildroot/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BAD_VERSION = 0.10.23
 GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz
 GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad
 # COPYING.LIB is in fact v2, but most of the code is v2.1+
-GST_PLUGINS_BAD_LICENSE = LGPLv2.1+, GPLv2+
+GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+
 GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING
 
 GST_PLUGINS_BAD_CONF_OPTS = \
diff --git a/bsp/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk b/bsp/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
index 1c2f9acd..73531436 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
+++ b/bsp/buildroot/package/gstreamer/gst-plugins-base/gst-plugins-base.mk
@@ -8,7 +8,7 @@ GST_PLUGINS_BASE_VERSION = 0.10.36
 GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz
 GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base
 GST_PLUGINS_BASE_INSTALL_STAGING = YES
-GST_PLUGINS_BASE_LICENSE = GPLv2+, LGPLv2+
+GST_PLUGINS_BASE_LICENSE = GPL-2.0+, LGPL-2.0+
 GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB
 
 # freetype is only used by examples, but if it is not found
diff --git a/bsp/buildroot/package/gstreamer/gst-plugins-good/Config.in b/bsp/buildroot/package/gstreamer/gst-plugins-good/Config.in
index 65f74e81..3b2a99f5 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugins-good/Config.in
+++ b/bsp/buildroot/package/gstreamer/gst-plugins-good/Config.in
@@ -2,8 +2,8 @@ menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD
 	bool "gst-plugins-good"
 	select BR2_PACKAGE_GST_PLUGINS_BASE
 	help
-	  A set of well-supported plug-ins for GStreamer under the preferred
-	  license.
+	  A set of well-supported plug-ins for GStreamer under the
+	  preferred license.
 
 	  http://gstreamer.freedesktop.org/
 
@@ -201,17 +201,18 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4
 	bool "oss4 (Open Sound System 4)"
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE
+	bool "pulseaudio"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	depends on BR2_USE_MMU # pulseaudio
 	depends on !BR2_STATIC_LIBS # pulseaudio
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
+	depends on BR2_USE_WCHAR # pulseaudio
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio
 	select BR2_PACKAGE_PULSEAUDIO
-	bool "pulseaudio"
 
-comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
+comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
diff --git a/bsp/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk b/bsp/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
index a686caf6..791b4135 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
+++ b/bsp/buildroot/package/gstreamer/gst-plugins-good/gst-plugins-good.mk
@@ -7,7 +7,7 @@
 GST_PLUGINS_GOOD_VERSION = 0.10.31
 GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz
 GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good
-GST_PLUGINS_GOOD_LICENSE = LGPLv2.1+
+GST_PLUGINS_GOOD_LICENSE = LGPL-2.1+
 GST_PLUGINS_GOOD_LICENSE_FILES = COPYING
 
 GST_PLUGINS_GOOD_CONF_OPTS = \
diff --git a/bsp/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/bsp/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
index 0f56164d..1a1e2a11 100644
--- a/bsp/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
+++ b/bsp/buildroot/package/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk
@@ -8,9 +8,9 @@ GST_PLUGINS_UGLY_VERSION = 0.10.19
 GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz
 GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST_PLUGINS_UGLY_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/gst-plugins-ugly0.10/cdio-cd-text-api.patch
-# COPYING is in fact LGPLv2.1, but all of the code is v2+
+# COPYING is in fact LGPL-2.1, but all of the code is LGPL-2.0+
 # (except for one test, xingmux)
-GST_PLUGINS_UGLY_LICENSE = LGPLv2+, GPLv2+ (synaesthesia)
+GST_PLUGINS_UGLY_LICENSE = LGPL-2.0+, GPL-2.0+ (synaesthesia)
 GST_PLUGINS_UGLY_LICENSE_FILES = COPYING
 
 GST_PLUGINS_UGLY_CONF_OPTS = \
diff --git a/bsp/buildroot/package/gstreamer/gstreamer/Config.in b/bsp/buildroot/package/gstreamer/gstreamer/Config.in
index 99c90f1a..b1334abf 100644
--- a/bsp/buildroot/package/gstreamer/gstreamer/Config.in
+++ b/bsp/buildroot/package/gstreamer/gstreamer/Config.in
@@ -24,15 +24,15 @@ config BR2_PACKAGE_GSTREAMER_GST_DEBUG
 	bool "enable gst-debug trace support"
 	default y
 	help
-	  Enable support for the gst-debug tracing functionality in gstreamer.
-	  This has limited CPU overhead, but does increase the rootfs size
-	  somewhat.
+	  Enable support for the gst-debug tracing functionality in
+	  gstreamer.  This has limited CPU overhead, but does increase
+	  the rootfs size somewhat.
 
 config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY
 	bool "enable plugin registry"
 	default y
 	help
-	  Enable support for the GStreamer plugin registry. This may increase
-	  the launch-time for a GStreamer application.
+	  Enable support for the GStreamer plugin registry. This may
+	  increase the launch-time for a GStreamer application.
 
 endif
diff --git a/bsp/buildroot/package/gstreamer/gstreamer/gstreamer.mk b/bsp/buildroot/package/gstreamer/gstreamer/gstreamer.mk
index cde7f8f6..91230aac 100644
--- a/bsp/buildroot/package/gstreamer/gstreamer/gstreamer.mk
+++ b/bsp/buildroot/package/gstreamer/gstreamer/gstreamer.mk
@@ -9,7 +9,7 @@ GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz
 GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER_INSTALL_STAGING = YES
 # COPYING is in fact v2, but most of the code is v2.1+
-GSTREAMER_LICENSE = LGPLv2.1+
+GSTREAMER_LICENSE = LGPL-2.1+
 GSTREAMER_LICENSE_FILES = COPYING
 
 # Checking if unaligned memory access works correctly cannot be done when cross
diff --git a/bsp/buildroot/package/gstreamer1/Config.in b/bsp/buildroot/package/gstreamer1/Config.in
index 23862bd8..76c32bc6 100644
--- a/bsp/buildroot/package/gstreamer1/Config.in
+++ b/bsp/buildroot/package/gstreamer1/Config.in
@@ -2,6 +2,7 @@
 source "package/gstreamer1/gstreamer1/Config.in"
 
 if BR2_PACKAGE_GSTREAMER1
+source "package/gstreamer1/gstreamer1-mm/Config.in"
 source "package/gstreamer1/gst1-plugins-base/Config.in"
 source "package/gstreamer1/gst1-plugins-good/Config.in"
 source "package/gstreamer1/gst1-plugins-bad/Config.in"
@@ -10,5 +11,6 @@ source "package/gstreamer1/gst1-imx/Config.in"
 source "package/gstreamer1/gst1-libav/Config.in"
 source "package/gstreamer1/gst1-rtsp-server/Config.in"
 source "package/gstreamer1/gst1-validate/Config.in"
+source "package/gstreamer1/gst1-vaapi/Config.in"
 source "package/gstreamer1/gst-omx/Config.in"
 endif
diff --git a/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.hash b/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.hash
index dff98404..c4f8b10b 100644
--- a/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.hash
+++ b/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.hash
@@ -1,2 +1,2 @@
-# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.4.tar.xz.sha256sum
-sha256 45072925cf262f0fd528fab78f0de52734e46a5a88aa802fae51c67c09c81aa2  gst-omx-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.12.4.tar.xz.sha256sum
+sha256 a025fa24242ec868fe0ff1e66d806a1070bcbc7c14a987a89cdc3395d0d56d5f gst-omx-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.mk b/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
index 6ce7baad..68cb7f66 100644
--- a/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
+++ b/bsp/buildroot/package/gstreamer1/gst-omx/gst-omx.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GST_OMX_VERSION = 1.10.4
+GST_OMX_VERSION = 1.12.4
 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz
 GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx
 
-GST_OMX_LICENSE = LGPLv2.1
+GST_OMX_LICENSE = LGPL-2.1
 GST_OMX_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
diff --git a/bsp/buildroot/package/gstreamer1/gst1-imx/Config.in b/bsp/buildroot/package/gstreamer1/gst1-imx/Config.in
index 9f792d1c..7b46233b 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-imx/Config.in
+++ b/bsp/buildroot/package/gstreamer1/gst1-imx/Config.in
@@ -8,8 +8,9 @@ menuconfig BR2_PACKAGE_GST1_IMX
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	help
-	  This is a set of GStreamer 1.0 plugins for plugins for Freescale's
-	  i.MX platforms, which make use of the i.MX multimedia capabilities.
+	  This is a set of GStreamer 1.0 plugins for plugins for
+	  Freescale's i.MX platforms, which make use of the i.MX
+	  multimedia capabilities.
 
 	  https://github.com/Freescale/gstreamer-imx
 
@@ -26,12 +27,12 @@ comment "imxeglvivsink needs the Vivante 3D libraries"
 
 config BR2_PACKAGE_GST1_IMX_G2D
 	bool "imxg2d"
-	depends on BR2_PACKAGE_IMX_GPU_VIV_G2D
+	depends on BR2_PACKAGE_IMX_GPU_G2D
 	help
 	  Elements leveraging the 2D GPU
 
-comment "imxg2d needs the Vivante 2D libraries"
-	depends on !BR2_PACKAGE_IMX_GPU_VIV_G2D
+comment "imxg2d needs the G2D libraries"
+	depends on !BR2_PACKAGE_IMX_GPU_G2D
 
 config BR2_PACKAGE_GST1_IMX_IPU
 	bool "imxipu"
@@ -84,4 +85,14 @@ config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC
 	help
 	  Elements for V4L2 capture
 
+config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK
+	bool "imxv4l2videosink"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2 # V4L2_COLORSPACE_DEFAULT
+	select BR2_PACKAGE_GST1_PLUGINS_BAD
+	help
+	  Elements for V4L2 output
+
+comment "imxv4l2videosink needs a toolchain w/ headers >= 4.2"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_2
+
 endif
diff --git a/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash b/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash
index e2e3971a..58ff4be2 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.hash
@@ -1,2 +1,2 @@
 # locally computed hash
-sha256 999c093e38768e51d14abbe7836c09b666bcb89f03f34dd3697a6e5b5e4a4086  gst1-imx-0.12.3.tar.gz
+sha256 3fcf1046ab8c6c7cd94218f4d2bc31ad7b5efa8a6b8f9fd5d93dc182f98ce026  gst1-imx-0.13.0.tar.gz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk b/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk
index 88429aea..43b4d9b1 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-imx/gst1-imx.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GST1_IMX_VERSION = 0.12.3
+GST1_IMX_VERSION = 0.13.0
 GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION))
 
-GST1_IMX_LICENSE = LGPLv2+
+GST1_IMX_LICENSE = LGPL-2.0+
 GST1_IMX_LICENSE_FILES = LICENSE
 
 GST1_IMX_INSTALL_STAGING = YES
@@ -33,6 +33,10 @@ ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y)
 GST1_IMX_DEPENDENCIES += imx-gpu-viv
 endif
 
+ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y)
+GST1_IMX_DEPENDENCIES += imx-gpu-g2d
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_IMX_EGLVISINK),y)
 # There's no --enable-eglvivsink option
 ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
@@ -83,10 +87,17 @@ GST1_IMX_CONF_OPTS += --disable-vpu
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC),y)
-# There's no --enable-v4l2src option
+# There's no --enable-imxv4l2videosrc option
 GST1_IMX_DEPENDENCIES += gst1-plugins-bad
 else
-GST1_IMX_CONF_OPTS += --disable-v4l2src
+GST1_IMX_CONF_OPTS += --disable-imxv4l2videosrc
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_IMX_V4L2VIDEOSINK),y)
+# There's no --enable-imxv4l2videosink option
+GST1_IMX_DEPENDENCIES += gst1-plugins-bad
+else
+GST1_IMX_CONF_OPTS += --disable-imxv4l2videosink
 endif
 
 $(eval $(waf-package))
diff --git a/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash b/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash
index cc83429f..f9a287c5 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.4.tar.xz.sha256sum
-sha256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b  gst-libav-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.12.4.tar.xz.sha256sum
+sha256 2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62 gst-libav-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk b/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk
index 5726bb5d..7450b759 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-libav/gst1-libav.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GST1_LIBAV_VERSION = 1.10.4
+GST1_LIBAV_VERSION = 1.12.4
 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz
 GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav
 GST1_LIBAV_CONF_OPTS = --with-system-libav
@@ -12,7 +12,7 @@ GST1_LIBAV_DEPENDENCIES = \
 	host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \
 	$(if $(BR2_PACKAGE_BZIP2),bzip2) \
 	$(if $(BR2_PACKAGE_XZ),xz)
-GST1_LIBAV_LICENSE = GPLv2+
+GST1_LIBAV_LICENSE = GPL-2.0+
 GST1_LIBAV_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch
deleted file mode 100644
index 6d4419c3..00000000
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/0001-openjpeg-Fix-build-against-openjpeg-2.2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From daaf649bda7231fd0d760802232a36ba62a4ea2d Mon Sep 17 00:00:00 2001
-From: Clemens Lang <cal@macports.org>
-Date: Sun, 13 Aug 2017 21:17:18 +0200
-Subject: [PATCH] openjpeg: Fix build against openjpeg 2.2
-
-OpenJPEG 2.2 has some API changes and thus ships its headers in a new
-include path. Add a configure check (to both meson and autoconf) to
-detect the newer version of OpenJPEG and add conditional includes.
-
-Fix the autoconf test for OpenJPEG 2.1, which checked for HAVE_OPENJPEG,
-which was always set even for 2.0.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=786250
-
-[Peter: drop meson changes for 2017.02.x]
-Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/patch/?id=15f24fef53a955c7c76fc966302cb0453732e657
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- configure.ac               |  7 ++++++-
- ext/openjpeg/gstopenjpeg.h |  4 +++-
- 2 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30e26b8..c4f08c7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2813,8 +2813,13 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [
-   if test x"$HAVE_OPENJPEG" = x"yes"; then
-     dnl minor API changes in v2.1
-     AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1)
--    if test x"$HAVE_OPENJPEG" = x"yes"; then
-+    if test x"$HAVE_OPENJPEG_2_1" = x"yes"; then
-       AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used])
-+        dnl include paths changed for v2.2
-+        AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2)
-+        if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then
-+          AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used])
-+        fi
-     fi
-   else
-     # Fallback to v1.5
-diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h
-index 03ce52e..52410a4 100644
---- a/ext/openjpeg/gstopenjpeg.h
-+++ b/ext/openjpeg/gstopenjpeg.h
-@@ -38,7 +38,9 @@
- #define OPJ_CPRL CPRL
- #else
- #include <stdio.h>
--# ifdef HAVE_OPENJPEG_2_1
-+# if defined(HAVE_OPENJPEG_2_2)
-+#  include <openjpeg-2.2/openjpeg.h>
-+# elif defined(HAVE_OPENJPEG_2_1)
- #  include <openjpeg-2.1/openjpeg.h>
- # else
- #  include <openjpeg-2.0/openjpeg.h>
- 
--- 
-2.12.3
-
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
index 2fe9bb62..7e166e43 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/Config.in
@@ -2,8 +2,8 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD
 	bool "gst1-plugins-bad"
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	help
-	  A set of plug-ins for GStreamer that may be of poor quality or
-	  lacking some features.
+	  A set of plug-ins for GStreamer that may be of poor quality
+	  or lacking some features.
 
 	  http://gstreamer.freedesktop.org/
 
@@ -164,6 +164,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX
 	help
 	  ASF Muxer Plugin
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT
+	bool "audiobuffersplit"
+	help
+	  Audio buffersplit plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
 	bool "audiofxbad"
 	help
@@ -174,6 +179,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER
 	help
 	  Audio mixer plugin
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX
+	bool "audiomixmatrix"
+	help
+	  Audio N:M mixer plugin
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
 	bool "compositor"
 	help
@@ -199,32 +209,16 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2
 	help
 	  Take image snapshots and record movies from camera
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE
-	bool "cdxaparse"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS
 	bool "coloreffects"
 	help
 	  Color Look-up Table filters
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC
-	bool "dataurisrc"
-	help
-	  data: URI source
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP
-	bool "dccp"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS
 	bool "debugutils"
 	help
-	  Collection of elements that may or may not be useful for debugging
-
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS
-	bool "dtls"
-	select BR2_PACKAGE_OPENSSL
-	help
-	  DTLS plugin
+	  Collection of elements that may or may not be useful for
+	  debugging
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY
 	bool "dvdsuboverlay"
@@ -274,9 +268,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP
 	help
 	  Payload/depayload GDP packets
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE
-	bool "hdvparse"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG
 	bool "id3tag"
 	help
@@ -338,9 +329,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX
 	help
 	  MPEG-PS muxer
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE
-	bool "mve"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF
 	bool "mxf"
 	help
@@ -349,15 +337,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM
 	bool "netsim"
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX
-	bool "nuvdemux"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF
 	bool "onvif"
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT
-	bool "patchdetect"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE
 	bool "pcapparse"
 	help
@@ -384,9 +366,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP
 	help
 	  RTMP plugin
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI
-	bool "sdi"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP
 	bool "sdp"
 	help
@@ -423,9 +402,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE
 	bool "timecode"
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA
-	bool "tta"
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS
 	bool "videofilters"
 	help
@@ -436,8 +412,10 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL
 	help
 	  videoframe_audiolevel
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE
-	bool "videomeasure"
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA
+	bool "iqa"
+	help
+	  Image Quality Assessment
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS
 	bool "videoparsers"
@@ -462,10 +440,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF
 
 comment "plugins with external dependencies"
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK
-	bool "apexsink"
-	select BR2_PACKAGE_OPENSSL
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
 	bool "assrender"
 	select BR2_PACKAGE_LIBASS
@@ -489,8 +463,8 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH
 	  DASH demuxer plugin
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK
-	depends on BR2_INSTALL_LIBSTDCPP
 	bool "decklink"
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Blackmagic Decklink plugin
 
@@ -499,14 +473,14 @@ comment "decklink needs a toolchain w/ C++"
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB
 	bool "directfb"
-	depends on BR2_PACKAGE_DIRECTFB
 	default y
+	depends on BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
 	bool "dvb"
-	select BR2_PACKAGE_DTV_SCAN_TABLES
 	# FEC_2_5 / QAM_4_NR definitions
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	select BR2_PACKAGE_DTV_SCAN_TABLES
 	help
 	  DVB elements
 
@@ -526,9 +500,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC
 	bool "fdk-aac"
-	select BR2_PACKAGE_FDK_AAC
 	depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS
 	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_FDK_AAC
 	help
 	  MPEG AAC encoder/decoder
 
@@ -568,6 +542,29 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS
 comment "libmms needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS
+	bool "dtls"
+	select BR2_PACKAGE_OPENSSL
+	help
+	  DTLS plugin
+
+config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML
+	bool "ttml"
+	depends on BR2_USE_WCHAR # pango -> glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pango -> glib2
+	depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_PANGO
+	help
+	  Timed Text Markup Language (TTML) subtitle plugin
+
+comment "ttml needs a toolchain w/ wchar, threads, C++"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_INSTALL_LIBSTDCPP
+
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC
 	bool "mpeg2enc"
 	select BR2_PACKAGE_LIBMPEG2
@@ -660,10 +657,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC
 	bool "sbc"
 	select BR2_PACKAGE_SBC
 
-config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL
-	bool "sdl"
-	select BR2_PACKAGE_SDL
-
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM
 	bool "shm"
 	help
@@ -686,9 +679,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND
 	bool "wayland"
+	default y
 	depends on BR2_PACKAGE_WAYLAND
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS
-	default y
 	help
 	  Wayland Video Sink
 
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
index 441afa2c..752d50a5 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.4.tar.xz.sha256sum
-sha256 23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966  gst-plugins-bad-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.12.4.tar.xz.sha256sum
+sha256 0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08 gst-plugins-bad-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 8e3010b8..b041014f 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -4,18 +4,14 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BAD_VERSION = 1.10.4
+GST1_PLUGINS_BAD_VERSION = 1.12.4
 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz
 GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad
 GST1_PLUGINS_BAD_INSTALL_STAGING = YES
-GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
-# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
-# enabled.
-GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+
-
-# patch 0001-openjpeg-Fix-build-against-openjpeg-2.2.patch touches configure.ac
-GST1_PLUGINS_BAD_AUTORECONF = YES
-GST1_PLUGINS_BAD_GETTEXTIZE = YES
+# Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and
+# GST1_PLUGINS_BAD_LICENSE_FILES if enabled.
+GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB
+GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+
 
 GST1_PLUGINS_BAD_CONF_OPTS = \
 	--disable-examples \
@@ -25,8 +21,6 @@ GST1_PLUGINS_BAD_CONF_OPTS = \
 	--disable-winks \
 	--disable-android_media \
 	--disable-apple_media \
-	--disable-sdltest \
-	--disable-wininet \
 	--disable-acm
 
 # Options which require currently unpackaged libraries
@@ -34,6 +28,7 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
 	--disable-avc \
 	--disable-opensles \
 	--disable-uvch264 \
+	--disable-msdk \
 	--disable-voamrwbenc \
 	--disable-bs2b \
 	--disable-chromaprint \
@@ -48,29 +43,21 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
 	--disable-ladspa \
 	--disable-lv2 \
 	--disable-libde265 \
-	--disable-linsys \
 	--disable-modplug \
-	--disable-mimic \
 	--disable-mplex \
-	--disable-nas \
 	--disable-ofa \
 	--disable-openexr \
 	--disable-openni2 \
-	--disable-pvr \
-	--disable-libvisual \
-	--disable-timidity \
 	--disable-teletextdec \
 	--disable-wildmidi \
 	--disable-smoothstreaming \
 	--disable-soundtouch \
 	--disable-spc \
 	--disable-gme \
-	--disable-xvid \
 	--disable-vdpau \
 	--disable-schro \
 	--disable-zbar \
 	--disable-spandsp \
-	--disable-sndio \
 	--disable-gtk3 \
 	--disable-qt
 
@@ -179,6 +166,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-asfmux
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOBUFFERSPLIT),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiobuffersplit
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiobuffersplit
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiofxbad
 else
@@ -191,6 +184,12 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixer
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixmatrix
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-compositor
 else
@@ -199,7 +198,6 @@ endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers
-GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers
 endif
@@ -222,43 +220,18 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc
-endif
-
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-dccp
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-dccp
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-debugutils
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls
-GST1_PLUGINS_BAD_DEPENDENCIES += openssl
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay
 else
@@ -319,12 +292,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-gdp
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-id3tag
 else
@@ -405,42 +372,24 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-mve
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-mve
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-mxf
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_NETSIM),y)
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-onvif
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-onvif
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse
 else
@@ -472,12 +421,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-rtmp
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdi
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdi
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdp
 else
@@ -526,12 +469,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-timecode
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-tta
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-tta
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-videofilters
 else
@@ -544,10 +481,10 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoframe_audiolevel
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IQA),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-iqa
 else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-iqa
 endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y)
@@ -576,19 +513,13 @@ endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif
+GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif
 endif
 
 # Plugins with dependencies
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK),y)
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-apexsink
-GST1_PLUGINS_BAD_DEPENDENCIES += openssl
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-apexsink
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-assrender
 GST1_PLUGINS_BAD_DEPENDENCIES += libass
@@ -654,7 +585,6 @@ endif
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac
 GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac
-GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac
 endif
@@ -698,6 +628,21 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls
+GST1_PLUGINS_BAD_DEPENDENCIES += openssl
+GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls
+endif
+
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTML),y)
+GST1_PLUGINS_BAD_CONF_OPTS += --enable-ttml
+GST1_PLUGINS_BAD_DEPENDENCIES += cairo libxml2 pango
+else
+GST1_PLUGINS_BAD_CONF_OPTS += --disable-ttml
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpeg2enc
 GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2
@@ -737,6 +682,7 @@ endif
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264
 GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264
+GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y
 else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264
 endif
@@ -769,14 +715,6 @@ else
 GST1_PLUGINS_BAD_CONF_OPTS += --disable-sbc
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y)
-GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
-GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdl
-GST1_PLUGINS_BAD_DEPENDENCIES += sdl
-else
-GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdl
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y)
 GST1_PLUGINS_BAD_CONF_OPTS += --enable-shm
 else
@@ -834,12 +772,18 @@ endif
 
 # Add GPL license if GPL licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
-GST1_PLUGINS_BAD_LICENSE += GPL
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+
+GST1_PLUGINS_BAD_LICENSE_FILES += COPYING
+endif
+
+# Add BSD license if BSD licensed plugins enabled.
+ifeq ($(GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE),y)
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), BSD-2-Clause
 endif
 
 # Add Unknown license if Unknown licensed plugins enabled.
 ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y)
-GST1_PLUGINS_BAD_LICENSE += UNKNOWN
+GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN
 endif
 
 # Use the following command to extract license info for plugins.
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-base/Config.in b/bsp/buildroot/package/gstreamer1/gst1-plugins-base/Config.in
index 897c1d13..6b08b68c 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-base/Config.in
@@ -54,9 +54,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO
 	  GIO elements
 
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK
-	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND
 	bool "playback"
 	default y
+	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND
 	help
 	  various playback elements
 
@@ -66,6 +66,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE
 	help
 	  Resamples audio
 
+config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE
+	bool "rawparse"
+	help
+	  Parses byte streams into raw frames
+
 config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE
 	bool "subparse"
 	help
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
index b526b145..b935f2f6 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.4.tar.xz.sha256sum
-sha256 f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7  gst-plugins-base-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.12.4.tar.xz.sha256sum
+sha256 4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282 gst-plugins-base-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index cb5da04b..10361ee3 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -4,20 +4,16 @@
 #
 ################################################################################
 
-GST1_PLUGINS_BASE_VERSION = 1.10.4
+GST1_PLUGINS_BASE_VERSION = 1.12.4
 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz
 GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base
 GST1_PLUGINS_BASE_INSTALL_STAGING = YES
 GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB
-GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPLv2.1+
+GST1_PLUGINS_BASE_LICENSE = LGPL-2.0+, LGPL-2.1+
 
 # gio_unix_2_0 is only used for tests
 GST1_PLUGINS_BASE_CONF_OPTS = \
 	--disable-examples \
-	--disable-oggtest \
-	--disable-vorbistest \
-	--disable-gio_unix_2_0 \
-	--disable-freetypetest \
 	--disable-valgrind
 
 # Options which require currently unpackaged libraries
@@ -95,6 +91,12 @@ else
 GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioresample
 endif
 
+ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_RAWPARSE),y)
+GST1_PLUGINS_BASE_CONF_OPTS += --enable-rawparse
+else
+GST1_PLUGINS_BASE_CONF_OPTS += --disable-rawparse
+endif
+
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y)
 GST1_PLUGINS_BASE_CONF_OPTS += --enable-subparse
 else
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-good/Config.in b/bsp/buildroot/package/gstreamer1/gst1-plugins-good/Config.in
index 27f24f5e..4f83d00a 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-good/Config.in
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-good/Config.in
@@ -5,8 +5,8 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7
 	help
-	  A set of well-supported plug-ins for GStreamer under the preferred
-	  license.
+	  A set of well-supported plug-ins for GStreamer under the
+	  preferred license.
 
 	  http://gstreamer.freedesktop.org/
 
@@ -70,7 +70,8 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT
 	bool "autodetect"
 	help
-	  Plugin contains auto-detection plugins for video/audio in- and outputs
+	  Plugin contains auto-detection plugins for video/audio in-
+	  and outputs
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI
 	bool "avi (*.avi video)"
@@ -306,9 +307,9 @@ comment "flac needs a toolchain w/ wchar"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF
 	bool "gdkpixbuf"
-	select BR2_PACKAGE_GDK_PIXBUF
 	depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2
+	select BR2_PACKAGE_GDK_PIXBUF
 	help
 	  GdkPixbuf-based image decoder, overlay and sink
 
@@ -316,19 +317,20 @@ comment "gdkpixbuf needs a toolchain w/ wchar, threads"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE
+	bool "pulseaudio"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio
 	depends on BR2_USE_MMU # pulseaudio
 	depends on !BR2_STATIC_LIBS # pulseaudio
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
+	depends on BR2_USE_WCHAR # pulseaudio
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC # pulseaudio
 	select BR2_PACKAGE_PULSEAUDIO
-	bool "pulseaudio"
 	help
 	  PulseAudio plugin library
 
-comment "pulseaudio support needs a toolchain w/ threads, dynamic library"
+comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC
 	bool "souphttpsrc (http client)"
@@ -360,9 +362,9 @@ comment "taglib needs a toolchain w/ C++, wchar"
 
 config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX
 	bool "vpx (webm)"
-	select BR2_PACKAGE_LIBVPX
 	depends on !BR2_bfin # libvpx
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx
+	select BR2_PACKAGE_LIBVPX
 	help
 	  VP8 plugin
 
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
index 21ee18d1..c6f61381 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.4.tar.xz.sha256sum
-sha256 8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e  gst-plugins-good-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz.sha256sum
+sha256 649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957 gst-plugins-good-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
index e25149a8..53e23415 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-GST1_PLUGINS_GOOD_VERSION = 1.10.4
+GST1_PLUGINS_GOOD_VERSION = 1.12.4
 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz
 GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good
 GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING
-GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+
+GST1_PLUGINS_GOOD_LICENSE = LGPL-2.1+
 
 GST1_PLUGINS_GOOD_CONF_OPTS = \
 	--disable-valgrind \
@@ -20,10 +20,7 @@ GST1_PLUGINS_GOOD_CONF_OPTS = \
 	--disable-osx_video \
 	--disable-aalib \
 	--disable-aalibtest \
-	--disable-libcaca \
-	--disable-esd \
-	--disable-esdtest
-
+	--disable-libcaca
 
 # Options which require currently unpackaged libraries
 GST1_PLUGINS_GOOD_CONF_OPTS += \
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in b/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in
index f30163aa..c9974110 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/Config.in
@@ -50,13 +50,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME
 	help
 	  Encode MP3s with LAME
 
-config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD
-	bool "mad (*.mp3 audio)"
-	select BR2_PACKAGE_LIBID3TAG
-	select BR2_PACKAGE_LIBMAD
-	help
-	  mp3 decoding based on the mad library
-
 config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123
 	bool "mpg123 (*.mp3 audio)"
 	select BR2_PACKAGE_MPG123
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
index 9567d9ca..d0581531 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.4.tar.xz.sha256sum
-sha256 6386c77ca8459cba431ed0b63da780c7062c7cc48055d222024d8eaf198ffa59  gst-plugins-ugly-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.12.4.tar.xz.sha256sum
+sha256 1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522 gst-plugins-ugly-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
index d503555c..af02a560 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-GST1_PLUGINS_UGLY_VERSION = 1.10.4
+GST1_PLUGINS_UGLY_VERSION = 1.12.4
 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz
 GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly
 GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING
 # GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled.
-GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+
+GST1_PLUGINS_UGLY_LICENSE = LGPL-2.1+
 
 GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind
 
@@ -77,14 +77,6 @@ else
 GST1_PLUGINS_UGLY_CONF_OPTS += --disable-lame
 endif
 
-ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD),y)
-GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mad
-GST1_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad
-GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y
-else
-GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mad
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123),y)
 GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpg123
 GST1_PLUGINS_UGLY_DEPENDENCIES += mpg123
@@ -110,7 +102,7 @@ endif
 
 # Add GPL license if GPL plugins enabled.
 ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y)
-GST1_PLUGINS_UGLY_LICENSE += GPLv2
+GST1_PLUGINS_UGLY_LICENSE += GPL-2.0
 endif
 
 # Use the following command to extract license info for plugins.
diff --git a/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
index d4c540d6..95c8eef8 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash
@@ -1,2 +1,2 @@
-# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.4.tar.xz.sha256sum
-sha256 2f6e12fd4e3568ee190dc24e57e4c3a878971c3a3fb6904a9674404fac256de6  gst-rtsp-server-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.12.4.tar.xz.sha256sum
+sha256 7660112ebd59838f1054796b38109dcbe32f0a040e3a252a68a81055aeaa56a9 gst-rtsp-server-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
index bfdd4c43..d6a82ee6 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GST1_RTSP_SERVER_VERSION = 1.10.4
+GST1_RTSP_SERVER_VERSION = 1.12.4
 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz
 GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server
-GST1_RTSP_SERVER_LICENSE = LGPLv2+
+GST1_RTSP_SERVER_LICENSE = LGPL-2.0+
 GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB
 GST1_RTSP_SERVER_INSTALL_STAGING = YES
 GST1_RTSP_SERVER_DEPENDENCIES = \
diff --git a/bsp/buildroot/package/gstreamer1/gst1-vaapi/Config.in b/bsp/buildroot/package/gstreamer1/gst1-vaapi/Config.in
new file mode 100644
index 00000000..91bd4f85
--- /dev/null
+++ b/bsp/buildroot/package/gstreamer1/gst1-vaapi/Config.in
@@ -0,0 +1,50 @@
+config BR2_PACKAGE_GST1_VAAPI
+	bool "gst1-vaapi"
+	depends on !BR2_STATIC_LIBS # dlopen(), libva
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libva, libdrm
+	depends on BR2_PACKAGE_HAS_UDEV
+	select BR2_PACKAGE_LIBVA
+	select BR2_PACKAGE_LIBDRM
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers
+	help
+	  gstreamer-vaapi consists in a collection of VA-API based
+	  plugins for GStreamer and helper libraries.
+
+	  vaapi<CODEC>dec is used to decode JPEG, MPEG-2, MPEG-4:2,
+	  H.264 AVC, H.264 MVC, VP8, VC-1, WMV3, HEVC videos to VA
+	  surfaces, depending on the actual value of <CODEC> and the
+	  underlying hardware capabilities.  This plugin is also able
+	  to implicitly download the decoded surface to raw YUV
+	  buffers.
+
+	  vaapi<CODEC>enc is used to encode into MPEG-2, H.264 AVC,
+	  H.264 MVC, JPEG, VP8, HEVC videos, depending on the actual
+	  value of <CODEC> (mpeg2, h264, etc.) and the hardware
+	  capabilities. By default, raw format bitstreams are
+	  generated, so the result may be piped to a muxer, e.g. qtmux
+	  for MP4 containers.
+
+	  vaapipostproc is used to filter VA surfaces, for
+	  e.g. scaling, deinterlacing (bob, motion-adaptive,
+	  motion-compensated), noise reduction or sharpening. This
+	  plugin is also used to upload raw YUV pixels into VA
+	  surfaces.
+
+	  vaapisink is used to render VA surfaces to an X11 or Wayland
+	  display. This plugin also features a "headless" mode (DRM)
+	  more suited to remote transcode scenarios, with faster
+	  throughput.
+
+	  https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi
+
+if BR2_PACKAGE_GST1_VAAPI
+
+config BR2_PACKAGE_GST1_VAAPI_ENCODERS
+	bool "enable encoders"
+
+endif
+
+comment "gst1-vaapi needs udev /dev management and a toolchain w/ threads, dynamic library"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
+		!BR2_PACKAGE_HAS_UDEV
diff --git a/bsp/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/bsp/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash
new file mode 100644
index 00000000..3eebc0af
--- /dev/null
+++ b/bsp/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash
@@ -0,0 +1,2 @@
+# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.12.4.tar.xz.sha256sum
+sha256 1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9 gstreamer-vaapi-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/bsp/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
new file mode 100644
index 00000000..6b637416
--- /dev/null
+++ b/bsp/buildroot/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk
@@ -0,0 +1,33 @@
+################################################################################
+#
+# gst1-vaapi
+#
+################################################################################
+
+GST1_VAAPI_VERSION = 1.12.4
+GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi
+GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz
+GST1_VAAPI_LICENSE = LGPL-2.1+
+GST1_VAAPI_LICENSE_FILES = COPYING.LIB
+
+GST1_VAAPI_DEPENDENCIES += \
+	gstreamer1 \
+	gst1-plugins-base \
+	gst1-plugins-bad \
+	libva \
+	libdrm
+
+GST1_VAAPI_CONF_OPTS += \
+	--disable-x11 \
+	--disable-glx \
+	--disable-wayland \
+	--disable-egl \
+	--disable-gtk-doc-html
+
+ifeq ($(BR2_PACKAGE_GST1_VAAPI_ENCODERS),y)
+GST1_VAAPI_CONF_OPTS += --enable-encoders
+else
+GST1_VAAPI_CONF_OPTS += --disable-encoders
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash b/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash
index 10c66673..50bddd0a 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash
+++ b/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.4.tar.xz.sha256sum
-sha256 e59c00bf64cca9c477cdb44eb8dd0b3aac5499b17d77bf28ee054fd211e8d73c  gst-validate-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.12.4.tar.xz.sha256sum
+sha256 f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1 gst-validate-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk b/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk
index cf7a8aff..d2764901 100644
--- a/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk
+++ b/bsp/buildroot/package/gstreamer1/gst1-validate/gst1-validate.mk
@@ -4,14 +4,12 @@
 #
 ################################################################################
 
-GST1_VALIDATE_VERSION = 1.10.4
+GST1_VALIDATE_VERSION = 1.12.4
 GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz
 GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate
-GST1_VALIDATE_LICENSE = LGPLv2.1+
+GST1_VALIDATE_LICENSE = LGPL-2.1+
 GST1_VALIDATE_LICENSE_FILES = COPYING
 
-GST1_VALIDATE_CONF_OPTS = --disable-sphinx-doc
-
 GST1_VALIDATE_DEPENDENCIES = \
 	gstreamer1 \
 	gst1-plugins-base \
@@ -20,4 +18,6 @@ GST1_VALIDATE_DEPENDENCIES = \
 	python \
 	$(if $(BR2_PACKAGE_CAIRO),cairo)
 
+GST1_VALIDATE_CONF_OPTS += --disable-sphinx-doc
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1-mm/Config.in b/bsp/buildroot/package/gstreamer1/gstreamer1-mm/Config.in
new file mode 100644
index 00000000..471c083c
--- /dev/null
+++ b/bsp/buildroot/package/gstreamer1/gstreamer1-mm/Config.in
@@ -0,0 +1,29 @@
+config BR2_PACKAGE_GSTREAMER1_MM
+	bool "gstreamer1-mm"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # glibmm
+	depends on BR2_INSTALL_LIBSTDCPP # glibmm
+	depends on BR2_USE_WCHAR # glibmm -> libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # glibmm -> libglib2
+	select BR2_PACKAGE_GLIBMM
+	select BR2_PACKAGE_GSTREAMER1_CHECK
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+	help
+	  gstreamermm provides C++ bindings for the GStreamer streaming
+	  multimedia library (http://gstreamer.freedesktop.org). With
+	  gstreamermm it is possible to	develop applications that work
+	  with multimedia in C++.
+
+	  gstreamermm is developed over glibmm, libsigc++ and libxml++
+	  and the functionalities they provide. This means that, among
+	  other things, referencing and unreferencing of GObjects is
+	  handled automatically via glibmm's automatic pointer class,
+	  Glib::RefPtr, and libsigc++'s slots are used for callbacks and
+	  signals.
+
+	  https://gstreamer.freedesktop.org/bindings/cplusplus.html
+
+comment "gstreamer1-mm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
+		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash b/bsp/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash
new file mode 100644
index 00000000..425cf05f
--- /dev/null
+++ b/bsp/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.hash
@@ -0,0 +1,6 @@
+# From http://ftp.gnome.org/pub/gnome/sources/gstreamermm/1.10/gstreamermm-1.10.0.sha256sum
+sha256 be58fe9ef7d7e392568ec85e80a84f4730adbf91fb0355ff7d7c616675ea8d60 gstreamermm-1.10.0.tar.xz
+
+# Locally computed
+sha256 7c78a8d7fc6781d51402d5a6036bedda9cffb0e5d28757e25d54d6eacbb1949f  COPYING
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING.examples
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk b/bsp/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk
new file mode 100644
index 00000000..539c9df1
--- /dev/null
+++ b/bsp/buildroot/package/gstreamer1/gstreamer1-mm/gstreamer1-mm.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# gstreamer1-mm
+#
+################################################################################
+
+GSTREAMER1_MM_VERSION_MAJOR = 1.10
+GSTREAMER1_MM_VERSION = $(GSTREAMER1_MM_VERSION_MAJOR).0
+GSTREAMER1_MM_SITE = http://ftp.gnome.org/pub/gnome/sources/gstreamermm/$(GSTREAMER1_MM_VERSION_MAJOR)
+GSTREAMER1_MM_SOURCE = gstreamermm-$(GSTREAMER1_MM_VERSION).tar.xz
+GSTREAMER1_MM_LICENSE = LGPL-2.1+ (library), GPL-2.0 (examples)
+GSTREAMER1_MM_LICENSE_FILES = COPYING COPYING.examples
+GSTREAMER1_MM_INSTALL_STAGING = YES
+GSTREAMER1_MM_DEPENDENCIES += \
+	glibmm \
+	gstreamer1 \
+	gst1-plugins-base
+
+GSTREAMER1_MM_CONF_OPTS += \
+	--disable-gl \
+	--enable-unittests=no \
+	--disable-deprecated-api
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch b/bsp/buildroot/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch
deleted file mode 100644
index 88f33732..00000000
--- a/bsp/buildroot/package/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 437b3e38d9127ae021ca8510709c2e6be3e6b819 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Sat, 18 Feb 2017 10:03:24 +0100
-Subject: [PATCH] gstconfig.h.in: Fix unaligned access support for the openrisc
- architecture
-
-Teach gstconfig.h.in about the openrisc (or1k) architecture.  Fixes
-buildroot autobuild failure:
-
-http://autobuild.buildroot.net/results/717/717d78ce0935749f477bdf3133b6f20057a28c01/build-end.log
-
-Submitted-upstream: https://bugzilla.gnome.org/show_bug.cgi?id=778866
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- gst/gstconfig.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
-index cf95f61ab..1b2ca64ac 100644
---- a/gst/gstconfig.h.in
-+++ b/gst/gstconfig.h.in
-@@ -104,7 +104,7 @@
-  * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6
-  * https://software.intel.com/en-us/node/583402
-  */
--#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__)
-+#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__)
- #  define GST_HAVE_UNALIGNED_ACCESS 0
- #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__)
- #  define GST_HAVE_UNALIGNED_ACCESS 1
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1/Config.in b/bsp/buildroot/package/gstreamer1/gstreamer1/Config.in
index 274171b6..e9f1bd03 100644
--- a/bsp/buildroot/package/gstreamer1/gstreamer1/Config.in
+++ b/bsp/buildroot/package/gstreamer1/gstreamer1/Config.in
@@ -9,47 +9,52 @@ config BR2_PACKAGE_GSTREAMER1
 	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
-	  GStreamer is an open source multimedia framework. This 1.x version of
-	  Gstreamer is incompatible with Gstreamer 0.10.x.
+	  GStreamer is an open source multimedia framework. This 1.x
+	  version of Gstreamer is incompatible with Gstreamer 0.10.x.
 
 	  http://gstreamer.freedesktop.org/
 
 if BR2_PACKAGE_GSTREAMER1
 
+config BR2_PACKAGE_GSTREAMER1_CHECK
+	bool "enable unit test libraries"
+	help
+	  Enable building unit test libraries for gstreamer.
+
 config BR2_PACKAGE_GSTREAMER1_PARSE
 	bool "enable command-line parser"
 	default y
 	help
-	  Enable command line parser for gstreamer. This may increase the CPU
-	  overhead by a small amount.
+	  Enable command line parser for gstreamer. This may increase
+	  the CPU overhead by a small amount.
 
 config BR2_PACKAGE_GSTREAMER1_TRACE
 	bool "enable tracing subsystem"
 	default y
 	help
-	  Enable the tracing subsystem within gstreamer. This may increase CPU
-	  overhead by a small amount.
+	  Enable the tracing subsystem within gstreamer. This may
+	  increase CPU overhead by a small amount.
 
 config BR2_PACKAGE_GSTREAMER1_GST_DEBUG
 	bool "enable gst-debug trace support"
 	default y
 	help
-	  Enable support for the gst-debug tracing functionality in gstreamer.
-	  This has limited CPU overhead, but does increase the rootfs size
-	  somewhat.
+	  Enable support for the gst-debug tracing functionality in
+	  gstreamer.  This has limited CPU overhead, but does increase
+	  the rootfs size somewhat.
 
 config BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY
 	bool "enable plugin registry"
 	default y
 	help
-	  Enable support for the GStreamer plugin registry. This may increase
-	  the launch-time for a GStreamer application.
+	  Enable support for the GStreamer plugin registry. This may
+	  increase the launch-time for a GStreamer application.
 
 config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS
 	bool "install gst-launch & gst-inspect"
 	default y
 	help
-	  Install the gst-launch and gst-inspect tools. This will take up
-	  additional space on the target.
+	  Install the gst-launch and gst-inspect tools. This will take
+	  up additional space on the target.
 
 endif
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash b/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash
index 455e7fb4..f8af9075 100644
--- a/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash
+++ b/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.hash
@@ -1,2 +1,2 @@
-# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.4.tar.xz.sha256sum
-sha256 50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218  gstreamer-1.10.4.tar.xz
+# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.12.4.tar.xz.sha256sum
+sha256 5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674 gstreamer-1.12.4.tar.xz
diff --git a/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk b/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk
index 5a0a369c..ea9f29a4 100644
--- a/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk
+++ b/bsp/buildroot/package/gstreamer1/gstreamer1/gstreamer1.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-GSTREAMER1_VERSION = 1.10.4
+GSTREAMER1_VERSION = 1.12.4
 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz
 GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer
 GSTREAMER1_INSTALL_STAGING = YES
 GSTREAMER1_LICENSE_FILES = COPYING
-GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+
+GSTREAMER1_LICENSE = LGPL-2.0+, LGPL-2.1+
 
 GSTREAMER1_CONF_OPTS = \
 	--disable-examples \
@@ -17,7 +17,7 @@ GSTREAMER1_CONF_OPTS = \
 	--disable-failing-tests \
 	--disable-valgrind \
 	--disable-benchmarks \
-	--disable-check \
+	$(if $(BR2_PACKAGE_GSTREAMER1_CHECK),,--disable-check) \
 	$(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \
 	$(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \
 	$(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \
diff --git a/bsp/buildroot/package/gtest/Config.in b/bsp/buildroot/package/gtest/Config.in
index 355b736c..3f1f3855 100644
--- a/bsp/buildroot/package/gtest/Config.in
+++ b/bsp/buildroot/package/gtest/Config.in
@@ -21,6 +21,34 @@ config BR2_PACKAGE_GTEST
 
 	  https://github.com/google/googletest
 
+if BR2_PACKAGE_GTEST
+
+config BR2_PACKAGE_GTEST_GMOCK
+	bool "gmock"
+	help
+	  Inspired by jMock, EasyMock, and Hamcrest, and designed with
+	  C++'s specifics in mind, Google C++ Mocking Framework (or
+	  Google Mock for short) is a library for writing and using C++
+	  mock classes.
+
+	  Google Mock:
+
+	    * lets you create mock classes trivially using simple
+	      macros, supports a rich set of matchers and actions,
+	    * handles unordered, partially ordered, or completely
+	      ordered expectations,
+	    * is extensible by users, and
+	    * works on Linux, Mac OS X, Windows, Windows Mobile, minGW,
+	      and Symbian.
+
+	  There are both host and target packages. The target one has
+	  include files required to compile the tests and the static
+	  libraries required to link/run them. The host package installs
+	  gmock_gen, a Python script used to generate code mocks.
+
+endif # BR2_PACKAGE_GTEST
+
 comment "gtest needs a toolchain w/ C++, wchar, threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/gmock/gmock.pc b/bsp/buildroot/package/gtest/gmock.pc
similarity index 93%
rename from bsp/buildroot/package/gmock/gmock.pc
rename to bsp/buildroot/package/gtest/gmock.pc
index 2f900682..4c723542 100644
--- a/bsp/buildroot/package/gmock/gmock.pc
+++ b/bsp/buildroot/package/gtest/gmock.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: gmock
 Description: Google C++ Mocking Framework
-Version: 1.7.0
+Version: 1.8.0
 Libs: -L${libdir} -lgmock
 Libs.private: -lpthread
 Cflags: -I${includedir}
diff --git a/bsp/buildroot/package/gtest/gtest.hash b/bsp/buildroot/package/gtest/gtest.hash
index 79e31e46..0a8d8ba0 100644
--- a/bsp/buildroot/package/gtest/gtest.hash
+++ b/bsp/buildroot/package/gtest/gtest.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256	f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc	gtest-release-1.7.0.tar.gz
+sha256	58a6f4277ca2bc8565222b3bbd58a177609e9c488e8a72649359ba51450db7d8	gtest-release-1.8.0.tar.gz
+sha256	9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138	googletest/LICENSE
diff --git a/bsp/buildroot/package/gtest/gtest.mk b/bsp/buildroot/package/gtest/gtest.mk
index eb30905c..b62ceb32 100644
--- a/bsp/buildroot/package/gtest/gtest.mk
+++ b/bsp/buildroot/package/gtest/gtest.mk
@@ -4,13 +4,29 @@
 #
 ################################################################################
 
-# Make sure this remains the same version as the gmock one
-GTEST_VERSION = release-1.7.0
+GTEST_VERSION = release-1.8.0
 GTEST_SITE = $(call github,google,googletest,$(GTEST_VERSION))
 GTEST_INSTALL_STAGING = YES
 GTEST_INSTALL_TARGET = NO
-GTEST_LICENSE = BSD-3c
-GTEST_LICENSE_FILES = LICENSE
+GTEST_LICENSE = BSD-3-Clause
+GTEST_LICENSE_FILES = googletest/LICENSE
+
+ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
+GTEST_DEPENDENCIES += host-gtest
+endif
+
+HOST_GTEST_LICENSE = Apache-2.0
+HOST_GTEST_LICENSE_FILES = googlemock/scripts/generator/LICENSE
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+HOST_GTEST_PYTHON_VERSION = $(PYTHON3_VERSION_MAJOR)
+HOST_GTEST_DEPENDENCIES += host-python3
+else
+HOST_GTEST_PYTHON_VERSION = $(PYTHON_VERSION_MAJOR)
+HOST_GTEST_DEPENDENCIES += host-python
+endif
+
+HOST_GTEST_GMOCK_PYTHONPATH = \
+	$(HOST_DIR)/lib/python$(HOST_GTEST_PYTHON_VERSION)/site-packages
 
 # While it is possible to build gtest as shared library, using this gtest shared
 # library requires to set some special configure option in the project using
@@ -21,11 +37,22 @@ GTEST_LICENSE_FILES = LICENSE
 # the gtest sources.
 GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
 
-define GTEST_INSTALL_STAGING_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/libgtest.a $(STAGING_DIR)/usr/lib/libgtest.a
-	$(INSTALL) -D -m 0755 $(@D)/libgtest_main.a $(STAGING_DIR)/usr/lib/libgtest_main.a
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gtest/
-	cp -rp $(@D)/include/gtest/* $(STAGING_DIR)/usr/include/gtest/
+# Ensure that GTest is compiled with -fPIC to allow linking the static
+# libraries with dynamically linked programs. This is not a requirement
+# for most architectures but is mandatory for ARM.
+ifeq ($(BR2_STATIC_LIBS),)
+GTEST_CONF_OPTS += -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+endif
+
+GTEST_CONF_OPTS += -DBUILD_GTEST=ON
+
+ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
+GTEST_CONF_OPTS += -DBUILD_GMOCK=ON
+else
+GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
+endif
+
+define GTEST_INSTALL_MISSING_FILES
 	$(INSTALL) -D -m 0644 package/gtest/gtest.pc \
 		$(STAGING_DIR)/usr/lib/pkgconfig/gtest.pc
 	# Generate the gtest-config script manually, since the CMake
@@ -39,9 +66,30 @@ define GTEST_INSTALL_STAGING_CMDS
 		s%@bindir@%$(STAGING_DIR)/usr/bin%;\
 		s%@PTHREAD_CFLAGS@%%;\
 		s%@PTHREAD_LIBS@%-lpthread%;' \
-		$(@D)/scripts/gtest-config.in \
+		$(@D)/googletest/scripts/gtest-config.in \
 		> $(STAGING_DIR)/usr/bin/gtest-config
 	chmod +x $(STAGING_DIR)/usr/bin/gtest-config
 endef
 
+GTEST_POST_INSTALL_STAGING_HOOKS = GTEST_INSTALL_MISSING_FILES
+
+ifeq ($(BR2_PACKAGE_GTEST_GMOCK),y)
+define GTEST_GMOCK_INSTALL_MISSING_FILE
+	$(INSTALL) -D -m 0644 package/gtest/gmock.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/gmock.pc
+endef
+
+GTEST_POST_INSTALL_STAGING_HOOKS += GTEST_GMOCK_INSTALL_MISSING_FILE
+endif
+
+define HOST_GTEST_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \
+		$(HOST_DIR)/bin/gmock_gen
+	cp -rp $(@D)/googlemock/scripts/generator/cpp \
+		$(HOST_GTEST_GMOCK_PYTHONPATH)
+endef
+
 $(eval $(cmake-package))
+# The host package does not build anything, just installs gmock_gen stuff, so
+# it does not need to be a host-cmake-package.
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/gtest/gtest.pc b/bsp/buildroot/package/gtest/gtest.pc
index b7a8aa40..594e79d7 100644
--- a/bsp/buildroot/package/gtest/gtest.pc
+++ b/bsp/buildroot/package/gtest/gtest.pc
@@ -5,7 +5,7 @@ includedir=${prefix}/include
 
 Name: gtest
 Description: Google C++ Testing Framework
-Version: 1.7.0
+Version: 1.8.0
 Libs: -L${libdir} -lgtest
 Libs.private: -lpthread
 Cflags: -I${includedir}
diff --git a/bsp/buildroot/package/gtk2-engines/gtk2-engines.mk b/bsp/buildroot/package/gtk2-engines/gtk2-engines.mk
index 9b285f6f..5f145940 100644
--- a/bsp/buildroot/package/gtk2-engines/gtk2-engines.mk
+++ b/bsp/buildroot/package/gtk2-engines/gtk2-engines.mk
@@ -9,7 +9,7 @@ GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2
 GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2
 GTK2_ENGINES_SITE = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR)
 GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool
-GTK2_ENGINES_LICENSE = LGPLv2.1+
+GTK2_ENGINES_LICENSE = LGPL-2.1+
 GTK2_ENGINES_LICENSE_FILES = COPYING
 
 GTK2_ENGINES_CONF_ENV = \
diff --git a/bsp/buildroot/package/gtkmm3/Config.in b/bsp/buildroot/package/gtkmm3/Config.in
index ef62a1f9..8762c720 100644
--- a/bsp/buildroot/package/gtkmm3/Config.in
+++ b/bsp/buildroot/package/gtkmm3/Config.in
@@ -1,7 +1,7 @@
-comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.8"
+comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \
 		|| !BR2_TOOLCHAIN_HAS_THREADS
 
@@ -14,7 +14,7 @@ config BR2_PACKAGE_GTKMM3
 	depends on !BR2_nios2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz
 	depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2
 	depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2
 	depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2
diff --git a/bsp/buildroot/package/gtkmm3/gtkmm3.mk b/bsp/buildroot/package/gtkmm3/gtkmm3.mk
index 57b9b1fd..00988914 100644
--- a/bsp/buildroot/package/gtkmm3/gtkmm3.mk
+++ b/bsp/buildroot/package/gtkmm3/gtkmm3.mk
@@ -8,7 +8,7 @@ GTKMM3_VERSION_MAJOR = 3.22
 GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0
 GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz
 GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR)
-GTKMM3_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+GTKMM3_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 GTKMM3_LICENSE_FILES = COPYING COPYING.tools
 GTKMM3_INSTALL_STAGING = YES
 GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf
diff --git a/bsp/buildroot/package/gtkperf/Config.in b/bsp/buildroot/package/gtkperf/Config.in
index 1089dbf4..78c35e72 100644
--- a/bsp/buildroot/package/gtkperf/Config.in
+++ b/bsp/buildroot/package/gtkperf/Config.in
@@ -5,5 +5,5 @@ config BR2_PACKAGE_GTKPERF
 	  GtkPerf is an application designed to test GTK+ performance.
 	  The point is to create common testing platform to run
 	  predefined GTK+ widgets
-	  e.g. (opening comboboxes, toggling buttons, scrolling text yms.)
-	  and this way define the speed of device/platform.
+	  e.g. (opening comboboxes, toggling buttons, scrolling text
+	  yms.) and this way define the speed of device/platform.
diff --git a/bsp/buildroot/package/gtkperf/gtkperf.mk b/bsp/buildroot/package/gtkperf/gtkperf.mk
index 0542a26f..1d1230f1 100644
--- a/bsp/buildroot/package/gtkperf/gtkperf.mk
+++ b/bsp/buildroot/package/gtkperf/gtkperf.mk
@@ -8,7 +8,7 @@ GTKPERF_VERSION = 0.40
 GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz
 GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION)
 GTKPERF_DEPENDENCIES = libgtk2
-GTKPERF_LICENSE = GPLv2
+GTKPERF_LICENSE = GPL-2.0
 GTKPERF_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gtksourceview/gtksourceview.hash b/bsp/buildroot/package/gtksourceview/gtksourceview.hash
index f57fadc4..feaae5e2 100644
--- a/bsp/buildroot/package/gtksourceview/gtksourceview.hash
+++ b/bsp/buildroot/package/gtksourceview/gtksourceview.hash
@@ -1,2 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.22/gtksourceview-3.22.2.sha256sum:
-sha256	6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e	gtksourceview-3.22.2.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.sha256sum:
+sha256	7aa6bdfebcdc73a763dddeaa42f190c40835e6f8495bb9eb8f78587e2577c188	gtksourceview-3.24.6.tar.xz
+
+# Locally computed:
+sha256	5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a	COPYING
diff --git a/bsp/buildroot/package/gtksourceview/gtksourceview.mk b/bsp/buildroot/package/gtksourceview/gtksourceview.mk
index 5e4ca0d2..2a33ed4b 100644
--- a/bsp/buildroot/package/gtksourceview/gtksourceview.mk
+++ b/bsp/buildroot/package/gtksourceview/gtksourceview.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-GTKSOURCEVIEW_VERSION_MAJOR = 3.22
-GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).2
+GTKSOURCEVIEW_VERSION_MAJOR = 3.24
+GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).6
 GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz
 GTKSOURCEVIEW_SITE = \
 	http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR)
-GTKSOURCEVIEW_LICENSE = LGPLv2.1+
+GTKSOURCEVIEW_LICENSE = LGPL-2.1+
 GTKSOURCEVIEW_LICENSE_FILES = COPYING
 GTKSOURCEVIEW_INSTALL_STAGING = YES
 GTKSOURCEVIEW_DEPENDENCIES = host-pkgconf libglib2 libxml2 libgtk3
diff --git a/bsp/buildroot/package/guile/Config.in b/bsp/buildroot/package/guile/Config.in
index e0f65712..c26c296e 100644
--- a/bsp/buildroot/package/guile/Config.in
+++ b/bsp/buildroot/package/guile/Config.in
@@ -19,4 +19,3 @@ config BR2_PACKAGE_GUILE
 comment "guile needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
 		BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
-
diff --git a/bsp/buildroot/package/guile/guile.hash b/bsp/buildroot/package/guile/guile.hash
index 43f0dd77..63651cf7 100644
--- a/bsp/buildroot/package/guile/guile.hash
+++ b/bsp/buildroot/package/guile/guile.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	3744f2addc282a0de627aaef048f062982b44564d54ac31ff5217972529ed88b	guile-2.0.13.tar.xz
+sha256 e8442566256e1be14e51fc18839cd799b966bc5b16c6a1d7a7c35155a8619d82  guile-2.0.14.tar.xz
diff --git a/bsp/buildroot/package/guile/guile.mk b/bsp/buildroot/package/guile/guile.mk
index 88c74143..f53ebdd5 100644
--- a/bsp/buildroot/package/guile/guile.mk
+++ b/bsp/buildroot/package/guile/guile.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-GUILE_VERSION = 2.0.13
+GUILE_VERSION = 2.0.14
 GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz
 GUILE_SITE = $(BR2_GNU_MIRROR)/guile
 GUILE_INSTALL_STAGING = YES
 # For 0002-calculate-csqrt_manually.patch
 GUILE_AUTORECONF = YES
-GUILE_LICENSE = LGPLv3+
+GUILE_LICENSE = LGPL-3.0+
 GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER
 
 # libtool dependency is needed because guile uses libltdl
@@ -47,7 +47,7 @@ else
 GUILE_CONF_OPTS += --without-libreadline-prefix
 endif
 
-GUILE_CONF_ENV += GUILE_FOR_BUILD=$(HOST_DIR)/usr/bin/guile \
+GUILE_CONF_ENV += GUILE_FOR_BUILD=$(HOST_DIR)/bin/guile \
 	CFLAGS="$(TARGET_CFLAGS) $(GUILE_CFLAGS)"
 
 GUILE_CONF_OPTS += \
diff --git a/bsp/buildroot/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch b/bsp/buildroot/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch
new file mode 100644
index 00000000..eba99da4
--- /dev/null
+++ b/bsp/buildroot/package/gupnp-av/0001-Fix-static-library-linking-with-gupnp.patch
@@ -0,0 +1,354 @@
+From 268ec01e448ed7cedf90b37fbc27f01806637825 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 30 Oct 2017 22:10:23 +0100
+Subject: [PATCH 1/1] Fix static library linking with gupnp
+
+gupnp and gupnp-av defines two internal functions with the same name:
+xml_util_get_element and xml_util_get_child_element_content, as a result
+an application such as rygel can't be build statically.
+To fix this issue, rename both functions as
+xml_util_get_element2 and xml_util_get_child_element_content2
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ libgupnp-av/gupnp-cds-last-change-parser.c |  2 +-
+ libgupnp-av/gupnp-didl-lite-container.c    |  4 ++--
+ libgupnp-av/gupnp-didl-lite-item.c         |  2 +-
+ libgupnp-av/gupnp-didl-lite-object.c       | 26 +++++++++++++-------------
+ libgupnp-av/gupnp-didl-lite-parser.c       |  4 ++--
+ libgupnp-av/gupnp-didl-lite-writer.c       |  2 +-
+ libgupnp-av/gupnp-feature-list-parser.c    |  2 +-
+ libgupnp-av/gupnp-last-change-parser.c     |  2 +-
+ libgupnp-av/xml-util.c                     | 16 ++++++++--------
+ libgupnp-av/xml-util.h                     |  4 ++--
+ 10 files changed, 32 insertions(+), 32 deletions(-)
+
+diff --git a/libgupnp-av/gupnp-cds-last-change-parser.c b/libgupnp-av/gupnp-cds-last-change-parser.c
+index cff5f0b..36f6b0a 100644
+--- a/libgupnp-av/gupnp-cds-last-change-parser.c
++++ b/libgupnp-av/gupnp-cds-last-change-parser.c
+@@ -119,7 +119,7 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,
+                 goto out;
+         }
+ 
+-        state_event = xml_util_get_element ((xmlNode *) doc,
++        state_event = xml_util_get_element2 ((xmlNode *) doc,
+                                             "StateEvent",
+                                             NULL);
+         if (state_event == NULL) {
+diff --git a/libgupnp-av/gupnp-didl-lite-container.c b/libgupnp-av/gupnp-didl-lite-container.c
+index d7ac578..c0e7395 100644
+--- a/libgupnp-av/gupnp-didl-lite-container.c
++++ b/libgupnp-av/gupnp-didl-lite-container.c
+@@ -340,7 +340,7 @@ gupnp_didl_lite_container_container_update_id_is_set
+ 
+         xml_node = gupnp_didl_lite_object_get_xml_node
+                                         (GUPNP_DIDL_LITE_OBJECT (container));
+-        content = xml_util_get_child_element_content (xml_node,
++        content = xml_util_get_child_element_content2 (xml_node,
+                                                       "containerUpdateID");
+         return content != NULL;
+ }
+@@ -390,7 +390,7 @@ gupnp_didl_lite_container_total_deleted_child_count_is_set
+ 
+         xml_node = gupnp_didl_lite_object_get_xml_node
+                                         (GUPNP_DIDL_LITE_OBJECT (container));
+-        content = xml_util_get_child_element_content (xml_node,
++        content = xml_util_get_child_element_content2 (xml_node,
+                                                       "totalDeletedChildCount");
+         return content != NULL;
+ }
+diff --git a/libgupnp-av/gupnp-didl-lite-item.c b/libgupnp-av/gupnp-didl-lite-item.c
+index 3588052..3d6d4d0 100644
+--- a/libgupnp-av/gupnp-didl-lite-item.c
++++ b/libgupnp-av/gupnp-didl-lite-item.c
+@@ -254,7 +254,7 @@ gupnp_didl_lite_item_get_lifetime (GUPnPDIDLLiteItem *item)
+         object = GUPNP_DIDL_LITE_OBJECT (item);
+         node = gupnp_didl_lite_object_get_xml_node (object);
+ 
+-        lifetime_str = xml_util_get_child_element_content (node, "lifetime");
++        lifetime_str = xml_util_get_child_element_content2 (node, "lifetime");
+         lifetime = seconds_from_time (lifetime_str);
+ 
+         return lifetime;
+diff --git a/libgupnp-av/gupnp-didl-lite-object.c b/libgupnp-av/gupnp-didl-lite-object.c
+index 68156dc..cab2359 100644
+--- a/libgupnp-av/gupnp-didl-lite-object.c
++++ b/libgupnp-av/gupnp-didl-lite-object.c
+@@ -1065,7 +1065,7 @@ gupnp_didl_lite_object_get_upnp_class (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "class");
+ }
+ 
+@@ -1211,7 +1211,7 @@ gupnp_didl_lite_object_get_title (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "title");
+ }
+ 
+@@ -1228,7 +1228,7 @@ gupnp_didl_lite_object_get_creator (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "creator");
+ }
+ 
+@@ -1266,7 +1266,7 @@ gupnp_didl_lite_object_get_artist (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "artist");
+ }
+ 
+@@ -1303,7 +1303,7 @@ gupnp_didl_lite_object_get_author (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "author");
+ }
+ 
+@@ -1377,7 +1377,7 @@ gupnp_didl_lite_object_get_genre (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "genre");
+ }
+ 
+@@ -1394,7 +1394,7 @@ gupnp_didl_lite_object_get_write_status (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "writeStatus");
+ }
+ 
+@@ -1411,7 +1411,7 @@ gupnp_didl_lite_object_get_album (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "album");
+ }
+ 
+@@ -1428,7 +1428,7 @@ gupnp_didl_lite_object_get_album_art (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "albumArtURI");
+ }
+ 
+@@ -1445,7 +1445,7 @@ gupnp_didl_lite_object_get_description (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "description");
+ }
+ 
+@@ -1462,7 +1462,7 @@ gupnp_didl_lite_object_get_date (GUPnPDIDLLiteObject *object)
+ {
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), NULL);
+ 
+-        return xml_util_get_child_element_content (object->priv->xml_node,
++        return xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                    "date");
+ }
+ 
+@@ -1481,7 +1481,7 @@ gupnp_didl_lite_object_get_track_number (GUPnPDIDLLiteObject *object)
+ 
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), -1);
+ 
+-        str = xml_util_get_child_element_content (object->priv->xml_node,
++        str = xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                   "originalTrackNumber");
+         if (str == NULL)
+                 return -1;
+@@ -1552,7 +1552,7 @@ gupnp_didl_lite_object_update_id_is_set (GUPnPDIDLLiteObject *object)
+         g_return_val_if_fail (object != NULL, FALSE);
+         g_return_val_if_fail (GUPNP_IS_DIDL_LITE_OBJECT (object), FALSE);
+ 
+-        content = xml_util_get_child_element_content (object->priv->xml_node,
++        content = xml_util_get_child_element_content2 (object->priv->xml_node,
+                                                       "objectUpdateID");
+         return content != NULL;
+ }
+diff --git a/libgupnp-av/gupnp-didl-lite-parser.c b/libgupnp-av/gupnp-didl-lite-parser.c
+index 59255ef..93d03c0 100644
+--- a/libgupnp-av/gupnp-didl-lite-parser.c
++++ b/libgupnp-av/gupnp-didl-lite-parser.c
+@@ -52,7 +52,7 @@ verify_didl_attributes (xmlNode *node)
+ {
+         const char *content;
+ 
+-        content = xml_util_get_child_element_content (node, "date");
++        content = xml_util_get_child_element_content2 (node, "date");
+         if (content) {
+                 /* try to roughly verify the passed date with ^\d{4}-\d{2}-\d{2} */
+                 char *ptr = (char *) content;
+@@ -251,7 +251,7 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
+         }
+ 
+         /* Get a pointer to root element */
+-        element = xml_util_get_element ((xmlNode *) doc,
++        element = xml_util_get_element2 ((xmlNode *) doc,
+                                         "DIDL-Lite",
+                                         NULL);
+         if (element == NULL) {
+diff --git a/libgupnp-av/gupnp-didl-lite-writer.c b/libgupnp-av/gupnp-didl-lite-writer.c
+index fb37c0b..e61739a 100644
+--- a/libgupnp-av/gupnp-didl-lite-writer.c
++++ b/libgupnp-av/gupnp-didl-lite-writer.c
+@@ -223,7 +223,7 @@ filter_node (xmlNode             *node,
+ 
+         if (strcmp ((const char *) node->name, "container") == 0) {
+                 is_container = TRUE;
+-                container_class = xml_util_get_child_element_content (node,
++                container_class = xml_util_get_child_element_content2 (node,
+                                                                       "class");
+         }
+ 
+diff --git a/libgupnp-av/gupnp-feature-list-parser.c b/libgupnp-av/gupnp-feature-list-parser.c
+index 85fb232..dcaad6b 100644
+--- a/libgupnp-av/gupnp-feature-list-parser.c
++++ b/libgupnp-av/gupnp-feature-list-parser.c
+@@ -138,7 +138,7 @@ gupnp_feature_list_parser_parse_text
+         }
+ 
+         /* Get a pointer to root element */
+-        element = xml_util_get_element ((xmlNode *) doc, "Features", NULL);
++        element = xml_util_get_element2 ((xmlNode *) doc, "Features", NULL);
+         if (element == NULL) {
+                 g_set_error (error,
+                              G_MARKUP_ERROR,
+diff --git a/libgupnp-av/gupnp-last-change-parser.c b/libgupnp-av/gupnp-last-change-parser.c
+index a98aecf..7078713 100644
+--- a/libgupnp-av/gupnp-last-change-parser.c
++++ b/libgupnp-av/gupnp-last-change-parser.c
+@@ -75,7 +75,7 @@ read_state_variable (const char *variable_name,
+         xmlNode    *variable_node;
+         const char *val_str;
+ 
+-        variable_node = xml_util_get_element (instance_node,
++        variable_node = xml_util_get_element2 (instance_node,
+                                               variable_name,
+                                               NULL);
+         if (!variable_node)
+diff --git a/libgupnp-av/xml-util.c b/libgupnp-av/xml-util.c
+index da718b2..8c937e0 100644
+--- a/libgupnp-av/xml-util.c
++++ b/libgupnp-av/xml-util.c
+@@ -81,7 +81,7 @@ xml_doc_unref (GUPnPAVXMLDoc *doc)
+ }
+ 
+ xmlNode *
+-xml_util_get_element (xmlNode *node,
++xml_util_get_element2 (xmlNode *node,
+                       ...)
+ {
+         va_list var_args;
+@@ -130,13 +130,13 @@ xml_util_get_child_elements_by_name (xmlNode *node, const char *name)
+ }
+ 
+ const char *
+-xml_util_get_child_element_content (xmlNode    *node,
++xml_util_get_child_element_content2 (xmlNode    *node,
+                                     const char *child_name)
+ {
+         xmlNode *child_node;
+         const char *content;
+ 
+-        child_node = xml_util_get_element (node, child_name, NULL);
++        child_node = xml_util_get_element2 (node, child_name, NULL);
+         if (!child_node || !(child_node->children))
+                 return NULL;
+ 
+@@ -154,7 +154,7 @@ xml_util_get_uint_child_element (xmlNode    *node,
+ {
+         const char *content;
+ 
+-        content = xml_util_get_child_element_content (node, child_name);
++        content = xml_util_get_child_element_content2 (node, child_name);
+         if (!content)
+                 return default_value;
+ 
+@@ -168,7 +168,7 @@ xml_util_get_uint64_child_element (xmlNode    *node,
+ {
+         const char *content;
+ 
+-        content = xml_util_get_child_element_content (node, child_name);
++        content = xml_util_get_child_element_content2 (node, child_name);
+         if (!content)
+                 return default_value;
+ 
+@@ -281,7 +281,7 @@ xml_util_set_child (xmlNode    *parent_node,
+         xmlNode *node;
+         xmlChar *escaped;
+ 
+-        node = xml_util_get_element (parent_node, name, NULL);
++        node = xml_util_get_element2 (parent_node, name, NULL);
+         if (node == NULL) {
+                 xmlNsPtr ns_ptr = NULL;
+ 
+@@ -305,7 +305,7 @@ xml_util_unset_child (xmlNode    *parent_node,
+ {
+         xmlNode *node;
+ 
+-        node = xml_util_get_element (parent_node, name, NULL);
++        node = xml_util_get_element2 (parent_node, name, NULL);
+         if (node != NULL) {
+                 xmlUnlinkNode (node);
+                 xmlFreeNode (node);
+@@ -342,7 +342,7 @@ xml_util_get_child_string (xmlNode    *parent_node,
+         char      *ret;
+         xmlNode   *node;
+ 
+-        node = xml_util_get_element (parent_node, name, NULL);
++        node = xml_util_get_element2 (parent_node, name, NULL);
+         if (!node)
+                 return NULL;
+ 
+diff --git a/libgupnp-av/xml-util.h b/libgupnp-av/xml-util.h
+index 9ae5b19..5ff2020 100644
+--- a/libgupnp-av/xml-util.h
++++ b/libgupnp-av/xml-util.h
+@@ -63,7 +63,7 @@ xml_doc_get_type                        (void) G_GNUC_CONST;
+ 
+ /* Misc utilities for inspecting xmlNodes */
+ G_GNUC_INTERNAL xmlNode *
+-xml_util_get_element                    (xmlNode    *node,
++xml_util_get_element2                   (xmlNode    *node,
+                                          ...) G_GNUC_NULL_TERMINATED;
+ 
+ G_GNUC_INTERNAL GList *
+@@ -71,7 +71,7 @@ xml_util_get_child_elements_by_name     (xmlNode *node,
+                                          const char *name);
+ 
+ G_GNUC_INTERNAL const char *
+-xml_util_get_child_element_content      (xmlNode    *node,
++xml_util_get_child_element_content2     (xmlNode    *node,
+                                          const char *child_name);
+ 
+ G_GNUC_INTERNAL guint
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/gupnp-av/Config.in b/bsp/buildroot/package/gupnp-av/Config.in
index 5320b82b..7b618f5b 100644
--- a/bsp/buildroot/package/gupnp-av/Config.in
+++ b/bsp/buildroot/package/gupnp-av/Config.in
@@ -7,8 +7,8 @@ config BR2_PACKAGE_GUPNP_AV
 	select BR2_PACKAGE_GUPNP
 	select BR2_PACKAGE_LIBXML2
 	help
-	  GUPnP-AV is a collection of helpers for building AV (audio/video)
-	  applications using GUPnP.
+	  GUPnP-AV is a collection of helpers for building AV
+	  (audio/video) applications using GUPnP.
 
 	  http://www.gupnp.org/
 
diff --git a/bsp/buildroot/package/gupnp-av/gupnp-av.hash b/bsp/buildroot/package/gupnp-av/gupnp-av.hash
index 8fe77822..e106b18a 100644
--- a/bsp/buildroot/package/gupnp-av/gupnp-av.hash
+++ b/bsp/buildroot/package/gupnp-av/gupnp-av.hash
@@ -1,2 +1,5 @@
 # Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.10.sha256sum:
 sha256	8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a	gupnp-av-0.12.10.tar.xz
+
+# Hash for license file:
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
diff --git a/bsp/buildroot/package/gupnp-av/gupnp-av.mk b/bsp/buildroot/package/gupnp-av/gupnp-av.mk
index 40e6c8c8..0940db76 100644
--- a/bsp/buildroot/package/gupnp-av/gupnp-av.mk
+++ b/bsp/buildroot/package/gupnp-av/gupnp-av.mk
@@ -8,7 +8,7 @@ GUPNP_AV_VERSION_MAJOR = 0.12
 GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).10
 GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz
 GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR)
-GUPNP_AV_LICENSE = LGPLv2+
+GUPNP_AV_LICENSE = LGPL-2.0+
 GUPNP_AV_LICENSE_FILES = COPYING
 GUPNP_AV_INSTALL_STAGING = YES
 GUPNP_AV_DEPENDENCIES = host-pkgconf libglib2 libxml2 gupnp
diff --git a/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.hash b/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.hash
index c28a06fc..01c74897 100644
--- a/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.hash
+++ b/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.hash
@@ -1,2 +1,5 @@
 # Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.5.sha256sum:
 sha256	123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a	gupnp-dlna-0.10.5.tar.xz
+
+# Locally computed:
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
diff --git a/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.mk b/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.mk
index 58b57354..304f86a5 100644
--- a/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.mk
+++ b/bsp/buildroot/package/gupnp-dlna/gupnp-dlna.mk
@@ -9,8 +9,8 @@ GUPNP_DLNA_VERSION = $(GUPNP_DLNA_VERSION_MAJOR).5
 GUPNP_DLNA_SOURCE = gupnp-dlna-$(GUPNP_DLNA_VERSION).tar.xz
 GUPNP_DLNA_SITE = \
 	http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR)
-# COPYING contains LGPLv2.1 but all source files contain LPGLv2+
-GUPNP_DLNA_LICENSE = LGPLv2+
+# COPYING contains LGPL-2.1 but all source files contain LPGL-2.0+
+GUPNP_DLNA_LICENSE = LGPL-2.0+
 GUPNP_DLNA_LICENSE_FILES = COPYING
 GUPNP_DLNA_INSTALL_STAGING = YES
 GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2
diff --git a/bsp/buildroot/package/gupnp-tools/Config.in b/bsp/buildroot/package/gupnp-tools/Config.in
index f9e645a0..af662417 100644
--- a/bsp/buildroot/package/gupnp-tools/Config.in
+++ b/bsp/buildroot/package/gupnp-tools/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GUPNP_TOOLS
 	bool "gupnp-tools"
+	depends on BR2_PACKAGE_LIBGTK3
 	# gssdp, gupnp, libsoup all select on libglib2, so they have
 	# the same dependencies as libgtk3, which we depend on. So for
 	# the same of simplicity, we don't replicate all those
@@ -8,7 +9,6 @@ config BR2_PACKAGE_GUPNP_TOOLS
 	select BR2_PACKAGE_GUPNP
 	select BR2_PACKAGE_LIBSOUP
 	select BR2_PACKAGE_LIBXML2
-	depends on BR2_PACKAGE_LIBGTK3
 	help
 	  GUPnP Tools are free replacements of Intel UPnP tools that
 	  use GUPnP. They provides client and server side tools which
diff --git a/bsp/buildroot/package/gupnp-tools/gupnp-tools.hash b/bsp/buildroot/package/gupnp-tools/gupnp-tools.hash
index f08b4f5e..d80d8326 100644
--- a/bsp/buildroot/package/gupnp-tools/gupnp-tools.hash
+++ b/bsp/buildroot/package/gupnp-tools/gupnp-tools.hash
@@ -1,2 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.13.sha256sum:
-sha256	aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed	gupnp-tools-0.8.13.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.14.sha256sum:
+sha256	682b952b3cf43818c7d27549c152ea52e43320500820ab3392cf5a29a95e7efa	gupnp-tools-0.8.14.tar.xz
+
+# Locally computed:
+sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	COPYING
diff --git a/bsp/buildroot/package/gupnp-tools/gupnp-tools.mk b/bsp/buildroot/package/gupnp-tools/gupnp-tools.mk
index 07b5d3c1..8f95e04f 100644
--- a/bsp/buildroot/package/gupnp-tools/gupnp-tools.mk
+++ b/bsp/buildroot/package/gupnp-tools/gupnp-tools.mk
@@ -5,11 +5,11 @@
 ################################################################################
 
 GUPNP_TOOLS_VERSION_MAJOR = 0.8
-GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).13
+GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).14
 GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz
 GUPNP_TOOLS_SITE = \
 	http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR)
-GUPNP_TOOLS_LICENSE = GPLv2+
+GUPNP_TOOLS_LICENSE = GPL-2.0+
 GUPNP_TOOLS_LICENSE_FILES = COPYING
 GUPNP_TOOLS_INSTALL_STAGING = YES
 GUPNP_TOOLS_DEPENDENCIES = \
diff --git a/bsp/buildroot/package/gupnp/gupnp.hash b/bsp/buildroot/package/gupnp/gupnp.hash
index 48aeb499..7f608647 100644
--- a/bsp/buildroot/package/gupnp/gupnp.hash
+++ b/bsp/buildroot/package/gupnp/gupnp.hash
@@ -1,2 +1,5 @@
-# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.1.sha256sum:
-sha256	934584cc1b361bf251a5ac271ffb1995a3c6426ce44cb64f9c6d779f2af9a6d9	gupnp-1.0.1.tar.xz
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.2.sha256sum:
+sha256	5173fda779111c6b01cd4a5e41b594322be9d04f8c74d3361f0a0c2069c77610  	gupnp-1.0.2.tar.xz
+
+# Hash for license file:
+sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5  COPYING
diff --git a/bsp/buildroot/package/gupnp/gupnp.mk b/bsp/buildroot/package/gupnp/gupnp.mk
index 764f527d..de08f28a 100644
--- a/bsp/buildroot/package/gupnp/gupnp.mk
+++ b/bsp/buildroot/package/gupnp/gupnp.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 GUPNP_VERSION_MAJOR = 1.0
-GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1
+GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).2
 GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz
 GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR)
-GUPNP_LICENSE = LGPLv2+
+GUPNP_LICENSE = LGPL-2.0+
 GUPNP_LICENSE_FILES = COPYING
 GUPNP_INSTALL_STAGING = YES
 GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux
diff --git a/bsp/buildroot/package/gutenprint/gutenprint.mk b/bsp/buildroot/package/gutenprint/gutenprint.mk
index 8ee2406a..65b8d310 100644
--- a/bsp/buildroot/package/gutenprint/gutenprint.mk
+++ b/bsp/buildroot/package/gutenprint/gutenprint.mk
@@ -8,7 +8,7 @@ GUTENPRINT_VERSION_MAJOR = 5.2
 GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).11
 GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION)
 GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2
-GUTENPRINT_LICENSE = GPLv2+
+GUTENPRINT_LICENSE = GPL-2.0+
 GUTENPRINT_LICENSE_FILES = COPYING
 
 # Needed, as we touch Makefile.am and configure.ac
@@ -43,7 +43,7 @@ GUTENPRINT_CONF_OPTS = \
 	--disable-cups-ppds
 
 # USE_PREGEN_XMLI18N_TMP_H is added by our patch
-GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h
+GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/include/xmli18n-tmp.h
 
 HOST_GUTENPRINT_DEPENDENCIES = host-pkgconf
 # The host-gutenprint shall create the required header
@@ -78,13 +78,13 @@ GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
 HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR
 
 define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
-	cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include
+	cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/include
 endef
 HOST_GUTENPRINT_POST_BUILD_HOOKS += HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER
 
 define GUTENPRINT_POST_INSTALL_TARGET_FIXUP
 	mkdir -p $(TARGET_DIR)/usr/share/gutenprint/5.2
-	cp -rf $(HOST_DIR)/usr/share/gutenprint/5.2/xml $(TARGET_DIR)/usr/share/gutenprint/5.2
+	cp -rf $(HOST_DIR)/share/gutenprint/5.2/xml $(TARGET_DIR)/usr/share/gutenprint/5.2
 endef
 GUTENPRINT_POST_INSTALL_TARGET_HOOKS += GUTENPRINT_POST_INSTALL_TARGET_FIXUP
 
diff --git a/bsp/buildroot/package/gvfs/gvfs.mk b/bsp/buildroot/package/gvfs/gvfs.mk
index f3b5fc42..7110e390 100644
--- a/bsp/buildroot/package/gvfs/gvfs.mk
+++ b/bsp/buildroot/package/gvfs/gvfs.mk
@@ -10,7 +10,7 @@ GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz
 GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
 GVFS_INSTALL_STAGING = YES
 GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info
-GVFS_LICENSE = LGPLv2+
+GVFS_LICENSE = LGPL-2.0+
 GVFS_LICENSE_FILES = COPYING
 
 # Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent
@@ -128,12 +128,12 @@ define GVFS_REMOVE_TARGET_SCHEMAS
 endef
 
 define GVFS_COMPILE_SCHEMAS
-	$(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
+	$(HOST_DIR)/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
 endef
 
 GVFS_POST_INSTALL_TARGET_HOOKS += \
-	GVFS_REMOVE_USELESS_BINARY	\
-	GVFS_REMOVE_TARGET_SCHEMAS	\
+	GVFS_REMOVE_USELESS_BINARY \
+	GVFS_REMOVE_TARGET_SCHEMAS \
 	GVFS_COMPILE_SCHEMAS
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/gzip/gzip.mk b/bsp/buildroot/package/gzip/gzip.mk
index c4e91b07..26fc8ec3 100644
--- a/bsp/buildroot/package/gzip/gzip.mk
+++ b/bsp/buildroot/package/gzip/gzip.mk
@@ -11,7 +11,7 @@ GZIP_SITE = $(BR2_GNU_MIRROR)/gzip
 GZIP_CONF_OPTS = --exec-prefix=/
 # Prefer full gzip over potentially lightweight/slower from busybox
 GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-GZIP_LICENSE = GPLv3+
+GZIP_LICENSE = GPL-3.0+
 GZIP_LICENSE_FILES = COPYING
 GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes
 # configure substitutes $(SHELL) for the shell shebang in scripts like
diff --git a/bsp/buildroot/package/hans/Config.in b/bsp/buildroot/package/hans/Config.in
index 7b60090f..54bdfd96 100644
--- a/bsp/buildroot/package/hans/Config.in
+++ b/bsp/buildroot/package/hans/Config.in
@@ -5,9 +5,10 @@ config BR2_PACKAGE_HANS
 	bool "hans"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Hans makes it possible to tunnel IPv4 through ICMP echo packets,
-	  so you could call it a ping tunnel.
+	  Hans makes it possible to tunnel IPv4 through ICMP echo
+	  packets, so you could call it a ping tunnel.
 	  This can be useful when you find yourself in the situation
-	  that your Internet access is firewalled, but pings are allowed.
+	  that your Internet access is firewalled, but pings are
+	  allowed.
 
 	  http://code.gerade.org/hans/
diff --git a/bsp/buildroot/package/hans/hans.hash b/bsp/buildroot/package/hans/hans.hash
index c1a28df1..bde6a7ab 100644
--- a/bsp/buildroot/package/hans/hans.hash
+++ b/bsp/buildroot/package/hans/hans.hash
@@ -1,3 +1,5 @@
 # From http://sourceforge.net/projects/hanstunnel/files/source/
-md5	97a93a886bc766212257198fd99d1061	hans-0.4.4.tar.gz
-sha1	8a21a9acc6d52cf7d2a5049523469e2609716ab3	hans-0.4.4.tar.gz
+md5 8628393ec1b61a6c3a47a0a3dcb455b3  hans-1.0.tar.gz
+sha1 0bc857df109af222732cb95c861a0f0a6dd53dee  hans-1.0.tar.gz
+# Locally computed
+sha256 f8f70cf22ba14d9223695c9e9a2d75289d8360f61f533b83ee538836f29a458e  hans-1.0.tar.gz
diff --git a/bsp/buildroot/package/hans/hans.mk b/bsp/buildroot/package/hans/hans.mk
index c10ae654..e26c2f37 100644
--- a/bsp/buildroot/package/hans/hans.mk
+++ b/bsp/buildroot/package/hans/hans.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-HANS_VERSION = 0.4.4
+HANS_VERSION = 1.0
 HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source
-HANS_LICENSE = GPLv3+
+HANS_LICENSE = GPL-3.0+
 HANS_LICENSE_FILES = LICENSE
 
 define HANS_BUILD_CMDS
diff --git a/bsp/buildroot/package/harfbuzz/harfbuzz.hash b/bsp/buildroot/package/harfbuzz/harfbuzz.hash
index b7da64b4..5f786dcb 100644
--- a/bsp/buildroot/package/harfbuzz/harfbuzz.hash
+++ b/bsp/buildroot/package/harfbuzz/harfbuzz.hash
@@ -1,2 +1,5 @@
-# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.4.tar.bz2.sha256
-sha256	35d2f8ca476cbbec64ee824eca6b0209ff8db0334990b9f5af893b94f119d255	harfbuzz-1.4.4.tar.bz2
+# From https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.7.1.tar.bz2.sha256
+sha256	9645a6e83313b690602017f18d4eb2adf81f2e54c6fc4471e19331304965154e	harfbuzz-1.7.1.tar.bz2
+
+# Locally computed
+sha256	2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216	COPYING
diff --git a/bsp/buildroot/package/harfbuzz/harfbuzz.mk b/bsp/buildroot/package/harfbuzz/harfbuzz.mk
index 64644809..5708745f 100644
--- a/bsp/buildroot/package/harfbuzz/harfbuzz.mk
+++ b/bsp/buildroot/package/harfbuzz/harfbuzz.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HARFBUZZ_VERSION = 1.4.4
+HARFBUZZ_VERSION = 1.7.1
 HARFBUZZ_SITE = https://www.freedesktop.org/software/harfbuzz/release
 HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
 HARFBUZZ_LICENSE = MIT, ISC (ucdn library)
diff --git a/bsp/buildroot/package/haserl/haserl.mk b/bsp/buildroot/package/haserl/haserl.mk
index 93d64c87..4c24b9bc 100644
--- a/bsp/buildroot/package/haserl/haserl.mk
+++ b/bsp/buildroot/package/haserl/haserl.mk
@@ -6,7 +6,7 @@
 
 HASERL_VERSION = 0.9.35
 HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel
-HASERL_LICENSE = GPLv2
+HASERL_LICENSE = GPL-2.0
 HASERL_LICENSE_FILES = COPYING
 HASERL_DEPENDENCIES = host-pkgconf
 
diff --git a/bsp/buildroot/package/haveged/haveged.mk b/bsp/buildroot/package/haveged/haveged.mk
index 66d69a6d..a645557b 100644
--- a/bsp/buildroot/package/haveged/haveged.mk
+++ b/bsp/buildroot/package/haveged/haveged.mk
@@ -6,7 +6,7 @@
 
 HAVEGED_VERSION = 1.9.1
 HAVEGED_SITE = http://www.issihosts.com/haveged
-HAVEGED_LICENSE = GPLv3+
+HAVEGED_LICENSE = GPL-3.0+
 HAVEGED_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
diff --git a/bsp/buildroot/package/hdparm/hdparm.hash b/bsp/buildroot/package/hdparm/hdparm.hash
index 14021691..f7462e25 100644
--- a/bsp/buildroot/package/hdparm/hdparm.hash
+++ b/bsp/buildroot/package/hdparm/hdparm.hash
@@ -1,3 +1,5 @@
 # From http://sourceforge.net/projects/hdparm/files/hdparm/
-md5	8fe0a71db02f7ffc602d14a69f766cff	hdparm-9.51.tar.gz
-sha1	cc9dc4cbaa00f7534988c37111be8e2c6e81cf73	hdparm-9.51.tar.gz
+md5 410539d0bf3cc247181594581edbfb53  hdparm-9.52.tar.gz
+sha1 c641429c5b5d0513acfc86dc31c6b3b35c070a70  hdparm-9.52.tar.gz
+# Locally computed
+sha256 c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6  hdparm-9.52.tar.gz
diff --git a/bsp/buildroot/package/hdparm/hdparm.mk b/bsp/buildroot/package/hdparm/hdparm.mk
index 4a53e939..72722022 100644
--- a/bsp/buildroot/package/hdparm/hdparm.mk
+++ b/bsp/buildroot/package/hdparm/hdparm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HDPARM_VERSION = 9.51
+HDPARM_VERSION = 9.52
 HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm
 HDPARM_LICENSE = BSD-Style
 HDPARM_LICENSE_FILES = LICENSE.TXT
diff --git a/bsp/buildroot/package/heimdal/heimdal.mk b/bsp/buildroot/package/heimdal/heimdal.mk
index 0dbb151d..5f7b6c68 100644
--- a/bsp/buildroot/package/heimdal/heimdal.mk
+++ b/bsp/buildroot/package/heimdal/heimdal.mk
@@ -24,17 +24,20 @@ HOST_HEIMDAL_CONF_OPTS = \
 	--without-libedit \
 	--without-hesiod \
 	--without-x \
+	--disable-mdb-db \
+	--disable-ndbm-db \
 	--disable-heimdal-documentation
+
 HOST_HEIMDAL_CONF_ENV = MAKEINFO=true
-HEIMDAL_LICENSE = BSD-3c
+HEIMDAL_LICENSE = BSD-3-Clause
 HEIMDAL_LICENSE_FILES = LICENSE
 
 # We need asn1_compile in the PATH for samba4
 define HOST_HEIMDAL_MAKE_SYMLINK
-	ln -sf $(HOST_DIR)/usr/libexec/heimdal/asn1_compile \
-		$(HOST_DIR)/usr/bin/asn1_compile
-	ln -sf $(HOST_DIR)/usr/bin/compile_et \
-		$(HOST_DIR)/usr/libexec/heimdal/compile_et
+	ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \
+		$(HOST_DIR)/bin/asn1_compile
+	ln -sf $(HOST_DIR)/bin/compile_et \
+		$(HOST_DIR)/libexec/heimdal/compile_et
 endef
 
 HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_MAKE_SYMLINK
diff --git a/bsp/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch b/bsp/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch
new file mode 100644
index 00000000..0fafa4ae
--- /dev/null
+++ b/bsp/buildroot/package/heirloom-mailx/0002-fix-libressl-support.patch
@@ -0,0 +1,54 @@
+From aad28d30af6c3a74c522dd61943788e908860c84 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Fri, 4 Aug 2017 07:22:47 -0400
+Subject: [PATCH] fix libressl support
+
+heirloom-mailx has two small issues when compiling against LibreSSL:
+  - RAND_egd is used (LibreSSL does not support RAND_egd)
+    Solution: "Guard" the code calling RAND_egd
+
+  - SSLv3_client_method function is used (LibreSSL does not support SSLv3)
+    Solution: "Guard" the code with #ifndef OPENSSL_NO_SSL3
+
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ openssl.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/openssl.c b/openssl.c
+index 44fe4e5..c4a1bb7 100644
+--- a/openssl.c
++++ b/openssl.c
+@@ -137,11 +137,13 @@ ssl_rand_init(void)
+ 
+ 	if ((cp = value("ssl-rand-egd")) != NULL) {
+ 		cp = expand(cp);
++#ifndef OPENSSL_NO_EGD
+ 		if (RAND_egd(cp) == -1) {
+ 			fprintf(stderr, catgets(catd, CATSET, 245,
+ 				"entropy daemon at \"%s\" not available\n"),
+ 					cp);
+ 		} else
++#endif
+ 			state = 1;
+ 	} else if ((cp = value("ssl-rand-file")) != NULL) {
+ 		cp = expand(cp);
+@@ -216,10 +218,15 @@ ssl_select_method(const char *uhp)
+ 
+ 	cp = ssl_method_string(uhp);
+ 	if (cp != NULL) {
++		#ifndef OPENSSL_NO_SSL3
+ 		if (equal(cp, "ssl3"))
+ 			method = SSLv3_client_method();
+ 		else if (equal(cp, "tls1"))
+ 			method = TLSv1_client_method();
++		#else
++		if (equal(cp, "tls1"))
++			method = TLSv1_client_method();
++		#endif
+ 		else {
+ 			fprintf(stderr, catgets(catd, CATSET, 244,
+ 					"Invalid SSL method \"%s\"\n"), cp);
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/package/heirloom-mailx/heirloom-mailx.mk b/bsp/buildroot/package/heirloom-mailx/heirloom-mailx.mk
index 044cd8cf..2f7e635e 100644
--- a/bsp/buildroot/package/heirloom-mailx/heirloom-mailx.mk
+++ b/bsp/buildroot/package/heirloom-mailx/heirloom-mailx.mk
@@ -7,7 +7,7 @@
 HEIRLOOM_MAILX_VERSION = 12.5
 HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
 HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx
-HEIRLOOM_MAILX_LICENSE = BSD-4c, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss)
+HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPL-1.1 (nss)
 HEIRLOOM_MAILX_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/bsp/buildroot/package/hiawatha/0001-cmake-allow-build-without-c.patch b/bsp/buildroot/package/hiawatha/0001-cmake-allow-build-without-c.patch
new file mode 100644
index 00000000..d264d621
--- /dev/null
+++ b/bsp/buildroot/package/hiawatha/0001-cmake-allow-build-without-c.patch
@@ -0,0 +1,34 @@
+From 784e46afd7530f3010726ba73cc1a81059eae8bf Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Mon, 5 Jun 2017 13:26:18 +0200
+Subject: [PATCH] cmake: allow build without c++
+
+By default cmake also searches for a c++ compiler:
+https://cmake.org/cmake/help/v3.7/command/project.html
+"By default C and CXX are enabled if no language options are given."
+
+This patch restricts the compiler to C to fix a build error detected
+by the buildroot autobuilders:
+http://autobuild.buildroot.net/results/c04/c04ff29b83c020573add597c355c57a6d9c9761d/build-end.log
+
+Patch sent upstream: https://github.com/hsleisink/hiawatha/pull/30
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4f28d76..e8051fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ cmake_minimum_required(VERSION 3.0)
+-project(Hiawatha VERSION 10.6)
++project(Hiawatha VERSION 10.6 LANGUAGES C)
+ 
+ # Compiler
+ set(CMAKE_C_FLAGS "-O2 -Wall -Wextra ${CMAKE_C_FLAGS}")
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/hiawatha/hiawatha.hash b/bsp/buildroot/package/hiawatha/hiawatha.hash
index 636dfd5d..3ec11cc2 100644
--- a/bsp/buildroot/package/hiawatha/hiawatha.hash
+++ b/bsp/buildroot/package/hiawatha/hiawatha.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	d76155430dc9100de412088bd68978a2a9052832609c7ac961dccaf2550c618a	hiawatha-10.5.tar.gz
+sha256 0cf014ae214be1bf6244c46c25e66805987c948837a4e37f9dede570de49bdeb  hiawatha-10.6.tar.gz
diff --git a/bsp/buildroot/package/hiawatha/hiawatha.mk b/bsp/buildroot/package/hiawatha/hiawatha.mk
index abe57b7f..4dde2545 100644
--- a/bsp/buildroot/package/hiawatha/hiawatha.mk
+++ b/bsp/buildroot/package/hiawatha/hiawatha.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-HIAWATHA_VERSION = 10.5
-HIAWATHA_SITE = http://www.hiawatha-webserver.org/files
+HIAWATHA_VERSION = 10.6
+HIAWATHA_SITE = https://www.hiawatha-webserver.org/files
 HIAWATHA_DEPENDENCIES = zlib
-HIAWATHA_LICENSE = GPLv2
+HIAWATHA_LICENSE = GPL-2.0
 HIAWATHA_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y)
diff --git a/bsp/buildroot/package/hicolor-icon-theme/Config.in b/bsp/buildroot/package/hicolor-icon-theme/Config.in
index 6cda097c..10edbf88 100644
--- a/bsp/buildroot/package/hicolor-icon-theme/Config.in
+++ b/bsp/buildroot/package/hicolor-icon-theme/Config.in
@@ -5,4 +5,5 @@ config BR2_PACKAGE_HICOLOR_ICON_THEME
 
 	  This is the fallback icon theme, which only creates the
 	  standard directory structure for storing icons of third-party
-	  applications (i.e. the ones not available in usual icon themes).
+	  applications (i.e. the ones not available in usual icon
+	  themes).
diff --git a/bsp/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk b/bsp/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk
index 5e000749..dec75c15 100644
--- a/bsp/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk
+++ b/bsp/buildroot/package/hicolor-icon-theme/hicolor-icon-theme.mk
@@ -7,7 +7,7 @@
 HICOLOR_ICON_THEME_VERSION = 0.15
 HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases
 HICOLOR_ICON_THEME_SOURCE = hicolor-icon-theme-$(HICOLOR_ICON_THEME_VERSION).tar.xz
-HICOLOR_ICON_THEME_LICENSE = GPLv2
+HICOLOR_ICON_THEME_LICENSE = GPL-2.0
 HICOLOR_ICON_THEME_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/hidapi/Config.in b/bsp/buildroot/package/hidapi/Config.in
index f6a31bac..b98c2db9 100644
--- a/bsp/buildroot/package/hidapi/Config.in
+++ b/bsp/buildroot/package/hidapi/Config.in
@@ -5,6 +5,8 @@ config BR2_PACKAGE_HIDAPI
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBGUDEV
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	# runtime UTF conversion support
+	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  HIDAPI is a multi-platform library which allows an application
 	  to interface with USB and Bluetooth HID-Class devices on
diff --git a/bsp/buildroot/package/hidapi/hidapi.mk b/bsp/buildroot/package/hidapi/hidapi.mk
index 9922efc0..7eed8003 100644
--- a/bsp/buildroot/package/hidapi/hidapi.mk
+++ b/bsp/buildroot/package/hidapi/hidapi.mk
@@ -11,7 +11,7 @@ HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION))
 HIDAPI_INSTALL_STAGING = YES
 # No configure provided, so we need to autoreconf.
 HIDAPI_AUTORECONF = YES
-HIDAPI_LICENSE = GPLv3 or BSD-3c or HIDAPI license
+HIDAPI_LICENSE = GPL-3.0 or BSD-3-Clause or HIDAPI license
 HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt
 
 HIDAPI_DEPENDENCIES = libusb libgudev
diff --git a/bsp/buildroot/package/hiredis/hiredis.hash b/bsp/buildroot/package/hiredis/hiredis.hash
index 2c788a67..682ec6d2 100644
--- a/bsp/buildroot/package/hiredis/hiredis.hash
+++ b/bsp/buildroot/package/hiredis/hiredis.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	717e6fc8dc2819bef522deaca516de9e51b9dfa68fe393b7db5c3b6079196f78	hiredis-v0.13.3.tar.gz
+sha256	dca05ce8fc87a8261783b4aed0deef8becc9350b6aa770bc714d0c1833b896eb	COPYING
diff --git a/bsp/buildroot/package/hiredis/hiredis.mk b/bsp/buildroot/package/hiredis/hiredis.mk
index 598e0147..dd757422 100644
--- a/bsp/buildroot/package/hiredis/hiredis.mk
+++ b/bsp/buildroot/package/hiredis/hiredis.mk
@@ -7,7 +7,7 @@
 HIREDIS_VERSION_MAJOR = 0.13
 HIREDIS_VERSION = v$(HIREDIS_VERSION_MAJOR).3
 HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION))
-HIREDIS_LICENSE = BSD-3c
+HIREDIS_LICENSE = BSD-3-Clause
 HIREDIS_LICENSE_FILES = COPYING
 HIREDIS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/hostapd/Config.in b/bsp/buildroot/package/hostapd/Config.in
index 1609d0df..84156e8f 100644
--- a/bsp/buildroot/package/hostapd/Config.in
+++ b/bsp/buildroot/package/hostapd/Config.in
@@ -14,6 +14,11 @@ config BR2_PACKAGE_HOSTAPD
 
 if BR2_PACKAGE_HOSTAPD
 
+config BR2_PACKAGE_HOSTAPD_DRIVER_RTW
+	bool "Enable rtl871xdrv driver"
+	help
+	  Enable support for Realtek wireless chips.
+
 config BR2_PACKAGE_HOSTAPD_ACS
 	bool "Enable ACS"
 	default y
@@ -38,6 +43,29 @@ config BR2_PACKAGE_HOSTAPD_WPS
 	help
 	  Enable support for Wi-Fi Protected Setup.
 
+config BR2_PACKAGE_HOSTAPD_VLAN
+	bool "Enable VLAN support"
+	default y
+	help
+	  Enable support for VLANs.
+
+config BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC
+	bool "Enable dynamic VLAN support"
+	default y
+	depends on BR2_PACKAGE_HOSTAPD_VLAN
+	help
+	  Enable support for fully dynamic VLANs.
+	  This enables hostapd to automatically create
+	  bridge and VLAN interfaces if necessary.
+
+config BR2_PACKAGE_HOSTAPD_VLAN_NETLINK
+	bool "Use netlink-based API for VLAN operations"
+	default y
+	depends on BR2_PACKAGE_HOSTAPD_VLAN
+	help
+	  Use netlink-based kernel API for VLAN operations
+	  instead of ioctl().
+
 endif
 
 comment "hostapd needs a toolchain w/ threads"
diff --git a/bsp/buildroot/package/hostapd/hostapd.hash b/bsp/buildroot/package/hostapd/hostapd.hash
index b20c89b1..588879f6 100644
--- a/bsp/buildroot/package/hostapd/hostapd.hash
+++ b/bsp/buildroot/package/hostapd/hostapd.hash
@@ -1,4 +1,5 @@
 # Locally calculated
 sha256  01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d  hostapd-2.6.tar.gz
+sha256  e204da659d0583c71af23cb9b55536fe99598ee26a44104344f456e4d17350c6  rtlxdrv.patch
 sha256  529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b  rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
 sha256  147c8abe07606905d16404fb2d2c8849796ca7c85ed8673c09bb50038bcdeb9e  rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch
diff --git a/bsp/buildroot/package/hostapd/hostapd.mk b/bsp/buildroot/package/hostapd/hostapd.mk
index 3ac1979c..16966703 100644
--- a/bsp/buildroot/package/hostapd/hostapd.mk
+++ b/bsp/buildroot/package/hostapd/hostapd.mk
@@ -13,20 +13,18 @@ HOSTAPD_SUBDIR = hostapd
 HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
 HOSTAPD_DEPENDENCIES = host-pkgconf libnl
 HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
-HOSTAPD_LICENSE = BSD-3c
+HOSTAPD_LICENSE = BSD-3-Clause
 HOSTAPD_LICENSE_FILES = README
 HOSTAPD_CONFIG_SET =
 
 HOSTAPD_CONFIG_ENABLE = \
-	CONFIG_FULL_DYNAMIC_VLAN \
 	CONFIG_HS20 \
 	CONFIG_IEEE80211AC \
 	CONFIG_IEEE80211N \
 	CONFIG_IEEE80211R \
 	CONFIG_INTERNAL_LIBTOMMATH \
 	CONFIG_INTERWORKING \
-	CONFIG_LIBNL32 \
-	CONFIG_VLAN_NETLINK
+	CONFIG_LIBNL32
 
 HOSTAPD_CONFIG_DISABLE =
 
@@ -38,8 +36,8 @@ HOSTAPD_LIBS += -lnl-3 -lm -lpthread
 endif
 
 # Try to use openssl if it's already available
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-HOSTAPD_DEPENDENCIES += openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+HOSTAPD_DEPENDENCIES += libopenssl
 HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
 HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
 else
@@ -47,6 +45,11 @@ HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD
 HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/'
 endif
 
+ifeq ($(BR2_PACKAGE_HOSTAPD_DRIVER_RTW),y)
+HOSTAPD_PATCH += https://github.com/pritambaral/hostapd-rtl871xdrv/raw/master/rtlxdrv.patch
+HOSTAPD_CONFIG_SET += CONFIG_DRIVER_RTW
+endif
+
 ifeq ($(BR2_PACKAGE_HOSTAPD_ACS),y)
 HOSTAPD_CONFIG_ENABLE += CONFIG_ACS
 endif
@@ -54,7 +57,7 @@ endif
 ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
 HOSTAPD_CONFIG_ENABLE += \
 	CONFIG_EAP \
-	CONFIG_RADIUS_SERVER \
+	CONFIG_RADIUS_SERVER
 
 # Enable both TLS v1.1 (CONFIG_TLSV11) and v1.2 (CONFIG_TLSV12)
 HOSTAPD_CONFIG_ENABLE += CONFIG_TLSV1
@@ -69,6 +72,18 @@ ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y)
 HOSTAPD_CONFIG_ENABLE += CONFIG_WPS
 endif
 
+ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN),)
+HOSTAPD_CONFIG_ENABLE += CONFIG_NO_VLAN
+endif
+
+ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_DYNAMIC),y)
+HOSTAPD_CONFIG_ENABLE += CONFIG_FULL_DYNAMIC_VLAN
+endif
+
+ifeq ($(BR2_PACKAGE_HOSTAPD_VLAN_NETLINK),y)
+HOSTAPD_CONFIG_ENABLE += CONFIG_VLAN_NETLINK
+endif
+
 define HOSTAPD_CONFIGURE_CMDS
 	cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG)
 	sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \
diff --git a/bsp/buildroot/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch b/bsp/buildroot/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch
index 81474901..db2f0a43 100644
--- a/bsp/buildroot/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch
+++ b/bsp/buildroot/package/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch
@@ -23,7 +23,7 @@ index 8b06428..680cad5 100755
 @@ -27,8 +27,7 @@
  
  #AC_PREREQ(2.59)
- AC_INIT([HP Linux Imaging and Printing], [3.16.11], [3.16.11], [hplip])
+ AC_INIT([HP Linux Imaging and Printing], [3.17.10], [3.17.10], [hplip])
 -#AM_INIT_AUTOMAKE([1.9 foreign])
 -AM_INIT_AUTOMAKE
 +AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
diff --git a/bsp/buildroot/package/hplip/Config.in b/bsp/buildroot/package/hplip/Config.in
index 176dc6a6..f4e0fe75 100644
--- a/bsp/buildroot/package/hplip/Config.in
+++ b/bsp/buildroot/package/hplip/Config.in
@@ -8,11 +8,12 @@ config BR2_PACKAGE_HPLIP
 	select BR2_PACKAGE_JPEG
 	help
 	  HP Linux Imaging and Printing (HPLIP)
-	  HPLIP is an HP-developed solution for printing, scanning, and faxing
-	  with HP inkjet and laser based printers in Linux. The HPLIP project
-	  provides printing support for 2,211 printer models, including
-	  Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business
-	  Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP.
+	  HPLIP is an HP-developed solution for printing, scanning, and
+	  faxing with HP inkjet and laser based printers in Linux. The
+	  HPLIP project provides printing support for 2,211 printer
+	  models, including Deskjet, Officejet, Photosmart, PSC
+	  (Print Scan Copy), Business Inkjet, LaserJet, Edgeline MFP,
+	  and LaserJet MFP.
 
 	  http://hplipopensource.com/
 
diff --git a/bsp/buildroot/package/hplip/hplip.hash b/bsp/buildroot/package/hplip/hplip.hash
index 9dfb7a2a..2260850e 100644
--- a/bsp/buildroot/package/hplip/hplip.hash
+++ b/bsp/buildroot/package/hplip/hplip.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  f6e20cacb4891e4e60fc5de2213a10f8d0c68840f9b511aa38cfca0cb29f9b24  hplip-3.16.11.tar.gz
+sha256  0f7344174672f63a98a22f3c109005b6eb89fe738b7d466316bf2c53d083476c  hplip-3.17.10.tar.gz
diff --git a/bsp/buildroot/package/hplip/hplip.mk b/bsp/buildroot/package/hplip/hplip.mk
index cd1be042..9eac83d5 100644
--- a/bsp/buildroot/package/hplip/hplip.mk
+++ b/bsp/buildroot/package/hplip/hplip.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-HPLIP_VERSION = 3.16.11
+HPLIP_VERSION = 3.17.10
 HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip
 HPLIP_AUTORECONF = YES
 HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf
-HPLIP_LICENSE = GPLv2, BSD-3c, MIT
+HPLIP_LICENSE = GPL-2.0, BSD-3-Clause, MIT
 HPLIP_LICENSE_FILES = COPYING
 
 HPLIP_CONF_OPTS = \
diff --git a/bsp/buildroot/package/htop/htop.mk b/bsp/buildroot/package/htop/htop.mk
index dd3bed41..d06e4a56 100644
--- a/bsp/buildroot/package/htop/htop.mk
+++ b/bsp/buildroot/package/htop/htop.mk
@@ -9,7 +9,7 @@ HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION)
 HTOP_DEPENDENCIES = ncurses
 # Prevent htop build system from searching the host paths
 HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
-HTOP_LICENSE = GPLv2
+HTOP_LICENSE = GPL-2.0
 HTOP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
diff --git a/bsp/buildroot/package/httping/0002-Makefile-allow-build-without-gettext.patch b/bsp/buildroot/package/httping/0002-Makefile-allow-build-without-gettext.patch
new file mode 100644
index 00000000..aec1de47
--- /dev/null
+++ b/bsp/buildroot/package/httping/0002-Makefile-allow-build-without-gettext.patch
@@ -0,0 +1,48 @@
+From fe7d6c5a0e5dfe129f228498037393d23d6ae890 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 18 Jul 2017 19:09:03 +0300
+Subject: [PATCH] Makefile: allow build without gettext
+
+The msgfmt command is part of the gettext package, and is used to generate
+binary translation files. When gettext is not installed, build fails.
+Translation files are not always needed on size constrained embedded targets.
+Add an option to disable translation files generation using the NO_GETTEXT
+variable.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/flok99/httping/pull/36
+
+ Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 46127f4cdde1..160cc1794ec8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,9 @@ MKDIR=/bin/mkdir
+ ARCHIVE=/bin/tar cf -
+ COMPRESS=/bin/gzip -9
+ 
++ifneq ($(NO_GETTEXT),yes)
+ TRANSLATIONS=nl.mo ru.mo
++endif
+ 
+ OBJS=gen.o http.o io.o error.o utils.o main.o tcp.o res.o socks5.o kalman.o cookies.o help.o colors.o
+ 
+@@ -118,10 +120,12 @@ install: $(TARGET) $(TRANSLATIONS)
+ ifneq ($(DEBUG),yes)
+ 	$(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
+ endif
++ifneq ($(NO_GETTEXT),yes)
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES
+ 	cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES
+ 	cp ru.mo $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES/httping.mo
++endif
+ 
+ 
+ makefile.inc:
+-- 
+2.13.2
+
diff --git a/bsp/buildroot/package/httping/Config.in b/bsp/buildroot/package/httping/Config.in
index 65644159..c0e5071c 100644
--- a/bsp/buildroot/package/httping/Config.in
+++ b/bsp/buildroot/package/httping/Config.in
@@ -4,13 +4,13 @@ comment "httping needs a toolchain w/ wchar"
 config BR2_PACKAGE_HTTPING
 	bool "httping"
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  Httping is like 'ping' but for http-requests.
-	  Give it an url, and it'll show you how long it takes to connect,
-	  send a request and retrieve the reply (only the headers).
-	  Be aware that the transmission across the network also takes time!
-	  So it measures the latency of the webserver + network.
+	  Give it an url, and it'll show you how long it takes to
+	  connect, send a request and retrieve the reply (only the
+	  headers).
+	  Be aware that the transmission across the network also takes
+	  time! So it measures the latency of the webserver + network.
 
 	  http://www.vanheusden.com/httping/
 
diff --git a/bsp/buildroot/package/httping/httping.hash b/bsp/buildroot/package/httping/httping.hash
index a50eedb7..c3961576 100644
--- a/bsp/buildroot/package/httping/httping.hash
+++ b/bsp/buildroot/package/httping/httping.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256	3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8	httping-2.5.tgz
+sha256  c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d	license.txt
diff --git a/bsp/buildroot/package/httping/httping.mk b/bsp/buildroot/package/httping/httping.mk
index 3418ffa1..955ee313 100644
--- a/bsp/buildroot/package/httping/httping.mk
+++ b/bsp/buildroot/package/httping/httping.mk
@@ -7,13 +7,13 @@
 HTTPING_VERSION = 2.5
 HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
 HTTPING_SITE = http://www.vanheusden.com/httping
-HTTPING_LICENSE = GPLv2
+HTTPING_LICENSE = GPL-2.0
 HTTPING_LICENSE_FILES = license.txt
 HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \
-	$(if $(BR2_NEEDS_GETTEXT),-lintl) \
+	$(TARGET_NLS_LIBS) \
 	$(if $(BR2_PACKAGE_LIBICONV),-liconv)
-HTTPING_DEPENDENCIES = host-gettext \
-	$(if $(BR2_NEEDS_GETTEXT),gettext) \
+HTTPING_DEPENDENCIES = \
+	$(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
@@ -22,7 +22,8 @@ HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
 	FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \
 	NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
 	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
-	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no)
+	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
+	NO_GETTEXT=$(if $(BR2_SYSTEM_ENABLE_NLS),no,yes)
 
 define HTTPING_BUILD_CMDS
 	$(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
diff --git a/bsp/buildroot/package/hwdata/Config.in b/bsp/buildroot/package/hwdata/Config.in
index 33e0738a..f563988a 100644
--- a/bsp/buildroot/package/hwdata/Config.in
+++ b/bsp/buildroot/package/hwdata/Config.in
@@ -1,5 +1,38 @@
 config BR2_PACKAGE_HWDATA
 	bool "hwdata"
 	help
-	  Various hardware identification and configuration data, such as
-	  the pci.ids database, or the XFree86/xorg Cards database.
+	  Various hardware identification and configuration data
+
+	  - Individual Address Block (IAB) and Organizationally Unique
+	    Identifier (OUI) databases, from IEEE Registration Authority
+	  - PCI ID database
+	  - PNP ID database (from Microsoft)
+	  - USB ID database
+
+	  https://github.com/vcrhonek/hwdata
+
+if BR2_PACKAGE_HWDATA
+
+config BR2_PACKAGE_HWDATA_IAB_OUI_TXT
+	bool "install iab.txt and oui.txt"
+	help
+	  Install iab.txt and oui.txt
+
+config BR2_PACKAGE_HWDATA_PCI_IDS
+	bool "install pci.ids"
+	default y
+	help
+	  Install pci.ids
+
+config BR2_PACKAGE_HWDATA_PNP_IDS
+	bool "install pnp.ids"
+	help
+	  Install pnp.ids
+
+config BR2_PACKAGE_HWDATA_USB_IDS
+	bool "install usb.ids"
+	default y
+	help
+	  Install usb.ids
+
+endif
diff --git a/bsp/buildroot/package/hwdata/hwdata.hash b/bsp/buildroot/package/hwdata/hwdata.hash
index b3c83ebb..dba1be31 100644
--- a/bsp/buildroot/package/hwdata/hwdata.hash
+++ b/bsp/buildroot/package/hwdata/hwdata.hash
@@ -1,3 +1,4 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata/hwdata_0.267-1.dsc
-sha256	d77f2b3f3d6e278be669141ffa5dac01b64cab02f7b2c744bbabc500a45263f4	hwdata_0.267.orig.tar.gz
-sha256	055d2f168de9333562a04f6a230c43dc19c4975882935d8b2f0ab17f64f57275	hwdata_0.267-1.diff.gz
+# Locally calculated
+sha256 986d919c20a0c7f8b669a63830f6d2f4cb5c4cddcfc944c5e2ae05c2e9e5ec9f  hwdata-v0.308.tar.gz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f  LICENSE
diff --git a/bsp/buildroot/package/hwdata/hwdata.mk b/bsp/buildroot/package/hwdata/hwdata.mk
index f8cffcdb..4603ad6e 100644
--- a/bsp/buildroot/package/hwdata/hwdata.mk
+++ b/bsp/buildroot/package/hwdata/hwdata.mk
@@ -4,16 +4,23 @@
 #
 ################################################################################
 
-HWDATA_VERSION = 0.267
-HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz
-HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz
-HWDATA_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata
-HWDATA_LICENSE = GPLv2+ or XFree86 1.0 license
+HWDATA_VERSION = v0.308
+HWDATA_SITE = $(call github,vcrhonek,hwdata,$(HWDATA_VERSION))
+HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0
 HWDATA_LICENSE_FILES = COPYING LICENSE
 
+HWDATA_FILES = \
+	$(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \
+	$(if $(BR2_PACKAGE_HWDATA_PCI_IDS),pci.ids) \
+	$(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \
+	$(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids)
+
+ifneq ($(strip $(HWDATA_FILES)),)
 define HWDATA_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 644 $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata/pci.ids
-	$(INSTALL) -D -m 644 $(@D)/usb.ids $(TARGET_DIR)/usr/share/hwdata/usb.ids
+	$(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata
+	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \
+		$(addprefix $(@D)/,$(HWDATA_FILES))
 endef
+endif
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch b/bsp/buildroot/package/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch
deleted file mode 100644
index c27bdd4d..00000000
--- a/bsp/buildroot/package/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From d5e802c9c2ed8dbe5c937e84bc3ab440218aa8de Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Tue, 12 May 2015 16:03:14 +0200
-Subject: [PATCH] utils/hwloc/Makefile.am: fix install-man race condition
-
-Make install contains a race condition in utils/hwloc, as both
-install-exec-hook (through intall-exec) and install-data trigger
-install-man:
-
-http://autobuild.buildroot.net/results/414/41403f8ce4751a27dd1bb9c43f5a97895dea3980/build-end.log
-
-The install-exec-hook target doesn't do anything with the manual pages, so
-fix the race condition by dropping the dependency.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- utils/hwloc/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/hwloc/Makefile.am b/utils/hwloc/Makefile.am
-index 7ca8027..8bbee86 100644
---- a/utils/hwloc/Makefile.am
-+++ b/utils/hwloc/Makefile.am
-@@ -108,7 +108,7 @@ endif HWLOC_HAVE_LINUX
- 	  -e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \
- 	  > $@ < $<
- 
--install-exec-hook: install-man
-+install-exec-hook:
- 	$(SED) -e 's/HWLOC_top_builddir\/utils\/hwloc/bindir/' -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
- 	$(SED) -e 's/HWLOC_top_builddir\/utils\/hwloc/bindir/' -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-compress-dir > $(DESTDIR)$(bindir)/hwloc-compress-dir.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-compress-dir.tmp $(DESTDIR)$(bindir)/hwloc-compress-dir
- 	chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote $(DESTDIR)$(bindir)/hwloc-compress-dir
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/hwloc/hwloc.hash b/bsp/buildroot/package/hwloc/hwloc.hash
index 53563dd8..c523bc53 100644
--- a/bsp/buildroot/package/hwloc/hwloc.hash
+++ b/bsp/buildroot/package/hwloc/hwloc.hash
@@ -1,2 +1,5 @@
-# From http://www.open-mpi.org/software/hwloc/v1.10/
-sha1	76291124e4638b2fbd4deb4cc3cd680e153077b5	hwloc-1.10.1.tar.bz2
+# From https://www.open-mpi.org/software/hwloc/v1.11/
+md5 13d2e4dbce392cda41f1451d386d9a45  hwloc-1.11.7.tar.bz2
+sha1 7b78850b8504a93972a3f114a0e75f9b115607d9  hwloc-1.11.7.tar.bz2
+# Locally computed
+sha256 ab6910e248eed8c85d08b529917a6aae706b32b346e886ba830895e36a809729  hwloc-1.11.7.tar.bz2
diff --git a/bsp/buildroot/package/hwloc/hwloc.mk b/bsp/buildroot/package/hwloc/hwloc.mk
index 9b5eae8e..598a9c6e 100644
--- a/bsp/buildroot/package/hwloc/hwloc.mk
+++ b/bsp/buildroot/package/hwloc/hwloc.mk
@@ -4,15 +4,14 @@
 #
 ################################################################################
 
-HWLOC_VERSION_MAJOR = 1.10
-HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1
+HWLOC_VERSION_MAJOR = 1.11
+HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).7
 HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2
 HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads
-HWLOC_LICENSE = BSD-3c
+HWLOC_LICENSE = BSD-3-Clause
 HWLOC_LICENSE_FILES = COPYING
 HWLOC_DEPENDENCIES = host-pkgconf
-# 0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch touches Makefile.am
-HWLOC_AUTORECONF = YES
+HWLOC_INSTALL_STAGING = YES
 
 HWLOC_CONF_OPTS = \
 	--disable-opencl \
diff --git a/bsp/buildroot/package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch b/bsp/buildroot/package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch
new file mode 100644
index 00000000..09a78dae
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0001-lib-Module.mk-Add-missing-dependencies.patch
@@ -0,0 +1,34 @@
+From a6a59693066fd8da81f7107479df3e32a129247d Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Wed, 6 Dec 2017 09:55:04 +0100
+Subject: [PATCH] lib/Module.mk: Add missing dependencies
+
+The lib symlinks lacked a dependency to the actual library file, so
+parallel builds could run into a race and break.
+
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+---
+ lib/Module.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 432a051..fd2c8c4 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -42,11 +42,11 @@ endif
+ $(LIB_DIR)/$(LIB_SHLIBNAME): $(LIB_DIR)/smbus.o
+ 	$(CC) -shared $(LDFLAGS) -Wl,--version-script=$(LIB_DIR)/libi2c.map -Wl,-soname,$(LIB_SHSONAME) -o $@ $^ -lc
+ 
+-$(LIB_DIR)/$(LIB_SHSONAME):
++$(LIB_DIR)/$(LIB_SHSONAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
+ 	$(RM) $@
+ 	$(LN) $(LIB_SHLIBNAME) $@
+ 
+-$(LIB_DIR)/$(LIB_SHBASENAME):
++$(LIB_DIR)/$(LIB_SHBASENAME): $(LIB_DIR)/$(LIB_SHLIBNAME)
+ 	$(RM) $@
+ 	$(LN) $(LIB_SHLIBNAME) $@
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch b/bsp/buildroot/package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch
new file mode 100644
index 00000000..b5ec5471
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0002-Makefile-Add-flag-to-disable-dynamic-library.patch
@@ -0,0 +1,64 @@
+From 9906b2ecb6aec02d6348d6237b784135e6930d0b Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo@amarulasolutions.com>
+Date: Wed, 6 Dec 2017 10:12:07 +0100
+Subject: Makefile: Add flag to disable dynamic library
+
+In such cases where you need to disable entirely the dynamic
+library compilation, now you can use the BUILD_DYNAMIC_LIB=0
+flag.
+
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ Makefile      | 10 +++++++++-
+ lib/Module.mk |  6 +++++-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c85317c..1bb5572 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,12 +32,20 @@ CFLAGS		?= -O2
+ CFLAGS		+= -Wall
+ SOCFLAGS	:= -fpic -D_REENTRANT $(CFLAGS)
+ 
+-USE_STATIC_LIB ?= 0
++BUILD_DYNAMIC_LIB ?= 1
+ BUILD_STATIC_LIB ?= 1
++USE_STATIC_LIB ?= 0
++
+ ifeq ($(USE_STATIC_LIB),1)
+ BUILD_STATIC_LIB := 1
+ endif
+ 
++ifeq ($(BUILD_DYNAMIC_LIB),0)
++ifeq ($(BUILD_STATIC_LIB),0)
++$(error BUILD_DYNAMIC_LIB and BUILD_STATIC_LIB cannot be disabled at the same time)
++endif
++endif
++
+ KERNELVERSION	:= $(shell uname -r)
+ 
+ .PHONY: all strip clean install uninstall
+diff --git a/lib/Module.mk b/lib/Module.mk
+index fd2c8c4..44fa938 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -27,9 +27,13 @@ LIB_SHSONAME	:= $(LIB_SHBASENAME).$(LIB_MAINVER)
+ LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
+ LIB_STLIBNAME	:= libi2c.a
+ 
+-LIB_TARGETS	:= $(LIB_SHLIBNAME)
+ LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
+ LIB_OBJECTS	:= smbus.o
++
++LIB_TARGETS	:=
++ifeq ($(BUILD_DYNAMIC_LIB),1)
++LIB_TARGETS	+= $(LIB_SHLIBNAME)
++endif
+ ifeq ($(BUILD_STATIC_LIB),1)
+ LIB_TARGETS	+= $(LIB_STLIBNAME)
+ LIB_OBJECTS	+= smbus.ao
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch b/bsp/buildroot/package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch
new file mode 100644
index 00000000..43c915c2
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0003-lib-Module.mk-Drop-unused-variable-LIB_OBJECTS.patch
@@ -0,0 +1,33 @@
+From 1831b618fbedf0bcf15b0465981d133d9e3c53ee Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Wed, 6 Dec 2017 10:46:56 +0100
+Subject: lib/Module.mk: Drop unused variable LIB_OBJECTS
+
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+---
+ lib/Module.mk | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 44fa938..8a58f5b 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -28,7 +28,6 @@ LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
+ LIB_STLIBNAME	:= libi2c.a
+ 
+ LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
+-LIB_OBJECTS	:= smbus.o
+ 
+ LIB_TARGETS	:=
+ ifeq ($(BUILD_DYNAMIC_LIB),1)
+@@ -36,7 +35,6 @@ LIB_TARGETS	+= $(LIB_SHLIBNAME)
+ endif
+ ifeq ($(BUILD_STATIC_LIB),1)
+ LIB_TARGETS	+= $(LIB_STLIBNAME)
+-LIB_OBJECTS	+= smbus.ao
+ endif
+ 
+ #
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch b/bsp/buildroot/package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch
new file mode 100644
index 00000000..d18090be
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0004-tools-Module.mk-Add-missing-dependencies.patch
@@ -0,0 +1,67 @@
+From 08b0d67ba7eceb862cb17f52eb1911e9579726ea Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Thu, 14 Dec 2017 08:52:26 +0100
+Subject: [PATCH] tools/Module.mk: Add missing dependencies
+
+Better build the library before building the tools which link against
+it, otherwise parallel builds could run into a race and break.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Tested-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Acked-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+---
+ lib/Module.mk   |  7 +++++++
+ tools/Module.mk | 10 +++++-----
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 8a58f5b..67afe91 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -37,6 +37,13 @@ ifeq ($(BUILD_STATIC_LIB),1)
+ LIB_TARGETS	+= $(LIB_STLIBNAME)
+ endif
+ 
++# Library file to link against (static or dynamic)
++ifeq ($(USE_STATIC_LIB),1)
++LIB_DEPS	:= $(LIB_DIR)/$(LIB_STLIBNAME)
++else
++LIB_DEPS	:= $(LIB_DIR)/$(LIB_SHBASENAME)
++endif
++
+ #
+ # Libraries
+ #
+diff --git a/tools/Module.mk b/tools/Module.mk
+index 6421a23..609de7a 100644
+--- a/tools/Module.mk
++++ b/tools/Module.mk
+@@ -24,19 +24,19 @@ TOOLS_TARGETS	:= i2cdetect i2cdump i2cset i2cget i2ctransfer
+ # Programs
+ #
+ 
+-$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o
++$(TOOLS_DIR)/i2cdetect: $(TOOLS_DIR)/i2cdetect.o $(TOOLS_DIR)/i2cbusses.o $(LIB_DEPS)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+ 
+-$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2cdump: $(TOOLS_DIR)/i2cdump.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+ 
+-$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2cset: $(TOOLS_DIR)/i2cset.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+ 
+-$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2cget: $(TOOLS_DIR)/i2cget.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+ 
+-$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o
++$(TOOLS_DIR)/i2ctransfer: $(TOOLS_DIR)/i2ctransfer.o $(TOOLS_DIR)/i2cbusses.o $(TOOLS_DIR)/util.o $(LIB_DEPS)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(TOOLS_LDFLAGS)
+ 
+ #
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch b/bsp/buildroot/package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch
new file mode 100644
index 00000000..37a8ebc6
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0005-lib-Module.mk-Fix-LIB_LINKS-dependency.patch
@@ -0,0 +1,34 @@
+From de278d0933e3caea2508f95fd00e7e338bc12e8f Mon Sep 17 00:00:00 2001
+From: Angelo Compagnucci <angelo@amarulasolutions.com>
+Date: Thu, 14 Dec 2017 13:34:29 +0100
+Subject: lib/Module.mk: Fix LIB_LINKS dependency
+
+LIB_LINKS should be added as a dependency only when
+BUILD_DYNAMIC_LIB is enabled.
+
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Fixes: 9906b2ecb6ae ("Makefile: Add flag to disable dynamic library"
+---
+ lib/Module.mk | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 67afe91..2ebc70d 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -27,10 +27,9 @@ LIB_SHSONAME	:= $(LIB_SHBASENAME).$(LIB_MAINVER)
+ LIB_SHLIBNAME	:= $(LIB_SHBASENAME).$(LIB_VER)
+ LIB_STLIBNAME	:= libi2c.a
+ 
+-LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
+-
+ LIB_TARGETS	:=
+ ifeq ($(BUILD_DYNAMIC_LIB),1)
++LIB_LINKS	:= $(LIB_SHSONAME) $(LIB_SHBASENAME)
+ LIB_TARGETS	+= $(LIB_SHLIBNAME)
+ endif
+ ifeq ($(BUILD_STATIC_LIB),1)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch b/bsp/buildroot/package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch
new file mode 100644
index 00000000..85438cbf
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0006-Makefile-Allow-to-really-disable-the-dynamic-library.patch
@@ -0,0 +1,33 @@
+From 57d2c370493f2e9e33b30e8767624c648f138ec4 Mon Sep 17 00:00:00 2001
+From: Jean Delvare <jdelvare@suse.de>
+Date: Thu, 14 Dec 2017 13:34:34 +0100
+Subject: Makefile: Allow to really disable the dynamic library
+
+If the user disables the build of the dynamic library, we have to
+link the tools with the static library. If we don't, the dependencies
+will cause the dynamic library to be built regardless of the user's
+request.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Fixes: 9906b2ecb6ae ("Makefile: Add flag to disable dynamic library")
+Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 1bb5572..6bb741f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -43,6 +43,8 @@ endif
+ ifeq ($(BUILD_DYNAMIC_LIB),0)
+ ifeq ($(BUILD_STATIC_LIB),0)
+ $(error BUILD_DYNAMIC_LIB and BUILD_STATIC_LIB cannot be disabled at the same time)
++else
++USE_STATIC_LIB := 1
+ endif
+ endif
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch b/bsp/buildroot/package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch
new file mode 100644
index 00000000..126d3885
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0007-eeprog-Module.mk-Add-missing-dependency.patch
@@ -0,0 +1,30 @@
+From f87c97317012a3b96b67237925893b8ffd5f4f50 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.john@gmail.com>
+Date: Tue, 19 Dec 2017 13:46:15 +0100
+Subject: [PATCH] eeprog/Module.mk: Add missing dependency
+
+Absence of this dependency caused parallel build to run into a race
+and break.
+
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ eeprog/Module.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/eeprog/Module.mk b/eeprog/Module.mk
+index 9d36869..d215855 100644
+--- a/eeprog/Module.mk
++++ b/eeprog/Module.mk
+@@ -20,7 +20,7 @@ EEPROG_TARGETS	:= eeprog
+ # Programs
+ #
+ 
+-$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o
++$(EEPROG_DIR)/eeprog: $(EEPROG_DIR)/eeprog.o $(EEPROG_DIR)/24cXX.o $(LIB_DEPS)
+ 	$(CC) $(LDFLAGS) -o $@ $^ $(EEPROG_LDFLAGS)
+ 
+ #
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch b/bsp/buildroot/package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch
new file mode 100644
index 00000000..69410ce5
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/0008-lib-Module.mk-don-t-install-dynamic-library-when-dis.patch
@@ -0,0 +1,41 @@
+From ae2e0c9708aeb4a8fb301a1a4016cec7b05fc142 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 2 Jan 2018 06:55:41 +0200
+Subject: [PATCH] lib/Module.mk: don't install dynamic library when disabled
+
+Do not attempt to install the dynamic library when build of that library
+is disabled. Fixes the following installation error:
+
+install -m 755 lib/libi2c.so.0.1.0 .../target/usr/lib
+install: cannot stat 'lib/libi2c.so.0.1.0': No such file or directory
+lib/Module.mk:90: recipe for target 'install-lib' failed
+
+Cc: Angelo Compagnucci <angelo@amarulasolutions.com>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+Patch status: posted upstream
+https://marc.info/?l=linux-i2c&m=151486925730634&w=2
+
+ lib/Module.mk | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/Module.mk b/lib/Module.mk
+index 2ebc70d76ed9..c492961e0a4a 100644
+--- a/lib/Module.mk
++++ b/lib/Module.mk
+@@ -88,9 +88,11 @@ clean-lib:
+ 
+ install-lib: $(addprefix $(LIB_DIR)/,$(LIB_TARGETS))
+ 	$(INSTALL_DIR) $(DESTDIR)$(libdir)
++ifeq ($(BUILD_DYNAMIC_LIB),1)
+ 	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHLIBNAME) $(DESTDIR)$(libdir)
+ 	$(LN) $(LIB_SHLIBNAME) $(DESTDIR)$(libdir)/$(LIB_SHSONAME)
+ 	$(LN) $(LIB_SHSONAME) $(DESTDIR)$(libdir)/$(LIB_SHBASENAME)
++endif
+ ifeq ($(BUILD_STATIC_LIB),1)
+ 	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STLIBNAME) $(DESTDIR)$(libdir)
+ endif
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/i2c-tools/Config.in b/bsp/buildroot/package/i2c-tools/Config.in
index b82c7dcd..d9b8dd9a 100644
--- a/bsp/buildroot/package/i2c-tools/Config.in
+++ b/bsp/buildroot/package/i2c-tools/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_I2C_TOOLS
 	help
 	  Heterogeneous set of I2C tools for Linux
 
-	  This package contains a heterogeneous set of I2C tools for Linux:
-	  a bus probing tool, a chip dumper, register-level access helpers,
-	  EEPROM decoding scripts, and more.
+	  This package contains a heterogeneous set of I2C tools for
+	  Linux: a bus probing tool, a chip dumper, register-level
+	  access helpers, EEPROM decoding scripts, and more.
 
-	  http://www.lm-sensors.org/wiki/I2CTools
+	  https://i2c.wiki.kernel.org/index.php/I2C_Tools
diff --git a/bsp/buildroot/package/i2c-tools/i2c-tools.hash b/bsp/buildroot/package/i2c-tools/i2c-tools.hash
new file mode 100644
index 00000000..3475d206
--- /dev/null
+++ b/bsp/buildroot/package/i2c-tools/i2c-tools.hash
@@ -0,0 +1,5 @@
+# Locally computed
+sha256 d900ca1c11c51ea20caa50b096f948008b8a7ad832311b23353e21baa7af28d6  i2c-tools-4.0.tar.xz
+
+# License file
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/bsp/buildroot/package/i2c-tools/i2c-tools.mk b/bsp/buildroot/package/i2c-tools/i2c-tools.mk
index e16b940c..9ddaa727 100644
--- a/bsp/buildroot/package/i2c-tools/i2c-tools.mk
+++ b/bsp/buildroot/package/i2c-tools/i2c-tools.mk
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-I2C_TOOLS_VERSION = v3.1.2
-I2C_TOOLS_SITE = git://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git
-I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus)
+I2C_TOOLS_VERSION = 4.0
+I2C_TOOLS_SOURCE = i2c-tools-$(I2C_TOOLS_VERSION).tar.xz
+I2C_TOOLS_SITE = https://www.kernel.org/pub/software/utils/i2c-tools
+I2C_TOOLS_LICENSE = GPL-2.0+, GPL-2.0 (py-smbus)
 I2C_TOOLS_LICENSE_FILES = COPYING
+I2C_TOOLS_MAKE_OPTS = EXTRA=eeprog
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 I2C_TOOLS_DEPENDENCIES += python
@@ -21,6 +23,14 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 I2C_TOOLS_DEPENDENCIES += busybox
 endif
 
+ifeq ($(BR2_STATIC_LIBS),y)
+I2C_TOOLS_MAKE_OPTS += BUILD_DYNAMIC_LIB=0 USE_STATIC_LIB=1
+endif
+
+ifeq ($(BR2_SHARED_LIBS),y)
+I2C_TOOLS_MAKE_OPTS += BUILD_STATIC_LIB=0
+endif
+
 # Build/install steps mirror the distutil python package type in the python package
 # infrastructure
 ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
@@ -30,31 +40,29 @@ I2C_TOOLS_PYTHON_BASE_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -I../include"
 
 define I2C_TOOLS_BUILD_PYSMBUS
-	(cd $(@D)/py-smbus;  \
+	(cd $(@D)/py-smbus; \
 	$(I2C_TOOLS_PYTHON_BASE_ENV) \
-		$(HOST_DIR)/usr/bin/python setup.py build \
+		$(HOST_DIR)/bin/python setup.py build \
 		$(PKG_PYTHON_DISTUTILS_BUILD_OPTS))
 endef
 
 define I2C_TOOLS_INSTALL_PYSMBUS
 	(cd $(@D)/py-smbus; \
 	$(I2C_TOOLS_PYTHON_BASE_ENV) \
-		$(HOST_DIR)/usr/bin/python setup.py install \
+		$(HOST_DIR)/bin/python setup.py install \
 		$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS))
 endef
 
 endif # BR2_PACKAGE_PYTHON
 
 define I2C_TOOLS_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) -C $(@D)
 	$(I2C_TOOLS_BUILD_PYSMBUS)
 endef
 
 define I2C_TOOLS_INSTALL_TARGET_CMDS
-	for i in i2cdump i2cget i2cset i2cdetect; \
-	do \
-		$(INSTALL) -m 755 -D $(@D)/tools/$$i $(TARGET_DIR)/usr/sbin/$$i; \
-	done
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) $(I2C_TOOLS_MAKE_OPTS) \
+		DESTDIR="$(TARGET_DIR)" prefix=/usr -C $(@D) install
 	$(I2C_TOOLS_INSTALL_PYSMBUS)
 endef
 
diff --git a/bsp/buildroot/package/i7z/i7z.mk b/bsp/buildroot/package/i7z/i7z.mk
index e21fd9fb..9c2c6739 100644
--- a/bsp/buildroot/package/i7z/i7z.mk
+++ b/bsp/buildroot/package/i7z/i7z.mk
@@ -6,7 +6,7 @@
 
 I7Z_VERSION = 5023138d7c35c4667c938b853e5ea89737334e92
 I7Z_SITE = $(call github,ajaiantilal,i7z,$(I7Z_VERSION))
-I7Z_LICENSE = GPLv2
+I7Z_LICENSE = GPL-2.0
 I7Z_LICENSE_FILES = COPYING
 I7Z_DEPENDENCIES = ncurses
 
diff --git a/bsp/buildroot/package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch b/bsp/buildroot/package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch
deleted file mode 100644
index a4e51aef..00000000
--- a/bsp/buildroot/package/icu/0006-utext-problems-with-handling-of-bad-utf8.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-ticket:12888 UText, problems with handling of bad UTF-8
-
-Fixes:
-
-CVE-2017-7867 - International Components for Unicode (ICU) for C/C++ before
-2017-02-13 has an out-of-bounds write caused by a heap-based buffer overflow
-related to the utf8TextAccess function in common/utext.cpp and the
-utext_setNativeIndex* function.
-
-CVE-2017-7868 - International Components for Unicode (ICU) for C/C++ before
-2017-02-13 has an out-of-bounds write caused by a heap-based buffer overflow
-related to the utf8TextAccess function in common/utext.cpp and the
-utext_moveIndex32* function.
-
-Upstream: http://bugs.icu-project.org/trac/changeset/39671
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-
-Index: /trunk/icu4c/source/common/utext.cpp
-===================================================================
---- icu4c/source/common/utext.cpp	(revision 39670)
-+++ icu4c/source/common/utext.cpp	(revision 39671)
-@@ -848,7 +848,13 @@
- 
- // Chunk size.
--//     Must be less than 85, because of byte mapping from UChar indexes to native indexes.
--//     Worst case is three native bytes to one UChar.  (Supplemenaries are 4 native bytes
--//     to two UChars.)
-+//     Must be less than 42  (256/6), because of byte mapping from UChar indexes to native indexes.
-+//     Worst case there are six UTF-8 bytes per UChar.
-+//         obsolete 6 byte form fd + 5 trails maps to fffd
-+//         obsolete 5 byte form fc + 4 trails maps to fffd
-+//         non-shortest 4 byte forms maps to fffd
-+//         normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit
-+//     mapToUChars array size must allow for the worst case, 6.
-+//     This could be brought down to 4, by treating fd and fc as pure illegal,
-+//     rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros.
- //
- enum { UTF8_TEXT_CHUNK_SIZE=32 };
-@@ -890,5 +896,5 @@
-                                                      //    one for a supplementary starting in the last normal position,
-                                                      //    and one for an entry for the buffer limit position.
--    uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to
-+    uint8_t   mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to
-                                                      //   correspoding offset in filled part of buf.
-     int32_t   align;
-@@ -1033,4 +1039,5 @@
-             u8b = (UTF8Buf *)ut->p;   // the current buffer
-             mapIndex = ix - u8b->toUCharsMapStart;
-+            U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));
-             ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
-             return TRUE;
-@@ -1299,4 +1306,8 @@
-         //   If index is at the end, there is no character there to look at.
-         if (ix != ut->b) {
-+            // Note: this function will only move the index back if it is on a trail byte
-+            //       and there is a preceding lead byte and the sequence from the lead 
-+            //       through this trail could be part of a valid UTF-8 sequence
-+            //       Otherwise the index remains unchanged.
-             U8_SET_CP_START(s8, 0, ix);
-         }
-@@ -1312,5 +1323,8 @@
-         uint8_t *mapToNative = u8b->mapToNative;
-         uint8_t *mapToUChars = u8b->mapToUChars;
--        int32_t  toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1);
-+        int32_t  toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1;
-+        // Note that toUCharsMapStart can be negative. Happens when the remaining
-+        // text from current position to the beginning is less than the buffer size.
-+        // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry.
-         int32_t  destIx = UTF8_TEXT_CHUNK_SIZE+2;   // Start in the overflow region
-                                                     //   at end of buffer to leave room
-@@ -1339,4 +1353,5 @@
-                 // Special case ASCII range for speed.
-                 buf[destIx] = (UChar)c;
-+                U_ASSERT(toUCharsMapStart <= srcIx);
-                 mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx;
-                 mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart);
-@@ -1368,4 +1383,5 @@
-                     mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx;
-                 } while (sIx >= srcIx);
-+                U_ASSERT(toUCharsMapStart <= (srcIx+1));
- 
-                 // Set native indexing limit to be the current position.
-@@ -1542,4 +1558,5 @@
-     U_ASSERT(index<=ut->chunkNativeLimit);
-     int32_t mapIndex = index - u8b->toUCharsMapStart;
-+    U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));
-     int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
-     U_ASSERT(offset>=0 && offset<=ut->chunkLength);
-Index: /trunk/icu4c/source/test/intltest/utxttest.cpp
-===================================================================
---- icu4c/source/test/intltest/utxttest.cpp	(revision 39670)
-+++ icu4c/source/test/intltest/utxttest.cpp	(revision 39671)
-@@ -68,4 +68,6 @@
-         case 7: name = "Ticket12130";
-             if (exec) Ticket12130(); break;
-+        case 8: name = "Ticket12888";
-+            if (exec) Ticket12888(); break;
-         default: name = "";          break;
-     }
-@@ -1584,2 +1586,62 @@
-     utext_close(&ut);
- }
-+
-+// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal,
-+//               six byte utf-8 forms. Original implementation had an assumption that
-+//               there would be at most three utf-8 bytes per UTF-16 code unit.
-+//               The five and six byte sequences map to a single replacement character.
-+
-+void UTextTest::Ticket12888() {
-+    const char *badString = 
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+            "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80";
-+
-+    UErrorCode status = U_ZERO_ERROR;
-+    LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status));
-+    TEST_SUCCESS(status);
-+    for (;;) {
-+        UChar32 c = utext_next32(ut.getAlias());
-+        if (c == U_SENTINEL) {
-+            break;
-+        }
-+    }
-+    int32_t endIdx = utext_getNativeIndex(ut.getAlias());
-+    if (endIdx != (int32_t)strlen(badString)) {
-+        errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx);
-+        return;
-+    }
-+
-+    for (int32_t prevIndex = endIdx; prevIndex>0;) {
-+        UChar32 c = utext_previous32(ut.getAlias());
-+        int32_t currentIndex = utext_getNativeIndex(ut.getAlias());
-+        if (c != 0xfffd) {
-+            errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n",
-+                    __FILE__, __LINE__, 0xfffd, c, currentIndex);
-+            break;
-+        }
-+        if (currentIndex != prevIndex - 6) {
-+            errln("%s:%d: wrong index. Expected, actual = %d, %d",
-+                    __FILE__, __LINE__, prevIndex - 6, currentIndex);
-+            break;
-+        }
-+        prevIndex = currentIndex;
-+    }
-+}
-Index: /trunk/icu4c/source/test/intltest/utxttest.h
-===================================================================
---- icu4c/source/test/intltest/utxttest.h	(revision 39670)
-+++ icu4c/source/test/intltest/utxttest.h	(revision 39671)
-@@ -39,4 +39,5 @@
-     void Ticket10983();
-     void Ticket12130();
-+    void Ticket12888();
- 
- private:
diff --git a/bsp/buildroot/package/icu/Config.in b/bsp/buildroot/package/icu/Config.in
index d31c1fa3..fde486b6 100644
--- a/bsp/buildroot/package/icu/Config.in
+++ b/bsp/buildroot/package/icu/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_ICU
 	bool "icu"
+	depends on BR2_HOST_GCC_AT_LEAST_4_8
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# icu does some funky things by generating by itself an ELF
 	# file, and it cannot easily be changed to generate FLAT
@@ -25,7 +27,9 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH
 
 endif
 
-comment "icu needs a toolchain w/ C++, wchar, threads"
+comment "icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.8, host gcc >= 4.8"
 	depends on !BR2_BINFMT_FLAT
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
diff --git a/bsp/buildroot/package/icu/icu.hash b/bsp/buildroot/package/icu/icu.hash
index d578bfbf..8b54e224 100644
--- a/bsp/buildroot/package/icu/icu.hash
+++ b/bsp/buildroot/package/icu/icu.hash
@@ -1,4 +1,3 @@
-# From https://ssl.icu-project.org/files/icu4c/57.1/icu4c-src-58_2.md5
-md5	fac212b32b7ec7ab007a12dff1f3aea1	icu4c-58_2-src.tgz
-# Calculated based on the hash above
-sha256	2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c	icu4c-58_2-src.tgz
+# From http://download.icu-project.org/files/icu4c/60.1/SHASUM512.txt
+sha512 a6798f70add1b3bac2197a49e09a0bb636279af7019ce572f63a30ab713e09657ee9d9b20aac7ea806fbb84667ca2eca981411e5053b47c3c705aa496a669233  icu4c-60_1-src.tgz
+sha256 24c771ce37201a3ab604852e47d10d21595d0493269dd6c8a5e567e998e18c00  LICENSE
diff --git a/bsp/buildroot/package/icu/icu.mk b/bsp/buildroot/package/icu/icu.mk
index a435e471..6ac4a253 100644
--- a/bsp/buildroot/package/icu/icu.mk
+++ b/bsp/buildroot/package/icu/icu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ICU_VERSION = 58.2
+ICU_VERSION = 60.1
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_LICENSE = ICU License
diff --git a/bsp/buildroot/package/ifenslave/ifenslave.mk b/bsp/buildroot/package/ifenslave/ifenslave.mk
index 1b823123..4030d22e 100644
--- a/bsp/buildroot/package/ifenslave/ifenslave.mk
+++ b/bsp/buildroot/package/ifenslave/ifenslave.mk
@@ -7,7 +7,7 @@
 IFENSLAVE_VERSION = 2.9
 IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz
 IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave
-IFENSLAVE_LICENSE = GPLv3+
+IFENSLAVE_LICENSE = GPL-3.0+
 IFENSLAVE_LICENSE_FILES = debian/copyright
 IFENSLAVE_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 
diff --git a/bsp/buildroot/package/ifplugd/ifplugd.mk b/bsp/buildroot/package/ifplugd/ifplugd.mk
index 9f0feba3..b5693209 100644
--- a/bsp/buildroot/package/ifplugd/ifplugd.mk
+++ b/bsp/buildroot/package/ifplugd/ifplugd.mk
@@ -6,7 +6,7 @@
 
 IFPLUGD_VERSION = 0.28
 IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd
-IFPLUGD_LICENSE = GPLv2
+IFPLUGD_LICENSE = GPL-2.0
 IFPLUGD_LICENSE_FILES = LICENSE
 IFPLUGD_AUTORECONF = YES
 
diff --git a/bsp/buildroot/package/iftop/Config.in b/bsp/buildroot/package/iftop/Config.in
index 8c6ae0ca..514101ca 100644
--- a/bsp/buildroot/package/iftop/Config.in
+++ b/bsp/buildroot/package/iftop/Config.in
@@ -1,13 +1,14 @@
 config BR2_PACKAGE_IFTOP
 	bool "iftop"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBPCAP
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  iftop does for network usage what top(1) does for CPU usage.
-	  It listens to network traffic on a named interface and displays
-	  a table of current bandwidth usage by pairs of hosts. Handy for
-	  answering the question "why is our ADSL link so slow?".
+	  It listens to network traffic on a named interface and
+	  displays a table of current bandwidth usage by pairs of hosts.
+	  Handy for answering the question "why is our ADSL link so
+	  slow?".
 
 	  http://www.ex-parrot.com/pdw/iftop/
 
diff --git a/bsp/buildroot/package/iftop/iftop.mk b/bsp/buildroot/package/iftop/iftop.mk
index 042f2b28..664c725f 100644
--- a/bsp/buildroot/package/iftop/iftop.mk
+++ b/bsp/buildroot/package/iftop/iftop.mk
@@ -7,7 +7,7 @@
 IFTOP_VERSION = 1.0pre4
 IFTOP_SITE = http://www.ex-parrot.com/pdw/iftop/download
 IFTOP_DEPENDENCIES = ncurses libpcap
-IFTOP_LICENSE = GPLv2+
+IFTOP_LICENSE = GPL-2.0+
 IFTOP_LICENSE_FILES = COPYING
 
 IFTOP_LIBS = -lpcap
diff --git a/bsp/buildroot/package/ifupdown-scripts/Config.in b/bsp/buildroot/package/ifupdown-scripts/Config.in
new file mode 100644
index 00000000..2f4b0d54
--- /dev/null
+++ b/bsp/buildroot/package/ifupdown-scripts/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_IFUPDOWN_SCRIPTS
+	bool "ifupdown scripts"
+	default y if BR2_ROOTFS_SKELETON_DEFAULT
+	depends on !BR2_PACKAGE_SYSTEMD_NETWORKD
+	help
+	  Set of scripts used by ifupdown (either the standalone one,
+	  or the busybox one) to bring network up, or tear it down.
diff --git a/bsp/buildroot/package/initscripts/init.d/S40network b/bsp/buildroot/package/ifupdown-scripts/S40network
similarity index 100%
rename from bsp/buildroot/package/initscripts/init.d/S40network
rename to bsp/buildroot/package/ifupdown-scripts/S40network
diff --git a/bsp/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk b/bsp/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk
new file mode 100644
index 00000000..ebc89b38
--- /dev/null
+++ b/bsp/buildroot/package/ifupdown-scripts/ifupdown-scripts.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# ifupdown-scripts
+#
+################################################################################
+
+define IFUPDOWN_SCRIPTS_LOCALHOST
+	( \
+		echo "# interface file auto-generated by buildroot"; \
+		echo ; \
+		echo "auto lo"; \
+		echo "iface lo inet loopback"; \
+	) > $(TARGET_DIR)/etc/network/interfaces
+endef
+
+IFUPDOWN_SCRIPTS_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
+
+ifneq ($(IFUPDOWN_SCRIPTS_DHCP_IFACE),)
+define IFUPDOWN_SCRIPTS_DHCP
+	( \
+		echo ; \
+		echo "auto $(IFUPDOWN_SCRIPTS_DHCP_IFACE)"; \
+		echo "iface $(IFUPDOWN_SCRIPTS_DHCP_IFACE) inet dhcp"; \
+		echo "  pre-up /etc/network/nfs_check"; \
+		echo "  wait-delay 15"; \
+	) >> $(TARGET_DIR)/etc/network/interfaces
+	$(INSTALL) -m 0755 -D $(IFUPDOWN_SCRIPTS_PKGDIR)/nfs_check \
+		$(TARGET_DIR)/etc/network/nfs_check
+endef
+endif
+
+define IFUPDOWN_SCRIPTS_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/etc/network
+	$(call SYSTEM_RSYNC,$(IFUPDOWN_SCRIPTS_PKGDIR)/network,$(TARGET_DIR)/etc/network)
+	$(IFUPDOWN_SCRIPTS_LOCALHOST)
+	$(IFUPDOWN_SCRIPTS_DHCP)
+endef
+
+define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 $(IFUPDOWN_SCRIPTS_PKGDIR)/S40network \
+		$(TARGET_DIR)/etc/init.d/S40network
+endef
+
+# ifupdown-scripts can not be selected when systemd-networkd is
+# enabled, so if we are enabled with systemd, we must install our
+# own service file.
+define IFUPDOWN_SCRIPTS_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 $(IFUPDOWN_SCRIPTS_PKGDIR)/network.service \
+		$(TARGET_DIR)/etc/systemd/system/network.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../network.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/systemd/network.service b/bsp/buildroot/package/ifupdown-scripts/network.service
similarity index 100%
rename from bsp/buildroot/package/systemd/network.service
rename to bsp/buildroot/package/ifupdown-scripts/network.service
diff --git a/bsp/buildroot/system/skeleton/dev/pts/.empty b/bsp/buildroot/package/ifupdown-scripts/network/if-down.d/.empty
similarity index 100%
rename from bsp/buildroot/system/skeleton/dev/pts/.empty
rename to bsp/buildroot/package/ifupdown-scripts/network/if-down.d/.empty
diff --git a/bsp/buildroot/system/skeleton/dev/shm/.empty b/bsp/buildroot/package/ifupdown-scripts/network/if-post-down.d/.empty
similarity index 100%
rename from bsp/buildroot/system/skeleton/dev/shm/.empty
rename to bsp/buildroot/package/ifupdown-scripts/network/if-post-down.d/.empty
diff --git a/bsp/buildroot/system/skeleton/etc/network/if-pre-up.d/wait_iface b/bsp/buildroot/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
similarity index 100%
rename from bsp/buildroot/system/skeleton/etc/network/if-pre-up.d/wait_iface
rename to bsp/buildroot/package/ifupdown-scripts/network/if-pre-up.d/wait_iface
diff --git a/bsp/buildroot/system/skeleton/etc/network/if-down.d/.empty b/bsp/buildroot/package/ifupdown-scripts/network/if-up.d/.empty
similarity index 100%
rename from bsp/buildroot/system/skeleton/etc/network/if-down.d/.empty
rename to bsp/buildroot/package/ifupdown-scripts/network/if-up.d/.empty
diff --git a/bsp/buildroot/package/skeleton/nfs_check b/bsp/buildroot/package/ifupdown-scripts/nfs_check
similarity index 100%
rename from bsp/buildroot/package/skeleton/nfs_check
rename to bsp/buildroot/package/ifupdown-scripts/nfs_check
diff --git a/bsp/buildroot/package/ifupdown/Config.in b/bsp/buildroot/package/ifupdown/Config.in
index e6832017..97d02b4c 100644
--- a/bsp/buildroot/package/ifupdown/Config.in
+++ b/bsp/buildroot/package/ifupdown/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_IFUPDOWN
 	bool "ifupdown"
 	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # iproute2
-	# Default/our uclibc lacks wordexp()
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	# runtime for ip binary
 	select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX
@@ -14,8 +12,7 @@ config BR2_PACKAGE_IFUPDOWN
 
 	  https://tracker.debian.org/pkg/ifupdown
 
-comment "ifupdown needs a glibc or musl toolchain w/ headers >= 3.0"
+comment "ifupdown needs a toolchain w/ headers >= 3.4"
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_USES_UCLIBC || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/bsp/buildroot/package/ifupdown/ifupdown.mk b/bsp/buildroot/package/ifupdown/ifupdown.mk
index ad0e513f..dfc3f3cc 100644
--- a/bsp/buildroot/package/ifupdown/ifupdown.mk
+++ b/bsp/buildroot/package/ifupdown/ifupdown.mk
@@ -8,7 +8,7 @@ IFUPDOWN_VERSION = 0.8.16
 IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz
 IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown
 IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-IFUPDOWN_LICENSE = GPLv2+
+IFUPDOWN_LICENSE = GPL-2.0+
 IFUPDOWN_LICENSE_FILES = COPYING
 
 define IFUPDOWN_BUILD_CMDS
diff --git a/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.hash b/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.hash
index f1c9a7bd..04253995 100644
--- a/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.hash
+++ b/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	523545a26b0d662e9f6913bec2518df6e70f4d497935d88983d994336a1b0ea9	igd2-for-linux-v1.2.tar.gz
+sha256	204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994	linuxigd2/doc/LICENSE
diff --git a/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.mk b/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.mk
index 8944c052..68b64f1d 100644
--- a/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.mk
+++ b/bsp/buildroot/package/igd2-for-linux/igd2-for-linux.mk
@@ -7,7 +7,7 @@
 IGD2_FOR_LINUX_VERSION = v1.2
 IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,$(IGD2_FOR_LINUX_VERSION))
 
-IGD2_FOR_LINUX_LICENSE = GPLv2
+IGD2_FOR_LINUX_LICENSE = GPL-2.0
 IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE
 
 IGD2_FOR_LINUX_DEPENDENCIES = libupnp
diff --git a/bsp/buildroot/package/igh-ethercat/igh-ethercat.mk b/bsp/buildroot/package/igh-ethercat/igh-ethercat.mk
index 32c49a3c..b9771e8f 100644
--- a/bsp/buildroot/package/igh-ethercat/igh-ethercat.mk
+++ b/bsp/buildroot/package/igh-ethercat/igh-ethercat.mk
@@ -7,7 +7,7 @@
 IGH_ETHERCAT_VERSION = 1.5.2
 IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat
 IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2
-IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries)
+IGH_ETHERCAT_LICENSE = GPL-2.0 (IgH EtherCAT master), LGPL-2.1 (libraries)
 IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER
 
 IGH_ETHERCAT_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/igmpproxy/igmpproxy.hash b/bsp/buildroot/package/igmpproxy/igmpproxy.hash
index 98dc242f..313af52f 100644
--- a/bsp/buildroot/package/igmpproxy/igmpproxy.hash
+++ b/bsp/buildroot/package/igmpproxy/igmpproxy.hash
@@ -1,2 +1,5 @@
 # Locally computed:
-sha256  2be2171cf273678810283937f7752dc9b8402456d0a03ee55f06ca52fadf075f  igmpproxy-a731683d1a65956fa05024b0597b105fe6a3a122.tar.gz
+sha256 e60331031f85d1fb834c5272a134f32d32e7834718da19ba3f787dff68389a31  igmpproxy-f47644d8fa7266a784f3ec7b251e7d318bc2f0a9.tar.gz
+sha256 be3d05af93dbbc4650f8d641d8e1bec220af4a729e07ba71e949c25b93a1b4f6  COPYING
+sha256 c4f65d5d396ad518a37d30b83fe33897661858dc174ff64a15d0461630ce64e4  GPL.txt
+sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1  Stanford.txt
diff --git a/bsp/buildroot/package/igmpproxy/igmpproxy.mk b/bsp/buildroot/package/igmpproxy/igmpproxy.mk
index 98168721..9c19f76f 100644
--- a/bsp/buildroot/package/igmpproxy/igmpproxy.mk
+++ b/bsp/buildroot/package/igmpproxy/igmpproxy.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-IGMPPROXY_VERSION = a731683d1a65956fa05024b0597b105fe6a3a122
+IGMPPROXY_VERSION = f47644d8fa7266a784f3ec7b251e7d318bc2f0a9
 IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION))
 IGMPPROXY_AUTORECONF = YES
-IGMPPROXY_LICENSE = GPLv2+
-IGMPPROXY_LICENSE_FILES = COPYING
+IGMPPROXY_LICENSE = GPL-2.0+, BSD-3-Clause (mrouted)
+IGMPPROXY_LICENSE_FILES = COPYING GPL.txt Stanford.txt
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/imagemagick/Config.in b/bsp/buildroot/package/imagemagick/Config.in
index 0bd4df2a..4bd81dbd 100644
--- a/bsp/buildroot/package/imagemagick/Config.in
+++ b/bsp/buildroot/package/imagemagick/Config.in
@@ -3,12 +3,13 @@ config BR2_PACKAGE_IMAGEMAGICK
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  ImageMagick(R) is a software suite to create, edit, and compose
-	  bitmap images. It can read, convert and write images in a variety of
-	  formats (about 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF,
-	  PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to
-	  translate, flip, mirror, rotate, scale, shear and transform images,
-	  adjust image colors, apply various special effects, or draw text,
+	  ImageMagick(R) is a software suite to create, edit, and
+	  compose bitmap images. It can read, convert and write images
+	  in a variety of formats (about 100) including DPX, EXR, GIF,
+	  JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF.
+	  Use ImageMagick to translate, flip, mirror, rotate, scale,
+	  shear and transform images, adjust image colors, apply various
+	  special effects, or draw text,
 	  lines, polygons, ellipses and Bézier curves.
 
 	  http://www.imagemagick.org/
diff --git a/bsp/buildroot/package/imagemagick/imagemagick.hash b/bsp/buildroot/package/imagemagick/imagemagick.hash
index 170231c4..9d5a3956 100644
--- a/bsp/buildroot/package/imagemagick/imagemagick.hash
+++ b/bsp/buildroot/package/imagemagick/imagemagick.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 723a28f9cbc5c6130f496065fc01c839083e97bf3e4930f940a03c0155046170  7.0.7-27.tar.gz
+sha256 e7c1b19923bb97ed456c78b63b3259b809ebc8e3967c6d086450370c67eedf06  7.0.7-39.tar.gz
 sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c  LICENSE
diff --git a/bsp/buildroot/package/imagemagick/imagemagick.mk b/bsp/buildroot/package/imagemagick/imagemagick.mk
index 11654388..b75d6537 100644
--- a/bsp/buildroot/package/imagemagick/imagemagick.mk
+++ b/bsp/buildroot/package/imagemagick/imagemagick.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IMAGEMAGICK_VERSION = 7.0.7-27
+IMAGEMAGICK_VERSION = 7.0.7-39
 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz
 IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive
 IMAGEMAGICK_LICENSE = Apache-2.0
diff --git a/bsp/buildroot/package/imlib2/Config.in b/bsp/buildroot/package/imlib2/Config.in
index 7aac0743..c47178f1 100644
--- a/bsp/buildroot/package/imlib2/Config.in
+++ b/bsp/buildroot/package/imlib2/Config.in
@@ -3,8 +3,8 @@ comment "imlib2 needs a toolchain w/ dynamic library"
 
 config BR2_PACKAGE_IMLIB2
 	bool "imlib2"
-	select BR2_PACKAGE_FREETYPE
 	depends on !BR2_STATIC_LIBS # dlopen()
+	select BR2_PACKAGE_FREETYPE
 	help
 	  Imlib 2 is the successor to Imlib. This library provides
 	  routines to load, save and render images in various formats.
diff --git a/bsp/buildroot/package/imlib2/imlib2.hash b/bsp/buildroot/package/imlib2/imlib2.hash
index 6e1faafc..62ebac32 100644
--- a/bsp/buildroot/package/imlib2/imlib2.hash
+++ b/bsp/buildroot/package/imlib2/imlib2.hash
@@ -1,3 +1,7 @@
-# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.4.9/
-md5	23ef8b49f2793bc63b16839a2062298b	imlib2-1.4.9.tar.bz2
-sha1	f389d67c337b604a365e620b0083b2d342dd724e	imlib2-1.4.9.tar.bz2
+# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.4.10/
+md5 a0de8524592bbd9f24fcc6cb8352137c  imlib2-1.4.10.tar.bz2
+sha1 664df65c6265a2825d685d2f3a4f0d072eb626ac  imlib2-1.4.10.tar.bz2
+
+# Locally computed
+sha256 fb70339dd33a77b6213c7ae067fccf93d04af44ff3f937c61f8863f7970e73f6  COPYING
+sha256 8c9a2e92ed4937e2d30c2ea95439c36ed3002fc47e34efee43455a460fee8ef5  COPYING-PLAIN
diff --git a/bsp/buildroot/package/imlib2/imlib2.mk b/bsp/buildroot/package/imlib2/imlib2.mk
index 7da032f9..21a96cb1 100644
--- a/bsp/buildroot/package/imlib2/imlib2.mk
+++ b/bsp/buildroot/package/imlib2/imlib2.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-IMLIB2_VERSION = 1.4.9
+IMLIB2_VERSION = 1.4.10
 IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2
 IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION)
-IMLIB2_LICENSE = imlib2 license
-IMLIB2_LICENSE_FILES = COPYING
+IMLIB2_LICENSE = Imlib2
+IMLIB2_LICENSE_FILES = COPYING COPYING-PLAIN
 
 IMLIB2_INSTALL_STAGING = YES
 IMLIB2_DEPENDENCIES = host-pkgconf freetype
diff --git a/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.hash b/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.hash
index 3e020389..e246ff85 100644
--- a/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.hash
+++ b/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256  40e1e36791e91366b13f57b16b32e75cf05e7177b2813f1bf2446419d0ed44eb  imx-usb-loader-9b0e81cf9511c3a27cf635407714caa2793b570c.tar.gz
+sha256  717b64cec31f7e1167d4a31e4f511eea97ab80039dd435b7b183c6f41352213a imx-usb-loader-7e77787c83288a421080a9bf2f67063931f561be.tar.gz
diff --git a/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.mk b/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.mk
index 0cd9637c..946a1f3d 100644
--- a/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.mk
+++ b/bsp/buildroot/package/imx-usb-loader/imx-usb-loader.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-IMX_USB_LOADER_VERSION = 9b0e81cf9511c3a27cf635407714caa2793b570c
+IMX_USB_LOADER_VERSION = 7e77787c83288a421080a9bf2f67063931f561be
 IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION))
-IMX_USB_LOADER_LICENSE = LGPLv2.1+
+IMX_USB_LOADER_LICENSE = LGPL-2.1+
 IMX_USB_LOADER_LICENSE_FILES = COPYING
 HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb host-pkgconf
 
@@ -15,8 +15,7 @@ define HOST_IMX_USB_LOADER_BUILD_CMDS
 endef
 
 define HOST_IMX_USB_LOADER_INSTALL_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		DESTDIR=$(HOST_DIR) sysconfdir=/etc install
+	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) prefix=$(HOST_DIR) install
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/inadyn/inadyn.hash b/bsp/buildroot/package/inadyn/inadyn.hash
index a4e60c96..c6c062ce 100644
--- a/bsp/buildroot/package/inadyn/inadyn.hash
+++ b/bsp/buildroot/package/inadyn/inadyn.hash
@@ -1,2 +1,5 @@
+# From https://github.com/troglobit/inadyn/releases/download/v2.2.1/inadyn-2.2.1.tar.xz.md5
+md5 8f7796ee45b2a2e282a54a2d31d03953  inadyn-2.2.1.tar.xz
 # Locally computed
-sha256	763c53eb3856decfe8b921cab8a54b428b079a62264fbcf6c89690713d63529a  inadyn-v2.0.tar.gz
+sha256 e7a74fcf8b7c069990940c0dc4d4d18071005be225667fdfcfa4156c44384579  inadyn-2.2.1.tar.xz
+sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
diff --git a/bsp/buildroot/package/inadyn/inadyn.mk b/bsp/buildroot/package/inadyn/inadyn.mk
index f23955bb..5eac3b5c 100644
--- a/bsp/buildroot/package/inadyn/inadyn.mk
+++ b/bsp/buildroot/package/inadyn/inadyn.mk
@@ -4,19 +4,13 @@
 #
 ################################################################################
 
-INADYN_VERSION = v2.0
-INADYN_SITE = $(call github,troglobit,inadyn,$(INADYN_VERSION))
-INADYN_LICENSE = GPLv2+
+INADYN_VERSION = 2.2.1
+INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
+INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
+INADYN_LICENSE = GPL-2.0+
 INADYN_LICENSE_FILES = COPYING
-INADYN_AUTORECONF = YES
 INADYN_DEPENDENCIES = host-pkgconf libconfuse libite
 
-# Needed for autoreconf to work properly, see ./autogen.sh
-define INADYN_FIXUP_M4_DIR
-	mkdir $(@D)/m4
-endef
-INADYN_POST_EXTRACT_HOOKS += INADYN_FIXUP_M4_DIR
-
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 INADYN_CONF_OPTS += --enable-openssl
 INADYN_DEPENDENCIES += openssl
diff --git a/bsp/buildroot/package/inconsolata/inconsolata.mk b/bsp/buildroot/package/inconsolata/inconsolata.mk
index 2f53b98a..3fe3895c 100644
--- a/bsp/buildroot/package/inconsolata/inconsolata.mk
+++ b/bsp/buildroot/package/inconsolata/inconsolata.mk
@@ -8,7 +8,7 @@ INCONSOLATA_VERSION = 001.010
 INCONSOLATA_SITE = http://snapshot.debian.org/archive/debian/20090524T155154Z/pool/main/t/ttf-inconsolata
 INCONSOLATA_SOURCE = ttf-inconsolata_$(INCONSOLATA_VERSION).orig.tar.gz
 INCONSOLATA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/inconsolata
-INCONSOLATA_LICENSE = OFLv1.0
+INCONSOLATA_LICENSE = OFL-1.0
 INCONSOLATA_LICENSE_FILES = OFL.txt
 
 define INCONSOLATA_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/initscripts/init.d/S20urandom b/bsp/buildroot/package/initscripts/init.d/S20urandom
index 2f5b4e4c..cababe10 100755
--- a/bsp/buildroot/package/initscripts/init.d/S20urandom
+++ b/bsp/buildroot/package/initscripts/init.d/S20urandom
@@ -33,9 +33,9 @@ case "$1" in
 		;;
 	stop)
 		if ! touch /etc/random-seed 2>/dev/null
-                then
-                        exit
-                fi
+		then
+			exit
+		fi
 		# Carry a random seed from shut-down to start-up;
 		# see documentation in linux/drivers/char/random.c
 		[ "$VERBOSE" != no ] && printf "Saving random seed... "
diff --git a/bsp/buildroot/package/inotify-tools/Config.in b/bsp/buildroot/package/inotify-tools/Config.in
index df440d59..1ca01b6e 100644
--- a/bsp/buildroot/package/inotify-tools/Config.in
+++ b/bsp/buildroot/package/inotify-tools/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_INOTIFY_TOOLS
 	  inotify-tools is a C library and a set of command-line
 	  programs for Linux providing a simple interface to inotify.
 	  These programs can be used to monitor and act upon
-	  filesystem events. Provides the 'inotifywait' and 'inotifywatch'
-	  binaries.
+	  filesystem events. Provides the 'inotifywait' and
+	  'inotifywatch' binaries.
 
 	  https://github.com/rvoicilas/inotify-tools
diff --git a/bsp/buildroot/package/input-tools/0001-rint.patch b/bsp/buildroot/package/input-tools/0001-rint.patch
deleted file mode 100644
index b2aa13f7..00000000
--- a/bsp/buildroot/package/input-tools/0001-rint.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c
---- joystick-20051019.orig/utils/jscal.c	2004-10-19 09:51:52.000000000 +0200
-+++ joystick-20051019/utils/jscal.c	2009-01-18 10:48:50.000000000 +0100
-@@ -141,10 +141,10 @@
- 	c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]);
- 	d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]);
- 
--	results[0] = rint(a);
--	results[1] = rint(b);
--	results[2] = rint(c*16384.0);
--	results[3] = rint(d*16384.0);
-+	results[0] = (int) (a + 0.5);
-+	results[1] = (int) (b + 0.5);
-+	results[2] = (int) (c*16384.0 + 0.5);
-+	results[3] = (int) (d*16384.0 + 0.5);
- 
- 	return 1;
- }
diff --git a/bsp/buildroot/package/input-tools/Config.in b/bsp/buildroot/package/input-tools/Config.in
deleted file mode 100644
index 85b4fd00..00000000
--- a/bsp/buildroot/package/input-tools/Config.in
+++ /dev/null
@@ -1,27 +0,0 @@
-config BR2_PACKAGE_INPUT_TOOLS
-	bool "input-tools"
-	help
-	  Tools for the Linux kernel input layer.
-	  http://linuxconsole.sourceforge.net/
-
-if BR2_PACKAGE_INPUT_TOOLS
-
-config BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH
-	bool "inputattach"
-	default y
-	help
-	  Inputattach is used for attaching a serial line to the input layer.
-
-config BR2_PACKAGE_INPUT_TOOLS_JSCAL
-	bool "jscal"
-	default y
-	help
-	  Joystick calibration program.
-
-config BR2_PACKAGE_INPUT_TOOLS_JSTEST
-	bool "jstest"
-	default y
-	help
-	  Joystick test program.
-
-endif
diff --git a/bsp/buildroot/package/input-tools/input-tools.hash b/bsp/buildroot/package/input-tools/input-tools.hash
deleted file mode 100644
index 53b0f92e..00000000
--- a/bsp/buildroot/package/input-tools/input-tools.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/joystick/joystick_20051019-12.dsc
-sha256	cb60cb62093f1889a91fcef1cc36546aba406f451941e8d057f095639e6afb89	joystick_20051019.orig.tar.gz
-# From http://snapshot.debian.org/archive/debian/20090630T220234Z/pool/main/j/joystick/joystick_20051019-5.dsc
-sha256	01e9d14a656d594a3e261751233200f740a09c2a538ac71447c104ffe89ec10c	joystick_20051019-5.diff.gz
diff --git a/bsp/buildroot/package/input-tools/input-tools.mk b/bsp/buildroot/package/input-tools/input-tools.mk
deleted file mode 100644
index 81e913d8..00000000
--- a/bsp/buildroot/package/input-tools/input-tools.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-################################################################################
-#
-# input-tools
-#
-################################################################################
-
-INPUT_TOOLS_VERSION = 20051019
-INPUT_TOOLS_SOURCE = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz
-INPUT_TOOLS_PATCH = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz
-INPUT_TOOLS_SITE = http://snapshot.debian.org/archive/debian/20101023T043132Z/pool/main/j/joystick
-INPUT_TOOLS_LICENSE = GPLv2+
-INPUT_TOOLS_LICENSE_FILES = utils/Makefile
-
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL)       += jscal
-INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST)      += jstest
-
-define INPUT_TOOLS_DEBIAN_PATCHES
-	if [ -d $(@D)/debian/patches ]; then \
-		$(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \
-	fi
-endef
-
-INPUT_TOOLS_POST_PATCH_HOOKS = INPUT_TOOLS_DEBIAN_PATCHES
-
-# jscal needs -lm
-define INPUT_TOOLS_BUILD_CMDS
-	for i in $(filter-out jscal,$(INPUT_TOOLS_TARGETS_y)); do \
-		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c \
-			$(TARGET_LDFLAGS); \
-	done
-	for i in $(filter jscal,$(INPUT_TOOLS_TARGETS_y)); do \
-		$(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c \
-			$(TARGET_LDFLAGS) -lm; \
-	done
-endef
-
-define INPUT_TOOLS_INSTALL_TARGET_CMDS
-	for i in $(INPUT_TOOLS_TARGETS_y); do \
-		$(INSTALL) -m 755 -D $(@D)/$$i $(TARGET_DIR)/usr/bin/$$i; \
-	done
-endef
-
-$(eval $(generic-package))
diff --git a/bsp/buildroot/package/intel-microcode/intel-microcode.hash b/bsp/buildroot/package/intel-microcode/intel-microcode.hash
index 12e1dfbf..999b2729 100644
--- a/bsp/buildroot/package/intel-microcode/intel-microcode.hash
+++ b/bsp/buildroot/package/intel-microcode/intel-microcode.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130  microcode-20180108.tgz
+sha256 0b381face2df1b0a829dc4fa8fa93f47f39e11b1c9c22ebd44f8614657c1e779  microcode-20180312.tgz
 sha256 6d4deb65ca688d930e188bf93f78430f134097b161e6df4a2ef00728e14965e3  license.txt
diff --git a/bsp/buildroot/package/intel-microcode/intel-microcode.mk b/bsp/buildroot/package/intel-microcode/intel-microcode.mk
index d6c35b21..e3134b64 100644
--- a/bsp/buildroot/package/intel-microcode/intel-microcode.mk
+++ b/bsp/buildroot/package/intel-microcode/intel-microcode.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-INTEL_MICROCODE_VERSION = 20180108
+INTEL_MICROCODE_VERSION = 20180312
 INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz
-INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27431/eng
+INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27591/eng
 INTEL_MICROCODE_STRIP_COMPONENTS = 0
 INTEL_MICROCODE_LICENSE = PROPRIETARY
 INTEL_MICROCODE_LICENSE_FILES = license.txt
diff --git a/bsp/buildroot/package/intltool/intltool.mk b/bsp/buildroot/package/intltool/intltool.mk
index dbef80f9..85955444 100644
--- a/bsp/buildroot/package/intltool/intltool.mk
+++ b/bsp/buildroot/package/intltool/intltool.mk
@@ -6,7 +6,7 @@
 
 INTLTOOL_VERSION = 0.51.0
 INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+download
-INTLTOOL_LICENSE = GPLv2+
+INTLTOOL_LICENSE = GPL-2.0+
 INTLTOOL_LICENSE_FILES = COPYING
 
 HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl
diff --git a/bsp/buildroot/package/iotop/iotop.mk b/bsp/buildroot/package/iotop/iotop.mk
index 31787c51..8b556497 100644
--- a/bsp/buildroot/package/iotop/iotop.mk
+++ b/bsp/buildroot/package/iotop/iotop.mk
@@ -6,7 +6,7 @@
 
 IOTOP_VERSION = 0.6
 IOTOP_SITE = http://guichaz.free.fr/iotop/files
-IOTOP_LICENSE = GPLv2+
+IOTOP_LICENSE = GPL-2.0+
 IOTOP_LICENSE_FILES = COPYING
 IOTOP_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/iozone/Config.in b/bsp/buildroot/package/iozone/Config.in
index 33c938ee..c66def26 100644
--- a/bsp/buildroot/package/iozone/Config.in
+++ b/bsp/buildroot/package/iozone/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_IOZONE
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	help
 	  IOzone is a filesystem benchmark tool.
-	  The benchmark generates and measures a variety of file operations
+	  The benchmark generates and measures a variety of file
+	  operations
 
 	  http://www.iozone.org/
 
diff --git a/bsp/buildroot/package/iperf/iperf.hash b/bsp/buildroot/package/iperf/iperf.hash
index 3e961435..0752bfc3 100644
--- a/bsp/buildroot/package/iperf/iperf.hash
+++ b/bsp/buildroot/package/iperf/iperf.hash
@@ -1,4 +1,5 @@
 # From https://sourceforge.net/projects/iperf2/files/
-sha1	59820895df9106ba189ccfdc5677077535ad50e7	iperf-2.0.9.tar.gz
+sha1	8b44a23385044bb454e7891966c37339d3bb3711	iperf-2.0.10.tar.gz
 # Locally computed:
-sha256  db02911f35686e808ed247160dfa766e08ae3f59d1e7dcedef0ffb2a6643f0bf  iperf-2.0.9.tar.gz
+sha256  7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2  iperf-2.0.10.tar.gz
+sha256  5f9f5c4feca3347c3b3c0ada8b16b4e6b698aac4e6f016a24adf61a5915336d1  COPYING
diff --git a/bsp/buildroot/package/iperf/iperf.mk b/bsp/buildroot/package/iperf/iperf.mk
index d2071bd2..64498075 100644
--- a/bsp/buildroot/package/iperf/iperf.mk
+++ b/bsp/buildroot/package/iperf/iperf.mk
@@ -4,16 +4,13 @@
 #
 ################################################################################
 
-IPERF_VERSION = 2.0.9
+IPERF_VERSION = 2.0.10
 IPERF_SITE = http://downloads.sourceforge.net/project/iperf2
 IPERF_LICENSE = MIT-like
 IPERF_LICENSE_FILES = COPYING
 # patching configure.ac
 IPERF_AUTORECONF = YES
 
-IPERF_CONF_ENV = \
-	ac_cv_func_malloc_0_nonnull=yes
-
 IPERF_CONF_OPTS = \
 	--disable-web100
 
diff --git a/bsp/buildroot/package/iperf3/Config.in b/bsp/buildroot/package/iperf3/Config.in
index 074c1d36..5b2204c5 100644
--- a/bsp/buildroot/package/iperf3/Config.in
+++ b/bsp/buildroot/package/iperf3/Config.in
@@ -5,10 +5,10 @@ config BR2_PACKAGE_IPERF3
 	  iperf is a tool for active measurements of the maximum
 	  achievable bandwidth on IP networks.
 	  It supports tuning of various parameters related to timing,
-	  protocols, and buffers. For each test it reports the bandwidth,
-	  loss, and other parameters.
-	  It's a redesign of the NLANR/DAST iperf(2) and is not
-	  backward compatible.
+	  protocols, and buffers. For each test it reports the
+	  bandwidth, loss, and other parameters.
+	  It's a redesign of the NLANR/DAST iperf(2) and is not backward
+	  compatible.
 
 	  http://software.es.net/iperf/index.html
 
diff --git a/bsp/buildroot/package/iperf3/iperf3.hash b/bsp/buildroot/package/iperf3/iperf3.hash
index e43210b7..3e34f98e 100644
--- a/bsp/buildroot/package/iperf3/iperf3.hash
+++ b/bsp/buildroot/package/iperf3/iperf3.hash
@@ -1,2 +1,2 @@
 # From http://software.es.net/iperf/news.html
-sha256   6e1a6200cd38baeab58ef0d7b8769e7aa6410c3a3168e65ea8277a4de79e5500 iperf-3.1.5.tar.gz
+sha256 a4ef73406fe92250602b8da2ae89ec53211f805df97a1d1d629db5a14043734f  iperf-3.1.7.tar.gz
diff --git a/bsp/buildroot/package/iperf3/iperf3.mk b/bsp/buildroot/package/iperf3/iperf3.mk
index 909c104d..cc4e7242 100644
--- a/bsp/buildroot/package/iperf3/iperf3.mk
+++ b/bsp/buildroot/package/iperf3/iperf3.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-IPERF3_VERSION = 3.1.5
+IPERF3_VERSION = 3.1.7
 IPERF3_SITE = http://downloads.es.net/pub/iperf
 IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz
-IPERF3_LICENSE = BSD-3c, BSD-2c, MIT
+IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT
 IPERF3_LICENSE_FILES = LICENSE
 
 IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
diff --git a/bsp/buildroot/package/ipmitool/Config.in b/bsp/buildroot/package/ipmitool/Config.in
index 1da0ace1..826bc094 100644
--- a/bsp/buildroot/package/ipmitool/Config.in
+++ b/bsp/buildroot/package/ipmitool/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_IPMITOOL
 	bool "ipmitool"
 	depends on BR2_USE_MMU # fork()
 	help
-	  IPMItool provides a simple command-line interface to IPMI-enabled devices.
+	  IPMItool provides a simple command-line interface to
+	  IPMI-enabled devices.
 
 	  http://sourceforge.net/projects/ipmitool/
 
@@ -12,11 +13,17 @@ config BR2_PACKAGE_IPMITOOL_LANPLUS
 	bool "enable lanplus interface"
 	select BR2_PACKAGE_OPENSSL
 	help
-	  Enables the IPMI v2.0 RMCP+ LAN interface typically used to send IPMI
-	  commands to the BMC of a remote server.
-	  Not needed if you only want to communicate with the local BMC of your
-	  device using the OpenIPMI ipmi_si kernel module, or if using the
-	  legacy IPMI v1.5 RMCP LAN interface.
+	  Enables the IPMI v2.0 RMCP+ LAN interface typically used to
+	  send IPMI commands to the BMC of a remote server.
+	  Not needed if you only want to communicate with the local BMC
+	  of your device using the OpenIPMI ipmi_si kernel module, or if
+	  using the legacy IPMI v1.5 RMCP LAN interface.
+
+config BR2_PACKAGE_IPMITOOL_USB
+	bool "enable usb interface"
+	help
+	  Enables the IPMI USB interface typically used to send inband
+	  IPMI commands to the BMC of a server.
 
 config BR2_PACKAGE_IPMITOOL_IPMIEVD
 	bool "ipmievd"
diff --git a/bsp/buildroot/package/ipmitool/ipmitool.mk b/bsp/buildroot/package/ipmitool/ipmitool.mk
index f4dca736..52546688 100644
--- a/bsp/buildroot/package/ipmitool/ipmitool.mk
+++ b/bsp/buildroot/package/ipmitool/ipmitool.mk
@@ -7,7 +7,7 @@
 IPMITOOL_VERSION = 1.8.18
 IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2
 IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION)
-IPMITOOL_LICENSE = BSD-3c
+IPMITOOL_LICENSE = BSD-3-Clause
 IPMITOOL_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y)
@@ -17,6 +17,12 @@ else
 IPMITOOL_CONF_OPTS += --disable-intf-lanplus
 endif
 
+ifeq ($(BR2_PACKAGE_IPMITOOL_USB),y)
+IPMITOOL_CONF_OPTS += --enable-intf-usb
+else
+IPMITOOL_CONF_OPTS += --disable-intf-usb
+endif
+
 ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y)
 IPMITOOL_DEPENDENCIES += ncurses readline
 IPMITOOL_CONF_OPTS += --enable-ipmishell
diff --git a/bsp/buildroot/package/ipmiutil/ipmiutil.mk b/bsp/buildroot/package/ipmiutil/ipmiutil.mk
index 392856cc..a5a6b493 100644
--- a/bsp/buildroot/package/ipmiutil/ipmiutil.mk
+++ b/bsp/buildroot/package/ipmiutil/ipmiutil.mk
@@ -6,7 +6,7 @@
 
 IPMIUTIL_VERSION = 2.9.9
 IPMIUTIL_SITE = http://sourceforge.net/projects/ipmiutil/files
-IPMIUTIL_LICENSE = BSD-3c
+IPMIUTIL_LICENSE = BSD-3-Clause
 IPMIUTIL_LICENSE_FILES = COPYING
 # We're patching configure.ac
 IPMIUTIL_AUTORECONF = YES
diff --git a/bsp/buildroot/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch b/bsp/buildroot/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
index c7c6e155..ff362c97 100644
--- a/bsp/buildroot/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
+++ b/bsp/buildroot/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
@@ -1,4 +1,4 @@
-From b4edb4eebbfd35934b8bc6d7ee0e00e76a01596c Mon Sep 17 00:00:00 2001
+From 909a6f10157114e09936d2dd545175d7ed84c0fb Mon Sep 17 00:00:00 2001
 From: Baruch Siach <baruch@tkos.co.il>
 Date: Thu, 22 Dec 2016 15:26:30 +0200
 Subject: [PATCH] Add the musl workaround to the libc-compat.h copy
@@ -12,14 +12,14 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
 musl fix must go to the kernel first.
 ---
- include/linux/libc-compat.h | 4 +++-
+ include/uapi/linux/libc-compat.h | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h
-index f38571dabd8d..30f0b67c7a12 100644
---- a/include/linux/libc-compat.h
-+++ b/include/linux/libc-compat.h
-@@ -49,10 +49,12 @@
+diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
+index 9ab3ace08e2b..e768459d89f9 100644
+--- a/include/uapi/linux/libc-compat.h
++++ b/include/uapi/linux/libc-compat.h
+@@ -50,10 +50,12 @@
  #define _LIBC_COMPAT_H
  
  /* We have included glibc headers... */
@@ -34,5 +34,5 @@ index f38571dabd8d..30f0b67c7a12 100644
  /* GLIBC headers included first so don't define anything
   * that would already be defined. */
 -- 
-2.11.0
+2.15.0
 
diff --git a/bsp/buildroot/package/iproute2/0002-Add-missing-sys-types.h-include.patch b/bsp/buildroot/package/iproute2/0002-Add-missing-sys-types.h-include.patch
deleted file mode 100644
index ef918140..00000000
--- a/bsp/buildroot/package/iproute2/0002-Add-missing-sys-types.h-include.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 19 Nov 2015 17:48:55 +0100
-Subject: [PATCH] Add missing <sys/types.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The u_intXX_t types are defined in <sys/types.h>, so it should be
-included before using those types. Otherwise, with certain C
-libraries, the build fails with:
-
-In file included from ../include/iptables.h:4:0,
-                 from m_ipt.c:18:
-../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’
- #define __le32 u_int32_t
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- include/iptables_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/iptables_common.h b/include/iptables_common.h
-index 9099667..2c27a4b 100644
---- a/include/iptables_common.h
-+++ b/include/iptables_common.h
-@@ -43,6 +43,8 @@ extern char *lib_dir;
-   extern void init_extensions(void);
- #endif
- 
-+#include <sys/types.h>
-+
- #define __be32	u_int32_t
- #define __le32	u_int32_t
- #define __be16	u_int16_t
--- 
-2.6.3
-
diff --git a/bsp/buildroot/package/iproute2/0003-tc-add-missing-limits.h-header.patch b/bsp/buildroot/package/iproute2/0003-tc-add-missing-limits.h-header.patch
deleted file mode 100644
index b9b27f31..00000000
--- a/bsp/buildroot/package/iproute2/0003-tc-add-missing-limits.h-header.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1f4547b0a81db617f4b0d02711d9e39278eb8283 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 22 Dec 2016 20:45:11 +0200
-Subject: [PATCH] tc: add missing limits.h header
-
-This fixes under musl build issues like:
-
-f_matchall.c: In function ‘matchall_parse_opt’:
-f_matchall.c:48:12: error: ‘LONG_MIN’ undeclared (first use in this function)
-   if (h == LONG_MIN || h == LONG_MAX) {
-            ^
-f_matchall.c:48:12: note: each undeclared identifier is reported only once for each function it appears in
-f_matchall.c:48:29: error: ‘LONG_MAX’ undeclared (first use in this function)
-   if (h == LONG_MIN || h == LONG_MAX) {
-                             ^
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: posted http://marc.info/?l=linux-netdev&m=148243283002957&w=2
----
- tc/tc_util.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tc/tc_util.h b/tc/tc_util.h
-index f198a4ad5554..4db26c6d5e25 100644
---- a/tc/tc_util.h
-+++ b/tc/tc_util.h
-@@ -2,6 +2,7 @@
- #define _TC_UTIL_H_ 1
- 
- #define MAX_MSG 16384
-+#include <limits.h>
- #include <linux/pkt_sched.h>
- #include <linux/pkt_cls.h>
- #include <linux/gen_stats.h>
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/iproute2/Config.in b/bsp/buildroot/package/iproute2/Config.in
index fd373a81..ab9e515e 100644
--- a/bsp/buildroot/package/iproute2/Config.in
+++ b/bsp/buildroot/package/iproute2/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_IPROUTE2
 	bool "iproute2"
 	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # bpf, namespaces
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # __kernel_{u,}long_t
 	help
 	  Kernel routing and traffic control utilities. Provides things
 	  like ip and tc.
 
 	  http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
 
-comment "iproute2 needs a toolchain w/ headers >= 3.0"
+comment "iproute2 needs a toolchain w/ headers >= 3.4"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
diff --git a/bsp/buildroot/package/iproute2/iproute2.hash b/bsp/buildroot/package/iproute2/iproute2.hash
index 5cacc7f9..e9b8a0ef 100644
--- a/bsp/buildroot/package/iproute2/iproute2.hash
+++ b/bsp/buildroot/package/iproute2/iproute2.hash
@@ -1,2 +1,3 @@
 # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256	c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4	iproute2-4.9.0.tar.xz
+sha256	d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067	iproute2-4.14.1.tar.xz
+sha256	e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4	COPYING
diff --git a/bsp/buildroot/package/iproute2/iproute2.mk b/bsp/buildroot/package/iproute2/iproute2.mk
index fefd0180..15bb132c 100644
--- a/bsp/buildroot/package/iproute2/iproute2.mk
+++ b/bsp/buildroot/package/iproute2/iproute2.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-IPROUTE2_VERSION = 4.9.0
+IPROUTE2_VERSION = 4.14.1
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBMNL),libmnl)
-IPROUTE2_LICENSE = GPLv2+
+IPROUTE2_LICENSE = GPL-2.0+
 IPROUTE2_LICENSE_FILES = COPYING
 
 # If both iproute2 and busybox are selected, make certain we win
@@ -31,9 +31,8 @@ define IPROUTE2_WITH_IPTABLES
 endef
 else
 define IPROUTE2_WITH_IPTABLES
-	# em_ipset needs xtables, but configure misdetects it
-	echo "TC_CONFIG_IPSET:=n" >>$(@D)/Config
-	echo "TC_CONFIG_XT:=n" >>$(@D)/Config
+	# m_xt.so is built unconditionally
+	echo "TC_CONFIG_XT:=n" >>$(@D)/config.mk
 endef
 endif
 
@@ -42,7 +41,7 @@ ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
 IPROUTE2_DEPENDENCIES += berkeleydb
 else
 define IPROUTE2_DISABLE_ARPD
-	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/Config
+	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/config.mk
 endef
 endif
 
diff --git a/bsp/buildroot/package/iprutils/0001-iprutils-Don-t-use-gettext.patch b/bsp/buildroot/package/iprutils/0001-iprutils-Don-t-use-gettext.patch
deleted file mode 100644
index 680bb07f..00000000
--- a/bsp/buildroot/package/iprutils/0001-iprutils-Don-t-use-gettext.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4ce3545b704588c5889b8dd7b100fcdb88ae2e1a Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Wed, 17 Sep 2014 17:48:54 +0100
-Subject: [PATCH] iprutils: Don't use gettext
-
-... since we don't have any translation.
-
-Based on the former patch by Jeremy Kerr.
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-[Thomas: adapt to the new autotools build system.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 2 +-
- iprconfig.h  | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ee69bee..c1a4f70 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,7 +137,7 @@ AC_SUBST([IPRCONFIG_LIBS])
- LIBS="$save_LIBS"
- 
- # Checks for header files.
--AC_CHECK_HEADERS([fcntl.h libintl.h locale.h netinet/in.h nl_types.h \
-+AC_CHECK_HEADERS([fcntl.h locale.h netinet/in.h nl_types.h \
- 		 paths.h stddef.h stdint.h stdlib.h string.h sys/file.h \
- 		 sys/ioctl.h sys/mount.h sys/socket.h syslog.h \
- 		 unistd.h ncurses.h form.h menu.h], [],
-diff --git a/iprconfig.h b/iprconfig.h
-index 9bce950..751a737 100644
---- a/iprconfig.h
-+++ b/iprconfig.h
-@@ -11,9 +11,7 @@
-  *
-  **/
- 
--#include <libintl.h>
--
--#define _(string) gettext(string)
-+#define _(string) (string)
- #define __(string) (string)
- #define EXIT_FLAG		0x8000	/* stops at given screen on exit call */
- #define CANCEL_FLAG		0x4000	/* stops at given screen on quit call */
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/iprutils/0002-configure.ac-use-pow-instead-of-matherr-for-libm-che.patch b/bsp/buildroot/package/iprutils/0002-configure.ac-use-pow-instead-of-matherr-for-libm-che.patch
deleted file mode 100644
index ea7a6835..00000000
--- a/bsp/buildroot/package/iprutils/0002-configure.ac-use-pow-instead-of-matherr-for-libm-che.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 62a41abffa028a3a4c4ae0803d48c559a14e97f1 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 7 Feb 2016 13:54:10 +0100
-Subject: [PATCH] configure.ac: use pow() instead of matherr() for libm check
-
-In certain configurations of uClibc, the matherr() function may not be
-provided by the C library, which makes the current configure.ac check
-for libm fail. However, iprutils does not use matherr(), so using this
-function for the test makes little sense.
-
-This patch adjusts configure.ac to test for pow() instead, which is
-actually used by iprutils, and more commonly available, including in
-uClibc.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c1a4f70..e430554 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,7 +129,7 @@ save_LIBS="$LIBS"
- AC_CHECK_LIB([ncurses], [curses_version], [],
- 	     [AC_ERROR("libncurses not found.")])
- AC_CHECK_LIB([form], [free_form], [], [AC_ERROR("libform not found.")])
--AC_CHECK_LIB([m], [matherr], [], [AC_ERROR("libm not found.")])
-+AC_CHECK_LIB([m], [pow], [], [AC_ERROR("libm not found.")])
- AC_CHECK_LIB([menu], [new_menu], [], [AC_ERROR("libmenu not found.")])
- AC_CHECK_LIB([panel], [show_panel], [], [AC_ERROR("libpanel not found.")])
- IPRCONFIG_LIBS="$LIBS"
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/iprutils/0003-iprlib-fixes-for-compatibility-with-musl.patch b/bsp/buildroot/package/iprutils/0003-iprlib-fixes-for-compatibility-with-musl.patch
deleted file mode 100644
index 0fe882fb..00000000
--- a/bsp/buildroot/package/iprutils/0003-iprlib-fixes-for-compatibility-with-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From df3b2b74ed7b49d74f5a5ec5687bcc3188d3b319 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 7 Feb 2016 14:10:44 +0100
-Subject: [PATCH] iprlib: fixes for compatibility with musl
-
-<bits/sockaddr.h> is an internal C library header, which is not
-guaranteed to be available in all C libraries, so it shouldn't be
-included, otherwise iprutils cannot be built with musl.
-
-<limits.h> is needed to get the definition of PATH_MAX.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- iprlib.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iprlib.h b/iprlib.h
-index 16fe1e1..73aa1ce 100644
---- a/iprlib.h
-+++ b/iprlib.h
-@@ -46,9 +46,9 @@
- #include <asm/byteorder.h>
- #include <sys/mman.h>
- #include <paths.h>
--#include <bits/sockaddr.h>
- #include <linux/netlink.h>
- #include <time.h>
-+#include <limits.h>
- 
- typedef uint8_t u8;
- typedef uint16_t u16;
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/iprutils/Config.in b/bsp/buildroot/package/iprutils/Config.in
index b429e71c..0143b53a 100644
--- a/bsp/buildroot/package/iprutils/Config.in
+++ b/bsp/buildroot/package/iprutils/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_IPRUTILS
 	bool "iprutils"
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_bfin # pciutils
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBSYSFS
 	select BR2_PACKAGE_PCIUTILS
-	depends on BR2_USE_MMU # fork()
-	depends on !BR2_bfin # pciutils
+	select BR2_PACKAGE_ZLIB
 	help
 	  System utilities for IBM Power RAID devices
 
diff --git a/bsp/buildroot/package/iprutils/iprutils.hash b/bsp/buildroot/package/iprutils/iprutils.hash
index 4b43a617..e5c17546 100644
--- a/bsp/buildroot/package/iprutils/iprutils.hash
+++ b/bsp/buildroot/package/iprutils/iprutils.hash
@@ -1,2 +1,5 @@
+# From https://sourceforge.net/projects/iprdd/files/iprutils%20for%202.6%20kernels/2.4.15/
+md5 e4011051bba7470df3936cbba7dced98  iprutils-2.4.15.1.tar.gz
+sha1 ed6c362ee3c6bd9023ee60d0d1a1ce5543c27c41  iprutils-2.4.15.1.tar.gz
 # Locally computed:
-sha256	99f28418fec505c4dfd532270569d4902a3792dcb2f08710b896f4e7bc0211e0	iprutils-2.4.10.1.tar.gz
+sha256 a733e65f8fb19565f2ef5191eaa2a14d816fabed0fc254ab4bbf1a4c7800ebe5  iprutils-2.4.15.1.tar.gz
diff --git a/bsp/buildroot/package/iprutils/iprutils.mk b/bsp/buildroot/package/iprutils/iprutils.mk
index 2d3d62ed..1165b3db 100644
--- a/bsp/buildroot/package/iprutils/iprutils.mk
+++ b/bsp/buildroot/package/iprutils/iprutils.mk
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-IPRUTILS_VERSION_MAJOR = 2.4.10
+IPRUTILS_VERSION_MAJOR = 2.4.15
 IPRUTILS_VERSION = $(IPRUTILS_VERSION_MAJOR).1
-IPRUTILS_SITE = http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/$(IPRUTILS_VERSION_MAJOR)
-IPRUTILS_DEPENDENCIES = ncurses libsysfs pciutils
+IPRUTILS_SITE = https://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/$(IPRUTILS_VERSION_MAJOR)
+IPRUTILS_DEPENDENCIES = ncurses libsysfs pciutils zlib
 IPRUTILS_LICENSE = Common Public License Version 1.0
 IPRUTILS_LICENSE_FILES = LICENSE
-# Patches touching configure.ac
-IPRUTILS_AUTORECONF = YES
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ipsec-tools/0002-configure-automake.patch b/bsp/buildroot/package/ipsec-tools/0002-configure-automake.patch
new file mode 100644
index 00000000..a006516f
--- /dev/null
+++ b/bsp/buildroot/package/ipsec-tools/0002-configure-automake.patch
@@ -0,0 +1,21 @@
+Needed to fix broken autoreconf
+
+Downloaded from
+https://sources.debian.net/src/ipsec-tools/1:0.8.2%2B20140711-8/debian/patches/automake-options/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+Index: pkg-ipsec-tools/configure.ac
+===================================================================
+--- pkg-ipsec-tools.orig/configure.ac	2014-06-28 17:25:22.000000000 +0200
++++ pkg-ipsec-tools/configure.ac	2014-06-28 17:28:13.818373322 +0200
+@@ -6,7 +6,8 @@ AC_INIT(ipsec-tools, 0.8.2)
+ AC_CONFIG_SRCDIR([configure.ac])
+ AC_CONFIG_HEADERS(config.h)
+ 
+-AM_INIT_AUTOMAKE(dist-bzip2)
++AC_CONFIG_MACRO_DIR([.])
++AM_INIT_AUTOMAKE([dist-bzip2 foreign serial-tests])
+ 
+ AC_ENABLE_SHARED(no)
+ 
diff --git a/bsp/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch b/bsp/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch
new file mode 100644
index 00000000..4fa0a02d
--- /dev/null
+++ b/bsp/buildroot/package/ipsec-tools/0003-Don-t-link-against-libfl.patch
@@ -0,0 +1,92 @@
+From e48b9097dce7bc2bfbb9e9c542124d3b5cebab39 Mon Sep 17 00:00:00 2001
+From: Paul Barker <paul@paulbarker.me.uk>
+Date: Wed, 5 Mar 2014 13:39:14 +0000
+Subject: [PATCH] Don't link against libfl
+
+We can remove all references to yywrap by adding "%option noyywrap" statements
+to each flex source file that doesn't override yywrap. After this, we no longer
+need to link against libfl and so no longer get errors about undefined
+references to yylex.
+
+Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
+Upstream-status: Submitted 2014-03-11
+    see http://sourceforge.net/p/ipsec-tools/mailman/ipsec-tools-devel/thread/CANyK_8ewmxGA3vBVJW6s1APXPmxPR%2BDFWZ61EL8pCt288aKQ6w%40mail.gmail.com/#msg32088797
+
+Downloaded from
+http://cgit.openembedded.org/meta-openembedded/tree/meta-networking/recipes-support/ipsec-tools/ipsec-tools/0002-Don-t-link-against-libfl.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/libipsec/Makefile.am | 1 -
+ src/racoon/Makefile.am   | 2 +-
+ src/racoon/cftoken.l     | 2 ++
+ src/setkey/Makefile.am   | 1 -
+ src/setkey/token.l       | 2 ++
+ 5 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/libipsec/Makefile.am b/src/libipsec/Makefile.am
+index 6a4e3b3..df1e106 100644
+--- a/src/libipsec/Makefile.am
++++ b/src/libipsec/Makefile.am
+@@ -26,7 +26,6 @@ libipsec_la_SOURCES = \
+ # version is current:revision:age.
+ # See: http://www.gnu.org/manual/libtool-1.4.2/html_chapter/libtool_6.html#SEC32
+ libipsec_la_LDFLAGS = -version-info 0:1:0
+-libipsec_la_LIBADD = $(LEXLIB)
+ 
+ noinst_HEADERS = ipsec_strerror.h
+ 
+diff --git a/src/racoon/Makefile.am b/src/racoon/Makefile.am
+index dbaded9..0662957 100644
+--- a/src/racoon/Makefile.am
++++ b/src/racoon/Makefile.am
+@@ -38,7 +38,7 @@ racoon_SOURCES = \
+ 	cftoken.l cfparse.y prsa_tok.l prsa_par.y 
+ EXTRA_racoon_SOURCES = isakmp_xauth.c isakmp_cfg.c isakmp_unity.c throttle.c \
+ 	isakmp_frag.c nattraversal.c security.c $(MISSING_ALGOS)
+-racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(LEXLIB) \
++racoon_LDADD = $(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) \
+ 	 $(SECCTX_OBJS) vmbuf.o sockmisc.o misc.o ../libipsec/libipsec.la
+ racoon_DEPENDENCIES = \
+ 	$(CRYPTOBJS) $(HYBRID_OBJS) $(NATT_OBJS) $(FRAG_OBJS) $(SECCTX_OBJS) \
+diff --git a/src/racoon/cftoken.l b/src/racoon/cftoken.l
+index 490242c..1701922 100644
+--- a/src/racoon/cftoken.l
++++ b/src/racoon/cftoken.l
+@@ -106,6 +106,8 @@ static int incstackp = 0;
+ static int yy_first_time = 1;
+ %}
+ 
++%option noyywrap
++
+ /* common seciton */
+ nl		\n
+ ws		[ \t]+
+diff --git a/src/setkey/Makefile.am b/src/setkey/Makefile.am
+index 746c1f1..389e6cf 100644
+--- a/src/setkey/Makefile.am
++++ b/src/setkey/Makefile.am
+@@ -13,7 +13,6 @@ setkey_SOURCES = \
+ 
+ setkey_LDFLAGS = ../libipsec/libipsec.la
+ setkey_DEPENDENCIES = ../libipsec/libipsec.la
+-setkey_LDADD = $(LEXLIB)
+ 
+ noinst_HEADERS = vchar.h extern.h
+ man8_MANS = setkey.8
+diff --git a/src/setkey/token.l b/src/setkey/token.l
+index ad3d843..eb23b76 100644
+--- a/src/setkey/token.l
++++ b/src/setkey/token.l
+@@ -88,6 +88,8 @@
+ #endif
+ %}
+ 
++%option noyywrap
++
+ /* common section */
+ nl		\n
+ ws		[ \t]+
+-- 
+1.9.0
+
diff --git a/bsp/buildroot/package/ipsec-tools/0002-CVE-2015-4047.patch b/bsp/buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch
similarity index 100%
rename from bsp/buildroot/package/ipsec-tools/0002-CVE-2015-4047.patch
rename to bsp/buildroot/package/ipsec-tools/0004-CVE-2015-4047.patch
diff --git a/bsp/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch b/bsp/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch
new file mode 100644
index 00000000..8ef3b037
--- /dev/null
+++ b/bsp/buildroot/package/ipsec-tools/0005-CVE-2016-10396.patch
@@ -0,0 +1,208 @@
+Fix CVE-2016-10396
+
+Description: Fix remotely exploitable DoS. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-10396
+Source: vendor; https://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=51682
+Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=867986
+
+Downloaded from
+https://github.com/openwrt/packages/blob/master/net/ipsec-tools/patches/010-CVE-2016-10396.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+Index: ipsec-tools-0.8.2/src/racoon/isakmp_frag.c
+===================================================================
+--- ipsec-tools-0.8.2.orig/src/racoon/isakmp_frag.c
++++ ipsec-tools-0.8.2/src/racoon/isakmp_frag.c
+@@ -1,4 +1,4 @@
+-/*	$NetBSD: isakmp_frag.c,v 1.5 2009/04/22 11:24:20 tteras Exp $	*/
++/*	$NetBSD: isakmp_frag.c,v 1.5.36.1 2017/04/21 16:50:42 bouyer Exp $	*/
+ 
+ /* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */
+ 
+@@ -173,6 +173,43 @@ vendorid_frag_cap(gen)
+ 	return ntohl(hp[MD5_DIGEST_LENGTH / sizeof(*hp)]);
+ }
+ 
++static int 
++isakmp_frag_insert(struct ph1handle *iph1, struct isakmp_frag_item *item)
++{
++	struct isakmp_frag_item *pitem = NULL;
++	struct isakmp_frag_item *citem = iph1->frag_chain;
++
++	/* no frag yet, just insert at beginning of list */
++	if (iph1->frag_chain == NULL) {
++		iph1->frag_chain = item;
++		return 0;
++	}
++
++	do {
++		/* duplicate fragment number, abort (CVE-2016-10396) */
++		if (citem->frag_num == item->frag_num)
++			return -1;
++
++		/* need to insert before current item */
++		if (citem->frag_num > item->frag_num) {
++			if (pitem != NULL)
++				pitem->frag_next = item;
++			else
++				/* insert at the beginning of the list  */
++				iph1->frag_chain = item;
++			item->frag_next = citem;
++			return 0;
++		}
++
++		pitem = citem;
++		citem = citem->frag_next;
++	} while (citem != NULL);
++
++	/* we reached the end of the list, insert */
++	pitem->frag_next = item;
++	return 0;
++}
++
+ int 
+ isakmp_frag_extract(iph1, msg)
+ 	struct ph1handle *iph1;
+@@ -224,39 +261,43 @@ isakmp_frag_extract(iph1, msg)
+ 	item->frag_next = NULL;
+ 	item->frag_packet = buf;
+ 
+-	/* Look for the last frag while inserting the new item in the chain */
+-	if (item->frag_last)
+-		last_frag = item->frag_num;
++	/* Check for the last frag before inserting the new item in the chain */
++	if (item->frag_last) {
++		/* if we have the last fragment, indices must match */
++		if (iph1->frag_last_index != 0 &&
++		    item->frag_last != iph1->frag_last_index) {
++			plog(LLV_ERROR, LOCATION, NULL,
++			     "Repeated last fragment index mismatch\n");
++			racoon_free(item);
++			vfree(buf);
++			return -1;
++		}
+ 
+-	if (iph1->frag_chain == NULL) {
+-		iph1->frag_chain = item;
+-	} else {
+-		struct isakmp_frag_item *current;
++		last_frag = iph1->frag_last_index = item->frag_num;
++	}
+ 
+-		current = iph1->frag_chain;
+-		while (current->frag_next) {
+-			if (current->frag_last)
+-				last_frag = item->frag_num;
+-			current = current->frag_next;
+-		}
+-		current->frag_next = item;
++	/* insert fragment into chain */
++	if (isakmp_frag_insert(iph1, item) == -1) {
++		plog(LLV_ERROR, LOCATION, NULL,
++		    "Repeated fragment index mismatch\n");
++		racoon_free(item);
++		vfree(buf);
++		return -1;
+ 	}
+ 
+-	/* If we saw the last frag, check if the chain is complete */
++	/* If we saw the last frag, check if the chain is complete
++	 * we have a sorted list now, so just walk through */
+ 	if (last_frag != 0) {
++		item = iph1->frag_chain;
+ 		for (i = 1; i <= last_frag; i++) {
+-			item = iph1->frag_chain;
+-			do {
+-				if (item->frag_num == i)
+-					break;
+-				item = item->frag_next;
+-			} while (item != NULL);
+-
++			if (item->frag_num != i)
++				break;
++			item = item->frag_next;
+ 			if (item == NULL) /* Not found */
+ 				break;
+ 		}
+ 
+-		if (item != NULL) /* It is complete */
++		if (i > last_frag) /* It is complete */
+ 			return 1;
+ 	}
+ 		
+@@ -291,15 +332,9 @@ isakmp_frag_reassembly(iph1)
+ 	}
+ 	data = buf->v;
+ 
++	item = iph1->frag_chain;
+ 	for (i = 1; i <= frag_count; i++) {
+-		item = iph1->frag_chain;
+-		do {
+-			if (item->frag_num == i)
+-				break;
+-			item = item->frag_next;
+-		} while (item != NULL);
+-
+-		if (item == NULL) {
++		if (item->frag_num != i) {
+ 			plog(LLV_ERROR, LOCATION, NULL, 
+ 			    "Missing fragment #%d\n", i);
+ 			vfree(buf);
+@@ -308,6 +343,7 @@ isakmp_frag_reassembly(iph1)
+ 		}
+ 		memcpy(data, item->frag_packet->v, item->frag_packet->l);
+ 		data += item->frag_packet->l;
++		item = item->frag_next;
+ 	}
+ 
+ out:
+Index: ipsec-tools-0.8.2/src/racoon/isakmp_inf.c
+===================================================================
+--- ipsec-tools-0.8.2.orig/src/racoon/isakmp_inf.c
++++ ipsec-tools-0.8.2/src/racoon/isakmp_inf.c
+@@ -720,6 +720,7 @@ isakmp_info_send_nx(isakmp, remote, loca
+ #endif
+ #ifdef ENABLE_FRAG
+ 	iph1->frag = 0;
++	iph1->frag_last_index = 0;
+ 	iph1->frag_chain = NULL;
+ #endif
+ 
+Index: ipsec-tools-0.8.2/src/racoon/isakmp.c
+===================================================================
+--- ipsec-tools-0.8.2.orig/src/racoon/isakmp.c
++++ ipsec-tools-0.8.2/src/racoon/isakmp.c
+@@ -1071,6 +1071,7 @@ isakmp_ph1begin_i(rmconf, remote, local)
+ 		iph1->frag = 1;
+ 	else
+ 		iph1->frag = 0;
++	iph1->frag_last_index = 0;
+ 	iph1->frag_chain = NULL;
+ #endif
+ 	iph1->approval = NULL;
+@@ -1175,6 +1176,7 @@ isakmp_ph1begin_r(msg, remote, local, et
+ #endif
+ #ifdef ENABLE_FRAG
+ 	iph1->frag = 0;
++	iph1->frag_last_index = 0;
+ 	iph1->frag_chain = NULL;
+ #endif
+ 	iph1->approval = NULL;
+Index: ipsec-tools-0.8.2/src/racoon/handler.h
+===================================================================
+--- ipsec-tools-0.8.2.orig/src/racoon/handler.h
++++ ipsec-tools-0.8.2/src/racoon/handler.h
+@@ -1,4 +1,4 @@
+-/*	$NetBSD: handler.h,v 1.25 2010/11/17 10:40:41 tteras Exp $	*/
++/*	$NetBSD: handler.h,v 1.26 2017/01/24 19:23:56 christos Exp $	*/
+ 
+ /* Id: handler.h,v 1.19 2006/02/25 08:25:12 manubsd Exp */
+ 
+@@ -141,6 +141,7 @@ struct ph1handle {
+ #endif
+ #ifdef ENABLE_FRAG
+ 	int frag;			/* IKE phase 1 fragmentation */
++	int frag_last_index;
+ 	struct isakmp_frag_item *frag_chain;	/* Received fragments */
+ #endif
+ 
diff --git a/bsp/buildroot/package/ipsec-tools/Config.in b/bsp/buildroot/package/ipsec-tools/Config.in
index 36c5a65a..1635675a 100644
--- a/bsp/buildroot/package/ipsec-tools/Config.in
+++ b/bsp/buildroot/package/ipsec-tools/Config.in
@@ -12,8 +12,8 @@ config BR2_PACKAGE_IPSEC_TOOLS
 if BR2_PACKAGE_IPSEC_TOOLS
 
 config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT
-	default y
 	bool "Enable racoonctl(8)"
+	default y
 	help
 	  Lets racoon to listen to racoon admin port, which is to
 	  be contacted by racoonctl(8).
@@ -42,12 +42,12 @@ config BR2_PACKAGE_IPSEC_TOOLS_DPD
 	  Enable dead peer detection support
 
 config BR2_PACKAGE_IPSEC_TOOLS_STATS
-	default y
 	bool "Enable statistics logging function"
+	default y
 
 config BR2_PACKAGE_IPSEC_TOOLS_READLINE
-	select BR2_PACKAGE_READLINE
 	bool "Enable readline input support"
+	select BR2_PACKAGE_READLINE
 
 config BR2_PACKAGE_IPSEC_TOOLS_HYBRID
 	bool "Enable hybrid, both mode-cfg and xauth support"
diff --git a/bsp/buildroot/package/ipsec-tools/ipsec-tools.mk b/bsp/buildroot/package/ipsec-tools/ipsec-tools.mk
index eb910bc4..20c7ab4f 100644
--- a/bsp/buildroot/package/ipsec-tools/ipsec-tools.mk
+++ b/bsp/buildroot/package/ipsec-tools/ipsec-tools.mk
@@ -9,7 +9,9 @@ IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2
 IPSEC_TOOLS_SITE = http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/$(IPSEC_TOOLS_VERSION)
 IPSEC_TOOLS_INSTALL_STAGING = YES
 IPSEC_TOOLS_MAKE = $(MAKE1)
-IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex
+IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex host-bison
+# we patch configure.ac
+IPSEC_TOOLS_AUTORECONF = YES
 
 # configure hardcodes -Werror, so override CFLAGS on make invocation
 IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)'
diff --git a/bsp/buildroot/package/ipset/0001-Do-not-pass-Werror-when-enable-debug-is-used.patch b/bsp/buildroot/package/ipset/0001-Do-not-pass-Werror-when-enable-debug-is-used.patch
deleted file mode 100644
index c115f633..00000000
--- a/bsp/buildroot/package/ipset/0001-Do-not-pass-Werror-when-enable-debug-is-used.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From f31bb2561776ad2ce4b77339da6fbfc9e3b2ffbb Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 26 Oct 2014 14:18:29 +0100
-Subject: [PATCH] Do not pass -Werror when --enable-debug is used
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Make_global.am | 2 +-
- configure.ac   | 1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Make_global.am b/Make_global.am
-index 7953451..25c4d64 100644
---- a/Make_global.am
-+++ b/Make_global.am
-@@ -77,7 +77,7 @@ AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \
- AM_CFLAGS = -std=gnu99
- 
- if ENABLE_DEBUG
--AM_CFLAGS += -g -g3 -ggdb -gdwarf-2 -DIPSET_DEBUG -Wall -Werror
-+AM_CFLAGS += -g -g3 -ggdb -gdwarf-2 -DIPSET_DEBUG -Wall
- else
- AM_CFLAGS += -O2 -DNDEBUG
- endif
-diff --git a/configure.ac b/configure.ac
-index 8fdac15..ee3b147 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,7 +345,6 @@ AX_CFLAGS_GCC_OPTION(-Waggregate-return)
- AX_CFLAGS_GCC_OPTION(-Wbad-function-cast)
- AX_CFLAGS_GCC_OPTION(-Wcast-align)
- AX_CFLAGS_GCC_OPTION(-Wcast-qual)
--AX_CFLAGS_GCC_OPTION(-Werror)
- AX_CFLAGS_GCC_OPTION(-Wextra)
- AX_CFLAGS_GCC_OPTION(-Wfloat-equal)
- AX_CFLAGS_GCC_OPTION(-Wformat=2)
--- 
-2.0.0
-
diff --git a/bsp/buildroot/package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch b/bsp/buildroot/package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch
new file mode 100644
index 00000000..84863e6e
--- /dev/null
+++ b/bsp/buildroot/package/ipset/0001-Replace-the-last-reference-to-u_int8_t-with-uint8_t.patch
@@ -0,0 +1,28 @@
+From a4212bf911026740afc7fce98d9100e2ef5dcea0 Mon Sep 17 00:00:00 2001
+From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+Date: Tue, 26 Sep 2017 07:00:13 +0200
+Subject: [PATCH] Replace the last reference to u_int8_t with uint8_t.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit a4212bf911026740
+
+ src/ipset.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ipset.c b/src/ipset.c
+index 79f56b869ea7..df0778a92d8b 100644
+--- a/src/ipset.c
++++ b/src/ipset.c
+@@ -282,7 +282,7 @@ call_parser(int *argc, char *argv[], const struct ipset_type *type,
+ 	const struct ipset_arg *arg;
+ 	const char *optstr;
+ 	const struct ipset_type *t = type;
+-	u_int8_t revision = type->revision;
++	uint8_t revision = type->revision;
+ 	int ret = 0, i = 1;
+ 
+ 	/* Currently CREATE and ADT may have got additional arguments */
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/ipset/ipset.hash b/bsp/buildroot/package/ipset/ipset.hash
index da860e8d..dcd709e8 100644
--- a/bsp/buildroot/package/ipset/ipset.hash
+++ b/bsp/buildroot/package/ipset/ipset.hash
@@ -1,4 +1,6 @@
-# From ftp://ftp.netfilter.org/pub/ipset/ipset-6.30.tar.bz2.md5sum.txt
-md5	41c32e3b884ec714f0aac95e7675f9d1	ipset-6.30.tar.bz2
+# From http://ftp.netfilter.org/pub/ipset/ipset-6.34.tar.bz2.md5sum.txt
+md5 51bd03f976a1501fd45e1d71a1e2e6bf  ipset-6.34.tar.bz2
 # Calculated based on the hash above
-sha256	65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31	ipset-6.30.tar.bz2
+sha256 d70e831b670b7aa25dde81fd994d3a7ce0c0e801559a557105576df66cd8d680  ipset-6.34.tar.bz2
+# Locally calculated
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
diff --git a/bsp/buildroot/package/ipset/ipset.mk b/bsp/buildroot/package/ipset/ipset.mk
index db4952b1..d7299568 100644
--- a/bsp/buildroot/package/ipset/ipset.mk
+++ b/bsp/buildroot/package/ipset/ipset.mk
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-IPSET_VERSION = 6.30
+IPSET_VERSION = 6.34
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_DEPENDENCIES = libmnl host-pkgconf
 IPSET_CONF_OPTS = --with-kmod=no
-# For 0001-Do-not-pass-Werror-when-enable-debug-is-used.patch
-IPSET_AUTORECONF = YES
-IPSET_LICENSE = GPLv2
+IPSET_LICENSE = GPL-2.0
 IPSET_LICENSE_FILES = COPYING
+IPSET_INSTALL_STAGING = YES
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch b/bsp/buildroot/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch
new file mode 100644
index 00000000..1f86ad13
--- /dev/null
+++ b/bsp/buildroot/package/iptables/0001-utils-nfsynproxy-fix-build-with-musl-libc.patch
@@ -0,0 +1,44 @@
+From 06e0312d0bfd1f0b9e7c23ab654f18524d49e86b Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 2 Mar 2017 09:20:48 +0200
+Subject: [PATCH] utils: nfsynproxy: fix build with musl libc
+
+The musl libc exposes some struct tcphdr field only when _GNU_SOURCE is
+defined. Fix the following build failure:
+
+nfsynproxy.c: In function ‘parse_packet’:
+nfsynproxy.c:34:9: error: ‘const struct tcphdr’ has no member named ‘syn’
+  if (!th->syn || !th->ack)
+         ^
+nfsynproxy.c:34:21: error: ‘const struct tcphdr’ has no member named ‘ack’
+  if (!th->syn || !th->ack)
+                     ^
+nfsynproxy.c:42:8: error: ‘const struct tcphdr’ has no member named ‘res2’
+  if (th->res2 == 0x1)
+        ^
+nfsynproxy.c:45:13: error: ‘const struct tcphdr’ has no member named ‘doff’
+  length = th->doff * 4 - sizeof(*th);
+             ^
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: pending (http://patchwork.ozlabs.org/patch/734503/)
+
+ utils/nfsynproxy.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/utils/nfsynproxy.c b/utils/nfsynproxy.c
+index baedc92c5d9f..bf5c416340f1 100644
+--- a/utils/nfsynproxy.c
++++ b/utils/nfsynproxy.c
+@@ -6,6 +6,7 @@
+  * published by the Free Software Foundation.
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdlib.h>
+ #include <stdbool.h>
+ #include <unistd.h>
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/iptables/Config.in b/bsp/buildroot/package/iptables/Config.in
index cdcd1c28..e6b12603 100644
--- a/bsp/buildroot/package/iptables/Config.in
+++ b/bsp/buildroot/package/iptables/Config.in
@@ -9,10 +9,6 @@ if BR2_PACKAGE_IPTABLES
 
 config BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY
 	bool "bpfc and nfsynproxy"
-	# this dependency can be removed when using a musl version
-	# containing this commit:
-	# http://git.musl-libc.org/cgit/musl/commit/?id=53f41fb568ae43034c9876cc9bd3961fd6d13671
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_LIBPCAP
 	help
 	  Build bpf compiler and nfsynproxy configuration tool.
diff --git a/bsp/buildroot/package/iptables/iptables.mk b/bsp/buildroot/package/iptables/iptables.mk
index 90fab345..44cfde2b 100644
--- a/bsp/buildroot/package/iptables/iptables.mk
+++ b/bsp/buildroot/package/iptables/iptables.mk
@@ -10,7 +10,7 @@ IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables
 IPTABLES_INSTALL_STAGING = YES
 IPTABLES_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack)
-IPTABLES_LICENSE = GPLv2
+IPTABLES_LICENSE = GPL-2.0
 IPTABLES_LICENSE_FILES = COPYING
 # Building static causes ugly warnings on some plugins
 IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \
diff --git a/bsp/buildroot/package/iptraf-ng/Config.in b/bsp/buildroot/package/iptraf-ng/Config.in
index 5afb81da..5c3b4848 100644
--- a/bsp/buildroot/package/iptraf-ng/Config.in
+++ b/bsp/buildroot/package/iptraf-ng/Config.in
@@ -3,10 +3,11 @@ config BR2_PACKAGE_IPTRAF_NG
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
-	  IPTraf-ng is a ncurses-based network monitoring utility. It gathers
-	  data like TCP connection packet and byte counts, interface statistics
-	  and activity indicators.
+	  IPTraf-ng is a ncurses-based network monitoring utility. It
+	  gathers data like TCP connection packet and byte counts,
+	  interface statistics and activity indicators.
 
 	  https://fedorahosted.org/iptraf-ng/
 
-	  IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org).
+	  IPTraf-ng is a fork of original IPTraf v3.0.0
+	  (http://iptraf.seul.org).
diff --git a/bsp/buildroot/package/iptraf-ng/iptraf-ng.mk b/bsp/buildroot/package/iptraf-ng/iptraf-ng.mk
index a36c7089..ac572b9e 100644
--- a/bsp/buildroot/package/iptraf-ng/iptraf-ng.mk
+++ b/bsp/buildroot/package/iptraf-ng/iptraf-ng.mk
@@ -6,7 +6,7 @@
 
 IPTRAF_NG_VERSION = 1.1.4
 IPTRAF_NG_SITE = https://fedorahosted.org/releases/i/p/iptraf-ng
-IPTRAF_NG_LICENSE = GPLv2+
+IPTRAF_NG_LICENSE = GPL-2.0+
 IPTRAF_NG_LICENSE_FILES = LICENSE
 IPTRAF_NG_DEPENDENCIES = ncurses
 
diff --git a/bsp/buildroot/package/iputils/Config.in b/bsp/buildroot/package/iputils/Config.in
index c83e414c..b5d9141a 100644
--- a/bsp/buildroot/package/iputils/Config.in
+++ b/bsp/buildroot/package/iputils/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_IPUTILS
 	bool "iputils"
 	depends on BR2_USE_MMU # fork()
 	help
-	  This package is set of small useful utilities for Linux networking.
-	  It includes complete versions of ping, traceroute, etc.
+	  This package is set of small useful utilities for Linux
+	  networking. It includes complete versions of ping, traceroute,
+	  etc.
 
 	  https://github.com/iputils/iputils
diff --git a/bsp/buildroot/package/iputils/iputils.hash b/bsp/buildroot/package/iputils/iputils.hash
index d7d3f5cb..a19348aa 100644
--- a/bsp/buildroot/package/iputils/iputils.hash
+++ b/bsp/buildroot/package/iputils/iputils.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	79e22e940b6f52c37810657c8f12e7ba85692b517d6cd6e90cbceac2d94fc5e8	iputils-55828d1fef3fed7f07abcbf7be9282a9662e78c7.tar.gz
+sha256 f813092f03d17294fd23544b129b95cdb87fe19f7970a51908a6b88509acad8a  iputils-s20161105.tar.gz
diff --git a/bsp/buildroot/package/iputils/iputils.mk b/bsp/buildroot/package/iputils/iputils.mk
index d3a12ac6..13e33898 100644
--- a/bsp/buildroot/package/iputils/iputils.mk
+++ b/bsp/buildroot/package/iputils/iputils.mk
@@ -7,13 +7,13 @@
 # The original upstream was forked to the github repository in 2014 to
 # pull fixes from other distribution and centralize the changes after
 # the upstream seemed to have gone dormant.  The fork contains the
-# latest changes including msul support, removing a libsysfs dependency
+# latest changes including musl support, removing a libsysfs dependency
 # and IPv6 updates.
 # http://www.spinics.net/lists/netdev/msg279881.html
 
-IPUTILS_VERSION = 55828d1fef3fed7f07abcbf7be9282a9662e78c7
+IPUTILS_VERSION = s20161105
 IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
-IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c
+IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause
 # Only includes a license file for BSD
 IPUTILS_LICENSE_FILES = ninfod/COPYING
 
@@ -36,13 +36,6 @@ endif
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 IPUTILS_MAKE_OPTS += USE_GCRYPT=yes
 IPUTILS_DEPENDENCIES += libgcrypt
-# When gettext is enabled (BR2_PACKAGE_GETTEXT=y), and provides libintl
-# (BR2_NEEDS_GETTEXT=y), libgpg-error will link with libintl, and libgpg-error
-# is pulled in by libgcrypt. Since iputils doesn't use libtool, we have to link
-# with libintl explicitly for static linking.
-ifeq ($(BR2_STATIC_LIBS)$(BR2_NEEDS_GETTEXT)$(BR2_PACKAGE_GETTEXT),yyy)
-IPUTILS_MAKE_OPTS += ADDLIB='-lintl'
-endif
 else
 IPUTILS_MAKE_OPTS += USE_GCRYPT=no
 endif
diff --git a/bsp/buildroot/package/iqvlinux/iqvlinux.mk b/bsp/buildroot/package/iqvlinux/iqvlinux.mk
index b3981fa7..165c7c46 100644
--- a/bsp/buildroot/package/iqvlinux/iqvlinux.mk
+++ b/bsp/buildroot/package/iqvlinux/iqvlinux.mk
@@ -8,7 +8,7 @@ IQVLINUX_VERSION = 1.1.5.3
 IQVLINUX_SITE = http://sourceforge.net/projects/e1000/files/iqvlinux/$(IQVLINUX_VERSION)
 IQVLINUX_SOURCE = iqvlinux.tar.gz
 
-IQVLINUX_LICENSE = GPLv2, BSD-3c
+IQVLINUX_LICENSE = GPL-2.0, BSD-3-Clause
 IQVLINUX_LICENSE_FILES = \
 	COPYING src/linux/driver/files.txt \
 	inc/linux/files.txt inc/files.txt
diff --git a/bsp/buildroot/package/irda-utils/irda-utils.mk b/bsp/buildroot/package/irda-utils/irda-utils.mk
index 4b170079..18a3e586 100644
--- a/bsp/buildroot/package/irda-utils/irda-utils.mk
+++ b/bsp/buildroot/package/irda-utils/irda-utils.mk
@@ -6,7 +6,7 @@
 
 IRDA_UTILS_VERSION = 0.9.18
 IRDA_UTILS_SITE = http://downloads.sourceforge.net/project/irda/irda-utils/$(IRDA_UTILS_VERSION)
-IRDA_UTILS_LICENSE = GPLv2+
+IRDA_UTILS_LICENSE = GPL-2.0+
 IRDA_UTILS_LICENSE_FILES = man/COPYING
 
 IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I.
diff --git a/bsp/buildroot/package/irqbalance/irqbalance.mk b/bsp/buildroot/package/irqbalance/irqbalance.mk
index 1872c889..e4e6078b 100644
--- a/bsp/buildroot/package/irqbalance/irqbalance.mk
+++ b/bsp/buildroot/package/irqbalance/irqbalance.mk
@@ -6,7 +6,7 @@
 
 IRQBALANCE_VERSION = v1.0.9
 IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,$(IRQBALANCE_VERSION))
-IRQBALANCE_LICENSE = GPLv2
+IRQBALANCE_LICENSE = GPL-2.0
 IRQBALANCE_LICENSE_FILES = COPYING
 IRQBALANCE_DEPENDENCIES = host-pkgconf
 # Autoreconf needed because package is distributed without a configure script
diff --git a/bsp/buildroot/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch b/bsp/buildroot/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
new file mode 100644
index 00000000..d6e4b63f
--- /dev/null
+++ b/bsp/buildroot/package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch
@@ -0,0 +1,44 @@
+From 5c5e6d0f469c8b4384bbe5d6c8f78069c182daf0 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 9 Apr 2017 19:56:55 +0200
+Subject: [PATCH] override CPPFLAGS, CXXFLAGS and CFLAGS in Makefile
+
+When CPPFLAGS is passed on the command line, include paths for the
+bundled libraries are lost. Since the hand written Makefile want
+to use them unconditionally, we need to use the key word "override"
+before CPPFLAGS.
+
+Do the same for CXXFLAGS and CFLAGS otherwise -fPIC is lost.
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ source/Irrlicht/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile
+index 0712b07..b334e9c 100644
+--- a/source/Irrlicht/Makefile
++++ b/source/Irrlicht/Makefile
+@@ -62,7 +62,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ ###############
+ #Compiler flags
+ CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
+-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
++override CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+@@ -74,8 +74,8 @@ CXXFLAGS += -pg
+ endif
+ CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+ 
+-sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+-sharedlib sharedlib_osx: CFLAGS += -fPIC
++sharedlib sharedlib_osx: override CXXFLAGS += -fPIC
++sharedlib sharedlib_osx: override CFLAGS += -fPIC
+ 
+ #multilib handling
+ ifeq ($(HOSTTYPE), x86_64)
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/irrlicht/0002-remove-sys-sysctl.h.patch b/bsp/buildroot/package/irrlicht/0002-remove-sys-sysctl.h.patch
new file mode 100644
index 00000000..d9142a9a
--- /dev/null
+++ b/bsp/buildroot/package/irrlicht/0002-remove-sys-sysctl.h.patch
@@ -0,0 +1,38 @@
+From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 9 Apr 2017 22:20:19 +0200
+Subject: [PATCH] remove sys/sysctl.h
+
+With musl irrlicht doesn't build due to missing sys/sysctl.h
+
+fatal error: sys/sysctl.h: No such file or directory
+
+From [1]
+"sysctl does not work, and NEVER worked. using it is bogus.
+it was a bogus experimental syscall that was deprecated before
+it was ever used (basically, a broken binary version of
+/proc/sys, without any stability between kernel versions for
+what the binary constants meant)."
+
+[1] https://devsonacid.wordpress.com/tag/musl/
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ source/Irrlicht/COSOperator.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp
+index 0899d1d..ccf5ef5 100644
+--- a/source/Irrlicht/COSOperator.cpp
++++ b/source/Irrlicht/COSOperator.cpp
+@@ -13,7 +13,6 @@
+ #include <unistd.h>
+ #ifndef _IRR_SOLARIS_PLATFORM_
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #endif
+ #endif
+ 
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/irrlicht/Config.in b/bsp/buildroot/package/irrlicht/Config.in
new file mode 100644
index 00000000..edd182be
--- /dev/null
+++ b/bsp/buildroot/package/irrlicht/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_IRRLICHT
+	bool "irrlicht"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_HAS_LIBGL # use GLX
+	select BR2_PACKAGE_XLIB_LIBXXF86VM # libXxf86vm
+	help
+	  An open source high performance realtime 3D graphics engine.
+
+	  http://irrlicht.sourceforge.net/
+
+comment "irrlicht needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
+
+comment "irrlicht needs X11 and an OpenGL provider"
+	depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
+	depends on BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/irrlicht/irrlicht.hash b/bsp/buildroot/package/irrlicht/irrlicht.hash
new file mode 100644
index 00000000..489790e2
--- /dev/null
+++ b/bsp/buildroot/package/irrlicht/irrlicht.hash
@@ -0,0 +1,5 @@
+# From https://sourceforge.net/projects/irrlicht/files/Irrlicht%20SDK/1.8/1.8.4
+md5 9401cfff801395010b0912211f3cbb4f irrlicht-1.8.4.zip
+sha1 38bf0223fe868d243d6a39d0dc191c8df6e03b3b irrlicht-1.8.4.zip
+# locally calculated
+sha256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433  irrlicht-1.8.4.zip
diff --git a/bsp/buildroot/package/irrlicht/irrlicht.mk b/bsp/buildroot/package/irrlicht/irrlicht.mk
new file mode 100644
index 00000000..ccd1045c
--- /dev/null
+++ b/bsp/buildroot/package/irrlicht/irrlicht.mk
@@ -0,0 +1,58 @@
+################################################################################
+#
+# irrlicht
+#
+################################################################################
+
+IRRLICHT_VERSION_MAJOR = 1.8
+IRRLICHT_VERSION = $(IRRLICHT_VERSION_MAJOR).4
+IRRLICHT_SOURCE = irrlicht-$(IRRLICHT_VERSION).zip
+IRRLICHT_SITE = https://downloads.sourceforge.net/project/irrlicht/Irrlicht%20SDK/$(IRRLICHT_VERSION_MAJOR)/$(IRRLICHT_VERSION)
+IRRLICHT_INSTALL_STAGING = YES
+
+# Bundled libraries: bzip2, libaesGladman, libpng, lzma, zlib,
+# The handcrafted Makefile can only use bundled libraries.
+IRRLICHT_LICENSE = Zlib (irrlicht), BSD-3-Clause (libaesGladman), bzip2-1.0.5 (bzip2), IJG (libjpeg), Libpng (libpng)
+IRRLICHT_LICENSE_FILES = \
+	doc/aesGladman.txt \
+	doc/bzip2-license.txt \
+	doc/irrlicht-license.txt \
+	doc/jpglib-license.txt \
+	doc/libpng-license.txt
+
+IRRLICHT_SUBDIR = source/Irrlicht
+
+IRRLICHT_DEPENDENCIES = libgl xlib_libXxf86vm
+
+define IRRLICHT_EXTRACT_CMDS
+	$(UNZIP) -d $(@D) $(DL_DIR)/$(IRRLICHT_SOURCE)
+	mv $(@D)/irrlicht-$(IRRLICHT_VERSION)/* $(@D)
+	$(RM) -r $(@D)/irrlicht-$(IRRLICHT_VERSION)
+endef
+
+IRRLICHT_CONF_OPTS = $(TARGET_CONFIGURE_OPTS)
+
+# Build a static library OR a shared library, otherwise we need to compile with -fPIC
+# "relocation R_X86_64_32S can not be used when making a shared object; recompile with -fPIC"
+ifeq ($(BR2_STATIC_LIBS),)
+IRRLICHT_CONF_OPTS += sharedlib
+endif
+
+define IRRLICHT_BUILD_CMDS
+	$(TARGET_MAKE_ENV)
+		$(MAKE) -C $(@D)/$(IRRLICHT_SUBDIR) $(IRRLICHT_CONF_OPTS)
+endef
+
+define IRRLICHT_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		INSTALL_DIR=$(STAGING_DIR)/usr/lib \
+		-C $(@D)/$(IRRLICHT_SUBDIR) install
+endef
+
+define IRRLICHT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		INSTALL_DIR=$(TARGET_DIR)/usr/lib \
+		-C $(@D)/$(IRRLICHT_SUBDIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/irssi/Config.in b/bsp/buildroot/package/irssi/Config.in
index 2cdd06c8..6361cff3 100644
--- a/bsp/buildroot/package/irssi/Config.in
+++ b/bsp/buildroot/package/irssi/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_IRSSI
 	bool "irssi"
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_OPENSSL
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_OPENSSL
 	help
 	  Irssi is a terminal based IRC client for UNIX systems.
 
diff --git a/bsp/buildroot/package/irssi/irssi.mk b/bsp/buildroot/package/irssi/irssi.mk
index ba425da0..611365f8 100644
--- a/bsp/buildroot/package/irssi/irssi.mk
+++ b/bsp/buildroot/package/irssi/irssi.mk
@@ -9,7 +9,7 @@ IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz
 # Do not use the github helper here. The generated tarball is *NOT* the
 # same as the one uploaded by upstream for the release.
 IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION)
-IRSSI_LICENSE = GPLv2+
+IRSSI_LICENSE = GPL-2.0+
 IRSSI_LICENSE_FILES = COPYING
 IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses openssl
 
diff --git a/bsp/buildroot/package/isl/isl.hash b/bsp/buildroot/package/isl/isl.hash
index e2c14ad1..43e5a463 100644
--- a/bsp/buildroot/package/isl/isl.hash
+++ b/bsp/buildroot/package/isl/isl.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	8882c9e36549fc757efa267706a9af733bb8d7fe3905cbfde43e17a89eea4675	isl-0.14.1.tar.xz
+sha256	0f35051cc030b87c673ac1f187de40e386a1482a0cfdf2c552dd6031b307ddc4	isl-0.18.tar.xz
diff --git a/bsp/buildroot/package/isl/isl.mk b/bsp/buildroot/package/isl/isl.mk
index 74de125b..b5f01c4c 100644
--- a/bsp/buildroot/package/isl/isl.mk
+++ b/bsp/buildroot/package/isl/isl.mk
@@ -4,18 +4,11 @@
 #
 ################################################################################
 
-# The latest 0.15 version is not yet compatible with cloog 0.18.3, so
-# bumping isl is not possible until a new version of cloog is
-# published.
-ISL_VERSION = 0.14.1
+ISL_VERSION = 0.18
 ISL_SOURCE = isl-$(ISL_VERSION).tar.xz
 ISL_SITE = http://isl.gforge.inria.fr
 ISL_LICENSE = MIT
 ISL_LICENSE_FILES = LICENSE
 HOST_ISL_DEPENDENCIES = host-gmp
 
-# Our libtool patch doesn't apply, and since this package is only
-# built for the host, we don't really care about it.
-ISL_LIBTOOL_PATCH = NO
-
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/iucode-tool/iucode-tool.mk b/bsp/buildroot/package/iucode-tool/iucode-tool.mk
index 3280c1ed..fb746c3c 100644
--- a/bsp/buildroot/package/iucode-tool/iucode-tool.mk
+++ b/bsp/buildroot/package/iucode-tool/iucode-tool.mk
@@ -10,7 +10,7 @@ IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/master
 ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y)
 IUCODE_TOOL_DEPENDENCIES = argp-standalone
 endif
-IUCODE_TOOL_LICENSE = GPLv2+
+IUCODE_TOOL_LICENSE = GPL-2.0+
 IUCODE_TOOL_LICENSE_FILES = COPYING
 
 define IUCODE_TOOL_INSTALL_INIT_SYSV
diff --git a/bsp/buildroot/package/iw/iw.mk b/bsp/buildroot/package/iw/iw.mk
index faff5fc7..aa85cbb5 100644
--- a/bsp/buildroot/package/iw/iw.mk
+++ b/bsp/buildroot/package/iw/iw.mk
@@ -13,7 +13,7 @@ IW_DEPENDENCIES = host-pkgconf libnl
 IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)"
 IW_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
-	PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \
+	PKG_CONFIG="$(HOST_DIR)/bin/pkg-config" \
 	GIT_DIR=$(IW_DIR)
 
 define IW_BUILD_CMDS
diff --git a/bsp/buildroot/package/jack2/jack2.mk b/bsp/buildroot/package/jack2/jack2.mk
index 7801840b..b61c5d75 100644
--- a/bsp/buildroot/package/jack2/jack2.mk
+++ b/bsp/buildroot/package/jack2/jack2.mk
@@ -6,7 +6,7 @@
 
 JACK2_VERSION = v1.9.10
 JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION))
-JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
+JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library)
 JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
 JACK2_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/jamvm/Config.in b/bsp/buildroot/package/jamvm/Config.in
index 57e1a8e6..7717ccaa 100644
--- a/bsp/buildroot/package/jamvm/Config.in
+++ b/bsp/buildroot/package/jamvm/Config.in
@@ -1,10 +1,17 @@
+config BR2_PACKAGE_JAMVM_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_i386 || BR2_x86_64
+	default y if (BR2_mips || BR2_mipsel) \
+		&& (BR2_MIPS_FP32_MODE_32 || BR2_MIPS_SOFT_FLOAT)
+	default y if BR2_powerpc
+
 config BR2_PACKAGE_JAMVM
 	bool "jamvm"
+	depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
-		|| BR2_mips || BR2_mipsel || BR2_powerpc
-	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_CLASSPATH
 	help
@@ -14,7 +21,6 @@ config BR2_PACKAGE_JAMVM
 	  http://jamvm.sf.net
 
 comment "jamvm needs a toolchain w/ threads, dynamic library"
-	depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
-		|| BR2_mips || BR2_mipsel || BR2_powerpc
+	depends on BR2_PACKAGE_JAMVM_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/jamvm/jamvm.mk b/bsp/buildroot/package/jamvm/jamvm.mk
index ee80c80b..3fcf460b 100644
--- a/bsp/buildroot/package/jamvm/jamvm.mk
+++ b/bsp/buildroot/package/jamvm/jamvm.mk
@@ -6,7 +6,7 @@
 
 JAMVM_VERSION = 2.0.0
 JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION)
-JAMVM_LICENSE = GPLv2+
+JAMVM_LICENSE = GPL-2.0+
 JAMVM_LICENSE_FILES = COPYING
 JAMVM_DEPENDENCIES = zlib classpath
 # For 0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch
diff --git a/bsp/buildroot/package/jansson/Config.in b/bsp/buildroot/package/jansson/Config.in
index 960a7c4c..18c8ce5d 100644
--- a/bsp/buildroot/package/jansson/Config.in
+++ b/bsp/buildroot/package/jansson/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_JANSSON
 	bool "jansson"
 	help
-	  Jansson is a C library for encoding, decoding and manipulating JSON
-	  data.
+	  Jansson is a C library for encoding, decoding and manipulating
+	  JSON data.
 
 	  http://www.digip.org/jansson/
diff --git a/bsp/buildroot/package/jansson/jansson.hash b/bsp/buildroot/package/jansson/jansson.hash
index adb345d2..7a04586c 100644
--- a/bsp/buildroot/package/jansson/jansson.hash
+++ b/bsp/buildroot/package/jansson/jansson.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	0ad0d074ca049a36637e7abef755d40849ad73e926b93914ce294927b97bd2a5	jansson-2.9.tar.gz
+sha256	78215ad1e277b42681404c1d66870097a50eb084be9d771b1d15576575cf6447	jansson-2.10.tar.gz
diff --git a/bsp/buildroot/package/jansson/jansson.mk b/bsp/buildroot/package/jansson/jansson.mk
index 5e131188..9771434c 100644
--- a/bsp/buildroot/package/jansson/jansson.mk
+++ b/bsp/buildroot/package/jansson/jansson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JANSSON_VERSION = 2.9
+JANSSON_VERSION = 2.10
 JANSSON_SITE = http://www.digip.org/jansson/releases
 JANSSON_LICENSE = MIT
 JANSSON_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/janus-gateway/Config.in b/bsp/buildroot/package/janus-gateway/Config.in
index 5c7b6337..5bd4e958 100644
--- a/bsp/buildroot/package/janus-gateway/Config.in
+++ b/bsp/buildroot/package/janus-gateway/Config.in
@@ -1,14 +1,14 @@
 menuconfig BR2_PACKAGE_JANUS_GATEWAY
 	bool "janus-gateway"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_WCHAR # libnice -> libglib2
+	depends on BR2_USE_MMU # libnice
+	depends on !BR2_STATIC_LIBS # dlopen
 	select BR2_PACKAGE_JANSSON
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBNICE
 	select BR2_PACKAGE_LIBSRTP
 	select BR2_PACKAGE_OPENSSL
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	depends on BR2_USE_WCHAR # libnice -> libglib2
-	depends on BR2_USE_MMU # libnice
-	depends on !BR2_STATIC_LIBS # dlopen
 	help
 	  Janus is an open source, general purpose, WebRTC gateway
 	  designed and developed by Meetecho.
@@ -54,6 +54,42 @@ config BR2_PACKAGE_JANUS_VOICE_MAIL
 	bool "voice mail"
 	select BR2_PACKAGE_LIBOGG
 
+comment "transports"
+
+config BR2_PACKAGE_JANUS_MQTT
+	bool "MQTT"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_PAHO_MQTT_C
+
+comment "MQTT transport needs a toolchain w/ threads and dynamic library support"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_JANUS_RABBITMQ
+	bool "RabbitMQ"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_RABBITMQ_C
+
+comment "RabbitMQ transport needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_JANUS_REST
+	bool "REST (HTTP/HTTPS)"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBMICROHTTPD
+
+comment "REST transport needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_JANUS_UNIX_SOCKETS
+	bool "Unix Sockets"
+	default y
+
+config BR2_PACKAGE_JANUS_WEBSOCKETS
+	bool "WebSockets"
+	depends on BR2_USE_MMU
+	select BR2_PACKAGE_LIBWEBSOCKETS
+
 endif
 
 comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar"
diff --git a/bsp/buildroot/package/janus-gateway/janus-gateway.hash b/bsp/buildroot/package/janus-gateway/janus-gateway.hash
index 68b9c311..f84ed8b6 100644
--- a/bsp/buildroot/package/janus-gateway/janus-gateway.hash
+++ b/bsp/buildroot/package/janus-gateway/janus-gateway.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256 5d071592faca2a1574b996b4ca07b6c9e02cd42a719b0dbb4bfb5dfde8d55ff3 janus-gateway-v0.2.1.tar.gz
+sha256 35cbbd5e7b7067e3a0b5ba221ea845814e5b59c733302f88fea80bcf98ce416f janus-gateway-v0.2.6.tar.gz
+sha256 0a884af515b4593503f6f0c9b424db3945bd77eaa2644d25f45eb93a412b3c19 COPYING
diff --git a/bsp/buildroot/package/janus-gateway/janus-gateway.mk b/bsp/buildroot/package/janus-gateway/janus-gateway.mk
index 212fa473..c37cda08 100644
--- a/bsp/buildroot/package/janus-gateway/janus-gateway.mk
+++ b/bsp/buildroot/package/janus-gateway/janus-gateway.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-JANUS_GATEWAY_VERSION = v0.2.1
+JANUS_GATEWAY_VERSION = v0.2.6
 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION))
-JANUS_GATEWAY_LICENSE = GPLv3
+JANUS_GATEWAY_LICENSE = GPL-3.0
 JANUS_GATEWAY_LICENSE_FILES = COPYING
 
 # ding-libs provides the ini_config library
 JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \
-	libsrtp host-gengetopt libglib2 openssl 
+	libsrtp host-gengetopt libglib2 openssl
 
 # Straight out of the repository, no ./configure, and we also patch
 # configure.ac.
@@ -24,7 +24,7 @@ JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4
 
 JANUS_GATEWAY_CONF_OPTS = \
 	--disable-data-channels \
-	--disable-rabbitmq
+	--disable-sample-event-handler
 
 ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y)
 JANUS_GATEWAY_DEPENDENCIES += opus
@@ -83,7 +83,34 @@ else
 JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail
 endif
 
-ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y)
+ifeq ($(BR2_PACKAGE_JANUS_MQTT),y)
+JANUS_GATEWAY_DEPENDENCIES += paho-mqtt-c
+JANUS_GATEWAY_CONF_OPTS += --enable-mqtt
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-mqtt
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_RABBITMQ),y)
+JANUS_GATEWAY_DEPENDENCIES += rabbitmq-c
+JANUS_GATEWAY_CONF_OPTS += --enable-rabbitmq
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-rabbitmq
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_REST),y)
+JANUS_GATEWAY_DEPENDENCIES += libmicrohttpd
+JANUS_GATEWAY_CONF_OPTS += --enable-rest
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-rest
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_UNIX_SOCKETS),y)
+JANUS_GATEWAY_CONF_OPTS += --enable-unix-sockets
+else
+JANUS_GATEWAY_CONF_OPTS += --disable-unix-sockets
+endif
+
+ifeq ($(BR2_PACKAGE_JANUS_WEBSOCKETS),y)
 JANUS_GATEWAY_DEPENDENCIES += libwebsockets
 JANUS_GATEWAY_CONF_OPTS += --enable-websockets
 else
diff --git a/bsp/buildroot/package/jasper/0001-Disable-C-compiler-check.patch b/bsp/buildroot/package/jasper/0001-Disable-C-compiler-check.patch
deleted file mode 100644
index c1f72710..00000000
--- a/bsp/buildroot/package/jasper/0001-Disable-C-compiler-check.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e4ed3e2c3fd5a859567f510deeb49a915d96700f Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Sat, 14 Jan 2017 21:06:25 +0200
-Subject: [PATCH] Disable C++ compiler check
-
-jasper does not use C++ code. Allow use of toolchains without C++ support.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: https://github.com/mdadams/jasper/pull/110
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6c99b3e7df31..3ac166b060ad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required (VERSION 2.8.11)
- 
--project(JasPer)
-+project(JasPer C)
- 
- set(CMAKE_MODULE_PATH
-   ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/modules/")
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch b/bsp/buildroot/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch
deleted file mode 100644
index be847205..00000000
--- a/bsp/buildroot/package/jasper/0002-Fixed-bugs-due-to-uninitialized-data-in-the-JP2-deco.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-From e96fc4fdd525fa0ede28074a7e2b1caf94b58b0d Mon Sep 17 00:00:00 2001
-From: Michael Adams <mdadams@ece.uvic.ca>
-Date: Sat, 4 Mar 2017 14:43:24 -0800
-Subject: [PATCH] Fixed bugs due to uninitialized data in the JP2 decoder.
- Also, added some comments marking I/O stream interfaces that probably need to
- be changed (in the long term) to fix integer overflow problems.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/libjasper/base/jas_stream.c | 18 +++++++++++++++++
- src/libjasper/jp2/jp2_cod.c     | 44 ++++++++++++++++++++++++++++-------------
- 2 files changed, 48 insertions(+), 14 deletions(-)
-
-diff --git a/src/libjasper/base/jas_stream.c b/src/libjasper/base/jas_stream.c
-index 327ee57..d70408f 100644
---- a/src/libjasper/base/jas_stream.c
-+++ b/src/libjasper/base/jas_stream.c
-@@ -664,6 +664,7 @@ int jas_stream_ungetc(jas_stream_t *stream, int c)
- 	return 0;
- }
- 
-+/* FIXME integral type */
- int jas_stream_read(jas_stream_t *stream, void *buf, int cnt)
- {
- 	int n;
-@@ -690,6 +691,7 @@ int jas_stream_read(jas_stream_t *stream, void *buf, int cnt)
- 	return n;
- }
- 
-+/* FIXME integral type */
- int jas_stream_write(jas_stream_t *stream, const void *buf, int cnt)
- {
- 	int n;
-@@ -742,6 +744,7 @@ int jas_stream_puts(jas_stream_t *stream, const char *s)
- 	return 0;
- }
- 
-+/* FIXME integral type */
- char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize)
- {
- 	int c;
-@@ -765,6 +768,7 @@ char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize)
- 	return buf;
- }
- 
-+/* FIXME integral type */
- int jas_stream_gobble(jas_stream_t *stream, int n)
- {
- 	int m;
-@@ -783,6 +787,7 @@ int jas_stream_gobble(jas_stream_t *stream, int n)
- 	return n;
- }
- 
-+/* FIXME integral type */
- int jas_stream_pad(jas_stream_t *stream, int n, int c)
- {
- 	int m;
-@@ -885,6 +890,7 @@ long jas_stream_tell(jas_stream_t *stream)
- * Buffer initialization code.
- \******************************************************************************/
- 
-+/* FIXME integral type */
- static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
-   int bufsize)
- {
-@@ -1060,6 +1066,7 @@ static int jas_strtoopenmode(const char *s)
- 	return openmode;
- }
- 
-+/* FIXME integral type */
- int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n)
- {
- 	int all;
-@@ -1085,6 +1092,7 @@ int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n)
- 	return 0;
- }
- 
-+/* FIXME integral type */
- long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt)
- {
- 	int old;
-@@ -1094,6 +1102,7 @@ long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt)
- 	return old;
- }
- 
-+/* FIXME integral type */
- int jas_stream_display(jas_stream_t *stream, FILE *fp, int n)
- {
- 	unsigned char buf[16];
-@@ -1168,6 +1177,7 @@ long jas_stream_length(jas_stream_t *stream)
- * Memory stream object.
- \******************************************************************************/
- 
-+/* FIXME integral type */
- static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt)
- {
- 	ssize_t n;
-@@ -1209,6 +1219,7 @@ static int mem_resize(jas_stream_memobj_t *m, size_t bufsize)
- 	return 0;
- }
- 
-+/* FIXME integral type */
- static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt)
- {
- 	size_t n;
-@@ -1264,6 +1275,7 @@ static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt)
- 	return ret;
- }
- 
-+/* FIXME integral type */
- static long mem_seek(jas_stream_obj_t *obj, long offset, int origin)
- {
- 	jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj;
-@@ -1310,6 +1322,7 @@ static int mem_close(jas_stream_obj_t *obj)
- * File stream object.
- \******************************************************************************/
- 
-+/* FIXME integral type */
- static int file_read(jas_stream_obj_t *obj, char *buf, int cnt)
- {
- 	jas_stream_fileobj_t *fileobj;
-@@ -1318,6 +1331,7 @@ static int file_read(jas_stream_obj_t *obj, char *buf, int cnt)
- 	return read(fileobj->fd, buf, cnt);
- }
- 
-+/* FIXME integral type */
- static int file_write(jas_stream_obj_t *obj, char *buf, int cnt)
- {
- 	jas_stream_fileobj_t *fileobj;
-@@ -1326,6 +1340,7 @@ static int file_write(jas_stream_obj_t *obj, char *buf, int cnt)
- 	return write(fileobj->fd, buf, cnt);
- }
- 
-+/* FIXME integral type */
- static long file_seek(jas_stream_obj_t *obj, long offset, int origin)
- {
- 	jas_stream_fileobj_t *fileobj;
-@@ -1352,6 +1367,7 @@ static int file_close(jas_stream_obj_t *obj)
- * Stdio file stream object.
- \******************************************************************************/
- 
-+/* FIXME integral type */
- static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt)
- {
- 	FILE *fp;
-@@ -1367,6 +1383,7 @@ static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt)
- 	return result;
- }
- 
-+/* FIXME integral type */
- static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt)
- {
- 	FILE *fp;
-@@ -1377,6 +1394,7 @@ static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt)
- 	return (n != JAS_CAST(size_t, cnt)) ? (-1) : cnt;
- }
- 
-+/* FIXME integral type */
- static long sfile_seek(jas_stream_obj_t *obj, long offset, int origin)
- {
- 	FILE *fp;
-diff --git a/src/libjasper/jp2/jp2_cod.c b/src/libjasper/jp2/jp2_cod.c
-index 7f3608a..8d98a2c 100644
---- a/src/libjasper/jp2/jp2_cod.c
-+++ b/src/libjasper/jp2/jp2_cod.c
-@@ -183,15 +183,28 @@ jp2_boxinfo_t jp2_boxinfo_unk = {
- * Box constructor.
- \******************************************************************************/
- 
--jp2_box_t *jp2_box_create(int type)
-+jp2_box_t *jp2_box_create0()
- {
- 	jp2_box_t *box;
--	jp2_boxinfo_t *boxinfo;
--
- 	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
- 		return 0;
- 	}
- 	memset(box, 0, sizeof(jp2_box_t));
-+	box->type = 0;
-+	box->len = 0;
-+	// Mark the box data as never having been constructed
-+	// so that we will not errantly attempt to destroy it later.
-+	box->ops = &jp2_boxinfo_unk.ops;
-+	return box;
-+}
-+
-+jp2_box_t *jp2_box_create(int type)
-+{
-+	jp2_box_t *box;
-+	jp2_boxinfo_t *boxinfo;
-+	if (!(box = jp2_box_create0())) {
-+		return 0;
-+	}
- 	box->type = type;
- 	box->len = 0;
- 	if (!(boxinfo = jp2_boxinfolookup(type))) {
-@@ -248,14 +261,9 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
- 	box = 0;
- 	tmpstream = 0;
- 
--	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-+	if (!(box = jp2_box_create0())) {
- 		goto error;
- 	}
--
--	// Mark the box data as never having been constructed
--	// so that we will not errantly attempt to destroy it later.
--	box->ops = &jp2_boxinfo_unk.ops;
--
- 	if (jp2_getuint32(in, &len) || jp2_getuint32(in, &box->type)) {
- 		goto error;
- 	}
-@@ -263,10 +271,12 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
- 	box->info = boxinfo;
- 	box->len = len;
- 	JAS_DBGLOG(10, (
--	  "preliminary processing of JP2 box: type=%c%s%c (0x%08x); length=%d\n",
-+	  "preliminary processing of JP2 box: "
-+	  "type=%c%s%c (0x%08x); length=%"PRIuFAST32"\n",
- 	  '"', boxinfo->name, '"', box->type, box->len
- 	  ));
- 	if (box->len == 1) {
-+		JAS_DBGLOG(10, ("big length\n"));
- 		if (jp2_getuint64(in, &extlen)) {
- 			goto error;
- 		}
-@@ -382,6 +392,7 @@ static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in)
- {
- 	jp2_bpcc_t *bpcc = &box->data.bpcc;
- 	unsigned int i;
-+	bpcc->bpcs = 0;
- 	bpcc->numcmpts = box->datalen;
- 	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
- 		return -1;
-@@ -462,6 +473,7 @@ static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in)
- 	jp2_cdef_t *cdef = &box->data.cdef;
- 	jp2_cdefchan_t *chan;
- 	unsigned int channo;
-+	cdef->ents = 0;
- 	if (jp2_getuint16(in, &cdef->numchans)) {
- 		return -1;
- 	}
-@@ -518,7 +530,9 @@ int jp2_box_put(jp2_box_t *box, jas_stream_t *out)
- 	}
- 
- 	if (dataflag) {
--		if (jas_stream_copy(out, tmpstream, box->len - JP2_BOX_HDRLEN(false))) {
-+		if (jas_stream_copy(out, tmpstream, box->len -
-+		  JP2_BOX_HDRLEN(false))) {
-+			jas_eprintf("cannot copy box data\n");
- 			goto error;
- 		}
- 		jas_stream_close(tmpstream);
-@@ -777,6 +791,7 @@ static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in)
- 	jp2_cmap_t *cmap = &box->data.cmap;
- 	jp2_cmapent_t *ent;
- 	unsigned int i;
-+	cmap->ents = 0;
- 
- 	cmap->numchans = (box->datalen) / 4;
- 	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
-@@ -835,6 +850,7 @@ static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in)
- 	int_fast32_t x;
- 
- 	pclr->lutdata = 0;
-+	pclr->bpc = 0;
- 
- 	if (jp2_getuint16(in, &pclr->numlutents) ||
- 	  jp2_getuint8(in, &pclr->numchans)) {
-@@ -869,9 +885,9 @@ static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out)
- #if 0
- 	jp2_pclr_t *pclr = &box->data.pclr;
- #endif
--/* Eliminate warning about unused variable. */
--box = 0;
--out = 0;
-+	/* Eliminate warning about unused variable. */
-+	box = 0;
-+	out = 0;
- 	return -1;
- }
- 
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch b/bsp/buildroot/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch
deleted file mode 100644
index 16a3e75b..00000000
--- a/bsp/buildroot/package/jasper/0003-Added-a-check-in-the-JP2-encoder-to-ensure-that-the-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 58ba0365d911b9f9dd68e9abf826682c0b4f2293 Mon Sep 17 00:00:00 2001
-From: Michael Adams <mdadams@ece.uvic.ca>
-Date: Mon, 6 Mar 2017 08:06:54 -0800
-Subject: [PATCH] Added a check in the JP2 encoder to ensure that the image to
- be coded has at least one component.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/libjasper/jp2/jp2_enc.c | 5 +++++
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/src/libjasper/jp2/jp2_enc.c b/src/libjasper/jp2/jp2_enc.c
-index 9a5e106..af4d9a4 100644
---- a/src/libjasper/jp2/jp2_enc.c
-+++ b/src/libjasper/jp2/jp2_enc.c
-@@ -115,6 +115,11 @@ int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr)
- 	iccstream = 0;
- 	iccprof = 0;
- 
-+	if (jas_image_numcmpts(image) < 1) {
-+		jas_eprintf("image must have at least one component\n");
-+		goto error;
-+	}
-+
- 	allcmptssame = 1;
- 	sgnd = jas_image_cmptsgnd(image, 0);
- 	prec = jas_image_cmptprec(image, 0);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/jasper/jasper.hash b/bsp/buildroot/package/jasper/jasper.hash
index 6c3ab473..b2b82178 100644
--- a/bsp/buildroot/package/jasper/jasper.hash
+++ b/bsp/buildroot/package/jasper/jasper.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 54d85428e35263642358a11c312d61cbc054170546fae780e11271df5d1502e8 jasper-2.0.10.tar.gz
+sha256 b50413b41bfc82ae419298b41eadcde1aa31f362fb9dc2ac089e5cbc19f60c24  jasper-version-2.0.13.tar.gz
diff --git a/bsp/buildroot/package/jasper/jasper.mk b/bsp/buildroot/package/jasper/jasper.mk
index a243b9a1..2aa3f9d5 100644
--- a/bsp/buildroot/package/jasper/jasper.mk
+++ b/bsp/buildroot/package/jasper/jasper.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-JASPER_VERSION = 2.0.10
-JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software
+JASPER_VERSION = version-2.0.13
+JASPER_SITE = $(call github,mdadams,jasper,$(JASPER_VERSION))
 JASPER_INSTALL_STAGING = YES
 JASPER_LICENSE = JasPer License Version 2.0
 JASPER_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/jemalloc/0001-Disable-documentation.patch b/bsp/buildroot/package/jemalloc/0001-Disable-documentation.patch
new file mode 100644
index 00000000..a5f252cd
--- /dev/null
+++ b/bsp/buildroot/package/jemalloc/0001-Disable-documentation.patch
@@ -0,0 +1,29 @@
+From b9113f8dc939dab775dbc64bae03b927f0679467 Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Sun, 2 Apr 2017 19:26:04 +0200
+Subject: [PATCH] Disable documentation
+
+As there is no option to disable documentation, update Makefile.in to
+skip it.
+
+Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e49a871..74a7541 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -383,7 +383,7 @@ done
+ 
+ install_doc: install_doc_html install_doc_man
+ 
+-install: install_bin install_include install_lib install_doc
++install: install_bin install_include install_lib
+ 
+ tests_unit: $(TESTS_UNIT:$(srcroot)%.c=$(objroot)%$(EXE))
+ tests_integration: $(TESTS_INTEGRATION:$(srcroot)%.c=$(objroot)%$(EXE))
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/jemalloc/0001-Fix-LG_QUANTUM-definition-for-sparc64.patch b/bsp/buildroot/package/jemalloc/0001-Fix-LG_QUANTUM-definition-for-sparc64.patch
deleted file mode 100644
index ef5b857d..00000000
--- a/bsp/buildroot/package/jemalloc/0001-Fix-LG_QUANTUM-definition-for-sparc64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b3211bd6363ee6884c8db64008dc325a9c711bfb Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Thu, 14 Jul 2016 22:44:01 +0200
-Subject: [PATCH] Fix LG_QUANTUM definition for sparc64
-
-GCC 4.9.3 cross-compiled for sparc64 defines __sparc_v9__, not
-__sparc64__ nor __sparcv9. This prevents LG_QUANTUM from being defined
-properly. Adding this new value to the check solves the issue.
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
- include/jemalloc/internal/jemalloc_internal.h.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
-index 51bf897..ece15b2 100644
---- a/include/jemalloc/internal/jemalloc_internal.h.in
-+++ b/include/jemalloc/internal/jemalloc_internal.h.in
-@@ -234,7 +234,7 @@ typedef unsigned szind_t;
- #  ifdef __alpha__
- #    define LG_QUANTUM		4
- #  endif
--#  if (defined(__sparc64__) || defined(__sparcv9))
-+#  if (defined(__sparc64__) || defined(__sparcv9) || defined(__sparc_v9__))
- #    define LG_QUANTUM		4
- #  endif
- #  if (defined(__amd64__) || defined(__x86_64__) || defined(_M_X64))
--- 
-2.4.11
-
diff --git a/bsp/buildroot/package/jemalloc/Config.in b/bsp/buildroot/package/jemalloc/Config.in
index b1b92bb7..c3fd8e34 100644
--- a/bsp/buildroot/package/jemalloc/Config.in
+++ b/bsp/buildroot/package/jemalloc/Config.in
@@ -14,10 +14,11 @@ config BR2_PACKAGE_JEMALLOC
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  This library providing a malloc(3) implementation that emphasizes
-	  fragmentation avoidance and scalable concurrency support.
+	  This library providing a malloc(3) implementation that
+	  emphasizes fragmentation avoidance and scalable concurrency
+	  support.
 
-	  http://www.canonware.com/jemalloc/
+	  http://jemalloc.net/
 
 comment "jemalloc needs a toolchain w/ dynamic library, threads"
 	depends on BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS
diff --git a/bsp/buildroot/package/jemalloc/jemalloc.hash b/bsp/buildroot/package/jemalloc/jemalloc.hash
index b6c860ba..50ac6828 100644
--- a/bsp/buildroot/package/jemalloc/jemalloc.hash
+++ b/bsp/buildroot/package/jemalloc/jemalloc.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5630650d5c1caab95d2f0898de4fe5ab8519dc680b04963b38bb425ef6a42d57 jemalloc-4.2.1.tar.bz2
+sha256 4814781d395b0ef093b21a08e8e6e0bd3dab8762f9935bbfb71679b0dea7c3e9  jemalloc-5.0.1.tar.bz2
diff --git a/bsp/buildroot/package/jemalloc/jemalloc.mk b/bsp/buildroot/package/jemalloc/jemalloc.mk
index f1c9ffe6..2424eb54 100644
--- a/bsp/buildroot/package/jemalloc/jemalloc.mk
+++ b/bsp/buildroot/package/jemalloc/jemalloc.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-JEMALLOC_VERSION = 4.2.1
+JEMALLOC_VERSION = 5.0.1
 JEMALLOC_SOURCE = jemalloc-$(JEMALLOC_VERSION).tar.bz2
-JEMALLOC_SITE = http://www.canonware.com/download/jemalloc
-JEMALLOC_LICENSE = BSD-2c
+JEMALLOC_SITE = https://github.com/jemalloc/jemalloc/releases/download/$(JEMALLOC_VERSION)
+JEMALLOC_LICENSE = BSD-2-Clause
 JEMALLOC_LICENSE_FILES = COPYING
 JEMALLOC_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/jimtcl/jimtcl.mk b/bsp/buildroot/package/jimtcl/jimtcl.mk
index 1c1a6b82..389a72ab 100644
--- a/bsp/buildroot/package/jimtcl/jimtcl.mk
+++ b/bsp/buildroot/package/jimtcl/jimtcl.mk
@@ -8,7 +8,7 @@ JIMTCL_VERSION = 0.75
 JIMTCL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/jimtcl
 JIMTCL_SOURCE = jimtcl_$(JIMTCL_VERSION).orig.tar.xz
 JIMTCL_INSTALL_STAGING = YES
-JIMTCL_LICENSE = BSD-2c
+JIMTCL_LICENSE = BSD-2-Clause
 JIMTCL_LICENSE_FILES = LICENSE
 
 JIMTCL_HEADERS_TO_INSTALL = \
@@ -17,7 +17,7 @@ JIMTCL_HEADERS_TO_INSTALL = \
 	jim-signal.h \
 	jim-subcmd.h \
 	jim-win32compat.h \
-	jim-config.h \
+	jim-config.h
 
 ifeq ($(BR2_PACKAGE_TCL),)
 define JIMTCL_LINK_TCLSH
@@ -38,10 +38,22 @@ define JIMTCL_INSTALL_LIB
 endef
 endif
 
+# build system doesn't use autotools, but does use an old version of
+# gnuconfig which doesn't know all the architectures supported by
+# Buildroot, so update config.guess / config.sub like we do in
+# pkg-autotools.mk
+JIMTCL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
+
+# jimtcl really wants to find a existing $CXX, so feed it false
+# when we do not have one.
 define JIMTCL_CONFIGURE_CMDS
 	(cd $(@D); \
-		$(TARGET_CONFIGURE_OPTS) CCACHE=none \
+		$(TARGET_CONFIGURE_OPTS) \
+		CCACHE=none \
+		$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
 		./configure --prefix=/usr \
+		--host=$(GNU_TARGET_NAME) \
+		--build=$(GNU_HOST_NAME) \
 		$(JIMTCL_SHARED) \
 	)
 endef
diff --git a/bsp/buildroot/package/jo/Config.in b/bsp/buildroot/package/jo/Config.in
new file mode 100644
index 00000000..c5532c21
--- /dev/null
+++ b/bsp/buildroot/package/jo/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_JO
+	bool "jo"
+	help
+	  Command-line processor to output JSON from a shell
+
+	  https://github.com/jpmens/jo
diff --git a/bsp/buildroot/package/jo/jo.hash b/bsp/buildroot/package/jo/jo.hash
new file mode 100644
index 00000000..736b0fb8
--- /dev/null
+++ b/bsp/buildroot/package/jo/jo.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 63ed4766c2e0fcb5391a14033930329369f437d7060a11d82874e57e278bda5f  jo-1.1.tar.gz
diff --git a/bsp/buildroot/package/jo/jo.mk b/bsp/buildroot/package/jo/jo.mk
new file mode 100644
index 00000000..ad085b29
--- /dev/null
+++ b/bsp/buildroot/package/jo/jo.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# jo
+#
+################################################################################
+
+JO_VERSION = 1.1
+JO_SITE = https://github.com/jpmens/jo/releases/download/v$(JO_VERSION)
+JO_LICENSE = MIT (json.[ch]), GPL-2.0+ (rest)
+JO_LICENSE_FILES = COPYING
+# don't build man pages
+JO_CONF_ENV = ac_cv_path_PANDOC=''
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/joe/0001-disable-bessel-functions-on-uclibc.patch b/bsp/buildroot/package/joe/0001-disable-bessel-functions-on-uclibc.patch
deleted file mode 100644
index 9f7b72c1..00000000
--- a/bsp/buildroot/package/joe/0001-disable-bessel-functions-on-uclibc.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-[PATCH] uClibc can be (and by default is) configured without bessel functions
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- umath.c |   10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-Index: joe-3.7/umath.c
-===================================================================
---- joe-3.7.orig/umath.c
-+++ joe-3.7/umath.c
-@@ -7,6 +7,12 @@
-  */
- #include "types.h"
- 
-+/* uClibc can be configured without bessel functions */
-+#include <features.h>
-+#if defined (__UCLIBC__) && !defined(__DO_XSI_MATH__)
-+#define NO_BESSEL
-+#endif
-+
- unsigned char *merr;
- 
- int mode_hex;
-@@ -396,10 +402,12 @@
- double m_fabs(double n) { return fabs(n); }
- double m_erf(double n) { return erf(n); }
- double m_erfc(double n) { return erfc(n); }
-+#ifndef NO_BESSEL
- double m_j0(double n) { return j0(n); }
- double m_j1(double n) { return j1(n); }
- double m_y0(double n) { return y0(n); }
- double m_y1(double n) { return y1(n); }
-+#endif
- 
- double calc(BW *bw, unsigned char *s)
- {
-@@ -434,10 +442,12 @@
- 		v = get(USTR "abs"); v->func = m_fabs;
- 		v = get(USTR "erf"); v->func = m_erf;
- 		v = get(USTR "erfc"); v->func = m_erfc;
-+#ifndef NO_BESSEL
- 		v = get(USTR "j0"); v->func = m_j0;
- 		v = get(USTR "j1"); v->func = m_j1;
- 		v = get(USTR "y0"); v->func = m_y0;
- 		v = get(USTR "y1"); v->func = m_y1;
-+#endif
- 	}
- 
- 	v = get(USTR "top");
diff --git a/bsp/buildroot/package/joe/Config.in b/bsp/buildroot/package/joe/Config.in
index eabfae78..c9dd967b 100644
--- a/bsp/buildroot/package/joe/Config.in
+++ b/bsp/buildroot/package/joe/Config.in
@@ -4,18 +4,18 @@ config BR2_PACKAGE_JOE
 	help
 	  Joe's Own Editor
 
-	  JOE is an easy-to-use, full featured terminal-based screen editor.
-	  Its behavior is a blending of WordStar and GNU-EMACS (but it does
-	  not use code from either program). It is a great editor for new
-	  users or as an alternative to vi.
+	  JOE is an easy-to-use, full featured terminal-based screen
+	  editor. Its behavior is a blending of WordStar and GNU-EMACS
+	  (but it does not use code from either program).
+	  It is a great editor for new users or as an alternative to vi.
 
 	  http://joe-editor.sf.net
 
 config BR2_PACKAGE_JOE_FULL
 	bool "full install of rc and syntax highlighting files"
-	depends on BR2_PACKAGE_JOE
 	default y
+	depends on BR2_PACKAGE_JOE
 	help
-	  Install all rc and syntax highlighting files. Without this option
-	  only the joe binary is installed, which contains a default
-	  configuration.
+	  Install all rc and syntax highlighting files. Without this
+	  option only the joe binary is installed, which contains a
+	  default configuration.
diff --git a/bsp/buildroot/package/joe/joe.hash b/bsp/buildroot/package/joe/joe.hash
index 664410d1..0a9c1fb8 100644
--- a/bsp/buildroot/package/joe/joe.hash
+++ b/bsp/buildroot/package/joe/joe.hash
@@ -1,2 +1,5 @@
+# From https://sourceforge.net/projects/joe-editor/files/JOE%20sources/joe-4.4/
+sha1 aedf1ac9e6b91053aa26c70e7bba5bbd8136f033  joe-4.4.tar.gz
+md5 59e63debe60b456a6ee5c0c27a756a47  joe-4.4.tar.gz
 # Locally computed:
-sha256  cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f  joe-3.7.tar.gz
+sha256 a5704828bbca29acb9e200414fef522c66cdf9ce28150f402d6767da43460979  joe-4.4.tar.gz
diff --git a/bsp/buildroot/package/joe/joe.mk b/bsp/buildroot/package/joe/joe.mk
index e86007e0..3d0e9f77 100644
--- a/bsp/buildroot/package/joe/joe.mk
+++ b/bsp/buildroot/package/joe/joe.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-JOE_VERSION = 3.7
+JOE_VERSION = 4.4
 JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION)
-JOE_LICENSE = GPLv1+
+JOE_LICENSE = GPL-1.0+
 JOE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
@@ -18,7 +18,7 @@ endif
 
 ifneq ($(BR2_PACKAGE_JOE_FULL),y)
 define JOE_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/joe $(TARGET_DIR)/usr/bin/joe
+	$(INSTALL) -m 0755 -D $(@D)/joe/joe $(TARGET_DIR)/usr/bin/joe
 endef
 endif
 
diff --git a/bsp/buildroot/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch b/bsp/buildroot/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch
new file mode 100644
index 00000000..0bd259ad
--- /dev/null
+++ b/bsp/buildroot/package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch
@@ -0,0 +1,71 @@
+From 591fc6da944ffc29936e0019b2bc225ddc81dbba Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 20 Nov 2017 22:48:33 +0100
+Subject: [PATCH] lib/hsh.c: rename hsh local variable
+
+The hsh local variable name conflicts with the function prototype of
+hsh() in hsh.h, causing the following build issues with old compilers
+(gcc 4.7):
+
+hsh.c: In function 'hsh':
+hsh.c:28:21: error: declaration of 'hsh' shadows a global declaration [-Werror=shadow]
+hsh.c:26:1: error: shadowed declaration is here [-Werror=shadow]
+hsh.c: In function 'hsh_buf':
+hsh.c:60:21: error: declaration of 'hsh' shadows a global declaration [-Werror=shadow]
+hsh.c:26:1: error: shadowed declaration is here [-Werror=shadow]
+
+Therefore, we rename this local variable to _hsh.
+
+Submitted-upstream: https://github.com/latchset/jose/pull/51
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ lib/hsh.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/hsh.c b/lib/hsh.c
+index c59a95f..a2a891b 100644
+--- a/lib/hsh.c
++++ b/lib/hsh.c
+@@ -25,7 +25,7 @@
+ json_t *
+ hsh(jose_cfg_t *cfg, const char *alg, const void *data, size_t dlen)
+ {
+-    jose_io_auto_t *hsh = NULL;
++    jose_io_auto_t *_hsh = NULL;
+     jose_io_auto_t *enc = NULL;
+     jose_io_auto_t *buf = NULL;
+     char b[1024] = {};
+@@ -33,8 +33,8 @@ hsh(jose_cfg_t *cfg, const char *alg, const void *data, size_t dlen)
+ 
+     buf = jose_io_buffer(cfg, b, &l);
+     enc = jose_b64_enc_io(buf);
+-    hsh = hsh_io(cfg, alg, enc);
+-    if (!buf || !enc || !hsh || !hsh->feed(hsh, data, dlen) || !hsh->done(hsh))
++    _hsh = hsh_io(cfg, alg, enc);
++    if (!buf || !enc || !_hsh || !_hsh->feed(_hsh, data, dlen) || !_hsh->done(_hsh))
+         return NULL;
+ 
+     return json_stringn(b, l);
+@@ -57,7 +57,7 @@ hsh_buf(jose_cfg_t *cfg, const char *alg,
+         const void *data, size_t dlen, void *hash, size_t hlen)
+ {
+     const jose_hook_alg_t *a = NULL;
+-    jose_io_auto_t *hsh = NULL;
++    jose_io_auto_t *_hsh = NULL;
+     jose_io_auto_t *buf = NULL;
+ 
+     a = jose_hook_alg_find(JOSE_HOOK_ALG_KIND_HASH, alg);
+@@ -71,8 +71,8 @@ hsh_buf(jose_cfg_t *cfg, const char *alg,
+         return SIZE_MAX;
+ 
+     buf = jose_io_buffer(cfg, hash, &hlen);
+-    hsh = a->hash.hsh(a, cfg, buf);
+-    if (!buf || !hsh || !hsh->feed(hsh, data, dlen) || !hsh->done(hsh))
++    _hsh = a->hash.hsh(a, cfg, buf);
++    if (!buf || !_hsh || !_hsh->feed(_hsh, data, dlen) || !_hsh->done(_hsh))
+         return SIZE_MAX;
+ 
+     return hlen;
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/jose/0002-configure-fix-build-with-old-compilers.patch b/bsp/buildroot/package/jose/0002-configure-fix-build-with-old-compilers.patch
new file mode 100644
index 00000000..0484f38f
--- /dev/null
+++ b/bsp/buildroot/package/jose/0002-configure-fix-build-with-old-compilers.patch
@@ -0,0 +1,165 @@
+From 98e9faa4d39cd5b6aaab882877e19ae394ba3810 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 20 Nov 2017 23:10:38 +0100
+Subject: [PATCH] configure: fix build with old compilers
+
+Old gcc versions (gcc 4.7) do not support all warnings flags currently
+hard-coded by configure.ac. In order to fix this, we import the
+AX_CHECK_COMPILE_FLAG() macro from the autoconf-archive, and use it in
+the configure.ac to only use warning flags when the compiler supports
+them.
+
+Submitted-upstream: https://github.com/latchset/jose/pull/51
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac                | 46 +++++++++++++++-------------
+ m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 105 insertions(+), 22 deletions(-)
+ create mode 100644 m4/ax_check_compile_flag.m4
+
+diff --git a/configure.ac b/configure.ac
+index cf8c9a6..6fe4ded 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,6 @@
+ AC_PREREQ(2.62)
+ AC_INIT(jose, 10)
++AC_CONFIG_MACRO_DIRS([m4])
+ AC_CANONICAL_SYSTEM
+ AC_PROG_CC_C99
+ 
+@@ -18,27 +19,30 @@ PKG_CHECK_MODULES([libcrypto], [libcrypto >= 1.0.2])
+ AC_OPENMP
+ AC_SUBST([OPENMP_CFLAGS])
+ 
+-JOSE_CFLAGS="\
+--Wall \
+--Wextra \
+--Werror \
+--Wstrict-aliasing \
+--Wchar-subscripts \
+--Wformat-security \
+--Wmissing-declarations \
+--Wmissing-prototypes \
+--Wnested-externs \
+--Wpointer-arith \
+--Wshadow \
+--Wsign-compare \
+--Wstrict-prototypes \
+--Wtype-limits \
+--Wunused-function \
+--Wno-missing-field-initializers \
+--Wno-unused-command-line-argument \
+--Wno-unused-parameter \
+--Wno-unknown-pragmas \
+-"
++for flag in \
++    -Wall \
++    -Wextra \
++    -Werror \
++    -Wstrict-aliasing \
++    -Wchar-subscripts \
++    -Wformat-security \
++    -Wmissing-declarations \
++    -Wmissing-prototypes \
++    -Wnested-externs \
++    -Wpointer-arith \
++    -Wshadow \
++    -Wsign-compare \
++    -Wstrict-prototypes \
++    -Wtype-limits \
++    -Wunused-function \
++    -Wno-missing-field-initializers \
++    -Wno-unused-command-line-argument \
++    -Wno-unused-parameter \
++    -Wno-unknown-pragmas ; do
++    AX_CHECK_COMPILE_FLAG([${flag}],
++		[JOSE_CFLAGS="${JOSE_CFLAGS} ${flag}"])
++done
++
+ AC_SUBST([JOSE_CFLAGS])
+ 
+ AC_MSG_CHECKING([for linker script support])
+diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4
+new file mode 100644
+index 0000000..dcabb92
+--- /dev/null
++++ b/m4/ax_check_compile_flag.m4
+@@ -0,0 +1,74 @@
++# ===========================================================================
++#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
++#
++# DESCRIPTION
++#
++#   Check whether the given FLAG works with the current language's compiler
++#   or gives an error.  (Warnings, however, are ignored)
++#
++#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
++#   success/failure.
++#
++#   If EXTRA-FLAGS is defined, it is added to the current language's default
++#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
++#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
++#   force the compiler to issue an error when a bad flag is given.
++#
++#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
++#
++#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
++#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
++#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 5
++
++AC_DEFUN([AX_CHECK_COMPILE_FLAG],
++[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
++AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
++AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
++  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
++  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
++  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
++    [AS_VAR_SET(CACHEVAR,[yes])],
++    [AS_VAR_SET(CACHEVAR,[no])])
++  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
++AS_VAR_IF(CACHEVAR,yes,
++  [m4_default([$2], :)],
++  [m4_default([$3], :)])
++AS_VAR_POPDEF([CACHEVAR])dnl
++])dnl AX_CHECK_COMPILE_FLAGS
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/jose/Config.in b/bsp/buildroot/package/jose/Config.in
new file mode 100644
index 00000000..4a9ed8da
--- /dev/null
+++ b/bsp/buildroot/package/jose/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_JOSE
+	bool "jose"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_JANSSON
+	select BR2_PACKAGE_OPENSSL
+	help
+	  C-language implementation of Javascript Object Signing and
+	  Encryption.
+
+	  https://github.com/latchset/jose
+
+comment "jose needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/jose/jose.hash b/bsp/buildroot/package/jose/jose.hash
new file mode 100644
index 00000000..376bc0b5
--- /dev/null
+++ b/bsp/buildroot/package/jose/jose.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 5c9cdcfb535c4d9f781393d7530521c72b1dd81caa9934cab6dd752cc7efcd72  jose-10.tar.bz2
+sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b  COPYING
diff --git a/bsp/buildroot/package/jose/jose.mk b/bsp/buildroot/package/jose/jose.mk
new file mode 100644
index 00000000..2758d408
--- /dev/null
+++ b/bsp/buildroot/package/jose/jose.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# jose
+#
+################################################################################
+
+JOSE_VERSION = 10
+JOSE_SOURCE = jose-$(JOSE_VERSION).tar.bz2
+JOSE_SITE = https://github.com/latchset/jose/releases/download/v$(JOSE_VERSION)
+JOSE_LICENSE = Apache-2.0
+JOSE_LICENSE_FILES = COPYING
+# 0002-configure-fix-build-with-old-compilers.patch
+JOSE_AUTORECONF = YES
+JOSE_INSTALL_STAGING = YES
+JOSE_DEPENDENCIES = host-pkgconf zlib jansson openssl
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.hash b/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.hash
index 93b245eb..11b323b8 100644
--- a/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.hash
+++ b/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.hash
@@ -1,5 +1,7 @@
-# From http://sourceforge.net/projects/libjpeg-turbo/files/1.5.1/
-sha1	ebb3f9e94044c77831a3e8c809c7ea7506944622	libjpeg-turbo-1.5.1.tar.gz
-md5	55deb139b0cac3c8200b75d485fc13f3	libjpeg-turbo-1.5.1.tar.gz
+# From https://sourceforge.net/projects/libjpeg-turbo/files/1.5.2/
+sha1 e788f6defa58b4393a5e1685c018f3b962971457  libjpeg-turbo-1.5.2.tar.gz
+md5 6b4923e297a7eaa255f08511017a8818  libjpeg-turbo-1.5.2.tar.gz
 # Locally computed
-sha256 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c  libjpeg-turbo-1.5.1.tar.gz
+sha256 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528  libjpeg-turbo-1.5.2.tar.gz
+sha256 5c08657eda60b7946a913ee22ac73603335a468a6aa95204506a1586a8d677ee  LICENSE.md
+sha256 53a3e3c299e08856964f4c5986e242c3695837b73c64625092f70c774e8af5d2  README.ijg
diff --git a/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.mk b/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.mk
index e2b7e63b..d52ab916 100644
--- a/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.mk
+++ b/bsp/buildroot/package/jpeg-turbo/jpeg-turbo.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-JPEG_TURBO_VERSION = 1.5.1
+JPEG_TURBO_VERSION = 1.5.2
 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz
-JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
-JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like)
-JPEG_TURBO_LICENSE_FILES = LICENSE.md
+JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION)
+JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD)
+JPEG_TURBO_LICENSE_FILES = LICENSE.md README.ijg
 JPEG_TURBO_INSTALL_STAGING = YES
 JPEG_TURBO_PROVIDES = jpeg
 JPEG_TURBO_DEPENDENCIES = host-pkgconf
diff --git a/bsp/buildroot/package/jq/Config.in b/bsp/buildroot/package/jq/Config.in
index 9329b2fb..321cbe8b 100644
--- a/bsp/buildroot/package/jq/Config.in
+++ b/bsp/buildroot/package/jq/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_JQ
 	bool "jq"
 	help
-	  jq is like sed for JSON data - you can use it to slice and filter
-	  and map and transform structured data with the same ease that sed,
-	  awk, grep and friends let you play with text.
+	  jq is like sed for JSON data - you can use it to slice and
+	  filter and map and transform structured data with the same
+	  ease that sed, awk, grep and friends let you play with text.
 
 	  http://stedolan.github.io/jq/
diff --git a/bsp/buildroot/package/jq/Config.in.host b/bsp/buildroot/package/jq/Config.in.host
index a0aabc0b..9fc0e990 100644
--- a/bsp/buildroot/package/jq/Config.in.host
+++ b/bsp/buildroot/package/jq/Config.in.host
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_HOST_JQ
 	bool "host jq"
 	help
-	  jq is like sed for JSON data - you can use it to slice and filter
-	  and map and transform structured data with the same ease that sed,
-	  awk, grep and friends let you play with text.
+	  jq is like sed for JSON data - you can use it to slice and
+	  filter and map and transform structured data with the same
+	  ease that sed, awk, grep and friends let you play with text.
 
-	  As a host tool, jq can be useful to create/edit/merge/check JSON
-	  files from a post-build script.
+	  As a host tool, jq can be useful to create/edit/merge/check
+	  JSON files from a post-build script.
 
 	  http://stedolan.github.io/jq/
diff --git a/bsp/buildroot/package/jq/jq.mk b/bsp/buildroot/package/jq/jq.mk
index 659b8dc8..79629faa 100644
--- a/bsp/buildroot/package/jq/jq.mk
+++ b/bsp/buildroot/package/jq/jq.mk
@@ -8,6 +8,7 @@ JQ_VERSION = 1.5
 JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION)
 JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
 JQ_LICENSE_FILES = COPYING
+JQ_INSTALL_STAGING = YES
 
 # uses c99 specific features
 # _GNU_SOURCE added to fix gcc6+ host compilation
diff --git a/bsp/buildroot/package/jquery-sparkline/jquery-sparkline.mk b/bsp/buildroot/package/jquery-sparkline/jquery-sparkline.mk
index 4a7b94ea..165c2fa9 100644
--- a/bsp/buildroot/package/jquery-sparkline/jquery-sparkline.mk
+++ b/bsp/buildroot/package/jquery-sparkline/jquery-sparkline.mk
@@ -7,7 +7,7 @@
 JQUERY_SPARKLINE_VERSION = 2.1.2
 JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION)
 JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js
-JQUERY_SPARKLINE_LICENSE = BSD-3c
+JQUERY_SPARKLINE_LICENSE = BSD-3-Clause
 
 define JQUERY_SPARKLINE_EXTRACT_CMDS
 	cp $(DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D)
diff --git a/bsp/buildroot/package/jquery-ui-themes/Config.in b/bsp/buildroot/package/jquery-ui-themes/Config.in
index a7ae11ec..fde30146 100644
--- a/bsp/buildroot/package/jquery-ui-themes/Config.in
+++ b/bsp/buildroot/package/jquery-ui-themes/Config.in
@@ -13,77 +13,77 @@ choice
 	help
 	  Specify the jQuery UI theme to install.
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
-		bool "black-tie"
+config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE
+	bool "black-tie"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
-		bool "blitzer"
+config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER
+	bool "blitzer"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
-		bool "cupertino"
+config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO
+	bool "cupertino"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
-		bool "dark-hive"
+config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE
+	bool "dark-hive"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
-		bool "dot-luv"
+config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV
+	bool "dot-luv"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
-		bool "eggplant"
+config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT
+	bool "eggplant"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
-		bool "excite-bike"
+config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE
+	bool "excite-bike"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
-		bool "flick"
+config BR2_PACKAGE_JQUERY_UI_THEME_FLICK
+	bool "flick"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
-		bool "hot-sneaks"
+config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS
+	bool "hot-sneaks"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
-		bool "humanity"
+config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY
+	bool "humanity"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
-		bool "le-frog"
+config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG
+	bool "le-frog"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
-		bool "mint-choc"
+config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC
+	bool "mint-choc"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
-		bool "overcast"
+config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST
+	bool "overcast"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
-		bool "pepper-grinder"
+config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER
+	bool "pepper-grinder"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
-		bool "redmond"
+config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND
+	bool "redmond"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
-		bool "smoothness"
+config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS
+	bool "smoothness"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
-		bool "south-street"
+config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET
+	bool "south-street"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_START
-		bool "start"
+config BR2_PACKAGE_JQUERY_UI_THEME_START
+	bool "start"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
-		bool "sunny"
+config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY
+	bool "sunny"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
-		bool "swanky-purse"
+config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE
+	bool "swanky-purse"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
-		bool "trontastic"
+config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC
+	bool "trontastic"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
-		bool "ui-darkness"
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS
+	bool "ui-darkness"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
-		bool "ui-lightness"
+config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS
+	bool "ui-lightness"
 
-	config BR2_PACKAGE_JQUERY_UI_THEME_VADER
-		bool "vader"
+config BR2_PACKAGE_JQUERY_UI_THEME_VADER
+	bool "vader"
 
 endchoice
 
diff --git a/bsp/buildroot/package/jquery-ui/Config.in b/bsp/buildroot/package/jquery-ui/Config.in
index a7c0a6df..fd38997e 100644
--- a/bsp/buildroot/package/jquery-ui/Config.in
+++ b/bsp/buildroot/package/jquery-ui/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_JQUERY_UI
 	help
 	  jQuery UI provides abstractions for low-level interaction and
 	  animation, advanced effects and high-level, themeable widgets,
-	  built on top of the jQuery JavaScript Library, that you can use
-	  to build highly interactive web applications.
+	  built on top of the jQuery JavaScript Library, that you can
+	  use to build highly interactive web applications.
 
 	  http://jqueryui.com/
diff --git a/bsp/buildroot/package/jsmin/jsmin.mk b/bsp/buildroot/package/jsmin/jsmin.mk
index a66ba715..84c39a7b 100644
--- a/bsp/buildroot/package/jsmin/jsmin.mk
+++ b/bsp/buildroot/package/jsmin/jsmin.mk
@@ -22,7 +22,7 @@ define HOST_JSMIN_BUILD_CMDS
 endef
 
 define HOST_JSMIN_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/jsmin $(HOST_DIR)/usr/bin/jsmin
+	$(INSTALL) -m 0755 -D $(@D)/jsmin $(HOST_DIR)/bin/jsmin
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/json-c/0001-configure.ac-remove-Werror.patch b/bsp/buildroot/package/json-c/0001-configure.ac-remove-Werror.patch
new file mode 100644
index 00000000..e8776715
--- /dev/null
+++ b/bsp/buildroot/package/json-c/0001-configure.ac-remove-Werror.patch
@@ -0,0 +1,32 @@
+From 79d862ccaabc6620ce4b2783a44d6014ae837df9 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Sun, 31 Dec 2017 00:01:37 +0200
+Subject: [PATCH] configure.ac: remove -Werror
+
+The unconditional _REENTRANT macro causes a warning when building with a
+no-threads toolchain. Remove -Werror to fix the build.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: not upstreamable
+Issue reported upstream: https://github.com/json-c/json-c/issues/396
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 024c5aa0d687..74caa4d99e15 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,7 +165,7 @@ AS_IF([test "x$enable_Bsymbolic" = "xcheck"],
+ AS_IF([test "x$enable_Bsymbolic" = "xyes"], [JSON_BSYMBOLIC_LDFLAGS=-Wl[,]-Bsymbolic-functions])
+ AC_SUBST(JSON_BSYMBOLIC_LDFLAGS)
+ 
+-AX_APPEND_COMPILE_FLAGS([-Wall -Werror -Wcast-qual -Wno-error=deprecated-declarations])
++AX_APPEND_COMPILE_FLAGS([-Wall -Wcast-qual -Wno-error=deprecated-declarations])
+ AX_APPEND_COMPILE_FLAGS([-Wextra -Wwrite-string -Wno-unused-parameter])
+ AX_APPEND_COMPILE_FLAGS([-D_GNU_SOURCE -D_REENTRANT])
+ 
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/json-c/0001-don-t-threat-warnings-as-errors.patch b/bsp/buildroot/package/json-c/0001-don-t-threat-warnings-as-errors.patch
deleted file mode 100644
index 804fb2cd..00000000
--- a/bsp/buildroot/package/json-c/0001-don-t-threat-warnings-as-errors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 2b4a43a94fb988e344f2d7edc74d6a4a5f64571d Mon Sep 17 00:00:00 2001
-From: Sagaert Johan <sagaert.johan@proximus.be>
-Date: Wed, 15 Apr 2015 00:40:46 +0200
-Subject: [PATCH] don't threat warnings as errors
-
-Signed-off-by: Sagaert Johan <sagaert.johan@proximus.be>
----
- Makefile.am.inc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am.inc b/Makefile.am.inc
-index fec591b..5eb461e 100644
---- a/Makefile.am.inc
-+++ b/Makefile.am.inc
-@@ -1,2 +1,2 @@
--AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
-+AM_CFLAGS = -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -std=gnu99 -D_GNU_SOURCE -D_REENTRANT
- 
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/json-c/0002-Link-against-libm-when-needed.patch b/bsp/buildroot/package/json-c/0002-Link-against-libm-when-needed.patch
deleted file mode 100644
index 305b782f..00000000
--- a/bsp/buildroot/package/json-c/0002-Link-against-libm-when-needed.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From ccb15ee3d7e8c925cb3af9ea805feea2863c4f81 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 1 May 2015 12:52:18 +0200
-Subject: [PATCH] Link against libm when needed
-
-In certain C libraries (e.g uClibc), isnan() and related functions are
-implemented in libm, so json-c needs to link against it. This commit
-therefore adds an AC_TRY_LINK() test to check whether a program
-calling isnan() can be properly linked with no special flags. If not,
-we assume linking against libm is needed.
-
-The json-c.pc.in file is also adjusted so that in the case of static
-linking against json-c, -lm is also used.
-
-Submitted upstream: https://github.com/json-c/json-c/pull/182
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 4 ++++
- json-c.pc.in | 3 ++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 99660a4..2a14ccf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -50,6 +50,10 @@ AC_CHECK_DECLS([isinf], [], [], [[#include <math.h>]])
- AC_CHECK_DECLS([_isnan], [], [], [[#include <float.h>]])
- AC_CHECK_DECLS([_finite], [], [], [[#include <float.h>]])
- 
-+if test "$ac_cv_have_decl_isnan" = "yes" ; then
-+   AC_TRY_LINK([#include <math.h>], [float f = 0.0; return isnan(f)], [], [LIBS="$LIBS -lm"])
-+fi
-+
- #check if .section.gnu.warning accepts long strings (for __warn_references)
- AC_LANG_PUSH([C])
- 
-diff --git a/json-c.pc.in b/json-c.pc.in
-index 037739d..05bfbc8 100644
---- a/json-c.pc.in
-+++ b/json-c.pc.in
-@@ -6,6 +6,7 @@ includedir=@includedir@
- Name: json-c
- Description: JSON implementation in C
- Version: @VERSION@
--Requires: 
-+Requires:
-+Libs.private: @LIBS@
- Libs:  -L${libdir} -ljson-c
- Cflags: -I${includedir}/json-c
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/json-c/json-c.hash b/bsp/buildroot/package/json-c/json-c.hash
index 65508955..41e614d6 100644
--- a/bsp/buildroot/package/json-c/json-c.hash
+++ b/bsp/buildroot/package/json-c/json-c.hash
@@ -1,2 +1,4 @@
+# From https://github.com/json-c/json-c/wiki
+sha256 0316780be9ad16c42d7c26b015a784fd5df4b0909fef0aba51cfb13e492ac24d  json-c-0.13.tar.gz
 # Locally calculated
-sha256 99304a4a633f1ee281d6a521155a182824dd995139d5ed6ee5c93093c281092b  json-c-json-c-0.12-20140410.tar.gz
+sha256 74c1e6ca5eba76b54d0ad00d4815c8315c1b3bc45ff99de61d103dc92486284c  COPYING
diff --git a/bsp/buildroot/package/json-c/json-c.mk b/bsp/buildroot/package/json-c/json-c.mk
index 35243f13..450ee8b2 100644
--- a/bsp/buildroot/package/json-c/json-c.mk
+++ b/bsp/buildroot/package/json-c/json-c.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-JSON_C_VERSION = json-c-0.12-20140410
-JSON_C_SITE = $(call github,json-c,json-c,$(JSON_C_VERSION))
+JSON_C_VERSION = 0.13
+JSON_C_SITE = https://s3.amazonaws.com/json-c_releases/releases
 JSON_C_INSTALL_STAGING = YES
-JSON_C_MAKE = $(MAKE1)
-JSON_C_CONF_OPTS = --disable-oldname-compat
-# AUTORECONF is needed because of Makefile.am.inc patch.
-JSON_C_AUTORECONF = YES
 JSON_C_LICENSE = MIT
 JSON_C_LICENSE_FILES = COPYING
 
+# Patching configure.ac
+JSON_C_AUTORECONF = YES
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/json-for-modern-cpp/Config.in b/bsp/buildroot/package/json-for-modern-cpp/Config.in
new file mode 100644
index 00000000..b045cba6
--- /dev/null
+++ b/bsp/buildroot/package/json-for-modern-cpp/Config.in
@@ -0,0 +1,29 @@
+config BR2_PACKAGE_JSON_FOR_MODERN_CPP
+	bool "json-for-modern-cpp"
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  Json for modern c++ has the following desing goals in mind:
+
+	  - Intuitive syntax. In languages such as Python, JSON feels
+	    like a first class data type. All the operator magic of
+	    modern C++ is used to achieve the same feeling in c++.
+
+	  - Trivial integration. The whole code consists of a single
+	    header file json.hpp. That's it. No library, no
+	    subproject, no dependencies, no complex build system. The
+	    class is written in vanilla C++11. All in all, everything
+	    should require no adjustment of compiler flags or project
+	    settings.
+
+	  - Serious testing. The class is heavily unit-tested and
+	    covers 100% of the code, including all exceptional
+	    behavior.  Furthermore, it is checked with Valgrind that
+	    there are no memory leaks. To maintain high quality, the
+	    project is following the Core Infrastructure Initiative
+	    (CII) best practices.
+
+	  https://github.com/nlohmann/json
+
+comment "json-for-modern-cpp needs a toolchain w/ C++, gcc >= 4.9"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/bsp/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash b/bsp/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
new file mode 100644
index 00000000..7f394aae
--- /dev/null
+++ b/bsp/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256	402464cd6d50c81bb6a683d07c537e5a8c4684fd1186826d3aa1385ce6adac13	json-v3.0.1.tar.gz
+sha256	6a6115fc4a7239a135f2dce8d33f94cb8a936b8f608ac0f6699fbac278b0dd5b	LICENSE.MIT
diff --git a/bsp/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk b/bsp/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
new file mode 100644
index 00000000..6413d625
--- /dev/null
+++ b/bsp/buildroot/package/json-for-modern-cpp/json-for-modern-cpp.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# json-for-modern-cpp
+#
+################################################################################
+
+JSON_FOR_MODERN_CPP_VERSION = v3.0.1
+JSON_FOR_MODERN_CPP_SOURCE = json-${JSON_FOR_MODERN_CPP_VERSION}.tar.gz
+JSON_FOR_MODERN_CPP_SITE = $(call github,nlohmann,json,$(JSON_FOR_MODERN_CPP_VERSION))
+JSON_FOR_MODERN_CPP_LICENSE = MIT
+JSON_FOR_MODERN_CPP_LICENSE_FILES = LICENSE.MIT
+JSON_FOR_MODERN_CPP_INSTALL_STAGING = YES
+# header only library
+JSON_FOR_MODERN_CPP_INSTALL_TARGET = NO
+JSON_FOR_MODERN_CPP_CONF_OPTS = -DJSON_BuildTests=OFF
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/json-glib/Config.in b/bsp/buildroot/package/json-glib/Config.in
index ea15295b..9df03d92 100644
--- a/bsp/buildroot/package/json-glib/Config.in
+++ b/bsp/buildroot/package/json-glib/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_JSON_GLIB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  JSON-GLib is a library providing serialization and
 	  deserialization support for the JavaScript Object Notation
diff --git a/bsp/buildroot/package/json-glib/json-glib.hash b/bsp/buildroot/package/json-glib/json-glib.hash
index 2a569393..2f190ab9 100644
--- a/bsp/buildroot/package/json-glib/json-glib.hash
+++ b/bsp/buildroot/package/json-glib/json-glib.hash
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.2.sha256sum
-sha256	ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621	json-glib-1.2.2.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.8.sha256sum
+sha256 fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a  json-glib-1.2.8.tar.xz
diff --git a/bsp/buildroot/package/json-glib/json-glib.mk b/bsp/buildroot/package/json-glib/json-glib.mk
index 305c9acc..5ee43d9a 100644
--- a/bsp/buildroot/package/json-glib/json-glib.mk
+++ b/bsp/buildroot/package/json-glib/json-glib.mk
@@ -5,15 +5,15 @@
 ################################################################################
 
 JSON_GLIB_VERSION_MAJOR = 1.2
-JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).2
+JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).8
 JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR)
 JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz
-JSON_GLIB_LICENSE = LGPLv2.1+
+JSON_GLIB_LICENSE = LGPL-2.1+
 JSON_GLIB_LICENSE_FILES = COPYING
 JSON_GLIB_INSTALL_STAGING = YES
 
 JSON_GLIB_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	libglib2
 
diff --git a/bsp/buildroot/package/jsoncpp/Config.in b/bsp/buildroot/package/jsoncpp/Config.in
index 83118c40..a6c6b919 100644
--- a/bsp/buildroot/package/jsoncpp/Config.in
+++ b/bsp/buildroot/package/jsoncpp/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_JSONCPP
+	bool "jsoncpp"
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
 	depends on BR2_INSTALL_LIBSTDCPP
-	bool "jsoncpp"
 	help
 	  JsonCpp is a C++ library that allows manipulating JSON
 	  values, including serialization and deserialization to and
diff --git a/bsp/buildroot/package/jsoncpp/jsoncpp.hash b/bsp/buildroot/package/jsoncpp/jsoncpp.hash
index 504357f1..09ceb585 100644
--- a/bsp/buildroot/package/jsoncpp/jsoncpp.hash
+++ b/bsp/buildroot/package/jsoncpp/jsoncpp.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  087640ebcf7fbcfe8e2717a0b9528fff89c52fcf69fa2a18cc2b538008098f97  jsoncpp-1.7.7.tar.gz
+sha256  3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f  jsoncpp-1.8.3.tar.gz
diff --git a/bsp/buildroot/package/jsoncpp/jsoncpp.mk b/bsp/buildroot/package/jsoncpp/jsoncpp.mk
index a9694411..6dfaecef 100644
--- a/bsp/buildroot/package/jsoncpp/jsoncpp.mk
+++ b/bsp/buildroot/package/jsoncpp/jsoncpp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-JSONCPP_VERSION = 1.7.7
+JSONCPP_VERSION = 1.8.3
 JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION))
 JSONCPP_LICENSE = Public Domain or MIT
 JSONCPP_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/kbd/0001-add-configure-flag-to-disable-tests.patch b/bsp/buildroot/package/kbd/0001-add-configure-flag-to-disable-tests.patch
deleted file mode 100644
index 28983e97..00000000
--- a/bsp/buildroot/package/kbd/0001-add-configure-flag-to-disable-tests.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From baeb5aa827d956bd06492775dc5bd9f89d394149 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 13 Jul 2015 23:38:41 -0400
-Subject: [PATCH] add configure flag to disable tests
-
-The tests require the check package to be installed.  There is a configure
-test for this package (which is good), but it's unconditional (which is
-bad) as it means you can't even build & install kbd w/out the check
-package being installed.
-
-URL: https://bugs.gentoo.org/485116
-Reported-by: Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com>
----
- Makefile.am  |  5 ++++-
- configure.ac | 17 +++++++++++++++--
- 2 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 89c7e83..f855110 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,7 +8,10 @@ EXTRA_DIST = \
- 	CREDITS \
- 	contrib docs rc
- 
--SUBDIRS = src data po tests docs
-+SUBDIRS = src data po docs
-+if BUILD_TESTS
-+SUBDIRS += tests
-+endif
- 
- kbd-$(VERSION).tar.xz:
- 	make distcheck
-diff --git a/configure.ac b/configure.ac
-index d0b462b..f659758 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -10,8 +10,21 @@ AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz])
- AC_CONFIG_SRCDIR([src/loadkeys.c])
- AC_CONFIG_HEADERS(config.h)
--
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+PKG_PROG_PKG_CONFIG
-+
-+AC_ARG_ENABLE(tests,
-+	[AS_HELP_STRING([--disable-tests], [do not build tests])],
-+	[build_tests=$enableval], [build_tests=auto])
-+if test "$build_tests" != "no"; then
-+	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4],
-+		[build_tests="yes"], [
-+			if test "$build_tests" = "yes"; then
-+				AC_MSG_ERROR([tests requested, but check package is missing])
-+			fi
-+			build_tests="no"
-+		])
-+fi
-+AM_CONDITIONAL(BUILD_TESTS, test "$build_tests" != "no")
- 
- m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
- AM_SILENT_RULES([yes])
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/kbd/0002-Link-against-libintl-when-needed.patch b/bsp/buildroot/package/kbd/0002-Link-against-libintl-when-needed.patch
deleted file mode 100644
index d28f0c80..00000000
--- a/bsp/buildroot/package/kbd/0002-Link-against-libintl-when-needed.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 008e7dc0ae46281360be62b7d69cd13e0a7f7e14 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 7 Feb 2016 18:24:35 +0100
-Subject: [PATCH] Link against libintl when needed
-
-Since the kbd code uses gettext functionality, it should link with the
-libintl library using the @INTLLIBS@ symbol provided by the gettext m4
-macro. This is necessary on C libraries that don't provide a built-in
-gettext functionality, and rely on the libintl library provided by
-gettext, as is the case with the uClibc C library.
-
-@INTLLIBS@ is empty when linking a separate library is not needed, as
-is the case with the glibc C library.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/Makefile.am   | 2 +-
- tests/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 40e8083..d4e0583 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -80,7 +80,7 @@ mapscrn_CFLAGS = -DMAIN
- loadunimap_CFLAGS = -DMAIN
- 
- noinst_LIBRARIES = libcommon.a libfont.a
--LDADD = libcommon.a libfont.a libkeymap/libkeymap.la
-+LDADD = libcommon.a libfont.a libkeymap/libkeymap.la @INTLLIBS@
- 
- install-exec-hook:
- 	for i in psfaddtable psfgettable psfstriptable; do \
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 1976333..848fd31 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
- 	-DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\"
- 
- AM_CFLAGS = $(CHECK_CFLAGS)
--LDADD  = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS)
-+LDADD  = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@
- 
- EXTRA_DIST = \
- 	alt-is-meta.in \
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/kbd/Config.in b/bsp/buildroot/package/kbd/Config.in
index 44c31633..6cf2fc0d 100644
--- a/bsp/buildroot/package/kbd/Config.in
+++ b/bsp/buildroot/package/kbd/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KBD
 	bool "kbd"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	# Uses fork()
 	depends on BR2_USE_MMU
 	help
diff --git a/bsp/buildroot/package/kbd/kbd.hash b/bsp/buildroot/package/kbd/kbd.hash
index 39a4cddb..3fed6ace 100644
--- a/bsp/buildroot/package/kbd/kbd.hash
+++ b/bsp/buildroot/package/kbd/kbd.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc
-sha256	7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e	kbd-2.0.3.tar.xz
+sha256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88  kbd-2.0.4.tar.xz
diff --git a/bsp/buildroot/package/kbd/kbd.mk b/bsp/buildroot/package/kbd/kbd.mk
index 0243c532..c32d82a3 100644
--- a/bsp/buildroot/package/kbd/kbd.mk
+++ b/bsp/buildroot/package/kbd/kbd.mk
@@ -4,18 +4,17 @@
 #
 ################################################################################
 
-KBD_VERSION = 2.0.3
+KBD_VERSION = 2.0.4
 KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz
 KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd
 KBD_CONF_OPTS = \
 	--disable-vlock \
 	--disable-tests
 KBD_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf
-KBD_LICENSE = GPLv2+
+KBD_LICENSE = GPL-2.0+
 KBD_LICENSE_FILES = COPYING
-KBD_AUTORECONF = YES
 
 KBD_INSTALL_TARGET_OPTS = MKINSTALLDIRS=$(@D)/config/mkinstalldirs DESTDIR=$(TARGET_DIR) install
 
diff --git a/bsp/buildroot/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch b/bsp/buildroot/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch
new file mode 100644
index 00000000..b5f21cb4
--- /dev/null
+++ b/bsp/buildroot/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch
@@ -0,0 +1,59 @@
+From 15f93dd90484532e25c8f3e43fb34a361a79d7f2 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 9 Feb 2018 11:55:19 +0200
+Subject: [PATCH] Fix build with Linux kernel headers v4.15
+
+Linux kernel version 4.15 changed the libc/kernel headers suppression
+logic in a way that introduces collisions:
+
+In file included from ./../include/vrrp_ipaddress.h:32:0,
+                 from ./../include/vrrp_arp.h:31,
+                 from vrrp.c:29:
+/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP'
+   IPPROTO_IP = 0,  /* Dummy protocol for TCP  */
+   ^
+/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here
+     IPPROTO_IP = 0,    /* Dummy protocol for TCP.  */
+     ^~~~~~~~~~
+
+Include the libc netinet/in.h header first to suppress the kernel
+header.
+
+In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo
+definition.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/acassen/keepalived/pull/777
+
+ keepalived/include/vrrp_arp.h | 1 +
+ keepalived/vrrp/vrrp.c        | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h
+index 77a26c450b12..a103ab075c1d 100644
+--- a/keepalived/include/vrrp_arp.h
++++ b/keepalived/include/vrrp_arp.h
+@@ -24,6 +24,7 @@
+ #define _VRRP_ARP_H
+ 
+ /* system includes */
++#include <netinet/in.h>
+ #include <net/ethernet.h>
+ #include <net/if_arp.h>
+ 
+diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
+index 3d2bfe41ab4f..435a4b54b2a9 100644
+--- a/keepalived/vrrp/vrrp.c
++++ b/keepalived/vrrp/vrrp.c
+@@ -26,6 +26,7 @@
+ #include "config.h"
+ 
+ /* local include */
++#define _GNU_SOURCE
+ #include "vrrp_arp.h"
+ #include "vrrp_ndisc.h"
+ #include "vrrp_scheduler.h"
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/keepalived/Config.in b/bsp/buildroot/package/keepalived/Config.in
new file mode 100644
index 00000000..0140e62a
--- /dev/null
+++ b/bsp/buildroot/package/keepalived/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_KEEPALIVED
+	bool "keepalived"
+	depends on BR2_USE_MMU
+	depends on !BR2_STATIC_LIBS # uses libdl
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_POPT
+	help
+	  The main goal of the keepalived project is to add a strong &
+	  robust keepalive facility to the Linux Virtual Server
+	  project. It implements a multilayer TCP/IP stack
+	  checks. Keepalived implements a framework based on three
+	  family checks: Layer3, Layer4 & Layer5. This framework gives
+	  the daemon the ability of checking a LVS server pool
+	  states. Keepalived can be sumarize as a LVS driving daemon.
+
+	  http://www.keepalived.org/
+
+comment "keepalived needs a toolchain w/ dynamic library, headers >= 3.4"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
diff --git a/bsp/buildroot/package/keepalived/keepalived.hash b/bsp/buildroot/package/keepalived/keepalived.hash
new file mode 100644
index 00000000..5d33c5be
--- /dev/null
+++ b/bsp/buildroot/package/keepalived/keepalived.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048  keepalived-1.3.5.tar.gz
diff --git a/bsp/buildroot/package/keepalived/keepalived.mk b/bsp/buildroot/package/keepalived/keepalived.mk
new file mode 100644
index 00000000..59d3cb5c
--- /dev/null
+++ b/bsp/buildroot/package/keepalived/keepalived.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# keepalived
+#
+################################################################################
+
+KEEPALIVED_VERSION = 1.3.5
+KEEPALIVED_SITE = http://www.keepalived.org/software
+KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
+KEEPALIVED_LICENSE = GPL-2.0+
+KEEPALIVED_LICENSE_FILES = COPYING
+KEEPALIVED_CONF_OPTS += --disable-dbus
+
+ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
+KEEPALIVED_DEPENDENCIES += libnl libnfnetlink
+KEEPALIVED_CONF_OPTS += --enable-libnl
+else
+KEEPALIVED_CONF_OPTS += --disable-libnl
+endif
+
+ifeq ($(BR2_PACKAGE_IPSET),y)
+KEEPALIVED_DEPENDENCIES += ipset
+KEEPALIVED_CONF_OPTS += --enable-libipset
+else
+KEEPALIVED_CONF_OPTS += --disable-libipset
+endif
+
+ifeq ($(BR2_PACKAGE_IPTABLES),y)
+KEEPALIVED_DEPENDENCIES += iptables
+KEEPALIVED_CONF_OPTS += --enable-libiptc
+else
+KEEPALIVED_CONF_OPTS += --disable-libiptc
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/kexec-lite/Config.in b/bsp/buildroot/package/kexec-lite/Config.in
index 97748dcc..cd0e30f2 100644
--- a/bsp/buildroot/package/kexec-lite/Config.in
+++ b/bsp/buildroot/package/kexec-lite/Config.in
@@ -9,7 +9,8 @@ config BR2_PACKAGE_KEXEC_LITE
 	select BR2_PACKAGE_DTC_PROGRAMS
 	help
 	  Kexec is a user space utiltity for loading another kernel
-	  and asking the currently running kernel to do something with it.
+	  and asking the currently running kernel to do something with
+	  it.
 
 	  This package is a tiny implementation of the kexec userspace
 	  components, for devicetree-based platforms.
diff --git a/bsp/buildroot/package/kexec-lite/kexec-lite.hash b/bsp/buildroot/package/kexec-lite/kexec-lite.hash
index 0f212241..d71e8d00 100644
--- a/bsp/buildroot/package/kexec-lite/kexec-lite.hash
+++ b/bsp/buildroot/package/kexec-lite/kexec-lite.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 5786ddc0c94ead4fd4a1fded44bb1da0c9bc91af08049fed373ea161603e1e1f  kexec-lite-86e45a47e8cc1f598ccfa9b873a23067f4ecc36f.tar.gz
+sha256 2e9b131324cec9d27840179daa35e3159a4032ff78b74e301850faa007567d0e kexec-lite-87d044a895b1c004320a2676099a54a5a2a74f2e.tar.gz
diff --git a/bsp/buildroot/package/kexec-lite/kexec-lite.mk b/bsp/buildroot/package/kexec-lite/kexec-lite.mk
index b1b66fd8..8e1ad8d5 100644
--- a/bsp/buildroot/package/kexec-lite/kexec-lite.mk
+++ b/bsp/buildroot/package/kexec-lite/kexec-lite.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KEXEC_LITE_VERSION = 86e45a47e8cc1f598ccfa9b873a23067f4ecc36f
+KEXEC_LITE_VERSION = 87d044a895b1c004320a2676099a54a5a2a74f2e
 KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION))
-KEXEC_LITE_LICENSE = GPLv2+
+KEXEC_LITE_LICENSE = GPL-2.0+
 KEXEC_LITE_LICENSE_FILES = COPYING
 KEXEC_LITE_DEPENDENCIES = elfutils dtc
 
diff --git a/bsp/buildroot/package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch b/bsp/buildroot/package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch
deleted file mode 100644
index adaac2f6..00000000
--- a/bsp/buildroot/package/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix musl build
-
-Downloaded from http://patchwork.openembedded.org/patch/112685/
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-
-From d811875a41b4628040abaada3da29b7b9592e757 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 9 Jan 2016 17:16:16 -0800
-Subject: [PATCH] vmcore-dmesg: Define _GNU_SOURCE
-
-loff_t is guarded with _GNU_SOURCE on some C library implementations
-e.g. musl since this type is not defined by POSIX. Define _GNU_SOURCE to
-include this define, it should help compiling on musl while nothing
-changes for glibc based systems since there _GNU_SOURCE is already
-defined
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- vmcore-dmesg/vmcore-dmesg.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c
-index 0364636..a8f56df 100644
---- a/vmcore-dmesg/vmcore-dmesg.c
-+++ b/vmcore-dmesg/vmcore-dmesg.c
-@@ -1,4 +1,5 @@
- #define _XOPEN_SOURCE 600
-+#define _GNU_SOURCE
- #define _LARGEFILE_SOURCE 1
- #define _FILE_OFFSET_BITS 64
- #include <endian.h>
--- 
-2.7.0
-
diff --git a/bsp/buildroot/package/kexec/Config.in b/bsp/buildroot/package/kexec/Config.in
index d92e6b95..c24dff38 100644
--- a/bsp/buildroot/package/kexec/Config.in
+++ b/bsp/buildroot/package/kexec/Config.in
@@ -5,7 +5,8 @@ config BR2_PACKAGE_KEXEC
 		BR2_powerpc || BR2_sh4 || BR2_sh4a
 	help
 	  Kexec is a user space utility for loading another kernel
-	  and asking the currently running kernel to do something with it.
+	  and asking the currently running kernel to do something with
+	  it.
 
 	  https://www.kernel.org/pub/linux/utils/kernel/kexec/
 
diff --git a/bsp/buildroot/package/kexec/kexec.hash b/bsp/buildroot/package/kexec/kexec.hash
index 9039dad4..eaa9d7b9 100644
--- a/bsp/buildroot/package/kexec/kexec.hash
+++ b/bsp/buildroot/package/kexec/kexec.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc
-sha256	ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 kexec-tools-2.0.14.tar.xz
+sha256 5b103351ad752c9badd1d65b00eb6de4bce579f944f4df4e3ef3a755ba567010 kexec-tools-2.0.16.tar.xz
diff --git a/bsp/buildroot/package/kexec/kexec.mk b/bsp/buildroot/package/kexec/kexec.mk
index 0a8e9f03..3ce1ed2e 100644
--- a/bsp/buildroot/package/kexec/kexec.mk
+++ b/bsp/buildroot/package/kexec/kexec.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-KEXEC_VERSION = 2.0.14
+KEXEC_VERSION = 2.0.16
 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
 KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
-KEXEC_LICENSE = GPLv2
+KEXEC_LICENSE = GPL-2.0
 KEXEC_LICENSE_FILES = COPYING
 
-# Makefile expects $STRIP -o to work, so needed for BR2_STRIP_none
+# Makefile expects $STRIP -o to work, so needed for !BR2_STRIP_strip
 KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip"
 
 ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y)
diff --git a/bsp/buildroot/package/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch b/bsp/buildroot/package/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch
deleted file mode 100644
index 88d32b0c..00000000
--- a/bsp/buildroot/package/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-keyutils: Allow building of the shared library to be suppressed
-
-Upstream patch:
-  https://kernel.googlesource.com/pub/scm/linux/kernel/git/dhowells/keyutils/+/a4deb71ddc05e951c8be8d46615beed9d408a5c8
-
-Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
-
-LIB: Allow building of the shared library to be suppressed
-
-Allow building of the shared library to be suppressed by passing NO_SOLIB=1 to
-the Makefile.
-
-Reported-and-tested-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
-Signed-off-by: David Howells <dhowells@redhat.com>
-diff --git a/Makefile b/Makefile
-index c904eaf..5dd2113 100644
---- a/Makefile
-+++ b/Makefile
-@@ -5,6 +5,7 @@
- SPECFILE	:= keyutils.spec
- NO_GLIBC_KEYERR	:= 0
- NO_ARLIB	:= 0
-+NO_SOLIB	:= 0
- ETCDIR		:= /etc
- BINDIR		:= /bin
- SBINDIR		:= /sbin
-@@ -95,7 +96,7 @@
- # Normal build rule
- #
- ###############################################################################
--all: $(DEVELLIB) keyctl request-key key.dns_resolver
-+all: keyctl request-key key.dns_resolver
- 
- ###############################################################################
- #
-@@ -104,20 +105,23 @@
- ###############################################################################
- #RPATH = -Wl,-rpath,$(LIBDIR)
- 
--ifeq ($(NO_ARLIB),0)
--all: $(ARLIB)
--$(ARLIB): keyutils.o
--	$(AR) rcs $@ $<
--endif
--
- VCPPFLAGS	:= -DPKGBUILD="\"$(shell date -u +%F)\""
- VCPPFLAGS	+= -DPKGVERSION="\"keyutils-$(VERSION)\""
- VCPPFLAGS	+= -DAPIVERSION="\"libkeyutils-$(APIVERSION)\""
- 
-+ifeq ($(NO_ARLIB),0)
-+all: $(ARLIB)
-+$(ARLIB): keyutils.o
-+	$(AR) rcs $@ $<
-+
- keyutils.o: keyutils.c keyutils.h Makefile
- 	$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -UNO_GLIBC_KEYERR -o $@ -c $<
-+LIB_DEPENDENCY	:= libkeyutils.a
-+endif
- 
- 
-+ifeq ($(NO_SOLIB),0)
-+all: $(DEVELLIB)
- $(DEVELLIB): $(SONAME)
- 	ln -sf $< $@
- 
-@@ -131,6 +135,8 @@
- 
- keyutils.os: keyutils.c keyutils.h Makefile
- 	$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
-+LIB_DEPENDENCY	:= $(DEVELLIB)
-+endif
- 
- ###############################################################################
- #
-@@ -140,13 +146,13 @@
- %.o: %.c keyutils.h Makefile
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
- 
--keyctl: keyctl.o $(DEVELLIB)
-+keyctl: keyctl.o $(LIB_DEPENDENCY)
- 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
- 
--request-key: request-key.o $(DEVELLIB)
-+request-key: request-key.o $(LIB_DEPENDENCY)
- 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
- 
--key.dns_resolver: key.dns_resolver.o $(DEVELLIB)
-+key.dns_resolver: key.dns_resolver.o $(LIB_DEPENDENCY)
- 	$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
- 
- ###############################################################################
-@@ -158,10 +164,12 @@
- ifeq ($(NO_ARLIB),0)
- 	$(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB)
- endif
-+ifeq ($(NO_SOLIB),0)
- 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
- 	$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
- 	mkdir -p $(DESTDIR)$(USRLIBDIR)
- 	$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
-+endif
- 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
- 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
- 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
diff --git a/bsp/buildroot/package/keyutils/0002-fix-install-rule.patch b/bsp/buildroot/package/keyutils/0001-fix-install-rule.patch
similarity index 100%
rename from bsp/buildroot/package/keyutils/0002-fix-install-rule.patch
rename to bsp/buildroot/package/keyutils/0001-fix-install-rule.patch
diff --git a/bsp/buildroot/package/keyutils/0003-cifs.patch b/bsp/buildroot/package/keyutils/0002-cifs.patch
similarity index 100%
rename from bsp/buildroot/package/keyutils/0003-cifs.patch
rename to bsp/buildroot/package/keyutils/0002-cifs.patch
diff --git a/bsp/buildroot/package/keyutils/0005-Add-missing-limits.h-include.patch b/bsp/buildroot/package/keyutils/0003-Add-missing-limits.h-include.patch
similarity index 100%
rename from bsp/buildroot/package/keyutils/0005-Add-missing-limits.h-include.patch
rename to bsp/buildroot/package/keyutils/0003-Add-missing-limits.h-include.patch
diff --git a/bsp/buildroot/package/keyutils/0004-Makefile-for-buildroot.patch b/bsp/buildroot/package/keyutils/0004-Makefile-for-buildroot.patch
deleted file mode 100644
index 1e19f77d..00000000
--- a/bsp/buildroot/package/keyutils/0004-Makefile-for-buildroot.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile: Don't call "ln" directly
-
-Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
-
---- keyutils-1.5.9/Makefile.orig	2014-09-22 16:05:14.117007430 +0100
-+++ keyutils-1.5.9/Makefile	2014-09-22 16:06:26.053219336 +0100
-@@ -123,10 +123,10 @@ endif
- ifeq ($(NO_SOLIB),0)
- all: $(DEVELLIB)
- $(DEVELLIB): $(SONAME)
--	ln -sf $< $@
-+	$(LNS) $< $@
- 
- $(SONAME): $(LIBNAME)
--	ln -sf $< $@
-+	$(LNS) $< $@
- 
- LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds
- 
diff --git a/bsp/buildroot/package/keyutils/keyutils.hash b/bsp/buildroot/package/keyutils/keyutils.hash
index 21ecae51..b14b7bec 100644
--- a/bsp/buildroot/package/keyutils/keyutils.hash
+++ b/bsp/buildroot/package/keyutils/keyutils.hash
@@ -1,3 +1,2 @@
-# From http://people.redhat.com/~dhowells/keyutils/
-md5	7f8ac985c45086b5fbcd12cecd23cf07	keyutils-1.5.9.tar.bz2
-sha1	cf040adebe25eb466760f34752f4100fd5acb5e7	keyutils-1.5.9.tar.bz2
+# Locally computed
+sha256 115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6  keyutils-1.5.10.tar.bz2
diff --git a/bsp/buildroot/package/keyutils/keyutils.mk b/bsp/buildroot/package/keyutils/keyutils.mk
index 4a8dbace..048b6894 100644
--- a/bsp/buildroot/package/keyutils/keyutils.mk
+++ b/bsp/buildroot/package/keyutils/keyutils.mk
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-KEYUTILS_VERSION = 1.5.9
+KEYUTILS_VERSION = 1.5.10
 KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
 KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
-KEYUTILS_LICENSE = GPLv2+, LGPLv2.1+
+KEYUTILS_LICENSE = GPL-2.0+, LGPL-2.1+
 KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
 KEYUTILS_INSTALL_STAGING = YES
 
-KEYUTILS_MAKE_PARAMS =                    \
-	INSTALL=$(INSTALL)                \
-	LIBDIR=/usr/lib                   \
-	USRLIBDIR=/usr/lib                \
-	CFLAGS="$(TARGET_CFLAGS)"         \
+KEYUTILS_MAKE_PARAMS = \
+	INSTALL=$(INSTALL) \
+	LIBDIR=/usr/lib \
+	USRLIBDIR=/usr/lib \
+	CFLAGS="$(TARGET_CFLAGS)" \
 	CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
 	LNS="$(HOSTLN) -sf"
 
diff --git a/bsp/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch b/bsp/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch
index b579c96d..8d2b9114 100644
--- a/bsp/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch
+++ b/bsp/buildroot/package/kismet/0003-fix-curses-libs-ordering.patch
@@ -14,10 +14,12 @@ at the *front* of the list, not at the end.
 Reported-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+[bernd.kuhls@t-online.de: update for 2016-07-R1]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in
---- kismet-Kismet-2014-02-R1.orig/configure.in	2014-02-19 05:37:43.000000000 +0100
-+++ kismet-Kismet-2014-02-R1/configure.in	2014-12-26 16:46:55.770692349 +0100
+--- kismet-Kismet-2014-02-R1.orig/configure.ac	2014-02-19 05:37:43.000000000 +0100
++++ kismet-Kismet-2014-02-R1/configure.ac	2014-12-26 16:46:55.770692349 +0100
 @@ -437,10 +434,10 @@
  		AC_MSG_ERROR(Failed to find curses.h or ncurses.h.  You probably need to install the curses-devel package from your distribution)
  	fi
@@ -25,7 +27,7 @@ diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/c
 -	LIBS="$LIBS $curseaux"
 +	LIBS="$curseaux $LIBS"
  	AC_CHECK_LIB([panel], [new_panel],
- 				 AC_DEFINE(HAVE_LIBPANEL, 1, Panel terminal lib) 
+ 				 AC_DEFINE(HAVE_LIBPANEL, 1, Panel terminal lib)
 -				 curseaux="$curseaux -lpanel",
 +				 curseaux="-lpanel $curseaux",
  				 AC_MSG_ERROR(Failed to find libpanel extension to curses/ncurses.  Install it, or disable building the Kismet client with --disable-client.  Disabling the client is probably not something you want to do normally.))
diff --git a/bsp/buildroot/package/kismet/0004-no-include-host-paths.patch b/bsp/buildroot/package/kismet/0004-no-include-host-paths.patch
index 1dcf1200..6819bf42 100644
--- a/bsp/buildroot/package/kismet/0004-no-include-host-paths.patch
+++ b/bsp/buildroot/package/kismet/0004-no-include-host-paths.patch
@@ -7,10 +7,12 @@ Remove that directory from the include search dirs.
 
 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+[bernd.kuhls@t-online.de: update for 2016-07-R1]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in
---- kismet-Kismet-2014-02-R1.orig/configure.in	2014-02-19 05:37:43.000000000 +0100
-+++ kismet-Kismet-2014-02-R1/configure.in	2014-12-26 16:46:55.770692349 +0100
+--- kismet-Kismet-2014-02-R1.orig/configure.ac	2014-02-19 05:37:43.000000000 +0100
++++ kismet-Kismet-2014-02-R1/configure.ac	2014-12-26 16:46:55.770692349 +0100
 @@ -406,9 +406,6 @@
  )
  AC_SUBST(wantclient)
diff --git a/bsp/buildroot/package/kismet/kismet.hash b/bsp/buildroot/package/kismet/kismet.hash
index e4dc5a48..913dffc9 100644
--- a/bsp/buildroot/package/kismet/kismet.hash
+++ b/bsp/buildroot/package/kismet/kismet.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 23b693baa29549b051e95e9d597b115bd94f7267c4677307ebd87f2a00e5a52b kismet-Kismet-2014-02-R1.tar.gz
+sha256 bdb21f153311f1ff3b16621bf0d6740f66369bf0982b0a289c9a12af8847e237  kismet-2016-07-R1.tar.xz
diff --git a/bsp/buildroot/package/kismet/kismet.mk b/bsp/buildroot/package/kismet/kismet.mk
index f4a28b86..cee814b5 100644
--- a/bsp/buildroot/package/kismet/kismet.mk
+++ b/bsp/buildroot/package/kismet/kismet.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-KISMET_VERSION = Kismet-2014-02-R1
-KISMET_SITE = http://www.kismetwireless.net/kismet.git
-KISMET_SITE_METHOD = git
+KISMET_VERSION = 2016-07-R1
+KISMET_SOURCE = kismet-$(KISMET_VERSION).tar.xz
+KISMET_SITE = http://www.kismetwireless.net/code
 KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl
 KISMET_CONF_OPTS += --with-netlink-version=3
-KISMET_LICENSE = GPLv2+
+KISMET_LICENSE = GPL-2.0+
 KISMET_LICENSE_FILES = debian/copyright
 
 # We touch configure.in:
diff --git a/bsp/buildroot/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch b/bsp/buildroot/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch
new file mode 100644
index 00000000..09fe2524
--- /dev/null
+++ b/bsp/buildroot/package/kmod/0002-shared-util.c-assert_cc-can-only-be-used-inside-func.patch
@@ -0,0 +1,56 @@
+From 7cd698eb31059012305d8bb7516577c8cd383e32 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 3 Jun 2017 16:52:37 +0200
+Subject: [PATCH] shared/util.c: assert_cc() can only be used inside functions
+
+shared/macro.h has two versions of assert_cc, one that uses gcc
+_Static_assert(), which requires recent enough gcc versions, and one
+that uses a fake array to trigger a build error. The latter can only
+work inside functions, so assert_cc() should only be used inside
+functions.
+
+Fixes the following build failure when building kmod with old gcc
+versions such as gcc 4.3.x:
+
+shared/util.c:52: error: expected identifier or '(' before 'do'
+shared/util.c:52: error: expected identifier or '(' before 'while'
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ shared/util.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/shared/util.c b/shared/util.c
+index 9de080a..fd2028d 100644
+--- a/shared/util.c
++++ b/shared/util.c
+@@ -49,8 +49,6 @@ static const struct kmod_ext {
+ 	{ }
+ };
+ 
+-assert_cc(EAGAIN == EWOULDBLOCK);
+-
+ /* string handling functions and memory allocations                         */
+ /* ************************************************************************ */
+ 
+@@ -201,6 +199,8 @@ ssize_t read_str_safe(int fd, char *buf, size_t buflen)
+ 	size_t todo = buflen - 1;
+ 	size_t done = 0;
+ 
++	assert_cc(EAGAIN == EWOULDBLOCK);
++
+ 	do {
+ 		ssize_t r = read(fd, buf + done, todo);
+ 
+@@ -226,6 +226,8 @@ ssize_t write_str_safe(int fd, const char *buf, size_t buflen)
+ 	size_t todo = buflen;
+ 	size_t done = 0;
+ 
++	assert_cc(EAGAIN == EWOULDBLOCK);
++
+ 	do {
+ 		ssize_t r = write(fd, buf + done, todo);
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/kmod/kmod.hash b/bsp/buildroot/package/kmod/kmod.hash
index 8220fd49..be350c42 100644
--- a/bsp/buildroot/package/kmod/kmod.hash
+++ b/bsp/buildroot/package/kmod/kmod.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
-sha256 d303d5519faec9d69e1132f6b37db2579db17a7fb5c1517da0115d03ba168155  kmod-23.tar.xz
+sha256 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397  kmod-24.tar.xz
diff --git a/bsp/buildroot/package/kmod/kmod.mk b/bsp/buildroot/package/kmod/kmod.mk
index 407d90d8..e1149b7b 100644
--- a/bsp/buildroot/package/kmod/kmod.mk
+++ b/bsp/buildroot/package/kmod/kmod.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KMOD_VERSION = 23
+KMOD_VERSION = 24
 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
 KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
 KMOD_INSTALL_STAGING = YES
@@ -12,7 +12,7 @@ KMOD_DEPENDENCIES = host-pkgconf
 HOST_KMOD_DEPENDENCIES = host-pkgconf
 
 # license info for libkmod only, conditionally add more below
-KMOD_LICENSE = LGPLv2.1+ (library)
+KMOD_LICENSE = LGPL-2.1+ (library)
 KMOD_LICENSE_FILES = libkmod/COPYING
 
 # --gc-sections triggers binutils ld segfault
@@ -46,7 +46,7 @@ endif
 ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y)
 
 # add license info for kmod tools
-KMOD_LICENSE := $(KMOD_LICENSE), GPLv2+ (tools)
+KMOD_LICENSE := $(KMOD_LICENSE), GPL-2.0+ (tools)
 KMOD_LICENSE_FILES += COPYING
 
 # take precedence over busybox implementation
@@ -74,7 +74,7 @@ endif
 # host.
 define HOST_KMOD_INSTALL_TOOLS
 	mkdir -p $(HOST_DIR)/sbin/
-	ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/depmod
+	ln -sf ../bin/kmod $(HOST_DIR)/sbin/depmod
 endef
 
 HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS
diff --git a/bsp/buildroot/package/kmscube/Config.in b/bsp/buildroot/package/kmscube/Config.in
new file mode 100644
index 00000000..b9fe627c
--- /dev/null
+++ b/bsp/buildroot/package/kmscube/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_KMSCUBE
+	bool "kmscube"
+	# requires libgbm from mesa3d
+	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
+	depends on BR2_PACKAGE_MESA3D_OPENGL_ES
+	help
+	  kmscube is an application to test kms/drm drivers.
+
+	  https://cgit.freedesktop.org/mesa/kmscube/
diff --git a/bsp/buildroot/package/kmscube/kmscube.hash b/bsp/buildroot/package/kmscube/kmscube.hash
new file mode 100644
index 00000000..e306d005
--- /dev/null
+++ b/bsp/buildroot/package/kmscube/kmscube.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 254d34209740731a557469030c960bbfd2299485a2ad0cbed2f7040b56a292a7  kmscube-6cbd03ab94066dddbba7bedfde87c7c4319c18d5.tar.gz
diff --git a/bsp/buildroot/package/kmscube/kmscube.mk b/bsp/buildroot/package/kmscube/kmscube.mk
new file mode 100644
index 00000000..37983b1a
--- /dev/null
+++ b/bsp/buildroot/package/kmscube/kmscube.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kmscube
+#
+################################################################################
+
+KMSCUBE_VERSION = 6cbd03ab94066dddbba7bedfde87c7c4319c18d5
+KMSCUBE_SITE = https://cgit.freedesktop.org/mesa/kmscube/snapshot
+KMSCUBE_LICENSE = MIT
+KMSCUBE_DEPENDENCIES = host-pkgconf mesa3d libdrm
+KMSCUBE_AUTORECONF = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/kmsxx/0001-Fix-LTO-support-for-cross-compilation.patch b/bsp/buildroot/package/kmsxx/0001-Fix-LTO-support-for-cross-compilation.patch
deleted file mode 100644
index 280583af..00000000
--- a/bsp/buildroot/package/kmsxx/0001-Fix-LTO-support-for-cross-compilation.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5da1f631bc753655ac94b08a6233eecd0d451327 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Fri, 26 Aug 2016 21:55:06 +0200
-Subject: [PATCH] Fix LTO support for cross-compilation.
-
-When cross-compiling, the ar and ranlib to be used for LTO are prefixed
-by the cross-tuple. gcc-ar and gcc-ranlib may not exist. Cfr.
-http://autobuild.buildroot.net/results/f3c/f3c48da3a9706cd366c0e0a96c3cd0ff959f2a78/
-
-Therefore, search for an appropriate lto-ar and lto-ranlib before
-enabling LTO.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
-Submitted upstream: https://github.com/tomba/kmsxx/pull/14
----
- CMakeLists.txt | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e5b5ea5..c61c81d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,9 +39,15 @@ if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG)
-     CHECK_CXX_COMPILER_FLAG("-flto" HAS_LTO_FLAG)
- 
-     if (HAS_LTO_FLAG)
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
--        set(CMAKE_AR gcc-ar)
--        set(CMAKE_RANLIB gcc-ranlib)
-+        find_program(LTO_AR NAMES "${CMAKE_C_COMPILER}-ar" gcc-ar)
-+        find_program(LTO_RANLIB NAMES "${CMAKE_C_COMPILER}-ranlib" gcc-ranlib)
-+        if (LTO_AR AND LTO_RANLIB)
-+            set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
-+            set(CMAKE_AR "${LTO_AR}")
-+            set(CMAKE_RANLIB "${LTO_RANLIB}")
-+        else()
-+            message(STATUS "gcc-ar or gcc-ranlib not found, disabling LTO")
-+        endif()
-     endif()
- endif()
- 
--- 
-2.9.3
-
diff --git a/bsp/buildroot/package/kmsxx/kmsxx.hash b/bsp/buildroot/package/kmsxx/kmsxx.hash
index 9e75bb9e..94a9ea1e 100644
--- a/bsp/buildroot/package/kmsxx/kmsxx.hash
+++ b/bsp/buildroot/package/kmsxx/kmsxx.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  ff8bdb84a738477a8740c835e23c5bb59aac750e9e72a4afcad4ec8820ec7da2  kmsxx-bd5f6471e619a6ba2987bc7f66ef78a531f94d6c.tar.gz
+sha256  28892e50c1d1c83fddff9ec683e3bdbd465f5032d0014ceeab43563b813807e1  kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9.tar.gz
diff --git a/bsp/buildroot/package/kmsxx/kmsxx.mk b/bsp/buildroot/package/kmsxx/kmsxx.mk
index 4932f479..dc0f8c17 100644
--- a/bsp/buildroot/package/kmsxx/kmsxx.mk
+++ b/bsp/buildroot/package/kmsxx/kmsxx.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KMSXX_VERSION = bd5f6471e619a6ba2987bc7f66ef78a531f94d6c
+KMSXX_VERSION = cb0786049f960f2bd383617151b01318e02e9ff9
 KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION))
-KMSXX_LICENSE = MPLv2.0
+KMSXX_LICENSE = MPL-2.0
 KMSXX_LICENSE_FILES = LICENSE
 KMSXX_INSTALL_STAGING = YES
 KMSXX_DEPENDENCIES = libdrm host-pkgconf
@@ -20,8 +20,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y)
 KMSXX_TESTS = \
-	fbtestpat kmsblank kmscapture \
-	kmsprint kmsview testpat wbcap \
+	fbtest kmsblank kmscapture \
+	kmsprint kmstest kmsview wbcap \
 	wbm2m
 
 define KMSXX_INSTALL_TARGET_TESTS
diff --git a/bsp/buildroot/package/knock/Config.in b/bsp/buildroot/package/knock/Config.in
index 8778a7e3..0060ad07 100644
--- a/bsp/buildroot/package/knock/Config.in
+++ b/bsp/buildroot/package/knock/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_KNOCK
 	bool "knock"
-	select BR2_PACKAGE_LIBPCAP
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBPCAP
 	help
 	  A port knocking implementation.
 	  Provides a daemon and a user application. Port knocking can be
diff --git a/bsp/buildroot/package/knock/knock.mk b/bsp/buildroot/package/knock/knock.mk
index 2ab8d1b6..55f5bfdf 100644
--- a/bsp/buildroot/package/knock/knock.mk
+++ b/bsp/buildroot/package/knock/knock.mk
@@ -7,7 +7,7 @@
 KNOCK_VERSION = 258a27e5a47809f97c2b9f2751a88c2f94aae891
 KNOCK_SITE = $(call github,jvinet,knock,$(KNOCK_VERSION))
 KNOCK_AUTORECONF = YES
-KNOCK_LICENSE = GPLv2+
+KNOCK_LICENSE = GPL-2.0+
 KNOCK_LICENSE_FILES = COPYING
 KNOCK_DEPENDENCIES = libpcap
 
diff --git a/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.hash b/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.hash
index e668ff2a..10dd773c 100644
--- a/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.hash
+++ b/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 0ae320af73085c322671d4b361248ff4341a6a04bd81c8b699847d5b04da828f kodi-adsp-basic-cb56e0eb6530fd50a286d47ef0be529001e9d556.tar.gz
+sha256 d6ef031157ceb825a6e6ba114fb20c622ef7f396ddd17ae8bf1954aab25bc2af  kodi-adsp-basic-2ae604e591346741324663260696cfa231931870.tar.gz
diff --git a/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.mk b/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.mk
index 0b1ba959..bb114a41 100644
--- a/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.mk
+++ b/bsp/buildroot/package/kodi-adsp-basic/kodi-adsp-basic.mk
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-KODI_ADSP_BASIC_VERSION = cb56e0eb6530fd50a286d47ef0be529001e9d556
+# This cset is on the branch 'Krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_ADSP_BASIC_VERSION = 2ae604e591346741324663260696cfa231931870
 KODI_ADSP_BASIC_SITE = $(call github,kodi-adsp,adsp.basic,$(KODI_ADSP_BASIC_VERSION))
-KODI_ADSP_BASIC_LICENSE = GPLv3+
+KODI_ADSP_BASIC_LICENSE = GPL-3.0+
 KODI_ADSP_BASIC_LICENSE_FILES = LICENSE.md
 KODI_ADSP_BASIC_DEPENDENCIES = libplatform kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash b/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash
index f23717f7..2649bbdc 100644
--- a/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash
+++ b/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 652c32d0c4b61343cbed13b6edd1ab4ad35280240a0ddb386f04adaa46986e7f kodi-adsp-freesurround-08b691d3d9a0382d2f6f789a31614fb02512036c.tar.gz
+sha256 cf6985be6839530027861b54e2146693d05e802363281ef6f8c1f352dbf94b5c  kodi-adsp-freesurround-34f50406bcba22e364711562e5b9205e57ae844b.tar.gz
diff --git a/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk b/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
index 49cf6732..927af74d 100644
--- a/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
+++ b/bsp/buildroot/package/kodi-adsp-freesurround/kodi-adsp-freesurround.mk
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-KODI_ADSP_FREESURROUND_VERSION = 08b691d3d9a0382d2f6f789a31614fb02512036c
+# This cset is on the branch 'Krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_ADSP_FREESURROUND_VERSION = 34f50406bcba22e364711562e5b9205e57ae844b
 KODI_ADSP_FREESURROUND_SITE = $(call github,kodi-adsp,adsp.freesurround,$(KODI_ADSP_FREESURROUND_VERSION))
-KODI_ADSP_FREESURROUND_LICENSE = GPLv3+
+KODI_ADSP_FREESURROUND_LICENSE = GPL-3.0+
 KODI_ADSP_FREESURROUND_LICENSE_FILES = LICENSE.md
 KODI_ADSP_FREESURROUND_DEPENDENCIES = libplatform kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
index 2760b11b..9b1c2114 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 dd4610ba5fdf3f46dcd0deff785d373d3996c6585cbeb39cb4449baafe5ea3df kodi-audiodecoder-modplug-03b772da7ea44ff3c34b322989254cd1e4732443.tar.gz
+sha256 8be4f8c6324bf790069e42c963e14733c53fcdc27548f21f4822b178f47b8177  kodi-audiodecoder-modplug-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
index 581223c0..c5a6f326 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_MODPLUG_VERSION = 03b772da7ea44ff3c34b322989254cd1e4732443
+KODI_AUDIODECODER_MODPLUG_VERSION = v1.1.0
 KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION))
-KODI_AUDIODECODER_MODPLUG_LICENSE = GPLv2+
+KODI_AUDIODECODER_MODPLUG_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp
 KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi-platform libmodplug
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
index b4cd28fe..df93b25c 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 da65b21ed6218d65b7d382d7fdd9c848a87f6dc766864925979ea8244320db94 kodi-audiodecoder-nosefart-bfab543bae0d9855538cf03e78ea9cd5e3b9750e.tar.gz
+sha256 444cc85f4618daa5147a63633db3f300123d5e33b1b5894e7036fa9243e8a535  kodi-audiodecoder-nosefart-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
index 49688a4d..f56dc191 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_NOSEFART_VERSION = bfab543bae0d9855538cf03e78ea9cd5e3b9750e
+KODI_AUDIODECODER_NOSEFART_VERSION = v1.1.0
 KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION))
-KODI_AUDIODECODER_NOSEFART_LICENSE = GPLv2+
+KODI_AUDIODECODER_NOSEFART_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp
 KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash b/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash
index fa60ce57..117e9f83 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 74b5736aa21d9cfb8fa835c1dc9cca47817cdb3867f99f5c6aee655f0df476ad kodi-audiodecoder-opus-0bd11e35e6ed8b6480e4100ac8927113cb085eda.tar.gz
+sha256 bb7037f903f0396da739005843264acd7227cf96eeeac78b0e36d82872c9acc4  kodi-audiodecoder-opus-d6eb25f0c08033f9a2b4d7402e8baf866ebc731c.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk b/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
index efe17f38..d93c33ac 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_OPUS_VERSION = 0bd11e35e6ed8b6480e4100ac8927113cb085eda
+KODI_AUDIODECODER_OPUS_VERSION = d6eb25f0c08033f9a2b4d7402e8baf866ebc731c
 KODI_AUDIODECODER_OPUS_SITE = $(call github,notspiff,audiodecoder.opus,$(KODI_AUDIODECODER_OPUS_VERSION))
-KODI_AUDIODECODER_OPUS_LICENSE = GPLv2+
+KODI_AUDIODECODER_OPUS_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_OPUS_LICENSE_FILES = src/OpusCodec.cpp
 KODI_AUDIODECODER_OPUS_DEPENDENCIES = kodi-platform libogg opus opusfile
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
index f339654f..b806956a 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 11855e7b0311516602eda34c5fa4917d51220a27c3053ea831da149ae4c93757 kodi-audiodecoder-sidplay-d832f050211b4e5f085a8b09bc7d26ce32098169.tar.gz
+sha256 527b188679add8043e8cd691af9735b6fe8bd6935ad8ac8312b459d6f160cdac  kodi-audiodecoder-sidplay-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
index d8cf438b..8eb425f4 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_SIDPLAY_VERSION = d832f050211b4e5f085a8b09bc7d26ce32098169
+KODI_AUDIODECODER_SIDPLAY_VERSION = v1.1.0
 KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION))
-KODI_AUDIODECODER_SIDPLAY_LICENSE = GPLv2+
+KODI_AUDIODECODER_SIDPLAY_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp
 KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi-platform libsidplay2
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
index e3da5722..159d67ec 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 6fd6e5dda0fbcdac280952e0efc0bb255ef99628c892164c26e60ee3f2ab8e4e kodi-audiodecoder-snesapu-db62e88e568994a0496d7026a10e044d70b3aa2b.tar.gz
+sha256 20d85822d0c01223903b5e5472a1d029fa4931c2a9ac4d399345c4363fa8f905  kodi-audiodecoder-snesapu-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
index f9f398ca..6104de71 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_SNESAPU_VERSION = db62e88e568994a0496d7026a10e044d70b3aa2b
+KODI_AUDIODECODER_SNESAPU_VERSION = v1.1.0
 KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION))
-KODI_AUDIODECODER_SNESAPU_LICENSE = GPLv2+
+KODI_AUDIODECODER_SNESAPU_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp
 KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
index 164e9676..133e645f 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2bd89d66c493ba354df5c154f313a4bd801ff019ad5c102aa54741b99dd9c608 kodi-audiodecoder-stsound-759ae7eadb94adfde8533a2a42d949c321718625.tar.gz
+sha256 c9b6e98d544712f7cec3cf18f866ccaed2fbcd20410179259ae0455ffa967ca4  kodi-audiodecoder-stsound-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
index 76010899..dd5b9da3 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_STSOUND_VERSION = 759ae7eadb94adfde8533a2a42d949c321718625
+KODI_AUDIODECODER_STSOUND_VERSION = v1.1.0
 KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION))
-KODI_AUDIODECODER_STSOUND_LICENSE = GPLv2+
+KODI_AUDIODECODER_STSOUND_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp
 KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-timidity/Config.in b/bsp/buildroot/package/kodi-audiodecoder-timidity/Config.in
index 8f604adf..3372dc5c 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-timidity/Config.in
+++ b/bsp/buildroot/package/kodi-audiodecoder-timidity/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KODI_AUDIODECODER_TIMIDITY
 	bool "kodi-audiodecoder-timidity"
-	select BR2_PACKAGE_KODI_PLATFORM
 	help
 	  Timidity decoder addon for Kodi
 
diff --git a/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
index d4af0197..5711b87a 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2e220b7d279fce73ff289536cd9e94b159ae648514fb8b423977dddb99c50e85 kodi-audiodecoder-timidity-a84559da92aa67744069fc9e9dc885732588c8ce.tar.gz
+sha256 83a740010dc7fa01101da370c74e79287ebd67bd28d27125e4372abe2fb3bb47  kodi-audiodecoder-timidity-v1.1.1.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
index fb680d14..e4a97fa7 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_TIMIDITY_VERSION = a84559da92aa67744069fc9e9dc885732588c8ce
+KODI_AUDIODECODER_TIMIDITY_VERSION = v1.1.1
 KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION))
-KODI_AUDIODECODER_TIMIDITY_LICENSE = GPLv2+
+KODI_AUDIODECODER_TIMIDITY_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp
-KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi-platform
+KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
index 5e6dfab3..28f4272e 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
+++ b/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 7a376447e8390f01c18f22b57ea553441493625545537a023d5d896272e56369 kodi-audiodecoder-vgmstream-cb2892ac0465b0563ee45f532323198a6f722b62.tar.gz
+sha256 40cd4f7f143c9313a4437854e31c460046af47bd709364439f0e370ec464af0d  kodi-audiodecoder-vgmstream-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
index 447d837c..8dc09fa7 100644
--- a/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
+++ b/bsp/buildroot/package/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIODECODER_VGMSTREAM_VERSION = cb2892ac0465b0563ee45f532323198a6f722b62
+KODI_AUDIODECODER_VGMSTREAM_VERSION = v1.1.0
 KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION))
-KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPLv2+
+KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPL-2.0+
 KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp
 KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
index f563f56b..41ddeb4e 100644
--- a/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
+++ b/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4317a01414577885ef4a0ac4f8d95714b021ad15fc668cbf36eae2fdf400bb33 kodi-audioencoder-flac-v1.0.0.tar.gz
+sha256 811dac5766dc9ef1a3447c55637edde55c5ddca1d583124e9312328152015ae5  kodi-audioencoder-flac-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
index ca488262..d1c41ca3 100644
--- a/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
+++ b/bsp/buildroot/package/kodi-audioencoder-flac/kodi-audioencoder-flac.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_FLAC_VERSION = v1.0.0
+KODI_AUDIOENCODER_FLAC_VERSION = v1.1.0
 KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION))
-KODI_AUDIOENCODER_FLAC_LICENSE = GPLv2+
+KODI_AUDIOENCODER_FLAC_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp
 KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf
 
diff --git a/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
index ffd38ba8..b93ae02e 100644
--- a/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
+++ b/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 7fbdc6c9111431f49498157204d19dfa94bbf9e5f807b631e84129c6c491225e kodi-audioencoder-lame-v1.0.0.tar.gz
+sha256 5118a2925bb0f7eca36b2d0f4d6822b45a8967c9fb91054bfaa8f83d21209c95  kodi-audioencoder-lame-v1.2.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
index 3e1836fc..941604ae 100644
--- a/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
+++ b/bsp/buildroot/package/kodi-audioencoder-lame/kodi-audioencoder-lame.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_LAME_VERSION = v1.0.0
+KODI_AUDIOENCODER_LAME_VERSION = v1.2.0
 KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION))
-KODI_AUDIOENCODER_LAME_LICENSE = GPLv2+
+KODI_AUDIOENCODER_LAME_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp
 KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame
 KODI_AUDIOENCODER_LAME_CONF_OPTS += \
diff --git a/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
index 47f428c7..094b2fab 100644
--- a/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
+++ b/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 65169e785d82f9081088df2693721f4a7e4b2d24f7e8b1e86b5f443206935303 kodi-audioencoder-vorbis-v1.0.0.tar.gz
+sha256 f00c74f010b465d43e8206bcbe155785e1f34660ca010acff3b890595ea2352c  kodi-audioencoder-vorbis-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
index 749ea8e1..198d3b1c 100644
--- a/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
+++ b/bsp/buildroot/package/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_VORBIS_VERSION = v1.0.0
+KODI_AUDIOENCODER_VORBIS_VERSION = v1.1.0
 KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION))
-KODI_AUDIOENCODER_VORBIS_LICENSE = GPLv2+
+KODI_AUDIOENCODER_VORBIS_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp
 KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf
 
diff --git a/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
index 86eb13cc..c6bbe79e 100644
--- a/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
+++ b/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 d4e6de5786b9e2bd3fa5e09314c9a60a8daac32cf96e8aa84ab42cacf60f7094 kodi-audioencoder-wav-v1.0.0.tar.gz
+sha256 f9b0f79c8364fb7ef584137031fceb8d2ab1af28e110cfe2a31932631cb8d36e  kodi-audioencoder-wav-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
index 661ab44b..1a9a6b7b 100644
--- a/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
+++ b/bsp/buildroot/package/kodi-audioencoder-wav/kodi-audioencoder-wav.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_AUDIOENCODER_WAV_VERSION = v1.0.0
+KODI_AUDIOENCODER_WAV_VERSION = v1.1.0
 KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION))
-KODI_AUDIOENCODER_WAV_LICENSE = GPLv2+
+KODI_AUDIOENCODER_WAV_LICENSE = GPL-2.0+
 KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp
 KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-inputstream-adaptive/Config.in b/bsp/buildroot/package/kodi-inputstream-adaptive/Config.in
new file mode 100644
index 00000000..cb512736
--- /dev/null
+++ b/bsp/buildroot/package/kodi-inputstream-adaptive/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_KODI_INPUTSTREAM_ADAPTIVE
+	bool "kodi-inputstream-adaptive"
+	# wvdecrypter/cdm/build/build_config.h
+	depends on BR2_aarch64 || BR2_arm || BR2_i386 || BR2_mipsel \
+		|| BR2_mips64el || BR2_x86_64
+	select BR2_PACKAGE_LIBPLATFORM
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi inputstream addon for several manifest types
+
+	  https://github.com/peak3d/inputstream.adaptive
diff --git a/bsp/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash b/bsp/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
new file mode 100644
index 00000000..78b48c16
--- /dev/null
+++ b/bsp/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 572b2e898484a5ada74c4095539cebf43c198a3147f0f24fe350bc79db053695  kodi-inputstream-adaptive-9af21218a87572bd4ab8d8d660c11f6295144f97.tar.gz
diff --git a/bsp/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk b/bsp/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
new file mode 100644
index 00000000..f7a4c66e
--- /dev/null
+++ b/bsp/buildroot/package/kodi-inputstream-adaptive/kodi-inputstream-adaptive.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# kodi-inputstream-adaptive
+#
+################################################################################
+
+# This cset is on the branch 'Krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_INPUTSTREAM_ADAPTIVE_VERSION = 9af21218a87572bd4ab8d8d660c11f6295144f97
+KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
+KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+
+KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp
+KODI_INPUTSTREAM_ADAPTIVE_DEPENDENCIES = libplatform kodi-platform
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-inputstream-rtmp/Config.in b/bsp/buildroot/package/kodi-inputstream-rtmp/Config.in
new file mode 100644
index 00000000..c40bff2d
--- /dev/null
+++ b/bsp/buildroot/package/kodi-inputstream-rtmp/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_KODI_INPUTSTREAM_RTMP
+	bool "kodi-inputstream-rtmp"
+	select BR2_PACKAGE_RTMPDUMP
+	help
+	  RTMP input stream add-on for Kodi
+
+	  https://github.com/notspiff/inputstream.rtmp
diff --git a/bsp/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash b/bsp/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
new file mode 100644
index 00000000..f5a82d2a
--- /dev/null
+++ b/bsp/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 75a3cc87243a7c92a0a2e3f16710a1e60d05cd8dbc8b7fd1852244fbc5da2ae8  kodi-inputstream-rtmp-v1.0.4.tar.gz
diff --git a/bsp/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk b/bsp/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
new file mode 100644
index 00000000..80c4bccd
--- /dev/null
+++ b/bsp/buildroot/package/kodi-inputstream-rtmp/kodi-inputstream-rtmp.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kodi-inputstream-rtmp
+#
+################################################################################
+
+KODI_INPUTSTREAM_RTMP_VERSION = v1.0.4
+KODI_INPUTSTREAM_RTMP_SITE = $(call github,notspiff,inputstream.rtmp,$(KODI_INPUTSTREAM_RTMP_VERSION))
+KODI_INPUTSTREAM_RTMP_LICENSE = GPL-2.0+
+KODI_INPUTSTREAM_RTMP_LICENSE_FILES = src/RTMPStream.cpp
+KODI_INPUTSTREAM_RTMP_DEPENDENCIES = kodi rtmpdump
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash b/bsp/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
new file mode 120000
index 00000000..a5757509
--- /dev/null
+++ b/bsp/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.hash
@@ -0,0 +1 @@
+../kodi/kodi.hash
\ No newline at end of file
diff --git a/bsp/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/bsp/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
new file mode 100644
index 00000000..fcf4888a
--- /dev/null
+++ b/bsp/buildroot/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# kodi-jsonschemabuilder
+#
+################################################################################
+
+# Not possible to directly refer to kodi variables, because of
+# first/second expansion trickery...
+KODI_JSONSCHEMABUILDER_VERSION = 17.6-Krypton
+KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
+KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
+KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0
+KODI_JSONSCHEMABUILDER_LICENSE_FILES = LICENSE.GPL
+HOST_KODI_JSONSCHEMABUILDER_SUBDIR = tools/depends/native/JsonSchemaBuilder
+
+HOST_KODI_JSONSCHEMABUILDER_CONF_OPTS = \
+	-DCMAKE_MODULE_PATH=$(@D)/project/cmake/modules
+
+define HOST_KODI_JSONSCHEMABUILDER_INSTALL_CMDS
+	$(INSTALL) -m 755 -D \
+		$(@D)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \
+		$(HOST_DIR)/bin/JsonSchemaBuilder
+endef
+
+$(eval $(host-cmake-package))
diff --git a/bsp/buildroot/package/kodi-peripheral-joystick/Config.in b/bsp/buildroot/package/kodi-peripheral-joystick/Config.in
new file mode 100644
index 00000000..f257710a
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-joystick/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_KODI_PERIPHERAL_JOYSTICK
+	bool "kodi-peripheral-joystick"
+	depends on BR2_PACKAGE_HAS_UDEV
+	select BR2_PACKAGE_KODI_PLATFORM
+	help
+	  Kodi joystick support (drivers and button maps)
+
+	  https://github.com/xbmc/peripheral.joystick
+
+comment "kodi-peripheral-joystick needs udev /dev management"
+	depends on !BR2_PACKAGE_HAS_UDEV
diff --git a/bsp/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash b/bsp/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
new file mode 100644
index 00000000..728c3cac
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 9a183e1f92ff2c68816bfa0056c65585a3e1129d924326359d7a5dfbcba6c56a  kodi-peripheral-joystick-v1.3.4.tar.gz
diff --git a/bsp/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk b/bsp/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
new file mode 100644
index 00000000..2fadbcc2
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-joystick/kodi-peripheral-joystick.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# kodi-peripheral-joystick
+#
+################################################################################
+
+# This cset is on the branch 'Krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_PERIPHERAL_JOYSTICK_VERSION = v1.3.4
+KODI_PERIPHERAL_JOYSTICK_SITE = $(call github,xbmc,peripheral.joystick,$(KODI_PERIPHERAL_JOYSTICK_VERSION))
+KODI_PERIPHERAL_JOYSTICK_LICENSE = GPL-2.0+
+KODI_PERIPHERAL_JOYSTICK_LICENSE_FILES = src/addon.cpp
+KODI_PERIPHERAL_JOYSTICK_DEPENDENCIES = kodi-platform udev
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-peripheral-steamcontroller/Config.in b/bsp/buildroot/package/kodi-peripheral-steamcontroller/Config.in
new file mode 100644
index 00000000..a994f4c9
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-steamcontroller/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_KODI_PERIPHERAL_STEAMCONTROLLER
+	bool "kodi-peripheral-steamcontroller"
+	select BR2_PACKAGE_KODI_PLATFORM
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Steam controller driver for Kodi
+
+	  https://github.com/kodi-game/peripheral.steamcontroller
diff --git a/bsp/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash b/bsp/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
new file mode 100644
index 00000000..c0b3bf6e
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 d5547b78ba84c9743c884a9377c398b540bfcf23e467e1edf8be2625d400c205  kodi-peripheral-steamcontroller-ef527cd81cfcd6c8342691f5c764e5c51df1fca2.tar.gz
diff --git a/bsp/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk b/bsp/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
new file mode 100644
index 00000000..98cccc85
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-steamcontroller/kodi-peripheral-steamcontroller.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kodi-peripheral-steamcontroller
+#
+################################################################################
+
+KODI_PERIPHERAL_STEAMCONTROLLER_VERSION = ef527cd81cfcd6c8342691f5c764e5c51df1fca2
+KODI_PERIPHERAL_STEAMCONTROLLER_SITE = $(call github,kodi-game,peripheral.steamcontroller,$(KODI_PERIPHERAL_STEAMCONTROLLER_VERSION))
+KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE = GPL-2.0+
+KODI_PERIPHERAL_STEAMCONTROLLER_LICENSE_FILES = src/addon.cpp
+KODI_PERIPHERAL_STEAMCONTROLLER_DEPENDENCIES = kodi-platform libusb
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-peripheral-xarcade/Config.in b/bsp/buildroot/package/kodi-peripheral-xarcade/Config.in
new file mode 100644
index 00000000..8d3c6785
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-xarcade/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_PERIPHERAL_XARCADE
+	bool "kodi-peripheral-xarcade"
+	help
+	  X-Arcade Tankstick support for Kodi
+
+	  https://github.com/kodi-game/peripheral.xarcade
diff --git a/bsp/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash b/bsp/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
new file mode 100644
index 00000000..48dc5a04
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 cd503e7f1413214693c28b59f19f3fffe0a54cff5c29d43b2eca9bb31c10edeb  kodi-peripheral-xarcade-f1875ba4b7aa6ce85ec40fedf48ed5501c79e5fd.tar.gz
diff --git a/bsp/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk b/bsp/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
new file mode 100644
index 00000000..c4ddba3e
--- /dev/null
+++ b/bsp/buildroot/package/kodi-peripheral-xarcade/kodi-peripheral-xarcade.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# kodi-peripheral-xarcade
+#
+################################################################################
+
+KODI_PERIPHERAL_XARCADE_VERSION = f1875ba4b7aa6ce85ec40fedf48ed5501c79e5fd
+KODI_PERIPHERAL_XARCADE_SITE = $(call github,kodi-game,peripheral.xarcade,$(KODI_PERIPHERAL_XARCADE_VERSION))
+KODI_PERIPHERAL_XARCADE_LICENSE = GPL-2.0+
+KODI_PERIPHERAL_XARCADE_LICENSE_FILES = src/addon.cpp
+KODI_PERIPHERAL_XARCADE_DEPENDENCIES = kodi
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-platform/kodi-platform.hash b/bsp/buildroot/package/kodi-platform/kodi-platform.hash
index a2484484..d99c6225 100644
--- a/bsp/buildroot/package/kodi-platform/kodi-platform.hash
+++ b/bsp/buildroot/package/kodi-platform/kodi-platform.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  88741358d5d54a0031553ac28aa63bc56c44d994a76f8651bac94a1e244a6595  kodi-platform-45d6ad1984fdb1dc855076ff18484dbec33939d1.tar.gz
+sha256 c53f37888d752e233f5adabc6ecfb8a1ea02728e010007200bbf671f6b9462de  kodi-platform-36fb49371dbce49bf470a5bb1fc51b74b4a3612d.tar.gz
diff --git a/bsp/buildroot/package/kodi-platform/kodi-platform.mk b/bsp/buildroot/package/kodi-platform/kodi-platform.mk
index 4b642f9c..53f8ce95 100644
--- a/bsp/buildroot/package/kodi-platform/kodi-platform.mk
+++ b/bsp/buildroot/package/kodi-platform/kodi-platform.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_PLATFORM_VERSION = 45d6ad1984fdb1dc855076ff18484dbec33939d1
+KODI_PLATFORM_VERSION = 36fb49371dbce49bf470a5bb1fc51b74b4a3612d
 KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION))
-KODI_PLATFORM_LICENSE = GPLv2+
+KODI_PLATFORM_LICENSE = GPL-2.0+
 KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h
 KODI_PLATFORM_INSTALL_STAGING = YES
 KODI_PLATFORM_DEPENDENCIES = libplatform kodi
diff --git a/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
index ef643879..138efa1d 100644
--- a/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
+++ b/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 68fab94cabbeb0fbf6fac0fcb66e8362505ee736ae3b72c4e29867cfc44b595b kodi-pvr-argustv-2aca01c6db28fe3145b57eb5bf5841895c618507.tar.gz
+sha256 ba9e4d76b9e6d2d879e95eeda0d919ca5eabc0d6f59037f173cd9294b2ce8e4a  kodi-pvr-argustv-2.5.6-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
index 3c0f40a2..2cf4d752 100644
--- a/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
+++ b/bsp/buildroot/package/kodi-pvr-argustv/kodi-pvr-argustv.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_ARGUSTV_VERSION = 2aca01c6db28fe3145b57eb5bf5841895c618507
+KODI_PVR_ARGUSTV_VERSION = 2.5.6-Krypton
 KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION))
-KODI_PVR_ARGUSTV_LICENSE = GPLv2+
+KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+
 KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h
 KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
index 713aae0e..e9b86731 100644
--- a/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
+++ b/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 1c359c1a59c50f98910ec1d4bc332cd9360447e05d63f0d90b07a7ba22bc7ab6 kodi-pvr-dvblink-06c4e5603e4db0bda3f35e80344a308f486ae0f9.tar.gz
+sha256 a45fff0c1fe6d91fd957e2a4e62e9c72a5c36d796c41caa6b1e5a4814f82a503  kodi-pvr-dvblink-3.4.5v2-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
index 75ce6217..9860b63b 100644
--- a/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
+++ b/bsp/buildroot/package/kodi-pvr-dvblink/kodi-pvr-dvblink.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBLINK_VERSION = 06c4e5603e4db0bda3f35e80344a308f486ae0f9
+KODI_PVR_DVBLINK_VERSION = 3.4.5v2-Krypton
 KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION))
-KODI_PVR_DVBLINK_LICENSE = GPLv2+
+KODI_PVR_DVBLINK_LICENSE = GPL-2.0+
 KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h
 KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2
 
diff --git a/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
index 785fd6c2..017bd836 100644
--- a/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
+++ b/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 a6a6d63e4b88df0d8b5166efdc09f6410cae736e610b328aaea49c8688bfce82 kodi-pvr-dvbviewer-26286604635a170eeea68df9b7eb52fea0056cfe.tar.gz
+sha256 f1cd26234e33a027d1ef2f3ea7b5f33be3a8aff9a7bf0117ee4bdfcf1e18fd9f  kodi-pvr-dvbviewer-2.4.14-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
index b2fae522..bc37de75 100644
--- a/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
+++ b/bsp/buildroot/package/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_DVBVIEWER_VERSION = 26286604635a170eeea68df9b7eb52fea0056cfe
+KODI_PVR_DVBVIEWER_VERSION = 2.4.14-Krypton
 KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION))
-KODI_PVR_DVBVIEWER_LICENSE = GPLv2+
+KODI_PVR_DVBVIEWER_LICENSE = GPL-2.0+
 KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h
 KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash b/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
index b60df982..7417b267 100644
--- a/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
+++ b/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4a51ba62239c96c16c569ca47bc7aac4a2e9e9ef4ae09dfc23d10be15afdee34 kodi-pvr-filmon-4b34b41999b86e675f794ec8e5a63c85b78c001e.tar.gz
+sha256 0384db9cbcd8ab2e7b8b0eb8c22e8913e734e436234c43d357718c5273058605  kodi-pvr-filmon-1.4.8-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk b/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
index 0174aa45..daa3e39d 100644
--- a/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
+++ b/bsp/buildroot/package/kodi-pvr-filmon/kodi-pvr-filmon.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_FILMON_VERSION = 4b34b41999b86e675f794ec8e5a63c85b78c001e
+KODI_PVR_FILMON_VERSION = 1.4.8-Krypton
 KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION))
-KODI_PVR_FILMON_LICENSE = GPLv2+
+KODI_PVR_FILMON_LICENSE = GPL-2.0+
 KODI_PVR_FILMON_LICENSE_FILES = src/client.h
 KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
index fcf04688..8262f4e1 100644
--- a/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
+++ b/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 84c7dd60db6e0d0c40cc83a70ad860127d0e5c8e77c6091014055372cad5fe1f kodi-pvr-hdhomerun-aa4324eaa5f738394f21d3f54667e346eb65038e.tar.gz
+sha256 3c000b3ebab2b12f5635451f6a71ad01c4f4d7043623cfeebfe6b7c662e026d9  kodi-pvr-hdhomerun-2.4.7-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
index 67980fba..75fa4876 100644
--- a/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
+++ b/bsp/buildroot/package/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HDHOMERUN_VERSION = aa4324eaa5f738394f21d3f54667e346eb65038e
+KODI_PVR_HDHOMERUN_VERSION = 2.4.7-Krypton
 KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION))
-KODI_PVR_HDHOMERUN_LICENSE = GPLv2+
+KODI_PVR_HDHOMERUN_LICENSE = GPL-2.0+
 KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h
 KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi-platform libhdhomerun
 
diff --git a/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash b/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash
index 369e6c02..87eafac8 100644
--- a/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash
+++ b/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 004dee4455d5d539b5e42d663659d4886d9a8650847ad614fa2179bbaace3783 kodi-pvr-hts-3c673b5b29fc26c203c79f7df58680af50a1afa7.tar.gz
+sha256 96e949526ebf4af542da572e704c0c052ec807408dc0ea65603a15614b889dd1  kodi-pvr-hts-3211941dade740ad92581f488402146794798e74.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk b/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk
index 4ca5a318..7f43b048 100644
--- a/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk
+++ b/bsp/buildroot/package/kodi-pvr-hts/kodi-pvr-hts.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_HTS_VERSION = 3c673b5b29fc26c203c79f7df58680af50a1afa7
+KODI_PVR_HTS_VERSION = 3211941dade740ad92581f488402146794798e74
 KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
-KODI_PVR_HTS_LICENSE = GPLv2+
+KODI_PVR_HTS_LICENSE = GPL-2.0+
 KODI_PVR_HTS_LICENSE_FILES = src/client.h
 KODI_PVR_HTS_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
index cdf94fdb..0b0406fe 100644
--- a/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
+++ b/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 5b5c67f70f47c52ccda673c3a98b5a81827835fb74289754bebf840133a84d56 kodi-pvr-iptvsimple-ae9bc1d94e97c5381b2fa59adac70a57146016cd.tar.gz
+sha256 329bd71e5c786d7b037bf5fd103ee4abff892afc6e5186a5d0a797194a8c4c7c  kodi-pvr-iptvsimple-2.4.14-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
index 85039dd9..0df509ea 100644
--- a/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
+++ b/bsp/buildroot/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_IPTVSIMPLE_VERSION = ae9bc1d94e97c5381b2fa59adac70a57146016cd
+KODI_PVR_IPTVSIMPLE_VERSION = 2.4.14-Krypton
 KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
-KODI_PVR_IPTVSIMPLE_LICENSE = GPLv2+
+KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
 KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h
 KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch b/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch
new file mode 100644
index 00000000..7abb153b
--- /dev/null
+++ b/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/0001-live555-remove-xlocale.h-from-Locale.hh.patch
@@ -0,0 +1,33 @@
+From 64b264d141fd80991ac071c5370802e2d7394f6d Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 3 Dec 2017 22:17:12 +0100
+Subject: [PATCH] live555: remove xlocale.h from Locale.hh
+
+Fixes build error with glibc 2.26:
+https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27
+
+Patch sent upstream:
+https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/79
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/lib/live555/liveMedia/include/Locale.hh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/lib/live555/liveMedia/include/Locale.hh b/src/lib/live555/liveMedia/include/Locale.hh
+index b327948..c4b4f4a 100644
+--- a/src/lib/live555/liveMedia/include/Locale.hh
++++ b/src/lib/live555/liveMedia/include/Locale.hh
+@@ -43,9 +43,6 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
+ 
+ #ifndef LOCALE_NOT_USED
+ #include <locale.h>
+-#ifndef XLOCALE_NOT_USED
+-#include <xlocale.h> // because, on some systems, <locale.h> doesn't include <xlocale.h>; this makes sure that we get both
+-#endif
+ #endif
+ 
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
index 74770fd3..6eb0abfb 100644
--- a/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
+++ b/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 45590c1b8dc57f2b5921641c864e68671c32db33f55db82ca62411557e9278b9 kodi-pvr-mediaportal-tvserver-a3dd464379a56131bae61b94275c14a3abcf2869.tar.gz
+sha256 3f5c022f83636b3739f26c1a07166b498eac82e8081ed7551980f4bb27c6b56e  kodi-pvr-mediaportal-tvserver-2.4.19v2-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
index e3a4df43..99a31891 100644
--- a/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
+++ b/bsp/buildroot/package/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = a3dd464379a56131bae61b94275c14a3abcf2869
+KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = 2.4.19v2-Krypton
 KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION))
-KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPLv2+
+KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPL-2.0+
 KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h
 KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
index 0e9eba87..82923a89 100644
--- a/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
+++ b/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 f6d61b134a96a25820b616e60e43ac1ed33bd3f8b9f7612a6f6324356b78582d kodi-pvr-mythtv-84b0b6b122ca779588de5c895ef77b6bc454e859.tar.gz
+sha256 fd60aba0dac25ab5885371495a5dfca53308c1fa23215299b0f62997c7391e1e  kodi-pvr-mythtv-4.15.3.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
index a8a1a6da..8099ffae 100644
--- a/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
+++ b/bsp/buildroot/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_MYTHTV_VERSION = 84b0b6b122ca779588de5c895ef77b6bc454e859
-KODI_PVR_MYTHTV_SITE = $(call github,kodi-pvr,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
-KODI_PVR_MYTHTV_LICENSE = GPLv2+
+KODI_PVR_MYTHTV_VERSION = 4.15.3
+KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
+KODI_PVR_MYTHTV_LICENSE = GPL-2.0+
 KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h
 KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch b/bsp/buildroot/package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch
deleted file mode 100644
index 18e59951..00000000
--- a/bsp/buildroot/package/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2698ac4eeca3a82967ff83386460c070ce387ead Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 28 Feb 2016 01:07:52 +0100
-Subject: [PATCH] Sync enum representation of char_class_e in struct traits
- with definition
-
-Copied from
-https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/28
-https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/35
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Patch sent upstream: https://github.com/kodi-pvr/pvr.nextpvr/pull/42]
----
- src/uri.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/uri.h b/src/uri.h
-index 2757cf0..3dbca88 100644
---- a/src/uri.h
-+++ b/src/uri.h
-@@ -21,13 +21,13 @@
- namespace uri
- {
-   /// Char class.
--  enum char_class_e
-+  typedef enum char_class_e : signed char
-   {
-     CINV = -2, ///< invalid
-     CEND = -1, ///< end delimitor
-     CVAL = 0,  ///< valid any position
-     CVA2 = 1,  ///< valid anywhere but 1st position
--  };
-+  } char_class_e_type;
- 
-   /// Traits used for parsing and encoding components.
-   struct traits
-@@ -35,7 +35,7 @@ namespace uri
-     const char* begin_cstring; ///< begin cstring (or 0 if none)
-     const char begin_char;     ///< begin char (or 0 if none)
-     const char end_char;       ///< end char (or 0 if none)
--    char char_class[256];      ///< map of char to class
-+    const char_class_e_type char_class[256];      ///< map of char to class
-   };
- 
-   /**
--- 
-2.7.0
-
diff --git a/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
index 64c09cfe..3d10b5bb 100644
--- a/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
+++ b/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8c4a36c21dc65cc358b34e5c2db849997f0add2501c3f787f99df3ae0ea850c5 kodi-pvr-nextpvr-2055105c93e18e04e73c87578bece3edf7525e14.tar.gz
+sha256 b126943a6d48ea4d2df38951505f385c2a499e399201eccd798a34076d3c5842  kodi-pvr-nextpvr-2.4.13-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
index a8b82354..d0a04991 100644
--- a/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
+++ b/bsp/buildroot/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NEXTPVR_VERSION = 2055105c93e18e04e73c87578bece3edf7525e14
+KODI_PVR_NEXTPVR_VERSION = 2.4.13-Krypton
 KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION))
-KODI_PVR_NEXTPVR_LICENSE = GPLv2+
+KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+
 KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h
 KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash b/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
index c6006d2a..261558ee 100644
--- a/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
+++ b/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 aa5e8b471993326be3622056a26ebf7387ac4758348e8f64632c1fc6979d993e kodi-pvr-njoy-480c1591d486c6166746fb8b5efc68a7aca3d0f0.tar.gz
+sha256 e4e0a6bb1bf0c6f8ae011eba58c5f0ae19a6574bb35fc6a7fbdbb99d20242a2c  kodi-pvr-njoy-2.4.3-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk b/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
index 0f2eecd3..e946e678 100644
--- a/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
+++ b/bsp/buildroot/package/kodi-pvr-njoy/kodi-pvr-njoy.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_NJOY_VERSION = 480c1591d486c6166746fb8b5efc68a7aca3d0f0
+KODI_PVR_NJOY_VERSION = 2.4.3-Krypton
 KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION))
-KODI_PVR_NJOY_LICENSE = GPLv2+
+KODI_PVR_NJOY_LICENSE = GPL-2.0+
 KODI_PVR_NJOY_LICENSE_FILES = src/client.h
 KODI_PVR_NJOY_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash b/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
index 0ff481a3..50448067 100644
--- a/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
+++ b/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4c045722c326dfe152ffadb8d966e8db4caa6128a7c53b2a852fce85f803bcbc kodi-pvr-pctv-0096770e96f84c46f444e159b9b737ac8b4238dc.tar.gz
+sha256 95f95f39739baf6013bb6c9188743f842f6ba3e1fa541907067f795e1a3c66a1  kodi-pvr-pctv-1.4.7-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk b/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
index a9824d5c..6c7a0304 100644
--- a/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
+++ b/bsp/buildroot/package/kodi-pvr-pctv/kodi-pvr-pctv.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_PCTV_VERSION = 0096770e96f84c46f444e159b9b737ac8b4238dc
+KODI_PVR_PCTV_VERSION = 1.4.7-Krypton
 KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION))
-KODI_PVR_PCTV_LICENSE = GPLv2+
+KODI_PVR_PCTV_LICENSE = GPL-2.0+
 KODI_PVR_PCTV_LICENSE_FILES = src/client.h
 KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch b/bsp/buildroot/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
new file mode 100644
index 00000000..2d85f6bc
--- /dev/null
+++ b/bsp/buildroot/package/kodi-pvr-stalker/0001-src-CWatchdog.h-Fix-gcc7-build.patch
@@ -0,0 +1,29 @@
+From bb16ccd14deb3a01049daec37b6d2e7711ef4738 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 13 May 2017 20:22:08 +0200
+Subject: [PATCH] src/CWatchdog.h: Fix gcc7 build
+
+Building with gcc7 is broken:
+
+src/CWatchdog.h:31:58: error: 'std::function' has not been declared
+    CWatchdog(unsigned int interval, SAPI *api, std::function<void(SError)> errorCallback);
+                                                     ^~~~~~~~
+
+Submitted-upstream: https://github.com/kodi-pvr/pvr.stalker/pull/93
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/CWatchdog.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/CWatchdog.h b/src/CWatchdog.h
+index c465e91..239d95d 100644
+--- a/src/CWatchdog.h
++++ b/src/CWatchdog.h
+@@ -22,6 +22,7 @@
+  */
+ 
+ #include <thread>
++#include <functional>
+ 
+ #include "SAPI.h"
+ 
diff --git a/bsp/buildroot/package/kodi-pvr-stalker/Config.in b/bsp/buildroot/package/kodi-pvr-stalker/Config.in
index 3ec530cd..d334d0c2 100644
--- a/bsp/buildroot/package/kodi-pvr-stalker/Config.in
+++ b/bsp/buildroot/package/kodi-pvr-stalker/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_KODI_PVR_STALKER
 	bool "kodi-pvr-stalker"
 	select BR2_PACKAGE_JSONCPP
 	select BR2_PACKAGE_KODI_PLATFORM
+	select BR2_PACKAGE_LIBXML2
 	help
 	  A PVR Client that connects Kodi to Stalker Middleware
 
diff --git a/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash b/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
index 7af1bcb2..07c768f2 100644
--- a/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
+++ b/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 e16cb12bd7a78b8849f370bedb8093d3cb1deb3a766a66efe4b838fc569ab50c kodi-pvr-stalker-5e588330c453141ae0a2f4fd9c02d909ac9d199e.tar.gz
+sha256 466cb3869927cdd245a746a32d92250e198befe577f7a847884eab1fd8eeb139  kodi-pvr-stalker-2.8.6-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk b/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
index d1fa8a0f..32ac2cad 100644
--- a/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
+++ b/bsp/buildroot/package/kodi-pvr-stalker/kodi-pvr-stalker.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_STALKER_VERSION = 5e588330c453141ae0a2f4fd9c02d909ac9d199e
+KODI_PVR_STALKER_VERSION = 2.8.6-Krypton
 KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION))
-KODI_PVR_STALKER_LICENSE = GPLv2+
+KODI_PVR_STALKER_LICENSE = GPL-2.0+
 KODI_PVR_STALKER_LICENSE_FILES = src/client.h
-KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform
+KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform libxml2
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-pvr-vbox/Config.in b/bsp/buildroot/package/kodi-pvr-vbox/Config.in
index 3a5f8c46..c1c22c10 100644
--- a/bsp/buildroot/package/kodi-pvr-vbox/Config.in
+++ b/bsp/buildroot/package/kodi-pvr-vbox/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_KODI_PVR_VBOX
 	bool "kodi-pvr-vbox"
 	select BR2_PACKAGE_KODI_PLATFORM
 	help
-	  Kodi PVR addon for interfacing with VBox Communications XTi TV Gateway
+	  Kodi PVR addon for interfacing with VBox Communications XTi TV
+	  Gateway
 
 	  https://github.com/kodi-pvr/pvr.vbox
diff --git a/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash b/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
index 705c0cb3..5f2c78f0 100644
--- a/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
+++ b/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 8eb43fb6e2a3132324bf24787bc0545c610832648aa17c12e93676502f7fc565 kodi-pvr-vbox-15e864d160da5a051e18aef06f3a53e49808be02.tar.gz
+sha256 78065a46b95b3988b1e49fe05da249a1896f54a2c30116a9446f7c4f55db743b  kodi-pvr-vbox-3.6.10-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk b/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
index 593c1e7c..2c54e149 100644
--- a/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
+++ b/bsp/buildroot/package/kodi-pvr-vbox/kodi-pvr-vbox.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VBOX_VERSION = 15e864d160da5a051e18aef06f3a53e49808be02
+KODI_PVR_VBOX_VERSION = 3.6.10-Krypton
 KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
-KODI_PVR_VBOX_LICENSE = GPLv2+
+KODI_PVR_VBOX_LICENSE = GPL-2.0+
 KODI_PVR_VBOX_LICENSE_FILES = src/client.h
 KODI_PVR_VBOX_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
index ecce639d..6d42583a 100644
--- a/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
+++ b/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 1d9e70030b73f44786d54e42e46c6bfa7810af3e4c71ba0dca95c2aa1751ef9b kodi-pvr-vdr-vnsi-7e11b853637ec436e30e4ac826de6ee87c303482.tar.gz
+sha256 b65acb7ade6eaac395ea357158a4aae5ccd141612acfd834b72fbdf8db4e8b0e  kodi-pvr-vdr-vnsi-4ed7d602924dbfcdd2770c0e13423092e829460d.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
index f8e1e927..e068641c 100644
--- a/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
+++ b/bsp/buildroot/package/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VDR_VNSI_VERSION = 7e11b853637ec436e30e4ac826de6ee87c303482
+KODI_PVR_VDR_VNSI_VERSION = 4ed7d602924dbfcdd2770c0e13423092e829460d
 KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION))
-KODI_PVR_VDR_VNSI_LICENSE = GPLv2+
+KODI_PVR_VDR_VNSI_LICENSE = GPL-2.0+
 KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h
 KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
index efdb1253..f4f67569 100644
--- a/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
+++ b/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 9684775c296dfd9b925d73ed1c21bee45afba4785d1bfb226f98b09ed235a8ee kodi-pvr-vuplus-815ea2f303dbe7dd19f87c53965dfdf2358fcdc8.tar.gz
+sha256 a8c7345e4e2e415e29c21f14460b257dfbe08ed5ecf1cc2dc6bc393a10f95cf3  kodi-pvr-vuplus-2.4.12-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
index e839bcce..581d884c 100644
--- a/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
+++ b/bsp/buildroot/package/kodi-pvr-vuplus/kodi-pvr-vuplus.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_VUPLUS_VERSION = 815ea2f303dbe7dd19f87c53965dfdf2358fcdc8
+KODI_PVR_VUPLUS_VERSION = 2.4.12-Krypton
 KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION))
-KODI_PVR_VUPLUS_LICENSE = GPLv2+
+KODI_PVR_VUPLUS_LICENSE = GPL-2.0+
 KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h
 KODI_PVR_VUPLUS_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash b/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
index 6cbdede3..4c050fb6 100644
--- a/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
+++ b/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 25963d8acbce397b6ec940d5ee1d7a69481d295ae31876daf57d3d3537b14543 kodi-pvr-wmc-949fcd162206b569af15942180e6c133ad61e336.tar.gz
+sha256 7f5dfb88f54d511d575b7aabd94e1a862afb7e8a0b89fa957db6a135c31846eb  kodi-pvr-wmc-1.4.9v2-Krypton.tar.gz
diff --git a/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk b/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
index 194bd1f2..b6e3d432 100644
--- a/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
+++ b/bsp/buildroot/package/kodi-pvr-wmc/kodi-pvr-wmc.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-# This cset is on the branch 'Jarvis'
+# This cset is on the branch 'Krypton'
 # When Kodi is updated, then this should be updated to the corresponding branch
-KODI_PVR_WMC_VERSION = 949fcd162206b569af15942180e6c133ad61e336
+KODI_PVR_WMC_VERSION = 1.4.9v2-Krypton
 KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION))
-KODI_PVR_WMC_LICENSE = GPLv2+
+KODI_PVR_WMC_LICENSE = GPL-2.0+
 KODI_PVR_WMC_LICENSE_FILES = src/client.h
 KODI_PVR_WMC_DEPENDENCIES = kodi-platform
 
diff --git a/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
index a70f1b0a..7d105bee 100644
--- a/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
+++ b/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 b76b9ba122cebddc7c201b088d93e86fde8fc76e7e9f167ff3e43c3390088f3f kodi-screensaver-asteroids-c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa.tar.gz
+sha256 2e072e6aad12f707dec1e70b7df26c590bb41fed8880dcfdbe6c99949b7e287a  kodi-screensaver-asteroids-v1.1.2.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
index 1af1f2ed..46df2e76 100644
--- a/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
+++ b/bsp/buildroot/package/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_ASTEROIDS_VERSION = c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa
+KODI_SCREENSAVER_ASTEROIDS_VERSION = v1.1.2
 KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION))
-KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPLv2+
+KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp
 KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
index 5f04031a..f8f6d7b2 100644
--- a/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
+++ b/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 6bf9367889c4ddece7e0c3720762d41bb0b22fc9ab28d1c8759edb1f77487ecd kodi-screensaver-asterwave-0dc2c48dadb100954eef823e7e3a5f502ce65b1e.tar.gz
+sha256 48cd459b60b2407b8bae9107760a013d04ee29e00fddbce9550291896d42ef64  kodi-screensaver-asterwave-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
index 7c718ccd..b8c3a2ad 100644
--- a/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
+++ b/bsp/buildroot/package/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_ASTERWAVE_VERSION = 0dc2c48dadb100954eef823e7e3a5f502ce65b1e
+KODI_SCREENSAVER_ASTERWAVE_VERSION = v1.1.0
 KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,notspiff,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION))
 KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil
 
diff --git a/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
index 6fc273d1..63b9d3c9 100644
--- a/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
+++ b/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 25e497c6843a7d933d1e4736e8dcb671bc9881328d5e27349dd0b25cb9be07eb kodi-screensaver-biogenesis-39928eef56ed639085d401dd97bf18f44b1f3e8b.tar.gz
+sha256 b97dc804261b19df725e0a9f1af3be6903226ae616fcac170f7b9c1a67bf811a  kodi-screensaver-biogenesis-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
index dce6968d..c5ebd855 100644
--- a/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
+++ b/bsp/buildroot/package/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_BIOGENESIS_VERSION = 39928eef56ed639085d401dd97bf18f44b1f3e8b
+KODI_SCREENSAVER_BIOGENESIS_VERSION = v1.1.0
 KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION))
-KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPLv2+
+KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp
 KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
index ebf19d9d..21443d82 100644
--- a/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
+++ b/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 c2d19c33aff73b99cbf51f943b62e58b2b6233dcf1d789ae8f73e92fa96f07bc kodi-screensaver-cpblobs-87a3abfbe6e4fd1089548eab77a84902d0e1af60.tar.gz
+sha256 1ca5e4de61251de7e420dc6ded3156960f9bb52ed7ff0243f305768147d470e3  kodi-screensaver-cpblobs-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
index bf67ea08..63a8dfa8 100644
--- a/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
+++ b/bsp/buildroot/package/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_CPBLOBS_VERSION = 87a3abfbe6e4fd1089548eab77a84902d0e1af60
+KODI_SCREENSAVER_CPBLOBS_VERSION = v1.1.0
 KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,notspiff,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION))
-KODI_SCREENSAVER_CPBLOBS_LICENSE = GPLv2
+KODI_SCREENSAVER_CPBLOBS_LICENSE = GPL-2.0
 KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE
 KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil
 
diff --git a/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
index 01183d74..ff9d6d02 100644
--- a/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
+++ b/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 680e9354adcb7048b5c2b55b3c49cf37cea0e12e6564018cd694feeb253c90dd kodi-screensaver-crystalmorph-2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68.tar.gz
+sha256 a8400c8d8be0fe0ba616ad1d0ef5fd798980a9dd4e38ef88bee9bf74a06975d5  kodi-screensaver-crystalmorph-1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
index 49ddb43c..83629e41 100644
--- a/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
+++ b/bsp/buildroot/package/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68
+KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 1dc9bf3f57cc2c5345efec64d9499c3bf8f7bd6e
 KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION))
-KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPLv2+
+KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp
 KODI_SCREENSAVER_CRYSTALMORPH_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
index 93394532..212aee66 100644
--- a/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
+++ b/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 fc114434db18a885fda30ac6b82fe82ec1d5ed97e2ff6414b4927487da684871 kodi-screensaver-greynetic-80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb.tar.gz
+sha256 55a77487f02d282e8431e64de3cb263489037c2374a4b9cdd7aa189093e7621f  kodi-screensaver-greynetic-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
index 9773bac1..66435eb2 100644
--- a/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
+++ b/bsp/buildroot/package/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_GREYNETIC_VERSION = 80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb
+KODI_SCREENSAVER_GREYNETIC_VERSION = v1.1.0
 KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION))
-KODI_SCREENSAVER_GREYNETIC_LICENSE = GPLv2+
+KODI_SCREENSAVER_GREYNETIC_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp
 KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
index 5ae2459c..55deabea 100644
--- a/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
+++ b/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 91990a29072cf85f4b9253a16a362d83fdfcc7595de796d982a189aa8618555c  kodi-screensaver-matrixtrails-16057e7195f930109f0a4aea999296ca315700e5.tar.gz
+sha256 2b531f51b86536df2a5268547e3d1b7fabc8a1dc930808b46685afcc455bb8fa  kodi-screensaver-matrixtrails-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
index 5ecacdf5..142e48dc 100644
--- a/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
+++ b/bsp/buildroot/package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 16057e7195f930109f0a4aea999296ca315700e5
+KODI_SCREENSAVER_MATRIXTRAILS_VERSION = v1.1.0
 KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,notspiff,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
-KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPLv2+
+KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp
 
 KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil
diff --git a/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
index 79d4dd40..aad8314b 100644
--- a/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
+++ b/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 59a5cdfa6387760205efabcd91bc64fdc92f103c8f213b650018160f6c1a691c kodi-screensaver-pingpong-5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17.tar.gz
+sha256 99e9cbc3815d4e3dad964b2d233dbf6acc4416121398f7fca75f3811cb04d88f  kodi-screensaver-pingpong-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
index 2adf9601..8b6426da 100644
--- a/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
+++ b/bsp/buildroot/package/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_PINGPONG_VERSION = 5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17
+KODI_SCREENSAVER_PINGPONG_VERSION = v1.1.0
 KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION))
-KODI_SCREENSAVER_PINGPONG_LICENSE = GPLv2+
+KODI_SCREENSAVER_PINGPONG_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt
 KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash b/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash
index 9aea9292..de5f6cf5 100644
--- a/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash
+++ b/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 13ce2881f8eaf9936691cf66b9f3471a718ae87249d62ade55174201873fb496 kodi-screensaver-planestate-95b6d1ec72f37bcd16cf8e5d49806193dba883f0.tar.gz
+sha256 6059630e56bd022a27f73fe7c94fcf6a66792e7bb10f54a7893f536c23b95b99  kodi-screensaver-planestate-5341406dd05439a1a0245ab3f6d1a8964461d0e5.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk b/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk
index 38885c5c..0e90ffc5 100644
--- a/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk
+++ b/bsp/buildroot/package/kodi-screensaver-planestate/kodi-screensaver-planestate.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_PLANESTATE_VERSION = 95b6d1ec72f37bcd16cf8e5d49806193dba883f0
+KODI_SCREENSAVER_PLANESTATE_VERSION = 5341406dd05439a1a0245ab3f6d1a8964461d0e5
 KODI_SCREENSAVER_PLANESTATE_SITE = $(call github,notspiff,screensaver.planestate,$(KODI_SCREENSAVER_PLANESTATE_VERSION))
 KODI_SCREENSAVER_PLANESTATE_DEPENDENCIES = kodi libsoil
 
diff --git a/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
index c79e3f5f..a16ee8e0 100644
--- a/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
+++ b/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 951bc3259407b7f21183c34556b1efc4c40bfafec61008cd543f382f67466184 kodi-screensaver-pyro-2476b77d9954980a27e07eb8eb0727e2af226351.tar.gz
+sha256 0dcaed581ffe5595878338a8c9c55bd7acc87e03d30a4d3ca4a03c3f8db66ddc  kodi-screensaver-pyro-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
index f9040527..bc501183 100644
--- a/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
+++ b/bsp/buildroot/package/kodi-screensaver-pyro/kodi-screensaver-pyro.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_PYRO_VERSION = 2476b77d9954980a27e07eb8eb0727e2af226351
+KODI_SCREENSAVER_PYRO_VERSION = v1.1.0
 KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION))
-KODI_SCREENSAVER_PYRO_LICENSE = GPLv2+
+KODI_SCREENSAVER_PYRO_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp
 KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/bsp/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch
index 56c2f4e4..a7b2053d 100644
--- a/bsp/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch
+++ b/bsp/buildroot/package/kodi-screensaver-rsxs/0001-cross-compile.patch
@@ -27,7 +27,7 @@ diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLi
  endif()
  externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
 -                    CONFIGURE_COMMAND ${configure_start}
-+                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no
++                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ac_cv_type__Bool=yes
 +                                      ac_cv_func_malloc_0_nonnull=yes
 +                                      ${configure_start}
                                        --prefix=<INSTALL_DIR>
diff --git a/bsp/buildroot/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch b/bsp/buildroot/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
new file mode 100644
index 00000000..a7e7c74b
--- /dev/null
+++ b/bsp/buildroot/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
@@ -0,0 +1,28 @@
+Fix X include path to prevent error during configure
+
+Downloaded from
+https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/patches/screensavers.rsxs-0002-fix-default-include-dir.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt
+--- screensavers.rsxs-3241d29.orig/CMakeLists.txt	2015-10-22 23:59:38.187280475 -0700
++++ screensavers.rsxs-3241d29/CMakeLists.txt	2015-10-23 00:00:27.228113829 -0700
+@@ -17,7 +17,7 @@
+ include_directories(${OpenGL_INCLUDE_DIR}
+                     ${PNG_INCLUDE_DIR}
+                     ${KODI_INCLUDE_DIR}
+-                    ${X_INCLUDE_DIRS}
++                    ${X_INCLUDE_DIR}
+                     ${CMAKE_BINARY_DIR}/rsxs-prefix/src/rsxs-build
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/lib
+@@ -67,7 +67,7 @@
+                                       --disable-skyrocket
+                                       --disable-solarwinds
+                                       --disable-sound
+-                                      --x-includes=${X_INCLUDE_DIRS}
++                                      --x-includes=${X_INCLUDE_DIR}
+                                       --x-libraries=${X_LIBRARIES}
+                                       ${PNG_PATH}
+                                       ${EXTRA_FLAGS}
diff --git a/bsp/buildroot/package/kodi-screensaver-rsxs/Config.in b/bsp/buildroot/package/kodi-screensaver-rsxs/Config.in
index 11546ad1..c523ce5a 100644
--- a/bsp/buildroot/package/kodi-screensaver-rsxs/Config.in
+++ b/bsp/buildroot/package/kodi-screensaver-rsxs/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
 	bool "kodi-screensaver-rsxs"
 	depends on BR2_PACKAGE_HAS_LIBGL # libglu
 	depends on BR2_PACKAGE_XORG7 # xlib_libXmu
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_XLIB_LIBXMU
 	help
 	  RSXS screensaver add-ons for Kodi
diff --git a/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
index 568b44b3..66d79a06 100644
--- a/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
+++ b/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz
+sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6  kodi-screensaver-rsxs-v1.3.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
index 7df6c22c..8445bf88 100644
--- a/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
+++ b/bsp/buildroot/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
+KODI_SCREENSAVER_RSXS_VERSION = v1.3.0
 KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
-KODI_SCREENSAVER_RSXS_LICENSE = GPLv3
+KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
 KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
-
-KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu
+KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash b/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
index 107ada47..7f8c9aef 100644
--- a/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
+++ b/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 79633afcdccf5df31c98d2144bd23086d691e7749255b4295b183b535d9b7abf kodi-screensaver-stars-28bf79d4dce040e9fbdc25f51007e13950cab937.tar.gz
+sha256 525caac94fd2bd858daf9fa7719eea4181c168e5c692bb896689625bf4437d32  kodi-screensaver-stars-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk b/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
index b5b5206d..e94670c6 100644
--- a/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
+++ b/bsp/buildroot/package/kodi-screensaver-stars/kodi-screensaver-stars.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_STARS_VERSION = 28bf79d4dce040e9fbdc25f51007e13950cab937
+KODI_SCREENSAVER_STARS_VERSION = v1.1.0
 KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION))
-KODI_SCREENSAVER_STARS_LICENSE = GPLv2+
+KODI_SCREENSAVER_STARS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp
 KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-skin-confluence/Config.in b/bsp/buildroot/package/kodi-skin-confluence/Config.in
new file mode 100644
index 00000000..08b65680
--- /dev/null
+++ b/bsp/buildroot/package/kodi-skin-confluence/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_KODI_SKIN_CONFLUENCE
+	bool "kodi-skin-confluence"
+	help
+	  Kodi confluence skin
+
+	  https://github.com/xbmc/skin.confluence
diff --git a/bsp/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash b/bsp/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash
new file mode 100644
index 00000000..2dabbbd4
--- /dev/null
+++ b/bsp/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 1fa8ebeec269e678111f64bec373d98e34b4ba1b32e583a505431b2562910ba0  kodi-skin-confluence-37bba429adc16d49a07add08de406682e1cc673a.tar.gz
diff --git a/bsp/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk b/bsp/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk
new file mode 100644
index 00000000..e9cdf3fb
--- /dev/null
+++ b/bsp/buildroot/package/kodi-skin-confluence/kodi-skin-confluence.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# kodi-skin-confluence
+#
+################################################################################
+
+# This cset is on the branch 'krypton'
+# When Kodi is updated, then this should be updated to the corresponding branch
+KODI_SKIN_CONFLUENCE_VERSION = 37bba429adc16d49a07add08de406682e1cc673a
+KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION))
+KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0
+KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt
+KODI_SKIN_CONFLUENCE_DEPENDENCIES = kodi
+
+define KODI_SKIN_CONFLUENCE_BUILD_CMDS
+	$(HOST_DIR)/bin/TexturePacker -input $(@D)/media/ -output $(@D)/media/Textures.xbt -dupecheck -use_none
+endef
+
+define KODI_SKIN_CONFLUENCE_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence
+	cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence
+	find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.jpg -delete
+	find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.png -delete
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/kodi/0002-texturepacker.patch b/bsp/buildroot/package/kodi-texturepacker/0001-texturepacker.patch
similarity index 100%
rename from bsp/buildroot/package/kodi/0002-texturepacker.patch
rename to bsp/buildroot/package/kodi-texturepacker/0001-texturepacker.patch
diff --git a/bsp/buildroot/package/kodi-texturepacker/0002-fix_reallocarray.patch b/bsp/buildroot/package/kodi-texturepacker/0002-fix_reallocarray.patch
new file mode 100644
index 00000000..e32d09ef
--- /dev/null
+++ b/bsp/buildroot/package/kodi-texturepacker/0002-fix_reallocarray.patch
@@ -0,0 +1,170 @@
+From ebc5dfcad836936a14e6f18fd7faa377b3c804e7 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Mon, 6 Nov 2017 11:47:28 +0000
+Subject: [PATCH] TexturePacker: use C++ headers
+
+Signed-off-by: Dagg Stompler <daggs@gmx.com>
+---
+ tools/depends/native/TexturePacker/src/SimpleFS.h            | 4 ++--
+ tools/depends/native/TexturePacker/src/TexturePacker.cpp     | 2 +-
+ tools/depends/native/TexturePacker/src/XBTFWriter.cpp        | 6 +++---
+ tools/depends/native/TexturePacker/src/XBTFWriter.h          | 2 +-
+ tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +-
+ tools/depends/native/TexturePacker/src/md5.h                 | 4 ++--
+ 6 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/tools/depends/native/TexturePacker/src/SimpleFS.h b/tools/depends/native/TexturePacker/src/SimpleFS.h
+index c48814c0ad..c2288cf8de 100644
+--- a/tools/depends/native/TexturePacker/src/SimpleFS.h
++++ b/tools/depends/native/TexturePacker/src/SimpleFS.h
+@@ -20,9 +20,9 @@
+  *
+  */
+ 
+-#include <stdio.h>
++#include <cstdio>
+ #include <string>
+-#include <stdint.h>
++#include <cstdint>
+ 
+ class CFile
+ {
+diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp
+index ba618be574..045c5ce38d 100644
+--- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp
++++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp
+@@ -22,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #define __STDC_FORMAT_MACROS
+-#include <inttypes.h>
++#include <cinttypes>
+ #define platform_stricmp _stricmp
+ #else
+ #define platform_stricmp stricmp
+diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
+index 9e2493369b..2e80ba674c 100644
+--- a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
++++ b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp
+@@ -19,14 +19,14 @@
+  */
+ 
+ #define __STDC_FORMAT_MACROS
+-#include <inttypes.h>
++#include <cinttypes>
+ #if defined(TARGET_FREEBSD) || defined(TARGET_DARWIN)
+-#include <stdlib.h>
++#include <cstdlib>
+ #elif !defined(TARGET_DARWIN)
+ #include <malloc.h>
+ #endif
+ #include <memory.h>
+-#include <string.h>
++#include <cstring>
+ 
+ #include "XBTFWriter.h"
+ #include "guilib/XBTFReader.h"
+diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.h b/tools/depends/native/TexturePacker/src/XBTFWriter.h
+index 7509303a51..d5cf1a2965 100644
+--- a/tools/depends/native/TexturePacker/src/XBTFWriter.h
++++ b/tools/depends/native/TexturePacker/src/XBTFWriter.h
+@@ -23,7 +23,7 @@
+ 
+ #include <vector>
+ #include <string>
+-#include <stdio.h>
++#include <cstdio>
+ 
+ #include "guilib/XBTF.h"
+ 
+diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
+index 56c22f7c3a..3ddb20fe88 100644
+--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
++++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
+@@ -20,7 +20,7 @@
+ 
+ #include "GifHelper.h"
+ #include <algorithm>
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <cstring>
+ 
+ #define UNSIGNED_LITTLE_ENDIAN(lo, hi)	((lo) | ((hi) << 8))
+diff --git a/tools/depends/native/TexturePacker/src/md5.h b/tools/depends/native/TexturePacker/src/md5.h
+index 456e5be17f..4bb48e0810 100644
+--- a/tools/depends/native/TexturePacker/src/md5.h
++++ b/tools/depends/native/TexturePacker/src/md5.h
+@@ -23,8 +23,8 @@
+ #ifndef MD5_H
+ #define MD5_H
+ 
+-#include <string.h>		/* for memcpy() */
+-#include <stdint.h>
++#include <cstring>		/* for memcpy() */
++#include <cstdint>
+ 
+ struct MD5Context 
+ {
+-- 
+2.16.0
+
+From ff3e6dad5fdb7b9a2985b2547c8020c709af0340 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Mon, 6 Nov 2017 18:05:17 +0000
+Subject: [PATCH] TexturePacker: drop unused variable
+
+---
+ tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
+index 53f5e9beb7..b0f18bed68 100644
+--- a/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
++++ b/tools/depends/native/TexturePacker/src/decoder/JPGDecoder.cpp
+@@ -72,7 +72,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames)
+   struct jpeg_decompress_struct cinfo;
+   struct jpeg_error_mgr jerr;
+   
+-  char *linha;
+   int ImageSize;
+   
+   cinfo.err = jpeg_std_error(&jerr);
+@@ -89,7 +88,6 @@ bool JPGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames)
+   DecodedFrame frame;
+   
+   frame.rgbaImage.pixels = (char *)new char[ImageSize];
+-  linha = (char *)frame.rgbaImage.pixels;
+   
+   unsigned char *scanlinebuff = new unsigned char[3 * cinfo.image_width];
+   unsigned char *dst = (unsigned char *)frame.rgbaImage.pixels;
+-- 
+2.16.0
+
+From ee441543be07de1222bcff2587bfcdb5c1231989 Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Mon, 6 Nov 2017 21:02:06 +0000
+Subject: [PATCH] TexturePacker: include GifHelper after system headers
+
+---
+ tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
+index 3ddb20fe88..9ced4ec5bc 100644
+--- a/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
++++ b/tools/depends/native/TexturePacker/src/decoder/GifHelper.cpp
+@@ -18,10 +18,10 @@
+  *
+  */
+ 
+-#include "GifHelper.h"
+ #include <algorithm>
+ #include <cstdlib>
+ #include <cstring>
++#include "GifHelper.h"
+ 
+ #define UNSIGNED_LITTLE_ENDIAN(lo, hi)	((lo) | ((hi) << 8))
+ #define GIF_MAX_MEMORY 82944000U // about 79 MB, which is equivalent to 10 full hd frames.
+-- 
+2.16.0
+
diff --git a/bsp/buildroot/package/kodi-texturepacker/kodi-texturepacker.hash b/bsp/buildroot/package/kodi-texturepacker/kodi-texturepacker.hash
new file mode 120000
index 00000000..a5757509
--- /dev/null
+++ b/bsp/buildroot/package/kodi-texturepacker/kodi-texturepacker.hash
@@ -0,0 +1 @@
+../kodi/kodi.hash
\ No newline at end of file
diff --git a/bsp/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk b/bsp/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk
new file mode 100644
index 00000000..31e3580a
--- /dev/null
+++ b/bsp/buildroot/package/kodi-texturepacker/kodi-texturepacker.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# kodi-texturepacker
+#
+################################################################################
+
+# Not possible to directly refer to kodi variables, because of
+# first/second expansion trickery...
+KODI_TEXTUREPACKER_VERSION = 17.6-Krypton
+KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
+KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
+KODI_TEXTUREPACKER_LICENSE = GPL-2.0
+KODI_TEXTUREPACKER_LICENSE_FILES = LICENSE.GPL
+HOST_KODI_TEXTUREPACKER_SUBDIR = tools/depends/native/TexturePacker
+HOST_KODI_TEXTUREPACKER_DEPENDENCIES = \
+	host-giflib \
+	host-libjpeg \
+	host-libpng \
+	host-lzo
+
+HOST_KODI_TEXTUREPACKER_CXXFLAGS = \
+	$(HOST_CXXFLAGS) \
+	-std=c++0x \
+	-DTARGET_POSIX \
+	-DTARGET_LINUX \
+	-D_LINUX \
+	-I$(@D)/xbmc/linux
+
+HOST_KODI_TEXTUREPACKER_CONF_OPTS += \
+	-DCMAKE_CXX_FLAGS="$(HOST_KODI_TEXTUREPACKER_CXXFLAGS)" \
+	-DCMAKE_MODULE_PATH=$(@D)/project/cmake/modules \
+	-DCORE_SOURCE_DIR=$(@D) \
+	-Wno-dev
+
+define HOST_KODI_TEXTUREPACKER_INSTALL_CMDS
+	$(INSTALL) -m 755 -D \
+		$(@D)/tools/depends/native/TexturePacker/TexturePacker \
+		$(HOST_DIR)/bin/TexturePacker
+endef
+
+$(eval $(host-cmake-package))
diff --git a/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
index 6a65a58f..c89ca9a6 100644
--- a/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
+++ b/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 7047d501942bcd5095e0f1424f003caec8eb792b59d16d16ad25f14829844e50 kodi-visualisation-fishbmc-50c38c296a62e096a2216e43b86d864ee265c506.tar.gz
+sha256 cf42a21978578cb5ecb10c20fe09791183d8ef2998ff9d956a84142a7dda8f72  kodi-visualisation-fishbmc-v4.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
index 1e07774f..d08c215e 100644
--- a/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
+++ b/bsp/buildroot/package/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_FISHBMC_VERSION = 50c38c296a62e096a2216e43b86d864ee265c506
+KODI_VISUALISATION_FISHBMC_VERSION = v4.1.0
 KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION))
-KODI_VISUALISATION_FISHBMC_LICENSE = GPLv2+
+KODI_VISUALISATION_FISHBMC_LICENSE = GPL-2.0+
 KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE
 KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-visualisation-fountain/Config.in b/bsp/buildroot/package/kodi-visualisation-fountain/Config.in
deleted file mode 100644
index 570d1693..00000000
--- a/bsp/buildroot/package/kodi-visualisation-fountain/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN
-	bool "kodi-visualisation-fountain"
-	depends on BR2_PACKAGE_HAS_LIBGL # libsoil
-	select BR2_PACKAGE_LIBSOIL
-	help
-	  Fountain visualization for Kodi
-
-	  https://github.com/notspiff/visualization.fountain
-
-comment "kodi-visualisation-fountain needs OpenGL"
-	depends on !BR2_PACKAGE_HAS_LIBGL
diff --git a/bsp/buildroot/package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash b/bsp/buildroot/package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
deleted file mode 100644
index 8dc933ef..00000000
--- a/bsp/buildroot/package/kodi-visualisation-fountain/kodi-visualisation-fountain.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 7b2867f415f22e4bc4ba834034f00117fcf76774aea0afc7bf30b5f2d1991dd7 kodi-visualisation-fountain-f22deacd2396a204694d346f85369ea9ea70e16f.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk b/bsp/buildroot/package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk
deleted file mode 100644
index 5684402a..00000000
--- a/bsp/buildroot/package/kodi-visualisation-fountain/kodi-visualisation-fountain.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-################################################################################
-#
-# kodi-visualisation-fountain
-#
-################################################################################
-
-KODI_VISUALISATION_FOUNTAIN_VERSION = f22deacd2396a204694d346f85369ea9ea70e16f
-KODI_VISUALISATION_FOUNTAIN_SITE = $(call github,notspiff,visualization.fountain,$(KODI_VISUALISATION_FOUNTAIN_VERSION))
-KODI_VISUALISATION_FOUNTAIN_DEPENDENCIES = kodi libsoil
-
-$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash b/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
index 8507c652..fa5fbf6c 100644
--- a/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
+++ b/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 66a71a5c5a1c0016d7020fcc9941634ee465dab14644cdc96023ce0a28408338 kodi-visualisation-goom-16747b7dba9cbdcfdc8df44e849eaf09450fc86f.tar.gz
+sha256 501b8b1d5bd174ec71d57894293ae5eb0c1f41c3b725ab5e7b5a1c5eeea77a7f  kodi-visualisation-goom-54da35870930acd1a3a36195dd2c1498ac336b90.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk b/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
index 89f2bab1..a7503a97 100644
--- a/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
+++ b/bsp/buildroot/package/kodi-visualisation-goom/kodi-visualisation-goom.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_GOOM_VERSION = 16747b7dba9cbdcfdc8df44e849eaf09450fc86f
+KODI_VISUALISATION_GOOM_VERSION = 54da35870930acd1a3a36195dd2c1498ac336b90
 KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION))
-KODI_VISUALISATION_GOOM_LICENSE = GPLv2+
+KODI_VISUALISATION_GOOM_LICENSE = GPL-2.0+
 KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp
 
 KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi
diff --git a/bsp/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/bsp/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
index 6737296f..8de96a6d 100644
--- a/bsp/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
+++ b/bsp/buildroot/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
@@ -23,9 +23,9 @@ index 8b084cf..81bbe27 100644
  
 -  include_directories(${OpenGL_INCLUDE_DIR}
 +  include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS}
-                       ${GLEW_INCLUDE_DIR}
                        ${KODI_INCLUDE_DIR}
-                       ${platform_INCLUDE_DIRS}
+                       ${p8-platform_INCLUDE_DIRS}
+                       ${PROJECT_SOURCE_DIR}/lib/kissfft
 diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake
 index e1b7d21..2a9ce0d 100644
 --- a/FindOpenGLES2.cmake
diff --git a/bsp/buildroot/package/kodi-visualisation-shadertoy/Config.in b/bsp/buildroot/package/kodi-visualisation-shadertoy/Config.in
index ac177027..3b981d0b 100644
--- a/bsp/buildroot/package/kodi-visualisation-shadertoy/Config.in
+++ b/bsp/buildroot/package/kodi-visualisation-shadertoy/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY
 	bool "kodi-visualisation-shadertoy"
-	select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_LIBPLATFORM
 	help
 	  Shadertoy visualiser for Kodi
diff --git a/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
index fdd81fd5..a0df397e 100644
--- a/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
+++ b/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 88732c399bb7e1237e8fc375583bb3789c96a28695a3805fb374361a7e5636c5 kodi-visualisation-shadertoy-f9988007681bf37e6c03d6992bae30133b020608.tar.gz
+sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd  kodi-visualisation-shadertoy-v1.1.5.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
index e5f2d911..92389159 100644
--- a/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
+++ b/bsp/buildroot/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
@@ -4,14 +4,10 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_SHADERTOY_VERSION = f9988007681bf37e6c03d6992bae30133b020608
+KODI_VISUALISATION_SHADERTOY_VERSION = v1.1.5
 KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
-KODI_VISUALISATION_SHADERTOY_LICENSE = GPLv2+
+KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+
 KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
 KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform
 
-ifeq ($(BR2_PACKAGE_LIBGLEW),y)
-KODI_VISUALISATION_SHADERTOY_DEPENDENCIES += libglew
-endif
-
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
index 18e38f57..6c892ed0 100644
--- a/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
+++ b/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 aa417d6ad3d3770029e7d8d9f7f0ca8d56a8a4f47821267b5a8604fc26993334 kodi-visualisation-spectrum-9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e.tar.gz
+sha256 7ee78ff5c24e3f81b6e2a9208237f34667cb9faa5453d7bdb900ab65245973f1  kodi-visualisation-spectrum-v1.1.1.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
index de197eb7..3ab2c997 100644
--- a/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
+++ b/bsp/buildroot/package/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_SPECTRUM_VERSION = 9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e
+KODI_VISUALISATION_SPECTRUM_VERSION = v1.1.1
 KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION))
-KODI_VISUALISATION_SPECTRUM_LICENSE = GPLv2+
+KODI_VISUALISATION_SPECTRUM_LICENSE = GPL-2.0+
 KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING
 KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash b/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash
index 5f49daae..e7e97f1d 100644
--- a/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash
+++ b/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2590ce4ee1816ffdf59fe33580a36fba49fbd1f60f4c9022b3315e04debc9c73 kodi-visualisation-waveforhue-e87d5c7d7e7504036b80af8bc89f4cf6489085fe.tar.gz
+sha256 80c466c55aee97d01442892135d4785070333e39f45942da17b65239758e5ae9  kodi-visualisation-waveforhue-b1805dbdba07e5e5b62115490c703aca43e9065c.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk b/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
index 28eeb4d8..3ff32e65 100644
--- a/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
+++ b/bsp/buildroot/package/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_WAVEFORHUE_VERSION = e87d5c7d7e7504036b80af8bc89f4cf6489085fe
-KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
-KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPLv2+
+KODI_VISUALISATION_WAVEFORHUE_VERSION = b1805dbdba07e5e5b62115490c703aca43e9065c
+KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,hardyt,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION))
+KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPL-2.0+
 KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING
 KODI_VISUALISATION_WAVEFORHUE_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
index 728b857e..1fdecbed 100644
--- a/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
+++ b/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 439bd50fcb1c0912532d0d113f7eeadf28f72bd2cb0c234581ee1acc2a70e45b kodi-visualisation-waveform-89aec48e2975f820004df5a1a53801339a5b3064.tar.gz
+sha256 cf10d8d78cb2bde4a0a21bb7e467445617b46593c093ef05f336f95a048f2d54  kodi-visualisation-waveform-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
index 81e880b0..d906c653 100644
--- a/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
+++ b/bsp/buildroot/package/kodi-visualisation-waveform/kodi-visualisation-waveform.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_WAVEFORM_VERSION = 89aec48e2975f820004df5a1a53801339a5b3064
+KODI_VISUALISATION_WAVEFORM_VERSION = v1.1.0
 KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION))
-KODI_VISUALISATION_WAVEFORM_LICENSE = GPLv2+
+KODI_VISUALISATION_WAVEFORM_LICENSE = GPL-2.0+
 KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING
 KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi
 
diff --git a/bsp/buildroot/package/kodi/0001-Fixup-include-path.patch b/bsp/buildroot/package/kodi/0001-Fixup-include-path.patch
deleted file mode 100644
index 9298981c..00000000
--- a/bsp/buildroot/package/kodi/0001-Fixup-include-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 63c255f1f5d68363f49193aceed343e602dc8bdf Mon Sep 17 00:00:00 2001
-From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
-Date: Thu, 26 Dec 2013 21:17:10 +0100
-Subject: [PATCH] Fixup include path
-
-Patch originally taken from :
-http://repository.timesys.com/buildsources/x/xbmc/xbmc-11.0/xbmc-11.0-fixups.patch
-
-Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
----
- lib/enca/configure                           | 3 ---
- lib/enca/configure.ac                        | 3 ---
- lib/libdvd/libdvdread/misc/dvdread-config.sh | 6 +++---
- lib/timidity/configure.in                    | 6 +++---
- 4 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/lib/libdvd/libdvdread/misc/dvdread-config.sh b/lib/libdvd/libdvdread/misc/dvdread-config.sh
-index e170c7e..25ee893 100644
---- a/lib/libdvd/libdvdread/misc/dvdread-config.sh
-+++ b/lib/libdvd/libdvdread/misc/dvdread-config.sh
-@@ -48,9 +48,9 @@ if test "$echo_prefix" = "yes"; then
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $extracflags
-+      echo $extracflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir $dvdreadlib
--fi      
-+      echo $dvdreadlib
-+fi
diff --git a/bsp/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/bsp/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
new file mode 100644
index 00000000..0b88ce9d
--- /dev/null
+++ b/bsp/buildroot/package/kodi/0001-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
@@ -0,0 +1,42 @@
+From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 29 Jul 2015 23:13:33 +0200
+Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
+ cross-compilation
+
+When cross-compiling, the location at build time of the libraries is
+not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
+is here to handle this difference, so use it in kodi-config.cmake.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+(rebased and simplified for Kodi 17.0-Krypton)
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ project/cmake/KodiConfig.cmake.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/project/cmake/KodiConfig.cmake.in b/project/cmake/KodiConfig.cmake.in
+index 76626ec..ffb8e1d 100644
+--- a/project/cmake/KodiConfig.cmake.in
++++ b/project/cmake/KodiConfig.cmake.in
+@@ -7,7 +7,7 @@ if(NOT @APP_NAME_UC@_PREFIX)
+   set(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
+ endif()
+ if(NOT @APP_NAME_UC@_INCLUDE_DIR)
+-  set(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
++  set(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
+ endif()
+ if(NOT @APP_NAME_UC@_LIB_DIR)
+   set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
+@@ -18,7 +18,7 @@ endif()
+ if(NOT WIN32)
+   set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
+ endif()
+-list(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@ @APP_DATA_DIR@/cmake)
++list(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@ ${CMAKE_FIND_ROOT_PATH}/@APP_DATA_DIR@/cmake)
+ 
+ string(REPLACE ";" " " ARCH_DEFINES "@ARCH_DEFINES@")
+ add_definitions(${ARCH_DEFINES} -DBUILD_KODI_ADDON)
+-- 
+2.5.0
+
diff --git a/bsp/buildroot/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch b/bsp/buildroot/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
new file mode 100644
index 00000000..80bf954d
--- /dev/null
+++ b/bsp/buildroot/package/kodi/0002-CMake-Remove-dependency-on-gmp-and-libintl-from-Find.patch
@@ -0,0 +1,39 @@
+CMake: Remove dependency on gmp and libintl from FindPython.cmake
+
+Downloaded from Openelec:
+https://github.com/OpenELEC/OpenELEC.tv/blob/master/packages/mediacenter/kodi/patches/kodi-998.02-cmake-python.patch
+
+The dependency for libintl and gmp was introduced by this commit
+https://github.com/xbmc/xbmc/commit/8558d672e98b62f3ea0126ba491376add8ed71cb
+without further explanation and, apparently, without necessity.
+
+A question asking whether this is really needed was sent upstream:
+https://github.com/xbmc/xbmc/pull/10973#pullrequestreview-34179550
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -Naur kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake
+--- kodi-17.1-Krypton/project/cmake/modules/FindPython.cmake	2017-03-20 17:17:49.000000000 +0100
++++ kodi-17.1-Krypton.patch/project/cmake/modules/FindPython.cmake	2017-03-30 11:10:01.065718667 +0200
+@@ -16,14 +16,12 @@
+ if(KODI_DEPENDSBUILD)
+   find_library(FFI_LIBRARY ffi REQUIRED)
+   find_library(EXPAT_LIBRARY expat REQUIRED)
+-  find_library(INTL_LIBRARY intl REQUIRED)
+-  find_library(GMP_LIBRARY gmp REQUIRED)
+ 
+   if(NOT CORE_SYSTEM_NAME STREQUAL android)
+     set(PYTHON_DEP_LIBRARIES pthread dl util)
+   endif()
+ 
+-  set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
++  set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${PYTHON_DEP_LIBRARIES})
+ else()
+   find_package(PythonLibs 2.7 REQUIRED)
+   list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES})
+@@ -36,4 +34,4 @@
+   set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+ endif()
+ 
+-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY)
++mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY)
diff --git a/bsp/buildroot/package/kodi/0003-ALSA-fix-device-change-event-support.patch b/bsp/buildroot/package/kodi/0003-ALSA-fix-device-change-event-support.patch
deleted file mode 100644
index b5f37b94..00000000
--- a/bsp/buildroot/package/kodi/0003-ALSA-fix-device-change-event-support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Patch sent upstream:
-
-https://github.com/xbmc/xbmc/pull/7551
-
-
-From a6d6a1a36ff2dff2586fbad2a068e7df14b55fdc Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sun, 19 Jul 2015 14:12:03 +0200
-Subject: [PATCH 1/1] ALSA: fix device change event support
-
-Current uClibc version 0.9.33.2 does not support eventfd_read/write.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure.ac                  |    5 ++++-
- xbmc/linux/FDEventMonitor.cpp |   12 ++++++++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d321f7d..4c6c750 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -911,7 +911,7 @@ AC_FUNC_STRFTIME
- AC_FUNC_STRTOD
- AC_FUNC_UTIME_NULL
- AC_FUNC_VPRINTF
--AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r])
-+AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r eventfd_read eventfd_write])
- 
- # Check for various sizes
- AC_CHECK_SIZEOF([int])
-@@ -2064,6 +2064,9 @@ fi
- if test "$use_alsa" = "yes"; then
-   USE_ALSA=1
-   AC_DEFINE([USE_ALSA],[1],["Define to 1 if alsa is installed"])
-+  if test "$ac_cv_func_eventfd_read" = "yes" -a "$ac_cv_func_eventfd_write" = "yes"; then
-+      AC_DEFINE([HAVE_EVENTFD],[1],["Define to 1 if eventfd is installed"])
-+  fi
-   final_message="$final_message\n  ALSA:\t\tYes"
- else
-   USE_ALSA=0
-diff --git a/xbmc/linux/FDEventMonitor.cpp b/xbmc/linux/FDEventMonitor.cpp
-index 4a41477..84efeb9 100644
---- a/xbmc/linux/FDEventMonitor.cpp
-+++ b/xbmc/linux/FDEventMonitor.cpp
-@@ -28,6 +28,18 @@
- 
- #include "FDEventMonitor.h"
- 
-+#ifndef HAVE_EVENTFD
-+static int eventfd_read(int __fd, eventfd_t *__value)
-+{
-+  return read(__fd, __value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1;
-+}
-+
-+static int eventfd_write(int __fd, eventfd_t __value)
-+{
-+  return write(__fd, &__value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1;
-+}
-+#endif
-+
- CFDEventMonitor::CFDEventMonitor() :
-   CThread("FDEventMonitor"),
-   m_nextID(0),
--- 
-1.7.10.4
-
diff --git a/bsp/buildroot/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch b/bsp/buildroot/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch
new file mode 100644
index 00000000..b95771c5
--- /dev/null
+++ b/bsp/buildroot/package/kodi/0003-cmake-iconv-is-a-required-dependency.patch
@@ -0,0 +1,92 @@
+From 70ab56d74aff8b2e3ac49fed6bdf3751c9b1457e Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 12 Feb 2017 14:24:18 +0100
+Subject: [PATCH] [cmake] iconv is a required dependency
+
+This patch adds support for libiconv currently only provided by the
+autoconf-based build system:
+https://github.com/xbmc/xbmc/blob/Krypton/configure.ac#L1172
+
+This commit fixes an error during linking with an uClibc-based
+buildroot toolchain:
+
+[100%] Linking CXX executable kodi.bin
+/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/lib/gcc/i586-buildroot-linux-uclibc/6.3.0/../../../../i586-buildroot-linux-uclibc/bin/ld: build/utils/utils.a(CharsetConverter.cpp.o): undefined reference to symbol 'libiconv_open'
+/home/buildroot/br8_ffmpeg3_kodi17_github/output/host/usr/i586-buildroot-linux-uclibc/sysroot/usr/lib32/libiconv.so.2: error adding symbols: DSO missing from command line
+
+Backported to Krypton from master branch commit:
+https://github.com/xbmc/xbmc/commit/9a64537543e8dc8609ca8a98181ba17f30c53493
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ project/cmake/CMakeLists.txt          |  2 +-
+ project/cmake/modules/FindIconv.cmake | 44 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 45 insertions(+), 1 deletion(-)
+ create mode 100644 project/cmake/modules/FindIconv.cmake
+
+diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
+index aeb1ff47c2..07c1d1a8d3 100644
+--- a/project/cmake/CMakeLists.txt
++++ b/project/cmake/CMakeLists.txt
+@@ -103,7 +103,7 @@ list(APPEND DEPLIBS ${CMAKE_THREAD_LIBS_INIT})
+ 
+ # Required dependencies
+ set(required_deps Sqlite3 FreeType PCRE Cpluff LibDvd
+-                  TinyXML Python Yajl Cdio
++                  TinyXML Python Yajl Cdio Iconv
+                   Lzo2 Fribidi TagLib FFMPEG CrossGUID)
+ if(NOT WIN32)
+   list(APPEND required_deps ZLIB)
+diff --git a/project/cmake/modules/FindIconv.cmake b/project/cmake/modules/FindIconv.cmake
+new file mode 100644
+index 0000000000..8ee01fb6b8
+--- /dev/null
++++ b/project/cmake/modules/FindIconv.cmake
+@@ -0,0 +1,44 @@
++#.rst:
++# FindICONV
++# --------
++# Finds the ICONV library
++#
++# This will will define the following variables::
++#
++# ICONV_FOUND - system has ICONV
++# ICONV_INCLUDE_DIRS - the ICONV include directory
++# ICONV_LIBRARIES - the ICONV libraries
++#
++# and the following imported targets::
++#
++#   ICONV::ICONV   - The ICONV library
++
++find_path(ICONV_INCLUDE_DIR NAMES iconv.h)
++
++find_library(ICONV_LIBRARY NAMES iconv libiconv c)
++
++set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARY})
++check_function_exists(iconv HAVE_ICONV_FUNCTION)
++if(NOT HAVE_ICONV_FUNCTION)
++  check_function_exists(libiconv HAVE_LIBICONV_FUNCTION2)
++  set(HAVE_ICONV_FUNCTION ${HAVE_LIBICONV_FUNCTION2})
++  unset(HAVE_LIBICONV_FUNCTION2)
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Iconv
++                                  REQUIRED_VARS ICONV_LIBRARY ICONV_INCLUDE_DIR HAVE_ICONV_FUNCTION)
++
++if(ICONV_FOUND)
++  set(ICONV_LIBRARIES ${ICONV_LIBRARY})
++  set(ICONV_INCLUDE_DIRS ${ICONV_INCLUDE_DIR})
++
++  if(NOT TARGET ICONV::ICONV)
++    add_library(ICONV::ICONV UNKNOWN IMPORTED)
++    set_target_properties(ICONV::ICONV PROPERTIES
++                                     IMPORTED_LOCATION "${ICONV_LIBRARY}"
++                                     INTERFACE_INCLUDE_DIRECTORIES "${ICONV_INCLUDE_DIR}")
++  endif()
++endif()
++
++mark_as_advanced(ICONV_INCLUDE_DIR ICONV_LIBRARY HAVE_ICONV_FUNCTION)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/bsp/buildroot/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
deleted file mode 100644
index 2678a783..00000000
--- a/bsp/buildroot/package/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 29 Jul 2015 23:13:33 +0200
-Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix
- cross-compilation
-
-When cross-compiling, the location at build time of the libraries is
-not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable
-is here to handle this difference, so use it in kodi-config.cmake.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- project/cmake/kodi-config.cmake.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in
-index 76626ec..ffb8e1d 100644
---- a/project/cmake/kodi-config.cmake.in
-+++ b/project/cmake/kodi-config.cmake.in
-@@ -7,15 +7,15 @@
-   SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@)
- ENDIF()
- IF(NOT @APP_NAME_UC@_INCLUDE_DIR)
--  SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@)
-+  SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@)
- ENDIF()
- IF(NOT @APP_NAME_UC@_LIB_DIR)
--  SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@)
-+  SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
- ENDIF()
- IF(NOT WIN32)
-   SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@")
- ENDIF()
--LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@)
-+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@)
- ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON)
- 
- if(NOT CORE_SYSTEM_NAME)
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch b/bsp/buildroot/package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
deleted file mode 100644
index 3d9370ff..00000000
--- a/bsp/buildroot/package/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2b395fb3f07551ae1ce2e484c14ac59f36e192b0 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Thu, 17 Mar 2016 21:47:53 +0100
-Subject: [PATCH] native/TexturePacker: fix compilation with gcc 4.6
-
-Kodi itself depends on gcc >= 4.7 due to its use of the C++11 standard.
-When cross-compiling the host gcc currently also needs to be >= 4.7 due
-to the texturepacker tool being needed as native binary to compile
-Textures.xbt for the target system.
-
-Cross-compiling on a system where host gcc is at version 4.6 fails atm
-with this error:
-
-cc1plus: error: unrecognized command line option '-std=c++11'
-make[4]: *** [md5.o] Error 1
-make[4]: *** Waiting for unfinished jobs....
-cc1plus: error: unrecognized command line option '-std=c++11'
-cc1plus: error: unrecognized command line option '-std=c++11'
-
-make[4]: *** [DecoderManager.o] Error 1
-make[4]: *** [XBTFWriter.o] Error 1
-cc1plus: error: unrecognized command line option '-std=c++11'
-make[4]: *** [TexturePacker.o] Error 1
-cc1plus: error: unrecognized command line option '-std=c++11'
-make[4]: *** [decoder/PNGDecoder.o] Error 1
-make[3]: *** [all] Error 2
-make[2]: *** [native/TexturePacker] Error 2
-
-Using this patch the problem is fixed and a working TexturePacker host
-binary is created.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-Patch sent upstream: https://github.com/xbmc/xbmc/pull/9378
----
- tools/depends/native/TexturePacker/src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/depends/native/TexturePacker/src/Makefile.am b/tools/depends/native/TexturePacker/src/Makefile.am
-index c1fc8be..d075290 100644
---- a/tools/depends/native/TexturePacker/src/Makefile.am
-+++ b/tools/depends/native/TexturePacker/src/Makefile.am
-@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects
- 
- AM_CFLAGS = -DTARGET_POSIX -DUSE_LZO_PACKING
- AM_CFLAGS += @EXTRA_DEFINES@
--AM_CXXFLAGS = $(AM_CFLAGS) -std=c++11
-+AM_CXXFLAGS = $(AM_CFLAGS) -std=c++0x
- 
- AM_CPPFLAGS = \
-   -I. \
--- 
-2.7.0
-
diff --git a/bsp/buildroot/package/kodi/0006-ffmpeg30.patch b/bsp/buildroot/package/kodi/0006-ffmpeg30.patch
deleted file mode 100644
index 9164d48a..00000000
--- a/bsp/buildroot/package/kodi/0006-ffmpeg30.patch
+++ /dev/null
@@ -1,646 +0,0 @@
-Add support for ffmpeg 3.0
-
-Changes from original commit are only in file paths & quilt refresh.
-
-commit c31b7d374062f87c7512d9872cbceac920465913
-Author: Philip Langdale <philipl@overt.org>
-Date:   Mon Sep 21 19:49:36 2015 -0700
-
-    ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master
-    
-    The deprecated PixelFormat and PIX_FMT_* names have been removed in
-    ffmpeg master.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-[Downloaded from
-https://gitweb.gentoo.org/repo/gentoo.git/tree/media-tv/kodi/files/kodi-16-ffmpeg3.patch]
-
-Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h
-@@ -24,7 +24,6 @@
- #include "utils/CPUInfo.h"
- 
- extern "C" {
--#include "libswscale/swscale.h"
- #include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
- #include "libavutil/avutil.h"
-@@ -33,23 +32,6 @@ extern "C" {
- #include "libpostproc/postprocess.h"
- }
- 
--inline int SwScaleCPUFlags()
--{
--  unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
--  int flags = 0;
--
--  if (cpuFeatures & CPU_FEATURE_MMX)
--    flags |= SWS_CPU_CAPS_MMX;
--  if (cpuFeatures & CPU_FEATURE_MMX2)
--    flags |= SWS_CPU_CAPS_MMX2;
--  if (cpuFeatures & CPU_FEATURE_3DNOW)
--    flags |= SWS_CPU_CAPS_3DNOW;
--  if (cpuFeatures & CPU_FEATURE_ALTIVEC)
--    flags |= SWS_CPU_CAPS_ALTIVEC;
--
--  return flags;
--}
--
- inline int PPCPUFlags()
- {
-   unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures();
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp
-@@ -39,7 +39,7 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
- 
--// allocate a new picture (PIX_FMT_YUV420P)
-+// allocate a new picture (AV_PIX_FMT_YUV420P)
- DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight)
- {
-   DVDVideoPicture* pPicture = new DVDVideoPicture;
-@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert
- 
-         int dstformat;
-         if (format == RENDER_FMT_UYVY422)
--          dstformat = PIX_FMT_UYVY422;
-+          dstformat = AV_PIX_FMT_UYVY422;
-         else
--          dstformat = PIX_FMT_YUYV422;
-+          dstformat = AV_PIX_FMT_YUYV422;
- 
--        struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P,
-+        struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P,
-                                                            pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat,
--                                                           SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                                           SWS_BILINEAR, NULL, NULL, NULL);
-         sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride);
-         sws_freeContext(ctx);
-       }
-@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur
- }
- 
- struct EFormatMap {
--  PixelFormat   pix_fmt;
-+  AVPixelFormat   pix_fmt;
-   ERenderFormat format;
- };
- 
- static const EFormatMap g_format_map[] = {
--   { PIX_FMT_YUV420P,     RENDER_FMT_YUV420P    }
--,  { PIX_FMT_YUVJ420P,    RENDER_FMT_YUV420P    }
--,  { PIX_FMT_YUV420P10,   RENDER_FMT_YUV420P10  }
--,  { PIX_FMT_YUV420P16,   RENDER_FMT_YUV420P16  }
--,  { PIX_FMT_UYVY422,     RENDER_FMT_UYVY422    }
--,  { PIX_FMT_YUYV422,     RENDER_FMT_YUYV422    }
--,  { PIX_FMT_VAAPI_VLD,   RENDER_FMT_VAAPI      }
--,  { PIX_FMT_DXVA2_VLD,   RENDER_FMT_DXVA       }
--,  { PIX_FMT_NONE     ,   RENDER_FMT_NONE       }
-+   { AV_PIX_FMT_YUV420P,     RENDER_FMT_YUV420P    }
-+,  { AV_PIX_FMT_YUVJ420P,    RENDER_FMT_YUV420P    }
-+,  { AV_PIX_FMT_YUV420P10,   RENDER_FMT_YUV420P10  }
-+,  { AV_PIX_FMT_YUV420P16,   RENDER_FMT_YUV420P16  }
-+,  { AV_PIX_FMT_UYVY422,     RENDER_FMT_UYVY422    }
-+,  { AV_PIX_FMT_YUYV422,     RENDER_FMT_YUYV422    }
-+,  { AV_PIX_FMT_VAAPI_VLD,   RENDER_FMT_VAAPI      }
-+,  { AV_PIX_FMT_DXVA2_VLD,   RENDER_FMT_DXVA       }
-+,  { AV_PIX_FMT_NONE     ,   RENDER_FMT_NONE       }
- };
- 
- ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt)
- {
--  for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
-+  for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
-   {
-     if(p->pix_fmt == fmt)
-       return p->format;
-@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro
- 
- int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt)
- {
--  for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p)
-+  for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p)
-   {
-     if(p->format == fmt)
-       return p->pix_fmt;
-   }
--  return PIX_FMT_NONE;
-+  return AV_PIX_FMT_NONE;
- }
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
-@@ -77,8 +77,8 @@ enum DecoderState
-   STATE_SW_MULTI
- };
- 
--enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
--                                                , const PixelFormat * fmt )
-+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx
-+                                                , const AVPixelFormat * fmt )
- {
-   CDVDVideoCodecFFmpeg* ctx  = (CDVDVideoCodecFFmpeg*)avctx->opaque;
- 
-@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
-     avctx->hwaccel_context = 0;
-   }
- 
--  const PixelFormat * cur = fmt;
--  while(*cur != PIX_FMT_NONE)
-+  const AVPixelFormat * cur = fmt;
-+  while(*cur != AV_PIX_FMT_NONE)
-   {
- #ifdef HAVE_LIBVDPAU
-     if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))
-@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G
- #endif
- #ifdef HAVE_LIBVA
-     // mpeg4 vaapi decoding is disabled
--    if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
-+    if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))
-     {
-       VAAPI::CDecoder* dec = new VAAPI::CDecoder();
-       if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true)
-@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre
- 
-   for(std::vector<ERenderFormat>::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it)
-   {
--    m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
-+    m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it));
-     if(*it == RENDER_FMT_YUV420P)
--      m_formats.push_back(PIX_FMT_YUVJ420P);
-+      m_formats.push_back(AV_PIX_FMT_YUVJ420P);
-   }
--  m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
-+  m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */
- 
-   pCodec = avcodec_find_decoder(hints.codec);
- 
-@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom
-   pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc;
-   pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace;
-   if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG
--  || m_pCodecContext->pix_fmt     == PIX_FMT_YUVJ420P)
-+  || m_pCodecContext->pix_fmt     == AV_PIX_FMT_YUVJ420P)
-     pDvdVideoPicture->color_range = 1;
-   else
-     pDvdVideoPicture->color_range = 0;
-@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV
-   pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED;
-   pDvdVideoPicture->extended_format = 0;
- 
--  PixelFormat pix_fmt;
--  pix_fmt = (PixelFormat)m_pFrame->format;
-+  AVPixelFormat pix_fmt;
-+  pix_fmt = (AVPixelFormat)m_pFrame->format;
- 
-   pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt);
-   return true;
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h
-@@ -46,7 +46,7 @@ public:
-     public:
-              IHardwareDecoder() {}
-     virtual ~IHardwareDecoder() {};
--    virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0;
-+    virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0;
-     virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame) = 0;
-     virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0;
-     virtual int  Check     (AVCodecContext* avctx) = 0;
-@@ -77,7 +77,7 @@ public:
-   void               SetHardware(IHardwareDecoder* hardware);
- 
- protected:
--  static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt);
-+  static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt);
- 
-   int  FilterOpen(const std::string& filters, bool scale);
-   void FilterClose();
-@@ -119,7 +119,7 @@ protected:
-   int m_iLastKeyframe;
-   double m_dts;
-   bool   m_started;
--  std::vector<PixelFormat> m_formats;
-+  std::vector<AVPixelFormat> m_formats;
-   double m_decoderPts;
-   int    m_skippedDeint;
-   bool   m_requestSkipDeint;
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp
-@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop(
- 
- void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture)
- {
--  // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P.
-+  // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P.
-   struct SwsContext *swcontext = sws_getContext(
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, 
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, 
--    SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422,
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
-+    SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   if (swcontext)
-   {
-     uint8_t  *src[] = { yuv422_ptr, 0, 0, 0 };
-@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42
- 
- void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture)
- {
--  // convert PIX_FMT_BGRA to PIX_FMT_YUV420P.
-+  // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P.
-   struct SwsContext *swcontext = sws_getContext(
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, 
--    m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, 
--    SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA,
-+    m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P,
-+    SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   if (swcontext)
-   {
-     uint8_t  *src[] = { bgra_ptr, 0, 0, 0 };
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
-@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo
-   return true;
- }
- 
--bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   if (!CheckCompatibility(avctx))
-     return false;
-@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder()
-   return true;
- }
- 
--bool CDecoder::Supports(enum PixelFormat fmt)
-+bool CDecoder::Supports(enum AVPixelFormat fmt)
- {
--  if(fmt == PIX_FMT_DXVA2_VLD)
-+  if(fmt == AV_PIX_FMT_DXVA2_VLD)
-     return true;
-   return false;
- }
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
-@@ -141,7 +141,7 @@ class CDecoder
- public:
-   CDecoder();
-  ~CDecoder();
--  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces);
-+  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces);
-   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual int  Check     (AVCodecContext* avctx);
-@@ -154,7 +154,7 @@ public:
-   int   GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
-   void  RelBuffer(uint8_t *data);
- 
--  static bool      Supports(enum PixelFormat fmt);
-+  static bool      Supports(enum AVPixelFormat fmt);
- 
-   void CloseDXVADecoder();
- 
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-@@ -479,7 +479,7 @@ CDecoder::~CDecoder()
-   Close();
- }
- 
--bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   // don't support broken wrappers by default
-   // nvidia cards with a vaapi to vdpau wrapper
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-@@ -406,7 +406,7 @@ public:
-   CDecoder();
-   virtual ~CDecoder();
- 
--  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
-+  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
-   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual void Reset();
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp
-@@ -186,7 +186,7 @@ void CDecoder::Close()
-   m_bitstream = NULL;
- }
- 
--bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   Close();
- 
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h
-@@ -35,7 +35,7 @@ class CDecoder
- public:
-   CDecoder();
-  ~CDecoder();
--  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
-+  virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
-   virtual int Decode(AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual int Check(AVCodecContext* avctx);
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_
-   m_vdpauConfig.context = 0;
- }
- 
--bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces)
-+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces)
- {
-   // check if user wants to decode this format with VDPAU
-   std::string gpuvendor = g_Windowing.GetRenderVendor();
-@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct
-   return 0;
- }
- 
--bool CDecoder::IsVDPAUFormat(PixelFormat format)
-+bool CDecoder::IsVDPAUFormat(AVPixelFormat format)
- {
-   if (format == AV_PIX_FMT_VDPAU)
-     return true;
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -556,7 +556,7 @@ public:
-   CDecoder();
-   virtual ~CDecoder();
- 
--  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0);
-+  virtual bool Open      (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0);
-   virtual int  Decode    (AVCodecContext* avctx, AVFrame* frame);
-   virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture);
-   virtual void Reset();
-@@ -571,7 +571,7 @@ public:
-   bool Supports(VdpVideoMixerFeature feature);
-   bool Supports(EINTERLACEMETHOD method);
-   EINTERLACEMETHOD AutoInterlaceMethod();
--  static bool IsVDPAUFormat(PixelFormat fmt);
-+  static bool IsVDPAUFormat(AVPixelFormat fmt);
- 
-   static void FFReleaseBuffer(void *opaque, uint8_t *data);
-   static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags);
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp
-@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack
- 
-   // for video we need a decoder to get desired information into codec context
-   if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata &&
--      (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE))
-+      (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE))
-   {
-     // open a decoder, it will be cleared down by ffmpeg on closing the stream
-     if (!st->codec->codec)
-@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
-       st = m_pFormatContext->streams[idx];
-       if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-       {
--        if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
-+        if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
-           return true;
-         hasVideo = true;
-       }
-@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady()
-       st = m_pFormatContext->streams[i];
-       if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)
-       {
--        if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE)
-+        if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE)
-           return true;
-         hasVideo = true;
-       }
-Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp
-@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st
- 
-             uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4];
-             struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight,
--                  PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                  AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-             if (context)
-             {
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
-@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
-   }
-   else if (m_format == RENDER_FMT_NV12)
-   {
--    srcFormat = PIX_FMT_NV12;
-+    srcFormat = AV_PIX_FMT_NV12;
-     for (int i = 0; i < 2; i++)
-     {
-       src[i]       = im->plane[i];
-@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
-   }
-   else if (m_format == RENDER_FMT_YUYV422)
-   {
--    srcFormat    = PIX_FMT_YUYV422;
-+    srcFormat    = AV_PIX_FMT_YUYV422;
-     src[0]       = im->plane[0];
-     srcStride[0] = im->stride[0];
-   }
-   else if (m_format == RENDER_FMT_UYVY422)
-   {
--    srcFormat    = PIX_FMT_UYVY422;
-+    srcFormat    = AV_PIX_FMT_UYVY422;
-     src[0]       = im->plane[0];
-     srcStride[0] = im->stride[0];
-   }
-@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im
- 
-   m_context = sws_getCachedContext(m_context,
-                                                  im->width, im->height, (AVPixelFormat)srcFormat,
--                                                 im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA,
--                                                 SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                                 im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA,
-+                                                 SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-   uint8_t *dst[]       = { m_rgbBuffer, 0, 0, 0 };
-   int      dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
-@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
- 
-   if (m_format == RENDER_FMT_YUV420P)
-   {
--    srcFormat = PIX_FMT_YUV420P;
-+    srcFormat = AV_PIX_FMT_YUV420P;
-     for (int i = 0; i < 3; i++)
-     {
-       srcTop[i]       = im->plane[i];
-@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
-   }
-   else if (m_format == RENDER_FMT_NV12)
-   {
--    srcFormat = PIX_FMT_NV12;
-+    srcFormat = AV_PIX_FMT_NV12;
-     for (int i = 0; i < 2; i++)
-     {
-       srcTop[i]       = im->plane[i];
-@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
-   }
-   else if (m_format == RENDER_FMT_YUYV422)
-   {
--    srcFormat       = PIX_FMT_YUYV422;
-+    srcFormat       = AV_PIX_FMT_YUYV422;
-     srcTop[0]       = im->plane[0];
-     srcStrideTop[0] = im->stride[0] * 2;
-     srcBot[0]       = im->plane[0] + im->stride[0];
-@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I
-   }
-   else if (m_format == RENDER_FMT_UYVY422)
-   {
--    srcFormat       = PIX_FMT_UYVY422;
-+    srcFormat       = AV_PIX_FMT_UYVY422;
-     srcTop[0]       = im->plane[0];
-     srcStrideTop[0] = im->stride[0] * 2;
-     srcBot[0]       = im->plane[0] + im->stride[0];
-@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I
- 
-   m_context = sws_getCachedContext(m_context,
-                                                  im->width, im->height >> 1, (AVPixelFormat)srcFormat,
--                                                 im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA,
--                                                 SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                                 im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA,
-+                                                 SWS_FAST_BILINEAR, NULL, NULL, NULL);
-   uint8_t *dstTop[]    = { m_rgbBuffer, 0, 0, 0 };
-   uint8_t *dstBot[]    = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 };
-   int      dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 };
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
-@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu
- #endif
-     {
-       m_sw_context = sws_getCachedContext(m_sw_context,
--        im->width, im->height, PIX_FMT_YUV420P,
--        im->width, im->height, PIX_FMT_RGBA,
-+        im->width, im->height, AV_PIX_FMT_YUV420P,
-+        im->width, im->height, AV_PIX_FMT_RGBA,
-         SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-       uint8_t *src[]  = { im->plane[0], im->plane[1], im->plane[2], 0 };
-Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp
-+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp
-@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer()
-   UnInit();
- }
- 
--static enum PixelFormat PixelFormatFromFormat(ERenderFormat format)
-+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format)
- {
--  if (format == RENDER_FMT_DXVA)      return PIX_FMT_NV12;
--  if (format == RENDER_FMT_YUV420P)   return PIX_FMT_YUV420P;
--  if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10;
--  if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16;
--  if (format == RENDER_FMT_NV12)      return PIX_FMT_NV12;
--  if (format == RENDER_FMT_UYVY422)   return PIX_FMT_UYVY422;
--  if (format == RENDER_FMT_YUYV422)   return PIX_FMT_YUYV422;
--  return PIX_FMT_NONE;
-+  if (format == RENDER_FMT_DXVA)      return AV_PIX_FMT_NV12;
-+  if (format == RENDER_FMT_YUV420P)   return AV_PIX_FMT_YUV420P;
-+  if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10;
-+  if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16;
-+  if (format == RENDER_FMT_NV12)      return AV_PIX_FMT_NV12;
-+  if (format == RENDER_FMT_UYVY422)   return AV_PIX_FMT_UYVY422;
-+  if (format == RENDER_FMT_YUYV422)   return AV_PIX_FMT_YUYV422;
-+  return AV_PIX_FMT_NONE;
- }
- 
- void CWinRenderer::ManageTextures()
-@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags)
- 
- void CWinRenderer::RenderSW()
- {
--  enum PixelFormat format = PixelFormatFromFormat(m_format);
-+  enum AVPixelFormat format = PixelFormatFromFormat(m_format);
- 
-   // 1. convert yuv to rgb
-   m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx,
-                                         m_sourceWidth, m_sourceHeight, format,
--                                        m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA,
--                                        SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL);
-+                                        m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA,
-+                                        SWS_FAST_BILINEAR, NULL, NULL, NULL);
- 
-   YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer];
- 
-Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp
-+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp
-@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi
-                           uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch,
-                           CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */)
- {
--  struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA,
--                                                         out_width, out_height, PIX_FMT_BGRA,
--                                                         CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL);
-+  struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA,
-+                                                         out_width, out_height, AV_PIX_FMT_BGRA,
-+                                                         CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL);
- 
-   uint8_t *src[] = { in_pixels, 0, 0, 0 };
-   int     srcStride[] = { (int)in_pitch, 0, 0, 0 };
-Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
-===================================================================
---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp
-+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp
-@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
-       return false;
- 
-     // Due to a bug in swsscale we need to allocate one extra line of data
--    if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
-+    if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 )
-       return false;
-   }
- 
-@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas
- 
-   // We got the video frame, render it into the picture buffer
-   struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt,
--                           m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
-+                           m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL );
- 
-   sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height,
-                                                                      m_pFrameRGB->data, m_pFrameRGB->linesize );
diff --git a/bsp/buildroot/package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch b/bsp/buildroot/package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
deleted file mode 100644
index 9b0e47d0..00000000
--- a/bsp/buildroot/package/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f63563615e357b7d794a38e1d37276c325d1466f Mon Sep 17 00:00:00 2001
-From: popcornmix <popcornmix@gmail.com>
-Date: Sat, 7 May 2016 13:47:42 +0100
-Subject: [PATCH] [exif] Fix for out-of-memory errors with large numbers
- of jpegs
-
-This reverts part of https://github.com/xbmc/xbmc/pull/7472
-
-Basically the commit made the 4 comments in the exif block increase
-from 2K to 64K each, so you now need 256K per photo.
-
-When opening a folder exif information for all photos is extracted.
-So, for a folder of 5000 jpegs, 1.2GB of RAM is needed just for
-the comments.
-
-As a 64K comment string is of no use to kodi, just truncate them to 2K
-like we used to.
-
-See:
-http://trac.kodi.tv/ticket/16193
-http://forum.kodi.tv/showthread.php?tid=251908
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(backported from upstream commit in master branch:
- https://github.com/xbmc/xbmc/commit/f63563615e357b7d794a38e1d37276c325d1466f)
----
- lib/libexif/libexif.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libexif/libexif.h b/lib/libexif/libexif.h
-index aa8da07..519ac30 100644
---- a/lib/libexif/libexif.h
-+++ b/lib/libexif/libexif.h
-@@ -81,7 +81,7 @@ typedef struct {
- #define EXIF_COMMENT_CHARSET_UNICODE    3 // Exif: Unicode (UTF-16)
- #define EXIF_COMMENT_CHARSET_JIS        4 // Exif: JIS X208-1990
- 
--#define MAX_COMMENT 65533 // 2 bytes - 2 for the length param
-+#define MAX_COMMENT 2000
- #define MAX_DATE_COPIES 10
- 
- typedef struct {
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch b/bsp/buildroot/package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
deleted file mode 100644
index dc428d6c..00000000
--- a/bsp/buildroot/package/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 78571ed421e3fd3d5244cd76670e4e1bab69132f Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Fri, 27 May 2016 17:30:28 +0200
-Subject: [PATCH 1/1] Fix nullpadding issue when reading certain id3v1 tags
-
-backported from upstream commit to master branch:
-
-https://github.com/xbmc/xbmc/commit/cdabf9dd9e82f4b2d639fb769db08227a7c52046
-
-to fix problems with taglib-1.11:
-
-http://trac.kodi.tv/ticket/16454
-https://github.com/taglib/taglib/issues/741#issuecomment-218059031
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- xbmc/music/tags/TagLoaderTagLib.cpp | 21 ---------------------
- xbmc/music/tags/TagLoaderTagLib.h   |  3 +++
- 2 files changed, 3 insertions(+), 21 deletions(-)
-
-diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp
-index b78a591..0fc346a 100644
---- a/xbmc/music/tags/TagLoaderTagLib.cpp
-+++ b/xbmc/music/tags/TagLoaderTagLib.cpp
-@@ -46,31 +46,12 @@
- #include "utils/URIUtils.h"
- #include "utils/log.h"
- #include "utils/StringUtils.h"
--#include "utils/CharsetConverter.h"
- #include "utils/Base64.h"
- #include "settings/AdvancedSettings.h"
- 
- using namespace TagLib;
- using namespace MUSIC_INFO;
- 
--template<class T>
--class TagStringHandler : public T
--{
--public:
--  TagStringHandler() {}
--  virtual ~TagStringHandler() {}
--  virtual String parse(const ByteVector &data) const
--  {
--    std::string strSource(data.data(), data.size());
--    std::string strUTF8;
--    g_charsetConverter.unknownToUTF8(strSource, strUTF8);
--    return String(strUTF8, String::UTF8);
--  }
--};
--
--static const TagStringHandler<ID3v1::StringHandler> ID3v1StringHandler;
--static const TagStringHandler<ID3v2::Latin1StringHandler> ID3v2StringHandler;
--
- CTagLoaderTagLib::CTagLoaderTagLib()
- {
- }
-@@ -824,8 +805,6 @@ bool CTagLoaderTagLib::Load(const std::string& strFileName, CMusicInfoTag& tag,
-     return false;
-   }
- 
--  ID3v1::Tag::setStringHandler(&ID3v1StringHandler);
--  ID3v2::Tag::setLatin1StringHandler(&ID3v2StringHandler);
-   TagLib::File*              file = NULL;
-   TagLib::APE::File*         apeFile = NULL;
-   TagLib::ASF::File*         asfFile = NULL;
-diff --git a/xbmc/music/tags/TagLoaderTagLib.h b/xbmc/music/tags/TagLoaderTagLib.h
-index f83ea4f..0edb84f 100644
---- a/xbmc/music/tags/TagLoaderTagLib.h
-+++ b/xbmc/music/tags/TagLoaderTagLib.h
-@@ -44,6 +44,9 @@
- #include <taglib/mp4tag.h>
- #include "ImusicInfoTagLoader.h"
- 
-+#include <string>
-+#include <vector>
-+
- namespace MUSIC_INFO
- {
-   class CMusicInfoTag;
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch b/bsp/buildroot/package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
deleted file mode 100644
index a8de36c7..00000000
--- a/bsp/buildroot/package/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch
+++ /dev/null
@@ -1,1438 +0,0 @@
-From 8f82e51563f0e1bc9b7a8adf669ad2b66e7ce3e5 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Thu, 28 Apr 2016 17:17:40 +0200
-Subject: [PATCH] lib/cximage-6.0: fix compilation with gcc6
-
-For a quick fix I renamed min() to cxmin() and max() to cxmax() to
-prevent the conflict with the gcc definition.
-
-Forum thread for reference:
-http://forum.kodi.tv/showthread.php?tid=263884
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(Patch sent upstream: https://github.com/xbmc/xbmc/pull/9703)
----
- lib/cximage-6.0/CxImage/ximabmp.cpp  |   6 +-
- lib/cximage-6.0/CxImage/ximadef.h    |   8 +-
- lib/cximage-6.0/CxImage/ximadsp.cpp  | 182 +++++++++++++++++------------------
- lib/cximage-6.0/CxImage/ximage.cpp   |   4 +-
- lib/cximage-6.0/CxImage/ximagif.cpp  |   6 +-
- lib/cximage-6.0/CxImage/ximahist.cpp |  12 +--
- lib/cximage-6.0/CxImage/ximaint.cpp  |   8 +-
- lib/cximage-6.0/CxImage/ximaiter.h   |   4 +-
- lib/cximage-6.0/CxImage/ximajbg.cpp  |   2 +-
- lib/cximage-6.0/CxImage/ximapal.cpp  |  14 +--
- lib/cximage-6.0/CxImage/ximapng.cpp  |  12 +--
- lib/cximage-6.0/CxImage/ximaraw.cpp  |   4 +-
- lib/cximage-6.0/CxImage/ximasel.cpp  |  50 +++++-----
- lib/cximage-6.0/CxImage/ximath.cpp   |   8 +-
- lib/cximage-6.0/CxImage/ximatif.cpp  |   6 +-
- lib/cximage-6.0/CxImage/ximatran.cpp | 138 +++++++++++++-------------
- lib/cximage-6.0/CxImage/ximawnd.cpp  |  16 +--
- 17 files changed, 236 insertions(+), 244 deletions(-)
-
-diff --git a/lib/cximage-6.0/CxImage/ximabmp.cpp b/lib/cximage-6.0/CxImage/ximabmp.cpp
-index 726ff91..55842b1 100644
---- a/lib/cximage-6.0/CxImage/ximabmp.cpp
-+++ b/lib/cximage-6.0/CxImage/ximabmp.cpp
-@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
- 		bihtoh(&infohdr);
- 
- 		// Write the file header
--		hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
-+		hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1);
- 		hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1);
- 		 //and DIB+ALPHA interlaced
- 		BYTE *srcalpha = AlphaGetPointer();
-@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
- #endif //CXIMAGE_SUPPORT_ALPHA
- 	{
- 		// Write the file header
--		hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
-+		hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1);
- 		//copy attributes
- 		memcpy(pDib,&head,sizeof(BITMAPINFOHEADER));
- 		bihtoh((BITMAPINFOHEADER*)pDib);
-@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile)
- 	BITMAPFILEHEADER   bf;
- 	DWORD off = hFile->Tell(); //<CSC>
-   cx_try {
--	if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
-+	if (hFile->Read(&bf,cxmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
- 
- 	bf.bfSize = my_ntohl(bf.bfSize); 
- 	bf.bfOffBits = my_ntohl(bf.bfOffBits); 
-diff --git a/lib/cximage-6.0/CxImage/ximadef.h b/lib/cximage-6.0/CxImage/ximadef.h
-index fe383bf..53ea452 100644
---- a/lib/cximage-6.0/CxImage/ximadef.h
-+++ b/lib/cximage-6.0/CxImage/ximadef.h
-@@ -53,12 +53,8 @@
-  #define CXIMAGE_SUPPORT_WINDOWS 0
- #endif
- 
--#ifndef min
--#define min(a,b) (((a)<(b))?(a):(b))
--#endif
--#ifndef max
--#define max(a,b) (((a)>(b))?(a):(b))
--#endif
-+#define cxmin(a,b) (((a)<(b))?(a):(b))
-+#define cxmax(a,b) (((a)>(b))?(a):(b))
- 
- #ifndef PI
-  #define PI 3.141592653589793f
-diff --git a/lib/cximage-6.0/CxImage/ximadsp.cpp b/lib/cximage-6.0/CxImage/ximadsp.cpp
-index 8425bb2..813253b 100644
---- a/lib/cximage-6.0/CxImage/ximadsp.cpp
-+++ b/lib/cximage-6.0/CxImage/ximadsp.cpp
-@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBColor)
- 	G = lRGBColor.rgbGreen;
- 	B = lRGBColor.rgbBlue;
- 
--	cMax = max( max(R,G), B);	/* calculate lightness */
--	cMin = min( min(R,G), B);
-+	cMax = cxmax( cxmax(R,G), B);	/* calculate lightness */
-+	cMin = cxmin( cxmin(R,G), B);
- 	L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX));
- 
- 	if (cMax==cMin){			/* r=g=b --> achromatic case */
-@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVColor)
- 	G = (int)( Y - 0.344f * U - 0.714f * V);
- 	B = (int)( Y + 1.770f * U);
- 
--	R= min(255,max(0,R));
--	G= min(255,max(0,G));
--	B= min(255,max(0,B));
-+	R= cxmin(255,cxmax(0,R));
-+	G= cxmin(255,cxmax(0,G));
-+	B= cxmin(255,cxmax(0,B));
- 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
- 	return rgb;
- }
-@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBColor)
- 	U = (int)((B-Y) * 0.565f + 128);
- 	V = (int)((R-Y) * 0.713f + 128);
- 
--	Y= min(255,max(0,Y));
--	U= min(255,max(0,U));
--	V= min(255,max(0,V));
-+	Y= cxmin(255,cxmax(0,Y));
-+	U= cxmin(255,cxmax(0,U));
-+	V= cxmin(255,cxmax(0,V));
- 	RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0};
- 	return yuv;
- }
-@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQColor)
- 	G = (int)( Y - 0.273f * I - 0.647f * Q);
- 	B = (int)( Y - 1.104f * I + 1.701f * Q);
- 
--	R= min(255,max(0,R));
--	G= min(255,max(0,G));
--	B= min(255,max(0,B));
-+	R= cxmin(255,cxmax(0,R));
-+	G= cxmin(255,cxmax(0,G));
-+	B= cxmin(255,cxmax(0,B));
- 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
- 	return rgb;
- }
-@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBColor)
- 	I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128);
- 	Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128);
- 
--	Y= min(255,max(0,Y));
--	I= min(255,max(0,I));
--	Q= min(255,max(0,Q));
-+	Y= cxmin(255,cxmax(0,Y));
-+	I= cxmin(255,cxmax(0,I));
-+	Q= cxmin(255,cxmax(0,Q));
- 	RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0};
- 	return yiq;
- }
-@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZColor)
- 	G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k);
- 	B = (int)(  0.055648f * X - 0.204043f * Y + 1.057311f * Z * k);
- 
--	R= min(255,max(0,R));
--	G= min(255,max(0,G));
--	B= min(255,max(0,B));
-+	R= cxmin(255,cxmax(0,R));
-+	G= cxmin(255,cxmax(0,G));
-+	B= cxmin(255,cxmax(0,B));
- 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
- 	return rgb;
- }
-@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBColor)
- 	Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B);
- 	Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f);
- 
--	//X= min(255,max(0,X));
--	//Y= min(255,max(0,Y));
--	//Z= min(255,max(0,Z));
-+	//X= cxmin(255,cxmax(0,X));
-+	//Y= cxmin(255,cxmax(0,Y));
-+	//Z= cxmin(255,cxmax(0,Z));
- 	RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0};
- 	return xyz;
- }
-@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, long contrast)
- 
- 	BYTE cTable[256]; //<nipper>
- 	for (int i=0;i<256;i++)	{
--		cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f)));
-+		cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)((i-128)*c + brightness + 0.5f)));
- 	}
- 
- 	return Lut(cTable);
-@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset)
- 						}
- 					}
- 					if (Kfactor==0 || ksumcur==0){
--						cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b + Koffset)));
-+						cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset)));
- 					} else if (ksumtot == ksumcur) {
--						cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
-+						cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset)));
- 					} else {
--						cPtr2[iY1] = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
- 					}
- 				}
- 			}
-@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset)
- 						}
- 					}
- 					if (Kfactor==0 || ksumcur==0){
--						c.rgbRed   = (BYTE)min(255, max(0,(int)(r + Koffset)));
--						c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset)));
--						c.rgbBlue  = (BYTE)min(255, max(0,(int)(b + Koffset)));
-+						c.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(r + Koffset)));
-+						c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g + Koffset)));
-+						c.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset)));
- 					} else if (ksumtot == ksumcur) {
--						c.rgbRed   = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset)));
--						c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset)));
--						c.rgbBlue  = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
-+						c.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(r/Kfactor + Koffset)));
-+						c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g/Kfactor + Koffset)));
-+						c.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset)));
- 					} else {
--						c.rgbRed   = (BYTE)min(255, max(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset)));
--						c.rgbGreen = (BYTE)min(255, max(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset)));
--						c.rgbBlue  = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						c.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset)));
-+						c.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
- 					}
- 					tmp.BlindSetPixelColor(x,y,c);
- 				}
-@@ -1078,8 +1078,8 @@ bool CxImage::Edge(long Ksize)
- // 
- void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffset, bool bMixAlpha)
- {
--    long lWide = min(GetWidth(),imgsrc2.GetWidth()-lXOffset);
--    long lHeight = min(GetHeight(),imgsrc2.GetHeight()-lYOffset);
-+    long lWide = cxmin(GetWidth(),imgsrc2.GetWidth()-lXOffset);
-+    long lHeight = cxmin(GetHeight(),imgsrc2.GetHeight()-lYOffset);
- 
- 	bool bEditAlpha = imgsrc2.AlphaIsValid() & bMixAlpha;
- 
-@@ -1112,16 +1112,16 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse
- 						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)((rgb1.rgbReserved+rgb2.rgbReserved)/2);
- 					break;
- 					case OpAdd:
--						rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue+rgb2.rgbBlue));
--						rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen+rgb2.rgbGreen));
--						rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed+rgb2.rgbRed));
--						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved+rgb2.rgbReserved));
-+						rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue+rgb2.rgbBlue));
-+						rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen+rgb2.rgbGreen));
-+						rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed+rgb2.rgbRed));
-+						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved+rgb2.rgbReserved));
- 					break;
- 					case OpSub:
--						rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue-rgb2.rgbBlue));
--						rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen-rgb2.rgbGreen));
--						rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed-rgb2.rgbRed));
--						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved-rgb2.rgbReserved));
-+						rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue-rgb2.rgbBlue));
-+						rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen-rgb2.rgbGreen));
-+						rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed-rgb2.rgbRed));
-+						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved-rgb2.rgbReserved));
- 					break;
- 					case OpAnd:
- 						rgbDest.rgbBlue = (BYTE)(rgb1.rgbBlue&rgb2.rgbBlue);
-@@ -1202,11 +1202,11 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse
- 							double dSmallAmt = dSmall*((double)rgb2.rgbBlue);
- 
- 							if( lAverage < lThresh+1){
--								rgbDest.rgbBlue = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbBlue) +
-+								rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbBlue) +
- 												dSmallAmt)));
--								rgbDest.rgbGreen = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbGreen) +
-+								rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbGreen) +
- 												dSmallAmt)));
--								rgbDest.rgbRed = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbRed) +
-+								rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbRed) +
- 												dSmallAmt)));
- 							}
- 							else
-@@ -1274,9 +1274,9 @@ bool CxImage::ShiftRGB(long r, long g, long b)
- #endif //CXIMAGE_SUPPORT_SELECTION
- 				{
- 					color = BlindGetPixelColor(x,y);
--					color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r)));
--					color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g)));
--					color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b)));
-+					color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + r)));
-+					color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + g)));
-+					color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + b)));
- 					BlindSetPixelColor(x,y,color);
- 				}
- 			}
-@@ -1284,9 +1284,9 @@ bool CxImage::ShiftRGB(long r, long g, long b)
- 	} else {
- 		for(DWORD j=0; j<head.biClrUsed; j++){
- 			color = GetPaletteColor((BYTE)j);
--			color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r)));
--			color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g)));
--			color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b)));
-+			color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + r)));
-+			color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + g)));
-+			color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + b)));
- 			SetPaletteColor((BYTE)j,color);
- 		}
- 	}
-@@ -1310,7 +1310,7 @@ bool CxImage::Gamma(float gamma)
- 
- 	BYTE cTable[256]; //<nipper>
- 	for (int i=0;i<256;i++)	{
--		cTable[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	return Lut(cTable);
-@@ -1337,21 +1337,21 @@ bool CxImage::GammaRGB(float gammaR, float gammaG, float gammaB)
- 	dMax = pow(255.0, dinvgamma) / 255.0;
- 	BYTE cTableR[256];
- 	for (i=0;i<256;i++)	{
--		cTableR[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTableR[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	dinvgamma = 1/gammaG;
- 	dMax = pow(255.0, dinvgamma) / 255.0;
- 	BYTE cTableG[256];
- 	for (i=0;i<256;i++)	{
--		cTableG[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTableG[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	dinvgamma = 1/gammaB;
- 	dMax = pow(255.0, dinvgamma) / 255.0;
- 	BYTE cTableB[256];
- 	for (i=0;i<256;i++)	{
--		cTableB[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
-+		cTableB[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
- 	}
- 
- 	return Lut(cTableR, cTableG, cTableB);
-@@ -1442,11 +1442,11 @@ bool CxImage::Noise(long level)
- 			{
- 				color = BlindGetPixelColor(x,y);
- 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
--				color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + n)));
-+				color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + n)));
- 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
--				color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + n)));
-+				color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + n)));
- 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
--				color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + n)));
-+				color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + n)));
- 				BlindSetPixelColor(x,y,color);
- 			}
- 		}
-@@ -1561,8 +1561,8 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage
- 
- 	//DFT buffers
- 	double *real2,*imag2;
--	real2 = (double*)malloc(max(w,h) * sizeof(double));
--	imag2 = (double*)malloc(max(w,h) * sizeof(double));
-+	real2 = (double*)malloc(cxmax(w,h) * sizeof(double));
-+	imag2 = (double*)malloc(cxmax(w,h) * sizeof(double));
- 
- 	/* Transform the rows */
- 	real = (double *)malloc(w * sizeof(double));
-@@ -1617,7 +1617,7 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage
- 
- 	/* converting from double to byte, there is a HUGE loss in the dynamics
- 	  "nn" tries to keep an acceptable SNR, but 8bit=48dB: don't ask more */
--	double nn=pow((double)2,(double)log((double)max(w,h))/(double)log((double)2)-4);
-+	double nn=pow((double)2,(double)log((double)cxmax(w,h))/(double)log((double)2)-4);
- 	//reversed gain for reversed transform
- 	if (direction==-1) nn=1/nn;
- 	//bMagnitude : just to see it on the screen
-@@ -1626,15 +1626,15 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage
- 	for (j=0;j<h;j++) {
- 		for (k=0;k<w;k++) {
- 			if (bMagnitude){
--				tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(nn*(3+log(_cabs(grid[k][j])))))));
-+				tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(nn*(3+log(_cabs(grid[k][j])))))));
- 				if (grid[k][j].x==0){
--					tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/0.0000000001)*nn)))));
-+					tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/0.0000000001)*nn)))));
- 				} else {
--					tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn)))));
-+					tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn)))));
- 				}
- 			} else {
--				tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].x*nn))));
--				tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].y*nn))));
-+				tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].x*nn))));
-+				tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].y*nn))));
- 			}
- 		}
- 	}
-@@ -1922,7 +1922,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius)
- 
- 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
- 
--			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
-+			tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5))));
- 		}
- 	}
- 
-@@ -1943,7 +1943,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius)
- 
- 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
- 
--			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
-+			tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5))));
- 		}
- 	}
- 	for (x=0;x<=w;x+=w){
-@@ -1963,7 +1963,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius)
- 
- 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
- 
--			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
-+			tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5))));
- 		}
- 	}
- 
-@@ -2621,8 +2621,8 @@ bool CxImage::SelectiveBlur(float radius, BYTE threshold, CxImage* iDst)
- 	}
- 
- 	//build the difference mask
--	BYTE thresh_dw = (BYTE)max( 0 ,(int)(128 - threshold));
--	BYTE thresh_up = (BYTE)min(255,(int)(128 + threshold));
-+	BYTE thresh_dw = (BYTE)cxmax( 0 ,(int)(128 - threshold));
-+	BYTE thresh_up = (BYTE)cxmin(255,(int)(128 + threshold));
- 	long kernel[]={-100,-100,-100,-100,801,-100,-100,-100,-100};
- 	if (!Tmp.Filter(kernel,3,800,128)){
- 		delete [] pPalette;
-@@ -2755,7 +2755,7 @@ bool CxImage::UnsharpMask(float radius /*= 5.0*/, float amount /*= 0.5*/, int th
- 					if (abs(diff) < threshold){
- 						dest_row[z] = cur_row[z];
- 					} else {
--						dest_row[z] = (BYTE)min(255, max(0,(int)(cur_row[z] + amount * diff)));
-+						dest_row[z] = (BYTE)cxmin(255, cxmax(0,(int)(cur_row[z] + amount * diff)));
- 					}
- 				}
- 			}
-@@ -2952,7 +2952,7 @@ bool CxImage::RedEyeRemove(float strength)
- 				float a = 1.0f-5.0f*((float)((x-0.5f*(xmax+xmin))*(x-0.5f*(xmax+xmin))+(y-0.5f*(ymax+ymin))*(y-0.5f*(ymax+ymin))))/((float)((xmax-xmin)*(ymax-ymin)));
- 				if (a<0) a=0;
- 				color = BlindGetPixelColor(x,y);
--				color.rgbRed = (BYTE)(a*min(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed);
-+				color.rgbRed = (BYTE)(a*cxmin(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed);
- 				BlindSetPixelColor(x,y,color);
- 			}
- 		}
-@@ -2990,7 +2990,7 @@ bool CxImage::Saturate(const long saturation, const long colorspace)
- 	case 1:
- 		{
- 			for (int i=0;i<256;i++)	{
--				cTable[i] = (BYTE)max(0,min(255,(int)(i + saturation)));
-+				cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)(i + saturation)));
- 			}
- 			for(long y=ymin; y<ymax; y++){
- 				info.nProgress = (long)(100*(y-ymin)/(ymax-ymin));
-@@ -3012,7 +3012,7 @@ bool CxImage::Saturate(const long saturation, const long colorspace)
- 	case 2:
- 		{
- 			for (int i=0;i<256;i++)	{
--				cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*(100 + saturation)/100.0f + 128.5f)));
-+				cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)((i-128)*(100 + saturation)/100.0f + 128.5f)));
- 			}
- 			for(long y=ymin; y<ymax; y++){
- 				info.nProgress = (long)(100*(y-ymin)/(ymax-ymin));
-@@ -3242,10 +3242,10 @@ int  CxImage::OptimalThreshold(long method, RECT * pBox, CxImage* pContrastMask)
- 
- 	long xmin,xmax,ymin,ymax;
- 	if (pBox){
--		xmin = max(pBox->left,0);
--		xmax = min(pBox->right,head.biWidth);
--		ymin = max(pBox->bottom,0);
--		ymax = min(pBox->top,head.biHeight);
-+		xmin = cxmax(pBox->left,0);
-+		xmax = cxmin(pBox->right,head.biWidth);
-+		ymin = cxmax(pBox->bottom,0);
-+		ymax = cxmin(pBox->top,head.biHeight);
- 	} else {
- 		xmin = ymin = 0;
- 		xmax = head.biWidth; ymax=head.biHeight;
-@@ -3463,7 +3463,7 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa
- 			r.top = r.bottom + nBoxSize;
- 			int threshold = OptimalThreshold(method, &r, pContrastMask);
- 			if (threshold <0) return false;
--			mask.SetPixelIndex(x,y,(BYTE)max(0,min(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold))));
-+			mask.SetPixelIndex(x,y,(BYTE)cxmax(0,cxmin(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold))));
- 		}
- 	}
- 
-@@ -3490,10 +3490,6 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa
-  * Note: nOpacity=0 && bSelectFilledArea=true act as a "magic wand"
-  * \return true if everything is ok
-  */
--#if defined(XBMC) && !defined(_WIN32)
--int max(int a, int b) { return a > b ? a : b; }
--int min(int a, int b) { return a < b ? a : b; }
--#endif
- 
- bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFillColor, const BYTE nTolerance,
- 						BYTE nOpacity, const bool bSelectFilledArea, const BYTE nSelectionLevel)
-@@ -3538,8 +3534,8 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil
- 	if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance
- 		BYTE idxRef = GetPixelIndex(xStart,yStart);
- 		BYTE idxFill = GetNearestIndex(cFillColor);
--		BYTE idxMin = (BYTE)min(255, max(0,(int)(idxRef - nTolerance)));
--		BYTE idxMax = (BYTE)min(255, max(0,(int)(idxRef + nTolerance)));
-+		BYTE idxMin = (BYTE)cxmin(255, cxmax(0,(int)(idxRef - nTolerance)));
-+		BYTE idxMax = (BYTE)cxmin(255, cxmax(0,(int)(idxRef + nTolerance)));
- 
- 		while(!q.empty())
- 		{
-@@ -3575,12 +3571,12 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil
- 	} else { //--- RGB image
- 		RGBQUAD cRef = GetPixelColor(xStart,yStart);
- 		RGBQUAD cRefMin, cRefMax;
--		cRefMin.rgbRed   = (BYTE)min(255, max(0,(int)(cRef.rgbRed   - nTolerance)));
--		cRefMin.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen - nTolerance)));
--		cRefMin.rgbBlue  = (BYTE)min(255, max(0,(int)(cRef.rgbBlue  - nTolerance)));
--		cRefMax.rgbRed   = (BYTE)min(255, max(0,(int)(cRef.rgbRed   + nTolerance)));
--		cRefMax.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen + nTolerance)));
--		cRefMax.rgbBlue  = (BYTE)min(255, max(0,(int)(cRef.rgbBlue  + nTolerance)));
-+		cRefMin.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed   - nTolerance)));
-+		cRefMin.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen - nTolerance)));
-+		cRefMin.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue  - nTolerance)));
-+		cRefMax.rgbRed   = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed   + nTolerance)));
-+		cRefMax.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen + nTolerance)));
-+		cRefMax.rgbBlue  = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue  + nTolerance)));
- 
- 		while(!q.empty())
- 		{
-diff --git a/lib/cximage-6.0/CxImage/ximage.cpp b/lib/cximage-6.0/CxImage/ximage.cpp
-index e81d3c6..26c6993 100644
---- a/lib/cximage-6.0/CxImage/ximage.cpp
-+++ b/lib/cximage-6.0/CxImage/ximage.cpp
-@@ -460,7 +460,7 @@ bool CxImage::CreateFromArray(BYTE* pArray,DWORD dwWidth,DWORD dwHeight,DWORD dw
- 				src+=4;
- 			}
- 		} else {
--			memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
-+			memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline));
- 		}
- 	}
- 	return true;
-@@ -500,7 +500,7 @@ bool CxImage::CreateFromMatrix(BYTE** ppMatrix,DWORD dwWidth,DWORD dwHeight,DWOR
- 					src+=4;
- 				}
- 			} else {
--				memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
-+				memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline));
- 			}
- 		}
- 	}
-diff --git a/lib/cximage-6.0/CxImage/ximagif.cpp b/lib/cximage-6.0/CxImage/ximagif.cpp
-index b89e061..64b1ccc 100644
---- a/lib/cximage-6.0/CxImage/ximagif.cpp
-+++ b/lib/cximage-6.0/CxImage/ximagif.cpp
-@@ -478,7 +478,7 @@ bool CxImageGIF::Encode(CxFile * fp, CxImage ** pImages, int pagecount, bool bLo
- 	ghost.EncodeHeader(fp);
- 
- 	if (m_loops!=1){
--		ghost.SetLoops(max(0,m_loops-1));
-+		ghost.SetLoops(cxmax(0,m_loops-1));
- 		ghost.EncodeLoopExtension(fp);
- 	}
- 
-@@ -1340,10 +1340,10 @@ void CxImageGIF::GetComment(char* sz_comment_out)
- ////////////////////////////////////////////////////////////////////////////////
- void CxImageGIF::GifMix(CxImage & imgsrc2, struct_image & imgdesc)
- {
--	long ymin = max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
-+	long ymin = cxmax(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
- 	long ymax = GetHeight()-imgdesc.t;
- 	long xmin = imgdesc.l;
--	long xmax = min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
-+	long xmax = cxmin(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
- 
- 	long ibg2= imgsrc2.GetTransIndex();
-     BYTE i2;
-diff --git a/lib/cximage-6.0/CxImage/ximahist.cpp b/lib/cximage-6.0/CxImage/ximahist.cpp
-index a2aed03..5391107 100644
---- a/lib/cximage-6.0/CxImage/ximahist.cpp
-+++ b/lib/cximage-6.0/CxImage/ximahist.cpp
-@@ -110,7 +110,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 	// calculate LUT
- 	BYTE lut[256];
- 	for (x = 0; x <256; x++){
--		lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
-+		lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc))));
- 	}
- 
- 	for (y=0; y<head.biHeight; y++)	{
-@@ -152,7 +152,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		// calculate LUT
- 		BYTE lut[256];
- 		for (x = 0; x <256; x++){
--			lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
-+			lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc))));
- 		}
- 
- 		// normalize image
-@@ -225,7 +225,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		BYTE range = maxR - minR;
- 		if (range != 0)	{
- 			for (x = 0; x <256; x++){
--				lutR[x] = (BYTE)max(0,min(255,(255 * (x - minR) / range)));
-+				lutR[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minR) / range)));
- 			}
- 		} else lutR[minR] = minR;
- 
-@@ -233,7 +233,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		range = maxG - minG;
- 		if (range != 0)	{
- 			for (x = 0; x <256; x++){
--				lutG[x] = (BYTE)max(0,min(255,(255 * (x - minG) / range)));
-+				lutG[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minG) / range)));
- 			}
- 		} else lutG[minG] = minG;
- 			
-@@ -241,7 +241,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		range = maxB - minB;
- 		if (range != 0)	{
- 			for (x = 0; x <256; x++){
--				lutB[x] = (BYTE)max(0,min(255,(255 * (x - minB) / range)));
-+				lutB[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minB) / range)));
- 			}
- 		} else lutB[minB] = minB;
- 
-@@ -292,7 +292,7 @@ bool CxImage::HistogramStretch(long method, double threshold)
- 		// calculate LUT
- 		BYTE lut[256];
- 		for (x = 0; x <256; x++){
--			lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
-+			lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc))));
- 		}
- 
- 		for(y=0; y<head.biHeight; y++){
-diff --git a/lib/cximage-6.0/CxImage/ximaint.cpp b/lib/cximage-6.0/CxImage/ximaint.cpp
-index 989d76c..5d49213 100644
---- a/lib/cximage-6.0/CxImage/ximaint.cpp
-+++ b/lib/cximage-6.0/CxImage/ximaint.cpp
-@@ -26,8 +26,8 @@ void CxImage::OverflowCoordinates(long &x, long &y, OverflowMethod const ofMetho
-   switch (ofMethod) {
-     case OM_REPEAT:
-       //clip coordinates
--      x=max(x,0); x=min(x, head.biWidth-1);
--      y=max(y,0); y=min(y, head.biHeight-1);
-+      x=cxmax(x,0); x=cxmin(x, head.biWidth-1);
-+      y=cxmax(y,0); y=cxmin(y, head.biHeight-1);
-       break;
-     case OM_WRAP:
-       //wrap coordinates
-@@ -59,8 +59,8 @@ void CxImage::OverflowCoordinates(float &x, float &y, OverflowMethod const ofMet
-   switch (ofMethod) {
-     case OM_REPEAT:
-       //clip coordinates
--      x=max(x,0); x=min(x, head.biWidth-1);
--      y=max(y,0); y=min(y, head.biHeight-1);
-+      x=cxmax(x,0); x=cxmin(x, head.biWidth-1);
-+      y=cxmax(y,0); y=cxmin(y, head.biHeight-1);
-       break;
-     case OM_WRAP:
-       //wrap coordinates
-diff --git a/lib/cximage-6.0/CxImage/ximaiter.h b/lib/cximage-6.0/CxImage/ximaiter.h
-index 9788919..01a720b 100644
---- a/lib/cximage-6.0/CxImage/ximaiter.h
-+++ b/lib/cximage-6.0/CxImage/ximaiter.h
-@@ -140,7 +140,7 @@ inline void CImageIterator::SetY(int y)
- inline void CImageIterator::SetRow(BYTE *buf, int n)
- {
- 	if (n<0) n = (int)ima->GetEffWidth();
--	else n = min(n,(int)ima->GetEffWidth());
-+	else n = cxmin(n,(int)ima->GetEffWidth());
- 
- 	if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) memcpy(IterImage,buf,n);
- }
-@@ -148,7 +148,7 @@ inline void CImageIterator::SetRow(BYTE *buf, int n)
- inline void CImageIterator::GetRow(BYTE *buf, int n)
- {
- 	if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0))
--		memcpy(buf,IterImage,min(n,(int)ima->GetEffWidth()));
-+		memcpy(buf,IterImage,cxmin(n,(int)ima->GetEffWidth()));
- }
- /////////////////////////////////////////////////////////////////////
- inline BYTE* CImageIterator::GetRow()
-diff --git a/lib/cximage-6.0/CxImage/ximajbg.cpp b/lib/cximage-6.0/CxImage/ximajbg.cpp
-index 06fb9bf..8a01e28 100644
---- a/lib/cximage-6.0/CxImage/ximajbg.cpp
-+++ b/lib/cximage-6.0/CxImage/ximajbg.cpp
-@@ -145,7 +145,7 @@ bool CxImageJBG::Encode(CxFile * hFile)
- 	jbg_enc_init(&jbig_state, w, h, planes, &buffer, jbig_data_out, hFile);
- 
-     //jbg_enc_layers(&jbig_state, 2);
--    //jbg_enc_lrlmax(&jbig_state, 800, 600);
-+    //jbg_enc_lrlcxmax(&jbig_state, 800, 600);
- 
- 	// Specify a few other options (each is ignored if negative)
- 	int dl = -1, dh = -1, d = -1, l0 = -1, mx = -1;
-diff --git a/lib/cximage-6.0/CxImage/ximapal.cpp b/lib/cximage-6.0/CxImage/ximapal.cpp
-index b3bd3da..3788c98 100644
---- a/lib/cximage-6.0/CxImage/ximapal.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapal.cpp
-@@ -398,8 +398,8 @@ void CxImage::RGBtoBGR(BYTE *buffer, int length)
- {
- 	if (buffer && (head.biClrUsed==0)){
- 		BYTE temp;
--		length = min(length,(int)info.dwEffWidth);
--		length = min(length,(int)(3*head.biWidth));
-+		length = cxmin(length,(int)info.dwEffWidth);
-+		length = cxmin(length,(int)(3*head.biWidth));
- 		for (int i=0;i<length;i+=3){
- 			temp = buffer[i]; buffer[i] = buffer[i+2]; buffer[i+2] = temp;
- 		}
-@@ -444,7 +444,7 @@ void CxImage::SetPalette(DWORD n, BYTE *r, BYTE *g, BYTE *b)
- 	if (!g) g = r;
- 	if (!b) b = g;
- 	RGBQUAD* ppal=GetPalette();
--	DWORD m=min(n,head.biClrUsed);
-+	DWORD m=cxmin(n,head.biClrUsed);
- 	for (DWORD i=0; i<m;i++){
- 		ppal[i].rgbRed=r[i];
- 		ppal[i].rgbGreen=g[i];
-@@ -457,7 +457,7 @@ void CxImage::SetPalette(rgb_color *rgb,DWORD nColors)
- {
- 	if ((!rgb)||(pDib==NULL)||(head.biClrUsed==0)) return;
- 	RGBQUAD* ppal=GetPalette();
--	DWORD m=min(nColors,head.biClrUsed);
-+	DWORD m=cxmin(nColors,head.biClrUsed);
- 	for (DWORD i=0; i<m;i++){
- 		ppal[i].rgbRed=rgb[i].r;
- 		ppal[i].rgbGreen=rgb[i].g;
-@@ -469,7 +469,7 @@ void CxImage::SetPalette(rgb_color *rgb,DWORD nColors)
- void CxImage::SetPalette(RGBQUAD* pPal,DWORD nColors)
- {
- 	if ((pPal==NULL)||(pDib==NULL)||(head.biClrUsed==0)) return;
--	memcpy(GetPalette(),pPal,min(GetPaletteSize(),nColors*sizeof(RGBQUAD)));
-+	memcpy(GetPalette(),pPal,cxmin(GetPaletteSize(),nColors*sizeof(RGBQUAD)));
- 	info.last_c_isvalid = false;
- }
- ////////////////////////////////////////////////////////////////////////////////
-@@ -654,10 +654,10 @@ void CxImage::SetClrImportant(DWORD ncolors)
- 
- 	switch(head.biBitCount){
- 	case 1:
--		head.biClrImportant = min(ncolors,2);
-+		head.biClrImportant = cxmin(ncolors,2);
- 		break;
- 	case 4:
--		head.biClrImportant = min(ncolors,16);
-+		head.biClrImportant = cxmin(ncolors,16);
- 		break;
- 	case 8:
- 		head.biClrImportant = ncolors;
-diff --git a/lib/cximage-6.0/CxImage/ximapng.cpp b/lib/cximage-6.0/CxImage/ximapng.cpp
-index a58441c..4b5cc50 100644
---- a/lib/cximage-6.0/CxImage/ximapng.cpp
-+++ b/lib/cximage-6.0/CxImage/ximapng.cpp
-@@ -206,9 +206,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
- 	
- #ifdef USE_NEW_LIBPNG_API
--	int nshift = max(0,(_bit_depth>>3)-1)<<3;
-+	int nshift = cxmax(0,(_bit_depth>>3)-1)<<3;
- #else
--	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
-+	int nshift = cxmax(0,(info_ptr->bit_depth>>3)-1)<<3;
- #endif
- 
- #ifdef USE_NEW_LIBPNG_API
-@@ -255,10 +255,10 @@ bool CxImagePNG::Decode(CxFile *hFile)
- 			if (pal){
- 				DWORD ip;
- #ifdef USE_NEW_LIBPNG_API
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
-+				for (ip=0;ip<cxmin(head.biClrUsed,(unsigned long)_num_trans);ip++)
- 					pal[ip].rgbReserved=_trans_alpha[ip];
- #else
--				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
-+				for (ip=0;ip<cxmin(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
- #if PNG_LIBPNG_VER > 10399
- 					pal[ip].rgbReserved=info_ptr->trans_alpha[ip];
- #else
-@@ -737,9 +737,9 @@ bool CxImagePNG::Encode(CxFile *hFile)
- #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
- 
- #ifdef USE_NEW_LIBPNG_API
--	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
-+	int row_size = cxmax(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
- #else
--	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
-+	int row_size = cxmax(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
- 	info_ptr->rowbytes = row_size;
- #endif
- 	BYTE *row_pointers = new BYTE[row_size];
-diff --git a/lib/cximage-6.0/CxImage/ximaraw.cpp b/lib/cximage-6.0/CxImage/ximaraw.cpp
-index fd86f96..52d964d 100644
---- a/lib/cximage-6.0/CxImage/ximaraw.cpp
-+++ b/lib/cximage-6.0/CxImage/ximaraw.cpp
-@@ -216,7 +216,7 @@ bool CxImageRAW::Decode(CxFile *hFile)
- 
- 		DWORD size = dcr.width * (dcr.colors*dcr.opt.output_bps/8);
- 		RGBtoBGR(ppm,size);
--		memcpy(GetBits(dcr.height - 1 - row), ppm, min(size,GetEffWidth()));
-+		memcpy(GetBits(dcr.height - 1 - row), ppm, cxmin(size,GetEffWidth()));
- 	}
- 	free (ppm);
- 
-@@ -298,7 +298,7 @@ bool CxImageRAW::GetExifThumbnail(const char *filename, const char *outname, int
- 			// Resizing.
-       		if (image.GetWidth() > 256 || image.GetHeight() > 256)
- 		    {
--				float amount = 256.0f / max(image.GetWidth(), image.GetHeight());
-+				float amount = 256.0f / cxmax(image.GetWidth(), image.GetHeight());
- 				image.Resample((long)(image.GetWidth() * amount), (long)(image.GetHeight() * amount), 0);
- 		    }
- 	      	
-diff --git a/lib/cximage-6.0/CxImage/ximasel.cpp b/lib/cximage-6.0/CxImage/ximasel.cpp
-index 3a7c9a1..37cd10f 100644
---- a/lib/cximage-6.0/CxImage/ximasel.cpp
-+++ b/lib/cximage-6.0/CxImage/ximasel.cpp
-@@ -113,15 +113,15 @@ bool CxImage::SelectionAddRect(RECT r, BYTE level)
- 	if (r.left<r.right) {r2.left=r.left; r2.right=r.right; } else {r2.left=r.right ; r2.right=r.left; }
- 	if (r.bottom<r.top) {r2.bottom=r.bottom; r2.top=r.top; } else {r2.bottom=r.top ; r2.top=r.bottom; }
- 
--	if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = max(0L,min(head.biHeight,r2.top+1));
--	if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = max(0L,min(head.biWidth,r2.left));
--	if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = max(0L,min(head.biWidth,r2.right+1));
--	if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = max(0L,min(head.biHeight,r2.bottom));
-+	if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,r2.top+1));
-+	if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,r2.left));
-+	if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,r2.right+1));
-+	if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,r2.bottom));
- 
--	long ymin = max(0L,min(head.biHeight,r2.bottom));
--	long ymax = max(0L,min(head.biHeight,r2.top+1));
--	long xmin = max(0L,min(head.biWidth,r2.left));
--	long xmax = max(0L,min(head.biWidth,r2.right+1));
-+	long ymin = cxmax(0L,cxmin(head.biHeight,r2.bottom));
-+	long ymax = cxmax(0L,cxmin(head.biHeight,r2.top+1));
-+	long xmin = cxmax(0L,cxmin(head.biWidth,r2.left));
-+	long xmax = cxmax(0L,cxmin(head.biWidth,r2.right+1));
- 
- 	for (long y=ymin; y<ymax; y++)
- 		memset(pSelection + xmin + y * head.biWidth, level, xmax-xmin);
-@@ -144,18 +144,18 @@ bool CxImage::SelectionAddEllipse(RECT r, BYTE level)
- 	long xcenter = (r.right + r.left)/2;
- 	long ycenter = (r.top + r.bottom)/2;
- 
--	if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = max(0L,min(head.biWidth,(xcenter - xradius)));
--	if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = max(0L,min(head.biWidth,(xcenter + xradius + 1)));
--	if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = max(0L,min(head.biHeight,(ycenter - yradius)));
--	if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = max(0L,min(head.biHeight,(ycenter + yradius + 1)));
-+	if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,(xcenter - xradius)));
-+	if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,(xcenter + xradius + 1)));
-+	if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,(ycenter - yradius)));
-+	if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,(ycenter + yradius + 1)));
- 
--	long xmin = max(0L,min(head.biWidth,xcenter - xradius));
--	long xmax = max(0L,min(head.biWidth,xcenter + xradius + 1));
--	long ymin = max(0L,min(head.biHeight,ycenter - yradius));
--	long ymax = max(0L,min(head.biHeight,ycenter + yradius + 1));
-+	long xmin = cxmax(0L,cxmin(head.biWidth,xcenter - xradius));
-+	long xmax = cxmax(0L,cxmin(head.biWidth,xcenter + xradius + 1));
-+	long ymin = cxmax(0L,cxmin(head.biHeight,ycenter - yradius));
-+	long ymax = cxmax(0L,cxmin(head.biHeight,ycenter + yradius + 1));
- 
- 	long y,yo;
--	for (y=ymin; y<min(ycenter,ymax); y++){
-+	for (y=ymin; y<cxmin(ycenter,ymax); y++){
- 		for (long x=xmin; x<xmax; x++){
- 			yo = (long)(ycenter - yradius * sqrt(1-pow((float)(x - xcenter)/(float)xradius,2)));
- 			if (yo<y) pSelection[x + y * head.biWidth] = level;
-@@ -268,10 +268,10 @@ bool CxImage::SelectionAddPolygon(POINT *points, long npoints, BYTE level)
- 		RECT r2;
- 		if (current->x < next->x) {r2.left=current->x; r2.right=next->x; } else {r2.left=next->x ; r2.right=current->x; }
- 		if (current->y < next->y) {r2.bottom=current->y; r2.top=next->y; } else {r2.bottom=next->y ; r2.top=current->y; }
--		if (localbox.top < r2.top) localbox.top = max(0L,min(head.biHeight-1,r2.top+1));
--		if (localbox.left > r2.left) localbox.left = max(0L,min(head.biWidth-1,r2.left-1));
--		if (localbox.right < r2.right) localbox.right = max(0L,min(head.biWidth-1,r2.right+1));
--		if (localbox.bottom > r2.bottom) localbox.bottom = max(0L,min(head.biHeight-1,r2.bottom-1));
-+		if (localbox.top < r2.top) localbox.top = cxmax(0L,cxmin(head.biHeight-1,r2.top+1));
-+		if (localbox.left > r2.left) localbox.left = cxmax(0L,cxmin(head.biWidth-1,r2.left-1));
-+		if (localbox.right < r2.right) localbox.right = cxmax(0L,cxmin(head.biWidth-1,r2.right+1));
-+		if (localbox.bottom > r2.bottom) localbox.bottom = cxmax(0L,cxmin(head.biHeight-1,r2.bottom-1));
- 
- 		i++;
- 	}
-@@ -385,10 +385,10 @@ bool CxImage::SelectionAddPolygon(POINT *points, long npoints, BYTE level)
- 		for (x=localbox.left; x<=localbox.right; x++)
- 			if (plocal[x + yoffset]!=1) pSelection[x + yoffset]=level;
- 	}
--	if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = min(head.biHeight,localbox.top + 1);
--	if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = min(head.biWidth,localbox.left);
--	if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = min(head.biWidth,localbox.right + 1);
--	if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = min(head.biHeight,localbox.bottom);
-+	if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = cxmin(head.biHeight,localbox.top + 1);
-+	if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = cxmin(head.biWidth,localbox.left);
-+	if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = cxmin(head.biWidth,localbox.right + 1);
-+	if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = cxmin(head.biHeight,localbox.bottom);
- 
- 	free(plocal);
- 	free(pix);
-diff --git a/lib/cximage-6.0/CxImage/ximath.cpp b/lib/cximage-6.0/CxImage/ximath.cpp
-index 37533e2..f84eb72 100644
---- a/lib/cximage-6.0/CxImage/ximath.cpp
-+++ b/lib/cximage-6.0/CxImage/ximath.cpp
-@@ -64,10 +64,10 @@ CxRect2 CxRect2::CrossSection(CxRect2 const &r2) const
-  */
- {
-   CxRect2 cs;
--  cs.botLeft.x=max(botLeft.x, r2.botLeft.x);
--  cs.botLeft.y=max(botLeft.y, r2.botLeft.y);
--  cs.topRight.x=min(topRight.x, r2.topRight.x);
--  cs.topRight.y=min(topRight.y, r2.topRight.y);
-+  cs.botLeft.x=cxmax(botLeft.x, r2.botLeft.x);
-+  cs.botLeft.y=cxmax(botLeft.y, r2.botLeft.y);
-+  cs.topRight.x=cxmin(topRight.x, r2.topRight.x);
-+  cs.topRight.y=cxmin(topRight.y, r2.topRight.y);
-   if (cs.botLeft.x<=cs.topRight.x && cs.botLeft.y<=cs.topRight.y) {
-     return cs;
-   } else {
-diff --git a/lib/cximage-6.0/CxImage/ximatif.cpp b/lib/cximage-6.0/CxImage/ximatif.cpp
-index 658392a..002766c 100644
---- a/lib/cximage-6.0/CxImage/ximatif.cpp
-+++ b/lib/cximage-6.0/CxImage/ximatif.cpp
-@@ -470,9 +470,9 @@ bool CxImageTIF::Decode(CxFile * hFile)
- 						if ( cb > 0.00304 ) cb = 1.055 * pow(cb,0.41667) - 0.055;
- 							else            cb = 12.92 * cb;
- 
--						c.rgbRed  =(BYTE)max(0,min(255,(int)(cr*255)));
--						c.rgbGreen=(BYTE)max(0,min(255,(int)(cg*255)));
--						c.rgbBlue =(BYTE)max(0,min(255,(int)(cb*255)));
-+						c.rgbRed  =(BYTE)cxmax(0,cxmin(255,(int)(cr*255)));
-+						c.rgbGreen=(BYTE)cxmax(0,cxmin(255,(int)(cg*255)));
-+						c.rgbBlue =(BYTE)cxmax(0,cxmin(255,(int)(cb*255)));
- 
- 						SetPixelColor(xi,yi,c);
- #if CXIMAGE_SUPPORT_ALPHA
-diff --git a/lib/cximage-6.0/CxImage/ximatran.cpp b/lib/cximage-6.0/CxImage/ximatran.cpp
-index 64a71e7..84d5e03 100644
---- a/lib/cximage-6.0/CxImage/ximatran.cpp
-+++ b/lib/cximage-6.0/CxImage/ximatran.cpp
-@@ -302,12 +302,12 @@ bool CxImage::RotateLeft(CxImage* iDst)
- 			for (ys = 0; ys < newHeight; ys+=RBLOCK) {
- 				if (head.biBitCount==24) {
- 					//RGB24 optimized pixel access:
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){    //do rotation
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){    //do rotation
- 						info.nProgress = (long)(100*x/newWidth);
- 						x2=newWidth-x-1;
- 						dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(x,ys);
- 						srcPtr = (BYTE*) BlindGetPixelPointer(ys, x2);
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							//imgDest.SetPixelColor(x, y, GetPixelColor(y, x2));
- 							*(dstPtr) = *(srcPtr);
- 							*(dstPtr+1) = *(srcPtr+1);
-@@ -318,19 +318,19 @@ bool CxImage::RotateLeft(CxImage* iDst)
- 					}//for x
- 				} else {
- 					//anything else than 24bpp (and 1bpp): palette
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 						info.nProgress = (long)(100*x/newWidth); //<Anatoly Ivasyuk>
- 						x2=newWidth-x-1;
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y, x2));
- 						}//for y
- 					}//for x
- 				}//if (version selection)
- #if CXIMAGE_SUPPORT_ALPHA
- 				if (AlphaIsValid()) {
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 						x2=newWidth-x-1;
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							imgDest.AlphaSet(x,y,BlindAlphaGet(y, x2));
- 						}//for y
- 					}//for x
-@@ -343,9 +343,9 @@ bool CxImage::RotateLeft(CxImage* iDst)
- 					imgDest.info.rSelectionBox.right = newWidth-info.rSelectionBox.bottom;
- 					imgDest.info.rSelectionBox.bottom = info.rSelectionBox.left;
- 					imgDest.info.rSelectionBox.top = info.rSelectionBox.right;
--					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+					for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 						x2=newWidth-x-1;
--						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+						for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 							imgDest.SelectionSet(x,y,BlindSelectionGet(y, x2));
- 						}//for y
- 					}//for x
-@@ -447,12 +447,12 @@ bool CxImage::RotateRight(CxImage* iDst)
- 			for (ys = 0; ys < newHeight; ys+=RBLOCK) {
- 				if (head.biBitCount==24) {
- 					//RGB24 optimized pixel access:
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						info.nProgress = (long)(100*y/newHeight); //<Anatoly Ivasyuk>
- 						y2=newHeight-y-1;
- 						dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(xs,y);
- 						srcPtr = (BYTE*) BlindGetPixelPointer(y2, xs);
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							//imgDest.SetPixelColor(x, y, GetPixelColor(y2, x));
- 							*(dstPtr) = *(srcPtr);
- 							*(dstPtr+1) = *(srcPtr+1);
-@@ -463,19 +463,19 @@ bool CxImage::RotateRight(CxImage* iDst)
- 					}//for y
- 				} else {
- 					//anything else than BW & RGB24: palette
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						info.nProgress = (long)(100*y/newHeight); //<Anatoly Ivasyuk>
- 						y2=newHeight-y-1;
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y2, x));
- 						}//for x
- 					}//for y
- 				}//if
- #if CXIMAGE_SUPPORT_ALPHA
- 				if (AlphaIsValid()){
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						y2=newHeight-y-1;
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							imgDest.AlphaSet(x,y,BlindAlphaGet(y2, x));
- 						}//for x
- 					}//for y
-@@ -488,9 +488,9 @@ bool CxImage::RotateRight(CxImage* iDst)
- 					imgDest.info.rSelectionBox.right = info.rSelectionBox.top;
- 					imgDest.info.rSelectionBox.bottom = newHeight-info.rSelectionBox.right;
- 					imgDest.info.rSelectionBox.top = newHeight-info.rSelectionBox.left;
--					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
-+					for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){
- 						y2=newHeight-y-1;
--						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
-+						for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){
- 							imgDest.SelectionSet(x,y,BlindSelectionGet(y2, x));
- 						}//for x
- 					}//for y
-@@ -608,10 +608,10 @@ bool CxImage::Rotate(float angle, CxImage* iDst)
- 	newP4.x = (float)(p4.x*cos_angle - p4.y*sin_angle);
- 	newP4.y = (float)(p4.x*sin_angle + p4.y*cos_angle);
- 
--	leftTop.x = min(min(newP1.x,newP2.x),min(newP3.x,newP4.x));
--	leftTop.y = min(min(newP1.y,newP2.y),min(newP3.y,newP4.y));
--	rightBottom.x = max(max(newP1.x,newP2.x),max(newP3.x,newP4.x));
--	rightBottom.y = max(max(newP1.y,newP2.y),max(newP3.y,newP4.y));
-+	leftTop.x = cxmin(cxmin(newP1.x,newP2.x),cxmin(newP3.x,newP4.x));
-+	leftTop.y = cxmin(cxmin(newP1.y,newP2.y),cxmin(newP3.y,newP4.y));
-+	rightBottom.x = cxmax(cxmax(newP1.x,newP2.x),cxmax(newP3.x,newP4.x));
-+	rightBottom.y = cxmax(cxmax(newP1.y,newP2.y),cxmax(newP3.y,newP4.y));
- 	leftBottom.x = leftTop.x;
- 	leftBottom.y = rightBottom.y;
- 	rightTop.x = rightBottom.x;
-@@ -740,10 +740,10 @@ bool CxImage::Rotate2(float angle,
- 	}//if
- 
- 	//(read new dimensions from location of corners)
--	float minx = (float) min(min(newp[0].x,newp[1].x),min(newp[2].x,newp[3].x));
--	float miny = (float) min(min(newp[0].y,newp[1].y),min(newp[2].y,newp[3].y));
--	float maxx = (float) max(max(newp[0].x,newp[1].x),max(newp[2].x,newp[3].x));
--	float maxy = (float) max(max(newp[0].y,newp[1].y),max(newp[2].y,newp[3].y));
-+	float minx = (float) cxmin(cxmin(newp[0].x,newp[1].x),cxmin(newp[2].x,newp[3].x));
-+	float miny = (float) cxmin(cxmin(newp[0].y,newp[1].y),cxmin(newp[2].y,newp[3].y));
-+	float maxx = (float) cxmax(cxmax(newp[0].x,newp[1].x),cxmax(newp[2].x,newp[3].x));
-+	float maxy = (float) cxmax(cxmax(newp[0].y,newp[1].y),cxmax(newp[2].y,newp[3].y));
- 	int newWidth = (int) floor(maxx-minx+0.5f);
- 	int newHeight= (int) floor(maxy-miny+0.5f);
- 	float ssx=((maxx+minx)- ((float) newWidth-1))/2.0f;   //start for x
-@@ -1003,12 +1003,12 @@ bool CxImage::Resample(long newx, long newy, int mode, CxImage* iDst)
- 				if (info.nEscape) break;
- 				fY = y * yScale;
- 				ifY = (int)fY;
--				ifY1 = min(ymax, ifY+1);
-+				ifY1 = cxmin(ymax, ifY+1);
- 				dy = fY - ifY;
- 				for(long x=0; x<newx; x++){
- 					fX = x * xScale;
- 					ifX = (int)fX;
--					ifX1 = min(xmax, ifX+1);
-+					ifX1 = cxmin(xmax, ifX+1);
- 					dx = fX - ifX;
- 					// Interpolate using the four nearest pixels in the source
- 					if (head.biClrUsed){
-@@ -1328,9 +1328,9 @@ bool CxImage::DecreaseBpp(DWORD nbit, bool errordiffusion, RGBQUAD* ppal, DWORD
- 				eb=(long)c.rgbBlue - (long)ce.rgbBlue;
- 
- 				c = GetPixelColor(x+1,y);
--				c.rgbRed = (BYTE)min(255L,max(0L,(long)c.rgbRed + ((er*7)/16)));
--				c.rgbGreen = (BYTE)min(255L,max(0L,(long)c.rgbGreen + ((eg*7)/16)));
--				c.rgbBlue = (BYTE)min(255L,max(0L,(long)c.rgbBlue + ((eb*7)/16)));
-+				c.rgbRed = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbRed + ((er*7)/16)));
-+				c.rgbGreen = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbGreen + ((eg*7)/16)));
-+				c.rgbBlue = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbBlue + ((eb*7)/16)));
- 				SetPixelColor(x+1,y,c);
- 				int coeff=1;
- 				for(int i=-1; i<2; i++){
-@@ -1343,9 +1343,9 @@ bool CxImage::DecreaseBpp(DWORD nbit, bool errordiffusion, RGBQUAD* ppal, DWORD
- 						coeff=1; break;
- 					}
- 					c = GetPixelColor(x+i,y+1);
--					c.rgbRed = (BYTE)min(255L,max(0L,(long)c.rgbRed + ((er * coeff)/16)));
--					c.rgbGreen = (BYTE)min(255L,max(0L,(long)c.rgbGreen + ((eg * coeff)/16)));
--					c.rgbBlue = (BYTE)min(255L,max(0L,(long)c.rgbBlue + ((eb * coeff)/16)));
-+					c.rgbRed = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbRed + ((er * coeff)/16)));
-+					c.rgbGreen = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbGreen + ((eg * coeff)/16)));
-+					c.rgbBlue = (BYTE)cxmin(255L,cxmax(0L,(long)c.rgbBlue + ((eb * coeff)/16)));
- 					SetPixelColor(x+i,y+1,c);
- 				}
- 			}
-@@ -1566,10 +1566,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 8) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 4) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1591,7 +1591,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 			}
-@@ -1620,10 +1620,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 8) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 4) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1645,7 +1645,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 				for (i = -2; i < 3; i++) {
-@@ -1667,7 +1667,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 2, level);
- 				}
- 			}
-@@ -1696,10 +1696,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 7) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 5) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1721,7 +1721,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 				for (i = -2; i < 3; i++) {
-@@ -1743,7 +1743,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 2, level);
- 				}
- 			}
-@@ -1772,10 +1772,10 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x + 1, y) + (error * 5) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 1, y, level);
- 				nlevel = GetPixelIndex(x + 2, y) + (error * 3) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(x + 2, y, level);
- 				int i;
- 				for (i = -2; i < 3; i++) {
-@@ -1797,7 +1797,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 1, level);
- 				}
- 				for (i = -1; i < 2; i++) {
-@@ -1813,7 +1813,7 @@ bool CxImage::Dither(long method)
- 						break;
- 					}
- 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
--					level = (BYTE)min(255, max(0, (int)nlevel));
-+					level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 					SetPixelIndex(x + i, y + 2, level);
- 				}
- 			}
-@@ -1845,76 +1845,76 @@ bool CxImage::Dither(long method)
- 				int tmp_index_y = y;
- 				int tmp_coeff = 32;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 3;
- 				tmp_index_y = y + 1;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 1;
- 				tmp_coeff = 26;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 1;
- 				tmp_coeff = 30;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 3;
- 				tmp_coeff = 16;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 2;
- 				tmp_index_y = y + 2;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x;
- 				tmp_coeff = 26;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 2;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 3;
- 				tmp_index_y = y + 3;
- 				tmp_coeff = 5;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x - 1;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 1;
- 				tmp_coeff = 12;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 
- 				tmp_index_x = x + 3;
- 				tmp_coeff = 5;
- 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
--				level = (BYTE)min(255, max(0, (int)nlevel));
-+				level = (BYTE)cxmin(255, cxmax(0, (int)nlevel));
- 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
- 			}
- 		}
-@@ -1941,7 +1941,7 @@ bool CxImage::Dither(long method)
- 			Bmatrix[i] = (BYTE)(dither);
- 		}
- 
--		int scale = max(0,(8-2*order));
-+		int scale = cxmax(0,(8-2*order));
- 		int level;
- 		for (long y=0;y<head.biHeight;y++){
- 			info.nProgress = (long)(100*y/head.biHeight);
-@@ -1981,7 +1981,7 @@ bool CxImage::Dither(long method)
- 				}
- 
- 				nlevel = GetPixelIndex(x+1,y) + (error * 7)/16;
--				level = (BYTE)min(255,max(0,(int)nlevel));
-+				level = (BYTE)cxmin(255,cxmax(0,(int)nlevel));
- 				SetPixelIndex(x+1,y,level);
- 				for(int i=-1; i<2; i++){
- 					switch(i){
-@@ -1993,7 +1993,7 @@ bool CxImage::Dither(long method)
- 						coeff=1; break;
- 					}
- 					nlevel = GetPixelIndex(x+i,y+1) + (error * coeff)/16;
--					level = (BYTE)min(255,max(0,(int)nlevel));
-+					level = (BYTE)cxmin(255,cxmax(0,(int)nlevel));
- 					SetPixelIndex(x+i,y+1,level);
- 				}
- 			}
-@@ -2031,7 +2031,7 @@ bool CxImage::CropRotatedRectangle( long topx, long topy, long width, long heigh
- 	if ( fabs(angle)<0.0002 )
- 		return Crop( topx, topy, topx+width, topy+height, iDst);
- 
--	startx = min(topx, topx - (long)(sin_angle*(double)height));
-+	startx = cxmin(topx, topx - (long)(sin_angle*(double)height));
- 	endx   = topx + (long)(cos_angle*(double)width);
- 	endy   = topy + (long)(cos_angle*(double)height + sin_angle*(double)width);
- 	// check: corners of the rectangle must be inside
-@@ -2079,10 +2079,10 @@ bool CxImage::Crop(long left, long top, long right, long bottom, CxImage* iDst)
- {
- 	if (!pDib) return false;
- 
--	long startx = max(0L,min(left,head.biWidth));
--	long endx = max(0L,min(right,head.biWidth));
--	long starty = head.biHeight - max(0L,min(top,head.biHeight));
--	long endy = head.biHeight - max(0L,min(bottom,head.biHeight));
-+	long startx = cxmax(0L,cxmin(left,head.biWidth));
-+	long endx = cxmax(0L,cxmin(right,head.biWidth));
-+	long starty = head.biHeight - cxmax(0L,cxmin(top,head.biHeight));
-+	long endy = head.biHeight - cxmax(0L,cxmin(bottom,head.biHeight));
- 
- 	if (startx==endx || starty==endy) return false;
- 
-@@ -2443,8 +2443,8 @@ bool CxImage::CircleTransform(int type,long rmax,float Koeff)
- 						nx=x+(x%32)-16;
- 						ny=y;
- 					}
--//					nx=max(xmin,min(nx,xmax));
--//					ny=max(ymin,min(ny,ymax));
-+//					nx=cxmax(xmin,cxmin(nx,xmax));
-+//					ny=cxmax(ymin,cxmin(ny,ymax));
- 				}
- 				else { nx=-1;ny=-1;}
- 				if (head.biClrUsed==0){
-diff --git a/lib/cximage-6.0/CxImage/ximawnd.cpp b/lib/cximage-6.0/CxImage/ximawnd.cpp
-index 2ae2f93..7029cc7 100644
---- a/lib/cximage-6.0/CxImage/ximawnd.cpp
-+++ b/lib/cximage-6.0/CxImage/ximawnd.cpp
-@@ -682,10 +682,10 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 	RECT clipbox,paintbox;
- 	GetClipBox(hdc,&clipbox);
- 
--	paintbox.top = min(clipbox.bottom,max(clipbox.top,y));
--	paintbox.left = min(clipbox.right,max(clipbox.left,x));
--	paintbox.right = max(clipbox.left,min(clipbox.right,x+cx));
--	paintbox.bottom = max(clipbox.top,min(clipbox.bottom,y+cy));
-+	paintbox.top = cxmin(clipbox.bottom,cxmax(clipbox.top,y));
-+	paintbox.left = cxmin(clipbox.right,cxmax(clipbox.left,x));
-+	paintbox.right = cxmax(clipbox.left,cxmin(clipbox.right,x+cx));
-+	paintbox.bottom = cxmax(clipbox.top,cxmin(clipbox.bottom,y+cy));
- 
- 	long destw = paintbox.right - paintbox.left;
- 	long desth = paintbox.bottom - paintbox.top;
-@@ -730,12 +730,12 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 
- 				for(yy=0;yy<desth;yy++){
- 					dy = head.biHeight-(ymax-yy-y)*fy;
--					sy = max(0L,(long)floor(dy));
-+					sy = cxmax(0L,(long)floor(dy));
- 					psrc = info.pImage+sy*info.dwEffWidth;
- 					pdst = pbase+yy*ew;
- 					for(xx=0;xx<destw;xx++){
- 						dx = (xx+xmin-x)*fx;
--						sx = max(0L,(long)floor(dx));
-+						sx = cxmax(0L,(long)floor(dx));
- #if CXIMAGE_SUPPORT_INTERPOLATION
- 						if (bSmooth){
- 							if (fx > 1 && fy > 1) { 
-@@ -813,7 +813,7 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 				
- 				for(yy=0;yy<desth;yy++){
- 					dy = head.biHeight-(ymax-yy-y)*fy;
--					sy = max(0L,(long)floor(dy));
-+					sy = cxmax(0L,(long)floor(dy));
- 
- 					alphaoffset = sy*head.biWidth;
- 					pdst = pbase + yy*ew;
-@@ -821,7 +821,7 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b
- 
- 					for(xx=0;xx<destw;xx++){
- 						dx = (xx+xmin-x)*fx;
--						sx = max(0L,(long)floor(dx));
-+						sx = cxmax(0L,(long)floor(dx));
- 
- 						if (bAlpha) a=pAlpha[alphaoffset+sx]; else a=255;
- 						a =(BYTE)((a*(1+info.nAlphaMax))>>8);
--- 
-2.8.0.rc3
-
diff --git a/bsp/buildroot/package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch b/bsp/buildroot/package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch
deleted file mode 100644
index b6743ae5..00000000
--- a/bsp/buildroot/package/kodi/0010-curl-support-version-7.5.0-and-upwards.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7d3c70b163bc67aeb1fdef8fd2347b39f311c584 Mon Sep 17 00:00:00 2001
-From: fritsch <peter.fruehberger@gmail.com>
-Date: Sun, 24 Jul 2016 20:24:07 +0200
-Subject: [PATCH] Curl: Adjust multi_cleanup method which returns CURLMcode
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(backported from upstream commit:
- https://github.com/xbmc/xbmc/commit/2a8d3e7f6cffea52740b8392a3be8ec251d5ff70)
----
- xbmc/filesystem/DllLibCurl.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h
-index db97f92..9e78a91 100644
---- a/xbmc/filesystem/DllLibCurl.h
-+++ b/xbmc/filesystem/DllLibCurl.h
-@@ -52,7 +52,7 @@ namespace XCURL
-     virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0;
-     virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0;
-     virtual CURLMsg*  multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0;
--    virtual void multi_cleanup(CURL_HANDLE * handle )=0;
-+    virtual CURLMcode multi_cleanup(CURLM * handle )=0;
-     virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0;
-     virtual void  slist_free_all(struct curl_slist *)=0;
-   };
-@@ -77,7 +77,7 @@ namespace XCURL
-     DEFINE_METHOD5(CURLMcode, multi_fdset, (CURLM *p1, fd_set *p2, fd_set *p3, fd_set *p4, int *p5))
-     DEFINE_METHOD2(CURLMcode, multi_timeout, (CURLM *p1, long *p2))
-     DEFINE_METHOD2(CURLMsg*,  multi_info_read, (CURLM *p1, int *p2))
--    DEFINE_METHOD1(void, multi_cleanup, (CURLM *p1))
-+    DEFINE_METHOD1(CURLMcode, multi_cleanup, (CURLM *p1))
-     DEFINE_METHOD2(struct curl_slist*, slist_append, (struct curl_slist * p1, const char * p2))
-     DEFINE_METHOD1(void, slist_free_all, (struct curl_slist * p1))
-     DEFINE_METHOD1(const char *, easy_strerror, (CURLcode p1))
diff --git a/bsp/buildroot/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch b/bsp/buildroot/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
deleted file mode 100644
index a3a9d50e..00000000
--- a/bsp/buildroot/package/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a17e8d39cf01e26955574acd236b4ef5b54b8c3b Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Mon, 5 Sep 2016 12:34:20 +0200
-Subject: [PATCH 2/2] xbmc_pvr_types.h: Fix compilation with gcc6
-
-Backport of upstream commit from master branch:
-https://github.com/xbmc/xbmc/commit/c8a346109926fa03bf6882c0b6e3885af0e0f8ed
-
-This patch can be removed when Kodi is bumped to 17.0-Krypton.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- xbmc/addons/include/xbmc_pvr_types.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h
-index c5ab20b..e518de1 100644
---- a/xbmc/addons/include/xbmc_pvr_types.h
-+++ b/xbmc/addons/include/xbmc_pvr_types.h
-@@ -34,6 +34,7 @@
- #endif
- #include <string.h>
- #include <stdint.h>
-+#include <stdio.h>
- 
- #include "xbmc_addon_types.h"
- #include "xbmc_epg_types.h"
--- 
-2.9.3
-
diff --git a/bsp/buildroot/package/kodi/0012-Fix_includes_in_amcodec.patch b/bsp/buildroot/package/kodi/0012-Fix_includes_in_amcodec.patch
deleted file mode 100644
index 4a6d44f6..00000000
--- a/bsp/buildroot/package/kodi/0012-Fix_includes_in_amcodec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 4bbb21aa5cee6b2f40759aa8b1bd65246a237f79
-Author: Alex Deryskyba <alex@codesnake.com>
-Date:   Wed May 4 01:38:27 2016 +0200
-
-    [aml] Fix includes in amcodec/codec.h to make them relative
-
-[Taken from upstream commit
-https://github.com/xbmc/xbmc/commit/4bbb21aa5cee6b2f40759aa8b1bd65246a237f79.]
-Signed-off-by: Dagg Stompler <daggs@gmx.com>
-
-diff --git a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
-index 187d4d5..632c24e 100644
---- a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
-+++ b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h
-@@ -12,8 +12,8 @@
- #ifndef CODEC_CTRL_H_
- #define CODEC_CTRL_H_
- 
--#include <codec_type.h>
--#include <codec_error.h>
-+#include "codec_type.h"
-+#include "codec_error.h"
- 
- 
- int codec_init(codec_para_t *);
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-index a1a3447..1bf5a89 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in
-@@ -24,8 +24,6 @@ endif
- ifeq (@USE_LIBAMCODEC@,1)
- SRCS += AMLCodec.cpp
- SRCS += DVDVideoCodecAmlogic.cpp
--INCLUDES += -I$(prefix)/include/amcodec
--INCLUDES += -I$(prefix)/include/amplayer
- endif
- 
- ifeq (@USE_ANDROID@,1)
diff --git a/bsp/buildroot/package/kodi/Config.in b/bsp/buildroot/package/kodi/Config.in
index f2a3e2e0..992b155f 100644
--- a/bsp/buildroot/package/kodi/Config.in
+++ b/bsp/buildroot/package/kodi/Config.in
@@ -1,16 +1,16 @@
 config BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	bool
+	default y if BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
+	# i386: needs sse (see upstream PR 10351)
+	depends on !(BR2_i386 && !BR2_X86_CPU_HAS_SSE)
 	depends on BR2_USE_MMU # libcdio, and others
-	default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \
-		&& BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \
-		&& BR2_TOOLCHAIN_HAS_SYNC_8
 
-comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6"
+comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.8, host gcc >= 4.6"
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_USE_WCHAR || BR2_STATIC_LIBS \
 		|| !BR2_HOST_GCC_AT_LEAST_4_6 \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
 		|| BR2_TOOLCHAIN_USES_MUSL \
 		|| !BR2_PACKAGE_PYTHON \
 		|| BR2_PACKAGE_PYTHON_PYC_ONLY
@@ -20,38 +20,31 @@ config BR2_PACKAGE_KODI_EGL_GLES
 	default y
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_PACKAGE_HAS_LIBGLES
-	depends on !BR2_PACKAGE_KODI_GL # prefer GL if available
+	depends on !BR2_PACKAGE_KODI_GL_EGL # prefer GL if available
 
-config BR2_PACKAGE_KODI_GL
+config BR2_PACKAGE_KODI_GL_EGL
 	bool
 	default y
+	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_PACKAGE_HAS_LIBGL
-	depends on !BR2_arm # kodi needs egl/gles on arm
 
-comment "kodi needs an OpenGL or an openGL ES and EGL backend"
-	depends on BR2_i386 || BR2_x86_64
-	depends on !BR2_PACKAGE_KODI_GL && !BR2_PACKAGE_KODI_EGL_GLES
-
-comment "kodi requires an OpenGL ES and EGL backend"
-	depends on BR2_arm
-	depends on !BR2_PACKAGE_KODI_EGL_GLES
+comment "kodi needs an OpenGL EGL with either an openGL or an OpenGL ES backend"
+	depends on !BR2_PACKAGE_KODI_GL_EGL && !BR2_PACKAGE_KODI_EGL_GLES
 
 menuconfig BR2_PACKAGE_KODI
 	bool "kodi"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_HOST_GCC_AT_LEAST_4_6
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_TOOLCHAIN_USES_MUSL
-	depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL
+	depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL_EGL
 	depends on BR2_USE_WCHAR
-	depends on !BR2_STATIC_LIBS # libsquish, and others
+	depends on !BR2_STATIC_LIBS # python and others
 	depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_PYTHON
 	depends on !BR2_PACKAGE_PYTHON_PYC_ONLY
 	select BR2_NEEDS_HOST_JAVA
-	select BR2_PACKAGE_BOOST
-	select BR2_PACKAGE_BOOST_THREAD
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_FFMPEG
@@ -60,27 +53,15 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_FFMPEG_SWSCALE
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
-	select BR2_PACKAGE_GIFLIB
-	select BR2_PACKAGE_JASPER
-	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBASS
 	select BR2_PACKAGE_LIBCDIO
 	select BR2_PACKAGE_LIBCROSSGUID
 	select BR2_PACKAGE_LIBCURL
-	select BR2_PACKAGE_LIBDCADEC
 	select BR2_PACKAGE_LIBFRIBIDI
-	select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_LIBGCRYPT
-	select BR2_PACKAGE_LIBMPEG2
-	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL_EGL
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBPLIST
-	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_LIBSAMPLERATE
-	select BR2_PACKAGE_LIBSQUISH
-	select BR2_PACKAGE_LIBVORBIS
-	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_OPENSSL
@@ -98,10 +79,9 @@ menuconfig BR2_PACKAGE_KODI
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_TAGLIB
-	select BR2_PACKAGE_TIFF
 	select BR2_PACKAGE_TINYXML
-	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL
-	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL
+	select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL_EGL
+	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL_EGL
 	select BR2_PACKAGE_YAJL
 	select BR2_PACKAGE_ZLIB
 	select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
@@ -129,12 +109,28 @@ config BR2_PACKAGE_KODI_AVAHI
 	  Enable Avahi support.
 	  Select this if you want Kodi to support Bonjour protocol.
 
+config BR2_PACKAGE_KODI_BLUEZ
+	bool "bluetooth"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # bluez5_utils
+	depends on !BR2_PACKAGE_BLUEZ_UTILS # bluez5_utils
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # bluez5_utils
+	select BR2_PACKAGE_BLUEZ5_UTILS
+	help
+	    Enable bluetooth support
+
 config BR2_PACKAGE_KODI_DBUS
 	bool "dbus"
 	select BR2_PACKAGE_DBUS
 	help
 	  Enable D-Bus support
 
+config BR2_PACKAGE_KODI_EVENTCLIENTS
+	bool "eventclients"
+	help
+	  Enable event clients support
+
+	  https://github.com/xbmc/xbmc/blob/master/tools/EventClients/README.txt
+
 config BR2_PACKAGE_KODI_LIBBLURAY
 	bool "blu-ray"
 	select BR2_PACKAGE_LIBBLURAY
@@ -153,6 +149,12 @@ config BR2_PACKAGE_KODI_LIBCEC
 comment "hdmi cec support needs udev /dev management"
 	depends on !BR2_PACKAGE_HAS_UDEV
 
+config BR2_PACKAGE_KODI_LCMS2
+	bool "lcms2"
+	select BR2_PACKAGE_LCMS2
+	help
+	  Enable color management support.
+
 config BR2_PACKAGE_KODI_LIRC
 	bool "lirc"
 	help
@@ -188,19 +190,24 @@ config BR2_PACKAGE_KODI_NONFREE
 	  Enable components with non-free licenses. This option
 	  currently only controls support for RAR archives.
 
-config BR2_PACKAGE_KODI_RTMPDUMP
-	bool "rtmp"
-	select BR2_PACKAGE_RTMPDUMP
+config BR2_PACKAGE_KODI_PULSEAUDIO
+	bool "pulseaudio"
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	# Pulseaudio support in kodi needs glib support in Pulseaudio,
+	# see FindPulseAudio.cmake. Kodi meets all dependencies of
+	# libglib2, so there is no need to propagate them here.
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_PULSEAUDIO
 	help
-	  Enable RTMP input support.
-	  Select this if you want to play back rtmp stream.
+	  Enable Pulseaudio support.
 
 config BR2_PACKAGE_KODI_LIBSHAIRPLAY
 	bool "shairport"
 	select BR2_PACKAGE_LIBSHAIRPLAY
 	help
 	  Enable Shairport support.
-	  Select this if you want to stream content from an Apple device.
+	  Select this if you want to stream content from an Apple
+	  device.
 
 config BR2_PACKAGE_KODI_LIBSMBCLIENT
 	bool "samba"
@@ -233,19 +240,25 @@ config BR2_PACKAGE_KODI_LIBUSB
 
 config BR2_PACKAGE_KODI_LIBVA
 	bool "va"
+	depends on BR2_PACKAGE_KODI_GL_EGL
+	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBVA
 	help
 	  Enable libva support.
 
+comment "libva support needs X.org with an openGL backend"
+	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_KODI_GL_EGL
+
 config BR2_PACKAGE_KODI_LIBVDPAU
 	bool "vdpau"
+	depends on BR2_PACKAGE_KODI_GL_EGL
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBVDPAU
 	help
 	  Enable libvdpau support.
 
-comment "libvdpau support needs X.org"
-	depends on !BR2_PACKAGE_XORG7
+comment "libvdpau support needs X.org with an openGL backend"
+	depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_KODI_GL_EGL
 
 config BR2_PACKAGE_KODI_UPNP
 	bool "upnp"
@@ -253,7 +266,9 @@ config BR2_PACKAGE_KODI_UPNP
 	  Enable UPnP support
 
 config BR2_PACKAGE_KODI_OPTICALDRIVE
-	bool
+	bool "optical drives"
+	help
+	  Add support for optical drives, to read e.g. DVDs...
 
 menu "Audio decoder addons"
 	source "package/kodi-audiodecoder-modplug/Config.in"
@@ -278,6 +293,17 @@ menu "Audio encoder addons"
 	source "package/kodi-audioencoder-wav/Config.in"
 endmenu
 
+menu "Peripheral addons"
+	source "package/kodi-peripheral-joystick/Config.in"
+	source "package/kodi-peripheral-steamcontroller/Config.in"
+	source "package/kodi-peripheral-xarcade/Config.in"
+endmenu
+
+menu "Inputstream addons"
+	source "package/kodi-inputstream-adaptive/Config.in"
+	source "package/kodi-inputstream-rtmp/Config.in"
+endmenu
+
 menu "PVR addons"
 	source "package/kodi-pvr-argustv/Config.in"
 	source "package/kodi-pvr-dvblink/Config.in"
@@ -313,9 +339,12 @@ menu "Screensavers"
 	source "package/kodi-screensaver-stars/Config.in"
 endmenu
 
+menu "Skins"
+	source "package/kodi-skin-confluence/Config.in"
+endmenu
+
 menu "Visualisations"
 	source "package/kodi-visualisation-fishbmc/Config.in"
-	source "package/kodi-visualisation-fountain/Config.in"
 	source "package/kodi-visualisation-goom/Config.in"
 	source "package/kodi-visualisation-shadertoy/Config.in"
 	source "package/kodi-visualisation-spectrum/Config.in"
diff --git a/bsp/buildroot/package/kodi/S50kodi b/bsp/buildroot/package/kodi/S50kodi
index f00c59c5..0afe7a67 100755
--- a/bsp/buildroot/package/kodi/S50kodi
+++ b/bsp/buildroot/package/kodi/S50kodi
@@ -4,7 +4,7 @@
 #
 
 BIN=/usr/bin/br-kodi
-KODI=/usr/lib/xbmc/kodi.bin
+KODI=/usr/lib/kodi/kodi.bin
 KODI_ARGS="--standalone -fs -n"
 PIDFILE=/var/run/kodi.pid
 
diff --git a/bsp/buildroot/package/kodi/kodi.hash b/bsp/buildroot/package/kodi/kodi.hash
index 5aa580ec..23a11ca4 100644
--- a/bsp/buildroot/package/kodi/kodi.hash
+++ b/bsp/buildroot/package/kodi/kodi.hash
@@ -1,2 +1,8 @@
 # Locally computed
-sha256	7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10	kodi-16.1-Jarvis.tar.gz
+sha256 c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d  kodi-17.6-Krypton.tar.gz
+# Locally computed - libdvdcss
+sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34  2f12236.tar.gz
+# Locally computed - libdvdnav
+sha256 312b3d15bc448d24e92f4b2e7248409525eccc4e75776026d805478e51c5ef3d  981488f.tar.gz
+# Locally computed - libdvdread
+sha256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b  17d99db.tar.gz
diff --git a/bsp/buildroot/package/kodi/kodi.mk b/bsp/buildroot/package/kodi/kodi.mk
index de4d308f..9d3b65ae 100644
--- a/bsp/buildroot/package/kodi/kodi.mk
+++ b/bsp/buildroot/package/kodi/kodi.mk
@@ -4,48 +4,35 @@
 #
 ################################################################################
 
-KODI_VERSION = 16.1-Jarvis
+# When updating the version, please also update kodi-jsonschemabuilder
+# and kodi-texturepacker
+KODI_VERSION = 17.6-Krypton
 KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
-KODI_LICENSE = GPLv2
+KODI_LICENSE = GPL-2.0
 KODI_LICENSE_FILES = LICENSE.GPL
 # needed for binary addons
 KODI_INSTALL_STAGING = YES
 KODI_DEPENDENCIES = \
-	boost \
 	bzip2 \
 	expat \
 	ffmpeg \
 	fontconfig \
 	freetype \
-	giflib \
 	host-gawk \
-	host-gettext \
-	host-giflib \
 	host-gperf \
-	host-libjpeg \
-	host-libpng \
-	host-lzo \
+	host-kodi-jsonschemabuilder \
+	host-kodi-texturepacker \
 	host-nasm \
 	host-swig \
+	host-xmlstarlet \
 	host-zip \
-	jasper \
-	jpeg \
 	libass \
 	libcdio \
 	libcrossguid \
 	libcurl \
-	libdcadec \
 	libfribidi \
-	libgcrypt \
-	libmpeg2 \
-	libogg \
 	libplist \
-	libpng \
 	libsamplerate \
-	libsquish \
-	libvorbis \
-	libxml2 \
-	libxslt \
 	lzo \
 	ncurses \
 	openssl \
@@ -54,191 +41,296 @@ KODI_DEPENDENCIES = \
 	readline \
 	sqlite \
 	taglib \
-	tiff \
 	tinyxml \
 	yajl \
 	zlib
 
-KODI_CONF_ENV = \
-	PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \
-	PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \
-	PYTHON_CPPFLAGS="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)" \
-	PYTHON_SITE_PKG="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \
-	PYTHON_NOVERSIONCHECK="no-check" \
-	use_texturepacker_native=yes \
-	USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \
-	TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr"
+KODI_SUBDIR = project/cmake
 
-KODI_CONF_OPTS +=  \
-	--with-ffmpeg=shared \
-	--disable-joystick \
-	--disable-openmax \
-	--disable-pulse \
-	--disable-vtbdecoder \
-	--enable-optimizations
+KODI_LIBDVDCSS_VERSION = 2f12236
+KODI_LIBDVDNAV_VERSION = 981488f
+KODI_LIBDVDREAD_VERSION = 17d99db
 
-ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
-KODI_CONF_OPTS += --enable-mysql
-KODI_CONF_ENV += ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config"
-KODI_DEPENDENCIES += mysql
-else
-KODI_CONF_OPTS += --disable-mysql
-endif
+KODI_EXTRA_DOWNLOADS = \
+	https://github.com/xbmc/libdvdcss/archive/$(KODI_LIBDVDCSS_VERSION).tar.gz \
+	https://github.com/xbmc/libdvdnav/archive/$(KODI_LIBDVDNAV_VERSION).tar.gz \
+	https://github.com/xbmc/libdvdread/archive/$(KODI_LIBDVDREAD_VERSION).tar.gz
 
-ifeq ($(BR2_PACKAGE_KODI_NONFREE),y)
-KODI_CONF_OPTS += --enable-non-free
-KODI_LICENSE := $(KODI_LICENSE), unrar
-KODI_LICENSE_FILES += lib/UnrarXLib/license.txt
-else
-KODI_CONF_OPTS += --disable-non-free
+KODI_CONF_OPTS += \
+	-DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(KODI_C_FLAGS)" \
+	-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(KODI_CXX_FLAGS)" \
+	-DENABLE_CCACHE=OFF \
+	-DENABLE_DVDCSS=ON \
+	-DENABLE_INTERNAL_CROSSGUID=OFF \
+	-DENABLE_INTERNAL_FFMPEG=OFF \
+	-DKODI_DEPENDSBUILD=OFF \
+	-DENABLE_OPENSSL=ON \
+	-DNATIVEPREFIX=$(HOST_DIR) \
+	-DDEPENDS_PATH=$(@D) \
+	-DWITH_FFMPEG=$(STAGING_DIR)/usr \
+	-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
+	-DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
+	-DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \
+	-DLIBDVDREAD_URL=$(DL_DIR)/$(KODI_LIBDVDREAD_VERSION).tar.gz \
+	-DENABLE_IMX=OFF
+
+ifeq ($(BR2_ENABLE_LOCALE),)
+KODI_DEPENDENCIES += libiconv
 endif
 
 ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
 KODI_DEPENDENCIES += rpi-userland
-KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer
-KODI_INCLUDES += \
-	-I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-	-I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux
-KODI_LIBS = -lvcos -lvchostif
+# These CPU-specific options are only used on rbpi:
+# https://github.com/xbmc/xbmc/blob/Krypton/project/cmake/scripts/rbpi/ArchSetup.cmake#L13
+ifeq ($(BR2_arm1176jzf_s)$(BR2_cortex_a7)$(BR2_cortex_a53),y)
+KODI_CONF_OPTS += -DWITH_CPU=$(BR2_GCC_TARGET_CPU)
+endif
+else
+ifeq ($(BR2_arceb)$(BR2_arcle),y)
+KODI_CONF_OPTS += -DWITH_ARCH=arc -DWITH_CPU=arc
+else ifeq ($(BR2_armeb),y)
+KODI_CONF_OPTS += -DWITH_ARCH=arm -DWITH_CPU=arm
+else ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
+KODI_CONF_OPTS += \
+	-DWITH_ARCH=mips$(if $(BR2_ARCH_IS_64),64) \
+	-DWITH_CPU=mips$(if $(BR2_ARCH_IS_64),64)
+else ifeq ($(BR2_powerpc)$(BR2_powerpc64le),y)
+KODI_CONF_OPTS += \
+	-DWITH_ARCH=powerpc$(if $(BR2_ARCH_IS_64),64) \
+	-DWITH_CPU=powerpc$(if $(BR2_ARCH_IS_64),64)
+else ifeq ($(BR2_powerpc64)$(BR2_sparc64)$(BR2_sh4)$(BR2_xtensa),y)
+KODI_CONF_OPTS += -DWITH_ARCH=$(BR2_ARCH) -DWITH_CPU=$(BR2_ARCH)
+else
+# Kodi auto-detects ARCH, tested: arm, aarch64, i386, x86_64
+# see project/cmake/scripts/linux/ArchSetup.cmake
+KODI_CONF_OPTS += -DWITH_CPU=$(BR2_ARCH)
+endif
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+KODI_CONF_OPTS += -D_SSE_OK=ON -D_SSE_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE_OK=OFF -D_SSE_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+KODI_CONF_OPTS += -D_SSE2_OK=ON -D_SSE2_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE2_OK=OFF -D_SSE2_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE3),y)
+KODI_CONF_OPTS += -D_SSE3_OK=ON -D_SSE3_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE3_OK=OFF -D_SSE3_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSSE3),y)
+KODI_CONF_OPTS += -D_SSSE3_OK=ON -D_SSSE3_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSSE3_OK=OFF -D_SSSE3_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE4),y)
+KODI_CONF_OPTS += -D_SSE41_OK=ON -D_SSE41_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE41_OK=OFF -D_SSE41_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE42),y)
+KODI_CONF_OPTS += -D_SSE42_OK=ON -D_SSE42_TRUE=ON
+else
+KODI_CONF_OPTS += -D_SSE42_OK=OFF -D_SSE42_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_AVX),y)
+KODI_CONF_OPTS += -D_AVX_OK=ON -D_AVX_TRUE=ON
+else
+KODI_CONF_OPTS += -D_AVX_OK=OFF -D_AVX_TRUE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_AVX2),y)
+KODI_CONF_OPTS += -D_AVX2_OK=ON -D_AVX2_TRUE=ON
+else
+KODI_CONF_OPTS += -D_AVX2_OK=OFF -D_AVX2_TRUE=OFF
+endif
+
+# mips: uses __atomic_load_8
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+KODI_CXX_FLAGS += -latomic
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_MYSQL),y)
+KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON
+KODI_DEPENDENCIES += mysql
+else
+KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_NONFREE),y)
+KODI_CONF_OPTS += -DENABLE_NONFREE=ON
+KODI_LICENSE := $(KODI_LICENSE), unrar
+KODI_LICENSE_FILES += lib/UnrarXLib/license.txt
+else
+KODI_CONF_OPTS += -DENABLE_NONFREE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+KODI_CONF_OPTS += -DCORE_SYSTEM_NAME=rbpi
+KODI_DEPENDENCIES += rpi-userland
+else
+# Kodi considers "rpbi" and "linux" as two separate platforms. The
+# below options, defined in
+# project/cmake/scripts/linux/ArchSetup.cmake are only valid for the
+# "linux" platforms. The "rpbi" platform has a different set of
+# options, defined in project/cmake/scripts/rbpi/
+KODI_CONF_OPTS += -DENABLE_LDGOLD=OFF
+ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
+KODI_CONF_OPTS += -DENABLE_AML=ON
+KODI_DEPENDENCIES += libamcodec
+else
+KODI_CONF_OPTS += -DENABLE_AML=OFF
+endif
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+KODI_CONF_OPTS += -DENABLE_UDEV=ON
 KODI_DEPENDENCIES += udev
-KODI_CONF_OPTS += --enable-udev
 else
-KODI_CONF_OPTS += --disable-udev
+KODI_CONF_OPTS += -DENABLE_UDEV=OFF
+ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y)
+KODI_CONF_OPTS += -DENABLE_LIBUSB=ON
+KODI_DEPENDENCIES += libusb-compat
 endif
-
-ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y)
-KODI_DEPENDENCIES += imx-vpuwrap
-KODI_CONF_OPTS += --enable-codec=imxvpu
 endif
 
-ifeq ($(BR2_PACKAGE_LIBAMCODEC),y)
-KODI_DEPENDENCIES += libamcodec
-KODI_CONF_OPTS += --enable-codec=amcodec
-KODI_INCLUDES += -I$(STAGING_DIR)/usr/include/amcodec
-endif
-
-KODI_CONF_ENV += \
-	INCLUDES="$(KODI_INCLUDES)" \
-	LIBS="$(KODI_LIBS)"
-
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
-KODI_CONF_OPTS += --enable-libcap
+KODI_CONF_OPTS += -DENABLE_CAP=ON
 KODI_DEPENDENCIES += libcap
 else
-KODI_CONF_OPTS += --disable-libcap
+KODI_CONF_OPTS += -DENABLE_CAP=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBXML2)$(BR2_PACKAGE_LIBXSLT),yy)
+KODI_CONF_OPTS += -DENABLE_XSLT=ON
+KODI_DEPENDENCIES += libxml2 libxslt
+else
+KODI_CONF_OPTS += -DENABLE_XSLT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_BLUEZ),y)
+KODI_CONF_OPTS += -DENABLE_BLUETOOTH=ON
+KODI_DEPENDENCIES += bluez5_utils
+else
+KODI_CONF_OPTS += -DENABLE_BLUETOOTH=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_DBUS),y)
 KODI_DEPENDENCIES += dbus
-KODI_CONF_OPTS += --enable-dbus
+KODI_CONF_OPTS += -DENABLE_DBUS=ON
 else
-KODI_CONF_OPTS += --disable-dbus
+KODI_CONF_OPTS += -DENABLE_DBUS=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_EVENTCLIENTS),y)
+KODI_CONF_OPTS += -DENABLE_EVENTCLIENTS=ON
+else
+KODI_CONF_OPTS += -DENABLE_EVENTCLIENTS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_ALSA_LIB),y)
+KODI_CONF_OPTS += -DENABLE_ALSA=ON
 KODI_DEPENDENCIES += alsa-lib
-KODI_CONF_OPTS += --enable-alsa
 else
-KODI_CONF_OPTS += --disable-alsa
+KODI_CONF_OPTS += -DENABLE_ALSA=OFF
 endif
 
-# quote from kodi/configure.in: "GLES overwrites GL if both set to yes."
-# we choose the opposite because opengl offers more features, like libva support
-# GL means X11, and under X11, Kodi needs libdrm; libdrm is forcefully selected
-# by a modular Xorg server, which Kodi already depends on.
-ifeq ($(BR2_PACKAGE_KODI_GL),y)
-KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \
-	xlib_libXmu xlib_libXrandr xlib_libXt libdrm
-KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles
+ifeq ($(BR2_PACKAGE_KODI_GL_EGL),y)
+KODI_DEPENDENCIES += libegl libglu libgl xlib_libX11 xlib_libXext \
+	xlib_libXrandr libdrm
+KODI_CONF_OPTS += -DENABLE_OPENGL=ON -DENABLE_X11=ON -DENABLE_OPENGLES=OFF
 else
-KODI_CONF_OPTS += --disable-gl --disable-x11
+KODI_CONF_OPTS += -DENABLE_OPENGL=OFF -DENABLE_X11=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y)
 KODI_DEPENDENCIES += libegl libgles
-KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
-KODI_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
-KODI_CONF_OPTS += --enable-gles
+KODI_CONF_OPTS += \
+	-DENABLE_OPENGLES=ON
+KODI_C_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`
+KODI_CXX_FLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`
 else
-KODI_CONF_OPTS += --disable-gles
-endif
-endif
-
-ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y)
-KODI_DEPENDENCIES += libusb-compat
-KODI_CONF_OPTS += --enable-libusb
-else
-KODI_CONF_OPTS += --disable-libusb
+KODI_CONF_OPTS += -DENABLE_OPENGLES=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y)
+KODI_CONF_OPTS += -DENABLE_MICROHTTPD=ON
 KODI_DEPENDENCIES += libmicrohttpd
-KODI_CONF_OPTS += --enable-webserver
 else
-KODI_CONF_OPTS += --disable-webserver
+KODI_CONF_OPTS += -DENABLE_MICROHTTPD=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSMBCLIENT),y)
 KODI_DEPENDENCIES += samba4
-KODI_CONF_OPTS += --enable-samba
+KODI_CONF_OPTS += -DENABLE_SMBCLIENT=ON
 else
-KODI_CONF_OPTS += --disable-samba
+KODI_CONF_OPTS += -DENABLE_SMBCLIENT=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBNFS),y)
 KODI_DEPENDENCIES += libnfs
-KODI_CONF_OPTS += --enable-nfs
+KODI_CONF_OPTS += -DENABLE_NFS=ON
 else
-KODI_CONF_OPTS += --disable-nfs
-endif
-
-ifeq ($(BR2_PACKAGE_KODI_RTMPDUMP),y)
-KODI_DEPENDENCIES += rtmpdump
-KODI_CONF_OPTS += --enable-rtmp
-else
-KODI_CONF_OPTS += --disable-rtmp
+KODI_CONF_OPTS += -DENABLE_NFS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBBLURAY),y)
 KODI_DEPENDENCIES += libbluray
-KODI_CONF_OPTS += --enable-libbluray
+KODI_CONF_OPTS += -DENABLE_BLURAY=ON
 else
-KODI_CONF_OPTS += --disable-libbluray
+KODI_CONF_OPTS += -DENABLE_BLURAY=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSHAIRPLAY),y)
 KODI_DEPENDENCIES += libshairplay
-KODI_CONF_OPTS += --enable-airplay
+KODI_CONF_OPTS += -DENABLE_AIRTUNES=ON
 else
-KODI_CONF_OPTS += --disable-airplay
+KODI_CONF_OPTS += -DENABLE_AIRTUNES=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSSH),y)
 KODI_DEPENDENCIES += libssh
-KODI_CONF_OPTS += --enable-ssh
+KODI_CONF_OPTS += -DENABLE_SSH=ON
 else
-KODI_CONF_OPTS += --disable-ssh
+KODI_CONF_OPTS += -DENABLE_SSH=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_AVAHI),y)
 KODI_DEPENDENCIES += avahi
-KODI_CONF_OPTS += --enable-avahi
+KODI_CONF_OPTS += -DENABLE_AVAHI=ON
 else
-KODI_CONF_OPTS += --disable-avahi
+KODI_CONF_OPTS += -DENABLE_AVAHI=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBCEC),y)
 KODI_DEPENDENCIES += libcec
-KODI_CONF_OPTS += --enable-libcec
+KODI_CONF_OPTS += -DENABLE_CEC=ON
 else
-KODI_CONF_OPTS += --disable-libcec
+KODI_CONF_OPTS += -DENABLE_CEC=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_KODI_LCMS2),y)
+KODI_DEPENDENCIES += lcms2
+KODI_CONF_OPTS += -DENABLE_LCMS2=ON
+else
+KODI_CONF_OPTS += -DENABLE_LCMS2=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIRC),y)
-KODI_CONF_OPTS += --enable-lirc
+KODI_CONF_OPTS += -DENABLE_LIRC=ON
 else
-KODI_CONF_OPTS += --disable-lirc
+KODI_CONF_OPTS += -DENABLE_LIRC=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y)
@@ -248,51 +340,48 @@ endif
 # kodi needs libva & libva-glx
 ifeq ($(BR2_PACKAGE_KODI_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy)
 KODI_DEPENDENCIES += mesa3d libva
-KODI_CONF_OPTS += --enable-vaapi
+KODI_CONF_OPTS += -DENABLE_VAAPI=ON
 else
-KODI_CONF_OPTS += --disable-vaapi
+KODI_CONF_OPTS += -DENABLE_VAAPI=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBVDPAU),y)
 KODI_DEPENDENCIES += libvdpau
-KODI_CONF_OPTS += --enable-vdpau
+KODI_CONF_OPTS += -DENABLE_VDPAU=ON
 else
-KODI_CONF_OPTS += --disable-vdpau
+KODI_CONF_OPTS += -DENABLE_VDPAU=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_UPNP),y)
-KODI_CONF_OPTS += --enable-upnp
+KODI_CONF_OPTS += -DENABLE_UPNP=ON
 else
-KODI_CONF_OPTS += --disable-upnp
+KODI_CONF_OPTS += -DENABLE_UPNP=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_OPTICALDRIVE),y)
-KODI_CONF_OPTS += --enable-optical-drive --enable-dvdcss
+KODI_CONF_OPTS += -DENABLE_OPTICAL=ON
 else
-KODI_CONF_OPTS += --disable-optical-drive --disable-dvdcss
+KODI_CONF_OPTS += -DENABLE_OPTICAL=OFF
 endif
 
-# Add HOST_DIR to PATH for codegenerator.mk to find swig
-define KODI_BOOTSTRAP
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/JsonSchemaBuilder
-	$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/TexturePacker
-	cd $(@D) && PATH=$(BR_PATH) ./bootstrap
-endef
-KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP
+ifeq ($(BR2_PACKAGE_KODI_PULSEAUDIO),y)
+KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=ON
+KODI_DEPENDENCIES += pulseaudio
+else
+KODI_CONF_OPTS += -DENABLE_PULSEAUDIO=OFF
+endif
 
+# Remove versioncheck addon, updating Kodi is done by building a new
+# buildroot image.
+KODI_ADDON_MANIFEST = $(TARGET_DIR)/usr/share/kodi/system/addon-manifest.xml
 define KODI_CLEAN_UNUSED_ADDONS
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm
-	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes
+	rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/service.xbmc.versioncheck
+	$(HOST_DIR)/bin/xml ed -L \
+		-d "/addons/addon[text()='service.xbmc.versioncheck']" \
+		$(KODI_ADDON_MANIFEST)
 endef
 KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_UNUSED_ADDONS
 
-define KODI_CLEAN_CONFLUENCE_SKIN
-	find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.png -delete
-	find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.jpg -delete
-endef
-KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_CONFLUENCE_SKIN
-
 define KODI_INSTALL_BR_WRAPPER
 	$(INSTALL) -D -m 0755 package/kodi/br-kodi \
 		$(TARGET_DIR)/usr/bin/br-kodi
@@ -327,4 +416,4 @@ define KODI_INSTALL_INIT_SYSTEMD
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/kodi.service
 endef
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/kompexsqlite/kompexsqlite.mk b/bsp/buildroot/package/kompexsqlite/kompexsqlite.mk
index 7f57680a..51b80aa8 100644
--- a/bsp/buildroot/package/kompexsqlite/kompexsqlite.mk
+++ b/bsp/buildroot/package/kompexsqlite/kompexsqlite.mk
@@ -8,7 +8,7 @@ KOMPEXSQLITE_VERSION = v1.10.12-1
 KOMPEXSQLITE_SOURCE = $(KOMPEXSQLITE_VERSION).tar.gz
 KOMPEXSQLITE_SITE = https://github.com/Aethelflaed/kompex-sqlite-wrapper/archive
 KOMPEXSQLITE_INSTALL_STAGING = YES
-KOMPEXSQLITE_LICENSE = LGPLv3+ (wrapper), Public Domain (bundled sqlite)
+KOMPEXSQLITE_LICENSE = LGPL-3.0+ (wrapper), Public Domain (bundled sqlite)
 KOMPEXSQLITE_LICENSE_FILES = LICENSE.txt
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ktap/Config.in b/bsp/buildroot/package/ktap/Config.in
index c8552284..38293f6d 100644
--- a/bsp/buildroot/package/ktap/Config.in
+++ b/bsp/buildroot/package/ktap/Config.in
@@ -5,21 +5,22 @@ config BR2_PACKAGE_KTAP
 	help
 	  ktap is a script-based dynamic tracing tool for Linux
 
-	  It uses a scripting language and lets users trace the Linux kernel
-	  dynamically. ktap is designed to give operational insights with
-	  interoperability that allows users to tune, troubleshoot and extend
-	  kernel and application. It's similar to Linux Systemtap and
-	  Solaris Dtrace.
+	  It uses a scripting language and lets users trace the Linux
+	  kernel dynamically. ktap is designed to give operational
+	  insights with interoperability that allows users to tune,
+	  troubleshoot and extend kernel and application.
+	  It's similar to Linux Systemtap and Solaris Dtrace.
 
 	  ktap doesn't support kernels older than 3.1.
 
-	  To be able to resolve symbols in DSO and for sdt, you need to enable
-	  elfutils.
+	  To be able to resolve symbols in DSO and for sdt, you need to
+	  enable elfutils.
 
 	  Your kernel must have CONFIG_EVENT_TRACING,
 	  CONFIG_PERF_EVENTS, and CONFIG_DEBUG_FS enabled to compile.
 
-	  Buildroot automatically enables these in the kernel configuration.
+	  Buildroot automatically enables these in the kernel
+	  configuration.
 
 	  http://www.ktap.org
 
diff --git a/bsp/buildroot/package/ktap/ktap.hash b/bsp/buildroot/package/ktap/ktap.hash
index d58bd85b..1eff7125 100644
--- a/bsp/buildroot/package/ktap/ktap.hash
+++ b/bsp/buildroot/package/ktap/ktap.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 bc8b03a53c430ae4fcf594ffdf31e2b2ed47a8fee25dd8fea60aa34f75441707  ktap-eb66d40310c93dc82bc8eac889744c1ed1f01f7b.tar.gz
+sha256 44a0808d57175cf9d15466f720e1e10d5ed1abc3497aedf9ddd6469545552345  ktap-23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f.tar.gz
+sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  LICENSE-GPL
diff --git a/bsp/buildroot/package/ktap/ktap.mk b/bsp/buildroot/package/ktap/ktap.mk
index 966b51c9..3b9134da 100644
--- a/bsp/buildroot/package/ktap/ktap.mk
+++ b/bsp/buildroot/package/ktap/ktap.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-KTAP_VERSION = eb66d40310c93dc82bc8eac889744c1ed1f01f7b
+KTAP_VERSION = 23bc7a4a94bd9e4e1b8b7c06632e61c041d57b5f
 KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION))
-KTAP_LICENSE = GPLv2
+KTAP_LICENSE = GPL-2.0
 KTAP_LICENSE_FILES = LICENSE-GPL
 
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
diff --git a/bsp/buildroot/package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch b/bsp/buildroot/package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch
new file mode 100644
index 00000000..633da8b3
--- /dev/null
+++ b/bsp/buildroot/package/kvazaar/0001-Modify-and-use-FILL_ARRAY-macro-to-prevent-warning-o.patch
@@ -0,0 +1,56 @@
+From 47a9f0de049e77e866ea5bdd4bc7c795ea6dd641 Mon Sep 17 00:00:00 2001
+From: Ari Lemmetti <ari.lemmetti@gmail.com>
+Date: Tue, 11 Apr 2017 12:57:22 +0300
+Subject: [PATCH] Modify and use FILL_ARRAY macro to prevent warning on GCC 7
+
+Following warning was given and is false positive
+
+error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream commit 47a9f0de049e7.
+
+ src/global.h | 6 +++++-
+ src/rdo.c    | 8 ++++----
+ 2 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/global.h b/src/global.h
+index bedcd49c2e02..518167443f35 100644
+--- a/src/global.h
++++ b/src/global.h
+@@ -219,7 +219,11 @@ typedef int16_t coeff_t;
+ // Fill a structure or a static array with val bytes.
+ #define FILL(var, val) memset(&(var), (val), sizeof(var))
+ // Fill a number of elements in an array with val bytes.
+-#define FILL_ARRAY(ar, val, size) memset((ar), (val), (size) * sizeof(*(ar)))
++#define FILL_ARRAY(ar, val, size) \
++{\
++  void *temp_ptr = (void*)(ar);\
++  memset((temp_ptr), (val), (size) * sizeof(*(ar)));\
++}
+ 
+ #define FREE_POINTER(pointer) { free((void*)pointer); pointer = NULL; }
+ #define MOVE_POINTER(dst_pointer,src_pointer) { dst_pointer = src_pointer; src_pointer = NULL; }
+diff --git a/src/rdo.c b/src/rdo.c
+index 52305fd72fab..2579f2808441 100644
+--- a/src/rdo.c
++++ b/src/rdo.c
+@@ -558,10 +558,10 @@ void kvz_rdoq(encoder_state_t * const state, coeff_t *coef, coeff_t *dest_coeff,
+   // Explicitly tell the only possible numbers of elements to be zeroed.
+   // Hope the compiler is able to utilize this information.
+   switch (cg_num) {
+-    case  1: memset(sig_coeffgroup_flag, 0,  1 * sizeof(sig_coeffgroup_flag[0])); break;
+-    case  4: memset(sig_coeffgroup_flag, 0,  4 * sizeof(sig_coeffgroup_flag[0])); break;
+-    case 16: memset(sig_coeffgroup_flag, 0, 16 * sizeof(sig_coeffgroup_flag[0])); break;
+-    case 64: memset(sig_coeffgroup_flag, 0, 64 * sizeof(sig_coeffgroup_flag[0])); break;
++    case  1: FILL_ARRAY(sig_coeffgroup_flag, 0,  1); break;
++    case  4: FILL_ARRAY(sig_coeffgroup_flag, 0,  4); break;
++    case 16: FILL_ARRAY(sig_coeffgroup_flag, 0, 16); break;
++    case 64: FILL_ARRAY(sig_coeffgroup_flag, 0, 64); break;
+     default: assert(0 && "There should be 1, 4, 16 or 64 coefficient groups");
+   }
+ 
+-- 
+2.13.2
+
diff --git a/bsp/buildroot/package/kvazaar/Config.in b/bsp/buildroot/package/kvazaar/Config.in
new file mode 100644
index 00000000..558d161e
--- /dev/null
+++ b/bsp/buildroot/package/kvazaar/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_KVAZAAR
+	bool "kvazaar"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	# use deprecated altivec vec_lvsl()
+	depends on !BR2_powerpc && !BR2_powerpc64 && !BR2_powerpc64le
+	help
+	  An open-source HEVC encoder licensed under LGPLv2.1
+
+	  https://github.com/ultravideo/kvazaar
+
+comment "kvazaar needs a toolchain w/ C++, threads"
+	depends on !BR2_powerpc && !BR2_powerpc64 && !BR2_powerpc64le
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/kvazaar/kvazaar.hash b/bsp/buildroot/package/kvazaar/kvazaar.hash
new file mode 100644
index 00000000..80f480b5
--- /dev/null
+++ b/bsp/buildroot/package/kvazaar/kvazaar.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 8e382738a51004bfcfca4c832e8b41fe6a17f889f3c39151dc1c1a37261a3a6d  kvazaar-v1.1.0.tar.gz
diff --git a/bsp/buildroot/package/kvazaar/kvazaar.mk b/bsp/buildroot/package/kvazaar/kvazaar.mk
new file mode 100644
index 00000000..f9149a78
--- /dev/null
+++ b/bsp/buildroot/package/kvazaar/kvazaar.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# kvazaar
+#
+################################################################################
+
+KVAZAAR_VERSION = v1.1.0
+KVAZAAR_SITE = $(call github,ultravideo,kvazaar,$(KVAZAAR_VERSION))
+KVAZAAR_LICENSE = LGPL-2.1+
+KVAZAAR_LICENSE_FILES = COPYING
+KVAZAAR_AUTORECONF = YES
+KVAZAAR_INSTALL_STAGING = YES
+KVAZAAR_DEPENDENCIES = host-pkgconf
+KVAZAAR_CONF_OPTS = --without-cryptopp
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch b/bsp/buildroot/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch
new file mode 100644
index 00000000..cbfa3a87
--- /dev/null
+++ b/bsp/buildroot/package/kvm-unit-tests/0001-Makefile-remove-Werror-to-avoid-build-failures.patch
@@ -0,0 +1,27 @@
+From 08e14a662b9e75daec29722e49150869952ba1b6 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 20 Nov 2017 22:09:39 +0100
+Subject: [PATCH] Makefile: remove -Werror to avoid build failures
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Matthew: Refactoring of Thomas Petazzoni's original.]
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 7231334..d9ad42b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,6 @@ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \
+ COMMON_CFLAGS += -g $(autodepend-flags)
+ COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized
+ COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter
+-COMMON_CFLAGS += -Werror
+ frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer
+ fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "")
+ fnostack_protector := $(call cc-option, -fno-stack-protector, "")
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/kvm-unit-tests/0001-remove-werror.patch b/bsp/buildroot/package/kvm-unit-tests/0001-remove-werror.patch
deleted file mode 100644
index 058a640d..00000000
--- a/bsp/buildroot/package/kvm-unit-tests/0001-remove-werror.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove -Werror to avoid build failures
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -45,7 +45,7 @@
-               > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
- 
- CFLAGS += -g
--CFLAGS += $(autodepend-flags) -Wall -Werror -Wno-frame-address
-+CFLAGS += $(autodepend-flags) -Wall -Wno-frame-address
- frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer
- fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "")
- fnostack_protector := $(call cc-option, -fno-stack-protector, "")
diff --git a/bsp/buildroot/package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch b/bsp/buildroot/package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch
deleted file mode 100644
index c8ee6b1a..00000000
--- a/bsp/buildroot/package/kvm-unit-tests/0001-x86-hyperv_clock-be-explicit-about-mul-instruction-d.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 022ae220d6e7b5bd064bc8698c271dca4dac7d8c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Mon, 8 May 2017 22:27:25 +0200
-Subject: [PATCH] x86/hyperv_clock: be explicit about mul instruction data size
-
-With gcc 4.7.2, the build fails with:
-
-x86/hyperv_clock.c: Assembler messages:
-x86/hyperv_clock.c:21: Error: no instruction mnemonic suffix given and no register operands; can't size instruction
-
-In order to avoid this, make the mul instruction data size explicit by
-adding the appropriate suffix. It operates on 64-bit data, so use
-"mulq".
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- x86/hyperv_clock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/x86/hyperv_clock.c b/x86/hyperv_clock.c
-index 8b1deba..6c4dd56 100644
---- a/x86/hyperv_clock.c
-+++ b/x86/hyperv_clock.c
-@@ -19,7 +19,7 @@ static inline u64 scale_delta(u64 delta, u64 mul_frac)
- 	u64 product, unused;
- 
- 	__asm__ (
--		"mul %3"
-+		"mulq %3"
- 		: "=d" (product), "=a" (unused) : "1" (delta), "rm" ((u64)mul_frac) );
- 
- 	return product;
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch b/bsp/buildroot/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch
new file mode 100644
index 00000000..47f15c6c
--- /dev/null
+++ b/bsp/buildroot/package/kvm-unit-tests/0002-kvm-unit-tests-test-for-rdseed-rdrand.patch
@@ -0,0 +1,110 @@
+From 8d9a62a5fa89001266352a929c5d40b28c0dda85 Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Fri, 12 Jan 2018 19:07:27 -0600
+Subject: [PATCH v2] kvm-unit-tests: test for rdseed/rdrand
+
+The build fails when the host binutils isn't at least 2.23
+(2.22.x introduced RDSEED).
+
+Fixes:
+http://autobuild.buildroot.net/results/c39/c3987a3cbd2960b0ff50f872636bdfd8d1a9c820/
+
+Upstream:
+https://marc.info/?l=kvm&m=151580743523259&w=2
+
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ Makefile        |  2 +-
+ configure       | 18 ++++++++++++++++++
+ x86/vmx_tests.c |  6 ++++++
+ 3 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index d9ad42b..799e9b5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -50,7 +50,7 @@ include $(SRCDIR)/$(TEST_DIR)/Makefile
+ cc-option = $(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null \
+               > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+ 
+-COMMON_CFLAGS += -g $(autodepend-flags)
++COMMON_CFLAGS += -g $(autodepend-flags) $(EXTRA_CFLAGS)
+ COMMON_CFLAGS += -Wall -Wwrite-strings -Wclobbered -Wempty-body -Wuninitialized
+ COMMON_CFLAGS += -Wignored-qualifiers -Wunused-but-set-parameter
+ frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer
+diff --git a/configure b/configure
+index dd9d361..21c0219 100755
+--- a/configure
++++ b/configure
+@@ -171,6 +171,23 @@ mkdir -p lib
+ ln -sf "$asm" lib/asm
+ 
+ 
++cat > rd_test.c <<EOF
++#include <stdint.h>
++int main() {
++   uint16_t seed=0;
++   unsigned char ok;
++   asm volatile ("rdseed %0; setc %1"
++                 : "=r" (seed), "=qm" (ok));
++   return ok;
++}
++EOF
++if $cross_prefix$cc -o /dev/null rd_test.c &> /dev/null; then
++  echo "Checking for rdseed/rdrand... Yes."
++else
++  echo "Checking for rdseed/rdrand... No."
++  extra_cflags="-DNO_RDSEEDRAND"
++fi
++
+ # create the config
+ cat <<EOF > config.mak
+ SRCDIR=$srcdir
+@@ -181,6 +198,7 @@ ARCH_NAME=$arch_name
+ PROCESSOR=$processor
+ CC=$cross_prefix$cc
+ CXX=$cross_prefix$cxx
++EXTRA_CFLAGS=$extra_cflags
+ LD=$cross_prefix$ld
+ OBJCOPY=$cross_prefix$objcopy
+ OBJDUMP=$cross_prefix$objdump
+diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
+index 4a3e94b..2cbe3eb 100644
+--- a/x86/vmx_tests.c
++++ b/x86/vmx_tests.c
+@@ -770,8 +770,10 @@ asm(
+ 	"insn_sldt: sldt %ax;ret\n\t"
+ 	"insn_lldt: xor %eax, %eax; lldt %ax;ret\n\t"
+ 	"insn_str: str %ax;ret\n\t"
++#ifndef NO_RDSEEDRAND
+ 	"insn_rdrand: rdrand %rax;ret\n\t"
+ 	"insn_rdseed: rdseed %rax;ret\n\t"
++#endif
+ );
+ extern void insn_hlt();
+ extern void insn_invlpg();
+@@ -796,8 +798,10 @@ extern void insn_lldt();
+ extern void insn_str();
+ extern void insn_cpuid();
+ extern void insn_invd();
++#ifndef NO_RDSEEDRAND
+ extern void insn_rdrand();
+ extern void insn_rdseed();
++#endif
+ 
+ u32 cur_insn;
+ u64 cr3;
+@@ -853,8 +857,10 @@ static struct insn_table insn_table[] = {
+ 	{"DESC_TABLE (LLDT)", CPU_DESC_TABLE, insn_lldt, INSN_CPU1, 47, 0, 0, 0},
+ 	{"DESC_TABLE (STR)", CPU_DESC_TABLE, insn_str, INSN_CPU1, 47, 0, 0, 0},
+ 	/* LTR causes a #GP if done with a busy selector, so it is not tested.  */
++#ifndef NO_RDSEEDRAND
+ 	{"RDRAND", CPU_RDRAND, insn_rdrand, INSN_CPU1, VMX_RDRAND, 0, 0, 0},
+ 	{"RDSEED", CPU_RDSEED, insn_rdseed, INSN_CPU1, VMX_RDSEED, 0, 0, 0},
++#endif
+ 	// Instructions always trap
+ 	{"CPUID", 0, insn_cpuid, INSN_ALWAYS_TRAP, 10, 0, 0, 0},
+ 	{"INVD", 0, insn_invd, INSN_ALWAYS_TRAP, 13, 0, 0, 0},
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/kvm-unit-tests/Config.in b/bsp/buildroot/package/kvm-unit-tests/Config.in
index 72656462..8b7908ee 100644
--- a/bsp/buildroot/package/kvm-unit-tests/Config.in
+++ b/bsp/buildroot/package/kvm-unit-tests/Config.in
@@ -1,16 +1,22 @@
+config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS
+	bool
+	# On ARM, it uses virtualization extensions
+	default y if BR2_cortex_a7 || BR2_cortex_a12 || \
+		BR2_cortex_a15 || BR2_cortex_a15_a7 || \
+		BR2_cortex_a17 || BR2_cortex_a17_a7
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_powerpc64 || BR2_powerpc64le
+
 config BR2_PACKAGE_KVM_UNIT_TESTS
 	bool "kvm-unit-tests"
-	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y
+	depends on BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS
 	# on i386 and x86-64, __builtin_reachable is used, so we need
 	# gcc 4.5 at least. on i386, we use the target gcc, while on
 	# x86-64 we use the host gcc (see .mk file for details)
-	# On ARM, it uses virtualization extensions
-	depends on BR2_cortex_a7 || BR2_cortex_a12 || \
-		BR2_cortex_a15 || BR2_cortex_a17 || \
-		(BR2_i386 && BR2_TOOLCHAIN_GCC_AT_LEAST_4_5) || \
-		BR2_powerpc64 || \
-		BR2_powerpc64le || \
-		(BR2_x86_64 && BR2_HOST_GCC_AT_LEAST_4_5)
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || !BR2_i386
+	depends on BR2_HOST_GCC_AT_LEAST_4_5 || !BR2_x86_64
+	depends on BR2_HOSTARCH = "x86_64" || !BR2_x86_64
+	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y
 	help
 	  kvm-unit-tests is a project as old as KVM. As its name
 	  suggests, it's purpose is to provide unit tests for KVM. The
@@ -28,3 +34,11 @@ config BR2_PACKAGE_KVM_UNIT_TESTS
 	  features are submitted with accompanying unit tests.
 
 	  http://www.linux-kvm.org/page/KVM-unit-tests
+
+comment "kvm-unit-tests needs a toolchain w/ gcc >= 4.5"
+	depends on BR2_i386
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
+
+comment "kvm-unit-tests needs a host gcc >= 4.5"
+	depends on BR2_x86_64
+	depends on !BR2_HOST_GCC_AT_LEAST_4_5
diff --git a/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash b/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash
new file mode 100644
index 00000000..bb827de9
--- /dev/null
+++ b/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 346c543de9e953db283072e1c591cab9d0eb775f7fb1fff3d7560f38bdf6bdf2  kvm-unit-tests-kvm-unit-tests-20171020.tar.gz
diff --git a/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk b/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk
index 0ddb0178..54614e26 100644
--- a/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk
+++ b/bsp/buildroot/package/kvm-unit-tests/kvm-unit-tests.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-KVM_UNIT_TESTS_VERSION = 5731572b2ac23eb410732110b93425b5bb7f27dd
+KVM_UNIT_TESTS_VERSION = kvm-unit-tests-20171020
 KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git
 KVM_UNIT_TESTS_SITE_METHOD = git
-KVM_UNIT_TESTS_LICENSE = LGPLv2
+KVM_UNIT_TESTS_LICENSE = LGPL-2.0
 KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT
 
 ifeq ($(BR2_arm),y)
diff --git a/bsp/buildroot/package/kvmtool/Config.in b/bsp/buildroot/package/kvmtool/Config.in
index d2290c5d..bf19a253 100644
--- a/bsp/buildroot/package/kvmtool/Config.in
+++ b/bsp/buildroot/package/kvmtool/Config.in
@@ -14,8 +14,8 @@ config BR2_PACKAGE_KVMTOOL
 	help
 	  kvmtool is a lightweight tool for hosting KVM guests.
 	  As a pure virtualization tool it only supports guests using
-	  the same architecture, though it supports running 32-bit guests
-	  on those 64-bit architectures that allow this.
+	  the same architecture, though it supports running 32-bit
+	  guests on those 64-bit architectures that allow this.
 
 	  https://git.kernel.org/cgit/linux/kernel/git/will/kvmtool.git/tree/README
 
diff --git a/bsp/buildroot/package/kvmtool/kvmtool.hash b/bsp/buildroot/package/kvmtool/kvmtool.hash
new file mode 100644
index 00000000..42827735
--- /dev/null
+++ b/bsp/buildroot/package/kvmtool/kvmtool.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 2d55e4521ac040b870db015e1f075d69b89f940242d7ce5708f7d7060d62c0cc  kvmtool-f77d646ba01d04be5aad9449ac00719c043fe36e.tar.gz
diff --git a/bsp/buildroot/package/kvmtool/kvmtool.mk b/bsp/buildroot/package/kvmtool/kvmtool.mk
index 12454e1b..5894e477 100644
--- a/bsp/buildroot/package/kvmtool/kvmtool.mk
+++ b/bsp/buildroot/package/kvmtool/kvmtool.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-KVMTOOL_VERSION = bed2bd9e1fbef5819090feeada7b86eed97ca5e2
+KVMTOOL_VERSION = f77d646ba01d04be5aad9449ac00719c043fe36e
 KVMTOOL_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/will/kvmtool.git
 KVMTOOL_SITE_METHOD = git
 KVMTOOL_DEPENDENCIES = \
@@ -15,26 +15,9 @@ KVMTOOL_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_LIBVNCSERVER),libvncserver) \
 	$(if $(BR2_PACKAGE_SDL),sdl) \
 	$(if $(BR2_PACKAGE_ZLIB),zlib)
-KVMTOOL_LICENSE = GPLv2
+KVMTOOL_LICENSE = GPL-2.0
 KVMTOOL_LICENSE_FILES = COPYING
 
-# This is required to convert a static binary (init helper) back into
-# object-file format, and in multilib toolchains like CS 2012.09 for x86
-# the default is i386, hence when building for x86_64 things break since
-# LD doesn't autodetect the input file format.
-# GCC-as-linker can't accomplish this feat easily either since it's mixing
-# static content (guest_init.o) with dynamic one (lkvm) making
-# a relocatable output file.
-# The purpose of this trick is to embed the init helper into the main
-# binary to help users in guest system startup, which would otherwise
-# require more complex guest images.
-# This needs revisiting if/when X32 ABI support is added.
-#
-# If more packages need this (unlikely) an ld wrapper might be a better
-# solution, using gcc -dumpspecs information.
-KVMTOOL_EXTRA_LDFLAGS = \
-	$(if $(BR2_x86_64),-m elf_x86_64)
-
 # Disable -Werror, otherwise musl is not happy
 KVMTOOL_MAKE_OPTS = \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
diff --git a/bsp/buildroot/package/kyua/kyua.mk b/bsp/buildroot/package/kyua/kyua.mk
index c75a09fb..9e1c810a 100644
--- a/bsp/buildroot/package/kyua/kyua.mk
+++ b/bsp/buildroot/package/kyua/kyua.mk
@@ -8,7 +8,7 @@ KYUA_VERSION = 0.11
 KYUA_SITE = https://github.com/jmmv/kyua/releases/download/kyua-$(KYUA_VERSION)
 KYUA_DEPENDENCIES = host-pkgconf atf lutok sqlite
 KYUA_CONF_OPTS = --without-doxygen --without-atf
-KYUA_LICENSE = BSD-3c
+KYUA_LICENSE = BSD-3-Clause
 KYUA_LICENSE_FILES = COPYING
 KYUA_CONF_ENV = \
 	kyua_cv_attribute_noreturn=yes \
diff --git a/bsp/buildroot/package/lame/lame.mk b/bsp/buildroot/package/lame/lame.mk
index 342e5c41..3d76ab93 100644
--- a/bsp/buildroot/package/lame/lame.mk
+++ b/bsp/buildroot/package/lame/lame.mk
@@ -10,7 +10,7 @@ LAME_DEPENDENCIES = host-pkgconf
 LAME_INSTALL_STAGING = YES
 LAME_CONF_ENV = GTK_CONFIG=/bin/false
 LAME_CONF_OPTS = --enable-dynamic-frontends
-LAME_LICENSE = LGPLv2+
+LAME_LICENSE = LGPL-2.0+
 LAME_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
diff --git a/bsp/buildroot/package/lapack/Config.in b/bsp/buildroot/package/lapack/Config.in
index b5eca492..9687ace8 100644
--- a/bsp/buildroot/package/lapack/Config.in
+++ b/bsp/buildroot/package/lapack/Config.in
@@ -15,7 +15,7 @@ config BR2_PACKAGE_LAPACK
 
 config BR2_PACKAGE_LAPACK_COMPLEX
 	bool "Complex/Complex16 support"
-	depends on BR2_PACKAGE_LAPACK
 	default y
+	depends on BR2_PACKAGE_LAPACK
 	help
 	  Builds support for COMPLEX and COMPLEX16 data types.
diff --git a/bsp/buildroot/package/lapack/lapack.hash b/bsp/buildroot/package/lapack/lapack.hash
index e57cebcb..fd3feef5 100644
--- a/bsp/buildroot/package/lapack/lapack.hash
+++ b/bsp/buildroot/package/lapack/lapack.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  888a50d787a9d828074db581c80b2d22bdb91435a673b1bf6cd6eb51aa50d1de  lapack-3.6.1.tgz
+sha256 f6c53fd9f56932f3ddb3d5e24c1c07e4cd9b3b08e7f89de9c867125eecc9a1c8  lapack-3.7.1.tgz
diff --git a/bsp/buildroot/package/lapack/lapack.mk b/bsp/buildroot/package/lapack/lapack.mk
index 56008e14..4e74bbd6 100644
--- a/bsp/buildroot/package/lapack/lapack.mk
+++ b/bsp/buildroot/package/lapack/lapack.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-LAPACK_VERSION = 3.6.1
+LAPACK_VERSION = 3.7.1
 LAPACK_SOURCE = lapack-$(LAPACK_VERSION).tgz
-LAPACK_LICENSE = BSD-3c
+LAPACK_LICENSE = BSD-3-Clause
 LAPACK_LICENSE_FILES = LICENSE
 LAPACK_SITE = http://www.netlib.org/lapack
 LAPACK_INSTALL_STAGING = YES
+LAPACK_SUPPORTS_IN_SOURCE_BUILD = NO
 LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON
 
 ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y)
diff --git a/bsp/buildroot/package/latencytop/latencytop.mk b/bsp/buildroot/package/latencytop/latencytop.mk
index 644a84f1..56afe860 100644
--- a/bsp/buildroot/package/latencytop/latencytop.mk
+++ b/bsp/buildroot/package/latencytop/latencytop.mk
@@ -7,7 +7,7 @@
 LATENCYTOP_VERSION = 0.5
 LATENCYTOP_SITE = http://www.latencytop.org/download
 LATENCYTOP_DEPENDENCIES = libglib2 ncurses
-LATENCYTOP_LICENSE = GPLv2
+LATENCYTOP_LICENSE = GPL-2.0
 LATENCYTOP_LICENSE_FILES = latencytop.c
 
 # NOTE: GTK is heavy weight, we intentionally build the text (ncurses)
diff --git a/bsp/buildroot/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch b/bsp/buildroot/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
new file mode 100644
index 00000000..12acf448
--- /dev/null
+++ b/bsp/buildroot/package/lbase64/0001-retro-compatible-with-Lua-5.1.patch
@@ -0,0 +1,20 @@
+retro compatible with Lua 5.1 C/API
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+Index: b/lbase64.c
+===================================================================
+--- a/lbase64.c
++++ b/lbase64.c
+@@ -111,7 +111,11 @@
+ 
+ LUALIB_API int luaopen_base64(lua_State *L)
+ {
++#if LUA_VERSION_NUM >= 502
+  luaL_newlib(L,R);
++#else
++ luaL_register(L,MYNAME,R);
++#endif
+  lua_pushliteral(L,"version");			/** version */
+  lua_pushliteral(L,MYVERSION);
+  lua_settable(L,-3);
diff --git a/bsp/buildroot/package/lbase64/Config.in b/bsp/buildroot/package/lbase64/Config.in
index 5ef91bf3..34ef943a 100644
--- a/bsp/buildroot/package/lbase64/Config.in
+++ b/bsp/buildroot/package/lbase64/Config.in
@@ -1,12 +1,7 @@
 config BR2_PACKAGE_LBASE64
 	bool "lbase64"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	help
 	  A base64 library for Lua
 
-	  http://luaforge.net/projects/lbase64/
-
-comment "lbase64 needs a Lua 5.1 interpreter"
-	depends on !BR2_PACKAGE_LUA_5_1
-	depends on !BR2_PACKAGE_LUAJIT
+	  http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/#lbase64
diff --git a/bsp/buildroot/package/lbase64/lbase64.hash b/bsp/buildroot/package/lbase64/lbase64.hash
index 08060903..d835d40b 100644
--- a/bsp/buildroot/package/lbase64/lbase64.hash
+++ b/bsp/buildroot/package/lbase64/lbase64.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	7326658d48a70382b496eb88220b0c398c19ed712e39863939330fec0533362a  lbase64-20120820-1.src.rock
+sha256 b83dbc87330a322e5222cd891a6e258b533f5b6c46e8f3c18fc0265e4c991aaa  lbase64.tar.gz
diff --git a/bsp/buildroot/package/lbase64/lbase64.mk b/bsp/buildroot/package/lbase64/lbase64.mk
index 80e88007..0225fc67 100644
--- a/bsp/buildroot/package/lbase64/lbase64.mk
+++ b/bsp/buildroot/package/lbase64/lbase64.mk
@@ -4,9 +4,21 @@
 #
 ################################################################################
 
-LBASE64_VERSION = 20120820-1
-LBASE64_SUBDIR = base64
+LBASE64_VERSION = 20120820
+LBASE64_SITE = http://webserver2.tecgraf.puc-rio.br/~lhf/ftp/lua/5.3
+LBASE64_SOURCE = lbase64.tar.gz
 LBASE64_LICENSE = Public domain
-LBASE64_LICENSE_FILES = $(LBASE64_SUBDIR)/README
+LBASE64_LICENSE_FILES = README
+LBASE64_DEPENDENCIES = luainterpreter
 
-$(eval $(luarocks-package))
+define LBASE64_BUILD_CMDS
+	$(MAKE1) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -fPIC" -C $(@D) so
+endef
+
+define LBASE64_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/base64.so \
+		$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/base64.so
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/lbreakout2/Config.in b/bsp/buildroot/package/lbreakout2/Config.in
index 221c9e2c..eeb8a069 100644
--- a/bsp/buildroot/package/lbreakout2/Config.in
+++ b/bsp/buildroot/package/lbreakout2/Config.in
@@ -2,13 +2,12 @@ config BR2_PACKAGE_LBREAKOUT2
 	bool "LBreakout2"
 	select BR2_PACKAGE_SDL
 	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  LBreakout2 is the successor to LBreakout, a breakout-style arcade
-	  game in the manner of Arkanoid. Requires SDL, libpng, and
-	  optionnally SDL_mixer/SDL_net.
-	  A display with minimum 640x480 resolution, a keyboard and a mouse
-	  are recommanded.
+	  LBreakout2 is the successor to LBreakout, a breakout-style
+	  arcade game in the manner of Arkanoid. Requires SDL, libpng,
+	  and optionnally SDL_mixer/SDL_net.
+	  A display with minimum 640x480 resolution, a keyboard and a
+	  mouse are recommanded.
 
 	  http://lgames.sourceforge.net/index.php?project=LBreakout2
 
diff --git a/bsp/buildroot/package/lbreakout2/lbreakout2.hash b/bsp/buildroot/package/lbreakout2/lbreakout2.hash
index d9638b47..0d305dcd 100644
--- a/bsp/buildroot/package/lbreakout2/lbreakout2.hash
+++ b/bsp/buildroot/package/lbreakout2/lbreakout2.hash
@@ -1,2 +1,5 @@
+# From https://sourceforge.net/projects/lgames/files/lbreakout2/2.6/
+md5 1a9238b83f9f13f09b7a4d53e00b4e84  lbreakout2-2.6.5.tar.gz
+sha1 d92326499165fd368be04378d633e13d42b4d2d7  lbreakout2-2.6.5.tar.gz
 # Locally computed:
-sha256  0b90716d52e67c27ff41ab7aa5c09dad4f5f19a78076cc57dd4b4d7ed2c1dbd9  lbreakout2-2.6.4.tar.gz
+sha256 9104d6175553da3442dc6a5fc407a669e2f5aff3eedc5d30409eb003b7a78d6f  lbreakout2-2.6.5.tar.gz
diff --git a/bsp/buildroot/package/lbreakout2/lbreakout2.mk b/bsp/buildroot/package/lbreakout2/lbreakout2.mk
index 5dc4c717..49db8d54 100644
--- a/bsp/buildroot/package/lbreakout2/lbreakout2.mk
+++ b/bsp/buildroot/package/lbreakout2/lbreakout2.mk
@@ -5,20 +5,16 @@
 ################################################################################
 
 LBREAKOUT2_VERSION_MAJOR = 2.6
-LBREAKOUT2_VERSION = $(LBREAKOUT2_VERSION_MAJOR).4
-LBREAKOUT2_SITE = http://downloads.sourceforge.net/lgames/lbreakout2/$(LBREAKOUT2_VERSION_MAJOR)
-LBREAKOUT2_LICENSE = GPLv2+
+LBREAKOUT2_VERSION = $(LBREAKOUT2_VERSION_MAJOR).5
+LBREAKOUT2_SITE = https://downloads.sourceforge.net/lgames/lbreakout2/$(LBREAKOUT2_VERSION_MAJOR)
+LBREAKOUT2_LICENSE = GPL-2.0+
 LBREAKOUT2_LICENSE_FILES = COPYING
 
-LBREAKOUT2_DEPENDENCIES = sdl libpng
+LBREAKOUT2_DEPENDENCIES = sdl libpng $(TARGET_NLS_DEPENDENCIES)
 
 LBREAKOUT2_CONF_ENV = \
-	SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config"
-
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-LBREAKOUT2_DEPENDENCIES += gettext
-LBREAKOUT2_CONF_ENV += LIBS=-lintl
-endif
+	SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
+	LIBS=$(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y)
 LBREAKOUT2_DEPENDENCIES += sdl_mixer
diff --git a/bsp/buildroot/package/lcdapi/Config.in b/bsp/buildroot/package/lcdapi/Config.in
index 34ce0fa1..154689b2 100644
--- a/bsp/buildroot/package/lcdapi/Config.in
+++ b/bsp/buildroot/package/lcdapi/Config.in
@@ -3,7 +3,8 @@ config BR2_PACKAGE_LCDAPI
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  C++ client API for lcdproc, containing a set of widget classes.
+	  C++ client API for lcdproc, containing a set of widget
+	  classes.
 
 	  https://github.com/spdawson/lcdapi
 
diff --git a/bsp/buildroot/package/lcdapi/lcdapi.hash b/bsp/buildroot/package/lcdapi/lcdapi.hash
index 98c42f8f..c04ea021 100644
--- a/bsp/buildroot/package/lcdapi/lcdapi.hash
+++ b/bsp/buildroot/package/lcdapi/lcdapi.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 fa26b53fd543ebab825d55cafb4c88af6a71ac3dcf86d4e8bcd3592be4212b55 lcdapi-v0.10.tar.gz
+sha256 6afdd4238af1fa7ea5f10378601381fc3f535a10504dc7d4ea8eab56e0dda091  lcdapi-v0.11.tar.gz
diff --git a/bsp/buildroot/package/lcdapi/lcdapi.mk b/bsp/buildroot/package/lcdapi/lcdapi.mk
index 75390421..f7c71dfd 100644
--- a/bsp/buildroot/package/lcdapi/lcdapi.mk
+++ b/bsp/buildroot/package/lcdapi/lcdapi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LCDAPI_VERSION = v0.10
+LCDAPI_VERSION = v0.11
 LCDAPI_SITE = $(call github,spdawson,lcdapi,$(LCDAPI_VERSION))
-LCDAPI_LICENSE = LGPLv2.1+
+LCDAPI_LICENSE = LGPL-2.1+
 LCDAPI_LICENSE_FILES = COPYING
 LCDAPI_AUTORECONF = YES
 LCDAPI_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch b/bsp/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch
new file mode 100644
index 00000000..8c212359
--- /dev/null
+++ b/bsp/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch
@@ -0,0 +1,50 @@
+From 6267665454501512ac054202b38e4e6a72fa284b Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 8 Sep 2017 14:19:11 +0300
+Subject: [PATCH] Add missing ioctl header
+
+The spidev.h header uses macros from linux/ioctl.h. Add this header
+explicitly since some libc, like musl, do not include it implicitly.
+This fixes the following build failure:
+
+In file included from .../sysroot/usr/include/sys/ioctl.h:7:0,
+                 from hd44780-spi.c:31:
+hd44780-spi.c: In function ‘spi_transfer’:
+hd44780-spi.c:89:24: error: ‘_IOC_SIZEBITS’ undeclared (first use in this function)
+  status = ioctl(p->fd, SPI_IOC_MESSAGE(1), &xfer);
+                        ^
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/lcdproc/lcdproc/pull/90
+
+ server/drivers/hd44780-pifacecad.c | 1 +
+ server/drivers/hd44780-spi.c       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/server/drivers/hd44780-pifacecad.c b/server/drivers/hd44780-pifacecad.c
+index a73b9f9b1f82..55139124d852 100644
+--- a/server/drivers/hd44780-pifacecad.c
++++ b/server/drivers/hd44780-pifacecad.c
+@@ -54,6 +54,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <linux/ioctl.h>
+ #include <stdint.h>
+ #include <linux/spi/spidev.h>
+ 
+diff --git a/server/drivers/hd44780-spi.c b/server/drivers/hd44780-spi.c
+index 791156f87a26..74c85fb014aa 100644
+--- a/server/drivers/hd44780-spi.c
++++ b/server/drivers/hd44780-spi.c
+@@ -29,6 +29,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <linux/ioctl.h>
+ #include <stdint.h>
+ #include <linux/spi/spidev.h>
+ 
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/lcdproc/0002-musl.patch b/bsp/buildroot/package/lcdproc/0002-musl.patch
deleted file mode 100644
index d0425fd5..00000000
--- a/bsp/buildroot/package/lcdproc/0002-musl.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Fix musl build
-
-Partly downloaded from
-http://lists.omnipotent.net/pipermail/lcdproc/2015-November/014291.html
-http://lists.omnipotent.net/pipermail/lcdproc/2015-November/014281.html
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr lcdproc-0.5.7.org/clients/lcdproc/machine.h lcdproc-0.5.7/clients/lcdproc/machine.h
---- lcdproc-0.5.7.org/clients/lcdproc/machine.h	2012-08-19 16:29:07.000000000 +0200
-+++ lcdproc-0.5.7/clients/lcdproc/machine.h	2016-01-30 14:07:33.641802847 +0100
-@@ -12,6 +12,7 @@
- #ifndef _lcdproc_machine_h_
- #define _lcdproc_machine_h_
- 
-+#include <time.h>
- #include "shared/LL.h"
- 
- #ifndef LOADAVG_NSTATS
-diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-pifacecad.c lcdproc-0.5.7/server/drivers/hd44780-pifacecad.c
---- lcdproc-0.5.7.org/server/drivers/hd44780-pifacecad.c	2014-03-23 11:22:09.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/hd44780-pifacecad.c	2016-01-30 14:12:03.521279729 +0100
-@@ -54,6 +54,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <linux/ioctl.h>
- #include <stdint.h>
- #include <linux/spi/spidev.h>
- 
-diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-rpi.c lcdproc-0.5.7/server/drivers/hd44780-rpi.c
---- lcdproc-0.5.7.org/server/drivers/hd44780-rpi.c	2014-03-23 11:22:09.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/hd44780-rpi.c	2016-01-30 14:04:10.288112853 +0100
-@@ -285,7 +285,7 @@
- 
- 	/* Unmap and free memory */
- 	if (gpio_map != NULL)
--		munmap((caddr_t) gpio_map, GPIO_BLOCK_SIZE);
-+		munmap((void *) gpio_map, GPIO_BLOCK_SIZE);
- 	if (p->rpi_gpio != NULL)
- 		free(p->rpi_gpio);
- 	p->rpi_gpio = NULL;
-diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-spi.c lcdproc-0.5.7/server/drivers/hd44780-spi.c
---- lcdproc-0.5.7.org/server/drivers/hd44780-spi.c	2014-03-23 11:22:09.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/hd44780-spi.c	2016-01-30 14:11:11.604763500 +0100
-@@ -29,6 +29,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <linux/ioctl.h>
- #include <stdint.h>
- #include <linux/spi/spidev.h>
- 
-diff -uNr lcdproc-0.5.7.org/server/drivers/mtc_s16209x.c lcdproc-0.5.7/server/drivers/mtc_s16209x.c
---- lcdproc-0.5.7.org/server/drivers/mtc_s16209x.c	2011-08-14 14:29:16.000000000 +0200
-+++ lcdproc-0.5.7/server/drivers/mtc_s16209x.c	2016-01-30 14:13:10.691122839 +0100
-@@ -49,6 +49,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/file.h>
- 
- #ifdef HAVE_CONFIG_H
- # include "config.h"
-diff -uNr lcdproc-0.5.7.org/server/drivers/rawserial.c lcdproc-0.5.7/server/drivers/rawserial.c
---- lcdproc-0.5.7.org/server/drivers/rawserial.c	2014-03-23 11:22:10.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/rawserial.c	2016-01-30 14:03:43.465779507 +0100
-@@ -60,13 +60,13 @@
- 	/** \name Event loop timing. refresh_time and refresh_delta form the
- 	 * event loop timing mechanism for configurable update rates.
- 	 *@{*/
--	uint refresh_time;		/**< time at the last screen update */
--	uint refresh_delta;		/**< time step to next screen update */
-+	unsigned int refresh_time;		/**< time at the last screen update */
-+	unsigned int refresh_delta;		/**< time step to next screen update */
- 	/**@}*/
- } PrivateData;
- 
- /* Local prototypes */
--static uint get_millisecond_time(void);
-+static unsigned int get_millisecond_time(void);
- 
- 
- /* Vars for the server core */
-@@ -303,7 +303,7 @@
- 	PrivateData *p = drvthis->private_data;
- 	char out[LCD_MAX_WIDTH * LCD_MAX_HEIGHT];
- 
--	uint currentTime = get_millisecond_time();
-+	unsigned int currentTime = get_millisecond_time();
- 	int t_delta = currentTime - p->refresh_time;
- 
- 	/*
-@@ -415,7 +415,7 @@
-  *
-  * \return  int with current millisecond time.
-  */
--static uint
-+static unsigned int
- get_millisecond_time(void)
- {
- 	struct timeval ts;
diff --git a/bsp/buildroot/package/lcdproc/lcdproc.hash b/bsp/buildroot/package/lcdproc/lcdproc.hash
index ea39a9b4..00f68544 100644
--- a/bsp/buildroot/package/lcdproc/lcdproc.hash
+++ b/bsp/buildroot/package/lcdproc/lcdproc.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804  lcdproc-0.5.7.tar.gz
+sha256  d48a915496c96ff775b377d2222de3150ae5172bfb84a6ec9f9ceab962f97b83  lcdproc-0.5.9.tar.gz
diff --git a/bsp/buildroot/package/lcdproc/lcdproc.mk b/bsp/buildroot/package/lcdproc/lcdproc.mk
index 4fbeca14..e5b6172b 100644
--- a/bsp/buildroot/package/lcdproc/lcdproc.mk
+++ b/bsp/buildroot/package/lcdproc/lcdproc.mk
@@ -4,15 +4,13 @@
 #
 ################################################################################
 
-LCDPROC_VERSION = 0.5.7
-LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
-LCDPROC_LICENSE = GPLv2+
+LCDPROC_VERSION = 0.5.9
+LCDPROC_SITE = https://github.com/lcdproc/lcdproc/releases/download/v$(LCDPROC_VERSION)
+LCDPROC_LICENSE = GPL-2.0+
 LCDPROC_LICENSE_FILES = COPYING
 LCDPROC_MAKE = $(MAKE1)
 
-LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \
-	--with-ft-prefix="$(STAGING_DIR)/usr" \
-	--with-ft-exec-prefix="$(STAGING_DIR)/usr"
+LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)
 
 ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
 LCDPROC_CONF_OPTS += --enable-lcdproc-menus
@@ -20,4 +18,14 @@ endif
 
 LCDPROC_DEPENDENCIES = freetype ncurses zlib
 
+LCDPROC_CONF_ENV += ac_cv_path_FT2_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+LCDPROC_DEPENDENCIES += libpng
+LCDPROC_CONF_ENV += ac_cv_path__png_config=$(STAGING_DIR)/usr/bin/libpng-config
+LCDPROC_CONF_OPTS += --enable-libpng
+else
+LCDPROC_CONF_OPTS += --disable-libpng
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch b/bsp/buildroot/package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch
deleted file mode 100644
index f8c0d00d..00000000
--- a/bsp/buildroot/package/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0b55fd4e0935a0231ca258fde631a95215df2f72 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 11 Nov 2016 23:29:56 +0100
-Subject: [PATCH] Fix lcms2.pc.in thread library dependency.
-
-Needed (sometimes) for static linking.
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- lcms2.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lcms2.pc.in b/lcms2.pc.in
-index b715f59..5b4213c 100644
---- a/lcms2.pc.in
-+++ b/lcms2.pc.in
-@@ -7,5 +7,5 @@ Name: @PACKAGE@
- Description: LCMS Color Management Library
- Version: @VERSION@
- Libs: -L${libdir} -llcms2
--Libs.private: @LIB_MATH@ 
-+Libs.private: @LIB_MATH@ @LIB_THREAD@
- Cflags: -I${includedir}
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch b/bsp/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch
new file mode 100644
index 00000000..c43d9343
--- /dev/null
+++ b/bsp/buildroot/package/lcms2/0001-Upgrade-Visual-studio-2017-15.8.patch
@@ -0,0 +1,174 @@
+From 768f70ca405cd3159d990e962d54456773bb8cf8 Mon Sep 17 00:00:00 2001
+From: Marti Maria <info@littlecms.com>
+Date: Wed, 15 Aug 2018 20:07:56 +0200
+Subject: [PATCH] Upgrade Visual studio 2017 15.8
+
+- Upgrade to 15.8
+- Add check on CGATS memory allocation (thanks to Quang Nguyen for
+pointing out this)
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ Projects/VC2017/jpegicc/jpegicc.vcxproj           |  1 +
+ Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj       |  2 +-
+ Projects/VC2017/lcms2_static/lcms2_static.vcxproj |  2 +-
+ Projects/VC2017/linkicc/linkicc.vcxproj           |  2 +-
+ Projects/VC2017/psicc/psicc.vcxproj               |  2 +-
+ Projects/VC2017/testbed/testbed.vcxproj           |  2 +-
+ Projects/VC2017/tiffdiff/tiffdiff.vcxproj         |  2 +-
+ Projects/VC2017/tifficc/tifficc.vcxproj           |  2 +-
+ Projects/VC2017/transicc/transicc.vcxproj         |  1 +
+ src/cmscgats.c                                    | 14 ++++++++++----
+ 10 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/Projects/VC2017/jpegicc/jpegicc.vcxproj b/Projects/VC2017/jpegicc/jpegicc.vcxproj
+index ab26a53..39cfd00 100644
+--- a/Projects/VC2017/jpegicc/jpegicc.vcxproj
++++ b/Projects/VC2017/jpegicc/jpegicc.vcxproj
+@@ -22,6 +22,7 @@
+     <ProjectGuid>{62812507-F926-4968-96A9-17678460AD90}</ProjectGuid>
+     <RootNamespace>jpegicc</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
+index 4c8aa3f..d1bf3eb 100644
+--- a/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
++++ b/Projects/VC2017/lcms2_DLL/lcms2_DLL.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{8C51BE48-ADB8-4089-A9EC-F6BF993A0548}</ProjectGuid>
+     <RootNamespace>lcms2_DLL</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
+index 2a9988a..9fc05ce 100644
+--- a/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
++++ b/Projects/VC2017/lcms2_static/lcms2_static.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{71DEDE59-3F1E-486B-A899-4283000F76B5}</ProjectGuid>
+     <RootNamespace>lcms2_static</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/linkicc/linkicc.vcxproj b/Projects/VC2017/linkicc/linkicc.vcxproj
+index 30c2b4e..51586dd 100644
+--- a/Projects/VC2017/linkicc/linkicc.vcxproj
++++ b/Projects/VC2017/linkicc/linkicc.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{FBFBE1DC-DB84-4BA1-9552-B4780F457849}</ProjectGuid>
+     <RootNamespace>linkicc</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/psicc/psicc.vcxproj b/Projects/VC2017/psicc/psicc.vcxproj
+index 9dcf89a..8f26e12 100644
+--- a/Projects/VC2017/psicc/psicc.vcxproj
++++ b/Projects/VC2017/psicc/psicc.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{EF6A8851-65FE-46F5-B9EF-14F0B671F693}</ProjectGuid>
+     <RootNamespace>psicc</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/testbed/testbed.vcxproj b/Projects/VC2017/testbed/testbed.vcxproj
+index 0af3762..3f6aea3 100644
+--- a/Projects/VC2017/testbed/testbed.vcxproj
++++ b/Projects/VC2017/testbed/testbed.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{928A3A2B-46EF-4279-959C-513B3652FF0E}</ProjectGuid>
+     <RootNamespace>testbed</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
+index 7edfe28..3a6d837 100644
+--- a/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
++++ b/Projects/VC2017/tiffdiff/tiffdiff.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{75B91835-CCD7-48BE-A606-A9C997D5DBEE}</ProjectGuid>
+     <RootNamespace>tiffdiff</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/tifficc/tifficc.vcxproj b/Projects/VC2017/tifficc/tifficc.vcxproj
+index cd9f04c..5ef954f 100644
+--- a/Projects/VC2017/tifficc/tifficc.vcxproj
++++ b/Projects/VC2017/tifficc/tifficc.vcxproj
+@@ -22,7 +22,7 @@
+     <ProjectGuid>{2256DE16-ED92-4A6F-9C54-F65BB61E64A2}</ProjectGuid>
+     <RootNamespace>tifficc</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
+-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/Projects/VC2017/transicc/transicc.vcxproj b/Projects/VC2017/transicc/transicc.vcxproj
+index d9b77c6..b3173d8 100644
+--- a/Projects/VC2017/transicc/transicc.vcxproj
++++ b/Projects/VC2017/transicc/transicc.vcxproj
+@@ -22,6 +22,7 @@
+     <ProjectGuid>{9EE22D66-C849-474C-9ED5-C3E141DAB160}</ProjectGuid>
+     <RootNamespace>transicc</RootNamespace>
+     <Keyword>Win32Proj</Keyword>
++    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+diff --git a/src/cmscgats.c b/src/cmscgats.c
+index 1a87613..8c3e96d 100644
+--- a/src/cmscgats.c
++++ b/src/cmscgats.c
+@@ -1,7 +1,7 @@
+ //---------------------------------------------------------------------------------
+ //
+ //  Little Color Management System
+-//  Copyright (c) 1998-2017 Marti Maria Saguer
++//  Copyright (c) 1998-2018 Marti Maria Saguer
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the "Software"),
+@@ -1506,10 +1506,16 @@ void AllocateDataSet(cmsIT8* it8)
+     t-> nSamples   = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_FIELDS"));
+     t-> nPatches   = atoi(cmsIT8GetProperty(it8, "NUMBER_OF_SETS"));
+ 
+-    t-> Data = (char**)AllocChunk (it8, ((cmsUInt32Number) t->nSamples + 1) * ((cmsUInt32Number) t->nPatches + 1) *sizeof (char*));
+-    if (t->Data == NULL) {
++    if (t -> nSamples < 0 || t->nSamples > 0x7ffe || t->nPatches < 0 || t->nPatches > 0x7ffe)
++    {
++        SynError(it8, "AllocateDataSet: too much data");
++    }
++    else {
++        t->Data = (char**)AllocChunk(it8, ((cmsUInt32Number)t->nSamples + 1) * ((cmsUInt32Number)t->nPatches + 1) * sizeof(char*));
++        if (t->Data == NULL) {
+ 
+-        SynError(it8, "AllocateDataSet: Unable to allocate data array");
++            SynError(it8, "AllocateDataSet: Unable to allocate data array");
++        }
+     }
+ 
+ }
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/lcms2/0002-Added-an-extra-check-to-MLU-bounds.patch b/bsp/buildroot/package/lcms2/0002-Added-an-extra-check-to-MLU-bounds.patch
deleted file mode 100644
index 9a5d9dd4..00000000
--- a/bsp/buildroot/package/lcms2/0002-Added-an-extra-check-to-MLU-bounds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001
-From: Marti <marti.maria@tktbrainpower.com>
-Date: Mon, 15 Aug 2016 23:31:39 +0200
-Subject: [PATCH] Added an extra check to MLU bounds
-
-Thanks to Ibrahim el-sayed for spotting the bug
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/cmstypes.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cmstypes.c b/src/cmstypes.c
-index cb61860..c7328b9 100644
---- a/src/cmstypes.c
-+++ b/src/cmstypes.c
-@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU
- 
-         // Check for overflow
-         if (Offset < (SizeOfHeader + 8)) goto Error;
-+        if ((Offset + Len) > SizeOfTag + 8) goto Error;
- 
-         // True begin of the string
-         BeginOfThisString = Offset - SizeOfHeader - 8;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/lcms2/Config.in b/bsp/buildroot/package/lcms2/Config.in
index d94c075e..19e1b9c1 100644
--- a/bsp/buildroot/package/lcms2/Config.in
+++ b/bsp/buildroot/package/lcms2/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_LCMS2
 	  Little Color Management Software (CMS) intends to be an OPEN
 	  SOURCE small-footprint color management engine, with special
 	  focus on accuracy and performance.
-	  It uses the International Color Consortium standard (ICC), which is
-	  the modern standard when regarding to color management.
+	  It uses the International Color Consortium standard (ICC),
+	  which is the modern standard when regarding to color
+	  management.
 
 	  http://www.littlecms.com/
diff --git a/bsp/buildroot/package/lcms2/lcms2.hash b/bsp/buildroot/package/lcms2/lcms2.hash
index 1cf1017c..248a08cf 100644
--- a/bsp/buildroot/package/lcms2/lcms2.hash
+++ b/bsp/buildroot/package/lcms2/lcms2.hash
@@ -1,4 +1,5 @@
-# From https://sourceforge.net/projects/lcms/files/lcms/2.8
-sha1 e9535ec4a572b8fc7a1c405c35e6f4dc97714197 lcms2-2.8.tar.gz
+# From https://sourceforge.net/projects/lcms/files/lcms/2.9
+sha1 60bea9875e017dd1c466e988c2ad98f8766e4e55 lcms2-2.9.tar.gz
 # Locally computed:
-sha256 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 lcms2-2.8.tar.gz
+sha256 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 lcms2-2.9.tar.gz
+sha256 c725daac91a9259ce5e195683c0eeb797d345035c36ac5ba114c9fa80e11639a COPYING
diff --git a/bsp/buildroot/package/lcms2/lcms2.mk b/bsp/buildroot/package/lcms2/lcms2.mk
index 9a4cf5ed..a19f807d 100644
--- a/bsp/buildroot/package/lcms2/lcms2.mk
+++ b/bsp/buildroot/package/lcms2/lcms2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LCMS2_VERSION = 2.8
+LCMS2_VERSION = 2.9
 LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION)
 LCMS2_LICENSE = MIT
 LCMS2_LICENSE_FILES = COPYING
@@ -31,4 +31,5 @@ else
 LCMS2_CONF_OPTS += --without-zlib
 endif
 
+$(eval $(host-autotools-package))
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/leafnode2/Config.in b/bsp/buildroot/package/leafnode2/Config.in
index 348e6daa..93d3090a 100644
--- a/bsp/buildroot/package/leafnode2/Config.in
+++ b/bsp/buildroot/package/leafnode2/Config.in
@@ -7,7 +7,8 @@ config BR2_PACKAGE_LEAFNODE2
 	  server designed for small sites with just a few active
 	  newsgroups.
 
-	  Leafnode-2 needs inetd, check chapter 14 of the documentation at
+	  Leafnode-2 needs inetd, check chapter 14 of the documentation
+	  at:
 	  http://www.dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/leafnode-readme.txt
 
 	  For example, you can add this line to inetd.conf:
diff --git a/bsp/buildroot/package/leafnode2/leafnode2.mk b/bsp/buildroot/package/leafnode2/leafnode2.mk
index 0c20fd03..a02aad43 100644
--- a/bsp/buildroot/package/leafnode2/leafnode2.mk
+++ b/bsp/buildroot/package/leafnode2/leafnode2.mk
@@ -7,7 +7,7 @@
 LEAFNODE2_VERSION = 2.0.0.alpha20140727b
 LEAFNODE2_SOURCE = leafnode-$(LEAFNODE2_VERSION).tar.bz2
 LEAFNODE2_SITE = http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta
-LEAFNODE2_LICENSE = LGPLv2.1
+LEAFNODE2_LICENSE = LGPL-2.1
 LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL
 LEAFNODE2_DEPENDENCIES = host-pcre pcre
 
@@ -16,7 +16,7 @@ LEAFNODE2_CONF_ENV = \
 
 # --enable-runas-user use 'news' as default but the configure stop
 # if news doesn't exist on the build host.
-# Use 'root' while cross-compiling 
+# Use 'root' while cross-compiling
 LEAFNODE2_CONF_OPTS = \
 	--sysconfdir=/etc/leafnode2 \
 	--enable-spooldir=/var/spool/news \
@@ -30,8 +30,8 @@ define LEAFNODE2_BUILD_SORTNL_TOOL
 	cd $(@D); \
 	$(HOSTCC) $(HOST_CFLAGS) -o b_sortnl_host \
 		arc4random.c mergesort.c b_sortnl.c critmem_malloc.c \
-		critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/usr/include \
-		-L $(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib -lpcre
+		critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/include \
+		-L $(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib -lpcre
 endef
 
 LEAFNODE2_PRE_BUILD_HOOKS += LEAFNODE2_BUILD_SORTNL_TOOL
diff --git a/bsp/buildroot/package/leafpad/leafpad.mk b/bsp/buildroot/package/leafpad/leafpad.mk
index 9551a758..c6c28d12 100644
--- a/bsp/buildroot/package/leafpad/leafpad.mk
+++ b/bsp/buildroot/package/leafpad/leafpad.mk
@@ -7,7 +7,7 @@
 LEAFPAD_VERSION = 0.8.18.1
 LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad
 LEAFPAD_DEPENDENCIES = libgtk2 host-intltool
-LEAFPAD_LICENSE = GPLv2+
+LEAFPAD_LICENSE = GPL-2.0+
 LEAFPAD_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lensfun/Config.in b/bsp/buildroot/package/lensfun/Config.in
new file mode 100644
index 00000000..7ec49020
--- /dev/null
+++ b/bsp/buildroot/package/lensfun/Config.in
@@ -0,0 +1,29 @@
+config BR2_PACKAGE_LENSFUN
+	bool "lensfun"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  Lensfun itself is only a library for correcting several
+	  artefacts and a database for storing lens profiles. To
+	  actually use Lensfun to process your images you need an
+	  image editing application with Lensfun support.
+
+	  http://lensfun.sourceforge.net
+
+if BR2_PACKAGE_LENSFUN
+
+config BR2_PACKAGE_LENSFUN_TOOLS
+	bool "lensfun tools"
+	select BR2_PACKAGE_LIBPNG
+	help
+	  Build 'lenstool'.
+
+endif
+
+comment "lensfun needs a toolchain w/ C++, threads, wchar"
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/lensfun/lensfun.hash b/bsp/buildroot/package/lensfun/lensfun.hash
new file mode 100644
index 00000000..a60f8f46
--- /dev/null
+++ b/bsp/buildroot/package/lensfun/lensfun.hash
@@ -0,0 +1,5 @@
+# From https://sourceforge.net/projects/lensfun/files/0.3.2
+sha1 1d978b15aa7304d66a4931fa37ca9f8f89396c16 lensfun-0.3.2.tar.gz
+md5 247e59a0812ec451f6cd0d20b3379cb5 lensfun-0.3.2.tar.gz
+# Locally calculated
+sha256 ae8bcad46614ca47f5bda65b00af4a257a9564a61725df9c74cb260da544d331 lensfun-0.3.2.tar.gz
diff --git a/bsp/buildroot/package/lensfun/lensfun.mk b/bsp/buildroot/package/lensfun/lensfun.mk
new file mode 100644
index 00000000..9258409f
--- /dev/null
+++ b/bsp/buildroot/package/lensfun/lensfun.mk
@@ -0,0 +1,47 @@
+################################################################################
+#
+# lensfun
+#
+################################################################################
+
+LENSFUN_VERSION = 0.3.2
+LENSFUN_SITE = https://sourceforge.net/projects/lensfun/files/$(LENSFUN_VERSION)
+LENSFUN_LICENSE = LGPL-3.0+ (libraries), GPL-3.0+ (programs)
+LENSFUN_LICENSE_FILES = docs/gpl-3.0.txt docs/lgpl-3.0.txt
+LENSFUN_INSTALL_STAGING = YES
+LENSFUN_DEPENDENCIES = libglib2
+
+# lensfun doesn't support in source build, it fail to build lensfun tools.
+LENSFUN_SUPPORTS_IN_SOURCE_BUILD = NO
+
+ifeq ($(BR2_X86_CPU_HAS_SSE),y)
+LENSFUN_CONF_OPTS += -DBUILD_FOR_SSE=ON
+else
+LENSFUN_CONF_OPTS += -DBUILD_FOR_SSE=OFF
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+LENSFUN_CONF_OPTS += -DBUILD_FOR_SSE2=ON
+else
+LENSFUN_CONF_OPTS += -DBUILD_FOR_SSE2=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LENSFUN_TOOLS),y)
+LENSFUN_DEPENDENCIES += libpng
+LENSFUN_CONF_OPTS += -DBUILD_LENSTOOL=ON
+# broken
+else
+LENSFUN_CONF_OPTS += -DBUILD_LENSTOOL=OFF
+endif
+
+ifeq ($(BR2_STATIC_LIBS),y)
+LENSFUN_CONF_OPTS += -DBUILD_STATIC=ON
+else
+LENSFUN_CONF_OPTS += -DBUILD_STATIC=OFF
+endif
+
+# Don't install helper scripts (which require python3 and gksudo).
+# Don't run setup.py on the host.
+LENSFUN_CONF_OPTS += -DINSTALL_HELPER_SCRIPTS=OFF -DPYTHON=OFF
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/leptonica/Config.in b/bsp/buildroot/package/leptonica/Config.in
new file mode 100644
index 00000000..ec4920c2
--- /dev/null
+++ b/bsp/buildroot/package/leptonica/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LEPTONICA
+	bool "leptonica"
+	help
+	  Leptonica is an image processing and image analysis library.
+
+	  http://www.leptonica.org/
diff --git a/bsp/buildroot/package/leptonica/leptonica.hash b/bsp/buildroot/package/leptonica/leptonica.hash
new file mode 100644
index 00000000..f67f2b88
--- /dev/null
+++ b/bsp/buildroot/package/leptonica/leptonica.hash
@@ -0,0 +1,2 @@
+# locally computed hash
+sha256 29c35426a416bf454413c6fec24c24a0b633e26144a17e98351b6dffaa4a833b  leptonica-1.74.4.tar.gz
diff --git a/bsp/buildroot/package/leptonica/leptonica.mk b/bsp/buildroot/package/leptonica/leptonica.mk
new file mode 100644
index 00000000..6a958a35
--- /dev/null
+++ b/bsp/buildroot/package/leptonica/leptonica.mk
@@ -0,0 +1,65 @@
+################################################################################
+#
+# leptonica
+#
+################################################################################
+
+LEPTONICA_VERSION = 1.74.4
+LEPTONICA_SITE = http://www.leptonica.org/source
+LEPTONICA_LICENSE = BSD-2-Clause
+LEPTONICA_LICENSE_FILES = leptonica-license.txt
+LEPTONICA_INSTALL_STAGING = YES
+LEPTONICA_DEPENDENCIES = host-pkgconf
+
+LEPTONICA_CONF_OPTS += --disable-programs
+
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+LEPTONICA_DEPENDENCIES += giflib
+LEPTONICA_CONF_OPTS +=  --with-giflib
+else
+LEPTONICA_CONF_OPTS +=  --without-giflib
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+LEPTONICA_DEPENDENCIES += jpeg
+LEPTONICA_CONF_OPTS += --with-jpeg
+else
+LEPTONICA_CONF_OPTS += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+LEPTONICA_DEPENDENCIES += libpng
+LEPTONICA_CONF_OPTS += --with-libpng
+else
+LEPTONICA_CONF_OPTS += --without-libpng
+endif
+
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+LEPTONICA_DEPENDENCIES += openjpeg
+LEPTONICA_CONF_OPTS += --with-libopenjpeg
+else
+LEPTONICA_CONF_OPTS += --without-libopenjpeg
+endif
+
+ifeq ($(BR2_PACKAGE_TIFF),y)
+LEPTONICA_DEPENDENCIES += tiff
+LEPTONICA_CONF_OPTS += --with-libtiff
+else
+LEPTONICA_CONF_OPTS += --without-libtiff
+endif
+
+ifeq ($(BR2_PACKAGE_WEBP),y)
+LEPTONICA_DEPENDENCIES += webp
+LEPTONICA_CONF_OPTS += --with-libwebp
+else
+LEPTONICA_CONF_OPTS += --without-libwebp
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LEPTONICA_DEPENDENCIES += zlib
+LEPTONICA_CONF_OPTS += --with-zlib
+else
+LEPTONICA_CONF_OPTS += --without-zlib
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/less/less.hash b/bsp/buildroot/package/less/less.hash
index eea201da..3a6c799a 100644
--- a/bsp/buildroot/package/less/less.hash
+++ b/bsp/buildroot/package/less/less.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5	less-481.tar.gz
+sha256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706  less-487.tar.gz
diff --git a/bsp/buildroot/package/less/less.mk b/bsp/buildroot/package/less/less.mk
index c2175438..bccc08b8 100644
--- a/bsp/buildroot/package/less/less.mk
+++ b/bsp/buildroot/package/less/less.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LESS_VERSION = 481
+LESS_VERSION = 487
 LESS_SITE = $(BR2_GNU_MIRROR)/less
-LESS_LICENSE = GPLv3+
+LESS_LICENSE = GPL-3.0+
 LESS_LICENSE_FILES = COPYING
 # Build after busybox, full-blown is better
 LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox)
diff --git a/bsp/buildroot/package/lesstif/Config.in b/bsp/buildroot/package/lesstif/Config.in
index a6a88ec4..654ee6f1 100644
--- a/bsp/buildroot/package/lesstif/Config.in
+++ b/bsp/buildroot/package/lesstif/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LESSTIF
 	bool "lesstif"
+	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_FREETYPE
-	depends on BR2_USE_MMU # fork()
 	help
 	  lesstif is the Hungry Programmers' version of OSF/Motif
 
diff --git a/bsp/buildroot/package/lesstif/lesstif.mk b/bsp/buildroot/package/lesstif/lesstif.mk
index 6ce2339b..378c594e 100644
--- a/bsp/buildroot/package/lesstif/lesstif.mk
+++ b/bsp/buildroot/package/lesstif/lesstif.mk
@@ -3,6 +3,7 @@
 # lesstif
 #
 ################################################################################
+
 LESSTIF_VERSION = 0.95.2
 LESSTIF_SOURCE = lesstif-$(LESSTIF_VERSION).tar.bz2
 LESSTIF_SITE = http://downloads.sourceforge.net/project/lesstif/lesstif/$(LESSTIF_VERSION)
@@ -11,26 +12,26 @@ LESSTIF_DEPENDENCIES = \
 	xlib_libXt \
 	xlib_libXext \
 	freetype
-LESSTIF_LICENSE = LGPLv2+
+LESSTIF_LICENSE = LGPL-2.0+
 LESSTIF_LICENSE_FILES = COPYING.LIB
 LESSTIF_CONF_OPTS = \
 	--with-gnu-ld \
 	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \
-	--enable-production=yes	\
+	--enable-production=yes \
 	--enable-build-tests=no \
 	--no-recursion
 
 # Reduces the buggy makefile to the smallest possible (and working) thing
 define LESSTIF_NOMAN2HTML
-	echo "all:" 	> $(@D)/doc/Makefile
-	echo "" 		>> $(@D)/doc/Makefile
+	echo "all:" > $(@D)/doc/Makefile
+	echo "" >> $(@D)/doc/Makefile
 	echo "install:" >> $(@D)/doc/Makefile
-	echo "" 		>> $(@D)/doc/Makefile
-	echo "clean:" 	>> $(@D)/doc/Makefile
+	echo "" >> $(@D)/doc/Makefile
+	echo "clean:" >> $(@D)/doc/Makefile
 endef
 
 # Prevents to copy ac_find_motif.m4 on target, it would else
-# be created at $(TARGET_DIR)/$(TOPDIR)/output/host/usr/share/aclocal/ac_find_motif.m4
+# be created at $(TARGET_DIR)/$(HOST_DIR)/share/aclocal/ac_find_motif.m4
 define LESSTIF_FIXACLOCAL
 	sed -i -e "/install-data-am: install-aclocalDATA/d" $(@D)/scripts/autoconf/Makefile
 endef
diff --git a/bsp/buildroot/package/let-me-create/0001-fix-build-with-musl-C-library.patch b/bsp/buildroot/package/let-me-create/0001-fix-build-with-musl-C-library.patch
new file mode 100644
index 00000000..90a72464
--- /dev/null
+++ b/bsp/buildroot/package/let-me-create/0001-fix-build-with-musl-C-library.patch
@@ -0,0 +1,38 @@
+From 93fbc53a727a49dd5061e44e3156ff2044e6e0b5 Mon Sep 17 00:00:00 2001
+From: Rahul Bedarkar <rahulbedarkar89@gmail.com>
+Date: Tue, 1 Aug 2017 22:44:22 +0530
+Subject: [PATCH] fix build with musl C library
+
+With musl C library, we get following build error:
+
+/home/buildroot/autobuild/run/instance-3/output/build/let-me-create-v1.5.2/src/core/spi.c: In function 'spi_transfer':
+/home/buildroot/autobuild/run/instance-3/output/build/let-me-create-v1.5.2/src/core/spi.c:170:19: error: '_IOC_SIZEBITS' undeclared (first use in this function)
+if (ioctl(fd, SPI_IOC_MESSAGE(1), &tr) < 0) {
+^
+/home/buildroot/autobuild/run/instance-3/output/build/let-me-create-v1.5.2/src/core/spi.c:170:19: note: each undeclared identifier is reported only once for each function it appears in
+
+Include <linux/ioctl.h> for musl C library compatibility.
+
+This build issue is detected by Buildroot autobuilder:
+http://autobuild.buildroot.net/results/af9/af946fa6fe05ee265e4ac97742b15afeb0cea1ab/
+
+Signed-off-by: Rahul Bedarkar rahulbedarkar89@gmail.com
+---
+Upstream status: https://github.com/CreatorDev/LetMeCreate/pull/29
+
+ src/core/spi.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/core/spi.c b/src/core/spi.c
+index 4d55cee..9ec7ea9 100644
+--- a/src/core/spi.c
++++ b/src/core/spi.c
+@@ -1,4 +1,5 @@
+ #include <sys/ioctl.h>
++#include <linux/ioctl.h>
+ #include <linux/spi/spidev.h>
+ #include <fcntl.h>
+ #include <errno.h>
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/let-me-create/Config.in b/bsp/buildroot/package/let-me-create/Config.in
new file mode 100644
index 00000000..b0fdc73d
--- /dev/null
+++ b/bsp/buildroot/package/let-me-create/Config.in
@@ -0,0 +1,27 @@
+comment "let-me-create needs a toolchain w/ C++, threads, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| BR2_STATIC_LIBS
+
+config BR2_PACKAGE_LET_ME_CREATE
+	bool "let-me-create"
+	# build issues in static libs configuration
+	# see https://github.com/CreatorDev/LetMeCreate/issues/28
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  This library is collection of small wrappers for some
+	  interfaces on the Creator Ci40 board. It aims at making
+	  easier to develop on this platform. It also provides
+	  wrappers for a few clicks.
+
+	  https://github.com/CreatorDev/LetMeCreate
+
+if BR2_PACKAGE_LET_ME_CREATE
+
+config BR2_PACKAGE_LET_ME_CREATE_EXAMPLES
+	bool "Build and install examples"
+	help
+	  Build and install examples
+
+endif
diff --git a/bsp/buildroot/package/let-me-create/let-me-create.hash b/bsp/buildroot/package/let-me-create/let-me-create.hash
new file mode 100644
index 00000000..45b5e55b
--- /dev/null
+++ b/bsp/buildroot/package/let-me-create/let-me-create.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 5f42858a2062f34d2578e9cb1aed3ccb8d2409d908aa4c41a924418666d5f2bd  let-me-create-v1.5.2.tar.gz
diff --git a/bsp/buildroot/package/let-me-create/let-me-create.mk b/bsp/buildroot/package/let-me-create/let-me-create.mk
new file mode 100644
index 00000000..2dd07ef4
--- /dev/null
+++ b/bsp/buildroot/package/let-me-create/let-me-create.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# LetMeCreate
+#
+################################################################################
+
+LET_ME_CREATE_VERSION = v1.5.2
+LET_ME_CREATE_SITE = $(call github,CreatorDev,LetMeCreate,$(LET_ME_CREATE_VERSION))
+LET_ME_CREATE_INSTALL_STAGING = YES
+LET_ME_CREATE_LICENSE = BSD-3-Clause
+LET_ME_CREATE_LICENSE_FILES = LICENSE
+
+# pure static build not supported
+ifeq ($(BR2_SHARED_LIBS),y)
+LET_ME_CREATE_CONF_OPTS += -DBUILD_STATIC=OFF -DBUILD_SHARED=ON
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+LET_ME_CREATE_CONF_OPTS += -DBUILD_STATIC=ON -DBUILD_SHARED=ON
+endif
+
+ifeq ($(BR2_PACKAGE_LET_ME_CREATE_EXAMPLES),y)
+LET_ME_CREATE_CONF_OPTS += -DBUILD_EXAMPLES=ON
+else
+LET_ME_CREATE_CONF_OPTS += -DBUILD_EXAMPLES=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/leveldb/0002-Add-install-recipe.patch b/bsp/buildroot/package/leveldb/0002-Add-install-recipe.patch
index f65916f1..29bf4a48 100644
--- a/bsp/buildroot/package/leveldb/0002-Add-install-recipe.patch
+++ b/bsp/buildroot/package/leveldb/0002-Add-install-recipe.patch
@@ -9,6 +9,8 @@ Signed-off-by: Steve James <ste@junkomatic.net>
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [baruch: update for v1.19]
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+[Bernd: update for v1.20]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 ---
  Makefile | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
@@ -19,8 +21,8 @@ index 07a5a1ead6fd..c87023db527a 100644
 +++ b/Makefile
 @@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc
  
- $(SHARED_OUTDIR)/%.o: %.c
- 	$(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@
+ $(SHARED_OUTDIR)/port/port_posix_sse.o: port/port_posix_sse.cc
+ 	$(CXX) $(CXXFLAGS) $(PLATFORM_SHARED_CFLAGS) $(PLATFORM_SSEFLAGS) -c $< -o $@
 +
 +INSTALL_ROOT = /
 +INSTALL_PREFIX= usr/local
diff --git a/bsp/buildroot/package/leveldb/Config.in b/bsp/buildroot/package/leveldb/Config.in
index b583c3b9..c44ef13c 100644
--- a/bsp/buildroot/package/leveldb/Config.in
+++ b/bsp/buildroot/package/leveldb/Config.in
@@ -6,8 +6,9 @@ config BR2_PACKAGE_LEVELDB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_SNAPPY
 	help
-	  LevelDB is a fast key-value storage library written at Google that
-	  provides an ordered mapping from string keys to string values.
+	  LevelDB is a fast key-value storage library written at Google
+	  that provides an ordered mapping from string keys to string
+	  values.
 
 	  https://github.com/google/leveldb
 
diff --git a/bsp/buildroot/package/leveldb/leveldb.hash b/bsp/buildroot/package/leveldb/leveldb.hash
index 4af30fbe..a5300d7c 100644
--- a/bsp/buildroot/package/leveldb/leveldb.hash
+++ b/bsp/buildroot/package/leveldb/leveldb.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 7d7a14ae825e66aabeb156c1c3fae9f9a76d640ef6b40ede74cc73da937e5202  leveldb-v1.19.tar.gz
+sha256 f5abe8b5b209c2f36560b75f32ce61412f39a2922f7045ae764a2c23335b6664  leveldb-v1.20.tar.gz
diff --git a/bsp/buildroot/package/leveldb/leveldb.mk b/bsp/buildroot/package/leveldb/leveldb.mk
index ca2ed703..54942a0f 100644
--- a/bsp/buildroot/package/leveldb/leveldb.mk
+++ b/bsp/buildroot/package/leveldb/leveldb.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LEVELDB_VERSION = v1.19
+LEVELDB_VERSION = v1.20
 LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION))
-LEVELDB_LICENSE = BSD-3c
+LEVELDB_LICENSE = BSD-3-Clause
 LEVELDB_LICENSE_FILES = LICENSE
 LEVELDB_INSTALL_STAGING = YES
 LEVELDB_DEPENDENCIES = snappy
diff --git a/bsp/buildroot/package/lft/lft.hash b/bsp/buildroot/package/lft/lft.hash
index b045e7c9..1b0454cf 100644
--- a/bsp/buildroot/package/lft/lft.hash
+++ b/bsp/buildroot/package/lft/lft.hash
@@ -1,2 +1,4 @@
-# Locally calculated, matches download from fossies.org and pwhois.org
-sha256	d182d6774e64dcdeb19ed1a598fa588e57ddb6cbb6847d9277c405d3a4597d89	lft-3.77.tar.gz
+# From http://pwhois.org/lft/
+md5 746dc08f2e20d0e0240f28873b3bb244  lft-3.79.tar.gz
+# Locally calculated
+sha256 08e5c7973551b529c850bffbc7152c4e5f0bcb1f07ebbb39151a7dc9a3bf9de0  lft-3.79.tar.gz
diff --git a/bsp/buildroot/package/lft/lft.mk b/bsp/buildroot/package/lft/lft.mk
index 72f43fa2..0555ab9a 100644
--- a/bsp/buildroot/package/lft/lft.mk
+++ b/bsp/buildroot/package/lft/lft.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LFT_VERSION = 3.77
+LFT_VERSION = 3.79
 LFT_SITE = http://pwhois.org/get
 LFT_DEPENDENCIES = libpcap
 LFT_LICENSE = VOSTROM Public License for Open Source
diff --git a/bsp/buildroot/package/lftp/Config.in b/bsp/buildroot/package/lftp/Config.in
index fb4ac136..ebe8882e 100644
--- a/bsp/buildroot/package/lftp/Config.in
+++ b/bsp/buildroot/package/lftp/Config.in
@@ -7,10 +7,11 @@ config BR2_PACKAGE_LFTP
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
 	help
-	  LFTP is a sophisticated ftp/http client, and a file transfer program
-	  supporting a number of network protocols. Like BASH, it has job
-	  control and uses the readline library for input. It has bookmarks,
-	  a built-in mirror command, and can transfer several files in parallel.
+	  LFTP is a sophisticated ftp/http client, and a file transfer
+	  program supporting a number of network protocols. Like BASH,
+	  it has job control and uses the readline library for input. It
+	  has bookmarks, a built-in mirror command, and can transfer
+	  several files in parallel.
 	  It was designed with reliability in mind.
 
 	  http://lftp.yar.ru/
diff --git a/bsp/buildroot/package/lftp/lftp.hash b/bsp/buildroot/package/lftp/lftp.hash
index 0e0f927a..99dd994f 100644
--- a/bsp/buildroot/package/lftp/lftp.hash
+++ b/bsp/buildroot/package/lftp/lftp.hash
@@ -1,2 +1,4 @@
+# From http://lftp.yar.ru/ftp/lftp-4.8.0.md5sum
+md5 468558412ad3575ef8e98547c41339f4  lftp-4.8.0.tar.xz
 # Locally calculated after checking gpg signature
-sha256 bf67c4d128b6f769a4082947376a9679c5ee3463a24ab761a0757f75d70bd92c  lftp-4.7.4.tar.xz
+sha256 7a2880968088b4aeec43b6b6680fef0e065e1dddcce9b409390157e9766b690f  lftp-4.8.0.tar.xz
diff --git a/bsp/buildroot/package/lftp/lftp.mk b/bsp/buildroot/package/lftp/lftp.mk
index a7e1f926..b174057f 100644
--- a/bsp/buildroot/package/lftp/lftp.mk
+++ b/bsp/buildroot/package/lftp/lftp.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LFTP_VERSION = 4.7.4
+LFTP_VERSION = 4.8.0
 LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz
 LFTP_SITE = http://lftp.yar.ru/ftp
-LFTP_LICENSE = GPLv3+
+LFTP_LICENSE = GPL-3.0+
 LFTP_LICENSE_FILES = COPYING
 # Needed so that our libtool patch applies properly, and for patch
 # 0001-fix-static-link-with-readline.patch.
@@ -41,6 +41,13 @@ else
 LFTP_CONF_OPTS += --without-openssl
 endif
 
+ifeq ($(BR2_PACKAGE_LIBIDN),y)
+LFTP_DEPENDENCIES += libidn
+LFTP_CONF_OPTS += --with-libidn=$(STAGING_DIR)/usr
+else
+LFTP_CONF_OPTS += --without-libidn
+endif
+
 # Remove /usr/share/lftp
 define LFTP_REMOVE_DATA
 	$(RM) -fr $(TARGET_DIR)/usr/share/lftp
diff --git a/bsp/buildroot/package/libaacs/libaacs.hash b/bsp/buildroot/package/libaacs/libaacs.hash
index 7160c6a9..84947e0c 100644
--- a/bsp/buildroot/package/libaacs/libaacs.hash
+++ b/bsp/buildroot/package/libaacs/libaacs.hash
@@ -1,2 +1,2 @@
-# From http://download.videolan.org/pub/videolan/libaacs/0.8.1/libaacs-0.8.1.tar.bz2.sha512
-sha512	dd677627f073460b719b9f836b026acc3e23b166c7b16bd205cf2ca97c376095980532fb15087c0d77b30c712cd5a5dd90b2cc2ae3128da717621ebd825afcc4	libaacs-0.8.1.tar.bz2
+# From http://download.videolan.org/pub/videolan/libaacs/0.9.0/libaacs-0.9.0.tar.bz2.sha512
+sha512 b9c658db22a0966486070d3b762509a7c0120469ab29d1e57c1b624cad309701de8b92455ec649db4d731be4a5c29c38fb4f99bb7617dbb4254270284a1903f6  libaacs-0.9.0.tar.bz2
diff --git a/bsp/buildroot/package/libaacs/libaacs.mk b/bsp/buildroot/package/libaacs/libaacs.mk
index df611543..143b0ff3 100644
--- a/bsp/buildroot/package/libaacs/libaacs.mk
+++ b/bsp/buildroot/package/libaacs/libaacs.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBAACS_VERSION = 0.8.1
+LIBAACS_VERSION = 0.9.0
 LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION)
 LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2
-LIBAACS_LICENSE = LGPLv2.1+
+LIBAACS_LICENSE = LGPL-2.1+
 LIBAACS_LICENSE_FILES = COPYING
 LIBAACS_INSTALL_STAGING = YES
 LIBAACS_DEPENDENCIES = host-bison host-flex libgcrypt
diff --git a/bsp/buildroot/package/libaio/Config.in b/bsp/buildroot/package/libaio/Config.in
index 3031c894..ea21a36f 100644
--- a/bsp/buildroot/package/libaio/Config.in
+++ b/bsp/buildroot/package/libaio/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
 	bool
 	default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \
 		BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \
-		BR2_sparc || BR2_x86_64
+		BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \
+		BR2_x86_64
 
 config BR2_PACKAGE_LIBAIO
 	bool "libaio"
diff --git a/bsp/buildroot/package/libaio/libaio.mk b/bsp/buildroot/package/libaio/libaio.mk
index 5ebe1b7e..03029d84 100644
--- a/bsp/buildroot/package/libaio/libaio.mk
+++ b/bsp/buildroot/package/libaio/libaio.mk
@@ -8,7 +8,7 @@ LIBAIO_VERSION = 0.3.110
 LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz
 LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio
 LIBAIO_INSTALL_STAGING = YES
-LIBAIO_LICENSE = LGPLv2.1+
+LIBAIO_LICENSE = LGPL-2.1+
 LIBAIO_LICENSE_FILES = COPYING
 
 LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS)
diff --git a/bsp/buildroot/package/libao/Config.in b/bsp/buildroot/package/libao/Config.in
index 3c99ab96..1fab6d9b 100644
--- a/bsp/buildroot/package/libao/Config.in
+++ b/bsp/buildroot/package/libao/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBAO
 	bool "libao"
 	help
 	  Libao is a cross-platform audio library that allows programs
-	  to output audio using a simple API on a wide variety of platforms.
+	  to output audio using a simple API on a wide variety of
+	  platforms.
 
 	  http://www.xiph.org/ao/
diff --git a/bsp/buildroot/package/libao/libao.mk b/bsp/buildroot/package/libao/libao.mk
index a314c08d..501ea0c9 100644
--- a/bsp/buildroot/package/libao/libao.mk
+++ b/bsp/buildroot/package/libao/libao.mk
@@ -8,7 +8,7 @@ LIBAO_VERSION = 1.2.0
 LIBAO_SITE = http://downloads.xiph.org/releases/ao
 LIBAO_DEPENDENCIES = host-pkgconf
 LIBAO_INSTALL_STAGING = YES
-LIBAO_LICENSE = GPLv2+
+LIBAO_LICENSE = GPL-2.0+
 LIBAO_LICENSE_FILES = COPYING
 LIBAO_CONF_OPTS = \
 	--disable-esd \
diff --git a/bsp/buildroot/package/libarchive/0002-iso9660-validate-directory-record-length.patch b/bsp/buildroot/package/libarchive/0002-iso9660-validate-directory-record-length.patch
new file mode 100644
index 00000000..8a0c34f2
--- /dev/null
+++ b/bsp/buildroot/package/libarchive/0002-iso9660-validate-directory-record-length.patch
@@ -0,0 +1,78 @@
+From f9569c086ff29259c73790db9cbf39fe8fb9d862 Mon Sep 17 00:00:00 2001
+From: John Starks <jostarks@microsoft.com>
+Date: Wed, 25 Jul 2018 12:16:34 -0700
+Subject: [PATCH] iso9660: validate directory record length
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit f9569c086ff
+
+ .../archive_read_support_format_iso9660.c       | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/libarchive/archive_read_support_format_iso9660.c b/libarchive/archive_read_support_format_iso9660.c
+index f01d37bf682e..089bb7236cd1 100644
+--- a/libarchive/archive_read_support_format_iso9660.c
++++ b/libarchive/archive_read_support_format_iso9660.c
+@@ -409,7 +409,8 @@ static int	next_entry_seek(struct archive_read *, struct iso9660 *,
+ 		    struct file_info **);
+ static struct file_info *
+ 		parse_file_info(struct archive_read *a,
+-		    struct file_info *parent, const unsigned char *isodirrec);
++		    struct file_info *parent, const unsigned char *isodirrec,
++		    size_t reclen);
+ static int	parse_rockridge(struct archive_read *a,
+ 		    struct file_info *file, const unsigned char *start,
+ 		    const unsigned char *end);
+@@ -1022,7 +1023,7 @@ read_children(struct archive_read *a, struct file_info *parent)
+ 			if (*(p + DR_name_len_offset) == 1
+ 			    && *(p + DR_name_offset) == '\001')
+ 				continue;
+-			child = parse_file_info(a, parent, p);
++			child = parse_file_info(a, parent, p, b - p);
+ 			if (child == NULL) {
+ 				__archive_read_consume(a, skip_size);
+ 				return (ARCHIVE_FATAL);
+@@ -1112,7 +1113,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
+ 	 */
+ 	seenJoliet = iso9660->seenJoliet;/* Save flag. */
+ 	iso9660->seenJoliet = 0;
+-	file = parse_file_info(a, NULL, block);
++	file = parse_file_info(a, NULL, block, vd->size);
+ 	if (file == NULL)
+ 		return (ARCHIVE_FATAL);
+ 	iso9660->seenJoliet = seenJoliet;
+@@ -1144,7 +1145,7 @@ choose_volume(struct archive_read *a, struct iso9660 *iso9660)
+ 			return (ARCHIVE_FATAL);
+ 		}
+ 		iso9660->seenJoliet = 0;
+-		file = parse_file_info(a, NULL, block);
++		file = parse_file_info(a, NULL, block, vd->size);
+ 		if (file == NULL)
+ 			return (ARCHIVE_FATAL);
+ 		iso9660->seenJoliet = seenJoliet;
+@@ -1749,7 +1750,7 @@ archive_read_format_iso9660_cleanup(struct archive_read *a)
+  */
+ static struct file_info *
+ parse_file_info(struct archive_read *a, struct file_info *parent,
+-    const unsigned char *isodirrec)
++    const unsigned char *isodirrec, size_t reclen)
+ {
+ 	struct iso9660 *iso9660;
+ 	struct file_info *file, *filep;
+@@ -1763,7 +1764,11 @@ parse_file_info(struct archive_read *a, struct file_info *parent,
+ 
+ 	iso9660 = (struct iso9660 *)(a->format->data);
+ 
+-	dr_len = (size_t)isodirrec[DR_length_offset];
++	if (reclen == 0 || reclen < (dr_len = (size_t)isodirrec[DR_length_offset])) {
++		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
++			"Invalid directory record length");
++		return (NULL);
++	}
+ 	name_len = (size_t)isodirrec[DR_name_len_offset];
+ 	location = archive_le32dec(isodirrec + DR_extent_offset);
+ 	fsize = toi(isodirrec + DR_size_offset, DR_size_size);
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch b/bsp/buildroot/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch
new file mode 100644
index 00000000..13a80d1f
--- /dev/null
+++ b/bsp/buildroot/package/libarchive/0003-Avoid-a-read-off-by-one-error-for-UTF16-names-in-RAR.patch
@@ -0,0 +1,34 @@
+From 5562545b5562f6d12a4ef991fae158bf4ccf92b6 Mon Sep 17 00:00:00 2001
+From: Joerg Sonnenberger <joerg@bec.de>
+Date: Sat, 9 Sep 2017 17:47:32 +0200
+Subject: [PATCH] Avoid a read off-by-one error for UTF16 names in RAR
+ archives.
+
+Reported-By: OSS-Fuzz issue 573
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 5562545b5562
+
+ libarchive/archive_read_support_format_rar.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
+index cbb14c32dc3b..751de6979ba5 100644
+--- a/libarchive/archive_read_support_format_rar.c
++++ b/libarchive/archive_read_support_format_rar.c
+@@ -1496,7 +1496,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
+         return (ARCHIVE_FATAL);
+       }
+       filename[filename_size++] = '\0';
+-      filename[filename_size++] = '\0';
++      /*
++       * Do not increment filename_size here as the computations below
++       * add the space for the terminating NUL explicitly.
++       */
++      filename[filename_size] = '\0';
+ 
+       /* Decoded unicode form is UTF-16BE, so we have to update a string
+        * conversion object for it. */
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch b/bsp/buildroot/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch
new file mode 100644
index 00000000..628e74ae
--- /dev/null
+++ b/bsp/buildroot/package/libarchive/0004-Reject-LHA-archive-entries-with-negative-size.patch
@@ -0,0 +1,32 @@
+From 2c8c83b9731ff822fad6cc8c670ea5519c366a14 Mon Sep 17 00:00:00 2001
+From: Joerg Sonnenberger <joerg@bec.de>
+Date: Thu, 19 Jul 2018 21:14:53 +0200
+Subject: [PATCH] Reject LHA archive entries with negative size.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 2c8c83b9731
+
+ libarchive/archive_read_support_format_lha.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c
+index b8ef4ae10ece..95c99bb1f31e 100644
+--- a/libarchive/archive_read_support_format_lha.c
++++ b/libarchive/archive_read_support_format_lha.c
+@@ -701,6 +701,12 @@ archive_read_format_lha_read_header(struct archive_read *a,
+ 	 * Prepare variables used to read a file content.
+ 	 */
+ 	lha->entry_bytes_remaining = lha->compsize;
++	if (lha->entry_bytes_remaining < 0) {
++		archive_set_error(&a->archive,
++		    ARCHIVE_ERRNO_FILE_FORMAT,
++		    "Invalid LHa entry size");
++		return (ARCHIVE_FATAL);
++	}
+ 	lha->entry_offset = 0;
+ 	lha->entry_crc_calculated = 0;
+ 
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/libarchive/libarchive.hash b/bsp/buildroot/package/libarchive/libarchive.hash
index 98a34ad3..60ea0d16 100644
--- a/bsp/buildroot/package/libarchive/libarchive.hash
+++ b/bsp/buildroot/package/libarchive/libarchive.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  ed2dbd6954792b2c054ccf8ec4b330a54b85904a80cef477a1c74643ddafa0ce  libarchive-3.3.2.tar.gz
+sha256  ae6f35cc1979beb316e4d6431fc34c6fc59f0dd126b425c8552bb41c86e4825d  COPYING
diff --git a/bsp/buildroot/package/libarchive/libarchive.mk b/bsp/buildroot/package/libarchive/libarchive.mk
index 3ebdc7e3..1c8391bd 100644
--- a/bsp/buildroot/package/libarchive/libarchive.mk
+++ b/bsp/buildroot/package/libarchive/libarchive.mk
@@ -7,7 +7,7 @@
 LIBARCHIVE_VERSION = 3.3.2
 LIBARCHIVE_SITE = http://www.libarchive.org/downloads
 LIBARCHIVE_INSTALL_STAGING = YES
-LIBARCHIVE_LICENSE = BSD-2c, BSD-3c
+LIBARCHIVE_LICENSE = BSD-2-Clause, BSD-3-Clause
 LIBARCHIVE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y)
diff --git a/bsp/buildroot/package/libargtable2/libargtable2.mk b/bsp/buildroot/package/libargtable2/libargtable2.mk
index 6b42cc08..8215f552 100644
--- a/bsp/buildroot/package/libargtable2/libargtable2.mk
+++ b/bsp/buildroot/package/libargtable2/libargtable2.mk
@@ -13,7 +13,7 @@ LIBARGTABLE2_CONF_OPTS = \
 	--disable-kernel-module \
 	--enable-lib \
 	--enable-util
-LIBARGTABLE2_LICENSE = LGPLv2+
+LIBARGTABLE2_LICENSE = LGPL-2.0+
 LIBARGTABLE2_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libart/libart.mk b/bsp/buildroot/package/libart/libart.mk
index 85ee37c1..b3c6176a 100644
--- a/bsp/buildroot/package/libart/libart.mk
+++ b/bsp/buildroot/package/libart/libart.mk
@@ -11,7 +11,7 @@ LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/$(LIBART_VERSIO
 LIBART_AUTORECONF = YES
 LIBART_INSTALL_STAGING = YES
 LIBART_CONFIG_SCRIPTS = libart2-config
-LIBART_LICENSE = LGPLv2+
+LIBART_LICENSE = LGPL-2.0+
 LIBART_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libasplib/libasplib.mk b/bsp/buildroot/package/libasplib/libasplib.mk
index 558d1734..e13945c6 100644
--- a/bsp/buildroot/package/libasplib/libasplib.mk
+++ b/bsp/buildroot/package/libasplib/libasplib.mk
@@ -6,7 +6,7 @@
 
 LIBASPLIB_VERSION = be7fac89218a84b75f7598e3d76625ece99296f2
 LIBASPLIB_SITE = $(call github,AchimTuran,asplib,$(LIBASPLIB_VERSION))
-LIBASPLIB_LICENSE = GPLv3+
+LIBASPLIB_LICENSE = GPL-3.0+
 LIBASPLIB_LICENSE_FILES = LICENSE
 LIBASPLIB_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libass/libass.hash b/bsp/buildroot/package/libass/libass.hash
index d1e9022c..d98b163f 100644
--- a/bsp/buildroot/package/libass/libass.hash
+++ b/bsp/buildroot/package/libass/libass.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 d84a2fc89011b99d87fc47af91906622707c165d1860e9f774825ebbbc9c9fb6  libass-0.13.4.tar.xz
+sha256 7065e5f5fb76e46f2042a62e7c68d81e5482dbeeda24644db1bd066e44da7e9d  libass-0.13.7.tar.xz
diff --git a/bsp/buildroot/package/libass/libass.mk b/bsp/buildroot/package/libass/libass.mk
index 9fe967fd..41f027d4 100644
--- a/bsp/buildroot/package/libass/libass.mk
+++ b/bsp/buildroot/package/libass/libass.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBASS_VERSION = 0.13.4
+LIBASS_VERSION = 0.13.7
 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz
 # Do not use the github helper here, the generated tarball is *NOT*
 # the same as the one uploaded by upstream for the release.
diff --git a/bsp/buildroot/package/libassuan/libassuan.hash b/bsp/buildroot/package/libassuan/libassuan.hash
index 01ade11f..2e80cfa4 100644
--- a/bsp/buildroot/package/libassuan/libassuan.hash
+++ b/bsp/buildroot/package/libassuan/libassuan.hash
@@ -1,2 +1,7 @@
 # From https://www.gnupg.org/download/integrity_check.html
-sha1 27391cf4a820b5350ea789c30661830c9a271518  libassuan-2.4.3.tar.bz2
+sha1 c8432695bf1daa914a92f51e911881ed93d50604  libassuan-2.5.1.tar.bz2
+# Locally calculated after checking signature
+# https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.5.1.tar.bz2.sig
+sha256 47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449  libassuan-2.5.1.tar.bz2
+sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LIB
+sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7  COPYING
diff --git a/bsp/buildroot/package/libassuan/libassuan.mk b/bsp/buildroot/package/libassuan/libassuan.mk
index c4d2e4f4..e807086b 100644
--- a/bsp/buildroot/package/libassuan/libassuan.mk
+++ b/bsp/buildroot/package/libassuan/libassuan.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBASSUAN_VERSION = 2.4.3
+LIBASSUAN_VERSION = 2.5.1
 LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan
 LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2
-LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPLv3 (tests, doc)
+LIBASSUAN_LICENSE = LGPL-2.1+ (library), GPL-3.0 (tests, doc)
 LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING
 LIBASSUAN_INSTALL_STAGING = YES
 LIBASSUAN_DEPENDENCIES = libgpg-error
diff --git a/bsp/buildroot/package/libatasmart/libatasmart.mk b/bsp/buildroot/package/libatasmart/libatasmart.mk
index 9e5de97d..1d4eeaae 100644
--- a/bsp/buildroot/package/libatasmart/libatasmart.mk
+++ b/bsp/buildroot/package/libatasmart/libatasmart.mk
@@ -7,7 +7,7 @@
 LIBATASMART_VERSION = 0.19
 LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz
 LIBATASMART_SITE = http://0pointer.de/public
-LIBATASMART_LICENSE = LGPLv2.1
+LIBATASMART_LICENSE = LGPL-2.1
 LIBATASMART_LICENSE_FILES = LGPL
 LIBATASMART_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libatomic_ops/libatomic_ops.hash b/bsp/buildroot/package/libatomic_ops/libatomic_ops.hash
index 47a281dd..90af18dc 100644
--- a/bsp/buildroot/package/libatomic_ops/libatomic_ops.hash
+++ b/bsp/buildroot/package/libatomic_ops/libatomic_ops.hash
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256 ef8335676f18a111f885d48810ab090fb6bfad94e5a5dd76cdccd2a536828662  libatomic_ops-libatomic_ops-7_4_4.tar.gz
+sha256 7ee6a1772a49d02711b97c600bd214bd86ba8a31bd7c6d6e850b502780de367c  libatomic_ops-v7.4.10.tar.gz
+sha256 f0e630c0ca489767033da5a0c869fb4231db522c5ff479ce55a853a923a00f69  doc/LICENSING.txt
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/bsp/buildroot/package/libatomic_ops/libatomic_ops.mk b/bsp/buildroot/package/libatomic_ops/libatomic_ops.mk
index b5e21723..dff62c51 100644
--- a/bsp/buildroot/package/libatomic_ops/libatomic_ops.mk
+++ b/bsp/buildroot/package/libatomic_ops/libatomic_ops.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBATOMIC_OPS_VERSION = libatomic_ops-7_4_4
+LIBATOMIC_OPS_VERSION = v7.4.10
 LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION))
 LIBATOMIC_OPS_AUTORECONF = YES
 
@@ -14,7 +14,7 @@ LIBATOMIC_OPS_AUTORECONF = YES
 # covered by an MIT-style license. A few library routines are covered
 # by the GNU General Public License. These are put into a separate
 # library, libatomic_ops_gpl.a."
-LIBATOMIC_OPS_LICENSE = MIT (main library) / GPLv2+ (gpl extension)
+LIBATOMIC_OPS_LICENSE = MIT (main library) / GPL-2.0+ (gpl extension)
 LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt COPYING
 
 LIBATOMIC_OPS_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libb64/Config.in b/bsp/buildroot/package/libb64/Config.in
new file mode 100644
index 00000000..405d0b8c
--- /dev/null
+++ b/bsp/buildroot/package/libb64/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LIBB64
+	bool "libb64"
+	help
+	  libb64 is a library of ANSI C routines for fast encoding
+	  and decoding of data into and from a base64-encoded format.
+	  C++ wrappers are included, as well as the source code for
+	  standalone encoding and decoding executables.
+
+	  Base64 uses a subset of displayable ASCII characters, and is
+	  therefore a useful encoding for storing binary data in a text
+	  file, such as XML, or sending binary data over text-only
+	  email.
+
+	  http://libb64.sourceforge.net
diff --git a/bsp/buildroot/package/libb64/libb64.hash b/bsp/buildroot/package/libb64/libb64.hash
new file mode 100644
index 00000000..012a7b0b
--- /dev/null
+++ b/bsp/buildroot/package/libb64/libb64.hash
@@ -0,0 +1,3 @@
+# sha1 from sourceforge, sha256 locally computed
+sha1  04b3e21b8c951d27f02fe91249ca3474554af0b9  libb64-1.2.1.zip
+sha256  20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2  libb64-1.2.1.zip
diff --git a/bsp/buildroot/package/libb64/libb64.mk b/bsp/buildroot/package/libb64/libb64.mk
new file mode 100644
index 00000000..4dea9593
--- /dev/null
+++ b/bsp/buildroot/package/libb64/libb64.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# libb64
+#
+################################################################################
+
+LIBB64_VERSION = 1.2.1
+LIBB64_SOURCE = libb64-$(LIBB64_VERSION).zip
+LIBB64_SITE = https://downloads.sourceforge.net/project/libb64/libb64/libb64
+LIBB64_LICENSE = Public Domain
+LIBB64_LICENSE_FILES = LICENSE
+LIBB64_INSTALL_STAGING = YES
+# Only static lib and headers
+LIBB64_INSTALL_TARGET = NO
+
+define LIBB64_EXTRACT_CMDS
+	unzip $(DL_DIR)/$(LIBB64_SOURCE) -d $(BUILD_DIR)
+endef
+
+define LIBB64_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS)" -C $(@D) all_src
+endef
+
+define LIBB64_INSTALL_STAGING_CMDS
+	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/b64
+	$(INSTALL) -m 0644 $(@D)/include/b64/* $(STAGING_DIR)/usr/include/b64
+	$(INSTALL) -D -m 0755 $(@D)/src/libb64.a $(STAGING_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/libbdplus/libbdplus.mk b/bsp/buildroot/package/libbdplus/libbdplus.mk
index 45913edd..b0e8b148 100644
--- a/bsp/buildroot/package/libbdplus/libbdplus.mk
+++ b/bsp/buildroot/package/libbdplus/libbdplus.mk
@@ -7,7 +7,7 @@
 LIBBDPLUS_VERSION = 0.1.2
 LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION)
 LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2
-LIBBDPLUS_LICENSE = LGPLv2.1+
+LIBBDPLUS_LICENSE = LGPL-2.1+
 LIBBDPLUS_LICENSE_FILES = COPYING
 LIBBDPLUS_INSTALL_STAGING = YES
 LIBBDPLUS_DEPENDENCIES = libgcrypt
diff --git a/bsp/buildroot/package/libbluray/libbluray.hash b/bsp/buildroot/package/libbluray/libbluray.hash
index ea0df505..9a35c5da 100644
--- a/bsp/buildroot/package/libbluray/libbluray.hash
+++ b/bsp/buildroot/package/libbluray/libbluray.hash
@@ -1,2 +1,3 @@
-# From http://get.videolan.org/libbluray/0.9.3/libbluray-0.9.3.tar.bz2.sha512
-sha512	1e308b85c51d43b23b186fdd2631f963d4c25de8aff29f335e131b32a175434ee21460a7aa470c508ad13662cf9052649bb4eb974dbd709eb9e6797fb84e0823	libbluray-0.9.3.tar.bz2
+# From http://get.videolan.org/libbluray/1.0.2/libbluray-1.0.2.tar.bz2.sha512
+sha512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b  libbluray-1.0.2.tar.bz2
+sha256 b3aa400aca6d2ba1f0bd03bd98d03d1fe7489a3bbb26969d72016360af8a5c9d  COPYING
diff --git a/bsp/buildroot/package/libbluray/libbluray.mk b/bsp/buildroot/package/libbluray/libbluray.mk
index dfe58f4e..3d7ce351 100644
--- a/bsp/buildroot/package/libbluray/libbluray.mk
+++ b/bsp/buildroot/package/libbluray/libbluray.mk
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-LIBBLURAY_VERSION = 0.9.3
+LIBBLURAY_VERSION = 1.0.2
 LIBBLURAY_SITE = http://get.videolan.org/libbluray/$(LIBBLURAY_VERSION)
 LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2
 LIBBLURAY_INSTALL_STAGING = YES
-LIBBLURAY_LICENSE = LGPLv2.1+
+LIBBLURAY_LICENSE = LGPL-2.1+
 LIBBLURAY_LICENSE_FILES = COPYING
 LIBBLURAY_DEPENDENCIES = host-pkgconf
 
-LIBBLURAY_CONF_OPTS = --enable-udf --disable-bdjava
+LIBBLURAY_CONF_OPTS = --disable-bdjava-jar
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 LIBBLURAY_DEPENDENCIES += libiconv
diff --git a/bsp/buildroot/package/libbroadvoice/libbroadvoice.hash b/bsp/buildroot/package/libbroadvoice/libbroadvoice.hash
new file mode 100644
index 00000000..e339aa44
--- /dev/null
+++ b/bsp/buildroot/package/libbroadvoice/libbroadvoice.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 b68c91d5af6e493c3d4fc3be04825e109a7593fe4de8c18ec75546004eeb4749  libbroadvoice-f65b0f50c8c767229fbf1758370880abc0d78564.tar.gz
diff --git a/bsp/buildroot/package/libbroadvoice/libbroadvoice.mk b/bsp/buildroot/package/libbroadvoice/libbroadvoice.mk
index c18d3d29..9c6b4e29 100644
--- a/bsp/buildroot/package/libbroadvoice/libbroadvoice.mk
+++ b/bsp/buildroot/package/libbroadvoice/libbroadvoice.mk
@@ -11,7 +11,7 @@ LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564
 # usable interface, on a range of platforms."
 LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git
 LIBBROADVOICE_SITE_METHOD = git
-LIBBROADVOICE_LICENSE = LGPLv2.1
+LIBBROADVOICE_LICENSE = LGPL-2.1
 LIBBROADVOICE_LICENSE_FILES = COPYING
 LIBBROADVOICE_AUTORECONF = YES
 LIBBROADVOICE_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libbsd/Config.in b/bsp/buildroot/package/libbsd/Config.in
index 9b5b8981..11e4c4d9 100644
--- a/bsp/buildroot/package/libbsd/Config.in
+++ b/bsp/buildroot/package/libbsd/Config.in
@@ -1,7 +1,9 @@
 config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
 	bool
-	# libbsd does not support the MicroBlaze ELF machine type (see local-elf.h)
-	default y if !BR2_microblaze
+	default y
+	# libbsd does not support those architectures (see src/local-elf.h)
+	depends on !BR2_microblaze
+	depends on !BR2_arc
 
 config BR2_PACKAGE_LIBBSD
 	bool "libbsd"
diff --git a/bsp/buildroot/package/libbsd/libbsd.hash b/bsp/buildroot/package/libbsd/libbsd.hash
index bc6c7cfb..133df90c 100644
--- a/bsp/buildroot/package/libbsd/libbsd.hash
+++ b/bsp/buildroot/package/libbsd/libbsd.hash
@@ -1,2 +1,3 @@
-# Locally calculated after checking pgp signature
-sha256	934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8	libbsd-0.8.3.tar.xz
+# From https://lists.freedesktop.org/archives/libbsd/2018-January/000166.html
+sha256	f548f10e5af5a08b1e22889ce84315b1ebe41505b015c9596bad03fd13a12b31	libbsd-0.8.7.tar.xz
+sha256	0b6cedd686394f9c811a6a9fd314d68ab4738475ad3d9df61154259fa649a2a7	COPYING
diff --git a/bsp/buildroot/package/libbsd/libbsd.mk b/bsp/buildroot/package/libbsd/libbsd.mk
index a932f2b4..e211389e 100644
--- a/bsp/buildroot/package/libbsd/libbsd.mk
+++ b/bsp/buildroot/package/libbsd/libbsd.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBBSD_VERSION = 0.8.3
+LIBBSD_VERSION = 0.8.7
 LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz
-LIBBSD_SITE = http://libbsd.freedesktop.org/releases
-LIBBSD_LICENSE = BSD-3c, MIT
+LIBBSD_SITE = https://archive.hadrons.org/software/libbsd
+LIBBSD_LICENSE = BSD-3-Clause, MIT
 LIBBSD_LICENSE_FILES = COPYING
 LIBBSD_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libbson/Config.in b/bsp/buildroot/package/libbson/Config.in
new file mode 100644
index 00000000..4305ca90
--- /dev/null
+++ b/bsp/buildroot/package/libbson/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LIBBSON
+	bool "libbson"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  libbson is a library providing useful routines related to
+	  building, parsing, and iterating BSON documents.
+
+comment "libbson needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libbson/libbson.hash b/bsp/buildroot/package/libbson/libbson.hash
new file mode 100644
index 00000000..27abe90b
--- /dev/null
+++ b/bsp/buildroot/package/libbson/libbson.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	aad410123e4bd8a9804c3c3d79e03344e2df104872594dc2cf19605d492944ba libbson-1.6.2.tar.gz
diff --git a/bsp/buildroot/package/libbson/libbson.mk b/bsp/buildroot/package/libbson/libbson.mk
new file mode 100644
index 00000000..8a71fc39
--- /dev/null
+++ b/bsp/buildroot/package/libbson/libbson.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# libbson
+#
+################################################################################
+
+LIBBSON_VERSION = 1.6.2
+LIBBSON_SITE = https://github.com/mongodb/libbson/releases/download/$(LIBBSON_VERSION)
+LIBBSON_LICENSE = Apache-2.0, MIT (jsonl), ISC (b64), Zlib (md5)
+LIBBSON_LICENSE_FILES = COPYING THIRD_PARTY_NOTICES
+LIBBSON_CONF_OPTS = \
+	--disable-tests \
+	--disable-examples \
+	--disable-man-pages \
+	--disable-html-docs
+
+LIBBSON_INSTALL_STAGING = YES
+
+# Also has CMake support, but that forces shared+static libs and static
+# lib has a different name.
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libcap-ng/Config.in b/bsp/buildroot/package/libcap-ng/Config.in
index d1663cde..46f0b69c 100644
--- a/bsp/buildroot/package/libcap-ng/Config.in
+++ b/bsp/buildroot/package/libcap-ng/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBCAP_NG
 	  The libcap-ng library is intended to make programming with
 	  posix capabilities much easier than the traditional libcap
 	  library. It includes utilities that can analyse all currently
-	  running applications and print out any capabilities and whether
-	  or not it has an open ended bounding set.
+	  running applications and print out any capabilities and
+	  whether or not it has an open ended bounding set.
 
 	  http://people.redhat.com/sgrubb/libcap-ng/
diff --git a/bsp/buildroot/package/libcap-ng/libcap-ng.mk b/bsp/buildroot/package/libcap-ng/libcap-ng.mk
index 19cc27d5..568f167b 100644
--- a/bsp/buildroot/package/libcap-ng/libcap-ng.mk
+++ b/bsp/buildroot/package/libcap-ng/libcap-ng.mk
@@ -6,7 +6,7 @@
 
 LIBCAP_NG_VERSION = 0.7.8
 LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng
-LIBCAP_NG_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
 LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
 LIBCAP_NG_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libcap/libcap.hash b/bsp/buildroot/package/libcap/libcap.hash
index a1dcd62b..2d3aee59 100644
--- a/bsp/buildroot/package/libcap/libcap.hash
+++ b/bsp/buildroot/package/libcap/libcap.hash
@@ -1,2 +1,5 @@
 # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
 sha256	693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162  libcap-2.25.tar.xz
+
+# Hash for license file:
+sha256	088cabde4662b4121258d298b0b2967bc1abffa134457ed9bc4a359685ab92bc  License
diff --git a/bsp/buildroot/package/libcap/libcap.mk b/bsp/buildroot/package/libcap/libcap.mk
index bcb5d8ce..a947fa06 100644
--- a/bsp/buildroot/package/libcap/libcap.mk
+++ b/bsp/buildroot/package/libcap/libcap.mk
@@ -7,7 +7,7 @@
 LIBCAP_VERSION = 2.25
 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
-LIBCAP_LICENSE = GPLv2 or BSD-3c
+LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause
 LIBCAP_LICENSE_FILES = License
 
 LIBCAP_DEPENDENCIES = host-libcap host-gperf
@@ -18,6 +18,9 @@ HOST_LIBCAP_DEPENDENCIES = host-gperf
 ifeq ($(BR2_STATIC_LIBS),y)
 LIBCAP_MAKE_TARGET = libcap.a libcap.pc
 LIBCAP_MAKE_INSTALL_TARGET = install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+LIBCAP_MAKE_TARGET = all
+LIBCAP_MAKE_INSTALL_TARGET = install-shared
 else
 LIBCAP_MAKE_TARGET = all
 LIBCAP_MAKE_INSTALL_TARGET = install
@@ -63,8 +66,8 @@ define HOST_LIBCAP_BUILD_CMDS
 endef
 
 define HOST_LIBCAP_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \
-		RAISE_SETFCAP=no prefix=/usr lib=lib install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) prefix=$(HOST_DIR) \
+		RAISE_SETFCAP=no lib=lib install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/libcdaudio/libcdaudio.mk b/bsp/buildroot/package/libcdaudio/libcdaudio.mk
index bee1fe3d..5d421eba 100644
--- a/bsp/buildroot/package/libcdaudio/libcdaudio.mk
+++ b/bsp/buildroot/package/libcdaudio/libcdaudio.mk
@@ -8,7 +8,7 @@ LIBCDAUDIO_VERSION = 0.99.12p2
 LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION)
 LIBCDAUDIO_INSTALL_STAGING = YES
 LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config
-LIBCDAUDIO_LICENSE = GPLv2+
+LIBCDAUDIO_LICENSE = GPL-2.0+
 LIBCDAUDIO_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libcddb/libcddb.mk b/bsp/buildroot/package/libcddb/libcddb.mk
index 96b265a4..952a8799 100644
--- a/bsp/buildroot/package/libcddb/libcddb.mk
+++ b/bsp/buildroot/package/libcddb/libcddb.mk
@@ -7,7 +7,7 @@
 LIBCDDB_VERSION = 1.3.2
 LIBCDDB_SOURCE = libcddb-$(LIBCDDB_VERSION).tar.bz2
 LIBCDDB_SITE = http://downloads.sourceforge.net/libcddb
-LIBCDDB_LICENSE = LGPLv2+
+LIBCDDB_LICENSE = LGPL-2.0+
 LIBCDDB_LICENSE_FILES = COPYING
 LIBCDDB_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libcdio/libcdio.mk b/bsp/buildroot/package/libcdio/libcdio.mk
index 4a7c6745..f0fc3352 100644
--- a/bsp/buildroot/package/libcdio/libcdio.mk
+++ b/bsp/buildroot/package/libcdio/libcdio.mk
@@ -7,7 +7,7 @@
 LIBCDIO_VERSION = 0.94
 LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio
 LIBCDIO_INSTALL_STAGING = YES
-LIBCDIO_LICENSE = GPLv3+
+LIBCDIO_LICENSE = GPL-3.0+
 LIBCDIO_LICENSE_FILES = COPYING
 LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb
 
diff --git a/bsp/buildroot/package/libcec/libcec.hash b/bsp/buildroot/package/libcec/libcec.hash
index 377f343a..5416c20f 100644
--- a/bsp/buildroot/package/libcec/libcec.hash
+++ b/bsp/buildroot/package/libcec/libcec.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  0f29d5a2d155b507807ba896bc3b3e50a0ab56bf8f543a2bf5c2798c790292b5  libcec-2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd.tar.gz
+sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27  libcec-4.0.2.tar.gz
diff --git a/bsp/buildroot/package/libcec/libcec.mk b/bsp/buildroot/package/libcec/libcec.mk
index c9a05a5f..99d1c8b2 100644
--- a/bsp/buildroot/package/libcec/libcec.mk
+++ b/bsp/buildroot/package/libcec/libcec.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBCEC_VERSION = 2c675dac48387c48c7f43c5d2547ef0c4ef5c7dd
-LIBCEC_SITE = $(call github,Pulse-Eight,libcec,$(LIBCEC_VERSION))
-LIBCEC_LICENSE = GPLv2+
+LIBCEC_VERSION = 4.0.2
+LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION))
+LIBCEC_LICENSE = GPL-2.0+
 LIBCEC_LICENSE_FILES = COPYING
 
 LIBCEC_INSTALL_STAGING = YES
@@ -37,4 +37,11 @@ ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
 LIBCEC_DEPENDENCIES += xlib_libXrandr
 endif
 
+# Disable information about how libCEC is compiled.
+LIBCEC_CONF_OPTS += -DHAVE_GIT_BIN="" \
+	-DHAVE_DATE_BIN="" \
+	-DHAVE_WHOAMI_BIN="" \
+	-DHAVE_HOSTNAME_BIN="" \
+	-DHAVE_UNAME_BIN=""
+
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch b/bsp/buildroot/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch
new file mode 100644
index 00000000..682bfe5d
--- /dev/null
+++ b/bsp/buildroot/package/libcgi/0001-CMakeLists.txt-libcgi-is-in-C.patch
@@ -0,0 +1,32 @@
+From 043f7a470e32c036f0fe933ec5cd2003087d6b2e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 2 Sep 2017 23:50:42 +0200
+Subject: [PATCH] CMakeLists.txt: libcgi is in C
+
+By default, CMake checks that both C and C++ compilers are
+available. However, since libcgi is only C, there's no need for a C++
+compiler check. Therefore, this commit adjusts the project() variable
+definition to only require C language support.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/38
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f98a99d..c599ca9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ #
+ cmake_minimum_required(VERSION 2.8.8)
+ 
+-project(cgi)
++project(cgi C)
+ string(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
+ string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LC)
+ set(LIBPREFIX ${PROJECT_NAME})
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/libcgi/0001-misc-fixes.patch b/bsp/buildroot/package/libcgi/0001-misc-fixes.patch
deleted file mode 100644
index b5761785..00000000
--- a/bsp/buildroot/package/libcgi/0001-misc-fixes.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Index: b/src/cgi.c
-===================================================================
---- a/src/cgi.c
-+++ b/src/cgi.c
-@@ -336,7 +336,7 @@
- 	hextable['b'] = 11;
- 	hextable['c'] = 12;
- 	hextable['d'] = 13;
--	hextable['e'] = 13;
-+	hextable['e'] = 14;
- 	hextable['f'] = 15;
- 	hextable['A'] = 10;
- 	hextable['B'] = 11;
-Index: b/src/string.c
-===================================================================
---- a/src/string.c
-+++ b/src/string.c
-@@ -584,7 +584,7 @@
- 
- 	va_start(ptr, s);
- 
--	va_copy(bkp, str);
-+	va_copy(bkp, ptr);
- 	len = strlen(s);
- 
- 	while (*str) {
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -5,22 +5,32 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- 
--SHAREDOPT = -shared
-+SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.0
- LIBDIR = $(prefix)/lib
--INCDIR = $(prefix)/include
-+INCDIR = $(prefix)/include/libcgi/
- MANDIR	= $(prefix)/man/man3
- SHELL = /bin/sh
- EXTRA_LIBS = 
- 
- INCS =  -Isrc
--FLAGS = -Wall -fpic
-+FLAGS = -Wall -D_REENTRANT
- 
- OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \
- 	src/string.o src/general.o src/list.o src/cookie.o
-+SHOBJS=$(OBJS:.o=.sh.o)
- 
--.c.o: $(CC) $(FLAGS) -c $<
-+ALL_TARGETS = src/libcgi.a
-+ifeq ($(STATIC),)
-+ALL_TARGETS += src/libcgi.so
-+endif
- 
--all: $(OBJS) src/libcgi.so
-+%.o: %.c
-+	$(CC) $(FLAGS) -c $*.c -o $@
-+
-+%.sh.o: %.c
-+	$(CC) $(FLAGS) -fPIC -c $*.c -o $@
-+
-+all: $(ALL_TARGETS)
- 
- 	@echo ""
- 	@echo ""
-@@ -48,14 +58,17 @@
- src/libcgi.a: $(OBJS)
- 	$(AR) rc src/libcgi.a $(OBJS)
- 
--src/libcgi.so: src/libcgi.a
--	$(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
-+src/libcgi.so: $(SHOBJS)
-+	$(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS)
- 
- install:
--	cp src/libcgi.a $(LIBDIR)
--	cp src/libcgi.so $(LIBDIR)
--	cp src/cgi.h $(INCDIR)
--	cp src/session.h $(INCDIR)
-+	cp src/libcgi.a $(DESTDIR)/$(LIBDIR)
-+ifeq ($(STATIC),)
-+	cp src/libcgi.so $(DESTDIR)/$(LIBDIR)
-+endif
-+	[ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p $(DESTDIR)/$(INCDIR)
-+	cp src/cgi.h $(DESTDIR)/$(INCDIR)
-+	cp src/session.h $(DESTDIR)/$(INCDIR)
- 
- 
- src/error.o: src/error.c src/error.h
-@@ -69,8 +82,9 @@
- src/list.o: src/list.c
- 
- clean:
--	find src/ -name *.*o -exec rm -f {} \;
-+	find src/ -name *.o -exec rm -f {} \;
- 	find src/ -name *.a -exec rm -f {} \;
-+	find src/ -name *.so -exec rm -f {} \;
- 
- uninstall: clean
- 	rm -f $(LIBDIR)/libcgi.*
-@@ -78,11 +92,11 @@
- 	rm -f $(INCDIR)/session.h
- 	rm -f $(MANDIR)/libcgi*
- 
--install_man:
--	cp doc/man/man3/libcgi_base64.3 $(MANDIR)
--	cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
--	cp doc/man/man3/libcgi_general.3 $(MANDIR)
--	cp doc/man/man3/libcgi_string.3 $(MANDIR)
--	cp doc/man/man3/libcgi_session.3 $(MANDIR)
--	cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
-+#install_man:
-+#	cp doc/man/man3/libcgi_base64.3 $(MANDIR)
-+#	cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
-+#	cp doc/man/man3/libcgi_general.3 $(MANDIR)
-+#	cp doc/man/man3/libcgi_string.3 $(MANDIR)
-+#	cp doc/man/man3/libcgi_session.3 $(MANDIR)
-+#	cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
- 
diff --git a/bsp/buildroot/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch b/bsp/buildroot/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch
new file mode 100644
index 00000000..ebf91b0a
--- /dev/null
+++ b/bsp/buildroot/package/libcgi/0002-CMakeLists.txt-don-t-force-the-build-of-a-shared-lib.patch
@@ -0,0 +1,44 @@
+From 9bb9d67da0e4faf4bb3a47786dee127e66a49ed0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 3 Sep 2017 15:22:30 +0200
+Subject: [PATCH] CMakeLists.txt: don't force the build of a shared library
+
+Building a shared library doesn't work on all platforms, so instead,
+let CMake rely on the standard BUILD_SHARED_LIBS variable to decide
+whether a static or shared library should be built.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Submitted-upstream: https://github.com/rafaelsteil/libcgi/pull/39
+---
+ src/CMakeLists.txt | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f32d22e..3bde408 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -23,17 +23,18 @@ set(CGI_SRC
+ )
+ 
+ # create binary
+-add_library(${PROJECT_NAME}-shared SHARED ${CGI_SRC})
+-set_target_properties(${PROJECT_NAME}-shared PROPERTIES
++add_library(${PROJECT_NAME} ${CGI_SRC})
++set_target_properties(${PROJECT_NAME} PROPERTIES
+ 	OUTPUT_NAME	${PROJECT_NAME}
+ 	SOVERSION	${PROJECT_VERSION_MAJOR}
+ 	VERSION		${PROJECT_VERSION}
+ )
+ 
+ # install binary
+-install(TARGETS ${PROJECT_NAME}-shared
++install(TARGETS ${PROJECT_NAME}
+ 	EXPORT ${PROJECT_NAME}-targets
+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ )
+ 
+ # install cmake targets
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/libcgi/Config.in b/bsp/buildroot/package/libcgi/Config.in
index 430039e5..33369079 100644
--- a/bsp/buildroot/package/libcgi/Config.in
+++ b/bsp/buildroot/package/libcgi/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCGI
 	  session and cookie support, GET and POST methods manipulation
 	  etc..., to help you to quickly write powerful CGI programs.
 
-	  http://libcgi.sourceforge.net/
+	  https://github.com/rafaelsteil/libcgi/
diff --git a/bsp/buildroot/package/libcgi/libcgi.hash b/bsp/buildroot/package/libcgi/libcgi.hash
index 6bd7c0c3..f071cc0a 100644
--- a/bsp/buildroot/package/libcgi/libcgi.hash
+++ b/bsp/buildroot/package/libcgi/libcgi.hash
@@ -1,2 +1,5 @@
-# Locally computed:
-sha256  861df39cc0195d43419c4c3de8dff4f42478db66c9ba0b0c1e994c99400e130c  libcgi-1.0.tar.gz
+# From https://github.com/rafaelsteil/libcgi/releases/download/v1.1/libcgi-1.1.tar.gz.sha256sum
+sha256  128445f2f828e84905d51bd53d11e2e08c489df3a07225ff9f198c1318092fe6  libcgi-1.1.tar.gz
+
+# Hash for license file:
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/bsp/buildroot/package/libcgi/libcgi.mk b/bsp/buildroot/package/libcgi/libcgi.mk
index 7cb34173..d1e403fd 100644
--- a/bsp/buildroot/package/libcgi/libcgi.mk
+++ b/bsp/buildroot/package/libcgi/libcgi.mk
@@ -4,12 +4,11 @@
 #
 ################################################################################
 
-LIBCGI_VERSION = 1.0
-LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION)
-LIBCGI_INSTALL_STAGING = YES
-# use cross CC/AR rather than host
-LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \
-	$(if $(BR2_STATIC_LIBS),STATIC=1)
-LIBCGI_LICENSE = LGPLv2.1+
+LIBCGI_VERSION = 1.1
+LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION)
 
-$(eval $(autotools-package))
+LIBCGI_INSTALL_STAGING = YES
+LIBCGI_LICENSE = LGPL-2.1+
+LIBCGI_LICENSE_FILES = COPYING
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libcgicc/libcgicc.mk b/bsp/buildroot/package/libcgicc/libcgicc.mk
index 1c36d42a..09df3a1b 100644
--- a/bsp/buildroot/package/libcgicc/libcgicc.mk
+++ b/bsp/buildroot/package/libcgicc/libcgicc.mk
@@ -7,7 +7,7 @@
 LIBCGICC_VERSION = 3.2.16
 LIBCGICC_SITE = $(BR2_GNU_MIRROR)/cgicc
 LIBCGICC_SOURCE = cgicc-$(LIBCGICC_VERSION).tar.bz2
-LIBCGICC_LICENSE = LGPLv3+ (library), GFDL1.2+ (docs)
+LIBCGICC_LICENSE = LGPL-3.0+ (library), GFDL-1.2+ (docs)
 LIBCGICC_LICENSE_FILES = COPYING.LIB COPYING.DOC
 LIBCGICC_INSTALL_STAGING = YES
 LIBCGICC_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libcgroup/libcgroup.mk b/bsp/buildroot/package/libcgroup/libcgroup.mk
index a4c3084c..3845627d 100644
--- a/bsp/buildroot/package/libcgroup/libcgroup.mk
+++ b/bsp/buildroot/package/libcgroup/libcgroup.mk
@@ -7,7 +7,7 @@
 LIBCGROUP_VERSION = 0.41
 LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
 LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v$(LIBCGROUP_VERSION)
-LIBCGROUP_LICENSE = LGPLv2.1
+LIBCGROUP_LICENSE = LGPL-2.1
 LIBCGROUP_LICENSE_FILES = COPYING
 LIBCGROUP_DEPENDENCIES = host-bison host-flex
 LIBCGROUP_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libcli/Config.in b/bsp/buildroot/package/libcli/Config.in
index e20afb0e..3b625c36 100644
--- a/bsp/buildroot/package/libcli/Config.in
+++ b/bsp/buildroot/package/libcli/Config.in
@@ -8,4 +8,3 @@ config BR2_PACKAGE_LIBCLI
 	  tree.
 
 	  http://sites.dparrish.com/libcli
-
diff --git a/bsp/buildroot/package/libcli/libcli.mk b/bsp/buildroot/package/libcli/libcli.mk
index 17eed798..0fef008a 100644
--- a/bsp/buildroot/package/libcli/libcli.mk
+++ b/bsp/buildroot/package/libcli/libcli.mk
@@ -6,7 +6,7 @@
 
 LIBCLI_VERSION = c63c9d35144939c8b4fa3c5394aed2e29ff517b0
 LIBCLI_SITE = $(call github,dparrish,libcli,$(LIBCLI_VERSION))
-LIBCLI_LICENSE = LGPLv2.1
+LIBCLI_LICENSE = LGPL-2.1
 LIBCLI_LICENSE_FILES = COPYING
 LIBCLI_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libcoap/0001-configure-only-add-Wunused-result-if-supported-by-th.patch b/bsp/buildroot/package/libcoap/0001-configure-only-add-Wunused-result-if-supported-by-th.patch
deleted file mode 100644
index bc938904..00000000
--- a/bsp/buildroot/package/libcoap/0001-configure-only-add-Wunused-result-if-supported-by-th.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d5914ecbb0285aea1eb2b9432d6e91155877fd95 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 9 Jun 2016 21:53:59 +0200
-Subject: [PATCH] configure: only add -Wunused-result if supported by the
- compiler
-
-Old gcc versions such as 4.3.x do not support -Wunused-result, so
-instead of unconditionally using this warning, only use it if supported
-by the compiler.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
-Submitted upstream: https://github.com/obgm/libcoap/pull/32
-
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index f4452ac..6354fcf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -110,12 +110,12 @@ WARNING_CFLAGS="\
- -Wswitch-default \
- -Wswitch-enum \
- -Wunused \
---Wunused-result \
- "
- 
- # check whether or not the compiler supports -Wlogical-op (clang does not...)
- AX_CHECK_COMPILE_FLAG([-Wlogical-op], [WARNING_CFLAGS="$WARNING_CFLAGS -Wlogical-op"],,[-Werror])
- AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="$CFLAGS -fdiagnostics-color"],,[-Werror])
-+AX_CHECK_COMPILE_FLAG([-Wunused-result], [WARNING_CFLAGS="$WARNING_CFLAGS -Wunused-result"])
- 
- AC_SUBST([WARNING_CFLAGS])
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/libcoap/Config.in b/bsp/buildroot/package/libcoap/Config.in
index c089b550..6e0c1905 100644
--- a/bsp/buildroot/package/libcoap/Config.in
+++ b/bsp/buildroot/package/libcoap/Config.in
@@ -1,10 +1,11 @@
 config BR2_PACKAGE_LIBCOAP
 	bool "libcoap"
 	help
-	  libcoap is a C implementation of a lightweight application-protocol
-	  for devices that are constrained their resources such as computing
-	  power, RF range, memory, bandwith, or network packet sizes. This
-	  protocol, CoAP, is standardized by the IETF as RFC 7252. For further
-	  information related to CoAP, see <http://coap.technology>.
+	  libcoap is a C implementation of a lightweight
+	  application-protocol for devices that are constrained their
+	  resources such as computing power, RF range, memory, bandwith,
+	  or network packet sizes. This protocol, CoAP, is standardized
+	  by the IETF as RFC 7252. For further information related to
+	  CoAP, see <http://coap.technology>.
 
 	  https://github.com/obgm/libcoap
diff --git a/bsp/buildroot/package/libcoap/libcoap.hash b/bsp/buildroot/package/libcoap/libcoap.hash
index dce491b5..deb94ecd 100644
--- a/bsp/buildroot/package/libcoap/libcoap.hash
+++ b/bsp/buildroot/package/libcoap/libcoap.hash
@@ -1,2 +1,5 @@
 # Locally calculated
-sha256 f66e91742c2b027fcd7c575d8e7b53d79d3624aad1b3baba481dd88f6e2bc44d libcoap-c909bf802034b7762a2182848304b2530e58444f.tar.gz
+sha256 f7e26dc232c177336474a14487771037a8fb32e311f5ccd076a00dc04b6d7b7a libcoap-v4.1.2.tar.gz
+sha256 28b61fbf3c5477611d7f6ead97d15348934496d27dca815b34d45e622730e72e COPYING
+sha256 d8c320ffc0030d1b096ae4732b50d2b811cf95e9a9b7377c1127b2563e0a0388 LICENSE.GPL
+sha256 9d5aeec17bdf82369bbe6e89efb07b7b35abefa044ea1d25cb2feeb70df1c208 LICENSE.BSD
diff --git a/bsp/buildroot/package/libcoap/libcoap.mk b/bsp/buildroot/package/libcoap/libcoap.mk
index ef9b731b..4f87886b 100644
--- a/bsp/buildroot/package/libcoap/libcoap.mk
+++ b/bsp/buildroot/package/libcoap/libcoap.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-LIBCOAP_VERSION = c909bf802034b7762a2182848304b2530e58444f
+LIBCOAP_VERSION = v4.1.2
 LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION))
 LIBCOAP_INSTALL_STAGING = YES
-LIBCOAP_LICENSE = GPLv2+ or BSD-2c
+LIBCOAP_LICENSE = GPL-2.0+ or BSD-2-Clause
 LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD
+LIBCOAP_DEPENDENCIES = host-pkgconf
 LIBCOAP_CONF_OPTS = --disable-examples
 LIBCOAP_AUTORECONF = YES
 
diff --git a/bsp/buildroot/package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch b/bsp/buildroot/package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch
deleted file mode 100644
index ede31dbc..00000000
--- a/bsp/buildroot/package/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From c7c769990bca3049bc389dcbd9985adaec134946 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 29 Aug 2015 11:59:18 +0200
-Subject: [PATCH] Use the native compiler to build generate_cookbook
-
-The generate_cookbook binary needs to be executed at build time. When
-cross-compiling, this means that it should be built with the native
-compiler rather than the cross-compiler.
-
-To achieve this, this commit imports the AX_CC_FOR_BUILD autoconf
-macro from the GNU Autoconf Archive project, and adjusts
-src/Makefile.am to use CC_FOR_BUILD to build generate_cookbook.
-
-Based on initial work by Bernd Kuhls.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.am           |  1 +
- configure.ac          |  2 ++
- m4/ax_cc_for_build.m4 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++
- src/Makefile.am       |  3 ++
- 4 files changed, 83 insertions(+)
- create mode 100644 m4/ax_cc_for_build.m4
-
-diff --git a/Makefile.am b/Makefile.am
-index 4468bca..bd3ce01 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,7 @@ AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm
- AUTOMAKE_OPTIONS = gnu 
- NAME = codec2
- AM_CPPFLAGS = $(AM_CFLAGS)
-+ACLOCAL_AMFLAGS = -I m4
- 
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = codec2.pc
-diff --git a/configure.ac b/configure.ac
-index 493c517..7520af6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,10 +4,12 @@
- AC_PREREQ([2.59])
- AC_INIT(codec2, 0.2, david@rowetel.com)
- AM_INIT_AUTOMAKE
-+AC_CONFIG_MACRO_DIR([m4])
- 
- # Checks for programs.
- AC_PROG_CC
- AC_PROG_LIBTOOL
-+AX_CC_FOR_BUILD
- 
- # Checks for libraries.
- # FIXME: Replace `main' with a function in `-lm':
-diff --git a/m4/ax_cc_for_build.m4 b/m4/ax_cc_for_build.m4
-new file mode 100644
-index 0000000..c880fd0
---- /dev/null
-+++ b/m4/ax_cc_for_build.m4
-@@ -0,0 +1,77 @@
-+# ===========================================================================
-+#      http://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html
-+# ===========================================================================
-+#
-+# SYNOPSIS
-+#
-+#   AX_CC_FOR_BUILD
-+#
-+# DESCRIPTION
-+#
-+#   Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD.
-+#
-+# LICENSE
-+#
-+#   Copyright (c) 2010 Reuben Thomas <rrt@sc3d.org>
-+#   Copyright (c) 1999 Richard Henderson <rth@redhat.com>
-+#
-+#   This program is free software: you can redistribute it and/or modify it
-+#   under the terms of the GNU General Public License as published by the
-+#   Free Software Foundation, either version 3 of the License, or (at your
-+#   option) any later version.
-+#
-+#   This program is distributed in the hope that it will be useful, but
-+#   WITHOUT ANY WARRANTY; without even the implied warranty of
-+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-+#   Public License for more details.
-+#
-+#   You should have received a copy of the GNU General Public License along
-+#   with this program. If not, see <http://www.gnu.org/licenses/>.
-+#
-+#   As a special exception, the respective Autoconf Macro's copyright owner
-+#   gives unlimited permission to copy, distribute and modify the configure
-+#   scripts that are the output of Autoconf when processing the Macro. You
-+#   need not follow the terms of the GNU General Public License when using
-+#   or distributing such scripts, even though portions of the text of the
-+#   Macro appear in them. The GNU General Public License (GPL) does govern
-+#   all other use of the material that constitutes the Autoconf Macro.
-+#
-+#   This special exception to the GPL applies to versions of the Autoconf
-+#   Macro released by the Autoconf Archive. When you make and distribute a
-+#   modified version of the Autoconf Macro, you may extend this special
-+#   exception to the GPL to apply to your modified version as well.
-+
-+#serial 2
-+
-+dnl Get a default for CC_FOR_BUILD to put into Makefile.
-+AC_DEFUN([AX_CC_FOR_BUILD],
-+[# Put a plausible default for CC_FOR_BUILD in Makefile.
-+if test -z "$CC_FOR_BUILD"; then
-+  if test "x$cross_compiling" = "xno"; then
-+    CC_FOR_BUILD='$(CC)'
-+  else
-+    CC_FOR_BUILD=gcc
-+  fi
-+fi
-+AC_SUBST(CC_FOR_BUILD)
-+# Also set EXEEXT_FOR_BUILD.
-+if test "x$cross_compiling" = "xno"; then
-+  EXEEXT_FOR_BUILD='$(EXEEXT)'
-+else
-+  AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
-+    [rm -f conftest*
-+     echo 'int main () { return 0; }' > conftest.c
-+     bfd_cv_build_exeext=
-+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
-+     for file in conftest.*; do
-+       case $file in
-+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
-+       esac
-+     done
-+     rm -f conftest*
-+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
-+  EXEEXT_FOR_BUILD=""
-+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-+fi
-+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1153b3c..719088d 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -77,6 +77,9 @@ CODEBOOKSGE= \
- 
- noinst_PROGRAMS = generate_codebook genlspdtcb
- 
-+generate_codebook$(EXEEXT_FOR_BUILD): generate_codebook.c
-+	$(CC_FOR_BUILD) -o $@ generate_codebook.c -lm
-+
- codebook.$(OBJEXT): codebook.c
- codebookd.$(OBJEXT): codebookd.c
- codebookdt.$(OBJEXT): codebookdt.c
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/libcodec2/0001-fix-codec2-pc-in.patch b/bsp/buildroot/package/libcodec2/0001-fix-codec2-pc-in.patch
new file mode 100644
index 00000000..5950219d
--- /dev/null
+++ b/bsp/buildroot/package/libcodec2/0001-fix-codec2-pc-in.patch
@@ -0,0 +1,20 @@
+Fix includedir in codec2.pc.in
+
+The template file codec2.pc.in contains the wrong path to the header
+files: they are installed in /usr/include/codec2 and not /usr/include/
+directly.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/codec2.pc.in
+===================================================================
+--- a/codec2.pc.in
++++ b/codec2.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/
++includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/codec2
+ 
+ Name: codec2
+ Description: A speech codec for 2400 bit/s and below
diff --git a/bsp/buildroot/package/libcodec2/0002-Add-option-to-disable-unit-tests.patch b/bsp/buildroot/package/libcodec2/0002-Add-option-to-disable-unit-tests.patch
deleted file mode 100644
index 78227020..00000000
--- a/bsp/buildroot/package/libcodec2/0002-Add-option-to-disable-unit-tests.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 19db6244200b870317382294f14b7d561d55a64e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 29 Aug 2015 12:05:53 +0200
-Subject: [PATCH] Add option to disable unit tests
-
-The unittests require C++, while the rest of the library does not, so
-this commit implements a --{enable,disable}-unittests option to
-selectively enable the build of the unit tests. When not provided, the
-option defaults to yes so that the existing behavior is preserved.
-
-Based on initial work by Bernd Kuhls.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.am  | 6 +++++-
- configure.ac | 5 +++++
- 2 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index bd3ce01..1da250b 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -95,4 +95,8 @@ src/codebook/lsp8.txt \
- src/codebook/lsp9.txt \
- src/codebook/lsp10.txt
- 
--SUBDIRS = src unittest
-+SUBDIRS = src
-+
-+if UNITTESTS
-+SUBDIRS += unittest
-+endif
-diff --git a/configure.ac b/configure.ac
-index 7520af6..55b7215 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,5 +24,10 @@ AC_CHECK_HEADERS([stdlib.h string.h])
- AC_FUNC_MALLOC
- AC_CHECK_FUNCS([floor pow sqrt])
- 
-+AC_ARG_ENABLE([unittests],
-+	AS_HELP_STRING([--disable-unittests], [Disable unittests]),
-+	[], [enable_unittests=yes])
-+AM_CONDITIONAL([UNITTESTS], [test "${enable_unittests}" = "yes"])
-+
- AC_CONFIG_FILES([Makefile src/Makefile unittest/Makefile codec2.pc])
- AC_OUTPUT
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/libcodec2/Config.in b/bsp/buildroot/package/libcodec2/Config.in
index b27aab1c..9a9eb865 100644
--- a/bsp/buildroot/package/libcodec2/Config.in
+++ b/bsp/buildroot/package/libcodec2/Config.in
@@ -2,6 +2,15 @@ config BR2_PACKAGE_LIBCODEC2
 	bool "libcodec2"
 	help
 	  Codec2 is an open source low bit rate speech codec designed
-	  for communications quality speech between 1200 and 3200 bit/s.
+	  for communications quality speech between 700 and 3200 bit/s.
 
 	  http://rowetel.com/codec2.html
+
+if BR2_PACKAGE_LIBCODEC2
+
+config BR2_PACKAGE_LIBCODEC2_EXAMPLES
+	bool "libcodec2_examples"
+	help
+	  Install Codec2 examples.
+
+endif
diff --git a/bsp/buildroot/package/libcodec2/libcodec2.hash b/bsp/buildroot/package/libcodec2/libcodec2.hash
new file mode 100644
index 00000000..e401e9d3
--- /dev/null
+++ b/bsp/buildroot/package/libcodec2/libcodec2.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 0695bb93cd985dd39f02f0db35ebc28a98b9b88747318f90774aba5f374eadb2  codec2-0.7.tar.xz
+sha256 9ebb6f82b7380a62ac74c5f0322c88e6744dedf2ebe1f54d6f088282b39844bf  COPYING
diff --git a/bsp/buildroot/package/libcodec2/libcodec2.mk b/bsp/buildroot/package/libcodec2/libcodec2.mk
index 73f98ca2..3253a359 100644
--- a/bsp/buildroot/package/libcodec2/libcodec2.mk
+++ b/bsp/buildroot/package/libcodec2/libcodec2.mk
@@ -4,13 +4,17 @@
 #
 ################################################################################
 
-LIBCODEC2_VERSION = 392a55b4f3f8ad30d845ac6ae35e8b27343bb944
-LIBCODEC2_SITE = https://freeswitch.org/stash/scm/sd/libcodec2.git
-LIBCODEC2_SITE_METHOD = git
-LIBCODEC2_LICENSE = LGPLv2.1
+LIBCODEC2_VERSION = 0.7
+LIBCODEC2_SITE = https://freedv.com/wp-content/uploads/sites/8/2017/10
+LIBCODEC2_SOURCE = codec2-$(LIBCODEC2_VERSION).tar.xz
+LIBCODEC2_LICENSE = LGPL-2.1
 LIBCODEC2_LICENSE_FILES = COPYING
-LIBCODEC2_AUTORECONF = YES
 LIBCODEC2_INSTALL_STAGING = YES
-LIBCODEC2_CONF_OPTS = --disable-unittests
+LIBCODEC2_SUPPORTS_IN_SOURCE_BUILD = NO
+LIBCODEC2_CONF_OPTS = -DUNITTEST=OFF
 
-$(eval $(autotools-package))
+ifeq ($(BR2_PACKAGE_LIBCODEC2_EXAMPLES),y)
+LIBCODEC2_CONF_OPTS += -DINSTALL_EXAMPLES=ON
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libcofi/Config.in b/bsp/buildroot/package/libcofi/Config.in
index df9ab71b..b9d22d43 100644
--- a/bsp/buildroot/package/libcofi/Config.in
+++ b/bsp/buildroot/package/libcofi/Config.in
@@ -5,7 +5,8 @@ config BR2_PACKAGE_LIBCOFI
 	depends on !BR2_STATIC_LIBS
 	help
 	  A replacement for memcpy and memset functionality for the
-	  Raspberry Pi with the intention of gaining greater performance.
+	  Raspberry Pi with the intention of gaining greater
+	  performance.
 
 	  https://github.com/simonjhall/copies-and-fills
 
diff --git a/bsp/buildroot/package/libcofi/libcofi.mk b/bsp/buildroot/package/libcofi/libcofi.mk
index 90daff2a..e611db6b 100644
--- a/bsp/buildroot/package/libcofi/libcofi.mk
+++ b/bsp/buildroot/package/libcofi/libcofi.mk
@@ -6,7 +6,7 @@
 
 LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce
 LIBCOFI_SITE = $(call github,simonjhall,copies-and-fills,$(LIBCOFI_VERSION))
-LIBCOFI_LICENSE = LGPLv2.1
+LIBCOFI_LICENSE = LGPL-2.1
 LIBCOFI_LICENSE_FILES = README.md
 
 define LIBCOFI_BUILD_CMDS
diff --git a/bsp/buildroot/package/libconfig/libconfig.mk b/bsp/buildroot/package/libconfig/libconfig.mk
index f11937c4..ed7e40f1 100644
--- a/bsp/buildroot/package/libconfig/libconfig.mk
+++ b/bsp/buildroot/package/libconfig/libconfig.mk
@@ -6,7 +6,7 @@
 
 LIBCONFIG_VERSION = 1.5
 LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig
-LIBCONFIG_LICENSE = LGPLv2.1+
+LIBCONFIG_LICENSE = LGPL-2.1+
 LIBCONFIG_LICENSE_FILES = COPYING.LIB
 LIBCONFIG_INSTALL_STAGING = YES
 LIBCONFIG_CONF_OPTS = --disable-examples
diff --git a/bsp/buildroot/package/libconfuse/Config.in b/bsp/buildroot/package/libconfuse/Config.in
index be18cbb0..b96b8f28 100644
--- a/bsp/buildroot/package/libconfuse/Config.in
+++ b/bsp/buildroot/package/libconfuse/Config.in
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCONFUSE
 	  environment variable expansion, functions and nested include
 	  statements.
 
-	  http://savannah.nongnu.org/download/confuse/
+	  https://github.com/martinh/libconfuse/
diff --git a/bsp/buildroot/package/libconfuse/libconfuse.hash b/bsp/buildroot/package/libconfuse/libconfuse.hash
index ec485a19..826a9263 100644
--- a/bsp/buildroot/package/libconfuse/libconfuse.hash
+++ b/bsp/buildroot/package/libconfuse/libconfuse.hash
@@ -1,3 +1,4 @@
-# From https://github.com/martinh/libconfuse/releases/download/v3.0/confuse-3.0.tar.xz.md5, sha256 locally computed.
-md5  c534b51a2118ed57031dc548032304a3  confuse-3.0.tar.xz
-sha256  bb75174e02aa8b44fa1a872a47beeea1f5fe715ab669694c97803eb6127cc861  confuse-3.0.tar.xz
+# From https://github.com/martinh/libconfuse/releases/download/v3.2/confuse-3.2.tar.xz.md5
+md5  84259ac3bd495645ab2fe61654917232  confuse-3.2.tar.xz
+# Locally computed
+sha256  a46abb8696026d314197b6a70ae1a1c296342a9a68aa69b1935709c1477a4e48  confuse-3.1.tar.xz
diff --git a/bsp/buildroot/package/libconfuse/libconfuse.mk b/bsp/buildroot/package/libconfuse/libconfuse.mk
index 2908af32..431fefd4 100644
--- a/bsp/buildroot/package/libconfuse/libconfuse.mk
+++ b/bsp/buildroot/package/libconfuse/libconfuse.mk
@@ -4,19 +4,14 @@
 #
 ################################################################################
 
-LIBCONFUSE_VERSION = 3.0
+LIBCONFUSE_VERSION = 3.2
 LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz
 LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION)
 LIBCONFUSE_INSTALL_STAGING = YES
 LIBCONFUSE_CONF_OPTS = --disable-rpath
-LIBCONFUSE_DEPENDENCIES = host-flex
-HOST_LIBCONFUSE_DEPENDENCIES = host-flex
 LIBCONFUSE_LICENSE = ISC
 LIBCONFUSE_LICENSE_FILES = LICENSE
-
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-LIBCONFUSE_DEPENDENCIES += gettext
-endif
+LIBCONFUSE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/libcpprestsdk/0001-fix-xlocale-header-check.patch b/bsp/buildroot/package/libcpprestsdk/0001-fix-xlocale-header-check.patch
new file mode 100644
index 00000000..ffed94a0
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/0001-fix-xlocale-header-check.patch
@@ -0,0 +1,55 @@
+From a826b7b656c165bc35746d9af3ec371387d2bca1 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 23 Oct 2017 08:11:21 -0400
+Subject: [PATCH] fix xlocale header check
+
+asyncrt_utils.h checks if __GLIBC__ is not defined before including
+xlocal.h.  This will cause a compilation failure on uclibc and musl.
+
+Add a proper check in CMakeLists.txt and check for HAVE_XLOCALE_H
+instead of __GLIBC__
+
+Upstream-Status: Accepted
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/CMakeLists.txt                  | 3 +++
+ Release/include/cpprest/asyncrt_utils.h | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Release/CMakeLists.txt b/Release/CMakeLists.txt
+index d57aa3d..eefae75 100644
+--- a/Release/CMakeLists.txt
++++ b/Release/CMakeLists.txt
+@@ -42,6 +42,7 @@ include(cmake/cpprest_find_boost.cmake)
+ include(cmake/cpprest_find_zlib.cmake)
+ include(cmake/cpprest_find_openssl.cmake)
+ include(cmake/cpprest_find_websocketpp.cmake)
++include(CheckIncludeFiles)
+ 
+ find_package(Threads REQUIRED)
+ if(THREADS_HAVE_PTHREAD_ARG)
+@@ -56,6 +57,8 @@ if(CPPREST_EXCLUDE_WEBSOCKETS)
+   set(CPPREST_WEBSOCKETS_IMPL none CACHE STRING "Internal use.")
+ endif()
+ 
++CHECK_INCLUDE_FILES(xlocale.h HAVE_XLOCALE_H)
++
+ if(APPLE) # Note: also iOS
+   set(CPPREST_PPLX_IMPL apple CACHE STRING "Internal use.")
+   set(CPPREST_WEBSOCKETS_IMPL wspp CACHE STRING "Internal use.")
+diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
+index fac70a9..8faa2dc 100644
+--- a/Release/include/cpprest/asyncrt_utils.h
++++ b/Release/include/cpprest/asyncrt_utils.h
+@@ -29,7 +29,7 @@
+ 
+ #ifndef _WIN32
+ #include <boost/algorithm/string.hpp>
+-#if !defined(ANDROID) && !defined(__ANDROID__) && !defined(__GLIBC__) // CodePlex 269
++#if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269
+ /* Systems using glibc: xlocale.h has been removed from glibc 2.26
+    The above include of locale.h is sufficient
+    Further details: https://sourceware.org/git/?p=glibc.git;a=commit;h=f0be25b6336db7492e47d2e8e72eb8af53b5506d */
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch b/bsp/buildroot/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch
new file mode 100644
index 00000000..12f049bf
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/0002-include-sys-time-for-struct-timeval.patch
@@ -0,0 +1,28 @@
+From 25453f9c186cf441881b06bc5503d979acb0ab75 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 23 Oct 2017 09:38:11 -0400
+Subject: [PATCH] Include sys/time.h for struct timeval
+
+This is needed with musl.
+
+Upstream-Status: Accepted
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/include/cpprest/asyncrt_utils.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Release/include/cpprest/asyncrt_utils.h b/Release/include/cpprest/asyncrt_utils.h
+index 8faa2dc..aab87a5 100644
+--- a/Release/include/cpprest/asyncrt_utils.h
++++ b/Release/include/cpprest/asyncrt_utils.h
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #ifndef _WIN32
++#include <sys/time.h>
+ #include <boost/algorithm/string.hpp>
+ #if !defined(ANDROID) && !defined(__ANDROID__) && defined(HAVE_XLOCALE_H) // CodePlex 269
+ /* Systems using glibc: xlocale.h has been removed from glibc 2.26
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/libcpprestsdk/0003-fix-strand.patch b/bsp/buildroot/package/libcpprestsdk/0003-fix-strand.patch
new file mode 100644
index 00000000..f5710b38
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/0003-fix-strand.patch
@@ -0,0 +1,28 @@
+From e75d642726c4c78c368e74660ef4bc5503f3ec12 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@codeblue.com>
+Date: Sun, 14 Jan 2018 14:44:02 -0500
+Subject: [PATCH] fix strand
+
+From upstream, fixes compiling against boost 1.66 strand.
+
+Commit IDs 6b2e0480018530b616f61d5cdc786c92ba148bb7
+
+Signed-off-by: Adam Duskett <aduskett@codeblue.com>
+---
+ Release/include/pplx/threadpool.h                                  | 2 +-
+ Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
+index 0be40f6b..395632c3 100644
+--- a/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
++++ b/Release/libs/websocketpp/websocketpp/transport/asio/connection.hpp
+@@ -422,7 +422,7 @@ class connection : public config::socket_type::socket_con_type {
+         m_io_service = io_service;
+ 
+         if (config::enable_multithreading) {
+-            m_strand = lib::make_shared<boost::asio::strand>(
++            m_strand = lib::make_shared<boost::asio::io_service::strand>(
+                 lib::ref(*io_service));
+ 
+             m_async_read_handler = m_strand->wrap(lib::bind(
diff --git a/bsp/buildroot/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch b/bsp/buildroot/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
new file mode 100644
index 00000000..de900178
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/0004-libcpprestsdk-fix-building-as-a-static-library.patch
@@ -0,0 +1,38 @@
+From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Mon, 12 Feb 2018 07:49:34 -0500
+Subject: [PATCH] libcpprestsdk: fix building as a static library
+
+Use pkg-config to find OpenSSL. This will automatically find any
+dependent libraries and put them in the correct order for linking.
+
+Upstream status: submitted
+https://github.com/Microsoft/cpprestsdk/pull/688
+
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Release/cmake/cpprest_find_openssl.cmake | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake
+index 0b49a7e..2be8afb 100644
+--- a/Release/cmake/cpprest_find_openssl.cmake
++++ b/Release/cmake/cpprest_find_openssl.cmake
+@@ -41,8 +41,12 @@ function(cpprest_find_openssl)
+       # This should prevent linking against the system provided 0.9.8y
+       set(_OPENSSL_VERSION "")
+     endif()
+-    find_package(OpenSSL 1.0.0 REQUIRED)
+-
++    if(UNIX)
++		find_package(PkgConfig REQUIRED)
++		pkg_search_module(OPENSSL openssl REQUIRED)
++    else()
++    	find_package(OpenSSL 1.0.0 REQUIRED)
++	endif()
+     INCLUDE(CheckCXXSourceCompiles)
+     set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+     set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/libcpprestsdk/Config.in b/bsp/buildroot/package/libcpprestsdk/Config.in
new file mode 100644
index 00000000..a07159b1
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/Config.in
@@ -0,0 +1,31 @@
+config BR2_PACKAGE_LIBCPPRESTSDK
+	bool "libcpprestsdk"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR # boost
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_ATOMIC
+	select BR2_PACKAGE_BOOST_CHRONO
+	select BR2_PACKAGE_BOOST_DATE_TIME
+	select BR2_PACKAGE_BOOST_FILESYSTEM
+	select BR2_PACKAGE_BOOST_RANDOM
+	select BR2_PACKAGE_BOOST_REGEX
+	select BR2_PACKAGE_BOOST_THREAD
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_ZLIB
+	help
+	  The C++ REST SDK is a Microsoft project for cloud-based
+	  client-server communication in native code using a modern
+	  asynchronous C++ API design. This project aims to help C++
+	  developers connect to and interact with services.
+
+	  https://github.com/Microsoft/cpprestsdk
+
+comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+		!BR2_INSTALL_LIBSTDCPP || \
+		!BR2_USE_WCHAR
+
+comment "libcpprestsdk needs exception_ptr"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/bsp/buildroot/package/libcpprestsdk/libcpprestsdk.hash b/bsp/buildroot/package/libcpprestsdk/libcpprestsdk.hash
new file mode 100644
index 00000000..0bddfc91
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/libcpprestsdk.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 f38bc48e6fca969de794dcd65889df6563855cee5ff99742dafc6b2869976e71	libcpprestsdk-v2.10.1.tar.gz
+sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97	license.txt
diff --git a/bsp/buildroot/package/libcpprestsdk/libcpprestsdk.mk b/bsp/buildroot/package/libcpprestsdk/libcpprestsdk.mk
new file mode 100644
index 00000000..4d30f07c
--- /dev/null
+++ b/bsp/buildroot/package/libcpprestsdk/libcpprestsdk.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libcpprestsdk
+#
+################################################################################
+
+LIBCPPRESTSDK_VERSION = v2.10.1
+LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,$(LIBCPPRESTSDK_VERSION))
+LIBCPPRESTSDK_LICENSE = MIT
+LIBCPPRESTSDK_LICENSE_FILES = license.txt
+LIBCPPRESTSDK_SUBDIR = Release
+LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
+LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libcroco/Config.in b/bsp/buildroot/package/libcroco/Config.in
index 5baf83df..ad78a147 100644
--- a/bsp/buildroot/package/libcroco/Config.in
+++ b/bsp/buildroot/package/libcroco/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LIBCROCO
 	bool "libcroco"
-	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Libcroco is a standalone css2 parsing and manipulation
 	  library. The parser provides a low level event driven SAC
diff --git a/bsp/buildroot/package/libcroco/libcroco.hash b/bsp/buildroot/package/libcroco/libcroco.hash
index edf0b1f3..83d2ffe5 100644
--- a/bsp/buildroot/package/libcroco/libcroco.hash
+++ b/bsp/buildroot/package/libcroco/libcroco.hash
@@ -1,2 +1,2 @@
-# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.11.sha256sum
-sha256	132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056	libcroco-0.6.11.tar.xz
+# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.12.sha256sum
+sha256	ddc4b5546c9fb4280a5017e2707fbd4839034ed1aba5b7d4372212f34f84f860	libcroco-0.6.12.tar.xz
diff --git a/bsp/buildroot/package/libcroco/libcroco.mk b/bsp/buildroot/package/libcroco/libcroco.mk
index 39dd5279..612fd1f4 100644
--- a/bsp/buildroot/package/libcroco/libcroco.mk
+++ b/bsp/buildroot/package/libcroco/libcroco.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 LIBCROCO_VERSION_MAJOR = 0.6
-LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).11
+LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).12
 LIBCROCO_SITE = http://ftp.gnome.org/pub/gnome/sources/libcroco/$(LIBCROCO_VERSION_MAJOR)
 LIBCROCO_SOURCE = libcroco-$(LIBCROCO_VERSION).tar.xz
 LIBCROCO_INSTALL_STAGING = YES
@@ -14,7 +14,7 @@ HOST_LIBCROCO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2
 LIBCROCO_CONFIG_SCRIPTS = croco-$(LIBCROCO_VERSION_MAJOR)-config
 # NEWS states that it's only LGPL
 # Source code says v2.1+ even though COPYING.LIB is v2
-LIBCROCO_LICENSE = LGPLv2.1+
+LIBCROCO_LICENSE = LGPL-2.1+
 LIBCROCO_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libcsv/Config.in b/bsp/buildroot/package/libcsv/Config.in
new file mode 100644
index 00000000..797c735b
--- /dev/null
+++ b/bsp/buildroot/package/libcsv/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBCSV
+	bool "libcsv"
+	help
+	  libcsv is a small, simple and fast CSV library written in
+	  pure ANSI C89 that can read and write CSV data. It provides
+	  a straight-forward interface using callback functions to
+	  handle parsed fields and rows and can parse improperly
+	  formatted CSV files.
+
+	  https://sourceforge.net/projects/libcsv/
diff --git a/bsp/buildroot/package/libcsv/libcsv.hash b/bsp/buildroot/package/libcsv/libcsv.hash
new file mode 100644
index 00000000..e35c44f9
--- /dev/null
+++ b/bsp/buildroot/package/libcsv/libcsv.hash
@@ -0,0 +1,2 @@
+#locally computed
+sha256 d9c0431cb803ceb9896ce74f683e6e5a0954e96ae1d9e4028d6e0f967bebd7e4  libcsv-3.0.3.tar.gz
diff --git a/bsp/buildroot/package/libcsv/libcsv.mk b/bsp/buildroot/package/libcsv/libcsv.mk
new file mode 100644
index 00000000..d0ce6433
--- /dev/null
+++ b/bsp/buildroot/package/libcsv/libcsv.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# libcsv
+#
+################################################################################
+
+LIBCSV_VERSION = 3.0.3
+LIBCSV_SITE = http://sourceforge.net/projects/libcsv/files
+LIBCSV_LICENSE = LGPL-2.1+
+LIBCSV_LICENSE_FILES = COPYING.LESSER
+LIBCSV_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libcue/libcue.mk b/bsp/buildroot/package/libcue/libcue.mk
index ba559a7f..7f8e45ec 100644
--- a/bsp/buildroot/package/libcue/libcue.mk
+++ b/bsp/buildroot/package/libcue/libcue.mk
@@ -6,7 +6,7 @@
 
 LIBCUE_VERSION = v1.4.0
 LIBCUE_SITE = $(call github,lipnitsk,libcue,$(LIBCUE_VERSION))
-LIBCUE_LICENSE = GPLv2, BSD-2c (rem.c)
+LIBCUE_LICENSE = GPL-2.0, BSD-2-Clause (rem.c)
 LIBCUE_LICENSE_FILES = COPYING
 LIBCUE_DEPENDENCIES = host-bison host-flex flex
 LIBCUE_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libcuefile/libcuefile.mk b/bsp/buildroot/package/libcuefile/libcuefile.mk
index d1f24488..66b589b1 100644
--- a/bsp/buildroot/package/libcuefile/libcuefile.mk
+++ b/bsp/buildroot/package/libcuefile/libcuefile.mk
@@ -8,7 +8,7 @@ LIBCUEFILE_VERSION = r475
 LIBCUEFILE_SITE = http://files.musepack.net/source
 LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz
 LIBCUEFILE_INSTALL_STAGING = YES
-LIBCUEFILE_LICENSE = GPLv2+
+LIBCUEFILE_LICENSE = GPL-2.0+
 LIBCUEFILE_LICENSE_FILES = COPYING
 
 define LIBCUEFILE_INSTALL_STAGING_INCLUDES
diff --git a/bsp/buildroot/package/libcurl/Config.in b/bsp/buildroot/package/libcurl/Config.in
index fc1527f0..21c2ee2b 100644
--- a/bsp/buildroot/package/libcurl/Config.in
+++ b/bsp/buildroot/package/libcurl/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_LIBCURL
 	bool "libcurl"
 	help
-	  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
-	  and Dict servers, using any of the supported protocols.
+	  cURL is a tool for getting files from FTP, HTTP, Gopher,
+	  Telnet, and Dict servers, using any of the supported
+	  protocols.
 
 	  http://curl.haxx.se/
 
diff --git a/bsp/buildroot/package/libcurl/libcurl.hash b/bsp/buildroot/package/libcurl/libcurl.hash
index aec61e3f..39530765 100644
--- a/bsp/buildroot/package/libcurl/libcurl.hash
+++ b/bsp/buildroot/package/libcurl/libcurl.hash
@@ -1,4 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://curl.haxx.se/download/curl-7.59.0.tar.xz.asc
-sha256 e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc  curl-7.59.0.tar.xz
+# https://curl.haxx.se/download/curl-7.61.1.tar.xz.asc
+# with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
+sha256 3d5913d6a39bd22e68e34dff697fd6e4c3c81563f580c76fca2009315cd81891  curl-7.61.1.tar.xz
 sha256 5f3849ec38ddb927e79f514bf948890c41b8d1407286a49609b8fb1585931095  COPYING
diff --git a/bsp/buildroot/package/libcurl/libcurl.mk b/bsp/buildroot/package/libcurl/libcurl.mk
index 59210dd8..92c1a1fb 100644
--- a/bsp/buildroot/package/libcurl/libcurl.mk
+++ b/bsp/buildroot/package/libcurl/libcurl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBCURL_VERSION = 7.59.0
+LIBCURL_VERSION = 7.61.1
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
 LIBCURL_SITE = https://curl.haxx.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
@@ -38,7 +38,6 @@ LIBCURL_CONFIG_SCRIPTS = curl-config
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
-LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 # configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up
 # native stuff during the rest of configure when target == host.
 # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
@@ -88,4 +87,18 @@ endef
 LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP
 endif
 
+HOST_LIBCURL_DEPENDENCIES = host-openssl
+HOST_LIBCURL_CONF_OPTS = \
+	--disable-manual \
+	--disable-ntlm-wb \
+	--disable-curldebug \
+	--with-ssl \
+	--without-gnutls \
+	--without-mbedtls \
+	--without-polarssl \
+	--without-nss
+
+HOST_LIBCURL_POST_PATCH_HOOKS += LIBCURL_FIX_DOT_PC
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/libdaemon/libdaemon.mk b/bsp/buildroot/package/libdaemon/libdaemon.mk
index 69dc0b76..a8f75108 100644
--- a/bsp/buildroot/package/libdaemon/libdaemon.mk
+++ b/bsp/buildroot/package/libdaemon/libdaemon.mk
@@ -6,7 +6,7 @@
 
 LIBDAEMON_VERSION = 0.14
 LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon
-LIBDAEMON_LICENSE = LGPLv2.1+
+LIBDAEMON_LICENSE = LGPL-2.1+
 LIBDAEMON_LICENSE_FILES = LICENSE
 LIBDAEMON_INSTALL_STAGING = YES
 LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no
diff --git a/bsp/buildroot/package/libdcadec/libdcadec.mk b/bsp/buildroot/package/libdcadec/libdcadec.mk
index 48e4a12f..a5a98bed 100644
--- a/bsp/buildroot/package/libdcadec/libdcadec.mk
+++ b/bsp/buildroot/package/libdcadec/libdcadec.mk
@@ -6,7 +6,7 @@
 
 LIBDCADEC_VERSION = v0.2.0
 LIBDCADEC_SITE = $(call github,foo86,dcadec,$(LIBDCADEC_VERSION))
-LIBDCADEC_LICENSE = LGPLv2.1+
+LIBDCADEC_LICENSE = LGPL-2.1+
 LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1
 LIBDCADEC_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libdmtx/Config.in b/bsp/buildroot/package/libdmtx/Config.in
index db4187fd..b81b99c4 100644
--- a/bsp/buildroot/package/libdmtx/Config.in
+++ b/bsp/buildroot/package/libdmtx/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBDMTX
 	bool "libdmtx"
 	help
-	  libdmtx is a software library that enables programs to read and write
-	  Data Matrix barcodes of the modern ECC200 variety.
+	  libdmtx is a software library that enables programs to read
+	  and write Data Matrix barcodes of the modern ECC200 variety.
 
 	  http://www.libdmtx.org/
diff --git a/bsp/buildroot/package/libdmtx/libdmtx.mk b/bsp/buildroot/package/libdmtx/libdmtx.mk
index 146534e8..f718b137 100644
--- a/bsp/buildroot/package/libdmtx/libdmtx.mk
+++ b/bsp/buildroot/package/libdmtx/libdmtx.mk
@@ -6,7 +6,7 @@
 
 LIBDMTX_VERSION = 0.7.4
 LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION)
-LIBDMTX_LICENSE = BSD-2c or Special Permission
+LIBDMTX_LICENSE = BSD-2-Clause or Special Permission
 LIBDMTX_LICENSE_FILES = LICENSE
 LIBDMTX_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libdnet/Config.in b/bsp/buildroot/package/libdnet/Config.in
index e78bdeda..e7ba3a21 100644
--- a/bsp/buildroot/package/libdnet/Config.in
+++ b/bsp/buildroot/package/libdnet/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_LIBDNET
 	bool "libdnet"
 	help
-	  libdnet - simplified interface to low-level networking routines.
+	  libdnet - simplified interface to low-level networking
+	  routines.
 
 	  http://libdnet.sourceforge.net/
 
diff --git a/bsp/buildroot/package/libdnet/libdnet.mk b/bsp/buildroot/package/libdnet/libdnet.mk
index f4e7a74c..00d9c4fd 100644
--- a/bsp/buildroot/package/libdnet/libdnet.mk
+++ b/bsp/buildroot/package/libdnet/libdnet.mk
@@ -6,7 +6,7 @@
 
 LIBDNET_VERSION = 1.11
 LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION)
-LIBDNET_LICENSE = BSD-3c
+LIBDNET_LICENSE = BSD-3-Clause
 LIBDNET_LICENSE_FILES = LICENSE
 LIBDNET_INSTALL_STAGING = YES
 LIBDNET_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libdri2/Config.in b/bsp/buildroot/package/libdri2/Config.in
index fff979e3..a10df740 100644
--- a/bsp/buildroot/package/libdri2/Config.in
+++ b/bsp/buildroot/package/libdri2/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_LIBDRI2
 	bool "libdri2"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
+	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XPROTO_DRI2PROTO
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm
-	depends on BR2_PACKAGE_XORG7
 	help
 	  Library for the DRI2 extension to the X Window System.
 
diff --git a/bsp/buildroot/package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch b/bsp/buildroot/package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
new file mode 100644
index 00000000..0fbe77ef
--- /dev/null
+++ b/bsp/buildroot/package/libdrm/0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
@@ -0,0 +1,162 @@
+From 57d544ff2f96a26cac07d5be00ff7b67678ae7b8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 18 Dec 2017 13:08:39 +0100
+Subject: [PATCH] configure/Makefile.am: use pkg-config to discover
+ libatomic_ops
+
+The configure script currently tests the availability of libatomic_ops
+by checking the presence of atomic_ops.h. While this is good enough as
+an availability test, it is not sufficient as on some platforms,
+libatomic_ops provides an actual shared library against which we
+should be linked to access libatomic_ops functionality.
+
+Therefore, we instead use PKG_CHECK_MODULES() to test the availability
+of libatomic_ops. Besides testing its availability, this also fills in
+the ATOMIC_OPS_LIBS variable with the list of libraries we need to
+link with to use libatomic_ops.
+
+All Mesa drivers that include xf86atomic.h have been updated to link
+against ATOMIC_OPS_LIBS.
+
+Of course, if we're not using libatomic_ops, ATOMIC_OPS_LIBS is empty,
+and we don't link against it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+[Bernd: PKG_CHECK_MODULES should not fail when libatomic_ops is missing]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ amdgpu/Makefile.am    | 2 +-
+ configure.ac          | 2 +-
+ etnaviv/Makefile.am   | 3 ++-
+ freedreno/Makefile.am | 3 ++-
+ intel/Makefile.am     | 3 ++-
+ nouveau/Makefile.am   | 2 +-
+ omap/Makefile.am      | 2 +-
+ radeon/Makefile.am    | 2 +-
+ tegra/Makefile.am     | 2 +-
+ 9 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/amdgpu/Makefile.am b/amdgpu/Makefile.am
+index a1b0d05c..b2bcceff 100644
+--- a/amdgpu/Makefile.am
++++ b/amdgpu/Makefile.am
+@@ -36,7 +36,7 @@ AM_CPPFLAGS = -DAMDGPU_ASIC_ID_TABLE=\"${libdrmdatadir}/amdgpu.ids\"
+ libdrm_amdgpu_la_LTLIBRARIES = libdrm_amdgpu.la
+ libdrm_amdgpu_ladir = $(libdir)
+ libdrm_amdgpu_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_amdgpu_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@
+ 
+ libdrm_amdgpu_la_SOURCES = $(LIBDRM_AMDGPU_FILES)
+ amdgpu_asic_id.lo: $(top_srcdir)/data/amdgpu.ids
+diff --git a/configure.ac b/configure.ac
+index 35378b33..501d0871 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -247,7 +247,7 @@ AC_CACHE_CHECK([for native atomic primitives], drm_cv_atomic_primitives, [
+ 					  ]],[[]])], [drm_cv_atomic_primitives="Intel"],[])
+ 
+ 	if test "x$drm_cv_atomic_primitives" = "xnone"; then
+-		AC_CHECK_HEADER([atomic_ops.h], drm_cv_atomic_primitives="libatomic-ops")
++		PKG_CHECK_MODULES(ATOMIC_OPS, [atomic_ops], drm_cv_atomic_primitives="libatomic-ops", true)
+ 	fi
+ 
+ 	# atomic functions defined in <atomic.h> & libc on Solaris
+diff --git a/etnaviv/Makefile.am b/etnaviv/Makefile.am
+index be96ba86..669cf14f 100644
+--- a/etnaviv/Makefile.am
++++ b/etnaviv/Makefile.am
+@@ -12,7 +12,8 @@ libdrm_etnaviv_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_etnaviv_la_LIBADD = \
+ 	../libdrm.la \
+ 	@PTHREADSTUBS_LIBS@ \
+-	@CLOCK_LIB@
++	@CLOCK_LIB@ \
++	@ATOMIC_OPS_LIBS@
+ 
+ libdrm_etnaviv_la_SOURCES = $(LIBDRM_ETNAVIV_FILES)
+ 
+diff --git a/freedreno/Makefile.am b/freedreno/Makefile.am
+index cbb0d031..238407e3 100644
+--- a/freedreno/Makefile.am
++++ b/freedreno/Makefile.am
+@@ -14,7 +14,8 @@ libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_freedreno_la_LIBADD = \
+ 	../libdrm.la \
+ 	@PTHREADSTUBS_LIBS@ \
+-	@CLOCK_LIB@
++	@CLOCK_LIB@ \
++	@ATOMIC_OPS_LIBS@
+ 
+ libdrm_freedreno_la_SOURCES = $(LIBDRM_FREEDRENO_FILES)
+ if HAVE_FREEDRENO_KGSL
+diff --git a/intel/Makefile.am b/intel/Makefile.am
+index c52e8c08..f3635a64 100644
+--- a/intel/Makefile.am
++++ b/intel/Makefile.am
+@@ -38,7 +38,8 @@ libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ libdrm_intel_la_LIBADD = ../libdrm.la \
+ 	@PTHREADSTUBS_LIBS@ \
+ 	@PCIACCESS_LIBS@ \
+-	@CLOCK_LIB@
++	@CLOCK_LIB@ \
++	@ATOMIC_OPS_LIBS@
+ 
+ libdrm_intel_la_SOURCES = $(LIBDRM_INTEL_FILES)
+ 
+diff --git a/nouveau/Makefile.am b/nouveau/Makefile.am
+index 344a8445..a4e6a78b 100644
+--- a/nouveau/Makefile.am
++++ b/nouveau/Makefile.am
+@@ -10,7 +10,7 @@ AM_CFLAGS = \
+ libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
+ libdrm_nouveau_ladir = $(libdir)
+ libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
+-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@
+ 
+ libdrm_nouveau_la_SOURCES = $(LIBDRM_NOUVEAU_FILES)
+ 
+diff --git a/omap/Makefile.am b/omap/Makefile.am
+index 599bb9de..524afee3 100644
+--- a/omap/Makefile.am
++++ b/omap/Makefile.am
+@@ -7,7 +7,7 @@ AM_CFLAGS = \
+ libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
+ libdrm_omap_ladir = $(libdir)
+ libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+-libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@
+ 
+ libdrm_omap_la_SOURCES = omap_drm.c
+ 
+diff --git a/radeon/Makefile.am b/radeon/Makefile.am
+index e2415314..c27d3c75 100644
+--- a/radeon/Makefile.am
++++ b/radeon/Makefile.am
+@@ -33,7 +33,7 @@ AM_CFLAGS = \
+ libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
+ libdrm_radeon_ladir = $(libdir)
+ libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
+-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@
+ 
+ libdrm_radeon_la_SOURCES = $(LIBDRM_RADEON_FILES)
+ 
+diff --git a/tegra/Makefile.am b/tegra/Makefile.am
+index fb40be55..12abe8c4 100644
+--- a/tegra/Makefile.am
++++ b/tegra/Makefile.am
+@@ -9,7 +9,7 @@ AM_CFLAGS = \
+ libdrm_tegra_ladir = $(libdir)
+ libdrm_tegra_la_LTLIBRARIES = libdrm_tegra.la
+ libdrm_tegra_la_LDFLAGS = -version-number 0:0:0 -no-undefined
+-libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
++libdrm_tegra_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @ATOMIC_OPS_LIBS@
+ 
+ libdrm_tegra_la_SOURCES = \
+ 	private.h \
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/libdrm/Config.in b/bsp/buildroot/package/libdrm/Config.in
index 81fc5ccf..581f9219 100644
--- a/bsp/buildroot/package/libdrm/Config.in
+++ b/bsp/buildroot/package/libdrm/Config.in
@@ -1,7 +1,7 @@
 menuconfig BR2_PACKAGE_LIBDRM
 	bool "libdrm"
-	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libpthread-stubs
+	select BR2_PACKAGE_LIBPTHREAD_STUBS
 	help
 	  Direct Rendering Manager
 
@@ -20,10 +20,10 @@ config BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
 
 config BR2_PACKAGE_LIBDRM_INTEL
 	bool "intel"
-	select BR2_PACKAGE_LIBPCIACCESS
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
 	select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
+	select BR2_PACKAGE_LIBPCIACCESS
 	help
 	  Install intel graphics driver.
 
@@ -64,7 +64,6 @@ config BR2_PACKAGE_LIBDRM_OMAP
 
 config BR2_PACKAGE_LIBDRM_ETNAVIV
 	bool "etnaviv (experimental)"
-	depends on BR2_arm
 	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
 	select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC
 	help
@@ -94,7 +93,7 @@ config BR2_PACKAGE_LIBDRM_TEGRA
 
 config BR2_PACKAGE_LIBDRM_VC4
 	bool "vc4"
-	depends on BR2_arm
+	depends on BR2_aarch64 || BR2_arm
 	help
 	  Install vc4 (Raspberry Pi) driver.
 
diff --git a/bsp/buildroot/package/libdrm/libdrm.hash b/bsp/buildroot/package/libdrm/libdrm.hash
index dc10b295..0842411c 100644
--- a/bsp/buildroot/package/libdrm/libdrm.hash
+++ b/bsp/buildroot/package/libdrm/libdrm.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/dri-devel/2017-January/131209.html
-sha256 2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f  libdrm-2.4.75.tar.bz2
+# From https://lists.freedesktop.org/archives/dri-devel/2017-December/160530.html
+md5 5307a147dde67ac643f6753a42b5d32c  libdrm-2.4.89.tar.bz2
+sha1 43123da26271df9a29deb687c1855bef3fed249c  libdrm-2.4.89.tar.bz2
+sha256 629f9782aabbb4809166de5f24d26fe0766055255038f16935602d89f136a02e  libdrm-2.4.89.tar.bz2
+sha512 380e4e46cd3971a73264bd1b482791fab0503268adb65ac81b674df009662cfb8ef5741e362f19670b2a43b1c46f022d857706c9a4bebed2b1cddaa317b7706d  libdrm-2.4.89.tar.bz2
diff --git a/bsp/buildroot/package/libdrm/libdrm.mk b/bsp/buildroot/package/libdrm/libdrm.mk
index ae7b75ba..1c898a5b 100644
--- a/bsp/buildroot/package/libdrm/libdrm.mk
+++ b/bsp/buildroot/package/libdrm/libdrm.mk
@@ -4,16 +4,20 @@
 #
 ################################################################################
 
-LIBDRM_VERSION = 2.4.75
+LIBDRM_VERSION = 2.4.89
 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
-LIBDRM_SITE = http://dri.freedesktop.org/libdrm
+LIBDRM_SITE = https://dri.freedesktop.org/libdrm
 LIBDRM_LICENSE = MIT
-
 LIBDRM_INSTALL_STAGING = YES
 
+# patch 0003-configure-Makefile.am-use-pkg-config-to-discover-lib.patch
+# touching configure.ac/Makefile.am (and host-xutil_util-macros dependency)
+LIBDRM_AUTORECONF = YES
+
 LIBDRM_DEPENDENCIES = \
 	libpthread-stubs \
-	host-pkgconf
+	host-pkgconf \
+	host-xutil_util-macros
 
 LIBDRM_CONF_OPTS = \
 	--disable-cairo-tests \
diff --git a/bsp/buildroot/package/libdvbcsa/Config.in b/bsp/buildroot/package/libdvbcsa/Config.in
index dd7dc151..1253ffbb 100644
--- a/bsp/buildroot/package/libdvbcsa/Config.in
+++ b/bsp/buildroot/package/libdvbcsa/Config.in
@@ -1,9 +1,11 @@
 config BR2_PACKAGE_LIBDVBCSA
 	bool "libdvbcsa"
 	help
-	  libdvbcsa is a free implementation of the DVB Common Scrambling
-	  Algorithm - DVB/CSA - with encryption and decryption capabilities
+	  libdvbcsa is a free implementation of the DVB Common
+	  Scrambling Algorithm - DVB/CSA - with encryption and
+	  decryption capabilities
 
-	  As libdvbcsa implements a standard, it is completely legal to use it.
+	  As libdvbcsa implements a standard, it is completely legal to
+	  use it.
 
 	  http://www.videolan.org/developers/libdvbcsa.html
diff --git a/bsp/buildroot/package/libdvbcsa/libdvbcsa.mk b/bsp/buildroot/package/libdvbcsa/libdvbcsa.mk
index dfbb4c22..8b733e74 100644
--- a/bsp/buildroot/package/libdvbcsa/libdvbcsa.mk
+++ b/bsp/buildroot/package/libdvbcsa/libdvbcsa.mk
@@ -6,7 +6,7 @@
 
 LIBDVBCSA_VERSION = 1.1.0
 LIBDVBCSA_SITE = http://get.videolan.org/libdvbcsa/$(LIBDVBCSA_VERSION)
-LIBDVBCSA_LICENSE = GPLv2+
+LIBDVBCSA_LICENSE = GPL-2.0+
 LIBDVBCSA_LICENSE_FILES = COPYING
 LIBDVBCSA_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libdvbpsi/Config.in b/bsp/buildroot/package/libdvbpsi/Config.in
index 4d543bc9..e52079bb 100644
--- a/bsp/buildroot/package/libdvbpsi/Config.in
+++ b/bsp/buildroot/package/libdvbpsi/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_LIBDVBPSI
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  libdvbpsi is a simple library designed for decoding and
-	  generation of MPEG TS and DVB PSI tables according to standards
-	  ISO/IEC 13818 and ITU-T H.222.0.
+	  generation of MPEG TS and DVB PSI tables according to
+	  standards ISO/IEC 13818 and ITU-T H.222.0.
 
 	  http://www.videolan.org/developers/libdvbpsi.html
 
diff --git a/bsp/buildroot/package/libdvbpsi/libdvbpsi.mk b/bsp/buildroot/package/libdvbpsi/libdvbpsi.mk
index 218c19e1..9a0a4acc 100644
--- a/bsp/buildroot/package/libdvbpsi/libdvbpsi.mk
+++ b/bsp/buildroot/package/libdvbpsi/libdvbpsi.mk
@@ -7,7 +7,7 @@
 LIBDVBPSI_VERSION = 1.3.0
 LIBDVBPSI_SITE = http://download.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)
 LIBDVBPSI_SOURCE = libdvbpsi-$(LIBDVBPSI_VERSION).tar.bz2
-LIBDVBPSI_LICENSE = LGPLv2.1+
+LIBDVBPSI_LICENSE = LGPL-2.1+
 LIBDVBPSI_LICENSE_FILES = COPYING
 LIBDVBPSI_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libdvbsi/Config.in b/bsp/buildroot/package/libdvbsi/Config.in
index f67342d6..fa0dcea4 100644
--- a/bsp/buildroot/package/libdvbsi/Config.in
+++ b/bsp/buildroot/package/libdvbsi/Config.in
@@ -4,9 +4,10 @@ config BR2_PACKAGE_LIBDVBSI
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  C++ parsing library for Service Information (SI) in DVB systems.
-	  With libdvbsi++ you can convert raw DVB service information to
-	  a set of C++ objects, removing the need to parse data manually.
+	  C++ parsing library for Service Information (SI) in DVB
+	  systems. With libdvbsi++ you can convert raw DVB service
+	  information to a set of C++ objects, removing the need to
+	  parse data manually.
 
 	  http://www.saftware.de/
 
diff --git a/bsp/buildroot/package/libdvbsi/libdvbsi.mk b/bsp/buildroot/package/libdvbsi/libdvbsi.mk
index f6469f9b..bfddd647 100644
--- a/bsp/buildroot/package/libdvbsi/libdvbsi.mk
+++ b/bsp/buildroot/package/libdvbsi/libdvbsi.mk
@@ -8,7 +8,7 @@ LIBDVBSI_VERSION = 0.3.7
 LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2
 LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++
 LIBDVBSI_INSTALL_STAGING = YES
-LIBDVBSI_LICENSE = LGPLv2.1
+LIBDVBSI_LICENSE = LGPL-2.1
 LIBDVBSI_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libdvdcss/libdvdcss.mk b/bsp/buildroot/package/libdvdcss/libdvdcss.mk
index 8e1c9299..e5ba3af2 100644
--- a/bsp/buildroot/package/libdvdcss/libdvdcss.mk
+++ b/bsp/buildroot/package/libdvdcss/libdvdcss.mk
@@ -8,7 +8,7 @@ LIBDVDCSS_VERSION = 1.4.0
 LIBDVDCSS_SOURCE = libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2
 LIBDVDCSS_SITE = http://www.videolan.org/pub/videolan/libdvdcss/$(LIBDVDCSS_VERSION)
 LIBDVDCSS_INSTALL_STAGING = YES
-LIBDVDCSS_LICENSE = GPLv2+
+LIBDVDCSS_LICENSE = GPL-2.0+
 LIBDVDCSS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libdvdnav/libdvdnav.mk b/bsp/buildroot/package/libdvdnav/libdvdnav.mk
index b53f0c82..5cb47ab0 100644
--- a/bsp/buildroot/package/libdvdnav/libdvdnav.mk
+++ b/bsp/buildroot/package/libdvdnav/libdvdnav.mk
@@ -9,7 +9,7 @@ LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)
 LIBDVDNAV_INSTALL_STAGING = YES
 LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf
-LIBDVDNAV_LICENSE = GPLv2+
+LIBDVDNAV_LICENSE = GPL-2.0+
 LIBDVDNAV_LICENSE_FILES = COPYING
 # 0001-do-not-match-nios2-as-os2.patch
 LIBDVDNAV_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libdvdread/libdvdread.mk b/bsp/buildroot/package/libdvdread/libdvdread.mk
index adf79d85..0e335e5c 100644
--- a/bsp/buildroot/package/libdvdread/libdvdread.mk
+++ b/bsp/buildroot/package/libdvdread/libdvdread.mk
@@ -8,7 +8,7 @@ LIBDVDREAD_VERSION = 5.0.3
 LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)
 LIBDVDREAD_INSTALL_STAGING = YES
-LIBDVDREAD_LICENSE = GPLv2+
+LIBDVDREAD_LICENSE = GPL-2.0+
 LIBDVDREAD_LICENSE_FILES = COPYING
 LIBDVDREAD_CONF_OPTS = --with-libdvdcss
 LIBDVDREAD_DEPENDENCIES = libdvdcss host-pkgconf
diff --git a/bsp/buildroot/package/libeXosip2/libeXosip2.mk b/bsp/buildroot/package/libeXosip2/libeXosip2.mk
index d101f954..04f8672c 100644
--- a/bsp/buildroot/package/libeXosip2/libeXosip2.mk
+++ b/bsp/buildroot/package/libeXosip2/libeXosip2.mk
@@ -7,7 +7,7 @@
 LIBEXOSIP2_VERSION = 3.6.0
 LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
 LIBEXOSIP2_INSTALL_STAGING = YES
-LIBEXOSIP2_LICENSE = GPLv2+
+LIBEXOSIP2_LICENSE = GPL-2.0+
 LIBEXOSIP2_LICENSE_FILES = COPYING
 
 LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
diff --git a/bsp/buildroot/package/libebml/libebml.mk b/bsp/buildroot/package/libebml/libebml.mk
index 36c8a5c7..8c5dee3f 100644
--- a/bsp/buildroot/package/libebml/libebml.mk
+++ b/bsp/buildroot/package/libebml/libebml.mk
@@ -8,7 +8,7 @@ LIBEBML_VERSION = 1.3.3
 LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.bz2
 LIBEBML_SITE = http://dl.matroska.org/downloads/libebml
 LIBEBML_INSTALL_STAGING = YES
-LIBEBML_LICENSE = LGPLv2.1+
+LIBEBML_LICENSE = LGPL-2.1+
 LIBEBML_LICENSE_FILES = LICENSE.LGPL
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libebur128/Config.in b/bsp/buildroot/package/libebur128/Config.in
index 1a6a7436..0d68b39d 100644
--- a/bsp/buildroot/package/libebur128/Config.in
+++ b/bsp/buildroot/package/libebur128/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_LIBEBUR128
 	# build system has no support to disable shared linking
 	# leading to a build error with a static-only toolchain
 	depends on !BR2_STATIC_LIBS
-	select BR2_PACKAGE_SPEEX
 	help
 	  libebur128 is a library that implements the EBU R 128 standard
 	  for loudness normalization.
diff --git a/bsp/buildroot/package/libebur128/libebur128.hash b/bsp/buildroot/package/libebur128/libebur128.hash
new file mode 100644
index 00000000..2b0d3e34
--- /dev/null
+++ b/bsp/buildroot/package/libebur128/libebur128.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 1d0d7e855da04010a2432e11fbc596502caf11b61c3b571ccbcb10095fe44b43  libebur128-v1.2.2.tar.gz
+sha256 d6b4754bb67bdd08b97d5d11b2d7434997a371585a78fe77007149df3af8d09c  COPYING
diff --git a/bsp/buildroot/package/libebur128/libebur128.mk b/bsp/buildroot/package/libebur128/libebur128.mk
index f5ada311..24c2f242 100644
--- a/bsp/buildroot/package/libebur128/libebur128.mk
+++ b/bsp/buildroot/package/libebur128/libebur128.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-LIBEBUR128_VERSION = v1.1.0
+LIBEBUR128_VERSION = v1.2.2
 LIBEBUR128_SITE = $(call github,jiixyj,libebur128,$(LIBEBUR128_VERSION))
 LIBEBUR128_LICENSE = MIT
 LIBEBUR128_LICENSE_FILES = COPYING
 LIBEBUR128_INSTALL_STAGING = YES
-LIBEBUR128_DEPENDENCIES = speex
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libedit/Config.in b/bsp/buildroot/package/libedit/Config.in
index 7c850145..8ccf3edc 100644
--- a/bsp/buildroot/package/libedit/Config.in
+++ b/bsp/buildroot/package/libedit/Config.in
@@ -11,8 +11,8 @@ config BR2_PACKAGE_LIBEDIT
 	  http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/
 
 	  Jess Thrysoee maintains an autotoolified package, which we use
-	  in Buildroot as it makes it much simpler than using the upstream
-	  sources which require pmake.
+	  in Buildroot as it makes it much simpler than using the
+	  upstream sources which require pmake.
 
 	  http://www.thrysoee.dk/editline
 
diff --git a/bsp/buildroot/package/libedit/libedit.mk b/bsp/buildroot/package/libedit/libedit.mk
index e7ddd1fc..51ca87d4 100644
--- a/bsp/buildroot/package/libedit/libedit.mk
+++ b/bsp/buildroot/package/libedit/libedit.mk
@@ -8,7 +8,7 @@ LIBEDIT_VERSION = 20150325-3.1
 LIBEDIT_SITE = http://www.thrysoee.dk/editline
 LIBEDIT_INSTALL_STAGING = YES
 LIBEDIT_DEPENDENCIES = ncurses
-LIBEDIT_LICENSE = BSD-3c
+LIBEDIT_LICENSE = BSD-3-Clause
 LIBEDIT_LICENSE_FILES = COPYING
 
 # We're patching configure.ac
diff --git a/bsp/buildroot/package/libee/libee.mk b/bsp/buildroot/package/libee/libee.mk
index 23441bc1..9879eff3 100644
--- a/bsp/buildroot/package/libee/libee.mk
+++ b/bsp/buildroot/package/libee/libee.mk
@@ -6,7 +6,7 @@
 
 LIBEE_VERSION = 0.4.1
 LIBEE_SITE = http://www.libee.org/download/files/download
-LIBEE_LICENSE = LGPLv2.1+
+LIBEE_LICENSE = LGPL-2.1+
 LIBEE_LICENSE_FILES = COPYING
 LIBEE_DEPENDENCIES = libestr host-pkgconf
 LIBEE_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libenca/libenca.mk b/bsp/buildroot/package/libenca/libenca.mk
index b87427a3..63b68950 100644
--- a/bsp/buildroot/package/libenca/libenca.mk
+++ b/bsp/buildroot/package/libenca/libenca.mk
@@ -8,7 +8,7 @@ LIBENCA_VERSION = 1.19
 LIBENCA_SITE = http://dl.cihar.com/enca
 LIBENCA_SOURCE = enca-$(LIBENCA_VERSION).tar.xz
 LIBENCA_INSTALL_STAGING = YES
-LIBENCA_LICENSE = GPLv2
+LIBENCA_LICENSE = GPL-2.0
 LIBENCA_LICENSE_FILES = COPYING
 LIBENCA_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
diff --git a/bsp/buildroot/package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch b/bsp/buildroot/package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch
new file mode 100644
index 00000000..286f875b
--- /dev/null
+++ b/bsp/buildroot/package/libepoxy/0001-Forward-EGL-cflags-into-epoxy.pc.patch
@@ -0,0 +1,32 @@
+From 99b8373dbe8fb3bac835ebad90f91cfd213e4acb Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Wed, 15 Mar 2017 10:02:54 -0300
+Subject: [PATCH] Forward EGL cflags into epoxy.pc
+
+When building mesa egl without x11 and gles2 the headers need a
+MESA_EGL_NO_X11_HEADERS define to avoid including X11 headers.
+Forward EGL CFLAGS into epoxy.pc to avoid build failures when linking
+against libepoxy on this scenario.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+Status: pull request https://github.com/anholt/libepoxy/pull/113
+
+ epoxy.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/epoxy.pc.in b/epoxy.pc.in
+index 7828a77..8278b7d 100644
+--- a/epoxy.pc.in
++++ b/epoxy.pc.in
+@@ -10,6 +10,6 @@ epoxy_has_wgl=@epoxy_has_wgl@
+ Name: epoxy
+ Description: epoxy GL dispatch Library
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${includedir}
++Cflags: -I${includedir} @EGL_CFLAGS@
+ Libs: -L${libdir} -lepoxy
+ Libs.private: @DLOPEN_LIBS@
+-- 
+2.10.2
+
diff --git a/bsp/buildroot/package/libepoxy/0001-select-platforms-based-on-configuration-results.patch b/bsp/buildroot/package/libepoxy/0001-select-platforms-based-on-configuration-results.patch
deleted file mode 100644
index e3a7b499..00000000
--- a/bsp/buildroot/package/libepoxy/0001-select-platforms-based-on-configuration-results.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 6 May 2015 10:45:22 +0200
-Subject: [PATCH 1/4] select platforms based on configuration results
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-Fetched from pull #81 on github for libepoxy:
-https://github.com/anholt/libepoxy/pull/81/commits
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac          | 13 +++++--------
- src/dispatch_common.c |  9 ++++++---
- src/dispatch_common.h |  9 +++++----
- 3 files changed, 16 insertions(+), 15 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2d67726..225ab73 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
- # uintptr_t to a void *") by default.  Kill that.
- XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
- 
-+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
-+
-+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
-+
- has_znow=yes
- 
- case $host_os in
-@@ -86,7 +90,7 @@ case $host_os in
-         ;;
-     *)
-         build_egl=yes
--        build_glx=yes
-+        build_glx=$x11
-         build_wgl=no
-         # On platforms with dlopen, we load everything dynamically and
-         # don't link against a specific window system or GL implementation.
-@@ -144,13 +148,6 @@ esac
- 
- AC_SUBST([VISIBILITY_CFLAGS])
- 
--PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
--if test x$x11 = xno -a x$build_glx = xyes; then
--    AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support])
--fi
--
--AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
--
- PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
- 
- AC_CONFIG_FILES([
-diff --git a/src/dispatch_common.c b/src/dispatch_common.c
-index 013027f..163d348 100644
---- a/src/dispatch_common.c
-+++ b/src/dispatch_common.c
-@@ -656,10 +656,13 @@ epoxy_get_proc_address(const char *name)
- #elif defined(__APPLE__)
-     return epoxy_gl_dlsym(name);
- #else
-+#if PLATFORM_HAS_GLX
-     if (epoxy_current_context_is_glx()) {
-         return glXGetProcAddressARB((const GLubyte *)name);
--    } else {
-+    } else
-+#endif /* PLATFORM_HAS_GLX */
- #if PLATFORM_HAS_EGL
-+    {
-         GLenum egl_api = epoxy_egl_get_current_gl_context_api();
- 
-         switch (egl_api) {
-@@ -669,10 +672,10 @@ epoxy_get_proc_address(const char *name)
-         case EGL_NONE:
-             break;
-         }
--#endif
-     }
-+#endif /* PLATFORM_HAS_EGL */
-     errx(1, "Couldn't find current GLX or EGL context.\n");
--#endif
-+#endif /* _WIN32 | __APPLE__*/
- }
- 
- WRAPPER_VISIBILITY (void)
-diff --git a/src/dispatch_common.h b/src/dispatch_common.h
-index 676a4d5..2728b45 100644
---- a/src/dispatch_common.h
-+++ b/src/dispatch_common.h
-@@ -21,12 +21,13 @@
-  * IN THE SOFTWARE.
-  */
- 
-+#include <config.h>
- #include <stdbool.h>
- 
- #ifdef _WIN32
- #define PLATFORM_HAS_EGL 0
- #define PLATFORM_HAS_GLX 0
--#define PLATFORM_HAS_WGL 1
-+#define PLATFORM_HAS_WGL BUILD_WGL
- #define EPOXY_IMPORTEXPORT __declspec(dllexport)
- #elif defined(__APPLE__)
- #define PLATFORM_HAS_EGL 0
-@@ -34,13 +35,13 @@
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #elif defined(ANDROID)
--#define PLATFORM_HAS_EGL 1
-+#define PLATFORM_HAS_EGL BUILD_EGL
- #define PLATFORM_HAS_GLX 0
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #else
--#define PLATFORM_HAS_EGL 1
--#define PLATFORM_HAS_GLX 1
-+#define PLATFORM_HAS_EGL BUILD_EGL
-+#define PLATFORM_HAS_GLX BUILD_GLX
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #endif
-
diff --git a/bsp/buildroot/package/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/bsp/buildroot/package/libepoxy/0002-add-an-option-to-disable-glx-support.patch
deleted file mode 100644
index a81547de..00000000
--- a/bsp/buildroot/package/libepoxy/0002-add-an-option-to-disable-glx-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a9efde0fb2678cd26bdf26d256732d97ded0c595 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Wed, 6 May 2015 11:05:48 +0200
-Subject: [PATCH 2/4] add an option to disable glx support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-this option would help us in yocto to get deterministic build results
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
-Fetched from pull #81 on github for libepoxy:
-https://github.com/anholt/libepoxy/pull/81/commits
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 225ab73..d3d947c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
- # uintptr_t to a void *") by default.  Kill that.
- XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
- 
--PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no])
-+AC_ARG_ENABLE([glx],
-+                [AS_HELP_STRING([--disable-glx],
-+				[disable if you don't want x11/glx support])],
-+                [],
-+                [enable_glx=yes]
-+             )
-+
-+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
- 
- AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
- 
-
diff --git a/bsp/buildroot/package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch b/bsp/buildroot/package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch
deleted file mode 100644
index 5b0d4fec..00000000
--- a/bsp/buildroot/package/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon, 18 Jan 2016 10:08:44 -0800
-Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows
-
-Followup for anholt/libepoxy#52
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Fetched from pull #81 on github for libepoxy:
-https://github.com/anholt/libepoxy/pull/81/commits
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac          | 6 +++---
- src/dispatch_common.h | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d3d947c..b4c7ede 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
- AC_ARG_ENABLE([glx],
-                 [AS_HELP_STRING([--disable-glx],
- 				[disable if you don't want x11/glx support])],
--                [],
-+                [enable_glx=$enableval],
-                 [enable_glx=yes]
-              )
- 
-@@ -74,7 +74,7 @@ has_znow=yes
- case $host_os in
-     mingw*)
-         build_egl=no
--        build_glx=no
-+        build_glx=$x11
-         build_wgl=yes
-         # On windows, the DLL has to have all of its functions
-         # resolved at link time, so we have to link directly aginst
-@@ -89,7 +89,7 @@ case $host_os in
-         ;;
-     darwin*)
-         build_egl=no
--        build_glx=no
-+        build_glx=$x11
-         build_wgl=no
-         build_apple=yes
-         has_znow=no
-diff --git a/src/dispatch_common.h b/src/dispatch_common.h
-index 2728b45..c30ce44 100644
---- a/src/dispatch_common.h
-+++ b/src/dispatch_common.h
-@@ -26,12 +26,12 @@
- 
- #ifdef _WIN32
- #define PLATFORM_HAS_EGL 0
--#define PLATFORM_HAS_GLX 0
-+#define PLATFORM_HAS_GLX BUILD_GLX
- #define PLATFORM_HAS_WGL BUILD_WGL
- #define EPOXY_IMPORTEXPORT __declspec(dllexport)
- #elif defined(__APPLE__)
- #define PLATFORM_HAS_EGL 0
--#define PLATFORM_HAS_GLX 0
-+#define PLATFORM_HAS_GLX BUILD_GLX
- #define PLATFORM_HAS_WGL 0
- #define EPOXY_IMPORTEXPORT
- #elif defined(ANDROID)
-
diff --git a/bsp/buildroot/package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch b/bsp/buildroot/package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch
deleted file mode 100644
index be9b009f..00000000
--- a/bsp/buildroot/package/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From d010922282580a32dfebcda12ee1c307b3ef6005 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Mon, 18 Jan 2016 09:49:55 -0800
-Subject: [PATCH 4/4] darwin: Use GLX instead of OpenGL.framework if it is the
- current context
-
-Also makes a stab at similar support for Win32
-
-anholt/libepoxy#63
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Fetched from pull #81 on github for libepoxy:
-https://github.com/anholt/libepoxy/pull/81/commits
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- src/dispatch_common.c | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/src/dispatch_common.c b/src/dispatch_common.c
-index 163d348..cb9f76a 100644
---- a/src/dispatch_common.c
-+++ b/src/dispatch_common.c
-@@ -482,16 +482,20 @@ epoxy_glx_dlsym(const char *name)
- void *
- epoxy_gl_dlsym(const char *name)
- {
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__APPLE__)
-+if (!epoxy_current_context_is_glx()) {
-+# if defined(_WIN32)
-     return do_dlsym(&api.gl_handle, "OPENGL32", name, true);
--#elif defined(__APPLE__)
-+# elif defined(__APPLE__)
-     return do_dlsym(&api.gl_handle,
-                     "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",
-                     name, true);
--#else
-+# endif
-+}
-+#endif
-+
-     /* There's no library for desktop GL support independent of GLX. */
-     return epoxy_glx_dlsym(name);
--#endif
- }
- 
- void *
-@@ -615,7 +619,7 @@ epoxy_get_bootstrap_proc_address(const char *name)
-      */
- #if PLATFORM_HAS_GLX
-     if (api.glx_handle && glXGetCurrentContext())
--        return epoxy_gl_dlsym(name);
-+        return epoxy_glx_dlsym(name);
- #endif
- 
-     /* If epoxy hasn't loaded any API-specific library yet, try to
-@@ -644,22 +648,17 @@ epoxy_get_bootstrap_proc_address(const char *name)
-     }
- #endif /* PLATFORM_HAS_EGL */
- 
--    /* Fall back to GLX */
-+    /* Fall back to the platform default */
-     return epoxy_gl_dlsym(name);
- }
- 
- void *
- epoxy_get_proc_address(const char *name)
- {
--#ifdef _WIN32
--    return wglGetProcAddress(name);
--#elif defined(__APPLE__)
--    return epoxy_gl_dlsym(name);
--#else
- #if PLATFORM_HAS_GLX
-     if (epoxy_current_context_is_glx()) {
-         return glXGetProcAddressARB((const GLubyte *)name);
--    } else
-+    }
- #endif /* PLATFORM_HAS_GLX */
- #if PLATFORM_HAS_EGL
-     {
-@@ -674,8 +673,12 @@ epoxy_get_proc_address(const char *name)
-         }
-     }
- #endif /* PLATFORM_HAS_EGL */
-+#if defined(_WIN32)
-+    return wglGetProcAddress(name);
-+#elif defined(__APPLE__)
-+    return epoxy_gl_dlsym(name);
-+#endif
-     errx(1, "Couldn't find current GLX or EGL context.\n");
--#endif /* _WIN32 | __APPLE__*/
- }
- 
- WRAPPER_VISIBILITY (void)
diff --git a/bsp/buildroot/package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch b/bsp/buildroot/package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch
deleted file mode 100644
index d13f01de..00000000
--- a/bsp/buildroot/package/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 68e5f1574758240aedfe8653d7aaae62cdb08bf5 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Sun, 20 Dec 2015 10:07:06 -0300
-Subject: [PATCH] Forward egl cflags into epoxy.pc
-
-When building mesa egl without x11 and gles2 the headers need a
-MESA_EGL_NO_X11_HEADERS define, so put them in epoxy.pc as well since
-otherwise builds will fail.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Status: pull request https://github.com/anholt/libepoxy/pull/80
-
- configure.ac | 2 ++
- epoxy.pc.in  | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index c7cffb2..7b599de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,6 +102,8 @@ if test x$build_egl = xyes; then
-     AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
- fi
- 
-+AC_SUBST(EGL_CFLAGS)
-+
- PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no])
- if test x$gl = xno; then
-     build_glx=no
-diff --git a/epoxy.pc.in b/epoxy.pc.in
-index 8c85a33..f377da5 100644
---- a/epoxy.pc.in
-+++ b/epoxy.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: epoxy
- Description: epoxy GL dispatch Library
- Version: @PACKAGE_VERSION@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} @EGL_CFLAGS@
- Libs: -L${libdir} -lepoxy
- Libs.private: @DLOPEN_LIBS@
--- 
-2.4.10
-
diff --git a/bsp/buildroot/package/libepoxy/0006-Make-egl-conditional.patch b/bsp/buildroot/package/libepoxy/0006-Make-egl-conditional.patch
deleted file mode 100644
index 752e8e4f..00000000
--- a/bsp/buildroot/package/libepoxy/0006-Make-egl-conditional.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 5492e81f317e48141b0687ad77252c52c2dfcd6d Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Fri, 5 Feb 2016 19:03:39 -0300
-Subject: [PATCH] Make egl conditional
-
-Mesa can be built with GLX and without EGL support, so make this
-possible in epoxy as well.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6e56599..21e3a25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,6 +58,13 @@ AC_CHECK_HEADER([KHR/khrplatform.h],
- # uintptr_t to a void *") by default.  Kill that.
- XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
- 
-+AC_ARG_ENABLE([egl],
-+		[AS_HELP_STRING([--disable-egl],
-+				[disable if you don't want egl support])],
-+		[enable_egl=$enableval],
-+		[enable_egl=yes]
-+             )
-+
- AC_ARG_ENABLE([glx],
-                 [AS_HELP_STRING([--disable-glx],
- 				[disable if you don't want x11/glx support])],
-@@ -65,6 +72,7 @@ AC_ARG_ENABLE([glx],
-                 [enable_glx=yes]
-              )
- 
-+PKG_CHECK_MODULES(EGL, [egl], [egl=$enable_egl], [egl=no])
- PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no])
- 
- AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes)
-@@ -96,7 +104,7 @@ case $host_os in
-         EPOXY_LINK_LIBS=""
-         ;;
-     *)
--        build_egl=yes
-+        build_egl=$egl
-         build_glx=$x11
-         build_wgl=no
-         # On platforms with dlopen, we load everything dynamically and
-@@ -109,7 +117,6 @@ AC_SUBST(EPOXY_LINK_LIBS)
- 
- AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
- if test x$build_egl = xyes; then
--    PKG_CHECK_MODULES(EGL, [egl])
-     AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
- fi
- 
--- 
-2.4.10
-
diff --git a/bsp/buildroot/package/libepoxy/Config.in b/bsp/buildroot/package/libepoxy/Config.in
index c87366af..9da190b8 100644
--- a/bsp/buildroot/package/libepoxy/Config.in
+++ b/bsp/buildroot/package/libepoxy/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBEPOXY
 	bool "libepoxy"
-	select BR2_PACKAGE_XUTIL_UTIL_MACROS
 	depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL
+	select BR2_PACKAGE_XUTIL_UTIL_MACROS
 	help
 	  Epoxy is a library for handling OpenGL function pointer
 	  management for you.
diff --git a/bsp/buildroot/package/libepoxy/libepoxy.hash b/bsp/buildroot/package/libepoxy/libepoxy.hash
index cb35cd40..d7ebec5b 100644
--- a/bsp/buildroot/package/libepoxy/libepoxy.hash
+++ b/bsp/buildroot/package/libepoxy/libepoxy.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4  libepoxy-v1.3.1.tar.gz
+# From ftp://ftp.gnome.org/pub/GNOME/sources/libepoxy/1.4/libepoxy-1.4.3.sha256sum
+sha256 0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6  libepoxy-1.4.3.tar.xz
diff --git a/bsp/buildroot/package/libepoxy/libepoxy.mk b/bsp/buildroot/package/libepoxy/libepoxy.mk
index 1dd583e3..366cc113 100644
--- a/bsp/buildroot/package/libepoxy/libepoxy.mk
+++ b/bsp/buildroot/package/libepoxy/libepoxy.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LIBEPOXY_VERSION = v1.3.1
-LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION))
+LIBEPOXY_VERSION_MAJOR = 1.4
+LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).3
+LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR)
+LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz
 LIBEPOXY_INSTALL_STAGING = YES
-# For patches 0001-0006:
-LIBEPOXY_AUTORECONF = YES
 LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
 LIBEPOXY_LICENSE = MIT
 LIBEPOXY_LICENSE_FILES = COPYING
diff --git a/bsp/buildroot/package/liberation/liberation.mk b/bsp/buildroot/package/liberation/liberation.mk
index a77c014a..cabee172 100644
--- a/bsp/buildroot/package/liberation/liberation.mk
+++ b/bsp/buildroot/package/liberation/liberation.mk
@@ -8,7 +8,7 @@ LIBERATION_VERSION = 2.00.1
 LIBERATION_SITE = https://releases.pagure.org/liberation-fonts
 LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz
 LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation
-LIBERATION_LICENSE = OFLv1.1
+LIBERATION_LICENSE = OFL-1.1
 LIBERATION_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_LIBERATION_MONO),y)
diff --git a/bsp/buildroot/package/libesmtp/Config.in b/bsp/buildroot/package/libesmtp/Config.in
index ba9d5275..f3ed521d 100644
--- a/bsp/buildroot/package/libesmtp/Config.in
+++ b/bsp/buildroot/package/libesmtp/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBESMTP
 	help
 	  Library for sending emails through SMTP.
 
-	  http://www.stafford.uklinux.net/libesmtp
+	  http://brianstafford.info/libesmtp
 
 comment "libesmtp needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libesmtp/libesmtp.mk b/bsp/buildroot/package/libesmtp/libesmtp.mk
index cad2e27d..9c336793 100644
--- a/bsp/buildroot/package/libesmtp/libesmtp.mk
+++ b/bsp/buildroot/package/libesmtp/libesmtp.mk
@@ -6,11 +6,11 @@
 
 LIBESMTP_VERSION = 1.0.6
 LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2
-LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp
+LIBESMTP_SITE = http://brianstafford.info/libesmtp
 LIBESMTP_INSTALL_STAGING = YES
 LIBESMTP_CONFIG_SCRIPTS = libesmtp-config
 LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl)
-LIBESMTP_LICENSE = GPLv2+ (examples), LGPLv2.1+ (library)
+LIBESMTP_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library)
 LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libestr/libestr.mk b/bsp/buildroot/package/libestr/libestr.mk
index e9783d33..dcd20947 100644
--- a/bsp/buildroot/package/libestr/libestr.mk
+++ b/bsp/buildroot/package/libestr/libestr.mk
@@ -6,7 +6,7 @@
 
 LIBESTR_VERSION = 0.1.10
 LIBESTR_SITE = http://libestr.adiscon.com/files/download
-LIBESTR_LICENSE = LGPLv2.1+
+LIBESTR_LICENSE = LGPL-2.1+
 LIBESTR_LICENSE_FILES = COPYING
 LIBESTR_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libev/libev.hash b/bsp/buildroot/package/libev/libev.hash
index 7f029df7..d3b7bb5c 100644
--- a/bsp/buildroot/package/libev/libev.hash
+++ b/bsp/buildroot/package/libev/libev.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	736079e8ac543c74d59af73f9c52737b3bfec9601f020bf25a87a4f4d0f01bd6	libev-4.22.tar.gz
+sha256 973593d3479abdf657674a55afe5f78624b0e440614e2b8cb3a07f16d4d7f821  libev-4.24.tar.gz
diff --git a/bsp/buildroot/package/libev/libev.mk b/bsp/buildroot/package/libev/libev.mk
index 8925a626..5d9020cd 100644
--- a/bsp/buildroot/package/libev/libev.mk
+++ b/bsp/buildroot/package/libev/libev.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBEV_VERSION = 4.22
+LIBEV_VERSION = 4.24
 LIBEV_SITE = http://dist.schmorp.de/libev/Attic
 LIBEV_INSTALL_STAGING = YES
-LIBEV_LICENSE = BSD-2c or GPLv2+
+LIBEV_LICENSE = BSD-2-Clause or GPL-2.0+
 LIBEV_LICENSE_FILES = LICENSE
 
 # The 'compatibility' event.h header conflicts with libevent
diff --git a/bsp/buildroot/package/libevdev/libevdev.hash b/bsp/buildroot/package/libevdev/libevdev.hash
index 613866cf..0702a7b0 100644
--- a/bsp/buildroot/package/libevdev/libevdev.hash
+++ b/bsp/buildroot/package/libevdev/libevdev.hash
@@ -1,2 +1,5 @@
-# Hash from https://lists.freedesktop.org/archives/input-tools/2017-January/001380.html
-sha256 ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 libevdev-1.5.6.tar.xz
+# From https://lists.freedesktop.org/archives/input-tools/2018-January/001447.html
+md5 c25a8c3939e4ad59a5e9e5e1e354832d libevdev-1.5.8.tar.xz
+sha1 a60e7a43570cdbc64af5adf99ca80023d21a1174 libevdev-1.5.8.tar.xz
+sha256 6083d81e46609da8ba80cb826c02d9080764a6dec33c8267ccb7e158833d4c6d libevdev-1.5.8.tar.xz
+sha512 e9485d8c6b48ebf762b32b003bc6b761c548024ad3bc34a0793485b53383746881fcc9b206a078d571937291e519d9822e50c5d8816778d347094691b65ec3fa libevdev-1.5.8.tar.xz
diff --git a/bsp/buildroot/package/libevdev/libevdev.mk b/bsp/buildroot/package/libevdev/libevdev.mk
index 01ee7fba..1893863e 100644
--- a/bsp/buildroot/package/libevdev/libevdev.mk
+++ b/bsp/buildroot/package/libevdev/libevdev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBEVDEV_VERSION = 1.5.6
+LIBEVDEV_VERSION = 1.5.8
 LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev
 LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz
 LIBEVDEV_LICENSE = X11
diff --git a/bsp/buildroot/package/libevent/libevent.mk b/bsp/buildroot/package/libevent/libevent.mk
index 50e48915..65bf1c2b 100644
--- a/bsp/buildroot/package/libevent/libevent.mk
+++ b/bsp/buildroot/package/libevent/libevent.mk
@@ -7,7 +7,7 @@
 LIBEVENT_VERSION = 2.1.8-stable
 LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION)
 LIBEVENT_INSTALL_STAGING = YES
-LIBEVENT_LICENSE = BSD-3c, OpenBSD
+LIBEVENT_LICENSE = BSD-3-Clause, OpenBSD
 LIBEVENT_LICENSE_FILES = LICENSE
 # For 0001-Disable-building-test-programs.patch
 LIBEVENT_AUTORECONF = YES
@@ -24,8 +24,8 @@ ifneq ($(BR2_PACKAGE_PYTHON),y)
 LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBEVENT_DEPENDENCIES += host-pkgconf openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+LIBEVENT_DEPENDENCIES += host-pkgconf libopenssl
 LIBEVENT_CONF_OPTS += --enable-openssl
 else
 LIBEVENT_CONF_OPTS += --disable-openssl
diff --git a/bsp/buildroot/package/libexif/libexif.mk b/bsp/buildroot/package/libexif/libexif.mk
index a71c1173..a4ec5ed3 100644
--- a/bsp/buildroot/package/libexif/libexif.mk
+++ b/bsp/buildroot/package/libexif/libexif.mk
@@ -9,7 +9,7 @@ LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2
 LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION)
 LIBEXIF_INSTALL_STAGING = YES
 LIBEXIF_DEPENDENCIES = host-pkgconf
-LIBEXIF_LICENSE = LGPLv2.1+
+LIBEXIF_LICENSE = LGPL-2.1+
 LIBEXIF_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libfastjson/Config.in b/bsp/buildroot/package/libfastjson/Config.in
index fbc9b1d6..a3a7c809 100644
--- a/bsp/buildroot/package/libfastjson/Config.in
+++ b/bsp/buildroot/package/libfastjson/Config.in
@@ -10,7 +10,8 @@ config BR2_PACKAGE_LIBFASTJSON
 	  Its aim is to provide:
 
 	  - a small library with essential json handling functions
-	  - sufficiently good json support (not 100% standards compliant)
+	  - sufficiently good json support (not 100% standards
+	    compliant)
 	  - be very fast in processing
 
 	  https://github.com/rsyslog/libfastjson/
diff --git a/bsp/buildroot/package/libfcgi/libfcgi.mk b/bsp/buildroot/package/libfcgi/libfcgi.mk
index ced850c1..78da7729 100644
--- a/bsp/buildroot/package/libfcgi/libfcgi.mk
+++ b/bsp/buildroot/package/libfcgi/libfcgi.mk
@@ -7,7 +7,7 @@
 LIBFCGI_VERSION = 2.4.0
 LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
 LIBFCGI_SITE = http://www.fastcgi.com/dist
-LIBFCGI_LICENSE = fcgi license
+LIBFCGI_LICENSE = OML
 LIBFCGI_LICENSE_FILES = LICENSE.TERMS
 LIBFCGI_INSTALL_STAGING = YES
 LIBFCGI_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libffi/libffi.hash b/bsp/buildroot/package/libffi/libffi.hash
index 63a9203f..0153f7e3 100644
--- a/bsp/buildroot/package/libffi/libffi.hash
+++ b/bsp/buildroot/package/libffi/libffi.hash
@@ -1,2 +1,4 @@
 # From ftp://sourceware.org/pub/libffi/sha512.sum
 sha512	980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483  libffi-3.2.1.tar.gz
+# License files, locally calculated
+sha256	0f4d7a0bfb83c37465d42dc305f124189196cc0cc2cc8d6f8461103682aebbc5  LICENSE
diff --git a/bsp/buildroot/package/libffi/libffi.mk b/bsp/buildroot/package/libffi/libffi.mk
index 38ef2d60..32e01e9c 100644
--- a/bsp/buildroot/package/libffi/libffi.mk
+++ b/bsp/buildroot/package/libffi/libffi.mk
@@ -14,13 +14,13 @@ LIBFFI_AUTORECONF = YES
 # Move the headers to the usual location, and adjust the .pc file
 # accordingly.
 define LIBFFI_MOVE_HEADERS
-	mv $(1)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/usr/include/
+	mv $(1)/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/include/
 	$(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \
-		$(1)/usr/lib/pkgconfig/libffi.pc
-	rm -rf $(1)/usr/lib/libffi-*
+		$(1)/lib/pkgconfig/libffi.pc
+	rm -rf $(1)/lib/libffi-*
 endef
 
-LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR))
+LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR)/usr)
 LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS
 
 HOST_LIBFFI_MOVE_HOST_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(HOST_DIR))
diff --git a/bsp/buildroot/package/libfm-extra/Config.in b/bsp/buildroot/package/libfm-extra/Config.in
index 79465f97..eefc022c 100644
--- a/bsp/buildroot/package/libfm-extra/Config.in
+++ b/bsp/buildroot/package/libfm-extra/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBFM_EXTRA
 	bool "libfm-extra"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  The libfm-extra package contains a library and other files
 	  required by menu-cache-gen libexec of menu-cache
diff --git a/bsp/buildroot/package/libfm-extra/libfm-extra.mk b/bsp/buildroot/package/libfm-extra/libfm-extra.mk
index 0e7a7dc0..67d6dc12 100644
--- a/bsp/buildroot/package/libfm-extra/libfm-extra.mk
+++ b/bsp/buildroot/package/libfm-extra/libfm-extra.mk
@@ -8,7 +8,7 @@ LIBFM_EXTRA_VERSION = 1.2.4
 LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz
 LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files
 LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool
-LIBFM_EXTRA_LICENSE = GPLv2+, LGPLv2.1+
+LIBFM_EXTRA_LICENSE = GPL-2.0+, LGPL-2.1+
 LIBFM_EXTRA_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
 LIBFM_EXTRA_INSTALL_STAGING = YES
 LIBFM_EXTRA_CONF_OPTS = --with-extra-only --with-gtk=no
diff --git a/bsp/buildroot/package/libfm/Config.in b/bsp/buildroot/package/libfm/Config.in
index 0463d1c5..81f2e100 100644
--- a/bsp/buildroot/package/libfm/Config.in
+++ b/bsp/buildroot/package/libfm/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_LIBFM
 	bool "libfm"
-	select BR2_PACKAGE_MENU_CACHE
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
-	select BR2_PACKAGE_CAIRO
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_INSTALL_LIBSTDCPP # libgtk2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
+	select BR2_PACKAGE_MENU_CACHE
 	help
 	  A glib/gio-based library providing some file management
 	  utilities and related-widgets missing in gtk+/glib. This is
diff --git a/bsp/buildroot/package/libfm/libfm.hash b/bsp/buildroot/package/libfm/libfm.hash
index 8a78adeb..69c4c31f 100644
--- a/bsp/buildroot/package/libfm/libfm.hash
+++ b/bsp/buildroot/package/libfm/libfm.hash
@@ -1,3 +1,3 @@
 # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
-md5	74997d75e7e87dc73398746fd373bf52	libfm-1.2.4.tar.xz
-sha1	2f8183389c8e74edb15c6c8ab260df5dd39f3b2d	libfm-1.2.4.tar.xz
+md5 a1ba9ae5e920f38b647dd511edd6c807  libfm-1.2.5.tar.xz
+sha1 5887aa4e85ee0964e7da67368136849957afd5d6  libfm-1.2.5.tar.xz
diff --git a/bsp/buildroot/package/libfm/libfm.mk b/bsp/buildroot/package/libfm/libfm.mk
index 633a844d..c49cd3e6 100644
--- a/bsp/buildroot/package/libfm/libfm.mk
+++ b/bsp/buildroot/package/libfm/libfm.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LIBFM_VERSION = 1.2.4
+LIBFM_VERSION = 1.2.5
 LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz
 LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files
 LIBFM_DEPENDENCIES = menu-cache libglib2 cairo
-LIBFM_LICENSE = GPLv2+, LGPLv2.1+
+LIBFM_LICENSE = GPL-2.0+, LGPL-2.1+
 LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
 LIBFM_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libfreefare/libfreefare.mk b/bsp/buildroot/package/libfreefare/libfreefare.mk
index e2d7bf12..13e6f2ad 100644
--- a/bsp/buildroot/package/libfreefare/libfreefare.mk
+++ b/bsp/buildroot/package/libfreefare/libfreefare.mk
@@ -10,7 +10,7 @@ LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2
 # the same as the one uploaded by upstream for the release.
 LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION)
 LIBFREEFARE_DEPENDENCIES = libnfc openssl
-LIBFREEFARE_LICENSE = LGPLv3+ with exception
+LIBFREEFARE_LICENSE = LGPL-3.0+ with exception
 LIBFREEFARE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/libfreeglut/Config.in b/bsp/buildroot/package/libfreeglut/Config.in
index e09e7efe..ccb2d5cd 100644
--- a/bsp/buildroot/package/libfreeglut/Config.in
+++ b/bsp/buildroot/package/libfreeglut/Config.in
@@ -1,17 +1,17 @@
 config BR2_PACKAGE_LIBFREEGLUT
 	bool "libfreeglut"
+	depends on BR2_PACKAGE_HAS_LIBGL
+	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBGLU
 	select BR2_PACKAGE_XLIB_LIBXI
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 	select BR2_PACKAGE_XLIB_LIBXXF86VM
-	depends on BR2_PACKAGE_HAS_LIBGL
-	depends on BR2_PACKAGE_XORG7
 	help
 	  FreeGLUT is a free-software/open-source alternative to the
 	  OpenGL Utility Toolkit (GLUT) library. GLUT (and hence
-	  FreeGLUT) takes care of all the system-specific chores required
-	  for creating windows, initializing OpenGL contexts, and
-	  handling input events, to allow for trully portable OpenGL
+	  FreeGLUT) takes care of all the system-specific chores
+	  required for creating windows, initializing OpenGL contexts,
+	  and handling input events, to allow for trully portable OpenGL
 	  programs.
 
 	  http://freeglut.sourceforge.net
diff --git a/bsp/buildroot/package/libfreeimage/libfreeimage.mk b/bsp/buildroot/package/libfreeimage/libfreeimage.mk
index fe79689f..0ca23933 100644
--- a/bsp/buildroot/package/libfreeimage/libfreeimage.mk
+++ b/bsp/buildroot/package/libfreeimage/libfreeimage.mk
@@ -7,7 +7,7 @@
 LIBFREEIMAGE_VERSION = 3.17.0
 LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage
 LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip
-LIBFREEIMAGE_LICENSE = GPLv2 or GPLv3 or FreeImage Public License
+LIBFREEIMAGE_LICENSE = GPL-2.0 or GPL-3.0 or FreeImage Public License
 LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt
 LIBFREEIMAGE_INSTALL_STAGING = YES
 
@@ -30,4 +30,3 @@ define LIBFREEIMAGE_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/bsp/buildroot/package/libfribidi/libfribidi.mk b/bsp/buildroot/package/libfribidi/libfribidi.mk
index 751a1b60..a7a85191 100644
--- a/bsp/buildroot/package/libfribidi/libfribidi.mk
+++ b/bsp/buildroot/package/libfribidi/libfribidi.mk
@@ -7,7 +7,7 @@
 LIBFRIBIDI_VERSION = 0.19.7
 LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2
 LIBFRIBIDI_SITE = http://www.fribidi.org/download
-LIBFRIBIDI_LICENSE = LGPLv2.1+
+LIBFRIBIDI_LICENSE = LGPL-2.1+
 LIBFRIBIDI_LICENSE_FILES = COPYING
 LIBFRIBIDI_INSTALL_STAGING = YES
 # Ships a beta libtool version hence our patch doesn't apply.
diff --git a/bsp/buildroot/package/libftdi1/Config.in b/bsp/buildroot/package/libftdi1/Config.in
index aca797b6..d4732134 100644
--- a/bsp/buildroot/package/libftdi1/Config.in
+++ b/bsp/buildroot/package/libftdi1/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBFTDI1
 	bool "libftdi1"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Userspace access to FTDI USB interface chips (version 1.x)
 
@@ -11,10 +11,10 @@ if BR2_PACKAGE_LIBFTDI1
 
 config BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1
 	bool "libftdipp1"
-	select BR2_PACKAGE_BOOST
 	depends on BR2_INSTALL_LIBSTDCPP # boost
 	depends on BR2_TOOLCHAIN_HAS_THREADS # boost
 	depends on BR2_USE_WCHAR # boost
+	select BR2_PACKAGE_BOOST
 	help
 	  C++ bindings for libftdi
 
@@ -28,8 +28,8 @@ config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS
 	  Python bindings for libftdi
 
 config BR2_PACKAGE_LIBFTDI1_FDTI_EEPROM
-	select BR2_PACKAGE_LIBCONFUSE
 	bool "ftdi_eeprom tool"
+	select BR2_PACKAGE_LIBCONFUSE
 
 endif # BR2_PACKAGE_LIBFTDI1
 
diff --git a/bsp/buildroot/package/libftdi1/libftdi1.hash b/bsp/buildroot/package/libftdi1/libftdi1.hash
index 0a891824..40512a7f 100644
--- a/bsp/buildroot/package/libftdi1/libftdi1.hash
+++ b/bsp/buildroot/package/libftdi1/libftdi1.hash
@@ -1,2 +1,3 @@
-# Locally computed (after checking the signature from http://www.intra2net.com/en/developer/libftdi/download.php)
-sha256  9a8c95c94bfbcf36584a0a58a6e2003d9b133213d9202b76aec76302ffaa81f4  libftdi1-1.3.tar.bz2
+# Locally computed after checking the signature
+# https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2.sig
+sha256  ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74  libftdi1-1.4.tar.bz2
diff --git a/bsp/buildroot/package/libftdi1/libftdi1.mk b/bsp/buildroot/package/libftdi1/libftdi1.mk
index 26aa293b..c45c83a7 100644
--- a/bsp/buildroot/package/libftdi1/libftdi1.mk
+++ b/bsp/buildroot/package/libftdi1/libftdi1.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBFTDI1_VERSION = 1.3
+LIBFTDI1_VERSION = 1.4
 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2
 LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download
 LIBFTDI1_INSTALL_STAGING = YES
 LIBFTDI1_DEPENDENCIES = libusb
-LIBFTDI1_LICENSE = LGPLv2 (libftdi1), GPLv2 with exception (ftdipp1)
+LIBFTDI1_LICENSE = LGPL-2.0 (libftdi1), GPL-2.0 with exception (ftdipp1)
 LIBFTDI1_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LIB
 LIBFTDI1_CONF_OPTS = -DDOCUMENTATION=OFF -DEXAMPLES=OFF
 
@@ -28,9 +28,8 @@ LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_LIBFTDI1_FDTI_EEPROM),y)
-# ftdi_eeprom optionally depends on libintl, so make sure gettext is built
-# _before_ libfitdi1 when gettext is enbaled.
-LIBFTDI1_DEPENDENCIES += libconfuse $(if $(BR2_PACKAGE_GETTEXT),gettext)
+# ftdi_eeprom optionally depends on libintl
+LIBFTDI1_DEPENDENCIES += libconfuse $(TARGET_NLS_DEPENDENCIES)
 LIBFTDI1_CONF_OPTS += -DFTDI_EEPROM=ON
 else
 LIBFTDI1_CONF_OPTS += -DFTDI_EEPROM=OFF
diff --git a/bsp/buildroot/package/libfuse/libfuse.hash b/bsp/buildroot/package/libfuse/libfuse.hash
index 60bdf639..3d1b9730 100644
--- a/bsp/buildroot/package/libfuse/libfuse.hash
+++ b/bsp/buildroot/package/libfuse/libfuse.hash
@@ -1,2 +1,6 @@
 # Locally calculated after checking pgp signature
-sha256	832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874	fuse-2.9.7.tar.gz
+sha256	5e84f81d8dd527ea74f39b6bc001c874c02bad6871d7a9b0c14efb57430eafe3	fuse-2.9.8.tar.gz
+
+# Hash for license files:
+sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING.LIB
diff --git a/bsp/buildroot/package/libfuse/libfuse.mk b/bsp/buildroot/package/libfuse/libfuse.mk
index 57aabcd9..e8a79a31 100644
--- a/bsp/buildroot/package/libfuse/libfuse.mk
+++ b/bsp/buildroot/package/libfuse/libfuse.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBFUSE_VERSION = 2.9.7
+LIBFUSE_VERSION = 2.9.8
 LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz
 LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION)
-LIBFUSE_LICENSE = GPLv2, LGPLv2.1
+LIBFUSE_LICENSE = GPL-2.0, LGPL-2.1
 LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB
 LIBFUSE_INSTALL_STAGING = YES
 LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
diff --git a/bsp/buildroot/package/libg7221/libg7221.hash b/bsp/buildroot/package/libg7221/libg7221.hash
new file mode 100644
index 00000000..d1472a6c
--- /dev/null
+++ b/bsp/buildroot/package/libg7221/libg7221.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 330dafa58d37a585a866167bc33f8fbe06dbcfc9a69cad43fab0b6702ebf2393  libg7221-dbfc29d4806ecdace50379a2f4d68a992a6fec34.tar.gz
diff --git a/bsp/buildroot/package/libgcrypt/libgcrypt.hash b/bsp/buildroot/package/libgcrypt/libgcrypt.hash
index 56a45c53..dce65229 100644
--- a/bsp/buildroot/package/libgcrypt/libgcrypt.hash
+++ b/bsp/buildroot/package/libgcrypt/libgcrypt.hash
@@ -1,3 +1,6 @@
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000426.html
+sha1 13bd2ce69e59ab538e959911dfae80ea309636e3  libgcrypt-1.8.3.tar.bz2
 # Locally calculated after checking signature
-# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.7.9.tar.bz2.sig
-sha256  bfe9bb703c1126c3647da2810fd23039c2f09d46969f71612c2065dc3fa9373b  libgcrypt-1.7.9.tar.bz2
+# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.8.3.tar.bz2.sig
+sha256  66ec90be036747602f2b48f98312361a9180c97c68a690a5f376fa0f67d0af7c  libgcrypt-1.8.3.tar.bz2
+sha256  ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532  COPYING.LIB
diff --git a/bsp/buildroot/package/libgcrypt/libgcrypt.mk b/bsp/buildroot/package/libgcrypt/libgcrypt.mk
index 0e428a78..f25944da 100644
--- a/bsp/buildroot/package/libgcrypt/libgcrypt.mk
+++ b/bsp/buildroot/package/libgcrypt/libgcrypt.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBGCRYPT_VERSION = 1.7.9
+LIBGCRYPT_VERSION = 1.8.3
 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2
-LIBGCRYPT_LICENSE = LGPLv2.1+
+LIBGCRYPT_LICENSE = LGPL-2.1+
 LIBGCRYPT_LICENSE_FILES = COPYING.LIB
 LIBGCRYPT_SITE = https://gnupg.org/ftp/gcrypt/libgcrypt
 LIBGCRYPT_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch b/bsp/buildroot/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch
deleted file mode 100644
index db67d467..00000000
--- a/bsp/buildroot/package/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From daf96b07c02734dceaf3c3b78c10e4e758b74d9e Mon Sep 17 00:00:00 2001
-From: Sergio Prado <sergio.prado@e-labworks.com>
-Date: Fri, 18 Dec 2015 15:08:58 -0200
-Subject: [PATCH 1/1] Fix compile error when cross-compiling.
-
-When cross-compiling with libjpeg enabled, we can get errors like the
-following when linking:
-
-sh-linux-gnu-gcc: ERROR: unsafe header/library path used in
-cross-compilation: '/lib'
-
-That's because there is an error in the configure script that are not
-generating ldflags correctly, and are trying to link with -L/lib.
-
-Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 772d5fc9d87a..58d55ade48e3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -223,7 +223,7 @@ AC_ARG_WITH([libjpeg],
-         jpeg_ok=no)
-       AC_MSG_RESULT($jpeg_ok)
-       if test "$jpeg_ok" = yes; then
--        JPEG='jpeg'; LIBJPEG='-L${libjpeg_prefix}/lib -ljpeg'
-+        JPEG='jpeg'; LIBJPEG="-L${libjpeg_prefix}/lib -ljpeg"
-       else
-         AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
-       fi
---
-1.9.1
-
diff --git a/bsp/buildroot/package/libgdiplus/Config.in b/bsp/buildroot/package/libgdiplus/Config.in
index 68625031..6ddf44fd 100644
--- a/bsp/buildroot/package/libgdiplus/Config.in
+++ b/bsp/buildroot/package/libgdiplus/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_LIBGDIPLUS
 	bool "libgdiplus"
-	select BR2_PACKAGE_XLIB_LIBXFT
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_CAIRO
-	select BR2_PACKAGE_LIBPNG
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # libglib2 -> gettext
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_XLIB_LIBXFT
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_CAIRO
+	select BR2_PACKAGE_LIBPNG
 	help
 	  An Open Source implementation of the GDI+ API.
 
diff --git a/bsp/buildroot/package/libgdiplus/libgdiplus.hash b/bsp/buildroot/package/libgdiplus/libgdiplus.hash
index f7fdcb58..740fefd9 100644
--- a/bsp/buildroot/package/libgdiplus/libgdiplus.hash
+++ b/bsp/buildroot/package/libgdiplus/libgdiplus.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 98f8a8e58ed22e136c4ac6eaafbc860757f5a97901ecc0ea357e2b6e4cfa2be5 libgdiplus-4.2.tar.gz
+sha256 ce31da0c6952c8fd160813dfa9bf4a9a871bfe7284e9e3abff9a8ee689acfe58 libgdiplus-5.4.tar.gz
diff --git a/bsp/buildroot/package/libgdiplus/libgdiplus.mk b/bsp/buildroot/package/libgdiplus/libgdiplus.mk
index aac859f8..eb185857 100644
--- a/bsp/buildroot/package/libgdiplus/libgdiplus.mk
+++ b/bsp/buildroot/package/libgdiplus/libgdiplus.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBGDIPLUS_VERSION = 4.2
+LIBGDIPLUS_VERSION = 5.4
 LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION))
 
-# Although there is a LICENSE file thas specifies LGPL or MPLv1.1,
+# Although there is a LICENSE file thas specifies LGPL or MPL-1.1,
 # looks like it is incorrect. The actual source files specify that
 # they're licensed under MIT, and so does the COPYING file (and they
 # all predate the addition of the LICENSE file).
@@ -21,9 +21,12 @@ LIBGDIPLUS_AUTORECONF = YES
 
 LIBGDIPLUS_DEPENDENCIES = xlib_libXft libglib2 cairo libpng host-pkgconf
 
-# API changes in recent versions of libgif makes it incompatible with
-# this version of libgdiplus, so we are disabling it for now.
-LIBGDIPLUS_CONF_OPTS = --without-libgif
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+LIBGDIPLUS_CONF_OPTS += --with-libgif
+LIBGDIPLUS_DEPENDENCIES += giflib
+else
+LIBGDIPLUS_CONF_OPTS += --without-libgif
+endif
 
 # there is a bug in the configure script that enables pango support
 # when passing --without-pango, so let's just not use it
diff --git a/bsp/buildroot/package/libgee/libgee.mk b/bsp/buildroot/package/libgee/libgee.mk
index 1df54d2b..9d87169e 100644
--- a/bsp/buildroot/package/libgee/libgee.mk
+++ b/bsp/buildroot/package/libgee/libgee.mk
@@ -10,7 +10,7 @@ LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJ
 LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz
 LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2
 LIBGEE_INSTALL_STAGING = YES
-LIBGEE_LICENSE = LGPLv2.1+
+LIBGEE_LICENSE = LGPL-2.1+
 LIBGEE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libglade/libglade.mk b/bsp/buildroot/package/libglade/libglade.mk
index a6eea09c..32fa595f 100644
--- a/bsp/buildroot/package/libglade/libglade.mk
+++ b/bsp/buildroot/package/libglade/libglade.mk
@@ -10,7 +10,7 @@ LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
 LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/$(LIBGLADE_VERSION_MAJOR)
 LIBGLADE_INSTALL_STAGING = YES
 LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2
-LIBGLADE_LICENSE = LGPLv2+
+LIBGLADE_LICENSE = LGPL-2.0+
 LIBGLADE_LICENSE_FILES = COPYING
 
 define LIBGLADE_INSTALL_FIX
diff --git a/bsp/buildroot/package/libglew/Config.in b/bsp/buildroot/package/libglew/Config.in
index 67c49d41..099c9461 100644
--- a/bsp/buildroot/package/libglew/Config.in
+++ b/bsp/buildroot/package/libglew/Config.in
@@ -7,11 +7,12 @@ config BR2_PACKAGE_LIBGLEW
 	select BR2_PACKAGE_XLIB_LIBXI
 	select BR2_PACKAGE_XLIB_LIBXMU
 	help
-	  The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++
-	  extension loading library. GLEW provides efficient run-time mechanisms
-	  for determining which OpenGL extensions are supported on the target
-	  platform. OpenGL core and extension functionality is exposed in a
-	  single header file.
+	  The OpenGL Extension Wrangler Library (GLEW) is a
+	  cross-platform C/C++ extension loading library. GLEW provides
+	  efficient run-time mechanisms for determining which OpenGL
+	  extensions are supported on the target platform. OpenGL core
+	  and extension functionality is exposed in a single header
+	  file.
 
 	  http://glew.sourceforge.net
 
diff --git a/bsp/buildroot/package/libglew/libglew.mk b/bsp/buildroot/package/libglew/libglew.mk
index 7af3affb..277a171b 100644
--- a/bsp/buildroot/package/libglew/libglew.mk
+++ b/bsp/buildroot/package/libglew/libglew.mk
@@ -7,7 +7,7 @@
 LIBGLEW_VERSION = 2.0.0
 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz
 LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION)
-LIBGLEW_LICENSE = BSD-3c, MIT
+LIBGLEW_LICENSE = BSD-3-Clause, MIT
 LIBGLEW_LICENSE_FILES = LICENSE.txt
 LIBGLEW_INSTALL_STAGING = YES
 LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu
diff --git a/bsp/buildroot/package/libglfw/libglfw.hash b/bsp/buildroot/package/libglfw/libglfw.hash
index 3226aad2..c0ad2af1 100644
--- a/bsp/buildroot/package/libglfw/libglfw.hash
+++ b/bsp/buildroot/package/libglfw/libglfw.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	6ac642087682aaf7f8397761a41a99042b2c656498217a1c63ba9706d1eef122	libglfw-3.1.2.tar.gz
+sha256 e10f0de1384d75e6fc210c53e91843f6110d6c4f3afbfb588130713c2f9d8fe8  libglfw-3.2.1.tar.gz
diff --git a/bsp/buildroot/package/libglfw/libglfw.mk b/bsp/buildroot/package/libglfw/libglfw.mk
index 0b1730d5..b6dde2e9 100644
--- a/bsp/buildroot/package/libglfw/libglfw.mk
+++ b/bsp/buildroot/package/libglfw/libglfw.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBGLFW_VERSION = 3.1.2
+LIBGLFW_VERSION = 3.2.1
 LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION))
 LIBGLFW_INSTALL_STAGING = YES
 LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \
 	xlib_libXinerama xlib_libXrandr
-LIBGLFW_LICENSE = zlib
+LIBGLFW_LICENSE = Zlib
 LIBGLFW_LICENSE_FILES = COPYING.txt
 
 LIBGLFW_CONF_OPTS += \
diff --git a/bsp/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch b/bsp/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch
index f6d0c5d6..708188b2 100644
--- a/bsp/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch
+++ b/bsp/buildroot/package/libglib2/0001-fix-compile-time-atomic-detection.patch
@@ -1,4 +1,7 @@
-[PATCH] Fix compilation issues on architectures with limited atomic support
+From d5c628a6179b99705fa05ab87437321b132c81bc Mon Sep 17 00:00:00 2001
+From: Brendan Heading <brendanheading@gmail.com>
+Date: Wed, 21 Jun 2017 16:36:15 -0400
+Subject: [PATCH] Fix compile time atomic detection
 
 Improved compile-time detection of atomic support in the compiler.
 
@@ -6,15 +9,16 @@ Upstream-Status: submitted
 See : https://bugzilla.gnome.org/show_bug.cgi?id=752731
 
 Signed-off-by: Brendan Heading <brendanheading@gmail.com>
+Signed-off-by: Adam Duskett <aduskett@codeblue.com>
 ---
  glib/gthread-posix.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
-index ae5d805..8db8557 100644
+index 71a6b7b..d09d029 100644
 --- a/glib/gthread-posix.c
 +++ b/glib/gthread-posix.c
-@@ -67,7 +67,7 @@
+@@ -65,7 +65,7 @@
  #endif
  
  /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */
@@ -24,5 +28,5 @@ index ae5d805..8db8557 100644
  #endif
  
 -- 
-2.4.3
+2.9.4
 
diff --git a/bsp/buildroot/package/libglib2/0002-disable-tests.patch b/bsp/buildroot/package/libglib2/0002-disable-tests.patch
index 1b0c5355..523ebb35 100644
--- a/bsp/buildroot/package/libglib2/0002-disable-tests.patch
+++ b/bsp/buildroot/package/libglib2/0002-disable-tests.patch
@@ -1,12 +1,37 @@
+From ee2d6609bce808ac72afdbf86db1a6e27c78171e Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
+Date: Wed, 21 Jun 2017 16:37:54 -0400
+Subject: [PATCH] disable tests
+
 Disable tests, some of them need python and sometimes host-python
 gets mixed with distro python leading to build failures.
 
 Signed-off-by: Gustavo Zacarias <gustavo.zacarias@free-electrons.com>
+Signed-off-by: Adam Duskett <aduskett@codeblue.com>
+---
+ Makefile.am      | 2 +-
+ gio/Makefile.am  | 2 +-
+ glib/Makefile.am | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
 
-diff -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am
---- glib-2.46.1.orig/gio/Makefile.am	2015-10-20 16:59:03.042212468 -0300
-+++ glib-2.46.1/gio/Makefile.am	2015-10-20 17:32:26.763146133 -0300
-@@ -233,7 +233,7 @@
+diff --git a/Makefile.am b/Makefile.am
+index 008ad58..007332d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,7 +6,7 @@ include $(top_srcdir)/glib.mk
+ 
+ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
+ 
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
+ DIST_SUBDIRS = $(SUBDIRS) build win32
+ 
+ bin_SCRIPTS = glib-gettextize
+diff --git a/gio/Makefile.am b/gio/Makefile.am
+index 67db1b7..78309b5 100644
+--- a/gio/Makefile.am
++++ b/gio/Makefile.am
+@@ -244,7 +244,7 @@ platform_libadd += win32/libgiowin32.la
  platform_deps += win32/libgiowin32.la
  endif
  
@@ -15,10 +40,11 @@ diff -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am
  
  if HAVE_FAM
  SUBDIRS += fam
-diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am
---- glib-2.46.1.orig/glib/Makefile.am	2015-10-20 16:59:03.066213318 -0300
-+++ glib-2.46.1/glib/Makefile.am	2015-10-20 17:33:23.537155988 -0300
-@@ -33,8 +33,8 @@
+diff --git a/glib/Makefile.am b/glib/Makefile.am
+index d755853..61166e5 100644
+--- a/glib/Makefile.am
++++ b/glib/Makefile.am
+@@ -33,8 +33,8 @@ else
  MAYBE_PCRE = pcre 
  endif
  
@@ -29,15 +55,6 @@ diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am
  
  AM_CPPFLAGS = 				\
  	$(glib_INCLUDES) 		\
-diff -Nura glib-2.46.1.orig/Makefile.am glib-2.46.1/Makefile.am
---- glib-2.46.1.orig/Makefile.am	2015-10-20 16:59:03.003211087 -0300
-+++ glib-2.46.1/Makefile.am	2015-10-20 17:32:20.923939420 -0300
-@@ -6,7 +6,7 @@
- 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
- 
--SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build
- 
- bin_SCRIPTS = glib-gettextize
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch b/bsp/buildroot/package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch
deleted file mode 100644
index 364e1793..00000000
--- a/bsp/buildroot/package/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ee32416dec8462ee27c3c254100cf980b0889ce0 Mon Sep 17 00:00:00 2001
-From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
-Date: Tue, 18 Oct 2016 23:04:50 +0530
-Subject: [PATCH] gio-2.0.pc: include libmount in Libs.private
-
-This helps with static linking. When application statically links with
-libgio, it needs to link against libmount explicitly. When it is
-mentioned in Libs.private, build system can figure out with which extra
-libs to link against with help of pkg-config.
-
-This build failure is detected by Buildroot autobuilder:
-http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186
-
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- gio-2.0.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in
-index 899af0c..7574eb7 100644
---- a/gio-2.0.pc.in
-+++ b/gio-2.0.pc.in
-@@ -14,5 +14,5 @@ Version: @VERSION@
- Requires: glib-2.0 gobject-2.0
- Requires.private: gmodule-no-export-2.0
- Libs: -L${libdir} -lgio-2.0
--Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@
-+Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@
- Cflags:
--- 
-2.6.2
-
diff --git a/bsp/buildroot/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch b/bsp/buildroot/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch
new file mode 100644
index 00000000..fa558e6d
--- /dev/null
+++ b/bsp/buildroot/package/libglib2/0004-Do-not-hardcode-python-path-into-various-tools.patch
@@ -0,0 +1,48 @@
+From b9160d951b9af647b97766c57295ca4f45cf9521 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 3 Oct 2017 10:45:55 +0300
+Subject: [PATCH] Do not hardcode python path into various tools
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Fetch from: http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch?id=eef7883587acc933d6f34b559ec03ff84d18573b
+Signed-off-by: David Owens <david.owens@rockwellcollins.com>
+---
+ gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +-
+ gobject/glib-genmarshal.in             | 2 +-
+ gobject/glib-mkenums.in                | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..e693ef3 100644
+--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
++++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env @PYTHON@
++#!/usr/bin/env python
+ 
+ # GDBus - GLib D-Bus Library
+ #
+diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in
+index 09e8408..b2f9d99 100755
+--- a/gobject/glib-genmarshal.in
++++ b/gobject/glib-genmarshal.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env @PYTHON@
++#!/usr/bin/env python
+ 
+ # pylint: disable=too-many-lines, missing-docstring, invalid-name
+ 
+diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
+index d4bfd11..051fce4 100755
+--- a/gobject/glib-mkenums.in
++++ b/gobject/glib-mkenums.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env @PYTHON@
++#!/usr/bin/env python
+ 
+ # If the code below looks horrible and unpythonic, do not panic.
+ #
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/libglib2/Config.in b/bsp/buildroot/package/libglib2/Config.in
index 80c7d674..ea946ba0 100644
--- a/bsp/buildroot/package/libglib2/Config.in
+++ b/bsp/buildroot/package/libglib2/Config.in
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_LIBGLIB2
 	bool "libglib2"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
+	depends on BR2_USE_WCHAR # gettext
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_LIBFFI
 	select BR2_PACKAGE_PCRE
@@ -8,9 +10,6 @@ config BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_USE_WCHAR # gettext
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
 	help
 	  Low-level core library that forms the basis of GTK+ and GNOME.
 
diff --git a/bsp/buildroot/package/libglib2/libglib2.hash b/bsp/buildroot/package/libglib2/libglib2.hash
index 94bf8700..cf1c9557 100644
--- a/bsp/buildroot/package/libglib2/libglib2.hash
+++ b/bsp/buildroot/package/libglib2/libglib2.hash
@@ -1,2 +1,4 @@
-# https://download.gnome.org/sources/glib/2.50/glib-2.50.2.sha256sum
-sha256  be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5  glib-2.50.2.tar.xz
+# https://download.gnome.org/sources/glib/2.54/glib-2.54.2.sha256sum
+sha256  bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c  glib-2.54.2.tar.xz
+# License files, locally calculated
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING
diff --git a/bsp/buildroot/package/libglib2/libglib2.mk b/bsp/buildroot/package/libglib2/libglib2.mk
index 1c111666..ff28ca61 100644
--- a/bsp/buildroot/package/libglib2/libglib2.mk
+++ b/bsp/buildroot/package/libglib2/libglib2.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LIBGLIB2_VERSION_MAJOR = 2.50
+LIBGLIB2_VERSION_MAJOR = 2.54
 LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2
 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz
 LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
-LIBGLIB2_LICENSE = LGPLv2+
+LIBGLIB2_LICENSE = LGPL-2.1+
 LIBGLIB2_LICENSE_FILES = COPYING
 # 0002-disable-tests.patch
 LIBGLIB2_AUTORECONF = YES
@@ -42,8 +42,6 @@ LIBGLIB2_CONF_ENV = \
 	jm_cv_func_nanosleep_works=yes \
 	gl_cv_func_working_utimes=yes \
 	ac_cv_func_utime_null=yes \
-	ac_cv_have_decl_strerror_r=yes \
-	ac_cv_func_strerror_r_char_p=no \
 	jm_cv_func_svid_putenv=yes \
 	ac_cv_func_getcwd_null=yes \
 	ac_cv_func_getdelim=yes \
@@ -67,7 +65,7 @@ LIBGLIB2_CONF_ENV = \
 	jm_cv_func_working_re_compile_pattern=yes \
 	ac_use_included_regex=no \
 	gl_cv_c_restrict=no \
-	ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal \
+	ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/bin/glib-genmarshal \
 	ac_cv_prog_F77=no \
 	ac_cv_func_posix_getgrgid_r=no \
 	glib_cv_long_long_format=ll \
@@ -103,8 +101,8 @@ HOST_LIBGLIB2_CONF_OPTS = \
 	--with-pcre=system
 
 LIBGLIB2_DEPENDENCIES = \
-	host-pkgconf host-libglib2 host-gettext \
-	libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext)
+	host-pkgconf host-libglib2 \
+	libffi pcre util-linux zlib $(TARGET_NLS_DEPENDENCIES)
 
 HOST_LIBGLIB2_DEPENDENCIES = \
 	host-gettext \
@@ -163,7 +161,7 @@ endef
 # them as well, and better do it in a central place.
 # It's used at run time so it doesn't matter defering it.
 define LIBGLIB2_COMPILE_SCHEMAS
-	$(HOST_DIR)/usr/bin/glib-compile-schemas \
+	$(HOST_DIR)/bin/glib-compile-schemas \
 		$(STAGING_DIR)/usr/share/glib-2.0/schemas \
 		--targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas
 endef
@@ -174,4 +172,4 @@ LIBGLIB2_TARGET_FINALIZE_HOOKS += LIBGLIB2_COMPILE_SCHEMAS
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
-LIBGLIB2_HOST_BINARY = $(HOST_DIR)/usr/bin/glib-genmarshal
+LIBGLIB2_HOST_BINARY = $(HOST_DIR)/bin/glib-genmarshal
diff --git a/bsp/buildroot/package/libglob/libglob.mk b/bsp/buildroot/package/libglob/libglob.mk
index cd6922e0..90356b39 100644
--- a/bsp/buildroot/package/libglob/libglob.mk
+++ b/bsp/buildroot/package/libglob/libglob.mk
@@ -6,7 +6,7 @@
 
 LIBGLOB_VERSION = 1.0
 LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION))
-LIBGLOB_LICENSE = BSD-3c
+LIBGLOB_LICENSE = BSD-3-Clause
 LIBGLOB_LICENSE_FILES = LICENSE
 LIBGLOB_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libglu/libglu.mk b/bsp/buildroot/package/libglu/libglu.mk
index 038d281c..0e5242f8 100644
--- a/bsp/buildroot/package/libglu/libglu.mk
+++ b/bsp/buildroot/package/libglu/libglu.mk
@@ -12,6 +12,6 @@ LIBGLU_LICENSE_FILES = include/GL/glu.h
 LIBGLU_INSTALL_STAGING = YES
 # upstream does not distribute a autoconf´ed configure script
 LIBGLU_AUTORECONF = YES
-LIBGLU_DEPENDENCIES = libgl
+LIBGLU_DEPENDENCIES = libgl host-pkgconf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libgpg-error/libgpg-error.hash b/bsp/buildroot/package/libgpg-error/libgpg-error.hash
index dac36db0..0e6304de 100644
--- a/bsp/buildroot/package/libgpg-error/libgpg-error.hash
+++ b/bsp/buildroot/package/libgpg-error/libgpg-error.hash
@@ -1,2 +1,6 @@
 # Locally calculated after checking pgp signature
-sha256  3df7432dc17ef66c764c3fc4a1d309a9b4a0485c914ecfdb61b71e9bf45fd930  libgpg-error-1.26.tar.gz
+# https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.29.tar.bz2.sig
+sha256 ece926fa5719d17a7ad8da618712cfa2f8a796ab2f2af9d544c5bb093383b1ea  libgpg-error-1.29.tar.bz2
+# Locally calculated
+sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c  COPYING
+sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LIB
diff --git a/bsp/buildroot/package/libgpg-error/libgpg-error.mk b/bsp/buildroot/package/libgpg-error/libgpg-error.mk
index 5126c0a8..862cb44e 100644
--- a/bsp/buildroot/package/libgpg-error/libgpg-error.mk
+++ b/bsp/buildroot/package/libgpg-error/libgpg-error.mk
@@ -4,16 +4,14 @@
 #
 ################################################################################
 
-LIBGPG_ERROR_VERSION = 1.26
-LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error
-LIBGPG_ERROR_LICENSE = GPLv2+, LGPLv2.1+
+LIBGPG_ERROR_VERSION = 1.29
+LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error
+LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2
+LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+
 LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB
 LIBGPG_ERROR_INSTALL_STAGING = YES
 LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config
-
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-LIBGPG_ERROR_DEPENDENCIES += gettext
-endif
+LIBGPG_ERROR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 define LIBGPG_ERROR_FIX_CROSS_COMPILATION
 	cd $(@D)/src/syscfg && \
diff --git a/bsp/buildroot/package/libgpgme/0001-core-Tweak-STATUS_FAILURE-handling.patch b/bsp/buildroot/package/libgpgme/0001-core-Tweak-STATUS_FAILURE-handling.patch
new file mode 100644
index 00000000..ae0e9c54
--- /dev/null
+++ b/bsp/buildroot/package/libgpgme/0001-core-Tweak-STATUS_FAILURE-handling.patch
@@ -0,0 +1,51 @@
+From b99502274ae5efdf6df0d967900ec3d1e64373d7 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Thu, 12 Apr 2018 20:36:30 +0200
+Subject: [PATCH] core: Tweak STATUS_FAILURE handling.
+
+* src/op-support.c (_gpgme_parse_failure): Ignore failures with
+location "gpg-exit".
+* tests/gpg/t-verify.c (main): Adjust for the now working checking of
+the second key.
+
+Signed-off-by: Werner Koch <wk@gnupg.org>
+[baruch: drop test]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit b99502274ae
+
+ src/op-support.c     | 10 +++++++++-
+ tests/gpg/t-verify.c |  8 +++++---
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/src/op-support.c b/src/op-support.c
+index 43cb1c760e0d..e55875f904d0 100644
+--- a/src/op-support.c
++++ b/src/op-support.c
+@@ -400,7 +400,13 @@ _gpgme_parse_plaintext (char *args, char **filenamep)
+ 
+ 
+ /* Parse a FAILURE status line and return the error code.  ARGS is
+-   modified to contain the location part.  */
++ * modified to contain the location part.  Note that for now we ignore
++ * failure codes with a location of gpg-exit; they are too trouble
++ * some.  Instead we should eventually record that error in the
++ * context and provide a function to return a fuller error
++ * description; this could then also show the location of the error
++ * (e.g. "option- parser") to make it easier for the user to detect
++ * the actual error. */
+ gpgme_error_t
+ _gpgme_parse_failure (char *args)
+ {
+@@ -418,6 +424,8 @@ _gpgme_parse_failure (char *args)
+     *where = '\0';
+ 
+   where = args;
++  if (!strcmp (where, "gpg-exit"))
++    return 0;
+ 
+   return atoi (which);
+ }
+-- 
+2.17.0
+
diff --git a/bsp/buildroot/package/libgpgme/libgpgme.hash b/bsp/buildroot/package/libgpgme/libgpgme.hash
index 5ef7b0e5..6bd595c5 100644
--- a/bsp/buildroot/package/libgpgme/libgpgme.hash
+++ b/bsp/buildroot/package/libgpgme/libgpgme.hash
@@ -1,2 +1,7 @@
+# From https://lists.gnupg.org/pipermail/gnupg-announce/2017q4/000418.html
+sha1 77d3390887da25ed70b7ac04392360efbdca501f  gpgme-1.10.0.tar.bz2
 # Locally calculated after checking pgp signature
-sha256	d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6	gpgme-1.7.1.tar.bz2
+# https://gnupg.org/ftp/gcrypt/gpgme/gpgme-1.10.0.tar.bz2.sig
+sha256 1a8fed1197c3b99c35f403066bb344a26224d292afc048cfdfc4ccd5690a0693  gpgme-1.10.0.tar.bz2
+# Locally calculated
+sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532  COPYING.LESSER
diff --git a/bsp/buildroot/package/libgpgme/libgpgme.mk b/bsp/buildroot/package/libgpgme/libgpgme.mk
index 84f4d229..5c46c7c5 100644
--- a/bsp/buildroot/package/libgpgme/libgpgme.mk
+++ b/bsp/buildroot/package/libgpgme/libgpgme.mk
@@ -4,17 +4,16 @@
 #
 ################################################################################
 
-LIBGPGME_VERSION = 1.7.1
-LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme
+LIBGPGME_VERSION = 1.10.0
+LIBGPGME_SITE = https://gnupg.org/ftp/gcrypt/gpgme
 LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2
-LIBGPGME_LICENSE = LGPLv2.1+
+LIBGPGME_LICENSE = LGPL-2.1+
 LIBGPGME_LICENSE_FILES = COPYING.LESSER
 LIBGPGME_INSTALL_STAGING = YES
 LIBGPGME_DEPENDENCIES = libassuan libgpg-error
 LIBGPGME_LANGUAGE_BINDINGS = cl
 
-# libgpgme, needs to know the gpg binary path on the target.
-LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \
+LIBGPGME_CONF_OPTS = \
 	--with-gpg-error-prefix=$(STAGING_DIR)/usr \
 	--with-libassuan-prefix=$(STAGING_DIR)/usr \
 	--disable-gpgsm-test \
@@ -36,4 +35,9 @@ LIBGPGME_CONF_ENV += LIBS="-largp" ac_cv_type_error_t=yes
 LIBGPGME_DEPENDENCIES += argp-standalone
 endif
 
+# MIPS N64 (re)introduced getdents64 in kernel version 3.10
+ifeq ($(BR2_MIPS_NABI64)x$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10),yx)
+LIBGPGME_CONF_OPTS += --disable-linux-getdents
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libgphoto2/Config.in b/bsp/buildroot/package/libgphoto2/Config.in
new file mode 100644
index 00000000..fc60dd68
--- /dev/null
+++ b/bsp/buildroot/package/libgphoto2/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_LIBGPHOTO2
+	bool "libgphoto2"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBXML2
+	help
+	  libgphoto2 is the core library designed to allow access to
+	  digital camera by external programs.
+
+	  http://gphoto.org/proj/libgphoto2/
+
+comment "libgphoto needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libgphoto2/libgphoto2.hash b/bsp/buildroot/package/libgphoto2/libgphoto2.hash
new file mode 100644
index 00000000..1afe275c
--- /dev/null
+++ b/bsp/buildroot/package/libgphoto2/libgphoto2.hash
@@ -0,0 +1,6 @@
+# https://sourceforge.net/projects/gphoto/files/libgphoto/2.5.13/
+md5 73bf5b3d94c8c6f5fad9ea6b5e561843 libgphoto2-2.5.13.tar.bz2
+sha1 cef2d2f1930f8ada16a63aca15683188231a626a libgphoto2-2.5.13.tar.bz2
+
+# Locally calculated hash
+sha256 ceaacbdf187d1cd1aed5336991f46b0100f6960b6c8383f9aeab98f1f64780ef libgphoto2-2.5.13.tar.bz2
diff --git a/bsp/buildroot/package/libgphoto2/libgphoto2.mk b/bsp/buildroot/package/libgphoto2/libgphoto2.mk
new file mode 100644
index 00000000..f6dadf1f
--- /dev/null
+++ b/bsp/buildroot/package/libgphoto2/libgphoto2.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# libgphoto2
+#
+################################################################################
+
+LIBGPHOTO2_VERSION = 2.5.13
+LIBGPHOTO2_SOURCE = libgphoto2-$(LIBGPHOTO2_VERSION).tar.bz2
+# Project is maintained on github but github tarball doesn't have
+# configure, so use tarballs from SourceForge
+LIBGPHOTO2_SITE = https://downloads.sourceforge.net/project/gphoto/libgphoto/$(LIBGPHOTO2_VERSION)
+LIBGPHOTO2_LICENSE = LGPL-2.1+, GPL-2.0 (adc65), GPL-2.0+ (some camlibs), \
+	LGPL-2.0 (sipix), LGPL-3.0+ (pentax), BSD-3-Clause (ax203/tinyjpeg)
+# There is a single license file for the LGPL-2.1, no license files
+# for other licenses
+LIBGPHOTO2_LICENSE_FILES = COPYING
+LIBGPHOTO2_INSTALL_STAGING = YES
+
+LIBGPHOTO2_DEPENDENCIES = libxml2 libusb libtool host-pkgconf
+
+LIBGPHOTO2_CONF_ENV = udevscriptdir=/lib/udev
+LIBGPHOTO2_CONF_OPTS += --without-rpmbuild --disable-gp2ddb --disable-internal-docs
+
+ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
+# libusb-compat is not actually used, but it is detected, so add it
+# here to guarantee reproducible builds
+LIBGPHOTO2_DEPENDENCIES += libusb-compat
+endif
+
+ifeq ($(BR2_PACKAGE_LIBEXIF),y)
+LIBGPHOTO2_DEPENDENCIES += libexif
+LIBGPHOTO2_CONF_OPTS += --with-libexif=auto
+else
+LIBGPHOTO2_CONF_OPTS += --with-libexif=no
+endif
+
+ifeq ($(BR2_PACKAGE_JPEG),y)
+LIBGPHOTO2_DEPENDENCIES += jpeg
+LIBGPHOTO2_CONF_OPTS += --with-jpeg
+else
+LIBGPHOTO2_CONF_OPTS += --without-jpeg
+endif
+
+ifeq ($(BR2_PACKAGE_GD),y)
+LIBGPHOTO2_DEPENDENCIES += gd
+LIBGPHOTO2_CONF_OPTS += --with-gdlib=auto
+else
+LIBGPHOTO2_CONF_OPTS += --with-gdlib=no
+endif
+
+ifeq ($(BR2_PACKAGE_LOCKDEV),y)
+LIBGPHOTO2_DEPENDENCIES += lockdev
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libgpiod/libgpiod.hash b/bsp/buildroot/package/libgpiod/libgpiod.hash
index eee2a662..6baeee23 100644
--- a/bsp/buildroot/package/libgpiod/libgpiod.hash
+++ b/bsp/buildroot/package/libgpiod/libgpiod.hash
@@ -1,2 +1,4 @@
-# Locally computed
-sha256 670a13518fabf2a99f9e349c33d5421c2146eec15b73c5edef3f1981a7adaeda libgpiod-v0.1.3.tar.gz
+# From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc
+sha256 50c7862428ca90b58672e2475aea66d33a6fc86c6bab1928c0660f3aedf44a37  libgpiod-0.3.2.tar.xz
+# Hash for license file
+sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed  COPYING
diff --git a/bsp/buildroot/package/libgpiod/libgpiod.mk b/bsp/buildroot/package/libgpiod/libgpiod.mk
index bc9c6eca..bc2e51d2 100644
--- a/bsp/buildroot/package/libgpiod/libgpiod.mk
+++ b/bsp/buildroot/package/libgpiod/libgpiod.mk
@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-LIBGPIOD_VERSION = v0.1.3
-LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION))
-LIBGPIOD_LICENSE = GPLv3+
+LIBGPIOD_VERSION = 0.3.2
+LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz
+LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod
+LIBGPIOD_LICENSE = LGPL-2.1+
 LIBGPIOD_LICENSE_FILES = COPYING
-# fetched from github, no configure script provided
-LIBGPIOD_AUTORECONF = YES
+LIBGPIOD_INSTALL_STAGING = YES
+
+LIBGPIOD_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBGPIOD_TOOLS),y)
 LIBGPIOD_CONF_OPTS += --enable-tools
diff --git a/bsp/buildroot/package/libgsasl/libgsasl.mk b/bsp/buildroot/package/libgsasl/libgsasl.mk
index 00ce8e03..9a625433 100644
--- a/bsp/buildroot/package/libgsasl/libgsasl.mk
+++ b/bsp/buildroot/package/libgsasl/libgsasl.mk
@@ -6,7 +6,7 @@
 
 LIBGSASL_VERSION = 1.8.0
 LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl
-LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs)
+LIBGSASL_LICENSE = LGPL-2.1+ (library), GPL-3.0+ (programs)
 LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
 LIBGSASL_INSTALL_STAGING = YES
 # It doesn't seem to build with our libgcrypt so better be safe
diff --git a/bsp/buildroot/package/libgsm/0001-misc-fixes-from-archlinux.patch b/bsp/buildroot/package/libgsm/0001-misc-fixes-from-archlinux.patch
new file mode 100644
index 00000000..86f4d42b
--- /dev/null
+++ b/bsp/buildroot/package/libgsm/0001-misc-fixes-from-archlinux.patch
@@ -0,0 +1,218 @@
+From e8f43832d401ad1e071e6860b2bf4a1e796d4356 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <aduskett@gmail.com>
+Date: Fri, 28 Jul 2017 08:18:22 -0400
+Subject: [PATCH] Misc fixes from Archlinux
+
+Patch from:
+    https://git.archlinux.org/svntogit/packages.git/plain/gsm/trunk/gsm.patch
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+Refresh for 1.0.17
+---
+ Makefile | 84 ++++++++++++++++++++++++++++++++--------------------------------
+ 1 file changed, 42 insertions(+), 42 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d5c0c90..ef61bd5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -44,7 +44,7 @@ WAV49	= -DWAV49
+ # CCFLAGS 	= -c -O
+ 
+ CC		= gcc -ansi -pedantic
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
++CCFLAGS 	= -c -O2 -fPIC -DNeedFunctionPrototypes=1 -Wall -Wno-comment
+ 
+ LD 		= $(CC)
+ 
+@@ -96,11 +96,11 @@ TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s -f
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+-RMFLAGS		=
++RMFLAGS		= -f
+ FIND		= find
+ COMPRESS 	= compress
+ COMPRESSFLAGS 	= 
+@@ -139,7 +139,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
+ 
+ # Targets
+ 
+-LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO = $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -257,7 +257,7 @@ STUFF = 	ChangeLog			\
+ # Install targets
+ 
+ GSM_INSTALL_TARGETS =	\
+-		$(GSM_INSTALL_LIB)/libgsm.a		\
++		$(GSM_INSTALL_LIB)/libgsm.so		\
+ 		$(GSM_INSTALL_INC)/gsm.h		\
+ 		$(GSM_INSTALL_MAN)/gsm.3		\
+ 		$(GSM_INSTALL_MAN)/gsm_explode.3	\
+@@ -279,7 +279,7 @@ TOAST_INSTALL_TARGETS =	\
+ 
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +299,23 @@ install:	toastinstall gsminstall
+ 
+ # The basic API: libgsm
+ 
+-$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
+-		-rm $(RMFLAGS) $(LIBGSM)
+-		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+-		$(RANLIB) $(LIBGSM)
+-
++$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
++	$(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS)
++	$(LN) libgsm.so.1.0.13 $(LIBGSMSO).1
++	$(LN) libgsm.so.1.0.13 $(LIBGSMSO)
+ 
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+-$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -351,53 +350,54 @@ toastuninstall:
+ 		fi
+ 
+ $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $(TOAST) $@
+ 		chmod 755 $@
+ 
+ $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
+-		-rm $@
+-		ln $? $@
++		-rm $(RMFLAGS) $@
++		$(LN) toast $@
+ 
+ $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
+-		-rm $@
+-		ln $? $@
++		-rm $(RMFLAGS) $@
++		$(LN) toast $@
+ 
+ $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
+ $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
+-		-rm $@
+-		cp $? $@
+-		chmod 444 $@
+-
+-$(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
+-		-rm $@
++		-rm $(RMFLAGS) $@
+ 		cp $? $@
+ 		chmod 444 $@
+ 
++$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSMSO)
++		-rm $(RMFLAGS) $@ $@.1 $@.1.0.13
++		cp $?.1.0.13 $@.1.0.13
++		chmod 755 $@.1.0.13
++		$(LN) libgsm.so.1.0.13 $@
++		$(LN) libgsm.so.1.0.13 $@.1
+ 
+ # Distribution
+ 
+@@ -425,7 +425,7 @@ semi-clean:
+ 			-print | xargs rm $(RMFLAGS)
+ 
+ clean:	semi-clean
+-		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
++		-rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add		\
+ 			$(TOAST) $(TCAT) $(UNTOAST)	\
+ 			$(ROOT)/gsm-1.0.tar.Z
+ 
+@@ -473,22 +473,22 @@ $(ADDTST)/add:	$(ADDTST)/add_test.o
+ $(TST)/test-result:	$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
+ 			( cd $(TST); ./run ) 
+ 
+-$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSM)
++$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/lin2txt \
+-				$(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
++				$(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSM)
++$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/lin2cod \
+-				$(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
++				$(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSM)
++$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/gsm2cod \
+-				$(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
++				$(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSM)
++$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/cod2txt \
+-				$(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
++				$(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB)
+ 
+-$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSM)
++$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSMSO)
+ 			$(LD) $(LFLAGS) -o $(TST)/cod2lin \
+-				$(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
++				$(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB)
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/package/libgsm/0001-misc.patch b/bsp/buildroot/package/libgsm/0001-misc.patch
deleted file mode 100644
index 735d7444..00000000
--- a/bsp/buildroot/package/libgsm/0001-misc.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-Misc fixes from Archlinux
-
-Patch from:
-    https://git.archlinux.org/svntogit/packages.git/plain/gsm/trunk/gsm.patch
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
---- a/Makefile	2006-04-26 15:14:26.000000000 -0400
-+++ b/Makefile	2010-06-19 16:53:25.000000000 -0400
-@@ -44,7 +44,7 @@
- # CCFLAGS 	= -c -O
- 
- CC		= gcc -ansi -pedantic
--CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1
-+CCFLAGS 	= -c -O2 -fPIC -DNeedFunctionPrototypes=1
- 
- LD 		= $(CC)
- 
-@@ -96,11 +96,11 @@
- #  Other tools
- 
- SHELL		= /bin/sh
--LN		= ln
-+LN		= ln -s -f
- BASENAME 	= basename
- AR		= ar
- ARFLAGS		= cr
--RMFLAGS		=
-+RMFLAGS		= -f
- FIND		= find
- COMPRESS 	= compress
- COMPRESSFLAGS 	= 
-@@ -139,7 +139,7 @@
- 
- # Targets
- 
--LIBGSM	= $(LIB)/libgsm.a
-+LIBGSMSO = $(LIB)/libgsm.so
- 
- TOAST	= $(BIN)/toast
- UNTOAST	= $(BIN)/untoast
-@@ -257,7 +257,7 @@
- # Install targets
- 
- GSM_INSTALL_TARGETS =	\
--		$(GSM_INSTALL_LIB)/libgsm.a		\
-+		$(GSM_INSTALL_LIB)/libgsm.so		\
- 		$(GSM_INSTALL_INC)/gsm.h		\
- 		$(GSM_INSTALL_MAN)/gsm.3		\
- 		$(GSM_INSTALL_MAN)/gsm_explode.3	\
-@@ -279,7 +279,7 @@
- 
- # Target rules
- 
--all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
-+all:		$(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
- 		@-echo $(ROOT): Done.
- 
- tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
-@@ -299,24 +299,23 @@
- 
- # The basic API: libgsm
- 
--$(LIBGSM):	$(LIB) $(GSM_OBJECTS)
--		-rm $(RMFLAGS) $(LIBGSM)
--		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
--		$(RANLIB) $(LIBGSM)
--
-+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
-+	$(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS)
-+	$(LN) libgsm.so.1.0.13 $(LIBGSMSO).1
-+	$(LN) libgsm.so.1.0.13 $(LIBGSMSO)
- 
- # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
- 
--$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
--		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
-+$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
-+		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
- 
- $(UNTOAST):	$(BIN) $(TOAST)
- 		-rm $(RMFLAGS) $(UNTOAST)
--		$(LN) $(TOAST) $(UNTOAST)
-+		$(LN) toast $(UNTOAST)
- 
- $(TCAT):	$(BIN) $(TOAST)
- 		-rm $(RMFLAGS) $(TCAT)
--		$(LN) $(TOAST) $(TCAT)
-+		$(LN) toast $(TCAT)
- 
- 
- # The local bin and lib directories
-@@ -351,53 +350,54 @@
- 		fi
- 
- $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $(TOAST) $@
- 		chmod 755 $@
- 
- $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
--		-rm $@
--		ln $? $@
-+		-rm $(RMFLAGS) $@
-+		$(LN) toast $@
- 
- $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
--		-rm $@
--		ln $? $@
-+		-rm $(RMFLAGS) $@
-+		$(LN) toast $@
- 
- $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $? $@
- 		chmod 444 $@
- 
- $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
--		-rm $@
--		cp $? $@
--		chmod 444 $@
--
--$(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
--		-rm $@
-+		-rm $(RMFLAGS) $@
- 		cp $? $@
- 		chmod 444 $@
- 
-+$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSMSO)
-+		-rm $(RMFLAGS) $@ $@.1 $@.1.0.13
-+		cp $?.1.0.13 $@.1.0.13
-+		chmod 755 $@.1.0.13
-+		$(LN) libgsm.so.1.0.13 $@
-+		$(LN) libgsm.so.1.0.13 $@.1
- 
- # Distribution
- 
-@@ -425,7 +425,7 @@
- 			-print | xargs rm $(RMFLAGS)
- 
- clean:	semi-clean
--		-rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add		\
-+		-rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add		\
- 			$(TOAST) $(TCAT) $(UNTOAST)	\
- 			$(ROOT)/gsm-1.0.tar.Z
- 
-@@ -473,22 +473,22 @@
- $(TST)/test-result:	$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run
- 			( cd $(TST); ./run ) 
- 
--$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSM)
-+$(TST)/lin2txt:		$(TST)/lin2txt.o $(LIBGSMSO)
- 			$(LD) $(LFLAGS) -o $(TST)/lin2txt \
--				$(TST)/lin2txt.o $(LIBGSM) $(LDLIB)
-+				$(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB)
- 
--$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSM)
-+$(TST)/lin2cod:		$(TST)/lin2cod.o $(LIBGSMSO)
- 			$(LD) $(LFLAGS) -o $(TST)/lin2cod \
--				$(TST)/lin2cod.o $(LIBGSM) $(LDLIB)
-+				$(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB)
- 
--$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSM)
-+$(TST)/gsm2cod:		$(TST)/gsm2cod.o $(LIBGSMSO)
- 			$(LD) $(LFLAGS) -o $(TST)/gsm2cod \
--				$(TST)/gsm2cod.o $(LIBGSM) $(LDLIB)
-+				$(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB)
- 
--$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSM)
-+$(TST)/cod2txt:		$(TST)/cod2txt.o $(LIBGSMSO)
- 			$(LD) $(LFLAGS) -o $(TST)/cod2txt \
--				$(TST)/cod2txt.o $(LIBGSM) $(LDLIB)
-+				$(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB)
- 
--$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSM)
-+$(TST)/cod2lin:		$(TST)/cod2lin.o $(LIBGSMSO)
- 			$(LD) $(LFLAGS) -o $(TST)/cod2lin \
--				$(TST)/cod2lin.o $(LIBGSM) $(LDLIB)
-+				$(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB)
diff --git a/bsp/buildroot/package/libgsm/libgsm.hash b/bsp/buildroot/package/libgsm/libgsm.hash
index bcfb6505..a73359d6 100644
--- a/bsp/buildroot/package/libgsm/libgsm.hash
+++ b/bsp/buildroot/package/libgsm/libgsm.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  725a3768a1e23ab8648b4df9d470aed38eb1635af3cbc8d0b64fef077236f4ce  gsm-1.0.16.tar.gz
+sha256  855a57d1694941ddf3c73cb79b8d0b3891e9c9e7870b4981613b734e1ad07601  gsm-1.0.17.tar.gz
diff --git a/bsp/buildroot/package/libgsm/libgsm.mk b/bsp/buildroot/package/libgsm/libgsm.mk
index 8e8335a0..0add45c5 100644
--- a/bsp/buildroot/package/libgsm/libgsm.mk
+++ b/bsp/buildroot/package/libgsm/libgsm.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBGSM_VERSION = 1.0.16
+LIBGSM_VERSION = 1.0.17
 LIBGSM_SOURCE = gsm-$(LIBGSM_VERSION).tar.gz
 LIBGSM_SITE = http://www.quut.com/gsm
 LIBGSM_LICENSE = gsm
diff --git a/bsp/buildroot/package/libgta/Config.in b/bsp/buildroot/package/libgta/Config.in
new file mode 100644
index 00000000..894dced0
--- /dev/null
+++ b/bsp/buildroot/package/libgta/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LIBGTA
+	bool "libgta"
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_XZ
+	help
+	  Libgta is a portable library that implements the Generic
+	  Tagged Array (GTA) file format.
+
+	  http://gta.nongnu.org
diff --git a/bsp/buildroot/package/libgta/libgta.hash b/bsp/buildroot/package/libgta/libgta.hash
new file mode 100644
index 00000000..d5fceb42
--- /dev/null
+++ b/bsp/buildroot/package/libgta/libgta.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 1d2ff713955eee28310de082a8fd8e236403c27dee3716ba1238c56e6643e4fb  libgta-1.0.8.tar.xz
+sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89  COPYING
diff --git a/bsp/buildroot/package/libgta/libgta.mk b/bsp/buildroot/package/libgta/libgta.mk
new file mode 100644
index 00000000..1189feef
--- /dev/null
+++ b/bsp/buildroot/package/libgta/libgta.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# libgta
+#
+################################################################################
+
+LIBGTA_VERSION = 1.0.8
+LIBGTA_SITE = http://download.savannah.nongnu.org/releases/gta
+LIBGTA_SOURCE = libgta-$(LIBGTA_VERSION).tar.xz
+LIBGTA_INSTALL_STAGING = YES
+LIBGTA_DEPENDENCIES = host-pkgconf bzip2 xz zlib
+LIBGTA_LICENSE = LGPL-2.1+
+LIBGTA_LICENSE_FILES = COPYING
+
+LIBGTA_CONF_OPTS += -DGTA_BUILD_DOCUMENTATION=OFF
+
+ifeq ($(BR2_STATIC_LIBS),)
+LIBGTA_CONF_OPTS += -DGTA_BUILD_SHARED_LIB=ON
+else
+LIBGTA_CONF_OPTS += -DGTA_BUILD_SHARED_LIB=OFF
+endif
+
+ifeq ($(BR2_SHARED_LIBS),)
+LIBGTA_CONF_OPTS += -DGTA_BUILD_STATIC_LIB=ON
+else
+LIBGTA_CONF_OPTS += -DGTA_BUILD_STATIC_LIB=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libgtk2/Config.in b/bsp/buildroot/package/libgtk2/Config.in
index b6cf37e1..aa297d71 100644
--- a/bsp/buildroot/package/libgtk2/Config.in
+++ b/bsp/buildroot/package/libgtk2/Config.in
@@ -1,5 +1,11 @@
 config BR2_PACKAGE_LIBGTK2
 	bool "libgtk2"
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	depends on BR2_INSTALL_LIBSTDCPP # pango
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	select BR2_PACKAGE_ATK
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PS
@@ -12,12 +18,6 @@ config BR2_PACKAGE_LIBGTK2
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXRENDER
-	depends on BR2_PACKAGE_XORG7
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	depends on BR2_USE_MMU # glib2
-	depends on BR2_INSTALL_LIBSTDCPP # pango
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	help
 	  The GTK+ version 2 graphical user interface library
 
diff --git a/bsp/buildroot/package/libgtk2/libgtk2.mk b/bsp/buildroot/package/libgtk2/libgtk2.mk
index cf8b2f4e..0b26d720 100644
--- a/bsp/buildroot/package/libgtk2/libgtk2.mk
+++ b/bsp/buildroot/package/libgtk2/libgtk2.mk
@@ -9,14 +9,14 @@ LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).31
 LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz
 LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR)
 LIBGTK2_INSTALL_STAGING = YES
-LIBGTK2_LICENSE = LGPLv2+
+LIBGTK2_LICENSE = LGPL-2.0+
 LIBGTK2_LICENSE_FILES = COPYING
 # For 0001-reduce-dependencies.patch
 LIBGTK2_AUTORECONF = YES
 
 LIBGTK2_CONF_ENV = \
-	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
-	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
+	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \
+	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \
 	DB2HTML=false
 
 LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no
@@ -120,7 +120,7 @@ define HOST_LIBGTK2_BUILD_CMDS
 endef
 
 define HOST_LIBGTK2_INSTALL_CMDS
-	cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin
+	cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/bin
 endef
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libgtk3/Config.in b/bsp/buildroot/package/libgtk3/Config.in
index 738f8650..12e64707 100644
--- a/bsp/buildroot/package/libgtk3/Config.in
+++ b/bsp/buildroot/package/libgtk3/Config.in
@@ -12,6 +12,13 @@ comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend"
 
 config BR2_PACKAGE_LIBGTK3
 	bool "libgtk3"
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	depends on BR2_INSTALL_LIBSTDCPP # pango
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
+	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+		BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_ATK
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PS
@@ -24,13 +31,6 @@ config BR2_PACKAGE_LIBGTK3
 	# At least one backend is required
 	select BR2_PACKAGE_LIBGTK3_BROADWAY if \
 		!(BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND)
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	depends on BR2_USE_MMU # glib2
-	depends on BR2_INSTALL_LIBSTDCPP # pango
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
-	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
-		BR2_PACKAGE_HAS_LIBGL
 	help
 	  The GTK+ version 3 graphical user interface library
 
@@ -42,13 +42,13 @@ config BR2_PACKAGE_LIBGTK3_BROADWAY
 	bool "Broadway GDK backend"
 	default y
 	  help
-	  This enables the Broadway backend for GDK, which provides support
-	  for displaying GTK+ applications in a web browser, using HTML5 and
-	  web sockets.
+	  This enables the Broadway backend for GDK, which provides
+	  support for displaying GTK+ applications in a web browser,
+	  using HTML5 and web sockets.
 
 	  For example, to run gtk3-demo on a target which IP address is
-	  192.168.0.1 and use it from a web browser, execute the following
-	  commands:
+	  192.168.0.1 and use it from a web browser, execute the
+	  following commands:
 
 	  $ broadwayd -a 192.168.0.1 -p 8080 :2 &
 	  $ export GDK_BACKEND=broadway
diff --git a/bsp/buildroot/package/libgtk3/libgtk3.hash b/bsp/buildroot/package/libgtk3/libgtk3.hash
index 12a25c9c..0f259e9a 100644
--- a/bsp/buildroot/package/libgtk3/libgtk3.hash
+++ b/bsp/buildroot/package/libgtk3/libgtk3.hash
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.7.sha256sum
-sha256 a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432  gtk+-3.22.7.tar.xz
+# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.15.sha256sum
+sha256 c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb  gtk+-3.22.15.tar.xz
diff --git a/bsp/buildroot/package/libgtk3/libgtk3.mk b/bsp/buildroot/package/libgtk3/libgtk3.mk
index a1b8fc60..b4a8b8c5 100644
--- a/bsp/buildroot/package/libgtk3/libgtk3.mk
+++ b/bsp/buildroot/package/libgtk3/libgtk3.mk
@@ -5,24 +5,22 @@
 ################################################################################
 
 LIBGTK3_VERSION_MAJOR = 3.22
-LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).7
+LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).15
 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz
 LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR)
-LIBGTK3_LICENSE = LGPLv2+
+LIBGTK3_LICENSE = LGPL-2.0+
 LIBGTK3_LICENSE_FILES = COPYING
 LIBGTK3_INSTALL_STAGING = YES
 LIBGTK3_AUTORECONF = YES
 
 LIBGTK3_CONF_ENV = \
-	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \
-	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \
-	PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/usr/bin/pkgconf
+	ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/bin/gtk-update-icon-cache \
+	ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/bin/gdk-pixbuf-csource \
+	PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/bin/pkgconf
 
 LIBGTK3_CONF_OPTS = \
 	--disable-glibtest \
-	--enable-explicit-deps=no \
-	--enable-gtk2-dependency \
-	--disable-introspection
+	--enable-explicit-deps=no
 
 # Override pkg-config pkgdatadir variable, it needs the prefix
 LIBGTK3_MAKE_OPTS = \
@@ -125,7 +123,7 @@ LIBGTK3_CONF_OPTS += --disable-installed-tests
 endif
 
 define LIBGTK3_COMPILE_GLIB_SCHEMAS
-	$(HOST_DIR)/usr/bin/glib-compile-schemas \
+	$(HOST_DIR)/bin/glib-compile-schemas \
 		$(TARGET_DIR)/usr/share/glib-2.0/schemas
 endef
 
@@ -153,8 +151,8 @@ HOST_LIBGTK3_DEPENDENCIES = \
 	host-librsvg
 
 HOST_LIBGTK3_CFLAGS = \
-	`$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \
-	`$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gio-2.0`
+	`$(HOST_DIR)/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \
+	`$(HOST_DIR)/bin/pkgconf --cflags --libs gio-2.0`
 
 define HOST_LIBGTK3_CONFIGURE_CMDS
 	echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h
@@ -175,16 +173,16 @@ endef
 
 define HOST_LIBGTK3_INSTALL_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/gtk/gtk-update-icon-cache \
-		$(HOST_DIR)/usr/bin/gtk-update-icon-cache
+		$(HOST_DIR)/bin/gtk-update-icon-cache
 	$(INSTALL) -D -m 0755 $(@D)/gtk/gtk-encode-symbolic-svg \
-		$(HOST_DIR)/usr/bin/gtk-encode-symbolic-svg
+		$(HOST_DIR)/bin/gtk-encode-symbolic-svg
 endef
 
 # Create icon-theme.cache for each of the icon directories/themes
 # It's not strictly necessary but speeds up lookups
 define LIBGTK3_UPDATE_ICON_CACHE
 	find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \
-		-exec $(HOST_DIR)/usr/bin/gtk-update-icon-cache {} \;
+		-exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \;
 endef
 LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE
 
diff --git a/bsp/buildroot/package/libgudev/libgudev.mk b/bsp/buildroot/package/libgudev/libgudev.mk
index dce9cd8e..fce710a1 100644
--- a/bsp/buildroot/package/libgudev/libgudev.mk
+++ b/bsp/buildroot/package/libgudev/libgudev.mk
@@ -9,7 +9,7 @@ LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz
 LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION)
 LIBGUDEV_INSTALL_STAGING = YES
 LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2
-LIBGUDEV_LICENSE = LGPLv2.1+
+LIBGUDEV_LICENSE = LGPL-2.1+
 LIBGUDEV_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libhdhomerun/libhdhomerun.hash b/bsp/buildroot/package/libhdhomerun/libhdhomerun.hash
index 78977641..0938889d 100644
--- a/bsp/buildroot/package/libhdhomerun/libhdhomerun.hash
+++ b/bsp/buildroot/package/libhdhomerun/libhdhomerun.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf	libhdhomerun_20150826.tgz
+sha256 0cb392231961fab6c226c69012503e2ebe46ac0f13512689bd37d6cf9ee838a1  libhdhomerun_20170930.tgz
diff --git a/bsp/buildroot/package/libhdhomerun/libhdhomerun.mk b/bsp/buildroot/package/libhdhomerun/libhdhomerun.mk
index 16e34c23..10aff88e 100644
--- a/bsp/buildroot/package/libhdhomerun/libhdhomerun.mk
+++ b/bsp/buildroot/package/libhdhomerun/libhdhomerun.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-LIBHDHOMERUN_VERSION = 20150826
+LIBHDHOMERUN_VERSION = 20170930
 LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz
 LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun
-LIBHDHOMERUN_LICENSE = LGPLv2.1+
-LIBHDHOMERUN_LICENSE_FILES = lgpl.txt
+LIBHDHOMERUN_LICENSE = LGPL-2.1+
+LIBHDHOMERUN_LICENSE_FILES = LICENSE
 LIBHDHOMERUN_INSTALL_STAGING = YES
 
 define LIBHDHOMERUN_BUILD_CMDS
diff --git a/bsp/buildroot/package/libhid/libhid.mk b/bsp/buildroot/package/libhid/libhid.mk
index 8b3cb2af..b2e890c3 100644
--- a/bsp/buildroot/package/libhid/libhid.mk
+++ b/bsp/buildroot/package/libhid/libhid.mk
@@ -9,7 +9,7 @@ LIBHID_SITE = http://sources.buildroot.net
 LIBHID_DEPENDENCIES = libusb-compat libusb
 LIBHID_INSTALL_STAGING = YES
 LIBHID_AUTORECONF = YES
-LIBHID_LICENSE = GPLv2
+LIBHID_LICENSE = GPL-2.0
 LIBHID_LICENSE_FILES = COPYING
 # configure runs libusb-config for cflags/ldflags. Ensure it picks up
 # the target version
diff --git a/bsp/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/bsp/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch
index df166565..70f16f66 100644
--- a/bsp/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch
+++ b/bsp/buildroot/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch
@@ -8,28 +8,32 @@ This allows "make install; make install" to work properly.
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Signed-off-by: Renaud AUBIN <root@renaud.io>
 ---
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 33c8ba0..b36d95a 100644
+index 6cf63bd..c182e5c 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c
+@@ -133,14 +133,14 @@ tags: http_parser.c http_parser.h test.c
  install: library
- 	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
- 	$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
-+	ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
+ 	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+ 	$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+-	ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+-	ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
++	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
  
  install-strip: library
- 	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
- 	$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
-+	ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
+ 	$(INSTALL) -D  http_parser.h $(DESTDIR)$(INCLUDEDIR)/http_parser.h
+ 	$(INSTALL) -D -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
+-	ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
+-	ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
++	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++	ln -sf $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
  
  uninstall:
- 	rm $(INCLUDEDIR)/http_parser.h
+ 	rm $(DESTDIR)$(INCLUDEDIR)/http_parser.h
 -- 
 2.6.2
 
diff --git a/bsp/buildroot/package/libhttpparser/libhttpparser.hash b/bsp/buildroot/package/libhttpparser/libhttpparser.hash
index e11006e8..8ffceb24 100644
--- a/bsp/buildroot/package/libhttpparser/libhttpparser.hash
+++ b/bsp/buildroot/package/libhttpparser/libhttpparser.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 libhttpparser-v2.6.0.tar.gz
+sha256 7277c6f99bf6fc272eb5d8fc3dca01e7cc1d4ae609b5d2c5d5e18added98479d  libhttpparser-v2.8.0.tar.gz
diff --git a/bsp/buildroot/package/libhttpparser/libhttpparser.mk b/bsp/buildroot/package/libhttpparser/libhttpparser.mk
index 015efc0a..5f50d877 100644
--- a/bsp/buildroot/package/libhttpparser/libhttpparser.mk
+++ b/bsp/buildroot/package/libhttpparser/libhttpparser.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBHTTPPARSER_VERSION = v2.6.0
+LIBHTTPPARSER_VERSION = v2.8.0
 LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION))
 LIBHTTPPARSER_INSTALL_STAGING = YES
 LIBHTTPPARSER_LICENSE = MIT
@@ -23,4 +23,13 @@ define LIBHTTPPARSER_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(TARGET_DIR)/usr install
 endef
 
+define HOST_LIBHTTPPARSER_BUILD_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) library package
+endef
+
+define HOST_LIBHTTPPARSER_INSTALL_CMDS
+	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) PREFIX=$(HOST_DIR)/usr install
+endef
+
 $(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/libical/Config.in b/bsp/buildroot/package/libical/Config.in
index 3220d5be..7c1d4a14 100644
--- a/bsp/buildroot/package/libical/Config.in
+++ b/bsp/buildroot/package/libical/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_LIBICAL
 	depends on BR2_USE_WCHAR
 	select BR2_TARGET_TZ_INFO
 	help
-	  libical is an Open Source (MPL/LGPL) implementation of the IETF's
-	  iCalendar Calendaring and Scheduling protocols.
+	  libical is an Open Source (MPL/LGPL) implementation of the
+	  IETF's iCalendar Calendaring and Scheduling protocols.
 
 	  http://libical.github.io/libical
 
diff --git a/bsp/buildroot/package/libical/libical.mk b/bsp/buildroot/package/libical/libical.mk
index a5110395..7125aa8b 100644
--- a/bsp/buildroot/package/libical/libical.mk
+++ b/bsp/buildroot/package/libical/libical.mk
@@ -7,7 +7,7 @@
 LIBICAL_VERSION = 1.0.1
 LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION)
 LIBICAL_INSTALL_STAGING = YES
-LIBICAL_LICENSE = MPLv1.0 or LGPLv2.1
+LIBICAL_LICENSE = MPL-1.0 or LGPL-2.1
 LIBICAL_LICENSE_FILES = LICENSE
 
 # building without this option is broken, it is used by
diff --git a/bsp/buildroot/package/libiconv/libiconv.hash b/bsp/buildroot/package/libiconv/libiconv.hash
index 83de76f4..440daee5 100644
--- a/bsp/buildroot/package/libiconv/libiconv.hash
+++ b/bsp/buildroot/package/libiconv/libiconv.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613	libiconv-1.14.tar.gz
+sha256	ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178	libiconv-1.15.tar.gz
diff --git a/bsp/buildroot/package/libiconv/libiconv.mk b/bsp/buildroot/package/libiconv/libiconv.mk
index f014da0f..9a813361 100644
--- a/bsp/buildroot/package/libiconv/libiconv.mk
+++ b/bsp/buildroot/package/libiconv/libiconv.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBICONV_VERSION = 1.14
+LIBICONV_VERSION = 1.15
 LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv
 LIBICONV_INSTALL_STAGING = YES
-LIBICONV_LICENSE = GPLv3+ (iconv program), LGPLv2+ (library)
+LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library)
 LIBICONV_LICENSE_FILES = COPYING COPYING.LIB
 
 # Don't build the preloadable library, as we don't need it (it's only
diff --git a/bsp/buildroot/package/libid3tag/libid3tag.mk b/bsp/buildroot/package/libid3tag/libid3tag.mk
index 2cd7820d..951ae09c 100644
--- a/bsp/buildroot/package/libid3tag/libid3tag.mk
+++ b/bsp/buildroot/package/libid3tag/libid3tag.mk
@@ -6,7 +6,7 @@
 
 LIBID3TAG_VERSION = 0.15.1b
 LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION)
-LIBID3TAG_LICENSE = GPLv2+
+LIBID3TAG_LICENSE = GPL-2.0+
 LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT
 LIBID3TAG_INSTALL_STAGING = YES
 LIBID3TAG_DEPENDENCIES = zlib
diff --git a/bsp/buildroot/package/libidn/0002-Update-intprops.h-for-gcc-7-compatibility.patch b/bsp/buildroot/package/libidn/0002-Update-intprops.h-for-gcc-7-compatibility.patch
new file mode 100644
index 00000000..89720442
--- /dev/null
+++ b/bsp/buildroot/package/libidn/0002-Update-intprops.h-for-gcc-7-compatibility.patch
@@ -0,0 +1,333 @@
+From bd705da12e244dda18474a54a2942591e5ef5148 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Wed, 1 Feb 2017 10:44:36 +0100
+Subject: [PATCH] Update intprops.h for gcc-7 compatibility
+
+[Backport from upstream commit 230930b3bc3e431b819eb45420cb42475d83ca93.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ gl/intprops.h          | 65 ++++++++++++++++++++++++++++++--------------------
+ lib/gltests/intprops.h | 65 ++++++++++++++++++++++++++++++--------------------
+ 2 files changed, 78 insertions(+), 52 deletions(-)
+
+diff --git a/gl/intprops.h b/gl/intprops.h
+index e1fce5c9..eb06b691 100644
+--- a/gl/intprops.h
++++ b/gl/intprops.h
+@@ -1,18 +1,18 @@
+ /* intprops.h -- properties of integer types
+ 
+-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
++   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published
+-   by the Free Software Foundation; either version 3 of the License, or
++   under the terms of the GNU Lesser General Public License as published
++   by the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU General Public License
++   You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ /* Written by Paul Eggert.  */
+@@ -47,12 +47,16 @@
+ 
+ /* Minimum and maximum values for integer types and expressions.  */
+ 
++/* The width in bits of the integer type or expression T.
++   Padding bits are not supported; this is checked at compile-time below.  */
++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
++
+ /* The maximum and minimum values for the integer type T.  */
+ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+ #define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
+-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
++        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+ 
+ /* The maximum and minimum values for the type of the expression E,
+    after integer promotion.  E should not have side effects.  */
+@@ -65,7 +69,13 @@
+    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+    : _GL_INT_NEGATE_CONVERT (e, 1))
+ #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
++  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
++
++/* Work around OpenVMS incompatibility with C99.  */
++#if !defined LLONG_MAX && defined __INT64_MAX
++# define LLONG_MAX __INT64_MAX
++# define LLONG_MIN __INT64_MIN
++#endif
+ 
+ /* This include file assumes that signed types are two's complement without
+    padding bits; the above macros have undefined behavior otherwise.
+@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+ verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ #endif
++/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined.  */
++#ifdef UINT_WIDTH
++verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH);
++#endif
+ 
+ /* Does the __typeof__ keyword work?  This could be done by
+    'configure', but for now it's easier to do it by hand.  */
+-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
++#if (2 <= __GNUC__ \
++     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+      || (0x5110 <= __SUNPRO_C && !__STDC__))
+ # define _GL_HAVE___TYPEOF__ 1
+ #else
+@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+    signed, this macro may overestimate the true bound by one byte when
+    applied to unsigned types of size 2, 4, 16, ... bytes.  */
+ #define INT_STRLEN_BOUND(t)                                     \
+-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
+-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
++  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+    + _GL_SIGNED_TYPE_OR_EXPR (t))
+ 
+ /* Bound on buffer size needed to represent an integer type or expression T,
+@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+    ? (a) < (min) >> (b)                                 \
+    : (max) >> (b) < (a))
+ 
+-/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
+-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
++/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
++#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
++
++/* True if __builtin_add_overflow_p (A, B, C) works.  */
++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+ 
+ /* The _GL*_OVERFLOW macros have the same restrictions as the
+    *_RANGE_OVERFLOW macros, except that they do not assume that operands
+    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+    that the result (e.g., A + B) has that type.  */
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
+-   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
+-   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
+-   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
++#if _GL_HAS_BUILTIN_OVERFLOW_P
++# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
++   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
++   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
++   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+ #define INT_SUBTRACT_OVERFLOW(a, b) \
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
++#if _GL_HAS_BUILTIN_OVERFLOW_P
+ # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+ #else
+ # define INT_NEGATE_OVERFLOW(a) \
+@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ #define INT_MULTIPLY_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+ 
+-#ifndef __has_builtin
+-# define __has_builtin(x) 0
+-#endif
+-
+ /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+    https://llvm.org/bugs/show_bug.cgi?id=25390
+@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+    overflow predicate.  Return 1 if the result overflows.  See above
+    for restrictions.  */
+-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
++#if _GL_HAS_BUILTIN_OVERFLOW
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
+ #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ # else
+ #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+-                     long int, LONG_MIN, LONG_MAX))
++                     long int, LONG_MIN, LONG_MAX)
+ # endif
+ #endif
+ 
+diff --git a/lib/gltests/intprops.h b/lib/gltests/intprops.h
+index e1fce5c9..eb06b691 100644
+--- a/lib/gltests/intprops.h
++++ b/lib/gltests/intprops.h
+@@ -1,18 +1,18 @@
+ /* intprops.h -- properties of integer types
+ 
+-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
++   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify it
+-   under the terms of the GNU General Public License as published
+-   by the Free Software Foundation; either version 3 of the License, or
++   under the terms of the GNU Lesser General Public License as published
++   by the Free Software Foundation; either version 2.1 of the License, or
+    (at your option) any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-   GNU General Public License for more details.
++   GNU Lesser General Public License for more details.
+ 
+-   You should have received a copy of the GNU General Public License
++   You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+ 
+ /* Written by Paul Eggert.  */
+@@ -47,12 +47,16 @@
+ 
+ /* Minimum and maximum values for integer types and expressions.  */
+ 
++/* The width in bits of the integer type or expression T.
++   Padding bits are not supported; this is checked at compile-time below.  */
++#define TYPE_WIDTH(t) (sizeof (t) * CHAR_BIT)
++
+ /* The maximum and minimum values for the integer type T.  */
+ #define TYPE_MINIMUM(t) ((t) ~ TYPE_MAXIMUM (t))
+ #define TYPE_MAXIMUM(t)                                                 \
+   ((t) (! TYPE_SIGNED (t)                                               \
+         ? (t) -1                                                        \
+-        : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
++        : ((((t) 1 << (TYPE_WIDTH (t) - 2)) - 1) * 2 + 1)))
+ 
+ /* The maximum and minimum values for the type of the expression E,
+    after integer promotion.  E should not have side effects.  */
+@@ -65,7 +69,13 @@
+    ? _GL_SIGNED_INT_MAXIMUM (e)                                         \
+    : _GL_INT_NEGATE_CONVERT (e, 1))
+ #define _GL_SIGNED_INT_MAXIMUM(e)                                       \
+-  (((_GL_INT_CONVERT (e, 1) << (sizeof ((e) + 0) * CHAR_BIT - 2)) - 1) * 2 + 1)
++  (((_GL_INT_CONVERT (e, 1) << (TYPE_WIDTH ((e) + 0) - 2)) - 1) * 2 + 1)
++
++/* Work around OpenVMS incompatibility with C99.  */
++#if !defined LLONG_MAX && defined __INT64_MAX
++# define LLONG_MAX __INT64_MAX
++# define LLONG_MIN __INT64_MIN
++#endif
+ 
+ /* This include file assumes that signed types are two's complement without
+    padding bits; the above macros have undefined behavior otherwise.
+@@ -84,10 +94,15 @@ verify (TYPE_MAXIMUM (long int) == LONG_MAX);
+ verify (TYPE_MINIMUM (long long int) == LLONG_MIN);
+ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ #endif
++/* Similarly, sanity-check one ISO/IEC TS 18661-1:2014 macro if defined.  */
++#ifdef UINT_WIDTH
++verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH);
++#endif
+ 
+ /* Does the __typeof__ keyword work?  This could be done by
+    'configure', but for now it's easier to do it by hand.  */
+-#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \
++#if (2 <= __GNUC__ \
++     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+      || (0x5110 <= __SUNPRO_C && !__STDC__))
+ # define _GL_HAVE___TYPEOF__ 1
+ #else
+@@ -116,8 +131,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+    signed, this macro may overestimate the true bound by one byte when
+    applied to unsigned types of size 2, 4, 16, ... bytes.  */
+ #define INT_STRLEN_BOUND(t)                                     \
+-  (INT_BITS_STRLEN_BOUND (sizeof (t) * CHAR_BIT                 \
+-                          - _GL_SIGNED_TYPE_OR_EXPR (t))        \
++  (INT_BITS_STRLEN_BOUND (TYPE_WIDTH (t) - _GL_SIGNED_TYPE_OR_EXPR (t)) \
+    + _GL_SIGNED_TYPE_OR_EXPR (t))
+ 
+ /* Bound on buffer size needed to represent an integer type or expression T,
+@@ -222,20 +236,23 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+    ? (a) < (min) >> (b)                                 \
+    : (max) >> (b) < (a))
+ 
+-/* True if __builtin_add_overflow (A, B, P) works when P is null.  */
+-#define _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL (7 <= __GNUC__)
++/* True if __builtin_add_overflow (A, B, P) works when P is non-null.  */
++#define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__)
++
++/* True if __builtin_add_overflow_p (A, B, C) works.  */
++#define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__)
+ 
+ /* The _GL*_OVERFLOW macros have the same restrictions as the
+    *_RANGE_OVERFLOW macros, except that they do not assume that operands
+    (e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+    that the result (e.g., A + B) has that type.  */
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
+-   __builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
+-   __builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
+-   __builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
++#if _GL_HAS_BUILTIN_OVERFLOW_P
++# define _GL_ADD_OVERFLOW(a, b, min, max)                               \
++   __builtin_add_overflow_p (a, b, (__typeof__ ((a) + (b))) 0)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)                          \
++   __builtin_sub_overflow_p (a, b, (__typeof__ ((a) - (b))) 0)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)                          \
++   __builtin_mul_overflow_p (a, b, (__typeof__ ((a) * (b))) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)                                \
+    ((min) < 0 ? INT_ADD_RANGE_OVERFLOW (a, b, min, max)                  \
+@@ -315,7 +332,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_ADD_OVERFLOW)
+ #define INT_SUBTRACT_OVERFLOW(a, b) \
+   _GL_BINARY_OP_OVERFLOW (a, b, _GL_SUBTRACT_OVERFLOW)
+-#if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
++#if _GL_HAS_BUILTIN_OVERFLOW_P
+ # define INT_NEGATE_OVERFLOW(a) INT_SUBTRACT_OVERFLOW (0, a)
+ #else
+ # define INT_NEGATE_OVERFLOW(a) \
+@@ -349,10 +366,6 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ #define INT_MULTIPLY_WRAPV(a, b, r) \
+   _GL_INT_OP_WRAPV (a, b, r, *, __builtin_mul_overflow, INT_MULTIPLY_OVERFLOW)
+ 
+-#ifndef __has_builtin
+-# define __has_builtin(x) 0
+-#endif
+-
+ /* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
+    https://llvm.org/bugs/show_bug.cgi?id=25390
+@@ -369,7 +382,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+    the operation.  BUILTIN is the builtin operation, and OVERFLOW the
+    overflow predicate.  Return 1 if the result overflows.  See above
+    for restrictions.  */
+-#if 5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)
++#if _GL_HAS_BUILTIN_OVERFLOW
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) builtin (a, b, r)
+ #elif 201112 <= __STDC_VERSION__ && !_GL__GENERIC_BOGUS
+ # define _GL_INT_OP_WRAPV(a, b, r, op, builtin, overflow) \
+@@ -412,7 +425,7 @@ verify (TYPE_MAXIMUM (long long int) == LLONG_MAX);
+ # else
+ #  define _GL_INT_OP_WRAPV_LONGISH(a, b, r, op, overflow) \
+     _GL_INT_OP_CALC (a, b, r, op, overflow, unsigned long int, \
+-                     long int, LONG_MIN, LONG_MAX))
++                     long int, LONG_MIN, LONG_MAX)
+ # endif
+ #endif
+ 
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/libidn/Config.in b/bsp/buildroot/package/libidn/Config.in
index 7b558c71..20e0e2b5 100644
--- a/bsp/buildroot/package/libidn/Config.in
+++ b/bsp/buildroot/package/libidn/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBIDN
 	bool "libidn"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Libidn's purpose is to encode and decode internationalized
 	  domain names.
diff --git a/bsp/buildroot/package/libidn/libidn.mk b/bsp/buildroot/package/libidn/libidn.mk
index c4088aeb..b50a8b62 100644
--- a/bsp/buildroot/package/libidn/libidn.mk
+++ b/bsp/buildroot/package/libidn/libidn.mk
@@ -9,8 +9,8 @@ LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn
 LIBIDN_INSTALL_STAGING = YES
 LIBIDN_CONF_ENV = EMACS="no" MAKEINFO=true
 LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no
-LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+
+LIBIDN_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+LIBIDN_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+
 LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3
 # lib/punycode.c patch triggers reconf in doc/
 LIBIDN_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libiio/0001-utilities.c-Add-a-check-for-newlocale-function.patch b/bsp/buildroot/package/libiio/0001-utilities.c-Add-a-check-for-newlocale-function.patch
deleted file mode 100644
index cea22cbc..00000000
--- a/bsp/buildroot/package/libiio/0001-utilities.c-Add-a-check-for-newlocale-function.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 913c2cc740d60450e91e066cf38f5654936a6015 Mon Sep 17 00:00:00 2001
-From: Paul Cercueil <paul.cercueil@analog.com>
-Date: Mon, 6 Feb 2017 14:04:47 +0100
-Subject: [PATCH] utilities.c: Add a check for newlocale() function
-
-uClibc might define __UCLIBC_HAS_LOCALE__, without actually providing
-the locale_t type or the setlocale() function.
-
-Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
----
- CMakeLists.txt       | 1 +
- iio-config.h.cmakein | 1 +
- utilities.c          | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cb3a48f..b24eff3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,6 +66,7 @@ endif()
- include(CheckSymbolExists)
- check_symbol_exists(strdup "string.h" HAS_STRDUP)
- check_symbol_exists(strerror_r "string.h" HAS_STRERROR_R)
-+check_symbol_exists(newlocale "locale.h" HAS_NEWLOCALE)
- 
- IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- 	option(WITH_IIOD "Build the IIO Daemon" ON)
-diff --git a/iio-config.h.cmakein b/iio-config.h.cmakein
-index 1b8608e..6700326 100644
---- a/iio-config.h.cmakein
-+++ b/iio-config.h.cmakein
-@@ -21,6 +21,7 @@
- #cmakedefine HAS_PIPE2
- #cmakedefine HAS_STRDUP
- #cmakedefine HAS_STRERROR_R
-+#cmakedefine HAS_NEWLOCALE
- #cmakedefine HAS_PTHREAD_SETNAME_NP
- #cmakedefine HAVE_IPV6
- #cmakedefine HAVE_AVAHI
-diff --git a/utilities.c b/utilities.c
-index 88b8257..21dbd10 100644
---- a/utilities.c
-+++ b/utilities.c
-@@ -34,7 +34,7 @@
- #endif
- 
- #ifdef LOCALE_SUPPORT
--#if defined(__MINGW32__)
-+#if defined(__MINGW32__) || (!defined(_WIN32) && !defined(HAS_NEWLOCALE))
- static int read_double_locale(const char *str, double *val)
- {
- 	char *end, *old_locale;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/libiio/Config.in b/bsp/buildroot/package/libiio/Config.in
index 6f6af168..b58ac7fd 100644
--- a/bsp/buildroot/package/libiio/Config.in
+++ b/bsp/buildroot/package/libiio/Config.in
@@ -17,24 +17,24 @@ config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
 
 config BR2_PACKAGE_LIBIIO_XML_BACKEND
 	bool "XML backend"
-	select BR2_PACKAGE_LIBXML2
 	default y
+	select BR2_PACKAGE_LIBXML2
 	help
 	  Enable the XML backend of the library.
 
 config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
 	bool "Network backend"
-	select BR2_PACKAGE_LIBIIO_XML_BACKEND
 	default y
+	select BR2_PACKAGE_LIBIIO_XML_BACKEND
 	help
 	  Enable the network backend of the library.
 
 config BR2_PACKAGE_LIBIIO_USB_BACKEND
 	bool "USB backend"
+	default y
 	depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb
 	select BR2_PACKAGE_LIBIIO_XML_BACKEND
 	select BR2_PACKAGE_LIBUSB
-	default y
 	help
 	  Enable the USB backend of the library.
 
@@ -43,18 +43,17 @@ comment "The USB backend needs a toolchain w/ threads"
 
 config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND
 	bool "Serial backend"
+	default y
 	select BR2_PACKAGE_LIBIIO_XML_BACKEND
 	select BR2_PACKAGE_LIBSERIALPORT
-	default y
 	help
 	  Enable the serial backend of the library.
 
 config BR2_PACKAGE_LIBIIO_IIOD
 	bool "IIO Daemon"
-	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_bfin
 	default y
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
 	help
 	  Install the IIO Daemon.
 
@@ -74,16 +73,9 @@ comment "USB support in the IIO Daemon requires libaio, headers >= 3.18"
 
 comment "IIO Daemon needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_bfin
-
-comment "IIO Daemon is not yet available on Blackfin"
-	depends on BR2_bfin
 
 config BR2_PACKAGE_LIBIIO_TESTS
 	bool "Install test programs"
-	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
-	select BR2_PACKAGE_LIBIIO_XML_BACKEND
-	select BR2_PACKAGE_LIBIIO_NETWORK_BACKEND
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Install the test programs (iio_info, iio_genxml, iio_readdev).
@@ -99,7 +91,7 @@ config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP
 
 config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON
 	bool "Install Python bindings"
-	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
 	help
 	  Install the Python bindings.
 
diff --git a/bsp/buildroot/package/libiio/libiio.hash b/bsp/buildroot/package/libiio/libiio.hash
index e5387861..027e2a07 100644
--- a/bsp/buildroot/package/libiio/libiio.hash
+++ b/bsp/buildroot/package/libiio/libiio.hash
@@ -1,2 +1,2 @@
-# From https://github.com/analogdevicesinc/libiio/archive/v0.9/
-sha256	b6184876d192fbfd51e3a0a29736fa1be2dbaf07370cf861797076f40a85f823	libiio-0.9.tar.gz
+# Locally calculated
+sha256 002d57f35715821efae66479859bc5357b4d8d33bfff1446b4e17b02ae2c10d2  libiio-0.10.tar.gz
diff --git a/bsp/buildroot/package/libiio/libiio.mk b/bsp/buildroot/package/libiio/libiio.mk
index d7d7f597..3fbd3918 100644
--- a/bsp/buildroot/package/libiio/libiio.mk
+++ b/bsp/buildroot/package/libiio/libiio.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBIIO_VERSION = 0.9
+LIBIIO_VERSION = 0.10
 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
 LIBIIO_INSTALL_STAGING = YES
-LIBIIO_LICENSE = LGPLv2.1+
+LIBIIO_LICENSE = LGPL-2.1+
 LIBIIO_LICENSE_FILES = COPYING.txt
 
 LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \
@@ -60,7 +60,11 @@ LIBIIO_DEPENDENCIES += avahi
 endif
 
 ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y)
+ifeq ($(BR2_PACKAGE_PYTHON),y)
 LIBIIO_DEPENDENCIES += python
+else ifeq ($(BR2_PACKAGE_PYTHON3),y)
+LIBIIO_DEPENDENCIES += python3
+endif
 LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON
 else
 LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF
@@ -69,11 +73,11 @@ endif
 ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP),y)
 define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET
 	rm $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll.mdb
-	$(HOST_DIR)/usr/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \
+	$(HOST_DIR)/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \
 		$(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll
 endef
 define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_STAGING
-	$(HOST_DIR)/usr/bin/gacutil -root $(STAGING_DIR)/usr/lib -i \
+	$(HOST_DIR)/bin/gacutil -root $(STAGING_DIR)/usr/lib -i \
 		$(STAGING_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll
 endef
 LIBIIO_POST_INSTALL_TARGET_HOOKS += LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET
diff --git a/bsp/buildroot/package/libilbc/libilbc.hash b/bsp/buildroot/package/libilbc/libilbc.hash
new file mode 100644
index 00000000..e6789c5e
--- /dev/null
+++ b/bsp/buildroot/package/libilbc/libilbc.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 70cd6a4f6bbe6dcebfc4293eea7b6200f883d1bf0affa1efba819d44d274e35f  libilbc-829b08c7902ceb87a261279fabb36b6d523c6e07.tar.gz
diff --git a/bsp/buildroot/package/libimxvpuapi/libimxvpuapi.mk b/bsp/buildroot/package/libimxvpuapi/libimxvpuapi.mk
index d368d3d0..bcabbf38 100644
--- a/bsp/buildroot/package/libimxvpuapi/libimxvpuapi.mk
+++ b/bsp/buildroot/package/libimxvpuapi/libimxvpuapi.mk
@@ -6,7 +6,7 @@
 
 LIBIMXVPUAPI_VERSION = 0.10.3
 LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION))
-LIBIMXVPUAPI_LICENSE = LGPLv2.1+
+LIBIMXVPUAPI_LICENSE = LGPL-2.1+
 LIBIMXVPUAPI_LICENSE_FILES = LICENSE
 LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu
 LIBIMXVPUAPI_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libinput/libinput.hash b/bsp/buildroot/package/libinput/libinput.hash
index dd3573f2..4e64568c 100644
--- a/bsp/buildroot/package/libinput/libinput.hash
+++ b/bsp/buildroot/package/libinput/libinput.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2017-January/032746.html
-sha256 b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832  libinput-1.6.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2017-September/034949.html
+md5  e94e9aa765da9533c23b80b440638de9  libinput-1.8.2.tar.xz
+sha1 1c55462eb598b91c9c360f31170a408fb8d38d22  libinput-1.8.2.tar.xz
+sha256 013518ee0adb2287e6e1f08412efba2137320738cadb5399b783738f04cbab38  libinput-1.8.2.tar.xz
+sha512 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7  libinput-1.8.2.tar.xz
diff --git a/bsp/buildroot/package/libinput/libinput.mk b/bsp/buildroot/package/libinput/libinput.mk
index 52aca9ac..f904b796 100644
--- a/bsp/buildroot/package/libinput/libinput.mk
+++ b/bsp/buildroot/package/libinput/libinput.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBINPUT_VERSION = 1.6.0
+LIBINPUT_VERSION = 1.8.2
 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz
 LIBINPUT_SITE = http://www.freedesktop.org/software/libinput
 LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev
@@ -15,10 +15,10 @@ LIBINPUT_LICENSE_FILES = COPYING
 LIBINPUT_CONF_OPTS = --disable-tests --disable-libwacom
 
 ifeq ($(BR2_PACKAGE_LIBGTK3),y)
-LIBINPUT_CONF_OPTS += --enable-event-gui
+LIBINPUT_CONF_OPTS += --enable-debug-gui
 LIBINPUT_DEPENDENCIES += libgtk3
 else
-LIBINPUT_CONF_OPTS += --disable-event-gui
+LIBINPUT_CONF_OPTS += --disable-debug-gui
 endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libiqrf/libiqrf.mk b/bsp/buildroot/package/libiqrf/libiqrf.mk
index 05316029..f403a5e3 100644
--- a/bsp/buildroot/package/libiqrf/libiqrf.mk
+++ b/bsp/buildroot/package/libiqrf/libiqrf.mk
@@ -8,6 +8,6 @@ LIBIQRF_VERSION = v0.1.2
 LIBIQRF_SITE = $(call github,nandra,libiqrf,$(LIBIQRF_VERSION))
 LIBIQRF_INSTALL_STAGING = YES
 LIBIQRF_DEPENDENCIES = libusb
-LIBIQRF_LICENSE = LGPLv2.1+
+LIBIQRF_LICENSE = LGPL-2.1+
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libiscsi/Config.in b/bsp/buildroot/package/libiscsi/Config.in
index 88933f39..760fecea 100644
--- a/bsp/buildroot/package/libiscsi/Config.in
+++ b/bsp/buildroot/package/libiscsi/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_LIBISCSI
 	bool "libiscsi"
 	help
-	  Libiscsi is a client-side library to implement the iSCSI protocol
-	  that can be used to access resource of an iSCSI Target.
+	  Libiscsi is a client-side library to implement the iSCSI
+	  protocol that can be used to access resource of an iSCSI
+	  Target.
 
-	  The library is fully async with regards to iscsi commands and scsi
-	  tasks, but a sync layer is also provided for ease of use for simpler
-	  applications.
+	  The library is fully async with regards to iscsi commands and
+	  scsi tasks, but a sync layer is also provided for ease of use
+	  for simpler applications.
 
 	  https://github.com/sahlberg/libiscsi  (no proper homepage)
diff --git a/bsp/buildroot/package/libiscsi/libiscsi.mk b/bsp/buildroot/package/libiscsi/libiscsi.mk
index 4c8a2292..6c860082 100644
--- a/bsp/buildroot/package/libiscsi/libiscsi.mk
+++ b/bsp/buildroot/package/libiscsi/libiscsi.mk
@@ -6,7 +6,7 @@
 
 LIBISCSI_VERSION = 1.18.0
 LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION))
-LIBISCSI_LICENSE = GPLv2+, LGPLv2.1+
+LIBISCSI_LICENSE = GPL-2.0+, LGPL-2.1+
 LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt
 LIBISCSI_INSTALL_STAGING = YES
 LIBISCSI_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libite/libite.hash b/bsp/buildroot/package/libite/libite.hash
index 67ad009b..ec894c5e 100644
--- a/bsp/buildroot/package/libite/libite.hash
+++ b/bsp/buildroot/package/libite/libite.hash
@@ -1,2 +1,5 @@
 # Locally calculated
-sha256 b27e4af69e9e5b4d00924538d3a41b53752082cc439b9246edec5501aff2f22f libite-v1.8.2.tar.gz
+sha256 18c087123f02cc3cfb612bf53b12dc8a94d4d3ebf015ed5937b1f9203eef72f8  libite-v1.9.2.tar.gz
+sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5  LICENSE
+sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8  chomp.c
+sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d  pidfile.c
diff --git a/bsp/buildroot/package/libite/libite.mk b/bsp/buildroot/package/libite/libite.mk
index b56c430b..e88060d1 100644
--- a/bsp/buildroot/package/libite/libite.mk
+++ b/bsp/buildroot/package/libite/libite.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBITE_VERSION = v1.8.2
+LIBITE_VERSION = v1.9.2
 LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION))
-LIBITE_LICENSE = MIT, X11, ISC, BSD-2c
+LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause
 LIBITE_LICENSE_FILES = LICENSE chomp.c pidfile.c
 LIBITE_INSTALL_STAGING = YES
 LIBITE_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libjpeg/libjpeg.mk b/bsp/buildroot/package/libjpeg/libjpeg.mk
index b8f4bac5..36f084bf 100644
--- a/bsp/buildroot/package/libjpeg/libjpeg.mk
+++ b/bsp/buildroot/package/libjpeg/libjpeg.mk
@@ -7,7 +7,7 @@
 LIBJPEG_VERSION = 9b
 LIBJPEG_SITE = http://www.ijg.org/files
 LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz
-LIBJPEG_LICENSE = jpeg-license (BSD-3c-like)
+LIBJPEG_LICENSE = IJG
 LIBJPEG_LICENSE_FILES = README
 LIBJPEG_INSTALL_STAGING = YES
 LIBJPEG_PROVIDES = jpeg
@@ -18,5 +18,14 @@ endef
 
 LIBJPEG_POST_INSTALL_TARGET_HOOKS += LIBJPEG_REMOVE_USELESS_TOOLS
 
+define LIBJPEG_INSTALL_STAGING_PC
+	$(INSTALL) -D -m 0644 package/libjpeg/libjpeg.pc.in \
+		$(STAGING_DIR)/usr/lib/pkgconfig/libjpeg.pc
+	version=`sed -e '/^PACKAGE_VERSION/!d;s/PACKAGE_VERSION = \(.*\)/\1/' $(@D)/Makefile` ; \
+		$(SED) "s/@PACKAGE_VERSION@/$${version}/" $(STAGING_DIR)/usr/lib/pkgconfig/libjpeg.pc
+endef
+
+LIBJPEG_POST_INSTALL_STAGING_HOOKS += LIBJPEG_INSTALL_STAGING_PC
+
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/libjpeg/libjpeg.pc.in b/bsp/buildroot/package/libjpeg/libjpeg.pc.in
new file mode 100644
index 00000000..59220cac
--- /dev/null
+++ b/bsp/buildroot/package/libjpeg/libjpeg.pc.in
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: libjpeg
+Description: A JPEG codec that provides the libjpeg API
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -ljpeg
+Cflags: -I${includedir}
diff --git a/bsp/buildroot/package/libjson/libjson.mk b/bsp/buildroot/package/libjson/libjson.mk
index c73a69f1..74224ba6 100644
--- a/bsp/buildroot/package/libjson/libjson.mk
+++ b/bsp/buildroot/package/libjson/libjson.mk
@@ -8,7 +8,7 @@ LIBJSON_VERSION = 7.6.1
 LIBJSON_SITE = http://downloads.sourceforge.net/project/libjson
 LIBJSON_SOURCE = libjson_$(LIBJSON_VERSION).zip
 LIBJSON_INSTALL_STAGING = YES
-LIBJSON_LICENSE = BSD-2c
+LIBJSON_LICENSE = BSD-2-Clause
 LIBJSON_LICENSE_FILES = License.txt
 
 LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG
diff --git a/bsp/buildroot/package/libkcapi/0001-Have-sufficient-memory-size-for-message.patch b/bsp/buildroot/package/libkcapi/0001-Have-sufficient-memory-size-for-message.patch
new file mode 100644
index 00000000..39e683f5
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/0001-Have-sufficient-memory-size-for-message.patch
@@ -0,0 +1,31 @@
+From b56deda7c13c257050fdbdd71c1a5a47b78aa63e Mon Sep 17 00:00:00 2001
+From: Stephan Mueller <smueller@chronox.de>
+Date: Thu, 3 Aug 2017 17:50:51 +0200
+Subject: [PATCH] Have sufficient memory size for message
+
+With GCC 7, the size of the buffer in snprintf is checked. The
+occurrence here is found to be too small.
+
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+[Upstream commit: https://github.com/smuellerDD/libkcapi/commit/b56deda7c13c257050fdbdd71c1a5a47b78aa63e]
+Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+---
+ speed-test/cryptoperf-base.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/speed-test/cryptoperf-base.c b/speed-test/cryptoperf-base.c
+index 8766ca7..07384ae 100644
+--- a/speed-test/cryptoperf-base.c
++++ b/speed-test/cryptoperf-base.c
+@@ -172,7 +172,7 @@ char *cp_print_status(struct cp_test *test, int raw)
+ 			(unsigned long)(processed_bytes/totaltime),
+ 			(unsigned long)ops);
+ 	} else {
+-		#define VALLEN 10
++		#define VALLEN 23
+ 		char byteseconds[VALLEN + 1];
+ 
+ 		memset(byteseconds, 0, sizeof(byteseconds));
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/libkcapi/0002-Do-not-compile-unused-functions.patch b/bsp/buildroot/package/libkcapi/0002-Do-not-compile-unused-functions.patch
new file mode 100644
index 00000000..97ab7fc5
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/0002-Do-not-compile-unused-functions.patch
@@ -0,0 +1,35 @@
+From 217b154a5f65d46064ceb69ce69664105e703a74 Mon Sep 17 00:00:00 2001
+From: Stephan Mueller <smueller@chronox.de>
+Date: Thu, 3 Aug 2017 17:52:48 +0200
+Subject: [PATCH] Do not compile unused functions
+
+GCC 7 now rightfully complains about unused functions.
+
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+[Upstream commit: https://github.com/smuellerDD/libkcapi/commit/217b154a5f65d46064ceb69ce69664105e703a74]
+Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+---
+ apps/kcapi-rng.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/apps/kcapi-rng.c b/apps/kcapi-rng.c
+index df7decf..e15edf9 100644
+--- a/apps/kcapi-rng.c
++++ b/apps/kcapi-rng.c
+@@ -45,6 +45,7 @@ struct kcapi_handle *rng = NULL;
+ unsigned int Verbosity = 0;
+ char *rng_name = NULL;
+ 
++#ifndef HAVE_GETRANDOM
+ static int read_complete(int fd, uint8_t *buf, uint32_t buflen)
+ {
+ 	ssize_t ret;
+@@ -76,6 +77,7 @@ static int read_random(uint8_t *buf, uint32_t buflen)
+ 	close(fd);
+ 	return ret;
+ }
++#endif
+ 
+ static int get_random(uint8_t *buf, uint32_t buflen)
+ {
diff --git a/bsp/buildroot/package/libkcapi/0003-Unify-code-to-read-from-seed-sources.patch b/bsp/buildroot/package/libkcapi/0003-Unify-code-to-read-from-seed-sources.patch
new file mode 100644
index 00000000..b636ffe9
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/0003-Unify-code-to-read-from-seed-sources.patch
@@ -0,0 +1,132 @@
+From 450dfb09ee72ffedea8f2a25fdce17295f01f62f Mon Sep 17 00:00:00 2001
+From: Stephan Mueller <smueller@chronox.de>
+Date: Tue, 8 Aug 2017 10:04:06 +0200
+Subject: [PATCH] Unify code to read from seed sources
+
+Remove the code duplication for FD reads and syscall reads.
+
+This patch also fixes the use of __NR_getrandom resolution.
+
+[Upstream commit: https://github.com/smuellerDD/libkcapi/commit/450dfb09ee72ffedea8f2a25fdce17295f01f62f]
+Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+
+---
+ apps/kcapi-rng.c | 71 +++++++++++++++++++++++++-------------------------------
+ 1 file changed, 32 insertions(+), 39 deletions(-)
+
+diff --git a/apps/kcapi-rng.c b/apps/kcapi-rng.c
+index e15edf9..96da111 100644
+--- a/apps/kcapi-rng.c
++++ b/apps/kcapi-rng.c
+@@ -17,7 +17,9 @@
+  * DAMAGE.
+  */
+ 
++#define _GNU_SOURCE
+ #include <unistd.h>
++#include <sys/syscall.h>
+ #include <errno.h>
+ #include <limits.h>
+ #include <stdint.h>
+@@ -41,56 +43,48 @@
+ /* Minimum seed is 256 bits. */
+ #define KCAPI_RNG_MINSEEDSIZE 32
+ 
+-struct kcapi_handle *rng = NULL;
+-unsigned int Verbosity = 0;
+-char *rng_name = NULL;
++static struct kcapi_handle *rng = NULL;
++static unsigned int Verbosity = 0;
++static char *rng_name = NULL;
+ 
+-#ifndef HAVE_GETRANDOM
+-static int read_complete(int fd, uint8_t *buf, uint32_t buflen)
++#if !defined(HAVE_GETRANDOM) && !defined(__NR_getrandom)
++static int random_fd = -1;
++static int open_random(void)
+ {
+-	ssize_t ret;
++	random_fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
++	if (0 > random_fd)
++		return random_fd;
+ 
+-	do {
+-		ret = read(fd, buf, buflen);
+-		if (0 < ret) {
+-			buflen -= ret;
+-			buf += ret;
+-		}
+-	} while ((0 < ret || EINTR == errno || ERESTART == errno)
+-		 && buflen > 0);
+-
+-	if (buflen == 0)
+-		return 0;
+-	return 1;
++	return 0;
+ }
+ 
+-static int read_random(uint8_t *buf, uint32_t buflen)
++static void close_random(void)
+ {
+-	int fd;
+-	int ret = 0;
+-
+-	fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC);
+-	if (0 > fd)
+-		return fd;
+-
+-	ret = read_complete(fd, buf, buflen);
+-	close(fd);
+-	return ret;
++	close(random_fd);
+ }
+ #endif
+ 
+ static int get_random(uint8_t *buf, uint32_t buflen)
+ {
++	ssize_t ret;
++
+ 	if (buflen > INT_MAX)
+ 		return 1;
+ 
++#if (!defined(HAVE_GETRANDOM) && !defined(__NR_getrandom))
++	ret = open_random();
++	if (ret)
++		return ret;
++#endif
++
++	do {
+ #ifdef HAVE_GETRANDOM
+-	return getrandom(buf, buflen, 0);
++		ret = getrandom(buf, buflen, 0);
++#elif defined __NR_getrandom
++		ret = syscall(__NR_getrandom, buf, buflen, 0);
+ #else
+-# ifdef __NR_getrandom
+-	do {
+-		int ret = syscall(__NR_getrandom, buf, buflen, 0);
+-
++		ret = read(random_fd, buf, buflen);
++#endif
+ 		if (0 < ret) {
+ 			buflen -= ret;
+ 			buf += ret;
+@@ -98,14 +92,13 @@ static int get_random(uint8_t *buf, uint32_t buflen)
+ 	} while ((0 < ret || EINTR == errno || ERESTART == errno)
+ 		 && buflen > 0);
+ 
++#if (!defined(HAVE_GETRANDOM) && !defined(__NR_getrandom))
++	close_random();
++#endif
++
+ 	if (buflen == 0)
+ 		return 0;
+-
+ 	return 1;
+-# else
+-	return read_random(buf, buflen);
+-# endif
+-#endif
+ }
+ 
+ static void usage(void)
diff --git a/bsp/buildroot/package/libkcapi/0004-internal.h-make-inline-functions-static.patch b/bsp/buildroot/package/libkcapi/0004-internal.h-make-inline-functions-static.patch
new file mode 100644
index 00000000..a0501739
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/0004-internal.h-make-inline-functions-static.patch
@@ -0,0 +1,103 @@
+From 2b9e01ee31c1b7596b19f0c89954e93e217b0479 Mon Sep 17 00:00:00 2001
+From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+Date: Thu, 21 Sep 2017 10:16:33 +0200
+Subject: [PATCH] internal.h: make inline functions static
+
+With some GCC configurations/build options it is possible for gcc to
+ignore the inline hint. As the methods are not declared static, gcc
+expects a definition to be provided elsewhere, which is not the case
+here resulting in the following linker error:
+
+libtool: link: /home/marcin/br-test-pkg/br-arm-cortex-a9-glibc/host/bin/arm-linux-gcc
+-fstack-protector-strong -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-D_FILE_OFFSET_BITS=64 -Os -Wl,-z -Wl,relro -Wl,-z -Wl,now -o bin/kcapi
+test/bin_kcapi-kcapi-main.o  ./.libs/libkcapi.so -Wl,-rpath
+-Wl,/home/marcin/br-test-pkg/br-arm-cortex-a9-glibc/build/libkcapi-0.14.0/.libs
+./.libs/libkcapi.so: undefined reference to `_kcapi_common_vmsplice_iov'
+./.libs/libkcapi.so: undefined reference to `_kcapi_common_read_data'
+./.libs/libkcapi.so: undefined reference to `_kcapi_aio_read_iov'
+./.libs/libkcapi.so: undefined reference to `_kcapi_common_recv_data'
+./.libs/libkcapi.so: undefined reference to `_kcapi_common_send_data'
+./.libs/libkcapi.so: undefined reference to `_kcapi_common_vmsplice_chunk'
+./.libs/libkcapi.so: undefined reference to `_kcapi_common_send_meta'
+collect2: error: ld returned 1 exit status
+
+$ arm-linux-gcc --version
+arm-linux-gcc.br_real (Buildroot 2017.08-git-01078-g95b1dae) 7.1.0
+
+Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+Signed-off-by: Stephan Mueller <smueller@chronox.de>
+
+[Upstream commit: https://github.com/smuellerDD/libkcapi/commit/2b9e01ee31c1b7596b19f0c89954e93e217b0479]
+Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
+---
+ lib/internal.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/internal.h b/lib/internal.h
+index 0d98f24..addf450 100644
+--- a/lib/internal.h
++++ b/lib/internal.h
+@@ -233,7 +233,7 @@ void kcapi_dolog(int severity, const char *fmt, ...);
+ int32_t _kcapi_common_send_meta_fd(struct kcapi_handle *handle, int *fdptr,
+ 				   struct iovec *iov, uint32_t iovlen,
+ 				   uint32_t enc, uint32_t flags);
+-inline int32_t _kcapi_common_send_meta(struct kcapi_handle *handle,
++static inline int32_t _kcapi_common_send_meta(struct kcapi_handle *handle,
+ 				       struct iovec *iov, uint32_t iovlen,
+ 				       uint32_t enc, uint32_t flags)
+ {
+@@ -244,7 +244,7 @@ inline int32_t _kcapi_common_send_meta(struct kcapi_handle *handle,
+ int32_t _kcapi_common_vmsplice_iov_fd(struct kcapi_handle *handle, int *fdptr,
+ 				      struct iovec *iov, unsigned long iovlen,
+ 				      uint32_t flags);
+-inline int32_t _kcapi_common_vmsplice_iov(struct kcapi_handle *handle,
++static inline int32_t _kcapi_common_vmsplice_iov(struct kcapi_handle *handle,
+ 				   struct iovec *iov, unsigned long iovlen,
+ 				   uint32_t flags)
+ {
+@@ -255,7 +255,7 @@ inline int32_t _kcapi_common_vmsplice_iov(struct kcapi_handle *handle,
+ int32_t _kcapi_common_send_data_fd(struct kcapi_handle *handle, int *fdprt,
+ 				   struct iovec *iov, uint32_t iovlen,
+ 				   uint32_t flags);
+-inline int32_t _kcapi_common_send_data(struct kcapi_handle *handle,
++static inline int32_t _kcapi_common_send_data(struct kcapi_handle *handle,
+ 				       struct iovec *iov, uint32_t iovlen,
+ 				       uint32_t flags)
+ {
+@@ -265,7 +265,7 @@ inline int32_t _kcapi_common_send_data(struct kcapi_handle *handle,
+ 
+ int32_t _kcapi_common_recv_data_fd(struct kcapi_handle *handle, int *fdptr,
+ 				   struct iovec *iov, uint32_t iovlen);
+-inline int32_t _kcapi_common_recv_data(struct kcapi_handle *handle,
++static inline int32_t _kcapi_common_recv_data(struct kcapi_handle *handle,
+ 				       struct iovec *iov, uint32_t iovlen)
+ {
+ 	return _kcapi_common_recv_data_fd(handle, &handle->opfd, iov, iovlen);
+@@ -273,7 +273,7 @@ inline int32_t _kcapi_common_recv_data(struct kcapi_handle *handle,
+ 
+ int32_t _kcapi_common_read_data_fd(struct kcapi_handle *handle, int *fdptr,
+ 				   uint8_t *out, uint32_t outlen);
+-inline int32_t _kcapi_common_read_data(struct kcapi_handle *handle,
++static inline int32_t _kcapi_common_read_data(struct kcapi_handle *handle,
+ 				       uint8_t *out, uint32_t outlen)
+ {
+ 	return _kcapi_common_read_data_fd(handle, &handle->opfd, out, outlen);
+@@ -285,7 +285,7 @@ int _kcapi_common_close(struct kcapi_handle *handle, int fdptr);
+ int32_t _kcapi_common_vmsplice_chunk_fd(struct kcapi_handle *handle, int *fdptr,
+ 				        const uint8_t *in, uint32_t inlen,
+ 				        uint32_t flags);
+-inline int32_t _kcapi_common_vmsplice_chunk(struct kcapi_handle *handle,
++static inline int32_t _kcapi_common_vmsplice_chunk(struct kcapi_handle *handle,
+ 					    const uint8_t *in, uint32_t inlen,
+ 					    uint32_t flags)
+ {
+@@ -315,7 +315,7 @@ int _kcapi_aio_send_iov(struct kcapi_handle *handle, struct iovec *iov,
+ 
+ int32_t _kcapi_aio_read_iov_fd(struct kcapi_handle *handle, int *fdptr,
+ 			       struct iovec *iov, uint32_t iovlen);
+-inline int32_t _kcapi_aio_read_iov(struct kcapi_handle *handle,
++static inline int32_t _kcapi_aio_read_iov(struct kcapi_handle *handle,
+ 				   struct iovec *iov, uint32_t iovlen)
+ {
+ 	return _kcapi_aio_read_iov_fd(handle, &handle->opfd, iov, iovlen);
diff --git a/bsp/buildroot/package/libkcapi/Config.in b/bsp/buildroot/package/libkcapi/Config.in
new file mode 100644
index 00000000..2b981777
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LIBKCAPI
+	bool "libkcapi"
+	help
+	  Linux Kernel Crypto API userspace interface library
+
+	  http://www.chronox.de/libkcapi.html
+
+if BR2_PACKAGE_LIBKCAPI
+
+config BR2_PACKAGE_LIBKCAPI_APPS
+	bool "build test applications"
+	depends on BR2_USE_MMU # fork()
+	help
+	  Build additional test applications that can provide
+	  performance or algorithm tests.
+
+endif
diff --git a/bsp/buildroot/package/libkcapi/libkcapi.hash b/bsp/buildroot/package/libkcapi/libkcapi.hash
new file mode 100644
index 00000000..9873e662
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/libkcapi.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 411fc32b3e36ac0268837a8d4538eb8aef487b3a3e9b21a2b88b8ed2f926edf3	libkcapi-0.14.0.tar.xz
diff --git a/bsp/buildroot/package/libkcapi/libkcapi.mk b/bsp/buildroot/package/libkcapi/libkcapi.mk
new file mode 100644
index 00000000..d21c81b1
--- /dev/null
+++ b/bsp/buildroot/package/libkcapi/libkcapi.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# libkcapi
+#
+################################################################################
+
+LIBKCAPI_VERSION = 0.14.0
+LIBKCAPI_SOURCE = libkcapi-$(LIBKCAPI_VERSION).tar.xz
+LIBKCAPI_SITE = http://www.chronox.de/libkcapi
+LIBKCAPI_AUTORECONF = YES
+LIBKCAPI_INSTALL_STAGING = YES
+LIBKCAPI_LICENSE = BSD-3-Clause (library), BSD-3-Clause or GPL-2.0 (programs)
+LIBKCAPI_LICENSE_FILES = COPYING COPYING.gplv2 COPYING.bsd
+
+ifeq ($(BR2_PACKAGE_LIBKCAPI_APPS),y)
+LIBKCAPI_CONF_OPTS += \
+	--enable-kcapi-speed \
+	--enable-kcapi-test \
+	--enable-kcapi-hasher \
+	--enable-kcapi-rngapp
+else
+LIBKCAPI_CONF_OPTS += \
+	--disable-kcapi-speed \
+	--disable-kcapi-test \
+	--disable-kcapi-hasher \
+	--disable-kcapi-rngapp
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libksba/libksba.mk b/bsp/buildroot/package/libksba/libksba.mk
index e29b6ae1..25b17a47 100644
--- a/bsp/buildroot/package/libksba/libksba.mk
+++ b/bsp/buildroot/package/libksba/libksba.mk
@@ -7,7 +7,7 @@
 LIBKSBA_VERSION = 1.3.5
 LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
 LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba
-LIBKSBA_LICENSE = LGPLv3+ or GPLv2+ (library, headers), GPLv3+ (manual, tests, build system)
+LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system)
 LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
 LIBKSBA_INSTALL_STAGING = YES
 LIBKSBA_DEPENDENCIES = libgpg-error
diff --git a/bsp/buildroot/package/libldns/0001-bugfix-548-Double-free-for-answers-4096.patch b/bsp/buildroot/package/libldns/0001-bugfix-548-Double-free-for-answers-4096.patch
deleted file mode 100644
index 4097cfed..00000000
--- a/bsp/buildroot/package/libldns/0001-bugfix-548-Double-free-for-answers-4096.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 128aeb54593d4dd8ff2403eb2dd7d6cd596717d2 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Tue, 28 Jan 2014 11:06:38 +0100
-Subject: [PATCH] bugfix #548: Double free for answers > 4096
-
-in ldns_resolver_send_pkt.  Thank you sunthought@gmail.com
-
-[Backport from upstream commit 2853eb352b4461e98f2926ace4ea3810cedf4167]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- resolver.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/resolver.c b/resolver.c
-index 16efc90..1474dc8 100644
---- a/resolver.c
-+++ b/resolver.c
-@@ -1117,6 +1117,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer, ldns_resolver *r,
- 					ldns_pkt_set_edns_udp_size(query_pkt
- 							, 4096);
- 					ldns_pkt_free(answer_pkt);
-+					answer_pkt = NULL;
- 					/* Nameservers should not become 
- 					 * unreachable because fragments are
- 					 * dropped (network error). We might
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/libldns/0002-whitespace-bug-in-ldns-read-zone.patch b/bsp/buildroot/package/libldns/0002-whitespace-bug-in-ldns-read-zone.patch
deleted file mode 100644
index ec87b18e..00000000
--- a/bsp/buildroot/package/libldns/0002-whitespace-bug-in-ldns-read-zone.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 055ea6aef77058f651b5571d98d2d9458821a977 Mon Sep 17 00:00:00 2001
-From: Matthijs Mekking <matthijs@nlnetlabs.nl>
-Date: Wed, 18 Jun 2014 09:55:17 +0200
-Subject: [PATCH] whitespace bug in ldns-read-zone
-
-[Backport from upstream commit d6037a22fbedb8ef3a22de4107e4eaa36840865b]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- rr.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/rr.c b/rr.c
-index cfee170..e530702 100644
---- a/rr.c
-+++ b/rr.c
-@@ -670,6 +670,18 @@ ldns_rr_new_question_frm_str(ldns_rr **newrr, const char *str,
- 	                                    true);
- }
- 
-+static int
-+ldns_rr_is_whitespace_line(char* line, int line_len)
-+{
-+	int i;
-+	for (i = 0; i < line_len; i++) {
-+		if (!isspace((int)line[i])) {
-+			return 0;
-+		}
-+	}
-+	return 1;
-+}
-+
- ldns_status
- ldns_rr_new_frm_fp(ldns_rr **newrr, FILE *fp, uint32_t *ttl, ldns_rdf **origin, ldns_rdf **prev)
- {
-@@ -745,6 +757,9 @@ ldns_rr_new_frm_fp_l(ldns_rr **newrr, FILE *fp, uint32_t *default_ttl, ldns_rdf
- 		s = LDNS_STATUS_SYNTAX_TTL;
- 	} else if (strncmp(line, "$INCLUDE", 8) == 0) {
- 		s = LDNS_STATUS_SYNTAX_INCLUDE;
-+	} else if (ldns_rr_is_whitespace_line(line, size)) {
-+		LDNS_FREE(line);
-+		return LDNS_STATUS_SYNTAX_EMPTY;
- 	} else {
- 		if (origin && *origin) {
- 			s = ldns_rr_new_frm_str(&rr, (const char*) line, ttl, *origin, prev);
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch b/bsp/buildroot/package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch
deleted file mode 100644
index 223ebe98..00000000
--- a/bsp/buildroot/package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From d8a3da12be085fbc92e3d4d4d084c328fc37485a Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 27 Nov 2014 16:21:54 +0100
-Subject: [PATCH] let doxyparse output manpage generation issues
-
-[Backport from upstream commit
-168ee09a4bf184947798c3ee3ac99b6651470d64, fixes the build with Perl
-5.22.]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- doc/doxyparse.pl | 45 ++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 38 insertions(+), 7 deletions(-)
-
-diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
-index 96a1732..a09b2e8 100755
---- a/doc/doxyparse.pl
-+++ b/doc/doxyparse.pl
-@@ -57,10 +57,15 @@ This manpage was automaticly generated from the ldns source code by
- use of Doxygen and some perl.
- ";
- 
--getopts("m:",\%options);
-+getopts("em:",\%options);
- # if -m manpage file is given process that file
- # parse the file which tells us what manpages go together
- my $functions, $see_also;
-+my $i = -1;
-+my $report_errors = defined $options{'e'};
-+my $errors = 0;
-+my %unique;
-+
- if (defined $options{'m'}) {
- 	# process
- 	open(MAN, "<$options{'m'}") or die "Cannot open $options{'m'}";
-@@ -68,18 +73,35 @@ if (defined $options{'m'}) {
- 		# func1, func2, .. | see_also1, see_also2, ...
- 		while(<MAN>) {
- 			chomp;
-+			$i += 1;
- 			if (/^#/) { next; }
- 			if (/^$/) { next; }
--			($functions, $see_also) = split /[\t ]*\|[\t ]*/, $_;
--			#print "{$functions}\n";
--			#print "{$see_also}\n";
-+			my @parts = split /[\t ]*\|[\t ]*/, $_;
-+			$functions = shift @parts;
-+			$see_also = join ', ', @parts;
-+			print "{$functions}\n";
-+			print "{$see_also}\n";
- 			my @funcs = split /[\t ]*,[\t ]*/, $functions;
- 			my @also = split /[\t ]*,[\t ]*/, $see_also;
- 			$manpages{$funcs[0]} = \@funcs;
- 			$see_also{$funcs[0]} = \@also;
-+			foreach (@funcs) {
-+				if ($unique{$_}) {
-+					push $unique{$_}, ($i,);
-+				} else {
-+					$unique{$_} = [$i];
-+				}
-+			}
- 			#print "[", $funcs[0], "]\n";
- 		}
- 	close(MAN);
-+	while (($func, $lines) = each %unique ) {
-+		if (scalar @$lines > 1) {
-+			print STDERR "$func in function_manpages on lines: "
-+			    . join(", ",@$lines) . "\n" if $report_errors;
-+			$errors += 1;
-+		}
-+	}
- } else {
- 	print "Need -m file to process the .h files\n";
- 	exit 1;
-@@ -95,7 +117,7 @@ mkdir "doc/man";
- mkdir "doc/man/man$MAN_SECTION";
- 
- $state = 0;
--my $i;
-+$i = 0;
- my @lines = <STDIN>;
- my $max = @lines;
- 
-@@ -273,7 +295,7 @@ foreach (keys %manpages) {
- 
- 	print MAN $MAN_MIDDLE;
- 
--	if (defined(@$also)) {
-+	if (@$also) {
- 		print MAN "\n.SH SEE ALSO\n\\fI";
- 		print MAN join "\\fR, \\fI", @$also;
- 		print MAN "\\fR.\nAnd ";
-@@ -290,7 +312,7 @@ foreach (keys %manpages) {
- 	# create symlinks
- 	chdir("$BASE/man$MAN_SECTION");
- 	foreach (@$name) {
--		print STDERR $_,"\n";
-+		print STDOUT $_,"\n";
- 		my $new_file = $_ . "." . $MAN_SECTION;
- 		if ($new_file eq $symlink_file) {
- 			next;
-@@ -301,3 +323,12 @@ foreach (keys %manpages) {
- 	chdir("../../.."); # and back, tricky and fragile...
- 	close(MAN);
- }
-+foreach (keys %api) {
-+	next if (/ / || /^$/);
-+	if (not $unique{$_}) {
-+		print STDERR "no man page for $_\n" if $report_errors;
-+		$errors += 1;
-+	}
-+}
-+
-+exit ($report_errors and $errors != 0);
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/libldns/0004-Comment-out-debugging-remnants.patch b/bsp/buildroot/package/libldns/0004-Comment-out-debugging-remnants.patch
deleted file mode 100644
index 65925387..00000000
--- a/bsp/buildroot/package/libldns/0004-Comment-out-debugging-remnants.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9720f6f7fdae210aa6d87d97324abd32e103dd16 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 27 Nov 2014 16:50:33 +0100
-Subject: [PATCH] Comment out debugging remnants
-
-[Backport from upstream commit
-a0a943d504debb05ce4d62ea81c2d218a6cc8727, needed for a following patch
-fixing the build with Perl 5.10.]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- doc/doxyparse.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
-index a09b2e8..3f7897f 100755
---- a/doc/doxyparse.pl
-+++ b/doc/doxyparse.pl
-@@ -79,8 +79,8 @@ if (defined $options{'m'}) {
- 			my @parts = split /[\t ]*\|[\t ]*/, $_;
- 			$functions = shift @parts;
- 			$see_also = join ', ', @parts;
--			print "{$functions}\n";
--			print "{$see_also}\n";
-+			#print "{$functions}\n";
-+			#print "{$see_also}\n";
- 			my @funcs = split /[\t ]*,[\t ]*/, $functions;
- 			my @also = split /[\t ]*,[\t ]*/, $see_also;
- 			$manpages{$funcs[0]} = \@funcs;
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/libldns/0005-Remove-manpage-content-nondeterminicity-warnings.patch b/bsp/buildroot/package/libldns/0005-Remove-manpage-content-nondeterminicity-warnings.patch
deleted file mode 100644
index c2826340..00000000
--- a/bsp/buildroot/package/libldns/0005-Remove-manpage-content-nondeterminicity-warnings.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-From adcef14bb9257ab38238eacabaa48cb7e8ef471f Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Wed, 14 Jan 2015 10:14:32 +0100
-Subject: [PATCH] Remove manpage content nondeterminicity & warnings
-
-TODO: Missing manpages
-
-[Backport upstream commit a56e48856d519d12f1ef600848f335615467f147,
-which fixes the build with Perl 5.10.]
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- doc/doxyparse.pl      |  20 +++--
- doc/function_manpages | 244 ++++++++++++++++++++++++--------------------------
- 2 files changed, 133 insertions(+), 131 deletions(-)
-
-diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl
-index 3f7897f..b9f015d 100755
---- a/doc/doxyparse.pl
-+++ b/doc/doxyparse.pl
-@@ -35,7 +35,7 @@ my %see_also;
- 
- my $BASE="doc/man";
- my $MAN_SECTION = "3";
--my $MAN_HEADER = ".TH ldns $MAN_SECTION \"30 May 2006\"\n";
-+my $MAN_HEADER = ".ad l\n.TH ldns $MAN_SECTION \"30 May 2006\"\n";
- my $MAN_MIDDLE = ".SH AUTHOR
- The ldns team at NLnet Labs. Which consists out of
- Jelte Jansen and Miek Gieben.
-@@ -60,8 +60,8 @@ use of Doxygen and some perl.
- getopts("em:",\%options);
- # if -m manpage file is given process that file
- # parse the file which tells us what manpages go together
--my $functions, $see_also;
--my $i = -1;
-+my $functions, $see_also, $shorts;
-+my $i = 0;
- my $report_errors = defined $options{'e'};
- my $errors = 0;
- my %unique;
-@@ -78,16 +78,22 @@ if (defined $options{'m'}) {
- 			if (/^$/) { next; }
- 			my @parts = split /[\t ]*\|[\t ]*/, $_;
- 			$functions = shift @parts;
--			$see_also = join ', ', @parts;
-+			@parts = split /[\t ]*-[\t ]*/, join ', ', @parts;
-+			$see_also = shift @parts;
-+			if (! $see_also) {
-+				@parts = split /[\t ]*-[\t ]*/, $_;
-+				$functions = shift @parts;
-+			}
- 			#print "{$functions}\n";
- 			#print "{$see_also}\n";
- 			my @funcs = split /[\t ]*,[\t ]*/, $functions;
- 			my @also = split /[\t ]*,[\t ]*/, $see_also;
- 			$manpages{$funcs[0]} = \@funcs;
- 			$see_also{$funcs[0]} = \@also;
-+			$shorts{$funcs[0]} = join '', @parts;
- 			foreach (@funcs) {
- 				if ($unique{$_}) {
--					push $unique{$_}, ($i,);
-+					push @{$unique{$_}}, ($i,);
- 				} else {
- 					$unique{$_} = [$i];
- 				}
-@@ -249,6 +255,7 @@ while($i < $max) {
- foreach (keys %manpages) {
- 	$name = $manpages{$_};
- 	$also = $see_also{$_};
-+	my $shrt = $shorts{$_};
- 
- 	$filename = @$name[0];
- 	$filename = "$BASE/man$MAN_SECTION/$filename.$MAN_SECTION";
-@@ -261,6 +268,9 @@ foreach (keys %manpages) {
- 	print MAN  $MAN_HEADER;
- 	print MAN  ".SH NAME\n";
- 	print MAN  join ", ", @$name;
-+	if ($shrt) {
-+		print MAN " \\- $shrt";
-+	}
- 	print MAN  "\n\n";
- 	print MAN  ".SH SYNOPSIS\n";
- 
-diff --git a/doc/function_manpages b/doc/function_manpages
-index ce05899..db53ee5 100644
---- a/doc/function_manpages
-+++ b/doc/function_manpages
-@@ -8,221 +8,213 @@
- 
- ### host2wire.h
- # conversion functions
--ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire | ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf
-+ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire | ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf - conversion functions
- # lower level conversions, some are from host2str.h
--ldns_pkt2buffer_str, ldns_pktheader2buffer_str, ldns_rr2buffer_str, ldns_rr_list2buffer_str, ldns_rdf2buffer_str, ldns_key2buffer_str, ldns_pkt2buffer_wire, ldns_rr2buffer_wire, ldns_rdf2buffer_wire, ldns_rrsig2buffer_wire, ldns_rr_rdata2buffer_wire | ldns_pkt2str, ldns_rr2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str
-+ldns_pkt2buffer_str, ldns_pktheader2buffer_str, ldns_rr2buffer_str, ldns_rr_list2buffer_str, ldns_rdf2buffer_str, ldns_key2buffer_str, ldns_pkt2buffer_wire, ldns_rr2buffer_wire, ldns_rdf2buffer_wire, ldns_rrsig2buffer_wire, ldns_rr_rdata2buffer_wire | ldns_pkt2str, ldns_rr2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str - lower level conversions
- ### /host2wire.h
- 
- ### host2str.h
--ldns_rr2str, ldns_pkt2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str | ldns_rr_print, ldns_rdf_print, ldns_pkt_print, ldns_rr_list_print, ldns_resolver_print, ldns_zone_print
--ldns_rr_print, ldns_rdf_print, ldns_pkt_print, ldns_rr_list_print, ldns_resolver_print, ldns_zone_print | ldns_rr2str, ldns_rdf2str, ldns_pkt2str, ldns_rr_list2str, ldns_key2str
-+ldns_rr2str, ldns_pkt2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str | ldns_rr_print, ldns_rdf_print, ldns_pkt_print, ldns_rr_list_print, ldns_resolver_print, ldns_zone_print - functions for conversions to string
- ### /host2str.h
- 
- ### host2str.h
- # and even lower
--ldns_rdf2buffer_str_a, ldns_rdf2buffer_str_aaaa, ldns_rdf2buffer_str_str, ldns_rdf2buffer_str_b64, ldns_rdf2buffer_str_hex, ldns_rdf2buffer_str_type, ldns_rdf2buffer_str_class, ldns_rdf2buffer_str_alg, ldns_rdf2buffer_str_loc, ldns_rdf2buffer_str_unknown, ldns_rdf2buffer_str_nsap, ldns_rdf2buffer_str_wks, ldns_rdf2buffer_str_nsec, ldns_rdf2buffer_str_period, ldns_rdf2buffer_str_tsigtime, ldns_rdf2buffer_str_apl, ldns_rdf2buffer_str_int16_data, ldns_rdf2buffer_str_int16, ldns_rdf2buffer_str_ipseckey
-+ldns_rdf2buffer_str_a, ldns_rdf2buffer_str_aaaa, ldns_rdf2buffer_str_str, ldns_rdf2buffer_str_b64, ldns_rdf2buffer_str_hex, ldns_rdf2buffer_str_type, ldns_rdf2buffer_str_class, ldns_rdf2buffer_str_alg, ldns_rdf2buffer_str_loc, ldns_rdf2buffer_str_unknown, ldns_rdf2buffer_str_nsap, ldns_rdf2buffer_str_wks, ldns_rdf2buffer_str_nsec, ldns_rdf2buffer_str_period, ldns_rdf2buffer_str_tsigtime, ldns_rdf2buffer_str_apl, ldns_rdf2buffer_str_int16_data, ldns_rdf2buffer_str_int16, ldns_rdf2buffer_str_ipseckey - lower level to string conversion functions
- ### /host2str.h
- 
- ### wire2host.h
- # wirefunctions
--ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf, ldns_wire2dname | ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire, ldns_dname2wire
--ldns_buffer2pkt_wire
-+ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf, ldns_wire2dname | ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire, ldns_dname2wire  -  convert from wire format to host type
-+ldns_buffer2pkt_wire - convert buffer/wire format to ldns_pkt
- ### /wire2host.h
- 
- ### dname.h
--ldns_dname_left_chop, ldns_dname_label_count | ldns_dname
--ldns_dname2canonical | ldns_dname
--ldns_dname_cat_clone, ldns_dname_cat | ldns_dname
--ldns_dname_new, ldns_dname_new_frm_str, ldns_dname_new_frm_data | ldns_dname, ldns_pkt_query_new_frm_str, ldns_rdf_new_frm_str, ldns_rr_new_frm_str
--ldns_dname_is_subdomain, ldns_dname_str_absolute, ldns_dname_label | ldns_dname
--ldns_dname_compare, ldns_dname_interval | ldns_dname_is_subdomain | ldns_dname
--ldns_dname | ldns_dname_left_chop, ldns_dname_label_count, ldns_dname2canonical, ldns_dname_cat, ldns_dname_cat_clone, ldns_dname_new, ldns_dname_new_frm_str, ldns_dname_new_frm_data, ldns_dname_is_subdomain, ldns_dname_str_absolute, ldns_dname_label, ldns_dname_compare, ldns_dname_interval
-+ldns_dname_left_chop, ldns_dname_label_count - dname label functions
-+ldns_dname2canonical - canonicalize dname
-+ldns_dname_cat_clone, ldns_dname_cat - concatenate two dnames
-+ldns_dname_new, ldns_dname_new_frm_str, ldns_dname_new_frm_data | ldns_pkt_query_new_frm_str, ldns_rdf_new_frm_str, ldns_rr_new_frm_str -  create a dname
-+ldns_dname_is_subdomain, ldns_dname_str_absolute, ldns_dname_label - check properties of dnames
-+ldns_dname_compare, ldns_dname_interval | ldns_dname_is_subdomain  - compare two dnames
- ### /dname.h
- 
- ### dane.h
--ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate, ldns_dane_create_tlsa_rr | ldns_dane_verify, ldns_dane_verify_rr
--ldns_dane_verify, ldns_dane_verify_rr | ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate, ldns_dane_create_tlsa_rr
-+ldns_dane_create_tlsa_rr, ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate | ldns_dane_verify, ldns_dane_verify_rr - TLSA RR creation functions
-+ldns_dane_verify, ldns_dane_verify_rr | ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate, ldns_dane_create_tlsa_rr - TLSA RR verification functions
- ### /dane.h
- 
- ### rdata.h
--ldns_rdf, ldns_rdf_type | ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data, ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare, ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t
--ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data | ldns_rdf
--ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare | ldns_rdf
--ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print | ldns_rdf
--ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t | ldns_rdf
--ldns_rdf_address_reverse | ldns_rdf
--ldns_octet | ldns_rdf
-+ldns_rdf, ldns_rdf_type | ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data, ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare, ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t - rdata field type
-+ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data | ldns_rdf - set rdf attributes
-+ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare | ldns_rdf - get rdf attributes
-+ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print | ldns_rdf - ldns_rdf creation, destruction and printing
-+ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t | ldns_rdf - rdf numeric converion functions
-+ldns_rdf_address_reverse | ldns_rdf - reverse an address rdf
-+ldns_octet | ldns_rdf - removes escaped from the input
- # why is this in rdata.h?
--ldns_str2period
-+ldns_str2period - converts a ttl value (like 5d2h) to a long
- ### /rdata.h
- 
- ### higher.h
--ldns_get_rr_list_addr_by_name, ldns_get_rr_list_name_by_addr | ldns_rr_list, ldns_rr
--ldns_get_rr_list_hosts_frm_fp, ldns_get_rr_list_hosts_frm_file | ldns_rr_list, ldns_rr, ldns_get_rr_list_hosts_frm_fp_l
--ldns_get_rr_list_hosts_frm_fp_l | ldns_rr_list
--ldns_getaddrinfo
-+ldns_get_rr_list_addr_by_name, ldns_get_rr_list_name_by_addr | ldns_rr_list, ldns_rr - get addresses by name or names by address
-+ldns_get_rr_list_hosts_frm_file, ldns_get_rr_list_hosts_frm_fp, ldns_get_rr_list_hosts_frm_fp_l | ldns_rr_list, ldns_rr - parse /etc/hosts file
-+ldns_getaddrinfo - mimic libc getaddrinfo
- ### /higher.h
- 
- #
- ### dnssec.h
- #
--ldns_calc_keytag, ldns_verify, ldns_verify_rrsig, ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5, ldns_key_rr2ds, ldns_key_buf2dsa, ldns_key_buf2rsa | ldns_key, ldns_sign_public, ldns_zone_sign, ldns_verify, ldns_verify_rrsig
--
- # algs
--ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5 | ldns_key, ldns_sign_public, ldns_zone_sign, ldns_verify, ldns_verify_rrsig
-+ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5 | ldns_key, ldns_sign_public, ldns_zone_sign, ldns_verify, ldns_verify_rrsig - verify signature data buffers
- 
- # tsig
--ldns_pkt_tsig_verify, ldns_pkt_tsig_sign | ldns_key
-+ldns_pkt_tsig_verify, ldns_pkt_tsig_sign | ldns_key - tsig signing and verification
- 
- # verify
--ldns_verify, ldns_verify_rrsig, ldns_verify_rrsig_keylist, ldns_verify_rrsig_keylist_notime, ldns_verify_notime | ldns_verify_rrsig_evp | ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5, ldns_sign_public, ldns_zone_sign, ldns_key
-+ldns_verify, ldns_verify_rrsig, ldns_verify_rrsig_keylist, ldns_verify_rrsig_keylist_notime, ldns_verify_notime | ldns_verify_rrsig_evp | ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5, ldns_sign_public, ldns_zone_sign, ldns_key - verify rrsigs
- 
- # convert
--ldns_key_buf2dsa, ldns_key_buf2rsa | ldns_key_rr2ds
--ldns_key_rr2ds | ldns_key
--ldns_create_nsec | ldns_sign_public
-+ldns_key_buf2dsa, ldns_key_buf2rsa | ldns_key_rr2ds - convert buffer to openssl key
-+ldns_key_rr2ds | ldns_key - create DS rr from DNSKEY rr
-+ldns_create_nsec | ldns_sign_public - Create a NSEC record
- 
- # signing
--ldns_sign_public | ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1, ldns_verify, ldns_verify_rrsig, ldns_key
--ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1 | ldns_sign_public
--ldns_dnssec_zone_sign, ldns_dnssec_zone_sign_nsec3 | ldns_zone_sign, ldns_zone_sign_nsec3 | ldns_sign_public, ldns_key, ldns_init_random
--ldns_init_random | ldns_sign_public, ldns_key
--ldns_pkt_verify | ldns_verify, ldns_sign_public, ldns_zone_sign
-+ldns_sign_public | ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1, ldns_verify, ldns_verify_rrsig, ldns_key - sign an rrset
-+ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1 | ldns_sign_public - sign buffer
-+ldns_init_random | ldns_sign_public, ldns_key - seed the random function
-+ldns_pkt_verify | ldns_verify, ldns_sign_public, ldns_zone_sign - verify a packet
-+ldns_zone_sign, ldns_zone_sign_nsec3 - dnssec sign a zone
- 
- # new family of dnssec functions
--ldns_dnssec_zone, ldns_dnssec_name, ldns_dnssec_rrs, ldns_dnssec_rrsets | ldns_dnssec_zone_new, ldns_dnssec_name_new, ldns_dnssec_rrs_new, ldns_dnssec_rrsets_new
--ldns_dnssec_zone_find_rrset, ldns_dnssec_zone_new, ldns_dnssec_zone_free, ldns_dnssec_zone_add_rr, ldns_dnssec_zone_names_print, ldns_dnssec_zone_print, ldns_dnssec_zone_add_empty_nonterminals | ldns_dnssec_zone
--ldns_dnssec_name_new, ldns_dnssec_name_new_frm_rr, ldns_dnssec_name_free, ldns_dnssec_name_name, ldns_dnssec_name_set_name, ldns_dnssec_name_set_nsec, ldns_dnssec_name_cmp, ldns_dnssec_name_add_rr, ldns_dnssec_name_find_rrset, ldns_dnssec_name_print | ldns_dnssec_zone
--ldns_dnssec_rrsets_new, ldns_dnssec_rrsets_free, ldns_dnssec_rrsets_type, ldns_dnssec_rrsets_set_type, ldns_dnssec_rrsets_add_rr, ldns_dnssec_rrsets_print | ldns_dnssec_zone
--ldns_dnssec_rrs_new, ldns_dnssec_rrs_free, ldns_dnssec_rrs_add_rr, ldns_dnssec_rrs_print | ldns_dnssec_zone
-+ldns_dnssec_zone, ldns_dnssec_name, ldns_dnssec_rrs, ldns_dnssec_rrsets | ldns_dnssec_zone_new, ldns_dnssec_name_new, ldns_dnssec_rrs_new, ldns_dnssec_rrsets_new - data structures
-+ldns_dnssec_zone_find_rrset, ldns_dnssec_zone_new, ldns_dnssec_zone_free, ldns_dnssec_zone_add_rr, ldns_dnssec_zone_names_print, ldns_dnssec_zone_print, ldns_dnssec_zone_add_empty_nonterminals | ldns_dnssec_zone - functions for ldns_dnssec_zone
-+ldns_dnssec_name_new, ldns_dnssec_name_new_frm_rr, ldns_dnssec_name_free, ldns_dnssec_name_name, ldns_dnssec_name_set_name, ldns_dnssec_name_set_nsec, ldns_dnssec_name_cmp, ldns_dnssec_name_add_rr, ldns_dnssec_name_find_rrset, ldns_dnssec_name_print | ldns_dnssec_zone - functions for ldns_dnssec_name
-+ldns_dnssec_rrsets_new, ldns_dnssec_rrsets_free, ldns_dnssec_rrsets_type, ldns_dnssec_rrsets_set_type, ldns_dnssec_rrsets_add_rr, ldns_dnssec_rrsets_print | ldns_dnssec_zone - functions for ldns_dnssec_rrsets
-+ldns_dnssec_rrs_new, ldns_dnssec_rrs_free, ldns_dnssec_rrs_add_rr, ldns_dnssec_rrs_print | ldns_dnssec_zone - functions for ldns_dnssec-rrs
- 
- # verification
--ldns_dnssec_data_chain, ldns_dnssec_data_chain_struct, ldns_dnssec_trust_tree | ldns_dnssec_data_chain_new, ldns_dnssec_trust_tree_new, ldns_dnssec_verify_denial
--ldns_dnssec_data_chain_new, ldns_dnssec_data_chain_free, ldns_dnssec_data_chain_deep_free, ldns_dnssec_build_data_chain, ldns_dnssec_data_chain_print | ldns_dnssec_data_chain
--ldns_dnssec_trust_tree_new, ldns_dnssec_trust_tree_free, ldns_dnssec_trust_tree_depth, ldns_dnssec_derive_trust_tree, ldns_dnssec_trust_tree_contains_keys, ldns_dnssec_trust_tree_print, ldns_dnssec_trust_tree_print_sm, ldns_dnssec_trust_tree_add_parent, ldns_dnssec_derive_trust_tree_normal_rrset, ldns_dnssec_derive_trust_tree_dnskey_rrset, ldns_dnssec_derive_trust_tree_ds_rrset, ldns_dnssec_derive_trust_tree_no_sig | ldns_dnssec_data_chain, ldns_dnssec_trust_tree
--ldns_dnssec_verify_denial, ldns_dnssec_verify_denial_nsec3 | ldns_dnssec_trust_tree, ldns_dnssec_data_chain
-+ldns_dnssec_data_chain, ldns_dnssec_data_chain_struct, ldns_dnssec_trust_tree | ldns_dnssec_data_chain_new, ldns_dnssec_trust_tree_new, ldns_dnssec_verify_denial - data structures for validation chains
-+ldns_dnssec_data_chain_new, ldns_dnssec_data_chain_free, ldns_dnssec_data_chain_deep_free, ldns_dnssec_build_data_chain, ldns_dnssec_data_chain_print | ldns_dnssec_data_chain - ldns_chain creation, destruction and printing
-+ldns_dnssec_trust_tree_new, ldns_dnssec_trust_tree_free, ldns_dnssec_trust_tree_depth, ldns_dnssec_derive_trust_tree, ldns_dnssec_trust_tree_contains_keys, ldns_dnssec_trust_tree_print, ldns_dnssec_trust_tree_print_sm, ldns_dnssec_trust_tree_add_parent, ldns_dnssec_derive_trust_tree_normal_rrset, ldns_dnssec_derive_trust_tree_dnskey_rrset, ldns_dnssec_derive_trust_tree_ds_rrset, ldns_dnssec_derive_trust_tree_no_sig | ldns_dnssec_data_chain, ldns_dnssec_trust_tree - functions for ldns_dnssec_trust_tree
-+ldns_dnssec_verify_denial, ldns_dnssec_verify_denial_nsec3 | ldns_dnssec_trust_tree, ldns_dnssec_data_chain - verify denial of existence
- 
- # new signing functions
--ldns_dnssec_zone_sign, ldns_dnssec_zone_sign_nsec3, ldns_dnssec_zone_mark_glue, ldns_dnssec_name_node_next_nonglue, ldns_dnssec_zone_create_nsecs, ldns_dnssec_remove_signatures, ldns_dnssec_zone_create_rrsigs | ldns_dnssec_zone
-+ldns_dnssec_zone_sign, ldns_dnssec_zone_sign_nsec3, ldns_dnssec_zone_mark_glue, ldns_dnssec_name_node_next_nonglue, ldns_dnssec_zone_create_nsecs, ldns_dnssec_remove_signatures, ldns_dnssec_zone_create_rrsigs | ldns_dnssec_zone - sign ldns_dnssec_zone
- 
- ### /dnssec.h
- 
- ### dnskey.h
--ldns_key_new | ldns_key, ldns_key_list_new
--ldns_key_new_frm_algorithm, ldns_key_new_frm_fp, ldns_key_new_frm_fp_l | ldns_key
--ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l | ldns_key_new_frm_fp, ldns_key
--ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l | ldns_key_new_frm_fp, ldns_key
--ldns_key_list_new | ldns_key_new, ldns_key
-+ldns_key_new, ldns_key_new_frm_algorithm, ldns_key_new_frm_fp, ldns_key_new_frm_fp_l, ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l, ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l | ldns_key - create a ldns_key
-+ldns_key_list_new  - create a ldns_key_list
- # access, write
--ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_algo_supported | ldns_key_push_key, ldns_key
--ldns_key_list_push_key | ldns_key_list_pop_key, ldns_key
--ldns_key_list_pop_key | ldns_key_list_push_key, ldns_key
-+ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_algo_supported | ldns_key_push_key, ldns_key - set ldns_key attributes
-+ldns_key_list_push_key, ldns_key_list_pop_key | ldns_key - manipulate ldns_key_list
- # access, read
--ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags | ldns_key
-+ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags | ldns_key - read ldns_keys
- # convert
--ldns_key2rr | ldns_key
--ldns_key_free, ldns_key_deep_free, ldns_key_list_free | ldns_key
-+ldns_key2rr | ldns_key - convert ldns_key to rr
-+ldns_key_free, ldns_key_deep_free, ldns_key_list_free | ldns_key - free a ldns_key
- #
--ldns_key_print | ldns_key_new, ldns_key
--ldns_key | ldns_key_new, ldns_key_new_frm_algorithm,ldns_key_new_frm_fp,ldns_key_new_frm_fp_l, ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l, ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l, ldns_key_list_new, ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_list_push_key, ldns_key_list_pop_key, ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags, ldns_key2rr, ldns_key_free, ldns_key_deep_free, ldns_key_list_free, ldns_key_print
-+ldns_key_print | ldns_key_new, ldns_key - print a ldns_key
-+ldns_calc_keytag, ldns_calc_keytag_raw | ldns_key - calculate ldns keytag
-+ldns_key | ldns_key_new, ldns_key_new_frm_algorithm,ldns_key_new_frm_fp,ldns_key_new_frm_fp_l, ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l, ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l, ldns_key_list_new, ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_list_push_key, ldns_key_list_pop_key, ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags, ldns_key2rr, ldns_key_free, ldns_key_deep_free, ldns_key_list_free, ldns_key_print - ldns_key data structure
- ### /dnskey.h
- 
- ### MIEK TOT HIER TOT HIER
- 
--#	lists
--ldns_key_list_new, ldns_key_list_push_key, ldns_key_list_pop_key, ldns_key_list_key_count, ldns_key_list_key | ldns_key_list, ldns_key
--ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key | ldns_key_list, ldns_key
--
--#	gets/sets
--ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags | ldns_key
--ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count | ldns_key
--
- # errr.h
--ldns_get_errorstr_by_id | ldns_status
--ldns_status | ldns_get_errorstr_by_id
-+ldns_get_errorstr_by_id, ldns_status - errors
- 
- ### net.h
--ldns_send | ldns_pkt, ldns_resolver
--ldns_tcp_send_query, ldns_tcp_read_wire, ldns_tcp_connect | ldns_send, ldns_pkt, ldns_resolver
-+ldns_send | ldns_pkt, ldns_resolver - send a packet
-+ldns_tcp_send_query, ldns_tcp_read_wire, ldns_tcp_connect | ldns_send, ldns_pkt, ldns_resolver - tcp queries
- ### /net.h
- 
- ### buffer.h
- # general
--ldns_buffer | ldns_buffer_new, ldns_buffer_new_frm_data, ldns_buffer_clear, ldns_buffer_printf, ldns_buffer_free, ldns_buffer_export, ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip, ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current, ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok, ldns_buffer_write_at, ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32
--ldns_buffer_new, ldns_buffer_new_frm_data, ldns_buffer_clear, ldns_buffer_printf, ldns_buffer_free, ldns_buffer_export | ldns_buffer
-+ldns_buffer, ldns_buffer_new, ldns_buffer_new_frm_data, ldns_buffer_clear, ldns_buffer_printf, ldns_buffer_free, ldns_buffer_copy, ldns_buffer_export, ldns_buffer_export2str, ldns_buffer2str | ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip, ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current, ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok, ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32, ldns_buffer_write_u32, ldns_buffer_write_u32_at - buffers
- # position
--ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip | ldns_buffer
-+ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip | ldns_buffer - buffer positioning
- # values and pointers
--ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current | ldns_buffer
-+ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current | ldns_buffer - buffer limits and pointers
- # info
--ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok | ldns_buffer
-+ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok | ldns_buffer - check buffer status
- # read and write
--ldns_buffer_write_at, ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32 | ldns_buffer
-+ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32, ldns_buffer_write_u32, ldns_buffer_write_u32_at | ldns_buffer - reading and writing buffers
- ### /buffer.h
- 
- # parse.h
--ldns_bget_token, ldns_bgetc, ldns_bskipcs | ldns_buffer
--ldns_fget_token, ldns_fskipcs | ldns_buffer
--ldns_str_remove_comment
--
-+ldns_bget_token, ldns_bgetc, ldns_bskipcs | ldns_buffer - get tokens from buffers
-+ldns_fget_token, ldns_fskipcs | ldns_buffer - get tokens from files
- 
- # rr.h and other general rr funcs
--ldns_rr, ldns_rr_class, ldns_rr_type, ldns_rr_compress, ldns_rr_list | ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print, ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf, ldns_rr_push_rdf, ldns_rr_pop_rdf, ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class, ldns_rr_list_rr_count, ldns_rr_list_set_rr_count, ldns_rr_list_new, ldns_rr_list_free, ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr, ldns_is_rrset, ldns_rr_set_push_rr, ldns_rr_set_pop_rr, ldns_get_rr_class_by_name, ldns_get_rr_type_by_name, ldns_rr_list_clone, ldns_rr_list_sort, ldns_rr_compare, ldns_rr_compare_ds, ldns_rr_uncompressed_size, ldns_rr2canonical, ldns_rr_label_count, ldns_is_rrset, ldns_rr_descriptor, ldns_rr_descript
--ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print | ldns_rr, ldns_rr_list
--ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf | ldns_rr, ldns_rr_list
--ldns_rr_push_rdf, ldns_rr_pop_rdf | ldns_rr, ldns_rr_list
--ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class | ldns_rr, ldns_rr_list
--ldns_rr_list_rr_count, ldns_rr_list_set_rr_count | ldns_rr, ldns_rr_list
--ldns_rr_list_new, ldns_rr_list_free | ldns_rr, ldns_rr_list
--ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr | ldns_rr, ldns_rr_list
--ldns_is_rrset | ldns_rr, ldns_rr_list
--ldns_rr_set_push_rr, ldns_rr_set_pop_rr | ldns_rr, ldns_rr_list
--ldns_get_rr_class_by_name, ldns_get_rr_type_by_name | ldns_rr, ldns_rr_list
--ldns_rr_list_clone | ldns_rr, ldns_rr_list
--ldns_rr_list_sort | ldns_rr, ldns_rr_list
--ldns_rr_compare, ldns_rr_compare_ds | ldns_rr, ldns_rr_list
--ldns_rr_uncompressed_size | ldns_rr, ldns_rr_list
--ldns_rr2canonical | ldns_rr, ldns_rr_list
--ldns_rr_label_count | ldns_rr, ldns_rr_list
--ldns_is_rrset | ldns_rr
-+ldns_rr, ldns_rr_class, ldns_rr_type, ldns_rr_compress, ldns_rr_list | ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print, ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf, ldns_rr_push_rdf, ldns_rr_pop_rdf, ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class, ldns_rr_list_rr_count, ldns_rr_list_set_rr_count, ldns_rr_list_new, ldns_rr_list_free, ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr, ldns_is_rrset, ldns_rr_set_push_rr, ldns_rr_set_pop_rr, ldns_get_rr_class_by_name, ldns_get_rr_type_by_name, ldns_rr_list_clone, ldns_rr_list_sort, ldns_rr_compare, ldns_rr_compare_ds, ldns_rr_uncompressed_size, ldns_rr2canonical, ldns_rr_label_count, ldns_is_rrset, ldns_rr_descriptor, ldns_rr_descript - types representing dns resource records
-+ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print | ldns_rr, ldns_rr_list - ldns_rr creation, destruction and printing
-+ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf | ldns_rr, ldns_rr_list - set ldns_rr attributes
-+ldns_rr_push_rdf, ldns_rr_pop_rdf | ldns_rr, ldns_rr_list - push and pop rdata fields
-+ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class | ldns_rr, ldns_rr_list - access rdata fields on ldns_rr
-+ldns_rr_list_rr_count, ldns_rr_list_set_rr_count | ldns_rr, ldns_rr_list - get and set ldns_rr_list length
-+ldns_rr_list_new, ldns_rr_list_free | ldns_rr, ldns_rr_list - ldns_rr_list creation and destruction
-+ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr | ldns_rr, ldns_rr_list - ldns_rr_list manipulation
-+ldns_is_rrset | ldns_rr, ldns_rr_list - is rr_list a rrset
-+ldns_rr_set_push_rr, ldns_rr_set_pop_rr | ldns_rr, ldns_rr_list - push and pop rr on a rrset
-+ldns_get_rr_class_by_name, ldns_get_rr_type_by_name | ldns_rr, ldns_rr_list - lookup class or type by name
-+ldns_rr_list_clone | ldns_rr, ldns_rr_list - clone a ldns_rr_list
-+ldns_rr_list_sort | ldns_rr, ldns_rr_list - sort a ldns_rr_list
-+ldns_rr_compare, ldns_rr_compare_ds | ldns_rr, ldns_rr_list - compare a ldns_rr
-+ldns_rr_uncompressed_size | ldns_rr, ldns_rr_list - calculates the uncompressed size of an RR
-+ldns_rr2canonical | ldns_rr, ldns_rr_list - canonicalize a RR
-+ldns_rr_label_count | ldns_rr, ldns_rr_list - return ownername label count
- 
- # rr descriptors
--ldns_rr_descriptor, ldns_rr_descript, ldns_rr_descriptor_minimum, ldns_rr_descriptor_maximum, ldns_rr_descriptor_field_type | ldns_rr, ldns_rdf
-+ldns_rr_descriptor, ldns_rr_descript, ldns_rr_descriptor_minimum, ldns_rr_descriptor_maximum, ldns_rr_descriptor_field_type | ldns_rr, ldns_rdf - rdata field descriptors
- 
- # packet.h
--ldns_pkt, ldns_pkt_section, ldns_pkt_type | ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type, ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type, ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig, ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data
-+ldns_pkt, ldns_pkt_section, ldns_pkt_type | ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type, ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type, ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig, ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data - request or anser packets types
- 
--ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type | ldns_pkt
-+ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type | ldns_pkt - ldns_pkt creation, destruction and printing
- #	gets
--ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type | ldns_pkt 
-+ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type | ldns_pkt - get ldns_pkt attributes
- #	sets
--ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig | ldns_pkt 
-+ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig | ldns_pkt - set ldns_pkt attributes
- #	EDNS0
--ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data | ldns_pkt
-+ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data | ldns_pkt - ldns_pkt ends0 related functions
- 
- # rr_functions.h
--ldns_rr_ns_nsdname
-+ldns_rr_ns_nsdname - get dname rdata field from NS RR
- #
--ldns_rr_mx_preference, ldns_rr_mx_exchange
-+ldns_rr_mx_preference, ldns_rr_mx_exchange - get MX RR rdata fields
- #
--ldns_rr_rrsig_typecovered, ldns_rr_rrsig_set_typecovered, ldns_rr_rrsig_algorithm, ldns_rr_rrsig_set_algorithm, ldns_rr_rrsig_labels, ldns_rr_rrsig_set_labels, ldns_rr_rrsig_origttl, ldns_rr_rrsig_set_origttl, ldns_rr_rrsig_expiration, ldns_rr_rrsig_set_expiration, ldns_rr_rrsig_inception, ldns_rr_rrsig_set_inception, ldns_rr_rrsig_keytag, ldns_rr_rrsig_set_keytag, ldns_rr_rrsig_signame, ldns_rr_rrsig_set_signame, ldns_rr_rrsig_sig, ldns_rr_rrsig_set_sig
-+ldns_rr_rrsig_typecovered, ldns_rr_rrsig_set_typecovered, ldns_rr_rrsig_algorithm, ldns_rr_rrsig_set_algorithm, ldns_rr_rrsig_labels, ldns_rr_rrsig_set_labels, ldns_rr_rrsig_origttl, ldns_rr_rrsig_set_origttl, ldns_rr_rrsig_expiration, ldns_rr_rrsig_set_expiration, ldns_rr_rrsig_inception, ldns_rr_rrsig_set_inception, ldns_rr_rrsig_keytag, ldns_rr_rrsig_set_keytag, ldns_rr_rrsig_signame, ldns_rr_rrsig_set_signame, ldns_rr_rrsig_sig, ldns_rr_rrsig_set_sig - get and set RRSIG RR rdata fields
- #
--ldns_rr_dnskey_flags, ldns_rr_dnskey_set_flags, ldns_rr_dnskey_protocol, ldns_rr_dnskey_set_protocol, ldns_rr_dnskey_algorithm, ldns_rr_dnskey_set_algorithm, ldns_rr_dnskey_key, ldns_rr_dnskey_set_key | ldns_rr
-+ldns_rr_dnskey_flags, ldns_rr_dnskey_set_flags, ldns_rr_dnskey_protocol, ldns_rr_dnskey_set_protocol, ldns_rr_dnskey_algorithm, ldns_rr_dnskey_set_algorithm, ldns_rr_dnskey_key, ldns_rr_dnskey_set_key | ldns_rr - get and set DNSKEY RR rdata fields
- 
- ### zone.h
--ldns_zone |  ldns_zone_new, ldns_zone_deep_free, ldns_zone_new_frm_fp, ldns_zone_new_frm_fp_l, ldns_zone_sort, ldns_zone_glue_rr_list, ldns_zone_push_rr, ldns_zone_push_rr_list, ldns_zone_set_rrs, ldns_zone_set_soa, ldns_zone_rrs, ldns_zone_soa, ldns_zone_rr_count,
-+ldns_zone, ldns_zone_new, ldns_zone_free, ldns_zone_deep_free, ldns_zone_new_frm_fp, ldns_zone_new_frm_fp_l,  ldns_zone_print, ldns_zone_print_fmt - ldns_zone creation, destruction and printing
-+ldns_zone_sort, ldns_zone_glue_rr_list | ldns_zone - sort a zone and get the glue records
-+ldns_zone_push_rr, ldns_zone_push_rr_list | ldns_zone - add rr's to a ldns_zone
-+ldns_zone_set_rrs, ldns_zone_set_soa | ldns_zone, ldns_zone_rrs, ldns_zone_soa - ldns_zone set content
-+ldns_zone_rrs, ldns_zone_soa | ldns_zone ldns_zone_set_rrs - ldns_zone get content
-+ldns_zone_rr_count | ldns_zone - get ldns_zone size
- 
-+### update.h
-+ldns_update_pkt_new | ldns_update_pkt_tsig_add, ldns_update_pkt_tsig_add, ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount, ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount - create an update packet
- 
--ldns_zone_new, ldns_zone_deep_free, ldns_zone_new_frm_fp, ldns_zone_new_frm_fp_l | ldns_zone
--ldns_zone_sort, ldns_zone_glue_rr_list | ldns_zone
--ldns_zone_push_rr, ldns_zone_push_rr_list | ldns_zone
--ldns_zone_set_rrs, ldns_zone_set_soa | ldns_zone, ldns_zone_rrs, ldns_zone_soa
--ldns_zone_rrs, ldns_zone_soa | ldns_zone ldns_zone_set_rrs
--ldns_zone_rr_count | ldns_zone
-+ldns_update_pkt_tsig_add | ldns_update_pkt_new - add resolver's tsig credentials to an ldns_pkt
-+ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount | ldns_update_pkt_new - return update packet counters
-+ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount | ldns_update_pkt_new - set the update packet counters
-+
-+### keys.h
-+ldns_algorithm - numbers assigned to algorithms used in dns
-+
-+
-+ldns_axfr_start, ldns_axfr_next, ldns_axfr_abort, ldns_axfr_complete, ldns_axfr_last_pkt - functions for full zone transfer
-+
-+ldns_b32_ntop_calculate_size, ldns_b32_pton_calculate_size, ldns_b64_ntop_calculate_size, ldns_b64_pton_calculate_size - return size needed for b32 or b64 encoded or decoded data
-+
-+ldns_duration_type, ldns_duration_create, ldns_duration_create_from_string, ldns_duration_cleanup, ldns_duration_compare, ldns_duration2string, ldns_duration2time - duration type and related functions
-+
-+ldns_bubblebabble - encode data as BubbleBabble
-+
-+ldns_version - return library version
- 
--### update.h
--ldns_update_pkt_new | ldns_update_pkt_tsig_add, ldns_update_pkt_tsig_add, ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount, ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount,
- 
--ldns_update_pkt_tsig_add | ldns_update_pkt_new
--ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount | ldns_update_pkt_new
--ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount | ldns_update_pkt_new
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/libldns/Config.in b/bsp/buildroot/package/libldns/Config.in
index 12065ae2..696fec97 100644
--- a/bsp/buildroot/package/libldns/Config.in
+++ b/bsp/buildroot/package/libldns/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBLDNS
 	bool "libldns"
+	select BR2_PACKAGE_OPENSSL
 	help
 	  The goal of ldns is to simplify DNS programming, it supports
 	  recent RFCs like the DNSSEC documents, and allows developers
diff --git a/bsp/buildroot/package/libldns/libldns.hash b/bsp/buildroot/package/libldns/libldns.hash
index 3565c583..dc6b1a34 100644
--- a/bsp/buildroot/package/libldns/libldns.hash
+++ b/bsp/buildroot/package/libldns/libldns.hash
@@ -1,4 +1,4 @@
-# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz.sha1
-sha1	4218897b3c002aadfc7280b3f40cda829e05c9a4	ldns-1.6.17.tar.gz
-# Locally calculated
-sha256	8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd	ldns-1.6.17.tar.gz
+# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz.sha1
+sha1 ceeeccf8a27e61a854762737f6ee02f44662c1b8  ldns-1.7.0.tar.gz
+# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.7.0.tar.gz.sha256
+sha256 c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc  ldns-1.7.0.tar.gz
diff --git a/bsp/buildroot/package/libldns/libldns.mk b/bsp/buildroot/package/libldns/libldns.mk
index 3d4d3568..d3c89bb6 100644
--- a/bsp/buildroot/package/libldns/libldns.mk
+++ b/bsp/buildroot/package/libldns/libldns.mk
@@ -4,42 +4,32 @@
 #
 ################################################################################
 
-LIBLDNS_VERSION = 1.6.17
+LIBLDNS_VERSION = 1.7.0
 LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz
 LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns
-LIBLDNS_LICENSE = BSD-3c
+LIBLDNS_LICENSE = BSD-3-Clause
 LIBLDNS_LICENSE_FILES = LICENSE
 LIBLDNS_INSTALL_STAGING = YES
+LIBLDNS_DEPENDENCIES = openssl
+# --disable-dane-verify can be removed after openssl bump to 1.1.x
 LIBLDNS_CONF_OPTS = \
+	--with-ssl=$(STAGING_DIR)/usr \
+	--enable-dane \
+	--disable-dane-verify \
+	--enable-ecdsa \
+	--enable-gost \
+	--enable-sha2 \
 	--without-examples \
 	--without-p5-dns-ldns \
 	--without-pyldns \
 	--without-pyldnsx
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBLDNS_DEPENDENCIES += openssl
-LIBLDNS_CONF_OPTS += \
-	--with-ssl=$(STAGING_DIR)/usr \
-	--enable-dane \
-	--enable-ecdsa \
-	--enable-gost \
-	--enable-sha2
-
 ifeq ($(BR2_STATIC_LIBS),y)
 LIBLDNS_DEPENDENCIES += host-pkgconf
 # missing -lz breaks configure, add it using pkgconf
 LIBLDNS_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`"
 endif
 
-else
-LIBLDNS_CONF_OPTS += \
-	--without-ssl \
-	--disable-dane \
-	--disable-ecdsa \
-	--disable-gost \
-	--disable-sha2
-endif
-
 # the linktest make target fails with static linking, and we are only
 # interested in the lib target anyway
 LIBLDNS_MAKE_OPTS = lib
diff --git a/bsp/buildroot/package/liblinear/Config.in b/bsp/buildroot/package/liblinear/Config.in
index f25c1196..cabcba05 100644
--- a/bsp/buildroot/package/liblinear/Config.in
+++ b/bsp/buildroot/package/liblinear/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBLINEAR
 	bool "liblinear"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  liblinear is a linear classifier for data with millions of instances
-	  and features.
+	  liblinear is a linear classifier for data with millions of
+	  instances and features.
 
 	  http://www.csie.ntu.edu.tw/~cjlin/liblinear/
 
diff --git a/bsp/buildroot/package/liblinear/liblinear.mk b/bsp/buildroot/package/liblinear/liblinear.mk
index a9524e35..84527ab8 100644
--- a/bsp/buildroot/package/liblinear/liblinear.mk
+++ b/bsp/buildroot/package/liblinear/liblinear.mk
@@ -6,7 +6,7 @@
 
 LIBLINEAR_VERSION = 2.1
 LIBLINEAR_SITE = http://www.csie.ntu.edu.tw/~cjlin/liblinear
-LIBLINEAR_LICENSE = BSD-3c
+LIBLINEAR_LICENSE = BSD-3-Clause
 LIBLINEAR_LICENSE_FILES = COPYRIGHT
 LIBLINEAR_INSTALL_STAGING = YES
 LIBLINEAR_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/libllcp/Config.in b/bsp/buildroot/package/libllcp/Config.in
index e5b21082..1660e92a 100644
--- a/bsp/buildroot/package/libllcp/Config.in
+++ b/bsp/buildroot/package/libllcp/Config.in
@@ -6,4 +6,4 @@ config BR2_PACKAGE_LIBLLCP
 	  Library extending libnfc with support for Logical Link Control
 	  Protocol.
 
-	  https://code.google.com/p/libllcp/
+	  https://github.com/nfc-tools/libllcp
diff --git a/bsp/buildroot/package/libllcp/libllcp.mk b/bsp/buildroot/package/libllcp/libllcp.mk
index 2c2014a1..ad4fca6b 100644
--- a/bsp/buildroot/package/libllcp/libllcp.mk
+++ b/bsp/buildroot/package/libllcp/libllcp.mk
@@ -10,7 +10,7 @@ LIBLLCP_DEPENDENCIES = host-pkgconf libnfc
 # There's no ./configure in the repository, so we need to autoreconf
 LIBLLCP_AUTORECONF = YES
 LIBLLCP_INSTALL_STAGING = YES
-LIBLLCP_LICENSE = GPLv3+
+LIBLLCP_LICENSE = GPL-3.0+
 LIBLLCP_LICENSE_FILES = COPYING
 # ensure graphviz isn't used
 LIBLLCP_CONF_ENV = ac_cv_path_DOT=
diff --git a/bsp/buildroot/package/liblo/liblo.mk b/bsp/buildroot/package/liblo/liblo.mk
index a6b90750..3c852be7 100644
--- a/bsp/buildroot/package/liblo/liblo.mk
+++ b/bsp/buildroot/package/liblo/liblo.mk
@@ -7,7 +7,7 @@
 LIBLO_VERSION = 0.26
 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION)
 
-LIBLO_LICENSE = LGPLv2.1+
+LIBLO_LICENSE = LGPL-2.1+
 LIBLO_LICENSE_FILES = COPYING
 LIBLO_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/liblockfile/liblockfile.mk b/bsp/buildroot/package/liblockfile/liblockfile.mk
index 59fced68..07108682 100644
--- a/bsp/buildroot/package/liblockfile/liblockfile.mk
+++ b/bsp/buildroot/package/liblockfile/liblockfile.mk
@@ -9,7 +9,7 @@ LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz
 LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile
 LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-6.debian.tar.bz2
 
-LIBLOCKFILE_LICENSE = LGPLv2+, GPLv2+ (dotlockfile)
+LIBLOCKFILE_LICENSE = LGPL-2.0+, GPL-2.0+ (dotlockfile)
 LIBLOCKFILE_LICENSE_FILES = COPYRIGHT
 
 LIBLOCKFILE_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/liblog4c-localtime/Config.in b/bsp/buildroot/package/liblog4c-localtime/Config.in
index a2b7a843..fd6cab83 100644
--- a/bsp/buildroot/package/liblog4c-localtime/Config.in
+++ b/bsp/buildroot/package/liblog4c-localtime/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_LIBLOG4C_LOCALTIME
 	help
 	  Log4c is a library of C for flexible logging to files, syslog
 	  and other destinations.
-	  This version is with localtime patch, to make lib show times in
-	  local timezone.
+	  This version is with localtime patch, to make lib show times
+	  in local timezone.
 
 	  https://github.com/rcmadruga/log4c-localtime
 	  http://log4c.sourceforge.net/
diff --git a/bsp/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk b/bsp/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk
index bc6d1ab5..fba0d4fa 100644
--- a/bsp/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk
+++ b/bsp/buildroot/package/liblog4c-localtime/liblog4c-localtime.mk
@@ -10,7 +10,7 @@ LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES
 LIBLOG4C_LOCALTIME_CONF_OPTS = --disable-expattest
 LIBLOG4C_LOCALTIME_DEPENDENCIES = expat
 LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config
-LIBLOG4C_LOCALTIME_LICENSE = LGPLv2.1
+LIBLOG4C_LOCALTIME_LICENSE = LGPL-2.1
 LIBLOG4C_LOCALTIME_LICENSE_FILES = COPYING
 LIBLOG4C_LOCALTIME_AUTORECONF = YES
 
diff --git a/bsp/buildroot/package/liblogging/Config.in b/bsp/buildroot/package/liblogging/Config.in
index 23c3c1ad..a39fdf8d 100644
--- a/bsp/buildroot/package/liblogging/Config.in
+++ b/bsp/buildroot/package/liblogging/Config.in
@@ -5,4 +5,4 @@ config BR2_PACKAGE_LIBLOGGING
 	  logging. It offers an enhanced replacement
 	  for the syslog() call, but retains its ease of use.
 
-	  http://www.liblogging.org/
+	  https://www.rsyslog.com/liblogging/
diff --git a/bsp/buildroot/package/liblogging/liblogging.mk b/bsp/buildroot/package/liblogging/liblogging.mk
index 9ef2e28b..ec57a0ac 100644
--- a/bsp/buildroot/package/liblogging/liblogging.mk
+++ b/bsp/buildroot/package/liblogging/liblogging.mk
@@ -6,7 +6,7 @@
 
 LIBLOGGING_VERSION = 1.0.5
 LIBLOGGING_SITE = http://download.rsyslog.com/liblogging
-LIBLOGGING_LICENSE = BSD-2c
+LIBLOGGING_LICENSE = BSD-2-Clause
 LIBLOGGING_LICENSE_FILES = COPYING
 LIBLOGGING_INSTALL_STAGING = YES
 LIBLOGGING_CONF_OPTS = --enable-cached-man-pages
diff --git a/bsp/buildroot/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch b/bsp/buildroot/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch
new file mode 100644
index 00000000..d19306fd
--- /dev/null
+++ b/bsp/buildroot/package/libloki/0001-allow-to-install-to-a-specific-location-using-DESTDI.patch
@@ -0,0 +1,65 @@
+From 0b80e8beff68a0570fdc2d9281992060414475c1 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sat, 29 Apr 2017 22:13:54 +0200
+Subject: [PATCH] allow to install to a specific location using DESTDIR
+
+DESTDIR is the autotools standard variable where to copy
+headers, libraries and binaries. It's not the same as "prefix".
+
+So while installing to Buildroot STAGING directory, use prefix=/usr
+and DESTOR=$(STAGING_DIR).
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+Sigend-off-by: Corentin GUILLEVIC <corentin.guillevic@smile.fr>
+---
+ include/Makefile | 12 ++++++------
+ src/Makefile     | 10 +++++-----
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/include/Makefile b/include/Makefile
+index 26a8139..a8cf369 100644
+--- a/include/Makefile
++++ b/include/Makefile
+@@ -2,10 +2,10 @@ include ../Makefile.common
+ 
+ .PHONY: install
+ install:
+-	mkdir -p $(prefix)/include/loki
+-	mkdir -p $(prefix)/include/loki/flex
+-	mkdir -p $(prefix)/include/loki/yasli
++	mkdir -p $(DESTDIR)$(prefix)/include/loki
++	mkdir -p $(DESTDIR)$(prefix)/include/loki/flex
++	mkdir -p $(DESTDIR)$(prefix)/include/loki/yasli
+ 	
+-	install -m 644 loki/*.h $(prefix)/include/loki
+-	install -m 644 loki/flex/*.h $(prefix)/include/loki/flex
+-	install -m 644 loki/yasli/*.h $(prefix)/include/loki/yasli
++	install -m 644 loki/*.h $(DESTDIR)$(prefix)/include/loki
++	install -m 644 loki/flex/*.h $(DESTDIR)$(prefix)/include/loki/flex
++	install -m 644 loki/yasli/*.h $(DESTDIR)$(prefix)/include/loki/yasli
+diff --git a/src/Makefile b/src/Makefile
+index b272929..054285e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -74,13 +74,13 @@ INSTALL_DATA := $(INSTALL) -m 644
+ install: install-static install-shared
+ 
+ install-static: $(RESULT_DIR)$(STATIC_LIB)
+-	mkdir -p $(prefix)/lib
+-	$(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(prefix)/lib
++	mkdir -p $(DESTDIR)$(prefix)/lib
++	$(INSTALL_DATA) $(RESULT_DIR)$(STATIC_LIB) $(DESTDIR)$(prefix)/lib
+ 
+ install-shared: $(RESULT_DIR)$(SHARED_LIB_VERSIONED)
+-	mkdir -p $(prefix)/lib
+-	$(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(prefix)/lib
+-	cd $(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE)
++	mkdir -p $(DESTDIR)$(prefix)/lib
++	$(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(DESTDIR)$(prefix)/lib
++	cd $(DESTDIR)$(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE)
+ 
+ %.lo : %.cpp
+ 	$(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $<
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/libloki/0002-use-ln-snf.patch b/bsp/buildroot/package/libloki/0002-use-ln-snf.patch
new file mode 100644
index 00000000..5b73d7f9
--- /dev/null
+++ b/bsp/buildroot/package/libloki/0002-use-ln-snf.patch
@@ -0,0 +1,31 @@
+From 7fcaa080ef3fddb3f7dcfaf2984bc397d7c9e96c Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sat, 29 Apr 2017 22:27:26 +0200
+Subject: [PATCH] use ln -snf
+
+Otherwise the install step fail due to existing symlink.
+
+'libloki.so': File exists
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+Sigend-off-by: Corentin GUILLEVIC <corentin.guillevic@smile.fr>
+---
+ src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 054285e..2c169ab 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -80,7 +80,7 @@ install-static: $(RESULT_DIR)$(STATIC_LIB)
+ install-shared: $(RESULT_DIR)$(SHARED_LIB_VERSIONED)
+ 	mkdir -p $(DESTDIR)$(prefix)/lib
+ 	$(INSTALL_DATA) $(RESULT_DIR)$(SHARED_LIB_VERSIONED) $(DESTDIR)$(prefix)/lib
+-	cd $(DESTDIR)$(prefix)/lib; ln -s $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE)
++	cd $(DESTDIR)$(prefix)/lib; ln -snf $(SHARED_LIB_VERSIONED) $(SHARED_LIB_BASE)
+ 
+ %.lo : %.cpp
+ 	$(CXX) -c $(CXXFLAGS) -fPIC $(CPPFLAGS) -o $@ $<
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/libloki/Config.in b/bsp/buildroot/package/libloki/Config.in
new file mode 100644
index 00000000..4ce4429a
--- /dev/null
+++ b/bsp/buildroot/package/libloki/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBLOKI
+	bool "libloki"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  A C++ library of designs, containing flexible
+	  implementations of common design patterns and idioms.
+
+	  http://sourceforge.net/projects/loki-lib
+
+comment "libloki needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libloki/libloki.hash b/bsp/buildroot/package/libloki/libloki.hash
new file mode 100644
index 00000000..52d67c88
--- /dev/null
+++ b/bsp/buildroot/package/libloki/libloki.hash
@@ -0,0 +1,5 @@
+# From https://sourceforge.net/projects/loki-lib/files/Loki/Loki%200.1.7
+md5 33a24bcbb99fa2ec8fcbbab65649f3f6 loki-0.1.7.tar.bz2
+sha1 006c630217b1e1fd33015dc0597d2d743d8ee4e3 loki-0.1.7.tar.bz2
+# locally computed
+sha256 07553754f6be2738559947db69b0718512665bf4a34015fa3a875b6eb1111198 loki-0.1.7.tar.bz2
diff --git a/bsp/buildroot/package/libloki/libloki.mk b/bsp/buildroot/package/libloki/libloki.mk
new file mode 100644
index 00000000..7564239f
--- /dev/null
+++ b/bsp/buildroot/package/libloki/libloki.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# libloki
+#
+################################################################################
+
+LIBLOKI_VERSION = 0.1.7
+LIBLOKI_SOURCE = loki-$(LIBLOKI_VERSION).tar.bz2
+LIBLOKI_SITE = https://sourceforge.net/projects/loki-lib/files/Loki/Loki%20$(LIBLOKI_VERSION)
+LIBLOKI_LICENSE = MIT
+LIBLOKI_INSTALL_STAGING = YES
+
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBLOKI_BUILD_TARGETS += build-static
+LIBLOKI_INSTALL_TARGETS += install-static
+else ifeq ($(BR2_SHARED_LIBS),y)
+LIBLOKI_BUILD_TARGETS += build-shared
+LIBLOKI_INSTALL_TARGETS += install-shared
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+LIBLOKI_BUILD_TARGETS += build-static build-shared
+LIBLOKI_INSTALL_TARGETS += install-static install-shared
+endif
+
+define LIBLOKI_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		-C $(@D) $(LIBLOKI_BUILD_TARGETS)
+endef
+
+define LIBLOKI_INSTALL_STAGING_CMDS
+	$(MAKE) -C $(@D)/src DESTDIR=$(STAGING_DIR) $(LIBLOKI_INSTALL_TARGETS)
+	$(MAKE) -C $(@D)/include DESTDIR=$(STAGING_DIR) install
+endef
+
+define LIBLOKI_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) $(LIBLOKI_INSTALL_TARGETS)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/libmad/Config.in b/bsp/buildroot/package/libmad/Config.in
index f93f54ab..1d6bdd86 100644
--- a/bsp/buildroot/package/libmad/Config.in
+++ b/bsp/buildroot/package/libmad/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBMAD
 	bool "libmad"
 	help
-	  High-quality MPEG audio decoder. All computations are performed
-	  with fixed-point integer arithmetic, making it ideal for systems
-	  without a floating-point unit.
+	  High-quality MPEG audio decoder. All computations are
+	  performed with fixed-point integer arithmetic, making it ideal
+	  for systems without a floating-point unit.
 
 	  http://www.underbit.com/products/mad/
 
@@ -37,9 +37,9 @@ config BR2_PACKAGE_LIBMAD_SSO
 
 config BR2_PACKAGE_LIBMAD_ASO
 	bool "Architecture-specific optimizations"
+	default y
 	# arm optimization needs classic arm instructions support
 	depends on !(BR2_arm && !BR2_ARM_CPU_HAS_ARM)
-	default y
 	help
 	  Use certain architecture-specific optimizations.
 
diff --git a/bsp/buildroot/package/libmad/libmad.mk b/bsp/buildroot/package/libmad/libmad.mk
index 2200448d..7175eaa3 100644
--- a/bsp/buildroot/package/libmad/libmad.mk
+++ b/bsp/buildroot/package/libmad/libmad.mk
@@ -8,7 +8,7 @@ LIBMAD_VERSION = 0.15.1b
 LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION)
 LIBMAD_INSTALL_STAGING = YES
 LIBMAD_LIBTOOL_PATCH = NO
-LIBMAD_LICENSE = GPLv2+
+LIBMAD_LICENSE = GPL-2.0+
 LIBMAD_LICENSE_FILES = COPYING
 LIBMAD_PATCH = \
 	https://sources.debian.net/data/main/libm/libmad/0.15.1b-8/debian/patches/frame_length.diff
@@ -23,14 +23,8 @@ define LIBMAD_INSTALL_STAGING_PC
 		$(STAGING_DIR)/usr/lib/pkgconfig/mad.pc
 endef
 
-define LIBMAD_INSTALL_TARGET_PC
-	$(INSTALL) -D package/libmad/mad.pc \
-		$(TARGET_DIR)/usr/lib/pkgconfig/mad.pc
-endef
-
 LIBMAD_POST_PATCH_HOOKS += LIBMAD_PREVENT_AUTOMAKE
 LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC
-LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC
 
 LIBMAD_CONF_OPTS = \
 	--disable-debugging \
diff --git a/bsp/buildroot/package/libmatroska/Config.in b/bsp/buildroot/package/libmatroska/Config.in
index 5815a46c..ec0e8415 100644
--- a/bsp/buildroot/package/libmatroska/Config.in
+++ b/bsp/buildroot/package/libmatroska/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBMATROSKA
 	bool "libmatroska"
-	select BR2_PACKAGE_LIBEBML
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBEBML
 	help
 	  Extensible open standard audio/video container format access
 	  library.
diff --git a/bsp/buildroot/package/libmatroska/libmatroska.mk b/bsp/buildroot/package/libmatroska/libmatroska.mk
index 083cced9..18ea505a 100644
--- a/bsp/buildroot/package/libmatroska/libmatroska.mk
+++ b/bsp/buildroot/package/libmatroska/libmatroska.mk
@@ -8,7 +8,7 @@ LIBMATROSKA_VERSION = 1.4.4
 LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska
 LIBMATROSKA_INSTALL_STAGING = YES
-LIBMATROSKA_LICENSE = LGPLv2.1+
+LIBMATROSKA_LICENSE = LGPL-2.1+
 LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL
 LIBMATROSKA_DEPENDENCIES = libebml host-pkgconf
 
diff --git a/bsp/buildroot/package/libmaxminddb/0001-Add-disable-binaries.patch b/bsp/buildroot/package/libmaxminddb/0001-Add-disable-binaries.patch
new file mode 100644
index 00000000..0053cace
--- /dev/null
+++ b/bsp/buildroot/package/libmaxminddb/0001-Add-disable-binaries.patch
@@ -0,0 +1,53 @@
+From 501f85fa729d08b90f0e1ff6f9378a0864f722a7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 2 Feb 2018 13:19:18 +0100
+Subject: [PATCH] Add --disable-binaries
+
+mmdblookup now depends on pthread.h which can be disabled on some
+toolchains so add an option to be able to compile libmaxminddb without
+this binary
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ Makefile.am  | 6 +++++-
+ configure.ac | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cebcd31..cfbfd77 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,8 +4,12 @@ include_HEADERS = include/maxminddb.h
+ nodist_include_HEADERS = include/maxminddb_config.h
+ 
+ SUBDIRS = \
+-  src     \
++  src
++
++if BINARIES
++SUBDIRS += \
+   bin
++endif
+ 
+ if TESTS
+ SUBDIRS += \
+diff --git a/configure.ac b/configure.ac
+index c494746..4d1beb4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,6 +119,12 @@ AC_ARG_ENABLE(
+         esac],[debug=false])
+ AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+ 
++AC_ARG_ENABLE([binaries],
++        AS_HELP_STRING([--enable-binaries], [Compilation of binaries code]),
++        [enable_binaries=${enableval}],
++        [enable_binaries=yes])
++AM_CONDITIONAL([BINARIES], [test "${enable_binaries}" = "yes"])
++
+ AC_ARG_ENABLE([tests],
+         AS_HELP_STRING([--enable-tests], [Compilation of tests code]),
+         [enable_tests=${enableval}],
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/libmaxminddb/Config.in b/bsp/buildroot/package/libmaxminddb/Config.in
new file mode 100644
index 00000000..1b8061b7
--- /dev/null
+++ b/bsp/buildroot/package/libmaxminddb/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LIBMAXMINDDB
+	bool "libmaxminddb"
+	help
+	  C library for the MaxMind DB file format
+
+	  The libmaxminddb library provides a C library for reading
+	  MaxMind DB files, including the GeoIP2 databases from
+	  MaxMind.  This is a custom binary format designed to
+	  facilitate fast lookups of IP addresses while allowing for
+	  great flexibility in the type of data associated with an
+	  address.
+
+	  The MaxMind DB format is an open format. The spec is
+	  available at http://maxmind.github.io/MaxMind-DB/. This spec
+	  is licensed under the Creative Commons
+	  Attribution-ShareAlike 3.0 Unported License.
+
+	  http://maxmind.github.io/libmaxminddb
diff --git a/bsp/buildroot/package/libmaxminddb/libmaxminddb.hash b/bsp/buildroot/package/libmaxminddb/libmaxminddb.hash
new file mode 100644
index 00000000..073458a3
--- /dev/null
+++ b/bsp/buildroot/package/libmaxminddb/libmaxminddb.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256	c0785521c7e5515f1169db90ed6e51bc2a5a000377d0fbad87e4d5a791a6e364	libmaxminddb-1.3.2.tar.gz
+sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30	LICENSE
diff --git a/bsp/buildroot/package/libmaxminddb/libmaxminddb.mk b/bsp/buildroot/package/libmaxminddb/libmaxminddb.mk
new file mode 100644
index 00000000..25d4d337
--- /dev/null
+++ b/bsp/buildroot/package/libmaxminddb/libmaxminddb.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# libmaxminddb
+#
+################################################################################
+
+LIBMAXMINDDB_VERSION = 1.3.2
+LIBMAXMINDDB_SITE = $(call github,maxmind,libmaxminddb,$(LIBMAXMINDDB_VERSION))
+LIBMAXMINDDB_INSTALL_STAGING = YES
+LIBMAXMINDDB_LICENSE = Apache-2.0
+LIBMAXMINDDB_LICENSE_FILES = LICENSE
+# Fetched from Github, with no configure script
+LIBMAXMINDDB_AUTORECONF = YES
+LIBMAXMINDDB_CONF_OPTS = --disable-tests
+
+# mmdblookup binary depends on pthreads
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+LIBMAXMINDDB_CONF_OPTS += --enable-binaries
+else
+LIBMAXMINDDB_CONF_OPTS += --disable-binaries
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch b/bsp/buildroot/package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch
new file mode 100644
index 00000000..1a72b618
--- /dev/null
+++ b/bsp/buildroot/package/libmbim/0001-mbim-device-prefer-realpath-to-canonicalize_file_nam.patch
@@ -0,0 +1,37 @@
+From 6b043b9b676e88a80e3d4013863c5e970fdde1df Mon Sep 17 00:00:00 2001
+From: Aleksander Morgado <aleksander@aleksander.es>
+Date: Mon, 11 Sep 2017 09:31:03 +0200
+Subject: [PATCH] mbim-device: prefer realpath() to canonicalize_file_name()
+
+Usually the canonicalize_file_name() GNU extension is preferred to the
+POSIX realpath(), as it covers some of the limitations the latter has.
+But this extension isn't available in lots of platforms or in other
+c library implementations (e.g. musl), so just default to the POSIX
+method to improve portability.
+
+Note that the check for canonicalize_file_name() availability during
+configure isn't as trivial as adding a new AC_CHECK_FUNCS(), and
+importing a gnulib module seems overkill just for this one liner.
+
+(cherry picked from commit 417b0b80023dc30d61c111ec0a54da2884d3a541)
+Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
+---
+ src/libmbim-glib/mbim-device.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libmbim-glib/mbim-device.c b/src/libmbim-glib/mbim-device.c
+index e1f32a6..20e64af 100644
+--- a/src/libmbim-glib/mbim-device.c
++++ b/src/libmbim-glib/mbim-device.c
+@@ -867,7 +867,7 @@ get_descriptors_filepath (MbimDevice *self)
+          *    /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.5/2-1.5:2.0
+          */
+         tmp = g_strdup_printf ("/sys/class/%s/%s/device", subsystems[i], device_basename);
+-        path = canonicalize_file_name (tmp);
++        path = realpath (tmp, NULL);
+         g_free (tmp);
+
+         if (g_file_test (path, G_FILE_TEST_EXISTS)) {
+--
+2.13.1
+
diff --git a/bsp/buildroot/package/libmbim/Config.in b/bsp/buildroot/package/libmbim/Config.in
index 0ef28db1..fd7dbb31 100644
--- a/bsp/buildroot/package/libmbim/Config.in
+++ b/bsp/buildroot/package/libmbim/Config.in
@@ -2,16 +2,15 @@ config BR2_PACKAGE_LIBMBIM
 	bool "libmbim"
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	depends on BR2_PACKAGE_HAS_UDEV
-	select BR2_PACKAGE_LIBGUDEV
+	depends on BR2_USE_MMU # libglib2
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  libmbim is a glib-based library for talking to WWAN modems and
-	  devices which speak the Mobile Interface Broadband Model (MBIM)
-	  protocol.
+	  devices which speak the Mobile Interface Broadband Model
+	  (MBIM) protocol.
 
 	  http://www.freedesktop.org/wiki/Software/libmbim/
 
-comment "libmbim needs udev /dev management and a toolchain w/ wchar, threads"
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_PACKAGE_HAS_UDEV
+comment "libmbim needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libmbim/libmbim.hash b/bsp/buildroot/package/libmbim/libmbim.hash
index 21921c9d..664513e5 100644
--- a/bsp/buildroot/package/libmbim/libmbim.hash
+++ b/bsp/buildroot/package/libmbim/libmbim.hash
@@ -1,2 +1,4 @@
 # Locally computed:
-sha256  ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b  libmbim-1.14.0.tar.xz
+sha256  22cafe6b8432433aa58bedcf7db71111522ce6531bfe24e8e9b6058412cd31cf  libmbim-1.14.2.tar.xz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/bsp/buildroot/package/libmbim/libmbim.mk b/bsp/buildroot/package/libmbim/libmbim.mk
index 0f757c02..b67905a7 100644
--- a/bsp/buildroot/package/libmbim/libmbim.mk
+++ b/bsp/buildroot/package/libmbim/libmbim.mk
@@ -4,16 +4,24 @@
 #
 ################################################################################
 
-LIBMBIM_VERSION = 1.14.0
+LIBMBIM_VERSION = 1.14.2
 LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim
 LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
-LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
-LIBMBIM_LICENSE_FILES = COPYING
+LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
+LIBMBIM_LICENSE_FILES = COPYING COPYING.LIB
 LIBMBIM_INSTALL_STAGING = YES
 
-LIBMBIM_DEPENDENCIES = libglib2 udev libgudev
+LIBMBIM_DEPENDENCIES = libglib2
 
 # we don't want -Werror
 LIBMBIM_CONF_OPTS = --enable-more-warnings=no
 
+# if libgudev available, request udev support
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
+LIBMBIM_DEPENDENCIES += libgudev
+LIBMBIM_CONF_OPTS += --with-udev
+else
+LIBMBIM_CONF_OPTS += --without-udev
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmbus/Config.in b/bsp/buildroot/package/libmbus/Config.in
index 86140690..ae3e85cd 100644
--- a/bsp/buildroot/package/libmbus/Config.in
+++ b/bsp/buildroot/package/libmbus/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBMBUS
 	bool "libmbus"
 	help
-	  libmbus is a library for communicating with energy metering devices.
-	  It supports TCP and RS232 M-bus gateways.
+	  libmbus is a library for communicating with energy metering
+	  devices. It supports TCP and RS232 M-bus gateways.
 	  (M-bus standard: http://www.m-bus.com/)
 
 	  http://www.rscada.se/libmbus/
diff --git a/bsp/buildroot/package/libmbus/libmbus.mk b/bsp/buildroot/package/libmbus/libmbus.mk
index 75aaa8dc..61f797b5 100644
--- a/bsp/buildroot/package/libmbus/libmbus.mk
+++ b/bsp/buildroot/package/libmbus/libmbus.mk
@@ -7,7 +7,7 @@
 LIBMBUS_VERSION = 0.8.0
 LIBMBUS_SITE = http://www.rscada.se/public-dist
 LIBMBUS_INSTALL_STAGING = YES
-LIBMBUS_LICENSE = BSD-3c
+LIBMBUS_LICENSE = BSD-3-Clause
 LIBMBUS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmcrypt/Config.in b/bsp/buildroot/package/libmcrypt/Config.in
index e5dc5e23..784d2c2a 100644
--- a/bsp/buildroot/package/libmcrypt/Config.in
+++ b/bsp/buildroot/package/libmcrypt/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBMCRYPT
 	bool "libmcrypt"
 	help
-	  libmcrypt is a library that provides uniform interface to access
-	  several encryption algorithms.
+	  libmcrypt is a library that provides uniform interface to
+	  access several encryption algorithms.
 
 	  http://mcrypt.sourceforge.net/
diff --git a/bsp/buildroot/package/libmcrypt/libmcrypt.mk b/bsp/buildroot/package/libmcrypt/libmcrypt.mk
index 1a2645bc..e93f0136 100644
--- a/bsp/buildroot/package/libmcrypt/libmcrypt.mk
+++ b/bsp/buildroot/package/libmcrypt/libmcrypt.mk
@@ -8,7 +8,7 @@ LIBMCRYPT_VERSION = 2.5.8
 LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION)
 LIBMCRYPT_AUTORECONF = YES
 LIBMCRYPT_INSTALL_STAGING = YES
-LIBMCRYPT_LICENSE = LGPLv2.1
+LIBMCRYPT_LICENSE = LGPL-2.1
 LIBMCRYPT_LICENSE_FILES = COPYING.LIB
 LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config
 
diff --git a/bsp/buildroot/package/libmediaart/Config.in b/bsp/buildroot/package/libmediaart/Config.in
new file mode 100644
index 00000000..e5e770d4
--- /dev/null
+++ b/bsp/buildroot/package/libmediaart/Config.in
@@ -0,0 +1,44 @@
+comment "libmediaart needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_LIBMEDIAART
+	bool "libmediaart"
+	depends on BR2_USE_MMU # glib2
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	select BR2_PACKAGE_LIBGLIB2
+	help
+	  Library tasked with managing, extracting and handling media
+	  art caches
+
+	  https://github.com/GNOME/libmediaart
+
+if BR2_PACKAGE_LIBMEDIAART
+
+choice
+	prompt "media art backend"
+	default BR2_PACKAGE_LIBMEDIAART_BACKEND_NONE
+
+config BR2_PACKAGE_MEDIAART_BACKEND_NONE
+	bool "none"
+	help
+	  With no backend, libmediaart will not be able to process MP3
+	  album art.
+
+config BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF
+	bool "gdk-pixbuf"
+	select BR2_PACKAGE_GDK_PIXBUF
+
+config BR2_PACKAGE_MEDIAART_BACKEND_QT
+	bool "Qt"
+	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
+
+comment "Qt backend depends on Qt or Qt5"
+	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
+
+endchoice
+
+endif # BR2_PACKAGE_MEDIAART
diff --git a/bsp/buildroot/package/libmediaart/libmediaart.hash b/bsp/buildroot/package/libmediaart/libmediaart.hash
new file mode 100644
index 00000000..d51c0562
--- /dev/null
+++ b/bsp/buildroot/package/libmediaart/libmediaart.hash
@@ -0,0 +1,5 @@
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/libmediaart/1.9/libmediaart-1.9.4.sha256sum:
+sha256	a57be017257e4815389afe4f58fdacb6a50e74fd185452b23a652ee56b04813d	libmediaart-1.9.4.tar.xz
+
+# Locally computed:
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING.LESSER
diff --git a/bsp/buildroot/package/libmediaart/libmediaart.mk b/bsp/buildroot/package/libmediaart/libmediaart.mk
new file mode 100644
index 00000000..db4f1fa2
--- /dev/null
+++ b/bsp/buildroot/package/libmediaart/libmediaart.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# libmediaart
+#
+################################################################################
+
+LIBMEDIAART_VERSION_MAJOR = 1.9
+LIBMEDIAART_VERSION = $(LIBMEDIAART_VERSION_MAJOR).4
+LIBMEDIAART_SOURCE = libmediaart-$(LIBMEDIAART_VERSION).tar.xz
+LIBMEDIAART_SITE = \
+	http://ftp.gnome.org/pub/gnome/sources/libmediaart/$(LIBMEDIAART_VERSION_MAJOR)
+LIBMEDIAART_LICENSE = LGPL-2.1+
+LIBMEDIAART_LICENSE_FILES = COPYING.LESSER
+LIBMEDIAART_INSTALL_STAGING = YES
+LIBMEDIAART_DEPENDENCIES = libglib2
+LIBMEDIAART_CONF_OPTS = --disable-unit-tests
+
+ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_GDK_PIXBUF),y)
+LIBMEDIAART_DEPENDENCIES += gdk-pixbuf
+LIBMEDIAART_CONF_OPTS += \
+	--enable-gdkpixbuf \
+	--disable-qt
+else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_QT),y)
+# qt5 needs c++11 (since qt-5.7)
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+endif
+LIBMEDIAART_DEPENDENCIES += \
+	$(if $(BR2_PACKAGE_QT),qt) \
+	$(if $(BR2_PACKAGE_QT5),qt5base)
+LIBMEDIAART_CONF_OPTS += \
+	--disable-gdkpixbuf \
+	--enable-qt
+else ifeq ($(BR2_PACKAGE_MEDIAART_BACKEND_NONE),y)
+LIBMEDIAART_CONF_OPTS += \
+	--disable-gdkpixbuf \
+	--disable-qt
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmemcached/libmemcached.mk b/bsp/buildroot/package/libmemcached/libmemcached.mk
index 36d09139..24955266 100644
--- a/bsp/buildroot/package/libmemcached/libmemcached.mk
+++ b/bsp/buildroot/package/libmemcached/libmemcached.mk
@@ -15,7 +15,7 @@ LIBMEMCACHED_INSTALL_STAGING = YES
 LIBMEMCACHED_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBEVENT),libevent)
 # For 0001-disable-tests.patch and 0002-disable-sanitizer.patch
 LIBMEMCACHED_AUTORECONF = YES
-LIBMEMCACHED_LICENSE = BSD-3c
+LIBMEMCACHED_LICENSE = BSD-3-Clause
 LIBMEMCACHED_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
diff --git a/bsp/buildroot/package/libmhash/Config.in b/bsp/buildroot/package/libmhash/Config.in
index a9bd51a2..774ff1b1 100644
--- a/bsp/buildroot/package/libmhash/Config.in
+++ b/bsp/buildroot/package/libmhash/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBMHASH
 	help
 	  Mhash is a free (under GNU Lesser GPL) library which provides
 	  a uniform interface to a large number of hash algorithms.
-	  These algorithms can be used to compute checksums, message digests,
-	  and other signatures.
+	  These algorithms can be used to compute checksums, message
+	  digests, and other signatures.
 
 	  http://mhash.sourceforge.net/
diff --git a/bsp/buildroot/package/libmhash/libmhash.mk b/bsp/buildroot/package/libmhash/libmhash.mk
index f7b8e729..f2da10e6 100644
--- a/bsp/buildroot/package/libmhash/libmhash.mk
+++ b/bsp/buildroot/package/libmhash/libmhash.mk
@@ -8,7 +8,7 @@ LIBMHASH_VERSION = 0.9.9.9
 LIBMHASH_SITE = http://downloads.sourceforge.net/project/mhash/mhash/$(LIBMHASH_VERSION)
 LIBMHASH_SOURCE = mhash-$(LIBMHASH_VERSION).tar.bz2
 LIBMHASH_INSTALL_STAGING = YES
-LIBMHASH_LICENSE = LGPLv2
+LIBMHASH_LICENSE = LGPL-2.0
 LIBMHASH_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmicrohttpd/Config.in b/bsp/buildroot/package/libmicrohttpd/Config.in
index 302dbb7a..7f3c9bb8 100644
--- a/bsp/buildroot/package/libmicrohttpd/Config.in
+++ b/bsp/buildroot/package/libmicrohttpd/Config.in
@@ -11,15 +11,14 @@ if BR2_PACKAGE_LIBMICROHTTPD
 
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
 	bool "https support"
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+	depends on !BR2_STATIC_LIBS # gnutls
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_GNUTLS
-	select BR2_PACKAGE_LIBGCRYPT
 	help
 	  Enable HTTPS (SSL) support.
 
-comment "libmicrohttpd https support needs a toolchain w/ wchar"
-	depends on !BR2_USE_WCHAR
+comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
 
 endif
 
diff --git a/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.hash b/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.hash
index a1460fd7..e628cb2c 100644
--- a/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.hash
+++ b/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8  libmicrohttpd-0.9.55.tar.gz
+sha256 dec1a76487d7e48ad74b468a888bfda1c05731f185ff950f1e363ca9d39caf4e  libmicrohttpd-0.9.57.tar.gz
+sha256 70e12e2a60151b9ed1a4c94a5ffeb99cd086fa94542b5a92fec581506e8d3121  COPYING
diff --git a/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.mk b/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.mk
index 8828eb54..62fb7fc2 100644
--- a/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.mk
+++ b/bsp/buildroot/package/libmicrohttpd/libmicrohttpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBMICROHTTPD_VERSION = 0.9.55
+LIBMICROHTTPD_VERSION = 0.9.57
 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd
 LIBMICROHTTPD_LICENSE_FILES = COPYING
 LIBMICROHTTPD_INSTALL_STAGING = YES
@@ -12,7 +12,7 @@ LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples
 LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99
 
 # gcc on arc and bfin doesn't define _REENTRANT when -pthread is
-# passed while it should. Compensate this defiency here otherwise
+# passed while it should. Compensate this deficiency here otherwise
 # libmicrohttpd configure script doesn't find that thread support is
 # enabled.
 ifeq ($(BR2_arc)$(BR2_bfin),y)
@@ -22,13 +22,11 @@ endif
 LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)"
 
 ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)
-LIBMICROHTTPD_LICENSE = LGPLv2.1+
-LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls libgcrypt
-LIBMICROHTTPD_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs gnutls`"
-LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \
-	--with-libgcrypt-prefix=$(STAGING_DIR)/usr
+LIBMICROHTTPD_LICENSE = LGPL-2.1+
+LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls
+LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr
 else
-LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos
+LIBMICROHTTPD_LICENSE = LGPL-2.1+ or eCos
 LIBMICROHTTPD_CONF_OPTS += --disable-https
 endif
 
diff --git a/bsp/buildroot/package/libminiupnpc/Config.in b/bsp/buildroot/package/libminiupnpc/Config.in
index c2417073..a3410a02 100644
--- a/bsp/buildroot/package/libminiupnpc/Config.in
+++ b/bsp/buildroot/package/libminiupnpc/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_LIBMINIUPNPC
 	depends on !BR2_STATIC_LIBS
 	help
 	  The UPnP protocol is supported by most home adsl/cable routers
-	  and Microsoft Windows 2K/XP. The aim of the MiniUPnP project is
-	  to bring a free software solution to support the "Internet
+	  and Microsoft Windows 2K/XP. The aim of the MiniUPnP project
+	  is to bring a free software solution to support the "Internet
 	  Gateway Device" part of the protocol.
 
 	  Miniupnpc aims at the simplest library possible, with the
diff --git a/bsp/buildroot/package/libminiupnpc/libminiupnpc.hash b/bsp/buildroot/package/libminiupnpc/libminiupnpc.hash
index 985d69d4..c83b38aa 100644
--- a/bsp/buildroot/package/libminiupnpc/libminiupnpc.hash
+++ b/bsp/buildroot/package/libminiupnpc/libminiupnpc.hash
@@ -1,2 +1,3 @@
 # Locally computed
 sha256 d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b  miniupnpc-2.0.tar.gz
+sha256 4025f2214fa46ad40c156605b83d66e8faf45823e67eb3337af3869716e6d7dd  LICENSE
diff --git a/bsp/buildroot/package/libminiupnpc/libminiupnpc.mk b/bsp/buildroot/package/libminiupnpc/libminiupnpc.mk
index 0eb7cf63..66b08b4e 100644
--- a/bsp/buildroot/package/libminiupnpc/libminiupnpc.mk
+++ b/bsp/buildroot/package/libminiupnpc/libminiupnpc.mk
@@ -8,7 +8,7 @@ LIBMINIUPNPC_VERSION = 2.0
 LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz
 LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files
 LIBMINIUPNPC_INSTALL_STAGING = YES
-LIBMINIUPNPC_LICENSE = BSD-3c
+LIBMINIUPNPC_LICENSE = BSD-3-Clause
 LIBMINIUPNPC_LICENSE_FILES = LICENSE
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libmms/libmms.mk b/bsp/buildroot/package/libmms/libmms.mk
index 01c8d672..dd0b1df5 100644
--- a/bsp/buildroot/package/libmms/libmms.mk
+++ b/bsp/buildroot/package/libmms/libmms.mk
@@ -8,7 +8,7 @@ LIBMMS_VERSION = 0.6.2
 LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION)
 LIBMMS_INSTALL_STAGING = YES
 LIBMMS_DEPENDENCIES = host-pkgconf libglib2
-LIBMMS_LICENSE = LGPLv2.1+
+LIBMMS_LICENSE = LGPL-2.1+
 LIBMMS_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmnl/libmnl.mk b/bsp/buildroot/package/libmnl/libmnl.mk
index 407c4f19..7fcce4c2 100644
--- a/bsp/buildroot/package/libmnl/libmnl.mk
+++ b/bsp/buildroot/package/libmnl/libmnl.mk
@@ -8,7 +8,7 @@ LIBMNL_VERSION = 1.0.4
 LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2
 LIBMNL_SITE = http://netfilter.org/projects/libmnl/files
 LIBMNL_INSTALL_STAGING = YES
-LIBMNL_LICENSE = LGPLv2.1+
+LIBMNL_LICENSE = LGPL-2.1+
 LIBMNL_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmodbus/Config.in b/bsp/buildroot/package/libmodbus/Config.in
index ccf11906..642b57cd 100644
--- a/bsp/buildroot/package/libmodbus/Config.in
+++ b/bsp/buildroot/package/libmodbus/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBMODBUS
 	bool "libmodbus"
 	help
-	  libmodbus is a free software library to send/receive data according
-	  to the Modbus protocol. This library is written in C and supports
-	  RTU (serial) and TCP (Ethernet) communications.
+	  libmodbus is a free software library to send/receive data
+	  according to the Modbus protocol. This library is written in C
+	  and supports RTU (serial) and TCP (Ethernet) communications.
 
 	  http://libmodbus.org
diff --git a/bsp/buildroot/package/libmodbus/libmodbus.hash b/bsp/buildroot/package/libmodbus/libmodbus.hash
index 095164d6..b5c4450d 100644
--- a/bsp/buildroot/package/libmodbus/libmodbus.hash
+++ b/bsp/buildroot/package/libmodbus/libmodbus.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	046d63f10f755e2160dc56ef681e5f5ad3862a57c1955fd82e0ce036b69471b6	libmodbus-3.0.6.tar.gz
+sha256  c8c862b0e9a7ba699a49bc98f62bdffdfafd53a5716c0e162696b4bf108d3637  libmodbus-3.1.4.tar.gz
diff --git a/bsp/buildroot/package/libmodbus/libmodbus.mk b/bsp/buildroot/package/libmodbus/libmodbus.mk
index 1f8c7303..e5a6c638 100644
--- a/bsp/buildroot/package/libmodbus/libmodbus.mk
+++ b/bsp/buildroot/package/libmodbus/libmodbus.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-LIBMODBUS_VERSION = 3.0.6
+LIBMODBUS_VERSION = 3.1.4
 LIBMODBUS_SITE = http://libmodbus.org/releases
-LIBMODBUS_LICENSE = LGPLv2.1+
+LIBMODBUS_LICENSE = LGPL-2.1+
 LIBMODBUS_LICENSE_FILES = COPYING.LESSER
 LIBMODBUS_INSTALL_STAGING = YES
+LIBMODBUS_CONF_OPTS = --without-documentation --disable-tests
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmpd/libmpd.mk b/bsp/buildroot/package/libmpd/libmpd.mk
index 882210cc..2aa7ff7e 100644
--- a/bsp/buildroot/package/libmpd/libmpd.mk
+++ b/bsp/buildroot/package/libmpd/libmpd.mk
@@ -9,7 +9,7 @@ LIBMPD_VERSION = $(LIBMPD_VERSION_MAJOR).17
 LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/$(LIBMPD_VERSION_MAJOR)
 LIBMPD_INSTALL_STAGING = YES
 LIBMPD_DEPENDENCIES = libglib2
-LIBMPD_LICENSE = GPLv2+
+LIBMPD_LICENSE = GPL-2.0+
 LIBMPD_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmpdclient/Config.in b/bsp/buildroot/package/libmpdclient/Config.in
index a58c6c34..ba0df56e 100644
--- a/bsp/buildroot/package/libmpdclient/Config.in
+++ b/bsp/buildroot/package/libmpdclient/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBMPDCLIENT
 	bool "libmpdclient"
 	help
-	  A stable, documented, asynchronous API library for interfacing MPD
-	  in the C, C++ & Objective C languages.
+	  A stable, documented, asynchronous API library for interfacing
+	  MPD in the C, C++ & Objective C languages.
 
 	  http://www.musicpd.org/libs/libmpdclient/
diff --git a/bsp/buildroot/package/libmpdclient/libmpdclient.mk b/bsp/buildroot/package/libmpdclient/libmpdclient.mk
index db3ae059..691aba9f 100644
--- a/bsp/buildroot/package/libmpdclient/libmpdclient.mk
+++ b/bsp/buildroot/package/libmpdclient/libmpdclient.mk
@@ -10,7 +10,7 @@ LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz
 LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR)
 LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 LIBMPDCLIENT_INSTALL_STAGING = YES
-LIBMPDCLIENT_LICENSE = BSD-3c
+LIBMPDCLIENT_LICENSE = BSD-3-Clause
 LIBMPDCLIENT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libmpeg2/0004-fix-sparc.patch b/bsp/buildroot/package/libmpeg2/0004-fix-sparc.patch
new file mode 100644
index 00000000..d876b668
--- /dev/null
+++ b/bsp/buildroot/package/libmpeg2/0004-fix-sparc.patch
@@ -0,0 +1,16 @@
+Do not use sparcv9 optimization flags for sparcv8 builds
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+
+diff -Nur libmpeg2-0.5.1.orig/configure.ac libmpeg2-0.5.1/configure.ac
+--- libmpeg2-0.5.1.orig/configure.ac	2008-07-18 16:30:17.000000000 +0200
++++ libmpeg2-0.5.1/configure.ac	2017-04-26 21:09:15.780838339 +0200
+@@ -95,7 +95,7 @@
+ 		break
+ 	    fi
+ 	done;;
+-    sparc-* | sparc64-*)
++    sparc64-*)
+ 	AC_DEFINE([ARCH_SPARC],,[sparc architecture])
+ 	TRY_CFLAGS="$OPT_CFLAGS -mcpu=ultrasparc -mvis"
+ 	AC_TRY_CFLAGS([$TRY_CFLAGS $CFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"]);;
diff --git a/bsp/buildroot/package/libmpeg2/libmpeg2.mk b/bsp/buildroot/package/libmpeg2/libmpeg2.mk
index 124c7499..db9b2f8b 100644
--- a/bsp/buildroot/package/libmpeg2/libmpeg2.mk
+++ b/bsp/buildroot/package/libmpeg2/libmpeg2.mk
@@ -6,7 +6,7 @@
 
 LIBMPEG2_VERSION = 0.5.1
 LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files
-LIBMPEG2_LICENSE = GPLv2+
+LIBMPEG2_LICENSE = GPL-2.0+
 LIBMPEG2_LICENSE_FILES = COPYING
 LIBMPEG2_INSTALL_STAGING = YES
 LIBMPEG2_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libnatpmp/libnatpmp.mk b/bsp/buildroot/package/libnatpmp/libnatpmp.mk
index cdd65e96..36230277 100644
--- a/bsp/buildroot/package/libnatpmp/libnatpmp.mk
+++ b/bsp/buildroot/package/libnatpmp/libnatpmp.mk
@@ -7,7 +7,7 @@
 LIBNATPMP_VERSION = 20150609
 LIBNATPMP_SITE = http://miniupnp.free.fr/files
 LIBNATPMP_INSTALL_STAGING = YES
-LIBNATPMP_LICENSE = BSD-3c
+LIBNATPMP_LICENSE = BSD-3-Clause
 LIBNATPMP_LICENSE_FILES = LICENSE
 
 define LIBNATPMP_BUILD_CMDS
diff --git a/bsp/buildroot/package/libndp/libndp.mk b/bsp/buildroot/package/libndp/libndp.mk
index c880b7e6..4fa1d333 100644
--- a/bsp/buildroot/package/libndp/libndp.mk
+++ b/bsp/buildroot/package/libndp/libndp.mk
@@ -6,7 +6,7 @@
 
 LIBNDP_VERSION = v1.5
 LIBNDP_SITE = $(call github,jpirko,libndp,$(LIBNDP_VERSION))
-LIBNDP_LICENSE = LGPLv2.1+
+LIBNDP_LICENSE = LGPL-2.1+
 LIBNDP_LICENSE_FILES = COPYING
 LIBNDP_AUTORECONF = YES
 LIBNDP_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libnet/libnet.mk b/bsp/buildroot/package/libnet/libnet.mk
index d13c4533..96610683 100644
--- a/bsp/buildroot/package/libnet/libnet.mk
+++ b/bsp/buildroot/package/libnet/libnet.mk
@@ -9,7 +9,7 @@ LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files
 LIBNET_INSTALL_STAGING = YES
 # PF_PACKET is always available on Linux
 LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes
-LIBNET_LICENSE = BSD-2c, BSD-3c
+LIBNET_LICENSE = BSD-2-Clause, BSD-3-Clause
 LIBNET_LICENSE_FILES = doc/COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnetfilter_acct/libnetfilter_acct.mk b/bsp/buildroot/package/libnetfilter_acct/libnetfilter_acct.mk
index c2fa2347..e791f6f1 100644
--- a/bsp/buildroot/package/libnetfilter_acct/libnetfilter_acct.mk
+++ b/bsp/buildroot/package/libnetfilter_acct/libnetfilter_acct.mk
@@ -9,7 +9,7 @@ LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz
 LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files
 LIBNETFILTER_ACCT_INSTALL_STAGING = YES
 LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl
-LIBNETFILTER_ACCT_LICENSE = LGPLv2.1+
+LIBNETFILTER_ACCT_LICENSE = LGPL-2.1+
 LIBNETFILTER_ACCT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk b/bsp/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
index ec05f6dc..2e9f6b7a 100644
--- a/bsp/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
+++ b/bsp/buildroot/package/libnetfilter_conntrack/libnetfilter_conntrack.mk
@@ -9,7 +9,7 @@ LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_
 LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files
 LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES
 LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
-LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+
+LIBNETFILTER_CONNTRACK_LICENSE = GPL-2.0+
 LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnetfilter_cthelper/Config.in b/bsp/buildroot/package/libnetfilter_cthelper/Config.in
index 571883df..8d9b1dd4 100644
--- a/bsp/buildroot/package/libnetfilter_cthelper/Config.in
+++ b/bsp/buildroot/package/libnetfilter_cthelper/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBNETFILTER_CTHELPER
 	select BR2_PACKAGE_LIBMNL
 	help
 	  libnetfilter_cthelper is the userspace library that provides
-	  the programming interface to the user-space helper infrastructure
-	  available since Linux kernel 3.6.
+	  the programming interface to the user-space helper
+	  infrastructure available since Linux kernel 3.6.
 
 	  http://www.netfilter.org/projects/libnetfilter_cthelper/
diff --git a/bsp/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk b/bsp/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
index 00388a5c..61d6acd0 100644
--- a/bsp/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
+++ b/bsp/buildroot/package/libnetfilter_cthelper/libnetfilter_cthelper.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthe
 LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES
 LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl
 LIBNETFILTER_CTHELPER_AUTORECONF = YES
-LIBNETFILTER_CTHELPER_LICENSE = GPLv2+
+LIBNETFILTER_CTHELPER_LICENSE = GPL-2.0+
 LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/bsp/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
index d85a8d2b..9c4c9516 100644
--- a/bsp/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
+++ b/bsp/buildroot/package/libnetfilter_cttimeout/libnetfilter_cttimeout.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_ctt
 LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES
 LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl
 LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES
-LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2+
+LIBNETFILTER_CTTIMEOUT_LICENSE = GPL-2.0+
 LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnetfilter_log/libnetfilter_log.mk b/bsp/buildroot/package/libnetfilter_log/libnetfilter_log.mk
index a448c547..bcf755e0 100644
--- a/bsp/buildroot/package/libnetfilter_log/libnetfilter_log.mk
+++ b/bsp/buildroot/package/libnetfilter_log/libnetfilter_log.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
 LIBNETFILTER_LOG_INSTALL_STAGING = YES
 LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink
 LIBNETFILTER_LOG_AUTORECONF = YES
-LIBNETFILTER_LOG_LICENSE = GPLv2+
+LIBNETFILTER_LOG_LICENSE = GPL-2.0+
 LIBNETFILTER_LOG_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk b/bsp/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk
index d788fd15..75910c59 100644
--- a/bsp/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk
+++ b/bsp/buildroot/package/libnetfilter_queue/libnetfilter_queue.mk
@@ -10,7 +10,7 @@ LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/f
 LIBNETFILTER_QUEUE_INSTALL_STAGING = YES
 LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl
 LIBNETFILTER_QUEUE_AUTORECONF = YES
-LIBNETFILTER_QUEUE_LICENSE = GPLv2+
+LIBNETFILTER_QUEUE_LICENSE = GPL-2.0+
 LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnfc/Config.in b/bsp/buildroot/package/libnfc/Config.in
index 1707f21c..c8fe2514 100644
--- a/bsp/buildroot/package/libnfc/Config.in
+++ b/bsp/buildroot/package/libnfc/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_LIBNFC
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
-	  Public platform independent Near Field Communication (NFC) library.
+	  Public platform independent Near Field Communication (NFC)
+	  library.
 
 	  http://www.libnfc.org/
 
diff --git a/bsp/buildroot/package/libnfc/libnfc.mk b/bsp/buildroot/package/libnfc/libnfc.mk
index aceedb09..b13fd69d 100644
--- a/bsp/buildroot/package/libnfc/libnfc.mk
+++ b/bsp/buildroot/package/libnfc/libnfc.mk
@@ -7,7 +7,7 @@
 LIBNFC_VERSION = 1.7.1
 LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.bz2
 LIBNFC_SITE = https://github.com/nfc-tools/libnfc/releases/download/libnfc-$(LIBNFC_VERSION)
-LIBNFC_LICENSE = LGPLv3+
+LIBNFC_LICENSE = LGPL-3.0+
 LIBNFC_LICENSE_FILES = COPYING
 LIBNFC_AUTORECONF = YES
 LIBNFC_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libnfnetlink/libnfnetlink.mk b/bsp/buildroot/package/libnfnetlink/libnfnetlink.mk
index 6f69a81a..13f5d72c 100644
--- a/bsp/buildroot/package/libnfnetlink/libnfnetlink.mk
+++ b/bsp/buildroot/package/libnfnetlink/libnfnetlink.mk
@@ -9,7 +9,7 @@ LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2
 LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files
 LIBNFNETLINK_AUTORECONF = YES
 LIBNFNETLINK_INSTALL_STAGING = YES
-LIBNFNETLINK_LICENSE = GPLv2
+LIBNFNETLINK_LICENSE = GPL-2.0
 LIBNFNETLINK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnfs/libnfs.hash b/bsp/buildroot/package/libnfs/libnfs.hash
index 27a9e5d3..2bd8caf2 100644
--- a/bsp/buildroot/package/libnfs/libnfs.hash
+++ b/bsp/buildroot/package/libnfs/libnfs.hash
@@ -1,2 +1,6 @@
 # Locally calculated
-sha256	7f6c62a05c7e0f0749f2b13f178a4ed7aaf17bd09e65a10bb147bfe9807da272	libnfs-libnfs-1.10.0.tar.gz
+sha256 7ea6cd8fa6c461d01091e584d424d28e137d23ff4b65b95d01a3fd0ef95d120e  libnfs-libnfs-2.0.0.tar.gz
+sha256 2d152e3a2f31ef0fe14d4908377277f8215fb5c82ec9329d1eed081c845fc85f  COPYING
+sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1  LICENCE-BSD.txt
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  LICENCE-LGPL-2.1.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  LICENCE-GPL-3.txt
diff --git a/bsp/buildroot/package/libnfs/libnfs.mk b/bsp/buildroot/package/libnfs/libnfs.mk
index e49656b7..0cf07d21 100644
--- a/bsp/buildroot/package/libnfs/libnfs.mk
+++ b/bsp/buildroot/package/libnfs/libnfs.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-LIBNFS_VERSION = libnfs-1.10.0
+LIBNFS_VERSION = libnfs-2.0.0
 LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION))
 LIBNFS_INSTALL_STAGING = YES
 LIBNFS_AUTORECONF = YES
-LIBNFS_MAKE = $(MAKE1)
-LIBNFS_LICENSE = LGPLv2.1+
-LIBNFS_LICENSE_FILES = LICENCE-LGPL-2.1.txt
+LIBNFS_LICENSE = LGPL-2.1+ (library), BSD-2-Clause (protocol, .x files), GPL-3.0+ (examples)
+LIBNFS_LICENSE_FILES = COPYING LICENCE-BSD.txt LICENCE-LGPL-2.1.txt LICENCE-GPL-3.txt
 LIBNFS_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
diff --git a/bsp/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch b/bsp/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch
index 6f5be4e7..1062f2b0 100644
--- a/bsp/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch
+++ b/bsp/buildroot/package/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch
@@ -1,4 +1,4 @@
-From 610d015143e88629eab07067a4ae0c1d7548cfaf Mon Sep 17 00:00:00 2001
+From a51cdce6fd271a5cc393c5e56996846d9c453d6a Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 Date: Thu, 2 Jun 2016 23:03:27 -0300
 Subject: [PATCH] Rename xfree() to libnftnl_xfree() to avoid symbol naming
@@ -22,6 +22,8 @@ libnftnl_xfree().
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 [Gustavo: update for version 1.0.7]
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[baruch: update for version 1.0.9]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 ---
  include/utils.h      |  2 +-
  src/chain.c          | 36 ++++++++++++++++++------------------
@@ -38,19 +40,19 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  src/object.c         | 14 +++++++-------
  src/rule.c           | 32 ++++++++++++++++----------------
  src/ruleset.c        |  2 +-
- src/set.c            | 26 +++++++++++++-------------
+ src/set.c            | 28 ++++++++++++++--------------
  src/set_elem.c       | 28 ++++++++++++++--------------
  src/table.c          | 14 +++++++-------
  src/trace.c          | 14 +++++++-------
  src/udata.c          |  2 +-
  src/utils.c          |  2 +-
- 21 files changed, 103 insertions(+), 103 deletions(-)
+ 21 files changed, 104 insertions(+), 104 deletions(-)
 
 diff --git a/include/utils.h b/include/utils.h
-index 924df32..f02fce7 100644
+index 3cc659652fe2..820556715013 100644
 --- a/include/utils.h
 +++ b/include/utils.h
-@@ -19,7 +19,7 @@
+@@ -17,7 +17,7 @@
  
  #define __noreturn	__attribute__((__noreturn__))
  
@@ -60,10 +62,10 @@ index 924df32..f02fce7 100644
  #define div_round_up(n, d)	(((n) + (d) - 1) / (d))
  
 diff --git a/src/chain.c b/src/chain.c
-index 49cd094..444cb79 100644
+index eff518680873..03033bbcb93b 100644
 --- a/src/chain.c
 +++ b/src/chain.c
-@@ -96,14 +96,14 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_alloc, nft_chain_alloc);
+@@ -97,14 +97,14 @@ EXPORT_SYMBOL(nftnl_chain_free);
  void nftnl_chain_free(const struct nftnl_chain *c)
  {
  	if (c->flags & (1 << NFTNL_CHAIN_NAME))
@@ -81,9 +83,9 @@ index 49cd094..444cb79 100644
 +		nftnl_xfree(c->dev);
 +	nftnl_xfree(c);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_chain_free, nft_chain_free);
  
-@@ -120,15 +120,15 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr)
+ EXPORT_SYMBOL(nftnl_chain_is_set);
+@@ -121,15 +121,15 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr)
  
  	switch (attr) {
  	case NFTNL_CHAIN_NAME:
@@ -102,7 +104,7 @@ index 49cd094..444cb79 100644
  		break;
  	case NFTNL_CHAIN_HOOKNUM:
  	case NFTNL_CHAIN_PRIO:
-@@ -139,7 +139,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr)
+@@ -140,7 +140,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr)
  	case NFTNL_CHAIN_FAMILY:
  		break;
  	case NFTNL_CHAIN_DEV:
@@ -111,7 +113,7 @@ index 49cd094..444cb79 100644
  		break;
  	default:
  		return;
-@@ -168,7 +168,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
+@@ -169,7 +169,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
  	switch(attr) {
  	case NFTNL_CHAIN_NAME:
  		if (c->flags & (1 << NFTNL_CHAIN_NAME))
@@ -120,7 +122,7 @@ index 49cd094..444cb79 100644
  
  		c->name = strdup(data);
  		if (!c->name)
-@@ -176,7 +176,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
+@@ -177,7 +177,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
  		break;
  	case NFTNL_CHAIN_TABLE:
  		if (c->flags & (1 << NFTNL_CHAIN_TABLE))
@@ -129,7 +131,7 @@ index 49cd094..444cb79 100644
  
  		c->table = strdup(data);
  		if (!c->table)
-@@ -208,7 +208,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
+@@ -209,7 +209,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
  		break;
  	case NFTNL_CHAIN_TYPE:
  		if (c->flags & (1 << NFTNL_CHAIN_TYPE))
@@ -138,7 +140,7 @@ index 49cd094..444cb79 100644
  
  		c->type = strdup(data);
  		if (!c->type)
-@@ -216,7 +216,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
+@@ -217,7 +217,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr,
  		break;
  	case NFTNL_CHAIN_DEV:
  		if (c->flags & (1 << NFTNL_CHAIN_DEV))
@@ -147,7 +149,7 @@ index 49cd094..444cb79 100644
  
  		c->dev = strdup(data);
  		if (!c->dev)
-@@ -540,7 +540,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c)
+@@ -541,7 +541,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c)
  
  	if (tb[NFTA_CHAIN_NAME]) {
  		if (c->flags & (1 << NFTNL_CHAIN_NAME))
@@ -156,7 +158,7 @@ index 49cd094..444cb79 100644
  		c->name = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_NAME]));
  		if (!c->name)
  			return -1;
-@@ -548,7 +548,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c)
+@@ -549,7 +549,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c)
  	}
  	if (tb[NFTA_CHAIN_TABLE]) {
  		if (c->flags & (1 << NFTNL_CHAIN_TABLE))
@@ -165,7 +167,7 @@ index 49cd094..444cb79 100644
  		c->table = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TABLE]));
  		if (!c->table)
  			return -1;
-@@ -578,7 +578,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c)
+@@ -579,7 +579,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c)
  	}
  	if (tb[NFTA_CHAIN_TYPE]) {
  		if (c->flags & (1 << NFTNL_CHAIN_TYPE))
@@ -174,49 +176,48 @@ index 49cd094..444cb79 100644
  		c->type = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TYPE]));
  		if (!c->type)
  			return -1;
-@@ -889,7 +889,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list)
+@@ -902,7 +902,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list)
  		list_del(&r->head);
  		nftnl_chain_free(r);
  	}
 -	xfree(list);
 +	nftnl_xfree(list);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_chain_list_free, nft_chain_list_free);
- 
-@@ -975,6 +975,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_list_iter_next, nft_chain_list_iter_next);
  
+ EXPORT_SYMBOL(nftnl_chain_list_is_empty);
+@@ -988,5 +988,5 @@ struct nftnl_chain *nftnl_chain_list_iter_next(struct nftnl_chain_list_iter *ite
+ EXPORT_SYMBOL(nftnl_chain_list_iter_destroy);
  void nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_chain_list_iter_destroy, nft_chain_list_iter_destroy);
 diff --git a/src/common.c b/src/common.c
-index bf4176c..98f8012 100644
+index 561c95439114..d0124134ea29 100644
 --- a/src/common.c
 +++ b/src/common.c
-@@ -58,7 +58,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_parse_err_alloc, nft_parse_err_alloc);
- 
+@@ -68,7 +68,7 @@ struct nftnl_parse_err *nftnl_parse_err_alloc(void)
+ EXPORT_SYMBOL(nftnl_parse_err_free);
  void nftnl_parse_err_free(struct nftnl_parse_err *err)
  {
 -	xfree(err);
 +	nftnl_xfree(err);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_parse_err_free, nft_parse_err_free);
  
+ EXPORT_SYMBOL(nftnl_parse_perror);
 diff --git a/src/expr.c b/src/expr.c
-index 8d5c562..47ecd3d 100644
+index 62565e046996..97f16275f44f 100644
 --- a/src/expr.c
 +++ b/src/expr.c
-@@ -50,7 +50,7 @@ void nftnl_expr_free(const struct nftnl_expr *expr)
+@@ -51,7 +51,7 @@ void nftnl_expr_free(const struct nftnl_expr *expr)
  	if (expr->ops->free)
  		expr->ops->free(expr);
  
 -	xfree(expr);
 +	nftnl_xfree(expr);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_expr_free, nft_rule_expr_free);
  
+ EXPORT_SYMBOL(nftnl_expr_is_set);
 @@ -270,7 +270,7 @@ struct nftnl_expr *nftnl_expr_parse(struct nlattr *attr)
  	return expr;
  
@@ -227,10 +228,10 @@ index 8d5c562..47ecd3d 100644
  	return NULL;
  }
 diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c
-index 0249258..994b388 100644
+index 1b28b291617b..8c7abdb91d21 100644
 --- a/src/expr/data_reg.c
 +++ b/src/expr/data_reg.c
-@@ -376,7 +376,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data)
+@@ -379,7 +379,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data)
  	switch(data->verdict) {
  	case NFT_JUMP:
  	case NFT_GOTO:
@@ -240,7 +241,7 @@ index 0249258..994b388 100644
  	default:
  		break;
 diff --git a/src/expr/dynset.c b/src/expr/dynset.c
-index 20a5004..f3d46a7 100644
+index 160d0e15c151..614124d841c7 100644
 --- a/src/expr/dynset.c
 +++ b/src/expr/dynset.c
 @@ -330,7 +330,7 @@ static void nftnl_expr_dynset_free(const struct nftnl_expr *e)
@@ -253,7 +254,7 @@ index 20a5004..f3d46a7 100644
  
  static bool nftnl_expr_dynset_cmp(const struct nftnl_expr *e1,
 diff --git a/src/expr/immediate.c b/src/expr/immediate.c
-index 0b188cc..6c17f68 100644
+index b0570bd539a4..6a0732c38ebd 100644
 --- a/src/expr/immediate.c
 +++ b/src/expr/immediate.c
 @@ -44,7 +44,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type,
@@ -266,7 +267,7 @@ index 0b188cc..6c17f68 100644
  		imm->data.chain = strdup(data);
  		if (!imm->data.chain)
 diff --git a/src/expr/log.c b/src/expr/log.c
-index b642255..2b24b6d 100644
+index 86d965136cd4..0624a7712237 100644
 --- a/src/expr/log.c
 +++ b/src/expr/log.c
 @@ -39,7 +39,7 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type,
@@ -287,7 +288,7 @@ index b642255..2b24b6d 100644
  
  		log->prefix = strdup(mnl_attr_get_str(tb[NFTA_LOG_PREFIX]));
  		if (!log->prefix)
-@@ -316,7 +316,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e)
+@@ -317,7 +317,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_log *log = nftnl_expr_data(e);
  
@@ -297,10 +298,10 @@ index b642255..2b24b6d 100644
  
  static bool nftnl_expr_log_cmp(const struct nftnl_expr *e1,
 diff --git a/src/expr/lookup.c b/src/expr/lookup.c
-index 861815f..1955ed3 100644
+index 5fcb81f3a7a2..45f5dfefd33f 100644
 --- a/src/expr/lookup.c
 +++ b/src/expr/lookup.c
-@@ -259,7 +259,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e)
+@@ -258,7 +258,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e)
  {
  	struct nftnl_expr_lookup *lookup = nftnl_expr_data(e);
  
@@ -310,7 +311,7 @@ index 861815f..1955ed3 100644
  
  static bool nftnl_expr_lookup_cmp(const struct nftnl_expr *e1,
 diff --git a/src/expr/match.c b/src/expr/match.c
-index dd09e1e..09e35c5 100644
+index dd09e1e85192..09e35c528aca 100644
 --- a/src/expr/match.c
 +++ b/src/expr/match.c
 @@ -50,7 +50,7 @@ nftnl_expr_match_set(struct nftnl_expr *e, uint16_t type,
@@ -341,7 +342,7 @@ index dd09e1e..09e35c5 100644
  
  static bool nftnl_expr_match_cmp(const struct nftnl_expr *e1,
 diff --git a/src/expr/target.c b/src/expr/target.c
-index ed4bf7d..5e28925 100644
+index ed4bf7df6328..5e28925debeb 100644
 --- a/src/expr/target.c
 +++ b/src/expr/target.c
 @@ -50,7 +50,7 @@ nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type,
@@ -372,23 +373,23 @@ index ed4bf7d..5e28925 100644
  
  static bool nftnl_expr_target_cmp(const struct nftnl_expr *e1,
 diff --git a/src/gen.c b/src/gen.c
-index c69d2f8..0143ea0 100644
+index f92180c7baf6..4fe078d3832c 100644
 --- a/src/gen.c
 +++ b/src/gen.c
-@@ -37,7 +37,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_gen_alloc, nft_gen_alloc);
- 
+@@ -38,7 +38,7 @@ struct nftnl_gen *nftnl_gen_alloc(void)
+ EXPORT_SYMBOL(nftnl_gen_free);
  void nftnl_gen_free(const struct nftnl_gen *gen)
  {
 -	xfree(gen);
 +	nftnl_xfree(gen);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_gen_free, nft_gen_free);
  
+ EXPORT_SYMBOL(nftnl_gen_is_set);
 diff --git a/src/object.c b/src/object.c
-index 0d3dc2b..542211c 100644
+index 30000f748da4..1b5965d7abdc 100644
 --- a/src/object.c
 +++ b/src/object.c
-@@ -47,11 +47,11 @@ EXPORT_SYMBOL(nftnl_obj_alloc);
+@@ -50,11 +50,11 @@ EXPORT_SYMBOL(nftnl_obj_free);
  void nftnl_obj_free(const struct nftnl_obj *obj)
  {
  	if (obj->flags & (1 << NFTNL_OBJ_TABLE))
@@ -401,9 +402,9 @@ index 0d3dc2b..542211c 100644
 -	xfree(obj);
 +	nftnl_xfree(obj);
  }
- EXPORT_SYMBOL(nftnl_obj_free);
  
-@@ -74,11 +74,11 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr,
+ EXPORT_SYMBOL(nftnl_obj_is_set);
+@@ -77,11 +77,11 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr,
  
  	switch (attr) {
  	case NFTNL_OBJ_TABLE:
@@ -417,28 +418,27 @@ index 0d3dc2b..542211c 100644
  		obj->name = strdup(data);
  		break;
  	case NFTNL_OBJ_TYPE:
-@@ -486,7 +486,7 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list)
+@@ -523,7 +523,7 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list)
  		list_del(&r->head);
  		nftnl_obj_free(r);
  	}
 -	xfree(list);
 +	nftnl_xfree(list);
  }
- EXPORT_SYMBOL(nftnl_obj_list_free);
- 
-@@ -573,6 +573,6 @@ EXPORT_SYMBOL(nftnl_obj_list_iter_next);
  
+ EXPORT_SYMBOL(nftnl_obj_list_is_empty);
+@@ -610,5 +610,5 @@ struct nftnl_obj *nftnl_obj_list_iter_next(struct nftnl_obj_list_iter *iter)
+ EXPORT_SYMBOL(nftnl_obj_list_iter_destroy);
  void nftnl_obj_list_iter_destroy(struct nftnl_obj_list_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL(nftnl_obj_list_iter_destroy);
 diff --git a/src/rule.c b/src/rule.c
-index 22026a4..256b699 100644
+index e4cba1f7a352..911f327a6f9f 100644
 --- a/src/rule.c
 +++ b/src/rule.c
-@@ -72,13 +72,13 @@ void nftnl_rule_free(const struct nftnl_rule *r)
+@@ -75,13 +75,13 @@ void nftnl_rule_free(const struct nftnl_rule *r)
  		nftnl_expr_free(e);
  
  	if (r->flags & (1 << (NFTNL_RULE_TABLE)))
@@ -454,9 +454,9 @@ index 22026a4..256b699 100644
 -	xfree(r);
 +	nftnl_xfree(r);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_rule_free, nft_rule_free);
  
-@@ -95,10 +95,10 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr)
+ EXPORT_SYMBOL(nftnl_rule_is_set);
+@@ -98,10 +98,10 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr)
  
  	switch (attr) {
  	case NFTNL_RULE_TABLE:
@@ -469,8 +469,8 @@ index 22026a4..256b699 100644
  		break;
  	case NFTNL_RULE_HANDLE:
  	case NFTNL_RULE_COMPAT_PROTO:
-@@ -107,7 +107,7 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr)
- 	case NFTNL_RULE_FAMILY:
+@@ -111,7 +111,7 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr)
+ 	case NFTNL_RULE_ID:
  		break;
  	case NFTNL_RULE_USERDATA:
 -		xfree(r->user.data);
@@ -478,7 +478,7 @@ index 22026a4..256b699 100644
  		break;
  	}
  
-@@ -132,7 +132,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr,
+@@ -137,7 +137,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr,
  	switch(attr) {
  	case NFTNL_RULE_TABLE:
  		if (r->flags & (1 << NFTNL_RULE_TABLE))
@@ -487,7 +487,7 @@ index 22026a4..256b699 100644
  
  		r->table = strdup(data);
  		if (!r->table)
-@@ -140,7 +140,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr,
+@@ -145,7 +145,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr,
  		break;
  	case NFTNL_RULE_CHAIN:
  		if (r->flags & (1 << NFTNL_RULE_CHAIN))
@@ -496,7 +496,7 @@ index 22026a4..256b699 100644
  
  		r->chain = strdup(data);
  		if (!r->chain)
-@@ -163,7 +163,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr,
+@@ -168,7 +168,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr,
  		break;
  	case NFTNL_RULE_USERDATA:
  		if (r->flags & (1 << NFTNL_RULE_USERDATA))
@@ -505,7 +505,7 @@ index 22026a4..256b699 100644
  
  		r->user.data = malloc(data_len);
  		if (!r->user.data)
-@@ -436,7 +436,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r)
+@@ -453,7 +453,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r)
  
  	if (tb[NFTA_RULE_TABLE]) {
  		if (r->flags & (1 << NFTNL_RULE_TABLE))
@@ -514,7 +514,7 @@ index 22026a4..256b699 100644
  		r->table = strdup(mnl_attr_get_str(tb[NFTA_RULE_TABLE]));
  		if (!r->table)
  			return -1;
-@@ -444,7 +444,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r)
+@@ -461,7 +461,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r)
  	}
  	if (tb[NFTA_RULE_CHAIN]) {
  		if (r->flags & (1 << NFTNL_RULE_CHAIN))
@@ -523,7 +523,7 @@ index 22026a4..256b699 100644
  		r->chain = strdup(mnl_attr_get_str(tb[NFTA_RULE_CHAIN]));
  		if (!r->chain)
  			return -1;
-@@ -473,7 +473,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r)
+@@ -490,7 +490,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r)
  			mnl_attr_get_payload(tb[NFTA_RULE_USERDATA]);
  
  		if (r->flags & (1 << NFTNL_RULE_USERDATA))
@@ -532,50 +532,49 @@ index 22026a4..256b699 100644
  
  		r->user.len = mnl_attr_get_payload_len(tb[NFTA_RULE_USERDATA]);
  
-@@ -915,7 +915,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_next, nft_rule_expr_iter_next);
- 
+@@ -910,7 +910,7 @@ struct nftnl_expr *nftnl_expr_iter_next(struct nftnl_expr_iter *iter)
+ EXPORT_SYMBOL(nftnl_expr_iter_destroy);
  void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_destroy, nft_rule_expr_iter_destroy);
  
-@@ -976,7 +976,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list)
+ EXPORT_SYMBOL(nftnl_rule_cmp);
+@@ -971,7 +971,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list)
  		list_del(&r->head);
  		nftnl_rule_free(r);
  	}
 -	xfree(list);
 +	nftnl_xfree(list);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_rule_list_free, nft_rule_list_free);
- 
-@@ -1068,6 +1068,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_next, nft_rule_list_iter_next);
  
+ EXPORT_SYMBOL(nftnl_rule_list_is_empty);
+@@ -1063,5 +1063,5 @@ struct nftnl_rule *nftnl_rule_list_iter_next(struct nftnl_rule_list_iter *iter)
+ EXPORT_SYMBOL(nftnl_rule_list_iter_destroy);
  void nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_destroy, nft_rule_list_iter_destroy);
 diff --git a/src/ruleset.c b/src/ruleset.c
-index b6ca565..0867e2a 100644
+index eb49fde582c2..1639cae68c61 100644
 --- a/src/ruleset.c
 +++ b/src/ruleset.c
-@@ -71,7 +71,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r)
+@@ -72,7 +72,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r)
  		nftnl_set_list_free(r->set_list);
  	if (r->flags & (1 << NFTNL_RULESET_RULELIST))
  		nftnl_rule_list_free(r->rule_list);
 -	xfree(r);
 +	nftnl_xfree(r);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_ruleset_free, nft_ruleset_free);
  
+ EXPORT_SYMBOL(nftnl_ruleset_is_set);
 diff --git a/src/set.c b/src/set.c
-index 14d28b5..0e93503 100644
+index ac24eae6bb16..2b758c4ec89a 100644
 --- a/src/set.c
 +++ b/src/set.c
-@@ -45,15 +45,15 @@ void nftnl_set_free(const struct nftnl_set *s)
+@@ -46,17 +46,17 @@ void nftnl_set_free(const struct nftnl_set *s)
  	struct nftnl_set_elem *elem, *tmp;
  
  	if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -584,6 +583,9 @@ index 14d28b5..0e93503 100644
  	if (s->flags & (1 << NFTNL_SET_NAME))
 -		xfree(s->name);
 +		nftnl_xfree(s->name);
+ 	if (s->flags & (1 << NFTNL_SET_USERDATA))
+-		xfree(s->user.data);
++		nftnl_xfree(s->user.data);
  
  	list_for_each_entry_safe(elem, tmp, &s->element_list, head) {
  		list_del(&elem->head);
@@ -592,9 +594,9 @@ index 14d28b5..0e93503 100644
 -	xfree(s);
 +	nftnl_xfree(s);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_set_free, nft_set_free);
  
-@@ -70,10 +70,10 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr)
+ EXPORT_SYMBOL(nftnl_set_is_set);
+@@ -73,10 +73,10 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr)
  
  	switch (attr) {
  	case NFTNL_SET_TABLE:
@@ -607,7 +609,7 @@ index 14d28b5..0e93503 100644
  		break;
  	case NFTNL_SET_FLAGS:
  	case NFTNL_SET_KEY_TYPE:
-@@ -89,7 +89,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr)
+@@ -92,7 +92,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr)
  	case NFTNL_SET_GC_INTERVAL:
  		break;
  	case NFTNL_SET_USERDATA:
@@ -616,7 +618,7 @@ index 14d28b5..0e93503 100644
  		break;
  	default:
  		return;
-@@ -122,7 +122,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
+@@ -125,7 +125,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
  	switch(attr) {
  	case NFTNL_SET_TABLE:
  		if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -625,7 +627,7 @@ index 14d28b5..0e93503 100644
  
  		s->table = strdup(data);
  		if (!s->table)
-@@ -130,7 +130,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
+@@ -133,7 +133,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
  		break;
  	case NFTNL_SET_NAME:
  		if (s->flags & (1 << NFTNL_SET_NAME))
@@ -634,7 +636,7 @@ index 14d28b5..0e93503 100644
  
  		s->name = strdup(data);
  		if (!s->name)
-@@ -174,7 +174,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
+@@ -177,7 +177,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data,
  		break;
  	case NFTNL_SET_USERDATA:
  		if (s->flags & (1 << NFTNL_SET_USERDATA))
@@ -643,7 +645,7 @@ index 14d28b5..0e93503 100644
  
  		s->user.data = malloc(data_len);
  		if (!s->user.data)
-@@ -474,7 +474,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -478,7 +478,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  
  	if (tb[NFTA_SET_TABLE]) {
  		if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -652,7 +654,7 @@ index 14d28b5..0e93503 100644
  		s->table = strdup(mnl_attr_get_str(tb[NFTA_SET_TABLE]));
  		if (!s->table)
  			return -1;
-@@ -482,7 +482,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -486,7 +486,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  	}
  	if (tb[NFTA_SET_NAME]) {
  		if (s->flags & (1 << NFTNL_SET_NAME))
@@ -661,29 +663,29 @@ index 14d28b5..0e93503 100644
  		s->name = strdup(mnl_attr_get_str(tb[NFTA_SET_NAME]));
  		if (!s->name)
  			return -1;
-@@ -972,7 +972,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list)
+@@ -982,7 +982,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list)
  		list_del(&s->head);
  		nftnl_set_free(s);
  	}
 -	xfree(list);
 +	nftnl_xfree(list);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_set_list_free, nft_set_list_free);
- 
-@@ -1064,7 +1064,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_next, nft_set_list_iter_next);
  
+ EXPORT_SYMBOL(nftnl_set_list_is_empty);
+@@ -1074,7 +1074,7 @@ struct nftnl_set *nftnl_set_list_iter_next(struct nftnl_set_list_iter *iter)
+ EXPORT_SYMBOL(nftnl_set_list_iter_destroy);
  void nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_destroy, nft_set_list_iter_destroy);
  
+ static struct nftnl_set *nftnl_set_lookup(const char *this_set_name,
 diff --git a/src/set_elem.c b/src/set_elem.c
-index fa87476..6d404bd 100644
+index e02a38791c9a..100ccda699c6 100644
 --- a/src/set_elem.c
 +++ b/src/set_elem.c
-@@ -42,18 +42,18 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elem_alloc, nft_set_elem_alloc);
+@@ -43,18 +43,18 @@ EXPORT_SYMBOL(nftnl_set_elem_free);
  void nftnl_set_elem_free(struct nftnl_set_elem *s)
  {
  	if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN))
@@ -704,9 +706,9 @@ index fa87476..6d404bd 100644
 -	xfree(s);
 +	nftnl_xfree(s);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_set_elem_free, nft_set_elem_free);
  
-@@ -70,7 +70,7 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr)
+ EXPORT_SYMBOL(nftnl_set_elem_is_set);
+@@ -71,7 +71,7 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr)
  
  	switch (attr) {
  	case NFTNL_SET_ELEM_CHAIN:
@@ -715,7 +717,7 @@ index fa87476..6d404bd 100644
  		break;
  	case NFTNL_SET_ELEM_FLAGS:
  	case NFTNL_SET_ELEM_KEY:	/* NFTA_SET_ELEM_KEY */
-@@ -80,13 +80,13 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr)
+@@ -81,13 +81,13 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr)
  	case NFTNL_SET_ELEM_EXPIRATION:	/* NFTA_SET_ELEM_EXPIRATION */
  		break;
  	case NFTNL_SET_ELEM_USERDATA:	/* NFTA_SET_ELEM_USERDATA */
@@ -731,7 +733,7 @@ index fa87476..6d404bd 100644
  		break;
  	default:
  		return;
-@@ -112,7 +112,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
+@@ -113,7 +113,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
  		break;
  	case NFTNL_SET_ELEM_CHAIN:	/* NFTA_SET_ELEM_DATA */
  		if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN))
@@ -740,7 +742,7 @@ index fa87476..6d404bd 100644
  
  		s->data.chain = strdup(data);
  		if (!s->data.chain)
-@@ -127,7 +127,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
+@@ -128,7 +128,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
  		break;
  	case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */
  		if (s->flags & (1 << NFTNL_SET_ELEM_USERDATA))
@@ -749,7 +751,7 @@ index fa87476..6d404bd 100644
  
  		s->user.data = malloc(data_len);
  		if (!s->user.data)
-@@ -137,7 +137,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
+@@ -138,7 +138,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr,
  		break;
  	case NFTNL_SET_ELEM_OBJREF:
  		if (s->flags & (1 << NFTNL_SET_ELEM_OBJREF))
@@ -767,7 +769,7 @@ index fa87476..6d404bd 100644
  
  		e->user.len  = mnl_attr_get_payload_len(tb[NFTA_SET_ELEM_USERDATA]);
  		e->user.data = malloc(e->user.len);
-@@ -515,7 +515,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -516,7 +516,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  
  	if (tb[NFTA_SET_ELEM_LIST_TABLE]) {
  		if (s->flags & (1 << NFTNL_SET_TABLE))
@@ -776,7 +778,7 @@ index fa87476..6d404bd 100644
  		s->table =
  			strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_TABLE]));
  		if (!s->table)
-@@ -524,7 +524,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
+@@ -525,7 +525,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s)
  	}
  	if (tb[NFTA_SET_ELEM_LIST_SET]) {
  		if (s->flags & (1 << NFTNL_SET_NAME))
@@ -785,20 +787,20 @@ index fa87476..6d404bd 100644
  		s->name =
  			strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_SET]));
  		if (!s->name)
-@@ -810,7 +810,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_next, nft_set_elems_iter_next);
- 
+@@ -816,7 +816,7 @@ struct nftnl_set_elem *nftnl_set_elems_iter_next(struct nftnl_set_elems_iter *it
+ EXPORT_SYMBOL(nftnl_set_elems_iter_destroy);
  void nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_destroy, nft_set_elems_iter_destroy);
  
+ static bool nftnl_attr_nest_overflow(struct nlmsghdr *nlh,
 diff --git a/src/table.c b/src/table.c
-index 4286d51..1e15ea7 100644
+index 7f97ca4e5807..7ac57c33021b 100644
 --- a/src/table.c
 +++ b/src/table.c
-@@ -45,9 +45,9 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_alloc, nft_table_alloc);
+@@ -46,9 +46,9 @@ EXPORT_SYMBOL(nftnl_table_free);
  void nftnl_table_free(const struct nftnl_table *t)
  {
  	if (t->flags & (1 << NFTNL_TABLE_NAME))
@@ -808,9 +810,9 @@ index 4286d51..1e15ea7 100644
 -	xfree(t);
 +	nftnl_xfree(t);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_table_free, nft_table_free);
  
-@@ -64,7 +64,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr)
+ EXPORT_SYMBOL(nftnl_table_is_set);
+@@ -65,7 +65,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr)
  
  	switch (attr) {
  	case NFTNL_TABLE_NAME:
@@ -819,7 +821,7 @@ index 4286d51..1e15ea7 100644
  		break;
  	case NFTNL_TABLE_FLAGS:
  	case NFTNL_TABLE_FAMILY:
-@@ -90,7 +90,7 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr,
+@@ -91,7 +91,7 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr,
  	switch (attr) {
  	case NFTNL_TABLE_NAME:
  		if (t->flags & (1 << NFTNL_TABLE_NAME))
@@ -828,7 +830,7 @@ index 4286d51..1e15ea7 100644
  
  		t->name = strdup(data);
  		if (!t->name)
-@@ -229,7 +229,7 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t)
+@@ -230,7 +230,7 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t)
  
  	if (tb[NFTA_TABLE_NAME]) {
  		if (t->flags & (1 << NFTNL_TABLE_NAME))
@@ -837,25 +839,24 @@ index 4286d51..1e15ea7 100644
  		t->name = strdup(mnl_attr_get_str(tb[NFTA_TABLE_NAME]));
  		if (!t->name)
  			return -1;
-@@ -448,7 +448,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list)
+@@ -452,7 +452,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list)
  		list_del(&r->head);
  		nftnl_table_free(r);
  	}
 -	xfree(list);
 +	nftnl_xfree(list);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_table_list_free, nft_table_list_free);
- 
-@@ -534,6 +534,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_next, nft_table_list_iter_next);
  
+ EXPORT_SYMBOL(nftnl_table_list_is_empty);
+@@ -538,5 +538,5 @@ struct nftnl_table *nftnl_table_list_iter_next(struct nftnl_table_list_iter *ite
+ EXPORT_SYMBOL(nftnl_table_list_iter_destroy);
  void nftnl_table_list_iter_destroy(const struct nftnl_table_list_iter *iter)
  {
 -	xfree(iter);
 +	nftnl_xfree(iter);
  }
- EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_destroy, nft_table_list_iter_destroy);
 diff --git a/src/trace.c b/src/trace.c
-index bd05d3c..abfc533 100644
+index f4264377508e..8a18391d83d1 100644
 --- a/src/trace.c
 +++ b/src/trace.c
 @@ -61,13 +61,13 @@ struct nftnl_trace *nftnl_trace_alloc(void)
@@ -880,20 +881,20 @@ index bd05d3c..abfc533 100644
  
  EXPORT_SYMBOL(nftnl_trace_is_set);
 diff --git a/src/udata.c b/src/udata.c
-index 60c2f34..ec1f7dc 100644
+index 6bd965161c43..049819304ef5 100644
 --- a/src/udata.c
 +++ b/src/udata.c
-@@ -32,7 +32,7 @@ EXPORT_SYMBOL(nftnl_udata_buf_alloc);
- 
+@@ -33,7 +33,7 @@ struct nftnl_udata_buf *nftnl_udata_buf_alloc(uint32_t data_size)
+ EXPORT_SYMBOL(nftnl_udata_buf_free);
  void nftnl_udata_buf_free(const struct nftnl_udata_buf *buf)
  {
 -	xfree(buf);
 +	nftnl_xfree(buf);
  }
- EXPORT_SYMBOL(nftnl_udata_buf_free);
  
+ EXPORT_SYMBOL(nftnl_udata_buf_len);
 diff --git a/src/utils.c b/src/utils.c
-index 3e44960..08f668f 100644
+index 3e449609395e..08f668f56a95 100644
 --- a/src/utils.c
 +++ b/src/utils.c
 @@ -264,7 +264,7 @@ int nftnl_fprintf(FILE *fp, const void *obj, uint32_t cmd, uint32_t type,
@@ -906,5 +907,5 @@ index 3e44960..08f668f 100644
  	return ret;
  }
 -- 
-2.10.2
+2.15.1
 
diff --git a/bsp/buildroot/package/libnftnl/libnftnl.hash b/bsp/buildroot/package/libnftnl/libnftnl.hash
index 63271e0f..c798dd2b 100644
--- a/bsp/buildroot/package/libnftnl/libnftnl.hash
+++ b/bsp/buildroot/package/libnftnl/libnftnl.hash
@@ -1,2 +1,6 @@
-# From http://www.netfilter.org/projects/libnftnl/downloads.html#libnftnl-1.0.7
-sha1	381b2b3cbb3fad186cb3f57bbf32d70f0b3c3c8e	libnftnl-1.0.7.tar.bz2
+# From http://www.netfilter.org/projects/libnftnl/downloads.html
+sha1	90b70f52a26f88ab1106671e797faac21265fa6a	libnftnl-1.0.9.tar.bz2
+# Locally calculated after checking pgp signature
+# http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.0.9.tar.bz2.sig
+sha256	fec1d824aee301e59a11aeaae2a2d429cb99ead81e6bafab791a4dd6569b3635	libnftnl-1.0.9.tar.bz2
+sha256	98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24	COPYING
diff --git a/bsp/buildroot/package/libnftnl/libnftnl.mk b/bsp/buildroot/package/libnftnl/libnftnl.mk
index 0e1ddf8b..8c8b3f82 100644
--- a/bsp/buildroot/package/libnftnl/libnftnl.mk
+++ b/bsp/buildroot/package/libnftnl/libnftnl.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBNFTNL_VERSION = 1.0.7
+LIBNFTNL_VERSION = 1.0.9
 LIBNFTNL_SITE = http://netfilter.org/projects/libnftnl/files
 LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2
-LIBNFTNL_LICENSE = GPLv2+
+LIBNFTNL_LICENSE = GPL-2.0+
 LIBNFTNL_LICENSE_FILES = COPYING
 LIBNFTNL_INSTALL_STAGING = YES
 LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl
@@ -19,11 +19,4 @@ else
 LIBNFTNL_CONF_OPTS += --without-json-parsing
 endif
 
-ifeq ($(BR2_PACKAGE_LIBNFTNL_XML),y)
-LIBNFTNL_CONF_OPTS += --with-xml-parsing
-LIBNFTNL_DEPENDENCIES += mxml
-else
-LIBNFTNL_CONF_OPTS += --without-xml-parsing
-endif
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnice/Config.in b/bsp/buildroot/package/libnice/Config.in
index 1d7c3410..c803a317 100644
--- a/bsp/buildroot/package/libnice/Config.in
+++ b/bsp/buildroot/package/libnice/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LIBNICE
 	bool "libnice"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Libnice is an implementation of the IETF's Interactive
 	  Connectivity Establishment (ICE) standard (RFC 5245) and the
diff --git a/bsp/buildroot/package/libnice/libnice.mk b/bsp/buildroot/package/libnice/libnice.mk
index 3df596a8..6afcb763 100644
--- a/bsp/buildroot/package/libnice/libnice.mk
+++ b/bsp/buildroot/package/libnice/libnice.mk
@@ -6,7 +6,7 @@
 
 LIBNICE_VERSION = 0.1.13
 LIBNICE_SITE = http://nice.freedesktop.org/releases
-LIBNICE_LICENSE = MPLv1.1 or LGPLv2.1
+LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
 LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
 LIBNICE_DEPENDENCIES = libglib2 host-pkgconf
 LIBNICE_INSTALL_STAGING = YES
@@ -14,6 +14,6 @@ LIBNICE_INSTALL_STAGING = YES
 LIBNICE_AUTORECONF = YES
 LIBNICE_CONF_OPTS = \
 	--without-gstreamer \
-	--without-gstreamer-0.10 \
+	--without-gstreamer-0.10
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch b/bsp/buildroot/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
similarity index 100%
rename from bsp/buildroot/package/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
rename to bsp/buildroot/package/libnl/0001-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch
diff --git a/bsp/buildroot/package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch b/bsp/buildroot/package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch
deleted file mode 100644
index c1a070ca..00000000
--- a/bsp/buildroot/package/libnl/0001-lib-check-for-integer-overflow-in-nlmsg_reserve.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3e18948f17148e6a3c4255bdeaaf01ef6081ceeb Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Mon, 6 Feb 2017 22:23:52 +0100
-Subject: [PATCH] lib: check for integer-overflow in nlmsg_reserve()
-
-In general, libnl functions are not robust against calling with
-invalid arguments. Thus, never call libnl functions with invalid
-arguments. In case of nlmsg_reserve() this means never provide
-a @len argument that causes overflow.
-
-Still, add an additional safeguard to avoid exploiting such bugs.
-
-Assume that @pad is a trusted, small integer.
-Assume that n->nm_size is a valid number of allocated bytes (and thus
-much smaller then SIZE_T_MAX).
-Assume, that @len may be set to an untrusted value. Then the patch
-avoids an integer overflow resulting in reserving too few bytes.
-
-[Upstream commit: https://github.com/thom311/libnl/commit/3e18948f17148e6a3c4255bdeaaf01ef6081ceeb.patch]
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- lib/msg.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/msg.c b/lib/msg.c
-index 9af3f3a0..3e27d4e0 100644
---- a/lib/msg.c
-+++ b/lib/msg.c
-@@ -411,6 +411,9 @@ void *nlmsg_reserve(struct nl_msg *n, size_t len, int pad)
- 	size_t nlmsg_len = n->nm_nlh->nlmsg_len;
- 	size_t tlen;
- 
-+	if (len > n->nm_size)
-+		return NULL;
-+
- 	tlen = pad ? ((len + (pad - 1)) & ~(pad - 1)) : len;
- 
- 	if ((tlen + nlmsg_len) > n->nm_size)
diff --git a/bsp/buildroot/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch b/bsp/buildroot/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
new file mode 100644
index 00000000..57d1c874
--- /dev/null
+++ b/bsp/buildroot/package/libnl/0002-Add-musl-workaround-to-the-libc-compat.h-copy.patch
@@ -0,0 +1,37 @@
+From be07fdbc9658de19304defa7538f219cd3f21ec0 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Sun, 12 Mar 2017 08:52:20 +0200
+Subject: [PATCH] Add musl workaround to the libc-compat.h copy
+
+The libc-compat.h kernel header uses glibc specific macros to solve conflicts
+with libc provided headers. This patch makes libc-compat.h work also for musl
+libc.
+
+Future rebase note: when upstream updates libc-compat.h some additional macro
+definitions will be needed. See the Buildroot iproute2 patch
+package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
+musl fix must go to the kernel first.
+---
+ include/linux-private/linux/libc-compat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux-private/linux/libc-compat.h b/include/linux-private/linux/libc-compat.h
+index 9bed5b6ae4d9..e2562a819464 100644
+--- a/include/linux-private/linux/libc-compat.h
++++ b/include/linux-private/linux/libc-compat.h
+@@ -49,7 +49,7 @@
+ #define _LIBC_COMPAT_H
+ 
+ /* We have included glibc headers... */
+-#if defined(__GLIBC__)
++#if 1
+ 
+ /* Coordinate with glibc netinet/in.h header. */
+ #if defined(_NETINET_IN_H)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/libnl/Config.in b/bsp/buildroot/package/libnl/Config.in
index 46877c37..1e29f574 100644
--- a/bsp/buildroot/package/libnl/Config.in
+++ b/bsp/buildroot/package/libnl/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBNL
 	help
 	  A library for applications dealing with netlink socket.
 
-	  http://people.suug.ch/~tgr/libnl/
+	  https://github.com/thom311/libnl
 
 if BR2_PACKAGE_LIBNL
 
diff --git a/bsp/buildroot/package/libnl/libnl.hash b/bsp/buildroot/package/libnl/libnl.hash
index 2f1a3cb1..b9c62604 100644
--- a/bsp/buildroot/package/libnl/libnl.hash
+++ b/bsp/buildroot/package/libnl/libnl.hash
@@ -1,2 +1,4 @@
-# From https://github.com/thom311/libnl/releases/download/libnl3_2_27/libnl-3.2.27.tar.gz.sha256sum
-sha256	4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6	libnl-3.2.27.tar.gz
+# From https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz.sha256sum
+sha256	b7287637ae71c6db6f89e1422c995f0407ff2fe50cecd61a312b6a9b0921f5bf	libnl-3.4.0.tar.gz
+# Locally calculated
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
diff --git a/bsp/buildroot/package/libnl/libnl.mk b/bsp/buildroot/package/libnl/libnl.mk
index 85c0db86..397910c4 100644
--- a/bsp/buildroot/package/libnl/libnl.mk
+++ b/bsp/buildroot/package/libnl/libnl.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBNL_VERSION = 3.2.27
+LIBNL_VERSION = 3.4.0
 LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION))
-LIBNL_LICENSE = LGPLv2.1+
+LIBNL_LICENSE = LGPL-2.1+
 LIBNL_LICENSE_FILES = COPYING
 LIBNL_INSTALL_STAGING = YES
-LIBNL_DEPENDENCIES = host-bison host-flex
+LIBNL_DEPENDENCIES = host-bison host-flex host-pkgconf
 
 ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y)
 LIBNL_CONF_OPTS += --enable-cli
@@ -17,4 +17,11 @@ else
 LIBNL_CONF_OPTS += --disable-cli
 endif
 
+ifeq ($(BR2_PACKAGE_CHECK),y)
+LIBNL_DEPENDENCIES += check
+LIBNL_CONF_OPTS += --enable-unit-tests
+else
+LIBNL_CONF_OPTS += --disable-unit-tests
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnpth/Config.in b/bsp/buildroot/package/libnpth/Config.in
new file mode 100644
index 00000000..71f9fcb3
--- /dev/null
+++ b/bsp/buildroot/package/libnpth/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBNPTH
+	bool "libnpth"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU # fork()
+	help
+	  nPth is a library to provide the GNU Pth API and thus a
+	  non-preemptive threads implementation.
+
+	  https://www.gnupg.org/related_software/npth/index.html
+
+comment "libnpth needs a toolchain w/ threads support"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/libnpth/libnpth.hash b/bsp/buildroot/package/libnpth/libnpth.hash
new file mode 100644
index 00000000..f8cfefa4
--- /dev/null
+++ b/bsp/buildroot/package/libnpth/libnpth.hash
@@ -0,0 +1,2 @@
+# Locally calculated after checking signature
+sha256 294a690c1f537b92ed829d867bee537e46be93fbd60b16c04630fbbfcd9db3c2  npth-1.5.tar.bz2
diff --git a/bsp/buildroot/package/libnpth/libnpth.mk b/bsp/buildroot/package/libnpth/libnpth.mk
new file mode 100644
index 00000000..7b2eb2ae
--- /dev/null
+++ b/bsp/buildroot/package/libnpth/libnpth.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libnpth
+#
+################################################################################
+
+LIBNPTH_VERSION = 1.5
+LIBNPTH_SOURCE = npth-$(LIBNPTH_VERSION).tar.bz2
+LIBNPTH_SITE = https://www.gnupg.org/ftp/gcrypt/npth
+LIBNPTH_LICENSE = LGPL-2.0+
+LIBNPTH_LICENSE_FILES = COPYING.LIB
+LIBNPTH_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libnspr/libnspr.mk b/bsp/buildroot/package/libnspr/libnspr.mk
index b41b0629..0c782ae3 100644
--- a/bsp/buildroot/package/libnspr/libnspr.mk
+++ b/bsp/buildroot/package/libnspr/libnspr.mk
@@ -10,7 +10,7 @@ LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_
 LIBNSPR_SUBDIR = nspr
 LIBNSPR_INSTALL_STAGING = YES
 LIBNSPR_CONFIG_SCRIPTS = nspr-config
-LIBNSPR_LICENSE = MPLv2.0
+LIBNSPR_LICENSE = MPL-2.0
 LIBNSPR_LICENSE_FILES = nspr/LICENSE
 
 # Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly
diff --git a/bsp/buildroot/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch b/bsp/buildroot/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch
new file mode 100644
index 00000000..c14880b1
--- /dev/null
+++ b/bsp/buildroot/package/libnss/0004-Bug-1438426-Avoid-stringop-truncation-warning-r-fran.patch
@@ -0,0 +1,33 @@
+From f0ce70989526fc9a0223398c99ea0d09777ea5df Mon Sep 17 00:00:00 2001
+From: Martin Thomson <martin.thomson@gmail.com>
+Date: Thu, 15 Feb 2018 16:34:02 +1100
+Subject: [PATCH] Bug 1438426 - Avoid stringop-truncation warning, r=franziskus
+
+--HG--
+extra : rebase_source : 4ea1630d0da0ce3523309e3da33ee50961682242
+
+Upstream-commit: https://github.com/nss-dev/nss/commit/f0ce70989526fc9a0223398c99ea0d09777ea5df
+[Thomas: edited after git format-patch to add the nss/ prefix needed
+for the patch to apply properly on the source code extracted by the
+tarball.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ nss/coreconf/nsinstall/pathsub.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/nss/coreconf/nsinstall/pathsub.c b/nss/coreconf/nsinstall/pathsub.c
+index a42a9f30a..c31a946f0 100644
+--- a/nss/coreconf/nsinstall/pathsub.c
++++ b/nss/coreconf/nsinstall/pathsub.c
+@@ -212,7 +212,7 @@ reversepath(char *inpath, char *name, int len, char *outpath)
+ 	    xchdir("..");
+ 	} else {
+ 	    cp -= 3;
+-	    strncpy(cp, "../", 3);
++	    memcpy(cp, "../", 3);
+ 	    xchdir(buf);
+ 	}
+     }
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/libnss/Config.in b/bsp/buildroot/package/libnss/Config.in
index f07bb043..599c9a65 100644
--- a/bsp/buildroot/package/libnss/Config.in
+++ b/bsp/buildroot/package/libnss/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_LIBNSS
 	bool "libnss"
-	select BR2_PACKAGE_LIBNSPR
-	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_ZLIB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr
 	depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBNSPR
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ZLIB
 	help
 	  Network Security Services (NSS) is a set of libraries designed
 	  to support development of security-enabled client and server
diff --git a/bsp/buildroot/package/libnss/libnss.mk b/bsp/buildroot/package/libnss/libnss.mk
index 53e27855..27d305cc 100644
--- a/bsp/buildroot/package/libnss/libnss.mk
+++ b/bsp/buildroot/package/libnss/libnss.mk
@@ -10,7 +10,7 @@ LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_
 LIBNSS_DISTDIR = dist
 LIBNSS_INSTALL_STAGING = YES
 LIBNSS_DEPENDENCIES = libnspr sqlite zlib
-LIBNSS_LICENSE = MPLv2.0
+LIBNSS_LICENSE = MPL-2.0
 LIBNSS_LICENSE_FILES = nss/COPYING
 
 # --gc-sections triggers binutils ld segfault
diff --git a/bsp/buildroot/package/liboauth/Config.in b/bsp/buildroot/package/liboauth/Config.in
index 77a78f11..4ed0efa6 100644
--- a/bsp/buildroot/package/liboauth/Config.in
+++ b/bsp/buildroot/package/liboauth/Config.in
@@ -3,8 +3,9 @@ config BR2_PACKAGE_LIBOAUTH
 	select BR2_PACKAGE_OPENSSL
 	help
 	  liboauth is a collection of c functions implementing the oAuth
-	  Core 1.0 Rev A standard API. liboauth provides basic functions to
-	  escape and encode parameters according to oAuth specs and offers
-	  high-level functions to sign requests or verify signatures.
+	  Core 1.0 Rev A standard API. liboauth provides basic functions
+	  to escape and encode parameters according to oAuth specs and
+	  offers high-level functions to sign requests or verify
+	  signatures.
 
 	  http://liboauth.sourceforge.net/
diff --git a/bsp/buildroot/package/libogg/libogg.hash b/bsp/buildroot/package/libogg/libogg.hash
index 393ebee2..0c65b8e1 100644
--- a/bsp/buildroot/package/libogg/libogg.hash
+++ b/bsp/buildroot/package/libogg/libogg.hash
@@ -1,2 +1,2 @@
 # From: http://www.xiph.org/downloads/
-sha256 3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b libogg-1.3.2.tar.xz
+sha256 4f3fc6178a533d392064f14776b23c397ed4b9f48f5de297aba73b643f955c08 libogg-1.3.3.tar.xz
diff --git a/bsp/buildroot/package/libogg/libogg.mk b/bsp/buildroot/package/libogg/libogg.mk
index 8fff5297..4c97e9a9 100644
--- a/bsp/buildroot/package/libogg/libogg.mk
+++ b/bsp/buildroot/package/libogg/libogg.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBOGG_VERSION = 1.3.2
+LIBOGG_VERSION = 1.3.3
 LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz
 LIBOGG_SITE = http://downloads.xiph.org/releases/ogg
-LIBOGG_LICENSE = BSD-3c
+LIBOGG_LICENSE = BSD-3-Clause
 LIBOGG_LICENSE_FILES = COPYING
 
 LIBOGG_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libopenh264/libopenh264.mk b/bsp/buildroot/package/libopenh264/libopenh264.mk
index 40bbf80e..feead5b8 100644
--- a/bsp/buildroot/package/libopenh264/libopenh264.mk
+++ b/bsp/buildroot/package/libopenh264/libopenh264.mk
@@ -6,7 +6,7 @@
 
 LIBOPENH264_VERSION = v1.6.0
 LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION))
-LIBOPENH264_LICENSE = BSD-2c
+LIBOPENH264_LICENSE = BSD-2-Clause
 LIBOPENH264_LICENSE_FILES = LICENSE
 LIBOPENH264_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/bsp/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
similarity index 100%
rename from bsp/buildroot/package/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
rename to bsp/buildroot/package/libopenssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch
diff --git a/bsp/buildroot/package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch b/bsp/buildroot/package/libopenssl/0002-cryptodev-Fix-issue-with-signature-generation.patch
similarity index 100%
rename from bsp/buildroot/package/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch
rename to bsp/buildroot/package/libopenssl/0002-cryptodev-Fix-issue-with-signature-generation.patch
diff --git a/bsp/buildroot/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch b/bsp/buildroot/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch
new file mode 100644
index 00000000..eff72c54
--- /dev/null
+++ b/bsp/buildroot/package/libopenssl/0003-Reproducible-build-do-not-leak-compiler-path.patch
@@ -0,0 +1,26 @@
+From 875fcad2ad84877763cba86c1265b57679b878b0 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 24 Oct 2017 16:58:32 +0200
+Subject: [PATCH] Reproducible build: do not leak compiler path
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ crypto/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/crypto/Makefile b/crypto/Makefile
+index 7869996..7e63291 100644
+--- a/crypto/Makefile
++++ b/crypto/Makefile
+@@ -55,7 +55,7 @@ top:
+ all: shared
+ 
+ buildinf.h: ../Makefile
+-	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
++	$(PERL) $(TOP)/util/mkbuildinf.pl "$$(basename $(CC)) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
+ 
+ x86cpuid.s:	x86cpuid.pl perlasm/x86asm.pl
+ 	$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/libopenssl/libopenssl.hash b/bsp/buildroot/package/libopenssl/libopenssl.hash
new file mode 100644
index 00000000..2b1e0487
--- /dev/null
+++ b/bsp/buildroot/package/libopenssl/libopenssl.hash
@@ -0,0 +1,10 @@
+# From https://www.openssl.org/source/openssl-1.0.2p.tar.gz.sha256
+sha256	50a98e07b1a89eb8f6a99477f262df71c6fa7bef77df4dc83025a2845c827d00	openssl-1.0.2p.tar.gz
+# From https://www.openssl.org/source/openssl-1.0.2p.tar.gz.sha1
+sha1	f34b5322e92415755c7d58bf5d0d5cf37666382c				openssl-1.0.2p.tar.gz
+# Locally computed
+sha256	eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9	openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
+sha256	147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f	openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
+sha256	30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956	openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
+sha256	deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f	openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
+sha256	c8f60f4842bbad0353f5d81620e72b168b5638ca3a0a999f5da113b22491612e	LICENSE
diff --git a/bsp/buildroot/package/libopenssl/libopenssl.mk b/bsp/buildroot/package/libopenssl/libopenssl.mk
new file mode 100644
index 00000000..d8e3dd8b
--- /dev/null
+++ b/bsp/buildroot/package/libopenssl/libopenssl.mk
@@ -0,0 +1,171 @@
+################################################################################
+#
+# libopenssl
+#
+################################################################################
+
+LIBOPENSSL_VERSION = 1.0.2p
+LIBOPENSSL_SITE = http://www.openssl.org/source
+LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
+LIBOPENSSL_LICENSE = OpenSSL or SSLeay
+LIBOPENSSL_LICENSE_FILES = LICENSE
+LIBOPENSSL_INSTALL_STAGING = YES
+LIBOPENSSL_DEPENDENCIES = zlib
+HOST_LIBOPENSSL_DEPENDENCIES = host-zlib
+LIBOPENSSL_TARGET_ARCH = generic32
+LIBOPENSSL_CFLAGS = $(TARGET_CFLAGS)
+LIBOPENSSL_PROVIDES = openssl
+LIBOPENSSL_PATCH = \
+	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
+	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
+	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
+	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
+
+# relocation truncated to fit: R_68K_GOT16O
+ifeq ($(BR2_m68k_cf),y)
+LIBOPENSSL_CFLAGS += -mxgot
+endif
+
+ifeq ($(BR2_USE_MMU),)
+LIBOPENSSL_CFLAGS += -DHAVE_FORK=0
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y)
+LIBOPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
+LIBOPENSSL_DEPENDENCIES += cryptodev
+endif
+
+# Some architectures are optimized in OpenSSL
+# Doesn't work for thumb-only (Cortex-M?)
+ifeq ($(BR2_ARM_CPU_HAS_ARM),y)
+LIBOPENSSL_TARGET_ARCH = armv4
+endif
+ifeq ($(ARCH),aarch64)
+LIBOPENSSL_TARGET_ARCH = aarch64
+endif
+ifeq ($(ARCH),powerpc)
+# 4xx cores seem to have trouble with openssl's ASM optimizations
+ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),)
+LIBOPENSSL_TARGET_ARCH = ppc
+endif
+endif
+ifeq ($(ARCH),powerpc64)
+LIBOPENSSL_TARGET_ARCH = ppc64
+endif
+ifeq ($(ARCH),powerpc64le)
+LIBOPENSSL_TARGET_ARCH = ppc64le
+endif
+ifeq ($(ARCH),x86_64)
+LIBOPENSSL_TARGET_ARCH = x86_64
+endif
+
+define HOST_LIBOPENSSL_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(HOST_CONFIGURE_OPTS) \
+		./config \
+		--prefix=$(HOST_DIR) \
+		--openssldir=$(HOST_DIR)/etc/ssl \
+		--libdir=/lib \
+		shared \
+		zlib-dynamic \
+	)
+	$(SED) "s#-O[0-9]#$(HOST_CFLAGS)#" $(@D)/Makefile
+endef
+
+define LIBOPENSSL_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_ARGS) \
+		$(TARGET_CONFIGURE_OPTS) \
+		./Configure \
+			linux-$(LIBOPENSSL_TARGET_ARCH) \
+			--prefix=/usr \
+			--openssldir=/etc/ssl \
+			--libdir=/lib \
+			$(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
+			$(if $(BR2_STATIC_LIBS),no-shared,shared) \
+			no-rc5 \
+			enable-camellia \
+			enable-mdc2 \
+			enable-tlsext \
+			$(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \
+			$(if $(BR2_STATIC_LIBS),no-dso) \
+	)
+	$(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile
+	$(SED) "s#-O[0-9]#$(LIBOPENSSL_CFLAGS)#" $(@D)/Makefile
+	$(SED) "s# build_tests##" $(@D)/Makefile
+endef
+
+# libdl is not available in a static build, and this is not implied by no-dso
+ifeq ($(BR2_STATIC_LIBS),y)
+define LIBOPENSSL_FIXUP_STATIC_MAKEFILE
+	$(SED) 's#-ldl##g' $(@D)/Makefile
+endef
+LIBOPENSSL_POST_CONFIGURE_HOOKS += LIBOPENSSL_FIXUP_STATIC_MAKEFILE
+endif
+
+define HOST_LIBOPENSSL_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define LIBOPENSSL_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define LIBOPENSSL_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
+endef
+
+define HOST_LIBOPENSSL_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+define LIBOPENSSL_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
+	rm -rf $(TARGET_DIR)/usr/lib/ssl
+	rm -f $(TARGET_DIR)/usr/bin/c_rehash
+endef
+
+# libdl has no business in a static build
+ifeq ($(BR2_STATIC_LIBS),y)
+define LIBOPENSSL_FIXUP_STATIC_PKGCONFIG
+	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc
+	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc
+	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc
+endef
+LIBOPENSSL_POST_INSTALL_STAGING_HOOKS += LIBOPENSSL_FIXUP_STATIC_PKGCONFIG
+endif
+
+ifneq ($(BR2_STATIC_LIBS),y)
+# libraries gets installed read only, so strip fails
+define LIBOPENSSL_INSTALL_FIXUPS_SHARED
+	chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
+	for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \
+	do chmod +w $$i; done
+endef
+LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_INSTALL_FIXUPS_SHARED
+endif
+
+ifeq ($(BR2_PACKAGE_PERL),)
+define LIBOPENSSL_REMOVE_PERL_SCRIPTS
+	$(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget}
+endef
+LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_PERL_SCRIPTS
+endif
+
+ifeq ($(BR2_PACKAGE_LIBOPENSSL_BIN),)
+define LIBOPENSSL_REMOVE_BIN
+	$(RM) -f $(TARGET_DIR)/usr/bin/openssl
+	$(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.*,c_*}
+endef
+LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_BIN
+endif
+
+ifneq ($(BR2_PACKAGE_LIBOPENSSL_ENGINES),y)
+define LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES
+	rm -rf $(TARGET_DIR)/usr/lib/engines
+endef
+LIBOPENSSL_POST_INSTALL_TARGET_HOOKS += LIBOPENSSL_REMOVE_LIBOPENSSL_ENGINES
+endif
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/liboping/0001-configure-also-check-for-clockgettime.patch b/bsp/buildroot/package/liboping/0001-configure-also-check-for-clockgettime.patch
deleted file mode 100644
index b2c58555..00000000
--- a/bsp/buildroot/package/liboping/0001-configure-also-check-for-clockgettime.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a45f3610beba1f7e6e1a038e3a1fe4150057c262 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Tue, 5 Jul 2016 15:31:28 +0200
-Subject: [PATCH] configure: also check for clockgettime()
-
-clock_gettime() is also in -lrt so we also need to check for it.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- configure.ac | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f83f5ab..3b6ae09 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -199,12 +199,16 @@ fi
- 
- AC_SUBST(LIBOPING_PC_LIBS_PRIVATE)
- 
--nanosleep_needs_rt="no"
-+needs_rt="no"
- AC_CHECK_FUNCS(nanosleep, [],
- 	AC_CHECK_LIB(rt, nanosleep,
--		[nanosleep_needs_rt="yes"],
-+		[needs_rt="yes"],
- 		AC_MSG_ERROR(cannot find nanosleep)))
--AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
-+AC_CHECK_FUNCS(clock_gettime, [],
-+	AC_CHECK_LIB(rt, clock_gettime,
-+		[needs_rt="yes"],
-+		AC_MSG_ERROR(cannot find clock_gettime)))
-+AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$needs_rt" = "xyes")
- 
- with_ncurses="no"
- AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], [])
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/liboping/liboping.mk b/bsp/buildroot/package/liboping/liboping.mk
index dd703871..114e0c27 100644
--- a/bsp/buildroot/package/liboping/liboping.mk
+++ b/bsp/buildroot/package/liboping/liboping.mk
@@ -10,9 +10,7 @@ LIBOPING_SOURCE = liboping-$(LIBOPING_VERSION).tar.bz2
 LIBOPING_INSTALL_STAGING = YES
 LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses)
 LIBOPING_CONF_OPTS = --without-perl-bindings
-LIBOPING_LICENSE = LGPLv2.1+, GPLv2
+LIBOPING_LICENSE = LGPL-2.1+, GPL-2.0
 LIBOPING_LICENSE_FILES = COPYING
 
-LIBOPING_AUTORECONF = YES
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libosip2/libosip2.mk b/bsp/buildroot/package/libosip2/libosip2.mk
index f22dcc31..9302b991 100644
--- a/bsp/buildroot/package/libosip2/libosip2.mk
+++ b/bsp/buildroot/package/libosip2/libosip2.mk
@@ -7,7 +7,7 @@
 LIBOSIP2_VERSION = 3.6.0
 LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip
 LIBOSIP2_INSTALL_STAGING = YES
-LIBOSIP2_LICENSE = LGPLv2.1+
+LIBOSIP2_LICENSE = LGPL-2.1+
 LIBOSIP2_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_arc),y)
diff --git a/bsp/buildroot/package/libostree/Config.in b/bsp/buildroot/package/libostree/Config.in
new file mode 100644
index 00000000..b62f4ea0
--- /dev/null
+++ b/bsp/buildroot/package/libostree/Config.in
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_LIBOSTREE
+	bool "libostree"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme
+	depends on !BR2_STATIC_LIBS # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_USE_MMU # e2fsprogs, libfuse,libglib2, libgpgme
+	# doesn't build with musl due to lack of TEMP_FAILURE_RETRY()
+	depends on !BR2_TOOLCHAIN_USES_MUSL
+	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGPGME
+	select BR2_PACKAGE_XZ
+	help
+	  OSTree is an upgrade system for Linux-based operating
+	  systems.
+
+	  https://ostree.readthedocs.io/en/latest/
+
+comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
+		|| !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/libostree/libostree.hash b/bsp/buildroot/package/libostree/libostree.hash
new file mode 100644
index 00000000..54bc263f
--- /dev/null
+++ b/bsp/buildroot/package/libostree/libostree.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 8b5e3b80425b91c93aeb916bb047ee194aa138a9cf00ce173dcc0ebc0dd11f4b  libostree-2018.1.tar.xz
+sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c  COPYING
diff --git a/bsp/buildroot/package/libostree/libostree.mk b/bsp/buildroot/package/libostree/libostree.mk
new file mode 100644
index 00000000..f3e79c84
--- /dev/null
+++ b/bsp/buildroot/package/libostree/libostree.mk
@@ -0,0 +1,69 @@
+################################################################################
+#
+# libostree
+#
+################################################################################
+
+LIBOSTREE_VERSION = 2018.1
+LIBOSTREE_SOURCE = libostree-$(LIBOSTREE_VERSION).tar.xz
+LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOSTREE_VERSION)
+
+LIBOSTREE_LICENSE = LGPL-2.0+
+LIBOSTREE_LICENSE_FILES = COPYING
+LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpgme xz
+LIBOSTREE_INSTALL_STAGING = YES
+
+LIBOSTREE_CONF_OPTS += \
+	--with-gpgme-prefix=$(STAGING_DIR)/usr \
+	--disable-gtk-doc \
+	--disable-gtk-doc-html \
+	--disable-gtk-doc-pdf \
+	--disable-man
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBOSTREE_CONF_OPTS += --with-openssl
+LIBOSTREE_DEPENDENCIES += openssl
+else
+LIBOSTREE_CONF_OPTS += --without-openssl
+endif
+
+# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
+# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
+# option yet, use the avahi-daemon and dbus config symbols to check for
+# libavahi-client.
+ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
+LIBOSTREE_CONF_OPTS += --with-avahi
+LIBOSTREE_DEPENDENCIES += avahi
+else
+LIBOSTREE_CONF_OPTS += --without-avahi
+endif
+
+#cURL support depends on libsoup
+ifeq ($(BR2_PACKAGE_LIBSOUP),y)
+LIBOSTREE_CONF_OPTS += --with-soup
+LIBOSTREE_DEPENDENCIES += libsoup
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LIBOSTREE_CONF_OPTS += --with-curl
+LIBOSTREE_DEPENDENCIES += libcurl
+else
+LIBOSTREE_CONF_OPTS += --without-curl
+endif
+else
+LIBOSTREE_CONF_OPTS += --without-soup --without-curl
+endif
+
+ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
+LIBOSTREE_CONF_OPTS += --with-libarchive
+LIBOSTREE_DEPENDENCIES += libarchive
+else
+LIBOSTREE_CONF_OPTS += --without-libarchive
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+LIBOSTREE_CONF_OPTS += --with-selinux
+LIBOSTREE_DEPENDENCIES += libselinux
+else
+LIBOSTREE_CONF_OPTS += --without-selinux
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libpam-radius-auth/libpam-radius-auth.mk b/bsp/buildroot/package/libpam-radius-auth/libpam-radius-auth.mk
index 5ed5953c..184e48d3 100644
--- a/bsp/buildroot/package/libpam-radius-auth/libpam-radius-auth.mk
+++ b/bsp/buildroot/package/libpam-radius-auth/libpam-radius-auth.mk
@@ -9,7 +9,7 @@ LIBPAM_RADIUS_AUTH_SITE = ftp://ftp.freeradius.org/pub/radius
 LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.gz
 LIBPAM_RADIUS_AUTH_DEPENDENCIES = linux-pam
 LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES
-LIBPAM_RADIUS_AUTH_LICENSE = GPLv2+
+LIBPAM_RADIUS_AUTH_LICENSE = GPL-2.0+
 LIBPAM_RADIUS_AUTH_LICENSE_FILES = LICENSE
 # While autoconf is used for configuration, the Makefile is
 # hand-written, so we need to pass CC, LD, CFLAGS at build time.
diff --git a/bsp/buildroot/package/libpam-tacplus/libpam-tacplus.mk b/bsp/buildroot/package/libpam-tacplus/libpam-tacplus.mk
index 6696d898..f43e2b9a 100644
--- a/bsp/buildroot/package/libpam-tacplus/libpam-tacplus.mk
+++ b/bsp/buildroot/package/libpam-tacplus/libpam-tacplus.mk
@@ -6,7 +6,7 @@
 
 LIBPAM_TACPLUS_VERSION = 1.3.9
 LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION))
-LIBPAM_TACPLUS_LICENSE = GPLv2+
+LIBPAM_TACPLUS_LICENSE = GPL-2.0+
 LIBPAM_TACPLUS_LICENSE_FILES = COPYING
 LIBPAM_TACPLUS_DEPENDENCIES = linux-pam
 # Fetching from github, we need to generate the configure script
diff --git a/bsp/buildroot/package/libpcap/Config.in b/bsp/buildroot/package/libpcap/Config.in
index 7f9517a7..643acbef 100644
--- a/bsp/buildroot/package/libpcap/Config.in
+++ b/bsp/buildroot/package/libpcap/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBPCAP
 	bool "libpcap"
 	select BR2_PACKAGE_ZLIB
 	help
-	  A system-independent library for user-level network packet capture.
+	  A system-independent library for user-level network packet
+	  capture.
 
 	  http://www.tcpdump.org/
diff --git a/bsp/buildroot/package/libpcap/libpcap.mk b/bsp/buildroot/package/libpcap/libpcap.mk
index 505e2abe..c4c5f314 100644
--- a/bsp/buildroot/package/libpcap/libpcap.mk
+++ b/bsp/buildroot/package/libpcap/libpcap.mk
@@ -6,7 +6,7 @@
 
 LIBPCAP_VERSION = 1.8.1
 LIBPCAP_SITE = http://www.tcpdump.org/release
-LIBPCAP_LICENSE = BSD-3c
+LIBPCAP_LICENSE = BSD-3-Clause
 LIBPCAP_LICENSE_FILES = LICENSE
 LIBPCAP_INSTALL_STAGING = YES
 LIBPCAP_DEPENDENCIES = zlib host-flex host-bison
diff --git a/bsp/buildroot/package/libpciaccess/0001-limits_h.patch b/bsp/buildroot/package/libpciaccess/0001-limits_h.patch
deleted file mode 100644
index c5c8444a..00000000
--- a/bsp/buildroot/package/libpciaccess/0001-limits_h.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix compilation error with musl-based toolchain
-
-linux_sysfs.c:751:15: error: 'PATH_MAX' undeclared (first use in this function)
-     char name[PATH_MAX];
-
-Patch applied upstream:
-http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=8ea3af620a2d4ad5648917b4a0ef2b23ff566774
-
-Signed-off-by: Felix Janda <felix.janda at posteo.de>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr libpciaccess-0.13.3.org/src/linux_sysfs.c libpciaccess-0.13.3/src/linux_sysfs.c
---- libpciaccess-0.13.3.org/src/linux_sysfs.c	2015-02-04 00:59:14.000000000 +0100
-+++ libpciaccess-0.13.3/src/linux_sysfs.c	2015-04-10 21:57:35.000000000 +0200
-@@ -44,6 +44,7 @@
- #include <sys/mman.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- 
- #if defined(__i386__) || defined(__x86_64__) || defined(__arm__)
- #include <sys/io.h>
diff --git a/bsp/buildroot/package/libpciaccess/0002-musl-arm.patch b/bsp/buildroot/package/libpciaccess/0001-musl-arm.patch
similarity index 100%
rename from bsp/buildroot/package/libpciaccess/0002-musl-arm.patch
rename to bsp/buildroot/package/libpciaccess/0001-musl-arm.patch
diff --git a/bsp/buildroot/package/libpciaccess/libpciaccess.hash b/bsp/buildroot/package/libpciaccess/libpciaccess.hash
index 0483c4c8..b73c27c2 100644
--- a/bsp/buildroot/package/libpciaccess/libpciaccess.hash
+++ b/bsp/buildroot/package/libpciaccess/libpciaccess.hash
@@ -1,2 +1,5 @@
-# From http://lists.x.org/archives/xorg-announce/2015-April/002590.html
-sha256	07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf	libpciaccess-0.13.4.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-October/002817.html
+md5 8f436e151d5106a9cfaa71857a066d33  libpciaccess-0.14.tar.bz2
+sha1 f70a958bf4e744cb4ee93be64e9bc52ac05cdaeb  libpciaccess-0.14.tar.bz2
+sha256 3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4  libpciaccess-0.14.tar.bz2
+sha512 bf40214dfd22f2a223f7c948566e6eaa4bfed60116e71b3eb19f6fe7ab2c4546649eb0416c06d5983e476ea5e27de036936646eb5f800ea97763b6d1f1976f4b  libpciaccess-0.14.tar.bz2
diff --git a/bsp/buildroot/package/libpciaccess/libpciaccess.mk b/bsp/buildroot/package/libpciaccess/libpciaccess.mk
index ced0786a..93b5fc7a 100644
--- a/bsp/buildroot/package/libpciaccess/libpciaccess.mk
+++ b/bsp/buildroot/package/libpciaccess/libpciaccess.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBPCIACCESS_VERSION = 0.13.4
+LIBPCIACCESS_VERSION = 0.14
 LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.bz2
 LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib
 LIBPCIACCESS_LICENSE = MIT
diff --git a/bsp/buildroot/package/libphidget/Config.in b/bsp/buildroot/package/libphidget/Config.in
index 7466fb50..61e91548 100644
--- a/bsp/buildroot/package/libphidget/Config.in
+++ b/bsp/buildroot/package/libphidget/Config.in
@@ -4,20 +4,22 @@ config BR2_PACKAGE_LIBPHIDGET
 	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_LIBUSB
 	help
-	  The libphidget library provides an API for controlling Phidgets
-	  USB devices. The library translates API function calls to libusb
-	  function calls to control attached Phidgets devices that provide
-	  GPIO's, DAC's, accelerometers, servo motors, and other capabilities
-	  either singly or on combo devices.
+	  The libphidget library provides an API for controlling
+	  Phidgets USB devices. The library translates API function
+	  calls to libusb function calls to control attached Phidgets
+	  devices that provide GPIO's, DAC's, accelerometers, servo
+	  motors, and other capabilities either singly or on combo
+	  devices.
 
 	  To use libphidget for controlling locally attached devices you
 	  need to set up the userspace USB device tree /dev/bus/usb. See
 	  file udev/99-phidgets.rules.
 
-	  The libphidget library also contains an API for sending commands
-	  to a local or remote phidgetwebservice using HTTP. The
-	  phidgetwebservice then translates HTTP requests to libphidget API
-	  function calls to control locally attached Phidgets devices.
+	  The libphidget library also contains an API for sending
+	  commands to a local or remote phidgetwebservice using HTTP.
+	  The phidgetwebservice then translates HTTP requests to
+	  libphidget API function calls to control locally attached
+	  Phidgets devices.
 
 	  http://phidgets.com/
 
diff --git a/bsp/buildroot/package/libphidget/libphidget.mk b/bsp/buildroot/package/libphidget/libphidget.mk
index cc315b35..803d5012 100644
--- a/bsp/buildroot/package/libphidget/libphidget.mk
+++ b/bsp/buildroot/package/libphidget/libphidget.mk
@@ -10,7 +10,7 @@ LIBPHIDGET_SITE = https://www.phidgets.com/downloads/phidget21/libraries/linux/l
 LIBPHIDGET_DEPENDENCIES = libusb
 LIBPHIDGET_CONF_OPTS = --disable-ldconfig
 LIBPHIDGET_INSTALL_STAGING = YES
-LIBPHIDGET_LICENSE = LGPLv3
+LIBPHIDGET_LICENSE = LGPL-3.0
 LIBPHIDGET_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libpjsip/libpjsip.mk b/bsp/buildroot/package/libpjsip/libpjsip.mk
index 5fa6bbfd..db9e474b 100644
--- a/bsp/buildroot/package/libpjsip/libpjsip.mk
+++ b/bsp/buildroot/package/libpjsip/libpjsip.mk
@@ -8,7 +8,7 @@ LIBPJSIP_VERSION = 2.7.2
 LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2
 LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION)
 LIBPJSIP_DEPENDENCIES = libsrtp
-LIBPJSIP_LICENSE = GPLv2+
+LIBPJSIP_LICENSE = GPL-2.0+
 LIBPJSIP_LICENSE_FILES = COPYING
 LIBPJSIP_INSTALL_STAGING = YES
 LIBPJSIP_MAKE = $(MAKE1)
@@ -38,8 +38,6 @@ LIBPJSIP_CONF_OPTS = \
 	--disable-opus \
 	--disable-oss \
 	--disable-ext-sound \
-	--disable-small-filter \
-	--disable-large-filter \
 	--disable-g711-codec \
 	--disable-l16-codec \
 	--disable-g722-codec \
@@ -58,8 +56,8 @@ LIBPJSIP_CONF_OPTS = \
 # so we want to use it.
 LIBPJSIP_CONF_OPTS += --enable-epoll
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-LIBPJSIP_DEPENDENCIES += openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+LIBPJSIP_DEPENDENCIES += libopenssl
 LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr
 else
 LIBPJSIP_CONF_OPTS += --disable-ssl
diff --git a/bsp/buildroot/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch b/bsp/buildroot/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
new file mode 100644
index 00000000..d487fd94
--- /dev/null
+++ b/bsp/buildroot/package/libplatform/0001-p8-platform-config-fix-lookup-paths.patch
@@ -0,0 +1,38 @@
+From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Mon, 6 Feb 2017 14:04:47 +0100
+Subject: [PATCH] p8-platform-config: fix lookup paths
+
+Use the proper methods to find the headers and the library.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ p8-platform-config.cmake.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in
+index 47f30f1..f59418d 100644
+--- a/p8-platform-config.cmake.in
++++ b/p8-platform-config.cmake.in
+@@ -10,7 +10,7 @@
+ #
+ # propagate these properties from one build system to the other
+ set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@")
+-set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
++find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h)
+ set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
+ set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@")
+ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@")
+@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@")
+ if(WIN32)
+   set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib")
+ else(WIN32)
+-  set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform")
++  find_library (p8-platform_LIBRARY p8-platform)
+ endif(WIN32)
+ set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@")
+ mark_as_advanced (p8-platform_LIBRARY)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch b/bsp/buildroot/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
deleted file mode 100644
index 89f35bdb..00000000
--- a/bsp/buildroot/package/libplatform/0001-platform-config.cmake-fix-paths-for-cross-compilatio.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 65ba437ed5514dd5762a796d349ed5db49e40fe7 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 29 Jul 2015 21:26:16 +0200
-Subject: [PATCH] platform-config.cmake: fix paths for cross-compilation
-
-Headers and library paths in platform-config.cmake must take into
-account ${CMAKE_FIND_ROOT_PATH} to work in cross-compilation.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- platform-config.cmake.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/platform-config.cmake.in b/platform-config.cmake.in
-index 7fe35fe..78b5085 100644
---- a/platform-config.cmake.in
-+++ b/platform-config.cmake.in
-@@ -10,16 +10,16 @@
- #
- # propagate these properties from one build system to the other
- set (platform_VERSION "@platform_VERSION_MAJOR@.@platform_VERSION_MINOR@")
--set (platform_INCLUDE_DIRS @platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include)
-+set (platform_INCLUDE_DIRS ${CMAKE_FIND_ROOT_PATH}/@platform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/include)
- set (platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
- set (platform_LINKER_FLAGS "@platform_LINKER_FLAGS@")
- set (platform_CONFIG_VARS "@platform_CONFIG_VARS@")
- 
- # libraries come from the build tree where this file was generated
- if(WIN32)
--  set (platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib")
-+  set (platform_LIBRARY "${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/platform.lib")
- else(WIN32)
--  set (platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform")
-+  set (platform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lplatform")
- endif(WIN32)
- set (platform_LIBRARIES ${platform_LIBRARY} "@platform_LIBRARIES@")
- mark_as_advanced (platform_LIBRARY)
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/libplatform/Config.in b/bsp/buildroot/package/libplatform/Config.in
index 7d275b1f..ade6baf2 100644
--- a/bsp/buildroot/package/libplatform/Config.in
+++ b/bsp/buildroot/package/libplatform/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_LIBPLATFORM
 	bool
 	help
-	  Platform support library used by libCEC and binary add-ons for Kodi
+	  Platform support library used by libCEC and binary add-ons for
+	  Kodi
 
 	  https://github.com/Pulse-Eight/platform
diff --git a/bsp/buildroot/package/libplatform/libplatform.hash b/bsp/buildroot/package/libplatform/libplatform.hash
index 8975dfd8..5162b43f 100644
--- a/bsp/buildroot/package/libplatform/libplatform.hash
+++ b/bsp/buildroot/package/libplatform/libplatform.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  3603ead8b16a48cb35b1e6dea330a693f10552b1a6ea036c5db9ec248cd8baf5  libplatform-feafe68e3e0b02c3261aefb3d711863ef6fadd38.tar.gz
+sha256 dd07bea9cb5676220586e772f09eab51f1093e5ef0faadee80f7c0e99f5f6c1c  libplatform-2d90f98620e25f47702c9e848380c0d93f29462b.tar.gz
diff --git a/bsp/buildroot/package/libplatform/libplatform.mk b/bsp/buildroot/package/libplatform/libplatform.mk
index 6d549151..c805af2e 100644
--- a/bsp/buildroot/package/libplatform/libplatform.mk
+++ b/bsp/buildroot/package/libplatform/libplatform.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBPLATFORM_VERSION = feafe68e3e0b02c3261aefb3d711863ef6fadd38
+LIBPLATFORM_VERSION = 2d90f98620e25f47702c9e848380c0d93f29462b
 LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,$(LIBPLATFORM_VERSION))
-LIBPLATFORM_LICENSE = GPLv2+, PHP license v3.01
-LIBPLATFORM_LICENSE_FILES = src/os.h src/util/fstrcmp.c
+LIBPLATFORM_LICENSE = GPL-2.0+
+LIBPLATFORM_LICENSE_FILES = src/os.h
 LIBPLATFORM_INSTALL_STAGING = YES
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libplayer/Config.in b/bsp/buildroot/package/libplayer/Config.in
index 82293c02..82083a0e 100644
--- a/bsp/buildroot/package/libplayer/Config.in
+++ b/bsp/buildroot/package/libplayer/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LIBPLAYER
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	bool "libplayer"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  libplayer provides a generic A/V API that relies on various multimedia
-	  player for Linux systems. It currently supports MPlayer, xine VLC and
-	  GStreamer only
+	  libplayer provides a generic A/V API that relies on various
+	  multimedia player for Linux systems. It currently supports
+	  MPlayer, xine VLC and GStreamer only
 
 	  http://libplayer.geexbox.org/
 
@@ -27,11 +27,6 @@ comment "gstreamer backend needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 		BR2_STATIC_LIBS
-
-config BR2_PACKAGE_LIBPLAYER_PYTHON
-	depends on BR2_PACKAGE_PYTHON
-	depends on BROKEN # player_init params, builds for host
-	bool "Libplayer python bindings"
 endif
 
 comment "libplayer needs a toolchain w/ threads"
diff --git a/bsp/buildroot/package/libplayer/libplayer.mk b/bsp/buildroot/package/libplayer/libplayer.mk
index ee5362dc..f4eccedb 100644
--- a/bsp/buildroot/package/libplayer/libplayer.mk
+++ b/bsp/buildroot/package/libplayer/libplayer.mk
@@ -7,7 +7,7 @@
 LIBPLAYER_VERSION = 2.0.1
 LIBPLAYER_SITE = http://libplayer.geexbox.org/releases
 LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2
-LIBPLAYER_LICENSE = LGPLv2.1+
+LIBPLAYER_LICENSE = LGPL-2.1+
 LIBPLAYER_LICENSE_FILES = COPYING
 
 # When passing the standard buildroot configure arguments, the configure script
@@ -39,9 +39,4 @@ else
 LIBPLAYER_CONF_OPTS += --disable-gstreamer
 endif
 
-ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y)
-LIBPLAYER_DEPENDENCIES += python
-LIBPLAYER_CONF_OPTS += --enable-binding-python
-endif
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libplist/libplist.mk b/bsp/buildroot/package/libplist/libplist.mk
index bb6a0af7..09fc8168 100644
--- a/bsp/buildroot/package/libplist/libplist.mk
+++ b/bsp/buildroot/package/libplist/libplist.mk
@@ -8,7 +8,7 @@ LIBPLIST_VERSION = 2.0.0
 LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2
 LIBPLIST_SITE = http://www.libimobiledevice.org/downloads
 LIBPLIST_INSTALL_STAGING = YES
-LIBPLIST_LICENSE = LGPLv2.1+
+LIBPLIST_LICENSE = LGPL-2.1+
 LIBPLIST_LICENSE_FILES = COPYING
 
 # Disable building Python bindings, because it requires host-cython, which
diff --git a/bsp/buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch b/bsp/buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
index 2a9bfd1e..de772225 100644
--- a/bsp/buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
+++ b/bsp/buildroot/package/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch
@@ -15,6 +15,9 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 [Julien: update for 1.6.25]
 Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
 
+[Bernd: update for 1.6.29]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 ---
  Makefile.am | 2 +-
@@ -44,7 +47,7 @@ index 4e67782..5f468d9 100644
  	-DPNGLIB_VERSION='@PNGLIB_VERSION@' \
 -	-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \
 +	-DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \
- 	-DPNG_BUILDING_SYMBOL_TABLE $(am__append_7)
+ 	-DPNG_BUILDING_SYMBOL_TABLE $(am__append_9)
  
  # EXT_LIST is a list of the possibly library directory extensions, this exists
 -- 
diff --git a/bsp/buildroot/package/libpng/libpng.hash b/bsp/buildroot/package/libpng/libpng.hash
index e5bd6ba0..0a0cebee 100644
--- a/bsp/buildroot/package/libpng/libpng.hash
+++ b/bsp/buildroot/package/libpng/libpng.hash
@@ -1,4 +1,7 @@
-# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.28/
-sha1 ff4dceadb15e2c929ad26283118d56f66f4a6cff libpng-1.6.28.tar.xz
+# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.34/
+md5		c05b6ca7190a5e387b78657dbe5536b2			libpng-1.6.34.tar.xz
+sha1	45de4ec996ffcc3e18037e7c128abe95f4d0292a	libpng-1.6.34.tar.xz
+
 # Locally computed:
-sha256 d8d3ec9de6b5db740fefac702c37ffcf96ae46cb17c18c1544635a3852f78f7a  libpng-1.6.28.tar.xz
+sha256	2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6	libpng-1.6.34.tar.xz
+sha256	a247c24f82bacf0403fe2f3d5550493a91cdb575fe7036b764bda8cacf3efd9c	LICENSE
diff --git a/bsp/buildroot/package/libpng/libpng.mk b/bsp/buildroot/package/libpng/libpng.mk
index c562965a..f8594c80 100644
--- a/bsp/buildroot/package/libpng/libpng.mk
+++ b/bsp/buildroot/package/libpng/libpng.mk
@@ -4,17 +4,28 @@
 #
 ################################################################################
 
-LIBPNG_VERSION = 1.6.28
+LIBPNG_VERSION = 1.6.34
 LIBPNG_SERIES = 16
 LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz
 LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION)
-LIBPNG_LICENSE = libpng license
+LIBPNG_LICENSE = Libpng
 LIBPNG_LICENSE_FILES = LICENSE
 LIBPNG_INSTALL_STAGING = YES
 LIBPNG_DEPENDENCIES = host-pkgconf zlib
 HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib
 LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config
-LIBPNG_CONF_OPTS = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-neon=yes,--enable-arm-neon=no)
+
+ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
+LIBPNG_CONF_OPTS += --enable-arm-neon
+else
+LIBPNG_CONF_OPTS += --disable-arm-neon
+endif
+
+ifeq ($(BR2_X86_CPU_HAS_SSE2),y)
+LIBPNG_CONF_OPTS += --enable-intel-sse
+else
+LIBPNG_CONF_OPTS += --disable-intel-sse
+endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch b/bsp/buildroot/package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch
deleted file mode 100644
index 672133a5..00000000
--- a/bsp/buildroot/package/libpqxx/0001-Fix-broken-sed-call-in-configure.ac.in.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d5120738a9b6b90d19e742f3c591727d16d76c9c Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Tue, 26 Dec 2017 14:09:46 +0100
-Subject: [PATCH] Fix broken sed call in configure.ac.in
-
-Upstream fix from commit [1][2]
-
-[1] 80a9d5386641ac67d4ea1b602c786b45b40b252f
-[2] 85e9336740475be25ed19924cca0961f7d844c4b
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 32cf5cb5..77cf7edd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -480,7 +480,7 @@ occurring in the file.
- ])], -L${with_postgres_lib})
- 
- # Remove redundant occurrances of -lpq
--LIBS="`echo "$LIBS" | sed -e 's/-lpq[[:space:]]*[[:space:]]-lpq\>/-lpq/g'`"
-+LIBS=[`echo "$LIBS" | sed -e 's/-lpq * -lpq\>/-lpq/g'`]
- 
- AC_LANG_POP(C)
- 
--- 
-2.14.3
-
diff --git a/bsp/buildroot/package/libpqxx/0001-include-sys-time.h-outside-fallback-select-55.patch b/bsp/buildroot/package/libpqxx/0001-include-sys-time.h-outside-fallback-select-55.patch
new file mode 100644
index 00000000..4c635759
--- /dev/null
+++ b/bsp/buildroot/package/libpqxx/0001-include-sys-time.h-outside-fallback-select-55.patch
@@ -0,0 +1,119 @@
+From 44970d7331e4f369e160af0135a2d1fc16f27a21 Mon Sep 17 00:00:00 2001
+From: jdknight-rockwellcollins <james.knight@rockwellcollins.com>
+Date: Mon, 15 Jan 2018 12:41:25 -0500
+Subject: [PATCH] include sys/time.h outside fallback select (#55)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The implementation of 'wait_fd' (inside 'connection_base.cxx') always
+relies on the existence of the 'timeval' structure. In Linux, this
+structure is provided by the header 'sys/time.h'. If polling or select
+capabilities are detected, the structure is never included into the
+source and will result in a compilation error (GCC 7.x):
+
+    connection_base.cxx:1153:28: error: ‘{anonymous}::tv_milliseconds’ declared as an ‘inline’ variable
+     inline int tv_milliseconds(timeval *tv = nullptr)
+                                ^~~~~~~
+    ...
+
+The following moves the 'HAVE_SYS_TIME_H' check outside the
+select-fallback case so that the header can be included no matter the
+event-function feature is used.
+
+Signed-off-by: James Knight <james.knight@rockwellcollins.com>
+---
+ configure               | 28 ++++++++++++----------------
+ configure.ac            |  6 +-----
+ src/connection_base.cxx |  2 +-
+ 3 files changed, 14 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index 7d6d96a98e0fcb7dde1e05adf034afe624ada6d6..dd2a33cb54dba5d3223fc2b4c8d03be7c8abde4e 100755
+--- a/configure
++++ b/configure
+@@ -17285,22 +17285,6 @@ fi
+ done
+ 
+ 
+-if test "$select_h" != "yes"
+-then
+-for ac_header in sys/time.h
+-do :
+-  ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_time_h" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_SYS_TIME_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-fi
+-
+ # Some systems keep select() in a separate library which is not linked by
+ # default.  See if we need one of those.
+ socklibok=no
+@@ -17419,6 +17403,18 @@ fi
+ 
+ fi # No poll()
+ 
++for ac_header in sys/time.h
++do :
++  ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_time_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_TIME_H 1
++_ACEOF
++
++fi
++
++done
++
+ 
+ # Add options to compiler command line, if compiler accepts them.
+ add_compiler_opts_if_ok() {
+diff --git a/configure.ac b/configure.ac
+index 8977c3d3900a5de66b580365d8fe7d133cd1042d..6649f7fa0ed0572489a0db09517c659012ce707c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,11 +117,6 @@ then
+ select_h=no
+ AC_CHECK_HEADERS([sys/select.h], [select_h=yes])
+ 
+-if test "$select_h" != "yes"
+-then
+-AC_CHECK_HEADERS([sys/time.h])
+-fi
+-
+ # Some systems keep select() in a separate library which is not linked by
+ # default.  See if we need one of those.
+ socklibok=no
+@@ -150,6 +145,7 @@ fi
+ 
+ fi # No poll()
+ 
++AC_CHECK_HEADERS([sys/time.h])
+ 
+ # Add options to compiler command line, if compiler accepts them.
+ add_compiler_opts_if_ok() {
+diff --git a/src/connection_base.cxx b/src/connection_base.cxx
+index 37ed7728ffd02e1fded3b5d64d6fb2d5fd74d5ed..0ec55bc5bd761690f66b67396cfbf3e3c56ba618 100644
+--- a/src/connection_base.cxx
++++ b/src/connection_base.cxx
+@@ -38,10 +38,10 @@
+ #if defined(HAVE_UNISTD_H)
+ #include <unistd.h>
+ #endif
++#endif
+ #if defined(HAVE_SYS_TIME_H)
+ #include <sys/time.h>
+ #endif
+-#endif
+ 
+ #include "libpq-fe.h"
+ 
+-- 
+1.8.3.msysgit.0
+
diff --git a/bsp/buildroot/package/libpqxx/Config.in b/bsp/buildroot/package/libpqxx/Config.in
index ddf14fd6..9553d790 100644
--- a/bsp/buildroot/package/libpqxx/Config.in
+++ b/bsp/buildroot/package/libpqxx/Config.in
@@ -1,13 +1,17 @@
 config BR2_PACKAGE_LIBPQXX
 	bool "libpqxx"
-	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_PACKAGE_POSTGRESQL
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  libpqxx is the official C++ client API for PostgreSQL, the
 	  enterprise-strength open-source relational database.
 
 	  http://pqxx.org/development/libpqxx/
 
-comment "libpqxx needs toolchain w/ C++ support"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "libpqxx needs toolchain w/ C++, gcc >= 4.8, threads"
 	depends on BR2_PACKAGE_POSTGRESQL
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libpqxx/libpqxx.hash b/bsp/buildroot/package/libpqxx/libpqxx.hash
index 65c50c67..372be603 100644
--- a/bsp/buildroot/package/libpqxx/libpqxx.hash
+++ b/bsp/buildroot/package/libpqxx/libpqxx.hash
@@ -1,4 +1,3 @@
-# From: http://pqxx.org/download/software/libpqxx/libpqxx-4.0.1.tar.gz.md5sum
-md5	6ea888b9ba85dd7cef1b182dc5f223a2  libpqxx-4.0.1.tar.gz
-# Locally computed after verifying md5sum:
-sha256	097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38  libpqxx-4.0.1.tar.gz
+# Locally computed:
+sha256	81cac92458efd799fadb0374107464320d93eba71de05aedf21afb9c8dda7c3a	libpqxx-6.0.0.tar.gz
+sha256	9e1c78fa302e4e9738bf3315b130429035c03fcb0f046531ccd977cb474f6b31	COPYING
diff --git a/bsp/buildroot/package/libpqxx/libpqxx.mk b/bsp/buildroot/package/libpqxx/libpqxx.mk
index 89a35202..ccafa9ce 100644
--- a/bsp/buildroot/package/libpqxx/libpqxx.mk
+++ b/bsp/buildroot/package/libpqxx/libpqxx.mk
@@ -4,16 +4,13 @@
 #
 ################################################################################
 
-LIBPQXX_VERSION = 4.0.1
-LIBPQXX_SITE = http://pqxx.org/download/software/libpqxx
+LIBPQXX_VERSION = 6.0.0
+LIBPQXX_SITE = $(call github,jtv,libpqxx,$(LIBPQXX_VERSION))
 LIBPQXX_INSTALL_STAGING = YES
 LIBPQXX_DEPENDENCIES = postgresql
-LIBPQXX_LICENSE = BSD-3c
+LIBPQXX_LICENSE = BSD-3-Clause
 LIBPQXX_LICENSE_FILES = COPYING
 
-# 0001-Fix-broken-sed-call-in-configure.ac.in.patch
-LIBPQXX_AUTORECONF = YES
-
 LIBPQXX_CONF_ENV += ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libpri/Config.in b/bsp/buildroot/package/libpri/Config.in
new file mode 100644
index 00000000..de2d96fc
--- /dev/null
+++ b/bsp/buildroot/package/libpri/Config.in
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_LIBPRI
+	bool "libpri"
+	depends on BR2_USE_MMU # fork()
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_DAHDI_LINUX
+	select BR2_PACKAGE_DAHDI_TOOLS
+	help
+	  libpri is an open source library that encapsulates the
+	  protocols used to communicate over ISDN Primary Rate
+	  Interfaces (T1, E1, J1).
+
+	  http://www.asterisk.org/downloads/libpri
+
+comment "libpri needs a kernel to be built"
+	depends on BR2_USE_MMU
+	depends on !BR2_LINUX_KERNEL
+
+comment "libpri needs a toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libpri/libpri.hash b/bsp/buildroot/package/libpri/libpri.hash
new file mode 100644
index 00000000..47c4a003
--- /dev/null
+++ b/bsp/buildroot/package/libpri/libpri.hash
@@ -0,0 +1,7 @@
+# sha1 and sha256 from http://downloads.asterisk.org/pub/telephony/libpri/releases/
+sha1    63536f3300fb007dfd5fe8064406992ca938bd9a                          libpri-1.5.0.tar.gz
+sha256  ee224bc4aa65c54546bd09675c3f0b71817ce9e277332bce86989d8dcd556a24  libpri-1.5.0.tar.gz
+
+# License files, locally calculated
+sha256  fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7  LICENSE
+sha256  53b8b3aea4faec23fd9dbd4936044aca80c9b00343e6e58ee3303cec19512b33  README
diff --git a/bsp/buildroot/package/libpri/libpri.mk b/bsp/buildroot/package/libpri/libpri.mk
new file mode 100644
index 00000000..2e2d0e8a
--- /dev/null
+++ b/bsp/buildroot/package/libpri/libpri.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# libpri
+#
+################################################################################
+
+LIBPRI_VERSION = 1.5.0
+LIBPRI_SITE = http://downloads.asterisk.org/pub/telephony/libpri/releases
+
+LIBPRI_LICENSE = GPL-2.0 with OpenH323 exception
+LIBPRI_LICENSE_FILES = LICENSE README
+
+LIBPRI_DEPENDENCIES = dahdi-linux dahdi-tools
+LIBPRI_INSTALL_STAGING = YES
+
+# The Makefile default rule will always try to generate both libraries.
+# So we need to explicitly build only what we can.
+ifneq ($(BR2_SHARED_LIBS),y)
+LIBPRI_LIBS = libpri.a
+define LIBPRI_INSTALL_A
+	$(INSTALL) -D -m 0644 $(@D)/libpri.a $(1)/usr/lib/libpri.a
+endef
+endif
+
+ifneq ($(BR2_STATIC_LIBS),y)
+LIBPRI_LIBS += libpri.so.1.4
+define LIBPRI_INSTALL_SO
+	$(INSTALL) -D -m 0644 $(@D)/libpri.so.1.4 $(1)/usr/lib/libpri.so.1.4
+	ln -sf libpri.so.1.4 $(1)/usr/lib/libpri.so
+endef
+endif
+
+LIBPRI_UTILS = pridump pritest rosetest testprilib
+
+define LIBPRI_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		$(LIBPRI_LIBS) $(LIBPRI_UTILS)
+endef
+
+define LIBPRI_INSTALL_STAGING_CMDS
+	$(call LIBPRI_INSTALL_A,$(STAGING_DIR))
+	$(call LIBPRI_INSTALL_SO,$(STAGING_DIR))
+	$(INSTALL) -D -m 0644 $(@D)/libpri.h $(STAGING_DIR)/usr/include/libpri.h
+endef
+
+define LIBPRI_INSTALL_TARGET_CMDS
+	$(foreach u,$(LIBPRI_UTILS),\
+		$(INSTALL) -D -m 0755 $(@D)/$(u) $(TARGET_DIR)/usr/sbin/$(u)$(sep))
+	$(call LIBPRI_INSTALL_SO,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.hash b/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.hash
index 8211455d..b6e38e8e 100644
--- a/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.hash
+++ b/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.hash
@@ -1,2 +1,2 @@
-# From http://www.x.org/archive/current/src/everything/CHECKSUMS
-sha256 35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299 libpthread-stubs-0.3.tar.bz2
+# Locally computed
+sha256 e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733  libpthread-stubs-0.4.tar.bz2
diff --git a/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.mk b/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.mk
index 856793c4..9cf69707 100644
--- a/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.mk
+++ b/bsp/buildroot/package/libpthread-stubs/libpthread-stubs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBPTHREAD_STUBS_VERSION = 0.3
+LIBPTHREAD_STUBS_VERSION = 0.4
 LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2
 LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist
 LIBPTHREAD_STUBS_LICENSE = MIT
diff --git a/bsp/buildroot/package/libpthsem/Config.in b/bsp/buildroot/package/libpthsem/Config.in
index 3219de13..c2856c52 100644
--- a/bsp/buildroot/package/libpthsem/Config.in
+++ b/bsp/buildroot/package/libpthsem/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_LIBPTHSEM
 	bool "libpthsem"
 	depends on BR2_USE_MMU # fork()
 	help
-	  GNU pth is a user mode multi threading library. pthsem is an extend
-	  version, with support for semaphores added.
+	  GNU pth is a user mode multi threading library. pthsem is an
+	  extend version, with support for semaphores added.
 
 	  http://www.auto.tuwien.ac.at/~mkoegler/pth/
 
diff --git a/bsp/buildroot/package/libpthsem/libpthsem.mk b/bsp/buildroot/package/libpthsem/libpthsem.mk
index b8a3d7d5..dfe25af3 100644
--- a/bsp/buildroot/package/libpthsem/libpthsem.mk
+++ b/bsp/buildroot/package/libpthsem/libpthsem.mk
@@ -7,7 +7,7 @@
 LIBPTHSEM_VERSION = 2.0.8
 LIBPTHSEM_SOURCE = pthsem_$(LIBPTHSEM_VERSION).tar.gz
 LIBPTHSEM_SITE = http://www.auto.tuwien.ac.at/~mkoegler/pth
-LIBPTHSEM_LICENSE = LGPLv2.1+
+LIBPTHSEM_LICENSE = LGPL-2.1+
 LIBPTHSEM_LICENSE_FILES = COPYING
 LIBPTHSEM_AUTORECONF = YES
 LIBPTHSEM_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch b/bsp/buildroot/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch
new file mode 100644
index 00000000..3bae15c2
--- /dev/null
+++ b/bsp/buildroot/package/libpwquality/0001-Fix-build-with-disable-nls-on-platforms-without-libi.patch
@@ -0,0 +1,47 @@
+From fd1694c9d85666a39fe39e76518581b1ccd5a6c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
+Date: Thu, 2 Feb 2017 11:16:49 +0100
+Subject: [PATCH] Fix build with --disable-nls on platforms without libintl
+ included in libc.
+
+Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
+
+---
+
+Status: accepted upstream, not yet released.
+
+diff --git a/src/pwmake.c b/src/pwmake.c
+index 5b8cfb8..81f7cd3 100644
+--- a/src/pwmake.c
++++ b/src/pwmake.c
+@@ -33,9 +33,11 @@ main(int argc, char *argv[])
+         int bits;
+         void *auxerror;
+ 
++#ifdef ENABLE_NLS
+         setlocale(LC_ALL, "");
+         bindtextdomain("libpwquality", "/usr/share/locale");
+         textdomain("libpwquality");
++#endif
+ 
+         if (argc != 2) {
+                 usage(basename(argv[0]));
+diff --git a/src/pwscore.c b/src/pwscore.c
+index 219a175..24c13f2 100644
+--- a/src/pwscore.c
++++ b/src/pwscore.c
+@@ -34,9 +34,11 @@ main(int argc, char *argv[])
+         size_t len;
+         char *user = NULL;
+ 
++#ifdef ENABLE_NLS
+         setlocale(LC_ALL, "");
+         bindtextdomain("libpwquality", "/usr/share/locale");
+         textdomain("libpwquality");
++#endif
+ 
+         if (argc > 2) {
+                 usage(basename(argv[0]));
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch b/bsp/buildroot/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch
new file mode 100644
index 00000000..1b4f2426
--- /dev/null
+++ b/bsp/buildroot/package/libpwquality/0002-Fix-memory-leak-in-settings-when-using-bad-word-list.patch
@@ -0,0 +1,26 @@
+From b1f2f1f71894fa0af92041fb4d5b6146101d63e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
+Date: Thu, 2 Feb 2017 11:17:26 +0100
+Subject: [PATCH] Fix memory leak in settings when using bad word list.
+
+Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
+
+---
+
+Status: accepted upstream, not yet released.
+
+diff --git a/src/settings.c b/src/settings.c
+index 5c38b30..4b026b1 100644
+--- a/src/settings.c
++++ b/src/settings.c
+@@ -46,6 +46,7 @@ pwquality_free_settings(pwquality_settings_t *pwq)
+ {
+         if (pwq) {
+                 free(pwq->dict_path);
++                free(pwq->bad_words);
+                 free(pwq);
+         }
+ }
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/libpwquality/Config.in b/bsp/buildroot/package/libpwquality/Config.in
new file mode 100644
index 00000000..23e15157
--- /dev/null
+++ b/bsp/buildroot/package/libpwquality/Config.in
@@ -0,0 +1,20 @@
+config BR2_PACKAGE_LIBPWQUALITY
+	bool "libpwquality"
+	select BR2_PACKAGE_CRACKLIB
+	help
+	  This is a library for password quality checks and generation
+	  of random passwords that pass the checks.  This library uses
+	  the cracklib and cracklib dictionaries to perform some of
+	  the checks.
+
+	  https://github.com/libpwquality/libpwquality
+
+if BR2_PACKAGE_LIBPWQUALITY
+
+config BR2_PACKAGE_LIBPWQUALITY_TOOLS
+	bool "install tools"
+	help
+	  Install libpwquality command line tools generating/checking
+	  passwords.
+
+endif
diff --git a/bsp/buildroot/package/libpwquality/libpwquality.hash b/bsp/buildroot/package/libpwquality/libpwquality.hash
new file mode 100644
index 00000000..0e3f9e30
--- /dev/null
+++ b/bsp/buildroot/package/libpwquality/libpwquality.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	74d2ea90e103323c1f2d6a6cc9617cdae6877573eddb31aaf31a40f354cc2d2a	libpwquality-1.3.0.tar.bz2
diff --git a/bsp/buildroot/package/libpwquality/libpwquality.mk b/bsp/buildroot/package/libpwquality/libpwquality.mk
new file mode 100644
index 00000000..697af0b0
--- /dev/null
+++ b/bsp/buildroot/package/libpwquality/libpwquality.mk
@@ -0,0 +1,44 @@
+################################################################################
+#
+# libpwquality
+#
+################################################################################
+
+LIBPWQUALITY_VERSION = 1.3.0
+LIBPWQUALITY_SOURCE = libpwquality-$(LIBPWQUALITY_VERSION).tar.bz2
+LIBPWQUALITY_SITE = https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$(LIBPWQUALITY_VERSION)
+LIBPWQUALITY_LICENSE = BSD-3-Clause or GPL-2.0+
+LIBPWQUALITY_INSTALL_STAGING = YES
+LIBPWQUALITY_DEPENDENCIES = cracklib
+LIBPWQUALITY_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+LIBPWQUALITY_CONF_OPTS += --enable-python-bindings
+LIBPWQUALITY_DEPENDENCIES += python
+LIBPWQUALITY_MAKE_ENV += $(PKG_PYTHON_DISTUTILS_ENV)
+else
+LIBPWQUALITY_CONF_OPTS += --disable-python-bindings
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+LIBPWQUALITY_CONF_OPTS += --enable-pam
+LIBPWQUALITY_DEPENDENCIES += linux-pam
+else
+LIBPWQUALITY_CONF_OPTS += --disable-pam
+endif
+
+# Static link with cracklib requires -lz if zlib is enabled
+ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy)
+LIBPWQUALITY_CONF_ENV += LIBS="-lz"
+endif
+
+ifeq ($(BR2_PACKAGE_LIBPWQUALITY_TOOLS),)
+define LIBPWQUALITY_REMOVE_TOOLS
+	rm -f $(TARGET_DIR)/usr/bin/pwmake
+	rm -f $(TARGET_DIR)/usr/bin/pwscore
+endef
+
+LIBPWQUALITY_POST_INSTALL_TARGET_HOOKS += LIBPWQUALITY_REMOVE_TOOLS
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libqmi/0001-musl-compat-canonicalize_file_name.patch b/bsp/buildroot/package/libqmi/0001-musl-compat-canonicalize_file_name.patch
new file mode 100644
index 00000000..3ae1c2eb
--- /dev/null
+++ b/bsp/buildroot/package/libqmi/0001-musl-compat-canonicalize_file_name.patch
@@ -0,0 +1,61 @@
+From 8f6181b6f8dd82aa1ab1288cc7f2fd05d4a2519f Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Mon, 1 May 2017 19:55:07 -0500
+Subject: [PATCH] musl compat canonicalize_file_name()
+
+Adds an equivalent of canonicalize_file_name
+using realpath().
+
+Bug report (origin of this patch):
+https://bugs.freedesktop.org/show_bug.cgi?id=99944
+
+Bug report has been updated with suggestion to not use inline.
+
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ configure.ac                |  2 ++
+ src/libqmi-glib/qmi-utils.c | 15 +++++++++++++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c56fa3e..d835db4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -80,6 +80,8 @@ AC_SUBST(GLIB_LIBS)
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+ AC_SUBST(GLIB_MKENUMS)
+ 
++AC_CHECK_FUNCS([canonicalize_file_name])
++
+ dnl qmi-firmware-update is optional, enabled by default
+ AC_ARG_ENABLE([firmware-update],
+               AS_HELP_STRING([--enable-firmware-update],
+diff --git a/src/libqmi-glib/qmi-utils.c b/src/libqmi-glib/qmi-utils.c
+index 29e5f22..26aff9e 100644
+--- a/src/libqmi-glib/qmi-utils.c
++++ b/src/libqmi-glib/qmi-utils.c
+@@ -34,6 +34,21 @@
+ #include "qmi-utils.h"
+ #include "qmi-error-types.h"
+ 
++#ifndef HAVE_CANONICALIZE_FILE_NAME
++#include <limits.h>
++static char * canonicalize_file_name(const char *path)
++{
++       char buf[PATH_MAX] = { };
++
++       snprintf(buf, sizeof(buf) - 1, "%s", path);
++
++       if (!realpath(path, buf))
++               return NULL;
++
++       return strdup(buf);
++}
++#endif
++
+ /**
+  * SECTION:qmi-utils
+  * @title: Common utilities
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/libqmi/Config.in b/bsp/buildroot/package/libqmi/Config.in
index a0e896cc..f1d111b7 100644
--- a/bsp/buildroot/package/libqmi/Config.in
+++ b/bsp/buildroot/package/libqmi/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_LIBQMI
 	bool "libqmi"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
-	  libqmi is a glib-based library for talking to WWAN modems and devices
-	  which speak the Qualcomm MSM Interface (QMI) protocol.
+	  libqmi is a glib-based library for talking to WWAN modems and
+	  devices which speak the Qualcomm MSM Interface (QMI) protocol.
 
 	  http://www.freedesktop.org/wiki/Software/libqmi/
 
diff --git a/bsp/buildroot/package/libqmi/libqmi.hash b/bsp/buildroot/package/libqmi/libqmi.hash
index 08da1ae2..1c54231a 100644
--- a/bsp/buildroot/package/libqmi/libqmi.hash
+++ b/bsp/buildroot/package/libqmi/libqmi.hash
@@ -1,2 +1,4 @@
 # Locally computed:
-sha256  7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a  libqmi-1.16.0.tar.xz
+sha256 a0a42c55935e75a630208e2f70840bd4407f56fe1c5258f5b0f6c0aaedf88cec  libqmi-1.18.0.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/bsp/buildroot/package/libqmi/libqmi.mk b/bsp/buildroot/package/libqmi/libqmi.mk
index 825493ee..08875649 100644
--- a/bsp/buildroot/package/libqmi/libqmi.mk
+++ b/bsp/buildroot/package/libqmi/libqmi.mk
@@ -4,16 +4,44 @@
 #
 ################################################################################
 
-LIBQMI_VERSION = 1.16.0
+LIBQMI_VERSION = 1.18.0
 LIBQMI_SITE = http://www.freedesktop.org/software/libqmi
 LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz
-LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs)
-LIBQMI_LICENSE_FILES = COPYING
+LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
+LIBQMI_LICENSE_FILES = COPYING COPYING.LIB
 LIBQMI_INSTALL_STAGING = YES
+# 0001-musl-compat-canonicalize_file_name.patch
+LIBQMI_AUTORECONF = YES
 
 LIBQMI_DEPENDENCIES = libglib2
 
 # we don't want -Werror
 LIBQMI_CONF_OPTS = --enable-more-warnings=no
 
+# if libgudev available, request udev support for a better
+# qmi-firmware-update experience
+ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
+LIBQMI_DEPENDENCIES += libgudev
+LIBQMI_CONF_OPTS += --with-udev
+else
+LIBQMI_CONF_OPTS += --without-udev
+endif
+
+# if libmbim available, request QMI-over-MBIM support
+ifeq ($(BR2_PACKAGE_LIBMBIM),y)
+LIBQMI_DEPENDENCIES += libmbim
+LIBQMI_CONF_OPTS += --enable-mbim-qmux
+else
+LIBQMI_CONF_OPTS += --disable-mbim-qmux
+endif
+
+# if ModemManager available, enable MM runtime check in
+# qmi-firmware-update (note that we don't need to build-depend on
+# anything else)
+ifeq ($(BR2_PACKAGE_MODEM_MANAGER),y)
+LIBQMI_CONF_OPTS += --enable-mm-runtime-check
+else
+LIBQMI_CONF_OPTS += --disable-mm-runtime-check
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libqrencode/libqrencode.mk b/bsp/buildroot/package/libqrencode/libqrencode.mk
index 5f30e77b..8f17b895 100644
--- a/bsp/buildroot/package/libqrencode/libqrencode.mk
+++ b/bsp/buildroot/package/libqrencode/libqrencode.mk
@@ -9,7 +9,7 @@ LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz
 LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode
 LIBQRENCODE_DEPENDENCIES = host-pkgconf
 LIBQRENCODE_INSTALL_STAGING = YES
-LIBQRENCODE_LICENSE = LGPLv2.1+
+LIBQRENCODE_LICENSE = LGPL-2.1+
 LIBQRENCODE_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/bsp/buildroot/package/libraw/libraw.mk b/bsp/buildroot/package/libraw/libraw.mk
index f78ce1e0..589ff891 100644
--- a/bsp/buildroot/package/libraw/libraw.mk
+++ b/bsp/buildroot/package/libraw/libraw.mk
@@ -18,7 +18,7 @@ LIBRAW_CONF_OPTS += \
 	--disable-openmp \
 	--disable-demosaic-pack-gpl2 \
 	--disable-demosaic-pack-gpl3
-LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010
+LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0 or LibRaw Software License 27032010
 LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README
 LIBRAW_DEPENDENCIES = host-pkgconf
 LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
diff --git a/bsp/buildroot/package/libraw1394/libraw1394.mk b/bsp/buildroot/package/libraw1394/libraw1394.mk
index 7123ac74..73517ed2 100644
--- a/bsp/buildroot/package/libraw1394/libraw1394.mk
+++ b/bsp/buildroot/package/libraw1394/libraw1394.mk
@@ -9,7 +9,7 @@ LIBRAW1394_SOURCE = libraw1394-$(LIBRAW1394_VERSION).tar.xz
 LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394
 LIBRAW1394_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/libraw1394/fix-types.patch
 LIBRAW1394_INSTALL_STAGING = YES
-LIBRAW1394_LICENSE = LGPLv2.1+
+LIBRAW1394_LICENSE = LGPL-2.1+
 LIBRAW1394_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libreplaygain/libreplaygain.mk b/bsp/buildroot/package/libreplaygain/libreplaygain.mk
index 47759998..ff0950c4 100644
--- a/bsp/buildroot/package/libreplaygain/libreplaygain.mk
+++ b/bsp/buildroot/package/libreplaygain/libreplaygain.mk
@@ -10,7 +10,7 @@ LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz
 # upstream doesn't ship configure
 LIBREPLAYGAIN_AUTORECONF = YES
 LIBREPLAYGAIN_INSTALL_STAGING = YES
-LIBREPLAYGAIN_LICENSE = LGPLv2.1+
+LIBREPLAYGAIN_LICENSE = LGPL-2.1+
 LIBREPLAYGAIN_LICENSE_FILES = src/gain_analysis.c
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libressl/0001-remove-test-z-DESTDIR-from-ltmain.patch b/bsp/buildroot/package/libressl/0001-remove-test-z-DESTDIR-from-ltmain.patch
new file mode 100644
index 00000000..901a48ca
--- /dev/null
+++ b/bsp/buildroot/package/libressl/0001-remove-test-z-DESTDIR-from-ltmain.patch
@@ -0,0 +1,28 @@
+From 4317d43d74996ad7ec3270b1e786e91a19312309 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Sat, 24 Jun 2017 13:08:57 -0400
+Subject: [PATCH] remove test -z "$DESTDIR" from ltmain.sh.
+
+Without this patch, buildroot-libtool-v2.4.patch will fail to apply.
+
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ ltmain.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index 5d29bd6..6c90601 100644
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -6658,7 +6658,7 @@ func_mode_link ()
+ 	  *)
+ 	    if test "$installed" = no; then
+ 	      func_append notinst_deplibs " $lib"
+-	      test -z "$DESTDIR" && need_relink=yes
++	      need_relink=yes
+ 	    fi
+ 	    ;;
+ 	  esac
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch b/bsp/buildroot/package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch
new file mode 100644
index 00000000..ddb95340
--- /dev/null
+++ b/bsp/buildroot/package/libressl/0002-Fix-build-with-musl-and-older-Linux-kernel.patch
@@ -0,0 +1,38 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 29 Sep 2017 10:06:52 +0300
+Subject: [PATCH] Fix build with musl and older Linux kernel
+
+The musl libc carries its own copy of Linux system calls. When building
+with Linux headers older than v3.17, musl provides SYS_getrandom
+definition, but not GRND_NONBLOCK. This causes build failure for
+libressl and openntpd:
+
+getentropy_linux.c: In function 'getentropy_getrandom':
+getentropy_linux.c:205:42: error: 'GRND_NONBLOCK' undeclared (first use in this function)
+   ret = syscall(SYS_getrandom, buf, len, GRND_NONBLOCK);
+                                          ^~~~~~~~~~~~~
+
+Define GRND_NONBLOCK locally when its definition is missing to fix the
+build. There should be no run-time effect. Older kernels return ENOSYS
+for unsupported syscall().
+
+[ from upstream pull request with file location changed ]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/libressl-portable/openbsd/pull/82
+
+diff -Nuar libressl-2.5.5-orig/crypto/compat/getentropy_linux.c libressl-2.5.5/crypto/compat/getentropy_linux.c
+--- libressl-2.5.5-orig/crypto/compat/getentropy_linux.c	2017-07-09 13:59:48.000000000 +0300
++++ libressl-2.5.5/crypto/compat/getentropy_linux.c	2017-09-29 10:03:32.447958829 +0300
+@@ -194,6 +194,11 @@
+ }
+ 
+ #ifdef SYS_getrandom
++
++#ifndef GRND_NONBLOCK
++#define GRND_NONBLOCK   0x0001
++#endif
++
+ static int
+ getentropy_getrandom(void *buf, size_t len)
+ {
diff --git a/bsp/buildroot/package/libressl/libressl.hash b/bsp/buildroot/package/libressl/libressl.hash
new file mode 100644
index 00000000..555a75cf
--- /dev/null
+++ b/bsp/buildroot/package/libressl/libressl.hash
@@ -0,0 +1,2 @@
+# From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
+sha256	859edfc71019d27c448fe148e679afdd972a0baa91b21f02b2b2f5f8a84ddd2a	libressl-2.6.5.tar.gz
diff --git a/bsp/buildroot/package/libressl/libressl.mk b/bsp/buildroot/package/libressl/libressl.mk
new file mode 100644
index 00000000..466b0b83
--- /dev/null
+++ b/bsp/buildroot/package/libressl/libressl.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# libressl
+#
+################################################################################
+
+LIBRESSL_VERSION = 2.6.5
+LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
+LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code)
+LIBRESSL_LICENSE_FILES = COPYING
+LIBRESSL_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_LIBRESSL_BIN),)
+define LIBRESSL_REMOVE_BIN
+	$(RM) -f $(TARGET_DIR)/usr/bin/openssl
+endef
+LIBRESSL_POST_INSTALL_TARGET_HOOKS += LIBRESSL_REMOVE_BIN
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libroxml/libroxml.mk b/bsp/buildroot/package/libroxml/libroxml.mk
index 43d1d916..5582b387 100644
--- a/bsp/buildroot/package/libroxml/libroxml.mk
+++ b/bsp/buildroot/package/libroxml/libroxml.mk
@@ -7,7 +7,7 @@
 LIBROXML_VERSION = 2.3.0
 LIBROXML_SITE = http://download.libroxml.net/pool/v2.x
 LIBROXML_INSTALL_STAGING = YES
-LIBROXML_LICENSE = LGPLv2.1+ with static link exception
+LIBROXML_LICENSE = LGPL-2.1+ with static link exception
 LIBROXML_LICENSE_FILES = License.txt
 
 LIBROXML_CONF_OPTS = --disable-silent-rules
diff --git a/bsp/buildroot/package/librsvg/Config.in b/bsp/buildroot/package/librsvg/Config.in
index 703428dc..ffb0287d 100644
--- a/bsp/buildroot/package/librsvg/Config.in
+++ b/bsp/buildroot/package/librsvg/Config.in
@@ -1,5 +1,10 @@
 config BR2_PACKAGE_LIBRSVG
 	bool "librsvg"
+	depends on BR2_USE_WCHAR # glib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	depends on BR2_INSTALL_LIBSTDCPP # pango
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	select BR2_PACKAGE_CAIRO
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_GDK_PIXBUF
@@ -7,11 +12,6 @@ config BR2_PACKAGE_LIBRSVG
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_PANGO
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	depends on BR2_USE_MMU # glib2
-	depends on BR2_INSTALL_LIBSTDCPP # pango
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
 	help
 	  The rsvg library is an efficient renderer for Scalable
 	  Vector Graphics (SVG) pictures.
diff --git a/bsp/buildroot/package/librsvg/librsvg.mk b/bsp/buildroot/package/librsvg/librsvg.mk
index 285f6635..4f563ce6 100644
--- a/bsp/buildroot/package/librsvg/librsvg.mk
+++ b/bsp/buildroot/package/librsvg/librsvg.mk
@@ -14,7 +14,7 @@ HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no
 LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \
 	$(if $(BR2_PACKAGE_LIBGTK3),libgtk3)
 HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango
-LIBRSVG_LICENSE = LGPLv2+
+LIBRSVG_LICENSE = LGPL-2.0+
 LIBRSVG_LICENSE_FILES = COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch b/bsp/buildroot/package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch
new file mode 100644
index 00000000..af5d28c5
--- /dev/null
+++ b/bsp/buildroot/package/librsync/0001-CMakeLists.txt-Don-t-require-a-C-compiler.patch
@@ -0,0 +1,33 @@
+From c1af3e1b926fa04dbddc2d30586ff26026083134 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Tue, 26 Sep 2017 19:06:43 +0200
+Subject: [PATCH] CMakeLists.txt: Don't require a C++ compiler
+
+By default, CMake assumes that the project is using both C and C++.  By
+explicitly passing 'C' as argument of the project() macro, we tell CMake
+that only C is used, which prevents CMake from erroring out if a C++
+compiler doesn't exist.
+
+Patch sent upstream: https://github.com/librsync/librsync/pull/116
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 85536e3..7fe1eda 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,7 @@
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ 
+-project(librsync)
++project(librsync C)
+ cmake_minimum_required(VERSION 2.6)
+ 
+ INCLUDE(CMakeDependentOption)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/librsync/Config.in b/bsp/buildroot/package/librsync/Config.in
index 652f0cb2..6957ddcc 100644
--- a/bsp/buildroot/package/librsync/Config.in
+++ b/bsp/buildroot/package/librsync/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_LIBRSYNC
 	bool "librsync"
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_POPT
@@ -9,3 +10,6 @@ config BR2_PACKAGE_LIBRSYNC
 	  rsync utility and is used in rproxy.
 
 	  https://github.com/librsync/librsync
+
+comment "librsync needs a toolchain w/ dynamic library support"
+	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/librsync/librsync.mk b/bsp/buildroot/package/librsync/librsync.mk
index 3031f1a1..07b684a2 100644
--- a/bsp/buildroot/package/librsync/librsync.mk
+++ b/bsp/buildroot/package/librsync/librsync.mk
@@ -6,7 +6,7 @@
 
 LIBRSYNC_VERSION = v2.0.0
 LIBRSYNC_SITE = $(call github,librsync,librsync,$(LIBRSYNC_VERSION))
-LIBRSYNC_LICENSE = LGPLv2.1+
+LIBRSYNC_LICENSE = LGPL-2.1+
 LIBRSYNC_LICENSE_FILES = COPYING
 LIBRSYNC_INSTALL_STAGING = YES
 LIBRSYNC_DEPENDENCIES = zlib bzip2 popt
diff --git a/bsp/buildroot/package/librtas/Config.in b/bsp/buildroot/package/librtas/Config.in
index fb0ac766..11660eb2 100644
--- a/bsp/buildroot/package/librtas/Config.in
+++ b/bsp/buildroot/package/librtas/Config.in
@@ -3,9 +3,10 @@ config BR2_PACKAGE_LIBRTAS
 	depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
-	  The librtas package provides an interface for Run-Time Abstraction
-	  Services (RTAS) calls on PAPR platforms. The libraries allow users to
-	  examine and manipulate hardware, and parse RTAS events.
+	  The librtas package provides an interface for Run-Time
+	  Abstraction Services (RTAS) calls on PAPR platforms.
+	  The libraries allow users to examine and manipulate hardware,
+	  and parse RTAS events.
 
 	  http://librtas.sourceforge.net/
 
diff --git a/bsp/buildroot/package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch b/bsp/buildroot/package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch
new file mode 100644
index 00000000..b663d08b
--- /dev/null
+++ b/bsp/buildroot/package/librtlsdr/0002-fix-builds-with-newer-compilers-C-standards.patch
@@ -0,0 +1,68 @@
+From ea6a86d8e792430faa3a8161ee99f2bc392875d1 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 3 Feb 2017 15:44:18 -1000
+Subject: [PATCH] fix builds with newer compilers & C standards
+
+The meaning of "inline" has changed when "static" is not used.
+Since none of these functions are used outside of their respective
+files, mark them as static to avoid build errors where funcs are
+not inlined (based on compiler flags too).
+
+Upstream status: pull request #38
+
+Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
+---
+ src/rtl_adsb.c  | 8 ++++----
+ src/rtl_power.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c
+index e611e78..a3bfa7f 100644
+--- a/src/rtl_adsb.c
++++ b/src/rtl_adsb.c
+@@ -182,7 +182,7 @@ int magnitute(uint8_t *buf, int len)
+ 	return len/2;
+ }
+ 
+-inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
++static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
+ /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
+ {
+ 	int bit, bit_p;
+@@ -223,17 +223,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d
+ 	return BADSAMPLE;
+ }
+ 
+-inline uint16_t min16(uint16_t a, uint16_t b)
++static inline uint16_t min16(uint16_t a, uint16_t b)
+ {
+ 	return a<b ? a : b;
+ }
+ 
+-inline uint16_t max16(uint16_t a, uint16_t b)
++static inline uint16_t max16(uint16_t a, uint16_t b)
+ {
+ 	return a>b ? a : b;
+ }
+ 
+-inline int preamble(uint16_t *buf, int i)
++static inline int preamble(uint16_t *buf, int i)
+ /* returns 0/1 for preamble at index i */
+ {
+ 	int i2;
+diff --git a/src/rtl_power.c b/src/rtl_power.c
+index aa7a138..a7a43bb 100644
+--- a/src/rtl_power.c
++++ b/src/rtl_power.c
+@@ -249,7 +249,7 @@ void sine_table(int size)
+ 	}
+ }
+ 
+-inline int16_t FIX_MPY(int16_t a, int16_t b)
++static inline int16_t FIX_MPY(int16_t a, int16_t b)
+ /* fixed point multiply and scale */
+ {
+ 	int c = ((int)a * (int)b) >> 14;
+-- 
+2.13.0
+
diff --git a/bsp/buildroot/package/librtlsdr/Config.in b/bsp/buildroot/package/librtlsdr/Config.in
index 1e217bcf..c2bf1a9f 100644
--- a/bsp/buildroot/package/librtlsdr/Config.in
+++ b/bsp/buildroot/package/librtlsdr/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBRTLSDR
 	bool "librtlsdr"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Library and command line programs for accessing
 	  RTL2832U SDR dongles.
diff --git a/bsp/buildroot/package/librtlsdr/librtlsdr.mk b/bsp/buildroot/package/librtlsdr/librtlsdr.mk
index 51ecabe1..ca0a4382 100644
--- a/bsp/buildroot/package/librtlsdr/librtlsdr.mk
+++ b/bsp/buildroot/package/librtlsdr/librtlsdr.mk
@@ -6,7 +6,7 @@
 
 LIBRTLSDR_VERSION = v0.5.3
 LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION))
-LIBRTLSDR_LICENSE = GPLv2+
+LIBRTLSDR_LICENSE = GPL-2.0+
 LIBRTLSDR_LICENSE_FILES = COPYING
 LIBRTLSDR_INSTALL_STAGING = YES
 LIBRTLSDR_DEPENDENCIES = libusb
diff --git a/bsp/buildroot/package/libsamplerate/libsamplerate.mk b/bsp/buildroot/package/libsamplerate/libsamplerate.mk
index 802b5b14..c107650c 100644
--- a/bsp/buildroot/package/libsamplerate/libsamplerate.mk
+++ b/bsp/buildroot/package/libsamplerate/libsamplerate.mk
@@ -9,9 +9,13 @@ LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC
 LIBSAMPLERATE_INSTALL_STAGING = YES
 LIBSAMPLERATE_DEPENDENCIES = host-pkgconf
 LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name=''
-LIBSAMPLERATE_LICENSE = BSD-2c
+LIBSAMPLERATE_LICENSE = BSD-2-Clause
 LIBSAMPLERATE_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
+LIBSAMPLERATE_DEPENDENCIES += alsa-lib
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSNDFILE),y)
 LIBSAMPLERATE_DEPENDENCIES += libsndfile
 endif
diff --git a/bsp/buildroot/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch b/bsp/buildroot/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch
new file mode 100644
index 00000000..a023a6fe
--- /dev/null
+++ b/bsp/buildroot/package/libscrypt/0001-Allow-adding-options-to-CFLAGS-and-LDFLAGS-variables.patch
@@ -0,0 +1,34 @@
+From 097c5d9248f4afd34c73de5aba01a143ef784257 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20S=C3=B8rensen?= <stefan.sorensen@spectralink.com>
+Date: Tue, 14 Mar 2017 09:23:51 +0100
+Subject: [PATCH] Allow adding options to CFLAGS and LDFLAGS variables
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This also removes a number of hard-coded CFLAGS, leaving it up to the
+user to pass appropriate optimization/hardening flags.
+
+Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 7022a4a..3098a9a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,8 +5,8 @@ MAKE_DIR     ?= install -d
+ INSTALL_DATA ?= install
+ 
+ CC?=gcc
+-CFLAGS?=-O2 -Wall -g -D_FORTIFY_SOURCE=2 -fstack-protector -fPIC
+-LDFLAGS?=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
++override CFLAGS+=-fPIC
++override LDFLAGS+=-Wl,-z,now -Wl,-z,relro -Wl,-soname,libscrypt.so.0 -Wl,--version-script=libscrypt.version
+ CFLAGS_EXTRA?=-Wl,-rpath=.
+ 
+ all: reference
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/libscrypt/Config.in b/bsp/buildroot/package/libscrypt/Config.in
new file mode 100644
index 00000000..b467fd6e
--- /dev/null
+++ b/bsp/buildroot/package/libscrypt/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LIBSCRYPT
+	bool "libscrypt"
+	# Unconditionally builds a shared library
+	depends on !BR2_STATIC_LIBS
+	help
+	  This is a library that implements the secure password
+	  hashing function "scrypt".
+
+	  http://www.lolware.net/libscrypt.html
+
+comment "libscrypt needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libscrypt/libscrypt.hash b/bsp/buildroot/package/libscrypt/libscrypt.hash
new file mode 100644
index 00000000..bf3f4411
--- /dev/null
+++ b/bsp/buildroot/package/libscrypt/libscrypt.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	68e377e79745c10d489b759b970e52d819dbb80dd8ca61f8c975185df3f457d3	libscrypt-v1.21.tar.gz
diff --git a/bsp/buildroot/package/libscrypt/libscrypt.mk b/bsp/buildroot/package/libscrypt/libscrypt.mk
new file mode 100644
index 00000000..6086ea95
--- /dev/null
+++ b/bsp/buildroot/package/libscrypt/libscrypt.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# libscrypt
+#
+################################################################################
+
+LIBSCRYPT_VERSION = v1.21
+LIBSCRYPT_SITE = $(call github,technion,libscrypt,$(LIBSCRYPT_VERSION))
+LIBSCRYPT_LICENSE = BSD-2-Clause
+LIBSCRYPT_LICENSE_FILES = LICENSE
+LIBSCRYPT_INSTALL_STAGING = YES
+
+define LIBSCRYPT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define LIBSCRYPT_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \
+		DESTDIR=$(STAGING_DIR) install
+endef
+
+define LIBSCRYPT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=/usr \
+		DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/libseccomp/Config.in b/bsp/buildroot/package/libseccomp/Config.in
index ddfe9f07..d3b4bb81 100644
--- a/bsp/buildroot/package/libseccomp/Config.in
+++ b/bsp/buildroot/package/libseccomp/Config.in
@@ -1,22 +1,28 @@
+config BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS
+	bool
+	default y if BR2_aarch64
+	default y if BR2_arm || BR2_armeb
+	default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	default y if BR2_i386 || BR2_x86_64
+	default y if BR2_powerpc64 || BR2_powerpc
+
 config BR2_PACKAGE_LIBSECCOMP
 	bool "libseccomp"
-	depends on BR2_aarch64 || BR2_mips || BR2_mipsel || BR2_mips64 || \
-		BR2_mips64el || BR2_i386 || BR2_x86_64 || BR2_powerpc64 || \
-		BR2_powerpc
+	depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 	help
 	  High level interface to the Linux Kernel's seccomp filter
 
-	  The libseccomp library provides an easy to use, platform independent,
-	  interface to the Linux Kernel's syscall filtering mechanism: seccomp.
-	  The libseccomp API is designed to abstract away the underlying BPF
-	  based syscall filter language and present a more conventional
-	  function-call based filtering interface that should be familiar to,
-	  and easily adopted by application developers.
+	  The libseccomp library provides an easy to use, platform
+	  independent, interface to the Linux Kernel's syscall filtering
+	  mechanism: seccomp. The libseccomp API is designed to abstract
+	  away the underlying BPF based syscall filter language and
+	  present a more conventional function-call based filtering
+	  interface that should be familiar to, and easily adopted by
+	  application developers.
 
 	  https://github.com/seccomp/libseccomp
 
 comment "libseccomp needs a toolchain w/ headers >= 3.12"
-	depends on BR2_aarch64 || BR2_mips || BR2_mipsel || BR2_mips64 || \
-		BR2_mips64el || BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
diff --git a/bsp/buildroot/package/libseccomp/libseccomp.mk b/bsp/buildroot/package/libseccomp/libseccomp.mk
index 03fc6cf8..9a241a55 100644
--- a/bsp/buildroot/package/libseccomp/libseccomp.mk
+++ b/bsp/buildroot/package/libseccomp/libseccomp.mk
@@ -6,7 +6,7 @@
 
 LIBSECCOMP_VERSION = v2.3.1
 LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION))
-LIBSECCOMP_LICENSE = LGPLv2.1
+LIBSECCOMP_LICENSE = LGPL-2.1
 LIBSECCOMP_LICENSE_FILES = LICENSE
 LIBSECCOMP_INSTALL_STAGING = YES
 LIBSECCOMP_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libsecret/Config.in b/bsp/buildroot/package/libsecret/Config.in
index 70f1fe7e..0539e5da 100644
--- a/bsp/buildroot/package/libsecret/Config.in
+++ b/bsp/buildroot/package/libsecret/Config.in
@@ -1,14 +1,14 @@
 config BR2_PACKAGE_LIBSECRET
 	bool "libsecret"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # gettext dep in libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
 	help
-	  libsecret is a library for storing and retrieving passwords and other
-	  secrets. It communicates with the "Secret Service" using DBus.
-	  gnome-keyring and ksecretservice are both implementations of a Secret
-	  Service.
+	  libsecret is a library for storing and retrieving passwords
+	  and other secrets. It communicates with the "Secret Service"
+	  using DBus. gnome-keyring and ksecretservice are both
+	  implementations of a Secret Service.
 
 	  https://wiki.gnome.org/Libsecret
 
diff --git a/bsp/buildroot/package/libsecret/libsecret.mk b/bsp/buildroot/package/libsecret/libsecret.mk
index 20a217f1..111b553f 100644
--- a/bsp/buildroot/package/libsecret/libsecret.mk
+++ b/bsp/buildroot/package/libsecret/libsecret.mk
@@ -16,7 +16,7 @@ LIBSECRET_CONF_OPTS = \
 	--disable-coverage \
 	--enable-introspection=no \
 	--enable-vala=no
-LIBSECRET_LICENSE = LGPLv2.1+
+LIBSECRET_LICENSE = LGPL-2.1+
 LIBSECRET_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
diff --git a/bsp/buildroot/package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch b/bsp/buildroot/package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch
deleted file mode 100644
index 3bda6075..00000000
--- a/bsp/buildroot/package/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e0803c0bdbb1abf06b6b5bb1b52fdb733505b8f7 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 25 Jan 2017 22:41:02 +1300
-Subject: [PATCH] src/regex.c: support old compilers for the endian
- check
-
-libselinux 2.6 has added some code in regex.c that uses __BYTE_ORDER__
-to determine the system endianness. Unfortunately, this definition
-provided directly by the compiler doesn't exist in older gcc versions
-such as gcc 4.4.
-
-In order to address this, this commit extends the logic to use
-<endian.h> definitions if __BYTE_ORDER__ is not provided by the
-compiler. This allows libselinux to build properly with gcc 4.4.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/regex.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/regex.c b/src/regex.c
-index a3b427b..0c5ad27 100644
---- a/src/regex.c
-+++ b/src/regex.c
-@@ -13,7 +13,18 @@
- #endif
- 
- #ifndef __BYTE_ORDER__
--#error __BYTE_ORDER__ not defined. Unable to determine endianness.
-+
-+/* If the compiler doesn't define __BYTE_ORDER__, try to use the C
-+ * library <endian.h> header definitions. */
-+#include <endian.h>
-+#ifndef __BYTE_ORDER
-+#error Neither __BYTE_ORDER__ nor __BYTE_ORDER defined. Unable to determine endianness.
-+#endif
-+
-+#define __ORDER_LITTLE_ENDIAN __LITTLE_ENDIAN
-+#define __ORDER_BIG_ENDIAN __BIG_ENDIAN
-+#define __BYTE_ORDER__ __BYTE_ORDER
-+
- #endif
- 
- #ifdef USE_PCRE2
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/libselinux/0003-libselinux-build-follow-standard-semantics-for-DESTD.patch b/bsp/buildroot/package/libselinux/0003-libselinux-build-follow-standard-semantics-for-DESTD.patch
new file mode 100644
index 00000000..089eef41
--- /dev/null
+++ b/bsp/buildroot/package/libselinux/0003-libselinux-build-follow-standard-semantics-for-DESTD.patch
@@ -0,0 +1,137 @@
+libselinux: build: follow standard semantics for DESTDIR and PREFIX
+
+This patch solves the following issues:
+- The pkg-config files generates odd paths when using DESTDIR without PREFIX
+- DESTDIR is needed during compile time to compute library and header paths which it should not.
+- Installing with both DESTDIR and PREFIX set gives us odd paths
+- Make usage of DESTDIR and PREFIX more standard
+
+Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
+
+diff -durN libselinux.orig/include/Makefile libselinux/include/Makefile
+--- libselinux.orig/include/Makefile	2018-01-12 12:42:30.898709792 +0100
++++ libselinux/include/Makefile	2018-01-12 10:02:57.745478435 +0100
+@@ -1,6 +1,6 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-INCDIR ?= $(PREFIX)/include/selinux
++PREFIX ?= /usr
++INCDIR = $(DESTDIR)$(PREFIX)/include/selinux
+ 
+ all:
+ 
+diff -durN libselinux.orig/man/Makefile libselinux/man/Makefile
+--- libselinux.orig/man/Makefile	2018-01-12 12:42:30.898709792 +0100
++++ libselinux/man/Makefile	2018-01-12 10:02:57.745478435 +0100
+@@ -1,7 +1,8 @@
+ # Installation directories.
+-MAN8DIR ?= $(DESTDIR)/usr/share/man/man8
+-MAN5DIR ?= $(DESTDIR)/usr/share/man/man5
+-MAN3DIR ?= $(DESTDIR)/usr/share/man/man3
++PREFIX	?= /usr
++MAN8DIR ?= $(DESTDIR)$(PREFIX)/share/man/man8
++MAN5DIR ?= $(DESTDIR)$(PREFIX)/share/man/man5
++MAN3DIR ?= $(DESTDIR)$(PREFIX)/share/man/man3
+ 
+ all:
+ 
+diff -durN libselinux.orig/src/libselinux.pc.in libselinux/src/libselinux.pc.in
+--- libselinux.orig/src/libselinux.pc.in	2018-01-12 12:42:30.905376458 +0100
++++ libselinux/src/libselinux.pc.in	2018-01-12 10:02:57.745478435 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@libdir@
++libdir=@libdir@
+ includedir=@includedir@
+ 
+ Name: libselinux
+diff -durN libselinux.orig/src/Makefile libselinux/src/Makefile
+--- libselinux.orig/src/Makefile	2018-01-12 12:42:30.902043126 +0100
++++ libselinux/src/Makefile	2018-01-12 10:02:57.745478435 +0100
+@@ -8,10 +8,10 @@
+ PKG_CONFIG ?= pkg-config
+ 
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
++PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/lib
+-SHLIBDIR ?= $(DESTDIR)/lib
+ INCLUDEDIR ?= $(PREFIX)/include
++LIBINSTALL = $(DESTDIR)$(LIBDIR)
+ PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
+ PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX))
+ PYSITEDIR ?= $(DESTDIR)$(shell $(PYTHON) -c 'import site; print(site.getsitepackages()[0])')
+@@ -19,8 +19,6 @@
+ RUBYINC ?= $(shell $(RUBY) -e 'puts "-I" + RbConfig::CONFIG["rubyarchhdrdir"] + " -I" + RbConfig::CONFIG["rubyhdrdir"]')
+ RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]')
+ RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]')
+-LIBBASE ?= $(shell basename $(LIBDIR))
+-LIBSEPOLA ?= $(LIBDIR)/libsepol.a
+ 
+ VERSION = $(shell cat ../VERSION)
+ LIBVERSION = 1
+@@ -148,7 +146,7 @@
+ 	ln -sf $@ $(TARGET)
+ 
+ $(LIBPC): $(LIBPC).in ../VERSION
+-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
++	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+ 
+ selinuxswig_python_exception.i: ../include/selinux/selinux.h
+ 	bash -e exception.sh > $@ || (rm -f $@ ; false)
+@@ -156,8 +154,8 @@
+ $(AUDIT2WHYLOBJ): audit2why.c
+ 	$(CC) $(filter-out -Werror, $(CFLAGS)) $(PYINC) -fPIC -DSHARED -c -o $@ $<
+ 
+-$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ) $(LIBSEPOLA)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(PYLIBS)
++$(AUDIT2WHYSO): $(AUDIT2WHYLOBJ)
++	$(CC) $(CFLAGS) $(LDFLAGS) -L. -shared -o $@ $^ -lselinux $(PYLIBS) -l:libsepol.a
+ 
+ %.o:  %.c policy.h
+ 	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
+@@ -177,13 +175,13 @@
+ 	$(SWIG) $<
+ 
+ install: all 
+-	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
+-	install -m 644 $(LIBA) $(LIBDIR)
+-	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
+-	install -m 755 $(LIBSO) $(SHLIBDIR)
+-	test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
+-	install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
+-	ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
++	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
++	install -m 644 $(LIBA) $(LIBINSTALL)
++	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
++	install -m 755 $(LIBSO) $(LIBINSTALL)
++	test -d $(LIBINSTALL)/pkgconfig || install -m 755 -d $(LIBINSTALL)/pkgconfig
++	install -m 644 $(LIBPC) $(LIBINSTALL)/pkgconfig
++	ln -sf --relative $(LIBINSTALL)/$(LIBSO) $(LIBINSTALL)/$(TARGET)
+ 
+ install-pywrap: pywrap
+ 	test -d $(PYSITEDIR)/selinux || install -m 755 -d $(PYSITEDIR)/selinux
+@@ -196,7 +194,7 @@
+ 	install -m 755 $(SWIGRUBYSO) $(RUBYINSTALL)/selinux.so
+ 
+ relabel:
+-	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
++	/sbin/restorecon $(LIBINSTALL)/$(LIBSO)
+ 
+ clean-pywrap:
+ 	-rm -f $(SWIGLOBJ) $(SWIGSO) $(AUDIT2WHYLOBJ) $(AUDIT2WHYSO)
+diff -durN libselinux.orig/utils/Makefile libselinux/utils/Makefile
+--- libselinux.orig/utils/Makefile	2018-01-12 12:42:30.905376458 +0100
++++ libselinux/utils/Makefile	2018-01-12 10:02:57.745478435 +0100
+@@ -1,8 +1,6 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-LIBDIR ?= $(PREFIX)/lib
+-SBINDIR ?= $(PREFIX)/sbin
+-INCLUDEDIR ?= $(PREFIX)/include
++PREFIX ?= /usr
++SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin
+ 
+ OS ?= $(shell uname)
+ 
diff --git a/bsp/buildroot/package/libselinux/0003-revert-ln-relative.patch b/bsp/buildroot/package/libselinux/0003-revert-ln-relative.patch
deleted file mode 100644
index b8ad0700..00000000
--- a/bsp/buildroot/package/libselinux/0003-revert-ln-relative.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile: revert libselinux: use ln --relative to create .so symlinks
-
-This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998
-
-ln --relative is too recent to be available in all distributions,
-especially enterprise-grade distros that can stick around as long as
-they are maintained (up to 10 years in some cases?).
-
-For the sake of Buildroot, revert the upstream patch.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN a/src/Makefile b/src/Makefile
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -151,7 +151,7 @@
- 	install -m 755 $(LIBSO) $(SHLIBDIR)
- 	test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
- 	install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
--	ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
-+	cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
- 
- install-pywrap: pywrap
- 	test -d $(PYLIBDIR)/site-packages/selinux || install -m 755 -d $(PYLIBDIR)/site-packages/selinux
diff --git a/bsp/buildroot/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch b/bsp/buildroot/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch
new file mode 100644
index 00000000..88e3a793
--- /dev/null
+++ b/bsp/buildroot/package/libselinux/0004-Fix-build-break-around-__atomic_-with-GCC-4.7.patch
@@ -0,0 +1,70 @@
+From abe76789f8e7ce61b357f693eaed5b28feab5ce2 Mon Sep 17 00:00:00 2001
+From: Hollis Blanchard <hollis_blanchard@mentor.com>
+Date: Mon, 13 Aug 2018 12:11:33 -0700
+Subject: [PATCH] Fix build break around __atomic_*() with GCC<4.7
+
+The __atomic_* GCC primitives were introduced in GCC 4.7, but Red Hat
+Enterprise Linux 6.x (for example) provides GCC 4.4. Tweak the current code to
+use the (most conservative) __sync_synchronize() primitive provided by those
+older GCC versions.
+
+(Really, no __atomic or __sync operations are needed here at all, since POSIX
+4.12 "Memory Synchronization" says pthread_mutex_lock() and
+pthread_mutex_unlock() "synchronize memory with respect to other threads"...)
+
+Signed-off-by: Hollis Blanchard <hollis_blanchard@mentor.com>
+---
+ src/label_file.h | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/src/label_file.h b/src/label_file.h
+index 2fa85474..47859baf 100644
+--- a/src/label_file.h
++++ b/src/label_file.h
+@@ -351,8 +351,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec,
+ 	 * init_routine does not take a parameter, it's not possible
+ 	 * to use, so we generate the same effect with atomics and a
+ 	 * mutex */
++#ifdef __ATOMIC_RELAXED
+ 	regex_compiled =
+ 		__atomic_load_n(&spec->regex_compiled, __ATOMIC_ACQUIRE);
++#else
++	/* GCC <4.7 */
++	__sync_synchronize();
++	regex_compiled = spec->regex_compiled;
++#endif
+ 	if (regex_compiled) {
+ 		return 0; /* already done */
+ 	}
+@@ -360,8 +366,14 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec,
+ 	__pthread_mutex_lock(&spec->regex_lock);
+ 	/* Check if another thread compiled the regex while we waited
+ 	 * on the mutex */
++#ifdef __ATOMIC_RELAXED
+ 	regex_compiled =
+ 		__atomic_load_n(&spec->regex_compiled, __ATOMIC_ACQUIRE);
++#else
++	/* GCC <4.7 */
++	__sync_synchronize();
++	regex_compiled = spec->regex_compiled;
++#endif
+ 	if (regex_compiled) {
+ 		__pthread_mutex_unlock(&spec->regex_lock);
+ 		return 0;
+@@ -404,7 +416,13 @@ static inline int compile_regex(struct saved_data *data, struct spec *spec,
+ 	}
+ 
+ 	/* Done. */
++#ifdef __ATOMIC_RELAXED
+ 	__atomic_store_n(&spec->regex_compiled, true, __ATOMIC_RELEASE);
++#else
++	/* GCC <4.7 */
++	spec->regex_compiled = true;
++	__sync_synchronize();
++#endif
+ 	__pthread_mutex_unlock(&spec->regex_lock);
+ 	return 0;
+ }
+-- 
+2.13.0
+
diff --git a/bsp/buildroot/package/libselinux/0004-revert-ln-relative.patch b/bsp/buildroot/package/libselinux/0004-revert-ln-relative.patch
new file mode 100644
index 00000000..f72afa1b
--- /dev/null
+++ b/bsp/buildroot/package/libselinux/0004-revert-ln-relative.patch
@@ -0,0 +1,24 @@
+Makefile: revert libselinux: use ln --relative to create .so symlinks
+
+This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998
+
+ln --relative is too recent to be available in all distributions,
+especially enterprise-grade distros that can stick around as long as
+they are maintained (up to 10 years in some cases?).
+
+For the sake of Buildroot, revert the upstream patch.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durNw libselinux-2.7.orig/src/Makefile libselinux-2.7/src/Makefile
+--- libselinux-2.7.orig/src/Makefile	2018-01-15 20:53:50.168525700 +0100
++++ libselinux-2.7/src/Makefile	2018-01-15 20:55:27.061858005 +0100
+@@ -181,7 +181,7 @@
+ 	install -m 755 $(LIBSO) $(LIBINSTALL)
+ 	test -d $(LIBINSTALL)/pkgconfig || install -m 755 -d $(LIBINSTALL)/pkgconfig
+ 	install -m 644 $(LIBPC) $(LIBINSTALL)/pkgconfig
+-	ln -sf --relative $(LIBINSTALL)/$(LIBSO) $(LIBINSTALL)/$(TARGET)
++	cd $(LIBINSTALL) && ln -sf $(LIBSO) $(TARGET)
+ 
+ install-pywrap: pywrap
+ 	test -d $(PYSITEDIR)/selinux || install -m 755 -d $(PYSITEDIR)/selinux
diff --git a/bsp/buildroot/package/libselinux/Config.in b/bsp/buildroot/package/libselinux/Config.in
index c88669b4..6be816db 100644
--- a/bsp/buildroot/package/libselinux/Config.in
+++ b/bsp/buildroot/package/libselinux/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_LIBSELINUX
 	bool "libselinux"
-	select BR2_PACKAGE_LIBSEPOL
-	select BR2_PACKAGE_PCRE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	# Uses <fts.h>, not available in musl or uClibc
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	# Toolchain issue: "fixup not contained within frag"
 	depends on !BR2_arc
+	select BR2_PACKAGE_LIBSEPOL
+	select BR2_PACKAGE_PCRE
 	help
 	  libselinux is the runtime SELinux library that provides
 	  interfaces (e.g. library functions for the SELinux kernel
diff --git a/bsp/buildroot/package/libselinux/libselinux.hash b/bsp/buildroot/package/libselinux/libselinux.hash
index 76130b2d..3c60d511 100644
--- a/bsp/buildroot/package/libselinux/libselinux.hash
+++ b/bsp/buildroot/package/libselinux/libselinux.hash
@@ -1,2 +1,2 @@
-# Locally computed
-sha256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a libselinux-2.6.tar.gz
+# From: https://github.com/SELinuxProject/selinux/wiki/Releases
+sha256 d0fec0769b3ad60aa7baf9b9a4b7a056827769dc2dadda0dc0eb59b3d1c18c57 libselinux-2.7.tar.gz
diff --git a/bsp/buildroot/package/libselinux/libselinux.mk b/bsp/buildroot/package/libselinux/libselinux.mk
index 6bf1b432..b3d48f71 100644
--- a/bsp/buildroot/package/libselinux/libselinux.mk
+++ b/bsp/buildroot/package/libselinux/libselinux.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSELINUX_VERSION = 2.6
-LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
+LIBSELINUX_VERSION = 2.7
+LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
 LIBSELINUX_LICENSE = Public Domain
 LIBSELINUX_LICENSE_FILES = LICENSE
 
@@ -20,16 +20,45 @@ LIBSELINUX_MAKE_OPTS = \
 	LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" \
 	ARCH=$(KERNEL_ARCH)
 
-define LIBSELINUX_BUILD_CMDS
-	# DESTDIR is needed during the compile to compute library and
-	# header paths.
+LIBSELINUX_MAKE_INSTALL_TARGETS = install
+
+ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y)
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+LIBSELINUX_DEPENDENCIES += python3 host-swig
+LIBSELINUX_PYINC = -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m
+LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
+else ifeq ($(BR2_PACKAGE_PYTHON),y)
+LIBSELINUX_DEPENDENCIES += python host-swig
+LIBSELINUX_PYINC = -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
+LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
+endif
+
+LIBSELINUX_MAKE_OPTS += \
+	PYINC="$(LIBSELINUX_PYINC)" \
+	PYSITEDIR=$(TARGET_DIR)/usr/lib/$(LIBSELINUX_PYLIBVER)/site-packages \
+	SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/"
+
+LIBSELINUX_MAKE_INSTALL_TARGETS += install-pywrap
+
+# dependencies are broken and result in file truncation errors at link
+# time if the Python bindings are built through the same make
+# invocation as the rest of the library.
+define LIBSELINUX_BUILD_PYTHON_BINDINGS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all
+		$(LIBSELINUX_MAKE_OPTS) swigify pywrap
+endef
+endif # python || python3
+
+define LIBSELINUX_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		$(LIBSELINUX_MAKE_OPTS) all
+	$(LIBSELINUX_BUILD_PYTHON_BINDINGS)
 endef
 
 define LIBSELINUX_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install
+		$(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) \
+		$(LIBSELINUX_MAKE_INSTALL_TARGETS)
 endef
 
 define LIBSELINUX_INSTALL_TARGET_CMDS
@@ -46,40 +75,37 @@ HOST_LIBSELINUX_DEPENDENCIES = \
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 HOST_LIBSELINUX_DEPENDENCIES += host-python3
-HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/
+HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/
 HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
 else
 HOST_LIBSELINUX_DEPENDENCIES += host-python
-HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/
+HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/
 HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
 endif
 
 HOST_LIBSELINUX_MAKE_OPTS = \
 	$(HOST_CONFIGURE_OPTS) \
+	PREFIX=$(HOST_DIR) \
 	LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \
 	PYINC="$(HOST_LIBSELINUX_PYINC)" \
-	PYSITEDIR="$(HOST_DIR)/usr/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \
-	SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/"
+	PYSITEDIR="$(HOST_DIR)/lib/$(HOST_LIBSELINUX_PYLIBVER)/site-packages" \
+	SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/"
 
 define HOST_LIBSELINUX_BUILD_CMDS
-	# DESTDIR is needed during the compile to compute library and
-	# header paths.
 	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \
-		$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \
-		SHLIBDIR=$(HOST_DIR)/usr/lib all
+		$(HOST_LIBSELINUX_MAKE_OPTS) all
 	# Generate python interface wrapper
 	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \
-		$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap
+		$(HOST_LIBSELINUX_MAKE_OPTS) swigify pywrap
 endef
 
 define HOST_LIBSELINUX_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \
-		SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/usr/sbin install
-	(cd $(HOST_DIR)/usr/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so)
+		$(HOST_LIBSELINUX_MAKE_OPTS) install
+	ln -sf libselinux.so.1 $(HOST_DIR)/lib/libselinux.so
 	# Install python interface wrapper
 	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) \
-		$(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap
+		$(HOST_LIBSELINUX_MAKE_OPTS) install-pywrap
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/libsemanage/0002-libsemanage-build-follow-standard-semantics-for-DESTD.patch b/bsp/buildroot/package/libsemanage/0002-libsemanage-build-follow-standard-semantics-for-DESTD.patch
new file mode 100644
index 00000000..47ac6bde
--- /dev/null
+++ b/bsp/buildroot/package/libsemanage/0002-libsemanage-build-follow-standard-semantics-for-DESTD.patch
@@ -0,0 +1,118 @@
+libsemanage: build: follow standard semantics for DESTDIR and PREFIX
+
+This patch solves the following issues:
+- DESTDIR is needed during compile time to compute library and header paths which it should not.
+- Installing with both DESTDIR and PREFIX set gives us odd paths
+- Make usage of DESTDIR and PREFIX more standard
+
+Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
+
+diff -durN libsemanage.orig/include/Makefile libsemanage/include/Makefile
+--- libsemanage.orig/include/Makefile	2018-01-12 12:42:30.915376458 +0100
++++ libsemanage/include/Makefile	2018-01-12 10:04:18.632144240 +0100
+@@ -1,6 +1,6 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-INCDIR ?= $(PREFIX)/include/semanage
++PREFIX ?= /usr
++INCDIR ?= $(DESTDIR)$(PREFIX)/include/semanage
+ 
+ all:
+ 
+diff -durN libsemanage.orig/man/Makefile libsemanage/man/Makefile
+--- libsemanage.orig/man/Makefile	2018-01-12 12:42:30.915376458 +0100
++++ libsemanage/man/Makefile	2018-01-12 10:04:18.632144240 +0100
+@@ -1,6 +1,7 @@
+ # Installation directories.
+-MAN3DIR ?= $(DESTDIR)/usr/share/man/man3
+-MAN5DIR ?= $(DESTDIR)/usr/share/man/man5
++PREFIX ?= /usr
++MAN3DIR ?= $(DESTDIR)$(PREFIX)/share/man/man3
++MAN5DIR ?= $(DESTDIR)$(PREFIX)/share/man/man5
+ 
+ all:
+ 
+diff -durN libsemanage.orig/src/libsemanage.pc.in libsemanage/src/libsemanage.pc.in
+--- libsemanage.orig/src/libsemanage.pc.in	2018-01-12 12:42:30.918709792 +0100
++++ libsemanage/src/libsemanage.pc.in	2018-01-12 10:04:18.632144240 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@libdir@
++libdir=@libdir@
+ includedir=@includedir@
+ 
+ Name: libsemanage
+diff -durN libsemanage.orig/src/Makefile libsemanage/src/Makefile
+--- libsemanage.orig/src/Makefile	2018-01-12 12:42:30.918709792 +0100
++++ libsemanage/src/Makefile	2018-01-12 10:04:18.632144240 +0100
+@@ -8,10 +8,10 @@
+ PKG_CONFIG ?= pkg-config
+ 
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
++PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/lib
+-SHLIBDIR ?= $(DESTDIR)/lib
+ INCLUDEDIR ?= $(PREFIX)/include
++LIBINSTALL = $(DESTDIR)$(LIBDIR)
+ PYINC ?= $(shell $(PKG_CONFIG) --cflags $(PYPREFIX))
+ PYLIBS ?= $(shell $(PKG_CONFIG) --libs $(PYPREFIX))
+ PYSITEDIR ?= $(DESTDIR)$(shell $(PYTHON) -c 'import site; print(site.getsitepackages()[0])')
+@@ -20,8 +20,6 @@
+ RUBYLIBS ?= $(shell $(RUBY) -e 'puts "-L" + RbConfig::CONFIG["libdir"] + " -L" + RbConfig::CONFIG["archlibdir"] + " " + RbConfig::CONFIG["LIBRUBYARG_SHARED"]')
+ RUBYINSTALL ?= $(DESTDIR)$(shell $(RUBY) -e 'puts RbConfig::CONFIG["vendorarchdir"]')
+ 
+-LIBBASE=$(shell basename $(LIBDIR))
+-
+ DEFAULT_SEMANAGE_CONF_LOCATION=$(DESTDIR)/etc/selinux/semanage.conf
+ 
+ ifeq ($(DEBUG),1)
+@@ -95,7 +93,7 @@
+ 	ln -sf $@ $(TARGET)
+ 
+ $(LIBPC): $(LIBPC).in ../VERSION
+-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
++	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+ 
+ semanageswig_python_exception.i: ../include/semanage/semanage.h
+ 	bash -e exception.sh > $@ || (rm -f $@ ; false)
+@@ -136,13 +134,13 @@
+ 	$(SWIG) $<
+ 
+ install: all 
+-	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
+-	install -m 644 $(LIBA) $(LIBDIR)
+-	install -m 755 $(LIBSO) $(LIBDIR)
+-	test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
+-	install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
++	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
++	install -m 644 $(LIBA) $(LIBINSTALL)
++	install -m 755 $(LIBSO) $(LIBINSTALL)
++	test -d $(LIBINSTALL)/pkgconfig || install -m 755 -d $(LIBINSTALL)/pkgconfig
++	install -m 644 $(LIBPC) $(LIBINSTALL)/pkgconfig
+ 	test -f $(DEFAULT_SEMANAGE_CONF_LOCATION) || install -m 644 -D semanage.conf $(DEFAULT_SEMANAGE_CONF_LOCATION)
+-	cd $(LIBDIR) && ln -sf $(LIBSO) $(TARGET)
++	cd $(LIBINSTALL) && ln -sf $(LIBSO) $(TARGET)
+ 
+ install-pywrap: pywrap 
+ 	test -d $(PYSITEDIR) || install -m 755 -d $(PYSITEDIR)
+@@ -155,7 +153,7 @@
+ 	install -m 755 $(SWIGRUBYSO) $(RUBYINSTALL)/semanage.so
+ 
+ relabel:
+-	/sbin/restorecon $(LIBDIR)/$(LIBSO)
++	/sbin/restorecon $(LIBINSTALL)/$(LIBSO)
+ 
+ clean: 
+ 	-rm -f $(LIBPC) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(SWIGLOBJ) $(SWIGSO) $(SWIGRUBYSO) $(TARGET) conf-parse.c conf-parse.h conf-scan.c *.o *.lo *~
+diff -durN libsemanage.orig/tests/Makefile libsemanage/tests/Makefile
+--- libsemanage.orig/tests/Makefile	2018-01-12 12:42:30.922043125 +0100
++++ libsemanage/tests/Makefile	2018-01-12 10:04:18.632144240 +0100
+@@ -1,6 +1,3 @@
+-PREFIX ?= $(DESTDIR)/usr
+-LIBDIR ?= $(PREFIX)/lib
+-
+ # Add your test source files here:
+ SOURCES = $(sort $(wildcard *.c))
+ 
diff --git a/bsp/buildroot/package/libsemanage/Config.in b/bsp/buildroot/package/libsemanage/Config.in
index 4318dbfc..7ee9c386 100644
--- a/bsp/buildroot/package/libsemanage/Config.in
+++ b/bsp/buildroot/package/libsemanage/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_LIBSEMANAGE
 	bool "libsemanage"
-	select BR2_PACKAGE_AUDIT
-	select BR2_PACKAGE_LIBSELINUX
-	select BR2_PACKAGE_USTR
-	select BR2_PACKAGE_BZIP2
 	depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
@@ -12,6 +8,10 @@ config BR2_PACKAGE_LIBSEMANAGE
 	# - audit is not available on musl
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on !BR2_arc
+	select BR2_PACKAGE_AUDIT
+	select BR2_PACKAGE_LIBSELINUX
+	select BR2_PACKAGE_USTR
+	select BR2_PACKAGE_BZIP2
 	help
 	  libsemanage is the policy management library. It uses
 	  libsepol for binary policy manipulation and libselinux for
diff --git a/bsp/buildroot/package/libsemanage/libsemanage.hash b/bsp/buildroot/package/libsemanage/libsemanage.hash
index 62f4d833..c3865715 100644
--- a/bsp/buildroot/package/libsemanage/libsemanage.hash
+++ b/bsp/buildroot/package/libsemanage/libsemanage.hash
@@ -1,2 +1,2 @@
-# Locally computed
-sha256 4f81541047290b751f2ffb926fcd381c186f22db18d9fe671b0b4a6a54e8cfce libsemanage-2.6.tar.gz
+# From: https://github.com/SELinuxProject/selinux/wiki/Releases
+sha256 07e9477714ce6a4557a1fe924ea4cb06501b62d0fa0e3c0dc32a2cf47cb8d476 libsemanage-2.7.tar.gz
diff --git a/bsp/buildroot/package/libsemanage/libsemanage.mk b/bsp/buildroot/package/libsemanage/libsemanage.mk
index 75455944..b6e50e28 100644
--- a/bsp/buildroot/package/libsemanage/libsemanage.mk
+++ b/bsp/buildroot/package/libsemanage/libsemanage.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBSEMANAGE_VERSION = 2.6
-LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-LIBSEMANAGE_LICENSE = LGPLv2.1+
+LIBSEMANAGE_VERSION = 2.7
+LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+LIBSEMANAGE_LICENSE = LGPL-2.1+
 LIBSEMANAGE_LICENSE_FILES = COPYING
 LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2
 LIBSEMANAGE_INSTALL_STAGING = YES
@@ -14,9 +14,7 @@ LIBSEMANAGE_INSTALL_STAGING = YES
 LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS)
 
 define LIBSEMANAGE_BUILD_CMDS
-	# DESTDIR is needed during the compile to compute library and
-	# header paths.
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) all
 endef
 
 define LIBSEMANAGE_INSTALL_STAGING_CMDS
@@ -29,33 +27,34 @@ endef
 
 HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-audit host-libsepol host-libselinux \
 				host-ustr host-bzip2 host-swig
-HOST_LIBSEMANAGE_MAKE_OPTS += $(HOST_CONFIGURE_OPTS) \
-	SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/"
+
+HOST_LIBSEMANAGE_MAKE_OPTS += \
+	$(HOST_CONFIGURE_OPTS) \
+	PREFIX=$(HOST_DIR) \
+	SWIG_LIB="$(HOST_DIR)/share/swig/$(SWIG_VERSION)/"
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 HOST_LIBSEMANAGE_DEPENDENCIES += host-python3
 HOST_LIBSEMANAGE_MAKE_OPTS += \
-	PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/" \
-	PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/" \
+	PYINC="-I$(HOST_DIR)/include/python$(PYTHON3_VERSION_MAJOR)m/" \
+	PYTHONLIBDIR="-L$(HOST_DIR)/lib/python$(PYTHON3_VERSION_MAJOR)/" \
 	PYLIBVER="python$(PYTHON3_VERSION_MAJOR)"
 else
 HOST_LIBSEMANAGE_DEPENDENCIES += host-python
 HOST_LIBSEMANAGE_MAKE_OPTS += \
-	PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \
-	PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \
+	PYINC="-I$(HOST_DIR)/include/python$(PYTHON_VERSION_MAJOR)/" \
+	PYTHONLIBDIR="-L$(HOST_DIR)/lib/python$(PYTHON_VERSION_MAJOR)/" \
 	PYLIBVER="python$(PYTHON_VERSION_MAJOR)"
 endif
 
 define HOST_LIBSEMANAGE_BUILD_CMDS
-	# DESTDIR is needed during the compile to compute library and
-	# header paths.
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) all
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) swigify pywrap
 endef
 
 define HOST_LIBSEMANAGE_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) install
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) install-pywrap
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/libsepol/0001-libsepol-build-follow-standard-semantics-for-DESTD.patch b/bsp/buildroot/package/libsepol/0001-libsepol-build-follow-standard-semantics-for-DESTD.patch
new file mode 100644
index 00000000..1daf7206
--- /dev/null
+++ b/bsp/buildroot/package/libsepol/0001-libsepol-build-follow-standard-semantics-for-DESTD.patch
@@ -0,0 +1,109 @@
+libsepol: build: follow standard semantics for DESTDIR and PREFIX
+
+This patch solves the following issues:
+- The pkg-config files generates odd paths when using DESTDIR without PREFIX
+- DESTDIR is needed during compile time to compute library and header paths which it should not.
+- Installing with both DESTDIR and PREFIX set gives us odd paths
+- Make usage of DESTDIR and PREFIX more standard
+
+Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
+
+diff -durN libsepol.orig/include/Makefile libsepol/include/Makefile
+--- libsepol.orig/include/Makefile	2018-01-12 12:42:30.908709792 +0100
++++ libsepol/include/Makefile	2018-01-12 09:58:04.322148228 +0100
+@@ -1,6 +1,6 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-INCDIR ?= $(PREFIX)/include/sepol
++PREFIX ?= /usr
++INCDIR = $(DESTDIR)$(PREFIX)/include/sepol
+ CILDIR ?= ../cil
+ 
+ all:
+diff -durN libsepol.orig/man/Makefile libsepol/man/Makefile
+--- libsepol.orig/man/Makefile	2018-01-12 12:42:30.912043126 +0100
++++ libsepol/man/Makefile	2018-01-12 09:58:04.322148228 +0100
+@@ -1,6 +1,7 @@
+ # Installation directories.
+-MAN8DIR ?= $(DESTDIR)/usr/share/man/man8
+-MAN3DIR ?= $(DESTDIR)/usr/share/man/man3
++PREFIX ?= /usr
++MAN8DIR ?= $(DESTDIR)$(PREFIX)/share/man/man8
++MAN3DIR ?= $(DESTDIR)$(PREFIX)/share/man/man3
+ 
+ all:
+ 
+diff -durN libsepol.orig/src/libsepol.pc.in libsepol/src/libsepol.pc.in
+--- libsepol.orig/src/libsepol.pc.in	2018-01-12 12:42:30.912043126 +0100
++++ libsepol/src/libsepol.pc.in	2018-01-12 09:58:04.322148228 +0100
+@@ -1,6 +1,6 @@
+ prefix=@prefix@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/@libdir@
++libdir=@libdir@
+ includedir=@includedir@
+ 
+ Name: libsepol
+diff -durN libsepol.orig/src/Makefile libsepol/src/Makefile
+--- libsepol.orig/src/Makefile	2018-01-12 12:42:30.912043126 +0100
++++ libsepol/src/Makefile	2018-01-12 09:58:04.322148228 +0100
+@@ -1,11 +1,10 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
++PREFIX ?= /usr
+ INCLUDEDIR ?= $(PREFIX)/include
+ LIBDIR ?= $(PREFIX)/lib
+-SHLIBDIR ?= $(DESTDIR)/lib
+ RANLIB ?= ranlib
+-LIBBASE ?= $(shell basename $(LIBDIR))
+ CILDIR ?= ../cil
++LIBINSTALL = $(DESTDIR)$(LIBDIR)
+ 
+ VERSION = $(shell cat ../VERSION)
+ LIBVERSION = 1
+@@ -52,7 +51,7 @@
+ 	ln -sf $@ $(TARGET) 
+ 
+ $(LIBPC): $(LIBPC).in ../VERSION
+-	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBBASE):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
++	sed -e 's/@VERSION@/$(VERSION)/; s:@prefix@:$(PREFIX):; s:@libdir@:$(LIBDIR):; s:@includedir@:$(INCLUDEDIR):' < $< > $@
+ 
+ $(LIBMAP): $(LIBMAP).in
+ ifneq ($(DISABLE_CIL),y)
+@@ -80,16 +79,16 @@
+ 	$(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $<
+ 
+ install: all
+-	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
+-	install -m 644 $(LIBA) $(LIBDIR)
+-	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
+-	install -m 755 $(LIBSO) $(SHLIBDIR)
+-	test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
+-	install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
+-	$(LN) -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
++	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
++	install -m 644 $(LIBA) $(LIBINSTALL)
++	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
++	install -m 755 $(LIBSO) $(LIBINSTALL)
++	test -d $(LIBINSTALL)/pkgconfig || install -m 755 -d $(LIBINSTALL)/pkgconfig
++	install -m 644 $(LIBPC) $(LIBINSTALL)/pkgconfig
++	$(LN) -sf --relative $(LIBINSTALL)/$(LIBSO) $(LIBINSTALL)/$(TARGET)
+ 
+ relabel:
+-	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
++	/sbin/restorecon $(LIBINSTALL)/$(LIBSO)
+ 
+ clean: 
+ 	-rm -f $(LIBPC) $(LIBMAP) $(OBJS) $(LOBJS) $(LIBA) $(LIBSO) $(TARGET) $(CIL_GENERATED)
+diff -durN libsepol.orig/utils/Makefile libsepol/utils/Makefile
+--- libsepol.orig/utils/Makefile	2018-01-12 12:42:30.915376458 +0100
++++ libsepol/utils/Makefile	2018-01-12 09:58:04.322148228 +0100
+@@ -1,6 +1,6 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-BINDIR ?= $(PREFIX)/bin
++PREFIX ?= /usr
++BINDIR ?= $(DESTDIR)$(PREFIX)/bin
+ 
+ CFLAGS ?= -Wall -Werror
+ override CFLAGS += -I../include
diff --git a/bsp/buildroot/package/libsepol/0001-support-static-only.patch b/bsp/buildroot/package/libsepol/0001-support-static-only.patch
deleted file mode 100644
index 3e6d555e..00000000
--- a/bsp/buildroot/package/libsepol/0001-support-static-only.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for static-only build
-
-Instead of unconditionally building shared libraries, this patch
-improves the libsepol build system with a "STATIC" variable, which
-when defined to some non-empty value, will disable the build of shared
-libraries. It allows to support cases where the target architecture
-does not have support for shared libraries.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
-
-Index: b/src/Makefile
-===================================================================
-
-diff --git a/src/Makefile b/src/Makefile
-index db6c2ba..0006285 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE
- override CFLAGS += -I$(CILDIR)/include
- endif
- 
-+ALL_TARGETS = $(LIBA) $(LIBPC)
-+ifeq ($(STATIC),)
-+ALL_TARGETS += $(LIBSO)
-+endif
-
--all: $(LIBA) $(LIBSO) $(LIBPC)
-+all: $(ALL_TARGETS)
- 
-
- $(LIBA):  $(OBJS)
-@@ -66,11 +70,13 @@
- install: all
- 	test -d $(LIBDIR) || install -m 755 -d $(LIBDIR)
- 	install -m 644 $(LIBA) $(LIBDIR)
--	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
--	install -m 755 $(LIBSO) $(SHLIBDIR)
- 	test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig
- 	install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig
-+ifeq ($(STATIC),)
-+	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
-+	install -m 755 $(LIBSO) $(SHLIBDIR)
- 	ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
-+endif
- 
- relabel:
- 	/sbin/restorecon $(SHLIBDIR)/$(LIBSO)
diff --git a/bsp/buildroot/package/libsepol/0003-revert-ln-relative.patch b/bsp/buildroot/package/libsepol/0003-revert-ln-relative.patch
deleted file mode 100644
index 0902d8d4..00000000
--- a/bsp/buildroot/package/libsepol/0003-revert-ln-relative.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile: revert libsepol: use ln --relative to create .so symlinks
-
-This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998
-
-ln --relative is too recent to be available in all distributions,
-especially enterprise-grade distros that can stick around as long as
-they are maintained (up to 10 years in some cases?).
-
-For the sake of Buildroot, revert the upstream patch.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN a/src/Makefile b/src/Makefile
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -77,7 +77,7 @@
- ifeq ($(STATIC),)
- 	test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR)
- 	install -m 755 $(LIBSO) $(SHLIBDIR)
--	ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET)
-+	cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET)
- endif
- 
- relabel:
diff --git a/bsp/buildroot/package/libsepol/0003-support-static-only.patch b/bsp/buildroot/package/libsepol/0003-support-static-only.patch
new file mode 100644
index 00000000..8cf9a180
--- /dev/null
+++ b/bsp/buildroot/package/libsepol/0003-support-static-only.patch
@@ -0,0 +1,45 @@
+From 2140db697c7f1da2a0a3f7bbcb14c1a0dade84e5 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Mon, 9 Oct 2017 16:28:12 -0400
+Subject: [PATCH] Add support for static-only build
+
+Instead of unconditionally building shared libraries, this patch
+improves the libsepol build system with a "STATIC" variable, which
+when defined to some non-empty value, will disable the build of shared
+libraries. It allows to support cases where the target architecture
+does not have support for shared libraries.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ src/Makefile | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile
+--- libsepol-2.7.orig/src/Makefile	2018-01-15 21:07:51.285183415 +0100
++++ libsepol-2.7/src/Makefile	2018-01-15 21:08:56.515182717 +0100
+@@ -39,7 +39,12 @@
+ LN=gln
+ endif
+ 
+-all: $(LIBA) $(LIBSO) $(LIBPC)
++ALL_TARGETS = $(LIBA) $(LIBPC)
++ifeq ($(STATIC),)
++ALL_TARGETS += $(LIBSO)
++endif
++
++all: $(ALL_TARGETS)
+ 
+ 
+ $(LIBA):  $(OBJS)
+@@ -81,8 +86,10 @@
+ install: all
+ 	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
+ 	install -m 644 $(LIBA) $(LIBINSTALL)
++ifeq ($(STATIC),)
+ 	test -d $(LIBINSTALL) || install -m 755 -d $(LIBINSTALL)
+ 	install -m 755 $(LIBSO) $(LIBINSTALL)
++endif
+ 	test -d $(LIBINSTALL)/pkgconfig || install -m 755 -d $(LIBINSTALL)/pkgconfig
+ 	install -m 644 $(LIBPC) $(LIBINSTALL)/pkgconfig
+ 	$(LN) -sf --relative $(LIBINSTALL)/$(LIBSO) $(LIBINSTALL)/$(TARGET)
diff --git a/bsp/buildroot/package/libsepol/0004-revert-ln-relative.patch b/bsp/buildroot/package/libsepol/0004-revert-ln-relative.patch
new file mode 100644
index 00000000..9d1553ed
--- /dev/null
+++ b/bsp/buildroot/package/libsepol/0004-revert-ln-relative.patch
@@ -0,0 +1,27 @@
+From 16b2b0e21e10727065042a1baabd1a887757c65c Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Mon, 9 Oct 2017 16:29:36 -0400
+Subject: [PATCH] Makefile: revert libsepol: use ln --relative to create .so symlinks
+
+This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998
+
+ln --relative is too recent to be available in all distributions,
+especially enterprise-grade distros that can stick around as long as
+they are maintained (up to 10 years in some cases?).
+
+For the sake of Buildroot, revert the upstream patch.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile
+--- libsepol-2.7.orig/src/Makefile	2018-01-15 21:37:12.821831315 +0100
++++ libsepol-2.7/src/Makefile	2018-01-15 21:38:03.838497434 +0100
+@@ -92,7 +92,7 @@
+ endif
+ 	test -d $(LIBINSTALL)/pkgconfig || install -m 755 -d $(LIBINSTALL)/pkgconfig
+ 	install -m 644 $(LIBPC) $(LIBINSTALL)/pkgconfig
+-	$(LN) -sf --relative $(LIBINSTALL)/$(LIBSO) $(LIBINSTALL)/$(TARGET)
++	cd $(LIBINSTALL) && ln -sf $(LIBSO) $(TARGET)
+ 
+ relabel:
+ 	/sbin/restorecon $(LIBINSTALL)/$(LIBSO)
diff --git a/bsp/buildroot/package/libsepol/Config.in b/bsp/buildroot/package/libsepol/Config.in
index f92af520..cfa923e4 100644
--- a/bsp/buildroot/package/libsepol/Config.in
+++ b/bsp/buildroot/package/libsepol/Config.in
@@ -1,7 +1,11 @@
 config BR2_PACKAGE_LIBSEPOL
 	bool "libsepol"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # pthread
 	help
 	  Libsepol is the binary policy manipulation library. It doesn't
 	  depend upon or use any of the other SELinux components.
 
 	  http://selinuxproject.org/page/Main_Page
+
+comment "libsepol needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libsepol/libsepol.hash b/bsp/buildroot/package/libsepol/libsepol.hash
index 6c705067..08e2bf97 100644
--- a/bsp/buildroot/package/libsepol/libsepol.hash
+++ b/bsp/buildroot/package/libsepol/libsepol.hash
@@ -1,2 +1,2 @@
-# From https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 d856d6506054f52abeaa3543ea2f2344595a3dc05d0d873ed7f724f7a16b1874  libsepol-2.6.tar.gz
+# From: https://github.com/SELinuxProject/selinux/wiki/Releases
+sha256 d69d3bd8ec901a3bd5adf2be2fb47fb1a685ed73066ab482e7e505371a48f9e7  libsepol-2.7.tar.gz
diff --git a/bsp/buildroot/package/libsepol/libsepol.mk b/bsp/buildroot/package/libsepol/libsepol.mk
index 61d1e611..5932ca14 100644
--- a/bsp/buildroot/package/libsepol/libsepol.mk
+++ b/bsp/buildroot/package/libsepol/libsepol.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBSEPOL_VERSION = 2.6
-LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-LIBSEPOL_LICENSE = LGPLv2.1+
+LIBSEPOL_VERSION = 2.7
+LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+LIBSEPOL_LICENSE = LGPL-2.1+
 LIBSEPOL_LICENSE_FILES = COPYING
 
 LIBSEPOL_INSTALL_STAGING = YES
@@ -20,9 +20,7 @@ LIBSEPOL_MAKE_FLAGS += STATIC=1
 endif
 
 define LIBSEPOL_BUILD_CMDS
-	# DESTDIR is needed during the compile to compute library and
-	# header paths.
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS)
 endef
 
 define LIBSEPOL_INSTALL_STAGING_CMDS
@@ -33,15 +31,17 @@ define LIBSEPOL_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR)
 endef
 
+HOST_LIBSEPOL_MAKE_ENV = \
+	$(HOST_MAKE_ENV) \
+	PREFIX=$(HOST_DIR)
+
 define HOST_LIBSEPOL_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR)
+	$(HOST_LIBSEPOL_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS)
 endef
 
 define HOST_LIBSEPOL_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR)
-	mv $(HOST_DIR)/lib/libsepol.so.1 $(HOST_DIR)/usr/lib
-	(cd $(HOST_DIR)/usr/lib; rm -f libsepol.so; ln -s libsepol.so.1 libsepol.so)
-	-rmdir $(HOST_DIR)/lib
+	$(HOST_LIBSEPOL_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS)
+	ln -sf libsepol.so.1 $(HOST_DIR)/lib/libsepol.so
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/libserial/Config.in b/bsp/buildroot/package/libserial/Config.in
index bd936b93..d492f6b7 100644
--- a/bsp/buildroot/package/libserial/Config.in
+++ b/bsp/buildroot/package/libserial/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_LIBSERIAL
 	depends on BR2_USE_WCHAR # boost
 	select BR2_PACKAGE_BOOST
 	help
-	  Simplified serial port programming in C++ under POSIX operating
-	  systems.
+	  Simplified serial port programming in C++ under POSIX
+	  operating systems.
 
 	  http://libserial.sourceforge.net/
 
diff --git a/bsp/buildroot/package/libserial/libserial.mk b/bsp/buildroot/package/libserial/libserial.mk
index 11f18748..b73d4c76 100644
--- a/bsp/buildroot/package/libserial/libserial.mk
+++ b/bsp/buildroot/package/libserial/libserial.mk
@@ -7,7 +7,7 @@
 LIBSERIAL_VERSION = 0.6.0rc2
 LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial
 LIBSERIAL_INSTALL_STAGING = YES
-LIBSERIAL_LICENSE = GPLv2+
+LIBSERIAL_LICENSE = GPL-2.0+
 LIBSERIAL_LICENSE_FILES = COPYING
 LIBSERIAL_DEPENDENCIES = boost
 
diff --git a/bsp/buildroot/package/libserialport/libserialport.mk b/bsp/buildroot/package/libserialport/libserialport.mk
index 86ae17f5..84d7a531 100644
--- a/bsp/buildroot/package/libserialport/libserialport.mk
+++ b/bsp/buildroot/package/libserialport/libserialport.mk
@@ -6,7 +6,7 @@
 
 LIBSERIALPORT_VERSION = 0.1.1
 LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport
-LIBSERIALPORT_LICENSE = LGPLv3+
+LIBSERIALPORT_LICENSE = LGPL-3.0+
 LIBSERIALPORT_LICENSE_FILES = COPYING
 LIBSERIALPORT_INSTALL_STAGING = YES
 LIBSERIALPORT_DEPENDENCIES = host-pkgconf
diff --git a/bsp/buildroot/package/libsexy/libsexy.mk b/bsp/buildroot/package/libsexy/libsexy.mk
index c291d7dc..b0792641 100644
--- a/bsp/buildroot/package/libsexy/libsexy.mk
+++ b/bsp/buildroot/package/libsexy/libsexy.mk
@@ -8,7 +8,7 @@ LIBSEXY_VERSION = 0.1.11
 LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy
 LIBSEXY_DEPENDENCIES = libgtk2 libxml2
 LIBSEXY_INSTALL_STAGING = YES
-LIBSEXY_LICENSE = LGPLv2.1+
+LIBSEXY_LICENSE = LGPL-2.1+
 LIBSEXY_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libsha1/libsha1.mk b/bsp/buildroot/package/libsha1/libsha1.mk
index 647f986d..4d80f3aa 100644
--- a/bsp/buildroot/package/libsha1/libsha1.mk
+++ b/bsp/buildroot/package/libsha1/libsha1.mk
@@ -6,7 +6,7 @@
 
 LIBSHA1_VERSION = 0.3
 LIBSHA1_SITE = $(call github,dottedmag,libsha1,$(LIBSHA1_VERSION))
-LIBSHA1_LICENSE = BSD-3c or GPL
+LIBSHA1_LICENSE = BSD-3-Clause or GPL
 LIBSHA1_LICENSE_FILES = COPYING
 
 LIBSHA1_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libshairplay/libshairplay.mk b/bsp/buildroot/package/libshairplay/libshairplay.mk
index 4bdd1a04..4b2883cd 100644
--- a/bsp/buildroot/package/libshairplay/libshairplay.mk
+++ b/bsp/buildroot/package/libshairplay/libshairplay.mk
@@ -8,7 +8,7 @@ LIBSHAIRPLAY_VERSION = ce80e005908f41d0e6fde1c4a21e9cb8ee54007b
 LIBSHAIRPLAY_SITE = $(call github,juhovh,shairplay,$(LIBSHAIRPLAY_VERSION))
 LIBSHAIRPLAY_INSTALL_STAGING = YES
 LIBSHAIRPLAY_AUTORECONF = YES
-LIBSHAIRPLAY_LICENSE = MIT, BSD-3c, LGPLv2.1+
+LIBSHAIRPLAY_LICENSE = MIT, BSD-3-Clause, LGPL-2.1+
 LIBSHAIRPLAY_LICENSE_FILES = LICENSE
 LIBSHAIRPLAY_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBAO),libao)
 
diff --git a/bsp/buildroot/package/libshout/Config.in b/bsp/buildroot/package/libshout/Config.in
index 02248c7f..f8749b91 100644
--- a/bsp/buildroot/package/libshout/Config.in
+++ b/bsp/buildroot/package/libshout/Config.in
@@ -3,8 +3,9 @@ config BR2_PACKAGE_LIBSHOUT
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBVORBIS
 	help
-	  Libshout is a library for communicating with and sending data to an
-	  icecast server. It handles the socket connection, the timing of the
-	  data, and prevents bad data from getting to the icecast server.
+	  Libshout is a library for communicating with and sending data
+	  to an icecast server. It handles the socket connection, the
+	  timing of the data, and prevents bad data from getting to the
+	  icecast server.
 
 	  http://icecast.org/download/
diff --git a/bsp/buildroot/package/libshout/libshout.mk b/bsp/buildroot/package/libshout/libshout.mk
index bf855952..4f209081 100644
--- a/bsp/buildroot/package/libshout/libshout.mk
+++ b/bsp/buildroot/package/libshout/libshout.mk
@@ -6,7 +6,7 @@
 
 LIBSHOUT_VERSION = 2.4.1
 LIBSHOUT_SITE = http://downloads.xiph.org/releases/libshout
-LIBSHOUT_LICENSE = LGPLv2+
+LIBSHOUT_LICENSE = LGPL-2.0+
 LIBSHOUT_LICENSE_FILES = COPYING
 LIBSHOUT_INSTALL_STAGING = YES
 LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis
@@ -31,6 +31,9 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBSHOUT_CONF_OPTS += --with-openssl
 LIBSHOUT_DEPENDENCIES += openssl
+else ifeq ($(BR2_PACKAGE_LIBRESSL),y)
+LIBSHOUT_CONF_OPTS += --with-openssl=$(STAGING_DIR)/lib
+LIBSHOUT_DEPENDENCIES += libressl
 else
 LIBSHOUT_CONF_OPTS += --without-openssl
 endif
diff --git a/bsp/buildroot/package/libsidplay2/Config.in b/bsp/buildroot/package/libsidplay2/Config.in
index 56983670..1bbe49ba 100644
--- a/bsp/buildroot/package/libsidplay2/Config.in
+++ b/bsp/buildroot/package/libsidplay2/Config.in
@@ -2,10 +2,11 @@ config BR2_PACKAGE_LIBSIDPLAY2
 	bool "libsidplay2"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Sidplay 2 is the second in the Sidplay series originally developed by
-	  Michael Schwendt. This version is written by Simon White and is cycle
-	  accurate for improved sound reproduction. Sidplay 2 is capable of
-	  playing all C64 mono and stereo file formats.
+	  Sidplay 2 is the second in the Sidplay series originally
+	  developed by Michael Schwendt. This version is written by
+	  Simon White and is cycle accurate for improved sound
+	  reproduction. Sidplay 2 is capable of playing all C64 mono and
+	  stereo file formats.
 
 	  http://sourceforge.net/projects/sidplay2
 
diff --git a/bsp/buildroot/package/libsidplay2/libsidplay2.mk b/bsp/buildroot/package/libsidplay2/libsidplay2.mk
index cf440689..20af7726 100644
--- a/bsp/buildroot/package/libsidplay2/libsidplay2.mk
+++ b/bsp/buildroot/package/libsidplay2/libsidplay2.mk
@@ -7,7 +7,7 @@
 LIBSIDPLAY2_VERSION = 2.1.1
 LIBSIDPLAY2_SOURCE = sidplay-libs-$(LIBSIDPLAY2_VERSION).tar.gz
 LIBSIDPLAY2_SITE = http://downloads.sourceforge.net/project/sidplay2/sidplay2/sidplay-libs-$(LIBSIDPLAY2_VERSION)
-LIBSIDPLAY2_LICENSE = GPLv2+
+LIBSIDPLAY2_LICENSE = GPL-2.0+
 LIBSIDPLAY2_LICENSE_FILES = libsidplay/COPYING
 LIBSIDPLAY2_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libsigc/Config.in b/bsp/buildroot/package/libsigc/Config.in
index f38749b4..4bd762ef 100644
--- a/bsp/buildroot/package/libsigc/Config.in
+++ b/bsp/buildroot/package/libsigc/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_LIBSIGC
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  libsigc++ implements a typesafe callback system for standard C++.
-	  It allows you to define signals and to connect those signals to
-	  any callback function, either global or a member function,
-	  regardless of whether it is static or virtual.
+	  libsigc++ implements a typesafe callback system for standard
+	  C++. It allows you to define signals and to connect those
+	  signals to any callback function, either global or a member
+	  function, regardless of whether it is static or virtual.
 
 	  http://libsigc.sourceforge.net/
 
diff --git a/bsp/buildroot/package/libsigc/libsigc.mk b/bsp/buildroot/package/libsigc/libsigc.mk
index 590cbaa5..d7cbd36d 100644
--- a/bsp/buildroot/package/libsigc/libsigc.mk
+++ b/bsp/buildroot/package/libsigc/libsigc.mk
@@ -10,7 +10,7 @@ LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz
 LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR)
 LIBSIGC_DEPENDENCIES = host-m4
 LIBSIGC_INSTALL_STAGING = YES
-LIBSIGC_LICENSE = LGPLv2.1+
+LIBSIGC_LICENSE = LGPL-2.1+
 LIBSIGC_LICENSE_FILES = COPYING
 
 define LIBSIGC_INSTALL_TARGET_FIXUP
diff --git a/bsp/buildroot/package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch b/bsp/buildroot/package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
deleted file mode 100644
index 2b206805..00000000
--- a/bsp/buildroot/package/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 83bf4762e42a4d4a5c077f48d8f5715c9147d9b8 Mon Sep 17 00:00:00 2001
-From: Aurelien Jacobs <aurel@gnuage.org>
-Date: Mon, 1 Feb 2016 22:37:36 +0100
-Subject: [PATCH] beaglelogic: use standard # operator instead of ugly __STRING
- macro
-
-Also note that the __ namespace is reserved by POSIX for its private
-usage, so user land software should never rely on any kind of API
-with a __ prefix.
-
-Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-Patch downloaded from upstream git:
-http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=83bf4762e42a4d4a5c077f48d8f5715c9147d9b8
-
- src/hardware/beaglelogic/beaglelogic.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h
-index 9015c61..96713ba 100644
---- a/src/hardware/beaglelogic/beaglelogic.h
-+++ b/src/hardware/beaglelogic/beaglelogic.h
-@@ -30,8 +30,7 @@
- 
- /* BeagleLogic device node name */
- #define BEAGLELOGIC_DEV_NODE        "/dev/beaglelogic"
--#define BEAGLELOGIC_SYSFS_ATTR(a)   "/sys/devices/virtual/misc/beaglelogic/"\
--					__STRING(a)
-+#define BEAGLELOGIC_SYSFS_ATTR(a)   "/sys/devices/virtual/misc/beaglelogic/" #a
- 
- /* Reproduced verbatim from beaglelogic.h in the kernel tree until the kernel
-  * module hits the mainline. Contains the ABI, so DO NOT TOUCH this section */
--- 
-2.6.2
-
diff --git a/bsp/buildroot/package/libsigrok/Config.in b/bsp/buildroot/package/libsigrok/Config.in
index ff2d2498..fb74beaa 100644
--- a/bsp/buildroot/package/libsigrok/Config.in
+++ b/bsp/buildroot/package/libsigrok/Config.in
@@ -1,13 +1,14 @@
 config BR2_PACKAGE_LIBSIGROK
 	bool "libsigrok"
-	select BR2_PACKAGE_LIBZIP
-	select BR2_PACKAGE_LIBGLIB2
 	# libglib2
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
+	depends on !BR2_STATIC_LIBS # libzip
 	# std=c11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	select BR2_PACKAGE_LIBZIP
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Libsigrok is a shared library written in C, which provides
 	  the basic hardware access drivers for logic analyzers and
@@ -22,18 +23,19 @@ if BR2_PACKAGE_LIBSIGROK
 
 config BR2_PACKAGE_LIBSIGROKCXX
 	bool "build C++ bindings"
-	select BR2_PACKAGE_GLIBMM
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # glibmm
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # glibmm
+	select BR2_PACKAGE_GLIBMM
 	help
 	  Build libsigrok C++ bindings as well.
 
-comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8"
+comment "C++ bindings need a toolchain w/ C++, gcc >= 4.9"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 endif
 
-comment "libsigrok needs a toolchain w/ wchar, threads, gcc >= 4.7"
+comment "libsigrok needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.7"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libsigrok/libsigrok.hash b/bsp/buildroot/package/libsigrok/libsigrok.hash
index 999cef54..47ad6129 100644
--- a/bsp/buildroot/package/libsigrok/libsigrok.hash
+++ b/bsp/buildroot/package/libsigrok/libsigrok.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e	libsigrok-0.4.0.tar.gz
+sha256	4c8c86779b880a5c419f6c77a08b1147021e5a19fa83b0f3b19da27463c9f3a4	libsigrok-0.5.0.tar.gz
diff --git a/bsp/buildroot/package/libsigrok/libsigrok.mk b/bsp/buildroot/package/libsigrok/libsigrok.mk
index e4e079d3..ef7fab82 100644
--- a/bsp/buildroot/package/libsigrok/libsigrok.mk
+++ b/bsp/buildroot/package/libsigrok/libsigrok.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBSIGROK_VERSION = 0.4.0
+LIBSIGROK_VERSION = 0.5.0
 LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok
-LIBSIGROK_LICENSE = GPLv3+
+LIBSIGROK_LICENSE = GPL-3.0+
 LIBSIGROK_LICENSE_FILES = COPYING
 LIBSIGROK_INSTALL_STAGING = YES
 LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf
@@ -39,7 +39,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y)
 LIBSIGROK_CONF_OPTS += --enable-cxx
-LIBSIGROK_AUTORECONF_OPTS += -I $(HOST_DIR)/usr/share/autoconf-archive
+LIBSIGROK_AUTORECONF_OPTS += -I $(HOST_DIR)/share/autoconf-archive
 LIBSIGROK_DEPENDENCIES += \
 	host-autoconf-archive \
 	glibmm \
diff --git a/bsp/buildroot/package/libsigrokdecode/Config.in b/bsp/buildroot/package/libsigrokdecode/Config.in
index 70f86ceb..28cbb5ca 100644
--- a/bsp/buildroot/package/libsigrokdecode/Config.in
+++ b/bsp/buildroot/package/libsigrokdecode/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_LIBSIGROKDECODE
 	bool "libsigrokdecode"
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_PYTHON3
 	depends on !BR2_PACKAGE_PYTHON # python3
 	depends on BR2_USE_WCHAR # libglib2/python3
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3
 	depends on BR2_USE_MMU # libglib2/python3
 	depends on !BR2_STATIC_LIBS # python3
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_PYTHON3
 	help
 	  Libsigrokdecode is a shared library written in C, which
 	  provides (streaming) protocol decoding functionality. Say
diff --git a/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.hash b/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.hash
index ccb20168..a4914b25 100644
--- a/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.hash
+++ b/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	065f70c10971173d86e03a8cf5534e600c7a622775113997d8061572135d4a95	libsigrokdecode-0.4.1.tar.gz
+sha256	4aa8579ecea9b421b8ac048a9b18c27e63206839f269374398d89c14a47bd1c1	libsigrokdecode-0.5.0.tar.gz
diff --git a/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.mk b/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.mk
index 7006b0c6..95e6e69a 100644
--- a/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.mk
+++ b/bsp/buildroot/package/libsigrokdecode/libsigrokdecode.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBSIGROKDECODE_VERSION = 0.4.1
+LIBSIGROKDECODE_VERSION = 0.5.0
 LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode
-LIBSIGROKDECODE_LICENSE = GPLv3+
+LIBSIGROKDECODE_LICENSE = GPL-3.0+
 LIBSIGROKDECODE_LICENSE_FILES = COPYING
 LIBSIGROKDECODE_INSTALL_STAGING = YES
 LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3
diff --git a/bsp/buildroot/package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch b/bsp/buildroot/package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch
deleted file mode 100644
index a3b03a00..00000000
--- a/bsp/buildroot/package/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 790e8f620f06834f3fd03c310cbecd1416536987 Mon Sep 17 00:00:00 2001
-From: Will Newton <will.newton@linaro.org>
-Date: Tue, 28 May 2013 18:31:46 +0100
-Subject: [PATCH 2/5] Add stack direction for the AArch64 architecture
-
-On this architecture, the stack grows downward.
-
-Signed-off-by: Will Newton <will.newton@linaro.org>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 39c1a28..3f70530 100644
---- a/m4/stack-direction.m4
-+++ b/m4/stack-direction.m4
-@@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
-     case "$host_cpu" in
-       dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h.
-       a29k | \
-+      aarch64* | \
-       alpha* | \
-       arc | \
-       arm* | strongarm* | xscale* | \
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch b/bsp/buildroot/package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch
deleted file mode 100644
index d3795d3f..00000000
--- a/bsp/buildroot/package/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f4395ff932758884416753f88f5d98f33ec67479 Mon Sep 17 00:00:00 2001
-From: Spenser Gilliland <spenser@gillilanding.com>
-Date: Mon, 29 Dec 2014 13:54:54 +0100
-Subject: [PATCH 3/5] Add stack direction for the Microblaze architecture
-
-Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 3f70530..53f4216 100644
---- a/m4/stack-direction.m4
-+++ b/m4/stack-direction.m4
-@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
-       m68* | \
-       m88k | \
-       mcore | \
-+      microblaze | \
-       mips* | \
-       mmix | \
-       mn10200 | \
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch b/bsp/buildroot/package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch
deleted file mode 100644
index 5d8232a1..00000000
--- a/bsp/buildroot/package/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 55a707283dbb3b2fdcaaa4e177d050e122cfc2a0 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Mon, 29 Dec 2014 13:55:16 +0100
-Subject: [PATCH 4/5] Add stack direction for the Blackfin architecture
-
-The stack grows downward on Blackfin, see
-https://sourceware.org/binutils/docs/as/Blackfin-Syntax.html: "The
-stack grows by decrementing the stack pointer.".
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 53f4216..1a97d5a 100644
---- a/m4/stack-direction.m4
-+++ b/m4/stack-direction.m4
-@@ -18,6 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
-       arc | \
-       arm* | strongarm* | xscale* | \
-       avr | \
-+      bfin | \
-       c1 | c2 | c32 | c34 | c38 | \
-       clipper | \
-       cris | \
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch b/bsp/buildroot/package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch
deleted file mode 100644
index ee4778ea..00000000
--- a/bsp/buildroot/package/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 24bac122bf4ffe437bb4f6ca633ad08f31a23d73 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Mon, 29 Dec 2014 13:56:54 +0100
-Subject: [PATCH 5/5] Add stack direction for the Nios II architecture
-
-According to Altera Application Binary Interface document for the Nios
-II architecture
-(http://www.altera.com/literature/hb/nios2/n2cpu_nii51016.pdf):
-
- "The stack grows downward (i.e. towards lower addresses). ".
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 1a97d5a..d9c5157 100644
---- a/m4/stack-direction.m4
-+++ b/m4/stack-direction.m4
-@@ -38,6 +38,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
-       mmix | \
-       mn10200 | \
-       mn10300 | \
-+      nios2 | \
-       ns32k | \
-       pdp11 | \
-       pj* | \
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/libsigsegv/0005-fix-sparc64-stackpointer.patch b/bsp/buildroot/package/libsigsegv/0005-fix-sparc64-stackpointer.patch
deleted file mode 100644
index 62de35f6..00000000
--- a/bsp/buildroot/package/libsigsegv/0005-fix-sparc64-stackpointer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix sparc64 build.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur libsigsegv-2.10.orig/src/fault-linux-sparc.h libsigsegv-2.10/src/fault-linux-sparc.h
---- libsigsegv-2.10.orig/src/fault-linux-sparc.h	2009-08-01 17:06:49.000000000 +0200
-+++ libsigsegv-2.10/src/fault-linux-sparc.h	2015-11-29 11:55:29.000000000 +0100
-@@ -27,4 +27,8 @@
-    (see also <asm/sigcontext.h>)
-    are quite different types.  */
- 
-+#if __WORDSIZE == 64
-+#define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.mc_gregs[REG_O6]
-+#else
- #define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gregs[REG_O6]
-+#endif
diff --git a/bsp/buildroot/package/libsigsegv/libsigsegv.hash b/bsp/buildroot/package/libsigsegv/libsigsegv.hash
index 0151105f..e937259e 100644
--- a/bsp/buildroot/package/libsigsegv/libsigsegv.hash
+++ b/bsp/buildroot/package/libsigsegv/libsigsegv.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a	libsigsegv-2.10.tar.gz
+sha256	dd7c2eb2ef6c47189406d562c1dc0f96f2fc808036834d596075d58377e37a18	libsigsegv-2.11.tar.gz
diff --git a/bsp/buildroot/package/libsigsegv/libsigsegv.mk b/bsp/buildroot/package/libsigsegv/libsigsegv.mk
index a5bb31c9..d2524977 100644
--- a/bsp/buildroot/package/libsigsegv/libsigsegv.mk
+++ b/bsp/buildroot/package/libsigsegv/libsigsegv.mk
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-LIBSIGSEGV_VERSION = 2.10
+LIBSIGSEGV_VERSION = 2.11
 LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv
 LIBSIGSEGV_INSTALL_STAGING = YES
 LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes
-LIBSIGSEGV_LICENSE = GPLv2+
+LIBSIGSEGV_LICENSE = GPL-2.0+
 LIBSIGSEGV_LICENSE_FILES = COPYING
 
-LIBSIGSEGV_AUTORECONF = YES
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libsilk/libsilk.hash b/bsp/buildroot/package/libsilk/libsilk.hash
new file mode 100644
index 00000000..2eab1c0d
--- /dev/null
+++ b/bsp/buildroot/package/libsilk/libsilk.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 01de52aa123f7bd20e500a076046f6b30d55f8e98c4029ab424bc51c46d7083d  libsilk-4268a02240c35c6055b0f237c46b09b2dcf79e45.tar.gz
diff --git a/bsp/buildroot/package/libsilk/libsilk.mk b/bsp/buildroot/package/libsilk/libsilk.mk
index eefdf8fd..eba70852 100644
--- a/bsp/buildroot/package/libsilk/libsilk.mk
+++ b/bsp/buildroot/package/libsilk/libsilk.mk
@@ -8,7 +8,7 @@ LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45
 # we use the FreeSwitch fork because it contains pkgconf support
 LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git
 LIBSILK_SITE_METHOD = git
-LIBSILK_LICENSE = BSD-3c
+LIBSILK_LICENSE = BSD-3-Clause
 LIBSILK_LICENSE_FILES = COPYING
 LIBSILK_AUTORECONF = YES
 LIBSILK_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libsndfile/Config.in b/bsp/buildroot/package/libsndfile/Config.in
index 9afe4966..4ccf9376 100644
--- a/bsp/buildroot/package/libsndfile/Config.in
+++ b/bsp/buildroot/package/libsndfile/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBSNDFILE
 	bool "libsndfile"
 	help
-	  Libsndfile is a C library for reading and writing files containing
-	  sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
-	  through one standard library interface.
+	  Libsndfile is a C library for reading and writing files
+	  containing sampled sound (such as MS Windows WAV and the
+	  Apple/SGI AIFF format) through one standard library interface.
 
 	  http://www.mega-nerd.com/libsndfile/
diff --git a/bsp/buildroot/package/libsndfile/libsndfile.mk b/bsp/buildroot/package/libsndfile/libsndfile.mk
index 0d152a7b..22909ffb 100644
--- a/bsp/buildroot/package/libsndfile/libsndfile.mk
+++ b/bsp/buildroot/package/libsndfile/libsndfile.mk
@@ -7,7 +7,7 @@
 LIBSNDFILE_VERSION = 1.0.28
 LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files
 LIBSNDFILE_INSTALL_STAGING = YES
-LIBSNDFILE_LICENSE = LGPLv2.1+
+LIBSNDFILE_LICENSE = LGPL-2.1+
 LIBSNDFILE_LICENSE_FILES = COPYING
 
 LIBSNDFILE_CONF_OPTS = \
diff --git a/bsp/buildroot/package/libsoc/libsoc.mk b/bsp/buildroot/package/libsoc/libsoc.mk
index 9bc2a9b8..bbc33143 100644
--- a/bsp/buildroot/package/libsoc/libsoc.mk
+++ b/bsp/buildroot/package/libsoc/libsoc.mk
@@ -6,7 +6,7 @@
 
 LIBSOC_VERSION = 0.8.2
 LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION))
-LIBSOC_LICENSE = LGPLv2.1
+LIBSOC_LICENSE = LGPL-2.1
 LIBSOC_LICENSE_FILES = LICENCE
 LIBSOC_AUTORECONF = YES
 LIBSOC_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libsocketcan/libsocketcan.mk b/bsp/buildroot/package/libsocketcan/libsocketcan.mk
index 65f3cb55..31ed0d39 100644
--- a/bsp/buildroot/package/libsocketcan/libsocketcan.mk
+++ b/bsp/buildroot/package/libsocketcan/libsocketcan.mk
@@ -8,6 +8,6 @@ LIBSOCKETCAN_VERSION = 0.0.10
 LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download
 LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2
 LIBSOCKETCAN_INSTALL_STAGING = YES
-LIBSOCKETCAN_LICENSE = LGPLv2.1+
+LIBSOCKETCAN_LICENSE = LGPL-2.1+
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libsodium/libsodium.hash b/bsp/buildroot/package/libsodium/libsodium.hash
index 3b129a0c..5cc07636 100644
--- a/bsp/buildroot/package/libsodium/libsodium.hash
+++ b/bsp/buildroot/package/libsodium/libsodium.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765	libsodium-1.0.11.tar.gz
+# https://download.libsodium.org/libsodium/releases/libsodium-1.0.16.tar.gz.sig
+sha256 eeadc7e1e1bcef09680fb4837d448fbdf57224978f865ac1c16745868fbd0533  libsodium-1.0.16.tar.gz
+sha256 6faf327c97dca6da69acefc6d3969d7bffb70a24f0707874870fdcfd6b0acf58  LICENSE
diff --git a/bsp/buildroot/package/libsodium/libsodium.mk b/bsp/buildroot/package/libsodium/libsodium.mk
index 1d21bb3d..ffdd1717 100644
--- a/bsp/buildroot/package/libsodium/libsodium.mk
+++ b/bsp/buildroot/package/libsodium/libsodium.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSODIUM_VERSION = 1.0.11
-LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases
+LIBSODIUM_VERSION = 1.0.16
+LIBSODIUM_SITE = https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)
 LIBSODIUM_LICENSE = ISC
 LIBSODIUM_LICENSE_FILES = LICENSE
 LIBSODIUM_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libsoundtouch/libsoundtouch.hash b/bsp/buildroot/package/libsoundtouch/libsoundtouch.hash
new file mode 100644
index 00000000..af0c3628
--- /dev/null
+++ b/bsp/buildroot/package/libsoundtouch/libsoundtouch.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 c805e7a72b7758a8986b71e73d2f94a8c79c66c1246fa2af1743c4282702e096  libsoundtouch-010a91a59071c7fefd316fca62c0d980ec85b4b1.tar.gz
diff --git a/bsp/buildroot/package/libsoundtouch/libsoundtouch.mk b/bsp/buildroot/package/libsoundtouch/libsoundtouch.mk
index cdfec20d..c4ac930b 100644
--- a/bsp/buildroot/package/libsoundtouch/libsoundtouch.mk
+++ b/bsp/buildroot/package/libsoundtouch/libsoundtouch.mk
@@ -7,7 +7,7 @@
 LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1
 LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git
 LIBSOUNDTOUCH_SITE_METHOD = git
-LIBSOUNDTOUCH_LICENSE = LGPLv2.1+
+LIBSOUNDTOUCH_LICENSE = LGPL-2.1+
 LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT
 LIBSOUNDTOUCH_AUTORECONF = YES
 LIBSOUNDTOUCH_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch b/bsp/buildroot/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch
new file mode 100644
index 00000000..46c7cb4f
--- /dev/null
+++ b/bsp/buildroot/package/libsoup/0001-cookie-jar-bail-if-hostname-is-an-empty-string.patch
@@ -0,0 +1,35 @@
+From 3f5635028bbad44287511fcd3c99f2a2fddf01cd Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Sun, 24 Jun 2018 19:46:19 -0500
+Subject: [PATCH] cookie-jar: bail if hostname is an empty string
+
+There are several other ways to fix the problem with this function, but
+skipping over all of the code is probably the simplest.
+
+Fixes #3
+
+
+(cherry picked from commit db2b0d5809d5f8226d47312b40992cadbcde439f)
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit db2b0d5809d
+
+ libsoup/soup-cookie-jar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libsoup/soup-cookie-jar.c b/libsoup/soup-cookie-jar.c
+index d12bc85a8e60..365da6abf9f4 100644
+--- a/libsoup/soup-cookie-jar.c
++++ b/libsoup/soup-cookie-jar.c
+@@ -306,7 +306,7 @@ get_cookies (SoupCookieJar *jar, SoupURI *uri, gboolean for_http, gboolean copy_
+ 
+ 	priv = SOUP_COOKIE_JAR_GET_PRIVATE (jar);
+ 
+-	if (!uri->host)
++	if (!uri->host || !uri->host[0])
+ 		return NULL;
+ 
+ 	/* The logic here is a little weird, but the plan is that if
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/libsoup/Config.in b/bsp/buildroot/package/libsoup/Config.in
index bc0ba950..599f9594 100644
--- a/bsp/buildroot/package/libsoup/Config.in
+++ b/bsp/buildroot/package/libsoup/Config.in
@@ -11,7 +11,7 @@ config BR2_PACKAGE_LIBSOUP
 	  and the GLib main loop, to integrate well with GNOME
 	  applications.
 
-	  http://live.gnome.org/LibSoup
+	  https://wiki.gnome.org/Projects/libsoup
 
 if BR2_PACKAGE_LIBSOUP
 
@@ -22,11 +22,15 @@ config BR2_PACKAGE_LIBSOUP_GNOME
 
 config BR2_PACKAGE_LIBSOUP_SSL
 	bool "https support"
+	depends on !BR2_STATIC_LIBS # gnutls
 	select BR2_PACKAGE_GLIB_NETWORKING
 	select BR2_PACKAGE_GNUTLS
 	help
 	  Enable HTTPS (SSL) support.
 
+comment "libsoup https support needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 endif
 
 comment "libsoup needs a toolchain w/ wchar, threads"
diff --git a/bsp/buildroot/package/libsoup/libsoup.mk b/bsp/buildroot/package/libsoup/libsoup.mk
index 6eed005b..a3ce686a 100644
--- a/bsp/buildroot/package/libsoup/libsoup.mk
+++ b/bsp/buildroot/package/libsoup/libsoup.mk
@@ -8,7 +8,7 @@ LIBSOUP_VERSION_MAJOR = 2.56
 LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).1
 LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz
 LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR)
-LIBSOUP_LICENSE = LGPLv2+
+LIBSOUP_LICENSE = LGPL-2.0+
 LIBSOUP_LICENSE_FILES = COPYING
 LIBSOUP_INSTALL_STAGING = YES
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
diff --git a/bsp/buildroot/package/libsoxr/libsoxr.mk b/bsp/buildroot/package/libsoxr/libsoxr.mk
index 0fdc5707..c1dc4b08 100644
--- a/bsp/buildroot/package/libsoxr/libsoxr.mk
+++ b/bsp/buildroot/package/libsoxr/libsoxr.mk
@@ -7,7 +7,7 @@
 LIBSOXR_VERSION = 0.1.2
 LIBSOXR_SOURCE = soxr-$(LIBSOXR_VERSION)-Source.tar.xz
 LIBSOXR_SITE = http://downloads.sourceforge.net/project/soxr
-LIBSOXR_LICENSE = LGPLv2.1+
+LIBSOXR_LICENSE = LGPL-2.1+
 LIBSOXR_LICENSE_FILES = LICENCE COPYING.LGPL
 LIBSOXR_INSTALL_STAGING = YES
 LIBSOXR_CONF_OPTS = -DWITH_OPENMP=OFF
diff --git a/bsp/buildroot/package/libspatialindex/0001-configure.ac-do-not-force-O2.patch b/bsp/buildroot/package/libspatialindex/0001-configure.ac-do-not-force-O2.patch
new file mode 100644
index 00000000..c078e713
--- /dev/null
+++ b/bsp/buildroot/package/libspatialindex/0001-configure.ac-do-not-force-O2.patch
@@ -0,0 +1,30 @@
+From 7472764fe19cb3eea77f21cc2859859b8ac62085 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Mon, 14 Aug 2017 23:36:36 +0200
+Subject: [PATCH] configure.ac: do not force -O2
+
+The user may want to provide its own set of optimization flags, and
+therefore forcing -O2 should not be done.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Submitted-upstream: https://github.com/libspatialindex/libspatialindex/pull/101
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index dc5e49f..2e2aa68 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -53,7 +53,7 @@ if test "x$enable_debug" = "xyes"; then
+ 	CXXFLAGS="$CXXFLAGS -g -DDEBUG"
+ 	AC_MSG_RESULT(checking wether debug information is enabled... yes)
+ else
+-	CXXFLAGS="$CXXFLAGS -O2 -DNDEBUG"
++	CXXFLAGS="$CXXFLAGS -DNDEBUG"
+ 	AC_MSG_RESULT(checking wether debug information is enabled... no)
+ fi
+ 
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/libspatialindex/Config.in b/bsp/buildroot/package/libspatialindex/Config.in
new file mode 100644
index 00000000..0d066f64
--- /dev/null
+++ b/bsp/buildroot/package/libspatialindex/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_LIBSPATIALINDEX
+	bool "libspatialindex"
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  The purpose of libspatialindex is to provide:
+
+	  * An extensible framework that will support robust spatial
+	    indexing methods.
+
+	  * Support for sophisticated spatial queries. Range, point
+	    location, nearest neighbor and k-nearest neighbor as well
+	    as parametric queries (defined by spatial constraints)
+	    should be easy to deploy and run.
+
+	  * Easy to use interfaces for inserting, deleting and updating
+	    information.
+
+	  * Wide variety of customization capabilities. Basic index and
+	    storage characteristics like the page size, node capacity,
+	    minimum fan-out, splitting algorithm, etc. should be easy
+	    to customize.
+
+	  * Index persistence. Internal memory and external memory
+	    structures should be supported. Clustered and non-clustered
+	    indices should be easy to be persisted.
+
+	  https://libspatialindex.github.io
+
+comment "libspatialindex needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/libspatialindex/libspatialindex.hash b/bsp/buildroot/package/libspatialindex/libspatialindex.hash
new file mode 100644
index 00000000..3aa636d3
--- /dev/null
+++ b/bsp/buildroot/package/libspatialindex/libspatialindex.hash
@@ -0,0 +1,4 @@
+# From http://download.osgeo.org/libspatialindex/spatialindex-src-1.8.5.tar.bz2.md5
+md5 3303c47fd85aa17e64ef52ebec212762 spatialindex-src-1.8.5.tar.bz2
+# Locally computed
+sha256 31ec0a9305c3bd6b4ad60a5261cba5402366dd7d1969a8846099717778e9a50a spatialindex-src-1.8.5.tar.bz2
diff --git a/bsp/buildroot/package/libspatialindex/libspatialindex.mk b/bsp/buildroot/package/libspatialindex/libspatialindex.mk
new file mode 100644
index 00000000..3a558dfc
--- /dev/null
+++ b/bsp/buildroot/package/libspatialindex/libspatialindex.mk
@@ -0,0 +1,26 @@
+################################################################################
+#
+# libspatialindex
+#
+################################################################################
+
+LIBSPATIALINDEX_VERSION = 1.8.5
+LIBSPATIALINDEX_SITE = http://download.osgeo.org/libspatialindex
+LIBSPATIALINDEX_SOURCE = spatialindex-src-$(LIBSPATIALINDEX_VERSION).tar.bz2
+LIBSPATIALINDEX_INSTALL_STAGING = YES
+LIBSPATIALINDEX_LICENSE = MIT
+LIBSPATIALINDEX_LICENSE_FILES = COPYING
+
+# 0001-configure.ac-do-not-force-O2.patch
+LIBSPATIALINDEX_AUTORECONF = YES
+
+LIBSPATIALINDEX_CXXFLAGS = $(TARGET_CXXFLAGS)
+LIBSPATIALINDEX_CONF_ENV = CXXFLAGS="$(LIBSPATIALINDEX_CXXFLAGS)"
+
+# Workaround gcc ICE
+# (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485)
+ifeq ($(BR2_microblaze),y)
+LIBSPATIALINDEX_CXXFLAGS += -O0
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libsquish/0001-kodi.patch b/bsp/buildroot/package/libsquish/0001-kodi.patch
deleted file mode 100644
index a9bca669..00000000
--- a/bsp/buildroot/package/libsquish/0001-kodi.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-Add Kodi-specific patch
-
-Kodi 15.0 contains an updated version of libsquish:
-https://github.com/xbmc/xbmc/tree/master/tools/depends/native/libsquish-native
-
-The OpenElec project provides a separate tarball including the Kodi-
-specific patches:
-http://sources.openelec.tv/devel/libsquish-1.10-openelec.tar.gz
-
-This patch contains the relevant diff between upstream libsquish 1.13
-and the OpenElec tarball.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uwNr 1.13/squish.cpp libsquish-1.10-openelec/squish.cpp
---- 1.13/squish.cpp	2015-04-30 12:48:49.000000000 +0200
-+++ libsquish-1.10-openelec/squish.cpp	2015-01-09 10:58:43.000000000 +0100
-@@ -23,6 +23,7 @@
- 
-    -------------------------------------------------------------------------- */
- 
-+#include <string.h>
- #include <squish.h>
- #include "colourset.h"
- #include "maths.h"
-@@ -39,7 +40,7 @@
-     // grab the flag bits
-     int method = flags & ( kDxt1 | kDxt3 | kDxt5 );
-     int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit );
--    int extra = flags & kWeightColourByAlpha;
-+	int extra = flags & ( kWeightColourByAlpha | kSourceBGRA );
- 
-     // set defaults
-     if( method != kDxt3 && method != kDxt5 )
-@@ -124,8 +125,30 @@
-     return blockcount*blocksize;
- }
- 
-+void CopyRGBA( u8 const* source, u8* dest, int flags )
-+{
-+	if (flags & kSourceBGRA)
-+	{
-+		// convert from bgra to rgba
-+		dest[0] = source[2];
-+		dest[1] = source[1];
-+		dest[2] = source[0];
-+		dest[3] = source[3];
-+	}
-+	else
-+	{
-+		for( int i = 0; i < 4; ++i )
-+			*dest++ = *source++;
-+	}
-+}
-+
- void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric )
- {
-+	CompressImage(rgba, width, height, width*4, blocks, flags, metric);
-+}
-+  
-+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric )
-+{
-     // fix any bad flags
-     flags = FixFlags( flags );
- 
-@@ -154,20 +177,14 @@
-                     if( sx < width && sy < height )
-                     {
-                         // copy the rgba value
--                        u8 const* sourcePixel = rgba + 4*( width*sy + sx );
--                        for( int i = 0; i < 4; ++i )
--                            *targetPixel++ = *sourcePixel++;
--
-+						u8 const* sourcePixel = rgba + pitch*sy + 4*sx;
-+						CopyRGBA(sourcePixel, targetPixel, flags);
-                         // enable this pixel
-                         mask |= ( 1 << ( 4*py + px ) );
-                     }
--                    else
--                    {
--                        // skip this pixel as its outside the image
-                         targetPixel += 4;
-                     }
-                 }
--            }
- 
-             // compress it into the output
-             CompressMasked( sourceRgba, mask, targetBlock, flags, metric );
-@@ -180,6 +197,11 @@
- 
- void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags )
- {
-+	DecompressImage( rgba, width, height, width*4, blocks, flags );
-+}
-+
-+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags )
-+{
-     // fix any bad flags
-     flags = FixFlags( flags );
- 
-@@ -207,24 +229,132 @@
-                     int sy = y + py;
-                     if( sx < width && sy < height )
-                     {
--                        u8* targetPixel = rgba + 4*( width*sy + sx );
-+						u8* targetPixel = rgba + pitch*sy + 4*sx;
- 
-                         // copy the rgba value
-+						CopyRGBA(sourcePixel, targetPixel, flags);
-+					}
-+					sourcePixel += 4;
-+				}
-+			}
-+			
-+			// advance
-+			sourceBlock += bytesPerBlock;
-+		}
-+	}
-+}
-+
-+static double ErrorSq(double x, double y)
-+{
-+	return (x - y) * (x - y);
-+}
-+
-+static void ComputeBlockWMSE(u8 const *original, u8 const *compressed, unsigned int w, unsigned int h, double &cmse, double &amse)
-+{
-+	// Computes the MSE for the block and weights it by the variance of the original block.
-+	// If the variance of the original block is less than 4 (i.e. a standard deviation of 1 per channel)
-+	// then the block is close to being a single colour. Quantisation errors in single colour blocks
-+	// are easier to see than similar errors in blocks that contain more colours, particularly when there
-+	// are many such blocks in a large area (eg a blue sky background) as they cause banding.  Given that
-+	// banding is easier to see than small errors in "complex" blocks, we weight the errors by a factor
-+	// of 5. This implies that images with large, single colour areas will have a higher potential WMSE
-+	// than images with lots of detail.
-+
-+	cmse = amse = 0;
-+	unsigned int sum_p[4];  // per channel sum of pixels
-+	unsigned int sum_p2[4]; // per channel sum of pixels squared
-+	memset(sum_p, 0, sizeof(sum_p));
-+	memset(sum_p2, 0, sizeof(sum_p2));
-+	for( unsigned int py = 0; py < 4; ++py )
-+	{
-+		for( unsigned int px = 0; px < 4; ++px )
-+		{
-+			if( px < w && py < h )
-+			{
-+				double pixelCMSE = 0;
-+				for( int i = 0; i < 3; ++i )
-+				{
-+					pixelCMSE += ErrorSq(original[i], compressed[i]);
-+					sum_p[i] += original[i];
-+					sum_p2[i] += (unsigned int)original[i]*original[i];
-+				}
-+				if( original[3] == 0 && compressed[3] == 0 )
-+					pixelCMSE = 0; // transparent in both, so colour is inconsequential
-+				amse += ErrorSq(original[3], compressed[3]);
-+				cmse += pixelCMSE;
-+				sum_p[3] += original[3];
-+				sum_p2[3] += (unsigned int)original[3]*original[3];
-+			}
-+			original += 4;
-+			compressed += 4;
-+		}
-+	}
-+	unsigned int variance = 0;
-                         for( int i = 0; i < 4; ++i )
--                            *targetPixel++ = *sourcePixel++;
-+		variance += w*h*sum_p2[i] - sum_p[i]*sum_p[i];
-+	if( variance < 4 * w * w * h * h )
-+	{
-+		amse *= 5;
-+		cmse *= 5;
-                     }
--                    else
-+}
-+  
-+void ComputeMSE( u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
-                     {
--                        // skip this pixel as its outside the image
--                        sourcePixel += 4;
-+	ComputeMSE(rgba, width, height, width*4, dxt, flags, colourMSE, alphaMSE);
-+}
-+                
-+void ComputeMSE( u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE )
-+{
-+	// fix any bad flags
-+	flags = FixFlags( flags );
-+	colourMSE = alphaMSE = 0;
-+
-+	// initialise the block input
-+	squish::u8 const* sourceBlock = dxt;
-+	int bytesPerBlock = ( ( flags & squish::kDxt1 ) != 0 ) ? 8 : 16;
-+
-+	// loop over blocks
-+	for( int y = 0; y < height; y += 4 )
-+	{
-+		for( int x = 0; x < width; x += 4 )
-+		{
-+			// decompress the block
-+			u8 targetRgba[4*16];
-+			Decompress( targetRgba, sourceBlock, flags );
-+			u8 const* sourcePixel = targetRgba;
-+
-+			// copy across to a similar pixel block
-+			u8 originalRgba[4*16];
-+			u8* originalPixel = originalRgba;
-+
-+			for( int py = 0; py < 4; ++py )
-+			{
-+				for( int px = 0; px < 4; ++px )
-+				{
-+					int sx = x + px;
-+					int sy = y + py;
-+					if( sx < width && sy < height )
-+					{
-+						u8 const* targetPixel = rgba + pitch*sy + 4*sx;
-+						CopyRGBA(targetPixel, originalPixel, flags);
-                     }
-+					sourcePixel += 4;
-+					originalPixel += 4;
-                 }
-             }
- 
-+			// compute the weighted MSE of the block
-+			double blockCMSE, blockAMSE;
-+			ComputeBlockWMSE(originalRgba, targetRgba, std::min(4, width - x), std::min(4, height - y), blockCMSE, blockAMSE);
-+			colourMSE += blockCMSE;
-+			alphaMSE += blockAMSE;
-             // advance
-             sourceBlock += bytesPerBlock;
-         }
-     }
-+	colourMSE /= (width * height * 3);
-+	alphaMSE /= (width * height);
- }
- 
- } // namespace squish
-diff -uwNr 1.13/squish.h libsquish-1.10-openelec/squish.h
---- 1.13/squish.h	2015-04-30 12:55:27.000000000 +0200
-+++ libsquish-1.10-openelec/squish.h	2015-01-09 10:58:43.000000000 +0100
-@@ -57,7 +57,10 @@
-     kColourRangeFit = ( 1 << 4 ),
- 
-     //! Weight the colour by alpha during cluster fit (disabled by default).
--    kWeightColourByAlpha = ( 1 << 7 )
-+	kWeightColourByAlpha = ( 1 << 7 ),
-+	
-+	//! Source is BGRA rather than RGBA
-+	kSourceBGRA = ( 1 << 9 ),
- };
- 
- // -----------------------------------------------------------------------------
-@@ -194,6 +197,7 @@
-     @param rgba   The pixels of the source.
-     @param width  The width of the source image.
-     @param height The height of the source image.
-+	@param pitch	The pitch of the source image.
-     @param blocks Storage for the compressed output.
-     @param flags  Compression flags.
-     @param metric An optional perceptual metric.
-@@ -231,6 +235,7 @@
-     to allocate for the compressed output.
- */
- void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 );
-+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 );
- 
- // -----------------------------------------------------------------------------
- 
-@@ -239,6 +244,7 @@
-     @param rgba   Storage for the decompressed pixels.
-     @param width  The width of the source image.
-     @param height The height of the source image.
-+	@param pitch    The pitch of the decompressed pixels.
-     @param blocks The compressed DXT blocks.
-     @param flags  Compression flags.
- 
-@@ -254,6 +260,32 @@
-     Internally this function calls squish::Decompress for each block.
- */
- void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags );
-+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags );
-+
-+// -----------------------------------------------------------------------------
-+
-+/*! @brief Computes MSE of an compressed image in memory.
-+
-+	@param rgba		The original image pixels.
-+	@param width	The width of the source image.
-+	@param height	The height of the source image.
-+	@param pitch  	The pitch of the source image.
-+	@param dxt		The compressed dxt blocks
-+	@param flags	Compression flags.
-+	@param colourMSE	The MSE of the colour values.
-+	@param alphaMSE	The MSE of the alpha values.
-+	
-+	The colour MSE and alpha MSE are computed across all pixels. The colour MSE is
-+	averaged across all rgb values (i.e. colourMSE = sum sum_k ||dxt.k - rgba.k||/3)
-+	
-+	The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, 
-+	however, DXT1 will be used by default if none is specified. All other flags 
-+	are ignored.
-+
-+	Internally this function calls squish::Decompress for each block.
-+*/
-+void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
-+void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE);
- 
- // -----------------------------------------------------------------------------
- 
-diff -uwNr 1.13/squish.pc.in libsquish-1.10-openelec/squish.pc.in
---- 1.13/squish.pc	1970-01-01 01:00:00.000000000 +0100
-+++ libsquish-1.10-openelec/squish.pc	2015-01-09 10:58:43.000000000 +0100
-@@ -0,0 +1,13 @@
-+prefix=/usr
-+exec_prefix=${prefix}
-+libdir=${prefix}/lib
-+sharedlibdir=${libdir}
-+includedir=${prefix}/include
-+
-+Name: squish
-+Description: squish DXT lib
-+Version: 1.1.3-kodi
-+
-+Requires:
-+Libs: -L${libdir} -L${sharedlibdir} -lsquish
-+Cflags: -I${includedir}
diff --git a/bsp/buildroot/package/libsquish/libsquish.hash b/bsp/buildroot/package/libsquish/libsquish.hash
index caa71986..e68d28d6 100644
--- a/bsp/buildroot/package/libsquish/libsquish.hash
+++ b/bsp/buildroot/package/libsquish/libsquish.hash
@@ -1,2 +1,3 @@
 # From http://sourceforge.net/projects/libsquish/files
-sha1	7bcdd7d0f0460a29e25dcdab8dc41a30e58bb366	libsquish-1.13.tgz
+sha1 51844b9a8bc815a27e2cc0ffbede5fee3ef75110 libsquish-1.15.tgz
+md5 c02645800131e55b519ff8dbe7284f93 libsquish-1.15.tgz
diff --git a/bsp/buildroot/package/libsquish/libsquish.mk b/bsp/buildroot/package/libsquish/libsquish.mk
index 73f8de9c..67892dd9 100644
--- a/bsp/buildroot/package/libsquish/libsquish.mk
+++ b/bsp/buildroot/package/libsquish/libsquish.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-LIBSQUISH_VERSION = 1.13
+LIBSQUISH_VERSION = 1.15
 LIBSQUISH_SOURCE = libsquish-$(LIBSQUISH_VERSION).tgz
 LIBSQUISH_SITE = http://downloads.sourceforge.net/project/libsquish
 LIBSQUISH_INSTALL_STAGING = YES
 LIBSQUISH_STRIP_COMPONENTS = 0
 LIBSQUISH_LICENSE = MIT
-LIBSQUISH_LICENSE_FILES = README
+LIBSQUISH_LICENSE_FILES = LICENSE.txt
 
 define LIBSQUISH_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
@@ -21,7 +21,7 @@ define LIBSQUISH_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/lib
 	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
 		install PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr
-	$(INSTALL) -D -m 644 $(@D)/squish.pc $(STAGING_DIR)/usr/lib/pkgconfig/squish.pc
+	$(INSTALL) -D -m 644 $(@D)/libsquish.pc $(STAGING_DIR)/usr/lib/pkgconfig/libsquish.pc
 	ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so
 	ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so.0
 endef
diff --git a/bsp/buildroot/package/libsrtp/libsrtp.mk b/bsp/buildroot/package/libsrtp/libsrtp.mk
index 40b85e69..9e72856c 100644
--- a/bsp/buildroot/package/libsrtp/libsrtp.mk
+++ b/bsp/buildroot/package/libsrtp/libsrtp.mk
@@ -7,7 +7,7 @@
 LIBSRTP_VERSION = v1.5.4
 LIBSRTP_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_VERSION))
 LIBSRTP_INSTALL_STAGING = YES
-LIBSRTP_LICENSE = BSD-3c
+LIBSRTP_LICENSE = BSD-3-Clause
 LIBSRTP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/libss7/Config.in b/bsp/buildroot/package/libss7/Config.in
new file mode 100644
index 00000000..bdf5fbe3
--- /dev/null
+++ b/bsp/buildroot/package/libss7/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_LIBSS7
+	bool "libss7"
+	depends on BR2_USE_MMU # dahdi-tools <- perl
+	depends on BR2_LINUX_KERNEL
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_DAHDI_LINUX
+	select BR2_PACKAGE_DAHDI_TOOLS
+	help
+	  libss7 is an open source library that encapsulates the
+	  protocols used to communicate using Signaling System 7
+	  over ISDN (T1, E1).
+
+	  http://www.asterisk.org/downloads/libss7
+
+comment "libss7 needs a kernel to be built"
+	depends on !BR2_LINUX_KERNEL
+
+comment "libss7 needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libss7/libss7.hash b/bsp/buildroot/package/libss7/libss7.hash
new file mode 100644
index 00000000..8e1d6635
--- /dev/null
+++ b/bsp/buildroot/package/libss7/libss7.hash
@@ -0,0 +1,6 @@
+# Hashes from http://downloads.asterisk.org/pub/telephony/libss7/releases/
+sha1    7112a0717293fc273d5d488e1387ad28abe4e9b3  libss7-2.0.0.tar.gz
+sha256  5af00853cfb2bc6bcf050947804db132ae6872db0cd2ab24b5378828f78eda52  libss7-2.0.0.tar.gz
+
+# License file, locally calculated
+sha256  fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7  LICENSE
diff --git a/bsp/buildroot/package/libss7/libss7.mk b/bsp/buildroot/package/libss7/libss7.mk
new file mode 100644
index 00000000..541505b2
--- /dev/null
+++ b/bsp/buildroot/package/libss7/libss7.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# libss7
+#
+################################################################################
+
+LIBSS7_VERSION = 2.0.0
+LIBSS7_SITE = http://downloads.asterisk.org/pub/telephony/libss7/releases
+
+LIBSS7_LICENSE = GPL-2.0
+LIBSS7_LICENSE_FILES = LICENSE
+
+LIBSS7_DEPENDENCIES = dahdi-linux dahdi-tools
+LIBSS7_INSTALL_STAGING = YES
+
+# The Makefile default rule will always try to generate both libraries.
+# So we need to explicitly build only what we can.
+ifneq ($(BR2_SHARED_LIBS),y)
+LIBSS7_LIBS = libss7.a
+define LIBSS7_INSTALL_A
+	$(INSTALL) -D -m 0644 $(@D)/libss7.a $(1)/usr/lib/libss7.a
+endef
+endif
+
+ifneq ($(BR2_STATIC_LIBS),y)
+LIBSS7_LIBS += libss7.so.2.0
+define LIBSS7_INSTALL_SO
+	$(INSTALL) -D -m 0644 $(@D)/libss7.so.2.0 $(1)/usr/lib/libss7.so.2.0
+	ln -sf libss7.so.2.0 $(1)/usr/lib/libss7.so
+endef
+endif
+
+# The Makefile erroneously looks for host headers to decide what utilities
+# to build, and thus misses the test utilities. So we explicitly build them
+# as they can be useful to validate that the hardware does work.
+LIBSS7_UTILS = parser_debug ss7test ss7linktest
+
+define LIBSS7_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		$(LIBSS7_LIBS) $(LIBSS7_UTILS)
+endef
+
+define LIBSS7_INSTALL_STAGING_CMDS
+	$(call LIBSS7_INSTALL_A,$(STAGING_DIR))
+	$(call LIBSS7_INSTALL_SO,$(STAGING_DIR))
+	$(INSTALL) -D -m 0644 $(@D)/libss7.h $(STAGING_DIR)/usr/include/libss7.h
+endef
+
+define LIBSS7_INSTALL_TARGET_CMDS
+	$(foreach u,$(LIBSS7_UTILS),\
+		$(INSTALL) -D -m 0755 $(@D)/$(u) $(TARGET_DIR)/usr/sbin/$(u)$(sep))
+	$(call LIBSS7_INSTALL_SO,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/libssh/libssh.hash b/bsp/buildroot/package/libssh/libssh.hash
index 1eef804e..009a335e 100644
--- a/bsp/buildroot/package/libssh/libssh.hash
+++ b/bsp/buildroot/package/libssh/libssh.hash
@@ -1,4 +1,5 @@
 # from https://red.libssh.org/projects/libssh/files/
-md5	05465da8004f3258db946346213209de	libssh-0.7.3.tar.xz
-# Locally calculated after checking signature on uncompressed libssh-0.7.3.tar
-sha256	26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98  libssh-0.7.3.tar.xz
+md5	d3fc864208bf607ad87cdee836894feb	libssh-0.7.5.tar.xz
+# Locally calculated after checking signature on uncompressed libssh-0.7.5.tar
+# https://red.libssh.org/attachments/download/217/libssh-0.7.5.tar.asc
+sha256	54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095  libssh-0.7.5.tar.xz
diff --git a/bsp/buildroot/package/libssh/libssh.mk b/bsp/buildroot/package/libssh/libssh.mk
index 429e3c17..902865d7 100644
--- a/bsp/buildroot/package/libssh/libssh.mk
+++ b/bsp/buildroot/package/libssh/libssh.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-LIBSSH_VERSION = 0.7.3
+LIBSSH_VERSION_MAJOR = 0.7
+LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5
 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
-LIBSSH_SITE = https://red.libssh.org/attachments/download/195
-LIBSSH_LICENSE = LGPLv2.1
+LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
+LIBSSH_LICENSE = LGPL-2.1
 LIBSSH_LICENSE_FILES = COPYING
 LIBSSH_INSTALL_STAGING = YES
 LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO
diff --git a/bsp/buildroot/package/libssh2/0001-drop-custom-buildconf-script.patch b/bsp/buildroot/package/libssh2/0001-drop-custom-buildconf-script.patch
new file mode 100644
index 00000000..a9a98e08
--- /dev/null
+++ b/bsp/buildroot/package/libssh2/0001-drop-custom-buildconf-script.patch
@@ -0,0 +1,121 @@
+From 39a2a444a32896bd2dab37c9b247ccfd11ff4693 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Mon, 30 Oct 2017 19:29:12 +0100
+Subject: [PATCH] buildsystem: drop custom buildconf script, rely on autoreconf
+
+The buildconf script is currently required, because we need to copy a
+header around, because it is used both from the library and the examples
+sources.
+
+However, having a custom 'buildconf'-like script is not needed if we can
+ensure that the header / exists by the time it is needed. For That, we
+can just append the src/ directory to the headers search path for the
+examples.
+
+And then it means we no longer need to generate the same header twice,
+so we remove the second one from configure.ac.
+
+Now, we can just call "autoreconf -fi" to generate the autotools files,
+instead of relying on the canned sequence in "buildconf", since
+autoreconf has now long known what to do at the correct moment (future
+versions of autotools, automake, autopoint, autoheader etc... may
+require an other ordering, or other intermediate steps, etc...).
+
+Eventually, get rid of buildconf now it is no longer needed. In fact, we
+really keep it for legacy, but have it just call autoreconf (and print a
+nice user-friendly warning).
+
+Update gitignore accordingly, too.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Cc: Sam Voss <sam.voss@rockwellcollins.com>
+---
+ .gitignore          |  2 ++
+ buildconf           | 24 +++++-------------------
+ configure.ac        |  2 +-
+ example/.gitignore  |  2 --
+ example/Makefile.am |  2 +-
+ 5 files changed, 9 insertions(+), 23 deletions(-)
+
+diff --git a/.gitignore b/.gitignore
+index 997e51e1..b6d6b5cb 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -13,6 +13,8 @@ Makefile
+ Makefile.in
+ aclocal.m4
+ autom4te.cache
++compile
++test-driver
+ config.guess
+ config.log
+ config.status
+diff --git a/buildconf b/buildconf
+index 558dcb66..728b3397 100755
+--- a/buildconf
++++ b/buildconf
+@@ -1,22 +1,8 @@
+ #!/bin/sh
+ 
+-LIBTOOLIZE="libtoolize"
++echo "***" >&2
++echo "*** Do not use buildconf. Instead, just use: autoreconf -fi" >&2
++echo "*** Doing it for you now, but buildconf may disapear in the future." >&2
++echo "***" >&2
+ 
+-if [ "x`which $LIBTOOLIZE`" = "x" ]; then
+-    LIBTOOLIZE="glibtoolize"
+-fi
+-
+-if [ "x`which $LIBTOOLIZE`" = "x" ]; then
+-    echo "Neither libtoolize nor glibtoolize could be found!"
+-    exit 1
+-fi
+-
+-${LIBTOOLIZE} --copy --automake --force
+-${ACLOCAL:-aclocal} -I m4 $ACLOCAL_FLAGS
+-${AUTOHEADER:-autoheader}
+-# copy the private libssh2_config.h.in to the examples dir so that
+-# it can be included without pointing the include path to the private
+-# source dir
+-cp src/libssh2_config.h.in example/libssh2_config.h.in
+-${AUTOCONF:-autoconf}
+-${AUTOMAKE:-automake} --add-missing --copy
++${AUTORECONF:-autoreconf} -fi "${@}"
+diff --git a/configure.ac b/configure.ac
+index c6ff7535..6939d0d6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ AC_INIT(libssh2, [-], libssh2-devel@cool.haxx.se)
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_SRCDIR([src])
+-AC_CONFIG_HEADERS([src/libssh2_config.h example/libssh2_config.h])
++AC_CONFIG_HEADERS([src/libssh2_config.h])
+ AM_MAINTAINER_MODE
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+diff --git a/example/.gitignore b/example/.gitignore
+index 13448191..cac152b8 100644
+--- a/example/.gitignore
++++ b/example/.gitignore
+@@ -20,8 +20,6 @@ sftp_write_nonblock
+ config.h.in
+ ssh2_exec
+ ssh2_agent
+-libssh2_config.h
+-libssh2_config.h.in
+ stamp-h2
+ sftp_append
+ sftp_write_sliding
+diff --git a/example/Makefile.am b/example/Makefile.am
+index 5cf5f071..41f65b12 100644
+--- a/example/Makefile.am
++++ b/example/Makefile.am
+@@ -13,5 +13,5 @@ if HAVE_SYS_UN_H
+ noinst_PROGRAMS += x11
+ endif
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/example
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/example -I../src
+ LDADD = $(top_builddir)/src/libssh2.la
diff --git a/bsp/buildroot/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch b/bsp/buildroot/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch
new file mode 100644
index 00000000..76e08c51
--- /dev/null
+++ b/bsp/buildroot/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch
@@ -0,0 +1,31 @@
+From f4846473f0f0ec313f8ed7ff4cd9f59c1741465d Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 20 Mar 2018 20:21:53 +0200
+Subject: [PATCH] acinclude.m4: add mbedtls to LIBS
+
+This is useful for static builds so that the Libs.private field in
+libssh2.pc contains correct info for the benefit of pkg-config users.
+Static link with libssh2 requires this information.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/libssh2/libssh2/pull/242
+
+ acinclude.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index c0e89a1a0c98..02c70845d27c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -441,6 +441,7 @@ m4_case([$1],
+ [mbedtls], [
+   LIBSSH2_LIB_HAVE_LINKFLAGS([mbedcrypto], [], [#include <mbedtls/version.h>], [
+     AC_DEFINE(LIBSSH2_MBEDTLS, 1, [Use $1])
++    LIBS="$LIBS $LIBMBEDCRYPTO"
+     found_crypto="$1"
+     support_clear_memory=yes
+   ])
+-- 
+2.16.2
+
diff --git a/bsp/buildroot/package/libssh2/Config.in b/bsp/buildroot/package/libssh2/Config.in
index 2944624e..90c38813 100644
--- a/bsp/buildroot/package/libssh2/Config.in
+++ b/bsp/buildroot/package/libssh2/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBSSH2
 	bool "libssh2"
-	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
+	select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_MBEDTLS || BR2_PACKAGE_LIBGCRYPT)
 	help
 	  libssh2 is a client-side C library implementing the SSH2
 	  protocol as defined by Internet Drafts: SECSH-TRANS(22),
@@ -8,3 +8,25 @@ config BR2_PACKAGE_LIBSSH2
 	  SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10)
 
 	  http://www.libssh2.org/
+
+if BR2_PACKAGE_LIBSSH2
+
+choice
+	prompt "Crypto Backend"
+	help
+	  Select crypto library to be used in libssh2.
+
+config BR2_PACKAGE_LIBSSH2_MBEDTLS
+	bool "mbedtls"
+	depends on BR2_PACKAGE_MBEDTLS
+
+config BR2_PACKAGE_LIBSSH2_LIBGCRYPT
+	bool "gcrypt"
+	depends on BR2_PACKAGE_LIBGCRYPT
+
+config BR2_PACKAGE_LIBSSH2_OPENSSL
+	bool "openssl"
+	depends on BR2_PACKAGE_OPENSSL
+
+endchoice
+endif
diff --git a/bsp/buildroot/package/libssh2/libssh2.hash b/bsp/buildroot/package/libssh2/libssh2.hash
index 8f6268f3..d36262ad 100644
--- a/bsp/buildroot/package/libssh2/libssh2.hash
+++ b/bsp/buildroot/package/libssh2/libssh2.hash
@@ -1,2 +1,2 @@
-# Locally calculated after checking pgp signature
-sha256	e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584	libssh2-1.7.0.tar.gz
+# Locally calculated
+sha256 e73d55cd512863aa6423c6e137039e3e1bcbf5ba87f130e7441132c2c78a5425 libssh2-616fd4d1b3e4a55de67c48819fefca83132126b5.tar.gz
diff --git a/bsp/buildroot/package/libssh2/libssh2.mk b/bsp/buildroot/package/libssh2/libssh2.mk
index 847c2f1b..c5b0bd85 100644
--- a/bsp/buildroot/package/libssh2/libssh2.mk
+++ b/bsp/buildroot/package/libssh2/libssh2.mk
@@ -4,28 +4,31 @@
 #
 ################################################################################
 
-LIBSSH2_VERSION = 1.7.0
-LIBSSH2_SITE = http://www.libssh2.org/download
+LIBSSH2_VERSION = 616fd4d1b3e4a55de67c48819fefca83132126b5
+LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION))
 LIBSSH2_LICENSE = BSD
 LIBSSH2_LICENSE_FILES = COPYING
 LIBSSH2_INSTALL_STAGING = YES
 LIBSSH2_CONF_OPTS = --disable-examples-build
 
-# Dependency is either on libgcrypt or openssl, guaranteed in Config.in.
-# Favour libgcrypt.
-ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+# building from a git clone
+LIBSSH2_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_LIBSSH2_MBEDTLS),y)
+LIBSSH2_DEPENDENCIES += mbedtls
+LIBSSH2_CONF_OPTS += --with-libmbedcrypto-prefix=$(STAGING_DIR)/usr \
+	--with-crypto=mbedtls
+else ifeq ($(BR2_PACKAGE_LIBSSH2_LIBGCRYPT),y)
 LIBSSH2_DEPENDENCIES += libgcrypt
-LIBSSH2_CONF_OPTS += --with-libgcrypt \
-	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
-	--without-openssl
+LIBSSH2_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
+	--with-crypto=libgcrypt
 # configure.ac forgets to link to dependent libraries of gcrypt breaking static
 # linking
 LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
-else
+else ifeq ($(BR2_PACKAGE_LIBSSH2_OPENSSL),y)
 LIBSSH2_DEPENDENCIES += openssl
-LIBSSH2_CONF_OPTS += --with-openssl \
-	--with-libssl-prefix=$(STAGING_DIR)/usr \
-	--without-libgcrypt
+LIBSSH2_CONF_OPTS += --with-libssl-prefix=$(STAGING_DIR)/usr \
+	--with-crypto=openssl
 endif
 
 # Add zlib support if enabled
@@ -37,4 +40,10 @@ else
 LIBSSH2_CONF_OPTS += --without-libz
 endif
 
+HOST_LIBSSH2_DEPENDENCIES += host-openssl
+HOST_LIBSSH2_CONF_OPTS += --with-openssl \
+	--with-libssl-prefix=$(HOST_DIR)/usr \
+	--without-libgcrypt
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/libstrophe/0001-Namespace-SHA-functions.patch b/bsp/buildroot/package/libstrophe/0001-Namespace-SHA-functions.patch
new file mode 100644
index 00000000..8c3451bb
--- /dev/null
+++ b/bsp/buildroot/package/libstrophe/0001-Namespace-SHA-functions.patch
@@ -0,0 +1,189 @@
+From b08766c8e46956daba010044b00c97f78b598780 Mon Sep 17 00:00:00 2001
+From: Michael Santos <michael.santos@gmail.com>
+Date: Sun, 24 May 2015 10:55:02 -0400
+Subject: [PATCH] Namespace SHA functions
+
+Fix statically linking against libstrophe by renaming the internal SHA
+functions:
+
+https://github.com/strophe/libstrophe/issues/40
+
+Although the same function names are used by libstrophe and OpenSSL,
+the signatures and contexts of the SHA functions differ, resulting in
+a segfault if the OpenSSL versions are substituted.
+
+[Upstream commit: https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/auth.c  |  8 ++++----
+ src/scram.c | 22 +++++++++++-----------
+ src/sha1.c  | 30 +++++++++++++++---------------
+ src/sha1.h  |  6 +++---
+ 4 files changed, 33 insertions(+), 33 deletions(-)
+
+diff --git a/src/auth.c b/src/auth.c
+index b06f18c..3506977 100644
+--- a/src/auth.c
++++ b/src/auth.c
+@@ -1187,10 +1187,10 @@ int _handle_component_auth(xmpp_conn_t * const conn)
+     /* Feed the session id and passphrase to the algorithm.
+      * We need to compute SHA1(session_id + passphrase)
+      */
+-    SHA1_Init(&mdctx);
+-    SHA1_Update(&mdctx, (uint8_t*)conn->stream_id, strlen(conn->stream_id));
+-    SHA1_Update(&mdctx, (uint8_t*)conn->pass, strlen(conn->pass));
+-    SHA1_Final(&mdctx, md_value);
++    xmpp_SHA1_Init(&mdctx);
++    xmpp_SHA1_Update(&mdctx, (uint8_t*)conn->stream_id, strlen(conn->stream_id));
++    xmpp_SHA1_Update(&mdctx, (uint8_t*)conn->pass, strlen(conn->pass));
++    xmpp_SHA1_Final(&mdctx, md_value);
+ 
+     digest = xmpp_alloc(conn->ctx, 2*sizeof(md_value)+1);
+     if (digest) {
+diff --git a/src/scram.c b/src/scram.c
+index 5cce168..6e420e1 100644
+--- a/src/scram.c
++++ b/src/scram.c
+@@ -37,9 +37,9 @@ static void SHA1(const uint8_t* data, size_t len,
+                  uint8_t digest[SHA1_DIGEST_SIZE])
+ {
+     SHA1_CTX ctx;
+-    SHA1_Init(&ctx);
+-    SHA1_Update(&ctx, data, len);
+-    SHA1_Final(&ctx, digest);
++    xmpp_SHA1_Init(&ctx);
++    xmpp_SHA1_Update(&ctx, data, len);
++    xmpp_SHA1_Final(&ctx, digest);
+ }
+ 
+ static void HMAC_SHA1(const uint8_t *key, size_t key_len,
+@@ -66,15 +66,15 @@ static void HMAC_SHA1(const uint8_t *key, size_t key_len,
+         key_opad[i] = key_pad[i] ^ opad;
+     }
+ 
+-    SHA1_Init(&ctx);
+-    SHA1_Update(&ctx, key_ipad, BLOCK_SIZE);
+-    SHA1_Update(&ctx, text, len);
+-    SHA1_Final(&ctx, sha_digest);
++    xmpp_SHA1_Init(&ctx);
++    xmpp_SHA1_Update(&ctx, key_ipad, BLOCK_SIZE);
++    xmpp_SHA1_Update(&ctx, text, len);
++    xmpp_SHA1_Final(&ctx, sha_digest);
+ 
+-    SHA1_Init(&ctx);
+-    SHA1_Update(&ctx, key_opad, BLOCK_SIZE);
+-    SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE);
+-    SHA1_Final(&ctx, digest);
++    xmpp_SHA1_Init(&ctx);
++    xmpp_SHA1_Update(&ctx, key_opad, BLOCK_SIZE);
++    xmpp_SHA1_Update(&ctx, sha_digest, SHA1_DIGEST_SIZE);
++    xmpp_SHA1_Final(&ctx, digest);
+ }
+ 
+ static void SCRAM_SHA1_Hi(const uint8_t *text, size_t len,
+diff --git a/src/sha1.c b/src/sha1.c
+index 9af4f04..b60b325 100644
+--- a/src/sha1.c
++++ b/src/sha1.c
+@@ -202,7 +202,7 @@ static void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64])
+ 
+ 
+ /* SHA1Init - Initialize new context */
+-void SHA1_Init(SHA1_CTX* context)
++void xmpp_SHA1_Init(SHA1_CTX* context)
+ {
+     /* SHA1 initialization constants */
+     context->state[0] = 0x67452301;
+@@ -215,7 +215,7 @@ void SHA1_Init(SHA1_CTX* context)
+ 
+ 
+ /* Run your data through this. */
+-void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
++void xmpp_SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
+ {
+     size_t i, j;
+ 
+@@ -244,7 +244,7 @@ void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len)
+ 
+ 
+ /* Add padding and return the message digest. */
+-void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
++void xmpp_SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+ {
+     uint32_t i;
+     uint8_t  finalcount[8];
+@@ -253,11 +253,11 @@ void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+         finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+          >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+     }
+-    SHA1_Update(context, (uint8_t *)"\200", 1);
++    xmpp_SHA1_Update(context, (uint8_t *)"\200", 1);
+     while ((context->count[0] & 504) != 448) {
+-        SHA1_Update(context, (uint8_t *)"\0", 1);
++        xmpp_SHA1_Update(context, (uint8_t *)"\0", 1);
+     }
+-    SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
++    xmpp_SHA1_Update(context, finalcount, 8);  /* Should cause a SHA1_Transform() */
+     for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
+         digest[i] = (uint8_t)
+          ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+@@ -300,12 +300,12 @@ FILE* file;
+             return(-1);
+         }
+     } 
+-    SHA1_Init(&context);
++    xmpp_SHA1_Init(&context);
+     while (!feof(file)) {  /* note: what if ferror(file) */
+         i = fread(buffer, 1, 16384, file);
+-        SHA1_Update(&context, buffer, i);
++        xmpp_SHA1_Update(&context, buffer, i);
+     }
+-    SHA1_Final(&context, digest);
++    xmpp_SHA1_Final(&context, digest);
+     fclose(file);
+     for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
+         for (j = 0; j < 4; j++) {
+@@ -358,9 +358,9 @@ int main(int argc, char** argv)
+     fprintf(stdout, "verifying SHA-1 implementation... ");
+     
+     for (k = 0; k < 2; k++){ 
+-        SHA1_Init(&context);
+-        SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
+-        SHA1_Final(&context, digest);
++        xmpp_SHA1_Init(&context);
++        xmpp_SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
++        xmpp_SHA1_Final(&context, digest);
+ 	digest_to_hex(digest, output);
+ 
+         if (strcmp(output, test_results[k])) {
+@@ -372,10 +372,10 @@ int main(int argc, char** argv)
+         }    
+     }
+     /* million 'a' vector we feed separately */
+-    SHA1_Init(&context);
++    xmpp_SHA1_Init(&context);
+     for (k = 0; k < 1000000; k++)
+-        SHA1_Update(&context, (uint8_t*)"a", 1);
+-    SHA1_Final(&context, digest);
++        xmpp_SHA1_Update(&context, (uint8_t*)"a", 1);
++    xmpp_SHA1_Final(&context, digest);
+     digest_to_hex(digest, output);
+     if (strcmp(output, test_results[2])) {
+         fprintf(stdout, "FAIL\n");
+diff --git a/src/sha1.h b/src/sha1.h
+index 10266cb..7ff48d7 100644
+--- a/src/sha1.h
++++ b/src/sha1.h
+@@ -23,9 +23,9 @@ typedef struct {
+ 
+ #define SHA1_DIGEST_SIZE 20
+ 
+-void SHA1_Init(SHA1_CTX* context);
+-void SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
+-void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]);
++void xmpp_SHA1_Init(SHA1_CTX* context);
++void xmpp_SHA1_Update(SHA1_CTX* context, const uint8_t* data, const size_t len);
++void xmpp_SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE]);
+ 
+ #ifdef __cplusplus
+ }
diff --git a/bsp/buildroot/package/libstrophe/0001-make-autoreconfable.patch b/bsp/buildroot/package/libstrophe/0002-make-autoreconfable.patch
similarity index 100%
rename from bsp/buildroot/package/libstrophe/0001-make-autoreconfable.patch
rename to bsp/buildroot/package/libstrophe/0002-make-autoreconfable.patch
diff --git a/bsp/buildroot/package/libstrophe/Config.in b/bsp/buildroot/package/libstrophe/Config.in
index 55dc162b..5fdb918d 100644
--- a/bsp/buildroot/package/libstrophe/Config.in
+++ b/bsp/buildroot/package/libstrophe/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBSTROPHE
 	bool "libstrophe"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  libstrophe is a lightweight XMPP client library written in C.
 	  It has minimal dependencies and is configurable for various
diff --git a/bsp/buildroot/package/libstrophe/libstrophe.hash b/bsp/buildroot/package/libstrophe/libstrophe.hash
index d8403039..6a2d9970 100644
--- a/bsp/buildroot/package/libstrophe/libstrophe.hash
+++ b/bsp/buildroot/package/libstrophe/libstrophe.hash
@@ -1,3 +1,2 @@
 # Locally calculated
 sha256 08f4a85ef419a8bdf08b6afa8f7b2a0e5e180fdc9c16cede81af672ec10e21e7  libstrophe-0.8.8.tar.gz
-sha256 00936397cbb75ef168992868ae559b141b505d3a06f08163012b240390efa553  b08766c8e46956daba010044b00c97f78b598780.patch
diff --git a/bsp/buildroot/package/libstrophe/libstrophe.mk b/bsp/buildroot/package/libstrophe/libstrophe.mk
index 60e29d38..4b5a10a5 100644
--- a/bsp/buildroot/package/libstrophe/libstrophe.mk
+++ b/bsp/buildroot/package/libstrophe/libstrophe.mk
@@ -9,10 +9,9 @@ LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION))
 LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf
 # Doesn't ship configure
 LIBSTROPHE_AUTORECONF = YES
-LIBSTROPHE_LICENSE = MIT or GPLv3
+LIBSTROPHE_LICENSE = MIT or GPL-3.0
 LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt
 LIBSTROPHE_INSTALL_STAGING = YES
-LIBSTROPHE_PATCH = https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780.patch
 
 ifeq ($(BR2_PACKAGE_EXPAT),y)
 # Passing --without-libxml2 doesn't work, due to how AC_ARG_WITH is
diff --git a/bsp/buildroot/package/libsvg-cairo/libsvg-cairo.mk b/bsp/buildroot/package/libsvg-cairo/libsvg-cairo.mk
index 28c91416..f7a105e0 100644
--- a/bsp/buildroot/package/libsvg-cairo/libsvg-cairo.mk
+++ b/bsp/buildroot/package/libsvg-cairo/libsvg-cairo.mk
@@ -8,7 +8,7 @@ LIBSVG_CAIRO_VERSION = 0.1.6
 LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots
 LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg
 LIBSVG_CAIRO_INSTALL_STAGING = YES
-LIBSVG_CAIRO_LICENSE = LGPLv2.1+
+LIBSVG_CAIRO_LICENSE = LGPL-2.1+
 LIBSVG_CAIRO_LICENSE_FILES = COPYING
 
 LIBSVG_CAIRO_CONF_OPTS = --without-x
diff --git a/bsp/buildroot/package/libsvg/libsvg.mk b/bsp/buildroot/package/libsvg/libsvg.mk
index 8b85d5a3..45d730db 100644
--- a/bsp/buildroot/package/libsvg/libsvg.mk
+++ b/bsp/buildroot/package/libsvg/libsvg.mk
@@ -8,7 +8,7 @@ LIBSVG_VERSION = 0.1.4
 LIBSVG_SITE = http://cairographics.org/snapshots
 LIBSVG_DEPENDENCIES = host-pkgconf libpng jpeg
 LIBSVG_INSTALL_STAGING = YES
-LIBSVG_LICENSE = LGPLv2+
+LIBSVG_LICENSE = LGPL-2.0+
 LIBSVG_LICENSE_FILES = COPYING
 
 # libsvg needs at last a XML parser
diff --git a/bsp/buildroot/package/libsvgtiny/libsvgtiny.hash b/bsp/buildroot/package/libsvgtiny/libsvgtiny.hash
new file mode 100644
index 00000000..fce37953
--- /dev/null
+++ b/bsp/buildroot/package/libsvgtiny/libsvgtiny.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 082a2e8849f05e2364a942eec51a798d637c6eca44db8c73350a038ebd1fd268  libsvgtiny-ea9d99fc8b231c22d06168135e181d61f4eb2f06.tar.gz
diff --git a/bsp/buildroot/package/libsvgtiny/libsvgtiny.mk b/bsp/buildroot/package/libsvgtiny/libsvgtiny.mk
index acd08d72..febd3fce 100644
--- a/bsp/buildroot/package/libsvgtiny/libsvgtiny.mk
+++ b/bsp/buildroot/package/libsvgtiny/libsvgtiny.mk
@@ -23,7 +23,7 @@ LIBSVGTINY_COMPONENT_TYPE = lib-static
 endif
 
 define LIBSVGTINY_CONFIGURE_CMDS
-	ln -sf $(HOST_DIR)/usr/share/netsurf-buildsystem $(@D)/build
+	ln -sf $(HOST_DIR)/share/netsurf-buildsystem $(@D)/build
 endef
 
 define LIBSVGTINY_BUILD_CMDS
diff --git a/bsp/buildroot/package/libsysfs/Config.in b/bsp/buildroot/package/libsysfs/Config.in
index e4e6f28e..2cbebaa5 100644
--- a/bsp/buildroot/package/libsysfs/Config.in
+++ b/bsp/buildroot/package/libsysfs/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBSYSFS
 	bool "libsysfs"
 	help
-	These are a set of utilities built upon sysfs, a filesystem in
-	Linux 2.6 kernels that exposes a system's device tree.
+	  These are a set of utilities built upon sysfs, a filesystem in
+	  Linux 2.6 kernels that exposes a system's device tree.
 
-	http://linux-diag.sourceforge.net/Sysfsutils.html
+	  http://linux-diag.sourceforge.net/Sysfsutils.html
diff --git a/bsp/buildroot/package/libsysfs/libsysfs.mk b/bsp/buildroot/package/libsysfs/libsysfs.mk
index fb0310fc..13edc9a4 100644
--- a/bsp/buildroot/package/libsysfs/libsysfs.mk
+++ b/bsp/buildroot/package/libsysfs/libsysfs.mk
@@ -8,7 +8,7 @@ LIBSYSFS_VERSION = 2.1.0
 LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION)
 LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz
 LIBSYSFS_INSTALL_STAGING = YES
-LIBSYSFS_LICENSE = GPLv2 (utilities), LGPLv2.1+ (library)
+LIBSYSFS_LICENSE = GPL-2.0 (utilities), LGPL-2.1+ (library)
 LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libtasn1/libtasn1.mk b/bsp/buildroot/package/libtasn1/libtasn1.mk
index 5f1b0e24..f14d57ab 100644
--- a/bsp/buildroot/package/libtasn1/libtasn1.mk
+++ b/bsp/buildroot/package/libtasn1/libtasn1.mk
@@ -7,7 +7,7 @@
 LIBTASN1_VERSION = 4.13
 LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1
 LIBTASN1_DEPENDENCIES = host-bison
-LIBTASN1_LICENSE = GPLv3+ (tests, tools), LGPLv2.1+ (library)
+LIBTASN1_LICENSE = GPL-3.0+ (tests, tools), LGPL-2.1+ (library)
 LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB
 LIBTASN1_INSTALL_STAGING = YES
 # 'missing' fallback logic botched so disable it completely
diff --git a/bsp/buildroot/package/libtheora/Config.in b/bsp/buildroot/package/libtheora/Config.in
index bf20a503..eee9e9b1 100644
--- a/bsp/buildroot/package/libtheora/Config.in
+++ b/bsp/buildroot/package/libtheora/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBTHEORA
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_LIBVORBIS
 	help
-	  A library for the free and open video compression format "Theora"
-	  from the Xiph.org Foundation.
+	  A library for the free and open video compression format
+	  "Theora" from the Xiph.org Foundation.
 
 	  http://www.theora.org/
diff --git a/bsp/buildroot/package/libtheora/libtheora.mk b/bsp/buildroot/package/libtheora/libtheora.mk
index 11f9852e..f408e6cc 100644
--- a/bsp/buildroot/package/libtheora/libtheora.mk
+++ b/bsp/buildroot/package/libtheora/libtheora.mk
@@ -10,7 +10,7 @@ LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora
 LIBTHEORA_INSTALL_STAGING = YES
 # We're patching Makefile.am
 LIBTHEORA_AUTORECONF = YES
-LIBTHEORA_LICENSE = BSD-3c
+LIBTHEORA_LICENSE = BSD-3-Clause
 LIBTHEORA_LICENSE_FILES = COPYING LICENSE
 
 LIBTHEORA_CONF_OPTS = \
diff --git a/bsp/buildroot/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch b/bsp/buildroot/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch
deleted file mode 100644
index 1cf86141..00000000
--- a/bsp/buildroot/package/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch
+++ /dev/null
@@ -1,6508 +0,0 @@
-From 866b651bcb9f93f47582e5e2e4f1eb3155025298 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 10 Nov 2012 16:21:01 +0100
-Subject: [PATCH] Add rpcgen program from nfs-utils sources
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[yann.morin.1998@free.fr: update for 0.3.1]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- Makefile.am          |    2 +-
- configure.ac         |   14 +-
- rpcgen/Makefile.am   |   22 ++
- rpcgen/rpc_clntout.c |  217 ++++++++++
- rpcgen/rpc_cout.c    |  706 +++++++++++++++++++++++++++++++++
- rpcgen/rpc_hout.c    |  490 +++++++++++++++++++++++
- rpcgen/rpc_main.c    | 1067 ++++++++++++++++++++++++++++++++++++++++++++++++++
- rpcgen/rpc_output.h  |   16 +
- rpcgen/rpc_parse.c   |  609 ++++++++++++++++++++++++++++
- rpcgen/rpc_parse.h   |  166 ++++++++
- rpcgen/rpc_sample.c  |  247 ++++++++++++
- rpcgen/rpc_scan.c    |  474 ++++++++++++++++++++++
- rpcgen/rpc_scan.h    |  103 +++++
- rpcgen/rpc_svcout.c  |  882 +++++++++++++++++++++++++++++++++++++++++
- rpcgen/rpc_tblout.c  |  165 ++++++++
- rpcgen/rpc_util.c    |  479 ++++++++++++++++++++++
- rpcgen/rpc_util.h    |  166 ++++++++
- rpcgen/rpcgen.1      |  521 ++++++++++++++++++++++++
- 18 files changed, 6344 insertions(+), 2 deletions(-)
- create mode 100644 rpcgen/Makefile.am
- create mode 100644 rpcgen/rpc_clntout.c
- create mode 100644 rpcgen/rpc_cout.c
- create mode 100644 rpcgen/rpc_hout.c
- create mode 100644 rpcgen/rpc_main.c
- create mode 100644 rpcgen/rpc_output.h
- create mode 100644 rpcgen/rpc_parse.c
- create mode 100644 rpcgen/rpc_parse.h
- create mode 100644 rpcgen/rpc_sample.c
- create mode 100644 rpcgen/rpc_scan.c
- create mode 100644 rpcgen/rpc_scan.h
- create mode 100644 rpcgen/rpc_svcout.c
- create mode 100644 rpcgen/rpc_tblout.c
- create mode 100644 rpcgen/rpc_util.c
- create mode 100644 rpcgen/rpc_util.h
- create mode 100644 rpcgen/rpcgen.1
-
-diff --git a/Makefile.am b/Makefile.am
-index 466b6dd..8558289 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = src man doc
-+SUBDIRS = src man doc rpcgen
- ACLOCAL_AMFLAGS = -I m4
- 
- noinst_HEADERS	       = tirpc/reentrant.h \
-diff --git a/configure.ac b/configure.ac
-index e3cb8af..0ea2e6e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,6 +58,18 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netine
- AC_CHECK_LIB([pthread], [pthread_create])
- AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent])
- 
--AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile])
-+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-+
-+AC_MSG_CHECKING([for a C compiler for build tools])
-+if test $cross_compiling = yes; then
-+   AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
-+else
-+   CC_FOR_BUILD=$CC
-+fi
-+AC_MSG_RESULT([$CC_FOR_BUILD])
-+AC_SUBST(CC_FOR_BUILD)
-+
-+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile])
-+
- AC_OUTPUT(libtirpc.pc)
- 
-diff --git a/rpcgen/Makefile.am b/rpcgen/Makefile.am
-new file mode 100644
-index 0000000..2277b6f
---- /dev/null
-+++ b/rpcgen/Makefile.am
-@@ -0,0 +1,22 @@
-+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
-+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
-+
-+noinst_PROGRAMS = rpcgen
-+
-+rpcgen_SOURCES = \
-+	rpc_clntout.c \
-+	rpc_cout.c \
-+	rpc_hout.c \
-+	rpc_main.c \
-+	rpc_parse.c \
-+	rpc_sample.c \
-+	rpc_scan.c \
-+	rpc_svcout.c \
-+	rpc_tblout.c \
-+	rpc_util.c \
-+	rpc_parse.h \
-+	rpc_scan.h \
-+	rpc_util.h
-+
-+dist_man1_MANS = rpcgen.1
-diff --git a/rpcgen/rpc_clntout.c b/rpcgen/rpc_clntout.c
-new file mode 100644
-index 0000000..e2f4382
---- /dev/null
-+++ b/rpcgen/rpc_clntout.c
-@@ -0,0 +1,217 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
-+ * Copyright (C) 1987, Sun Microsytsems, Inc.
-+ */
-+#include <stdio.h>
-+#include <string.h>
-+#include <rpc/types.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+#include "rpc_output.h"
-+
-+/* extern pdeclaration(); */
-+/* void printarglist(); */
-+
-+#define DEFAULT_TIMEOUT 25	/* in seconds */
-+static char RESULT[] = "clnt_res";
-+
-+static void	write_program(definition *def);
-+static void	printbody(proc_list *proc);
-+
-+
-+void
-+write_stubs(void)
-+{
-+	list *l;
-+	definition *def;
-+
-+	f_print(fout, 
-+		"\n/* Default timeout can be changed using clnt_control() */\n");
-+	f_print(fout, "static struct timeval TIMEOUT = { %d, 0 };\n",
-+		DEFAULT_TIMEOUT);
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind == DEF_PROGRAM) {
-+			write_program(def);
-+		}
-+	}
-+}
-+
-+static void
-+write_program(definition *def)
-+{
-+	version_list   *vp;
-+	proc_list      *proc;
-+
-+	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+			f_print(fout, "\n");
-+			ptype(proc->res_prefix, proc->res_type, 1);
-+			f_print(fout, "*\n");
-+			pvname(proc->proc_name, vp->vers_num);
-+			printarglist(proc, "clnt", "CLIENT *");
-+			f_print(fout, "{\n");
-+			printbody(proc);
-+			f_print(fout, "}\n");
-+		}
-+	}
-+}
-+
-+/*
-+ * Writes out declarations of procedure's argument list.
-+ * In either ANSI C style, in one of old rpcgen style (pass by reference),
-+ * or new rpcgen style (multiple arguments, pass by value);
-+ */
-+
-+/* sample addargname = "clnt"; sample addargtype = "CLIENT * " */
-+
-+void
-+printarglist(proc_list *proc, char *addargname, char *addargtype)
-+{
-+
-+	decl_list      *l;
-+
-+	if (!newstyle) {	/* old style: always pass arg by reference */
-+		if (Cflag) {	/* C++ style heading */
-+			f_print(fout, "(");
-+			ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
-+			f_print(fout, "*argp, %s%s)\n", addargtype, addargname);
-+		} else {
-+			f_print(fout, "(argp, %s)\n", addargname);
-+			f_print(fout, "\t");
-+			ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
-+			f_print(fout, "*argp;\n");
-+		}
-+	} else if (streq(proc->args.decls->decl.type, "void")) {
-+		/* newstyle, 0 argument */
-+		if (Cflag)
-+			f_print(fout, "(%s%s)\n", addargtype, addargname);
-+		else
-+			f_print(fout, "(%s)\n", addargname);
-+	} else {
-+		/* new style, 1 or multiple arguments */
-+		if (!Cflag) {
-+			f_print(fout, "(");
-+			for (l = proc->args.decls; l != NULL; l = l->next)
-+				f_print(fout, "%s, ", l->decl.name);
-+			f_print(fout, "%s)\n", addargname);
-+			for (l = proc->args.decls; l != NULL; l = l->next) {
-+				pdeclaration(proc->args.argname, &l->decl, 1, ";\n");
-+			}
-+		} else {	/* C++ style header */
-+			f_print(fout, "(");
-+			for (l = proc->args.decls; l != NULL; l = l->next) {
-+				pdeclaration(proc->args.argname, &l->decl, 0, ", ");
-+			}
-+			f_print(fout, " %s%s)\n", addargtype, addargname);
-+		}
-+	}
-+
-+	if (!Cflag)
-+		f_print(fout, "\t%s%s;\n", addargtype, addargname);
-+}
-+
-+
-+
-+static char *
-+ampr(char *type)
-+{
-+	if (isvectordef(type, REL_ALIAS)) {
-+		return ("");
-+	} else {
-+		return ("&");
-+	}
-+}
-+
-+static void
-+printbody(proc_list *proc)
-+{
-+	decl_list      *l;
-+	bool_t          args2 = (proc->arg_num > 1);
-+
-+	/* For new style with multiple arguments, need a structure in which
-+         * to stuff the arguments. */
-+	if (newstyle && args2) {
-+		f_print(fout, "\t%s", proc->args.argname);
-+		f_print(fout, " arg;\n");
-+	}
-+	f_print(fout, "\tstatic ");
-+	if (streq(proc->res_type, "void")) {
-+		f_print(fout, "char ");
-+	} else {
-+		ptype(proc->res_prefix, proc->res_type, 0);
-+	}
-+	f_print(fout, "%s;\n", RESULT);
-+	f_print(fout, "\n");
-+	f_print(fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n",
-+		ampr(proc->res_type), RESULT, RESULT);
-+	if (newstyle && !args2 && (streq(proc->args.decls->decl.type, "void"))) {
-+		/* newstyle, 0 arguments */
-+		f_print(fout,
-+			"\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_void, (caddr_t) NULL, "
-+			"(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
-+			proc->proc_name,
-+			stringfix(proc->res_type), ampr(proc->res_type), RESULT);
-+
-+	} else if (newstyle && args2) {
-+		/* newstyle, multiple arguments:  stuff arguments into structure */
-+		for (l = proc->args.decls; l != NULL; l = l->next) {
-+			f_print(fout, "\targ.%s = %s;\n",
-+				l->decl.name, l->decl.name);
-+		}
-+		f_print(fout,
-+			"\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, (caddr_t) &arg, "
-+			"(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
-+			proc->proc_name, proc->args.argname,
-+			stringfix(proc->res_type), ampr(proc->res_type), RESULT);
-+	} else {		/* single argument, new or old style */
-+		f_print(fout,
-+			"\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, "
-+			"(caddr_t) %s%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
-+			proc->proc_name,
-+			stringfix(proc->args.decls->decl.type),
-+			(newstyle ? "&" : ""),
-+			(newstyle ? proc->args.decls->decl.name : "argp"),
-+			stringfix(proc->res_type), ampr(proc->res_type), RESULT);
-+	}
-+	f_print(fout, "\t\treturn (NULL);\n");
-+	f_print(fout, "\t}\n");
-+	if (streq(proc->res_type, "void")) {
-+		f_print(fout, "\treturn ((void *)%s%s);\n",
-+			ampr(proc->res_type), RESULT);
-+	} else {
-+		f_print(fout, "\treturn (%s%s);\n", ampr(proc->res_type), RESULT);
-+	}
-+}
-diff --git a/rpcgen/rpc_cout.c b/rpcgen/rpc_cout.c
-new file mode 100644
-index 0000000..a61214f
---- /dev/null
-+++ b/rpcgen/rpc_cout.c
-@@ -0,0 +1,706 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_cout.c, XDR routine outputter for the RPC protocol compiler 
-+ */
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <malloc.h>
-+#include <ctype.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+
-+static int	findtype(definition *def, char *type);
-+static int	undefined(char *type);
-+static void	print_generic_header(char *procname, int pointerp);
-+static void	print_header(definition *def);
-+static void	print_prog_header(proc_list *plist);
-+static void	print_trailer(void);
-+static void	print_ifopen(int indent, char *name);
-+static void	print_ifarg(char *arg);
-+static void	print_ifsizeof(char *prefix, char *type);
-+static void	print_ifclose(int indent);
-+static void	print_ifstat(int indent, char *prefix, char *type, relation rel,
-+			char *amax, char *objname, char *name);
-+static void	emit_enum(definition *def);
-+static void	emit_program(definition *def);
-+static void	emit_union(definition *def);
-+static void	emit_struct(definition *def);
-+static void	emit_typedef(definition *def);
-+static void	print_stat(int indent, declaration *dec);
-+static void	emit_inline(declaration *decl, int flag);
-+static void	emit_single_in_line(declaration *decl, int flag, relation rel);
-+static char *	upcase(char *str);
-+
-+/*
-+ * Emit the C-routine for the given definition 
-+ */
-+void
-+emit(definition *def)
-+{
-+	if (def->def_kind == DEF_CONST) {
-+		return;
-+	}
-+	if (def->def_kind == DEF_PROGRAM) {
-+		emit_program(def);
-+		return;
-+	}
-+	if (def->def_kind == DEF_TYPEDEF) {
-+		/* now we need to handle declarations like
-+		 * struct typedef foo foo;
-+		 * since we dont want this to be expanded into 2 calls
-+		 * to xdr_foo */
-+
-+		if (strcmp(def->def.ty.old_type, def->def_name) == 0)
-+			return;
-+	};
-+
-+	print_header(def);
-+	switch (def->def_kind) {
-+	case DEF_UNION:
-+		emit_union(def);
-+		break;
-+	case DEF_ENUM:
-+		emit_enum(def);
-+		break;
-+	case DEF_STRUCT:
-+		emit_struct(def);
-+		break;
-+	case DEF_TYPEDEF:
-+		emit_typedef(def);
-+		break;
-+	default:
-+		break;
-+	}
-+	print_trailer();
-+}
-+
-+static int
-+findtype(definition *def, char *type)
-+{
-+
-+	if (def->def_kind == DEF_PROGRAM || def->def_kind == DEF_CONST) {
-+		return (0);
-+	} else {
-+		return (streq(def->def_name, type));
-+	}
-+}
-+
-+static int
-+undefined(char *type)
-+{
-+	definition     *def;
-+
-+	def = (definition *) FINDVAL(defined, type, findtype);
-+
-+	return (def == NULL);
-+}
-+
-+
-+static void
-+print_generic_header(char *procname, int pointerp)
-+{
-+	f_print(fout, "\n");
-+	f_print(fout, "bool_t\n");
-+	if (Cflag) {
-+		f_print(fout, "xdr_%s(", procname);
-+		f_print(fout, "XDR *xdrs, ");
-+		f_print(fout, "%s ", procname);
-+		if (pointerp)
-+			f_print(fout, "*");
-+		f_print(fout, "objp)\n{\n\n");
-+	} else {
-+		f_print(fout, "xdr_%s(xdrs, objp)\n", procname);
-+		f_print(fout, "\tXDR *xdrs;\n");
-+		f_print(fout, "\t%s ", procname);
-+		if (pointerp)
-+			f_print(fout, "*");
-+		f_print(fout, "objp;\n{\n\n");
-+	}
-+}
-+
-+static void
-+print_header(definition *def)
-+{
-+	print_generic_header(def->def_name,
-+		def->def_kind != DEF_TYPEDEF ||
-+		!isvectordef(def->def.ty.old_type, def->def.ty.rel));
-+
-+	/* Now add Inline support */
-+
-+
-+	if (Inline == 0)
-+		return;
-+}
-+
-+static void
-+print_prog_header(proc_list *plist)
-+{
-+	print_generic_header(plist->args.argname, 1);
-+}
-+
-+static void
-+print_trailer(void)
-+{
-+	f_print(fout, "\treturn (TRUE);\n");
-+	f_print(fout, "}\n");
-+}
-+
-+
-+static void
-+print_ifopen(int indent, char *name)
-+{
-+	tabify(fout, indent);
-+	f_print(fout, " if (!xdr_%s(xdrs", name);
-+}
-+
-+static void
-+print_ifarg(char *arg)
-+{
-+	f_print(fout, ", %s", arg);
-+}
-+
-+static void
-+print_ifsizeof(char *prefix, char *type)
-+{
-+	if (streq(type, "bool")) {
-+		f_print(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool");
-+	} else {
-+		f_print(fout, ", sizeof(");
-+		if (undefined(type) && prefix) {
-+			f_print(fout, "%s ", prefix);
-+		}
-+		f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type);
-+	}
-+}
-+
-+static void
-+print_ifclose(int indent)
-+{
-+	f_print(fout, ")) {\n");
-+	tabify(fout, indent);
-+	f_print(fout, "\t return (FALSE);\n");
-+	tabify(fout, indent);
-+	f_print(fout, " }\n");
-+}
-+
-+static void
-+print_ifstat(int indent, char *prefix, char *type, relation rel,
-+			char *amax, char *objname, char *name)
-+{
-+	char *alt = NULL;
-+
-+	switch (rel) {
-+	case REL_POINTER:
-+		print_ifopen(indent, "pointer");
-+		print_ifarg("(char **)");
-+		f_print(fout, "%s", objname);
-+		print_ifsizeof(prefix, type);
-+		break;
-+	case REL_VECTOR:
-+		if (streq(type, "string")) {
-+			alt = "string";
-+		} else if (streq(type, "opaque")) {
-+			alt = "opaque";
-+		}
-+		if (alt) {
-+			print_ifopen(indent, alt);
-+			print_ifarg(objname);
-+		} else {
-+			print_ifopen(indent, "vector");
-+			print_ifarg("(char *)");
-+			f_print(fout, "%s", objname);
-+		}
-+		print_ifarg(amax);
-+		if (!alt) {
-+			print_ifsizeof(prefix, type);
-+		}
-+		break;
-+	case REL_ARRAY:
-+		if (streq(type, "string")) {
-+			alt = "string";
-+		} else if (streq(type, "opaque")) {
-+			alt = "bytes";
-+		}
-+		if (streq(type, "string")) {
-+			print_ifopen(indent, alt);
-+			print_ifarg(objname);
-+		} else {
-+			if (alt) {
-+				print_ifopen(indent, alt);
-+			} else {
-+				print_ifopen(indent, "array");
-+			}
-+			/* The (void*) avoids a gcc-4.1 warning */
-+			print_ifarg("(char **)(void*)");
-+			if (*objname == '&') {
-+				f_print(fout, "%s.%s_val, (u_int *)%s.%s_len",
-+					objname, name, objname, name);
-+			} else {
-+				f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len",
-+					objname, name, objname, name);
-+			}
-+		}
-+		print_ifarg(amax);
-+		if (!alt) {
-+			print_ifsizeof(prefix, type);
-+		}
-+		break;
-+	case REL_ALIAS:
-+		print_ifopen(indent, type);
-+		print_ifarg(objname);
-+		break;
-+	}
-+	print_ifclose(indent);
-+}
-+
-+static void
-+emit_enum(definition *def)
-+{
-+	print_ifopen(1, "enum");
-+	print_ifarg("(enum_t *)objp");
-+	print_ifclose(1);
-+}
-+
-+static void
-+emit_program(definition *def)
-+{
-+	decl_list      *dl;
-+	version_list   *vlist;
-+	proc_list      *plist;
-+
-+	for (vlist = def->def.pr.versions; vlist != NULL; vlist = vlist->next)
-+		for (plist = vlist->procs; plist != NULL; plist = plist->next) {
-+			if (!newstyle || plist->arg_num < 2)
-+				continue;/* old style, or single argument */
-+			print_prog_header(plist);
-+			for (dl = plist->args.decls; dl != NULL; dl = dl->next)
-+				print_stat(1, &dl->decl);
-+			print_trailer();
-+		}
-+}
-+
-+
-+static void
-+emit_union(definition *def)
-+{
-+  declaration *dflt;
-+  case_list *cl;
-+  declaration *cs;
-+  char *object;
-+  char *vecformat = "objp->%s_u.%s";
-+  char *format = "&objp->%s_u.%s";
-+
-+  print_stat(1,&def->def.un.enum_decl);
-+  f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name);
-+  for (cl = def->def.un.cases; cl != NULL; cl = cl->next) {
-+
-+    f_print(fout, "\tcase %s:\n", cl->case_name);
-+    if(cl->contflag == 1)	/* a continued case statement */
-+      continue;
-+    cs = &cl->case_decl;
-+    if (!streq(cs->type, "void")) {
-+      object = alloc(strlen(def->def_name) + strlen(format) +
-+		     strlen(cs->name) + 1);
-+      if (isvectordef (cs->type, cs->rel)) {
-+	s_print(object, vecformat, def->def_name, 
-+		cs->name);
-+      } else {
-+	s_print(object, format, def->def_name, 
-+		cs->name);
-+      }
-+      print_ifstat(2, cs->prefix, cs->type, cs->rel, cs->array_max,
-+		   object, cs->name);
-+      free(object);
-+    }
-+    f_print(fout, "\t\tbreak;\n");
-+  }
-+  dflt = def->def.un.default_decl;
-+  if (dflt != NULL) {
-+    if (!streq(dflt->type, "void")) {
-+      f_print(fout, "\tdefault:\n");
-+      object = alloc(strlen(def->def_name) + strlen(format) +
-+		     strlen(dflt->name) + 1);
-+      if (isvectordef (dflt->type, dflt->rel)) {
-+	s_print(object, vecformat, def->def_name, 
-+		dflt->name);
-+      } else {
-+	s_print(object, format, def->def_name, 
-+		dflt->name);
-+      }
-+
-+      print_ifstat(2, dflt->prefix, dflt->type, dflt->rel,
-+		   dflt->array_max, object, dflt->name);
-+      free(object);
-+      f_print(fout, "\t\tbreak;\n");
-+    } else {
-+      /* Avoid gcc warnings about `value not handled in switch' */
-+      f_print(fout, "\tdefault:\n");
-+      f_print(fout, "\t\tbreak;\n");
-+    }
-+  } else {
-+    f_print(fout, "\tdefault:\n");
-+    f_print(fout, "\t\treturn (FALSE);\n");
-+  }
-+
-+  f_print(fout, "\t}\n");
-+}
-+
-+static void
-+emit_struct(definition *def)
-+{
-+	decl_list      *dl;
-+	int             i, j, size, flag;
-+	decl_list      *cur = NULL, *psav;
-+	bas_type       *ptr;
-+	char           *sizestr, *plus;
-+	char            ptemp[256];
-+	int             can_inline;
-+	const char	*buf_declaration;
-+
-+
-+	if (Inline == 0) {
-+		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
-+			print_stat(1, &dl->decl);
-+	} else {
-+		size = 0;
-+		can_inline = 0;
-+		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
-+			if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) {
-+
-+				if (dl->decl.rel == REL_ALIAS)
-+					size += ptr->length;
-+				else {
-+					can_inline = 1;
-+					break;	/* can be inlined */
-+				};
-+			} else {
-+				if (size >= Inline) {
-+					can_inline = 1;
-+					break;	/* can be inlined */
-+				}
-+				size = 0;
-+			}
-+		if (size > Inline)
-+			can_inline = 1;
-+
-+		if (can_inline == 0) {	/* can not inline, drop back to old mode */
-+			for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
-+				print_stat(1, &dl->decl);
-+			return;
-+		};
-+
-+
-+
-+
-+		flag = PUT;
-+		for (j = 0; j < 2; j++) {
-+
-+			if (flag == PUT)
-+				f_print(fout, "\n\t if (xdrs->x_op == XDR_ENCODE) {\n");
-+			else
-+				f_print(fout, "\n \t return (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n");
-+
-+
-+			i = 0;
-+			size = 0;
-+			sizestr = NULL;
-+			buf_declaration = "int32_t *";
-+			for (dl = def->def.st.decls; dl != NULL; dl = dl->next) {	/* xxx */
-+
-+				/* now walk down the list and check for basic types */
-+				if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) {
-+					if (i == 0)
-+						cur = dl;
-+					i++;
-+
-+					if (dl->decl.rel == REL_ALIAS)
-+						size += ptr->length;
-+					else {
-+						/* this is required to handle arrays */
-+
-+						if (sizestr == NULL)
-+							plus = " ";
-+						else
-+							plus = "+";
-+
-+						if (ptr->length != 1)
-+							s_print(ptemp, " %s %s * %d", plus, dl->decl.array_max, ptr->length);
-+						else
-+							s_print(ptemp, " %s %s ", plus, dl->decl.array_max);
-+
-+						/*now concatenate to sizestr !!!! */
-+						if (sizestr == NULL)
-+							sizestr = strdup(ptemp);
-+						else {
-+							sizestr = realloc(sizestr, strlen(sizestr) + strlen(ptemp) + 1);
-+							if (sizestr == NULL) {
-+
-+								f_print(stderr, "Fatal error : no memory \n");
-+								crash();
-+							};
-+							sizestr = strcat(sizestr, ptemp);	/*build up length of array */
-+
-+						}
-+					}
-+
-+				} else {
-+					if (i > 0)
-+					    {
-+						if (sizestr == NULL && size < Inline) {
-+							/* don't expand into inline code if size < inline */
-+							while (cur != dl) {
-+								print_stat(1, &cur->decl);
-+								cur = cur->next;
-+							}
-+						} else {
-+
-+
-+
-+							/* were already looking at a xdr_inlineable structure */
-+							if (sizestr == NULL)
-+								f_print(fout, "\t %sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);",
-+									buf_declaration, size);
-+							else if (size == 0)
-+								f_print(fout,
-+									"\t %sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);",
-+									buf_declaration, sizestr);
-+							else
-+								f_print(fout,
-+									"\t %sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);",
-+									buf_declaration, size, sizestr);
-+							buf_declaration = "";
-+
-+							f_print(fout, "\n\t   if (buf == NULL) {\n");
-+
-+							psav = cur;
-+							while (cur != dl) {
-+								print_stat(2, &cur->decl);
-+								cur = cur->next;
-+							}
-+
-+							f_print(fout, "\n\t  }\n\t  else {\n");
-+
-+							cur = psav;
-+							while (cur != dl) {
-+								emit_inline(&cur->decl, flag);
-+								cur = cur->next;
-+							}
-+
-+							f_print(fout, "\t  }\n");
-+						}
-+					    }
-+					size = 0;
-+					i = 0;
-+					sizestr = NULL;
-+					print_stat(1, &dl->decl);
-+				}
-+
-+			}
-+			if (i > 0)
-+			    {
-+				if (sizestr == NULL && size < Inline) {
-+					/* don't expand into inline code if size < inline */
-+					while (cur != dl) {
-+						print_stat(1, &cur->decl);
-+						cur = cur->next;
-+					}
-+				} else {
-+
-+					/* were already looking at a xdr_inlineable structure */
-+					if (sizestr == NULL)
-+						f_print(fout, "\t\t%sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);",
-+							buf_declaration, size);
-+					else if (size == 0)
-+						f_print(fout,
-+							"\t\t%sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);",
-+							buf_declaration, sizestr);
-+					else
-+						f_print(fout,
-+							"\t\t%sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);",
-+							buf_declaration, size, sizestr);
-+					buf_declaration = "";
-+
-+					f_print(fout, "\n\t\tif (buf == NULL) {\n");
-+
-+					psav = cur;
-+					while (cur != NULL) {
-+						print_stat(2, &cur->decl);
-+						cur = cur->next;
-+					}
-+					f_print(fout, "\n\t  }\n\t  else {\n");
-+
-+					cur = psav;
-+					while (cur != dl) {
-+						emit_inline(&cur->decl, flag);
-+						cur = cur->next;
-+					}
-+
-+					f_print(fout, "\t  }\n");
-+
-+				}
-+			    }
-+			flag = GET;
-+		}
-+		f_print(fout, "\t return(TRUE);\n\t}\n\n");
-+
-+		/* now take care of XDR_FREE case */
-+
-+		for (dl = def->def.st.decls; dl != NULL; dl = dl->next)
-+			print_stat(1, &dl->decl);
-+	}
-+}
-+ 
-+
-+
-+
-+static void
-+emit_typedef(definition *def)
-+{
-+	char *prefix = def->def.ty.old_prefix;
-+	char *type = def->def.ty.old_type;
-+	char *amax = def->def.ty.array_max;
-+	relation rel = def->def.ty.rel;
-+
-+
-+	  print_ifstat(1, prefix, type, rel, amax, "objp", def->def_name);
-+}
-+
-+static void
-+print_stat(int indent, declaration *dec)
-+{
-+	char *prefix = dec->prefix;
-+	char *type = dec->type;
-+	char *amax = dec->array_max;
-+	relation rel = dec->rel;
-+	char name[256];
-+
-+	if (isvectordef(type, rel)) {
-+		s_print(name, "objp->%s", dec->name);
-+	} else {
-+		s_print(name, "&objp->%s", dec->name);
-+	}
-+	print_ifstat(indent, prefix, type, rel, amax, name, dec->name);
-+}
-+
-+
-+static void
-+emit_inline(declaration *decl, int flag)
-+{
-+
-+	/*check whether an array or not */
-+
-+	switch (decl->rel) {
-+	case REL_ALIAS:
-+		emit_single_in_line(decl, flag, REL_ALIAS);
-+		break;
-+	case REL_VECTOR:
-+		f_print(fout, "\t\t{ register %s *genp; \n", decl->type);
-+		f_print(fout, "\t\t  int i;\n");
-+		f_print(fout, "\t\t  for ( i = 0,genp=objp->%s;\n \t\t\ti < %s; i++){\n\t\t",
-+			decl->name, decl->array_max);
-+		emit_single_in_line(decl, flag, REL_VECTOR);
-+		f_print(fout, "\t\t   }\n\t\t };\n");
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+static void
-+emit_single_in_line(declaration *decl, int flag, relation rel)
-+{
-+	char *upp_case;
-+	int freed=0;
-+
-+	if(flag == PUT)
-+		f_print(fout,"\t\t (void) IXDR_PUT_");
-+	else    
-+		if(rel== REL_ALIAS)
-+			f_print(fout,"\t\t objp->%s = IXDR_GET_",decl->name);
-+		else
-+			f_print(fout,"\t\t *genp++ = IXDR_GET_");
-+
-+	upp_case=upcase(decl->type);
-+
-+	/* hack  - XX */
-+	if(strcmp(upp_case,"INT") == 0)
-+	{
-+		free(upp_case);
-+		freed=1;
-+		upp_case="INT32";
-+	}
-+
-+	if(strcmp(upp_case,"U_INT") == 0)
-+	{
-+		free(upp_case);
-+		freed=1;
-+		upp_case="U_INT32";
-+	}
-+
-+
-+	if(flag == PUT) 
-+		if(rel== REL_ALIAS)
-+			f_print(fout,"%s(buf,objp->%s);\n",upp_case,decl->name);
-+		else
-+			f_print(fout,"%s(buf,*genp++);\n",upp_case);
-+
-+	else
-+		f_print(fout,"%s(buf);\n",upp_case);
-+	if(!freed)
-+		free(upp_case);
-+
-+}
-+
-+
-+static char *
-+upcase(char *str)
-+{
-+	char           *ptr, *hptr;
-+
-+
-+	ptr = (char *) malloc(strlen(str)+1);
-+	if (ptr == (char *) NULL) {
-+		f_print(stderr, "malloc failed \n");
-+		exit(1);
-+	};
-+
-+	hptr = ptr;
-+	while (*str != '\0')
-+		*ptr++ = toupper(*str++);
-+
-+	*ptr = '\0';
-+	return (hptr);
-+
-+}
-diff --git a/rpcgen/rpc_hout.c b/rpcgen/rpc_hout.c
-new file mode 100644
-index 0000000..ea1cb24
---- /dev/null
-+++ b/rpcgen/rpc_hout.c
-@@ -0,0 +1,490 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_hout.c, Header file outputter for the RPC protocol compiler 
-+ */
-+#include <stdio.h>
-+#include <ctype.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+#include "rpc_output.h"
-+
-+
-+static int	undefined2(char *type, char *stop);
-+static void	pxdrfuncdecl(char *name, int pointerp);
-+static void	pconstdef(definition *def);
-+static void	pargdef(definition *def);
-+static void	pstructdef(definition *def);
-+static void	puniondef(definition *def);
-+static void	pdefine(char *name, char *num);
-+static void	puldefine(char *name, char *num);
-+static int	define_printed(proc_list *stop, version_list *start);
-+static void	pprogramdef(definition *def);
-+static void	pprocdef(proc_list *proc, version_list *vp,
-+				char *addargtype, int server_p, int mode);
-+static void	parglist(proc_list *proc, char *addargtype);
-+static void	penumdef(definition *def);
-+static void	ptypedef(definition *def);
-+
-+/*
-+ * Print the C-version of an xdr definition 
-+ */
-+void
-+print_datadef(definition *def)
-+{
-+
-+	if (def->def_kind == DEF_PROGRAM )  /* handle data only */
-+	        return;
-+
-+	if (def->def_kind != DEF_CONST) {
-+		f_print(fout, "\n");
-+	}
-+	switch (def->def_kind) {
-+	case DEF_STRUCT:
-+		pstructdef(def);
-+		break;
-+	case DEF_UNION:
-+		puniondef(def);
-+		break;
-+	case DEF_ENUM:
-+		penumdef(def);
-+		break;
-+	case DEF_TYPEDEF:
-+		ptypedef(def);
-+		break;
-+	case DEF_PROGRAM:
-+		pprogramdef(def);
-+		break;
-+	case DEF_CONST:
-+		pconstdef(def);
-+		break;
-+	}
-+	if (def->def_kind != DEF_PROGRAM && def->def_kind != DEF_CONST) {
-+	  pxdrfuncdecl( def->def_name,
-+		       def->def_kind != DEF_TYPEDEF ||
-+		       !isvectordef(def->def.ty.old_type, def->def.ty.rel));
-+
-+	}
-+}
-+
-+
-+void
-+print_funcdef(definition *def)
-+{
-+	switch (def->def_kind) {
-+	case DEF_PROGRAM:
-+		f_print(fout, "\n");
-+		pprogramdef(def);
-+		break;
-+	default:
-+		break;
-+	}
-+}
-+
-+static void
-+pxdrfuncdecl(char *name, int pointerp)
-+{
-+	f_print(fout,
-+	"#ifdef __cplusplus \n"
-+	"extern \"C\" bool_t xdr_%s(XDR *, %s%s);\n"
-+	"#elif __STDC__ \n"
-+	"extern  bool_t xdr_%s(XDR *, %s%s);\n"
-+	"#else /* Old Style C */ \n"
-+	"bool_t xdr_%s();\n"
-+	"#endif /* Old Style C */ \n\n",
-+	name, name, pointerp ? "*" : "",
-+	name, name, pointerp ? "*" : "",
-+	name);
-+}
-+
-+
-+static void
-+pconstdef(definition *def)
-+{
-+	pdefine(def->def_name, def->def.co);
-+}
-+
-+/* print out the definitions for the arguments of functions in the 
-+   header file 
-+*/
-+static  void
-+pargdef(definition *def)
-+{
-+	decl_list *l;
-+	version_list *vers;
-+	char *name;
-+	proc_list *plist;
-+
-+	
-+	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
-+			for(plist = vers->procs; plist != NULL; 
-+			    plist = plist->next) {
-+				
-+				if (!newstyle || plist->arg_num < 2) {
-+					continue; /* old style or single args */
-+				}
-+				name = plist->args.argname;
-+				f_print(fout, "struct %s {\n", name);
-+				for (l = plist->args.decls; 
-+				     l != NULL; l = l->next) {
-+					pdeclaration(name, &l->decl, 1, ";\n" );
-+				}
-+				f_print(fout, "};\n");
-+				f_print(fout, "typedef struct %s %s;\n", name, name);
-+				pxdrfuncdecl(name, 0);
-+				f_print( fout, "\n" );
-+			}
-+		}
-+
-+}
-+
-+
-+static void
-+pstructdef(definition *def)
-+{
-+	decl_list *l;
-+	char *name = def->def_name;
-+
-+	f_print(fout, "struct %s {\n", name);
-+	for (l = def->def.st.decls; l != NULL; l = l->next) {
-+		pdeclaration(name, &l->decl, 1, ";\n");
-+	}
-+	f_print(fout, "};\n");
-+	f_print(fout, "typedef struct %s %s;\n", name, name);
-+}
-+
-+static void
-+puniondef(definition *def)
-+{
-+	case_list      *l;
-+	char           *name = def->def_name;
-+	declaration    *decl;
-+
-+	f_print(fout, "struct %s {\n", name);
-+	decl = &def->def.un.enum_decl;
-+	if (streq(decl->type, "bool")) {
-+		f_print(fout, "\tbool_t %s;\n", decl->name);
-+	} else {
-+		f_print(fout, "\t%s %s;\n", decl->type, decl->name);
-+	}
-+	f_print(fout, "\tunion {\n");
-+	for (l = def->def.un.cases; l != NULL; l = l->next) {
-+		if (l->contflag == 0)
-+			pdeclaration(name, &l->case_decl, 2, ";\n");
-+	}
-+	decl = def->def.un.default_decl;
-+	if (decl && !streq(decl->type, "void")) {
-+		pdeclaration(name, decl, 2, ";\n");
-+	}
-+	f_print(fout, "\t} %s_u;\n", name);
-+	f_print(fout, "};\n");
-+	f_print(fout, "typedef struct %s %s;\n", name, name);
-+}
-+
-+static void
-+pdefine(char *name, char *num)
-+{
-+	f_print(fout, "#define %s %s\n", name, num);
-+}
-+
-+static void
-+puldefine(char *name, char *num)
-+{
-+	f_print(fout, "#define %s ((u_int32_t)%s)\n", name, num);
-+}
-+
-+static int
-+define_printed(proc_list *stop, version_list *start)
-+{
-+	version_list *vers;
-+	proc_list *proc;
-+
-+	for (vers = start; vers != NULL; vers = vers->next) {
-+		for (proc = vers->procs; proc != NULL; proc = proc->next) {
-+			if (proc == stop) {
-+				return (0);
-+			} else if (streq(proc->proc_name, stop->proc_name)) {
-+				return (1);
-+			}
-+		}
-+	}
-+	abort();
-+	/* NOTREACHED */
-+}
-+
-+static void
-+pprogramdef(definition *def)
-+{
-+	version_list   *vers;
-+	proc_list      *proc;
-+	int             i;
-+	char           *ext;
-+
-+	pargdef(def);
-+
-+	puldefine(def->def_name, def->def.pr.prog_num);
-+	for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) {
-+		if (tblflag) {
-+			f_print(fout, "extern struct rpcgen_table %s_%s_table[];\n",
-+				locase(def->def_name), vers->vers_num);
-+			f_print(fout, "extern %s_%s_nproc;\n",
-+				locase(def->def_name), vers->vers_num);
-+		}
-+		puldefine(vers->vers_name, vers->vers_num);
-+
-+		/*
-+		 * Print out 3 definitions, one for ANSI-C, another for C++,
-+		 * a third for old style C
-+		 */
-+
-+		for (i = 0; i < 3; i++) {
-+			if (i == 0) {
-+				f_print(fout, "\n#ifdef __cplusplus\n");
-+				ext = "extern \"C\" ";
-+			} else if (i == 1) {
-+				f_print(fout, "\n#elif __STDC__\n");
-+				ext = "extern  ";
-+			} else {
-+				f_print(fout, "\n#else /* Old Style C */ \n");
-+				ext = "extern  ";
-+			}
-+
-+
-+			for (proc = vers->procs; proc != NULL; proc = proc->next) {
-+				if (!define_printed(proc, def->def.pr.versions)) {
-+					puldefine(proc->proc_name, proc->proc_num);
-+				}
-+				f_print(fout, "%s", ext);
-+				pprocdef(proc, vers, "CLIENT *", 0, i);
-+				f_print(fout, "%s", ext);
-+				pprocdef(proc, vers, "struct svc_req *", 1, i);
-+
-+			}
-+
-+		}
-+		f_print(fout, "#endif /* Old Style C */ \n");
-+	}
-+}
-+
-+static void
-+pprocdef(proc_list *proc, version_list *vp, char *addargtype,
-+				int server_p, int mode)
-+{
-+	ptype(proc->res_prefix, proc->res_type, 1);
-+	f_print(fout, "* ");
-+	if (server_p)
-+		pvname_svc(proc->proc_name, vp->vers_num);
-+	else
-+		pvname(proc->proc_name, vp->vers_num);
-+
-+	/*
-+	 * mode  0 == cplusplus, mode  1 = ANSI-C, mode 2 = old style C
-+	 */
-+	if (mode == 0 || mode == 1)
-+		parglist(proc, addargtype);
-+	else
-+		f_print(fout, "();\n");
-+}
-+
-+
-+
-+/* print out argument list of procedure */
-+static void
-+parglist(proc_list *proc, char *addargtype)
-+{
-+	decl_list      *dl;
-+
-+	f_print(fout, "(");
-+
-+	if (proc->arg_num < 2 && newstyle &&
-+		streq(proc->args.decls->decl.type, "void")) {
-+		/* 0 argument in new style:  do nothing */
-+	} else {
-+		for (dl = proc->args.decls; dl != NULL; dl = dl->next) {
-+			ptype(dl->decl.prefix, dl->decl.type, 1);
-+			if (!newstyle)
-+				f_print(fout, "*");	/* old style passes by reference */
-+
-+			f_print(fout, ", ");
-+		}
-+	}
-+
-+	f_print(fout, "%s);\n", addargtype);
-+}
-+
-+static void
-+penumdef(definition *def)
-+{
-+	char *name = def->def_name;
-+	enumval_list *l;
-+	char *last = NULL;
-+	int count = 0;
-+
-+	f_print(fout, "enum %s {\n", name);
-+	for (l = def->def.en.vals; l != NULL; l = l->next) {
-+		f_print(fout, "\t%s", l->name);
-+		if (l->assignment) {
-+			f_print(fout, " = %s", l->assignment);
-+			last = l->assignment;
-+			count = 1;
-+		} else {
-+			if (last == NULL) {
-+				f_print(fout, " = %d", count++);
-+			} else {
-+				f_print(fout, " = %s + %d", last, count++);
-+			}
-+		}
-+		f_print(fout, ",\n");
-+	}
-+	f_print(fout, "};\n");
-+	f_print(fout, "typedef enum %s %s;\n", name, name);
-+}
-+
-+static void
-+ptypedef(definition *def)
-+{
-+	char *name = def->def_name;
-+	char *old = def->def.ty.old_type;
-+	char prefix[8];	/* enough to contain "struct ", including NUL */
-+	relation rel = def->def.ty.rel;
-+
-+
-+	if (!streq(name, old)) {
-+		if (streq(old, "string")) {
-+			old = "char";
-+			rel = REL_POINTER;
-+		} else if (streq(old, "opaque")) {
-+			old = "char";
-+		} else if (streq(old, "bool")) {
-+			old = "bool_t";
-+		}
-+		if (undefined2(old, name) && def->def.ty.old_prefix) {
-+			s_print(prefix, "%s ", def->def.ty.old_prefix);
-+		} else {
-+			prefix[0] = 0;
-+		}
-+		f_print(fout, "typedef ");
-+		switch (rel) {
-+		case REL_ARRAY:
-+			f_print(fout, "struct {\n");
-+			f_print(fout, "\tu_int %s_len;\n", name);
-+			f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name);
-+			f_print(fout, "} %s", name);
-+			break;
-+		case REL_POINTER:
-+			f_print(fout, "%s%s *%s", prefix, old, name);
-+			break;
-+		case REL_VECTOR:
-+			f_print(fout, "%s%s %s[%s]", prefix, old, name,
-+				def->def.ty.array_max);
-+			break;
-+		case REL_ALIAS:
-+			f_print(fout, "%s%s %s", prefix, old, name);
-+			break;
-+		}
-+		f_print(fout, ";\n");
-+	}
-+}
-+
-+void
-+pdeclaration(char *name, declaration *dec, int tab, char *separator)
-+{
-+	char buf[8];	/* enough to hold "struct ", include NUL */
-+	char *prefix;
-+	char *type;
-+
-+	if (streq(dec->type, "void")) {
-+		return;
-+	}
-+	tabify(fout, tab);
-+	if (streq(dec->type, name) && !dec->prefix) {
-+		f_print(fout, "struct ");
-+	}
-+	if (streq(dec->type, "string")) {
-+		f_print(fout, "char *%s", dec->name);
-+	} else {
-+		prefix = "";
-+		if (streq(dec->type, "bool")) {
-+			type = "bool_t";
-+		} else if (streq(dec->type, "opaque")) {
-+			type = "char";
-+		} else {
-+			if (dec->prefix) {
-+				s_print(buf, "%s ", dec->prefix);
-+				prefix = buf;
-+			}
-+			type = dec->type;
-+		}
-+		switch (dec->rel) {
-+		case REL_ALIAS:
-+			f_print(fout, "%s%s %s", prefix, type, dec->name);
-+			break;
-+		case REL_VECTOR:
-+			f_print(fout, "%s%s %s[%s]", prefix, type, dec->name,
-+				dec->array_max);
-+			break;
-+		case REL_POINTER:
-+			f_print(fout, "%s%s *%s", prefix, type, dec->name);
-+			break;
-+		case REL_ARRAY:
-+			f_print(fout, "struct {\n");
-+			tabify(fout, tab);
-+			f_print(fout, "\tu_int %s_len;\n", dec->name);
-+			tabify(fout, tab);
-+			f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name);
-+			tabify(fout, tab);
-+			f_print(fout, "} %s", dec->name);
-+			break;
-+		}
-+	}
-+	f_print(fout, separator );
-+}
-+
-+static int
-+undefined2(char *type, char *stop)
-+{
-+	list *l;
-+	definition *def;
-+
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind != DEF_PROGRAM) {
-+			if (streq(def->def_name, stop)) {
-+				return (1);
-+			} else if (streq(def->def_name, type)) {
-+				return (0);
-+			}
-+		}
-+	}
-+	return (1);
-+}
-diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c
-new file mode 100644
-index 0000000..28aa60c
---- /dev/null
-+++ b/rpcgen/rpc_main.c
-@@ -0,0 +1,1067 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_main.c, Top level of the RPC protocol compiler. 
-+ */
-+
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/file.h>
-+#include <sys/stat.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+#include "rpc_scan.h"
-+
-+struct commandline {
-+	int cflag;		/* xdr C routines */
-+	int hflag;		/* header file */
-+	int lflag;		/* client side stubs */
-+	int mflag;		/* server side stubs */
-+	int nflag;		/* netid flag */
-+	int sflag;		/* server stubs for the given transport */
-+	int tflag;		/* dispatch Table file */
-+	int Ssflag;		/* produce server sample code */
-+	int Scflag;		/* produce client sample code */
-+	char *infile;		/* input module name */
-+	char *outfile;		/* output module name */
-+};
-+
-+static char *	extendfile(char *file, char *ext);
-+static void	open_output(char *infile, char *outfile);
-+static void	add_warning(void);
-+static void	clear_args(void);
-+static void	open_input(char *infile, char *define);
-+static int	check_nettype(char *name, char **list_to_check);
-+static void	c_output(char *infile, char *define, int extend, char *outfile);
-+static void	c_initialize(void);
-+static char *	generate_guard(char *pathname);
-+static void	h_output(char *infile, char *define, int extend, char *outfile);
-+static void	s_output(int argc, char **argv, char *infile,
-+			char *define, int extend, char *outfile,
-+			int nomain, int netflag);
-+static void	l_output(char *infile, char *define, int extend, char *outfile);
-+static void	t_output(char *infile, char *define, int extend, char *outfile);
-+static void	svc_output(char *, char *, int, char *);
-+static void	clnt_output(char *, char *, int, char *);
-+static int	do_registers(int argc, char **argv);
-+static void	addarg(char *cp);
-+static void	putarg(int where, char *cp);
-+static void	checkfiles(char *infile, char *outfile);
-+static int	parseargs(int argc, char **argv, struct commandline *cmd);
-+static void	usage(void);
-+static void	options_usage(void);
-+
-+/*
-+extern void  write_sample_svc();
-+int write_sample_clnt();
-+void write_sample_clnt_main();
-+
-+static svc_output();
-+ */
-+
-+#define EXTEND	1		/* alias for TRUE */
-+#define DONT_EXTEND	0		/* alias for FALSE */
-+
-+#define SVR4_CPP "/usr/ccs/lib/cpp"
-+#define SUNOS_CPP "/lib/cpp"
-+static int cppDefined = 0;          /* explicit path for C preprocessor */
-+
-+
-+static char *cmdname;
-+
-+static char *svcclosetime = "120";
-+static char *CPP = SVR4_CPP;
-+static char CPPFLAGS[] = "-C";
-+static char pathbuf[MAXPATHLEN + 1];
-+static char *allv[] = {
-+	"rpcgen", "-s", "udp", "-s", "tcp",
-+};
-+static int allc = sizeof(allv)/sizeof(allv[0]);
-+static char *allnv[] = {
-+	"rpcgen", "-s", "netpath",
-+};
-+static int allnc = sizeof(allnv)/sizeof(allnv[0]);
-+
-+/*
-+ * machinations for handling expanding argument list
-+ */
-+#if 0
-+static void addarg();		/* add another argument to the list */
-+static void putarg();		/* put argument at specified location  */
-+static void clear_args();	/* clear argument list */
-+static void checkfiles();	/* check if out file already exists */
-+#endif
-+
-+
-+
-+#define ARGLISTLEN	20
-+#define FIXEDARGS         2
-+
-+static char *arglist[ARGLISTLEN];
-+static int argcount = FIXEDARGS;
-+
-+
-+int nonfatalerrors;	/* errors */
-+int inetdflag/* = 1*/;	/* Support for inetd */ /* is now the default */
-+int pmflag;		/* Support for port monitors */
-+int logflag;		/* Use syslog instead of fprintf for errors */
-+int tblflag;		/* Support for dispatch table file */
-+
-+/* length at which to start doing an inline */
-+#define INLINE 3
-+
-+int Inline = INLINE;	/* length at which to start doing an inline. 3 = default
-+			 * if 0, no xdr_inline code */
-+
-+int indefinitewait;	/* If started by port monitors, hang till it wants */
-+int exitnow;		/* If started by port monitors, exit after the call */
-+int timerflag;		/* TRUE if !indefinite && !exitnow */
-+int newstyle;           /* newstyle of passing arguments (by value) */
-+int Cflag = 0 ;         /* ANSI C syntax */
-+static int allfiles;    /* generate all files */
-+#ifdef linux
-+int tirpcflag = 0;	/* no tirpc by default */
-+#else
-+int tirpcflag = 1;      /* generating code for tirpc, by default */
-+#endif
-+
-+int
-+main(int argc, char **argv)
-+{
-+	struct commandline cmd;
-+
-+	(void) memset((char *) &cmd, 0, sizeof(struct commandline));
-+	clear_args();
-+	if (!parseargs(argc, argv, &cmd))
-+		usage();
-+
-+	if (cmd.cflag || cmd.hflag || cmd.lflag || cmd.tflag || cmd.sflag ||
-+		cmd.mflag || cmd.nflag || cmd.Ssflag || cmd.Scflag) {
-+		checkfiles(cmd.infile, cmd.outfile);
-+	} else
-+		checkfiles(cmd.infile, NULL);
-+
-+	if (cmd.cflag) {
-+		c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile);
-+	} else if (cmd.hflag) {
-+		h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile);
-+	} else if (cmd.lflag) {
-+		l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile);
-+	} else if (cmd.sflag || cmd.mflag || (cmd.nflag)) {
-+		s_output(argc, argv, cmd.infile, "-DRPC_SVC", DONT_EXTEND,
-+			cmd.outfile, cmd.mflag, cmd.nflag);
-+	} else if (cmd.tflag) {
-+		t_output(cmd.infile, "-DRPC_TBL", DONT_EXTEND, cmd.outfile);
-+	} else if (cmd.Ssflag) {
-+		svc_output(cmd.infile, "-DRPC_SERVER", DONT_EXTEND, cmd.outfile);
-+	} else if (cmd.Scflag) {
-+		clnt_output(cmd.infile, "-DRPC_CLIENT", DONT_EXTEND, cmd.outfile);
-+	} else {
-+		/* the rescans are required, since cpp may effect input */
-+		c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c");
-+		reinitialize();
-+		h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h");
-+		reinitialize();
-+		l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c");
-+		reinitialize();
-+		if (inetdflag || !tirpcflag)
-+			s_output(allc, allv, cmd.infile, "-DRPC_SVC", EXTEND,
-+				"_svc.c", cmd.mflag, cmd.nflag);
-+		else
-+			s_output(allnc, allnv, cmd.infile, "-DRPC_SVC",
-+				EXTEND, "_svc.c", cmd.mflag, cmd.nflag);
-+		if (tblflag) {
-+			reinitialize();
-+			t_output(cmd.infile, "-DRPC_TBL", EXTEND, "_tbl.i");
-+		}
-+		if (allfiles) {
-+			reinitialize();
-+			svc_output(cmd.infile, "-DRPC_SERVER", EXTEND, "_server.c");
-+		}
-+		if (allfiles) {
-+			reinitialize();
-+			clnt_output(cmd.infile, "-DRPC_CLIENT", EXTEND, "_client.c");
-+		}
-+	}
-+	exit(nonfatalerrors);
-+	/* NOTREACHED */
-+}
-+
-+/*
-+ * add extension to filename 
-+ */
-+static char *
-+extendfile(char *file, char *ext)
-+{
-+	char *res;
-+	char *p;
-+
-+	res = alloc(strlen(file) + strlen(ext) + 1);
-+	if (res == NULL) {
-+		abort();
-+	}
-+	p = strrchr(file, '.');
-+	if (p == NULL) {
-+		p = file + strlen(file);
-+	}
-+	(void) strcpy(res, file);
-+	(void) strcpy(res + (p - file), ext);
-+	return (res);
-+}
-+
-+/*
-+ * Open output file with given extension 
-+ */
-+static void
-+open_output(char *infile, char *outfile)
-+{
-+
-+	if (outfile == NULL) {
-+		fout = stdout;
-+		return;
-+	}
-+
-+	if (infile != NULL && streq(outfile, infile)) {
-+		f_print(stderr, "%s: output would overwrite %s\n", cmdname,
-+			infile);
-+		crash();
-+	}
-+	fout = fopen(outfile, "w");
-+	if (fout == NULL) {
-+		f_print(stderr, "%s: unable to open ", cmdname);
-+		perror(outfile);
-+		crash();
-+	}
-+	record_open(outfile);
-+
-+}
-+
-+static void
-+add_warning(void)
-+{
-+	f_print(fout, "/*\n");
-+	f_print(fout, " * Please do not edit this file.\n");
-+	f_print(fout, " * It was generated using rpcgen.\n");
-+	f_print(fout, " */\n\n");
-+}
-+
-+/* clear list of arguments */
-+static void
-+clear_args(void)
-+{
-+  int i;
-+  for( i=FIXEDARGS; i<ARGLISTLEN; i++ )
-+    arglist[i] = NULL;
-+  argcount = FIXEDARGS;
-+}
-+
-+/*
-+ * Open input file with given define for C-preprocessor 
-+ */
-+static void
-+open_input(char *infile, char *define)
-+{
-+	int pd[2];
-+
-+	infilename = (infile == NULL) ? "<stdin>" : infile;
-+	(void) pipe(pd);
-+	switch (fork()) {
-+	case 0:
-+		putarg(0, "cpp");
-+		putarg(1, CPPFLAGS);
-+		addarg(define);
-+		addarg(infile);
-+		addarg((char *)NULL);
-+		(void) close(1);
-+		(void) dup2(pd[1], 1);
-+		(void) close(pd[0]);
-+		if (cppDefined)
-+			execv(CPP, arglist);
-+		else {
-+			execvp("cpp", arglist);
-+			if (errno == ENOENT)
-+				execvp(SVR4_CPP, arglist);
-+			if (errno == ENOENT)
-+				execvp(SUNOS_CPP, arglist);
-+		}
-+		perror("execv");
-+		exit(1);
-+	case -1:
-+		perror("fork");
-+		exit(1);
-+	}
-+	(void) close(pd[1]);
-+	fin = fdopen(pd[0], "r");
-+	if (fin == NULL) {
-+		f_print(stderr, "%s: ", cmdname);
-+		perror(infilename);
-+		crash();
-+	}
-+}
-+
-+/* valid tirpc nettypes */
-+static char*	valid_ti_nettypes[] =
-+{
-+	"netpath",
-+	"visible",
-+	"circuit_v",
-+	"datagram_v",
-+	"circuit_n",
-+	"datagram_n",
-+	"udp",
-+	"tcp",
-+	"raw",
-+	NULL
-+};
-+
-+/* valid inetd nettypes */
-+static char* valid_i_nettypes[] =
-+{
-+	"udp",
-+	"tcp",
-+	NULL
-+};
-+
-+static int
-+check_nettype(char *name, char **list_to_check)
-+{
-+  int i;
-+  for( i = 0; list_to_check[i] != NULL; i++ ) {
-+	  if( strcmp( name, list_to_check[i] ) == 0 ) {
-+	    return 1;
-+	  }
-+  }
-+  f_print( stderr, "illegal nettype :\'%s\'\n", name );
-+  return 0;
-+}
-+
-+/*
-+ * Compile into an XDR routine output file
-+ */
-+
-+static void
-+c_output(char *infile, char *define, int extend, char *outfile)
-+{
-+	definition *def;
-+	char *include;
-+	char *outfilename;
-+	long tell;
-+
-+	c_initialize();
-+	open_input(infile, define);	
-+	outfilename = extend ? extendfile(infile, outfile) : outfile;
-+	open_output(infile, outfilename);
-+	add_warning();
-+	if (infile && (include = extendfile(infile, ".h"))) {
-+		f_print(fout, "#include \"%s\"\n", include);
-+		free(include);
-+		/* .h file already contains rpc/rpc.h */
-+	} else
-+	  f_print(fout, "#include <rpc/rpc.h>\n");
-+	tell = ftell(fout);
-+	while ((def = get_definition()) != NULL) {
-+		emit(def);
-+	}
-+	if (extend && tell == ftell(fout)) {
-+		(void) unlink(outfilename);
-+	}
-+}
-+
-+
-+static void
-+c_initialize(void)
-+{
-+
-+  /* add all the starting basic types */
-+
-+  add_type(1,"int");
-+  add_type(1,"int32_t");
-+  add_type(1,"short");
-+  add_type(1,"bool");
-+
-+  add_type(1,"u_int");
-+  add_type(1,"u_int32_t");
-+  add_type(1,"u_short");
-+
-+}
-+
-+char rpcgen_table_dcl[] = "struct rpcgen_table {\n\
-+	char	*(*proc)();\n\
-+	xdrproc_t	xdr_arg;\n\
-+	unsigned	len_arg;\n\
-+	xdrproc_t	xdr_res;\n\
-+	unsigned	len_res;\n\
-+};\n";
-+
-+
-+static char *
-+generate_guard(char *pathname)
-+{
-+        char* filename, *guard, *tmp;
-+
-+	filename = strrchr(pathname, '/' );  /* find last component */
-+	filename = ((filename == 0) ? pathname : filename+1);
-+	guard = strdup(filename);
-+	/* convert to upper case */
-+	tmp = guard;
-+	while (*tmp) {
-+		if (islower(*tmp))
-+			*tmp = toupper(*tmp);
-+		tmp++;
-+	}
-+		
-+	guard = extendfile(guard, "_H_RPCGEN");
-+	return( guard );
-+}
-+
-+/*
-+ * Compile into an XDR header file
-+ */
-+static void
-+h_output(char *infile, char *define, int extend, char *outfile)
-+{
-+	definition *def;
-+	char *outfilename;
-+	long tell;
-+	char *guard;
-+	list *l;
-+
-+	open_input(infile, define);
-+	outfilename =  extend ? extendfile(infile, outfile) : outfile;
-+	open_output(infile, outfilename);
-+	add_warning();
-+	guard = generate_guard(  outfilename ? outfilename: infile );
-+
-+	f_print(fout,"#ifndef _%s\n#define _%s\n\n", guard,
-+		guard);
-+
-+	f_print(fout, "#include <rpc/rpc.h>\n\n");
-+
-+	f_print(fout, "#ifndef IXDR_GET_INT32\n");
-+	f_print(fout, "#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))\n");
-+	f_print(fout, "#endif\n");
-+	f_print(fout, "#ifndef IXDR_PUT_INT32\n");
-+	f_print(fout, "#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))\n");
-+	f_print(fout, "#endif\n");
-+	f_print(fout, "#ifndef IXDR_GET_U_INT32\n");
-+	f_print(fout, "#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))\n");
-+	f_print(fout, "#endif\n");
-+	f_print(fout, "#ifndef IXDR_PUT_U_INT32\n");
-+	f_print(fout, "#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))\n");
-+	f_print(fout, "#endif\n");
-+
-+	tell = ftell(fout);
-+	/* print data definitions */
-+	while ((def = get_definition()) != NULL) {
-+		print_datadef(def);
-+	}
-+
-+	/* print function declarations.  
-+	   Do this after data definitions because they might be used as
-+	   arguments for functions */
-+	for (l = defined; l != NULL; l = l->next) {
-+		print_funcdef(l->val);
-+	}
-+	if (extend && tell == ftell(fout)) {
-+		(void) unlink(outfilename);
-+	} else if (tblflag) {
-+		f_print(fout, rpcgen_table_dcl);
-+	}
-+	f_print(fout, "\n#endif /* !_%s */\n", guard);
-+}
-+
-+/*
-+ * Compile into an RPC service
-+ */
-+static void
-+s_output(int argc, char **argv, char *infile, char *define, int extend,
-+			char *outfile, int nomain, int netflag)
-+{
-+	char *include;
-+	definition *def;
-+	int foundprogram = 0;
-+	char *outfilename;
-+
-+	open_input(infile, define);
-+	outfilename = extend ? extendfile(infile, outfile) : outfile;
-+	open_output(infile, outfilename);
-+	add_warning();
-+	if (infile && (include = extendfile(infile, ".h"))) {
-+		f_print(fout, "#include \"%s\"\n", include);
-+		free(include);
-+	} else
-+	  f_print(fout, "#include <rpc/rpc.h>\n");
-+
-+	f_print(fout, "#include <stdio.h>\n");
-+	f_print(fout, "#include <stdlib.h>/* getenv, exit */\n"); 
-+	if (Cflag) {
-+		f_print (fout, "#include <rpc/pmap_clnt.h> /* for pmap_unset */\n");
-+		f_print (fout, "#include <string.h> /* strcmp */ \n"); 
-+	}
-+	if (strcmp(svcclosetime, "-1") == 0)
-+		indefinitewait = 1;
-+	else if (strcmp(svcclosetime, "0") == 0)
-+		exitnow = 1;
-+	else if (inetdflag || pmflag) {
-+		f_print(fout, "#include <signal.h>\n");
-+	  timerflag = 1;
-+	}
-+
-+#ifndef linux
-+	if( !tirpcflag && inetdflag )
-+	  f_print(fout, "#include <sys/ttycom.h>/* TIOCNOTTY */\n");
-+#else
-+	if( !tirpcflag )
-+	  f_print(fout, "#include <sys/ioctl.h>/* TIOCNOTTY */\n");
-+#endif
-+	if( Cflag && (inetdflag || pmflag ) ) {
-+	  f_print(fout, "#ifdef __cplusplus\n");
-+	  f_print(fout, "#include <sysent.h> /* getdtablesize, open */\n"); 
-+	  f_print(fout, "#endif /* __cplusplus */\n");
-+	  
-+	  if( tirpcflag )
-+	    f_print(fout, "#include <unistd.h> /* setsid */\n");
-+	}
-+	if( tirpcflag )
-+	  f_print(fout, "#include <sys/types.h>\n");
-+
-+	f_print(fout, "#include <memory.h>\n");
-+#ifndef linux
-+	f_print(fout, "#include <stropts.h>\n");
-+#endif
-+	if (inetdflag || !tirpcflag ) {
-+		f_print(fout, "#include <sys/socket.h>\n");
-+		f_print(fout, "#include <netinet/in.h>\n");
-+	} 
-+
-+	if ( (netflag || pmflag) && tirpcflag ) {
-+		f_print(fout, "#include <netconfig.h>\n");
-+	}
-+	if (/*timerflag &&*/ tirpcflag)
-+		f_print(fout, "#include <sys/resource.h> /* rlimit */\n");
-+	if (logflag || inetdflag || pmflag) {
-+#ifdef linux
-+		f_print(fout, "#include <syslog.h>\n");
-+#else
-+		f_print(fout, "#ifdef SYSLOG\n");
-+		f_print(fout, "#include <syslog.h>\n");
-+		f_print(fout, "#else\n");
-+		f_print(fout, "#define LOG_ERR 1\n");
-+		f_print(fout, "#define openlog(a, b, c)\n");
-+		f_print(fout, "#endif\n");
-+#endif
-+	}
-+
-+	/* for ANSI-C */
-+	f_print(fout, "\n#ifdef __STDC__\n#define SIG_PF void(*)(int)\n#endif\n");
-+
-+	f_print(fout, "\n#ifdef DEBUG\n#define RPC_SVC_FG\n#endif\n");
-+	if (timerflag)
-+		f_print(fout, "\n#define _RPCSVC_CLOSEDOWN %s\n", svcclosetime);
-+	while ((def = get_definition()) != NULL) {
-+		foundprogram |= (def->def_kind == DEF_PROGRAM);
-+	}
-+	if (extend && !foundprogram) {
-+		(void) unlink(outfilename);
-+		return;
-+	}
-+	write_most(infile, netflag, nomain);
-+	if (!nomain) {
-+		if( !do_registers(argc, argv) ) {
-+		  if (outfilename)
-+		    (void) unlink(outfilename);
-+		  usage();
-+		}
-+		write_rest();
-+	}
-+}
-+
-+/*
-+ * generate client side stubs
-+ */
-+static void
-+l_output(char *infile, char *define, int extend, char *outfile)
-+{
-+	char *include;
-+	definition *def;
-+	int foundprogram = 0;
-+	char *outfilename;
-+
-+	open_input(infile, define);
-+	outfilename = extend ? extendfile(infile, outfile) : outfile;
-+	open_output(infile, outfilename);
-+	add_warning();
-+	if (Cflag)
-+	  f_print (fout, "#include <memory.h> /* for memset */\n");
-+	if (infile && (include = extendfile(infile, ".h"))) {
-+		f_print(fout, "#include \"%s\"\n", include);
-+		free(include);
-+	} else
-+	  f_print(fout, "#include <rpc/rpc.h>\n");
-+	while ((def = get_definition()) != NULL) {
-+		foundprogram |= (def->def_kind == DEF_PROGRAM);
-+	}
-+	if (extend && !foundprogram) {
-+		(void) unlink(outfilename);
-+		return;
-+	}
-+	write_stubs();
-+}
-+
-+/*
-+ * generate the dispatch table
-+ */
-+static void
-+t_output(char *infile, char *define, int extend, char *outfile)
-+{
-+	definition *def;
-+	int foundprogram = 0;
-+	char *outfilename;
-+
-+	open_input(infile, define);
-+	outfilename = extend ? extendfile(infile, outfile) : outfile;
-+	open_output(infile, outfilename);
-+	add_warning();
-+	while ((def = get_definition()) != NULL) {
-+		foundprogram |= (def->def_kind == DEF_PROGRAM);
-+	}
-+	if (extend && !foundprogram) {
-+		(void) unlink(outfilename);
-+		return;
-+	}
-+	write_tables();
-+}
-+
-+/* sample routine for the server template */
-+static  void
-+svc_output(char *infile, char *define, int extend, char *outfile)
-+{
-+  definition *def;
-+  char *include;
-+  char *outfilename;
-+  long tell;
-+  
-+  open_input(infile, define);	
-+  outfilename = extend ? extendfile(infile, outfile) : outfile;
-+  checkfiles(infile,outfilename); /*check if outfile already exists.
-+				  if so, print an error message and exit*/
-+  open_output(infile, outfilename);
-+  add_sample_msg();
-+
-+  if (infile && (include = extendfile(infile, ".h"))) {
-+    f_print(fout, "#include \"%s\"\n", include);
-+    free(include);
-+  } else
-+    f_print(fout, "#include <rpc/rpc.h>\n");
-+
-+  tell = ftell(fout);
-+  while ((def = get_definition()) != NULL) {
-+	  write_sample_svc(def);
-+  }
-+  if (extend && tell == ftell(fout)) {
-+	  (void) unlink(outfilename);
-+  }
-+}
-+
-+
-+/* sample main routine for client */
-+static  void
-+clnt_output(char *infile, char *define, int extend, char *outfile)
-+{
-+	definition     *def;
-+	char           *include;
-+	char           *outfilename;
-+	long            tell;
-+	int             has_program = 0;
-+
-+	open_input(infile, define);
-+	outfilename = extend ? extendfile(infile, outfile) : outfile;
-+	checkfiles(infile, outfilename);	/*check if outfile already exists.
-+				  if so, print an error message and exit*/
-+
-+	open_output(infile, outfilename);
-+	add_sample_msg();
-+	if (infile && (include = extendfile(infile, ".h"))) {
-+		f_print(fout, "#include \"%s\"\n", include);
-+		free(include);
-+	} else
-+		f_print(fout, "#include <rpc/rpc.h>\n");
-+	tell = ftell(fout);
-+	while ((def = get_definition()) != NULL) {
-+		has_program += write_sample_clnt(def);
-+	}
-+
-+	if (has_program)
-+		write_sample_clnt_main();
-+
-+	if (extend && tell == ftell(fout)) {
-+		(void) unlink(outfilename);
-+	}
-+}
-+
-+/*
-+ * Perform registrations for service output 
-+ * Return 0 if failed; 1 otherwise.
-+ */
-+static int
-+do_registers(int argc, char **argv)
-+{
-+	int             i;
-+
-+	if (inetdflag || !tirpcflag) {
-+		for (i = 1; i < argc; i++) {
-+			if (streq(argv[i], "-s")) {
-+				if (!check_nettype(argv[i + 1], valid_i_nettypes))
-+					return 0;
-+				write_inetd_register(argv[i + 1]);
-+				i++;
-+			}
-+		}
-+	} else {
-+		for (i = 1; i < argc; i++)
-+			if (streq(argv[i], "-s")) {
-+				if (!check_nettype(argv[i + 1], valid_ti_nettypes))
-+					return 0;
-+				write_nettype_register(argv[i + 1]);
-+				i++;
-+			} else if (streq(argv[i], "-n")) {
-+				write_netid_register(argv[i + 1]);
-+				i++;
-+			}
-+	}
-+	return 1;
-+}
-+
-+/*
-+ * Add another argument to the arg list
-+ */
-+static void
-+addarg(char *cp)
-+{
-+	if (argcount >= ARGLISTLEN) {
-+		f_print(stderr, "rpcgen: too many defines\n");
-+		crash();
-+		/*NOTREACHED*/
-+	}
-+	arglist[argcount++] = cp;
-+
-+}
-+
-+static void
-+putarg(int where, char *cp)
-+{
-+	if (where >= ARGLISTLEN) {
-+		f_print(stderr, "rpcgen: arglist coding error\n");
-+		crash();
-+		/*NOTREACHED*/
-+	}
-+	arglist[where] = cp;
-+	
-+}
-+
-+/*
-+ * if input file is stdin and an output file is specified then complain
-+ * if the file already exists. Otherwise the file may get overwritten
-+ * If input file does not exist, exit with an error 
-+ */
-+
-+static void
-+checkfiles(char *infile, char *outfile) 
-+{
-+
-+  struct stat buf;
-+
-+  if(infile)			/* infile ! = NULL */
-+    if(stat(infile,&buf) < 0)
-+      {
-+	perror(infile);
-+	crash();
-+      };
-+  if (outfile) {
-+    if (stat(outfile, &buf) < 0) 
-+      return;			/* file does not exist */
-+    else {
-+      f_print(stderr, 
-+	      "file '%s' already exists and may be overwritten\n", outfile);
-+      crash();
-+    }
-+  }
-+}
-+
-+/*
-+ * Parse command line arguments 
-+ */
-+static int
-+parseargs(int argc, char **argv, struct commandline *cmd)
-+{
-+	int i;
-+	int j;
-+	char c;
-+	char flag[(1 << 8 * sizeof(char))];
-+	int nflags;
-+
-+	cmdname = argv[0];
-+	cmd->infile = cmd->outfile = NULL;
-+	if (argc < 2) {
-+		return (0);
-+	}
-+	allfiles = 0;
-+	flag['c'] = 0;
-+	flag['h'] = 0;
-+	flag['l'] = 0;
-+	flag['m'] = 0;
-+	flag['o'] = 0;
-+	flag['s'] = 0;
-+	flag['n'] = 0;
-+	flag['t'] = 0;
-+	flag['S'] = 0;
-+	flag['C'] = 0;
-+	for (i = 1; i < argc; i++) {
-+		if (argv[i][0] != '-') {
-+			if (cmd->infile) {
-+			        f_print( stderr, "Cannot specify more than one input file!\n");
-+
-+				return (0);
-+			}
-+			cmd->infile = argv[i];
-+		} else {
-+			for (j = 1; argv[i][j] != 0; j++) {
-+				c = argv[i][j];
-+				switch (c) {
-+				case 'a':
-+					allfiles = 1;
-+					break;
-+				case 'c':
-+				case 'h':
-+				case 'l':
-+				case 'm':
-+				case 't':
-+					if (flag[(int) c]) {
-+						return (0);
-+					}
-+					flag[(int) c] = 1;
-+					break;
-+				case 'S':  
-+					/* sample flag: Ss or Sc.
-+					   Ss means set flag['S'];
-+					   Sc means set flag['C']; */
-+					c = argv[i][++j];  /* get next char */
-+					if( c == 's' )
-+					  c = 'S';
-+					else if( c == 'c' )
-+					  c = 'C';
-+					else
-+					  return( 0 );
-+
-+					if (flag[(int) c]) {
-+						return (0);
-+					}
-+					flag[(int) c] = 1;
-+					break;
-+				case 'C':  /* ANSI C syntax */
-+					Cflag = 1;
-+					break;
-+
-+				case 'b':  /* turn TIRPC flag off for
-+					    generating backward compatible
-+					    */
-+					tirpcflag = 0;
-+					break;
-+
-+				case 'I':
-+					inetdflag = 1;
-+					break;
-+				case 'N':
-+					newstyle = 1;
-+					break;
-+				case 'L':
-+					logflag = 1;
-+					break;
-+				case 'K':
-+					if (++i == argc) {
-+						return (0);
-+					}
-+					svcclosetime = argv[i];
-+					goto nextarg;
-+				case 'T':
-+					tblflag = 1;
-+					break;
-+				case 'i' :
-+				  	if (++i == argc) {
-+						return (0);
-+					}
-+					Inline = atoi(argv[i]);
-+					goto nextarg;
-+				case 'n':
-+				case 'o':
-+				case 's':
-+					if (argv[i][j - 1] != '-' || 
-+					    argv[i][j + 1] != 0) {
-+						return (0);
-+					}
-+					flag[(int) c] = 1;
-+					if (++i == argc) {
-+						return (0);
-+					}
-+					if (c == 's') {
-+						if (!streq(argv[i], "udp") &&
-+						    !streq(argv[i], "tcp")) {
-+							return (0);
-+						}
-+					} else if (c == 'o') {
-+						if (cmd->outfile) {
-+							return (0);
-+						}
-+						cmd->outfile = argv[i];
-+					}
-+					goto nextarg;
-+				case 'D':
-+					if (argv[i][j - 1] != '-') {
-+						return (0);
-+					}
-+					(void) addarg(argv[i]);
-+					goto nextarg;
-+				case 'Y':
-+					if (++i == argc) {
-+						return (0);
-+					}
-+					(void) strcpy(pathbuf, argv[i]);
-+					(void) strcat(pathbuf, "/cpp");
-+					CPP = pathbuf;
-+					cppDefined = 1;
-+					goto nextarg;
-+
-+
-+
-+				default:
-+					return (0);
-+				}
-+			}
-+	nextarg:
-+			;
-+		}
-+	}
-+
-+	cmd->cflag = flag['c'];
-+	cmd->hflag = flag['h'];
-+	cmd->lflag = flag['l'];
-+	cmd->mflag = flag['m'];
-+	cmd->nflag = flag['n'];
-+	cmd->sflag = flag['s'];
-+	cmd->tflag = flag['t'];
-+	cmd->Ssflag = flag['S'];
-+	cmd->Scflag = flag['C'];
-+
-+	if( tirpcflag ) {
-+	  pmflag = inetdflag ? 0 : 1;	  /* pmflag or inetdflag is always TRUE */
-+	  if( (inetdflag && cmd->nflag)) { /* netid not allowed with inetdflag */
-+	    f_print(stderr, "Cannot use netid flag with inetd flag!\n");
-+	    return (0);
-+	  }
-+	} else {  /* 4.1 mode */
-+	  pmflag = 0;               /* set pmflag only in tirpcmode */
-+	  inetdflag = 1;            /* inetdflag is TRUE by default */
-+	  if( cmd->nflag ) {          /* netid needs TIRPC */
-+	    f_print( stderr, "Cannot use netid flag without TIRPC!\n");
-+	    return( 0 );
-+	  }
-+	}
-+
-+	if( newstyle && ( tblflag || cmd->tflag) ) {
-+	  f_print( stderr, "Cannot use table flags with newstyle!\n");
-+	  return( 0 );
-+	}
-+
-+	/* check no conflicts with file generation flags */
-+	nflags = cmd->cflag + cmd->hflag + cmd->lflag + cmd->mflag +
-+		cmd->sflag + cmd->nflag + cmd->tflag + cmd->Ssflag + cmd->Scflag;
-+
-+	if (nflags == 0) {
-+		if (cmd->outfile != NULL || cmd->infile == NULL) {
-+			return (0);
-+		}
-+	} else if (nflags > 1) {
-+	        f_print( stderr, "Cannot have more than one file generation flag!\n");
-+		return (0);
-+	}
-+	return (1);
-+}
-+
-+static void
-+usage(void)
-+{
-+	f_print(stderr, "usage:  %s infile\n", cmdname);
-+	f_print(stderr, "\t%s [-a][-b][-C][-Dname[=value]] -i size  [-I [-K seconds]] [-L][-N][-T] infile\n",
-+			cmdname);
-+	f_print(stderr, "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss] [-o outfile] [infile]\n",
-+			cmdname);
-+	f_print(stderr, "\t%s [-s nettype]* [-o outfile] [infile]\n", cmdname);
-+	f_print(stderr, "\t%s [-n netid]* [-o outfile] [infile]\n", cmdname);
-+	options_usage();
-+	exit(1);
-+}
-+
-+static void
-+options_usage(void)
-+{
-+	f_print(stderr, "options:\n");
-+	f_print(stderr, "-a\t\tgenerate all files, including samples\n");
-+	f_print(stderr, "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n");
-+	f_print(stderr, "-c\t\tgenerate XDR routines\n");
-+	f_print(stderr, "-C\t\tANSI C mode\n");
-+	f_print(stderr, "-Dname[=value]\tdefine a symbol (same as #define)\n");
-+	f_print(stderr, "-h\t\tgenerate header file\n");
-+	f_print(stderr, "-i size\t\tsize at which to start generating inline code\n");
-+	f_print(stderr, "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n");
-+	f_print(stderr, "-K seconds\tserver exits after K seconds of inactivity\n");
-+	f_print(stderr, "-l\t\tgenerate client side stubs\n");
-+	f_print(stderr, "-L\t\tserver errors will be printed to syslog\n");
-+	f_print(stderr, "-m\t\tgenerate server side stubs\n");
-+	f_print(stderr, "-n netid\tgenerate server code that supports named netid\n");
-+	f_print(stderr, "-N\t\tsupports multiple arguments and call-by-value\n");
-+	f_print(stderr, "-o outfile\tname of the output file\n");
-+	f_print(stderr, "-s nettype\tgenerate server code that supports named nettype\n");
-+	f_print(stderr, "-Sc\t\tgenerate sample client code that uses remote procedures\n");
-+	f_print(stderr, "-Ss\t\tgenerate sample server code that defines remote procedures\n");
-+	f_print(stderr, "-t\t\tgenerate RPC dispatch table\n");
-+	f_print(stderr, "-T\t\tgenerate code to support RPC dispatch tables\n");
-+	f_print(stderr, "-Y path\t\tdirectory name to find C preprocessor (cpp)\n");
-+
-+	exit(1);
-+}
-diff --git a/rpcgen/rpc_output.h b/rpcgen/rpc_output.h
-new file mode 100644
-index 0000000..eb25a60
---- /dev/null
-+++ b/rpcgen/rpc_output.h
-@@ -0,0 +1,16 @@
-+/*
-+ * rpc_output.h
-+ *
-+ * Declarations for output functions
-+ *
-+ */
-+
-+#ifndef RPCGEN_NEW_OUTPUT_H
-+#define RPCGEN_NEW_OUTPUT_H
-+
-+void	write_msg_out(void);
-+int	nullproc(proc_list *);
-+void	printarglist(proc_list *, char *, char *);
-+void	pdeclaration(char *, declaration *, int, char *);
-+
-+#endif /* RPCGEN_NEW_OUTPUT_H */
-diff --git a/rpcgen/rpc_parse.c b/rpcgen/rpc_parse.c
-new file mode 100644
-index 0000000..b53a553
---- /dev/null
-+++ b/rpcgen/rpc_parse.c
-@@ -0,0 +1,609 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_parse.c, Parser for the RPC protocol compiler 
-+ * Copyright (C) 1987 Sun Microsystems, Inc.
-+ */
-+#include <stdio.h>
-+#include <string.h>
-+#include "rpc/types.h"
-+#include "rpc_scan.h"
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+
-+#define ARGNAME "arg"
-+
-+/*
-+extern char *make_argname();
-+extern char *strdup();
-+ */
-+
-+static void	isdefined(definition *defp);
-+static void	def_struct(definition *defp);
-+static void	def_program(definition *defp);
-+static void	def_enum(definition *defp);
-+static void	def_const(definition *defp);
-+static void	def_union(definition *defp);
-+static void	check_type_name(char *name, int new_type);
-+static void	def_typedef(definition *defp);
-+static void	get_declaration(declaration *dec, defkind dkind);
-+static void	get_prog_declaration(declaration *dec, defkind dkind, int num);
-+static void	get_type(char **prefixp, char **typep, defkind dkind);
-+static void	unsigned_dec(char **typep);
-+
-+/*
-+ * return the next definition you see
-+ */
-+definition *
-+get_definition(void)
-+{
-+	definition *defp;
-+	token tok;
-+
-+	defp = ALLOC(definition);
-+	get_token(&tok);
-+	switch (tok.kind) {
-+	case TOK_STRUCT:
-+		def_struct(defp);
-+		break;
-+	case TOK_UNION:
-+		def_union(defp);
-+		break;
-+	case TOK_TYPEDEF:
-+		def_typedef(defp);
-+		break;
-+	case TOK_ENUM:
-+		def_enum(defp);
-+		break;
-+	case TOK_PROGRAM:
-+		def_program(defp);
-+		break;
-+	case TOK_CONST:
-+		def_const(defp);
-+		break;
-+	case TOK_EOF:
-+		free(defp);
-+		return (NULL);
-+	default:
-+		error("definition keyword expected");
-+	}
-+	scan(TOK_SEMICOLON, &tok);
-+	isdefined(defp);
-+	return (defp);
-+}
-+
-+static void
-+isdefined(definition *defp)
-+{
-+	STOREVAL(&defined, defp);
-+}
-+
-+static void
-+def_struct(definition *defp)
-+{
-+	token tok;
-+	declaration dec;
-+	decl_list *decls;
-+	decl_list **tailp;
-+
-+	defp->def_kind = DEF_STRUCT;
-+
-+	scan(TOK_IDENT, &tok);
-+	defp->def_name = tok.str;
-+	scan(TOK_LBRACE, &tok);
-+	tailp = &defp->def.st.decls;
-+	do {
-+		get_declaration(&dec, DEF_STRUCT);
-+		decls = ALLOC(decl_list);
-+		decls->decl = dec;
-+		*tailp = decls;
-+		tailp = &decls->next;
-+		scan(TOK_SEMICOLON, &tok);
-+		peek(&tok);
-+	} while (tok.kind != TOK_RBRACE);
-+	get_token(&tok);
-+	*tailp = NULL;
-+}
-+
-+static void
-+def_program(definition *defp)
-+{
-+	token tok;
-+	declaration dec;
-+	decl_list *decls;
-+	decl_list **tailp;
-+	version_list *vlist;
-+	version_list **vtailp;
-+	proc_list *plist;
-+	proc_list **ptailp;
-+	int num_args;
-+	bool_t isvoid = FALSE; /* whether first argument is void */
-+	defp->def_kind = DEF_PROGRAM;
-+	scan(TOK_IDENT, &tok);
-+	defp->def_name = tok.str;
-+	scan(TOK_LBRACE, &tok);
-+	vtailp = &defp->def.pr.versions;
-+	tailp = &defp->def.st.decls;
-+	scan(TOK_VERSION, &tok);
-+	do {
-+		scan(TOK_IDENT, &tok);
-+		vlist = ALLOC(version_list);
-+		vlist->vers_name = tok.str;
-+		scan(TOK_LBRACE, &tok);
-+		ptailp = &vlist->procs;
-+		do {
-+			/* get result type */
-+			plist = ALLOC(proc_list);
-+			get_type(&plist->res_prefix, &plist->res_type, 
-+				 DEF_PROGRAM);
-+			if (streq(plist->res_type, "opaque")) {
-+				error("illegal result type");
-+			}
-+			scan(TOK_IDENT, &tok);
-+			plist->proc_name = tok.str;
-+			scan(TOK_LPAREN, &tok);
-+			/* get args - first one*/
-+			num_args = 1;
-+			isvoid = FALSE;
-+			/* type of DEF_PROGRAM in the first 
-+			 * get_prog_declaration and DEF_STURCT in the next
-+			 * allows void as argument if it is the only argument
-+			 */
-+			get_prog_declaration(&dec, DEF_PROGRAM, num_args);
-+			if (streq(dec.type, "void"))
-+			  isvoid = TRUE;
-+			decls = ALLOC(decl_list);
-+			plist->args.decls = decls;
-+			decls->decl = dec;
-+			tailp = &decls->next;
-+			/* get args */
-+			while(peekscan(TOK_COMMA, &tok)) {
-+			  num_args++;
-+			  get_prog_declaration(&dec, DEF_STRUCT, 
-+					       num_args);
-+			  decls = ALLOC(decl_list);
-+			  decls->decl = dec;
-+			  *tailp = decls;
-+			  if (streq(dec.type, "void"))
-+			    isvoid = TRUE;
-+			  tailp = &decls->next;
-+			}
-+			/* multiple arguments are only allowed in newstyle */
-+			if( !newstyle && num_args > 1 ) {
-+			  error("only one argument is allowed" );
-+			}
-+			if (isvoid && num_args > 1) { 
-+			  error("illegal use of void in program definition");
-+			}
-+			*tailp = NULL;
-+			scan(TOK_RPAREN, &tok);
-+			scan(TOK_EQUAL, &tok);
-+			scan_num(&tok);
-+			scan(TOK_SEMICOLON, &tok);
-+			plist->proc_num = tok.str;
-+			plist->arg_num = num_args;
-+			*ptailp = plist;
-+			ptailp = &plist->next;
-+			peek(&tok);
-+		} while (tok.kind != TOK_RBRACE);
-+		*ptailp = NULL;
-+		*vtailp = vlist;
-+		vtailp = &vlist->next;
-+		scan(TOK_RBRACE, &tok);
-+		scan(TOK_EQUAL, &tok);
-+		scan_num(&tok);
-+		vlist->vers_num = tok.str;
-+		/* make the argument structure name for each arg*/
-+		for(plist = vlist->procs; plist != NULL; 
-+		    plist = plist->next) {
-+			plist->args.argname = make_argname(plist->proc_name,
-+							   vlist->vers_num); 
-+			/* free the memory ??*/
-+		}
-+		scan(TOK_SEMICOLON, &tok);
-+		scan2(TOK_VERSION, TOK_RBRACE, &tok);
-+	} while (tok.kind == TOK_VERSION);
-+	scan(TOK_EQUAL, &tok);
-+	scan_num(&tok);
-+	defp->def.pr.prog_num = tok.str;
-+	*vtailp = NULL;
-+}
-+
-+
-+static void
-+def_enum(definition *defp)
-+{
-+	token tok;
-+	enumval_list *elist;
-+	enumval_list **tailp;
-+
-+	defp->def_kind = DEF_ENUM;
-+	scan(TOK_IDENT, &tok);
-+	defp->def_name = tok.str;
-+	scan(TOK_LBRACE, &tok);
-+	tailp = &defp->def.en.vals;
-+	do {
-+		scan(TOK_IDENT, &tok);
-+		elist = ALLOC(enumval_list);
-+		elist->name = tok.str;
-+		elist->assignment = NULL;
-+		scan3(TOK_COMMA, TOK_RBRACE, TOK_EQUAL, &tok);
-+		if (tok.kind == TOK_EQUAL) {
-+			scan_num(&tok);
-+			elist->assignment = tok.str;
-+			scan2(TOK_COMMA, TOK_RBRACE, &tok);
-+		}
-+		*tailp = elist;
-+		tailp = &elist->next;
-+	} while (tok.kind != TOK_RBRACE);
-+	*tailp = NULL;
-+}
-+
-+static void
-+def_const(definition *defp)
-+{
-+	token tok;
-+
-+	defp->def_kind = DEF_CONST;
-+	scan(TOK_IDENT, &tok);
-+	defp->def_name = tok.str;
-+	scan(TOK_EQUAL, &tok);
-+	scan2(TOK_IDENT, TOK_STRCONST, &tok);
-+	defp->def.co = tok.str;
-+}
-+
-+static void
-+def_union(definition *defp)
-+{
-+  token tok;
-+  declaration dec;
-+  case_list *cases;
-+  case_list **tailp;
-+
-+  defp->def_kind = DEF_UNION;
-+  scan(TOK_IDENT, &tok);
-+  defp->def_name = tok.str;
-+  scan(TOK_SWITCH, &tok);
-+  scan(TOK_LPAREN, &tok);
-+  get_declaration(&dec, DEF_UNION);
-+  defp->def.un.enum_decl = dec;
-+  tailp = &defp->def.un.cases;
-+  scan(TOK_RPAREN, &tok);
-+  scan(TOK_LBRACE, &tok);
-+  scan(TOK_CASE, &tok);
-+  while (tok.kind == TOK_CASE) {
-+    scan2(TOK_IDENT, TOK_CHARCONST, &tok);
-+    cases = ALLOC(case_list);
-+    cases->case_name = tok.str;
-+    scan(TOK_COLON, &tok);
-+    /* now peek at next token */
-+    if(peekscan(TOK_CASE,&tok))
-+      {
-+
-+	do 
-+	  {
-+	    scan2(TOK_IDENT, TOK_CHARCONST, &tok);
-+	    cases->contflag=1;	/* continued case statement */
-+	    *tailp = cases;
-+	    tailp = &cases->next;
-+	    cases = ALLOC(case_list);
-+	    cases->case_name = tok.str;
-+	    scan(TOK_COLON, &tok);
-+      
-+	  }while(peekscan(TOK_CASE,&tok));
-+      }
-+
-+    get_declaration(&dec, DEF_UNION);
-+    cases->case_decl = dec;
-+    cases->contflag=0;		/* no continued case statement */
-+    *tailp = cases;
-+    tailp = &cases->next;
-+    scan(TOK_SEMICOLON, &tok);
-+
-+    scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok);
-+  }
-+  *tailp = NULL;
-+  if (tok.kind == TOK_DEFAULT) {
-+    scan(TOK_COLON, &tok);
-+    get_declaration(&dec, DEF_UNION);
-+    defp->def.un.default_decl = ALLOC(declaration);
-+    *defp->def.un.default_decl = dec;
-+    scan(TOK_SEMICOLON, &tok);
-+    scan(TOK_RBRACE, &tok);
-+  } else {
-+    defp->def.un.default_decl = NULL;
-+  }
-+}
-+
-+static char* reserved_words[] =
-+{
-+  "array",
-+  "bytes",
-+  "destroy",
-+  "free",
-+  "getpos",
-+  "inline",
-+  "pointer",
-+  "reference",
-+  "setpos",
-+  "sizeof",
-+  "union",
-+  "vector",
-+  NULL
-+  };
-+
-+static char* reserved_types[] =
-+{
-+  "opaque",
-+  "string",
-+  NULL
-+  };
-+
-+/* check that the given name is not one that would eventually result in
-+   xdr routines that would conflict with internal XDR routines. */
-+static void
-+check_type_name(char *name, int new_type)
-+{
-+  int i;
-+  char tmp[100];
-+
-+  for( i = 0; reserved_words[i] != NULL; i++ ) {
-+    if( strcmp( name, reserved_words[i] ) == 0 ) {
-+      sprintf(tmp, 
-+	      "illegal (reserved) name :\'%s\' in type definition", name );
-+      error(tmp);
-+    }
-+  }
-+  if( new_type ) {
-+    for( i = 0; reserved_types[i] != NULL; i++ ) {
-+      if( strcmp( name, reserved_types[i] ) == 0 ) {
-+	sprintf(tmp, 
-+		"illegal (reserved) name :\'%s\' in type definition", name );
-+	error(tmp);
-+      }
-+    }
-+  }
-+}
-+
-+static void
-+def_typedef(definition *defp)
-+{
-+	declaration dec;
-+
-+	defp->def_kind = DEF_TYPEDEF;
-+	get_declaration(&dec, DEF_TYPEDEF);
-+	defp->def_name = dec.name;
-+	check_type_name( dec.name, 1 );
-+	defp->def.ty.old_prefix = dec.prefix;
-+	defp->def.ty.old_type = dec.type;
-+	defp->def.ty.rel = dec.rel;
-+	defp->def.ty.array_max = dec.array_max;
-+}
-+
-+static void
-+get_declaration(declaration *dec, defkind dkind)
-+{
-+	token tok;
-+
-+	get_type(&dec->prefix, &dec->type, dkind);
-+	dec->rel = REL_ALIAS;
-+	if (streq(dec->type, "void")) {
-+		return;
-+	}
-+
-+	check_type_name( dec->type, 0 );
-+
-+	scan2(TOK_STAR, TOK_IDENT, &tok);
-+	if (tok.kind == TOK_STAR) {
-+		dec->rel = REL_POINTER;
-+		scan(TOK_IDENT, &tok);
-+	}
-+	dec->name = tok.str;
-+	if (peekscan(TOK_LBRACKET, &tok)) {
-+		if (dec->rel == REL_POINTER) {
-+			error("no array-of-pointer declarations -- use typedef");
-+		}
-+		dec->rel = REL_VECTOR;
-+		scan_num(&tok);
-+		dec->array_max = tok.str;
-+		scan(TOK_RBRACKET, &tok);
-+	} else if (peekscan(TOK_LANGLE, &tok)) {
-+		if (dec->rel == REL_POINTER) {
-+			error("no array-of-pointer declarations -- use typedef");
-+		}
-+		dec->rel = REL_ARRAY;
-+		if (peekscan(TOK_RANGLE, &tok)) {
-+			dec->array_max = "~0";	/* unspecified size, use max */
-+		} else {
-+			scan_num(&tok);
-+			dec->array_max = tok.str;
-+			scan(TOK_RANGLE, &tok);
-+		}
-+	}
-+	if (streq(dec->type, "opaque")) {
-+		if (dec->rel != REL_ARRAY && dec->rel != REL_VECTOR) {
-+			error("array declaration expected");
-+		}
-+	} else if (streq(dec->type, "string")) {
-+		if (dec->rel != REL_ARRAY) {
-+			error("variable-length array declaration expected");
-+		}
-+	}
-+}
-+
-+
-+static void
-+get_prog_declaration(declaration *dec, defkind dkind, int num)
-+{
-+	token tok;
-+	char name[10]; /* argument name */
-+
-+	if (dkind == DEF_PROGRAM) { 
-+	  peek(&tok);
-+	  if (tok.kind == TOK_RPAREN) { /* no arguments */
-+	    	dec->rel = REL_ALIAS;
-+		dec->type = "void";
-+		dec->prefix = NULL;
-+		dec->name = NULL;
-+		return;
-+	      }
-+	}
-+	get_type(&dec->prefix, &dec->type, dkind);
-+	dec->rel = REL_ALIAS;
-+	if (peekscan(TOK_IDENT, &tok))  /* optional name of argument */
-+		strcpy(name, tok.str);
-+	else 
-+		sprintf(name, "%s%d", ARGNAME, num); /* default name of argument */
-+
-+	dec->name = (char *) strdup(name); 
-+	
-+	if (streq(dec->type, "void")) {
-+		return;
-+	}
-+
-+	if (streq(dec->type, "opaque")) {
-+		error("opaque -- illegal argument type");
-+	}
-+	if (peekscan(TOK_STAR, &tok)) { 
-+	  if (streq(dec->type, "string")) {
-+	    error("pointer to string not allowed in program arguments\n");
-+	  }
-+		dec->rel = REL_POINTER;
-+		if (peekscan(TOK_IDENT, &tok))  /* optional name of argument */
-+		  dec->name = strdup(tok.str);
-+      }
-+	  if (peekscan(TOK_LANGLE, &tok)) {
-+	    if (!streq(dec->type, "string")) {
-+	      error("arrays cannot be declared as arguments to procedures -- use typedef");
-+	    }
-+		dec->rel = REL_ARRAY;
-+		if (peekscan(TOK_RANGLE, &tok)) {
-+			dec->array_max = "~0";/* unspecified size, use max */
-+		} else {
-+			scan_num(&tok);
-+			dec->array_max = tok.str;
-+			scan(TOK_RANGLE, &tok);
-+		}
-+	}
-+	if (streq(dec->type, "string")) {
-+		if (dec->rel != REL_ARRAY) {  /* .x specifies just string as
-+					       * type of argument 
-+					       * - make it string<>
-+					       */
-+			dec->rel = REL_ARRAY;
-+			dec->array_max = "~0";/* unspecified size, use max */
-+		}
-+	}
-+}
-+
-+
-+
-+static void
-+get_type(char **prefixp, char **typep, defkind dkind)
-+{
-+	token tok;
-+
-+	*prefixp = NULL;
-+	get_token(&tok);
-+	switch (tok.kind) {
-+	case TOK_IDENT:
-+		*typep = tok.str;
-+		break;
-+	case TOK_STRUCT:
-+	case TOK_ENUM:
-+	case TOK_UNION:
-+		*prefixp = tok.str;
-+		scan(TOK_IDENT, &tok);
-+		*typep = tok.str;
-+		break;
-+	case TOK_UNSIGNED:
-+		unsigned_dec(typep);
-+		break;
-+	case TOK_SHORT:
-+		*typep = "short";
-+		(void) peekscan(TOK_INT, &tok);
-+		break;
-+	case TOK_INT32:
-+		*typep = "int32_t";
-+		(void) peekscan(TOK_INT, &tok);
-+		break;
-+	case TOK_VOID:
-+		if (dkind != DEF_UNION && dkind != DEF_PROGRAM) {
-+			error("voids allowed only inside union and program definitions with one argument");
-+		}
-+		*typep = tok.str;
-+		break;
-+	case TOK_STRING:
-+	case TOK_OPAQUE:
-+	case TOK_CHAR:
-+	case TOK_INT:
-+	case TOK_FLOAT:
-+	case TOK_DOUBLE:
-+	case TOK_BOOL:
-+		*typep = tok.str;
-+		break;
-+	default:
-+		error("expected type specifier");
-+	}
-+}
-+
-+static void
-+unsigned_dec(char **typep)
-+{
-+	token tok;
-+
-+	peek(&tok);
-+	switch (tok.kind) {
-+	case TOK_CHAR:
-+		get_token(&tok);
-+		*typep = "u_char";
-+		break;
-+	case TOK_SHORT:
-+		get_token(&tok);
-+		*typep = "u_short";
-+		(void) peekscan(TOK_INT, &tok);
-+		break;
-+	case TOK_INT32:
-+		get_token(&tok);
-+		*typep = "u_int32_";
-+		(void) peekscan(TOK_INT, &tok);
-+		break;
-+	case TOK_INT:
-+		get_token(&tok);
-+		*typep = "u_int";
-+		break;
-+	default:
-+		*typep = "u_int";
-+		break;
-+	}
-+}
-diff --git a/rpcgen/rpc_parse.h b/rpcgen/rpc_parse.h
-new file mode 100644
-index 0000000..2afae10
---- /dev/null
-+++ b/rpcgen/rpc_parse.h
-@@ -0,0 +1,166 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*      @(#)rpc_parse.h  1.3  90/08/29  (C) 1987 SMI   */
-+
-+/*
-+ * rpc_parse.h, Definitions for the RPCL parser 
-+ */
-+
-+enum defkind {
-+	DEF_CONST,
-+	DEF_STRUCT,
-+	DEF_UNION,
-+	DEF_ENUM,
-+	DEF_TYPEDEF,
-+	DEF_PROGRAM
-+};
-+typedef enum defkind defkind;
-+
-+typedef char *const_def;
-+
-+enum relation {
-+	REL_VECTOR,	/* fixed length array */
-+	REL_ARRAY,	/* variable length array */
-+	REL_POINTER,	/* pointer */
-+	REL_ALIAS,	/* simple */
-+};
-+typedef enum relation relation;
-+
-+struct typedef_def {
-+	char *old_prefix;
-+	char *old_type;
-+	relation rel;
-+	char *array_max;
-+};
-+typedef struct typedef_def typedef_def;
-+
-+struct enumval_list {
-+	char *name;
-+	char *assignment;
-+	struct enumval_list *next;
-+};
-+typedef struct enumval_list enumval_list;
-+
-+struct enum_def {
-+	enumval_list *vals;
-+};
-+typedef struct enum_def enum_def;
-+
-+struct declaration {
-+	char *prefix;
-+	char *type;
-+	char *name;
-+	relation rel;
-+	char *array_max;
-+};
-+typedef struct declaration declaration;
-+
-+struct decl_list {
-+	declaration decl;
-+	struct decl_list *next;
-+};
-+typedef struct decl_list decl_list;
-+
-+struct struct_def {
-+	decl_list *decls;
-+};
-+typedef struct struct_def struct_def;
-+
-+struct case_list {
-+	char *case_name;
-+	int contflag;
-+	declaration case_decl;
-+	struct case_list *next;
-+};
-+typedef struct case_list case_list;
-+
-+struct union_def {
-+	declaration enum_decl;
-+	case_list *cases;
-+	declaration *default_decl;
-+};
-+typedef struct union_def union_def;
-+
-+struct arg_list {
-+	char *argname; /* name of struct for arg*/
-+	decl_list *decls;
-+};
-+	
-+typedef struct arg_list arg_list;
-+
-+struct proc_list {
-+	char *proc_name;
-+	char *proc_num;
-+	arg_list args;
-+	int arg_num;
-+	char *res_type;
-+	char *res_prefix;
-+	struct proc_list *next;
-+};
-+typedef struct proc_list proc_list;
-+
-+struct version_list {
-+	char *vers_name;
-+	char *vers_num;
-+	proc_list *procs;
-+	struct version_list *next;
-+};
-+typedef struct version_list version_list;
-+
-+struct program_def {
-+	char *prog_num;
-+	version_list *versions;
-+};
-+typedef struct program_def program_def;
-+
-+struct definition {
-+	char *def_name;
-+	defkind def_kind;
-+	union {
-+		const_def co;
-+		struct_def st;
-+		union_def un;
-+		enum_def en;
-+		typedef_def ty;
-+		program_def pr;
-+	} def;
-+};
-+typedef struct definition definition;
-+
-+definition *get_definition();
-+
-+
-+struct bas_type
-+{
-+  char *name;
-+  int length;
-+  struct bas_type *next;
-+};
-+
-+typedef struct bas_type bas_type;
-diff --git a/rpcgen/rpc_sample.c b/rpcgen/rpc_sample.c
-new file mode 100644
-index 0000000..2b5c81b
---- /dev/null
-+++ b/rpcgen/rpc_sample.c
-@@ -0,0 +1,247 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_sample.c  1.1  90/08/30  (C) 1987 SMI";
-+
-+#endif
-+
-+/*
-+ * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+
-+
-+static char RQSTP[] = "rqstp";
-+
-+static void	write_sample_client(char *program_name, version_list *vp);
-+static void	write_sample_server(definition * def);
-+static void	return_type(proc_list *plist);
-+
-+void
-+write_sample_svc(definition *def)
-+{
-+	if (def->def_kind != DEF_PROGRAM)
-+		return;
-+	write_sample_server(def);
-+}
-+
-+
-+int
-+write_sample_clnt(definition *def)
-+{
-+	version_list   *vp;
-+	int             count = 0;
-+
-+	if (def->def_kind != DEF_PROGRAM)
-+		return (0);
-+	/* generate sample code for each version */
-+	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		write_sample_client(def->def_name, vp);
-+		++count;
-+	}
-+	return (count);
-+}
-+
-+
-+static void
-+write_sample_client(char *program_name, version_list *vp)
-+{
-+	proc_list      *proc;
-+	int             i;
-+	decl_list      *l;
-+
-+	f_print(fout, "\n\nvoid\n");
-+	pvname(program_name, vp->vers_num);
-+	if (Cflag)
-+		f_print(fout, "( char* host )\n{\n");
-+	else
-+		f_print(fout, "(host)\nchar *host;\n{\n");
-+	f_print(fout, "\tCLIENT *clnt;\n");
-+
-+	i = 0;
-+	for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+		f_print(fout, "\t");
-+		ptype(proc->res_prefix, proc->res_type, 1);
-+		f_print(fout, " *result_%d;\n", ++i);
-+		/* print out declarations for arguments */
-+		if (proc->arg_num < 2 && !newstyle) {
-+			f_print(fout, "\t");
-+			if (!streq(proc->args.decls->decl.type, "void"))
-+				ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
-+			else
-+				f_print(fout, "char* ");	/* cannot have "void" type */
-+			f_print(fout, " ");
-+			pvname(proc->proc_name, vp->vers_num);
-+			f_print(fout, "_arg;\n");
-+		} else if (!streq(proc->args.decls->decl.type, "void")) {
-+			for (l = proc->args.decls; l != NULL; l = l->next) {
-+				f_print(fout, "\t");
-+				ptype(l->decl.prefix, l->decl.type, 1);
-+				f_print(fout, " ");
-+				pvname(proc->proc_name, vp->vers_num);
-+				f_print(fout, "_%s;\n", l->decl.name);
-+				/*	  pdeclaration(proc->args.argname, &l->decl, 1, ";\n" );*/
-+			}
-+		}
-+	}
-+
-+	/* generate creation of client handle */
-+	f_print(fout, "\tclnt = clnt_create(host, %s, %s, \"%s\");\n",
-+		program_name, vp->vers_name, tirpcflag ? "netpath" : "udp");
-+	f_print(fout, "\tif (clnt == NULL) {\n");
-+	f_print(fout, "\t\tclnt_pcreateerror(host);\n");
-+	f_print(fout, "\t\texit(1);\n\t}\n");
-+
-+	/* generate calls to procedures */
-+	i = 0;
-+	for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+		f_print(fout, "\tresult_%d = ", ++i);
-+		pvname(proc->proc_name, vp->vers_num);
-+		if (proc->arg_num < 2 && !newstyle) {
-+			f_print(fout, "(");
-+			if (streq(proc->args.decls->decl.type, "void"))	/* cast to void* */
-+				f_print(fout, "(void*)");
-+			f_print(fout, "&");
-+			pvname(proc->proc_name, vp->vers_num);
-+			f_print(fout, "_arg, clnt);\n");
-+		} else if (streq(proc->args.decls->decl.type, "void")) {
-+			f_print(fout, "(clnt);\n");
-+		} else {
-+			f_print(fout, "(");
-+			for (l = proc->args.decls; l != NULL; l = l->next) {
-+				pvname(proc->proc_name, vp->vers_num);
-+				f_print(fout, "_%s, ", l->decl.name);
-+			}
-+			f_print(fout, "clnt);\n");
-+		}
-+		f_print(fout, "\tif (result_%d == NULL) {\n", i);
-+		f_print(fout, "\t\tclnt_perror(clnt, \"call failed:\");\n");
-+		f_print(fout, "\t}\n");
-+	}
-+
-+	f_print(fout, "\tclnt_destroy( clnt );\n");
-+	f_print(fout, "}\n");
-+}
-+
-+static void
-+write_sample_server(definition * def)
-+{
-+	version_list   *vp;
-+	proc_list      *proc;
-+
-+	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+			f_print(fout, "\n");
-+			/*			if( Cflag )
-+			  f_print( fout, "extern \"C\"{\n");
-+*/
-+			return_type(proc);
-+			f_print(fout, "* \n");
-+			if (Cflag)
-+				pvname_svc(proc->proc_name, vp->vers_num);
-+			else
-+				pvname(proc->proc_name, vp->vers_num);
-+			printarglist(proc, RQSTP, "struct svc_req *");
-+
-+			f_print(fout, "{\n");
-+			f_print(fout, "\n\tstatic ");
-+			if (!streq(proc->res_type, "void"))
-+				return_type(proc);
-+			else
-+				f_print(fout, "char*");	/* cannot have void type */
-+			/* f_print(fout, " result;\n", proc->res_type); */
-+			f_print(fout, " result;\n");
-+			f_print(fout,
-+				"\n\t/*\n\t * insert server code here\n\t */\n\n");
-+			if (!streq(proc->res_type, "void"))
-+				f_print(fout, "\treturn(&result);\n}\n");
-+			else	/* cast back to void * */
-+				f_print(fout, "\treturn((void*) &result);\n}\n");
-+			/*			if( Cflag)
-+			  f_print( fout, "};\n");
-+*/
-+
-+		}
-+	}
-+}
-+
-+
-+
-+static void
-+return_type(proc_list *plist)
-+{
-+	ptype( plist->res_prefix, plist->res_type, 1 );
-+}
-+
-+void
-+add_sample_msg(void)
-+{
-+	f_print(fout, "/*\n");
-+	f_print(fout, " * This is sample code generated by rpcgen.\n");
-+	f_print(fout, " * These are only templates and you can use them\n");
-+	f_print(fout, " * as a guideline for developing your own functions.\n");
-+	f_print(fout, " */\n\n");
-+}
-+
-+void
-+write_sample_clnt_main(void)
-+{
-+  list *l;
-+  definition *def;
-+  version_list *vp;
-+
-+  f_print(fout, "\n\n" );
-+  if( Cflag )
-+    f_print(fout,"main( int argc, char* argv[] )\n{\n" );
-+  else
-+    f_print(fout, "main(argc, argv)\nint argc;\nchar *argv[];\n{\n" );
-+
-+  f_print(fout, "\tchar *host;");
-+  f_print(fout, "\n\n\tif(argc < 2) {");
-+  f_print(fout, "\n\t\tprintf(\"usage: %%s server_host\\n\", argv[0]);\n" );
-+  f_print(fout, "\t\texit(1);\n\t}");
-+  f_print(fout, "\n\thost = argv[1];\n");
-+
-+  for (l = defined; l != NULL; l = l->next) {
-+		def = l->val;
-+		if (def->def_kind != DEF_PROGRAM) {
-+			continue;
-+		}
-+		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		        f_print( fout, "\t" );
-+			pvname(def->def_name, vp->vers_num);
-+			f_print( fout, "( host );\n" );
-+		      }
-+		}
-+  f_print(fout, "}\n");
-+}
-diff --git a/rpcgen/rpc_scan.c b/rpcgen/rpc_scan.c
-new file mode 100644
-index 0000000..f58fa9f
---- /dev/null
-+++ b/rpcgen/rpc_scan.c
-@@ -0,0 +1,474 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_scan.c, Scanner for the RPC protocol compiler 
-+ * Copyright (C) 1987, Sun Microsystems, Inc. 
-+ */
-+#include <stdio.h>
-+#include <ctype.h>
-+#include <string.h>
-+#include "rpc_scan.h"
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+
-+static void	unget_token(token *tokp);
-+static void	findstrconst(char **str, char **val);
-+static void	findchrconst(char **str, char **val);
-+static void	findconst(char **str, char **val);
-+static void	findkind(char **mark, token *tokp);
-+static int	cppline(char *line);
-+static int	directive(char *line);
-+static void	printdirective(char *line);
-+static void	docppline(char *line, int *lineno, char **fname);
-+
-+#define startcomment(where) (where[0] == '/' && where[1] == '*')
-+#define endcomment(where) (where[-1] == '*' && where[0] == '/')
-+
-+static int pushed = 0;	/* is a token pushed */
-+static token lasttok;	/* last token, if pushed */
-+
-+/*
-+ * scan expecting 1 given token 
-+ */
-+void
-+scan(tok_kind expect, token *tokp)
-+{
-+	get_token(tokp);
-+	if (tokp->kind != expect) {
-+		expected1(expect);
-+	}
-+}
-+
-+/*
-+ * scan expecting any of the 2 given tokens 
-+ */
-+void
-+scan2(tok_kind expect1, tok_kind expect2, token *tokp)
-+{
-+	get_token(tokp);
-+	if (tokp->kind != expect1 && tokp->kind != expect2) {
-+		expected2(expect1, expect2);
-+	}
-+}
-+
-+/*
-+ * scan expecting any of the 3 given token 
-+ */
-+void
-+scan3(tok_kind expect1, tok_kind expect2, tok_kind expect3, token *tokp)
-+{
-+	get_token(tokp);
-+	if (tokp->kind != expect1 && tokp->kind != expect2
-+	    && tokp->kind != expect3) {
-+		expected3(expect1, expect2, expect3);
-+	}
-+}
-+
-+/*
-+ * scan expecting a constant, possibly symbolic 
-+ */
-+void
-+scan_num(token *tokp)
-+{
-+	get_token(tokp);
-+	switch (tokp->kind) {
-+	case TOK_IDENT:
-+		break;
-+	default:
-+		error("constant or identifier expected");
-+	}
-+}
-+
-+/*
-+ * Peek at the next token 
-+ */
-+void
-+peek(token *tokp)
-+{
-+	get_token(tokp);
-+	unget_token(tokp);
-+}
-+
-+/*
-+ * Peek at the next token and scan it if it matches what you expect 
-+ */
-+int
-+peekscan(tok_kind expect, token *tokp)
-+{
-+	peek(tokp);
-+	if (tokp->kind == expect) {
-+		get_token(tokp);
-+		return (1);
-+	}
-+	return (0);
-+}
-+
-+/*
-+ * Get the next token, printing out any directive that are encountered. 
-+ */
-+void
-+get_token(token *tokp)
-+{
-+	int commenting;
-+
-+	if (pushed) {
-+		pushed = 0;
-+		*tokp = lasttok;
-+		return;
-+	}
-+	commenting = 0;
-+	for (;;) {
-+		if (*where == 0) {
-+			for (;;) {
-+				if (!fgets(curline, MAXLINESIZE, fin)) {
-+					tokp->kind = TOK_EOF;
-+					*where = 0;
-+					return;
-+				}
-+				linenum++;
-+				if (commenting) {
-+					break;
-+				} else if (cppline(curline)) {
-+					docppline(curline, &linenum, 
-+						  &infilename);
-+				} else if (directive(curline)) {
-+					printdirective(curline);
-+				} else {
-+					break;
-+				}
-+			}
-+			where = curline;
-+		} else if (isspace(*where)) {
-+			while (isspace(*where)) {
-+				where++;	/* eat */
-+			}
-+		} else if (commenting) {
-+			for (where++; *where; where++) {
-+				if (endcomment(where)) {
-+					where++;
-+					commenting--;
-+					break;
-+				}
-+			}
-+		} else if (startcomment(where)) {
-+			where += 2;
-+			commenting++;
-+		} else {
-+			break;
-+		}
-+	}
-+
-+	/*
-+	 * 'where' is not whitespace, comment or directive Must be a token! 
-+	 */
-+	switch (*where) {
-+	case ':':
-+		tokp->kind = TOK_COLON;
-+		where++;
-+		break;
-+	case ';':
-+		tokp->kind = TOK_SEMICOLON;
-+		where++;
-+		break;
-+	case ',':
-+		tokp->kind = TOK_COMMA;
-+		where++;
-+		break;
-+	case '=':
-+		tokp->kind = TOK_EQUAL;
-+		where++;
-+		break;
-+	case '*':
-+		tokp->kind = TOK_STAR;
-+		where++;
-+		break;
-+	case '[':
-+		tokp->kind = TOK_LBRACKET;
-+		where++;
-+		break;
-+	case ']':
-+		tokp->kind = TOK_RBRACKET;
-+		where++;
-+		break;
-+	case '{':
-+		tokp->kind = TOK_LBRACE;
-+		where++;
-+		break;
-+	case '}':
-+		tokp->kind = TOK_RBRACE;
-+		where++;
-+		break;
-+	case '(':
-+		tokp->kind = TOK_LPAREN;
-+		where++;
-+		break;
-+	case ')':
-+		tokp->kind = TOK_RPAREN;
-+		where++;
-+		break;
-+	case '<':
-+		tokp->kind = TOK_LANGLE;
-+		where++;
-+		break;
-+	case '>':
-+		tokp->kind = TOK_RANGLE;
-+		where++;
-+		break;
-+
-+	case '"':
-+		tokp->kind = TOK_STRCONST;
-+		findstrconst(&where, &tokp->str);
-+		break;
-+	case '\'':
-+		tokp->kind = TOK_CHARCONST;
-+		findchrconst(&where, &tokp->str);
-+		break;
-+
-+	case '-':
-+	case '0':
-+	case '1':
-+	case '2':
-+	case '3':
-+	case '4':
-+	case '5':
-+	case '6':
-+	case '7':
-+	case '8':
-+	case '9':
-+		tokp->kind = TOK_IDENT;
-+		findconst(&where, &tokp->str);
-+		break;
-+
-+	default:
-+		if (!(isalpha(*where) || *where == '_')) {
-+			char buf[100];
-+			char *p;
-+
-+			s_print(buf, "illegal character in file: ");
-+			p = buf + strlen(buf);
-+			if (isprint(*where)) {
-+				s_print(p, "%c", *where);
-+			} else {
-+				s_print(p, "%d", *where);
-+			}
-+			error(buf);
-+		}
-+		findkind(&where, tokp);
-+		break;
-+	}
-+}
-+
-+static void
-+unget_token(token *tokp)
-+{
-+	lasttok = *tokp;
-+	pushed = 1;
-+}
-+
-+static void
-+findstrconst(char **str, char **val)
-+{
-+	char *p;
-+	int size;
-+
-+	p = *str;
-+	do {
-+		*p++;
-+	} while (*p && *p != '"');
-+	if (*p == 0) {
-+		error("unterminated string constant");
-+	}
-+	p++;
-+	size = p - *str;
-+	*val = alloc(size + 1);
-+	(void) strncpy(*val, *str, size);
-+	(*val)[size] = 0;
-+	*str = p;
-+}
-+
-+static void
-+findchrconst(char **str, char **val)
-+{
-+	char *p;
-+	int size;
-+
-+	p = *str;
-+	do {
-+		*p++;
-+	} while (*p && *p != '\'');
-+	if (*p == 0) {
-+		error("unterminated string constant");
-+	}
-+	p++;
-+	size = p - *str;
-+	if (size != 3) {
-+		error("empty char string");
-+	}
-+	*val = alloc(size + 1);
-+	(void) strncpy(*val, *str, size);
-+	(*val)[size] = 0;
-+	*str = p;
-+}
-+
-+static void
-+findconst(char **str, char **val)
-+{
-+	char *p;
-+	int size;
-+
-+	p = *str;
-+	if (*p == '0' && *(p + 1) == 'x') {
-+		p++;
-+		do {
-+			p++;
-+		} while (isxdigit(*p));
-+	} else {
-+		do {
-+			p++;
-+		} while (isdigit(*p));
-+	}
-+	size = p - *str;
-+	*val = alloc(size + 1);
-+	(void) strncpy(*val, *str, size);
-+	(*val)[size] = 0;
-+	*str = p;
-+}
-+
-+static token symbols[] = {
-+			  {TOK_CONST, "const"},
-+			  {TOK_UNION, "union"},
-+			  {TOK_SWITCH, "switch"},
-+			  {TOK_CASE, "case"},
-+			  {TOK_DEFAULT, "default"},
-+			  {TOK_STRUCT, "struct"},
-+			  {TOK_TYPEDEF, "typedef"},
-+			  {TOK_ENUM, "enum"},
-+			  {TOK_OPAQUE, "opaque"},
-+			  {TOK_BOOL, "bool"},
-+			  {TOK_VOID, "void"},
-+			  {TOK_CHAR, "char"},
-+			  {TOK_INT, "int"},
-+			  {TOK_UNSIGNED, "unsigned"},
-+			  {TOK_SHORT, "short"},
-+			  {TOK_INT32, "int32"},
-+			  {TOK_FLOAT, "float"},
-+			  {TOK_DOUBLE, "double"},
-+			  {TOK_STRING, "string"},
-+			  {TOK_PROGRAM, "program"},
-+			  {TOK_VERSION, "version"},
-+			  {TOK_EOF, "??????"},
-+};
-+
-+static void
-+findkind(char **mark, token *tokp)
-+{
-+	int len;
-+	token *s;
-+	char *str;
-+
-+	str = *mark;
-+	for (s = symbols; s->kind != TOK_EOF; s++) {
-+		len = strlen(s->str);
-+		if (strncmp(str, s->str, len) == 0) {
-+			if (!isalnum(str[len]) && str[len] != '_') {
-+				tokp->kind = s->kind;
-+				tokp->str = s->str;
-+				*mark = str + len;
-+				return;
-+			}
-+		}
-+	}
-+	tokp->kind = TOK_IDENT;
-+	for (len = 0; isalnum(str[len]) || str[len] == '_'; len++);
-+	tokp->str = alloc(len + 1);
-+	(void) strncpy(tokp->str, str, len);
-+	tokp->str[len] = 0;
-+	*mark = str + len;
-+}
-+
-+static int
-+cppline(char *line)
-+{
-+	return (line == curline && *line == '#');
-+}
-+
-+static int
-+directive(char *line)
-+{
-+	return (line == curline && *line == '%');
-+}
-+
-+static void
-+printdirective(char *line)
-+{
-+	f_print(fout, "%s", line + 1);
-+}
-+
-+static void
-+docppline(char *line, int *lineno, char **fname)
-+{
-+	char *file;
-+	int num;
-+	char *p;
-+
-+	line++;
-+	while (isspace(*line)) {
-+		line++;
-+	}
-+	num = atoi(line);
-+	while (isdigit(*line)) {
-+		line++;
-+	}
-+	while (isspace(*line)) {
-+		line++;
-+	}
-+	if (*line != '"') {
-+		error("preprocessor error");
-+	}
-+	line++;
-+	p = file = alloc(strlen(line) + 1);
-+	while (*line && *line != '"') {
-+		*p++ = *line++;
-+	}
-+	if (*line == 0) {
-+		error("preprocessor error");
-+	}
-+	*p = 0;
-+	if (*file == 0) {
-+		*fname = NULL;
-+		free(file);
-+	} else {
-+		*fname = file;
-+	}
-+	*lineno = num - 1;
-+}
-diff --git a/rpcgen/rpc_scan.h b/rpcgen/rpc_scan.h
-new file mode 100644
-index 0000000..16f688c
---- /dev/null
-+++ b/rpcgen/rpc_scan.h
-@@ -0,0 +1,103 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*      @(#)rpc_scan.h  1.3  90/08/29  (C) 1987 SMI   */
-+
-+/*
-+ * rpc_scan.h, Definitions for the RPCL scanner 
-+ */
-+
-+/*
-+ * kinds of tokens 
-+ */
-+enum tok_kind {
-+	TOK_IDENT,
-+	TOK_CHARCONST,
-+	TOK_STRCONST,
-+	TOK_LPAREN,
-+	TOK_RPAREN,
-+	TOK_LBRACE,
-+	TOK_RBRACE,
-+	TOK_LBRACKET,
-+	TOK_RBRACKET,
-+	TOK_LANGLE,
-+	TOK_RANGLE,
-+	TOK_STAR,
-+	TOK_COMMA,
-+	TOK_EQUAL,
-+	TOK_COLON,
-+	TOK_SEMICOLON,
-+	TOK_CONST,
-+	TOK_STRUCT,
-+	TOK_UNION,
-+	TOK_SWITCH,
-+	TOK_CASE,
-+	TOK_DEFAULT,
-+	TOK_ENUM,
-+	TOK_TYPEDEF,
-+	TOK_INT,
-+	TOK_SHORT,
-+	TOK_INT32,
-+	TOK_UNSIGNED,
-+	TOK_FLOAT,
-+	TOK_DOUBLE,
-+	TOK_OPAQUE,
-+	TOK_CHAR,
-+	TOK_STRING,
-+	TOK_BOOL,
-+	TOK_VOID,
-+	TOK_PROGRAM,
-+	TOK_VERSION,
-+	TOK_EOF
-+};
-+typedef enum tok_kind tok_kind;
-+
-+/*
-+ * a token 
-+ */
-+struct token {
-+	tok_kind kind;
-+	char *str;
-+};
-+typedef struct token token;
-+
-+
-+/*
-+ * routine interface 
-+ */
-+void            scan();
-+void            scan2();
-+void            scan3();
-+void            scan_num();
-+void            peek();
-+int             peekscan();
-+void            get_token();
-+void            expected1(tok_kind);
-+void            expected2(tok_kind, tok_kind);
-+void            expected3(tok_kind, tok_kind, tok_kind);
-+
-diff --git a/rpcgen/rpc_svcout.c b/rpcgen/rpc_svcout.c
-new file mode 100644
-index 0000000..284a529
---- /dev/null
-+++ b/rpcgen/rpc_svcout.c
-@@ -0,0 +1,882 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
-+ */
-+#include <stdio.h>
-+#include <string.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+#include "rpc_output.h"
-+
-+static void	write_real_program(definition *def);
-+static void	write_program(definition *def, char *storage);
-+static void	printerr(char *err, char *transp);
-+static void	printif(char *proc, char *transp, char *prefix, char *arg);
-+static void	write_inetmost(char *infile);
-+static void	print_return(char *space);
-+static void	print_pmapunset(char *space);
-+static void	print_err_message(char *space);
-+static void	write_timeout_func(void);
-+static void	write_pm_most(char *infile, int netflag);
-+static void	write_rpc_svc_fg(char *infile, char *sp);
-+static void	open_log_file(char *infile, char *sp);
-+
-+static char RQSTP[] = "rqstp";
-+static char TRANSP[] = "transp";
-+static char ARG[] = "argument";
-+static char RESULT[] = "result";
-+static char ROUTINE[] = "local";
-+
-+char _errbuf[256];	/* For all messages */
-+
-+static void
-+p_xdrfunc(char *rname, char *typename)
-+{
-+	if (Cflag)
-+		f_print(fout, "\t\txdr_%s = (xdrproc_t) xdr_%s;\n", rname,
-+			stringfix(typename));
-+	else
-+		f_print(fout, "\t\txdr_%s = xdr_%s;\n", rname, stringfix(typename));
-+}
-+
-+void
-+internal_proctype(proc_list *plist)
-+{
-+	f_print(fout, "static ");
-+	ptype( plist->res_prefix, plist->res_type, 1 );
-+	f_print( fout, "*" );
-+}
-+
-+
-+/*
-+ * write most of the service, that is, everything but the registrations. 
-+ */
-+void
-+write_most(char *infile, int netflag, int nomain)
-+{
-+	if (inetdflag || pmflag) {
-+	        char* var_type;
-+		var_type = (nomain? "extern" : "static");
-+		f_print(fout, "%s int _rpcpmstart;", var_type );
-+		f_print(fout, "\t\t/* Started by a port monitor ? */\n"); 
-+		f_print(fout, "%s int _rpcfdtype;", var_type );
-+		f_print(fout, "\t\t/* Whether Stream or Datagram ? */\n");
-+		if (timerflag) {
-+			f_print(fout, "%s int _rpcsvcdirty;", var_type );
-+			f_print(fout, "\t/* Still serving ? */\n");
-+		}
-+		write_svc_aux( nomain );
-+	}
-+	/* write out dispatcher and stubs */
-+	write_programs( nomain? (char *)NULL : "static" );
-+
-+        if( nomain ) 
-+	  return;
-+
-+	f_print(fout, "\nmain()\n");
-+	f_print(fout, "{\n");
-+	if (inetdflag) {
-+		write_inetmost(infile); /* Includes call to write_rpc_svc_fg() */
-+	} else {
-+	  if( tirpcflag ) {
-+		if (netflag) {
-+			f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP);
-+			f_print(fout, "\tstruct netconfig *nconf = NULL;\n");
-+		}
-+		f_print(fout, "\tpid_t pid;\n");
-+		f_print(fout, "\tint i;\n");
-+		f_print(fout, "\tchar mname[FMNAMESZ + 1];\n\n");
-+		write_pm_most(infile, netflag);
-+		f_print(fout, "\telse {\n");
-+		write_rpc_svc_fg(infile, "\t\t");
-+		f_print(fout, "\t}\n");
-+	      } else {
-+		f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP);
-+		f_print(fout, "\n");
-+		print_pmapunset("\t");
-+	      }
-+	}
-+
-+	if (logflag && !inetdflag) {
-+		open_log_file(infile, "\t");
-+	}
-+}
-+
-+/*
-+ * write a registration for the given transport 
-+ */
-+void
-+write_netid_register(char *transp)
-+{
-+	list *l;
-+	definition *def;
-+	version_list *vp;
-+	char *sp;
-+	char tmpbuf[32];
-+
-+	sp = "";
-+	f_print(fout, "\n");
-+	f_print(fout, "%s\tnconf = getnetconfigent(\"%s\");\n", sp, transp);
-+	f_print(fout, "%s\tif (nconf == NULL) {\n", sp);
-+	(void) sprintf(_errbuf, "cannot find %s netid.", transp);
-+	sprintf(tmpbuf, "%s\t\t", sp);
-+	print_err_message(tmpbuf);
-+	f_print(fout, "%s\t\texit(1);\n", sp);
-+	f_print(fout, "%s\t}\n", sp);
-+	f_print(fout, "%s\t%s = svc_tli_create(RPC_ANYFD, nconf, 0, 0, 0);\n",
-+			sp, TRANSP);
-+	f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP);
-+	(void) sprintf(_errbuf, "cannot create %s service.", transp);
-+	print_err_message(tmpbuf);
-+	f_print(fout, "%s\t\texit(1);\n", sp);
-+	f_print(fout, "%s\t}\n", sp);
-+
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind != DEF_PROGRAM) {
-+			continue;
-+		}
-+		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+			f_print(fout,
-+				"%s\t(void) rpcb_unset(%s, %s, nconf);\n",
-+				sp, def->def_name, vp->vers_name);
-+			f_print(fout,
-+				"%s\tif (!svc_reg(%s, %s, %s, ",
-+				sp, TRANSP, def->def_name, vp->vers_name);
-+			pvname(def->def_name, vp->vers_num);
-+			f_print(fout, ", nconf)) {\n");
-+			(void) sprintf(_errbuf, "unable to register (%s, %s, %s).",
-+					def->def_name, vp->vers_name, transp);
-+			print_err_message(tmpbuf);
-+			f_print(fout, "%s\t\texit(1);\n", sp);
-+			f_print(fout, "%s\t}\n", sp);
-+		}
-+	}
-+	f_print(fout, "%s\tfreenetconfigent(nconf);\n", sp);
-+}
-+
-+/*
-+ * write a registration for the given transport for TLI
-+ */
-+void
-+write_nettype_register(char *transp)
-+{
-+	list *l;
-+	definition *def;
-+	version_list *vp;
-+
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind != DEF_PROGRAM) {
-+			continue;
-+		}
-+		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+			f_print(fout, "\tif (!svc_create(");
-+			pvname(def->def_name, vp->vers_num);
-+			f_print(fout, ", %s, %s, \"%s\")) {\n ",
-+				def->def_name, vp->vers_name, transp);
-+			(void) sprintf(_errbuf,
-+				"unable to create (%s, %s) for %s.",
-+					def->def_name, vp->vers_name, transp);
-+			print_err_message("\t\t");
-+			f_print(fout, "\t\texit(1);\n");
-+			f_print(fout, "\t}\n");
-+		}
-+	}
-+}
-+
-+/*
-+ * write the rest of the service 
-+ */
-+void
-+write_rest(void)
-+{
-+	f_print(fout, "\n");
-+	if (inetdflag) {
-+		f_print(fout, "\tif (%s == (SVCXPRT *)NULL) {\n", TRANSP);
-+		(void) sprintf(_errbuf, "could not create a handle");
-+		print_err_message("\t\t");
-+		f_print(fout, "\t\texit(1);\n");
-+		f_print(fout, "\t}\n");
-+		if (timerflag) {
-+			f_print(fout, "\tif (_rpcpmstart) {\n");
-+			f_print(fout, 
-+				"\t\t(void) signal(SIGALRM, %s closedown);\n",
-+				Cflag? "(SIG_PF)" : "(void(*)())" );
-+			f_print(fout, "\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n");
-+			f_print(fout, "\t}\n");
-+		}
-+	}
-+	f_print(fout, "\tsvc_run();\n");
-+	(void) sprintf(_errbuf, "svc_run returned");
-+	print_err_message("\t");
-+	f_print(fout, "\texit(1);\n");
-+	f_print(fout, "\t/* NOTREACHED */\n");
-+	f_print(fout, "}\n");
-+}
-+
-+void
-+write_programs(char *storage)
-+{
-+	list *l;
-+	definition *def;
-+
-+	/* write out stubs for procedure  definitions */
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind == DEF_PROGRAM) {
-+			write_real_program(def);
-+		}
-+	}
-+
-+	/* write out dispatcher for each program */
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind == DEF_PROGRAM) {
-+			write_program(def, storage);
-+		}
-+	}
-+
-+
-+}
-+
-+/* write out definition of internal function (e.g. _printmsg_1(...))
-+   which calls server's defintion of actual function (e.g. printmsg_1(...)).
-+   Unpacks single user argument of printmsg_1 to call-by-value format
-+   expected by printmsg_1. */
-+static void
-+write_real_program(definition *def)
-+{
-+	version_list *vp;
-+	proc_list *proc;
-+	decl_list *l;
-+
-+	if( !newstyle ) return;  /* not needed for old style */
-+	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+			f_print(fout, "\n");
-+			internal_proctype(proc);
-+			f_print(fout, "\n_");
-+			pvname(proc->proc_name, vp->vers_num);
-+			if( Cflag ) {
-+			  f_print(fout, "(" );
-+			  /* arg name */
-+			  if (proc->arg_num > 1)
-+			    f_print(fout, proc->args.argname);
-+			  else
-+			    ptype(proc->args.decls->decl.prefix, 
-+				  proc->args.decls->decl.type, 0);
-+			  f_print(fout, " *argp, struct svc_req *%s)\n", 
-+				  RQSTP);
-+			} else {
-+			  f_print(fout, "(argp, %s)\n", RQSTP );
-+			  /* arg name */
-+			  if (proc->arg_num > 1)
-+			    f_print(fout, "\t%s *argp;\n", proc->args.argname);
-+			  else {
-+			    f_print(fout, "\t");
-+			    ptype(proc->args.decls->decl.prefix, 
-+				  proc->args.decls->decl.type, 0);
-+			    f_print(fout, " *argp;\n");
-+			  }
-+			  f_print(fout, "	struct svc_req *%s;\n", RQSTP);
-+			}
-+
-+			f_print(fout, "{\n");
-+			f_print(fout, "\treturn(");
-+			if( Cflag )
-+			  pvname_svc(proc->proc_name, vp->vers_num);
-+			else
-+			  pvname(proc->proc_name, vp->vers_num);
-+			f_print(fout, "(");
-+			if (proc->arg_num < 2) { /* single argument */
-+			  if (!streq( proc->args.decls->decl.type, "void"))
-+			    f_print(fout, "*argp, ");  /* non-void */
-+			} else {
-+			  for (l = proc->args.decls;  l != NULL; l = l->next) 
-+			    f_print(fout, "argp->%s, ", l->decl.name);
-+			}
-+			f_print(fout, "%s));\n}\n", RQSTP);
-+		} 		
-+	}
-+}
-+
-+static void
-+write_program(definition *def, char *storage)
-+{
-+	version_list *vp;
-+	proc_list *proc;
-+	int filled;
-+
-+	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		f_print(fout, "\n");
-+		if (storage != NULL) {
-+			f_print(fout, "%s ", storage);
-+		}
-+		f_print(fout, "void\n");
-+		pvname(def->def_name, vp->vers_num);
-+
-+		if (Cflag) {
-+		   f_print(fout, "(struct svc_req *%s, ", RQSTP);
-+		   f_print(fout, "register SVCXPRT *%s)\n", TRANSP);
-+		} else {
-+		   f_print(fout, "(%s, %s)\n", RQSTP, TRANSP);
-+		   f_print(fout, "	struct svc_req *%s;\n", RQSTP);
-+		   f_print(fout, "	register SVCXPRT *%s;\n", TRANSP);
-+		}
-+
-+		f_print(fout, "{\n");
-+
-+		filled = 0;
-+		f_print(fout, "\tunion {\n");
-+		for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+			if (proc->arg_num < 2) { /* single argument */
-+				if (streq(proc->args.decls->decl.type, 
-+					  "void")) {
-+					continue;
-+				}
-+				filled = 1;
-+				f_print(fout, "\t\t");
-+				ptype(proc->args.decls->decl.prefix, 
-+				      proc->args.decls->decl.type, 0);
-+				pvname(proc->proc_name, vp->vers_num);
-+				f_print(fout, "_arg;\n");
-+
-+			}
-+			else {
-+				filled = 1;
-+				f_print(fout, "\t\t%s", proc->args.argname);
-+				f_print(fout, " ");
-+				pvname(proc->proc_name, vp->vers_num);
-+				f_print(fout, "_arg;\n");
-+			}
-+		}
-+		if (!filled) {
-+			f_print(fout, "\t\tint fill;\n");
-+		}
-+		f_print(fout, "\t} %s;\n", ARG);
-+		f_print(fout, "\tchar *%s;\n", RESULT);
-+
-+		if (Cflag) {
-+		    f_print(fout, "\txdrproc_t xdr_%s, xdr_%s;\n", ARG, RESULT);
-+		    f_print(fout,
-+			    "\tchar *(*%s)(char *, struct svc_req *);\n",
-+			    ROUTINE);
-+		} else {
-+		    f_print(fout, "\tbool_t (*xdr_%s)(), (*xdr_%s)();\n", ARG, RESULT);
-+		    f_print(fout, "\tchar *(*%s)();\n", ROUTINE);
-+		}
-+
-+		f_print(fout, "\n");
-+
-+		if (timerflag)
-+			f_print(fout, "\t_rpcsvcdirty = 1;\n");
-+		f_print(fout, "\tswitch (%s->rq_proc) {\n", RQSTP);
-+		if (!nullproc(vp->procs)) {
-+			f_print(fout, "\tcase NULLPROC:\n");
-+			f_print(fout,
-+			"\t\t(void) svc_sendreply(%s, (xdrproc_t) xdr_void, (char *)NULL);\n",
-+					TRANSP);
-+			print_return("\t\t");
-+			f_print(fout, "\n");
-+		}
-+		for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+			f_print(fout, "\tcase %s:\n", proc->proc_name);
-+			if (proc->arg_num < 2) { /* single argument */
-+			  p_xdrfunc( ARG, proc->args.decls->decl.type);
-+			} else {
-+			  p_xdrfunc( ARG, proc->args.argname);
-+			}
-+			p_xdrfunc( RESULT, proc->res_type);
-+			if( Cflag )
-+			    f_print(fout,
-+				    "\t\t%s = (char *(*)(char *, struct svc_req *)) ",
-+				    ROUTINE);
-+			else
-+			    f_print(fout, "\t\t%s = (char *(*)()) ", ROUTINE);
-+
-+			if (newstyle) { /* new style: calls internal routine */
-+				f_print(fout,"_");
-+			}
-+			/* Not sure about the following...
-+			 * rpc_hout always generates foobar_1_svc for
-+			 * the service procedure, so why should we use
-+			 * foobar_1 here?! --okir */
-+#if 0
-+			if( Cflag && !newstyle )
-+			  pvname_svc(proc->proc_name, vp->vers_num);
-+			else
-+			  pvname(proc->proc_name, vp->vers_num);
-+#else
-+			pvname_svc(proc->proc_name, vp->vers_num);
-+#endif
-+			f_print(fout, ";\n");
-+			f_print(fout, "\t\tbreak;\n\n");
-+		}
-+		f_print(fout, "\tdefault:\n");
-+		printerr("noproc", TRANSP);
-+		print_return("\t\t");
-+		f_print(fout, "\t}\n");
-+
-+		f_print(fout, "\t(void) memset((char *)&%s, 0, sizeof (%s));\n", ARG, ARG);
-+		if (Cflag)
-+		    printif("getargs", TRANSP, "(caddr_t) &", ARG);
-+		else
-+		    printif("getargs", TRANSP, "&", ARG);
-+		printerr("decode", TRANSP);
-+		print_return("\t\t");
-+		f_print(fout, "\t}\n");
-+
-+		if (Cflag)
-+		    f_print(fout, "\t%s = (*%s)((char *)&%s, %s);\n",
-+			    RESULT, ROUTINE, ARG, RQSTP);
-+		else
-+		    f_print(fout, "\t%s = (*%s)(&%s, %s);\n",
-+			    RESULT, ROUTINE, ARG, RQSTP);
-+		f_print(fout, 
-+			"\tif (%s != NULL && !svc_sendreply(%s, "
-+			"(xdrproc_t) xdr_%s, %s)) {\n",
-+			RESULT, TRANSP, RESULT, RESULT);
-+		printerr("systemerr", TRANSP);
-+		f_print(fout, "\t}\n");
-+
-+		if (Cflag)
-+		    printif("freeargs", TRANSP, "(caddr_t) &", ARG);
-+		else
-+		    printif("freeargs", TRANSP, "&", ARG);
-+		(void) sprintf(_errbuf, "unable to free arguments");
-+		print_err_message("\t\t");
-+		f_print(fout, "\t\texit(1);\n");
-+		f_print(fout, "\t}\n");
-+		print_return("\t");
-+		f_print(fout, "}\n");
-+	}
-+}
-+
-+static void
-+printerr(char *err, char *transp)
-+{
-+	f_print(fout, "\t\tsvcerr_%s(%s);\n", err, transp);
-+}
-+
-+static void
-+printif(char *proc, char *transp, char *prefix, char *arg)
-+{
-+	f_print(fout, "\tif (!svc_%s(%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s)) {\n",
-+		proc, transp, arg, prefix, arg);
-+}
-+
-+int
-+nullproc(proc_list *proc)
-+{
-+	for (; proc != NULL; proc = proc->next) {
-+		if (streq(proc->proc_num, "0")) {
-+			return (1);
-+		}
-+	}
-+	return (0);
-+}
-+
-+static void
-+write_inetmost(char *infile)
-+{
-+	f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP);
-+	f_print(fout, "\tint sock;\n");
-+	f_print(fout, "\tint proto;\n");
-+	f_print(fout, "\tstruct sockaddr_in saddr;\n");
-+	f_print(fout, "\tint asize = sizeof (saddr);\n");
-+	f_print(fout, "\n");
-+	f_print(fout, 
-+	"\tif (getsockname(0, (struct sockaddr *)&saddr, &asize) == 0) {\n");
-+	f_print(fout, "\t\tint ssize = sizeof (int);\n\n");
-+	f_print(fout, "\t\tif (saddr.sin_family != AF_INET)\n");
-+	f_print(fout, "\t\t\texit(1);\n");
-+	f_print(fout, "\t\tif (getsockopt(0, SOL_SOCKET, SO_TYPE,\n");
-+	f_print(fout, "\t\t\t\t(char *)&_rpcfdtype, &ssize) == -1)\n");
-+	f_print(fout, "\t\t\texit(1);\n");
-+	f_print(fout, "\t\tsock = 0;\n");
-+	f_print(fout, "\t\t_rpcpmstart = 1;\n");
-+	f_print(fout, "\t\tproto = 0;\n");
-+	open_log_file(infile, "\t\t");
-+	f_print(fout, "\t} else {\n");
-+	write_rpc_svc_fg(infile, "\t\t");
-+	f_print(fout, "\t\tsock = RPC_ANYSOCK;\n");
-+	print_pmapunset("\t\t");
-+	f_print(fout, "\t}\n");
-+}
-+
-+static void
-+print_return(char *space)
-+{
-+	if (exitnow)
-+		f_print(fout, "%sexit(0);\n", space);
-+	else {
-+		if (timerflag)
-+			f_print(fout, "%s_rpcsvcdirty = 0;\n", space);
-+		f_print(fout, "%sreturn;\n", space);
-+	}
-+}
-+
-+static void
-+print_pmapunset(char *space)
-+{
-+	list *l;
-+	definition *def;
-+	version_list *vp;
-+
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind == DEF_PROGRAM) {
-+			for (vp = def->def.pr.versions; vp != NULL;
-+					vp = vp->next) {
-+				f_print(fout, "%s(void) pmap_unset(%s, %s);\n",
-+					space, def->def_name, vp->vers_name);
-+			}
-+		}
-+	}
-+}
-+
-+static void
-+print_err_message(char *space)
-+{
-+	if (logflag)
-+		f_print(fout, "%ssyslog(LOG_ERR, \"%s\");\n", space, _errbuf);
-+	else if (inetdflag || pmflag)
-+		f_print(fout, "%s_msgout(\"%s\");\n", space, _errbuf);
-+	else
-+		f_print(fout, "%sfprintf(stderr, \"%s\");\n", space, _errbuf);
-+}
-+
-+/*
-+ * Write the server auxiliary function ( _msgout, timeout)
-+ */
-+void
-+write_svc_aux(int nomain)
-+{
-+	if (!logflag)
-+		write_msg_out();
-+	if( !nomain )
-+	  write_timeout_func();
-+}
-+
-+/*
-+ * Write the _msgout function
-+ */
-+void
-+write_msg_out(void)
-+{
-+	f_print(fout, "\n");
-+	f_print(fout, "static\n");
-+	if( !Cflag ) {
-+	  f_print(fout, "void _msgout(msg)\n");
-+	  f_print(fout, "\tchar *msg;\n");
-+	} else {
-+	  f_print(fout, "void _msgout(char* msg)\n");
-+	}
-+	f_print(fout, "{\n");
-+	f_print(fout, "#ifdef RPC_SVC_FG\n");
-+	if (inetdflag || pmflag)
-+		f_print(fout, "\tif (_rpcpmstart)\n");
-+	f_print(fout, "\t\tsyslog(LOG_ERR, \"%%s\", msg);\n");
-+	f_print(fout, "\telse\n");
-+	f_print(fout, "\t\t(void) fprintf(stderr, \"%%s\\n\", msg);\n");
-+	f_print(fout, "#else\n");
-+	f_print(fout, "\tsyslog(LOG_ERR, \"%%s\", msg);\n");
-+	f_print(fout, "#endif\n");
-+	f_print(fout, "}\n");
-+}
-+
-+/*
-+ * Write the timeout function
-+ */
-+static void
-+write_timeout_func(void)
-+{
-+	if (!timerflag)
-+		return;
-+	f_print(fout, "\n");
-+	f_print(fout, "static void\n");
-+	f_print(fout, "closedown()\n");
-+	f_print(fout, "{\n");
-+	f_print(fout, "\tif (_rpcsvcdirty == 0) {\n");
-+	f_print(fout, "\t\tstatic int size;\n");
-+	f_print(fout, "\t\tint i, openfd;\n");
-+	if (tirpcflag && pmflag) {
-+		f_print(fout, "\t\tstruct t_info tinfo;\n\n");
-+		f_print(fout, "\t\tif (!t_getinfo(0, &tinfo) && (tinfo.servtype == T_CLTS))\n");
-+	} else {
-+		f_print(fout, "\n\t\tif (_rpcfdtype == SOCK_DGRAM)\n");
-+	}
-+	f_print(fout, "\t\t\texit(0);\n");
-+	f_print(fout, "\t\tif (size == 0) {\n");
-+	if( tirpcflag ) {
-+	  f_print(fout, "\t\t\tstruct rlimit rl;\n\n");
-+	  f_print(fout, "\t\t\trl.rlim_max = 0;\n");
-+	  f_print(fout, "\t\t\tgetrlimit(RLIMIT_NOFILE, &rl);\n");
-+	  f_print(fout, "\t\t\tif ((size = rl.rlim_max) == 0)\n");
-+	  f_print(fout, "\t\t\t\treturn;\n");
-+	} else {
-+	  f_print(fout, "\t\t\tsize = getdtablesize();\n");
-+	}
-+	f_print(fout, "\t\t}\n");
-+	f_print(fout, "\t\tfor (i = 0, openfd = 0; i < size && openfd < 2; i++)\n");
-+	f_print(fout, "\t\t\tif (FD_ISSET(i, &svc_fdset))\n");
-+	f_print(fout, "\t\t\t\topenfd++;\n");
-+	f_print(fout, "\t\tif (openfd <= 1)\n");
-+	f_print(fout, "\t\t\texit(0);\n");
-+	f_print(fout, "\t}\n");
-+	f_print(fout, "\t(void) alarm(_RPCSVC_CLOSEDOWN);\n");
-+	f_print(fout, "}\n");
-+}
-+
-+/*
-+ * Write the most of port monitor support
-+ */
-+static void
-+write_pm_most(char *infile, int netflag)
-+{
-+	list *l;
-+	definition *def;
-+	version_list *vp;
-+
-+	f_print(fout, "\tif (!ioctl(0, I_LOOK, mname) &&\n");
-+	f_print(fout, "\t\t(!strcmp(mname, \"sockmod\") ||");
-+	f_print(fout, " !strcmp(mname, \"timod\"))) {\n");
-+	f_print(fout, "\t\tchar *netid;\n");
-+	if (!netflag) {	/* Not included by -n option */
-+		f_print(fout, "\t\tstruct netconfig *nconf = NULL;\n");
-+		f_print(fout, "\t\tSVCXPRT *%s;\n", TRANSP);
-+	}
-+	if( timerflag )
-+	  f_print(fout, "\t\tint pmclose;\n");
-+/* not necessary, defined in /usr/include/stdlib */
-+/*	f_print(fout, "\t\textern char *getenv();\n");*/
-+	f_print(fout, "\n");
-+	f_print(fout, "\t\t_rpcpmstart = 1;\n");
-+	if (logflag)
-+		open_log_file(infile, "\t\t");
-+	f_print(fout, "\t\tif ((netid = getenv(\"NLSPROVIDER\")) == NULL) {\n");
-+	sprintf(_errbuf, "cannot get transport name");
-+	print_err_message("\t\t\t");
-+	f_print(fout, "\t\t} else if ((nconf = getnetconfigent(netid)) == NULL) {\n");
-+	sprintf(_errbuf, "cannot get transport info");
-+	print_err_message("\t\t\t");
-+	f_print(fout, "\t\t}\n");
-+	/*
-+	 * A kludgy support for inetd services. Inetd only works with
-+	 * sockmod, and RPC works only with timod, hence all this jugglery
-+	 */
-+	f_print(fout, "\t\tif (strcmp(mname, \"sockmod\") == 0) {\n");
-+	f_print(fout, "\t\t\tif (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, \"timod\")) {\n");
-+	sprintf(_errbuf, "could not get the right module");
-+	print_err_message("\t\t\t\t");
-+	f_print(fout, "\t\t\t\texit(1);\n");
-+	f_print(fout, "\t\t\t}\n");
-+	f_print(fout, "\t\t}\n");
-+	if( timerflag )
-+	  f_print(fout, "\t\tpmclose = (t_getstate(0) != T_DATAXFER);\n");
-+	f_print(fout, "\t\tif ((%s = svc_tli_create(0, nconf, NULL, 0, 0)) == NULL) {\n",
-+			TRANSP);
-+	sprintf(_errbuf, "cannot create server handle");
-+	print_err_message("\t\t\t");
-+	f_print(fout, "\t\t\texit(1);\n");
-+	f_print(fout, "\t\t}\n");
-+	f_print(fout, "\t\tif (nconf)\n");
-+	f_print(fout, "\t\t\tfreenetconfigent(nconf);\n");
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind != DEF_PROGRAM) {
-+			continue;
-+		}
-+		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+			f_print(fout,
-+				"\t\tif (!svc_reg(%s, %s, %s, ",
-+				TRANSP, def->def_name, vp->vers_name);
-+			pvname(def->def_name, vp->vers_num);
-+			f_print(fout, ", 0)) {\n");
-+			(void) sprintf(_errbuf, "unable to register (%s, %s).",
-+					def->def_name, vp->vers_name);
-+			print_err_message("\t\t\t");
-+			f_print(fout, "\t\t\texit(1);\n");
-+			f_print(fout, "\t\t}\n");
-+		}
-+	}
-+	if (timerflag) {
-+		f_print(fout, "\t\tif (pmclose) {\n");
-+		f_print(fout, "\t\t\t(void) signal(SIGALRM, %s closedown);\n",
-+				Cflag? "(SIG_PF)" : "(void(*)())" );
-+		f_print(fout, "\t\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n");
-+		f_print(fout, "\t\t}\n");
-+	}
-+	f_print(fout, "\t\tsvc_run();\n");
-+	f_print(fout, "\t\texit(1);\n");
-+	f_print(fout, "\t\t/* NOTREACHED */\n");
-+	f_print(fout, "\t}\n");
-+}
-+
-+/*
-+ * Support for backgrounding the server if self started.
-+ */
-+static void
-+write_rpc_svc_fg(char *infile, char *sp)
-+{
-+	f_print(fout, "#ifndef RPC_SVC_FG\n");
-+	f_print(fout, "%sint size;\n", sp);
-+	if( tirpcflag )
-+	        f_print(fout, "%sstruct rlimit rl;\n", sp);
-+	if (inetdflag)
-+		f_print(fout, "%sint pid, i;\n\n", sp);
-+	f_print(fout, "%spid = fork();\n", sp);
-+	f_print(fout, "%sif (pid < 0) {\n", sp);
-+	f_print(fout, "%s\tperror(\"cannot fork\");\n", sp);
-+	f_print(fout, "%s\texit(1);\n", sp);
-+	f_print(fout, "%s}\n", sp);
-+	f_print(fout, "%sif (pid)\n", sp);
-+	f_print(fout, "%s\texit(0);\n", sp);
-+	/* get number of file descriptors */
-+	if( tirpcflag ) {
-+	  f_print(fout, "%srl.rlim_max = 0;\n", sp);
-+	  f_print(fout, "%sgetrlimit(RLIMIT_NOFILE, &rl);\n", sp);
-+	  f_print(fout, "%sif ((size = rl.rlim_max) == 0)\n", sp);
-+	  f_print(fout, "%s\texit(1);\n", sp);
-+	} else {
-+	  f_print(fout, "%ssize = getdtablesize();\n", sp);
-+	}
-+
-+	f_print(fout, "%sfor (i = 0; i < size; i++)\n", sp);
-+	f_print(fout, "%s\t(void) close(i);\n", sp);
-+	/* Redirect stderr and stdout to console */
-+	f_print(fout, "%si = open(\"/dev/console\", 2);\n", sp);
-+	f_print(fout, "%s(void) dup2(i, 1);\n", sp);
-+	f_print(fout, "%s(void) dup2(i, 2);\n", sp);
-+	/* This removes control of the controlling terminal */
-+	if( tirpcflag )
-+	  f_print(fout, "%ssetsid();\n", sp);
-+	else {
-+	  f_print(fout, "%si = open(\"/dev/tty\", 2);\n", sp);
-+	  f_print(fout, "%sif (i >= 0) {\n", sp);
-+	  f_print(fout, "%s\t(void) ioctl(i, TIOCNOTTY, (char *)NULL);\n", sp);;
-+	  f_print(fout, "%s\t(void) close(i);\n", sp);
-+	  f_print(fout, "%s}\n", sp);
-+	}
-+	if (!logflag)
-+		open_log_file(infile, sp);
-+	f_print(fout, "#endif\n");
-+	if (logflag)
-+		open_log_file(infile, sp);
-+}
-+
-+static void
-+open_log_file(char *infile, char *sp)
-+{
-+	char *s;
-+
-+	s = strrchr(infile, '.');
-+	if (s) 
-+		*s = '\0';
-+	f_print(fout,"%sopenlog(\"%s\", LOG_PID, LOG_DAEMON);\n", sp, infile);
-+	if (s)
-+		*s = '.';
-+}
-+
-+
-+
-+
-+/*
-+ * write a registration for the given transport for Inetd
-+ */
-+void
-+write_inetd_register(char *transp)
-+{
-+	list *l;
-+	definition *def;
-+	version_list *vp;
-+	char *sp;
-+	int isudp;
-+	char tmpbuf[32];
-+
-+	if (inetdflag)
-+		sp = "\t";
-+	else
-+		sp = "";
-+	if (streq(transp, "udp"))
-+		isudp = 1;
-+	else
-+		isudp = 0;
-+	f_print(fout, "\n");
-+	if (inetdflag) {
-+		f_print(fout, "\tif ((_rpcfdtype == 0) || (_rpcfdtype == %s)) {\n",
-+				isudp ? "SOCK_DGRAM" : "SOCK_STREAM");
-+	}
-+	f_print(fout, "%s\t%s = svc%s_create(%s",
-+		sp, TRANSP, transp, inetdflag? "sock": "RPC_ANYSOCK");
-+	if (!isudp)
-+		f_print(fout, ", 0, 0");
-+	f_print(fout, ");\n");
-+	f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP);
-+	(void) sprintf(_errbuf, "cannot create %s service.", transp);
-+	(void) sprintf(tmpbuf, "%s\t\t", sp);
-+	print_err_message(tmpbuf);
-+	f_print(fout, "%s\t\texit(1);\n", sp);
-+	f_print(fout, "%s\t}\n", sp);
-+
-+	if (inetdflag) {
-+		f_print(fout, "%s\tif (!_rpcpmstart)\n\t", sp);
-+		f_print(fout, "%s\tproto = IPPROTO_%s;\n",
-+				sp, isudp ? "UDP": "TCP");
-+	}
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind != DEF_PROGRAM) {
-+			continue;
-+		}
-+		for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+			f_print(fout, "%s\tif (!svc_register(%s, %s, %s, ",
-+				sp, TRANSP, def->def_name, vp->vers_name);
-+			pvname(def->def_name, vp->vers_num);
-+			if (inetdflag)
-+				f_print(fout, ", proto)) {\n");
-+			else 
-+				f_print(fout, ", IPPROTO_%s)) {\n",
-+					isudp ? "UDP": "TCP");
-+			(void) sprintf(_errbuf, "unable to register (%s, %s, %s).",
-+					def->def_name, vp->vers_name, transp);
-+			print_err_message(tmpbuf);
-+			f_print(fout, "%s\t\texit(1);\n", sp);
-+			f_print(fout, "%s\t}\n", sp);
-+		}
-+	}
-+	if (inetdflag)
-+		f_print(fout, "\t}\n");
-+}
-diff --git a/rpcgen/rpc_tblout.c b/rpcgen/rpc_tblout.c
-new file mode 100644
-index 0000000..ae002f7
---- /dev/null
-+++ b/rpcgen/rpc_tblout.c
-@@ -0,0 +1,165 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI";
-+#endif
-+
-+/*
-+ * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler
-+ */
-+#include <stdio.h>
-+#include <string.h>
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+#include "rpc_output.h"
-+
-+static void	write_table(definition *def);
-+static void	printit(char *prefix, char *type);
-+
-+#define TABSIZE		8
-+#define TABCOUNT	5
-+#define TABSTOP		(TABSIZE*TABCOUNT)
-+
-+static char tabstr[TABCOUNT+1] = "\t\t\t\t\t";
-+
-+static char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n";
-+static char tbl_end[] = "};\n";
-+
-+static char null_entry[] = "\n\t(char *(*)())0,\n\
-+ \t(xdrproc_t) xdr_void,\t\t\t0,\n\
-+ \t(xdrproc_t) xdr_void,\t\t\t0,\n";
-+
-+
-+static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n";
-+
-+void
-+write_tables(void)
-+{
-+	list *l;
-+	definition *def;
-+
-+	f_print(fout, "\n");
-+	for (l = defined; l != NULL; l = l->next) {
-+		def = (definition *) l->val;
-+		if (def->def_kind == DEF_PROGRAM) {
-+			write_table(def);
-+		}
-+	}
-+}
-+
-+static void
-+write_table(definition *def)
-+{
-+	version_list *vp;
-+	proc_list *proc;
-+	int current;
-+	int expected;
-+	char progvers[100];
-+	int warning;
-+
-+	for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
-+		warning = 0;
-+		s_print(progvers, "%s_%s",
-+		    locase(def->def_name), vp->vers_num);
-+		/* print the table header */
-+		f_print(fout, tbl_hdr, progvers);
-+
-+		if (nullproc(vp->procs)) {
-+			expected = 0;
-+		} else {
-+			expected = 1;
-+			f_print(fout, null_entry);
-+		}
-+		for (proc = vp->procs; proc != NULL; proc = proc->next) {
-+			current = atoi(proc->proc_num);
-+			if (current != expected++) {
-+				f_print(fout,
-+			"\n/*\n * WARNING: table out of order\n */\n");
-+				if (warning == 0) {
-+					f_print(stderr,
-+				    "WARNING %s table is out of order\n",
-+					    progvers);
-+					warning = 1;
-+					nonfatalerrors = 1;
-+				}
-+				expected = current + 1;
-+			}
-+			f_print(fout, "\n\t(char *(*)())RPCGEN_ACTION(");
-+
-+			/* routine to invoke */
-+			if( Cflag && !newstyle )
-+			  pvname_svc(proc->proc_name, vp->vers_num);
-+			else {
-+			  if( newstyle )
-+			    f_print( fout, "_");   /* calls internal func */
-+			  pvname(proc->proc_name, vp->vers_num);
-+			}
-+			f_print(fout, "),\n");
-+
-+			/* argument info */
-+			if( proc->arg_num > 1 )
-+			  printit((char*) NULL, proc->args.argname );
-+			else  
-+			  /* do we have to do something special for newstyle */
-+			  printit( proc->args.decls->decl.prefix,
-+				  proc->args.decls->decl.type );
-+			/* result info */
-+			printit(proc->res_prefix, proc->res_type);
-+		}
-+
-+		/* print the table trailer */
-+		f_print(fout, tbl_end);
-+		f_print(fout, tbl_nproc, progvers, progvers, progvers);
-+	}
-+}
-+
-+static void
-+printit(char *prefix, char *type)
-+{
-+	int len;
-+	int tabs;
-+
-+
-+ 	len = fprintf(fout, "\txdr_%s,", stringfix(type));
-+	/* account for leading tab expansion */
-+	len += TABSIZE - 1;
-+	/* round up to tabs required */
-+	tabs = (TABSTOP - len + TABSIZE - 1)/TABSIZE;
-+	f_print(fout, "%s", &tabstr[TABCOUNT-tabs]);
-+
-+	if (streq(type, "void")) {
-+		f_print(fout, "0");
-+	} else {
-+		f_print(fout, "sizeof ( ");
-+		/* XXX: should "follow" be 1 ??? */
-+		ptype(prefix, type, 0);
-+		f_print(fout, ")");
-+	}
-+	f_print(fout, ",\n");
-+}
-diff --git a/rpcgen/rpc_util.c b/rpcgen/rpc_util.c
-new file mode 100644
-index 0000000..b67be57
---- /dev/null
-+++ b/rpcgen/rpc_util.c
-@@ -0,0 +1,479 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#if 0
-+static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI";
-+#endif
-+
-+/*
-+ * rpc_util.c, Utility routines for the RPC protocol compiler 
-+ */
-+#include <stdio.h>
-+#include <memory.h>
-+#include <ctype.h>
-+#include <unistd.h>
-+#include "rpc_scan.h"
-+#include "rpc_parse.h"
-+#include "rpc_util.h"
-+
-+static void	printwhere(void);
-+
-+
-+#define ARGEXT "argument"
-+
-+char curline[MAXLINESIZE];	/* current read line */
-+char *where = curline;		/* current point in line */
-+int linenum = 0;		/* current line number */
-+
-+char *infilename;		/* input filename */
-+
-+#define NFILES 7
-+char *outfiles[NFILES];		/* output file names */
-+int nfiles;
-+
-+FILE *fout;			/* file pointer of current output */
-+FILE *fin;			/* file pointer of current input */
-+
-+list *defined;			/* list of defined things */
-+
-+/*
-+ * Reinitialize the world 
-+ */
-+void
-+reinitialize(void)
-+{
-+	memset(curline, 0, MAXLINESIZE);
-+	where = curline;
-+	linenum = 0;
-+	defined = NULL;
-+}
-+
-+/*
-+ * string equality 
-+ */
-+int
-+streq(char *a, char *b)
-+{
-+	return (strcmp(a, b) == 0);
-+}
-+
-+/*
-+ * find a value in a list 
-+ */
-+definition *
-+findval(list *lst, char *val, int (*cmp)(definition *, char *))
-+{
-+         
-+	for (; lst != NULL; lst = lst->next) {
-+		if ((*cmp) (lst->val, val)) {
-+			return (lst->val);
-+		}
-+	}
-+	return (NULL);
-+}
-+
-+/*
-+ * store a value in a list 
-+ */
-+void
-+storeval(lstp, val)
-+	list **lstp;
-+	definition *val;
-+{
-+	list **l;
-+	list *lst;
-+
-+	
-+	for (l = lstp; *l != NULL; l = (list **) & (*l)->next);
-+	lst = ALLOC(list);
-+	lst->val = val;
-+	lst->next = NULL;
-+	*l = lst;
-+}
-+
-+static int
-+findit(definition *def, char *type)
-+{
-+	return (streq(def->def_name, type));
-+}
-+
-+static char *
-+fixit(char *type, char *orig)
-+{
-+	definition *def;
-+
-+	def = (definition *) FINDVAL(defined, type, findit);
-+	if (def == NULL || def->def_kind != DEF_TYPEDEF) {
-+		return (orig);
-+	}
-+	switch (def->def.ty.rel) {
-+	case REL_VECTOR:
-+		return (def->def.ty.old_type);
-+	case REL_ALIAS:
-+		return (fixit(def->def.ty.old_type, orig));
-+	default:
-+		return (orig);
-+	}
-+}
-+
-+char *
-+fixtype(char *type)
-+{
-+	return (fixit(type, type));
-+}
-+
-+char *
-+stringfix(char *type)
-+{
-+	if (streq(type, "string")) {
-+		return ("wrapstring");
-+	} else {
-+		return (type);
-+	}
-+}
-+
-+void
-+ptype(char *prefix, char *type, int follow)
-+{
-+	if (prefix != NULL) {
-+		if (streq(prefix, "enum")) {
-+			f_print(fout, "enum ");
-+		} else {
-+			f_print(fout, "struct ");
-+		}
-+	}
-+	if (streq(type, "bool")) {
-+		f_print(fout, "bool_t ");
-+	} else if (streq(type, "string")) {
-+		f_print(fout, "char *");
-+	} else {
-+		f_print(fout, "%s ", follow ? fixtype(type) : type);
-+	}
-+}
-+
-+static int
-+typedefed(definition *def, char *type)
-+{
-+	if (def->def_kind != DEF_TYPEDEF || def->def.ty.old_prefix != NULL) {
-+		return (0);
-+	} else {
-+		return (streq(def->def_name, type));
-+	}
-+}
-+
-+int
-+isvectordef(char *type, relation rel)
-+{
-+	definition *def;
-+
-+	for (;;) {
-+		switch (rel) {
-+		case REL_VECTOR:
-+			return (!streq(type, "string"));
-+		case REL_ARRAY:
-+			return (0);
-+		case REL_POINTER:
-+			return (0);
-+		case REL_ALIAS:
-+			def = (definition *) FINDVAL(defined, type, typedefed);
-+			if (def == NULL) {
-+				return (0);
-+			}
-+			type = def->def.ty.old_type;
-+			rel = def->def.ty.rel;
-+		}
-+	}
-+}
-+
-+char *
-+locase(char *str)
-+{
-+	char c;
-+	static char buf[100];
-+	char *p = buf;
-+
-+	while ((c = *str++) != '\0') {
-+		*p++ = (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c;
-+	}
-+	*p = 0;
-+	return (buf);
-+}
-+
-+void
-+pvname_svc(char *pname, char *vnum)
-+{
-+	f_print(fout, "%s_%s_svc", locase(pname), vnum);
-+}
-+
-+void
-+pvname(char *pname, char *vnum)
-+{
-+	f_print(fout, "%s_%s", locase(pname), vnum);
-+}
-+
-+/*
-+ * print a useful (?) error message, and then die 
-+ */
-+void
-+error(char *msg)
-+{
-+	printwhere();
-+	f_print(stderr, "%s, line %d: ", infilename, linenum);
-+	f_print(stderr, "%s\n", msg);
-+	crash();
-+}
-+
-+/*
-+ * Something went wrong, unlink any files that we may have created and then
-+ * die. 
-+ */
-+void
-+crash(void)
-+{
-+	int i;
-+
-+	for (i = 0; i < nfiles; i++) {
-+		(void) unlink(outfiles[i]);
-+	}
-+	exit(1);
-+}
-+
-+void
-+record_open(char *file)
-+{
-+	if (nfiles < NFILES) {
-+		outfiles[nfiles++] = file;
-+	} else {
-+		f_print(stderr, "too many files!\n");
-+		crash();
-+	}
-+}
-+
-+static char expectbuf[100];
-+static char *toktostr();
-+
-+/*
-+ * error, token encountered was not the expected one 
-+ */
-+void
-+expected1(exp1)
-+	tok_kind exp1;
-+{
-+	s_print(expectbuf, "expected '%s'",
-+		toktostr(exp1));
-+	error(expectbuf);
-+}
-+
-+/*
-+ * error, token encountered was not one of two expected ones 
-+ */
-+void
-+expected2(exp1, exp2)
-+	tok_kind exp1, exp2;
-+{
-+	s_print(expectbuf, "expected '%s' or '%s'",
-+		toktostr(exp1),
-+		toktostr(exp2));
-+	error(expectbuf);
-+}
-+
-+/*
-+ * error, token encountered was not one of 3 expected ones 
-+ */
-+void
-+expected3(exp1, exp2, exp3)
-+	tok_kind exp1, exp2, exp3;
-+{
-+	s_print(expectbuf, "expected '%s', '%s' or '%s'",
-+		toktostr(exp1),
-+		toktostr(exp2),
-+		toktostr(exp3));
-+	error(expectbuf);
-+}
-+
-+void
-+tabify(f, tab)
-+	FILE *f;
-+	int tab;
-+{
-+	while (tab--) {
-+		(void) fputc('\t', f);
-+	}
-+}
-+
-+
-+static token tokstrings[] = {
-+			     {TOK_IDENT, "identifier"},
-+			     {TOK_CONST, "const"},
-+			     {TOK_RPAREN, ")"},
-+			     {TOK_LPAREN, "("},
-+			     {TOK_RBRACE, "}"},
-+			     {TOK_LBRACE, "{"},
-+			     {TOK_LBRACKET, "["},
-+			     {TOK_RBRACKET, "]"},
-+			     {TOK_STAR, "*"},
-+			     {TOK_COMMA, ","},
-+			     {TOK_EQUAL, "="},
-+			     {TOK_COLON, ":"},
-+			     {TOK_SEMICOLON, ";"},
-+			     {TOK_UNION, "union"},
-+			     {TOK_STRUCT, "struct"},
-+			     {TOK_SWITCH, "switch"},
-+			     {TOK_CASE, "case"},
-+			     {TOK_DEFAULT, "default"},
-+			     {TOK_ENUM, "enum"},
-+			     {TOK_TYPEDEF, "typedef"},
-+			     {TOK_INT, "int"},
-+			     {TOK_SHORT, "short"},
-+			     {TOK_INT32, "int32"},
-+			     {TOK_UNSIGNED, "unsigned"},
-+			     {TOK_DOUBLE, "double"},
-+			     {TOK_FLOAT, "float"},
-+			     {TOK_CHAR, "char"},
-+			     {TOK_STRING, "string"},
-+			     {TOK_OPAQUE, "opaque"},
-+			     {TOK_BOOL, "bool"},
-+			     {TOK_VOID, "void"},
-+			     {TOK_PROGRAM, "program"},
-+			     {TOK_VERSION, "version"},
-+			     {TOK_EOF, "??????"}
-+};
-+
-+static char *
-+toktostr(kind)
-+	tok_kind kind;
-+{
-+	token *sp;
-+
-+	for (sp = tokstrings; sp->kind != TOK_EOF && sp->kind != kind; sp++);
-+	return (sp->str);
-+}
-+
-+static void
-+printbuf(void)
-+{
-+	char c;
-+	int i;
-+	int cnt;
-+
-+#	define TABSIZE 4
-+
-+	for (i = 0; (c = curline[i]) != '\0'; i++) {
-+		if (c == '\t') {
-+			cnt = 8 - (i % TABSIZE);
-+			c = ' ';
-+		} else {
-+			cnt = 1;
-+		}
-+		while (cnt--) {
-+			(void) fputc(c, stderr);
-+		}
-+	}
-+}
-+
-+static void
-+printwhere(void)
-+{
-+	int i;
-+	char c;
-+	int cnt;
-+
-+	printbuf();
-+	for (i = 0; i < where - curline; i++) {
-+		c = curline[i];
-+		if (c == '\t') {
-+			cnt = 8 - (i % TABSIZE);
-+		} else {
-+			cnt = 1;
-+		}
-+		while (cnt--) {
-+			(void) fputc('^', stderr);
-+		}
-+	}
-+	(void) fputc('\n', stderr);
-+}
-+
-+char * 
-+make_argname(char *pname, char *vname) 
-+{
-+	char *name;
-+	
-+	name = malloc(strlen(pname) + strlen(vname) + strlen(ARGEXT) + 3);
-+	if (!name) {
-+		fprintf(stderr, "failed in malloc");
-+		exit(1);
-+	}
-+	sprintf(name, "%s_%s_%s", locase(pname), vname, ARGEXT);
-+	return(name);
-+}
-+
-+bas_type *typ_list_h;
-+bas_type *typ_list_t;
-+
-+void
-+add_type(int len, char *type)
-+{
-+	bas_type       *ptr;
-+
-+
-+	if ((ptr = (bas_type *) malloc(sizeof(bas_type))) == (bas_type *) NULL) {
-+		fprintf(stderr, "failed in malloc");
-+		exit(1);
-+	}
-+	ptr->name = type;
-+	ptr->length = len;
-+	ptr->next = NULL;
-+	if (typ_list_t == NULL) {
-+
-+		typ_list_t = ptr;
-+		typ_list_h = ptr;
-+	} else {
-+
-+		typ_list_t->next = ptr;
-+		typ_list_t = ptr;
-+	}
-+}
-+
-+
-+bas_type *
-+find_type(char *type)
-+{
-+	bas_type       *ptr;
-+
-+	ptr = typ_list_h;
-+
-+
-+	while (ptr != NULL) {
-+		if (strcmp(ptr->name, type) == 0)
-+			return (ptr);
-+		else
-+			ptr = ptr->next;
-+	};
-+	return (NULL);
-+}
-+
-diff --git a/rpcgen/rpc_util.h b/rpcgen/rpc_util.h
-new file mode 100644
-index 0000000..fa115be
---- /dev/null
-+++ b/rpcgen/rpc_util.h
-@@ -0,0 +1,166 @@
-+/*
-+ * Copyright (c) 2009, Sun Microsystems, Inc.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are met:
-+ * - Redistributions of source code must retain the above copyright notice,
-+ *   this list of conditions and the following disclaimer.
-+ * - Redistributions in binary form must reproduce the above copyright notice,
-+ *   this list of conditions and the following disclaimer in the documentation
-+ *   and/or other materials provided with the distribution.
-+ * - Neither the name of Sun Microsystems, Inc. nor the names of its
-+ *   contributors may be used to endorse or promote products derived
-+ *   from this software without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+ * POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*      @(#)rpc_util.h  1.5  90/08/29  (C) 1987 SMI   */
-+
-+/*
-+ * rpc_util.h, Useful definitions for the RPC protocol compiler 
-+ */
-+
-+#include <stdlib.h>
-+
-+#define alloc(size)		malloc((unsigned)(size))
-+#define ALLOC(object)   (object *) malloc(sizeof(object))
-+
-+#define s_print	(void) sprintf
-+#define f_print (void) fprintf
-+
-+struct list {
-+	definition *val;
-+	struct list *next;
-+};
-+typedef struct list list;
-+
-+#define PUT 1
-+#define GET 2
-+
-+/*
-+ * Global variables 
-+ */
-+#define MAXLINESIZE 1024
-+extern char curline[MAXLINESIZE];
-+extern char *where;
-+extern int linenum;
-+
-+extern char *infilename;
-+extern FILE *fout;
-+extern FILE *fin;
-+
-+extern list *defined;
-+
-+
-+extern bas_type *typ_list_h;
-+extern bas_type *typ_list_t;
-+
-+/*
-+ * All the option flags
-+ */
-+extern int inetdflag;
-+extern int pmflag;   
-+extern int tblflag;
-+extern int logflag;
-+extern int newstyle;
-+extern int Cflag;	/* C++ flag */
-+extern int tirpcflag;	/* flag for generating tirpc code */
-+extern int Inline;	/* if this is 0, then do not generate inline code */
-+
-+/*
-+ * Other flags related with inetd jumpstart.
-+ */
-+extern int indefinitewait;
-+extern int exitnow;
-+extern int timerflag;
-+
-+extern int nonfatalerrors;
-+
-+/*
-+ * rpc_util routines 
-+ */
-+void storeval();
-+
-+#define STOREVAL(list,item)	\
-+	storeval(list,item)
-+
-+definition *findval();
-+
-+#define FINDVAL(list,item,finder) \
-+	findval(list, item, finder)
-+
-+
-+/*
-+ * rpc_cout routines
-+ */
-+void            cprint(void);
-+void            emit(definition *);
-+
-+/*
-+ * rpc_hout routines
-+ */
-+void            print_datadef(definition *);
-+void            print_funcdef(definition *);
-+
-+/*
-+ * rpc_svcout routines
-+ */
-+void            write_most(char *, int, int);
-+void            write_register(void);
-+void		write_netid_register(char *);
-+void		write_nettype_register(char *);
-+void		write_inetd_register(char *);
-+void            write_rest(void);
-+void            write_programs(char *);
-+void            write_svc_aux(int);
-+
-+/*
-+ * rpc_clntout routines
-+ */
-+void            write_stubs(void);
-+void		printarglist(proc_list *, char *, char *);
-+
-+/*
-+ * rpc_tblout routines
-+ */
-+void            write_tables(void);
-+
-+/*
-+ * rpc_util
-+ */
-+void            pvname_svc(char *, char *);
-+void            pvname(char *, char *);
-+void            ptype(char *, char *, int);
-+char *		make_argname(char *, char *);
-+void		add_type(int, char *);
-+void		reinitialize(void);
-+void		crash(void);
-+void		error(char *);
-+char           *fixtype(char *);
-+char           *stringfix(char *);
-+char           *locase(char *);
-+int             isvectordef(char *, relation);
-+int             streq(char *, char *);
-+void            tabify(FILE *, int);
-+void            record_open(char *);
-+bas_type       *find_type(char *type);
-+
-+/*
-+ * rpc_sample
-+ */
-+void		write_sample_svc(definition *);
-+int		write_sample_clnt(definition *);
-+void		write_sample_clnt_main(void);
-+void		add_sample_msg(void);
-diff --git a/rpcgen/rpcgen.1 b/rpcgen/rpcgen.1
-new file mode 100644
-index 0000000..89df7ed
---- /dev/null
-+++ b/rpcgen/rpcgen.1
-@@ -0,0 +1,521 @@
-+.\" @(#)rpcgen.1 1.35 93/06/02 SMI
-+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.12.2.4 2002/06/21 15:28:50 charnier Exp $
-+.\" Copyright 1985-1993 Sun Microsystems, Inc.
-+.Dd March 28, 1993
-+.Dt RPCGEN 1
-+.Os
-+.Sh NAME
-+.Nm rpcgen
-+.Nd an RPC protocol compiler
-+.Sh SYNOPSIS
-+.Nm
-+.Ar infile
-+.Nm
-+.Op Fl a
-+.Op Fl b
-+.Op Fl C
-+.Oo
-+.Fl D Ns Ar name Ns Op Ar =value
-+.Oc
-+.Op Fl i Ar size
-+.Op Fl I Op Fl K Ar seconds
-+.Op Fl L
-+.Op Fl M
-+.Op Fl N
-+.Op Fl T
-+.Op Fl Y Ar pathname
-+.Ar infile
-+.Nm
-+.Oo
-+.Fl c |
-+.Fl h |
-+.Fl l |
-+.Fl m |
-+.Fl t |
-+.Fl \&Sc |
-+.Fl \&Ss |
-+.Fl \&Sm
-+.Oc
-+.Op Fl o Ar outfile
-+.Op Ar infile
-+.Nm
-+.Op Fl s Ar nettype
-+.Op Fl o Ar outfile
-+.Op Ar infile
-+.Nm
-+.Op Fl n Ar netid
-+.Op Fl o Ar outfile
-+.Op Ar infile
-+.\" .SH AVAILABILITY
-+.\" .LP
-+.\" SUNWcsu
-+.Sh DESCRIPTION
-+The
-+.Nm
-+utility is a tool that generates C code to implement an
-+.Tn RPC
-+protocol.
-+The input to
-+.Nm
-+is a language similar to C known as
-+.Tn RPC
-+Language (Remote Procedure Call Language).
-+.Pp
-+The
-+.Nm
-+utility is normally used as in the first synopsis where
-+it takes an input file and generates three output files.
-+If the
-+.Ar infile
-+is named
-+.Pa proto.x ,
-+then
-+.Nm
-+generates a header in
-+.Pa proto.h ,
-+XDR routines in
-+.Pa proto_xdr.c ,
-+server-side stubs in
-+.Pa proto_svc.c ,
-+and client-side stubs in
-+.Pa proto_clnt.c .
-+With the
-+.Fl T
-+option,
-+it also generates the
-+.Tn RPC
-+dispatch table in
-+.Pa proto_tbl.i .
-+.Pp
-+The
-+.Nm
-+utility can also generate sample client and server files
-+that can be customized to suit a particular application.
-+The
-+.Fl \&Sc ,
-+.Fl \&Ss
-+and
-+.Fl \&Sm
-+options generate sample client, server and makefile, respectively.
-+The
-+.Fl a
-+option generates all files, including sample files.
-+If the
-+.Ar infile
-+is
-+.Pa proto.x ,
-+then the client side sample file is written to
-+.Pa proto_client.c ,
-+the server side sample file to
-+.Pa proto_server.c
-+and the sample makefile to
-+.Pa makefile.proto .
-+.Pp
-+The server created can be started both by the port monitors
-+(for example,
-+.Xr inetd 8 )
-+or by itself.
-+When it is started by a port monitor,
-+it creates servers only for the transport for which
-+the file descriptor
-+.Em 0
-+was passed.
-+The name of the transport must be specified
-+by setting up the environment variable
-+.Ev PM_TRANSPORT .
-+When the server generated by
-+.Nm
-+is executed,
-+it creates server handles for all the transports
-+specified in
-+.Ev NETPATH
-+environment variable,
-+or if it is unset,
-+it creates server handles for all the visible transports from
-+.Pa /etc/netconfig
-+file.
-+Note:
-+the transports are chosen at run time and not at compile time.
-+When the server is self-started,
-+it backgrounds itself by default.
-+A special define symbol
-+.Em RPC_SVC_FG
-+can be used to run the server process in foreground.
-+.Pp
-+The second synopsis provides special features which allow
-+for the creation of more sophisticated
-+.Tn RPC
-+servers.
-+These features include support for user provided
-+.Em #defines
-+and
-+.Tn RPC
-+dispatch tables.
-+The entries in the
-+.Tn RPC
-+dispatch table contain:
-+.Bl -bullet -offset indent -compact
-+.It
-+pointers to the service routine corresponding to that procedure,
-+.It
-+a pointer to the input and output arguments,
-+.It
-+the size of these routines.
-+.El
-+A server can use the dispatch table to check authorization
-+and then to execute the service routine;
-+a client library may use it to deal with the details of storage
-+management and XDR data conversion.
-+.Pp
-+The other three synopses shown above are used when
-+one does not want to generate all the output files,
-+but only a particular one.
-+See the
-+.Sx EXAMPLES
-+section below for examples of
-+.Nm
-+usage.
-+When
-+.Nm
-+is executed with the
-+.Fl s
-+option,
-+it creates servers for that particular class of transports.
-+When
-+executed with the
-+.Fl n
-+option,
-+it creates a server for the transport specified by
-+.Ar netid .
-+If
-+.Ar infile
-+is not specified,
-+.Nm
-+accepts the standard input.
-+.Pp
-+The C preprocessor,
-+.Em cc -E
-+is run on the input file before it is actually interpreted by
-+.Nm .
-+For each type of output file,
-+.Nm
-+defines a special preprocessor symbol for use by the
-+.Nm
-+programmer:
-+.Bl -tag -width indent
-+.It RPC_HDR
-+defined when compiling into headers
-+.It RPC_XDR
-+defined when compiling into XDR routines
-+.It RPC_SVC
-+defined when compiling into server-side stubs
-+.It RPC_CLNT
-+defined when compiling into client-side stubs
-+.It RPC_TBL
-+defined when compiling into RPC dispatch tables
-+.El
-+.Pp
-+Any line beginning with
-+.Dq %
-+is passed directly into the output file,
-+uninterpreted by
-+.Nm .
-+To specify the path name of the C preprocessor use
-+.Fl Y
-+flag.
-+.Pp
-+For every data type referred to in
-+.Ar infile ,
-+.Nm
-+assumes that there exists a
-+routine with the string
-+.Em xdr_
-+prepended to the name of the data type.
-+If this routine does not exist in the
-+.Tn RPC/XDR
-+library, it must be provided.
-+Providing an undefined data type
-+allows customization of
-+.Xr xdr 3
-+routines.
-+.Sh OPTIONS
-+The following options are available:
-+.Bl -tag -width indent
-+.It Fl a
-+Generate all files, including sample files.
-+.It Fl b
-+Backward compatibility mode.
-+Generate transport specific
-+.Tn RPC
-+code for older versions
-+of the operating system.
-+.Pp
-+Note: in
-+.Fx ,
-+this compatibility flag is turned on by
-+default since
-+.Fx
-+supports only the older
-+.Tn ONC RPC
-+library.
-+.It Fl c
-+Compile into
-+.Tn XDR
-+routines.
-+.It Fl C
-+Generate header and stub files which can be used with
-+.Tn ANSI
-+C compilers.  Headers generated with this flag can also be
-+used with C++ programs.
-+.It Fl D Ns Ar name
-+.It Fl D Ns Ar name=value
-+.\".It Fl D Ns Ar name Ns Op Ar =value
-+Define a symbol
-+.Ar name .
-+Equivalent to the
-+.Em #define
-+directive in the source.
-+If no
-+.Ar value
-+is given,
-+.Ar value
-+is defined as
-+.Em 1 .
-+This option may be specified more than once.
-+.It Fl h
-+Compile into C data-definitions (a header).
-+.Fl T
-+option can be used in conjunction to produce a
-+header which supports
-+.Tn RPC
-+dispatch tables.
-+.It Fl i Ar size
-+Size at which to start generating inline code.
-+This option is useful for optimization.
-+The default size is 5.
-+.Pp
-+Note: in order to provide backwards compatibility with the older
-+.Nm
-+on the
-+.Fx
-+platform, the default is actually 0 (which means
-+that inline code generation is disabled by default). You must specify
-+a non-zero value explicitly to override this default.
-+.It Fl I
-+Compile support for
-+.Xr inetd 8
-+in the server side stubs.
-+Such servers can be self-started or can be started by
-+.Nm inetd .
-+When the server is self-started, it backgrounds itself by default.
-+A special define symbol
-+.Em RPC_SVC_FG
-+can be used to run the
-+server process in foreground, or the user may simply compile without
-+the
-+.Fl I
-+option.
-+.Pp
-+If there are no pending client requests, the
-+.Nm inetd
-+servers exit after 120 seconds (default).
-+The default can be changed with the
-+.Fl K
-+option.
-+All the error messages for
-+.Nm inetd
-+servers
-+are always logged with
-+.Xr syslog 3 .
-+.\" .IP
-+.\" Note:
-+.\" this option is supported for backward compatibility only.
-+.\" By default,
-+.\" .B rpcgen
-+.\" generates servers that can be invoked through portmonitors.
-+.Pp
-+.It Fl K Ar seconds
-+By default, services created using
-+.Nm
-+and invoked through
-+port monitors wait 120 seconds
-+after servicing a request before exiting.
-+That interval can be changed using the
-+.Fl K
-+flag.
-+To create a server that exits immediately upon servicing a request,
-+use
-+.Fl K Ar 0 .
-+To create a server that never exits, the appropriate argument is
-+.Fl k Ar -1 .
-+.Pp
-+When monitoring for a server,
-+some portmonitors
-+.Em always
-+spawn a new process in response to a service request.
-+If it is known that a server will be used with such a monitor, the
-+server should exit immediately on completion.
-+For such servers,
-+.Nm
-+should be used with
-+.Fl K Ar 0 .
-+.It Fl l
-+Compile into client-side stubs.
-+.It Fl L
-+When the servers are started in foreground, use
-+.Xr syslog 3
-+to log the server errors instead of printing them on the standard
-+error.
-+.It Fl m
-+Compile into server-side stubs,
-+but do not generate a
-+.Qq main
-+routine.
-+This option is useful for doing callback-routines
-+and for users who need to write their own
-+.Qq main
-+routine to do initialization.
-+.It Fl M
-+Generate multithread-safe stubs for passing arguments and results between
-+rpcgen generated code and user written code.
-+This option is useful
-+for users who want to use threads in their code.
-+However, the
-+.Xr rpc_svc_calls 3
-+functions are not yet MT-safe, which means that rpcgen generated server-side
-+code will not be MT-safe.
-+.It Fl N
-+This option allows procedures to have multiple arguments.
-+It also uses the style of parameter passing that closely resembles C.
-+So, when passing an argument to a remote procedure, you do not have to
-+pass a pointer to the argument, but can pass the argument itself.
-+This behavior is different from the old style of
-+.Nm
-+generated code.
-+To maintain backward compatibility,
-+this option is not the default.
-+.It Fl n Ar netid
-+Compile into server-side stubs for the transport
-+specified by
-+.Ar netid .
-+There should be an entry for
-+.Ar netid
-+in the
-+netconfig database.
-+This option may be specified more than once,
-+so as to compile a server that serves multiple transports.
-+.It Fl o Ar outfile
-+Specify the name of the output file.
-+If none is specified,
-+standard output is used
-+(
-+.Fl c ,
-+.Fl h ,
-+.Fl l ,
-+.Fl m ,
-+.Fl n ,
-+.Fl s ,
-+.Fl \&Sc ,
-+.Fl \&Sm ,
-+.Fl \&Ss ,
-+and
-+.Fl t
-+modes only).
-+.It Fl s Ar nettype
-+Compile into server-side stubs for all the
-+transports belonging to the class
-+.Ar nettype .
-+The supported classes are
-+.Em netpath ,
-+.Em visible ,
-+.Em circuit_n ,
-+.Em circuit_v ,
-+.Em datagram_n ,
-+.Em datagram_v ,
-+.Em tcp ,
-+and
-+.Em udp
-+(see
-+.Xr rpc 3
-+for the meanings associated with these classes).
-+This option may be specified more than once.
-+Note:
-+the transports are chosen at run time and not at compile time.
-+.It Fl \&Sc
-+Generate sample client code that uses remote procedure calls.
-+.It Fl \&Sm
-+Generate a sample
-+.Pa Makefile
-+which can be used for compiling the application.
-+.It Fl \&Ss
-+Generate sample server code that uses remote procedure calls.
-+.It Fl t
-+Compile into
-+.Tn RPC
-+dispatch table.
-+.It Fl T
-+Generate the code to support
-+.Tn RPC
-+dispatch tables.
-+.Pp
-+The options
-+.Fl c ,
-+.Fl h ,
-+.Fl l ,
-+.Fl m ,
-+.Fl s ,
-+.Fl \&Sc ,
-+.Fl \&Sm ,
-+.Fl \&Ss ,
-+and
-+.Fl t
-+are used exclusively to generate a particular type of file,
-+while the options
-+.Fl D
-+and
-+.Fl T
-+are global and can be used with the other options.
-+.It Fl Y Ar pathname
-+Give the name of the directory where
-+.Nm
-+will start looking for the C-preprocessor.
-+.El
-+.Sh EXAMPLES
-+The following example:
-+.Dl example% rpcgen -T prot.x
-+.Pp
-+generates all the five files:
-+.Pa prot.h ,
-+.Pa prot_clnt.c ,
-+.Pa prot_svc.c ,
-+.Pa prot_xdr.c
-+and
-+.Pa prot_tbl.i .
-+.Pp
-+The following example sends the C data-definitions (header)
-+to the standard output.
-+.Dl example% rpcgen -h prot.x
-+.Pp
-+To send the test version of the
-+.Fl D Ns Ar TEST ,
-+server side stubs for
-+all the transport belonging to the class
-+.Ar datagram_n
-+to standard output, use:
-+.Dl example% rpcgen -s datagram_n -DTEST prot.x
-+.Pp
-+To create the server side stubs for the transport indicated
-+by
-+.Ar netid
-+tcp,
-+use:
-+.Dl example% rpcgen -n tcp -o prot_svc.c prot.x
-+.Sh SEE ALSO
-+.Xr cc 1 ,
-+.Xr rpc 3 ,
-+.Xr syslog 3 ,
-+.Xr inetd 8
-+.\" .BR rpc_svc_calls (3)
-+.Rs
-+.%T The rpcgen chapter in the NETP manual
-+.Re
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch b/bsp/buildroot/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch
new file mode 100644
index 00000000..2712f53c
--- /dev/null
+++ b/bsp/buildroot/package/libtirpc/0003-Automatically-generate-XDR-header-files-from-.x-sour.patch
@@ -0,0 +1,1001 @@
+From 001e3f26dc80b8f21bed7d9b5872fe10e8b4af04 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Nov 2012 17:29:53 +0100
+Subject: [PATCH] Automatically generate XDR header files from .x sources using
+ rpcgen
+
+[Gustavo: update after dropping non-IPv6 support]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[yann.morin.1998@free.fr: update for 0.3.1]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[baruch: use external rpcgen]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ Makefile.am           |  16 +-
+ src/Makefile.am       |   2 +-
+ tirpc/rpc/rpcb_prot.h | 797 ------------------------------------------
+ tirpc/rpcsvc/crypt.h  | 109 ------
+ 4 files changed, 14 insertions(+), 910 deletions(-)
+ delete mode 100644 tirpc/rpc/rpcb_prot.h
+ delete mode 100644 tirpc/rpcsvc/crypt.h
+
+diff --git a/Makefile.am b/Makefile.am
+index 3f6063771faf..368fb8a1aed2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,9 @@
+ SUBDIRS = src man doc
+ ACLOCAL_AMFLAGS = -I m4
+ 
++GENFILES	       = tirpc/rpcsvc/crypt.h \
++			 tirpc/rpc/rpcb_prot.h
++
+ noinst_HEADERS	       = tirpc/reentrant.h \
+ 			 tirpc/getpeereid.h \
+ 			 tirpc/libc_private.h \
+@@ -8,7 +11,6 @@ noinst_HEADERS	       = tirpc/reentrant.h \
+ 
+ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpcsvc/crypt.x \
+-			 tirpc/rpcsvc/crypt.h \
+ 			 tirpc/rpc/xdr.h \
+ 			 tirpc/rpc/types.h \
+ 			 tirpc/rpc/svc_soc.h \
+@@ -21,7 +23,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \
+ 			 tirpc/rpc/rpcent.h \
+ 			 tirpc/rpc/rpc_com.h \
+ 			 tirpc/rpc/rpcb_prot.x \
+-			 tirpc/rpc/rpcb_prot.h \
+ 			 tirpc/rpc/rpcb_clnt.h \
+ 			 tirpc/rpc/raw.h \
+ 			 tirpc/rpc/pmap_rmt.h \
+@@ -48,5 +49,14 @@ endif
+ pkgconfigdir=$(libdir)/pkgconfig
+ pkgconfig_DATA = libtirpc.pc
+ 
+-CLEANFILES	       = cscope.* *~
++nobase_nodist_include_HEADERS = $(GENFILES)
++BUILT_SOURCES = $(GENFILES)
++
++$(GENFILES): %.h: %.x
++	mkdir -p $(dir $@)
++	rpcgen -h -o $@ $<
++
++force:
++
++CLEANFILES	       = cscope.* *~ $(GENFILES)
+ DISTCLEANFILES	       = Makefile.in libtirpc*.tar.gz
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2af40f16d03a..0b7e23835c36 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@
+ noinst_HEADERS = rpc_com.h debug.h
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/tirpc -include config.h -DPORTMAP -DINET6 \
+-		-D_GNU_SOURCE -Wall -pipe
++		-D_GNU_SOURCE -Wall -pipe -I$(top_builddir)/tirpc
+ 
+ lib_LTLIBRARIES = libtirpc.la
+ 
+diff --git a/tirpc/rpc/rpcb_prot.h b/tirpc/rpc/rpcb_prot.h
+deleted file mode 100644
+index 7ae48b805370..000000000000
+--- a/tirpc/rpc/rpcb_prot.h
++++ /dev/null
+@@ -1,797 +0,0 @@
+-/*
+- * Please do not edit this file.
+- * It was generated using rpcgen.
+- */
+-
+-#ifndef _RPCB_PROT_H_RPCGEN
+-#define _RPCB_PROT_H_RPCGEN
+-
+-#include <rpc/rpc.h>
+-
+-#ifndef IXDR_GET_INT32
+-#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_INT32
+-#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
+-#endif
+-#ifndef IXDR_GET_U_INT32
+-#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_U_INT32
+-#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
+-#endif
+-/*
+- * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
+- *
+- * Copyright (c) 2009, Sun Microsystems, Inc.
+- * All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions are met:
+- * - Redistributions of source code must retain the above copyright notice,
+- *   this list of conditions and the following disclaimer.
+- * - Redistributions in binary form must reproduce the above copyright notice,
+- *   this list of conditions and the following disclaimer in the documentation
+- *   and/or other materials provided with the distribution.
+- * - Neither the name of Sun Microsystems, Inc. nor the names of its
+- *   contributors may be used to endorse or promote products derived
+- *   from this software without specific prior written permission.
+- *
+- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+- * POSSIBILITY OF SUCH DAMAGE.
+- */
+-/*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
+- */
+-/* from rpcb_prot.x */
+-
+-/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
+-
+-#ifndef _KERNEL
+-
+-
+-/*
+- * The following procedures are supported by the protocol in version 3:
+- *
+- * RPCBPROC_NULL() returns ()
+- * 	takes nothing, returns nothing
+- *
+- * RPCBPROC_SET(rpcb) returns (bool_t)
+- * 	TRUE is success, FALSE is failure.  Registers the tuple
+- *	[prog, vers, address, owner, netid].
+- *	Finds out owner and netid information on its own.
+- *
+- * RPCBPROC_UNSET(rpcb) returns (bool_t)
+- *	TRUE is success, FALSE is failure.  Un-registers tuple
+- *	[prog, vers, netid].  addresses is ignored.
+- *	If netid is NULL, unregister all.
+- *
+- * RPCBPROC_GETADDR(rpcb) returns (string).
+- *	0 is failure.  Otherwise returns the universal address where the
+- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
+- *
+- * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
+- *	used to dump the entire rpcbind maps
+- *
+- * RPCBPROC_CALLIT(rpcb_rmtcallargs)
+- * 	RETURNS (rpcb_rmtcallres);
+- * 	Calls the procedure on the remote machine.  If it is not registered,
+- *	this procedure is quiet; i.e. it does not return error information!!!
+- *	This routine only passes null authentication parameters.
+- *	It has no interface to xdr routines for RPCBPROC_CALLIT.
+- *
+- * RPCBPROC_GETTIME() returns (int).
+- *	Gets the remote machines time
+- *
+- * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
+- *	Returns the netbuf address from universal address.
+- *
+- * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
+- *	Returns the universal address from netbuf address.
+- *
+- * END OF RPCBIND VERSION 3 PROCEDURES
+- */
+-/*
+- * Except for RPCBPROC_CALLIT, the procedures above are carried over to
+- * rpcbind version 4.  Those below are added or modified for version 4.
+- * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
+- * AS RPCBPROC_CALLIT.
+- *
+- * RPCBPROC_BCAST(rpcb_rmtcallargs)
+- * 	RETURNS (rpcb_rmtcallres);
+- * 	Calls the procedure on the remote machine.  If it is not registered,
+- *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
+- *	This routine should be used for broadcasting and nothing else.
+- *
+- * RPCBPROC_GETVERSADDR(rpcb) returns (string).
+- *	0 is failure.  Otherwise returns the universal address where the
+- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
+- *	Same as RPCBPROC_GETADDR except that if the given version number
+- *	is not available, the address is not returned.
+- *
+- * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
+- * 	RETURNS (rpcb_rmtcallres);
+- * 	Calls the procedure on the remote machine.  If it is not registered,
+- *	this procedure is NOT quiet; i.e. it DOES return error information!!!
+- * 	as any normal application would expect.
+- *
+- * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
+- *	Same as RPCBPROC_GETADDR except that it returns a list of all the
+- *	addresses registered for the combination (prog, vers) (for all
+- *	transports).
+- *
+- * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
+- *	Returns the statistics about the kind of requests received by rpcbind.
+- */
+-
+-/*
+- * A mapping of (program, version, network ID) to address
+- */
+-
+-struct rpcb {
+-	rpcprog_t r_prog;
+-	rpcvers_t r_vers;
+-	char *r_netid;
+-	char *r_addr;
+-	char *r_owner;
+-};
+-typedef struct rpcb rpcb;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb(XDR *, rpcb*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb(XDR *, rpcb*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcb RPCB;
+-
+-
+-/*
+- * A list of mappings
+- *
+- * Below are two definitions for the rpcblist structure.  This is done because
+- * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
+- * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
+- * structure (actually called rp__list) is used with rpcgen, and the other is
+- * defined only in the header file for compatibility with the specified
+- * interface.
+- */
+-
+-struct rp__list {
+-	rpcb rpcb_map;
+-	struct rp__list *rpcb_next;
+-};
+-typedef struct rp__list rp__list;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rp__list(XDR *, rp__list*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rp__list(XDR *, rp__list*);
+-#else /* Old Style C */ 
+-bool_t xdr_rp__list();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rp__list *rpcblist_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcblist_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-typedef struct rp__list rpcblist;
+-typedef struct rp__list RPCBLIST;
+-
+-#ifndef __cplusplus
+-struct rpcblist {
+- RPCB rpcb_map;
+- struct rpcblist *rpcb_next;
+-};
+-#endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-extern bool_t xdr_rpcblist(XDR *, rpcblist**);
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-
+-/*
+- * Arguments of remote calls
+- */
+-
+-struct rpcb_rmtcallargs {
+-	rpcprog_t prog;
+-	rpcvers_t vers;
+-	rpcproc_t proc;
+-	struct {
+-		u_int args_len;
+-		char *args_val;
+-	} args;
+-};
+-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_rmtcallargs();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * Client-side only representation of rpcb_rmtcallargs structure.
+- *
+- * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
+- * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
+- * be passed the XDR routine that knows the args' structure.  This routine
+- * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
+- * the application being called already knows the args structure.  So we use a
+- * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
+- * includes the args' XDR routine.
+- */
+-struct r_rpcb_rmtcallargs {
+- rpcprog_t prog;
+- rpcvers_t vers;
+- rpcproc_t proc;
+- struct {
+- u_int args_len;
+- char *args_val;
+- } args;
+- xdrproc_t xdr_args; /* encodes args */
+-};
+-
+-
+-/*
+- * Results of the remote call
+- */
+-
+-struct rpcb_rmtcallres {
+-	char *addr;
+-	struct {
+-		u_int results_len;
+-		char *results_val;
+-	} results;
+-};
+-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_rmtcallres();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * Client-side only representation of rpcb_rmtcallres structure.
+- */
+-struct r_rpcb_rmtcallres {
+- char *addr;
+- struct {
+- u_int32_t results_len;
+- char *results_val;
+- } results;
+- xdrproc_t xdr_res; /* decodes results */
+-};
+-
+-/*
+- * rpcb_entry contains a merged address of a service on a particular
+- * transport, plus associated netconfig information.  A list of rpcb_entrys
+- * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
+- * in r_nc_* fields.
+- */
+-
+-struct rpcb_entry {
+-	char *r_maddr;
+-	char *r_nc_netid;
+-	u_int r_nc_semantics;
+-	char *r_nc_protofmly;
+-	char *r_nc_proto;
+-};
+-typedef struct rpcb_entry rpcb_entry;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_entry();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * A list of addresses supported by a service.
+- */
+-
+-struct rpcb_entry_list {
+-	rpcb_entry rpcb_entry_map;
+-	struct rpcb_entry_list *rpcb_entry_next;
+-};
+-typedef struct rpcb_entry_list rpcb_entry_list;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_entry_list();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcb_entry_list *rpcb_entry_list_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_entry_list_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * rpcbind statistics
+- */
+-
+-#define rpcb_highproc_2 RPCBPROC_CALLIT
+-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
+-#define rpcb_highproc_4 RPCBPROC_GETSTAT
+-#define RPCBSTAT_HIGHPROC 13
+-#define RPCBVERS_STAT 3
+-#define RPCBVERS_4_STAT 2
+-#define RPCBVERS_3_STAT 1
+-#define RPCBVERS_2_STAT 0
+-
+-/* Link list of all the stats about getport and getaddr */
+-
+-struct rpcbs_addrlist {
+-	rpcprog_t prog;
+-	rpcvers_t vers;
+-	int success;
+-	int failure;
+-	char *netid;
+-	struct rpcbs_addrlist *next;
+-};
+-typedef struct rpcbs_addrlist rpcbs_addrlist;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_addrlist();
+-#endif /* Old Style C */ 
+-
+-
+-/* Link list of all the stats about rmtcall */
+-
+-struct rpcbs_rmtcalllist {
+-	rpcprog_t prog;
+-	rpcvers_t vers;
+-	rpcproc_t proc;
+-	int success;
+-	int failure;
+-	int indirect;
+-	char *netid;
+-	struct rpcbs_rmtcalllist *next;
+-};
+-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_rmtcalllist();
+-#endif /* Old Style C */ 
+-
+-
+-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_proc();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_addrlist_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcbs_rmtcalllist_ptr();
+-#endif /* Old Style C */ 
+-
+-
+-struct rpcb_stat {
+-	rpcbs_proc info;
+-	int setinfo;
+-	int unsetinfo;
+-	rpcbs_addrlist_ptr addrinfo;
+-	rpcbs_rmtcalllist_ptr rmtinfo;
+-};
+-typedef struct rpcb_stat rpcb_stat;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_stat();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * One rpcb_stat structure is returned for each version of rpcbind
+- * being monitored.
+- */
+-
+-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
+-#elif __STDC__ 
+-extern  bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
+-#else /* Old Style C */ 
+-bool_t xdr_rpcb_stat_byvers();
+-#endif /* Old Style C */ 
+-
+-
+-/*
+- * We don't define netbuf in RPCL, since it would contain structure member
+- * names that would conflict with the definition of struct netbuf in
+- * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
+- * and implement it ourselves in rpc/rpcb_prot.c.
+- */
+-#ifdef __cplusplus
+-extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
+-
+-#else /* __STDC__ */
+-extern bool_t xdr_netbuf(XDR *, struct netbuf *);
+-
+-#endif
+-
+-#define RPCBVERS_3 RPCBVERS
+-#define RPCBVERS_4 RPCBVERS4
+-
+-#define _PATH_RPCBINDSOCK "/var/run/rpcbind.sock"
+-
+-#else /* ndef _KERNEL */
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-/*
+- * A mapping of (program, version, network ID) to address
+- */
+-struct rpcb {
+- rpcprog_t r_prog; /* program number */
+- rpcvers_t r_vers; /* version number */
+- char *r_netid; /* network id */
+- char *r_addr; /* universal address */
+- char *r_owner; /* owner of the mapping */
+-};
+-typedef struct rpcb RPCB;
+-
+-/*
+- * A list of mappings
+- */
+-struct rpcblist {
+- RPCB rpcb_map;
+- struct rpcblist *rpcb_next;
+-};
+-typedef struct rpcblist RPCBLIST;
+-typedef struct rpcblist *rpcblist_ptr;
+-
+-/*
+- * Remote calls arguments
+- */
+-struct rpcb_rmtcallargs {
+- rpcprog_t prog; /* program number */
+- rpcvers_t vers; /* version number */
+- rpcproc_t proc; /* procedure number */
+- u_int32_t arglen; /* arg len */
+- caddr_t args_ptr; /* argument */
+- xdrproc_t xdr_args; /* XDR routine for argument */
+-};
+-typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
+-
+-/*
+- * Remote calls results
+- */
+-struct rpcb_rmtcallres {
+- char *addr_ptr; /* remote universal address */
+- u_int32_t resultslen; /* results length */
+- caddr_t results_ptr; /* results */
+- xdrproc_t xdr_results; /* XDR routine for result */
+-};
+-typedef struct rpcb_rmtcallres rpcb_rmtcallres;
+-
+-struct rpcb_entry {
+- char *r_maddr;
+- char *r_nc_netid;
+- unsigned int r_nc_semantics;
+- char *r_nc_protofmly;
+- char *r_nc_proto;
+-};
+-typedef struct rpcb_entry rpcb_entry;
+-
+-/*
+- * A list of addresses supported by a service.
+- */
+-
+-struct rpcb_entry_list {
+- rpcb_entry rpcb_entry_map;
+- struct rpcb_entry_list *rpcb_entry_next;
+-};
+-typedef struct rpcb_entry_list rpcb_entry_list;
+-
+-typedef rpcb_entry_list *rpcb_entry_list_ptr;
+-
+-/*
+- * rpcbind statistics
+- */
+-
+-#define rpcb_highproc_2 RPCBPROC_CALLIT
+-#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
+-#define rpcb_highproc_4 RPCBPROC_GETSTAT
+-#define RPCBSTAT_HIGHPROC 13
+-#define RPCBVERS_STAT 3
+-#define RPCBVERS_4_STAT 2
+-#define RPCBVERS_3_STAT 1
+-#define RPCBVERS_2_STAT 0
+-
+-/* Link list of all the stats about getport and getaddr */
+-
+-struct rpcbs_addrlist {
+- rpcprog_t prog;
+- rpcvers_t vers;
+- int success;
+- int failure;
+- char *netid;
+- struct rpcbs_addrlist *next;
+-};
+-typedef struct rpcbs_addrlist rpcbs_addrlist;
+-
+-/* Link list of all the stats about rmtcall */
+-
+-struct rpcbs_rmtcalllist {
+- rpcprog_t prog;
+- rpcvers_t vers;
+- rpcproc_t proc;
+- int success;
+- int failure;
+- int indirect;
+- char *netid;
+- struct rpcbs_rmtcalllist *next;
+-};
+-typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
+-
+-typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
+-
+-typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
+-
+-typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
+-
+-struct rpcb_stat {
+- rpcbs_proc info;
+- int setinfo;
+- int unsetinfo;
+- rpcbs_addrlist_ptr addrinfo;
+- rpcbs_rmtcalllist_ptr rmtinfo;
+-};
+-typedef struct rpcb_stat rpcb_stat;
+-
+-/*
+- * One rpcb_stat structure is returned for each version of rpcbind
+- * being monitored.
+- */
+-
+-typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+-#endif /* ndef _KERNEL */
+-
+-#define RPCBPROG ((u_int32_t)100000)
+-#define RPCBVERS ((u_int32_t)3)
+-
+-#ifdef __cplusplus
+-#define RPCBPROC_SET ((u_int32_t)1)
+-extern "C" bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_UNSET ((u_int32_t)2)
+-extern "C" bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETADDR ((u_int32_t)3)
+-extern "C" char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
+-extern "C" char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_DUMP ((u_int32_t)4)
+-extern "C" rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
+-extern "C" rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_CALLIT ((u_int32_t)5)
+-extern "C" rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
+-extern "C" rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETTIME ((u_int32_t)6)
+-extern "C" u_int * rpcbproc_gettime_3(void *, CLIENT *);
+-extern "C" u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
+-#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
+-extern "C" char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
+-extern "C" char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
+-
+-#elif __STDC__
+-#define RPCBPROC_SET ((u_int32_t)1)
+-extern  bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_UNSET ((u_int32_t)2)
+-extern  bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETADDR ((u_int32_t)3)
+-extern  char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
+-extern  char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_DUMP ((u_int32_t)4)
+-extern  rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
+-extern  rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_CALLIT ((u_int32_t)5)
+-extern  rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
+-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETTIME ((u_int32_t)6)
+-extern  u_int * rpcbproc_gettime_3(void *, CLIENT *);
+-extern  u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
+-#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
+-#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
+-extern  char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
+-extern  char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
+-
+-#else /* Old Style C */ 
+-#define RPCBPROC_SET ((u_int32_t)1)
+-extern  bool_t * rpcbproc_set_3();
+-extern  bool_t * rpcbproc_set_3_svc();
+-#define RPCBPROC_UNSET ((u_int32_t)2)
+-extern  bool_t * rpcbproc_unset_3();
+-extern  bool_t * rpcbproc_unset_3_svc();
+-#define RPCBPROC_GETADDR ((u_int32_t)3)
+-extern  char ** rpcbproc_getaddr_3();
+-extern  char ** rpcbproc_getaddr_3_svc();
+-#define RPCBPROC_DUMP ((u_int32_t)4)
+-extern  rpcblist_ptr * rpcbproc_dump_3();
+-extern  rpcblist_ptr * rpcbproc_dump_3_svc();
+-#define RPCBPROC_CALLIT ((u_int32_t)5)
+-extern  rpcb_rmtcallres * rpcbproc_callit_3();
+-extern  rpcb_rmtcallres * rpcbproc_callit_3_svc();
+-#define RPCBPROC_GETTIME ((u_int32_t)6)
+-extern  u_int * rpcbproc_gettime_3();
+-extern  u_int * rpcbproc_gettime_3_svc();
+-#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3();
+-extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc();
+-#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
+-extern  char ** rpcbproc_taddr2uaddr_3();
+-extern  char ** rpcbproc_taddr2uaddr_3_svc();
+-#endif /* Old Style C */ 
+-#define RPCBVERS4 ((u_int32_t)4)
+-
+-#ifdef __cplusplus
+-extern "C" bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
+-extern "C" bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
+-extern "C" bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
+-extern "C" char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
+-extern "C" char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
+-extern "C" rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
+-extern "C" rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
+-#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
+-extern "C" rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
+-extern "C" rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-extern "C" u_int * rpcbproc_gettime_4(void *, CLIENT *);
+-extern "C" u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
+-extern "C" struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
+-extern "C" char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
+-extern "C" char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
+-#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
+-extern "C" char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
+-extern "C" char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_INDIRECT ((u_int32_t)10)
+-extern "C" rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
+-extern "C" rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
+-extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
+-extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETSTAT ((u_int32_t)12)
+-extern "C" rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
+-extern "C" rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
+-
+-#elif __STDC__
+-extern  bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
+-extern  bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
+-extern  bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
+-extern  char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
+-extern  char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
+-extern  rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
+-extern  rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
+-#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-extern  u_int * rpcbproc_gettime_4(void *, CLIENT *);
+-extern  u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
+-extern  char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
+-extern  char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
+-#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
+-extern  char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
+-extern  char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_INDIRECT ((u_int32_t)10)
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
+-#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
+-#define RPCBPROC_GETSTAT ((u_int32_t)12)
+-extern  rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
+-extern  rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
+-
+-#else /* Old Style C */ 
+-extern  bool_t * rpcbproc_set_4();
+-extern  bool_t * rpcbproc_set_4_svc();
+-extern  bool_t * rpcbproc_unset_4();
+-extern  bool_t * rpcbproc_unset_4_svc();
+-extern  char ** rpcbproc_getaddr_4();
+-extern  char ** rpcbproc_getaddr_4_svc();
+-extern  rpcblist_ptr * rpcbproc_dump_4();
+-extern  rpcblist_ptr * rpcbproc_dump_4_svc();
+-#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4();
+-extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc();
+-extern  u_int * rpcbproc_gettime_4();
+-extern  u_int * rpcbproc_gettime_4_svc();
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4();
+-extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc();
+-extern  char ** rpcbproc_taddr2uaddr_4();
+-extern  char ** rpcbproc_taddr2uaddr_4_svc();
+-#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
+-extern  char ** rpcbproc_getversaddr_4();
+-extern  char ** rpcbproc_getversaddr_4_svc();
+-#define RPCBPROC_INDIRECT ((u_int32_t)10)
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4();
+-extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc();
+-#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4();
+-extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc();
+-#define RPCBPROC_GETSTAT ((u_int32_t)12)
+-extern  rpcb_stat * rpcbproc_getstat_4();
+-extern  rpcb_stat * rpcbproc_getstat_4_svc();
+-#endif /* Old Style C */ 
+-
+-#endif /* !_RPCB_PROT_H_RPCGEN */
+diff --git a/tirpc/rpcsvc/crypt.h b/tirpc/rpcsvc/crypt.h
+deleted file mode 100644
+index da1f9ccb56ea..000000000000
+--- a/tirpc/rpcsvc/crypt.h
++++ /dev/null
+@@ -1,109 +0,0 @@
+-/*
+- * Please do not edit this file.
+- * It was generated using rpcgen.
+- */
+-
+-#ifndef _CRYPT_H_RPCGEN
+-#define _CRYPT_H_RPCGEN
+-
+-#include <rpc/rpc.h>
+-
+-#ifndef IXDR_GET_INT32
+-#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_INT32
+-#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
+-#endif
+-#ifndef IXDR_GET_U_INT32
+-#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
+-#endif
+-#ifndef IXDR_PUT_U_INT32
+-#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
+-#endif
+-
+-enum des_dir {
+-	ENCRYPT_DES = 0,
+-	DECRYPT_DES = 1,
+-};
+-typedef enum des_dir des_dir;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_des_dir(XDR *, des_dir*);
+-#elif __STDC__ 
+-extern  bool_t xdr_des_dir(XDR *, des_dir*);
+-#else /* Old Style C */ 
+-bool_t xdr_des_dir();
+-#endif /* Old Style C */ 
+-
+-
+-enum des_mode {
+-	CBC_DES = 0,
+-	ECB_DES = 1,
+-};
+-typedef enum des_mode des_mode;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_des_mode(XDR *, des_mode*);
+-#elif __STDC__ 
+-extern  bool_t xdr_des_mode(XDR *, des_mode*);
+-#else /* Old Style C */ 
+-bool_t xdr_des_mode();
+-#endif /* Old Style C */ 
+-
+-
+-struct desargs {
+-	u_char des_key[8];
+-	des_dir des_dir;
+-	des_mode des_mode;
+-	u_char des_ivec[8];
+-	struct {
+-		u_int desbuf_len;
+-		char *desbuf_val;
+-	} desbuf;
+-};
+-typedef struct desargs desargs;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_desargs(XDR *, desargs*);
+-#elif __STDC__ 
+-extern  bool_t xdr_desargs(XDR *, desargs*);
+-#else /* Old Style C */ 
+-bool_t xdr_desargs();
+-#endif /* Old Style C */ 
+-
+-
+-struct desresp {
+-	struct {
+-		u_int desbuf_len;
+-		char *desbuf_val;
+-	} desbuf;
+-	u_char des_ivec[8];
+-	int stat;
+-};
+-typedef struct desresp desresp;
+-#ifdef __cplusplus 
+-extern "C" bool_t xdr_desresp(XDR *, desresp*);
+-#elif __STDC__ 
+-extern  bool_t xdr_desresp(XDR *, desresp*);
+-#else /* Old Style C */ 
+-bool_t xdr_desresp();
+-#endif /* Old Style C */ 
+-
+-
+-#define CRYPT_PROG ((u_int32_t)600100029)
+-#define CRYPT_VERS ((u_int32_t)1)
+-
+-#ifdef __cplusplus
+-#define DES_CRYPT ((u_int32_t)1)
+-extern "C" desresp * des_crypt_1(desargs *, CLIENT *);
+-extern "C" desresp * des_crypt_1_svc(desargs *, struct svc_req *);
+-
+-#elif __STDC__
+-#define DES_CRYPT ((u_int32_t)1)
+-extern  desresp * des_crypt_1(desargs *, CLIENT *);
+-extern  desresp * des_crypt_1_svc(desargs *, struct svc_req *);
+-
+-#else /* Old Style C */ 
+-#define DES_CRYPT ((u_int32_t)1)
+-extern  desresp * des_crypt_1();
+-extern  desresp * des_crypt_1_svc();
+-#endif /* Old Style C */ 
+-
+-#endif /* !_CRYPT_H_RPCGEN */
+-- 
+2.17.0
+
diff --git a/bsp/buildroot/package/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/bsp/buildroot/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
similarity index 100%
rename from bsp/buildroot/package/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
rename to bsp/buildroot/package/libtirpc/0004-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch
diff --git a/bsp/buildroot/package/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch b/bsp/buildroot/package/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch
deleted file mode 100644
index e302c5d1..00000000
--- a/bsp/buildroot/package/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch
+++ /dev/null
@@ -1,1002 +0,0 @@
-From eba198c27f2b8d3f0b27ea4a42f3dc79d397440c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 10 Nov 2012 17:29:53 +0100
-Subject: [PATCH] Automatically generate XDR header files from .x sources using
- rpcgen
-
-[Gustavo: update after dropping non-IPv6 support]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-[yann.morin.1998@free.fr: update for 0.3.1]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- Makefile.am           |  19 +-
- src/Makefile.am       |   2 +-
- tirpc/rpc/rpcb_prot.h | 797 --------------------------------------------------
- tirpc/rpcsvc/crypt.h  | 109 -------
- 4 files changed, 17 insertions(+), 910 deletions(-)
- delete mode 100644 tirpc/rpc/rpcb_prot.h
- delete mode 100644 tirpc/rpcsvc/crypt.h
-
-diff --git a/Makefile.am b/Makefile.am
-index 8558289..aa5908e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,9 @@
- SUBDIRS = src man doc rpcgen
- ACLOCAL_AMFLAGS = -I m4
- 
-+GENFILES	       = tirpc/rpcsvc/crypt.h \
-+			 tirpc/rpc/rpcb_prot.h
-+
- noinst_HEADERS	       = tirpc/reentrant.h \
- 			 tirpc/getpeereid.h \
- 			 tirpc/libc_private.h \
-@@ -8,7 +11,6 @@ noinst_HEADERS	       = tirpc/reentrant.h \
- 
- nobase_include_HEADERS = tirpc/netconfig.h \
- 			 tirpc/rpcsvc/crypt.x \
--			 tirpc/rpcsvc/crypt.h \
- 			 tirpc/rpc/xdr.h \
- 			 tirpc/rpc/types.h \
- 			 tirpc/rpc/svc_soc.h \
-@@ -20,7 +22,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \
- 			 tirpc/rpc/rpcent.h \
- 			 tirpc/rpc/rpc_com.h \
- 			 tirpc/rpc/rpcb_prot.x \
--			 tirpc/rpc/rpcb_prot.h \
- 			 tirpc/rpc/rpcb_clnt.h \
- 			 tirpc/rpc/raw.h \
- 			 tirpc/rpc/pmap_rmt.h \
-@@ -51,5 +52,17 @@ endif
- pkgconfigdir=$(libdir)/pkgconfig
- pkgconfig_DATA = libtirpc.pc
- 
--CLEANFILES	       = cscope.* *~
-+nobase_nodist_include_HEADERS = $(GENFILES)
-+BUILT_SOURCES = $(GENFILES)
-+
-+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen
-+	mkdir -p $(dir $@)
-+	$(top_builddir)/rpcgen/rpcgen -h -o $@ $<
-+
-+$(top_builddir)/rpcgen/rpcgen: force
-+	cd rpcgen && $(MAKE)
-+
-+force:
-+
-+CLEANFILES	       = cscope.* *~ $(GENFILES)
- DISTCLEANFILES	       = Makefile.in libtirpc*.tar.gz
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7428e92..0356171 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,7 +8,7 @@
- noinst_HEADERS = rpc_com.h debug.h
- 
- AM_CPPFLAGS = -I$(top_srcdir)/tirpc -include config.h -DPORTMAP -DINET6 \
--		-D_GNU_SOURCE -Wall -pipe
-+		-D_GNU_SOURCE -Wall -pipe -I$(top_builddir)/tirpc
- 
- lib_LTLIBRARIES = libtirpc.la
- 
-diff --git a/tirpc/rpc/rpcb_prot.h b/tirpc/rpc/rpcb_prot.h
-deleted file mode 100644
-index 7ae48b8..0000000
---- a/tirpc/rpc/rpcb_prot.h
-+++ /dev/null
-@@ -1,797 +0,0 @@
--/*
-- * Please do not edit this file.
-- * It was generated using rpcgen.
-- */
--
--#ifndef _RPCB_PROT_H_RPCGEN
--#define _RPCB_PROT_H_RPCGEN
--
--#include <rpc/rpc.h>
--
--#ifndef IXDR_GET_INT32
--#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
--#endif
--#ifndef IXDR_PUT_INT32
--#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
--#endif
--#ifndef IXDR_GET_U_INT32
--#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
--#endif
--#ifndef IXDR_PUT_U_INT32
--#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
--#endif
--/*
-- * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $
-- *
-- * Copyright (c) 2009, Sun Microsystems, Inc.
-- * All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions are met:
-- * - Redistributions of source code must retain the above copyright notice,
-- *   this list of conditions and the following disclaimer.
-- * - Redistributions in binary form must reproduce the above copyright notice,
-- *   this list of conditions and the following disclaimer in the documentation
-- *   and/or other materials provided with the distribution.
-- * - Neither the name of Sun Microsystems, Inc. nor the names of its
-- *   contributors may be used to endorse or promote products derived
-- *   from this software without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-- * POSSIBILITY OF SUCH DAMAGE.
-- */
--/*
-- * Copyright (c) 1988 by Sun Microsystems, Inc.
-- */
--/* from rpcb_prot.x */
--
--/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
--
--#ifndef _KERNEL
--
--
--/*
-- * The following procedures are supported by the protocol in version 3:
-- *
-- * RPCBPROC_NULL() returns ()
-- * 	takes nothing, returns nothing
-- *
-- * RPCBPROC_SET(rpcb) returns (bool_t)
-- * 	TRUE is success, FALSE is failure.  Registers the tuple
-- *	[prog, vers, address, owner, netid].
-- *	Finds out owner and netid information on its own.
-- *
-- * RPCBPROC_UNSET(rpcb) returns (bool_t)
-- *	TRUE is success, FALSE is failure.  Un-registers tuple
-- *	[prog, vers, netid].  addresses is ignored.
-- *	If netid is NULL, unregister all.
-- *
-- * RPCBPROC_GETADDR(rpcb) returns (string).
-- *	0 is failure.  Otherwise returns the universal address where the
-- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
-- *
-- * RPCBPROC_DUMP() RETURNS (rpcblist_ptr)
-- *	used to dump the entire rpcbind maps
-- *
-- * RPCBPROC_CALLIT(rpcb_rmtcallargs)
-- * 	RETURNS (rpcb_rmtcallres);
-- * 	Calls the procedure on the remote machine.  If it is not registered,
-- *	this procedure is quiet; i.e. it does not return error information!!!
-- *	This routine only passes null authentication parameters.
-- *	It has no interface to xdr routines for RPCBPROC_CALLIT.
-- *
-- * RPCBPROC_GETTIME() returns (int).
-- *	Gets the remote machines time
-- *
-- * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf)
-- *	Returns the netbuf address from universal address.
-- *
-- * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string)
-- *	Returns the universal address from netbuf address.
-- *
-- * END OF RPCBIND VERSION 3 PROCEDURES
-- */
--/*
-- * Except for RPCBPROC_CALLIT, the procedures above are carried over to
-- * rpcbind version 4.  Those below are added or modified for version 4.
-- * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER
-- * AS RPCBPROC_CALLIT.
-- *
-- * RPCBPROC_BCAST(rpcb_rmtcallargs)
-- * 	RETURNS (rpcb_rmtcallres);
-- * 	Calls the procedure on the remote machine.  If it is not registered,
-- *	this procedure IS quiet; i.e. it DOES NOT return error information!!!
-- *	This routine should be used for broadcasting and nothing else.
-- *
-- * RPCBPROC_GETVERSADDR(rpcb) returns (string).
-- *	0 is failure.  Otherwise returns the universal address where the
-- *	triple [prog, vers, netid] is registered.  Ignore address and owner.
-- *	Same as RPCBPROC_GETADDR except that if the given version number
-- *	is not available, the address is not returned.
-- *
-- * RPCBPROC_INDIRECT(rpcb_rmtcallargs)
-- * 	RETURNS (rpcb_rmtcallres);
-- * 	Calls the procedure on the remote machine.  If it is not registered,
-- *	this procedure is NOT quiet; i.e. it DOES return error information!!!
-- * 	as any normal application would expect.
-- *
-- * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr).
-- *	Same as RPCBPROC_GETADDR except that it returns a list of all the
-- *	addresses registered for the combination (prog, vers) (for all
-- *	transports).
-- *
-- * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers)
-- *	Returns the statistics about the kind of requests received by rpcbind.
-- */
--
--/*
-- * A mapping of (program, version, network ID) to address
-- */
--
--struct rpcb {
--	rpcprog_t r_prog;
--	rpcvers_t r_vers;
--	char *r_netid;
--	char *r_addr;
--	char *r_owner;
--};
--typedef struct rpcb rpcb;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb(XDR *, rpcb*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb(XDR *, rpcb*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb();
--#endif /* Old Style C */ 
--
--
--typedef rpcb RPCB;
--
--
--/*
-- * A list of mappings
-- *
-- * Below are two definitions for the rpcblist structure.  This is done because
-- * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a
-- * struct rpcblist * that rpcgen would produce.  One version of the rpcblist
-- * structure (actually called rp__list) is used with rpcgen, and the other is
-- * defined only in the header file for compatibility with the specified
-- * interface.
-- */
--
--struct rp__list {
--	rpcb rpcb_map;
--	struct rp__list *rpcb_next;
--};
--typedef struct rp__list rp__list;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rp__list(XDR *, rp__list*);
--#elif __STDC__ 
--extern  bool_t xdr_rp__list(XDR *, rp__list*);
--#else /* Old Style C */ 
--bool_t xdr_rp__list();
--#endif /* Old Style C */ 
--
--
--typedef rp__list *rpcblist_ptr;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*);
--#else /* Old Style C */ 
--bool_t xdr_rpcblist_ptr();
--#endif /* Old Style C */ 
--
--
--typedef struct rp__list rpcblist;
--typedef struct rp__list RPCBLIST;
--
--#ifndef __cplusplus
--struct rpcblist {
-- RPCB rpcb_map;
-- struct rpcblist *rpcb_next;
--};
--#endif
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--extern bool_t xdr_rpcblist(XDR *, rpcblist**);
--#ifdef __cplusplus
--}
--#endif
--
--
--/*
-- * Arguments of remote calls
-- */
--
--struct rpcb_rmtcallargs {
--	rpcprog_t prog;
--	rpcvers_t vers;
--	rpcproc_t proc;
--	struct {
--		u_int args_len;
--		char *args_val;
--	} args;
--};
--typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_rmtcallargs();
--#endif /* Old Style C */ 
--
--
--/*
-- * Client-side only representation of rpcb_rmtcallargs structure.
-- *
-- * The routine that XDRs the rpcb_rmtcallargs structure must deal with the
-- * opaque arguments in the "args" structure.  xdr_rpcb_rmtcallargs() needs to
-- * be passed the XDR routine that knows the args' structure.  This routine
-- * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since
-- * the application being called already knows the args structure.  So we use a
-- * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which
-- * includes the args' XDR routine.
-- */
--struct r_rpcb_rmtcallargs {
-- rpcprog_t prog;
-- rpcvers_t vers;
-- rpcproc_t proc;
-- struct {
-- u_int args_len;
-- char *args_val;
-- } args;
-- xdrproc_t xdr_args; /* encodes args */
--};
--
--
--/*
-- * Results of the remote call
-- */
--
--struct rpcb_rmtcallres {
--	char *addr;
--	struct {
--		u_int results_len;
--		char *results_val;
--	} results;
--};
--typedef struct rpcb_rmtcallres rpcb_rmtcallres;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_rmtcallres();
--#endif /* Old Style C */ 
--
--
--/*
-- * Client-side only representation of rpcb_rmtcallres structure.
-- */
--struct r_rpcb_rmtcallres {
-- char *addr;
-- struct {
-- u_int32_t results_len;
-- char *results_val;
-- } results;
-- xdrproc_t xdr_res; /* decodes results */
--};
--
--/*
-- * rpcb_entry contains a merged address of a service on a particular
-- * transport, plus associated netconfig information.  A list of rpcb_entrys
-- * is returned by RPCBPROC_GETADDRLIST.  See netconfig.h for values used
-- * in r_nc_* fields.
-- */
--
--struct rpcb_entry {
--	char *r_maddr;
--	char *r_nc_netid;
--	u_int r_nc_semantics;
--	char *r_nc_protofmly;
--	char *r_nc_proto;
--};
--typedef struct rpcb_entry rpcb_entry;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_entry(XDR *, rpcb_entry*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_entry();
--#endif /* Old Style C */ 
--
--
--/*
-- * A list of addresses supported by a service.
-- */
--
--struct rpcb_entry_list {
--	rpcb_entry rpcb_entry_map;
--	struct rpcb_entry_list *rpcb_entry_next;
--};
--typedef struct rpcb_entry_list rpcb_entry_list;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_entry_list();
--#endif /* Old Style C */ 
--
--
--typedef rpcb_entry_list *rpcb_entry_list_ptr;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_entry_list_ptr();
--#endif /* Old Style C */ 
--
--
--/*
-- * rpcbind statistics
-- */
--
--#define rpcb_highproc_2 RPCBPROC_CALLIT
--#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
--#define rpcb_highproc_4 RPCBPROC_GETSTAT
--#define RPCBSTAT_HIGHPROC 13
--#define RPCBVERS_STAT 3
--#define RPCBVERS_4_STAT 2
--#define RPCBVERS_3_STAT 1
--#define RPCBVERS_2_STAT 0
--
--/* Link list of all the stats about getport and getaddr */
--
--struct rpcbs_addrlist {
--	rpcprog_t prog;
--	rpcvers_t vers;
--	int success;
--	int failure;
--	char *netid;
--	struct rpcbs_addrlist *next;
--};
--typedef struct rpcbs_addrlist rpcbs_addrlist;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*);
--#else /* Old Style C */ 
--bool_t xdr_rpcbs_addrlist();
--#endif /* Old Style C */ 
--
--
--/* Link list of all the stats about rmtcall */
--
--struct rpcbs_rmtcalllist {
--	rpcprog_t prog;
--	rpcvers_t vers;
--	rpcproc_t proc;
--	int success;
--	int failure;
--	int indirect;
--	char *netid;
--	struct rpcbs_rmtcalllist *next;
--};
--typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*);
--#else /* Old Style C */ 
--bool_t xdr_rpcbs_rmtcalllist();
--#endif /* Old Style C */ 
--
--
--typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
--#elif __STDC__ 
--extern  bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc);
--#else /* Old Style C */ 
--bool_t xdr_rpcbs_proc();
--#endif /* Old Style C */ 
--
--
--typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*);
--#else /* Old Style C */ 
--bool_t xdr_rpcbs_addrlist_ptr();
--#endif /* Old Style C */ 
--
--
--typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*);
--#else /* Old Style C */ 
--bool_t xdr_rpcbs_rmtcalllist_ptr();
--#endif /* Old Style C */ 
--
--
--struct rpcb_stat {
--	rpcbs_proc info;
--	int setinfo;
--	int unsetinfo;
--	rpcbs_addrlist_ptr addrinfo;
--	rpcbs_rmtcalllist_ptr rmtinfo;
--};
--typedef struct rpcb_stat rpcb_stat;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_stat(XDR *, rpcb_stat*);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_stat();
--#endif /* Old Style C */ 
--
--
--/*
-- * One rpcb_stat structure is returned for each version of rpcbind
-- * being monitored.
-- */
--
--typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
--#ifdef __cplusplus 
--extern "C" bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
--#elif __STDC__ 
--extern  bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers);
--#else /* Old Style C */ 
--bool_t xdr_rpcb_stat_byvers();
--#endif /* Old Style C */ 
--
--
--/*
-- * We don't define netbuf in RPCL, since it would contain structure member
-- * names that would conflict with the definition of struct netbuf in
-- * <tiuser.h>.  Instead we merely declare the XDR routine xdr_netbuf() here,
-- * and implement it ourselves in rpc/rpcb_prot.c.
-- */
--#ifdef __cplusplus
--extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *);
--
--#else /* __STDC__ */
--extern bool_t xdr_netbuf(XDR *, struct netbuf *);
--
--#endif
--
--#define RPCBVERS_3 RPCBVERS
--#define RPCBVERS_4 RPCBVERS4
--
--#define _PATH_RPCBINDSOCK "/var/run/rpcbind.sock"
--
--#else /* ndef _KERNEL */
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--/*
-- * A mapping of (program, version, network ID) to address
-- */
--struct rpcb {
-- rpcprog_t r_prog; /* program number */
-- rpcvers_t r_vers; /* version number */
-- char *r_netid; /* network id */
-- char *r_addr; /* universal address */
-- char *r_owner; /* owner of the mapping */
--};
--typedef struct rpcb RPCB;
--
--/*
-- * A list of mappings
-- */
--struct rpcblist {
-- RPCB rpcb_map;
-- struct rpcblist *rpcb_next;
--};
--typedef struct rpcblist RPCBLIST;
--typedef struct rpcblist *rpcblist_ptr;
--
--/*
-- * Remote calls arguments
-- */
--struct rpcb_rmtcallargs {
-- rpcprog_t prog; /* program number */
-- rpcvers_t vers; /* version number */
-- rpcproc_t proc; /* procedure number */
-- u_int32_t arglen; /* arg len */
-- caddr_t args_ptr; /* argument */
-- xdrproc_t xdr_args; /* XDR routine for argument */
--};
--typedef struct rpcb_rmtcallargs rpcb_rmtcallargs;
--
--/*
-- * Remote calls results
-- */
--struct rpcb_rmtcallres {
-- char *addr_ptr; /* remote universal address */
-- u_int32_t resultslen; /* results length */
-- caddr_t results_ptr; /* results */
-- xdrproc_t xdr_results; /* XDR routine for result */
--};
--typedef struct rpcb_rmtcallres rpcb_rmtcallres;
--
--struct rpcb_entry {
-- char *r_maddr;
-- char *r_nc_netid;
-- unsigned int r_nc_semantics;
-- char *r_nc_protofmly;
-- char *r_nc_proto;
--};
--typedef struct rpcb_entry rpcb_entry;
--
--/*
-- * A list of addresses supported by a service.
-- */
--
--struct rpcb_entry_list {
-- rpcb_entry rpcb_entry_map;
-- struct rpcb_entry_list *rpcb_entry_next;
--};
--typedef struct rpcb_entry_list rpcb_entry_list;
--
--typedef rpcb_entry_list *rpcb_entry_list_ptr;
--
--/*
-- * rpcbind statistics
-- */
--
--#define rpcb_highproc_2 RPCBPROC_CALLIT
--#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR
--#define rpcb_highproc_4 RPCBPROC_GETSTAT
--#define RPCBSTAT_HIGHPROC 13
--#define RPCBVERS_STAT 3
--#define RPCBVERS_4_STAT 2
--#define RPCBVERS_3_STAT 1
--#define RPCBVERS_2_STAT 0
--
--/* Link list of all the stats about getport and getaddr */
--
--struct rpcbs_addrlist {
-- rpcprog_t prog;
-- rpcvers_t vers;
-- int success;
-- int failure;
-- char *netid;
-- struct rpcbs_addrlist *next;
--};
--typedef struct rpcbs_addrlist rpcbs_addrlist;
--
--/* Link list of all the stats about rmtcall */
--
--struct rpcbs_rmtcalllist {
-- rpcprog_t prog;
-- rpcvers_t vers;
-- rpcproc_t proc;
-- int success;
-- int failure;
-- int indirect;
-- char *netid;
-- struct rpcbs_rmtcalllist *next;
--};
--typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist;
--
--typedef int rpcbs_proc[RPCBSTAT_HIGHPROC];
--
--typedef rpcbs_addrlist *rpcbs_addrlist_ptr;
--
--typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr;
--
--struct rpcb_stat {
-- rpcbs_proc info;
-- int setinfo;
-- int unsetinfo;
-- rpcbs_addrlist_ptr addrinfo;
-- rpcbs_rmtcalllist_ptr rmtinfo;
--};
--typedef struct rpcb_stat rpcb_stat;
--
--/*
-- * One rpcb_stat structure is returned for each version of rpcbind
-- * being monitored.
-- */
--
--typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT];
--
--#ifdef __cplusplus
--}
--#endif
--
--#endif /* ndef _KERNEL */
--
--#define RPCBPROG ((u_int32_t)100000)
--#define RPCBVERS ((u_int32_t)3)
--
--#ifdef __cplusplus
--#define RPCBPROC_SET ((u_int32_t)1)
--extern "C" bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
--extern "C" bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_UNSET ((u_int32_t)2)
--extern "C" bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
--extern "C" bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_GETADDR ((u_int32_t)3)
--extern "C" char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
--extern "C" char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_DUMP ((u_int32_t)4)
--extern "C" rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
--extern "C" rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
--#define RPCBPROC_CALLIT ((u_int32_t)5)
--extern "C" rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
--extern "C" rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
--#define RPCBPROC_GETTIME ((u_int32_t)6)
--extern "C" u_int * rpcbproc_gettime_3(void *, CLIENT *);
--extern "C" u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
--#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
--extern "C" struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
--extern "C" struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
--#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
--extern "C" char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
--extern "C" char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
--
--#elif __STDC__
--#define RPCBPROC_SET ((u_int32_t)1)
--extern  bool_t * rpcbproc_set_3(rpcb *, CLIENT *);
--extern  bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_UNSET ((u_int32_t)2)
--extern  bool_t * rpcbproc_unset_3(rpcb *, CLIENT *);
--extern  bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_GETADDR ((u_int32_t)3)
--extern  char ** rpcbproc_getaddr_3(rpcb *, CLIENT *);
--extern  char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_DUMP ((u_int32_t)4)
--extern  rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *);
--extern  rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *);
--#define RPCBPROC_CALLIT ((u_int32_t)5)
--extern  rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *);
--extern  rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *);
--#define RPCBPROC_GETTIME ((u_int32_t)6)
--extern  u_int * rpcbproc_gettime_3(void *, CLIENT *);
--extern  u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *);
--#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
--extern  struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *);
--extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *);
--#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
--extern  char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *);
--extern  char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *);
--
--#else /* Old Style C */ 
--#define RPCBPROC_SET ((u_int32_t)1)
--extern  bool_t * rpcbproc_set_3();
--extern  bool_t * rpcbproc_set_3_svc();
--#define RPCBPROC_UNSET ((u_int32_t)2)
--extern  bool_t * rpcbproc_unset_3();
--extern  bool_t * rpcbproc_unset_3_svc();
--#define RPCBPROC_GETADDR ((u_int32_t)3)
--extern  char ** rpcbproc_getaddr_3();
--extern  char ** rpcbproc_getaddr_3_svc();
--#define RPCBPROC_DUMP ((u_int32_t)4)
--extern  rpcblist_ptr * rpcbproc_dump_3();
--extern  rpcblist_ptr * rpcbproc_dump_3_svc();
--#define RPCBPROC_CALLIT ((u_int32_t)5)
--extern  rpcb_rmtcallres * rpcbproc_callit_3();
--extern  rpcb_rmtcallres * rpcbproc_callit_3_svc();
--#define RPCBPROC_GETTIME ((u_int32_t)6)
--extern  u_int * rpcbproc_gettime_3();
--extern  u_int * rpcbproc_gettime_3_svc();
--#define RPCBPROC_UADDR2TADDR ((u_int32_t)7)
--extern  struct netbuf * rpcbproc_uaddr2taddr_3();
--extern  struct netbuf * rpcbproc_uaddr2taddr_3_svc();
--#define RPCBPROC_TADDR2UADDR ((u_int32_t)8)
--extern  char ** rpcbproc_taddr2uaddr_3();
--extern  char ** rpcbproc_taddr2uaddr_3_svc();
--#endif /* Old Style C */ 
--#define RPCBVERS4 ((u_int32_t)4)
--
--#ifdef __cplusplus
--extern "C" bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
--extern "C" bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
--extern "C" bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
--extern "C" bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
--extern "C" char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
--extern "C" char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
--extern "C" rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
--extern "C" rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
--#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
--extern "C" rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
--extern "C" rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
--extern "C" u_int * rpcbproc_gettime_4(void *, CLIENT *);
--extern "C" u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
--extern "C" struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
--extern "C" struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
--extern "C" char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
--extern "C" char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
--#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
--extern "C" char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
--extern "C" char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_INDIRECT ((u_int32_t)10)
--extern "C" rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
--extern "C" rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
--#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
--extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
--extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_GETSTAT ((u_int32_t)12)
--extern "C" rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
--extern "C" rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
--
--#elif __STDC__
--extern  bool_t * rpcbproc_set_4(rpcb *, CLIENT *);
--extern  bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *);
--extern  bool_t * rpcbproc_unset_4(rpcb *, CLIENT *);
--extern  bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *);
--extern  char ** rpcbproc_getaddr_4(rpcb *, CLIENT *);
--extern  char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *);
--extern  rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *);
--extern  rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *);
--#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
--extern  rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *);
--extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *);
--extern  u_int * rpcbproc_gettime_4(void *, CLIENT *);
--extern  u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *);
--extern  struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *);
--extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *);
--extern  char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *);
--extern  char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *);
--#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
--extern  char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *);
--extern  char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_INDIRECT ((u_int32_t)10)
--extern  rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *);
--extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *);
--#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
--extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *);
--extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *);
--#define RPCBPROC_GETSTAT ((u_int32_t)12)
--extern  rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *);
--extern  rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *);
--
--#else /* Old Style C */ 
--extern  bool_t * rpcbproc_set_4();
--extern  bool_t * rpcbproc_set_4_svc();
--extern  bool_t * rpcbproc_unset_4();
--extern  bool_t * rpcbproc_unset_4_svc();
--extern  char ** rpcbproc_getaddr_4();
--extern  char ** rpcbproc_getaddr_4_svc();
--extern  rpcblist_ptr * rpcbproc_dump_4();
--extern  rpcblist_ptr * rpcbproc_dump_4_svc();
--#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT)
--extern  rpcb_rmtcallres * rpcbproc_bcast_4();
--extern  rpcb_rmtcallres * rpcbproc_bcast_4_svc();
--extern  u_int * rpcbproc_gettime_4();
--extern  u_int * rpcbproc_gettime_4_svc();
--extern  struct netbuf * rpcbproc_uaddr2taddr_4();
--extern  struct netbuf * rpcbproc_uaddr2taddr_4_svc();
--extern  char ** rpcbproc_taddr2uaddr_4();
--extern  char ** rpcbproc_taddr2uaddr_4_svc();
--#define RPCBPROC_GETVERSADDR ((u_int32_t)9)
--extern  char ** rpcbproc_getversaddr_4();
--extern  char ** rpcbproc_getversaddr_4_svc();
--#define RPCBPROC_INDIRECT ((u_int32_t)10)
--extern  rpcb_rmtcallres * rpcbproc_indirect_4();
--extern  rpcb_rmtcallres * rpcbproc_indirect_4_svc();
--#define RPCBPROC_GETADDRLIST ((u_int32_t)11)
--extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4();
--extern  rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc();
--#define RPCBPROC_GETSTAT ((u_int32_t)12)
--extern  rpcb_stat * rpcbproc_getstat_4();
--extern  rpcb_stat * rpcbproc_getstat_4_svc();
--#endif /* Old Style C */ 
--
--#endif /* !_RPCB_PROT_H_RPCGEN */
-diff --git a/tirpc/rpcsvc/crypt.h b/tirpc/rpcsvc/crypt.h
-deleted file mode 100644
-index da1f9cc..0000000
---- a/tirpc/rpcsvc/crypt.h
-+++ /dev/null
-@@ -1,109 +0,0 @@
--/*
-- * Please do not edit this file.
-- * It was generated using rpcgen.
-- */
--
--#ifndef _CRYPT_H_RPCGEN
--#define _CRYPT_H_RPCGEN
--
--#include <rpc/rpc.h>
--
--#ifndef IXDR_GET_INT32
--#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))
--#endif
--#ifndef IXDR_PUT_INT32
--#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))
--#endif
--#ifndef IXDR_GET_U_INT32
--#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))
--#endif
--#ifndef IXDR_PUT_U_INT32
--#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))
--#endif
--
--enum des_dir {
--	ENCRYPT_DES = 0,
--	DECRYPT_DES = 1,
--};
--typedef enum des_dir des_dir;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_des_dir(XDR *, des_dir*);
--#elif __STDC__ 
--extern  bool_t xdr_des_dir(XDR *, des_dir*);
--#else /* Old Style C */ 
--bool_t xdr_des_dir();
--#endif /* Old Style C */ 
--
--
--enum des_mode {
--	CBC_DES = 0,
--	ECB_DES = 1,
--};
--typedef enum des_mode des_mode;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_des_mode(XDR *, des_mode*);
--#elif __STDC__ 
--extern  bool_t xdr_des_mode(XDR *, des_mode*);
--#else /* Old Style C */ 
--bool_t xdr_des_mode();
--#endif /* Old Style C */ 
--
--
--struct desargs {
--	u_char des_key[8];
--	des_dir des_dir;
--	des_mode des_mode;
--	u_char des_ivec[8];
--	struct {
--		u_int desbuf_len;
--		char *desbuf_val;
--	} desbuf;
--};
--typedef struct desargs desargs;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_desargs(XDR *, desargs*);
--#elif __STDC__ 
--extern  bool_t xdr_desargs(XDR *, desargs*);
--#else /* Old Style C */ 
--bool_t xdr_desargs();
--#endif /* Old Style C */ 
--
--
--struct desresp {
--	struct {
--		u_int desbuf_len;
--		char *desbuf_val;
--	} desbuf;
--	u_char des_ivec[8];
--	int stat;
--};
--typedef struct desresp desresp;
--#ifdef __cplusplus 
--extern "C" bool_t xdr_desresp(XDR *, desresp*);
--#elif __STDC__ 
--extern  bool_t xdr_desresp(XDR *, desresp*);
--#else /* Old Style C */ 
--bool_t xdr_desresp();
--#endif /* Old Style C */ 
--
--
--#define CRYPT_PROG ((u_int32_t)600100029)
--#define CRYPT_VERS ((u_int32_t)1)
--
--#ifdef __cplusplus
--#define DES_CRYPT ((u_int32_t)1)
--extern "C" desresp * des_crypt_1(desargs *, CLIENT *);
--extern "C" desresp * des_crypt_1_svc(desargs *, struct svc_req *);
--
--#elif __STDC__
--#define DES_CRYPT ((u_int32_t)1)
--extern  desresp * des_crypt_1(desargs *, CLIENT *);
--extern  desresp * des_crypt_1_svc(desargs *, struct svc_req *);
--
--#else /* Old Style C */ 
--#define DES_CRYPT ((u_int32_t)1)
--extern  desresp * des_crypt_1();
--extern  desresp * des_crypt_1_svc();
--#endif /* Old Style C */ 
--
--#endif /* !_CRYPT_H_RPCGEN */
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/libtirpc/0006-Disable-DES-authentification-support.patch b/bsp/buildroot/package/libtirpc/0005-Disable-DES-authentification-support.patch
similarity index 100%
rename from bsp/buildroot/package/libtirpc/0006-Disable-DES-authentification-support.patch
rename to bsp/buildroot/package/libtirpc/0005-Disable-DES-authentification-support.patch
diff --git a/bsp/buildroot/package/libtirpc/0007-include-stdint.h-for-uintptr_t.patch b/bsp/buildroot/package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch
similarity index 100%
rename from bsp/buildroot/package/libtirpc/0007-include-stdint.h-for-uintptr_t.patch
rename to bsp/buildroot/package/libtirpc/0006-include-stdint.h-for-uintptr_t.patch
diff --git a/bsp/buildroot/package/libtirpc/libtirpc.mk b/bsp/buildroot/package/libtirpc/libtirpc.mk
index a11e49a1..319b78c3 100644
--- a/bsp/buildroot/package/libtirpc/libtirpc.mk
+++ b/bsp/buildroot/package/libtirpc/libtirpc.mk
@@ -7,9 +7,10 @@
 LIBTIRPC_VERSION = 1.0.2
 LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2
 LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION)
-LIBTIRPC_LICENSE = BSD-3c
+LIBTIRPC_LICENSE = BSD-3-Clause
 LIBTIRPC_LICENSE_FILES = COPYING
 
+LIBTIRPC_DEPENDENCIES = host-nfs-utils
 LIBTIRPC_INSTALL_STAGING = YES
 LIBTIRPC_AUTORECONF = YES
 
@@ -18,4 +19,11 @@ LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ"
 
 LIBTIRPC_CONF_OPTS = --disable-gssapi
 
+define HOST_LIBTIRPC_INSTALL_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/tirpc/rpc/types.h $(HOST_DIR)/include/rpc/types.h
+	$(INSTALL) -D -m 0644 $(@D)/tirpc/netconfig.h $(HOST_DIR)/include/netconfig.h
+endef
+
 $(eval $(autotools-package))
+# We are only copying headers; no need for the autotools infrastructure
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/libtomcrypt/Config.in b/bsp/buildroot/package/libtomcrypt/Config.in
index 6678b303..a7c5f500 100644
--- a/bsp/buildroot/package/libtomcrypt/Config.in
+++ b/bsp/buildroot/package/libtomcrypt/Config.in
@@ -3,9 +3,9 @@ config BR2_PACKAGE_LIBTOMCRYPT
 	select BR2_PACKAGE_LIBTOMMATH
 	help
 	  LibTomCrypt is a fairly comprehensive, modular and portable
-	  cryptographic toolkit that provides developers with a vast array
-	  of well known published block ciphers, one-way hash functions,
-	  chaining modes, pseudo-random number generators, public key
-	  cryptography and a plethora of other routines.
+	  cryptographic toolkit that provides developers with a vast
+	  array of well known published block ciphers, one-way hash
+	  functions, chaining modes, pseudo-random number generators,
+	  public key cryptography and a plethora of other routines.
 
 	  http://www.libtom.net
diff --git a/bsp/buildroot/package/libtomcrypt/libtomcrypt.hash b/bsp/buildroot/package/libtomcrypt/libtomcrypt.hash
index 562016d5..be8e9b1b 100644
--- a/bsp/buildroot/package/libtomcrypt/libtomcrypt.hash
+++ b/bsp/buildroot/package/libtomcrypt/libtomcrypt.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116  crypt-1.17.tar.bz2
+sha256  57c13a34fbfd45696189d19e47864e48f4e5c11590c29b444accb8edbf047f14  crypt-1.18.1.tar.xz
diff --git a/bsp/buildroot/package/libtomcrypt/libtomcrypt.mk b/bsp/buildroot/package/libtomcrypt/libtomcrypt.mk
index 8cc02b28..ff6222cc 100644
--- a/bsp/buildroot/package/libtomcrypt/libtomcrypt.mk
+++ b/bsp/buildroot/package/libtomcrypt/libtomcrypt.mk
@@ -4,24 +4,25 @@
 #
 ################################################################################
 
-LIBTOMCRYPT_VERSION = 1.17
-LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/$(LIBTOMCRYPT_VERSION)
-LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.bz2
+LIBTOMCRYPT_VERSION = 1.18.1
+LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/v$(LIBTOMCRYPT_VERSION)
+LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.xz
 LIBTOMCRYPT_LICENSE = WTFPL
 LIBTOMCRYPT_LICENSE_FILES = LICENSE
 LIBTOMCRYPT_INSTALL_STAGING = YES
 LIBTOMCRYPT_INSTALL_TARGET = NO # only static library
 LIBTOMCRYPT_DEPENDENCIES = libtommath
 
-LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC \
-	$(if $(BR2_USE_WCHAR),,-DLTC_NO_WCHAR)
+LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC
 
 define LIBTOMCRYPT_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)"
 endef
 
 define LIBTOMCRYPT_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" NODOCS=1 INSTALL_USER=$(shell id -u) INSTALL_GROUP=$(shell id -g) install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" \
+		PREFIX=/usr NODOCS=1 INSTALL_USER=$(shell id -u) \
+		INSTALL_GROUP=$(shell id -g) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/libtommath/libtommath.hash b/bsp/buildroot/package/libtommath/libtommath.hash
index fcf2ddc9..359dfeda 100644
--- a/bsp/buildroot/package/libtommath/libtommath.hash
+++ b/bsp/buildroot/package/libtommath/libtommath.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  993a7df9ee091fca430cdde3263df57d88ef62af8103903214da49fc51bbb56c  ltm-1.0.tar.xz
+sha256 47032fb39d698ce4cf9c9c462c198e6b08790ce8203ad1224086b9b978636c69  ltm-1.0.1.tar.xz
diff --git a/bsp/buildroot/package/libtommath/libtommath.mk b/bsp/buildroot/package/libtommath/libtommath.mk
index 2fc8c39c..ceb2e684 100644
--- a/bsp/buildroot/package/libtommath/libtommath.mk
+++ b/bsp/buildroot/package/libtommath/libtommath.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBTOMMATH_VERSION = 1.0
+LIBTOMMATH_VERSION = 1.0.1
 LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION)
 LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz
 LIBTOMMATH_LICENSE = WTFPL
@@ -17,7 +17,7 @@ define LIBTOMMATH_BUILD_CMDS
 endef
 
 define LIBTOMMATH_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" PREFIX=/usr install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/libtool/Config.in b/bsp/buildroot/package/libtool/Config.in
index d3cf2d78..8192c770 100644
--- a/bsp/buildroot/package/libtool/Config.in
+++ b/bsp/buildroot/package/libtool/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_LIBTOOL
 	bool "libtool"
 	help
-	  Library that hides the complexity of using shared/static libraries
-	  on different platforms behind a consistent, portable interface.
+	  Library that hides the complexity of using shared/static
+	  libraries on different platforms behind a consistent, portable
+	  interface.
 
 	  http://www.gnu.org/software/libtool/
diff --git a/bsp/buildroot/package/libtool/libtool.hash b/bsp/buildroot/package/libtool/libtool.hash
index baaac612..dd34c0d7 100644
--- a/bsp/buildroot/package/libtool/libtool.hash
+++ b/bsp/buildroot/package/libtool/libtool.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
 sha256	7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f	libtool-2.4.6.tar.xz
+# License files, locally calculated
+sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
diff --git a/bsp/buildroot/package/libtool/libtool.mk b/bsp/buildroot/package/libtool/libtool.mk
index 1d066bd1..bf97ee12 100644
--- a/bsp/buildroot/package/libtool/libtool.mk
+++ b/bsp/buildroot/package/libtool/libtool.mk
@@ -11,7 +11,7 @@ LIBTOOL_INSTALL_STAGING = YES
 LIBTOOL_CONF_ENV = HELP2MAN=true
 LIBTOOL_DEPENDENCIES = host-m4
 HOST_LIBTOOL_DEPENDENCIES = host-m4
-LIBTOOL_LICENSE = GPLv2+
+LIBTOOL_LICENSE = GPL-2.0+
 LIBTOOL_LICENSE_FILES = COPYING
 
 HOST_LIBTOOL_CONF_ENV = MAKEINFO=true
@@ -41,5 +41,5 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # variables used by other packages
-LIBTOOL = $(HOST_DIR)/usr/bin/libtool
-LIBTOOLIZE = $(HOST_DIR)/usr/bin/libtoolize
+LIBTOOL = $(HOST_DIR)/bin/libtool
+LIBTOOLIZE = $(HOST_DIR)/bin/libtoolize
diff --git a/bsp/buildroot/package/libtorrent/libtorrent.mk b/bsp/buildroot/package/libtorrent/libtorrent.mk
index ef1c75f0..fbd332e3 100644
--- a/bsp/buildroot/package/libtorrent/libtorrent.mk
+++ b/bsp/buildroot/package/libtorrent/libtorrent.mk
@@ -14,7 +14,7 @@ LIBTORRENT_CONF_OPTS = --enable-aligned \
 	$(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl)
 LIBTORRENT_INSTALL_STAGING = YES
 LIBTORRENT_AUTORECONF = YES
-LIBTORRENT_LICENSE = GPLv2
+LIBTORRENT_LICENSE = GPL-2.0
 LIBTORRENT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libubox/libubox.mk b/bsp/buildroot/package/libubox/libubox.mk
index 2bde25f4..d3e3b709 100644
--- a/bsp/buildroot/package/libubox/libubox.mk
+++ b/bsp/buildroot/package/libubox/libubox.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBUBOX_VERSION = 290c64ef5b5c3e75be851594f269d6a9568e64e5
+LIBUBOX_VERSION = 723730214732862de7e892bae2f7a7889e66bf1b
 LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git
-LIBUBOX_LICENSE = ISC, BSD-3c
+LIBUBOX_LICENSE = ISC, BSD-3-Clause
 LIBUBOX_INSTALL_STAGING = YES
 LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c)
 
diff --git a/bsp/buildroot/package/libuci/libuci.hash b/bsp/buildroot/package/libuci/libuci.hash
new file mode 100644
index 00000000..d4c839eb
--- /dev/null
+++ b/bsp/buildroot/package/libuci/libuci.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 bb9827863c6b7b6cf986a3de42b5716edb8a280e44b3ce39541de18062c3c00e  libuci-49ec6efbdac4819033d34f08927d795f83a3932d.tar.gz
diff --git a/bsp/buildroot/package/libuci/libuci.mk b/bsp/buildroot/package/libuci/libuci.mk
index 66470457..642238c2 100644
--- a/bsp/buildroot/package/libuci/libuci.mk
+++ b/bsp/buildroot/package/libuci/libuci.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBUCI_VERSION = e339407372ffc70b1451e4eda218c01aa95a6a7f
-LIBUCI_SITE = git://nbd.name/uci.git
-LIBUCI_LICENSE = LGPLv2.1, GPLv2 (tools)
+LIBUCI_VERSION = 49ec6efbdac4819033d34f08927d795f83a3932d
+LIBUCI_SITE = git://git.openwrt.org/project/uci.git
+LIBUCI_LICENSE = LGPL-2.1, GPL-2.0 (tools)
 LIBUCI_INSTALL_STAGING = YES
 LIBUCI_DEPENDENCIES = libubox
 
@@ -15,7 +15,7 @@ LIBUCI_DEPENDENCIES += lua
 LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \
 	-DLUAPATH=/usr/lib/lua/5.1 \
 	-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
-LIBUCI_LICENSE := $(LIBUCI_LICENSE), GPLv2 (lua bindings)
+LIBUCI_LICENSE := $(LIBUCI_LICENSE), GPL-2.0 (lua bindings)
 else
 LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
 endif
diff --git a/bsp/buildroot/package/libucl/libucl.mk b/bsp/buildroot/package/libucl/libucl.mk
index 3530bbe5..39a7ed3c 100644
--- a/bsp/buildroot/package/libucl/libucl.mk
+++ b/bsp/buildroot/package/libucl/libucl.mk
@@ -8,7 +8,7 @@ LIBUCL_VERSION = 0.7.3
 LIBUCL_SITE = $(call github,vstakhov,libucl,$(LIBUCL_VERSION))
 LIBUCL_INSTALL_STAGING = YES
 LIBUCL_AUTORECONF = YES
-LIBUCL_LICENSE = BSD-2c
+LIBUCL_LICENSE = BSD-2-Clause
 LIBUCL_LICENSE_FILES = COPYING
 LIBUCL_DEPENDENCIES = host-pkgconf
 
diff --git a/bsp/buildroot/package/libuecc/libuecc.mk b/bsp/buildroot/package/libuecc/libuecc.mk
index 87ca2e42..aad26e5a 100644
--- a/bsp/buildroot/package/libuecc/libuecc.mk
+++ b/bsp/buildroot/package/libuecc/libuecc.mk
@@ -7,7 +7,7 @@
 LIBUECC_VERSION = 7
 LIBUECC_SITE = https://projects.universe-factory.net/attachments/download/85
 LIBUECC_SOURCE = libuecc-$(LIBUECC_VERSION).tar.xz
-LIBUECC_LICENSE = BSD-2c
+LIBUECC_LICENSE = BSD-2-Clause
 LIBUECC_LICENSE_FILES = COPYRIGHT
 LIBUECC_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libuio/Config.in b/bsp/buildroot/package/libuio/Config.in
index a96df54b..97be1e3d 100644
--- a/bsp/buildroot/package/libuio/Config.in
+++ b/bsp/buildroot/package/libuio/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LIBUIO
 	bool "libuio"
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  libuio is a light-weight C programming library to handle UIO
 	  (Userspace I/O) device discovery and binding task.
diff --git a/bsp/buildroot/package/libuio/libuio.mk b/bsp/buildroot/package/libuio/libuio.mk
index 6d07f1fa..8f72253a 100644
--- a/bsp/buildroot/package/libuio/libuio.mk
+++ b/bsp/buildroot/package/libuio/libuio.mk
@@ -7,9 +7,11 @@
 # v0.2.7
 LIBUIO_VERSION = 940861de278cb794bf9d775b76a4d1d4f9108607
 LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION))
-LIBUIO_LICENSE = LGPLv2.1 (library), GPLv2 (programs)
+LIBUIO_LICENSE = LGPL-2.1 (library), GPL-2.0 (programs)
 LIBUIO_LICENSE_FILES = COPYING
 LIBUIO_CONF_OPTS = --with-glib=no --without-werror
+LIBUIO_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+LIBUIO_LIBS = $(TARGET_NLS_LIBS)
 LIBUIO_INSTALL_STAGING = YES
 
 # Fetched from github, no pre-generated configure script provided
@@ -24,13 +26,6 @@ LIBUIO_DEPENDENCIES += argp-standalone
 LIBUIO_LIBS += -largp
 endif
 
-# libuio pulls in libintl if needed, so ensure we also
-# link against it, otherwise static linking fails
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-LIBUIO_DEPENDENCIES += gettext
-LIBUIO_LIBS += -lintl
-endif
-
 LIBUIO_CONF_ENV += LIBS="$(LIBUIO_LIBS)"
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libunistring/libunistring.mk b/bsp/buildroot/package/libunistring/libunistring.mk
index ce58b471..9340e799 100644
--- a/bsp/buildroot/package/libunistring/libunistring.mk
+++ b/bsp/buildroot/package/libunistring/libunistring.mk
@@ -8,7 +8,7 @@ LIBUNISTRING_VERSION = 0.9.7
 LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring
 LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz
 LIBUNISTRING_INSTALL_STAGING = YES
-LIBUNISTRING_LICENSE = LGPLv3+ or GPLv2
+LIBUNISTRING_LICENSE = LGPL-3.0+ or GPL-2.0
 LIBUNISTRING_LICENSE_FILES = COPYING.LIB
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/bsp/buildroot/package/libunwind/0001-add-disable-tests-option.patch b/bsp/buildroot/package/libunwind/0001-add-disable-tests-option.patch
new file mode 100644
index 00000000..72a16861
--- /dev/null
+++ b/bsp/buildroot/package/libunwind/0001-add-disable-tests-option.patch
@@ -0,0 +1,68 @@
+From 208a430bcbab7d63a4c04242f13c4740e0246a56 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=D0=9A=D0=BE=D1=80=D0=BE=D0=BB=D0=B5=D0=B2=20=D0=A1=D0=B5?=
+ =?UTF-8?q?=D1=80=D0=B3=D0=B5=D0=B9?= <korolev.sergey@gmail.com>
+Date: Wed, 11 May 2016 22:48:55 +0300
+Subject: [PATCH] add --disable-tests option
+
+Allows to skip tests build.
+
+Backported from upstream master branch:
+https://github.com/libunwind/libunwind/commit/208a430bcbab7d63a4c04242f13c4740e0246a56
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.am  |  6 +++++-
+ configure.ac | 13 +++++++++++--
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 6a3ed9e..0c29b3e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -42,7 +42,11 @@ endif
+ 
+ nodist_include_HEADERS = include/libunwind-common.h
+ 
+-SUBDIRS = src tests
++SUBDIRS = src
++
++if CONFIG_TESTS
++SUBDIRS += tests
++endif
+ 
+ if CONFIG_DOCS
+ SUBDIRS += doc
+diff --git a/configure.ac b/configure.ac
+index 863fb8f..6c46cf3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,6 +129,10 @@ AC_ARG_ENABLE(documentation,
+ 	AS_HELP_STRING([--disable-documentation],[Disable generating the man pages]),,
+ 	[enable_documentation=yes])
+ 
++AC_ARG_ENABLE(tests,
++ AS_HELP_STRING([--disable-tests],[Disable tests build]),,
++ [enable_tests=yes])
++
+ AC_MSG_CHECKING([if we should build libunwind-setjmp])
+ AC_MSG_RESULT([$enable_setjmp])
+ 
+@@ -396,8 +400,13 @@ if test "x$enable_documentation" = "xyes"; then
+   AC_CONFIG_FILES(doc/Makefile doc/common.tex)
+ fi
+ 
+-AC_CONFIG_FILES(Makefile src/Makefile tests/Makefile tests/check-namespace.sh
+-		include/libunwind-common.h
++AM_CONDITIONAL([CONFIG_TESTS], [test x$enable_tests = xyes])
++if test "x$enable_tests" = "xyes"; then
++  AC_CONFIG_FILES(tests/Makefile tests/check-namespace.sh)
++fi
++
++AC_CONFIG_FILES(Makefile src/Makefile
++                include/libunwind-common.h
+                 include/libunwind.h include/tdep/libunwind_i.h)
+ AC_CONFIG_FILES(src/unwind/libunwind.pc src/coredump/libunwind-coredump.pc
+                 src/ptrace/libunwind-ptrace.pc src/setjmp/libunwind-setjmp.pc
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/libunwind/0001-disable-tests.patch b/bsp/buildroot/package/libunwind/0001-disable-tests.patch
deleted file mode 100644
index 05475a5d..00000000
--- a/bsp/buildroot/package/libunwind/0001-disable-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Disable building of tests
-
-libunwind tests do not build with uClibc, so we disable them.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile.am
-===================================================================
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -36,7 +36,7 @@
- 
- nodist_include_HEADERS = include/libunwind-common.h
- 
--SUBDIRS = src tests doc
-+SUBDIRS = src doc
- 
- noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h	\
- 	include/compiler.h include/libunwind_i.h include/mempool.h	\
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -313,7 +313,7 @@
- 	$(am__append_7) $(am__append_8) $(am__append_9) \
- 	$(am__append_10)
- nodist_include_HEADERS = include/libunwind-common.h
--SUBDIRS = src tests doc
-+SUBDIRS = src doc
- noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h	\
- 	include/compiler.h include/libunwind_i.h include/mempool.h	\
- 	include/remote.h						\
diff --git a/bsp/buildroot/package/libunwind/0003-Fix-compilation-of-tests-on-alpine-linux-musl-libc.patch b/bsp/buildroot/package/libunwind/0003-Fix-compilation-of-tests-on-alpine-linux-musl-libc.patch
new file mode 100644
index 00000000..411b40d1
--- /dev/null
+++ b/bsp/buildroot/package/libunwind/0003-Fix-compilation-of-tests-on-alpine-linux-musl-libc.patch
@@ -0,0 +1,88 @@
+From 5dcb7cd3cb63bf8a3a5f7531d10f937053930a25 Mon Sep 17 00:00:00 2001
+From: Tony Kelman <tony@kelman.net>
+Date: Sun, 31 Jan 2016 08:31:04 +0000
+Subject: [PATCH] Fix compilation of tests on alpine linux (musl libc)
+
+If we don't link to libexecinfo, as detected by the
+AC_SEARCH_LIBS(backtrace, execinfo) configure probe, we get
+
+```
+test-coredump-unwind.o: In function `handle_sigsegv':
+/home/libunwind/tests/test-coredump-unwind.c:246: undefined reference to
+`backtrace_symbols_fd'
+collect2: error: ld returned 1 exit status
+Makefile:1187: recipe for target 'test-coredump-unwind' failed
+```
+
+and
+
+```
+Gtest-init.o: In function `do_backtrace()':
+Gtest-init.cxx:(.text+0x2f): undefined reference to `_Ux86_64_getcontext'
+Gtest-init.cxx:(.text+0x48): undefined reference to `_Ux86_64_init_local'
+Gtest-init.cxx:(.text+0x63): undefined reference to `_Ux86_64_get_reg'
+Gtest-init.cxx:(.text+0x96): undefined reference to `_Ux86_64_get_proc_name'
+Gtest-init.cxx:(.text+0x171): undefined reference to `_Ux86_64_step'
+collect2: error: ld returned 1 exit status
+Makefile:1063: recipe for target 'Gtest-init' failed
+```
+
+There are 2 XFAIL and 6 FAIL tests, but it's a start
+
+Backported from upstream master branch:
+https://github.com/libunwind/libunwind/commit/5dcb7cd3cb63bf8a3a5f7531d10f937053930a25
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac      | 5 +++++
+ tests/Makefile.am | 4 ++--
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6c46cf3..21bae90 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -373,6 +373,10 @@ old_LIBS="$LIBS"
+ LIBS=""
+ AC_SEARCH_LIBS(backtrace, execinfo)
+ LIBS="$old_LIBS"
++case "$ac_cv_search_backtrace" in
++  -l*) BACKTRACELIB=$ac_cv_search_backtrace;;
++  *) BACKTRACELIB="";;
++esac
+ 
+ AC_SUBST(build_arch)
+ AC_SUBST(target_os)
+@@ -388,6 +392,7 @@ AC_SUBST(PKG_MAINTAINER)
+ AC_SUBST(enable_cxx_exceptions)
+ AC_SUBST(enable_debug_frame)
+ AC_SUBST(DLLIB)
++AC_SUBST(BACKTRACELIB)
+ 
+ AC_PATH_PROG([LATEX2MAN],[latex2man])
+ if test "x$LATEX2MAN" = "x"; then
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 0a74881..cd3e589 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -179,7 +179,7 @@ Gtest_bt_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+ Gtest_concurrent_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) -lpthread
+ Gtest_dyn1_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+ Gtest_exc_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+-Gtest_init_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
++Gtest_init_LDADD = $(LIBUNWIND) $(LIBUNWIND_local) @BACKTRACELIB@
+ Gtest_resume_sig_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+ Gtest_resume_sig_rt_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+ Gperf_simple_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+@@ -203,7 +203,7 @@ test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+ ia64_test_setjmp_LDADD = $(LIBUNWIND_setjmp)
+ 
+ if BUILD_COREDUMP
+-test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND)
++test_coredump_unwind_LDADD = $(LIBUNWIND_coredump) $(LIBUNWIND) @BACKTRACELIB@
+ endif
+ 
+ Gia64_test_nat_LDADD = $(LIBUNWIND) $(LIBUNWIND_local)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch b/bsp/buildroot/package/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch
deleted file mode 100644
index 7ea25129..00000000
--- a/bsp/buildroot/package/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f1684379dfaf8018d5d4c1945e292a56d0fab245 Mon Sep 17 00:00:00 2001
-From: Thierry Reding <treding@nvidia.com>
-Date: Fri, 27 Jun 2014 08:40:33 +0200
-Subject: [PATCH] Link libunwind to libgcc_s rather than libgcc
-
-For some architectures, -lgcc and -lgcc_s are not equivalent. On ARM for
-example, libgcc_s.so.1 contains some symbols needed by libunwind which
-are not present in libgcc.
-
-This causes the following link error when building the X.Org X server
-with libunwind support:
-
-	  CCLD     Xorg
-	/usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr0'
-	/usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr1'
-
-Linking against libgcc_s explicitly solves this problem.
-
-Signed-off-by: Thierry Reding <treding@nvidia.com>
-[yann.morin.1998@free.fr: backport to libunwind 1.1]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4e2fd23..a77cf01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -258,7 +258,7 @@ else
- 
- if test x$GCC = xyes -a x$intel_compiler != xyes; then
-   CFLAGS="${CFLAGS} -fexceptions -Wall -Wsign-compare"
--  LIBCRTS="-lgcc"
-+  LIBCRTS="-lgcc_s"
- fi
- AC_MSG_RESULT([$intel_compiler])
- 
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/libunwind/0004-libunwind-arm-fix-build-failure-due-to-asm.patch b/bsp/buildroot/package/libunwind/0004-libunwind-arm-fix-build-failure-due-to-asm.patch
new file mode 100644
index 00000000..cfd0c550
--- /dev/null
+++ b/bsp/buildroot/package/libunwind/0004-libunwind-arm-fix-build-failure-due-to-asm.patch
@@ -0,0 +1,43 @@
+From c7ab998ec52b09d61ec3c0ea62aa07cd26077ea3 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@smile.fr>
+Date: Mon, 3 Jul 2017 14:43:02 +0200
+Subject: [PATCH] libunwind-arm: fix build failure due to asm()
+
+The gcc documentation [1] suggest to use __asm__ instead of asm.
+
+Fixes:
+http://autobuild.buildroot.net/results/3ef/3efe156b6494e4392b6c31de447ee2c72acc1a53
+
+[1] https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
+
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ include/libunwind-arm.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/libunwind-arm.h b/include/libunwind-arm.h
+index f208487..1c856fa 100644
+--- a/include/libunwind-arm.h
++++ b/include/libunwind-arm.h
+@@ -265,7 +265,7 @@ unw_tdep_context_t;
+ #ifndef __thumb__
+ #define unw_tdep_getcontext(uc) (({                                     \
+   unw_tdep_context_t *unw_ctx = (uc);                                   \
+-  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;          \
++  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;      \
+   __asm__ __volatile__ (                                                \
+     "stmia %[base], {r0-r15}"                                           \
+     : : [base] "r" (unw_base) : "memory");                              \
+@@ -273,7 +273,7 @@ unw_tdep_context_t;
+ #else /* __thumb__ */
+ #define unw_tdep_getcontext(uc) (({                                     \
+   unw_tdep_context_t *unw_ctx = (uc);                                   \
+-  register unsigned long *unw_base asm ("r0") = unw_ctx->regs;          \
++  register unsigned long *unw_base __asm__ ("r0") = unw_ctx->regs;      \
+   __asm__ __volatile__ (                                                \
+     ".align 2\nbx pc\nnop\n.code 32\n"                                  \
+     "stmia %[base], {r0-r15}\n"                                         \
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/libunwind/Config.in b/bsp/buildroot/package/libunwind/Config.in
index 9007ce51..be576d13 100644
--- a/bsp/buildroot/package/libunwind/Config.in
+++ b/bsp/buildroot/package/libunwind/Config.in
@@ -10,26 +10,26 @@
 config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
 	bool
 	default y if BR2_TOOLCHAIN_USES_GLIBC && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_mips || BR2_mipsel || BR2_mips64 || \
+		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || BR2_mips64 || \
 		 BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_mips || BR2_mipsel || \
+		(BR2_ARM_CPU_HAS_ARM || BR2_mips || BR2_mipsel || \
 		 BR2_mips64 || BR2_mips64el || BR2_x86_64)
 	default y if BR2_TOOLCHAIN_USES_MUSL && \
-		(((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \
-		 BR2_i386 || BR2_x86_64)
+		(BR2_ARM_CPU_HAS_ARM || BR2_x86_64)
 
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
+	# forcefully links against libgcc_s, only available in dynamic
+	# linking configurations
+	depends on !BR2_STATIC_LIBS
 	help
 	  C API to determine the call-chain of a program.
 
 	  http://www.nongnu.org/libunwind/index.html
 
-comment "libunwind needs a toolchain w/ threads"
+comment "libunwind needs a toolchain w/ threads, dynamic library"
 	depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libunwind/libunwind.hash b/bsp/buildroot/package/libunwind/libunwind.hash
index 7ec47fab..2f6c8ec7 100644
--- a/bsp/buildroot/package/libunwind/libunwind.hash
+++ b/bsp/buildroot/package/libunwind/libunwind.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a  libunwind-1.1.tar.gz
+sha256 3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb  libunwind-1.2.1.tar.gz
diff --git a/bsp/buildroot/package/libunwind/libunwind.mk b/bsp/buildroot/package/libunwind/libunwind.mk
index a75a8884..7adf3189 100644
--- a/bsp/buildroot/package/libunwind/libunwind.mk
+++ b/bsp/buildroot/package/libunwind/libunwind.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-LIBUNWIND_VERSION = 1.1
+LIBUNWIND_VERSION = 1.2.1
 LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind
 LIBUNWIND_INSTALL_STAGING = YES
 LIBUNWIND_LICENSE_FILES = COPYING
 LIBUNWIND_LICENSE = MIT
 LIBUNWIND_AUTORECONF = YES
 
+LIBUNWIND_CONF_OPTS = --disable-tests
+
 ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y)
 LIBUNWIND_DEPENDENCIES = libatomic_ops
 endif
diff --git a/bsp/buildroot/package/libupnp/Config.in b/bsp/buildroot/package/libupnp/Config.in
index 6a07b42d..7c6c3760 100644
--- a/bsp/buildroot/package/libupnp/Config.in
+++ b/bsp/buildroot/package/libupnp/Config.in
@@ -2,10 +2,11 @@ config BR2_PACKAGE_LIBUPNP
 	bool "libupnp"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  The portable SDK for UPnP(tm) Devices (libupnp) provides developers
-	  with an API and open source code for building control points,
-	  devices, and bridges that are compliant with Version 1.0 of the
-	  Universal Plug and Play Device Architecture Specification
+	  The portable SDK for UPnP(tm) Devices (libupnp) provides
+	  developers with an API and open source code for building
+	  control points, devices, and bridges that are compliant with
+	  Version 1.0 of the Universal Plug and Play Device Architecture
+	  Specification
 
 	  http://pupnp.sourceforge.net/
 
diff --git a/bsp/buildroot/package/libupnp/libupnp.hash b/bsp/buildroot/package/libupnp/libupnp.hash
index df39f327..e52b7ea9 100644
--- a/bsp/buildroot/package/libupnp/libupnp.hash
+++ b/bsp/buildroot/package/libupnp/libupnp.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256	af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b	libupnp-1.6.21.tar.bz2
+sha256	c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43	libupnp-1.6.25.tar.bz2
+sha256	0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd	LICENSE
diff --git a/bsp/buildroot/package/libupnp/libupnp.mk b/bsp/buildroot/package/libupnp/libupnp.mk
index 8236cee1..8831885b 100644
--- a/bsp/buildroot/package/libupnp/libupnp.mk
+++ b/bsp/buildroot/package/libupnp/libupnp.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBUPNP_VERSION = 1.6.21
+LIBUPNP_VERSION = 1.6.25
 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2
 LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION)
 LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no
 LIBUPNP_INSTALL_STAGING = YES
-LIBUPNP_LICENSE = BSD-3c
+LIBUPNP_LICENSE = BSD-3-Clause
 LIBUPNP_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libupnp18/Config.in b/bsp/buildroot/package/libupnp18/Config.in
new file mode 100644
index 00000000..58508e4e
--- /dev/null
+++ b/bsp/buildroot/package/libupnp18/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_LIBUPNP18
+	bool "libupnp18"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_PACKAGE_LIBUPNP
+	help
+	  The portable SDK for UPnP(tm) Devices (libupnp) provides
+	  developers with an API and open source code for building
+	  control points, devices, and bridges that are compliant with
+	  Version 1.0 of the Universal Plug and Play Device Architecture
+	  Specification
+
+	  http://pupnp.sourceforge.net/
+
+comment "libupnp18 needs a toolchain w/ threads"
+	depends on !BR2_PACKAGE_LIBUPNP
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libupnp18/libupnp18.hash b/bsp/buildroot/package/libupnp18/libupnp18.hash
new file mode 100644
index 00000000..dd59034c
--- /dev/null
+++ b/bsp/buildroot/package/libupnp18/libupnp18.hash
@@ -0,0 +1,5 @@
+# From https://sourceforge.net/projects/pupnp/files/pupnp/libUPnP%201.8.3/libupnp-1.8.3.tar.bz2.sha1
+sha1 e7c28c24905ae972ff3277a7bdaa9b839f6c66b9  libupnp-1.8.3.tar.bz2
+# Locally computed:
+sha256	9afa0b09faa9ebd9e8a6425ddbfe8d1d856544c49b1f86fde221219e569a308d	libupnp-1.8.3.tar.bz2
+sha256	0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd	LICENSE
diff --git a/bsp/buildroot/package/libupnp18/libupnp18.mk b/bsp/buildroot/package/libupnp18/libupnp18.mk
new file mode 100644
index 00000000..a75558e9
--- /dev/null
+++ b/bsp/buildroot/package/libupnp18/libupnp18.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libupnp18
+#
+################################################################################
+
+LIBUPNP18_VERSION = 1.8.3
+LIBUPNP18_SOURCE = libupnp-$(LIBUPNP18_VERSION).tar.bz2
+LIBUPNP18_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP18_VERSION)
+LIBUPNP18_CONF_ENV = ac_cv_lib_compat_ftime=no
+LIBUPNP18_INSTALL_STAGING = YES
+LIBUPNP18_LICENSE = BSD-3-Clause
+LIBUPNP18_LICENSE_FILES = LICENSE
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libupnpp/Config.in b/bsp/buildroot/package/libupnpp/Config.in
index 2d995867..32877ff5 100644
--- a/bsp/buildroot/package/libupnpp/Config.in
+++ b/bsp/buildroot/package/libupnpp/Config.in
@@ -1,16 +1,16 @@
 config BR2_PACKAGE_LIBUPNPP
 	bool "libupnpp"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBUPNP
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
 	help
-	  The libupnpp C++ library wraps libupnp for easier use by upmpdcli and
-	  upplay.
+	  The libupnpp C++ library wraps libupnp for easier use by
+	  upmpdcli and upplay.
 
 	  http://www.lesbonscomptes.com/upmpdcli/
 
-comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 4.6"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
+comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 4.9"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/bsp/buildroot/package/libupnpp/libupnpp.hash b/bsp/buildroot/package/libupnpp/libupnpp.hash
index dde4c4f6..fe67987c 100644
--- a/bsp/buildroot/package/libupnpp/libupnpp.hash
+++ b/bsp/buildroot/package/libupnpp/libupnpp.hash
@@ -1,2 +1,5 @@
-# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.1.tar.gz.sha256
-sha256  c558e6285d61485e656bc973511396665b68b1d5cfa34db5fa4e64e0f2026c3a  libupnpp-0.15.1.tar.gz
+# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.16.0.tar.gz.sha256
+sha256  b34b179e69c46993cf360da9e85db646b03c15ab2927b19eb70e27bf3c359017  libupnpp-0.16.0.tar.gz
+
+# Hash for license file:
+sha256  00a89b0d18aacd4114decf79122db87bf35bddaf2bc50e383c9c9f4c263390b2  COPYING
diff --git a/bsp/buildroot/package/libupnpp/libupnpp.mk b/bsp/buildroot/package/libupnpp/libupnpp.mk
index 0cb3eae2..98cb515f 100644
--- a/bsp/buildroot/package/libupnpp/libupnpp.mk
+++ b/bsp/buildroot/package/libupnpp/libupnpp.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBUPNPP_VERSION = 0.15.1
+LIBUPNPP_VERSION = 0.16.0
 LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
-LIBUPNPP_LICENSE = GPLv2+
+LIBUPNPP_LICENSE = LGPL-2.1+
 LIBUPNPP_LICENSE_FILES = COPYING
 LIBUPNPP_INSTALL_STAGING = YES
 LIBUPNPP_DEPENDENCIES = expat libcurl libupnp
diff --git a/bsp/buildroot/package/liburcu/Config.in b/bsp/buildroot/package/liburcu/Config.in
index b5b63268..2598181a 100644
--- a/bsp/buildroot/package/liburcu/Config.in
+++ b/bsp/buildroot/package/liburcu/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
 	bool
+	default y
 	depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64
 	depends on BR2_USE_MMU # fork() in test
-	default y
 
 config BR2_PACKAGE_LIBURCU
 	bool "liburcu"
@@ -16,8 +16,8 @@ config BR2_PACKAGE_LIBURCU
 
 	  On ARM, because of bug:
 	    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854
-	  liburcu cannot be built using gcc 4.8.0, 4.8.1 or 4.8.2 without the
-	  following bug fix:
+	  liburcu cannot be built using gcc 4.8.0, 4.8.1 or 4.8.2
+	  without the following bug fix:
 	    http://gcc.gnu.org/viewcvs/gcc?view=revision&revision=204665
 
 	  http://lttng.org/urcu
diff --git a/bsp/buildroot/package/liburcu/liburcu.mk b/bsp/buildroot/package/liburcu/liburcu.mk
index c21c210a..d8579f6c 100644
--- a/bsp/buildroot/package/liburcu/liburcu.mk
+++ b/bsp/buildroot/package/liburcu/liburcu.mk
@@ -7,7 +7,7 @@
 LIBURCU_VERSION = 0.9.2
 LIBURCU_SITE = http://lttng.org/files/urcu
 LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2
-LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPLv2+ (test), GPLv3 (few *.m4 files)
+LIBURCU_LICENSE = LGPL-2.1+ (library), MIT-like (few source files listed in LICENSE), GPL-2.0+ (test), GPL-3.0 (few *.m4 files)
 LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE
 
 LIBURCU_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/liburiparser/Config.in b/bsp/buildroot/package/liburiparser/Config.in
index 95a6fe83..e85a2626 100644
--- a/bsp/buildroot/package/liburiparser/Config.in
+++ b/bsp/buildroot/package/liburiparser/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBURIPARSER
 	bool "liburiparser"
 	help
-	  uriparser is a strictly RFC 3986 compliant URI parsing and handling
-	  library written in C.
+	  uriparser is a strictly RFC 3986 compliant URI parsing and
+	  handling library written in C.
 
 	  http://uriparser.sourceforge.net
diff --git a/bsp/buildroot/package/liburiparser/liburiparser.hash b/bsp/buildroot/package/liburiparser/liburiparser.hash
index 84340f8b..9e9517c1 100644
--- a/bsp/buildroot/package/liburiparser/liburiparser.hash
+++ b/bsp/buildroot/package/liburiparser/liburiparser.hash
@@ -1,3 +1,5 @@
-# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.1/
-md5	4e4c5f0ee6abb111a431c45e144247aa		uriparser-0.8.1.tar.bz2
-sha1	4405d8baa0d9f5bc0319e6d5e68770acab67b602	uriparser-0.8.1.tar.bz2
+# From http://sourceforge.net/projects/uriparser/files/Sources/0.8.4/
+md5	9aabdc3611546f553f4af372167de6d6		uriparser-0.8.4.tar.bz2
+sha1	7a1948c20bed54b04dad0e1d7d2fa8f80fc7b2b3	uriparser-0.8.4.tar.bz2
+# Locally calculated
+sha256  c6ef125800c2ef13a41a22126bfc77e8b8c08993a6b96196117695988ea76249  COPYING
diff --git a/bsp/buildroot/package/liburiparser/liburiparser.mk b/bsp/buildroot/package/liburiparser/liburiparser.mk
index 661fa960..856a6aaf 100644
--- a/bsp/buildroot/package/liburiparser/liburiparser.mk
+++ b/bsp/buildroot/package/liburiparser/liburiparser.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBURIPARSER_VERSION = 0.8.1
+LIBURIPARSER_VERSION = 0.8.4
 LIBURIPARSER_SOURCE = uriparser-$(LIBURIPARSER_VERSION).tar.bz2
 LIBURIPARSER_SITE = http://sourceforge.net/projects/uriparser/files/Sources/$(LIBURIPARSER_VERSION)
-LIBURIPARSER_LICENSE = BSD-3c
+LIBURIPARSER_LICENSE = BSD-3-Clause
 LIBURIPARSER_LICENSE_FILES = COPYING
 LIBURIPARSER_INSTALL_STAGING = YES
 LIBURIPARSER_CONF_OPTS = --disable-test
diff --git a/bsp/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch b/bsp/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch
index ad71199c..35872a97 100644
--- a/bsp/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch
+++ b/bsp/buildroot/package/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch
@@ -1,7 +1,7 @@
-From 2e9b6bbebb7cf1ef0095516ec6d5203deb3822e8 Mon Sep 17 00:00:00 2001
+From 87adda6abc3467ede45a6d2a87df2b9efdf5bb33 Mon Sep 17 00:00:00 2001
 From: Nathan Hjelm <hjelmn@me.com>
 Date: Fri, 9 Oct 2015 15:03:10 -0600
-Subject: [PATCH 1/1] Use C99 standard fixed width integer types in usb.h
+Subject: [PATCH] Use C99 standard fixed width integer types in usb.h
 
 This patch modifies the integer types in usb.h of the form u_int* to the
 C99 standard uint* types.
@@ -13,6 +13,7 @@ https://github.com/libusb/libusb-compat-0.1/commit/2e9b6bbebb7cf1ef0095516ec6d52
 
 Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com>
 Signed-off-by: Nathan Hjelm <hjelmn@me.com>
+Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
 ---
  libusb/usb.h | 130 ++++++++++++++++++++++++++++++++---------------------------
  1 file changed, 70 insertions(+), 60 deletions(-)
@@ -232,5 +233,5 @@ index 84e730f..d2c30aa 100644
    struct usb_device *root_dev;
  };
 -- 
-2.4.9
+2.9.3
 
diff --git a/bsp/buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch b/bsp/buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch
new file mode 100644
index 00000000..d2e26b32
--- /dev/null
+++ b/bsp/buildroot/package/libusb-compat/0002-fix-a-build-issue-on-linux.patch
@@ -0,0 +1,32 @@
+From af07587e8775c25450cda8ba9e9a8b1a58072634 Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <brgl@bgdev.pl>
+Date: Mon, 3 Jul 2017 15:55:00 +0200
+Subject: [PATCH] fix a build issue on linux
+
+On linux PATH_MAX is defined in linux/limits.h. If we include usb.h
+without previously having indirectly included it, the build fails.
+
+Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
+---
+ libusb/usb.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libusb/usb.h b/libusb/usb.h
+index d2c30aa..7ad9a66 100644
+--- a/libusb/usb.h
++++ b/libusb/usb.h
+@@ -41,6 +41,11 @@ typedef unsigned __int32  uint32_t;
+ #include <stdint.h>
+ #endif
+ 
++/* On linux PATH_MAX is defined in linux/limits.h. */
++#if defined(__linux__)
++#include <linux/limits.h>
++#endif
++
+ /*
+  * USB spec information
+  *
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/libusb-compat/libusb-compat.mk b/bsp/buildroot/package/libusb-compat/libusb-compat.mk
index 26107be8..61d4c203 100644
--- a/bsp/buildroot/package/libusb-compat/libusb-compat.mk
+++ b/bsp/buildroot/package/libusb-compat/libusb-compat.mk
@@ -12,7 +12,7 @@ LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb
 HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf host-libusb
 LIBUSB_COMPAT_INSTALL_STAGING = YES
 LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config
-LIBUSB_COMPAT_LICENSE = LGPLv2.1+
+LIBUSB_COMPAT_LICENSE = LGPL-2.1+
 LIBUSB_COMPAT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libusb/0001-parallel-make.patch b/bsp/buildroot/package/libusb/0001-parallel-make.patch
deleted file mode 100644
index a326e995..00000000
--- a/bsp/buildroot/package/libusb/0001-parallel-make.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-Fix parallel build
-
-This patch is a partial backport of
-https://github.com/libusb/libusb/commit/3dc781ce3ecd0315cfc0b4fdcef9e062990f289b
-
-Signed-off-by: Jeroen Roovers <jer@airfi.aero>
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,6 +36,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RU
- 
- AC_PREREQ([2.50])
- AC_PROG_CC
-+AC_PROG_CXX
- LT_INIT
- LT_LANG([Windows Resource])
- AC_C_INLINE
-@@ -91,7 +92,6 @@ case $host in
- 	;;
- *-haiku*)
- 	AC_MSG_RESULT([Haiku])
--	AC_CONFIG_SUBDIRS([libusb/os/haiku])
- 	backend="haiku"
- 	threads="posix"
- 	;;
-@@ -193,6 +193,7 @@ AM_CONDITIONAL(OS_HAIKU, test "x$backend
- AM_CONDITIONAL(THREADS_POSIX, test "x$threads" = xposix)
- AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = "xyes")
- AM_CONDITIONAL(USE_UDEV, test "x$enable_udev" = xyes)
-+AM_CONDITIONAL(USE_USBDK, test "x$enable_usbdk" = xyes)
- if test "$threads" = posix; then
- 	AC_DEFINE(THREADS_POSIX, 1, [Use POSIX Threads])
- fi
---- a/libusb/Makefile.am
-+++ b/libusb/Makefile.am
-@@ -4,58 +4,66 @@ AUTOMAKE_OPTIONS = subdir-objects
- 
- lib_LTLIBRARIES = libusb-1.0.la
- 
--POSIX_POLL_SRC = os/poll_posix.c
--LINUX_USBFS_SRC = os/linux_usbfs.c
--DARWIN_USB_SRC = os/darwin_usb.c
-+POSIX_POLL_SRC = os/poll_posix.h os/poll_posix.c
-+POSIX_THREADS_SRC = os/threads_posix.h os/threads_posix.c
-+WINDOWS_POLL_SRC = os/poll_windows.h os/poll_windows.c
-+WINDOWS_THREADS_SRC = os/threads_windows.h os/threads_windows.c
-+LINUX_USBFS_SRC = os/linux_usbfs.h os/linux_usbfs.c
-+DARWIN_USB_SRC = os/darwin_usb.h os/darwin_usb.c
- OPENBSD_USB_SRC = os/openbsd_usb.c
- NETBSD_USB_SRC = os/netbsd_usb.c
--WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def
--WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h
--
--DIST_SUBDIRS = 
--
--EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \
--	$(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \
--	$(POSIX_POLL_SRC) \
--	os/threads_posix.c os/threads_windows.c \
-+WINDOWS_COMMON_SRC = os/windows_nt_common.h os/windows_nt_common.c \
-+                     os/windows_common.h libusb-1.0.rc libusb-1.0.def
-+WINDOWS_USB_SRC = os/windows_winusb.h os/windows_winusb.c
-+WINDOWS_USBDK_SRC = os/windows_usbdk.h os/windows_usbdk.c
-+WINCE_USB_SRC = os/wince_usb.h os/wince_usb.c
-+HAIKU_USB_SRC = os/haiku_usb.h os/haiku_usb_backend.cpp \
-+		os/haiku_usb_raw.h os/haiku_usb_raw.cpp os/haiku_pollfs.cpp
-+
-+EXTRA_DIST = $(POSIX_POLL_SRC) $(POSIX_THREADS_SRC) \
-+	$(WINDOWS_POLL_SRC) $(WINDOWS_THREADS_SRC) \
-+	$(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) \
-+	$(OPENBSD_USB_SRC) $(NETBSD_USB_SRC) \
-+	$(WINDOWS_COMMON_SRC) $(WINDOWS_USB_SRC) $(WINDOWS_USBDK_SRC) \
-+        $(WINCE_USB_SRC) $(HAIKU_USB_SRC) \
- 	os/linux_udev.c os/linux_netlink.c
- 
--dist-hook:
--	cp -r os/haiku $(distdir)/os/haiku
--	rm -rf $(distdir)/os/haiku/autom4te.cache
--
- if OS_LINUX
- 
- if USE_UDEV
--OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \
--	os/linux_udev.c
-+OS_SRC = $(LINUX_USBFS_SRC) os/linux_udev.c
- else
--OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \
--	os/linux_netlink.c
-+OS_SRC = $(LINUX_USBFS_SRC) os/linux_netlink.c
- endif
- 
- endif
- 
- if OS_DARWIN
--OS_SRC = $(DARWIN_USB_SRC) $(POSIX_POLL_SRC)
-+OS_SRC = $(DARWIN_USB_SRC)
- AM_CFLAGS_EXT = -no-cpp-precomp
- endif
- 
- if OS_OPENBSD
--OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC)
-+OS_SRC = $(OPENBSD_USB_SRC)
- endif
- 
- if OS_NETBSD
--OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC)
-+OS_SRC = $(NETBSD_USB_SRC)
- endif
- 
- if OS_HAIKU
--OS_SRC = $(POSIX_POLL_SRC)
--SUBDIRS = os/haiku
-+noinst_LTLIBRARIES = libusb_haiku.la
-+libusb_haiku_la_SOURCES = $(HAIKU_USB_SRC)
-+libusb_1_0_la_LIBADD = libusb_haiku.la
- endif
- 
- if OS_WINDOWS
--OS_SRC = $(WINDOWS_USB_SRC)
-+
-+if USE_USBDK
-+OS_SRC = $(WINDOWS_USBDK_SRC) $(WINDOWS_COMMON_SRC)
-+else
-+OS_SRC = $(WINDOWS_USB_SRC) $(WINDOWS_COMMON_SRC)
-+endif
- 
- .rc.lo:
- 	$(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@
-@@ -69,22 +77,23 @@ if CREATE_IMPORT_LIB
- 	$(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a
- endif
- 
-+if OS_WINDOWS
-+POLL_SRC = $(WINDOWS_POLL_SRC)
-+else
-+POLL_SRC = $(POSIX_POLL_SRC)
-+endif
-+
- if THREADS_POSIX
--THREADS_SRC = os/threads_posix.h os/threads_posix.c
-+THREADS_SRC = $(POSIX_THREADS_SRC)
- else
--THREADS_SRC = os/threads_windows.h os/threads_windows.c
-+THREADS_SRC = $(WINDOWS_THREADS_SRC)
- endif
- 
- libusb_1_0_la_CFLAGS = $(AM_CFLAGS)
- libusb_1_0_la_LDFLAGS = $(LTLDFLAGS)
--libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c strerror.c sync.c \
--	os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h os/windows_common.h \
--	hotplug.h hotplug.c $(THREADS_SRC) $(OS_SRC) \
--	os/poll_posix.h os/poll_windows.h
--
--if OS_HAIKU
--libusb_1_0_la_LIBADD = os/haiku/libhaikuusb.la
--endif
-+libusb_1_0_la_SOURCES = libusbi.h libusb.h version.h version_nano.h \
-+	core.c descriptor.c hotplug.h hotplug.c io.c strerror.c sync.c \
-+	$(POLL_SRC) $(THREADS_SRC) $(OS_SRC)
- 
- hdrdir = $(includedir)/libusb-1.0
- hdr_HEADERS = libusb.h
diff --git a/bsp/buildroot/package/libusb/libusb.hash b/bsp/buildroot/package/libusb/libusb.hash
index c809896f..0415aab5 100644
--- a/bsp/buildroot/package/libusb/libusb.hash
+++ b/bsp/buildroot/package/libusb/libusb.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff  libusb-1.0.20.tar.bz2
+sha256 7dce9cce9a81194b7065ee912bcd55eeffebab694ea403ffb91b67db66b1824b  libusb-1.0.21.tar.bz2
diff --git a/bsp/buildroot/package/libusb/libusb.mk b/bsp/buildroot/package/libusb/libusb.mk
index 4d05feb8..f0bb9e33 100644
--- a/bsp/buildroot/package/libusb/libusb.mk
+++ b/bsp/buildroot/package/libusb/libusb.mk
@@ -5,15 +5,13 @@
 ################################################################################
 
 LIBUSB_VERSION_MAJOR = 1.0
-LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).20
+LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).21
 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2
 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION)
-LIBUSB_LICENSE = LGPLv2.1+
+LIBUSB_LICENSE = LGPL-2.1+
 LIBUSB_LICENSE_FILES = COPYING
 LIBUSB_DEPENDENCIES = host-pkgconf
 LIBUSB_INSTALL_STAGING = YES
-# 0001-parallel-make.patch
-LIBUSB_AUTORECONF = YES
 
 # Avoid the discovery of udev for the host variant
 HOST_LIBUSB_CONF_OPTS = --disable-udev
diff --git a/bsp/buildroot/package/libusbgx/libusbgx.mk b/bsp/buildroot/package/libusbgx/libusbgx.mk
index 1340d2d1..1964b47d 100644
--- a/bsp/buildroot/package/libusbgx/libusbgx.mk
+++ b/bsp/buildroot/package/libusbgx/libusbgx.mk
@@ -6,7 +6,7 @@
 
 LIBUSBGX_VERSION = 2e3d43ee098ed928d1baa61ce791ce9ff4788c5a
 LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,$(LIBUSBGX_VERSION))
-LIBUSBGX_LICENSE = GPLv2+ (examples), LGPLv2.1+ (library)
+LIBUSBGX_LICENSE = GPL-2.0+ (examples), LGPL-2.1+ (library)
 LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL
 LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig
 LIBUSBGX_AUTORECONF = YES
diff --git a/bsp/buildroot/package/libuv/libuv.hash b/bsp/buildroot/package/libuv/libuv.hash
index 9ad1c8a7..1a2833e7 100644
--- a/bsp/buildroot/package/libuv/libuv.hash
+++ b/bsp/buildroot/package/libuv/libuv.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256  6ec7eec6ecc24b1a8ffedebedb2fe9313fffb5410de89aaf784dd01080411c7a  libuv-v1.11.0.tar.gz
+sha256  ccc5f3b43ed171640513786e5e809508cb6308279b4d71a016e4550ad62f1686  libuv-v1.19.2.tar.gz
+sha256  6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b  LICENSE
diff --git a/bsp/buildroot/package/libuv/libuv.mk b/bsp/buildroot/package/libuv/libuv.mk
index 6f6a1cc9..2e07d3a0 100644
--- a/bsp/buildroot/package/libuv/libuv.mk
+++ b/bsp/buildroot/package/libuv/libuv.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-LIBUV_VERSION = v1.11.0
+LIBUV_VERSION = v1.19.2
 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
 LIBUV_DEPENDENCIES = host-pkgconf
 LIBUV_INSTALL_STAGING = YES
 LIBUV_AUTORECONF = YES
-LIBUV_LICENSE = BSD-2c, BSD-3c, ISC, MIT
+LIBUV_LICENSE = BSD-2-Clause, BSD-3-Clause, ISC, MIT
 LIBUV_LICENSE_FILES = LICENSE
 
 # Upstream needs tests to be run sequentially. This is the default in
diff --git a/bsp/buildroot/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch b/bsp/buildroot/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch
deleted file mode 100644
index 5bce2d91..00000000
--- a/bsp/buildroot/package/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9908872aaa614a6c4bba80d7a5f1adea7ca7117e Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Tue, 14 Feb 2017 21:27:59 +0100
-Subject: [PATCH] ir-ctl: fixes for musl compile
-
-- add copy of TEMP_FAILURE_RETRY macro
-- use strdup instead of strdupa
-
-Fixes [1]:
-
-  ir-ctl.c:(.text+0xb06): undefined reference to `strndupa'
-  ir-ctl.c:(.text+0xe01): undefined reference to `TEMP_FAILURE_RETRY'
-
-[1] http://autobuild.buildroot.net/results/b8b96c7bbf2147dacac62485cbfdbcfd758271a5
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- utils/ir-ctl/ir-ctl.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c
-index bc58cee..e9da777 100644
---- a/utils/ir-ctl/ir-ctl.c
-+++ b/utils/ir-ctl/ir-ctl.c
-@@ -44,6 +44,15 @@
- 
- # define N_(string) string
- 
-+/* taken from glibc unistd.h */
-+#ifndef TEMP_FAILURE_RETRY
-+#define TEMP_FAILURE_RETRY(expression) \
-+  (__extension__                                                              \
-+    ({ long int __result;                                                     \
-+       do __result = (long int) (expression);                                 \
-+       while (__result == -1L && errno == EINTR);                             \
-+       __result; }))
-+#endif
- 
- /* See drivers/media/rc/ir-lirc-codec.c line 23 */
- #define LIRCBUF_SIZE	512
-@@ -344,12 +353,14 @@ static struct file *read_scancode(const char *name)
- 		return NULL;
- 	}
- 
--	pstr = strndupa(name, p - name);
-+	pstr = strndup(name, p - name);
- 
- 	if (!protocol_match(pstr, &proto)) {
- 		fprintf(stderr, _("error: protocol '%s' not found\n"), pstr);
-+		free(pstr);
- 		return NULL;
- 	}
-+	free(pstr);
- 
- 	if (!strtoscancode(p + 1, &scancode)) {
- 		fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1);
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch b/bsp/buildroot/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch
new file mode 100644
index 00000000..656008b7
--- /dev/null
+++ b/bsp/buildroot/package/libv4l/0002-keytable-fix-EVIOCSCLOCKID-related-compile-failure.patch
@@ -0,0 +1,35 @@
+From 663b7be9d27c979c914011a3ce707e227987bc59 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sat, 3 Feb 2018 22:47:18 +0100
+Subject: [PATCH] keytable: fix EVIOCSCLOCKID related compile failure
+
+Fixes:
+
+  keytable.c: In function 'test_event':
+  keytable.c:1351:12: error: 'EVIOCSCLOCKID' undeclared (first use in this function)
+    ioctl(fd, EVIOCSCLOCKID, &mode);
+              ^~~~~~~~~~~~~
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ utils/keytable/keytable.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/utils/keytable/keytable.c b/utils/keytable/keytable.c
+index 34a1522e..925eab00 100644
+--- a/utils/keytable/keytable.c
++++ b/utils/keytable/keytable.c
+@@ -55,6 +55,10 @@ struct input_keymap_entry_v2 {
+ 	u_int8_t  scancode[32];
+ };
+ 
++#ifndef EVIOCSCLOCKID
++#define EVIOCSCLOCKID		_IOW('E', 0xa0, int)
++#endif
++
+ #ifndef EVIOCGKEYCODE_V2
+ #define EVIOCGKEYCODE_V2	_IOR('E', 0x04, struct input_keymap_entry_v2)
+ #define EVIOCSKEYCODE_V2	_IOW('E', 0x04, struct input_keymap_entry_v2)
+-- 
+2.16.1
+
diff --git a/bsp/buildroot/package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch b/bsp/buildroot/package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch
new file mode 100644
index 00000000..cd22be15
--- /dev/null
+++ b/bsp/buildroot/package/libv4l/0003-libdvbv5-add-optional-copy-of-TEMP_FAILURE_RETRY-mac.patch
@@ -0,0 +1,39 @@
+From abfe3e7b2b4af1de9b891f3a7a996b70533b0a27 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Sun, 4 Mar 2018 09:07:51 +0100
+Subject: [PATCH] libdvbv5: add optional copy of TEMP_FAILURE_RETRY macro (fix
+ musl compile)
+
+Fixes:
+
+  ../../lib/libdvbv5/.libs/libdvbv5.so: undefined reference to `TEMP_FAILURE_RETRY'
+
+[Upstream: https://www.mail-archive.com/linux-media@vger.kernel.org/msg127134.html]
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ lib/libdvbv5/dvb-dev-local.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/lib/libdvbv5/dvb-dev-local.c b/lib/libdvbv5/dvb-dev-local.c
+index 8bc99d1..7a76d65 100644
+--- a/lib/libdvbv5/dvb-dev-local.c
++++ b/lib/libdvbv5/dvb-dev-local.c
+@@ -44,6 +44,15 @@
+ # define _(string) string
+ #endif
+ 
++/* taken from glibc unistd.h */
++#ifndef TEMP_FAILURE_RETRY
++#define TEMP_FAILURE_RETRY(expression) \
++    ({ long int __result;                                                     \
++       do __result = (long int) (expression);                                 \
++       while (__result == -1L && errno == EINTR);                             \
++       __result; })
++#endif
++
+ struct dvb_dev_local_priv {
+ 	dvb_dev_change_t notify_dev_change;
+ 
+-- 
+2.16.2
+
diff --git a/bsp/buildroot/package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch b/bsp/buildroot/package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch
new file mode 100644
index 00000000..4c4365f9
--- /dev/null
+++ b/bsp/buildroot/package/libv4l/0004-Build-sdlcam-only-if-jpeg-is-enabled.patch
@@ -0,0 +1,31 @@
+From 5c407e130f8d0416f91f5a12bcdc2709f00dda65 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Fri, 29 Jun 2018 21:15:10 +0200
+Subject: [PATCH] Build sdlcam only if jpeg is enabled
+
+Fixes:
+ - http://autobuild.buildroot.net/results/1eded8b44cc369550566c6ce0b3c042f1aec8d44
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ contrib/test/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/contrib/test/Makefile.am b/contrib/test/Makefile.am
+index 0188fe21..c7c38e7a 100644
+--- a/contrib/test/Makefile.am
++++ b/contrib/test/Makefile.am
+@@ -17,8 +17,10 @@ noinst_PROGRAMS += v4l2gl
+ endif
+ 
+ if HAVE_SDL
++if HAVE_JPEG
+ noinst_PROGRAMS += sdlcam
+ endif
++endif
+ 
+ driver_test_SOURCES = driver-test.c
+ driver_test_LDADD = ../../utils/libv4l2util/libv4l2util.la
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/libv4l/Config.in b/bsp/buildroot/package/libv4l/Config.in
index 4da00342..57ddde1d 100644
--- a/bsp/buildroot/package/libv4l/Config.in
+++ b/bsp/buildroot/package/libv4l/Config.in
@@ -1,16 +1,15 @@
 config BR2_PACKAGE_LIBV4L
 	bool "libv4l"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU # fork()
-	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers
 	select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
-	  libv4l is a collection of libraries which adds a thin abstraction
-	  layer on top of video4linux2 devices. libv4l consists of 3 different
-	  libraries: libv4lconvert, libv4l1 and libv4l2.
+	  libv4l is a collection of libraries which adds a thin
+	  abstraction layer on top of video4linux2 devices. libv4l
+	  consists of 3 different libraries: libv4lconvert, libv4l1 and
+	  libv4l2.
 
 	  http://linuxtv.org/wiki/index.php/V4l-utils
 
@@ -21,10 +20,9 @@ comment "libv4l JPEG support not enabled"
 
 config BR2_PACKAGE_LIBV4L_UTILS
 	bool "v4l-utils tools"
-	depends on BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  v4l-utils is a collection of various video4linux and DVB utilities.
+	  v4l-utils is a collection of various video4linux and DVB
+	  utilities.
 	  Enable this if you want to build the following tools:
 	  - cx18-ctl
 	  - dvb-fe-tool, dvbv5-zap, dvbv5-scan, dvb-format-convert
@@ -37,12 +35,8 @@ config BR2_PACKAGE_LIBV4L_UTILS
 	  - rds-ctl
 	  - qv4l2 (if Qt is enabled)
 
-comment "libv4l-utils tools need a toolchain w/ locale"
-	depends on !BR2_ENABLE_LOCALE
-
 endif
 
-comment "libv4l needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
+comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
diff --git a/bsp/buildroot/package/libv4l/libv4l.hash b/bsp/buildroot/package/libv4l/libv4l.hash
index c02fa0ae..aea9cc98 100644
--- a/bsp/buildroot/package/libv4l/libv4l.hash
+++ b/bsp/buildroot/package/libv4l/libv4l.hash
@@ -1,2 +1,7 @@
+# Locally calculated after checking signature
+# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2.asc
+sha256 7974e5626447407d8a1ed531da0461c0fe00e599a696cb548a240d17d3519005  v4l-utils-1.14.1.tar.bz2
 # Locally calculated
-sha256	ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d	v4l-utils-1.12.2.tar.bz2
+sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a  COPYING
+sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78  COPYING.libv4l
+sha256 37d0f2c8dc3f267d864cb39d54f82c5092a599beb29cb5caa96d50d27e069a44  lib/libv4l1/libv4l1-kernelcode-license.txt
diff --git a/bsp/buildroot/package/libv4l/libv4l.mk b/bsp/buildroot/package/libv4l/libv4l.mk
index 4fec14f3..c95b2778 100644
--- a/bsp/buildroot/package/libv4l/libv4l.mk
+++ b/bsp/buildroot/package/libv4l/libv4l.mk
@@ -4,18 +4,22 @@
 #
 ################################################################################
 
-LIBV4L_VERSION = 1.12.2
+LIBV4L_VERSION = 1.14.1
 LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
-LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils
+LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
 LIBV4L_INSTALL_STAGING = YES
 LIBV4L_DEPENDENCIES = host-pkgconf
 LIBV4L_CONF_OPTS = --disable-doxygen-doc
+# We're patching contrib/test/Makefile.am
+LIBV4L_AUTORECONF = YES
+# add host-gettext for AM_ICONV macro
+LIBV4L_DEPENDENCIES += host-gettext
 
 # fix uclibc-ng configure/compile
 LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
 # v4l-utils components have different licences, see v4l-utils.spec for details
-LIBV4L_LICENSE = GPLv2+ (utilities), LGPLv2.1+ (libraries)
+LIBV4L_LICENSE = GPL-2.0+ (utilities), LGPL-2.1+ (libraries)
 LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt
 
 ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
@@ -41,10 +45,7 @@ LIBV4L_DEPENDENCIES += libgl
 endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-LIBV4L_CONF_OPTS += --with-libudev
 LIBV4L_DEPENDENCIES += udev
-else
-LIBV4L_CONF_OPTS += --without-libudev
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGLU),y)
@@ -53,19 +54,15 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
 LIBV4L_CONF_OPTS += --enable-v4l-utils
-# clock_gettime is used, which is provided by librt for glibc < 2.17
-LIBV4L_LIBS += -lrt
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-LIBV4L_DEPENDENCIES += gettext
-endif
+LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
 ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)
 LIBV4L_CONF_OPTS += --enable-qv4l2
 LIBV4L_DEPENDENCIES += qt5base
 # protect against host version detection of moc-qt5/rcc-qt5/uic-qt5
 LIBV4L_CONF_ENV += \
-	ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc \
-	ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \
-	ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic
+	ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \
+	ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \
+	ac_cv_prog_UIC=$(HOST_DIR)/bin/uic
 # qt5 needs c++11 (since qt-5.7)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
 LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
@@ -80,6 +77,10 @@ else
 LIBV4L_CONF_OPTS += --disable-v4l-utils
 endif
 
+ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y)
+LIBV4L_DEPENDENCIES += sdl2_image
+endif
+
 LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)"
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libva-intel-driver/Config.in b/bsp/buildroot/package/libva-intel-driver/Config.in
index 0f5b656b..120f152c 100644
--- a/bsp/buildroot/package/libva-intel-driver/Config.in
+++ b/bsp/buildroot/package/libva-intel-driver/Config.in
@@ -1,18 +1,18 @@
 config BR2_PACKAGE_LIBVA_INTEL_DRIVER
 	bool "libva-intel-driver"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
+	depends on !BR2_STATIC_LIBS # libva
 	select BR2_PACKAGE_LIBVA
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_LIBDRM_INTEL
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
-	depends on BR2_i386 || BR2_x86_64
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
-	depends on !BR2_STATIC_LIBS # libva
 	help
 	  VA-API back-end driver for Intel graphics chips
 
-	  https://01.org/linuxgraphics/community/vaapi
+	  https://01.org/linuxmedia/vaapi
 
 comment "libva intel driver needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.hash b/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.hash
index 10664d05..4ffc60ca 100644
--- a/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.hash
+++ b/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/libva/2016-November/004731.html
-sha1 5100f187afc4e39fce5664b96fe11a38faa9afaa  libva-intel-driver-1.7.3.tar.bz2
+# From https://github.com/01org/intel-vaapi-driver/releases
+sha1 19e83c084a404817263c04371c42345b617900ff intel-vaapi-driver-2.0.0.tar.bz2
+# Locally computed
+sha256 10f6b0a91f34715d8d4d9a9e0fb3cc0afe5fcf85355db1272bd5fff31522f469  intel-vaapi-driver-2.0.0.tar.bz2
+sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de  COPYING
diff --git a/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.mk b/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.mk
index 86f6eaa6..0255038b 100644
--- a/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.mk
+++ b/bsp/buildroot/package/libva-intel-driver/libva-intel-driver.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-LIBVA_INTEL_DRIVER_VERSION = 1.7.3
-LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
-LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver
+LIBVA_INTEL_DRIVER_VERSION = 2.0.0
+LIBVA_INTEL_DRIVER_SOURCE = intel-vaapi-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2
+LIBVA_INTEL_DRIVER_SITE = \
+	https://github.com/01org/intel-vaapi-driver/releases/download/$(LIBVA_INTEL_DRIVER_VERSION)
 LIBVA_INTEL_DRIVER_LICENSE = MIT
 LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING
-# needed to work around https://bugs.freedesktop.org/show_bug.cgi?id=79478
-LIBVA_INTEL_DRIVER_AUTORECONF = YES
 LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
diff --git a/bsp/buildroot/package/libva-utils/Config.in b/bsp/buildroot/package/libva-utils/Config.in
new file mode 100644
index 00000000..ad299234
--- /dev/null
+++ b/bsp/buildroot/package/libva-utils/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBVA_UTILS
+	bool "libva-utils"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS # libva
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libva
+	select BR2_PACKAGE_LIBVA
+	help
+	  Libva-utils is a collection of tests for VA-API (Video
+	  Acceleration API)
+
+	  https://01.org/linuxmedia/vaapi
+
+comment "libva-utils needs a toolchain w/ C++, threads, dynamic library"
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/libva-utils/libva-utils.hash b/bsp/buildroot/package/libva-utils/libva-utils.hash
new file mode 100644
index 00000000..3429fb53
--- /dev/null
+++ b/bsp/buildroot/package/libva-utils/libva-utils.hash
@@ -0,0 +1,5 @@
+# From https://github.com/01org/libva-utils/releases
+sha1 b4dc39459f8539c1ea16e7ca957a853fb7735ec4 libva-utils-2.0.0.tar.bz2
+# Locally computed
+sha256 a921df31311d8f49d2e392a5fc2a068d79f89aeb588309fbff24365310dbc5f6  libva-utils-2.0.0.tar.bz2
+sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50  COPYING
diff --git a/bsp/buildroot/package/libva-utils/libva-utils.mk b/bsp/buildroot/package/libva-utils/libva-utils.mk
new file mode 100644
index 00000000..275d5996
--- /dev/null
+++ b/bsp/buildroot/package/libva-utils/libva-utils.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# libva-utils
+#
+################################################################################
+
+LIBVA_UTILS_VERSION = 2.0.0
+LIBVA_UTILS_SOURCE = libva-utils-$(LIBVA_UTILS_VERSION).tar.bz2
+LIBVA_UTILS_SITE = https://github.com/01org/libva-utils/releases/download/$(LIBVA_UTILS_VERSION)
+LIBVA_UTILS_LICENSE = MIT
+LIBVA_UTILS_LICENSE_FILES = COPYING
+LIBVA_UTILS_DEPENDENCIES = host-pkgconf libva
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libva/0001-no_test_decode.patch b/bsp/buildroot/package/libva/0001-no_test_decode.patch
deleted file mode 100644
index 0f0d7866..00000000
--- a/bsp/buildroot/package/libva/0001-no_test_decode.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-mpeg2vldemo is the only file requiring cxx support. It is not needed for
-buildroot, so disable its compilation to avoid depending on cxx.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr libva-1.3.0.org/test/Makefile.am libva-1.3.0/test/Makefile.am
---- libva-1.3.0.org/test/Makefile.am	2014-03-24 05:49:46.000000000 +0100
-+++ libva-1.3.0/test/Makefile.am	2014-04-26 18:12:25.644390292 +0200
-@@ -20,7 +20,7 @@
- # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--SUBDIRS = common decode encode vainfo
-+SUBDIRS = common encode vainfo
- 
- if USE_X11
- SUBDIRS += basic putsurface
diff --git a/bsp/buildroot/package/libva/Config.in b/bsp/buildroot/package/libva/Config.in
index 467b9d2f..08eb16b4 100644
--- a/bsp/buildroot/package/libva/Config.in
+++ b/bsp/buildroot/package/libva/Config.in
@@ -1,18 +1,19 @@
 config BR2_PACKAGE_LIBVA
 	bool "libva"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs
-	depends on !BR2_STATIC_LIBS
 	help
-	  The main motivation for VA-API (Video Acceleration API) is to enable
-	  hardware accelerated video decode/encode at various entry-points (VLD,
-	  IDCT, Motion Compensation etc.) for the prevailing coding standards
-	  today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).
+	  The main motivation for VA-API (Video Acceleration API) is to
+	  enable hardware accelerated video decode/encode at various
+	  entry-points (VLD, IDCT, Motion Compensation etc.) for the
+	  prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263,
+	  MPEG-4 AVC/H.264, and VC-1/VMW3).
 
-	  http://www.freedesktop.org/wiki/Software/vaapi/
+	  https://01.org/linuxmedia/vaapi
 
 comment "libva needs a toolchain w/ threads, dynamic library"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libva/libva.hash b/bsp/buildroot/package/libva/libva.hash
index e63f4dbd..17365754 100644
--- a/bsp/buildroot/package/libva/libva.hash
+++ b/bsp/buildroot/package/libva/libva.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/libva/2016-November/004730.html
-sha1 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8  libva-1.7.3.tar.bz2
+# From https://github.com/01org/libva/releases
+sha1 762a49f8925ca1d0531c5071afbd629ffea93b90  libva-2.0.0.tar.bz2
+# Locally computed
+sha256 bb0601f9a209e60d8d0b867067323661a7816ff429021441b775452b8589e533  libva-2.0.0.tar.bz2
+sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de  COPYING
diff --git a/bsp/buildroot/package/libva/libva.mk b/bsp/buildroot/package/libva/libva.mk
index cf42b70e..8d1e27f2 100644
--- a/bsp/buildroot/package/libva/libva.mk
+++ b/bsp/buildroot/package/libva/libva.mk
@@ -4,33 +4,28 @@
 #
 ################################################################################
 
-LIBVA_VERSION = 1.7.3
+LIBVA_VERSION = 2.0.0
 LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2
-LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva
+LIBVA_SITE = https://github.com/01org/libva/releases/download/$(LIBVA_VERSION)
 LIBVA_LICENSE = MIT
 LIBVA_LICENSE_FILES = COPYING
-LIBVA_AUTORECONF = YES
 LIBVA_INSTALL_STAGING = YES
 LIBVA_DEPENDENCIES = host-pkgconf libdrm
 
 # libdrm is a hard-dependency
 LIBVA_CONF_OPTS = \
 	--enable-drm \
-	--disable-dummy-driver \
 	--with-drivers-path="/usr/lib/va"
 
-ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
-LIBVA_DEPENDENCIES += mesa3d
-LIBVA_CONF_OPTS += --enable-glx
-else
-LIBVA_CONF_OPTS += --disable-glx
-endif
-
 ifeq ($(BR2_PACKAGE_XORG7),y)
 LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes
 LIBVA_CONF_OPTS += --enable-x11
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
+LIBVA_DEPENDENCIES += mesa3d
+LIBVA_CONF_OPTS += --enable-glx
+endif
 else
-LIBVA_CONF_OPTS += --disable-x11
+LIBVA_CONF_OPTS += --disable-glx --disable-x11
 endif
 
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
@@ -40,17 +35,4 @@ else
 LIBVA_CONF_OPTS += --disable-wayland
 endif
 
-ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
-LIBVA_DEPENDENCIES += libegl
-LIBVA_CONF_OPTS += --enable-egl
-else
-LIBVA_CONF_OPTS += --disable-egl
-endif
-
-# Autoreconf requires an m4 directory to exist
-define LIBVA_PATCH_M4
-	mkdir -p $(@D)/m4
-endef
-LIBVA_POST_PATCH_HOOKS += LIBVA_PATCH_M4
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libvdpau/0001-missing-configh-include.patch b/bsp/buildroot/package/libvdpau/0001-missing-configh-include.patch
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/libvdpau/0002-link-with-libx11.patch b/bsp/buildroot/package/libvdpau/0002-link-with-libx11.patch
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/libvdpau/0003-vdpau-module-searchpath.patch b/bsp/buildroot/package/libvdpau/0003-vdpau-module-searchpath.patch
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/libvdpau/Config.in b/bsp/buildroot/package/libvdpau/Config.in
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/libvdpau/libvdpau.hash b/bsp/buildroot/package/libvdpau/libvdpau.hash
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/libvdpau/libvdpau.mk b/bsp/buildroot/package/libvdpau/libvdpau.mk
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/libvips/Config.in b/bsp/buildroot/package/libvips/Config.in
index 87ada513..e16e5277 100644
--- a/bsp/buildroot/package/libvips/Config.in
+++ b/bsp/buildroot/package/libvips/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_LIBVIPS
 	bool "libvips"
-	depends on BR2_USE_WCHAR # gettext, libglib2
+	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # fork()
 	# C++ support is required to build libvips
@@ -8,7 +8,6 @@ config BR2_PACKAGE_LIBVIPS
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  libvips is a 2D image processing library. Compared to
 	  similar libraries, libvips runs quickly and uses little
diff --git a/bsp/buildroot/package/libvips/libvips.mk b/bsp/buildroot/package/libvips/libvips.mk
index 5f80b2d6..8078e046 100644
--- a/bsp/buildroot/package/libvips/libvips.mk
+++ b/bsp/buildroot/package/libvips/libvips.mk
@@ -8,7 +8,7 @@ LIBVIPS_VERSION_MAJOR = 7.42
 LIBVIPS_VERSION = $(LIBVIPS_VERSION_MAJOR).2
 LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz
 LIBVIPS_SITE = http://www.vips.ecs.soton.ac.uk/supported/$(LIBVIPS_VERSION_MAJOR)
-LIBVIPS_LICENSE = LGPLv2.1+
+LIBVIPS_LICENSE = LGPL-2.1+
 LIBVIPS_LICENSE_FILES = COPYING
 # We're patching gtk-doc.make, so need to autoreconf
 LIBVIPS_AUTORECONF = YES
@@ -41,7 +41,7 @@ LIBVIPS_CONF_OPTS = \
 LIBVIPS_INSTALL_STAGING = YES
 LIBVIPS_DEPENDENCIES = \
 	host-pkgconf libglib2 \
-	libxml2 $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	libxml2 $(TARGET_NLS_DEPENDENCIES)
 
 # --disable-cxx is broken upstream
 # https://github.com/jcupitt/libvips/issues/231
diff --git a/bsp/buildroot/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch b/bsp/buildroot/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch
new file mode 100644
index 00000000..84a53764
--- /dev/null
+++ b/bsp/buildroot/package/libvncserver/0001-Limit-client-cut-text-length-to-1-MB.patch
@@ -0,0 +1,65 @@
+From 28afb6c537dc82ba04d5f245b15ca7205c6dbb9c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Mon, 26 Feb 2018 13:48:00 +0100
+Subject: [PATCH] Limit client cut text length to 1 MB
+
+This patch constrains a client cut text length to 1 MB. Otherwise
+a client could make server allocate 2 GB of memory and that seems to
+be to much to classify it as a denial of service.
+
+The limit also prevents from an integer overflow followed by copying
+an uninitilized memory when processing msg.cct.length value larger
+than SIZE_MAX or INT_MAX - sz_rfbClientCutTextMsg.
+
+This patch also corrects accepting length value of zero (malloc(0) is
+interpreted on differnet systems differently).
+
+CVE-2018-7225
+<https://github.com/LibVNC/libvncserver/issues/218>
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ libvncserver/rfbserver.c | 20 +++++++++++++++++++-
+ 1 file changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c
+index 116c488..4fc4d9d 100644
+--- a/libvncserver/rfbserver.c
++++ b/libvncserver/rfbserver.c
+@@ -88,6 +88,8 @@
+ #include <errno.h>
+ /* strftime() */
+ #include <time.h>
++/* PRIu32 */
++#include <inttypes.h>
+ 
+ #ifdef LIBVNCSERVER_WITH_WEBSOCKETS
+ #include "rfbssl.h"
+@@ -2575,7 +2577,23 @@ rfbProcessClientNormalMessage(rfbClientPtr cl)
+ 
+ 	msg.cct.length = Swap32IfLE(msg.cct.length);
+ 
+-	str = (char *)malloc(msg.cct.length);
++	/* uint32_t input is passed to malloc()'s size_t argument,
++	 * to rfbReadExact()'s int argument, to rfbStatRecordMessageRcvd()'s int
++	 * argument increased of sz_rfbClientCutTextMsg, and to setXCutText()'s int
++	 * argument. Here we impose a limit of 1 MB so that the value fits
++	 * into all of the types to prevent from misinterpretation and thus
++	 * from accessing uninitialized memory (CVE-2018-7225) and also to
++	 * prevent from a denial-of-service by allocating to much memory in
++	 * the server. */
++	if (msg.cct.length > 1<<20) {
++	    rfbLog("rfbClientCutText: too big cut text length requested: %" PRIu32 "\n",
++		    msg.cct.length);
++	    rfbCloseClient(cl);
++	    return;
++	}
++
++	/* Allow zero-length client cut text. */
++	str = (char *)calloc(msg.cct.length ? msg.cct.length : 1, 1);
+ 	if (str == NULL) {
+ 		rfbLogPerror("rfbProcessClientNormalMessage: not enough memory");
+ 		rfbCloseClient(cl);
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/libvncserver/libvncserver.mk b/bsp/buildroot/package/libvncserver/libvncserver.mk
index d3f0657a..8063570d 100644
--- a/bsp/buildroot/package/libvncserver/libvncserver.mk
+++ b/bsp/buildroot/package/libvncserver/libvncserver.mk
@@ -7,7 +7,7 @@
 LIBVNCSERVER_VERSION = 0.9.11
 LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz
 LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive
-LIBVNCSERVER_LICENSE = GPLv2+
+LIBVNCSERVER_LICENSE = GPL-2.0+
 LIBVNCSERVER_LICENSE_FILES = COPYING
 LIBVNCSERVER_INSTALL_STAGING = YES
 LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config
diff --git a/bsp/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch b/bsp/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch
new file mode 100644
index 00000000..e84f3d47
--- /dev/null
+++ b/bsp/buildroot/package/libvorbis/0001-CVE-2017-14160-fix-bounds-check-on-very-low-sample-rates.patch
@@ -0,0 +1,28 @@
+From: Thomas Daede <daede003@umn.edu>
+Date: Wed, 9 May 2018 21:56:59 +0000 (-0700)
+Subject: CVE-2017-14160: fix bounds check on very low sample rates.
+X-Git-Url: https://git.xiph.org/?p=vorbis.git;a=commitdiff_plain;h=018ca26dece618457dd13585cad52941193c4a25
+
+CVE-2017-14160: fix bounds check on very low sample rates.
+
+Downloaded from upstream commit
+https://git.xiph.org/?p=vorbis.git;a=commitdiff;h=018ca26dece618457dd13585cad52941193c4a25
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+
+diff --git a/lib/psy.c b/lib/psy.c
+index 422c6f1..1310123 100644
+--- a/lib/psy.c
++++ b/lib/psy.c
+@@ -602,8 +602,9 @@ static void bark_noise_hybridmp(int n,const long *b,
+   for (i = 0, x = 0.f;; i++, x += 1.f) {
+ 
+     lo = b[i] >> 16;
+-    if( lo>=0 ) break;
+     hi = b[i] & 0xffff;
++    if( lo>=0 ) break;
++    if( hi>=n ) break;
+ 
+     tN = N[hi] + N[-lo];
+     tX = X[hi] - X[-lo];
diff --git a/bsp/buildroot/package/libvorbis/Config.in b/bsp/buildroot/package/libvorbis/Config.in
index e322dd25..3d5b5d6d 100644
--- a/bsp/buildroot/package/libvorbis/Config.in
+++ b/bsp/buildroot/package/libvorbis/Config.in
@@ -3,12 +3,13 @@ config BR2_PACKAGE_LIBVORBIS
 	select BR2_PACKAGE_LIBOGG
 	help
 	  Library for the Vorbis open source audio decoder
-	  Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free,
-	  general-purpose compressed audio format for mid to high quality
-	  (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and
-	  variable bitrates from 16 to 128 kbps/channel.
+	  Ogg Vorbis is a fully open, non-proprietary,
+	  patent-and-royalty-free, general-purpose compressed audio
+	  format for mid to high quality (8kHz-48.0kHz, 16+ bit,
+	  polyphonic) audio and music at fixed and variable bitrates
+	  from 16 to 128 kbps/channel.
 
 	  This places Vorbis in the same competitive class as audio
-	  representations such as MPEG-4 (AAC), and similar to, but higher
-	  performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ),
-	  WMA and PAC.
+	  representations such as MPEG-4 (AAC), and similar to, but
+	  higher performance than MPEG-1/2 audio layer 3, MPEG-4 audio
+	  (TwinVQ), WMA and PAC.
diff --git a/bsp/buildroot/package/libvorbis/libvorbis.mk b/bsp/buildroot/package/libvorbis/libvorbis.mk
index 654637f6..ae2c1eff 100644
--- a/bsp/buildroot/package/libvorbis/libvorbis.mk
+++ b/bsp/buildroot/package/libvorbis/libvorbis.mk
@@ -10,7 +10,7 @@ LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis
 LIBVORBIS_INSTALL_STAGING = YES
 LIBVORBIS_CONF_OPTS = --disable-oggtest
 LIBVORBIS_DEPENDENCIES = host-pkgconf libogg
-LIBVORBIS_LICENSE = BSD-3c
+LIBVORBIS_LICENSE = BSD-3-Clause
 LIBVORBIS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch b/bsp/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch
index 20f08c90..e17ff717 100644
--- a/bsp/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch
+++ b/bsp/buildroot/package/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch
@@ -20,7 +20,7 @@ index c14f288..82df745 100644
  
  #include "vpx_config.h"
 -#if defined(__uClinux__)
--# include <lddk.h>
+-#include <lddk.h>
 -#endif
  
  #include <stdlib.h>
diff --git a/bsp/buildroot/package/libvpx/libvpx.hash b/bsp/buildroot/package/libvpx/libvpx.hash
index f0240d69..95ff3a80 100644
--- a/bsp/buildroot/package/libvpx/libvpx.hash
+++ b/bsp/buildroot/package/libvpx/libvpx.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad  libvpx-1.6.0.tar.bz2
+sha256 1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819  libvpx-1.6.1.tar.bz2
diff --git a/bsp/buildroot/package/libvpx/libvpx.mk b/bsp/buildroot/package/libvpx/libvpx.mk
index 4ad55224..24c39032 100644
--- a/bsp/buildroot/package/libvpx/libvpx.mk
+++ b/bsp/buildroot/package/libvpx/libvpx.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIBVPX_VERSION = 1.6.0
+LIBVPX_VERSION = 1.6.1
 LIBVPX_SOURCE = libvpx-$(LIBVPX_VERSION).tar.bz2
 LIBVPX_SITE = http://storage.googleapis.com/downloads.webmproject.org/releases/webm
-LIBVPX_LICENSE = BSD-3c
+LIBVPX_LICENSE = BSD-3-Clause
 LIBVPX_LICENSE_FILES = LICENSE PATENTS
 LIBVPX_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/libwebsock/Config.in b/bsp/buildroot/package/libwebsock/Config.in
index 9ef21362..14651cf4 100644
--- a/bsp/buildroot/package/libwebsock/Config.in
+++ b/bsp/buildroot/package/libwebsock/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LIBWEBSOCK
 	bool "libwebsock"
-	select BR2_PACKAGE_LIBEVENT
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_LIBEVENT
 	help
 	  C library for easy WebSockets servers.
 
diff --git a/bsp/buildroot/package/libwebsock/libwebsock.mk b/bsp/buildroot/package/libwebsock/libwebsock.mk
index b52293b2..df3af3b0 100644
--- a/bsp/buildroot/package/libwebsock/libwebsock.mk
+++ b/bsp/buildroot/package/libwebsock/libwebsock.mk
@@ -9,7 +9,7 @@ LIBWEBSOCK_SITE = $(call github,payden,libwebsock,$(LIBWEBSOCK_VERSION))
 LIBWEBSOCK_DEPENDENCIES = libevent host-pkgconf
 LIBWEBSOCK_AUTORECONF = YES
 LIBWEBSOCK_INSTALL_STAGING = YES
-LIBWEBSOCK_LICENSE = LGPLv3
+LIBWEBSOCK_LICENSE = LGPL-3.0
 LIBWEBSOCK_LICENSE_FILES = COPYING.lesser
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/bsp/buildroot/package/libwebsockets/libwebsockets.hash b/bsp/buildroot/package/libwebsockets/libwebsockets.hash
index 7976a697..49013974 100644
--- a/bsp/buildroot/package/libwebsockets/libwebsockets.hash
+++ b/bsp/buildroot/package/libwebsockets/libwebsockets.hash
@@ -1,3 +1,2 @@
 # Locally computed:
-sha256	96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d  libwebsockets-v2.1.1.tar.gz
-sha256	49ae9f959394686d469f960951ece3ad1101655afe64df28ea5b1a61c1d124f0  f9f5a5760782b68fba190fb46d306f7c08f027c0.patch
+sha256	e7f9eaef258e003c9ada0803a9a5636757a5bc0a58927858834fb38a87d18ad2  libwebsockets-v2.2.1.tar.gz
diff --git a/bsp/buildroot/package/libwebsockets/libwebsockets.mk b/bsp/buildroot/package/libwebsockets/libwebsockets.mk
index 74b6b2b3..b29a2f14 100644
--- a/bsp/buildroot/package/libwebsockets/libwebsockets.mk
+++ b/bsp/buildroot/package/libwebsockets/libwebsockets.mk
@@ -4,16 +4,14 @@
 #
 ################################################################################
 
-LIBWEBSOCKETS_VERSION = v2.1.1
+LIBWEBSOCKETS_VERSION = v2.2.1
 LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION))
-LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
+LIBWEBSOCKETS_LICENSE = LGPL-2.1 with exceptions
 LIBWEBSOCKETS_LICENSE_FILES = LICENSE
 LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_INSTALL_STAGING = YES
 LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
 
-LIBWEBSOCKETS_PATCH = https://github.com/warmcat/libwebsockets/commit/f9f5a5760782b68fba190fb46d306f7c08f027c0.patch
-
 # If LWS_MAX_SMP=1, then there is no code related to pthreads compiled
 # in the library. If unset, LWS_MAX_SMP defaults to 32 and a small
 # amount of pthread mutex code is built into the library.
diff --git a/bsp/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk b/bsp/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk
index 1367a398..514c457d 100644
--- a/bsp/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk
+++ b/bsp/buildroot/package/libxml-parser-perl/libxml-parser-perl.mk
@@ -8,19 +8,19 @@ LIBXML_PARSER_PERL_VERSION = 2.44
 LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz
 LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR
 HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat
-LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+
+LIBXML_PARSER_PERL_LICENSE = Artistic or GPL-1.0+
 LIBXML_PARSER_PERL_LICENSE_FILES = README
 LIBXML_PARSER_PERL_RUN_PERL = `which perl`
 
 define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS
 	(cd $(@D) ; \
 		$(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \
-			PREFIX=$(HOST_DIR)/usr \
-			EXPATLIBPATH=$(HOST_DIR)/usr/lib \
-			EXPATINCPATH=$(HOST_DIR)/usr/include \
+			PREFIX=$(HOST_DIR) \
+			EXPATLIBPATH=$(HOST_DIR)/lib \
+			EXPATINCPATH=$(HOST_DIR)/include \
 			INSTALLDIRS=site \
-			INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \
-			INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \
+			INSTALLSITELIB=$(HOST_DIR)/lib/perl \
+			INSTALLSITEARCH=$(HOST_DIR)/lib/perl \
 	)
 endef
 
diff --git a/bsp/buildroot/package/libxml2/libxml2.mk b/bsp/buildroot/package/libxml2/libxml2.mk
index 9c9a42e4..a6285a69 100644
--- a/bsp/buildroot/package/libxml2/libxml2.mk
+++ b/bsp/buildroot/package/libxml2/libxml2.mk
@@ -49,4 +49,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # libxml2 for the host
-LIBXML2_HOST_BINARY = $(HOST_DIR)/usr/bin/xmllint
+LIBXML2_HOST_BINARY = $(HOST_DIR)/bin/xmllint
diff --git a/bsp/buildroot/package/libxmlpp/Config.in b/bsp/buildroot/package/libxmlpp/Config.in
index 0f2da98f..72445868 100644
--- a/bsp/buildroot/package/libxmlpp/Config.in
+++ b/bsp/buildroot/package/libxmlpp/Config.in
@@ -1,18 +1,18 @@
 config BR2_PACKAGE_LIBXMLPP
 	bool "libxml++"
-	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_GLIBMM
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # glibmm -> libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glibmm -> libglib2
 	depends on BR2_USE_MMU # glibmm -> libglib2
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_GLIBMM
 	help
 	  libxml++ is a C++ wrapper for the libxml XML parser library.
 
 	  http://libxmlplusplus.sourceforge.net/
 
-comment "libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 4.8"
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
+comment "libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
 		||!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/libxmlpp/libxmlpp.mk b/bsp/buildroot/package/libxmlpp/libxmlpp.mk
index d4281992..d0f6329e 100644
--- a/bsp/buildroot/package/libxmlpp/libxmlpp.mk
+++ b/bsp/buildroot/package/libxmlpp/libxmlpp.mk
@@ -6,7 +6,7 @@
 
 LIBXMLPP_VERSION_MAJOR = 2.40
 LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1
-LIBXMLPP_LICENSE = LGPLv2.1 (library), LGPLv2+ (examples)
+LIBXMLPP_LICENSE = LGPL-2.1 (library), LGPL-2.0+ (examples)
 LIBXMLPP_LICENSE_FILES = COPYING
 LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz
 LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR)
diff --git a/bsp/buildroot/package/libxmlrpc/libxmlrpc.mk b/bsp/buildroot/package/libxmlrpc/libxmlrpc.mk
index 738ae9a8..80acfb8e 100644
--- a/bsp/buildroot/package/libxmlrpc/libxmlrpc.mk
+++ b/bsp/buildroot/package/libxmlrpc/libxmlrpc.mk
@@ -7,7 +7,7 @@
 LIBXMLRPC_VERSION = 1.39.12
 LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz
 LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION)
-LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)
+LIBXMLRPC_LICENSE = BSD-3-Clause (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c)
 LIBXMLRPC_LICENSE_FILES = doc/COPYING
 LIBXMLRPC_INSTALL_STAGING = YES
 LIBXMLRPC_DEPENDENCIES = libcurl host-autoconf
@@ -16,7 +16,7 @@ LIBXMLRPC_MAKE = $(MAKE1)
 
 # Using autoconf, not automake, so we cannot use AUTORECONF = YES.
 define LIBXMLRPC_RUN_AUTOCONF
-	cd $(@D); $(HOST_DIR)/usr/bin/autoconf
+	cd $(@D); $(HOST_DIR)/bin/autoconf
 endef
 
 LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF
diff --git a/bsp/buildroot/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch b/bsp/buildroot/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch
deleted file mode 100644
index 1ad494a6..00000000
--- a/bsp/buildroot/package/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From eb1030de31165b68487f288308f9d1810fed6880 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer <wellnhofer@aevum.de>
-Date: Fri, 10 Jun 2016 14:23:58 +0200
-Subject: [PATCH] Fix heap overread in xsltFormatNumberConversion
-
-An empty decimal-separator could cause a heap overread. This can be
-exploited to leak a couple of bytes after the buffer that holds the
-pattern string.
-
-Found with afl-fuzz and ASan.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: upstream commit eb1030de311
-
- libxslt/numbers.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libxslt/numbers.c b/libxslt/numbers.c
-index d1549b46ca26..e78c46b6357b 100644
---- a/libxslt/numbers.c
-+++ b/libxslt/numbers.c
-@@ -1090,7 +1090,8 @@ xsltFormatNumberConversion(xsltDecimalFormatPtr self,
-     }
- 
-     /* We have finished the integer part, now work on fraction */
--    if (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) {
-+    if ( (*the_format != 0) &&
-+         (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) ) {
-         format_info.add_decimal = TRUE;
- 	the_format += xsltUTF8Size(the_format);	/* Skip over the decimal */
-     }
--- 
-2.10.2
-
diff --git a/bsp/buildroot/package/libxslt/libxslt.hash b/bsp/buildroot/package/libxslt/libxslt.hash
index 8222bc59..f28150b7 100644
--- a/bsp/buildroot/package/libxslt/libxslt.hash
+++ b/bsp/buildroot/package/libxslt/libxslt.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256	b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce	libxslt-1.1.29.tar.gz
+sha256	526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460	libxslt-1.1.32.tar.gz
+
+# Hash for license file:
+sha256	7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819	COPYING
diff --git a/bsp/buildroot/package/libxslt/libxslt.mk b/bsp/buildroot/package/libxslt/libxslt.mk
index d89dde8d..ae58e14a 100644
--- a/bsp/buildroot/package/libxslt/libxslt.mk
+++ b/bsp/buildroot/package/libxslt/libxslt.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBXSLT_VERSION = 1.1.29
+LIBXSLT_VERSION = 1.1.32
 LIBXSLT_SITE = ftp://xmlsoft.org/libxslt
 LIBXSLT_INSTALL_STAGING = YES
 LIBXSLT_LICENSE = MIT
@@ -14,10 +14,9 @@ LIBXSLT_CONF_OPTS = \
 	--with-gnu-ld \
 	--without-debug \
 	--without-python \
-	--with-libxml-prefix=$(STAGING_DIR)/usr/ \
-	--with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib
+	--with-libxml-prefix=$(STAGING_DIR)/usr
 LIBXSLT_CONFIG_SCRIPTS = xslt-config
-LIBXSLT_DEPENDENCIES = libxml2
+LIBXSLT_DEPENDENCIES = host-pkgconf libxml2
 
 # GCC bug with Os/O2/O3, PR77311
 # error: unable to find a register to spill in class 'CCREGS'
@@ -35,7 +34,7 @@ endif
 
 HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python --without-crypto
 
-HOST_LIBXSLT_DEPENDENCIES = host-libxml2
+HOST_LIBXSLT_DEPENDENCIES = host-pkgconf host-libxml2
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/libyaml/0001-fix-CVE-2014-9130.patch b/bsp/buildroot/package/libyaml/0001-fix-CVE-2014-9130.patch
deleted file mode 100644
index a267e408..00000000
--- a/bsp/buildroot/package/libyaml/0001-fix-CVE-2014-9130.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e6aa721cc0e5a48f408c52355559fd36780ba32a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= <ingy@ingy.net>
-Date: Fri, 28 Nov 2014 09:21:49 -0800
-Subject: [PATCH] Fix for https://bitbucket.org/xi/libyaml/issue/10/
-
-https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-
-Commenting out the assert makes the scanner do the right thing and
-results in just a simple parse failure.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- src/scanner.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/scanner.c b/src/scanner.c
-index 88d4fa5..c5f3d2f 100644
---- a/src/scanner.c
-+++ b/src/scanner.c
-@@ -1110,7 +1110,9 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
-      * line.  Therefore it is always allowed.  But we add a check anyway.
-      */
- 
--    assert(parser->simple_key_allowed || !required);    /* Impossible. */
-+    /* XXX This caused:
-+     * https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure
-+    assert(parser->simple_key_allowed || !required); */    /* Impossible. */
- 
-     /*
-      * If the current position may start a simple key, save it.
--- 
-2.0.4
-
diff --git a/bsp/buildroot/package/libyaml/libyaml.hash b/bsp/buildroot/package/libyaml/libyaml.hash
index fd039fa6..44b04a33 100644
--- a/bsp/buildroot/package/libyaml/libyaml.hash
+++ b/bsp/buildroot/package/libyaml/libyaml.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749	yaml-0.1.6.tar.gz
+sha256 8088e457264a98ba451a90b8661fcb4f9d6f478f7265d48322a196cec2480729  yaml-0.1.7.tar.gz
diff --git a/bsp/buildroot/package/libyaml/libyaml.mk b/bsp/buildroot/package/libyaml/libyaml.mk
index 52d47506..bc8d6951 100644
--- a/bsp/buildroot/package/libyaml/libyaml.mk
+++ b/bsp/buildroot/package/libyaml/libyaml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIBYAML_VERSION = 0.1.6
+LIBYAML_VERSION = 0.1.7
 LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz
 LIBYAML_SITE = http://pyyaml.org/download/libyaml
 LIBYAML_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/libyuv/Config.in b/bsp/buildroot/package/libyuv/Config.in
index 29dcaa44..355ceb0f 100644
--- a/bsp/buildroot/package/libyuv/Config.in
+++ b/bsp/buildroot/package/libyuv/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBYUV
 	  libyuv is an open source project that includes YUV scaling
 	  and conversion functionality.
 
-	  https://code.google.com/p/libyuv
+	  https://chromium.googlesource.com/libyuv/libyuv/
 
 comment "libyuv needs a toolchain w/ C++, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libyuv/libyuv.hash b/bsp/buildroot/package/libyuv/libyuv.hash
new file mode 100644
index 00000000..0361ce6e
--- /dev/null
+++ b/bsp/buildroot/package/libyuv/libyuv.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 ec31df87fc42153723e9ca65a6d71b0993504c3de5f925e79464c93b7ef66094  libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea.tar.gz
diff --git a/bsp/buildroot/package/libyuv/libyuv.mk b/bsp/buildroot/package/libyuv/libyuv.mk
index c00bc05c..1abe1263 100644
--- a/bsp/buildroot/package/libyuv/libyuv.mk
+++ b/bsp/buildroot/package/libyuv/libyuv.mk
@@ -10,7 +10,7 @@ LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea
 # deactivated in 2015.
 LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git
 LIBYUV_SITE_METHOD = git
-LIBYUV_LICENSE = BSD-3c
+LIBYUV_LICENSE = BSD-3-Clause
 LIBYUV_LICENSE_FILES = LICENSE
 LIBYUV_INSTALL_STAGING = YES
 LIBYUV_DEPENDENCIES = $(if $(BR2_PACKAGE_JPEG),jpeg)
diff --git a/bsp/buildroot/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch b/bsp/buildroot/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch
new file mode 100644
index 00000000..7d40111b
--- /dev/null
+++ b/bsp/buildroot/package/libzip/0001-Use-cmake-E-tar-to-extract-test-data.patch
@@ -0,0 +1,40 @@
+From e9244b207c0fc883ff84c1fc46602feb1e2b0347 Mon Sep 17 00:00:00 2001
+From: Thomas Klausner <tk@giga.or.at>
+Date: Wed, 3 Jan 2018 11:41:57 +0100
+Subject: [PATCH] Use 'cmake -E tar' to extract test data.
+
+For easier cross-compilation (Github issue #21).
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit e9244b207c0
+
+ regress/CMakeLists.txt | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/regress/CMakeLists.txt b/regress/CMakeLists.txt
+index e2ce232c774a..3a0d4f77dcf6 100644
+--- a/regress/CMakeLists.txt
++++ b/regress/CMakeLists.txt
+@@ -51,15 +51,9 @@ ADD_CUSTOM_TARGET(cleanup
+ ADD_CUSTOM_TARGET(testinput
+   ALL
+   VERBATIM
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 0 > manyfiles.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 1 > manyfiles-133000.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 2 > manyfiles-65536.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 3 > manyfiles-zip64-modulo.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 4 > manyfiles-zip64.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 5 > manyfiles-fewer.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip cat 6 > manyfiles-more.zip
+-  COMMAND ziptool ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip cat 0 > bigzero.zip
+-  DEPENDS ziptool ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
++  COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip
++  COMMAND cmake -E tar x ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
++  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/manyfiles-zip.zip ${CMAKE_CURRENT_SOURCE_DIR}/bigzero-zip.zip
+ )
+ 
+ SET_PROPERTY(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/libzip/Config.in b/bsp/buildroot/package/libzip/Config.in
index 54de9e5a..f69dd0d4 100644
--- a/bsp/buildroot/package/libzip/Config.in
+++ b/bsp/buildroot/package/libzip/Config.in
@@ -1,8 +1,13 @@
 config BR2_PACKAGE_LIBZIP
 	bool "libzip"
+	depends on !BR2_STATIC_LIBS # dlsym()
 	select BR2_PACKAGE_ZLIB
 	help
-	  C library for reading, creating, and modifying zip archives. This
-	  package also contains zipcmp, ziptorrent and zipmerge utilities.
+	  C library for reading, creating, and modifying zip archives.
+	  This package also contains zipcmp, ziptorrent and zipmerge
+	  utilities.
 
 	  http://www.nih.at/libzip/
+
+comment "libzip needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/libzip/libzip.hash b/bsp/buildroot/package/libzip/libzip.hash
index ccd0e6ad..0eeb3130 100644
--- a/bsp/buildroot/package/libzip/libzip.hash
+++ b/bsp/buildroot/package/libzip/libzip.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb	libzip-0.11.2.tar.xz
+sha256	e508aba025f5f94b267d5120fc33761bcd98440ebe49dbfe2ed3df3afeacc7b1  libzip-1.4.0.tar.xz
+sha256  3c964a7eb1abeb6bd6f40035ed3a014728ff8c5437f107dcf24fbbfab16e227e  LICENSE
diff --git a/bsp/buildroot/package/libzip/libzip.mk b/bsp/buildroot/package/libzip/libzip.mk
index a419db7e..537aa1de 100644
--- a/bsp/buildroot/package/libzip/libzip.mk
+++ b/bsp/buildroot/package/libzip/libzip.mk
@@ -4,12 +4,18 @@
 #
 ################################################################################
 
-LIBZIP_VERSION = 0.11.2
+LIBZIP_VERSION = 1.4.0
 LIBZIP_SITE = http://www.nih.at/libzip
 LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz
-LIBZIP_LICENSE = BSD-3c
+LIBZIP_LICENSE = BSD-3-Clause
 LIBZIP_LICENSE_FILES = LICENSE
 LIBZIP_INSTALL_STAGING = YES
 LIBZIP_DEPENDENCIES = zlib
 
-$(eval $(autotools-package))
+ifeq ($(BR2_PACKAGE_BZIP2),y)
+LIBZIP_DEPENDENCIES += bzip2
+else
+LIBZIP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_BZIP2=TRUE
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/libzlib/libzlib.hash b/bsp/buildroot/package/libzlib/libzlib.hash
new file mode 100644
index 00000000..e3736b10
--- /dev/null
+++ b/bsp/buildroot/package/libzlib/libzlib.hash
@@ -0,0 +1,4 @@
+# From http://www.zlib.net/
+sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066  zlib-1.2.11.tar.xz
+# License files, locally calculated
+sha256 7960b6b1cc63e619abb77acaea5427159605afee8c8b362664f4effc7d7f7d15  README
diff --git a/bsp/buildroot/package/libzlib/libzlib.mk b/bsp/buildroot/package/libzlib/libzlib.mk
new file mode 100644
index 00000000..eea0c12f
--- /dev/null
+++ b/bsp/buildroot/package/libzlib/libzlib.mk
@@ -0,0 +1,78 @@
+################################################################################
+#
+# libzlib
+#
+################################################################################
+
+LIBZLIB_VERSION = 1.2.11
+LIBZLIB_SOURCE = zlib-$(LIBZLIB_VERSION).tar.xz
+LIBZLIB_SITE = http://www.zlib.net
+LIBZLIB_LICENSE = Zlib
+LIBZLIB_LICENSE_FILES = README
+LIBZLIB_INSTALL_STAGING = YES
+LIBZLIB_PROVIDES = zlib
+
+# It is not possible to build only a shared version of zlib, so we build both
+# shared and static, unless we only want the static libs, and we eventually
+# selectively remove what we do not want
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBZLIB_PIC =
+LIBZLIB_SHARED = --static
+else
+LIBZLIB_PIC = -fPIC
+LIBZLIB_SHARED = --shared
+endif
+
+define LIBZLIB_CONFIGURE_CMDS
+	(cd $(@D); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_ARGS) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) $(LIBZLIB_PIC)" \
+		./configure \
+		$(LIBZLIB_SHARED) \
+		--prefix=/usr \
+	)
+endef
+
+define HOST_LIBZLIB_CONFIGURE_CMDS
+	(cd $(@D); rm -rf config.cache; \
+		$(HOST_CONFIGURE_ARGS) \
+		$(HOST_CONFIGURE_OPTS) \
+		./configure \
+		--prefix="$(HOST_DIR)" \
+		--sysconfdir="$(HOST_DIR)/etc" \
+	)
+endef
+
+define LIBZLIB_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define HOST_LIBZLIB_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D)
+endef
+
+define LIBZLIB_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) LDCONFIG=true install
+endef
+
+define LIBZLIB_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) LDCONFIG=true install
+endef
+
+# We don't care removing the .a from target, since it not used at link
+# time to build other packages, and it is anyway removed later before
+# assembling the filesystem images anyway.
+ifeq ($(BR2_SHARED_LIBS),y)
+define LIBZLIB_RM_STATIC_STAGING
+	rm -f $(STAGING_DIR)/usr/lib/libz.a
+endef
+LIBZLIB_POST_INSTALL_STAGING_HOOKS += LIBZLIB_RM_STATIC_STAGING
+endif
+
+define HOST_LIBZLIB_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) LDCONFIG=true install
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/lightning/Config.in b/bsp/buildroot/package/lightning/Config.in
index d85c964e..79f7f86f 100644
--- a/bsp/buildroot/package/lightning/Config.in
+++ b/bsp/buildroot/package/lightning/Config.in
@@ -18,10 +18,10 @@ if BR2_PACKAGE_LIGHTNING
 
 config BR2_PACKAGE_LIGHTNING_DISASSEMBLER
 	bool "enable disassembler"
-	select BR2_PACKAGE_BINUTILS
-	select BR2_PACKAGE_ZLIB
 	depends on !BR2_nios2 # binutils
 	depends on BR2_USE_WCHAR # binutils
+	select BR2_PACKAGE_BINUTILS
+	select BR2_PACKAGE_ZLIB
 	help
 	  Enable the GNU lightning disassembler.
 
diff --git a/bsp/buildroot/package/lightning/lightning.hash b/bsp/buildroot/package/lightning/lightning.hash
index 4805686e..8e78ef4f 100644
--- a/bsp/buildroot/package/lightning/lightning.hash
+++ b/bsp/buildroot/package/lightning/lightning.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256	1fa3a2421852598b3162d6765645bb3cd0fccb5f0c105d0800c64c8428b749a6	lightning-2.1.0.tar.gz
+sha256	9b289ed1c977602f9282da507db2e980dcfb5207ee8bd2501536a6852a157a69	lightning-2.1.2.tar.gz
+sha256	a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c	COPYING.LESSER
diff --git a/bsp/buildroot/package/lightning/lightning.mk b/bsp/buildroot/package/lightning/lightning.mk
index 052e593b..b9394614 100644
--- a/bsp/buildroot/package/lightning/lightning.mk
+++ b/bsp/buildroot/package/lightning/lightning.mk
@@ -4,17 +4,15 @@
 #
 ################################################################################
 
-LIGHTNING_VERSION = 2.1.0
+LIGHTNING_VERSION = 2.1.2
 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning
-LIGHTNING_LICENSE = LGPLv3+
+LIGHTNING_LICENSE = LGPL-3.0+
 LIGHTNING_LICENSE_FILES = COPYING.LESSER
 LIGHTNING_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y)
 LIGHTNING_DEPENDENCIES += binutils zlib
 LIGHTNING_CONF_OPTS += --enable-disassembler
-# binutils libraries are not explicitly linked against gettext
-LIGHTNING_CONF_ENV += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl)
 endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lighttpd/Config.in b/bsp/buildroot/package/lighttpd/Config.in
index f62ccb9c..383c10f7 100644
--- a/bsp/buildroot/package/lighttpd/Config.in
+++ b/bsp/buildroot/package/lighttpd/Config.in
@@ -7,13 +7,14 @@ config BR2_PACKAGE_LIGHTTPD
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
 	help
-	  lighttpd a secure, fast, compliant and very flexible web-server
-	  which has been optimized for high-performance environments. It
-	  has a very low memory footprint compared to other webservers and
-	  takes care of cpu-load. Its advanced feature-set (FastCGI, CGI,
-	  Auth, Output-Compression, URL-Rewriting and many more) make
-	  lighttpd the perfect webserver-software for every server that
-	  is suffering load problems.
+	  lighttpd a secure, fast, compliant and very flexible
+	  web-server which has been optimized for high-performance
+	  environments. It has a very low memory footprint compared to
+	  other webservers and takes care of cpu-load. Its advanced
+	  feature-set (FastCGI, CGI, Auth, Output-Compression,
+	  URL-Rewriting and many more) make lighttpd the perfect
+	  webserver-software for every server that is suffering load
+	  problems.
 
 	  http://www.lighttpd.net/
 
diff --git a/bsp/buildroot/package/lighttpd/S50lighttpd b/bsp/buildroot/package/lighttpd/S50lighttpd
index 44ac257c..b3518cd2 100644
--- a/bsp/buildroot/package/lighttpd/S50lighttpd
+++ b/bsp/buildroot/package/lighttpd/S50lighttpd
@@ -2,15 +2,21 @@
 #
 # Starts lighttpd.
 #
+NAME=lighttpd
+DAEMON=/usr/sbin/$NAME
+PID_FILE="/var/run/$NAME.pid"
+CONF_FILE="/etc/$NAME/$NAME.conf"
+
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
 start() {
 	printf "Starting lighttpd: "
-	start-stop-daemon -S -q -p /var/run/lighttpd.pid --exec /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf
+	start-stop-daemon -S -q -p $PID_FILE --exec $DAEMON -- -f $CONF_FILE
 	echo "OK"
 }
 stop() {
 	printf "Stopping lighttpd: "
-	start-stop-daemon -K -q -p /var/run/lighttpd.pid
+	start-stop-daemon -K -q -p $PID_FILE
 	echo "OK"
 }
 restart() {
diff --git a/bsp/buildroot/package/lighttpd/lighttpd.hash b/bsp/buildroot/package/lighttpd/lighttpd.hash
index 36783ff1..813d1cd0 100644
--- a/bsp/buildroot/package/lighttpd/lighttpd.hash
+++ b/bsp/buildroot/package/lighttpd/lighttpd.hash
@@ -1,2 +1,4 @@
 # From http://www.lighttpd.net/
-sha256 1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f  lighttpd-1.4.45.tar.xz
+sha256 0f8ad5aac7529d7b948b9d7e8cd0b4a9e177309d85d6bf6516e28e6e40d74f36  lighttpd-1.4.48.tar.xz
+# Locally calculated
+sha256 5c98cad2fbaf5c5e2562bcbab401a7c557c1bb1bac9914ecc63730925052fb13  COPYING
diff --git a/bsp/buildroot/package/lighttpd/lighttpd.mk b/bsp/buildroot/package/lighttpd/lighttpd.mk
index b3127ef2..0a09d912 100644
--- a/bsp/buildroot/package/lighttpd/lighttpd.mk
+++ b/bsp/buildroot/package/lighttpd/lighttpd.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 LIGHTTPD_VERSION_MAJOR = 1.4
-LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).45
+LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).48
 LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz
 LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x
-LIGHTTPD_LICENSE = BSD-3c
+LIGHTTPD_LICENSE = BSD-3-Clause
 LIGHTTPD_LICENSE_FILES = COPYING
 LIGHTTPD_DEPENDENCIES = host-pkgconf
 LIGHTTPD_CONF_OPTS = \
@@ -96,6 +96,9 @@ define LIGHTTPD_INSTALL_INIT_SYSTEMD
 
 	ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service
+
+	$(INSTALL) -D -m 644 package/lighttpd/lighttpd_tmpfiles.conf \
+		$(TARGET_DIR)/usr/lib/tmpfiles.d/lighttpd.conf
 endef
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lighttpd/lighttpd_tmpfiles.conf b/bsp/buildroot/package/lighttpd/lighttpd_tmpfiles.conf
new file mode 100644
index 00000000..a24f3f7f
--- /dev/null
+++ b/bsp/buildroot/package/lighttpd/lighttpd_tmpfiles.conf
@@ -0,0 +1,2 @@
+f /var/log/lighttpd-access.log 0640 www-data www-data -
+f /var/log/lighttpd-error.log 0640 www-data www-data -
diff --git a/bsp/buildroot/package/linenoise/linenoise.mk b/bsp/buildroot/package/linenoise/linenoise.mk
index 64a7b7c8..f51e2871 100644
--- a/bsp/buildroot/package/linenoise/linenoise.mk
+++ b/bsp/buildroot/package/linenoise/linenoise.mk
@@ -6,7 +6,7 @@
 
 LINENOISE_VERSION = 1.0
 LINENOISE_SITE = $(call github,antirez,linenoise,$(LINENOISE_VERSION))
-LINENOISE_LICENSE = BSD-2c
+LINENOISE_LICENSE = BSD-2-Clause
 LINENOISE_LICENSE_FILES = LICENSE
 LINENOISE_INSTALL_STAGING = YES
 # Static library only, nothing to install on target
diff --git a/bsp/buildroot/package/linknx/0001-fix-static-build-with-mysql.patch b/bsp/buildroot/package/linknx/0001-fix-static-build-with-mysql.patch
deleted file mode 100644
index c26bef77..00000000
--- a/bsp/buildroot/package/linknx/0001-fix-static-build-with-mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Fix static build with mysql
-
-When building static binaries, the order of libraries in the link command line
-is significant. Use $LIBS for mysql libraries, so that mysql appear after the
-object files that depends on it. This fixes build failures like the following.
-
-/home/buildroot/build/instance-1/output/host/usr/bin/arm-linux-g++  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -static -static -I/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/mysql  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -static   -DUNIV_LINUX -DUNIV_LINUX  -static -static -rdynamic -L/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lmysqlclient_r -lz -lpthread -lcrypt -lnsl -lm -lpthread -o linknx linknx.o logger.o ruleserver.o objectcontroller.o eibclient.o threads.o timermanager.o persistentstorage.o xmlserver.o smsgateway.o emailgateway.o knxconnection.o services.o suncalc.o luacondition.o ioport.o ../ticpp/libticpp.a -L/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lpthsem    -lm -largp
-persistentstorage.o: In function `MysqlPersistentStorage::~MysqlPersistentStorage()':
-persistentstorage.cpp:(.text+0x2c): undefined reference to `mysql_close'
-persistentstorage.o: In function `MysqlPersistentStorage::MysqlPersistentStorage(ticpp::Element*)':
-persistentstorage.cpp:(.text+0x518): undefined reference to `mysql_init'
-persistentstorage.cpp:(.text+0x570): undefined reference to `mysql_options'
-persistentstorage.cpp:(.text+0x5a8): undefined reference to `mysql_real_connect'
-persistentstorage.cpp:(.text+0x5c0): undefined reference to `mysql_options'
-persistentstorage.cpp:(.text+0x618): undefined reference to `mysql_error'
-persistentstorage.cpp:(.text+0x6c0): undefined reference to `mysql_options'
-persistentstorage.o: In function `MysqlPersistentStorage::write(std::string const&, std::string const&)':
-persistentstorage.cpp:(.text+0xb70): undefined reference to `mysql_real_query'
-persistentstorage.cpp:(.text+0xbcc): undefined reference to `mysql_error'
-persistentstorage.o: In function `MysqlPersistentStorage::read(std::string const&, std::string const&)':
-persistentstorage.cpp:(.text+0xd14): undefined reference to `mysql_real_query'
-persistentstorage.cpp:(.text+0xd38): undefined reference to `mysql_store_result'
-persistentstorage.cpp:(.text+0xd40): undefined reference to `mysql_num_rows'
-persistentstorage.cpp:(.text+0xd50): undefined reference to `mysql_fetch_row'
-persistentstorage.cpp:(.text+0xd68): undefined reference to `mysql_free_result'
-persistentstorage.cpp:(.text+0xdc8): undefined reference to `mysql_error'
-persistentstorage.o: In function `MysqlPersistentStorage::writelog(std::string const&, std::string const&)':
-persistentstorage.cpp:(.text+0xf74): undefined reference to `mysql_real_query'
-persistentstorage.cpp:(.text+0xfd0): undefined reference to `mysql_error'
-collect2: error: ld returned 1 exit status
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: sent to jef2000@users.sourceforge.net
-
-diff -Nuar linknx-0.0.1.32-orig/acinclude.m4 linknx-0.0.1.32/acinclude.m4
---- linknx-0.0.1.32-orig/acinclude.m4	2011-01-09 16:47:32.000000000 +0200
-+++ linknx-0.0.1.32/acinclude.m4	2016-03-15 12:41:19.983861719 +0200
-@@ -36,7 +36,7 @@
-     CFLAGS="$CFLAGS $ADDFLAGS"    
-     CXXFLAGS="$CXXFLAGS $ADDFLAGS"    
- 
--    LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r`
-+    LIBS="$LIBS "`$MYSQL_CONFIG --libs_r`
-     
-     AC_MSG_RESULT($MYSQL_CONFIG)
- 	AC_DEFINE([HAVE_MYSQL], [1], [Build with MySQL support.])
diff --git a/bsp/buildroot/package/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch b/bsp/buildroot/package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch
similarity index 100%
rename from bsp/buildroot/package/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch
rename to bsp/buildroot/package/linknx/0001-src-suncalc.cpp-fix-build-with-gcc-6.x.patch
diff --git a/bsp/buildroot/package/linknx/Config.in b/bsp/buildroot/package/linknx/Config.in
index e8583899..97fdaff9 100644
--- a/bsp/buildroot/package/linknx/Config.in
+++ b/bsp/buildroot/package/linknx/Config.in
@@ -1,14 +1,13 @@
 config BR2_PACKAGE_LINKNX
 	bool "linknx"
-	select BR2_PACKAGE_LIBPTHSEM
-	select BR2_PACKAGE_LIBCURL # for autoreconf
-	select BR2_PACKAGE_ARGP_STANDALONE \
-	       if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # libpthsem
+	select BR2_PACKAGE_LIBPTHSEM
+	select BR2_PACKAGE_ARGP_STANDALONE \
+	       if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL
 	help
-	  Linknx is an automation platform providing high level functionalities
-	  to EIB/KNX installation.
+	  Linknx is an automation platform providing high level
+	  functionalities to EIB/KNX installation.
 
 	  http://linknx.sourceforge.net/
 	  https://github.com/linknx/linknx
diff --git a/bsp/buildroot/package/linknx/linknx.hash b/bsp/buildroot/package/linknx/linknx.hash
index d1be6d20..40e26766 100644
--- a/bsp/buildroot/package/linknx/linknx.hash
+++ b/bsp/buildroot/package/linknx/linknx.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  f161d3c8da3b8c6969e9c02d84d3cd26eb5e7fb4f3a3efbaaede8acdaaf11700  linknx-0.0.1.32.tar.gz
+sha256 635b8fbd3477fd7d85a95955b93f327cd5a389db80dc18cdae04de19a3a8a972  linknx-0.0.1.33.tar.gz
diff --git a/bsp/buildroot/package/linknx/linknx.mk b/bsp/buildroot/package/linknx/linknx.mk
index 5dc8bb2d..dfabef55 100644
--- a/bsp/buildroot/package/linknx/linknx.mk
+++ b/bsp/buildroot/package/linknx/linknx.mk
@@ -4,31 +4,35 @@
 #
 ################################################################################
 
-LINKNX_VERSION = 0.0.1.32
-LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION)
-LINKNX_LICENSE = GPLv2+
+LINKNX_VERSION = 0.0.1.33
+LINKNX_SITE = $(call github,linknx,linknx,$(LINKNX_VERSION))
+LINKNX_LICENSE = GPL-2.0+
 LINKNX_INSTALL_STAGING = YES
-# Patching acinclude.m4
-LINKNX_AUTORECONF = YES
 LINKNX_CONF_OPTS = \
-	--without-lua \
 	--without-log4cpp \
 	--without-pth-test \
 	--with-pth=$(STAGING_DIR)/usr \
-	--disable-smtp \
-	--with-libcurl=$(STAGING_DIR)/usr/bin/curl-config
+	--disable-smtp
 
-LINKNX_DEPENDENCIES = libpthsem libcurl \
+LINKNX_DEPENDENCIES = libpthsem \
 	$(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone)
 
-# This is needed to make autoreconf happy
-define LINKNX_CREATE_MISSING_FILES
-	touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/README
-endef
-LINKNX_POST_EXTRACT_HOOKS += LINKNX_CREATE_MISSING_FILES
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+LINKNX_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr
+LINKNX_DEPENDENCIES += libcurl
+else
+LINKNX_CONF_OPTS += --without-libcurl
+endif
+
+ifeq ($(BR2_PACKAGE_LUA),y)
+LINKNX_CONF_OPTS += --with-lua
+LINKNX_DEPENDENCIES += lua
+else
+LINKNX_CONF_OPTS += --without-lua
+endif
 
 ifeq ($(BR2_PACKAGE_MYSQL),y)
-LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config
+LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr
 LINKNX_DEPENDENCIES += mysql
 else
 LINKNX_CONF_OPTS += --without-mysql
diff --git a/bsp/buildroot/package/links/links.mk b/bsp/buildroot/package/links/links.mk
index ce0e638f..651a089f 100644
--- a/bsp/buildroot/package/links/links.mk
+++ b/bsp/buildroot/package/links/links.mk
@@ -8,14 +8,17 @@ LINKS_VERSION = 2.14
 LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2
 LINKS_SITE = http://links.twibright.com/download
 LINKS_DEPENDENCIES = host-pkgconf
-LINKS_LICENSE = GPLv2+
+LINKS_LICENSE = GPL-2.0+
 LINKS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y)
 LINKS_CONF_OPTS += --enable-graphics
 LINKS_DEPENDENCIES += libpng
 ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y)
-LINKS_CONF_OPTS += --with-x
+LINKS_CONF_OPTS += \
+	--with-x \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
 LINKS_DEPENDENCIES += xlib_libXt
 else
 LINKS_CONF_OPTS += --without-x
diff --git a/bsp/buildroot/package/linphone/Config.in b/bsp/buildroot/package/linphone/Config.in
index 2622aa4f..2504ca2b 100644
--- a/bsp/buildroot/package/linphone/Config.in
+++ b/bsp/buildroot/package/linphone/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LINPHONE
 	bool "linphone"
-	select BR2_PACKAGE_LIBEXOSIP2
-	select BR2_PACKAGE_SPEEX
 	depends on BR2_INSTALL_LIBSTDCPP # mediastreamer (bundled)
 	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp (bundled)
 	depends on BR2_USE_MMU # libeXosip2
+	select BR2_PACKAGE_LIBEXOSIP2
+	select BR2_PACKAGE_SPEEX
 	help
 	  Linphone is an internet phone or Voice Over IP phone (VoIP).
 
diff --git a/bsp/buildroot/package/linphone/linphone.hash b/bsp/buildroot/package/linphone/linphone.hash
index 2e202cf1..9ed9d37f 100644
--- a/bsp/buildroot/package/linphone/linphone.hash
+++ b/bsp/buildroot/package/linphone/linphone.hash
@@ -1,6 +1,2 @@
 # Locally calculated after checking pgp signature
 sha256	05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0	linphone-3.6.1.tar.gz
-sha256	bc4ef670c0ecc1bb60bcb79374309b555c11d154bacfa363d809a26a58780933	libav9.patch
-sha256	a50a8ac2caedb389c224f81393901a029fec055ec2ec83aa18d677e1bfe7fc73	libav10.patch
-sha256	e384775c12ea93d3bc35dccfe4ea875c38b74be8af63fcb82e6b7f06e93d1593	libav11.patch
-sha256	3367a26f65f49f4101787b1821402127d29cde9b02d3873112a5001a549cc7d9	ffmpeg_2.9.patch
diff --git a/bsp/buildroot/package/linphone/linphone.mk b/bsp/buildroot/package/linphone/linphone.mk
index 5c678d4c..4129c2a9 100644
--- a/bsp/buildroot/package/linphone/linphone.mk
+++ b/bsp/buildroot/package/linphone/linphone.mk
@@ -13,13 +13,8 @@ LINPHONE_CONF_OPTS = \
 LINPHONE_AUTORECONF = YES
 LINPHONE_INSTALL_STAGING = YES
 LINPHONE_DEPENDENCIES = host-pkgconf libeXosip2 speex
-LINPHONE_LICENSE = GPLv2+
+LINPHONE_LICENSE = GPL-2.0+
 LINPHONE_LICENSE_FILES = COPYING
-LINPHONE_PATCH = \
-	https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav9.patch \
-	https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav10.patch \
-	https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav11.patch \
-	https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/ffmpeg_2.9.patch
 
 ifeq ($(BR2_arc),y)
 # toolchain __arc__ define conflicts with libosip2 source
diff --git a/bsp/buildroot/package/linux-backports/Config.in b/bsp/buildroot/package/linux-backports/Config.in
index e858a45a..362e6e4b 100644
--- a/bsp/buildroot/package/linux-backports/Config.in
+++ b/bsp/buildroot/package/linux-backports/Config.in
@@ -8,7 +8,8 @@ config BR2_PACKAGE_LINUX_BACKPORTS
 	  The linux-backports package includes many Linux drivers from
 	  recent kernels, backported to older ones.
 
-	  This version of linux-backports supports kernels starting from 3.0.
+	  This version of linux-backports supports kernels starting
+	  from 3.0.
 
 	  https://backports.wiki.kernel.org
 
@@ -40,8 +41,9 @@ config BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE
 	help
 	  Path to the backports configuration file
 
-	  Note: this can be a defconfig file or a complete .config file,
-	  which can later be saved back with make linux-update-(def)config.
+	  Note: this can be a defconfig file or a complete .config
+	  file, which can later be saved back with make
+	  linux-update-(def)config.
 
 config BR2_PACKAGE_LINUX_BACKPORTS_CONFIG_FRAGMENT_FILES
 	string "Additional configuration fragment files"
diff --git a/bsp/buildroot/package/linux-backports/linux-backports.mk b/bsp/buildroot/package/linux-backports/linux-backports.mk
index 6f599a8a..1d7d6e7f 100644
--- a/bsp/buildroot/package/linux-backports/linux-backports.mk
+++ b/bsp/buildroot/package/linux-backports/linux-backports.mk
@@ -8,7 +8,7 @@ LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2
 LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1
 LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz
 LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR)
-LINUX_BACKPORTS_LICENSE = GPLv2
+LINUX_BACKPORTS_LICENSE = GPL-2.0
 LINUX_BACKPORTS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y)
diff --git a/bsp/buildroot/package/linux-firmware/Config.in b/bsp/buildroot/package/linux-firmware/Config.in
index e9a4dfbf..f93561ee 100644
--- a/bsp/buildroot/package/linux-firmware/Config.in
+++ b/bsp/buildroot/package/linux-firmware/Config.in
@@ -39,6 +39,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IBT
 	  Firmware files for Intel 3160/7260/7265/8260/8265 Wireless
 	  bluetooth support.
 
+config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT
+	bool "Qualcomm Atheros Rome 6174A Bluetooth"
+	help
+	  Firmware files for QCA Rome 6174A bluetooth support.
+
 endmenu # Bluetooth
 
 menu "WiFi firmware"
@@ -73,6 +78,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271
 	help
 	  Firmware files for the Atheros 9271 module
 
+config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X
+	bool "Atheros 10k (QCA998X)"
+	help
+	  Firmware files for the Atheros QCA988X module
+
 config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX
 	bool "Broadcom BRCM bcm43xx"
 	help
@@ -146,6 +156,12 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265
 	  Firmware files for the Intel Wifi 8265 devices supported by
 	  the iwlwifi kernel driver.
 
+config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX
+	bool "Intel iwlwifi 9xxx"
+	help
+	  Firmware files for the Intel Wifi 9xxx devices supported by
+	  the iwlwifi kernel driver.
+
 config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8
 	bool "Libertas SD 8686 v8"
 	help
@@ -206,6 +222,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U
 	help
 	  MediaTek MT7601U
 
+config BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174
+	bool "Qualcomm Atheros 6174"
+	help
+	  Firmware files for the Qualcomm Atheros QCA6174 chip
+
 config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61
 	bool "Ralink rt2501/rt61"
 	help
@@ -236,10 +257,16 @@ config BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX
 	help
 	  Realtek rtl8821ae
 
+config BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113
+	bool "Redpine rs9113"
+	help
+	  Firmware files for WLAN and Bluetooth modules rs9113
+
 config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X
 	bool "TI wl127x"
 	help
-	  Firmware files for WLAN and Bluetooth modules wl1271 and wl1273
+	  Firmware files for WLAN and Bluetooth modules wl1271 and
+	  wl1273
 
 config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X
 	bool "TI wl128x"
@@ -258,17 +285,20 @@ menu "Ethernet firmware"
 config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X
 	bool "Broadcom NetXtremeII"
 	help
-	  Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x)
+	  Firmware files for Broadcom NetXtreme 10Gb ethernet cards
+	  (bnx2x)
 
 config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4
 	bool "Chelsio T4"
 	help
-	  Firmware files for Chelsio T4 1Gb and 10Gb ethernet cards (cxgb4)
+	  Firmware files for Chelsio T4 1Gb and 10Gb ethernet cards
+	  (cxgb4)
 
 config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5
 	bool "Chelsio T5"
 	help
-	  Firmware files for Chelsio T5 1Gb and 10Gb ethernet cards (cxgb4)
+	  Firmware files for Chelsio T5 1Gb and 10Gb ethernet cards
+	  (cxgb4)
 
 config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169
 	bool "Realtek 8169"
@@ -306,4 +336,41 @@ config BR2_PACKAGE_LINUX_FIRMWARE_XCx000
 
 endmenu
 
+menu "SoC Firmware"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
+	bool "Freescale i.MX SDMA"
+	help
+	  Firmware files for i.MX SDMA.
+
+endmenu
+
+menu "Fibre Channel Adapter Firmware"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX
+	bool "QLogic 2xxx Fibre Channel Adapters"
+	help
+	  Firmware files for ql2xxx adapters
+
+endmenu
+
+menu "Intel QuickAssist Firmware"
+
+config BR2_PACKAGE_LINUX_FIRMWARE_QAT_DH895XCC
+	bool "Support for DH895xCC"
+	help
+	  Firmware files for Intel DH895xCC devices
+
+config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C3XXX
+	bool "Support for C3XXX"
+	help
+	  Firmware files for Intel C3XXX devices
+
+config BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X
+	bool "Support for C62X"
+	help
+	  Firmware files for Intel C62X devices
+
+endmenu
+
 endif
diff --git a/bsp/buildroot/package/linux-firmware/linux-firmware.hash b/bsp/buildroot/package/linux-firmware/linux-firmware.hash
index 16460394..1beb1f76 100644
--- a/bsp/buildroot/package/linux-firmware/linux-firmware.hash
+++ b/bsp/buildroot/package/linux-firmware/linux-firmware.hash
@@ -1,2 +1,27 @@
 # Locally calculated
-sha256 1cd14477a392fe8c7c44e62623b85466df90ed72a55ae213b637e1c4335739fd linux-firmware-6d3bc8886517d171068fd1263176b8b5c51df204.tar.gz
+sha256 d253f7abb32e0407bcc840a5bddba1dc20190bb4a4bb6d40512f279fde384671 linux-firmware-65b1c68c63f974d72610db38dfae49861117cae2.tar.gz
+sha256 8116433f4004fc0c24d72b3d9e497808b724aa0e5e1cd63fc1bf66b715b1e2e9 LICENCE.Abilis
+sha256 38f2037aa14631b4b29826d7a99379613c41a97064d1defdee30a7a022138b20 LICENCE.Marvell
+sha256 802b7014b26c606cf6248ae8b0ab1ce6d2d1b0db236d38dd269e676cd70710f2 LICENCE.atheros_firmware
+sha256 b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d LICENCE.broadcom_bcm43xx
+sha256 a5777f9e80aca0603b0648454de996168b1c530322550ccda94d6d78bcf6c061 LICENCE.chelsio_firmware
+sha256 60fbc9cccb455e1a3306c97db942d6f24fa93664be61d54c497637e6d0e2ae83 LICENCE.fw_sst_0f28
+sha256 5181b0b51efc79d5acb2c9bb92042878fdbad97a92114d4ab5e32e2b5b52fce4 LICENCE.ibt_firmware
+sha256 0e0c11073ba3c832097da38e0905da36b8a3526f219407977b13b71c6675be7d LICENCE.it913x
+sha256 e295020afd7597dc1b3bbe50a84a7e432d9cb92bc053c1c5e657b50d2517627b LICENCE.iwlwifi_firmware
+sha256 2051d5bf0755a0668f8c3d9a0d1c41d4b8cc411aba70f720fda71ae9e3b4d25c LICENCE.qat_firmware
+sha256 4071a11d878dbc0ac6d9e71203d03b151638f9d7a8bc47a54c3cb964100d5822 LICENCE.qla2xxx
+sha256 d7bec70668ddd4aae8fb4aa32870e54b49fcdb0b9b007aa9f54b53a1ac7461bd LICENCE.ralink-firmware.txt
+sha256 8568352b57f3574f9d5b2753cdb7c6e5eb2b79e82fbb9c9ba6566947467ef508 LICENCE.ralink_a_mediatek_company_firmware
+sha256 a61351665b4f264f6c631364f85b907d8f8f41f8b369533ef4021765f9f3b62e LICENCE.rtlwifi_firmware.txt
+sha256 106bef96470001e877fcf7ba0337fa6766a317650eb47fcaeb743eeebd62c4ff LICENCE.ti-connectivity
+sha256 8ea9f4aee5f53ad877041ff089e8c95d34d615ce19a3111e5e1ea70d990ed7ff LICENCE.xc4000
+sha256 30ec8a66503dc73f83937564ae70ca23aa03259e64727ff4195b5b6f695e782f LICENCE.xc5000
+sha256 f8822049f32fef2e90a197bd8cf259f476db75d549456bdca8567616a9c07ace LICENCE.xc5000c
+sha256 337a55102138d7baa143ee4a4c6c91693e0113fece35d380b2a12109e8c23b3f LICENSE.QualcommAtheros_ath10k
+sha256 630fd46c95d3ac6544590c2265ba7348fbc930fb386261a1c04dcd9f403645b8 LICENSE.dib0700
+sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENSE.i915
+sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom
+sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon
+sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware
+sha256 9703115e298649dfad003d7d3d55f4b2bd417e28f19e9cf6d5c6f9a906a2c4d9 WHENCE
diff --git a/bsp/buildroot/package/linux-firmware/linux-firmware.mk b/bsp/buildroot/package/linux-firmware/linux-firmware.mk
index 7706bd5c..82680937 100644
--- a/bsp/buildroot/package/linux-firmware/linux-firmware.mk
+++ b/bsp/buildroot/package/linux-firmware/linux-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINUX_FIRMWARE_VERSION = 6d3bc8886517d171068fd1263176b8b5c51df204
+LINUX_FIRMWARE_VERSION = 65b1c68c63f974d72610db38dfae49861117cae2
 LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 LINUX_FIRMWARE_SITE_METHOD = git
 
@@ -30,6 +30,18 @@ LINUX_FIRMWARE_FILES += intel/ibt-*
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ibt_firmware
 endif
 
+# Qualcomm Atheros Rome 6174A Bluetooth
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174A_BT),y)
+LINUX_FIRMWARE_FILES += qca/rampatch_usb_00000302.bin qca/nvm_usb_00000302.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qcom
+endif
+
+# Freescale i.MX SDMA
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA),y)
+LINUX_FIRMWARE_FILES += imx/sdma/sdma-imx6q.bin imx/sdma/sdma-imx7d.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.sdma_firmware
+endif
+
 # rt2501/rt61
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y)
 LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin
@@ -53,12 +65,14 @@ endif
 # rtl81xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX),y)
 LINUX_FIRMWARE_FILES += \
-	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin 		\
-	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin	\
-	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin		\
-	rtlwifi/rtl8188efw.bin rtlwifi/rtl8188eufw.bin		\
-	rtlwifi/rtl8192cufw_A.bin				\
-	rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin
+	rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \
+	rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \
+	rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \
+	rtlwifi/rtl8188efw.bin rtlwifi/rtl8188eufw.bin \
+	rtlwifi/rtl8192cufw_A.bin \
+	rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin \
+	rtlwifi/rtl8192eefw.bin rtlwifi/rtl8192eu_ap_wowlan.bin \
+	rtlwifi/rtl8192eu_nic.bin rtlwifi/rtl8192eu_wowlan.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
 
@@ -66,7 +80,13 @@ endif
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX),y)
 LINUX_FIRMWARE_FILES += \
 	rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \
-	rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin
+	rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin \
+	rtlwifi/rtl8723aufw_A.bin rtlwifi/rtl8723aufw_B.bin \
+	rtlwifi/rtl8723aufw_B_NoBT.bin rtlwifi/rtl8723befw.bin \
+	rtlwifi/rtl8723bs_ap_wowlan.bin rtlwifi/rtl8723bs_bt.bin \
+	rtlwifi/rtl8723bs_nic.bin rtlwifi/rtl8723bs_wowlan.bin \
+	rtlwifi/rtl8723bu_ap_wowlan.bin rtlwifi/rtl8723bu_nic.bin \
+	rtlwifi/rtl8723bu_wowlan.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
 
@@ -74,7 +94,8 @@ endif
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX),y)
 LINUX_FIRMWARE_FILES += \
 	rtlwifi/rtl8821aefw.bin \
-	rtlwifi/rtl8821aefw_wowlan.bin
+	rtlwifi/rtl8821aefw_wowlan.bin \
+	rtlwifi/rtl8821aefw_29.bin rtlwifi/rtl8822befw.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt
 endif
 
@@ -104,7 +125,7 @@ endif
 
 # ar9170
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170),y)
-LINUX_FIRMWARE_FILES += ar9170-1.fw ar9170-2.fw
+LINUX_FIRMWARE_FILES += ar9170-1.fw ar9170-2.fw carl9170-1.fw
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware
 endif
 
@@ -114,6 +135,14 @@ LINUX_FIRMWARE_FILES += ar9271.fw htc_9271.fw ath9k_htc/htc_9271-1.4.0.fw
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware
 endif
 
+# ath10k
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_10K_QCA998X),y)
+LINUX_FIRMWARE_FILES += ath10k/QCA988X/hw2.0/board.bin \
+			ath10k/QCA988X/hw2.0/firmware-4.bin \
+			ath10k/QCA988X/hw2.0/firmware-5.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware
+endif
+
 # sd8686 v8
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8),y)
 LINUX_FIRMWARE_FILES += libertas/sd8686_v8.bin libertas/sd8686_v8_helper.bin
@@ -188,23 +217,29 @@ LINUX_FIRMWARE_FILES += mt7601u.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware
 endif
 
+# qca6174
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QUALCOMM_6174),y)
+LINUX_FIRMWARE_FILES += ath10k/QCA6174
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.QualcommAtheros_ath10k
+endif
+
 # wl127x
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y)
 # wl1271-nvs.bin is a symlink to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
-	ti-connectivity/wl1271-fw-2.bin				\
-	ti-connectivity/wl1271-fw-ap.bin			\
-	ti-connectivity/wl1271-fw.bin				\
-	ti-connectivity/wl1271-nvs.bin				\
-	ti-connectivity/wl127x-fw-3.bin				\
-	ti-connectivity/wl127x-fw-plt-3.bin			\
-	ti-connectivity/wl127x-nvs.bin				\
-	ti-connectivity/wl127x-fw-4-mr.bin			\
-	ti-connectivity/wl127x-fw-4-plt.bin			\
-	ti-connectivity/wl127x-fw-4-sr.bin			\
-	ti-connectivity/wl127x-fw-5-mr.bin			\
-	ti-connectivity/wl127x-fw-5-plt.bin			\
-	ti-connectivity/wl127x-fw-5-sr.bin			\
+	ti-connectivity/wl1271-fw-2.bin \
+	ti-connectivity/wl1271-fw-ap.bin \
+	ti-connectivity/wl1271-fw.bin \
+	ti-connectivity/wl1271-nvs.bin \
+	ti-connectivity/wl127x-fw-3.bin \
+	ti-connectivity/wl127x-fw-plt-3.bin \
+	ti-connectivity/wl127x-nvs.bin \
+	ti-connectivity/wl127x-fw-4-mr.bin \
+	ti-connectivity/wl127x-fw-4-plt.bin \
+	ti-connectivity/wl127x-fw-4-sr.bin \
+	ti-connectivity/wl127x-fw-5-mr.bin \
+	ti-connectivity/wl127x-fw-5-plt.bin \
+	ti-connectivity/wl127x-fw-5-sr.bin \
 	ti-connectivity/TIInit_7.2.31.bts
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
@@ -213,20 +248,20 @@ endif
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
 # wl1271-nvs.bin and wl12xx-nvs.bin are symlinks to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
-	ti-connectivity/wl128x-fw-3.bin				\
-	ti-connectivity/wl128x-fw-ap.bin			\
-	ti-connectivity/wl128x-fw-plt-3.bin			\
-	ti-connectivity/wl128x-fw.bin				\
-	ti-connectivity/wl1271-nvs.bin				\
-	ti-connectivity/wl128x-nvs.bin				\
-	ti-connectivity/wl12xx-nvs.bin				\
-	ti-connectivity/wl127x-nvs.bin				\
-	ti-connectivity/wl128x-fw-4-mr.bin			\
-	ti-connectivity/wl128x-fw-4-plt.bin			\
-	ti-connectivity/wl128x-fw-4-sr.bin			\
-	ti-connectivity/wl128x-fw-5-mr.bin			\
-	ti-connectivity/wl128x-fw-5-plt.bin			\
-	ti-connectivity/wl128x-fw-5-sr.bin			\
+	ti-connectivity/wl128x-fw-3.bin \
+	ti-connectivity/wl128x-fw-ap.bin \
+	ti-connectivity/wl128x-fw-plt-3.bin \
+	ti-connectivity/wl128x-fw.bin \
+	ti-connectivity/wl1271-nvs.bin \
+	ti-connectivity/wl128x-nvs.bin \
+	ti-connectivity/wl12xx-nvs.bin \
+	ti-connectivity/wl127x-nvs.bin \
+	ti-connectivity/wl128x-fw-4-mr.bin \
+	ti-connectivity/wl128x-fw-4-plt.bin \
+	ti-connectivity/wl128x-fw-4-sr.bin \
+	ti-connectivity/wl128x-fw-5-mr.bin \
+	ti-connectivity/wl128x-fw-5-plt.bin \
+	ti-connectivity/wl128x-fw-5-sr.bin \
 	ti-connectivity/TIInit_7.2.31.bts
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
@@ -299,6 +334,11 @@ LINUX_FIRMWARE_FILES += iwlwifi-8265-*.ucode
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
 endif
 
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_9XXX),y)
+LINUX_FIRMWARE_FILES += iwlwifi-9???-*.ucode
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y)
 LINUX_FIRMWARE_FILES += bnx2x/*
 # No license file; the license is in the file WHENCE
@@ -306,14 +346,12 @@ LINUX_FIRMWARE_FILES += bnx2x/*
 endif
 
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4),y)
-# cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.14.4.0.bin
-LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.14.4.0.bin cxgb4/t4fw.bin
+LINUX_FIRMWARE_FILES += cxgb4/t4fw*.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
 endif
 
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5),y)
-# cxgb4/t5fw.bin is a symlink to cxgb4/t5fw-1.14.4.0.bin
-LINUX_FIRMWARE_FILES += cxgb4/t5fw-1.14.4.0.bin cxgb4/t5fw.bin
+LINUX_FIRMWARE_FILES += cxgb4/t5fw*.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
 endif
 
@@ -389,18 +427,48 @@ LINUX_FIRMWARE_FILES += \
 	brcm/brcmfmac43236b.bin brcm/brcmfmac43241b0-sdio.bin \
 	brcm/brcmfmac43241b4-sdio.bin brcm/brcmfmac43241b5-sdio.bin \
 	brcm/brcmfmac43242a.bin brcm/brcmfmac43340-sdio.bin \
-	brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43455-sdio.bin \
+	brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43430-sdio.bin \
+	brcm/brcmfmac43430a0-sdio.bin brcm/brcmfmac43455-sdio.bin \
 	brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \
-	brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin \
-	brcm/brcmfmac43430-sdio.bin
+	brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
 endif
 
+# ql2xxx
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y)
+LINUX_FIRMWARE_FILES += \
+	ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin \
+	ql2400_fw.bin ql2500_fw.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qla2xxx
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_REDPINE_RS9113),y)
+LINUX_FIRMWARE_FILES += rsi/rs9113_wlan_qspi.rps
+# No license file; the license is in the file WHENCE
+# which is installed unconditionally
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_DH895XCC),y)
+# qat_mmp.bin is a symlink to qat_895xcc_mmp.bin
+LINUX_FIRMWARE_FILES += qat_895xcc.bin qat_895xcc_mmp.bin qat_mmp.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_C3XXX),y)
+LINUX_FIRMWARE_FILES += qat_c3xxx.bin qat_c3xxx_mmp.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QAT_C62X),y)
+LINUX_FIRMWARE_FILES += qat_c62x.bin qat_c62x_mmp.bin
+LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.qat_firmware
+endif
+
 ifneq ($(LINUX_FIRMWARE_FILES),)
 define LINUX_FIRMWARE_INSTALL_FILES
-	cd $(@D) ; \
-	$(TAR) c $(sort $(LINUX_FIRMWARE_FILES)) | \
-		$(TAR) x -C $(TARGET_DIR)/lib/firmware
+	cd $(@D) && \
+		$(TAR) cf install.tar $(sort $(LINUX_FIRMWARE_FILES)) && \
+		$(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware
 endef
 endif
 
diff --git a/bsp/buildroot/package/linux-fusion/linux-fusion.mk b/bsp/buildroot/package/linux-fusion/linux-fusion.mk
index 35ed28e7..f30a07aa 100644
--- a/bsp/buildroot/package/linux-fusion/linux-fusion.mk
+++ b/bsp/buildroot/package/linux-fusion/linux-fusion.mk
@@ -9,7 +9,7 @@ LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion
 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.xz
 LINUX_FUSION_INSTALL_STAGING = YES
 LINUX_FUSION_DEPENDENCIES = linux
-LINUX_FUSION_LICENSE = GPLv2+
+LINUX_FUSION_LICENSE = GPL-2.0+
 LINUX_FUSION_LICENSE_FILES = debian/copyright
 
 LINUX_FUSION_ETC_DIR = $(TARGET_DIR)/etc/udev/rules.d
diff --git a/bsp/buildroot/package/linux-headers/Config.in.host b/bsp/buildroot/package/linux-headers/Config.in.host
index d9597474..8dc8a4cc 100644
--- a/bsp/buildroot/package/linux-headers/Config.in.host
+++ b/bsp/buildroot/package/linux-headers/Config.in.host
@@ -6,69 +6,78 @@ config BR2_PACKAGE_HOST_LINUX_HEADERS
 choice
 	prompt "Kernel Headers"
 	default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL
-	default BR2_KERNEL_HEADERS_4_9
+	default BR2_KERNEL_HEADERS_4_15
 	help
 	  Select the kernel version to get headers from.
 
-	  The kernel headers must be at least as old as the oldest kernel
-	  you intend to run on your target.
+	  The kernel headers must be at least as old as the oldest
+	  kernel you intend to run on your target.
 
 	  If you use Buildroot to build a kernel, then you can use
 	  the sources from that kernel as source for the headers.
 
-	  If you choose a custom version of the kernel headers, or choose
-	  to use the same sources as the kernel, you'll have to select
-	  (below) the series of that kernel, so that Buildroot can show
-	  or hide packages that have strong requirements on the kernel
-	  headers.
+	  If you choose a custom version of the kernel headers, or
+	  choose to use the same sources as the kernel, you'll have to
+	  select (below) the series of that kernel, so that Buildroot
+	  can show or hide packages that have strong requirements on the
+	  kernel headers.
 
-	config BR2_KERNEL_HEADERS_AS_KERNEL
-		bool "Same as kernel being built"
-		depends on BR2_LINUX_KERNEL
+config BR2_KERNEL_HEADERS_AS_KERNEL
+	bool "Same as kernel being built"
+	depends on BR2_LINUX_KERNEL
 
-	config BR2_KERNEL_HEADERS_3_2
-		bool "Linux 3.2.x kernel headers"
-		depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+config BR2_KERNEL_HEADERS_3_2
+	bool "Linux 3.2.x kernel headers"
+	depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
 
-	config BR2_KERNEL_HEADERS_3_4
-		bool "Linux 3.4.x kernel headers"
-		depends on !BR2_aarch64 && !BR2_arc && !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+config BR2_KERNEL_HEADERS_4_1
+	bool "Linux 4.1.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
 
-	config BR2_KERNEL_HEADERS_3_10
-		bool "Linux 3.10.x kernel headers"
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+config BR2_KERNEL_HEADERS_4_4
+	bool "Linux 4.4.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
 
-	config BR2_KERNEL_HEADERS_3_12
-		bool "Linux 3.12.x kernel headers"
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+config BR2_KERNEL_HEADERS_4_9
+	bool "Linux 4.9.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
 
-	config BR2_KERNEL_HEADERS_3_18
-		bool "Linux 3.18.x kernel headers"
-		depends on !BR2_nios2
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+config BR2_KERNEL_HEADERS_4_10
+	bool "Linux 4.10.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
 
-	config BR2_KERNEL_HEADERS_4_1
-		bool "Linux 4.1.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_1
+config BR2_KERNEL_HEADERS_4_11
+	bool "Linux 4.11.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
 
-	config BR2_KERNEL_HEADERS_4_4
-		bool "Linux 4.4.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4
+config BR2_KERNEL_HEADERS_4_12
+	bool "Linux 4.12.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
 
-	config BR2_KERNEL_HEADERS_4_8
-		bool "Linux 4.8.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
+config BR2_KERNEL_HEADERS_4_13
+	bool "Linux 4.13.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
 
-	config BR2_KERNEL_HEADERS_4_9
-		bool "Linux 4.9.x kernel headers"
-		select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
+config BR2_KERNEL_HEADERS_4_14
+	bool "Linux 4.14.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+
+config BR2_KERNEL_HEADERS_4_15
+	bool "Linux 4.15.x kernel headers"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+
+config BR2_KERNEL_HEADERS_VERSION
+	bool "Manually specified Linux version"
+	help
+	  This option allows you to use a specific official version from
+	  kernel.org, like 2.6.x, 2.6.x.y, 3.x.y, ...
+
+	  Note: you cannot use this option to select a _longterm_ 2.6
+	  kernel, because these kernels are not located at the standard
+	  URL at kernel.org. Instead, select "Custom tarball" and
+	  specify the right URL directly.
 
-	config BR2_KERNEL_HEADERS_VERSION
-		bool "Manually specified Linux version"
 endchoice
 
 config BR2_DEFAULT_KERNEL_VERSION
@@ -82,11 +91,36 @@ choice
 	bool "Custom kernel headers series"
 	depends on BR2_KERNEL_HEADERS_VERSION || BR2_KERNEL_HEADERS_AS_KERNEL
 	help
-	  Specify the kernel headers series you manually selected, above.
+	  Specify the kernel headers series you manually selected,
+	  above.
 
 	  This is used to hide/show some packages that have strict
 	  requirements on the version of kernel headers.
 
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15
+	bool "4.15.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14
+	bool "4.14.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13
+	bool "4.13.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12
+	bool "4.12.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11
+	bool "4.11.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
+config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_10
+	bool "4.10.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+
 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9
 	bool "4.9.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
@@ -214,15 +248,14 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "3.2.101"	if BR2_KERNEL_HEADERS_3_2
-	default "3.4.113"	if BR2_KERNEL_HEADERS_3_4
-	default "3.10.108"	if BR2_KERNEL_HEADERS_3_10
-	default "3.12.74"	if BR2_KERNEL_HEADERS_3_12
-	default "3.18.72"	if BR2_KERNEL_HEADERS_3_18
-	default "3.19.8"	if BR2_KERNEL_HEADERS_3_19
-	default "4.0.9"		if BR2_KERNEL_HEADERS_4_0
-	default "4.1.51"	if BR2_KERNEL_HEADERS_4_1
-	default "4.4.127"	if BR2_KERNEL_HEADERS_4_4
-	default "4.8.17"	if BR2_KERNEL_HEADERS_4_8
-	default "4.9.93"	if BR2_KERNEL_HEADERS_4_9
+	default "3.2.102"	if BR2_KERNEL_HEADERS_3_2
+	default "4.1.52"	if BR2_KERNEL_HEADERS_4_1
+	default "4.4.158"	if BR2_KERNEL_HEADERS_4_4
+	default "4.9.129"	if BR2_KERNEL_HEADERS_4_9
+	default "4.10.17"	if BR2_KERNEL_HEADERS_4_10
+	default "4.11.12"	if BR2_KERNEL_HEADERS_4_11
+	default "4.12.14"	if BR2_KERNEL_HEADERS_4_12
+	default "4.13.16"	if BR2_KERNEL_HEADERS_4_13
+	default "4.14.72"	if BR2_KERNEL_HEADERS_4_14
+	default "4.15.18"	if BR2_KERNEL_HEADERS_4_15
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
diff --git a/bsp/buildroot/package/linux-headers/linux-headers.mk b/bsp/buildroot/package/linux-headers/linux-headers.mk
index 8f339cfe..f1e37906 100644
--- a/bsp/buildroot/package/linux-headers/linux-headers.mk
+++ b/bsp/buildroot/package/linux-headers/linux-headers.mk
@@ -16,7 +16,6 @@ ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y)
 LINUX_HEADERS_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
 LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_TARBALL)))
 LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_TARBALL))
-BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
 LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_HEADERS_SITE_METHOD = git
@@ -29,9 +28,6 @@ LINUX_HEADERS_SITE_METHOD = hg
 LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
 else
 LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
-ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
-BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
-endif
 # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
 # to use the $(word) function. We support versions such as 4.0, 3.1,
 # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
@@ -80,9 +76,13 @@ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
 endif
 LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
 
+ifeq ($(BR2_KERNEL_HEADERS_VERSION),y)
+BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
+endif
+
 endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
 
-LINUX_HEADERS_LICENSE = GPLv2
+LINUX_HEADERS_LICENSE = GPL-2.0
 LINUX_HEADERS_LICENSE_FILES = COPYING
 
 LINUX_HEADERS_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/linux-pam/Config.in b/bsp/buildroot/package/linux-pam/Config.in
index 3d9835e8..13965493 100644
--- a/bsp/buildroot/package/linux-pam/Config.in
+++ b/bsp/buildroot/package/linux-pam/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_LINUX_PAM
 	bool "linux-pam"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_FLEX
 	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_FLEX
 	help
-	  A Security Framework that Provides Authentication for Applications
+	  A Security Framework that Provides Authentication for
+	  Applications
 
 	  http://linux-pam.org
 
diff --git a/bsp/buildroot/package/linux-pam/linux-pam.mk b/bsp/buildroot/package/linux-pam/linux-pam.mk
index c8ba30f7..5c80e784 100644
--- a/bsp/buildroot/package/linux-pam/linux-pam.mk
+++ b/bsp/buildroot/package/linux-pam/linux-pam.mk
@@ -16,15 +16,12 @@ LINUX_PAM_CONF_OPTS = \
 	--disable-regenerate-docu \
 	--enable-securedir=/lib/security \
 	--libdir=/lib
-LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf
+LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf \
+	$(TARGET_NLS_DEPENDENCIES)
 LINUX_PAM_AUTORECONF = YES
-LINUX_PAM_LICENSE = BSD-3c
+LINUX_PAM_LICENSE = BSD-3-Clause
 LINUX_PAM_LICENSE_FILES = Copyright
-
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-LINUX_PAM_DEPENDENCIES += gettext
-LINUX_PAM_MAKE_OPTS += LIBS=-lintl
-endif
+LINUX_PAM_MAKE_OPTS += LIBS=$(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 LINUX_PAM_CONF_OPTS += --enable-selinux
@@ -44,6 +41,13 @@ else
 LINUX_PAM_CONF_OPTS += --disable-audit
 endif
 
+ifeq ($(BR2_PACKAGE_CRACKLIB),y)
+LINUX_PAM_CONF_OPTS += --enable-cracklib
+LINUX_PAM_DEPENDENCIES += cracklib
+else
+LINUX_PAM_CONF_OPTS += --disable-cracklib
+endif
+
 # Install default pam config (deny everything except login)
 define LINUX_PAM_INSTALL_CONFIG
 	$(INSTALL) -m 0644 -D package/linux-pam/login.pam \
diff --git a/bsp/buildroot/package/linux-syscall-support/linux-syscall-support.mk b/bsp/buildroot/package/linux-syscall-support/linux-syscall-support.mk
index 6833a62f..b8145de4 100644
--- a/bsp/buildroot/package/linux-syscall-support/linux-syscall-support.mk
+++ b/bsp/buildroot/package/linux-syscall-support/linux-syscall-support.mk
@@ -8,7 +8,7 @@
 LINUX_SYSCALL_SUPPORT_VERSION = 3f6478ac95edf86cd3da300c2c0d34a438f5dbeb
 LINUX_SYSCALL_SUPPORT_SITE = https://chromium.googlesource.com/linux-syscall-support
 LINUX_SYSCALL_SUPPORT_SITE_METHOD = git
-LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3c
+LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3-Clause
 LINUX_SYSCALL_SUPPORT_LICENSE_FILES = linux_syscall_support.h
 
 # Provide only one header file.
@@ -22,7 +22,7 @@ endef
 
 define HOST_LINUX_SYSCALL_SUPPORT_INSTALL_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/linux_syscall_support.h \
-		$(HOST_DIR)/usr/include/linux_syscall_support.h
+		$(HOST_DIR)/include/linux_syscall_support.h
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/linux-tools/Config.in b/bsp/buildroot/package/linux-tools/Config.in
index db9ed9f1..fd496bba 100644
--- a/bsp/buildroot/package/linux-tools/Config.in
+++ b/bsp/buildroot/package/linux-tools/Config.in
@@ -8,18 +8,12 @@ config BR2_PACKAGE_LINUX_TOOLS
 config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER
 	bool "cpupower"
 	depends on !BR2_bfin # pciutils
-	depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT # gettext
 	select BR2_PACKAGE_LINUX_TOOLS
 	select BR2_PACKAGE_PCIUTILS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  cpupower is a collection of tools to examine and tune power
 	  saving related features of your processor.
 
-comment "cpupower needs a toolchain w/ wchar"
-	depends on !BR2_bfin
-	depends on !BR2_USE_WCHAR && BR2_NEEDS_GETTEXT
-
 config BR2_PACKAGE_LINUX_TOOLS_GPIO
 	bool "gpio"
 	select BR2_PACKAGE_LINUX_TOOLS
@@ -54,9 +48,11 @@ config BR2_PACKAGE_LINUX_TOOLS_PERF
 	  code), single CPU or severals threads.
 
 	  This will build and install the userspace 'perf'
-	  command. It is up to the user to ensure that the kernel
-	  configuration has all the suitable options enabled to allow a
-	  proper operation of 'perf'.
+	  command.
+
+	  Your kernel must have CONFIG_PERF_EVENTS enabled to use perf
+	  profiling. Buildroot automatically enables this in the kernel
+	  configuration.
 
 	  https://perf.wiki.kernel.org/
 
@@ -83,4 +79,12 @@ comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS"
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 
+config BR2_PACKAGE_LINUX_TOOLS_TMON
+	bool "tmon"
+	select BR2_PACKAGE_LINUX_TOOLS
+	select BR2_PACKAGE_NCURSES
+	help
+	  tmon is a terminal-based tool (using curses) that allows the
+	  user to access thermal information about the system.
+
 endmenu
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-cpupower.mk b/bsp/buildroot/package/linux-tools/linux-tool-cpupower.mk
deleted file mode 100644
index 9958cff8..00000000
--- a/bsp/buildroot/package/linux-tools/linux-tool-cpupower.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-################################################################################
-#
-# cpupower
-#
-################################################################################
-
-LINUX_TOOLS += cpupower
-
-CPUPOWER_DEPENDENCIES = pciutils $(if $(BR2_NEEDS_GETTEXT),gettext)
-
-CPUPOWER_MAKE_OPTS = CROSS=$(TARGET_CROSS) \
-	CPUFREQ_BENCH=false \
-	NLS=false \
-	$(if $(BR2_NEEDS_GETTEXT),LDFLAGS=-lintl) \
-	DEBUG=false
-
-define CPUPOWER_BUILD_CMDS
-	$(Q)if test ! -f $(LINUX_DIR)/tools/power/cpupower/Makefile ; then \
-		echo "Your kernel version is too old and does not have the cpupower tool." ; \
-		echo "At least kernel 3.4 must be used." ; \
-		exit 1 ; \
-	fi
-
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
-		$(CPUPOWER_MAKE_OPTS) \
-		cpupower
-endef
-
-define CPUPOWER_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
-		$(CPUPOWER_MAKE_OPTS) \
-		DESTDIR=$(STAGING_DIR) \
-		cpupower_install
-endef
-
-define CPUPOWER_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
-		$(CPUPOWER_MAKE_OPTS) \
-		DESTDIR=$(TARGET_DIR) \
-		cpupower_install
-endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-cpupower.mk.in b/bsp/buildroot/package/linux-tools/linux-tool-cpupower.mk.in
new file mode 100644
index 00000000..2a2d3e01
--- /dev/null
+++ b/bsp/buildroot/package/linux-tools/linux-tool-cpupower.mk.in
@@ -0,0 +1,41 @@
+################################################################################
+#
+# cpupower
+#
+################################################################################
+
+LINUX_TOOLS += cpupower
+
+CPUPOWER_DEPENDENCIES = pciutils $(TARGET_NLS_DEPENDENCIES)
+
+CPUPOWER_MAKE_OPTS = CROSS=$(TARGET_CROSS) \
+	CPUFREQ_BENCH=false \
+	NLS=false \
+	LDFLAGS=$(TARGET_NLS_LIBS) \
+	DEBUG=false
+
+define CPUPOWER_BUILD_CMDS
+	$(Q)if test ! -f $(LINUX_DIR)/tools/power/cpupower/Makefile ; then \
+		echo "Your kernel version is too old and does not have the cpupower tool." ; \
+		echo "At least kernel 3.4 must be used." ; \
+		exit 1 ; \
+	fi
+
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+		$(CPUPOWER_MAKE_OPTS) \
+		cpupower
+endef
+
+define CPUPOWER_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+		$(CPUPOWER_MAKE_OPTS) \
+		DESTDIR=$(STAGING_DIR) \
+		cpupower_install
+endef
+
+define CPUPOWER_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+		$(CPUPOWER_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) \
+		cpupower_install
+endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-gpio.mk b/bsp/buildroot/package/linux-tools/linux-tool-gpio.mk.in
similarity index 100%
rename from bsp/buildroot/package/linux-tools/linux-tool-gpio.mk
rename to bsp/buildroot/package/linux-tools/linux-tool-gpio.mk.in
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-iio.mk b/bsp/buildroot/package/linux-tools/linux-tool-iio.mk
deleted file mode 100644
index 60d6249d..00000000
--- a/bsp/buildroot/package/linux-tools/linux-tool-iio.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-################################################################################
-#
-# iio
-#
-################################################################################
-
-LINUX_TOOLS += iio
-
-IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS)
-
-define IIO_BUILD_CMDS
-	$(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \
-		echo "Your kernel version is too old and does not have install section in the iio tools." ; \
-		echo "At least kernel 4.7 must be used." ; \
-		exit 1 ; \
-	fi
-
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \
-		$(IIO_MAKE_OPTS)
-endef
-
-define IIO_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \
-		$(IIO_MAKE_OPTS) \
-		INSTALL_ROOT=$(TARGET_DIR) \
-		install
-endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-iio.mk.in b/bsp/buildroot/package/linux-tools/linux-tool-iio.mk.in
new file mode 100644
index 00000000..a8cc89e8
--- /dev/null
+++ b/bsp/buildroot/package/linux-tools/linux-tool-iio.mk.in
@@ -0,0 +1,29 @@
+################################################################################
+#
+# iio
+#
+################################################################################
+
+LINUX_TOOLS += iio
+
+IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS)
+
+define IIO_BUILD_CMDS
+	$(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \
+		echo "Your kernel version is too old and does not have install section in the iio tools." ; \
+		echo "At least kernel 4.7 must be used." ; \
+		exit 1 ; \
+	fi
+
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \
+		$(IIO_MAKE_OPTS)
+endef
+
+# DESTDIR used since kernel version 4.14
+define IIO_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \
+		$(IIO_MAKE_OPTS) \
+		INSTALL_ROOT=$(TARGET_DIR) \
+		DESTDIR=$(TARGET_DIR) \
+		install
+endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-perf.mk b/bsp/buildroot/package/linux-tools/linux-tool-perf.mk
deleted file mode 100644
index 16f3a58c..00000000
--- a/bsp/buildroot/package/linux-tools/linux-tool-perf.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-################################################################################
-#
-# perf
-#
-################################################################################
-
-LINUX_TOOLS += perf
-
-PERF_DEPENDENCIES = host-flex host-bison
-
-ifeq ($(KERNEL_ARCH),x86_64)
-PERF_ARCH=x86
-else
-PERF_ARCH=$(KERNEL_ARCH)
-endif
-
-PERF_MAKE_FLAGS = \
-	$(LINUX_MAKE_FLAGS) \
-	JOBS=$(PARALLEL_JOBS) \
-	ARCH=$(PERF_ARCH) \
-	DESTDIR=$(TARGET_DIR) \
-	prefix=/usr \
-	WERROR=0 \
-	NO_LIBAUDIT=1 \
-	NO_NEWT=1 \
-	NO_GTK2=1 \
-	NO_LIBPERL=1 \
-	NO_LIBPYTHON=1 \
-	NO_LIBBIONIC=1
-
-# We need to pass an argument to ld for setting the endianness when
-# building it for MIPS architecture, otherwise the default one will
-# always be used (which is big endian) and the compilation for little
-# endian will always fail showing an error like this one:
-#  LD    foo.o
-# mips-linux-gnu-ld: foo.o: compiled for a little endian system and
-# target is big endian
-ifeq ($(BR2_mips)$(BR2_mips64),y)
-PERF_MAKE_FLAGS += LD="$(TARGET_LD) -EB"
-else ifeq ($(BR2_mipsel)$(BR2_mips64el),y)
-PERF_MAKE_FLAGS += LD="$(TARGET_LD) -EL"
-endif
-
-# The call to backtrace() function fails for ARC, because for some
-# reason the unwinder from libgcc returns early. Thus the usage of
-# backtrace() should be disabled in perf explicitly: at build time
-# backtrace() appears to be available, but it fails at runtime: the
-# backtrace will contain only several functions from the top of stack,
-# instead of the complete backtrace.
-ifeq ($(BR2_arc),y)
-PERF_MAKE_FLAGS += NO_BACKTRACE=1
-endif
-
-ifeq ($(BR2_PACKAGE_SLANG),y)
-PERF_DEPENDENCIES += slang
-else
-PERF_MAKE_FLAGS += NO_SLANG=1
-endif
-
-ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
-PERF_DEPENDENCIES += libunwind
-else
-PERF_MAKE_FLAGS += NO_LIBUNWIND=1
-endif
-
-ifeq ($(BR2_PACKAGE_NUMACTL),y)
-PERF_DEPENDENCIES += numactl
-else
-PERF_MAKE_FLAGS += NO_LIBNUMA=1
-endif
-
-ifeq ($(BR2_PACKAGE_ELFUTILS),y)
-PERF_DEPENDENCIES += elfutils
-else
-PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1
-endif
-
-ifeq ($(BR2_PACKAGE_ZLIB),y)
-PERF_DEPENDENCIES += zlib
-else
-PERF_MAKE_FLAGS += NO_ZLIB=1
-endif
-
-# lzma is provided by xz
-ifeq ($(BR2_PACKAGE_XZ),y)
-PERF_DEPENDENCIES += xz
-else
-PERF_MAKE_FLAGS += NO_LZMA=1
-endif
-
-# We really do not want to build the perf documentation, because it
-# has stringent requirement on the documentation generation tools,
-# like xmlto and asciidoc), which may be lagging behind on some
-# distributions.
-# We name it 'GNUmakefile' so that GNU make will use it instead of
-# the existing 'Makefile'.
-define PERF_DISABLE_DOCUMENTATION
-	if [ -f $(LINUX_DIR)/tools/perf/Documentation/Makefile ]; then \
-		printf "%%:\n\t@:\n" >$(LINUX_DIR)/tools/perf/Documentation/GNUmakefile; \
-	fi
-endef
-LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION
-
-# O must be redefined here to overwrite the one used by Buildroot for
-# out of tree build. We build perf in $(LINUX_DIR)/tools/perf/ and not just
-# $(LINUX_DIR) so that it isn't built in the root directory of the kernel
-# sources.
-define PERF_BUILD_CMDS
-	$(Q)if test ! -f $(LINUX_DIR)/tools/perf/Makefile ; then \
-		echo "Your kernel version is too old and does not have the perf tool." ; \
-		echo "At least kernel 2.6.31 must be used." ; \
-		exit 1 ; \
-	fi
-	$(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \
-		if ! grep -q NO_LIBELF $(LINUX_DIR)/tools/perf/Makefile* ; then \
-			if ! test -r $(LINUX_DIR)/tools/perf/config/Makefile ; then \
-				echo "The perf tool in your kernel cannot be built without libelf." ; \
-				echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \
-				exit 1 ; \
-			fi \
-		fi \
-	fi
-	$(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \
-		-C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/
-endef
-
-# After installation, we remove the Perl and Python scripts from the
-# target.
-define PERF_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \
-		-C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/ install
-	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
-	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/
-endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-perf.mk.in b/bsp/buildroot/package/linux-tools/linux-tool-perf.mk.in
new file mode 100644
index 00000000..69492ba8
--- /dev/null
+++ b/bsp/buildroot/package/linux-tools/linux-tool-perf.mk.in
@@ -0,0 +1,142 @@
+################################################################################
+#
+# perf
+#
+################################################################################
+
+LINUX_TOOLS += perf
+
+PERF_DEPENDENCIES = host-flex host-bison
+
+ifeq ($(KERNEL_ARCH),x86_64)
+PERF_ARCH=x86
+else
+PERF_ARCH=$(KERNEL_ARCH)
+endif
+
+PERF_MAKE_FLAGS = \
+	$(LINUX_MAKE_FLAGS) \
+	JOBS=$(PARALLEL_JOBS) \
+	ARCH=$(PERF_ARCH) \
+	DESTDIR=$(TARGET_DIR) \
+	prefix=/usr \
+	WERROR=0 \
+	NO_LIBAUDIT=1 \
+	NO_NEWT=1 \
+	NO_GTK2=1 \
+	NO_LIBPERL=1 \
+	NO_LIBPYTHON=1 \
+	NO_LIBBIONIC=1
+
+# We need to pass an argument to ld for setting the emulation when
+# building for MIPS architecture, otherwise the default one will always
+# be used and the compilation for most variants will fail.
+ifeq ($(BR2_mips),y)
+PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32btsmip"
+else ifeq ($(BR2_mipsel),y)
+PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmip"
+else ifeq ($(BR2_mips64),y)
+ifeq ($(BR2_MIPS_NABI32),y)
+PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32btsmipn32"
+else
+PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64btsmip"
+endif
+else ifeq ($(BR2_mips64el),y)
+ifeq ($(BR2_MIPS_NABI32),y)
+PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf32ltsmipn32"
+else
+PERF_MAKE_FLAGS += LD="$(TARGET_LD) -m elf64ltsmip"
+endif
+endif
+
+# The call to backtrace() function fails for ARC, because for some
+# reason the unwinder from libgcc returns early. Thus the usage of
+# backtrace() should be disabled in perf explicitly: at build time
+# backtrace() appears to be available, but it fails at runtime: the
+# backtrace will contain only several functions from the top of stack,
+# instead of the complete backtrace.
+ifeq ($(BR2_arc),y)
+PERF_MAKE_FLAGS += NO_BACKTRACE=1
+endif
+
+ifeq ($(BR2_PACKAGE_SLANG),y)
+PERF_DEPENDENCIES += slang
+else
+PERF_MAKE_FLAGS += NO_SLANG=1
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
+PERF_DEPENDENCIES += libunwind
+else
+PERF_MAKE_FLAGS += NO_LIBUNWIND=1
+endif
+
+ifeq ($(BR2_PACKAGE_NUMACTL),y)
+PERF_DEPENDENCIES += numactl
+else
+PERF_MAKE_FLAGS += NO_LIBNUMA=1
+endif
+
+ifeq ($(BR2_PACKAGE_ELFUTILS),y)
+PERF_DEPENDENCIES += elfutils
+else
+PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+PERF_DEPENDENCIES += zlib
+else
+PERF_MAKE_FLAGS += NO_ZLIB=1
+endif
+
+# lzma is provided by xz
+ifeq ($(BR2_PACKAGE_XZ),y)
+PERF_DEPENDENCIES += xz
+else
+PERF_MAKE_FLAGS += NO_LZMA=1
+endif
+
+# We really do not want to build the perf documentation, because it
+# has stringent requirement on the documentation generation tools,
+# like xmlto and asciidoc), which may be lagging behind on some
+# distributions.
+# We name it 'GNUmakefile' so that GNU make will use it instead of
+# the existing 'Makefile'.
+define PERF_DISABLE_DOCUMENTATION
+	if [ -f $(LINUX_DIR)/tools/perf/Documentation/Makefile ]; then \
+		printf "%%:\n\t@:\n" >$(LINUX_DIR)/tools/perf/Documentation/GNUmakefile; \
+	fi
+endef
+LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION
+
+# O must be redefined here to overwrite the one used by Buildroot for
+# out of tree build. We build perf in $(LINUX_DIR)/tools/perf/ and not just
+# $(LINUX_DIR) so that it isn't built in the root directory of the kernel
+# sources.
+define PERF_BUILD_CMDS
+	$(Q)if test ! -f $(LINUX_DIR)/tools/perf/Makefile ; then \
+		echo "Your kernel version is too old and does not have the perf tool." ; \
+		echo "At least kernel 2.6.31 must be used." ; \
+		exit 1 ; \
+	fi
+	$(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \
+		if ! grep -q NO_LIBELF $(LINUX_DIR)/tools/perf/Makefile* ; then \
+			if ! test -r $(LINUX_DIR)/tools/perf/config/Makefile ; then \
+				echo "The perf tool in your kernel cannot be built without libelf." ; \
+				echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \
+				exit 1 ; \
+			fi \
+		fi \
+	fi
+	$(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \
+		-C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/
+endef
+
+# After installation, we remove the Perl and Python scripts from the
+# target.
+define PERF_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \
+		-C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/ install
+	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
+	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/
+endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-selftests.mk b/bsp/buildroot/package/linux-tools/linux-tool-selftests.mk.in
similarity index 100%
rename from bsp/buildroot/package/linux-tools/linux-tool-selftests.mk
rename to bsp/buildroot/package/linux-tools/linux-tool-selftests.mk.in
diff --git a/bsp/buildroot/package/linux-tools/linux-tool-tmon.mk.in b/bsp/buildroot/package/linux-tools/linux-tool-tmon.mk.in
new file mode 100644
index 00000000..15931c31
--- /dev/null
+++ b/bsp/buildroot/package/linux-tools/linux-tool-tmon.mk.in
@@ -0,0 +1,37 @@
+################################################################################
+#
+# tmon
+#
+################################################################################
+
+LINUX_TOOLS += tmon
+
+TMON_DEPENDENCIES = host-pkgconf ncurses
+TMON_MAKE_OPTS = $(LINUX_MAKE_FLAGS) \
+	CC=$(TARGET_CC) \
+	PKG_CONFIG_PATH=$(STAGING_DIR)/usr/lib/pkgconfig
+
+ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
+define TMON_DISABLE_STACK_PROTECTOR
+	$(SED) 's%-fstack-protector%%' $(LINUX_DIR)/tools/thermal/tmon/Makefile
+endef
+endif
+
+define TMON_BUILD_CMDS
+	$(Q)if ! grep install $(LINUX_DIR)/tools/thermal/tmon/Makefile >/dev/null 2>&1 ; then \
+		echo "Your kernel version is too old and does not have the tmon tool." ; \
+		echo "At least kernel 3.13 must be used." ; \
+		exit 1 ; \
+	fi
+	$(TMON_DISABLE_STACK_PROTECTOR)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+		$(TMON_MAKE_OPTS) \
+		tmon
+endef
+
+define TMON_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \
+		$(TMON_MAKE_OPTS) \
+		INSTALL_ROOT=$(TARGET_DIR) \
+		tmon_install
+endef
diff --git a/bsp/buildroot/package/linux-tools/linux-tools.mk b/bsp/buildroot/package/linux-tools/linux-tools.mk
index 7fa8d194..ac4da59b 100644
--- a/bsp/buildroot/package/linux-tools/linux-tools.mk
+++ b/bsp/buildroot/package/linux-tools/linux-tools.mk
@@ -10,15 +10,14 @@
 #
 # So, all tools refer to $(LINUX_DIR) instead of $(@D).
 
-# Note: we need individual tools .mk files to be included *before* this one
-# to guarantee that each tool has a chance to register itself before we build
-# the list of build and install hooks, below.
-#
-# This is currently guaranteed by the naming of each file:
-# - they get included by the top-level Makefile, with $(sort $(wildcard ...))
-# - make's $(sort) function will aways sort in the C locale
-# - the files names correctly sort out in the C locale so that each tool's
-#   .mk file is included before this one.
+# Note: we need individual tools makefiles to be included *before* we build
+# the list of build and install hooks below to guarantee that each tool has
+# a chance to register itself once, and only once. Therefore, the makefiles
+# are named linux-tool-*.mk.in, so they won't be picked up by the top-level
+# Makefile, but can be included here, guaranteeing the single inclusion and
+# the proper ordering.
+
+include $(sort $(wildcard package/linux-tools/*.mk.in))
 
 # We only need the kernel to be extracted, not actually built
 LINUX_TOOLS_PATCH_DEPENDENCIES = linux
diff --git a/bsp/buildroot/package/linux-zigbee/Config.in b/bsp/buildroot/package/linux-zigbee/Config.in
index fc21faa4..ff2b0f7c 100644
--- a/bsp/buildroot/package/linux-zigbee/Config.in
+++ b/bsp/buildroot/package/linux-zigbee/Config.in
@@ -40,7 +40,6 @@ config BR2_PACKAGE_LINUX_ZIGBEE_TESTS
 	  Enable this option to install the Linux-ZigBee test programs
 	  to the target.
 
-
 config BR2_PACKAGE_LINUX_ZIGBEE_OLD_KERNEL_COMPAT
 	bool "compatibility with older kernels"
 	help
diff --git a/bsp/buildroot/package/linux-zigbee/linux-zigbee.mk b/bsp/buildroot/package/linux-zigbee/linux-zigbee.mk
index e46b4ee4..8d3248f2 100644
--- a/bsp/buildroot/package/linux-zigbee/linux-zigbee.mk
+++ b/bsp/buildroot/package/linux-zigbee/linux-zigbee.mk
@@ -6,7 +6,7 @@
 
 LINUX_ZIGBEE_VERSION = v0.3.1
 LINUX_ZIGBEE_SITE = git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee
-LINUX_ZIGBEE_LICENSE = GPLv2
+LINUX_ZIGBEE_LICENSE = GPL-2.0
 LINUX_ZIGBEE_LICENSE_FILES = COPYING
 LINUX_ZIGBEE_DEPENDENCIES = libnl host-pkgconf host-flex host-bison
 
diff --git a/bsp/buildroot/package/linuxconsoletools/0001-conditional-build.patch b/bsp/buildroot/package/linuxconsoletools/0001-conditional-build.patch
new file mode 100644
index 00000000..9f462a64
--- /dev/null
+++ b/bsp/buildroot/package/linuxconsoletools/0001-conditional-build.patch
@@ -0,0 +1,58 @@
+Selectively build groups of tools (inputattach,
+joystick tools and/or force-feedback tools).
+
+Signed-off-by: Koen Martens <gmc@sonologic.nl>
+
+diff -Naur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile	2016-04-19 23:28:36.000000000 +0200
++++ b/utils/Makefile	2017-06-19 08:54:20.152184000 +0200
+@@ -27,8 +27,26 @@
+ 
+ CFLAGS		?= -g -O2 -Wall
+ 
+-PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
+-		  ffcfstress jscal-restore jscal-store evdev-joystick
++PROGRAMS    =
++
++ifdef ENABLE_INPUTATTACH
++PROGRAMS	+= inputattach
++endif
++
++ifdef ENABLE_JOYSTICK
++PROGRAMS    += jstest
++PROGRAMS    += jscal
++PROGRAMS    += jscal-restore
++PROGRAMS    += jscal-store
++PROGRAMS    += evdev-joystick
++endif
++
++ifdef ENABLE_FORCEFEEDBACK
++PROGRAMS    += fftest
++PROGRAMS    += ffmvforce
++PROGRAMS    += ffset
++PROGRAMS    += ffcfstress
++endif
+ 
+ PREFIX          ?= /usr/local
+ 
+@@ -79,13 +97,20 @@
+ 80-stelladaptor-joystick.rules: 80-stelladaptor-joystick.rules.in
+ 	sed "s^@@PREFIX@@^$(PREFIX)^g" < $^ > $@
+ 
++INSTALL_DEP = compile
++ifdef ENABLE_JOYSTICK
++INSTALL_DEP +=  80-stelladaptor-joystick.rules
++endif
++
+ install: compile 80-stelladaptor-joystick.rules
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+ 	install $(PROGRAMS) $(DESTDIR)$(PREFIX)/bin
++ifdef ENABLE_JOYSTICK
+ 	install -d $(DESTDIR)$(PREFIX)/share/joystick
+ 	install extract filter ident $(DESTDIR)$(PREFIX)/share/joystick
+ 	install -d $(DESTDIR)/lib/udev/rules.d
+ 	install js-set-enum-leds $(DESTDIR)/lib/udev
+ 	install -m 644 80-stelladaptor-joystick.rules $(DESTDIR)/lib/udev/rules.d
++endif
+ 
+ .PHONY: compile clean distclean install
diff --git a/bsp/buildroot/package/linuxconsoletools/0002-sdl-config.patch b/bsp/buildroot/package/linuxconsoletools/0002-sdl-config.patch
new file mode 100644
index 00000000..c19c274a
--- /dev/null
+++ b/bsp/buildroot/package/linuxconsoletools/0002-sdl-config.patch
@@ -0,0 +1,20 @@
+Specify sdl-config to use instead of using host sdl-config.
+
+Signed-off-by: Koen Martens <gmc@sonologic.nl>
+
+diff -Naur a/utils/Makefile b/utils/Makefile
+--- a/utils/Makefile	2017-06-16 18:48:28.402824790 +0200
++++ b/utils/Makefile	2017-06-16 18:48:53.898696647 +0200
+@@ -69,10 +69,10 @@
+ 	$(CC) $(CFLAGS) $(CPPFLAGS) -funsigned-char $^ $(LDFLAGS) -lm -o $@
+ 
+ ffmvforce.o: ffmvforce.c
+-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `sdl-config --cflags`
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c $^ -o $@ `${SDL_CONFIG} --cflags`
+ 
+ ffmvforce: ffmvforce.o
+-	$(CC) $^ -o $@ $(LDFLAGS) -g -lm `sdl-config --libs`
++	$(CC) $^ -o $@ $(LDFLAGS) -g -lm `${SDL_CONFIG} --libs`
+ 
+ axbtnmap.o: axbtnmap.c axbtnmap.h
+ 
diff --git a/bsp/buildroot/package/linuxconsoletools/Config.in b/bsp/buildroot/package/linuxconsoletools/Config.in
new file mode 100644
index 00000000..76150278
--- /dev/null
+++ b/bsp/buildroot/package/linuxconsoletools/Config.in
@@ -0,0 +1,36 @@
+config BR2_PACKAGE_LINUXCONSOLETOOLS
+	bool "linuxconsoletools"
+	select BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH if \
+	       !BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK && \
+	       !BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK
+	help
+	  Linuxconsoletools contains the inputattach utility
+	  to attach legacy serial devices to the Linux kernel
+	  input layer and joystick utilities to calibrate and
+	  test joysticks and joypads.
+
+	  http://sf.net/projects/linuxconsole/
+
+if BR2_PACKAGE_LINUXCONSOLETOOLS
+
+config BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH
+	bool "inputattach"
+	default y
+	help
+	  The inputattach utility attaches legacy serial devices
+	  to the Linux kernel input layer.
+
+config BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK
+	bool "joystick utilities"
+	help
+	  Joystick utilities (jstest, jscal, jscal-store,
+	  jscal-restore, evdev-joystick).
+
+config BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK
+	bool "force-feedback utilities"
+	select BR2_PACKAGE_SDL
+	help
+	  Build force-feedback driver utilities (fftest,
+	  ffmvforce, ffset, ffcfstress).
+
+endif
diff --git a/bsp/buildroot/package/linuxconsoletools/linuxconsoletools.hash b/bsp/buildroot/package/linuxconsoletools/linuxconsoletools.hash
new file mode 100644
index 00000000..756c9f43
--- /dev/null
+++ b/bsp/buildroot/package/linuxconsoletools/linuxconsoletools.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	ced2efed00b67b45f82eddc69be07385835d558f658016315ac621fe2eaa8146	linuxconsoletools-1.6.0.tar.bz2
diff --git a/bsp/buildroot/package/linuxconsoletools/linuxconsoletools.mk b/bsp/buildroot/package/linuxconsoletools/linuxconsoletools.mk
new file mode 100644
index 00000000..82ff4c31
--- /dev/null
+++ b/bsp/buildroot/package/linuxconsoletools/linuxconsoletools.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# linuxconsoletools
+#
+################################################################################
+
+LINUXCONSOLETOOLS_VERSION = 1.6.0
+LINUXCONSOLETOOLS_SOURCE = linuxconsoletools-$(LINUXCONSOLETOOLS_VERSION).tar.bz2
+LINUXCONSOLETOOLS_SITE = https://downloads.sourceforge.net/project/linuxconsole
+LINUXCONSOLETOOLS_LICENSE = GPL-2.0+
+LINUXCONSOLETOOLS_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_INPUTATTACH),y)
+LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_INPUTATTACH=1
+endif
+
+ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_JOYSTICK),y)
+LINUXCONSOLETOOLS_MAKE_OPTS += ENABLE_JOYSTICK=1
+endif
+
+ifeq ($(BR2_PACKAGE_LINUXCONSOLETOOLS_FORCEFEEDBACK),y)
+LINUXCONSOLETOOLS_MAKE_OPTS += \
+	ENABLE_FORCEFEEDBACK=1 \
+	SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config
+LINUXCONSOLETOOLS_DEPENDENCIES += sdl
+endif
+
+define LINUXCONSOLETOOLS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		$(LINUXCONSOLETOOLS_MAKE_OPTS)
+endef
+
+define LINUXCONSOLETOOLS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		$(LINUXCONSOLETOOLS_MAKE_OPTS) \
+		DESTDIR="$(TARGET_DIR)" \
+		PREFIX=/usr \
+		install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch b/bsp/buildroot/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch
new file mode 100644
index 00000000..54ef963a
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/0001-missing.h-drop-clock_nanosleep-replacement.patch
@@ -0,0 +1,49 @@
+From 947bf03ec3d9eaa0bfc0269eed86b9364e94bc1a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Sun, 5 Aug 2018 15:25:53 +0200
+Subject: [PATCH] missing.h: drop clock_nanosleep() replacement
+
+Since uClibc-ng commits 68628fe7d463541bf3c33da6b214e63c0cc9feed
+("librt: declare clock_nanosleep not only for NPTL") and
+ddbb03e77ac1a48740688814b82f45c97ee81f37 ("librt: clock_nanosleep
+could be even used without threads"), clock_nanosleep() is always
+provided by uClibc, regardless of the thread implementation (none,
+linuxthreads, nptl). These commits will be part of the upcoming 1.0.31
+release of uClibc-ng.
+
+Thanks to this, we can drop the replacement clock_nanosleep()
+implementation added by linuxptp. Without this, linuxptp fails to
+build with:
+
+missing.h:117:19: error: static declaration of 'clock_nanosleep' follows non-static declaration
+ static inline int clock_nanosleep(clockid_t clock_id, int flags,
+                   ^~~~~~~~~~~~~~~
+In file included from clockadj.h:24:0,
+                 from clockadj.c:24:
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ missing.h | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/missing.h b/missing.h
+index 2f7adb9..60f89a3 100644
+--- a/missing.h
++++ b/missing.h
+@@ -129,13 +129,6 @@ enum {
+ 
+ #define TFD_TIMER_ABSTIME (1 << 0)
+ 
+-static inline int clock_nanosleep(clockid_t clock_id, int flags,
+-				  const struct timespec *request,
+-				  struct timespec *remain)
+-{
+-	return syscall(__NR_clock_nanosleep, clock_id, flags, request, remain);
+-}
+-
+ static inline int timerfd_create(int clockid, int flags)
+ {
+ 	return syscall(__NR_timerfd_create, clockid, flags);
+-- 
+2.14.4
+
diff --git a/bsp/buildroot/package/linuxptp/Config.in b/bsp/buildroot/package/linuxptp/Config.in
new file mode 100644
index 00000000..a32dbde2
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LINUXPTP
+	bool "linuxptp"
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
+	help
+	  The Linux PTP Project is the Precision Time Protocol
+	  implementation according to IEEE standard 1588 for Linux.
+
+	  The dual design goals are to provide a robust implementation
+	  of the standard and to use the most relevant and modern
+	  Application Programming Interfaces (API) offered by the
+	  Linux kernel. Supporting legacy APIs and other platforms is
+	  not a goal.
+
+	  http://linuxptp.sourceforge.net/
+
+comment "linuxptp needs a toolchain w/ NPTL"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/bsp/buildroot/package/linuxptp/S65linuxptp b/bsp/buildroot/package/linuxptp/S65linuxptp
new file mode 100755
index 00000000..46b8921f
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/S65linuxptp
@@ -0,0 +1,46 @@
+#!/bin/sh
+#
+# Start linuxptp
+#
+
+start() {
+	printf "Starting linuxptp daemon: "
+	start-stop-daemon -S -b -q -p /var/run/linuxptp-ptp4l.pid \
+		-x /usr/sbin/ptp4l -- -f /etc/linuxptp.cfg
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+
+	printf "Starting linuxptp system clock synchronization: "
+	start-stop-daemon -S -b -q -p /var/run/linuxptp-phc2sys.pid \
+		-x /usr/sbin/phc2sys -- -s eth0 -c CLOCK_REALTIME -w -S 1.0
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+
+stop() {
+	printf "Stopping linuxptp system clock synchronization: "
+	start-stop-daemon -K -q -p /var/run/linuxptp-phc2sys.pid \
+		-x /usr/sbin/phc2sys
+	echo "OK"
+
+	printf "Stopping linuxptp daemon: "
+	start-stop-daemon -K -q -p /var/run/linuxptp-ptp4l.pid \
+		-x /usr/sbin/ptp4l
+	echo "OK"
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	stop
+	start
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?
diff --git a/bsp/buildroot/package/linuxptp/linuxptp-system-clock.service b/bsp/buildroot/package/linuxptp/linuxptp-system-clock.service
new file mode 100644
index 00000000..73272542
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/linuxptp-system-clock.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Precision Time Protocol system clock synchronization
+After=syslog.target network.target
+
+[Service]
+ExecStart=/usr/sbin/phc2sys -s /dev/ptp0 -c CLOCK_REALTIME -w -S 1.0
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
+WantedBy=linuxptp.service
diff --git a/bsp/buildroot/package/linuxptp/linuxptp.cfg b/bsp/buildroot/package/linuxptp/linuxptp.cfg
new file mode 100644
index 00000000..f9d02e8d
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/linuxptp.cfg
@@ -0,0 +1,19 @@
+# LinuxPTP configuration file for synchronizing the system clock to
+# a remote PTP master in slave-only mode.
+#
+# By default synchronize time in slave-only mode using UDP and hardware time
+# stamps on eth0. If the difference to master is >1.0 second correct by
+# stepping the clock instead of adjusting the frequency.
+#
+# If you change the configuration don't forget to update the phc2sys
+# parameters accordingly in linuxptp-system-clock.service (systemd)
+# or the linuxptp SysV init script.
+
+[global]
+slaveOnly		1
+delay_mechanism		Auto
+network_transport	UDPv4
+time_stamping		hardware
+step_threshold		1.0
+
+[eth0]
diff --git a/bsp/buildroot/package/linuxptp/linuxptp.hash b/bsp/buildroot/package/linuxptp/linuxptp.hash
new file mode 100644
index 00000000..ef2db562
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/linuxptp.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 d0ccc4591966e21819cdc248765ebbe02456bc8ca37845eb7c23c2d1ff9bcf6b  linuxptp-303b08cbf55096aba55bd08a314e0701e5c33482.tar.gz
diff --git a/bsp/buildroot/package/linuxptp/linuxptp.mk b/bsp/buildroot/package/linuxptp/linuxptp.mk
new file mode 100644
index 00000000..f43fee6f
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/linuxptp.mk
@@ -0,0 +1,50 @@
+################################################################################
+#
+# linuxptp
+#
+################################################################################
+
+LINUXPTP_VERSION = 303b08cbf55096aba55bd08a314e0701e5c33482
+LINUXPTP_SITE_METHOD = git
+LINUXPTP_SITE = git://git.code.sf.net/p/linuxptp/code
+LINUXPTP_LICENSE = GPL-2.0+
+LINUXPTP_LICENSE_FILES = COPYING
+
+LINUXPTP_MAKE_ENV = \
+	$(TARGET_MAKE_ENV) \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	KBUILD_OUTPUT=$(STAGING_DIR)
+
+LINUXPTP_MAKE_OPTS = \
+	prefix=/usr \
+	EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)"
+
+define LINUXPTP_BUILD_CMDS
+	$(LINUXPTP_MAKE_ENV) $(MAKE) $(LINUXPTP_MAKE_OPTS) -C $(@D) all
+endef
+
+define LINUXPTP_INSTALL_TARGET_CMDS
+	$(LINUXPTP_MAKE_ENV) $(MAKE) $(LINUXPTP_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) -C $(@D) install
+
+	$(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp.cfg \
+		$(TARGET_DIR)/etc/linuxptp.cfg
+endef
+
+define LINUXPTP_INSTALL_INIT_SYSV
+	$(INSTALL) -m 755 -D $(LINUXPTP_PKGDIR)/S65linuxptp \
+		$(TARGET_DIR)/etc/init.d/S65linuxptp
+endef
+
+define LINUXPTP_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/linuxptp.service
+	$(INSTALL) -D -m 644 $(LINUXPTP_PKGDIR)/linuxptp-system-clock.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/linuxptp-system-clock.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/linuxptp.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/linuxptp.service
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/linuxptp/linuxptp.service b/bsp/buildroot/package/linuxptp/linuxptp.service
new file mode 100644
index 00000000..f6904306
--- /dev/null
+++ b/bsp/buildroot/package/linuxptp/linuxptp.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Precision Time Protocol daemon
+After=syslog.target network.target
+Wants=linuxptp-system-clock.service
+
+[Service]
+ExecStart=/usr/sbin/ptp4l -f /etc/linuxptp.cfg
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bsp/buildroot/package/liquid-dsp/Config.in b/bsp/buildroot/package/liquid-dsp/Config.in
index dca39153..59ee7edb 100644
--- a/bsp/buildroot/package/liquid-dsp/Config.in
+++ b/bsp/buildroot/package/liquid-dsp/Config.in
@@ -18,7 +18,6 @@ if BR2_PACKAGE_LIQUID_DSP
 
 config BR2_PACKAGE_LIQUID_DSP_FAST
 	bool "optimize for speed over accuracy"
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
 	help
 	  Optimize for speed over accuracy.
 
diff --git a/bsp/buildroot/package/liquid-dsp/liquid-dsp.hash b/bsp/buildroot/package/liquid-dsp/liquid-dsp.hash
index e32d8290..ecee4744 100644
--- a/bsp/buildroot/package/liquid-dsp/liquid-dsp.hash
+++ b/bsp/buildroot/package/liquid-dsp/liquid-dsp.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 d0f050b9d5137c43ba45a35b6c82bc8222eba86f772f4e2e46c91427647bb847 liquid-dsp-1191179b786703b3af20abf7e1404d91099b335d.tar.gz
+sha256 b136343d644bc1441f7854f2d292bfa054e8d040c0b745879b205f6836dca0f0  liquid-dsp-v1.3.0.tar.gz
diff --git a/bsp/buildroot/package/liquid-dsp/liquid-dsp.mk b/bsp/buildroot/package/liquid-dsp/liquid-dsp.mk
index 35994137..e3114a2d 100644
--- a/bsp/buildroot/package/liquid-dsp/liquid-dsp.mk
+++ b/bsp/buildroot/package/liquid-dsp/liquid-dsp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LIQUID_DSP_VERSION = 1191179b786703b3af20abf7e1404d91099b335d
+LIQUID_DSP_VERSION = v1.3.0
 LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,$(LIQUID_DSP_VERSION))
 LIQUID_DSP_LICENSE = MIT
 LIQUID_DSP_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/lirc-tools/0001-Fix-build-without-Python.patch b/bsp/buildroot/package/lirc-tools/0001-Fix-build-without-Python.patch
new file mode 100644
index 00000000..b1940eac
--- /dev/null
+++ b/bsp/buildroot/package/lirc-tools/0001-Fix-build-without-Python.patch
@@ -0,0 +1,63 @@
+From 71f329d997d949d3c12d62d2f1473a1c99ee49b0 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Sun, 27 Aug 2017 21:30:37 +0300
+Subject: [PATCH] Fix build without Python
+
+Don't define HAVE_PYTHON35 when PYTHON_LIBS is empty.
+
+Also, don't build Python dependent code when HAVE_PYTHON35 is not
+defined.
+
+This fixes build failures like:
+
+Makefile:1616: recipe for target 'python-pkg/dist/lirc-0.10.0.tar.gz' failed
+make[3]: *** [python-pkg/dist/lirc-0.10.0.tar.gz] Error 1
+python-pkg/lirc/_client.c:1:20: fatal error: Python.h: No such file or directory
+ #include <Python.h>
+                    ^
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 74a2bcab6b
+
+ Makefile.am  | 2 ++
+ configure.ac | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9f3dd14340cc..d8164fcd44cf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -104,6 +104,7 @@ dist_py_pkg_doc_DATA    = python-pkg/doc/Doxyfile \
+ 
+ libpython               = $(libdir)/python$(PYTHON_VERSION)
+ pydir                   = $(libpython)/site-packages/lirc
++if HAVE_PYTHON35
+ py_LTLIBRARIES          = python-pkg/lib/_client.la
+ python_pkg_lib__client_la_SOURCES = \
+                           python-pkg/lirc/_client.c
+@@ -116,6 +117,7 @@ python_pkg_lib__client_la_LDFLAGS  = \
+                           $(PYTHON_LIBS)
+ python_pkg_lib__client_la_LIBADD = \
+                           lib/liblirc_client.la
++endif
+ 
+ pylint: .phony
+ 	$(MAKE) -C tools pylint
+diff --git a/configure.ac b/configure.ac
+index 4108688433f8..07d901deafdf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,8 @@ test -z "$PYTHON_LIBS" && \
+ test -n "$PYTHON_LIBS" || \
+     AC_MSG_WARN([No python package found (missing devel package?)])
+ python_version_nodots=$(echo $PYTHON_VERSION | tr -d '.')
+-AM_CONDITIONAL(HAVE_PYTHON35, [test $python_version_nodots -ge 35])
++AM_CONDITIONAL(HAVE_PYTHON35, [test -n "$PYTHON_LIBS" && \
++			       test $python_version_nodots -ge 35])
+ CFLAGS="$CFLAGS $PYTHON_CFLAGS"
+ 
+ 
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch b/bsp/buildroot/package/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch
deleted file mode 100644
index 070aab94..00000000
--- a/bsp/buildroot/package/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c861eae83bae3116d330efb3c6061e2de4fdcbce Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Sun, 5 Apr 2015 22:26:12 +0300
-Subject: [PATCH] tools: make_rel_symlink.py can also use python2
-
-The make_rel_symlink.py script is compatible with both python2 and python3.
-Don't hard code a requirement for python3.
-
-Patch status: sent upstream
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- tools/make_rel_symlink.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
-index 896637ff93e0..ff0403a0397a 100755
---- a/tools/make_rel_symlink.py
-+++ b/tools/make_rel_symlink.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python
- 
- import os
- import os.path
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/lirc-tools/0002-Fix-python-client-cross-compile.patch b/bsp/buildroot/package/lirc-tools/0002-Fix-python-client-cross-compile.patch
new file mode 100644
index 00000000..02deefaf
--- /dev/null
+++ b/bsp/buildroot/package/lirc-tools/0002-Fix-python-client-cross-compile.patch
@@ -0,0 +1,47 @@
+From 13c4ffcfde07f659a836fba4a604dc1c5024bb90 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 29 Aug 2017 11:37:36 +0300
+Subject: [PATCH] Fix python client cross compile
+
+The setup.py setuptools wrapper needs to use a version of python built
+specifically for cross compiling to cross compile successfully. Allow
+setting that in the environment using the SETUPTOOLS_ENV variable.
+
+Fixes the following build failure:
+
+/usr/bin/ld: skipping incompatible .../lirc-tools-0.10.0/lib/.libs/liblirc_client.so when searching for -llirc_client
+/usr/bin/ld: cannot find -llirc_client
+collect2: error: ld returned 1 exit status
+error: command '/usr/bin/gcc' failed with exit status 1
+Makefile:1578: recipe for target 'all-local' failed
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://sourceforge.net/p/lirc/tickets/308/
+
+ Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index d8164fcd44cf..a16be4278ae2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -131,6 +131,7 @@ pep8: $(py_PYTHON)
+ if HAVE_PYTHON35
+ all-local:
+ 	cd python-pkg; \
++	    $(SETUPTOOLS_ENV) \
+ 	    CFLAGS="-I$(abs_top_srcdir)/lib -I$(abs_builddir)/lib" \
+ 	    LDFLAGS=-L$(abs_builddir)/lib/.libs $(PYTHON) setup.py \
+ 	    $(if $(VERBOSE),,-q) build
+@@ -179,6 +180,7 @@ $(abs_builddir)/python-pkg/setup.py:
+ $(PYTHON_TARBALL): $(abs_builddir)/python-pkg/setup.py
+ 	cp $(top_builddir)/VERSION $(abs_builddir)/python-pkg
+ 	cd $(abs_builddir)/python-pkg; CFLAGS=-I$(abs_top_srcdir)/lib \
++	    $(SETUPTOOLS_ENV) \
+ 	    LDFLAGS=-L$(abs_builddir)/lib/.libs $(PYTHON) setup.py -q sdist
+ 
+ $(top_builddir)/python-pkg/VERSION: VERSION
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch b/bsp/buildroot/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch
deleted file mode 100644
index 710dfd3b..00000000
--- a/bsp/buildroot/package/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e654ae139cec42a6f1b5684261787d0c241cfd3b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Fri, 19 Aug 2016 15:25:48 +0200
-Subject: [PATCH] configure: check for clock_gettime in librt
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac        | 3 +++
- daemons/Makefile.am | 2 +-
- plugins/Makefile.am | 1 +
- 3 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 73340c7..466e638 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,9 @@ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \
- AC_SEARCH_LIBS([dlopen], [dl dld], [], [
-   AC_MSG_ERROR([unable to find the dlopen() function])
- ])
-+# glibc < 2.17 needs librt for clock_gettime()
-+AC_CHECK_LIB(rt, clock_gettime, LIBCLOCK_GETTIME="-lrt")
-+AC_SUBST(LIBCLOCK_GETTIME)
- AC_CHECK_FUNCS(daemon)
- if test "$ac_cv_func_daemon" != yes; then
-   daemon=""
-diff --git a/daemons/Makefile.am b/daemons/Makefile.am
-index 5625627..85a28f3 100644
---- a/daemons/Makefile.am
-+++ b/daemons/Makefile.am
-@@ -21,7 +21,7 @@ sbin_PROGRAMS           += lircd-uinput
- endif
- 
- lircd_SOURCES           = lircd.cpp
--lircd_LDADD             = ../lib/liblirc.la
-+lircd_LDADD             = ../lib/liblirc.la @LIBCLOCK_GETTIME@
- 
- lircd_uinput_SOURCES    = lircd-uinput.cpp
- lircd_uinput_LDADD     = ../lib/liblirc.la
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index ddff01d..45c012a 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -127,6 +127,7 @@ zotac_la_SOURCES            = zotac.c
- 
- plugin_LTLIBRARIES          += mplay.la
- mplay_la_SOURCES            = mplay.c
-+mplay_la_LIBADD             = @LIBCLOCK_GETTIME@
- endif
- 
- $(srcdir)/pluginlist.am:
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/bsp/buildroot/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
deleted file mode 100644
index 9fe5256c..00000000
--- a/bsp/buildroot/package/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 45c590f64dd79e8e1704d5c94ce3456a5cdbfa5f Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Fri, 19 Aug 2016 04:48:02 +0200
-Subject: [PATCH] lircd: Remove use of functions killed in kernel 4.8.0
-
-From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE,
-LIRC_SETUP_START/LIRC_SETUP_END and several constants related
-to initiating filters. Remove corresponding calls from lircd.
-
-[baruch: move DRVCTL_NOTIFY_DECODE into lircd.cpp]
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: backported from upstream 31fcc8aa39f62c5c
----
- daemons/lircd.cpp | 53 ++++-------------------------------------------------
- 1 file changed, 4 insertions(+), 49 deletions(-)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index 782b6d3f8342..d778aa19308b 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -78,6 +78,8 @@
- #define lirc_gid gid_t
- #endif
- 
-+#define DRVCTL_NOTIFY_DECODE		7
-+
- #ifdef DARWIN
- #include <mach/mach_time.h>
- #define CLOCK_REALTIME 0
-@@ -462,50 +464,6 @@ static int setup_timeout(void)
- }
- 
- 
--static int setup_filter(void)
--{
--	int ret1, ret2;
--	lirc_t min_pulse_supported = 0, max_pulse_supported = 0;
--	lirc_t min_space_supported = 0, max_space_supported = 0;
--
--	if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER))
--		return 1;
--	if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE,
--				     &min_pulse_supported) == -1 ||
--	    curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1
--	    || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1
--	    || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) {
--		log_error("could not get filter range");
--		log_perror_err(__func__);
--	}
--
--	if (setup_min_pulse > max_pulse_supported)
--		setup_min_pulse = max_pulse_supported;
--	else if (setup_min_pulse < min_pulse_supported)
--		setup_min_pulse = 0;    /* disable filtering */
--
--	if (setup_min_space > max_space_supported)
--		setup_min_space = max_space_supported;
--	else if (setup_min_space < min_space_supported)
--		setup_min_space = 0;    /* disable filtering */
--
--	ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse);
--	ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space);
--	if (ret1 == -1 || ret2 == -1) {
--		if (curr_driver->
--		    drvctl_func(LIRC_SET_REC_FILTER,
--				setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) {
--			log_error("could not set filter");
--			log_perror_err(__func__);
--			return 0;
--		}
--	}
--	return 1;
--}
--
--
--
--
- static int setup_hardware(void)
- {
- 	int ret = 1;
-@@ -514,10 +472,7 @@ static int setup_hardware(void)
- 		if ((curr_driver->features & LIRC_CAN_SET_REC_CARRIER)
- 		    || (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT)
- 		    || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) {
--			(void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL);
--			ret = setup_frequency() && setup_timeout()
--			      && setup_filter();
--			(void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL);
-+				ret = setup_frequency() && setup_timeout();
- 		}
- 	}
- 	return ret;
-@@ -2162,7 +2117,7 @@ void loop(void)
- 			int reps;
- 
- 			if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE))
--				curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL);
-+				curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL);
- 
- 			get_release_data(&remote_name, &button_name, &reps);
- 
--- 
-2.9.3
-
diff --git a/bsp/buildroot/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch b/bsp/buildroot/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch
new file mode 100644
index 00000000..04fbfe6e
--- /dev/null
+++ b/bsp/buildroot/package/lirc-tools/0003-python-pkg-Fix-lirc-version-detection-when-cross-com.patch
@@ -0,0 +1,51 @@
+From 732fd31610a6790a927ea9ed6d660796a1641254 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 7 Sep 2017 08:12:01 +0200
+Subject: [PATCH] build: Fix lirc version detection when cross compiling.
+
+The setup.py script that runs on the host can't use the client library
+built for target. So setup.py falls back to a wrong hard-coded VERSION
+value.
+
+Instead of importing the target library, use exec() to read
+lirc/config.py directly for its VERSION value.
+
+Fixes build failure:
+
+/usr/bin/install -c -m 644 ./python-pkg/dist/lirc-0.10.0.tar.gz \
+    '.../output/host/arm-buildroot-linux-musleabihf/sysroot/usr/share/lirc'
+/usr/bin/install: cannot stat './python-pkg/dist/lirc-0.10.0.tar.gz': \
+    No such file or directory
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 732fd31610a6
+
+ python-pkg/setup.py | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/python-pkg/setup.py b/python-pkg/setup.py
+index e9b33690f828..a2d92e0432aa 100644
+--- a/python-pkg/setup.py
++++ b/python-pkg/setup.py
+@@ -6,14 +6,11 @@ import subprocess
+ import os.path
+ import os
+ 
+-try:
+-    import lirc.config
+-    VERSION = lirc.config.VERSION.replace('-devel','')
+-except ImportError:
+-    VERSION='0.0.0'
+-
+ from setuptools import setup, Extension
+ 
++exec(open("lirc/config.py").read())
++VERSION = VERSION.replace('-devel','')
++
+ if 'CFLAGS' in os.environ:
+     cflags = os.environ['CFLAGS'].split()
+     if 'LDFLAGS' in os.environ:
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/lirc-tools/lirc-tools.hash b/bsp/buildroot/package/lirc-tools/lirc-tools.hash
index 239c7664..ed5ecfde 100644
--- a/bsp/buildroot/package/lirc-tools/lirc-tools.hash
+++ b/bsp/buildroot/package/lirc-tools/lirc-tools.hash
@@ -1,3 +1,5 @@
-# hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.4b/
-sha1 7cb2867de1b486708781413aa33568e0612fb912 lirc-0.9.4b.tar.bz2
-md5 9e3f2869a47bbd7c973dd63f30c13fc2 lirc-0.9.4b.tar.bz2
+# hash from https://sourceforge.net/projects/lirc/files/LIRC/0.10.1/
+sha1 9d6f6d18ac566a96ef4ca1d6909a4e8bc517d48a lirc-0.10.1.tar.bz2
+md5 86c3f8e4efaba10571addb8313d1e040 lirc-0.10.1.tar.bz2
+# Locally computed
+sha256 8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2 lirc-0.10.1.tar.bz2
diff --git a/bsp/buildroot/package/lirc-tools/lirc-tools.mk b/bsp/buildroot/package/lirc-tools/lirc-tools.mk
index bd0f96f3..a5165ad4 100644
--- a/bsp/buildroot/package/lirc-tools/lirc-tools.mk
+++ b/bsp/buildroot/package/lirc-tools/lirc-tools.mk
@@ -4,18 +4,26 @@
 #
 ################################################################################
 
-LIRC_TOOLS_VERSION = 0.9.4b
+LIRC_TOOLS_VERSION = 0.10.1
 LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2
 LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION)
-LIRC_TOOLS_LICENSE = GPLv2+
+LIRC_TOOLS_LICENSE = GPL-2.0+
 LIRC_TOOLS_LICENSE_FILES = COPYING
 LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3
 LIRC_TOOLS_INSTALL_STAGING = YES
-# 0002-configure-check-for-clock_gettime-in-librt.patch
+# Patching configure.ac and Makefile.am
 LIRC_TOOLS_AUTORECONF = YES
 
-LIRC_TOOLS_CONF_ENV = XSLTPROC=yes
-LIRC_TOOLS_CONF_OPTS = --without-x
+LIRC_TOOLS_CONF_ENV = XSLTPROC=yes HAVE_WORKING_POLL=yes
+LIRC_TOOLS_CONF_OPTS = --without-x --enable-devinput --enable-uinput
+
+ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_4),y)
+LIRC_TOOLS_CONF_ENV += \
+	DEVINPUT_HEADER=$(STAGING_DIR)/usr/include/linux/input-event-codes.h
+else
+LIRC_TOOLS_CONF_ENV += \
+	DEVINPUT_HEADER=$(STAGING_DIR)/usr/include/linux/input.h
+endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 LIRC_TOOLS_DEPENDENCIES += udev
@@ -33,6 +41,15 @@ ifeq ($(BR2_PACKAGE_PORTAUDIO),y)
 LIRC_TOOLS_DEPENDENCIES += portaudio
 endif
 
+ifeq ($(BR2_PACKAGE_LIBFTDI1),y)
+LIRC_TOOLS_DEPENDENCIES += libftdi1
+endif
+
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+LIRC_TOOLS_DEPENDENCIES += python3 host-python-setuptools
+LIRC_TOOLS_MAKE_ENV += SETUPTOOLS_ENV="$(PKG_PYTHON_SETUPTOOLS_ENV)"
+endif
+
 define LIRC_TOOLS_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/lirc-tools/S25lircd \
 		$(TARGET_DIR)/etc/init.d/S25lircd
diff --git a/bsp/buildroot/package/lite/lite.mk b/bsp/buildroot/package/lite/lite.mk
index 9a1c9174..ddb55d46 100644
--- a/bsp/buildroot/package/lite/lite.mk
+++ b/bsp/buildroot/package/lite/lite.mk
@@ -11,7 +11,7 @@ LITE_INSTALL_STAGING = YES
 LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb
 LITE_DEPENDENCIES = directfb
-LITE_LICENSE = LGPLv2.1+
+LITE_LICENSE = LGPL-2.1+
 LITE_LICENSE_FILES = COPYING
 
 define LITE_FINALIZE_INSTALL
diff --git a/bsp/buildroot/package/live555/Config.in b/bsp/buildroot/package/live555/Config.in
index 5018296c..dbd9dfd3 100644
--- a/bsp/buildroot/package/live555/Config.in
+++ b/bsp/buildroot/package/live555/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_LIVE555
 	bool "live555"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  LIVE555 Streaming Media forms a set of C++ libraries for multimedia
-	  streaming, using open standard protocols (RTP/RTCP, RTSP, SIP).
+	  LIVE555 Streaming Media forms a set of C++ libraries for
+	  multimedia streaming, using open standard protocols
+	  (RTP/RTCP, RTSP, SIP).
 
 	  http://www.live555.com/liveMedia/
 
diff --git a/bsp/buildroot/package/live555/live555.hash b/bsp/buildroot/package/live555/live555.hash
index 16f70774..66a7b7d7 100644
--- a/bsp/buildroot/package/live555/live555.hash
+++ b/bsp/buildroot/package/live555/live555.hash
@@ -1,4 +1,5 @@
 # From http://live555.com/liveMedia/public/live555-latest-md5.txt
-md5	df4ad1d60c2f5ae8155fb077bb011ab3	live.2016.03.16.tar.gz
+md5 a5acd14c4fa7b50f7270304d3b4a70ae live.2017.10.28.tar.gz
 # Locally generated
-sha256	6f98a96d4cf6e986c7711f0a2431c02cb807a8107d6715eb491a6ed9d0446cf6	live.2016.03.16.tar.gz
+sha256 d8eaec9ded34321aa655d3c9007217dd447218c54cb48c97827e58ecd5edb338  live.2017.10.28.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/bsp/buildroot/package/live555/live555.mk b/bsp/buildroot/package/live555/live555.mk
index f36cce34..0507ee9b 100644
--- a/bsp/buildroot/package/live555/live555.mk
+++ b/bsp/buildroot/package/live555/live555.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LIVE555_VERSION = 2016.03.16
+LIVE555_VERSION = 2017.10.28
 LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
 LIVE555_SITE = http://www.live555.com/liveMedia/public
-LIVE555_LICENSE = LGPLv2.1+
+LIVE555_LICENSE = LGPL-2.1+
 LIVE555_LICENSE_FILES = COPYING
 LIVE555_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/ljlinenoise/Config.in b/bsp/buildroot/package/ljlinenoise/Config.in
index be83bdba..61c80df0 100644
--- a/bsp/buildroot/package/ljlinenoise/Config.in
+++ b/bsp/buildroot/package/ljlinenoise/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LJLINENOISE
 	bool "ljlinenoise"
-	# run-time dependency only
-	select BR2_PACKAGE_LJSYSCALL
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
+	# run-time dependency only
+	select BR2_PACKAGE_LJSYSCALL
 	help
 	  ljlinenoise is a pure LuaJIT port of linenoise,
 	  a small alternative to readline and libedit.
diff --git a/bsp/buildroot/package/ljlinenoise/ljlinenoise.hash b/bsp/buildroot/package/ljlinenoise/ljlinenoise.hash
index 7b4a948c..c70b5d68 100644
--- a/bsp/buildroot/package/ljlinenoise/ljlinenoise.hash
+++ b/bsp/buildroot/package/ljlinenoise/ljlinenoise.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	a5fa2a88d8232bd0f97d3af9aafe780cd855830b42a9ab87c9ae2a5697b044a1  ljlinenoise-0.1.2-1.src.rock
+sha256	7a6c4142b0096106f498d7ee4bea5bf5086c076d1f071893441b8e5c0665fb47  ljlinenoise-0.1.3-1.src.rock
diff --git a/bsp/buildroot/package/ljlinenoise/ljlinenoise.mk b/bsp/buildroot/package/ljlinenoise/ljlinenoise.mk
index aca63588..f021d938 100644
--- a/bsp/buildroot/package/ljlinenoise/ljlinenoise.mk
+++ b/bsp/buildroot/package/ljlinenoise/ljlinenoise.mk
@@ -4,9 +4,7 @@
 #
 ################################################################################
 
-LJLINENOISE_VERSION_UPSTREAM = 0.1.2
-LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1
-LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM)
+LJLINENOISE_VERSION = 0.1.3-1
 LJLINENOISE_LICENSE = MIT
 LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT
 
diff --git a/bsp/buildroot/package/ljsyscall/Config.in b/bsp/buildroot/package/ljsyscall/Config.in
index 149e71d3..3af9dabe 100644
--- a/bsp/buildroot/package/ljsyscall/Config.in
+++ b/bsp/buildroot/package/ljsyscall/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_LJSYSCALL
 	# ljsyscall is specifically for LuaJIT, not Lua.
 	depends on BR2_PACKAGE_LUAJIT
 	help
-	  An FFI implementation of the Linux and NetBSD kernel ABIs for LuaJIT.
+	  An FFI implementation of the Linux and NetBSD kernel ABIs for
+	  LuaJIT.
 
 	  http://github.com/justincormack/ljsyscall
 
 comment "ljsyscall needs LuaJIT"
 	depends on !BR2_PACKAGE_LUAJIT
-
diff --git a/bsp/buildroot/package/ljsyscall/ljsyscall.hash b/bsp/buildroot/package/ljsyscall/ljsyscall.hash
index 2d67907a..114aa842 100644
--- a/bsp/buildroot/package/ljsyscall/ljsyscall.hash
+++ b/bsp/buildroot/package/ljsyscall/ljsyscall.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 9b5ba2b5798c5bc33aa2158f3b44f730de12497c195764aa1bc3d3f1244df198  ljsyscall-v0.10.tar.gz
+sha256 6e29503609bd966fed33dec1a1571b36bbdbc37bf1a828af6722ed0ead192ff1  ljsyscall-v0.12.tar.gz
diff --git a/bsp/buildroot/package/ljsyscall/ljsyscall.mk b/bsp/buildroot/package/ljsyscall/ljsyscall.mk
index 1c6c2c11..45e9e82b 100644
--- a/bsp/buildroot/package/ljsyscall/ljsyscall.mk
+++ b/bsp/buildroot/package/ljsyscall/ljsyscall.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LJSYSCALL_VERSION = v0.10
+LJSYSCALL_VERSION = v0.12
 LJSYSCALL_SITE = $(call github,justincormack,ljsyscall,$(LJSYSCALL_VERSION))
 LJSYSCALL_LICENSE = MIT
 LJSYSCALL_LICENSE_FILES = COPYRIGHT
diff --git a/bsp/buildroot/package/lksctp-tools/lksctp-tools.mk b/bsp/buildroot/package/lksctp-tools/lksctp-tools.mk
index a36d6ca9..5ac794e8 100644
--- a/bsp/buildroot/package/lksctp-tools/lksctp-tools.mk
+++ b/bsp/buildroot/package/lksctp-tools/lksctp-tools.mk
@@ -9,7 +9,7 @@ LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools
 LKSCTP_TOOLS_INSTALL_STAGING = YES
 # configure not shipped
 LKSCTP_TOOLS_AUTORECONF = YES
-LKSCTP_TOOLS_LICENSE = LGPLv2.1 (library), GPLv2+ (programs)
+LKSCTP_TOOLS_LICENSE = LGPL-2.1 (library), GPL-2.0+ (programs)
 LKSCTP_TOOLS_LICENSE_FILES = COPYING.lib COPYING
 LKSCTP_TOOLS_CONF_OPTS = --disable-tests
 
diff --git a/bsp/buildroot/package/lm-sensors/Config.in b/bsp/buildroot/package/lm-sensors/Config.in
index b035f5d0..60571b78 100644
--- a/bsp/buildroot/package/lm-sensors/Config.in
+++ b/bsp/buildroot/package/lm-sensors/Config.in
@@ -38,9 +38,9 @@ config BR2_PACKAGE_LM_SENSORS_ISASET
 config BR2_PACKAGE_LM_SENSORS_PWMCONFIG
 	bool "pwmconfig"
 	help
-	  Pwmconfig searches your sensors for pulse width modulation (PWM)
-	  controls, and tests each one to see if it controls a fan on
-	  your motherboard.
+	  Pwmconfig searches your sensors for pulse width modulation
+	  (PWM) controls, and tests each one to see if it controls a fan
+	  on your motherboard.
 
 config BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT
 	bool "sensors-detect"
diff --git a/bsp/buildroot/package/lm-sensors/lm-sensors.mk b/bsp/buildroot/package/lm-sensors/lm-sensors.mk
index c1988178..6fc7ce49 100644
--- a/bsp/buildroot/package/lm-sensors/lm-sensors.mk
+++ b/bsp/buildroot/package/lm-sensors/lm-sensors.mk
@@ -9,7 +9,7 @@ LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2
 LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors
 LM_SENSORS_INSTALL_STAGING = YES
 LM_SENSORS_DEPENDENCIES = host-bison host-flex
-LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPLv2+ (programs)
+LM_SENSORS_LICENSE = LGPL-2.1+ (libsensors), GPL-2.0+ (programs)
 LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING
 
 LM_SENSORS_BINS_ = bin/sensors-conf-convert
@@ -26,7 +26,7 @@ LM_SENSORS_MAKE_OPTS = \
 	PREFIX=/usr
 
 ifeq ($(BR2_STATIC_LIBS),y)
-LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0
+LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0 EXLDFLAGS=-static
 else
 LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1
 endif
diff --git a/bsp/buildroot/package/lmbench/Config.in b/bsp/buildroot/package/lmbench/Config.in
index c4ea5223..33778e4d 100644
--- a/bsp/buildroot/package/lmbench/Config.in
+++ b/bsp/buildroot/package/lmbench/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LMBENCH
 	bool "lmbench"
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
-	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  LMbench is a suite of simple, portable,
 	  ANSI/C microbenchmarks for UNIX/POSIX.
diff --git a/bsp/buildroot/package/lmbench/lmbench.mk b/bsp/buildroot/package/lmbench/lmbench.mk
index b62096d9..c52d6a5a 100644
--- a/bsp/buildroot/package/lmbench/lmbench.mk
+++ b/bsp/buildroot/package/lmbench/lmbench.mk
@@ -7,7 +7,7 @@
 LMBENCH_VERSION = 3.0-a9
 LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz
 LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION)
-LMBENCH_LICENSE = lmbench license (based on GPLv2)
+LMBENCH_LICENSE = lmbench license (based on GPL-2.0)
 LMBENCH_LICENSE_FILES = COPYING COPYING-2
 
 LMBENCH_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/localedef/localedef.mk b/bsp/buildroot/package/localedef/localedef.mk
index 1fe431aa..11d9ba38 100644
--- a/bsp/buildroot/package/localedef/localedef.mk
+++ b/bsp/buildroot/package/localedef/localedef.mk
@@ -16,7 +16,7 @@ HOST_LOCALEDEF_CONF_ENV = CFLAGS="$(HOST_CFLAGS) -fgnu89-inline"
 
 # The makefile does not implement an install target
 define HOST_LOCALEDEF_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/usr/bin/localedef
+	$(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/bin/localedef
 endef
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/lockdev/lockdev.mk b/bsp/buildroot/package/lockdev/lockdev.mk
index a45e22e7..e491b132 100644
--- a/bsp/buildroot/package/lockdev/lockdev.mk
+++ b/bsp/buildroot/package/lockdev/lockdev.mk
@@ -9,7 +9,7 @@ LOCKDEV_VERSION = $(LOCKDEV_VERSION_MAJOR).0.3
 LOCKDEV_SOURCE = lockdev_$(LOCKDEV_VERSION).orig.tar.gz
 LOCKDEV_PATCH = lockdev_$(LOCKDEV_VERSION)-1.6.diff.gz
 LOCKDEV_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev
-LOCKDEV_LICENSE = LGPLv2.1
+LOCKDEV_LICENSE = LGPL-2.1
 LOCKDEV_LICENSE_FILES = LICENSE
 LOCKDEV_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/lockfile-progs/lockfile-progs.mk b/bsp/buildroot/package/lockfile-progs/lockfile-progs.mk
index deb9f908..ed192f10 100644
--- a/bsp/buildroot/package/lockfile-progs/lockfile-progs.mk
+++ b/bsp/buildroot/package/lockfile-progs/lockfile-progs.mk
@@ -8,10 +8,10 @@ LOCKFILE_PROGS_VERSION = 0.1.17
 LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz
 LOCKFILE_PROGS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockfile-progs
 LOCKFILE_PROGS_DEPENDENCIES = liblockfile
-LOCKFILE_PROGS_LICENSE = GPLv2
+LOCKFILE_PROGS_LICENSE = GPL-2.0
 LOCKFILE_PROGS_LICENSE_FILES = COPYING
 
-LOCKFILE_BINS = \
+LOCKFILE_PROGS_BINS = \
 	$(addprefix lockfile-,check create remove touch) \
 	$(addprefix mail-,lock touchlock unlock)
 
@@ -20,7 +20,7 @@ define LOCKFILE_PROGS_BUILD_CMDS
 endef
 
 define LOCKFILE_PROGS_INSTALL_TARGET_CMDS
-	for i in $(LOCKFILE_BINS); do \
+	for i in $(LOCKFILE_PROGS_BINS); do \
 		$(INSTALL) -D -m 755 $(@D)/bin/$$i $(TARGET_DIR)/usr/bin/$$i || exit 1; \
 	done
 endef
diff --git a/bsp/buildroot/package/log4cplus/log4cplus.mk b/bsp/buildroot/package/log4cplus/log4cplus.mk
index 292fa66d..b4a57c36 100644
--- a/bsp/buildroot/package/log4cplus/log4cplus.mk
+++ b/bsp/buildroot/package/log4cplus/log4cplus.mk
@@ -7,7 +7,7 @@
 LOG4CPLUS_VERSION = 1.1.2
 LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz
 LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION)
-LOG4CPLUS_LICENSE = Apache-2.0
+LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause
 LOG4CPLUS_LICENSE_FILES = LICENSE
 LOG4CPLUS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/log4cpp/0001-Fix-musl-compile.patch b/bsp/buildroot/package/log4cpp/0001-Fix-musl-compile.patch
deleted file mode 100644
index f1a13a07..00000000
--- a/bsp/buildroot/package/log4cpp/0001-Fix-musl-compile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 17562259fb6684f351a70b98b4f3b438927ba1aa Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Mon, 11 Jul 2016 22:58:31 +0200
-Subject: [PATCH] Fix musl compile.
-
-Include proper config.h (via log4cpp/Portability.hh) to fix the
-evaluate of LOG4CPP_HAVE_STDINT_H in the file tests/Clock.hh
-
-Fixes:
-
-  Clock.hh:17:13: error: 'int64_t' does not name a type
-       typedef int64_t usec_t;
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- log4cpp/tests/Clock.hh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/log4cpp/tests/Clock.hh b/log4cpp/tests/Clock.hh
-index 4bf0ca4..45c6467 100644
---- a/log4cpp/tests/Clock.hh
-+++ b/log4cpp/tests/Clock.hh
-@@ -6,6 +6,8 @@
- #ifndef __CLOCK_H
- #define __CLOCK_H
- 
-+#include <log4cpp/Portability.hh>
-+
- #ifdef LOG4CPP_HAVE_STDINT_H
- #include <stdint.h>
- #endif // LOG4CPP_HAVE_STDINT_H
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/log4cpp/Config.in b/bsp/buildroot/package/log4cpp/Config.in
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/log4cpp/log4cpp.hash b/bsp/buildroot/package/log4cpp/log4cpp.hash
old mode 100755
new mode 100644
index 6467aabf..fd739880
--- a/bsp/buildroot/package/log4cpp/log4cpp.hash
+++ b/bsp/buildroot/package/log4cpp/log4cpp.hash
@@ -1,3 +1,5 @@
 # From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/
-md5		1e173df8ee97205f412ff84aa93b8fbe	log4cpp-1.1.1.tar.gz
-sha1	23aa5bd7d6f79992c92bad3e1c6d64a34f8fcf68	log4cpp-1.1.1.tar.gz
+md5 b9e2cee932da987212f2c74b767b4d8b  log4cpp-1.1.3.tar.gz
+sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041  log4cpp-1.1.3.tar.gz
+# Locally computed
+sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d  log4cpp-1.1.3.tar.gz
diff --git a/bsp/buildroot/package/log4cpp/log4cpp.mk b/bsp/buildroot/package/log4cpp/log4cpp.mk
old mode 100755
new mode 100644
index df7109b2..8664a543
--- a/bsp/buildroot/package/log4cpp/log4cpp.mk
+++ b/bsp/buildroot/package/log4cpp/log4cpp.mk
@@ -5,14 +5,17 @@
 ################################################################################
 
 LOG4CPP_VERSION_MAJOR = 1.1
-LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).1
+LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).3
 LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR)
 LOG4CPP_SUBDIR = log4cpp
 # The "or later" is indicated in the HTML documentation
-LOG4CPP_LICENSE = LGPLv2.1+
+LOG4CPP_LICENSE = LGPL-2.1+
 LOG4CPP_LICENSE_FILES = log4cpp/COPYING
 LOG4CPP_INSTALL_STAGING = YES
 LOG4CPP_CONF_OPTS = --enable-doxygen=no --enable-dot=no
+# needed to fix broken configure script
+LOG4CPP_AUTORECONF = YES
+LOG4CPP_AUTORECONF_OPTS = -I m4
 
 # The default <pkg>_CONFIG_SCRIPTS handling does not apply
 define LOG4CPP_STAGING_CONFIG_SCRIPT_FIXUP
diff --git a/bsp/buildroot/package/log4cxx/Config.in b/bsp/buildroot/package/log4cxx/Config.in
index 6ec67b62..bf739a43 100644
--- a/bsp/buildroot/package/log4cxx/Config.in
+++ b/bsp/buildroot/package/log4cxx/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_LOG4CXX
 	bool "log4cxx"
-	select BR2_PACKAGE_APR
-	select BR2_PACKAGE_APR_UTIL
 	# apr really needs shared library support
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # apr
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_APR_UTIL
 	help
 	  Apache log4cxx is a logging framework for C++ patterned
 	  after Apache log4j.
diff --git a/bsp/buildroot/package/logrotate/Config.in b/bsp/buildroot/package/logrotate/Config.in
index 2b1ae643..eea9ec2a 100644
--- a/bsp/buildroot/package/logrotate/Config.in
+++ b/bsp/buildroot/package/logrotate/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LOGROTATE
 	bool "logrotate"
-	select BR2_PACKAGE_POPT
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_POPT
 	help
 	  A simple program to rotate logs.
 
diff --git a/bsp/buildroot/package/logrotate/logrotate.hash b/bsp/buildroot/package/logrotate/logrotate.hash
index 4985a17a..70b068c6 100644
--- a/bsp/buildroot/package/logrotate/logrotate.hash
+++ b/bsp/buildroot/package/logrotate/logrotate.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 62aa0229cfd34c7b6ea6a6736d569983bf4a3dd1f3c9e9c2efe2ffe2a0a55cf2 logrotate-3.11.0.tar.gz
+sha256 fb1ff8502e7ae4aedaa3d0da8d3740a6a0f44b72e34666af724e9094b166c942  logrotate-3.13.0.tar.gz
diff --git a/bsp/buildroot/package/logrotate/logrotate.mk b/bsp/buildroot/package/logrotate/logrotate.mk
index 5fd779e6..c2c48856 100644
--- a/bsp/buildroot/package/logrotate/logrotate.mk
+++ b/bsp/buildroot/package/logrotate/logrotate.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LOGROTATE_VERSION = 3.11.0
+LOGROTATE_VERSION = 3.13.0
 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION))
-LOGROTATE_LICENSE = GPLv2+
+LOGROTATE_LICENSE = GPL-2.0+
 LOGROTATE_LICENSE_FILES = COPYING
 LOGROTATE_DEPENDENCIES = popt host-pkgconf
 # tarball does not have a generated configure script
diff --git a/bsp/buildroot/package/logsurfer/Config.in b/bsp/buildroot/package/logsurfer/Config.in
index d4218bce..43e2f519 100644
--- a/bsp/buildroot/package/logsurfer/Config.in
+++ b/bsp/buildroot/package/logsurfer/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LOGSURFER
 	bool "logsurfer"
 	depends on BR2_USE_MMU # fork()
 	help
-	  Logsurfer is a program for monitoring system logs in real-time,
-	  and reporting on the occurrence of events.
+	  Logsurfer is a program for monitoring system logs in
+	  real-time, and reporting on the occurrence of events.
 
 	  http://www.crypt.gen.nz/logsurfer/
diff --git a/bsp/buildroot/package/logsurfer/logsurfer.hash b/bsp/buildroot/package/logsurfer/logsurfer.hash
index 2c14078f..539a41a3 100644
--- a/bsp/buildroot/package/logsurfer/logsurfer.hash
+++ b/bsp/buildroot/package/logsurfer/logsurfer.hash
@@ -1,2 +1,3 @@
-# Locally computed:
-sha256  74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af  logsurfer-1.8.tar.gz
+# From https://www.crypt.gen.nz/logsurfer/
+md5 4c26a74d813ccf766117c95c644aa601  logsurfer-1.8.tar.gz
+sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af  logsurfer-1.8.tar.gz
diff --git a/bsp/buildroot/package/lpc3250loader/Config.in.host b/bsp/buildroot/package/lpc3250loader/Config.in.host
index 9371f134..946820a5 100644
--- a/bsp/buildroot/package/lpc3250loader/Config.in.host
+++ b/bsp/buildroot/package/lpc3250loader/Config.in.host
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_HOST_LPC3250LOADER
 	bool "host lpc3250loader"
 	help
-	  lpc3250loader is a tool to load/burn programs (in particular kickstart
-	  and S1L) on an LPC3250 platform.
+	  lpc3250loader is a tool to load/burn programs (in particular
+	  kickstart and S1L) on an LPC3250 platform.
 
 	  https://github.com/alexandrebelloni/lpc3250loader
diff --git a/bsp/buildroot/package/lpc3250loader/lpc3250loader.mk b/bsp/buildroot/package/lpc3250loader/lpc3250loader.mk
index 042e364f..ee153fef 100644
--- a/bsp/buildroot/package/lpc3250loader/lpc3250loader.mk
+++ b/bsp/buildroot/package/lpc3250loader/lpc3250loader.mk
@@ -6,12 +6,12 @@
 
 HOST_LPC3250LOADER_VERSION = 1.0
 HOST_LPC3250LOADER_SITE = $(call github,alexandrebelloni,lpc3250loader,$(HOST_LPC3250LOADER_VERSION))
-LPC3250LOADER_LICENSE = GPLv2+
+LPC3250LOADER_LICENSE = GPL-2.0+
 LPC3250LOADER_LICENSE_FILES = LPC3250loader.py
 
 define HOST_LPC3250LOADER_INSTALL_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/LPC3250loader.py \
-		$(HOST_DIR)/usr/bin/LPC3250loader.py
+		$(HOST_DIR)/bin/LPC3250loader.py
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/lpeg/lpeg.hash b/bsp/buildroot/package/lpeg/lpeg.hash
index 50e66d12..92616748 100644
--- a/bsp/buildroot/package/lpeg/lpeg.hash
+++ b/bsp/buildroot/package/lpeg/lpeg.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	e70c7cf8d7b8feddd8a41235d0ebb27bb60fbe7f31c8364ad23ee30a7f0cc26e  lpeg-1.0.0-1.src.rock
+sha256	149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d  lpeg-1.0.1-1.src.rock
diff --git a/bsp/buildroot/package/lpeg/lpeg.mk b/bsp/buildroot/package/lpeg/lpeg.mk
index 0754f00d..1541f33c 100644
--- a/bsp/buildroot/package/lpeg/lpeg.mk
+++ b/bsp/buildroot/package/lpeg/lpeg.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LPEG_VERSION = 1.0.0-1
+LPEG_VERSION = 1.0.1-1
 LPEG_LICENSE = MIT
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lpty/lpty.mk b/bsp/buildroot/package/lpty/lpty.mk
index 963ab611..5a691256 100644
--- a/bsp/buildroot/package/lpty/lpty.mk
+++ b/bsp/buildroot/package/lpty/lpty.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-LPTY_VERSION_UPSTREAM = 1.0.1
-LPTY_VERSION = $(LPTY_VERSION_UPSTREAM)-1
+LPTY_VERSION = 1.0.1-1
 LPTY_SUBDIR = lpty-$(LPTY_VERSION)
 LPTY_LICENSE = MIT
 LPTY_LICENSE_FILES = $(LPTY_SUBDIR)/doc/LICENSE
diff --git a/bsp/buildroot/package/lrzsz/lrzsz.mk b/bsp/buildroot/package/lrzsz/lrzsz.mk
index a283dd1a..25ecf3de 100644
--- a/bsp/buildroot/package/lrzsz/lrzsz.mk
+++ b/bsp/buildroot/package/lrzsz/lrzsz.mk
@@ -7,7 +7,7 @@
 LRZSZ_VERSION = 0.12.20
 LRZSZ_SITE = http://www.ohse.de/uwe/releases
 LRZSZ_CONF_OPTS = --disable-timesync
-LRZSZ_LICENSE = GPLv2+
+LRZSZ_LICENSE = GPL-2.0+
 LRZSZ_LICENSE_FILES = COPYING
 
 define LRZSZ_POST_CONFIGURE_HOOKS
@@ -24,6 +24,10 @@ define LRZSZ_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz
 	ln -sf rz $(TARGET_DIR)/usr/bin/lrz
 	ln -sf sz $(TARGET_DIR)/usr/bin/lsz
+	ln -sf rz $(TARGET_DIR)/usr/bin/rb
+	ln -sf sz $(TARGET_DIR)/usr/bin/sb
+	ln -sf rz $(TARGET_DIR)/usr/bin/rx
+	ln -sf sz $(TARGET_DIR)/usr/bin/sx
 endef
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lshw/Config.in b/bsp/buildroot/package/lshw/Config.in
index 8cc935ab..3caac66c 100644
--- a/bsp/buildroot/package/lshw/Config.in
+++ b/bsp/buildroot/package/lshw/Config.in
@@ -2,10 +2,10 @@ config BR2_PACKAGE_LSHW
 	bool "lshw"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  lshw (Hardware Lister) is a small tool to provide
-	  detailed information on the hardware configuration of the machine.
+	  detailed information on the hardware configuration of the
+	  machine.
 
 	  http://ezix.org/project/wiki/HardwareLiSter
 
diff --git a/bsp/buildroot/package/lshw/lshw.mk b/bsp/buildroot/package/lshw/lshw.mk
index 32c0bc0d..9b52b091 100644
--- a/bsp/buildroot/package/lshw/lshw.mk
+++ b/bsp/buildroot/package/lshw/lshw.mk
@@ -6,20 +6,15 @@
 
 LSHW_VERSION = B.02.18
 LSHW_SITE = http://ezix.org/software/files
-LSHW_LICENSE = GPLv2
+LSHW_LICENSE = GPL-2.0
 LSHW_LICENSE_FILES = COPYING
 
-LSHW_CFLAGS = $(TARGET_CFLAGS)
-ifeq ($(BR2_ENABLE_LOCALE),)
-LSHW_CFLAGS += -DNONLS
-endif
-
 LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
-	RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all
+	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
 LSHW_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
-	LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
-LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	LIBS=$(TARGET_NLS_LIBS)
+LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 define LSHW_BUILD_CMDS
 	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)
diff --git a/bsp/buildroot/package/lsqlite3/Config.in b/bsp/buildroot/package/lsqlite3/Config.in
index cc431ae0..223fb59c 100644
--- a/bsp/buildroot/package/lsqlite3/Config.in
+++ b/bsp/buildroot/package/lsqlite3/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LSQLITE3
 	bool "lsqlite3"
-	select BR2_PACKAGE_SQLITE
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+	select BR2_PACKAGE_SQLITE
 	help
 	  a thin Lua wrapper for the SQLite3 library.
 
diff --git a/bsp/buildroot/package/lsscsi/Config.in b/bsp/buildroot/package/lsscsi/Config.in
new file mode 100644
index 00000000..1c856863
--- /dev/null
+++ b/bsp/buildroot/package/lsscsi/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LSSCSI
+	bool "lsscsi"
+	help
+	  lsscsi - list SCSI devices (or hosts) and their attributes
+
+	  http://sg.danny.cz/scsi/lsscsi.html
diff --git a/bsp/buildroot/package/lsscsi/lsscsi.hash b/bsp/buildroot/package/lsscsi/lsscsi.hash
new file mode 100644
index 00000000..d39da9bc
--- /dev/null
+++ b/bsp/buildroot/package/lsscsi/lsscsi.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 025d009a1af42bc5b2fca664c44c9ecdfd754356e4a44f5c6aced2420afadd50  lsscsi-0.28.tgz
diff --git a/bsp/buildroot/package/lsscsi/lsscsi.mk b/bsp/buildroot/package/lsscsi/lsscsi.mk
new file mode 100644
index 00000000..649aad9a
--- /dev/null
+++ b/bsp/buildroot/package/lsscsi/lsscsi.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lsscsi
+#
+################################################################################
+
+LSSCSI_VERSION = 0.28
+LSSCSI_SOURCE = lsscsi-$(LSSCSI_VERSION).tgz
+LSSCSI_SITE = http://sg.danny.cz/scsi
+LSSCSI_LICENSE = GPL-2.0+
+LSSCSI_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lsuio/lsuio.mk b/bsp/buildroot/package/lsuio/lsuio.mk
index 5f8a9658..193de15a 100644
--- a/bsp/buildroot/package/lsuio/lsuio.mk
+++ b/bsp/buildroot/package/lsuio/lsuio.mk
@@ -6,7 +6,7 @@
 
 LSUIO_VERSION = 0.2.0
 LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user
-LSUIO_LICENSE = GPLv2
+LSUIO_LICENSE = GPL-2.0
 LSUIO_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch b/bsp/buildroot/package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch
new file mode 100644
index 00000000..6ad1db04
--- /dev/null
+++ b/bsp/buildroot/package/ltp-testsuite/0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch
@@ -0,0 +1,37 @@
+From 01c134f30be755a43af12a4ae2c31177d04be790 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <pvorel@suse.cz>
+Date: Mon, 29 Jan 2018 10:31:40 +0100
+Subject: [PATCH] numa: Fix numa v2 detection for cross compilation
+
+Changed to AC_COMPILE_IFELSE as AC_RUN_IFELSE cannot be run while
+cross compiling.
+
+Bug found by Buildroot project.
+
+Signed-off-by: Petr Vorel <pvorel@suse.cz>
+Reported-by: Baruch Siach <baruch@tkos.co.il>
+---
+ m4/ltp-numa.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/ltp-numa.m4 b/m4/ltp-numa.m4
+index fc3383e97..633f54c18 100644
+--- a/m4/ltp-numa.m4
++++ b/m4/ltp-numa.m4
+@@ -28,11 +28,11 @@ AC_DEFUN([LTP_CHECK_SYSCALL_NUMA], [
+ 	AC_CHECK_HEADERS([numa.h numaif.h], [], [have_numa_headers=no])
+ 
+ 	if test "x$have_numa_headers" != "xno"; then
+-		AC_RUN_IFELSE([AC_LANG_PROGRAM([
++		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ #include <numa.h>
+ 		], [
+ #if LIBNUMA_API_VERSION < 2
+-exit(1);
++# error Required numa headers >= 2
+ #endif
+ 		])], [have_numa_headers_v2=yes])
+ 	fi
+-- 
+2.16.0
+
diff --git a/bsp/buildroot/package/ltp-testsuite/0002-uClibc-ng-has-no-profil-support.patch b/bsp/buildroot/package/ltp-testsuite/0002-uClibc-ng-has-no-profil-support.patch
deleted file mode 100644
index c1496037..00000000
--- a/bsp/buildroot/package/ltp-testsuite/0002-uClibc-ng-has-no-profil-support.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4ab7dc5fd201318e2a62dbd3ba1680b97034ec65 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Fri, 30 Sep 2016 17:45:03 +0200
-Subject: [PATCH] uClibc-ng has no profil() support
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-[Erico: Rebase for ltp 20160920]
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
----
- testcases/kernel/syscalls/profil/profil01.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/profil/profil01.c b/testcases/kernel/syscalls/profil/profil01.c
-index 2fc47aa..f8afd57 100644
---- a/testcases/kernel/syscalls/profil/profil01.c
-+++ b/testcases/kernel/syscalls/profil/profil01.c
-@@ -37,6 +37,9 @@
- #define PROFIL_BUFLEN (32*1024)
- 
- char *TCID = "profil01";
-+
-+#if !defined(__UCLIBC__)
-+
- int TST_TOTAL = 1;
- 
- static volatile sig_atomic_t profil_done;
-@@ -124,3 +127,9 @@ int main(int ac, char *av[])
- 
- 	tst_exit();
- }
-+#else /* systems that dont support profil */
-+int main(void)
-+{
-+        tst_brkm(TCONF, NULL, "system doesn't have profil support");
-+}
-+#endif
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/ltp-testsuite/0003-uClibc-ng-need-__UCLIBC_SV4_DEPRECATED__-enabled-for.patch b/bsp/buildroot/package/ltp-testsuite/0003-uClibc-ng-need-__UCLIBC_SV4_DEPRECATED__-enabled-for.patch
deleted file mode 100644
index 14f5888d..00000000
--- a/bsp/buildroot/package/ltp-testsuite/0003-uClibc-ng-need-__UCLIBC_SV4_DEPRECATED__-enabled-for.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From bb966fd9efc3b9bec3ca72b0e72dd760434e0f10 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Fri, 30 Sep 2016 17:45:16 +0200
-Subject: [PATCH] uClibc-ng need __UCLIBC_SV4_DEPRECATED__ enabled for ustat
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-[Erico: Rebase for ltp 20160920]
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
----
- testcases/kernel/syscalls/ustat/ustat01.c | 12 ++++++++++++
- testcases/kernel/syscalls/ustat/ustat02.c | 10 ++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c
-index 494647b..35e0bb1 100644
---- a/testcases/kernel/syscalls/ustat/ustat01.c
-+++ b/testcases/kernel/syscalls/ustat/ustat01.c
-@@ -21,7 +21,9 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__)
- #include <sys/ustat.h>
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "test.h"
-@@ -30,6 +32,9 @@
- static void setup(void);
- 
- char *TCID = "ustat01";
-+
-+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__)
-+
- int TST_TOTAL = 1;
- 
- static dev_t dev_num;
-@@ -79,3 +84,10 @@ static void setup(void)
- 
- 	dev_num = buf.st_dev;
- }
-+#else /* systems that dont support ustat */
-+int main(void)
-+{
-+        tst_brkm(TCONF, NULL, "system doesn't have ustat support");
-+}
-+#endif
-+
-diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c
-index edada31..795c605 100644
---- a/testcases/kernel/syscalls/ustat/ustat02.c
-+++ b/testcases/kernel/syscalls/ustat/ustat02.c
-@@ -22,7 +22,9 @@
- 
- #include <unistd.h>
- #include <errno.h>
-+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__)
- #include <sys/ustat.h>
-+#endif
- #include <sys/stat.h>
- #include <sys/types.h>
- #include "test.h"
-@@ -32,6 +34,8 @@ static void setup(void);
- 
- char *TCID = "ustat02";
- 
-+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__)
-+
- static dev_t invalid_dev = -1;
- static dev_t root_dev;
- struct ustat ubuf;
-@@ -101,3 +105,9 @@ static void setup(void)
- 
- 	root_dev = buf.st_dev;
- }
-+#else /* systems that dont support ustat */
-+int main(void)
-+{
-+        tst_brkm(TCONF, NULL, "system doesn't have ustat support");
-+}
-+#endif
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch b/bsp/buildroot/package/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch
deleted file mode 100644
index fc3dce97..00000000
--- a/bsp/buildroot/package/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 780bec6c2742231ca73d4dee51c727815cf857b3 Mon Sep 17 00:00:00 2001
-From: Erico Nunes <nunes.erico@gmail.com>
-Date: Fri, 30 Sep 2016 17:45:31 +0200
-Subject: [PATCH] rusers.h is unused and not available for uClibc-ng / libtirpc
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-[Erico: Rebase for ltp 20160920]
-Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
----
- .../tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c    | 1 -
- .../rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c         | 1 -
- .../rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c         | 1 -
- .../rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c   | 1 -
- .../rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c  | 1 -
- .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c     | 1 -
- .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c     | 1 -
- .../rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c      | 1 -
- .../rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c   | 1 -
- .../rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c  | 1 -
- .../rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c     | 1 -
- 11 files changed, 11 deletions(-)
-
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c
-index 7f157e1..728c023 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c
-index d9a3111..8d80a5e 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c
-index cabffc7..a4d1d6f 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c
-index 4f10466..863aec7 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c
-index 290f357..e849468 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c
-index 55bac16..8c1800b 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c
-index 09d1bf9..384a00d 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c
-index 3e15306..285eb21 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c
-index a7030a2..1f2690a 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c
-index 06f4740..faa8ef6 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
-diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c
-index ca38aa0..974f5fb 100644
---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c
-+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c
-@@ -30,7 +30,6 @@
- #include <time.h>
- #include <rpc/rpc.h>
- #include <sys/socket.h>
--#include <rpcsvc/rusers.h>
- #include <utmp.h>
- #include <sys/time.h>
- #include <netdb.h>
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/ltp-testsuite/Config.in b/bsp/buildroot/package/ltp-testsuite/Config.in
index 60e19228..711c859e 100644
--- a/bsp/buildroot/package/ltp-testsuite/Config.in
+++ b/bsp/buildroot/package/ltp-testsuite/Config.in
@@ -1,28 +1,26 @@
-comment "ltp-testsuite needs specific uClibc options, see help"
-	depends on BR2_PACKAGE_LTP_TESTSUITE
-	depends on BR2_TOOLCHAIN_USES_UCLIBC
+config BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
+	bool
+	# Needs __sync*() built-ins for 4-byte data, except on a few
+	# architectures for which a specific implementation is
+	# provided in ltp-testsuite
+	default y if BR2_TOOLCHAIN_HAS_SYNC_4
+	default y if BR2_arc
+	# does not build on nios2, cachectl.h issue
+	depends on !BR2_nios2
 
 config BR2_PACKAGE_LTP_TESTSUITE
 	bool "ltp-testsuite"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	# does not build, cachectl.h issue
-	depends on !BR2_nios2
 	help
 	  The Linux Test Project provides a huge testsuite for Linux.
 
-	  The LTP testsuite uses several functions that are considered
-	  obsolete, such as sigset() and others. Therefore, the LTP
-	  testsuite does not build with Buildroot's default uClibc
-	  configuration, and options such as DO_XSI_MATH,
-	  UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and UCLIBC_SV4_DEPRECATED
-	  are needed.
-
 	  http://linux-test-project.github.io
 
 comment "ltp-testsuite needs a glibc or uClibc toolchain w/ NPTL"
-	depends on !BR2_nios2
+	depends on BR2_PACKAGE_LTP_TESTSUITE_ARCH_SUPPORTS
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_TOOLCHAIN_USES_MUSL
diff --git a/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.hash b/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.hash
index b8311e09..d75d2043 100644
--- a/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.hash
+++ b/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.hash
@@ -1,2 +1,2 @@
-# From: https://github.com/linux-test-project/ltp/releases/download/20170116/ltp-full-20170116.tar.xz.sha1
-sha1 b42047fe0d30db9b2c760bd1ab901ecb133835fc  ltp-full-20170116.tar.xz
+# From: https://github.com/linux-test-project/ltp/releases/download/20180118/ltp-full-20180118.tar.xz.sha1
+sha1 2e643f1e29cd89efc8059729f60237a427fd409e  ltp-full-20180118.tar.xz
diff --git a/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.mk b/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.mk
index 29f374be..c47f5878 100644
--- a/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.mk
+++ b/bsp/buildroot/package/ltp-testsuite/ltp-testsuite.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LTP_TESTSUITE_VERSION = 20170116
+LTP_TESTSUITE_VERSION = 20180118
 LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz
 LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION)
-LTP_TESTSUITE_LICENSE = GPLv2, GPLv2+
+LTP_TESTSUITE_LICENSE = GPL-2.0, GPL-2.0+
 LTP_TESTSUITE_LICENSE_FILES = COPYING
 
 # Do not enable Open POSIX testsuite as it doesn't cross-compile
@@ -40,6 +40,13 @@ else
 LTP_TESTSUITE_CONF_ENV += ac_cv_lib_cap_cap_compare=no
 endif
 
+# No explicit enable/disable options
+ifeq ($(BR2_PACKAGE_NUMACTL),y)
+LTP_TESTSUITE_DEPENDENCIES += numactl
+else
+LTP_TESTSUITE_CONF_ENV += have_numa_headers=no
+endif
+
 # ltp-testsuite uses <fts.h>, which isn't compatible with largefile
 # support.
 LTP_TESTSUITE_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))
@@ -58,6 +65,9 @@ LTP_TESTSUITE_CONF_ENV += \
 	LIBS="$(LTP_TESTSUITE_LIBS)" \
 	SYSROOT="$(STAGING_DIR)"
 
+# Required by patch 0002-numa-Fix-numa-v2-detection-for-cross-compilation.patch
+LTP_TESTSUITE_AUTORECONF = YES
+
 # Requires uClibc fts and bessel support, normally not enabled
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 define LTP_TESTSUITE_REMOVE_UNSUPPORTED
@@ -68,5 +78,12 @@ endef
 LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED
 endif
 
+# ldd command build system tries to build a shared library unconditionally.
+ifeq ($(BR2_STATIC_LIBS),y)
+define LTP_TESTSUITE_REMOVE_LDD
+	rm -rf $(@D)/testcases/commands/ldd
+endef
+LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_LDD
+endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ltrace/Config.in b/bsp/buildroot/package/ltrace/Config.in
index 7af6be21..2defbe28 100644
--- a/bsp/buildroot/package/ltrace/Config.in
+++ b/bsp/buildroot/package/ltrace/Config.in
@@ -1,23 +1,30 @@
+config BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm
+	default y if BR2_i386
+	default y if BR2_mips
+	default y if BR2_mipsel
+	default y if BR2_powerpc
+	default y if BR2_sparc
+	default y if BR2_x86_64
+	default y if BR2_xtensa
+
 config BR2_PACKAGE_LTRACE
 	bool "ltrace"
-	# ltrace normally has mips/mipsel support, but it's currently
-	# broken (error: 'struct ltelf' has no member named
-	# 'relplt_count'). Issue reported upstream at
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756764.
-	depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \
-		|| BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa)
-	select BR2_PACKAGE_ELFUTILS
 	depends on BR2_USE_WCHAR # elfutils
 	depends on !BR2_STATIC_LIBS # elfutils
 	depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils
+	depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
+	select BR2_PACKAGE_ELFUTILS
 	help
-	  Debugging program which runs a specified command until it exits.
-	  While the command is executing, ltrace intercepts and records
-	  the dynamic library calls which are called by the executed
-	  process and the signals received by that process.
+	  Debugging program which runs a specified command until it
+	  exits. While the command is executing, ltrace intercepts and
+	  records the dynamic library calls which are called by the
+	  executed process and the signals received by that process.
 
 	  http://ltrace.org
 
 comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library"
+	depends on BR2_PACKAGE_LTRACE_ARCH_SUPPORTS
 	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \
 		|| !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC)
diff --git a/bsp/buildroot/package/ltrace/ltrace.hash b/bsp/buildroot/package/ltrace/ltrace.hash
new file mode 100644
index 00000000..58a9c6d2
--- /dev/null
+++ b/bsp/buildroot/package/ltrace/ltrace.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 894333bb7d347066c4e398d9f4a202af5f2faf80754905dd0e6a2259695baba0  ltrace-c22d359433b333937ee3d803450dc41998115685.tar.gz
diff --git a/bsp/buildroot/package/ltrace/ltrace.mk b/bsp/buildroot/package/ltrace/ltrace.mk
index eac42be3..6dfbb58c 100644
--- a/bsp/buildroot/package/ltrace/ltrace.mk
+++ b/bsp/buildroot/package/ltrace/ltrace.mk
@@ -8,7 +8,7 @@ LTRACE_VERSION = c22d359433b333937ee3d803450dc41998115685
 LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git
 LTRACE_DEPENDENCIES = elfutils
 LTRACE_CONF_OPTS = --disable-werror
-LTRACE_LICENSE = GPLv2
+LTRACE_LICENSE = GPL-2.0
 LTRACE_LICENSE_FILES = COPYING
 LTRACE_AUTORECONF = YES
 
diff --git a/bsp/buildroot/package/ltris/Config.in b/bsp/buildroot/package/ltris/Config.in
index bf73489d..7d9dc04a 100644
--- a/bsp/buildroot/package/ltris/Config.in
+++ b/bsp/buildroot/package/ltris/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_LTRIS
 	bool "LTris"
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_SDL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  LTris is a tetris clone, using SDL. It optionally requires
 	  SDL_mixer for audio support. A display with minimum 640x480
diff --git a/bsp/buildroot/package/ltris/ltris.mk b/bsp/buildroot/package/ltris/ltris.mk
index bbd270ea..fb0d4c34 100644
--- a/bsp/buildroot/package/ltris/ltris.mk
+++ b/bsp/buildroot/package/ltris/ltris.mk
@@ -6,10 +6,11 @@
 
 LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris
 LTRIS_VERSION = 1.0.19
-LTRIS_LICENSE = GPLv2+
+LTRIS_LICENSE = GPL-2.0+
 LTRIS_LICENSE_FILES = COPYING
 
-LTRIS_DEPENDENCIES = sdl
+LTRIS_DEPENDENCIES = sdl $(TARGET_NLS_DEPENDENCIES)
+LTRIS_LIBS = $(TARGET_NLS_LIBS)
 
 LTRIS_CONF_ENV = \
 	SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \
@@ -25,9 +26,4 @@ else
 LTRIS_CONF_OPTS += --disable-sound
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-LTRIS_DEPENDENCIES += gettext
-LTRIS_LIBS += -lintl
-endif
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lttng-babeltrace/Config.in b/bsp/buildroot/package/lttng-babeltrace/Config.in
index 09fab449..ba6b5543 100644
--- a/bsp/buildroot/package/lttng-babeltrace/Config.in
+++ b/bsp/buildroot/package/lttng-babeltrace/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_LTTNG_BABELTRACE
 	bool "lttng-babeltrace"
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on BR2_USE_MMU # libglib2
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_POPT
-	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
-	depends on BR2_USE_MMU # libglib2
 	help
 	  The Babeltrace project provides trace read and write
 	  libraries, as well as a trace converter application. Plugins
diff --git a/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash b/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash
index 8f296927..fafcd5e5 100644
--- a/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash
+++ b/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.hash
@@ -1,3 +1,3 @@
-# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.1.tar.bz2.{md5,sha1}
-md5 3f7d29ba2821a966d24759a928a15cdf  babeltrace-1.5.1.tar.bz2
-sha1 07bffefed8ef68317f26e043ae5f71be58fdb783  babeltrace-1.5.1.tar.bz2
+# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.2.tar.bz2.{md5,sha1}
+md5 1176e7f69e128112d5f29fefec39c6ce  babeltrace-1.5.2.tar.bz2
+sha1 3316e8311ebbc9e8642ed399208c1846a6f0e0c3  babeltrace-1.5.2.tar.bz2
diff --git a/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk b/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk
index abb3bba3..cfd67de6 100644
--- a/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk
+++ b/bsp/buildroot/package/lttng-babeltrace/lttng-babeltrace.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace
-LTTNG_BABELTRACE_VERSION = 1.5.1
+LTTNG_BABELTRACE_VERSION = 1.5.2
 LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
-LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code)
+LTTNG_BABELTRACE_LICENSE = MIT, LGPL-2.1 (include/babeltrace/list.h), GPL-2.0 (test code)
 LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf
 # The host-elfutils dependency is optional, but since we don't have
diff --git a/bsp/buildroot/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch b/bsp/buildroot/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch
new file mode 100644
index 00000000..ef817e44
--- /dev/null
+++ b/bsp/buildroot/package/lttng-libust/0001-configure.ac-add-disable-examples-option-to-not-buil.patch
@@ -0,0 +1,68 @@
+From 08aa9a26779d4ede3de7857fafd03bd6331ba948 Mon Sep 17 00:00:00 2001
+From: Philippe Proulx <eeppeliteloop@gmail.com>
+Date: Mon, 6 Nov 2017 15:46:03 -0500
+Subject: [PATCH] configure.ac: add --disable-examples option to not
+ build/install examples
+
+Some environments and distributions do not need the LTTng-UST examples
+to be built because they remove them anyway. Continue to build them by
+default, but add --disable-examples to explicitly disable them.
+
+Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
+[Philippe: backport from upstream commit 08aa9a26]
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+---
+ configure.ac    | 16 ++++++++++++++++
+ doc/Makefile.am |  6 +++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 10087f3f..68f41315 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,6 +423,19 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
+ AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"])
+ AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"])
+
++# Enable building examples
++AC_ARG_ENABLE(
++	examples,
++	AS_HELP_STRING(
++		[--disable-examples],
++		[Do not build and install examples]
++	),
++	[enable_examples=$enableval],
++	[enable_examples=yes]
++)
++
++AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"])
++
+ # Set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file
+ # is not distributed in tarballs.
+ AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no])
+@@ -596,6 +609,9 @@ PPRINT_PROP_BOOL([NUMA], $value)
+ AS_ECHO
+ PPRINT_SET_INDENT(0)
+
++test "x$enable_examples" = xyes && value=1 || value=0
++PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE)
++
+ # man pages build enabled/disabled
+ m4_pushdef([build_man_pages_msg], [Build and install man pages])
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index e110ed85..a67c8c22 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,3 +1,7 @@
+-SUBDIRS = . man examples
++SUBDIRS = . man
++
++if ENABLE_EXAMPLES
++SUBDIRS += examples
++endif
+
+ dist_doc_DATA = java-agent.txt
+--
+2.15.0
+
diff --git a/bsp/buildroot/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/bsp/buildroot/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
deleted file mode 100644
index 2e0c8b1d..00000000
--- a/bsp/buildroot/package/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001
-From: Philippe Proulx <eeppeliteloop@gmail.com>
-Date: Sat, 29 Oct 2016 13:32:57 -0400
-Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined
-
-On uClibc, NT_GNU_BUILD_ID is not defined, so we define it
-manually in this case.
-
-Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
-[Philippe: grabbed from this pull request:
-    https://github.com/lttng/lttng-ust/pull/39
-]
----
- liblttng-ust/lttng-ust-elf.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c
-index 5f27920..beaa7f3 100644
---- a/liblttng-ust/lttng-ust-elf.c
-+++ b/liblttng-ust/lttng-ust-elf.c
-@@ -29,6 +29,10 @@
-
- #define BUF_LEN	4096
-
-+#ifndef NT_GNU_BUILD_ID
-+# define NT_GNU_BUILD_ID	3
-+#endif
-+
- /*
-  * Retrieve the nth (where n is the `index` argument) phdr (program
-  * header) from the given elf instance.
---
-2.9.3
-
diff --git a/bsp/buildroot/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch b/bsp/buildroot/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
deleted file mode 100644
index 5172dbbf..00000000
--- a/bsp/buildroot/package/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Wed, 30 Nov 2016 16:52:51 +0000
-Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for
- CMake
-
-This prevents build failures when cross-compiling.
-
-If we don't define the compiler, it will use the one from the host
-machine. For instance "/usr/bin/c++", which is incorrect.
-
-The failure looks like this:
-
-.............................................................
-[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o
-/usr/bin/c++   -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC   -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp
-In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0,
-                 from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32,
-                 from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26:
-/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory
- #include <urcu/compiler.h>
-                           ^
-compilation terminated.
-.............................................................
-
-Pull request URL: https://github.com/lttng/lttng-ust/pull/41
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- doc/examples/Makefile.am | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
-index 424b844..5bc1f4c 100644
---- a/doc/examples/Makefile.am
-+++ b/doc/examples/Makefile.am
-@@ -152,7 +152,9 @@ all-local:
- 				cmake \
- 				-DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \
- 				-DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \
-+				-DCMAKE_C_COMPILER="$(CC)" \
- 				-DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \
-+				-DCMAKE_CXX_COMPILER="$(CXX)" \
- 				-DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \
- 				-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
- 				.. && \
--- 
-2.10.1
-
diff --git a/bsp/buildroot/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch b/bsp/buildroot/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
deleted file mode 100644
index 699f1e03..00000000
--- a/bsp/buildroot/package/lttng-libust/0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 42330adcefcd1830dad89e2a960c93d8dd1da125 Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Date: Tue, 21 Feb 2017 16:00:27 -0500
-Subject: [PATCH] Validate the presence of dlmopen at configure time
-
-Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
-Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-[Backport from upstream commit 42330adcefcd1830dad89e2a960c93d8dd1da125.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac                   | 8 ++++++++
- liblttng-ust-dl/lttng-ust-dl.c | 8 ++++++++
- liblttng-ust-dl/ust_dl.h       | 2 ++
- 3 files changed, 18 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 450b43b..023cfd4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -125,15 +125,23 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [
- # Checks for libraries.
- AC_CHECK_LIB([dl], [dlopen], [
- 	have_libdl=yes
-+	libdl_name=dl
- ], [
- 	#libdl not found, check for dlopen in libc.
- 	AC_CHECK_LIB([c], [dlopen], [
- 		have_libc_dl=yes
-+		libdl_name=c
- 	], [
- 		AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
- 	])
- ])
- 
-+# Check if libdl has dlmopen support.
-+AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
-+AC_CHECK_LIB([$libdl_name], [dlmopen],
-+	[AC_DEFINE([HAVE_DLMOPEN], [1])]
-+)
-+
- AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
- AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
- 
-diff --git a/liblttng-ust-dl/lttng-ust-dl.c b/liblttng-ust-dl/lttng-ust-dl.c
-index b0737b6..ce2ae0e 100644
---- a/liblttng-ust-dl/lttng-ust-dl.c
-+++ b/liblttng-ust-dl/lttng-ust-dl.c
-@@ -38,8 +38,10 @@
- #include "ust_dl.h"
- 
- static void *(*__lttng_ust_plibc_dlopen)(const char *filename, int flags);
-+#ifdef HAVE_DLMOPEN
- static void *(*__lttng_ust_plibc_dlmopen)(Lmid_t nsid, const char *filename,
- 		int flags);
-+#endif
- static int (*__lttng_ust_plibc_dlclose)(void *handle);
- 
- static
-@@ -55,6 +57,7 @@ void *_lttng_ust_dl_libc_dlopen(const char *filename, int flags)
- 	return __lttng_ust_plibc_dlopen(filename, flags);
- }
- 
-+#ifdef HAVE_DLMOPEN
- static
- void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
- 		int flags)
-@@ -68,6 +71,7 @@ void *_lttng_ust_dl_libc_dlmopen(Lmid_t nsid, const char *filename,
- 	}
- 	return __lttng_ust_plibc_dlmopen(nsid, filename, flags);
- }
-+#endif
- 
- static
- int _lttng_ust_dl_libc_dlclose(void *handle)
-@@ -143,6 +147,7 @@ end:
- 	return;
- }
- 
-+#ifdef HAVE_DLMOPEN
- static
- void lttng_ust_dl_dlmopen(void *so_base, Lmid_t nsid, const char *so_name,
- 		int flags, void *ip)
-@@ -203,6 +208,7 @@ end:
- 	lttng_ust_elf_destroy(elf);
- 	return;
- }
-+#endif
- 
- void *dlopen(const char *filename, int flags)
- {
-@@ -223,6 +229,7 @@ void *dlopen(const char *filename, int flags)
- 	return handle;
- }
- 
-+#ifdef HAVE_DLMOPEN
- void *dlmopen(Lmid_t nsid, const char *filename, int flags)
- {
- 	void *handle;
-@@ -243,6 +250,7 @@ void *dlmopen(Lmid_t nsid, const char *filename, int flags)
- 	return handle;
- 
- }
-+#endif
- 
- int dlclose(void *handle)
- {
-diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
-index b8cfe82..afa8e84 100644
---- a/liblttng-ust-dl/ust_dl.h
-+++ b/liblttng-ust-dl/ust_dl.h
-@@ -51,6 +51,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlopen,
- 	)
- )
- 
-+#ifdef HAVE_DLMOPEN
- TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
- 	TP_ARGS(void *, ip, void *, baddr, Lmid_t, nsid,
- 		const char *, path, int, flags,
-@@ -66,6 +67,7 @@ TRACEPOINT_EVENT(lttng_ust_dl, dlmopen,
- 		ctf_integer(uint8_t, has_debug_link, has_debug_link)
- 	)
- )
-+#endif
- 
- TRACEPOINT_EVENT(lttng_ust_dl, build_id,
- 	TP_ARGS(
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch b/bsp/buildroot/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch
deleted file mode 100644
index 734d3c4c..00000000
--- a/bsp/buildroot/package/lttng-libust/0004-Fix-include-config.h-to-resolve-HAVE_DLMOPEN.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0b2253f5c9af73904d49da32085036c16b9d2d75 Mon Sep 17 00:00:00 2001
-From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Date: Tue, 21 Feb 2017 18:10:11 -0500
-Subject: [PATCH] Fix: include config.h to resolve HAVE_DLMOPEN
-
-Fixes commit 42330adcefcd1830dad89e2a960c93d8dd1da125
-
-Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-[Backported from upstream commit 0b2253f5c9af73904d49da32085036c16b9d2d75.]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- liblttng-ust-dl/ust_dl.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/liblttng-ust-dl/ust_dl.h b/liblttng-ust-dl/ust_dl.h
-index afa8e84..c8a0695 100644
---- a/liblttng-ust-dl/ust_dl.h
-+++ b/liblttng-ust-dl/ust_dl.h
-@@ -33,6 +33,7 @@ extern "C" {
- 
- #include <stdint.h>
- #include <unistd.h>
-+#include <config.h>
- 
- #define LTTNG_UST_DL_PROVIDER
- #include <lttng/tracepoint.h>
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/lttng-libust/Config.in b/bsp/buildroot/package/lttng-libust/Config.in
index 4aba1888..8472cab7 100644
--- a/bsp/buildroot/package/lttng-libust/Config.in
+++ b/bsp/buildroot/package/lttng-libust/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_LTTNG_LIBUST
 	bool "lttng-libust"
-	select BR2_PACKAGE_LIBURCU
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	depends on BR2_USE_WCHAR # uses wchar_t
 	# liburcu only works on some architectures and requires threads support"
 	depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBURCU
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
 	help
 	  Userspace tracing library for the LTTng 2.x tracing
 	  infrastructure. It allows userspace programs to create
diff --git a/bsp/buildroot/package/lttng-libust/lttng-libust.hash b/bsp/buildroot/package/lttng-libust/lttng-libust.hash
index e080361a..6e5fdf23 100644
--- a/bsp/buildroot/package/lttng-libust/lttng-libust.hash
+++ b/bsp/buildroot/package/lttng-libust/lttng-libust.hash
@@ -1,3 +1,3 @@
-# From http://lttng.org/files/lttng-ust/lttng-ust-2.9.0.tar.bz2.{md5,sha1}
-md5 77f3378ba37a36801420bce87b702e9c  lttng-ust-2.9.0.tar.bz2
-sha1 9937eae64540821b8597cce081e92be76e6b5568  lttng-ust-2.9.0.tar.bz2
+# From http://lttng.org/files/lttng-ust/lttng-ust-2.10.1.tar.bz2.{md5,sha1}
+md5 4863cc2f9f0a070b42438bb646bbba06  lttng-ust-2.10.1.tar.bz2
+sha1 3779c9ed75e3fa532797431f2c47979ce73614a7  lttng-ust-2.10.1.tar.bz2
diff --git a/bsp/buildroot/package/lttng-libust/lttng-libust.mk b/bsp/buildroot/package/lttng-libust/lttng-libust.mk
index f8c4c118..d645220b 100644
--- a/bsp/buildroot/package/lttng-libust/lttng-libust.mk
+++ b/bsp/buildroot/package/lttng-libust/lttng-libust.mk
@@ -5,15 +5,14 @@
 ################################################################################
 
 LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust
-LTTNG_LIBUST_VERSION = 2.9.0
+LTTNG_LIBUST_VERSION = 2.10.1
 LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2
-LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
+LTTNG_LIBUST_LICENSE = LGPL-2.1, MIT (system headers), GPL-2.0 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond)
 LTTNG_LIBUST_LICENSE_FILES = COPYING
 LTTNG_LIBUST_INSTALL_STAGING = YES
 LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux
-LTTNG_LIBUST_CONF_OPTS += --disable-man-pages
-# 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch
-# 0003-Validate-the-presence-of-dlmopen-at-configure-time.patch
+LTTNG_LIBUST_CONF_OPTS += --disable-man-pages --disable-examples
+# 0001-configure.ac-add-disable-examples-option-to-not-buil.patch
 LTTNG_LIBUST_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
diff --git a/bsp/buildroot/package/lttng-modules/lttng-modules.hash b/bsp/buildroot/package/lttng-modules/lttng-modules.hash
index d8314f6e..8992cbce 100644
--- a/bsp/buildroot/package/lttng-modules/lttng-modules.hash
+++ b/bsp/buildroot/package/lttng-modules/lttng-modules.hash
@@ -1,3 +1,3 @@
-# From http://lttng.org/files/lttng-modules/lttng-modules-2.9.0.tar.bz2.{md5,sha1}
-md5 717df375ccb6f32bb297cc2f2e692bbf  lttng-modules-2.9.0.tar.bz2
-sha1 819ee1c2a5a821b7fdc1c2fc102ef3079c32aad7  lttng-modules-2.9.0.tar.bz2
+# From http://lttng.org/files/lttng-modules/lttng-modules-2.10.6.tar.bz2.{md5,sha1}
+md5 8110099f4615fc89a74ffe9189b56cfc  lttng-modules-2.10.6.tar.bz2
+sha1 1126b29e055ebdb3fad9201edaf0ef27f88c9369  lttng-modules-2.10.6.tar.bz2
diff --git a/bsp/buildroot/package/lttng-modules/lttng-modules.mk b/bsp/buildroot/package/lttng-modules/lttng-modules.mk
index aa0ac30b..8d48c37b 100644
--- a/bsp/buildroot/package/lttng-modules/lttng-modules.mk
+++ b/bsp/buildroot/package/lttng-modules/lttng-modules.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.9.0
+LTTNG_MODULES_VERSION = 2.10.6
 LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules
 LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
-LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
+LTTNG_MODULES_LICENSE = LGPL-2.1/GPL-2.0 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*)
 LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE
 LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m
 
diff --git a/bsp/buildroot/package/lttng-tools/Config.in b/bsp/buildroot/package/lttng-tools/Config.in
index 187e424b..9c86cc26 100644
--- a/bsp/buildroot/package/lttng-tools/Config.in
+++ b/bsp/buildroot/package/lttng-tools/Config.in
@@ -17,7 +17,7 @@ config BR2_PACKAGE_LTTNG_TOOLS
 	  and stop tracing sessions. Analysis of the trace can be done
 	  on the host machine using the babeltrace utility. This
 	  utility is automatically built by Buildroot in
-	  $(O)/host/usr/bin/babeltrace, as a dependency of
+	  $(O)/host/bin/babeltrace, as a dependency of
 	  lttng-tools. However, there is also a lttng-babeltrace
 	  package for the target, if babeltrace on the target is
 	  interesting.
diff --git a/bsp/buildroot/package/lttng-tools/lttng-tools.hash b/bsp/buildroot/package/lttng-tools/lttng-tools.hash
index 4f3d2837..f6c01b7d 100644
--- a/bsp/buildroot/package/lttng-tools/lttng-tools.hash
+++ b/bsp/buildroot/package/lttng-tools/lttng-tools.hash
@@ -1,3 +1,8 @@
-# From http://lttng.org/files/lttng-tools/lttng-tools-2.9.3.tar.bz2.{md5,sha1}
-md5 19fdcc5e9c307ef66581a2743a08a541  lttng-tools-2.9.3.tar.bz2
-sha1 78fdc9b7fd15f33ac60ea08320d679ce66e18bf7  lttng-tools-2.9.3.tar.bz2
+# From https://lttng.org/files/lttng-tools/lttng-tools-2.10.5.tar.bz2.{md5,sha1}
+md5 50e07676d5eb5d6cf4ece804863a6f74  lttng-tools-2.10.5.tar.bz2
+sha1 68790d44529a3b29896c35bb2350e8a0e1226264  lttng-tools-2.10.5.tar.bz2
+# Locally computed
+sha256 a4868078ef961e83dc236c4f24fd848161bfa755344b064dece62c4c81a07411  lttng-tools-2.10.5.tar.bz2
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  gpl-2.0.txt
+sha256 051be1f11b508ef7bb839994f6b58be19a827c56bd9bddfe36d77d3d4be55abe  lgpl-2.1.txt
+sha256 f07515677547da5f3ee2396bdf491affc1accd5e4765a5378b6e1e98392fd5e7  LICENSE
diff --git a/bsp/buildroot/package/lttng-tools/lttng-tools.mk b/bsp/buildroot/package/lttng-tools/lttng-tools.mk
index 2df2dffa..ce07ce4b 100644
--- a/bsp/buildroot/package/lttng-tools/lttng-tools.mk
+++ b/bsp/buildroot/package/lttng-tools/lttng-tools.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-LTTNG_TOOLS_VERSION = 2.9.3
-LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools
+LTTNG_TOOLS_VERSION = 2.10.5
+LTTNG_TOOLS_SITE = https://lttng.org/files/lttng-tools
 LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2
-LTTNG_TOOLS_LICENSE = GPLv2+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
+LTTNG_TOOLS_INSTALL_STAGING = YES
+LTTNG_TOOLS_LICENSE = GPL-2.0+, LGPL-2.1+ (include/lttng/*, src/lib/lttng-ctl/*)
 LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE
 LTTNG_TOOLS_CONF_OPTS += --disable-man-pages
-
 LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux
 
 ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y)
diff --git a/bsp/buildroot/package/lua-basexx/Config.in b/bsp/buildroot/package/lua-basexx/Config.in
new file mode 100644
index 00000000..2f3bb1de
--- /dev/null
+++ b/bsp/buildroot/package/lua-basexx/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LUA_BASEXX
+	bool "lua-basexx"
+	help
+	  A Lua library which provides base2(bitfield), base16(hex),
+	  base32(crockford/rfc), base64(rfc/url), base85(z85) decoding
+	  and encoding.
+
+	  https://github.com/aiq/basexx
diff --git a/bsp/buildroot/package/lua-basexx/lua-basexx.hash b/bsp/buildroot/package/lua-basexx/lua-basexx.hash
new file mode 100644
index 00000000..91c428c1
--- /dev/null
+++ b/bsp/buildroot/package/lua-basexx/lua-basexx.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 ff5379b1f5b396103b8bb589ab3dd94d0a727c8e7a48dcfe1c73e2f07af6a8df  basexx-0.4.0-1.src.rock
diff --git a/bsp/buildroot/package/lua-basexx/lua-basexx.mk b/bsp/buildroot/package/lua-basexx/lua-basexx.mk
new file mode 100644
index 00000000..bfdc1e27
--- /dev/null
+++ b/bsp/buildroot/package/lua-basexx/lua-basexx.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-basexx
+#
+################################################################################
+
+LUA_BASEXX_VERSION_UPSTREAM =0.4.0
+LUA_BASEXX_VERSION = $(LUA_BASEXX_VERSION_UPSTREAM)-1
+LUA_BASEXX_NAME_UPSTREAM = basexx
+LUA_BASEXX_SUBDIR = basexx-$(LUA_BASEXX_VERSION_UPSTREAM)
+LUA_BASEXX_LICENSE = MIT
+LUA_BASEXX_LICENSE_FILES = $(LUA_BASEXX_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-bit32/Config.in b/bsp/buildroot/package/lua-bit32/Config.in
new file mode 100644
index 00000000..f896940d
--- /dev/null
+++ b/bsp/buildroot/package/lua-bit32/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LUA_BIT32
+	bool "lua-bit32"
+	help
+	  bit32 is the native Lua 5.2 bit manipulation library, in the
+	  version from Lua 5.3; it is compatible with Lua 5.1, 5.2 and
+	  5.3.
+
+	  http://www.lua.org/manual/5.2/manual.html#6.7
diff --git a/bsp/buildroot/package/lua-bit32/lua-bit32.hash b/bsp/buildroot/package/lua-bit32/lua-bit32.hash
new file mode 100644
index 00000000..21dbd053
--- /dev/null
+++ b/bsp/buildroot/package/lua-bit32/lua-bit32.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  fe7bc70d1e48183d95ccfb6741e70a676283075173122cb161303d77059b27a6  bit32-5.3.0-1.src.rock
diff --git a/bsp/buildroot/package/lua-bit32/lua-bit32.mk b/bsp/buildroot/package/lua-bit32/lua-bit32.mk
new file mode 100644
index 00000000..14851a51
--- /dev/null
+++ b/bsp/buildroot/package/lua-bit32/lua-bit32.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-bit32
+#
+################################################################################
+
+LUA_BIT32_VERSION = 5.3.0-1
+LUA_BIT32_NAME_UPSTREAM = bit32
+LUA_BIT32_SUBDIR = lua-compat-5.2
+LUA_BIT32_LICENSE = MIT
+LUA_BIT32_LICENSE_FILES = $(LUA_BIT32_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-cjson/Config.in b/bsp/buildroot/package/lua-cjson/Config.in
index 1f4c7c79..262452a8 100644
--- a/bsp/buildroot/package/lua-cjson/Config.in
+++ b/bsp/buildroot/package/lua-cjson/Config.in
@@ -2,9 +2,11 @@ config BR2_PACKAGE_LUA_CJSON
 	bool "lua-cjson"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  The Lua CJSON module provides JSON support for Lua. It features:
+	  The Lua CJSON module provides JSON support for Lua.
+	  It features:
 	  - Fast, standards compliant encoding/parsing routines
-	  - Full support for JSON with UTF-8, including decoding surrogate pairs
+	  - Full support for JSON with UTF-8, including decoding
+	    surrogate pairs
 	  - Optional run-time support for common exceptions to the JSON
 	    specification (infinity, NaN, ...)
 	  - No dependencies on other libraries
diff --git a/bsp/buildroot/package/lua-cjson/lua-cjson.mk b/bsp/buildroot/package/lua-cjson/lua-cjson.mk
index 16cb9741..1823aa50 100644
--- a/bsp/buildroot/package/lua-cjson/lua-cjson.mk
+++ b/bsp/buildroot/package/lua-cjson/lua-cjson.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LUA_CJSON_VERSION_UPSTREAM = 2.1.0
-LUA_CJSON_VERSION = $(LUA_CJSON_VERSION_UPSTREAM)-1
+LUA_CJSON_VERSION = 2.1.0-1
 LUA_CJSON_LICENSE = MIT
-LUA_CJSON_LICENSE_FILES = lua-cjson-$(LUA_CJSON_VERSION_UPSTREAM)/LICENSE
+LUA_CJSON_LICENSE_FILES = $(LUA_CJSON_SUBDIR)/LICENSE
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-coat/lua-coat.hash b/bsp/buildroot/package/lua-coat/lua-coat.hash
index ad15a38b..1f213556 100644
--- a/bsp/buildroot/package/lua-coat/lua-coat.hash
+++ b/bsp/buildroot/package/lua-coat/lua-coat.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	38a8342f6b3883a81931feaa9ef90a6343445289f3d65a296f0924818587c7d4  lua-coat-0.9.1-1.src.rock
+sha256	24d0e894d743f46c09a282e4dd272d2a6004557608b618c1c9d9f464dd65af02  lua-coat-0.9.2-1.src.rock
diff --git a/bsp/buildroot/package/lua-coat/lua-coat.mk b/bsp/buildroot/package/lua-coat/lua-coat.mk
index 205995ed..6555e66c 100644
--- a/bsp/buildroot/package/lua-coat/lua-coat.mk
+++ b/bsp/buildroot/package/lua-coat/lua-coat.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LUA_COAT_VERSION_UPSTREAM = 0.9.1
-LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1
-LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM)
+LUA_COAT_VERSION = 0.9.2-1
+LUA_COAT_NAME_UPSTREAM = lua-Coat
 LUA_COAT_LICENSE = MIT
 LUA_COAT_LICENSE_FILES = $(LUA_COAT_SUBDIR)/COPYRIGHT
 
diff --git a/bsp/buildroot/package/lua-coatpersistent/Config.in b/bsp/buildroot/package/lua-coatpersistent/Config.in
index a0f5bdc0..d8b3570c 100644
--- a/bsp/buildroot/package/lua-coatpersistent/Config.in
+++ b/bsp/buildroot/package/lua-coatpersistent/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LUA_COATPERSISTENT
 	bool "lua-coatpersistent"
+	depends on BR2_PACKAGE_LSQLITE3 || BR2_PACKAGE_LUASQL_SQLITE3
 	# run-time dependencies
 	select BR2_PACKAGE_DADO
 	select BR2_PACKAGE_LUA_COAT
-	depends on BR2_PACKAGE_LSQLITE3 || BR2_PACKAGE_LUASQL_SQLITE3
 	help
 	  An ORM for lua-Coat.
 
diff --git a/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash b/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
index ddd3c9bb..eeb13bb1 100644
--- a/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
+++ b/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	46f5a1988a47b988d729df2937589756d989df7c26dac6aaf2a331a7b15bf7cf  lua-coatpersistent-lsqlite3-0.2.1-1.src.rock
-sha256	8053428fa7a6229d70ae161ec55a24b28c210078ac494161d48b6bf74ed000ca  lua-coatpersistent-luasql-0.2.1-1.src.rock
+sha256	e718ee36a17312108f266e8412f840db150afd89e8587d36e685673fff65f142  lua-coatpersistent-lsqlite3-0.2.2-1.src.rock
+sha256	5d36d6a8b413a2d56a466a45314291a0265c514a179e741b3fc95f4dd901abe6  lua-coatpersistent-luasql-0.2.2-1.src.rock
diff --git a/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.mk b/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.mk
index be8a4da4..68c60838 100644
--- a/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.mk
+++ b/bsp/buildroot/package/lua-coatpersistent/lua-coatpersistent.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.1
+LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.2
 ifeq ($(BR2_PACKAGE_LSQLITE3),y)
 LUA_COATPERSISTENT_VERSION = lsqlite3-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1
 else
diff --git a/bsp/buildroot/package/lua-compat53/Config.in b/bsp/buildroot/package/lua-compat53/Config.in
new file mode 100644
index 00000000..7ab3d740
--- /dev/null
+++ b/bsp/buildroot/package/lua-compat53/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LUA_COMPAT53
+	bool "lua-compat53"
+	depends on !BR2_PACKAGE_LUA_5_3
+	help
+	  Compatibility module providing Lua-5.3-style APIs for Lua 5.2
+	  and 5.1
+
+	  https://github.com/keplerproject/lua-compat-5.3
diff --git a/bsp/buildroot/package/lua-compat53/lua-compat53.hash b/bsp/buildroot/package/lua-compat53/lua-compat53.hash
new file mode 100644
index 00000000..7f1e1bb2
--- /dev/null
+++ b/bsp/buildroot/package/lua-compat53/lua-compat53.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 fd0117156f59d1cb3824d5cca63be84c72cb5519b714377545433be3bb31afdf  compat53-0.5-1.src.rock
diff --git a/bsp/buildroot/package/lua-compat53/lua-compat53.mk b/bsp/buildroot/package/lua-compat53/lua-compat53.mk
new file mode 100644
index 00000000..969f8163
--- /dev/null
+++ b/bsp/buildroot/package/lua-compat53/lua-compat53.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-compat53
+#
+################################################################################
+
+LUA_COMPAT53_VERSION_UPSTREAM = 0.5
+LUA_COMPAT53_VERSION = $(LUA_COMPAT53_VERSION_UPSTREAM)-1
+LUA_COMPAT53_NAME_UPSTREAM = compat53
+LUA_COMPAT53_SUBDIR = lua-compat-5.3-$(LUA_COMPAT53_VERSION_UPSTREAM)
+LUA_COMPAT53_LICENSE = MIT
+LUA_COMPAT53_LICENSE_FILES = $(LUA_COMPAT53_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-cqueues/Config.in b/bsp/buildroot/package/lua-cqueues/Config.in
new file mode 100644
index 00000000..60f02284
--- /dev/null
+++ b/bsp/buildroot/package/lua-cqueues/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LUA_CQUEUES
+	bool "lua-cqueues"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_OPENSSL
+	help
+	  Continuation Queues: Embeddable asynchronous networking,
+	  threading, and notification framework for Lua on Unix.
+
+	  http://25thandclement.com/~william/projects/cqueues.html
+
+comment "lua-cqueues needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/lua-cqueues/lua-cqueues.hash b/bsp/buildroot/package/lua-cqueues/lua-cqueues.hash
new file mode 100644
index 00000000..9fd664d6
--- /dev/null
+++ b/bsp/buildroot/package/lua-cqueues/lua-cqueues.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 ae51b713bdf966215b87244e03ac60b5a12beb82d15dfb02755a000cfb2df905  lua-cqueues-rel-20161215.tar.gz
diff --git a/bsp/buildroot/package/lua-cqueues/lua-cqueues.mk b/bsp/buildroot/package/lua-cqueues/lua-cqueues.mk
new file mode 100644
index 00000000..4f4be1e0
--- /dev/null
+++ b/bsp/buildroot/package/lua-cqueues/lua-cqueues.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# lua-cqueues
+#
+################################################################################
+
+LUA_CQUEUES_VERSION = rel-20161215
+LUA_CQUEUES_SITE = $(call github,wahern,cqueues,$(LUA_CQUEUES_VERSION))
+LUA_CQUEUES_LICENSE = MIT
+LUA_CQUEUES_LICENSE_FILES = LICENSE
+LUA_CQUEUES_DEPENDENCIES = luainterpreter openssl
+
+define LUA_CQUEUES_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		prefix="$(STAGING_DIR)/usr" all$(LUAINTERPRETER_ABIVER)
+endef
+
+define LUA_CQUEUES_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" prefix=/usr install$(LUAINTERPRETER_ABIVER)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/lua-csnappy/Config.in b/bsp/buildroot/package/lua-csnappy/Config.in
index 0562277a..54d68a2e 100644
--- a/bsp/buildroot/package/lua-csnappy/Config.in
+++ b/bsp/buildroot/package/lua-csnappy/Config.in
@@ -5,4 +5,3 @@ config BR2_PACKAGE_LUA_CSNAPPY
 	  which implements the Google's Snappy (de)compressor.
 
 	  http://fperrad.github.io/lua-csnappy/
-
diff --git a/bsp/buildroot/package/lua-csnappy/lua-csnappy.hash b/bsp/buildroot/package/lua-csnappy/lua-csnappy.hash
index 13636349..f8874264 100644
--- a/bsp/buildroot/package/lua-csnappy/lua-csnappy.hash
+++ b/bsp/buildroot/package/lua-csnappy/lua-csnappy.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	855331feb8e09a32eea8366ab9bcd4386db6392de82383f08ae5e59adbb7d8a6  lua-csnappy-0.1.4-1.src.rock
+sha256	4fc373ba714cb8b428e9971f1725d82de6a43dfea361a0b7894e4762238dc95c  lua-csnappy-0.1.5-1.src.rock
diff --git a/bsp/buildroot/package/lua-csnappy/lua-csnappy.mk b/bsp/buildroot/package/lua-csnappy/lua-csnappy.mk
index 07392591..cba0a060 100644
--- a/bsp/buildroot/package/lua-csnappy/lua-csnappy.mk
+++ b/bsp/buildroot/package/lua-csnappy/lua-csnappy.mk
@@ -4,10 +4,8 @@
 #
 ################################################################################
 
-LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.4
-LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1
-LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM)
-LUA_CSNAPPY_LICENSE = BSD-3c
+LUA_CSNAPPY_VERSION = 0.1.5-1
+LUA_CSNAPPY_LICENSE = BSD-3-Clause
 LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-curl/Config.in b/bsp/buildroot/package/lua-curl/Config.in
new file mode 100644
index 00000000..88cdaf10
--- /dev/null
+++ b/bsp/buildroot/package/lua-curl/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_CURL
+	bool "lua-curl"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Lua binding to libcurl.
+
+	  https://lua-curl.github.io/
diff --git a/bsp/buildroot/package/lua-curl/lua-curl.hash b/bsp/buildroot/package/lua-curl/lua-curl.hash
new file mode 100644
index 00000000..e73810ce
--- /dev/null
+++ b/bsp/buildroot/package/lua-curl/lua-curl.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4cc6389bf5d4a868cc1e6017733b9b6306f2fc8b5083aa928d66399195697f34  lua-curl-0.3.7-1.src.rock
diff --git a/bsp/buildroot/package/lua-curl/lua-curl.mk b/bsp/buildroot/package/lua-curl/lua-curl.mk
new file mode 100644
index 00000000..9e4f262c
--- /dev/null
+++ b/bsp/buildroot/package/lua-curl/lua-curl.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-curl
+#
+################################################################################
+
+LUA_CURL_VERSION_UPSTREAM = 0.3.7
+LUA_CURL_VERSION = $(LUA_CURL_VERSION_UPSTREAM)-1
+LUA_CURL_SUBDIR = Lua-cURLv3-$(LUA_CURL_VERSION_UPSTREAM)
+LUA_CURL_LICENSE = MIT
+LUA_CURL_LICENSE_FILES = $(LUA_CURL_SUBDIR)/LICENSE
+LUA_CURL_DEPENDENCIES = libcurl
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-datafile/Config.in b/bsp/buildroot/package/lua-datafile/Config.in
new file mode 100644
index 00000000..e65406ed
--- /dev/null
+++ b/bsp/buildroot/package/lua-datafile/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_DATAFILE
+	bool "lua-datafile"
+	help
+	  datafile is a library for avoiding hardcoded paths
+	  when loading resource files in Lua modules.
+
+	  https://github.com/hishamhm/datafile
diff --git a/bsp/buildroot/package/lua-datafile/lua-datafile.hash b/bsp/buildroot/package/lua-datafile/lua-datafile.hash
new file mode 100644
index 00000000..83c346ea
--- /dev/null
+++ b/bsp/buildroot/package/lua-datafile/lua-datafile.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 37a33079c3476477f19de14bebd664635a39a57dd05a2709c3a402cbc1e79a6b  datafile-0.4-1.src.rock
diff --git a/bsp/buildroot/package/lua-datafile/lua-datafile.mk b/bsp/buildroot/package/lua-datafile/lua-datafile.mk
new file mode 100644
index 00000000..75aef529
--- /dev/null
+++ b/bsp/buildroot/package/lua-datafile/lua-datafile.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-datafile
+#
+################################################################################
+
+LUA_DATAFILE_VERSION = 0.4-1
+LUA_DATAFILE_NAME_UPSTREAM = datafile
+LUA_DATAFILE_SUBDIR = datafile
+LUA_DATAFILE_LICENSE = MIT
+LUA_DATAFILE_LICENSE_FILES = $(LUA_DATAFILE_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-ev/Config.in b/bsp/buildroot/package/lua-ev/Config.in
index 4b3f8ed1..0cb4c22a 100644
--- a/bsp/buildroot/package/lua-ev/Config.in
+++ b/bsp/buildroot/package/lua-ev/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LUA_EV
 	bool "lua-ev"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	select BR2_PACKAGE_LIBEV
 	depends on !BR2_bfin # libev
+	select BR2_PACKAGE_LIBEV
 	help
 	  Get access to the libev library from Lua.
 
diff --git a/bsp/buildroot/package/lua-ev/lua-ev.hash b/bsp/buildroot/package/lua-ev/lua-ev.hash
index 522e7e7e..3f8d9812 100644
--- a/bsp/buildroot/package/lua-ev/lua-ev.hash
+++ b/bsp/buildroot/package/lua-ev/lua-ev.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 f7f5df5ecfe4bd54797261d1b1bd3f770d39128b7aba72deef6d1d8d8e2b53fe  lua-ev-v1.4.tar.gz
+sha256 4e26e05830955fdd882a1b48b535be94356582eea310327f839f830cd9250d3a  lua-ev-339426fbe528f11cb3cd1af69a88f06bba367981.tar.gz
diff --git a/bsp/buildroot/package/lua-ev/lua-ev.mk b/bsp/buildroot/package/lua-ev/lua-ev.mk
index 68f7fc75..39394875 100644
--- a/bsp/buildroot/package/lua-ev/lua-ev.mk
+++ b/bsp/buildroot/package/lua-ev/lua-ev.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUA_EV_VERSION = v1.4
+LUA_EV_VERSION = 339426fbe528f11cb3cd1af69a88f06bba367981
 LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION))
 LUA_EV_DEPENDENCIES = luainterpreter libev
 LUA_EV_LICENSE = MIT
diff --git a/bsp/buildroot/package/lua-fifo/Config.in b/bsp/buildroot/package/lua-fifo/Config.in
new file mode 100644
index 00000000..5715b6bd
--- /dev/null
+++ b/bsp/buildroot/package/lua-fifo/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LUA_FIFO
+	bool "lua-fifo"
+	help
+	  A lua library/'class' that implements a FIFO.
+
+	  https://github.com/daurnimator/fifo.lua
diff --git a/bsp/buildroot/package/lua-fifo/lua-fifo.hash b/bsp/buildroot/package/lua-fifo/lua-fifo.hash
new file mode 100644
index 00000000..bab37280
--- /dev/null
+++ b/bsp/buildroot/package/lua-fifo/lua-fifo.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 53dea24ad658614a0254dcb10296a1a0fc5357315ada5724d6362f54c32b4c20  fifo-0.2-0.src.rock
diff --git a/bsp/buildroot/package/lua-fifo/lua-fifo.mk b/bsp/buildroot/package/lua-fifo/lua-fifo.mk
new file mode 100644
index 00000000..875b8957
--- /dev/null
+++ b/bsp/buildroot/package/lua-fifo/lua-fifo.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-fifo
+#
+################################################################################
+
+LUA_FIFO_VERSION_UPSTREAM =0.2
+LUA_FIFO_VERSION =$(LUA_FIFO_VERSION_UPSTREAM)-0
+LUA_FIFO_NAME_UPSTREAM = fifo
+LUA_FIFO_SUBDIR = fifo.lua-$(LUA_FIFO_VERSION_UPSTREAM)
+LUA_FIFO_LICENSE = MIT
+LUA_FIFO_LICENSE_FILES = $(LUA_FIFO_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-flu/0001-use-system-xattr-h.patch b/bsp/buildroot/package/lua-flu/0001-use-system-xattr-h.patch
new file mode 100644
index 00000000..1cd44b46
--- /dev/null
+++ b/bsp/buildroot/package/lua-flu/0001-use-system-xattr-h.patch
@@ -0,0 +1,169 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+ENOATTR was in fact defined as ENODATA, so switch to using that instead.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Upstream status: merged:
+    https://bitbucket.org/doub/flu/pull-requests/1
+    https://bitbucket.org/doub/flu/commits/2d75cc2be79026b94188b11c6f53b219c24a5f70
+
+
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
+@@ -327,7 +327,7 @@
+ 				name = "fs.getxattr";
+ 				parameters = {"path", "name"};
+ 				results = {"value"};
+-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
++				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
+ 			},
+ 			{
+ 				name = "fs.listxattr";
+@@ -338,7 +338,7 @@
+ 			{
+ 				name = "fs.removexattr";
+ 				parameters = {"path", "name"};
+-				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
++				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
+ 			},
+ 			{
+ 				name = "fs.opendir";
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua	2018-05-06 09:22:28.495324054 +0200
+@@ -222,8 +222,8 @@
+ -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs
+ 
+ function luafs.getxattr(path, name)
+-	local attrs = assert(xattrs[path], errno.ENOATTR)
+-	return assert(attrs[name], errno.ENOATTR)
++	local attrs = assert(xattrs[path], errno.ENODATA)
++	return assert(attrs[name], errno.ENODATA)
+ end
+ 
+ function luafs.setxattr(path, name, value, flags)
+@@ -236,7 +236,7 @@
+ end
+ 
+ function luafs.removexattr(path, name)
+-	local attrs = assert(xattrs[path], errno.ENOATTR)
++	local attrs = assert(xattrs[path], errno.ENODATA)
+ 	attrs[name] = nil
+ 	if next(attrs)==nil then
+ 		xattrs[path] = nil
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html	2018-05-06 09:22:28.499324049 +0200
+@@ -347,7 +347,7 @@
+ 		<div class="function">
+ 		<h3><a name="fs.getxattr"><code>value = fs.getxattr (path, name)</code></a></h3>
+ 
+-<p>Get an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
++<p>Get an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
+ 		</div>
+ 
+ 		<div class="function">
+@@ -359,7 +359,7 @@
+ 		<div class="function">
+ 		<h3><a name="fs.removexattr"><code>fs.removexattr (path, name)</code></a></h3>
+ 
+-<p>Remove an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
++<p>Remove an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
+ 		</div>
+ 
+ 		<div class="function">
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c	2018-05-06 09:23:06.323282527 +0200
+@@ -3,7 +3,7 @@
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <stdlib.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "compat.h"
+ 
+ /****************************************************************************/
+@@ -103,7 +103,7 @@
+ 	REGISTER_ERROR(EDOM)
+ 	REGISTER_ERROR(ERANGE)
+ 	REGISTER_ERROR(ENOSYS)
+-	REGISTER_ERROR(ENOATTR)
++	REGISTER_ERROR(ENODATA)
+ 	#undef REGISTER_ERROR
+ }
+ 
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:22:04.123351349 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c	2018-05-06 09:23:06.323282527 +0200
+@@ -15,7 +15,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <fuse.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <lua.h>
+ #include <lauxlib.h>
+ 
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md	2018-05-06 09:22:28.495324054 +0200
+@@ -345,7 +345,7 @@
+ 
+ ### `value = fs.getxattr (path, name)`
+ 
+-Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
++Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
+ 
+ ---
+ 
+@@ -357,7 +357,7 @@
+ 
+ ### `fs.removexattr (path, name)`
+ 
+-Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
++Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
+ 
+ ---
+ 
+diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec
+--- lua-flu-20150331-1.orig/flu-20150331-1.rockspec	2015-04-02 23:44:11.000000000 +0200
++++ lua-flu-20150331-1/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
diff --git a/bsp/buildroot/package/lua-flu/Config.in b/bsp/buildroot/package/lua-flu/Config.in
new file mode 100644
index 00000000..526dc900
--- /dev/null
+++ b/bsp/buildroot/package/lua-flu/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LUA_FLU
+	bool "lua-flu"
+	depends on !BR2_STATIC_LIBS # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
+	select BR2_PACKAGE_ATTR
+	select BR2_PACKAGE_LIBFUSE
+	help
+	  Flu is a Lua binding for FUSE, which is a library allowing
+	  creation of filesystem drivers run in userspace. Flu is a high
+	  level binding, using basic Lua types rather than userdata
+	  whenever possible.
+
+	  http://piratery.net/flu/
+
+comment "lua-flu needs a toolchain w/ threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/lua-flu/lua-flu.hash b/bsp/buildroot/package/lua-flu/lua-flu.hash
new file mode 100644
index 00000000..92a0a13f
--- /dev/null
+++ b/bsp/buildroot/package/lua-flu/lua-flu.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	1389c22daec77161ec93ff90c39ee70e0f8a656ff92f22f9cf5d7121999d5c53  flu-20150331-1.src.rock
diff --git a/bsp/buildroot/package/lua-flu/lua-flu.mk b/bsp/buildroot/package/lua-flu/lua-flu.mk
new file mode 100644
index 00000000..7cfea8e6
--- /dev/null
+++ b/bsp/buildroot/package/lua-flu/lua-flu.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-flu
+#
+################################################################################
+
+LUA_FLU_VERSION = 20150331-1
+LUA_FLU_NAME_UPSTREAM = flu
+LUA_FLU_SUBDIR = doub-flu-a7daae986339
+LUA_FLU_LICENSE = MIT
+LUA_FLU_LICENSE_FILES = $(LUA_FLU_SUBDIR)/doc/LICENSE.txt
+LUA_FLU_DEPENDENCIES = attr libfuse
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-http/Config.in b/bsp/buildroot/package/lua-http/Config.in
new file mode 100644
index 00000000..247cc403
--- /dev/null
+++ b/bsp/buildroot/package/lua-http/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LUA_HTTP
+	bool "lua-http"
+	depends on BR2_TOOLCHAIN_HAS_THREADS    # luaossl & lua-cqueues
+	# These are runtime dependencies
+	select BR2_PACKAGE_LUA_BASEXX
+	select BR2_PACKAGE_LUA_COMPAT53 if !BR2_PACKAGE_LUA_5_3
+	select BR2_PACKAGE_LUA_CQUEUES
+	select BR2_PACKAGE_LUA_FIFO
+	select BR2_PACKAGE_LUA_LPEG_PATTERNS
+	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
+	select BR2_PACKAGE_LUAOSSL
+	help
+	  HTTP library for Lua
+
+	  https://daurnimator.github.io/lua-http/
+
+comment "lua-http needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/lua-http/lua-http.hash b/bsp/buildroot/package/lua-http/lua-http.hash
new file mode 100644
index 00000000..2346ab97
--- /dev/null
+++ b/bsp/buildroot/package/lua-http/lua-http.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 d68591eeeeb60c4187469eae89f5bad02d753a8c0adaa460d453b0734222645a  http-0.2-0.src.rock
diff --git a/bsp/buildroot/package/lua-http/lua-http.mk b/bsp/buildroot/package/lua-http/lua-http.mk
new file mode 100644
index 00000000..9bc416b8
--- /dev/null
+++ b/bsp/buildroot/package/lua-http/lua-http.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-http
+#
+################################################################################
+
+LUA_HTTP_VERSION_UPSTREAM = 0.2
+LUA_HTTP_VERSION = $(LUA_HTTP_VERSION_UPSTREAM)-0
+LUA_HTTP_NAME_UPSTREAM = http
+LUA_HTTP_SUBDIR = lua-http-$(LUA_HTTP_VERSION_UPSTREAM)
+LUA_HTTP_LICENSE = MIT
+LUA_HTTP_LICENSE_FILES = $(LUA_HTTP_SUBDIR)/LICENSE.md
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-iconv/lua-iconv.mk b/bsp/buildroot/package/lua-iconv/lua-iconv.mk
index f0afa2b8..dd7533af 100644
--- a/bsp/buildroot/package/lua-iconv/lua-iconv.mk
+++ b/bsp/buildroot/package/lua-iconv/lua-iconv.mk
@@ -4,9 +4,7 @@
 #
 ################################################################################
 
-LUA_ICONV_VERSION_UPSTREAM = 7
-LUA_ICONV_VERSION = $(LUA_ICONV_VERSION_UPSTREAM)-1
-LUA_ICONV_SUBDIR  = lua-iconv-$(LUA_ICONV_VERSION_UPSTREAM)
+LUA_ICONV_VERSION = 7-1
 LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv)
 LUA_ICONV_LICENSE = MIT
 LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING
diff --git a/bsp/buildroot/package/lua-lpeg-patterns/Config.in b/bsp/buildroot/package/lua-lpeg-patterns/Config.in
new file mode 100644
index 00000000..9c701d3d
--- /dev/null
+++ b/bsp/buildroot/package/lua-lpeg-patterns/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LUA_LPEG_PATTERNS
+	bool "lua-lpeg-patterns"
+	# These are runtime dependencies
+	select BR2_PACKAGE_LPEG
+	help
+	  a collection of LPEG patterns.
+
+	  https://github.com/daurnimator/lpeg_patterns
diff --git a/bsp/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash b/bsp/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
new file mode 100644
index 00000000..f779466d
--- /dev/null
+++ b/bsp/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 82c8eddee52069e5ae821b68cb9e295ab5767a47d07545a4ca36ac1e81066086  lpeg_patterns-0.4-0.src.rock
diff --git a/bsp/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk b/bsp/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
new file mode 100644
index 00000000..8f40c995
--- /dev/null
+++ b/bsp/buildroot/package/lua-lpeg-patterns/lua-lpeg-patterns.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-lpeg-patterns
+#
+################################################################################
+
+LUA_LPEG_PATTERNS_VERSION = 0.4-0
+LUA_LPEG_PATTERNS_NAME_UPSTREAM = lpeg_patterns
+LUA_LPEG_PATTERNS_ROCKSPEC = $(LUA_LPEG_PATTERNS_NAME_UPSTREAM)-$(LUA_LPEG_PATTERNS_VERSION).rockspec
+LUA_LPEG_PATTERNS_SOURCE = $(LUA_LPEG_PATTERNS_NAME_UPSTREAM)-$(LUA_LPEG_PATTERNS_VERSION).src.rock
+LUA_LPEG_PATTERNS_LICENSE = MIT
+LUA_LPEG_PATTERNS_LICENSE_FILES = $(LUA_LPEG_PATTERNS_SUBDIR)/LICENSE.md
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-markdown/Config.in b/bsp/buildroot/package/lua-markdown/Config.in
new file mode 100644
index 00000000..c53dc460
--- /dev/null
+++ b/bsp/buildroot/package/lua-markdown/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_MARKDOWN
+	bool "lua-markdown"
+	help
+	  A pure-lua implementation of the Markdown text-to-html
+	  markup system.
+
+	  https://github.com/mpeterv/markdown
diff --git a/bsp/buildroot/package/lua-markdown/lua-markdown.hash b/bsp/buildroot/package/lua-markdown/lua-markdown.hash
new file mode 100644
index 00000000..9bfbf600
--- /dev/null
+++ b/bsp/buildroot/package/lua-markdown/lua-markdown.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 bed84231bb48322f8e614b4392181c52c36bc71340f9273e0c3bd72dc922bc07  markdown-0.33-1.src.rock
diff --git a/bsp/buildroot/package/lua-markdown/lua-markdown.mk b/bsp/buildroot/package/lua-markdown/lua-markdown.mk
new file mode 100644
index 00000000..a98f3125
--- /dev/null
+++ b/bsp/buildroot/package/lua-markdown/lua-markdown.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-markdown
+#
+################################################################################
+
+LUA_MARKDOWN_VERSION = 0.33-1
+LUA_MARKDOWN_NAME_UPSTREAM = markdown
+LUA_MARKDOWN_SUBDIR = markdown
+LUA_MARKDOWN_LICENSE = MIT
+LUA_MARKDOWN_LICENSE_FILES = $(LUA_MARKDOWN_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-messagepack/lua-messagepack.hash b/bsp/buildroot/package/lua-messagepack/lua-messagepack.hash
index 7da34e13..86ea5d08 100644
--- a/bsp/buildroot/package/lua-messagepack/lua-messagepack.hash
+++ b/bsp/buildroot/package/lua-messagepack/lua-messagepack.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 a8aac195dc835101a025385b4c5b596de6602c4ced85e0df35b7f52e6aa6ee5d  lua-messagepack-0.4.0-1.src.rock
-sha256 85a3eef21e10eb6c3ebf584ce950610fc10457746a4b8dbcbcab4b626f7d3265  lua-messagepack-lua53-0.4.0-1.src.rock
+sha256 a27d985b8bdb79ebe78dfe255c795e839a04eb2fed1c610a81c7876e3f72fd97  lua-messagepack-0.5.1-1.src.rock
+sha256 b7f69ada6aed7e0cdfd690291607d8f41246e67f191107ecdc0a1e592c449abe  lua-messagepack-lua53-0.5.1-1.src.rock
diff --git a/bsp/buildroot/package/lua-messagepack/lua-messagepack.mk b/bsp/buildroot/package/lua-messagepack/lua-messagepack.mk
index 15fc1825..7c9bb0d8 100644
--- a/bsp/buildroot/package/lua-messagepack/lua-messagepack.mk
+++ b/bsp/buildroot/package/lua-messagepack/lua-messagepack.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.4.0
-ifeq ($(BR2_PACKAGE_LUA_5_3),y)
-LUA_MESSAGEPACK_VERSION = lua53-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1
-else
+LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.5.1
 LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1
+ifeq ($(BR2_PACKAGE_LUA_5_3),y)
+LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack-lua53
+else
+LUA_MESSAGEPACK_NAME_UPSTREAM = lua-MessagePack
 endif
 LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)
 LUA_MESSAGEPACK_LICENSE = MIT
diff --git a/bsp/buildroot/package/lua-periphery/lua-periphery.mk b/bsp/buildroot/package/lua-periphery/lua-periphery.mk
index 48eba392..2c04eede 100644
--- a/bsp/buildroot/package/lua-periphery/lua-periphery.mk
+++ b/bsp/buildroot/package/lua-periphery/lua-periphery.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.6
-LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1
+LUA_PERIPHERY_VERSION = 1.0.6-1
 LUA_PERIPHERY_SUBDIR = lua-periphery
 LUA_PERIPHERY_LICENSE = MIT
 LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE
diff --git a/bsp/buildroot/package/lua-resty-http/Config.in b/bsp/buildroot/package/lua-resty-http/Config.in
new file mode 100644
index 00000000..4697c90d
--- /dev/null
+++ b/bsp/buildroot/package/lua-resty-http/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LUA_RESTY_HTTP
+	bool "lua-resty-http"
+	help
+	  Lua HTTP client cosocket driver for OpenResty / ngx_lua.
+
+	  http://github.com/pintsized/lua-resty-http
diff --git a/bsp/buildroot/package/lua-resty-http/lua-resty-http.hash b/bsp/buildroot/package/lua-resty-http/lua-resty-http.hash
new file mode 100644
index 00000000..e45df0e9
--- /dev/null
+++ b/bsp/buildroot/package/lua-resty-http/lua-resty-http.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4628413a5a2828645e3ddb38a2a0c764e81443cbd1a011357eeed7e983750329  lua-resty-http-0.12-0.src.rock
diff --git a/bsp/buildroot/package/lua-resty-http/lua-resty-http.mk b/bsp/buildroot/package/lua-resty-http/lua-resty-http.mk
new file mode 100644
index 00000000..2aee63d7
--- /dev/null
+++ b/bsp/buildroot/package/lua-resty-http/lua-resty-http.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# lua-resty-http
+#
+################################################################################
+
+LUA_RESTY_HTTP_VERSION = 0.12-0
+LUA_RESTY_HTTP_SUBDIR = lua-resty-http
+LUA_RESTY_HTTP_LICENSE = BSD-2-Clause
+LUA_RESTY_HTTP_LICENSE_FILES = $(LUA_RESTY_HTTP_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-sailor/Config.in b/bsp/buildroot/package/lua-sailor/Config.in
new file mode 100644
index 00000000..2600d460
--- /dev/null
+++ b/bsp/buildroot/package/lua-sailor/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LUA_SAILOR
+	bool "lua-sailor"
+	# These are runtime dependencies
+	select BR2_PACKAGE_CGILUA
+	select BR2_PACKAGE_LBASE64
+	select BR2_PACKAGE_LUAFILESYSTEM
+	select BR2_PACKAGE_LUA_DATAFILE
+	select BR2_PACKAGE_LUA_VALUA
+	select BR2_PACKAGE_XAVANTE
+	select BR2_PACKAGE_WSAPI_XAVANTE
+	help
+	  Sailor is a web framework written in Lua that follows the MVC
+	  design pattern.
+
+	  http://sailorproject.org/
diff --git a/bsp/buildroot/package/lua-sailor/lua-sailor.hash b/bsp/buildroot/package/lua-sailor/lua-sailor.hash
new file mode 100644
index 00000000..f4c42ccc
--- /dev/null
+++ b/bsp/buildroot/package/lua-sailor/lua-sailor.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 4f7f43a7cf6c62712a521ebaf5f53aaf230039c7fb06480ae168c3aa036120bf  sailor-0.5-4.src.rock
diff --git a/bsp/buildroot/package/lua-sailor/lua-sailor.mk b/bsp/buildroot/package/lua-sailor/lua-sailor.mk
new file mode 100644
index 00000000..17fbd7c6
--- /dev/null
+++ b/bsp/buildroot/package/lua-sailor/lua-sailor.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-sailor
+#
+################################################################################
+
+LUA_SAILOR_VERSION = 0.5-4
+LUA_SAILOR_NAME_UPSTREAM = sailor
+LUA_SAILOR_SUBDIR = sailor
+LUA_SAILOR_LICENSE = MIT
+LUA_SAILOR_LICENSE_FILES = $(LUA_SAILOR_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch b/bsp/buildroot/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch
new file mode 100644
index 00000000..f4b06e0b
--- /dev/null
+++ b/bsp/buildroot/package/lua-sdl2/0001-Do-not-reference-host-directory-for-headers.patch
@@ -0,0 +1,29 @@
+From 07309a49ad6c3e18c8c84fe54f1fdb9e103c4cc5 Mon Sep 17 00:00:00 2001
+From: Francois Perrad <francois.perrad@gadz.org>
+Date: Sun, 22 Oct 2017 13:00:01 +0200
+Subject: [PATCH] Do not reference host directory for headers
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+---
+ cmake/FindSDL2.cmake | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
+index 5cf4115..5e17919 100644
+--- a/cmake/FindSDL2.cmake
++++ b/cmake/FindSDL2.cmake
+@@ -73,11 +73,6 @@ find_path(SDL2_INCLUDE_DIR SDL.h
+   PATH_SUFFIXES include/SDL2 include
+ )
+ 
+-# On FreeBSD SDL depends on libiconv and SDL_stdinc.h includes iconv.h, which is
+-# located in ${LOCALBASE}/include. Append {LOCALBASE}/include to
+-# the SDL_INCLUDE_DIR, thus allow to build SDL apps out of box.
+-list(APPEND SDL2_INCLUDE_DIR /usr/local/include)
+-
+ find_library(SDL_LIBRARY_TEMP
+   NAMES SDL2 SDL2-2.0
+   HINTS
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch b/bsp/buildroot/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch
new file mode 100644
index 00000000..eb03ca58
--- /dev/null
+++ b/bsp/buildroot/package/lua-sdl2/0002-CMakeLists-do-not-require-C.patch
@@ -0,0 +1,58 @@
+From 5732174debfe027f7620af55c283060201f0ad03 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 2 Nov 2017 22:54:51 +0100
+Subject: [PATCH] CMakeLists: do not require C++
+
+The project doesn't use C++, so don't let CMake check for a C++
+compiler by explicitly specifying that this is a C-only project.
+
+Submitted-upstream: https://github.com/Tangent128/luasdl2/pull/69
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ common/CMakeLists.txt    | 2 +-
+ examples/CMakeLists.txt  | 2 +-
+ tutorials/CMakeLists.txt | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
+index 9e19709..8cfb748 100644
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -15,7 +15,7 @@
+ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+-project(common)
++project(common C)
+ 
+ set(
+ 	SOURCES
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index 572b3b7..4e3af4d 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -16,7 +16,7 @@
+ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
+-project(examples)
++project(examples C)
+ 
+ # Option to enable / disable examples installation
+ option(WITH_DOCS "Installation of documentation and examples" On)
+diff --git a/tutorials/CMakeLists.txt b/tutorials/CMakeLists.txt
+index adefbc9..6ec069e 100644
+--- a/tutorials/CMakeLists.txt
++++ b/tutorials/CMakeLists.txt
+@@ -16,7 +16,7 @@
+ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+ 
+-project(tutorials)
++project(tutorials C)
+ 
+ # Option to enable / disable examples installation
+ option(WITH_DOCS "Installation of tutorials" On)
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/lua-sdl2/Config.in b/bsp/buildroot/package/lua-sdl2/Config.in
new file mode 100644
index 00000000..65f9e7ff
--- /dev/null
+++ b/bsp/buildroot/package/lua-sdl2/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_LUA_SDL2
+	bool "lua-sdl2"
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_SDL2
+	help
+	  Lua-SDL2 is a pure C binding of SDL2 to Lua 5.1, Lua 5.2,
+	  Lua 5.3, and LuaJIT.
+
+	  https://github.com/Tangent128/luasdl2
+
+comment "lua-sdl2 needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/lua-sdl2/lua-sdl2.hash b/bsp/buildroot/package/lua-sdl2/lua-sdl2.hash
new file mode 100644
index 00000000..80aa1ccc
--- /dev/null
+++ b/bsp/buildroot/package/lua-sdl2/lua-sdl2.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	cee7875106062fbc00cf8acb3b2738e336e2327df73ede011968cb060c094bfb  lua-sdl2-v2.0.5-6.0.tar.gz
diff --git a/bsp/buildroot/package/lua-sdl2/lua-sdl2.mk b/bsp/buildroot/package/lua-sdl2/lua-sdl2.mk
new file mode 100644
index 00000000..31375997
--- /dev/null
+++ b/bsp/buildroot/package/lua-sdl2/lua-sdl2.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# lua-sdl2
+#
+################################################################################
+
+LUA_SDL2_VERSION = v2.0.5-6.0
+LUA_SDL2_SITE = $(call github,Tangent128,luasdl2,$(LUA_SDL2_VERSION))
+LUA_SDL2_LICENSE = ISC
+LUA_SDL2_LICENSE_FILES = LICENSE
+LUA_SDL2_DEPENDENCIES = luainterpreter sdl2
+
+LUA_SDL2_CONF_OPTS += -DWITH_LUAVER=user -DLUA_INCLUDE_DIR=$(STAGING_DIR)/usr/include
+
+ifeq ($(BR2_PACKAGE_SDL2_IMAGE),y)
+LUA_SDL2_DEPENDENCIES += sdl2_image
+else
+LUA_SDL2_CONF_OPTS += -DWITH_IMAGE=Off
+endif
+
+ifeq ($(BR2_PACKAGE_SDL2_MIXER),y)
+LUA_SDL2_DEPENDENCIES += sdl2_mixer
+else
+LUA_SDL2_CONF_OPTS += -DWITH_MIXER=Off
+endif
+
+ifeq ($(BR2_PACKAGE_SDL2_NET),y)
+LUA_SDL2_DEPENDENCIES += sdl2_net
+else
+LUA_SDL2_CONF_OPTS += -DWITH_NET=Off
+endif
+
+ifeq ($(BR2_PACKAGE_SDL2_TTF),y)
+LUA_SDL2_DEPENDENCIES += sdl2_ttf
+else
+LUA_SDL2_CONF_OPTS += -DWITH_TTF=Off
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/lua-stdlib/Config.in b/bsp/buildroot/package/lua-stdlib/Config.in
new file mode 100644
index 00000000..1843826c
--- /dev/null
+++ b/bsp/buildroot/package/lua-stdlib/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LUA_STDLIB
+	bool "lua-stdlib"
+	help
+	  lua-stdlib is a library of modules for common programming
+	  tasks, including list, table and functional operations,
+	  objects, pickling, pretty-printing and command-line option
+	  parsing.
+
+	  https://github.com/lua-stdlib/lua-stdlib/
diff --git a/bsp/buildroot/package/lua-stdlib/lua-stdlib.hash b/bsp/buildroot/package/lua-stdlib/lua-stdlib.hash
new file mode 100644
index 00000000..4882bf1e
--- /dev/null
+++ b/bsp/buildroot/package/lua-stdlib/lua-stdlib.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 b7302ecc8ea3992d3bad96c0c4d56272e38d786d16cc1ad5964fefa73fd7c10b  stdlib-41.2.1-1.src.rock
diff --git a/bsp/buildroot/package/lua-stdlib/lua-stdlib.mk b/bsp/buildroot/package/lua-stdlib/lua-stdlib.mk
new file mode 100644
index 00000000..a7930be5
--- /dev/null
+++ b/bsp/buildroot/package/lua-stdlib/lua-stdlib.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# lua-stdlib
+#
+################################################################################
+
+LUA_STDLIB_VERSION_UPSTREAM = 41.2.1
+LUA_STDLIB_VERSION = $(LUA_STDLIB_VERSION_UPSTREAM)-1
+LUA_STDLIB_NAME_UPSTREAM = stdlib
+LUA_STDLIB_SUBDIR = lua-stdlib-release-v$(LUA_STDLIB_VERSION_UPSTREAM)
+LUA_STDLIB_LICENSE = MIT
+LUA_STDLIB_LICENSE_FILES = $(LUA_STDLIB_SUBDIR)/COPYING
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-testmore/lua-testmore.hash b/bsp/buildroot/package/lua-testmore/lua-testmore.hash
index 439097b9..8db664f2 100644
--- a/bsp/buildroot/package/lua-testmore/lua-testmore.hash
+++ b/bsp/buildroot/package/lua-testmore/lua-testmore.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	a76a9b707487bf3e8b6a5362640bc2e010d184c4f66e423de7b28bd480a0db90  lua-testmore-0.3.2-1.src.rock
+sha256	163055ef92df9e01d9ae57cd45d6f6aace1ff4dd3abf7e29b9e30ecb1ab76ae2  lua-testmore-0.3.3-1.src.rock
diff --git a/bsp/buildroot/package/lua-testmore/lua-testmore.mk b/bsp/buildroot/package/lua-testmore/lua-testmore.mk
index 771b97f0..79047761 100644
--- a/bsp/buildroot/package/lua-testmore/lua-testmore.mk
+++ b/bsp/buildroot/package/lua-testmore/lua-testmore.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LUA_TESTMORE_VERSION_UPSTREAM = 0.3.2
-LUA_TESTMORE_VERSION = $(LUA_TESTMORE_VERSION_UPSTREAM)-1
-LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM)
+LUA_TESTMORE_VERSION = 0.3.3-1
+LUA_TESTMORE_NAME_UPSTREAM = lua-TestMore
 LUA_TESTMORE_LICENSE = MIT
 LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT
 
diff --git a/bsp/buildroot/package/lua-utf8/Config.in b/bsp/buildroot/package/lua-utf8/Config.in
new file mode 100644
index 00000000..313fa4e4
--- /dev/null
+++ b/bsp/buildroot/package/lua-utf8/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LUA_UTF8
+	bool "lua-utf8"
+	help
+	  This module adds UTF-8 support to Lua.
+	  It's compatible with Lua "string" module.
+
+	  http://github.com/starwing/luautf8
diff --git a/bsp/buildroot/package/lua-utf8/lua-utf8.hash b/bsp/buildroot/package/lua-utf8/lua-utf8.hash
new file mode 100644
index 00000000..51fa2439
--- /dev/null
+++ b/bsp/buildroot/package/lua-utf8/lua-utf8.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 c9ceb3a9f327b3215cdf959eebf616970b5b0427ca3fde05b19f8236defa4b91  utf8-1.2-0.src.rock
diff --git a/bsp/buildroot/package/lua-utf8/lua-utf8.mk b/bsp/buildroot/package/lua-utf8/lua-utf8.mk
new file mode 100644
index 00000000..7ed4f3fb
--- /dev/null
+++ b/bsp/buildroot/package/lua-utf8/lua-utf8.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# lua-utf8
+#
+################################################################################
+
+LUA_UTF8_VERSION = 1.2-0
+LUA_UTF8_NAME_UPSTREAM = utf8
+LUA_UTF8_SUBDIR = luautf8
+LUA_UTF8_LICENSE = MIT
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua-valua/Config.in b/bsp/buildroot/package/lua-valua/Config.in
new file mode 100644
index 00000000..96b37965
--- /dev/null
+++ b/bsp/buildroot/package/lua-valua/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LUA_VALUA
+	bool "lua-valua"
+	help
+	  This module provides tools for validating values, very useful
+	  in forms, but also usable elsewhere. It works in appended
+	  chains. Create a new validation object and start chaining
+	  your test functions.
+
+	  https://github.com/sailorproject/valua
diff --git a/bsp/buildroot/package/lua-valua/lua-valua.hash b/bsp/buildroot/package/lua-valua/lua-valua.hash
new file mode 100644
index 00000000..92ea6131
--- /dev/null
+++ b/bsp/buildroot/package/lua-valua/lua-valua.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 bff39692fd2ac3590fd814aa1b1ca33e5d5971092955309aa8424b02b88ce1a3  valua-0.3-1.src.rock
diff --git a/bsp/buildroot/package/lua-valua/lua-valua.mk b/bsp/buildroot/package/lua-valua/lua-valua.mk
new file mode 100644
index 00000000..8cb0bf52
--- /dev/null
+++ b/bsp/buildroot/package/lua-valua/lua-valua.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# lua-valua
+#
+################################################################################
+
+LUA_VALUA_VERSION = 0.3-1
+LUA_VALUA_NAME_UPSTREAM = valua
+LUA_VALUA_SUBDIR = valua
+LUA_VALUA_LICENSE = MIT
+LUA_VALUA_LICENSE_FILES = $(LUA_VALUA_SUBDIR)/LICENSE
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lua/5.2.4/0004-lua-pc.patch b/bsp/buildroot/package/lua/5.2.4/0004-lua-pc.patch
deleted file mode 100644
index 31ff6115..00000000
--- a/bsp/buildroot/package/lua/5.2.4/0004-lua-pc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-add lua.pc
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-[Jörg Krause: add @MYLIBS@]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-
-Index: b/etc/lua.pc
-===================================================================
---- /dev/null
-+++ b/etc/lua.pc
-@@ -0,0 +1,31 @@
-+# lua.pc -- pkg-config data for Lua
-+
-+# vars from install Makefile
-+
-+# grep '^V=' ../Makefile
-+V= 5.2
-+# grep '^R=' ../Makefile
-+R= 5.2.3
-+
-+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-+prefix= /usr
-+INSTALL_BIN= ${prefix}/bin
-+INSTALL_INC= ${prefix}/include
-+INSTALL_LIB= ${prefix}/lib
-+INSTALL_MAN= ${prefix}/man/man1
-+INSTALL_LMOD= ${prefix}/share/lua/${V}
-+INSTALL_CMOD= ${prefix}/lib/lua/${V}
-+
-+# canonical vars
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: Lua
-+Description: An Extensible Extension Language
-+Version: ${R}
-+Requires: 
-+Libs: -L${libdir} -llua -lm @MYLIBS@
-+Cflags: -I${includedir}
-+
-+# (end of lua.pc)
diff --git a/bsp/buildroot/package/lua/5.3.4/0004-lua-pc.patch b/bsp/buildroot/package/lua/5.3.4/0004-lua-pc.patch
deleted file mode 100644
index 11258329..00000000
--- a/bsp/buildroot/package/lua/5.3.4/0004-lua-pc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-add lua.pc
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-[Jörg Krause: add @MYLIBS@]
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
-
-Index: b/etc/lua.pc
-===================================================================
---- /dev/null
-+++ b/etc/lua.pc
-@@ -0,0 +1,31 @@
-+# lua.pc -- pkg-config data for Lua
-+
-+# vars from install Makefile
-+
-+# grep '^V=' ../Makefile
-+V= 5.3
-+# grep '^R=' ../Makefile
-+R= 5.3.4
-+
-+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-+prefix= /usr
-+INSTALL_BIN= ${prefix}/bin
-+INSTALL_INC= ${prefix}/include
-+INSTALL_LIB= ${prefix}/lib
-+INSTALL_MAN= ${prefix}/man/man1
-+INSTALL_LMOD= ${prefix}/share/lua/${V}
-+INSTALL_CMOD= ${prefix}/lib/lua/${V}
-+
-+# canonical vars
-+exec_prefix=${prefix}
-+libdir=${exec_prefix}/lib
-+includedir=${prefix}/include
-+
-+Name: Lua
-+Description: An Extensible Extension Language
-+Version: ${R}
-+Requires:
-+Libs: -L${libdir} -llua -lm @MYLIBS@
-+Cflags: -I${includedir}
-+
-+# (end of lua.pc)
diff --git a/bsp/buildroot/package/lua/Config.in b/bsp/buildroot/package/lua/Config.in
index 711fa891..4d2f0e90 100644
--- a/bsp/buildroot/package/lua/Config.in
+++ b/bsp/buildroot/package/lua/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_LUA
 	bool "lua"
 	select BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  Lua is a powerful, fast, light-weight, embeddable scripting language.
+	  Lua is a powerful, fast, light-weight, embeddable scripting
+	  language.
 
 	  http://www.lua.org/
 
@@ -17,14 +18,14 @@ choice
 	help
 	  Select the version of Lua API/ABI you wish to use.
 
-	config BR2_PACKAGE_LUA_5_1
-		bool "Lua 5.1.x"
+config BR2_PACKAGE_LUA_5_1
+	bool "Lua 5.1.x"
 
-	config BR2_PACKAGE_LUA_5_2
-		bool "Lua 5.2.x"
+config BR2_PACKAGE_LUA_5_2
+	bool "Lua 5.2.x"
 
-	config BR2_PACKAGE_LUA_5_3
-		bool "Lua 5.3.x"
+config BR2_PACKAGE_LUA_5_3
+	bool "Lua 5.3.x"
 
 endchoice
 
diff --git a/bsp/buildroot/package/lua/lua.mk b/bsp/buildroot/package/lua/lua.mk
index 89636f20..0ac2e0e2 100644
--- a/bsp/buildroot/package/lua/lua.mk
+++ b/bsp/buildroot/package/lua/lua.mk
@@ -73,6 +73,8 @@ define LUA_BUILD_CMDS
 	MYLDFLAGS="$(TARGET_LDFLAGS)" \
 	BUILDMODE=$(LUA_BUILDMODE) \
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
+	sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(LUA_MYLIBS)/" \
+		package/lua/lua.pc.in > $(@D)/lua.pc
 endef
 
 define HOST_LUA_BUILD_CMDS
@@ -82,13 +84,14 @@ define HOST_LUA_BUILD_CMDS
 	MYLIBS="$(HOST_LUA_MYLIBS)" \
 	BUILDMODE=static \
 	PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all
+	sed -e "s/@VERSION@/$(LUA_VERSION)/;s/@ABI@/$(LUAINTERPRETER_ABIVER)/;s/@MYLIBS@/$(HOST_LUA_MYLIBS)/" \
+		package/lua/lua.pc.in > $(@D)/lua.pc
 endef
 
 define LUA_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/
-	sed -e "s/@MYLIBS@/$(LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
-		> $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
+	$(INSTALL) -m 0644 -D $(@D)/lua.pc \
+		$(STAGING_DIR)/usr/lib/pkgconfig/lua.pc
 endef
 
 define LUA_INSTALL_TARGET_CMDS
@@ -96,10 +99,9 @@ define LUA_INSTALL_TARGET_CMDS
 endef
 
 define HOST_LUA_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install
-	mkdir -p $(HOST_DIR)/usr/lib/pkgconfig/
-	sed -e "s/@MYLIBS@/$(HOST_LUA_MYLIBS)/g" $(@D)/etc/lua.pc \
-		> $(HOST_DIR)/lib/pkgconfig/lua.pc
+	$(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)" -C $(@D) install
+	$(INSTALL) -m 0644 -D $(@D)/lua.pc \
+		$(HOST_DIR)/lib/pkgconfig/lua.pc
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/lua/lua.pc.in b/bsp/buildroot/package/lua/lua.pc.in
new file mode 100644
index 00000000..0a61d5e6
--- /dev/null
+++ b/bsp/buildroot/package/lua/lua.pc.in
@@ -0,0 +1,26 @@
+# lua.pc -- pkg-config data for Lua
+
+V= @ABI@
+R= @VERSION@
+
+prefix= /usr
+INSTALL_BIN= ${prefix}/bin
+INSTALL_INC= ${prefix}/include
+INSTALL_LIB= ${prefix}/lib
+INSTALL_MAN= ${prefix}/man/man1
+INSTALL_LMOD= ${prefix}/share/lua/${V}
+INSTALL_CMOD= ${prefix}/lib/lua/${V}
+
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires:
+Libs: -L${libdir} -llua -lm @MYLIBS@
+Cflags: -I${includedir}
+
+# (end of lua.pc)
diff --git a/bsp/buildroot/package/luabitop/Config.in b/bsp/buildroot/package/luabitop/Config.in
index 26442fc9..a819fe8a 100644
--- a/bsp/buildroot/package/luabitop/Config.in
+++ b/bsp/buildroot/package/luabitop/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_LUABITOP
 	bool "luabitop"
 	depends on !BR2_PACKAGE_LUA_5_3
 	help
-	  Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise
-	  operations on numbers.
+	  Lua BitOp is a C extension module for Lua 5.1/5.2 which adds
+	  bitwise operations on numbers.
 
 	  http://bitop.luajit.org
 
diff --git a/bsp/buildroot/package/luabitop/luabitop.mk b/bsp/buildroot/package/luabitop/luabitop.mk
index 5ced99b3..a36a2fea 100644
--- a/bsp/buildroot/package/luabitop/luabitop.mk
+++ b/bsp/buildroot/package/luabitop/luabitop.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LUABITOP_VERSION_UPSTREAM = 1.0.2
-LUABITOP_VERSION = $(LUABITOP_VERSION_UPSTREAM)-1
-LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM)
+LUABITOP_VERSION = 1.0.2-1
+LUABITOP_NAME_UPSTREAM = LuaBitOp
 LUABITOP_LICENSE = MIT
 LUABITOP_LICENSE_FILES = $(LUABITOP_SUBDIR)/README
 
diff --git a/bsp/buildroot/package/luacrypto/Config.in b/bsp/buildroot/package/luacrypto/Config.in
index 8d13eec6..e9d43cd8 100644
--- a/bsp/buildroot/package/luacrypto/Config.in
+++ b/bsp/buildroot/package/luacrypto/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_LUACRYPTO
 	help
 	  LuaCrypto provides a Lua frontend to the OpenSSL cryptographic
 	  library.
-	  The OpenSSL features that are currently exposed are digests (MD5,
-	  SHA-1, HMAC, and more) and crypto-grade random number generators
-	  communication.
+	  The OpenSSL features that are currently exposed are digests
+	  (MD5, SHA-1, HMAC, and more) and crypto-grade random number
+	  generators communication.
 
 	  http://luacrypto.luaforge.net
diff --git a/bsp/buildroot/package/luacrypto/luacrypto.mk b/bsp/buildroot/package/luacrypto/luacrypto.mk
index b0e972c6..b6dbb999 100644
--- a/bsp/buildroot/package/luacrypto/luacrypto.mk
+++ b/bsp/buildroot/package/luacrypto/luacrypto.mk
@@ -4,9 +4,7 @@
 #
 ################################################################################
 
-LUACRYPTO_VERSION_UPSTREAM = 0.3.2
-LUACRYPTO_VERSION = $(LUACRYPTO_VERSION_UPSTREAM)-1
-LUACRYPTO_SUBDIR = luacrypto-$(LUACRYPTO_VERSION_UPSTREAM)
+LUACRYPTO_VERSION = 0.3.2-1
 LUACRYPTO_LICENSE = MIT
 LUACRYPTO_LICENSE_FILES = $(LUACRYPTO_SUBDIR)/COPYING
 LUACRYPTO_DEPENDENCIES = openssl
diff --git a/bsp/buildroot/package/luadbi-sqlite3/Config.in b/bsp/buildroot/package/luadbi-sqlite3/Config.in
new file mode 100644
index 00000000..6ed32a29
--- /dev/null
+++ b/bsp/buildroot/package/luadbi-sqlite3/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LUADBI_SQLITE3
+	bool "luadbi-sqlite3"
+	select BR2_PACKAGE_LUADBI # runtime dependency
+	select BR2_PACKAGE_SQLITE
+	help
+	  LuaDBI is a database interface library for Lua.
+	  And this is the SQLite3 backend.
+
+	  https://github.com/mwild1/luadbi
diff --git a/bsp/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash b/bsp/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
new file mode 100644
index 00000000..bd8b927f
--- /dev/null
+++ b/bsp/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 2868dad4d189368fcf5cddd191965c8cb2efaa3a3ba83d50e6a88c30353f74ce  luadbi-sqlite3-0.6-2.src.rock
diff --git a/bsp/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk b/bsp/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
new file mode 100644
index 00000000..422fa1e3
--- /dev/null
+++ b/bsp/buildroot/package/luadbi-sqlite3/luadbi-sqlite3.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# luadbi-sqlite3
+#
+################################################################################
+
+LUADBI_SQLITE3_VERSION = 0.6-2
+LUADBI_SQLITE3_LICENSE = MIT
+LUADBI_SQLITE3_SUBDIR = luadbi
+LUADBI_SQLITE3_LICENSE_FILES = $(LUADBI_SQLITE3_SUBDIR)/COPYING
+LUADBI_SQLITE3_DEPENDENCIES = sqlite
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/luadbi/Config.in b/bsp/buildroot/package/luadbi/Config.in
new file mode 100644
index 00000000..2e290585
--- /dev/null
+++ b/bsp/buildroot/package/luadbi/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_LUADBI
+	bool "luadbi"
+	help
+	  LuaDBI is a database interface library for Lua.
+	  It is designed to provide a RDBMS agnostic API for handling
+	  database operations. LuaDBI also provides support for
+	  prepared statement handles, placeholders and bind parameters
+	  for all database operations.
+
+	  https://github.com/mwild1/luadbi
diff --git a/bsp/buildroot/package/luadbi/luadbi.hash b/bsp/buildroot/package/luadbi/luadbi.hash
new file mode 100644
index 00000000..e5c022bd
--- /dev/null
+++ b/bsp/buildroot/package/luadbi/luadbi.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 723f63b744b7367ddfd6bbf7a7e6f6867aa1eaabbbc2bab5dc8a90e80b0c34c2  luadbi-0.6-2.src.rock
diff --git a/bsp/buildroot/package/luadbi/luadbi.mk b/bsp/buildroot/package/luadbi/luadbi.mk
new file mode 100644
index 00000000..268e0e62
--- /dev/null
+++ b/bsp/buildroot/package/luadbi/luadbi.mk
@@ -0,0 +1,12 @@
+################################################################################
+#
+# luadbi
+#
+################################################################################
+
+LUADBI_VERSION = 0.6-2
+LUADBI_LICENSE = MIT
+LUADBI_SUBDIR = luadbi
+LUADBI_LICENSE_FILES = $(LUADBI_SUBDIR)/COPYING
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/luaexpat/Config.in b/bsp/buildroot/package/luaexpat/Config.in
index 6976e40c..7139e8c6 100644
--- a/bsp/buildroot/package/luaexpat/Config.in
+++ b/bsp/buildroot/package/luaexpat/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LUAEXPAT
 	bool "luaexpat"
-	select BR2_PACKAGE_EXPAT
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+	select BR2_PACKAGE_EXPAT
 	help
 	  LuaExpat is a SAX XML parser based on the Expat library.
 
diff --git a/bsp/buildroot/package/luaexpat/luaexpat.mk b/bsp/buildroot/package/luaexpat/luaexpat.mk
index c6768dcc..c7377f6a 100644
--- a/bsp/buildroot/package/luaexpat/luaexpat.mk
+++ b/bsp/buildroot/package/luaexpat/luaexpat.mk
@@ -7,5 +7,6 @@
 LUAEXPAT_VERSION = 1.3.0-1
 LUAEXPAT_DEPENDENCIES = expat
 LUAEXPAT_LICENSE = MIT
+LUAEXPAT_LICENSE_FILES = $(LUAEXPAT_SUBDIR)/doc/us/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/luaexpatutils/Config.in b/bsp/buildroot/package/luaexpatutils/Config.in
index cb2887ac..28a7b095 100644
--- a/bsp/buildroot/package/luaexpatutils/Config.in
+++ b/bsp/buildroot/package/luaexpatutils/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_LUAEXPATUTILS
 	bool "luaexpatutils"
 	select BR2_PACKAGE_LUAEXPAT
 	help
-	  lxp.doc is a module that provides useful features for working with
-	  XML formats in LOM format as used by the LuaExpat project from Kepler.
+	  lxp.doc is a module that provides useful features for working
+	  with XML formats in LOM format as used by the LuaExpat project
+	  from Kepler.
 
 	  https://github.com/stevedonovan/LuaExpatUtils
diff --git a/bsp/buildroot/package/luafilesystem/luafilesystem.hash b/bsp/buildroot/package/luafilesystem/luafilesystem.hash
index e91f9d66..bd4a446c 100644
--- a/bsp/buildroot/package/luafilesystem/luafilesystem.hash
+++ b/bsp/buildroot/package/luafilesystem/luafilesystem.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	70121e78b8ef9365265b85027729d0520c1163f5609abfa9554b215a672f4e7a  luafilesystem-1.6.3-1.src.rock
+sha256 65e6d437e577a1d6cd509b6cd224d2cb9501d58d32a72cafbd4fd3f911681576  luafilesystem-1.7.0-2.src.rock
diff --git a/bsp/buildroot/package/luafilesystem/luafilesystem.mk b/bsp/buildroot/package/luafilesystem/luafilesystem.mk
index a54ae236..bde04267 100644
--- a/bsp/buildroot/package/luafilesystem/luafilesystem.mk
+++ b/bsp/buildroot/package/luafilesystem/luafilesystem.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUAFILESYSTEM_VERSION = 1.6.3-1
+LUAFILESYSTEM_VERSION = 1.7.0-2
 LUAFILESYSTEM_LICENSE = MIT
 LUAFILESYSTEM_LICENSE_FILES = luafilesystem/LICENSE
 LUAFILESYSTEM_SUBDIR = luafilesystem
diff --git a/bsp/buildroot/package/luainterpreter/luainterpreter.mk b/bsp/buildroot/package/luainterpreter/luainterpreter.mk
index a6c98ab9..cb1d5dde 100644
--- a/bsp/buildroot/package/luainterpreter/luainterpreter.mk
+++ b/bsp/buildroot/package/luainterpreter/luainterpreter.mk
@@ -6,7 +6,18 @@
 
 LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION))
 
+# Lua packages often install documentation, clean that up globally
+# Since luainterpreter is a virtual package, we can't use
+# LUAINTERPRETER_TARGET_FINALIZE_HOOKS
+ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
+define LUAINTERPRETER_REMOVE_DOC
+	rm -rf $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/doc
+endef
+
+TARGET_FINALIZE_HOOKS += LUAINTERPRETER_REMOVE_DOC
+endif
+
 $(eval $(virtual-package))
 $(eval $(host-virtual-package))
 
-LUA_RUN = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER))
+LUA_RUN = $(HOST_DIR)/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER))
diff --git a/bsp/buildroot/package/luajit/0001-no-bin-symlink.patch b/bsp/buildroot/package/luajit/0001-no-bin-symlink.patch
index 37298dd7..dd1dfd89 100644
--- a/bsp/buildroot/package/luajit/0001-no-bin-symlink.patch
+++ b/bsp/buildroot/package/luajit/0001-no-bin-symlink.patch
@@ -14,11 +14,11 @@ Index: b/Makefile
 -INSTALL_TSYMNAME= luajit
 +INSTALL_TNAME= luajit
  INSTALL_ANAME= libluajit-$(ABIVER).a
- INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
- INSTALL_SOSHORT= libluajit-$(ABIVER).so
-@@ -58,7 +57,6 @@
- INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
- INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
+ INSTALL_SOSHORT1= libluajit-$(ABIVER).so
+ INSTALL_SOSHORT2= libluajit-$(ABIVER).so.$(MAJVER)
+@@ -59,7 +58,6 @@
+ INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT1)
+ INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT2)
  INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
 -INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME)
  INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
diff --git a/bsp/buildroot/package/luajit/0003-install-so.patch b/bsp/buildroot/package/luajit/0003-install-so.patch
deleted file mode 100644
index 5929595a..00000000
--- a/bsp/buildroot/package/luajit/0003-install-so.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-fix the following runtime error :
-    luajit: error while loading shared libraries: libluajit-5.1.so.2: cannot open shared object file: No such file or directory
-
-by creating two symbolic links:
-    libluajit-5.1.so -> libluajit-5.1.so.2.0.3
-    libluajit-5.1.so.2 -> libluajit-5.1.so.2.0.3
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@
- INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME)
- INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME)
- INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
--INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT)
-+INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT).$(MAJVER)
- INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME)
- INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME)
- 
diff --git a/bsp/buildroot/package/luajit/Config.in b/bsp/buildroot/package/luajit/Config.in
index 0f84bfd2..7e792c53 100644
--- a/bsp/buildroot/package/luajit/Config.in
+++ b/bsp/buildroot/package/luajit/Config.in
@@ -1,17 +1,16 @@
 config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
 	bool
-	# -m32 flag is used for 32bit builds and host-luajit has
-	# limited architecture support
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	default y if BR2_i386 || \
 		(BR2_x86_64 && BR2_HOSTARCH='x86_64') || \
 		BR2_powerpc || BR2_arm || BR2_armeb || \
 		((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \
 		!BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6)
+	# -m32 flag is used for 32bit builds and host-luajit has
+	# limited architecture support
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 
 config BR2_PACKAGE_LUAJIT
 	bool "luajit"
-	select BR2_PACKAGE_HAS_LUAINTERPRETER
 	depends on !BR2_STATIC_LIBS # dlopen
 	# Luajit is only available for some target architectures, and
 	# has some complexity wrt 32/64. See luajit.mk for details.
@@ -19,6 +18,7 @@ config BR2_PACKAGE_LUAJIT
 	# luajit.mk uses the "-m32" compiler option to build 32bit
 	# binaries, so check if that option is supported. See
 	# luajit.mk for details.
+	select BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64
 	help
 	  LuaJIT implements the full set of language features defined
diff --git a/bsp/buildroot/package/luajit/luajit.hash b/bsp/buildroot/package/luajit/luajit.hash
index 086bef01..2081d127 100644
--- a/bsp/buildroot/package/luajit/luajit.hash
+++ b/bsp/buildroot/package/luajit/luajit.hash
@@ -1,2 +1,2 @@
 # Hashes from: http://luajit.org/download.html
-md5 dd9c38307f2223a504cbfb96e477eca0    LuaJIT-2.0.4.tar.gz
+md5 48353202cbcacab84ee41a5a70ea0a2c    LuaJIT-2.0.5.tar.gz
diff --git a/bsp/buildroot/package/luajit/luajit.mk b/bsp/buildroot/package/luajit/luajit.mk
index d3ef3b75..939fa660 100644
--- a/bsp/buildroot/package/luajit/luajit.mk
+++ b/bsp/buildroot/package/luajit/luajit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUAJIT_VERSION = 2.0.4
+LUAJIT_VERSION = 2.0.5
 LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz
 LUAJIT_SITE = http://luajit.org/download
 LUAJIT_LICENSE = MIT
@@ -66,13 +66,13 @@ LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK
 
 # host-efl package needs host-luajit to be linked dynamically.
 define HOST_LUAJIT_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \
+	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" BUILDMODE=dynamic \
 		TARGET_LDFLAGS="$(HOST_LDFLAGS)" \
 		-C $(@D) amalg
 endef
 
 define HOST_LUAJIT_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install
+	$(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)" LDCONFIG=true -C $(@D) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/luajson/luajson.hash b/bsp/buildroot/package/luajson/luajson.hash
index deda5efd..36534fe3 100644
--- a/bsp/buildroot/package/luajson/luajson.hash
+++ b/bsp/buildroot/package/luajson/luajson.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	4898e5575713b37a1eb9badbd3968e15ec1856115daaed9819acf39113616619  luajson-1.3.3-1.src.rock
+sha256 28a5928cf2e4fd79fa9a9aceaef5ebf1dccb1146489b7de4c2726f561700f01c  luajson-1.3.4-1.src.rock
diff --git a/bsp/buildroot/package/luajson/luajson.mk b/bsp/buildroot/package/luajson/luajson.mk
index 67bc2664..81a9f811 100644
--- a/bsp/buildroot/package/luajson/luajson.mk
+++ b/bsp/buildroot/package/luajson/luajson.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUAJSON_VERSION = 1.3.3-1
+LUAJSON_VERSION = 1.3.4-1
 LUAJSON_SUBDIR = luajson
 LUAJSON_LICENSE = MIT
 LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE
diff --git a/bsp/buildroot/package/lualogging/Config.in b/bsp/buildroot/package/lualogging/Config.in
index 37d70152..bb87f57f 100644
--- a/bsp/buildroot/package/lualogging/Config.in
+++ b/bsp/buildroot/package/lualogging/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_LUALOGGING
 	bool "lualogging"
 	help
-	  LuaLogging provides a simple API to use logging features in Lua.
-	  Its design was based on log4j. LuaLogging currently supports,
-	  through the use of appenders, console, file, rolling file, email,
-	  socket and SQL outputs.
+	  LuaLogging provides a simple API to use logging features in
+	  Lua. Its design was based on log4j. LuaLogging currently
+	  supports, through the use of appenders, console, file, rolling
+	  file, email, socket and SQL outputs.
 
 	  http://www.keplerproject.org/lualogging/
diff --git a/bsp/buildroot/package/luaossl/Config.in b/bsp/buildroot/package/luaossl/Config.in
new file mode 100644
index 00000000..d8763e76
--- /dev/null
+++ b/bsp/buildroot/package/luaossl/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_LUAOSSL
+	bool "luaossl"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_OPENSSL
+	help
+	  luaossl is a comprehensive binding to OpenSSL for Lua 5.1,
+	  5.2, and later.
+
+	  It includes support for certificate and key management,
+	  key generation, signature verification, and deep bindings
+	  to the distinguished name, alternative name, and X.509v3
+	  extension interfaces. It also binds OpenSSL's bignum, message
+	  digest, HMAC, cipher, and CSPRNG interfaces.
+
+	  http://25thandclement.com/~william/projects/luaossl.html
+
+comment "luaossl needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/luaossl/luaossl.hash b/bsp/buildroot/package/luaossl/luaossl.hash
new file mode 100644
index 00000000..8c91a1fc
--- /dev/null
+++ b/bsp/buildroot/package/luaossl/luaossl.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 f9c94c97579efddf8abad1e373e0fe0ecc93d00cd9d1bd49f48c5716c281a08b  luaossl-20171028-0.src.rock
diff --git a/bsp/buildroot/package/luaossl/luaossl.mk b/bsp/buildroot/package/luaossl/luaossl.mk
new file mode 100644
index 00000000..26021a73
--- /dev/null
+++ b/bsp/buildroot/package/luaossl/luaossl.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# luaossl
+#
+################################################################################
+
+LUAOSSL_VERSION_UPSTREAM = 20171028
+LUAOSSL_VERSION = $(LUAOSSL_VERSION_UPSTREAM)-0
+LUAOSSL_SUBDIR = luaossl-rel-$(LUAOSSL_VERSION_UPSTREAM)
+LUAOSSL_LICENSE = MIT
+LUAOSSL_LICENSE_FILES = $(LUAOSSL_SUBDIR)/LICENSE
+LUAOSSL_DEPENDENCIES = openssl
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/luaposix/Config.in b/bsp/buildroot/package/luaposix/Config.in
index 9707cdee..91abcb9e 100644
--- a/bsp/buildroot/package/luaposix/Config.in
+++ b/bsp/buildroot/package/luaposix/Config.in
@@ -1,8 +1,10 @@
 config BR2_PACKAGE_LUAPOSIX
 	bool "luaposix"
 	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1
-	# LuaBitOp is already included in LuaJIT
+	# "bit32" is included in Lua 5.2+. luajit has an equivalent
+	# "bit" module, but since it has a different name, luaposix
+	# doesn't find it.
+	select BR2_PACKAGE_LUA_BIT32 if BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	help
 	  This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3;
 	  like most libraries it simply binds to C APIs on the
diff --git a/bsp/buildroot/package/luaposix/luaposix.hash b/bsp/buildroot/package/luaposix/luaposix.hash
index e2216be7..b3984c1d 100644
--- a/bsp/buildroot/package/luaposix/luaposix.hash
+++ b/bsp/buildroot/package/luaposix/luaposix.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 luaposix-33.4.0.tar.gz
+sha256 ba0bc343783fc33958cd02a68cdbfd65430152d9f297f7ed92678b1a305bd5d7  luaposix-34.0.1.tar.gz
diff --git a/bsp/buildroot/package/luaposix/luaposix.mk b/bsp/buildroot/package/luaposix/luaposix.mk
index ea3af16f..779e707c 100644
--- a/bsp/buildroot/package/luaposix/luaposix.mk
+++ b/bsp/buildroot/package/luaposix/luaposix.mk
@@ -4,11 +4,27 @@
 #
 ################################################################################
 
-LUAPOSIX_VERSION = 33.4.0
+LUAPOSIX_VERSION = 34.0.1
 LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION))
 LUAPOSIX_LICENSE = MIT
-LUAPOSIX_LICENSE_FILES = COPYING
+LUAPOSIX_LICENSE_FILES = LICENSE
 LUAPOSIX_DEPENDENCIES = luainterpreter host-lua
-LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)"
 
-$(eval $(autotools-package))
+define LUAPOSIX_BUILD_CMDS
+	(cd $(@D); \
+		$(LUA_RUN) build-aux/luke \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		LUA_INCDIR=$(STAGING_DIR)/usr/include \
+	)
+endef
+
+define LUAPOSIX_INSTALL_TARGET_CMDS
+	(cd $(@D); \
+		$(LUA_RUN) build-aux/luke install \
+		INST_LIBDIR="$(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \
+		INST_LUADIR="$(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)" \
+	)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/luarocks/luarocks.hash b/bsp/buildroot/package/luarocks/luarocks.hash
index fb01993f..27845a46 100644
--- a/bsp/buildroot/package/luarocks/luarocks.hash
+++ b/bsp/buildroot/package/luarocks/luarocks.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	0e1ec34583e1b265e0fbafb64c8bd348705ad403fe85967fd05d3a659f74d2e5  luarocks-2.4.2.tar.gz
+sha256 4d414d32fed5bb121c72d3ff1280b7f2dc9027a9bc012e41dfbffd5b519b362e  luarocks-2.4.3.tar.gz
diff --git a/bsp/buildroot/package/luarocks/luarocks.mk b/bsp/buildroot/package/luarocks/luarocks.mk
index d18056a5..e050cb55 100644
--- a/bsp/buildroot/package/luarocks/luarocks.mk
+++ b/bsp/buildroot/package/luarocks/luarocks.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-LUAROCKS_VERSION = 2.4.2
+LUAROCKS_VERSION = 2.4.3
 LUAROCKS_SITE = http://luarocks.org/releases
 LUAROCKS_LICENSE = MIT
 LUAROCKS_LICENSE_FILES = COPYING
 
 HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter
 
-LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks
+LUAROCKS_CONFIG_DIR = $(HOST_DIR)/etc/luarocks
 LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua
 LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC
 ifeq ($(BR2_PACKAGE_LUA_5_3),y)
@@ -19,9 +19,9 @@ LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2
 endif
 
 HOST_LUAROCKS_CONF_OPTS = \
-	--prefix=$(HOST_DIR)/usr \
+	--prefix=$(HOST_DIR) \
 	--sysconfdir=$(LUAROCKS_CONFIG_DIR) \
-	--with-lua=$(HOST_DIR)/usr
+	--with-lua=$(HOST_DIR)
 
 ifeq ($(BR2_PACKAGE_LUAJIT),y)
 HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit
@@ -34,7 +34,7 @@ endef
 define HOST_LUAROCKS_INSTALL_CMDS
 	rm -f $(LUAROCKS_CONFIG_FILE)
 	$(MAKE1) -C $(@D) install \
-		PREFIX=$(HOST_DIR)/usr
+		PREFIX=$(HOST_DIR)
 	echo "-- BR cross-compilation"                          >> $(LUAROCKS_CONFIG_FILE)
 	echo "variables = {"                                    >> $(LUAROCKS_CONFIG_FILE)
 	echo "   LUA_INCDIR = [[$(STAGING_DIR)/usr/include]],"  >> $(LUAROCKS_CONFIG_FILE)
@@ -53,8 +53,8 @@ endef
 
 $(eval $(host-generic-package))
 
-LUAROCKS_RUN_ENV = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua"
-LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks
+LUAROCKS_RUN_ENV = LUA_PATH="$(HOST_DIR)/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua"
+LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/bin/luarocks
 
 define LUAROCKS_FINALIZE_TARGET
 	rm -rf $(TARGET_DIR)/usr/lib/luarocks
diff --git a/bsp/buildroot/package/luasec/Config.in b/bsp/buildroot/package/luasec/Config.in
index a8cc9c97..9391cd9d 100644
--- a/bsp/buildroot/package/luasec/Config.in
+++ b/bsp/buildroot/package/luasec/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_LUASEC
 	bool "luasec"
+	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LUASOCKET
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
 	  LuaSec is a binding for OpenSSL library to provide TLS/SSL
 	  communication.
diff --git a/bsp/buildroot/package/luasec/luasec.hash b/bsp/buildroot/package/luasec/luasec.hash
index 1e9f70ad..9d721ed4 100644
--- a/bsp/buildroot/package/luasec/luasec.hash
+++ b/bsp/buildroot/package/luasec/luasec.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	d2198cc39b3fa55bd5020046742b34093b6efcb619cf4032948b8c8556202a32  luasec-0.5-2.src.rock
+sha256	1d04e2f70bc055348dda3cc3566d27d8408094bc944aa5c6a4ae18bffe5c0007  luasec-0.6-1.src.rock
diff --git a/bsp/buildroot/package/luasec/luasec.mk b/bsp/buildroot/package/luasec/luasec.mk
index fd1f1cdb..28c4b2c6 100644
--- a/bsp/buildroot/package/luasec/luasec.mk
+++ b/bsp/buildroot/package/luasec/luasec.mk
@@ -4,8 +4,7 @@
 #
 ################################################################################
 
-LUASEC_VERSION_UPSTREAM = 0.5
-LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-2
+LUASEC_VERSION = 0.6-1
 LUASEC_SUBDIR = luasec
 LUASEC_LICENSE = MIT
 LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE
diff --git a/bsp/buildroot/package/luasql-sqlite3/Config.in b/bsp/buildroot/package/luasql-sqlite3/Config.in
index 3bd73f3b..483d6a0f 100644
--- a/bsp/buildroot/package/luasql-sqlite3/Config.in
+++ b/bsp/buildroot/package/luasql-sqlite3/Config.in
@@ -6,4 +6,3 @@ config BR2_PACKAGE_LUASQL_SQLITE3
 	  LuaSQL is a simple interface from Lua to a DBMS.
 
 	  http://www.keplerproject.org/luasql
-
diff --git a/bsp/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk b/bsp/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
index 23983a84..51178db2 100644
--- a/bsp/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
+++ b/bsp/buildroot/package/luasql-sqlite3/luasql-sqlite3.mk
@@ -7,7 +7,7 @@
 LUASQL_SQLITE3_VERSION = 2.3.0-1
 LUASQL_SQLITE3_SUBDIR = luasql
 LUASQL_SQLITE3_LICENSE = MIT
-LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/README
+LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/doc/us/license.html
 LUASQL_SQLITE3_DEPENDENCIES = sqlite
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch b/bsp/buildroot/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch
new file mode 100644
index 00000000..6096477c
--- /dev/null
+++ b/bsp/buildroot/package/lugaru/0001-ImageIO-fix-invalid-conversion.patch
@@ -0,0 +1,35 @@
+From 73e56ba8e91b6bae59220e6f25c1b7c15817edb5 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 12 Feb 2017 21:17:44 +0100
+Subject: [PATCH] ImageIO: fix invalid conversion
+
+Fixes:
+Source/Utils/ImageIO.cpp:125:27: error: invalid conversion from 'int' to 'boolean' [-fpermissive]
+     cinfo.quantize_colors = 0;
+                           ^
+
+quantize_colors type is bool, so it must be initialized to TRUE or FALSE.
+
+Patch status: upsteam
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ Source/Utils/ImageIO.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/Utils/ImageIO.cpp b/Source/Utils/ImageIO.cpp
+index 706c201..c19a63e 100644
+--- a/Source/Utils/ImageIO.cpp
++++ b/Source/Utils/ImageIO.cpp
+@@ -122,7 +122,7 @@ static bool load_jpg(const char* file_name, ImageRec& tex)
+     (void)jpeg_read_header(&cinfo, TRUE);
+ 
+     cinfo.out_color_space = JCS_RGB;
+-    cinfo.quantize_colors = 0;
++    cinfo.quantize_colors = FALSE;
+     (void)jpeg_calc_output_dimensions(&cinfo);
+     (void)jpeg_start_decompress(&cinfo);
+ 
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch b/bsp/buildroot/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
new file mode 100644
index 00000000..9c362a98
--- /dev/null
+++ b/bsp/buildroot/package/lugaru/0002-Fix-mismatched-usage-length-build-fail-on-g.patch
@@ -0,0 +1,58 @@
+From 5a0c9f6358169b447840acdb721250ce932cb180 Mon Sep 17 00:00:00 2001
+From: Martin Erik Werner <martinerikwerner@gmail.com>
+Date: Wed, 8 Mar 2017 22:51:16 +0100
+Subject: [PATCH] Fix mismatched usage length, build fail on g++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The length of const option::Descriptor usage[] is intended to be
+inferred based on the initialisation in Source/main.cpp, however, the
+extern declaration in Source/Game.hpp hard-codes it to 13.
+
+Remove the hard-coded 13 in the extern declaration, in favour of the
+inferred length.
+
+This also fixes the follwoing build failure with g++ (Debian 4.9.2-10)
+4.9.2:
+(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::index’
+     };
+     ^
+(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::index’ [-Wmissing-field-initializers]
+(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::type’
+(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::type’ [-Wmissing-field-initializers]
+(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::shortopt’
+(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::shortopt’ [-Wmissing-field-initializers]
+(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::longopt’
+(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::longopt’ [-Wmissing-field-initializers]
+(...)/Source/main.cpp:602:5: error: uninitialized const member ‘option::Descriptor::check_arg’
+(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::check_arg’ [-Wmissing-field-initializers]
+(...)/Source/main.cpp:602:5: warning: missing initializer for member ‘option::Descriptor::help’ [-Wmissing-field-initializers]
+CMakeFiles/lugaru.dir/build.make:54: recipe for target 'CMakeFiles/lugaru.dir/Source/main.cpp.o' failed
+
+Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com>
+
+[Romain: backport to v1.2]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+
+(cherry picked from commit dd685fe9080c2853422d8272792691358ea07dfc)
+---
+ Source/Game.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/Game.hpp b/Source/Game.hpp
+index 51232cc..9bb6adb 100644
+--- a/Source/Game.hpp
++++ b/Source/Game.hpp
+@@ -234,7 +234,7 @@ enum optionIndex
+ /* Number of options + 1 */
+ const int commandLineOptionsNumber = 10;
+ 
+-extern const option::Descriptor usage[13];
++extern const option::Descriptor usage[];
+ 
+ extern option::Option commandLineOptions[commandLineOptionsNumber];
+ extern option::Option* commandLineOptionsBuffer;
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/lugaru/Config.in b/bsp/buildroot/package/lugaru/Config.in
new file mode 100644
index 00000000..521c89ae
--- /dev/null
+++ b/bsp/buildroot/package/lugaru/Config.in
@@ -0,0 +1,38 @@
+config BR2_PACKAGE_LUGARU
+	bool "lugaru"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_HAS_LIBGL # libglu
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_XORG7 # SDL2 OpenGL (GLX)
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
+	depends on BR2_USE_MMU # SDL2 OpenGL (GLX)
+	depends on !BR2_STATIC_LIBS # SDL2
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_LIBGLU # GL/glu.h
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_OPENAL
+	select BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_SDL2_OPENGL
+	select BR2_PACKAGE_ZLIB
+	help
+	  Lugaru (pronounced Loo-GAH-roo) is a cross-platform
+	  third-person action game. The main character, Turner, is an
+	  anthropomorphic rebel bunny rabbit with impressive combat
+	  skills. In his quest to find those responsible for
+	  slaughtering his village, he uncovers a far-reaching
+	  conspiracy involving the corrupt leaders of the rabbit
+	  republic and the starving wolves from a nearby den. Turner
+	  takes it upon himself to fight against their plot and save
+	  his fellow rabbits from slavery.
+
+	  https://osslugaru.gitlab.io/
+
+comment "lugaru needs X11 and a toolchain w/ C++, OpenGL backend, gcc >= 4.7, NPTL, dynamic library"
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+		BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/lugaru/lugaru.hash b/bsp/buildroot/package/lugaru/lugaru.hash
new file mode 100644
index 00000000..6ba2bca6
--- /dev/null
+++ b/bsp/buildroot/package/lugaru/lugaru.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 f3ea477caf78911c69939fbdc163f9f6517c7ef2267e716a0e050be1a166ef97 lugaru-1.2.tar.xz
diff --git a/bsp/buildroot/package/lugaru/lugaru.mk b/bsp/buildroot/package/lugaru/lugaru.mk
new file mode 100644
index 00000000..53797f40
--- /dev/null
+++ b/bsp/buildroot/package/lugaru/lugaru.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# lugaru
+#
+################################################################################
+
+LUGARU_VERSION = 1.2
+LUGARU_SITE = https://bitbucket.org/osslugaru/lugaru/downloads
+LUGARU_SOURCE = lugaru-$(LUGARU_VERSION).tar.xz
+
+LUGARU_LICENSE = GPL-2.0+, CC-BY-SA-3.0 (Wolfire and Slib assets), \
+	CC-BY-SA-4.0 (OSS Lugaru, Jendraz and Philtron R. assets)
+LUGARU_LICENSE_FILES = COPYING.txt CONTENT-LICENSE.txt
+
+LUGARU_DEPENDENCIES = host-pkgconf jpeg libgl libglu libpng libvorbis \
+	openal sdl2 zlib
+
+# Avoid incompatible posix_memalign declaration on x86 and x86_64 with
+# musl.
+# https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_i386)$(BR2_x86_64),y:y)
+define LUGARU_REMOVE_PEDANTIC
+	$(SED) 's% -pedantic%%' $(@D)/CMakeLists.txt
+endef
+LUGARU_POST_PATCH_HOOKS += LUGARU_REMOVE_PEDANTIC
+endif
+
+LUGARU_CONF_OPTS = -DSYSTEM_INSTALL=ON
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/luksmeta/Config.in b/bsp/buildroot/package/luksmeta/Config.in
new file mode 100644
index 00000000..ddc9b6f3
--- /dev/null
+++ b/bsp/buildroot/package/luksmeta/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_LUKSMETA
+	bool "luksmeta"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # cryptsetup -> lvm2
+	depends on BR2_USE_MMU # cryptsetup -> lvm2
+	depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c
+	select BR2_PACKAGE_CRYPTSETUP
+	help
+	  LUKSMeta is a simple library and utility for storing
+	  metadata in the LUKSv1 header.
+
+	  https://github.com/latchset/luksmeta
+
+comment "luksmeta needs a toolchain w/ threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/luksmeta/luksmeta.hash b/bsp/buildroot/package/luksmeta/luksmeta.hash
new file mode 100644
index 00000000..f5d75640
--- /dev/null
+++ b/bsp/buildroot/package/luksmeta/luksmeta.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 0154af98e7302a172060d83d24b6d87557a822c39ba3e911461bb1a6d3a22d51  luksmeta-8.tar.bz2
+sha256 4b72eb6b5a336cd3ec837cc2d6347c23bf7574168db6b4802267700b93021abf  COPYING
diff --git a/bsp/buildroot/package/luksmeta/luksmeta.mk b/bsp/buildroot/package/luksmeta/luksmeta.mk
new file mode 100644
index 00000000..33671e46
--- /dev/null
+++ b/bsp/buildroot/package/luksmeta/luksmeta.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# luksmeta
+#
+################################################################################
+
+LUKSMETA_VERSION = 8
+LUKSMETA_SOURCE = luksmeta-$(LUKSMETA_VERSION).tar.bz2
+LUKSMETA_SITE = https://github.com/latchset/luksmeta/releases/download/v$(LUKSMETA_VERSION)
+LUKSMETA_LICENSE = LGPL-2.1+
+LUKSMETA_LICENSE_FILES = COPYING
+LUKSMETA_DEPENDENCIES = host-pkgconf cryptsetup
+LUKSMETA_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lunit/lunit.mk b/bsp/buildroot/package/lunit/lunit.mk
index 3c557f87..34e22db7 100644
--- a/bsp/buildroot/package/lunit/lunit.mk
+++ b/bsp/buildroot/package/lunit/lunit.mk
@@ -4,9 +4,7 @@
 #
 ################################################################################
 
-LUNIT_VERSION_UPSTREAM = 0.5
-LUNIT_VERSION = $(LUNIT_VERSION_UPSTREAM)-2
-LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM)
+LUNIT_VERSION = 0.5-2
 LUNIT_LICENSE = MIT
 LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE
 
diff --git a/bsp/buildroot/package/lutok/Config.in b/bsp/buildroot/package/lutok/Config.in
index d6c87cf5..ab9c32b6 100644
--- a/bsp/buildroot/package/lutok/Config.in
+++ b/bsp/buildroot/package/lutok/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LUTOK
 	bool "lutok"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
 	depends on !BR2_PACKAGE_LUAJIT
 	help
 	  Lutok is a lightweight C++ API library for Lua.
diff --git a/bsp/buildroot/package/lutok/lutok.mk b/bsp/buildroot/package/lutok/lutok.mk
index 6ee198b4..41abddb0 100644
--- a/bsp/buildroot/package/lutok/lutok.mk
+++ b/bsp/buildroot/package/lutok/lutok.mk
@@ -10,7 +10,7 @@ LUTOK_INSTALL_STAGING = YES
 LUTOK_DEPENDENCIES = host-pkgconf lua
 # --without-atf disables the atf-based lutok tests
 LUTOK_CONF_OPTS = --without-doxygen --without-atf
-LUTOK_LICENSE = BSD-3c
+LUTOK_LICENSE = BSD-3-Clause
 LUTOK_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/luv/Config.in b/bsp/buildroot/package/luv/Config.in
index e9d01099..434cb3b4 100644
--- a/bsp/buildroot/package/luv/Config.in
+++ b/bsp/buildroot/package/luv/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_LUV
 	bool "luv"
-	select BR2_PACKAGE_LIBUV
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
 	depends on BR2_USE_MMU # libuv
 	depends on !BR2_STATIC_LIBS # libuv
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv
+	select BR2_PACKAGE_LIBUV
 	help
 	  libuv bindings for LuaJIT and Lua.
 
diff --git a/bsp/buildroot/package/luv/luv.hash b/bsp/buildroot/package/luv/luv.hash
index 140fe963..44f4048d 100644
--- a/bsp/buildroot/package/luv/luv.hash
+++ b/bsp/buildroot/package/luv/luv.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  2eab80360f8ab6793612bb59d067a56664ac9a5a14988e0a09a53d0bff20c131  luv-1.9.1-0.tar.gz
+sha256 1051cfbdc361d5ea6d978fd71273b94c8a5007d76af498b456b297b18de9622c  luv-1.9.1-1.tar.gz
diff --git a/bsp/buildroot/package/luv/luv.mk b/bsp/buildroot/package/luv/luv.mk
index 43cecf57..633bfe68 100644
--- a/bsp/buildroot/package/luv/luv.mk
+++ b/bsp/buildroot/package/luv/luv.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUV_VERSION = 1.9.1-0
+LUV_VERSION = 1.9.1-1
 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION)
 LUV_LICENSE = Apache-2.0
 LUV_LICENSE_FILES = LICENSE.txt
diff --git a/bsp/buildroot/package/luvi/Config.in b/bsp/buildroot/package/luvi/Config.in
index a9dd2ef7..c9fd4173 100644
--- a/bsp/buildroot/package/luvi/Config.in
+++ b/bsp/buildroot/package/luvi/Config.in
@@ -8,15 +8,16 @@ config BR2_PACKAGE_LUVI
 	select BR2_PACKAGE_LIBUV
 	select BR2_PACKAGE_LUV
 	help
-	  A project in-between luv and luvit. The goal of this is to make
-	  building luvit and derivatives much easier.
+	  A project in-between luv and luvit. The goal of this is to
+	  make building luvit and derivatives much easier.
 
 	  luvi extends LuaJIT with asynchronous I/O and several optional
-	  modules to run Lua applications and build self-contained binaries
-	  on systems that don't have a compiler.
+	  modules to run Lua applications and build self-contained
+	  binaries on systems that don't have a compiler.
 
-	  The luvi core can be extended with several Lua modules by adding its
-	  bundled Lua binding libraries. To get the Lua module...
+	  The luvi core can be extended with several Lua modules by
+	  adding its bundled Lua binding libraries.
+	  To get the Lua module...
 	    * 'rex' select PCRE (BR2_PACKAGE_PCRE)
 	    * 'ssl' select OpenSSL (BR2_PACKAGE_OPENSSL)
 	    * 'zlib' select zlib (BR2_PACKAGE_ZLIB)
diff --git a/bsp/buildroot/package/luvi/luvi.hash b/bsp/buildroot/package/luvi/luvi.hash
index 99fd69e7..e2239b61 100644
--- a/bsp/buildroot/package/luvi/luvi.hash
+++ b/bsp/buildroot/package/luvi/luvi.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  b36a3b96ec5852398338bc38567c5bb589783487c65130e1d702ff98fac3a6b7  luvi-src-v2.7.5.tar.gz
+sha256  ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42  luvi-src-v2.7.6.tar.gz
diff --git a/bsp/buildroot/package/luvi/luvi.mk b/bsp/buildroot/package/luvi/luvi.mk
index ade63f5f..a2bc218e 100644
--- a/bsp/buildroot/package/luvi/luvi.mk
+++ b/bsp/buildroot/package/luvi/luvi.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LUVI_VERSION = v2.7.5
+LUVI_VERSION = v2.7.6
 LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz
 LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
 LUVI_LICENSE = Apache-2.0
@@ -33,7 +33,7 @@ LUVI_CONF_OPTS = \
 	-DBUILD_SHARED_LIBS=OFF \
 	-DWithSharedLibluv=ON \
 	-DTARGET_ARCH=$(LUVI_TARGET_ARCH) \
-	-DLUA_PATH=$(HOST_DIR)/usr/share/luajit-2.0.4/?.lua
+	-DLUA_PATH=$(HOST_DIR)/share/luajit-$(LUAJIT_VERSION)/?.lua
 
 # Add "rex" module (PCRE via bundled lrexlib)
 ifeq ($(BR2_PACKAGE_PCRE),y)
diff --git a/bsp/buildroot/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch b/bsp/buildroot/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
new file mode 100644
index 00000000..8ca39c2c
--- /dev/null
+++ b/bsp/buildroot/package/lvm2/0001-configure-Introduce-enable-symvers-option.patch
@@ -0,0 +1,277 @@
+From f563334a76e31442f7b8693d2d350e6981c51c46 Mon Sep 17 00:00:00 2001
+From: Marcin Niestroj <m.niestroj@grinn-global.com>
+Date: Fri, 20 Jul 2018 14:26:44 +0200
+Subject: [PATCH] configure: Introduce --enable-symvers option
+
+Only few libc (e.g. glibc) libraries support full symbol version
+resolution in runtime. There are lot of standard libraries that do not
+support that, such as dietlibc, musl and uclibc. Hence there is no
+reason to generate symbol versions when compiling against them.
+
+Additionally libdevmapper.so was broken when compiled against
+uclibc. Runtime linker loader caused calling dm_task_get_info_base()
+function recursively, leading to segmentation fault.
+
+Introduce --enable-symvers[=STYLE] option, which allows to choose
+between gnu and disabled symbol versioning. By default gnu symbol
+versioning is used to provide backward compatibility.
+__GNUC__ check is replaced now with GNU_SYMVER, which is generated by
+configure script. Additionally ld version script is included only in
+case of gnu option, which slightly reduces output size.
+
+Providing --disable-symvers to configure script when building against
+uclibc library fixes segmentation fault error described above, due to
+lack of several versions of the same symbol in libdevmapper.so
+library.
+
+Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
+---
+ configure                 | 32 ++++++++++++++++++++++++++++++--
+ configure.in              | 28 +++++++++++++++++++++++++---
+ include/configure.h.in    |  3 +++
+ lib/misc/lib.h            | 10 +++++-----
+ libdm/datastruct/bitset.c |  5 +----
+ libdm/ioctl/libdm-iface.c |  2 +-
+ libdm/libdm-deptree.c     |  2 +-
+ libdm/libdm-stats.c       |  2 +-
+ 8 files changed, 67 insertions(+), 17 deletions(-)
+
+diff --git a/configure b/configure
+index e1ae0e884..c5d11c1b6 100755
+--- a/configure
++++ b/configure
+@@ -985,6 +985,7 @@ enable_fsadm
+ enable_blkdeactivate
+ enable_dmeventd
+ enable_selinux
++enable_symvers
+ enable_nls
+ with_localedir
+ with_confdir
+@@ -1729,6 +1730,9 @@ Optional Features:
+   --disable-blkdeactivate disable blkdeactivate
+   --enable-dmeventd       enable the device-mapper event daemon
+   --disable-selinux       disable selinux support
++  --enable-symvers[=STYLE]
++                          enables symbol versioning of the shared library
++                          [default=gnu]
+   --enable-nls            enable Native Language Support
+ 
+ Optional Packages:
+@@ -3169,7 +3173,6 @@ if test -z "$CFLAGS"; then :
+ fi
+ case "$host_os" in
+ 	linux*)
+-		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ 		ELDFLAGS="-Wl,--export-dynamic"
+ 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+@@ -3190,7 +3193,6 @@ case "$host_os" in
+ 		;;
+ 	darwin*)
+ 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+-		CLDFLAGS="$CLDFLAGS"
+ 		ELDFLAGS=
+ 		CLDWHOLEARCHIVE="-all_load"
+ 		CLDNOWHOLEARCHIVE=
+@@ -14609,6 +14611,32 @@ done
+ 	LIBS=$lvm_saved_libs
+ fi
+ 
++################################################################################
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable symbol versioning" >&5
++$as_echo_n "checking whether to enable symbol versioning... " >&6; }
++# Check whether --enable-symvers was given.
++if test "${enable_symvers+set}" = set; then :
++  enableval=$enable_symvers;
++  case "$enableval" in
++    gnu|no) ;;
++    *) as_fn_error $? "Unknown argument to enable/disable symvers" "$LINENO" 5 ;;
++  esac
++else
++  enable_symvers=gnu
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_symvers" >&5
++$as_echo "$enable_symvers" >&6; }
++
++if test x$GCC = xyes && test x$enable_symvers = xgnu ; then
++
++$as_echo "#define GNU_SYMVER 1" >>confdefs.h
++
++  case "$host_os" in
++    linux*) CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" ;;
++  esac
++fi
++
+ ################################################################################
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalisation" >&5
+ $as_echo_n "checking whether to enable internationalisation... " >&6; }
+diff --git a/configure.in b/configure.in
+index 2e5e015c8..09c390850 100644
+--- a/configure.in
++++ b/configure.in
+@@ -30,12 +30,10 @@ AC_CANONICAL_TARGET([])
+ AS_IF([test -z "$CFLAGS"], [COPTIMISE_FLAG="-O2"])
+ case "$host_os" in
+ 	linux*)
+-		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
+ 		ELDFLAGS="-Wl,--export-dynamic"
+ 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
+ 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
+ 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
+-		LDDEPS="$LDDEPS .export.sym"
+ 		LIB_SUFFIX=so
+ 		DEVMAPPER=yes
+ 		BUILD_LVMETAD=no
+@@ -51,7 +49,6 @@ case "$host_os" in
+ 		;;
+ 	darwin*)
+ 		CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
+-		CLDFLAGS="$CLDFLAGS"
+ 		ELDFLAGS=
+ 		CLDWHOLEARCHIVE="-all_load"
+ 		CLDNOWHOLEARCHIVE=
+@@ -1742,6 +1739,31 @@ package as well (which may be called readline-devel or something similar).])
+ 	LIBS=$lvm_saved_libs
+ fi
+ 
++################################################################################
++dnl -- Symbol versioning
++AC_MSG_CHECKING(whether to enable symbol versioning)
++AC_ARG_ENABLE(symvers,
++              AC_HELP_STRING([--enable-symvers[[[=STYLE]]]],
++                             [enables symbol versioning of the shared library [default=gnu]]),
++                             [
++  case "$enableval" in
++    gnu|no) ;;
++    *) AC_MSG_ERROR(Unknown argument to enable/disable symvers) ;;
++  esac],
++                             enable_symvers=gnu)
++AC_MSG_RESULT($enable_symvers)
++
++if test x$GCC = xyes && test x$enable_symvers = xgnu ; then
++  AC_DEFINE(GNU_SYMVER, 1,
++            [Define to use GNU versioning in the shared library.])
++  case "$host_os" in
++    linux*)
++      CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
++      LDDEPS="$LDDEPS .export.sym"
++      ;;
++  esac
++fi
++
+ ################################################################################
+ dnl -- Internationalisation stuff
+ AC_MSG_CHECKING(whether to enable internationalisation)
+diff --git a/include/configure.h.in b/include/configure.h.in
+index 51726506c..3fc181b1e 100644
+--- a/include/configure.h.in
++++ b/include/configure.h.in
+@@ -151,6 +151,9 @@
+ /* Path to fsadm binary. */
+ #undef FSADM_PATH
+ 
++/* Define to use GNU versioning in the shared library. */
++#undef GNU_SYMVER
++
+ /* Define to 1 if you have the `alarm' function. */
+ #undef HAVE_ALARM
+ 
+diff --git a/lib/misc/lib.h b/lib/misc/lib.h
+index 8ed06f81d..9b3ce8a03 100644
+--- a/lib/misc/lib.h
++++ b/lib/misc/lib.h
+@@ -42,16 +42,16 @@
+  * macro DM_EXPORT_SYMBOL to export the function and bind it to the
+  * specified version string.
+  *
+- * Since versioning is only available when compiling with GCC the entire
+- * compatibility version should be enclosed in '#if defined(__GNUC__)',
+- * for example:
++ * Since versioning is only available when compiling with GCC
++ * and GLIBC the entire compatibility version should be enclosed
++ * in '#if defined(GNU_SYMVER)', for example:
+  *
+  *   int dm_foo(int bar)
+  *   {
+  *     return bar;
+  *   }
+  *
+- *   #if defined(__GNUC__)
++ *   #if defined(GNU_SYMVER)
+  *   // Backward compatible dm_foo() version 1.02.104
+  *   int dm_foo_v1_02_104(void);
+  *   int dm_foo_v1_02_104(void)
+@@ -68,7 +68,7 @@
+  * versions of library symbols prior to the introduction of symbol
+  * versioning: it must never be used for new symbols.
+  */
+-#if defined(__GNUC__)
++#if defined(GNU_SYMVER)
+ #define DM_EXPORT_SYMBOL(func, ver) \
+ 	__asm__(".symver " #func "_v" #ver ", " #func "@DM_" #ver )
+ #define DM_EXPORT_SYMBOL_BASE(func) \
+diff --git a/libdm/datastruct/bitset.c b/libdm/datastruct/bitset.c
+index b0826e1eb..2ec3f8f84 100644
+--- a/libdm/datastruct/bitset.c
++++ b/libdm/datastruct/bitset.c
+@@ -242,7 +242,7 @@ bad:
+ 	return NULL;
+ }
+ 
+-#if defined(__GNUC__)
++#if defined(GNU_SYMVER)
+ /*
+  * Maintain backward compatibility with older versions that did not
+  * accept a 'min_num_bits' argument to dm_bitset_parse_list().
+@@ -253,7 +253,4 @@ dm_bitset_t dm_bitset_parse_list_v1_02_129(const char *str, struct dm_pool *mem)
+ 	return dm_bitset_parse_list(str, mem, 0);
+ }
+ DM_EXPORT_SYMBOL(dm_bitset_parse_list, 1_02_129);
+-
+-#else /* if defined(__GNUC__) */
+-
+ #endif
+diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
+index c47e08467..b98afb15d 100644
+--- a/libdm/ioctl/libdm-iface.c
++++ b/libdm/ioctl/libdm-iface.c
+@@ -2137,7 +2137,7 @@ void dm_lib_exit(void)
+ 	_version_checked = 0;
+ }
+ 
+-#if defined(__GNUC__)
++#if defined(GNU_SYMVER)
+ /*
+  * Maintain binary backward compatibility.
+  * Version script mechanism works with 'gcc' compatible compilers only.
+diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
+index cf4fd62e7..474871da5 100644
+--- a/libdm/libdm-deptree.c
++++ b/libdm/libdm-deptree.c
+@@ -4110,7 +4110,7 @@ void dm_tree_node_set_callback(struct dm_tree_node *dnode,
+ 	dnode->callback_data = data;
+ }
+ 
+-#if defined(__GNUC__)
++#if defined(GNU_SYMVER)
+ /*
+  * Backward compatible implementations.
+  *
+diff --git a/libdm/libdm-stats.c b/libdm/libdm-stats.c
+index bc498675f..d424928c7 100644
+--- a/libdm/libdm-stats.c
++++ b/libdm/libdm-stats.c
+@@ -5064,7 +5064,7 @@ int dm_stats_start_filemapd(int fd, uint64_t group_id, const char *path,
+  * current dm_stats_create_region() version.
+  */
+ 
+-#if defined(__GNUC__)
++#if defined(GNU_SYMVER)
+ int dm_stats_create_region_v1_02_106(struct dm_stats *dms, uint64_t *region_id,
+ 				     uint64_t start, uint64_t len, int64_t step,
+ 				     int precise, const char *program_id,
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/lvm2/Config.in b/bsp/buildroot/package/lvm2/Config.in
index 23dff707..0dd6d53b 100644
--- a/bsp/buildroot/package/lvm2/Config.in
+++ b/bsp/buildroot/package/lvm2/Config.in
@@ -3,39 +3,51 @@ config BR2_PACKAGE_LVM2
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # needs fork()
 	depends on !BR2_STATIC_LIBS # It fails to build statically
-	# http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  This is LVM2, the rewrite of The Linux Logical Volume Manager.
-	  LVM supports enterprise level volume management of disk and disk
-	  subsystems by grouping arbitrary disks into volume groups. The total
-	  capacity of volume groups can be allocated to logical volumes, which
-	  are accessed as regular block devices.
+	  LVM supports enterprise level volume management of disk and
+	  disk subsystems by grouping arbitrary disks into volume
+	  groups. The total capacity of volume groups can be allocated
+	  to logical volumes, which are accessed as regular block
+	  devices.
 
 	  The Linux Kernel Device Mapper is the LVM
 	  (Linux Logical Volume Management) Team's implementation of a
-	  minimalistic kernel-space driver that handles volume management,
-	  while keeping knowledge of the underlying device layout in
-	  user-space. This makes it useful for not only LVM, but EVMS,
-	  software raid, and other drivers that create "virtual" block devices.
+	  minimalistic kernel-space driver that handles volume
+	  management, while keeping knowledge of the underlying device
+	  layout in user-space. This makes it useful for not only LVM,
+	  but EVMS, software raid, and other drivers that create
+	  "virtual" block devices.
+
+	  http://www.sourceware.org/lvm2/
 
 if BR2_PACKAGE_LVM2
 
 config BR2_PACKAGE_LVM2_STANDARD_INSTALL
 	bool "standard install instead of only dmsetup"
 	default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11
+	# http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html
+	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
-	  Install the standard suite of lvm2 programs. When this option is not
-	  set, only dmsetup is installed.
+	  Install the standard suite of lvm2 programs. When this option
+	  is not set, only dmsetup is installed.
+
+comment "lvm2 standard install needs a glibc or uClibc toolchain"
+	depends on BR2_TOOLCHAIN_USES_MUSL
 
 config BR2_PACKAGE_LVM2_APP_LIBRARY
 	bool "install application library"
+	# http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html
+	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_LVM2_STANDARD_INSTALL
 	help
 	  Install application library (liblvm2app).
 
+comment "lvm2 application library needs a glibc or uClibc toolchain"
+	depends on BR2_TOOLCHAIN_USES_MUSL
+
 endif
 
-comment "lvm2 needs a glibc or uClibc toolchain w/ threads, dynamic library"
+comment "lvm2 needs a toolchain w/ threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/lvm2/lvm2.hash b/bsp/buildroot/package/lvm2/lvm2.hash
index 3619af87..b0dfcfce 100644
--- a/bsp/buildroot/package/lvm2/lvm2.hash
+++ b/bsp/buildroot/package/lvm2/lvm2.hash
@@ -1,2 +1,5 @@
 # From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum
-sha512 ebff909e1c81919967373c55c7a95ba13ef4e0536b8ef1c28ed7e1c1eb9b9fd406a649d93b141822b24675ebece5a722247737c4e869fb7fb5eeb881a7f9102d  LVM2.2.02.168.tgz
+sha512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e  LVM2.2.02.173.tgz
+# Locally computed sha256 checksums
+sha256 e76fbcd2fb97cf202da330301327754d2db5c58b5b4bebd3a8a749393e7603d1  COPYING
+sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a  COPYING.LIB
diff --git a/bsp/buildroot/package/lvm2/lvm2.mk b/bsp/buildroot/package/lvm2/lvm2.mk
index a2d484bc..ccdc2c38 100644
--- a/bsp/buildroot/package/lvm2/lvm2.mk
+++ b/bsp/buildroot/package/lvm2/lvm2.mk
@@ -4,20 +4,25 @@
 #
 ################################################################################
 
-LVM2_VERSION = 2.02.168
+LVM2_VERSION = 2.02.173
 LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
 LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
 LVM2_INSTALL_STAGING = YES
-LVM2_LICENSE = GPLv2, LGPLv2.1
+LVM2_LICENSE = GPL-2.0, LGPL-2.1
 LVM2_LICENSE_FILES = COPYING COPYING.LIB
 
 # Make sure that binaries and libraries are installed with write
-# permissions for the owner.
+# permissions for the owner. We disable NLS because it's broken, and
+# the package anyway doesn't provide any translation files.
 LVM2_CONF_OPTS += \
 	--enable-write_install \
 	--enable-pkgconfig \
 	--enable-cmdlib \
-	--enable-dmeventd
+	--enable-dmeventd \
+	--disable-nls \
+	--disable-symvers
+
+LVM2_DEPENDENCIES += host-pkgconf
 
 # LVM2 uses autoconf, but not automake, and the build system does not
 # take into account the toolchain passed at configure time.
@@ -31,6 +36,13 @@ else
 LVM2_CONF_OPTS += --disable-readline
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+LVM2_CONF_OPTS += --enable-selinux
+LVM2_DEPENDENCIES += libselinux
+else
+LVM2_CONF_OPTS += --disable-selinux
+endif
+
 ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
 LVM2_MAKE_OPTS = device-mapper
 LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper
@@ -47,4 +59,18 @@ ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),)
 LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no
 endif
 
+HOST_LVM2_DEPENDENCIES = host-pkgconf
+HOST_LVM2_CONF_OPTS = \
+	--enable-write_install \
+	--enable-pkgconfig \
+	--disable-cmdlib \
+	--disable-dmeventd \
+	--disable-applib \
+	--disable-fsadm \
+	--disable-readline \
+	--disable-selinux
+HOST_LVM2_MAKE_OPTS = device-mapper
+HOST_LVM2_INSTALL_OPTS = install_device-mapper
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch b/bsp/buildroot/package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch
new file mode 100644
index 00000000..031f7753
--- /dev/null
+++ b/bsp/buildroot/package/lxc/0001-Fix-compilation-on-toolchain-without-prlimit.patch
@@ -0,0 +1,98 @@
+From f48b5fd8ab03c200eaf5e3a9b03bcd01b2659cf3 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Thu, 2 Nov 2017 16:00:33 +0100
+Subject: [PATCH] Fix compilation on toolchain without prlimit
+
+Some toolchains which are not bionic like uclibc does not support
+prlimit or prlimit64. In this case, return an error.
+Moreover, if prlimit64 is available, use lxc implementation of prlimit.
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac        |  4 ++++
+ src/lxc/Makefile.am |  6 ++++++
+ src/lxc/conf.c      | 12 +++++++++---
+ 3 files changed, 19 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 642b78e7..63df7466 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -671,6 +671,10 @@ AC_CHECK_FUNCS([prlimit],
+ 	AM_CONDITIONAL(HAVE_PRLIMIT, true)
+ 	AC_DEFINE(HAVE_PRLIMIT,1,[Have prlimit]),
+ 	AM_CONDITIONAL(HAVE_PRLIMIT, false))
++AC_CHECK_FUNCS([prlimit64],
++	AM_CONDITIONAL(HAVE_PRLIMIT64, true)
++	AC_DEFINE(HAVE_PRLIMIT64,1,[Have prlimit64]),
++	AM_CONDITIONAL(HAVE_PRLIMIT64, false))
+ 
+ # Check for some libraries
+ AC_SEARCH_LIBS(sem_open, [rt pthread])
+diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
+index fff32ae4..8f0c11ec 100644
+--- a/src/lxc/Makefile.am
++++ b/src/lxc/Makefile.am
+@@ -45,7 +45,10 @@ noinst_HEADERS += \
+ 	../include/ifaddrs.h \
+ 	../include/openpty.h \
+ 	../include/lxcmntent.h
++endif
++
+ if !HAVE_PRLIMIT
++if HAVE_PRLIMIT64
+ noinst_HEADERS += ../include/prlimit.h
+ endif
+ endif
+@@ -143,7 +146,10 @@ liblxc_la_SOURCES += \
+ 	../include/ifaddrs.c ../include/ifaddrs.h \
+ 	../include/openpty.c ../include/openpty.h \
+ 	../include/lxcmntent.c ../include/lxcmntent.h
++endif
++
+ if !HAVE_PRLIMIT
++if HAVE_PRLIMIT64
+ liblxc_la_SOURCES += ../include/prlimit.c ../include/prlimit.h
+ endif
+ endif
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index 44d97843..8a66f2d0 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -97,13 +97,14 @@
+ 
+ #if IS_BIONIC
+ #include <../include/lxcmntent.h>
+-#ifndef HAVE_PRLIMIT
+-#include <../include/prlimit.h>
+-#endif
+ #else
+ #include <mntent.h>
+ #endif
+ 
++#if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64)
++#include <../include/prlimit.h>
++#endif
++
+ lxc_log_define(lxc_conf, lxc);
+ 
+ #if HAVE_LIBCAP
+@@ -2399,10 +2400,15 @@ int setup_resource_limits(struct lxc_list *limits, pid_t pid) {
+ 			return -1;
+ 		}
+ 
++#if HAVE_PRLIMIT || HAVE_PRLIMIT64
+ 		if (prlimit(pid, resid, &lim->limit, NULL) != 0) {
+ 			ERROR("failed to set limit %s: %s", lim->resource, strerror(errno));
+ 			return -1;
+ 		}
++#else
++		ERROR("Cannot set limit %s as prlimit is missing", lim->resource);
++		return -1;
++#endif
+ 	}
+ 	return 0;
+ }
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch b/bsp/buildroot/package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch
new file mode 100644
index 00000000..a11f7850
--- /dev/null
+++ b/bsp/buildroot/package/lxc/0002-lxc-start.c-Fix-legacy-PR_-G-S-ET_NO_NEW_PRIVS-handl.patch
@@ -0,0 +1,49 @@
+From 995accccbb07d59381aa60939cd44b41dc092dda Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Mon, 6 Nov 2017 09:35:48 +0100
+Subject: [PATCH] lxc/start.c: Fix legacy PR_{G,S}ET_NO_NEW_PRIVS handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The configure checks for these use AC_CHECK_DECLS, which define the symbol
+to 0 if not available - So adjust the code to match.  From the autoconf
+manual:
+
+https://www.gnu.org/software/autoconf/manual/autoconf-2.65/html_node/Generic-Declarations.html)
+
+For each of the symbols (comma-separated list), define HAVE_DECL_symbol (in
+all capitals) to ‘1’ if symbol is declared, otherwise to ‘0’.
+
+[Submitted upstream: https://github.com/lxc/lxc/pull/1901]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ src/lxc/start.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/lxc/start.c b/src/lxc/start.c
+index 2632a9b1..fe76b235 100644
+--- a/src/lxc/start.c
++++ b/src/lxc/start.c
+@@ -52,15 +52,15 @@
+ #include <sys/capability.h>
+ #endif
+ 
+-#ifndef HAVE_DECL_PR_CAPBSET_DROP
++#if !HAVE_DECL_PR_CAPBSET_DROP
+ #define PR_CAPBSET_DROP 24
+ #endif
+ 
+-#ifndef HAVE_DECL_PR_SET_NO_NEW_PRIVS
++#if !HAVE_DECL_PR_SET_NO_NEW_PRIVS
+ #define PR_SET_NO_NEW_PRIVS 38
+ #endif
+ 
+-#ifndef HAVE_DECL_PR_GET_NO_NEW_PRIVS
++#if !HAVE_DECL_PR_GET_NO_NEW_PRIVS
+ #define PR_GET_NO_NEW_PRIVS 39
+ #endif
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/lxc/Config.in b/bsp/buildroot/package/lxc/Config.in
index 6a39d2eb..d90e7885 100644
--- a/bsp/buildroot/package/lxc/Config.in
+++ b/bsp/buildroot/package/lxc/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_LXC
 	bool "lxc"
-	select BR2_PACKAGE_LIBCAP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	# build system forcefully builds a shared library
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call
 	help
-	  Linux Containers (LXC), provides the ability to group and isolate
-	  of a set of processes in a jail by virtualizing and accounting the
-	  kernel resources. It is similar to Linux-Vserver or Openvz.
+	  Linux Containers (LXC), provides the ability to group and
+	  isolate of a set of processes in a jail by virtualizing and
+	  accounting the kernel resources. It is similar to
+	  Linux-Vserver or Openvz.
 
 	  https://linuxcontainers.org/
 
diff --git a/bsp/buildroot/package/lxc/lxc.hash b/bsp/buildroot/package/lxc/lxc.hash
index f80c88d6..d8526e93 100644
--- a/bsp/buildroot/package/lxc/lxc.hash
+++ b/bsp/buildroot/package/lxc/lxc.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	1c09c075f06ec029f86fa6370c7d379494ff4c66a129eda17af7b7b41e055f5d	lxc-2.0.7.tar.gz
+sha256	68663a67450a8d6734e137eac54cc7077209fb15c456eec401a2c26e6386eff6	lxc-2.1.1.tar.gz
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
diff --git a/bsp/buildroot/package/lxc/lxc.mk b/bsp/buildroot/package/lxc/lxc.mk
index 455814b9..a65c1666 100644
--- a/bsp/buildroot/package/lxc/lxc.mk
+++ b/bsp/buildroot/package/lxc/lxc.mk
@@ -4,12 +4,14 @@
 #
 ################################################################################
 
-LXC_VERSION = 2.0.7
+LXC_VERSION = 2.1.1
 LXC_SITE = https://linuxcontainers.org/downloads/lxc
-LXC_LICENSE = LGPLv2.1+
+LXC_LICENSE = LGPL-2.1+
 LXC_LICENSE_FILES = COPYING
-LXC_DEPENDENCIES = libcap host-pkgconf
+LXC_DEPENDENCIES = host-pkgconf
 LXC_INSTALL_STAGING = YES
+# We're patching configure.ac
+LXC_AUTORECONF = YES
 
 LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
 	--disable-python --disable-werror \
@@ -22,6 +24,13 @@ else
 LXC_CONF_OPTS += --disable-gnutls
 endif
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+LXC_CONF_OPTS += --enable-capabilities
+LXC_DEPENDENCIES += libcap
+else
+LXC_CONF_OPTS += --disable-capabilities
+endif
+
 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
 LXC_CONF_OPTS += --enable-seccomp
 LXC_DEPENDENCIES += libseccomp
@@ -29,6 +38,13 @@ else
 LXC_CONF_OPTS += --disable-seccomp
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+LXC_CONF_OPTS += --enable-selinux
+LXC_DEPENDENCIES += libselinux
+else
+LXC_CONF_OPTS += --disable-selinux
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
 LXC_CONF_OPTS += --enable-lua
 LXC_DEPENDENCIES += luainterpreter
diff --git a/bsp/buildroot/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch b/bsp/buildroot/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch
new file mode 100644
index 00000000..cc057cee
--- /dev/null
+++ b/bsp/buildroot/package/lynx/0001-src-chrtrans-don-t-build-host-tools-with-target-LDFL.patch
@@ -0,0 +1,41 @@
+From bb47abe9e7996147f6b7b325f5c9b2143abf8f13 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Mon, 7 May 2018 22:00:52 +0200
+Subject: [PATCH] src/chrtrans: don't build host tools with target LDFLAGS
+
+In a cross-compilation context, the LDFLAGS variable contains linker
+flags used when building things for the target. However, the makeuctb
+tool is built for the host machine, and therefore should not use the
+same LDFLAGS as the target, which is why BUILD_LDFLAGS exist.
+
+Using LDFLAGS when building a tool for the host can cause problems
+when some flags in LDFLAGS are not supported by the host machine. For
+example, if you're linking statically lynx for the target, but the
+build machine does not support static linking:
+
+gcc -I../.. -I../../src -I../../src/chrtrans -I../../WWW/Library/Implementation -I../../     -static  -o makeuctb makeuctb.o
+/usr/bin/ld: cannot find -lc
+collect2: error: ld returned 1 exit status
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Upstream-status: submitted on the mailing list
+---
+ src/chrtrans/makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in
+index aab358f..6e0ef03 100644
+--- a/src/chrtrans/makefile.in
++++ b/src/chrtrans/makefile.in
+@@ -123,7 +123,7 @@ OBJS		= makeuctb$o
+ C_SRC		= $(OBJS:$o=.c)
+ 
+ $(MAKEUCTB) : $(OBJS)
+-	$(BUILD_CC) $(CC_OPTS) $(LDFLAGS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
++	$(BUILD_CC) $(CC_OPTS) $(BUILD_LDFLAGS) -o $@ $(OBJS) $(INTLLIB) $(BUILD_LIBS)
+ 
+ makeuctb$o : $(srcdir)/UCkd.h $(srcdir)/makeuctb.c
+ 
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/lynx/Config.in b/bsp/buildroot/package/lynx/Config.in
new file mode 100644
index 00000000..a338f836
--- /dev/null
+++ b/bsp/buildroot/package/lynx/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_LYNX
+	bool "lynx"
+	depends on BR2_USE_MMU
+	select BR2_PACKAGE_SLANG if !BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
+	help
+	  The Text Web-Browser.
+
+	  http://lynx.invisible-island.net/
diff --git a/bsp/buildroot/package/lynx/lynx.hash b/bsp/buildroot/package/lynx/lynx.hash
new file mode 100644
index 00000000..c39475aa
--- /dev/null
+++ b/bsp/buildroot/package/lynx/lynx.hash
@@ -0,0 +1,3 @@
+# Locally calculated:
+sha256  04318a100b052d079d0018fa371aa28cfb41ab68db3a959f3b75c2170eea1bc8  lynx2.8.9dev.16.tar.bz2
+sha256  8406a30ff3134ec23cf752d1ceda92ddaabbe41b4f2dc07ea3cfa139de12d6d6  COPYING
diff --git a/bsp/buildroot/package/lynx/lynx.mk b/bsp/buildroot/package/lynx/lynx.mk
new file mode 100644
index 00000000..a95326a1
--- /dev/null
+++ b/bsp/buildroot/package/lynx/lynx.mk
@@ -0,0 +1,38 @@
+################################################################################
+#
+# lynx
+#
+################################################################################
+
+LYNX_VERSION = 2.8.9dev.16
+LYNX_SOURCE = lynx$(LYNX_VERSION).tar.bz2
+LYNX_SITE = ftp://ftp.invisible-island.net/lynx/tarballs
+LYNX_LICENSE = GPL-2.0
+LYNX_LICENSE_FILES = COPYING
+
+LYNX_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+LYNX_DEPENDENCIES += ncurses
+LYNX_CONF_OPTS += --with-screen=ncurses$(if $(BR2_PACKAGE_NCURSES_WCHAR),w)
+else ifeq ($(BR2_PACKAGE_SLANG),y)
+LYNX_DEPENDENCIES += slang
+LYNX_CONF_OPTS += --with-screen=slang
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LYNX_DEPENDENCIES += openssl
+LYNX_CONF_OPTS += --with-ssl
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+LYNX_DEPENDENCIES += gnutls
+LYNX_CONF_OPTS += --with-gnutls
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+LYNX_DEPENDENCIES += zlib
+LYNX_CONF_OPTS += --with-zlib
+else
+LYNX_CONF_OPTS += --without-zlib
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/lz4/Config.in b/bsp/buildroot/package/lz4/Config.in
index 4a00a703..9f12299c 100644
--- a/bsp/buildroot/package/lz4/Config.in
+++ b/bsp/buildroot/package/lz4/Config.in
@@ -2,9 +2,9 @@ config BR2_PACKAGE_LZ4
 	bool "lz4"
 	help
 	  LZ4 is a very fast lossless compression algorithm, providing
-	  compression speed at 400 MB/s per core, scalable with multi-cores
-	  CPU. It also features an extremely fast decoder, with speed
-	  in multiple GB/s per core, typically reaching RAM speed limits
-	  on multi-core systems.
+	  compression speed at 400 MB/s per core, scalable with
+	  multi-cores CPU. It also features an extremely fast decoder,
+	  with speed in multiple GB/s per core, typically reaching RAM
+	  speed limits on multi-core systems.
 
 	  http://www.lz4.org/
diff --git a/bsp/buildroot/package/lz4/lz4.mk b/bsp/buildroot/package/lz4/lz4.mk
index 292bf4a2..de8c311a 100644
--- a/bsp/buildroot/package/lz4/lz4.mk
+++ b/bsp/buildroot/package/lz4/lz4.mk
@@ -7,7 +7,7 @@
 LZ4_VERSION = v1.7.5
 LZ4_SITE = $(call github,lz4,lz4,$(LZ4_VERSION))
 LZ4_INSTALL_STAGING = YES
-LZ4_LICENSE = BSD-2c (library), GPLv2+ (programs)
+LZ4_LICENSE = BSD-2-Clause (library), GPL-2.0+ (programs)
 LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING
 
 ifeq ($(BR2_STATIC_LIBS),y)
@@ -22,7 +22,7 @@ define HOST_LZ4_BUILD_CMDS
 endef
 
 define HOST_LZ4_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR)/usr \
+	$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) PREFIX=$(HOST_DIR) \
 		install -C $(@D)
 endef
 
diff --git a/bsp/buildroot/package/lzip/Config.in b/bsp/buildroot/package/lzip/Config.in
index 821cd262..d406e771 100644
--- a/bsp/buildroot/package/lzip/Config.in
+++ b/bsp/buildroot/package/lzip/Config.in
@@ -5,10 +5,11 @@ config BR2_PACKAGE_LZIP
 	bool "lzip"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Lzip is a lossless data compressor with a user interface similar
-	  to the one of gzip or bzip2.
+	  Lzip is a lossless data compressor with a user interface
+	  similar to the one of gzip or bzip2.
 	  Lzip is about as fast as gzip, compresses most files more than
-	  bzip2, and is better than both from a data recovery perspective.
-	  Lzip is a clean implementation of the LZMA algorithm.
+	  bzip2, and is better than both from a data recovery
+	  perspective. Lzip is a clean implementation of the LZMA
+	  algorithm.
 
 	  http://www.nongnu.org/lzip/lzip.html
diff --git a/bsp/buildroot/package/lzip/lzip.hash b/bsp/buildroot/package/lzip/lzip.hash
index 8855231f..e074c760 100644
--- a/bsp/buildroot/package/lzip/lzip.hash
+++ b/bsp/buildroot/package/lzip/lzip.hash
@@ -1,4 +1,2 @@
-# From http://lists.nongnu.org/archive/html/lzip-bug/2016-06/msg00002.html
-sha1	ef42f3209d02c3b3c217a61c8f127bcb8747b128	lzip-1.18.tar.gz
-# Locally calculated after checking pgp signature
-sha256	47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd	lzip-1.18.tar.gz
+# From http://lists.nongnu.org/archive/html/lzip-bug/2017-05/msg00000.html
+sha256 ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9 lzip-1.19.tar.gz
diff --git a/bsp/buildroot/package/lzip/lzip.mk b/bsp/buildroot/package/lzip/lzip.mk
index db04862c..b7ba5dd2 100644
--- a/bsp/buildroot/package/lzip/lzip.mk
+++ b/bsp/buildroot/package/lzip/lzip.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LZIP_VERSION = 1.18
+LZIP_VERSION = 1.19
 LZIP_SITE = http://download.savannah.gnu.org/releases/lzip
-LZIP_LICENSE = GPLv2+
+LZIP_LICENSE = GPL-2.0+
 LZIP_LICENSE_FILES = COPYING
 
 define LZIP_CONFIGURE_CMDS
@@ -15,7 +15,7 @@ define LZIP_CONFIGURE_CMDS
 endef
 
 define HOST_LZIP_CONFIGURE_CMDS
-	(cd $(@D); $(HOST_MAKE_ENV) ./configure --prefix=/usr \
+	(cd $(@D); $(HOST_MAKE_ENV) ./configure --prefix=$(HOST_DIR) \
 		$(HOST_CONFIGURE_OPTS) )
 endef
 
@@ -32,7 +32,7 @@ define LZIP_INSTALL_TARGET_CMDS
 endef
 
 define HOST_LZIP_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
 # It's not autotools-based
diff --git a/bsp/buildroot/package/lzlib/Config.in b/bsp/buildroot/package/lzlib/Config.in
index 32328c5e..59a2e6d5 100644
--- a/bsp/buildroot/package/lzlib/Config.in
+++ b/bsp/buildroot/package/lzlib/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_LZLIB
 	bool "lzlib"
-	select BR2_PACKAGE_ZLIB
 	depends on BR2_PACKAGE_LUA
+	select BR2_PACKAGE_ZLIB
 	help
 	  This package provides a library to access zlib library
 	  functions and also to read/write gzip files using an
diff --git a/bsp/buildroot/package/lzma/lzma.mk b/bsp/buildroot/package/lzma/lzma.mk
index 90f07717..1b4d7feb 100644
--- a/bsp/buildroot/package/lzma/lzma.mk
+++ b/bsp/buildroot/package/lzma/lzma.mk
@@ -10,4 +10,4 @@ LZMA_SITE = http://tukaani.org/lzma
 
 $(eval $(host-autotools-package))
 
-LZMA = $(HOST_DIR)/usr/bin/lzma
+LZMA = $(HOST_DIR)/bin/lzma
diff --git a/bsp/buildroot/package/lzo/lzo.hash b/bsp/buildroot/package/lzo/lzo.hash
index 415ed99d..cf2734fc 100644
--- a/bsp/buildroot/package/lzo/lzo.hash
+++ b/bsp/buildroot/package/lzo/lzo.hash
@@ -1,2 +1,4 @@
 # From http://www.oberhumer.com/opensource/lzo/
-sha1 e2a60aca818836181e7e6f8c4f2c323aca6ac057 lzo-2.09.tar.gz
+sha1 4924676a9bae5db58ef129dc1cebce3baa3c4b5d  lzo-2.10.tar.gz
+# Locally computed
+sha256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072  lzo-2.10.tar.gz
diff --git a/bsp/buildroot/package/lzo/lzo.mk b/bsp/buildroot/package/lzo/lzo.mk
index ec7c749f..27ca459a 100644
--- a/bsp/buildroot/package/lzo/lzo.mk
+++ b/bsp/buildroot/package/lzo/lzo.mk
@@ -4,14 +4,24 @@
 #
 ################################################################################
 
-LZO_VERSION = 2.09
+LZO_VERSION = 2.10
 LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
-LZO_LICENSE = GPLv2+
+LZO_LICENSE = GPL-2.0+
 LZO_LICENSE_FILES = COPYING
 LZO_INSTALL_STAGING = YES
-# Ships a beta libtool version hence our patch doesn't apply.
-# Run autoreconf to regenerate ltmain.sh.
-LZO_AUTORECONF = YES
+LZO_SUPPORTS_IN_SOURCE_BUILD = NO
 
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+LZO_CONF_OPTS += -DENABLE_SHARED=ON
+else
+LZO_CONF_OPTS += -DENABLE_SHARED=OFF
+endif
+
+ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+LZO_CONF_OPTS += -DENABLE_STATIC=ON
+else
+LZO_CONF_OPTS += -DENABLE_STATIC=OFF
+endif
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
diff --git a/bsp/buildroot/package/lzop/Config.in b/bsp/buildroot/package/lzop/Config.in
index c9118237..236f21d3 100644
--- a/bsp/buildroot/package/lzop/Config.in
+++ b/bsp/buildroot/package/lzop/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_LZOP
 	select BR2_PACKAGE_LZO
 	help
 	  lzop is a file compressor which is very similar to gzip.
-	  lzop uses the LZO data compression library for compression services.
+	  lzop uses the LZO data compression library for compression
+	  services.
 
 	  http://www.lzop.org/
diff --git a/bsp/buildroot/package/lzop/lzop.mk b/bsp/buildroot/package/lzop/lzop.mk
index 43c16284..55157c4d 100644
--- a/bsp/buildroot/package/lzop/lzop.mk
+++ b/bsp/buildroot/package/lzop/lzop.mk
@@ -6,7 +6,7 @@
 
 LZOP_VERSION = 1.03
 LZOP_SITE = http://www.lzop.org/download
-LZOP_LICENSE = GPLv2+
+LZOP_LICENSE = GPL-2.0+
 LZOP_LICENSE_FILES = COPYING
 LZOP_DEPENDENCIES = lzo
 HOST_LZOP_DEPENDENCIES = host-lzo
@@ -14,4 +14,4 @@ HOST_LZOP_DEPENDENCIES = host-lzo
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
-LZOP = $(HOST_DIR)/usr/bin/lzop
+LZOP = $(HOST_DIR)/bin/lzop
diff --git a/bsp/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch b/bsp/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 00000000..5c5c11b9
--- /dev/null
+++ b/bsp/buildroot/package/m4/0001-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,166 @@
+From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+ lib/fflush.c     |  6 +++---
+ lib/fpending.c   |  2 +-
+ lib/fpurge.c     |  2 +-
+ lib/freadahead.c |  2 +-
+ lib/freading.c   |  2 +-
+ lib/fseeko.c     |  4 ++--
+ lib/stdio-impl.h |  6 ++++++
+ 7 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c
+index 983ade0ff..a6edfa105 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+     return fflush (stream);
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c
+index c84e3a5b4..789f50e4e 100644
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,7 @@ __fpending (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c
+index b1d417c7a..3aedcc373 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c
+index c2ecb5b28..23ec76ee5 100644
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c
+index 73c28acdd..c24d0c88a 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c
+index 0101ab55f..193f4e8ce 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff --git a/lib/stdio-impl.h b/build-aux/gnulib/lib/stdio-impl.h
+index 78d896e9f..05c5752a2 100644
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+    the same implementation of stdio extension API, except that some fields
+    have different naming conventions, or their access requires some casts.  */
+ 
++/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
++   problem by defining it ourselves.  FIXME: Do not rely on glibc
++   internals.  */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+ 
+ /* BSD stdio derived implementations.  */
+ 
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch b/bsp/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
new file mode 100644
index 00000000..a820ca8c
--- /dev/null
+++ b/bsp/buildroot/package/m4/0002-fflush-be-more-paranoid-about-libio.h-change.patch
@@ -0,0 +1,151 @@
+From 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH 2/2] fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+---
+ lib/fflush.c     |  9 ++++++---
+ lib/fpending.c   |  3 ++-
+ lib/fpurge.c     |  3 ++-
+ lib/freadahead.c |  3 ++-
+ lib/freading.c   |  3 ++-
+ lib/fseeko.c     |  6 ++++--
+ 6 files changed, 18 insertions(+), 9 deletions(-)
+
+[yann.morin.1998@free.fr: partially backport from upstream gnulib]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+diff --git a/lib/fflush.c b/build-aux/gnulib/lib/fflush.c
+index a6edfa105..a140b7ad9 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,8 @@
+ #undef fflush
+ 
+ 
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
+ static void
+@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp)
+ 
+ #endif
+ 
+-#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1)
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream)
+   if (stream == NULL || ! freading (stream))
+     return fflush (stream);
+ 
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+ 
+   clear_ungetc_buffer_preserving_position (stream);
+ 
+diff --git a/lib/fpending.c b/build-aux/gnulib/lib/fpending.c
+index 789f50e4e..7bc235ded 100644
+--- a/lib/fpending.c
++++ b/lib/fpending.c
+@@ -32,7 +32,8 @@ __fpending (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/fpurge.c b/build-aux/gnulib/lib/fpurge.c
+index 3aedcc373..554790b56 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,8 @@ fpurge (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   fp->_IO_read_end = fp->_IO_read_ptr;
+   fp->_IO_write_ptr = fp->_IO_write_base;
+   /* Avoid memory leak when there is an active ungetc buffer.  */
+diff --git a/lib/freadahead.c b/build-aux/gnulib/lib/freadahead.c
+index 23ec76ee5..ed3dd0ebd 100644
+--- a/lib/freadahead.c
++++ b/lib/freadahead.c
+@@ -30,7 +30,8 @@ extern size_t __sreadahead (FILE *);
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_write_ptr > fp->_IO_write_base)
+     return 0;
+   return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff --git a/lib/freading.c b/build-aux/gnulib/lib/freading.c
+index c24d0c88a..790f92ca3 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,8 @@ freading (FILE *fp)
+   /* Most systems provide FILE as a struct and the necessary bitmask in
+      <stdio.h>, because they need it for implementing getc() and putc() as
+      fast macros.  */
+-# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   return ((fp->_flags & _IO_NO_WRITES) != 0
+           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+               && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/build-aux/gnulib/lib/fseeko.c
+index 193f4e8ce..e5c5172e7 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+           return -1;
+         }
+ 
+-#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++      /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/m4/m4.hash b/bsp/buildroot/package/m4/m4.hash
index 79c36c87..e665fc14 100644
--- a/bsp/buildroot/package/m4/m4.hash
+++ b/bsp/buildroot/package/m4/m4.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
 sha256	f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07	m4-1.4.18.tar.xz
+# License files, locally calculated
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/bsp/buildroot/package/m4/m4.mk b/bsp/buildroot/package/m4/m4.mk
index d53f7cbd..849e7f4a 100644
--- a/bsp/buildroot/package/m4/m4.mk
+++ b/bsp/buildroot/package/m4/m4.mk
@@ -7,7 +7,7 @@
 M4_VERSION = 1.4.18
 M4_SOURCE = m4-$(M4_VERSION).tar.xz
 M4_SITE = $(BR2_GNU_MIRROR)/m4
-M4_LICENSE = GPLv3+
+M4_LICENSE = GPL-3.0+
 M4_LICENSE_FILES = COPYING
 HOST_M4_CONF_OPTS = --disable-static
 
diff --git a/bsp/buildroot/package/macchanger/Config.in b/bsp/buildroot/package/macchanger/Config.in
index a9ebc8ee..e1a03e12 100644
--- a/bsp/buildroot/package/macchanger/Config.in
+++ b/bsp/buildroot/package/macchanger/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MACCHANGER
 	bool "macchanger"
 	help
-	  A GNU/Linux utility for viewing/manipulating the MAC address of
-	  network interfaces
+	  A GNU/Linux utility for viewing/manipulating the MAC address
+	  of network interfaces
 
 	  http://www.gnu.org/software/macchanger
diff --git a/bsp/buildroot/package/macchanger/macchanger.mk b/bsp/buildroot/package/macchanger/macchanger.mk
index 2e716d98..f2cbce49 100644
--- a/bsp/buildroot/package/macchanger/macchanger.mk
+++ b/bsp/buildroot/package/macchanger/macchanger.mk
@@ -6,7 +6,7 @@
 
 MACCHANGER_VERSION = 1.7.0
 MACCHANGER_SITE = https://github.com/alobbs/macchanger/releases/download/$(MACCHANGER_VERSION)
-MACCHANGER_LICENSE = GPLv2+
+MACCHANGER_LICENSE = GPL-2.0+
 MACCHANGER_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/madplay/Config.in b/bsp/buildroot/package/madplay/Config.in
index d83fac6d..922460e0 100644
--- a/bsp/buildroot/package/madplay/Config.in
+++ b/bsp/buildroot/package/madplay/Config.in
@@ -2,13 +2,12 @@ config BR2_PACKAGE_MADPLAY
 	bool "madplay"
 	select BR2_PACKAGE_LIBMAD
 	select BR2_PACKAGE_LIBID3TAG
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  Command-line front-end to libmad, a high-quality MPEG audio decoder.
-	  It currently supports MPEG-1 and the MPEG-2 extension to lower
-	  sampling frequencies, as well as the de facto MPEG 2.5 format. All
-	  three audio layers — Layer I, Layer II, and Layer III (i.e. MP3) —
-	  are fully implemented.
+	  Command-line front-end to libmad, a high-quality MPEG audio
+	  decoder.  It currently supports MPEG-1 and the MPEG-2
+	  extension to lower sampling frequencies, as well as the de
+	  facto MPEG 2.5 format. All three audio layers — Layer I,
+	  Layer II, and Layer III (i.e. MP3) — are fully implemented.
 
 	  http://www.underbit.com/products/mad/
 
diff --git a/bsp/buildroot/package/madplay/madplay.mk b/bsp/buildroot/package/madplay/madplay.mk
index 6b138197..e72e2f81 100644
--- a/bsp/buildroot/package/madplay/madplay.mk
+++ b/bsp/buildroot/package/madplay/madplay.mk
@@ -6,18 +6,10 @@
 
 MADPLAY_VERSION = 0.15.2b
 MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
-MADPLAY_LICENSE = GPLv2+
+MADPLAY_LICENSE = GPL-2.0+
 MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
 MADPLAY_LIBTOOL_PATCH = NO
-MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext)
-
-# Workaround a bug in uClibc-ng, which exposes madvise() but doesn't
-# provide the corresponding MADV_* definitions. Bug reported at
-# http://mailman.uclibc-ng.org/pipermail/devel/2016-December/001306.html. madvise()
-# is anyway useless on noMMU.
-ifeq ($(BR2_USE_MMU),)
-MADPLAY_CONF_ENV += ac_cv_func_madvise=no
-endif
+MADPLAY_DEPENDENCIES = libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
 
 # Check if ALSA is built, then we should configure after alsa-lib so
 # ./configure can find alsa-lib.
diff --git a/bsp/buildroot/package/make/Config.in b/bsp/buildroot/package/make/Config.in
index f576b7b5..e8aa912f 100644
--- a/bsp/buildroot/package/make/Config.in
+++ b/bsp/buildroot/package/make/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MAKE
 	bool "make"
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A tool which controls the generation of executables and other
 	  non-source files of a program from the program's source files.
diff --git a/bsp/buildroot/package/make/make.mk b/bsp/buildroot/package/make/make.mk
index c51ce3b7..5717628f 100644
--- a/bsp/buildroot/package/make/make.mk
+++ b/bsp/buildroot/package/make/make.mk
@@ -7,8 +7,8 @@
 MAKE_VERSION = 4.2.1
 MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2
 MAKE_SITE = $(BR2_GNU_MIRROR)/make
-MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-MAKE_LICENSE = GPLv3+
+MAKE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+MAKE_LICENSE = GPL-3.0+
 MAKE_LICENSE_FILES = COPYING
 
 MAKE_CONF_OPTS = --without-guile
diff --git a/bsp/buildroot/package/makedevs/makedevs.c b/bsp/buildroot/package/makedevs/makedevs.c
index 7092b147..c57b964f 100644
--- a/bsp/buildroot/package/makedevs/makedevs.c
+++ b/bsp/buildroot/package/makedevs/makedevs.c
@@ -510,7 +510,7 @@ int main(int argc, char **argv)
 
 		linenum++;
 
-		if (1 == sscanf(line, "|xattr %254s", xattr)) {
+		if (1 == sscanf(line, " |xattr %254s", xattr)) {
 #ifdef EXTENDED_ATTRIBUTES
 			if (!full_name)
 				bb_error_msg_and_die("line %d should be after a file\n", linenum);
@@ -570,9 +570,12 @@ int main(int argc, char **argv)
 				ret = EXIT_FAILURE;
 				goto loop;
 			}
-		} else if (type == 'f') {
+		} else if (type == 'f' || type == 'F') {
 			struct stat st;
 			if ((stat(full_name, &st) < 0 || !S_ISREG(st.st_mode))) {
+				if (type == 'F') {
+					continue; /*Ignore optional files*/
+				}
 				bb_perror_msg("line %d: regular file '%s' does not exist", linenum, full_name);
 				ret = EXIT_FAILURE;
 				goto loop;
diff --git a/bsp/buildroot/package/makedevs/makedevs.mk b/bsp/buildroot/package/makedevs/makedevs.mk
index 9bd684f0..36837a19 100644
--- a/bsp/buildroot/package/makedevs/makedevs.mk
+++ b/bsp/buildroot/package/makedevs/makedevs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MAKEDEVS_LICENSE = GPLv2
+MAKEDEVS_LICENSE = GPL-2.0
 
 HOST_MAKEDEVS_CFLAGS = $(HOST_CFLAGS)
 HOST_MAKEDEVS_LDFLAGS = $(HOST_LDFLAGS)
@@ -21,7 +21,7 @@ define HOST_MAKEDEVS_BUILD_CMDS
 endef
 
 define HOST_MAKEDEVS_INSTALL_CMDS
-	$(INSTALL) -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs
+	$(INSTALL) -D -m 755 $(@D)/makedevs $(HOST_DIR)/bin/makedevs
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/mali-t76x/Config.in b/bsp/buildroot/package/mali-t76x/Config.in
index 26a7f6c0..a85fa5b2 100644
--- a/bsp/buildroot/package/mali-t76x/Config.in
+++ b/bsp/buildroot/package/mali-t76x/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_MALI_T76X
 	bool "mali-t76x"
-	select BR2_PACKAGE_MESA3D_HEADERS
-	select BR2_PACKAGE_HAS_LIBEGL
-	select BR2_PACKAGE_HAS_LIBGLES
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_ARM_EABIHF
 	depends on BR2_arm
+	select BR2_PACKAGE_MESA3D_HEADERS
+	select BR2_PACKAGE_HAS_LIBEGL
+	select BR2_PACKAGE_HAS_LIBGLES
 	help
-	  Install the binary user-space components for the ARM Mali Midgard
-	  T76X GPU. This package requires a kernel with the ARM Mali Midgard
-	  GPU Kernel Drivers enabled.
+	  Install the binary user-space components for the ARM Mali
+	  Midgard T76X GPU. This package requires a kernel with the
+	  ARM Mali Midgard GPU Kernel Drivers enabled.
 
 	  Source: http://malideveloper.arm.com/resources/drivers/
 
diff --git a/bsp/buildroot/package/mariadb/mariadb.hash b/bsp/buildroot/package/mariadb/mariadb.hash
index cc1e353a..e4736465 100644
--- a/bsp/buildroot/package/mariadb/mariadb.hash
+++ b/bsp/buildroot/package/mariadb/mariadb.hash
@@ -1,5 +1,8 @@
-# From https://downloads.mariadb.org/mariadb/10.1.31/
-sha256 ab7641c2fe4e5289da6141766a9c3350e013def56fafd6f1377080bc8048b2e6  mariadb-10.1.31.tar.gz
+# From https://downloads.mariadb.org/mariadb/10.1.35/
+md5 935f401314ff08a4177beb70fed6055c  mariadb-10.1.35.tar.gz
+sha1 d322f0da17f4de475832dd534657eba5a936f77b  mariadb-10.1.35.tar.gz
+sha256 9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d  mariadb-10.1.35.tar.gz
+sha512 88e6049f3bbc3aa047e108f91a2c4f335758e80f25bfa2974b5f8c2e13f5758824d7835dece021b515c531e5641b9998e4de92256ad4b47b7f694da99bd471aa  mariadb-10.1.35.tar.gz
 
 # Hash for license files
 sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a  README
diff --git a/bsp/buildroot/package/mariadb/mariadb.mk b/bsp/buildroot/package/mariadb/mariadb.mk
index 18dfece3..23822187 100644
--- a/bsp/buildroot/package/mariadb/mariadb.mk
+++ b/bsp/buildroot/package/mariadb/mariadb.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-MARIADB_VERSION = 10.1.31
+MARIADB_VERSION = 10.1.35
 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
-MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library)
+MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
 # Tarball no longer contains LGPL license text
 # https://jira.mariadb.org/browse/MDEV-12297
 MARIADB_LICENSE_FILES = README COPYING
@@ -104,13 +104,13 @@ define MARIADB_INSTALL_INIT_SYSTEMD
 endef
 endif
 
+# We don't need mysql_config on the target as it's only useful in staging
+# We also don't need the test suite on the target
 define MARIADB_POST_INSTALL
 	mkdir -p $(TARGET_DIR)/var/lib/mysql
 	$(INSTALL) -D -m 644 $(TARGET_DIR)/usr/share/mysql/my-small.cnf \
 		$(TARGET_DIR)/etc/mysql/my.cnf
-	# We don't need this on the target as it's only useful in staging
 	$(RM) $(TARGET_DIR)/usr/bin/mysql_config
-	# Remove test suite
 	$(RM) -r $(TARGET_DIR)/usr/share/mysql/test
 endef
 
diff --git a/bsp/buildroot/package/matchbox-common/Config.in b/bsp/buildroot/package/matchbox-common/Config.in
index 5a038e17..587a0694 100644
--- a/bsp/buildroot/package/matchbox-common/Config.in
+++ b/bsp/buildroot/package/matchbox-common/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MATCHBOX_COMMON
 	bool "matchbox-common"
-	select BR2_PACKAGE_MATCHBOX_LIB
 	depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
+	select BR2_PACKAGE_MATCHBOX_LIB
 	help
 	  Common desktop folders and matchbox-session script.
 
diff --git a/bsp/buildroot/package/matchbox-common/matchbox-common.mk b/bsp/buildroot/package/matchbox-common/matchbox-common.mk
index 038dd594..fd54c27e 100644
--- a/bsp/buildroot/package/matchbox-common/matchbox-common.mk
+++ b/bsp/buildroot/package/matchbox-common/matchbox-common.mk
@@ -8,7 +8,7 @@ MATCHBOX_COMMON_VERSION_MAJOR = 0.9
 MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1
 MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2
 MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR)
-MATCHBOX_COMMON_LICENSE = GPLv2+
+MATCHBOX_COMMON_LICENSE = GPL-2.0+
 MATCHBOX_COMMON_LICENSE_FILES = COPYING
 MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib
 
diff --git a/bsp/buildroot/package/matchbox-desktop/matchbox-desktop.mk b/bsp/buildroot/package/matchbox-desktop/matchbox-desktop.mk
index a703a18e..81b13c07 100644
--- a/bsp/buildroot/package/matchbox-desktop/matchbox-desktop.mk
+++ b/bsp/buildroot/package/matchbox-desktop/matchbox-desktop.mk
@@ -8,7 +8,7 @@ MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9
 MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1
 MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2
 MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR)
-MATCHBOX_DESKTOP_LICENSE = GPLv2+
+MATCHBOX_DESKTOP_LICENSE = GPL-2.0+
 MATCHBOX_DESKTOP_LICENSE_FILES = COPYING
 MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib
 MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat
diff --git a/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk b/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk
index d694e61c..e607c48c 100644
--- a/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk
+++ b/bsp/buildroot/package/matchbox-fakekey/matchbox-fakekey.mk
@@ -7,7 +7,7 @@
 MATCHBOX_FAKEKEY_VERSION = 0.1
 MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2
 MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION)
-MATCHBOX_FAKEKEY_LICENSE = GPLv2+
+MATCHBOX_FAKEKEY_LICENSE = GPL-2.0+
 MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING
 MATCHBOX_FAKEKEY_INSTALL_STAGING = YES
 MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
diff --git a/bsp/buildroot/package/matchbox-keyboard/matchbox-keyboard.mk b/bsp/buildroot/package/matchbox-keyboard/matchbox-keyboard.mk
index 3ffaca66..23ab5ad7 100644
--- a/bsp/buildroot/package/matchbox-keyboard/matchbox-keyboard.mk
+++ b/bsp/buildroot/package/matchbox-keyboard/matchbox-keyboard.mk
@@ -7,7 +7,7 @@
 MATCHBOX_KEYBOARD_VERSION = 0.1
 MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2
 MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION)
-MATCHBOX_KEYBOARD_LICENSE = GPLv2+
+MATCHBOX_KEYBOARD_LICENSE = GPL-2.0+
 MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING
 MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat
 
diff --git a/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk b/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk
index ea6abf11..55418676 100644
--- a/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk
+++ b/bsp/buildroot/package/matchbox-lib/matchbox-lib.mk
@@ -7,7 +7,7 @@
 MATCHBOX_LIB_VERSION = 1.9
 MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2
 MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION)
-MATCHBOX_LIB_LICENSE = LGPLv2.1+
+MATCHBOX_LIB_LICENSE = LGPL-2.1+
 MATCHBOX_LIB_LICENSE_FILES = COPYING
 MATCHBOX_LIB_INSTALL_STAGING = YES
 MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext
diff --git a/bsp/buildroot/package/matchbox-panel/matchbox-panel.mk b/bsp/buildroot/package/matchbox-panel/matchbox-panel.mk
index aa2d4179..344d8fde 100644
--- a/bsp/buildroot/package/matchbox-panel/matchbox-panel.mk
+++ b/bsp/buildroot/package/matchbox-panel/matchbox-panel.mk
@@ -8,7 +8,7 @@ MATCHBOX_PANEL_VERSION_MAJOR = 0.9
 MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3
 MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2
 MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR)
-MATCHBOX_PANEL_LICENSE = GPLv2+
+MATCHBOX_PANEL_LICENSE = GPL-2.0+
 MATCHBOX_PANEL_LICENSE_FILES = COPYING
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPTS = --enable-expat --enable-dnotify
diff --git a/bsp/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/bsp/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
index be572396..c80e7533 100644
--- a/bsp/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
+++ b/bsp/buildroot/package/matchbox-startup-monitor/matchbox-startup-monitor.mk
@@ -7,7 +7,7 @@
 MATCHBOX_STARTUP_MONITOR_VERSION = 0.1
 MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2
 MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION)
-MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+
+MATCHBOX_STARTUP_MONITOR_LICENSE = GPL-2.0+
 MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING
 MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification
 
diff --git a/bsp/buildroot/package/matchbox/Config.in b/bsp/buildroot/package/matchbox/Config.in
index 3a9f118f..9d212902 100644
--- a/bsp/buildroot/package/matchbox/Config.in
+++ b/bsp/buildroot/package/matchbox/Config.in
@@ -9,7 +9,8 @@ menuconfig BR2_PACKAGE_MATCHBOX
 	  Matchbox is an Open Source base environment for the X Window
 	  System running on non-desktop embedded platforms such as
 	  handhelds, set-top boxes, kiosks and anything else for which
-	  screen space, input mechanisms or system resources are limited.
+	  screen space, input mechanisms or system resources are
+	  limited.
 
 	  https://www.yoctoproject.org/tools-resources/projects/matchbox
 
diff --git a/bsp/buildroot/package/matchbox/matchbox.mk b/bsp/buildroot/package/matchbox/matchbox.mk
index 9094b1ec..c0a2778b 100644
--- a/bsp/buildroot/package/matchbox/matchbox.mk
+++ b/bsp/buildroot/package/matchbox/matchbox.mk
@@ -7,7 +7,7 @@
 MATCHBOX_VERSION = 1.2
 MATCHBOX_SOURCE = matchbox-window-manager-$(MATCHBOX_VERSION).tar.bz2
 MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_VERSION)
-MATCHBOX_LICENSE = GPLv2+
+MATCHBOX_LICENSE = GPL-2.0+
 MATCHBOX_LICENSE_FILES = COPYING
 
 MATCHBOX_DEPENDENCIES = matchbox-lib
diff --git a/bsp/buildroot/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch b/bsp/buildroot/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch
new file mode 100644
index 00000000..60bf53f6
--- /dev/null
+++ b/bsp/buildroot/package/mbedtls/0001-bn_mul.h-fix-x86-PIC-inline-ASM-compilation-with-GCC.patch
@@ -0,0 +1,74 @@
+From a0ae2ba37ca479c6edddec8634b25686be965e0d Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Mon, 27 Aug 2018 22:50:57 +0200
+Subject: [PATCH] bn_mul.h: fix x86 PIC inline ASM compilation with GCC < 5
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes #1910
+
+With ebx added to the MULADDC_STOP clobber list to fix #1550, the inline
+assembly fails to build with GCC < 5 in PIC mode with the following error:
+
+include/mbedtls/bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’
+
+This is because older GCC versions treated the x86 ebx register (which is
+used for the GOT) as a fixed reserved register when building as PIC.
+
+This is fixed by an improved register allocator in GCC 5+.  From the release
+notes:
+
+Register allocation improvements: Reuse of the PIC hard register, instead of
+using a fixed register, was implemented on x86/x86-64 targets.  This
+improves generated PIC code performance as more hard registers can be used.
+
+https://www.gnu.org/software/gcc/gcc-5/changes.html
+
+As a workaround, detect this situation and disable the inline assembly,
+similar to the MULADDC_CANNOT_USE_R7 logic.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+Upstream: https://github.com/ARMmbed/mbedtls/pull/1986
+---
+ include/mbedtls/bn_mul.h | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/include/mbedtls/bn_mul.h b/include/mbedtls/bn_mul.h
+index b587317d9..74a2d29be 100644
+--- a/include/mbedtls/bn_mul.h
++++ b/include/mbedtls/bn_mul.h
+@@ -50,13 +50,29 @@
+ #if defined(__GNUC__) && \
+     ( !defined(__ARMCC_VERSION) || __ARMCC_VERSION >= 6000000 )
+ 
++/*
++ * GCC < 5.0 treated the x86 ebx (which is used for the GOT) as a
++ * fixed reserved register when building as PIC, leading to errors
++ * like: bn_mul.h:46:13: error: PIC register clobbered by ‘ebx’ in ‘asm’
++ *
++ * This is fixed by an improved register allocator in GCC 5+. From the
++ * release notes:
++ * Register allocation improvements: Reuse of the PIC hard register,
++ * instead of using a fixed register, was implemented on x86/x86-64
++ * targets. This improves generated PIC code performance as more hard
++ * registers can be used.
++ */
++#if defined(__GNUC__) && __GNUC__ < 5 && defined(__PIC__)
++#define MULADDC_CANNOT_USE_EBX
++#endif
++
+ /*
+  * Disable use of the i386 assembly code below if option -O0, to disable all
+  * compiler optimisations, is passed, detected with __OPTIMIZE__
+  * This is done as the number of registers used in the assembly code doesn't
+  * work with the -O0 option.
+  */
+-#if defined(__i386__) && defined(__OPTIMIZE__)
++#if defined(__i386__) && defined(__OPTIMIZE__) && !defined(MULADDC_CANNOT_USE_EBX)
+ 
+ #define MULADDC_INIT                        \
+     asm(                                    \
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch b/bsp/buildroot/package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch
deleted file mode 100644
index effaf3d9..00000000
--- a/bsp/buildroot/package/mbedtls/0001-dhm-Fix-typo-in-RFC-5114-constants.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 129f50838bf14f4e1319f06f41c827fae9cc4b73 Mon Sep 17 00:00:00 2001
-From: Jaeden Amero <jaeden.amero@arm.com>
-Date: Thu, 8 Feb 2018 14:25:36 +0000
-Subject: [PATCH] dhm: Fix typo in RFC 5114 constants
-
-We accidentally named the constant MBEDTLS_DHM_RFC5114_MODP_P instead of
-MBEDTLS_DHM_RFC5114_MODP_2048_P.
-
-Fixes #1358
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: upstream commit 129f50838bf
-
- include/mbedtls/dhm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/mbedtls/dhm.h b/include/mbedtls/dhm.h
-index da2e66b111b6..00fafd8d16f4 100644
---- a/include/mbedtls/dhm.h
-+++ b/include/mbedtls/dhm.h
-@@ -372,7 +372,7 @@ MBEDTLS_DEPRECATED typedef char const * mbedtls_deprecated_constant_t;
-  * in <em>RFC-5114: Additional Diffie-Hellman Groups for Use with
-  * IETF Standards</em>.
-  */
--#define MBEDTLS_DHM_RFC5114_MODP_P                              \
-+#define MBEDTLS_DHM_RFC5114_MODP_2048_P                         \
-     MBEDTLS_DEPRECATED_STRING_CONSTANT(                         \
-         "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1"      \
-         "B54B1597B61D0A75E6FA141DF95A56DBAF9A3C407BA1DF15"      \
--- 
-2.16.1
-
diff --git a/bsp/buildroot/package/mbedtls/Config.in b/bsp/buildroot/package/mbedtls/Config.in
index ed63f2da..a39ba65d 100644
--- a/bsp/buildroot/package/mbedtls/Config.in
+++ b/bsp/buildroot/package/mbedtls/Config.in
@@ -23,10 +23,10 @@ config BR2_PACKAGE_MBEDTLS_COMPRESSION
 	help
 	  Enable support for compression of the content data before it
 	  enters the secure channel as described in RFC 3749.
-	  
-	  Warning: TLS compression may make you vulnerable to the CRIME
-	  attack. You should not enable it unless you know for sure CRIME
-	  and similar attacks are not applicable to your particular
-	  situation.
+
+	  Warning: TLS compression may make you vulnerable to the
+	  CRIME attack. You should not enable it unless you know for
+	  sure CRIME and similar attacks are not applicable to your
+	  particular situation.
 
 endif
diff --git a/bsp/buildroot/package/mbedtls/mbedtls.hash b/bsp/buildroot/package/mbedtls/mbedtls.hash
index a62c0f58..47e446dd 100644
--- a/bsp/buildroot/package/mbedtls/mbedtls.hash
+++ b/bsp/buildroot/package/mbedtls/mbedtls.hash
@@ -1,5 +1,5 @@
-# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.7.0-2.1.10-and-1.3.22-released
-sha1	01ffebf679c8696cc941c41224fa73d8944d2c85	mbedtls-2.7.0-apache.tgz
-sha256	aeb66d6cd43aa1c79c145d15845c655627a7fc30d624148aaafbb6c36d7f55ef	mbedtls-2.7.0-apache.tgz
+# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.12.0-2.7.5-and-2.1.14-released
+sha1	180ca49e2bb6df3826113781b793529a81427ce3	mbedtls-2.7.5-apache.tgz
+sha256	a1302ad9094aabb9880d2755927b466a6bac8e02b68e04dee77321f3859e9b40	mbedtls-2.7.5-apache.tgz
 # Locally calculated
 sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30	apache-2.0.txt
diff --git a/bsp/buildroot/package/mbedtls/mbedtls.mk b/bsp/buildroot/package/mbedtls/mbedtls.mk
index 7c26ea95..e07cc3d7 100644
--- a/bsp/buildroot/package/mbedtls/mbedtls.mk
+++ b/bsp/buildroot/package/mbedtls/mbedtls.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 MBEDTLS_SITE = https://tls.mbed.org/code/releases
-MBEDTLS_VERSION = 2.7.0
+MBEDTLS_VERSION = 2.7.5
 MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz
 MBEDTLS_CONF_OPTS = \
 	-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \
diff --git a/bsp/buildroot/package/mc/Config.in b/bsp/buildroot/package/mc/Config.in
index 7030b5f1..61f351c4 100644
--- a/bsp/buildroot/package/mc/Config.in
+++ b/bsp/buildroot/package/mc/Config.in
@@ -7,10 +7,10 @@ config BR2_PACKAGE_MC
 	# mc prefers slang, but can use ncurses too
 	select BR2_PACKAGE_SLANG if !BR2_PACKAGE_NCURSES
 	help
-	  GNU Midnight Commander is a visual file manager, licensed under
-	  GNU General Public License. It can use either SLang (preferred)
-	  or ncurses for screen handling; if neither is enabled SLang
-	  will be automatically chosen.
+	  GNU Midnight Commander is a visual file manager, licensed
+	  under GNU General Public License. It can use either SLang
+	  (preferred) or ncurses for screen handling; if neither is
+	  enabled SLang will be automatically chosen.
 
 	  https://www.midnight-commander.org
 
diff --git a/bsp/buildroot/package/mc/mc.hash b/bsp/buildroot/package/mc/mc.hash
index a8116d02..d980b8a4 100644
--- a/bsp/buildroot/package/mc/mc.hash
+++ b/bsp/buildroot/package/mc/mc.hash
@@ -1,2 +1,4 @@
-# Hash from http://ftp.midnight-commander.org/mc-4.8.18.sha256:
-sha256 f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece  mc-4.8.18.tar.xz
+# Hash from http://ftp.midnight-commander.org/mc-4.8.20.sha256:
+sha256  017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c  mc-4.8.20.tar.xz
+# sha256 locally computed:
+sha256  5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284  COPYING
diff --git a/bsp/buildroot/package/mc/mc.mk b/bsp/buildroot/package/mc/mc.mk
index ff4c8ad2..a83c5f0a 100644
--- a/bsp/buildroot/package/mc/mc.mk
+++ b/bsp/buildroot/package/mc/mc.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-MC_VERSION = 4.8.18
+MC_VERSION = 4.8.20
 MC_SOURCE = mc-$(MC_VERSION).tar.xz
 MC_SITE = http://ftp.midnight-commander.org
-MC_LICENSE = GPLv3+
+MC_LICENSE = GPL-3.0+
 MC_LICENSE_FILES = COPYING
 MC_DEPENDENCIES = libglib2 host-pkgconf
 
diff --git a/bsp/buildroot/package/mcelog/Config.in b/bsp/buildroot/package/mcelog/Config.in
index f3ccc71e..55ebb7c8 100644
--- a/bsp/buildroot/package/mcelog/Config.in
+++ b/bsp/buildroot/package/mcelog/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MCELOG
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_USE_MMU # fork()
 	help
-	  mcelog processes machine checks (in particular memory and CPU hardware
-	  errors) on modern x86 Linux systems.
+	  mcelog processes machine checks (in particular memory and
+	  CPU hardware errors) on modern x86 Linux systems.
 
 	  http://www.mcelog.org/
diff --git a/bsp/buildroot/package/mcelog/mcelog.hash b/bsp/buildroot/package/mcelog/mcelog.hash
new file mode 100644
index 00000000..1a9dd602
--- /dev/null
+++ b/bsp/buildroot/package/mcelog/mcelog.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 d8f3dde21b2e0d76740f374385817c11b3fd69b095a186a6dd12c7b0ba0cca8f  mcelog-v153.tar.gz
diff --git a/bsp/buildroot/package/mcelog/mcelog.mk b/bsp/buildroot/package/mcelog/mcelog.mk
index 1290e349..dca6a18c 100644
--- a/bsp/buildroot/package/mcelog/mcelog.mk
+++ b/bsp/buildroot/package/mcelog/mcelog.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-MCELOG_VERSION = v111
+MCELOG_VERSION = v153
 MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git
 MCELOG_SITE_METHOD = git
-MCELOG_LICENSE = GPLv2
-MCELOG_LICENSE_FILES = README
+MCELOG_LICENSE = GPL-2.0
+MCELOG_LICENSE_FILES = README.md
 
 define MCELOG_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all
diff --git a/bsp/buildroot/package/mcrypt/Config.in b/bsp/buildroot/package/mcrypt/Config.in
index 58567cd7..e3b9541f 100644
--- a/bsp/buildroot/package/mcrypt/Config.in
+++ b/bsp/buildroot/package/mcrypt/Config.in
@@ -3,11 +3,10 @@ config BR2_PACKAGE_MCRYPT
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBMCRYPT
 	select BR2_PACKAGE_LIBMHASH
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  MCrypt is a replacement for the old crypt() package and crypt(1)
-	  command, with extensions.
-	  It allows developers to use a wide range of encryption functions,
-	  without making drastic changes to their code.
+	  MCrypt is a replacement for the old crypt() package and
+	  crypt(1) command, with extensions.
+	  It allows developers to use a wide range of encryption
+	  functions, without making drastic changes to their code.
 
 	  http://mcrypt.sourceforge.net/
diff --git a/bsp/buildroot/package/mcrypt/mcrypt.mk b/bsp/buildroot/package/mcrypt/mcrypt.mk
index b413ffa3..f98895f4 100644
--- a/bsp/buildroot/package/mcrypt/mcrypt.mk
+++ b/bsp/buildroot/package/mcrypt/mcrypt.mk
@@ -9,9 +9,9 @@ MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VE
 MCRYPT_DEPENDENCIES = libmcrypt libmhash \
 	$(if $(BR2_PACKAGE_ZLIB),zlib) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+	$(TARGET_NLS_DEPENDENCIES)
 MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr
-MCRYPT_LICENSE = GPLv3
+MCRYPT_LICENSE = GPL-3.0
 MCRYPT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/mdadm/Config.in b/bsp/buildroot/package/mdadm/Config.in
index e0d606b5..61d631cd 100644
--- a/bsp/buildroot/package/mdadm/Config.in
+++ b/bsp/buildroot/package/mdadm/Config.in
@@ -1,7 +1,12 @@
 config BR2_PACKAGE_MDADM
 	bool "mdadm"
+	depends on !BR2_STATIC_LIBS # dlfcn.h
 	depends on BR2_USE_MMU # fork()
 	help
 	  Utility for managing Linux Software RAID arrays.
 
 	  http://neil.brown.name/blog/mdadm
+
+comment "mdadm needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/mdadm/mdadm.hash b/bsp/buildroot/package/mdadm/mdadm.hash
index 7f228d99..6132a6d8 100644
--- a/bsp/buildroot/package/mdadm/mdadm.hash
+++ b/bsp/buildroot/package/mdadm/mdadm.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc
-sha256	8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68	mdadm-3.3.4.tar.xz
+sha256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9  mdadm-4.0.tar.xz
diff --git a/bsp/buildroot/package/mdadm/mdadm.mk b/bsp/buildroot/package/mdadm/mdadm.mk
index 7558c18a..207b0be6 100644
--- a/bsp/buildroot/package/mdadm/mdadm.mk
+++ b/bsp/buildroot/package/mdadm/mdadm.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-MDADM_VERSION = 3.3.4
+MDADM_VERSION = 4.0
 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz
 MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
-MDADM_LICENSE = GPLv2+
+MDADM_LICENSE = GPL-2.0+
 MDADM_LICENSE_FILES = COPYING
 
 MDADM_MAKE_OPTS = \
-	CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
+	CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
 
 MDADM_INSTALL_TARGET_OPTS = \
 	DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm
diff --git a/bsp/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch b/bsp/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch
new file mode 100644
index 00000000..cdaa0fab
--- /dev/null
+++ b/bsp/buildroot/package/mediastreamer/0002-m4-fix-local-ffmpeg-and-avcodec-function-conflict.patch
@@ -0,0 +1,42 @@
+From d12e74a559602b3dff9a6bf38fcbb139535c9c9c Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@micronovasrl.com>
+Date: Mon, 3 Sep 2018 20:27:00 +0200
+Subject: [PATCH] m4: fix local ffmpeg and avcodec function conflict
+
+Autotools miss avcodec function check.
+This is due to linker library list order, -ldrm is appended too early
+respect to -lavutil. This results in missing drm library functions for
+avcodec functions:
+- drmGetVersion()
+- drmFreeVersion()
+So these functions:
+- avcodec_get_context_defaults3
+- avcodec_open2
+- avcodec_encode_video2
+can't link correctly during check and they seem not to be present.
+Then macros HAVE_FUN_avcodec_* are not defined in mediastreamer-config.h
+So local avcodec functions conflict with real avcodec library functions.
+
+In acinclude.m4 file, swap $FFMPEG_LIBS and -lavutil if avcodec is found.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 6c31ed82..89ff6643 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -110,7 +110,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
+ 			if test x$avcodec_found = xno ; then
+ 			   AC_MSG_WARN([Could not find libavcodec (from ffmpeg) headers and library.])
+ 			else
+-			   FFMPEG_LIBS="$FFMPEG_LIBS -lavutil"
++			   FFMPEG_LIBS="-lavutil $FFMPEG_LIBS"
+ 			fi
+ 			
+ 			
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/mediastreamer/Config.in b/bsp/buildroot/package/mediastreamer/Config.in
index 7e62bf2e..afaed4a7 100644
--- a/bsp/buildroot/package/mediastreamer/Config.in
+++ b/bsp/buildroot/package/mediastreamer/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_MEDIASTREAMER
 	bool "mediastreamer"
-	select BR2_PACKAGE_ORTP
 	depends on BR2_INSTALL_LIBSTDCPP # ortp
 	depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
+	select BR2_PACKAGE_ORTP
 	help
 	  Mediastreamer is a powerful and lightweighted streaming
 	  engine specialized for voice/video telephony applications.
diff --git a/bsp/buildroot/package/mediastreamer/mediastreamer.mk b/bsp/buildroot/package/mediastreamer/mediastreamer.mk
index fa4b163e..1276cfae 100644
--- a/bsp/buildroot/package/mediastreamer/mediastreamer.mk
+++ b/bsp/buildroot/package/mediastreamer/mediastreamer.mk
@@ -11,7 +11,7 @@ MEDIASTREAMER_INSTALL_STAGING = YES
 MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext host-vim
 # tests fail linking on some architectures, so disable them
 MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict
-MEDIASTREAMER_LICENSE = GPLv2+
+MEDIASTREAMER_LICENSE = GPL-2.0+
 MEDIASTREAMER_LICENSE_FILES = COPYING
 
 # patching configure.ac
diff --git a/bsp/buildroot/package/memcached/Config.in b/bsp/buildroot/package/memcached/Config.in
index e011d089..93bf02d6 100644
--- a/bsp/buildroot/package/memcached/Config.in
+++ b/bsp/buildroot/package/memcached/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_MEMCACHED
 	select BR2_PACKAGE_LIBEVENT
 	help
 	  Memcached is an in-memory key-value store for small chunks
-	  of arbitrary data (strings, objects) from results of database calls,
-	  API calls, or page rendering.
+	  of arbitrary data (strings, objects) from results of
+	  database calls, API calls, or page rendering.
 
 	  http://www.memcached.org/
 
diff --git a/bsp/buildroot/package/memcached/memcached.hash b/bsp/buildroot/package/memcached/memcached.hash
index f9f68d53..82789338 100644
--- a/bsp/buildroot/package/memcached/memcached.hash
+++ b/bsp/buildroot/package/memcached/memcached.hash
@@ -1,4 +1,3 @@
-# From http://www.memcached.org/files/memcached-1.4.36.tar.gz.sha1
-sha1 519b417515206b0b95ff9bf14106a891f6a2252e  memcached-1.4.36.tar.gz
-# Calculated based on the hash above
-sha256 773b6bb20bf80223ca6a15d75f570fbab346ad11ec98595e5af5e33f54bd82d8  memcached-1.4.36.tar.gz
+# From http://www.memcached.org/files/memcached-1.5.6.tar.gz.sha1
+sha1 ca35929e74b132c2495a6957cfdc80556337fb90  memcached-1.5.6.tar.gz
+sha256 9675ee859d7d81f7a950f190a6812720b26f08228d356044ec517d4d5af25f03  memcached-1.5.6.tar.gz
diff --git a/bsp/buildroot/package/memcached/memcached.mk b/bsp/buildroot/package/memcached/memcached.mk
index 4de1bf64..c15abc79 100644
--- a/bsp/buildroot/package/memcached/memcached.mk
+++ b/bsp/buildroot/package/memcached/memcached.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-MEMCACHED_VERSION = 1.4.36
+MEMCACHED_VERSION = 1.5.6
 MEMCACHED_SITE = http://www.memcached.org/files
 MEMCACHED_DEPENDENCIES = libevent
 MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 MEMCACHED_CONF_OPTS = --disable-coverage
-MEMCACHED_LICENSE = BSD-3c
+MEMCACHED_LICENSE = BSD-3-Clause
 MEMCACHED_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_ENDIAN),"BIG")
diff --git a/bsp/buildroot/package/memtest86/Config.in b/bsp/buildroot/package/memtest86/Config.in
index 3a684b63..79c01610 100644
--- a/bsp/buildroot/package/memtest86/Config.in
+++ b/bsp/buildroot/package/memtest86/Config.in
@@ -16,11 +16,12 @@ config BR2_PACKAGE_MEMTEST86
 
 	  Memtest86+ will only work on 32-bit or 64-bit x86 targets.
 	  It boots as an i486 program and autodetects hardware. It can
-	  be added to the grub2 boot menu by adding the following lines
-	  to the bottom of /boot/grub/grub.cfg - note the use of linux16.
+	  be added to the grub2 boot menu by adding the following
+	  lines to the bottom of /boot/grub/grub.cfg - note the use of
+	  linux16.
 
 	  menuentry "Memtest86+" {
-		 linux16 /boot/memtest86+.bin
+	    linux16 /boot/memtest86+.bin
 	  }
 
 	  Other boot loaders will have similar requirements.
diff --git a/bsp/buildroot/package/memtest86/memtest86.mk b/bsp/buildroot/package/memtest86/memtest86.mk
index d2ec1a79..eb071cc2 100644
--- a/bsp/buildroot/package/memtest86/memtest86.mk
+++ b/bsp/buildroot/package/memtest86/memtest86.mk
@@ -7,7 +7,7 @@
 MEMTEST86_VERSION = 5.01
 MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz
 MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION)
-MEMTEST86_LICENSE = GPLv2
+MEMTEST86_LICENSE = GPL-2.0
 MEMTEST86_LICENSE_FILES = README
 
 # memtest86+ is sensitive to toolchain changes, use the shipped binary version
diff --git a/bsp/buildroot/package/memtester/Config.in b/bsp/buildroot/package/memtester/Config.in
index 7a504dc1..b9887726 100644
--- a/bsp/buildroot/package/memtester/Config.in
+++ b/bsp/buildroot/package/memtester/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MEMTESTER
 	bool "memtester"
 	help
-	  A userspace utility for testing the memory subsystem for faults.
+	  A userspace utility for testing the memory subsystem for
+	  faults.
 
 	  http://pyropus.ca/software/memtester/
diff --git a/bsp/buildroot/package/memtester/memtester.mk b/bsp/buildroot/package/memtester/memtester.mk
index 802c1e49..0e64d8cd 100644
--- a/bsp/buildroot/package/memtester/memtester.mk
+++ b/bsp/buildroot/package/memtester/memtester.mk
@@ -6,7 +6,7 @@
 
 MEMTESTER_VERSION = 4.3.0
 MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions
-MEMTESTER_LICENSE = GPLv2
+MEMTESTER_LICENSE = GPL-2.0
 MEMTESTER_LICENSE_FILES = COPYING
 
 MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr
diff --git a/bsp/buildroot/package/memtool/Config.in b/bsp/buildroot/package/memtool/Config.in
new file mode 100644
index 00000000..63099d0d
--- /dev/null
+++ b/bsp/buildroot/package/memtool/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_MEMTOOL
+	bool "memtool"
+	help
+	  Development tool to modify memory mapped registers.
+
+	  memtool allows one to read and write memory mapped registers
+	  via /dev/mem. The commands are inspired by the respective
+	  commands of the barebox bootloader.  This is handy during
+	  driver development to inspect and modify register
+	  settings. It can also be used to modify regular files and
+	  character devices (e.g. to paint to /dev/fb0).
+
+	  http://www.pengutronix.de/software/memtool/index_en.html
diff --git a/bsp/buildroot/package/memtool/memtool.hash b/bsp/buildroot/package/memtool/memtool.hash
new file mode 100644
index 00000000..95df1aaf
--- /dev/null
+++ b/bsp/buildroot/package/memtool/memtool.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256  58309d356cb9b45a241cb602ca3850891a70ddaa93ced51d1cced78e14767680  memtool-2016.10.0.tar.xz
diff --git a/bsp/buildroot/package/memtool/memtool.mk b/bsp/buildroot/package/memtool/memtool.mk
new file mode 100644
index 00000000..c236cab8
--- /dev/null
+++ b/bsp/buildroot/package/memtool/memtool.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# memtool
+#
+################################################################################
+
+MEMTOOL_VERSION = 2016.10.0
+MEMTOOL_SITE = http://public.pengutronix.de/software/memtool
+MEMTOOL_SOURCE = memtool-$(MEMTOOL_VERSION).tar.xz
+MEMTOOL_LICENSE = GPL-2.0
+MEMTOOL_LICENSE_FILES = COPYING
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/menu-cache/Config.in b/bsp/buildroot/package/menu-cache/Config.in
index b75c8ec0..e61ca447 100644
--- a/bsp/buildroot/package/menu-cache/Config.in
+++ b/bsp/buildroot/package/menu-cache/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_MENU_CACHE
 	bool "menu-cache"
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBFM_EXTRA
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBFM_EXTRA
 	help
 	  Small library from LXDE project used for application menu
 	  integration
diff --git a/bsp/buildroot/package/menu-cache/menu-cache.mk b/bsp/buildroot/package/menu-cache/menu-cache.mk
index 16878258..b5fde990 100644
--- a/bsp/buildroot/package/menu-cache/menu-cache.mk
+++ b/bsp/buildroot/package/menu-cache/menu-cache.mk
@@ -9,7 +9,7 @@ MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).1
 MENU_CACHE_SOURCE = menu-cache-$(MENU_CACHE_VERSION).tar.xz
 MENU_CACHE_SITE = http://sourceforge.net/projects/lxde/files/menu-cache/$(MENU_CACHE_VERSION_MAJOR)
 MENU_CACHE_DEPENDENCIES = libfm-extra libglib2
-MENU_CACHE_LICENSE = LGPLv2.1
+MENU_CACHE_LICENSE = LGPL-2.1
 MENU_CACHE_LICENSE_FILES = COPYING
 MENU_CACHE_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/mesa3d-demos/Config.in b/bsp/buildroot/package/mesa3d-demos/Config.in
index f22c0dee..b716cf57 100644
--- a/bsp/buildroot/package/mesa3d-demos/Config.in
+++ b/bsp/buildroot/package/mesa3d-demos/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_MESA3D_DEMOS
 	bool "mesa3d-demos"
+	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
+		|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
 	select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL
-	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \
-		|| BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG
 	help
 	  OpenGL demos from the Mesa 3D project.
 
diff --git a/bsp/buildroot/package/mesa3d-demos/mesa3d-demos.mk b/bsp/buildroot/package/mesa3d-demos/mesa3d-demos.mk
index cbc15c3b..91828037 100644
--- a/bsp/buildroot/package/mesa3d-demos/mesa3d-demos.mk
+++ b/bsp/buildroot/package/mesa3d-demos/mesa3d-demos.mk
@@ -12,7 +12,6 @@ MESA3D_DEMOS_DEPENDENCIES = host-pkgconf
 MESA3D_DEMOS_LICENSE = MIT
 
 MESA3D_DEMOS_CONF_OPTS += \
-	--disable-osmesa \
 	--disable-gles1
 
 ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy)
diff --git a/bsp/buildroot/package/mesa3d-headers/mesa3d-headers.mk b/bsp/buildroot/package/mesa3d-headers/mesa3d-headers.mk
index 35b1a714..90f5c3cf 100644
--- a/bsp/buildroot/package/mesa3d-headers/mesa3d-headers.mk
+++ b/bsp/buildroot/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,9 +12,9 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 13.0.4
+MESA3D_HEADERS_VERSION = 17.3.6
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
-MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
+MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive
 MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
 MESA3D_HEADERS_LICENSE_FILES = docs/license.html
 
@@ -34,9 +34,9 @@ ifeq ($(BR2_PACKAGE_XORG7),y)
 # contains -i.
 define MESA3D_HEADERS_BUILD_DRI_PC
 	sed -e 's:@\(exec_\)\?prefix@:/usr:' \
-	    -e 's:@libdir@:${exec_prefix}/lib:' \
-	    -e 's:@includedir@:${prefix}/include:' \
-	    -e 's:@DRI_DRIVER_INSTALL_DIR@:${libdir}/dri:' \
+	    -e 's:@libdir@:$${exec_prefix}/lib:' \
+	    -e 's:@includedir@:$${prefix}/include:' \
+	    -e 's:@DRI_DRIVER_INSTALL_DIR@:$${libdir}/dri:' \
 	    -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \
 	    -e 's:@DRI_PC_REQ_PRIV@::' \
 	    $(@D)/src/mesa/drivers/dri/dri.pc.in \
diff --git a/bsp/buildroot/package/mesa3d/0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch b/bsp/buildroot/package/mesa3d/0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch
deleted file mode 100644
index ab773f85..00000000
--- a/bsp/buildroot/package/mesa3d/0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 83a1afd73f2d0aff9aa11c1754d6d407983afa7d Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Wed, 9 Apr 2014 12:48:36 +0200
-Subject: [PATCH] Fix khrplatform.h not installed if EGL is disabled.
-
-KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is
-only installed if Mesa3d is compiled with EGL support.
-
-This patch installs this header file unconditionally.
-
-Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=77240
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> (rebased for mesa3d 10.3)
-
-diff -uNr Mesa-10.3.0-rc2.org/src/egl/main/Makefile.am Mesa-10.3.0-rc2/src/egl/main/Makefile.am
---- Mesa-10.3.0-rc2.org/src/egl/Makefile.am	2014-08-29 00:00:57.000000000 +0200
-+++ Mesa-10.3.0-rc2/src/egl/Makefile.am	2014-09-02 21:35:52.548071820 +0200
-@@ -85,9 +85,6 @@
- 
- pkgconfig_DATA = egl.pc
- 
--khrdir = $(includedir)/KHR
--khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
--
- egldir = $(includedir)/EGL
- egl_HEADERS = \
- 	$(top_srcdir)/include/EGL/eglext.h \
-diff -uNr Mesa-10.3.0-rc2.org/src/mapi/Makefile.am Mesa-10.3.0-rc2/src/mapi/Makefile.am
---- Mesa-10.3.0-rc2.org/src/mapi/Makefile.am	2014-09-01 01:22:12.000000000 +0200
-+++ Mesa-10.3.0-rc2/src/mapi/Makefile.am	2014-09-02 21:36:22.891686861 +0200
-@@ -211,4 +211,7 @@
- SUBDIRS += vgapi
- endif
- 
-+khrdir = $(includedir)/KHR
-+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h
-+
- include $(top_srcdir)/install-lib-links.mk
diff --git a/bsp/buildroot/package/mesa3d/0003-musl.patch b/bsp/buildroot/package/mesa3d/0001-musl.patch
similarity index 100%
rename from bsp/buildroot/package/mesa3d/0003-musl.patch
rename to bsp/buildroot/package/mesa3d/0001-musl.patch
diff --git a/bsp/buildroot/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch b/bsp/buildroot/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch
new file mode 100644
index 00000000..4846b34c
--- /dev/null
+++ b/bsp/buildroot/package/mesa3d/0002-Fix-endianess-detection-with-musl-based-toolchains.patch
@@ -0,0 +1,67 @@
+From 4135bd2e13880866deb0440855d1a869397e5024 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Fri, 4 Nov 2016 19:44:37 +0100
+Subject: [PATCH] Fix endianess detection with musl-based toolchains
+
+Musl does not define __GLIBC__ and will not provide a __MUSL__ macro:
+http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F
+
+This patch checks for the presence of endian.h and promotes the result
+to src/amd/Makefile.addrlib.am which executes the broken build command.
+Fixes compile errors detected by the autobuilder infrastructure of the
+buildroot project:
+
+http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/
+http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/
+
+Patch sent upstream: https://patchwork.freedesktop.org/patch/119961/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Romain: rebase on mesa 17.3.1]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ configure.ac                | 1 +
+ src/amd/Makefile.addrlib.am | 1 +
+ src/util/u_endian.h         | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a02173f244..ee03d6f582 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -791,6 +791,7 @@ fi
+ AC_HEADER_MAJOR
+ AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"])
+ AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
++AC_CHECK_HEADER([endian.h], [DEFINES="$DEFINES -DHAVE_ENDIAN_H"])
+ AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
+ AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
+ AC_CHECK_FUNC([memfd_create], [DEFINES="$DEFINES -DHAVE_MEMFD_CREATE"])
+diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am
+index 46689637f9..508edfd0d5 100644
+--- a/src/amd/Makefile.addrlib.am
++++ b/src/amd/Makefile.addrlib.am
+@@ -30,6 +30,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \
+ 	-I$(srcdir)/addrlib/inc/chip/r800 \
+ 	-I$(srcdir)/addrlib/gfx9/chip \
+ 	-I$(srcdir)/addrlib/r800/chip \
++	$(DEFINES) \
+ 	-DBRAHMA_BUILD=1
+ 
+ addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
+diff --git a/src/util/u_endian.h b/src/util/u_endian.h
+index 9e09f80181..038a28fac9 100644
+--- a/src/util/u_endian.h
++++ b/src/util/u_endian.h
+@@ -27,7 +27,7 @@
+ #ifndef U_ENDIAN_H
+ #define U_ENDIAN_H
+ 
+-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
++#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) || defined(HAVE_ENDIAN_H)
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch b/bsp/buildroot/package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch
deleted file mode 100644
index 59627bef..00000000
--- a/bsp/buildroot/package/mesa3d/0002-Fix-runtime-error-with-uClibc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Fix runtime error with uClibc
-
-Patch inspired by
-https://www.winehq.org/pipermail/wine-bugs/2011-September/288987.html
-http://git.alpinelinux.org/cgit/aports/tree/main/wine/uclibc-fmaxf-fminf.patch?id=c9b491b6099eec02a835ffd05539b5c783c6c43a
-
-Starting an app using mesa3d 10.5.x, Kodi for example, fails:
-
-/usr/lib/kodi/kodi.bin: symbol 'fminf': can't resolve symbol in lib '/usr/lib/dri/i965_dri.so'.
-libGL error: unable to load driver: i965_dri.so
-libGL error: driver pointer missing
-libGL error: failed to load driver: i965
-libGL error: unable to load driver: swrast_dri.so
-libGL error: failed to load driver: swrast
-
-This patch was rejected by upstream mesa3d:
-http://lists.freedesktop.org/archives/mesa-dev/2015-March/079436.html
-
-The real fix was committed to uClibc:
-http://git.uclibc.org/uClibc/commit/?id=6c4538905e65ceb203f59aaa9a61728e81c6bc0a
-
-Until the external toolchains do not contain this uClibc patch we keep this
-patch: http://lists.busybox.net/pipermail/buildroot/2015-March/123410.html
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-diff -uNr mesa-10.5.3.org/src/glsl/nir/nir_constant_expressions.c mesa-10.5.3/src/glsl/nir/nir_constant_expressions.c
---- mesa-10.5.3.org/src/compiler/nir/nir_constant_expressions.c	2015-04-12 23:31:29.000000000 +0200
-+++ mesa-10.5.3/src/compiler/nir/nir_constant_expressions.c	2015-04-13 19:59:37.819786541 +0200
-@@ -48,6 +48,18 @@
- }
- #endif
- 
-+#ifdef __UCLIBC__
-+float fmaxf(float a, float b)
-+{
-+	return (a > b) ? a : b;
-+}
-+
-+float fminf(float a, float b)
-+{
-+	return (a < b) ? a : b;
-+}
-+#endif
-+
- /**
-  * Evaluate one component of packSnorm4x8.
-  */
diff --git a/bsp/buildroot/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch b/bsp/buildroot/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch
new file mode 100644
index 00000000..bfb63765
--- /dev/null
+++ b/bsp/buildroot/package/mesa3d/0003-configure.ac-invert-order-for-wayland-scanner-check.patch
@@ -0,0 +1,44 @@
+From 11a759c33160db6e887e7640071ba84482e6164f Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Thu, 17 Nov 2016 15:36:54 -0300
+Subject: [PATCH] configure.ac: invert order for wayland-scanner check
+
+When cross-compiling the .pc file might point to the wrong
+wayland-scanner binary (target rather than host) resulting in a
+non-executable and wrong scanner.
+Try searching the PATH first, and if that fails fall back into
+pkg-config.
+
+[Vincent: tweak patch for 17.1.1 version]
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+[Romain: rebase on 17.3.1]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ configure.ac | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index ee03d6f582..786b7214b9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1695,11 +1695,11 @@ if test "x$with_platforms" = xauto; then
+     with_platforms=$with_egl_platforms
+ fi
+ 
+-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+-        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+-        WAYLAND_SCANNER='')
++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+ if test "x$WAYLAND_SCANNER" = x; then
+-    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:])
++	PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
++		WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
++		WAYLAND_SCANNER='')
+ fi
+ 
+ PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no])
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch b/bsp/buildroot/package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch
deleted file mode 100644
index 656705b4..00000000
--- a/bsp/buildroot/package/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 61b076689b6308b1c9d0d84ee8654a47e65e67ae Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Fri, 4 Nov 2016 19:44:37 +0100
-Subject: [PATCH 1/1] Fix endianess detection with musl-based toolchains
-
-Musl does not define __GLIBC__ and will not provide a __MUSL__ macro:
-http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F
-
-This patch checks for the presence of endian.h and promotes the result
-to src/amd/Makefile.addrlib.am which executes the broken build command.
-Fixes compile errors detected by the autobuilder infrastructure of the
-buildroot project:
-
-http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/
-http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/
-
-Patch sent upstream: https://patchwork.freedesktop.org/patch/119961/
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- configure.ac                | 1 +
- src/amd/Makefile.addrlib.am | 1 +
- src/util/u_endian.h         | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4761c59..7991b52 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -786,6 +786,7 @@ fi
- AC_HEADER_MAJOR
- AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"])
- AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"])
-+AC_CHECK_HEADER([endian.h], [DEFINES="$DEFINES -DHAVE_ENDIAN_H"])
- AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"])
- AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"])
- 
-diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am
-index 64823fc..4e2fb1d 100644
---- a/src/amd/Makefile.addrlib.am
-+++ b/src/amd/Makefile.addrlib.am
-@@ -28,6 +28,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \
- 	-I$(srcdir)/addrlib/core \
- 	-I$(srcdir)/addrlib/inc/chip/r800 \
- 	-I$(srcdir)/addrlib/r800/chip \
-+	$(DEFINES) \
- 	-DBRAHMA_BUILD=1
- 
- addrlib_libamdgpu_addrlib_la_CXXFLAGS = \
-diff --git a/src/util/u_endian.h b/src/util/u_endian.h
-index b9d563d..266fb4a 100644
---- a/src/util/u_endian.h
-+++ b/src/util/u_endian.h
-@@ -27,7 +27,7 @@
- #ifndef U_ENDIAN_H
- #define U_ENDIAN_H
- 
--#if defined(__GLIBC__) || defined(ANDROID)
-+#if defined(__GLIBC__) || defined(ANDROID) || defined(HAVE_ENDIAN_H)
- #include <endian.h>
- 
- #if __BYTE_ORDER == __LITTLE_ENDIAN
--- 
-2.10.1
-
diff --git a/bsp/buildroot/package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch b/bsp/buildroot/package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch
deleted file mode 100644
index e32031ec..00000000
--- a/bsp/buildroot/package/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Thu, 17 Nov 2016 15:36:54 -0300
-Subject: [PATCH] configure.ac: invert order for wayland-scanner check
-
-When cross-compiling the .pc file might point to the wrong
-wayland-scanner binary (target rather than host) resulting in a
-non-executable and wrong scanner.
-Try searching the PATH first, and if that fails fall back into
-pkg-config.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5f30ae8..461792e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2025,11 +2025,11 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
-     AC_MSG_ERROR([cannot build egl state tracker without EGL library])
- fi
- 
--PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
--        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
--        WAYLAND_SCANNER='')
-+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
- if test "x$WAYLAND_SCANNER" = x; then
--    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
-+    PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
-+            WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
-+            WAYLAND_SCANNER='')
- fi
- 
- # Do per-EGL platform setups and checks
--- 
-2.7.3
-
diff --git a/bsp/buildroot/package/mesa3d/Config.in b/bsp/buildroot/package/mesa3d/Config.in
index bbab9537..f141587c 100644
--- a/bsp/buildroot/package/mesa3d/Config.in
+++ b/bsp/buildroot/package/mesa3d/Config.in
@@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
 	select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
@@ -15,8 +16,10 @@ menuconfig BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_ZLIB
 	help
-	  Mesa 3D, an open-source implementation of the OpenGL specification.
+	  Mesa 3D, an open-source implementation of the OpenGL
+	  specification.
 
 	  http://mesa3d.org
 
@@ -24,14 +27,21 @@ if BR2_PACKAGE_MESA3D
 
 # inform the .mk file of gallium, dri or vulkan driver selection
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
-	select BR2_PACKAGE_MESA3D_DRIVER
 	bool
+	select BR2_PACKAGE_MESA3D_DRIVER
 
 config BR2_PACKAGE_MESA3D_DRI_DRIVER
-	select BR2_PACKAGE_MESA3D_DRIVER
-	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
-	select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO
 	bool
+	select BR2_PACKAGE_MESA3D_DRIVER
+	# xlib-libxshmfence needs sync_4, so we cannot select it if
+	# BR2_TOOLCHAIN_HAS_SYNC_4 is false. xproto-presentproto
+	# doesn't need sync_4, but it is only needed in conjunction
+	# with xlib-libxshmfence and dri3proto to provide dri3
+	# support, so we also only select it if sync_4 is available.
+	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
+		(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
+	select BR2_PACKAGE_XPROTO_PRESENTPROTO if \
+		(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
 
 config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
 	bool
@@ -45,6 +55,14 @@ config BR2_PACKAGE_MESA3D_NEEDS_XA
 
 comment "Gallium drivers"
 
+config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV
+	bool "Gallium Etnaviv driver"
+	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
+	select BR2_PACKAGE_LIBDRM_ETNAVIV
+	select BR2_PACKAGE_MESA3D_OPENGL_EGL
+	help
+	  Mesa driver for Vivante GPUs.
+
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
 	bool "Gallium nouveau driver"
 	depends on BR2_i386 || BR2_x86_64
@@ -81,10 +99,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
 
 config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4
 	bool "Gallium vc4 driver"
-	depends on BR2_arm
+	depends on BR2_ARM_CPU_HAS_NEON || BR2_aarch64
 	select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 	select BR2_PACKAGE_LIBDRM_VC4
 	select BR2_PACKAGE_MESA3D_NEEDS_XA
+	select BR2_PACKAGE_MESA3D_OPENGL_EGL
 	help
 	  Driver for Broadcom VC4 (rpi2/3) GPUs.
 	  It requires a vanilla 4.5+ kernel with drm vc4 (open) support.
@@ -144,11 +163,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h
 	depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert
 	depends on BR2_PACKAGE_XORG7 # xproto_dri3proto
-	# We need a SHA1 implementation. If either openssl or
-	# libgcrypt are already part of the build, we'll use one of
-	# them, otherwise, use the small libsha1 library.
-	select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT)
-	select BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
 	select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
 	select BR2_PACKAGE_XPROTO_DRI3PROTO
 	help
@@ -164,7 +178,8 @@ comment "Off-screen Rendering"
 config BR2_PACKAGE_MESA3D_OSMESA
 	bool "OSMesa library"
 	help
-	  The OSMesa API provides functions for making off-screen renderings.
+	  The OSMesa API provides functions for making off-screen
+	  renderings.
 
 if BR2_PACKAGE_MESA3D_DRIVER
 
@@ -175,15 +190,38 @@ config BR2_PACKAGE_MESA3D_OPENGL_EGL
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
 	help
-	  Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications
-	  similar to GLX, for X, and WGL, for Windows.
+	  Use the Khronos EGL APIs. EGL is a window manager for OpenGL
+	  applications similar to GLX, for X, and WGL, for Windows.
 
 config BR2_PACKAGE_MESA3D_OPENGL_ES
 	bool "OpenGL ES"
 	select BR2_PACKAGE_HAS_LIBGLES
 	help
-	  Use the Khronos OpenGL ES APIs. This is commonly used on embedded
-	  systems and represents a subset of the OpenGL API.
+	  Use the Khronos OpenGL ES APIs. This is commonly used on
+	  embedded systems and represents a subset of the OpenGL API.
+
+config BR2_PACKAGE_MESA3D_OPENGL_TEXTURE_FLOAT
+	bool "OpenGL texture float (patented format)"
+	help
+	  GL_ARB_texture_float is required to enable GLX core profile
+	  (OpenGL3.x) otherwise the compat profile is used
+	  (OpenGL2.1).
+
+	  The source code to implement ARB_texture_float extension is
+	  included and can be toggled on at compile time, for those
+	  who purchased a license from SGI, or are in a country where
+	  the patent does not apply, etc.
+
+	  Please consult docs/patents.txt with your lawyer before
+	  building Mesa.
+
+	  Also, note that this option doesn't affect all drivers. Some
+	  drivers have support for texture float enabled
+	  unconditionally.
+
+	  If unsure, say N.
+
+	  http://www.google.com/patents/about?id=mIIOAAAAEBAJ&dq=6650327
 
 endif # BR2_PACKAGE_MESA3D_DRIVER
 
diff --git a/bsp/buildroot/package/mesa3d/mesa3d.hash b/bsp/buildroot/package/mesa3d/mesa3d.hash
index b3c4b777..a61fe02b 100644
--- a/bsp/buildroot/package/mesa3d/mesa3d.hash
+++ b/bsp/buildroot/package/mesa3d/mesa3d.hash
@@ -1,2 +1,8 @@
-# From https://lists.freedesktop.org/archives/mesa-announce/2017-February/000294.html
-sha256 a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726  mesa-13.0.4.tar.xz
+# From https://lists.freedesktop.org/archives/mesa-announce/2018-February/000403.html
+md5 ba66ae0f09b9b84482268608557cd175  mesa-17.3.6.tar.xz
+sha1 eff29cb8c284a813977d4201dd646d949b1d8fc4  mesa-17.3.6.tar.xz
+sha256 e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8  mesa-17.3.6.tar.xz
+sha512 5164ed5a1d3d25031b712a9f443f0e467a29b2bca0a1aa11324ed5c10279411979c9c7482825053926a813e76c58b78a3439c7c81fcd51a7808f53977080828f  mesa-17.3.6.tar.xz
+# License
+sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c  docs/license.html
+sha256 a75ee0cec909515ff80a3ec07155b7fb0aafe8051abe1f0e45d5c4c5e2539366  docs/patents.txt
diff --git a/bsp/buildroot/package/mesa3d/mesa3d.mk b/bsp/buildroot/package/mesa3d/mesa3d.mk
index bed31150..5f4832c0 100644
--- a/bsp/buildroot/package/mesa3d/mesa3d.mk
+++ b/bsp/buildroot/package/mesa3d/mesa3d.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 13.0.4
+MESA3D_VERSION = 17.3.6
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
-MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
+MESA3D_SITE = https://mesa.freedesktop.org/archive
 MESA3D_LICENSE = MIT, SGI, Khronos
 MESA3D_LICENSE_FILES = docs/license.html
 MESA3D_AUTORECONF = YES
@@ -20,7 +20,11 @@ MESA3D_DEPENDENCIES = \
 	host-bison \
 	host-flex \
 	expat \
-	libdrm
+	libdrm \
+	zlib
+
+# Disable assembly usage.
+MESA3D_CONF_OPTS = --disable-asm
 
 # Disable static, otherwise configure will fail with: "Cannot enable both static
 # and shared."
@@ -36,17 +40,6 @@ MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh"
 MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh"
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MESA3D_DEPENDENCIES += openssl
-MESA3D_CONF_OPTS += --with-sha1=libcrypto
-else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
-MESA3D_DEPENDENCIES += libgcrypt
-MESA3D_CONF_OPTS += --with-sha1=libgcrypt
-else ifeq ($(BR2_PACKAGE_LIBSHA1),y)
-MESA3D_DEPENDENCIES += libsha1
-MESA3D_CONF_OPTS += --with-sha1=libsha1
-endif
-
 ifeq ($(BR2_PACKAGE_XORG7),y)
 MESA3D_DEPENDENCIES += \
 	xproto_xf86driproto \
@@ -73,6 +66,7 @@ endif
 # Drivers
 
 #Gallium Drivers
+MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV)  += etnaviv imx
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU)  += nouveau
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600)     += r600
 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA)     += svga
@@ -90,18 +84,20 @@ MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL)   += intel
 
 ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),)
 MESA3D_CONF_OPTS += \
-	--without-gallium-drivers
+	--without-gallium-drivers \
+	--disable-gallium-extra-hud
 else
 MESA3D_CONF_OPTS += \
 	--enable-shared-glapi \
-	--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y))
+	--with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) \
+	--enable-gallium-extra-hud
 endif
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 MESA3D_CONF_OPTS += \
 	--without-dri-drivers --disable-dri3
 else
-ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
+ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
 MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
 MESA3D_CONF_OPTS += --enable-dri3
 else
@@ -151,26 +147,31 @@ endef
 MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
-MESA3D_PROVIDES += libegl
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
-MESA3D_EGL_PLATFORMS = drm
+MESA3D_PLATFORMS = drm
 else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y)
-MESA3D_EGL_PLATFORMS = drm
+MESA3D_PLATFORMS = drm
+else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV),y)
+MESA3D_PLATFORMS = drm
 else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y)
-MESA3D_EGL_PLATFORMS = drm
+MESA3D_PLATFORMS = drm
 endif
 ifeq ($(BR2_PACKAGE_WAYLAND),y)
-MESA3D_DEPENDENCIES += wayland
-MESA3D_EGL_PLATFORMS += wayland
+MESA3D_DEPENDENCIES += wayland wayland-protocols
+MESA3D_PLATFORMS += wayland
 endif
 ifeq ($(BR2_PACKAGE_XORG7),y)
-MESA3D_EGL_PLATFORMS += x11
+MESA3D_PLATFORMS += x11
 endif
+
+MESA3D_CONF_OPTS += \
+	--with-platforms=$(subst $(space),$(comma),$(MESA3D_PLATFORMS))
+
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
+MESA3D_PROVIDES += libegl
 MESA3D_CONF_OPTS += \
 	--enable-gbm \
-	--enable-egl \
-	--with-egl-platforms=$(subst $(space),$(comma),$(MESA3D_EGL_PLATFORMS))
+	--enable-egl
 else
 MESA3D_CONF_OPTS += \
 	--disable-egl
@@ -183,6 +184,34 @@ else
 MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2
 endif
 
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_TEXTURE_FLOAT),y)
+MESA3D_CONF_OPTS += --enable-texture-float
+MESA3D_LICENSE_FILES += docs/patents.txt
+else
+MESA3D_CONF_OPTS += --disable-texture-float
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXVMC),y)
+MESA3D_DEPENDENCIES += xlib_libXvMC
+MESA3D_CONF_OPTS += --enable-xvmc
+else
+MESA3D_CONF_OPTS += --disable-xvmc
+endif
+
+ifeq ($(BR2_PACKAGE_LIBUNWIND),y)
+MESA3D_CONF_OPTS += --enable-libunwind
+MESA3D_DEPENDENCIES += libunwind
+else
+MESA3D_CONF_OPTS += --disable-libunwind
+endif
+
+ifeq ($(BR2_PACKAGE_LIBVDPAU),y)
+MESA3D_DEPENDENCIES += libvdpau
+MESA3D_CONF_OPTS += --enable-vdpau
+else
+MESA3D_CONF_OPTS += --disable-vdpau
+endif
+
 ifeq ($(BR2_PACKAGE_LM_SENSORS),y)
 MESA3D_CONF_OPTS += --enable-lmsensors
 MESA3D_DEPENDENCIES += lm-sensors
diff --git a/bsp/buildroot/package/meson/cross-compilation.conf.in b/bsp/buildroot/package/meson/cross-compilation.conf.in
new file mode 100644
index 00000000..0eec7408
--- /dev/null
+++ b/bsp/buildroot/package/meson/cross-compilation.conf.in
@@ -0,0 +1,23 @@
+# Note: Buildroot's and Meson's terminologies differ about the meaning
+# of 'build', 'host' and 'target':
+# - Buildroot's 'host' is Meson's 'build'
+# - Buildroot's 'target' is Meson's 'host'
+
+[binaries]
+c = '@TARGET_CROSS@gcc'
+cpp = '@TARGET_CROSS@g++'
+ar = '@TARGET_CROSS@ar'
+strip = '@TARGET_CROSS@strip'
+pkgconfig = '@HOST_DIR@/usr/bin/pkg-config'
+
+[properties]
+c_args = [@TARGET_CFLAGS@]
+c_link_args = [@TARGET_LDFLAGS@]
+cpp_args = [@TARGET_CXXFLAGS@]
+cpp_link_args = [@TARGET_LDFLAGS@]
+
+[host_machine]
+system = 'linux'
+cpu_family ='@TARGET_ARCH@'
+cpu = '@TARGET_CPU@'
+endian = '@TARGET_ENDIAN@'
diff --git a/bsp/buildroot/package/meson/meson.hash b/bsp/buildroot/package/meson/meson.hash
new file mode 100644
index 00000000..279dd93a
--- /dev/null
+++ b/bsp/buildroot/package/meson/meson.hash
@@ -0,0 +1,4 @@
+# Locally calculated after checking pgp signature
+# https://github.com/mesonbuild/meson/releases/download/0.44.0/meson-0.44.0.tar.gz.asc
+sha256	50f9b12b77272ef6ab064d26b7e06667f07fa9f931e6a20942bba2216ba4281b	meson-0.44.0.tar.gz
+sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30	COPYING
diff --git a/bsp/buildroot/package/meson/meson.mk b/bsp/buildroot/package/meson/meson.mk
new file mode 100644
index 00000000..764c187e
--- /dev/null
+++ b/bsp/buildroot/package/meson/meson.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# meson
+#
+################################################################################
+
+MESON_VERSION = 0.44.0
+MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
+MESON_LICENSE = Apache-2.0
+MESON_LICENSE_FILES = COPYING
+MESON_SETUP_TYPE = setuptools
+
+HOST_MESON_DEPENDENCIES = host-ninja
+HOST_MESON_NEEDS_HOST_PYTHON = python3
+
+HOST_MESON_TARGET_ENDIAN = $(call LOWERCASE,$(BR2_ENDIAN))
+HOST_MESON_TARGET_CPU = $(call qstrip,$(BR2_GCC_TARGET_CPU))
+
+HOST_MESON_SED_CFLAGS = $(if $(TARGET_CFLAGS),`printf '"%s"$(comma) ' $(TARGET_CFLAGS)`)
+HOST_MESON_SED_LDFLAGS = $(if $(TARGET_LDFLAGS),`printf '"%s"$(comma) ' $(TARGET_LDFLAGS)`)
+HOST_MESON_SED_CXXFLAGS = $(if $(TARGET_CXXFLAGS),`printf '"%s"$(comma) ' $(TARGET_CXXFLAGS)`)
+
+define HOST_MESON_INSTALL_CROSS_CONF
+	mkdir -p $(HOST_DIR)/etc/meson
+	sed -e "s%@TARGET_CROSS@%$(TARGET_CROSS)%g" \
+	    -e "s%@TARGET_ARCH@%$(ARCH)%g" \
+	    -e "s%@TARGET_CPU@%$(HOST_MESON_TARGET_CPU)%g" \
+	    -e "s%@TARGET_ENDIAN@%$(HOST_MESON_TARGET_ENDIAN)%g" \
+	    -e "s%@TARGET_CFLAGS@%$(HOST_MESON_SED_CFLAGS)%g" \
+	    -e "s%@TARGET_LDFLAGS@%$(HOST_MESON_SED_LDFLAGS)%g" \
+	    -e "s%@TARGET_CXXFLAGS@%$(HOST_MESON_SED_CXXFLAGS)%g" \
+	    -e "s%@HOST_DIR@%$(HOST_DIR)%g" \
+	    $(HOST_MESON_PKGDIR)/cross-compilation.conf.in \
+	    > $(HOST_DIR)/etc/meson/cross-compilation.conf
+endef
+
+HOST_MESON_POST_INSTALL_HOOKS += HOST_MESON_INSTALL_CROSS_CONF
+
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/metacity/metacity.mk b/bsp/buildroot/package/metacity/metacity.mk
index d8897791..b93200ca 100644
--- a/bsp/buildroot/package/metacity/metacity.mk
+++ b/bsp/buildroot/package/metacity/metacity.mk
@@ -9,7 +9,7 @@ METACITY_VERSION_MAJOR = 2.25
 METACITY_VERSION = $(METACITY_VERSION_MAJOR).1
 METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2
 METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR)
-METACITY_LICENSE = GPLv2+
+METACITY_LICENSE = GPL-2.0+
 METACITY_LICENSE_FILES = COPYING
 
 METACITY_CONF_OPTS = \
diff --git a/bsp/buildroot/package/mfgtools/mfgtools.mk b/bsp/buildroot/package/mfgtools/mfgtools.mk
index 99a72cb2..e4663a8a 100644
--- a/bsp/buildroot/package/mfgtools/mfgtools.mk
+++ b/bsp/buildroot/package/mfgtools/mfgtools.mk
@@ -7,14 +7,14 @@
 MFGTOOLS_VERSION = v0.02
 MFGTOOLS_SITE = $(call github,codeauroraforum,mfgtools,$(MFGTOOLS_VERSION))
 MFGTOOLS_SUBDIR = MfgToolLib
-MFGTOOLS_LICENSE = BSD-3c or CPOL
+MFGTOOLS_LICENSE = BSD-3-Clause or CPOL
 MFGTOOLS_LICENSE_FILES = LICENSE README.txt
 HOST_MFGTOOLS_DEPENDENCIES = host-libusb
 
 HOST_MFGTOOLS_CFLAGS = \
 	$(HOST_CFLAGS) $(HOST_LDFLAGS) -std=c++11 -lpthread \
 	-L$(@D)/MfgToolLib -lMfgToolLib -I$(@D)/MfgToolLib \
-	-lusb-1.0 -I$(HOST_DIR)/usr/include/libusb-1.0 \
+	-lusb-1.0 -I$(HOST_DIR)/include/libusb-1.0 \
 	-fpermissive -Wno-write-strings
 
 define HOST_MFGTOOLS_CLI_BUILD
@@ -26,9 +26,9 @@ HOST_MFGTOOLS_POST_BUILD_HOOKS += HOST_MFGTOOLS_CLI_BUILD
 
 define HOST_MFGTOOLS_INSTALL_CMDS
 	$(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \
-		$(HOST_DIR)/usr/lib/libMfgToolLib.so
+		$(HOST_DIR)/lib/libMfgToolLib.so
 	$(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \
-		$(HOST_DIR)/usr/bin/mfgtoolcli
+		$(HOST_DIR)/bin/mfgtoolcli
 endef
 
 $(eval $(host-cmake-package))
diff --git a/bsp/buildroot/package/mfgtools/readme.txt b/bsp/buildroot/package/mfgtools/readme.txt
index d54781f1..320e6ec4 100644
--- a/bsp/buildroot/package/mfgtools/readme.txt
+++ b/bsp/buildroot/package/mfgtools/readme.txt
@@ -42,7 +42,7 @@ Depending on your ucl2.xml file, the sample doesn't flash anything.
 
 6. Run the MfgTools client:
 
-$ ./host/usr/bin/mfgtoolcli -l mmc -s uboot_defconfig=imx \
+$ ./host/bin/mfgtoolcli -l mmc -s uboot_defconfig=imx \
   -s dtbname=imx6q-sabrelite.dtb -s initramfs=rootfs.cpio.uboot \
   -s mmc=1 -p 1
 
diff --git a/bsp/buildroot/package/micropython-lib/Config.in b/bsp/buildroot/package/micropython-lib/Config.in
index 599af779..76557b22 100644
--- a/bsp/buildroot/package/micropython-lib/Config.in
+++ b/bsp/buildroot/package/micropython-lib/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MICROPYTHON_LIB
 	bool "micropython-lib"
-	select BR2_PACKAGE_PCRE # runtime
 	depends on BR2_PACKAGE_MICROPYTHON
+	select BR2_PACKAGE_PCRE # runtime
 	help
 	  Core Python libraries ported to MicroPython.
 
diff --git a/bsp/buildroot/package/micropython-lib/micropython-lib.mk b/bsp/buildroot/package/micropython-lib/micropython-lib.mk
index 066572e5..c9423fea 100644
--- a/bsp/buildroot/package/micropython-lib/micropython-lib.mk
+++ b/bsp/buildroot/package/micropython-lib/micropython-lib.mk
@@ -6,7 +6,7 @@
 
 MICROPYTHON_LIB_VERSION = v1.8.6
 MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION))
-MICROPYTHON_LIB_LICENSE = Python software foundation license v2 (some modules), MIT (everything else)
+MICROPYTHON_LIB_LICENSE = Python-2.0 (some modules), MIT (everything else)
 MICROPYTHON_LIB_LICENSE_FILES = LICENSE
 
 define MICROPYTHON_LIB_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/micropython/Config.in b/bsp/buildroot/package/micropython/Config.in
index ed65d6ab..00649d4f 100644
--- a/bsp/buildroot/package/micropython/Config.in
+++ b/bsp/buildroot/package/micropython/Config.in
@@ -1,13 +1,14 @@
 config BR2_PACKAGE_MICROPYTHON
 	bool "micropython"
-	select BR2_PACKAGE_LIBFFI
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	# libffi doesn't provide the closure implementation on Blackfin
 	depends on !BR2_bfin
+	select BR2_PACKAGE_LIBFFI
 	help
-	  Micro Python is a lean and fast implementation of the Python 3
-	  programming language that is optimised to run on a microcontroller.
+	  Micro Python is a lean and fast implementation of the Python
+	  3 programming language that is optimised to run on a
+	  microcontroller.
 
 	  http://micropython.org
 
diff --git a/bsp/buildroot/package/midori/Config.in b/bsp/buildroot/package/midori/Config.in
index 35dac156..f0767c85 100644
--- a/bsp/buildroot/package/midori/Config.in
+++ b/bsp/buildroot/package/midori/Config.in
@@ -1,10 +1,18 @@
-comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5"
+comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8"
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \
+		!BR2_TOOLCHAIN_USES_GLIBC
 
 config BR2_PACKAGE_MIDORI
 	bool "midori"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2
+	depends on BR2_PACKAGE_LIBGTK3
+	depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk
+	depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk
+	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	# GCR can only be used with the X11 backend
 	select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_GRANITE
@@ -13,14 +21,7 @@ config BR2_PACKAGE_MIDORI
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_WEBKITGTK
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2
-	depends on BR2_PACKAGE_LIBGTK3
-	depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # webkitgtk
-	depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk
-	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	help
 	  Midori is a lightweight web browser based on WebKit
 
diff --git a/bsp/buildroot/package/midori/midori.mk b/bsp/buildroot/package/midori/midori.mk
index 5aa83c6f..1755f124 100644
--- a/bsp/buildroot/package/midori/midori.mk
+++ b/bsp/buildroot/package/midori/midori.mk
@@ -7,7 +7,7 @@
 MIDORI_VERSION = 0.5.11
 MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2
 MIDORI_SITE = http://midori-browser.org/downloads
-MIDORI_LICENSE = LGPLv2.1+
+MIDORI_LICENSE = LGPL-2.1+
 MIDORI_LICENSE_FILES = COPYING
 MIDORI_DEPENDENCIES = \
 	host-intltool \
@@ -22,7 +22,7 @@ MIDORI_DEPENDENCIES = \
 	libxml2 \
 	sqlite \
 	webkitgtk \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
 
 MIDORI_CONF_OPTS = \
diff --git a/bsp/buildroot/package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch b/bsp/buildroot/package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch
new file mode 100644
index 00000000..e484e50a
--- /dev/null
+++ b/bsp/buildroot/package/minetest-game/0001-Default-Revert-Default-Shorter-and-better-ABMs.patch
@@ -0,0 +1,54 @@
+From 626cd8e9c7c2a5d5c907a12abbaa6066b6d5f2ff Mon Sep 17 00:00:00 2001
+From: "vorunbekannt75@web.de" <vorunbekannt75@web.de>
+Date: Tue, 6 Jun 2017 19:20:58 +0200
+Subject: [PATCH] Default: Revert "Default: Shorter and better ABMs"
+
+This reverts commit e523c3a2965afe76b9102b67992e15fafba1594a to re-enable
+the overriding and redefinition of these global functions.
+
+[Romain backport from upstream]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ mods/default/functions.lua | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/mods/default/functions.lua b/mods/default/functions.lua
+index 5dc22ca..327e0c8 100644
+--- a/mods/default/functions.lua
++++ b/mods/default/functions.lua
+@@ -139,7 +139,9 @@ if minetest.settings:get_bool("enable_lavacooling") ~= false then
+ 		interval = 1,
+ 		chance = 2,
+ 		catch_up = false,
+-		action = default.cool_lava,
++		action = function(...)
++			default.cool_lava(...)
++		end,
+ 	})
+ end
+ 
+@@ -222,7 +224,9 @@ minetest.register_abm({
+ 	neighbors = {"group:sand"},
+ 	interval = 12,
+ 	chance = 83,
+-	action = default.grow_cactus
++	action = function(...)
++		default.grow_cactus(...)
++	end
+ })
+ 
+ minetest.register_abm({
+@@ -231,7 +235,9 @@ minetest.register_abm({
+ 	neighbors = {"default:dirt", "default:dirt_with_grass"},
+ 	interval = 14,
+ 	chance = 71,
+-	action = default.grow_papyrus
++	action = function(...)
++		default.grow_papyrus(...)
++	end
+ })
+ 
+ 
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/minetest-game/Config.in b/bsp/buildroot/package/minetest-game/Config.in
new file mode 100644
index 00000000..cf92ea52
--- /dev/null
+++ b/bsp/buildroot/package/minetest-game/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_MINETEST_GAME
+	bool "minetest-game"
+	depends on BR2_PACKAGE_MINETEST
+	help
+	  The main subgame for the Minetest engine.
+
+	  https://github.com/minetest/minetest_game
diff --git a/bsp/buildroot/package/minetest-game/minetest-game.hash b/bsp/buildroot/package/minetest-game/minetest-game.hash
new file mode 100644
index 00000000..1a2fe78a
--- /dev/null
+++ b/bsp/buildroot/package/minetest-game/minetest-game.hash
@@ -0,0 +1,25 @@
+# Locally calculated
+sha256 ea914555949b4faccda5e13143cb021d2f9a5fa19abd1f5e4b7b65004cbd2b5a minetest-game-0.4.16.tar.gz
+
+sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt
+sha256 3382f3bf99566089543621ee3256f7f98bf9364d3b852c5ed08202d435215d7d mods/beds/license.txt
+sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt
+sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt
+sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt
+sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt
+sha256 c0eca35bf446b1b9c8a0d1eefa0613bf2996187cd1f9382e7424b3d0b0dd7851 mods/creative/license.txt
+sha256 0542a1ff8212197bf350b6135fb4d29f8a2341d9ddc1407ec812d7fb609a5c0f mods/default/license.txt
+sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt
+sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt
+sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt
+sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt
+sha256 a8647ac7609fdaea96bd0ec58ac5837fd17d049fd450008fd7922162979a292e mods/flowers/license.txt
+sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt
+sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt
+sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt
+sha256 a82dfda1c9feb704997ea42116eb6a15a1f3f99ee8c49215fbbd32d519e8ad74 mods/stairs/license.txt
+sha256 1d42ffae6bad0da2e76966532f5f759bbeb5adb395ee4bf7bacca1fdfef745a6 mods/tnt/license.txt
+sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt
+sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt
+sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt
+sha256 54fd170807a31712e3d6489287a27cdf5aa42eaff10e321aea040fb5b3e5a60a mods/xpanes/license.txt
diff --git a/bsp/buildroot/package/minetest-game/minetest-game.mk b/bsp/buildroot/package/minetest-game/minetest-game.mk
new file mode 100644
index 00000000..2386944a
--- /dev/null
+++ b/bsp/buildroot/package/minetest-game/minetest-game.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# minetest_game
+#
+################################################################################
+
+MINETEST_GAME_VERSION = 0.4.16
+MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION))
+MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \
+	CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods)
+MINETEST_GAME_LICENSE_FILES = LICENSE.txt \
+	mods/beds/license.txt \
+	mods/boats/license.txt \
+	mods/bones/license.txt \
+	mods/bucket/license.txt \
+	mods/carts/license.txt \
+	mods/creative/license.txt \
+	mods/default/license.txt \
+	mods/doors/license.txt \
+	mods/dye/license.txt \
+	mods/farming/license.txt \
+	mods/fire/license.txt \
+	mods/flowers/license.txt \
+	mods/give_initial_stuff/license.txt \
+	mods/screwdriver/license.txt \
+	mods/sethome/license.txt \
+	mods/stairs/license.txt \
+	mods/tnt/license.txt \
+	mods/vessels/license.txt \
+	mods/walls/license.txt \
+	mods/wool/license.txt \
+	mods/xpanes/license.txt
+
+define MINETEST_GAME_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/share/minetest/games/minetest_game
+	cp -dpfr $(@D)/* $(TARGET_DIR)/usr/share/minetest/games/minetest_game
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/minetest/Config.in b/bsp/buildroot/package/minetest/Config.in
new file mode 100644
index 00000000..4e8b1d0e
--- /dev/null
+++ b/bsp/buildroot/package/minetest/Config.in
@@ -0,0 +1,66 @@
+config BR2_PACKAGE_MINETEST
+	bool "minetest"
+	depends on BR2_INSTALL_LIBSTDCPP # irrlicht
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_PACKAGE_XORG7 # irrlicht
+	depends on BR2_PACKAGE_HAS_LIBGL # irrlicht
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	select BR2_PACKAGE_IRRLICHT
+	select BR2_PACKAGE_GMP
+	select BR2_PACKAGE_JSONCPP
+	select BR2_PACKAGE_LUAJIT
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ZLIB
+	# At least one option must be enabled
+	select BR2_PACKAGE_MINETEST_CLIENT if !BR2_PACKAGE_MINETEST_SERVER
+	help
+	  Minetest is a near-infinite-world block sandbox game and a
+	  game engine, inspired by InfiniMiner, Minecraft, and the
+	  like.
+
+	  http://www.minetest.net
+
+if BR2_PACKAGE_MINETEST
+
+config BR2_PACKAGE_MINETEST_CLIENT
+	bool "minetest client"
+	select BR2_PACKAGE_BZIP2
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_JPEG
+	select BR2_PACKAGE_XLIB_LIBXXF86VM
+	help
+	  Build Minetest client.
+
+config BR2_PACKAGE_MINETEST_SERVER
+	bool "minetest server"
+	help
+	  Build Minetest server.
+
+config BR2_PACKAGE_MINETEST_SOUND
+	bool "enable sound"
+	depends on BR2_PACKAGE_MINETEST_CLIENT
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_OPENAL
+
+comment "sound support needs a toolchain w/ threads NPTL"
+	depends on BR2_PACKAGE_MINETEST_CLIENT
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+
+endif
+
+comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads"
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on !BR2_INSTALL_LIBSTDCPP \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
+		|| !BR2_TOOLCHAIN_HAS_THREADS
+
+comment "minetest needs X11 and an OpenGL provider"
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on (BR2_INSTALL_LIBSTDCPP \
+		&& BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \
+		&& BR2_TOOLCHAIN_HAS_THREADS)
+	depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
diff --git a/bsp/buildroot/package/minetest/minetest.hash b/bsp/buildroot/package/minetest/minetest.hash
new file mode 100644
index 00000000..5e6aeffa
--- /dev/null
+++ b/bsp/buildroot/package/minetest/minetest.hash
@@ -0,0 +1,4 @@
+# Locally calculated
+sha256 0ef3793de9f569746ea78af7a66fe96ef65400019e5e64a04a5c3fa26a707655  minetest-0.4.16.tar.gz
+
+sha256 e48121374512b8f2fada00ac1c8e100a767e2a2edd2853557ccf1995e35a4be0  README.txt
diff --git a/bsp/buildroot/package/minetest/minetest.mk b/bsp/buildroot/package/minetest/minetest.mk
new file mode 100644
index 00000000..a813a0db
--- /dev/null
+++ b/bsp/buildroot/package/minetest/minetest.mk
@@ -0,0 +1,92 @@
+################################################################################
+#
+# minetest
+#
+################################################################################
+
+MINETEST_VERSION = 0.4.16
+MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION))
+MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds)
+MINETEST_LICENSE_FILES = README.txt
+
+MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib
+
+MINETEST_CONF_OPTS = \
+	-DDEFAULT_RUN_IN_PLACE=OFF \
+	-DENABLE_GLES=OFF \
+	-DENABLE_LUAJIT=ON \
+	-DENABLE_CURSES=OFF \
+	-DAPPLY_LOCALE_BLACKLIST=OFF \
+	-DENABLE_SYSTEM_GMP=ON \
+	-DENABLE_SYSTEM_JSONCPP=ON
+
+ifeq ($(BR2_PACKAGE_MINETEST_CLIENT),y)
+MINETEST_DEPENDENCIES += bzip2 jpeg libgl libpng xlib_libXxf86vm
+MINETEST_CONF_OPTS += -DBUILD_CLIENT=ON
+else
+MINETEST_CONF_OPTS += -DBUILD_CLIENT=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_MINETEST_SERVER),y)
+MINETEST_CONF_OPTS += -DBUILD_SERVER=ON
+else
+MINETEST_CONF_OPTS += -DBUILD_SERVER=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_MINETEST_SOUND),y)
+MINETEST_DEPENDENCIES += libvorbis openal
+MINETEST_CONF_OPTS += -DENABLE_SOUND=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_SOUND=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_FREETYPE),y)
+MINETEST_DEPENDENCIES += freetype
+MINETEST_CONF_OPTS += -DENABLE_FREETYPE=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_FREETYPE=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_HIREDIS),y)
+MINETEST_DEPENDENCIES += hiredis
+MINETEST_CONF_OPTS += -DENABLE_REDIS=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_REDIS=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LEVELDB),y)
+MINETEST_DEPENDENCIES += leveldb
+MINETEST_CONF_OPTS += -DENABLE_LEVELDB=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_LEVELDB=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+MINETEST_DEPENDENCIES += libcurl
+MINETEST_CONF_OPTS += -DENABLE_CURL=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_CURL=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSPATIALINDEX),y)
+MINETEST_DEPENDENCIES += libspatialindex
+MINETEST_CONF_OPTS += -DENABLE_SPATIAL=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_SPATIAL=OFF
+endif
+
+ifeq ($(BR2_PACKAGE_POSTGRESQL),y)
+MINETEST_DEPENDENCIES += postgresql
+MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_POSTGRESQL=OFF
+endif
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+MINETEST_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
+MINETEST_CONF_OPTS += -DENABLE_GETTEXT=ON
+else
+MINETEST_CONF_OPTS += -DENABLE_GETTEXT=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/minicom/minicom.hash b/bsp/buildroot/package/minicom/minicom.hash
index ca308716..f49e430c 100644
--- a/bsp/buildroot/package/minicom/minicom.hash
+++ b/bsp/buildroot/package/minicom/minicom.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1  minicom-2.7.1.tar.gz
+sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15  COPYING
diff --git a/bsp/buildroot/package/minicom/minicom.mk b/bsp/buildroot/package/minicom/minicom.mk
index 3aa11ed9..cb064823 100644
--- a/bsp/buildroot/package/minicom/minicom.mk
+++ b/bsp/buildroot/package/minicom/minicom.mk
@@ -6,7 +6,7 @@
 
 MINICOM_VERSION = 2.7.1
 MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/4215
-MINICOM_LICENSE = GPLv2+
+MINICOM_LICENSE = GPL-2.0+
 MINICOM_LICENSE_FILES = COPYING
 
 # pkg-config is only used to check for liblockdev, which we don't have
diff --git a/bsp/buildroot/package/minidlna/Config.in b/bsp/buildroot/package/minidlna/Config.in
index c900143f..0083c9d8 100644
--- a/bsp/buildroot/package/minidlna/Config.in
+++ b/bsp/buildroot/package/minidlna/Config.in
@@ -13,10 +13,9 @@ config BR2_PACKAGE_MINIDLNA
 	select BR2_PACKAGE_LIBEXIF
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  MiniDLNA (aka ReadyDLNA) is server software with the aim of being
-	  fully compliant with DLNA/UPnP-AV clients.
+	  MiniDLNA (aka ReadyDLNA) is server software with the aim of
+	  being fully compliant with DLNA/UPnP-AV clients.
 
 	  http://minidlna.sourceforge.net/
 
diff --git a/bsp/buildroot/package/minidlna/minidlna.hash b/bsp/buildroot/package/minidlna/minidlna.hash
index d1ed4b91..5398506c 100644
--- a/bsp/buildroot/package/minidlna/minidlna.hash
+++ b/bsp/buildroot/package/minidlna/minidlna.hash
@@ -1,3 +1,5 @@
-# From http://sourceforge.net/projects/minidlna/files/minidlna/1.1.5/
-md5	1970e553a1eb8a3e7e302e2ce292cbc4	minidlna-1.1.5.tar.gz
-sha1	8185337621f5f9111118d8a4bca1e8cfcdd19505	minidlna-1.1.5.tar.gz
+# From https://sourceforge.net/projects/minidlna/files/minidlna/1.2.1/
+md5 a968d3d84971322471cabda3669cc0f8  minidlna-1.2.1.tar.gz
+sha1 79d0032c7055aefd4c8e5178bc86fbf258d449d2  minidlna-1.2.1.tar.gz
+# Locally computed
+sha256 67388ba23ab0c7033557a32084804f796aa2a796db7bb2b770fb76ac2a742eec  minidlna-1.2.1.tar.gz
diff --git a/bsp/buildroot/package/minidlna/minidlna.mk b/bsp/buildroot/package/minidlna/minidlna.mk
index c67373fd..262480cb 100644
--- a/bsp/buildroot/package/minidlna/minidlna.mk
+++ b/bsp/buildroot/package/minidlna/minidlna.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-MINIDLNA_VERSION = 1.1.5
-MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
-MINIDLNA_LICENSE = GPLv2, BSD-3c
+MINIDLNA_VERSION = 1.2.1
+MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
+MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause
 MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd
 
 MINIDLNA_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext \
+	$(TARGET_NLS_DEPENDENCIES) \
 	ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \
 	host-xutil_makedepend
 
diff --git a/bsp/buildroot/package/minissdpd/minissdpd.hash b/bsp/buildroot/package/minissdpd/minissdpd.hash
index 8d670f3e..dd166775 100644
--- a/bsp/buildroot/package/minissdpd/minissdpd.hash
+++ b/bsp/buildroot/package/minissdpd/minissdpd.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	dfd637b185731e1acb412a86faa9718eb93c04ca08280541a6d22d14d1fb890f	minissdpd-1.5.tar.gz
+sha256	c432d6ee83deb6a0c105a2c3ebd11e3855ab91498b0847a8657e68ce8e4491a5	LICENSE
diff --git a/bsp/buildroot/package/minissdpd/minissdpd.mk b/bsp/buildroot/package/minissdpd/minissdpd.mk
index 5c8bd371..f3f383b1 100644
--- a/bsp/buildroot/package/minissdpd/minissdpd.mk
+++ b/bsp/buildroot/package/minissdpd/minissdpd.mk
@@ -6,7 +6,7 @@
 
 MINISSDPD_VERSION = 1.5
 MINISSDPD_SITE = http://miniupnp.free.fr/files
-MINISSDPD_LICENSE = BSD-3c
+MINISSDPD_LICENSE = BSD-3-Clause
 MINISSDPD_LICENSE_FILES = LICENSE
 MINISSDPD_DEPENDENCIES = libnfnetlink
 
diff --git a/bsp/buildroot/package/minizip/minizip.hash b/bsp/buildroot/package/minizip/minizip.hash
index 994ed60a..718026c1 100644
--- a/bsp/buildroot/package/minizip/minizip.hash
+++ b/bsp/buildroot/package/minizip/minizip.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 ac361f40531d9fb7222d4befd10d160c647d5e85138f6bc9eda080ed8f937fb8 minizip-5f56dd81d94bd7028f7dc05d7d14112697c30241.tar.gz
+sha256 5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1  minizip-1.1.tar.gz
diff --git a/bsp/buildroot/package/minizip/minizip.mk b/bsp/buildroot/package/minizip/minizip.mk
index 3d612886..bcd6cc92 100644
--- a/bsp/buildroot/package/minizip/minizip.mk
+++ b/bsp/buildroot/package/minizip/minizip.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-MINIZIP_VERSION = 5f56dd81d94bd7028f7dc05d7d14112697c30241
+MINIZIP_VERSION = 1.1
 MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION))
 MINIZIP_DEPENDENCIES = zlib
 MINIZIP_AUTORECONF = YES
 MINIZIP_INSTALL_STAGING = YES
 MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos)
-MINIZIP_LICENSE = zlib license
+MINIZIP_LICENSE = Zlib
 MINIZIP_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/miraclecast/Config.in b/bsp/buildroot/package/miraclecast/Config.in
index 4c6a8aaa..57bd57a9 100644
--- a/bsp/buildroot/package/miraclecast/Config.in
+++ b/bsp/buildroot/package/miraclecast/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MIRACLECAST
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_GSTREAMER1
 	select BR2_PACKAGE_READLINE
-	select BR2_PACKAGE_SYSTEMD_KDBUS
 	help
 	  The MiracleCast project provides software to connect external
 	  monitors to your system via Wifi. It is compatible to the
diff --git a/bsp/buildroot/package/miraclecast/miraclecast.mk b/bsp/buildroot/package/miraclecast/miraclecast.mk
index 17e73f1e..f75191b2 100644
--- a/bsp/buildroot/package/miraclecast/miraclecast.mk
+++ b/bsp/buildroot/package/miraclecast/miraclecast.mk
@@ -6,7 +6,7 @@
 
 MIRACLECAST_VERSION = c94be167c85c6ec8badd7ac79e3dea2e0b73225c
 MIRACLECAST_SITE = $(call github,albfan,miraclecast,$(MIRACLECAST_VERSION))
-MIRACLECAST_LICENSE = LGPLv2.1+, GPLv2 (gdhcp)
+MIRACLECAST_LICENSE = LGPL-2.1+, GPL-2.0 (gdhcp)
 MIRACLECAST_LICENSE_FILES = COPYING LICENSE_gdhcp LICENSE_htable LICENSE_lgpl
 MIRACLECAST_DEPENDENCIES = host-pkgconf systemd gstreamer1 \
 	readline libglib2
diff --git a/bsp/buildroot/package/mjpegtools/Config.in b/bsp/buildroot/package/mjpegtools/Config.in
index 6a36109d..c486361a 100644
--- a/bsp/buildroot/package/mjpegtools/Config.in
+++ b/bsp/buildroot/package/mjpegtools/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_MJPEGTOOLS
 	bool "mjpegtools"
-	select BR2_PACKAGE_JPEG
 	depends on BR2_USE_MMU # fork
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_JPEG
 	help
 	  The mjpegtools programs are a set of tools
 	  that can do recording of videos and playback,
diff --git a/bsp/buildroot/package/mjpegtools/mjpegtools.mk b/bsp/buildroot/package/mjpegtools/mjpegtools.mk
index 76ae968d..c7392fa2 100644
--- a/bsp/buildroot/package/mjpegtools/mjpegtools.mk
+++ b/bsp/buildroot/package/mjpegtools/mjpegtools.mk
@@ -7,7 +7,7 @@
 MJPEGTOOLS_VERSION = 2.1.0
 MJPEGTOOLS_SITE = http://sourceforge.net/projects/mjpeg/files/mjpegtools/$(MJPEGTOOLS_VERSION)
 MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg
-MJPEGTOOLS_LICENSE = GPLv2+
+MJPEGTOOLS_LICENSE = GPL-2.0+
 MJPEGTOOLS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
diff --git a/bsp/buildroot/package/mjpg-streamer/mjpg-streamer.mk b/bsp/buildroot/package/mjpg-streamer/mjpg-streamer.mk
index a710af6f..4fecf69e 100644
--- a/bsp/buildroot/package/mjpg-streamer/mjpg-streamer.mk
+++ b/bsp/buildroot/package/mjpg-streamer/mjpg-streamer.mk
@@ -10,7 +10,7 @@
 # http://sourceforge.net/p/mjpg-streamer/patches/14/
 MJPG_STREAMER_VERSION = bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b
 MJPG_STREAMER_SITE = $(call github,oliv3r,mjpg-streamer,$(MJPG_STREAMER_VERSION))
-MJPG_STREAMER_LICENSE = GPLv2+
+MJPG_STREAMER_LICENSE = GPL-2.0+
 MJPG_STREAMER_LICENSE_FILES = LICENSE
 MJPG_STREAMER_DEPENDENCIES = jpeg
 
diff --git a/bsp/buildroot/package/mke2img/Config.in.host b/bsp/buildroot/package/mke2img/Config.in.host
deleted file mode 100644
index b5bcb845..00000000
--- a/bsp/buildroot/package/mke2img/Config.in.host
+++ /dev/null
@@ -1,11 +0,0 @@
-config BR2_PACKAGE_HOST_MKE2IMG
-	bool "host mke2img"
-	select BR2_PACKAGE_HOST_E2FSPROGS
-	select BR2_PACKAGE_HOST_GENEXT2FS
-	help
-	  Easily create filesystems of the extend familly: ext2/3/4.
-
-	  This tool is bundled by, and specific to Buildroot. However, it can
-	  be used from post-images scripts is needed.
-
-	  https://code.google.com/p/mke2img/
diff --git a/bsp/buildroot/package/mke2img/mke2img b/bsp/buildroot/package/mke2img/mke2img
deleted file mode 100755
index c2e0d02b..00000000
--- a/bsp/buildroot/package/mke2img/mke2img
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/env bash
-
-# Buildroot wrapper to the collection of ext2/3/4 filesystem tools:
-# - genext2fs, to generate ext2 filesystem images
-# - tune2fs, to modify an ext2/3/4 filesystem (possibly in an image file)
-# - e2fsck, to check and fix an ext2/3/4 filesystem (possibly in an image file)
-
-set -e
-
-main() {
-    local OPT OPTARG
-    local nb_blocks nb_inodes nb_res_blocks root_dir image gen rev label uuid
-    local -a genext2fs_opts
-    local -a tune2fs_opts
-    local tune2fs_O_opts
-
-    # Default values
-    gen=2
-    rev=1
-    nb_extra_blocks=0
-    nb_extra_inodes=0
-
-    while getopts :hb:B:i:I:r:d:o:G:R:l:u: OPT; do
-        case "${OPT}" in
-        h)  help; exit 0;;
-        b)  nb_blocks=${OPTARG};;
-        B)  nb_extra_blocks=${OPTARG};;
-        i)  nb_inodes=${OPTARG};;
-        I)  nb_extra_inodes=${OPTARG};;
-        r)  nb_res_blocks=${OPTARG};;
-        d)  root_dir="${OPTARG}";;
-        o)  image="${OPTARG}";;
-        G)  gen=${OPTARG};;
-        R)  rev=${OPTARG};;
-        l)  label="${OPTARG}";;
-        u)  uuid="${OPTARG}";;
-        :)  error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
-        \?) error "unknown option '%s'\n" "${OPTARG}";;
-        esac
-    done
-
-    # Sanity checks
-    if [ -z "${root_dir}" ]; then
-        error "you must specify a root directory with '-d'\n"
-    fi
-    if [ -z "${image}" ]; then
-        error "you must specify an output image file with '-o'\n"
-    fi
-    case "${gen}:${rev}" in
-    2:0|2:1|3:1|4:1)
-        ;;
-    3:0|4:0)
-        error "revision 0 is invalid for ext3 and ext4\n"
-        ;;
-    *)  error "unknown ext generation '%s' and/or revision '%s'\n" \
-               "${gen}" "${rev}"
-        ;;
-    esac
-
-    # calculate needed inodes
-    if [ -z "${nb_inodes}" ]; then
-        nb_inodes=$(find "${root_dir}" | wc -l)
-        nb_inodes=$((nb_inodes+400))
-    fi
-    nb_inodes=$((nb_inodes+nb_extra_inodes))
-
-    # calculate needed blocks
-    if [ -z "${nb_blocks}" ]; then
-        # size ~= superblock, block+inode bitmaps, inodes (8 per block),
-        # blocks; we scale inodes / blocks with 10% to compensate for
-        # bitmaps size + slack
-        nb_blocks=$(du -s -k "${root_dir}" |sed -r -e 's/[[:space:]]+.*$//')
-        nb_blocks=$((500+(nb_blocks+nb_inodes/8)*11/10))
-        if [ ${gen} -ge 3 ]; then
-            # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks)
-            # for the journal
-            # Note: I came to 1300 blocks after trial-and-error checks. YMMV.
-            nb_blocks=$((nb_blocks+1300))
-        fi
-    fi
-    nb_blocks=$((nb_blocks+nb_extra_blocks))
-
-    # Upgrade to rev1 if needed
-    if [ ${rev} -ge 1 ]; then
-        tune2fs_O_opts+=",filetype,sparse_super"
-    fi
-
-    # Add a journal for ext3 and above
-    if [ ${gen} -ge 3 ]; then
-        tune2fs_opts+=( -j -J size=1 )
-    fi
-
-    # Add ext4 specific features
-    if [ ${gen} -ge 4 ]; then
-        tune2fs_O_opts+=",extents,uninit_bg,dir_index"
-    fi
-
-    # Add our -O options (there will be at most one leading comma, remove it)
-    if [ -n "${tune2fs_O_opts}" ]; then
-        tune2fs_opts+=( -O "${tune2fs_O_opts#,}" )
-    fi
-
-    # Add the label if specified
-    if [ -n "${label}" ]; then
-        tune2fs_opts+=( -L "${label}" )
-    fi
-
-    # Generate the filesystem
-    genext2fs_opts=( -z -b ${nb_blocks} -N ${nb_inodes} -d "${root_dir}" )
-    if [ -n "${nb_res_blocks}" ]; then
-        genext2fs_opts+=( -m ${nb_res_blocks} )
-    fi
-    genext2fs "${genext2fs_opts[@]}" "${image}"
-
-    # genext2fs does not generate a UUID, but fsck will whine if one
-    # is missing, so we need to add a UUID.
-    # Of course, this has to happen _before_ we run fsck.
-    # Also, some ext4 metadata are based on the UUID, so we must
-    # set it before we can convert the filesystem to ext4.
-    # If the user did not specify a UUID, we generate a random one.
-    # Although a random UUID may seem bad for reproducibility, there
-    # already are so many things that are not reproducible in a
-    # filesystem: file dates, file ordering, content of the files...
-    tune2fs -U "${uuid:-random}" "${image}"
-
-    # Upgrade the filesystem
-    if [ ${#tune2fs_opts[@]} -ne 0 ]; then
-        tune2fs "${tune2fs_opts[@]}" "${image}"
-    fi
-
-    # After changing filesystem options, running fsck is required
-    # (see: man tune2fs). Running e2fsck in other cases will ensure
-    # coherency of the filesystem, although it is not required.
-    # 'e2fsck -pDf' means:
-    #  - automatically repair
-    #  - optimise and check for duplicate entries
-    #  - force checking
-    # Sending output to oblivion, as e2fsck can be *very* verbose,
-    # especially with filesystems generated by genext2fs.
-    # Exit codes 1 & 2 are OK, it means fs errors were successfully
-    # corrected, hence our little trick with $ret.
-    ret=0
-    e2fsck -pDf "${image}" >/dev/null || ret=$?
-    case ${ret} in
-       0|1|2) ;;
-       *)   errorN ${ret} "failed to run e2fsck on '%s' (ext%d)\n" \
-                   "${image}" ${gen}
-    esac
-    printf "\n"
-    trace "e2fsck was successfully run on '%s' (ext%d)\n" "${image}" ${gen}
-    printf "\n"
-
-    # Remove count- and time-based checks, they are not welcome
-    # on embedded devices, where they can cause serious boot-time
-    # issues by tremendously slowing down the boot.
-    tune2fs -c 0 -i 0 "${image}"
-}
-
-help() {
-    cat <<_EOF_
-NAME
-    ${my_name} - Create an ext2/3/4 filesystem image
-
-SYNOPSIS
-    ${my_name} [OPTION]...
-
-DESCRIPTION
-    Create ext2/3/4 filesystem image from the content of a directory.
-
-    -b BLOCKS
-        Create a filesystem of BLOCKS 1024-byte blocs. The default is to
-        compute the required number of blocks.
-
-    -i INODES
-        Create a filesystem with INODES inodes. The default is to compute
-        the required number of inodes.
-
-    -r RES_BLOCKS
-        Create a filesystem with RES_BLOCKS reserved blocks. The default
-        is to reserve 0 block.
-
-    -d ROOT_DIR
-        Create a filesystem, using the content of ROOT_DIR as the content
-        of the root of the filesystem. Mandatory.
-
-    -o FILE
-        Create the filesystem in FILE. Madatory.
-
-    -G GEN -R REV
-        Create a filesystem of generation GEN (2, 3 or 4), and revision
-        REV (0 or 1). The default is to generate an ext2 revision 1
-        filesystem; revision 0 is invalid for ext3 and ext4.
-
-    -l LABEL
-        Create a filesystem with label LABEL. The default is to not set
-        a label.
-
-    -u UUID
-        Create filesystem with uuid UUID. The default is to set a random
-        UUID.
-
-  Exit status:
-    0   if OK
-    !0  in case of error
-_EOF_
-}
-
-trace()  { local msg="${1}"; shift; printf "%s: ${msg}" "${my_name}" "${@}"; }
-warn()   { trace "${@}" >&2; }
-errorN() { local ret="${1}"; shift; warn "${@}"; exit ${ret}; }
-error()  { errorN 1 "${@}"; }
-
-my_name="${0##*/}"
-main "$@"
diff --git a/bsp/buildroot/package/mke2img/mke2img.mk b/bsp/buildroot/package/mke2img/mke2img.mk
deleted file mode 100644
index 9de387a3..00000000
--- a/bsp/buildroot/package/mke2img/mke2img.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# mke2img
-#
-################################################################################
-
-HOST_MKE2IMG_DEPENDENCIES = host-genext2fs host-e2fsprogs
-
-define HOST_MKE2IMG_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 package/mke2img/mke2img $(HOST_DIR)/usr/bin/mke2img
-endef
-
-$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/mkpasswd/mkpasswd.c b/bsp/buildroot/package/mkpasswd/mkpasswd.c
index 5820f325..fd162304 100644
--- a/bsp/buildroot/package/mkpasswd/mkpasswd.c
+++ b/bsp/buildroot/package/mkpasswd/mkpasswd.c
@@ -44,6 +44,11 @@
 #include <sys/time.h>
 #endif
 
+/* glibc without crypt() */
+#ifndef _XOPEN_CRYPT
+#include <crypt.h>
+#endif
+
 /* Application-specific */
 #include "utils.h"
 
diff --git a/bsp/buildroot/package/mkpasswd/mkpasswd.mk b/bsp/buildroot/package/mkpasswd/mkpasswd.mk
index 07935a41..b0133905 100644
--- a/bsp/buildroot/package/mkpasswd/mkpasswd.mk
+++ b/bsp/buildroot/package/mkpasswd/mkpasswd.mk
@@ -7,7 +7,7 @@
 # source included in buildroot, taken from
 # https://github.com/rfc1036/whois/blob/master/
 # at revision 5a0f08500fa51608b6d3b73ee338be38c692eadb
-HOST_MKPASSWD_LICENSE = GPLv2+
+HOST_MKPASSWD_LICENSE = GPL-2.0+
 
 define HOST_MKPASSWD_BUILD_CMDS
 	$(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \
@@ -16,9 +16,9 @@ define HOST_MKPASSWD_BUILD_CMDS
 endef
 
 define HOST_MKPASSWD_INSTALL_CMDS
-	$(INSTALL) -D -m 755 $(@D)/mkpasswd $(HOST_DIR)/usr/bin/mkpasswd
+	$(INSTALL) -D -m 755 $(@D)/mkpasswd $(HOST_DIR)/bin/mkpasswd
 endef
 
 $(eval $(host-generic-package))
 
-MKPASSWD = $(HOST_DIR)/usr/bin/mkpasswd
+MKPASSWD = $(HOST_DIR)/bin/mkpasswd
diff --git a/bsp/buildroot/package/mkpimage/mkpimage.mk b/bsp/buildroot/package/mkpimage/mkpimage.mk
index 04b2ef08..8e08013f 100644
--- a/bsp/buildroot/package/mkpimage/mkpimage.mk
+++ b/bsp/buildroot/package/mkpimage/mkpimage.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-HOST_MKPIMAGE_LICENSE = GPLv2
+HOST_MKPIMAGE_LICENSE = GPL-2.0
 
 # source included in the package
 # came from barebox's repository:
@@ -15,7 +15,7 @@ define HOST_MKPIMAGE_BUILD_CMDS
 endef
 
 define HOST_MKPIMAGE_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/mkpimage $(HOST_DIR)/usr/bin/mkpimage
+	$(INSTALL) -D -m 0755 $(@D)/mkpimage $(HOST_DIR)/bin/mkpimage
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/mksh/mksh.hash b/bsp/buildroot/package/mksh/mksh.hash
index e92acd93..411baa86 100644
--- a/bsp/buildroot/package/mksh/mksh.hash
+++ b/bsp/buildroot/package/mksh/mksh.hash
@@ -1,4 +1,4 @@
 # From http://www.mirbsd.org/mksh.htm#build
-md5	be0a6fb93b4a5f927bcc1893bb6692f8	mksh-R54.tgz
+md5 718c44251b52c48e7312903273e263f4  mksh-R55.tgz
 # Calculated based on the hash above
-sha256	8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013	mksh-R54.tgz
+sha256 ced42cb4a181d97d52d98009eed753bd553f7c34e6991d404f9a8dcb45c35a57  mksh-R55.tgz
diff --git a/bsp/buildroot/package/mksh/mksh.mk b/bsp/buildroot/package/mksh/mksh.mk
index 4d91bfcf..b5706dbe 100644
--- a/bsp/buildroot/package/mksh/mksh.mk
+++ b/bsp/buildroot/package/mksh/mksh.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MKSH_VERSION = R54
+MKSH_VERSION = R55
 MKSH_SOURCE = mksh-$(MKSH_VERSION).tgz
 MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh
 # For MirOS License see https://www.mirbsd.org/TaC-mksh.txt
diff --git a/bsp/buildroot/package/mmc-utils/mmc-utils.hash b/bsp/buildroot/package/mmc-utils/mmc-utils.hash
new file mode 100644
index 00000000..35cd5800
--- /dev/null
+++ b/bsp/buildroot/package/mmc-utils/mmc-utils.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 92ba148648688fca6e0e0e30248ebc6b432bea55584760f20a013583f20a109d  mmc-utils-37c86e60c0442fef570b75cd81aeb1db4d0cbafd.tar.gz
diff --git a/bsp/buildroot/package/mmc-utils/mmc-utils.mk b/bsp/buildroot/package/mmc-utils/mmc-utils.mk
index 7473a1b3..9aeaf5c6 100644
--- a/bsp/buildroot/package/mmc-utils/mmc-utils.mk
+++ b/bsp/buildroot/package/mmc-utils/mmc-utils.mk
@@ -4,16 +4,16 @@
 #
 ################################################################################
 
-MMC_UTILS_VERSION = 2cb6695e8dec00d887bdd5309d1b57d836fcd214
+MMC_UTILS_VERSION = 37c86e60c0442fef570b75cd81aeb1db4d0cbafd
 MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
-MMC_UTILS_LICENSE = GPLv2
+MMC_UTILS_LICENSE = GPL-2.0
 
 define MMC_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
 endef
 
 define MMC_UTILS_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/mmc $(TARGET_DIR)/usr/bin/mmc
+	$(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/moarvm/Config.in b/bsp/buildroot/package/moarvm/Config.in
index c318ab4b..c370a0f2 100644
--- a/bsp/buildroot/package/moarvm/Config.in
+++ b/bsp/buildroot/package/moarvm/Config.in
@@ -12,10 +12,12 @@ config BR2_PACKAGE_MOARVM
 	select BR2_PACKAGE_LIBATOMIC_OPS
 	# dyncall does not work on MIPS; libffi needs to be used.
 	# See: https://github.com/MoarVM/MoarVM/issues/222
-	select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	# dyncall does not work also on powerpc64 and powerpc64le
+	select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc64 || BR2_powerpc64le
 	help
-	  Short for "Metamodel On A Runtime", MoarVM is a virtual machine
-	  built especially for Rakudo Perl 6 and the NQP Compiler Toolchain.
+	  Short for "Metamodel On A Runtime", MoarVM is a virtual
+	  machine built especially for Rakudo Perl 6 and the NQP
+	  Compiler Toolchain.
 
 	  http://moarvm.com
 
diff --git a/bsp/buildroot/package/moarvm/moarvm.hash b/bsp/buildroot/package/moarvm/moarvm.hash
index e6335ab7..409486ac 100644
--- a/bsp/buildroot/package/moarvm/moarvm.hash
+++ b/bsp/buildroot/package/moarvm/moarvm.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2074693a42a7f31218bf69b70fd5b73d6fd1a1d0e31eaf3f528e204963e94c53  MoarVM-2017.01.tar.gz
+sha256 7cb9b7a871b14ac9b6cddc57e646d277177c4b3b21220e6fbc204084a15a4e41  MoarVM-2017.05.tar.gz
diff --git a/bsp/buildroot/package/moarvm/moarvm.mk b/bsp/buildroot/package/moarvm/moarvm.mk
index b459474a..705c9393 100644
--- a/bsp/buildroot/package/moarvm/moarvm.mk
+++ b/bsp/buildroot/package/moarvm/moarvm.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-MOARVM_VERSION = 2017.01
+MOARVM_VERSION = 2017.05
 MOARVM_SITE = http://moarvm.com/releases
 MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz
 MOARVM_LICENSE = Artistic-2.0
 MOARVM_LICENSE_FILES = Artistic2.txt
 MOARVM_INSTALL_STAGING = YES
-MOARVM_DEPENDENCIES = host-luajit host-pkgconf libuv libtommath libatomic_ops
+MOARVM_DEPENDENCIES = host-lua host-pkgconf libuv libtommath libatomic_ops
 
 MOARVM_CONF_OPTS = \
 	--build=$(GNU_HOST_NAME) \
@@ -20,7 +20,7 @@ MOARVM_CONF_OPTS = \
 	--ld="$(TARGET_CC)" \
 	--prefix="/usr" \
 	--pkgconfig=$(PKG_CONFIG_HOST_BINARY) \
-	--lua=$(HOST_DIR)/usr/bin/luajit \
+	--lua=$(HOST_DIR)/bin/lua \
 	--has-libuv \
 	--has-libtommath \
 	--has-libatomic
diff --git a/bsp/buildroot/package/modem-manager/Config.in b/bsp/buildroot/package/modem-manager/Config.in
index aa7ed1e2..8e995b41 100644
--- a/bsp/buildroot/package/modem-manager/Config.in
+++ b/bsp/buildroot/package/modem-manager/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_MODEM_MANAGER
 	depends on BR2_USE_WCHAR # libglib2 and gnutls
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
 	depends on BR2_USE_MMU # dbus
-	select BR2_PACKAGE_DBUS
-	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_DBUS # runtime dependency
+	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBGUDEV
 	help
 	  ModemManager is a DBus-activated daemon which controls mobile
diff --git a/bsp/buildroot/package/modem-manager/modem-manager.hash b/bsp/buildroot/package/modem-manager/modem-manager.hash
index 481f7dd4..bc080448 100644
--- a/bsp/buildroot/package/modem-manager/modem-manager.hash
+++ b/bsp/buildroot/package/modem-manager/modem-manager.hash
@@ -1,2 +1,4 @@
 # Locally computed
-sha256  e4544398d9c166f8e13fe7c97149f262ad1fb48af980e0d4f9c34013920c6393  ModemManager-1.6.2.tar.xz
+sha256  bc74326fa69ae8012f806e235f3d296144922669b952d4d4987dd0af645d5f68  ModemManager-1.6.10.tar.xz
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/bsp/buildroot/package/modem-manager/modem-manager.mk b/bsp/buildroot/package/modem-manager/modem-manager.mk
index c74c2243..b741acf0 100644
--- a/bsp/buildroot/package/modem-manager/modem-manager.mk
+++ b/bsp/buildroot/package/modem-manager/modem-manager.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-MODEM_MANAGER_VERSION = 1.6.2
+MODEM_MANAGER_VERSION = 1.6.10
 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz
 MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager
-MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib)
-MODEM_MANAGER_LICENSE_FILES = COPYING
-MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool libgudev
+MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib)
+MODEM_MANAGER_LICENSE_FILES = COPYING COPYING.LIB
+MODEM_MANAGER_DEPENDENCIES = host-pkgconf host-intltool libglib2 libgudev
 MODEM_MANAGER_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y)
diff --git a/bsp/buildroot/package/modplugtools/Config.in b/bsp/buildroot/package/modplugtools/Config.in
index 89c32206..33acad63 100644
--- a/bsp/buildroot/package/modplugtools/Config.in
+++ b/bsp/buildroot/package/modplugtools/Config.in
@@ -4,9 +4,9 @@ config BR2_PACKAGE_MODPLUGTOOLS
 	select BR2_PACKAGE_LIBAO
 	select BR2_PACKAGE_LIBMODPLUG
 	help
-	  This installs the 'modplug123' command line tool to play music files
-	  in the tracker formats supported by libmodplug: MOD, S3M, XM etc.
-	  Audio output is handled by libao.
+	  This installs the 'modplug123' command line tool to play
+	  music files in the tracker formats supported by libmodplug:
+	  MOD, S3M, XM etc.  Audio output is handled by libao.
 
 	  http://modplug-xmms.sourceforge.net/
 
diff --git a/bsp/buildroot/package/modplugtools/modplugtools.mk b/bsp/buildroot/package/modplugtools/modplugtools.mk
index e8d73afe..59a2a522 100644
--- a/bsp/buildroot/package/modplugtools/modplugtools.mk
+++ b/bsp/buildroot/package/modplugtools/modplugtools.mk
@@ -6,7 +6,7 @@
 
 MODPLUGTOOLS_VERSION = 0.5.3
 MODPLUGTOOLS_SITE = http://downloads.sourceforge.net/project/modplug-xmms/modplug-tools
-MODPLUGTOOLS_LICENSE = GPLv3
+MODPLUGTOOLS_LICENSE = GPL-3.0
 MODPLUGTOOLS_LICENSE_FILES = COPYING
 
 MODPLUGTOOLS_DEPENDENCIES = libao libmodplug
diff --git a/bsp/buildroot/package/mongodb/Config.in b/bsp/buildroot/package/mongodb/Config.in
index a78bb27e..ed3ad569 100644
--- a/bsp/buildroot/package/mongodb/Config.in
+++ b/bsp/buildroot/package/mongodb/Config.in
@@ -14,11 +14,12 @@ config BR2_PACKAGE_MONGODB
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	help
-	  MongoDB is a cross-platform document-oriented database (NoSQL).
+	  MongoDB is a cross-platform document-oriented database
+	  (NoSQL).
 
-	  It uses JSON-like documents with dynamic schemas (BSON), making
-	  the integration of data in certain types of applications easier
-	  and faster.
+	  It uses JSON-like documents with dynamic schemas (BSON),
+	  making the integration of data in certain types of
+	  applications easier and faster.
 
 	  https://www.mongodb.org/
 
diff --git a/bsp/buildroot/package/mongodb/mongodb.mk b/bsp/buildroot/package/mongodb/mongodb.mk
index f5b2c01d..54c904e5 100644
--- a/bsp/buildroot/package/mongodb/mongodb.mk
+++ b/bsp/buildroot/package/mongodb/mongodb.mk
@@ -8,7 +8,7 @@ MONGODB_VERSION_BASE = 3.3.4
 MONGODB_VERSION = r$(MONGODB_VERSION_BASE)
 MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION))
 
-MONGODB_LICENSE = AGPLv3, Apache-2.0
+MONGODB_LICENSE = AGPL-3.0, Apache-2.0
 MONGODB_LICENSE_FILES = GNU-AGPL-3.0.txt APACHE-2.0.txt
 
 MONGODB_DEPENDENCIES = host-scons
diff --git a/bsp/buildroot/package/mongoose/mongoose.hash b/bsp/buildroot/package/mongoose/mongoose.hash
index c131e48c..d5252eb6 100644
--- a/bsp/buildroot/package/mongoose/mongoose.hash
+++ b/bsp/buildroot/package/mongoose/mongoose.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256	94b934da083afe8abb1c0af5abb8f25294050011793f048166b12f000f9433a0  mongoose-6.2.tar.gz
+sha256	ccc971298db70963d3f13766c3246a3c36ae7e388acfab7ba2180149d9c8c64f  mongoose-6.7.tar.gz
diff --git a/bsp/buildroot/package/mongoose/mongoose.mk b/bsp/buildroot/package/mongoose/mongoose.mk
index 7dfa1198..e2149e06 100644
--- a/bsp/buildroot/package/mongoose/mongoose.mk
+++ b/bsp/buildroot/package/mongoose/mongoose.mk
@@ -4,18 +4,19 @@
 #
 ################################################################################
 
-MONGOOSE_VERSION = 6.2
+MONGOOSE_VERSION = 6.7
 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION))
-MONGOOSE_LICENSE = GPLv2
+MONGOOSE_LICENSE = GPL-2.0
 MONGOOSE_LICENSE_FILES = LICENSE
 MONGOOSE_INSTALL_STAGING = YES
+# static library
+MONGOOSE_INSTALL_TARGET = NO
 
-MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -DMONGOOSE_NO_DL
+MONGOOSE_CFLAGS = $(TARGET_CFLAGS)
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 MONGOOSE_DEPENDENCIES += openssl
-# directly linked
-MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz
+MONGOOSE_CFLAGS += -DMG_ENABLE_SSL
 endif
 
 define MONGOOSE_BUILD_CMDS
diff --git a/bsp/buildroot/package/mongrel2/Config.in b/bsp/buildroot/package/mongrel2/Config.in
index 796bae6d..a9b09b78 100644
--- a/bsp/buildroot/package/mongrel2/Config.in
+++ b/bsp/buildroot/package/mongrel2/Config.in
@@ -14,12 +14,12 @@ comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic lib
 
 config BR2_PACKAGE_MONGREL2
 	bool "mongrel2"
-	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_ZEROMQ
 	depends on BR2_INSTALL_LIBSTDCPP # zeromq
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on !BR2_STATIC_LIBS # uses dlopen()
 	depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_ZEROMQ
 	help
 	  Mongrel2 is an application, language, and network architecture
 	  agnostic web server that focuses on web applications using
diff --git a/bsp/buildroot/package/mongrel2/mongrel2.mk b/bsp/buildroot/package/mongrel2/mongrel2.mk
index c69c1434..a35a8724 100644
--- a/bsp/buildroot/package/mongrel2/mongrel2.mk
+++ b/bsp/buildroot/package/mongrel2/mongrel2.mk
@@ -9,7 +9,7 @@ MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2
 # Do not use the github helper here, the generated tarball is *NOT* the same
 # as the one uploaded by upstream for the release.
 MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/$(MONGREL2_VERSION)
-MONGREL2_LICENSE = BSD-3c
+MONGREL2_LICENSE = BSD-3-Clause
 MONGREL2_LICENSE_FILES = LICENSE
 MONGREL2_DEPENDENCIES = sqlite zeromq
 
diff --git a/bsp/buildroot/package/monit/monit.hash b/bsp/buildroot/package/monit/monit.hash
index 8eb02fce..611d3e18 100644
--- a/bsp/buildroot/package/monit/monit.hash
+++ b/bsp/buildroot/package/monit/monit.hash
@@ -1,2 +1,2 @@
-# From https://mmonit.com/monit/dist/monit-5.20.0.tar.gz.sha256:
-sha256  ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d  monit-5.20.0.tar.gz
+# From https://mmonit.com/monit/dist/monit-5.24.0.tar.gz.sha256:
+sha256  754d1f0e165e5a26d4639a6a83f44ccf839e381f2622e0946d5302fa1f2d2414  monit-5.24.0.tar.gz
diff --git a/bsp/buildroot/package/monit/monit.mk b/bsp/buildroot/package/monit/monit.mk
index f4899c3c..260bb5b7 100644
--- a/bsp/buildroot/package/monit/monit.mk
+++ b/bsp/buildroot/package/monit/monit.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-MONIT_VERSION = 5.20.0
+MONIT_VERSION = 5.24.0
 MONIT_SITE = http://mmonit.com/monit/dist
-MONIT_LICENSE = AGPLv3 with OpenSSL exception
+MONIT_LICENSE = AGPL-3.0 with OpenSSL exception
 MONIT_LICENSE_FILES = COPYING
 #
 # Touching Makefile.am:
diff --git a/bsp/buildroot/package/monkey/Config.in b/bsp/buildroot/package/monkey/Config.in
index 001c4153..9054aa05 100644
--- a/bsp/buildroot/package/monkey/Config.in
+++ b/bsp/buildroot/package/monkey/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_MONKEY
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on BR2_USE_MMU # fork()
 	help
-	  Monkey Server is a fast and lightweight web server for Linux platforms.
+	  Monkey Server is a fast and lightweight web server for Linux
+	  platforms.
 
 	  http://monkey-project.com/
 
diff --git a/bsp/buildroot/package/mono-gtksharp3/mono-gtksharp3.mk b/bsp/buildroot/package/mono-gtksharp3/mono-gtksharp3.mk
index cccfcde1..126aabed 100644
--- a/bsp/buildroot/package/mono-gtksharp3/mono-gtksharp3.mk
+++ b/bsp/buildroot/package/mono-gtksharp3/mono-gtksharp3.mk
@@ -8,10 +8,10 @@ MONO_GTKSHARP3_VERSION_MAJOR = 2.99
 MONO_GTKSHARP3_VERSION = $(MONO_GTKSHARP3_VERSION_MAJOR).3
 MONO_GTKSHARP3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR)
 MONO_GTKSHARP3_SOURCE = gtk-sharp-$(MONO_GTKSHARP3_VERSION).tar.xz
-MONO_GTKSHARP3_LICENSE = LGPLv2, MIT (cairo)
+MONO_GTKSHARP3_LICENSE = LGPL-2.0, MIT (cairo)
 MONO_GTKSHARP3_LICENSE_FILES = COPYING
 MONO_GTKSHARP3_INSTALL_STAGING = YES
 MONO_GTKSHARP3_DEPENDENCIES = mono libgtk3
-MONO_GTKSHARP3_CONF_OPTS += CSC=$(HOST_DIR)/usr/bin/mcs
+MONO_GTKSHARP3_CONF_OPTS += CSC=$(HOST_DIR)/bin/mcs
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/bsp/buildroot/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch
index 3714b658..a3e88e73 100644
--- a/bsp/buildroot/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch
+++ b/bsp/buildroot/package/mono/0006-Remove-unit-tests-from-mono-compilation.patch
@@ -1,6 +1,6 @@
-From 155f96953d1b898f04a4e708c9ebc1e450b2f63e Mon Sep 17 00:00:00 2001
+From 26e31fc54af591bdd88d6a4a79b7fa91c57f4b0c Mon Sep 17 00:00:00 2001
 From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
-Date: Tue, 24 Nov 2015 23:11:10 +0100
+Date: Thu, 10 Aug 2017 23:30:05 +0200
 Subject: [PATCH] Remove unit-tests from mono compilation
 
 This patch fixes compiling errors with unit-tests under linux.
@@ -11,19 +11,19 @@ Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mono/Makefile.am b/mono/Makefile.am
-index ef41dfe..7129507 100644
+index 8c9c2cb..7af36ec 100644
 --- a/mono/Makefile.am
 +++ b/mono/Makefile.am
-@@ -30,7 +30,7 @@ monotouch-do-clean:
+@@ -34,7 +34,7 @@ monotouch-do-clean:
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
      done;
  else
--SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
-+SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler
+-SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
++SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler
  endif
  endif
--DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
-+DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler
+-DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
++DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests benchmark profiler
 -- 
-1.9.1
+2.7.4
 
diff --git a/bsp/buildroot/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch b/bsp/buildroot/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
deleted file mode 100644
index 58fa3238..00000000
--- a/bsp/buildroot/package/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
-From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
-Date: Thu, 25 Feb 2016 22:19:31 +0100
-Subject: [PATCH] mcs/class/monodoc/Makefile: Fixing wrong monodoc search path
-
-mono_libdir actually leaks host compiler path, fixing
-by hardcoding correct path for our usecase.
-
-Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
----
- mcs/class/monodoc/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
-index 3ebba80..ddc2098 100644
---- a/mcs/class/monodoc/Makefile
-+++ b/mcs/class/monodoc/Makefile
-@@ -135,7 +135,7 @@ test-local: setup-doc-sources
- dist-local: Monodoc.Ecma/EcmaUrlParser.cs
- 
- $(the_lib).config: Makefile monodoc.dll.config.in
--	sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
-+	sed 's,@monodoc_refdir@,/usr/lib/monodoc,g' monodoc.dll.config.in > $@
- 
- Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh
- 	$(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS)
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch b/bsp/buildroot/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch
deleted file mode 100644
index 3d932b6d..00000000
--- a/bsp/buildroot/package/mono/0009-fix-musl-incorrect-sigcontext-include.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63f0b0246b8125ae48b15bd182bb5831be02e6c9 Mon Sep 17 00:00:00 2001
-From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
-Date: Mon, 27 Jun 2016 21:32:11 +0200
-Subject: [PATCH] fix musl incorrect sigcontext include
-
-On musl __GLIBC__ is not defined, so the conditional logic will
-not produce correct result. Add a specific case to handle when
-__GLIBC__ is not defined.
-
-Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
----
- libgc/os_dep.c             | 2 +-
- mono/mini/exceptions-arm.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libgc/os_dep.c b/libgc/os_dep.c
-index 8c8e098..34859c1 100644
---- a/libgc/os_dep.c
-+++ b/libgc/os_dep.c
-@@ -32,7 +32,7 @@
-       /* prototypes, so we have to include the top-level sigcontext.h to    */
-       /* make sure the former gets defined to be the latter if appropriate. */
- #     include <features.h>
--#     if 2 <= __GLIBC__
-+#     if 2 <= __GLIBC__ || !defined(__GLIBC__)
- #       if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__
- 	  /* glibc 2.1 no longer has sigcontext.h.  But signal.h	*/
- 	  /* has the right declaration for glibc 2.1.			*/
-diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c
-index b036aa7..a3e2164 100644
---- a/mono/mini/exceptions-arm.c
-+++ b/mono/mini/exceptions-arm.c
-@@ -14,7 +14,7 @@
- #include <string.h>
- 
- #ifndef MONO_CROSS_COMPILE
--#ifdef HAVE_ASM_SIGCONTEXT_H
-+#if defined(HAVE_ASM_SIGCONTEXT_H) && defined(__GLIBC__)
- #include <asm/sigcontext.h>
- #endif  /* def HAVE_ASM_SIGCONTEXT_H */
- #endif
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/mono/Config.in b/bsp/buildroot/package/mono/Config.in
index d45ad376..d1622370 100644
--- a/bsp/buildroot/package/mono/Config.in
+++ b/bsp/buildroot/package/mono/Config.in
@@ -1,5 +1,11 @@
+config BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
+	bool
+	default y if BR2_HOSTARCH = "x86_64"
+	default y if BR2_HOSTARCH = "x86"
+
 config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 	bool
+	depends on BR2_PACKAGE_HOST_MONO_ARCH_SUPPORTS
 	default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \
 		      BR2_mipsel || BR2_powerpc || BR2_x86_64)
 
diff --git a/bsp/buildroot/package/mono/mono.hash b/bsp/buildroot/package/mono/mono.hash
index 6719fec4..85039502 100644
--- a/bsp/buildroot/package/mono/mono.hash
+++ b/bsp/buildroot/package/mono/mono.hash
@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 8965d107f4ebf4583ba1b50e0dcad39f0dc6adac8df7a083e9c5879ad93c0ea4  mono-4.6.2.16.tar.bz2
+sha256 2a2f5c2a214a9980c086ac7561a5dd106f13d823a630de218eabafe1d995c5b4  mono-5.4.0.201.tar.bz2
diff --git a/bsp/buildroot/package/mono/mono.mk b/bsp/buildroot/package/mono/mono.mk
index 4f39c0fd..802c1d44 100644
--- a/bsp/buildroot/package/mono/mono.mk
+++ b/bsp/buildroot/package/mono/mono.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-MONO_VERSION = 4.6.2.16
+MONO_VERSION = 5.4.0.201
 MONO_SITE = http://download.mono-project.com/sources/mono
 MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2
-MONO_LICENSE = GPLv2 or MIT (compiler, tools), MIT (libs) or commercial
+MONO_LICENSE = GPL-2.0 or MIT (compiler, tools), MIT (libs) or commercial
 MONO_LICENSE_FILES = LICENSE mcs/COPYING eglib/COPYING \
 	external/Newtonsoft.Json/Tools/7-zip/copying.txt
 MONO_INSTALL_STAGING = YES
@@ -20,15 +20,16 @@ MONO_AUTORECONF = YES
 # Disable managed code (mcs folder) from building
 MONO_CONF_OPTS = --with-mcs-docs=no \
 	--with-ikvm-native=no \
-	--enable-minimal=profiler,debug \
+	--enable-minimal=profiler,debug,aot \
 	--disable-mcs-build \
-	--enable-static
+	--enable-static \
+	--disable-btls
 
 # The libraries have been built by the host-mono build. Since they are
 # architecture-independent, we simply copy them to the target.
 define MONO_INSTALL_LIBS
 	rsync -av --exclude=*.so --exclude=*.mdb \
-		$(HOST_DIR)/usr/lib/mono $(TARGET_DIR)/usr/lib/
+		$(HOST_DIR)/lib/mono $(TARGET_DIR)/usr/lib/
 endef
 
 MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS
@@ -44,8 +45,9 @@ MONO_DEPENDENCIES += host-mono
 HOST_MONO_CONF_OPTS = --with-mcs-docs=no \
 	--disable-libraries \
 	--with-ikvm-native=no \
-	--enable-minimal=profiler,debug \
-	--enable-static
+	--enable-minimal=profiler,debug,aot \
+	--enable-static \
+	--disable-btls
 
 # ensure monolite is used
 HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false
@@ -54,7 +56,7 @@ HOST_MONO_DEPENDENCIES = host-monolite host-gettext
 
 define HOST_MONO_SETUP_MONOLITE
 	rm -rf $(@D)/mcs/class/lib/monolite
-	(cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/usr/lib/monolite monolite)
+	(cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/lib/monolite monolite)
 endef
 
 HOST_MONO_POST_CONFIGURE_HOOKS += HOST_MONO_SETUP_MONOLITE
diff --git a/bsp/buildroot/package/monolite/monolite.hash b/bsp/buildroot/package/monolite/monolite.hash
index 621e5e4f..76f54678 100644
--- a/bsp/buildroot/package/monolite/monolite.hash
+++ b/bsp/buildroot/package/monolite/monolite.hash
@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 c01e9ba37d8d8f9ef68e08170b2582cc710a8a77756e2412dff298a39b3c4d2b  monolite-149-latest.tar.gz
+sha256 8c893c3eb3efb5006e19fb45a878860265c3f47fbaf2470be47612e84725d9fd  monolite-linux-1050400003-latest.tar.gz
diff --git a/bsp/buildroot/package/monolite/monolite.mk b/bsp/buildroot/package/monolite/monolite.mk
index d50d9f22..80b2af95 100644
--- a/bsp/buildroot/package/monolite/monolite.mk
+++ b/bsp/buildroot/package/monolite/monolite.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-MONOLITE_VERSION = 149
-MONOLITE_SITE = http://download.mono-project.com/monolite/
-MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz
-MONOLITE_LICENSE = LGPLv2 or commercial
+MONOLITE_VERSION = 1050400003
+MONOLITE_SITE = http://download.mono-project.com/monolite
+MONOLITE_SOURCE = monolite-linux-$(MONOLITE_VERSION)-latest.tar.gz
+MONOLITE_LICENSE = LGPL-2.0 or commercial
 
 define HOST_MONOLITE_INSTALL_CMDS
-	mkdir -p $(HOST_DIR)/usr/lib/monolite
-	cp $(@D)/* $(HOST_DIR)/usr/lib/monolite
+	mkdir -p $(HOST_DIR)/lib/monolite/$(MONOLITE_VERSION)
+	cp -r $(@D)/* $(HOST_DIR)/lib/monolite/$(MONOLITE_VERSION)
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/mosh/Config.in b/bsp/buildroot/package/mosh/Config.in
index d1fbd632..da8a305a 100644
--- a/bsp/buildroot/package/mosh/Config.in
+++ b/bsp/buildroot/package/mosh/Config.in
@@ -1,6 +1,7 @@
-comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar"
+comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar, host and target gcc >= 4.5"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
-		|| BR2_STATIC_LIBS || !BR2_USE_WCHAR
+		|| BR2_STATIC_LIBS || !BR2_USE_WCHAR \
+		|| !BR2_HOST_GCC_AT_LEAST_4_5 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
 
 config BR2_PACKAGE_MOSH
@@ -8,6 +9,8 @@ config BR2_PACKAGE_MOSH
 	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf
+	depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 # protobuf
 	depends on !BR2_STATIC_LIBS # protobuf
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_PROTOBUF
@@ -17,8 +20,16 @@ config BR2_PACKAGE_MOSH
 	# runtime dependency
 	select BR2_PACKAGE_OPENSSH if !BR2_PACKAGE_DROPBEAR_CLIENT
 	help
-	  Remote terminal application that supports intermittent connectivity,
-	  allows roaming, and provides speculative local echo and line editing
-	  of user keystrokes.
+	  Remote terminal application that supports intermittent
+	  connectivity, allows roaming, and provides speculative local
+	  echo and line editing of user keystrokes.
 
-	  https://mosh.mit.edu
+	  Mosh requires that the remote machine has a locale setting
+	  matching the one on the client.
+
+	  When using mosh with dropbear on a remote machine, the
+	  client needs mosh with a version above 1.3.0 and the
+	  --no-ssh-pty option needs to be passed when starting the
+	  connection.
+
+	  https://mosh.org
diff --git a/bsp/buildroot/package/mosh/mosh.hash b/bsp/buildroot/package/mosh/mosh.hash
index 31f59c7f..baffe1f1 100644
--- a/bsp/buildroot/package/mosh/mosh.hash
+++ b/bsp/buildroot/package/mosh/mosh.hash
@@ -1,2 +1,5 @@
-# From https://mailman.mit.edu/pipermail/mosh-users/2016-August/000330.html
-sha256 7e82b7fbfcc698c70f5843bb960dadb8e7bd7ac1d4d2151c9d979372ea850e85 mosh-1.2.6.tar.gz
+# From https://mailman.mit.edu/pipermail/mosh-users/2017-July/000357.html
+sha256 da600573dfa827d88ce114e0fed30210689381bbdcff543c931e4d6a2e851216 mosh-1.3.2.tar.gz
+# Locally calculcated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
+sha256 8042495ddc8d99b883335d53552554eccf825fc1f0ba487d0f8e6656baaa8199  COPYING.iOS
diff --git a/bsp/buildroot/package/mosh/mosh.mk b/bsp/buildroot/package/mosh/mosh.mk
index 2cd358b3..fa6ab170 100644
--- a/bsp/buildroot/package/mosh/mosh.mk
+++ b/bsp/buildroot/package/mosh/mosh.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-MOSH_VERSION = 1.2.6
-MOSH_SITE = https://mosh.mit.edu
+MOSH_VERSION = 1.3.2
+MOSH_SITE = https://mosh.org
 MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf
-MOSH_LICENSE = GPLv3+ with exception
+MOSH_LICENSE = GPL-3.0+ with exception
 MOSH_LICENSE_FILES = COPYING COPYING.iOS
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/bsp/buildroot/package/mosquitto/mosquitto.mk b/bsp/buildroot/package/mosquitto/mosquitto.mk
index dc503390..ec5fc02f 100644
--- a/bsp/buildroot/package/mosquitto/mosquitto.mk
+++ b/bsp/buildroot/package/mosquitto/mosquitto.mk
@@ -6,7 +6,7 @@
 
 MOSQUITTO_VERSION = 1.4.15
 MOSQUITTO_SITE = https://mosquitto.org/files/source
-MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0
+MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
 MOSQUITTO_INSTALL_STAGING = YES
 
@@ -30,8 +30,8 @@ else
 MOSQUITTO_MAKE_OPTS += WITH_THREADING=no
 endif
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-MOSQUITTO_DEPENDENCIES += openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+MOSQUITTO_DEPENDENCIES += libopenssl
 MOSQUITTO_MAKE_OPTS += WITH_TLS=yes
 else
 MOSQUITTO_MAKE_OPTS += WITH_TLS=no
diff --git a/bsp/buildroot/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch b/bsp/buildroot/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch
deleted file mode 100644
index 4211fe67..00000000
--- a/bsp/buildroot/package/motion/0001-configure.ac-use-given-CFLAGS-LIBS-for-mysqlclient-l.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5a1081d36bf2861ffc882354c583a0eb6b0ee3d5 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Tue, 25 Oct 2016 21:27:41 +0200
-Subject: [PATCH] configure.ac: use given CFLAGS/LIBS for mysqlclient library
- check
-
-Needed for static linking of mysql with enabled libz.
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5782fd6..aa5d9dd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -618,8 +618,8 @@ else
- 		#LDFLAGS="-L$MYSQL_LIBDIR"
- 		saved_CFLAGS=$CFLAGS
- 		saved_LIBS=$LIBS
--		CFLAGS="-I$MYSQL_INCDIR"
--		LIBS="-L$MYSQL_LIBDIR"
-+		CFLAGS="-I$MYSQL_INCDIR $CFLAGS"
-+		LIBS="-L$MYSQL_LIBDIR $LIBS"
- 		AC_CHECK_LIB(mysqlclient,mysql_init,[
- 					TEMP_LIBS="$TEMP_LIBS -L$MYSQL_LIBDIR -lmysqlclient -lz"
- 					TEMP_CFLAGS="$TEMP_CFLAGS -I$MYSQL_INCDIR"
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/motion/0002-Rename-base64_encode.patch b/bsp/buildroot/package/motion/0002-Rename-base64_encode.patch
deleted file mode 100644
index 8b063092..00000000
--- a/bsp/buildroot/package/motion/0002-Rename-base64_encode.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 0da5428bdfe67eb17ee03f22f68e66b044abdf70 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Sun, 30 Oct 2016 19:30:46 +0100
-Subject: [PATCH] Rename base64_encode
-
-base64_encode is already defined in gnutls so rename it as
-motion_base64_encode to prevent a definition clash when linking
-statically with gnutls
-
-Fixes:
-  - http://autobuild.buildroot.org/results/592672b8826f4c731c50d29725da964d876573c4
-
-Applied upstream:
-  - https://github.com/Motion-Project/motion/commit/cc3c25527d4bada0fe98a734fa2df29f8d6cf1ad
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
----
- netcam.c      | 4 ++--
- netcam_wget.c | 4 ++--
- netcam_wget.h | 2 +-
- stream.c      | 4 ++--
- webhttpd.c    | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/netcam.c b/netcam.c
-index a9df33a..38d4ca3 100644
---- a/netcam.c
-+++ b/netcam.c
-@@ -2019,7 +2019,7 @@ static int netcam_http_build_url(netcam_context_ptr netcam, struct url_t *url)
-     else
-         ptr = url->userpass;
- 
--    /* base64_encode needs up to 3 additional chars. */
-+    /* motion_base64_encode needs up to 3 additional chars. */
-     if (ptr) {
-         userpass = mymalloc(strlen(ptr) + 3);
-         strcpy(userpass, ptr);
-@@ -2045,7 +2045,7 @@ static int netcam_http_build_url(netcam_context_ptr netcam, struct url_t *url)
-         /* Allocate space for the base64-encoded string. */
-         encuserpass = mymalloc(BASE64_LENGTH(strlen(userpass)) + 1);
-         /* Fill in the value. */
--        base64_encode(userpass, encuserpass, strlen(userpass));
-+        motion_base64_encode(userpass, encuserpass, strlen(userpass));
-         /* Now create the last part (authorization) of the request. */
-         request_pass = mymalloc(strlen(connect_auth_req) +
-                                 strlen(encuserpass) + 1);
-diff --git a/netcam_wget.c b/netcam_wget.c
-index 4491760..f5c1dc2 100644
---- a/netcam_wget.c
-+++ b/netcam_wget.c
-@@ -210,13 +210,13 @@ int skip_lws(const char *string)
- 
- 
- /**
-- * base64_encode
-+ * motion_base64_encode
-  *
-  *   Encode the string S of length LENGTH to base64 format and place it
-  *   to STORE.  STORE will be 0-terminated, and must point to a writable
-  *   buffer of at least 1+BASE64_LENGTH(length) bytes.  
-  */
--void base64_encode(const char *s, char *store, int length)
-+void motion_base64_encode(const char *s, char *store, int length)
- {
-     /* Conversion table.  */
-     static const char tbl[64] = {
-diff --git a/netcam_wget.h b/netcam_wget.h
-index 9a091bf..e9b02b5 100644
---- a/netcam_wget.h
-+++ b/netcam_wget.h
-@@ -72,7 +72,7 @@ int rbuf_read_bufferful(netcam_context_ptr);
- /* How many bytes it will take to store LEN bytes in base64.  */
- #define BASE64_LENGTH(len) (4 * (((len) + 2) / 3))
- 
--void base64_encode(const char *, char *, int);
-+void motion_base64_encode(const char *, char *, int);
- char *strdupdelim(const char *, const char *);
- int http_process_type(const char *, void *);
- 
-diff --git a/stream.c b/stream.c
-index 04e67ee..ca201ac 100644
---- a/stream.c
-+++ b/stream.c
-@@ -211,10 +211,10 @@ static void* handle_basic_auth(void* param)
- 
-         authentication = mymalloc(BASE64_LENGTH(auth_size) + 1);
-         userpass = mymalloc(auth_size + 4);
--        /* base64_encode can read 3 bytes after the end of the string, initialize it. */
-+        /* motion_base64_encode can read 3 bytes after the end of the string, initialize it. */
-         memset(userpass, 0, auth_size + 4);
-         strcpy(userpass, p->conf->stream_authentication);
--        base64_encode(userpass, authentication, auth_size);
-+        motion_base64_encode(userpass, authentication, auth_size);
-         free(userpass);
- 
-         if (strcmp(auth, authentication)) {
-diff --git a/webhttpd.c b/webhttpd.c
-index 6df2d11..36e8beb 100644
---- a/webhttpd.c
-+++ b/webhttpd.c
-@@ -2616,10 +2616,10 @@ void httpd_run(struct context **cnt)
- 
-         authentication = mymalloc(BASE64_LENGTH(auth_size) + 1);
-         userpass = mymalloc(auth_size + 4);
--        /* base64_encode can read 3 bytes after the end of the string, initialize it */
-+        /* motion_base64_encode can read 3 bytes after the end of the string, initialize it */
-         memset(userpass, 0, auth_size + 4);
-         strcpy(userpass, cnt[0]->conf.webcontrol_authentication);
--        base64_encode(userpass, authentication, auth_size);
-+        motion_base64_encode(userpass, authentication, auth_size);
-         free(userpass);
-     }
- 
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/motion/motion.hash b/bsp/buildroot/package/motion/motion.hash
index e8591179..5b67755e 100644
--- a/bsp/buildroot/package/motion/motion.hash
+++ b/bsp/buildroot/package/motion/motion.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256	2f67669a09ce0481ecd987028dae1c5cb135dfdc3c254c06ab7c9ca0c6c183f0	motion-release-4.0.1.tar.gz
+sha256	2074b935bdfe28f84c2c3233274b06908336778f303bb13530d4299c3f8aa4e2	motion-release-4.1.1.tar.gz
+sha256	91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad	COPYING
diff --git a/bsp/buildroot/package/motion/motion.mk b/bsp/buildroot/package/motion/motion.mk
index d76b5470..0f489867 100644
--- a/bsp/buildroot/package/motion/motion.mk
+++ b/bsp/buildroot/package/motion/motion.mk
@@ -4,17 +4,15 @@
 #
 ################################################################################
 
-MOTION_VERSION = release-4.0.1
+MOTION_VERSION = release-4.1.1
 MOTION_SITE = $(call github,Motion-Project,motion,$(MOTION_VERSION))
-MOTION_LICENSE = GPLv2
+MOTION_LICENSE = GPL-2.0
 MOTION_LICENSE_FILES = COPYING
 MOTION_DEPENDENCIES = host-pkgconf jpeg
-# From git and patched configure.ac
+# From git
 MOTION_AUTORECONF = YES
 
-# motion does not use any specific function of jpeg-turbo, so just relies on
-# jpeg selection
-MOTION_CONF_OPTS += --without-jpeg-turbo --without-optimizecpu
+MOTION_CONF_OPTS += --without-optimizecpu
 
 ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
 MOTION_DEPENDENCIES += ffmpeg
@@ -29,10 +27,6 @@ MOTION_CONF_OPTS += \
 	--with-mysql \
 	--with-mysql-include=$(STAGING_DIR)/usr/include/mysql \
 	--with-mysql-lib=$(STAGING_DIR)/usr/lib
-# static link of mysql needs -lz
-ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_ZLIB),yy)
-MOTION_CONF_ENV += LIBS="-lz"
-endif
 else
 MOTION_CONF_OPTS += --without-mysql
 endif
@@ -47,16 +41,6 @@ else
 MOTION_CONF_OPTS += --without-pgsql
 endif
 
-ifeq ($(BR2_PACKAGE_SDL),y)
-MOTION_DEPENDENCIES += sdl
-MOTION_CONF_OPTS += --with-sdl=$(STAGING_DIR)/usr
-# overwrite ac_cv_path_CONFIG_SDL in case sdl development is
-# installed on the host
-MOTION_CONF_ENV += ac_cv_path_CONFIG_SDL=$(STAGING_DIR)/usr/bin/sdl-config
-else
-MOTION_CONF_OPTS += --without-sdl
-endif
-
 ifeq ($(BR2_PACKAGE_SQLITE),y)
 MOTION_DEPENDENCIES += sqlite
 MOTION_CONF_OPTS += --with-sqlite3
@@ -64,11 +48,18 @@ else
 MOTION_CONF_OPTS += --without-sqlite3
 endif
 
+ifeq ($(BR2_PACKAGE_WEBP_MUX),y)
+MOTION_DEPENDENCIES += webp
+MOTION_CONF_OPTS += --with-webp
+else
+MOTION_CONF_OPTS += --without-webp
+endif
+
 # Do not use default install target as it installs many unneeded files and
 # directories: docs, examples and init scripts
 define MOTION_INSTALL_TARGET_CMDS
 	$(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \
-		$(TARGET_DIR)/etc/motion.conf
+		$(TARGET_DIR)/etc/motion/motion.conf
 	$(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion
 endef
 
diff --git a/bsp/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch b/bsp/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch
new file mode 100644
index 00000000..90222c10
--- /dev/null
+++ b/bsp/buildroot/package/mp4v2/0001-Fix-GCC7-build.patch
@@ -0,0 +1,32 @@
+From 855e9674232808ff3be7191b697dfb56917db21f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Wed, 8 Feb 2017 00:56:32 +0000
+Subject: [PATCH] Fix GCC7 build
+
+if (*pSlash != '\0') {
+
+As it stands the body of that if will always execute and when there are
+no encoding parameters ppEncodingParams will be returned as a pointer to
+an empty string rather than as a null pointer
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ src/rtphint.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/rtphint.cpp b/src/rtphint.cpp
+index e07309d..1eb01f5 100644
+--- a/src/rtphint.cpp
++++ b/src/rtphint.cpp
+@@ -339,7 +339,7 @@ void MP4RtpHintTrack::GetPayload(
+                 pSlash = strchr(pSlash, '/');
+                 if (pSlash != NULL) {
+                     pSlash++;
+-                    if (pSlash != '\0') {
++                    if (*pSlash != '\0') {
+                         length = (uint32_t)strlen(pRtpMap) - (pSlash - pRtpMap);
+                         *ppEncodingParams = (char *)MP4Calloc(length + 1);
+                         strncpy(*ppEncodingParams, pSlash, length);
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/mp4v2/mp4v2.mk b/bsp/buildroot/package/mp4v2/mp4v2.mk
index 2acbb4ea..b6b7d9ae 100644
--- a/bsp/buildroot/package/mp4v2/mp4v2.mk
+++ b/bsp/buildroot/package/mp4v2/mp4v2.mk
@@ -8,7 +8,7 @@ MP4V2_VERSION = 2.0.0
 MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2
 MP4V2_SITE = https://mp4v2.googlecode.com/files
 MP4V2_INSTALL_STAGING = YES
-MP4V2_LICENSE = MPLv1.1
+MP4V2_LICENSE = MPL-1.1
 MP4V2_LICENSE_FILES = COPYING
 
 # help2man expects to be able to run utilities on the build machine to
diff --git a/bsp/buildroot/package/mpc/mpc.mk b/bsp/buildroot/package/mpc/mpc.mk
index 579e2ccc..89bbfd9c 100644
--- a/bsp/buildroot/package/mpc/mpc.mk
+++ b/bsp/buildroot/package/mpc/mpc.mk
@@ -6,7 +6,7 @@
 
 MPC_VERSION = 1.0.3
 MPC_SITE = $(BR2_GNU_MIRROR)/mpc
-MPC_LICENSE = LGPLv3+
+MPC_LICENSE = LGPL-3.0+
 MPC_LICENSE_FILES = COPYING.LESSER
 MPC_INSTALL_STAGING = YES
 MPC_DEPENDENCIES = gmp mpfr
diff --git a/bsp/buildroot/package/mpd-mpc/mpd-mpc.mk b/bsp/buildroot/package/mpd-mpc/mpd-mpc.mk
index d9aa1f87..6c15c0d9 100644
--- a/bsp/buildroot/package/mpd-mpc/mpd-mpc.mk
+++ b/bsp/buildroot/package/mpd-mpc/mpd-mpc.mk
@@ -8,7 +8,7 @@ MPD_MPC_VERSION_MAJOR = 0
 MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).28
 MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR)
 MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz
-MPD_MPC_LICENSE = GPLv2+
+MPD_MPC_LICENSE = GPL-2.0+
 MPD_MPC_LICENSE_FILES = COPYING
 MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient
 MPD_MPC_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
diff --git a/bsp/buildroot/package/mpd/Config.in b/bsp/buildroot/package/mpd/Config.in
index 0c73548f..31afb496 100644
--- a/bsp/buildroot/package/mpd/Config.in
+++ b/bsp/buildroot/package/mpd/Config.in
@@ -5,9 +5,8 @@ menuconfig BR2_PACKAGE_MPD
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
-	# 0.19.x could be built with GCC 4.6, but for simplicity we require
-	# the same toolchain dependencies for all versions.
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
 	# ARC toolchain issue
 	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
 	select BR2_PACKAGE_BOOST
@@ -23,24 +22,6 @@ menuconfig BR2_PACKAGE_MPD
 
 if BR2_PACKAGE_MPD
 
-# Hidden config symbols to select the branch 0.20 by default and fallback
-# to branch 0.19 for toolchains affected by GCC bug PR 64735. This way we
-# keep support for mpd on some architectures, like ARMv5, until GCC 7 is
-# released, which will fix this issue.
-config BR2_PACKAGE_MPD_VERSION_STRING
-	string
-	default "0.20" if !BR2_TOOLCHAIN_HAS_GCC_BUG_64735
-	default "0.19"
-
-config BR2_PACKAGE_MPD_VERSION_0_20
-	bool
-	default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.20"
-
-config BR2_PACKAGE_MPD_VERSION_0_19
-	bool
-	default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.19"
-	select BR2_PACKAGE_LIBGLIB2
-
 comment "Archive plugins"
 
 config BR2_PACKAGE_MPD_BZIP2
@@ -273,15 +254,19 @@ config BR2_PACKAGE_MPD_OSS
 
 config BR2_PACKAGE_MPD_PULSEAUDIO
 	bool "pulseaudio"
-	depends on !BR2_STATIC_LIBS # pulseaudio
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_PULSEAUDIO
 	help
 	  Enable pulseaudio output support.
 
-comment "pulseaudio support needs a toolchain w/ dynamic library"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on BR2_STATIC_LIBS
+comment "pulseaudio support needs a toolchain w/ threads, wchar, dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_MPD_SHOUTCAST
 	bool "shoutcast"
@@ -342,3 +327,6 @@ comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
+
+comment "mpd needs a toolchain not affected by GCC bug 64735"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/bsp/buildroot/package/mpd/mpd.hash b/bsp/buildroot/package/mpd/mpd.hash
index ecd78e97..735ea700 100644
--- a/bsp/buildroot/package/mpd/mpd.hash
+++ b/bsp/buildroot/package/mpd/mpd.hash
@@ -1,3 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256  712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728  mpd-0.20.4.tar.xz
-sha256  8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730  mpd-0.19.21.tar.xz
+sha256  c69c4f67e665380ea3bbde6cff8958edc85f7cd40e7918ae5ce0a2184ca9eb40  mpd-0.20.15.tar.xz
diff --git a/bsp/buildroot/package/mpd/mpd.mk b/bsp/buildroot/package/mpd/mpd.mk
index 8e71ae21..48285951 100644
--- a/bsp/buildroot/package/mpd/mpd.mk
+++ b/bsp/buildroot/package/mpd/mpd.mk
@@ -4,23 +4,15 @@
 #
 ################################################################################
 
-MPD_VERSION_MAJOR = $(call qstrip,$(BR2_PACKAGE_MPD_VERSION_STRING))
-ifeq ($(BR2_PACKAGE_MPD_VERSION_0_20),y)
-MPD_VERSION = $(MPD_VERSION_MAJOR).4
-else
-MPD_VERSION = $(MPD_VERSION_MAJOR).21
-endif
+MPD_VERSION_MAJOR = 0.20
+MPD_VERSION = $(MPD_VERSION_MAJOR).15
 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
 MPD_DEPENDENCIES = host-pkgconf boost
-MPD_LICENSE = GPLv2+
+MPD_LICENSE = GPL-2.0+
 MPD_LICENSE_FILES = COPYING
 MPD_AUTORECONF = YES
 
-ifeq ($(BR2_PACKAGE_MPD_VERSION_0_19),y)
-MPD_DEPENDENCIES += libglib2
-endif
-
 # Some options need an explicit --disable or --enable
 
 # Zeroconf support depends on libdns_sd from avahi.
diff --git a/bsp/buildroot/package/mpdecimal/mpdecimal.mk b/bsp/buildroot/package/mpdecimal/mpdecimal.mk
index 9b13def5..5e0929ee 100644
--- a/bsp/buildroot/package/mpdecimal/mpdecimal.mk
+++ b/bsp/buildroot/package/mpdecimal/mpdecimal.mk
@@ -7,7 +7,7 @@
 MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases
 MPDECIMAL_VERSION = 2.4.1
 MPDECIMAL_INSTALL_STAGING = YES
-MPDECIMAL_LICENSE = BSD-2c
+MPDECIMAL_LICENSE = BSD-2-Clause
 MPDECIMAL_LICENSE_FILES = LICENSE.txt
 MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)"
 MPDECIMAL_AUTORECONF = YES
diff --git a/bsp/buildroot/package/mpfr/mpfr.hash b/bsp/buildroot/package/mpfr/mpfr.hash
index d2c32f2a..1c825e12 100644
--- a/bsp/buildroot/package/mpfr/mpfr.hash
+++ b/bsp/buildroot/package/mpfr/mpfr.hash
@@ -1,2 +1,2 @@
-# Locally calculated after checking pgp signature
-sha256	015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc	mpfr-3.1.5.tar.xz
+# From http://lists.gnu.org/archive/html/info-gnu/2017-09/msg00004.html
+sha256 7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950  mpfr-3.1.6.tar.xz
diff --git a/bsp/buildroot/package/mpfr/mpfr.mk b/bsp/buildroot/package/mpfr/mpfr.mk
index bb78ccc8..1b67cf2e 100644
--- a/bsp/buildroot/package/mpfr/mpfr.mk
+++ b/bsp/buildroot/package/mpfr/mpfr.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-MPFR_VERSION = 3.1.5
+MPFR_VERSION = 3.1.6
 MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION)
 MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz
-MPFR_LICENSE = LGPLv3+
+MPFR_LICENSE = LGPL-3.0+
 MPFR_LICENSE_FILES = COPYING.LESSER
 MPFR_INSTALL_STAGING = YES
 MPFR_DEPENDENCIES = gmp
diff --git a/bsp/buildroot/package/mpg123/Config.in b/bsp/buildroot/package/mpg123/Config.in
index eacefada..73ca1c74 100644
--- a/bsp/buildroot/package/mpg123/Config.in
+++ b/bsp/buildroot/package/mpg123/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_MPG123
 	bool "mpg123"
 	depends on BR2_USE_MMU # fork - in the application
 	help
-	  Fast, free and portable MPEG audio player for Unix. It supports
-	  MPEG 1.0/2.0 layers 1, 2 and 3.
+	  Fast, free and portable MPEG audio player for Unix. It
+	  supports MPEG 1.0/2.0 layers 1, 2 and 3.
 
 	  http://www.mpg123.de/
diff --git a/bsp/buildroot/package/mpg123/mpg123.hash b/bsp/buildroot/package/mpg123/mpg123.hash
index cbab6f3e..22db5bca 100644
--- a/bsp/buildroot/package/mpg123/mpg123.hash
+++ b/bsp/buildroot/package/mpg123/mpg123.hash
@@ -1,5 +1,7 @@
-# Locally calculated after checking pgp signature
-sha256	5314b0fb8ad291bfc79ff4c5c321b971916819a65233ec065434358fcf8aee38	mpg123-1.25.2.tar.bz2
-
+# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.10/
+sha1 604784ddbcfe282bffdc595d1d45c677c7cf381f  mpg123-1.25.10.tar.bz2
+md5 ea32caa61d41d8be797f0b04a1b43ad9  mpg123-1.25.10.tar.bz2
+# Locally calculated
+sha256 6c1337aee2e4bf993299851c70b7db11faec785303cfca3a5c3eb5f329ba7023  mpg123-1.25.10.tar.bz2
 # License file
 sha256  f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295  COPYING
diff --git a/bsp/buildroot/package/mpg123/mpg123.mk b/bsp/buildroot/package/mpg123/mpg123.mk
index 44218eda..dd2d39d9 100644
--- a/bsp/buildroot/package/mpg123/mpg123.mk
+++ b/bsp/buildroot/package/mpg123/mpg123.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-MPG123_VERSION = 1.25.2
+MPG123_VERSION = 1.25.10
 MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
 MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
 MPG123_CONF_OPTS = --disable-lfs-alias
 MPG123_INSTALL_STAGING = YES
-MPG123_LICENSE = LGPLv2.1
+MPG123_LICENSE = LGPL-2.1
 MPG123_LICENSE_FILES = COPYING
 MPG123_DEPENDENCIES = host-pkgconf
 
diff --git a/bsp/buildroot/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch b/bsp/buildroot/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch
new file mode 100644
index 00000000..6a6f467d
--- /dev/null
+++ b/bsp/buildroot/package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch
@@ -0,0 +1,40 @@
+From d858ce52d1971cb4e8500b0ebc0472fdae4686ec Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 7 May 2017 23:12:04 +0200
+Subject: [PATCH] mpn/arm/udiv.asm: workaround binutils bug #14887
+
+Old binutils versions are affected by bug #14887,
+https://sourceware.org/bugzilla/show_bug.cgi?id=14887, which causes a
+build failure when a register specification is surrounded by
+whitespaces. Removing those whitespaces works around the issue.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ mpn/arm/udiv.asm | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mpn/arm/udiv.asm b/mpn/arm/udiv.asm
+index 25197a6..ed11eb3 100644
+--- a/mpn/arm/udiv.asm
++++ b/mpn/arm/udiv.asm
+@@ -50,7 +50,7 @@ L(oop):	divstep(n1,n0,d)
+ 	teq	r12, #0
+ 	bne	L(oop)
+ 
+-	str	n1, [ rem_ptr ]		C store remainder
++	str	n1, [rem_ptr]		C store remainder
+ 	adc	r0, n0, n0		C quotient: add last carry from divstep
+ 	mov	pc, lr
+ 
+@@ -89,7 +89,7 @@ L(oop2):
+ 	addcs	n0, n0, #1		C adjust quotient
+ 
+ L(_even_divisor):
+-	str	n1, [ rem_ptr ]		C store remainder
++	str	n1, [rem_ptr]		C store remainder
+ 	mov	r0, n0			C quotient
+ 	ldmfd	sp!, { r8, pc }
+ EPILOGUE(mpn_udiv_qrnnd)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/mpir/Config.in b/bsp/buildroot/package/mpir/Config.in
new file mode 100644
index 00000000..da4cc9f4
--- /dev/null
+++ b/bsp/buildroot/package/mpir/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_MPIR
+	bool "mpir"
+	select BR2_PACKAGE_GMP
+	help
+	  MPIR is a highly optimised library for bignum arithmetic
+	  forked from the GMP bignum library.
+
+	  http://www.mpir.org/
diff --git a/bsp/buildroot/package/mpir/mpir.hash b/bsp/buildroot/package/mpir/mpir.hash
new file mode 100644
index 00000000..8320337e
--- /dev/null
+++ b/bsp/buildroot/package/mpir/mpir.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	52f63459cf3f9478859de29e00357f004050ead70b45913f2c2269d9708675bb	mpir-3.0.0.tar.bz2
diff --git a/bsp/buildroot/package/mpir/mpir.mk b/bsp/buildroot/package/mpir/mpir.mk
new file mode 100644
index 00000000..91f704d3
--- /dev/null
+++ b/bsp/buildroot/package/mpir/mpir.mk
@@ -0,0 +1,39 @@
+################################################################################
+#
+# mpir
+#
+################################################################################
+
+MPIR_VERSION = 3.0.0
+MPIR_SITE = http://www.mpir.org
+MPIR_SOURCE = mpir-$(MPIR_VERSION).tar.bz2
+MPIR_LICENSE = LGPL-3.0+
+MPIR_LICENSE_FILES = COPYING.LIB
+MPIR_INSTALL_STAGING = YES
+MPIR_DEPENDENCIES = gmp host-yasm
+
+ifeq ($(BR2_MIPS_NABI32),y)
+MPIR_CONF_OPTS += ABI=n32
+endif
+
+ifeq ($(BR2_MIPS_NABI64),y)
+MPIR_CONF_OPTS += ABI=64
+endif
+
+# The optimized ARM assembly code uses ARM-only (i.e not Thumb1/2
+# compatible) instructions.
+ifeq ($(BR2_arm)$(BR2_armeb):$(BR2_ARM_CPU_HAS_ARM),y:)
+MPIR_CONF_ENV += MPN_PATH="generic"
+endif
+
+# Optimized mips32/mips64 code not suitable for mips32r6/mips64r6
+ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
+MPIR_CONF_ENV += MPN_PATH="generic"
+endif
+
+# Optimized powerpc64 code is not suitable for powerpc64le
+ifeq ($(BR2_powerpc64le),y)
+MPIR_CONF_ENV += MPN_PATH="generic"
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/mplayer/Config.in b/bsp/buildroot/package/mplayer/Config.in
index a10ad26b..15c903ae 100644
--- a/bsp/buildroot/package/mplayer/Config.in
+++ b/bsp/buildroot/package/mplayer/Config.in
@@ -16,8 +16,8 @@ config BR2_PACKAGE_MPLAYER
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  MPlayer is a movie player which runs on many systems and supports
-	  many different file formats.
+	  MPlayer is a movie player which runs on many systems and
+	  supports many different file formats.
 
 	  http://www.mplayerhq.hu/
 
diff --git a/bsp/buildroot/package/mplayer/mplayer.mk b/bsp/buildroot/package/mplayer/mplayer.mk
index 38452abd..5313b3a5 100644
--- a/bsp/buildroot/package/mplayer/mplayer.mk
+++ b/bsp/buildroot/package/mplayer/mplayer.mk
@@ -8,7 +8,7 @@ MPLAYER_VERSION = 1.3.0
 MPLAYER_SOURCE = MPlayer-$(MPLAYER_VERSION).tar.xz
 MPLAYER_SITE = http://www.mplayerhq.hu/MPlayer/releases
 MPLAYER_DEPENDENCIES = host-pkgconf
-MPLAYER_LICENSE = GPLv2
+MPLAYER_LICENSE = GPL-2.0
 MPLAYER_LICENSE_FILES = LICENSE Copyright
 MPLAYER_CFLAGS = $(TARGET_CFLAGS)
 MPLAYER_LDFLAGS = $(TARGET_LDFLAGS)
@@ -56,7 +56,7 @@ MPLAYER_CONF_OPTS += --disable-sdl
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--enable-freetype \
 	--with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config
 MPLAYER_DEPENDENCIES += freetype
@@ -128,7 +128,7 @@ MPLAYER_CONF_OPTS += --disable-libcdio
 # We intentionally don't pass --enable-dvdread, to let the
 # autodetection find which library to link with.
 ifeq ($(BR2_PACKAGE_LIBDVDREAD),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--with-dvdread-config="$(PKG_CONFIG_HOST_BINARY) dvdread"
 MPLAYER_DEPENDENCIES += libdvdread
 endif
@@ -136,7 +136,7 @@ endif
 # We intentionally don't pass --enable-dvdnav to let the autodetection
 # find which library to link with.
 ifeq ($(BR2_PACKAGE_LIBDVDNAV),y)
-MPLAYER_CONF_OPTS +=  \
+MPLAYER_CONF_OPTS += \
 	--with-dvdnav-config="$(PKG_CONFIG_HOST_BINARY) dvdnav"
 MPLAYER_DEPENDENCIES += libdvdnav
 endif
@@ -285,16 +285,23 @@ MPLAYER_CFLAGS += -mfpu=neon
 endif
 endif
 
+define MPLAYER_DISABLE_INLINE_ASM
+	$(SED) 's,#define HAVE_INLINE_ASM 1,#define HAVE_INLINE_ASM 0,g' \
+		$(@D)/config.h
+	$(SED) 's,#define HAVE_MMX_INLINE 1,#define HAVE_MMX_INLINE 0,g' \
+		$(@D)/config.h
+	$(SED) 's,#define HAVE_MMX_EXTERNAL 1,#define HAVE_MMX_EXTERNAL 0,g' \
+		$(@D)/config.h
+endef
+
 ifeq ($(BR2_i386),y)
-# inline asm breaks with "can't find a register in class 'GENERAL_REGS'"
-# inless we free up ebp
-MPLAYER_CFLAGS += -fomit-frame-pointer
+MPLAYER_POST_CONFIGURE_HOOKS += MPLAYER_DISABLE_INLINE_ASM
 endif
 
 ifeq ($(BR2_X86_CPU_HAS_MMX),y)
 MPLAYER_CONF_OPTS += \
 	--enable-mmx \
-	--yasm=$(HOST_DIR)/usr/bin/yasm
+	--yasm=$(HOST_DIR)/bin/yasm
 MPLAYER_DEPENDENCIES += host-yasm
 else
 MPLAYER_CONF_OPTS += \
diff --git a/bsp/buildroot/package/mpv/0003-rpi-fix-linking-errors.patch b/bsp/buildroot/package/mpv/0003-rpi-fix-linking-errors.patch
new file mode 100644
index 00000000..0e65a5a3
--- /dev/null
+++ b/bsp/buildroot/package/mpv/0003-rpi-fix-linking-errors.patch
@@ -0,0 +1,90 @@
+From fe482a600d507dc7ce77f6d154a9e8b395f74fdd Mon Sep 17 00:00:00 2001
+From: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+Date: Tue, 24 Oct 2017 09:47:38 +0100
+Subject: [PATCH] rpi: fix linking errors
+
+Fixes linking issues when compiling with Raspberry Pi support.
+
+Signed-off-by: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
+---
+Status: pull request https://github.com/mpv-player/mpv/pull/4883
+---
+ waftools/checks/custom.py | 26 +++++++++++++++++++++++++-
+ wscript                   | 18 +-----------------
+ 2 files changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py
+index d8065a3..9086795 100644
+--- a/waftools/checks/custom.py
++++ b/waftools/checks/custom.py
+@@ -4,7 +4,7 @@ from waflib import Utils
+ import os
+ 
+ __all__ = ["check_pthreads", "check_iconv", "check_lua",
+-           "check_cocoa", "check_openal"]
++           "check_cocoa", "check_openal", "check_rpi"]
+ 
+ pthreads_program = load_fragment('pthreads.c')
+ 
+@@ -103,3 +103,27 @@ def check_openal(ctx, dependency_identifier):
+         if fn(ctx, dependency_identifier):
+             return True
+     return False
++
++def check_rpi(ctx, dependency_identifier):
++    # We need MMAL/bcm_host/dispmanx APIs.
++    # Upstream keeps pkgconfig files in '/opt/vc/lib/pkgconfig'.
++    # See https://github.com/raspberrypi/userland/issues/245
++    # PKG_CONFIG_SYSROOT_DIR helps with cross compilation.
++    prev_pkg_path = os.getenv('PKG_CONFIG_PATH', '')
++    os.environ['PKG_CONFIG_PATH'] = os.pathsep.join(
++        filter(None, [os.path.join(os.getenv('PKG_CONFIG_SYSROOT_DIR', '/'),
++                                   'opt/vc/lib/pkgconfig'),
++                      prev_pkg_path]))
++
++    checks = [
++        # We still need all OpenGL symbols, because the vo_opengl code is
++        # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
++        check_pkg_config('bcm_host', uselib_store='bcm_host'),
++        check_pkg_config('egl'),
++        check_pkg_config('glesv2'),
++        check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']),
++    ]
++
++    ret = all((fn(ctx, dependency_identifier) for fn in checks))
++    os.environ['PKG_CONFIG_PATH'] = prev_pkg_path
++    return ret
+diff --git a/wscript b/wscript
+index 9d88588..84e5f2e 100644
+--- a/wscript
++++ b/wscript
+@@ -732,25 +732,9 @@ video_output_features = [
+         'desc': 'Android support',
+         'func': check_statement('android/api-level.h', '(void)__ANDROID__'),  # arbitrary android-specific header
+     }, {
+-        # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
+-        # every project to hardcode the paths to the include directories. Also,
+-        # these headers are so broken that they spam tons of warnings by merely
+-        # including them (compensate with -isystem and -fgnu89-inline).
+         'name': '--rpi',
+         'desc': 'Raspberry Pi support',
+-        'func': compose_checks(
+-            check_cc(cflags="-isystem/opt/vc/include/ "+
+-                            "-isystem/opt/vc/include/interface/vcos/pthreads " +
+-                            "-isystem/opt/vc/include/interface/vmcs_host/linux " +
+-                            "-fgnu89-inline",
+-                     linkflags="-L/opt/vc/lib",
+-                     header_name="bcm_host.h",
+-                     lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
+-            # We still need all OpenGL symbols, because the vo_opengl code is
+-            # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+-            check_cc(lib="EGL"),
+-            check_cc(lib="GLESv2"),
+-        ),
++        'func': check_rpi,
+     } , {
+         'name': '--ios-gl',
+         'desc': 'iOS OpenGL ES hardware decoding interop support',
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/mpv/0004-libva20.patch b/bsp/buildroot/package/mpv/0004-libva20.patch
new file mode 100644
index 00000000..349dd3cb
--- /dev/null
+++ b/bsp/buildroot/package/mpv/0004-libva20.patch
@@ -0,0 +1,93 @@
+From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001
+From: Mark Thompson <sw@jkqxz.net>
+Date: Mon, 9 Oct 2017 20:10:26 +0100
+Subject: [PATCH] vaapi: Use libva2 message callbacks
+
+They are no longer global, so they work vaguely sensibly.
+
+Downloaded from upstream commit:
+https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ video/vaapi.c | 32 +++++++++++++++++++++++++++++---
+ 1 file changed, 29 insertions(+), 3 deletions(-)
+
+diff --git a/video/vaapi.c b/video/vaapi.c
+index 6bedbbaa18..3b1cb9cc41 100644
+--- a/video/vaapi.c
++++ b/video/vaapi.c
+@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp)
+     return 0;
+ }
+ 
+-// VA message callbacks are global and do not have a context parameter, so it's
+-// impossible to know from which VADisplay they originate. Try to route them
+-// to existing mpv/libmpv instances within this process.
++#if VA_CHECK_VERSION(1, 0, 0)
++static void va_message_callback(void *context, const char *msg, int mp_level)
++{
++    struct mp_vaapi_ctx *res = context;
++    mp_msg(res->log, mp_level, "libva: %s", msg);
++}
++
++static void va_error_callback(void *context, const char *msg)
++{
++    va_message_callback(context, msg, MSGL_ERR);
++}
++
++static void va_info_callback(void *context, const char *msg)
++{
++    va_message_callback(context, msg, MSGL_V);
++}
++#else
++// Pre-libva2 VA message callbacks are global and do not have a context
++// parameter, so it's impossible to know from which VADisplay they
++// originate.  Try to route them to existing mpv/libmpv instances within
++// this process.
+ static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER;
+ static struct mp_vaapi_ctx **va_mpv_clients;
+ static int num_va_mpv_clients;
+@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg)
+ {
+     va_message_callback(msg, MSGL_V);
+ }
++#endif
+ 
+ static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx)
+ {
+@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+         },
+     };
+ 
++#if VA_CHECK_VERSION(1, 0, 0)
++    vaSetErrorCallback(display, va_error_callback, res);
++    vaSetInfoCallback(display,  va_info_callback,  res);
++#else
+     pthread_mutex_lock(&va_log_mutex);
+     MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res);
+     pthread_mutex_unlock(&va_log_mutex);
+@@ -118,6 +141,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
+     vaSetErrorCallback(va_error_callback);
+     vaSetInfoCallback(va_info_callback);
+ #endif
++#endif
+ 
+     int major, minor;
+     int status = vaInitialize(display, &major, &minor);
+@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+         if (ctx->destroy_native_ctx)
+             ctx->destroy_native_ctx(ctx->native_ctx);
+ 
++#if !VA_CHECK_VERSION(1, 0, 0)
+         pthread_mutex_lock(&va_log_mutex);
+         for (int n = 0; n < num_va_mpv_clients; n++) {
+             if (va_mpv_clients[n] == ctx) {
+@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
+         if (num_va_mpv_clients == 0)
+             TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors
+         pthread_mutex_unlock(&va_log_mutex);
++#endif
+ 
+         talloc_free(ctx);
+     }
diff --git a/bsp/buildroot/package/mpv/Config.in b/bsp/buildroot/package/mpv/Config.in
index 6e115aed..ce6f367d 100644
--- a/bsp/buildroot/package/mpv/Config.in
+++ b/bsp/buildroot/package/mpv/Config.in
@@ -12,6 +12,12 @@ config BR2_PACKAGE_MPV
 	select BR2_PACKAGE_ZLIB
 	# Select xkbcommon for wayland to avoid being mysterious
 	select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND
+	# Select all necessary X11 dependencies if X.org is enabled
+	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
 	help
 	  mpv is a fork of mplayer2 and MPlayer. It shares some features
 	  with the former projects while introducing many more.
diff --git a/bsp/buildroot/package/mpv/mpv.hash b/bsp/buildroot/package/mpv/mpv.hash
index 0e7aab70..1dac3a49 100644
--- a/bsp/buildroot/package/mpv/mpv.hash
+++ b/bsp/buildroot/package/mpv/mpv.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998	v0.23.0.tar.gz
+sha256 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be v0.27.2.tar.gz
diff --git a/bsp/buildroot/package/mpv/mpv.mk b/bsp/buildroot/package/mpv/mpv.mk
index 25b54e5e..f38a6b91 100644
--- a/bsp/buildroot/package/mpv/mpv.mk
+++ b/bsp/buildroot/package/mpv/mpv.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-MPV_VERSION = 0.23.0
+MPV_VERSION = 0.27.2
 MPV_SITE = https://github.com/mpv-player/mpv/archive
 MPV_SOURCE = v$(MPV_VERSION).tar.gz
 MPV_DEPENDENCIES = \
 	host-pkgconf ffmpeg zlib \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
-MPV_LICENSE = GPLv2+
+MPV_LICENSE = GPL-2.0+
 MPV_LICENSE_FILES = LICENSE
 
 MPV_NEEDS_EXTERNAL_WAF = YES
@@ -26,13 +26,13 @@ MPV_CONF_OPTS = \
 	--disable-cuda-hwaccel \
 	--disable-libv4l2 \
 	--disable-opensles \
-	--disable-rpi \
 	--disable-rsound \
 	--disable-rubberband \
 	--disable-uchardet \
 	--disable-vapoursynth \
 	--disable-vapoursynth-lazy \
-	--disable-vdpau
+	--disable-vdpau \
+	--disable-mali-fbdev
 
 # ALSA support requires pcm+mixer
 ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy)
@@ -134,10 +134,10 @@ endif
 
 # OpenGL support
 ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
-MPV_CONF_OPTS += --enable-gl --enable-standard-gl
+MPV_CONF_OPTS += --enable-gl
 MPV_DEPENDENCIES += libgl
 else
-MPV_CONF_OPTS += --disable-gl --disable-standard-gl
+MPV_CONF_OPTS += --disable-gl
 endif
 
 # pulseaudio support
@@ -169,11 +169,19 @@ else
 MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2
 endif
 
+# Raspberry Pi support
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+MPV_CONF_OPTS += --enable-rpi --enable-gl
+MPV_DEPENDENCIES += rpi-userland
+else
+MPV_CONF_OPTS += --disable-rpi
+endif
+
 # va-api support
 # This requires one or more of the egl-drm, wayland, x11 backends
 # For now we support wayland and x11
 ifeq ($(BR2_PACKAGE_LIBVA),y)
-ifneq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XLIB_LIBX11),)
+ifneq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XORG7),)
 MPV_CONF_OPTS += --enable-vaapi
 MPV_DEPENDENCIES += libva
 else
@@ -191,31 +199,12 @@ else
 MPV_CONF_OPTS += --disable-wayland
 endif
 
-# Base X11 support
-ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
-MPV_CONF_OPTS += --enable-x11 --disable-xss
-MPV_DEPENDENCIES += xlib_libX11
-# xext
-ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y)
-MPV_CONF_OPTS += --enable-xext
-MPV_DEPENDENCIES += xlib_libXext
-else
-MPV_CONF_OPTS += --disable-xext
-endif
-# xinerama
-ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
-MPV_CONF_OPTS += --enable-xinerama
-MPV_DEPENDENCIES += xlib_libXinerama
-else
-MPV_CONF_OPTS += --disable-xinerama
-endif
-# xrandr
-ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
-MPV_CONF_OPTS += --enable-xrandr
-MPV_DEPENDENCIES += xlib_libXrandr
-else
-MPV_CONF_OPTS += --disable-xrandr
-endif
+# Base X11 support. Config.in ensures that if BR2_PACKAGE_XORG7 is
+# enabled, xlib_libX11, xlib_libXext, xlib_libXinerama,
+# xlib_libXrandr, xlib_libXScrnSaver.
+ifeq ($(BR2_PACKAGE_XORG7),y)
+MPV_CONF_OPTS += --enable-x11
+MPV_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXinerama xlib_libXrandr xlib_libXScrnSaver
 # XVideo
 ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
 MPV_CONF_OPTS += --enable-xv
diff --git a/bsp/buildroot/package/mraa/Config.in b/bsp/buildroot/package/mraa/Config.in
index 2e5d3b12..cdd7b9e8 100644
--- a/bsp/buildroot/package/mraa/Config.in
+++ b/bsp/buildroot/package/mraa/Config.in
@@ -4,9 +4,9 @@ config BR2_PACKAGE_MRAA
 	depends on BR2_arm || BR2_i386 || BR2_x86_64
 	help
 	  mraa is a C/C++ library with bindings to javascript & python
-	  to interface with the IO on Galileo, Edison & other platforms,
-	  with a structured and sane API where port names/numbering matches
-	  the board that you are on.
+	  to interface with the IO on Galileo, Edison & other
+	  platforms, with a structured and sane API where port
+	  names/numbering matches the board that you are on.
 
 	  http://iotdk.intel.com/docs/master/mraa
 
diff --git a/bsp/buildroot/package/mrouted/Config.in b/bsp/buildroot/package/mrouted/Config.in
index bf4614d4..e5d9348d 100644
--- a/bsp/buildroot/package/mrouted/Config.in
+++ b/bsp/buildroot/package/mrouted/Config.in
@@ -4,7 +4,4 @@ config BR2_PACKAGE_MROUTED
 	help
 	  An implementation of the DVMRP multicast routing protocol.
 
-	  If built with uClibc, then UCLIBC_SUPPORT_AI_ADDRCONFIG is
-	  needed in uClibc configuration.
-
 	  http://github.com/troglobit/mrouted
diff --git a/bsp/buildroot/package/mrouted/mrouted.mk b/bsp/buildroot/package/mrouted/mrouted.mk
index 2969e36c..731e79eb 100644
--- a/bsp/buildroot/package/mrouted/mrouted.mk
+++ b/bsp/buildroot/package/mrouted/mrouted.mk
@@ -7,7 +7,7 @@
 MROUTED_VERSION = 3.9.7
 MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION))
 MROUTED_DEPENDENCIES = host-bison
-MROUTED_LICENSE = BSD-3c
+MROUTED_LICENSE = BSD-3-Clause
 MROUTED_LICENSE_FILES = LICENSE
 
 define MROUTED_CONFIGURE_CMDS
diff --git a/bsp/buildroot/package/msgpack/Config.in b/bsp/buildroot/package/msgpack/Config.in
index b8e82138..b7ae35a0 100644
--- a/bsp/buildroot/package/msgpack/Config.in
+++ b/bsp/buildroot/package/msgpack/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_MSGPACK
 	help
 	  MessagePack is an efficient binary serialization format.
 
-	  It lets you exchange data among multiple languages like JSON but
-	  it's faster and smaller.
+	  It lets you exchange data among multiple languages like JSON
+	  but it's faster and smaller.
 
 	  http://msgpack.org/
 
diff --git a/bsp/buildroot/package/msgpack/msgpack.hash b/bsp/buildroot/package/msgpack/msgpack.hash
index 8cd8cb65..f1033ade 100644
--- a/bsp/buildroot/package/msgpack/msgpack.hash
+++ b/bsp/buildroot/package/msgpack/msgpack.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  97a371ef950c89f48e8dba6abeccab07f1887e9ba6dab921de0f985c7d5075fe  msgpack-0.5.4.tar.gz
+sha256  9c87f80fc651b900772deaef0ab154b63160c74d292529b5be6d06d6485d4640  msgpack-2.1.5.tar.gz
diff --git a/bsp/buildroot/package/msgpack/msgpack.mk b/bsp/buildroot/package/msgpack/msgpack.mk
index 9e239486..38df8f53 100644
--- a/bsp/buildroot/package/msgpack/msgpack.mk
+++ b/bsp/buildroot/package/msgpack/msgpack.mk
@@ -4,9 +4,15 @@
 #
 ################################################################################
 
-MSGPACK_VERSION = 0.5.4
-MSGPACK_SITE = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp
-MSGPACK_LICENSE = Apache-2.0
-MSGPACK_LICENSE_FILES = COPYING
+MSGPACK_VERSION = 2.1.5
+MSGPACK_SITE = $(call github,msgpack,msgpack-c,cpp-$(MSGPACK_VERSION))
+MSGPACK_LICENSE = BSL-1.0
+MSGPACK_LICENSE_FILES = COPYING LICENSE_1_0.txt
+MSGPACK_INSTALL_STAGING = YES
+MSGPACK_CONF_OPTS = -DMSGPACK_BUILD_EXAMPLES=OFF
 
-$(eval $(autotools-package))
+ifeq ($(BR2_STATIC_LIBS),y)
+MSGPACK_CONF_OPTS += -DMSGPACK_ENABLE_SHARED=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/msmtp/msmtp.hash b/bsp/buildroot/package/msmtp/msmtp.hash
index d0de8e04..10d6cea6 100644
--- a/bsp/buildroot/package/msmtp/msmtp.hash
+++ b/bsp/buildroot/package/msmtp/msmtp.hash
@@ -1,3 +1,6 @@
-# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.5/
-md5	50a8c9bb72f8222779db6b4aae2965e0	msmtp-1.6.5.tar.xz
-sha1	27d1fc609cd453a7e4c55c4ec55d455949bc53f1	msmtp-1.6.5.tar.xz
+# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.6/
+md5	82b0520b57db4b2cf05333d11fb5974d	msmtp-1.6.6.tar.xz
+sha1	f997f40dfb3f882df837cfd9a63bd4d271dcdc41	msmtp-1.6.6.tar.xz
+# Locally calculated after checking signature
+# http://downloads.sourceforge.net/project/msmtp/msmtp/1.6.6/msmtp-1.6.6.tar.xz.sig
+sha256	da15db1f62bd0201fce5310adb89c86188be91cd745b7cb3b62b81a501e7fb5e	msmtp-1.6.6.tar.xz
diff --git a/bsp/buildroot/package/msmtp/msmtp.mk b/bsp/buildroot/package/msmtp/msmtp.mk
index 7ede66c0..a1bd9e14 100644
--- a/bsp/buildroot/package/msmtp/msmtp.mk
+++ b/bsp/buildroot/package/msmtp/msmtp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MSMTP_VERSION = 1.6.5
+MSMTP_VERSION = 1.6.6
 MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION)
 MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz
 MSMTP_DEPENDENCIES = host-pkgconf
@@ -12,7 +12,7 @@ MSMTP_CONF_OPTS = \
 	--without-libidn \
 	--disable-gai-idn \
 	--without-libgsasl
-MSMTP_LICENSE = GPLv3+
+MSMTP_LICENSE = GPL-3.0+
 MSMTP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBSECRET),y)
diff --git a/bsp/buildroot/package/msr-tools/msr-tools.mk b/bsp/buildroot/package/msr-tools/msr-tools.mk
index 4f84a288..bfe1a07a 100644
--- a/bsp/buildroot/package/msr-tools/msr-tools.mk
+++ b/bsp/buildroot/package/msr-tools/msr-tools.mk
@@ -6,7 +6,7 @@
 
 MSR_TOOLS_VERSION = 1.3
 MSR_TOOLS_SITE = $(call github,01org,msr-tools,msr-tools-$(MSR_TOOLS_VERSION))
-MSR_TOOLS_LICENSE = GPLv2
+MSR_TOOLS_LICENSE = GPL-2.0
 MSR_TOOLS_LICENSE_FILES = cpuid.c
 
 define MSR_TOOLS_BUILD_CMDS
diff --git a/bsp/buildroot/package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch b/bsp/buildroot/package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch
deleted file mode 100644
index 077ca0c6..00000000
--- a/bsp/buildroot/package/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 5f50207231414bfdbac8f0f974a2824f24177d6e Mon Sep 17 00:00:00 2001
-From: Enrico Jorns <ejo@pengutronix.de>
-Date: Fri, 11 Sep 2015 15:28:13 +0200
-Subject: [PATCH] mtd-utils: ubinize: Always return error code (at least -1) in
- case of an error
-
-ubinize should not fail silenty, this can be very annoying when using
-it from other tools that rely on the exit code for determining the
-success of their operation.
-
-Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
-Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
----
- ubi-utils/ubinize.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/ubi-utils/ubinize.c b/ubi-utils/ubinize.c
-index 34f465a..60bbd9a 100644
---- a/ubi-utils/ubinize.c
-+++ b/ubi-utils/ubinize.c
-@@ -519,6 +519,7 @@ int main(int argc, char * const argv[])
- 	 */
- 	seek = ui.peb_size * 2;
- 	if (lseek(args.out_fd, seek, SEEK_SET) != seek) {
-+		err = -1;
- 		sys_errmsg("cannot seek file \"%s\"", args.f_out);
- 		goto out_free;
- 	}
-@@ -530,6 +531,7 @@ int main(int argc, char * const argv[])
- 		int fd, j;
- 
- 		if (!sname) {
-+			err = -1;
- 			errmsg("ini-file parsing error (iniparser_getsecname)");
- 			goto out_free;
- 		}
-@@ -550,6 +552,7 @@ int main(int argc, char * const argv[])
- 		 */
- 		for (j = 0; j < i; j++) {
- 			if (vi[i].id == vi[j].id) {
-+				err = -1;
- 				errmsg("volume IDs must be unique, but ID %d "
- 				       "in section \"%s\" is not",
- 				       vi[i].id, sname);
-@@ -557,6 +560,7 @@ int main(int argc, char * const argv[])
- 			}
- 
- 			if (!strcmp(vi[i].name, vi[j].name)) {
-+				err = -1;
- 				errmsg("volume name must be unique, but name "
- 				       "\"%s\" in section \"%s\" is not",
- 				       vi[i].name, sname);
-@@ -580,6 +584,7 @@ int main(int argc, char * const argv[])
- 		if (img) {
- 			fd = open(img, O_RDONLY);
- 			if (fd == -1) {
-+				err = fd;
- 				sys_errmsg("cannot open \"%s\"", img);
- 				goto out_free;
- 			}
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch b/bsp/buildroot/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch
new file mode 100644
index 00000000..1fd4f769
--- /dev/null
+++ b/bsp/buildroot/package/mtd/0001-revert-return-correct-error-number-in-ubi_get_vol_info1.patch
@@ -0,0 +1,92 @@
+From 0f833ac73ad631248826386e2918d8571ecf0347 Mon Sep 17 00:00:00 2001
+From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
+Date: Sat, 9 Jun 2018 16:45:22 +0200
+Subject: [PATCH] Revert "Return correct error number in ubi_get_vol_info1"
+
+This reverts commit dede98ffb706676309488d7cc660f569548d5930.
+
+The original commit tried to fix a descrepancy between the implementation
+and the documentation by making the implementation comply.
+
+When making the change, it was overlooked, that ubinfo and ubirename were
+written against the implementation instead of the behaviour specified by
+the documentation. So were further internal functions like
+ubi_get_vol_info1_nm which further breaks ubirmvol.
+
+A report with an outline of a resulting problem can be read on
+the mailing list:
+
+http://lists.infradead.org/pipermail/linux-mtd/2018-June/081562.html
+
+From the report:
+
+steps to reproduce: have mtd-utils 2.0.1 or 2.0.2
+
+0. make a bunch of ubi volumes in sequential order
+
+ubimkvol /dev/ubi0 -s 64KiB -N test1
+ubimkvol /dev/ubi0 -s 64KiB -N test2
+ubimkvol /dev/ubi0 -s 64KiB -N test3
+ubimkvol /dev/ubi0 -s 64KiB -N test4
+..
+
+1. delete the test1 volume, making a hole in the volume table
+
+ubirmvol /dev/ubi0 -N test1
+
+2. try an affected tool (i.e. "ubirmvol /dev/ubi0 -N test4" )
+
+ |root at mr24:/# ubirmvol /dev/ubi0 -N test4
+ |ubirmvol: error!: cannot find UBI volume "test4"
+ |         error 19 (No such device)
+
+or "ubinfo -a"
+
+ | root at mr24:/# ubinfo -a
+ | UBI version:                    1
+ | Count of UBI devices:           1
+ | UBI control device major/minor: 10:59
+ | Present UBI devices:            ubi0
+ |
+ | ubi0
+ | Volumes count:                           11
+ | Logical eraseblock size:                 15872 bytes, 15.5 KiB
+ | Total amount of logical eraseblocks:     1952 (30982144 bytes, 29.5 MiB)
+ | Amount of available logical eraseblocks: 75 (1190400 bytes, 1.1 MiB)
+ | Maximum count of volumes                 92
+ | Count of bad physical eraseblocks:       0
+ | Count of reserved physical eraseblocks:  40
+ | Current maximum erase counter value:     984
+ | Minimum input/output unit size:          512 bytes
+ | Character device major/minor:            251:0
+ | ubinfo: error!: libubi failed to probe volume 5 on ubi0
+ |        error 19 (No such device)
+ | Present volumes:                         0, 1, 2, 3, 4root at mr24:/#
+
+Reported-by: Christian Lamparter <chunkeey@gmail.com>
+Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
+Signed-off-by: David Owens <david.owens@rockwellcollins.com>
+---
+ lib/libubi.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/lib/libubi.c b/lib/libubi.c
+index b50e68a..978b433 100644
+--- a/lib/libubi.c
++++ b/lib/libubi.c
+@@ -1240,11 +1240,8 @@ int ubi_get_vol_info1(libubi_t desc, int dev_num, int vol_id,
+ 	info->dev_num = dev_num;
+ 	info->vol_id = vol_id;
+ 
+-	if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor)) {
+-		if (errno == ENOENT)
+-			errno = ENODEV;
++	if (vol_get_major(lib, dev_num, vol_id, &info->major, &info->minor))
+ 		return -1;
+-	}
+ 
+ 	ret = vol_read_data(lib->vol_type, dev_num, vol_id, buf, 50);
+ 	if (ret < 0)
+-- 
+2.14.4
+
diff --git a/bsp/buildroot/package/mtd/0002-integck-only-use-execinfo.h-when-INTEGCK_DEBUG-is-en.patch b/bsp/buildroot/package/mtd/0002-integck-only-use-execinfo.h-when-INTEGCK_DEBUG-is-en.patch
deleted file mode 100644
index 0f74a7b5..00000000
--- a/bsp/buildroot/package/mtd/0002-integck-only-use-execinfo.h-when-INTEGCK_DEBUG-is-en.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 30f0cd91b21dbc5d593d61ae44875ad0cb53cb4d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 16 Jul 2016 11:27:06 +0200
-Subject: [PATCH] integck: only use execinfo.h when INTEGCK_DEBUG is enabled
-
-Guard the usage of execinfo.h by INTEGCK_DEBUG so that by defaut,
-integck builds properly on systems without <execinfo.h> (uClibc and
-musl based systems). As stated in the code, the backtrace()
-functionality of <execinfo.h> will anyway only work properly when
-INTEGCK_DEBUG is defined (it makes all functions non-static, which is
-needed for backtrace to provide some useful information).
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- tests/fs-tests/integrity/integck.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
-index 8badd1f..6ef817e 100644
---- a/tests/fs-tests/integrity/integck.c
-+++ b/tests/fs-tests/integrity/integck.c
-@@ -31,7 +31,9 @@
- #include <getopt.h>
- #include <assert.h>
- #include <mntent.h>
-+#ifdef INTEGCK_DEBUG
- #include <execinfo.h>
-+#endif
- #include <bits/stdio_lim.h>
- #include <sys/mman.h>
- #include <sys/vfs.h>
-@@ -248,14 +250,18 @@ static char *random_name_buf;
- static void check_failed(const char *cond, const char *func, const char *file,
- 			 int line)
- {
--	int error = errno, count;
-+	int error = errno;
-+#ifdef INTEGCK_DEBUG
-+	int count;
- 	void *addresses[128];
-+#endif
- 
- 	fflush(stdout);
- 	fflush(stderr);
- 	errmsg("condition '%s' failed in %s() at %s:%d",
- 	       cond, func, file, line);
- 	normsg("error %d (%s)", error, strerror(error));
-+#ifdef INTEGCK_DEBUG
- 	/*
- 	 * Note, to make this work well you need:
- 	 * 1. Make all functions non-static - add "#define static'
-@@ -264,6 +270,7 @@ static void check_failed(const char *cond, const char *func, const char *file,
- 	 */
- 	count = backtrace(addresses, 128);
- 	backtrace_symbols_fd(addresses, count, fileno(stdout));
-+#endif
- 	exit(EXIT_FAILURE);
- }
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/mtd/0003-fs-tests-integrity-don-t-include-header-bits-stdio_l.patch b/bsp/buildroot/package/mtd/0003-fs-tests-integrity-don-t-include-header-bits-stdio_l.patch
deleted file mode 100644
index 5c0a552d..00000000
--- a/bsp/buildroot/package/mtd/0003-fs-tests-integrity-don-t-include-header-bits-stdio_l.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 600ab10e3b452cdffc6c82770b0bb2ff5c23ad70 Mon Sep 17 00:00:00 2001
-From: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
-Date: Fri, 12 Aug 2016 22:59:35 +0530
-Subject: [PATCH 1/1] fs-tests: integrity: don't include header
- <bits/stdio_lim.h>
-
-With musl C library, we get following build error
-
-integck.c:37:28: fatal error: bits/stdio_lim.h: No such file or directory
- #include <bits/stdio_lim.h>
-                            ^
-compilation terminated.
-make[2]: *** [integck] Error 1
-
-Header <bits/stdio_lim.h> is not available in musl C library. However
-<stdio.h> has all definition that <bits/stdio_lim.h> supposed to be
-providing. Moreover <bits/stdio_lim.h> shouldn't be included directly
-instead we should be using <stdio.h>.
-
-Since we already include <stdio.h> and in case of uClibc or glibc
-<bits/stdio_lim.h> gets included internally, we can safely remove it.
-
-This build issue is found by Buildroot autobuilder
-http://autobuild.buildroot.net/results/175/1754861457af520480cc34d7d2d0edff2868ff66/
-
-Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
----
- tests/fs-tests/integrity/integck.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
-index 6ef817e..0bb9711 100644
---- a/tests/fs-tests/integrity/integck.c
-+++ b/tests/fs-tests/integrity/integck.c
-@@ -34,7 +34,6 @@
- #ifdef INTEGCK_DEBUG
- #include <execinfo.h>
- #endif
--#include <bits/stdio_lim.h>
- #include <sys/mman.h>
- #include <sys/vfs.h>
- #include <sys/mount.h>
--- 
-2.6.2
-
diff --git a/bsp/buildroot/package/mtd/Config.in b/bsp/buildroot/package/mtd/Config.in
index 2e6cdbbe..590ca7f5 100644
--- a/bsp/buildroot/package/mtd/Config.in
+++ b/bsp/buildroot/package/mtd/Config.in
@@ -6,6 +6,22 @@ config BR2_PACKAGE_MTD
 	  http://www.linux-mtd.infradead.org/
 
 if BR2_PACKAGE_MTD
+
+# The two hidden options below match mtd configure script options
+# --enable-jffs and --enable-ubifs
+
+config BR2_PACKAGE_MTD_JFFS_UTILS
+	bool
+	select BR2_PACKAGE_LZO
+	select BR2_PACKAGE_ZLIB
+
+config BR2_PACKAGE_MTD_UBIFS_UTILS
+	bool
+	select BR2_PACKAGE_LZO
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_ZLIB
+
 comment "MTD tools selection"
 
 config BR2_PACKAGE_MTD_DOCFDISK
@@ -50,18 +66,15 @@ config BR2_PACKAGE_MTD_FTL_FORMAT
 
 config BR2_PACKAGE_MTD_JFFS2DUMP
 	bool "jffs2dump"
+	select BR2_PACKAGE_MTD_JFFS_UTILS
 
 config BR2_PACKAGE_MTD_MKFSJFFS2
 	bool "mkfs.jffs2"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LZO
+	select BR2_PACKAGE_MTD_JFFS_UTILS
 
 config BR2_PACKAGE_MTD_MKFSUBIFS
 	bool "mkfs.ubifs"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LZO
-	select BR2_PACKAGE_UTIL_LINUX
-	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_MTD_UBIFS_UTILS
 
 config BR2_PACKAGE_MTD_MTD_DEBUG
 	bool "mtd_debug"
@@ -102,6 +115,7 @@ config BR2_PACKAGE_MTD_SERVE_IMAGE
 
 config BR2_PACKAGE_MTD_SUMTOOL
 	bool "sumtool"
+	select BR2_PACKAGE_MTD_JFFS_UTILS
 
 config BR2_PACKAGE_MTD_MTDINFO
 	bool "mtdinfo"
@@ -155,10 +169,43 @@ config BR2_PACKAGE_MTD_UBIBLOCK
 	bool "ubiblock"
 	default y
 
+config BR2_PACKAGE_MTD_TESTS
+	bool "MTD test tools"
+	depends on BR2_USE_MMU # fork() in fstests
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  Build and install tools for testing MTD devices and drivers.
+
+if BR2_PACKAGE_MTD_TESTS
+
+config BR2_PACKAGE_MTD_FLASH_READTEST
+	bool "flash_readtest"
+
+config BR2_PACKAGE_MTD_FLASH_SPEED
+	bool "flash_speed"
+
+config BR2_PACKAGE_MTD_FLASH_STRESS
+	bool "flash_stress"
+
+config BR2_PACKAGE_MTD_FLASH_TORTURE
+	bool "flash_torture"
+
 config BR2_PACKAGE_MTD_INTEGCK
 	bool "integck"
-	depends on BR2_USE_MMU # fork()
-	help
-	  Install the integck test program.
+
+config BR2_PACKAGE_MTD_NANDBITERRS
+	bool "nandbiterrs"
+
+config BR2_PACKAGE_MTD_NANDPAGETEST
+	bool "nandpagetest"
+
+config BR2_PACKAGE_MTD_NANDSUBPAGETEST
+	bool "nandsubpagetest"
+
+endif
+
+comment "MTD test tools need a toolchain w/ threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 endif
diff --git a/bsp/buildroot/package/mtd/mtd.hash b/bsp/buildroot/package/mtd/mtd.hash
index a99e04e5..4bd0cda0 100644
--- a/bsp/buildroot/package/mtd/mtd.hash
+++ b/bsp/buildroot/package/mtd/mtd.hash
@@ -1,3 +1,4 @@
 # Locally calculated after checking pgp signature
-# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.5.2.tar.bz2.asc
-sha256	5db57389280a3abaec5dd23af2590988b70f213fa3929c12a2642c8f9a86f400	mtd-utils-1.5.2.tar.bz2
+# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.0.2.tar.bz2.asc
+sha256	fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8	mtd-utils-2.0.2.tar.bz2
+sha256	dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa	COPYING
diff --git a/bsp/buildroot/package/mtd/mtd.mk b/bsp/buildroot/package/mtd/mtd.mk
index acf24d5a..83bd6a6a 100644
--- a/bsp/buildroot/package/mtd/mtd.mk
+++ b/bsp/buildroot/package/mtd/mtd.mk
@@ -4,25 +4,31 @@
 #
 ################################################################################
 
-MTD_VERSION = 1.5.2
+MTD_VERSION = 2.0.2
 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2
 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils
-MTD_LICENSE = GPLv2
+MTD_LICENSE = GPL-2.0
 MTD_LICENSE_FILES = COPYING
-
 MTD_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y)
-MTD_DEPENDENCIES = zlib lzo
+ifeq ($(BR2_PACKAGE_MTD_JFFS_UTILS),y)
+MTD_DEPENDENCIES += zlib lzo host-pkgconf
+MTD_CONF_OPTS += --with-jffs
+else
+MTD_CONF_OPTS += --without-jffs
 endif
 
-ifeq ($(BR2_PACKAGE_MTD_MKFSUBIFS),y)
+ifeq ($(BR2_PACKAGE_MTD_UBIFS_UTILS),y)
 MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf
-define MTD_ADD_MISSING_LINTL
-	$(SED) "/^LDLIBS_mkfs\.ubifs/ s%$$% `$(PKG_CONFIG_HOST_BINARY) --libs uuid`%" \
-		$(@D)/Makefile
-endef
-MTD_POST_PATCH_HOOKS += MTD_ADD_MISSING_LINTL
+MTD_CONF_OPTS += --with-ubifs
+else
+MTD_CONF_OPTS += --without-ubifs
+endif
+
+ifeq ($(BR2_PACKAGE_MTD_TESTS),y)
+MTD_CONF_OPTS += --enable-tests --enable-install-tests
+else
+MTD_CONF_OPTS += --disable-tests --disable-install-tests
 endif
 
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -33,26 +39,20 @@ endif
 # also be enabled which will also include the attr package.
 ifeq ($(BR2_PACKAGE_ACL),y)
 MTD_DEPENDENCIES += acl
-MTD_MAKE_OPTS += WITHOUT_XATTR=0
+MTD_CONF_OPTS += --with-xattr
 else
-MTD_MAKE_OPTS += WITHOUT_XATTR=1
+MTD_CONF_OPTS += --without-xattr
 endif
 
-HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs
+HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-util-linux
+HOST_MTD_CONF_OPTS = \
+	--with-jffs \
+	--with-ubifs \
+	--disable-tests
 
-define HOST_MTD_BUILD_CMDS
-	$(HOST_CONFIGURE_OPTS) $(MAKE1) \
-		CROSS= BUILDDIR=$(@D) WITHOUT_XATTR=1 -C $(@D)
-endef
+MKFS_JFFS2 = $(HOST_DIR)/sbin/mkfs.jffs2
+SUMTOOL = $(HOST_DIR)/sbin/sumtool
 
-define HOST_MTD_INSTALL_CMDS
-	$(MAKE1) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install
-endef
-
-MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2
-SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool
-
-MTD_STAGING_y = lib/libmtd.a ubi-utils/libubi.a
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK)		+= docfdisk
 MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS)	+= doc_loadbios
 MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP)		+= flashcp
@@ -79,56 +79,46 @@ MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP)		+= rfddump
 MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT)	+= rfdformat
 MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE)	+= serve_image
 MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL)		+= sumtool
-
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO)	+= mtdinfo
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH)	+= ubiattach
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32)	+= ubicrc32
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH)	+= ubidetach
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT)	+= ubiformat
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL)	+= ubimkvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO)	+= ubinfo
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE)	+= ubinize
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME)	+= ubirename
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL)	+= ubirmvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL)	+= ubirsvol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
-MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK)	+= ubiblock
-
-MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y))
-MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs
-
-ifeq ($(BR2_PACKAGE_MTD_INTEGCK),y)
-define MTD_BUILD_INTEGCK
-	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \
-		BUILDDIR=$(@D) $(MTD_MAKE_OPTS) -C $(@D)/tests/fs-tests all
-endef
-define MTD_INSTALL_INTEGCK
-	$(INSTALL) -D -m 755 $(@D)/tests/fs-tests/integrity/integck $(TARGET_DIR)/usr/sbin/integck
-endef
-endif
-
-define MTD_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \
-		BUILDDIR=$(@D) $(MTD_MAKE_OPTS) -C $(@D) \
-		$(addprefix $(@D)/,$(MTD_TARGETS_y)) \
-		$(addprefix $(@D)/,$(MTD_STAGING_y))
-	$(MTD_BUILD_INTEGCK)
-endef
-
-define MTD_INSTALL_STAGING_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/lib/libmtd.a $(STAGING_DIR)/usr/lib/libmtd.a
-	$(INSTALL) -D -m 0755 $(@D)/ubi-utils/libubi.a $(STAGING_DIR)/usr/lib/libubi.a
-	$(INSTALL) -D -m 0644 $(@D)/include/libmtd.h $(STAGING_DIR)/usr/include/mtd/libmtd.h
-	$(INSTALL) -D -m 0644 $(@D)/ubi-utils/include/libubi.h $(STAGING_DIR)/usr/include/mtd/libubi.h
-	$(INSTALL) -D -m 0644 $(@D)/include/mtd/ubi-media.h $(STAGING_DIR)/usr/include/mtd/ubi-media.h
-endef
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDINFO)		+= mtdinfo
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIATTACH)	+= ubiattach
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBICRC32)		+= ubicrc32
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIDETACH)	+= ubidetach
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIFORMAT)	+= ubiformat
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIMKVOL)		+= ubimkvol
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBINFO)		+= ubinfo
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBINIZE)		+= ubinize
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIRENAME)	+= ubirename
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIRMVOL)		+= ubirmvol
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIRSVOL)		+= ubirsvol
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIUPDATEVOL)	+= ubiupdatevol
+MTD_TARGETS_$(BR2_PACKAGE_MTD_UBIBLOCK)		+= ubiblock
+MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS)	+= mkfs.ubifs
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_READTEST)	+= flash_readtest
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_SPEED)	+= flash_speed
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_STRESS)	+= flash_stress
+MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_TORTURE)	+= flash_torture
+MTD_TARGETS_$(BR2_PACKAGE_MTD_INTEGCK)		+= integck
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDBITERRS)	+= nandbiterrs
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDPAGETEST)	+= nandpagetest
+MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDSUBPAGETEST)	+= nandsubpagetest
 
 define MTD_INSTALL_TARGET_CMDS
-	for f in $(MTD_TARGETS_y) ; do \
-		$(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \
-	done
-	$(MTD_INSTALL_INTEGCK)
+	$(foreach f,$(MTD_TARGETS_y), \
+		$(INSTALL) -D -m 0755 $(@D)/$(f) $(TARGET_DIR)/usr/sbin/$(notdir $(f))
+	)
 endef
 
-$(eval $(generic-package))
-$(eval $(host-generic-package))
+# Those libraries are not installed by "make install", but are needed
+# by other packages, such as swupdate.
+define MTD_INSTALL_LIBS
+	$(INSTALL) -D -m 0755 $(@D)/include/libmtd.h $(STAGING_DIR)/usr/include/mtd/libmtd.h
+	$(INSTALL) -D -m 0755 $(@D)/include/libubi.h $(STAGING_DIR)/usr/include/mtd/libubi.h
+	$(INSTALL) -D -m 0755 $(@D)/include/mtd/ubi-media.h $(STAGING_DIR)/usr/include/mtd/ubi-media.h
+	$(INSTALL) -D -m 0755 $(@D)/libmtd.a $(STAGING_DIR)/usr/lib/libmtd.a
+	$(INSTALL) -D -m 0755 $(@D)/libubi.a $(STAGING_DIR)/usr/lib/libubi.a
+endef
+
+MTD_POST_INSTALL_STAGING_HOOKS += MTD_INSTALL_LIBS
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/mtdev2tuio/Config.in b/bsp/buildroot/package/mtdev2tuio/Config.in
index 4195ecfe..3e88d218 100644
--- a/bsp/buildroot/package/mtdev2tuio/Config.in
+++ b/bsp/buildroot/package/mtdev2tuio/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_MTDEV2TUIO
 	bool "mtdev2tuio"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # liblo
 	select BR2_PACKAGE_LIBLO
 	select BR2_PACKAGE_MTDEV
-	depends on BR2_TOOLCHAIN_HAS_THREADS # liblo
 	help
 	  mtdev2tuio is a simple application for converting touch
 	  events captured from libmtdev to TUIO 1.1
diff --git a/bsp/buildroot/package/mtdev2tuio/mtdev2tuio.mk b/bsp/buildroot/package/mtdev2tuio/mtdev2tuio.mk
index d2e70408..e9085b00 100644
--- a/bsp/buildroot/package/mtdev2tuio/mtdev2tuio.mk
+++ b/bsp/buildroot/package/mtdev2tuio/mtdev2tuio.mk
@@ -7,7 +7,7 @@
 MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1
 MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION))
 MTDEV2TUIO_DEPENDENCIES = mtdev liblo
-MTDEV2TUIO_LICENSE = GPLv3+
+MTDEV2TUIO_LICENSE = GPL-3.0+
 MTDEV2TUIO_LICENSE_FILES = COPYING
 
 # mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD
diff --git a/bsp/buildroot/package/mtools/Config.in b/bsp/buildroot/package/mtools/Config.in
index e51bac12..99a073ca 100644
--- a/bsp/buildroot/package/mtools/Config.in
+++ b/bsp/buildroot/package/mtools/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_MTOOLS
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
 	help
-	  Mtools is a collection of utilities to access MS-DOS disks from
-	  Unix without mounting them. It supports Win'95 style long file
-	  names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high
-	  density 3 1/2 disk).
+	  Mtools is a collection of utilities to access MS-DOS disks
+	  from Unix without mounting them. It supports Win'95 style
+	  long file names, OS/2 Xdf disks and 2m disks (store up to
+	  1992k on a high density 3 1/2 disk).
 
 	  http://www.gnu.org/software/mtools/
 
diff --git a/bsp/buildroot/package/mtools/Config.in.host b/bsp/buildroot/package/mtools/Config.in.host
index 96b332b0..42cb6f80 100644
--- a/bsp/buildroot/package/mtools/Config.in.host
+++ b/bsp/buildroot/package/mtools/Config.in.host
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_HOST_MTOOLS
 	bool "host mtools"
 	help
-	  Mtools is a collection of utilities to access MS-DOS disks from
-	  Unix without mounting them. It supports Win'95 style long file
-	  names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high
-	  density 3 1/2 disk).
+	  Mtools is a collection of utilities to access MS-DOS disks
+	  from Unix without mounting them. It supports Win'95 style long
+	  file names, OS/2 Xdf disks and 2m disks (store up to 1992k on
+	  a high density 3 1/2 disk).
 
 	  http://www.gnu.org/software/mtools/
diff --git a/bsp/buildroot/package/mtools/mtools.mk b/bsp/buildroot/package/mtools/mtools.mk
index 1ba1e986..1a621883 100644
--- a/bsp/buildroot/package/mtools/mtools.mk
+++ b/bsp/buildroot/package/mtools/mtools.mk
@@ -7,7 +7,7 @@
 MTOOLS_VERSION = 4.0.18
 MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2
 MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools
-MTOOLS_LICENSE = GPLv3+
+MTOOLS_LICENSE = GPL-3.0+
 MTOOLS_LICENSE_FILES = COPYING
 MTOOLS_CONF_OPTS = --without-x
 # info documentation not needed
diff --git a/bsp/buildroot/package/mtr/mtr.mk b/bsp/buildroot/package/mtr/mtr.mk
index 5ee61249..82688ed0 100644
--- a/bsp/buildroot/package/mtr/mtr.mk
+++ b/bsp/buildroot/package/mtr/mtr.mk
@@ -9,7 +9,7 @@ MTR_SITE = $(call github,traviscross,mtr,$(MTR_VERSION))
 MTR_AUTORECONF = YES
 MTR_CONF_OPTS = --without-gtk
 MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses)
-MTR_LICENSE = GPLv2
+MTR_LICENSE = GPL-2.0
 MTR_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/multicat/Config.in b/bsp/buildroot/package/multicat/Config.in
index 13593581..85f306d5 100644
--- a/bsp/buildroot/package/multicat/Config.in
+++ b/bsp/buildroot/package/multicat/Config.in
@@ -3,7 +3,8 @@ config BR2_PACKAGE_MULTICAT
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_BITSTREAM
 	help
-	  Simple and efficient multicast and transport stream manipulation.
+	  Simple and efficient multicast and transport stream
+	  manipulation.
 
 	  http://www.videolan.org/projects/multicat.html
 
diff --git a/bsp/buildroot/package/multicat/multicat.mk b/bsp/buildroot/package/multicat/multicat.mk
index cc6eb78d..6f882667 100644
--- a/bsp/buildroot/package/multicat/multicat.mk
+++ b/bsp/buildroot/package/multicat/multicat.mk
@@ -7,7 +7,7 @@
 MULTICAT_VERSION = 2.1
 MULTICAT_SOURCE = multicat-$(MULTICAT_VERSION).tar.bz2
 MULTICAT_SITE = https://get.videolan.org/multicat/$(MULTICAT_VERSION)
-MULTICAT_LICENSE = GPLv2+
+MULTICAT_LICENSE = GPL-2.0+
 MULTICAT_LICENSE_FILES = COPYING
 
 MULTICAT_DEPENDENCIES = bitstream
diff --git a/bsp/buildroot/package/musepack/Config.in b/bsp/buildroot/package/musepack/Config.in
index 2a966a47..f368764b 100644
--- a/bsp/buildroot/package/musepack/Config.in
+++ b/bsp/buildroot/package/musepack/Config.in
@@ -3,9 +3,10 @@ config BR2_PACKAGE_MUSEPACK
 	select BR2_PACKAGE_LIBCUEFILE
 	select BR2_PACKAGE_LIBREPLAYGAIN
 	help
-	  Musepack is an audio compression format with a strong emphasis
-	  on high quality. It's not lossless, but it is designed
-	  for transparency, so that you won't be able to hear differences
-	  between the original wave file and the much smaller MPC file.
+	  Musepack is an audio compression format with a strong
+	  emphasis on high quality. It's not lossless, but it is
+	  designed for transparency, so that you won't be able to hear
+	  differences between the original wave file and the much
+	  smaller MPC file.
 
 	  http://www.musepack.net/
diff --git a/bsp/buildroot/package/musepack/musepack.mk b/bsp/buildroot/package/musepack/musepack.mk
index db613a0a..fc66c684 100644
--- a/bsp/buildroot/package/musepack/musepack.mk
+++ b/bsp/buildroot/package/musepack/musepack.mk
@@ -10,7 +10,7 @@ MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz
 MUSEPACK_DEPENDENCIES = libcuefile libreplaygain
 MUSEPACK_INSTALL_STAGING = YES
 MUSEPACK_MAKE = $(MAKE1)
-MUSEPACK_LICENSE = BSD-3c (*mpcdec), LGPLv2.1+ (*mpcenc)
+MUSEPACK_LICENSE = BSD-3-Clause (*mpcdec), LGPL-2.1+ (*mpcenc)
 MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/musl-compat-headers/musl-compat-headers.mk b/bsp/buildroot/package/musl-compat-headers/musl-compat-headers.mk
index 25e032c7..91f5074e 100644
--- a/bsp/buildroot/package/musl-compat-headers/musl-compat-headers.mk
+++ b/bsp/buildroot/package/musl-compat-headers/musl-compat-headers.mk
@@ -9,7 +9,7 @@ MUSL_COMPAT_HEADERS_QUEUE_H = http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/qu
 
 MUSL_COMPAT_HEADERS_EXTRA_DOWNLOADS = $(MUSL_COMPAT_HEADERS_QUEUE_H)
 
-MUSL_COMPAT_HEADERS_LICENSE = BSD-3c, Public Domain or CC0
+MUSL_COMPAT_HEADERS_LICENSE = BSD-3-Clause, Public Domain or CC0
 MUSL_COMPAT_HEADERS_LICENSE_FILES = queue.h cdefs.h
 
 MUSL_COMPAT_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
diff --git a/bsp/buildroot/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch b/bsp/buildroot/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch
new file mode 100644
index 00000000..cbfc9b66
--- /dev/null
+++ b/bsp/buildroot/package/musl/0002-add-additional-uapi-guards-for-Linux-kernel-header-f.patch
@@ -0,0 +1,69 @@
+From b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sat, 6 Jan 2018 23:32:52 +0100
+Subject: [PATCH] add additional uapi guards for Linux kernel header files
+
+With Linux kernel 4.16 it will be possible to guard more parts of the
+Linux header files from a libc. Make use of this in musl to guard all
+the structures and other definitions from the Linux header files which
+are also defined by the header files provided by musl. This will make
+it possible to compile source files which include both the libc
+headers and the kernel userspace headers.
+
+This extends the definitions done in commit 04983f227238 ("make
+netinet/in.h suppress clashing definitions from kernel headers")
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit b583c5d3b4cc
+
+ include/net/if.h           | 7 +++++++
+ include/netinet/if_ether.h | 1 +
+ include/sys/xattr.h        | 2 ++
+ 3 files changed, 10 insertions(+)
+
+diff --git a/include/net/if.h b/include/net/if.h
+index 2f2fcc10e484..774cbff0b506 100644
+--- a/include/net/if.h
++++ b/include/net/if.h
+@@ -125,6 +125,13 @@ struct ifconf {
+ #define ifc_req		ifc_ifcu.ifcu_req
+ #define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
+ 
++#define __UAPI_DEF_IF_IFCONF                                    0
++#define __UAPI_DEF_IF_IFMAP                                     0
++#define __UAPI_DEF_IF_IFNAMSIZ                                  0
++#define __UAPI_DEF_IF_IFREQ                                     0
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS                          0
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO    0
++
+ #endif
+ 
+ #ifdef __cplusplus
+diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
+index d9a131aa2d1d..97134d75b480 100644
+--- a/include/netinet/if_ether.h
++++ b/include/netinet/if_ether.h
+@@ -133,5 +133,6 @@ do { \
+ 	(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
+ } while(0)
+ 
++#define __UAPI_DEF_ETHHDR       0
+ 
+ #endif
+diff --git a/include/sys/xattr.h b/include/sys/xattr.h
+index 6479fcc62e5f..eeeaafc44f09 100644
+--- a/include/sys/xattr.h
++++ b/include/sys/xattr.h
+@@ -24,6 +24,8 @@ int removexattr(const char *, const char *);
+ int lremovexattr(const char *, const char *);
+ int fremovexattr(int, const char *);
+ 
++#define __UAPI_DEF_XATTR        0
++
+ #ifdef __cplusplus
+ }
+ #endif
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch b/bsp/buildroot/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch
deleted file mode 100644
index c6b5ef26..00000000
--- a/bsp/buildroot/package/musl/0002-in-dns-parsing-callback-enforce-MAXADDRS-to-preclude.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 45ca5d3fcb6f874bf5ba55d0e9651cef68515395 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Wed, 18 Oct 2017 14:50:03 -0400
-Subject: [PATCH] in dns parsing callback, enforce MAXADDRS to preclude
- overflow
-
-MAXADDRS was chosen not to need enforcement, but the logic used to
-compute it assumes the answers received match the RR types of the
-queries. specifically, it assumes that only one replu contains A
-record answers. if the replies to both the A and the AAAA query have
-their answer sections filled with A records, MAXADDRS can be exceeded
-and clobber the stack of the calling function.
-
-this bug was found and reported by Felix Wilhelm.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/network/lookup_name.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c
-index 066be4d5..209c20f0 100644
---- a/src/network/lookup_name.c
-+++ b/src/network/lookup_name.c
-@@ -111,6 +111,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const
- {
- 	char tmp[256];
- 	struct dpc_ctx *ctx = c;
-+	if (ctx->cnt >= MAXADDRS) return -1;
- 	switch (rr) {
- 	case RR_A:
- 		if (len != 4) return -1;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/musl/Config.in b/bsp/buildroot/package/musl/Config.in
index 2775313a..bedc50cd 100644
--- a/bsp/buildroot/package/musl/Config.in
+++ b/bsp/buildroot/package/musl/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_MUSL
 	bool
-	depends on BR2_TOOLCHAIN_USES_MUSL
 	default y
+	depends on BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_LINUX_HEADERS
 	# SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2
 	select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc)
diff --git a/bsp/buildroot/package/musl/musl.hash b/bsp/buildroot/package/musl/musl.hash
index f3f37410..68e6aab1 100644
--- a/bsp/buildroot/package/musl/musl.hash
+++ b/bsp/buildroot/package/musl/musl.hash
@@ -1,2 +1,3 @@
-# Locally calculated after checking pgp signature
-sha256	937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011  musl-1.1.16.tar.gz
+# Locally calculated after checking pgp signature from
+# http://www.musl-libc.org/releases/musl-1.1.18.tar.gz.asc
+sha256	d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118  musl-1.1.18.tar.gz
diff --git a/bsp/buildroot/package/musl/musl.mk b/bsp/buildroot/package/musl/musl.mk
index 6d560339..b1aace04 100644
--- a/bsp/buildroot/package/musl/musl.mk
+++ b/bsp/buildroot/package/musl/musl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MUSL_VERSION = 1.1.16
+MUSL_VERSION = 1.1.18
 MUSL_SITE = http://www.musl-libc.org/releases
 MUSL_LICENSE = MIT
 MUSL_LICENSE_FILES = COPYRIGHT
diff --git a/bsp/buildroot/package/mutt/0001-nodoc.patch b/bsp/buildroot/package/mutt/0001-nodoc.patch
deleted file mode 100644
index 6fd556dc..00000000
--- a/bsp/buildroot/package/mutt/0001-nodoc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Disable the documentation build
-
-The documentation tool is compiled for the target, but executed on the
-host. We don't bother fixing this, as we don't care of the
-documentation in Buildroot.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: mutt-1.5.17+20080114/Makefile.am
-===================================================================
---- mutt-1.5.17+20080114.orig/Makefile.am	2010-05-15 18:15:08.000000000 +0200
-+++ mutt-1.5.17+20080114/Makefile.am	2010-05-15 18:15:17.000000000 +0200
-@@ -9,7 +9,7 @@
- IMAP_INCLUDES = -I$(top_srcdir)/imap
- endif
- 
--SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
-+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
- 
- bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- 
diff --git a/bsp/buildroot/package/mutt/mutt.hash b/bsp/buildroot/package/mutt/mutt.hash
index 460cd5f0..f6dc472d 100644
--- a/bsp/buildroot/package/mutt/mutt.hash
+++ b/bsp/buildroot/package/mutt/mutt.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df  mutt-1.7.1.tar.gz
+sha256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42  mutt-1.8.3.tar.gz
diff --git a/bsp/buildroot/package/mutt/mutt.mk b/bsp/buildroot/package/mutt/mutt.mk
index cd44ca10..b0bf5a7b 100644
--- a/bsp/buildroot/package/mutt/mutt.mk
+++ b/bsp/buildroot/package/mutt/mutt.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-MUTT_VERSION = 1.7.1
+MUTT_VERSION = 1.8.3
 MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads
-MUTT_LICENSE = GPLv2+
+MUTT_LICENSE = GPL-2.0+
 MUTT_LICENSE_FILES = GPL
 MUTT_DEPENDENCIES = ncurses
-MUTT_CONF_OPTS = --disable-smtp
-MUTT_AUTORECONF = YES
+MUTT_CONF_OPTS = --disable-doc --disable-smtp
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 MUTT_DEPENDENCIES += libiconv
@@ -67,6 +66,7 @@ MUTT_CONF_ENV += \
 MUTT_CONF_OPTS += --with-mailpath=/var/mail
 
 define MUTT_VAR_MAIL
+	mkdir -p $(TARGET_DIR)/var
 	ln -sf /tmp $(TARGET_DIR)/var/mail
 endef
 MUTT_POST_INSTALL_TARGET_HOOKS += MUTT_VAR_MAIL
diff --git a/bsp/buildroot/package/mxml/mxml.mk b/bsp/buildroot/package/mxml/mxml.mk
index 1ed5eb97..ac270bd1 100644
--- a/bsp/buildroot/package/mxml/mxml.mk
+++ b/bsp/buildroot/package/mxml/mxml.mk
@@ -6,7 +6,7 @@
 
 MXML_VERSION = 2.10
 MXML_SITE = https://github.com/michaelrsweet/mxml/releases/download/release-$(MXML_VERSION)
-MXML_LICENSE = LGPLv2+ with exceptions
+MXML_LICENSE = LGPL-2.0+ with exceptions
 MXML_LICENSE_FILES = COPYING
 MXML_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/mxsldr/mxsldr.mk b/bsp/buildroot/package/mxsldr/mxsldr.mk
index fa7ca844..239b40ad 100644
--- a/bsp/buildroot/package/mxsldr/mxsldr.mk
+++ b/bsp/buildroot/package/mxsldr/mxsldr.mk
@@ -6,7 +6,7 @@
 
 MXSLDR_VERSION = 2793a657ab7a22487d21c1b020957806f8ae8383
 MXSLDR_SITE = git://git.denx.de/mxsldr.git
-MXSLDR_LICENSE = GPLv2+
+MXSLDR_LICENSE = GPL-2.0+
 MXSLDR_LICENSE_FILES = COPYING
 HOST_MXSLDR_DEPENDENCIES = host-libusb host-pkgconf
 
@@ -15,7 +15,7 @@ define HOST_MXSLDR_BUILD_CMDS
 endef
 
 define HOST_MXSLDR_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/mxsldr $(HOST_DIR)/usr/bin/mxsldr
+	$(INSTALL) -m 0755 -D $(@D)/mxsldr $(HOST_DIR)/bin/mxsldr
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/mysql/Config.in b/bsp/buildroot/package/mysql/Config.in
index 69ad5865..2abf5dae 100644
--- a/bsp/buildroot/package/mysql/Config.in
+++ b/bsp/buildroot/package/mysql/Config.in
@@ -17,6 +17,7 @@ choice
 config BR2_PACKAGE_MARIADB
 	bool "mariadb"
 	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_LIBAIO
 	select BR2_PACKAGE_LIBXML2
 	select BR2_PACKAGE_NCURSES
@@ -24,12 +25,16 @@ config BR2_PACKAGE_MARIADB
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_HAS_MYSQL
 	help
-	  MariaDB is one of the most popular database servers in the world.
-	  It's made by the original developers of MySQL and guaranteed to
-	  stay open source.
+	  MariaDB is one of the most popular database servers in the
+	  world.  It's made by the original developers of MySQL and
+	  guaranteed to stay open source.
 
 	  http://www.mariadb.org/
 
+comment "mariadb needs a toolchain w/ dynamic library"
+	depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_ORACLE_MYSQL
 	bool "oracle mysql"
 	select BR2_PACKAGE_NCURSES
diff --git a/bsp/buildroot/package/nano/nano.hash b/bsp/buildroot/package/nano/nano.hash
index aa3e27b9..c09f0313 100644
--- a/bsp/buildroot/package/nano/nano.hash
+++ b/bsp/buildroot/package/nano/nano.hash
@@ -1,2 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256 752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9  nano-2.7.4.tar.xz
+sha256 d2d30c39caef53aba1ec1b4baff4186d4496f35d2411b0848242a5f2e27e129e  nano-2.9.0.tar.xz
+sha256 fc82ca8b6fdb18d4e3e85cfd8ab58d1bcd3f1b29abe782895abd91d64763f8e7  COPYING
diff --git a/bsp/buildroot/package/nano/nano.mk b/bsp/buildroot/package/nano/nano.mk
index 4632bed3..458174a4 100644
--- a/bsp/buildroot/package/nano/nano.mk
+++ b/bsp/buildroot/package/nano/nano.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-NANO_VERSION_MAJOR = 2.7
-NANO_VERSION = $(NANO_VERSION_MAJOR).4
+NANO_VERSION_MAJOR = 2.9
+NANO_VERSION = $(NANO_VERSION_MAJOR).0
 NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR)
 NANO_SOURCE = nano-$(NANO_VERSION).tar.xz
-NANO_LICENSE = GPLv3+
+NANO_LICENSE = GPL-3.0+
 NANO_LICENSE_FILES = COPYING
 NANO_CONF_OPTS = \
 	--without-slang \
diff --git a/bsp/buildroot/package/nanocom/Config.in b/bsp/buildroot/package/nanocom/Config.in
index 51d628ae..bc0a0586 100644
--- a/bsp/buildroot/package/nanocom/Config.in
+++ b/bsp/buildroot/package/nanocom/Config.in
@@ -1,11 +1,12 @@
 config BR2_PACKAGE_NANOCOM
 	bool "nanocom"
 	help
-	  Nanocom is based upon microcom (http://microcom.port5.com/) but
-	  removes the scripting and logging features while introducing support
-	  for setting local/remote echo, parity and stop bits. It also follows
-	  a more standard command line style using the getopt function.
-	  Internally much of the code has been rewritten and reformatted, the
-	  menu system in particular is almost entirely different.
+	  Nanocom is based upon microcom (http://microcom.port5.com/)
+	  but removes the scripting and logging features while
+	  introducing support for setting local/remote echo, parity
+	  and stop bits. It also follows a more standard command line
+	  style using the getopt function.  Internally much of the
+	  code has been rewritten and reformatted, the menu system in
+	  particular is almost entirely different.
 
 	  http://nanocom.sourceforge.net/
diff --git a/bsp/buildroot/package/nanocom/nanocom.mk b/bsp/buildroot/package/nanocom/nanocom.mk
index caab3680..7893cc6b 100644
--- a/bsp/buildroot/package/nanocom/nanocom.mk
+++ b/bsp/buildroot/package/nanocom/nanocom.mk
@@ -8,7 +8,7 @@ NANOCOM_VERSION = 1.0
 NANOCOM_SOURCE = nanocom.tar.gz
 NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v$(NANOCOM_VERSION)
 NANOCOM_STRIP_COMPONENTS = 0
-NANOCOM_LICENSE = GPLv2+
+NANOCOM_LICENSE = GPL-2.0+
 NANOCOM_LICENSE_FILES = COPYING
 
 define NANOCOM_BUILD_CMDS
diff --git a/bsp/buildroot/package/nanomsg/Config.in b/bsp/buildroot/package/nanomsg/Config.in
new file mode 100644
index 00000000..0cab8b47
--- /dev/null
+++ b/bsp/buildroot/package/nanomsg/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_NANOMSG
+	bool "nanomsg"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  nanomsg is a socket library that provides several common
+	  communication patterns. It aims to make the networking layer
+	  fast, scalable, and easy to use. Implemented in C, it works
+	  on a wide range of operating systems with no further
+	  dependencies.
+
+	  http://nanomsg.org/
+
+if BR2_PACKAGE_NANOMSG
+
+config BR2_PACKAGE_NANOMSG_TOOLS
+	bool "Build nanomsg tools"
+	help
+	  Build nanomsg tools
+
+endif
+
+comment "nanomsg needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/nanomsg/nanomsg.hash b/bsp/buildroot/package/nanomsg/nanomsg.hash
new file mode 100644
index 00000000..5164a754
--- /dev/null
+++ b/bsp/buildroot/package/nanomsg/nanomsg.hash
@@ -0,0 +1,5 @@
+# Locally computed
+sha256 24afdeb71b2e362e8a003a7ecc906e1b84fd9f56ce15ec567481d1bb33132cc7  nanomsg-1.0.0.tar.gz
+
+# Hash for license file:
+sha256 4e51f6a04312ea7c5f4f0e92d91b6415c1eeb09bdaf86a6fd11d93499457c07a  COPYING
diff --git a/bsp/buildroot/package/nanomsg/nanomsg.mk b/bsp/buildroot/package/nanomsg/nanomsg.mk
new file mode 100644
index 00000000..3b1c2ca0
--- /dev/null
+++ b/bsp/buildroot/package/nanomsg/nanomsg.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# nanomsg
+#
+################################################################################
+
+NANOMSG_VERSION = 1.0.0
+NANOMSG_SITE = $(call github,nanomsg,nanomsg,$(NANOMSG_VERSION))
+NANOMSG_INSTALL_STAGING = YES
+NANOMSG_LICENSE = MIT
+NANOMSG_LICENSE_FILES = COPYING
+NANOMSG_CONF_OPTS = -DNN_ENABLE_DOC=OFF -DNN_TESTS=OFF
+
+ifeq ($(BR2_STATIC_LIBS),y)
+NANOMSG_CONF_OPTS += -DNN_STATIC_LIB=ON
+endif
+
+ifeq ($(BR2_PACKAGE_NANOMSG_TOOLS),y)
+NANOMSG_CONF_OPTS += -DNN_TOOLS=ON
+else
+NANOMSG_CONF_OPTS += -DNN_TOOLS=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/nasm/0001-nasmlib-Drop-unused-seg_init.patch b/bsp/buildroot/package/nasm/0001-nasmlib-Drop-unused-seg_init.patch
new file mode 100644
index 00000000..a18d121b
--- /dev/null
+++ b/bsp/buildroot/package/nasm/0001-nasmlib-Drop-unused-seg_init.patch
@@ -0,0 +1,32 @@
+From 5eb1838b4d3752fd863d19442943983a2a5ee87c Mon Sep 17 00:00:00 2001
+From: Cyrill Gorcunov <gorcunov@gmail.com>
+Date: Sat, 10 Feb 2018 00:33:41 +0300
+Subject: [PATCH] nasmlib: Drop unused seg_init
+
+The helper has been eliminated in 2c4a4d5810d0a59b033a07876a2648ef5d4c2859
+
+https://bugzilla.nasm.us/show_bug.cgi?id=3392461
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
+---
+ include/nasmlib.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/include/nasmlib.h b/include/nasmlib.h
+index 79e866b5..fee1b5ea 100644
+--- a/include/nasmlib.h
++++ b/include/nasmlib.h
+@@ -188,10 +188,8 @@ int64_t readnum(char *str, bool *error);
+ int64_t readstrnum(char *str, int length, bool *warn);
+ 
+ /*
+- * seg_init: Initialise the segment-number allocator.
+  * seg_alloc: allocate a hitherto unused segment number.
+  */
+-void pure_func seg_init(void);
+ int32_t pure_func seg_alloc(void);
+ 
+ /*
+-- 
+2.17.0
+
diff --git a/bsp/buildroot/package/nasm/nasm.hash b/bsp/buildroot/package/nasm/nasm.hash
index 5d7c36de..db5b8571 100644
--- a/bsp/buildroot/package/nasm/nasm.hash
+++ b/bsp/buildroot/package/nasm/nasm.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321	nasm-2.12.02.tar.xz
+sha256 812ecfb0dcbc5bd409aaa8f61c7de94c5b8752a7b00c632883d15b2ed6452573  nasm-2.13.03.tar.xz
+sha256 1563996c52e220e15ef2418e67d39488255aa8c28c89e617074d3afe3ee329e0  LICENSE
diff --git a/bsp/buildroot/package/nasm/nasm.mk b/bsp/buildroot/package/nasm/nasm.mk
index f5d9ea0b..76bcca3b 100644
--- a/bsp/buildroot/package/nasm/nasm.mk
+++ b/bsp/buildroot/package/nasm/nasm.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-NASM_VERSION = 2.12.02
+NASM_VERSION = 2.13.03
 NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz
 NASM_SITE = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION)
-NASM_LICENSE = BSD-2c
+NASM_LICENSE = BSD-2-Clause
 NASM_LICENSE_FILES = LICENSE
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/nbd/Config.in b/bsp/buildroot/package/nbd/Config.in
index a5ded298..ad9fb5cc 100644
--- a/bsp/buildroot/package/nbd/Config.in
+++ b/bsp/buildroot/package/nbd/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_NBD
 	bool "nbd"
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	depends on BR2_USE_MMU # glib2
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBGLIB2
 	help
 	  NBD is a set of utilities to configure network block devices,
@@ -12,16 +12,21 @@ config BR2_PACKAGE_NBD
 
 if BR2_PACKAGE_NBD
 
-config BR2_NBD_CLIENT
+config BR2_PACKAGE_NBD_CLIENT
 	bool "nbd client"
 	default y
 	help
-	  the client part of NBD.
+	  The client part of NBD.
 
-config BR2_NBD_SERVER
+config BR2_PACKAGE_NBD_SERVER
 	bool "nbd server"
 	help
-	  the server part of NBD.
+	  The server part of NBD.
+
+config BR2_PACKAGE_NBD_TRDUMP
+	bool "nbd trdump"
+	help
+	  Utility to dump server logs in human-readable form.
 
 endif
 
diff --git a/bsp/buildroot/package/nbd/nbd.hash b/bsp/buildroot/package/nbd/nbd.hash
index c90682f4..03234fd8 100644
--- a/bsp/buildroot/package/nbd/nbd.hash
+++ b/bsp/buildroot/package/nbd/nbd.hash
@@ -1,3 +1,3 @@
 # From http://sourceforge.net/projects/nbd/files/nbd/3.13/
-md5	784be37497cc2f9a53c67c8c77d1676d	nbd-3.13.tar.xz
-sha1	e43674a2d2b42d20719cba3149748e8f5683e554	nbd-3.13.tar.xz
+md5	f52a4ef8979d81e6c15a745236582fdf	nbd-3.15.2.tar.xz
+sha1	c8248dd76641a31189735407cd4d55fe63969c08	nbd-3.15.2.tar.xz
diff --git a/bsp/buildroot/package/nbd/nbd.mk b/bsp/buildroot/package/nbd/nbd.mk
index a763d83d..82de1c48 100644
--- a/bsp/buildroot/package/nbd/nbd.mk
+++ b/bsp/buildroot/package/nbd/nbd.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-NBD_VERSION = 3.13
+NBD_VERSION = 3.15.2
 NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz
 NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION)
 NBD_CONF_OPTS = --enable-lfs
 NBD_DEPENDENCIES = libglib2
-NBD_LICENSE = GPLv2
+NBD_LICENSE = GPL-2.0
 NBD_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
@@ -18,12 +18,15 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no
 endif
 
-ifneq ($(BR2_NBD_CLIENT),y)
+ifneq ($(BR2_PACKAGE_NBD_CLIENT),y)
 NBD_TOREMOVE += /usr/sbin/nbd-client
 endif
-ifneq ($(BR2_NBD_SERVER),y)
+ifneq ($(BR2_PACKAGE_NBD_SERVER),y)
 NBD_TOREMOVE += /usr/bin/nbd-server
 endif
+ifneq ($(BR2_PACKAGE_NBD_TRDUMP),y)
+NBD_TOREMOVE += /usr/bin/nbd-trdump
+endif
 
 define NBD_CLEANUP_AFTER_INSTALL
 	rm -f $(addprefix $(TARGET_DIR), $(NBD_TOREMOVE))
diff --git a/bsp/buildroot/package/ncdu/ncdu.hash b/bsp/buildroot/package/ncdu/ncdu.hash
index 4bdda402..8a0c1d16 100644
--- a/bsp/buildroot/package/ncdu/ncdu.hash
+++ b/bsp/buildroot/package/ncdu/ncdu.hash
@@ -1,3 +1,3 @@
-# From http://dev.yorhel.nl/download/ncdu-1.11.tar.gz.{md5,sha1}
-md5   9e44240a5356b029f05f0e70a63c4d12          ncdu-1.11.tar.gz
-sha1  8f22d713e6d2b28e1f501eee2bd1e03b55550c8d  ncdu-1.11.tar.gz
+# From http://dev.yorhel.nl/download/ncdu-1.12.tar.gz.{md5,sha1}
+md5 7365ac46c420bc511621216b1747984f  ncdu-1.12.tar.gz
+sha1 b79b1c44784f334dca74d89a49f49274f14cfeef  ncdu-1.12.tar.gz
diff --git a/bsp/buildroot/package/ncdu/ncdu.mk b/bsp/buildroot/package/ncdu/ncdu.mk
index bccbb8d9..d45e62d9 100644
--- a/bsp/buildroot/package/ncdu/ncdu.mk
+++ b/bsp/buildroot/package/ncdu/ncdu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NCDU_VERSION = 1.11
+NCDU_VERSION = 1.12
 NCDU_SITE = http://dev.yorhel.nl/download
 
 NCDU_DEPENDENCIES = ncurses
diff --git a/bsp/buildroot/package/ncftp/Config.in b/bsp/buildroot/package/ncftp/Config.in
index 135ab535..6a939aa8 100644
--- a/bsp/buildroot/package/ncftp/Config.in
+++ b/bsp/buildroot/package/ncftp/Config.in
@@ -3,8 +3,9 @@ config BR2_PACKAGE_NCFTP
 	# fork()
 	depends on BR2_USE_MMU
 	help
-	  NcFTP Client (also known as just NcFTP) is a set of FREE application
-	  programs implementing the File Transfer Protocol (FTP).
+	  NcFTP Client (also known as just NcFTP) is a set of FREE
+	  application programs implementing the File Transfer Protocol
+	  (FTP).
 
 	  http://www.ncftp.com/ncftp/
 
diff --git a/bsp/buildroot/package/ncftp/ncftp.hash b/bsp/buildroot/package/ncftp/ncftp.hash
index 0a7c26c9..f6f73101 100644
--- a/bsp/buildroot/package/ncftp/ncftp.hash
+++ b/bsp/buildroot/package/ncftp/ncftp.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d  ncftp-3.2.6-src.tar.xz
+sha256 129e5954850290da98af012559e6743de193de0012e972ff939df9b604f81c23  ncftp-3.2.6-src.tar.gz
diff --git a/bsp/buildroot/package/ncftp/ncftp.mk b/bsp/buildroot/package/ncftp/ncftp.mk
index 11bfccaa..c8c89423 100644
--- a/bsp/buildroot/package/ncftp/ncftp.mk
+++ b/bsp/buildroot/package/ncftp/ncftp.mk
@@ -5,7 +5,9 @@
 ################################################################################
 
 NCFTP_VERSION = 3.2.6
-NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz
+# use .gz as upstream .xz tarball has changed after the hash was added for
+# 2017.02. Can be changed back to .xz when version is bumped
+NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz
 NCFTP_SITE = ftp://ftp.ncftp.com/ncftp
 NCFTP_TARGET_BINS = ncftp
 NCFTP_LICENSE = Clarified Artistic License
@@ -19,7 +21,7 @@ NCFTP_CONF_OPTS = --disable-ccdv
 # We need to pass -I because of the non-standard m4 directory name, and
 # none of the other autotools are used, so the below is the easiest.
 define NCFTP_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/)
+	(cd $(@D); $(HOST_DIR)/bin/autoconf -I$(@D)/autoconf_local/)
 endef
 NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF
 
diff --git a/bsp/buildroot/package/ncmpc/ncmpc.hash b/bsp/buildroot/package/ncmpc/ncmpc.hash
index e7646b2e..82fae1d7 100644
--- a/bsp/buildroot/package/ncmpc/ncmpc.hash
+++ b/bsp/buildroot/package/ncmpc/ncmpc.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256 6e328acb71d06ae9e6c5fced99bc28ae78bcab1a73130b42ce9ab08a814ecea4 ncmpc-0.25.tar.xz
+sha256 f9a26a3fc869cfdf0a16b0ea3e6512c2fe28a031bbc71b1d24a2bf0bbd3e15d9  ncmpc-0.27.tar.xz
diff --git a/bsp/buildroot/package/ncmpc/ncmpc.mk b/bsp/buildroot/package/ncmpc/ncmpc.mk
index b5fa7cdf..31b4f08d 100644
--- a/bsp/buildroot/package/ncmpc/ncmpc.mk
+++ b/bsp/buildroot/package/ncmpc/ncmpc.mk
@@ -5,11 +5,11 @@
 ################################################################################
 
 NCMPC_VERSION_MAJOR = 0
-NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).25
+NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).27
 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz
 NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR)
 NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses
-NCMPC_LICENSE = GPLv2+
+NCMPC_LICENSE = GPL-2.0+
 NCMPC_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ncurses/0001-fixup-pkg-config-handling.patch b/bsp/buildroot/package/ncurses/0001-fixup-pkg-config-handling.patch
deleted file mode 100644
index e1cfc751..00000000
--- a/bsp/buildroot/package/ncurses/0001-fixup-pkg-config-handling.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-Change handling of PKG_CONFIG_LIBDIR
-
-When PKG_CONFIG_LIBDIR was unset in the environment, the configure
-script was deducing the PKG_CONFIG_LIBDIR from the location of the
-pkg-config binary, which doesn't make a lot of sense, and isn't done
-by other autotools based packages.
-
-Also, the configure script was checking that the directory really
-exists. This forced to create the directory *and* provide an absolute
-path in PKG_CONFIG_LIBDIR, which didn't play well with the fact that
-at installation time, PKG_CONFIG_LIBDIR is suffixed to DESTDIR, which
-means that we got two times the staging directory location.
-
-This patch fixes both of those issues. Also, since ncurses uses a fork
-of autoconf 2.13, we can't simply use _AUTORECONF=YES, so we also fix
-the configure script in this patch.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -3623,27 +3623,20 @@
- 
- 	# Leave this as something that can be overridden in the environment.
- 	if test -z "$PKG_CONFIG_LIBDIR" ; then
--		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
-+		PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
- 	fi
-+
- 	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
--	if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
- 
--# Check whether --enable-pc-files or --disable-pc-files was given.
--if test "${enable_pc_files+set}" = set; then
--  enableval="$enable_pc_files"
--  enable_pc_files=$enableval
--else
--  enable_pc_files=no
--fi;
--		echo "$as_me:3638: result: $enable_pc_files" >&5
--echo "${ECHO_T}$enable_pc_files" >&6
-+        # Check whether --enable-pc-files or --disable-pc-files was given.
-+	if test "${enable_pc_files+set}" = set; then
-+	    enableval="$enable_pc_files"
-+	    enable_pc_files=$enableval
- 	else
--		echo "$as_me:3641: result: no" >&5
--echo "${ECHO_T}no" >&6
--		{ echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5
--echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;}
--		enable_pc_files=no
--	fi
-+	    enable_pc_files=no
-+	fi;
-+	echo "$as_me:3638: result: $enable_pc_files" >&5
-+	echo "${ECHO_T}$enable_pc_files" >&6
- fi
- 
- echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -174,20 +174,14 @@
- 
- 	# Leave this as something that can be overridden in the environment.
- 	if test -z "$PKG_CONFIG_LIBDIR" ; then
--		PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
-+		PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig"
- 	fi
- 	PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
--	if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
--		AC_ARG_ENABLE(pc-files,
-+	AC_ARG_ENABLE(pc-files,
- 			[  --enable-pc-files       generate and install .pc files for pkg-config],
- 			[enable_pc_files=$enableval],
- 			[enable_pc_files=no])
--		AC_MSG_RESULT($enable_pc_files)
--	else
--		AC_MSG_RESULT(no)
--		AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR)
--		enable_pc_files=no
--	fi
-+	AC_MSG_RESULT($enable_pc_files)
- fi
- AC_SUBST(PKG_CONFIG_LIBDIR)
- 
diff --git a/bsp/buildroot/package/ncurses/0001-gcc-5.x-MKlib_gen.patch b/bsp/buildroot/package/ncurses/0001-gcc-5.x-MKlib_gen.patch
new file mode 100644
index 00000000..df7c15fe
--- /dev/null
+++ b/bsp/buildroot/package/ncurses/0001-gcc-5.x-MKlib_gen.patch
@@ -0,0 +1,43 @@
+Fix gcc 5.x build failure
+
+Extracted from upstream commit
+http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517.
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+Original author: Thomas E. Dickey <dickey@invisible-island.net>
+Signed-off-by: Mikhail Peselnik <bas@bmail.ru>
+
+--- a/ncurses/base/MKlib_gen.sh 2015-08-06 20:48:24.000000000 -0400
++++ b/ncurses/base/MKlib_gen.sh	2017-02-07 10:09:01.293962392 -0500
+@@ -491,11 +491,22 @@
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#       https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \
diff --git a/bsp/buildroot/package/ncurses/0002-gcc-5.x-MKlib_gen.patch b/bsp/buildroot/package/ncurses/0002-gcc-5.x-MKlib_gen.patch
deleted file mode 100644
index 25c2bd02..00000000
--- a/bsp/buildroot/package/ncurses/0002-gcc-5.x-MKlib_gen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix gcc 5.x build failure
-
-Extracted from upstream commit
-http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517.
-
-+ modify MKlib_gen.sh to work around change in development version of
-  gcc introduced here:
-  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
-  (reports by Marcus Shawcroft, Maohui Lei).
-
-Original author: Thomas E. Dickey <dickey@invisible-island.net>
-Signed-off-by: Mikhail Peselnik <bas@bmail.ru>
-
---- a/ncurses/base/MKlib_gen.sh.orig	2015-07-23 21:52:32.239481505 +0300
-+++ b/ncurses/base/MKlib_gen.sh	2015-07-23 21:53:20.772966587 +0300
-@@ -437,11 +437,22 @@
- 	-e 's/gen_$//' \
- 	-e 's/  / /g' >>$TMP
- 
-+cat >$ED1 <<EOF
-+s/  / /g
-+s/^ //
-+s/ $//
-+s/P_NCURSES_BOOL/NCURSES_BOOL/g
-+EOF
-+
-+# A patch discussed here:
-+#       https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
-+# introduces spurious #line markers.  Work around that by ignoring the system's
-+# attempt to define "bool" and using our own symbol here.
-+sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
-+cat $ED2 >$TMP
-+
- $preprocessor $TMP 2>/dev/null \
--| sed \
--	-e 's/  / /g' \
--	-e 's/^ //' \
--	-e 's/_Bool/NCURSES_BOOL/g' \
-+| sed -f $ED1 \
- | $AWK -f $AW2 \
- | sed -f $ED3 \
- | sed \
diff --git a/bsp/buildroot/package/ncurses/0002-recognise-uclinux.patch b/bsp/buildroot/package/ncurses/0002-recognise-uclinux.patch
new file mode 100644
index 00000000..57dd4cf3
--- /dev/null
+++ b/bsp/buildroot/package/ncurses/0002-recognise-uclinux.patch
@@ -0,0 +1,29 @@
+aclocal: fix detection for uclinux hosts
+uclinux is just a linux like the others...
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: "Adam Duskett" <aduskett@gmail.com>
+
+--- a/aclocal.m4	2015-08-05 20:46:34.000000000 -0400
++++ b/aclocal.m4	2017-02-07 09:58:17.770056849 -0500
+@@ -7656,7 +7656,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*|gnu*|mint*|k*bsd*-gnu)
++(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu)
+ 	CF_GNU_SOURCE
+ 	;;
+ (minix*)
+diff -durN a/configure b/configure
+--- a/configure	2015-08-05 05:20:32.000000000 -0400
++++ b/configure	2017-02-07 09:58:52.883886426 -0500
+@@ -7869,7 +7869,7 @@
+ 	cf_xopen_source="-D_SGI_SOURCE"
+ 	cf_XOPEN_SOURCE=
+ 	;;
+-(linux*|gnu*|mint*|k*bsd*-gnu)
++(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu)
+ 
+ echo "$as_me:7874: checking if we must define _GNU_SOURCE" >&5
+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
diff --git a/bsp/buildroot/package/ncurses/0003-recognise-uclinux.patch b/bsp/buildroot/package/ncurses/0003-recognise-uclinux.patch
deleted file mode 100644
index e86546cc..00000000
--- a/bsp/buildroot/package/ncurses/0003-recognise-uclinux.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-aclocal: fix detection for uclinux hosts
-
-uclinux is just a linux like the others...
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-diff -durN ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4
---- ncurses-5.9.orig/aclocal.m4	2011-04-01 01:35:38.000000000 +0200
-+++ ncurses-5.9/aclocal.m4	2016-08-21 15:24:47.003620029 +0200
-@@ -6531,7 +6531,7 @@
- irix[[56]].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
- 	;;
--linux*|gnu*|mint*|k*bsd*-gnu) #(vi
-+linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
-diff -durN ncurses-5.9.orig/configure ncurses-5.9/configure
---- ncurses-5.9.orig/configure	2016-08-21 15:21:50.789285661 +0200
-+++ ncurses-5.9/configure	2016-08-21 15:24:35.187463625 +0200
-@@ -6984,7 +6984,7 @@
- irix[56].*) #(vi
- 	cf_xopen_source="-D_SGI_SOURCE"
- 	;;
--linux*|gnu*|mint*|k*bsd*-gnu) #(vi
-+linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi
- 
- echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
diff --git a/bsp/buildroot/package/ncurses/Config.in b/bsp/buildroot/package/ncurses/Config.in
index 92be1643..bb45bd8d 100644
--- a/bsp/buildroot/package/ncurses/Config.in
+++ b/bsp/buildroot/package/ncurses/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_NCURSES
 	bool "ncurses"
 	help
-	  The Ncurses (new curses) library is a free software emulation of
-	  curses in System V Release 4.0, and more.
+	  The Ncurses (new curses) library is a free software
+	  emulation of curses in System V Release 4.0, and more.
 
 	  This package installs only a few vital termcap entries
 
diff --git a/bsp/buildroot/package/ncurses/ncurses.hash b/bsp/buildroot/package/ncurses/ncurses.hash
index 482b2d48..6bca1438 100644
--- a/bsp/buildroot/package/ncurses/ncurses.hash
+++ b/bsp/buildroot/package/ncurses/ncurses.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b	ncurses-5.9.tar.gz
+sha256	f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260	ncurses-6.0.tar.gz
diff --git a/bsp/buildroot/package/ncurses/ncurses.mk b/bsp/buildroot/package/ncurses/ncurses.mk
index b0f17247..7552cc25 100644
--- a/bsp/buildroot/package/ncurses/ncurses.mk
+++ b/bsp/buildroot/package/ncurses/ncurses.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-NCURSES_VERSION = 5.9
+NCURSES_VERSION = 6.0
 NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses
 NCURSES_INSTALL_STAGING = YES
 NCURSES_DEPENDENCIES = host-ncurses
 NCURSES_LICENSE = MIT with advertising clause
 NCURSES_LICENSE_FILES = README
-NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)$(NCURSES_ABI_VERSION)-config
+NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config
 
 NCURSES_CONF_OPTS = \
 	--without-cxx \
@@ -25,6 +25,7 @@ NCURSES_CONF_OPTS = \
 	--enable-const \
 	--enable-overwrite \
 	--enable-pc-files \
+	--with-pkg-config-libdir="/usr/lib/pkgconfig" \
 	$(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \
 	--without-manpages
 
@@ -49,6 +50,7 @@ NCURSES_TERMINFO_FILES = \
 	d/dumb \
 	l/linux \
 	p/putty \
+	p/putty-256color \
 	p/putty-vt100 \
 	s/screen \
 	s/screen-256color \
@@ -58,8 +60,10 @@ NCURSES_TERMINFO_FILES = \
 	v/vt200 \
 	v/vt220 \
 	x/xterm \
+	x/xterm+256color \
+	x/xterm-256color \
 	x/xterm-color \
-	x/xterm-xfree86 \
+	x/xterm-xfree86
 
 ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
 NCURSES_CONF_OPTS += --enable-widec
@@ -96,17 +100,10 @@ NCURSES_LINK_STAGING_LIBS = \
 NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC)
 
 NCURSES_CONF_OPTS += --enable-ext-colors
-NCURSES_ABI_VERSION = 6
-NCURSES_TERMINFO_FILES += \
-	p/putty-256color \
-	x/xterm+256color \
-	x/xterm-256color
 
 NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS
 NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_PC
 
-else # BR2_PACKAGE_NCURSES_WCHAR
-NCURSES_ABI_VERSION = 5
 endif # BR2_PACKAGE_NCURSES_WCHAR
 
 ifneq ($(BR2_ENABLE_DEBUG),y)
@@ -154,6 +151,8 @@ HOST_NCURSES_CONF_OPTS = \
 	--without-cxx \
 	--without-cxx-binding \
 	--without-ada \
+	--with-default-terminfo-dir=/usr/share/terminfo \
+	--disable-db-install \
 	--without-normal
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch b/bsp/buildroot/package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch
deleted file mode 100644
index f84719cf..00000000
--- a/bsp/buildroot/package/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <jacmet@sunsite.dk>
-Date: Thu, 26 Apr 2012 23:45:25 +0200
-Subject: [PATCH] trace-{tcp,udp}.c: fix build on uClibc
-
-Selection of the BSD variant of struct tcphdr/udphdr on uClibc fails
-because of config.h. This is caused by config.h setting _GNU_SOURCE
-and the compat handling (uClibc doesn't have inet6_rth_*) including
-sys/types.h which in term includes features.h, which figures out
-what bsd/gnu/posix variant to use because of:
-
- /* If _BSD_SOURCE was defined by the user, favor BSD over POSIX.  */
- #if defined _BSD_SOURCE && \
-    !(defined _POSIX_SOURCE || defined _POSIX_C_SOURCE || \
-      defined _XOPEN_SOURCE || defined _XOPEN_SOURCE_EXTENDED || \
-      defined _GNU_SOURCE || defined _SVID_SOURCE)
- # define __FAVOR_BSD    1
- #endif
-
-The current workaround of undefining _GNU_SOURCE after config.h doesn't
-work as features.h has already been evaluated by then. Instead, simply
-don't include config.h as it isn't needed in these two files.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/trace-tcp.c |    5 -----
- src/trace-udp.c |    5 -----
- 2 files changed, 10 deletions(-)
-
-diff --git a/src/trace-tcp.c b/src/trace-tcp.c
-index 6a7732d..91b64c2 100644
---- a/src/trace-tcp.c
-+++ b/src/trace-tcp.c
-@@ -17,11 +17,6 @@
-  *  along with this program. If not, see <http://www.gnu.org/licenses/>. *
-  *************************************************************************/
- 
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#undef _GNU_SOURCE
- #define _BSD_SOURCE 1
- 
- #include <string.h>
-diff --git a/src/trace-udp.c b/src/trace-udp.c
-index 821c24c..1754338 100644
---- a/src/trace-udp.c
-+++ b/src/trace-udp.c
-@@ -17,11 +17,6 @@
-  *  along with this program. If not, see <http://www.gnu.org/licenses/>. *
-  *************************************************************************/
- 
--#ifdef HAVE_CONFIG_H
--# include <config.h>
--#endif
--
--#undef _GNU_SOURCE
- #define _BSD_SOURCE 1
- 
- #include <string.h>
--- 
-1.7.10
-
diff --git a/bsp/buildroot/package/ndisc6/Config.in b/bsp/buildroot/package/ndisc6/Config.in
index 321bfbc9..55311238 100644
--- a/bsp/buildroot/package/ndisc6/Config.in
+++ b/bsp/buildroot/package/ndisc6/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_NDISC6
 	bool "ndisc6 tools"
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  NDisc6 is a small collection of useful tools for IPv6 networking
+	  NDisc6 is a small collection of useful tools for IPv6
+	  networking
 
 	  http://www.remlab.net/ndisc6/
 
diff --git a/bsp/buildroot/package/ndisc6/ndisc6.hash b/bsp/buildroot/package/ndisc6/ndisc6.hash
index 8d71bdea..e37e33e6 100644
--- a/bsp/buildroot/package/ndisc6/ndisc6.hash
+++ b/bsp/buildroot/package/ndisc6/ndisc6.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a	ndisc6-1.0.2.tar.bz2
+sha256 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821  ndisc6-1.0.3.tar.bz2
diff --git a/bsp/buildroot/package/ndisc6/ndisc6.mk b/bsp/buildroot/package/ndisc6/ndisc6.mk
index f431035c..eb4fbbbc 100644
--- a/bsp/buildroot/package/ndisc6/ndisc6.mk
+++ b/bsp/buildroot/package/ndisc6/ndisc6.mk
@@ -4,18 +4,14 @@
 #
 ################################################################################
 
-NDISC6_VERSION = 1.0.2
+NDISC6_VERSION = 1.0.3
 NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2
 NDISC6_SITE = http://www.remlab.net/files/ndisc6
-NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99"
+NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" LIBS=$(TARGET_NLS_LIBS)
 NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install
-NDISC6_LICENSE = GPLv2 or GPLv3
+NDISC6_LICENSE = GPL-2.0 or GPL-3.0
 NDISC6_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-NDISC6_DEPENDENCIES += gettext
-NDISC6_CONF_ENV += LIBS="-lintl"
-endif
+NDISC6_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 NDISC6_BIN_ += dnssort # perl script
 NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name
diff --git a/bsp/buildroot/package/ne10/ne10.mk b/bsp/buildroot/package/ne10/ne10.mk
index aeaa0413..cb303bd7 100644
--- a/bsp/buildroot/package/ne10/ne10.mk
+++ b/bsp/buildroot/package/ne10/ne10.mk
@@ -6,7 +6,7 @@
 
 NE10_VERSION = v1.2.0
 NE10_SITE = $(call github,projectNe10,Ne10,$(NE10_VERSION))
-NE10_LICENSE = BSD-3c or Apache-2.0
+NE10_LICENSE = BSD-3-Clause or Apache-2.0
 NE10_LICENSE_FILES = doc/LICENSE
 NE10_INSTALL_STAGING = YES
 
@@ -32,7 +32,6 @@ define NE10_INSTALL_STAGING_CMDS
 	$(NE10_INSTALL_STAGING_SHARED_LIB)
 endef
 
-
 define NE10_INSTALL_TARGET_CMDS
 	cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/
 endef
diff --git a/bsp/buildroot/package/neard/Config.in b/bsp/buildroot/package/neard/Config.in
index 8571e7c9..277e467c 100644
--- a/bsp/buildroot/package/neard/Config.in
+++ b/bsp/buildroot/package/neard/Config.in
@@ -9,12 +9,13 @@ config BR2_PACKAGE_NEARD
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBNL
 	help
-	  Near Field Communication (NFC) manager. This userspace daemon is
-	  a part of the NFC stack provided by the Linux NFC project.
+	  Near Field Communication (NFC) manager. This userspace
+	  daemon is a part of the NFC stack provided by the Linux NFC
+	  project.
 
 	  http://git.kernel.org/?p=network/nfc/neard.git;a=summary
 
-	  https://01.org/linux-nfc/documentation/how-start-linux-nfc-code...
+	  https://01.org/linux-nfc/
 
 if BR2_PACKAGE_NEARD
 
diff --git a/bsp/buildroot/package/neard/neard.hash b/bsp/buildroot/package/neard/neard.hash
index 75170931..d1e74b37 100644
--- a/bsp/buildroot/package/neard/neard.hash
+++ b/bsp/buildroot/package/neard/neard.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/network/nfc/sha256sums.asc
-sha256	6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca	neard-0.14.tar.xz
+sha256 eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36  neard-0.16.tar.xz
diff --git a/bsp/buildroot/package/neard/neard.mk b/bsp/buildroot/package/neard/neard.mk
index ed2c6b15..a3514691 100644
--- a/bsp/buildroot/package/neard/neard.mk
+++ b/bsp/buildroot/package/neard/neard.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-NEARD_VERSION = 0.14
+NEARD_VERSION = 0.16
 NEARD_SOURCE = neard-$(NEARD_VERSION).tar.xz
 NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc
-NEARD_LICENSE = GPLv2
+NEARD_LICENSE = GPL-2.0
 NEARD_LICENSE_FILES = COPYING
 
 NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl
@@ -17,6 +17,13 @@ ifeq ($(BR2_PACKAGE_NEARD_TOOLS),y)
 NEARD_CONF_OPTS += --enable-tools
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+NEARD_CONF_OPTS += --enable-systemd
+NEARD_DEPENDENCIES += systemd
+else
+NEARD_CONF_OPTS += --disable-systemd
+endif
+
 define NEARD_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/neard/S53neard \
 		$(TARGET_DIR)/etc/init.d/S53neard
diff --git a/bsp/buildroot/package/neardal/neardal.mk b/bsp/buildroot/package/neardal/neardal.mk
index c3164ef0..f3e55fd9 100644
--- a/bsp/buildroot/package/neardal/neardal.mk
+++ b/bsp/buildroot/package/neardal/neardal.mk
@@ -7,7 +7,7 @@
 NEARDAL_VERSION = 33b54a55032b047fd885a5eb3592c169c0056c49
 NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION))
 NEARDAL_INSTALL_STAGING = YES
-NEARDAL_LICENSE = GPLv2
+NEARDAL_LICENSE = GPL-2.0
 NEARDAL_LICENSE_FILES = COPYING
 
 NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib
diff --git a/bsp/buildroot/package/neon/Config.in b/bsp/buildroot/package/neon/Config.in
index e76278c3..98313433 100644
--- a/bsp/buildroot/package/neon/Config.in
+++ b/bsp/buildroot/package/neon/Config.in
@@ -27,8 +27,8 @@ config BR2_PACKAGE_NEON_XML
 
 config BR2_PACKAGE_NEON_EXPAT
 	bool "XML support with expat"
-	select BR2_PACKAGE_EXPAT
 	depends on !BR2_PACKAGE_NEON_LIBXML2
+	select BR2_PACKAGE_EXPAT
 	help
 	  Enable XML support in neon, using the Expat XML library.
 
diff --git a/bsp/buildroot/package/neon/neon.mk b/bsp/buildroot/package/neon/neon.mk
index ca1a6bd8..1b8eb368 100644
--- a/bsp/buildroot/package/neon/neon.mk
+++ b/bsp/buildroot/package/neon/neon.mk
@@ -6,7 +6,7 @@
 
 NEON_VERSION = 0.30.2
 NEON_SITE = http://www.webdav.org/neon
-NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests)
+NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests)
 NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README
 NEON_INSTALL_STAGING = YES
 NEON_CONF_OPTS = --without-gssapi --disable-rpath
diff --git a/bsp/buildroot/package/net-tools/0001-Makefile-fix-static-linking-issue-with-lintl.patch b/bsp/buildroot/package/net-tools/0001-Makefile-fix-static-linking-issue-with-lintl.patch
deleted file mode 100644
index a2d674e8..00000000
--- a/bsp/buildroot/package/net-tools/0001-Makefile-fix-static-linking-issue-with-lintl.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From a2076079a409141704701ec17a205d89e5b24052 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 28 May 2016 20:45:02 +0200
-Subject: [PATCH] Makefile: fix static linking issue with lintl
-
-When net-tools are build with uClibc-ng and statically linked,
-some tools like hostname and route needs to link with -lintl.
-
-Adding -lintl in LDFLAGS place the library before object files:
-arm-linux-gcc -O2 -g -Wall -fno-strict-aliasing   -static -lintl -Llib -o hostname hostname.o
-
-Add $(LIBS) after object files in the Makefile to place -lintl correctly.
-
-Fixes:
-http://autobuild.buildroot.net/results/134/1345b6d366125320b89512e7ce7f142f1a03acf8
-
-Ref:
-http://lists.busybox.net/pipermail/buildroot/2016-May/162216.html
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- Makefile | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 171123d..a2baf79 100644
---- a/Makefile
-+++ b/Makefile
-@@ -158,37 +158,37 @@ subdirs:	libdir
- 		@for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done
- 
- ifconfig:	$(NET_LIB) ifconfig.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(LIBS) $(NLIB)
- 
- nameif:		$(NET_LIB) nameif.o
- 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB)
- 
- hostname:	hostname.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(LIBS) $(DNLIB)
- 
- route:		$(NET_LIB) route.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(LIBS) $(NLIB)
- 
- arp:		$(NET_LIB) arp.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(LIBS) $(NLIB)
- 
- rarp:		$(NET_LIB) rarp.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(LIBS) $(NLIB)
- 
- slattach:	$(NET_LIB) slattach.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(LIBS) $(NLIB)
- 
- plipconfig:	$(NET_LIB) plipconfig.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(LIBS) $(NLIB)
- 
- netstat:	$(NET_LIB) netstat.o statistics.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(SELIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(LIBS) $(NLIB) $(SELIB)
- 
- iptunnel:	$(NET_LIB) iptunnel.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(LIBS) $(NLIB)
- 
- ipmaddr:	$(NET_LIB) ipmaddr.o
--		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB)
-+		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(LIBS) $(NLIB)
- 
- mii-tool:	$(NET_LIB) mii-tool.o
- 		$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB)
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch b/bsp/buildroot/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch
deleted file mode 100644
index a8658c4f..00000000
--- a/bsp/buildroot/package/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From eec38a200357b195efbb23bb645ab721c040f246 Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Thu, 3 Nov 2016 12:59:39 +0000
-Subject: [PATCH] iptunnel.c: do not include netinet/ip.h
-
-This fixes a struct redefinition problem like this one:
-
-================================
-In file included from /usr/include/linux/if_tunnel.h:6:0,
-                 from iptunnel.c:34:
-/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr'
- struct iphdr {
-        ^
-In file included from iptunnel.c:29:0:
-/usr/include/netinet/ip.h:45:8: note: originally defined here
- struct iphdr
-        ^
-================================
-
-iptunnel.c includes netinet/ip.h which contains a definition of the
-iphdr struct.
-
-iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h
-which contains a definition of the iphdr struct.
-
-So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both
-of them have been included directly or indirectly by iptunnel.c. Because
-of that the compilation fails due to a struct redefinition.
-
-The problem can be solved by just not including netinet/ip.h.
-
-However, some Linux headers included in certain toolchains may not have
-an updated linux/if_tunnel.h which includes linux/ip.h, so we need to
-include it unconditionally otherwise linux/if_tunnel.h will use the
-struct iphdr before being defined and the compilation will also fail in
-this way:
-
-================================
-In file included from iptunnel.c:33:0:
-/usr/include/linux/if_tunnel.h:37:16: error: field 'iph' has incomplete type
-  struct iphdr  iph;
-                  ^
-================================
-
-Upstream status: merge request sent
-https://sourceforge.net/p/net-tools/code/merge-requests/4/
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- iptunnel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/iptunnel.c b/iptunnel.c
-index 3fe1b84..e2ec2d8 100644
---- a/iptunnel.c
-+++ b/iptunnel.c
-@@ -26,11 +26,11 @@
- #include <sys/socket.h>
- #include <sys/ioctl.h>
- #include <netinet/in.h>
--#include <netinet/ip.h>
- #include <arpa/inet.h>
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <linux/types.h>
-+#include <linux/ip.h>
- #include <linux/if_tunnel.h>
-
- #include "config.h"
--- 
-2.10.1
-
diff --git a/bsp/buildroot/package/net-tools/Config.in b/bsp/buildroot/package/net-tools/Config.in
index 3980b7ed..5e24bd1b 100644
--- a/bsp/buildroot/package/net-tools/Config.in
+++ b/bsp/buildroot/package/net-tools/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_NET_TOOLS
 	bool "net-tools"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  A collection of programs that form the base set of the NET-3
 	  networking distribution for the Linux operating system.
diff --git a/bsp/buildroot/package/net-tools/net-tools.hash b/bsp/buildroot/package/net-tools/net-tools.hash
new file mode 100644
index 00000000..766b6fa0
--- /dev/null
+++ b/bsp/buildroot/package/net-tools/net-tools.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 f7cfe9e73825bac9ab1a6f99d1fc7f54bfd9d33a6f62ba58d28a566905c4e86c  net-tools-479bb4a7e11a4084e2935c0a576388f92469225b.tar.gz
diff --git a/bsp/buildroot/package/net-tools/net-tools.mk b/bsp/buildroot/package/net-tools/net-tools.mk
index f0c61d5c..adab475b 100644
--- a/bsp/buildroot/package/net-tools/net-tools.mk
+++ b/bsp/buildroot/package/net-tools/net-tools.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-NET_TOOLS_VERSION = 3f170bff115303e92319791cbd56371e33dcbf6d
+NET_TOOLS_VERSION = 479bb4a7e11a4084e2935c0a576388f92469225b
 NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code
-NET_TOOLS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-NET_TOOLS_LICENSE = GPLv2+
+NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+NET_TOOLS_LICENSE = GPL-2.0+
 NET_TOOLS_LICENSE_FILES = COPYING
 
 # Install after busybox for the full-blown versions
@@ -20,7 +20,7 @@ define NET_TOOLS_CONFIGURE_CMDS
 endef
 
 # Enable I18N when appropiate
-ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
 define NET_TOOLS_ENABLE_I18N
 	$(SED) 's:I18N 0:I18N 1:' $(@D)/config.h
 endef
@@ -35,7 +35,7 @@ NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6
 
 define NET_TOOLS_BUILD_CMDS
 	$(TARGET_CONFIGURE_OPTS) \
-		LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)" \
 		$(MAKE) -C $(@D)
 endef
 
diff --git a/bsp/buildroot/package/netatalk/0002-no-acl.patch b/bsp/buildroot/package/netatalk/0002-no-acl.patch
deleted file mode 100644
index 165141b4..00000000
--- a/bsp/buildroot/package/netatalk/0002-no-acl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix builds without acl, from http://sourceforge.net/p/netatalk/bugs/574/
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura netatalk-3.1.7.orig/include/atalk/acl.h netatalk-3.1.7/include/atalk/acl.h
---- netatalk-3.1.7.orig/include/atalk/acl.h	2014-12-03 17:34:49.895524464 -0300
-+++ netatalk-3.1.7/include/atalk/acl.h	2014-12-03 17:34:58.735243283 -0300
-@@ -61,6 +61,7 @@
- #else /* HAVE_ACLS=no */
- 
- #define O_NETATALK_ACL 0
-+#define O_IGNORE 0
- #define chmod_acl chmod
- 
- #endif /* HAVE_ACLS */
diff --git a/bsp/buildroot/package/netatalk/Config.in b/bsp/buildroot/package/netatalk/Config.in
index ce173183..1560a187 100644
--- a/bsp/buildroot/package/netatalk/Config.in
+++ b/bsp/buildroot/package/netatalk/Config.in
@@ -10,8 +10,9 @@ config BR2_PACKAGE_NETATALK
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGPG_ERROR
 	help
-	  Netatalk can be used to turn a *NIX machine into an extremely
-	  high-performance and reliable file server for Macintosh computers.
+	  Netatalk can be used to turn a *NIX machine into an
+	  extremely high-performance and reliable file server for
+	  Macintosh computers.
 
 	  http://netatalk.sourceforge.net/
 
diff --git a/bsp/buildroot/package/netatalk/netatalk.hash b/bsp/buildroot/package/netatalk/netatalk.hash
index 955ffd40..ce78373a 100644
--- a/bsp/buildroot/package/netatalk/netatalk.hash
+++ b/bsp/buildroot/package/netatalk/netatalk.hash
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.8/
-md5	9cab934ca32b8979f389da52d44c69c2	netatalk-3.1.8.tar.bz2
-sha1	00518461a311e6c17c95738ac214c8f06f863b4b	netatalk-3.1.8.tar.bz2
+# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.11/
+md5 8f79ce2a275b128ebb07188766f088fc  netatalk-3.1.11.tar.bz2
+sha1 5aa7900e6f7de3c7ee812aa1130c1245d1974586  netatalk-3.1.11.tar.bz2
diff --git a/bsp/buildroot/package/netatalk/netatalk.mk b/bsp/buildroot/package/netatalk/netatalk.mk
index dbe13a94..28a87509 100644
--- a/bsp/buildroot/package/netatalk/netatalk.mk
+++ b/bsp/buildroot/package/netatalk/netatalk.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NETATALK_VERSION = 3.1.8
+NETATALK_VERSION = 3.1.11
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 # For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch
@@ -12,7 +12,7 @@ NETATALK_AUTORECONF = YES
 NETATALK_CONFIG_SCRIPTS = netatalk-config
 NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \
 	libevent
-NETATALK_LICENSE = GPLv2+, LGPLv3+, MIT-like
+NETATALK_LICENSE = GPL-2.0+, LGPL-3.0+, MIT-like
 NETATALK_LICENSE_FILES = COPYING COPYRIGHT
 
 # Don't run ldconfig!
diff --git a/bsp/buildroot/package/netcat-openbsd/Config.in b/bsp/buildroot/package/netcat-openbsd/Config.in
index 0df997cb..4734ff99 100644
--- a/bsp/buildroot/package/netcat-openbsd/Config.in
+++ b/bsp/buildroot/package/netcat-openbsd/Config.in
@@ -1,25 +1,28 @@
 config BR2_PACKAGE_NETCAT_OPENBSD
 	bool "netcat-openbsd"
-	select BR2_PACKAGE_LIBBSD
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
+	select BR2_PACKAGE_LIBBSD
 	help
-	  A simple Unix utility which reads and writes data across network
-	  connections using TCP or UDP protocol. It is designed to be a
-	  reliable "back-end" tool that can be used directly or easily driven
-	  by other programs and scripts. At the same time it is a feature-rich
-	  network debugging and exploration tool, since it can create almost
-	  any kind of connection you would need and has several interesting
+	  A simple Unix utility which reads and writes data across
+	  network connections using TCP or UDP protocol. It is
+	  designed to be a reliable "back-end" tool that can be used
+	  directly or easily driven by other programs and scripts. At
+	  the same time it is a feature-rich network debugging and
+	  exploration tool, since it can create almost any kind of
+	  connection you would need and has several interesting
 	  built-in capabilities.
 
-	  This package contains the OpenBSD rewrite of netcat, including
-	  support for IPv6, proxies, and Unix sockets.
+	  This package contains the OpenBSD rewrite of netcat,
+	  including support for IPv6, proxies, and Unix sockets.
 
 	  https://packages.debian.org/sid/netcat-openbsd
 
-comment "netcat-openbsd needs a glibc toolchain w/ threads"
+comment "netcat-openbsd needs a glibc toolchain w/ threads, headers >= 3.12"
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC || \
+		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
diff --git a/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.hash b/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.hash
new file mode 100644
index 00000000..1bf62bbc
--- /dev/null
+++ b/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 63d72b4e5ea629af148d6d655125dcbe48f4996a8a2a8c5e234c62eba2856b5f netcat-openbsd-debian_1.187-1.tar.gz
+sha256 e2e86d58c38f044a49f51e45515747585db58a2305419c73323eaad88fcaef5c debian/copyright
diff --git a/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.mk b/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.mk
index 5abfc7e1..6d3be500 100644
--- a/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.mk
+++ b/bsp/buildroot/package/netcat-openbsd/netcat-openbsd.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NETCAT_OPENBSD_VERSION = debian/1.105-7
+NETCAT_OPENBSD_VERSION = debian/1.187-1
 NETCAT_OPENBSD_SITE = git://anonscm.debian.org/collab-maint/netcat-openbsd
-NETCAT_OPENBSD_LICENSE = BSD-3c
+NETCAT_OPENBSD_LICENSE = BSD-3-Clause
 NETCAT_OPENBSD_LICENSE_FILES = debian/copyright
 NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd
 
diff --git a/bsp/buildroot/package/netcat/Config.in b/bsp/buildroot/package/netcat/Config.in
index 924069ee..26bc7fa4 100644
--- a/bsp/buildroot/package/netcat/Config.in
+++ b/bsp/buildroot/package/netcat/Config.in
@@ -2,12 +2,14 @@ config BR2_PACKAGE_NETCAT
 	bool "netcat"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  Netcat is a featured networking utility which reads and writes data
-	  across network connections, using the TCP/IP protocol.
-	  It is designed to be a reliable "back-end" tool that can be used
-	  directly or easily driven by other programs and scripts. At the
-	  same time, it is a feature-rich network debugging and exploration
-	  tool, since it can create almost any kind of connection you would
-	  need and has several interesting built-in capabilities.
+	  Netcat is a featured networking utility which reads and
+	  writes data across network connections, using the TCP/IP
+	  protocol.
+	  It is designed to be a reliable "back-end" tool that can be
+	  used directly or easily driven by other programs and
+	  scripts. At the same time, it is a feature-rich network
+	  debugging and exploration tool, since it can create almost
+	  any kind of connection you would need and has several
+	  interesting built-in capabilities.
 
 	  http://netcat.sourceforge.net/download.php
diff --git a/bsp/buildroot/package/netcat/netcat.mk b/bsp/buildroot/package/netcat/netcat.mk
index 5d01ebba..eb7ddcac 100644
--- a/bsp/buildroot/package/netcat/netcat.mk
+++ b/bsp/buildroot/package/netcat/netcat.mk
@@ -6,7 +6,7 @@
 
 NETCAT_VERSION = 0.7.1
 NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION)
-NETCAT_LICENSE = GPLv2+
+NETCAT_LICENSE = GPL-2.0+
 NETCAT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/netplug/S29netplug b/bsp/buildroot/package/netplug/S29netplug
index d3df9ddf..66459061 100755
--- a/bsp/buildroot/package/netplug/S29netplug
+++ b/bsp/buildroot/package/netplug/S29netplug
@@ -22,8 +22,8 @@ elif [ -f /etc/rc.d/init.d/functions ]; then
 fi
 
 # Source networking configuration.
-if [ -f /etc/sysconfig/network ]; then
-	. /etc/sysconfig/network
+if [ -f /etc/default/network ]; then
+	. /etc/default/network
 
 	# Check that networking is up.
 	[ ${NETWORKING} = "no" ] && exit 0
@@ -32,10 +32,8 @@ elif [ ! -f /etc/network/interfaces ]; then
 	exit 0
 fi
 
-[ -x /sbin/netplugd ] || exit 0
-
-if [ -f /etc/sysconfig/netplugd ]; then
-    . /etc/sysconfig/netplugd
+if [ -f /etc/default/netplugd ]; then
+    . /etc/default/netplugd
 fi
 
 # See how we were called.
@@ -43,7 +41,7 @@ case "$1" in
   start)
 	# Start daemon.
 	printf "Starting network plug daemon: "
-	start-stop-daemon -S -q -p /var/run/netplugd.pid -x /sbin/netplugd ${NETPLUGDARGS}
+	start-stop-daemon -S -q -x /sbin/netplugd -- -p /var/run/netplugd.pid ${NETPLUGDARGS}
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd
@@ -51,7 +49,7 @@ case "$1" in
   stop)
 	# Stop daemon.
 	printf "Shutting down network plug daemon: "
-	start-stop-daemon -K -n netplugd
+	start-stop-daemon -K -q -p /var/run/netplugd.pid
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd
diff --git a/bsp/buildroot/package/netplug/netplug.mk b/bsp/buildroot/package/netplug/netplug.mk
index a165192f..9363a718 100644
--- a/bsp/buildroot/package/netplug/netplug.mk
+++ b/bsp/buildroot/package/netplug/netplug.mk
@@ -7,7 +7,7 @@
 NETPLUG_VERSION = 1.2.9.2
 NETPLUG_SOURCE = netplug-$(NETPLUG_VERSION).tar.bz2
 NETPLUG_SITE = http://www.red-bean.com/~bos/netplug
-NETPLUG_LICENSE = GPLv2
+NETPLUG_LICENSE = GPL-2.0
 NETPLUG_LICENSE_FILES = COPYING
 
 define NETPLUG_BUILD_CMDS
diff --git a/bsp/buildroot/package/netsniff-ng/Config.in b/bsp/buildroot/package/netsniff-ng/Config.in
index 00617e37..c4803b2f 100644
--- a/bsp/buildroot/package/netsniff-ng/Config.in
+++ b/bsp/buildroot/package/netsniff-ng/Config.in
@@ -1,21 +1,23 @@
 config BR2_PACKAGE_NETSNIFF_NG
 	bool "netsniff-ng"
+	# Build with uClibc fails due to missing ceill()
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
 	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_LIBPCAP
 	select BR2_PACKAGE_LIBCLI
 	select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
 	select BR2_PACKAGE_LIBURCU
 	select BR2_PACKAGE_LIBNET
-	# Build with uClibc fails due to missing ceill()
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
 	help
 	  netsniff-ng is a free, performant Linux network analyzer and
 	  networking toolkit. If you will, the Swiss army knife for
 	  network packets.
 
+	  http://netsniff-ng.org
+
 comment "netsniff-ng needs a glibc or musl toolchain w/ threads, headers >= 3.0"
 	depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC \
diff --git a/bsp/buildroot/package/netsniff-ng/netsniff-ng.hash b/bsp/buildroot/package/netsniff-ng/netsniff-ng.hash
index 67b3331a..576e0008 100644
--- a/bsp/buildroot/package/netsniff-ng/netsniff-ng.hash
+++ b/bsp/buildroot/package/netsniff-ng/netsniff-ng.hash
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256 62e8aa970a4f46cdaddf54daf8ea26e7ae9f9f358efaf0651799c8c4e937c286 netsniff-ng-v0.6.2.tar.gz
+# Locally calculated after checking signature
+sha256 fd67150e0954b7079b6d0c72fb0ef1f34091357ad559b45c68e8752376bdc307 netsniff-ng-0.6.4.tar.xz
diff --git a/bsp/buildroot/package/netsniff-ng/netsniff-ng.mk b/bsp/buildroot/package/netsniff-ng/netsniff-ng.mk
index 4ec7e743..fb1c2c7a 100644
--- a/bsp/buildroot/package/netsniff-ng/netsniff-ng.mk
+++ b/bsp/buildroot/package/netsniff-ng/netsniff-ng.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-NETSNIFF_NG_VERSION = v0.6.2
-NETSNIFF_NG_SITE = $(call github,netsniff-ng,netsniff-ng,$(NETSNIFF_NG_VERSION))
-NETSNIFF_NG_LICENSE = GPLv2
+NETSNIFF_NG_VERSION = 0.6.4
+NETSNIFF_NG_SITE = http://pub.netsniff-ng.org/netsniff-ng
+NETSNIFF_NG_SOURCE = netsniff-ng-$(NETSNIFF_NG_VERSION).tar.xz
+NETSNIFF_NG_LICENSE = GPL-2.0
 NETSNIFF_NG_LICENSE_FILES = README COPYING
 # Prevent netsniff-ng configure script from finding a host installed nacl
 NETSNIFF_NG_CONF_ENV = \
diff --git a/bsp/buildroot/package/netsnmp/Config.in b/bsp/buildroot/package/netsnmp/Config.in
index 57cc6b93..f22e38b3 100644
--- a/bsp/buildroot/package/netsnmp/Config.in
+++ b/bsp/buildroot/package/netsnmp/Config.in
@@ -46,9 +46,9 @@ config BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING
 	bool "Enable debugging code"
 	help
 	  By default net-snmp is compiled without debugging support
-	  (--disable-debugging). Enable this options if you need debugging
-	  support, including the ability to log with DEBUGMSG(),
-	  DEBUGMSGTL() and companion macros.
+	  (--disable-debugging). Enable this options if you need
+	  debugging support, including the ability to log with
+	  DEBUGMSG(), DEBUGMSGTL() and companion macros.
 
 config BR2_PACKAGE_NETSNMP_OPENSSL_INTERNAL
 	bool "Enable minimal internal OpenSSL code"
diff --git a/bsp/buildroot/package/netsnmp/netsnmp.hash b/bsp/buildroot/package/netsnmp/netsnmp.hash
index 2c18441f..fc779260 100644
--- a/bsp/buildroot/package/netsnmp/netsnmp.hash
+++ b/bsp/buildroot/package/netsnmp/netsnmp.hash
@@ -1,4 +1,3 @@
 # From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.7.3/
 md5	d4a3459e1577d0efa8d96ca70a885e53	net-snmp-5.7.3.tar.gz
 sha1	97dc25077257680815de44e34128d365c76bd839	net-snmp-5.7.3.tar.gz
-
diff --git a/bsp/buildroot/package/netsnmp/netsnmp.mk b/bsp/buildroot/package/netsnmp/netsnmp.mk
index 0f4b7d80..742fa6e3 100644
--- a/bsp/buildroot/package/netsnmp/netsnmp.mk
+++ b/bsp/buildroot/package/netsnmp/netsnmp.mk
@@ -38,8 +38,6 @@ NETSNMP_MAKE = $(MAKE1)
 NETSNMP_CONFIG_SCRIPTS = net-snmp-config
 NETSNMP_AUTORECONF = YES
 
-NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX
-
 ifeq ($(BR2_ENDIAN),"BIG")
 NETSNMP_CONF_OPTS += --with-endianness=big
 else
@@ -101,14 +99,6 @@ else
 NETSNMP_CONF_OPTS += --disable-applications
 endif
 
-define NETSNMP_REMOVE_BLOAT_MIBS
-	for mib in $(NETSNMP_BLOAT_MIBS); do \
-		rm -f $(TARGET_DIR)/usr/share/snmp/mibs/$$mib-MIB.txt; \
-	done
-endef
-
-NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_REMOVE_BLOAT_MIBS
-
 ifeq ($(BR2_PACKAGE_NETSNMP_SERVER),y)
 define NETSNMP_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \
@@ -117,7 +107,7 @@ endef
 endif
 
 define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-	$(SED) 	"s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
+	$(SED)	"s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
 		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
 		$(STAGING_DIR)/usr/bin/net-snmp-config
 endef
diff --git a/bsp/buildroot/package/netstat-nat/netstat-nat.mk b/bsp/buildroot/package/netstat-nat/netstat-nat.mk
index 9a60f123..0d16579a 100644
--- a/bsp/buildroot/package/netstat-nat/netstat-nat.mk
+++ b/bsp/buildroot/package/netstat-nat/netstat-nat.mk
@@ -6,7 +6,7 @@
 
 NETSTAT_NAT_VERSION = 1.4.10
 NETSTAT_NAT_SITE = http://tweegy.nl/download
-NETSTAT_NAT_LICENSE = GPLv2+
+NETSTAT_NAT_LICENSE = GPL-2.0+
 NETSTAT_NAT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash b/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash
new file mode 100644
index 00000000..c326c28d
--- /dev/null
+++ b/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 2e2d93e25623761c5de39c8c94750c982335acc1c2da4439b1a2088ecd4455c9  netsurf-buildsystem-7574b41345968b5f7e9ca5875faccb1478ce0555.tar.gz
diff --git a/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.mk b/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.mk
index 34788507..d4efec0e 100644
--- a/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.mk
+++ b/bsp/buildroot/package/netsurf-buildsystem/netsurf-buildsystem.mk
@@ -7,10 +7,10 @@
 NETSURF_BUILDSYSTEM_VERSION = 7574b41345968b5f7e9ca5875faccb1478ce0555
 NETSURF_BUILDSYSTEM_SITE = http://git.netsurf-browser.org/buildsystem.git
 NETSURF_BUILDSYSTEM_SITE_METHOD = git
-NETSURF_BUILDSYSTEM_LICENSE = MIT, BSD-3c (for llvm/* files)
+NETSURF_BUILDSYSTEM_LICENSE = MIT, BSD-3-Clause (for llvm/* files)
 NETSURF_BUILDSYSTEM_LICENSE_FILES = llvm/LICENSE.TXT
 
-NETSURF_BUILDSYSTEM_INSTALL_DIR = $(HOST_DIR)/usr/share/netsurf-buildsystem
+NETSURF_BUILDSYSTEM_INSTALL_DIR = $(HOST_DIR)/share/netsurf-buildsystem
 
 define HOST_NETSURF_BUILDSYSTEM_INSTALL_CMDS
 	mkdir -p $(NETSURF_BUILDSYSTEM_INSTALL_DIR)
diff --git a/bsp/buildroot/package/nettle/Config.in b/bsp/buildroot/package/nettle/Config.in
index 55776216..48909701 100644
--- a/bsp/buildroot/package/nettle/Config.in
+++ b/bsp/buildroot/package/nettle/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_NETTLE
 	bool "nettle"
 	select BR2_PACKAGE_GMP
 	help
-	  Nettle is a cryptographic library that is designed to fit easily
-	  in more or less any context: In crypto toolkits for object-oriented
-	  languages, in applications like LSH or GNUPG, or even in kernel space
+	  Nettle is a cryptographic library that is designed to fit
+	  easily in more or less any context: In crypto toolkits for
+	  object-oriented languages, in applications like LSH or
+	  GNUPG, or even in kernel space
 
 	  http://www.lysator.liu.se/~nisse/nettle/
diff --git a/bsp/buildroot/package/nettle/nettle.hash b/bsp/buildroot/package/nettle/nettle.hash
index cd911c0d..473be1c2 100644
--- a/bsp/buildroot/package/nettle/nettle.hash
+++ b/bsp/buildroot/package/nettle/nettle.hash
@@ -1,2 +1,6 @@
 # Locally calculated after checking pgp signature
-sha256	46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e	nettle-3.3.tar.gz
+# https://ftp.gnu.org/gnu/nettle/nettle-3.4.tar.gz.sig
+sha256	ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94	nettle-3.4.tar.gz
+# Locally calculated
+sha256	a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c	COPYING.LESSERv3
+sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYINGv2
diff --git a/bsp/buildroot/package/nettle/nettle.mk b/bsp/buildroot/package/nettle/nettle.mk
index 31789ec2..95828150 100644
--- a/bsp/buildroot/package/nettle/nettle.mk
+++ b/bsp/buildroot/package/nettle/nettle.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-NETTLE_VERSION = 3.3
+NETTLE_VERSION = 3.4
 NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive
 NETTLE_DEPENDENCIES = gmp
 NETTLE_INSTALL_STAGING = YES
-NETTLE_LICENSE = Dual GPLv2+/LGPLv3+
+NETTLE_LICENSE = Dual GPL-2.0+/LGPL-3.0+
 NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2
 # don't include openssl support for (unused) examples as it has problems
 # with static linking
diff --git a/bsp/buildroot/package/network-manager/Config.in b/bsp/buildroot/package/network-manager/Config.in
index c9dabfdd..ca508185 100644
--- a/bsp/buildroot/package/network-manager/Config.in
+++ b/bsp/buildroot/package/network-manager/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_NETWORK_MANAGER
-	bool "networkmanager"
+	bool "network-manager"
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+	depends on !BR2_STATIC_LIBS # gnutls
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_PACKAGE_HAS_UDEV
 	# Tested with 3.2, but may even work with earlier versions
@@ -20,12 +21,12 @@ config BR2_PACKAGE_NETWORK_MANAGER
 	select BR2_PACKAGE_READLINE
 	select BR2_PACKAGE_LIBNDP
 	help
-	  NetworkManager is a set of co-operative tools that make networking
-	  simple and straightforward. Whether WiFi, wired, 3G, or Bluetooth,
-	  NetworkManager allows you to quickly move from one network to
-	  another: once a network has been configured and joined once, it
-	  can be detected and re-joined automatically the next time it's
-	  available.
+	  NetworkManager is a set of co-operative tools that make
+	  networking simple and straightforward. Whether WiFi, wired,
+	  3G, or Bluetooth, NetworkManager allows you to quickly move
+	  from one network to another: once a network has been
+	  configured and joined once, it can be detected and re-joined
+	  automatically the next time it's available.
 
 	  http://projects.gnome.org/NetworkManager/
 
@@ -55,10 +56,16 @@ config BR2_PACKAGE_NETWORK_MANAGER_PPPD
 comment "pppd support needs a glibc or uClibc toolchain"
 	depends on BR2_TOOLCHAIN_USES_MUSL
 
+config BR2_PACKAGE_NETWORK_MANAGER_OVS
+	bool "OpenVSwitch support"
+	select BR2_PACKAGE_JANSSON
+	help
+	  This option enables support for OpenVSwitch
+
 endif
 
-comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7"
+comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.2, dynamic library"
 	depends on BR2_USE_MMU
 	depends on !BR2_PACKAGE_HAS_UDEV || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 || \
-		!BR2_TOOLCHAIN_USES_GLIBC
+		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || \
+		!BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/network-manager/network-manager.hash b/bsp/buildroot/package/network-manager/network-manager.hash
index 94f3e267..8fedc647 100644
--- a/bsp/buildroot/package/network-manager/network-manager.hash
+++ b/bsp/buildroot/package/network-manager/network-manager.hash
@@ -1,2 +1,2 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/NetworkManager-1.4.2.sha256sum
-sha256 a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204  NetworkManager-1.4.2.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.10/NetworkManager-1.10.2.sha256sum
+sha256 169c34f50770e3c96b431f7d2cff654455246f2e6ccd46eccfb4454d4595625b  NetworkManager-1.10.2.tar.xz
diff --git a/bsp/buildroot/package/network-manager/network-manager.mk b/bsp/buildroot/package/network-manager/network-manager.mk
index 3d7a1bf0..a520aad9 100644
--- a/bsp/buildroot/package/network-manager/network-manager.mk
+++ b/bsp/buildroot/package/network-manager/network-manager.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-NETWORK_MANAGER_VERSION_MAJOR = 1.4
+NETWORK_MANAGER_VERSION_MAJOR = 1.10
 NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2
 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz
 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR)
 NETWORK_MANAGER_INSTALL_STAGING = YES
 NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \
 	libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev
-NETWORK_MANAGER_LICENSE = GPLv2+ (app), LGPLv2+ (libnm-util)
+NETWORK_MANAGER_LICENSE = GPL-2.0+ (app), LGPL-2.0+ (libnm-util)
 NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING
 
 NETWORK_MANAGER_CONF_ENV = \
@@ -22,7 +22,6 @@ NETWORK_MANAGER_CONF_ENV = \
 	ac_cv_file__etc_redhat_release=no \
 	ac_cv_file__etc_SuSE_release=no
 
-
 NETWORK_MANAGER_CONF_OPTS = \
 	--disable-tests \
 	--disable-qt \
@@ -33,6 +32,20 @@ NETWORK_MANAGER_CONF_OPTS = \
 	--disable-ifupdown \
 	--disable-ifnet
 
+ifeq ($(BR2_PACKAGE_OFONO),y)
+NETWORK_MANAGER_DEPENDENCIES += ofono
+NETWORK_MANAGER_CONF_OPTS += --with-ofono
+else
+NETWORK_MANAGER_CONF_OPTS += --without-ofono
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+NETWORK_MANAGER_DEPENDENCIES += libcurl
+NETWORK_MANAGER_CONF_OPTS += --enable-concheck
+else
+NETWORK_MANAGER_CONF_OPTS += --disable-concheck
+endif
+
 ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y)
 NETWORK_MANAGER_DEPENDENCIES += newt
 NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes
@@ -62,6 +75,13 @@ ifeq ($(BR2_PACKAGE_DHCPCD),y)
 NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd
 endif
 
+ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_OVS),y)
+NETWORK_MANAGER_CONF_OPTS += --enable-ovs
+NETWORK_MANAGER_DEPENDENCIES += jansson
+else
+NETWORK_MANAGER_CONF_OPTS += --disable-ovs
+endif
+
 # uClibc by default doesn't have backtrace support, so don't use it
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace
diff --git a/bsp/buildroot/package/newt/Config.in b/bsp/buildroot/package/newt/Config.in
index a2216155..42a9eca7 100644
--- a/bsp/buildroot/package/newt/Config.in
+++ b/bsp/buildroot/package/newt/Config.in
@@ -5,9 +5,9 @@ config BR2_PACKAGE_NEWT
 	depends on !BR2_STATIC_LIBS # unconditionally creates .so
 	select BR2_PACKAGE_SLANG
 	select BR2_PACKAGE_POPT
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  Programming library for color text mode, widget based user interfaces.
+	  Programming library for color text mode, widget based user
+	  interfaces.
 
 	  http://www.redhat.com/
 
diff --git a/bsp/buildroot/package/newt/newt.hash b/bsp/buildroot/package/newt/newt.hash
index fe5870b0..b6fd317c 100644
--- a/bsp/buildroot/package/newt/newt.hash
+++ b/bsp/buildroot/package/newt/newt.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80  newt-0.52.19.tar.gz
+sha256 8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc  newt-0.52.20.tar.gz
diff --git a/bsp/buildroot/package/newt/newt.mk b/bsp/buildroot/package/newt/newt.mk
index 2b8d3376..b6d973af 100644
--- a/bsp/buildroot/package/newt/newt.mk
+++ b/bsp/buildroot/package/newt/newt.mk
@@ -4,14 +4,16 @@
 #
 ################################################################################
 
-NEWT_VERSION = 0.52.19
+NEWT_VERSION = 0.52.20
 NEWT_SITE = https://pagure.io/releases/newt
 NEWT_INSTALL_STAGING = YES
-NEWT_DEPENDENCIES = popt slang \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+NEWT_DEPENDENCIES = popt slang $(TARGET_NLS_DEPENDENCIES)
+# Force to use libintl, otherwise it finds gettext functions in the C
+# library, and does not link against libintl.
+NEWT_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
 NEWT_CONF_OPTS = --without-python --without-tcl
 NEWT_MAKE = $(MAKE1)
-NEWT_LICENSE = GPLv2
+NEWT_LICENSE = GPL-2.0
 NEWT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/nfacct/nfacct.mk b/bsp/buildroot/package/nfacct/nfacct.mk
index a4e20452..d4c7c4ce 100644
--- a/bsp/buildroot/package/nfacct/nfacct.mk
+++ b/bsp/buildroot/package/nfacct/nfacct.mk
@@ -9,7 +9,7 @@ NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2
 NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files
 NFACCT_DEPENDENCIES = host-pkgconf \
 	libnetfilter_acct
-NFACCT_LICENSE = GPLv2
+NFACCT_LICENSE = GPL-2.0
 NFACCT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/nfs-utils/0005-nfs-utils-add-missing-include-of-stdint.h.patch b/bsp/buildroot/package/nfs-utils/0005-nfs-utils-add-missing-include-of-stdint.h.patch
new file mode 100644
index 00000000..a6214350
--- /dev/null
+++ b/bsp/buildroot/package/nfs-utils/0005-nfs-utils-add-missing-include-of-stdint.h.patch
@@ -0,0 +1,33 @@
+From b3ff26fa182b34b6faa1317f18a9dac4c7963334 Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Mon, 2 Oct 2017 09:57:15 -0500
+Subject: [PATCH] nfs-utils: add missing include of stdint.h
+
+Glibc bump to 2.26 exposed this missing header when building
+with the following combination using an i386 internal toolchain.
+gcc5.4.0
+bin2.28.1
+linux4.1.43
+
+Upstream: https://bugzilla.linux-nfs.org/show_bug.cgi?id=312
+
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ support/nsm/rpc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/support/nsm/rpc.c b/support/nsm/rpc.c
+index 4e5f40e..d91c6ea 100644
+--- a/support/nsm/rpc.c
++++ b/support/nsm/rpc.c
+@@ -40,6 +40,7 @@
+ 
+ #include <time.h>
+ #include <stdbool.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/nfs-utils/Config.in b/bsp/buildroot/package/nfs-utils/Config.in
index bfaddd15..055b711f 100644
--- a/bsp/buildroot/package/nfs-utils/Config.in
+++ b/bsp/buildroot/package/nfs-utils/Config.in
@@ -5,13 +5,13 @@ comment "nfs-utils needs a toolchain w/ threads"
 config BR2_PACKAGE_NFS_UTILS
 	bool "nfs-utils"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_PACKAGE_RPCBIND # runtime
-	depends on BR2_USE_MMU # fork()
 	help
 	  The NFS Linux kernel server.
 
-	  http://sourceforge.net/projects/nfs
+	  http://linux-nfs.org/
 
 if BR2_PACKAGE_NFS_UTILS
 
diff --git a/bsp/buildroot/package/nfs-utils/nfs-utils.mk b/bsp/buildroot/package/nfs-utils/nfs-utils.mk
index 179009dc..9fa7ae20 100644
--- a/bsp/buildroot/package/nfs-utils/nfs-utils.mk
+++ b/bsp/buildroot/package/nfs-utils/nfs-utils.mk
@@ -7,7 +7,7 @@
 NFS_UTILS_VERSION = 1.3.3
 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz
 NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION)
-NFS_UTILS_LICENSE = GPLv2+
+NFS_UTILS_LICENSE = GPL-2.0+
 NFS_UTILS_LICENSE_FILES = COPYING
 NFS_UTILS_AUTORECONF = YES
 NFS_UTILS_DEPENDENCIES = host-pkgconf
@@ -24,6 +24,20 @@ NFS_UTILS_CONF_OPTS = \
 	--with-statedir=/run/nfs \
 	--with-rpcgen=internal
 
+HOST_NFS_UTILS_CONF_OPTS = \
+	--disable-nfsv4 \
+	--disable-nfsv41 \
+	--disable-gss \
+	--disable-uuid \
+	--disable-ipv6 \
+	--without-tcp-wrappers \
+	--with-statedir=/run/nfs \
+	--disable-caps \
+	--disable-tirpc \
+	--without-systemd \
+	--with-rpcgen=internal
+HOST_NFS_UTILS_DEPENDENCIES = host-pkgconf host-libtirpc
+
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
 NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
@@ -89,4 +103,13 @@ endef
 # nfsiostat is interpreted python, so remove it unless it's in the target
 NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT)
 
+define HOST_NFS_UTILS_BUILD_CMDS
+	$(MAKE) -C $(@D)/tools/rpcgen
+endef
+
+define HOST_NFS_UTILS_INSTALL_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/tools/rpcgen/rpcgen $(HOST_DIR)/bin/rpcgen
+endef
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/nftables/0001-src-fix-build-with-older-glibc.patch b/bsp/buildroot/package/nftables/0001-src-fix-build-with-older-glibc.patch
new file mode 100644
index 00000000..d1ba2953
--- /dev/null
+++ b/bsp/buildroot/package/nftables/0001-src-fix-build-with-older-glibc.patch
@@ -0,0 +1,38 @@
+From 381eaa40735385a1a60e5ab0a7daf4bb847fc2ab Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 9 Feb 2018 14:42:31 +0200
+Subject: [PATCH] src: fix build with older glibc
+
+glibc before 2.19 missed the definition of IPPROTO_MH. This leads to
+build failure:
+
+parser_bison.y: In function 'nft_parse':
+parser_bison.y:3793:21: error: 'IPPROTO_MH' undeclared (first use in this function)
+    | MH { $$ = IPPROTO_MH; }
+                     ^
+
+Since we have a local definition of IPPROTO_MH in headers.h use that to
+fix the build.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://marc.info/?l=netfilter-devel&m=151818061103886&w=2
+
+ src/parser_bison.y | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/parser_bison.y b/src/parser_bison.y
+index 2e79109f4da3..578bfdc10429 100644
+--- a/src/parser_bison.y
++++ b/src/parser_bison.y
+@@ -29,6 +29,7 @@
+ #include <rule.h>
+ #include <statement.h>
+ #include <expression.h>
++#include <headers.h>
+ #include <utils.h>
+ #include <parser.h>
+ #include <erec.h>
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/nftables/Config.in b/bsp/buildroot/package/nftables/Config.in
index d0a1b892..6452ab4f 100644
--- a/bsp/buildroot/package/nftables/Config.in
+++ b/bsp/buildroot/package/nftables/Config.in
@@ -5,13 +5,12 @@ config BR2_PACKAGE_NFTABLES
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBNFTNL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  nftables is the project that aims to replace the existing
 	  {ip,ip6,arp,eb}tables framework.
-	  Basically, this project provides a new packet filtering framework,
-	  a new userspace utility and also a compatibility layer
-	  for {ip,ip6}tables.
+	  Basically, this project provides a new packet filtering
+	  framework, a new userspace utility and also a compatibility
+	  layer for {ip,ip6}tables.
 
 	  http://www.netfilter.org/projects/nftables/index.html
 
diff --git a/bsp/buildroot/package/nftables/nftables.hash b/bsp/buildroot/package/nftables/nftables.hash
index a743476a..d6ccf7b4 100644
--- a/bsp/buildroot/package/nftables/nftables.hash
+++ b/bsp/buildroot/package/nftables/nftables.hash
@@ -1,2 +1,6 @@
-# From http://www.netfilter.org/projects/nftables/downloads.html#nftables-0.7
-sha1	c003fa8b63b1b44c52de345a4d84487d81865a98	nftables-0.7.tar.bz2
+# From http://www.netfilter.org/projects/nftables/downloads.html
+sha1	51fd436845718f1221ee198128656ef9055c2588	nftables-0.8.1.tar.bz2
+# Locally calculated after checking pgp signature
+# http://www.netfilter.org/projects/nftables/files/nftables-0.8.1.tar.bz2.sig
+sha256	8aead66cce70d68c70e4be917813abcbcf62811ee6de4c7761d0e34391772fc4	nftables-0.8.1.tar.bz2
+sha256	c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e	COPYING
diff --git a/bsp/buildroot/package/nftables/nftables.mk b/bsp/buildroot/package/nftables/nftables.mk
index 64d6be72..329b9871 100644
--- a/bsp/buildroot/package/nftables/nftables.mk
+++ b/bsp/buildroot/package/nftables/nftables.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-NFTABLES_VERSION = 0.7
+NFTABLES_VERSION = 0.8.1
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
 NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files
 NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
-	host-pkgconf $(if $(BR2_NEEDS_GETTEXT),gettext)
-NFTABLES_LICENSE = GPLv2
+	host-pkgconf $(TARGET_NLS_DEPENDENCIES)
+NFTABLES_LICENSE = GPL-2.0
 NFTABLES_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
@@ -22,9 +22,6 @@ endif
 ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy)
 NFTABLES_LIBS += -ljansson -lm
 endif
-ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_XML),yy)
-NFTABLES_LIBS += -lmxml -lpthread
-endif
 
 NFTABLES_CONF_ENV = \
 	ac_cv_prog_CONFIG_PDF=no \
diff --git a/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash b/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash
index ea7eb863..a711f8c6 100644
--- a/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash
+++ b/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256 d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d  nginx-dav-ext-v0.0.3.tar.gz
+sha256 6b004eed8ea16ad8de4d304027bf0413cc323a95914e58625a7dc066481aae3a  nginx-dav-ext-v0.1.0.tar.gz
+sha256 40581cf424621965adaf1461e97129520ff4fcfb62ed9965ec6fd50b7f4ddfca  LICENSE
diff --git a/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk b/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk
index 61e5bd0f..436bc295 100644
--- a/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk
+++ b/bsp/buildroot/package/nginx-dav-ext/nginx-dav-ext.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-NGINX_DAV_EXT_VERSION = v0.0.3
+NGINX_DAV_EXT_VERSION = v0.1.0
 NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,$(NGINX_DAV_EXT_VERSION))
-NGINX_DAV_EXT_LICENSE = BSD-2c
-NGINX_DAV_EXT_LICENSE_FILES = ngx_http_dav_ext_module.c
+NGINX_DAV_EXT_LICENSE = BSD-2-Clause
+NGINX_DAV_EXT_LICENSE_FILES = LICENSE
 NGINX_DAV_EXT_DEPENDENCIES = expat
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.hash b/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.hash
index 967f7880..55fc4f14 100644
--- a/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.hash
+++ b/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	256378564e36b8f222adb8fbe746529e73413c6cbe2b0e5574f41dfd62d92577	nginx-naxsi-0.55.2.tar.gz
+sha256	0b3c95d250772dc89ad8b49e47c1e024c5ae2c76c0cffa445e9fe05c4dd13495	nginx-naxsi-0.55.3.tar.gz
diff --git a/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.mk b/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.mk
index fb5e00a5..491d5183 100644
--- a/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.mk
+++ b/bsp/buildroot/package/nginx-naxsi/nginx-naxsi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NGINX_NAXSI_VERSION = 0.55.2
+NGINX_NAXSI_VERSION = 0.55.3
 NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION))
-NGINX_NAXSI_LICENSE = GPLv2+ with OpenSSL exception
+NGINX_NAXSI_LICENSE = GPL-2.0+ with OpenSSL exception
 NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch b/bsp/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch
new file mode 100644
index 00000000..11617515
--- /dev/null
+++ b/bsp/buildroot/package/nginx-upload/0001-nginx-upload-module-add-openssl-lib-dependency.patch
@@ -0,0 +1,56 @@
+From 600d0a36c2af785c8284acadeb062d73247281af Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Sun, 23 Jul 2017 09:21:23 -0500
+Subject: [PATCH] nginx-upload-module: add openssl lib dependency
+
+When building against nginx 1.11.2+, requires additional
+-lcrypto dependency. (Nginx changed crypto approach
+and dependencies for openssl are no longer default)
+
+More details found here:
+https://github.com/vkholodkov/nginx-upload-module/issues/79
+
+Upstream pull request:
+https://github.com/vkholodkov/nginx-upload-module/pull/93
+
+Resolves build failure:
+objs/addon/nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3/ngx_http_upload_module.o \
+objs/ngx_modules.o \
+-ldl -lpthread -lpthread -lpcre -lz -latomic_ops \
+-Wl,-E
+ngx_http_upload_module.o: In function `ngx_http_upload_flush_output_buffer':
+ngx_http_upload_module.c:1625: undefined reference to `MD5_Update'
+ngx_http_upload_module.c:1628: undefined reference to `SHA1_Update'
+ngx_http_upload_module.c:1631: undefined reference to `SHA256_Update'
+ngx_http_upload_module.c:1634: undefined reference to `SHA512_Update'
+
+Fixes:
+http://autobuild.buildroot.net/results/e25f8ba8d8743e47a77707cf582e58477e1860e6
+http://autobuild.buildroot.net/results/c4aa6e22033be934bd311cd9761f646d44618dc0
+http://autobuild.buildroot.net/results/75e935d248b46df11c32c95526423a2287ac8c62
+
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ config | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/config b/config
+index cabd4f1..293529f 100644
+--- a/config
++++ b/config
+@@ -1,11 +1,10 @@
+-USE_MD5=YES
+-USE_SHA1=YES
+ ngx_addon_name=ngx_http_upload_module
+ 
+ if test -n "$ngx_module_link"; then
+     ngx_module_type=HTTP
+     ngx_module_name=$ngx_addon_name
+     ngx_module_srcs="$ngx_addon_dir/ngx_http_upload_module.c"
++    ngx_module_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
+ 
+     . auto/module
+ else
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/nginx-upload/nginx-upload.hash b/bsp/buildroot/package/nginx-upload/nginx-upload.hash
index 4fc43473..3a8dfedd 100644
--- a/bsp/buildroot/package/nginx-upload/nginx-upload.hash
+++ b/bsp/buildroot/package/nginx-upload/nginx-upload.hash
@@ -1,2 +1,2 @@
 #Locally Computed:
-sha256 8cd1d9d968ffba807de2e546ea9cad5e1ae294ec60b4927b2d60a98bdb4a1144  nginx-upload-aba1e3f34c754551f4f49e572bc86863d535609d.tar.gz
+sha256 5f1c3c2b9858b9cacd877a0f2df9b9263734e9cef8d837b73f0e659c0f7fde2d  nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3.tar.gz
diff --git a/bsp/buildroot/package/nginx-upload/nginx-upload.mk b/bsp/buildroot/package/nginx-upload/nginx-upload.mk
index 6f94d358..73854257 100644
--- a/bsp/buildroot/package/nginx-upload/nginx-upload.mk
+++ b/bsp/buildroot/package/nginx-upload/nginx-upload.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NGINX_UPLOAD_VERSION = aba1e3f34c754551f4f49e572bc86863d535609d
+NGINX_UPLOAD_VERSION = 70bee48f1811eecd255ed094ce9f0fb560c390c3
 NGINX_UPLOAD_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_VERSION))
-NGINX_UPLOAD_LICENSE = BSD-3c
+NGINX_UPLOAD_LICENSE = BSD-3-Clause
 NGINX_UPLOAD_LICENSE_FILES = LICENCE
 NGINX_UPLOAD_DEPENDENCIES = openssl
 
diff --git a/bsp/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/bsp/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
index 603f7292..5b1a50b2 100644
--- a/bsp/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
+++ b/bsp/buildroot/package/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch
@@ -1,6 +1,6 @@
-From fe05ccf80afe5de33d4f9c5e5545390c450bcd2d Mon Sep 17 00:00:00 2001
+From fb158af083e72c9aa0a8dfd4c6965f950192a230 Mon Sep 17 00:00:00 2001
 From: Samuel Martin <s.martin49@gmail.com>
-Date: Thu, 24 Apr 2014 23:27:32 +0200
+Date: Tue, 4 Jul 2017 11:09:20 -0400
 Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation
  friendly
 
@@ -15,12 +15,14 @@ Refresh for 1.8.0.
 Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
 [martin@barkynet.com: Updated for 1.10.0]
 Signed-off-by: Martin Bark <martin@barkynet.com>
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+Refresh for 1.12.0
 ---
- auto/types/sizeof | 42 ++++++++++++++++++++++++++++--------------
- 1 file changed, 28 insertions(+), 14 deletions(-)
+ auto/types/sizeof | 37 ++++++++++++++++++++++++++++---------
+ 1 file changed, 28 insertions(+), 9 deletions(-)
 
 diff --git a/auto/types/sizeof b/auto/types/sizeof
-index a5f66bb..c6f31ec 100644
+index 480d8cf..61dcd2d 100644
 --- a/auto/types/sizeof
 +++ b/auto/types/sizeof
 @@ -14,7 +14,7 @@ END
@@ -32,11 +34,11 @@ index a5f66bb..c6f31ec 100644
  
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H
+@@ -25,22 +25,41 @@ $NGX_INCLUDE_UNISTD_H
  $NGX_INCLUDE_INTTYPES_H
  $NGX_INCLUDE_AUTO_CONFIG_H
  
--int main() {
+-int main(void) {
 -    printf("%d", (int) sizeof($ngx_type));
 +#if !defined( PASTE)
 +#define PASTE2( x, y) x##y
@@ -55,9 +57,9 @@ index a5f66bb..c6f31ec 100644
  }
  
 -END
--
 +_EOF
  
+ 
 -ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \
 -          -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs"
 +_ngx_typename=`echo "$ngx_type" | sed 's/ /_/g;s/\*/p/'`
@@ -83,5 +85,5 @@ index a5f66bb..c6f31ec 100644
  fi
  
 -- 
-1.9.1
+2.9.4
 
diff --git a/bsp/buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/bsp/buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
index ed67a679..be1df7fb 100644
--- a/bsp/buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
+++ b/bsp/buildroot/package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch
@@ -28,7 +28,7 @@ diff --git a/auto/cc/conf b/auto/cc/conf
 index edc6d74..a61ade4 100644
 --- a/auto/cc/conf
 +++ b/auto/cc/conf
-@@ -159,6 +159,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -181,6 +181,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
      ngx_feature="gcc builtin atomic operations"
      ngx_feature_name=NGX_HAVE_GCC_ATOMIC
      ngx_feature_run=yes
@@ -36,7 +36,7 @@ index edc6d74..a61ade4 100644
      ngx_feature_incs=
      ngx_feature_path=
      ngx_feature_libs=
-@@ -179,6 +180,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -201,6 +203,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
          ngx_feature="C99 variadic macros"
          ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
          ngx_feature_run=yes
@@ -44,7 +44,7 @@ index edc6d74..a61ade4 100644
          ngx_feature_incs="#include <stdio.h>
  #define var(dummy, ...)  sprintf(__VA_ARGS__)"
          ngx_feature_path=
-@@ -193,6 +195,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+@@ -215,6 +220,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
      ngx_feature="gcc variadic macros"
      ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
      ngx_feature_run=yes
@@ -80,7 +80,7 @@ diff --git a/auto/os/darwin b/auto/os/darwin
 index 1d3e3d3..11b7276 100644
 --- a/auto/os/darwin
 +++ b/auto/os/darwin
-@@ -27,6 +27,7 @@ NGX_KQUEUE_CHECKED=YES
+@@ -30,6 +30,7 @@ NGX_KQUEUE_CHECKED=YES
  ngx_feature="kqueue's EVFILT_TIMER"
  ngx_feature_name="NGX_HAVE_TIMER_EVENT"
  ngx_feature_run=yes
@@ -88,7 +88,7 @@ index 1d3e3d3..11b7276 100644
  ngx_feature_incs="#include <sys/event.h>
                    #include <sys/time.h>"
  ngx_feature_path=
-@@ -57,6 +58,7 @@ ngx_feature_test="int      kq;
+@@ -60,6 +61,7 @@ ngx_feature_test="int      kq;
  ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
  ngx_feature_name=NGX_DARWIN_KEVENT_BUG
  ngx_feature_run=bug
@@ -96,7 +96,7 @@ index 1d3e3d3..11b7276 100644
  ngx_feature_incs="#include <sys/event.h>
                    #include <sys/time.h>"
  ngx_feature_path=
-@@ -87,6 +89,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS"
+@@ -90,6 +92,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS"
  ngx_feature="sendfile()"
  ngx_feature_name="NGX_HAVE_SENDFILE"
  ngx_feature_run=yes
@@ -108,7 +108,7 @@ diff --git a/auto/os/linux b/auto/os/linux
 index 19bf832..16848b2 100644
 --- a/auto/os/linux
 +++ b/auto/os/linux
-@@ -49,6 +49,7 @@ fi
+@@ -37,6 +37,7 @@ fi
  ngx_feature="epoll"
  ngx_feature_name="NGX_HAVE_EPOLL"
  ngx_feature_run=yes
@@ -116,7 +116,7 @@ index 19bf832..16848b2 100644
  ngx_feature_incs="#include <sys/epoll.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -106,6 +107,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
+@@ -111,6 +112,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
  ngx_feature="sendfile()"
  ngx_feature_name="NGX_HAVE_SENDFILE"
  ngx_feature_run=yes
@@ -124,7 +124,7 @@ index 19bf832..16848b2 100644
  ngx_feature_incs="#include <sys/sendfile.h>
                    #include <errno.h>"
  ngx_feature_path=
-@@ -127,6 +129,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+@@ -132,6 +134,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
  ngx_feature="sendfile64()"
  ngx_feature_name="NGX_HAVE_SENDFILE64"
  ngx_feature_run=yes
@@ -132,7 +132,7 @@ index 19bf832..16848b2 100644
  ngx_feature_incs="#include <sys/sendfile.h>
                    #include <errno.h>"
  ngx_feature_path=
-@@ -145,6 +148,7 @@ ngx_include="sys/prctl.h"; . auto/include
+@@ -150,6 +153,7 @@ ngx_include="sys/prctl.h"; . auto/include
  ngx_feature="prctl(PR_SET_DUMPABLE)"
  ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
  ngx_feature_run=yes
@@ -144,7 +144,7 @@ diff --git a/auto/unix b/auto/unix
 index 6e54531..7dbf9d1 100755
 --- a/auto/unix
 +++ b/auto/unix
-@@ -99,6 +99,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
+@@ -100,6 +100,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then
          ngx_feature="kqueue's EVFILT_TIMER"
          ngx_feature_name="NGX_HAVE_TIMER_EVENT"
          ngx_feature_run=yes
@@ -152,7 +152,7 @@ index 6e54531..7dbf9d1 100755
          ngx_feature_incs="#include <sys/event.h>
                            #include <sys/time.h>"
          ngx_feature_path=
-@@ -589,6 +590,7 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0);
+@@ -702,6 +703,7 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0);
  ngx_feature="sys_nerr"
  ngx_feature_name="NGX_SYS_NERR"
  ngx_feature_run=value
@@ -160,7 +160,7 @@ index 6e54531..7dbf9d1 100755
  ngx_feature_incs='#include <errno.h>
                    #include <stdio.h>'
  ngx_feature_path=
-@@ -603,6 +605,7 @@ if [ $ngx_found = no ]; then
+@@ -716,6 +718,7 @@ if [ $ngx_found = no ]; then
      ngx_feature="_sys_nerr"
      ngx_feature_name="NGX_SYS_NERR"
      ngx_feature_run=value
@@ -168,7 +168,7 @@ index 6e54531..7dbf9d1 100755
      ngx_feature_incs='#include <errno.h>
                        #include <stdio.h>'
      ngx_feature_path=
-@@ -618,6 +621,7 @@ if [ $ngx_found = no ]; then
+@@ -731,6 +734,7 @@ if [ $ngx_found = no ]; then
      ngx_feature='maximum errno'
      ngx_feature_name=NGX_SYS_NERR
      ngx_feature_run=value
@@ -176,7 +176,7 @@ index 6e54531..7dbf9d1 100755
      ngx_feature_incs='#include <errno.h>
                        #include <string.h>
                        #include <stdio.h>'
-@@ -676,6 +680,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096);
+@@ -789,6 +793,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096);
  ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
  ngx_feature_name="NGX_HAVE_MAP_ANON"
  ngx_feature_run=yes
@@ -184,7 +184,7 @@ index 6e54531..7dbf9d1 100755
  ngx_feature_incs="#include <sys/mman.h>"
  ngx_feature_path=
  ngx_feature_libs=
-@@ -689,6 +694,7 @@ ngx_feature_test="void *p;
+@@ -802,6 +807,7 @@ ngx_feature_test="void *p;
  ngx_feature='mmap("/dev/zero", MAP_SHARED)'
  ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
  ngx_feature_run=yes
@@ -192,7 +192,7 @@ index 6e54531..7dbf9d1 100755
  ngx_feature_incs="#include <sys/mman.h>
                    #include <sys/stat.h>
                    #include <fcntl.h>"
-@@ -704,6 +710,7 @@ ngx_feature_test='void *p; int  fd;
+@@ -817,6 +823,7 @@ ngx_feature_test='void *p; int  fd;
  ngx_feature="System V shared memory"
  ngx_feature_name="NGX_HAVE_SYSVSHM"
  ngx_feature_run=yes
@@ -200,7 +200,7 @@ index 6e54531..7dbf9d1 100755
  ngx_feature_incs="#include <sys/ipc.h>
                    #include <sys/shm.h>"
  ngx_feature_path=
-@@ -718,6 +725,7 @@ ngx_feature_test="int  id;
+@@ -831,6 +838,7 @@ ngx_feature_test="int  id;
  ngx_feature="POSIX semaphores"
  ngx_feature_name="NGX_HAVE_POSIX_SEM"
  ngx_feature_run=yes
diff --git a/bsp/buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/bsp/buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
index b315909c..103f90b3 100644
--- a/bsp/buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
+++ b/bsp/buildroot/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
@@ -15,13 +15,14 @@ diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
 index 3a0f37b..3c2a60e 100644
 --- a/auto/lib/libxslt/conf
 +++ b/auto/lib/libxslt/conf
-@@ -12,8 +12,8 @@
+@@ -12,8 +12,9 @@
                        #include <libxslt/xsltInternals.h>
                        #include <libxslt/transform.h>
                        #include <libxslt/xsltutils.h>"
 -    ngx_feature_path="/usr/include/libxml2"
 -    ngx_feature_libs="-lxml2 -lxslt"
-+    ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|sed 's/-I//g')"
++    ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|
++			 sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
 +    ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
      ngx_feature_test="xmlParserCtxtPtr    ctxt = NULL;
                        xsltStylesheetPtr   sheet = NULL;
diff --git a/bsp/buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/bsp/buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
index 2242d133..b4d8215b 100644
--- a/bsp/buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
+++ b/bsp/buildroot/package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch
@@ -109,7 +109,7 @@ diff --git a/auto/unix b/auto/unix
 index 7dbf9d1..00a7370 100755
 --- a/auto/unix
 +++ b/auto/unix
-@@ -595,6 +595,10 @@ ngx_feature_incs='#include <errno.h>
+@@ -708,6 +708,10 @@ ngx_feature_incs='#include <errno.h>
                    #include <stdio.h>'
  ngx_feature_path=
  ngx_feature_libs=
@@ -120,7 +120,7 @@ index 7dbf9d1..00a7370 100755
  ngx_feature_test='printf("%d", sys_nerr);'
  . auto/feature
  
-@@ -643,6 +647,12 @@ if [ $ngx_found = no ]; then
+@@ -756,6 +760,12 @@ if [ $ngx_found = no ]; then
      . auto/feature
  fi
  
diff --git a/bsp/buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/bsp/buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
index b826a3c8..0bd4d337 100644
--- a/bsp/buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
+++ b/bsp/buildroot/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch
@@ -15,13 +15,14 @@ diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
 index 39d9602..995c6f3 100644
 --- a/auto/lib/openssl/conf
 +++ b/auto/lib/openssl/conf
-@@ -50,8 +50,8 @@ else
+@@ -58,8 +58,9 @@ else
          ngx_feature_name="NGX_OPENSSL"
          ngx_feature_run=no
          ngx_feature_incs="#include <openssl/ssl.h>"
 -        ngx_feature_path=
 -        ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL"
-+        ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|sed 's/-I//g')"
++        ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|
++			     sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')"
 +        ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
          ngx_feature_test="SSL_CTX_set_options(NULL, 0)"
          . auto/feature
diff --git a/bsp/buildroot/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch b/bsp/buildroot/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
new file mode 100644
index 00000000..08456511
--- /dev/null
+++ b/bsp/buildroot/package/nginx/0009-auto-lib-conf-fix-PCRE-condition-WRT-the-http-and-ht.patch
@@ -0,0 +1,33 @@
+From 9668f0d5ecd2382fd36b7ff6a3a29abd04f6533f Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Fri, 14 Jul 2017 11:50:08 +0200
+Subject: [PATCH] auto/lib/conf: fix PCRE condition WRT the http and
+ http_rewrite options
+
+http_rewrite module cannot be selected when http server is disabled, so
+fix the PCRE check condition to avoid irrelevant check failure.
+
+Fixes:
+  http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ auto/lib/conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/auto/lib/conf b/auto/lib/conf
+index 0b8545a3..2c7af104 100644
+--- a/auto/lib/conf
++++ b/auto/lib/conf
+@@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
+     . auto/lib/pcre/conf
+ 
+ else
+-    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
++    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
+ 
+ cat << END
+ 
+-- 
+2.13.2
+
diff --git a/bsp/buildroot/package/nginx/Config.in b/bsp/buildroot/package/nginx/Config.in
index e6f2d96d..5c34f11e 100644
--- a/bsp/buildroot/package/nginx/Config.in
+++ b/bsp/buildroot/package/nginx/Config.in
@@ -3,8 +3,8 @@ menuconfig BR2_PACKAGE_NGINX
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBATOMIC_OPS if BR2_sparc_v8 || BR2_sparc_leon3
 	help
-	  nginx is an HTTP and reverse proxy server, as well as a mail proxy
-	  server.
+	  nginx is an HTTP and reverse proxy server, as well as a mail
+	  proxy server.
 
 	  http://nginx.org/
 
@@ -141,8 +141,8 @@ config BR2_PACKAGE_NGINX_HTTP_CHARSET_MODULE
 
 config BR2_PACKAGE_NGINX_HTTP_GZIP_MODULE
 	bool "ngx_http_gzip_module"
-	select BR2_PACKAGE_ZLIB
 	default y
+	select BR2_PACKAGE_ZLIB
 	help
 	  Enable ngx_http_gzip_module
 
@@ -202,8 +202,8 @@ config BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE
 
 config BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE
 	bool "ngx_http_rewrite_module"
-	select BR2_PACKAGE_PCRE
 	default y
+	select BR2_PACKAGE_PCRE
 	help
 	  Enable ngx_http_rewrite_module
 
diff --git a/bsp/buildroot/package/nginx/S50nginx b/bsp/buildroot/package/nginx/S50nginx
index b2f8b808..964652b9 100755
--- a/bsp/buildroot/package/nginx/S50nginx
+++ b/bsp/buildroot/package/nginx/S50nginx
@@ -3,23 +3,29 @@
 # Start/stop nginx
 #
 
+NGINX=/usr/sbin/nginx
 PIDFILE=/var/run/nginx.pid
 
 case "$1" in
   start)
 	echo "Starting nginx..."
 	mkdir -p /var/log/nginx /var/tmp/nginx
-	start-stop-daemon -S -x /usr/sbin/nginx -p $PIDFILE
+	start-stop-daemon -S -x "$NGINX" -p "$PIDFILE"
 	;;
   stop)
-	printf "Stopping nginx..."
-	start-stop-daemon -K -o -p $PIDFILE
+	echo "Stopping nginx..."
+	start-stop-daemon -K -x "$NGINX" -p "$PIDFILE" -o
 	;;
-  restart|reload)
+  reload|force-reload)
+	echo "Reloading nginx configuration..."
+	"$NGINX" -s reload
+	;;
+  restart)
 	"$0" stop
+	sleep 1 # Prevent race condition: ensure nginx stops before start.
 	"$0" start
 	;;
   *)
-	echo "Usage: $0 {start|stop|restart}"
+	echo "Usage: $0 {start|stop|restart|reload|force-reload}"
 	exit 1
 esac
diff --git a/bsp/buildroot/package/nginx/nginx.hash b/bsp/buildroot/package/nginx/nginx.hash
index 498d272d..9936ca1d 100644
--- a/bsp/buildroot/package/nginx/nginx.hash
+++ b/bsp/buildroot/package/nginx/nginx.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90	nginx-1.10.3.tar.gz
+sha256	305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416	nginx-1.12.2.tar.gz
+# License files, locally calculated
+sha256	75820469c890db641e54078df018e497fde0542211aa704e15320316a2175780	LICENSE
diff --git a/bsp/buildroot/package/nginx/nginx.mk b/bsp/buildroot/package/nginx/nginx.mk
index f9b2cd1d..e5652af6 100644
--- a/bsp/buildroot/package/nginx/nginx.mk
+++ b/bsp/buildroot/package/nginx/nginx.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NGINX_VERSION = 1.10.3
+NGINX_VERSION = 1.12.2
 NGINX_SITE = http://nginx.org/download
-NGINX_LICENSE = BSD-2c
+NGINX_LICENSE = BSD-2-Clause
 NGINX_LICENSE_FILES = LICENSE
 NGINX_DEPENDENCIES = host-pkgconf
 
diff --git a/bsp/buildroot/package/ngircd/0001-Fix-Get_error-usage.patch b/bsp/buildroot/package/ngircd/0001-Fix-Get_error-usage.patch
new file mode 100644
index 00000000..3724e46d
--- /dev/null
+++ b/bsp/buildroot/package/ngircd/0001-Fix-Get_error-usage.patch
@@ -0,0 +1,44 @@
+From 543f44bff8d56785dc13a74a14d4eaa96465bf05 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Wed, 13 Sep 2017 14:07:11 +0200
+Subject: [PATCH] Fix Get_error usage
+
+The usage of Get_Error is guarded by "ifdef h_errno" in this file, the
+definition of this function should follow the same rules.
+
+Fixes a build error when cross-compiling:
+https://github.com/ngircd/ngircd/issues/223
+
+Patch sent upstream: https://github.com/ngircd/ngircd/pull/240
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/ngircd/resolve.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c
+index 32791901..e1903254 100644
+--- a/src/ngircd/resolve.c
++++ b/src/ngircd/resolve.c
+@@ -108,9 +108,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short))
+ 	return false;
+ } /* Resolve_Name */
+ 
+-
+-#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
+-#if !defined(WANT_IPV6) && defined(h_errno)
++#ifdef h_errno
+ static char *
+ Get_Error( int H_Error )
+ {
+@@ -128,7 +126,6 @@ Get_Error( int H_Error )
+ 	return "unknown error";
+ }
+ #endif
+-#endif
+ 
+ 
+ /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/ngircd/Config.in b/bsp/buildroot/package/ngircd/Config.in
index f1d8bea9..9b3d4309 100644
--- a/bsp/buildroot/package/ngircd/Config.in
+++ b/bsp/buildroot/package/ngircd/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_NGIRCD
 	bool "ngircd"
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_ZLIB
 	help
 	  Next Generation IRC server deamon.
 
diff --git a/bsp/buildroot/package/ngircd/ngircd.hash b/bsp/buildroot/package/ngircd/ngircd.hash
index 45e2d9e8..128867bf 100644
--- a/bsp/buildroot/package/ngircd/ngircd.hash
+++ b/bsp/buildroot/package/ngircd/ngircd.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	93f953b2785ff0e6e29b8b3794ba5a64754b86251ce71bf39fc27f4f5074eada	ngircd-20.3.tar.xz
+sha256 173fa0ea10788a8ba08ef2f7e64ea8951d7c88862e744128c8b87bae424b1008  ngircd-24.tar.xz
diff --git a/bsp/buildroot/package/ngircd/ngircd.mk b/bsp/buildroot/package/ngircd/ngircd.mk
index 927474c8..9b330fab 100644
--- a/bsp/buildroot/package/ngircd/ngircd.mk
+++ b/bsp/buildroot/package/ngircd/ngircd.mk
@@ -4,11 +4,37 @@
 #
 ################################################################################
 
-NGIRCD_VERSION = 20.3
+NGIRCD_VERSION = 24
 NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz
-NGIRCD_SITE = http://arthur.barton.de/pub/ngircd
-NGIRCD_DEPENDENCIES = zlib
-NGIRCD_LICENSE = GPLv2+
+NGIRCD_SITE = https://arthur.barton.de/pub/ngircd
+NGIRCD_LICENSE = GPL-2.0+
 NGIRCD_LICENSE_FILES = COPYING
 
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+NGIRCD_CONF_OPTS += --with-pam=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += linux-pam
+else
+NGIRCD_CONF_OPTS += --without-pam
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+NGIRCD_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += openssl
+else
+NGIRCD_CONF_OPTS += --without-openssl
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+NGIRCD_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += gnutls
+else
+NGIRCD_CONF_OPTS += --without-gnutls
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+NGIRCD_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr
+NGIRCD_DEPENDENCIES += zlib
+else
+NGIRCD_CONF_OPTS += --without-zlib
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ngrep/ngrep.mk b/bsp/buildroot/package/ngrep/ngrep.mk
index 8daaf2d8..3f569374 100644
--- a/bsp/buildroot/package/ngrep/ngrep.mk
+++ b/bsp/buildroot/package/ngrep/ngrep.mk
@@ -7,7 +7,7 @@
 NGREP_VERSION = 1.45
 NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2
 NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION)
-NGREP_LICENSE = BSD-4c-like
+NGREP_LICENSE = BSD-4-Clause-like
 NGREP_LICENSE_FILES = LICENSE.txt
 NGREP_INSTALL_STAGING = YES
 
@@ -17,7 +17,7 @@ NGREP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
 endif
 NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)"
 
-NGREP_CONF_OPTS =  \
+NGREP_CONF_OPTS = \
 	--with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \
 	--enable-pcre \
 	--with-pcre=$(STAGING_DIR)/usr \
diff --git a/bsp/buildroot/package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch b/bsp/buildroot/package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch
new file mode 100644
index 00000000..f14079a5
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/0001-nilfs-utils-use-_POSIX_MAX_INPUT.patch
@@ -0,0 +1,32 @@
+From c6e5a79b130ac33093c36f972be49454f506be7e Mon Sep 17 00:00:00 2001
+From: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+Date: Thu, 28 Dec 2017 20:06:38 +0100
+Subject: [PATCH] nilfs-utils: use _POSIX_MAX_INPUT
+
+musl does provide _POSIX_MAX_INPUT, but no MAX_INPUT out of the box.
+This commit assigns _POSIX_MAX_INPUT to MAX_INPUT.
+
+Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+---
+ bin/rmcp.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/bin/rmcp.c b/bin/rmcp.c
+index 0140f56..6773912 100644
+--- a/bin/rmcp.c
++++ b/bin/rmcp.c
+@@ -47,6 +47,11 @@
+ #include <limits.h>
+ #endif	/* HAVE_LIMITS_H */
+ 
++/* define MAX_INPUT for musl */
++#ifndef MAX_INPUT
++#define MAX_INPUT _POSIX_MAX_INPUT
++#endif
++
+ #include <errno.h>
+ #include "nilfs.h"
+ #include "parser.h"
+-- 
+1.8.5.rc3
+
diff --git a/bsp/buildroot/package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch b/bsp/buildroot/package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch
new file mode 100644
index 00000000..ab057b29
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/0002-nilfs_cleanerd-link-dynamically.patch
@@ -0,0 +1,32 @@
+From 7888f8f24ec08cdfd51929cde4e177396d7504e7 Mon Sep 17 00:00:00 2001
+From: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+Date: Thu, 28 Dec 2017 20:22:00 +0100
+Subject: [PATCH] nilfs_cleanerd: link dynamically
+
+When nilfs_cleanerd does not run due to shared object problems,
+nilfs2 filesystems may run out of space soon.
+This logic that justified linking nilfs_cleanerd statically
+does IMO not apply to embedded systems built by buildroot.
+This commit therefore drops the static linking.
+
+Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+---
+ sbin/cleanerd/Makefile.am | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/sbin/cleanerd/Makefile.am b/sbin/cleanerd/Makefile.am
+index 3a5335d..06f0847 100644
+--- a/sbin/cleanerd/Makefile.am
++++ b/sbin/cleanerd/Makefile.am
+@@ -9,8 +9,6 @@ nilfs_cleanerd_SOURCES = cleanerd.c cldconfig.c \
+ nilfs_cleanerd_CFLAGS = -Wall
+ nilfs_cleanerd_CPPFLAGS = -I$(top_srcdir)/include \
+ 	-DSYSCONFDIR=\"$(sysconfdir)\"
+-# Use -static option to make nilfs_cleanerd self-contained.
+-nilfs_cleanerd_LDFLAGS = -static
+ 
+ dist_sysconf_DATA = nilfs_cleanerd.conf
+ 
+-- 
+1.8.5.rc3
+
diff --git a/bsp/buildroot/package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch b/bsp/buildroot/package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch
new file mode 100644
index 00000000..9d54c40f
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/0003-mount.nilfs-drop-include-rpc-types.h.patch
@@ -0,0 +1,32 @@
+From a924a05ea6fd8c5284983a09d1ea8993124b6b77 Mon Sep 17 00:00:00 2001
+From: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+Date: Thu, 28 Dec 2017 20:26:09 +0100
+Subject: [PATCH] mount.nilfs: drop include rpc/types.h
+
+rpc/types.h does not exist on low-footprint musl toolchains,
+and is only required for the boolean types, which musl provides
+elsewhere.
+This commit drops the include completely.
+
+Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+---
+ sbin/mount/sundries.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/sbin/mount/sundries.h b/sbin/mount/sundries.h
+index b3064a7..94d8ce4 100644
+--- a/sbin/mount/sundries.h
++++ b/sbin/mount/sundries.h
+@@ -15,9 +15,6 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+-#if !defined(bool_t) && !defined(__GLIBC__)
+-#include <rpc/types.h>
+-#endif
+ 
+ extern int mount_quiet;
+ 
+-- 
+1.8.5.rc3
+
diff --git a/bsp/buildroot/package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch b/bsp/buildroot/package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch
new file mode 100644
index 00000000..49cdd266
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/0004-autoconf-use-PKG_CHECK_MODULES-for-libmount-and-libb.patch
@@ -0,0 +1,141 @@
+From 65ce9b4817544734770e410c5c2779065152f991 Mon Sep 17 00:00:00 2001
+From: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+Date: Thu, 4 Jan 2018 09:47:45 +0100
+Subject: [PATCH] autoconf: use PKG_CHECK_MODULES for libmount and libblkid
+
+The dependencies of libmount to libblkid and libblkid to libuuid
+were not handled correctly, and only work for the shared object scenario.
+This commit switches the autoconfiguration to use PKG_CHECK_MODULES
+which handles the static vs. dynamic case.
+This commit has been compile-tested using buildroot on different compilers,
+including static & dynamic ones
+
+Signed-off-by: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
+---
+ configure.ac                 | 13 +++----------
+ sbin/mkfs/Makefile.am        |  4 ++--
+ sbin/mkfs/mkfs.c             |  6 +++---
+ sbin/mount/Makefile.am       |  4 ++--
+ sbin/mount/mount_libmount.c  |  4 +---
+ sbin/mount/umount_libmount.c |  4 +---
+ 6 files changed, 12 insertions(+), 23 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6fa8c41..3e31e55 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,13 +104,10 @@ AC_CHECK_HEADERS([ctype.h err.h fcntl.h grp.h libintl.h limits.h \
+ 
+ # Check for conditional libraries and headers.
+ if test "${with_libmount}" = "yes"; then
+-   AC_CHECK_LIB(mount, mnt_context_do_mount, [LIB_MOUNT="-lmount"],
+-   	AC_MSG_ERROR([Mount library is enabled but libmount not found]))
+-   AC_CHECK_HEADERS([libmount/libmount.h])
++   PKG_CHECK_MODULES([MOUNT], [mount])
+    with_selinux=no
+ fi
+ AM_CONDITIONAL(CONFIG_LIBMOUNT, [test "$with_libmount" = "yes"])
+-AC_SUBST(LIB_MOUNT)
+ 
+ if test "${with_selinux}" = "yes"; then
+    AC_CHECK_LIB(selinux, getprevcon,
+@@ -125,15 +122,11 @@ fi
+ AC_SUBST([LIB_SELINUX])
+ 
+ if test "${with_blkid}" = "yes"; then
+-   AC_CHECK_LIB(blkid, blkid_new_probe_from_filename,
++   PKG_CHECK_MODULES([BLKID], [blkid],
+    		[AC_DEFINE(HAVE_LIBBLKID, 1,
+ 		    [Define to 1 if you have the 'blkid' library (-lblkid).])
+-		 LIB_BLKID="-lblkid"
+-		],
+-		AC_MSG_ERROR([BLKID library not found]))
+-   AC_CHECK_HEADERS([blkid/blkid.h])
++		])
+ fi
+-AC_SUBST(LIB_BLKID)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/sbin/mkfs/Makefile.am b/sbin/mkfs/Makefile.am
+index 28f5128..408c976 100644
+--- a/sbin/mkfs/Makefile.am
++++ b/sbin/mkfs/Makefile.am
+@@ -1,8 +1,8 @@
+ ## Makefile.am
+ 
+-AM_CFLAGS = -Wall
++AM_CFLAGS = -Wall $(BLKID_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+-LDADD = -luuid $(LIB_BLKID) $(top_builddir)/lib/libnilfsfeature.la \
++LDADD = -luuid $(BLKID_LIBS) $(top_builddir)/lib/libnilfsfeature.la \
+ 	$(top_builddir)/lib/libmountchk.la \
+ 	$(top_builddir)/lib/libcrc32.la
+ 
+diff --git a/sbin/mkfs/mkfs.c b/sbin/mkfs/mkfs.c
+index d7f161e..0c45d6a 100644
+--- a/sbin/mkfs/mkfs.c
++++ b/sbin/mkfs/mkfs.c
+@@ -66,9 +66,9 @@
+ 
+ #include <errno.h>
+ 
+-#if HAVE_BLKID_BLKID_H
+-#include <blkid/blkid.h>
+-#endif	/* HAVE_BLKID_BLKID_H */
++#if HAVE_LIBBLKID
++#include <blkid.h>
++#endif	/* HAVE_LIBBLKID */
+ 
+ #include "nilfs.h"
+ #include "util.h"
+diff --git a/sbin/mount/Makefile.am b/sbin/mount/Makefile.am
+index f5d3c27..9554aa5 100644
+--- a/sbin/mount/Makefile.am
++++ b/sbin/mount/Makefile.am
+@@ -6,10 +6,10 @@ COMMONHEADERS = mount.nilfs2.h sundries.h xmalloc.h
+ LEGACYSOURCES = fstab.c mount_mntent.c mount_opts.c
+ LEGACYHEADERS = fstab.h mount_constants.h mount_mntent.h mount_opts.h
+ 
+-AM_CFLAGS = -Wall
++AM_CFLAGS = -Wall $(MOUNT_CFLAGS)
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ LDADD = $(top_builddir)/lib/librealpath.la \
+-	$(top_builddir)/lib/libcleanerexec.la $(LIB_MOUNT) $(LIB_SELINUX) \
++	$(top_builddir)/lib/libcleanerexec.la $(MOUNT_LIBS) $(LIB_SELINUX) \
+ 	$(LIB_POSIX_TIMER)
+ 
+ root_sbin_PROGRAMS = mount.nilfs2 umount.nilfs2
+diff --git a/sbin/mount/mount_libmount.c b/sbin/mount/mount_libmount.c
+index ef40e68..a7fec00 100644
+--- a/sbin/mount/mount_libmount.c
++++ b/sbin/mount/mount_libmount.c
+@@ -67,9 +67,7 @@
+ #include <syslog.h>
+ #endif	/* HAVE_SYSLOG_H */
+ 
+-#if HAVE_LIBMOUNT_LIBMOUNT_H
+-#include <libmount/libmount.h>
+-#endif	/* HAVE_LIBMOUNT_H */
++#include <libmount.h>
+ 
+ #include <stdarg.h>
+ #include <errno.h>
+diff --git a/sbin/mount/umount_libmount.c b/sbin/mount/umount_libmount.c
+index ae5a337..b678f54 100644
+--- a/sbin/mount/umount_libmount.c
++++ b/sbin/mount/umount_libmount.c
+@@ -59,9 +59,7 @@
+ #include <syslog.h>
+ #endif	/* HAVE_SYSLOG_H */
+ 
+-#if HAVE_LIBMOUNT_LIBMOUNT_H
+-#include <libmount/libmount.h>
+-#endif	/* HAVE_LIBMOUNT_H */
++#include <libmount.h>
+ 
+ #include <stdarg.h>
+ #include <errno.h>
+-- 
+1.8.5.rc3
+
diff --git a/bsp/buildroot/package/nilfs-utils/Config.in b/bsp/buildroot/package/nilfs-utils/Config.in
new file mode 100644
index 00000000..e245dc46
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_NILFS_UTILS
+	bool "nilfs-utils"
+	depends on BR2_USE_MMU # util-linux libmount, libblkid
+	depends on BR2_TOOLCHAIN_HAS_THREADS # sem_open()
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep()
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
+	select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
+	select BR2_PACKAGE_UTIL_LINUX
+	help
+	  Tools for creating and managing NILFS2 filesystems.
+
+	  https://github.com/nilfs-dev/nilfs-utils
+
+comment "nilfs-utils needs a toolchain w/ threads, NPTL"
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/bsp/buildroot/package/nilfs-utils/nilfs-utils.hash b/bsp/buildroot/package/nilfs-utils/nilfs-utils.hash
new file mode 100644
index 00000000..bf803670
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/nilfs-utils.hash
@@ -0,0 +1,3 @@
+# Locally calculated after checking pgp signature
+sha512	8a73b807bbdb2dc56b100ab8fbffe8129c9db31a6cbceecf267bdeb726fc13dd6844ce8ef96690bd7786709cb884881a3cd6d3cf24290248c5abc457976e9487  nilfs-utils-v2.2.7.tar.gz
+sha512	4fc92d3998910acb108f81b1aee70a55a572b661a2766d0e57a55e48e2b737eea41415356cbd62593f26aec5797ab9fbb40211d7782b5834b4855ff1ce6ad5f7  COPYING
diff --git a/bsp/buildroot/package/nilfs-utils/nilfs-utils.mk b/bsp/buildroot/package/nilfs-utils/nilfs-utils.mk
new file mode 100644
index 00000000..3fde94fd
--- /dev/null
+++ b/bsp/buildroot/package/nilfs-utils/nilfs-utils.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# nilfs-utils
+#
+################################################################################
+
+NILFS_UTILS_VERSION = v2.2.7
+NILFS_UTILS_SITE = $(call github,nilfs-dev,nilfs-utils,$(NILFS_UTILS_VERSION))
+NILFS_UTILS_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
+NILFS_UTILS_LICENSE_FILES = COPYING
+
+# need libuuid, libblkid, libmount
+NILFS_UTILS_DEPENDENCIES = host-pkgconf util-linux
+
+# we're fetching from github
+NILFS_UTILS_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
+NILFS_UTILS_CONF_OPTS += --with-selinux
+NILFS_UTILS_DEPENDENCIES += libselinux
+else
+NILFS_UTILS_CONF_OPTS += --without-selinux
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ninja/ninja.hash b/bsp/buildroot/package/ninja/ninja.hash
index 47ec8229..6334c042 100644
--- a/bsp/buildroot/package/ninja/ninja.hash
+++ b/bsp/buildroot/package/ninja/ninja.hash
@@ -1,2 +1,2 @@
 # Locally generated
-sha256 51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19  ninja-v1.7.1.tar.gz
+sha256 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4  ninja-v1.8.2.tar.gz
diff --git a/bsp/buildroot/package/ninja/ninja.mk b/bsp/buildroot/package/ninja/ninja.mk
index 3cfe4faf..259a87d2 100644
--- a/bsp/buildroot/package/ninja/ninja.mk
+++ b/bsp/buildroot/package/ninja/ninja.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NINJA_VERSION = v1.7.1
+NINJA_VERSION = v1.8.2
 NINJA_SITE = $(call github,ninja-build,ninja,$(NINJA_VERSION))
 NINJA_LICENSE = Apache-2.0
 NINJA_LICENSE_FILES = COPYING
@@ -16,7 +16,7 @@ define HOST_NINJA_BUILD_CMDS
 endef
 
 define HOST_NINJA_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/usr/bin/ninja
+	$(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/bin/ninja
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/nload/nload.mk b/bsp/buildroot/package/nload/nload.mk
index 1ead61ca..80d42a15 100644
--- a/bsp/buildroot/package/nload/nload.mk
+++ b/bsp/buildroot/package/nload/nload.mk
@@ -7,7 +7,7 @@
 NLOAD_VERSION = 0.7.4
 NLOAD_SITE = http://www.roland-riegel.de/nload
 NLOAD_DEPENDENCIES = ncurses
-NLOAD_LICENSE = GPLv2+
+NLOAD_LICENSE = GPL-2.0+
 NLOAD_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch b/bsp/buildroot/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch
new file mode 100644
index 00000000..ed5cae25
--- /dev/null
+++ b/bsp/buildroot/package/nmap/0002-configure.ac-fix-AC_CHECK_HEADER-call-to-test-for-li.patch
@@ -0,0 +1,30 @@
+From ff629766dbd3b5e179330ba4f07fd7e3d8384ec0 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Wed, 1 Nov 2017 15:30:40 +0100
+Subject: [PATCH] configure.ac: fix AC_CHECK_HEADER call to test for libssh2
+
+The -lm argument is passed as an argument to AC_CHECK_HEADER(), which
+doesn't make sense. The intention was to pass it as the fifth
+argument of AC_CHECK_LIB().
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3d00e164e..67db42e08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -674,7 +674,7 @@ AC_HELP_STRING([--without-libssh2], [Compile without libssh2]),
+       AC_CHECK_LIB(ssh2, libssh2_version,
+         [have_libssh2=yes
+         LIBSSH2_INC=$with_libssh2/include
+-        LIBSSH2_LIB=$with_libssh2/lib])],,[-lm])
++        LIBSSH2_LIB=$with_libssh2/lib],,[-lm])])
+ 
+     LDFLAGS=$_ldflags
+     CPPFLAGS=$_cppflags
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/nmap/nmap.hash b/bsp/buildroot/package/nmap/nmap.hash
index 239ca138..740ec7a0 100644
--- a/bsp/buildroot/package/nmap/nmap.hash
+++ b/bsp/buildroot/package/nmap/nmap.hash
@@ -1,2 +1,2 @@
-# From https://nmap.org/dist/sigs/nmap-7.40.tar.bz2.digest.txt
-sha256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188  nmap-7.40.tar.bz2
+# From https://nmap.org/dist/sigs/nmap-7.60.tar.bz2.digest.txt
+sha256 a8796ecc4fa6c38aad6139d9515dc8113023a82e9d787e5a5fb5fa1b05516f21  nmap-7.60.tar.bz2
diff --git a/bsp/buildroot/package/nmap/nmap.mk b/bsp/buildroot/package/nmap/nmap.mk
index 6e178b1f..ceb08ec0 100644
--- a/bsp/buildroot/package/nmap/nmap.mk
+++ b/bsp/buildroot/package/nmap/nmap.mk
@@ -4,16 +4,24 @@
 #
 ################################################################################
 
-NMAP_VERSION = 7.40
-NMAP_SITE = http://nmap.org/dist
+NMAP_VERSION = 7.60
+NMAP_SITE = https://nmap.org/dist
 NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2
-NMAP_DEPENDENCIES = libpcap pcre
+NMAP_DEPENDENCIES = libpcap pcre host-autoconf
 NMAP_CONF_OPTS = --without-liblua --without-zenmap \
 	--with-libdnet=included --with-liblinear=included \
 	--with-libpcre="$(STAGING_DIR)/usr" --without-ncat
-NMAP_LICENSE = GPLv2
+NMAP_LICENSE = GPL-2.0
 NMAP_LICENSE_FILES = COPYING
 
+# nmap doesn't autoreconf properly, so we just re-generate the
+# top-level configure script, since we are patching configure.ac.
+define NMAP_DO_AUTOCONF
+	(cd $(@D); $(HOST_DIR)/bin/autoconf)
+endef
+
+NMAP_PRE_CONFIGURE_HOOKS += NMAP_DO_AUTOCONF
+
 # needed by libpcap
 NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`
 
@@ -27,6 +35,14 @@ define NMAP_WRAPPER_EXEC
 endef
 NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC
 
+ifeq ($(BR2_PACKAGE_LIBSSH2),y)
+NMAP_CONF_OPTS += --with-libssh2="$(STAGING_DIR)/usr"
+NMAP_DEPENDENCIES += libssh2
+NMAP_LIBS_FOR_STATIC_LINK += `$(PKG_CONFIG_HOST_BINARY) --libs libssh2`
+else
+NMAP_CONF_OPTS += --without-libssh2
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr"
 NMAP_DEPENDENCIES += host-pkgconf openssl
diff --git a/bsp/buildroot/package/nmon/nmon.hash b/bsp/buildroot/package/nmon/nmon.hash
index f3a073ff..432f71d8 100644
--- a/bsp/buildroot/package/nmon/nmon.hash
+++ b/bsp/buildroot/package/nmon/nmon.hash
@@ -1,5 +1,5 @@
 # From https://sourceforge.net/projects/nmon/files/
-md5 a72e3eb737c230cd309329330a5545bd    lmon16f.c
-sha1    b69fdddf86ffe674e0133426fa09935ed678ab7d    lmon16f.c
+md5 246ccfc74d5af55d992601fc4d3d4a72  lmon16g.c
+sha1 926217a98f78dd398d4d5690d7b10b8b2b620168  lmon16g.c
 # Locally computed
-sha256  280a371e17488f8a2c5e0c64273155789be6fa5b937ab5c465488e591bdc5cd9    lmon16f.c
+sha256 da82dd693b503b062854dfe7dbb5d36b347872ab44a4aa05b97e9d577747f688  lmon16g.c
diff --git a/bsp/buildroot/package/nmon/nmon.mk b/bsp/buildroot/package/nmon/nmon.mk
index 9b9f8890..f561d6dc 100644
--- a/bsp/buildroot/package/nmon/nmon.mk
+++ b/bsp/buildroot/package/nmon/nmon.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-NMON_VERSION = 16f
-NMON_SITE = http://sourceforge.net/projects/nmon/files
+NMON_VERSION = 16g
+NMON_SITE = https://sourceforge.net/projects/nmon/files
 NMON_SOURCE = lmon$(NMON_VERSION).c
-NMON_LICENSE = GPLv3+
+NMON_LICENSE = GPL-3.0+
 NMON_LICENSE_FILES = $(NMON_SOURCE)
 NMON_DEPENDENCIES = ncurses
 NMON_CFLAGS = $(TARGET_CFLAGS) -D JFS -D GETUSER -D LARGEMEM -D DEBIAN
diff --git a/bsp/buildroot/package/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch b/bsp/buildroot/package/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch
deleted file mode 100644
index 75fe4375..00000000
--- a/bsp/buildroot/package/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Remove dependency on Python bz2 module
-
-The Python bz2 module is only needed in certain cases, so only import
-it when needed. In the normal nodejs build, this allows to remove the
-dependency on this module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/deps/v8/tools/js2c.py
-===================================================================
---- a/deps/v8/tools/js2c.py
-+++ b/deps/v8/tools/js2c.py
-@@ -33,7 +33,6 @@
- 
- import os, re, sys, string
- import jsmin
--import bz2
- 
- 
- def ToCAsciiArray(lines):
-@@ -344,6 +343,7 @@
-   else:
-     raw_sources_declaration = RAW_SOURCES_COMPRESSION_DECLARATION
-     if env['COMPRESSION'] == 'bz2':
-+      import bz2
-       all_sources = bz2.compress("".join(all_sources))
-     total_length = len(all_sources)
-     sources_data = ToCArray(all_sources)
diff --git a/bsp/buildroot/package/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch b/bsp/buildroot/package/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch
deleted file mode 100644
index a2f02abf..00000000
--- a/bsp/buildroot/package/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 00d809e9305241f8636a2d75e22c493293e6971a Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sun, 20 Apr 2014 15:03:01 +0200
-Subject: [PATCH] gyp: force link command to use CXX
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- tools/gyp/pylib/gyp/generator/make.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
-index 0de510e..54e4c96 100644
---- a/tools/gyp/pylib/gyp/generator/make.py
-+++ b/tools/gyp/pylib/gyp/generator/make.py
-@@ -134,7 +134,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
- # special "figure out circular dependencies" flags around the entire
- # input list during linking.
- quiet_cmd_link = LINK($(TOOLSET)) $@
--cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
-+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
- 
- # We support two kinds of shared objects (.so):
- # 1) shared_library, which is just bundling together many dependent libraries
--- 
-1.9.2
-
diff --git a/bsp/buildroot/package/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch b/bsp/buildroot/package/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch
deleted file mode 100644
index 128058df..00000000
--- a/bsp/buildroot/package/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 0bc482abeb814573251ecafb5a1e045c885b13a2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Mon, 25 May 2015 16:22:57 +0200
-Subject: [PATCH 1/1] Fix musl __USE_MISC issue
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The musl C library does not define __USE_MISC and so libuv (built-in dependency)
-does not use the correct struct stat definition for musl.
-
-The feature test macro __USE_MISC is defined by glibc if _BSD_SOURCE or
-_SVID_SOURCE is defined.
-
-The libuv build system enables the feature test macro _GNU_SOURCE for linux
-builds.
-
-Since glibc 2.19, defining _GNU_SOURCE also has the effect of implicitly
-defining _DEFAULT_SOURCE - the replacement for _BSD_SOURCE and _SVID_SOURCE.
-
-In glibc versions before 2.20, defining _GNU_SOURCE also had the effect of
-implicitly defining _BSD_SOURCE and _SVID_SOURCE. This is also true for uClibc.
-
-Alltogether, we can safely replace __USE_MISC by _GNU_SOURCE to support building
-nodejs 0.10.x with the musl C library.
-
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- deps/uv/src/fs-poll.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/uv/src/fs-poll.c b/deps/uv/src/fs-poll.c
-index ad27f18..094447e 100644
---- a/deps/uv/src/fs-poll.c
-+++ b/deps/uv/src/fs-poll.c
-@@ -198,7 +198,7 @@ static int statbuf_eq(const uv_statbuf_t* a, const uv_statbuf_t* b) {
- 
-   /* Jump through a few hoops to get sub-second granularity on Linux. */
- # if defined(__linux__)
--#  if defined(__USE_MISC) /* _BSD_SOURCE || _SVID_SOURCE */
-+#  if defined(_GNU_SOURCE) /* _BSD_SOURCE || _SVID_SOURCE */
-   if (a->st_ctim.tv_nsec != b->st_ctim.tv_nsec) return 0;
-   if (a->st_mtim.tv_nsec != b->st_mtim.tv_nsec) return 0;
- #  else
--- 
-2.4.1
-
diff --git a/bsp/buildroot/package/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch b/bsp/buildroot/package/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch
deleted file mode 100644
index 59b9d504..00000000
--- a/bsp/buildroot/package/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 1cc08f6ceacbb0e5ba1f4638ca3a97ac002d7792 Mon Sep 17 00:00:00 2001
-From: "Bark, Martin" <martin.bark@te.com>
-Date: Mon, 14 Dec 2015 13:26:10 +0000
-Subject: [PATCH 2/2] Fix support for uClibc-ng
-
-uClibc-ng is currently at v1.0.9.  The patch corrects the uClibc
-version test so that HAVE_IFADDRS_H is defined for uClibc versions
-after v0.9.32.
-
-Submitted upstream to libuv and accepted, see
-https://github.com/libuv/libuv/pull/653 and
-https://github.com/libuv/libuv/commit/c861972
-
-Signed-off-by: Bark, Martin <martin.bark@te.com>
----
- deps/uv/src/unix/linux-core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c
-index e6e6828..6cbbb71 100644
---- a/deps/uv/src/unix/linux-core.c
-+++ b/deps/uv/src/unix/linux-core.c
-@@ -39,7 +39,7 @@
- #define HAVE_IFADDRS_H 1
-
- #ifdef __UCLIBC__
--# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32
-+# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32
- #  undef HAVE_IFADDRS_H
- # endif
- #endif
---
-2.6.2
diff --git a/bsp/buildroot/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch b/bsp/buildroot/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch
new file mode 100644
index 00000000..079bbb43
--- /dev/null
+++ b/bsp/buildroot/package/nodejs/0001-check-if-uclibc-has-backtrace-support.patch
@@ -0,0 +1,26 @@
+From 7c69553d7275bbcaa88fada8ccd0d2d9f787e1ad Mon Sep 17 00:00:00 2001
+From: Martin Bark <martin@barkynet.com>
+Date: Sat, 4 Mar 2017 20:41:40 +0000
+Subject: [PATCH] check if uclibc has backtrace support
+
+Signed-off-by: Martin Bark <martin@barkynet.com>
+---
+ deps/v8/src/base/debug/stack_trace_posix.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/deps/v8/src/base/debug/stack_trace_posix.cc b/deps/v8/src/base/debug/stack_trace_posix.cc
+index 87c0a73..d2c182a 100644
+--- a/deps/v8/src/base/debug/stack_trace_posix.cc
++++ b/deps/v8/src/base/debug/stack_trace_posix.cc
+@@ -25,7 +25,7 @@
+ #include <string>
+ #include <vector>
+ 
+-#if V8_LIBC_GLIBC || V8_LIBC_BSD || V8_LIBC_UCLIBC || V8_OS_SOLARIS
++#if V8_LIBC_GLIBC || V8_LIBC_BSD || ( V8_LIBC_UCLIBC && __UCLIBC_HAS_BACKTRACE__ ) || V8_OS_SOLARIS
+ #define HAVE_EXECINFO_H 1
+ #endif
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/nodejs/6.12.2/0001-gyp-force-link-command-to-use-CXX.patch b/bsp/buildroot/package/nodejs/6.12.2/0001-gyp-force-link-command-to-use-CXX.patch
deleted file mode 100644
index 7b5a9947..00000000
--- a/bsp/buildroot/package/nodejs/6.12.2/0001-gyp-force-link-command-to-use-CXX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 90a3c113c19ec615249ab880c45c6c0a8d369098 Mon Sep 17 00:00:00 2001
-From: Martin Bark <martin@barkynet.com>
-Date: Tue, 30 Jun 2015 09:43:47 +0100
-Subject: [PATCH 2/4] gyp: force link command to use CXX
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-Signed-off-by: Martin Bark <martin@barkynet.com>
-[yann.morin.1998@free.fr: adapt to 4.1.2]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- tools/gyp/pylib/gyp/generator/make.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py
-index b88a433..0a1f2e0 100644
---- a/tools/gyp/pylib/gyp/generator/make.py
-+++ b/tools/gyp/pylib/gyp/generator/make.py
-@@ -147,7 +147,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
- # special "figure out circular dependencies" flags around the entire
- # input list during linking.
- quiet_cmd_link = LINK($(TOOLSET)) $@
--cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
-+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) $(LIBS) -Wl,--end-group
- 
- # We support two kinds of shared objects (.so):
- # 1) shared_library, which is just bundling together many dependent libraries
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/nodejs/6.12.2/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch b/bsp/buildroot/package/nodejs/6.12.2/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch
deleted file mode 100644
index c22311ed..00000000
--- a/bsp/buildroot/package/nodejs/6.12.2/0002-src-add-HAVE_OPENSSL-directive-to-openssl_config.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e1d8899c28997613505d288d22bfb95470d606a1 Mon Sep 17 00:00:00 2001
-From: Daniel Bevenius <daniel.bevenius@gmail.com>
-Date: Tue, 28 Feb 2017 20:04:12 +0100
-Subject: [PATCH] src: add HAVE_OPENSSL directive to openssl_config
-
-Currently when building with the following configuration options:
-$ ./configure --without-ssl && make
-
-The following link error is reported:
-
-Undefined symbols for architecture x86_64:
-  "node::openssl_config", referenced from:
-      node::Init(int*, char const**, int*, char const***) in node.o
-ld: symbol(s) not found for architecture x86_64
-clang: error: linker command failed with exit code 1 (use -v to see
-invocation)
-
-Adding an HAVE_OPENSSL directive around this code allows the build to
-pass.
-
-PR-URL: https://github.com/nodejs/node/pull/11618
-Reviewed-By: Anna Henningsen <anna@addaleax.net>
-Reviewed-By: James M Snell <jasnell@gmail.com>
-Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
-Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
-Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/node.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/node.cc b/src/node.cc
-index 57415bba41..ec78339d89 100644
---- a/src/node.cc
-+++ b/src/node.cc
-@@ -4389,8 +4389,10 @@ void Init(int* argc,
-   V8::SetFlagsFromString(NODE_V8_OPTIONS, sizeof(NODE_V8_OPTIONS) - 1);
- #endif
- 
-+#if HAVE_OPENSSL
-   if (openssl_config.empty())
-     SafeGetenv("OPENSSL_CONF", &openssl_config);
-+#endif
- 
-   // Parse a few arguments which are specific to Node.
-   int v8_argc;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/nodejs/Config.in b/bsp/buildroot/package/nodejs/Config.in
index c88baaff..d2846f8d 100644
--- a/bsp/buildroot/package/nodejs/Config.in
+++ b/bsp/buildroot/package/nodejs/Config.in
@@ -1,21 +1,23 @@
-comment "nodejs needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.8, wchar"
+config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS
+	bool
+	# On ARM, at least ARMv6+ with VFPv2+ is needed
+	default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 && BR2_ARM_CPU_HAS_VFPV2
+	default y if BR2_mipsel && !BR2_MIPS_SOFT_FLOAT
+	default y if BR2_aarch64 || BR2_i386 || BR2_x86_64
+	# libuv
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+
+comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.8, wchar"
 	depends on BR2_USE_MMU
-	depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel
-	depends on !BR2_MIPS_SOFT_FLOAT
-	depends on !BR2_ARM_CPU_ARMV4
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
+	depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		!BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_NODEJS
 	bool "nodejs"
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel
-	depends on !BR2_MIPS_SOFT_FLOAT
-	# ARM needs BLX, so v5t+
-	depends on !BR2_ARM_CPU_ARMV4
-	# 0.10.x could be built without the following toolchain dependencies but
-	# simplify things by requiring these basic dependencies for all versions.
+	depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS
 	depends on BR2_HOST_GCC_AT_LEAST_4_8
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on BR2_USE_WCHAR
@@ -24,57 +26,30 @@ config BR2_PACKAGE_NODEJS
 	# uses dlopen(). On ARMv5, we could technically support static
 	# linking, but that's too much of a corner case to support it.
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_C_ARES
+	select BR2_PACKAGE_LIBHTTPPARSER
+	select BR2_PACKAGE_LIBUV
 	select BR2_PACKAGE_ZLIB
 	help
-	  Event-driven I/O server-side JavaScript environment based on V8.
+	  Event-driven I/O server-side JavaScript environment based on
+	  V8.
 
 	  http://nodejs.org/
 
 if BR2_PACKAGE_NODEJS
 
-# Starting with 0.12.x, on ARM, V8 (the JS engine)
-# now requires an armv6+ and a VFPv2+.
-config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
-	bool
-	# On supported architectures other than ARM, no special requirement
-	default y if !BR2_arm
-	# On ARM, at least ARMv6+ with VFPv2+ is needed
-	default y if !BR2_ARM_CPU_ARMV5 && BR2_ARM_CPU_HAS_VFPV2
-
-config BR2_PACKAGE_NODEJS_VERSION_STRING
-	string
-	default "6.12.2"		if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
-	default "0.10.48"
-
 config BR2_PACKAGE_NODEJS_NPM
 	bool "NPM for the target"
 	select BR2_PACKAGE_OPENSSL
 	help
 	  NPM is the package manager for the Node JavaScript platform.
-	  Note that enabling NPM on the target also selects OpenSSL for the
-	  target.
+	  Note that enabling NPM on the target also selects OpenSSL
+	  for the target.
 
 	  http://www.npmjs.org
 
 	  Note that NPM is always built for the buildroot host.
 
-config BR2_PACKAGE_NODEJS_MODULES_EXPRESS
-	bool "Express web application framework"
-	help
-	  Express is a minimal and flexible node.js web application
-	  framework, providing a robust set of features for building
-	  single and multi-page, and hybrid web applications.
-
-	  http://www.expressjs.com
-	  https://github.com/visionmedia/express
-
-config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT
-	bool "CoffeeScript"
-	help
-	  CoffeeScript is a little language that compiles into JavaScript.
-
-	  http://www.coffeescript.org
-
 config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL
 	string "Additional modules"
 	help
@@ -84,20 +59,23 @@ config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL
 	  download and save tgz files or clone git repos for the
 	  components you care about.
 
-	  Example: serialport uglify-js@1.3.4 /my/module/mymodule.tgz git://github.com/someuser/somemodule.git#v1.2
+	  Example:
+	  serialport uglify-js@1.3.4 /my/module/mymodule.tgz \
+	    git://github.com/someuser/somemodule.git#v1.2
 
-	  This would install the serialport module (at the newest version),
-	  the uglify-js module at 1.3.4, a module from a filesystem path,
-	  and a module from a git repository.
+	  This would install the serialport module (at the newest
+	  version), the uglify-js module at 1.3.4, a module from a
+	  filesystem path, and a module from a git repository.
 
 config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS
 	string "Additional module dependencies"
 	help
-	  List of space-separated buildroot recipes which must be built before
-	  your npms can be installed. For example, if in 'Additional modules'
-	  you specified 'node-curl' (see:
-	  https://github.com/jiangmiao/node-curl), you could then specify
-	  'libcurl' here, to ensure that buildroot builds the libcurl package,
-	  and does so before building your node modules.
+	  List of space-separated buildroot recipes which must be
+	  built before your npms can be installed. For example, if in
+	  'Additional modules' you specified 'node-curl' (see:
+	  https://github.com/jiangmiao/node-curl), you could then
+	  specify 'libcurl' here, to ensure that buildroot builds the
+	  libcurl package, and does so before building your node
+	  modules.
 
 endif
diff --git a/bsp/buildroot/package/nodejs/nodejs.hash b/bsp/buildroot/package/nodejs/nodejs.hash
index f82ce1e3..82851722 100644
--- a/bsp/buildroot/package/nodejs/nodejs.hash
+++ b/bsp/buildroot/package/nodejs/nodejs.hash
@@ -1,5 +1,5 @@
-# From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt
-sha256  365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e  node-v0.10.48.tar.xz
+# From http://nodejs.org/dist/v8.11.4/SHASUMS256.txt
+sha256 fbce7de6d96b0bcb0db0bf77f0e6ea999b6755e6930568aedaab06847552a609  node-v8.11.4.tar.xz
 
-# From upstream URL: http://nodejs.org/dist/v6.12.2/SHASUMS256.txt
-sha256  33677c1fcf6a2f35d2718834fd0afdb36166b0cc68349820e05d8f9316b1dafc  node-v6.12.2.tar.xz
+# Hash for license file
+sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5  LICENSE
diff --git a/bsp/buildroot/package/nodejs/nodejs.mk b/bsp/buildroot/package/nodejs/nodejs.mk
index 042cc3fb..e2c94ba8 100644
--- a/bsp/buildroot/package/nodejs/nodejs.mk
+++ b/bsp/buildroot/package/nodejs/nodejs.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING))
+NODEJS_VERSION = 8.11.4
 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz
 NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION)
-NODEJS_DEPENDENCIES = host-python host-nodejs zlib \
+NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \
+	libhttpparser libuv zlib \
 	$(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS))
 HOST_NODEJS_DEPENDENCIES = host-python host-zlib
 NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components)
@@ -16,6 +17,9 @@ NODEJS_LICENSE_FILES = LICENSE
 NODEJS_CONF_OPTS = \
 	--without-snapshot \
 	--shared-zlib \
+	--shared-cares \
+	--shared-http-parser \
+	--shared-libuv \
 	--without-dtrace \
 	--without-etw \
 	--dest-os=linux
@@ -27,15 +31,12 @@ else
 NODEJS_CONF_OPTS += --without-ssl
 endif
 
-# 0.10.x does not have icu support
-ifeq ($(findstring 0.10.,$(NODEJS_VERSION)),)
 ifeq ($(BR2_PACKAGE_ICU),y)
 NODEJS_DEPENDENCIES += icu
 NODEJS_CONF_OPTS += --with-intl=system-icu
 else
 NODEJS_CONF_OPTS += --with-intl=none
 endif
-endif
 
 ifneq ($(BR2_PACKAGE_NODEJS_NPM),y)
 NODEJS_CONF_OPTS += --without-npm
@@ -47,7 +48,7 @@ define HOST_NODEJS_CONFIGURE_CMDS
 	# The build system directly calls python. Work around this by forcing python2
 	# into PATH. See https://github.com/nodejs/node/issues/2735
 	mkdir -p $(@D)/bin
-	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
+	ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python
 
 	# Build with the static, built-in OpenSSL which is supplied as part of
 	# the nodejs source distribution.  This is needed on the host because
@@ -56,28 +57,30 @@ define HOST_NODEJS_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(HOST_CONFIGURE_OPTS) \
 		PATH=$(@D)/bin:$(BR_PATH) \
-		PYTHON=$(HOST_DIR)/usr/bin/python2 \
-		$(HOST_DIR)/usr/bin/python2 ./configure \
-		--prefix=$(HOST_DIR)/usr \
+		PYTHON=$(HOST_DIR)/bin/python2 \
+		$(HOST_DIR)/bin/python2 ./configure \
+		--prefix=$(HOST_DIR) \
 		--without-snapshot \
 		--without-dtrace \
 		--without-etw \
 		--shared-zlib \
-		$(if $(BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS),--with-intl=none) \
+		--with-intl=none \
 	)
 endef
 
 define HOST_NODEJS_BUILD_CMDS
-	$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
 		$(MAKE) -C $(@D) \
 		$(HOST_CONFIGURE_OPTS) \
+		NO_LOAD=cctest.target.mk \
 		PATH=$(@D)/bin:$(BR_PATH)
 endef
 
 define HOST_NODEJS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	$(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
 		$(MAKE) -C $(@D) install \
 		$(HOST_CONFIGURE_OPTS) \
+		NO_LOAD=cctest.target.mk \
 		PATH=$(@D)/bin:$(BR_PATH)
 endef
 
@@ -111,14 +114,14 @@ endif
 
 define NODEJS_CONFIGURE_CMDS
 	mkdir -p $(@D)/bin
-	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python
+	ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python
 
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS) \
 		PATH=$(@D)/bin:$(BR_PATH) \
 		LD="$(TARGET_CXX)" \
-		PYTHON=$(HOST_DIR)/usr/bin/python2 \
-		$(HOST_DIR)/usr/bin/python2 ./configure \
+		PYTHON=$(HOST_DIR)/bin/python2 \
+		$(HOST_DIR)/bin/python2 ./configure \
 		--prefix=/usr \
 		--dest-cpu=$(NODEJS_CPU) \
 		$(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \
@@ -129,20 +132,18 @@ define NODEJS_CONFIGURE_CMDS
 endef
 
 define NODEJS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
 		$(MAKE) -C $(@D) \
 		$(TARGET_CONFIGURE_OPTS) \
+		NO_LOAD=cctest.target.mk \
 		PATH=$(@D)/bin:$(BR_PATH) \
 		LD="$(TARGET_CXX)"
 endef
 
 #
-# Build the list of modules to install based on the booleans for
-# popular modules, as well as the "additional modules" list.
+# Build the list of modules to install.
 #
 NODEJS_MODULES_LIST= $(call qstrip,\
-	$(if $(BR2_PACKAGE_NODEJS_MODULES_EXPRESS),express) \
-	$(if $(BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT),coffee-script) \
 	$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL))
 
 # Define NPM for other packages to use
@@ -153,7 +154,7 @@ NPM = $(TARGET_CONFIGURE_OPTS) \
 	npm_config_build_from_source=true \
 	npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \
 	npm_config_prefix=$(TARGET_DIR)/usr \
-	$(HOST_DIR)/usr/bin/npm
+	$(HOST_DIR)/bin/npm
 
 #
 # We can only call NPM if there's something to install.
@@ -168,10 +169,11 @@ endef
 endif
 
 define NODEJS_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	$(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \
 		$(MAKE) -C $(@D) install \
 		DESTDIR=$(TARGET_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
+		NO_LOAD=cctest.target.mk \
 		PATH=$(@D)/bin:$(BR_PATH) \
 		LD="$(TARGET_CXX)"
 	$(NODEJS_INSTALL_MODULES)
diff --git a/bsp/buildroot/package/nodm/Config.in b/bsp/buildroot/package/nodm/Config.in
index 97ce8c39..38171e8d 100644
--- a/bsp/buildroot/package/nodm/Config.in
+++ b/bsp/buildroot/package/nodm/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_NODM
 	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
 	depends on !BR2_STATIC_LIBS # linux-pam
 	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs wordexp.h
 	depends on BR2_USE_MMU # linux-pam
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_LINUX_PAM
@@ -19,8 +18,7 @@ config BR2_PACKAGE_NODM
 
 	  https://github.com/spanezz/nodm/
 
-comment "nodm needs a glibc toolchain w/ wchar, locale, dynamic library"
+comment "nodm needs a glibc or uClibc toolchain w/ wchar, locale, dynamic library"
 	depends on BR2_PACKAGE_XORG7
 	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL \
-		|| BR2_TOOLCHAIN_USES_UCLIBC
+		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
diff --git a/bsp/buildroot/package/nodm/nodm.hash b/bsp/buildroot/package/nodm/nodm.hash
index e11e8756..2a70c686 100644
--- a/bsp/buildroot/package/nodm/nodm.hash
+++ b/bsp/buildroot/package/nodm/nodm.hash
@@ -1,2 +1,2 @@
 # locally calculated
-sha256  840939d27d3d9b02ad09e1cffce24729bcdeee6cea6b3f0037d8ae76b49feecd  nodm-0.12-1.tar.gz
+sha256 ef11667ae82846801a9633df36c20f632cc03319bb1da35f062ac0f950771273  nodm-0.13.tar.gz
diff --git a/bsp/buildroot/package/nodm/nodm.mk b/bsp/buildroot/package/nodm/nodm.mk
index da6bc850..a5afd53b 100644
--- a/bsp/buildroot/package/nodm/nodm.mk
+++ b/bsp/buildroot/package/nodm/nodm.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NODM_VERSION = 0.12-1
-NODM_SITE = $(call github,spanezz,nodm,debian/$(NODM_VERSION))
-NODM_LICENSE = GPLv2+
+NODM_VERSION = 0.13
+NODM_SITE = $(call github,spanezz,nodm,$(NODM_VERSION))
+NODM_LICENSE = GPL-2.0+
 NODM_LICENSE_FILES = COPYING
 NODM_AUTORECONF = YES
 
diff --git a/bsp/buildroot/package/noip/noip.mk b/bsp/buildroot/package/noip/noip.mk
index a61d1418..b7fcc84e 100644
--- a/bsp/buildroot/package/noip/noip.mk
+++ b/bsp/buildroot/package/noip/noip.mk
@@ -7,7 +7,7 @@
 NOIP_VERSION = 2.1.9
 NOIP_SITE = http://www.no-ip.com/client/linux
 NOIP_SOURCE = noip-duc-linux.tar.gz
-NOIP_LICENSE = GPLv2+
+NOIP_LICENSE = GPL-2.0+
 NOIP_LICENSE_FILES = COPYING
 
 define NOIP_BUILD_CMDS
diff --git a/bsp/buildroot/package/norm/0003-fix-const-qualifier-gcc7.patch b/bsp/buildroot/package/norm/0003-fix-const-qualifier-gcc7.patch
new file mode 100644
index 00000000..57e01f9c
--- /dev/null
+++ b/bsp/buildroot/package/norm/0003-fix-const-qualifier-gcc7.patch
@@ -0,0 +1,46 @@
+protolib: remove const qualifiers in ProtoSortedTreeTemplate
+
+The methods PeekPrevItem() and PeekNextItem() in
+ProtoSortedTreeTemplate were using a const qualifier, but not the
+corresponding methods in ProtoSortedTree, causing a build failure with
+gcc 7.x:
+
+norm-1.5r6/protolib/include/protoTree.h: In member function 'ITEM_TYPE* ProtoSortedTreeTemplate<ITEM_TYPE>::Iterator::PeekPrevItem() const':
+norm-1.5r6/protolib/include/protoTree.h:652:93: error: no matching function for call to 'ProtoSortedTreeTemplate<ITEM_TYPE>::Iterator::PeekPrevItem() const'
+                     {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekPrevItem());}
+                                                                                             ^
+norm-1.5r6/protolib/include/protoTree.h:565:23: note: candidate: ProtoSortedTree::Item* ProtoSortedTree::Iterator::PeekPrevItem() <near match>
+                 Item* PeekPrevItem()
+                       ^~~~~~~~~~~~
+
+Since the same methods in ProtoTreeTemplate don't have the const
+qualifier, we take the simple solution of dropping such qualifiers
+from ProtoSortedTreeTemplate as well, which fixes the build of norm
+with gcc 7.x.
+
+Many thanks to Romain Naour <romain.naour@gmail.com> for pointing out
+the solution.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Patch has been submitted upstream and accepted, but mailing list
+archive not updated.]
+
+Index: b/protolib/include/protoTree.h
+===================================================================
+--- a/protolib/include/protoTree.h
++++ b/protolib/include/protoTree.h
+@@ -648,12 +648,12 @@
+                 
+                 ITEM_TYPE* GetPrevItem()
+                     {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::GetPrevItem());}
+-                ITEM_TYPE* PeekPrevItem() const
++                ITEM_TYPE* PeekPrevItem()
+                     {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekPrevItem());}
+                 
+                 ITEM_TYPE* GetNextItem()
+                     {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::GetNextItem());}
+-                ITEM_TYPE* PeekNextItem() const
++                ITEM_TYPE* PeekNextItem()
+                     {return static_cast<ITEM_TYPE*>(ProtoSortedTree::Iterator::PeekNextItem());}
+ 
+         };  // end class ProtoSortedTreeTemplate::Iterator
diff --git a/bsp/buildroot/package/nss-mdns/nss-mdns.mk b/bsp/buildroot/package/nss-mdns/nss-mdns.mk
index 9ec9c1af..407b9426 100644
--- a/bsp/buildroot/package/nss-mdns/nss-mdns.mk
+++ b/bsp/buildroot/package/nss-mdns/nss-mdns.mk
@@ -6,7 +6,7 @@
 
 NSS_MDNS_VERSION = 0.10
 NSS_MDNS_SITE = http://0pointer.de/lennart/projects/nss-mdns
-NSS_MDNS_LICENSE = LGPLv2.1+
+NSS_MDNS_LICENSE = LGPL-2.1+
 NSS_MDNS_LICENSE_FILES = LICENSE
 
 define NSS_MDNS_INSTALL_CONFIG
diff --git a/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash b/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash
index b931e6fc..66cb7940 100644
--- a/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash
+++ b/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.hash
@@ -1,4 +1,4 @@
-# From http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.6.tar.gz.md5
-md5	fa5ec49cb54428d6c73e244a11021695	nss-pam-ldapd-0.9.6.tar.gz
+# From https://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.8.tar.gz.md5
+md5 8c99fdc54f4bf9aca8c5f53fdb1403ff  nss-pam-ldapd-0.9.8.tar.gz
 # Locally computed:
-sha256	101d5a7fa10549cc77be48d07f2b8141f59182f10f2cc0fea93efd13c3a5a6f2	nss-pam-ldapd-0.9.5.tar.gz
+sha256 ef7362e7f2003da8c7beb7bcc03c30494acf712625aaac8badc6e7eb16f3453f  nss-pam-ldapd-0.9.8.tar.gz
diff --git a/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk b/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk
index f588e157..c094db96 100644
--- a/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk
+++ b/bsp/buildroot/package/nss-pam-ldapd/nss-pam-ldapd.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-NSS_PAM_LDAPD_VERSION = 0.9.6
+NSS_PAM_LDAPD_VERSION = 0.9.8
 NSS_PAM_LDAPD_SITE = http://arthurdejong.org/nss-pam-ldapd
-NSS_PAM_LDAPD_LICENSE = LGPLv2.1+
+NSS_PAM_LDAPD_LICENSE = LGPL-2.1+
 NSS_PAM_LDAPD_LICENSE_FILES = COPYING
 NSS_PAM_LDAPD_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/ntfs-3g/0001-libfuse-util-include-paths.h-when-needed.patch b/bsp/buildroot/package/ntfs-3g/0001-libfuse-util-include-paths.h-when-needed.patch
deleted file mode 100644
index 1765f68c..00000000
--- a/bsp/buildroot/package/ntfs-3g/0001-libfuse-util-include-paths.h-when-needed.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From da021ed297ff7a69f3b7532ef68a9b6877a55265 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 20 Aug 2016 11:05:27 +0200
-Subject: [PATCH] libfuse-util: include <paths.h> when needed
-
-Both fusermount.c and mount_util.c use _PATH_MOUNTED, so they should
-include <paths.h>, which provides this definition.
-
-This fixes the build with the musl C library.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- libfuse-lite/fusermount.c | 1 +
- libfuse-lite/mount_util.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/libfuse-lite/fusermount.c b/libfuse-lite/fusermount.c
-index 4e724db..680fee1 100644
---- a/libfuse-lite/fusermount.c
-+++ b/libfuse-lite/fusermount.c
-@@ -19,6 +19,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <pwd.h>
-+#include <paths.h>
- 
- #ifdef __SOLARIS__
- #include <sys/mnttab.h>
-diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c
-index 8ea5e08..8b31722 100644
---- a/libfuse-lite/mount_util.c
-+++ b/libfuse-lite/mount_util.c
-@@ -15,6 +15,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <limits.h>
-+#include <paths.h>
- #include <sys/stat.h>
- #include <sys/wait.h>
- #ifdef __SOLARIS__
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/ntfs-3g/ntfs-3g.hash b/bsp/buildroot/package/ntfs-3g/ntfs-3g.hash
index eaa3d987..2e0b06fd 100644
--- a/bsp/buildroot/package/ntfs-3g/ntfs-3g.hash
+++ b/bsp/buildroot/package/ntfs-3g/ntfs-3g.hash
@@ -1,3 +1,2 @@
 # Locally calculated
-sha256 d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0 ntfs-3g_ntfsprogs-2016.2.22.tgz
-sha256 43deadaeade489934b0b45e2ed8aa5f853ad0364fbde7ad144211b80132ea041  0003-CVE-2017-0358.patch
+sha256 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5  ntfs-3g_ntfsprogs-2017.3.23.tgz
diff --git a/bsp/buildroot/package/ntfs-3g/ntfs-3g.mk b/bsp/buildroot/package/ntfs-3g/ntfs-3g.mk
index 6e1a8f94..5f23eae9 100644
--- a/bsp/buildroot/package/ntfs-3g/ntfs-3g.mk
+++ b/bsp/buildroot/package/ntfs-3g/ntfs-3g.mk
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-NTFS_3G_VERSION = 2016.2.22
+NTFS_3G_VERSION = 2017.3.23
 NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz
 NTFS_3G_SITE = http://tuxera.com/opensource
-NTFS_3G_PATCH = https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch
 NTFS_3G_CONF_OPTS = --disable-ldconfig
 NTFS_3G_INSTALL_STAGING = YES
 NTFS_3G_DEPENDENCIES = host-pkgconf
-NTFS_3G_LICENSE = GPLv2+, LGPLv2+
+NTFS_3G_LICENSE = GPL-2.0+, LGPL-2.0+
 NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB
 
 ifeq ($(BR2_PACKAGE_LIBFUSE),y)
diff --git a/bsp/buildroot/package/ntp/Config.in b/bsp/buildroot/package/ntp/Config.in
index 8ce9a5b0..efd47e18 100644
--- a/bsp/buildroot/package/ntp/Config.in
+++ b/bsp/buildroot/package/ntp/Config.in
@@ -30,16 +30,16 @@ config BR2_PACKAGE_NTP_NTP_WAIT
 	depends on BR2_PACKAGE_PERL
 	help
 	  ntp-wait waits until the locally running ntpd is in state 4
-	  (synchronized). This could be useful at boot time, to delay the
-	  boot sequence until after "ntpd -g" has set the time.
+	  (synchronized). This could be useful at boot time, to delay
+	  the boot sequence until after "ntpd -g" has set the time.
 
 config BR2_PACKAGE_NTP_NTPD
 	bool "ntpd"
 	default y
 	help
 	  ntpd is the time synchronization daemon keeping your local
-	  system date and time in sync and optionally serving time and date
-	  information on the network via the NTP protocol.
+	  system date and time in sync and optionally serving time and
+	  date information on the network via the NTP protocol.
 
 config BR2_PACKAGE_NTP_NTPD_ATOM_PPS
 	bool "PPS support"
@@ -51,8 +51,8 @@ config BR2_PACKAGE_NTP_NTPD_ATOM_PPS
 config BR2_PACKAGE_NTP_NTPDATE
 	bool "ntpdate"
 	help
-	  The ntpdate utility program is used to set the local date and time
-	  from an NTP server given as an argument.
+	  The ntpdate utility program is used to set the local date
+	  and time from an NTP server given as an argument.
 
 config BR2_PACKAGE_NTP_NTPDC
 	bool "ntpdc"
@@ -63,8 +63,9 @@ config BR2_PACKAGE_NTP_NTPDC
 config BR2_PACKAGE_NTP_NTPQ
 	bool "ntpq"
 	help
-	  The ntpq utility program is used to query NTP servers requesting
-	  information about current state and/or changes in that state.
+	  The ntpq utility program is used to query NTP servers
+	  requesting information about current state and/or changes in
+	  that state.
 
 config BR2_PACKAGE_NTP_NTPSNMPD
 	bool "ntpsnmpd"
@@ -76,16 +77,16 @@ config BR2_PACKAGE_NTP_NTPSNMPD
 config BR2_PACKAGE_NTP_NTPTIME
 	bool "ntptime"
 	help
-	  The ntptime utility program is used to read and set kernel time
-	  variables.
+	  The ntptime utility program is used to read and set kernel
+	  time variables.
 
 config BR2_PACKAGE_NTP_NTPTRACE
 	bool "ntptrace"
 	depends on BR2_PACKAGE_PERL
 	help
-	  ntptrace is a perl script that uses the ntpq utility program to
-	  follow the chain of NTP servers from a given host back to the
-	  primary time source
+	  ntptrace is a perl script that uses the ntpq utility program
+	  to follow the chain of NTP servers from a given host back to
+	  the primary time source
 
 config BR2_PACKAGE_NTP_TICKADJ
 	bool "tickadj"
diff --git a/bsp/buildroot/package/ntp/ntp.mk b/bsp/buildroot/package/ntp/ntp.mk
index b7172153..b5e2c1e0 100644
--- a/bsp/buildroot/package/ntp/ntp.mk
+++ b/bsp/buildroot/package/ntp/ntp.mk
@@ -8,7 +8,7 @@ NTP_VERSION_MAJOR = 4.2
 NTP_VERSION = $(NTP_VERSION_MAJOR).8p11
 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR)
 NTP_DEPENDENCIES = host-pkgconf libevent $(if $(BR2_PACKAGE_BUSYBOX),busybox)
-NTP_LICENSE = ntp license
+NTP_LICENSE = NTP
 NTP_LICENSE_FILES = COPYRIGHT
 NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
 NTP_CONF_OPTS = \
@@ -17,12 +17,12 @@ NTP_CONF_OPTS = \
 	--disable-tickadj \
 	--disable-debugging \
 	--with-yielding-select=yes \
-	--disable-local-libevent \
+	--disable-local-libevent
 
 # 0002-ntp-syscalls-fallback.patch
 NTP_AUTORECONF = YES
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
 NTP_CONF_OPTS += --with-crypto --enable-openssl-random
 NTP_DEPENDENCIES += openssl
 else
diff --git a/bsp/buildroot/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch b/bsp/buildroot/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
new file mode 100644
index 00000000..ebb934f6
--- /dev/null
+++ b/bsp/buildroot/package/numactl/0001-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
@@ -0,0 +1,35 @@
+From 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Fri, 12 Feb 2016 19:25:02 +0100
+Subject: [PATCH] Fix usage of __GLIBC_PREREQ for non-glibc toolchains
+
+The way __GLIBC_PREREQ() is currently used means that it's evaluated
+even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will
+not exist if __GLIBC__ is not defined, causing build failures on C
+libraries not defining __GLIBC__ such as the musl C library.
+
+Patch originally taken from:
+https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: Reworked to fix uClibc]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Thomas: improve patch description.]
+[Upstream commit: https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.]
+---
+ syscall.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/syscall.c b/syscall.c
+index 4589b85..37782d9 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -115,7 +115,7 @@
+ 
+ #endif
+ 
+-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
++#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 11)
+ 
+ /* glibc 2.11 seems to have working 6 argument sycall. Use the
+    glibc supplied syscall in this case.
diff --git a/bsp/buildroot/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch b/bsp/buildroot/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
new file mode 100644
index 00000000..a98fd724
--- /dev/null
+++ b/bsp/buildroot/package/numactl/0002-Fix-usage-of-GLIBC_PREREQ-for-non-glibc-toolchains.patch
@@ -0,0 +1,39 @@
+From 31dc2951c758698bff060aeae8ffd8854616183b Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Fri, 12 Feb 2016 19:25:02 +0100
+Subject: [PATCH] Fix usage of __GLIBC_PREREQ for non-glibc toolchains
+
+The way __GLIBC_PREREQ() is currently used means that it's evaluated
+even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will
+not exist if __GLIBC__ is not defined, causing build failures on C
+libraries not defining __GLIBC__ such as the musl C library.
+
+Patch originally taken from:
+https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Bernd: Reworked to fix uClibc]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Thomas: improve patch description.]
+[Upstream commit: https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b]
+---
+ syscall.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/syscall.c b/syscall.c
+index 37782d9..255853d 100644
+--- a/syscall.c
++++ b/syscall.c
+@@ -115,7 +115,11 @@
+ 
+ #endif
+ 
+-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 11)
++#ifndef __GLIBC_PREREQ
++# define __GLIBC_PREREQ(x,y) 0
++#endif
++
++#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
+ 
+ /* glibc 2.11 seems to have working 6 argument sycall. Use the
+    glibc supplied syscall in this case.
diff --git a/bsp/buildroot/package/numactl/Config.in b/bsp/buildroot/package/numactl/Config.in
index f18e28d9..95057d3c 100644
--- a/bsp/buildroot/package/numactl/Config.in
+++ b/bsp/buildroot/package/numactl/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_NUMACTL
 	bool "numactl"
 	# numactl uses some system calls that are not available on all
 	# architectures.
-	depends on BR2_i386 || BR2_mips || BR2_mipsel || \
+	depends on BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel || \
 		BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64
 	help
 	  numactl allows you to run your application on specific cpus
diff --git a/bsp/buildroot/package/numactl/numactl.hash b/bsp/buildroot/package/numactl/numactl.hash
index 77ccfae6..c36e24d6 100644
--- a/bsp/buildroot/package/numactl/numactl.hash
+++ b/bsp/buildroot/package/numactl/numactl.hash
@@ -1,4 +1,2 @@
 # Locally calculated
 sha256	450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861	numactl-2.0.11.tar.gz
-sha256	1f4c813cc8c81fa4dfd0be959457a5c3de8fc3316bbc80de3aa1d9ef9992b2b6	3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch
-sha256	0c4cb6550b46976f2a21087490420b218e62ead7d9b178120ad782d53a7ad3a6	31dc2951c758698bff060aeae8ffd8854616183b.patch
diff --git a/bsp/buildroot/package/numactl/numactl.mk b/bsp/buildroot/package/numactl/numactl.mk
index e2d2590c..d37ee9e8 100644
--- a/bsp/buildroot/package/numactl/numactl.mk
+++ b/bsp/buildroot/package/numactl/numactl.mk
@@ -6,10 +6,7 @@
 
 NUMACTL_VERSION = 2.0.11
 NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download
-NUMACTL_PATCH = \
-	https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch \
-	https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b.patch
-NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
+NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs)
 NUMACTL_LICENSE_FILES = README
 NUMACTL_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/nut/Config.in b/bsp/buildroot/package/nut/Config.in
index 659c9586..df647b9b 100644
--- a/bsp/buildroot/package/nut/Config.in
+++ b/bsp/buildroot/package/nut/Config.in
@@ -9,9 +9,10 @@ config BR2_PACKAGE_NUT
 	help
 	  Network UPS tools
 
-	  The primary goal of the Network UPS Tools (NUT) project is to provide
-	  support for Power Devices, such as Uninterruptible Power Supplies,
-	  Power Distribution Units and Solar Controllers.
+	  The primary goal of the Network UPS Tools (NUT) project is
+	  to provide support for Power Devices, such as
+	  Uninterruptible Power Supplies, Power Distribution Units and
+	  Solar Controllers.
 
 	  http://www.networkupstools.org/
 
@@ -20,7 +21,7 @@ if BR2_PACKAGE_NUT
 config BR2_PACKAGE_NUT_DRIVERS
 	string "drivers"
 	help
-	  Select the individual drivers to enable, in a comma-separated list.
-	  Leave empty for all.
+	  Select the individual drivers to enable, in a
+	  comma-separated list. Leave empty for all.
 
 endif # BR2_PACKAGE_NUT
diff --git a/bsp/buildroot/package/nut/nut.mk b/bsp/buildroot/package/nut/nut.mk
index adc64c90..4ea99471 100644
--- a/bsp/buildroot/package/nut/nut.mk
+++ b/bsp/buildroot/package/nut/nut.mk
@@ -7,7 +7,7 @@
 NUT_VERSION_MAJOR = 2.7
 NUT_VERSION = $(NUT_VERSION_MAJOR).4
 NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR)
-NUT_LICENSE = GPLv2+, GPLv3+ (python scripts), GPL/Artistic (perl client)
+NUT_LICENSE = GPL-2.0+, GPL-3.0+ (python scripts), GPL/Artistic (perl client)
 NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3
 NUT_DEPENDENCIES = host-pkgconf
 
diff --git a/bsp/buildroot/package/nuttcp/nuttcp.mk b/bsp/buildroot/package/nuttcp/nuttcp.mk
index 455875a8..2636f950 100644
--- a/bsp/buildroot/package/nuttcp/nuttcp.mk
+++ b/bsp/buildroot/package/nuttcp/nuttcp.mk
@@ -7,7 +7,7 @@
 NUTTCP_VERSION = 6.1.2
 NUTTCP_SITE = http://nuttcp.net/nuttcp
 NUTTCP_SOURCE = nuttcp-$(NUTTCP_VERSION).tar.bz2
-NUTTCP_LICENSE = GPLv2
+NUTTCP_LICENSE = GPL-2.0
 NUTTCP_LICENSE_FILES = LICENSE
 
 define NUTTCP_BUILD_CMDS
diff --git a/bsp/buildroot/package/nvidia-driver/Config.in b/bsp/buildroot/package/nvidia-driver/Config.in
index 1105ec63..732d9255 100644
--- a/bsp/buildroot/package/nvidia-driver/Config.in
+++ b/bsp/buildroot/package/nvidia-driver/Config.in
@@ -22,8 +22,8 @@ config BR2_PACKAGE_NVIDIA_DRIVER_XORG
 	default y
 	depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	select BR2_PACKAGE_MESA3D_HEADERS
-	select BR2_PACKAGE_XLIB_LIBX11 # runtime
-	select BR2_PACKAGE_XLIB_LIBXEXT # runtime
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBEGL_WAYLAND
diff --git a/bsp/buildroot/package/nvidia-driver/nvidia-driver.hash b/bsp/buildroot/package/nvidia-driver/nvidia-driver.hash
index 04a44b82..e05b8f04 100644
--- a/bsp/buildroot/package/nvidia-driver/nvidia-driver.hash
+++ b/bsp/buildroot/package/nvidia-driver/nvidia-driver.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 cc79d3ac2b688009ed2e47a1cf27557aea5dd745b3b6e9b83945c359ddab4335  NVIDIA-Linux-x86-375.20.run
-sha256 d10e40a19dc57ac958567a2b247c2b113e5f1e4186ad48e9a58e70a46d07620b  NVIDIA-Linux-x86_64-375.20.run
+sha256 3b70587582220ab1102bcb8386f206f89e6b146856af41f16eaa5910e54ef8fd  NVIDIA-Linux-x86-384.69.run
+sha256 a7b7984fc532be17c262bc4353e279824ae63625d8ae9f1016cb66d199b97650  NVIDIA-Linux-x86_64-384.69.run
diff --git a/bsp/buildroot/package/nvidia-driver/nvidia-driver.mk b/bsp/buildroot/package/nvidia-driver/nvidia-driver.mk
index 1b85f3db..e5666105 100644
--- a/bsp/buildroot/package/nvidia-driver/nvidia-driver.mk
+++ b/bsp/buildroot/package/nvidia-driver/nvidia-driver.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-NVIDIA_DRIVER_VERSION = 375.20
+NVIDIA_DRIVER_VERSION = 384.69
 NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64)
 NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION)
 NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run
@@ -20,7 +20,7 @@ ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_XORG),y)
 # are build dependencies of packages that depend on nvidia-driver, so
 # they should be built prior to those packages, and the only simple
 # way to do so is to make nvidia-driver depend on them.
-NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers
+NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers xlib_libX11 xlib_libXext
 NVIDIA_DRIVER_PROVIDES = libgl libegl libgles
 
 # libGL.so.$(NVIDIA_DRIVER_VERSION) is the legacy libGL.so library; it
@@ -43,33 +43,33 @@ NVIDIA_DRIVER_PROVIDES = libgl libegl libgles
 NVIDIA_DRIVER_LIBS_GL = \
 	libGLX.so.0 \
 	libGL.so.$(NVIDIA_DRIVER_VERSION) \
-	libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+	libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS_EGL = \
 	libEGL.so.1 \
 	libGLdispatch.so.0 \
-	libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+	libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS_GLES = \
 	libGLESv1_CM.so.1 \
 	libGLESv2.so.2 \
 	libGLESv1_CM_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
-	libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
+	libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS_MISC = \
 	libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \
-	libnvidia-egl-wayland.so.$(NVIDIA_DRIVER_VERSION) \
+	libnvidia-egl-wayland.so.1.0.1 \
 	libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \
 	libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \
 	tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \
 	libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \
-	libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) \
+	libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION)
 
 NVIDIA_DRIVER_LIBS = \
 	$(NVIDIA_DRIVER_LIBS_GL) \
 	$(NVIDIA_DRIVER_LIBS_EGL) \
 	$(NVIDIA_DRIVER_LIBS_GLES) \
-	$(NVIDIA_DRIVER_LIBS_MISC) \
+	$(NVIDIA_DRIVER_LIBS_MISC)
 
 # Install the gl.pc file
 define NVIDIA_DRIVER_INSTALL_GL_DEV
diff --git a/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in b/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in
index 573ab90b..3494c5b9 100644
--- a/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in
+++ b/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in
@@ -7,8 +7,8 @@ config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES
 	select BR2_PACKAGE_HAS_LIBGLES
 	select BR2_PACKAGE_HAS_LIBOPENMAX
 	help
-	  Those packages provide libraries, drivers and firmware that comes from
-	  NVIDIA Linux For Tegra.
+	  Those packages provide libraries, drivers and firmware that
+	  comes from NVIDIA Linux For Tegra.
 
 	  https://developer.nvidia.com/linux-tegra
 
diff --git a/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
index 4f7cdcf6..9b153b02 100644
--- a/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
+++ b/bsp/buildroot/package/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk
@@ -11,7 +11,7 @@ NVIDIA_TEGRA23_BINARIES_SOURCE = $(NVIDIA_TEGRA23_BASE)_R$(NVIDIA_TEGRA23_BINARI
 NVIDIA_TEGRA23_BINARIES_LICENSE = License For Customer Use of NVIDIA Software
 NVIDIA_TEGRA23_BINARIES_LICENSE_FILES = nv_tegra/LICENSE
 ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y)
-NVIDIA_TEGRA23_BINARIES_LICENSE += LGPLv2.1
+NVIDIA_TEGRA23_BINARIES_LICENSE += LGPL-2.1
 NVIDIA_TEGRA23_BINARIES_LICENSE_FILES += nv_tegra/nv_sample_apps/LICENSE.gst-openmax
 endif
 
diff --git a/bsp/buildroot/package/nvme/0001-Makefile-allow-linker-override-for-cross-uuid-test.patch b/bsp/buildroot/package/nvme/0001-Makefile-allow-linker-override-for-cross-uuid-test.patch
new file mode 100644
index 00000000..dc1c01a8
--- /dev/null
+++ b/bsp/buildroot/package/nvme/0001-Makefile-allow-linker-override-for-cross-uuid-test.patch
@@ -0,0 +1,34 @@
+From f926559acd1beb74dc5dc9b0e414b087110a251f Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Wed, 9 Aug 2017 09:43:12 +0300
+Subject: [PATCH] Makefile: allow linker override for cross uuid test
+
+The test to determine whether libuuid is installed uses the host 'ld' utility.
+This breaks when cross compiling, since target libraries are often different
+than host libraries.
+
+Use $(LD) instead. This allows to easily use the cross compiler linker.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/linux-nvme/nvme-cli/pull/216
+
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3f1d9aaa890d..cc74bdd6c3e6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ CFLAGS ?= -O2 -g -Wall -Werror
+ CFLAGS += -std=gnu99
+ CPPFLAGS += -D_GNU_SOURCE -D__CHECK_ENDIAN__
+-LIBUUID = $(shell ld -o /dev/null -luuid >/dev/null 2>&1; echo $$?)
++LIBUUID = $(shell $(LD) -o /dev/null -luuid >/dev/null 2>&1; echo $$?)
+ NVME = nvme
+ INSTALL ?= install
+ DESTDIR =
+-- 
+2.13.2
+
diff --git a/bsp/buildroot/package/nvme/nvme.hash b/bsp/buildroot/package/nvme/nvme.hash
index b2990419..92e2bc0a 100644
--- a/bsp/buildroot/package/nvme/nvme.hash
+++ b/bsp/buildroot/package/nvme/nvme.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 c631e90dd4d411cdb618b26bc36b06706e6f1f2d3db38874bcfe48f4bc15aac4 nvme-v0.3.tar.gz
+sha256 52eb45c9ef5a529580a3f6f9e02c067695675ac01b8ab8b8e0398c62e8a8646d nvme-v1.3.tar.gz
diff --git a/bsp/buildroot/package/nvme/nvme.mk b/bsp/buildroot/package/nvme/nvme.mk
old mode 100755
new mode 100644
index b745025f..8eab1dac
--- a/bsp/buildroot/package/nvme/nvme.mk
+++ b/bsp/buildroot/package/nvme/nvme.mk
@@ -4,24 +4,13 @@
 #
 ################################################################################
 
-NVME_VERSION = v0.3
+NVME_VERSION = v1.3
 NVME_SITE = $(call github,linux-nvme,nvme-cli,$(NVME_VERSION))
-NVME_LICENSE = GPLv2+
+NVME_LICENSE = GPL-2.0+
 NVME_LICENSE_FILES = LICENSE
 
-# Yes LIBUDEV=0 means udev support enabled, LIBUDEV=1 means udev
-# support disabled.
-ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
-NVME_DEPENDENCIES += udev
-NVME_MAKE_OPTS += LIBUDEV=0
-else
-NVME_MAKE_OPTS += LIBUDEV=1
-endif
-
-# LIBUDEV=1 means that libudev is _disabled_
 define NVME_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
-		$(NVME_MAKE_OPTS) -C $(@D)
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
 
 define NVME_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/ocrad/ocrad.hash b/bsp/buildroot/package/ocrad/ocrad.hash
index d2a44ae7..5cde4d3a 100644
--- a/bsp/buildroot/package/ocrad/ocrad.hash
+++ b/bsp/buildroot/package/ocrad/ocrad.hash
@@ -1,2 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256	e710be9c030fbcbce2315077326c8268feb422c0bc39fa744644cbbd1f5d4dd4	ocrad-0.25.tar.lz
+sha256 c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c  ocrad-0.26.tar.lz
+sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef  COPYING
diff --git a/bsp/buildroot/package/ocrad/ocrad.mk b/bsp/buildroot/package/ocrad/ocrad.mk
index 54b607c7..94020d2d 100644
--- a/bsp/buildroot/package/ocrad/ocrad.mk
+++ b/bsp/buildroot/package/ocrad/ocrad.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-OCRAD_VERSION = 0.25
+OCRAD_VERSION = 0.26
 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz
 OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad
-OCRAD_LICENSE = GPLv3+
+OCRAD_LICENSE = GPL-3.0+
 OCRAD_LICENSE_FILES = COPYING
 OCRAD_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/odhcp6c/Config.in b/bsp/buildroot/package/odhcp6c/Config.in
index 329b55c1..97ea4b44 100644
--- a/bsp/buildroot/package/odhcp6c/Config.in
+++ b/bsp/buildroot/package/odhcp6c/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_ODHCP6C
 	bool "odhcp6c"
 	depends on BR2_USE_MMU # fork()
 	help
-	  odhcp6c is a minimal DHCPv6 and RA-client for use in embedded Linux
-	  systems, especially routers.
+	  odhcp6c is a minimal DHCPv6 and RA-client for use in
+	  embedded Linux systems, especially routers.
 
 	  https://github.com/sbyx/odhcp6c
diff --git a/bsp/buildroot/package/odhcp6c/odhcp6c.mk b/bsp/buildroot/package/odhcp6c/odhcp6c.mk
index 0ec9657a..31867d72 100644
--- a/bsp/buildroot/package/odhcp6c/odhcp6c.mk
+++ b/bsp/buildroot/package/odhcp6c/odhcp6c.mk
@@ -6,7 +6,7 @@
 
 ODHCP6C_VERSION = 7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07
 ODHCP6C_SITE = $(call github,sbyx,odhcp6c,$(ODHCP6C_VERSION))
-ODHCP6C_LICENSE = GPLv2
+ODHCP6C_LICENSE = GPL-2.0
 ODHCP6C_LICENSE_FILES = COPYING
 
 define ODHCP6C_INSTALL_SCRIPT
diff --git a/bsp/buildroot/package/odroid-mali/Config.in b/bsp/buildroot/package/odroid-mali/Config.in
index e5c07f23..1c31c2d0 100644
--- a/bsp/buildroot/package/odroid-mali/Config.in
+++ b/bsp/buildroot/package/odroid-mali/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_ODROID_MALI
 	bool "odroid-mali"
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_aarch64 || BR2_ARM_EABIHF
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBGLES
 	select BR2_PACKAGE_ODROID_SCRIPTS # runtime
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	depends on BR2_aarch64 || BR2_ARM_EABIHF
 	help
 	  Install the ARM Mali drivers for odroidc2 based systems.
 
diff --git a/bsp/buildroot/package/odroid-mali/odroid-mali.hash b/bsp/buildroot/package/odroid-mali/odroid-mali.hash
index 4d248242..b71ebab1 100644
--- a/bsp/buildroot/package/odroid-mali/odroid-mali.hash
+++ b/bsp/buildroot/package/odroid-mali/odroid-mali.hash
@@ -1,2 +1,2 @@
 # Locally computed hash
-sha256 29d98ed4b8694b860d9289787c416faa847b0de26d36580a53add1752b4c2e9a  odroid-mali-46fe49f37e3506c6205ad8c50980eca9bfff11e3.tar.gz
+sha256 6c85e96f3372c24c6497f2a1cbea867a8dbf3a7b3edd736802c762176006aec6  odroid-mali-4f8a541693fee5fdcaa162a7fd8922861a4ba0a9.tar.gz
diff --git a/bsp/buildroot/package/odroid-mali/odroid-mali.mk b/bsp/buildroot/package/odroid-mali/odroid-mali.mk
index 142fd97c..86215a1d 100644
--- a/bsp/buildroot/package/odroid-mali/odroid-mali.mk
+++ b/bsp/buildroot/package/odroid-mali/odroid-mali.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ODROID_MALI_VERSION = 46fe49f37e3506c6205ad8c50980eca9bfff11e3
+ODROID_MALI_VERSION = 4f8a541693fee5fdcaa162a7fd8922861a4ba0a9
 ODROID_MALI_SITE = $(call github,mdrjr,c2_mali,$(ODROID_MALI_VERSION))
 ODROID_MALI_LICENSE = Hardkernel EULA
 ODROID_MALI_LICENSE_FILES = README.md
@@ -21,6 +21,10 @@ ODROID_MALI_DEPENDENCIES += \
 	libdrm xlib_libX11 xlib_libXdamage \
 	xlib_libXext xlib_libXfixes
 else
+define ODROID_MALI_FIX_EGL_PC
+	$(SED) "s/Cflags: /Cflags: -DMESA_EGL_NO_X11_HEADERS /" \
+		$(STAGING_DIR)/usr/lib/pkgconfig/egl.pc
+endef
 ODROID_MALI_HEADERS_SUBDIR = fbdev/mali_headers/
 ifeq ($(BR2_aarch64),y)
 ODROID_MALI_LIBS_SUBDIR = fbdev/mali_libs/
@@ -38,6 +42,7 @@ define ODROID_MALI_INSTALL_STAGING_CMDS
 	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
 	cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/
 	cp -dpfr $(@D)/$(ODROID_MALI_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include
+	$(ODROID_MALI_FIX_EGL_PC)
 endef
 
 define ODROID_MALI_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/odroid-scripts/Config.in b/bsp/buildroot/package/odroid-scripts/Config.in
index c4e09cad..c07c3a4c 100644
--- a/bsp/buildroot/package/odroid-scripts/Config.in
+++ b/bsp/buildroot/package/odroid-scripts/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_ODROID_SCRIPTS
 	bool "odroid-scripts"
-	depends on BR2_aarch64 || BR2_arm
+	depends on BR2_aarch64 || BR2_arm || BR2_armeb
 	select BR2_PACKAGE_FBSET # runtime
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # needed for fbset
 	help
diff --git a/bsp/buildroot/package/ofono/ofono.hash b/bsp/buildroot/package/ofono/ofono.hash
index d6117368..37933f12 100644
--- a/bsp/buildroot/package/ofono/ofono.hash
+++ b/bsp/buildroot/package/ofono/ofono.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc
-sha256	53cdbf342913f46bce4827241c60e24255a3d43a94945edf77482ae5b312d51f  ofono-1.18.tar.xz
+sha256 a6b021cda0b444b772897cd637d5f455857fb5819b62c279a8302b44f9c7f2c3  ofono-1.21.tar.xz
diff --git a/bsp/buildroot/package/ofono/ofono.mk b/bsp/buildroot/package/ofono/ofono.mk
index 82343963..b4b7915a 100644
--- a/bsp/buildroot/package/ofono/ofono.mk
+++ b/bsp/buildroot/package/ofono/ofono.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-OFONO_VERSION = 1.18
+OFONO_VERSION = 1.21
 OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
-OFONO_LICENSE = GPLv2
+OFONO_LICENSE = GPL-2.0
 OFONO_LICENSE_FILES = COPYING
 OFONO_DEPENDENCIES = \
 	host-pkgconf \
diff --git a/bsp/buildroot/package/ola/0001-Remove-fvisibiliy-inlines-hidden.patch b/bsp/buildroot/package/ola/0001-Remove-fvisibiliy-inlines-hidden.patch
deleted file mode 100644
index f2bf247c..00000000
--- a/bsp/buildroot/package/ola/0001-Remove-fvisibiliy-inlines-hidden.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cd4f5d9d8a10c368584e8e714ebb0f9695267063 Mon Sep 17 00:00:00 2001
-From: Simon Marchi <simon.marchi@polymtl.ca>
-Date: Mon, 10 Aug 2015 15:01:42 -0400
-Subject: [PATCH] Remove -fvisibiliy-inlines-hidden
-
-Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 714e435..17a23e2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -32,7 +32,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-python-libs
- COMMON_CXXFLAGS_ONLY_WARNINGS = \
-     -I$(top_srcdir)/include \
-     -I$(top_builddir)/include \
--    -Wall -Wformat -W -fvisibility-inlines-hidden \
-+    -Wall -Wformat -W \
-     $(libprotobuf_CFLAGS)
- 
- COMMON_CXXFLAGS = $(COMMON_CXXFLAGS_ONLY_WARNINGS)
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/ola/0002-Remove-replacing-I-with-isystem.patch b/bsp/buildroot/package/ola/0002-Remove-replacing-I-with-isystem.patch
deleted file mode 100644
index 010c99a3..00000000
--- a/bsp/buildroot/package/ola/0002-Remove-replacing-I-with-isystem.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From bbb03794def326c2e8ad2de523c5a61a4c8cb464 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
-Date: Thu, 22 Sep 2016 00:58:58 +0200
-Subject: [PATCH] Remove replacing -I with -isystem
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building OLA with a GCC 6 cross-toolchain fails:
-
-```
-/usr/bin/arm-linux-g++ -DHAVE_CONFIG_H -I.   -D_LARGEFILE_SOURCE
--D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./include -I./include
--Wall -Wformat -W -isystem
-/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include -pthread
--D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os
--pthread -c -o libs/acn/e131_transmit_test.o
-libs/acn/e131_transmit_test.cpp
-/usr/bin/arm-linux-g++ -DHAVE_CONFIG_H -I.   -D_LARGEFILE_SOURCE
--D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./include -I./include
--Wall -Wformat -W -isystem
-/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include -pthread
--D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os
--pthread -c -o libs/acn/E131TestFramework.o
-libs/acn/E131TestFramework.cpp
-In file included from
-/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/ext/string_conversions.h:41:0,
-                 from
-/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/bits/basic_string.h:5402,
-                 from
-/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/string:52,
-                 from ./tools/ola_trigger/config.ypp:2:
-/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/cstdlib:75:25:
-fatal error: stdlib.h: No such file or directory
- #include_next <stdlib.h>
-                         ^
-compilation terminated.
-```
-
-The C++ library in GCC 6 now provides its own `<stdlib.h>` header that
-wraps the C library header of the same name, so in `<cstdlib>` the
-header include
-
-```
-#include <stdlib.h>
-```
-
-has become
-
-```
-#include_next <stdlib.h>
-```
-
-`#include_next` is sensitive to the order of directories in the
-preprocessor's search path, so if that order is changed with `-isystem`
-then the compiler can't find the right header:
-
-```
-[1] /usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include
-[2] /opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0
-[..]
-End of search list.
-```
-
-`<cstdlib>` is located in [2] whereas `<stdlib.h>` (C library header) is
-in [1]. In this case, the `#include_next <stdlib.h>` statement in
-`<cstdlib>`, located in [2], is evaluated **after** the search path [1],
-so the compiler does not find the right system header.
-
-The problem is that the OLA build system replaces the `-I` in the CFLAGS
-from libprotobuf with `-isystem` to fix some warnings treated as errors
-in the libprotobuf header files.
-
-`-isystem` should be used to suppress warnings in system headers only
-and the libprotobuf header files are not system files.
-
-The correct fix is to compile with less restrictions and remove
-`-Werror` for the build.
-
-As using `-isystem` is reordering GCCs search path and using `-isystem`
-is really not necessary, remove the faulty replacement of `-I`.
-
-Upstream status: https://github.com/OpenLightingProject/ola/pull/1126
-
-Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- config/ola.m4 | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/config/ola.m4 b/config/ola.m4
-index 2796cfb..d3b8cc8 100644
---- a/config/ola.m4
-+++ b/config/ola.m4
-@@ -24,9 +24,6 @@ AC_DEFUN([PROTOBUF_SUPPORT],
- AC_REQUIRE_CPP()
- PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1])
- 
--# We want to replace -I with -isystem here to disable errors in the .h files
--# See https://groups.google.com/forum/#!topic/open-lighting/39Mj0KXlCIk
--libprotobuf_CFLAGS=`echo $libprotobuf_CFLAGS | sed 's/-I/-isystem /'`
- AC_SUBST([libprotobuf_CFLAGS])
- 
- AC_ARG_WITH([protoc],
--- 
-2.10.0
-
diff --git a/bsp/buildroot/package/ola/Config.in b/bsp/buildroot/package/ola/Config.in
deleted file mode 100644
index 90a92fd2..00000000
--- a/bsp/buildroot/package/ola/Config.in
+++ /dev/null
@@ -1,131 +0,0 @@
-comment "ola needs a toolchain w/ C++, threads, dynamic library"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
-
-menuconfig BR2_PACKAGE_OLA
-	bool "ola (open lighting architecture)"
-	select BR2_PACKAGE_PROTOBUF
-	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
-	select BR2_PACKAGE_UTIL_LINUX
-	depends on BR2_INSTALL_LIBSTDCPP # protobuf
-	depends on !BR2_STATIC_LIBS # protobuf
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
-	help
-	  Open Lighting Architecture provides applications
-	  with a mechanism to send and receive DMX512 & RDM
-	  commands using hardware devices and DMX over IP protocols.
-
-	  http://www.opendmx.net/index.php/OLA
-
-if BR2_PACKAGE_OLA
-
-comment "bindings and interface"
-
-config BR2_PACKAGE_OLA_WEB
-	bool "http interface"
-	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd
-	select BR2_PACKAGE_LIBMICROHTTPD
-	help
-	  Build OLA with browser interface.
-
-config BR2_PACKAGE_OLA_PYTHON_BINDINGS
-	bool "python bindings"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_PROTOBUF
-	help
-	  Build OLA with support for the Python language.
-
-config BR2_PACKAGE_OLA_SLP
-	bool "slp tools"
-	help
-	  Build OLA with slp tools.
-
-comment "tests and examples"
-
-config BR2_PACKAGE_OLA_EXAMPLES
-	bool "examples"
-	select BR2_PACKAGE_NCURSES
-	help
-	  Build OLA examples.
-
-config BR2_PACKAGE_OLA_RDM_TESTS
-	bool "rdm tests"
-	depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS
-	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
-	select BR2_PACKAGE_PYTHON_NUMPY
-	help
-	  Build OLA RDM tests.
-
-comment "plugin selections"
-
-config BR2_PACKAGE_OLA_PLUGIN_E131
-	bool "acn E131"
-	help
-	  Build ACN E131 plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_ARTNET
-	bool "artnet"
-	help
-	  Build Artnet plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_OPENDMX
-	bool "DMX4Linux"
-	help
-	  Build DMX4Linux plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_DUMMY
-	bool "dummy"
-	help
-	  Build Dummy plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_ESPNET
-	bool "espnet"
-	help
-	  Build EspNet plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_KINET
-	bool "kinet"
-	help
-	  Build KiNet plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_MILINT
-	bool "Milford Instruments"
-	help
-	  Build Milford Instruments 1-463 plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_OSC
-	bool "osc"
-	select BR2_PACKAGE_LIBLO
-	help
-	  Build Open Sound Control plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_PATHPORT
-	bool "pathport"
-	help
-	  Build Pathport plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_SANDNET
-	bool "sandnet"
-	help
-	  Build SandNet plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_SHOWNET
-	bool "shownet"
-	help
-	  Build ShowNet plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI
-	bool "stageprofi"
-	select BR2_PACKAGE_LIBUSB
-	help
-	  Build StageProfi plugin for OLA.
-
-config BR2_PACKAGE_OLA_PLUGIN_USBPRO
-	bool "usbpro"
-	select BR2_PACKAGE_LIBUSB
-	help
-	  Build UsbPro plugin for OLA.
-
-endif
diff --git a/bsp/buildroot/package/ola/ola.hash b/bsp/buildroot/package/ola/ola.hash
deleted file mode 100644
index a791e9ca..00000000
--- a/bsp/buildroot/package/ola/ola.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256  986e61874bc80db3b23cf201af2dafa39e3412cc50cddf1cd449c869110bfd27  ola-0.10.2.tar.gz
diff --git a/bsp/buildroot/package/ola/ola.mk b/bsp/buildroot/package/ola/ola.mk
deleted file mode 100644
index cfd66383..00000000
--- a/bsp/buildroot/package/ola/ola.mk
+++ /dev/null
@@ -1,180 +0,0 @@
-################################################################################
-#
-# ola
-#
-################################################################################
-
-OLA_VERSION = 0.10.2
-OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION)
-OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests)
-OLA_LICENSE_FILES = LICENCE GPL LGPL
-OLA_INSTALL_STAGING = YES
-OLA_AUTORECONF = YES
-
-# util-linux provides uuid lib
-OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola
-
-OLA_CONF_OPTS = \
-	ac_cv_have_pymod_google_protobuf=yes \
-	--disable-gcov \
-	--disable-tcmalloc \
-	--disable-unittests \
-	--disable-root-check \
-	--disable-java-libs \
-	--disable-fatal-warnings \
-	--with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin
-
-HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf
-
-# When building the host part, disable as much as possible to speed up
-# the configure step and avoid missing host dependencies.
-HOST_OLA_CONF_OPTS = \
-	--disable-all-plugins \
-	--disable-slp \
-	--disable-osc \
-	--disable-uart \
-	--disable-libusb \
-	--disable-libftdi \
-	--disable-http  \
-	--disable-examples \
-	--disable-unittests \
-	--disable-doxygen-html \
-	--disable-doxygen-doc \
-	--disable-fatal-warnings
-
-# On the host side, we only need ola_protoc_plugin, so build and install this
-# only.
-HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin
-define HOST_OLA_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin
-endef
-
-# sets where to find python libs built for target and required by ola
-OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-
-## OLA Bindings and Interface selections
-
-ifeq ($(BR2_PACKAGE_OLA_WEB),y)
-OLA_CONF_OPTS += --enable-http
-OLA_DEPENDENCIES += libmicrohttpd
-else
-OLA_CONF_OPTS += --disable-http
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_SLP),y)
-OLA_CONF_OPTS += --enable-slp
-else
-OLA_CONF_OPTS += --disable-slp
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y)
-OLA_CONF_OPTS += --enable-python-libs
-OLA_DEPENDENCIES += python python-protobuf
-else
-OLA_CONF_OPTS += --disable-python-libs
-endif
-
-## OLA Examples and Tests
-
-ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y)
-OLA_CONF_OPTS += --enable-examples
-OLA_DEPENDENCIES += ncurses
-else
-OLA_CONF_OPTS += --disable-examples
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y)
-OLA_CONF_OPTS += --enable-rdm-tests
-OLA_DEPENDENCIES += python-numpy
-# needed as numpy builds some shared libraries and ola checks for
-# numpy using a host python test program which fails with 'wrong ELF
-# class'.
-OLA_CONF_ENV = ac_cv_have_pymod_numpy=yes
-else
-OLA_CONF_OPTS += --disable-rdm-tests
-endif
-
-## OLA Plugin selections
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y)
-OLA_CONF_OPTS += --enable-e131
-else
-OLA_CONF_OPTS += --disable-e131
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y)
-OLA_CONF_OPTS += --enable-artnet
-else
-OLA_CONF_OPTS += --disable-artnet
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y)
-OLA_CONF_OPTS += --enable-opendmx
-else
-OLA_CONF_OPTS += --disable-opendmx
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y)
-OLA_CONF_OPTS += --enable-dummy
-else
-OLA_CONF_OPTS += --disable-dummy
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y)
-OLA_CONF_OPTS += --enable-espnet
-else
-OLA_CONF_OPTS += --disable-espnet
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y)
-OLA_CONF_OPTS += --enable-kinet
-else
-OLA_CONF_OPTS += --disable-kinet
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y)
-OLA_CONF_OPTS += --enable-osc
-OLA_DEPENDENCIES += liblo
-else
-OLA_CONF_OPTS += --disable-osc
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y)
-OLA_CONF_OPTS += --enable-milinst
-else
-OLA_CONF_OPTS += --disable-milinst
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y)
-OLA_CONF_OPTS += --enable-pathport
-else
-OLA_CONF_OPTS += --disable-pathport
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y)
-OLA_CONF_OPTS += --enable-sandnet
-else
-OLA_CONF_OPTS += --disable-sandnet
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y)
-OLA_CONF_OPTS += --enable-shownet
-else
-OLA_CONF_OPTS += --disable-shownet
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y)
-OLA_CONF_OPTS += --enable-stageprofi --enable-libusb
-else
-OLA_CONF_OPTS += --disable-stageprofi
-endif
-
-ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y)
-OLA_CONF_OPTS += --enable-usbpro --enable-libusb
-else
-OLA_CONF_OPTS += --disable-usbpro
-endif
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/olsr/olsr.hash b/bsp/buildroot/package/olsr/olsr.hash
index c6b14153..6de02905 100644
--- a/bsp/buildroot/package/olsr/olsr.hash
+++ b/bsp/buildroot/package/olsr/olsr.hash
@@ -1,2 +1,2 @@
-# From http://www.olsr.org/releases/0.9/SHA256SUM-0.9.0.3
-sha256	1f038ed3ea72e4f73dfc9701de83de7313f5049161c8df17b9aaeba8e9711e92 olsrd-0.9.0.3.tar.bz2
+# From http://www.olsr.org/releases/0.9/SHA256SUM-0.9.6.1
+sha256 9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612  olsrd-0.9.6.1.tar.bz2
diff --git a/bsp/buildroot/package/olsr/olsr.mk b/bsp/buildroot/package/olsr/olsr.mk
index 5a456a95..faff2533 100644
--- a/bsp/buildroot/package/olsr/olsr.mk
+++ b/bsp/buildroot/package/olsr/olsr.mk
@@ -5,14 +5,14 @@
 ################################################################################
 
 OLSR_VERSION_MAJOR = 0.9
-OLSR_VERSION = $(OLSR_VERSION_MAJOR).0.3
+OLSR_VERSION = $(OLSR_VERSION_MAJOR).6.1
 OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2
 OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR)
 OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \
 	mdns nameservice p2pd pgraph secure txtinfo watchdog
 # Doesn't really need quagga but not very useful without it
 OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga)
-OLSR_LICENSE = BSD-3c, LGPLv2.1+
+OLSR_LICENSE = BSD-3-Clause, LGPL-2.1+
 OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE
 OLSR_DEPENDENCIES = host-flex host-bison
 
diff --git a/bsp/buildroot/package/omap-u-boot-utils/Config.in.host b/bsp/buildroot/package/omap-u-boot-utils/Config.in.host
index 87dcc069..1549674f 100644
--- a/bsp/buildroot/package/omap-u-boot-utils/Config.in.host
+++ b/bsp/buildroot/package/omap-u-boot-utils/Config.in.host
@@ -3,7 +3,7 @@ config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS
 	depends on BR2_arm || BR2_armeb
 	help
 	  U-Boot Utilities for Texas Instrument's OMAP platforms.
-	  This is a set of tools to control U-Boot from scripts, generate
-	  OMAP-specific signed image files and more.
+	  This is a set of tools to control U-Boot from scripts,
+	  generate OMAP-specific signed image files and more.
 
 	  https://github.com/nmenon/omap-u-boot-utils
diff --git a/bsp/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.mk b/bsp/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.mk
index b8a342bf..d68b1300 100644
--- a/bsp/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/bsp/buildroot/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -6,7 +6,7 @@
 
 OMAP_U_BOOT_UTILS_VERSION = 3f07426cddc0be9e24702e7aacc7574ddd7fba28
 OMAP_U_BOOT_UTILS_SITE = $(call github,nmenon,omap-u-boot-utils,$(OMAP_U_BOOT_UTILS_VERSION))
-OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
+OMAP_U_BOOT_UTILS_LICENSE = GPL-2.0, GPL-2.0+
 OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 
 define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
@@ -15,7 +15,7 @@ endef
 
 define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS
 	for f in gpsign pserial tagger ucmd ukermit ; do \
-		$(INSTALL) -D -m 755 $(@D)/$$f $(HOST_DIR)/usr/bin/$$f ; \
+		$(INSTALL) -D -m 755 $(@D)/$$f $(HOST_DIR)/bin/$$f ; \
 	done
 endef
 
diff --git a/bsp/buildroot/package/omniorb/0001-fix-unistd-sys-time-includes.patch b/bsp/buildroot/package/omniorb/0001-fix-unistd-sys-time-includes.patch
deleted file mode 100644
index 29d917b0..00000000
--- a/bsp/buildroot/package/omniorb/0001-fix-unistd-sys-time-includes.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-omniorb/thread: use proper autoconf macros for header inclusion
-
-src/lib/omnithread/posix.cc uses sleep() and usleep(), defined in
-<unistd.h> on numerous platforms, and struct timeval/gettimeofday(),
-defined in <sys/time.h> on various platforms.
-
-Since those header files are not available on all platforms, posix.cc
-currently uses the following condition:
-
-#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__SCO_VERSION__) || defined(__aix__) || defined (__cygwin__) || defined(__darwin__) || defined(__macos__)
-
-Unfortunately, this falls short on Linux systems based on the musl C
-library. Indeed, the musl C library does not define the __GLIBC__
-symbol, but does have the sleep()/usleep() definitions in <unistd.h>,
-and the struct timeval/gettimeofday() definitions in <sys/time.h>,
-like any Linux system. Also, the musl C library does not define any
-constant like __MUSL__ to distinguish it.
-
-Due to this, on musl based systems, <unistd.h> and <sys/time.h> are
-not included, causing a build failure:
-
-posix.cc:864:22: error: '::sleep' has not been declared
-       while ((secs = ::sleep(secs))) ;
-                      ^
-posix.cc:866:43: error: 'usleep' was not declared in this scope
-  usleep(secs * 1000000 + (nanosecs / 1000));
-                                           ^
-posix.cc: In static member function 'static void omni_thread::get_time(long unsigned int*, long unsigned int*, long unsigned int, long unsigned int)':
-posix.cc:904:20: error: aggregate 'omni_thread::get_time(long unsigned int*, long unsigned int*, long unsigned int, long unsigned int)::timeval tv' has incomplete type and cannot be defined
-     struct timeval tv;
-                    ^
-posix.cc:905:24: error: 'gettimeofday' was not declared in this scope
-     gettimeofday(&tv, 0); 
-
-It turns out that the configure.ac already checks for the availability
-of <unistd.h> and <sys/time.h>. So all what this patch does is use the
-C defines generated by the configure script to decide whether
-<unistd.h> and <sys/time.h> can be included or not.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/src/lib/omnithread/posix.cc
-===================================================================
---- a/src/lib/omnithread/posix.cc
-+++ b/src/lib/omnithread/posix.cc
-@@ -78,10 +78,14 @@
- #include <errno.h>
- #include <time.h>
- #include <omnithread.h>
-+#include <omniORB4/acconfig.h>
- 
--#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__SCO_VERSION__) || defined(__aix__) || defined (__cygwin__) || defined(__darwin__) || defined(__macos__)
- // typedef of struct timeval and gettimeofday();
-+#if defined(HAVE_SYS_TIME_H)
- #include <sys/time.h>
-+#endif
-+
-+#if defined(HAVE_UNISTD_H)
- #include <unistd.h>
- #endif
- 
diff --git a/bsp/buildroot/package/omniorb/Config.in b/bsp/buildroot/package/omniorb/Config.in
index b8c4e0a5..4af91a4d 100644
--- a/bsp/buildroot/package/omniorb/Config.in
+++ b/bsp/buildroot/package/omniorb/Config.in
@@ -7,11 +7,13 @@ config BR2_PACKAGE_OMNIORB
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  omniORB is a robust high performance CORBA ORB for C++ and Python.
-	  omniORB is largely CORBA 2.6 compliant. omniORB is one of only
-	  three ORBs to have been awarded the Open Group's Open Brand for
-	  CORBA. This means that omniORB has been tested and certified
-	  CORBA compliant, to version 2.1 of the CORBA specification.
+	  omniORB is a robust high performance CORBA ORB for C++ and
+	  Python.
+	  omniORB is largely CORBA 2.6 compliant. omniORB is one of
+	  only three ORBs to have been awarded the Open Group's Open
+	  Brand for CORBA. This means that omniORB has been tested and
+	  certified CORBA compliant, to version 2.1 of the CORBA
+	  specification.
 
 	  http://omniorb.sourceforge.net/
 
diff --git a/bsp/buildroot/package/omniorb/omniorb.hash b/bsp/buildroot/package/omniorb/omniorb.hash
index 3d98b466..3f4af2e6 100644
--- a/bsp/buildroot/package/omniorb/omniorb.hash
+++ b/bsp/buildroot/package/omniorb/omniorb.hash
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.1/
-sha1	cf0f3ca7caab901c9485ca8afd85087c080c9684	omniORB-4.2.1.tar.bz2
-md5	dbe349d2bd929d349083b303bb4317e5	omniORB-4.2.1.tar.bz2
+# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.2/
+sha1 0c682542290cabb22878b3ef492de3e85c4b4281  omniORB-4.2.2.tar.bz2
+md5 cc6b2a65a2b1c1b3d44b3ccbaf92e104  omniORB-4.2.2.tar.bz2
diff --git a/bsp/buildroot/package/omniorb/omniorb.mk b/bsp/buildroot/package/omniorb/omniorb.mk
index 98bae20a..2f094b57 100644
--- a/bsp/buildroot/package/omniorb/omniorb.mk
+++ b/bsp/buildroot/package/omniorb/omniorb.mk
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-OMNIORB_VERSION = 4.2.1
+OMNIORB_VERSION = 4.2.2
 OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION)
 OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2
 OMNIORB_INSTALL_STAGING = YES
-OMNIORB_LICENSE = GPL2+, LGPLv2.1+
+OMNIORB_LICENSE = GPL2+, LGPL-2.1+
 OMNIORB_LICENSE_FILES = COPYING COPYING.LIB
 OMNIORB_DEPENDENCIES = host-omniorb
 HOST_OMNIORB_DEPENDENCIES = host-python
 
 # omniorb is not python3 friendly, so force the python interpreter
-OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
-HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
+HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
 
 # Defaulting long double support to a safe option for the
 # mix of embedded targets, this could later be automated
@@ -65,7 +65,7 @@ endif
 # cross compiled target OMNIORB application.
 define OMNIORB_ADJUST_TOOLDIR
 	# Point to the host folder to get HOST_OMNIORB tools
-	$(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/usr/bin:g' $(@D)/mk/beforeauto.mk
+	$(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/bin:g' $(@D)/mk/beforeauto.mk
 	# Disables OMNIORB app/service/tool building
 	echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk
 endef
diff --git a/bsp/buildroot/package/omxplayer/0001-Makefiles-clean-up-the-cruft.patch b/bsp/buildroot/package/omxplayer/0001-Makefiles-clean-up-the-cruft.patch
deleted file mode 100644
index 2dc61669..00000000
--- a/bsp/buildroot/package/omxplayer/0001-Makefiles-clean-up-the-cruft.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 563dafc1129848419482b540d149d0b8687cac1e Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Sun, 10 Apr 2016 16:22:53 +0200
-Subject: [PATCH] Makefiles: clean up the cruft
-
-Most of the variables that Makefile.include tries (but fails) to set,
-are already available from Buildroot's variables:
-  - AR, AS, CC, CXX, OBJDUMP...
-  - CFLAGS, CXXFLAGS, CPPFLAGS...
-
-This leaves us with a few select variables that define include and
-library paths local to the omxplayer package, plus a few optimisations.
-
-Finally, also remove hard-coded, absolute paths pointing to the host
-system (won't work for cross-compilation, so our paranoid wrapper would
-catch those paths).
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- Makefile         |  2 +-
- Makefile.include | 20 ++------------------
- 2 files changed, 3 insertions(+), 19 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index bcfadfb..3dc1a03 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX
- 
- LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
- 
--INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/
- 
- DIST ?= omxplayer-dist
- 
-diff --git a/Makefile.include b/Makefile.include
-index 58e9560..79ca277 100644
---- a/Makefile.include
-+++ b/Makefile.include
-@@ -20,21 +20,5 @@ endif
- 
- JOBS=7
- 
--CFLAGS			:= -isystem$(PREFIX)/include
--CXXFLAGS		:= $(CFLAGS)
--CPPFLAGS		:= $(CFLAGS)
--LDFLAGS			:= -L$(BUILDROOT)/lib
--LD					:= $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT)
--CC					:= $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT)
--CXX         := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT)
--OBJDUMP			:= $(TOOLCHAIN)/bin/$(HOST)-objdump
--RANLIB			:= $(TOOLCHAIN)/bin/$(HOST)-ranlib
--STRIP				:= $(TOOLCHAIN)/bin/$(HOST)-strip
--AR 					:= $(TOOLCHAIN)/bin/$(HOST)-ar
--CXXCP 			:= $(CXX) -E
--PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
--
--CFLAGS			+= -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
--LDFLAGS			+= -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
--#INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
--INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
-+CFLAGS			+= -fomit-frame-pointer -Wno-psabi -mno-apcs-stack-check    \
-+			   -mstructure-size-boundary=32 -mno-sched-prolog
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch b/bsp/buildroot/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch
new file mode 100644
index 00000000..8f8bfad7
--- /dev/null
+++ b/bsp/buildroot/package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch
@@ -0,0 +1,39 @@
+From 40bf9c0960becaf0e592cac901466af93f24e52b Mon Sep 17 00:00:00 2001
+From: Julius Kriukas <julius@kriukas.lt>
+Date: Fri, 1 Dec 2017 18:29:24 +0200
+Subject: [PATCH] Update Makefile to be compatible with buildroot
+
+- Append to existing CFLAGS instead of overwriting.
+- Remove cross-compilation specific options from CFLAGS, they will be
+  set by buildroot.
+- Remove local ffmpeg_compiled include, buildroot will build ffmpeg
+  separately.
+- Remove hard-coded dbus, freetype, rpi-firmware include paths, they
+  will be added by buildroot.
+
+Signed-off-by: Julius Kriukas <julius@kriukas.lt>
+---
+ Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 5f4e414..53fa1bc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,10 +1,10 @@
+-CFLAGS=-pipe -mfloat-abi=hard -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
++CFLAGS+=-fomit-frame-pointer -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog
+ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
+ 
+ LDFLAGS=-L$(SDKSTAGE)/opt/vc/lib/
+-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
++LDFLAGS+=-L./ -lc -lbrcmGLESv2 -lbrcmEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
+ 
+-INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -I/usr/include/freetype2 -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads
++INCLUDES+=-I./ -Ilinux
+ 
+ DIST ?= omxplayer-dist
+ STRIP ?= strip
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/omxplayer/Config.in b/bsp/buildroot/package/omxplayer/Config.in
index b417aa3b..80e48d09 100644
--- a/bsp/buildroot/package/omxplayer/Config.in
+++ b/bsp/buildroot/package/omxplayer/Config.in
@@ -4,9 +4,10 @@ config BR2_PACKAGE_OMXPLAYER
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS # ffmpeg
 	depends on BR2_INSTALL_LIBSTDCPP # boost
-	depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libusb
+	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, boost, libusb
 	depends on BR2_USE_WCHAR # boost
 	depends on BR2_PACKAGE_RPI_USERLAND
+	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_FFMPEG
@@ -18,9 +19,9 @@ config BR2_PACKAGE_OMXPLAYER
 	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_ZLIB
 	help
-	  OMXPlayer is a commandline OMX player for the Raspberry Pi. It was
-	  developed as a testbed for the XBMC Raspberry PI implementation
-	  and is quite handy to use standalone.
+	  OMXPlayer is a commandline OMX player for the Raspberry
+	  Pi. It was developed as a testbed for the XBMC Raspberry PI
+	  implementation and is quite handy to use standalone.
 
 	  https://github.com/popcornmix/omxplayer
 
diff --git a/bsp/buildroot/package/omxplayer/omxplayer.hash b/bsp/buildroot/package/omxplayer/omxplayer.hash
index 4ee215b7..ad084e26 100644
--- a/bsp/buildroot/package/omxplayer/omxplayer.hash
+++ b/bsp/buildroot/package/omxplayer/omxplayer.hash
@@ -1,3 +1,6 @@
-# Locally computed
-sha1    23eb444757e445c127a7114ae233569cac64f984                          omxplayer-6c90c7503ba4658221774759edf7f2ae816711de.tar.gz
-sha256  93ebfd654314231749936e4fc09f5ec4a361806cdb640d7579a5106921e00299  omxplayer-6c90c7503ba4658221774759edf7f2ae816711de.tar.gz
+# Locally computed:
+sha1    258316ff94a1f1e5e47a5bb1a28d324ab08871a9                          omxplayer-2ee17b22a6149a043a2e402580504f282c615373.tar.gz
+sha256  c16498258ee78c59f9705b621e4b5b7b0673e1687d94681f9dc52451b1ceba48  omxplayer-2ee17b22a6149a043a2e402580504f282c615373.tar.gz
+
+# Hash for license file:
+sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/bsp/buildroot/package/omxplayer/omxplayer.mk b/bsp/buildroot/package/omxplayer/omxplayer.mk
index da4614bf..69992691 100644
--- a/bsp/buildroot/package/omxplayer/omxplayer.mk
+++ b/bsp/buildroot/package/omxplayer/omxplayer.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-OMXPLAYER_VERSION = 6c90c7503ba4658221774759edf7f2ae816711de
+OMXPLAYER_VERSION = 2ee17b22a6149a043a2e402580504f282c615373
 OMXPLAYER_SITE = $(call github,popcornmix,omxplayer,$(OMXPLAYER_VERSION))
-OMXPLAYER_LICENSE = GPLv2+
+OMXPLAYER_LICENSE = GPL-2.0+
 OMXPLAYER_LICENSE_FILES = COPYING
 
 OMXPLAYER_DEPENDENCIES = \
-	host-pkgconf boost dbus ffmpeg freetype libidn libusb pcre \
+	host-pkgconf alsa-lib boost dbus ffmpeg freetype libidn libusb pcre \
 	rpi-userland zlib
 
 OMXPLAYER_EXTRA_CFLAGS = \
@@ -23,14 +23,7 @@ OMXPLAYER_EXTRA_CFLAGS = \
 # procedure is, well, tainted. Fix this by forcing the real,
 # correct values.
 OMXPLAYER_MAKE_ENV = \
-	USE_BUILDROOT=1 \
-	BUILDROOT=$(TOP_DIR) \
 	SDKSTAGE=$(STAGING_DIR) \
-	TARGETFS=$(TARGET_DIR) \
-	TOOLCHAIN=$(HOST_DIR)/usr \
-	HOST=$(GNU_TARGET_NAME) \
-	SYSROOT=$(STAGING_DIR) \
-	JOBS=$(PARALLEL_JOBS) \
 	$(TARGET_CONFIGURE_OPTS) \
 	STRIP=true \
 	CFLAGS="$(TARGET_CFLAGS) $(OMXPLAYER_EXTRA_CFLAGS)"
diff --git a/bsp/buildroot/package/on2-8170-libs/Config.in b/bsp/buildroot/package/on2-8170-libs/Config.in
index 40cad3d0..2a60c581 100644
--- a/bsp/buildroot/package/on2-8170-libs/Config.in
+++ b/bsp/buildroot/package/on2-8170-libs/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_ON2_8170_LIBS
+	bool "on2-8170-libs"
 	#This is a binary only package which has been compiled for glibc
 	depends on BR2_arm926t
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_LINUX_KERNEL # on2-8170-modules
 	select BR2_PACKAGE_ON2_8170_MODULES # runtime
-	bool "on2-8170-libs"
 	help
 	  Libraries for Hantro X170 video decoder
 
diff --git a/bsp/buildroot/package/on2-8170-modules/Config.in b/bsp/buildroot/package/on2-8170-modules/Config.in
index 06ce992f..8c51e0c8 100644
--- a/bsp/buildroot/package/on2-8170-modules/Config.in
+++ b/bsp/buildroot/package/on2-8170-modules/Config.in
@@ -3,7 +3,8 @@ config BR2_PACKAGE_ON2_8170_MODULES
 	depends on BR2_LINUX_KERNEL
 	depends on BR2_arm926t
 	help
-	  Kernel modules for Hantro x170 hardware video decompression support.
+	  Kernel modules for Hantro x170 hardware video decompression
+	  support.
 
 	  http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer
 
diff --git a/bsp/buildroot/package/on2-8170-modules/on2-8170-modules.mk b/bsp/buildroot/package/on2-8170-modules/on2-8170-modules.mk
index b40ed86c..98643134 100644
--- a/bsp/buildroot/package/on2-8170-modules/on2-8170-modules.mk
+++ b/bsp/buildroot/package/on2-8170-modules/on2-8170-modules.mk
@@ -7,7 +7,7 @@
 ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39
 ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION))
 
-ON2_8170_MODULES_LICENSE = GPLv2+
+ON2_8170_MODULES_LICENSE = GPL-2.0+
 #There is no license file
 
 $(eval $(kernel-module))
diff --git a/bsp/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch b/bsp/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch
new file mode 100644
index 00000000..c2026778
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/0001-vdptool-fixed-compile-error-for-getline.patch
@@ -0,0 +1,27 @@
+From 3c7887bb8a61a3b49a2989329c756a038023c544 Mon Sep 17 00:00:00 2001
+From: Laurent Charpentier <laurent_pubs@yahoo.com>
+Date: Fri, 12 Jan 2018 12:25:41 +0100
+Subject: [PATCH] vdptool: fixed compile error for getline()
+
+vdptool.c was generating an error: implicit declaration for the getline() function.
+
+Signed-off-by: Laurent Charpentier <laurent_pubs@yahoo.com>
+---
+ vdptool.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/vdptool.c b/vdptool.c
+index b805372..4930f6a 100644
+--- a/vdptool.c
++++ b/vdptool.c
+@@ -36,6 +36,7 @@
+  * set and query VSI profile settings.
+  */
+ 
++#define _GNU_SOURCE
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch b/bsp/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
new file mode 100644
index 00000000..57a23b2a
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/0002-get-inline-functions-work-with-both-gnu11-and-gnu89.patch
@@ -0,0 +1,73 @@
+From e186ca9ebda181f62504a1922559ef3ddae5e3b6 Mon Sep 17 00:00:00 2001
+From: Laurent Charpentier <laurent_pubs@yahoo.com>
+Date: Mon, 15 Jan 2018 11:24:45 +0100
+Subject: [PATCH] get inline functions work with both gnu11 and gnu89
+
+After gcc upgraded to gcc5, and if the codes are compiled without optimization(-O0), and the below error will happen:
+
+./include/lldp_8021qaz.h:237:12: error: inline function 'ieee8021qaz_clif_cmd' declared but never defined [-Werror]
+ inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from,
+            ^
+./include/lldp_8021qaz.h:222:13: error: inline function 'set_prio_map' declared but never defined [-Werror]
+ inline void set_prio_map(u32 *prio_map, u8 prio, int tc);
+             ^
+./include/lldp_8021qaz.h:221:12: error: inline function 'get_prio_map' declared but never defined [-Werror]
+ inline int get_prio_map(u32 prio_map, int tc);
+
+gcc5 defaults to -std=gnu11 instead of -std=gnu89, and it requires that exactly one C source file has the callable copy of the inline function.
+
+Signed-off-by: Laurent Charpentier <laurent_pubs@yahoo.com>
+---
+ include/lldp_8021qaz.h | 6 ------
+ lldp_8021qaz.c         | 4 ++--
+ 2 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/include/lldp_8021qaz.h b/include/lldp_8021qaz.h
+index 55353b8..09dee20 100644
+--- a/include/lldp_8021qaz.h
++++ b/include/lldp_8021qaz.h
+@@ -218,9 +218,6 @@ int ieee8021qaz_mod_app(struct app_tlv_head *head, int peer,
+ 			u8 prio, u8 sel, u16 proto, u32 ops);
+ int ieee8021qaz_app_sethw(char *ifname, struct app_tlv_head *head);
+ 
+-inline int get_prio_map(u32 prio_map, int tc);
+-inline void set_prio_map(u32 *prio_map, u8 prio, int tc);
+-
+ struct ieee8021qaz_tlvs *ieee8021qaz_data(const char *);
+ 
+ int ieee8021qaz_tlvs_rxed(const char *ifname);
+@@ -234,9 +231,6 @@ int ieee8021qaz_rchange(struct port *port, struct lldp_agent *,
+ void ieee8021qaz_ifup(char *ifname, struct lldp_agent *);
+ void ieee8021qaz_ifdown(char *ifname, struct lldp_agent *);
+ u8 ieee8021qaz_mibDeleteObject(struct port *port, struct lldp_agent *);
+-inline int ieee8021qaz_clif_cmd(void *data, struct sockaddr_un *from,
+-				socklen_t fromlen, char *ibuf, int ilen,
+-				char *rbuf);
+ int ieee8021qaz_check_operstate(void);
+ int get_dcbx_hw(const char *ifname, __u8 *dcbx);
+ 
+diff --git a/lldp_8021qaz.c b/lldp_8021qaz.c
+index 094676d..f154317 100644
+--- a/lldp_8021qaz.c
++++ b/lldp_8021qaz.c
+@@ -396,7 +396,7 @@ static int read_cfg_file(char *ifname, struct lldp_agent *agent,
+ 	return 0;
+ }
+ 
+-inline int get_prio_map(u32 prio_map, int prio)
++static inline int get_prio_map(u32 prio_map, int prio)
+ {
+ 	if (prio > 7)
+ 		return 0;
+@@ -404,7 +404,7 @@ inline int get_prio_map(u32 prio_map, int prio)
+ 	return (prio_map >> (4 * (7-prio))) & 0xF;
+ }
+ 
+-inline void set_prio_map(u32 *prio_map, u8 prio, int tc)
++static inline void set_prio_map(u32 *prio_map, u8 prio, int tc)
+ {
+ 	u32 mask = ~(0xffffffff & (0xF << (4 * (7-prio))));
+ 	*prio_map &= mask;
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch b/bsp/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch
new file mode 100644
index 00000000..d6393bdc
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/0003-Makefile.am-disable-Werror.patch
@@ -0,0 +1,38 @@
+From c350f263136801fd54d42322a07a3b5ad2181dd9 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 18 Jan 2018 09:29:32 +0100
+Subject: [PATCH] Makefile.am: disable -Werror
+
+Due to additional warnings in recent gcc versions and the use of
+-Werror the build fails for reasons that are not that important. For
+example:
+
+clif.c:54:2: error: implicit declaration of function 'memset' [-Werror=implicit-function-declaration]
+  memset(clif, 0, sizeof(*clif));
+
+or:
+
+log.c:46:30: error: format '%ld' expects argument of type 'long int', but argument 5 has type '__suseconds_t {aka int}' [-Werror=format=]
+   printf("%02d:%02d:%02d.%06ld ",
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 551d4c7..62a52a5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -16,7 +16,7 @@ ACLOCAL_AMFLAGS = -I m4
+ parse_cli.o: CFLAGS+=-U_FORTIFY_SOURCE -Wno-error
+ 
+ ## system requires a shared libconfig
+-AM_CFLAGS = -Wall -Werror -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS)
++AM_CFLAGS = -Wall -Wextra -Wformat=2 $(LIBCONFIG_CFLAGS) $(LIBNL_CFLAGS)
+ AM_LDFLAGS = $(LIBCONFIG_LIBS) $(LIBNL_LIBS) -lrt
+ 
+ ## header files to be installed, for programs using the client interface to lldpad 
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch b/bsp/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch
new file mode 100644
index 00000000..2d3b9148
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/0004-fixed-unknown-type-pid_t.patch
@@ -0,0 +1,41 @@
+From 41e9e6b5aa13d65480cc960a7f15f97d74d64090 Mon Sep 17 00:00:00 2001
+From: Laurent Charpentier <laurent_pubs@yahoo.com>
+Date: Mon, 22 Jan 2018 10:49:45 +0100
+Subject: [PATCH] fixed unknown type pid_t
+
+Fixed 'unknown type pid_t' gcc compile error in dcbtool_cmds.c and
+lldptool_cmds.c
+
+Signed-off-by: Laurent Charpentier <laurent_pubs@yahoo.com>
+---
+ dcbtool_cmds.c  | 1 +
+ lldptool_cmds.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/dcbtool_cmds.c b/dcbtool_cmds.c
+index a5cd0fe..ee5c144 100644
+--- a/dcbtool_cmds.c
++++ b/dcbtool_cmds.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <ctype.h>
++#include <sys/types.h>
+ #include "clif.h"
+ #include "dcbtool.h"
+ #include "lldp_dcbx_cmds.h"
+diff --git a/lldptool_cmds.c b/lldptool_cmds.c
+index daef8c8..c793e34 100644
+--- a/lldptool_cmds.c
++++ b/lldptool_cmds.c
+@@ -27,6 +27,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <sys/types.h>
+ #include "clif.h"
+ #include "dcb_types.h"
+ #include "lldptool.h"
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/open-lldp/Config.in b/bsp/buildroot/package/open-lldp/Config.in
new file mode 100644
index 00000000..b40bff89
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_OPEN_LLDP
+	bool "open-lldp"
+	depends on !BR2_STATIC_LIBS # dlfcn.h
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
+	select BR2_PACKAGE_LIBCONFIG
+	select BR2_PACKAGE_LIBNL
+	select BR2_PACKAGE_READLINE
+	help
+	  This package contains the Linux user space daemon and
+	  configuration tool for Intel LLDP Agent with Enhanced Ethernet
+	  support for the Data Center.
+
+	  http://open-lldp.org/
+
+comment "open-lldp needs a toolchain w/ dynamic library, threads"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/open-lldp/open-lldp.hash b/bsp/buildroot/package/open-lldp/open-lldp.hash
new file mode 100644
index 00000000..fdd85fed
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/open-lldp.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 f2c8a3307970374b01ad832ea18cf6d9abce6f00b3d8aed9305aa1428ad8252d  open-lldp-036e314bd93602f7388262cc37faf8b626980af1.tar.gz
+sha256 67af5abeb092213cd9c53781503320f635ba28b641e0c3f24d367e8e93a9839b  COPYING
diff --git a/bsp/buildroot/package/open-lldp/open-lldp.mk b/bsp/buildroot/package/open-lldp/open-lldp.mk
new file mode 100644
index 00000000..b650aea3
--- /dev/null
+++ b/bsp/buildroot/package/open-lldp/open-lldp.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# open-lldp
+#
+################################################################################
+
+OPEN_LLDP_VERSION = 036e314bd93602f7388262cc37faf8b626980af1
+OPEN_LLDP_SITE = git://open-lldp.org/open-lldp.git
+OPEN_LLDP_DEPENDENCIES = readline libnl libconfig host-pkgconf
+OPEN_LLDP_LICENSE = GPL-2.0
+OPEN_LLDP_LICENSE_FILES = COPYING
+
+# Fetching from git, need to generate configure/Makefile.in
+OPEN_LLDP_AUTORECONF = YES
+
+# Create the m4 directory (missing from the archive).
+# This is required for autoconf.
+define OPEN_LLDP_CREATE_M4
+	mkdir -p $(@D)/m4
+endef
+
+OPEN_LLDP_PRE_CONFIGURE_HOOKS += OPEN_LLDP_CREATE_M4
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/open-plc-utils/open-plc-utils.mk b/bsp/buildroot/package/open-plc-utils/open-plc-utils.mk
index 67c8d7dc..d45bb9d4 100644
--- a/bsp/buildroot/package/open-plc-utils/open-plc-utils.mk
+++ b/bsp/buildroot/package/open-plc-utils/open-plc-utils.mk
@@ -6,7 +6,7 @@
 
 OPEN_PLC_UTILS_VERSION = 1be781d1ea81827e5f6c1a35961c65dd4d15472c
 OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION))
-OPEN_PLC_UTILS_LICENSE = BSD-3c
+OPEN_PLC_UTILS_LICENSE = BSD-3-Clause
 OPEN_PLC_UTILS_LICENSE_FILES = LICENSE
 
 # We unfortunately can't use TARGET_CONFIGURE_OPTS, as it would
diff --git a/bsp/buildroot/package/open2300/open2300.mk b/bsp/buildroot/package/open2300/open2300.mk
index 588692d4..589d344b 100644
--- a/bsp/buildroot/package/open2300/open2300.mk
+++ b/bsp/buildroot/package/open2300/open2300.mk
@@ -7,7 +7,7 @@
 OPEN2300_SITE = http://www.lavrsen.dk/svn/open2300/trunk
 OPEN2300_SITE_METHOD = svn
 OPEN2300_VERSION = 12
-OPEN2300_LICENSE = GPLv2
+OPEN2300_LICENSE = GPL-2.0
 OPEN2300_LICENSE_FILES = COPYING
 
 OPEN2300_BINS = \
diff --git a/bsp/buildroot/package/openal/0001-Fix-detection-of-C11-atomics.patch b/bsp/buildroot/package/openal/0001-Fix-detection-of-C11-atomics.patch
deleted file mode 100644
index c6b98409..00000000
--- a/bsp/buildroot/package/openal/0001-Fix-detection-of-C11-atomics.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 10fee6d71a1f7d6e6319005196562b4a30b4e8ff Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Tue, 2 Feb 2016 14:58:52 +0100
-Subject: [PATCH] Fix detection of C11 atomics
-
-Currently, the CMakeLists.txt logic to detect the availability of C11
-atomics is based on building a small program that uses the
-atomic_load().
-
-However, atomic_load() does not need to use any function from
-libatomic (part of the gcc runtime). So even if libatomic is missing,
-this test concludes that C11 atomic support is available. For example
-on SPARC, the example program builds fine without linking to
-libatomic, but calling other functions of the atomic_*() APIs fail
-without linking to libatomic.
-
-So, this patch adjusts the CMakeLists.txt test to use a function that
-is known to require the libatomic run-time library (on architectures
-where it is needed). This way, openal will only use the __atomic_*()
-built-ins when they are actually functional.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- CMakeLists.txt | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5784d35..a53f996 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -209,14 +209,17 @@ CHECK_C_SOURCE_COMPILES(
- HAVE_C11_ALIGNAS)
- 
- # Check if we have C11 _Atomic
-+set(OLD_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
-+set(CMAKE_REQUIRED_LIBRARIES ${EXTRA_LIBS})
- CHECK_C_SOURCE_COMPILES(
- "#include <stdatomic.h>
-- const int _Atomic foo = ATOMIC_VAR_INIT(~0);
-+ int _Atomic foo = ATOMIC_VAR_INIT(~0);
-  int main()
-  {
--     return atomic_load(&foo);
-+     return atomic_fetch_add(&foo, 2);
-  }"
- HAVE_C11_ATOMIC)
-+set(CMAKE_REQUIRED_LIBRARIES ${OLD_REQUIRED_LIBRARIES})
- 
- # Add definitions, compiler switches, etc.
- INCLUDE_DIRECTORIES("${OpenAL_SOURCE_DIR}/include" "${OpenAL_BINARY_DIR}")
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/openal/openal.hash b/bsp/buildroot/package/openal/openal.hash
index 45f1421d..aead6e15 100644
--- a/bsp/buildroot/package/openal/openal.hash
+++ b/bsp/buildroot/package/openal/openal.hash
@@ -1,6 +1,2 @@
 # Locally calculated
-sha256	a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314	openal-soft-1.17.2.tar.bz2
-sha256	9c9040269376aba77b1277bbae0f055aee535e14ad4a3ab4e66e39830504e83f	27916ce3db023454a0295ee63ea196fbc246674c.patch
-sha256	4621f6b79d4bbac5ce423f227c92ad1e4f833d7e1f2ff1cc3b5f03721f75b933	a52cfc804813aef8e4b304e20cf843fa6907af6c.patch
-sha256	f442da31b4001a5133f2762a5bc1e780b11d5e2d9f21b257f54695ee6d87d997	c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch
-sha256	3691c1a327b87d5fb487841459fd00d3baaa79808ecb5e3b33b349363663640f	46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch
+sha256 2d51a6529526ef22484f51567e31a5c346a599767991a3dc9d4dcd9d9cec71dd  openal-soft-1.18.1.tar.bz2
diff --git a/bsp/buildroot/package/openal/openal.mk b/bsp/buildroot/package/openal/openal.mk
index 63841047..439f5f10 100644
--- a/bsp/buildroot/package/openal/openal.mk
+++ b/bsp/buildroot/package/openal/openal.mk
@@ -4,15 +4,10 @@
 #
 ################################################################################
 
-OPENAL_VERSION = 1.17.2
+OPENAL_VERSION = 1.18.1
 OPENAL_SOURCE = openal-soft-$(OPENAL_VERSION).tar.bz2
 OPENAL_SITE = http://kcat.strangesoft.net/openal-releases
-OPENAL_PATCH = \
-	https://github.com/kcat/openal-soft/commit/27916ce3db023454a0295ee63ea196fbc246674c.patch \
-	https://github.com/kcat/openal-soft/commit/a52cfc804813aef8e4b304e20cf843fa6907af6c.patch \
-	https://github.com/kcat/openal-soft/commit/c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch \
-	https://github.com/kcat/openal-soft/commit/46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch
-OPENAL_LICENSE = LGPLv2+
+OPENAL_LICENSE = LGPL-2.0+
 OPENAL_LICENSE_FILES = COPYING
 OPENAL_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/openblas/Config.in b/bsp/buildroot/package/openblas/Config.in
index 353e9f8a..8e71a43f 100644
--- a/bsp/buildroot/package/openblas/Config.in
+++ b/bsp/buildroot/package/openblas/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET
 	default "PRESCOTT"     if BR2_x86_prescott || BR2_x86_nocona
 	default "BANIAS"       if BR2_x86_pentium_m
 	default "CORE2"        if BR2_x86_core2
-	default "NEHALEM"      if BR2_x86_corei7
+	default "NEHALEM"      if BR2_x86_corei7 || BR2_x86_silvermont
 	default "SANDYBRIDGE"  if BR2_x86_corei7_avx
 	default "HASWELL"      if BR2_x86_core_avx2
 	default "ATOM"         if BR2_x86_atom
diff --git a/bsp/buildroot/package/openblas/openblas.mk b/bsp/buildroot/package/openblas/openblas.mk
index a26e10a4..93dbc1f9 100644
--- a/bsp/buildroot/package/openblas/openblas.mk
+++ b/bsp/buildroot/package/openblas/openblas.mk
@@ -6,7 +6,7 @@
 
 OPENBLAS_VERSION = f04af36ad0e85b64f12a7c38095383192cc52345
 OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,$(OPENBLAS_VERSION))
-OPENBLAS_LICENSE = BSD-3c
+OPENBLAS_LICENSE = BSD-3-Clause
 OPENBLAS_LICENSE_FILES = LICENSE
 OPENBLAS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/openbox/openbox.mk b/bsp/buildroot/package/openbox/openbox.mk
index b5148e00..91d1c865 100644
--- a/bsp/buildroot/package/openbox/openbox.mk
+++ b/bsp/buildroot/package/openbox/openbox.mk
@@ -7,7 +7,7 @@
 OPENBOX_VERSION = 3.6.1
 OPENBOX_SOURCE = openbox-$(OPENBOX_VERSION).tar.xz
 OPENBOX_SITE = http://openbox.org/dist/openbox
-OPENBOX_LICENSE = GPLv2+
+OPENBOX_LICENSE = GPL-2.0+
 OPENBOX_LICENSE_FILES = COPYING
 
 OPENBOX_CONF_OPTS = \
diff --git a/bsp/buildroot/package/opencore-amr/Config.in b/bsp/buildroot/package/opencore-amr/Config.in
index 1ccc6319..e35c8ddd 100644
--- a/bsp/buildroot/package/opencore-amr/Config.in
+++ b/bsp/buildroot/package/opencore-amr/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_OPENCORE_AMR
 	bool "opencore-amr"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Library of OpenCORE Framework implementation of Adaptive Multi Rate
-	  Narrowband and Wideband (AMR-NB and AMR-WB) speech codec.
+	  Library of OpenCORE Framework implementation of Adaptive
+	  Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB)
+	  speech codec.
 
 	  http://opencore-amr.sourceforge.net/
 
diff --git a/bsp/buildroot/package/opencore-amr/opencore-amr.hash b/bsp/buildroot/package/opencore-amr/opencore-amr.hash
index a984514d..b333822b 100644
--- a/bsp/buildroot/package/opencore-amr/opencore-amr.hash
+++ b/bsp/buildroot/package/opencore-amr/opencore-amr.hash
@@ -1,2 +1,6 @@
+# From https://sourceforge.net/projects/opencore-amr/files/opencore-amr/
+md5 e0798587b91411cc092aa73091a97dfc  opencore-amr-0.1.5.tar.gz
+sha1 bef4d1e3a8a155b47569b6691a223843b33e279e  opencore-amr-0.1.5.tar.gz
 # Locally computed:
-sha256  106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385  opencore-amr-0.1.3.tar.gz
+sha256 2c006cb9d5f651bfb5e60156dbff6af3c9d35c7bbcc9015308c0aff1e14cd341  opencore-amr-0.1.5.tar.gz
+sha256 8b3f1762349248d444ab9acbafe73941254e36e1064954da56bb9ddbd5873ddb  LICENSE
diff --git a/bsp/buildroot/package/opencore-amr/opencore-amr.mk b/bsp/buildroot/package/opencore-amr/opencore-amr.mk
index 8b6aa29a..ac366e24 100644
--- a/bsp/buildroot/package/opencore-amr/opencore-amr.mk
+++ b/bsp/buildroot/package/opencore-amr/opencore-amr.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-OPENCORE_AMR_VERSION = 0.1.3
+OPENCORE_AMR_VERSION = 0.1.5
 OPENCORE_AMR_SITE = http://downloads.sourceforge.net/project/opencore-amr/opencore-amr
 OPENCORE_AMR_INSTALL_STAGING = YES
 OPENCORE_AMR_LICENSE = Apache-2.0
-OPENCORE_AMR_LICENSE_FILES = COPYING
+OPENCORE_AMR_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/bsp/buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch
similarity index 100%
rename from bsp/buildroot/package/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch
rename to bsp/buildroot/package/opencv/0002-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch
diff --git a/bsp/buildroot/package/opencv/0002-avoid-sysctl_h.patch b/bsp/buildroot/package/opencv/0002-avoid-sysctl_h.patch
deleted file mode 100644
index b63ba55a..00000000
--- a/bsp/buildroot/package/opencv/0002-avoid-sysctl_h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e5e71c31d54562f9c67a8226f0bfc08ad24b81cf Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Tue, 1 Nov 2016 09:30:23 +0100
-Subject: [PATCH 2/4] From upstream master branch:
- https://github.com/Itseez/opencv/blob/master/modules/core/src/
-
-Do not include sysctl.h targeting Linux systems.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-[Samuel Martin: convert patch to git diff, add cap_ffmpeg_impl.hpp fix]
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- modules/core/src/parallel.cpp           | 2 +-
- modules/core/src/system.cpp             | 2 +-
- modules/highgui/src/cap_ffmpeg_impl.hpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp
-index 4459a24..0374876 100644
---- a/modules/core/src/parallel.cpp
-+++ b/modules/core/src/parallel.cpp
-@@ -56,7 +56,7 @@
-     #include <sys/types.h>
-     #if defined ANDROID
-         #include <sys/sysconf.h>
--    #else
-+    #elif defined __APPLE__
-         #include <sys/sysctl.h>
-     #endif
- #endif
-diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
-index 9a7b262..731f090 100644
---- a/modules/core/src/system.cpp
-+++ b/modules/core/src/system.cpp
-@@ -163,7 +163,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix)
- #include <sys/types.h>
- #if defined ANDROID
- #include <sys/sysconf.h>
--#else
-+#elif defined __APPLE__
- #include <sys/sysctl.h>
- #endif
- #endif
-diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
-index dc3e10d..23674ff 100644
---- a/modules/highgui/src/cap_ffmpeg_impl.hpp
-+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
-@@ -126,9 +126,9 @@ extern "C" {
-     #include <unistd.h>
-     #include <stdio.h>
-     #include <sys/types.h>
--    #include <sys/sysctl.h>
-     #include <sys/time.h>
- #if defined __APPLE__
-+    #include <sys/sysctl.h>
-     #include <mach/clock.h>
-     #include <mach/mach.h>
- #endif
--- 
-2.10.2
-
diff --git a/bsp/buildroot/package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch b/bsp/buildroot/package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
new file mode 100644
index 00000000..9a81d930
--- /dev/null
+++ b/bsp/buildroot/package/opencv/0003-Update-OpenCVCompilerOptions.cmake.patch
@@ -0,0 +1,32 @@
+From 126de0cd95418811e302996161e03195bf7e631a Mon Sep 17 00:00:00 2001
+From: neok-m4700 <neok-m4700@users.noreply.github.com>
+Date: Tue, 25 Jul 2017 10:25:20 +0200
+Subject: [PATCH] Update OpenCVCompilerOptions.cmake
+
+misplaced else
+
+[Upstream commit: https://github.com/opencv/opencv/commit/126de0cd95418811e302996161e03195bf7e631a]
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ cmake/OpenCVCompilerOptions.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake
+index 9b2a4e42e..7b079c5f9 100644
+--- a/cmake/OpenCVCompilerOptions.cmake
++++ b/cmake/OpenCVCompilerOptions.cmake
+@@ -18,9 +18,9 @@ if(ENABLE_CCACHE AND NOT CMAKE_COMPILER_IS_CCACHE)
+         message(STATUS "Unable to compile program with enabled ccache, reverting...")
+         set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${__OLD_RULE_LAUNCH_COMPILE}")
+       endif()
+-    else()
+-      message(STATUS "Looking for ccache - not found")
+     endif()
++  else()
++    message(STATUS "Looking for ccache - not found")
+   endif()
+ endif()
+ 
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch b/bsp/buildroot/package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch
deleted file mode 100644
index 85a23a07..00000000
--- a/bsp/buildroot/package/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 18c868c47307b786d1bea729dccaad7f8d696cb7 Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Tue, 6 Sep 2016 11:49:00 +0200
-Subject: [PATCH 1/1] types_c.h: Fix compiling VFP assembler code
-
-Replace asm by __asm__ according to
-https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords
-as suggested by Arnout Vandecappelle:
-http://lists.busybox.net/pipermail/buildroot/2016-September/171491.html
-
-to fix build errors in ffmpeg with opencv2 support detected by
-buildroot autobuilders:
-http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/build-end.log
-
-Patch sent upstream: https://github.com/opencv/opencv/pull/7242
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- modules/core/include/opencv2/core/types_c.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h
-index c21cd2c..771715d 100644
---- a/modules/core/include/opencv2/core/types_c.h
-+++ b/modules/core/include/opencv2/core/types_c.h
-@@ -318,7 +318,7 @@ enum {
-     int res; \
-     float temp; \
-     (void)temp; \
--    asm(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
-+    __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \
-     return res;
- // 2. version for double
- #ifdef __clang__
--- 
-2.9.3
-
diff --git a/bsp/buildroot/package/opencv/Config.in b/bsp/buildroot/package/opencv/Config.in
index 5de4cf73..b7c8c416 100644
--- a/bsp/buildroot/package/opencv/Config.in
+++ b/bsp/buildroot/package/opencv/Config.in
@@ -1,12 +1,12 @@
 menuconfig BR2_PACKAGE_OPENCV
 	bool "opencv-2.4"
-	select BR2_PACKAGE_ZLIB
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_ZLIB
 	help
-	  OpenCV (Open Source Computer Vision) is a library of programming
-	  functions for real time computer vision.
+	  OpenCV (Open Source Computer Vision) is a library of
+	  programming functions for real time computer vision.
 
 	  http://opencv.org/
 
@@ -51,14 +51,13 @@ config BR2_PACKAGE_OPENCV_LIB_FLANN
 
 config BR2_PACKAGE_OPENCV_LIB_GPU
 	bool "gpu"
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
+	depends on !BR2_STATIC_LIBS
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV_LIB_LEGACY
 	select BR2_PACKAGE_OPENCV_LIB_OBJDETECT
 	select BR2_PACKAGE_OPENCV_LIB_PHOTO
 	select BR2_PACKAGE_OPENCV_LIB_VIDEO
-	depends on !BR2_STATIC_LIBS
 	help
 	  Include opencv_gpu module into the OpenCV build.
 
@@ -114,7 +113,6 @@ config BR2_PACKAGE_OPENCV_LIB_OBJDETECT
 config BR2_PACKAGE_OPENCV_LIB_PHOTO
 	bool "photo"
 	default y
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Binutils 2.25 nios2 issue
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 	help
 	  Include opencv_photo module into the OpenCV build.
@@ -137,8 +135,8 @@ config BR2_PACKAGE_OPENCV_LIB_SUPERRES
 	select BR2_PACKAGE_OPENCV_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV_LIB_VIDEO
 	help
-	  Include opencv_superres "super resolution" - module into the OpenCV
-	  build.
+	  Include opencv_superres "super resolution" - module into the
+	  OpenCV build.
 
 config BR2_PACKAGE_OPENCV_LIB_TS
 	bool "ts (touchscreen)"
@@ -162,7 +160,6 @@ config BR2_PACKAGE_OPENCV_LIB_VIDEO
 config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB
 	bool "videostab"
 	default y
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto
 	select BR2_PACKAGE_OPENCV_LIB_CALIB3D
 	select BR2_PACKAGE_OPENCV_LIB_FEATURES2D
 	select BR2_PACKAGE_OPENCV_LIB_HIGHGUI
@@ -221,7 +218,6 @@ comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads, dynamic lib
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 		BR2_STATIC_LIBS
 
-
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1
 	bool "gstreamer-1.x"
 	depends on BR2_USE_MMU # gstreamer1 -> libglib2
@@ -275,7 +271,6 @@ config BR2_PACKAGE_OPENCV_WITH_QT
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # qt
 	depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_STL
 	select BR2_PACKAGE_QT_GUI_MODULE
@@ -283,9 +278,6 @@ config BR2_PACKAGE_OPENCV_WITH_QT
 	help
 	  Use Qt with QtTest module and STL support
 
-comment "qt backend support needs a toolchain not affected by Binutils bug 19405"
-	depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
-
 config BR2_PACKAGE_OPENCV_WITH_TIFF
 	bool "tiff support"
 	select BR2_PACKAGE_TIFF
@@ -297,7 +289,8 @@ config BR2_PACKAGE_OPENCV_WITH_V4L
 	help
 	  Enable Video 4 Linux support.
 
-	  If the package libv4l is enabled, its support is automatically enabled.
+	  If the package libv4l is enabled, its support is
+	  automatically enabled.
 
 comment "Install options"
 
diff --git a/bsp/buildroot/package/opencv/opencv.hash b/bsp/buildroot/package/opencv/opencv.hash
index 9686cb28..5b4b80d0 100644
--- a/bsp/buildroot/package/opencv/opencv.hash
+++ b/bsp/buildroot/package/opencv/opencv.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 94ebcca61c30034d5fb16feab8ec12c8a868f5162d20a9f0396f0f5f6d8bbbff  opencv-2.4.13.tar.gz
+sha256 fb4769d0119c35426c3754b7fb079b407911e863958db53bdec83c7794582e41  opencv-2.4.13.3.tar.gz
+sha256 46e42877dfc3ac65769292cb4dc1a04b204ad9e40859a390f4c035d6179fbcc4  LICENSE
diff --git a/bsp/buildroot/package/opencv/opencv.mk b/bsp/buildroot/package/opencv/opencv.mk
index 947589b8..d170aec5 100644
--- a/bsp/buildroot/package/opencv/opencv.mk
+++ b/bsp/buildroot/package/opencv/opencv.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-OPENCV_VERSION = 2.4.13
+OPENCV_VERSION = 2.4.13.3
 OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION))
 OPENCV_INSTALL_STAGING = YES
-OPENCV_LICENSE = BSD-3c
+OPENCV_LICENSE = BSD-3-Clause
 OPENCV_LICENSE_FILES = LICENSE
+OPENCV_SUPPORTS_IN_SOURCE_BUILD = NO
 
 # OpenCV component options
 OPENCV_CONF_OPTS += \
@@ -79,7 +80,8 @@ OPENCV_CONF_OPTS += \
 	-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
 	-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
 	-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
-	-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
+	-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) \
+	-DENABLE_NEON=$(if $(BR2_ARM_CPU_HAS_NEON),ON,OFF)
 
 # Cuda stuff
 OPENCV_CONF_OPTS += \
@@ -192,7 +194,8 @@ OPENCV_CONF_OPTS += -DWITH_GTK=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)
-OPENCV_CONF_OPTS += -DWITH_JASPER=ON
+OPENCV_CONF_OPTS += -DWITH_JASPER=ON \
+	-DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -D__STDC_LIMIT_MACROS"
 OPENCV_DEPENDENCIES += jasper
 else
 OPENCV_CONF_OPTS += -DWITH_JASPER=OFF
diff --git a/bsp/buildroot/package/opencv3/Config.in b/bsp/buildroot/package/opencv3/Config.in
index 4c00bf1b..80a297a9 100644
--- a/bsp/buildroot/package/opencv3/Config.in
+++ b/bsp/buildroot/package/opencv3/Config.in
@@ -1,15 +1,15 @@
 menuconfig BR2_PACKAGE_OPENCV3
 	bool "opencv3"
-	select BR2_PACKAGE_ZLIB
 	depends on BR2_TOOLCHAIN_HAS_ATOMIC
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS # include dlfcn.h
 	depends on !BR2_PACKAGE_OPENCV
+	select BR2_PACKAGE_ZLIB
 	help
-	  OpenCV (Open Source Computer Vision) is a library of programming
-	  functions for real time computer vision.
+	  OpenCV (Open Source Computer Vision) is a library of
+	  programming functions for real time computer vision.
 
 	  Note that the opencv_core module and the opencv_hal library
 	  are always built and installed, not matter which other
@@ -26,8 +26,8 @@ config BR2_PACKAGE_OPENCV3_LIB_CALIB3D
 	select BR2_PACKAGE_OPENCV3_LIB_FEATURES2D
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	help
-	  Include opencv_calib3d (camera calibration and 3d reconstruction) module
-	  into the OpenCV build.
+	  Include opencv_calib3d (camera calibration and 3d
+	  reconstruction) module into the OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_FEATURES2D
 	bool "features2d"
@@ -35,15 +35,15 @@ config BR2_PACKAGE_OPENCV3_LIB_FEATURES2D
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_ML
 	help
-	  Include opencv_features2d (2d features framework) module into the OpenCV
-	  build.
+	  Include opencv_features2d (2d features framework) module
+	  into the OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_FLANN
 	bool "flann"
 	# opencv_core dependency is already enabled
 	help
-	  Include opencv_flann (clustering and search in multi-dimensional spaces)
-	  module into the OpenCV build.
+	  Include opencv_flann (clustering and search in
+	  multi-dimensional spaces) module into the OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
 	bool "highgui"
@@ -51,8 +51,8 @@ config BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_VIDEOIO
 	help
-	  Include opencv_highgui (high-level gui and media i/o) module into the
-	  OpenCV build.
+	  Include opencv_highgui (high-level gui and media i/o) module
+	  into the OpenCV build.
 
 if BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
 
@@ -85,16 +85,16 @@ comment "gtk3 support needs libgtk3"
 config BR2_PACKAGE_OPENCV3_WITH_QT
 	bool "qt4"
 	depends on BR2_PACKAGE_QT
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_STL
 	select BR2_PACKAGE_QT_GUI_MODULE
 	select BR2_PACKAGE_QT_TEST
 	help
-	  Use Qt4 with QtTest and QtGui modules and STL support, as GUI toolkit.
+	  Use Qt4 with QtTest and QtGui modules and STL support, as
+	  GUI toolkit.
 
-comment "qt4 support needs qt and a toolchain not affected by Binutils bug 19405"
+comment "qt4 support needs qt"
 	depends on BR2_USE_MMU # qt
-	depends on (!BR2_PACKAGE_QT && !BR2_PACKAGE_QT5) || BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
+	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
 
 config BR2_PACKAGE_OPENCV3_WITH_QT5
 	bool "qt5"
@@ -104,8 +104,8 @@ config BR2_PACKAGE_OPENCV3_WITH_QT5
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_WIDGETS
 	help
-	  Use Qt5 with base, concurrent, test, gui and widgets components, as GUI
-	  toolkit.
+	  Use Qt5 with base, concurrent, test, gui and widgets
+	  components, as GUI toolkit.
 
 comment "qt5 support needs qt5"
 	depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5
@@ -130,24 +130,26 @@ comment "opengl support needs an OpenGL provider"
 
 endif # BR2_PACKAGE_OPENCV3_LIB_HIGHGUI
 
-
 config BR2_PACKAGE_OPENCV3_LIB_IMGCODECS
 	bool "imgcodecs"
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	help
-	  Include opencv_imgcodecs (image codecs) module into the OpenCV build.
+	  Include opencv_imgcodecs (image codecs) module into the
+	  OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	bool "imgproc"
 	# opencv_core dependency is already enabled
 	help
-	  Include opencv_imgproc (image processing) module into the OpenCV build.
+	  Include opencv_imgproc (image processing) module into the
+	  OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_ML
 	bool "ml"
 	# opencv_core dependency is already enabled
 	help
-	  Include opencv_ml (machine learning) module into the OpenCV build.
+	  Include opencv_ml (machine learning) module into the OpenCV
+	  build.
 
 config BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
 	bool "objdetect"
@@ -155,14 +157,15 @@ config BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_ML
 	help
-	  Include opencv_objdetect (object detection) module into the OpenCV build.
+	  Include opencv_objdetect (object detection) module into the
+	  OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_PHOTO
 	bool "photo"
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	help
-	  Include opencv_photo (computational photography) module into the OpenCV
-	  build.
+	  Include opencv_photo (computational photography) module into
+	  the OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_PYTHON
 	bool "python"
@@ -170,8 +173,8 @@ config BR2_PACKAGE_OPENCV3_LIB_PYTHON
 	depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	select BR2_PACKAGE_PYTHON_NUMPY
 	help
-	  Include opencv_python module into the OpenCV build.
-	  No python example is installed.
+	  Include opencv_python module into the OpenCV build.  No
+	  python example is installed.
 
 config BR2_PACKAGE_OPENCV3_LIB_SHAPE
 	bool "shape"
@@ -179,8 +182,8 @@ config BR2_PACKAGE_OPENCV3_LIB_SHAPE
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_VIDEO
 	help
-	  Include opencv_shape (shape descriptors and matchers) module into the
-	  OpenCV build.
+	  Include opencv_shape (shape descriptors and matchers) module
+	  into the OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_STITCHING
 	bool "stitching"
@@ -189,14 +192,16 @@ config BR2_PACKAGE_OPENCV3_LIB_STITCHING
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
 	help
-	  Include opencv_stitching (images stitching) module into the OpenCV build.
+	  Include opencv_stitching (images stitching) module into the
+	  OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_SUPERRES
 	bool "superres"
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_VIDEO
 	help
-	  Include opencv_superres (super resolution) module into the OpenCV build.
+	  Include opencv_superres (super resolution) module into the
+	  OpenCV build.
 
 config BR2_PACKAGE_OPENCV3_LIB_TS
 	bool "ts"
@@ -213,13 +218,15 @@ config BR2_PACKAGE_OPENCV3_LIB_VIDEOIO
 	select BR2_PACKAGE_OPENCV3_LIB_IMGCODECS
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	help
-	  Include opencv_videoio (media i/o) module into the OpenCV build.
+	  Include opencv_videoio (media i/o) module into the OpenCV
+	  build.
 
 config BR2_PACKAGE_OPENCV3_LIB_VIDEO
 	bool "video"
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	help
-	  Include opencv_video (video analysis) module into the OpenCV build.
+	  Include opencv_video (video analysis) module into the OpenCV
+	  build.
 
 config BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB
 	bool "videostab"
@@ -229,8 +236,8 @@ config BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB
 	select BR2_PACKAGE_OPENCV3_LIB_PHOTO
 	select BR2_PACKAGE_OPENCV3_LIB_VIDEO
 	help
-	  Include opencv_videostab (video stabilization) module into the OpenCV
-	  build.
+	  Include opencv_videostab (video stabilization) module into
+	  the OpenCV build.
 
 comment "Test sets"
 config BR2_PACKAGE_OPENCV3_BUILD_TESTS
@@ -320,16 +327,17 @@ config BR2_PACKAGE_OPENCV3_WITH_V4L
 	help
 	  Enable Video 4 Linux support.
 
-	  If the package libv4l is enabled, its support is automatically enabled.
+	  If the package libv4l is enabled, its support is
+	  automatically enabled.
 
 comment "Install options"
 
 config BR2_PACKAGE_OPENCV3_INSTALL_DATA
 	bool "install extra data"
 	help
-	  Install various data that is used by cv libraries and/or demo
-	  applications, specifically for haarcascades and lbpcascades
-	  features.
+	  Install various data that is used by cv libraries and/or
+	  demo applications, specifically for haarcascades and
+	  lbpcascades features.
 
 	  For further information: see OpenCV documentation.
 
diff --git a/bsp/buildroot/package/opencv3/opencv3.hash b/bsp/buildroot/package/opencv3/opencv3.hash
index 20859ea2..de15bc8c 100644
--- a/bsp/buildroot/package/opencv3/opencv3.hash
+++ b/bsp/buildroot/package/opencv3/opencv3.hash
@@ -1,2 +1,4 @@
 # Locally calculated
-sha256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf  opencv3-3.1.0.tar.gz
+sha256 8bb312b9d9fd17336dc1f8b3ac82f021ca50e2034afc866098866176d985adc6  opencv3-3.3.0.tar.gz
+# License files, locally calculated
+sha256 e974db937899a2505f0eb43ece9d2f2eb36e8580ad88785e3ffac0d697ebaf5d  LICENSE
diff --git a/bsp/buildroot/package/opencv3/opencv3.mk b/bsp/buildroot/package/opencv3/opencv3.mk
index 8f1a64b9..15e4eadf 100644
--- a/bsp/buildroot/package/opencv3/opencv3.mk
+++ b/bsp/buildroot/package/opencv3/opencv3.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-OPENCV3_VERSION = 3.1.0
-OPENCV3_SITE = $(call github,itseez,opencv,$(OPENCV3_VERSION))
+OPENCV3_VERSION = 3.3.0
+OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION))
 OPENCV3_INSTALL_STAGING = YES
-OPENCV3_LICENSE = BSD-3c
+OPENCV3_LICENSE = BSD-3-Clause
 OPENCV3_LICENSE_FILES = LICENSE
+OPENCV3_SUPPORTS_IN_SOURCE_BUILD = NO
 
 # Uses __atomic_fetch_add_4
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
@@ -97,22 +98,8 @@ OPENCV3_CONF_OPTS += \
 #
 # * PowerPC support is turned off since its only effect is altering CFLAGS,
 #   adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot.
-# * fma3 and popcnt support is disabled because according to gcc manual [2], it
-#   is only available on x86_64 haswell, broadwell and knl architecture.
-#
-# [2] https://gcc.gnu.org/onlinedocs/gcc-5.1.0/gcc/x86-Options.html#x86-Options
 OPENCV3_CONF_OPTS += \
-	-DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \
-	-DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \
-	-DENABLE_FMA3=OFF \
-	-DENABLE_POPCNT=OFF \
-	-DENABLE_POWERPC=OFF \
-	-DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \
-	-DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \
-	-DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \
-	-DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \
-	-DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \
-	-DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF)
+	-DENABLE_POWERPC=OFF
 
 # Cuda stuff
 OPENCV3_CONF_OPTS += \
@@ -179,7 +166,6 @@ OPENCV3_CONF_OPTS += \
 	-DWITH_CSTRIPES=OFF \
 	-DWITH_DSHOW=OFF \
 	-DWITH_MSMF=OFF \
-	-DWITH_PTHREADS_PF=OFF \
 	-DWITH_VFW=OFF \
 	-DWITH_VIDEOINPUT=OFF \
 	-DWITH_WIN32UI=OFF
@@ -206,6 +192,7 @@ OPENCV3_CONF_OPTS += \
 	-DWITH_EIGEN=OFF \
 	-DWITH_GDAL=OFF \
 	-DWITH_GPHOTO2=OFF \
+	-DWITH_LAPACK=OFF \
 	-DWITH_MATLAB=OFF \
 	-DWITH_OPENCL=OFF \
 	-DWITH_OPENCL_SVM=OFF \
@@ -321,7 +308,7 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
 OPENCV3_CONF_OPTS += \
 	-DBUILD_opencv_python2=ON \
 	-DBUILD_opencv_python3=OFF \
-	-DPYTHON2_EXECUTABLE=$(HOST_DIR)/usr/bin/python2 \
+	-DPYTHON2_EXECUTABLE=$(HOST_DIR)/bin/python2 \
 	-DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \
 	-DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \
 	-DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \
@@ -332,7 +319,7 @@ else
 OPENCV3_CONF_OPTS += \
 	-DBUILD_opencv_python2=OFF \
 	-DBUILD_opencv_python3=ON \
-	-DPYTHON3_EXECUTABLE=$(HOST_DIR)/usr/bin/python3 \
+	-DPYTHON3_EXECUTABLE=$(HOST_DIR)/bin/python3 \
 	-DPYTHON3_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m \
 	-DPYTHON3_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON3_VERSION_MAJOR)m.so \
 	-DPYTHON3_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \
diff --git a/bsp/buildroot/package/opengl/libegl/Config.in b/bsp/buildroot/package/opengl/libegl/Config.in
index f756fbea..a2369989 100644
--- a/bsp/buildroot/package/opengl/libegl/Config.in
+++ b/bsp/buildroot/package/opengl/libegl/Config.in
@@ -6,5 +6,5 @@ config BR2_PACKAGE_HAS_LIBEGL_WAYLAND
 	depends on BR2_PACKAGE_HAS_LIBEGL
 
 config BR2_PACKAGE_PROVIDES_LIBEGL
-	depends on BR2_PACKAGE_HAS_LIBEGL
 	string
+	depends on BR2_PACKAGE_HAS_LIBEGL
diff --git a/bsp/buildroot/package/opengl/libgl/Config.in b/bsp/buildroot/package/opengl/libgl/Config.in
index 8b99e5bd..b9a1602a 100644
--- a/bsp/buildroot/package/opengl/libgl/Config.in
+++ b/bsp/buildroot/package/opengl/libgl/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBGL
 	bool
 
 config BR2_PACKAGE_PROVIDES_LIBGL
-	depends on BR2_PACKAGE_HAS_LIBGL
 	string
+	depends on BR2_PACKAGE_HAS_LIBGL
diff --git a/bsp/buildroot/package/opengl/libgles/Config.in b/bsp/buildroot/package/opengl/libgles/Config.in
index b7b800f3..090ef16d 100644
--- a/bsp/buildroot/package/opengl/libgles/Config.in
+++ b/bsp/buildroot/package/opengl/libgles/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBGLES
 	bool
 
 config BR2_PACKAGE_PROVIDES_LIBGLES
-	depends on BR2_PACKAGE_HAS_LIBGLES
 	string
+	depends on BR2_PACKAGE_HAS_LIBGLES
diff --git a/bsp/buildroot/package/opengl/libopenmax/Config.in b/bsp/buildroot/package/opengl/libopenmax/Config.in
index d50f2ced..901426ab 100644
--- a/bsp/buildroot/package/opengl/libopenmax/Config.in
+++ b/bsp/buildroot/package/opengl/libopenmax/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBOPENMAX
 	bool
 
 config BR2_PACKAGE_PROVIDES_LIBOPENMAX
-	depends on BR2_PACKAGE_HAS_LIBOPENMAX
 	string
+	depends on BR2_PACKAGE_HAS_LIBOPENMAX
diff --git a/bsp/buildroot/package/opengl/libopenvg/Config.in b/bsp/buildroot/package/opengl/libopenvg/Config.in
index 53cde6a8..37d9410e 100644
--- a/bsp/buildroot/package/opengl/libopenvg/Config.in
+++ b/bsp/buildroot/package/opengl/libopenvg/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_LIBOPENVG
 	bool
 
 config BR2_PACKAGE_PROVIDES_LIBOPENVG
-	depends on BR2_PACKAGE_HAS_LIBOPENVG
 	string
+	depends on BR2_PACKAGE_HAS_LIBOPENVG
diff --git a/bsp/buildroot/package/openipmi/0001-Avoid-searching-host-library-path.patch b/bsp/buildroot/package/openipmi/0001-Avoid-searching-host-library-path.patch
index 9a51d97e..44a57dcf 100644
--- a/bsp/buildroot/package/openipmi/0001-Avoid-searching-host-library-path.patch
+++ b/bsp/buildroot/package/openipmi/0001-Avoid-searching-host-library-path.patch
@@ -1,4 +1,4 @@
-From ca6e99d9fa4bf503a883407e964eaad5e18d51c7 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Baruch Siach <baruch@tkos.co.il>
 Date: Wed, 22 Jul 2015 07:04:33 +0300
 Subject: [PATCH] Avoid searching host library path
@@ -9,44 +9,44 @@ host libraries which may be different than target libraries. Don't use
 $(libdir) in the library search path.
 
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
 ---
- cmdlang/Makefile.am | 2 +-
- unix/Makefile.am    | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ cmdlang/Makefile.am | 3 +--
+ unix/Makefile.am    | 6 ++----
+ 2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
-index e80090dd0c6f..b59ff244b9a8 100644
+index 264ee12be79f..0b3843784656 100644
 --- a/cmdlang/Makefile.am
 +++ b/cmdlang/Makefile.am
-@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \
+@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \
+ libOpenIPMIcmdlang_la_LIBADD = -lm \
  	$(top_builddir)/utils/libOpenIPMIutils.la \
  	$(top_builddir)/lib/libOpenIPMI.la
- libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir)
-+	-Wl,-Map -Wl,libOpenIPMIcmdlang.map
+-libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+-	-L$(libdir)
++libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
  
  bin_PROGRAMS = openipmish
  
 diff --git a/unix/Makefile.am b/unix/Makefile.am
-index a7921477e1c4..a108bc679c9a 100644
+index 5128839dad13..bd0f897ba8d6 100644
 --- a/unix/Makefile.am
 +++ b/unix/Makefile.am
-@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
+@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
+ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
  libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
- 	$(top_builddir)/utils/libOpenIPMIutils.la
- libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir)
-+	-Wl,-Map -Wl,libOpenIPMIpthread.map
+ 	$(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
+-libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+-	-L$(libdir)
++libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
  
  libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
  libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
- 	$(GDBM_LIB)
- libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
--	-Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir)
-+	-Wl,-Map -Wl,libOpenIPMIposix.map
+ 	$(GDBM_LIB) $(RT_LIB)
+-libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+-	-L$(libdir)
++libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
  
  noinst_HEADERS = heap.h
  
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/openipmi/0002-configure.ac-detect-lrt-requirement-for-clock_gettim.patch b/bsp/buildroot/package/openipmi/0002-configure.ac-detect-lrt-requirement-for-clock_gettim.patch
deleted file mode 100644
index d58ffd7c..00000000
--- a/bsp/buildroot/package/openipmi/0002-configure.ac-detect-lrt-requirement-for-clock_gettim.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d3be03464be7fa3844dfe0837a7e2c920c107836 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 23 Jul 2015 13:35:35 +0300
-Subject: [PATCH] configure.ac: detect -lrt requirement for clock_gettime
-
-glibc versions before 2.17 require link with -lrt.
-
-Upstream status: sent, stuck in moderator's queue
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- configure.ac     | 8 ++++++++
- unix/Makefile.am | 4 ++--
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 18401f161d45..6b350a41a916 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -854,6 +854,14 @@ OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\
- AC_SUBST(OPENIPMI_SWIG_LIBS)
- AC_SUBST(OPENIPMI_SWIG_SO)
- 
-+LIB_CLOCK_GETTIME=
-+clk_saved_libs=$LIBS
-+AC_SEARCH_LIBS([clock_gettime], [rt],
-+	       [test "$ac_cv_search_clock_gettime" = "none required" ||
-+		LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
-+AC_SUBST([LIB_CLOCK_GETTIME])
-+LIBS=$clk_saved_libs
-+
- # Everything from here to AC_OUTPUT is for libedit
- 
- # AC_PROG_LIBTOOL runs AC_CANONICAL_HOST
-diff --git a/unix/Makefile.am b/unix/Makefile.am
-index a108bc679c9a..fb60242d5d3b 100644
---- a/unix/Makefile.am
-+++ b/unix/Makefile.am
-@@ -9,13 +9,13 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
- 
- libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
- libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
--	$(top_builddir)/utils/libOpenIPMIutils.la
-+	$(top_builddir)/utils/libOpenIPMIutils.la $(LIB_CLOCK_GETTIME)
- libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- 	-Wl,-Map -Wl,libOpenIPMIpthread.map
- 
- libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
- libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
--	$(GDBM_LIB)
-+	$(GDBM_LIB) $(LIB_CLOCK_GETTIME)
- libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
- 	-Wl,-Map -Wl,libOpenIPMIposix.map
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/openipmi/openipmi.hash b/bsp/buildroot/package/openipmi/openipmi.hash
index 30e37634..37048ca2 100644
--- a/bsp/buildroot/package/openipmi/openipmi.hash
+++ b/bsp/buildroot/package/openipmi/openipmi.hash
@@ -1,5 +1,4 @@
 # From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/
-sha1 826081e7ed0ad430de9b8fdb75a9eaa10c99b660 OpenIPMI-2.0.22.tar.gz
+sha1 f37656813a826a3147ed557c32408f8daa399c28 OpenIPMI-2.0.24.tar.gz
 # Locally computed
-sha256	4988900043c35fcfa9b2bf275d6593904f6429221befb770ba6ecb5502108e55	OpenIPMI-2.0.22.tar.gz
-sha256	0eafaa502ccf752899c5089159574081067d0c4ac53ea0ace33a5087f33ea32a	0001-ui-use-standard-uint32_t.patch
+sha256	bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4	OpenIPMI-2.0.24.tar.gz
diff --git a/bsp/buildroot/package/openipmi/openipmi.mk b/bsp/buildroot/package/openipmi/openipmi.mk
index 9faa7c68..8e91e4ed 100644
--- a/bsp/buildroot/package/openipmi/openipmi.mk
+++ b/bsp/buildroot/package/openipmi/openipmi.mk
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-OPENIPMI_VERSION = 2.0.22
+OPENIPMI_VERSION = 2.0.24
 OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library
 OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
-OPENIPMI_PATCH = \
-	http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch
-OPENIPMI_LICENSE = LGPLv2+, GPLv2+, BSD-3c
+OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause
 OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
 OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
 # Patching Makefile.am
@@ -17,7 +15,6 @@ OPENIPMI_AUTORECONF = YES
 OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)"
 OPENIPMI_CONF_OPTS = \
 	--with-glib=no \
-	--with-glib12=no \
 	--with-tcl=no \
 	--with-perl=no \
 	--with-python=no \
diff --git a/bsp/buildroot/package/openjpeg/0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch b/bsp/buildroot/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch
similarity index 100%
rename from bsp/buildroot/package/openjpeg/0004-CMakeLists.txt-Don-t-require-a-C-compiler.patch
rename to bsp/buildroot/package/openjpeg/0003-CMakeLists.txt-Don-t-require-a-C-compiler.patch
diff --git a/bsp/buildroot/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch b/bsp/buildroot/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch
deleted file mode 100644
index 8463e20d..00000000
--- a/bsp/buildroot/package/openjpeg/0003-avoid-malloc-poisoning-issue.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 51a1dcaa6ed5713520dca36fc58cd9240c08b7ca Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault@spatialys.com>
-Date: Thu, 7 Sep 2017 17:52:59 +0200
-Subject: [PATCH] Avoid malloc poisoning issue when including <pthread.h> of
- uclibc (#1013)
-
-Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
----
- src/lib/openjp2/thread.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib/openjp2/thread.c b/src/lib/openjp2/thread.c
-index 8b56aa4d5..af33c2c80 100644
---- a/src/lib/openjp2/thread.c
-+++ b/src/lib/openjp2/thread.c
-@@ -29,9 +29,6 @@
-  * POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include "opj_includes.h"
--
--#include "thread.h"
- #include <assert.h>
- 
- #ifdef MUTEX_win32
-@@ -46,6 +43,8 @@
- #include <windows.h>
- #include <process.h>
- 
-+#include "opj_includes.h"
-+
- OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
- {
-     return OPJ_TRUE;
-@@ -289,6 +288,10 @@ void opj_thread_join(opj_thread_t* thread)
- #include <stdlib.h>
- #include <unistd.h>
- 
-+/* Moved after all system includes, and in particular pthread.h, so as to */
-+/* avoid poisoning issuing with malloc() use in pthread.h with ulibc (#1013) */
-+#include "opj_includes.h"
-+
- OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
- {
-     return OPJ_TRUE;
-@@ -425,6 +428,8 @@ void opj_thread_join(opj_thread_t* thread)
- #else
- /* Stub implementation */
- 
-+#include "opj_includes.h"
-+
- OPJ_BOOL OPJ_CALLCONV opj_has_thread_support(void)
- {
-     return OPJ_FALSE;
diff --git a/bsp/buildroot/package/openjpeg/0004-install-static-lib.patch b/bsp/buildroot/package/openjpeg/0004-install-static-lib.patch
new file mode 100644
index 00000000..4a3bbfa2
--- /dev/null
+++ b/bsp/buildroot/package/openjpeg/0004-install-static-lib.patch
@@ -0,0 +1,27 @@
+From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Mon, 9 Oct 2017 11:40:43 +0200
+Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or
+ static-only build lacks the installation target for the library (#1019, fixes
+ regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b)
+
+Downloaded from upstream commit
+https://github.com/uclouvain/openjpeg/commit/66297f07a43d2770a97c8456d20202f3d051d980
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/lib/openjp2/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
+index 0b4520384..f8990ccf0 100644
+--- a/src/lib/openjp2/CMakeLists.txt
++++ b/src/lib/openjp2/CMakeLists.txt
+@@ -99,6 +99,7 @@ else()
+     set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
+   else()
+     add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
++    set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
+   endif()
+ endif()
+ 
diff --git a/bsp/buildroot/package/openjpeg/openjpeg.hash b/bsp/buildroot/package/openjpeg/openjpeg.hash
index 0e51aaec..dd3cf26c 100644
--- a/bsp/buildroot/package/openjpeg/openjpeg.hash
+++ b/bsp/buildroot/package/openjpeg/openjpeg.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256	6fddbce5a618e910e03ad00d66e7fcd09cc6ee307ce69932666d54c73b7c6e7b  openjpeg-2.2.0.tar.gz
+sha256 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a  openjpeg-2.3.0.tar.gz
diff --git a/bsp/buildroot/package/openjpeg/openjpeg.mk b/bsp/buildroot/package/openjpeg/openjpeg.mk
index e6717130..9a8fdab7 100644
--- a/bsp/buildroot/package/openjpeg/openjpeg.mk
+++ b/bsp/buildroot/package/openjpeg/openjpeg.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-OPENJPEG_VERSION = 2.2.0
+OPENJPEG_VERSION = 2.3.0
 OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION))
-OPENJPEG_LICENSE = BSD-2c
+OPENJPEG_LICENSE = BSD-2-Clause
 OPENJPEG_LICENSE_FILES = LICENSE
 OPENJPEG_INSTALL_STAGING = YES
 
@@ -15,4 +15,10 @@ OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng)
 OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff)
 OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LCMS2),lcms2)
 
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+OPENJPEG_CONF_OPTS += -DOPJ_USE_THREAD=ON
+else
+OPENJPEG_CONF_OPTS += -DOPJ_USE_THREAD=OFF
+endif
+
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/openldap/Config.in b/bsp/buildroot/package/openldap/Config.in
index 3085a5c8..bd39d0d0 100644
--- a/bsp/buildroot/package/openldap/Config.in
+++ b/bsp/buildroot/package/openldap/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_OPENLDAP
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # needs fork()
 	help
-	  OpenLDAP Software is an open source implementation of
-	  the Lightweight Directory Access Protocol.
+	  OpenLDAP Software is an open source implementation of the
+	  Lightweight Directory Access Protocol.
 
 	  This only installs client-side support.
 
@@ -16,9 +16,9 @@ config BR2_PACKAGE_OPENLDAP_CLIENTS
 	bool "openldap client binaries"
 	default y
 	help
-	  Install the OpenLDAP client tools (ldapadd, ldapcompare, ldapdelete,
-	  ldapexop, ldapmodify, ldapmodrdn, ldappasswd, ldapsearch, ldapurl,
-	  ldapwhoami)
+	  Install the OpenLDAP client tools (ldapadd, ldapcompare,
+	  ldapdelete, ldapexop, ldapmodify, ldapmodrdn, ldappasswd,
+	  ldapsearch, ldapurl, ldapwhoami)
 
 endif
 
diff --git a/bsp/buildroot/package/openldap/openldap.hash b/bsp/buildroot/package/openldap/openldap.hash
index 785c4897..aec4aaeb 100644
--- a/bsp/buildroot/package/openldap/openldap.hash
+++ b/bsp/buildroot/package/openldap/openldap.hash
@@ -1,4 +1,4 @@
-# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.44.md5
-md5	693ac26de86231f8dcae2b4e9d768e51	openldap-2.4.44.tgz
-# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.44.sha1
-sha1	016a738d050a68d388602a74b5e991035cdba149	openldap-2.4.44.tgz
+# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.md5
+md5 00ff8301277cdfd0af728a6927042a13  openldap-2.4.45.tgz
+# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.45.sha1
+sha1 c98437385d3eaee80c9e2c09f3f0d4b7c140233d  openldap-2.4.45.tgz
diff --git a/bsp/buildroot/package/openldap/openldap.mk b/bsp/buildroot/package/openldap/openldap.mk
index 2f738e51..2bf6fc3f 100644
--- a/bsp/buildroot/package/openldap/openldap.mk
+++ b/bsp/buildroot/package/openldap/openldap.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OPENLDAP_VERSION = 2.4.44
+OPENLDAP_VERSION = 2.4.45
 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz
 OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release
 OPENLDAP_LICENSE = OpenLDAP Public License
@@ -12,9 +12,9 @@ OPENLDAP_LICENSE_FILES = LICENSE
 OPENLDAP_INSTALL_STAGING = YES
 OPENLDAP_DEPENDENCIES = host-pkgconf
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
 OPENLDAP_TLS = openssl
-OPENLDAP_DEPENDENCIES += openssl
+OPENLDAP_DEPENDENCIES += libopenssl
 else ifeq ($(BR2_PACKAGE_GNUTLS),y)
 OPENLDAP_TLS = gnutls
 OPENLDAP_DEPENDENCIES += gnutls
diff --git a/bsp/buildroot/package/openmpi/openmpi.hash b/bsp/buildroot/package/openmpi/openmpi.hash
index 92152a24..4e967e65 100644
--- a/bsp/buildroot/package/openmpi/openmpi.hash
+++ b/bsp/buildroot/package/openmpi/openmpi.hash
@@ -1,3 +1,5 @@
 # From: https://www.open-mpi.org/software/ompi/v1.10/
-md5 b2f43d9635d2d52826e5ef9feb97fd4c  openmpi-1.10.2.tar.bz2
-sha1 03934fc0a2dd0d0d2d0459d714a976eabca938fb  openmpi-1.10.2.tar.bz2
+md5 c87c613f9acb1a4eee21fa1ac8042579  openmpi-1.10.7.tar.bz2
+sha1 fe359d8caa4888625308cf03343d913dd5ac6198  openmpi-1.10.7.tar.bz2
+# Locally computed
+sha256 a089ece151fec974905caa35b0a59039b227bdea4e7933069e94bee4ed0e5a90  openmpi-1.10.7.tar.bz2
diff --git a/bsp/buildroot/package/openmpi/openmpi.mk b/bsp/buildroot/package/openmpi/openmpi.mk
index c5b8a01b..df3270f5 100644
--- a/bsp/buildroot/package/openmpi/openmpi.mk
+++ b/bsp/buildroot/package/openmpi/openmpi.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 OPENMPI_VERSION_MAJOR = 1.10
-OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).2
+OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).7
 OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads
 OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2
-OPENMPI_LICENSE = BSD-3c
+OPENMPI_LICENSE = BSD-3-Clause
 OPENMPI_LICENSE_FILES = LICENSE
 OPENMPI_INSTALL_STAGING = YES
 OPENMPI_CONF_OPTS = --disable-vt
diff --git a/bsp/buildroot/package/openntpd/0001-fix-musl.patch b/bsp/buildroot/package/openntpd/0001-fix-musl.patch
new file mode 100644
index 00000000..e369d5a8
--- /dev/null
+++ b/bsp/buildroot/package/openntpd/0001-fix-musl.patch
@@ -0,0 +1,38 @@
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 29 Sep 2017 10:06:52 +0300
+Subject: [PATCH] Fix build with musl and older Linux kernel
+
+The musl libc carries its own copy of Linux system calls. When building
+with Linux headers older than v3.17, musl provides SYS_getrandom
+definition, but not GRND_NONBLOCK. This causes build failure for
+libressl and openntpd:
+
+getentropy_linux.c: In function 'getentropy_getrandom':
+getentropy_linux.c:205:42: error: 'GRND_NONBLOCK' undeclared (first use in this function)
+   ret = syscall(SYS_getrandom, buf, len, GRND_NONBLOCK);
+                                          ^~~~~~~~~~~~~
+
+Define GRND_NONBLOCK locally when its definition is missing to fix the
+build. There should be no run-time effect. Older kernels return ENOSYS
+for unsupported syscall().
+
+[ from upstream pull request with file location changed ]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/libressl-portable/openbsd/pull/82
+
+diff -Nuar openntpd-6.2p2-orig/compat/getentropy_linux.c openntpd-6.2p2/compat/getentropy_linux.c
+--- openntpd-6.2p2-orig/compat/getentropy_linux.c	2017-09-07 22:12:02.000000000 +0300
++++ openntpd-6.2p2/compat/getentropy_linux.c	2017-09-29 11:54:54.856245770 +0300
+@@ -194,6 +194,11 @@
+ }
+ 
+ #ifdef SYS_getrandom
++
++#ifndef GRND_NONBLOCK
++#define GRND_NONBLOCK   0x0001
++#endif
++
+ static int
+ getentropy_getrandom(void *buf, size_t len)
+ {
diff --git a/bsp/buildroot/package/openntpd/Config.in b/bsp/buildroot/package/openntpd/Config.in
index 1b856c03..c84d0ba2 100644
--- a/bsp/buildroot/package/openntpd/Config.in
+++ b/bsp/buildroot/package/openntpd/Config.in
@@ -9,6 +9,9 @@ config BR2_PACKAGE_OPENNTPD
 	  to remote NTP servers and can act as NTP server itself,
 	  redistributing the local clock. It just works.
 
+	  Crypto support is available if the LibreSSL library is
+	  enabled.
+
 	  http://www.openntpd.org/
 
 comment "openntpd needs a toolchain w/ NPTL"
diff --git a/bsp/buildroot/package/openntpd/openntpd.hash b/bsp/buildroot/package/openntpd/openntpd.hash
index 7f5d3e3f..4d00b7bb 100644
--- a/bsp/buildroot/package/openntpd/openntpd.hash
+++ b/bsp/buildroot/package/openntpd/openntpd.hash
@@ -1,2 +1,5 @@
-# From http://www.openntpd.org/txt/release-6.0p1.txt
-sha256	b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8	openntpd-6.0p1.tar.gz
+# from http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/SHA256
+sha256 7b02691524197e01ba6b1b4b7595b33956e657ba6d5c4cf2fc20ea3f4914c13a	openntpd-6.2p3.tar.gz
+
+# Locally computed
+sha256 6c1822ee950652c12bb3773849db18794f62c63452a70d018edf23e8cba71839 COPYING
diff --git a/bsp/buildroot/package/openntpd/openntpd.mk b/bsp/buildroot/package/openntpd/openntpd.mk
index 9c98064c..f5a56904 100644
--- a/bsp/buildroot/package/openntpd/openntpd.mk
+++ b/bsp/buildroot/package/openntpd/openntpd.mk
@@ -4,13 +4,19 @@
 #
 ################################################################################
 
-OPENNTPD_VERSION = 6.0p1
+OPENNTPD_VERSION = 6.2p3
 OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD
-OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3c
+OPENNTPD_LICENSE = MIT-like, BSD-2-Clause, BSD-3-Clause
 OPENNTPD_LICENSE_FILES = COPYING
-# Ships a beta libtool version hence our patch doesn't apply.
+# Need to autoreconf for our libtool patch to apply properly
 OPENNTPD_AUTORECONF = YES
 
+# Openntpd searches for tls_config_set_ca_mem which is only available
+# in LibreSSL
+ifeq ($(BR2_PACKAGE_LIBRESSL),y)
+OPENNTPD_DEPENDENCIES += openssl
+endif
+
 # openntpd uses pthread functions for arc4random emulation but forgets
 # to use -pthread
 OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread"
diff --git a/bsp/buildroot/package/openobex/0001-libusb_check_when_cross-compiling.patch b/bsp/buildroot/package/openobex/0001-libusb_check_when_cross-compiling.patch
deleted file mode 100644
index 7b8056af..00000000
--- a/bsp/buildroot/package/openobex/0001-libusb_check_when_cross-compiling.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix libusb check when cross-compiling.
-
-Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
-Index: openobex-1.5/acinclude.m4
-===================================================================
---- openobex-1.5.orig/acinclude.m4	2010-06-16 10:32:47.000000000 +0200
-+++ openobex-1.5/acinclude.m4	2010-06-16 10:35:33.000000000 +0200
-@@ -158,7 +158,7 @@
- 		;;
- 	*)
- 		PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no))
--		AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb")
-+		REQUIRES="libusb"
- 		;;
- 	esac
- 	AC_SUBST(USB_CFLAGS)
diff --git a/bsp/buildroot/package/openobex/0002-replace_deprecated_functions.patch b/bsp/buildroot/package/openobex/0002-replace_deprecated_functions.patch
deleted file mode 100644
index 17274d38..00000000
--- a/bsp/buildroot/package/openobex/0002-replace_deprecated_functions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-obex_test_cable.c: avoid to use SuSv3 LEGACY APIs
-
-Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
-Index: openobex-1.5/apps/obex_test_cable.c
-===================================================================
---- openobex-1.5.orig/apps/obex_test_cable.c	2009-02-08 19:30:22.000000000 +0100
-+++ openobex-1.5/apps/obex_test_cable.c	2010-06-16 11:11:05.000000000 +0200
-@@ -113,9 +113,9 @@
- 			if(total == sizeof(tmpbuf))
- 				return -1;
- 
--			if( (answer = index(tmpbuf, '\n')) )	{
-+			if( (answer = strchr(tmpbuf, '\n')) )	{
- 				// Remove first line (echo)
--				if( (answer_end = index(answer+1, '\n')) )	{
-+				if( (answer_end = strchr(answer+1, '\n')) )	{
- 					// Found end of answer
- 					done = 1;
- 				}
-@@ -178,7 +178,7 @@
- 	}
- 
- 	tcgetattr(gt->ttyfd, &gt->oldtio);
--	bzero(&gt->newtio, sizeof(struct termios));
-+	memset(&gt->newtio, 0, sizeof(struct termios));
- 	gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS;
- 	gt->newtio.c_iflag = IGNPAR;
- 	gt->newtio.c_oflag = 0;
diff --git a/bsp/buildroot/package/openobex/Config.in b/bsp/buildroot/package/openobex/Config.in
index ed1b81fe..e611b8d8 100644
--- a/bsp/buildroot/package/openobex/Config.in
+++ b/bsp/buildroot/package/openobex/Config.in
@@ -5,39 +5,3 @@ config BR2_PACKAGE_OPENOBEX
 	  protocol.
 
 	  http://sourceforge.net/projects/openobex
-
-if BR2_PACKAGE_OPENOBEX
-
-config BR2_PACKAGE_OPENOBEX_BLUEZ
-	bool "enable bluez support"
-	depends on !BR2_STATIC_LIBS # bluez_utils
-	depends on BR2_USE_WCHAR # libglib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
-	depends on BR2_USE_MMU # dbus
-	select BR2_PACKAGE_BLUEZ_UTILS
-
-comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_OPENOBEX_LIBUSB
-	bool "enable libusb support"
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
-
-comment "libusb support needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
-
-config BR2_PACKAGE_OPENOBEX_APPS
-	bool "install test applications"
-	help
-	  Also install the openobex test applications on target.
-
-config BR2_PACKAGE_OPENOBEX_SYSLOG
-	bool "enable debugging to the system logger"
-
-config BR2_PACKAGE_OPENOBEX_DUMP
-	bool "enable protocol dumping for debugging"
-
-endif
diff --git a/bsp/buildroot/package/openobex/openobex.hash b/bsp/buildroot/package/openobex/openobex.hash
index 2aef9819..1cdb09de 100644
--- a/bsp/buildroot/package/openobex/openobex.hash
+++ b/bsp/buildroot/package/openobex/openobex.hash
@@ -1,3 +1,6 @@
-# From http://sourceforge.net/projects/openobex/files/openobex/1.5/
-sha1	5332ef95bc8b321bda675cdb74379804c6c1a83f	openobex-1.5.0-Source.zip
-md5	f6d87af55a1d702d582173c81619176e		openobex-1.5.0-Source.zip
+# From http://sourceforge.net/projects/openobex/files/openobex/1.7.2/
+sha1 4a5098a62889134cbd2b54997e7ff3e959e601e6  openobex-1.7.2-Source.tar.gz
+md5 f6e0b6cb7dcfd731460a7e9a91429a3a  openobex-1.7.2-Source.tar.gz
+# License files, locally calculated
+sha256	e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4  COPYING
+sha256	6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3  COPYING.LIB
diff --git a/bsp/buildroot/package/openobex/openobex.mk b/bsp/buildroot/package/openobex/openobex.mk
index 6a1a10ba..ea41f65a 100644
--- a/bsp/buildroot/package/openobex/openobex.mk
+++ b/bsp/buildroot/package/openobex/openobex.mk
@@ -4,42 +4,31 @@
 #
 ################################################################################
 
-OPENOBEX_VERSION_MAJOR = 1.5
-OPENOBEX_VERSION = $(OPENOBEX_VERSION_MAJOR).0
-OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPENOBEX_VERSION_MAJOR)
-OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.zip
-# Libraries seems to be released under LGPLv2.1+,
-# while other material is under GPLv2+.
-OPENOBEX_LICENSE = GPLv2+/LGPLv2.1+
+OPENOBEX_VERSION = 1.7.2
+OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPENOBEX_VERSION)
+OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.tar.gz
+# Libraries seems to be released under LGPL-2.1+,
+# while other material is under GPL-2.0+.
+OPENOBEX_LICENSE = GPL-2.0+/LGPL-2.1+
 OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB
-
 OPENOBEX_DEPENDENCIES = host-pkgconf
-OPENOBEX_AUTORECONF = YES
 OPENOBEX_INSTALL_STAGING = YES
+OPENOBEX_CONF_OPTS = -DBUILD_DOCUMENTATION=OFF
 
-define OPENOBEX_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(DL_DIR)/$(OPENOBEX_SOURCE)
-	mv $(@D)/openobex-$(OPENOBEX_VERSION)-Source/* $(@D)
-	$(RM) -r $(@D)/openobex-$(OPENOBEX_VERSION)-Source
-endef
-
-OPENOBEX_CONF_OPTS += \
-	$(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \
-	$(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \
-	$(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump)
-
-ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y)
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
 OPENOBEX_DEPENDENCIES += bluez_utils
-OPENOBEX_CONF_OPTS += --with-bluez=$(STAGING_DIR)
-else
-OPENOBEX_CONF_OPTS += --disable-bluetooth
 endif
 
-ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
-OPENOBEX_DEPENDENCIES += libusb-compat
-OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR)
-else
-OPENOBEX_CONF_OPTS += --disable-usb
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
+OPENOBEX_DEPENDENCIES += bluez5_utils
 endif
 
-$(eval $(autotools-package))
+ifeq ($(BR2_PACKAGE_LIBUSB),y)
+OPENOBEX_DEPENDENCIES += libusb
+endif
+
+ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
+OPENOBEX_DEPENDENCIES += udev
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch b/bsp/buildroot/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
similarity index 100%
rename from bsp/buildroot/package/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
rename to bsp/buildroot/package/openocd/0001-Fix-jimtcl-auto-configuration-to-force-static-librar.patch
diff --git a/bsp/buildroot/package/openocd/0002-configure-enable-build-on-uclinux.patch b/bsp/buildroot/package/openocd/0002-configure-enable-build-on-uclinux.patch
new file mode 100644
index 00000000..2f2d3208
--- /dev/null
+++ b/bsp/buildroot/package/openocd/0002-configure-enable-build-on-uclinux.patch
@@ -0,0 +1,26 @@
+From 11ea78c4d253bb90296e2dd8c3f7fbf59ba397b6 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 17 Aug 2017 06:30:31 +0200
+Subject: [PATCH] configure: enable build on uclinux
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index c680bda7..1a7980a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -327,7 +327,7 @@ AC_ARG_ENABLE([sysfsgpio],
+   [build_sysfsgpio=$enableval], [build_sysfsgpio=no])
+ 
+ AS_CASE([$host_os],
+-  [linux*], [],
++  [linux*|uclinux*], [],
+   [
+     AS_IF([test "x$build_sysfsgpio" = "xyes"], [
+       AC_MSG_ERROR([sysfsgpio is only available on linux])
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/openocd/Config.in b/bsp/buildroot/package/openocd/Config.in
index 23136715..6cba7a04 100644
--- a/bsp/buildroot/package/openocd/Config.in
+++ b/bsp/buildroot/package/openocd/Config.in
@@ -11,109 +11,109 @@ comment "Adapters"
 
 config BR2_PACKAGE_OPENOCD_FTDI
 	bool "MPSSE mode of FTDI based devices"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the MPSSE mode of FTDI
 	  (FT2xxx/FT4xxx) based devices (default is auto)
 
 config BR2_PACKAGE_OPENOCD_STLINK
 	bool "ST-Link JTAG Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the ST-Link JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_TI_ICDI
 	bool "TI ICDI JTAG Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the TI ICDI JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_ULINK
 	bool "Keil ULINK JTAG Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the Keil ULINK JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_UBLASTER2
 	bool "Altera USB-Blaster II Compatible"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the Altera USB-Blaster
 	  II Compatible (default is auto)
 
 config BR2_PACKAGE_OPENOCD_JLINK
 	bool "Segger J-Link JTAG Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Segger J-Link JTAG Programmer and clone such as Atmel
 	  SAM-ICE
 
 config BR2_PACKAGE_OPENOCD_OSDBM
 	bool "OSDBM JTAG (only) Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the OSBDM (JTAG only)
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_OPENDOUS
 	bool "eStick/opendous JTAG Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the eStick/opendous JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_AICE
 	bool "Andes JTAG Programmer"
-	select BR2_PACKAGE_LIBUSB
 	depends on BR2_USE_MMU # use fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
 	help
 	  Enable building support for the Andes JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_VSLLINK
 	bool "Versaloon-Link JTAG Programmer"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	help
 	  Enable building support for the Versaloon-Link JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_USBPROG
 	bool "USBProg JTAG Programmer"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	help
 	  Enable building support for the USBProg JTAG
 	  Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_RLINK
 	bool "Raisonance RLink JTAG Programmer"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	help
 	  Enable building support for the Raisonance RLink
 	  JTAG Programmer (default is auto)
 
 config BR2_PACKAGE_OPENOCD_ARMEW
 	bool "Olimex ARM-JTAG-EW Programmer"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb
 	help
 	  Enable building support for the Olimex ARM-JTAG-EW
 	  Programmer (default is auto)
@@ -123,14 +123,6 @@ config BR2_PACKAGE_OPENOCD_PARPORT
 	help
 	  Enable building the pc parallel port driver
 
-config BR2_PACKAGE_OPENOCD_FT2XXX
-	bool "FT2232 based devices (DEPRECATED)"
-	select BR2_PACKAGE_LIBFTDI1
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
-	help
-	  (DEPRECATED) Enable building support for FT2232
-	  based devices using the libftdi library
-
 config BR2_PACKAGE_OPENOCD_VPI
 	bool "JTAG VPI"
 	help
@@ -138,8 +130,8 @@ config BR2_PACKAGE_OPENOCD_VPI
 
 config BR2_PACKAGE_OPENOCD_UBLASTER
 	bool "Altera USB-Blaster"
-	select BR2_PACKAGE_LIBFTDI1
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
+	select BR2_PACKAGE_LIBFTDI1
 	help
 	  Enable building support for the Altera USB-Blaster
 	  using the libftdi driver, opensource alternate of
@@ -178,18 +170,18 @@ config BR2_PACKAGE_OPENOCD_GW16012
 
 config BR2_PACKAGE_OPENOCD_PRESTO
 	bool "ASIX Presto Programmer"
-	select BR2_PACKAGE_LIBFTDI1
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
+	select BR2_PACKAGE_LIBFTDI1
 	help
 	  Enable building support for ASIX Presto Programmer
 	  using the libftdi driver
 
 config BR2_PACKAGE_OPENOCD_OPENJTAG
 	bool "OpenJTAG Programmer"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
 	select BR2_PACKAGE_LIBFTDI1
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_LIBUSB_COMPAT # needs usb.h
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb
 	help
 	  Enable building support for the OpenJTAG Programmer
 	  with ftdi driver
diff --git a/bsp/buildroot/package/openocd/openocd.hash b/bsp/buildroot/package/openocd/openocd.hash
index 4ca11e20..3fb817b4 100644
--- a/bsp/buildroot/package/openocd/openocd.hash
+++ b/bsp/buildroot/package/openocd/openocd.hash
@@ -1,3 +1,4 @@
-# From http://sourceforge.net/projects/openocd/files/openocd/0.9.0/
-sha1 bcf99bb21f09513065b2c9ece148ace7d16cdd0c openocd-0.9.0.tar.bz2
-md5 665cc98ae9e7297e09ec6ac7235fee49 openocd-0.9.0.tar.bz2
+# From http://sourceforge.net/projects/openocd/files/openocd/0.10.0/
+sha1 3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a  openocd-0.10.0.tar.bz2
+md5 b412bdef0481a3859c6585eb69f6f6ba  openocd-0.10.0.tar.bz2
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/bsp/buildroot/package/openocd/openocd.mk b/bsp/buildroot/package/openocd/openocd.mk
index 0d183657..548d8b81 100644
--- a/bsp/buildroot/package/openocd/openocd.mk
+++ b/bsp/buildroot/package/openocd/openocd.mk
@@ -4,11 +4,19 @@
 #
 ################################################################################
 
-OPENOCD_VERSION = 0.9.0
+OPENOCD_VERSION = 0.10.0
 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION)
+OPENOCD_LICENSE = GPL-2.0+
+OPENOCD_LICENSE_FILES = COPYING
+# 0002-configure-enable-build-on-uclinux.patch patches configure.ac
+OPENOCD_AUTORECONF = YES
 
-OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+# The bundled jimtcl really wants to find a existing $CXX, so feed it
+# false when we do not have one.
+OPENOCD_CONF_ENV = \
+	$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
+	CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
 
 OPENOCD_CONF_OPTS = \
 	--oldincludedir=$(STAGING_DIR)/usr/include \
@@ -45,9 +53,8 @@ OPENOCD_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_OPENOCD_ARMEW),--enable-armjtagew,--disable-armjtagew) \
 	$(if $(BR2_PACKAGE_OPENOCD_CMSIS_DAP),--enable-cmsis-dap,--disable-cmsis-dap) \
 	$(if $(BR2_PACKAGE_OPENOCD_PARPORT),--enable-parport,--disable-parport) \
-	$(if $(BR2_PACKAGE_OPENOCD_FT2XXX),--enable-legacy-ft2232_libftdi,--disable-legacy-ft2232_libftdi) \
 	$(if $(BR2_PACKAGE_OPENOCD_VPI),--enable-jtag_vpi,--disable-jtag_vpi) \
-	$(if $(BR2_PACKAGE_OPENOCD_UBLASTER),--enable-usb_blaster_libftdi,--disable-usb_blaster_libftdi) \
+	$(if $(BR2_PACKAGE_OPENOCD_UBLASTER),--enable-usb-blaster,--disable-usb-blaster) \
 	$(if $(BR2_PACKAGE_OPENOCD_AMTJT),--enable-amtjtagaccel,--disable-amjtagaccel) \
 	$(if $(BR2_PACKAGE_OPENOCD_ZY1000_MASTER),--enable-zy1000-master,--disable-zy1000-master) \
 	$(if $(BR2_PACKAGE_OPENOCD_ZY1000),--enable-zy1000,--disable-zy1000) \
@@ -55,8 +62,8 @@ OPENOCD_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_OPENOCD_AT91RM),--enable-at91rm9200,--disable-at91rm9200) \
 	$(if $(BR2_PACKAGE_OPENOCD_BCM2835),--enable-bcm2835gpio,--disable-bcm2835gpio) \
 	$(if $(BR2_PACKAGE_OPENOCD_GW16012),--enable-gw16012,--disable-gw16012) \
-	$(if $(BR2_PACKAGE_OPENOCD_PRESTO),--enable-presto_libftdi,--disable-presto_libftdi) \
-	$(if $(BR2_PACKAGE_OPENOCD_OPENJTAG),--enable-openjtag_ftdi,--disable-openjtag_ftdi) \
+	$(if $(BR2_PACKAGE_OPENOCD_PRESTO),--enable-presto,--disable-presto) \
+	$(if $(BR2_PACKAGE_OPENOCD_OPENJTAG),--enable-openjtag,--disable-openjtag) \
 	$(if $(BR2_PACKAGE_OPENOCD_BUSPIRATE),--enable-buspirate,--disable-buspirate) \
 	$(if $(BR2_PACKAGE_OPENOCD_SYSFS),--enable-sysfsgpio,--disable-sysfsgpio)
 
@@ -82,15 +89,15 @@ HOST_OPENOCD_CONF_OPTS = \
 	--enable-armjtagew \
 	--enable-parport \
 	--enable-jtag_vpi \
-	--enable-usb_blaster_libftdi \
+	--enable-usb-blaster \
 	--enable-amtjtagaccel \
 	--enable-gw16012 \
-	--enable-presto_libftdi \
-	--enable-openjtag_ftdi \
+	--enable-presto \
+	--enable-openjtag \
 	--enable-buspirate \
 	--enable-sysfsgpio \
-	--oldincludedir=$(HOST_DIR)/usr/include \
-	--includedir=$(HOST_DIR)/usr/include \
+	--oldincludedir=$(HOST_DIR)/include \
+	--includedir=$(HOST_DIR)/include \
 	--disable-doxygen-html \
 	--with-jim-shared=no \
 	--disable-shared \
@@ -108,11 +115,10 @@ HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat
 # build system believe the documentation doesn't need to be
 # regenerated.
 define OPENOCD_FIX_VERSION_TEXI
-       touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi
+	touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi
 endef
 OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
 HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI
 
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/openpgm/openpgm.mk b/bsp/buildroot/package/openpgm/openpgm.mk
index 42b0a5d8..8c85344b 100644
--- a/bsp/buildroot/package/openpgm/openpgm.mk
+++ b/bsp/buildroot/package/openpgm/openpgm.mk
@@ -6,7 +6,7 @@
 
 OPENPGM_VERSION = release-5-2-122
 OPENPGM_SITE = $(call github,steve-o,openpgm,$(OPENPGM_VERSION))
-OPENPGM_LICENSE = LGPLv2.1+
+OPENPGM_LICENSE = LGPL-2.1+
 OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE
 OPENPGM_INSTALL_STAGING = YES
 OPENPGM_SUBDIR = openpgm/pgm
diff --git a/bsp/buildroot/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch b/bsp/buildroot/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch
index 1f5eb89d..0e1c21ec 100644
--- a/bsp/buildroot/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch
+++ b/bsp/buildroot/package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch
@@ -1,4 +1,4 @@
-From 4e8aa3a9e1696e5e02ff0a3ae5a72f034ee60c2f Mon Sep 17 00:00:00 2001
+From 16230b7f51bff2bdf061fa80e9a49c807596bb92 Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Wed, 25 May 2016 15:57:10 +0200
 Subject: [PATCH] install the stack libraries to "lib" subdirectory
@@ -53,7 +53,7 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
  11 files changed, 11 insertions(+), 11 deletions(-)
 
 diff --git a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt
-index 73b641d..b8b5c9d 100644
+index 2b3da16..ddb3e92 100644
 --- a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt
 +++ b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt
 @@ -96,4 +96,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
@@ -63,7 +63,7 @@ index 73b641d..b8b5c9d 100644
 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt
-index 323eafc..459124a 100644
+index 3be6c52..cf1b1dd 100644
 --- a/stack/proj/linux/liboplkcn/CMakeLists.txt
 +++ b/stack/proj/linux/liboplkcn/CMakeLists.txt
 @@ -90,4 +90,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
@@ -73,7 +73,7 @@ index 323eafc..459124a 100644
 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
-index f8b1850..c16194a 100644
+index 904de6c..d8713a8 100644
 --- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
 +++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt
 @@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
@@ -83,7 +83,7 @@ index f8b1850..c16194a 100644
 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
-index 0f07e63..0074616 100644
+index e2514cf..a4e2b75 100644
 --- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
 +++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt
 @@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
@@ -93,7 +93,7 @@ index 0f07e63..0074616 100644
 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
-index d0dad78..ee0fdec 100644
+index 98f068c..bb20006 100644
 --- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
 +++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt
 @@ -76,4 +76,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
@@ -153,7 +153,7 @@ index cd97882..aaaa526 100644
 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
-index 7e1a820..82205c2 100644
+index 0c29087..1783134 100644
 --- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
 +++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt
 @@ -79,4 +79,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})
@@ -163,5 +163,5 @@ index 7e1a820..82205c2 100644
 -INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)
 +INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)
 -- 
-2.8.1
+2.9.4
 
diff --git a/bsp/buildroot/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch b/bsp/buildroot/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch
index 7d338a45..8e815c04 100644
--- a/bsp/buildroot/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch
+++ b/bsp/buildroot/package/openpowerlink/0002-cmake-install-oplk-headers-files.patch
@@ -1,4 +1,4 @@
-From 8cb39257e12d6b82190aec8ab9ad89a9ee13af71 Mon Sep 17 00:00:00 2001
+From f7679a4083de3a9dba80cd719ad4904fbade349b Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Wed, 25 May 2016 15:57:29 +0200
 Subject: [PATCH] cmake: install oplk headers files
@@ -15,10 +15,10 @@ Signed-off-by: Romain Naour <romain.naour@gmail.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/stack/CMakeLists.txt b/stack/CMakeLists.txt
-index 3b11c54..4eadf44 100644
+index 69454f2..45f131d 100644
 --- a/stack/CMakeLists.txt
 +++ b/stack/CMakeLists.txt
-@@ -105,3 +105,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU
+@@ -110,3 +110,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU
  ELSE()
      MESSAGE(FATAL_ERROR "Unknown Platform and processor combination ${CMAKE_SYSTEM_NAME} and ${CMAKE_SYSTEM_PROCESSOR}!!")
  ENDIF()
@@ -28,5 +28,5 @@ index 3b11c54..4eadf44 100644
 +################################################################################
 +INSTALL(DIRECTORY ${STACK_INCLUDE_DIR}/oplk DESTINATION "include")
 -- 
-2.8.1
+2.9.4
 
diff --git a/bsp/buildroot/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch b/bsp/buildroot/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch
index 9cbf02d2..cd8f9274 100644
--- a/bsp/buildroot/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch
+++ b/bsp/buildroot/package/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch
@@ -1,4 +1,4 @@
-From 7f81c74726aec4aef6bd93ee644200ab34375437 Mon Sep 17 00:00:00 2001
+From cd0945a323cecb638ce56f2e3d7fb4e8c004b98b Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@gmail.com>
 Date: Wed, 25 May 2016 15:59:20 +0200
 Subject: [PATCH] Add top level CMakeLists.txt
@@ -174,10 +174,10 @@ index 49aab66..d9fd418 100644
              TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB})
          ENDIF()
 diff --git a/drivers/linux/drv_daemon_pcap/CMakeLists.txt b/drivers/linux/drv_daemon_pcap/CMakeLists.txt
-index 1ef9353..e720834 100644
+index 2b4a2c1..ecceb4c 100644
 --- a/drivers/linux/drv_daemon_pcap/CMakeLists.txt
 +++ b/drivers/linux/drv_daemon_pcap/CMakeLists.txt
-@@ -104,9 +104,15 @@ ENDIF()
+@@ -109,9 +109,15 @@ ENDIF()
  SET(OPLKLIB_DIR ${OPLK_BASE_DIR}/stack/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR})
  SET(OPLKLIB_INCDIR ${OPLK_BASE_DIR}/stack/proj/${SYSTEM_NAME_DIR}/lib${LIB_NAME})
  
@@ -197,5 +197,5 @@ index 1ef9353..e720834 100644
  
  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -std=c99 -pthread -fno-strict-aliasing")
 -- 
-2.8.1
+2.9.4
 
diff --git a/bsp/buildroot/package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch b/bsp/buildroot/package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch
deleted file mode 100644
index d246f466..00000000
--- a/bsp/buildroot/package/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 041799c4990d56b9822ee3ae3ffbb181e5c16c81 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Thu, 3 Nov 2016 21:09:57 +0100
-Subject: [PATCH] [FIX] Veth: Fix compilation on Linux kernels >= 4.7
-
-dev->trans_start was replaced by netif_trans_update helper in kernel
-4.7 by commit 860e9538a9482bb84589f7d0718a7e6d0a944d58.
-
-Upstream status: Pending
-https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/177
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- stack/src/kernel/veth/veth-linuxkernel.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/stack/src/kernel/veth/veth-linuxkernel.c b/stack/src/kernel/veth/veth-linuxkernel.c
-index 8c68c47..ecdc000 100644
---- a/stack/src/kernel/veth/veth-linuxkernel.c
-+++ b/stack/src/kernel/veth/veth-linuxkernel.c
-@@ -287,7 +287,11 @@ static int vethStartXmit(struct sk_buff* pSkb_p, struct net_device* pNetDevice_p
-     struct net_device_stats* pStats = netdev_priv(pNetDevice_p);
- 
-     //save time stamp
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0))
-     pNetDevice_p->trans_start = jiffies;
-+#else
-+    netif_trans_update(pNetDevice_p);
-+#endif
- 
-     frameInfo.frame.pBuffer = (tPlkFrame*)pSkb_p->data;
-     frameInfo.frameSize = pSkb_p->len;
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/openpowerlink/Config.in b/bsp/buildroot/package/openpowerlink/Config.in
index d5e97643..68ea7519 100644
--- a/bsp/buildroot/package/openpowerlink/Config.in
+++ b/bsp/buildroot/package/openpowerlink/Config.in
@@ -110,8 +110,8 @@ endmenu
 endif # BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB
 
 config BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER
-	depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB
 	bool "PCIe Powerlink Driver"
+	depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB
 
 menu "demos"
 
diff --git a/bsp/buildroot/package/openpowerlink/openpowerlink.hash b/bsp/buildroot/package/openpowerlink/openpowerlink.hash
index f9c94f90..f69950dd 100644
--- a/bsp/buildroot/package/openpowerlink/openpowerlink.hash
+++ b/bsp/buildroot/package/openpowerlink/openpowerlink.hash
@@ -1,5 +1,5 @@
-# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.5.0/
-md5	929b778a6a4d448d502da5a428322949	openPOWERLINK_V2.5.0.tar.gz
-sha1	28e2e5621550421e74ba94738f6c12eb8c279fce	openPOWERLINK_V2.5.0.tar.gz
+# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.6.2/
+md5	bbb268e33e55424de563cb677703d8f7	openPOWERLINK_V2.6.2.tar.gz
+sha1	bf6a8b202c1192b531ce6d6c4c6254e5689c65fe	openPOWERLINK_V2.6.2.tar.gz
 # sha256 locally computed
-sha256	1cb8c44626dbb7f224520667e437b4b430a32699560914f379679b6c58c1309c	openPOWERLINK_V2.5.0.tar.gz
+sha256	38d7a93c05cc0167be5c498e625d1efddeac2616ceb1bc8c3c6679552ae6da15	openPOWERLINK_V2.6.2.tar.gz
diff --git a/bsp/buildroot/package/openpowerlink/openpowerlink.mk b/bsp/buildroot/package/openpowerlink/openpowerlink.mk
index dcb548cc..e2958b30 100644
--- a/bsp/buildroot/package/openpowerlink/openpowerlink.mk
+++ b/bsp/buildroot/package/openpowerlink/openpowerlink.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-OPENPOWERLINK_VERSION = V2.5.0
+OPENPOWERLINK_VERSION = V2.6.2
 OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION)
 OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz
-OPENPOWERLINK_LICENSE = BSD-2c, GPLv2
+OPENPOWERLINK_LICENSE = BSD-2-Clause, GPL-2.0
 OPENPOWERLINK_LICENSE_FILES = license.md
 
 OPENPOWERLINK_INSTALL_STAGING = YES
@@ -40,7 +40,8 @@ OPENPOWERLINK_CONF_OPTS += \
 	-DCFG_COMPILE_LIB_CN=$(OPENPOWERLINK_CN_ONOFF) \
 	-DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \
 	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
-	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF
+	-DCFG_COMPILE_LIB_CNDRV_PCAP=OFF \
+	-DPCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config"
 else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB),y)
 OPENPOWERLINK_DEPENDENCIES += libpcap
 OPENPOWERLINK_CONF_OPTS += \
@@ -52,7 +53,8 @@ OPENPOWERLINK_CONF_OPTS += \
 	-DCFG_COMPILE_LIB_CN=OFF \
 	-DCFG_COMPILE_LIB_CNAPP_USERINTF=$(OPENPOWERLINK_CN_ONOFF) \
 	-DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \
-	-DCFG_COMPILE_LIB_CNDRV_PCAP=$(OPENPOWERLINK_CN_ONOFF)
+	-DCFG_COMPILE_LIB_CNDRV_PCAP=$(OPENPOWERLINK_CN_ONOFF) \
+	-DPCAP_CONFIG="$(STAGING_DIR)/usr/bin/pcap-config"
 else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB),y)
 OPENPOWERLINK_CONF_OPTS += \
 	-DCFG_COMPILE_LIB_MN=OFF \
diff --git a/bsp/buildroot/package/openssh/0001-configure-ac-detect-mips-abi.patch b/bsp/buildroot/package/openssh/0001-configure-ac-detect-mips-abi.patch
deleted file mode 100644
index 0d43e6ba..00000000
--- a/bsp/buildroot/package/openssh/0001-configure-ac-detect-mips-abi.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f4fcd8c788a4854d4ebae400cf55e3957f906835 Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Tue, 20 Jun 2017 16:42:11 +0100
-Subject: [PATCH] configure.ac: detect MIPS ABI
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-[Upstream commit: ttps://github.com/openssh/openssh-portable/commit/f4fcd8c788a4854d4ebae400cf55e3957f906835]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 18079acba..f990cfe08 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -746,6 +746,27 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
- 	fi
- 	AC_CHECK_HEADERS([linux/seccomp.h linux/filter.h linux/audit.h], [],
- 	    [], [#include <linux/types.h>])
-+	# Obtain MIPS ABI
-+	case "$host" in
-+	mips*)
-+		AC_COMPILE_IFELSE([
-+#if _MIPS_SIM != _ABIO32
-+#error
-+#endif
-+			],[mips_abi="o32"],[AC_COMPILE_IFELSE([
-+#if _MIPS_SIM != _ABIN32
-+#error
-+#endif
-+				],[mips_abi="n32"],[AC_COMPILE_IFELSE([
-+#if _MIPS_SIM != _ABI64
-+#error
-+#endif
-+					],[mips_abi="n64"],[AC_MSG_ERROR([unknown MIPS ABI])
-+				])
-+			])
-+		])
-+		;;
-+	esac
- 	AC_MSG_CHECKING([for seccomp architecture])
- 	seccomp_audit_arch=
- 	case "$host" in
diff --git a/bsp/buildroot/package/openssh/0003-fix-pam-uclibc-pthreads-clash.patch b/bsp/buildroot/package/openssh/0001-fix-pam-uclibc-pthreads-clash.patch
similarity index 100%
rename from bsp/buildroot/package/openssh/0003-fix-pam-uclibc-pthreads-clash.patch
rename to bsp/buildroot/package/openssh/0001-fix-pam-uclibc-pthreads-clash.patch
diff --git a/bsp/buildroot/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch b/bsp/buildroot/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch
deleted file mode 100644
index 879af5e3..00000000
--- a/bsp/buildroot/package/openssh/0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From afc3e31b637db9dae106d4fad78f7b481c8c24e3 Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Tue, 20 Jun 2017 16:42:28 +0100
-Subject: [PATCH] configure.ac: properly set seccomp_audit_arch for MIPS64
-
-Currently seccomp_audit_arch is set to AUDIT_ARCH_MIPS64 or
-AUDIT_ARCH_MIPSEL64 (depending on the endinness) when openssh is built
-for MIPS64. However, that's only valid for n64 ABI. The right macros for
-n32 ABI defined in seccomp.h are AUDIT_ARCH_MIPS64N32 and
-AUDIT_ARCH_MIPSEL64N32, for big and little endian respectively.
-
-Because of that an sshd built for MIPS64 n32 rejects connection attempts
-and the output of strace reveals that the problem is related to seccomp
-audit:
-
-[pid   194] prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, {len=57,
-filter=0x555d5da0}) = 0
-[pid   194] write(7, "\0\0\0]\0\0\0\5\0\0\0Ulist_hostkey_types: "..., 97) = ?
-[pid   193] <... poll resumed> )        = 2 ([{fd=5, revents=POLLIN|POLLHUP},
-{fd=6, revents=POLLHUP}])
-[pid   194] +++ killed by SIGSYS +++
-
-This patch fixes that problem by setting the right value to
-seccomp_audit_arch taking into account the MIPS64 ABI.
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-[Upstream commit: https://github.com/openssh/openssh-portable/commit/afc3e31b637db9dae106d4fad78f7b481c8c24e3]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f990cfe08..5d640f679 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -801,10 +801,24 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
- 		seccomp_audit_arch=AUDIT_ARCH_MIPSEL
- 		;;
- 	mips64-*)
--		seccomp_audit_arch=AUDIT_ARCH_MIPS64
-+		case "$mips_abi" in
-+		"n32")
-+			seccomp_audit_arch=AUDIT_ARCH_MIPS64N32
-+			;;
-+		"n64")
-+			seccomp_audit_arch=AUDIT_ARCH_MIPS64
-+			;;
-+		esac
- 		;;
- 	mips64el-*)
--		seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
-+		case "$mips_abi" in
-+		"n32")
-+			seccomp_audit_arch=AUDIT_ARCH_MIPSEL64N32
-+			;;
-+		"n64")
-+			seccomp_audit_arch=AUDIT_ARCH_MIPSEL64
-+			;;
-+		esac
- 		;;
- 	esac
- 	if test "x$seccomp_audit_arch" != "x" ; then
diff --git a/bsp/buildroot/package/openssh/0004-fix-howmany-include.patch b/bsp/buildroot/package/openssh/0002-fix-howmany-include.patch
similarity index 100%
rename from bsp/buildroot/package/openssh/0004-fix-howmany-include.patch
rename to bsp/buildroot/package/openssh/0002-fix-howmany-include.patch
diff --git a/bsp/buildroot/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch b/bsp/buildroot/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch
deleted file mode 100644
index ce600729..00000000
--- a/bsp/buildroot/package/openssh/0005-openbsd-compat-bsd-getpagesize.c-include-includes.h-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9a43657a3dcb868b4f36ade3aba5dcf0871fb412 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Mon, 30 Oct 2017 23:36:56 +0100
-Subject: [PATCH] openbsd-compat/bsd-getpagesize.c: include includes.h for
- config.h defines
-
-The configure script checks for getpagesize() and sets HAVE_GETPAGESIZE in
-config.h, but bsd-getpagesize.c forgot to include includes.h (which
-indirectly includes config.h) so the checks always fails, causing linker
-issues when linking statically on systems with getpagesize():
-
-http://autobuild.buildroot.net/results/8cc/8cc30818a400c7a392a3de787cabc9cd8425495f/build-end.log
-
-Fix it by including includes.h
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- openbsd-compat/bsd-getpagesize.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/openbsd-compat/bsd-getpagesize.c b/openbsd-compat/bsd-getpagesize.c
-index 9daddfbd..416a8d4c 100644
---- a/openbsd-compat/bsd-getpagesize.c
-+++ b/openbsd-compat/bsd-getpagesize.c
-@@ -1,5 +1,7 @@
- /* Placed in the public domain */
- 
-+#include "includes.h"
-+
- #ifndef HAVE_GETPAGESIZE
- 
- #include <unistd.h>
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/openssh/Config.in b/bsp/buildroot/package/openssh/Config.in
index 75911402..683a9c0e 100644
--- a/bsp/buildroot/package/openssh/Config.in
+++ b/bsp/buildroot/package/openssh/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_OPENSSH
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	help
-	  A free version of the SSH protocol suite of network connectivity
-	  tools. The standard 'ssh', 'sshd', 'scp', and friends.
+	  A free version of the SSH protocol suite of network
+	  connectivity tools. The standard 'ssh', 'sshd', 'scp', and
+	  friends.
 
 	  http://www.openssh.com/
diff --git a/bsp/buildroot/package/openssh/openssh.hash b/bsp/buildroot/package/openssh/openssh.hash
index d8a4da32..0b31f70e 100644
--- a/bsp/buildroot/package/openssh/openssh.hash
+++ b/bsp/buildroot/package/openssh/openssh.hash
@@ -1,4 +1,4 @@
-# From http://www.openssh.com/txt/release-7.6 (base64 encoded)
-sha256 a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723  openssh-7.6p1.tar.gz
+# From http://www.openssh.com/txt/release-7.8 (base64 encoded)
+sha256 1a484bb15152c183bb2514e112aa30dd34138c3cfb032eee5490a66c507144ca  openssh-7.8p1.tar.gz
 # Locally calculated
 sha256 05a4c25ef464e19656c5259bd4f4da8428efab01044f3541b79fbb3ff209350f  LICENCE
diff --git a/bsp/buildroot/package/openssh/openssh.mk b/bsp/buildroot/package/openssh/openssh.mk
index 368cb33f..45a11ee6 100644
--- a/bsp/buildroot/package/openssh/openssh.mk
+++ b/bsp/buildroot/package/openssh/openssh.mk
@@ -4,14 +4,10 @@
 #
 ################################################################################
 
-OPENSSH_VERSION = 7.6p1
+OPENSSH_VERSION = 7.8p1
 OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
-OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain
+OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain
 OPENSSH_LICENSE_FILES = LICENCE
-# Autoreconf needed due to the following patches modifying configure.ac:
-# 0001-configure-ac-detect-mips-abi.patch
-# 0002-configure-ac-properly-set-seccomp-audit-arch-for-mips64.patch
-OPENSSH_AUTORECONF = YES
 OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)"
 OPENSSH_CONF_OPTS = \
 	--sysconfdir=/etc/ssh \
@@ -32,6 +28,13 @@ endif
 
 OPENSSH_DEPENDENCIES = zlib openssl
 
+ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y)
+OPENSSH_DEPENDENCIES += cryptodev-linux
+OPENSSH_CONF_OPTS += --with-ssl-engine
+else
+OPENSSH_CONF_OPTS += --without-ssl-engine
+endif
+
 ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
 define OPENSSH_INSTALL_PAM_CONF
 	$(INSTALL) -D -m 644 $(@D)/contrib/sshd.pam.generic $(TARGET_DIR)/etc/pam.d/sshd
@@ -66,4 +69,10 @@ define OPENSSH_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S50sshd
 endef
 
+define OPENSSH_INSTALL_SSH_COPY_ID
+	$(INSTALL) -D -m 755 $(@D)/contrib/ssh-copy-id $(TARGET_DIR)/usr/bin/ssh-copy-id
+endef
+
+OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_SSH_COPY_ID
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/openssl/Config.in b/bsp/buildroot/package/openssl/Config.in
index e08b648b..d8403314 100644
--- a/bsp/buildroot/package/openssl/Config.in
+++ b/bsp/buildroot/package/openssl/Config.in
@@ -1,28 +1,86 @@
+config BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+	bool
+
 config BR2_PACKAGE_OPENSSL
+	bool "openssl support"
+	select BR2_PACKAGE_HAS_OPENSSL
+	help
+	  Select the desired ssl library provider.
+
+if BR2_PACKAGE_OPENSSL
+
+choice
+	prompt "ssl library"
+	default BR2_PACKAGE_LIBOPENSSL
+	help
+	  Select OpenSSL or LibreSSL.
+
+config BR2_PACKAGE_LIBOPENSSL
 	bool "openssl"
 	select BR2_PACKAGE_ZLIB
 	help
-	  A collaborative effort to develop a robust, commercial-grade, fully
-	  featured, and Open Source toolkit implementing the Secure Sockets
-	  Layer (SSL v2/v3) and Transport Security (TLS v1) as well as a
-	  full-strength general-purpose cryptography library.
+	  A collaborative effort to develop a robust, commercial-grade,
+	  fully featured, and Open Source toolkit implementing the
+	  Secure Sockets Layer (SSL v2/v3) and Transport Security
+	  (TLS v1) as well as a full-strength general-purpose
+	  cryptography library.
 
 	  http://www.openssl.org/
 
 	  Note: Some helper scripts need perl.
 
-if BR2_PACKAGE_OPENSSL
+if BR2_PACKAGE_LIBOPENSSL
 
-config BR2_PACKAGE_OPENSSL_BIN
+config BR2_PACKAGE_LIBOPENSSL_BIN
 	bool "openssl binary"
 	help
-	  Install the openssl binary and the associated helper scripts to the
-	  target file system. This is a command line tool for doing various
-	  cryptographic stuff.
+	  Install the openssl binary and the associated helper scripts
+	  to the target file system. This is a command line tool for
+	  doing various cryptographic stuff.
 
-config BR2_PACKAGE_OPENSSL_ENGINES
+config BR2_PACKAGE_LIBOPENSSL_ENGINES
 	bool "openssl additional engines"
 	help
 	  Install additional encryption engine libraries.
 
 endif
+
+config BR2_PACKAGE_LIBRESSL
+	bool "libressl"
+	depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+	# uClibc on noMMU doesn't provide __register_atfork()
+	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU)
+	help
+	  LibreSSL is a version of the TLS/crypto stack forked from
+	  OpenSSL in 2014, with goals of modernizing the codebase,
+	  improving security, and applying best practice development
+	  processes.
+
+	  http://www.libressl.org/
+
+if BR2_PACKAGE_LIBRESSL
+
+config BR2_PACKAGE_LIBRESSL_BIN
+	bool "openssl binary"
+	help
+	  Install the openssl binary to the target file system. This is
+	  a command line tool for doing various cryptographic stuff.
+
+endif
+
+endchoice
+
+config BR2_PACKAGE_HAS_OPENSSL
+	bool
+
+config BR2_PACKAGE_PROVIDES_OPENSSL
+	string
+	default "libopenssl"  if BR2_PACKAGE_LIBOPENSSL
+	default "libressl"  if BR2_PACKAGE_LIBRESSL
+
+endif
+
+# ensure libopenssl is used for the host variant
+config BR2_PACKAGE_PROVIDES_HOST_OPENSSL
+	string
+	default "host-libopenssl"
diff --git a/bsp/buildroot/package/openssl/openssl.hash b/bsp/buildroot/package/openssl/openssl.hash
deleted file mode 100644
index 48b7471c..00000000
--- a/bsp/buildroot/package/openssl/openssl.hash
+++ /dev/null
@@ -1,8 +0,0 @@
-# From https://www.openssl.org/source/openssl-1.0.2o.tar.gz.sha256
-sha256	ec3f5c9714ba0fd45cb4e087301eb1336c317e0d20b575a125050470e8089e4d	openssl-1.0.2o.tar.gz
-# Locally computed
-sha256	eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9	openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f	openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956	openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f	openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-sha256	c8f60f4842bbad0353f5d81620e72b168b5638ca3a0a999f5da113b22491612e	LICENSE
diff --git a/bsp/buildroot/package/openssl/openssl.mk b/bsp/buildroot/package/openssl/openssl.mk
index e11fe120..d20e184c 100644
--- a/bsp/buildroot/package/openssl/openssl.mk
+++ b/bsp/buildroot/package/openssl/openssl.mk
@@ -4,166 +4,5 @@
 #
 ################################################################################
 
-OPENSSL_VERSION = 1.0.2o
-OPENSSL_SITE = http://www.openssl.org/source
-OPENSSL_LICENSE = OpenSSL or SSLeay
-OPENSSL_LICENSE_FILES = LICENSE
-OPENSSL_INSTALL_STAGING = YES
-OPENSSL_DEPENDENCIES = zlib
-HOST_OPENSSL_DEPENDENCIES = host-zlib
-OPENSSL_TARGET_ARCH = generic32
-OPENSSL_CFLAGS = $(TARGET_CFLAGS)
-OPENSSL_PATCH = \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \
-	https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
-
-# relocation truncated to fit: R_68K_GOT16O
-ifeq ($(BR2_m68k_cf),y)
-OPENSSL_CFLAGS += -mxgot
-endif
-
-ifeq ($(BR2_USE_MMU),)
-OPENSSL_CFLAGS += -DHAVE_FORK=0
-endif
-
-ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y)
-OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS
-OPENSSL_DEPENDENCIES += cryptodev
-endif
-
-# Some architectures are optimized in OpenSSL
-# Doesn't work for thumb-only (Cortex-M?)
-ifeq ($(BR2_ARM_CPU_HAS_ARM),y)
-OPENSSL_TARGET_ARCH = armv4
-endif
-ifeq ($(ARCH),aarch64)
-OPENSSL_TARGET_ARCH = aarch64
-endif
-ifeq ($(ARCH),powerpc)
-# 4xx cores seem to have trouble with openssl's ASM optimizations
-ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),)
-OPENSSL_TARGET_ARCH = ppc
-endif
-endif
-ifeq ($(ARCH),powerpc64)
-OPENSSL_TARGET_ARCH = ppc64
-endif
-ifeq ($(ARCH),powerpc64le)
-OPENSSL_TARGET_ARCH = ppc64le
-endif
-ifeq ($(ARCH),x86_64)
-OPENSSL_TARGET_ARCH = x86_64
-endif
-
-define HOST_OPENSSL_CONFIGURE_CMDS
-	(cd $(@D); \
-		$(HOST_CONFIGURE_OPTS) \
-		./config \
-		--prefix=$(HOST_DIR)/usr \
-		--openssldir=$(HOST_DIR)/etc/ssl \
-		--libdir=/lib \
-		shared \
-		zlib-dynamic \
-	)
-	$(SED) "s#-O[0-9]#$(HOST_CFLAGS)#" $(@D)/Makefile
-endef
-
-define OPENSSL_CONFIGURE_CMDS
-	(cd $(@D); \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(TARGET_CONFIGURE_OPTS) \
-		./Configure \
-			linux-$(OPENSSL_TARGET_ARCH) \
-			--prefix=/usr \
-			--openssldir=/etc/ssl \
-			--libdir=/lib \
-			$(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \
-			$(if $(BR2_STATIC_LIBS),no-shared,shared) \
-			no-rc5 \
-			enable-camellia \
-			enable-mdc2 \
-			enable-tlsext \
-			$(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \
-			$(if $(BR2_STATIC_LIBS),no-dso) \
-	)
-	$(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile
-	$(SED) "s#-O[0-9]#$(OPENSSL_CFLAGS)#" $(@D)/Makefile
-	$(SED) "s# build_tests##" $(@D)/Makefile
-endef
-
-# libdl is not available in a static build, and this is not implied by no-dso
-ifeq ($(BR2_STATIC_LIBS),y)
-define OPENSSL_FIXUP_STATIC_MAKEFILE
-	$(SED) 's#-ldl##g' $(@D)/Makefile
-endef
-OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE
-endif
-
-define HOST_OPENSSL_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define OPENSSL_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
-endef
-
-define OPENSSL_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install
-endef
-
-define HOST_OPENSSL_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
-endef
-
-define OPENSSL_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install
-	rm -rf $(TARGET_DIR)/usr/lib/ssl
-	rm -f $(TARGET_DIR)/usr/bin/c_rehash
-endef
-
-# libdl has no business in a static build
-ifeq ($(BR2_STATIC_LIBS),y)
-define OPENSSL_FIXUP_STATIC_PKGCONFIG
-	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc
-	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc
-	$(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc
-endef
-OPENSSL_POST_INSTALL_STAGING_HOOKS += OPENSSL_FIXUP_STATIC_PKGCONFIG
-endif
-
-ifneq ($(BR2_STATIC_LIBS),y)
-# libraries gets installed read only, so strip fails
-define OPENSSL_INSTALL_FIXUPS_SHARED
-	chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so
-	for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \
-	do chmod +w $$i; done
-endef
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS_SHARED
-endif
-
-ifeq ($(BR2_PACKAGE_PERL),)
-define OPENSSL_REMOVE_PERL_SCRIPTS
-	$(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget}
-endef
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_PERL_SCRIPTS
-endif
-
-ifeq ($(BR2_PACKAGE_OPENSSL_BIN),)
-define OPENSSL_REMOVE_BIN
-	$(RM) -f $(TARGET_DIR)/usr/bin/openssl
-	$(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.*,c_*}
-endef
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_BIN
-endif
-
-ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y)
-define OPENSSL_REMOVE_OPENSSL_ENGINES
-	rm -rf $(TARGET_DIR)/usr/lib/engines
-endef
-OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_ENGINES
-endif
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
+$(eval $(virtual-package))
+$(eval $(host-virtual-package))
diff --git a/bsp/buildroot/package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch b/bsp/buildroot/package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch
deleted file mode 100644
index aa4d0ede..00000000
--- a/bsp/buildroot/package/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0f7bf4706d2932aaa50904fc529a853c9f86478f Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Mon, 13 Feb 2017 22:18:11 +0100
-Subject: [PATCH] uClibc-ng is compatible to glibc
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-Pull-Request: https://github.com/xelerance/Openswan/pull/227
-
----
- linux/include/openswan.h | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/linux/include/openswan.h b/linux/include/openswan.h
-index e2c45a130..66b9d42b2 100644
---- a/linux/include/openswan.h
-+++ b/linux/include/openswan.h
-@@ -27,18 +27,6 @@
- #endif
- 
- /*
-- * When using uclibc, malloc(0) returns NULL instead of success. This is
-- * to make it use the inbuilt work-around.
-- * See: http://osdir.com/ml/network.freeswan.devel/2003-11/msg00009.html
-- */
--#ifdef __UCLIBC__
--# if !defined(__MALLOC_GLIBC_COMPAT__) && !defined(MALLOC_GLIBC_COMPAT)
--#  warning Please compile uclibc with GLIBC_COMPATIBILITY defined
--# endif
--#endif
--
--
--/*
-  * We've just got to have some datatypes defined...  And annoyingly, just
-  * where we get them depends on whether we're in userland or not.
-  */
--- 
-2.11.1
-
diff --git a/bsp/buildroot/package/openswan/Config.in b/bsp/buildroot/package/openswan/Config.in
index 5db665c6..340686cc 100644
--- a/bsp/buildroot/package/openswan/Config.in
+++ b/bsp/buildroot/package/openswan/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_OPENSWAN
 	bool "openswan"
 	depends on BR2_USE_MMU # iproute2
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # iproute2
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2
 	depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_IPROUTE2
@@ -10,7 +10,7 @@ config BR2_PACKAGE_OPENSWAN
 
 	  http://www.openswan.org
 
-comment "openswan needs a uClibc or glibc toolchain w/ headers >= 3.0"
+comment "openswan needs a uClibc or glibc toolchain w/ headers >= 3.4"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || \
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \
 		BR2_TOOLCHAIN_USES_MUSL
diff --git a/bsp/buildroot/package/openswan/openswan.hash b/bsp/buildroot/package/openswan/openswan.hash
index 5929f8d1..805ab948 100644
--- a/bsp/buildroot/package/openswan/openswan.hash
+++ b/bsp/buildroot/package/openswan/openswan.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	c1605c96d3c3cf357cefea7622f3acbc7a02d6a3cebfb76979327b566084a5ea	openswan-2.6.46.tar.gz
+sha256 9a3eb041084c3ab125dd645c40e8f5563efe73e18a3881cf2ce3582001daafc5  openswan-2.6.50.tar.gz
diff --git a/bsp/buildroot/package/openswan/openswan.mk b/bsp/buildroot/package/openswan/openswan.mk
index 5c8e143b..928eb9bb 100644
--- a/bsp/buildroot/package/openswan/openswan.mk
+++ b/bsp/buildroot/package/openswan/openswan.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-OPENSWAN_VERSION = 2.6.46
-OPENSWAN_SITE = http://download.openswan.org/openswan
-OPENSWAN_LICENSE = GPLv2+, BSD-3c
+OPENSWAN_VERSION = 2.6.50
+OPENSWAN_SITE = https://download.openswan.org/openswan
+OPENSWAN_LICENSE = GPL-2.0+, BSD-3-Clause
 OPENSWAN_LICENSE_FILES = COPYING LICENSE
 
 OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2
diff --git a/bsp/buildroot/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch b/bsp/buildroot/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch
new file mode 100644
index 00000000..90a945bb
--- /dev/null
+++ b/bsp/buildroot/package/opentracing-cpp/0001-CMake-make-shared-static-target-a-configurable-optio.patch
@@ -0,0 +1,74 @@
+From 9462847f23a25524fdc2112cbc8de3f2c02a1669 Mon Sep 17 00:00:00 2001
+From: Jan Heylen <jan.heylen@nokia.com>
+Date: Fri, 22 Dec 2017 22:04:29 +0100
+Subject: [PATCH] CMake: make shared/static target a configurable option
+
+Signed-off-by: Jan Heylen <jan.heylen@nokia.com>
+---
+ CMakeLists.txt | 40 ++++++++++++++++++++++++++++------------
+ 1 file changed, 28 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index aadf2f9..d03bd00 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,18 +70,36 @@ endif()
+ include_directories(include)
+ include_directories(SYSTEM 3rd_party/include)
+ 
++option(BUILD_SHARED_LIBS "Build as a shared library" ON)
++option(BUILD_STATIC_LIBS "Build as a static library" ON)
++
++if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
++    message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
++endif()
++
+ set(SRCS src/propagation.cpp src/noop.cpp src/tracer.cpp)
+-add_library(opentracing SHARED ${SRCS})
+-target_include_directories(opentracing INTERFACE "$<INSTALL_INTERFACE:include/>")
+-set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
++
++if (BUILD_SHARED_LIBS)
++  add_library(opentracing SHARED ${SRCS})
++  target_include_directories(opentracing INTERFACE "$<INSTALL_INTERFACE:include/>")
++  set_target_properties(opentracing PROPERTIES VERSION ${OPENTRACING_VERSION_STRING}
+                                              SOVERSION ${OPENTRACING_VERSION_MAJOR})
+-add_library(opentracing-static STATIC ${SRCS})
+-set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
+-target_include_directories(opentracing-static INTERFACE "$<INSTALL_INTERFACE:include/>")
+-if (CLANG_TIDY_EXE)
+-  set_target_properties(opentracing PROPERTIES
++  install(TARGETS opentracing EXPORT OpenTracingTargets
++          LIBRARY DESTINATION lib
++          ARCHIVE DESTINATION lib)
++  if (CLANG_TIDY_EXE)
++    set_target_properties(opentracing PROPERTIES
+                                     CXX_CLANG_TIDY "${DO_CLANG_TIDY}")
+-endif()
++  endif()
++endif(BUILD_SHARED_LIBS)
++
++if (BUILD_STATIC_LIBS)
++  add_library(opentracing-static STATIC ${SRCS})
++  set_target_properties(opentracing-static PROPERTIES OUTPUT_NAME opentracing)
++  target_include_directories(opentracing-static INTERFACE "$<INSTALL_INTERFACE:include/>")
++  install(TARGETS opentracing-static EXPORT OpenTracingTargets
++          ARCHIVE DESTINATION lib)
++endif(BUILD_STATIC_LIBS)
+ 
+ 
+ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
+@@ -89,9 +107,7 @@ install(DIRECTORY 3rd_party/include/opentracing DESTINATION include
+                            PATTERN "*.h")
+ install(DIRECTORY include/opentracing DESTINATION include
+             FILES_MATCHING PATTERN "*.h")
+-install(TARGETS opentracing opentracing-static EXPORT OpenTracingTargets
+-        LIBRARY DESTINATION lib
+-        ARCHIVE DESTINATION lib)
++
+ 
+ # ==============================================================================
+ # Package configuration setup
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/opentracing-cpp/Config.in b/bsp/buildroot/package/opentracing-cpp/Config.in
new file mode 100644
index 00000000..4ee7b29d
--- /dev/null
+++ b/bsp/buildroot/package/opentracing-cpp/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_OPENTRACING_CPP
+	bool "opentracing-cpp"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
+	help
+	  OpenTracing API for C++
+
+	  http://opentracing.io
+
+comment "opentracing-cpp needs a toolchain w/ C++, gcc >= 4.8"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+
+comment "opentracing-cpp needs exception_ptr"
+	depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
diff --git a/bsp/buildroot/package/opentracing-cpp/opentracing-cpp.hash b/bsp/buildroot/package/opentracing-cpp/opentracing-cpp.hash
new file mode 100644
index 00000000..d25dbafe
--- /dev/null
+++ b/bsp/buildroot/package/opentracing-cpp/opentracing-cpp.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 c77041cb2f147ac81b2b0702abfced5565a9cebc318d045c060a4c3e074009ee opentracing-cpp-v1.2.0.tar.gz
+sha256 b80bffcfee825a69645f7ca97ddba48714031ea5c845198d184714d5490798b6 COPYING
diff --git a/bsp/buildroot/package/opentracing-cpp/opentracing-cpp.mk b/bsp/buildroot/package/opentracing-cpp/opentracing-cpp.mk
new file mode 100644
index 00000000..4e296fc9
--- /dev/null
+++ b/bsp/buildroot/package/opentracing-cpp/opentracing-cpp.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# opentracing-cpp
+#
+################################################################################
+
+OPENTRACING_CPP_VERSION = v1.2.0
+OPENTRACING_CPP_SITE = $(call github,opentracing,opentracing-cpp,$(OPENTRACING_CPP_VERSION))
+OPENTRACING_CPP_LICENSE = MIT
+OPENTRACING_CPP_LICENSE_FILES = COPYING
+
+OPENTRACING_CPP_INSTALL_STAGING = YES
+
+# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
+# although BUILD_STATIC_LIBS=ON is default, make it explicit,
+# cmake and static/shared libs is confusing enough already.
+ifeq ($(BR2_STATIC_LIBS),y)
+OPENTRACING_CPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
+else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
+OPENTRACING_CPP_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
+else ifeq ($(BR2_SHARED_LIBS),y)
+OPENTRACING_CPP_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/opentyrian-data/Config.in b/bsp/buildroot/package/opentyrian-data/Config.in
index df25c218..dd3b0c13 100644
--- a/bsp/buildroot/package/opentyrian-data/Config.in
+++ b/bsp/buildroot/package/opentyrian-data/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_OPENTYRIAN_DATA
 	bool "OpenTyrian data"
 	depends on BR2_PACKAGE_OPENTYRIAN
 	help
-	  Data files to use with OpenTyrian game. Currently only the original
-	  Tyrian 2.1 data files, that have been released as Freeware in 2004,
-	  are compatible.
+	  Data files to use with OpenTyrian game. Currently only the
+	  original Tyrian 2.1 data files, that have been released as
+	  Freeware in 2004, are compatible.
 
 	  http://code.google.com/p/opentyrian/wiki/FAQ
diff --git a/bsp/buildroot/package/opentyrian/Config.in b/bsp/buildroot/package/opentyrian/Config.in
index b0c519fa..cbc73e5d 100644
--- a/bsp/buildroot/package/opentyrian/Config.in
+++ b/bsp/buildroot/package/opentyrian/Config.in
@@ -3,11 +3,11 @@ config BR2_PACKAGE_OPENTYRIAN
 	select BR2_PACKAGE_SDL
 	select BR2_PACKAGE_OPENTYRIAN_DATA
 	help
-	  OpenTyrian is a port of the DOS shoot-em-up Tyrian. It uses SDL,
-	  making it easily cross-platform.
+	  OpenTyrian is a port of the DOS shoot-em-up Tyrian. It uses
+	  SDL, making it easily cross-platform.
 	  It requires the original data files to run.
-	  A display with minimum 640x480 resolution and a keyboard are needed
-	  to play the game.
+	  A display with minimum 640x480 resolution and a keyboard are
+	  needed to play the game.
 	  If you want some sound, activate ALSA with OSS emulation.
 
 	  https://bitbucket.org/opentyrian/opentyrian/wiki/Home
diff --git a/bsp/buildroot/package/opentyrian/opentyrian.mk b/bsp/buildroot/package/opentyrian/opentyrian.mk
index c6b19d2a..12e41ad9 100644
--- a/bsp/buildroot/package/opentyrian/opentyrian.mk
+++ b/bsp/buildroot/package/opentyrian/opentyrian.mk
@@ -7,7 +7,7 @@
 OPENTYRIAN_VERSION = 9c9f0ec3532b
 OPENTYRIAN_SITE = https://bitbucket.org/opentyrian/opentyrian
 OPENTYRIAN_SITE_METHOD = hg
-OPENTYRIAN_LICENSE = GPLv2+
+OPENTYRIAN_LICENSE = GPL-2.0+
 OPENTYRIAN_LICENSE_FILES = COPYING
 
 OPENTYRIAN_DEPENDENCIES = sdl
diff --git a/bsp/buildroot/package/openvmtools/Config.in b/bsp/buildroot/package/openvmtools/Config.in
index 79c503cf..66d4f1b1 100644
--- a/bsp/buildroot/package/openvmtools/Config.in
+++ b/bsp/buildroot/package/openvmtools/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_OPENVMTOOLS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_ENABLE_LOCALE
-	depends on !BR2_TOOLCHAIN_USES_UCLIBC
+	depends on BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_LIBGLIB2
 	select BR2_PACKAGE_LIBDNET
 	help
@@ -14,10 +14,11 @@ config BR2_PACKAGE_OPENVMTOOLS
 
 	  http://open-vm-tools.sourceforge.net/
 
-	  ICU locales, Xerces, and X11 tools are currently not supported.
+	  ICU locales, Xerces, and X11 tools are currently not
+	  supported.
 
-	  NOTE: Support for vmblock-fuse will be enabled in openvmtools if the
-		libfuse package is selected.
+	  NOTE: Support for vmblock-fuse will be enabled in
+	  openvmtools if the libfuse package is selected.
 
 if BR2_PACKAGE_OPENVMTOOLS
 
@@ -33,11 +34,11 @@ comment "procps support needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS"
 
 config BR2_PACKAGE_OPENVMTOOLS_PAM
 	bool "PAM support"
-	select BR2_PACKAGE_LINUX_PAM
 	# linux-pam needs locale and wchar, but we already have this
 	# dependency on the main symbol, above.
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
+	select BR2_PACKAGE_LINUX_PAM
 	help
 	  Support for PAM in openvmtools
 
@@ -46,9 +47,9 @@ comment "PAM support needs a glibc toolchain w/ dynamic library"
 
 endif
 
-comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale"
+comment "openvmtools needs a glibc toolchain w/ wchar, threads, RPC, locale"
 	depends on BR2_i386 || BR2_x86_64
 	depends on BR2_USE_MMU
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \
-		BR2_TOOLCHAIN_USES_UCLIBC
+		!BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/openvmtools/openvmtools.mk b/bsp/buildroot/package/openvmtools/openvmtools.mk
index d3eda5c0..9501ef33 100644
--- a/bsp/buildroot/package/openvmtools/openvmtools.mk
+++ b/bsp/buildroot/package/openvmtools/openvmtools.mk
@@ -7,7 +7,7 @@
 OPENVMTOOLS_VERSION = 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f
 OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION))
 OPENVMTOOLS_SUBDIR = open-vm-tools
-OPENVMTOOLS_LICENSE = LGPLv2.1
+OPENVMTOOLS_LICENSE = LGPL-2.1
 OPENVMTOOLS_LICENSE_FILES = $(OPENVMTOOLS_SUBDIR)/COPYING
 
 # Autoreconf needed or config/missing will run configure again at buildtime
@@ -17,7 +17,7 @@ OPENVMTOOLS_CONF_OPTS = --with-dnet \
 	--without-gtkmm --without-kernel-modules \
 	--disable-deploypkg --without-xerces
 OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" "
-OPENVMTOOLS_DEPENDENCIES = libglib2 libdnet
+OPENVMTOOLS_DEPENDENCIES = host-nfs-utils libglib2 libdnet
 
 # When libfuse is available, openvmtools can build vmblock-fuse, so
 # make sure that libfuse gets built first
diff --git a/bsp/buildroot/package/openvpn/openvpn.mk b/bsp/buildroot/package/openvpn/openvpn.mk
index 6cbc35dc..086f99bf 100644
--- a/bsp/buildroot/package/openvpn/openvpn.mk
+++ b/bsp/buildroot/package/openvpn/openvpn.mk
@@ -8,7 +8,7 @@ OPENVPN_VERSION = 2.4.4
 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz
 OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
 OPENVPN_DEPENDENCIES = host-pkgconf openssl
-OPENVPN_LICENSE = GPLv2
+OPENVPN_LICENSE = GPL-2.0
 OPENVPN_LICENSE_FILES = COPYRIGHT.GPL
 OPENVPN_CONF_OPTS = \
 	--disable-plugin-auth-pam \
diff --git a/bsp/buildroot/package/openzwave/0001-Fix-compilation-of-MinOZW.patch b/bsp/buildroot/package/openzwave/0001-Fix-compilation-of-MinOZW.patch
new file mode 100644
index 00000000..773672e0
--- /dev/null
+++ b/bsp/buildroot/package/openzwave/0001-Fix-compilation-of-MinOZW.patch
@@ -0,0 +1,37 @@
+From 599e2a11c6f48dde744012ec45686c08e15f3059 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fabrice.fontaine@orange.com>
+Date: Mon, 3 Oct 2016 10:35:52 +0200
+Subject: [PATCH] Fix compilation of MinOZW (#991)
+
+LIBDIR was used in cpp/examples/MinOZW/Makefile to add dynamic
+libraries. However, as it was unset by default, the cross-compilation
+could fail if the host had a library such as libnss3.so in /.
+To fix this issue, this patch sets LIBDIR to top_buildir if it is unset
+
+Fixes:
+  http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898
+
+Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
+[Upstream commit: https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ cpp/examples/MinOZW/Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/cpp/examples/MinOZW/Makefile b/cpp/examples/MinOZW/Makefile
+index e575632a3..95d684b77 100644
+--- a/cpp/examples/MinOZW/Makefile
++++ b/cpp/examples/MinOZW/Makefile
+@@ -17,9 +17,11 @@ DEBUG_LDFLAGS	:= -g
+ 
+ top_srcdir := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../../)
+ 
++#where is put the temporary library
++LIBDIR  	?= $(top_builddir)
+ 
+ INCLUDES	:= -I $(top_srcdir)/cpp/src -I $(top_srcdir)/cpp/tinyxml/ -I $(top_srcdir)/cpp/hidapi/hidapi/
+-LIBS =  $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/*.so $(top_builddir)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
++LIBS =  $(wildcard $(LIBDIR)/*.so $(LIBDIR)/*.dylib $(top_builddir)/cpp/build/*.so $(top_builddir)/cpp/build/*.dylib )
+ LIBSDIR = $(abspath $(dir $(firstword $(LIBS))))
+ minozwsrc := $(notdir $(wildcard $(top_srcdir)/cpp/examples/MinOZW/*.cpp))
+ VPATH := $(top_srcdir)/cpp/examples/MinOZW
diff --git a/bsp/buildroot/package/openzwave/0001-Fix-warning-on-wcsdup-implicit-declaration.patch b/bsp/buildroot/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch
similarity index 100%
rename from bsp/buildroot/package/openzwave/0001-Fix-warning-on-wcsdup-implicit-declaration.patch
rename to bsp/buildroot/package/openzwave/0002-Fix-warning-on-wcsdup-implicit-declaration.patch
diff --git a/bsp/buildroot/package/openzwave/0002-Ensure-correct-git-repository-path.patch b/bsp/buildroot/package/openzwave/0003-Ensure-correct-git-repository-path.patch
similarity index 100%
rename from bsp/buildroot/package/openzwave/0002-Ensure-correct-git-repository-path.patch
rename to bsp/buildroot/package/openzwave/0003-Ensure-correct-git-repository-path.patch
diff --git a/bsp/buildroot/package/openzwave/Config.in b/bsp/buildroot/package/openzwave/Config.in
index 190b88b6..86f45dc7 100644
--- a/bsp/buildroot/package/openzwave/Config.in
+++ b/bsp/buildroot/package/openzwave/Config.in
@@ -5,10 +5,10 @@ config BR2_PACKAGE_OPENZWAVE
 	depends on BR2_PACKAGE_HAS_UDEV
 	depends on BR2_USE_WCHAR
 	help
-	  Free software library that interfaces with selected Z-Wave PC
-	  controllers, allowing anyone to create applications that manipulate
-	  and respond to devices on a Z-Wave network, without requiring
-	  in-depth knowledge of the Z-Wave protocol
+	  Free software library that interfaces with selected Z-Wave
+	  PC controllers, allowing anyone to create applications that
+	  manipulate and respond to devices on a Z-Wave network,
+	  without requiring in-depth knowledge of the Z-Wave protocol
 
 	  http://www.openzwave.net
 
diff --git a/bsp/buildroot/package/openzwave/openzwave.hash b/bsp/buildroot/package/openzwave/openzwave.hash
index d07961ed..f3a677bd 100644
--- a/bsp/buildroot/package/openzwave/openzwave.hash
+++ b/bsp/buildroot/package/openzwave/openzwave.hash
@@ -1,3 +1,6 @@
 # Locally computed:
 sha256	abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238	openzwave-V1.5.tar.gz
-sha256	98851964fd8de3dd40f00d0032b47c61c17a4cf789ad5792e14149da5ab8755e	599e2a11c6f48dde744012ec45686c08e15f3059.patch
+sha256	c8db08727d03bea1213cdb29459b4b489b0d68a0866765df40ff205c6cd7224b	license/license.txt
+sha256	4da452226e9064b597020ad404e1c78d8175bc31ad7c1908485a92c0a4d70284	license/lgpl.txt
+sha256	33ffdead480674d5f33e2934822a3b93c93e3f8c894667a3bf30bd1195b38f83	license/gpl.txt
+sha256	6f50ebf9af9b6658c7936ffcc6fedd99254df984c0fec2e6ffb9f3aa1c4ef3e1	license/Apache-License-2.0.txt
diff --git a/bsp/buildroot/package/openzwave/openzwave.mk b/bsp/buildroot/package/openzwave/openzwave.mk
index 199d9e1b..38515e38 100644
--- a/bsp/buildroot/package/openzwave/openzwave.mk
+++ b/bsp/buildroot/package/openzwave/openzwave.mk
@@ -6,19 +6,13 @@
 
 OPENZWAVE_VERSION = V1.5
 OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION))
-OPENZWAVE_LICENSE = LGPLv3+, GPLv3 (examples), Apache-2.0 (sh2ju.sh)
+OPENZWAVE_LICENSE = LGPL-3.0+, GPL-3.0 (examples), Apache-2.0 (sh2ju.sh)
 OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \
 	license/gpl.txt license/Apache-License-2.0.txt
 
 OPENZWAVE_DEPENDENCIES = host-pkgconf udev
 OPENZWAVE_INSTALL_STAGING = YES
 
-# This patch fixes incorrect default value of LIBDIR:
-# http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898
-# This patch is currently in dev branch and will be a part of v1.6
-OPENZWAVE_PATCH = \
-	https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059.patch
-
 # Set instlibdir to install libopenzwave.so* in the correct directory
 # otherwise openzwave will check that /lib64 exists (on the host) to
 # know if the library should be installed in $(PREFIX)/lib or $(PREFIX)/lib64.
diff --git a/bsp/buildroot/package/opkg-utils/opkg-utils.mk b/bsp/buildroot/package/opkg-utils/opkg-utils.mk
index aa3c44d9..df202220 100644
--- a/bsp/buildroot/package/opkg-utils/opkg-utils.mk
+++ b/bsp/buildroot/package/opkg-utils/opkg-utils.mk
@@ -7,7 +7,7 @@
 OPKG_UTILS_VERSION = 0.3.4
 OPKG_UTILS_SITE = http://git.yoctoproject.org/git/opkg-utils
 OPKG_UTILS_SITE_METHOD = git
-OPKG_UTILS_LICENSE = GPLv2+
+OPKG_UTILS_LICENSE = GPL-2.0+
 OPKG_UTILS_LICENSE_FILES = COPYING
 
 define HOST_OPKG_UTILS_BUILD_CMDS
@@ -15,7 +15,7 @@ define HOST_OPKG_UTILS_BUILD_CMDS
 endef
 
 define HOST_OPKG_UTILS_INSTALL_CMDS
-	$(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) PREFIX=/usr install
+	$(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/opkg/Config.in b/bsp/buildroot/package/opkg/Config.in
index 5a4bbc26..20f6fa2f 100644
--- a/bsp/buildroot/package/opkg/Config.in
+++ b/bsp/buildroot/package/opkg/Config.in
@@ -4,17 +4,18 @@ comment "opkg needs a toolchain w/ wchar"
 
 config BR2_PACKAGE_OPKG
 	bool "opkg"
-	select BR2_PACKAGE_LIBARCHIVE
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # libarchive
+	select BR2_PACKAGE_LIBARCHIVE
 	help
-	  Opkg is a lightweight package management system, based on ipkg. It is
-	  written in C and resembles apt/dpkg in operation. It is intended for
-	  use on embedded Linux devices.
-	  Opkg is maintained, stable, robust and conservative in its memory
-	  usage, despite its buggy ipkg ancestry. As best it can, opkg
-	  maintains backwards compatibility with ipkg and conforms to a subset
-	  of debian's policy manual regarding control files.
+	  Opkg is a lightweight package management system, based on
+	  ipkg. It is written in C and resembles apt/dpkg in
+	  operation. It is intended for use on embedded Linux devices.
+	  Opkg is maintained, stable, robust and conservative in its
+	  memory usage, despite its buggy ipkg ancestry. As best it
+	  can, opkg maintains backwards compatibility with ipkg and
+	  conforms to a subset of debian's policy manual regarding
+	  control files.
 
 	  http://code.google.com/p/opkg/
 
diff --git a/bsp/buildroot/package/opkg/opkg.hash b/bsp/buildroot/package/opkg/opkg.hash
new file mode 100644
index 00000000..80f3f0d1
--- /dev/null
+++ b/bsp/buildroot/package/opkg/opkg.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 2ec7157ccf866e49ca139e3632ba1ca9d61dc24382606b55062e423161a530b0  opkg-v0.3.1.tar.gz
diff --git a/bsp/buildroot/package/opkg/opkg.mk b/bsp/buildroot/package/opkg/opkg.mk
index bf19a60f..0c7e15ea 100644
--- a/bsp/buildroot/package/opkg/opkg.mk
+++ b/bsp/buildroot/package/opkg/opkg.mk
@@ -9,7 +9,7 @@ OPKG_SITE = http://git.yoctoproject.org/git/opkg
 OPKG_SITE_METHOD = git
 # Uses PKG_CHECK_MODULES() in configure.ac
 OPKG_DEPENDENCIES = host-pkgconf libarchive
-OPKG_LICENSE = GPLv2+
+OPKG_LICENSE = GPL-2.0+
 OPKG_LICENSE_FILES = COPYING
 OPKG_INSTALL_STAGING = YES
 OPKG_CONF_OPTS = --disable-curl
diff --git a/bsp/buildroot/package/oprofile/Config.in b/bsp/buildroot/package/oprofile/Config.in
index e2adde58..d99a7e60 100644
--- a/bsp/buildroot/package/oprofile/Config.in
+++ b/bsp/buildroot/package/oprofile/Config.in
@@ -15,14 +15,14 @@ config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
 config BR2_PACKAGE_OPROFILE
 	bool "oprofile"
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_POPT
-	select BR2_PACKAGE_BINUTILS
-	select BR2_PACKAGE_LIBPFM4 if BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR # binutils
 	depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS
 	# libpfm4 is needed on PowerPC, and requires thread support
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
+	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_BINUTILS
+	select BR2_PACKAGE_LIBPFM4 if BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4
 	help
 	  OProfile is a system-wide profiler for Linux systems,
 	  capable of profiling all running code at low overhead.
diff --git a/bsp/buildroot/package/oprofile/oprofile.mk b/bsp/buildroot/package/oprofile/oprofile.mk
index f6c0f130..4e0278eb 100644
--- a/bsp/buildroot/package/oprofile/oprofile.mk
+++ b/bsp/buildroot/package/oprofile/oprofile.mk
@@ -6,7 +6,7 @@
 
 OPROFILE_VERSION = 1.1.0
 OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION)
-OPROFILE_LICENSE = GPLv2+
+OPROFILE_LICENSE = GPL-2.0+
 OPROFILE_LICENSE_FILES = COPYING
 OPROFILE_CONF_OPTS = \
 	--disable-account-check \
@@ -41,12 +41,6 @@ ifeq ($(BR2_PACKAGE_LIBPFM4),y)
 OPROFILE_DEPENDENCIES += libpfm4
 endif
 
-# When gettext is enabled, popt links with -lintl, specifies it in its
-# popt.pc and has done so for the past 6+ years. But oprofile does not
-# use pkconfig to find popt, so misses -lintl, which is important for
-# a static build. We have to do the call to pkgconfig manually...
-OPROFILE_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`"
-
 ifeq ($(BR2_STATIC_LIBS),)
 define OPROFILE_INSTALL_SHARED_LIBRARY
 	$(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile
diff --git a/bsp/buildroot/package/opus-tools/opus-tools.hash b/bsp/buildroot/package/opus-tools/opus-tools.hash
index 486384c3..185c94ce 100644
--- a/bsp/buildroot/package/opus-tools/opus-tools.hash
+++ b/bsp/buildroot/package/opus-tools/opus-tools.hash
@@ -1,2 +1,2 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256	b1873dd78c7fbc98cf65d6e10cfddb5c2c03b3af93f922139a2104baedb4643a	opus-tools-0.1.9.tar.gz
+sha256 a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c  opus-tools-0.1.10.tar.gz
diff --git a/bsp/buildroot/package/opus-tools/opus-tools.mk b/bsp/buildroot/package/opus-tools/opus-tools.mk
index de1b4399..ab00ced7 100644
--- a/bsp/buildroot/package/opus-tools/opus-tools.mk
+++ b/bsp/buildroot/package/opus-tools/opus-tools.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-OPUS_TOOLS_VERSION = 0.1.9
-OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus
-OPUS_TOOLS_LICENSE = BSD-2c
+OPUS_TOOLS_VERSION = 0.1.10
+OPUS_TOOLS_SITE = https://downloads.xiph.org/releases/opus
+OPUS_TOOLS_LICENSE = BSD-2-Clause, GPL-2.0 (opusinfo)
 OPUS_TOOLS_LICENSE_FILES = COPYING
 OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest
 OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf
diff --git a/bsp/buildroot/package/opus/opus.hash b/bsp/buildroot/package/opus/opus.hash
index 7349ec4b..32fe2e24 100644
--- a/bsp/buildroot/package/opus/opus.hash
+++ b/bsp/buildroot/package/opus/opus.hash
@@ -1,2 +1,2 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256	9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692	opus-1.1.4.tar.gz
+sha256 cfafd339ccd9c5ef8d6ab15d7e1a412c054bf4cb4ecbbbcc78c12ef2def70732  opus-1.2.1.tar.gz
diff --git a/bsp/buildroot/package/opus/opus.mk b/bsp/buildroot/package/opus/opus.mk
index 020be88b..44de5db2 100644
--- a/bsp/buildroot/package/opus/opus.mk
+++ b/bsp/buildroot/package/opus/opus.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-OPUS_VERSION = 1.1.4
-OPUS_SITE = http://downloads.xiph.org/releases/opus
-OPUS_LICENSE = BSD-3c
+OPUS_VERSION = 1.2.1
+OPUS_SITE = https://downloads.xiph.org/releases/opus
+OPUS_LICENSE = BSD-3-Clause
 OPUS_LICENSE_FILES = COPYING
 OPUS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/opusfile/Config.in b/bsp/buildroot/package/opusfile/Config.in
index fe8a1b9c..63e0786f 100644
--- a/bsp/buildroot/package/opusfile/Config.in
+++ b/bsp/buildroot/package/opusfile/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_OPUSFILE
 	select BR2_PACKAGE_LIBOGG
 	select BR2_PACKAGE_OPUS
 	help
-	  A convenient high-level API for decoding and basic manipulation
-	  of all Ogg Opus audio streams.
+	  A convenient high-level API for decoding and basic
+	  manipulation of all Ogg Opus audio streams.
 
 	  http://opus-codec.org
diff --git a/bsp/buildroot/package/opusfile/opusfile.hash b/bsp/buildroot/package/opusfile/opusfile.hash
index 541a21fe..528ded20 100644
--- a/bsp/buildroot/package/opusfile/opusfile.hash
+++ b/bsp/buildroot/package/opusfile/opusfile.hash
@@ -1,2 +1,2 @@
 # From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt
-sha256	2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4	opusfile-0.8.tar.gz
+sha256 f75fb500e40b122775ac1a71ad80c4477698842a8fe9da4a1b4a1a9f16e4e979  opusfile-0.9.tar.gz
diff --git a/bsp/buildroot/package/opusfile/opusfile.mk b/bsp/buildroot/package/opusfile/opusfile.mk
index 4c3fb355..28d4368e 100644
--- a/bsp/buildroot/package/opusfile/opusfile.mk
+++ b/bsp/buildroot/package/opusfile/opusfile.mk
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-OPUSFILE_VERSION = 0.8
-OPUSFILE_SITE = http://downloads.xiph.org/releases/opus
+OPUSFILE_VERSION = 0.9
+OPUSFILE_SITE = https://downloads.xiph.org/releases/opus
 OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus
-OPUSFILE_LICENSE = BSD-3c
+OPUSFILE_LICENSE = BSD-3-Clause
 OPUSFILE_LICENSE_FILES = COPYING
 OPUSFILE_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-OPUSFILE_DEPENDENCIES += openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+OPUSFILE_DEPENDENCIES += libopenssl
 else
 OPUSFILE_CONF_OPTS += --disable-http
 endif
diff --git a/bsp/buildroot/package/oracle-mysql/0008-gcc7.patch b/bsp/buildroot/package/oracle-mysql/0008-gcc7.patch
new file mode 100644
index 00000000..321112d6
--- /dev/null
+++ b/bsp/buildroot/package/oracle-mysql/0008-gcc7.patch
@@ -0,0 +1,45 @@
+Fix gcc7 compile
+
+mysql.cc: In function 'void build_completion_hash(bool, bool)':
+mysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive]
+       field_names[i][num_fields*2]= '\0';
+                                     ^~~~
+Patch was partly backported from upstream commit:
+https://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Thomas: add more gcc 7.x fixes in instance_map.cc.]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/client/mysql.cc
+===================================================================
+--- a/client/mysql.cc
++++ b/client/mysql.cc
+@@ -2684,7 +2684,7 @@
+         mysql_free_result(fields);
+         break;
+       }
+-      field_names[i][num_fields*2]= '\0';
++      field_names[i][num_fields*2]= NULL;
+       j=0;
+       while ((sql_field=mysql_fetch_field(fields)))
+       {
+Index: b/server-tools/instance-manager/instance_map.cc
+===================================================================
+--- a/server-tools/instance-manager/instance_map.cc
++++ b/server-tools/instance-manager/instance_map.cc
+@@ -526,12 +526,12 @@
+              Options::Main::config_file);
+ 
+     argv_options[1]= defaults_file_arg;
+-    argv_options[2]= '\0';
++    argv_options[2]= NULL;
+ 
+     argc= 2;
+   }
+   else
+-    argv_options[1]= '\0';
++    argv_options[1]= NULL;
+ 
+   /*
+     If the routine failed, we'll simply fallback to defaults in
diff --git a/bsp/buildroot/package/oracle-mysql/oracle-mysql.mk b/bsp/buildroot/package/oracle-mysql/oracle-mysql.mk
index f0f06496..7da5c547 100644
--- a/bsp/buildroot/package/oracle-mysql/oracle-mysql.mk
+++ b/bsp/buildroot/package/oracle-mysql/oracle-mysql.mk
@@ -11,7 +11,7 @@ ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERS
 ORACLE_MYSQL_INSTALL_STAGING = YES
 ORACLE_MYSQL_DEPENDENCIES = readline ncurses
 ORACLE_MYSQL_AUTORECONF = YES
-ORACLE_MYSQL_LICENSE = GPLv2
+ORACLE_MYSQL_LICENSE = GPL-2.0
 ORACLE_MYSQL_LICENSE_FILES = README COPYING
 ORACLE_MYSQL_PROVIDES = mysql
 
@@ -58,7 +58,7 @@ define HOST_ORACLE_MYSQL_BUILD_CMDS
 endef
 
 define HOST_ORACLE_MYSQL_INSTALL_CMDS
-	$(INSTALL) -m 0755  $(@D)/sql/gen_lex_hash $(HOST_DIR)/usr/bin/
+	$(INSTALL) -m 0755  $(@D)/sql/gen_lex_hash $(HOST_DIR)/bin/
 endef
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
@@ -125,7 +125,6 @@ ORACLE_MYSQL_CONF_OPTS += \
 	--without-server
 endif
 
-
 define ORACLE_MYSQL_REMOVE_TEST_PROGS
 	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
 endef
diff --git a/bsp/buildroot/package/orbit/Config.in b/bsp/buildroot/package/orbit/Config.in
index 556c46ea..8df42a83 100644
--- a/bsp/buildroot/package/orbit/Config.in
+++ b/bsp/buildroot/package/orbit/Config.in
@@ -1,10 +1,16 @@
 config BR2_PACKAGE_ORBIT
 	bool "orbit"
+	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
 	# These are runtime dependencies
-	select BR2_PACKAGE_WSAPI
+	select BR2_PACKAGE_LPEG
 	select BR2_PACKAGE_LUAFILESYSTEM
+	select BR2_PACKAGE_WSAPI_XAVANTE
 	help
-	  An MVC web framework for Lua. The design is inspired by lightweight
-	  Ruby frameworks such as Camping
+	  An MVC web framework for Lua. The design is inspired by
+	  lightweight Ruby frameworks such as Camping
 
 	  http://keplerproject.github.com/orbit
+
+comment "orbit needs a Lua 5.1 interpreter"
+	depends on !BR2_PACKAGE_LUA_5_1
+	depends on !BR2_PACKAGE_LUAJIT
diff --git a/bsp/buildroot/package/orbit/orbit.hash b/bsp/buildroot/package/orbit/orbit.hash
index 91eba3c6..9662a650 100644
--- a/bsp/buildroot/package/orbit/orbit.hash
+++ b/bsp/buildroot/package/orbit/orbit.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	42b0357041b4bdb051cb1a56cf73e3c2b2a2be207d431f70b4955465ad94b6a6  orbit-2.2.3-1.src.rock
+sha256 91e3c514d5b86918db83666c8889635bb2d50c71d1ab3aeb69c6469c9424089b  orbit-2.2.4-1.src.rock
diff --git a/bsp/buildroot/package/orbit/orbit.mk b/bsp/buildroot/package/orbit/orbit.mk
index fa30f384..3329439d 100644
--- a/bsp/buildroot/package/orbit/orbit.mk
+++ b/bsp/buildroot/package/orbit/orbit.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ORBIT_VERSION_UPSTREAM = 2.2.3
+ORBIT_VERSION_UPSTREAM = 2.2.4
 ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1
 ORBIT_SUBDIR = orbit
 ORBIT_LICENSE = MIT
diff --git a/bsp/buildroot/package/orc/orc.hash b/bsp/buildroot/package/orc/orc.hash
index 200467cf..f47a9cfe 100644
--- a/bsp/buildroot/package/orc/orc.hash
+++ b/bsp/buildroot/package/orc/orc.hash
@@ -1,2 +1,2 @@
-# From https://lists.freedesktop.org/archives/gstreamer-devel/2016-August/060159.html
-sha256	7d52fa80ef84988359c3434e1eea302d077a08987abdde6905678ebcad4fa649	orc-0.4.26.tar.xz
+# From https://gstreamer.freedesktop.org/src/orc/orc-0.4.27.tar.xz.sha256sum
+sha256 51e53e58fc8158e5986a1f1a49a6d970c5b16493841cf7b9de2c2bde7ce36b93 orc-0.4.27.tar.xz
diff --git a/bsp/buildroot/package/orc/orc.mk b/bsp/buildroot/package/orc/orc.mk
index 4456f531..ab718296 100644
--- a/bsp/buildroot/package/orc/orc.mk
+++ b/bsp/buildroot/package/orc/orc.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-ORC_VERSION = 0.4.26
+ORC_VERSION = 0.4.27
 ORC_SOURCE = orc-$(ORC_VERSION).tar.xz
 ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc
-ORC_LICENSE = BSD-2c, BSD-3c
+ORC_LICENSE = BSD-2-Clause, BSD-3-Clause
 ORC_LICENSE_FILES = COPYING
 ORC_INSTALL_STAGING = YES
 ORC_DEPENDENCIES = host-orc
diff --git a/bsp/buildroot/package/ortp/ortp.mk b/bsp/buildroot/package/ortp/ortp.mk
index da17231f..0bd61e88 100644
--- a/bsp/buildroot/package/ortp/ortp.mk
+++ b/bsp/buildroot/package/ortp/ortp.mk
@@ -9,7 +9,7 @@ ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources
 
 ORTP_CONF_OPTS = --disable-strict
 ORTP_INSTALL_STAGING = YES
-ORTP_LICENSE = LGPLv2.1+
+ORTP_LICENSE = LGPL-2.1+
 ORTP_LICENSE_FILES = COPYING
 ORTP_DEPENDENCIES = bctoolbox
 
diff --git a/bsp/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch b/bsp/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch
index c4c38445..b25aa598 100644
--- a/bsp/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch
+++ b/bsp/buildroot/package/owfs/0001-configure.ac-check-for-localtime_r.patch
@@ -11,6 +11,8 @@ Upstream-Status: Submitted
 https://sourceforge.net/p/owfs/mailman/message/34873667/
 
 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+[Bernd: rebased against version 3.2p1]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -19,15 +21,15 @@ diff --git a/configure.ac b/configure.ac
 index c22dde9..12fdd18 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1529,7 +1529,7 @@ AC_FUNC_SELECT_ARGTYPES
+@@ -1646,7 +1646,7 @@
  AC_FUNC_STRFTIME
  AC_FUNC_STRTOD
  AC_TYPE_SIGNAL
--AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gettimeofday inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline])
-+AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gettimeofday inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline localtime_r])
+-AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gmtime_r gettimeofday localtime_r inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline])
++AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gmtime_r gettimeofday localtime_r inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline localtime_r])
  
- if test "${ENABLE_ZERO}" = "true" ; then
- 	AC_SEARCH_LIBS(dlopen, dl, AC_DEFINE(HAVE_DLOPEN, 1, [Define if you have dlopen]))
+ save_LIBS="$LIBS"
+ LIBS=""
 -- 
 2.7.0
 
diff --git a/bsp/buildroot/package/owfs/0002-compat.h-only-include-compat_netdb.h-if-needed.patch b/bsp/buildroot/package/owfs/0002-compat.h-only-include-compat_netdb.h-if-needed.patch
deleted file mode 100644
index 7ae79325..00000000
--- a/bsp/buildroot/package/owfs/0002-compat.h-only-include-compat_netdb.h-if-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d24e63eea4f4d234f313145e40668a5e2f64e49c Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Wed, 9 Mar 2016 23:20:11 +0100
-Subject: [PATCH] compat.h: only include compat_netdb.h if needed
-
-compat_netdb.h is added for only one reason: to provide the definitions
-for getaddrinfo, in case it is not provided by the system.
-compat_netdb.h is just a copy from an old glibc version, but that makes
-it incompatible with other standard C libraries. For example, uClibc
-without RPC support doesn't have the rpc/netdb.h header. This leads to
-build errors.
-
-To work around this, only include compat_netdb.h when needed, i.e.
-when getaddrinfo isn't provided natively.
-
-Note that this getaddrinfo compat was introduced in commit bc54c431 to
-support Solaris 7. Starting from Solaris 8, however, getaddrinfo is
-available natively, and it's available on MacOS, Windows and any other
-POSIX-2001 compliant system as well. So it may be worhtwhile to remove
-it altogether.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- module/owlib/src/include/compat.h   | 2 ++
- module/ownet/c/src/include/compat.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/module/owlib/src/include/compat.h b/module/owlib/src/include/compat.h
-index c55bc96..e95e16f 100644
---- a/module/owlib/src/include/compat.h
-+++ b/module/owlib/src/include/compat.h
-@@ -57,7 +57,9 @@
- #include <features.h>
- #endif
- 
-+#ifndef HAVE_GETADDRINFO
- #include "compat_netdb.h"
-+#endif
- #include "compat_getopt.h"
- 
- #ifndef HAVE_STRSEP
-diff --git a/module/ownet/c/src/include/compat.h b/module/ownet/c/src/include/compat.h
-index c45d852..f8ae759 100644
---- a/module/ownet/c/src/include/compat.h
-+++ b/module/ownet/c/src/include/compat.h
-@@ -58,7 +58,9 @@ $Id$
- #include <features.h>
- #endif
- 
-+#ifndef HAVE_GETADDRINFO
- #include "compat_netdb.h"
-+#endif
- #include "compat_getopt.h"
- 
- #ifndef HAVE_STRSEP
--- 
-2.7.0
-
diff --git a/bsp/buildroot/package/owfs/owfs.hash b/bsp/buildroot/package/owfs/owfs.hash
index 3991eec9..1e57e295 100644
--- a/bsp/buildroot/package/owfs/owfs.hash
+++ b/bsp/buildroot/package/owfs/owfs.hash
@@ -1,4 +1,5 @@
-# From https://sourceforge.net/projects/owfs/files/owfs/3.1p1/
-sha1  80892ca3e72fef2979b8f0a04db15fd24a2cbda6  owfs-3.1p1.tar.gz
+# From https://sourceforge.net/projects/owfs/files/owfs/3.2p1/
+md5 fb42ce3b8a49f0b62711d8e3f5f04880  owfs-3.2p1.tar.gz
+sha1 4ee76e686bec769acde5bfbda148a8693df244c6  owfs-3.2p1.tar.gz
 # Locally calculated
-sha256  e69421ae534565c1f8530a2447f583401f4d0d4b1cf3cb8cf399a57133ed7f81  owfs-3.1p1.tar.gz
+sha256 33220b25db36969a717cd27e750d73dee376795e13a5f3677f05111b745832ea  owfs-3.2p1.tar.gz
diff --git a/bsp/buildroot/package/owfs/owfs.mk b/bsp/buildroot/package/owfs/owfs.mk
index e0679d21..47626cea 100644
--- a/bsp/buildroot/package/owfs/owfs.mk
+++ b/bsp/buildroot/package/owfs/owfs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-OWFS_VERSION = 3.1p1
+OWFS_VERSION = 3.2p1
 OWFS_SITE = http://downloads.sourceforge.net/project/owfs/owfs/$(OWFS_VERSION)
 OWFS_DEPENDENCIES = host-pkgconf
 OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl
@@ -13,7 +13,7 @@ OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl
 OWFS_AUTORECONF = YES
 
 # owtcl license is declared in module/ownet/c/src/include/ow_functions.h
-OWFS_LICENSE = GPLv2+, LGPLv2 (owtcl)
+OWFS_LICENSE = GPL-2.0+, LGPL-2.0 (owtcl)
 OWFS_LICENSE_FILES = COPYING COPYING.LIB
 OWFS_INSTALL_STAGING = YES
 
@@ -68,7 +68,7 @@ OWFS_MAKE_ENV += \
 OWFS_DEPENDENCIES += python host-swig
 # The configure scripts finds PYSITEDIR as the python_lib directory of
 # host-python, and then prepends DESTDIR in front of it. So we end up
-# installing things in $(TARGET_DIR)/$(HOST_DIR)/usr/lib/python which is
+# installing things in $(TARGET_DIR)/$(HOST_DIR)/lib/python which is
 # clearly wrong.
 # Patching owfs to do the right thing is not trivial, it's much easier to
 # override the PYSITEDIR variable in make.
diff --git a/bsp/buildroot/package/owl-linux/Config.in b/bsp/buildroot/package/owl-linux/Config.in
index 595a1db7..bf412d36 100644
--- a/bsp/buildroot/package/owl-linux/Config.in
+++ b/bsp/buildroot/package/owl-linux/Config.in
@@ -3,9 +3,11 @@ config BR2_PACKAGE_OWL_LINUX
 	depends on BR2_LINUX_KERNEL
 	depends on (BR2_arm920t || BR2_arm922t || BR2_arm926t)
 	help
-	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP.
+	  Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi
+	  SIP.
 
-	  owl-linux requires the hidden kernel option WIRELESS_EXT enabled.
+	  owl-linux requires the hidden kernel option WIRELESS_EXT
+	  enabled.
 
 	  http://linux.hd-wireless.se/bin/view/Linux/GettingStarted
 
diff --git a/bsp/buildroot/package/p11-kit/p11-kit.mk b/bsp/buildroot/package/p11-kit/p11-kit.mk
index e856cac0..d4cf9bc0 100644
--- a/bsp/buildroot/package/p11-kit/p11-kit.mk
+++ b/bsp/buildroot/package/p11-kit/p11-kit.mk
@@ -11,7 +11,7 @@ P11_KIT_INSTALL_STAGING = YES
 P11_KIT_CONF_OPTS = --disable-static
 P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
 	ac_cv_have_decl___progname=no
-P11_KIT_LICENSE = BSD-3c
+P11_KIT_LICENSE = BSD-3-Clause
 P11_KIT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/p7zip/Config.in b/bsp/buildroot/package/p7zip/Config.in
index 840949c8..a3adab5b 100644
--- a/bsp/buildroot/package/p7zip/Config.in
+++ b/bsp/buildroot/package/p7zip/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_P7ZIP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	help
-	  p7zip is a quick port of the command line version of 7-zip for Unix.
-	  (see http://www.7-zip.org)
+	  p7zip is a quick port of the command line version of 7-zip
+	  for Unix (see http://www.7-zip.org)
 
 	  7-Zip is a file archiver with highest compression ratio.
 
diff --git a/bsp/buildroot/package/p7zip/p7zip.hash b/bsp/buildroot/package/p7zip/p7zip.hash
index ead6d871..b134550e 100644
--- a/bsp/buildroot/package/p7zip/p7zip.hash
+++ b/bsp/buildroot/package/p7zip/p7zip.hash
@@ -1,3 +1,5 @@
-# From https://sourceforge.net/projects/p7zip/files/p7zip/
-md5	92cca093312b5a71a7be7dc7d1d32509	p7zip_15.14.1_src_all.tar.bz2
-sha1	9b15a79f94230fab9b9d4f9f532c723117145c7a	p7zip_15.14.1_src_all.tar.bz2
+# From https://sourceforge.net/projects/p7zip/files/p7zip/16.02/
+md5 a0128d661cfe7cc8c121e73519c54fbf  p7zip_16.02_src_all.tar.bz2
+sha1 e8819907132811aa1afe5ef296181d3a15cc8f22  p7zip_16.02_src_all.tar.bz2
+# Locally computed
+sha256 5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f  p7zip_16.02_src_all.tar.bz2
diff --git a/bsp/buildroot/package/p7zip/p7zip.mk b/bsp/buildroot/package/p7zip/p7zip.mk
index 15d51381..ff0dd01e 100644
--- a/bsp/buildroot/package/p7zip/p7zip.mk
+++ b/bsp/buildroot/package/p7zip/p7zip.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-P7ZIP_VERSION = 15.14.1
+P7ZIP_VERSION = 16.02
 P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2
 P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION)
-P7ZIP_LICENSE = LGPLv2.1+ with unRAR restriction
+P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction
 P7ZIP_LICENSE_FILES = DOC/License.txt
 
 # p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and
diff --git a/bsp/buildroot/package/p910nd/p910nd.mk b/bsp/buildroot/package/p910nd/p910nd.mk
index a1afdb38..163ab1bc 100644
--- a/bsp/buildroot/package/p910nd/p910nd.mk
+++ b/bsp/buildroot/package/p910nd/p910nd.mk
@@ -7,7 +7,7 @@
 P910ND_VERSION = 0.97
 P910ND_SITE = http://downloads.sourceforge.net/project/p910nd/p910nd/$(P910ND_VERSION)
 P910ND_SOURCE = p910nd-$(P910ND_VERSION).tar.bz2
-P910ND_LICENSE = GPLv2
+P910ND_LICENSE = GPL-2.0
 P910ND_LICENSE_FILES = COPYING
 
 define P910ND_BUILD_CMDS
diff --git a/bsp/buildroot/package/paho-mqtt-c/0001-Declare-mqtt-tests-as-a-C-only-project.patch b/bsp/buildroot/package/paho-mqtt-c/0001-Declare-mqtt-tests-as-a-C-only-project.patch
new file mode 100644
index 00000000..9edb2c4a
--- /dev/null
+++ b/bsp/buildroot/package/paho-mqtt-c/0001-Declare-mqtt-tests-as-a-C-only-project.patch
@@ -0,0 +1,27 @@
+From 6556e62a07972eafccaefdcdf32bd0d386c64ca2 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Wed, 13 Sep 2017 07:59:50 +0200
+Subject: [PATCH] Declare mqtt-tests as a C-only project
+
+This way CMake doesn't break the build on the systems without
+C++ compiler.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+Reported-by: Marcus Hoffmann <m.hoffmann@cartelsol.com>
+---
+ test/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 5c88c44..3aca80f 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-PROJECT(mqtt-tests)
++PROJECT(mqtt-tests C)
+ 
+ IF (WIN32)
+   SET(MQTT_TEST_BROKER "tcp://mqtt.iotree.co.uk:1883" CACHE STRING "Hostname of a test MQTT broker to use")
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash b/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
index 8807d788..3bee8914 100644
--- a/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
+++ b/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.hash
@@ -1,2 +1,4 @@
 # Locally computed:
-sha256  970b9621efc24251441d386274cd0a90cf6ad52b64031f3c8cb53fdd5526f5f3  paho-mqtt-c-v1.1.0.tar.gz
+sha256  0cb0396554ebe0e8ac6b0de1cbc16601ef169b6a63baf6f0f3ddeb405f5471a5  paho-mqtt-c-v1.2.0.tar.gz
+sha256  83bbba033dc985487e321b6dfde111772affb73460be48726299fed3da684b1c  edl-v10
+sha256  44277b2bec6093e4ac313afec251a4de599d24c4e768f8574d95b13a9d2d97b5  epl-v10
diff --git a/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk b/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
index 7fb3026d..5df7a55c 100644
--- a/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
+++ b/bsp/buildroot/package/paho-mqtt-c/paho-mqtt-c.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PAHO_MQTT_C_VERSION = v1.1.0
+PAHO_MQTT_C_VERSION = v1.2.0
 PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,$(PAHO_MQTT_C_VERSION))
-PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3c
+PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3-Clause
 PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10
 PAHO_MQTT_C_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/pango/0001-build-disable-tests-from-building.patch b/bsp/buildroot/package/pango/0001-build-disable-tests-from-building.patch
new file mode 100644
index 00000000..1156c24f
--- /dev/null
+++ b/bsp/buildroot/package/pango/0001-build-disable-tests-from-building.patch
@@ -0,0 +1,41 @@
+From 1c503a8b2f127c12e58a6e8ba01743c04061df50 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 5 Sep 2017 07:25:17 -0400
+Subject: [PATCH] build: disable tests from building
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Adam: refresh for pango 1.40.12]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ Makefile.am | 2 +-
+ Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 70bf8b0..c69daf0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to create Makefile.in.
+ 
+-SUBDIRS= pango pango-view examples docs tools tests win32
++SUBDIRS= pango pango-view examples docs tools win32
+ 
+ meson_dist_files = \
+ 	pango/pango-features.h.meson \
+diff --git a/Makefile.in b/Makefile.in
+index 8489ca1..51f6ada 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -412,7 +412,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = pango pango-view examples docs tools tests win32
++SUBDIRS = pango pango-view examples docs tools win32
+ meson_dist_files = \
+ 	pango/pango-features.h.meson \
+ 	pango-view/meson.build \
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/pango/0001-no-tests.patch b/bsp/buildroot/package/pango/0001-no-tests.patch
deleted file mode 100644
index 734409db..00000000
--- a/bsp/buildroot/package/pango/0001-no-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Prevent Pango to build tests.
-
-Updated to Pango 1.36.3 by Hadrien Boutteville.
-
-Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com>
-[Gustavo: update for 1.38.1]
-
-diff -Nura pango-1.38.1.orig/Makefile.am pango-1.38.1/Makefile.am
---- pango-1.38.1.orig/Makefile.am	2015-10-14 15:41:27.620016974 +0000
-+++ pango-1.38.1/Makefile.am	2015-10-14 15:41:54.431240793 +0000
-@@ -1,6 +1,6 @@
- ## Process this file with automake to create Makefile.in.
- 
--SUBDIRS= pango pango-view examples docs tools tests build
-+SUBDIRS= pango pango-view examples docs tools build
- 
- EXTRA_DIST = 			\
- 	autogen.sh		\
-diff -Nura pango-1.38.1.orig/Makefile.in pango-1.38.1/Makefile.in
---- pango-1.38.1.orig/Makefile.in	2015-10-14 15:41:27.630016685 +0000
-+++ pango-1.38.1/Makefile.in	2015-10-14 15:41:58.753115676 +0000
-@@ -417,7 +417,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = pango pango-view examples docs tools tests build
-+SUBDIRS = pango pango-view examples docs tools build
- EXTRA_DIST = \
- 	autogen.sh		\
- 	pango.pc.in		\
diff --git a/bsp/buildroot/package/pango/Config.in b/bsp/buildroot/package/pango/Config.in
index 7813c4eb..e8a53186 100644
--- a/bsp/buildroot/package/pango/Config.in
+++ b/bsp/buildroot/package/pango/Config.in
@@ -11,14 +11,14 @@ config BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_HARFBUZZ
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	help
-	  Pango is a library for laying out and rendering of text, with an
-	  emphasis on internationalization. Pango can be used anywhere that
-	  text layout is needed, though most of the work on Pango so far has
-	  been done in the context of the GTK+ widget toolkit. Pango forms the
-	  core of text and font handling for GTK+-2.x.
+	  Pango is a library for laying out and rendering of text,
+	  with an emphasis on internationalization. Pango can be used
+	  anywhere that text layout is needed, though most of the work
+	  on Pango so far has been done in the context of the GTK+
+	  widget toolkit. Pango forms the core of text and font
+	  handling for GTK+-2.x.
 
 	  http://www.pango.org/
 
diff --git a/bsp/buildroot/package/pango/pango.hash b/bsp/buildroot/package/pango/pango.hash
index 1ea9f6bd..6df08e9c 100644
--- a/bsp/buildroot/package/pango/pango.hash
+++ b/bsp/buildroot/package/pango/pango.hash
@@ -1,2 +1,3 @@
-# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.3.sha256sum
-sha256	abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3	pango-1.40.3.tar.xz
+# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.14.sha256sum
+sha256	90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3	pango-1.40.14.tar.xz
+sha256	d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5	COPYING
diff --git a/bsp/buildroot/package/pango/pango.mk b/bsp/buildroot/package/pango/pango.mk
index b45bf9a9..805d35e1 100644
--- a/bsp/buildroot/package/pango/pango.mk
+++ b/bsp/buildroot/package/pango/pango.mk
@@ -5,19 +5,19 @@
 ################################################################################
 
 PANGO_VERSION_MAJOR = 1.40
-PANGO_VERSION = $(PANGO_VERSION_MAJOR).3
+PANGO_VERSION = $(PANGO_VERSION_MAJOR).14
 PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz
 PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR)
 PANGO_AUTORECONF = YES
 PANGO_INSTALL_STAGING = YES
-PANGO_LICENSE = LGPLv2+
+PANGO_LICENSE = LGPL-2.0+
 PANGO_LICENSE_FILES = COPYING
 
 PANGO_CONF_OPTS = --enable-explicit-deps=no
 HOST_PANGO_CONF_OPTS = --enable-explicit-deps=no
 
 PANGO_DEPENDENCIES = \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	host-pkgconf \
 	libglib2 \
 	cairo \
diff --git a/bsp/buildroot/package/pangomm/Config.in b/bsp/buildroot/package/pangomm/Config.in
index a7c41a00..0702b8c5 100644
--- a/bsp/buildroot/package/pangomm/Config.in
+++ b/bsp/buildroot/package/pangomm/Config.in
@@ -1,22 +1,22 @@
 config BR2_PACKAGE_PANGOMM
 	bool "pangomm"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
+	depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
+	depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2
+	depends on BR2_USE_MMU # *mm/pango -> libglib2
+	depends on BR2_USE_WCHAR # *mm/pango -> libglib2
 	select BR2_PACKAGE_CAIROMM
 	select BR2_PACKAGE_GLIBMM
 	select BR2_PACKAGE_PANGO
 	select BR2_PACKAGE_LIBSIGC
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz
-	depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
-	depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2
-	depends on BR2_USE_MMU # *mm/pango -> libglib2
-	depends on BR2_USE_WCHAR # *mm/pango -> libglib2
 	help
 	  The pangomm package is a set of C++ bindings for Pango.
 
 	  http://www.gtkmm.org/
 
-comment "pangomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8"
+comment "pangomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/pangomm/pangomm.mk b/bsp/buildroot/package/pangomm/pangomm.mk
index 2a85e39f..9edcb164 100644
--- a/bsp/buildroot/package/pangomm/pangomm.mk
+++ b/bsp/buildroot/package/pangomm/pangomm.mk
@@ -8,7 +8,7 @@ PANGOMM_VERSION_MAJOR = 2.40
 PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).1
 PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz
 PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR)
-PANGOMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools)
+PANGOMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
 PANGOMM_LICENSE_FILES = COPYING COPYING.tools
 PANGOMM_INSTALL_STAGING = YES
 PANGOMM_DEPENDENCIES = glibmm cairomm libsigc pango host-pkgconf
diff --git a/bsp/buildroot/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch b/bsp/buildroot/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch
new file mode 100644
index 00000000..1cf699bb
--- /dev/null
+++ b/bsp/buildroot/package/parted/0001-libparted-arch-linux.c-Compile-without-ENABLE_DEVICE.patch
@@ -0,0 +1,79 @@
+From 141c4309d7164dcd4e09d137fc075c1726fd8dbb Mon Sep 17 00:00:00 2001
+From: Felix Janda <felix.janda@posteo.de>
+Date: Sun, 3 May 2015 10:33:15 +0200
+Subject: [PATCH] libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER
+
+Signed-off-by: Brian C. Lane <bcl@redhat.com>
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ libparted/arch/linux.c | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 0f18904..cf38c6f 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -2304,6 +2304,7 @@ zasprintf (const char *format, ...)
+   return r < 0 ? NULL : resultp;
+ }
+ 
++#ifdef ENABLE_DEVICE_MAPPER
+ static char *
+ dm_canonical_path (PedDevice const *dev)
+ {
+@@ -2326,14 +2327,21 @@ dm_canonical_path (PedDevice const *dev)
+ err:
+         return NULL;
+ }
++#endif
+ 
+ static char*
+ _device_get_part_path (PedDevice const *dev, int num)
+ {
+-        char *devpath = (dev->type == PED_DEVICE_DM
+-                         ? dm_canonical_path (dev) : dev->path);
+-        size_t path_len = strlen (devpath);
++        char *devpath;
++        size_t path_len;
+         char *result;
++#ifdef ENABLE_DEVICE_MAPPER
++        devpath = (dev->type == PED_DEVICE_DM
++                         ? dm_canonical_path (dev) : dev->path);
++#else
++        devpath = dev->path;
++#endif
++        path_len = strlen (devpath);
+         /* Check for devfs-style /disc => /partN transformation
+            unconditionally; the system might be using udev with devfs rules,
+            and if not the test is harmless. */
+@@ -2349,8 +2357,10 @@ _device_get_part_path (PedDevice const *dev, int num)
+                                  ? "p" : "");
+                 result = zasprintf ("%s%s%d", devpath, p, num);
+         }
++#ifdef ENABLE_DEVICE_MAPPER
+         if (dev->type == PED_DEVICE_DM)
+                 free (devpath);
++#endif
+         return result;
+ }
+ 
+@@ -2945,12 +2955,15 @@ _disk_sync_part_table (PedDisk* disk)
+                                                unsigned long long *length);
+ 
+ 
++#ifdef ENABLE_DEVICE_MAPPER
+         if (disk->dev->type == PED_DEVICE_DM) {
+                 add_partition = _dm_add_partition;
+                 remove_partition = _dm_remove_partition;
+                 resize_partition = _dm_resize_partition;
+                 get_partition_start_and_length = _dm_get_partition_start_and_length;
+-        } else {
++        } else
++#endif
++        {
+                 add_partition = _blkpg_add_partition;
+                 remove_partition = _blkpg_remove_partition;
+ #ifdef BLKPG_RESIZE_PARTITION
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/parted/0001-readline-deprecated.patch b/bsp/buildroot/package/parted/0001-readline-deprecated.patch
deleted file mode 100644
index a3f40c8d..00000000
--- a/bsp/buildroot/package/parted/0001-readline-deprecated.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-The CPPFunction typedef (among others) have been deprecated in favour of
-specific prototyped typedefs since readline 4.2.
-It's been working since because compatibility typedefs have been
-in place until they were removed in readline 6.3.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura parted-3.1.orig/parted/ui.c parted-3.1/parted/ui.c
---- parted-3.1.orig/parted/ui.c	2014-03-01 16:11:41.970827134 -0300
-+++ parted-3.1/parted/ui.c	2014-03-01 16:11:55.540259786 -0300
-@@ -1474,7 +1474,7 @@
- #ifdef HAVE_LIBREADLINE
-   if (!opt_script_mode) {
-     rl_initialize ();
--    rl_attempted_completion_function = (CPPFunction*) complete_function;
-+    rl_attempted_completion_function = (rl_completion_func_t *) complete_function;
-     readline_state.in_readline = 0;
-   }
- #endif
diff --git a/bsp/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch b/bsp/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch
index b2119bcd..5a264ced 100644
--- a/bsp/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch
+++ b/bsp/buildroot/package/parted/0002-configure.ac-uclinux-is-also-linux.patch
@@ -1,4 +1,4 @@
-From b3958317c5ee2940e7024bec2e7f288b5a6a26c3 Mon Sep 17 00:00:00 2001
+From 7697d9c54e489b32b82c01f17db04f8b51857e51 Mon Sep 17 00:00:00 2001
 From: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Date: Mon, 30 Jun 2014 10:09:04 -0300
 Subject: [PATCH] configure.ac: uclinux is also linux
@@ -29,5 +29,5 @@ index 436d0e2..50ad478 100644
  AC_SUBST([OS])
  
 -- 
-1.8.5.5
+2.14.2
 
diff --git a/bsp/buildroot/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch b/bsp/buildroot/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch
new file mode 100644
index 00000000..752938ab
--- /dev/null
+++ b/bsp/buildroot/package/parted/0003-Include-fcntl.h-to-get-loff_t-definition.patch
@@ -0,0 +1,29 @@
+From 2078c07d38ee7841b89ac8d81afc5e8bfcd4f703 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 8 Oct 2017 00:58:58 +0200
+Subject: [PATCH] Include <fcntl.h> to get loff_t definition
+
+Patch borrowed from Alpine Linux at
+http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves
+build with musl.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ libparted/fs/xfs/platform_defs.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h
+index 2b55752..17023dc 100644
+--- a/libparted/fs/xfs/platform_defs.h
++++ b/libparted/fs/xfs/platform_defs.h
+@@ -35,6 +35,7 @@
+ #define __XFS_PLATFORM_DEFS_H__
+ 
+ #include <stdio.h>
++#include <fcntl.h>
+ #include <stdarg.h>
+ #include <assert.h>
+ #include <endian.h>
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/parted/0003-fix-static-link-uuid.patch b/bsp/buildroot/package/parted/0003-fix-static-link-uuid.patch
deleted file mode 100644
index d6ec2cf3..00000000
--- a/bsp/buildroot/package/parted/0003-fix-static-link-uuid.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-configure: use pkg-config to find libuuid
-
-In some conditions, libuuid may be linked with -lintl. This can be the
-case on uClibc when locales are enabled.
-
-When doing a shared link, this dependency is automatically pulled in via
-a DT_NEEDED ELF tag
-
-For a static link, there is no such mechanism to pull in dependent
-libraries.
-
-Currently, the check for libuuid is done with AC_CHECK_LIB, but this
-does not handle dependencies, and thus a stattic build fails.
-
-Use pkg-config to find libuuid, that automatically pulls in the
-dependencies of libuuid, if any.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
----
-Note: of course, that relies on the fact that libuuid installs a proper
-.pc file; a patch will be submitted upstream shortly.
-
-But even considering the current situation, where libuuid does not
-provide a proper .pc file (yet), this patch does not change the
-behaviour we've had so far; it is a bet on the future! ;-)
-
-diff -durN parted-3.1.orig/configure.ac parted-3.1/configure.ac
---- parted-3.1.orig/configure.ac	2014-11-29 16:27:49.520560137 +0100
-+++ parted-3.1/configure.ac	2014-11-29 16:32:50.799702049 +0100
-@@ -313,16 +313,7 @@
- AC_SUBST([DL_LIBS])
- 
- dnl Check for libuuid
--UUID_LIBS=""
--AC_CHECK_LIB([uuid], [uuid_generate], [UUID_LIBS="-luuid"],
--	[AC_MSG_ERROR(dnl
--[GNU Parted requires libuuid - a part of the util-linux-ng package (but
--usually distributed separately in libuuid-devel, uuid-dev or similar)
--This can probably be found on your distribution's CD or FTP site or at:
--    http://userweb.kernel.org/~kzak/util-linux-ng/
--Note: originally, libuuid was part of the e2fsprogs package.  Later, it
--moved to util-linux-ng-2.16, and that package is now the preferred source.])])
--AC_SUBST([UUID_LIBS])
-+PKG_CHECK_MODULES([UUID],[uuid])
- 
- dnl Check for libdevmapper
- DM_LIBS=
diff --git a/bsp/buildroot/package/parted/0004-fix-includes-for-musl.patch b/bsp/buildroot/package/parted/0004-fix-includes-for-musl.patch
deleted file mode 100644
index 28c94ace..00000000
--- a/bsp/buildroot/package/parted/0004-fix-includes-for-musl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Include <fcntl.h> to get loff_t definition
-
-Patch borrowed from Alpine Linux at
-http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves
-build with musl.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h
-+++ parted-3.1/libparted/fs/xfs/platform_defs.h
-@@ -35,6 +35,7 @@
- #define __XFS_PLATFORM_DEFS_H__
- 
- #include <stdio.h>
-+#include <fcntl.h>
- #include <stdarg.h>
- #include <assert.h>
- #include <endian.h>
diff --git a/bsp/buildroot/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch b/bsp/buildroot/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch
new file mode 100644
index 00000000..a4a1b003
--- /dev/null
+++ b/bsp/buildroot/package/parted/0004-libparted-labels-link-with-libiconv-if-needed.patch
@@ -0,0 +1,54 @@
+From dd17f55b2ac189ccd3b8025e4f6509537d00f9d3 Mon Sep 17 00:00:00 2001
+From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
+Date: Sun, 8 Oct 2017 00:53:31 +0200
+Subject: [PATCH] libparted/labels: link with libiconv if needed
+
+gpt.c uses iconv so it should link with it. Otherwise, on platforms
+where libiconv is a separate library, we get a link failure of parted:
+
+    CCLD     parted
+  ../libparted/.libs/libparted.so: undefined reference to `libiconv'
+  ../libparted/.libs/libparted.so: undefined reference to `libiconv_open'
+  ../libparted/.libs/libparted.so: undefined reference to `libiconv_close'
+
+Since iconv functionality is needed unconditionally (not only when
+gettext is enabled), AM_ICONV needs to be added to configure.ac.
+
+Upstream status: sent to mailing list
+http://lists.alioth.debian.org/pipermail/parted-devel/2017-November/005131.html
+
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+---
+ configure.ac                 | 2 ++
+ libparted/labels/Makefile.am | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 50ad478..62f1b4d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -288,6 +288,8 @@ fi
+ AC_PROG_LIBTOOL
+ LT_INIT
+ 
++AM_ICONV
++
+ AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ if test "$USE_INCLUDED_LIBINTL" = "yes"; then
+diff --git a/libparted/labels/Makefile.am b/libparted/labels/Makefile.am
+index c996f81..b204379 100644
+--- a/libparted/labels/Makefile.am
++++ b/libparted/labels/Makefile.am
+@@ -35,7 +35,7 @@ liblabels_la_SOURCES = \
+   rdb.c		\
+   sun.c
+ 
+-liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS)
++liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV)
+ 
+ AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
+ 
+-- 
+2.14.2
+
diff --git a/bsp/buildroot/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch b/bsp/buildroot/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch
new file mode 100644
index 00000000..e0b4c2ac
--- /dev/null
+++ b/bsp/buildroot/package/parted/0005-linux-Include-sys-sysmacros.h-for-major-macro.patch
@@ -0,0 +1,27 @@
+From ba5e0451b51c983e40afd123b6e0d3eddb55e610 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 24 Mar 2018 17:37:02 +0000
+Subject: [PATCH] linux: Include <sys/sysmacros.h> for major() macro.
+
+Since glibc 2.27 this header is required.
+
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 31b98ab..7e86b51 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -41,6 +41,7 @@
+ #include <sys/utsname.h>        /* for uname() */
+ #include <scsi/scsi.h>
+ #include <assert.h>
++#include <sys/sysmacros.h>
+ #ifdef ENABLE_DEVICE_MAPPER
+ #include <libdevmapper.h>
+ #endif
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/parted/parted.hash b/bsp/buildroot/package/parted/parted.hash
index 297b5d7b..e31ae3c4 100644
--- a/bsp/buildroot/package/parted/parted.hash
+++ b/bsp/buildroot/package/parted/parted.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15	parted-3.1.tar.xz
+sha256	858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4  parted-3.2.tar.xz
diff --git a/bsp/buildroot/package/parted/parted.mk b/bsp/buildroot/package/parted/parted.mk
index dc7ff2bd..1f0428a5 100644
--- a/bsp/buildroot/package/parted/parted.mk
+++ b/bsp/buildroot/package/parted/parted.mk
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-PARTED_VERSION = 3.1
+PARTED_VERSION = 3.2
 PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
 PARTED_SITE = $(BR2_GNU_MIRROR)/parted
 PARTED_DEPENDENCIES = host-pkgconf util-linux
 PARTED_INSTALL_STAGING = YES
-# For uclinux patch
+# 0002-configure.ac-uclinux-is-also-linux.patch
+# 0004-libparted-labels-link-with-libiconv-if-needed.patch
 PARTED_AUTORECONF = YES
 PARTED_GETTEXTIZE = YES
-PARTED_LICENSE = GPLv3+
+PARTED_LICENSE = GPL-3.0+
 PARTED_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_READLINE),y)
@@ -29,6 +30,10 @@ else
 PARTED_CONF_OPTS += --disable-device-mapper
 endif
 
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
+PARTED_DEPENDENCIES += libiconv
+endif
+
 ifeq ($(BR2_STATIC_LIBS),y)
 PARTED_CONF_OPTS += --disable-dynamic-loading
 endif
@@ -36,7 +41,7 @@ endif
 HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux
 HOST_PARTED_CONF_OPTS += \
 	--without-readline \
-	--disable-device-mapper \
+	--disable-device-mapper
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/patch/Config.in b/bsp/buildroot/package/patch/Config.in
index 1f84ec62..13fa7bfc 100644
--- a/bsp/buildroot/package/patch/Config.in
+++ b/bsp/buildroot/package/patch/Config.in
@@ -4,8 +4,8 @@ config BR2_PACKAGE_PATCH
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  Take patch files (containing difference listings) and apply them
-	  to original files, producing patched versions.
+	  Take patch files (containing difference listings) and apply
+	  them to original files, producing patched versions.
 
 	  http://www.gnu.org/software/patch/
 
diff --git a/bsp/buildroot/package/patch/patch.mk b/bsp/buildroot/package/patch/patch.mk
index cfd540ce..d581682c 100644
--- a/bsp/buildroot/package/patch/patch.mk
+++ b/bsp/buildroot/package/patch/patch.mk
@@ -7,14 +7,14 @@
 PATCH_VERSION = 2.7.6
 PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz
 PATCH_SITE = $(BR2_GNU_MIRROR)/patch
-PATCH_LICENSE = GPLv3+
+PATCH_LICENSE = GPL-3.0+
 PATCH_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_ATTR),y)
-PATCH_CONF_OPTS += --enable-attr
+PATCH_CONF_OPTS += --enable-xattr
 PATCH_DEPENDENCIES += attr
 else
-PATCH_CONF_OPTS += --disable-attr
+PATCH_CONF_OPTS += --disable-xattr
 endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch b/bsp/buildroot/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch
new file mode 100644
index 00000000..dc462eff
--- /dev/null
+++ b/bsp/buildroot/package/patchelf/0001-Remove-apparently-incorrect-usage-of-static.patch
@@ -0,0 +1,56 @@
+From 2480efa8411523cf046094492192a5ee451aae5d Mon Sep 17 00:00:00 2001
+From: Eelco Dolstra <eelco.dolstra@logicblox.com>
+Date: Mon, 19 Sep 2016 17:31:37 +0200
+Subject: [PATCH] Remove apparently incorrect usage of "static"
+
+[Upstream-commit: https://github.com/NixOS/patchelf/commit/a365bcb7d7025da51b33165ef7ebc7180199a05e
+This patch also removes the DT_INIT symbols from needed_libs (DT_INIT
+points to library initialisation function, not to needed libraries...)]
+Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
+---
+ src/patchelf.cc | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/patchelf.cc b/src/patchelf.cc
+index 136098f..c870638 100644
+--- a/src/patchelf.cc
++++ b/src/patchelf.cc
+@@ -941,7 +941,6 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const string & newS
+     assert(strTabAddr == rdi(shdrDynStr.sh_addr));
+ 
+     /* Walk through the dynamic section, look for the DT_SONAME entry. */
+-    static vector<string> neededLibs;
+     dyn = (Elf_Dyn *) (contents + rdi(shdrDynamic.sh_offset));
+     Elf_Dyn * dynSoname = 0;
+     char * soname = 0;
+@@ -949,8 +948,7 @@ void ElfFile<ElfFileParamNames>::modifySoname(sonameMode op, const string & newS
+         if (rdi(dyn->d_tag) == DT_SONAME) {
+             dynSoname = dyn;
+             soname = strTab + rdi(dyn->d_un.d_val);
+-        } else if (rdi(dyn->d_tag) == DT_INIT)
+-            neededLibs.push_back(string(strTab + rdi(dyn->d_un.d_val)));
++        }
+     }
+ 
+     if (op == printSoname) {
+@@ -1058,7 +1056,7 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+        unless you use its `--enable-new-dtag' option, in which case it
+        generates a DT_RPATH and DT_RUNPATH pointing at the same
+        string. */
+-    static vector<string> neededLibs;
++    vector<string> neededLibs;
+     dyn = (Elf_Dyn *) (contents + rdi(shdrDynamic.sh_offset));
+     Elf_Dyn * dynRPath = 0, * dynRunPath = 0;
+     char * rpath = 0;
+@@ -1091,7 +1089,7 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+     /* For each directory in the RPATH, check if it contains any
+        needed library. */
+     if (op == rpShrink) {
+-        static vector<bool> neededLibFound(neededLibs.size(), false);
++        vector<bool> neededLibFound(neededLibs.size(), false);
+ 
+         newRPath = "";
+ 
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch b/bsp/buildroot/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch
new file mode 100644
index 00000000..330bea23
--- /dev/null
+++ b/bsp/buildroot/package/patchelf/0002-Extract-a-function-for-splitting-a-colon-separated-s.patch
@@ -0,0 +1,63 @@
+From a8452dc7e80eb17572c7458e33a4f4d609e6a3da Mon Sep 17 00:00:00 2001
+From: Tuomas Tynkkynen <tuomas@tuxera.com>
+Date: Fri, 3 Jun 2016 23:03:51 +0300
+Subject: [PATCH] Extract a function for splitting a colon-separated string
+
+We're going to need this logic in another place, so make a function of
+this.
+
+[Upstream-commit: https://github.com/NixOS/patchelf/commit/2e3fdc2030c75c19df6fc2924083cfad53856562]
+Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
+---
+ src/patchelf.cc | 28 +++++++++++++++++++---------
+ 1 file changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/src/patchelf.cc b/src/patchelf.cc
+index c870638..1d9a772 100644
+--- a/src/patchelf.cc
++++ b/src/patchelf.cc
+@@ -57,6 +57,22 @@ unsigned char * contents = 0;
+ #define ElfFileParamNames Elf_Ehdr, Elf_Phdr, Elf_Shdr, Elf_Addr, Elf_Off, Elf_Dyn, Elf_Sym
+ 
+ 
++static vector<string> splitColonDelimitedString(const char * s){
++    vector<string> parts;
++    const char * pos = s;
++    while (*pos) {
++        const char * end = strchr(pos, ':');
++        if (!end) end = strchr(pos, 0);
++
++        parts.push_back(string(pos, end - pos));
++        if (*end == ':') ++end;
++        pos = end;
++    }
++
++    return parts;
++}
++
++
+ static unsigned int getPageSize(){
+     return pageSize;
+ }
+@@ -1093,15 +1109,9 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+ 
+         newRPath = "";
+ 
+-        char * pos = rpath;
+-        while (*pos) {
+-            char * end = strchr(pos, ':');
+-            if (!end) end = strchr(pos, 0);
+-
+-            /* Get the name of the directory. */
+-            string dirName(pos, end - pos);
+-            if (*end == ':') ++end;
+-            pos = end;
++        vector<string> rpathDirs = splitColonDelimitedString(rpath);
++        for (vector<string>::iterator it = rpathDirs.begin(); it != rpathDirs.end(); ++it) {
++            const string & dirName = *it;
+ 
+             /* Non-absolute entries are allowed (e.g., the special
+                "$ORIGIN" hack). */
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch b/bsp/buildroot/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch
new file mode 100644
index 00000000..feec6276
--- /dev/null
+++ b/bsp/buildroot/package/patchelf/0003-Add-option-to-make-the-rpath-relative-under-a-specif.patch
@@ -0,0 +1,332 @@
+From 618220bfb55c875d6a4d197cb24fe632ac93ec85 Mon Sep 17 00:00:00 2001
+From: Wolfgang Grandegger <wg@grandegger.com>
+Date: Mon, 20 Feb 2017 16:29:24 +0100
+Subject: [PATCH] Add option to make the rpath relative under a specified root
+ directory
+
+Running "patchelf" with the option "--make-rpath-relative ROOTDIR" will
+modify or delete the RPATHDIRs according the following rules
+similar to Martin's patches [1] making the Buildroot toolchaing/SDK
+relocatable.
+
+RPATHDIR starts with "$ORIGIN":
+    The original build-system already took care of setting a relative
+    RPATH, resolve it and test if it's valid (does exist)
+
+RPATHDIR starts with ROOTDIR:
+    The original build-system added some absolute RPATH (absolute on
+    the build machine). Test if it's valid (does exist).
+
+ROOTDIR/RPATHDIR exists:
+    The original build-system already took care of setting an absolute
+    RPATH (absolute in the final rootfs), resolve it and test if it's
+    valid (does exist).
+
+RPATHDIR points somewhere else:
+    (can be anywhere: build trees, staging tree, host location,
+    non-existing location, etc.). Just discard such a path.
+
+The option "--no-standard-libs" will discard RPATHDIRs ROOTDIR/lib and
+ROOTDIR/usr/lib. Like "--shrink-rpath", RPATHDIRs are also discarded
+if the directories do not contain a library referenced by the
+DT_NEEDED fields.
+If the option "--relative-to-file" is given, the rpath will start
+with "$ORIGIN" making it relative to the ELF file, otherwise an
+absolute path relative to ROOTDIR will be used.
+
+A pull request for a similar patch [2] for mainline inclusion is
+pending.
+
+[1] http://lists.busybox.net/pipermail/buildroot/2016-April/159422.html
+[2] https://github.com/NixOS/patchelf/pull/118
+
+Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
+---
+ src/patchelf.cc | 196 ++++++++++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 175 insertions(+), 21 deletions(-)
+
+diff --git a/src/patchelf.cc b/src/patchelf.cc
+index 1d9a772..35b4a33 100644
+--- a/src/patchelf.cc
++++ b/src/patchelf.cc
+@@ -46,6 +46,10 @@ static bool debugMode = false;
+ 
+ static bool forceRPath = false;
+ 
++static bool noStandardLibDirs = false;
++
++static bool relativeToFile = false;
++
+ static string fileName;
+ static int pageSize = PAGESIZE;
+ 
+@@ -77,6 +81,49 @@ static unsigned int getPageSize(){
+     return pageSize;
+ }
+ 
++static bool absolutePathExists(const string & path, string & canonicalPath)
++{
++    char *cpath = realpath(path.c_str(), NULL);
++    if (cpath) {
++        canonicalPath = cpath;
++        free(cpath);
++        return true;
++    } else {
++        return false;
++    }
++}
++
++static string makePathRelative(const string & path,
++    const string & refPath)
++{
++    string relPath = "$ORIGIN";
++    string p = path, refP = refPath;
++    size_t pos;
++
++    /* Strip the common part of path and refPath */
++    while (true) {
++        pos = p.find_first_of('/', 1);
++        if (refP.find_first_of('/', 1) != pos)
++            break;
++        if (p.substr(0, pos) != refP.substr(0, pos))
++            break;
++        if (pos == string::npos)
++            break;
++        p = p.substr(pos);
++        refP = refP.substr(pos);
++    }
++    /* Check if both pathes are equal */
++    if (p != refP) {
++        pos = 0;
++        while (pos != string::npos) {
++            pos =refP.find_first_of('/', pos + 1);
++            relPath.append("/..");
++        }
++        relPath.append(p);
++    }
++
++    return relPath;
++}
+ 
+ template<ElfFileParams>
+ class ElfFile
+@@ -183,9 +230,13 @@ public:
+ 
+     void setInterpreter(const string & newInterpreter);
+ 
+-    typedef enum { rpPrint, rpShrink, rpSet, rpRemove } RPathOp;
++    typedef enum { rpPrint, rpShrink, rpMakeRelative, rpSet, rpRemove} RPathOp;
++
++    bool libFoundInRPath(const string & dirName,
++                         const vector<string> neededLibs,
++                         vector<bool> & neededLibFound);
+ 
+-    void modifyRPath(RPathOp op, string newRPath);
++    void modifyRPath(RPathOp op, string rootDir, string newRPath);
+ 
+     void addNeeded(set<string> libs);
+ 
+@@ -1041,7 +1092,27 @@ static void concatToRPath(string & rpath, const string & path)
+ 
+ 
+ template<ElfFileParams>
+-void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
++bool ElfFile<ElfFileParamNames>::libFoundInRPath(const string & dirName,
++    const vector<string> neededLibs, vector<bool> & neededLibFound)
++{
++    /* For each library that we haven't found yet, see if it
++       exists in this directory. */
++    bool libFound = false;
++    for (unsigned int j = 0; j < neededLibs.size(); ++j)
++        if (!neededLibFound[j]) {
++            string libName = dirName + "/" + neededLibs[j];
++            struct stat st;
++            if (stat(libName.c_str(), &st) == 0) {
++                neededLibFound[j] = true;
++                libFound = true;
++            }
++        }
++    return libFound;
++}
++
++
++template<ElfFileParams>
++void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string rootDir, string newRPath)
+ {
+     Elf_Shdr & shdrDynamic = findSection(".dynamic");
+ 
+@@ -1096,6 +1167,11 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+         return;
+     }
+ 
++    if (op == rpMakeRelative && !rpath) {
++        debug("no RPATH to make relative\n");
++        return;
++    }
++
+     if (op == rpShrink && !rpath) {
+         debug("no RPATH to shrink\n");
+         return;
+@@ -1120,26 +1196,86 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string newRPath)
+                 continue;
+             }
+ 
+-            /* For each library that we haven't found yet, see if it
+-               exists in this directory. */
+-            bool libFound = false;
+-            for (unsigned int j = 0; j < neededLibs.size(); ++j)
+-                if (!neededLibFound[j]) {
+-                    string libName = dirName + "/" + neededLibs[j];
+-                    struct stat st;
+-                    if (stat(libName.c_str(), &st) == 0) {
+-                        neededLibFound[j] = true;
+-                        libFound = true;
+-                    }
+-                }
+-
+-            if (!libFound)
++            if (!libFoundInRPath(dirName, neededLibs, neededLibFound))
+                 debug("removing directory `%s' from RPATH\n", dirName.c_str());
+             else
+                 concatToRPath(newRPath, dirName);
+         }
+     }
+ 
++    /* Make the the RPATH relative to the specified path */
++    if (op == rpMakeRelative) {
++        vector<bool> neededLibFound(neededLibs.size(), false);
++        string fileDir = fileName.substr(0, fileName.find_last_of("/"));
++
++        newRPath = "";
++
++        vector<string> rpathDirs = splitColonDelimitedString(rpath);
++        for (vector<string>::iterator it = rpathDirs.begin(); it != rpathDirs.end(); ++it) {
++            const string & dirName = *it;
++
++            string canonicalPath;
++
++            /* Figure out if we should keep or discard the path. There are several
++               cases to be handled:
++               "dirName" starts with "$ORIGIN":
++                   The original build-system already took care of setting a relative
++                   RPATH. Resolve it and test if it's valid (does exist).
++               "dirName" start with "rootDir":
++                   The original build-system added some absolute RPATH (absolute on
++                   the build machine). Test if it's valid (does exist).
++               "rootDir"/"dirName" exists:
++                    The original build-system already took care of setting an absolute
++                    RPATH (absolute in the final rootfs). Resolve it and test if it's
++                    valid (does exist).
++               "dirName" points somewhere else:
++                    (can be anywhere: build trees, staging tree, host location,
++                    non-existing location, etc.). Just discard such a path. */
++            if (!dirName.compare(0, 7, "$ORIGIN")) {
++                string path = fileDir + dirName.substr(7);
++                if (!absolutePathExists(path, canonicalPath)) {
++                    debug("removing directory '%s' from RPATH because '%s' doesn't exist\n",
++                          dirName.c_str(), path.c_str());
++                    continue;
++                }
++            } else if (!dirName.compare(0, rootDir.length(), rootDir)) {
++                if (!absolutePathExists(dirName, canonicalPath)) {
++                    debug("removing directory '%s' from RPATH because it doesn't exist\n", dirName.c_str());
++                    continue;
++                }
++            } else {
++                string path = rootDir + dirName;
++                if (!absolutePathExists(path, canonicalPath)) {
++                    debug("removing directory '%s' from RPATH because it's not in rootdir\n",
++                          dirName.c_str());
++                    continue;
++                }
++            }
++
++            if (noStandardLibDirs) {
++                if (!canonicalPath.compare(rootDir + "/lib") ||
++                    !canonicalPath.compare(rootDir + "/usr/lib")) {
++                    debug("removing directory '%s' from RPATH because it's a standard library directory\n",
++                         dirName.c_str());
++                    continue;
++                }
++            }
++
++            if (!libFoundInRPath(canonicalPath, neededLibs, neededLibFound)) {
++                debug("removing directory '%s' from RPATH because it does not contain needed libs\n",
++                      dirName.c_str());
++                continue;
++            }
++
++            /* Finally make "canonicalPath" relative to "filedir" in "rootDir" */
++            if (relativeToFile)
++                concatToRPath(newRPath, makePathRelative(canonicalPath, fileDir));
++            else
++                concatToRPath(newRPath, canonicalPath.substr(rootDir.length()));
++            debug("keeping relative path of %s\n", canonicalPath.c_str());
++        }
++    }
++
+     if (op == rpRemove) {
+         if (!rpath) {
+             debug("no RPATH to delete\n");
+@@ -1413,7 +1549,9 @@ static bool shrinkRPath = false;
+ static bool removeRPath = false;
+ static bool setRPath = false;
+ static bool printRPath = false;
++static bool makeRPathRelative = false;
+ static string newRPath;
++static string rootDir;
+ static set<string> neededLibsToRemove;
+ static map<string, string> neededLibsToReplace;
+ static set<string> neededLibsToAdd;
+@@ -1438,14 +1576,16 @@ static void patchElf2(ElfFile & elfFile)
+         elfFile.setInterpreter(newInterpreter);
+ 
+     if (printRPath)
+-        elfFile.modifyRPath(elfFile.rpPrint, "");
++        elfFile.modifyRPath(elfFile.rpPrint, "", "");
+ 
+     if (shrinkRPath)
+-        elfFile.modifyRPath(elfFile.rpShrink, "");
++        elfFile.modifyRPath(elfFile.rpShrink, "", "");
+     else if (removeRPath)
+-        elfFile.modifyRPath(elfFile.rpRemove, "");
++        elfFile.modifyRPath(elfFile.rpRemove, "", "");
+     else if (setRPath)
+-        elfFile.modifyRPath(elfFile.rpSet, newRPath);
++        elfFile.modifyRPath(elfFile.rpSet, "", newRPath);
++    else if (makeRPathRelative)
++        elfFile.modifyRPath(elfFile.rpMakeRelative, rootDir, "");
+ 
+     if (printNeeded) elfFile.printNeededLibs();
+ 
+@@ -1508,6 +1648,9 @@ void showHelp(const string & progName)
+   [--set-rpath RPATH]\n\
+   [--remove-rpath]\n\
+   [--shrink-rpath]\n\
++  [--make-rpath-relative ROOTDIR]\n\
++  [--no-standard-lib-dirs]\n\
++  [--relative-to-file]\n\
+   [--print-rpath]\n\
+   [--force-rpath]\n\
+   [--add-needed LIBRARY]\n\
+@@ -1564,6 +1707,17 @@ int main(int argc, char * * argv)
+             setRPath = true;
+             newRPath = argv[i];
+         }
++        else if (arg == "--make-rpath-relative") {
++            if (++i == argc) error("missing argument to --make-rpath-relative");
++            makeRPathRelative = true;
++            rootDir = argv[i];
++        }
++        else if (arg == "--no-standard-lib-dirs") {
++            noStandardLibDirs = true;
++        }
++        else if (arg == "--relative-to-file") {
++            relativeToFile = true;
++        }
+         else if (arg == "--print-rpath") {
+             printRPath = true;
+         }
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch b/bsp/buildroot/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch
new file mode 100644
index 00000000..8a89d3a6
--- /dev/null
+++ b/bsp/buildroot/package/patchelf/0004-patchelf-Check-ELF-endianness-before-writing-new-run.patch
@@ -0,0 +1,40 @@
+From 8c75599b674c73fbfe9c15afeccad54ae88243f5 Mon Sep 17 00:00:00 2001
+From: Bryce Ferguson <bryce.ferguson@rockwellcollins.com>
+Date: Mon, 25 Jun 2018 13:05:07 -0500
+Subject: [PATCH] patchelf: Check ELF endianness before writing new runpath
+
+This commit modifies the way fields are written in the dynamic
+section in order to account the architecture of the target ELF
+file. Instead of copying the raw data, use the helper functions
+to convert endianness.
+
+Link to upstream PR: https://github.com/NixOS/patchelf/pull/151
+
+Signed-off-by: Bryce Ferguson <bryce.ferguson@rockwellcollins.com>
+---
+ src/patchelf.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/patchelf.cc b/src/patchelf.cc
+index 35b4a33..a33f644 100644
+--- a/src/patchelf.cc
++++ b/src/patchelf.cc
+@@ -1315,13 +1315,13 @@ void ElfFile<ElfFileParamNames>::modifyRPath(RPathOp op, string rootDir, string
+     debug("new rpath is `%s'\n", newRPath.c_str());
+ 
+     if (!forceRPath && dynRPath && !dynRunPath) { /* convert DT_RPATH to DT_RUNPATH */
+-        dynRPath->d_tag = DT_RUNPATH;
++        wri(dynRPath->d_tag, DT_RUNPATH);
+         dynRunPath = dynRPath;
+         dynRPath = 0;
+     }
+ 
+     if (forceRPath && dynRPath && dynRunPath) { /* convert DT_RUNPATH to DT_RPATH */
+-        dynRunPath->d_tag = DT_IGNORE;
++        wri(dynRunPath->d_tag, DT_IGNORE);
+     }
+ 
+     if (newRPath.size() <= rpathSize) {
+-- 
+2.17.0
+
diff --git a/bsp/buildroot/package/patchelf/Config.in.host b/bsp/buildroot/package/patchelf/Config.in.host
index d1c83757..6abe78e2 100644
--- a/bsp/buildroot/package/patchelf/Config.in.host
+++ b/bsp/buildroot/package/patchelf/Config.in.host
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_HOST_PATCHELF
-	bool "host patchelf"
+	bool
+	default y
 	help
 	  PatchELF is a small utility to modify the dynamic linker
 	  and RPATH of ELF executables.
diff --git a/bsp/buildroot/package/patchelf/patchelf.hash b/bsp/buildroot/package/patchelf/patchelf.hash
index 653eb466..0f545609 100644
--- a/bsp/buildroot/package/patchelf/patchelf.hash
+++ b/bsp/buildroot/package/patchelf/patchelf.hash
@@ -1,2 +1,4 @@
 # Locally calculated
 sha256	a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83	patchelf-0.9.tar.bz2
+# License files, locally calculated
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/bsp/buildroot/package/patchelf/patchelf.mk b/bsp/buildroot/package/patchelf/patchelf.mk
index cf2e43a7..74e6cccd 100644
--- a/bsp/buildroot/package/patchelf/patchelf.mk
+++ b/bsp/buildroot/package/patchelf/patchelf.mk
@@ -7,7 +7,7 @@
 PATCHELF_VERSION = 0.9
 PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-$(PATCHELF_VERSION)
 PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2
-PATCHELF_LICENSE = GPLv3+
+PATCHELF_LICENSE = GPL-3.0+
 PATCHELF_LICENSE_FILES = COPYING
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/pax-utils/Config.in b/bsp/buildroot/package/pax-utils/Config.in
index e61d9b31..58100e48 100644
--- a/bsp/buildroot/package/pax-utils/Config.in
+++ b/bsp/buildroot/package/pax-utils/Config.in
@@ -1,11 +1,7 @@
 config BR2_PACKAGE_PAX_UTILS
 	bool "pax-utils"
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 # needs PR_SET_NO_NEW_PRIVS
 	help
 	  ELF related utils for ELF 32/64 binaries that can check files
 	  for security relevant properties.
 
 	  http://www.gentoo.org/proj/en/hardened/pax-utils.xml
-
-comment "pax-utils needs a toolchain w/ headers >= 3.5"
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
diff --git a/bsp/buildroot/package/pax-utils/pax-utils.hash b/bsp/buildroot/package/pax-utils/pax-utils.hash
index 399bae40..c7558960 100644
--- a/bsp/buildroot/package/pax-utils/pax-utils.hash
+++ b/bsp/buildroot/package/pax-utils/pax-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414	pax-utils-1.1.4.tar.xz
+sha256	7f4a7f8db6b4743adde7582fa48992ad01776796fcde030683732f56221337d9	pax-utils-1.2.2.tar.xz
diff --git a/bsp/buildroot/package/pax-utils/pax-utils.mk b/bsp/buildroot/package/pax-utils/pax-utils.mk
index 8d5f3eea..b31468ec 100644
--- a/bsp/buildroot/package/pax-utils/pax-utils.mk
+++ b/bsp/buildroot/package/pax-utils/pax-utils.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PAX_UTILS_VERSION = 1.1.4
+PAX_UTILS_VERSION = 1.2.2
 PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles
 PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz
-PAX_UTILS_LICENSE = GPLv2
+PAX_UTILS_LICENSE = GPL-2.0
 PAX_UTILS_LICENSE_FILES = COPYING
 
 PAX_UTILS_DEPENDENCIES = host-pkgconf
diff --git a/bsp/buildroot/package/paxtest/0001-genpaxtest-move-log-location.patch b/bsp/buildroot/package/paxtest/0001-genpaxtest-move-log-location.patch
new file mode 100644
index 00000000..6447d53c
--- /dev/null
+++ b/bsp/buildroot/package/paxtest/0001-genpaxtest-move-log-location.patch
@@ -0,0 +1,30 @@
+From 623d99e4f557ef9cd771006e4f916c12d22a07a8 Mon Sep 17 00:00:00 2001
+From: David Graziano <david.graziano@rockwellcollins.com>
+Date: Mon, 12 Jun 2017 10:41:45 -0500
+Subject: [PATCH] genpaxtest: move log location
+
+Move log location to /var/log instead of local directory.
+(For read-only filesystems)
+
+Signed-off-by: David Graziano <david.graziano@rockwellcollins.com>
+---
+ genpaxtest | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/genpaxtest b/genpaxtest
+index 5a22e15..d62b15e 100644
+--- a/genpaxtest
++++ b/genpaxtest
+@@ -35,7 +35,7 @@
+        exit 1
+ fi
+
+-LOG=\$HOME/paxtest.log
++LOG=/var/log/paxtest.log
+ [ -n "\$1" ] && LOG=\$1
+ touch "\$LOG"
+ if [ ! -e "\$LOG" ]; then
+ 
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch b/bsp/buildroot/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch
new file mode 100644
index 00000000..54e5e69e
--- /dev/null
+++ b/bsp/buildroot/package/paxtest/0002-paxtest-page-alignment-ARM-and-NIOS2-arch.patch
@@ -0,0 +1,49 @@
+From 70406ad5668a15fedce2ae1ed3bc4fad04d9f040 Mon Sep 17 00:00:00 2001
+From: Matt Weber <matthew.weber@rockwellcollins.com>
+Date: Wed, 5 Jul 2017 20:47:42 -0500
+Subject: [PATCH] paxtest: page alignment ARM and NIOS2 arch
+
+- Extended ARM range from ARMv6-v7 to also include anything below v7
+- Added NIOS2 arch to conditionally have smaller alignment
+
+Submitted Upstream to pageexec@freemail.hu.  Also posted a
+bug to both (Hardened) Suse and Gentoo's bugtrackers.
+https://bugzilla.opensuse.org/show_bug.cgi?id=1047422
+https://bugs.gentoo.org/show_bug.cgi?id=623946
+
+Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
+---
+ paxtest.h | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/paxtest.h b/paxtest.h
+index 8623bfb..a230c1a 100644
+--- a/paxtest.h
++++ b/paxtest.h
+@@ -5,13 +5,21 @@
+ #include <unistd.h>
+ 
+ /*
+- * ARMv6 and ARMv7 do not like 64k alignment, 32k is ok
++ * Earlier ARMv# through ARMv7 do not like 64k alignment, 32k is ok
+  */
+-#if defined(__arm__) && __ARM_ARCH >= 6 && __ARM_ARCH <= 7
++#if defined(__arm__) && __ARM_ARCH <= 7
+ #define PAGE_SIZE_MAX  (32768)
+ #else
+ #define PAGE_SIZE_MAX	0x10000	/* 64k should cover most arches */
+ #endif
++
++/*
++ * NIOS2's assemblier doesn't like 64k alignment
++ */
++#if defined(__nios2_arch__)
++#define PAGE_SIZE_MAX  (32768)
++#endif
++
+ #ifndef __aligned
+ #define __aligned(x)	__attribute__((aligned(x)))
+ #endif
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/paxtest/Config.in b/bsp/buildroot/package/paxtest/Config.in
new file mode 100644
index 00000000..1e09820b
--- /dev/null
+++ b/bsp/buildroot/package/paxtest/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PAXTEST
+	bool "paxtest"
+	# No UCLIBC or MUSL because __NO_A_OUT_SUPPORT
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	help
+	  PaX regression test suite
+
+	  http://pax.grsecurity.net/docs
+
+comment "paxtest needs a glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/paxtest/paxtest.hash b/bsp/buildroot/package/paxtest/paxtest.hash
new file mode 100644
index 00000000..c10566c5
--- /dev/null
+++ b/bsp/buildroot/package/paxtest/paxtest.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256	d553848431fd8c2ab6c8361b62e5cedfed1cc1d60088241f4a33d2af15dd667f	paxtest-0.9.15.tar.gz
diff --git a/bsp/buildroot/package/paxtest/paxtest.mk b/bsp/buildroot/package/paxtest/paxtest.mk
new file mode 100644
index 00000000..e632e222
--- /dev/null
+++ b/bsp/buildroot/package/paxtest/paxtest.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# paxtest
+#
+################################################################################
+
+PAXTEST_VERSION = 0.9.15
+PAXTEST_SITE = https://www.grsecurity.net/~spender
+PAXTEST_LICENSE = GPL-2.0+
+PAXTEST_LICENSE_FILES = README
+
+define PAXTEST_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		RUNDIR="/usr/lib/paxtest" CC="$(TARGET_CC)" LD="$(TARGET_CC)" linux
+endef
+
+# The files installed to RUNDIR include test apps and shared libs.
+# Assuming /usr/bin/paxtest script solely uses these libs and apps, the
+# genpaxtest script updates LD_LIBRARY_PATH in the paxtest script
+# as part of the paxtest's creation to include the RUNDIR path for shared
+# library use.
+define PAXTEST_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
+		DESTDIR=$(TARGET_DIR) \
+		BINDIR="usr/bin" \
+		RUNDIR="/usr/lib/paxtest" -f Makefile.psm install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/pciutils/pciutils.hash b/bsp/buildroot/package/pciutils/pciutils.hash
index 2572c35b..80d7041a 100644
--- a/bsp/buildroot/package/pciutils/pciutils.hash
+++ b/bsp/buildroot/package/pciutils/pciutils.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc
-sha256	3a99141a9f40528d0a0035665a06dc37ddb1ae341658e51b50a76ecf86235efc	pciutils-3.5.2.tar.xz
+sha256	1d62f8fa192f90e61c35a6fc15ff3cb9a7a792f782407acc42ef67817c5939f5	pciutils-3.5.5.tar.xz
diff --git a/bsp/buildroot/package/pciutils/pciutils.mk b/bsp/buildroot/package/pciutils/pciutils.mk
index e65eadca..2dd5771f 100644
--- a/bsp/buildroot/package/pciutils/pciutils.mk
+++ b/bsp/buildroot/package/pciutils/pciutils.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PCIUTILS_VERSION = 3.5.2
+PCIUTILS_VERSION = 3.5.5
 PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils
 PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz
 PCIUTILS_INSTALL_STAGING = YES
-PCIUTILS_LICENSE = GPLv2+
+PCIUTILS_LICENSE = GPL-2.0+
 PCIUTILS_LICENSE_FILES = COPYING
 PCIUTILS_MAKE_OPTS = \
 	CC="$(TARGET_CC)" \
diff --git a/bsp/buildroot/package/pcmanfm/Config.in b/bsp/buildroot/package/pcmanfm/Config.in
index 40ebbdfc..69ddf002 100644
--- a/bsp/buildroot/package/pcmanfm/Config.in
+++ b/bsp/buildroot/package/pcmanfm/Config.in
@@ -1,19 +1,19 @@
 config BR2_PACKAGE_PCMANFM
 	bool "pcmanfm"
-	select BR2_PACKAGE_LIBFM
-	select BR2_PACKAGE_MENU_CACHE
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
 	depends on BR2_INSTALL_LIBSTDCPP # libgtk2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz
+	select BR2_PACKAGE_LIBFM
+	select BR2_PACKAGE_MENU_CACHE
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11
 	help
-	  PCMan File Manager (PCManFM) is a file manager application developed
-	  by Hong Jen Yee from Taiwan which is meant to be a replacement for
-	  Nautilus, Konqueror and Thunar.
+	  PCMan File Manager (PCManFM) is a file manager application
+	  developed by Hong Jen Yee from Taiwan which is meant to be a
+	  replacement for Nautilus, Konqueror and Thunar.
 
 	  http://wiki.lxde.org/en/PCManFM
 
diff --git a/bsp/buildroot/package/pcmanfm/pcmanfm.hash b/bsp/buildroot/package/pcmanfm/pcmanfm.hash
index cb0d2066..155e9beb 100644
--- a/bsp/buildroot/package/pcmanfm/pcmanfm.hash
+++ b/bsp/buildroot/package/pcmanfm/pcmanfm.hash
@@ -1,3 +1,3 @@
 # From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
-md5	19764c2f59653724c8713e0064fa6829	pcmanfm-1.2.4.tar.xz
-sha1	4768ee564a36021977e4af8c33270b6835b3391d	pcmanfm-1.2.4.tar.xz
+md5 b4d1f8ce08d87e4f27805a246fc51ac2  pcmanfm-1.2.5.tar.xz
+sha1 9a8a2b4abebdf859e5ba2486eff84d505ad17b89  pcmanfm-1.2.5.tar.xz
diff --git a/bsp/buildroot/package/pcmanfm/pcmanfm.mk b/bsp/buildroot/package/pcmanfm/pcmanfm.mk
index e3619093..31acae65 100644
--- a/bsp/buildroot/package/pcmanfm/pcmanfm.mk
+++ b/bsp/buildroot/package/pcmanfm/pcmanfm.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PCMANFM_VERSION = 1.2.4
+PCMANFM_VERSION = 1.2.5
 PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz
 PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files
 PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm
-PCMANFM_LICENSE = GPLv2+
+PCMANFM_LICENSE = GPL-2.0+
 PCMANFM_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
diff --git a/bsp/buildroot/package/pcre/pcre.hash b/bsp/buildroot/package/pcre/pcre.hash
index b36e1301..fc0bb98d 100644
--- a/bsp/buildroot/package/pcre/pcre.hash
+++ b/bsp/buildroot/package/pcre/pcre.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
 sha256 e62c7eac5ae7c0e7286db61ff82912e1c0b7a0c13706616e94a7dd729321b530  pcre-8.41.tar.bz2
+# License files, locally calculated
+sha256 9ac4dfc82b2645ff77b56b759f95f28aa15ab15a03670fa6d4313a6b351e60f0  LICENCE
diff --git a/bsp/buildroot/package/pcre/pcre.mk b/bsp/buildroot/package/pcre/pcre.mk
index 5734fce2..b12b00dd 100644
--- a/bsp/buildroot/package/pcre/pcre.mk
+++ b/bsp/buildroot/package/pcre/pcre.mk
@@ -7,7 +7,7 @@
 PCRE_VERSION = 8.41
 PCRE_SITE = https://ftp.pcre.org/pub/pcre
 PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2
-PCRE_LICENSE = BSD-3c
+PCRE_LICENSE = BSD-3-Clause
 PCRE_LICENSE_FILES = LICENCE
 PCRE_INSTALL_STAGING = YES
 PCRE_CONFIG_SCRIPTS = pcre-config
diff --git a/bsp/buildroot/package/pcre2/0001-fix-heapframe-alignment.patch b/bsp/buildroot/package/pcre2/0001-fix-heapframe-alignment.patch
new file mode 100644
index 00000000..a10e9e79
--- /dev/null
+++ b/bsp/buildroot/package/pcre2/0001-fix-heapframe-alignment.patch
@@ -0,0 +1,49 @@
+src/pcre2_intmodedep.h: fix alignment of fields in struct heapframe
+
+pcre2_intmodedep.h has a check to verify that the size of the struct
+heapframe is a multiple of 4 bytes. On most architectures this works
+fine, but not on m68k. Indeed, when building the 16-bit variant of
+pcre2, the heapframe structure contains:
+
+ PCRE2_UCHAR occu[2];
+ PCRE2_SPTR  eptr;
+
+Where PCRE2_UCHAR is a 16-bit data type, and PCRE2_SPTR is a
+pointer. The occu[] array starts at byte 0x32, so not aligned on a
+32-bit boundary. With 2 x 16-bit, the occur[] array ends at byte 0x36.
+
+Now, on most architectures, the alignment required for a pointer will
+make the eptr field start at 0x38 (on 32 bit architectures). However,
+on m68k, it is fine to have a pointer aligned only on a 16-bit
+boundary, and the eptr pointer will be at offset 0x36.
+
+This doesn't cause a problem per-se, but breaks the check that
+heapframe should be a multiple of 4 bytes.
+
+To fix this, we make sure eptr is aligned by introducing an unused
+field of 16 bits after the occu[] array (in the 16-bit variant) or
+after the occu[] array (in the 32-bit variant). These choices have
+been made to keep the structure layout unchanged.
+
+Fixes the following build failure on m68k:
+
+src/pcre2_intmodedep.h:818:14: error: size of array 'check_heapframe_size' is negative
+ typedef char check_heapframe_size[
+              ^~~~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Upstream: https://bugs.exim.org/show_bug.cgi?id=2247
+
+Index: src/pcre2_intmodedep.h
+===================================================================
+--- a/src/pcre2_intmodedep.h	(revision 923)
++++ b/src/pcre2_intmodedep.h	(working copy)
+@@ -797,7 +797,9 @@
+   PCRE2_UCHAR occu[6];       /* Used for other case code units */
+ #elif PCRE2_CODE_UNIT_WIDTH == 16
+   PCRE2_UCHAR occu[2];       /* Used for other case code units */
++  uint8_t     unused[2];     /* Ensure 32 bit alignment */
+ #else
++  uint8_t     unused[2];     /* Ensure 32 bit alignment */
+   PCRE2_UCHAR occu[1];       /* Used for other case code units */
+ #endif
diff --git a/bsp/buildroot/package/pcre2/Config.in b/bsp/buildroot/package/pcre2/Config.in
new file mode 100644
index 00000000..bb576c75
--- /dev/null
+++ b/bsp/buildroot/package/pcre2/Config.in
@@ -0,0 +1,26 @@
+
+config BR2_PACKAGE_PCRE2
+	bool "pcre2"
+	help
+	  Perl Compatible Regular Expressions. By default, only the
+	  8-bits libpcre2 is built. To get the 16-bits and/or 32-bits
+	  variants libpcre2-16/libpcre2-32, use the package
+	  sub-options.
+
+	  http://www.pcre.org/
+
+if BR2_PACKAGE_PCRE2
+
+config BR2_PACKAGE_PCRE2_16
+	bool "16-bit pcre2"
+	help
+	  This option builds the 16-bits pcre2 library, i.e
+	  'libpcre2-16'
+
+config BR2_PACKAGE_PCRE2_32
+	bool "32-bit pcre2"
+	help
+	  This option builds the 32-bits pcre2 library, i.e
+	  'libpcre2-32'
+
+endif
diff --git a/bsp/buildroot/package/pcre2/pcre2.hash b/bsp/buildroot/package/pcre2/pcre2.hash
new file mode 100644
index 00000000..7b125dda
--- /dev/null
+++ b/bsp/buildroot/package/pcre2/pcre2.hash
@@ -0,0 +1,2 @@
+# Locally calculated after checking pgp signature at https://ftp.pcre.org/pub/pcre/pcre2-10.30.tar.bz2.sig
+sha256 90bd41c605d30e3745771eb81928d779f158081a51b2f314bbcc1f73de5773db  pcre2-10.30.tar.bz2
diff --git a/bsp/buildroot/package/pcre2/pcre2.mk b/bsp/buildroot/package/pcre2/pcre2.mk
new file mode 100644
index 00000000..38446228
--- /dev/null
+++ b/bsp/buildroot/package/pcre2/pcre2.mk
@@ -0,0 +1,25 @@
+################################################################################
+#
+# pcre2
+#
+################################################################################
+
+PCRE2_VERSION = 10.30
+PCRE2_SITE = https://ftp.pcre.org/pub/pcre
+PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2
+PCRE2_LICENSE = BSD-3-Clause
+PCRE2_LICENSE_FILES = LICENCE
+PCRE2_INSTALL_STAGING = YES
+PCRE2_CONFIG_SCRIPTS = pcre2-config
+
+PCRE2_CONF_OPTS += --enable-pcre2-8
+PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_16),--enable-pcre2-16,--disable-pcre2-16)
+PCRE2_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE2_32),--enable-pcre2-32,--disable-pcre2-32)
+
+# disable fork usage if not available
+ifeq ($(BR2_USE_MMU),)
+PCRE2_CONF_OPTS += --disable-pcre2grep-callout
+endif
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/pcsc-lite/pcsc-lite.hash b/bsp/buildroot/package/pcsc-lite/pcsc-lite.hash
index 3adb8652..efd97493 100644
--- a/bsp/buildroot/package/pcsc-lite/pcsc-lite.hash
+++ b/bsp/buildroot/package/pcsc-lite/pcsc-lite.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 607c4bd730526d282a63edb2ba4ee043f497877be642c5c647e37995e21f2612 pcsc-lite-1.8.10.tar.bz2
+sha256 ec7d0114016c788c1c09859c84860f6cec6c4595436d23245105154b9c046bb2 pcsc-lite-1.8.22.tar.bz2
diff --git a/bsp/buildroot/package/pcsc-lite/pcsc-lite.mk b/bsp/buildroot/package/pcsc-lite/pcsc-lite.mk
index e53c004e..15c37f9e 100644
--- a/bsp/buildroot/package/pcsc-lite/pcsc-lite.mk
+++ b/bsp/buildroot/package/pcsc-lite/pcsc-lite.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PCSC_LITE_VERSION = 1.8.10
+PCSC_LITE_VERSION = 1.8.22
 PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2
-PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/3963
+PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/4203
 PCSC_LITE_INSTALL_STAGING = YES
 PCSC_LITE_DEPENDENCIES = host-pkgconf
-PCSC_LITE_LICENSE = BSD-3c
+PCSC_LITE_LICENSE = BSD-3-Clause
 PCSC_LITE_LICENSE_FILES = COPYING
 PCSC_LITE_AUTORECONF = YES
 
@@ -37,4 +37,10 @@ ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y)
 PCSC_LITE_CONF_OPTS += --enable-embedded
 endif
 
+define PCSC_LITE_INSTALL_INIT_SYSTEMD
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/pcscd.socket \
+		$(TARGET_DIR)/etc/systemd/system/sockets.target.wants/pcscd.socket
+endef
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/pdbg/Config.in b/bsp/buildroot/package/pdbg/Config.in
index 3e23c210..a0b3d866 100644
--- a/bsp/buildroot/package/pdbg/Config.in
+++ b/bsp/buildroot/package/pdbg/Config.in
@@ -2,9 +2,10 @@ config BR2_PACKAGE_PDBG
 	bool "pdbg"
 	help
 	  PowerPC FSI Debugger, for low level debugging of a IBM
-	  Power8 CPU over FSI.
+	  Power8 and Power9 CPU over FSI.
 
 	  pdbg runs on a BMC, which is generally an ARM-powered system
-	  monitoring/controlling a host CPU.
+	  monitoring/controlling a host CPU. It can also run on the
+	  host.
 
 	  https://github.com/open-power/pdbg
diff --git a/bsp/buildroot/package/pdbg/pdbg.hash b/bsp/buildroot/package/pdbg/pdbg.hash
index 16bf5802..39aa33e1 100644
--- a/bsp/buildroot/package/pdbg/pdbg.hash
+++ b/bsp/buildroot/package/pdbg/pdbg.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 8edabb9ae98ce3b1892b768f2ee5e779a00476b63cdcc6f905e8464a0b7d96a3 pdbg-90a7370a11e727f1482dea6ff2bd6aec20c64805.tar.gz
+sha256 2d6174d30b12cb46d24c260ecc0714a757c2cb899be3f5106c148d4c359bd319 pdbg-139ba071c222a5b0c20075f7c2265029ddd59449.tar.gz
diff --git a/bsp/buildroot/package/pdbg/pdbg.mk b/bsp/buildroot/package/pdbg/pdbg.mk
index 9cc05cd7..ba9aa15d 100644
--- a/bsp/buildroot/package/pdbg/pdbg.mk
+++ b/bsp/buildroot/package/pdbg/pdbg.mk
@@ -4,10 +4,18 @@
 #
 ################################################################################
 
-PDBG_VERSION = 90a7370a11e727f1482dea6ff2bd6aec20c64805
+PDBG_VERSION = 139ba071c222a5b0c20075f7c2265029ddd59449
 PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION))
-PDBG_LICENSE = Apache 2.0
+PDBG_LICENSE = Apache-2.0
 PDBG_LICENSE_FILES = COPYING
 PDBG_AUTORECONF = YES
+PDBG_DEPENDENCIES = host-dtc
+
+PDBG_MAKE_OPTS = "GIT_SHA1=\"$(PDBG_VERSION)\""
+
+define PDBG_PATCH_M4
+	mkdir -p $(@D)/m4
+endef
+PDBG_POST_PATCH_HOOKS += PDBG_PATCH_M4
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch b/bsp/buildroot/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch
new file mode 100644
index 00000000..78f3e576
--- /dev/null
+++ b/bsp/buildroot/package/pdmenu/0001-autoconf-makeinfo.in-link-with-INTLLIBS-if-needed.patch
@@ -0,0 +1,27 @@
+From 319cc3859044214961164ed1f219f2f21ca965af Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 30 Aug 2017 23:04:37 +0200
+Subject: [PATCH] autoconf/makeinfo.in: link with INTLLIBS if needed
+
+gettext may be provided by external libraries, as specified in
+INTLLIBS, so we must include @INTLLIBS@ in the LIBS variable.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ autoconf/makeinfo.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autoconf/makeinfo.in b/autoconf/makeinfo.in
+index ee3054a..6d58d77 100644
+--- a/autoconf/makeinfo.in
++++ b/autoconf/makeinfo.in
+@@ -13,5 +13,5 @@ DEFINES		= -DETCDIR=\"${SYSCONFDIR}/\" -DVER=\"${VER}\" @DEFS@ \
+ 		  $(PROFILE) -D__USE_FIXED_PROTOTYPES__ -D_GNU_SOURCE \
+ 		  -DLOCALEDIR=\"@datadir@/locale\"
+ CFLAGS		= $(DEFINES) @gcc_cflags@ @CFLAGS@
+-LIBS		= @LIBS@ $(EFENCE)
++LIBS		= @LIBS@ @INTLLIBS@ $(EFENCE)
+ INSTALL_PROGRAM	= ${INSTALL}
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch b/bsp/buildroot/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch
new file mode 100644
index 00000000..1a22aa6f
--- /dev/null
+++ b/bsp/buildroot/package/pdmenu/0002-Makefile-autoconf-makeinfo.in-support-build-install-.patch
@@ -0,0 +1,76 @@
+From 5368bd0cfd0640f5c0ca766d4fda1b3f71c1b013 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 30 Aug 2017 23:07:26 +0200
+Subject: [PATCH] Makefile, autoconf/makeinfo.in: support build/install without
+ gettext
+
+The gettext tool msgfmt may not be available to build the .mo files
+from the .po files, so we handle this case by disabling the
+build/installation of .po files in such a case.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile             | 17 ++++++++++++++---
+ autoconf/makeinfo.in |  1 +
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index a708046..3e83ca3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -7,11 +7,18 @@ OBJFILES	:= $(SRCFILES:%.c=%.o)
+ LANGS		= fr ru es
+ MOS		:= $(addprefix po/, $(addsuffix .mo, $(LANGS)))
+ LOCALEDIR	= $(INSTALL_PREFIX)/usr/share/locale
+-
+-all: pdmenu $(POTFILE) $(MOS)
++TARGETS		= pdmenu
++INSTALL_TARGETS	= install-pdmenu
+ 
+ include makeinfo
+ 
++ifneq ($(MSGFMT),)
++TARGETS += $(POTFILE) $(MOS)
++INSTALL_TARGETS += install-pos
++endif
++
++all: $(TARGETS)
++
+ pdmenu: .dep $(OBJFILES)
+ 	${CC} -o pdmenu $(OBJFILES) $(CFLAGS) $(LIBS)
+ 
+@@ -40,7 +47,9 @@ clean:
+ 	$(MAKE) $(POTFILE) # make sure translators' input is ready
+ 	rm -f $(OBJFILES) pdmenu $(MOS)
+ 
+-install: all
++install: $(INSTALL_TARGETS)
++
++install-pdmenu:
+ 	$(INSTALL) -d $(INSTALL_PREFIX)/$(BINDIR) \
+ 		$(INSTALL_PREFIX)/$(MANDIR)/man1 \
+ 		$(INSTALL_PREFIX)/$(MANDIR)/man5 \
+@@ -56,6 +65,8 @@ install: all
+ 	$(INSTALL) examples/pdmenurc $(INSTALL_PREFIX)/$(SYSCONFDIR)/pdmenurc -m 0644
+ 	$(INSTALL) examples/showdir.pl $(INSTALL_PREFIX)/$(DATADIR)/pdmenu
+ 	cd $(INSTALL_PREFIX)/$(DATADIR)/pdmenu && $(LN_S) -f showdir.pl editdir.pl
++
++install-pos:
+ 	for lang in $(LANGS); do \
+ 		[ ! -d $(LOCALEDIR)/$$lang/LC_MESSAGES/ ] && mkdir -p $(LOCALEDIR)/$$lang/LC_MESSAGES/; \
+ 		install -m 644 po/$$lang.mo $(LOCALEDIR)/$$lang/LC_MESSAGES/pdmenu.mo; \
+diff --git a/autoconf/makeinfo.in b/autoconf/makeinfo.in
+index 6d58d77..069daf8 100644
+--- a/autoconf/makeinfo.in
++++ b/autoconf/makeinfo.in
+@@ -8,6 +8,7 @@ DATADIR		= @datadir@
+ CC		= @CC@
+ INSTALL		= @INSTALL@
+ LN_S		= @LN_S@
++MSGFMT		= @MSGFMT@
+ VER		= @VER@
+ DEFINES		= -DETCDIR=\"${SYSCONFDIR}/\" -DVER=\"${VER}\" @DEFS@ \
+ 		  $(PROFILE) -D__USE_FIXED_PROTOTYPES__ -D_GNU_SOURCE \
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/pdmenu/Config.in b/bsp/buildroot/package/pdmenu/Config.in
new file mode 100644
index 00000000..8f35f614
--- /dev/null
+++ b/bsp/buildroot/package/pdmenu/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_PDMENU
+	bool "pdmenu"
+	depends on BR2_USE_MMU # slang
+	select BR2_PACKAGE_SLANG
+	help
+	  Pdmenu is a full screen menuing system for Unix. It is
+	  designed to be easy to use, and is suitable as a login shell
+	  for inexperienced users, or it can just be ran at the
+	  command line as a handy menu.
+
+	  Pdmenu features color support and GPM mouse support at the
+	  Linux console. It was developed on Linux, and has now been
+	  compiled on many other unixes without problems.
+
+	  https://joeyh.name/code/pdmenu/
diff --git a/bsp/buildroot/package/pdmenu/pdmenu.hash b/bsp/buildroot/package/pdmenu/pdmenu.hash
new file mode 100644
index 00000000..ab3a6660
--- /dev/null
+++ b/bsp/buildroot/package/pdmenu/pdmenu.hash
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256 302aa81b8868133ff5a0f3e3e897f71d425bc628c0d7439addb623f12c277bea pdmenu_1.3.4.tar.gz
+
+# License file hash, locally calculated
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 doc/COPYING
diff --git a/bsp/buildroot/package/pdmenu/pdmenu.mk b/bsp/buildroot/package/pdmenu/pdmenu.mk
new file mode 100644
index 00000000..78350958
--- /dev/null
+++ b/bsp/buildroot/package/pdmenu/pdmenu.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# pdmenu
+#
+################################################################################
+
+PDMENU_VERSION = 1.3.4
+PDMENU_SOURCE = pdmenu_$(PDMENU_VERSION).tar.gz
+PDMENU_SITE = http://snapshot.debian.org/archive/debian/20170828T160058Z/pool/main/p/pdmenu
+PDMENU_LICENSE = GPL-2.0
+PDMENU_LICENSE_FILES = doc/COPYING
+PDMENU_DEPENDENCIES = slang $(TARGET_NLS_DEPENDENCIES)
+PDMENU_INSTALL_TARGET_OPTS = INSTALL_PREFIX=$(TARGET_DIR) install
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk b/bsp/buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
index 61528210..de029e9a 100644
--- a/bsp/buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
+++ b/bsp/buildroot/package/perl-crypt-openssl-random/perl-crypt-openssl-random.mk
@@ -8,7 +8,7 @@ PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.11
 PERL_CRYPT_OPENSSL_RANDOM_SOURCE = Crypt-OpenSSL-Random-$(PERL_CRYPT_OPENSSL_RANDOM_VERSION).tar.gz
 PERL_CRYPT_OPENSSL_RANDOM_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
 PERL_CRYPT_OPENSSL_RANDOM_DEPENDENCIES = openssl
-PERL_CRYPT_OPENSSL_RANDOM_LICENSE = Artistic or GPLv1+
+PERL_CRYPT_OPENSSL_RANDOM_LICENSE = Artistic or GPL-1.0+
 PERL_CRYPT_OPENSSL_RANDOM_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/bsp/buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
index 7a4e31ee..b853d995 100644
--- a/bsp/buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
+++ b/bsp/buildroot/package/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk
@@ -8,7 +8,7 @@ PERL_CRYPT_OPENSSL_RSA_VERSION = 0.28
 PERL_CRYPT_OPENSSL_RSA_SOURCE = Crypt-OpenSSL-RSA-$(PERL_CRYPT_OPENSSL_RSA_VERSION).tar.gz
 PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERLER
 PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = perl-crypt-openssl-random
-PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPLv1+
+PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPL-1.0+
 PERL_CRYPT_OPENSSL_RSA_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-datetime-tiny/perl-datetime-tiny.mk b/bsp/buildroot/package/perl-datetime-tiny/perl-datetime-tiny.mk
index 57589731..6b549671 100644
--- a/bsp/buildroot/package/perl-datetime-tiny/perl-datetime-tiny.mk
+++ b/bsp/buildroot/package/perl-datetime-tiny/perl-datetime-tiny.mk
@@ -7,7 +7,7 @@
 PERL_DATETIME_TINY_VERSION = 1.06
 PERL_DATETIME_TINY_SOURCE = DateTime-Tiny-$(PERL_DATETIME_TINY_VERSION).tar.gz
 PERL_DATETIME_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN
-PERL_DATETIME_TINY_LICENSE = Artistic or GPLv1+
+PERL_DATETIME_TINY_LICENSE = Artistic or GPL-1.0+
 PERL_DATETIME_TINY_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-digest-hmac/perl-digest-hmac.mk b/bsp/buildroot/package/perl-digest-hmac/perl-digest-hmac.mk
index bee32f44..a926a1e5 100644
--- a/bsp/buildroot/package/perl-digest-hmac/perl-digest-hmac.mk
+++ b/bsp/buildroot/package/perl-digest-hmac/perl-digest-hmac.mk
@@ -7,7 +7,7 @@
 PERL_DIGEST_HMAC_VERSION = 1.03
 PERL_DIGEST_HMAC_SOURCE = Digest-HMAC-$(PERL_DIGEST_HMAC_VERSION).tar.gz
 PERL_DIGEST_HMAC_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_DIGEST_HMAC_LICENSE = Artistic or GPLv1+
+PERL_DIGEST_HMAC_LICENSE = Artistic or GPL-1.0+
 PERL_DIGEST_HMAC_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-digest-sha1/perl-digest-sha1.mk b/bsp/buildroot/package/perl-digest-sha1/perl-digest-sha1.mk
index 52b9ec35..d93159b9 100644
--- a/bsp/buildroot/package/perl-digest-sha1/perl-digest-sha1.mk
+++ b/bsp/buildroot/package/perl-digest-sha1/perl-digest-sha1.mk
@@ -7,7 +7,7 @@
 PERL_DIGEST_SHA1_VERSION = 2.13
 PERL_DIGEST_SHA1_SOURCE = Digest-SHA1-$(PERL_DIGEST_SHA1_VERSION).tar.gz
 PERL_DIGEST_SHA1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_DIGEST_SHA1_LICENSE = Artistic or GPLv1+
+PERL_DIGEST_SHA1_LICENSE = Artistic or GPL-1.0+
 PERL_DIGEST_SHA1_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-encode-locale/perl-encode-locale.mk b/bsp/buildroot/package/perl-encode-locale/perl-encode-locale.mk
index 2544b16f..80d9c3b5 100644
--- a/bsp/buildroot/package/perl-encode-locale/perl-encode-locale.mk
+++ b/bsp/buildroot/package/perl-encode-locale/perl-encode-locale.mk
@@ -7,7 +7,7 @@
 PERL_ENCODE_LOCALE_VERSION = 1.05
 PERL_ENCODE_LOCALE_SOURCE = Encode-Locale-$(PERL_ENCODE_LOCALE_VERSION).tar.gz
 PERL_ENCODE_LOCALE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_ENCODE_LOCALE_LICENSE = Artistic or GPLv1+
+PERL_ENCODE_LOCALE_LICENSE = Artistic or GPL-1.0+
 PERL_ENCODE_LOCALE_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-file-listing/perl-file-listing.mk b/bsp/buildroot/package/perl-file-listing/perl-file-listing.mk
index a9d8cede..e150de77 100644
--- a/bsp/buildroot/package/perl-file-listing/perl-file-listing.mk
+++ b/bsp/buildroot/package/perl-file-listing/perl-file-listing.mk
@@ -8,7 +8,7 @@ PERL_FILE_LISTING_VERSION = 6.04
 PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz
 PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
 PERL_FILE_LISTING_DEPENDENCIES = perl-http-date
-PERL_FILE_LISTING_LICENSE = Artistic or GPLv1+
+PERL_FILE_LISTING_LICENSE = Artistic or GPL-1.0+
 PERL_FILE_LISTING_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-file-util/perl-file-util.hash b/bsp/buildroot/package/perl-file-util/perl-file-util.hash
index 1e613dc0..dc3e59e3 100644
--- a/bsp/buildroot/package/perl-file-util/perl-file-util.hash
+++ b/bsp/buildroot/package/perl-file-util/perl-file-util.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    93c572b4c54743a7ef383486dd2c4014 File-Util-4.132140.tar.gz
-sha256 4233c493468da8b34f2df19b191aaa400f328d877c8c023605e43385976a99d1 File-Util-4.132140.tar.gz
+md5    5706487ecf0daae885f709914915e832 File-Util-4.161950.tar.gz
+sha256 88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee File-Util-4.161950.tar.gz
diff --git a/bsp/buildroot/package/perl-file-util/perl-file-util.mk b/bsp/buildroot/package/perl-file-util/perl-file-util.mk
index 7026515e..f8f27121 100644
--- a/bsp/buildroot/package/perl-file-util/perl-file-util.mk
+++ b/bsp/buildroot/package/perl-file-util/perl-file-util.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_FILE_UTIL_VERSION = 4.132140
+PERL_FILE_UTIL_VERSION = 4.161950
 PERL_FILE_UTIL_SOURCE = File-Util-$(PERL_FILE_UTIL_VERSION).tar.gz
 PERL_FILE_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOMMY
 PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build
-PERL_FILE_UTIL_LICENSE = Artistic or GPLv1+
+PERL_FILE_UTIL_LICENSE = Artistic or GPL-1.0+
 PERL_FILE_UTIL_LICENSE_FILES = COPYING LICENSE
 HOST_PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build
 
diff --git a/bsp/buildroot/package/perl-gd/0001-getoptions.patch b/bsp/buildroot/package/perl-gd/0001-getoptions.patch
deleted file mode 100644
index 74f055be..00000000
--- a/bsp/buildroot/package/perl-gd/0001-getoptions.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-fix option handling in Makefile.PL
-
-the call to GetOptions() must be unique.
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-see https://github.com/lstein/Perl-GD/pull/6
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -24,7 +24,15 @@
- my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
- 
- use Getopt::Long;
--GetOptions("ignore_missing_gd" => \$force);
-+my $result = GetOptions("options=s"         => \$options,
-+			"lib_gd_path=s"     => \$lib_gd_path,
-+			"lib_ft_path=s"     => \$lib_ft_path,
-+			"lib_png_path=s"    => \$lib_png_path,
-+			"lib_jpeg_path=s"   => \$lib_jpeg_path,
-+			"lib_xpm_path=s"    => \$lib_xpm_path,
-+			"lib_zlib_path=s"   => \$lib_zlib_path,
-+			"ignore_missing_gd" => \$force,
-+		       );
- 
- unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
-     die <<END;
-@@ -47,14 +55,6 @@
- #############################################################################################
- # Build options passed in to script to support reproducible builds via Makefiles
- #############################################################################################
--my $result = GetOptions("options=s"       => \$options,
--			"lib_gd_path=s"   => \$lib_gd_path,
--			"lib_ft_path=s"   => \$lib_ft_path,
--			"lib_png_path=s"  => \$lib_png_path,
--			"lib_jpeg_path=s" => \$lib_jpeg_path,
--			"lib_xpm_path=s"  => \$lib_xpm_path,
--			"lib_zlib_path=s" => \$lib_zlib_path,
--		       );
- unless ($result) {
-   print STDERR <<END;
- Usage: perl Makefile.PL [options]
diff --git a/bsp/buildroot/package/perl-gd/0002-lgd.patch b/bsp/buildroot/package/perl-gd/0002-lgd.patch
deleted file mode 100644
index 2827cd76..00000000
--- a/bsp/buildroot/package/perl-gd/0002-lgd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-refactor -lgd in @LIBS
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-see https://github.com/lstein/Perl-GD/pull/7
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -42,9 +42,9 @@
- END
- }
- 
-+push @LIBS, "-lgd";
- @INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
- @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
--@LIBS    = qw(-lgd) unless @LIBS;
- 
- # support for AMD64 libraries
- if (-d '/usr/lib64') {
-@@ -294,7 +294,6 @@
-   @$LIBPATH      = map {s/^-L// && "-L$_"} split /\s+/,$ldflags;
-   @$LIBS         = split /\s+/,$libs;
- 
--  push @$LIBS,"-lgd";
-   push @$LIBPATH,"-L$libdir";
-   ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!;
-   $$options      = $features;
diff --git a/bsp/buildroot/package/perl-gd/0003-force.patch b/bsp/buildroot/package/perl-gd/0003-force.patch
deleted file mode 100644
index 611066b9..00000000
--- a/bsp/buildroot/package/perl-gd/0003-force.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-let @INC and @LIBPATH empty when ignore_missing_gd
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-see https://github.com/lstein/Perl-GD/pull/7
-
-Index: b/Makefile.PL
-===================================================================
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -43,13 +43,15 @@
- }
- 
- push @LIBS, "-lgd";
--@INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
--@LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
--
--# support for AMD64 libraries
--if (-d '/usr/lib64') {
--  my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
--  @LIBPATH = (@LIBPATH,@libs64);
-+unless ($force) {
-+  @INC     = qw(-I/usr/include -I/usr/include/gd) unless @INC;
-+  @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH;
-+
-+  # support for AMD64 libraries
-+  if (-d '/usr/lib64') {
-+    my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH;
-+    @LIBPATH = (@LIBPATH,@libs64);
-+  }
- }
- 
- #############################################################################################
diff --git a/bsp/buildroot/package/perl-gd/0004-gdlib-config-is-now-configurable.patch b/bsp/buildroot/package/perl-gd/0004-gdlib-config-is-now-configurable.patch
deleted file mode 100644
index 58df2255..00000000
--- a/bsp/buildroot/package/perl-gd/0004-gdlib-config-is-now-configurable.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f417f38929fe558d388b9a9343da9b2c0e6984aa Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Sat, 20 Dec 2014 23:22:41 +0100
-Subject: [PATCH] Makefile.PL: gdlib-config is now configurable
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- Makefile.PL | 15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.PL b/Makefile.PL
-index dfe8ad7..0fa6ef3 100644
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -21,7 +21,7 @@ END
- my (@INC,@LIBPATH,@LIBS);
- my $AUTOCONFIG = 0;      # global set by try_to_autoconfigure() below
- 
--my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
-+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force,$gdlib_config_path);
- 
- use Getopt::Long;
- my $result = GetOptions("options=s"         => \$options,
-@@ -32,6 +32,7 @@ my $result = GetOptions("options=s"         => \$options,
- 			"lib_xpm_path=s"    => \$lib_xpm_path,
- 			"lib_zlib_path=s"   => \$lib_zlib_path,
- 			"ignore_missing_gd" => \$force,
-+			"gdlib_config_path=s" => \$gdlib_config_path,
- 		       );
- 
- unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
-@@ -72,6 +73,7 @@ Configure GD module.
-      -lib_xpm_path  path            path to libxpm
-      -lib_zlib_path path            path to libpng
-      -ignore_missing_gd             Ignore missing or old libgd installations and try to compile anyway
-+     -gdlib_config_path path        path to gdlib-config
- 
- If no options are passed on the command line.  The program will
- attempt to autoconfigure itself with the gdlib-config program (present
-@@ -118,6 +120,15 @@ if( defined($lib_zlib_path) )
-     @INC     = ("-I$lib_zlib_path/include", @INC);
-     @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); 
- }
-+if( defined($gdlib_config_path) )
-+{
-+    print "gdlib-config used:          $gdlib_config_path\n";
-+}
-+else
-+{
-+    $gdlib_config_path = "gdlib-config";
-+    print "$gdlib_config_path used from the PATH\n";
-+}
- #############################################################################################
- 
- if ($^O eq 'VMS'){
-@@ -278,7 +289,7 @@ exit 0;
- 
- sub try_to_autoconfigure {
-   my ($options,$lib_gd_path,$INC,$LIBPATH,$LIBS) = @_;
--  my $config = `gdlib-config --all`;
-+  my $config = `$gdlib_config_path --all`;
-   return unless $config;
-   $AUTOCONFIG++;
- 
--- 
-1.9.3
-
diff --git a/bsp/buildroot/package/perl-gd/perl-gd.hash b/bsp/buildroot/package/perl-gd/perl-gd.hash
index 0c16d3f5..ad30e0a1 100644
--- a/bsp/buildroot/package/perl-gd/perl-gd.hash
+++ b/bsp/buildroot/package/perl-gd/perl-gd.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    c4b3afd98b2c4ce3c2e1027d101a8f1e GD-2.56.tar.gz
-sha256 1f103d1c98de8621504642ed7fb79f1b40f5f6a63c2abe9390a8ab78617248f9 GD-2.56.tar.gz
+md5    b9cfc5a677b5e9fa607be1379f789855 GD-2.67.tar.gz
+sha256 93a47c2259979cf20c6a39c9e03e0da87a9a855d8b650fb68a08d16a96684246 GD-2.67.tar.gz
diff --git a/bsp/buildroot/package/perl-gd/perl-gd.mk b/bsp/buildroot/package/perl-gd/perl-gd.mk
index 2ad966c1..81070a93 100644
--- a/bsp/buildroot/package/perl-gd/perl-gd.mk
+++ b/bsp/buildroot/package/perl-gd/perl-gd.mk
@@ -4,26 +4,18 @@
 #
 ################################################################################
 
-PERL_GD_VERSION = 2.56
+PERL_GD_VERSION = 2.67
 PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz
-PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS
+PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN
 PERL_GD_DEPENDENCIES = zlib libpng freetype gd
-PERL_GD_LICENSE = Artistic or GPLv1+
+PERL_GD_LICENSE = Artistic or GPL-1.0+
 PERL_GD_LICENSE_FILES = LICENSE
-PERL_GD_PREFER_INSTALLER = EUMM
-
-define PERL_GD_MOVE_XS
-	mv $(@D)/lib/GD.xs $(@D)/GD.xs
-endef
-PERL_GD_POST_PATCH_HOOKS += PERL_GD_MOVE_XS
 
 PERL_GD_CONF_OPTS = \
-	-options=FT,PNG \
 	-lib_gd_path=$(STAGING_DIR)/usr \
 	-lib_ft_path=$(STAGING_DIR)/usr \
 	-lib_png_path=$(STAGING_DIR)/usr \
 	-lib_zlib_path=$(STAGING_DIR)/usr \
-	-ignore_missing_gd \
-	-gdlib=$(STAGING_DIR)/usr/bin/gdlib-config
+	-gdlib_config_path=$(STAGING_DIR)/usr/bin
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-gdgraph/perl-gdgraph.mk b/bsp/buildroot/package/perl-gdgraph/perl-gdgraph.mk
index dc7ffd9b..c4317075 100644
--- a/bsp/buildroot/package/perl-gdgraph/perl-gdgraph.mk
+++ b/bsp/buildroot/package/perl-gdgraph/perl-gdgraph.mk
@@ -8,7 +8,7 @@ PERL_GDGRAPH_VERSION = 1.54
 PERL_GDGRAPH_SOURCE = GDGraph-$(PERL_GDGRAPH_VERSION).tar.gz
 PERL_GDGRAPH_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RUZ
 PERL_GDGRAPH_DEPENDENCIES = perl-gd perl-gdtextutil
-PERL_GDGRAPH_LICENSE = Artistic or GPLv1+
+PERL_GDGRAPH_LICENSE = Artistic or GPL-1.0+
 PERL_GDGRAPH_LICENSE_FILES = Dustismo.LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-html-parser/perl-html-parser.mk b/bsp/buildroot/package/perl-html-parser/perl-html-parser.mk
index 14a28264..66016eb8 100644
--- a/bsp/buildroot/package/perl-html-parser/perl-html-parser.mk
+++ b/bsp/buildroot/package/perl-html-parser/perl-html-parser.mk
@@ -8,7 +8,7 @@ PERL_HTML_PARSER_VERSION = 3.72
 PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz
 PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
 PERL_HTML_PARSER_DEPENDENCIES = perl-html-tagset
-PERL_HTML_PARSER_LICENSE = Artistic or GPLv1+
+PERL_HTML_PARSER_LICENSE = Artistic or GPL-1.0+
 PERL_HTML_PARSER_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-html-tagset/perl-html-tagset.mk b/bsp/buildroot/package/perl-html-tagset/perl-html-tagset.mk
index d18d6a63..ff371fa2 100644
--- a/bsp/buildroot/package/perl-html-tagset/perl-html-tagset.mk
+++ b/bsp/buildroot/package/perl-html-tagset/perl-html-tagset.mk
@@ -7,7 +7,7 @@
 PERL_HTML_TAGSET_VERSION = 3.20
 PERL_HTML_TAGSET_SOURCE = HTML-Tagset-$(PERL_HTML_TAGSET_VERSION).tar.gz
 PERL_HTML_TAGSET_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PETDANCE
-PERL_HTML_TAGSET_LICENSE = Artistic or GPLv1+
+PERL_HTML_TAGSET_LICENSE = Artistic or GPL-1.0+
 PERL_HTML_TAGSET_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-http-cookies/Config.in b/bsp/buildroot/package/perl-http-cookies/Config.in
index cb5a3c1f..4095fee8 100644
--- a/bsp/buildroot/package/perl-http-cookies/Config.in
+++ b/bsp/buildroot/package/perl-http-cookies/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_PERL_HTTP_COOKIES
 	select BR2_PACKAGE_PERL_HTTP_DATE
 	select BR2_PACKAGE_PERL_HTTP_MESSAGE
 	help
-	  Objects that represent a "cookie jar"
+	  HTTP cookie jars
 
-	  http://github.com/gisle/http-cookies
+	  https://github.com/libwww-perl/http-cookies
diff --git a/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.hash b/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.hash
index 94e5f31c..361d4db9 100644
--- a/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.hash
+++ b/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    ecfd0eeb88512033352c2f13c9580f03 HTTP-Cookies-6.01.tar.gz
-sha256 f5d3ade383ce6389d80cb0d0356b643af80435bb036afd8edce335215ec5eb20 HTTP-Cookies-6.01.tar.gz
+md5    7bf1e277bd5c886bc18d21eb8423b65f HTTP-Cookies-6.04.tar.gz
+sha256 0cc7f079079dcad8293fea36875ef58dd1bfd75ce1a6c244cd73ed9523eb13d4 HTTP-Cookies-6.04.tar.gz
diff --git a/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.mk b/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.mk
index 52ee74a5..0777c084 100644
--- a/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.mk
+++ b/bsp/buildroot/package/perl-http-cookies/perl-http-cookies.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_HTTP_COOKIES_VERSION = 6.01
+PERL_HTTP_COOKIES_VERSION = 6.04
 PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz
-PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
+PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS
 PERL_HTTP_COOKIES_DEPENDENCIES = perl-http-date perl-http-message
-PERL_HTTP_COOKIES_LICENSE = Artistic or GPLv1+
-PERL_HTTP_COOKIES_LICENSE_FILES = README
+PERL_HTTP_COOKIES_LICENSE = Artistic or GPL-1.0+
+PERL_HTTP_COOKIES_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-http-daemon/Config.in b/bsp/buildroot/package/perl-http-daemon/Config.in
index e09328c9..7544ece1 100644
--- a/bsp/buildroot/package/perl-http-daemon/Config.in
+++ b/bsp/buildroot/package/perl-http-daemon/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON
 	select BR2_PACKAGE_PERL_HTTP_MESSAGE
 	select BR2_PACKAGE_PERL_LWP_MEDIATYPES
 	help
-	  Instances of the `HTTP::Daemon' class are HTTP/1.1 servers that listen
-	  on a socket for incoming requests.
+	  Instances of the `HTTP::Daemon' class are HTTP/1.1 servers
+	  that listen on a socket for incoming requests.
 
 	  http://github.com/gisle/http-daemon
diff --git a/bsp/buildroot/package/perl-http-daemon/perl-http-daemon.mk b/bsp/buildroot/package/perl-http-daemon/perl-http-daemon.mk
index 56dbd784..65cdaf8e 100644
--- a/bsp/buildroot/package/perl-http-daemon/perl-http-daemon.mk
+++ b/bsp/buildroot/package/perl-http-daemon/perl-http-daemon.mk
@@ -8,7 +8,7 @@ PERL_HTTP_DAEMON_VERSION = 6.01
 PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz
 PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
 PERL_HTTP_DAEMON_DEPENDENCIES = perl-http-date perl-http-message perl-lwp-mediatypes
-PERL_HTTP_DAEMON_LICENSE = Artistic or GPLv1+
+PERL_HTTP_DAEMON_LICENSE = Artistic or GPL-1.0+
 PERL_HTTP_DAEMON_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-http-date/Config.in b/bsp/buildroot/package/perl-http-date/Config.in
index c45335fb..5ce47813 100644
--- a/bsp/buildroot/package/perl-http-date/Config.in
+++ b/bsp/buildroot/package/perl-http-date/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PERL_HTTP_DATE
 	bool "perl-http-date"
 	help
-	  This module provides functions that deal the date formats used by the
-	  HTTP protocol (and then some more)
+	  This module provides functions that deal the date formats
+	  used by the HTTP protocol (and then some more)
 
 	  https://github.com/gisle/http-date
diff --git a/bsp/buildroot/package/perl-http-date/perl-http-date.mk b/bsp/buildroot/package/perl-http-date/perl-http-date.mk
index bb5f4dc2..feccf25d 100644
--- a/bsp/buildroot/package/perl-http-date/perl-http-date.mk
+++ b/bsp/buildroot/package/perl-http-date/perl-http-date.mk
@@ -7,7 +7,7 @@
 PERL_HTTP_DATE_VERSION = 6.02
 PERL_HTTP_DATE_SOURCE = HTTP-Date-$(PERL_HTTP_DATE_VERSION).tar.gz
 PERL_HTTP_DATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_HTTP_DATE_LICENSE = Artistic or GPLv1+
+PERL_HTTP_DATE_LICENSE = Artistic or GPL-1.0+
 PERL_HTTP_DATE_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-http-message/Config.in b/bsp/buildroot/package/perl-http-message/Config.in
index 9dda1ee3..682a4b01 100644
--- a/bsp/buildroot/package/perl-http-message/Config.in
+++ b/bsp/buildroot/package/perl-http-message/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE
 	select BR2_PACKAGE_PERL_LWP_MEDIATYPES
 	select BR2_PACKAGE_PERL_URI
 	help
-	  The HTTP-Message distribution contains classes useful for representing
-	  the messages passed in HTTP style communication.
+	  HTTP style message (base class)
 
-	  https://github.com/libwww-perl/http-message
+	  https://github.com/libwww-perl/HTTP-Message
diff --git a/bsp/buildroot/package/perl-http-message/perl-http-message.hash b/bsp/buildroot/package/perl-http-message/perl-http-message.hash
index f57fec27..a34d0456 100644
--- a/bsp/buildroot/package/perl-http-message/perl-http-message.hash
+++ b/bsp/buildroot/package/perl-http-message/perl-http-message.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    4ed7add10daea3ab30abfeab6d03872f HTTP-Message-6.11.tar.gz
-sha256 e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b HTTP-Message-6.11.tar.gz
+md5    e4c6e183860c42cbdff65dcd76c333b0 HTTP-Message-6.14.tar.gz
+sha256 71aab9f10eb4b8ec6e8e3a85fc5acb46ba04db1c93eb99613b184078c5cf2ac9 HTTP-Message-6.14.tar.gz
diff --git a/bsp/buildroot/package/perl-http-message/perl-http-message.mk b/bsp/buildroot/package/perl-http-message/perl-http-message.mk
index 77213fa1..722d6be6 100644
--- a/bsp/buildroot/package/perl-http-message/perl-http-message.mk
+++ b/bsp/buildroot/package/perl-http-message/perl-http-message.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_HTTP_MESSAGE_VERSION = 6.11
+PERL_HTTP_MESSAGE_VERSION = 6.14
 PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz
-PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
+PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS
 PERL_HTTP_MESSAGE_DEPENDENCIES = perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes perl-uri
-PERL_HTTP_MESSAGE_LICENSE = Artistic or GPLv1+
+PERL_HTTP_MESSAGE_LICENSE = Artistic or GPL-1.0+
 PERL_HTTP_MESSAGE_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-http-negotiate/Config.in b/bsp/buildroot/package/perl-http-negotiate/Config.in
index 2b7f7b9b..dcb1bbbf 100644
--- a/bsp/buildroot/package/perl-http-negotiate/Config.in
+++ b/bsp/buildroot/package/perl-http-negotiate/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_PERL_HTTP_NEGOTIATE
 	bool "perl-http-negotiate"
 	select BR2_PACKAGE_PERL_HTTP_MESSAGE
 	help
-	  This module provides a complete implementation of the HTTP content
-	  negotiation algorithm specified in draft-ietf-http-v11-spec-00.ps
-	  chapter 12.
+	  This module provides a complete implementation of the HTTP
+	  content negotiation algorithm specified in
+	  draft-ietf-http-v11-spec-00.ps chapter 12.
 
 	  http://github.com/gisle/http-negotiate
diff --git a/bsp/buildroot/package/perl-http-negotiate/perl-http-negotiate.mk b/bsp/buildroot/package/perl-http-negotiate/perl-http-negotiate.mk
index 569ed2b1..86ca554a 100644
--- a/bsp/buildroot/package/perl-http-negotiate/perl-http-negotiate.mk
+++ b/bsp/buildroot/package/perl-http-negotiate/perl-http-negotiate.mk
@@ -8,7 +8,7 @@ PERL_HTTP_NEGOTIATE_VERSION = 6.01
 PERL_HTTP_NEGOTIATE_SOURCE = HTTP-Negotiate-$(PERL_HTTP_NEGOTIATE_VERSION).tar.gz
 PERL_HTTP_NEGOTIATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
 PERL_HTTP_NEGOTIATE_DEPENDENCIES = perl-http-message
-PERL_HTTP_NEGOTIATE_LICENSE = Artistic or GPLv1+
+PERL_HTTP_NEGOTIATE_LICENSE = Artistic or GPL-1.0+
 PERL_HTTP_NEGOTIATE_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-io-html/Config.in b/bsp/buildroot/package/perl-io-html/Config.in
index 69770226..86038af0 100644
--- a/bsp/buildroot/package/perl-io-html/Config.in
+++ b/bsp/buildroot/package/perl-io-html/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PERL_IO_HTML
 	bool "perl-io-html"
 	help
-	  Perl module that opens a file and performs automatic charset detection
+	  Perl module that opens a file and performs automatic charset
+	  detection
 
 	  https://github.com/madsen/io-html
diff --git a/bsp/buildroot/package/perl-io-html/perl-io-html.mk b/bsp/buildroot/package/perl-io-html/perl-io-html.mk
index 4bdcc8dc..bb79f450 100644
--- a/bsp/buildroot/package/perl-io-html/perl-io-html.mk
+++ b/bsp/buildroot/package/perl-io-html/perl-io-html.mk
@@ -7,7 +7,7 @@
 PERL_IO_HTML_VERSION = 1.001
 PERL_IO_HTML_SOURCE = IO-HTML-$(PERL_IO_HTML_VERSION).tar.gz
 PERL_IO_HTML_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CJ/CJM
-PERL_IO_HTML_LICENSE = Artistic or GPLv1+
+PERL_IO_HTML_LICENSE = Artistic or GPL-1.0+
 PERL_IO_HTML_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash b/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash
index 852eb8d7..3bf0421e 100644
--- a/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash
+++ b/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    a5f284d543aec4a6fcd595eb5fc8898b IO-Socket-SSL-2.022.tar.gz
-sha256 651c4e5e2762ca780f2743986639b64557295bb326fddaff32f3adc0eac4f806 IO-Socket-SSL-2.022.tar.gz
+md5    26c9bcdfb4ba8763ef89264f21326a48 IO-Socket-SSL-2.052.tar.gz
+sha256 e4897a9b17cb18a3c44aa683980d52cef534cdfcb8063d6877c879bfa2f26673 IO-Socket-SSL-2.052.tar.gz
diff --git a/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk b/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
index 5bbd0c68..62fc2298 100644
--- a/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
+++ b/bsp/buildroot/package/perl-io-socket-ssl/perl-io-socket-ssl.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_IO_SOCKET_SSL_VERSION = 2.022
+PERL_IO_SOCKET_SSL_VERSION = 2.052
 PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz
 PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR
 PERL_IO_SOCKET_SSL_DEPENDENCIES = perl-net-ssleay
-PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPLv1+
+PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPL-1.0+
 PERL_IO_SOCKET_SSL_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.hash b/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.hash
index 4b6bb89c..86478da9 100644
--- a/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.hash
+++ b/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    52a57f8bd5b7727bc0ee8c4591431045 JSON-Tiny-0.56.tar.gz
-sha256 f5e3eecd278ddc0b15e3b3d8d108f89fa47cc039852bdb80b909b6bc1b538d04 JSON-Tiny-0.56.tar.gz
+md5    aa006882222e17a94295b3a655aab91b JSON-Tiny-0.58.tar.gz
+sha256 ad42e9137f5148df7fdb22aa52186b306032977bcd70d49f44a288070e4f0f23 JSON-Tiny-0.58.tar.gz
diff --git a/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.mk b/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.mk
index 3892da60..6b45613c 100644
--- a/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.mk
+++ b/bsp/buildroot/package/perl-json-tiny/perl-json-tiny.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_JSON_TINY_VERSION = 0.56
+PERL_JSON_TINY_VERSION = 0.58
 PERL_JSON_TINY_SOURCE = JSON-Tiny-$(PERL_JSON_TINY_VERSION).tar.gz
 PERL_JSON_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAVIDO
 PERL_JSON_TINY_LICENSE = Artistic-2.0
diff --git a/bsp/buildroot/package/perl-libwww-perl/Config.in b/bsp/buildroot/package/perl-libwww-perl/Config.in
index fc46bf1d..09fc0054 100644
--- a/bsp/buildroot/package/perl-libwww-perl/Config.in
+++ b/bsp/buildroot/package/perl-libwww-perl/Config.in
@@ -11,12 +11,13 @@ config BR2_PACKAGE_PERL_LIBWWW_PERL
 	select BR2_PACKAGE_PERL_HTTP_NEGOTIATE
 	select BR2_PACKAGE_PERL_LWP_MEDIATYPES
 	select BR2_PACKAGE_PERL_NET_HTTP
+	select BR2_PACKAGE_PERL_TRY_TINY
 	select BR2_PACKAGE_PERL_URI
 	select BR2_PACKAGE_PERL_WWW_ROBOTRULES
 	help
 	  The World-Wide Web library for Perl
 
-	  https://metacpan.org/release/libwww-perl
+	  https://github.com/libwww-perl/libwww-perl
 
 comment "perl-libwww-perl needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash b/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash
index d3b33286..7ce08530 100644
--- a/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash
+++ b/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    0880fade10edcf5f60087e42f1db4481 libwww-perl-6.16.tar.gz
-sha256 daffd268000f92d241f8ae5508ae5616dbd02f15a587b4fbcd14998ccc15ce22 libwww-perl-6.16.tar.gz
+md5    688284bc6282562948c6916f9e8563b0 libwww-perl-6.31.tar.gz
+sha256 525d5386d39d1c1d7da8a0e9dd0cbab95cba2a4bfcfd9b83b257f49be4eecae3 libwww-perl-6.31.tar.gz
diff --git a/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk b/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk
index 8d4d00e3..cdff6b41 100644
--- a/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk
+++ b/bsp/buildroot/package/perl-libwww-perl/perl-libwww-perl.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PERL_LIBWWW_PERL_VERSION = 6.16
+PERL_LIBWWW_PERL_VERSION = 6.31
 PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz
-PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS
+PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
 PERL_LIBWWW_PERL_DEPENDENCIES = \
 	perl-encode-locale \
 	perl-file-listing \
@@ -18,9 +18,10 @@ PERL_LIBWWW_PERL_DEPENDENCIES = \
 	perl-http-negotiate \
 	perl-lwp-mediatypes \
 	perl-net-http \
+	perl-try-tiny \
 	perl-uri \
 	perl-www-robotrules
-PERL_LIBWWW_PERL_LICENSE = Artistic or GPLv1+
+PERL_LIBWWW_PERL_LICENSE = Artistic or GPL-1.0+
 PERL_LIBWWW_PERL_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-lwp-mediatypes/Config.in b/bsp/buildroot/package/perl-lwp-mediatypes/Config.in
index b362e9c1..ae2056ad 100644
--- a/bsp/buildroot/package/perl-lwp-mediatypes/Config.in
+++ b/bsp/buildroot/package/perl-lwp-mediatypes/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PERL_LWP_MEDIATYPES
 	bool "perl-lwp-mediatypes"
 	help
-	  This module provides functions for handling media (also known as MIME)
-	  types and encodings.
+	  This module provides functions for handling media (also
+	  known as MIME) types and encodings.
 
 	  https://github.com/gisle/lwp-mediatypes
diff --git a/bsp/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk b/bsp/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
index cd7c75a4..bcf4e5f7 100644
--- a/bsp/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
+++ b/bsp/buildroot/package/perl-lwp-mediatypes/perl-lwp-mediatypes.mk
@@ -7,7 +7,7 @@
 PERL_LWP_MEDIATYPES_VERSION = 6.02
 PERL_LWP_MEDIATYPES_SOURCE = LWP-MediaTypes-$(PERL_LWP_MEDIATYPES_VERSION).tar.gz
 PERL_LWP_MEDIATYPES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_LWP_MEDIATYPES_LICENSE = Artistic or GPLv1+
+PERL_LWP_MEDIATYPES_LICENSE = Artistic or GPL-1.0+
 PERL_LWP_MEDIATYPES_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash b/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash
index b6bb545a..c40e66e9 100644
--- a/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash
+++ b/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    9ceb8a0397aff83928e7a9760b1b190f Mail-DKIM-0.40.tar.gz
-sha256 3c5ea0c3a2028a5a2c3b64bbcd6bd9de6a5fa5ee4e16046dd8875c4796aaa6f1 Mail-DKIM-0.40.tar.gz
+md5    60ebe54760f6633f07b25228272b9473 Mail-DKIM-0.42.tar.gz
+sha256 f4e3a6344517aeee9a7516c0f58197f41dce81461f74ce9ba8401a143aa2577c Mail-DKIM-0.42.tar.gz
diff --git a/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk b/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk
index 03a3b744..e088ecf1 100644
--- a/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk
+++ b/bsp/buildroot/package/perl-mail-dkim/perl-mail-dkim.mk
@@ -4,10 +4,9 @@
 #
 ################################################################################
 
-PERL_MAIL_DKIM_VERSION = 0.40
+PERL_MAIL_DKIM_VERSION = 0.42
 PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz
-PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JA/JASLONG
+PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MB/MBRADSHAW
 PERL_MAIL_DKIM_DEPENDENCIES = perl-crypt-openssl-rsa perl-mailtools perl-net-dns
-PERL_MAIL_DKIM_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-mailtools/Config.in b/bsp/buildroot/package/perl-mailtools/Config.in
index e02d3cba..2123c61e 100644
--- a/bsp/buildroot/package/perl-mailtools/Config.in
+++ b/bsp/buildroot/package/perl-mailtools/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_PERL_MAILTOOLS
 	bool "perl-mailtools"
 	select BR2_PACKAGE_PERL_TIMEDATE
 	help
-	  Various e-mail related modules
+	  Various ancient e-mail related modules
 
 	  https://metacpan.org/release/MailTools
diff --git a/bsp/buildroot/package/perl-mailtools/perl-mailtools.hash b/bsp/buildroot/package/perl-mailtools/perl-mailtools.hash
index 65a424b0..cb33453e 100644
--- a/bsp/buildroot/package/perl-mailtools/perl-mailtools.hash
+++ b/bsp/buildroot/package/perl-mailtools/perl-mailtools.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    972468ab5207b90398d77bed4ffc361d MailTools-2.18.tar.gz
-sha256 dfee9e770257371112f20d978e637759e81bc4f19e97b083585c71ecab37b527 MailTools-2.18.tar.gz
+md5    a00b9d3c3dec64bd15de8c50f1b73d05 MailTools-2.19.tar.gz
+sha256 c17ed702efea8eab56fe92961c07cd4980cee26ca6f13aff2688dc8af69c5e1a MailTools-2.19.tar.gz
diff --git a/bsp/buildroot/package/perl-mailtools/perl-mailtools.mk b/bsp/buildroot/package/perl-mailtools/perl-mailtools.mk
index 1c41831c..75079f9e 100644
--- a/bsp/buildroot/package/perl-mailtools/perl-mailtools.mk
+++ b/bsp/buildroot/package/perl-mailtools/perl-mailtools.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_MAILTOOLS_VERSION = 2.18
+PERL_MAILTOOLS_VERSION = 2.19
 PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz
 PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV
 PERL_MAILTOOLS_DEPENDENCIES = perl-timedate
-PERL_MAILTOOLS_LICENSE = Artistic or GPLv1+
+PERL_MAILTOOLS_LICENSE = Artistic or GPL-1.0+
 PERL_MAILTOOLS_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-mime-base64/Config.in b/bsp/buildroot/package/perl-mime-base64/Config.in
index 22563dd5..70225985 100644
--- a/bsp/buildroot/package/perl-mime-base64/Config.in
+++ b/bsp/buildroot/package/perl-mime-base64/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_PERL_MIME_BASE64
 	bool "perl-mime-base64"
 	depends on !BR2_STATIC_LIBS
 	help
-	  This package contains a base64 encoder/decoder and a quoted-printable
-	  encoder/decoder.
+	  This package contains a base64 encoder/decoder and a
+	  quoted-printable encoder/decoder.
 
 	  http://github.com/gisle/mime-base64
 
diff --git a/bsp/buildroot/package/perl-mime-base64/perl-mime-base64.mk b/bsp/buildroot/package/perl-mime-base64/perl-mime-base64.mk
index d0643377..e7febe19 100644
--- a/bsp/buildroot/package/perl-mime-base64/perl-mime-base64.mk
+++ b/bsp/buildroot/package/perl-mime-base64/perl-mime-base64.mk
@@ -7,7 +7,7 @@
 PERL_MIME_BASE64_VERSION = 3.15
 PERL_MIME_BASE64_SOURCE = MIME-Base64-$(PERL_MIME_BASE64_VERSION).tar.gz
 PERL_MIME_BASE64_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
-PERL_MIME_BASE64_LICENSE = Artistic or GPLv1+
+PERL_MIME_BASE64_LICENSE = Artistic or GPL-1.0+
 PERL_MIME_BASE64_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-module-build/perl-module-build.hash b/bsp/buildroot/package/perl-module-build/perl-module-build.hash
index 0363ac57..17e8b4e5 100644
--- a/bsp/buildroot/package/perl-module-build/perl-module-build.hash
+++ b/bsp/buildroot/package/perl-module-build/perl-module-build.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    9df204e188462a4410d496f316c2c531 Module-Build-0.4220.tar.gz
-sha256 fb1207c7e799366f7a8adda3f135bf8141c4d6068505650d4db2b2d3ce34b5a2 Module-Build-0.4220.tar.gz
+md5    b74c2f6e84b60aad3a3defd30b6f0f4d Module-Build-0.4224.tar.gz
+sha256 a6ca15d78244a7b50fdbf27f85c85f4035aa799ce7dd018a0d98b358ef7bc782 Module-Build-0.4224.tar.gz
diff --git a/bsp/buildroot/package/perl-module-build/perl-module-build.mk b/bsp/buildroot/package/perl-module-build/perl-module-build.mk
index 3c270029..42c9c111 100644
--- a/bsp/buildroot/package/perl-module-build/perl-module-build.mk
+++ b/bsp/buildroot/package/perl-module-build/perl-module-build.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PERL_MODULE_BUILD_VERSION = 0.4220
+PERL_MODULE_BUILD_VERSION = 0.4224
 PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz
 PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT
-PERL_MODULE_BUILD_LICENSE = Artistic or GPLv1+
+PERL_MODULE_BUILD_LICENSE = Artistic or GPL-1.0+
 PERL_MODULE_BUILD_LICENSE_FILES = LICENSE
 
 $(eval $(host-perl-package))
diff --git a/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.hash b/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.hash
index 21b2768b..0593a3cc 100644
--- a/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.hash
+++ b/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    97a935d64fc2aaf5538e6ab704bbc420 Mojolicious-7.20.tar.gz
-sha256 ddd034bdd2b99f64498f30b9859c2f2607318f43983dfe36e14bfdf1526fd693 Mojolicious-7.20.tar.gz
+md5    47d198ea987b4913818c24107cd9673d Mojolicious-7.61.tar.gz
+sha256 386ade41021bf0470879a0abceeccc305f773b41b76245cc3cdce92d7dc8897d Mojolicious-7.61.tar.gz
diff --git a/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.mk b/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.mk
index b3e6615f..4e94c47a 100644
--- a/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.mk
+++ b/bsp/buildroot/package/perl-mojolicious/perl-mojolicious.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_MOJOLICIOUS_VERSION = 7.20
+PERL_MOJOLICIOUS_VERSION = 7.61
 PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz
 PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI
 PERL_MOJOLICIOUS_LICENSE = Artistic-2.0
diff --git a/bsp/buildroot/package/perl-net-dns/Config.in b/bsp/buildroot/package/perl-net-dns/Config.in
index de720bf2..c156505c 100644
--- a/bsp/buildroot/package/perl-net-dns/Config.in
+++ b/bsp/buildroot/package/perl-net-dns/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_PERL_NET_DNS
 	help
 	  Perl Interface to the Domain Name System
 
-	  http://www.net-dns.org
+	  https://metacpan.org/release/Net-DNS
diff --git a/bsp/buildroot/package/perl-net-dns/perl-net-dns.hash b/bsp/buildroot/package/perl-net-dns/perl-net-dns.hash
index d2f07251..1572a9f3 100644
--- a/bsp/buildroot/package/perl-net-dns/perl-net-dns.hash
+++ b/bsp/buildroot/package/perl-net-dns/perl-net-dns.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    96c1a801cab92b81696a037c7c326e59 Net-DNS-1.07.tar.gz
-sha256 5f91497f1af9f690153fa05a27a7d73ddada08bed40536fe2d0ac759b7af8492 Net-DNS-1.07.tar.gz
+md5    0da1099c0a3548d36ea9e31d5bb9e122 Net-DNS-1.14.tar.gz
+sha256 83c38a594eeb2c85d66e60047a0f5b403f34bd92a5d13606f02e828d450299fc Net-DNS-1.14.tar.gz
diff --git a/bsp/buildroot/package/perl-net-dns/perl-net-dns.mk b/bsp/buildroot/package/perl-net-dns/perl-net-dns.mk
index f1a0b88d..0066a31b 100644
--- a/bsp/buildroot/package/perl-net-dns/perl-net-dns.mk
+++ b/bsp/buildroot/package/perl-net-dns/perl-net-dns.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_NET_DNS_VERSION = 1.07
+PERL_NET_DNS_VERSION = 1.14
 PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz
 PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS
 PERL_NET_DNS_DEPENDENCIES = perl-digest-hmac
diff --git a/bsp/buildroot/package/perl-net-http/perl-net-http.hash b/bsp/buildroot/package/perl-net-http/perl-net-http.hash
index 4dfad86e..ff59a0d9 100644
--- a/bsp/buildroot/package/perl-net-http/perl-net-http.hash
+++ b/bsp/buildroot/package/perl-net-http/perl-net-http.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    988c72ce2890df56e41df6695d108e5d Net-HTTP-6.12.tar.gz
-sha256 8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6 Net-HTTP-6.12.tar.gz
+md5    068fa02fd3c8a5b63316025b5a24844c Net-HTTP-6.17.tar.gz
+sha256 1e8624b1618dc6f7f605f5545643ebb9b833930f4d7485d4124aa2f2f26d1611 Net-HTTP-6.17.tar.gz
diff --git a/bsp/buildroot/package/perl-net-http/perl-net-http.mk b/bsp/buildroot/package/perl-net-http/perl-net-http.mk
index ec74a3f3..f13614e3 100644
--- a/bsp/buildroot/package/perl-net-http/perl-net-http.mk
+++ b/bsp/buildroot/package/perl-net-http/perl-net-http.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_NET_HTTP_VERSION = 6.12
+PERL_NET_HTTP_VERSION = 6.17
 PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz
 PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS
 PERL_NET_HTTP_DEPENDENCIES = perl-uri
-PERL_NET_HTTP_LICENSE = Artistic or GPLv1+
+PERL_NET_HTTP_LICENSE = Artistic or GPL-1.0+
 PERL_NET_HTTP_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.hash b/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.hash
index 556aea7d..daa2c186 100644
--- a/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.hash
+++ b/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    a740d7792dbac8ca8c4eb38d3b8fbd01 Net-SSLeay-1.72.tar.gz
-sha256 1baac39f0f12cee515d8bec633175bb5916ca542e5356e26420437bd6195d2f4 Net-SSLeay-1.72.tar.gz
+md5    cfbe968487149626978f427cc9fb8c77 Net-SSLeay-1.84.tar.gz
+sha256 823ec3cbb428309d6a9e56f362a9300693ce3215b7fede109adb7be361fff177 Net-SSLeay-1.84.tar.gz
diff --git a/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.mk b/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.mk
index 03a039e0..3814038c 100644
--- a/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.mk
+++ b/bsp/buildroot/package/perl-net-ssleay/perl-net-ssleay.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_NET_SSLEAY_VERSION = 1.72
+PERL_NET_SSLEAY_VERSION = 1.84
 PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz
 PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM
 PERL_NET_SSLEAY_DEPENDENCIES = openssl
diff --git a/bsp/buildroot/package/perl-netaddr-ip/Config.in b/bsp/buildroot/package/perl-netaddr-ip/Config.in
index 15258300..d4061e1d 100644
--- a/bsp/buildroot/package/perl-netaddr-ip/Config.in
+++ b/bsp/buildroot/package/perl-netaddr-ip/Config.in
@@ -4,4 +4,3 @@ config BR2_PACKAGE_PERL_NETADDR_IP
 	  Manages IPv4 and IPv6 addresses and subnets
 
 	  https://metacpan.org/release/NetAddr-IP
-
diff --git a/bsp/buildroot/package/perl-netaddr-ip/perl-netaddr-ip.mk b/bsp/buildroot/package/perl-netaddr-ip/perl-netaddr-ip.mk
index b5ee9a1c..a1f02c69 100644
--- a/bsp/buildroot/package/perl-netaddr-ip/perl-netaddr-ip.mk
+++ b/bsp/buildroot/package/perl-netaddr-ip/perl-netaddr-ip.mk
@@ -7,7 +7,7 @@
 PERL_NETADDR_IP_VERSION = 4.079
 PERL_NETADDR_IP_SOURCE = NetAddr-IP-$(PERL_NETADDR_IP_VERSION).tar.gz
 PERL_NETADDR_IP_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKER
-PERL_NETADDR_IP_LICENSE = Artistic or GPLv1+
+PERL_NETADDR_IP_LICENSE = Artistic or GPL-1.0+
 PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying
 
 # we always build the Pure Perl version.
diff --git a/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.hash b/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.hash
index 259469cc..49b6661e 100644
--- a/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.hash
+++ b/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    92ece7b2aa09f18035b0550b0118bdee Path-Tiny-0.100.tar.gz
-sha256 8b8c4c9db710470a26b356e7187eba47217fbba1fe8bd0ad72c5b2cc8f6ba10c Path-Tiny-0.100.tar.gz
+md5    17354181d9794df01be555b25114dd24 Path-Tiny-0.104.tar.gz
+sha256 c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef Path-Tiny-0.104.tar.gz
diff --git a/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.mk b/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.mk
index ed1304d4..53e787dc 100644
--- a/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.mk
+++ b/bsp/buildroot/package/perl-path-tiny/perl-path-tiny.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_PATH_TINY_VERSION = 0.100
+PERL_PATH_TINY_VERSION = 0.104
 PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz
 PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN
 PERL_PATH_TINY_LICENSE = Apache-2.0
diff --git a/bsp/buildroot/package/perl-time-hires/Config.in b/bsp/buildroot/package/perl-time-hires/Config.in
index 37bad71d..fe933a4d 100644
--- a/bsp/buildroot/package/perl-time-hires/Config.in
+++ b/bsp/buildroot/package/perl-time-hires/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_PERL_TIME_HIRES
 	help
 	  High resolution alarm, sleep, gettimeofday, interval timers
 
-	  http://search.cpan.org/dist/Time-HiRes/HiRes.pm
+	  https://metacpan.org/release/Time-HiRes
 
 comment "perl-time-hires needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/perl-time-hires/perl-time-hires.hash b/bsp/buildroot/package/perl-time-hires/perl-time-hires.hash
index 18523404..f3ab700e 100644
--- a/bsp/buildroot/package/perl-time-hires/perl-time-hires.hash
+++ b/bsp/buildroot/package/perl-time-hires/perl-time-hires.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    077e5d7eda1349f98c564026603f8a0a Time-HiRes-1.9726.tar.gz
-sha256 ff662ad9b1f6c75a149db7fa1bfc7a161ac8b271e5f3980345e08b734769109e Time-HiRes-1.9726.tar.gz
+md5    b98099e0cb7702210606776e9746e103 Time-HiRes-1.9753.tar.gz
+sha256 0fbfd5f99cdd26011d5c0bc3a8e369dacc4a9e1d1658f4663ac6018f2cec4915 Time-HiRes-1.9753.tar.gz
diff --git a/bsp/buildroot/package/perl-time-hires/perl-time-hires.mk b/bsp/buildroot/package/perl-time-hires/perl-time-hires.mk
index 7436d96d..c8dde49f 100644
--- a/bsp/buildroot/package/perl-time-hires/perl-time-hires.mk
+++ b/bsp/buildroot/package/perl-time-hires/perl-time-hires.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PERL_TIME_HIRES_VERSION = 1.9726
+PERL_TIME_HIRES_VERSION = 1.9753
 PERL_TIME_HIRES_SOURCE = Time-HiRes-$(PERL_TIME_HIRES_VERSION).tar.gz
-PERL_TIME_HIRES_SITE = $(BR2_CPAN_MIRROR)/authors/id/Z/ZE/ZEFRAM
-PERL_TIME_HIRES_LICENSE = Artistic or GPLv1+
+PERL_TIME_HIRES_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JH/JHI
+PERL_TIME_HIRES_LICENSE = Artistic or GPL-1.0+
 PERL_TIME_HIRES_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-timedate/perl-timedate.mk b/bsp/buildroot/package/perl-timedate/perl-timedate.mk
index 4c594fb7..cdc2c07f 100644
--- a/bsp/buildroot/package/perl-timedate/perl-timedate.mk
+++ b/bsp/buildroot/package/perl-timedate/perl-timedate.mk
@@ -7,7 +7,7 @@
 PERL_TIMEDATE_VERSION = 2.30
 PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz
 PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR
-PERL_TIMEDATE_LICENSE = Artistic or GPLv1+
+PERL_TIMEDATE_LICENSE = Artistic or GPL-1.0+
 PERL_TIMEDATE_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.hash b/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.hash
index c6dbd44f..85f60401 100644
--- a/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.hash
+++ b/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    e2f8af601a62981aab30df15a6f47475 Try-Tiny-0.28.tar.gz
-sha256 f1d166be8aa19942c4504c9111dade7aacb981bc5b3a2a5c5f6019646db8c146 Try-Tiny-0.28.tar.gz
+md5    eb362c3cb32c42f9f28de9ddb7f2ead6 Try-Tiny-0.30.tar.gz
+sha256 da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b Try-Tiny-0.30.tar.gz
diff --git a/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.mk b/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.mk
index b4d35ab1..f9113e70 100644
--- a/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.mk
+++ b/bsp/buildroot/package/perl-try-tiny/perl-try-tiny.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PERL_TRY_TINY_VERSION = 0.28
+PERL_TRY_TINY_VERSION = 0.30
 PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz
 PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
 PERL_TRY_TINY_LICENSE = MIT
diff --git a/bsp/buildroot/package/perl-uri/Config.in b/bsp/buildroot/package/perl-uri/Config.in
index 62a53f24..23e5c50e 100644
--- a/bsp/buildroot/package/perl-uri/Config.in
+++ b/bsp/buildroot/package/perl-uri/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_PERL_URI
 	bool "perl-uri"
 	help
-	  The module implements the URI class. Objects of this class represent
-	  Uniform Resource Identifier references as specified in RFC 2396 and
-	  updated by RFC 2732.
+	  Uniform Resource Identifiers (absolute and relative)
 
-	  https://github.com/libwww-perl/uri
+	  https://github.com/libwww-perl/URI
diff --git a/bsp/buildroot/package/perl-uri/perl-uri.hash b/bsp/buildroot/package/perl-uri/perl-uri.hash
index 8a265bfc..5f27230e 100644
--- a/bsp/buildroot/package/perl-uri/perl-uri.hash
+++ b/bsp/buildroot/package/perl-uri/perl-uri.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    247c3da29a794f72730e01aa5a715daf URI-1.71.tar.gz
-sha256 9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115 URI-1.71.tar.gz
+md5    37d44a08e599aa945b32a9434ffe00a5 URI-1.73.tar.gz
+sha256 cca7ab4a6f63f3ccaacae0f2e1337e8edf84137e73f18548ec7d659f23efe413 URI-1.73.tar.gz
diff --git a/bsp/buildroot/package/perl-uri/perl-uri.mk b/bsp/buildroot/package/perl-uri/perl-uri.mk
index e7118fce..690a0eb8 100644
--- a/bsp/buildroot/package/perl-uri/perl-uri.mk
+++ b/bsp/buildroot/package/perl-uri/perl-uri.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PERL_URI_VERSION = 1.71
+PERL_URI_VERSION = 1.73
 PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz
 PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER
-PERL_URI_LICENSE = Artistic or GPLv1+
+PERL_URI_LICENSE = Artistic or GPL-1.0+
 PERL_URI_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-www-robotrules/Config.in b/bsp/buildroot/package/perl-www-robotrules/Config.in
index e80f5a0d..3e7175e3 100644
--- a/bsp/buildroot/package/perl-www-robotrules/Config.in
+++ b/bsp/buildroot/package/perl-www-robotrules/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_PERL_WWW_ROBOTRULES
 	bool "perl-www-robotrules"
 	select BR2_PACKAGE_PERL_URI
 	help
-	  This module provides functions that deal the date formats used by the
-	  HTTP protocol (and then some more)
+	  This module provides functions that deal the date formats
+	  used by the HTTP protocol (and then some more)
 
 	  http://github.com/gisle/www-robotrules
diff --git a/bsp/buildroot/package/perl-www-robotrules/perl-www-robotrules.mk b/bsp/buildroot/package/perl-www-robotrules/perl-www-robotrules.mk
index 0c68b98a..5e8bab9d 100644
--- a/bsp/buildroot/package/perl-www-robotrules/perl-www-robotrules.mk
+++ b/bsp/buildroot/package/perl-www-robotrules/perl-www-robotrules.mk
@@ -8,7 +8,7 @@ PERL_WWW_ROBOTRULES_VERSION = 6.02
 PERL_WWW_ROBOTRULES_SOURCE = WWW-RobotRules-$(PERL_WWW_ROBOTRULES_VERSION).tar.gz
 PERL_WWW_ROBOTRULES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS
 PERL_WWW_ROBOTRULES_DEPENDENCIES = perl-uri
-PERL_WWW_ROBOTRULES_LICENSE = Artistic or GPLv1+
+PERL_WWW_ROBOTRULES_LICENSE = Artistic or GPL-1.0+
 PERL_WWW_ROBOTRULES_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash b/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash
index b6195c3b..bbe841a6 100644
--- a/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash
+++ b/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    9904690371679e082ff2c23677b6c90e XML-LibXML-2.0128.tar.gz
-sha256 26e7ba451f3bade4d29ff00653a2ee01d13fe38b9a2ebcd0b0f3f82f9f688f2b XML-LibXML-2.0128.tar.gz
+md5    43546fd9a3974f19323f9fb04861ece9 XML-LibXML-2.0132.tar.gz
+sha256 721452e3103ca188f5968ab06d5ba29fe8e00e49f4767790882095050312d476 XML-LibXML-2.0132.tar.gz
diff --git a/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk b/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk
index 8d8f5905..ff831bb0 100644
--- a/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk
+++ b/bsp/buildroot/package/perl-xml-libxml/perl-xml-libxml.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PERL_XML_LIBXML_VERSION = 2.0128
+PERL_XML_LIBXML_VERSION = 2.0132
 PERL_XML_LIBXML_SOURCE = XML-LibXML-$(PERL_XML_LIBXML_VERSION).tar.gz
 PERL_XML_LIBXML_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHLOMIF
 PERL_XML_LIBXML_DEPENDENCIES = zlib libxml2 perl-xml-namespacesupport perl-xml-sax perl-xml-sax-base
-PERL_XML_LIBXML_LICENSE = Artistic or GPLv1+
+PERL_XML_LIBXML_LICENSE = Artistic or GPL-1.0+
 PERL_XML_LIBXML_LICENSE_FILES = LICENSE
 
 PERL_XML_LIBXML_CONF_OPTS = \
diff --git a/bsp/buildroot/package/perl-xml-namespacesupport/Config.in b/bsp/buildroot/package/perl-xml-namespacesupport/Config.in
index bc67d479..93a697c6 100644
--- a/bsp/buildroot/package/perl-xml-namespacesupport/Config.in
+++ b/bsp/buildroot/package/perl-xml-namespacesupport/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT
 	bool "perl-xml-namespacesupport"
 	help
-	  a simple generic namespace support class
+	  A simple generic namespace processor
 
-	  https://metacpan.org/release/XML-NamespaceSupport
+	  https://github.com/perigrin/xml-namespacesupport
diff --git a/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash b/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash
index 9389601d..d55551c1 100644
--- a/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash
+++ b/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    222cca76161cd956d724286d36b607da XML-NamespaceSupport-1.11.tar.gz
-sha256 6d8151f0a3f102313d76b64bfd1c2d9ed46bfe63a16f038e7d860fda287b74ea XML-NamespaceSupport-1.11.tar.gz
+md5    a8916c6d095bcf073e1108af02e78c97 XML-NamespaceSupport-1.12.tar.gz
+sha256 47e995859f8dd0413aa3f22d350c4a62da652e854267aa0586ae544ae2bae5ef XML-NamespaceSupport-1.12.tar.gz
diff --git a/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk b/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
index 31b71c13..325440b3 100644
--- a/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
+++ b/bsp/buildroot/package/perl-xml-namespacesupport/perl-xml-namespacesupport.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PERL_XML_NAMESPACESUPPORT_VERSION = 1.11
+PERL_XML_NAMESPACESUPPORT_VERSION = 1.12
 PERL_XML_NAMESPACESUPPORT_SOURCE = XML-NamespaceSupport-$(PERL_XML_NAMESPACESUPPORT_VERSION).tar.gz
 PERL_XML_NAMESPACESUPPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERIGRIN
-PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPLv1+
-PERL_XML_NAMESPACESUPPORT_LICENSE_FILES = README
+PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPL-1.0+
+PERL_XML_NAMESPACESUPPORT_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.hash b/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.hash
index 6822e184..a51e1d1b 100644
--- a/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.hash
+++ b/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.hash
@@ -1,3 +1,3 @@
 # retrieved by scancpan from http://cpan.metacpan.org/
-md5    38c8c3247dfd080712596118d70dbe32 XML-SAX-Base-1.08.tar.gz
-sha256 666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e XML-SAX-Base-1.08.tar.gz
+md5    ec347a14065dd7aec7d9fb181b2d7946 XML-SAX-Base-1.09.tar.gz
+sha256 66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0 XML-SAX-Base-1.09.tar.gz
diff --git a/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.mk b/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.mk
index 60dec316..ec6e052b 100644
--- a/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.mk
+++ b/bsp/buildroot/package/perl-xml-sax-base/perl-xml-sax-base.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PERL_XML_SAX_BASE_VERSION = 1.08
+PERL_XML_SAX_BASE_VERSION = 1.09
 PERL_XML_SAX_BASE_SOURCE = XML-SAX-Base-$(PERL_XML_SAX_BASE_VERSION).tar.gz
 PERL_XML_SAX_BASE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM
-PERL_XML_SAX_BASE_LICENSE = Artistic or GPLv1+
+PERL_XML_SAX_BASE_LICENSE = Artistic or GPL-1.0+
 PERL_XML_SAX_BASE_LICENSE_FILES = README
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl-xml-sax/perl-xml-sax.mk b/bsp/buildroot/package/perl-xml-sax/perl-xml-sax.mk
index f6d03729..90b2cd69 100644
--- a/bsp/buildroot/package/perl-xml-sax/perl-xml-sax.mk
+++ b/bsp/buildroot/package/perl-xml-sax/perl-xml-sax.mk
@@ -8,7 +8,7 @@ PERL_XML_SAX_VERSION = 0.99
 PERL_XML_SAX_SOURCE = XML-SAX-$(PERL_XML_SAX_VERSION).tar.gz
 PERL_XML_SAX_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM
 PERL_XML_SAX_DEPENDENCIES = perl-xml-namespacesupport perl-xml-sax-base
-PERL_XML_SAX_LICENSE = Artistic or GPLv1+
+PERL_XML_SAX_LICENSE = Artistic or GPL-1.0+
 PERL_XML_SAX_LICENSE_FILES = LICENSE
 
 $(eval $(perl-package))
diff --git a/bsp/buildroot/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch b/bsp/buildroot/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch
new file mode 100644
index 00000000..5223b78c
--- /dev/null
+++ b/bsp/buildroot/package/perl/0001-PATCH-Remove-existing-files-before-overwriting-them.patch
@@ -0,0 +1,46 @@
+From ae65651eab053fc6dc4590dbb863a268215c1fc5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Fri, 8 Jun 2018 11:45:40 +0100
+Subject: [PATCH] [PATCH] Remove existing files before overwriting them
+
+Archive should extract only the latest same-named entry.
+Extracted regular file should not be writtent into existing block
+device (or any other one).
+
+https://rt.cpan.org/Ticket/Display.html?id=125523
+
+[Peter: rewrite path to match perl tarball with sed 's|\(lib/Archive\)|cpan/Archive-Tar/\1|g']
+Signed-off-by: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ cpan/Archive-Tar/lib/Archive/Tar.pm | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/cpan/Archive-Tar/lib/Archive/Tar.pm b/cpan/Archive-Tar/lib/Archive/Tar.pm
+index 6244369..a83975f 100644
+--- a/cpan/Archive-Tar/lib/Archive/Tar.pm
++++ b/cpan/Archive-Tar/lib/Archive/Tar.pm
+@@ -845,6 +845,20 @@ sub _extract_file {
+         return;
+     }
+ 
++    ### If a file system already contains a block device with the same name as
++    ### the being extracted regular file, we would write the file's content
++    ### to the block device. So remove the existing file (block device) now.
++    ### If an archive contains multiple same-named entries, the last one
++    ### should replace the previous ones. So remove the old file now.
++    ### If the old entry is a symlink to a file outside of the CWD, the new
++    ### entry would create a file there. This is CVE-2018-12015
++    ### <https://rt.cpan.org/Ticket/Display.html?id=125523>.
++    if (-l $full || -e _) {
++	if (!unlink $full) {
++	    $self->_error( qq[Could not remove old file '$full': $!] );
++	    return;
++	}
++    }
+     if( length $entry->type && $entry->is_file ) {
+         my $fh = IO::File->new;
+         $fh->open( $full, '>' ) or (
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/perl/0001-fix-static-build-with-gdbm-gettext.patch b/bsp/buildroot/package/perl/0001-fix-static-build-with-gdbm-gettext.patch
deleted file mode 100644
index ca6bf011..00000000
--- a/bsp/buildroot/package/perl/0001-fix-static-build-with-gdbm-gettext.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-fix static build with gdbm + gettext
-
-see doc http://perldoc.perl.org/ExtUtils/MakeMaker.html#LIBS
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-index: b/ext/GDBM_File/Makefile.PL
-===================================================================
---- a/ext/GDBM_File/Makefile.PL
-+++ b/ext/GDBM_File/Makefile.PL
-@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
- use ExtUtils::Constant 0.11 'WriteConstants';
- WriteMakefile(
-     NAME => 'GDBM_File',
--    LIBS => ["-lgdbm", "-ldbm"],
-+    LIBS => ["-lgdbm -lintl", "-lgdbm", "-ldbm"],
-     XSPROTOARG => '-noprototypes', 		# XXX remove later?
-     VERSION_FROM => 'GDBM_File.pm',
-     realclean => {FILES=> 'const-c.inc const-xs.inc'},
-
diff --git a/bsp/buildroot/package/perl/Config.in b/bsp/buildroot/package/perl/Config.in
index cdd5aaba..32a3fd2e 100644
--- a/bsp/buildroot/package/perl/Config.in
+++ b/bsp/buildroot/package/perl/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_PERL
 	depends on BR2_USE_MMU # fork()
 	help
 	  Larry Wall's Practical Extraction and Report Language
-	  An interpreted scripting language, known among some as "Unix's Swiss
-	  Army Chainsaw".
+	  An interpreted scripting language, known among some as
+	  "Unix's Swiss Army Chainsaw".
 
 	  http://www.perl.org/
 
@@ -13,8 +13,8 @@ if BR2_PACKAGE_PERL
 config BR2_PACKAGE_PERL_MODULES
 	string "custom module selection"
 	help
-	  List of space-separated perl modules (without .pm) to copy to the
-	  rootfs.
+	  List of space-separated perl modules (without .pm) to copy
+	  to the rootfs.
 
 	  Examples: constant Getopt/Std Time/Local
 
diff --git a/bsp/buildroot/package/perl/perl.hash b/bsp/buildroot/package/perl/perl.hash
index 41c1ce8a..210f6d58 100644
--- a/bsp/buildroot/package/perl/perl.hash
+++ b/bsp/buildroot/package/perl/perl.hash
@@ -1,7 +1,7 @@
-# Hashes from: http://www.cpan.org/src/5.0/perl-5.24.1.tar.xz.{md5,sha1,sha256}.txt
-md5    af6a84c7c3e2b8b269c105a5db2f6d53                                 perl-5.24.1.tar.xz
-sha1   5bec25d8821b81a5939ee220997f4c8ab1c13e31                         perl-5.24.1.tar.xz
-sha256 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f perl-5.24.1.tar.xz
+# Hashes from: http://www.cpan.org/src/5.0/perl-5.26.2.tar.xz.{md5,sha1,sha256}.txt
+md5    1fa1b53eeff76aa37b17bfc9b2771671                                 perl-5.26.2.tar.xz
+sha1   bfa5c7921ed7bf5e035dbf2f7ff81367b81e372c                         perl-5.26.2.tar.xz
+sha256 0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c perl-5.26.2.tar.xz
 
-# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.hash
-sha256 181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d perl-cross-1.1.3.tar.gz
+# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.9/perl-cross-1.1.9.hash
+sha256	0bbb450e48d07e7fdf867d578b1780ac8f0e8dc284d52301dac4d763b42f6041  perl-cross-1.1.9.tar.gz
diff --git a/bsp/buildroot/package/perl/perl.mk b/bsp/buildroot/package/perl/perl.mk
index 224b4cba..7b4a2710 100644
--- a/bsp/buildroot/package/perl/perl.mk
+++ b/bsp/buildroot/package/perl/perl.mk
@@ -4,16 +4,16 @@
 #
 ################################################################################
 
-# When updating the version here, also update support/scripts/scancpan
-PERL_VERSION_MAJOR = 24
-PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1
+# When updating the version here, also update utils/scancpan
+PERL_VERSION_MAJOR = 26
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
 PERL_SITE = http://www.cpan.org/src/5.0
 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz
-PERL_LICENSE = Artistic or GPLv1+
+PERL_LICENSE = Artistic or GPL-1.0+
 PERL_LICENSE_FILES = Artistic Copying README
 PERL_INSTALL_STAGING = YES
 
-PERL_CROSS_VERSION = 1.1.3
+PERL_CROSS_VERSION = 1.1.9
 # DO NOT refactor with the github helper (the result is not the same)
 PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION)
 PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz
@@ -91,7 +91,7 @@ endef
 
 HOST_PERL_CONF_OPTS = \
 	-des \
-	-Dprefix="$(HOST_DIR)/usr" \
+	-Dprefix="$(HOST_DIR)" \
 	-Dcc="$(HOSTCC)"
 
 define HOST_PERL_CONFIGURE_CMDS
diff --git a/bsp/buildroot/package/phidgetwebservice/Config.in b/bsp/buildroot/package/phidgetwebservice/Config.in
index db7577d7..50018e0a 100644
--- a/bsp/buildroot/package/phidgetwebservice/Config.in
+++ b/bsp/buildroot/package/phidgetwebservice/Config.in
@@ -5,14 +5,15 @@ config BR2_PACKAGE_PHIDGETWEBSERVICE
 	select BR2_PACKAGE_LIBPHIDGET
 	help
 	  phidgetwebservice (the Phidget WebService) provides an HTTP
-	  front-end to the libphidget device control API. This provides
-	  an alternative to the libphidget C linkage interface for
-	  controlling locally attached Phidgets USB devices and it also
-	  allows you to control Phidget USB devices remotely when the host
-	  running the phidgetwebservice has an exposed network interface.
+	  front-end to the libphidget device control API. This
+	  provides an alternative to the libphidget C linkage
+	  interface for controlling locally attached Phidgets USB
+	  devices and it also allows you to control Phidget USB
+	  devices remotely when the host running the phidgetwebservice
+	  has an exposed network interface.
 
-	  The phidgetwebservice client program uses the libphidget HTTP
-	  functions to send commands to the phidgetwebservice.
+	  The phidgetwebservice client program uses the libphidget
+	  HTTP functions to send commands to the phidgetwebservice.
 
 	  http://phidgets.com/
 
diff --git a/bsp/buildroot/package/phidgetwebservice/phidgetwebservice.mk b/bsp/buildroot/package/phidgetwebservice/phidgetwebservice.mk
index f7d1b484..36c0185e 100644
--- a/bsp/buildroot/package/phidgetwebservice/phidgetwebservice.mk
+++ b/bsp/buildroot/package/phidgetwebservice/phidgetwebservice.mk
@@ -8,7 +8,7 @@ PHIDGETWEBSERVICE_VERSION = 2.1.8.20140319
 PHIDGETWEBSERVICE_SOURCE = phidgetwebservice_$(PHIDGETWEBSERVICE_VERSION).tar.gz
 PHIDGETWEBSERVICE_SITE = http://www.phidgets.com/downloads/libraries
 PHIDGETWEBSERVICE_DEPENDENCIES = libphidget
-PHIDGETWEBSERVICE_LICENSE = LGPLv3
+PHIDGETWEBSERVICE_LICENSE = LGPL-3.0
 PHIDGETWEBSERVICE_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/php-amqp/Config.in b/bsp/buildroot/package/php-amqp/Config.in
index 0aa2021f..dc779f0e 100644
--- a/bsp/buildroot/package/php-amqp/Config.in
+++ b/bsp/buildroot/package/php-amqp/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PHP_AMQP
 	bool "php-amqp"
 	depends on BR2_PACKAGE_PHP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # rabbitmq-c
+	select BR2_PACKAGE_OPENSSL # rabbitmq-c: amqp_ssl_socket.h
 	select BR2_PACKAGE_RABBITMQ_C
 	help
 	  Communicate with any AMQP compliant server.
diff --git a/bsp/buildroot/package/php-amqp/php-amqp.hash b/bsp/buildroot/package/php-amqp/php-amqp.hash
index 73c69d92..4b3b1972 100644
--- a/bsp/buildroot/package/php-amqp/php-amqp.hash
+++ b/bsp/buildroot/package/php-amqp/php-amqp.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 38a92eaef1aa863404170bcd15605f7f78140eeec1ff5be6af65c5b8081e2599  amqp-1.7.1.tgz
+sha256 f45831d498b8fa47a151c31f6abdc0530aa6eabda6e2e10514aca3bdc76a5098  amqp-1.9.0.tgz
diff --git a/bsp/buildroot/package/php-amqp/php-amqp.mk b/bsp/buildroot/package/php-amqp/php-amqp.mk
index d3ffe160..6a8c52c4 100644
--- a/bsp/buildroot/package/php-amqp/php-amqp.mk
+++ b/bsp/buildroot/package/php-amqp/php-amqp.mk
@@ -4,20 +4,20 @@
 #
 ################################################################################
 
-PHP_AMQP_VERSION = 1.7.1
+PHP_AMQP_VERSION = 1.9.0
 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
 PHP_AMQP_SITE = https://pecl.php.net/get
 PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
 	--with-amqp=$(STAGING_DIR)/usr
 # phpize does the autoconf magic
 PHP_AMQP_DEPENDENCIES = rabbitmq-c php host-autoconf
-PHP_AMQP_LICENSE = PHP
+PHP_AMQP_LICENSE = PHP-3.01
 PHP_AMQP_LICENSE_FILES = LICENSE
 
 define PHP_AMQP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-geoip/php-geoip.hash b/bsp/buildroot/package/php-geoip/php-geoip.hash
index 37298802..21e26c8e 100644
--- a/bsp/buildroot/package/php-geoip/php-geoip.hash
+++ b/bsp/buildroot/package/php-geoip/php-geoip.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 63167b717f624580b93f3c6c050d8d64ebc6cbe1377069646eb387534c7a2f7e  php-geoip-ebb68228ad94298a305710f701b2ade9acff985d.tar.gz
+sha256 b2d05c03019d46135c249b5a7fa0dbd43ca5ee98aea8ed807bc7aa90ac8c0f06  geoip-1.1.1.tgz
diff --git a/bsp/buildroot/package/php-geoip/php-geoip.mk b/bsp/buildroot/package/php-geoip/php-geoip.mk
index c39c95c4..82ecba58 100644
--- a/bsp/buildroot/package/php-geoip/php-geoip.mk
+++ b/bsp/buildroot/package/php-geoip/php-geoip.mk
@@ -4,19 +4,20 @@
 #
 ################################################################################
 
-PHP_GEOIP_VERSION = ebb68228ad94298a305710f701b2ade9acff985d
-PHP_GEOIP_SITE = $(call github,php7-extensions,ext-php7-geoip,$(PHP_GEOIP_VERSION))
+PHP_GEOIP_VERSION = 1.1.1
+PHP_GEOIP_SOURCE = geoip-$(PHP_GEOIP_VERSION).tgz
+PHP_GEOIP_SITE = https://pecl.php.net/get
 PHP_GEOIP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
 	--with-geoip=$(STAGING_DIR)/usr
 # phpize does the autoconf magic
 PHP_GEOIP_DEPENDENCIES = geoip php host-autoconf
-PHP_GEOIP_LICENSE = PHP
+PHP_GEOIP_LICENSE = PHP-3.01
 PHP_GEOIP_LICENSE_FILES = geoip.c
 
 define PHP_GEOIP_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-gnupg/php-gnupg.hash b/bsp/buildroot/package/php-gnupg/php-gnupg.hash
index f0654b57..4185665e 100644
--- a/bsp/buildroot/package/php-gnupg/php-gnupg.hash
+++ b/bsp/buildroot/package/php-gnupg/php-gnupg.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 6f1a4b5a95fe501519de76d66602e46290cc452fc48f3a5ec2eacaffe68d9a01  php-gnupg-30fab6eaf9eb61c65b3b46987442be058cbd7823.tar.gz
+sha256 35e16bee11345a7d6bf57bea3cadf45e371ad1ed4e0218b0c06f6f637e4e1772  gnupg-1.4.0.tgz
diff --git a/bsp/buildroot/package/php-gnupg/php-gnupg.mk b/bsp/buildroot/package/php-gnupg/php-gnupg.mk
index c1c6680b..ae0a7811 100644
--- a/bsp/buildroot/package/php-gnupg/php-gnupg.mk
+++ b/bsp/buildroot/package/php-gnupg/php-gnupg.mk
@@ -4,19 +4,20 @@
 #
 ################################################################################
 
-PHP_GNUPG_VERSION = 30fab6eaf9eb61c65b3b46987442be058cbd7823
-PHP_GNUPG_SITE = $(call github,Sean-Der,pecl-encryption-gnupg,$(PHP_GNUPG_VERSION))
+PHP_GNUPG_VERSION = 1.4.0
+PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz
+PHP_GNUPG_SITE = https://pecl.php.net/get
 # phpize does the autoconf magic
 PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf
 PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
 	--with-gnupg=$(STAGING_DIR)/usr/include --with-gpg=/usr/bin/gpg
-PHP_GNUPG_LICENSE = BSD-2c
+PHP_GNUPG_LICENSE = BSD-2-Clause
 PHP_GNUPG_LICENSE_FILES = LICENSE
 
 define PHP_GNUPG_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-imagick/php-imagick.hash b/bsp/buildroot/package/php-imagick/php-imagick.hash
index e9912371..abb29d4e 100644
--- a/bsp/buildroot/package/php-imagick/php-imagick.hash
+++ b/bsp/buildroot/package/php-imagick/php-imagick.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 50bbc46e78cd6e1ea5d7660be1722258e60b1729483ca14b02da7cf9f5ed3e6a  imagick-3.4.3RC1.tgz
+sha256 1f3c5b5eeaa02800ad22f506cd100e8889a66b2ec937e192eaaa30d74562567c  imagick-3.4.3.tgz
diff --git a/bsp/buildroot/package/php-imagick/php-imagick.mk b/bsp/buildroot/package/php-imagick/php-imagick.mk
index ddcefdaa..ca0cbc74 100644
--- a/bsp/buildroot/package/php-imagick/php-imagick.mk
+++ b/bsp/buildroot/package/php-imagick/php-imagick.mk
@@ -4,20 +4,20 @@
 #
 ################################################################################
 
-PHP_IMAGICK_VERSION = 3.4.3RC1
+PHP_IMAGICK_VERSION = 3.4.3
 PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz
 PHP_IMAGICK_SITE = http://pecl.php.net/get
 PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
 	--with-imagick=$(STAGING_DIR)/usr
 # phpize does the autoconf magic
 PHP_IMAGICK_DEPENDENCIES = imagemagick php host-autoconf
-PHP_IMAGICK_LICENSE = PHP
+PHP_IMAGICK_LICENSE = PHP-3.01
 PHP_IMAGICK_LICENSE_FILES = LICENSE
 
 define PHP_IMAGICK_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-memcached/php-memcached.hash b/bsp/buildroot/package/php-memcached/php-memcached.hash
index f2a096f3..7a8ec283 100644
--- a/bsp/buildroot/package/php-memcached/php-memcached.hash
+++ b/bsp/buildroot/package/php-memcached/php-memcached.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 73266212e791a4817da06be1daddf9ff7dd5b5b0b650b3fbd0f5fc6ccc18491b  php-memcached-6ee96cad7be5caa1f13a1f3e5a4d5f900b9c04ce.tar.gz
+sha256 5d1c29a1d5e391d6bb7b736a07e063d2f0834800673dd246d64ce1b73e47645d  memcached-3.0.3.tgz
diff --git a/bsp/buildroot/package/php-memcached/php-memcached.mk b/bsp/buildroot/package/php-memcached/php-memcached.mk
index ea241b26..224a3445 100644
--- a/bsp/buildroot/package/php-memcached/php-memcached.mk
+++ b/bsp/buildroot/package/php-memcached/php-memcached.mk
@@ -4,21 +4,22 @@
 #
 ################################################################################
 
-PHP_MEMCACHED_VERSION = 6ee96cad7be5caa1f13a1f3e5a4d5f900b9c04ce
-PHP_MEMCACHED_SITE = $(call github,php-memcached-dev,php-memcached,$(PHP_MEMCACHED_VERSION))
+PHP_MEMCACHED_VERSION = 3.0.3
+PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz
+PHP_MEMCACHED_SITE = https://pecl.php.net/get
 PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
 	--disable-memcached-sasl \
 	--with-libmemcached-dir=$(STAGING_DIR)/usr \
 	--with-zlib-dir=$(STAGING_DIR)/usr
 # phpize does the autoconf magic
 PHP_MEMCACHED_DEPENDENCIES = libmemcached php zlib host-autoconf host-pkgconf
-PHP_MEMCACHED_LICENSE = MIT
-PHP_MEMCACHED_LICENSE_FILES = LICENSE
+PHP_MEMCACHED_LICENSE = PHP-3.01, MIT (fastlz), ISC-like (g_fmt.c, g_fmt.h)
+PHP_MEMCACHED_LICENSE_FILES = LICENSE fastlz/LICENSE g_fmt.h
 
 define PHP_MEMCACHED_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-ssh2/php-ssh2.hash b/bsp/buildroot/package/php-ssh2/php-ssh2.hash
index b514601b..f110e778 100644
--- a/bsp/buildroot/package/php-ssh2/php-ssh2.hash
+++ b/bsp/buildroot/package/php-ssh2/php-ssh2.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 3d79a6c9ffed3fd6ec16e834c0cc93cf125d9f5bdbb951b8b76a3507498548d5  php-ssh2-12dd52236c601577a63e33ee71e3ce6dad811e40.tar.gz
+sha256 87618d6a0981afe8c24b36d6b38c21a0aa0237b62e60347d0170bd86b51f79fb  ssh2-1.1.2.tgz
diff --git a/bsp/buildroot/package/php-ssh2/php-ssh2.mk b/bsp/buildroot/package/php-ssh2/php-ssh2.mk
index 2b616321..c9c13010 100644
--- a/bsp/buildroot/package/php-ssh2/php-ssh2.mk
+++ b/bsp/buildroot/package/php-ssh2/php-ssh2.mk
@@ -4,19 +4,20 @@
 #
 ################################################################################
 
-PHP_SSH2_VERSION = 12dd52236c601577a63e33ee71e3ce6dad811e40
-PHP_SSH2_SITE = $(call github,php,pecl-networking-ssh2,$(PHP_SSH2_VERSION))
+PHP_SSH2_VERSION = 1.1.2
+PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz
+PHP_SSH2_SITE = https://pecl.php.net/get
 PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
 	--with-ssh2=$(STAGING_DIR)/usr
 # phpize does the autoconf magic
 PHP_SSH2_DEPENDENCIES = libssh2 php host-autoconf
-PHP_SSH2_LICENSE = PHP
+PHP_SSH2_LICENSE = PHP-3.01
 PHP_SSH2_LICENSE_FILES = LICENSE
 
 define PHP_SSH2_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-yaml/php-yaml.hash b/bsp/buildroot/package/php-yaml/php-yaml.hash
index a40677ef..21b507e1 100644
--- a/bsp/buildroot/package/php-yaml/php-yaml.hash
+++ b/bsp/buildroot/package/php-yaml/php-yaml.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 d49acf2b7843258957a16df0d7ced56c0e1fc3eaa54f54289e4012edc002814c  yaml-2.0.0RC7.tgz
+sha256 c3afb0dad47b6c3a5b7b449f57a4938df27bf974efbe188d85c4fb998eff0039  yaml-2.0.2.tgz
diff --git a/bsp/buildroot/package/php-yaml/php-yaml.mk b/bsp/buildroot/package/php-yaml/php-yaml.mk
index 27118906..086d575e 100644
--- a/bsp/buildroot/package/php-yaml/php-yaml.mk
+++ b/bsp/buildroot/package/php-yaml/php-yaml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_YAML_VERSION = 2.0.0RC7
+PHP_YAML_VERSION = 2.0.2
 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz
 PHP_YAML_SITE = https://pecl.php.net/get
 PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
@@ -16,8 +16,8 @@ PHP_YAML_LICENSE_FILES = LICENSE
 
 define PHP_YAML_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php-zmq/php-zmq.mk b/bsp/buildroot/package/php-zmq/php-zmq.mk
index 2730996d..fed71955 100644
--- a/bsp/buildroot/package/php-zmq/php-zmq.mk
+++ b/bsp/buildroot/package/php-zmq/php-zmq.mk
@@ -10,13 +10,13 @@ PHP_ZMQ_SITE = https://pecl.php.net/get
 # phpize does the autoconf magic
 PHP_ZMQ_DEPENDENCIES = php zeromq host-autoconf host-pkgconf
 PHP_ZMQ_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config
-PHP_ZMQ_LICENSE = BSD-3c
+PHP_ZMQ_LICENSE = BSD-3-Clause
 PHP_ZMQ_LICENSE_FILES = LICENSE
 
 define PHP_ZMQ_PHPIZE
 	(cd $(@D); \
-		PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \
-		PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \
+		PHP_AUTOCONF=$(HOST_DIR)/bin/autoconf \
+		PHP_AUTOHEADER=$(HOST_DIR)/bin/autoheader \
 		$(STAGING_DIR)/usr/bin/phpize)
 endef
 
diff --git a/bsp/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch b/bsp/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
index d507775b..b2391132 100644
--- a/bsp/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
+++ b/bsp/buildroot/package/php/0001-acinclude.m4-don-t-unset-variables.patch
@@ -7,6 +7,8 @@ Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache.
 Terminate them with extreme prejudice.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[aduskett@gmail.com: Update for 7.2.2]
 ---
  acinclude.m4 | 4 ----
  1 file changed, 4 deletions(-)
@@ -15,7 +17,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
 index 28506b6..af4aa06 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -1898,8 +1898,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
+@@ -1890,8 +1890,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,]))
  dnl
  AC_DEFUN([PHP_CHECK_FUNC_LIB],[
    ifelse($2,,:,[
@@ -24,7 +26,7 @@ index 28506b6..af4aa06 100644
    unset found
    AC_CHECK_LIB($2, $1, [found=yes], [
      AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
-@@ -1931,8 +1929,6 @@ dnl in the default libraries and as a fall back in the specified library.
+@@ -1923,8 +1921,6 @@ dnl in the default libraries and as a fall back in the specified library.
  dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
  dnl
  AC_DEFUN([PHP_CHECK_FUNC],[
diff --git a/bsp/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch b/bsp/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
index a3466493..e921030d 100644
--- a/bsp/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
+++ b/bsp/buildroot/package/php/0002-iconv-tweak-iconv-detection.patch
@@ -13,6 +13,8 @@ PHP_ICONV_H_PATH which, again, uses test and absolute paths.
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 [Gustavo: convert to nice m4 instead of patching configure]
 [Gustavo: update for 5.6.10]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[aduskett@gmail.com: Update for 7.2.2]
 ---
  acinclude.m4        |  2 +-
  ext/iconv/config.m4 | 22 ----------------------
@@ -22,7 +24,7 @@ diff --git a/acinclude.m4 b/acinclude.m4
 index af4aa06..1bd2652 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -2471,7 +2471,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+@@ -2463,7 +2463,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [
    dnl
    if test "$found_iconv" = "no"; then
  
diff --git a/bsp/buildroot/package/php/0003-configure-disable-the-phar-tool.patch b/bsp/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
index 3b64b7b6..e41584e8 100644
--- a/bsp/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
+++ b/bsp/buildroot/package/php/0003-configure-disable-the-phar-tool.patch
@@ -10,15 +10,17 @@ on the target.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 [Gustavo: update for autoreconf/configure.in]
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+[Aduskett: update for 7.2.2]
 ---
- configure.in | 9 ++-------
+ configure.ac | 9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
-diff --git a/configure.in b/configure.in
-index 25c8abf..4dc8a09 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1445,13 +1445,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
+diff --git a/configure.ac b/configure.ac
+index d20af76..7f02f1a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1420,13 +1420,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
  
@@ -35,5 +37,5 @@ index 25c8abf..4dc8a09 100644
  all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
  install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
 -- 
-2.7.4
+2.14.3
 
diff --git a/bsp/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch b/bsp/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
index a36c2a3a..257ac70f 100644
--- a/bsp/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
+++ b/bsp/buildroot/package/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch
@@ -5,6 +5,8 @@ Subject: [PATCH] ext/fileinfo/config.m4: allow cache answer for strcasestr
  discovery
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[aduskett@gmail.com: Update for 7.2.2]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
 ---
  ext/fileinfo/config.m4 | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
@@ -13,14 +15,14 @@ diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
 index 7e98d62..8561962 100644
 --- a/ext/fileinfo/config.m4
 +++ b/ext/fileinfo/config.m4
-@@ -14,6 +14,7 @@ if test "$PHP_FILEINFO" != "no"; then
-     libmagic/readcdf.c libmagic/softmagic.c"
+@@ -15,6 +15,7 @@ libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c"
  
    AC_MSG_CHECKING([for strcasestr])
 +  AC_CACHE_VAL(ac_cv_func_strcasestr,
    AC_TRY_RUN([
  #include <string.h>
  #include <strings.h>
+ #include <stdlib.h>
 @@ -46,7 +47,7 @@ int main(void)
      AC_MSG_RESULT(no)
      AC_MSG_NOTICE(using libmagic strcasestr implementation)
diff --git a/bsp/buildroot/package/php/0006-avoid-bfin-gcc-segfault.patch b/bsp/buildroot/package/php/0006-avoid-bfin-gcc-segfault.patch
new file mode 100644
index 00000000..7f8cb24e
--- /dev/null
+++ b/bsp/buildroot/package/php/0006-avoid-bfin-gcc-segfault.patch
@@ -0,0 +1,17 @@
+Avoid gcc segmentation fault
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[aduskett@gmail.com: Update for 7.2.2]
+diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h
+--- php-7.0.12.orig/Zend/zend_portability.h	2016-10-13 16:04:17.000000000 +0200
++++ php-7.0.12/Zend/zend_portability.h	2016-11-08 02:49:39.118388999 +0100
+@@ -95,7 +95,7 @@
+ 
+ #if defined(ZEND_WIN32) && !defined(__clang__)
+ # define ZEND_ASSUME(c)	__assume(c)
+-#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT
++#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__)
+ # define ZEND_ASSUME(c)	do { \
+ 		if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \
+ 	} while (0)
diff --git a/bsp/buildroot/package/php/0007-Call-apxs-with-correct-prefix.patch b/bsp/buildroot/package/php/0007-Call-apxs-with-correct-prefix.patch
new file mode 100644
index 00000000..c81711d2
--- /dev/null
+++ b/bsp/buildroot/package/php/0007-Call-apxs-with-correct-prefix.patch
@@ -0,0 +1,51 @@
+From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fabrice.fontaine@orange.com>
+Date: Sun, 11 Dec 2016 23:12:46 +0100
+Subject: [PATCH] Call apxs with correct prefix
+
+php uses apache's apxs script from staging directory to install libphp
+dynamic library and update /etc/apache2/httpd.conf in the staging and target
+directories. Here is the full command line:
+"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
+ -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
+This does not work for target directory as apxs sets the full path of the
+library and not the relative one. Indeed, apxs is smart enough to substitute
+away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
+httpd.conf will only be correct in the staging directory.
+To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
+
+Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+[aduskett@gmail.com: Update for 7.2.2]
+---
+ sapi/apache2handler/config.m4 | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
+index 2e64b21..f5bf002 100644
+--- a/sapi/apache2handler/config.m4
++++ b/sapi/apache2handler/config.m4
+@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then
+     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
+   fi
+ 
++  APXS_PREFIX='$(INSTALL_ROOT)'/usr
+   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
+   if test -z `$APXS -q SYSCONFDIR`; then
+     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
++                       -S PREFIX='$APXS_PREFIX' \
+                        -i -n php7"
+   else
+     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
+@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then
+                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
+                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
+                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
++                       -S PREFIX='$APXS_PREFIX' \
+                        -i -a -n php7"
+   fi
+ 
+-- 
+2.5.0
+
diff --git a/bsp/buildroot/package/php/0007-avoid-bfin-gcc-segfault.patch b/bsp/buildroot/package/php/0007-avoid-bfin-gcc-segfault.patch
deleted file mode 100644
index 4dccb25f..00000000
--- a/bsp/buildroot/package/php/0007-avoid-bfin-gcc-segfault.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid gcc segmentation fault
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-
-diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h
---- php-7.0.12.orig/Zend/zend_portability.h	2016-10-13 16:04:17.000000000 +0200
-+++ php-7.0.12/Zend/zend_portability.h	2016-11-08 02:49:39.118388999 +0100
-@@ -97,7 +97,7 @@
- 
- #if defined(ZEND_WIN32) && !defined(__clang__)
- # define ZEND_ASSUME(c)	__assume(c)
--#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT
-+#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__)
- # define ZEND_ASSUME(c)	do { \
- 		if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \
- 	} while (0)
diff --git a/bsp/buildroot/package/php/0008-Call-apxs-with-correct-prefix.patch b/bsp/buildroot/package/php/0008-Call-apxs-with-correct-prefix.patch
deleted file mode 100644
index b850ab77..00000000
--- a/bsp/buildroot/package/php/0008-Call-apxs-with-correct-prefix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Sun, 11 Dec 2016 23:12:46 +0100
-Subject: [PATCH] Call apxs with correct prefix
-
-php uses apache's apxs script from staging directory to install libphp
-dynamic library and update /etc/apache2/httpd.conf in the staging and target
-directories. Here is the full command line:
-"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
- -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
-This does not work for target directory as apxs sets the full path of the
-library and not the relative one. Indeed, apxs is smart enough to substitute
-away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
-httpd.conf will only be correct in the staging directory.
-To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
----
- sapi/apache2handler/config.m4 | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
-index 2e64b21..f5bf002 100644
---- a/sapi/apache2handler/config.m4
-+++ b/sapi/apache2handler/config.m4
-@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then
-     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])
-   fi
- 
-+  APXS_PREFIX='$(INSTALL_ROOT)'/usr
-   APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`
-   if test -z `$APXS -q SYSCONFDIR`; then
-     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-+                       -S PREFIX='$APXS_PREFIX' \
-                        -i -n php7"
-   else
-     APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
-@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then
-                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
-                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
-                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
-+                       -S PREFIX='$APXS_PREFIX' \
-                        -i -a -n php7"
-   fi
- 
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/php/0008-ext-xml-expat_compat.h-add-missing-php.h-include.patch b/bsp/buildroot/package/php/0008-ext-xml-expat_compat.h-add-missing-php.h-include.patch
new file mode 100644
index 00000000..daf004dc
--- /dev/null
+++ b/bsp/buildroot/package/php/0008-ext-xml-expat_compat.h-add-missing-php.h-include.patch
@@ -0,0 +1,71 @@
+From fb1f0e17eed729204a6d5caf590715d6257dceb3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Date: Thu, 5 Apr 2018 22:50:00 +0200
+Subject: [PATCH] ext/xml/expat_compat.h: add missing php.h include
+
+When expat support is disabled and libxml support is enabled, the
+following part of the code in expat_compat.h gets used:
+
+and therefore "php".h" is included. However, when libexpat support is
+enabled, HAVE_LIBEXPAT is defined, and therefore the following part of
+the code is used:
+
+In this case, "php.h" is not included. Due to this, zend_alloc.h is
+never included when building the ext/xmlrpc/libxmlrpc/xml_element.c
+file, and therefore the estrdup -> _estrdup macros are never defined,
+causing the following link time failure:
+
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_element_serialize':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:462: undefined reference to `efree'
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_entity_escape':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:347: undefined reference to `emalloc'
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `_xmlrpc_charHandler':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:646: undefined reference to `efree'
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_free_non_recurse':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:198: undefined reference to `efree'
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:199: undefined reference to `efree'
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:200: undefined reference to `efree'
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:207: undefined reference to `efree'
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_new':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:263: undefined reference to `ecalloc'
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `_xmlrpc_startElement':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:602: undefined reference to `estrdup'
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:607: undefined reference to `emalloc'
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:609: undefined reference to `estrdup'
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:610: undefined reference to `estrdup'
+ext/xmlrpc/libxmlrpc/xml_element.o: In function `xml_elem_free_non_recurse':
+/home/thomas/projets/php/ext/xmlrpc/libxmlrpc/xml_element.c:211: undefined reference to `efree'
+collect2: error: ld returned 1 exit status
+make: *** [Makefile:248: sapi/cgi/php-cgi] Error 1
+
+This link time failure can be produced with:
+
+./configure --prefix=/usr --with-libdir=/usr/lib64 --disable-all \
+	    --without-pear --with-config-file-path=/etc --disable-phpdbg \
+	    --disable-cli --enable-cgi --disable-fpm --enable-xmlreader \
+	    --enable-xmlwriter --enable-libxml --enable-wddx --with-xmlrpc \
+	    --with-libexpat-dir=/
+
+We fix it by including "php.h" in the HAVE_LIBEXPAT case.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+Upstream-status: https://github.com/php/php-src/pull/3212
+---
+ ext/xml/expat_compat.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ext/xml/expat_compat.h b/ext/xml/expat_compat.h
+index ed621ab53d..29fe48a7dd 100644
+--- a/ext/xml/expat_compat.h
++++ b/ext/xml/expat_compat.h
+@@ -154,6 +154,7 @@ PHP_XML_API const XML_Char *XML_ExpatVersion(void);
+ PHP_XML_API void XML_ParserFree(XML_Parser);
+ 
+ #elif defined(HAVE_LIBEXPAT)
++#include "php.h"
+ #include <expat.h>
+ #endif /* HAVE_LIBEXPAT */
+ 
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/php/Config.ext b/bsp/buildroot/package/php/Config.ext
index 7c3ba7e8..51dcbbf4 100644
--- a/bsp/buildroot/package/php/Config.ext
+++ b/bsp/buildroot/package/php/Config.ext
@@ -53,8 +53,8 @@ config BR2_PACKAGE_PHP_EXT_ZIP
 
 config BR2_PACKAGE_PHP_EXT_ZLIB
 	bool "zlib"
-	select BR2_PACKAGE_ZLIB
 	default y
+	select BR2_PACKAGE_ZLIB
 	help
 	  zlib support
 
@@ -113,6 +113,7 @@ endif
 
 config BR2_PACKAGE_PHP_EXT_MYSQLI
 	bool "Mysqli"
+	select BR2_PACKAGE_PHP_EXT_HASH
 	help
 	  MySQL Improved extension support
 
@@ -131,14 +132,15 @@ if BR2_PACKAGE_PHP_EXT_PDO
 
 config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
 	bool "MySQL"
+	select BR2_PACKAGE_PHP_EXT_HASH
 	help
 	  PDO driver for MySQL
 
 config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL
 	bool "PostgreSQL"
-	select BR2_PACKAGE_POSTGRESQL
 	depends on BR2_USE_MMU # postgresql
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_POSTGRESQL
 	help
 	  PDO driver for PostgreSQL
 
@@ -164,13 +166,12 @@ comment "Human language and character encoding support"
 
 config BR2_PACKAGE_PHP_EXT_GETTEXT
 	bool "Gettext"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
-	depends on BR2_USE_WCHAR
+	depends on BR2_SYSTEM_ENABLE_NLS
 	help
 	  Gettext support
 
-comment "Gettext support needs a toolchain w/ wchar"
-	depends on !BR2_USE_WCHAR
+comment "Gettext support needs NLS enabled"
+	depends on !BR2_SYSTEM_ENABLE_NLS
 
 config BR2_PACKAGE_PHP_EXT_ICONV
 	bool "iconv"
@@ -180,17 +181,22 @@ config BR2_PACKAGE_PHP_EXT_ICONV
 
 config BR2_PACKAGE_PHP_EXT_INTL
 	bool "intl"
-	select BR2_PACKAGE_ICU
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
 	depends on !BR2_BINFMT_FLAT # icu
 	depends on BR2_TOOLCHAIN_HAS_THREADS # icu
+	select BR2_PACKAGE_ICU
 	help
 	  Internationalization support
 
-comment "intl support needs a toolchain w/ C++, wchar, threads"
+comment "intl support needs a toolchain w/ C++, wchar, threads, gcc >= 4.8, host gcc >= 4.8"
 	depends on !BR2_BINFMT_FLAT
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
 
 config BR2_PACKAGE_PHP_EXT_MBSTRING
 	bool "mbstring"
diff --git a/bsp/buildroot/package/php/Config.in b/bsp/buildroot/package/php/Config.in
index 0fb80063..11514e04 100644
--- a/bsp/buildroot/package/php/Config.in
+++ b/bsp/buildroot/package/php/Config.in
@@ -6,6 +6,10 @@ config BR2_PACKAGE_PHP
 	       !BR2_PACKAGE_PHP_SAPI_FPM &&  \
 	       BR2_USE_MMU
 	select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU
+	# PHP uses -export-dynamic, which breaks with elf2flt with a
+	# message like "ld.real: section .junk LMA [...,...] overlaps
+	# section .text LMA [...,...]"
+	depends on !BR2_BINFMT_FLAT
 	help
 	  PHP  is a widely-used general-purpose scripting
 	  language that is especially suited for Web development
diff --git a/bsp/buildroot/package/php/php.hash b/bsp/buildroot/package/php/php.hash
index 3b3c97bd..2774c44d 100644
--- a/bsp/buildroot/package/php/php.hash
+++ b/bsp/buildroot/package/php/php.hash
@@ -1,5 +1,5 @@
 # From http://php.net/downloads.php
-sha256 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10  php-7.1.13.tar.xz
+sha256 01c2154a3a8e3c0818acbdbc1a956832c828a0380ce6d1d14fea495ea21804f0  php-7.2.10.tar.xz
 
 # License file
-sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e  LICENSE
+sha256 00e567a8d50359d93ee1f9afdd9511277660c1e70a0cbf3229f84403aa9aebb1  LICENSE
diff --git a/bsp/buildroot/package/php/php.mk b/bsp/buildroot/package/php/php.mk
index b684fa15..f92e9b65 100644
--- a/bsp/buildroot/package/php/php.mk
+++ b/bsp/buildroot/package/php/php.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_VERSION = 7.1.13
+PHP_VERSION = 7.2.10
 PHP_SITE = http://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
@@ -55,6 +55,7 @@ endif
 PHP_CONFIG_SCRIPTS = php-config
 
 PHP_CFLAGS = $(TARGET_CFLAGS)
+PHP_CXXFLAGS = $(TARGET_CXXFLAGS)
 
 # The OPcache extension isn't cross-compile friendly
 # Throw some defines here to avoid patching heavily
@@ -136,7 +137,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y)
 PHP_CONF_ENV += php_cv_libxml_build_works=yes
-PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr
+PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=$(STAGING_DIR)/usr
 PHP_DEPENDENCIES += libxml2
 endif
 
@@ -159,7 +160,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y)
 PHP_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr
-PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext)
+PHP_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
 endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y)
@@ -173,6 +174,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y)
 PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr
+PHP_CXXFLAGS += "`$(STAGING_DIR)/usr/bin/icu-config --cxxflags`"
 PHP_DEPENDENCIES += icu
 # The intl module is implemented in C++, but PHP fails to use
 # g++ as the compiler for the final link. As a workaround,
@@ -226,9 +228,10 @@ ifneq ($(BR2_PACKAGE_PHP_EXT_MYSQLI)$(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),)
 PHP_CONF_OPTS += --with-mysql-sock=$(MYSQL_SOCKET)
 endif
 
-define PHP_DISABLE_PCRE_JIT
-	$(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h
+define PHP_DISABLE_VALGRIND
+	$(SED) '/^#define HAVE_VALGRIND/d' $(@D)/main/php_config.h
 endef
+PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_VALGRIND
 
 ### Use external PCRE if it's available
 ifeq ($(BR2_PACKAGE_PCRE),y)
@@ -242,8 +245,10 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 PHP_CFLAGS += -DSLJIT_SINGLE_THREADED=1
 endif
 # check ext/pcre/pcrelib/sljit/sljitConfigInternal.h for supported archs
-ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),)
-PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_PCRE_JIT
+ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y)
+PHP_CONF_OPTS += --with-pcre-jit
+else
+PHP_CONF_OPTS += --without-pcre-jit
 endif
 endif
 
@@ -343,6 +348,6 @@ endef
 
 PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP
 
-PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)"
+PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)" CXXFLAGS="$(PHP_CXXFLAGS)"
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/physfs/Config.in b/bsp/buildroot/package/physfs/Config.in
new file mode 100644
index 00000000..c272d887
--- /dev/null
+++ b/bsp/buildroot/package/physfs/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PHYSFS
+	bool "physfs"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  PhysicsFS; a portable, flexible file i/o abstraction.
+
+	  http://icculus.org/physfs
+
+comment "physfs needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/physfs/physfs.hash b/bsp/buildroot/package/physfs/physfs.hash
new file mode 100644
index 00000000..3d97fe0b
--- /dev/null
+++ b/bsp/buildroot/package/physfs/physfs.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1  physfs-3.0.1.tar.bz2
+sha256 7ce475991f6cc09958ef0d57312522eba78e36d984307c95f9a3965adf7e4e2b  LICENSE.txt
diff --git a/bsp/buildroot/package/physfs/physfs.mk b/bsp/buildroot/package/physfs/physfs.mk
new file mode 100644
index 00000000..78176be4
--- /dev/null
+++ b/bsp/buildroot/package/physfs/physfs.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# physfs
+#
+################################################################################
+
+PHYSFS_VERSION = 3.0.1
+PHYSFS_SOURCE = physfs-$(PHYSFS_VERSION).tar.bz2
+PHYSFS_SITE = https://icculus.org/physfs/downloads
+
+PHYSFS_LICENSE = Zlib
+PHYSFS_LICENSE_FILES = LICENSE.txt
+
+PHYSFS_INSTALL_STAGING = YES
+
+PHYSFS_CONF_OPTS = -DPHYSFS_BUILD_TEST=OFF
+
+ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_SHARED=ON
+else
+PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_SHARED=OFF
+endif
+
+ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
+PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_STATIC=ON
+else
+PHYSFS_CONF_OPTS += -DPHYSFS_BUILD_STATIC=OFF
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/phytool/Config.in b/bsp/buildroot/package/phytool/Config.in
new file mode 100644
index 00000000..985468f1
--- /dev/null
+++ b/bsp/buildroot/package/phytool/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PHYTOOL
+	bool "phytool"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 # linux/mdio.h
+	help
+	  Linux MDIO register access utility.
+
+	  https://github.com/wkz/phytool
+
+comment "phytool needs a toolchain w/ headers >= 3.7"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
diff --git a/bsp/buildroot/package/phytool/phytool.hash b/bsp/buildroot/package/phytool/phytool.hash
new file mode 100644
index 00000000..ce049364
--- /dev/null
+++ b/bsp/buildroot/package/phytool/phytool.hash
@@ -0,0 +1,4 @@
+# md5 from https://github.com/wkz/phytool/releases/download/v2/phytool-2.tar.xz.md5
+# sha256 locally computed:
+md5  972982f8e5f7237cbccfc6d275da7348  phytool-2.tar.xz
+sha256  9901a14e8c6af02b7333c60b21ff81f50620e8326d54827185e5617ff9b11d21  phytool-2.tar.xz
diff --git a/bsp/buildroot/package/phytool/phytool.mk b/bsp/buildroot/package/phytool/phytool.mk
new file mode 100644
index 00000000..3de66661
--- /dev/null
+++ b/bsp/buildroot/package/phytool/phytool.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# phytool
+#
+################################################################################
+
+PHYTOOL_VERSION = 2
+PHYTOOL_SOURCE = phytool-$(PHYTOOL_VERSION).tar.xz
+PHYTOOL_SITE = https://github.com/wkz/phytool/releases/download/v$(PHYTOOL_VERSION)
+PHYTOOL_LICENSE = GPL-2.0+
+PHYTOOL_LICENSE_FILES = LICENSE
+
+define PHYTOOL_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		LDLIBS="$(TARGET_LDFLAGS)"
+endef
+
+define PHYTOOL_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" \
+		PREFIX="usr" install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/picocom/Config.in b/bsp/buildroot/package/picocom/Config.in
index 671d01fb..9f8efc4a 100644
--- a/bsp/buildroot/package/picocom/Config.in
+++ b/bsp/buildroot/package/picocom/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_PICOCOM
 	bool "picocom"
 	depends on BR2_USE_MMU # fork()
 	help
-	  picocom is a minimal dumb-terminal emulation program. It is, in
-	  principle, very much like minicom, only it's pico instead of mini!
+	  picocom is a minimal dumb-terminal emulation program. It is,
+	  in principle, very much like minicom, only it's pico instead
+	  of mini!
 
 	  https://github.com/npat-efault/picocom/
diff --git a/bsp/buildroot/package/picocom/picocom.hash b/bsp/buildroot/package/picocom/picocom.hash
index 674b6209..f1558304 100644
--- a/bsp/buildroot/package/picocom/picocom.hash
+++ b/bsp/buildroot/package/picocom/picocom.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 6b152fc5f816eaef6b86336a4cec7cf1496b7c712061e5aea5a36f143a0b09ed  picocom-2.1.tar.gz
+sha256 a539db95bde3a5ebd52ae58a21f40d00cc2c97bf14b1f50caffc07257989112e  picocom-3.0.tar.gz
+sha256 9273c6b2c55be95f0f0df292d87e8900e5bfdf5b510a6ea09e80306cf45c10f6  LICENSE.txt
diff --git a/bsp/buildroot/package/picocom/picocom.mk b/bsp/buildroot/package/picocom/picocom.mk
index e0e817ea..0fa60f99 100644
--- a/bsp/buildroot/package/picocom/picocom.mk
+++ b/bsp/buildroot/package/picocom/picocom.mk
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-PICOCOM_VERSION = 2.1
+PICOCOM_VERSION = 3.0
 PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION))
-PICOCOM_LICENSE = GPLv2+
+PICOCOM_LICENSE = GPL-2.0+
 PICOCOM_LICENSE_FILES = LICENSE.txt
 
 define PICOCOM_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \
-		LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D)
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
 endef
 
 define PICOCOM_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/pifmrds/pifmrds.mk b/bsp/buildroot/package/pifmrds/pifmrds.mk
index a30c0136..509ec808 100644
--- a/bsp/buildroot/package/pifmrds/pifmrds.mk
+++ b/bsp/buildroot/package/pifmrds/pifmrds.mk
@@ -7,7 +7,7 @@
 PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2
 PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION))
 PIFMRDS_DEPENDENCIES = libsndfile
-PIFMRDS_LICENSE = GPLv3+
+PIFMRDS_LICENSE = GPL-3.0+
 PIFMRDS_LICENSE_FILES = LICENSE
 
 define PIFMRDS_BUILD_CMDS
diff --git a/bsp/buildroot/package/pimd/Config.in b/bsp/buildroot/package/pimd/Config.in
new file mode 100644
index 00000000..d6a579bd
--- /dev/null
+++ b/bsp/buildroot/package/pimd/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PIMD
+	bool "pimd"
+	depends on BR2_USE_MMU # fork()
+	help
+	  pimd is a lightweight stand-alone PIM-SM v2 multicast routing
+	  daemon.
+
+	  http://troglobit.com/project/pimd/
diff --git a/bsp/buildroot/package/pimd/pimd.hash b/bsp/buildroot/package/pimd/pimd.hash
new file mode 100644
index 00000000..98c717d2
--- /dev/null
+++ b/bsp/buildroot/package/pimd/pimd.hash
@@ -0,0 +1,6 @@
+# Locally computed:
+sha256 c77a9812751f114490a28a6839b16aac8b020c8d9fd6aa22bf3880c054e19f1d  pimd-2.3.2.tar.gz
+
+# Hash for license files:
+sha256 3379436c16caccdef9b40a49fbdfdbb45aad8ecb05870834490b8fb080126009  LICENSE
+sha256 4328a21f0822caa9976356623118bcdcc9970c7a0f9a3deeba23c779b7cfb5d1  LICENSE.mrouted
diff --git a/bsp/buildroot/package/pimd/pimd.mk b/bsp/buildroot/package/pimd/pimd.mk
new file mode 100644
index 00000000..7a12f8fe
--- /dev/null
+++ b/bsp/buildroot/package/pimd/pimd.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# pimd
+#
+################################################################################
+
+PIMD_VERSION = 2.3.2
+PIMD_SITE = https://github.com/troglobit/pimd/releases/download/$(PIMD_VERSION)
+
+PIMD_LICENSE = BSD-3-Clause
+PIMD_LICENSE_FILES = LICENSE LICENSE.mrouted
+
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_TOOLCHAIN_USES_MUSL),y)
+PIMD_CONF_OPTS += --embedded-libc
+endif
+
+# The configure script is not autoconf based, so we use the
+# generic-package infrastructure
+define PIMD_CONFIGURE_CMDS
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		./configure $(PIMD_CONF_OPTS) \
+	)
+endef
+
+define PIMD_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) CROSS=$(TARGET_CROSS) \
+		CC=$(TARGET_CC) -C $(@D)
+endef
+
+define PIMD_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) \
+		prefix=/usr -C $(@D) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/pinentry/0001-remove-hard-wired-ncursesw-include-path.patch b/bsp/buildroot/package/pinentry/0001-remove-hard-wired-ncursesw-include-path.patch
deleted file mode 100644
index c9903c45..00000000
--- a/bsp/buildroot/package/pinentry/0001-remove-hard-wired-ncursesw-include-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From cf84bf3ef505059d42184b22cf38f89336bec43d Mon Sep 17 00:00:00 2001
-From: Gergely Imreh <imrehg@gmail.com>
-Date: Mon, 22 Jun 2015 07:51:17 +0000
-Subject: [PATCH 1/1] remove hard-wired ncursesw include path
-
-Don't assume that the ncursesw headers are in ../usr/include/ncursesw/..,
-and pkg-config finds the correct include path anyways.
-
-Signed-off-by: Gergely Imreh <imrehg@gmail.com>
----
- pinentry/pinentry-curses.c | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
-index 235435a..bdcd0f4 100644
---- a/pinentry/pinentry-curses.c
-+++ b/pinentry/pinentry-curses.c
-@@ -22,11 +22,7 @@
- #include <config.h>
- #endif
- #include <assert.h>
--#ifdef HAVE_NCURSESW
--#include <ncursesw/curses.h>
--#else
- #include <curses.h>
--#endif
- #include <signal.h>
- #include <fcntl.h>
- #include <unistd.h>
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/pinentry/Config.in b/bsp/buildroot/package/pinentry/Config.in
index 682af9f3..5f2cb58f 100644
--- a/bsp/buildroot/package/pinentry/Config.in
+++ b/bsp/buildroot/package/pinentry/Config.in
@@ -1,7 +1,14 @@
 menuconfig BR2_PACKAGE_PINENTRY
 	bool "pinentry"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error
+	depends on BR2_USE_MMU # libassuan
+	select BR2_PACKAGE_LIBASSUAN
+	select BR2_PACKAGE_LIBGPG_ERROR
 	# At least one backend is needed to avoid build breakage
-	select BR2_PACKAGE_PINENTRY_NCURSES if !BR2_PACKAGE_PINENTRY_GTK2 && !BR2_PACKAGE_PINENTRY_QT4
+	select BR2_PACKAGE_PINENTRY_NCURSES if \
+		!BR2_PACKAGE_PINENTRY_GTK2 && \
+		!BR2_PACKAGE_PINENTRY_QT4 && \
+		!BR2_PACKAGE_PINENTRY_QT5
 	help
 	  A collection of simple PIN or pass-phrase entry dialogs
 
@@ -40,17 +47,32 @@ config BR2_PACKAGE_PINENTRY_QT4
 	depends on BR2_USE_MMU # fork
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  The pinentry-qt4 tool
 
-comment "pinentry-qt4 support needs a toolchain not affected by Binutils bug 19405"
-	depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
-
 comment "pinentry-qt4 needs a toolchain w/ C++, threads"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
+config BR2_PACKAGE_PINENTRY_QT5
+	bool "pinentry-qt5"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on !BR2_STATIC_LIBS
+	depends on !BR2_PACKAGE_PINENTRY_QT4
+	depends on !BR2_PACKAGE_QT
+	select BR2_PACKAGE_QT5
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	help
+	  The pinentry-qt5 tool
+
+comment "pinentry-qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
+	depends on !BR2_PACKAGE_PINENTRY_QT4
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
+
 endif
diff --git a/bsp/buildroot/package/pinentry/pinentry.hash b/bsp/buildroot/package/pinentry/pinentry.hash
index d544efd7..ef450b3c 100644
--- a/bsp/buildroot/package/pinentry/pinentry.hash
+++ b/bsp/buildroot/package/pinentry/pinentry.hash
@@ -1,2 +1,4 @@
 # From https://www.gnupg.org/download/integrity_check.html
-sha1  0c47f0ddea4631bcba01ebbeca8bffe0bf43e440  pinentry-0.9.4.tar.bz2
+sha1  85d9ac81ebad3fb082514c505c90c39a0456f1f6  pinentry-1.0.0.tar.bz2
+# Locally computed
+sha256 1672c2edc1feb036075b187c0773787b2afd0544f55025c645a71b4c2f79275a  pinentry-1.0.0.tar.bz2
diff --git a/bsp/buildroot/package/pinentry/pinentry.mk b/bsp/buildroot/package/pinentry/pinentry.mk
index bcb910a0..d0179728 100644
--- a/bsp/buildroot/package/pinentry/pinentry.mk
+++ b/bsp/buildroot/package/pinentry/pinentry.mk
@@ -4,21 +4,22 @@
 #
 ################################################################################
 
-PINENTRY_VERSION = 0.9.4
+PINENTRY_VERSION = 1.0.0
 PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2
-PINENTRY_SITE = ftp://ftp.gnupg.org/gcrypt/pinentry
-PINENTRY_LICENSE = GPLv2+
+PINENTRY_SITE = https://www.gnupg.org/ftp/gcrypt/pinentry
+PINENTRY_LICENSE = GPL-2.0+
 PINENTRY_LICENSE_FILES = COPYING
 PINENTRY_DEPENDENCIES = \
+	libassuan libgpg-error \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
 	host-pkgconf
-PINENTRY_CONF_OPTS += --without-libcap       # requires PAM
+PINENTRY_CONF_OPTS += \
+	--with-libassuan-prefix=$(STAGING_DIR)/usr \
+	--with-libgpg-error-prefix=$(STAGING_DIR)/usr \
+	--without-libcap       # requires PAM
 
-# pinentry uses some std::string functionality that needs C++11
-# support when gcc >= 5.x. This should be removed when bumping
-# pinentry, since newer versions no longer use std::string.
-ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y)
-PINENTRY_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11"
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+PINENTRY_CONF_ENV += LIBS=-latomic
 endif
 
 # build with X if available
@@ -51,15 +52,17 @@ else
 PINENTRY_CONF_OPTS += --disable-pinentry-gtk2
 endif
 
-# pinentry-qt4 backend
+# pinentry-qt4/5 backend
+ifeq ($(BR2_PACKAGE_PINENTRY_QT4)$(BR2_PACKAGE_PINENTRY_QT5),y)
 ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y)
 # -pthread needs to be passed for certain toolchains
 # http://autobuild.buildroot.net/results/6be/6be109ccedec603a67cebdb31b55865dcce0e128/
-PINENTRY_CONF_OPTS += LIBS=-pthread MOC=$(HOST_DIR)/usr/bin/moc
-PINENTRY_CONF_OPTS += --enable-pinentry-qt4
-PINENTRY_DEPENDENCIES += qt
+PINENTRY_CONF_OPTS += LIBS=-pthread MOC=$(HOST_DIR)/bin/moc
+endif
+PINENTRY_CONF_OPTS += --enable-pinentry-qt
+PINENTRY_DEPENDENCIES += $(if $(BR2_PACKAGE_PINENTRY_QT4),qt,qt5base)
 else
-PINENTRY_CONF_OPTS += --disable-pinentry-qt4
+PINENTRY_CONF_OPTS += --disable-pinentry-qt
 endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/pixz/Config.in b/bsp/buildroot/package/pixz/Config.in
new file mode 100644
index 00000000..f7ca0157
--- /dev/null
+++ b/bsp/buildroot/package/pixz/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_PIXZ
+	bool "pixz"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_WCHAR # libarchive
+	select BR2_PACKAGE_LIBARCHIVE
+	select BR2_PACKAGE_XZ
+	help
+	  Pixz (pronounced pixie) is a parallel, indexing version of xz.
+
+	  https://github.com/vasi/pixz
+
+comment "pixz needs a toolchain w/ threads, wchar"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/pixz/pixz.hash b/bsp/buildroot/package/pixz/pixz.hash
new file mode 100644
index 00000000..3089bcd9
--- /dev/null
+++ b/bsp/buildroot/package/pixz/pixz.hash
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256 02c50746b134fa1b1aae41fcc314d7c6f1919b3d48bcdea01bf11769f83f72e8 pixz-1.0.6.tar.xz
diff --git a/bsp/buildroot/package/pixz/pixz.mk b/bsp/buildroot/package/pixz/pixz.mk
new file mode 100644
index 00000000..8d80f786
--- /dev/null
+++ b/bsp/buildroot/package/pixz/pixz.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# pixz
+#
+################################################################################
+
+PIXZ_VERSION = 1.0.6
+PIXZ_SITE = https://github.com/vasi/pixz/releases/download/v$(PIXZ_VERSION)
+PIXZ_SOURCE = pixz-$(PIXZ_VERSION).tar.xz
+PIXZ_DEPENDENCIES = host-pkgconf libarchive xz
+PIXZ_LICENSE = BSD-2-Clause
+PIXZ_LICENSE_FILES = LICENSE
+
+# pixz.1 is actually present, but AC_CHECK_FILE doesn't detect it when
+# cross-compiling, which causes configure to try to regenerate it. So give it a
+# hint to say that it actually is present.
+PIXZ_CONF_ENV = ac_cv_file_src_pixz_1=yes
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/pkg-autotools.mk b/bsp/buildroot/package/pkg-autotools.mk
index f7b84888..45de9935 100644
--- a/bsp/buildroot/package/pkg-autotools.mk
+++ b/bsp/buildroot/package/pkg-autotools.mk
@@ -199,9 +199,9 @@ define $(2)_CONFIGURE_CMDS
 		--disable-documentation \
 		--with-xmlto=no \
 		--with-fop=no \
-		--disable-dependency-tracking \
+		$$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \
 		--enable-ipv6 \
-		$$(DISABLE_NLS) \
+		$$(NLS_OPTS) \
 		$$(SHARED_STATIC_LIBS_OPTS) \
 		$$(QUIET) $$($$(PKG)_CONF_OPTS) \
 	)
@@ -220,7 +220,7 @@ define $(2)_CONFIGURE_CMDS
 	$$($$(PKG)_CONF_ENV) \
 	CONFIG_SITE=/dev/null \
 	./configure \
-		--prefix="$$(HOST_DIR)/usr" \
+		--prefix="$$(HOST_DIR)" \
 		--sysconfdir="$$(HOST_DIR)/etc" \
 		--localstatedir="$$(HOST_DIR)/var" \
 		--enable-shared --disable-static \
@@ -232,7 +232,7 @@ define $(2)_CONFIGURE_CMDS
 		--disable-debug \
 		--with-xmlto=no \
 		--with-fop=no \
-		--disable-dependency-tracking \
+		$$(if $$($$(PKG)_OVERRIDE_SRCDIR),,--disable-dependency-tracking) \
 		$$(QUIET) $$($$(PKG)_CONF_OPTS) \
 	)
 endef
diff --git a/bsp/buildroot/package/pkg-cmake.mk b/bsp/buildroot/package/pkg-cmake.mk
index f1c12b98..9b07798a 100644
--- a/bsp/buildroot/package/pkg-cmake.mk
+++ b/bsp/buildroot/package/pkg-cmake.mk
@@ -22,8 +22,8 @@
 
 # Set compiler variables.
 ifeq ($(BR2_CCACHE),y)
-CMAKE_HOST_C_COMPILER = $(HOST_DIR)/usr/bin/ccache
-CMAKE_HOST_CXX_COMPILER = $(HOST_DIR)/usr/bin/ccache
+CMAKE_HOST_C_COMPILER = $(HOST_DIR)/bin/ccache
+CMAKE_HOST_CXX_COMPILER = $(HOST_DIR)/bin/ccache
 CMAKE_HOST_C_COMPILER_ARG1 = $(HOSTCC_NOCCACHE)
 CMAKE_HOST_CXX_COMPILER_ARG1 = $(HOSTCXX_NOCCACHE)
 else
@@ -80,13 +80,21 @@ ifndef $(2)_CONFIGURE_CMDS
 ifeq ($(4),target)
 
 # Configure package for target
+#
+# - We are passing BUILD_SHARED_LIBS because it is documented as a
+#   standard CMake variable to control the build of shared libraries
+#   (see https://cmake.org/cmake/help/v3.8/manual/cmake-variables.7.html#variables-that-change-behavior)
+# - We are not passing BUILD_STATIC_LIBS because it is *not*
+#   documented as a standard CMake variable. If a package supports it,
+#   it must handle it explicitly.
+#
 define $(2)_CONFIGURE_CMDS
 	(mkdir -p $$($$(PKG)_BUILDDIR) && \
 	cd $$($$(PKG)_BUILDDIR) && \
 	rm -f CMakeCache.txt && \
 	PATH=$$(BR_PATH) \
 	$$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \
-		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \
+		-DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/share/buildroot/toolchainfile.cmake" \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DCMAKE_COLOR_MAKEFILE=OFF \
 		-DBUILD_DOC=OFF \
@@ -120,10 +128,11 @@ define $(2)_CONFIGURE_CMDS
 		-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \
 		-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" \
 		-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" \
-		-DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \
+		-DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)" \
 		-DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \
 		-DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \
 		-DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \
+		-DCMAKE_SHARED_LINKER_FLAGS="$$(HOST_LDFLAGS)" \
 		-DCMAKE_ASM_COMPILER="$$(HOSTAS)" \
 		-DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \
 		-DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \
@@ -224,21 +233,27 @@ else ifeq ($(BR2_ARM_CPU_ARMV6),y)
 CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv6
 else ifeq ($(BR2_ARM_CPU_ARMV7A),y)
 CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv7
+else ifeq ($(BR2_ARM_CPU_ARMV8A),y)
+CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv8
 endif
 
 ifeq ($(BR2_arm),y)
 CMAKE_SYSTEM_PROCESSOR = $(CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT)l
 else ifeq ($(BR2_armeb),y)
 CMAKE_SYSTEM_PROCESSOR = $(CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT)b
+else ifeq ($(call qstrip,$(BR2_ARCH)),powerpc64)
+CMAKE_SYSTEM_PROCESSOR = ppc64
+else ifeq ($(call qstrip,$(BR2_ARCH)),powerpc64le)
+CMAKE_SYSTEM_PROCESSOR = ppc64le
 else
 CMAKE_SYSTEM_PROCESSOR = $(BR2_ARCH)
 endif
 
 # In order to allow the toolchain to be relocated, we calculate the HOST_DIR
-# based on the toolchainfile.cmake file's location: $(HOST_DIR)/usr/share/buildroot
+# based on the toolchainfile.cmake file's location: $(HOST_DIR)/share/buildroot
 # In all the other variables, HOST_DIR will be replaced by RELOCATED_HOST_DIR,
 # so we have to strip "$(HOST_DIR)/" from the paths that contain it.
-$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
+$(HOST_DIR)/share/buildroot/toolchainfile.cmake:
 	@mkdir -p $(@D)
 	sed \
 		-e 's#@@STAGING_SUBDIR@@#$(call qstrip,$(STAGING_SUBDIR))#' \
@@ -254,3 +269,6 @@ $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake:
 		-e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \
 		$(TOPDIR)/support/misc/toolchainfile.cmake.in \
 		> $@
+
+$(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake:
+	$(Q)$(INSTALL) -D -m 0644 support/misc/Buildroot.cmake $(@)
diff --git a/bsp/buildroot/package/pkg-download.mk b/bsp/buildroot/package/pkg-download.mk
index cfc550e7..6f15deba 100644
--- a/bsp/buildroot/package/pkg-download.mk
+++ b/bsp/buildroot/package/pkg-download.mk
@@ -68,29 +68,21 @@ export BR_NO_CHECK_HASH_FOR =
 # ssh authentication. DOWNLOAD_WGET is the normal wget-based download
 # mechanism.
 #
-# The SOURCE_CHECK_* helpers are in charge of simply checking that the source
-# is available for download. This can be used to make sure one will be able
-# to get all the sources needed for one's build configuration.
 ################################################################################
 
 define DOWNLOAD_GIT
 	$(EXTRA_ENV) $(DL_WRAPPER) -b git \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
 		$(if $($(PKG)_GIT_SUBMODULES),-r) \
+		-H $(PKGDIR)/$($(PKG)_RAWNAME).hash \
 		$(QUIET) \
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
-		$($(PKG)_RAW_BASE_NAME) \
+		$($(PKG)_BASENAME_RAW) \
 		$($(PKG)_DL_OPTS)
 endef
 
-# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
-# repository
-define SOURCE_CHECK_GIT
-	$(GIT) ls-remote --heads $($(PKG)_SITE) > /dev/null
-endef
-
 define DOWNLOAD_BZR
 	$(EXTRA_ENV) $(DL_WRAPPER) -b bzr \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
@@ -98,14 +90,10 @@ define DOWNLOAD_BZR
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
-		$($(PKG)_RAW_BASE_NAME) \
+		$($(PKG)_BASENAME_RAW) \
 		$($(PKG)_DL_OPTS)
 endef
 
-define SOURCE_CHECK_BZR
-	$(BZR) ls --quiet $($(PKG)_SITE) > /dev/null
-endef
-
 define DOWNLOAD_CVS
 	$(EXTRA_ENV) $(DL_WRAPPER) -b cvs \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
@@ -114,15 +102,10 @@ define DOWNLOAD_CVS
 		$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \
 		$($(PKG)_DL_VERSION) \
 		$($(PKG)_RAWNAME) \
-		$($(PKG)_RAW_BASE_NAME) \
+		$($(PKG)_BASENAME_RAW) \
 		$($(PKG)_DL_OPTS)
 endef
 
-# Not all CVS servers support ls/rls, use login to see if we can connect
-define SOURCE_CHECK_CVS
-	$(CVS) -d:pserver:anonymous:@$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) login
-endef
-
 define DOWNLOAD_SVN
 	$(EXTRA_ENV) $(DL_WRAPPER) -b svn \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
@@ -130,14 +113,10 @@ define DOWNLOAD_SVN
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
-		$($(PKG)_RAW_BASE_NAME) \
+		$($(PKG)_BASENAME_RAW) \
 		$($(PKG)_DL_OPTS)
 endef
 
-define SOURCE_CHECK_SVN
-	$(SVN) ls $($(PKG)_SITE)@$($(PKG)_DL_VERSION) > /dev/null
-endef
-
 # SCP URIs should be of the form scp://[user@]host:filepath
 # Note that filepath is relative to the user's home directory, so you may want
 # to prepend the path with a slash: scp://[user@]host:/absolutepath
@@ -151,10 +130,6 @@ define DOWNLOAD_SCP
 		$($(PKG)_DL_OPTS)
 endef
 
-define SOURCE_CHECK_SCP
-	$(SSH) $(call domain,$(1),:) ls '$(call notdomain,$(1),:)' > /dev/null
-endef
-
 define DOWNLOAD_HG
 	$(EXTRA_ENV) $(DL_WRAPPER) -b hg \
 		-o $(DL_DIR)/$($(PKG)_SOURCE) \
@@ -162,16 +137,10 @@ define DOWNLOAD_HG
 		-- \
 		$($(PKG)_SITE) \
 		$($(PKG)_DL_VERSION) \
-		$($(PKG)_RAW_BASE_NAME) \
+		$($(PKG)_BASENAME_RAW) \
 		$($(PKG)_DL_OPTS)
 endef
 
-# TODO: improve to check that the given PKG_DL_VERSION exists on the remote
-# repository
-define SOURCE_CHECK_HG
-	$(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null
-endef
-
 define DOWNLOAD_WGET
 	$(EXTRA_ENV) $(DL_WRAPPER) -b wget \
 		-o $(DL_DIR)/$(2) \
@@ -182,10 +151,6 @@ define DOWNLOAD_WGET
 		$($(PKG)_DL_OPTS)
 endef
 
-define SOURCE_CHECK_WGET
-	$(WGET) --spider '$(call qstrip,$(1))'
-endef
-
 define DOWNLOAD_LOCALFILES
 	$(EXTRA_ENV) $(DL_WRAPPER) -b cp \
 		-o $(DL_DIR)/$(2) \
@@ -196,10 +161,6 @@ define DOWNLOAD_LOCALFILES
 		$($(PKG)_DL_OPTS)
 endef
 
-define SOURCE_CHECK_LOCALFILES
-	test -e $(call stripurischeme,$(call qstrip,$(1)))
-endef
-
 ################################################################################
 # DOWNLOAD -- Download helper. Will try to download source from:
 # 1) BR2_PRIMARY_SITE if enabled
@@ -220,12 +181,8 @@ define DOWNLOAD
 	$(call DOWNLOAD_INNER,$(1),$(notdir $(1)),DOWNLOAD)
 endef
 
-define SOURCE_CHECK
-	$(call DOWNLOAD_INNER,$(1),$(notdir $(1)),SOURCE_CHECK)
-endef
-
 define DOWNLOAD_INNER
-	$(Q)$(if $(filter bzr cvs git hg svn,$($(PKG)_SITE_METHOD)),export BR_NO_CHECK_HASH_FOR=$(2);) \
+	$(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),export BR_NO_CHECK_HASH_FOR=$(2);) \
 	if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \
 		case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \
 			file) $(call $(3)_LOCALFILES,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \
diff --git a/bsp/buildroot/package/pkg-generic.mk b/bsp/buildroot/package/pkg-generic.mk
index d545cf6c..a689dde4 100644
--- a/bsp/buildroot/package/pkg-generic.mk
+++ b/bsp/buildroot/package/pkg-generic.mk
@@ -57,36 +57,43 @@ GLOBAL_INSTRUMENTATION_HOOKS += step_time
 
 # Hooks to collect statistics about installed files
 
-# This hook will be called before the target installation of a
-# package. We store in a file named .br_filelist_before the list of
-# files currently installed in the target. Note that the MD5 is also
-# stored, in order to identify if the files are overwritten.
-define step_pkg_size_start
-	(cd $(TARGET_DIR) ; find . -type f -print0 | xargs -0 md5sum) | sort > \
-		$($(PKG)_DIR)/.br_filelist_before
-endef
-
-# This hook will be called after the target installation of a
-# package. We store in a file named .br_filelist_after the list of
-# files (and their MD5) currently installed in the target. We then do
-# a diff with the .br_filelist_before to compute the list of files
-# installed by this package.
-define step_pkg_size_end
-	(cd $(TARGET_DIR); find . -type f -print0 | xargs -0 md5sum) | sort > \
-		$($(PKG)_DIR)/.br_filelist_after
-	comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \
-		while read hash file ; do \
-			echo "$(1),$${file}" >> $(BUILD_DIR)/packages-file-list.txt ; \
-		done
+# The suffix is typically empty for the target variant, for legacy backward
+# compatibility.
+# $(1): package name
+# $(2): base directory to search in
+# $(3): suffix of file  (optional)
+define step_pkg_size_inner
+	@touch $(BUILD_DIR)/packages-file-list$(3).txt
+	$(SED) '/^$(1),/d' $(BUILD_DIR)/packages-file-list$(3).txt
+	cd $(2); \
+	find . \( -type f -o -type l \) \
+		-newer $($(PKG)_DIR)/.stamp_built \
+		-exec printf '$(1),%s\n' {} + \
+		>> $(BUILD_DIR)/packages-file-list$(3).txt
 endef
 
 define step_pkg_size
 	$(if $(filter install-target,$(2)),\
-		$(if $(filter start,$(1)),$(call step_pkg_size_start,$(3))) \
-		$(if $(filter end,$(1)),$(call step_pkg_size_end,$(3))))
+		$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(TARGET_DIR))))
+	$(if $(filter install-staging,$(2)),\
+		$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(STAGING_DIR),-staging)))
+	$(if $(filter install-host,$(2)),\
+		$(if $(filter end,$(1)),$(call step_pkg_size_inner,$(3),$(HOST_DIR),-host)))
 endef
 GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size
 
+# Relies on step_pkg_size, so must be after
+define check_bin_arch
+	$(if $(filter end-install-target,$(1)-$(2)),\
+		support/scripts/check-bin-arch -p $(3) \
+			-l $(BUILD_DIR)/packages-file-list.txt \
+			$(foreach i,$($(PKG)_BIN_ARCH_EXCLUDE),-i "$(i)") \
+			-r $(TARGET_READELF) \
+			-a $(BR2_READELF_ARCH_NAME))
+endef
+
+GLOBAL_INSTRUMENTATION_HOOKS += check_bin_arch
+
 # This hook checks that host packages that need libraries that we build
 # have a proper DT_RPATH or DT_RUNPATH tag
 define check_host_rpath
@@ -421,10 +428,10 @@ ifdef $(3)_OVERRIDE_SRCDIR
   $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR)
 endif
 
-$(2)_BASE_NAME	= $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1))
-$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME))
-$(2)_DL_DIR	=  $$(DL_DIR)/$$($(2)_BASE_NAME)
-$(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASE_NAME)
+$(2)_BASENAME	= $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1))
+$(2)_BASENAME_RAW = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME))
+$(2)_DL_DIR	=  $$(DL_DIR)
+$(2)_DIR	=  $$(BUILD_DIR)/$$($(2)_BASENAME)
 
 ifndef $(2)_SUBDIR
  ifdef $(3)_SUBDIR
@@ -453,7 +460,7 @@ ifndef $(2)_SOURCE
  ifdef $(3)_SOURCE
   $(2)_SOURCE = $$($(3)_SOURCE)
  else ifdef $(2)_VERSION
-  $(2)_SOURCE			?= $$($(2)_RAW_BASE_NAME).tar.gz
+  $(2)_SOURCE			?= $$($(2)_BASENAME_RAW).tar.gz
  endif
 endif
 
@@ -503,6 +510,9 @@ ifeq ($$($(2)_SITE_METHOD),local)
 ifeq ($$($(2)_OVERRIDE_SRCDIR),)
 $(2)_OVERRIDE_SRCDIR = $$($(2)_SITE)
 endif
+ifeq ($$($(2)_OVERRIDE_SRCDIR),)
+$$(error $(1) has local site method, but `$(2)_SITE` is not defined)
+endif
 endif
 
 ifndef $(2)_LICENSE
@@ -527,15 +537,18 @@ endif
 
 $(2)_REDISTRIBUTE		?= YES
 
-$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME)
+$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_BASENAME_RAW)
 
 # When a target package is a toolchain dependency set this variable to
 # 'NO' so the 'toolchain' dependency is not added to prevent a circular
-# dependency
+# dependency.
+# Similarly for the skeleton.
 $(2)_ADD_TOOLCHAIN_DEPENDENCY	?= YES
+$(2)_ADD_SKELETON_DEPENDENCY	?= YES
+
 
 ifeq ($(4),target)
-ifneq ($(1),skeleton)
+ifeq ($$($(2)_ADD_SKELETON_DEPENDENCY),YES)
 $(2)_DEPENDENCIES += skeleton
 endif
 ifeq ($$($(2)_ADD_TOOLCHAIN_DEPENDENCY),YES)
@@ -598,6 +611,8 @@ $(2)_POST_INSTALL_IMAGES_HOOKS  ?=
 $(2)_PRE_LEGAL_INFO_HOOKS       ?=
 $(2)_POST_LEGAL_INFO_HOOKS      ?=
 $(2)_TARGET_FINALIZE_HOOKS      ?=
+$(2)_ROOTFS_PRE_CMD_HOOKS       ?=
+$(2)_ROOTFS_POST_CMD_HOOKS      ?=
 
 # human-friendly targets and target sequencing
 $(1):			$(1)-install
@@ -631,7 +646,7 @@ else
 $(1)-install-images:
 endif
 
-$(1)-install-host:      	$$($(2)_TARGET_INSTALL_HOST)
+$(1)-install-host:		$$($(2)_TARGET_INSTALL_HOST)
 $$($(2)_TARGET_INSTALL_HOST):	$$($(2)_TARGET_BUILD)
 
 $(1)-build:		$$($(2)_TARGET_BUILD)
@@ -683,10 +698,6 @@ $(1)-legal-source:	$$($(2)_TARGET_ACTUAL_SOURCE)
 endif # actual sources != sources
 endif # actual sources != ""
 
-$(1)-source-check: PKG=$(2)
-$(1)-source-check:
-	$$(foreach p,$$($(2)_ALL_DOWNLOADS),$$(call SOURCE_CHECK,$$(p))$$(sep))
-
 $(1)-external-deps:
 	@for p in $$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS) ; do \
 		echo `basename $$$$p` ; \
@@ -711,9 +722,6 @@ $(1)-rsync:		$$($(2)_TARGET_RSYNC)
 $(1)-source:
 $(1)-legal-source:
 
-$(1)-source-check:
-	test -d $$($(2)_OVERRIDE_SRCDIR)
-
 $(1)-external-deps:
 	@echo "file://$$($(2)_OVERRIDE_SRCDIR)"
 endif
@@ -727,6 +735,9 @@ $(1)-show-depends:
 $(1)-show-rdepends:
 			@echo $$($(2)_RDEPENDENCIES)
 
+$(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES))
+	$$(info $(1))
+
 $(1)-graph-depends: graph-depends-requirements
 	$(call pkg-graph-depends,$(1),--direct)
 
@@ -736,9 +747,6 @@ $(1)-graph-rdepends: graph-depends-requirements
 $(1)-all-source:	$(1)-source
 $(1)-all-source:	$$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source)
 
-$(1)-all-source-check:	$(1)-source-check
-$(1)-all-source-check:	$$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source-check)
-
 $(1)-all-external-deps:	$(1)-external-deps
 $(1)-all-external-deps:	$$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-external-deps)
 
@@ -766,8 +774,6 @@ $(1)-rebuild:		$(1)-clean-for-rebuild $(1)
 $(1)-clean-for-reconfigure: $(1)-clean-for-rebuild
 			rm -f $$($(2)_TARGET_CONFIGURE)
 
-$(1)-rebuild-depends:	$$(foreach p,$$($(2)_FINAL_DEPENDENCIES),$$(p)-clean-for-rebuild) $(1)-rebuild
-
 $(1)-reconfigure:	$(1)-clean-for-reconfigure $(1)
 
 # define the PKG variable for all targets, containing the
@@ -823,7 +829,9 @@ endif
 endif
 
 # legal-info: produce legally relevant info.
+$(1)-legal-info: PKG=$(2)
 $(1)-legal-info:
+	@$$(call MESSAGE,"Collecting legal info")
 # Packages without a source are assumed to be part of Buildroot, skip them.
 	$$(foreach hook,$$($(2)_PRE_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep))
 ifneq ($$(call qstrip,$$($(2)_SOURCE)),)
@@ -835,9 +843,9 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),)
 # is that the license still applies to the files distributed as part
 # of the rootfs, even if the sources are not themselves redistributed.
 ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),)
-	@$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined))
+	$(Q)$$(call legal-warning-pkg,$$($(2)_BASENAME_RAW),cannot save license ($(2)_LICENSE_FILES not defined))
 else
-	@$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAW_BASE_NAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))
+	$(Q)$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$($(2)_BASENAME_RAW),$$($(2)_PKGDIR),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))
 endif # license files
 
 ifeq ($$($(2)_SITE_METHOD),local)
@@ -914,6 +922,8 @@ ifneq ($$($(2)_USERS),)
 PACKAGES_USERS += $$($(2)_USERS)$$(sep)
 endif
 TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS)
+ROOTFS_PRE_CMD_HOOKS += $$($(2)_ROOTFS_PRE_CMD_HOOKS)
+ROOTFS_POST_CMD_HOOKS += $$($(2)_ROOTFS_POST_CMD_HOOKS)
 
 ifeq ($$($(2)_SITE_METHOD),svn)
 DL_TOOLS_DEPENDENCIES += svn
@@ -936,7 +946,6 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
 	$(1)-all-external-deps \
 	$(1)-all-legal-info \
 	$(1)-all-source \
-	$(1)-all-source-check \
 	$(1)-build \
 	$(1)-clean-for-rebuild \
 	$(1)-clean-for-reconfigure \
@@ -961,8 +970,7 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE))
 	$(1)-rsync \
 	$(1)-show-depends \
 	$(1)-show-version \
-	$(1)-source \
-	$(1)-source-check
+	$(1)-source
 
 ifneq ($$($(2)_SOURCE),)
 ifeq ($$($(2)_SITE),)
diff --git a/bsp/buildroot/package/pkg-kernel-module.mk b/bsp/buildroot/package/pkg-kernel-module.mk
index 200c91df..fcd6b8bc 100644
--- a/bsp/buildroot/package/pkg-kernel-module.mk
+++ b/bsp/buildroot/package/pkg-kernel-module.mk
@@ -25,7 +25,7 @@
 #
 #   $(eval $(kernel-module))
 #   define FOO_MOD_TWEAK
-#   	# do something
+#       # do something
 #   endef
 #   FOO_POST_BUILD_HOOKS += FOO_MOD_TWEAK
 #   $(eval $(generic-package))
diff --git a/bsp/buildroot/package/pkg-luarocks.mk b/bsp/buildroot/package/pkg-luarocks.mk
index da5c912c..d7628671 100644
--- a/bsp/buildroot/package/pkg-luarocks.mk
+++ b/bsp/buildroot/package/pkg-luarocks.mk
@@ -34,9 +34,10 @@
 define inner-luarocks-package
 
 $(2)_BUILD_OPTS		?=
-$(2)_SUBDIR		?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//")
-$(2)_ROCKSPEC		?= $(1)-$$($(3)_VERSION).rockspec
-$(2)_SOURCE		?= $(1)-$$($(3)_VERSION).src.rock
+$(2)_NAME_UPSTREAM	?= $(1)
+$(2)_SUBDIR		?= $$($(2)_NAME_UPSTREAM)-$$(shell echo "$$($(2)_VERSION)" | sed -e "s/-[0-9]$$$$//")
+$(2)_ROCKSPEC		?= $$(call LOWERCASE,$$($(2)_NAME_UPSTREAM))-$$($(2)_VERSION).rockspec
+$(2)_SOURCE		?= $$(call LOWERCASE,$$($(2)_NAME_UPSTREAM))-$$($(2)_VERSION).src.rock
 $(2)_SITE		?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
 
 # Since we do not support host-luarocks-package, we know this is
@@ -44,12 +45,15 @@ $(2)_SITE		?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR))
 $(2)_DEPENDENCIES	+= host-luarocks luainterpreter
 
 #
-# Extract step
+# Extract step. Extract into a temporary dir and move the relevant part to the
+# source dir.
 #
 ifndef $(2)_EXTRACT_CMDS
 define $(2)_EXTRACT_CMDS
-	cd $$($(2)_DIR)/.. && \
+	mkdir -p $$($(2)_DIR)/luarocks-extract
+	cd $$($(2)_DIR)/luarocks-extract && \
 		$$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$(DL_DIR)/$$($(2)_SOURCE)
+	mv $$($(2)_DIR)/luarocks-extract/*/* $$($(2)_DIR)
 endef
 endif
 
diff --git a/bsp/buildroot/package/pkg-perl.mk b/bsp/buildroot/package/pkg-perl.mk
index cc94cd9f..b0d5789a 100644
--- a/bsp/buildroot/package/pkg-perl.mk
+++ b/bsp/buildroot/package/pkg-perl.mk
@@ -20,7 +20,7 @@
 ################################################################################
 
 PERL_ARCHNAME = $(ARCH)-linux
-PERL_RUN = PERL5LIB= PERL_USE_UNSAFE_INC=1 $(HOST_DIR)/usr/bin/perl
+PERL_RUN = PERL5LIB= PERL_USE_UNSAFE_INC=1 $(HOST_DIR)/bin/perl
 
 ################################################################################
 # inner-perl-package -- defines how the configuration, compilation and
diff --git a/bsp/buildroot/package/pkg-python.mk b/bsp/buildroot/package/pkg-python.mk
index 52c33f87..f57e486d 100644
--- a/bsp/buildroot/package/pkg-python.mk
+++ b/bsp/buildroot/package/pkg-python.mk
@@ -20,6 +20,10 @@
 #
 ################################################################################
 
+define PKG_PYTHON_SYSCONFIGDATA_NAME
+$(basename $(notdir $(wildcard $(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/_sysconfigdata_m_linux_*.py)))
+endef
+
 # Target distutils-based packages
 PKG_PYTHON_DISTUTILS_ENV = \
 	PATH=$(BR_PATH) \
@@ -29,6 +33,7 @@ PKG_PYTHON_DISTUTILS_ENV = \
 	LDSHARED="$(TARGET_CROSS)gcc -shared" \
 	PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
 	PYTHONNOUSERSITE=1 \
+	_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
 	_python_sysroot=$(STAGING_DIR) \
 	_python_prefix=/usr \
 	_python_exec_prefix=/usr
@@ -48,10 +53,11 @@ HOST_PKG_PYTHON_DISTUTILS_ENV = \
 	PYTHONNOUSERSITE=1
 
 HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
-	--prefix=$(HOST_DIR)/usr
+	--prefix=$(HOST_DIR)
 
 # Target setuptools-based packages
 PKG_PYTHON_SETUPTOOLS_ENV = \
+	_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
 	PATH=$(BR_PATH) \
 	PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
 	PYTHONNOUSERSITE=1 \
@@ -77,7 +83,7 @@ HOST_PKG_PYTHON_SETUPTOOLS_ENV = \
 	PYTHONNOUSERSITE=1
 
 HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \
-	--prefix=$(HOST_DIR)/usr
+	--prefix=$(HOST_DIR)
 
 ################################################################################
 # inner-python-package -- defines how the configuration, compilation
@@ -198,12 +204,12 @@ endif
 #   - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON.
 #
 ifeq ($(4),target)
-$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/python
+$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python
 else
 ifeq ($$($(2)_NEEDS_HOST_PYTHON),)
-$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/python
+$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/python
 else
-$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/$$($(2)_NEEDS_HOST_PYTHON)
+$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/bin/$$($(2)_NEEDS_HOST_PYTHON)
 endif
 endif
 
diff --git a/bsp/buildroot/package/pkg-rebar.mk b/bsp/buildroot/package/pkg-rebar.mk
index 7605a64a..e2b4a586 100644
--- a/bsp/buildroot/package/pkg-rebar.mk
+++ b/bsp/buildroot/package/pkg-rebar.mk
@@ -25,14 +25,14 @@
 # infrastructure tells rebar to NOT download dependencies during
 # the build stage.
 #
-REBAR_HOST_DEPS_DIR = $(HOST_DIR)/usr/share/rebar/deps
+REBAR_HOST_DEPS_DIR = $(HOST_DIR)/share/rebar/deps
 REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps
 
 # Tell rebar where to find the dependencies
 #
 REBAR_HOST_DEPS_ENV = \
 	ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \
-	ERL_EI_LIBDIR=$(HOST_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib
+	ERL_EI_LIBDIR=$(HOST_DIR)/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib
 REBAR_TARGET_DEPS_ENV = \
 	ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \
 	ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib
@@ -44,7 +44,7 @@ REBAR_TARGET_DEPS_ENV = \
 # Install an Erlang application from $(@D).
 #
 # i.e., define a recipe that installs the "bin ebin priv $(2)" directories
-# from $(@D) to $(1)$($(PKG)_ERLANG_LIBDIR).
+# from $(@D) to $(1)/$($(PKG)_ERLANG_LIBDIR).
 #
 #  argument 1 should typically be $(HOST_DIR), $(TARGET_DIR),
 #	      or $(STAGING_DIR).
@@ -59,7 +59,7 @@ define install-erlang-directories
 	$(INSTALL) -d $(1)/$($(PKG)_ERLANG_LIBDIR)
 	for dir in bin ebin priv $(2); do                               \
 		if test -d $(@D)/$$dir; then                            \
-			cp -r $(@D)/$$dir $(1)$($(PKG)_ERLANG_LIBDIR);  \
+			cp -r $(@D)/$$dir $(1)/$($(PKG)_ERLANG_LIBDIR); \
 		fi;                                                     \
 	done
 endef
@@ -119,10 +119,10 @@ define inner-rebar-package
 $(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1))))
 
 # Path where to store the package's libs, relative to either $(HOST_DIR)
-# for host packages, or $(STAGING_DIR) for target packages.
+# for host packages, or $(STAGING_DIR)/usr for target packages.
 #
 $(2)_ERLANG_LIBDIR = \
-	/usr/lib/erlang/lib/$$($$(PKG)_ERLANG_APP)-$$($$(PKG)_VERSION)
+	lib/erlang/lib/$$($$(PKG)_ERLANG_APP)-$$($$(PKG)_VERSION)
 
 # If a host package, inherit <pkg>_USE_BUNDLED_REBAR from the target
 # package, if not explicitly defined. Otherwise, default to NO.
@@ -173,8 +173,8 @@ endif
 # package-related variables
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
-	$$(call install-erlang-directories,$$(STAGING_DIR),include)
-	$$(call install-rebar-deps,$$(STAGING_DIR),TARGET)
+	$$(call install-erlang-directories,$$(STAGING_DIR)/usr,include)
+	$$(call install-rebar-deps,$$(STAGING_DIR)/usr,TARGET)
 endef
 endif
 
@@ -182,7 +182,7 @@ endif
 # package-related variables
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
-	$$(call install-erlang-directories,$$(TARGET_DIR))
+	$$(call install-erlang-directories,$$(TARGET_DIR)/usr)
 endef
 endif
 
diff --git a/bsp/buildroot/package/pkg-utils.mk b/bsp/buildroot/package/pkg-utils.mk
index c95e7795..c3acc22b 100644
--- a/bsp/buildroot/package/pkg-utils.mk
+++ b/bsp/buildroot/package/pkg-utils.mk
@@ -83,7 +83,15 @@ define legal-manifest # pkg, version, license, license-files, source, url, {HOST
 	echo '"$(1)","$(2)","$(3)","$(4)","$(5)","$(6)"' >>$(LEGAL_MANIFEST_CSV_$(7))
 endef
 
-define legal-license-file # pkg, filename, file-fullpath, {HOST|TARGET}
-	mkdir -p $(LICENSE_FILES_DIR_$(4))/$(1)/$(dir $(2)) && \
-	cp $(3) $(LICENSE_FILES_DIR_$(4))/$(1)/$(2)
+define legal-license-file # pkgname, pkgname-pkgver, pkgdir, filename, file-fullpath, {HOST|TARGET}
+	mkdir -p $(LICENSE_FILES_DIR_$(6))/$(2)/$(dir $(4)) && \
+	{ \
+		if [ -f $(3)/$($(PKG)_VERSION)/$(1).hash ]; then \
+			support/download/check-hash $(3)/$($(PKG)_VERSION)/$(1).hash $(5) $(4); \
+		else \
+			support/download/check-hash $(3)/$(1).hash $(5) $(4); \
+		fi; \
+		case $${?} in (0|3) ;; (*) exit 1;; esac; \
+	} && \
+	cp $(5) $(LICENSE_FILES_DIR_$(6))/$(2)/$(4)
 endef
diff --git a/bsp/buildroot/package/pkg-virtual.mk b/bsp/buildroot/package/pkg-virtual.mk
index 2e83e077..05bd63eb 100644
--- a/bsp/buildroot/package/pkg-virtual.mk
+++ b/bsp/buildroot/package/pkg-virtual.mk
@@ -41,6 +41,11 @@ $$(error No implementation selected for virtual package $(1). Configuration erro
 endif
 endif
 
+# explicitly set these so we do not get confused by environment
+# variables with the same names.
+$(2)_VERSION =
+$(2)_SOURCE =
+
 $(2)_IS_VIRTUAL = YES
 
 # Add dependency against the provider
@@ -49,7 +54,13 @@ $(2)_IS_VIRTUAL = YES
 ifeq ($(4),target)
 $(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2)))
 else
+ifeq ($$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))),)
+# Inherit from target package BR2_PACKAGE_PROVIDES_FOO
 $(2)_DEPENDENCIES += host-$$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(3)))
+else
+# BR2_PACKAGE_PROVIDES_HOST_<pkg> is explicitly defined
+$(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2)))
+endif
 endif
 
 # Call the generic package infrastructure to generate the necessary
diff --git a/bsp/buildroot/package/pkg-waf.mk b/bsp/buildroot/package/pkg-waf.mk
index 2cdd654b..e5b606f0 100644
--- a/bsp/buildroot/package/pkg-waf.mk
+++ b/bsp/buildroot/package/pkg-waf.mk
@@ -44,14 +44,14 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO
 # If the package does not have its own waf, use our own.
 ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES)
 $(2)_DEPENDENCIES += host-waf
-$(2)_WAF = $(HOST_DIR)/usr/bin/waf
+$(2)_WAF = $(HOST_DIR)/bin/waf
 else
 $(2)_WAF = ./waf
 endif
 
-$(2)_BUILD_OPTS 			?=
-$(2)_INSTALL_STAGING_OPTS 		?=
-$(2)_INSTALL_TARGET_OPTS 		?=
+$(2)_BUILD_OPTS				?=
+$(2)_INSTALL_STAGING_OPTS		?=
+$(2)_INSTALL_TARGET_OPTS		?=
 $(2)_WAF_OPTS				?=
 
 #
@@ -63,7 +63,7 @@ define $(2)_CONFIGURE_CMDS
 	cd $$(@D) && \
 	$$(TARGET_CONFIGURE_OPTS) \
 	$$($(2)_CONF_ENV) \
-	$$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) configure \
+	$$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \
 		--prefix=/usr \
 		--libdir=/usr/lib \
 		$$($(2)_CONF_OPTS) \
@@ -78,7 +78,7 @@ endif
 ifndef $(2)_BUILD_CMDS
 define $(2)_BUILD_CMDS
 	cd $$(@D) && \
-	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \
+	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
 		build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \
 		$$($(2)_WAF_OPTS)
 endef
@@ -91,7 +91,7 @@ endif
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
 	cd $$(@D) && \
-	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \
+	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
 		install --destdir=$$(STAGING_DIR) \
 		$$($(2)_INSTALL_STAGING_OPTS) \
 		$$($(2)_WAF_OPTS)
@@ -105,7 +105,7 @@ endif
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
 	cd $$(@D) && \
-	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \
+	$$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
 		install --destdir=$$(TARGET_DIR) \
 		$$($(2)_INSTALL_TARGET_OPTS) \
 		$$($(2)_WAF_OPTS)
diff --git a/bsp/buildroot/package/pkgconf/Config.in b/bsp/buildroot/package/pkgconf/Config.in
index 9d5d9ab1..76fa394c 100644
--- a/bsp/buildroot/package/pkgconf/Config.in
+++ b/bsp/buildroot/package/pkgconf/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_PKGCONF
 	bool "pkgconf"
 	help
-	  pkgconf is a program which helps to configure compiler and linker
-	  flags for development frameworks. It is similar to pkg-config,
-	  but was written from scratch in the summer of 2011 to replace
-	  pkg-config, which now needs itself to build itself
+	  pkgconf is a program which helps to configure compiler and
+	  linker flags for development frameworks. It is similar to
+	  pkg-config, but was written from scratch in the summer of
+	  2011 to replace pkg-config, which now needs itself to build
+	  itself
 
 	  https://github.com/pkgconf/pkgconf
diff --git a/bsp/buildroot/package/pkgconf/Config.in.host b/bsp/buildroot/package/pkgconf/Config.in.host
new file mode 100644
index 00000000..56836a5c
--- /dev/null
+++ b/bsp/buildroot/package/pkgconf/Config.in.host
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_HOST_PKGCONF
+	bool "host pkgconf"
+	help
+	  pkgconf is a program which helps to configure compiler and
+	  linker flags for development frameworks. It is similar to
+	  pkg-config, but was written from scratch in the summer of
+	  2011 to replace pkg-config, which now needs itself to build
+	  itself
+
+	  https://github.com/pkgconf/pkgconf
diff --git a/bsp/buildroot/package/pkgconf/pkg-config.in b/bsp/buildroot/package/pkgconf/pkg-config.in
index 4dec4878..99c0add8 100644
--- a/bsp/buildroot/package/pkgconf/pkg-config.in
+++ b/bsp/buildroot/package/pkgconf/pkg-config.in
@@ -1,2 +1,5 @@
 #!/bin/sh
-PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-@PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} $(dirname $0)/pkgconf @STATIC@ $@
+PKGCONFDIR=$(dirname $0)
+DEFAULT_PKG_CONFIG_LIBDIR=${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/lib/pkgconfig:${PKGCONFDIR}/../@STAGING_SUBDIR@/usr/share/pkgconfig
+DEFAULT_PKG_CONFIG_SYSROOT_DIR=${PKGCONFDIR}/../@STAGING_SUBDIR@
+PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-${DEFAULT_PKG_CONFIG_LIBDIR}} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-${DEFAULT_PKG_CONFIG_SYSROOT_DIR}} exec ${PKGCONFDIR}/pkgconf @STATIC@ "$@"
diff --git a/bsp/buildroot/package/pkgconf/pkgconf.mk b/bsp/buildroot/package/pkgconf/pkgconf.mk
index c8b0cbaf..00b2d017 100644
--- a/bsp/buildroot/package/pkgconf/pkgconf.mk
+++ b/bsp/buildroot/package/pkgconf/pkgconf.mk
@@ -10,7 +10,7 @@ PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2
 PKGCONF_LICENSE = pkgconf license
 PKGCONF_LICENSE_FILES = COPYING
 
-PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config
+PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/bin/pkg-config
 
 define PKGCONF_LINK_PKGCONFIG
 	ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config
@@ -18,18 +18,17 @@ endef
 
 define HOST_PKGCONF_INSTALL_WRAPPER
 	$(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \
-		$(HOST_DIR)/usr/bin/pkg-config
-	$(SED) 's,@PKG_CONFIG_LIBDIR@,$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig,' \
-		-e 's,@STAGING_DIR@,$(STAGING_DIR),' \
-		$(HOST_DIR)/usr/bin/pkg-config
+		$(HOST_DIR)/bin/pkg-config
+	$(SED) 's,@STAGING_SUBDIR@,$(STAGING_SUBDIR),g' \
+		$(HOST_DIR)/bin/pkg-config
 endef
 
 define HOST_PKGCONF_STATIC
-	$(SED) 's,@STATIC@,--static,' $(HOST_DIR)/usr/bin/pkg-config
+	$(SED) 's,@STATIC@,--static,' $(HOST_DIR)/bin/pkg-config
 endef
 
 define HOST_PKGCONF_SHARED
-	$(SED) 's,@STATIC@,,' $(HOST_DIR)/usr/bin/pkg-config
+	$(SED) 's,@STATIC@,,' $(HOST_DIR)/bin/pkg-config
 endef
 
 PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG
diff --git a/bsp/buildroot/package/pngquant/Config.in b/bsp/buildroot/package/pngquant/Config.in
new file mode 100644
index 00000000..c63f0f9d
--- /dev/null
+++ b/bsp/buildroot/package/pngquant/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PNGQUANT
+	bool "pngquant"
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_ZLIB
+	help
+	  Lossy PNG compressor — pngquant command and libimagequant
+	  library
+
+	  https://pngquant.org
diff --git a/bsp/buildroot/package/pngquant/pngquant.hash b/bsp/buildroot/package/pngquant/pngquant.hash
new file mode 100644
index 00000000..a3f1005d
--- /dev/null
+++ b/bsp/buildroot/package/pngquant/pngquant.hash
@@ -0,0 +1,4 @@
+# From https://pngquant.org/releases.html
+sha1 30f54b0731b8913a8c8b3bd1fdf53e1c68b12262  pngquant-2.10.1-src.tar.gz
+# Locally computed
+sha256 e07a21fe37b6ae9fa5524f1e20a8e73b698566d42d2cc3edd469531745faa850  pngquant-2.10.1-src.tar.gz
diff --git a/bsp/buildroot/package/pngquant/pngquant.mk b/bsp/buildroot/package/pngquant/pngquant.mk
new file mode 100644
index 00000000..1ce8359d
--- /dev/null
+++ b/bsp/buildroot/package/pngquant/pngquant.mk
@@ -0,0 +1,55 @@
+################################################################################
+#
+# pngquant
+#
+################################################################################
+
+PNGQUANT_VERSION = 2.10.1
+PNGQUANT_SOURCE = pngquant-$(PNGQUANT_VERSION)-src.tar.gz
+PNGQUANT_SITE = https://pngquant.org
+PNGQUANT_LICENSE = GPL-3.0+
+PNGQUANT_LICENSE_FILES = COPYRIGHT
+HOST_PNGQUANT_DEPENDENCIES = host-libpng
+PNGQUANT_DEPENDENCIES = libpng
+
+ifeq ($(BR2_PACKAGE_LCMS2),y)
+PNGQUANT_DEPENDENCIES += lcms2
+endif
+
+define PNGQUANT_CONFIGURE_CMDS
+	(cd $(@D) && \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure --prefix=/usr \
+		$(if $(BR2_PACKAGE_LCMS2),--with-lcms2,--without-lcms2) \
+		$(if $(BR2_X86_CPU_HAS_SSE),--enable-sse,--disable-sse) \
+		$(TARGET_CONFIGURE_OPTS) \
+	)
+endef
+
+define PNGQUANT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define PNGQUANT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
+endef
+
+define HOST_PNGQUANT_CONFIGURE_CMDS
+	(cd $(@D) && \
+		$(HOST_CONFIGURE_OPTS) \
+		CC=$(HOSTCC_NOCCACHE) \
+		./configure --prefix=$(HOST_DIR) \
+		--without-lcms2 \
+	)
+endef
+
+define HOST_PNGQUANT_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_PNGQUANT_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(host-generic-package))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/poco/Config.in b/bsp/buildroot/package/poco/Config.in
index b3b247f9..9199b54f 100644
--- a/bsp/buildroot/package/poco/Config.in
+++ b/bsp/buildroot/package/poco/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_POCO
 	bool "poco"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	# pthread_condattr_setclock
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on !BR2_STATIC_LIBS # dlopen()
 	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
 		|| BR2_or1k || BR2_xtensa)
@@ -61,8 +62,8 @@ config BR2_PACKAGE_POCO_DATA_MYSQL
 
 endif # BR2_PACKAGE_POCO
 
-comment "poco needs a toolchain w/ wchar, threads, C++, dynamic library"
+comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library"
 	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 	depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \
 		|| BR2_or1k || BR2_xtensa)
diff --git a/bsp/buildroot/package/poco/poco.hash b/bsp/buildroot/package/poco/poco.hash
index 1730f1c2..0c0266f4 100644
--- a/bsp/buildroot/package/poco/poco.hash
+++ b/bsp/buildroot/package/poco/poco.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  cfd311ecbc9e58accf1c4ea70170af88f92f88e73dd14944e528e7f6229e6cab  poco-poco-1.7.2-release.tar.gz
-sha256  32182791e7eac00ba367d2f22dd1dd5bfce0b6d6f76fd52f853364f98402dda3  30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch
+sha256  43cc469c01d1f799efc51e2bfde6ffdf467b98a8a0901e6b33db86958619b3af  poco-poco-1.8.1-release.tar.gz
+sha256  c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5  LICENSE
diff --git a/bsp/buildroot/package/poco/poco.mk b/bsp/buildroot/package/poco/poco.mk
index 90dfb343..3dddb435 100644
--- a/bsp/buildroot/package/poco/poco.mk
+++ b/bsp/buildroot/package/poco/poco.mk
@@ -4,32 +4,31 @@
 #
 ################################################################################
 
-POCO_VERSION = poco-1.7.2-release
+POCO_VERSION = poco-1.8.1-release
 POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION))
-POCO_LICENSE = Boost-v1.0
+POCO_LICENSE = BSL-1.0
 POCO_LICENSE_FILES = LICENSE
 POCO_INSTALL_STAGING = YES
-POCO_PATCH = https://github.com/pocoproject/poco/commit/30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch
 
-POCO_DEPENDENCIES = zlib pcre					\
-	$(if $(BR2_PACKAGE_POCO_XML),expat)			\
-	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl)		\
-	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl)	\
-	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite)		\
+POCO_DEPENDENCIES = zlib pcre \
+	$(if $(BR2_PACKAGE_POCO_XML),expat) \
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \
+	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \
 	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql)
 
-POCO_OMIT = Data/ODBC PageCompiler					\
-	$(if $(BR2_PACKAGE_POCO_XML),,XML)				\
-	$(if $(BR2_PACKAGE_POCO_UTIL),,Util)				\
-	$(if $(BR2_PACKAGE_POCO_NET),,Net)				\
-	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL)	\
-	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto)			\
-	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip)				\
-	$(if $(BR2_PACKAGE_POCO_DATA),,Data)				\
-	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL)		\
+POCO_OMIT = Data/ODBC PageCompiler \
+	$(if $(BR2_PACKAGE_POCO_XML),,XML) \
+	$(if $(BR2_PACKAGE_POCO_UTIL),,Util) \
+	$(if $(BR2_PACKAGE_POCO_NET),,Net) \
+	$(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \
+	$(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \
+	$(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \
+	$(if $(BR2_PACKAGE_POCO_DATA),,Data) \
+	$(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \
 	$(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite)
 
-ifeq ($(LIBC),uclibc)
+ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
 POCO_CONF_OPTS += --no-fpenvironment --no-wstring
 endif
 
@@ -48,12 +47,12 @@ endif
 
 define POCO_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_MAKE_ENV) ./configure \
-		--config=Linux		\
-		--prefix=/usr		\
-		--omit="$(POCO_OMIT)"	\
-		$(POCO_CONF_OPTS)	\
-		--unbundled		\
-		--no-tests		\
+		--config=Linux \
+		--prefix=/usr \
+		--omit="$(POCO_OMIT)" \
+		$(POCO_CONF_OPTS) \
+		--unbundled \
+		--no-tests \
 		--no-samples)
 endef
 
diff --git a/bsp/buildroot/package/polarssl/0001-no-test-suite.patch b/bsp/buildroot/package/polarssl/0001-no-test-suite.patch
deleted file mode 100644
index 4c8552a9..00000000
--- a/bsp/buildroot/package/polarssl/0001-no-test-suite.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Add BUILD_TESTS option to disable test suite
-
-By default, PolarSSL builds a fairly extensive test suite to validate
-the library. In the context of Buildroot, building this test suite is
-not really useful, so we add a BUILD_TESTS to disable its build.
-
-[Gustavo: update for 1.2.11]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura polarssl-1.2.11.orig/CMakeLists.txt polarssl-1.2.11/CMakeLists.txt
---- polarssl-1.2.11.orig/CMakeLists.txt	2014-07-11 17:14:43.414651327 -0300
-+++ polarssl-1.2.11/CMakeLists.txt	2014-07-11 17:23:00.573498626 -0300
-@@ -49,9 +49,11 @@
- add_subdirectory(library)
- add_subdirectory(include)
- 
--if(CMAKE_COMPILER_IS_GNUCC)
-+option(BUILD_TESTS "Build tests." ON)
-+
-+if(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS)
-   add_subdirectory(tests)
--endif(CMAKE_COMPILER_IS_GNUCC)
-+endif(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS)
- if(CMAKE_COMPILER_IS_CLANG)
-   add_subdirectory(tests)
- endif(CMAKE_COMPILER_IS_CLANG)
diff --git a/bsp/buildroot/package/polarssl/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/bsp/buildroot/package/polarssl/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
deleted file mode 100644
index d241ae26..00000000
--- a/bsp/buildroot/package/polarssl/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From a14028b0878c1ba27f7c7a6d0962874d0f7f3801 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Sun, 31 Aug 2014 11:54:37 +0200
-Subject: [PATCH 3/3] cmake: use the standard CMake flag to drive the shared
- object build
-
-If BUILD_SHARED_LIBS is set and not USE_SHARED_POLARSSL_LIBRARY, then
-drive USE_SHARED_POLARSSL_LIBRARY with the BUILD_SHARED_LIBS value.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- library/CMakeLists.txt | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
-index 27bd2e0..2ae0aba 100644
---- a/library/CMakeLists.txt
-+++ b/library/CMakeLists.txt
-@@ -1,5 +1,15 @@
--option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL static library." ON)
--option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL shared library." OFF)
-+# Use the standard CMake flag to drive the shared object build.
-+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED USE_STATIC_POLARSSL_LIBRARY AND NOT DEFINED USE_SHARED_POLARSSL_LIBRARY)
-+  set(USE_STATIC_POLARSSL_LIBRARY ON)
-+  if(BUILD_SHARED_LIBS)
-+    set(USE_SHARED_POLARSSL_LIBRARY ON)
-+  else()
-+    set(USE_SHARED_POLARSSL_LIBRARY OFF)
-+  endif()
-+else()
-+  option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL static library." ON)
-+  option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL shared library." OFF)
-+endif()
- 
- set(src
-      aes.c
--- 
-2.1.0
-
diff --git a/bsp/buildroot/package/polarssl/Config.in b/bsp/buildroot/package/polarssl/Config.in
deleted file mode 100644
index 17125a3c..00000000
--- a/bsp/buildroot/package/polarssl/Config.in
+++ /dev/null
@@ -1,32 +0,0 @@
-config BR2_PACKAGE_POLARSSL
-	bool "polarssl"
-	help
-	  PolarSSL is an SSL library written in ANSI C. PolarSSL makes
-	  it easy for developers to include cryptographic and SSL/TLS
-	  capabilities in their (embedded) products with as little
-	  hassle as possible. It is designed to be readable,
-	  documented, tested, loosely coupled and portable.
-
-	  Warning: PolarSSL is licensed under the GPL. If you want to
-	  use it in your own proprietary applications, you have to
-	  purchase a commercial license.
-
-	  https://tls.mbed.org/
-
-if BR2_PACKAGE_POLARSSL
-
-config BR2_PACKAGE_POLARSSL_PROGRAMS
-	bool "polarssl programs"
-	depends on BR2_USE_MMU # fork()
-	help
-	  This option enables the installation and the build of
-	  PolarSSL companion programs: aescrypt2, benchmark, cert_app,
-	  crl_app, crypt_and_hash, dh_client, dh_genprime, dh_server,
-	  gen_entropy, generic_sum, gen_random_ctr_drbg,
-	  gen_random_havege, hello, key_app, md5sum, mpi_demo,
-	  rsa_decrypt, rsa_encrypt, rsa_genkey, rsa_sign, rsa_verify,
-	  selftest, sha1sum, sha2sum, ssi-cgi, ssl_cert_test,
-	  ssl_client1, ssl_client2, ssl_fork_server, ssl_mail_client,
-	  ssl_server, ssl_test
-
-endif
diff --git a/bsp/buildroot/package/polarssl/polarssl.hash b/bsp/buildroot/package/polarssl/polarssl.hash
deleted file mode 100644
index 3f1871c8..00000000
--- a/bsp/buildroot/package/polarssl/polarssl.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.2.1-2.1.4-1.3.16-and-polarssl.1.2.19-released
-sha256	24cb1608a160101ead3c7240f35fc447fe7880cd60f7ed6c9db7a1d773ccd4b8	polarssl-1.2.19-gpl.tgz
diff --git a/bsp/buildroot/package/polarssl/polarssl.mk b/bsp/buildroot/package/polarssl/polarssl.mk
deleted file mode 100644
index 7f4c5827..00000000
--- a/bsp/buildroot/package/polarssl/polarssl.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-################################################################################
-#
-# polarssl
-#
-################################################################################
-
-POLARSSL_SITE = https://tls.mbed.org/code/releases
-POLARSSL_VERSION = 1.2.19
-POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz
-POLARSSL_CONF_OPTS = \
-	-DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF)
-
-POLARSSL_INSTALL_STAGING = YES
-POLARSSL_LICENSE = GPLv2
-POLARSSL_LICENSE_FILES = LICENSE
-
-define POLARSSL_DISABLE_ASM
-	$(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/include/polarssl/config.h
-endef
-
-# ARM in thumb mode breaks debugging with asm optimizations
-# Microblaze asm optimizations are broken in general
-# MIPS R6 asm is not yet supported
-ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy)
-POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM
-else ifeq ($(BR2_microblaze),y)
-POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM
-else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y)
-POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM
-endif
-
-$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/bsp/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch
index bbd6895e..3c0ddcc5 100644
--- a/bsp/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch
+++ b/bsp/buildroot/package/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch
@@ -1,3 +1,8 @@
+From 85763549c53b2907dab094163f1404b2233f8029 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Mon, 9 Oct 2017 16:51:20 -0400
+Subject: [PATCH] Add DESTDIR to setfiles
+
 The addition of this patch makes the use of DESTDIR
 mandatory as there are conditional checks which would fail if it's not
 defined.
@@ -8,124 +13,23 @@ accomodate version 2.5
 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
 Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
 Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
 ---
- policycoreutils/Makefile             | 2 +-
- policycoreutils/newrole/Makefile     | 4 ++--
- policycoreutils/restorecond/Makefile | 5 +++--
- policycoreutils/run_init/Makefile    | 4 ++--
- policycoreutils/sepolicy/Makefile    | 2 +-
- policycoreutils/sestatus/Makefile    | 2 +-
- policycoreutils/setfiles/Makefile    | 4 ++--
- 7 files changed, 12 insertions(+), 11 deletions(-)
+ setfiles/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index 962ac12..0634a2a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
- 
--INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null)
-+INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null)
- 
- ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
- 	SUBDIRS += restorecond
-diff --git a/newrole/Makefile b/newrole/Makefile
-index 646cd4d..f124a6a 100644
---- a/newrole/Makefile
-+++ b/newrole/Makefile
-@@ -4,8 +4,8 @@ BINDIR ?= $(PREFIX)/bin
- MANDIR ?= $(PREFIX)/share/man
- ETCDIR ?= $(DESTDIR)/etc
- LOCALEDIR = /usr/share/locale
--PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null)
-+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null)
- # Enable capabilities to permit newrole to generate audit records.
- # This will make newrole a setuid root program.
- # The capabilities used are: CAP_AUDIT_WRITE.
-diff --git a/restorecond/Makefile b/restorecond/Makefile
-index f99e1e7..92a4a4d 100644
---- a/restorecond/Makefile
-+++ b/restorecond/Makefile
-@@ -11,11 +11,12 @@ autostart_DATA = sealertauto.desktop
- INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
- SELINUXDIR = $(DESTDIR)/etc/selinux
- 
--DBUSFLAGS = -DHAVE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include
-+DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include
- DBUSLIB = -ldbus-glib-1 -ldbus-1
- 
- CFLAGS ?= -g -Werror -Wall -W
--override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include
-+override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \
-+-I$(DESTDIR)/usr/lib64/glib-2.0/include -I$(DESTDIR)/usr/lib/glib-2.0/include
- 
- LDLIBS += -lselinux $(DBUSLIB) -lglib-2.0 -L$(LIBDIR)
- 
-diff --git a/run_init/Makefile b/run_init/Makefile
-index 5815a08..c81179b 100644
---- a/run_init/Makefile
-+++ b/run_init/Makefile
-@@ -5,8 +5,8 @@ SBINDIR ?= $(PREFIX)/sbin
- MANDIR ?= $(PREFIX)/share/man
- ETCDIR ?= $(DESTDIR)/etc
- LOCALEDIR ?= /usr/share/locale
--PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null)
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null)
-+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null)
- 
- CFLAGS ?= -Werror -Wall -W
- override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-diff --git a/sepolicy/Makefile b/sepolicy/Makefile
-index 39d46e8..6624373 100644
---- a/sepolicy/Makefile
-+++ b/sepolicy/Makefile
-@@ -12,7 +12,7 @@ LOCALEDIR ?= /usr/share/locale
- BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions
- SHAREDIR ?= $(PREFIX)/share/sandbox
- CFLAGS ?= -Wall -Werror -Wextra -W
--override CFLAGS += -I$(PREFIX)/include -DPACKAGE="policycoreutils" -DSHARED -shared
-+override CFLAGS = $(LDFLAGS) -I$(DESTDIR)/usr/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W  -DSHARED -shared
- 
- BASHCOMPLETIONS=sepolicy-bash-completion.sh
- 
-diff --git a/sestatus/Makefile b/sestatus/Makefile
-index c04ff00..e10c32c 100644
---- a/sestatus/Makefile
-+++ b/sestatus/Makefile
-@@ -6,7 +6,7 @@ ETCDIR ?= $(DESTDIR)/etc
- LIBDIR ?= $(PREFIX)/lib
- 
- CFLAGS ?= -Werror -Wall -W
--override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64
-+override CFLAGS += -I$(DESTDIR)/usr/include -D_FILE_OFFSET_BITS=64
- LDLIBS = -lselinux -L$(LIBDIR)
- 
- all: sestatus
 diff --git a/setfiles/Makefile b/setfiles/Makefile
-index 98f4f7d..eb26ed0 100644
+index c08e2dd..36c0638 100644
 --- a/setfiles/Makefile
 +++ b/setfiles/Makefile
-@@ -3,13 +3,13 @@ PREFIX ?= $(DESTDIR)/usr
+@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
  SBINDIR ?= $(DESTDIR)/sbin
  MANDIR = $(PREFIX)/share/man
  LIBDIR ?= $(PREFIX)/lib
--AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null)
-+AUDITH = $(shell ls  $(DESTDIR)/usr/include/libaudit.h 2>/dev/null)
+-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
++AUDITH ?= $(shell test -f $(DESTDIR)/include/libaudit.h && echo y)
  
- PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }')
  ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }')
  
- CFLAGS ?= -g -Werror -Wall -W
--override CFLAGS += -I$(PREFIX)/include
-+override CFLAGS += -I$(DESTDIR)/usr/include
- LDLIBS = -lselinux -lsepol -L$(LIBDIR)
- 
- ifeq ($(AUDITH), /usr/include/libaudit.h)
 -- 
-2.7.4
+2.13.6
 
diff --git a/bsp/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/bsp/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch
index 56aae74b..32d2ae92 100644
--- a/bsp/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch
+++ b/bsp/buildroot/package/policycoreutils/0002-Add-PREFIX-to-host-paths.patch
@@ -1,6 +1,6 @@
-From 7f99a727cdb8160d49bb0d0554fc88787980c971 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Thu, 14 Jul 2016 13:16:03 -0400
+From a221304344b3f9db7e86d928cf97d77542bcf456 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Mon, 9 Oct 2017 16:47:19 -0400
 Subject: [PATCH] Add PREFIX to host paths
 
 Updates the remaining hardcoded host paths used in the build to be
@@ -11,201 +11,59 @@ Updated to work with version 2.5
 Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
 Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
 Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
 ---
- policycoreutils/Makefile              |  4 +++-
- policycoreutils/audit2allow/Makefile  |  2 +-
- policycoreutils/load_policy/Makefile  |  2 +-
- policycoreutils/mcstrans/src/Makefile | 17 +++++++++--------
- policycoreutils/newrole/Makefile      |  8 ++++----
- policycoreutils/run_init/Makefile     |  8 ++++----
- policycoreutils/sepolicy/Makefile     |  2 +-
- policycoreutils/setfiles/Makefile     |  4 ++--
- 8 files changed, 25 insertions(+), 22 deletions(-)
+ load_policy/Makefile | 2 +-
+ newrole/Makefile     | 6 +++---
+ run_init/Makefile    | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 0634a2a..bd99b1c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,10 @@
-+PREFIX  ?= $(DESTDIR)/usr
-+
- SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll
- 
- INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null)
- 
--ifeq (${INOTIFYH}, /usr/include/sys/inotify.h)
-+ifeq (${INOTIFYH}, $(PREFIX)/include/sys/inotify.h)
- 	SUBDIRS += restorecond
- endif
- 
-diff --git a/audit2allow/Makefile b/audit2allow/Makefile
-index 87d2502..d4108fe 100644
---- a/audit2allow/Makefile
-+++ b/audit2allow/Makefile
-@@ -5,7 +5,7 @@ PREFIX ?= $(DESTDIR)/usr
- BINDIR ?= $(PREFIX)/bin
- LIBDIR ?= $(PREFIX)/lib
- MANDIR ?= $(PREFIX)/share/man
--LOCALEDIR ?= /usr/share/locale
-+LOCALEDIR ?= $(PREFIX)/share/locale
- 
- all: audit2why
- 
 diff --git a/load_policy/Makefile b/load_policy/Makefile
-index 7c5bab0..5cd0bbb 100644
+index b85833c..6a45f31 100644
 --- a/load_policy/Makefile
 +++ b/load_policy/Makefile
-@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
+@@ -2,7 +2,7 @@
+ PREFIX ?= $(DESTDIR)/usr
  SBINDIR ?= $(DESTDIR)/sbin
- USRSBINDIR ?= $(PREFIX)/sbin
  MANDIR ?= $(PREFIX)/share/man
 -LOCALEDIR ?= /usr/share/locale
 +LOCALEDIR ?= $(PREFIX)/share/locale
  
  CFLAGS ?= -Werror -Wall -W
- override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
-diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile
-index 907a1f1..6fda57e 100644
---- a/mcstrans/src/Makefile
-+++ b/mcstrans/src/Makefile
-@@ -1,23 +1,24 @@
- ARCH = $(shell uname -i)
-+# Installation directories.
-+PREFIX  ?= $(DESTDIR)/usr
-+SBINDIR ?= $(DESTDIR)/sbin
-+INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
-+SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd
-+
- ifeq "$(ARCH)" "x86_64"
- 	# In case of 64 bit system, use these lines
--	LIBDIR=/usr/lib64
-+	LIBDIR=$(PREFIX)/lib64
- else 
- ifeq "$(ARCH)" "i686"
- 	# In case of 32 bit system, use these lines
--	LIBDIR=/usr/lib
-+	LIBDIR=$(PREFIX)/lib
- else
- ifeq "$(ARCH)" "i386"
- 	# In case of 32 bit system, use these lines
--	LIBDIR=/usr/lib
-+	LIBDIR=$(PREFIX)/lib
- endif
- endif
- endif
--# Installation directories.
--PREFIX  ?= $(DESTDIR)/usr
--SBINDIR ?= $(DESTDIR)/sbin
--INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
--SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd
- 
- PROG_SRC=mcstrans.c  mcscolor.c  mcstransd.c  mls_level.c
- PROG_OBJS= $(patsubst %.c,%.o,$(PROG_SRC))
+ override CFLAGS += $(LDFLAGS) -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
 diff --git a/newrole/Makefile b/newrole/Makefile
-index f124a6a..b687a09 100644
+index 196af92..896708f 100644
 --- a/newrole/Makefile
 +++ b/newrole/Makefile
-@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr
+@@ -3,9 +3,9 @@ PREFIX ?= $(DESTDIR)/usr
  BINDIR ?= $(PREFIX)/bin
  MANDIR ?= $(PREFIX)/share/man
  ETCDIR ?= $(DESTDIR)/etc
 -LOCALEDIR = /usr/share/locale
-+LOCALEDIR =  $(PREFIX)/share/locale
- PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null)
- AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null)
+-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y)
+-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
++LOCALEDIR = $(PREFIX)/share/locale
++PAMH ?= $(shell test -f $(PREFIX)/include/security/pam_appl.h && echo y)
++AUDITH ?= $(shell test -f $(PREFIX)/include/libaudit.h && echo y)
  # Enable capabilities to permit newrole to generate audit records.
-@@ -24,7 +24,7 @@ CFLAGS ?= -Werror -Wall -W
- EXTRA_OBJS =
- override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -L$(PREFIX)/lib
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h)
- 	override CFLAGS += -DUSE_PAM
- 	EXTRA_OBJS += hashtab.o
- 	LDLIBS += -lpam -lpam_misc
-@@ -32,7 +32,7 @@ else
- 	override CFLAGS += -D_XOPEN_SOURCE=500
- 	LDLIBS += -lcrypt
- endif
--ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h)
- 	override CFLAGS += -DUSE_AUDIT
- 	LDLIBS += -laudit
- endif
-@@ -66,7 +66,7 @@ install: all
- 	test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1
- 	install -m $(MODE) newrole $(BINDIR)
- 	install -m 644 newrole.1 $(MANDIR)/man1/
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h)
- 	test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d
- ifeq ($(LSPP_PRIV),y)
- 	install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole
+ # This will make newrole a setuid root program.
+ # The capabilities used are: CAP_AUDIT_WRITE.
 diff --git a/run_init/Makefile b/run_init/Makefile
-index c81179b..ce0df9f 100644
+index 921f0b0..e1566fc 100644
 --- a/run_init/Makefile
 +++ b/run_init/Makefile
-@@ -4,21 +4,21 @@ PREFIX ?= $(DESTDIR)/usr
+@@ -4,9 +4,9 @@ PREFIX ?= $(DESTDIR)/usr
  SBINDIR ?= $(PREFIX)/sbin
  MANDIR ?= $(PREFIX)/share/man
  ETCDIR ?= $(DESTDIR)/etc
 -LOCALEDIR ?= /usr/share/locale
+-PAMH ?= $(shell test -f /usr/include/security/pam_appl.h && echo y)
+-AUDITH ?= $(shell test -f /usr/include/libaudit.h && echo y)
 +LOCALEDIR ?= $(PREFIX)/share/locale
- PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null)
- AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null)
++PAMH ?= $(shell test -f $(PREFIX)/include/security/pam_appl.h && echo y)
++AUDITH ?= $(shell test -f $(PREFIX)/include/libaudit.h && echo y)
  
  CFLAGS ?= -Werror -Wall -W
- override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
- LDLIBS += -lselinux -L$(PREFIX)/lib
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h)
- 	override CFLAGS += -DUSE_PAM
- 	LDLIBS += -lpam -lpam_misc
- else
- 	override CFLAGS += -D_XOPEN_SOURCE=500
- 	LDLIBS += -lcrypt
- endif
--ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h)
- 	override CFLAGS += -DUSE_AUDIT
- 	LDLIBS += -laudit
- endif
-@@ -38,7 +38,7 @@ install: all
- 	install -m 755 open_init_pty $(SBINDIR)
- 	install -m 644 run_init.8 $(MANDIR)/man8/
- 	install -m 644 open_init_pty.8 $(MANDIR)/man8/
--ifeq ($(PAMH), /usr/include/security/pam_appl.h)
-+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h)
- 	install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init
- endif
- 
-diff --git a/sepolicy/Makefile b/sepolicy/Makefile
-index 6624373..a16f8de 100644
---- a/sepolicy/Makefile
-+++ b/sepolicy/Makefile
-@@ -8,7 +8,7 @@ BINDIR ?= $(PREFIX)/bin
- SBINDIR ?= $(PREFIX)/sbin
- DATADIR ?= $(PREFIX)/share
- MANDIR ?= $(PREFIX)/share/man
--LOCALEDIR ?= /usr/share/locale
-+LOCALEDIR ?= $(PREFIX)/share/locale
- BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions
- SHAREDIR ?= $(PREFIX)/share/sandbox
- CFLAGS ?= -Wall -Werror -Wextra -W
-diff --git a/setfiles/Makefile b/setfiles/Makefile
-index eb26ed0..3c6b80d 100644
---- a/setfiles/Makefile
-+++ b/setfiles/Makefile
-@@ -12,7 +12,7 @@ CFLAGS ?= -g -Werror -Wall -W
- override CFLAGS += -I$(DESTDIR)/usr/include
- LDLIBS = -lselinux -lsepol -L$(LIBDIR)
- 
--ifeq ($(AUDITH), /usr/include/libaudit.h)
-+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h)
- 	override CFLAGS += -DUSE_AUDIT
- 	LDLIBS += -laudit
- endif
+ override CFLAGS += -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\""
 -- 
-2.7.4
+2.13.6
 
diff --git a/bsp/buildroot/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch b/bsp/buildroot/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch
deleted file mode 100644
index 375fb577..00000000
--- a/bsp/buildroot/package/policycoreutils/0003-Remove-hardcoded-arch-variable.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 7424f2bea0cb412e96202f596ad8077131589f40 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Thu, 14 Jul 2016 13:18:24 -0400
-Subject: [PATCH] Remove hardcoded arch variable.
-
-Allow the ARCH value to be passed in as original configuration was
-solely based on host architecture.
-
-This patch was updated to work with version 2.5
-
-Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
-Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
-Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
----
- policycoreutils/mcstrans/src/Makefile   | 1 -
- policycoreutils/mcstrans/utils/Makefile | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile
-index 6fda57e..7b4489f 100644
---- a/mcstrans/src/Makefile
-+++ b/mcstrans/src/Makefile
-@@ -1,4 +1,3 @@
--ARCH = $(shell uname -i)
- # Installation directories.
- PREFIX  ?= $(DESTDIR)/usr
- SBINDIR ?= $(DESTDIR)/sbin
-diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile
-index 1ffb027..912fe12 100644
---- a/mcstrans/utils/Makefile
-+++ b/mcstrans/utils/Makefile
-@@ -2,7 +2,6 @@
- PREFIX ?= $(DESTDIR)/usr
- BINDIR ?= $(PREFIX)/sbin
- 
--ARCH = $(shell uname -i)
- ifeq "$(ARCH)" "x86_64"
-         # In case of 64 bit system, use these lines
-         LIBDIR=/usr/lib64
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch b/bsp/buildroot/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch
deleted file mode 100644
index 636b722b..00000000
--- a/bsp/buildroot/package/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 27fd1c85ca95b5d66ab0241a08242a75b60b375c Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Thu, 14 Jul 2016 13:22:57 -0400
-Subject: [PATCH] Change sepolicy python install arguments to be a variable
-
-To allow the python install arguments to be overwritten, change the
-arguments to be a variable. This also cleans up the DESTDIR detection a
-little bit.
-
-Updated to work with version 2.5
-
-Signed-off-by: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
-Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
----
- policycoreutils/sepolicy/Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/sepolicy/Makefile b/sepolicy/Makefile
-index a16f8de..2013301 100644
---- a/sepolicy/Makefile
-+++ b/sepolicy/Makefile
-@@ -1,4 +1,7 @@
- PYTHON ?= python
-+ifneq ($(DESTDIR),)
-+PYTHON_INSTALL_ARGS ?= --root $(DESTDIR)
-+endif
- 
- # Installation directories.
- PREFIX ?= $(DESTDIR)/usr
-@@ -32,7 +35,7 @@ test:
- 	@$(PYTHON) test_sepolicy.py -v
- 
- install:
--	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
-+	$(PYTHON) setup.py install $(PYTHON_INSTALL_ARGS)
- 	[ -d $(BINDIR) ] || mkdir -p $(BINDIR)
- 	install -m 755 sepolicy.py $(BINDIR)/sepolicy
- 	(cd $(BINDIR); ln -sf sepolicy sepolgen)
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch b/bsp/buildroot/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch
deleted file mode 100644
index 37ffac8d..00000000
--- a/bsp/buildroot/package/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d1bc28c5b2efe60a0ee04d9c171928d0f3475654 Mon Sep 17 00:00:00 2001
-From: Adam Duskett <Aduskett@gmail.com>
-Date: Thu, 14 Jul 2016 13:26:23 -0400
-Subject: [PATCH] Check to see if DBUS is enabled.
-
-Adds a condition to prevent linking against dbus when at build time
-dbus has not been enabled.
-
-Updated for 2.5.
-
-Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
-Signed-off-by: Adam Duskett <AdamDuskett@outlook.com>
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
----
- policycoreutils/restorecond/Makefile | 2 ++
- policycoreutils/restorecond/user.c   | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/restorecond/Makefile b/restorecond/Makefile
-index 92a4a4d..95f38a6 100644
---- a/restorecond/Makefile
-+++ b/restorecond/Makefile
-@@ -11,8 +11,10 @@ autostart_DATA = sealertauto.desktop
- INITDIR ?= $(DESTDIR)/etc/rc.d/init.d
- SELINUXDIR = $(DESTDIR)/etc/selinux
- 
-+ifdef ENABLE_DBUS
- DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include
- DBUSLIB = -ldbus-glib-1 -ldbus-1
-+endif
- 
- CFLAGS ?= -g -Werror -Wall -W
- override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \
-diff --git a/restorecond/user.c b/restorecond/user.c
-index 714aae7..a04cddb 100644
---- a/restorecond/user.c
-+++ b/restorecond/user.c
-@@ -54,7 +54,6 @@ static const char *PATH="/org/selinux/Restorecond";
- static const char *INTERFACE="org.selinux.RestorecondIface";
- static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'";
- 
--static int local_lock_fd = -1;
- 
- static DBusHandlerResult
- signal_filter (DBusConnection *connection  __attribute__ ((__unused__)), DBusMessage *message, void *user_data)
-@@ -101,6 +100,7 @@ static int dbus_server(GMainLoop *loop) {
- #include <selinux/selinux.h>
- #include <sys/file.h>
- 
-+static int local_lock_fd = -1;
- /* size of the event structure, not counting name */
- #define EVENT_SIZE  (sizeof (struct inotify_event))
- /* reasonable guess as to size of 1024 events */
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/policycoreutils/Config.in b/bsp/buildroot/package/policycoreutils/Config.in
index 53238b4e..0d69fb51 100644
--- a/bsp/buildroot/package/policycoreutils/Config.in
+++ b/bsp/buildroot/package/policycoreutils/Config.in
@@ -6,56 +6,33 @@ comment "policycoreutils needs a glibc toolchain w/ threads, dynamic library"
 
 config BR2_PACKAGE_POLICYCOREUTILS
 	bool "policycoreutils"
-	select BR2_PACKAGE_LIBSEMANAGE
-	select BR2_PACKAGE_LIBCAP_NG
 	depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage
 	depends on !BR2_STATIC_LIBS #libsemanage
 	depends on !BR2_arc # libsemanage
 	depends on BR2_TOOLCHAIN_USES_GLIBC # libsemanage
+	select BR2_PACKAGE_LIBSEMANAGE
+	select BR2_PACKAGE_LIBCAP_NG
 	help
-	  Policycoreutils is a collection of policy utilities (originally
-	  the "core" set of utilities needed to use SELinux, although it
-	  has grown a bit over time), which have different dependencies.
-	  sestatus, secon, run_init, and newrole only use libselinux.
-	  load_policy and setfiles only use libselinux and libsepol.
-	  semodule and semanage use libsemanage (and thus bring in
-	  dependencies on libsepol and libselinux as well). setsebool
-	  uses libselinux to make non-persistent boolean changes (via
-	  the kernel interface) and uses libsemanage to make persistent
-	  boolean changes.
+	  Policycoreutils is a collection of policy utilities
+	  (originally the "core" set of utilities needed to use
+	  SELinux, although it has grown a bit over time), which have
+	  different dependencies.  sestatus, secon, run_init, and
+	  newrole only use libselinux.  load_policy and setfiles only
+	  use libselinux and libsepol.  semodule and semanage use
+	  libsemanage (and thus bring in dependencies on libsepol and
+	  libselinux as well). setsebool uses libselinux to make
+	  non-persistent boolean changes (via the kernel interface)
+	  and uses libsemanage to make persistent boolean changes.
 
 	  The base package will install the following utilities:
 	      load_policy
 	      newrole
-	      restorecond
 	      run_init
 	      secon
 	      semodule
-	      semodule_deps
-	      semodule_expand
-	      semodule_link
-	      semodule_package
-	      sepolgen-ifgen
 	      sestatus
 	      setfiles
 	      setsebool
 
 	  http://selinuxproject.org/page/Main_Page
-
-if BR2_PACKAGE_POLICYCOREUTILS
-
-config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND
-	bool "restorecond"
-	select BR2_PACKAGE_LIBGLIB2
-	depends on BR2_USE_WCHAR # glib2
-	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
-	depends on BR2_USE_MMU # glib2
-	help
-	  Enable restorecond to be built
-
-comment "restorecond needs a toolchain w/ wchar, threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
-
-endif
diff --git a/bsp/buildroot/package/policycoreutils/policycoreutils.hash b/bsp/buildroot/package/policycoreutils/policycoreutils.hash
index 999a7788..241905ca 100644
--- a/bsp/buildroot/package/policycoreutils/policycoreutils.hash
+++ b/bsp/buildroot/package/policycoreutils/policycoreutils.hash
@@ -1,2 +1,3 @@
 # https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29 policycoreutils-2.6.tar.gz
+sha256 0a1b8a4a323b854981c6755ff025fe98a0f1cff307f109abb260f0490f13e4f4 policycoreutils-2.7.tar.gz
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
diff --git a/bsp/buildroot/package/policycoreutils/policycoreutils.mk b/bsp/buildroot/package/policycoreutils/policycoreutils.mk
index 6076bb9c..21c5470c 100644
--- a/bsp/buildroot/package/policycoreutils/policycoreutils.mk
+++ b/bsp/buildroot/package/policycoreutils/policycoreutils.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-POLICYCOREUTILS_VERSION = 2.6
-POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-POLICYCOREUTILS_LICENSE = GPLv2
+POLICYCOREUTILS_VERSION = 2.7
+POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+POLICYCOREUTILS_LICENSE = GPL-2.0
 POLICYCOREUTILS_LICENSE_FILES = COPYING
 
 POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng
@@ -41,15 +41,9 @@ POLICYCOREUTILS_MAKE_OPTS += \
 
 POLICYCOREUTILS_MAKE_DIRS = \
 	load_policy newrole run_init \
-	secon semodule semodule_deps \
-	semodule_expand semodule_link \
-	semodule_package sepolgen-ifgen \
-	sestatus setfiles setsebool
+	secon semodule sestatus setfiles \
+	setsebool
 
-ifeq ($(BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND),y)
-POLICYCOREUTILS_MAKE_DIRS += restorecond
-POLICYCOREUTILS_DEPENDENCIES += libglib2
-endif
 # We need to pass DESTDIR at build time because it's used by
 # policycoreutils build system to find headers and libraries.
 define POLICYCOREUTILS_BUILD_CMDS
@@ -67,19 +61,23 @@ define POLICYCOREUTILS_INSTALL_TARGET_CMDS
 endef
 
 HOST_POLICYCOREUTILS_DEPENDENCIES = \
-	host-libsemanage host-dbus-glib \
-	host-sepolgen host-setools
+	host-libsemanage host-dbus-glib host-setools
 
 # Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h
 # large file support.
 # See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information
+# We need to pass DESTDIR at build time because it's used by
+# policycoreutils build system to find headers and libraries.
+# We also need to pass PREFIX because it defaults to $(DESTDIR)/usr
 HOST_POLICYCOREUTILS_MAKE_OPTS = \
 	$(HOST_CONFIGURE_OPTS) \
 	CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \
 	CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \
-	PYTHON="$(HOST_DIR)/usr/bin/python" \
+	PYTHON="$(HOST_DIR)/bin/python" \
 	PYTHON_INSTALL_ARGS="$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)" \
-	ARCH="$(HOSTARCH)"
+	ARCH="$(HOSTARCH)" \
+	DESTDIR=$(HOST_DIR) \
+	PREFIX=$(HOST_DIR)
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 HOST_POLICYCOREUTILS_DEPENDENCIES += host-python3
@@ -93,29 +91,20 @@ endif
 
 # Note: We are only building the programs required by the refpolicy build
 HOST_POLICYCOREUTILS_MAKE_DIRS = \
-	load_policy semodule semodule_deps \
-	semodule_expand semodule_link \
-	semodule_package setfiles restorecond \
-	audit2allow scripts semanage sepolicy
+	load_policy newrole run_init \
+	secon semodule sestatus setfiles \
+	setsebool
 
-# We need to pass DESTDIR at build time because it's used by
-# policycoreutils build system to find headers and libraries.
 define HOST_POLICYCOREUTILS_BUILD_CMDS
 	$(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS),
-		$(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) \
-			DESTDIR=$(HOST_DIR) all
+		$(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) all
 	)
 endef
 
 define HOST_POLICYCOREUTILS_INSTALL_CMDS
 	$(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS),
-		$(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) \
-			DESTDIR=$(HOST_DIR) install
+		$(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) install
 	)
-	# Fix python paths
-	$(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/audit2allow
-	$(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/sepolgen-ifgen
-	$(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/sepolicy
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/polkit/polkit.mk b/bsp/buildroot/package/polkit/polkit.mk
index f31387ec..e2831814 100644
--- a/bsp/buildroot/package/polkit/polkit.mk
+++ b/bsp/buildroot/package/polkit/polkit.mk
@@ -6,7 +6,7 @@
 
 POLKIT_VERSION = 0.103
 POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases
-POLKIT_LICENSE = GPLv2
+POLKIT_LICENSE = GPL-2.0
 POLKIT_LICENSE_FILES = COPYING
 
 POLKIT_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch b/bsp/buildroot/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch
new file mode 100644
index 00000000..8d210dab
--- /dev/null
+++ b/bsp/buildroot/package/poppler/0001-Form.cc-include-ctype.h-to-fix-build-error.patch
@@ -0,0 +1,37 @@
+From f40143f7acca81b7d39d774ed4c349aec8d9310b Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 23 Sep 2017 11:37:23 +0200
+Subject: [PATCH] Form.cc: include ctype.h to fix build error
+
+Fixes
+Form.cc:546:28: error: 'isdigit' was not declared in this scope
+Form.cc:548:34: error: 'isxdigit' was not declared in this scope
+Form.cc:575:40: error: 'isxdigit' was not declared in this scope
+
+detected by buildroot autobuilders:
+http://autobuild.buildroot.net/results/a6a/a6a336f8b6a0136b204a34091e33dc4598178125/
+when cross-compiling with
+gcc version 4.7.3 (crosstool-NG hg+-c65fcf8a34b7)
+
+Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=102951
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ poppler/Form.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/poppler/Form.cc b/poppler/Form.cc
+index 83bceb20..e7efae95 100644
+--- a/poppler/Form.cc
++++ b/poppler/Form.cc
+@@ -32,6 +32,7 @@
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <ctype.h>
+ #include "goo/gmem.h"
+ #include "goo/GooString.h"
+ #include "Error.h"
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/poppler/Config.in b/bsp/buildroot/package/poppler/Config.in
index d741f652..9b03df8d 100644
--- a/bsp/buildroot/package/poppler/Config.in
+++ b/bsp/buildroot/package/poppler/Config.in
@@ -6,7 +6,8 @@ config BR2_PACKAGE_POPPLER
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	help
-	  Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+	  Poppler is a PDF rendering library based on the xpdf-3.0
+	  code base.
 
 	  http://poppler.freedesktop.org/
 
@@ -15,15 +16,11 @@ if BR2_PACKAGE_POPPLER
 config BR2_PACKAGE_POPPLER_QT
 	bool "Qt support"
 	depends on BR2_PACKAGE_QT
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_GUI_MODULE
 	select BR2_PACKAGE_QT_XML
 	help
 	  Build Qt support into the Poppler library
 
-comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405"
-	depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
-
 config BR2_PACKAGE_POPPLER_QT5
 	bool "Qt5 support"
 	depends on BR2_PACKAGE_QT5
diff --git a/bsp/buildroot/package/poppler/poppler.hash b/bsp/buildroot/package/poppler/poppler.hash
index af597e02..7aa14c68 100644
--- a/bsp/buildroot/package/poppler/poppler.hash
+++ b/bsp/buildroot/package/poppler/poppler.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	e997c9ad81a8372f2dd03a02b00692b8cc479c220340c8881edaca540f402c1f	poppler-0.51.0.tar.xz
+sha256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641  poppler-0.59.0.tar.xz
diff --git a/bsp/buildroot/package/poppler/poppler.mk b/bsp/buildroot/package/poppler/poppler.mk
index fda82845..bad61a66 100644
--- a/bsp/buildroot/package/poppler/poppler.mk
+++ b/bsp/buildroot/package/poppler/poppler.mk
@@ -4,16 +4,20 @@
 #
 ################################################################################
 
-POPPLER_VERSION = 0.51.0
+POPPLER_VERSION = 0.59.0
 POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz
 POPPLER_SITE = http://poppler.freedesktop.org
 POPPLER_DEPENDENCIES = fontconfig host-pkgconf
-POPPLER_LICENSE = GPLv2+
+POPPLER_LICENSE = GPL-2.0+
 POPPLER_LICENSE_FILES = COPYING
 POPPLER_INSTALL_STAGING = YES
 POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \
 	--enable-xpdf-headers
 
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+POPPLER_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -latomic"
+endif
+
 ifeq ($(BR2_PACKAGE_CAIRO),y)
 POPPLER_CONF_OPTS += --enable-cairo-output
 POPPLER_DEPENDENCIES += cairo
@@ -46,10 +50,10 @@ POPPLER_CONF_OPTS += --disable-libtiff
 endif
 
 ifeq ($(BR2_PACKAGE_JPEG),y)
-POPPLER_CONF_OPTS += --enable-libjpeg
+POPPLER_CONF_OPTS += --enable-dctdecoder=libjpeg
 POPPLER_DEPENDENCIES += jpeg
 else
-POPPLER_CONF_OPTS += --disable-libjpeg
+POPPLER_CONF_OPTS += --enable-dctdecoder=none
 endif
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
@@ -66,7 +70,7 @@ else
 POPPLER_CONF_OPTS += --disable-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_POPPLER_LIBCURL),y)
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
 POPPLER_CONF_OPTS += --enable-libcurl
 POPPLER_DEPENDENCIES += libcurl
 else
@@ -100,7 +104,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_OPENJPEG),y)
 POPPLER_DEPENDENCIES += openjpeg
-POPPLER_CONF_OPTS += --enable-libopenjpeg
+POPPLER_CONF_OPTS += --enable-libopenjpeg=openjpeg2
 else
 POPPLER_CONF_OPTS += --enable-libopenjpeg=none
 endif
diff --git a/bsp/buildroot/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch b/bsp/buildroot/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch
deleted file mode 100644
index 9b0b07e3..00000000
--- a/bsp/buildroot/package/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 470755ccc353b59107c957972d908cbde4942c8d Mon Sep 17 00:00:00 2001
-From: Fabio Porcedda <fabio.porcedda@gmail.com>
-Date: Sun, 1 Mar 2015 21:13:48 +0100
-Subject: [PATCH] popt.pc: add the libintl library to the Libs.private field
-
-If static linking and libintl is used, the program that uses the popt
-library needs to link to the libintl library too so add the libintl
-library to the libs.private field because is useful for programs that call
-  pkg-config --static --libs popt
-they get the libintl library too:
-  -L<...> -lpopt -lintl
-
-This patch was already sent upstream:
-http://rpm5.org/community/popt-devel/0294.html
-
-Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
----
- configure.ac | 1 +
- popt.pc.in   | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e8eb238..816d272 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -90,6 +90,7 @@ popt_sysconfdir="${sysconfdir}"
- eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix}
- AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory])
- 
-+AC_SUBST([POPT_PKGCONFIG_LIBS_PRIVATE],"$LIBINTL")
- 
- # Define a (hope) portable Libs pkgconfig directive that 
- # - Don't harm if the default library search path include ${libdir}
-diff --git a/popt.pc.in b/popt.pc.in
-index a86437c..0acfdb9 100644
---- a/popt.pc.in
-+++ b/popt.pc.in
-@@ -6,5 +6,6 @@ includedir=@includedir@
- Name: popt
- Version: @VERSION@
- Description: popt library.
-+Libs.private: @POPT_PKGCONFIG_LIBS_PRIVATE@
- Libs: @POPT_PKGCONFIG_LIBS@
- Cflags: -I${includedir}
--- 
-2.3.1
-
diff --git a/bsp/buildroot/package/popt/popt.mk b/bsp/buildroot/package/popt/popt.mk
index 3ab53880..99c5138b 100644
--- a/bsp/buildroot/package/popt/popt.mk
+++ b/bsp/buildroot/package/popt/popt.mk
@@ -11,10 +11,7 @@ POPT_LICENSE = MIT
 POPT_LICENSE_FILES = COPYING
 POPT_AUTORECONF = YES
 POPT_GETTEXTIZE = YES
-
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-POPT_DEPENDENCIES += gettext
-endif
+POPT_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 POPT_CONF_ENV = ac_cv_va_copy=yes
 
diff --git a/bsp/buildroot/package/portaudio/Config.in b/bsp/buildroot/package/portaudio/Config.in
index 252a92a6..18e87fde 100644
--- a/bsp/buildroot/package/portaudio/Config.in
+++ b/bsp/buildroot/package/portaudio/Config.in
@@ -14,8 +14,8 @@ if BR2_PACKAGE_PORTAUDIO
 
 config BR2_PACKAGE_PORTAUDIO_ALSA
 	bool "alsa support"
-	select BR2_PACKAGE_ALSA_LIB
 	default y
+	select BR2_PACKAGE_ALSA_LIB
 	help
 	  Compile with ALSA support.
 
diff --git a/bsp/buildroot/package/portmap/0001-README-fix-typo-in-tcp-wrapper-doc.patch b/bsp/buildroot/package/portmap/0001-README-fix-typo-in-tcp-wrapper-doc.patch
deleted file mode 100644
index 01aa7bf8..00000000
--- a/bsp/buildroot/package/portmap/0001-README-fix-typo-in-tcp-wrapper-doc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From af4a27a17bbdbe941f2462e116c2e4c8ade110e3 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 19 Nov 2010 23:35:20 -0500
-Subject: [PATCH 1/4] README: fix typo in tcp wrapper doc
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- README |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/README b/README
-index 0da54cc..916de7e 100644
---- a/README
-+++ b/README
-@@ -18,7 +18,7 @@ There is no "./configure", just use "make".
- 
- Some make variable can be used to control compilation.
- 
-- NO_TCP_WRAPPER=  if non-empty, doen't use tcp_wrappers
-+ NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
-  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
- 		  as well as IP address.  This should only be used if you
- 		  are certain that gethostbyname will never trigger a
--- 
-1.7.3.1
-
diff --git a/bsp/buildroot/package/portmap/0002-NO_PIE-make-PIE-support-controllable.patch b/bsp/buildroot/package/portmap/0002-NO_PIE-make-PIE-support-controllable.patch
deleted file mode 100644
index 6e544bfa..00000000
--- a/bsp/buildroot/package/portmap/0002-NO_PIE-make-PIE-support-controllable.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 087874b15367a04fd482541d1832696d7163d1ac Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 19 Nov 2010 23:35:47 -0500
-Subject: [PATCH 2/4] NO_PIE: make PIE support controllable
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile |    8 ++++++--
- README   |    1 +
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5343428..cfcfdbb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -106,6 +106,10 @@ CPPFLAGS += -DIGNORE_SIGCHLD	# AIX 4.x, HP-UX 9.x
- #
- # LDLIBS	+= -m
- # CFLAGS	+= -arch m68k -arch i386 -arch hppa
-+ifeq ($(NO_PIE),)
-+CFLAGS_PIE  = -fpie
-+LDFLAGS_PIE = -pie
-+endif
- 
- # Auxiliary libraries that you may have to specify
- #
-@@ -125,9 +129,9 @@ CFLAGS   += -Wall -Wstrict-prototypes
- all:	portmap pmap_dump pmap_set portmap.man
- 
- CPPFLAGS += $(HOSTS_ACCESS)
--portmap: CFLAGS   += -fpie
-+portmap: CFLAGS   += $(CFLAGS_PIE)
- portmap: LDLIBS   += $(WRAP_LIB)
--portmap: LDFLAGS  += -pie
-+portmap: LDFLAGS  += $(LDFLAGS_PIE)
- portmap: portmap.o pmap_check.o from_local.o
- 
- from_local: CPPFLAGS += -DTEST
-diff --git a/README b/README
-index 916de7e..e0b561a 100644
---- a/README
-+++ b/README
-@@ -18,6 +18,7 @@ There is no "./configure", just use "make".
- 
- Some make variable can be used to control compilation.
- 
-+ NO_PIE=	  if non-empty, don't build portmap as a PIE
-  NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
-  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
- 		  as well as IP address.  This should only be used if you
--- 
-1.7.3.1
-
diff --git a/bsp/buildroot/package/portmap/0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch b/bsp/buildroot/package/portmap/0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch
deleted file mode 100644
index 41396b66..00000000
--- a/bsp/buildroot/package/portmap/0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From b3afea5757af1a7356ba30d2e0a7d5909ca18121 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 19 Nov 2010 23:48:20 -0500
-Subject: [PATCH 3/4] NO_FORK: control usage of fork() for nommu systems
-
-nommu systems lack a fork() function, so add a NO_FORK flag to control
-its usage.  We don't lose a ton of functionality in doing so, and on an
-embedded system, this is OK.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile     |    5 +++++
- README       |    1 +
- pmap_check.c |    6 ++++--
- portmap.c    |    6 ++++++
- 4 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cfcfdbb..9df5574 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,6 +27,11 @@ MAN_SED += -e 's/USE_DNS/yes/'
- endif
- endif
- 
-+# For no-mmu systems, we have to disable the fork() functions.
-+ifneq ($(NO_FORK),)
-+CPPFLAGS += -DNO_FORK
-+endif
-+
- # Comment out if your RPC library does not allocate privileged ports for
- # requests from processes with root privilege, or the new portmap will
- # always reject requests to register/unregister services on privileged
-diff --git a/README b/README
-index e0b561a..bda1707 100644
---- a/README
-+++ b/README
-@@ -18,6 +18,7 @@ There is no "./configure", just use "make".
- 
- Some make variable can be used to control compilation.
- 
-+ NO_FORK=	  if non-empty, don't use fork (good for nommu systems)
-  NO_PIE=	  if non-empty, don't build portmap as a PIE
-  NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
-  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
-diff --git a/pmap_check.c b/pmap_check.c
-index 6b3e490..983414e 100644
---- a/pmap_check.c
-+++ b/pmap_check.c
-@@ -302,8 +302,10 @@ static void logit(int severity, struct sockaddr_in *addr,
-      * getrpcbynumber() or syslog() does its thing.
-      */
- 
--    if (fork() == 0) {
--
-+#ifndef NO_FORK
-+    if (fork() == 0)
-+#endif
-+    {
- 	/* Try to map program number to name. */
- 
- 	if (prognum == 0) {
-diff --git a/portmap.c b/portmap.c
-index 2a98881..94abc64 100644
---- a/portmap.c
-+++ b/portmap.c
-@@ -753,6 +755,7 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
- 	if ((pml = find_service(a.rmt_prog, a.rmt_vers,
- 	    (u_long)IPPROTO_UDP)) == NULL)
- 		return;
-+#ifndef NO_FORK
- 	/*
- 	 * fork a child to do the work.  Parent immediately returns.
- 	 * Child exits upon completion.
-@@ -763,6 +766,7 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
- 			    a.rmt_prog);
- 		return;
- 	}
-+#endif
- 	port = pml->pml_map.pm_port;
- 	get_myaddress(&me);
- 	me.sin_port = htons(port);
-@@ -783,7 +787,9 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt)
- 		clnt_destroy(client);
- 	}
- 	(void)close(so);
-+#ifndef NO_FORK
- 	exit(0);
-+#endif
- }
- 
- #ifndef IGNORE_SIGCHLD			/* Lionel Cons <cons@dxcern.cern.ch> */
--- 
-1.7.3.1
-
diff --git a/bsp/buildroot/package/portmap/0004-NO_PERROR-control-overriding-of-perror-symbol.patch b/bsp/buildroot/package/portmap/0004-NO_PERROR-control-overriding-of-perror-symbol.patch
deleted file mode 100644
index 665d6a1f..00000000
--- a/bsp/buildroot/package/portmap/0004-NO_PERROR-control-overriding-of-perror-symbol.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 8cea0778f0fb838a7bd764be08f15e1494e5a0b2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 19 Nov 2010 23:50:27 -0500
-Subject: [PATCH 4/4] NO_PERROR: control overriding of perror() symbol
-
-Doing static builds of portmap might fail when the C library's perror()
-function is pulled in and collides with portmap's definition.  So add a
-flag to control the local override.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile |    5 +++++
- README   |    1 +
- 2 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9df5574..1635107 100644
---- a/Makefile
-+++ b/Makefile
-@@ -32,6 +32,11 @@ ifneq ($(NO_FORK),)
- CPPFLAGS += -DNO_FORK
- endif
- 
-+# For static builds, we might hit perror() symbol clashes
-+ifneq ($(NO_PERROR),)
-+CPPFLAGS += -DNO_PERROR
-+endif
-+
- # Comment out if your RPC library does not allocate privileged ports for
- # requests from processes with root privilege, or the new portmap will
- # always reject requests to register/unregister services on privileged
-diff --git a/README b/README
-index bda1707..05861a8 100644
---- a/README
-+++ b/README
-@@ -19,6 +19,7 @@ There is no "./configure", just use "make".
- Some make variable can be used to control compilation.
- 
-  NO_FORK=	  if non-empty, don't use fork (good for nommu systems)
-+ NO_PERROR=	  if non-empty, don't override the perror() func
-  NO_PIE=	  if non-empty, don't build portmap as a PIE
-  NO_TCP_WRAPPER=  if non-empty, don't use tcp_wrappers
-  USE_DNS=	  if set, tcp_wrappers can check peers based on hostname
-diff --git a/portmap.c b/portmap.c
-index 2a98881..94abc64 100644
---- a/portmap.c
-+++ b/portmap.c
-@@ -391,12 +391,14 @@ main(int argc, char **argv)
- 	abort();
- }
- 
-+#ifndef NO_PERROR
- /* need to override perror calls in rpc library */
- void perror(const char *what)
- {
- 
- 	syslog(LOG_ERR, "%s: %m", what);
- }
-+#endif
- 
- static struct pmaplist *
- find_service(u_long prog, u_long vers, u_long prot)
--- 
-1.7.3.1
-
diff --git a/bsp/buildroot/package/portmap/0005-tcpd.patch b/bsp/buildroot/package/portmap/0005-tcpd.patch
deleted file mode 100644
index c6af8f8c..00000000
--- a/bsp/buildroot/package/portmap/0005-tcpd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Enable compile without tcp-wrappers
-
-Patch by Timothy Redaelli <drizzt@gentoo.org>
-
-http://bugs.gentoo.org/178242
-
---- portmap_6.0/pmap_check.c
-+++ portmap_6.0/pmap_check.c
-@@ -44,7 +44,9 @@
- #include <netinet/in.h>
- #include <rpc/rpcent.h>
- #endif
-+#ifdef HOSTS_ACCESS
- #include <tcpd.h>
-+#endif
- #include <arpa/inet.h>
- #include <grp.h>
- 
diff --git a/bsp/buildroot/package/portmap/Config.in b/bsp/buildroot/package/portmap/Config.in
deleted file mode 100644
index d960690d..00000000
--- a/bsp/buildroot/package/portmap/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_PORTMAP
-	bool "portmap"
-	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	# portmap and rpcbind provide the same feature, so they are
-	# mutually exclusive. rpcbind is the newer, preferred
-	# implementation.
-	depends on !BR2_PACKAGE_RPCBIND
-	help
-	  The standard portmapper for RPC services.
-
-	  Note that portmap is being deprecated in favour of rpcbind.
-
-	  http://neil.brown.name/portmap/
-
-comment "portmap needs a toolchain w/ RPC"
-	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/bsp/buildroot/package/portmap/S13portmap b/bsp/buildroot/package/portmap/S13portmap
deleted file mode 100755
index 9aa6adfc..00000000
--- a/bsp/buildroot/package/portmap/S13portmap
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-
-[ -f /sbin/portmap ] || exit 0
-
-start() {
-	printf "Starting portmap: "
-	portmap
-	mkdir -p /var/lock/subsys
-	touch /var/lock/subsys/portmap
-	echo "done"
-}
-
-
-stop() {
-        printf "Stopping portmap: "
-	echo
-        killall portmap
-        rm -rf /var/lock/subsys
-	echo "done"
-}
-
-restart() {
-	stop
-	start
-	rm -f /var/run/portmap.state
-}
-
-# See how we were called.
-case "$1" in
-  start)
-	start
-	;;
-  stop)
-	stop
-	;;
-  restart|reload)
-	restart
-	;;
-  *)
-	echo "Usage: $0 {start|stop|reload|restart}"
-	exit 1
-esac
-
-exit $?
diff --git a/bsp/buildroot/package/portmap/portmap.hash b/bsp/buildroot/package/portmap/portmap.hash
deleted file mode 100644
index e542b2d9..00000000
--- a/bsp/buildroot/package/portmap/portmap.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256 02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de  portmap-6.0.tgz
diff --git a/bsp/buildroot/package/portmap/portmap.mk b/bsp/buildroot/package/portmap/portmap.mk
deleted file mode 100644
index 5caf54cb..00000000
--- a/bsp/buildroot/package/portmap/portmap.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-################################################################################
-#
-# portmap
-#
-################################################################################
-
-PORTMAP_VERSION = 6.0
-PORTMAP_SOURCE = portmap-$(PORTMAP_VERSION).tgz
-PORTMAP_SITE = http://neil.brown.name/portmap
-PORTMAP_LICENSE = BSD-4c (portmap.c) SunRPC License (portmap.c from_local.c)
-PORTMAP_LICENSE_FILES = portmap.c from_local.c
-PORTMAP_SBINS = portmap pmap_dump pmap_set
-
-PORTMAP_FLAGS = NO_TCP_WRAPPER=1 NO_PIE=1 NO_PERROR=1
-ifeq ($(BR2_USE_MMU),)
-PORTMAP_FLAGS += NO_FORK=1
-endif
-
-define PORTMAP_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(PORTMAP_FLAGS)
-endef
-
-define PORTMAP_INSTALL_TARGET_CMDS
-	for sbin in $(PORTMAP_SBINS); do \
-		$(INSTALL) -D -m 0755 $(@D)/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \
-	done
-endef
-
-define PORTMAP_INSTALL_INIT_SYSV
-	$(INSTALL) -D -m 0755 package/portmap/S13portmap $(TARGET_DIR)/etc/init.d/S13portmap
-endef
-
-$(eval $(generic-package))
diff --git a/bsp/buildroot/package/postgresql/Config.in b/bsp/buildroot/package/postgresql/Config.in
index e9b8f48d..9dda54bf 100644
--- a/bsp/buildroot/package/postgresql/Config.in
+++ b/bsp/buildroot/package/postgresql/Config.in
@@ -19,4 +19,5 @@ config BR2_PACKAGE_POSTGRESQL
 	  http://www.postgresql.org
 
 comment "postgresql needs a toolchain w/ dynamic library"
+	depends on BR2_USE_MMU
 	depends on BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/postgresql/postgresql.hash b/bsp/buildroot/package/postgresql/postgresql.hash
index 1d7133f7..a9cc93c7 100644
--- a/bsp/buildroot/package/postgresql/postgresql.hash
+++ b/bsp/buildroot/package/postgresql/postgresql.hash
@@ -1,4 +1,5 @@
-# From https://ftp.postgresql.org/pub/source/v9.6.8/postgresql-9.6.8.tar.bz2.sha256
-sha256 eafdb3b912e9ec34bdd28b651d00226a6253ba65036cb9a41cad2d9e82e3eb70  postgresql-9.6.8.tar.bz2
+# From https://ftp.postgresql.org/pub/source/v10.5/postgresql-10.5.tar.bz2.sha256
+sha256	6c8e616c91a45142b85c0aeb1f29ebba4a361309e86469e0fb4617b6a73c4011	postgresql-10.5.tar.bz2
+
 # License file, Locally calculated
-sha256 24cfc70cf16b3a23242c49ffce39510683bdd48cbedb8a46fe03976ee5f5c21e  COPYRIGHT
+sha256	24cfc70cf16b3a23242c49ffce39510683bdd48cbedb8a46fe03976ee5f5c21e	COPYRIGHT
diff --git a/bsp/buildroot/package/postgresql/postgresql.mk b/bsp/buildroot/package/postgresql/postgresql.mk
index 92cfe4ec..f6dad978 100644
--- a/bsp/buildroot/package/postgresql/postgresql.mk
+++ b/bsp/buildroot/package/postgresql/postgresql.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-POSTGRESQL_VERSION = 9.6.8
+POSTGRESQL_VERSION = 10.5
 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
 POSTGRESQL_LICENSE = PostgreSQL
@@ -56,6 +56,11 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 POSTGRESQL_DEPENDENCIES += openssl
 POSTGRESQL_CONF_OPTS += --with-openssl
+else
+# PostgreSQL checks for /dev/urandom and fails if it's being cross-compiled and
+# an SSL library isn't found. Since /dev/urandom is guaranteed to be provided
+# on Linux systems, explicitly tell the configure script it's available.
+POSTGRESQL_CONF_ENV += ac_cv_file__dev_urandom=yes
 endif
 
 ifeq ($(BR2_PACKAGE_OPENLDAP),y)
diff --git a/bsp/buildroot/package/pound/pound.mk b/bsp/buildroot/package/pound/pound.mk
index 40866421..6f7cc848 100644
--- a/bsp/buildroot/package/pound/pound.mk
+++ b/bsp/buildroot/package/pound/pound.mk
@@ -7,7 +7,7 @@
 POUND_VERSION = 2.7
 POUND_SITE = http://www.apsis.ch/pound
 POUND_SOURCE = Pound-$(POUND_VERSION).tgz
-POUND_LICENSE = GPLv3+
+POUND_LICENSE = GPL-3.0+
 POUND_LICENSE_FILES = GPL.txt
 POUND_DEPENDENCIES = openssl
 
diff --git a/bsp/buildroot/package/powerpc-utils/Config.in b/bsp/buildroot/package/powerpc-utils/Config.in
index fb2fb7fa..d04d81c0 100644
--- a/bsp/buildroot/package/powerpc-utils/Config.in
+++ b/bsp/buildroot/package/powerpc-utils/Config.in
@@ -10,14 +10,14 @@ config BR2_PACKAGE_POWERPC_UTILS
 	help
 	  System utilities for PowerPC machines.
 
-	  https://github.com/nfont/powerpc-utils
+	  https://github.com/ibm-power-utilities/powerpc-utils.git
 
 if BR2_PACKAGE_POWERPC_UTILS
 
 config BR2_PACKAGE_POWERPC_UTILS_RTAS
 	bool "RTAS support"
-	select BR2_PACKAGE_LIBRTAS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_LIBRTAS
 	help
 	  Enable support for functions that require RTAS.
 
diff --git a/bsp/buildroot/package/powerpc-utils/powerpc-utils.hash b/bsp/buildroot/package/powerpc-utils/powerpc-utils.hash
index 9e299da3..437a5865 100644
--- a/bsp/buildroot/package/powerpc-utils/powerpc-utils.hash
+++ b/bsp/buildroot/package/powerpc-utils/powerpc-utils.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 657790a4aea7f3e4649a454b4c384e255145bff9b9c5e40402170603980a6736 powerpc-utils-v1.3.1.tar.gz
+sha256 d36372efebc1f6f9409501f7ab68a812843925334dee6438e7b52a53c21574c5 powerpc-utils-v1.3.4.tar.gz
diff --git a/bsp/buildroot/package/powerpc-utils/powerpc-utils.mk b/bsp/buildroot/package/powerpc-utils/powerpc-utils.mk
index 036be52d..da7a3c9c 100644
--- a/bsp/buildroot/package/powerpc-utils/powerpc-utils.mk
+++ b/bsp/buildroot/package/powerpc-utils/powerpc-utils.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-POWERPC_UTILS_VERSION = v1.3.1
-POWERPC_UTILS_SITE = $(call github,nfont,powerpc-utils,$(POWERPC_UTILS_VERSION))
+POWERPC_UTILS_VERSION = v1.3.4
+POWERPC_UTILS_SITE = $(call github,ibm-power-utilities,powerpc-utils,$(POWERPC_UTILS_VERSION))
 POWERPC_UTILS_DEPENDENCIES = zlib
 POWERPC_UTILS_AUTORECONF = YES
-POWERPC_UTILS_LICENSE = GPLv2+
+POWERPC_UTILS_LICENSE = GPL-2.0+
 POWERPC_UTILS_LICENSE_FILES = COPYING
 
 POWERPC_UTILS_CONF_ENV = \
diff --git a/bsp/buildroot/package/powertop/0001-autotune-fix-use-after-close.patch b/bsp/buildroot/package/powertop/0001-autotune-fix-use-after-close.patch
deleted file mode 100644
index f2b3dff1..00000000
--- a/bsp/buildroot/package/powertop/0001-autotune-fix-use-after-close.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Patch pulled from https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/powertop&id=37469c47b885c50365f57044e4ad72e0e3512b91
-
-Fixes a use-after-close bug in create_all_devfreq_devices().
-
-Signed-off-by: Steven Noonan <steven@uplinklabs.net>
-
---- a/src/devices/devfreq.cpp
-+++ b/src/devices/devfreq.cpp
-@@ -247,6 +247,7 @@ void create_all_devfreq_devices(void)
-		fprintf(stderr, "Devfreq not enabled\n");
-		is_enabled = false;
-		closedir(dir);
-+		dir = NULL;
-		return;
-	}
diff --git a/bsp/buildroot/package/powertop/0002-dont-force-stack-smashing-protection.patch b/bsp/buildroot/package/powertop/0001-dont-force-stack-smashing-protection.patch
similarity index 100%
rename from bsp/buildroot/package/powertop/0002-dont-force-stack-smashing-protection.patch
rename to bsp/buildroot/package/powertop/0001-dont-force-stack-smashing-protection.patch
diff --git a/bsp/buildroot/package/powertop/0003-add-missing-sys-time.h-header.patch b/bsp/buildroot/package/powertop/0003-add-missing-sys-time.h-header.patch
deleted file mode 100644
index 7156e425..00000000
--- a/bsp/buildroot/package/powertop/0003-add-missing-sys-time.h-header.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 283cab667a9ac3ae3a675b5e5d1a42191188699f Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Sat, 8 Aug 2015 18:24:48 +0200
-Subject: [PATCH] add missing sys/time.h header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-struct timeval is defined in sys/time.h with a musl toolchain.
-
-Fixes:
-In file included from devices/devfreq.cpp:35:0:
-devices/devfreq.h:35:18: error: field ‘stamp_before’ has incomplete type ‘timeval’
-  struct timeval  stamp_before, stamp_after;
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- src/devices/devfreq.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h
-index 16a60fb..4a8983b 100644
---- a/src/devices/devfreq.h
-+++ b/src/devices/devfreq.h
-@@ -27,6 +27,7 @@
- 
- #include "device.h"
- #include "../parameters/parameters.h"
-+#include <sys/time.h>
- 
- struct frequency;
- 
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/powertop/0004-add-missing-stdio.h-header.patch b/bsp/buildroot/package/powertop/0004-add-missing-stdio.h-header.patch
deleted file mode 100644
index 7619cca1..00000000
--- a/bsp/buildroot/package/powertop/0004-add-missing-stdio.h-header.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e6cfd977c81b335664db1d5d3d6b5488c245e30f Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@openwide.fr>
-Date: Sat, 8 Aug 2015 18:26:15 +0200
-Subject: [PATCH] add missing stdio.h header
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-snprinf is defined in stdio.h.
-
-Fixes:
-perf/perf_bundle.cpp: In function ‘void parse_event_format(const char*)’:
-perf/perf_bundle.cpp:141:75: error: ‘sprintf’ was not declared in this scope
-  sprintf(file, "/sys/kernel/debug/tracing/events/%s/%s/format", sys, event);
-
-Signed-off-by: Romain Naour <romain.naour@openwide.fr>
----
- src/perf/perf_bundle.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/perf/perf_bundle.cpp b/src/perf/perf_bundle.cpp
-index cf1ae11..3d216ff 100644
---- a/src/perf/perf_bundle.cpp
-+++ b/src/perf/perf_bundle.cpp
-@@ -31,6 +31,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <stdio.h>
- 
- #include "perf_bundle.h"
- #include "perf_event.h"
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/powertop/Config.in b/bsp/buildroot/package/powertop/Config.in
index a532302a..714b1629 100644
--- a/bsp/buildroot/package/powertop/Config.in
+++ b/bsp/buildroot/package/powertop/Config.in
@@ -7,9 +7,9 @@ config BR2_PACKAGE_POWERTOP
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_PCIUTILS
 	select BR2_PACKAGE_LIBNL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
-	  A tool to diagnose issues with power consumption and power management
+	  A tool to diagnose issues with power consumption and power
+	  management
 
 	  https://01.org/powertop/
 
diff --git a/bsp/buildroot/package/powertop/powertop.hash b/bsp/buildroot/package/powertop/powertop.hash
index b64981ea..0f9acdc2 100644
--- a/bsp/buildroot/package/powertop/powertop.hash
+++ b/bsp/buildroot/package/powertop/powertop.hash
@@ -1,2 +1,2 @@
 # Locally-generated hash
-sha256	8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca	powertop-2.7.tar.gz
+sha256	aa7fb7d8e9a00f05e7d8a7a2866d85929741e0d03a5bf40cab22d2021c959250	powertop-v2.9.tar.gz
diff --git a/bsp/buildroot/package/powertop/powertop.mk b/bsp/buildroot/package/powertop/powertop.mk
index 53be483a..cf5e8d4f 100644
--- a/bsp/buildroot/package/powertop/powertop.mk
+++ b/bsp/buildroot/package/powertop/powertop.mk
@@ -4,19 +4,16 @@
 #
 ################################################################################
 
-POWERTOP_VERSION = 2.7
+POWERTOP_VERSION = 2.9
 POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop
-POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-gettext host-pkgconf
-POWERTOP_LICENSE = GPLv2
+POWERTOP_SOURCE = powertop-v$(POWERTOP_VERSION).tar.gz
+POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-pkgconf \
+	$(TARGET_NLS_DEPENDENCIES)
+POWERTOP_LICENSE = GPL-2.0
 POWERTOP_LICENSE_FILES = COPYING
-# We're patching Makefile.am
+POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
+# 0001-dont-force-stack-smashing-protection.patch
 POWERTOP_AUTORECONF = YES
-POWERTOP_GETTEXTIZE = YES
-
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-POWERTOP_DEPENDENCIES += gettext
-POWERTOP_CONF_ENV += LIBS='-lintl'
-endif
 
 # Help powertop at finding the right ncurses library depending on
 # which one is available.
diff --git a/bsp/buildroot/package/powervr/Config.in b/bsp/buildroot/package/powervr/Config.in
index 746e15b2..7be2b237 100644
--- a/bsp/buildroot/package/powervr/Config.in
+++ b/bsp/buildroot/package/powervr/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_POWERVR
 	bool
 
 config BR2_PACKAGE_PROVIDES_POWERVR
-	depends on BR2_PACKAGE_HAS_POWERVR
 	string
+	depends on BR2_PACKAGE_HAS_POWERVR
diff --git a/bsp/buildroot/package/pppd/Config.in b/bsp/buildroot/package/pppd/Config.in
index b56b6234..ee89a577 100644
--- a/bsp/buildroot/package/pppd/Config.in
+++ b/bsp/buildroot/package/pppd/Config.in
@@ -11,8 +11,8 @@ config BR2_PACKAGE_PPPD
 if BR2_PACKAGE_PPPD
 
 config BR2_PACKAGE_PPPD_FILTER
-	select BR2_PACKAGE_LIBPCAP
 	bool "filtering"
+	select BR2_PACKAGE_LIBPCAP
 	help
 	  Packet filtering abilities for pppd. If enabled,
 	  the pppd active-filter and pass-filter options
@@ -23,6 +23,18 @@ config BR2_PACKAGE_PPPD_RADIUS
 	help
 	  Install RADIUS support for pppd
 
+config BR2_PACKAGE_PPPD_OVERWRITE_RESOLV_CONF
+	bool "overwrite /etc/resolv.conf"
+	default y
+	help
+	  Overwrite /etc/resolv.conf instead of maintaining the
+	  separate list of nameservers in /etc/ppp/resolv.conf
+
+	  Note that the pppd default of writing to /etc/ppp/resolv.conf
+	  does not work on a read-only rootfs unless you make it
+	  writable in your rootfs customizations (e.g. by linking it to
+	  a file in tmpfs or by mounting a writable filesystem on it).
+
 endif
 
 comment "pppd needs a uClibc or glibc toolchain w/ dynamic library"
diff --git a/bsp/buildroot/package/pppd/pppd.mk b/bsp/buildroot/package/pppd/pppd.mk
index 55630a8a..6b86a4d3 100644
--- a/bsp/buildroot/package/pppd/pppd.mk
+++ b/bsp/buildroot/package/pppd/pppd.mk
@@ -7,7 +7,7 @@
 PPPD_VERSION = 2.4.7
 PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
 PPPD_SITE = https://download.samba.org/pub/ppp
-PPPD_LICENSE = LGPLv2+, LGPL, BSD-4c, BSD-3c, GPLv2+
+PPPD_LICENSE = LGPL-2.0+, LGPL, BSD-4-Clause, BSD-3-Clause, GPL-2.0+
 PPPD_LICENSE_FILES = \
 	pppd/tdb.c pppd/plugins/pppoatm/COPYING \
 	pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
@@ -41,7 +41,9 @@ PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H
 define PPPD_SET_RESOLV_CONF
 	$(SED) 's,ppp/resolv.conf,resolv.conf,' $(@D)/pppd/pathnames.h
 endef
+ifeq ($(BR2_PACKAGE_PPPD_OVERWRITE_RESOLV_CONF),y)
 PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF
+endif
 
 define PPPD_CONFIGURE_CMDS
 	$(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux
diff --git a/bsp/buildroot/package/pps-tools/Config.in b/bsp/buildroot/package/pps-tools/Config.in
index 83308f4f..0c4bb112 100644
--- a/bsp/buildroot/package/pps-tools/Config.in
+++ b/bsp/buildroot/package/pps-tools/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PPS_TOOLS
 	bool "pps-tools"
 	help
-	  Pulse per second tools. Provides timepps.h and other PPS utilities.
+	  Pulse per second tools. Provides timepps.h and other PPS
+	  utilities.
 
 	  https://github.com/ago/pps-tools/
diff --git a/bsp/buildroot/package/pps-tools/pps-tools.mk b/bsp/buildroot/package/pps-tools/pps-tools.mk
index c3e147a4..37bb7e1f 100644
--- a/bsp/buildroot/package/pps-tools/pps-tools.mk
+++ b/bsp/buildroot/package/pps-tools/pps-tools.mk
@@ -7,7 +7,7 @@
 PPS_TOOLS_VERSION = 47333f24af878f67ce48022e8af16419713aa1ac
 PPS_TOOLS_SITE = $(call github,ago,pps-tools,$(PPS_TOOLS_VERSION))
 PPS_TOOLS_INSTALL_STAGING = YES
-PPS_TOOLS_LICENSE = GPLv2+
+PPS_TOOLS_LICENSE = GPL-2.0+
 PPS_TOOLS_LICENSE_FILES = COPYING
 
 define PPS_TOOLS_BUILD_CMDS
diff --git a/bsp/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch b/bsp/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch
index d6b5445f..1036b3c8 100644
--- a/bsp/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch
+++ b/bsp/buildroot/package/pptp-linux/0003-pqueue.h-include-sys-types.h.patch
@@ -7,8 +7,8 @@ We're using u_int32_t here, this breaks on musl libc builds otherwise.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 ---
-Patch status: sent upstream to the devel mailing list
-(moderated, no archive link yet)
+Patch status: applied upstream:
+https://sourceforge.net/p/pptpclient/git/ci/ee8ef349d9543cb48045a27d1cdd801fc6e910e8/
 
  pqueue.h | 1 +
  1 file changed, 1 insertion(+)
diff --git a/bsp/buildroot/package/pptp-linux/pptp-linux.hash b/bsp/buildroot/package/pptp-linux/pptp-linux.hash
index 839d0bf8..6200ef15 100644
--- a/bsp/buildroot/package/pptp-linux/pptp-linux.hash
+++ b/bsp/buildroot/package/pptp-linux/pptp-linux.hash
@@ -1,3 +1,3 @@
-# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.8.0/
-md5	4efce9f263e2c3f38d79d9df222476de	pptp-1.8.0.tar.gz
-sha1	6289953812ac986c7234e83aefb10b5e279dc613	pptp-1.8.0.tar.gz
+# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.9.0/
+md5 b2117b377f65294a9786f80f0235d308  pptp-1.9.0.tar.gz
+sha1 047bb9812be477b44c94ffb1dc95c34658eedc24  pptp-1.9.0.tar.gz
diff --git a/bsp/buildroot/package/pptp-linux/pptp-linux.mk b/bsp/buildroot/package/pptp-linux/pptp-linux.mk
index 1538457a..25f3037f 100644
--- a/bsp/buildroot/package/pptp-linux/pptp-linux.mk
+++ b/bsp/buildroot/package/pptp-linux/pptp-linux.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PPTP_LINUX_VERSION = 1.8.0
+PPTP_LINUX_VERSION = 1.9.0
 PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION)
 PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz
 PPTP_LINUX_MAKE = $(MAKE1)
-PPTP_LINUX_LICENSE = GPLv2+
+PPTP_LINUX_LICENSE = GPL-2.0+
 PPTP_LINUX_LICENSE_FILES = COPYING
 
 define PPTP_LINUX_BUILD_CMDS
diff --git a/bsp/buildroot/package/prboom/Config.in b/bsp/buildroot/package/prboom/Config.in
index 6884f31e..7dc635d7 100644
--- a/bsp/buildroot/package/prboom/Config.in
+++ b/bsp/buildroot/package/prboom/Config.in
@@ -1,13 +1,12 @@
 config BR2_PACKAGE_PRBOOM
 	bool "prboom"
-	# These result in internal compiler error
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
 	select BR2_PACKAGE_SDL
 	select BR2_PACKAGE_SDL_MIXER
 	select BR2_PACKAGE_SDL_NET
 	help
-	  PrBoom is a Doom client which allows you to play the good old game on
-	  newer hardware. It even supports higher resolution and better
-	  rendering, while still keeping the old style alive.
+	  PrBoom is a Doom client which allows you to play the good
+	  old game on newer hardware. It even supports higher
+	  resolution and better rendering, while still keeping the old
+	  style alive.
 
 	  http://prboom.sourceforge.net/
diff --git a/bsp/buildroot/package/prboom/prboom.mk b/bsp/buildroot/package/prboom/prboom.mk
index 5f5e7fb6..d370ae3f 100644
--- a/bsp/buildroot/package/prboom/prboom.mk
+++ b/bsp/buildroot/package/prboom/prboom.mk
@@ -8,7 +8,7 @@ PRBOOM_VERSION = 2.5.0
 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION)
 PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes
 PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer
-PRBOOM_LICENSE = GPLv2+
+PRBOOM_LICENSE = GPL-2.0+
 PRBOOM_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
diff --git a/bsp/buildroot/package/privoxy/privoxy.mk b/bsp/buildroot/package/privoxy/privoxy.mk
index 267ddc27..df0e7372 100644
--- a/bsp/buildroot/package/privoxy/privoxy.mk
+++ b/bsp/buildroot/package/privoxy/privoxy.mk
@@ -10,7 +10,7 @@ PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz
 # configure not shipped
 PRIVOXY_AUTORECONF = YES
 PRIVOXY_DEPENDENCIES = pcre zlib
-PRIVOXY_LICENSE = GPLv2+
+PRIVOXY_LICENSE = GPL-2.0+
 PRIVOXY_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/procps-ng/0001-remove-index.patch b/bsp/buildroot/package/procps-ng/0001-remove-index.patch
deleted file mode 100644
index 1d85b31c..00000000
--- a/bsp/buildroot/package/procps-ng/0001-remove-index.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-sysctl: remove use of legacy index()
-
-[yann.morin.1998@free.fr: adapt to procps-ng]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-diff -durN procps-v3.3.9.orig/sysctl.c procps-v3.3.9/sysctl.c
---- procps-v3.3.9.orig/sysctl.c	2013-12-03 12:16:18.000000000 +0100
-+++ procps-v3.3.9/sysctl.c	2014-05-31 00:45:00.869748741 +0200
-@@ -794,7 +794,7 @@
- 		      program_invocation_short_name);
- 
- 	for ( ; *argv; argv++) {
--		if (WriteMode || index(*argv, '='))
-+		if (WriteMode || strchr(*argv, '='))
- 			ReturnCode += WriteSetting(*argv);
- 		else
- 			ReturnCode += ReadSetting(*argv);
diff --git a/bsp/buildroot/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch b/bsp/buildroot/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch
deleted file mode 100644
index 1329ac4b..00000000
--- a/bsp/buildroot/package/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Don't assume ncursesw headers are in ../usr/include/ncursesw/..
-On a pure build/system without legacy ncurses that may not be true.
-Since we're using pkg-config let it provide the correct include path.
-
-Status: contacted one of the maintainers on sf.net
-(ticket submission closed to the public, no other way of contacting them).
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-[Bernd: Rebased for version 3.3.11]
-
-diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac
---- procps-ng-3.3.10.orig/configure.ac	2015-04-07 19:21:55.729819952 -0300
-+++ procps-ng-3.3.10/configure.ac	2015-04-07 19:32:09.511706653 -0300
-@@ -138,7 +138,8 @@
-   ])
-   AM_CONDITIONAL(WITH_NCURSES, true)
-   if test "$enable_watch8bit" = yes; then
--    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
-+    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"]
-+    [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [
-       AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
-                    [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
-     ])
-@@ -148,6 +149,7 @@
- fi
- AC_SUBST([NCURSES_LIBS])
- AC_SUBST([WATCH_NCURSES_LIBS])
-+AC_SUBST([WATCH_NCURSES_CFLAGS])
- 
- AC_ARG_WITH([systemd],
-   [AS_HELP_STRING([--with-systemd], [enable systemd support])],
-diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am
---- procps-ng-3.3.10.orig/Makefile.am	2015-04-07 19:21:55.655817434 -0300
-+++ procps-ng-3.3.10/Makefile.am	2015-04-07 19:32:54.516238136 -0300
-@@ -97,6 +97,7 @@
- slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
- watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
- watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS)
-+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@
- top_top_SOURCES = \
- 	top/top.h \
- 	top/top.c \
-diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c
---- procps-ng-3.3.10.orig/watch.c	2015-04-07 19:21:55.707819203 -0300
-+++ procps-ng-3.3.10/watch.c	2015-04-07 19:22:27.323895083 -0300
-@@ -51,10 +51,8 @@
- #ifdef WITH_WATCH8BIT
- # include <wchar.h>
- # include <wctype.h>
--# include <ncursesw/ncurses.h>
--#else
--# include <ncurses.h>
- #endif	/* WITH_WATCH8BIT */
-+#include <ncurses.h>
- 
- #ifdef FORCE_8BIT
- # undef isprint
diff --git a/bsp/buildroot/package/procps-ng/0003-ps-output.c-include-dlfcn.h-only-when-necessary.patch b/bsp/buildroot/package/procps-ng/0003-ps-output.c-include-dlfcn.h-only-when-necessary.patch
deleted file mode 100644
index dca28fab..00000000
--- a/bsp/buildroot/package/procps-ng/0003-ps-output.c-include-dlfcn.h-only-when-necessary.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 4fc9a348026a945aec8eddffc7613de9cb10b10c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 7 Aug 2016 11:08:26 +0200
-Subject: [PATCH] ps/output.c: include <dlfcn.h> only when necessary
-
-dlopen() functionality is only used when SELinux support is enabled, so
-<dlfcn.h> only needs to be included when ENABLE_LIBSELINUX is
-defined. This fixes the build in configurations where <dlfcn.h> is not
-available.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- ps/output.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ps/output.c b/ps/output.c
-index 42c04cf..f540832 100644
---- a/ps/output.c
-+++ b/ps/output.c
-@@ -46,7 +46,9 @@
-  */
- 
- #include <ctype.h>
-+#if ENABLE_LIBSELINUX
- #include <dlfcn.h>
-+#endif
- #include <fcntl.h>
- #include <grp.h>
- #include <limits.h>
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/procps-ng/Config.in b/bsp/buildroot/package/procps-ng/Config.in
index 553bea1a..d9e884fa 100644
--- a/bsp/buildroot/package/procps-ng/Config.in
+++ b/bsp/buildroot/package/procps-ng/Config.in
@@ -2,10 +2,14 @@ config BR2_PACKAGE_PROCPS_NG
 	bool "procps-ng"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	depends on !BR2_TOOLCHAIN_USES_MUSL # fopencookie()
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Standard informational utilities and process-handling tools.
 	  Provides things like kill, ps, uptime, free, top, etc...
 
 	  http://sourceforge.net/projects/procps-ng/
+
+comment "procps-ng needs a glibc or uclibc toolchain"
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_USES_MUSL
diff --git a/bsp/buildroot/package/procps-ng/procps-ng.hash b/bsp/buildroot/package/procps-ng/procps-ng.hash
index 62d61727..123db992 100644
--- a/bsp/buildroot/package/procps-ng/procps-ng.hash
+++ b/bsp/buildroot/package/procps-ng/procps-ng.hash
@@ -1,3 +1,8 @@
 # From http://sourceforge.net/projects/procps-ng/files/Production/
-md5	957e42e8b193490b2111252e4a2b443c	procps-ng-3.3.12.tar.xz
-sha1	82c0745f150f1385ca01fe7d24f05f74e31c94c6	procps-ng-3.3.12.tar.xz
+md5	2b0717a7cb474b3d6dfdeedfbad2eccc	procps-ng-3.3.15.tar.xz
+sha1	2929bc64f0cf7b2db997eef79b7187658e47230d	procps-ng-3.3.15.tar.xz
+# Locally calculated after checking signature
+# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.15.tar.xz.asc
+sha256 10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465  procps-ng-3.3.15.tar.xz
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366  COPYING.LIB
diff --git a/bsp/buildroot/package/procps-ng/procps-ng.mk b/bsp/buildroot/package/procps-ng/procps-ng.mk
index 0f8b20c5..e1fddea3 100644
--- a/bsp/buildroot/package/procps-ng/procps-ng.mk
+++ b/bsp/buildroot/package/procps-ng/procps-ng.mk
@@ -4,16 +4,14 @@
 #
 ################################################################################
 
-PROCPS_NG_VERSION = 3.3.12
+PROCPS_NG_VERSION = 3.3.15
 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz
 PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production
-PROCPS_NG_LICENSE = GPLv2+, LGPLv2+ (libproc and libps)
+PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps)
 PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB
 PROCPS_NG_INSTALL_STAGING = YES
-PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf
-# For 0002-use-pkgconfig-for-ncursesw-cflags.patch
-PROCPS_NG_AUTORECONF = YES
-PROCPS_NG_GETTEXTIZE = YES
+PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES)
+PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS)
 
 # If both procps-ng and busybox are selected, make certain procps-ng
 # wins the fight over who gets to have their utils actually installed.
@@ -21,11 +19,6 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 PROCPS_NG_DEPENDENCIES += busybox
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-PROCPS_NG_DEPENDENCIES += gettext
-PROCPS_NG_CONF_OPTS += LIBS=-lintl
-endif
-
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 PROCPS_NG_DEPENDENCIES += systemd
 PROCPS_NG_CONF_OPTS += --with-systemd
@@ -47,6 +40,10 @@ PROCPS_NG_CONF_OPTS += \
 	--enable-watch8bit
 endif
 
+ifeq ($(BR2_USE_WCHAR),)
+PROCPS_NG_CONF_OPTS += CPPFLAGS=-DOFF_XTRAWIDE
+endif
+
 # numa support requires libdl, so explicitly disable it when
 # BR2_STATIC_LIBS=y
 ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/proftpd/0002-__mempcpy.patch b/bsp/buildroot/package/proftpd/0002-__mempcpy.patch
deleted file mode 100644
index 1b8f0b0b..00000000
--- a/bsp/buildroot/package/proftpd/0002-__mempcpy.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-[PATCH] pr_fnmatch.c: use mempcpy, not __mempcpy to fix linker issue with uClibc
-
-The standard name (as checked for by configure) for the function is mempcpy,
-not __mempcpy, so use that instead.
-
-The existing code happens to work on glibc, as that provides an __mempcpy
-alias, but other C libraries (E.G.  uClibc) don't:
-
-./host/usr/bin/arm-linux-nm -D ./staging/lib/libuClibc-0.9.33.2.so | grep mempcpy
-00035d2c W mempcpy
-00036cf8 W wmempcpy
-
-vs
-
-./host/usr/bin/arm-none-linux-gnueabi-nm -D staging/lib/libc-2.18.so | grep mempcpy
-0007d140 T mempcpy
-0007d140 T __mempcpy
-000e15f0 T __mempcpy_chk
-00081828 T __mempcpy_small
-00083148 W wmempcpy
-000e4e3c T __wmempcpy_chk
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- lib/pr_fnmatch.c      |    2 +-
- lib/pr_fnmatch_loop.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: proftpd-1.3.4d/lib/pr_fnmatch.c
-===================================================================
---- proftpd-1.3.4d.orig/lib/pr_fnmatch.c
-+++ proftpd-1.3.4d/lib/pr_fnmatch.c
-@@ -250,7 +250,7 @@
- # endif
- # define STRLEN(S) strlen (S)
- # define STRCAT(D, S) strcat (D, S)
--# define MEMPCPY(D, S, N) __mempcpy (D, S, N)
-+# define MEMPCPY(D, S, N) mempcpy (D, S, N)
- # define MEMCHR(S, C, N) memchr (S, C, N)
- # define STRCOLL(S1, S2) strcoll (S1, S2)
- # include "pr_fnmatch_loop.c"
-Index: proftpd-1.3.4d/lib/pr_fnmatch_loop.c
-===================================================================
---- proftpd-1.3.4d.orig/lib/pr_fnmatch_loop.c
-+++ proftpd-1.3.4d/lib/pr_fnmatch_loop.c
-@@ -54,7 +54,7 @@
- /* Copy N bytes of SRC to DEST, return pointer to bytes after the
-    last written byte.  */
- static void *
--__mempcpy (void *dest, const void *src, size_t n)
-+mempcpy (void *dest, const void *src, size_t n)
- {
-   return (char *) memcpy (dest, src, n) + n;
- }
diff --git a/bsp/buildroot/package/proftpd/Config.in b/bsp/buildroot/package/proftpd/Config.in
index dd87eb45..e979d407 100644
--- a/bsp/buildroot/package/proftpd/Config.in
+++ b/bsp/buildroot/package/proftpd/Config.in
@@ -13,4 +13,11 @@ config BR2_PACKAGE_PROFTPD_MOD_REWRITE
 	help
 	  Compile ProFTPD with mod_rewrite support
 
+config BR2_PACKAGE_PROFTPD_MOD_REDIS
+	bool "mod_redis support"
+	select BR2_PACKAGE_HIREDIS
+	help
+	  The mod_redis module enables ProFTPD support for caching
+	  data in Redis servers, using the hiredis client library.
+
 endif
diff --git a/bsp/buildroot/package/proftpd/proftpd.hash b/bsp/buildroot/package/proftpd/proftpd.hash
index cc8add99..537222f0 100644
--- a/bsp/buildroot/package/proftpd/proftpd.hash
+++ b/bsp/buildroot/package/proftpd/proftpd.hash
@@ -1,4 +1,4 @@
-# From ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.5d.tar.gz.md5
-md5	bcd2846edf0dad4c4d49a7c8c176d83a	proftpd-1.3.5d.tar.gz
+# From ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz.md5
+md5 13270911c42aac842435f18205546a1b proftpd-1.3.6.tar.gz
 # Locally calculated
-sha256	f4e2997be7f22a5b31d7ac72497ed4f4471d24d32385978350410713e76129ac	proftpd-1.3.5d.tar.gz
+sha256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf proftpd-1.3.6.tar.gz
diff --git a/bsp/buildroot/package/proftpd/proftpd.mk b/bsp/buildroot/package/proftpd/proftpd.mk
index b5ffddc0..3e165c6a 100644
--- a/bsp/buildroot/package/proftpd/proftpd.mk
+++ b/bsp/buildroot/package/proftpd/proftpd.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PROFTPD_VERSION = 1.3.5d
+PROFTPD_VERSION = 1.3.6
 PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source
-PROFTPD_LICENSE = GPLv2+
+PROFTPD_LICENSE = GPL-2.0+
 PROFTPD_LICENSE_FILES = COPYING
 
 PROFTPD_CONF_ENV = \
@@ -27,6 +27,13 @@ ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
 PROFTPD_CONF_OPTS += --with-modules=mod_rewrite
 endif
 
+ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REDIS),y)
+PROFTPD_CONF_OPTS += --enable-redis
+PROFTPD_DEPENDENCIES += hiredis
+else
+PROFTPD_CONF_OPTS += --disable-redis
+endif
+
 # configure script doesn't handle detection of %llu format string
 # support for printing the file size when cross compiling, breaking
 # access for large files.
diff --git a/bsp/buildroot/package/proj/Config.in b/bsp/buildroot/package/proj/Config.in
new file mode 100644
index 00000000..788aee83
--- /dev/null
+++ b/bsp/buildroot/package/proj/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_PROJ
+	bool "proj"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  proj.4 is a standard UNIX filter function which converts
+	  geographic longitude and latitude coordinates into cartesian
+	  coordinates (and vice versa), and it is a C API for software
+	  developers to include coordinate transformation in their own
+	  software.
+
+	  http://proj4.org/
+
+comment "proj needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/proj/proj.hash b/bsp/buildroot/package/proj/proj.hash
new file mode 100644
index 00000000..6a791baa
--- /dev/null
+++ b/bsp/buildroot/package/proj/proj.hash
@@ -0,0 +1,5 @@
+# Fetched from http://download.osgeo.org/proj/proj-4.9.3.tar.gz.md5
+md5 d598336ca834742735137c5674b214a1 proj-4.9.3.tar.gz
+# Locally calculated
+sha256 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7 proj-4.9.3.tar.gz
+sha256 2dcac4af6990093ef48b896bfb81452d46a31b08d46cce34b27e83f93b2e37f6 COPYING
diff --git a/bsp/buildroot/package/proj/proj.mk b/bsp/buildroot/package/proj/proj.mk
new file mode 100644
index 00000000..6d029bba
--- /dev/null
+++ b/bsp/buildroot/package/proj/proj.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# proj
+#
+################################################################################
+
+PROJ_VERSION = 4.9.3
+PROJ_SITE = http://download.osgeo.org/proj
+PROJ_LICENSE = MIT
+PROJ_LICENSE_FILES = COPYING
+PROJ_INSTALL_STAGING = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/prosody/Config.in b/bsp/buildroot/package/prosody/Config.in
new file mode 100644
index 00000000..77eeb85a
--- /dev/null
+++ b/bsp/buildroot/package/prosody/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_PROSODY
+	bool "prosody"
+	depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT
+	select BR2_PACKAGE_LUAEXPAT # runtime
+	select BR2_PACKAGE_LUASEC # runtime
+	select BR2_PACKAGE_LUASOCKET # runtime
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBIDN
+	select BR2_PACKAGE_LUAFILESYSTEM # runtime
+	help
+	  Prosody is a modern XMPP communication server. It aims to be
+	  easy to set up and configure, and efficient with system
+	  resources.
+
+	  https://prosody.im
+
+comment "prosody needs the lua interpreter"
+	depends on !BR2_PACKAGE_LUA_5_1 && !BR2_PACKAGE_LUAJIT
diff --git a/bsp/buildroot/package/prosody/S50prosody b/bsp/buildroot/package/prosody/S50prosody
new file mode 100644
index 00000000..84913a5f
--- /dev/null
+++ b/bsp/buildroot/package/prosody/S50prosody
@@ -0,0 +1,44 @@
+#! /bin/sh
+
+NAME=prosody
+DAEMON=/usr/bin/$NAME
+
+# This must match the pidfile field in
+# /etc/prosody/prosody.cfg.lua
+
+PIDDIR=/var/run/$NAME
+PIDFILE=$PIDDIR/$NAME.pid
+
+# Gracefully exit if the package has been removed.
+test -x $DAEMON || exit 0
+
+case "$1" in
+  start)
+    printf "Starting $NAME: "
+    mkdir -p $PIDDIR
+    chown $NAME:$NAME $PIDDIR
+    start-stop-daemon -S -q -o -x $DAEMON -c $NAME
+    [ $? = 0 ] && echo "OK" || echo "FAIL"
+    ;;
+  stop)
+    printf "Stopping $NAME: "
+    # The standard method of identifying the name doesn't
+    # work as the process name is lua. So use the pidfile
+    # which is created by the service itself as a match
+    # criteria when stopping the service
+    start-stop-daemon -K -q -o -p "$PIDFILE"
+    [ $? = 0 ] && echo "OK" || echo "FAIL"
+    ;;
+  restart|reload)
+    echo "Restarting $NAME: "
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|restart|reload}" >&2
+    exit 1
+    ;;
+esac
+
+exit 0
diff --git a/bsp/buildroot/package/prosody/prosody.cfg.lua b/bsp/buildroot/package/prosody/prosody.cfg.lua
new file mode 100644
index 00000000..8329c0ad
--- /dev/null
+++ b/bsp/buildroot/package/prosody/prosody.cfg.lua
@@ -0,0 +1,184 @@
+-- Prosody Example Configuration File
+--
+-- Information on configuring Prosody can be found on our
+-- website at http://prosody.im/doc/configure
+--
+-- Tip: You can check that the syntax of this file is correct
+-- when you have finished by running: luac -p prosody.cfg.lua
+-- If there are any errors, it will let you know what and where
+-- they are, otherwise it will keep quiet.
+--
+-- The only thing left to do is rename this file to remove the .dist ending, and fill in the
+-- blanks. Good luck, and happy Jabbering!
+
+
+---------- Server-wide settings ----------
+-- Settings in this section apply to the whole server and are the default settings
+-- for any virtual hosts
+
+-- This is a (by default, empty) list of accounts that are admins
+-- for the server. Note that you must create the accounts separately
+-- (see http://prosody.im/doc/creating_accounts for info)
+-- Example: admins = { "user1@example.com", "user2@example.net" }
+admins = { }
+
+-- Enable use of libevent for better performance under high load
+-- For more information see: http://prosody.im/doc/libevent
+--use_libevent = true;
+
+-- This is the list of modules Prosody will load on startup.
+-- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+-- Documentation on modules can be found at: http://prosody.im/doc/modules
+modules_enabled = {
+
+	-- Generally required
+		"roster"; -- Allow users to have a roster. Recommended ;)
+		"saslauth"; -- Authentication for clients and servers. Recommended if you want to log in.
+		"tls"; -- Add support for secure TLS on c2s/s2s connections
+		"dialback"; -- s2s dialback support
+		"disco"; -- Service discovery
+
+	-- Not essential, but recommended
+		"private"; -- Private XML storage (for room bookmarks, etc.)
+		"vcard"; -- Allow users to set vCards
+	
+	-- These are commented by default as they have a performance impact
+		--"privacy"; -- Support privacy lists
+		--"compression"; -- Stream compression
+
+	-- Nice to have
+		"version"; -- Replies to server version requests
+		"uptime"; -- Report how long server has been running
+		"time"; -- Let others know the time here on this server
+		"ping"; -- Replies to XMPP pings with pongs
+		"pep"; -- Enables users to publish their mood, activity, playing music and more
+		"register"; -- Allow users to register on this server using a client and change passwords
+
+	-- Admin interfaces
+		"admin_adhoc"; -- Allows administration via an XMPP client that supports ad-hoc commands
+		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
+	
+	-- HTTP modules
+		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
+		--"http_files"; -- Serve static files from a directory over HTTP
+
+	-- Other specific functionality
+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
+		--"groups"; -- Shared roster support
+		--"announce"; -- Send announcement to all online users
+		--"welcome"; -- Welcome users who register accounts
+		--"watchregistrations"; -- Alert admins of registrations
+		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
+};
+
+-- These modules are auto-loaded, but should you want
+-- to disable them then uncomment them here:
+modules_disabled = {
+	-- "offline"; -- Store offline messages
+	-- "c2s"; -- Handle client connections
+	-- "s2s"; -- Handle server-to-server connections
+};
+
+-- Disable account creation by default, for security
+-- For more information see http://prosody.im/doc/creating_accounts
+allow_registration = false;
+
+-- These are the SSL/TLS-related settings. If you don't want
+-- to use SSL/TLS, you may comment or remove this
+ssl = {
+	key = "certs/localhost.key";
+	certificate = "certs/localhost.crt";
+}
+
+-- Force clients to use encrypted connections? This option will
+-- prevent clients from authenticating unless they are using encryption.
+
+c2s_require_encryption = false
+
+-- Force certificate authentication for server-to-server connections?
+-- This provides ideal security, but requires servers you communicate
+-- with to support encryption AND present valid, trusted certificates.
+-- NOTE: Your version of LuaSec must support certificate verification!
+-- For more information see http://prosody.im/doc/s2s#security
+
+s2s_secure_auth = false
+
+-- Many servers don't support encryption or have invalid or self-signed
+-- certificates. You can list domains here that will not be required to
+-- authenticate using certificates. They will be authenticated using DNS.
+
+--s2s_insecure_domains = { "gmail.com" }
+
+-- Even if you leave s2s_secure_auth disabled, you can still require valid
+-- certificates for some domains by specifying a list here.
+
+--s2s_secure_domains = { "jabber.org" }
+
+-- Select the authentication backend to use. The 'internal' providers
+-- use Prosody's configured data storage to store the authentication data.
+-- To allow Prosody to offer secure authentication mechanisms to clients, the
+-- default provider stores passwords in plaintext. If you do not trust your
+-- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
+-- for information about using the hashed backend.
+
+authentication = "internal_plain"
+
+-- Select the storage backend to use. By default Prosody uses flat files
+-- in its configured data directory, but it also supports more backends
+-- through modules. An "sql" backend is included by default, but requires
+-- additional dependencies. See http://prosody.im/doc/storage for more info.
+
+--storage = "sql" -- Default is "internal"
+
+-- For the "sql" backend, you can uncomment *one* of the below to configure:
+--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.
+--sql = { driver = "MySQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
+--sql = { driver = "PostgreSQL", database = "prosody", username = "prosody", password = "secret", host = "localhost" }
+
+-- Logging configuration
+-- For advanced logging see http://prosody.im/doc/logging
+log = {
+	-- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+	-- error = "prosody.err";
+	"*syslog"; -- Logging to syslog
+	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+}
+
+pidfile = "/var/run/prosody/prosody.pid"
+
+----------- Virtual hosts -----------
+-- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+-- Settings under each VirtualHost entry apply *only* to that host.
+
+VirtualHost "localhost"
+
+VirtualHost "example.com"
+	-- Assign this host a certificate for TLS, otherwise it would use the one
+	-- set in the global section (if any).
+	-- Note that old-style SSL on port 5223 only supports one certificate, and will always
+	-- use the global one.
+	ssl = {
+		key = "certs/example.com.key";
+		certificate = "certs/example.com.crt";
+	}
+
+------ Components ------
+-- You can specify components to add hosts that provide special services,
+-- like multi-user conferences, and transports.
+-- For more information on components, see http://prosody.im/doc/components
+
+---Set up a MUC (multi-user chat) room server on conference.example.com:
+--Component "conference.example.com" "muc"
+
+-- Set up a SOCKS5 bytestream proxy for server-proxied file transfers:
+--Component "proxy.example.com" "proxy65"
+
+---Set up an external component (default component port is 5347)
+--
+-- External components allow adding various services, such as gateways/
+-- transports to other networks like ICQ, MSN and Yahoo. For more info
+-- see: http://prosody.im/doc/components#adding_an_external_component
+--
+--Component "gateway.example.com"
+--	component_secret = "password"
diff --git a/bsp/buildroot/package/prosody/prosody.hash b/bsp/buildroot/package/prosody/prosody.hash
new file mode 100644
index 00000000..38942ea7
--- /dev/null
+++ b/bsp/buildroot/package/prosody/prosody.hash
@@ -0,0 +1,5 @@
+# Hashes from: https://prosody.im/downloads/source/{MD5,SHA1,SHA256,SHA512}SUMS
+md5    d743adea6cfbaacc3a24cc0c3928bb1b  prosody-0.9.12.tar.gz
+sha1   1ee224263a5b3d67960e12edbbe6b2f16b95d147  prosody-0.9.12.tar.gz
+sha256 1a59a322b71928a21985522aa00d0eab3552208d7bf9ecb318542a1b2fee3e8d  prosody-0.9.12.tar.gz
+sha512 e87b5f3b3e327722cec9d8d0470684e2ec2788a1c5ae623c4f505a00572ef21f65afe84cd5b7de47d6a65fe8872506fe34e5e8886e20979ff84710669857ca76  prosody-0.9.12.tar.gz
diff --git a/bsp/buildroot/package/prosody/prosody.mk b/bsp/buildroot/package/prosody/prosody.mk
new file mode 100644
index 00000000..d1965350
--- /dev/null
+++ b/bsp/buildroot/package/prosody/prosody.mk
@@ -0,0 +1,72 @@
+################################################################################
+#
+# prosody
+#
+################################################################################
+
+PROSODY_VERSION = 0.9.12
+PROSODY_SITE = https://prosody.im/downloads/source
+PROSODY_LICENSE = MIT
+PROSODY_LICENSE_FILES = COPYING
+PROSODY_DEPENDENCIES = openssl libidn
+
+ifeq ($(BR2_PACKAGE_LUA_5_1),y)
+PROSODY_DEPENDENCIES += lua
+endif
+
+ifeq ($(BR2_PACKAGE_LUAJIT),y)
+PROSODY_DEPENDENCIES += luajit
+endif
+
+PROSODY_CONF_OPTS = \
+	--with-lua=$(STAGING_DIR)/usr \
+	--c-compiler=$(TARGET_CC) \
+	--cflags="$(TARGET_CFLAGS) -fPIC" \
+	--linker=$(TARGET_CC) \
+	--ldflags="$(TARGET_LDFLAGS) -shared" \
+	--sysconfdir=/etc/prosody \
+	--prefix=/usr
+
+define PROSODY_CONFIGURE_CMDS
+	cd $(@D) && \
+		$(TARGET_CONFIGURE_OPTS) \
+		./configure $(PROSODY_CONF_OPTS)
+endef
+
+define PROSODY_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define PROSODY_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
+endef
+
+define PROSODY_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/prosody/S50prosody \
+		$(TARGET_DIR)/etc/init.d/S50prosody
+endef
+
+define PROSODY_USERS
+	prosody -1 prosody -1 * - - - Prosody user
+endef
+
+# make install installs a Makefile and meta data to generate certs
+define PROSODY_REMOVE_CERT_GENERATOR
+	rm -f $(TARGET_DIR)/etc/prosody/certs/Makefile
+	rm -f $(TARGET_DIR)/etc/prosody/certs/*.cnf
+endef
+
+PROSODY_POST_INSTALL_TARGET_HOOKS += PROSODY_REMOVE_CERT_GENERATOR
+
+# 1. Enable posix functionality
+# 2. Log to syslog
+# 3. Specify pid file write location
+# 4. Enable virtual host example.com
+define PROSODY_TWEAK_DEFAULT_CONF
+	$(INSTALL) -D package/prosody/prosody.cfg.lua \
+		$(TARGET_DIR)/etc/prosody/prosody.cfg.lua
+endef
+
+PROSODY_POST_INSTALL_TARGET_HOOKS += PROSODY_TWEAK_DEFAULT_CONF
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/protobuf-c/Config.in b/bsp/buildroot/package/protobuf-c/Config.in
index 28555502..6f916c57 100644
--- a/bsp/buildroot/package/protobuf-c/Config.in
+++ b/bsp/buildroot/package/protobuf-c/Config.in
@@ -4,12 +4,14 @@ config BR2_PACKAGE_PROTOBUF_C
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# host-protobuf only builds on certain architectures
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_HOST_GCC_AT_LEAST_4_5 # host-protobuf
 	help
 	  Code generator and runtime libraries to use Protocol Buffers
 	  from pure C (not C++).
 
-	  http://code.google.com/p/protobuf-c/
+	  https://github.com/protobuf-c/protobuf-c
 
-comment "protobuf-c needs a toolchain w/ C++, threads"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "protobuf-c needs a toolchain w/ C++, threads, host gcc >= 4.5"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_HOST_GCC_AT_LEAST_4_5
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
diff --git a/bsp/buildroot/package/protobuf-c/protobuf-c.hash b/bsp/buildroot/package/protobuf-c/protobuf-c.hash
index 7584058e..e22a9f1c 100644
--- a/bsp/buildroot/package/protobuf-c/protobuf-c.hash
+++ b/bsp/buildroot/package/protobuf-c/protobuf-c.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 49340784ca0f8657f38547088731fff3bfe8084adb89bf5e8dbc19ac43339aa6 protobuf-c-v1.1.1.tar.gz
+sha256 fd8f6f5d6927330cf2b8b4ec8332de8b1ee2b8f2480b52ee3f221aad6de2082c protobuf-c-v1.3.0.tar.gz
diff --git a/bsp/buildroot/package/protobuf-c/protobuf-c.mk b/bsp/buildroot/package/protobuf-c/protobuf-c.mk
index ee4500ee..43066105 100644
--- a/bsp/buildroot/package/protobuf-c/protobuf-c.mk
+++ b/bsp/buildroot/package/protobuf-c/protobuf-c.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-PROTOBUF_C_VERSION = v1.1.1
+PROTOBUF_C_VERSION = v1.3.0
 PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,$(PROTOBUF_C_VERSION))
 PROTOBUF_C_DEPENDENCIES = host-protobuf-c
 HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf
 PROTOBUF_C_MAKE = $(MAKE1)
 PROTOBUF_C_CONF_OPTS = --disable-protoc
 PROTOBUF_C_INSTALL_STAGING = YES
-PROTOBUF_C_LICENSE = BSD-2c
+PROTOBUF_C_LICENSE = BSD-2-Clause
 PROTOBUF_C_LICENSE_FILES = LICENSE
 PROTOBUF_C_AUTORECONF = YES
 HOST_PROTOBUF_C_AUTORECONF = YES
diff --git a/bsp/buildroot/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch b/bsp/buildroot/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch
deleted file mode 100644
index fffdf49f..00000000
--- a/bsp/buildroot/package/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f020fe05a20dfcd16cd7df833dcf3cdeef770538 Mon Sep 17 00:00:00 2001
-From: Carlos Santos <casantos@datacom.ind.br>
-Date: Thu, 11 Feb 2016 10:58:35 -0200
-Subject: [PATCH 2/2] configure.ac: check if libatomic is needed
-
-Compilation of protobuf for PowerPC and SPARC may fail due to missing
-references to __atomic_fetch_add_4 and __atomic_compare_exchange_4.
-
-The __atomic_*() intrinsics for all sizes are provided by libatomic when
-gcc is >= 4.8. This can be achieved by adding this to configure.ac:
-
-    AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic])
-
-Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index c07067c..88d4a0d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -160,6 +160,8 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"])
- # We still keep this for improving pbconfig.h for unsupported platforms.
- AC_CXX_STL_HASH
- 
-+AC_SEARCH_LIBS([__atomic_load_4], [atomic])
-+
- case "$target_os" in
-   mingw* | cygwin* | win*)
-     ;;
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/protobuf/Config.in b/bsp/buildroot/package/protobuf/Config.in
index bccf258f..c91e4015 100644
--- a/bsp/buildroot/package/protobuf/Config.in
+++ b/bsp/buildroot/package/protobuf/Config.in
@@ -11,11 +11,7 @@
 #
 # Since protobuf most likely only uses the 1, 2 and 4-byte variants, it
 # *could* technically build with gcc 4.7. This is probably not a big deal,
-# and we can live with requiring gcc 4.8 on PowerPC to build protobuf. 
-#
-# The SPARC64 build fails due to a missing definition of Atomic64. This
-# has been fixed on the master branch but the build still breaks due to
-# undefined references to internal NoBarrier_Atomic*() functions.
+# and we can live with requiring gcc 4.8 on PowerPC to build protobuf.
 #
 # host-protobuf only builds on certain architectures
 config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
@@ -24,8 +20,8 @@ config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
 	default y if BR2_i386
 	default y if BR2_mipsel
 	default y if BR2_x86_64
+	default y if BR2_sparc64
 	default y if BR2_TOOLCHAIN_HAS_ATOMIC
-	depends on !BR2_sparc64 # missing definition of Atomic64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_USE_MMU # fork()
 
@@ -34,14 +30,18 @@ config BR2_PACKAGE_PROTOBUF
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
+	depends on BR2_HOST_GCC_AT_LEAST_4_5
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 	depends on !BR2_STATIC_LIBS
 	help
-	  Protocol buffers are Google's language-neutral, platform-neutral,
-	  extensible mechanism for serializing structured data.
+	  Protocol buffers are Google's language-neutral,
+	  platform-neutral, extensible mechanism for serializing
+	  structured data.
 
 	  https://developers.google.com/protocol-buffers
 
-comment "protobuf needs a toolchain w/ C++, threads, dynamic library"
+comment "protobuf needs a toolchain w/ C++, threads, dynamic library, host and target gcc >= 4.5"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| BR2_STATIC_LIBS
+		|| BR2_STATIC_LIBS || !BR2_HOST_GCC_AT_LEAST_4_5 \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 	depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS
diff --git a/bsp/buildroot/package/protobuf/protobuf.hash b/bsp/buildroot/package/protobuf/protobuf.hash
index b681650a..fa02440a 100644
--- a/bsp/buildroot/package/protobuf/protobuf.hash
+++ b/bsp/buildroot/package/protobuf/protobuf.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 f5b3563f118f1d3d6e001705fa7082e8fc3bda50038ac3dff787650795734146 protobuf-v3.0.0.tar.gz
+sha256 2bb34b4a8211a30d12ef29fd8660995023d119c99fbab2e5fe46f17528c9cc78 protobuf-cpp-3.4.1.tar.gz
diff --git a/bsp/buildroot/package/protobuf/protobuf.mk b/bsp/buildroot/package/protobuf/protobuf.mk
index dabbfb7a..d2782ddc 100644
--- a/bsp/buildroot/package/protobuf/protobuf.mk
+++ b/bsp/buildroot/package/protobuf/protobuf.mk
@@ -7,16 +7,19 @@
 # When bumping this package, make sure to also verify if the
 # python-protobuf package still works, as they share the same
 # version/site variables.
-PROTOBUF_VERSION = v3.0.0
-PROTOBUF_SITE = $(call github,google,protobuf,$(PROTOBUF_VERSION))
-PROTOBUF_LICENSE = BSD-3c
+PROTOBUF_VERSION = 3.4.1
+PROTOBUF_SOURCE = protobuf-cpp-$(PROTOBUF_VERSION).tar.gz
+PROTOBUF_SITE = https://github.com/google/protobuf/releases/download/v$(PROTOBUF_VERSION)
+PROTOBUF_LICENSE = BSD-3-Clause
 PROTOBUF_LICENSE_FILES = LICENSE
-# no configure script
-PROTOBUF_AUTORECONF = YES
 
 # N.B. Need to use host protoc during cross compilation.
 PROTOBUF_DEPENDENCIES = host-protobuf
-PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc
+PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/bin/protoc
+
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+PROTOBUF_CONF_ENV += LIBS=-latomic
+endif
 
 PROTOBUF_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/proxychains-ng/Config.in b/bsp/buildroot/package/proxychains-ng/Config.in
index 1f89b131..e27283ad 100644
--- a/bsp/buildroot/package/proxychains-ng/Config.in
+++ b/bsp/buildroot/package/proxychains-ng/Config.in
@@ -3,7 +3,8 @@ config BR2_PACKAGE_PROXYCHAINS_NG
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
 	help
-	  Force any tcp connections to flow through a proxy (or proxy chain)
+	  Force any tcp connections to flow through a proxy (or proxy
+	  chain)
 
 	  https://github.com/rofl0r/proxychains
 
diff --git a/bsp/buildroot/package/proxychains-ng/proxychains-ng.mk b/bsp/buildroot/package/proxychains-ng/proxychains-ng.mk
index cf2379db..a9f3fc95 100644
--- a/bsp/buildroot/package/proxychains-ng/proxychains-ng.mk
+++ b/bsp/buildroot/package/proxychains-ng/proxychains-ng.mk
@@ -7,7 +7,7 @@
 PROXYCHAINS_NG_VERSION = 4.11
 PROXYCHAINS_NG_SOURCE = proxychains-ng-$(PROXYCHAINS_NG_VERSION).tar.bz2
 PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng
-PROXYCHAINS_NG_LICENSE = GPLv2+
+PROXYCHAINS_NG_LICENSE = GPL-2.0+
 PROXYCHAINS_NG_LICENSE_FILES = COPYING
 
 define PROXYCHAINS_NG_CONFIGURE_CMDS
diff --git a/bsp/buildroot/package/pru-software-support/pru-software-support.hash b/bsp/buildroot/package/pru-software-support/pru-software-support.hash
index 8f624da7..f4ce8e46 100644
--- a/bsp/buildroot/package/pru-software-support/pru-software-support.hash
+++ b/bsp/buildroot/package/pru-software-support/pru-software-support.hash
@@ -1,2 +1,2 @@
 # Locally-calculated hash
-sha256	b257535ca9b1641d1a238795f3c7004064c573a91cf4a1fa566e3f7c2360c38f	pru-software-support-804b548e69ef9fdf44445f6d0968d81cb8a1e7b4.tar.gz
+sha256	1e880d74f9a1d04324e6255cb7a0e3d40f92e08809dc81dc6c714447bac5c335	pru-software-support-v5.1.0.tar.gz
diff --git a/bsp/buildroot/package/pru-software-support/pru-software-support.mk b/bsp/buildroot/package/pru-software-support/pru-software-support.mk
index 06983c27..f30ff6b5 100644
--- a/bsp/buildroot/package/pru-software-support/pru-software-support.mk
+++ b/bsp/buildroot/package/pru-software-support/pru-software-support.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4
-PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git
-PRU_SOFTWARE_SUPPORT_LICENSE =  BSD-3c, GPLv2, Public Domain
-PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v4.0-Manifest.html
+PRU_SOFTWARE_SUPPORT_VERSION = v5.1.0
+PRU_SOFTWARE_SUPPORT_SITE = https://git.ti.com/pru-software-support-package/pru-software-support-package/archive-tarball/$(PRU_SOFTWARE_SUPPORT_VERSION)?
+PRU_SOFTWARE_SUPPORT_LICENSE =  BSD-3-Clause, GPL-2.0, Public Domain
+PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v5.0-Manifest.html
 PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support
 HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru
 
diff --git a/bsp/buildroot/package/pseudo/pseudo.mk b/bsp/buildroot/package/pseudo/pseudo.mk
index 8144cca8..44642710 100644
--- a/bsp/buildroot/package/pseudo/pseudo.mk
+++ b/bsp/buildroot/package/pseudo/pseudo.mk
@@ -9,7 +9,7 @@ PSEUDO_SITE = https://git.yoctoproject.org/git/pseudo
 PSEUDO_SITE_METHOD = git
 
 # No "or later" clause.
-PSEUDO_LICENSE = LGPLv2.1
+PSEUDO_LICENSE = LGPL-2.1
 PSEUDO_LICENSE_FILES = COPYING
 
 HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite
@@ -21,9 +21,9 @@ HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite
 # a warning at configure time.
 HOST_PSEUDO_CONF_OPTS = \
 	--cflags="$(HOSTCFLAGS)" \
-	--with-rpath=$(HOST_DIR)/usr/lib \
+	--with-rpath=$(HOST_DIR)/lib \
 	--bits=$(if $(filter %64,$(HOSTARCH)),64,32) \
-	--libdir=$(HOST_DIR)/usr/lib \
-	--with-sqlite=$(HOST_DIR)/usr
+	--libdir=$(HOST_DIR)/lib \
+	--with-sqlite=$(HOST_DIR)
 
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/psmisc/0001-link-against-libintl.patch b/bsp/buildroot/package/psmisc/0001-link-against-libintl.patch
index 907e7e75..bf6b9717 100644
--- a/bsp/buildroot/package/psmisc/0001-link-against-libintl.patch
+++ b/bsp/buildroot/package/psmisc/0001-link-against-libintl.patch
@@ -1,4 +1,7 @@
-Link against libintl if needed
+From f2b6f342325824399da3525df182031475b5c4dd Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Thu, 22 Jun 2017 13:56:03 +0300
+Subject: [PATCH] Link against libintl if needed
 
 When built against a C library that has locale support, but for which
 intl support is provided by an external libintl library, psmisc
@@ -8,26 +11,27 @@ properly checks that.
 This patch therefore ensure that we link against libintl when needed,
 thanks to the @INTLLIBS@ variable provided by the configure script.
 
-We do not modify the Makefile.am file, because autoreconfiguring this
-package doesn't work: because of its usage of gettext, it wants to run
-the "autopoint" program, which itself depends on CVS being installed,
-for some strange reasons. That's the reason why we fall back to the
-hacky solution of modifying the Makefile.in file.
-
 Forward-ported Thomas's patch to psmisc 22.16
 from commit f066ed70cd6939838d4057f66798cbc1d972cc73
-
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[baruch: move from Makefile.in to Makefile.am for 23.1]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 9f61ab4f2f70..8ce284e65124 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -65,6 +65,7 @@ src_fuser_LDADD = @LIBINTL@
+ src_killall_SOURCES = src/killall.c src/comm.h src/signals.c src/signals.h src/i18n.h
+ src_killall_LDADD = @LIBINTL@ @SELINUX_LIB@
+ src_peekfd_SOURCES = src/peekfd.c
++src_peekfd_LDADD = @LIBINTL@
+ src_pslog_SOURCES = src/pslog.c
+ src_pstree_SOURCES = src/pstree.c src/comm.h src/i18n.h
+ src_pstree_LDADD = @LIBINTL@ @TERMCAP_LIB@ @SELINUX_LIB@
+-- 
+2.11.0
 
-diff -Nura psmisc-22.16.orig/src/Makefile.in psmisc-22.16/src/Makefile.in
---- psmisc-22.16.orig/src/Makefile.in	2012-03-28 22:27:33.106660358 -0300
-+++ psmisc-22.16/src/Makefile.in	2012-03-28 22:28:55.752219349 -0300
-@@ -76,7 +76,7 @@
- killall_DEPENDENCIES =
- am_peekfd_OBJECTS = peekfd.$(OBJEXT)
- peekfd_OBJECTS = $(am_peekfd_OBJECTS)
--peekfd_LDADD = $(LDADD)
-+peekfd_LDADD = $(LDADD) @LIBINTL@
- am_prtstat_OBJECTS = prtstat.$(OBJEXT)
- prtstat_OBJECTS = $(am_prtstat_OBJECTS)
- prtstat_DEPENDENCIES =
diff --git a/bsp/buildroot/package/psmisc/0002-add-git-version-get.patch b/bsp/buildroot/package/psmisc/0002-add-git-version-get.patch
new file mode 100644
index 00000000..e75fb1d3
--- /dev/null
+++ b/bsp/buildroot/package/psmisc/0002-add-git-version-get.patch
@@ -0,0 +1,198 @@
+Makefile: ship also git-version-gen
+
+Without git-version-gen, the tarball autogen.sh fails.
+
+This patch is equivalent to upstream pending merge request:
+
+  https://gitlab.com/psmisc/psmisc/merge_requests/13
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+
+diff --git psmisc-23.1/misc/git-version-gen psmisc-23.1/misc/git-version-gen
+new file mode 100755
+index 000000000000..171767f0d7a3
+--- /dev/null
++++ psmisc-23.1/misc/git-version-gen
+@@ -0,0 +1,181 @@
++#!/bin/sh
++# Print a version string.
++scriptversion=2011-02-19.19; # UTC
++
++# Copyright (C) 2007-2011 Free Software Foundation, Inc.
++#
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
++
++# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/.
++# It may be run two ways:
++# - from a git repository in which the "git describe" command below
++#   produces useful output (thus requiring at least one signed tag)
++# - from a non-git-repo directory containing a .tarball-version file, which
++#   presumes this script is invoked like "./git-version-gen .tarball-version".
++
++# In order to use intra-version strings in your project, you will need two
++# separate generated version string files:
++#
++# .tarball-version - present only in a distribution tarball, and not in
++#   a checked-out repository.  Created with contents that were learned at
++#   the last time autoconf was run, and used by git-version-gen.  Must not
++#   be present in either $(srcdir) or $(builddir) for git-version-gen to
++#   give accurate answers during normal development with a checked out tree,
++#   but must be present in a tarball when there is no version control system.
++#   Therefore, it cannot be used in any dependencies.  GNUmakefile has
++#   hooks to force a reconfigure at distribution time to get the value
++#   correct, without penalizing normal development with extra reconfigures.
++#
++# .version - present in a checked-out repository and in a distribution
++#   tarball.  Usable in dependencies, particularly for files that don't
++#   want to depend on config.h but do want to track version changes.
++#   Delete this file prior to any autoconf run where you want to rebuild
++#   files to pick up a version string change; and leave it stale to
++#   minimize rebuild time after unrelated changes to configure sources.
++#
++# It is probably wise to add these two files to .gitignore, so that you
++# don't accidentally commit either generated file.
++#
++# Use the following line in your configure.ac, so that $(VERSION) will
++# automatically be up-to-date each time configure is run (and note that
++# since configure.ac no longer includes a version string, Makefile rules
++# should not depend on configure.ac for version updates).
++#
++# AC_INIT([GNU project],
++#         m4_esyscmd([build-aux/git-version-gen .tarball-version]),
++#         [bug-project@example])
++#
++# Then use the following lines in your Makefile.am, so that .version
++# will be present for dependencies, and so that .tarball-version will
++# exist in distribution tarballs.
++#
++# BUILT_SOURCES = $(top_srcdir)/.version
++# $(top_srcdir)/.version:
++#	echo $(VERSION) > $@-t && mv $@-t $@
++# dist-hook:
++#	echo $(VERSION) > $(distdir)/.tarball-version
++
++case $# in
++    1|2) ;;
++    *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version" \
++         '[TAG-NORMALIZATION-SED-SCRIPT]'
++       exit 1;;
++esac
++
++tarball_version_file=$1
++tag_sed_script="${2:-s/x/x/}"
++nl='
++'
++
++# Avoid meddling by environment variable of the same name.
++v=
++v_from_git=
++
++# First see if there is a tarball-only version file.
++# then try "git describe", then default.
++if test -f $tarball_version_file
++then
++    v=`cat $tarball_version_file` || v=
++    case $v in
++        *$nl*) v= ;; # reject multi-line output
++        [0-9]*) ;;
++        *) v= ;;
++    esac
++    test -z "$v" \
++        && echo "$0: WARNING: $tarball_version_file is missing or damaged" 1>&2
++fi
++
++if test -n "$v"
++then
++    : # use $v
++# Otherwise, if there is at least one git commit involving the working
++# directory, and "git describe" output looks sensible, use that to
++# derive a version string.
++elif test "`git log -1 --pretty=format:x . 2>&1`" = x \
++    && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \
++          || git describe --abbrev=4 HEAD 2>/dev/null` \
++    && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \
++    && case $v in
++         v[0-9]*) ;;
++         *) (exit 1) ;;
++       esac
++then
++    # Is this a new git that lists number of commits since the last
++    # tag or the previous older version that did not?
++    #   Newer: v6.10-77-g0f8faeb
++    #   Older: v6.10-g0f8faeb
++    case $v in
++        *-rc[0-9]) ;; # release candidate
++        *-*-*) : git describe is okay three part flavor ;;
++        *-*)
++            : git describe is older two part flavor
++            # Recreate the number of commits and rewrite such that the
++            # result is the same as if we were using the newer version
++            # of git describe.
++            vtag=`echo "$v" | sed 's/-.*//'`
++            commit_list=`git rev-list "$vtag"..HEAD 2>/dev/null` \
++                || { commit_list=failed;
++                     echo "$0: WARNING: git rev-list failed" 1>&2; }
++            numcommits=`echo "$commit_list" | wc -l`
++            v=`echo "$v" | sed "s/\(.*\)-\(.*\)/\1-$numcommits-\2/"`;
++            test "$commit_list" = failed && v=UNKNOWN
++            ;;
++    esac
++
++    case $v in
++        *-rc[0-9])
++	    # Remove the "g" in git describe's output string, to save a byte.
++            v=`echo "$v" | sed 's/\(.*\)-g/\1-/'`;
++	    ;;
++        *)
++	    # Change the first '-' to a '.', so version-comparing tools work properly.
++	    # Remove the "g" in git describe's output string, to save a byte.
++	    v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
++	    ;;
++    esac
++    v_from_git=1
++else
++    v=UNKNOWN
++fi
++
++v=`echo "$v" |sed 's/^v//'`
++
++# Test whether to append the "-dirty" suffix only if the version
++# string we're using came from git.  I.e., skip the test if it's "UNKNOWN"
++# or if it came from .tarball-version.
++if test -n "$v_from_git"; then
++  # Don't declare a version "dirty" merely because a time stamp has changed.
++  git update-index --refresh > /dev/null 2>&1
++
++  dirty=`exec 2>/dev/null;git diff-index --name-only HEAD` || dirty=
++  case "$dirty" in
++      '') ;;
++      *) # Append the suffix only if there isn't one already.
++          case $v in
++            *-dirty) ;;
++            *) v="$v-dirty" ;;
++          esac ;;
++  esac
++fi
++
++# Omit the trailing newline, so that m4_esyscmd can use the result directly.
++echo "$v" | tr -d "$nl"
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-time-zone: "UTC"
++# time-stamp-end: "; # UTC"
++# End:
diff --git a/bsp/buildroot/package/psmisc/0002-no-__progname.patch b/bsp/buildroot/package/psmisc/0002-no-__progname.patch
deleted file mode 100644
index 51096571..00000000
--- a/bsp/buildroot/package/psmisc/0002-no-__progname.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-[PATCH]: pstree: don't use glibc-specific __progname
-
-uclibc (per default) doesn't implement __progname, and the pstree.x11
-stuff isn't that critical, so just disable it.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: psmisc-22.13/src/pstree.c
-===================================================================
---- psmisc-22.13.orig/src/pstree.c	2010-07-12 13:10:03.000000000 +0200
-+++ psmisc-22.13/src/pstree.c	2011-05-21 16:33:37.456530775 +0200
-@@ -49,8 +49,6 @@
- #include <selinux/selinux.h>
- #endif                                /*WITH_SELINUX */
- 
--extern const char *__progname;
--
- #define PROC_BASE    "/proc"
- 
- /* UTF-8 defines by Johan Myreen, updated by Ben Winslow */
-@@ -854,9 +852,6 @@
-     textdomain(PACKAGE);
- #endif
- 
--    if (!strcmp(__progname, "pstree.x11"))
--        wait_end = 1;
--
-     /*
-      * Attempt to figure out a good default symbol set.  Will be overriden by
-      * command-line options, if given.
-Index: psmisc-22.13/src/Makefile.in
-===================================================================
---- psmisc-22.13.orig/src/Makefile.in	2011-05-21 16:33:42.748530777 +0200
-+++ psmisc-22.13/src/Makefile.in	2011-05-21 16:33:47.360530782 +0200
-@@ -557,10 +557,6 @@
- 		grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \
- 		  { rm -f signames.h; exit 1; }
- 
--install-exec-hook:
--		cd $(DESTDIR)$(bindir) && \
--			( [ -h pstree.x11 ]  || $(LN_S) pstree pstree.x11)
--
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/bsp/buildroot/package/psmisc/Config.in b/bsp/buildroot/package/psmisc/Config.in
index 734542cc..84e30967 100644
--- a/bsp/buildroot/package/psmisc/Config.in
+++ b/bsp/buildroot/package/psmisc/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_PSMISC
 	bool "psmisc"
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  Helpful /proc related utilities such as pstree, fuser, and killall
+	  Helpful /proc related utilities such as pstree, fuser, and
+	  killall
 
-	  http://psmisc.sourceforge.net/
+	  https://gitlab.com/psmisc/psmisc
diff --git a/bsp/buildroot/package/psmisc/psmisc.hash b/bsp/buildroot/package/psmisc/psmisc.hash
index 5e489ed3..8ce8e00d 100644
--- a/bsp/buildroot/package/psmisc/psmisc.hash
+++ b/bsp/buildroot/package/psmisc/psmisc.hash
@@ -1,3 +1,5 @@
+# From https://sourceforge.net/projects/psmisc/files/psmisc/
+md5 bbba1f701c02fb50d59540d1ff90d8d1 psmisc-23.1.tar.xz
+sha1 d19031a5ba18a530aa0bb768cb74593f9af74b08 psmisc-23.1.tar.xz
 # Locally computed:
-sha256  97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a  psmisc-22.21.tar.gz
-sha256  4f1cb11c7182ad96e682ec50a2d9a6a22079a2b11dffde3bb3cb67823b679422  e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff
+sha256  2e84d474cf75dfbe3ecdacfb797bbfab71a35c7c2639d1b9f6d5f18b2149ba30  psmisc-23.1.tar.xz
diff --git a/bsp/buildroot/package/psmisc/psmisc.mk b/bsp/buildroot/package/psmisc/psmisc.mk
index 2f83b7d8..3d9a8046 100644
--- a/bsp/buildroot/package/psmisc/psmisc.mk
+++ b/bsp/buildroot/package/psmisc/psmisc.mk
@@ -4,13 +4,19 @@
 #
 ################################################################################
 
-PSMISC_VERSION = 22.21
+PSMISC_VERSION = 23.1
 PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc
-PSMISC_PATCH = \
-	https://gitlab.com/psmisc/psmisc/commit/e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff
-PSMISC_LICENSE = GPLv2
+PSMISC_SOURCE = psmisc-$(PSMISC_VERSION).tar.xz
+PSMISC_LICENSE = GPL-2.0
 PSMISC_LICENSE_FILES = COPYING
-PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
+PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
+# Patching Makefile.am
+PSMISC_AUTORECONF = YES
+
+define PSMISC_GIT_VERSION_EXEC
+	chmod +x $(@D)/misc/git-version-gen
+endef
+PSMISC_POST_PATCH_HOOKS += PSMISC_GIT_VERSION_EXEC
 
 ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
 # Don't force -fstack-protector when SSP is not available in toolchain
diff --git a/bsp/buildroot/package/psplash/Config.in b/bsp/buildroot/package/psplash/Config.in
index d68aaa21..5053ebac 100644
--- a/bsp/buildroot/package/psplash/Config.in
+++ b/bsp/buildroot/package/psplash/Config.in
@@ -2,18 +2,18 @@ config BR2_PACKAGE_PSPLASH
 	bool "psplash"
 	depends on BR2_USE_WCHAR
 	help
-	  PSplash is a userspace graphical boot splash screen for mainly
-	  embedded Linux devices supporting a 16bpp or 32bpp framebuffer.
-	  It has few dependencies (just libc), supports basic images and
-	  text and handles rotation. Its visual look is configurable by
-	  basic source changes.
+	  PSplash is a userspace graphical boot splash screen for
+	  mainly embedded Linux devices supporting a 16bpp or 32bpp
+	  framebuffer. It has few dependencies (just libc), supports
+	  basic images and text and handles rotation. Its visual look
+	  is configurable by basic source changes.
 
 	  Also included is a 'client' command utility for sending
 	  information to psplash such as boot progress information.
 
-	  Start the drawing process with 'psplash -n&' as early as possible.
-	  Note: psplash creates a FIFO in /tmp for communication with
-	  psplash-write.
+	  Start the drawing process with 'psplash -n&' as early as
+	  possible. Note: psplash creates a FIFO in /tmp for
+	  communication with psplash-write.
 
 	  Usage:
 	  * Set progress bar to 50 percent:
diff --git a/bsp/buildroot/package/psplash/psplash.hash b/bsp/buildroot/package/psplash/psplash.hash
new file mode 100644
index 00000000..68c6ffa8
--- /dev/null
+++ b/bsp/buildroot/package/psplash/psplash.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 aaddb20ef892dfb03d4e046cc634159bbcdfe555f7291652dde2b7d4cf491289  psplash-5b3c1cc28f5abdc2c33830150b48b278cc4f7bca.tar.gz
diff --git a/bsp/buildroot/package/psplash/psplash.mk b/bsp/buildroot/package/psplash/psplash.mk
index 4e365c53..fe009785 100644
--- a/bsp/buildroot/package/psplash/psplash.mk
+++ b/bsp/buildroot/package/psplash/psplash.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PSPLASH_VERSION = 14c8f7b705de944beb4de3f296506d80871e410f
+PSPLASH_VERSION = 5b3c1cc28f5abdc2c33830150b48b278cc4f7bca
 PSPLASH_SITE = git://git.yoctoproject.org/psplash
-PSPLASH_LICENSE = GPLv2+
+PSPLASH_LICENSE = GPL-2.0+
 PSPLASH_AUTORECONF = YES
 
 define PSPLASH_INSTALL_INIT_SYSTEMD
diff --git a/bsp/buildroot/package/ptpd2/Config.in b/bsp/buildroot/package/ptpd2/Config.in
index e88a9bb1..406276af 100644
--- a/bsp/buildroot/package/ptpd2/Config.in
+++ b/bsp/buildroot/package/ptpd2/Config.in
@@ -6,4 +6,3 @@ config BR2_PACKAGE_PTPD2
 	  (PTP) as defined by the IEEE-1588-2008.
 
 	  https://github.com/ptpd/ptpd
-
diff --git a/bsp/buildroot/package/ptpd2/ptpd2.mk b/bsp/buildroot/package/ptpd2/ptpd2.mk
index d53b1353..d95d415b 100644
--- a/bsp/buildroot/package/ptpd2/ptpd2.mk
+++ b/bsp/buildroot/package/ptpd2/ptpd2.mk
@@ -10,7 +10,7 @@ PTPD2_DEPENDENCIES = libpcap
 PTPD2_CONF_OPTS = --with-pcap-config=$(STAGING_DIR)/usr/bin/pcap-config
 # configure not shipped
 PTPD2_AUTORECONF = YES
-PTPD2_LICENSE = BSD-2c
+PTPD2_LICENSE = BSD-2-Clause
 PTPD2_LICENSE_FILES = COPYRIGHT
 
 ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/pugixml/Config.in b/bsp/buildroot/package/pugixml/Config.in
index d67e6957..c37b1df9 100644
--- a/bsp/buildroot/package/pugixml/Config.in
+++ b/bsp/buildroot/package/pugixml/Config.in
@@ -2,15 +2,18 @@ config BR2_PACKAGE_PUGIXML
 	bool "pugixml"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Light-weight, simple and fast XML parser for C++ with XPath support
+	  Light-weight, simple and fast XML parser for C++ with XPath
+	  support
 
 	  Features:
-	  * DOM-like interface with rich traversal/modification capabilities
-	  * Extremely fast non-validating XML parser which constructs the DOM tree
-	    from an XML file/buffer
-	  * XPath 1.0 implementation for complex data-driven tree queries
-	  * Full Unicode support with Unicode interface variants and automatic
-	    encoding conversions
+	  * DOM-like interface with rich traversal/modification
+	    capabilities
+	  * Extremely fast non-validating XML parser which constructs
+	    the DOM tree from an XML file/buffer
+	  * XPath 1.0 implementation for complex data-driven tree
+	    queries
+	  * Full Unicode support with Unicode interface variants and
+	    automatic encoding conversions
 
 	  http://pugixml.org/
 	  https://github.com/zeux/pugixml
diff --git a/bsp/buildroot/package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch b/bsp/buildroot/package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
deleted file mode 100644
index b2c06519..00000000
--- a/bsp/buildroot/package/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7af6cbe74d48a9853b60b029d4ce38a963386138 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 3 Jul 2016 20:19:48 +0200
-Subject: [PATCH] webrtc: C++11 is only required for WebRTC support
-
-Make C++11 support optional and explicitely check for gnu++11.
-
-Stop the build only if no C++11 support has been found and WebRTC
-support has been resquested.
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- configure.ac | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4edc8e0..fea93a9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -84,7 +84,7 @@ AM_PROG_CC_C_O
- # Only required if you want the WebRTC canceller -- no runtime dep on
- # libstdc++ otherwise
- AC_PROG_CXX
--AX_CXX_COMPILE_STDCXX_11
-+AX_CXX_COMPILE_STDCXX_11([ext],[optional])
- AC_PROG_GCC_TRADITIONAL
- AC_USE_SYSTEM_EXTENSIONS
- 
-@@ -1414,6 +1414,9 @@ fi
- AC_ARG_ENABLE([webrtc-aec],
-     AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller]))
- 
-+AS_IF([test "x$enable_webrtc_aec" = "xyes" && test "$HAVE_CXX11" = "0"],
-+    [AC_MSG_ERROR([*** webrtc-audio-processing needs C++11 support])])
-+
- AS_IF([test "x$enable_webrtc_aec" != "xno"],
-     [PKG_CHECK_MODULES(WEBRTC, [ webrtc-audio-processing >= 0.2 ], [HAVE_WEBRTC=1], [HAVE_WEBRTC=0])],
-     [HAVE_WEBRTC=0])
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/pulseaudio/Config.in b/bsp/buildroot/package/pulseaudio/Config.in
index 20aa374f..6600006a 100644
--- a/bsp/buildroot/package/pulseaudio/Config.in
+++ b/bsp/buildroot/package/pulseaudio/Config.in
@@ -1,14 +1,23 @@
+config BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
+	bool
+	default y if BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS || \
+		BR2_TOOLCHAIN_HAS_SYNC_4
+
+config BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC
+	bool
+	select BR2_PACKAGE_LIBATOMIC_OPS if !BR2_TOOLCHAIN_HAS_SYNC_4
+
 config BR2_PACKAGE_PULSEAUDIO
 	bool "pulseaudio"
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
-	select BR2_PACKAGE_LIBTOOL
-	select BR2_PACKAGE_JSON_C
-	select BR2_PACKAGE_LIBSNDFILE
-	select BR2_PACKAGE_SPEEX
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBTOOL
+	select BR2_PACKAGE_LIBSNDFILE
+	select BR2_PACKAGE_PULSEAUDIO_ENABLE_ATOMIC
+	select BR2_PACKAGE_SPEEX
 	help
 	  PulseAudio is a sound system for POSIX OSes, meaning that it
 	  is a proxy for your sound applications. It allows you to do
@@ -33,5 +42,5 @@ endif
 
 comment "pulseaudio needs a toolchain w/ wchar, threads, dynamic library"
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/pulseaudio/pulseaudio.hash b/bsp/buildroot/package/pulseaudio/pulseaudio.hash
index 0ef825d8..7e59afdf 100644
--- a/bsp/buildroot/package/pulseaudio/pulseaudio.hash
+++ b/bsp/buildroot/package/pulseaudio/pulseaudio.hash
@@ -1,3 +1,5 @@
-# From http://freedesktop.org/software/pulseaudio/releases/pulseaudio-9.0.tar.xz.{md5,sha1}
-md5 da7162541b3a9bc20576dbd0d7d1489a  pulseaudio-9.0.tar.xz
-sha1 d9a9d7cb667ed95ee1de4b6544d5c7444c5a0064  pulseaudio-9.0.tar.xz
+# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2017-September/028733.html
+md5 390de38231d5cdd6b43ada8939eb74f1  pulseaudio-11.1.tar.xz
+sha1 53bde72b6bfe715c19b1519db8845f7a58346b67  pulseaudio-11.1.tar.xz
+# Locally computed
+sha256 f2521c525a77166189e3cb9169f75c2ee2b82fa3fcf9476024fbc2c3a6c9cd9e  pulseaudio-11.1.tar.xz
diff --git a/bsp/buildroot/package/pulseaudio/pulseaudio.mk b/bsp/buildroot/package/pulseaudio/pulseaudio.mk
index 5960f8a5..13fcec52 100644
--- a/bsp/buildroot/package/pulseaudio/pulseaudio.mk
+++ b/bsp/buildroot/package/pulseaudio/pulseaudio.mk
@@ -4,39 +4,33 @@
 #
 ################################################################################
 
-PULSEAUDIO_VERSION = 9.0
+PULSEAUDIO_VERSION = 11.1
 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz
 PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases
 PULSEAUDIO_INSTALL_STAGING = YES
-PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file)
+PULSEAUDIO_LICENSE = LGPL-2.1+ (specific license for modules, see LICENSE file)
 PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL
 PULSEAUDIO_CONF_OPTS = \
 	--disable-default-build-tests \
 	--disable-legacy-database-entry-format \
 	--disable-manpages
 
-# Make sure we don't detect libatomic_ops. Indeed, since pulseaudio
-# requires json-c, which needs 4 bytes __sync builtins, there should
-# be no need for pulseaudio to rely on libatomic_ops.
-PULSEAUDIO_CONF_ENV += \
-	ac_cv_header_atomic_ops_h=no
-
-# 0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch
-PULSEAUDIO_AUTORECONF = YES
-
 PULSEAUDIO_DEPENDENCIES = \
-	host-pkgconf libtool json-c libsndfile speex host-intltool \
-	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \
-	$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \
+	host-pkgconf libtool libsndfile speex host-intltool \
 	$(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \
 	$(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \
 	$(if $(BR2_PACKAGE_DBUS),dbus) \
-	$(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) \
-	$(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) \
 	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
 	$(if $(BR2_PACKAGE_FFTW),fftw) \
 	$(if $(BR2_PACKAGE_SYSTEMD),systemd)
 
+ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y)
+PULSEAUDIO_CONF_OPTS += --enable-samplerate
+PULSEAUDIO_DEPENDENCIES += libsamplerate
+else
+PULSEAUDIO_CONF_OPTS += --disable-samplerate
+endif
+
 ifeq ($(BR2_PACKAGE_GDBM),y)
 PULSEAUDIO_CONF_OPTS += --with-database=gdbm
 PULSEAUDIO_DEPENDENCIES += gdbm
@@ -51,9 +45,16 @@ else
 PULSEAUDIO_CONF_OPTS += --disable-jack
 endif
 
+ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y)
+PULSEAUDIO_DEPENDENCIES += libatomic_ops
+ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y)
+PULSEAUDIO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9"
+endif
+endif
+
 ifeq ($(BR2_PACKAGE_ORC),y)
 PULSEAUDIO_DEPENDENCIES += orc
-PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc
+PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/bin/orcc
 PULSEAUDIO_CONF_OPTS += --enable-orc
 else
 PULSEAUDIO_CONF_OPTS += --disable-orc
@@ -81,6 +82,20 @@ else
 PULSEAUDIO_CONF_OPTS += --without-soxr
 endif
 
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy)
+PULSEAUDIO_CONF_OPTS += --enable-bluez4
+PULSEAUDIO_DEPENDENCIES += bluez_utils sbc
+else
+PULSEAUDIO_CONF_OPTS += --disable-bluez4
+endif
+
+ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy)
+PULSEAUDIO_CONF_OPTS += --enable-bluez5
+PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc
+else
+PULSEAUDIO_CONF_OPTS += --disable-bluez5
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 PULSEAUDIO_CONF_OPTS += --enable-udev
 PULSEAUDIO_DEPENDENCIES += udev
@@ -109,7 +124,10 @@ PULSEAUDIO_CONF_OPTS += --enable-neon-opt=no
 endif
 
 # pulseaudio alsa backend needs pcm/mixer apis
-ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy)
+PULSEAUDIO_DEPENDENCIES += alsa-lib
+PULSEAUDIO_CONF_OPTS += --enable-alsa
+else
 PULSEAUDIO_CONF_OPTS += --disable-alsa
 endif
 
@@ -118,7 +136,7 @@ PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst
 
 # .desktop file generation needs nls support, so fake it for !locale builds
 # https://bugs.freedesktop.org/show_bug.cgi?id=54658
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
 define PULSEAUDIO_FIXUP_DESKTOP_FILES
 	cp $(@D)/src/daemon/pulseaudio.desktop.in \
 		$(@D)/src/daemon/pulseaudio.desktop
@@ -130,11 +148,17 @@ else
 PULSEAUDIO_CONF_OPTS += --disable-x11
 endif
 
+# ConsoleKit module init failure breaks user daemon startup
+define PULSEAUDIO_REMOVE_CONSOLE_KIT
+	rm -f $(TARGET_DIR)/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules/module-console-kit.so
+endef
+
 define PULSEAUDIO_REMOVE_VALA
 	rm -rf $(TARGET_DIR)/usr/share/vala
 endef
 
-PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA
+PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA \
+	PULSEAUDIO_REMOVE_CONSOLE_KIT
 
 ifeq ($(BR2_PACKAGE_PULSEAUDIO_DAEMON),y)
 define PULSEAUDIO_USERS
diff --git a/bsp/buildroot/package/pulseview/0001-musl.patch b/bsp/buildroot/package/pulseview/0001-musl.patch
deleted file mode 100644
index 1acee737..00000000
--- a/bsp/buildroot/package/pulseview/0001-musl.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From dcfe0a01f72021aab961245d0ebcc9f8d4504b40 Mon Sep 17 00:00:00 2001
-From: Soeren Apel <soeren@apelpie.net>
-Date: Sun, 31 Jan 2016 14:12:44 +0100
-Subject: [PATCH] View: Honor ENABLE_DECODE compiler switch
-
-Signed-off-by: Soeren Apel <soeren@apelpie.net>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-Patch downloaded from upstream git:
-http://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff;h=dcfe0a01f72021aab961245d0ebcc9f8d4504b40
-as suggested by upstream:
-http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1954
-
- pv/view/view.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pv/view/view.cpp b/pv/view/view.cpp
-index c9b08bf..6ad7dea 100644
---- a/pv/view/view.cpp
-+++ b/pv/view/view.cpp
-@@ -43,7 +43,6 @@
- #include <libsigrokcxx/libsigrokcxx.hpp>
- 
- #include "analogsignal.hpp"
--#include "decodetrace.hpp"
- #include "header.hpp"
- #include "logicsignal.hpp"
- #include "ruler.hpp"
-@@ -59,6 +58,10 @@
- #include "pv/data/logicsegment.hpp"
- #include "pv/util.hpp"
- 
-+#ifdef ENABLE_DECODE
-+#include "decodetrace.hpp"
-+#endif
-+
- using boost::shared_lock;
- using boost::shared_mutex;
- 
-@@ -455,9 +458,11 @@ void View::enable_coloured_bg(bool state)
- 		if (l)
- 			l->set_coloured_bg(state);
- 
-+#ifdef ENABLE_DECODE
- 		shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
- 		if (d)
- 			d->set_coloured_bg(state);
-+#endif
- 	}
- 
- 	viewport_->update();
--- 
-2.6.2
-
diff --git a/bsp/buildroot/package/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch b/bsp/buildroot/package/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch
deleted file mode 100644
index 70549e6d..00000000
--- a/bsp/buildroot/package/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 71830c804be76cf6abe913ac2fe584947b7a91ea Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Tue, 24 May 2016 23:08:40 +0200
-Subject: [PATCH] cmake: add check for explicit linking against libatomic
-
-To use atomics functions, some toolchains requires to explicitly add
--latomic to the linker flags (because they are not provided by libc,
-but libatomic).
-
-This change adds a helper function trying to build/link a test program
-using atomics, then calls it to:
-* first check if atomics are directly available in the libc;
-* if not and libatomic has been found, then run the same test with
-  "-latomic" added to the linker flags.
-The pulseview link library list is updated according to the results of
-these tests.
-
-This issue was triggered by the Buildroot farms:
-  http://autobuild.buildroot.org/results/1e3/1e3101261252d5f30fdf842cc99604e4f4c25eef/build-end.log
-
-Notes:
-1- CMAKE_REQUIRED_* variables are only used in check functions. They
-   are not automatically forwarded to/handled by the target commands
-   (such as target_link_library), because the check functions are
-   implemented as macro in CMake code, whereas many target commands
-   are native.
-2- Because of note #1, CMAKE_REQUIRED_LIBRARIES (or its value) must be
-   explicitly passed to the target_link_library command when this is
-   needed.
-3- In this implementation, LIBATOMIC_LIBRARY is only set when it is
-   needed; so, unconditionally appending it to PULSEVIEW_LINK_LIBS
-   will produce the expected behavior.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
-changes v1->v2:
-- use std::atomic_fetch_add_explicit function instead of
-  __atomic_fetch_add_4;
-- rework code using cmake_*_check_state and find_library helpers;
-- quiet-ize checks and clean outputs
-- extend the commit log
----
- CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 50 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9dac69f..44f810e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,6 +107,55 @@ endif()
- # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
- find_package(Threads REQUIRED)
- 
-+
-+# Check for explicit link against libatomic
-+#
-+# Depending on the toolchain, linking a program using atomic functions may need
-+# "-latomic" explicitly passed to the linker
-+#
-+# This check first tests if atomics are available in the C-library, if not and
-+# libatomic exists, then it runs the same test with -latomic added to the
-+# linker flags.
-+
-+# Helper for checking for atomics
-+function(check_working_cxx_atomics varname additional_lib)
-+  include(CheckCXXSourceCompiles)
-+  include(CMakePushCheckState)
-+  cmake_push_check_state()
-+  set(CMAKE_REQUIRED_FLAGS "-std=c++11")
-+  set(CMAKE_REQUIRED_LIBRARIES "${additional_lib}")
-+  set(CMAKE_REQUIRED_QUIET 1)
-+  CHECK_CXX_SOURCE_COMPILES("
-+#include <atomic>
-+std::atomic<int> x;
-+int main() {
-+  return std::atomic_fetch_add_explicit(&x, 1, std::memory_order_seq_cst);
-+}
-+" ${varname})
-+  cmake_pop_check_state()
-+endfunction(check_working_cxx_atomics)
-+
-+# First check if atomics work without the library.
-+# If not, check if the library exists, and atomics work with it.
-+check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB "")
-+if(HAVE_CXX_ATOMICS_WITHOUT_LIB)
-+  message(STATUS "Atomics provided by the C-library - yes")
-+else()
-+  message(STATUS "Atomics provided by the C-library - no")
-+  find_library(LIBATOMIC_LIBRARY NAMES atomic PATH_SUFFIXES lib)
-+  if(LIBATOMIC_LIBRARY)
-+    check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB "${LIBATOMIC_LIBRARY}")
-+    if (HAVE_CXX_ATOMICS_WITH_LIB)
-+      message(STATUS "Atomics provided by libatomic - yes")
-+    else()
-+      message(STATUS "Atomics provided by libatomic - no")
-+      message(FATAL_ERROR "Compiler must support std::atomic!")
-+    endif()
-+  else()
-+    message(FATAL_ERROR "Compiler appears to require libatomic, but cannot find it.")
-+  endif()
-+endif()
-+
- #===============================================================================
- #= System Introspection
- #-------------------------------------------------------------------------------
-@@ -387,6 +436,7 @@ set(PULSEVIEW_LINK_LIBS
- 	${Boost_LIBRARIES}
- 	${QT_LIBRARIES}
- 	${CMAKE_THREAD_LIBS_INIT}
-+	${LIBATOMIC_LIBRARY}
- )
- 
- if(STATIC_PKGDEPS_LIBS)
--- 
-2.8.3
-
diff --git a/bsp/buildroot/package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch b/bsp/buildroot/package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch
deleted file mode 100644
index 89137f2a..00000000
--- a/bsp/buildroot/package/pulseview/0003-CMakeLists.txt-Avoid-fext-numeric-literals-not-suppo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 6ad4d7a6f17edecc3523a7ab3d627f9a70dbacc1 Mon Sep 17 00:00:00 2001
-From: Uwe Hermann <uwe@hermann-uwe.de>
-Date: Wed, 17 May 2017 11:00:44 +0200
-Subject: [PATCH] CMakeLists.txt: Avoid -fext-numeric-literals, (not supported
- by clang).
-
-This (re-)fixes bug #863.
-
-Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e8bc79f..e7e4432 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,6 +395,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
- add_definitions(-D__STDC_LIMIT_MACROS)
- add_definitions(-Wall -Wextra)
- add_definitions(-std=c++11)
-+add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
- 
- if(ENABLE_DECODE)
- 	add_definitions(-DENABLE_DECODE)
--- 
-2.9.3
-
diff --git a/bsp/buildroot/package/pulseview/Config.in b/bsp/buildroot/package/pulseview/Config.in
index 46abe78f..301acf7d 100644
--- a/bsp/buildroot/package/pulseview/Config.in
+++ b/bsp/buildroot/package/pulseview/Config.in
@@ -1,8 +1,17 @@
 config BR2_PACKAGE_PULSEVIEW
 	bool "pulseview"
+	depends on BR2_PACKAGE_QT5
+	# libsigrok->libglib2:
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
+	depends on BR2_INSTALL_LIBSTDCPP
+	# libsigrok->libzip
+	depends on !BR2_STATIC_LIBS
+	# libsigrok
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	select BR2_PACKAGE_LIBSIGROK
 	select BR2_PACKAGE_LIBSIGROKCXX
-	depends on BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE_WIDGETS
 	select BR2_PACKAGE_QT5BASE_PNG
 	select BR2_PACKAGE_QT5SVG
@@ -10,21 +19,15 @@ config BR2_PACKAGE_PULSEVIEW
 	select BR2_PACKAGE_BOOST_FILESYSTEM
 	select BR2_PACKAGE_BOOST_SYSTEM
 	select BR2_PACKAGE_BOOST_THREAD
-	# libsigrok->libglib2:
-	depends on BR2_USE_WCHAR
-	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_USE_MMU
-	depends on BR2_INSTALL_LIBSTDCPP
-	# libsigrok
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	select BR2_PACKAGE_BOOST_SERIALIZATION
 	help
 	  PulseView is a Qt based logic analyzer, oscilloscope
 	  and MSO GUI for sigrok.
 
 	  http://sigrok.org/wiki/PulseView
 
-comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8"
+comment "pulseview needs a toolchain w/ wchar, threads, dynamic library, C++, gcc >= 4.9"
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_QT5
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \
-		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR \
+		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/pulseview/pulseview.hash b/bsp/buildroot/package/pulseview/pulseview.hash
index dc50ec61..7883eabe 100644
--- a/bsp/buildroot/package/pulseview/pulseview.hash
+++ b/bsp/buildroot/package/pulseview/pulseview.hash
@@ -1,3 +1,2 @@
 # Locally computed
-sha256	5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e	pulseview-0.3.0.tar.gz
-sha256	7de425dfe3b0f76e76e266374dca8b2951510d232380901ef2abda71c7c30bb0	dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch
+sha256	78f8291045c6f65b4827b12e83c8e68cea2d5e7268b15a51aaca9726c8100eb9	pulseview-0.4.0.tar.gz
diff --git a/bsp/buildroot/package/pulseview/pulseview.mk b/bsp/buildroot/package/pulseview/pulseview.mk
index cc971871..e9bbf4f5 100644
--- a/bsp/buildroot/package/pulseview/pulseview.mk
+++ b/bsp/buildroot/package/pulseview/pulseview.mk
@@ -4,11 +4,9 @@
 #
 ################################################################################
 
-# TODO Pulseview can be built and linked against Qt4 as well.
-
-PULSEVIEW_VERSION = 0.3.0
+PULSEVIEW_VERSION = 0.4.0
 PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview
-PULSEVIEW_LICENSE = GPLv3+
+PULSEVIEW_LICENSE = GPL-3.0+
 PULSEVIEW_LICENSE_FILES = COPYING
 PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost
 PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE
diff --git a/bsp/buildroot/package/pure-ftpd/Config.in b/bsp/buildroot/package/pure-ftpd/Config.in
index 57b78d1a..c0601026 100644
--- a/bsp/buildroot/package/pure-ftpd/Config.in
+++ b/bsp/buildroot/package/pure-ftpd/Config.in
@@ -1,13 +1,14 @@
 config BR2_PACKAGE_PURE_FTPD
 	bool "pure-ftpd"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
-	  Pure-FTPd is a free (BSD), secure, production-quality and standard-
-	  conformant FTP server. It doesn't provide useless bells and whistles,
-	  but focuses on efficiency and ease of use. It provides simple answers
-	  to common needs, plus unique useful features for personal users as
-	  well as hosting providers.
+	  Pure-FTPd is a free (BSD), secure, production-quality and
+	  standard- conformant FTP server. It doesn't provide useless
+	  bells and whistles, but focuses on efficiency and ease of
+	  use. It provides simple answers to common needs, plus unique
+	  useful features for personal users as well as hosting
+	  providers.
 
 	  http://www.pureftpd.org
 
@@ -16,16 +17,23 @@ if BR2_PACKAGE_PURE_FTPD
 config BR2_PACKAGE_PURE_FTPD_FTPWHO
 	bool "ftpwho"
 	help
-	  Enable the pure-ftpd command.  Pure-ftpwho shows current Pure-ftpd
-	  client sessions.  Only the system administrator may run this.  Output
-	  can be text (default), HTML, XML data and parser-optimized.
+	  Enable the pure-ftpd command.  Pure-ftpwho shows current
+	  Pure-ftpd client sessions.  Only the system administrator
+	  may run this.  Output can be text (default), HTML, XML data
+	  and parser-optimized.
 
 config BR2_PACKAGE_PURE_FTPD_QUOTAS
 	bool "quotas"
 	help
 	  Enable virtual quotas. With virtual quotas, restrictions can
 	  be placed on the maximum number of files a user can store in
-	  his account. In addition, restrictions can also be placed
-	  on the total size.
+	  his account. In addition, restrictions can also be placed on
+	  the total size.
+
+config BR2_PACKAGE_PURE_FTPD_UPLOADSCRIPT
+	bool "uploadscript"
+	help
+	  Enable pure-upload script. Automatically run an external
+	  program after a successful upload.
 
 endif
diff --git a/bsp/buildroot/package/pure-ftpd/pure-ftpd.hash b/bsp/buildroot/package/pure-ftpd/pure-ftpd.hash
index 69962905..f01da51a 100644
--- a/bsp/buildroot/package/pure-ftpd/pure-ftpd.hash
+++ b/bsp/buildroot/package/pure-ftpd/pure-ftpd.hash
@@ -1,2 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256	efd11295998453e31dbeef9159624beabbac2643a338134ae8c2ef529aa2ec10	pure-ftpd-1.0.42.tar.bz2
+sha256 cb1b695e779a06e42d62d7a1a428d2f605d621dfd5afe4e192b5f9fc4e343692  pure-ftpd-1.0.47.tar.bz2
+sha256 e724ba991d8efa4c963e84ec31314c532dab00ac455ef77020fe60e78177bf23  COPYING
diff --git a/bsp/buildroot/package/pure-ftpd/pure-ftpd.mk b/bsp/buildroot/package/pure-ftpd/pure-ftpd.mk
index 95e70655..457e67ea 100644
--- a/bsp/buildroot/package/pure-ftpd/pure-ftpd.mk
+++ b/bsp/buildroot/package/pure-ftpd/pure-ftpd.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PURE_FTPD_VERSION = 1.0.42
-PURE_FTPD_SITE = http://download.pureftpd.org/pub/pure-ftpd/releases
+PURE_FTPD_VERSION = 1.0.47
+PURE_FTPD_SITE = https://download.pureftpd.org/pub/pure-ftpd/releases
 PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2
 PURE_FTPD_LICENSE = ISC
 PURE_FTPD_LICENSE_FILES = COPYING
@@ -53,4 +53,8 @@ ifeq ($(BR2_PACKAGE_PURE_FTPD_QUOTAS),y)
 PURE_FTPD_CONF_OPTS += --with-quotas
 endif
 
+ifeq ($(BR2_PACKAGE_PURE_FTPD_UPLOADSCRIPT),y)
+PURE_FTPD_CONF_OPTS += --with-uploadscript
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/putty/0001-uxcons-Fix-on-musl-libc.patch b/bsp/buildroot/package/putty/0001-uxcons-Fix-on-musl-libc.patch
deleted file mode 100644
index 5f43af0d..00000000
--- a/bsp/buildroot/package/putty/0001-uxcons-Fix-on-musl-libc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 4ae1577b432c1859704d2763f70a764dee23bd98 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Thu, 28 Apr 2016 22:40:32 -0400
-Subject: [PATCH] uxcons: Fix on musl libc
-
-musl libc exports FD_SET and friends in sys/select.h.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: upstream commit 4ae1577b432c
-
- unix/uxcons.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/unix/uxcons.c b/unix/uxcons.c
-index b9fd67fe9274..f2a25f3fed70 100644
---- a/unix/uxcons.c
-+++ b/unix/uxcons.c
-@@ -12,6 +12,7 @@
- #include <termios.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/select.h>
- 
- #include "putty.h"
- #include "storage.h"
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch b/bsp/buildroot/package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch
deleted file mode 100644
index 514b6298..00000000
--- a/bsp/buildroot/package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3377ea57f5d333d65d44a1130161396782389e88 Mon Sep 17 00:00:00 2001
-From: Tim Kosse <tim.kosse@filezilla-project.org>
-Date: Tue, 11 Aug 2015 09:43:34 +0200
-Subject: [PATCH] Fix  __uint128_t compile error on MinGW.
-
-MinGW has __uint128_t, but not __uint64_t.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: upstream commit 3377ea57f5
-
- sshbn.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sshbn.h b/sshbn.h
-index a043241eea67..9366f614ae4c 100644
---- a/sshbn.h
-+++ b/sshbn.h
-@@ -26,7 +26,7 @@
-  * using the same 'two machine registers' kind of code generation that
-  * 32-bit targets use for 64-bit ints. If we have one of these, we can
-  * use a 64-bit BignumInt and a 128-bit BignumDblInt. */
--typedef __uint64_t BignumInt;
-+typedef unsigned long long BignumInt;
- typedef __uint128_t BignumDblInt;
- #define BIGNUM_INT_MASK  0xFFFFFFFFFFFFFFFFULL
- #define BIGNUM_TOP_BIT   0x8000000000000000ULL
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/putty/Config.in b/bsp/buildroot/package/putty/Config.in
index fe5b9eb7..cd8b3bb2 100644
--- a/bsp/buildroot/package/putty/Config.in
+++ b/bsp/buildroot/package/putty/Config.in
@@ -1,9 +1,15 @@
 config BR2_PACKAGE_PUTTY
 	bool "putty"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_USE_WCHAR
 	help
-	  PuTTY is a free SSH and Telnet client. Without GTK2 activated,
-	  only the commandline tools plink, pscp, psftp, and puttygen are
-	  built; enable GTK2 for the graphical client.
+	  PuTTY is a free SSH and Telnet client. Without GTK2
+	  activated, only the commandline tools plink, pscp, psftp,
+	  and puttygen are built; enable GTK2 for the graphical
+	  client.
 
 	  http://www.chiark.greenend.org.uk/~sgtatham/putty/
+
+comment "putty needs a toolchain w/ wchar"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/putty/putty.hash b/bsp/buildroot/package/putty/putty.hash
index 75990e41..e0527105 100644
--- a/bsp/buildroot/package/putty/putty.hash
+++ b/bsp/buildroot/package/putty/putty.hash
@@ -1,3 +1,3 @@
-# Hashes from: http://the.earth.li/~sgtatham/putty/0.67/{sha256,sha512}sums
-sha256 80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47                                                                 putty-0.67.tar.gz
-sha512 c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca putty-0.67.tar.gz
+# Hashes from: http://the.earth.li/~sgtatham/putty/0.70/{sha256,sha512}sums
+sha256 bb8aa49d6e96c5a8e18a057f3150a1695ed99a24eef699e783651d1f24e7b0be                                                                 putty-0.70.tar.gz
+sha512 2aaf4fa2b4ad2d82eb5cdc4419ade79e0c5d8bd3c093db92b3c048e6107f85a5f1647f9d8203cda0906ce2b926725a75319f981cb32e6f1ebf50b1f738564fed putty-0.70.tar.gz
diff --git a/bsp/buildroot/package/putty/putty.mk b/bsp/buildroot/package/putty/putty.mk
index 5155714c..52f2d4c3 100644
--- a/bsp/buildroot/package/putty/putty.mk
+++ b/bsp/buildroot/package/putty/putty.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PUTTY_VERSION = 0.67
+PUTTY_VERSION = 0.70
 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION)
 PUTTY_SUBDIR = unix
 PUTTY_LICENSE = MIT
diff --git a/bsp/buildroot/package/pv/0001-configure.in-tighten-AIX-test.patch b/bsp/buildroot/package/pv/0001-configure.in-tighten-AIX-test.patch
new file mode 100644
index 00000000..2e0d2af2
--- /dev/null
+++ b/bsp/buildroot/package/pv/0001-configure.in-tighten-AIX-test.patch
@@ -0,0 +1,57 @@
+From cd7605723eb8e6d8231644f1cf62f1e80badf074 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Mon, 20 Aug 2018 15:57:22 +0200
+Subject: [PATCH] configure.in: tighten AIX test
+
+Depending on the configuration, the cpp output may contain the string 'yes'
+in a comment if built under a path containing 'yes', confusing the _AIX
+test:
+
+${CROSS}-cpp conftest.h
+\# 1 "conftest.h"
+\# 1 "<built-in>"
+\# 1 "<command-line>"
+\# 31 "<command-line>"
+\# 1 "/home/peko/source/buildroot/output-yes/host/x86_64-buildroot-linux-gnu/sysroot/usr/include/stdc-predef.h" 1 3 4
+\# 32 "<command-line>" 2
+\# 1 "conftest.txt"
+
+Fix it by only matching on 'yes' on a line by itself.
+
+Upstream-status: submitted to author
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+
+ autoconf/configure.in | 2 +-
+ configure             | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autoconf/configure.in b/autoconf/configure.in
+index bd45004..487c42b 100644
+--- a/autoconf/configure.in
++++ b/autoconf/configure.in
+@@ -86,7 +86,7 @@ AC_PROG_MAKE_SET
+ 
+ dnl AIX needs -lc128
+ dnl
+-AC_EGREP_CPP([yes], [#ifdef _AIX
++AC_EGREP_CPP([^yes$], [#ifdef _AIX
+ yes
+ #endif
+ ], [LIBS="$LIBS -lc128"])
+diff --git a/configure b/configure
+index 7c11be0..59267b9 100755
+--- a/configure
++++ b/configure
+@@ -3377,7 +3377,7 @@ yes
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then
++  $EGREP "^yes$" >/dev/null 2>&1; then
+   LIBS="$LIBS -lc128"
+ fi
+ rm -f conftest*
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/pv/Config.in b/bsp/buildroot/package/pv/Config.in
index d7322963..671f78e8 100644
--- a/bsp/buildroot/package/pv/Config.in
+++ b/bsp/buildroot/package/pv/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PV
 	bool "pv"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Pipe Viewer - is a terminal-based tool for
 	  monitoring the progress of data through a
diff --git a/bsp/buildroot/package/pv/pv.mk b/bsp/buildroot/package/pv/pv.mk
index 2279805a..0ef5a6f6 100644
--- a/bsp/buildroot/package/pv/pv.mk
+++ b/bsp/buildroot/package/pv/pv.mk
@@ -9,13 +9,7 @@ PV_SOURCE = pv-$(PV_VERSION).tar.bz2
 PV_SITE = http://www.ivarch.com/programs/sources
 PV_LICENSE = Artistic-2.0
 PV_LICENSE_FILES = doc/COPYING
-
-# pv configure script is somewhat stupid: if it cannot find the host
-# gettext tool msgfmt, it concludes that gettext is not available, and
-# provides its own minimal version. Unfortunately, this minimal
-# version conflicts with the available target gettext. We fix this by
-# ensuring that host-gettext is built if gettext support is enabled;
-PV_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext host-gettext)
+PV_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 # --relax linker option is enabled by default on sparc/sparc64
 # architectures, and it can't be used together with -r option, so
diff --git a/bsp/buildroot/package/pwgen/Config.in b/bsp/buildroot/package/pwgen/Config.in
index 7bbc1d6d..441605c7 100644
--- a/bsp/buildroot/package/pwgen/Config.in
+++ b/bsp/buildroot/package/pwgen/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PWGEN
 	bool "pwgen"
 	help
-	  Pwgen is a small, GPL'ed password generator which creates passwords
-	  which can be easily memorized by a human.
+	  Pwgen is a small, GPL'ed password generator which creates
+	  passwords which can be easily memorized by a human.
 
 	  http://sourceforge.net/projects/pwgen/
diff --git a/bsp/buildroot/package/pwgen/Config.in.host b/bsp/buildroot/package/pwgen/Config.in.host
index 0c56851d..20b55f3f 100644
--- a/bsp/buildroot/package/pwgen/Config.in.host
+++ b/bsp/buildroot/package/pwgen/Config.in.host
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_HOST_PWGEN
 	bool "host pwgen"
 	help
-	  Pwgen is a small, GPL'ed password generator which creates passwords
-	  which can be easily memorized by a human.
+	  Pwgen is a small, GPL'ed password generator which creates
+	  passwords which can be easily memorized by a human.
 
 	  http://sourceforge.net/projects/pwgen/
diff --git a/bsp/buildroot/package/pwgen/pwgen.mk b/bsp/buildroot/package/pwgen/pwgen.mk
index 9810097e..653adb87 100644
--- a/bsp/buildroot/package/pwgen/pwgen.mk
+++ b/bsp/buildroot/package/pwgen/pwgen.mk
@@ -6,7 +6,7 @@
 
 PWGEN_VERSION = 2.07
 PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION)
-PWGEN_LICENSE = GPLv2
+PWGEN_LICENSE = GPL-2.0
 PWGEN_LICENSE_FILES = debian/copyright
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/python-aiocoap/Config.in b/bsp/buildroot/package/python-aiocoap/Config.in
new file mode 100644
index 00000000..cf5ca4e8
--- /dev/null
+++ b/bsp/buildroot/package/python-aiocoap/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_AIOCOAP
+	bool "python-aiocoap"
+	depends on BR2_PACKAGE_PYTHON3
+	help
+	  Python CoAP library.
+
+	  https://github.com/chrysn/aiocoap
diff --git a/bsp/buildroot/package/python-aiocoap/python-aiocoap.hash b/bsp/buildroot/package/python-aiocoap/python-aiocoap.hash
new file mode 100644
index 00000000..6df482aa
--- /dev/null
+++ b/bsp/buildroot/package/python-aiocoap/python-aiocoap.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/aiocoap/json, sha256 locally computed
+md5	f5fed00767b4197f2fbaa0ff95cbbf78  aiocoap-0.3.tar.gz
+sha256	402d4151db6d8d0b1d66af5b6e10e0de1521decbf12140637e5b8d2aa9c5aef6  aiocoap-0.3.tar.gz
+sha256  2bb211d412a6bfa4b2a9cf01123c7fe90e5e6185938896e23ab07b84f8494180  LICENSE
diff --git a/bsp/buildroot/package/python-aiocoap/python-aiocoap.mk b/bsp/buildroot/package/python-aiocoap/python-aiocoap.mk
new file mode 100644
index 00000000..a2db70b8
--- /dev/null
+++ b/bsp/buildroot/package/python-aiocoap/python-aiocoap.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-aiocoap
+#
+################################################################################
+
+PYTHON_AIOCOAP_VERSION = 0.3
+PYTHON_AIOCOAP_SOURCE = aiocoap-$(PYTHON_AIOCOAP_VERSION).tar.gz
+PYTHON_AIOCOAP_SITE = https://pypi.python.org/packages/9c/f6/d839e4b14258d76e74a39810829c13f8dd31de2bfe0915579b2a609d1bbe
+PYTHON_AIOCOAP_SETUP_TYPE = setuptools
+PYTHON_AIOCOAP_LICENSE = MIT
+PYTHON_AIOCOAP_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-alsaaudio/python-alsaaudio.mk b/bsp/buildroot/package/python-alsaaudio/python-alsaaudio.mk
index 92c354e3..73a7e74b 100644
--- a/bsp/buildroot/package/python-alsaaudio/python-alsaaudio.mk
+++ b/bsp/buildroot/package/python-alsaaudio/python-alsaaudio.mk
@@ -8,7 +8,7 @@ PYTHON_ALSAAUDIO_VERSION = 0.8.2
 PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz
 PYTHON_ALSAAUDIO_SITE = https://pypi.python.org/packages/source/p/pyalsaaudio
 PYTHON_ALSAAUDIO_SETUP_TYPE = distutils
-PYTHON_ALSAAUDIO_LICENSE = Python software foundation license v2
+PYTHON_ALSAAUDIO_LICENSE = Python-2.0
 PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE
 PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib
 
diff --git a/bsp/buildroot/package/python-argh/python-argh.mk b/bsp/buildroot/package/python-argh/python-argh.mk
index bc5d7133..ac514174 100644
--- a/bsp/buildroot/package/python-argh/python-argh.mk
+++ b/bsp/buildroot/package/python-argh/python-argh.mk
@@ -8,7 +8,7 @@ PYTHON_ARGH_VERSION = 0.26.2
 PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz
 PYTHON_ARGH_SITE = https://pypi.python.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15
 PYTHON_ARGH_SETUP_TYPE = setuptools
-PYTHON_ARGH_LICENSE = LGPLv3+
+PYTHON_ARGH_LICENSE = LGPL-3.0+
 PYTHON_ARGH_LICENSE_FILES = README.rst
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-asn1crypto/Config.in b/bsp/buildroot/package/python-asn1crypto/Config.in
new file mode 100644
index 00000000..fe3b5ebb
--- /dev/null
+++ b/bsp/buildroot/package/python-asn1crypto/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_ASN1CRYPTO
+	bool "python-asn1crypto"
+	help
+	  Fast ASN.1 parser and serializer with definitions for
+	  private keys, public keys, certificates, CRL, OCSP, CMS,
+	  PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP.
+
+	  https://github.com/wbond/asn1crypto
diff --git a/bsp/buildroot/package/python-asn1crypto/python-asn1crypto.hash b/bsp/buildroot/package/python-asn1crypto/python-asn1crypto.hash
new file mode 100644
index 00000000..ec5d7cfc
--- /dev/null
+++ b/bsp/buildroot/package/python-asn1crypto/python-asn1crypto.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/asn1crypto/json, sha256 locally computed
+md5	74a8b9402625b38ef19cf3fa69ef8470  asn1crypto-0.22.0.tar.gz
+sha256	cbbadd640d3165ab24b06ef25d1dca09a3441611ac15f6a6b452474fdf0aed1a  asn1crypto-0.22.0.tar.gz
diff --git a/bsp/buildroot/package/python-asn1crypto/python-asn1crypto.mk b/bsp/buildroot/package/python-asn1crypto/python-asn1crypto.mk
new file mode 100644
index 00000000..681dfd5c
--- /dev/null
+++ b/bsp/buildroot/package/python-asn1crypto/python-asn1crypto.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-asn1crypto
+#
+################################################################################
+
+PYTHON_ASN1CRYPTO_VERSION = 0.22.0
+PYTHON_ASN1CRYPTO_SOURCE = asn1crypto-$(PYTHON_ASN1CRYPTO_VERSION).tar.gz
+PYTHON_ASN1CRYPTO_SITE = https://pypi.python.org/packages/67/14/5d66588868c4304f804ebaff9397255f6ec5559e46724c2496e0f26e68d6
+PYTHON_ASN1CRYPTO_SETUP_TYPE = setuptools
+PYTHON_ASN1CRYPTO_LICENSE = MIT
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-attrs/python-attrs.hash b/bsp/buildroot/package/python-attrs/python-attrs.hash
index 33ecd2c0..4434fa19 100644
--- a/bsp/buildroot/package/python-attrs/python-attrs.hash
+++ b/bsp/buildroot/package/python-attrs/python-attrs.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/attrs/json, sha256 locally computed
-md5	4ec003c49360853cf935113d1ae56151  attrs-16.3.0.tar.gz
-sha256	80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc  attrs-16.3.0.tar.gz
+md5	3b7136a570f3ff8a4ff42e7360073f9f  attrs-17.2.0.tar.gz
+sha256	5d4d1b99f94d69338f485984127e4473b3ab9e20f43821b0e546cc3b2302fd11  attrs-17.2.0.tar.gz
diff --git a/bsp/buildroot/package/python-attrs/python-attrs.mk b/bsp/buildroot/package/python-attrs/python-attrs.mk
index 5e7985a3..c9633711 100644
--- a/bsp/buildroot/package/python-attrs/python-attrs.mk
+++ b/bsp/buildroot/package/python-attrs/python-attrs.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_ATTRS_VERSION = 16.3.0
+PYTHON_ATTRS_VERSION = 17.2.0
 PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz
-PYTHON_ATTRS_SITE = https://pypi.python.org/packages/01/b0/3ac73bf6df716a38568a16f6a9cbc46cc9e8ed6fe30c8768260030db55d4
+PYTHON_ATTRS_SITE = https://pypi.python.org/packages/be/41/e909cb6d901e9689da947419505cc7fb7d242a08a62ee221fce6a009a523
 PYTHON_ATTRS_SETUP_TYPE = setuptools
 PYTHON_ATTRS_LICENSE = MIT
 PYTHON_ATTRS_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-autobahn/python-autobahn.hash b/bsp/buildroot/package/python-autobahn/python-autobahn.hash
index cae9160e..32c99167 100644
--- a/bsp/buildroot/package/python-autobahn/python-autobahn.hash
+++ b/bsp/buildroot/package/python-autobahn/python-autobahn.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/autobahn/json, sha256 locally computed
-md5	9850702d0078c5a4aa17170afe2f233c  autobahn-0.16.0.tar.gz
-sha256	a1dcb4315a0914da56ec484659816de72dfad229be4ac19fa61bbc0111ada884  autobahn-0.16.0.tar.gz
+md5	f8c8d74bf73644719b751e6fb11dc4a3  autobahn-17.10.1.tar.gz
+sha256	8cf74132a18da149c5ea3dcbb5e055f6f4fe5a0238b33258d29e89bd276a8078  autobahn-17.10.1.tar.gz
+sha256  0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef  LICENSE
diff --git a/bsp/buildroot/package/python-autobahn/python-autobahn.mk b/bsp/buildroot/package/python-autobahn/python-autobahn.mk
index a5e9aeea..3ba91c5e 100644
--- a/bsp/buildroot/package/python-autobahn/python-autobahn.mk
+++ b/bsp/buildroot/package/python-autobahn/python-autobahn.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_AUTOBAHN_VERSION = 0.16.0
+PYTHON_AUTOBAHN_VERSION = 17.10.1
 PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz
-PYTHON_AUTOBAHN_SITE = https://pypi.python.org/packages/68/37/2523309412f0fb93a7784c65e5c5639b4b5d7a84f91374ad6c3c2d5af60b
+PYTHON_AUTOBAHN_SITE = https://pypi.python.org/packages/e4/2e/01a64212b1eb580d601fa20f146c962235e3493795f46e3b254597ec635d
 PYTHON_AUTOBAHN_LICENSE = MIT
 PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE
 PYTHON_AUTOBAHN_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-automat/Config.in b/bsp/buildroot/package/python-automat/Config.in
new file mode 100644
index 00000000..ee02d22b
--- /dev/null
+++ b/bsp/buildroot/package/python-automat/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_AUTOMAT
+	bool "python-automat"
+	select BR2_PACKAGE_PYTHON_ATTRS # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  Self-service finite-state machines for the programmer on the
+	  go.
+
+	  https://github.com/glyph/Automat
diff --git a/bsp/buildroot/package/python-automat/python-automat.hash b/bsp/buildroot/package/python-automat/python-automat.hash
new file mode 100644
index 00000000..c0e35052
--- /dev/null
+++ b/bsp/buildroot/package/python-automat/python-automat.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/automat/json, sha256 locally computed
+md5	ad7bba58d262d8956d732330cb5ef53d  Automat-0.6.0.tar.gz
+sha256	3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8  Automat-0.6.0.tar.gz
diff --git a/bsp/buildroot/package/python-automat/python-automat.mk b/bsp/buildroot/package/python-automat/python-automat.mk
new file mode 100644
index 00000000..96a4f515
--- /dev/null
+++ b/bsp/buildroot/package/python-automat/python-automat.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-automat
+#
+################################################################################
+
+PYTHON_AUTOMAT_VERSION = 0.6.0
+PYTHON_AUTOMAT_SOURCE = Automat-$(PYTHON_AUTOMAT_VERSION).tar.gz
+PYTHON_AUTOMAT_SITE = https://pypi.python.org/packages/de/05/b8e453085cf8a7f27bb1226596f4ccf5cc9e758377d60284f990bbdc592c
+PYTHON_AUTOMAT_SETUP_TYPE = setuptools
+PYTHON_AUTOMAT_LICENSE = MIT
+PYTHON_AUTOMAT_LICENSE_FILES = LICENSE
+PYTHON_AUTOMAT_DEPENDENCIES = host-python-m2r host-python-setuptools-scm
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-babel/python-babel.mk b/bsp/buildroot/package/python-babel/python-babel.mk
index 3627b15f..d9bd0f04 100644
--- a/bsp/buildroot/package/python-babel/python-babel.mk
+++ b/bsp/buildroot/package/python-babel/python-babel.mk
@@ -8,7 +8,7 @@ PYTHON_BABEL_VERSION = 2.3.4
 PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz
 PYTHON_BABEL_SITE = https://pypi.python.org/packages/6e/96/ba2a2462ed25ca0e651fb7b66e7080f5315f91425a07ea5b34d7c870c114
 PYTHON_BABEL_SETUP_TYPE = setuptools
-PYTHON_BABEL_LICENSE = BSD-3c
+PYTHON_BABEL_LICENSE = BSD-3-Clause
 PYTHON_BABEL_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-backports-abc/python-backports-abc.hash b/bsp/buildroot/package/python-backports-abc/python-backports-abc.hash
index 07e954e6..f638527d 100644
--- a/bsp/buildroot/package/python-backports-abc/python-backports-abc.hash
+++ b/bsp/buildroot/package/python-backports-abc/python-backports-abc.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0b65a216ce9dc9c1a7e20a729dd7c05b, sha256 locally computed
-md5     0b65a216ce9dc9c1a7e20a729dd7c05b backports_abc-0.4.tar.gz
-sha256  8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5  backports_abc-0.4.tar.gz
+# md5 from https://pypi.python.org/pypi/backports_abc/json, sha256 locally computed
+md5 7d1936ec183a3586290adf60f6f96764 backports_abc-0.5.tar.gz
+sha256 033be54514a03e255df75c5aee8f9e672f663f93abb723444caec8fe43437bde backports_abc-0.5.tar.gz
diff --git a/bsp/buildroot/package/python-backports-abc/python-backports-abc.mk b/bsp/buildroot/package/python-backports-abc/python-backports-abc.mk
index 1e3a9a6e..66cea170 100644
--- a/bsp/buildroot/package/python-backports-abc/python-backports-abc.mk
+++ b/bsp/buildroot/package/python-backports-abc/python-backports-abc.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-PYTHON_BACKPORTS_ABC_VERSION = 0.4
+PYTHON_BACKPORTS_ABC_VERSION = 0.5
 PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz
-PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/source/b/backports_abc
-PYTHON_BACKPORTS_ABC_LICENSE = Python Software Foundation License
+PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/68/3c/1317a9113c377d1e33711ca8de1e80afbaf4a3c950dd0edfaf61f9bfe6d8
+PYTHON_BACKPORTS_ABC_LICENSE = Python-2.0
+PYTHON_BACKPORTS_ABC_LICENSE_FILES = LICENSE
 PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-backports-shutil-get-terminal-size/Config.in b/bsp/buildroot/package/python-backports-shutil-get-terminal-size/Config.in
new file mode 100644
index 00000000..392e05a2
--- /dev/null
+++ b/bsp/buildroot/package/python-backports-shutil-get-terminal-size/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE
+	bool "python-backports-shutil-get-terminal-size"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  A backport of the get_terminal_size function from Python
+	  3.3's shutil.
+
+	  https://pypi.python.org/pypi/backports.shutil_get_terminal_size
diff --git a/bsp/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash b/bsp/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
new file mode 100644
index 00000000..c1b65e59
--- /dev/null
+++ b/bsp/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/backports.shutil_get_terminal_size/json, sha256 locally computed
+md5 03267762480bd86b50580dc19dff3c66 backports.shutil_get_terminal_size-1.0.0.tar.gz
+sha256 713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80 backports.shutil_get_terminal_size-1.0.0.tar.gz
diff --git a/bsp/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk b/bsp/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
new file mode 100644
index 00000000..7c24b196
--- /dev/null
+++ b/bsp/buildroot/package/python-backports-shutil-get-terminal-size/python-backports-shutil-get-terminal-size.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-backports-shutil-get-terminal-size
+#
+################################################################################
+
+PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION = 1.0.0
+PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SOURCE = backports.shutil_get_terminal_size-$(PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_VERSION).tar.gz
+PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SITE = https://pypi.python.org/packages/ec/9c/368086faa9c016efce5da3e0e13ba392c9db79e3ab740b763fe28620b18b
+PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_SETUP_TYPE = setuptools
+PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE = MIT
+PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-bcrypt/Config.in b/bsp/buildroot/package/python-bcrypt/Config.in
new file mode 100644
index 00000000..4fa6c31a
--- /dev/null
+++ b/bsp/buildroot/package/python-bcrypt/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_BCRYPT
+	bool "python-bcrypt"
+	select BR2_PACKAGE_PYTHON_CFFI # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  Modern password hashing for your software and your servers.
+
+	  https://github.com/pyca/bcrypt/
diff --git a/bsp/buildroot/package/python-bcrypt/python-bcrypt.hash b/bsp/buildroot/package/python-bcrypt/python-bcrypt.hash
new file mode 100644
index 00000000..574cbe15
--- /dev/null
+++ b/bsp/buildroot/package/python-bcrypt/python-bcrypt.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/bcrypt/json, sha256 locally computed
+md5	20da8b40790caad99c4086dba533154b  bcrypt-3.1.3.tar.gz
+sha256	6645c8d0ad845308de3eb9be98b6fd22a46ec5412bfc664a423e411cdd8f5488  bcrypt-3.1.3.tar.gz
diff --git a/bsp/buildroot/package/python-bcrypt/python-bcrypt.mk b/bsp/buildroot/package/python-bcrypt/python-bcrypt.mk
new file mode 100644
index 00000000..aa6f9815
--- /dev/null
+++ b/bsp/buildroot/package/python-bcrypt/python-bcrypt.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-bcrypt
+#
+################################################################################
+
+PYTHON_BCRYPT_VERSION = 3.1.3
+PYTHON_BCRYPT_SOURCE = bcrypt-$(PYTHON_BCRYPT_VERSION).tar.gz
+PYTHON_BCRYPT_SITE = https://pypi.python.org/packages/58/e9/6d7f1d883d8c5876470b5d187d72c04f2a9954d61e71e7eb5d2ea2a50442
+PYTHON_BCRYPT_SETUP_TYPE = setuptools
+PYTHON_BCRYPT_LICENSE = Apache-2.0
+PYTHON_BCRYPT_LICENSE_FILES = LICENSE
+PYTHON_BCRYPT_DEPENDENCIES = host-python-cffi
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash b/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash
index c86879fc..dd0c3e43 100644
--- a/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash
+++ b/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/beautifulsoup4/json, sha256 locally computed
-md5	994abd90e691beaf7d42c00ffb2f3a67  beautifulsoup4-4.5.1.tar.gz
-sha256	3c9474036afda9136aac6463def733f81017bf9ef3510d25634f335b0c87f5e1  beautifulsoup4-4.5.1.tar.gz
+md5 937e0df0d699a1237646f38fd567f0c6 beautifulsoup4-4.5.3.tar.gz
+sha256 b21ca09366fa596043578fd4188b052b46634d22059e68dd0077d9ee77e08a3e beautifulsoup4-4.5.3.tar.gz
diff --git a/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk b/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk
index e2fa9b3c..ccec30fb 100644
--- a/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk
+++ b/bsp/buildroot/package/python-beautifulsoup4/python-beautifulsoup4.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_BEAUTIFULSOUP4_VERSION = 4.5.1
+PYTHON_BEAUTIFULSOUP4_VERSION = 4.5.3
 PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz
-PYTHON_BEAUTIFULSOUP4_SITE = https://pypi.python.org/packages/86/ea/8e9fbce5c8405b9614f1fd304f7109d9169a3516a493ce4f7f77c39435b7
+PYTHON_BEAUTIFULSOUP4_SITE = https://pypi.python.org/packages/9b/a5/c6fa2d08e6c671103f9508816588e0fb9cec40444e8e72993f3d4c325936
 PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools
 PYTHON_BEAUTIFULSOUP4_LICENSE = MIT
 PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = COPYING.txt
diff --git a/bsp/buildroot/package/python-bottle/Config.in b/bsp/buildroot/package/python-bottle/Config.in
index f9b60ca7..5e37f6e3 100644
--- a/bsp/buildroot/package/python-bottle/Config.in
+++ b/bsp/buildroot/package/python-bottle/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_PYTHON_BOTTLE
 	bool "python-bottle"
 	help
-	  Bottle is a fast, simple and lightweight WSGI micro web-framework
-	  for Python. It is distributed as a single file module and has no
-	  dependencies other than the Python Standard Library.
+	  Bottle is a fast, simple and lightweight WSGI micro
+	  web-framework for Python. It is distributed as a single file
+	  module and has no dependencies other than the Python
+	  Standard Library.
 
 	  http://bottlepy.org
diff --git a/bsp/buildroot/package/python-can/Config.in b/bsp/buildroot/package/python-can/Config.in
index 6b4e0fa7..94b16ab3 100644
--- a/bsp/buildroot/package/python-can/Config.in
+++ b/bsp/buildroot/package/python-can/Config.in
@@ -1,6 +1,9 @@
 config BR2_PACKAGE_PYTHON_CAN
 	bool "python-can"
+	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
 	help
-	  This module provides controller area network support for Python.
+	  This module provides controller area network support for
+	  Python.
 
 	  https://bitbucket.org/hardbyte/python-can
diff --git a/bsp/buildroot/package/python-can/python-can.hash b/bsp/buildroot/package/python-can/python-can.hash
index a8778622..bd19d194 100644
--- a/bsp/buildroot/package/python-can/python-can.hash
+++ b/bsp/buildroot/package/python-can/python-can.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b9b556fe6f016c0a3b27cc67790cf821, sha256 locally computed
-md5     b9b556fe6f016c0a3b27cc67790cf821  python-can-1.4.3.tar.gz
-sha256  2dcd32737cc39fbf39f41521146a9685f594942c99c6183bad7e3c404930198b  python-can-1.4.3.tar.gz
+# md5 from https://pypi.python.org/pypi/python-can/json, sha256 locally computed
+md5     f653aecf8b9034bbba32cc04ca6a7b6d  python-can-1.5.2.tar.gz
+sha256  edabb426e6cd11c2dc7a98980340135aa0eb02143b0d51bf14e3e6178c131cc3  python-can-1.5.2.tar.gz
diff --git a/bsp/buildroot/package/python-can/python-can.mk b/bsp/buildroot/package/python-can/python-can.mk
index ae9ef1a0..a271baea 100644
--- a/bsp/buildroot/package/python-can/python-can.mk
+++ b/bsp/buildroot/package/python-can/python-can.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CAN_VERSION = 1.4.3
-PYTHON_CAN_SITE = https://pypi.python.org/packages/source/p/python-can
-PYTHON_CAN_LICENSE = LGPLv3
+PYTHON_CAN_VERSION = 1.5.2
+PYTHON_CAN_SITE = https://pypi.python.org/packages/a1/b1/80f023e2b728c7ebccbf989aec777f3add3dd4cee650573ce5d38132a07c
+PYTHON_CAN_LICENSE = LGPL-3.0
 PYTHON_CAN_LICENSE_FILES = LICENSE.txt
 PYTHON_CAN_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-cbor/Config.in b/bsp/buildroot/package/python-cbor/Config.in
index 2d0962d5..403fab3f 100644
--- a/bsp/buildroot/package/python-cbor/Config.in
+++ b/bsp/buildroot/package/python-cbor/Config.in
@@ -4,4 +4,3 @@ config BR2_PACKAGE_PYTHON_CBOR
 	  RFC 7049 - Concise Binary Object Representation.
 
 	  https://pypi.python.org/pypi/cbor
-
diff --git a/bsp/buildroot/package/python-certifi/python-certifi.hash b/bsp/buildroot/package/python-certifi/python-certifi.hash
index 443cc6d3..e3e2f077 100644
--- a/bsp/buildroot/package/python-certifi/python-certifi.hash
+++ b/bsp/buildroot/package/python-certifi/python-certifi.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/certifi/json, sha256 locally computed
-md5	baa81e951a29958563689d868ef1064d  certifi-2016.9.26.tar.gz
-sha256	8275aef1bbeaf05c53715bfc5d8569bd1e04ca1e8e69608cc52bcaac2604eb19  certifi-2016.9.26.tar.gz
+md5	068fd5c3c690ae47504b3e0bf4e56c4c  certifi-2018.1.18.tar.gz
+sha256	edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d  certifi-2018.1.18.tar.gz
+sha256	6a70a4bf6b010016d59a64b8ae4ad8dc7f5ef16f1fb453cc2ecd771c5a341131  LICENSE
diff --git a/bsp/buildroot/package/python-certifi/python-certifi.mk b/bsp/buildroot/package/python-certifi/python-certifi.mk
index f69e7c18..084893f5 100644
--- a/bsp/buildroot/package/python-certifi/python-certifi.mk
+++ b/bsp/buildroot/package/python-certifi/python-certifi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CERTIFI_VERSION = 2016.9.26
+PYTHON_CERTIFI_VERSION = 2018.1.18
 PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz
-PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/4f/75/e1bc6e363a2c76f8d7e754c27c437dbe4086414e1d6d2f6b2a3e7846f22b
+PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/15/d4/2f888fc463d516ff7bf2379a4e9a552fef7f22a94147655d9b1097108248
 PYTHON_CERTIFI_SETUP_TYPE = setuptools
 PYTHON_CERTIFI_LICENSE = ISC (Python code), MPL-2.0 (cacert.pem)
 PYTHON_CERTIFI_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-cffi/Config.in b/bsp/buildroot/package/python-cffi/Config.in
index 3805d3d1..bc9f6a29 100644
--- a/bsp/buildroot/package/python-cffi/Config.in
+++ b/bsp/buildroot/package/python-cffi/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PYTHON_CFFI
 	bool "python-cffi"
 	select BR2_PACKAGE_LIBFFI
+	select BR2_PACKAGE_PYTHON_PYCPARSER # runtime
 	help
 	  This is the Foreign Function Interface for Python calling C
 	  code. The aim of this project is to provide a convenient
diff --git a/bsp/buildroot/package/python-cffi/python-cffi.hash b/bsp/buildroot/package/python-cffi/python-cffi.hash
index 39065bcd..3d4387fb 100644
--- a/bsp/buildroot/package/python-cffi/python-cffi.hash
+++ b/bsp/buildroot/package/python-cffi/python-cffi.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/cffi/json, sha256 locally computed
-md5  c8e877fe0426a99d0cf5872cf2f95b27  cffi-1.8.3.tar.gz
-sha256	 c321bd46faa7847261b89c0469569530cad5a41976bb6dba8202c0159f476568  cffi-1.8.3.tar.gz
+md5	a731487324b501c8295221b629d3f5f3  cffi-1.11.2.tar.gz
+sha256	ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6  cffi-1.11.2.tar.gz
+sha256  04b80f5b077bbed68808cfebadeb5e3523f2a8c9a96495c587bd96df1eac2a33  LICENSE
diff --git a/bsp/buildroot/package/python-cffi/python-cffi.mk b/bsp/buildroot/package/python-cffi/python-cffi.mk
index d3486956..1ef83917 100644
--- a/bsp/buildroot/package/python-cffi/python-cffi.mk
+++ b/bsp/buildroot/package/python-cffi/python-cffi.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_CFFI_VERSION = 1.8.3
+PYTHON_CFFI_VERSION = 1.11.2
 PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz
-PYTHON_CFFI_SITE = https://pypi.python.org/packages/0a/f3/686af8873b70028fccf67b15c78fd4e4667a3da995007afc71e786d61b0a
+PYTHON_CFFI_SITE = https://pypi.python.org/packages/c9/70/89b68b6600d479034276fed316e14b9107d50a62f5627da37fafe083fde3
 PYTHON_CFFI_SETUP_TYPE = setuptools
 PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi
 PYTHON_CFFI_LICENSE = MIT
@@ -20,7 +20,7 @@ HOST_PYTHON_CFFI_ENV = \
 	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
 	PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
 	PKG_CONFIG_SYSROOT_DIR="/" \
-	PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig"
+	PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
 HOST_PYTHON_CFFI_DEPENDENCIES = host-pkgconf host-python-pycparser host-libffi
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-characteristic/python-characteristic.mk b/bsp/buildroot/package/python-characteristic/python-characteristic.mk
index dc3e8bb2..7ea8d95c 100644
--- a/bsp/buildroot/package/python-characteristic/python-characteristic.mk
+++ b/bsp/buildroot/package/python-characteristic/python-characteristic.mk
@@ -6,7 +6,7 @@
 
 PYTHON_CHARACTERISTIC_VERSION = 14.3.0
 PYTHON_CHARACTERISTIC_SOURCE = characteristic-$(PYTHON_CHARACTERISTIC_VERSION).tar.gz
-PYTHON_CHARACTERISTIC_SITE = http://pypi.python.org/packages/source/c/characteristic
+PYTHON_CHARACTERISTIC_SITE = https://pypi.python.org/packages/source/c/characteristic
 PYTHON_CHARACTERISTIC_LICENSE = MIT
 PYTHON_CHARACTERISTIC_LICENSE_FILES = LICENSE
 PYTHON_CHARACTERISTIC_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-chardet/Config.in b/bsp/buildroot/package/python-chardet/Config.in
index 8f1cd602..869888cf 100644
--- a/bsp/buildroot/package/python-chardet/Config.in
+++ b/bsp/buildroot/package/python-chardet/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_CHARDET
 	bool "python-chardet"
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	help
 	  Universal encoding detector for Python 2 and 3.
 
diff --git a/bsp/buildroot/package/python-chardet/python-chardet.hash b/bsp/buildroot/package/python-chardet/python-chardet.hash
index aa4efeb1..799713cf 100644
--- a/bsp/buildroot/package/python-chardet/python-chardet.hash
+++ b/bsp/buildroot/package/python-chardet/python-chardet.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/chardet/json, sha256 locally computed
-md5	25274d664ccb5130adae08047416e1a8  chardet-2.3.0.tar.gz
-sha256	e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa  chardet-2.3.0.tar.gz
+md5	7dd1ba7f9c77e32351b0a0cfacf4055c  chardet-3.0.4.tar.gz
+sha256	84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae  chardet-3.0.4.tar.gz
diff --git a/bsp/buildroot/package/python-chardet/python-chardet.mk b/bsp/buildroot/package/python-chardet/python-chardet.mk
index 19629548..51610989 100644
--- a/bsp/buildroot/package/python-chardet/python-chardet.mk
+++ b/bsp/buildroot/package/python-chardet/python-chardet.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_CHARDET_VERSION = 2.3.0
+PYTHON_CHARDET_VERSION = 3.0.4
 PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz
-PYTHON_CHARDET_SITE = https://pypi.python.org/packages/7d/87/4e3a3f38b2f5c578ce44f8dc2aa053217de9f0b6d737739b0ddac38ed237
+PYTHON_CHARDET_SITE = https://pypi.python.org/packages/fc/bb/a5768c230f9ddb03acc9ef3f0d4a3cf93462473795d18e9535498c8f929d
 PYTHON_CHARDET_SETUP_TYPE = setuptools
-PYTHON_CHARDET_LICENSE = LGPLv2.1+
+PYTHON_CHARDET_LICENSE = LGPL-2.1+
 PYTHON_CHARDET_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-cheetah/Config.in b/bsp/buildroot/package/python-cheetah/Config.in
index e98dc392..12749a16 100644
--- a/bsp/buildroot/package/python-cheetah/Config.in
+++ b/bsp/buildroot/package/python-cheetah/Config.in
@@ -2,11 +2,12 @@ config BR2_PACKAGE_PYTHON_CHEETAH
 	bool "python-cheetah"
 	depends on BR2_PACKAGE_PYTHON
 	help
-	  Cheetah is an open source template engine and code generation tool.
+	  Cheetah is an open source template engine and code
+	  generation tool.
 
-	  It can be used standalone or combined with other tools and frameworks.
-	  Web development is its principle use, but Cheetah is very flexible
-	  and is also being used to generate C++ game code, Java, sql, form
-	  emails and even Python code.
+	  It can be used standalone or combined with other tools and
+	  frameworks.  Web development is its principle use, but
+	  Cheetah is very flexible and is also being used to generate
+	  C++ game code, Java, sql, form emails and even Python code.
 
 	  https://pypi.python.org/pypi/Cheetah/
diff --git a/bsp/buildroot/package/python-cheetah/python-cheetah.mk b/bsp/buildroot/package/python-cheetah/python-cheetah.mk
index af7d1f54..eee87fce 100644
--- a/bsp/buildroot/package/python-cheetah/python-cheetah.mk
+++ b/bsp/buildroot/package/python-cheetah/python-cheetah.mk
@@ -6,7 +6,7 @@
 
 PYTHON_CHEETAH_VERSION = 2.4.4
 PYTHON_CHEETAH_SOURCE = Cheetah-$(PYTHON_CHEETAH_VERSION).tar.gz
-PYTHON_CHEETAH_SITE = http://pypi.python.org/packages/source/C/Cheetah
+PYTHON_CHEETAH_SITE = https://pypi.python.org/packages/source/C/Cheetah
 PYTHON_CHEETAH_LICENSE = MIT
 PYTHON_CHEETAH_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-cheroot/Config.in b/bsp/buildroot/package/python-cheroot/Config.in
new file mode 100644
index 00000000..bb85f7bd
--- /dev/null
+++ b/bsp/buildroot/package/python-cheroot/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_CHEROOT
+	bool "python-cheroot"
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  Cheroot is the high-performance, pure-Python
+	  HTTP server used by CherryPy.
+
+	  https://github.com/cherrypy/cheroot
diff --git a/bsp/buildroot/package/python-cheroot/python-cheroot.hash b/bsp/buildroot/package/python-cheroot/python-cheroot.hash
new file mode 100644
index 00000000..664ad100
--- /dev/null
+++ b/bsp/buildroot/package/python-cheroot/python-cheroot.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/Cheroot/json, sha256 locally computed
+md5	d256a0ccd28c3426a7764868e98a9020  cheroot-5.10.0.tar.gz
+sha256	a408f1b80a3f93a3b49fc330f68eea40d8d30b9b07084f374607d1a5cc2e824f  cheroot-5.10.0.tar.gz
+sha256  02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9  LICENSE
diff --git a/bsp/buildroot/package/python-cheroot/python-cheroot.mk b/bsp/buildroot/package/python-cheroot/python-cheroot.mk
new file mode 100644
index 00000000..07775e57
--- /dev/null
+++ b/bsp/buildroot/package/python-cheroot/python-cheroot.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-cheroot
+#
+################################################################################
+
+PYTHON_CHEROOT_VERSION = 5.10.0
+PYTHON_CHEROOT_SOURCE = cheroot-$(PYTHON_CHEROOT_VERSION).tar.gz
+PYTHON_CHEROOT_SITE = https://pypi.python.org/packages/14/dc/afc41e7f7e797973808d8520e6aef21c4efd00550aa32f5b726327d36be0
+PYTHON_CHEROOT_LICENSE = BSD-3-Clause
+PYTHON_CHEROOT_LICENSE_FILES = LICENSE
+PYTHON_CHEROOT_SETUP_TYPE = setuptools
+PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-cherrypy/Config.in b/bsp/buildroot/package/python-cherrypy/Config.in
index 6e32ec2a..622dd1f4 100644
--- a/bsp/buildroot/package/python-cherrypy/Config.in
+++ b/bsp/buildroot/package/python-cherrypy/Config.in
@@ -1,9 +1,13 @@
 config BR2_PACKAGE_PYTHON_CHERRYPY
 	bool "python-cherrypy"
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_CHEROOT # runtime
+	select BR2_PACKAGE_PYTHON_JARACO_CLASSES # runtime
+	select BR2_PACKAGE_PYTHON_PORTEND # runtime
 	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  A minimalist web framework
 
diff --git a/bsp/buildroot/package/python-cherrypy/python-cherrypy.hash b/bsp/buildroot/package/python-cherrypy/python-cherrypy.hash
index 6befa457..d8f97af0 100644
--- a/bsp/buildroot/package/python-cherrypy/python-cherrypy.hash
+++ b/bsp/buildroot/package/python-cherrypy/python-cherrypy.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=4b765329b0b4b65ec25811e3febb6c93, sha256 locally computed
-md5	4b765329b0b4b65ec25811e3febb6c93  CherryPy-4.0.0.tar.gz
-sha256	73ad4f8870b5a3e9988a7778b5d3003a390d440527ec3458a0c7e58865d2611a  CherryPy-4.0.0.tar.gz
+# md5 from https://pypi.python.org/pypi/CherryPy/json, sha256 locally computed
+md5	e21fd0c5706504a8f26c46d808a14255  CherryPy-12.0.1.tar.gz
+sha256	6a3a90a43b1e05bd4634c60acfdcf34efe74f9f8746aca14dbe95a9b69db30ea  CherryPy-12.0.1.tar.gz
+sha256  02f4efe6e7dcd218c33cfa065c0552de983b5ad563b053e97697c5abd2ef14f9  LICENSE.md
diff --git a/bsp/buildroot/package/python-cherrypy/python-cherrypy.mk b/bsp/buildroot/package/python-cherrypy/python-cherrypy.mk
index 754e0a2b..72b17bc8 100644
--- a/bsp/buildroot/package/python-cherrypy/python-cherrypy.mk
+++ b/bsp/buildroot/package/python-cherrypy/python-cherrypy.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-PYTHON_CHERRYPY_VERSION = 4.0.0
+PYTHON_CHERRYPY_VERSION = 12.0.1
 PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz
-PYTHON_CHERRYPY_SITE = http://pypi.python.org/packages/source/C/CherryPy
-PYTHON_CHERRYPY_LICENSE = BSD-3c
-PYTHON_CHERRYPY_LICENSE_FILES = cherrypy/LICENSE.txt
-PYTHON_CHERRYPY_SETUP_TYPE = distutils
+PYTHON_CHERRYPY_SITE = https://pypi.python.org/packages/be/d8/a8ef56bfe1c39d466b8d55b496b64459cc43dec71361d88edf904901637f
+PYTHON_CHERRYPY_LICENSE = BSD-3-Clause
+PYTHON_CHERRYPY_LICENSE_FILES = LICENSE.md
+PYTHON_CHERRYPY_SETUP_TYPE = setuptools
+PYTHON_CHERRYPY_DEPENDENCIES = host-python-setuptools-scm
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-click/python-click.hash b/bsp/buildroot/package/python-click/python-click.hash
index c0d05682..cae03c72 100644
--- a/bsp/buildroot/package/python-click/python-click.hash
+++ b/bsp/buildroot/package/python-click/python-click.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=d0b09582123605220ad6977175f3e51d, sha256 locally computed.
-md5	d0b09582123605220ad6977175f3e51d  click-6.6.tar.gz
-sha256	cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9  click-6.6.tar.gz
+# md5 from https://pypi.python.org/pypi/click/json, sha256 locally computed
+md5 fc4cc00c4863833230d3af92af48abd4 click-6.7.tar.gz
+sha256 f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b click-6.7.tar.gz
diff --git a/bsp/buildroot/package/python-click/python-click.mk b/bsp/buildroot/package/python-click/python-click.mk
index 839a4673..e6df6361 100644
--- a/bsp/buildroot/package/python-click/python-click.mk
+++ b/bsp/buildroot/package/python-click/python-click.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_CLICK_VERSION = 6.6
+PYTHON_CLICK_VERSION = 6.7
 PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz
-PYTHON_CLICK_SITE = http://pypi.python.org/packages/source/c/click
-PYTHON_CLICK_LICENSE = BSD-3c
+PYTHON_CLICK_SITE = https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897
+PYTHON_CLICK_LICENSE = BSD-3-Clause
 PYTHON_CLICK_LICENSE_FILES = LICENSE
 PYTHON_CLICK_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-coherence/python-coherence.hash b/bsp/buildroot/package/python-coherence/python-coherence.hash
index f788ca37..533d0c66 100644
--- a/bsp/buildroot/package/python-coherence/python-coherence.hash
+++ b/bsp/buildroot/package/python-coherence/python-coherence.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  fd5a2db9661994a57232ace4a90d259b6554c43b8bf5bfbf8ec2518c03627922  python-coherence-0.6.6.2.tar.gz
+sha256  97c8b700b3fe73d48eacb259008f410d6567e5d7d1b8e96386f8cc2422135ca5  python-coherence-b7856985fd496689ca1f9024925ae737297c00d1.tar.gz
diff --git a/bsp/buildroot/package/python-coherence/python-coherence.mk b/bsp/buildroot/package/python-coherence/python-coherence.mk
index f9df37c3..24da7f70 100644
--- a/bsp/buildroot/package/python-coherence/python-coherence.mk
+++ b/bsp/buildroot/package/python-coherence/python-coherence.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-PYTHON_COHERENCE_VERSION = 0.6.6.2
-PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,Coherence-$(PYTHON_COHERENCE_VERSION))
+PYTHON_COHERENCE_VERSION = b7856985fd496689ca1f9024925ae737297c00d1
+PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,$(PYTHON_COHERENCE_VERSION))
 PYTHON_COHERENCE_SETUP_TYPE = setuptools
 PYTHON_COHERENCE_LICENSE = MIT
 PYTHON_COHERENCE_LICENSE_FILES = LICENCE
-PYTHON_COHERENCE_DEPENDENCIES = python-twisted python-zope-interface python-pyasn
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-configobj/python-configobj.mk b/bsp/buildroot/package/python-configobj/python-configobj.mk
index d9591d5b..9e281d28 100644
--- a/bsp/buildroot/package/python-configobj/python-configobj.mk
+++ b/bsp/buildroot/package/python-configobj/python-configobj.mk
@@ -7,7 +7,7 @@
 PYTHON_CONFIGOBJ_VERSION = 5.0.6
 PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz
 PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab
-PYTHON_CONFIGOBJ_LICENSE = BSD-3c
+PYTHON_CONFIGOBJ_LICENSE = BSD-3-Clause
 # License only mentioned in the source
 PYTHON_CONFIGOBJ_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-couchdb/python-couchdb.mk b/bsp/buildroot/package/python-couchdb/python-couchdb.mk
index c88787c1..afdbdf59 100644
--- a/bsp/buildroot/package/python-couchdb/python-couchdb.mk
+++ b/bsp/buildroot/package/python-couchdb/python-couchdb.mk
@@ -8,7 +8,7 @@ PYTHON_COUCHDB_VERSION = 1.1
 PYTHON_COUCHDB_SOURCE = CouchDB-$(PYTHON_COUCHDB_VERSION).tar.gz
 PYTHON_COUCHDB_SITE = https://pypi.python.org/packages/9a/e8/c3c8da6d00145aaca07f2b784794917613dad26532068da4e8392dc48d7f
 PYTHON_COUCHDB_SETUP_TYPE = setuptools
-PYTHON_COUCHDB_LICENSE = BSD-3c
+PYTHON_COUCHDB_LICENSE = BSD-3-Clause
 PYTHON_COUCHDB_LICENSE_FILES = COPYING
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-crc16/python-crc16.mk b/bsp/buildroot/package/python-crc16/python-crc16.mk
index 3a292a0e..9809f1ed 100644
--- a/bsp/buildroot/package/python-crc16/python-crc16.mk
+++ b/bsp/buildroot/package/python-crc16/python-crc16.mk
@@ -6,7 +6,7 @@
 
 PYTHON_CRC16_VERSION = 0.1.1
 PYTHON_CRC16_SITE = $(call github,gennady,pycrc16,v$(PYTHON_CRC16_VERSION))
-PYTHON_CRC16_LICENSE = LGPLv3+
+PYTHON_CRC16_LICENSE = LGPL-3.0+
 PYTHON_CRC16_LICENSE_FILES = COPYING.txt
 PYTHON_CRC16_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-crossbar/0002-Rework-runtime-dependencies.patch b/bsp/buildroot/package/python-crossbar/0002-Rework-runtime-dependencies.patch
new file mode 100644
index 00000000..784949c2
--- /dev/null
+++ b/bsp/buildroot/package/python-crossbar/0002-Rework-runtime-dependencies.patch
@@ -0,0 +1,37 @@
+From 35b2ec4949c9d1620551efde6e3a3d46323899de Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Thu, 11 Jan 2018 10:13:18 +0100
+Subject: [PATCH 2/2] Rework runtime dependencies
+
+Add python version requirement to Python2 only packages like
+ipaddress and enum34 and bump h2 package version.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ requirements-min.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/requirements-min.txt b/requirements-min.txt
+index 83820cd1..5cbf35c4 100644
+--- a/requirements-min.txt
++++ b/requirements-min.txt
+@@ -2,7 +2,7 @@ click>=6.6
+ setuptools>=28.3.0
+ zope.interface>=4.3.2
+ Twisted>=17.1.0
+-h2<3.0.0
++h2>=3.0.1
+ priority>=1.3.0
+ txaio>=2.8.0
+ autobahn>=17.6.2
+@@ -33,5 +33,5 @@ bitstring>=3.1.5
+ attrs>=16.2.0
+ incremental>=16.10.1
+ constantly>=15.1.0
+-enum34>=1.1.6
+-ipaddress>=1.0.18
++enum34>=1.1.6; python_version < '3.4'
++ipaddress>=1.0.18; python_version < '3.3'
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/python-crossbar/Config.in b/bsp/buildroot/package/python-crossbar/Config.in
index 7ef1aadb..96a25c2c 100644
--- a/bsp/buildroot/package/python-crossbar/Config.in
+++ b/bsp/buildroot/package/python-crossbar/Config.in
@@ -1,16 +1,24 @@
 config BR2_PACKAGE_PYTHON_CROSSBAR
 	bool "python-crossbar"
-	depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil
+	depends on BR2_INSTALL_LIBSTDCPP # python-pyasn
 	# All the following dependencies are runtime dependencies
+	select BR2_PACKAGE_PYTHON_ATTRS
 	select BR2_PACKAGE_PYTHON_AUTOBAHN
+	select BR2_PACKAGE_PYTHON_BITSTRING
+	select BR2_PACKAGE_PYTHON_CONSTANTLY
 	select BR2_PACKAGE_PYTHON_CBOR
 	select BR2_PACKAGE_PYTHON_CLICK
-	select BR2_PACKAGE_PYTHON_PYCPARSER
 	select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY
+	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_IDNA
+	select BR2_PACKAGE_PYTHON_INCREMENTAL
+	select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON_JINJA2
+	select BR2_PACKAGE_PYTHON_H2
 	select BR2_PACKAGE_PYTHON_LMDB
 	select BR2_PACKAGE_PYTHON_MISTUNE
 	select BR2_PACKAGE_PYTHON_NETADDR
+	select BR2_PACKAGE_PYTHON_PRIORITY
 	select BR2_PACKAGE_PYTHON_PSUTIL
 	select BR2_PACKAGE_PYTHON_PYASN
 	select BR2_PACKAGE_PYTHON_PYASN_MODULES
@@ -18,6 +26,7 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 	select BR2_PACKAGE_PYTHON_PYINOTIFY
 	select BR2_PACKAGE_PYTHON_PYNACL
 	select BR2_PACKAGE_PYTHON_PYOPENSSL
+	select BR2_PACKAGE_PYTHON_PYQRCODE
 	select BR2_PACKAGE_PYTHON_PYTRIE
 	select BR2_PACKAGE_PYTHON_PYYAML
 	select BR2_PACKAGE_PYTHON_SDNOTIFY
@@ -25,14 +34,12 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 	select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY
 	select BR2_PACKAGE_PYTHON_SETPROCTITLE
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS
-	select BR2_PACKAGE_PYTHON_SHUTILWHICH if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_SHUTILWHICH
 	select BR2_PACKAGE_PYTHON_TREQ
 	select BR2_PACKAGE_PYTHON_TWISTED
 	select BR2_PACKAGE_PYTHON_U_MSGPACK
 	select BR2_PACKAGE_PYTHON_UBJSON
 	select BR2_PACKAGE_PYTHON_WATCHDOG
-	select BR2_PACKAGE_PYTHON_WSACCEL
-	depends on BR2_INSTALL_LIBSTDCPP # python-pyasn
 	help
 	  Crossbar.io is an open-source WAMP application router that
 	  allows to build advanced applications from loosely-coupled
@@ -40,5 +47,5 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 
 	  https://pypi.python.org/pypi/crossbar
 
-comment "python-crossbar needs a uClibc or glibc toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL
+comment "python-crossbar needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/python-crossbar/python-crossbar.hash b/bsp/buildroot/package/python-crossbar/python-crossbar.hash
index a500bcf6..b9bfea89 100644
--- a/bsp/buildroot/package/python-crossbar/python-crossbar.hash
+++ b/bsp/buildroot/package/python-crossbar/python-crossbar.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi/crossbar/json, sha256 locally computed.
-md5	516478cc368503a0a0babc1dc28c5085  crossbar-0.14.0.tar.gz
-sha256	6242ef34c56061850743d750d042993590ca7ec8ebe7b28c21ed05bb0904d71b  crossbar-0.14.0.tar.gz
+# md5 from https://pypi.python.org/pypi/crossbar/json, sha256 locally computed
+md5	d557615f34e7736f749e59b4d3ddbea0  crossbar-17.6.1.post3.tar.gz
+sha256	8d023af0a772404f4e57add5888583fc0068d62a7a2249bea4539a6d7b70fbd9  crossbar-17.6.1.post3.tar.gz
+sha256  57c8ff33c9c0cfc3ef00e650a1cc910d7ee479a8bc509f6c9209a7c2a11399d6  LICENSE
diff --git a/bsp/buildroot/package/python-crossbar/python-crossbar.mk b/bsp/buildroot/package/python-crossbar/python-crossbar.mk
index 3d82d770..5ebeddc7 100644
--- a/bsp/buildroot/package/python-crossbar/python-crossbar.mk
+++ b/bsp/buildroot/package/python-crossbar/python-crossbar.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_CROSSBAR_VERSION = 0.14.0
+PYTHON_CROSSBAR_VERSION = 17.6.1.post3
 PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz
-PYTHON_CROSSBAR_SITE = https://pypi.python.org/packages/f0/9a/e0b77e15698c47b6293655bc0e1996dd8e87bd8af7bc7434a5c8281a024e
-PYTHON_CROSSBAR_LICENSE = AGPLv3
+PYTHON_CROSSBAR_SITE = https://pypi.python.org/packages/6a/25/9bc78947a4552c5fe27671ca2abe3be0559b8c76bc93d52157a6333ea971
+PYTHON_CROSSBAR_LICENSE = AGPL-3.0
 PYTHON_CROSSBAR_LICENSE_FILES = LICENSE
 PYTHON_CROSSBAR_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-cryptography/Config.in b/bsp/buildroot/package/python-cryptography/Config.in
index 9827cf82..14f950d4 100644
--- a/bsp/buildroot/package/python-cryptography/Config.in
+++ b/bsp/buildroot/package/python-cryptography/Config.in
@@ -3,16 +3,17 @@ config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY
 	depends on BR2_INSTALL_LIBSTDCPP # python-pyasn
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_PYTHON_CFFI # runtime
-	select BR2_PACKAGE_PYTHON_IDNA # runtime
-	select BR2_PACKAGE_PYTHON_PYASN # runtime
-	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
+	select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_IDNA # runtime
+	select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_PYASN # runtime
 	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
-	select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
 	help
 	  cryptography is a package designed to expose cryptographic
 	  primitives and recipes to Python developers.
diff --git a/bsp/buildroot/package/python-cryptography/python-cryptography.hash b/bsp/buildroot/package/python-cryptography/python-cryptography.hash
index 7738d234..a1162cf8 100644
--- a/bsp/buildroot/package/python-cryptography/python-cryptography.hash
+++ b/bsp/buildroot/package/python-cryptography/python-cryptography.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/cryptography/json, sha256 locally computed
-md5	2f63dee6ace602d1d20d1995f8538015  cryptography-1.7.1.tar.gz
-sha256	953fef7d40a49a795f4d955c5ce4338abcec5dea822ed0414ed30348303fdb4c  cryptography-1.7.1.tar.gz
+md5 fade66de437392ed1ba6980768626204 cryptography-1.7.2.tar.gz
+sha256 878cb68b3da3d493ffd68f36db11c29deee623671d3287c3f8d685117ffda9a9 cryptography-1.7.2.tar.gz
diff --git a/bsp/buildroot/package/python-cryptography/python-cryptography.mk b/bsp/buildroot/package/python-cryptography/python-cryptography.mk
index d4e18ec1..5373da82 100644
--- a/bsp/buildroot/package/python-cryptography/python-cryptography.mk
+++ b/bsp/buildroot/package/python-cryptography/python-cryptography.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_CRYPTOGRAPHY_VERSION = 1.7.1
+PYTHON_CRYPTOGRAPHY_VERSION = 1.7.2
 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz
-PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/82/f7/d6dfd7595910a20a563a83a762bf79a253c4df71759c3b228accb3d7e5e4
+PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/99/df/71c7260003f5c469cec3db4c547115df39e9ce6c719a99e067ba0e78fd8a
 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools
-PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3c
+PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause
 PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD
 PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl
 
diff --git a/bsp/buildroot/package/python-cssselect/Config.in b/bsp/buildroot/package/python-cssselect/Config.in
index 9c1ffe46..18d63720 100644
--- a/bsp/buildroot/package/python-cssselect/Config.in
+++ b/bsp/buildroot/package/python-cssselect/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_PYTHON_CSSSELECT
 	bool "python-cssselect"
 	help
-	  cssselect parses CSS3 Selectors and translates them to XPath 1.0
+	  cssselect parses CSS3 Selectors and translates them to XPath
+	  1.0
 
 	  http://packages.python.org/cssselect/
diff --git a/bsp/buildroot/package/python-cssselect/python-cssselect.hash b/bsp/buildroot/package/python-cssselect/python-cssselect.hash
index d3ee055a..dd05bebe 100644
--- a/bsp/buildroot/package/python-cssselect/python-cssselect.hash
+++ b/bsp/buildroot/package/python-cssselect/python-cssselect.hash
@@ -1,4 +1,4 @@
-# md5 from https://pypi.python.org/pypi/cssselect/json
-md5	4c5931d8456dfe72fa4662f9c0509bfa  cssselect-0.9.2.tar.gz
-# sha256 locally computed
-sha256	713b5b99ef08022257b3409c7ae1b18b2c6536b3f155e6237c5cfba0f67ae6f5  cssselect-0.9.2.tar.gz
+# md5 from https://pypi.python.org/pypi/cssselect/json, sha256 locally computed
+md5	50422c9ec04b74cd60c571f74ddc1a80  cssselect-1.0.3.tar.gz
+sha256	066d8bc5229af09617e24b3ca4d52f1f9092d9e061931f4184cd572885c23204  cssselect-1.0.3.tar.gz
+sha256  5c8da9f744e0afba81a48c9b5dbe73048f798b3287d6f1af8a05ee08ebb10892  LICENSE
diff --git a/bsp/buildroot/package/python-cssselect/python-cssselect.mk b/bsp/buildroot/package/python-cssselect/python-cssselect.mk
index 0db69b96..4ecc07ae 100644
--- a/bsp/buildroot/package/python-cssselect/python-cssselect.mk
+++ b/bsp/buildroot/package/python-cssselect/python-cssselect.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_CSSSELECT_VERSION = 0.9.2
+PYTHON_CSSSELECT_VERSION = 1.0.3
 PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz
-PYTHON_CSSSELECT_SITE = https://pypi.python.org/packages/11/21/47b5d2696a945da177d2344b6e330b7b0d1c52404063cb387d2261517ccb
+PYTHON_CSSSELECT_SITE = https://pypi.python.org/packages/52/ea/f31e1d2e9eb130fda2a631e22eac369dc644e8807345fbed5113f2d6f92b
 PYTHON_CSSSELECT_SETUP_TYPE = setuptools
-PYTHON_CSSSELECT_LICENSE = BSD-3c
+PYTHON_CSSSELECT_LICENSE = BSD-3-Clause
 PYTHON_CSSSELECT_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-cssutils/python-cssutils.mk b/bsp/buildroot/package/python-cssutils/python-cssutils.mk
index 3dd501aa..3aa96f47 100644
--- a/bsp/buildroot/package/python-cssutils/python-cssutils.mk
+++ b/bsp/buildroot/package/python-cssutils/python-cssutils.mk
@@ -7,7 +7,7 @@
 PYTHON_CSSUTILS_VERSION = 1.0.1
 PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz
 PYTHON_CSSUTILS_SITE = https://pypi.python.org/packages/22/de/6b03e0088baf0299ab7d2e95a9e26c2092e9cb3855876b958b6a62175ca2
-PYTHON_CSSUTILS_LICENSE = LGPLv3+
+PYTHON_CSSUTILS_LICENSE = LGPL-3.0+
 PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER
 PYTHON_CSSUTILS_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-daemon/python-daemon.mk b/bsp/buildroot/package/python-daemon/python-daemon.mk
index 648d549c..76820b70 100644
--- a/bsp/buildroot/package/python-daemon/python-daemon.mk
+++ b/bsp/buildroot/package/python-daemon/python-daemon.mk
@@ -6,7 +6,7 @@
 
 PYTHON_DAEMON_VERSION = 2.1.1
 PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon
-PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPLv3+ (test, build)
+PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPL-3.0+ (test, build)
 PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3
 PYTHON_DAEMON_SETUP_TYPE = setuptools
 PYTHON_DAEMON_DEPENDENCIES = host-python-docutils
diff --git a/bsp/buildroot/package/python-dataproperty/Config.in b/bsp/buildroot/package/python-dataproperty/Config.in
index 7ef7f085..18687090 100644
--- a/bsp/buildroot/package/python-dataproperty/Config.in
+++ b/bsp/buildroot/package/python-dataproperty/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_PYTHON_DATAPROPERTY
 	bool "python-dataproperty"
-	select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
-	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
-	select BR2_PACKAGE_PYTHON_PYTZ # runtime
-	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_LOGBOOK # runtime
+	select BR2_PACKAGE_PYTHON_TYPEPY # runtime
 	help
 	  Python library for extract property from data.
 
diff --git a/bsp/buildroot/package/python-dataproperty/python-dataproperty.hash b/bsp/buildroot/package/python-dataproperty/python-dataproperty.hash
index d84b2145..0e74acac 100644
--- a/bsp/buildroot/package/python-dataproperty/python-dataproperty.hash
+++ b/bsp/buildroot/package/python-dataproperty/python-dataproperty.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi/dataproperty/json, sha256 locally computed
-md5	a05cb97210d41677bde224b53562add4  DataProperty-0.16.2.tar.gz
-sha256	c2c6e1f2558bf03b0f8f2dc53a5eb00d9540babd3d69d299be878f2e32937e53  DataProperty-0.16.2.tar.gz
+# md5 from https://pypi.python.org/pypi/DataProperty/json, sha256 locally computed
+md5	66ecca45ae5e00b2a88799a2795a0cf8  DataProperty-0.29.1.tar.gz
+sha256	3e547003b1af16126ff48b1c284241bc8a46d1e38e334ecd3a5ba87955446806  DataProperty-0.29.1.tar.gz
+sha256  a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2  LICENSE
diff --git a/bsp/buildroot/package/python-dataproperty/python-dataproperty.mk b/bsp/buildroot/package/python-dataproperty/python-dataproperty.mk
index 997019c7..900cd046 100644
--- a/bsp/buildroot/package/python-dataproperty/python-dataproperty.mk
+++ b/bsp/buildroot/package/python-dataproperty/python-dataproperty.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_DATAPROPERTY_VERSION = 0.16.2
+PYTHON_DATAPROPERTY_VERSION = 0.29.1
 PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz
-PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/c8/95/4803e558a7e29ccf3adbf8f993ec53fe28c46df450892c4cc35c2f0ccedc
+PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/38/6f/bf65cf1398ca34c709bf14ca9bc33821588498abe50c4652b0d345b9c08c
 PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools
 PYTHON_DATAPROPERTY_LICENSE = MIT
 PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-dateutil/python-dateutil.mk b/bsp/buildroot/package/python-dateutil/python-dateutil.mk
index b1f5e68b..41dee2d1 100644
--- a/bsp/buildroot/package/python-dateutil/python-dateutil.mk
+++ b/bsp/buildroot/package/python-dateutil/python-dateutil.mk
@@ -7,7 +7,7 @@
 PYTHON_DATEUTIL_VERSION = 2.6.0
 PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6
 PYTHON_DATEUTIL_SETUP_TYPE = setuptools
-PYTHON_DATEUTIL_LICENSE = BSD-3c
+PYTHON_DATEUTIL_LICENSE = BSD-3-Clause
 PYTHON_DATEUTIL_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-decorator/Config.in b/bsp/buildroot/package/python-decorator/Config.in
new file mode 100644
index 00000000..e7ec00cd
--- /dev/null
+++ b/bsp/buildroot/package/python-decorator/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_DECORATOR
+	bool "python-decorator"
+	help
+	  Better living through Python with decorators
+
+	  https://github.com/micheles/decorator
diff --git a/bsp/buildroot/package/python-decorator/python-decorator.hash b/bsp/buildroot/package/python-decorator/python-decorator.hash
new file mode 100644
index 00000000..293f1ca6
--- /dev/null
+++ b/bsp/buildroot/package/python-decorator/python-decorator.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/decorator/json, sha256 locally calculated
+md5 73644c8f0bd4983d1b6a34b49adec0ae decorator-4.0.11.tar.gz
+sha256 953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76 decorator-4.0.11.tar.gz
diff --git a/bsp/buildroot/package/python-decorator/python-decorator.mk b/bsp/buildroot/package/python-decorator/python-decorator.mk
new file mode 100644
index 00000000..c0c43f60
--- /dev/null
+++ b/bsp/buildroot/package/python-decorator/python-decorator.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-decorator
+#
+################################################################################
+
+PYTHON_DECORATOR_VERSION = 4.0.11
+PYTHON_DECORATOR_SITE = https://pypi.python.org/packages/cc/ac/5a16f1fc0506ff72fcc8fd4e858e3a1c231f224ab79bb7c4c9b2094cc570
+PYTHON_DECORATOR_SOURCE = decorator-$(PYTHON_DECORATOR_VERSION).tar.gz
+PYTHON_DECORATOR_LICENSE = BSD-2-Clause
+PYTHON_DECORATOR_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-dialog/python-dialog.mk b/bsp/buildroot/package/python-dialog/python-dialog.mk
index b75d19fd..01bcb760 100644
--- a/bsp/buildroot/package/python-dialog/python-dialog.mk
+++ b/bsp/buildroot/package/python-dialog/python-dialog.mk
@@ -7,7 +7,7 @@
 PYTHON_DIALOG_VERSION = 3.0.1
 PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2
 PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION)
-PYTHON_DIALOG_LICENSE = LGPLv2.1+
+PYTHON_DIALOG_LICENSE = LGPL-2.1+
 PYTHON_DIALOG_LICENSE_FILES = COPYING
 PYTHON_DIALOG_SETUP_TYPE = distutils
 PYTHON_DIALOG_DEPENDENCIES = dialog
diff --git a/bsp/buildroot/package/python-dialog3/python-dialog3.mk b/bsp/buildroot/package/python-dialog3/python-dialog3.mk
index abc4a395..4048447e 100644
--- a/bsp/buildroot/package/python-dialog3/python-dialog3.mk
+++ b/bsp/buildroot/package/python-dialog3/python-dialog3.mk
@@ -7,7 +7,7 @@
 PYTHON_DIALOG3_VERSION = 3.4.0
 PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.bz2
 PYTHON_DIALOG3_SITE = https://pypi.python.org/packages/fa/f4/686742f01ebb5863d4c5e1acab620acfed0fe97280a26b4ed25917f4f333
-PYTHON_DIALOG3_LICENSE = LGPLv2.1+
+PYTHON_DIALOG3_LICENSE = LGPL-2.1+
 PYTHON_DIALOG3_LICENSE_FILES = COPYING
 PYTHON_DIALOG3_SETUP_TYPE = distutils
 PYTHON_DIALOG3_DEPENDENCIES = dialog
diff --git a/bsp/buildroot/package/python-dicttoxml/Config.in b/bsp/buildroot/package/python-dicttoxml/Config.in
index 152afbb6..e38a5f79 100644
--- a/bsp/buildroot/package/python-dicttoxml/Config.in
+++ b/bsp/buildroot/package/python-dicttoxml/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_DICTTOXML
 	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
 	help
-	  Converts a Python dictionary or other native data type into a valid
-	  XML string.
+	  Converts a Python dictionary or other native data type into
+	  a valid XML string.
 
 	  https://github.com/quandyfactory/dicttoxml
diff --git a/bsp/buildroot/package/python-dicttoxml/python-dicttoxml.mk b/bsp/buildroot/package/python-dicttoxml/python-dicttoxml.mk
index 69767150..537afff6 100644
--- a/bsp/buildroot/package/python-dicttoxml/python-dicttoxml.mk
+++ b/bsp/buildroot/package/python-dicttoxml/python-dicttoxml.mk
@@ -8,7 +8,7 @@ PYTHON_DICTTOXML_VERSION = 1.7.4
 PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz
 PYTHON_DICTTOXML_SITE = https://pypi.python.org/packages/74/36/534db111db9e7610a41641a1f6669a964aacaf51858f466de264cc8dcdd9
 PYTHON_DICTTOXML_SETUP_TYPE = distutils
-PYTHON_DICTTOXML_LICENSE = GPLv2
+PYTHON_DICTTOXML_LICENSE = GPL-2.0
 PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-django/Config.in b/bsp/buildroot/package/python-django/Config.in
index ff842275..75322d1b 100644
--- a/bsp/buildroot/package/python-django/Config.in
+++ b/bsp/buildroot/package/python-django/Config.in
@@ -7,10 +7,10 @@ config BR2_PACKAGE_PYTHON_DJANGO
 	help
 	  Django is a high-level Python Web framework that encourages
 	  rapid development and clean, pragmatic design. It takes your
-	  Web applications from concept to launch in a matter of hours.
-	  Django takes care of user authentication, content administration,
-	  site maps, RSS feeds, user comments and many more tasks.
-	  Django takes security seriously and helps developers avoid
-	  many common security mistakes
+	  Web applications from concept to launch in a matter of
+	  hours.  Django takes care of user authentication, content
+	  administration, site maps, RSS feeds, user comments and many
+	  more tasks.  Django takes security seriously and helps
+	  developers avoid many common security mistakes
 
 	  https://www.djangoproject.com/
diff --git a/bsp/buildroot/package/python-django/python-django.hash b/bsp/buildroot/package/python-django/python-django.hash
index 09be1844..6e6e7708 100644
--- a/bsp/buildroot/package/python-django/python-django.hash
+++ b/bsp/buildroot/package/python-django/python-django.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/django/json, sha256 locally computed
-md5	693dfeabad62c561cb205900d32c2a98  Django-1.10.7.tar.gz
-sha256	593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8  Django-1.10.7.tar.gz
+# From https://www.djangoproject.com/m/pgp/Django-1.11.16.checksum.txt
+sha256	29268cc47816a44f27308e60f71da635f549c47d8a1d003b28de55141df75791  Django-1.11.16.tar.gz
+sha256	b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669  LICENSE
diff --git a/bsp/buildroot/package/python-django/python-django.mk b/bsp/buildroot/package/python-django/python-django.mk
index 5bb76556..9f43ffab 100644
--- a/bsp/buildroot/package/python-django/python-django.mk
+++ b/bsp/buildroot/package/python-django/python-django.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_DJANGO_VERSION = 1.10.7
+PYTHON_DJANGO_VERSION = 1.11.16
 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
 # The official Django site has an unpractical URL
-PYTHON_DJANGO_SITE = https://pypi.python.org/packages/15/b4/d4bb7313e02386bd23a60e1eb5670321313fb67289c6f36ec43bce747aff
-PYTHON_DJANGO_LICENSE = BSD-3c
+PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/35/1d/59836bce4c9cfded261e21c0abd6a4629de6d289522d0fd928117d8eb985
+PYTHON_DJANGO_LICENSE = BSD-3-Clause
 PYTHON_DJANGO_LICENSE_FILES = LICENSE
 PYTHON_DJANGO_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-docutils/python-docutils.hash b/bsp/buildroot/package/python-docutils/python-docutils.hash
index 9d45058f..dbf0fde8 100644
--- a/bsp/buildroot/package/python-docutils/python-docutils.hash
+++ b/bsp/buildroot/package/python-docutils/python-docutils.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed
-md5     4622263b62c5c771c03502afa3157768 docutils-0.12.tar.gz
-sha256  c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa  docutils-0.12.tar.gz
+md5	c53768d63db3873b7d452833553469de  docutils-0.14.tar.gz
+sha256	51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274  docutils-0.14.tar.gz
+sha256  58c2807e9e6e3297ad4da08acc8884d09d8c5ffc9d824dd100922d0bb1ee4717  COPYING.txt
diff --git a/bsp/buildroot/package/python-docutils/python-docutils.mk b/bsp/buildroot/package/python-docutils/python-docutils.mk
index a67d89fa..53da1a56 100644
--- a/bsp/buildroot/package/python-docutils/python-docutils.mk
+++ b/bsp/buildroot/package/python-docutils/python-docutils.mk
@@ -1,13 +1,13 @@
-#############################################################
+################################################################################
 #
 # python-docutils
 #
-#############################################################
+################################################################################
 
-PYTHON_DOCUTILS_VERSION = 0.12
+PYTHON_DOCUTILS_VERSION = 0.14
 PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz
-PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/37/38/ceda70135b9144d84884ae2fc5886c6baac4edea39550f28bcd144c1234d
-PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPLv3 (emacs mode), other
+PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/84/f4/5771e41fdf52aabebbadecc9381d11dea0fa34e4759b4071244fa094804c
+PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2-Clause, GPL-3.0 (emacs mode), other
 PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt
 PYTHON_DOCUTILS_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-dominate/python-dominate.mk b/bsp/buildroot/package/python-dominate/python-dominate.mk
index 3e264caa..70ddb067 100644
--- a/bsp/buildroot/package/python-dominate/python-dominate.mk
+++ b/bsp/buildroot/package/python-dominate/python-dominate.mk
@@ -8,7 +8,7 @@ PYTHON_DOMINATE_VERSION = 2.3.1
 PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz
 PYTHON_DOMINATE_SITE = https://pypi.python.org/packages/43/b2/3b7d67dd59dab93ae08569384b254323516e8868b453eea5614a53835baf
 PYTHON_DOMINATE_SETUP_TYPE = setuptools
-PYTHON_DOMINATE_LICENSE = LGPLv3+
+PYTHON_DOMINATE_LICENSE = LGPL-3.0+
 PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-dpkt/python-dpkt.mk b/bsp/buildroot/package/python-dpkt/python-dpkt.mk
index 30155024..9694b9e6 100644
--- a/bsp/buildroot/package/python-dpkt/python-dpkt.mk
+++ b/bsp/buildroot/package/python-dpkt/python-dpkt.mk
@@ -7,7 +7,7 @@
 PYTHON_DPKT_VERSION = 1.8.r98
 PYTHON_DPKT_SITE = $(call github,kbandla,dpkt,$(PYTHON_DPKT_VERSION))
 PYTHON_DPKT_SETUP_TYPE = distutils
-PYTHON_DPKT_LICENSE = BSD-3c
+PYTHON_DPKT_LICENSE = BSD-3-Clause
 PYTHON_DPKT_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-enum/python-enum.hash b/bsp/buildroot/package/python-enum/python-enum.hash
index c7c1924a..6f1daa0b 100644
--- a/bsp/buildroot/package/python-enum/python-enum.hash
+++ b/bsp/buildroot/package/python-enum/python-enum.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=ce75c7c3c86741175a84456cc5bd531e, sha256 locally computed
-md5	ce75c7c3c86741175a84456cc5bd531e  enum-0.4.4.tar.gz
-sha256	9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff  enum-0.4.4.tar.gz
+# md5 from https://pypi.python.org/pypi/enum/json, sha256 locally computed
+md5 173d468112cfa13a149b2c8af3e8fd52 enum-0.4.6.tar.gz
+sha256 54e78526b166982b36884613f35a76d9a6711c49810d3ec1a05b10c9b31f938e enum-0.4.6.tar.gz
diff --git a/bsp/buildroot/package/python-enum/python-enum.mk b/bsp/buildroot/package/python-enum/python-enum.mk
index 0131be3f..ea602e44 100644
--- a/bsp/buildroot/package/python-enum/python-enum.mk
+++ b/bsp/buildroot/package/python-enum/python-enum.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_ENUM_VERSION = 0.4.4
+PYTHON_ENUM_VERSION = 0.4.6
 PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz
-PYTHON_ENUM_SITE = http://pypi.python.org/packages/source/e/enum
+PYTHON_ENUM_SITE = https://pypi.python.org/packages/0c/4e/1ea357e7783c756bb579333c1e4a026fb331371ee771f616ffedc781e531
 PYTHON_ENUM_SETUP_TYPE = setuptools
-PYTHON_ENUM_LICENSE = GPLv2+ or Python software foundation license v2
-PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL LICENSE.PSF
+PYTHON_ENUM_LICENSE = GPL-3.0+
+PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL-3
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-enum34/python-enum34.hash b/bsp/buildroot/package/python-enum34/python-enum34.hash
index dd6ce340..a5f0c653 100644
--- a/bsp/buildroot/package/python-enum34/python-enum34.hash
+++ b/bsp/buildroot/package/python-enum34/python-enum34.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=ac80f432ac9373e7d162834b264034b6, sha256 locally computed
-md5	ac80f432ac9373e7d162834b264034b6  enum34-1.0.4.tar.gz
-sha256	d3c19f26a6a34629c18c775f59dfc5dd595764c722b57a2da56ebfb69b94e447  enum34-1.0.4.tar.gz
+# md5 from https://pypi.python.org/pypi/enum34/json, sha256 locally computed
+md5 5f13a0841a61f7fc295c514490d120d0 enum34-1.1.6.tar.gz
+sha256 8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1 enum34-1.1.6.tar.gz
diff --git a/bsp/buildroot/package/python-enum34/python-enum34.mk b/bsp/buildroot/package/python-enum34/python-enum34.mk
index 13c529d2..c612cb65 100644
--- a/bsp/buildroot/package/python-enum34/python-enum34.mk
+++ b/bsp/buildroot/package/python-enum34/python-enum34.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_ENUM34_VERSION = 1.0.4
+PYTHON_ENUM34_VERSION = 1.1.6
 PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz
-PYTHON_ENUM34_SITE = http://pypi.python.org/packages/source/e/enum34
-PYTHON_ENUM34_SETUP_TYPE = distutils
-PYTHON_ENUM34_LICENSE = BSD-3c
+PYTHON_ENUM34_SITE = https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876
+PYTHON_ENUM34_SETUP_TYPE = setuptools
+PYTHON_ENUM34_LICENSE = BSD-3-Clause
 PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-flask-babel/python-flask-babel.mk b/bsp/buildroot/package/python-flask-babel/python-flask-babel.mk
index 35d34d1c..0b74149f 100644
--- a/bsp/buildroot/package/python-flask-babel/python-flask-babel.mk
+++ b/bsp/buildroot/package/python-flask-babel/python-flask-babel.mk
@@ -7,7 +7,7 @@
 PYTHON_FLASK_BABEL_VERSION = 0.11.1
 PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz
 PYTHON_FLASK_BABEL_SITE = https://pypi.python.org/packages/47/96/6013d4091fb4238e27e918aec4929f082942fa8c9489ae3aad2f18de4b5b
-PYTHON_FLASK_BABEL_LICENSE = BSD-3c
+PYTHON_FLASK_BABEL_LICENSE = BSD-3-Clause
 PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools
 PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE
 
diff --git a/bsp/buildroot/package/python-flask-cors/Config.in b/bsp/buildroot/package/python-flask-cors/Config.in
new file mode 100644
index 00000000..e2e84797
--- /dev/null
+++ b/bsp/buildroot/package/python-flask-cors/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_FLASK_CORS
+	bool "python-flask-cors"
+	select BR2_PACKAGE_PYTHON_FLASK # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  A Flask extension adding a decorator for CORS support.
+
+	  https://github.com/corydolphin/flask-cors
diff --git a/bsp/buildroot/package/python-flask-cors/python-flask-cors.hash b/bsp/buildroot/package/python-flask-cors/python-flask-cors.hash
new file mode 100644
index 00000000..5a8256ef
--- /dev/null
+++ b/bsp/buildroot/package/python-flask-cors/python-flask-cors.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/flask-cors/json, sha256 locally computed
+md5	ddc12bdf8fa19a4ce1504ab9d0b0a8bc  Flask-Cors-3.0.3.tar.gz
+sha256	62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b  Flask-Cors-3.0.3.tar.gz
+sha256	6e1a1bdc54834c1e0740cbce5d5f6f2cae1c846fd2a7f482b11649594fafbd5d  LICENSE
diff --git a/bsp/buildroot/package/python-flask-cors/python-flask-cors.mk b/bsp/buildroot/package/python-flask-cors/python-flask-cors.mk
new file mode 100644
index 00000000..6d5900b4
--- /dev/null
+++ b/bsp/buildroot/package/python-flask-cors/python-flask-cors.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-flask-cors
+#
+################################################################################
+
+PYTHON_FLASK_CORS_VERSION = 3.0.3
+PYTHON_FLASK_CORS_SOURCE = Flask-Cors-$(PYTHON_FLASK_CORS_VERSION).tar.gz
+PYTHON_FLASK_CORS_SITE = https://pypi.python.org/packages/64/e8/e6bcf79dcad7b7c10f8c8c35d78b5710f2ddcd8ed38e607dd6a4853ab8a8
+PYTHON_FLASK_CORS_SETUP_TYPE = setuptools
+PYTHON_FLASK_CORS_LICENSE = MIT
+PYTHON_FLASK_CORS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk b/bsp/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
index ade39e1b..dbb37c37 100644
--- a/bsp/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
+++ b/bsp/buildroot/package/python-flask-jsonrpc/python-flask-jsonrpc.mk
@@ -7,7 +7,7 @@
 PYTHON_FLASK_JSONRPC_VERSION = 0.3.1
 PYTHON_FLASK_JSONRPC_SOURCE = Flask-JSONRPC-$(PYTHON_FLASK_JSONRPC_VERSION).tar.gz
 PYTHON_FLASK_JSONRPC_SITE = https://pypi.python.org/packages/cb/1f/e6d66e8498609ba04bac76155b2ea884df95531e93501bf4ef009d40a83c
-PYTHON_FLASK_JSONRPC_LICENSE = BSD-3c
+PYTHON_FLASK_JSONRPC_LICENSE = BSD-3-Clause
 PYTHON_FLASK_JSONRPC_LICENSE_FILES = setup.py
 PYTHON_FLASK_JSONRPC_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-flask-login/python-flask-login.hash b/bsp/buildroot/package/python-flask-login/python-flask-login.hash
index c488a35e..cd73b3ff 100644
--- a/bsp/buildroot/package/python-flask-login/python-flask-login.hash
+++ b/bsp/buildroot/package/python-flask-login/python-flask-login.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/Flask-Login/0.3.2, sha256 locally computed:
-md5    d95c2275d3e1c755145910077366dc45                                 Flask-Login-0.3.2.tar.gz
-sha256 e72eff5c35e5a31db1aeca1db5d2501be702674ea88e8f223b5d2b11644beee6 Flask-Login-0.3.2.tar.gz
+# md5 from https://pypi.python.org/pypi/flask_login/json, sha256 locally computed
+md5 e050efaa2c4dbc2d97f480a70f4d44aa Flask-Login-0.4.0.tar.gz
+sha256 d25e356b14a59f52da0ab30c31c2ad285fa23a840f0f6971df7ed247c77082a7 Flask-Login-0.4.0.tar.gz
diff --git a/bsp/buildroot/package/python-flask-login/python-flask-login.mk b/bsp/buildroot/package/python-flask-login/python-flask-login.mk
index aa6d8e3d..50374130 100644
--- a/bsp/buildroot/package/python-flask-login/python-flask-login.mk
+++ b/bsp/buildroot/package/python-flask-login/python-flask-login.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_FLASK_LOGIN_VERSION = 0.3.2
+PYTHON_FLASK_LOGIN_VERSION = 0.4.0
 PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz
-PYTHON_FLASK_LOGIN_SITE = http://pypi.python.org/packages/source/F/Flask-Login
+PYTHON_FLASK_LOGIN_SITE = https://pypi.python.org/packages/70/96/20cae731ef27084dcb183f3a6e3073d0232f10c1fd7be76729bd7bd4b994
 PYTHON_FLASK_LOGIN_LICENSE = MIT
 PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE
 PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-flask/python-flask.hash b/bsp/buildroot/package/python-flask/python-flask.hash
index 919b0759..ca117218 100644
--- a/bsp/buildroot/package/python-flask/python-flask.hash
+++ b/bsp/buildroot/package/python-flask/python-flask.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/flask/json, sha256 locally computed
-md5	c1d30f51cff4a38f9454b23328a15c5a  Flask-0.12.tar.gz
-sha256	93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b  Flask-0.12.tar.gz
+# md5 from https://pypi.python.org/pypi/Flask/json, sha256 locally computed
+md5	97278dfdafda98ba7902e890b0289177  Flask-0.12.2.tar.gz
+sha256	49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1  Flask-0.12.2.tar.gz
diff --git a/bsp/buildroot/package/python-flask/python-flask.mk b/bsp/buildroot/package/python-flask/python-flask.mk
index 6c25a6d1..06b1b4d9 100644
--- a/bsp/buildroot/package/python-flask/python-flask.mk
+++ b/bsp/buildroot/package/python-flask/python-flask.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_FLASK_VERSION = 0.12
+PYTHON_FLASK_VERSION = 0.12.2
 PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz
-PYTHON_FLASK_SITE = https://pypi.python.org/packages/4b/3a/4c20183df155dd2e39168e35d53a388efb384a512ca6c73001d8292c094a
+PYTHON_FLASK_SITE = https://pypi.python.org/packages/eb/12/1c7bd06fcbd08ba544f25bf2c6612e305a70ea51ca0eda8007344ec3f123
 PYTHON_FLASK_SETUP_TYPE = setuptools
-PYTHON_FLASK_LICENSE = BSD-3c
+PYTHON_FLASK_LICENSE = BSD-3-Clause
 PYTHON_FLASK_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-flup/python-flup.hash b/bsp/buildroot/package/python-flup/python-flup.hash
index 50a0381d..86f8d1bf 100644
--- a/bsp/buildroot/package/python-flup/python-flup.hash
+++ b/bsp/buildroot/package/python-flup/python-flup.hash
@@ -1,4 +1,3 @@
-# From https://pypi.python.org/pypi/flup/1.0.3.dev-20110405
-md5	a005b072d144fc0e44b0fa4c5a9ba029	flup-1.0.3.dev-20110405.tar.gz
-# Calculated based on the hash above
-sha256	6649cf41854ea8782c795cdde64fdf79a90db821533d3652f91d21b0a7f39c79	flup-1.0.3.dev-20110405.tar.gz
+# md5 from https://pypi.python.org/pypi/flup/json, sha256 locally computed
+md5 bc104a7444bfac36fc2146a356de4c11 flup-1.0.3.dev20161029.tar.gz
+sha256 3dc5620b77a6a4cd0afb556626eb0ce85708e513f9c50dc5e982190e3d5f9e26 flup-1.0.3.dev20161029.tar.gz
diff --git a/bsp/buildroot/package/python-flup/python-flup.mk b/bsp/buildroot/package/python-flup/python-flup.mk
index 5e612bb3..26d59385 100644
--- a/bsp/buildroot/package/python-flup/python-flup.mk
+++ b/bsp/buildroot/package/python-flup/python-flup.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_FLUP_VERSION = 1.0.3.dev-20110405
+PYTHON_FLUP_VERSION = 1.0.3.dev20161029
 PYTHON_FLUP_SOURCE = flup-$(PYTHON_FLUP_VERSION).tar.gz
-PYTHON_FLUP_SITE = http://pypi.python.org/packages/source/f/flup
+PYTHON_FLUP_SITE = https://pypi.python.org/packages/17/33/36768930a5ffe4f294ed3987c631bfd3fddb4f9e5e46bc8dc30fd731dbcd
 
-PYTHON_FLUP_LICENSE = BSD-2c, MIT
+PYTHON_FLUP_LICENSE = BSD-2-Clause, MIT
 
 PYTHON_FLUP_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-functools32/Config.in b/bsp/buildroot/package/python-functools32/Config.in
new file mode 100644
index 00000000..cc12557e
--- /dev/null
+++ b/bsp/buildroot/package/python-functools32/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_FUNCTOOLS32
+	bool "python-functools32"
+	depends on BR2_PACKAGE_PYTHON
+	help
+	  Backport of the functools module from Python 3.2.3 for use on 2.7
+	  and PyPy.
+
+	  https://github.com/MiCHiLU/python-functools32
diff --git a/bsp/buildroot/package/python-functools32/python-functools32.hash b/bsp/buildroot/package/python-functools32/python-functools32.hash
new file mode 100644
index 00000000..606de817
--- /dev/null
+++ b/bsp/buildroot/package/python-functools32/python-functools32.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/functools32/json, sha256 locally computed
+md5	09f24ffd9af9f6cd0f63cb9f4e23d4b2  functools32-3.2.3-2.tar.gz
+sha256	f6253dfbe0538ad2e387bd8fdfd9293c925d63553f5813c4e587745416501e6d  functools32-3.2.3-2.tar.gz
+sha256	3f9ea6b89abe1556b72aff67b987d64c8272564815cd6a2832e6c4f6abdfe3b1  LICENSE
diff --git a/bsp/buildroot/package/python-functools32/python-functools32.mk b/bsp/buildroot/package/python-functools32/python-functools32.mk
new file mode 100644
index 00000000..8a88bb2a
--- /dev/null
+++ b/bsp/buildroot/package/python-functools32/python-functools32.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-functools32
+#
+################################################################################
+
+PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2
+PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz
+PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db
+PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils
+PYTHON_FUNCTOOLS32_LICENSE = Python-2.0
+PYTHON_FUNCTOOLS32_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-futures/python-futures.mk b/bsp/buildroot/package/python-futures/python-futures.mk
index 8a1afa33..fabfa6ae 100644
--- a/bsp/buildroot/package/python-futures/python-futures.mk
+++ b/bsp/buildroot/package/python-futures/python-futures.mk
@@ -8,7 +8,7 @@ PYTHON_FUTURES_VERSION = 3.0.5
 PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz
 PYTHON_FUTURES_SITE = https://pypi.python.org/packages/55/db/97c1ca37edab586a1ae03d6892b6633d8eaa23b23ac40c7e5bbc55423c78
 PYTHON_FUTURES_SETUP_TYPE = setuptools
-PYTHON_FUTURES_LICENSE = BSD-2c
+PYTHON_FUTURES_LICENSE = BSD-2-Clause
 PYTHON_FUTURES_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-gobject/python-gobject.mk b/bsp/buildroot/package/python-gobject/python-gobject.mk
index 74cb0540..cf5c8741 100644
--- a/bsp/buildroot/package/python-gobject/python-gobject.mk
+++ b/bsp/buildroot/package/python-gobject/python-gobject.mk
@@ -8,7 +8,7 @@ PYTHON_GOBJECT_VERSION_MAJOR = 2.28
 PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).6
 PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz
 PYTHON_GOBJECT_SITE = http://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR)
-PYTHON_GOBJECT_LICENSE = LGPLv2.1+
+PYTHON_GOBJECT_LICENSE = LGPL-2.1+
 PYTHON_GOBJECT_LICENSE_FILES = COPYING
 PYTHON_GOBJECT_DEPENDENCIES = host-pkgconf libglib2
 PYTHON_GOBJECT_CONF_OPTS = --disable-introspection
@@ -19,13 +19,13 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON_GOBJECT_DEPENDENCIES += python host-python
 
 PYTHON_GOBJECT_CONF_ENV = \
-	PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	PYTHON=$(HOST_DIR)/bin/python2 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`"
 else
 PYTHON_GOBJECT_DEPENDENCIES += python3 host-python3
 
 PYTHON_GOBJECT_CONF_ENV = \
-	PYTHON=$(HOST_DIR)/usr/bin/python3 \
+	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`"
 endif
 
diff --git a/bsp/buildroot/package/python-h2/Config.in b/bsp/buildroot/package/python-h2/Config.in
new file mode 100644
index 00000000..dccee9b9
--- /dev/null
+++ b/bsp/buildroot/package/python-h2/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_H2
+	bool "python-h2"
+	select BR2_PACKAGE_PYTHON_HYPERFRAME # runtime
+	select BR2_PACKAGE_PYTHON_HPACK # runtime
+	help
+	  HTTP/2 State-Machine based protocol implementation.
+
+	  http://hyper.rtfd.org
diff --git a/bsp/buildroot/package/python-h2/python-h2.hash b/bsp/buildroot/package/python-h2/python-h2.hash
new file mode 100644
index 00000000..e34f7beb
--- /dev/null
+++ b/bsp/buildroot/package/python-h2/python-h2.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/h2/json, sha256 locally computed
+md5	586686662928c2851eb0f1fe99bf279d  h2-3.0.1.tar.gz
+sha256	b2962f883fa392a23cbfcc4ad03c335bcc661be0cf9627657b589f0df2206e64  h2-3.0.1.tar.gz
diff --git a/bsp/buildroot/package/python-h2/python-h2.mk b/bsp/buildroot/package/python-h2/python-h2.mk
new file mode 100644
index 00000000..37f01564
--- /dev/null
+++ b/bsp/buildroot/package/python-h2/python-h2.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-h2
+#
+################################################################################
+
+PYTHON_H2_VERSION = 3.0.1
+PYTHON_H2_SOURCE = h2-$(PYTHON_H2_VERSION).tar.gz
+PYTHON_H2_SITE = https://pypi.python.org/packages/3c/86/aebb88df3c87255cfd0ffd338608fbfb34d1c850750a486e7f05b013e5a3
+PYTHON_H2_SETUP_TYPE = setuptools
+PYTHON_H2_LICENSE = MIT
+PYTHON_H2_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch b/bsp/buildroot/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch
new file mode 100644
index 00000000..015b8a24
--- /dev/null
+++ b/bsp/buildroot/package/python-hpack/0001-Convert-HISTORY.rst-from-UTF-8-format-to-ASCII.patch
@@ -0,0 +1,40 @@
+From 3d195f4f599f37c89419f1db1302f94acb38c264 Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Tue, 1 Aug 2017 10:15:33 +0200
+Subject: [PATCH] Convert HISTORY.rst from UTF-8 format to ASCII
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+UTF-8 formatted file breaks installations on some systems:
+
+Traceback (most recent call last):
+  File "setup.py", line 34, in <module>
+    long_description=open('README.rst').read() + '\n\n' + open('HISTORY.rst').read(),
+  File "/home/peko/autobuild/instance-1/output/target/usr/lib/python3.6/encodings/ascii.py", line 26, in decode
+    return codecs.ascii_decode(input, self.errors)[0]
+UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1125: ordinal not in range(128)
+
+To fix this error just replace '§' with 'S' meaning 'Section'.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ HISTORY.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/HISTORY.rst b/HISTORY.rst
+index 37b2d9c..b9310f5 100644
+--- a/HISTORY.rst
++++ b/HISTORY.rst
+@@ -27,7 +27,7 @@ Release History
+ - HPACK now tolerates receiving multiple header table size changes in sequence,
+   rather than only one.
+ - HPACK now forbids header table size changes anywhere but first in a header
+-  block, as required by RFC 7541 § 4.2.
++  block, as required by RFC 7541 S 4.2.
+ - Other miscellaneous performance improvements.
+ 
+ 2.3.0 (2016-08-04)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/python-hpack/Config.in b/bsp/buildroot/package/python-hpack/Config.in
new file mode 100644
index 00000000..b0ea03bc
--- /dev/null
+++ b/bsp/buildroot/package/python-hpack/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_HPACK
+	bool "python-hpack"
+	help
+	  Pure-Python HPACK header compression.
+
+	  http://hyper.rtfd.org
diff --git a/bsp/buildroot/package/python-hpack/python-hpack.hash b/bsp/buildroot/package/python-hpack/python-hpack.hash
new file mode 100644
index 00000000..445d4d59
--- /dev/null
+++ b/bsp/buildroot/package/python-hpack/python-hpack.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/hpack/json, sha256 locally computed
+md5	556b0ae66180f54c2ce8029a0952088b  hpack-3.0.0.tar.gz
+sha256	8eec9c1f4bfae3408a3f30500261f7e6a65912dc138526ea054f9ad98892e9d2  hpack-3.0.0.tar.gz
diff --git a/bsp/buildroot/package/python-hpack/python-hpack.mk b/bsp/buildroot/package/python-hpack/python-hpack.mk
new file mode 100644
index 00000000..d6b96649
--- /dev/null
+++ b/bsp/buildroot/package/python-hpack/python-hpack.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-hpack
+#
+################################################################################
+
+PYTHON_HPACK_VERSION = 3.0.0
+PYTHON_HPACK_SOURCE = hpack-$(PYTHON_HPACK_VERSION).tar.gz
+PYTHON_HPACK_SITE = https://pypi.python.org/packages/44/f1/b4440e46e265a29c0cb7b09b6daec6edf93c79eae713cfed93fbbf8716c5
+PYTHON_HPACK_SETUP_TYPE = setuptools
+PYTHON_HPACK_LICENSE = MIT
+PYTHON_HPACK_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-httplib2/python-httplib2.hash b/bsp/buildroot/package/python-httplib2/python-httplib2.hash
index 879f18b9..9a075b6d 100644
--- a/bsp/buildroot/package/python-httplib2/python-httplib2.hash
+++ b/bsp/buildroot/package/python-httplib2/python-httplib2.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=bd1b1445b3b2dfa7276b09b1a07b7f0e, sha256 locally computed
-md5	bd1b1445b3b2dfa7276b09b1a07b7f0e  httplib2-0.9.2.tar.gz
-sha256	c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988  httplib2-0.9.2.tar.gz
+# md5 from https://pypi.python.org/pypi/httplib2/json, sha256 locally computed
+md5 709c305e1b00e9c0af49ee816429569c httplib2-0.10.3.tar.gz
+sha256 e404d3b7bd86c1bc931906098e7c1305d6a3a6dcef141b8bb1059903abb3ceeb httplib2-0.10.3.tar.gz
diff --git a/bsp/buildroot/package/python-httplib2/python-httplib2.mk b/bsp/buildroot/package/python-httplib2/python-httplib2.mk
index adeddd33..7c14e24e 100644
--- a/bsp/buildroot/package/python-httplib2/python-httplib2.mk
+++ b/bsp/buildroot/package/python-httplib2/python-httplib2.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_HTTPLIB2_VERSION = 0.9.2
+PYTHON_HTTPLIB2_VERSION = 0.10.3
 PYTHON_HTTPLIB2_SOURCE = httplib2-$(PYTHON_HTTPLIB2_VERSION).tar.gz
-PYTHON_HTTPLIB2_SITE = http://pypi.python.org/packages/source/h/httplib2
+PYTHON_HTTPLIB2_SITE = https://pypi.python.org/packages/e4/2e/a7e27d2c36076efeb8c0e519758968b20389adf57a9ce3af139891af2696
 PYTHON_HTTPLIB2_SETUP_TYPE = setuptools
 PYTHON_HTTPLIB2_LICENSE = MIT
 PYTHON_HTTPLIB2_LICENSE_FILES = PKG-INFO
diff --git a/bsp/buildroot/package/python-hyperframe/Config.in b/bsp/buildroot/package/python-hyperframe/Config.in
new file mode 100644
index 00000000..f3318a20
--- /dev/null
+++ b/bsp/buildroot/package/python-hyperframe/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_HYPERFRAME
+	bool "python-hyperframe"
+	help
+	  HTTP/2 framing layer for Python.
+
+	  http://hyper.rtfd.org
diff --git a/bsp/buildroot/package/python-hyperframe/python-hyperframe.hash b/bsp/buildroot/package/python-hyperframe/python-hyperframe.hash
new file mode 100644
index 00000000..e6139374
--- /dev/null
+++ b/bsp/buildroot/package/python-hyperframe/python-hyperframe.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/hyperframe/json, sha256 locally computed
+md5	c2aa71dd091836e72d2c6784d1dd1591  hyperframe-5.1.0.tar.gz
+sha256	a25944539db36d6a2e47689e7915dcee562b3f8d10c6cdfa0d53c91ed692fb04  hyperframe-5.1.0.tar.gz
diff --git a/bsp/buildroot/package/python-hyperframe/python-hyperframe.mk b/bsp/buildroot/package/python-hyperframe/python-hyperframe.mk
new file mode 100644
index 00000000..8d0688f6
--- /dev/null
+++ b/bsp/buildroot/package/python-hyperframe/python-hyperframe.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-hyperframe
+#
+################################################################################
+
+PYTHON_HYPERFRAME_VERSION = 5.1.0
+PYTHON_HYPERFRAME_SOURCE = hyperframe-$(PYTHON_HYPERFRAME_VERSION).tar.gz
+PYTHON_HYPERFRAME_SITE = https://pypi.python.org/packages/a4/59/dddaddc73b4d53e9649850998e23b6daca80817c5442465a12423235d20b
+PYTHON_HYPERFRAME_SETUP_TYPE = setuptools
+PYTHON_HYPERFRAME_LICENSE = MIT
+PYTHON_HYPERFRAME_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-hyperlink/Config.in b/bsp/buildroot/package/python-hyperlink/Config.in
new file mode 100644
index 00000000..11ac8142
--- /dev/null
+++ b/bsp/buildroot/package/python-hyperlink/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_HYPERLINK
+	bool "python-hyperlink"
+	help
+	  A featureful, correct URL for Python.
+
+	  https://github.com/python-hyper/hyperlink
diff --git a/bsp/buildroot/package/python-hyperlink/python-hyperlink.hash b/bsp/buildroot/package/python-hyperlink/python-hyperlink.hash
new file mode 100644
index 00000000..565a34d1
--- /dev/null
+++ b/bsp/buildroot/package/python-hyperlink/python-hyperlink.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/hyperlink/json, sha256 locally computed
+md5	7a86b09d80b8f0c89f6b61efa0ebaab9  hyperlink-17.3.0.tar.gz
+sha256	ddadbbdda2b94182da14be1b5d26ec3188dfdf9687b9b8c8d810f52f79b7af1a  hyperlink-17.3.0.tar.gz
diff --git a/bsp/buildroot/package/python-hyperlink/python-hyperlink.mk b/bsp/buildroot/package/python-hyperlink/python-hyperlink.mk
new file mode 100644
index 00000000..7b48e363
--- /dev/null
+++ b/bsp/buildroot/package/python-hyperlink/python-hyperlink.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-hyperlink
+#
+################################################################################
+
+PYTHON_HYPERLINK_VERSION = 17.3.0
+PYTHON_HYPERLINK_SOURCE = hyperlink-$(PYTHON_HYPERLINK_VERSION).tar.gz
+PYTHON_HYPERLINK_SITE = https://pypi.python.org/packages/61/9c/69aa5d6942271961ad1fff910db77706623423d054ecb647da963efdf49a
+PYTHON_HYPERLINK_SETUP_TYPE = setuptools
+PYTHON_HYPERLINK_LICENSE = MIT
+PYTHON_HYPERLINK_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-ibmiotf/Config.in b/bsp/buildroot/package/python-ibmiotf/Config.in
new file mode 100644
index 00000000..66d58687
--- /dev/null
+++ b/bsp/buildroot/package/python-ibmiotf/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_PYTHON_IBMIOTF
+	bool "python-ibmiotf"
+	select BR2_PACKAGE_PYTHON_DICTTOXML # runtime
+	select BR2_PACKAGE_PYTHON_ISO8601 # runtime
+	select BR2_PACKAGE_PYTHON_PAHO_MQTT # runtime
+	select BR2_PACKAGE_PYTHON_PYTZ # runtime
+	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
+	select BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT # runtime
+	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_XMLTODICT # runtime
+	help
+	  Python Client for IBM Watson IoT Platform.
+
+	  https://github.com/ibm-watson-iot/iot-python
diff --git a/bsp/buildroot/package/python-ibmiotf/python-ibmiotf.hash b/bsp/buildroot/package/python-ibmiotf/python-ibmiotf.hash
new file mode 100644
index 00000000..9649876f
--- /dev/null
+++ b/bsp/buildroot/package/python-ibmiotf/python-ibmiotf.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256  ab230bc4c90af4237abe790ebc6b171706a35971b886f1724d879c2f328a616b  python-ibmiotf-0.2.8.tar.gz
+sha256  d8288e11fc42988629f7c0b649fa007332dd0187b010d025feaf7b1925376e8d  LICENSE
diff --git a/bsp/buildroot/package/python-ibmiotf/python-ibmiotf.mk b/bsp/buildroot/package/python-ibmiotf/python-ibmiotf.mk
new file mode 100644
index 00000000..9853389c
--- /dev/null
+++ b/bsp/buildroot/package/python-ibmiotf/python-ibmiotf.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-ibmiotf
+#
+################################################################################
+
+PYTHON_IBMIOTF_VERSION = 0.2.8
+PYTHON_IBMIOTF_SITE = $(call github,ibm-watson-iot,iot-python,$(PYTHON_IBMIOTF_VERSION))
+PYTHON_IBMIOTF_SETUP_TYPE = setuptools
+PYTHON_IBMIOTF_LICENSE = EPL-1.0
+PYTHON_IBMIOTF_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-id3/python-id3.mk b/bsp/buildroot/package/python-id3/python-id3.mk
index 157576e6..d4cdded0 100644
--- a/bsp/buildroot/package/python-id3/python-id3.mk
+++ b/bsp/buildroot/package/python-id3/python-id3.mk
@@ -8,7 +8,7 @@ PYTHON_ID3_VERSION = 1.2
 PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz
 PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION)
 PYTHON_ID3_SETUP_TYPE = distutils
-PYTHON_ID3_LICENSE = GPLv2+
+PYTHON_ID3_LICENSE = GPL-2.0+
 PYTHON_ID3_LICENSE_FILES = COPYING
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-idna/python-idna.hash b/bsp/buildroot/package/python-idna/python-idna.hash
index 4e4c6771..839154a0 100644
--- a/bsp/buildroot/package/python-idna/python-idna.hash
+++ b/bsp/buildroot/package/python-idna/python-idna.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f6473caa9c5e0cc1ad3fd5d04c3c114b, sha256 locally computed
-md5     f6473caa9c5e0cc1ad3fd5d04c3c114b  idna-2.1.tar.gz
-sha256  ed36f281aebf3cd0797f163bb165d84c31507cedd15928b095b1675e2d04c676  idna-2.1.tar.gz
+# md5 from https://pypi.python.org/pypi/idna/json, sha256 locally computed
+md5 fc1d992bef73e8824db411bb5d21f012 idna-2.5.tar.gz
+sha256 3cb5ce08046c4e3a560fc02f138d0ac63e00f8ce5901a56b32ec8b7994082aab idna-2.5.tar.gz
diff --git a/bsp/buildroot/package/python-idna/python-idna.mk b/bsp/buildroot/package/python-idna/python-idna.mk
index 3f9f1093..c8d1793e 100644
--- a/bsp/buildroot/package/python-idna/python-idna.mk
+++ b/bsp/buildroot/package/python-idna/python-idna.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_IDNA_VERSION = 2.1
+PYTHON_IDNA_VERSION = 2.5
 PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz
-PYTHON_IDNA_SITE = https://pypi.python.org/packages/source/i/idna
-PYTHON_IDNA_LICENSE =  BSD-3c
+PYTHON_IDNA_SITE = https://pypi.python.org/packages/d8/82/28a51052215014efc07feac7330ed758702fc0581347098a81699b5281cb
+PYTHON_IDNA_LICENSE =  BSD-3-Clause
 PYTHON_IDNA_LICENSE_FILES = LICENSE.rst
 PYTHON_IDNA_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-incremental/python-incremental.mk b/bsp/buildroot/package/python-incremental/python-incremental.mk
index 64eda68e..fc1975ff 100644
--- a/bsp/buildroot/package/python-incremental/python-incremental.mk
+++ b/bsp/buildroot/package/python-incremental/python-incremental.mk
@@ -12,3 +12,4 @@ PYTHON_INCREMENTAL_LICENSE = MIT
 PYTHON_INCREMENTAL_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-iniparse/python-iniparse.hash b/bsp/buildroot/package/python-iniparse/python-iniparse.hash
index d7d8e933..f1f80382 100644
--- a/bsp/buildroot/package/python-iniparse/python-iniparse.hash
+++ b/bsp/buildroot/package/python-iniparse/python-iniparse.hash
@@ -1,4 +1,3 @@
 # md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5e573e9e9733d97623881ce9bbe5eca6, sha256 locally computed
 md5 5e573e9e9733d97623881ce9bbe5eca6 iniparse-0.4.tar.gz
 sha256 abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054  iniparse-0.4.tar.gz
-
diff --git a/bsp/buildroot/package/python-iniparse/python-iniparse.mk b/bsp/buildroot/package/python-iniparse/python-iniparse.mk
index b00e0c4a..5c4e03c8 100644
--- a/bsp/buildroot/package/python-iniparse/python-iniparse.mk
+++ b/bsp/buildroot/package/python-iniparse/python-iniparse.mk
@@ -7,7 +7,7 @@
 PYTHON_INIPARSE_VERSION = 0.4
 PYTHON_INIPARSE_SOURCE = iniparse-$(PYTHON_INIPARSE_VERSION).tar.gz
 PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse
-PYTHON_INIPARSE_LICENSE = Python software foundation license v2, MIT
+PYTHON_INIPARSE_LICENSE = Python-2.0, MIT
 PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE
 PYTHON_INIPARSE_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-iowait/python-iowait.hash b/bsp/buildroot/package/python-iowait/python-iowait.hash
index 67dac15f..fcaf8cc5 100644
--- a/bsp/buildroot/package/python-iowait/python-iowait.hash
+++ b/bsp/buildroot/package/python-iowait/python-iowait.hash
@@ -1,4 +1,4 @@
-# md5 from https://pypi.python.org/pypi/iowait/json
+# md5 from https://pypi.python.org/pypi/iowait/json, sha256 locally computed
 md5	f49ca7766fe4a67e03a731e575614f87  iowait-0.2.tar.gz
-# sha256 calculated by scanpypi
 sha256	ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299  iowait-0.2.tar.gz
+sha256  da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768  COPYING.LESSER
diff --git a/bsp/buildroot/package/python-iowait/python-iowait.mk b/bsp/buildroot/package/python-iowait/python-iowait.mk
index 99c29228..e327053e 100644
--- a/bsp/buildroot/package/python-iowait/python-iowait.mk
+++ b/bsp/buildroot/package/python-iowait/python-iowait.mk
@@ -8,7 +8,7 @@ PYTHON_IOWAIT_VERSION = 0.2
 PYTHON_IOWAIT_SOURCE = iowait-$(PYTHON_IOWAIT_VERSION).tar.gz
 PYTHON_IOWAIT_SITE = https://pypi.python.org/packages/65/30/e953673fe9619938e9c74408401cf865f37716da89f61f6e5d9328c0f71e
 PYTHON_IOWAIT_SETUP_TYPE = distutils
-PYTHON_IOWAIT_LICENSE = LGPLv3+
+PYTHON_IOWAIT_LICENSE = LGPL-3.0+
 PYTHON_IOWAIT_LICENSE_FILES = COPYING.LESSER
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-ipaddr/Config.in b/bsp/buildroot/package/python-ipaddr/Config.in
index 746d720d..57279273 100644
--- a/bsp/buildroot/package/python-ipaddr/Config.in
+++ b/bsp/buildroot/package/python-ipaddr/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_PYTHON_IPADDR
-	depends on BR2_PACKAGE_PYTHON # included since python3.3
 	bool "python-ipaddr"
+	depends on BR2_PACKAGE_PYTHON # included since python3.3
 	help
 	  An IPv4/IPv6 manipulation library in Python. This library is
 	  used to create/poke/manipulate IPv4 and IPv6 addresses and
 	  prefixes.
 
-	  https://code.google.com/p/ipaddr-py/
+	  https://github.com/google/ipaddr-py
diff --git a/bsp/buildroot/package/python-ipaddr/python-ipaddr.mk b/bsp/buildroot/package/python-ipaddr/python-ipaddr.mk
index 8bfb5437..84c486dc 100644
--- a/bsp/buildroot/package/python-ipaddr/python-ipaddr.mk
+++ b/bsp/buildroot/package/python-ipaddr/python-ipaddr.mk
@@ -6,7 +6,7 @@
 
 PYTHON_IPADDR_VERSION = 2.1.11
 PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz
-PYTHON_IPADDR_SITE = http://pypi.python.org/packages/source/i/ipaddr
+PYTHON_IPADDR_SITE = https://pypi.python.org/packages/source/i/ipaddr
 PYTHON_IPADDR_SETUP_TYPE = distutils
 PYTHON_IPADDR_LICENSE = Apache-2.0
 PYTHON_IPADDR_LICENSE_FILES = COPYING
diff --git a/bsp/buildroot/package/python-ipaddress/python-ipaddress.hash b/bsp/buildroot/package/python-ipaddress/python-ipaddress.hash
index a7c3803f..c4fdf6d6 100644
--- a/bsp/buildroot/package/python-ipaddress/python-ipaddress.hash
+++ b/bsp/buildroot/package/python-ipaddress/python-ipaddress.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/ipaddress/json, sha256 locally computed
-md5	8bbf0326719fafb1f453921ef96729fe  ipaddress-1.0.17.tar.gz
-sha256	3a21c5a15f433710aaa26f1ae174b615973a25182006ae7f9c26de151cd51716  ipaddress-1.0.17.tar.gz
+md5 310c2dfd64eb6f0df44aa8c59f2334a7 ipaddress-1.0.18.tar.gz
+sha256 5d8534c8e185f2d8a1fda1ef73f2c8f4b23264e8e30063feeb9511d492a413e1 ipaddress-1.0.18.tar.gz
diff --git a/bsp/buildroot/package/python-ipaddress/python-ipaddress.mk b/bsp/buildroot/package/python-ipaddress/python-ipaddress.mk
index 5ff70d48..646db5d2 100644
--- a/bsp/buildroot/package/python-ipaddress/python-ipaddress.mk
+++ b/bsp/buildroot/package/python-ipaddress/python-ipaddress.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_IPADDRESS_VERSION = 1.0.17
+PYTHON_IPADDRESS_VERSION = 1.0.18
 PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz
-PYTHON_IPADDRESS_SITE = https://pypi.python.org/packages/bb/26/3b64955ff73f9e3155079b9ed31812afdfa5333b5c76387454d651ef593a
-PYTHON_IPADDRESS_LICENSE = Python software foundation license
+PYTHON_IPADDRESS_SITE = https://pypi.python.org/packages/4e/13/774faf38b445d0b3a844b65747175b2e0500164b7c28d78e34987a5bfe06
+PYTHON_IPADDRESS_LICENSE = Python-2.0
 PYTHON_IPADDRESS_LICENSE_FILES = LICENSE
 PYTHON_IPADDRESS_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-ipy/python-ipy.mk b/bsp/buildroot/package/python-ipy/python-ipy.mk
index ec0d0d7f..2b2bdf2d 100644
--- a/bsp/buildroot/package/python-ipy/python-ipy.mk
+++ b/bsp/buildroot/package/python-ipy/python-ipy.mk
@@ -7,7 +7,7 @@
 PYTHON_IPY_VERSION = 0.83
 PYTHON_IPY_SOURCE = IPy-$(PYTHON_IPY_VERSION).tar.gz
 PYTHON_IPY_SITE = https://pypi.python.org/packages/88/28/79162bfc351a3f1ab44d663ab3f03fb495806fdb592170990a1568ffbf63
-PYTHON_IPY_LICENSE = BSD-3c
+PYTHON_IPY_LICENSE = BSD-3-Clause
 PYTHON_IPY_LICENSE_FILES = COPYING
 PYTHON_IPY_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-ipython-genutils/Config.in b/bsp/buildroot/package/python-ipython-genutils/Config.in
new file mode 100644
index 00000000..d49442ee
--- /dev/null
+++ b/bsp/buildroot/package/python-ipython-genutils/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_IPYTHON_GENUTILS
+	bool "python-ipython-genutils"
+	help
+	  IPython vestigial utilities
+
+	  https://pypi.python.org/pypi/ipython_genutils
diff --git a/bsp/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash b/bsp/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash
new file mode 100644
index 00000000..6fa2bc54
--- /dev/null
+++ b/bsp/buildroot/package/python-ipython-genutils/python-ipython-genutils.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/ipython_genutils/json, sha256 locally computed
+md5 5a4f9781f78466da0ea1a648f3e1f79f ipython_genutils-0.2.0.tar.gz
+sha256 eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 ipython_genutils-0.2.0.tar.gz
diff --git a/bsp/buildroot/package/python-ipython-genutils/python-ipython-genutils.mk b/bsp/buildroot/package/python-ipython-genutils/python-ipython-genutils.mk
new file mode 100644
index 00000000..4e8cc287
--- /dev/null
+++ b/bsp/buildroot/package/python-ipython-genutils/python-ipython-genutils.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-ipython-genutils
+#
+################################################################################
+
+PYTHON_IPYTHON_GENUTILS_VERSION = 0.2.0
+PYTHON_IPYTHON_GENUTILS_SOURCE = ipython_genutils-$(PYTHON_IPYTHON_GENUTILS_VERSION).tar.gz
+PYTHON_IPYTHON_GENUTILS_SITE = https://pypi.python.org/packages/e8/69/fbeffffc05236398ebfcfb512b6d2511c622871dca1746361006da310399
+PYTHON_IPYTHON_GENUTILS_LICENSE = BSD-3-Clause
+PYTHON_IPYTHON_GENUTILS_LICENSE_FILES = COPYING.md
+PYTHON_IPYTHON_GENUTILS_SETUP_TYPE = distutils
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-ipython/Config.in b/bsp/buildroot/package/python-ipython/Config.in
index 1d92873f..d8164afb 100644
--- a/bsp/buildroot/package/python-ipython/Config.in
+++ b/bsp/buildroot/package/python-ipython/Config.in
@@ -1,9 +1,19 @@
 config BR2_PACKAGE_PYTHON_IPYTHON
 	bool "python-ipython"
+	select BR2_PACKAGE_PYTHON_BACKPORTS_SHUTIL_GET_TERMINAL_SIZE if BR2_PACKAGE_PYTHON  # runtime
+	select BR2_PACKAGE_PYTHON_DECORATOR # runtime
+	select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON  # runtime
+	select BR2_PACKAGE_PYTHON_PICKLESHARE # runtime
+	select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime
+	select BR2_PACKAGE_PYTHON_PYGMENTS  # runtime
+	select BR2_PACKAGE_PYTHON_PEXPECT # runtime
+	select BR2_PACKAGE_PYTHON_SIMPLEGENERIC  # runtime
+	select BR2_PACKAGE_PYTHON_TRAITLETS  # runtime
 	help
-	  IPython is a command shell for interactive computing in multiple
-	  programming languages, originally developed for the Python
-	  programming language, that offers enhanced introspection, rich
-	  media, additional shell syntax, tab completion, and rich history.
+	  IPython is a command shell for interactive computing in
+	  multiple programming languages, originally developed for the
+	  Python programming language, that offers enhanced
+	  introspection, rich media, additional shell syntax, tab
+	  completion, and rich history.
 
 	  http://ipython.org/
diff --git a/bsp/buildroot/package/python-ipython/python-ipython.hash b/bsp/buildroot/package/python-ipython/python-ipython.hash
index 250a0225..af1ed94b 100644
--- a/bsp/buildroot/package/python-ipython/python-ipython.hash
+++ b/bsp/buildroot/package/python-ipython/python-ipython.hash
@@ -1,2 +1,3 @@
-# locally computed
-sha256  ca86a6308c4b53ea8a040ba776066dc9a7af4ac738ad43ab2059a016c09b0c2d  ipython-2.1.0.tar.gz
+# md5 from https://pypi.python.org/pypi/ipython/json, sha256 locally computed
+md5 d8cc938f46801060239184a35ec9c5a6 ipython-5.4.0.tar.gz
+sha256 6907826c427c917bf0cdab71ee728288b1f1975c4b94b3ed608b67db3183c974 ipython-5.4.0.tar.gz
diff --git a/bsp/buildroot/package/python-ipython/python-ipython.mk b/bsp/buildroot/package/python-ipython/python-ipython.mk
index 236462a5..5d92546f 100644
--- a/bsp/buildroot/package/python-ipython/python-ipython.mk
+++ b/bsp/buildroot/package/python-ipython/python-ipython.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_IPYTHON_VERSION = 2.1.0
+PYTHON_IPYTHON_VERSION = 5.4.0
 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz
-PYTHON_IPYTHON_SITE = https://pypi.python.org/packages/source/i/ipython
-PYTHON_IPYTHON_LICENSE = BSD-3c
+PYTHON_IPYTHON_SITE = https://pypi.python.org/packages/36/cd/765f53135bbbbcd691858aba3af124453a230fe0c752f009f69012fce5d5
+PYTHON_IPYTHON_LICENSE = BSD-3-Clause
 PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst
 PYTHON_IPYTHON_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-iso8601/Config.in b/bsp/buildroot/package/python-iso8601/Config.in
new file mode 100644
index 00000000..9e4610cf
--- /dev/null
+++ b/bsp/buildroot/package/python-iso8601/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_ISO8601
+	bool "python-iso8601"
+	help
+	  Simple module to parse ISO 8601 dates.
+
+	  https://bitbucket.org/micktwomey/pyiso8601
diff --git a/bsp/buildroot/package/python-iso8601/python-iso8601.hash b/bsp/buildroot/package/python-iso8601/python-iso8601.hash
new file mode 100644
index 00000000..57604cc9
--- /dev/null
+++ b/bsp/buildroot/package/python-iso8601/python-iso8601.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/iso8601/json, sha256 locally computed
+md5	4de940f691c5ea759fb254384c8ddcf6  iso8601-0.1.12.tar.gz
+sha256	49c4b20e1f38aa5cf109ddcd39647ac419f928512c869dc01d5c7098eddede82  iso8601-0.1.12.tar.gz
+sha256  116d368d14a8cf0061027c944c60ee20b476ce42814818a7d627396906761f16  LICENSE
diff --git a/bsp/buildroot/package/python-iso8601/python-iso8601.mk b/bsp/buildroot/package/python-iso8601/python-iso8601.mk
new file mode 100644
index 00000000..7fc171d6
--- /dev/null
+++ b/bsp/buildroot/package/python-iso8601/python-iso8601.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-iso8601
+#
+################################################################################
+
+PYTHON_ISO8601_VERSION = 0.1.12
+PYTHON_ISO8601_SOURCE = iso8601-$(PYTHON_ISO8601_VERSION).tar.gz
+PYTHON_ISO8601_SITE = https://pypi.python.org/packages/45/13/3db24895497345fb44c4248c08b16da34a9eb02643cea2754b21b5ed08b0
+PYTHON_ISO8601_SETUP_TYPE = setuptools
+PYTHON_ISO8601_LICENSE = MIT
+PYTHON_ISO8601_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-itsdangerous/python-itsdangerous.mk b/bsp/buildroot/package/python-itsdangerous/python-itsdangerous.mk
index 8b055d6d..45adbb06 100644
--- a/bsp/buildroot/package/python-itsdangerous/python-itsdangerous.mk
+++ b/bsp/buildroot/package/python-itsdangerous/python-itsdangerous.mk
@@ -7,7 +7,7 @@
 PYTHON_ITSDANGEROUS_VERSION = 0.24
 PYTHON_ITSDANGEROUS_SITE = $(call github,mitsuhiko,itsdangerous,$(PYTHON_ITSDANGEROUS_VERSION))
 PYTHON_ITSDANGEROUS_SETUP_TYPE = setuptools
-PYTHON_ITSDANGEROUS_LICENSE = BSD-3c
+PYTHON_ITSDANGEROUS_LICENSE = BSD-3-Clause
 PYTHON_ITSDANGEROUS_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-jaraco-classes/Config.in b/bsp/buildroot/package/python-jaraco-classes/Config.in
new file mode 100644
index 00000000..05c11237
--- /dev/null
+++ b/bsp/buildroot/package/python-jaraco-classes/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_JARACO_CLASSES
+	bool "python-jaraco-classes"
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  Utility functions for Python class constructs.
+
+	  https://github.com/jaraco/jaraco.classes
diff --git a/bsp/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash b/bsp/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash
new file mode 100644
index 00000000..bc30c5f7
--- /dev/null
+++ b/bsp/buildroot/package/python-jaraco-classes/python-jaraco-classes.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/jaraco.classes/json, sha256 locally computed
+md5     c0cb1a0ce529e3cdbca9d99742071a04  jaraco.classes-1.4.3.tar.gz
+sha256  e347f2b502521bfc35c57ab4695e8b6d7371625c392a0ca0d46742ee93359d3e  jaraco.classes-1.4.3.tar.gz
+sha256  a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd  LICENSE
diff --git a/bsp/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk b/bsp/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk
new file mode 100644
index 00000000..c361e97a
--- /dev/null
+++ b/bsp/buildroot/package/python-jaraco-classes/python-jaraco-classes.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-jaraco-classes
+#
+################################################################################
+
+PYTHON_JARACO_CLASSES_VERSION = 1.4.3
+PYTHON_JARACO_CLASSES_SOURCE = jaraco.classes-$(PYTHON_JARACO_CLASSES_VERSION).tar.gz
+PYTHON_JARACO_CLASSES_SITE = https://pypi.python.org/packages/b3/ce/031a6004619c2a3744b977b4a8414d7e8087afe6247110efcac797fee7f1
+PYTHON_JARACO_CLASSES_LICENSE = MIT
+PYTHON_JARACO_CLASSES_LICENSE_FILES = LICENSE
+PYTHON_JARACO_CLASSES_SETUP_TYPE = setuptools
+PYTHON_JARACO_CLASSES_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-jinja2/python-jinja2.hash b/bsp/buildroot/package/python-jinja2/python-jinja2.hash
index 46ea75fa..f5a09729 100644
--- a/bsp/buildroot/package/python-jinja2/python-jinja2.hash
+++ b/bsp/buildroot/package/python-jinja2/python-jinja2.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/jinja2/json, sha256 locally computed
-md5	b151bfab6fb728fb7a06da4299161c74  Jinja2-2.9.4.tar.gz
-sha256	aab8d8ca9f45624f1e77f2844bf3c144d180e97da8824c2a6d7552ad039b5442  Jinja2-2.9.4.tar.gz
+md5 9e55f0db6620dd99a1b366183a94270d Jinja2-2.9.5.tar.gz
+sha256 702a24d992f856fa8d5a7a36db6128198d0c21e1da34448ca236c42e92384825 Jinja2-2.9.5.tar.gz
diff --git a/bsp/buildroot/package/python-jinja2/python-jinja2.mk b/bsp/buildroot/package/python-jinja2/python-jinja2.mk
index 16b7b204..c7dd4902 100644
--- a/bsp/buildroot/package/python-jinja2/python-jinja2.mk
+++ b/bsp/buildroot/package/python-jinja2/python-jinja2.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_JINJA2_VERSION = 2.9.4
+PYTHON_JINJA2_VERSION = 2.9.5
 PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz
-PYTHON_JINJA2_SITE = https://pypi.python.org/packages/f4/3f/28387a5bbc6883082c16784c6135440b94f9d5938fb156ff579798e18eda
+PYTHON_JINJA2_SITE = https://pypi.python.org/packages/71/59/d7423bd5e7ddaf3a1ce299ab4490e9044e8dfd195420fc83a24de9e60726
 PYTHON_JINJA2_SETUP_TYPE = setuptools
-PYTHON_JINJA2_LICENSE = BSD-3c
+PYTHON_JINJA2_LICENSE = BSD-3-Clause
 PYTHON_JINJA2_LICENSE_FILES = LICENSE
 # In host build, setup.py tries to download markupsafe if it is not installed
 HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
@@ -17,11 +17,13 @@ HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe
 # not available in Python 2 and some features available in Python 3.6.
 # So in both cases *.py compilation would produce compiler errors.
 # Hence remove both files after package extraction.
+ifeq ($(BR2_PACKAGE_PYTHON),y)
 define PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT
 	rm $(@D)/jinja2/asyncsupport.py $(@D)/jinja2/asyncfilters.py
 endef
 
 PYTHON_JINJA2_POST_EXTRACT_HOOKS = PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT
+endif
 
 $(eval $(python-package))
 $(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-json-schema-validator/Config.in b/bsp/buildroot/package/python-json-schema-validator/Config.in
index 6ae1eb16..e50e8eef 100644
--- a/bsp/buildroot/package/python-json-schema-validator/Config.in
+++ b/bsp/buildroot/package/python-json-schema-validator/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR
 	bool "python-json-schema-validator"
-	depends on BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON_VERSIONTOOLS
 	help
 	  JSON Schema Validator
 
diff --git a/bsp/buildroot/package/python-json-schema-validator/python-json-schema-validator.mk b/bsp/buildroot/package/python-json-schema-validator/python-json-schema-validator.mk
index 1456c349..c0a335cb 100644
--- a/bsp/buildroot/package/python-json-schema-validator/python-json-schema-validator.mk
+++ b/bsp/buildroot/package/python-json-schema-validator/python-json-schema-validator.mk
@@ -7,8 +7,8 @@
 PYTHON_JSON_SCHEMA_VALIDATOR_VERSION = 2.4.1
 PYTHON_JSON_SCHEMA_VALIDATOR_SOURCE = json-schema-validator-$(PYTHON_JSON_SCHEMA_VALIDATOR_VERSION).tar.gz
 PYTHON_JSON_SCHEMA_VALIDATOR_SITE = https://pypi.python.org/packages/70/46/ba39cb7efad1898cfc89bf3588b8612f24d128f1c25b761994f524a59cef
-PYTHON_JSON_SCHEMA_VALIDATOR_LICENSE = LGPLv3
+PYTHON_JSON_SCHEMA_VALIDATOR_LICENSE = LGPL-3.0
 PYTHON_JSON_SCHEMA_VALIDATOR_SETUP_TYPE = setuptools
-PYTHON_JSON_SCHEMA_VALIDATOR_DEPENDENCIES = python-versiontools
+PYTHON_JSON_SCHEMA_VALIDATOR_DEPENDENCIES = host-python-versiontools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-jsonschema/Config.in b/bsp/buildroot/package/python-jsonschema/Config.in
index 70026537..b547f4ae 100644
--- a/bsp/buildroot/package/python-jsonschema/Config.in
+++ b/bsp/buildroot/package/python-jsonschema/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_JSONSCHEMA
 	bool "python-jsonschema"
+	select BR2_PACKAGE_PYTHON_FUNCTOOLS32 if BR2_PACKAGE_PYTHON # runtime
 	help
 	  An implementation of JSON Schema validation for Python.
 
diff --git a/bsp/buildroot/package/python-keyring/Config.in b/bsp/buildroot/package/python-keyring/Config.in
index a6eacf52..23d86a48 100644
--- a/bsp/buildroot/package/python-keyring/Config.in
+++ b/bsp/buildroot/package/python-keyring/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_PYTHON_KEYRING
 	bool "python-keyring"
-	depends on BR2_PACKAGE_PYTHON
+	depends on BR2_INSTALL_LIBSTDCPP # python-secretstorage
+	select BR2_PACKAGE_PYTHON_SECRETSTORAGE # runtime
 	help
 	  The Python keyring lib provides a easy way to access the
 	  system keyring service from Python.
 
 	  https://pypi.python.org/pypi/keyring
+
+comment "python-keyring needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/python-keyring/python-keyring.hash b/bsp/buildroot/package/python-keyring/python-keyring.hash
index cd1683a7..a5741903 100644
--- a/bsp/buildroot/package/python-keyring/python-keyring.hash
+++ b/bsp/buildroot/package/python-keyring/python-keyring.hash
@@ -1,2 +1,4 @@
-# locally computed
-sha256  c3f0665ee2d969170dcd6b9e83e76cc7fca2be5a40943700ce2624a0a02f9658  keyring-3.0.5.zip
+# md5 from https://pypi.python.org/pypi/keyring/json, sha256 locally computed
+md5	9c53e4f2427ebaa59d304a826311fbcf  keyring-10.5.0.tar.gz
+sha256	0e6129e8c5bc80da34cc1942d30daad79ed40419fcaaa538278c3b2ff235b313  keyring-10.5.0.tar.gz
+sha256  a55e2ffe9b44998e621d51d8c094bed09acc4b5236ee73d7df395a33ba3c18fd  LICENSE
diff --git a/bsp/buildroot/package/python-keyring/python-keyring.mk b/bsp/buildroot/package/python-keyring/python-keyring.mk
index ef8b8af2..27db2802 100644
--- a/bsp/buildroot/package/python-keyring/python-keyring.mk
+++ b/bsp/buildroot/package/python-keyring/python-keyring.mk
@@ -4,16 +4,12 @@
 #
 ################################################################################
 
-PYTHON_KEYRING_VERSION = 3.0.5
-PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).zip
-PYTHON_KEYRING_SITE = http://pypi.python.org/packages/source/k/keyring
+PYTHON_KEYRING_VERSION = 10.5.0
+PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).tar.gz
+PYTHON_KEYRING_SITE = https://pypi.python.org/packages/42/2e/51bd1739fe335095a2174db3f2f230346762e7e572471059540146a521f6
 PYTHON_KEYRING_SETUP_TYPE = setuptools
-PYTHON_KEYRING_LICENSE = python software foundation license
-
-define PYTHON_KEYRING_EXTRACT_CMDS
-	$(UNZIP) -d $(@D) $(DL_DIR)/$(PYTHON_KEYRING_SOURCE)
-	mv $(@D)/keyring-$(PYTHON_KEYRING_VERSION)/* $(@D)
-	$(RM) -r $(@D)/keyring-$(PYTHON_KEYRING_VERSION)
-endef
+PYTHON_KEYRING_LICENSE = MIT
+PYTHON_KEYRING_LICENSE_FILES = LICENSE
+PYTHON_KEYRING_DEPENDENCIES = host-python-setuptools-scm
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-libconfig/Config.in b/bsp/buildroot/package/python-libconfig/Config.in
index a222f9a1..00688719 100644
--- a/bsp/buildroot/package/python-libconfig/Config.in
+++ b/bsp/buildroot/package/python-libconfig/Config.in
@@ -4,13 +4,13 @@ comment "python-libconfig needs a glibc or uClibc toolchain w/ C++, threads"
 
 config BR2_PACKAGE_PYTHON_LIBCONFIG
 	bool "python-libconfig"
-	select BR2_PACKAGE_BOOST
-	select BR2_PACKAGE_BOOST_PYTHON
-	select BR2_PACKAGE_LIBCONFIG
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# error: invalid use of incomplete type 'struct _IO_FILE'
 	depends on !BR2_TOOLCHAIN_USES_MUSL
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_PYTHON
+	select BR2_PACKAGE_LIBCONFIG
 	help
 	  Python bindings to the C++ library libconfig
 
diff --git a/bsp/buildroot/package/python-logbook/python-logbook.mk b/bsp/buildroot/package/python-logbook/python-logbook.mk
index 29123797..5fcf301b 100644
--- a/bsp/buildroot/package/python-logbook/python-logbook.mk
+++ b/bsp/buildroot/package/python-logbook/python-logbook.mk
@@ -8,6 +8,6 @@ PYTHON_LOGBOOK_VERSION = 1.0.0
 PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz
 PYTHON_LOGBOOK_SITE = https://pypi.python.org/packages/34/e8/6419c217bbf464fe8a902418120cccaf476201bd03b50958db24d6e90f65
 PYTHON_LOGBOOK_SETUP_TYPE = setuptools
-PYTHON_LOGBOOK_LICENSE = BSD-3c
+PYTHON_LOGBOOK_LICENSE = BSD-3-Clause
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-lxml/Config.in.host b/bsp/buildroot/package/python-lxml/Config.in.host
new file mode 100644
index 00000000..7bf1e485
--- /dev/null
+++ b/bsp/buildroot/package/python-lxml/Config.in.host
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_HOST_PYTHON_LXML
+	bool "host python-lxml"
+	help
+	  The lxml XML toolkit is a Pythonic binding for the C libraries
+	  libxml2 and libxslt.
+
+	  http://lxml.de/
diff --git a/bsp/buildroot/package/python-lxml/python-lxml.hash b/bsp/buildroot/package/python-lxml/python-lxml.hash
index a1dc0939..38607e1b 100644
--- a/bsp/buildroot/package/python-lxml/python-lxml.hash
+++ b/bsp/buildroot/package/python-lxml/python-lxml.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  59d9176360dbc3919e9d4bfca85c1ca64ab4f4ee00e6f119d7150ba887e3410a  lxml-3.7.2.tgz
+sha256  f7bc9f702500e205b1560d620f14015fec76dcd6f9e889a946a2ddcc3c344fd0  lxml-4.0.0.tgz
diff --git a/bsp/buildroot/package/python-lxml/python-lxml.mk b/bsp/buildroot/package/python-lxml/python-lxml.mk
index 62c2980b..7f1692d1 100644
--- a/bsp/buildroot/package/python-lxml/python-lxml.mk
+++ b/bsp/buildroot/package/python-lxml/python-lxml.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PYTHON_LXML_VERSION = 3.7.2
+PYTHON_LXML_VERSION = 4.0.0
 PYTHON_LXML_SITE = http://lxml.de/files
 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz
 
 # Not including the GPL, because it is used only for the test scripts.
-PYTHON_LXML_LICENSE = BSD-3c, Others
+PYTHON_LXML_LICENSE = BSD-3-Clause, Others
 PYTHON_LXML_LICENSE_FILES = \
 	LICENSES.txt \
 	doc/licenses/BSD.txt \
@@ -21,11 +21,16 @@ PYTHON_LXML_LICENSE_FILES = \
 PYTHON_LXML_SETUP_TYPE = setuptools
 
 PYTHON_LXML_DEPENDENCIES = libxml2 libxslt zlib
+HOST_PYTHON_LXML_DEPENDENCIES = host-libxml2 host-libxslt host-zlib
 
 # python-lxml needs these scripts in order to properly detect libxml2 and
 # libxslt compiler and linker flags
 PYTHON_LXML_BUILD_OPTS = \
 	--with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \
 	--with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config
+HOST_PYTHON_LXML_BUILD_OPTS = \
+	--with-xslt-config=$(HOST_DIR)/bin/xslt-config \
+	--with-xml2-config=$(HOST_DIR)/bin/xml2-config
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-m2r/Config.in b/bsp/buildroot/package/python-m2r/Config.in
new file mode 100644
index 00000000..44dafaa4
--- /dev/null
+++ b/bsp/buildroot/package/python-m2r/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_M2R
+	bool "python-m2r"
+	select BR2_PACKAGE_PYTHON_MISTUNE # runtime
+	select BR2_PACKAGE_PYTHON_DOCUTILS # runtime
+	help
+	  Markdown to reStructuredText converter.
+
+	  https://github.com/miyakogi/m2r
diff --git a/bsp/buildroot/package/python-m2r/python-m2r.hash b/bsp/buildroot/package/python-m2r/python-m2r.hash
new file mode 100644
index 00000000..50de2b4f
--- /dev/null
+++ b/bsp/buildroot/package/python-m2r/python-m2r.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/m2r/json, sha256 locally computed
+md5	906eb6dabb0295c93881f32d0a1c0919  m2r-0.1.12.tar.gz
+sha256	adfb86ebb7ff3fcd3ebb27ce8cd6f795c409a13f0c03363e265f17419ce5b9ab  m2r-0.1.12.tar.gz
+sha256  28728ec0ecbd8c171ebaeccebf69e3961282fd81f06abc7424c65546b6ae6f27  LICENSE
diff --git a/bsp/buildroot/package/python-m2r/python-m2r.mk b/bsp/buildroot/package/python-m2r/python-m2r.mk
new file mode 100644
index 00000000..7c8ed288
--- /dev/null
+++ b/bsp/buildroot/package/python-m2r/python-m2r.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# python-m2r
+#
+################################################################################
+
+PYTHON_M2R_VERSION = 0.1.12
+PYTHON_M2R_SOURCE = m2r-$(PYTHON_M2R_VERSION).tar.gz
+PYTHON_M2R_SITE = https://pypi.python.org/packages/a0/95/7273d54664e74c3100d07206fe6b30247be046b39676972fc90ae04376a1
+PYTHON_M2R_SETUP_TYPE = setuptools
+PYTHON_M2R_LICENSE = MIT
+PYTHON_M2R_LICENSE_FILES = LICENSE
+HOST_PYTHON_M2R_DEPENDENCIES = host-python-docutils host-python-mistune
+
+$(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-mad/python-mad.mk b/bsp/buildroot/package/python-mad/python-mad.mk
index 5a49887a..a2221487 100644
--- a/bsp/buildroot/package/python-mad/python-mad.mk
+++ b/bsp/buildroot/package/python-mad/python-mad.mk
@@ -8,7 +8,7 @@ PYTHON_MAD_VERSION = 0.6
 PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz
 PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download
 PYTHON_MAD_SETUP_TYPE = distutils
-PYTHON_MAD_LICENSE = GPLv2+
+PYTHON_MAD_LICENSE = GPL-2.0+
 PYTHON_MAD_LICENSE_FILES = COPYING
 
 PYTHON_MAD_DEPENDENCIES = libmad
diff --git a/bsp/buildroot/package/python-mako/python-mako.hash b/bsp/buildroot/package/python-mako/python-mako.hash
index b6a74f3d..6a64ec31 100644
--- a/bsp/buildroot/package/python-mako/python-mako.hash
+++ b/bsp/buildroot/package/python-mako/python-mako.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/Mako/json, sha256 locally computed
-md5	c5fc31a323dd4990683d2f2da02d4e20	Mako-1.0.4.tar.gz
-sha256	fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059	Mako-1.0.4.tar.gz
+# md5 from https://pypi.python.org/pypi/mako/json, sha256 locally computed
+md5 a28e22a339080316b2acc352b9ee631c Mako-1.0.6.tar.gz
+sha256 48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d Mako-1.0.6.tar.gz
diff --git a/bsp/buildroot/package/python-mako/python-mako.mk b/bsp/buildroot/package/python-mako/python-mako.mk
index 88ce13ef..0d06dc49 100644
--- a/bsp/buildroot/package/python-mako/python-mako.mk
+++ b/bsp/buildroot/package/python-mako/python-mako.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_MAKO_VERSION = 1.0.4
+PYTHON_MAKO_VERSION = 1.0.6
 PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz
-PYTHON_MAKO_SITE = https://pypi.python.org/packages/7a/ae/925434246ee90b42e8ef57d3b30a0ab7caf9a2de3e449b876c56dcb48155
+PYTHON_MAKO_SITE = https://pypi.python.org/packages/56/4b/cb75836863a6382199aefb3d3809937e21fa4cb0db15a4f4ba0ecc2e7e8e
 PYTHON_MAKO_SETUP_TYPE = setuptools
 PYTHON_MAKO_LICENSE = MIT
 PYTHON_MAKO_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-markdown/python-markdown.hash b/bsp/buildroot/package/python-markdown/python-markdown.hash
index d30faaed..f2131eda 100644
--- a/bsp/buildroot/package/python-markdown/python-markdown.hash
+++ b/bsp/buildroot/package/python-markdown/python-markdown.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/markdown/json, sha256 locally computed
-md5	a06f1c5d462b32e0e8da014e9eebb0d9  Markdown-2.6.7.tar.gz
-sha256	daebf24846efa7ff269cfde8c41a48bb2303920c7b2c7c5e04fa82e6282d05c0  Markdown-2.6.7.tar.gz
+md5 d9ef057a5bd185f6f536400a31fc5d45 Markdown-2.6.8.tar.gz
+sha256 0ac8a81e658167da95d063a9279c9c1b2699f37c7c4153256a458b3a43860e33 Markdown-2.6.8.tar.gz
diff --git a/bsp/buildroot/package/python-markdown/python-markdown.mk b/bsp/buildroot/package/python-markdown/python-markdown.mk
index fb87ada7..d5273f97 100644
--- a/bsp/buildroot/package/python-markdown/python-markdown.mk
+++ b/bsp/buildroot/package/python-markdown/python-markdown.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_MARKDOWN_VERSION = 2.6.7
+PYTHON_MARKDOWN_VERSION = 2.6.8
 PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz
-PYTHON_MARKDOWN_SITE = https://pypi.python.org/packages/d4/32/642bd580c577af37b00a1eb59b0eaa996f2d11dfe394f3dd0c7a8a2de81a
-PYTHON_MARKDOWN_LICENSE = BSD-3c
+PYTHON_MARKDOWN_SITE = https://pypi.python.org/packages/1d/25/3f6d2cb31ec42ca5bd3bfbea99b63892b735d76e26f20dd2dcc34ffe4f0d
+PYTHON_MARKDOWN_LICENSE = BSD-3-Clause
 PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md
 PYTHON_MARKDOWN_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-markupsafe/python-markupsafe.hash b/bsp/buildroot/package/python-markupsafe/python-markupsafe.hash
index 448252b0..4226a1dd 100644
--- a/bsp/buildroot/package/python-markupsafe/python-markupsafe.hash
+++ b/bsp/buildroot/package/python-markupsafe/python-markupsafe.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f5ab3deee4c37cd6a922fb81e730da6e, sha256 locally computed
-md5	f5ab3deee4c37cd6a922fb81e730da6e  MarkupSafe-0.23.tar.gz
-sha256	a4ec1aff59b95a14b45eb2e23761a0179e98319da5a7eb76b56ea8cdc7b871c3  MarkupSafe-0.23.tar.gz
+# md5 from https://pypi.python.org/pypi/markupsafe/json, sha256 locally computed
+md5	2fcedc9284d50e577b5192e8e3578355  MarkupSafe-1.0.tar.gz
+sha256	a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665  MarkupSafe-1.0.tar.gz
diff --git a/bsp/buildroot/package/python-markupsafe/python-markupsafe.mk b/bsp/buildroot/package/python-markupsafe/python-markupsafe.mk
index c815728c..625a9b5b 100644
--- a/bsp/buildroot/package/python-markupsafe/python-markupsafe.mk
+++ b/bsp/buildroot/package/python-markupsafe/python-markupsafe.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_MARKUPSAFE_VERSION = 0.23
+PYTHON_MARKUPSAFE_VERSION = 1.0
 PYTHON_MARKUPSAFE_SOURCE = MarkupSafe-$(PYTHON_MARKUPSAFE_VERSION).tar.gz
-PYTHON_MARKUPSAFE_SITE = http://pypi.python.org/packages/source/M/MarkupSafe
+PYTHON_MARKUPSAFE_SITE = https://pypi.python.org/packages/4d/de/32d741db316d8fdb7680822dd37001ef7a448255de9699ab4bfcbdf4172b
 PYTHON_MARKUPSAFE_SETUP_TYPE = setuptools
-PYTHON_MARKUPSAFE_LICENSE = BSD-3c
+PYTHON_MARKUPSAFE_LICENSE = BSD-3-Clause
 PYTHON_MARKUPSAFE_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash b/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash
index 1389ac3a..389bc49c 100644
--- a/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash
+++ b/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/mbstrdecoder/json, sha256 locally computed
-md5	5548c4748cf0bc16befcf7ef848f95ff  mbstrdecoder-0.1.0.tar.gz
-sha256	7c65c4ea6681729ddfdb7612ac39f5accb10abb4e838ca810d810931ec023aad  mbstrdecoder-0.1.0.tar.gz
+md5 f528c26e537fe5c6987d5c5ccf6ab6e0 mbstrdecoder-0.2.2.tar.gz
+sha256 fe6412d8f796fc86c90a5d394a2c93adc05a3e4225986494665a43c65dcc9312 mbstrdecoder-0.2.2.tar.gz
diff --git a/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk b/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk
index f64bde95..8eb36e79 100644
--- a/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk
+++ b/bsp/buildroot/package/python-mbstrdecoder/python-mbstrdecoder.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_MBSTRDECODER_VERSION = 0.1.0
+PYTHON_MBSTRDECODER_VERSION = 0.2.2
 PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz
-PYTHON_MBSTRDECODER_SITE = https://pypi.python.org/packages/e4/10/fa3d8716b28e2b37eba1edab1c6831a56b805032328279c14fc99d37c391
+PYTHON_MBSTRDECODER_SITE = https://pypi.python.org/packages/40/17/ea4f3a4c844e3e5a112408879c02a1c0517ab07f97a070afe992d98d1a1a
 PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools
 PYTHON_MBSTRDECODER_LICENSE = MIT
 PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-meld3/python-meld3.mk b/bsp/buildroot/package/python-meld3/python-meld3.mk
index 529425c8..675478ef 100644
--- a/bsp/buildroot/package/python-meld3/python-meld3.mk
+++ b/bsp/buildroot/package/python-meld3/python-meld3.mk
@@ -7,7 +7,7 @@
 PYTHON_MELD3_VERSION = 1.0.2
 PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz
 PYTHON_MELD3_SITE = https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f
-PYTHON_MELD3_LICENSE = ZPLv2.1
+PYTHON_MELD3_LICENSE = ZPL-2.1
 PYTHON_MELD3_LICENSE_FILES = COPYRIGHT.txt LICENSE.txt
 PYTHON_MELD3_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-mistune/python-mistune.hash b/bsp/buildroot/package/python-mistune/python-mistune.hash
index cfc6a25e..e939aefc 100644
--- a/bsp/buildroot/package/python-mistune/python-mistune.hash
+++ b/bsp/buildroot/package/python-mistune/python-mistune.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/mistune/json, sha256 locally computed
-md5	4eba50bd121b83716fa4be6a4049004b  mistune-0.7.3.tar.gz
-sha256	21d0e869df3b9189f248e022f1c9763cf9069e1a2f00676f1f1852bd7f98b713  mistune-0.7.3.tar.gz
+md5	8bd955fe74ce37af54b16c0d9b89a2ef  mistune-0.8.tar.gz
+sha256	dc3f43e7cf0abb95cdfecbf82d85c419108d5f13e1844b2a8a2fc0abf24c7a47  mistune-0.8.tar.gz
+sha256  0c5259c3dd0a7c46f4835221645f62a0638c9b9faa02af08676e8069e1ff964b  LICENSE
diff --git a/bsp/buildroot/package/python-mistune/python-mistune.mk b/bsp/buildroot/package/python-mistune/python-mistune.mk
index 91e97e86..405216cc 100644
--- a/bsp/buildroot/package/python-mistune/python-mistune.mk
+++ b/bsp/buildroot/package/python-mistune/python-mistune.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-PYTHON_MISTUNE_VERSION = 0.7.3
+PYTHON_MISTUNE_VERSION = 0.8
 PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz
-PYTHON_MISTUNE_SITE = https://pypi.python.org/packages/88/1e/be99791262b3a794332fda598a07c2749a433b9378586361ba9d8e824607
-PYTHON_MISTUNE_LICENSE = BSD-3c
+PYTHON_MISTUNE_SITE = https://pypi.python.org/packages/d3/66/a45d1c7c50fd63a707cd1bd340b969523137c5284d9466c41012fe54c621
+PYTHON_MISTUNE_LICENSE = BSD-3-Clause
 PYTHON_MISTUNE_LICENSE_FILES = LICENSE
 PYTHON_MISTUNE_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-more-itertools/Config.in b/bsp/buildroot/package/python-more-itertools/Config.in
new file mode 100644
index 00000000..dc5fb7ce
--- /dev/null
+++ b/bsp/buildroot/package/python-more-itertools/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_MORE_ITERTOOLS
+	bool "python-more-itertools"
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  More routines for operating on iterables, beyond itertools.
+
+	  https://github.com/erikrose/more-itertools
diff --git a/bsp/buildroot/package/python-more-itertools/python-more-itertools.hash b/bsp/buildroot/package/python-more-itertools/python-more-itertools.hash
new file mode 100644
index 00000000..36748cb3
--- /dev/null
+++ b/bsp/buildroot/package/python-more-itertools/python-more-itertools.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/more-itertools/json, sha256 locally computed
+md5	fef89b28d050e325fbb7eb209e75ab45  more-itertools-4.0.1.tar.gz
+sha256	5d21dcefa19782f9ec9aa64e0bfd903f5024512b1e1f17519800b193b2e64d31  more-itertools-4.0.1.tar.gz
+sha256  09f1c8c9e941af3e584d59641ea9b87d83c0cb0fd007eb5ef391a7e2643c1a46  LICENSE
diff --git a/bsp/buildroot/package/python-more-itertools/python-more-itertools.mk b/bsp/buildroot/package/python-more-itertools/python-more-itertools.mk
new file mode 100644
index 00000000..971a3386
--- /dev/null
+++ b/bsp/buildroot/package/python-more-itertools/python-more-itertools.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-more-itertools
+#
+################################################################################
+
+PYTHON_MORE_ITERTOOLS_VERSION = 4.0.1
+PYTHON_MORE_ITERTOOLS_SOURCE = more-itertools-$(PYTHON_MORE_ITERTOOLS_VERSION).tar.gz
+PYTHON_MORE_ITERTOOLS_SITE = https://pypi.python.org/packages/a2/28/d02c111c230a769a32fd97e9f6d42bfb0136da381f356b945db38367b3d3
+PYTHON_MORE_ITERTOOLS_SETUP_TYPE = setuptools
+PYTHON_MORE_ITERTOOLS_LICENSE = MIT
+PYTHON_MORE_ITERTOOLS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-msgpack/Config.in b/bsp/buildroot/package/python-msgpack/Config.in
index 7dfe8e81..2050d4f0 100644
--- a/bsp/buildroot/package/python-msgpack/Config.in
+++ b/bsp/buildroot/package/python-msgpack/Config.in
@@ -1,16 +1,9 @@
 config BR2_PACKAGE_PYTHON_MSGPACK
 	bool "python-msgpack"
-	select BR2_PACKAGE_MSGPACK
-	depends on BR2_INSTALL_LIBSTDCPP # msgpack
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # msgpack
 	help
 	  MessagePack (http://msgpack.org/) is a fast, compact binary
 	  serialization format, suitable for similar data to JSON.
-	  This package provides CPython bindings for reading and
-	  writing MessagePack data.
+	  This package provides a pure python library for reading
+	  and writing MessagePack data.
 
 	  https://pypi.python.org/pypi/msgpack-python/
-
-comment "python-msgpack needs a toolchain w/ C++"
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/python-msgpack/python-msgpack.hash b/bsp/buildroot/package/python-msgpack/python-msgpack.hash
index 636aa905..48313ff5 100644
--- a/bsp/buildroot/package/python-msgpack/python-msgpack.hash
+++ b/bsp/buildroot/package/python-msgpack/python-msgpack.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=eb2aad1081534ef3a9f32a0ecd350b9b, sha356 locally computed.
-md5	eb2aad1081534ef3a9f32a0ecd350b9b  msgpack-python-0.4.7.tar.gz
-sha256	5e001229a54180a02dcdd59db23c9978351af55b1290c27bc549e381f43acd6b  msgpack-python-0.4.7.tar.gz
+# md5 from https://pypi.python.org/pypi/msgpack-python/json, sha256 locally computed.
+md5	dcd854fb41ee7584ebbf35e049e6be98  msgpack-python-0.4.8.tar.gz
+sha256	1a2b19df0f03519ec7f19f826afb935b202d8979b0856c6fb3dc28955799f886  msgpack-python-0.4.8.tar.gz
diff --git a/bsp/buildroot/package/python-msgpack/python-msgpack.mk b/bsp/buildroot/package/python-msgpack/python-msgpack.mk
index 344b7bf1..5be2b14b 100644
--- a/bsp/buildroot/package/python-msgpack/python-msgpack.mk
+++ b/bsp/buildroot/package/python-msgpack/python-msgpack.mk
@@ -4,12 +4,11 @@
 #
 ################################################################################
 
-PYTHON_MSGPACK_VERSION = 0.4.7
+PYTHON_MSGPACK_VERSION = 0.4.8
 PYTHON_MSGPACK_SOURCE = msgpack-python-$(PYTHON_MSGPACK_VERSION).tar.gz
-PYTHON_MSGPACK_SITE = https://pypi.python.org/packages/source/m/msgpack-python
+PYTHON_MSGPACK_SITE = https://pypi.python.org/packages/21/27/8a1d82041c7a2a51fcc73675875a5f9ea06c2663e02fcfeb708be1d081a0
 PYTHON_MSGPACK_LICENSE = Apache-2.0
 PYTHON_MSGPACK_LICENSE_FILES = COPYING
 PYTHON_MSGPACK_SETUP_TYPE = setuptools
-PYTHON_MSGPACK_DEPENDENCIES = msgpack
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-mutagen/python-mutagen.hash b/bsp/buildroot/package/python-mutagen/python-mutagen.hash
index 8970a23f..33710067 100644
--- a/bsp/buildroot/package/python-mutagen/python-mutagen.hash
+++ b/bsp/buildroot/package/python-mutagen/python-mutagen.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/mutagen, sha256 locally computed
-md5	2bd50519d64411626fa22d405afbf078  mutagen-1.36.tar.gz
-sha256	d7ee37e33b8c5893c3ebf66edac31241eb9d48e1dc7ec647bbfbc180565a4bcd  mutagen-1.36.tar.gz
+# md5 from https://pypi.python.org/pypi/mutagen/json, sha256 locally computed
+md5 af52956a1b8976accf402f3104b95a84 mutagen-1.36.2.tar.gz
+sha256 86fe98e941ca305be8ee6bdc6bb0e4e9c473bf9fb69a838fe5bf2fc6124fbcc7 mutagen-1.36.2.tar.gz
diff --git a/bsp/buildroot/package/python-mutagen/python-mutagen.mk b/bsp/buildroot/package/python-mutagen/python-mutagen.mk
index 8458de55..3b516fe1 100644
--- a/bsp/buildroot/package/python-mutagen/python-mutagen.mk
+++ b/bsp/buildroot/package/python-mutagen/python-mutagen.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_MUTAGEN_VERSION = 1.36
+PYTHON_MUTAGEN_VERSION = 1.36.2
 PYTHON_MUTAGEN_SOURCE = mutagen-$(PYTHON_MUTAGEN_VERSION).tar.gz
-PYTHON_MUTAGEN_SITE = https://pypi.python.org/packages/69/14/4a5c8360a727563291a7159de935ffff2b99ee783928169f0fea7445370f
-PYTHON_MUTAGEN_LICENSE = GPLv2
+PYTHON_MUTAGEN_SITE = https://pypi.python.org/packages/e7/8a/61496657e30c2cbeb9b3aa28848e0adbcba7cab0ff0bd8e6206647670088
+PYTHON_MUTAGEN_LICENSE = GPL-2.0
 PYTHON_MUTAGEN_LICENSE_FILES = COPYING
 PYTHON_MUTAGEN_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch b/bsp/buildroot/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch
deleted file mode 100644
index ac7838a7..00000000
--- a/bsp/buildroot/package/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5de1bb82465d39962e26175c62f644a3e423d030 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam@redhat.com>
-Date: Thu, 21 Jan 2016 17:21:52 -0800
-Subject: [PATCH] use 'exec' in py3-compatible manner
-
-per https://docs.python.org/2/reference/simple_stmts.html ,
-as exec is a function not a statement in py3, the py2 version
-has been set to allow the subsequent statement to be a tuple,
-so we can invoke it like this to make it both py2 and py3
-compatible. Without this, byte-compiling the file fails under
-py3.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-downloaded from upstream commit:
-https://github.com/mwclient/mwclient/commit/5de1bb82465d39962e26175c62f644a3e423d030
-
- mwclient/ex.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mwclient/ex.py b/mwclient/ex.py
-index db4006c..c0b1eae 100644
---- a/mwclient/ex.py
-+++ b/mwclient/ex.py
-@@ -12,7 +12,7 @@ def read_config(config_files, **predata):
- 
- def _read_config_file(_config_file, predata):
-     _file = open(_config_file)
--    exec _file in globals(), predata
-+    exec(_file, globals(), predata)
-     _file.close()
- 
-     for _k, _v in predata.iteritems():
--- 
-2.9.3
-
diff --git a/bsp/buildroot/package/python-mwclient/Config.in b/bsp/buildroot/package/python-mwclient/Config.in
index be889786..76bf7948 100644
--- a/bsp/buildroot/package/python-mwclient/Config.in
+++ b/bsp/buildroot/package/python-mwclient/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_PYTHON_MWCLIENT
 	bool "python-mwclient"
-	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
+	select BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  MediaWiki API client.
diff --git a/bsp/buildroot/package/python-mwclient/python-mwclient.hash b/bsp/buildroot/package/python-mwclient/python-mwclient.hash
index 10989717..3fb643e6 100644
--- a/bsp/buildroot/package/python-mwclient/python-mwclient.hash
+++ b/bsp/buildroot/package/python-mwclient/python-mwclient.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/mwclient/json, sha256 locally computed
-md5	c1334facf2d6ca54fe6dba4ab75ecf34  mwclient-0.8.1.tar.gz
-sha256	5f892711cc0b23ff2a6d8b7986ee63cd43fd1ec92b0783604ffa7613cd1662e4  mwclient-0.8.1.tar.gz
+md5	486d3109e73d298d512d967501b23647  mwclient-0.8.7.tar.gz
+sha256	3bdaaa48fda6386b190651e49484a549bd0c48b97573dbda34a8b7c4c80430ed  mwclient-0.8.7.tar.gz
+sha256	d29eaa80939b6d8fc3ab458bab90f4af879fa9e0430ed7e0fb2b94752e7eb33f  mwclient/__init__.py
diff --git a/bsp/buildroot/package/python-mwclient/python-mwclient.mk b/bsp/buildroot/package/python-mwclient/python-mwclient.mk
index 1f1e2096..5f18ef7d 100644
--- a/bsp/buildroot/package/python-mwclient/python-mwclient.mk
+++ b/bsp/buildroot/package/python-mwclient/python-mwclient.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_MWCLIENT_VERSION = 0.8.1
+PYTHON_MWCLIENT_VERSION = 0.8.7
 PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz
-PYTHON_MWCLIENT_SITE = https://pypi.python.org/packages/19/79/481b288a497f625ee8f76141ff3472d81428b1f14b7155a28a63a3247197
+PYTHON_MWCLIENT_SITE = https://pypi.python.org/packages/63/05/ddf7d1b0d3a1dc9ee650dcaef7ddfbb980b4d2f0c41128c5f9e6fed5e8e2
 PYTHON_MWCLIENT_LICENSE = MIT
 PYTHON_MWCLIENT_LICENSE_FILES = mwclient/__init__.py
 PYTHON_MWCLIENT_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-mwscrape2slob/Config.in b/bsp/buildroot/package/python-mwscrape2slob/Config.in
index 799ab29c..7856a2c0 100644
--- a/bsp/buildroot/package/python-mwscrape2slob/Config.in
+++ b/bsp/buildroot/package/python-mwscrape2slob/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB
 	bool "python-mwscrape2slob"
 	depends on !BR2_BINFMT_FLAT # python-slob -> python-pyicu -> icu
 	depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # python-slob -> python-pyicu -> icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-slob -> python-pyicu -> icu
 	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_COUCHDB # runtime
 	select BR2_PACKAGE_PYTHON_CSSSELECT # runtime
@@ -14,6 +16,8 @@ config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB
 
 	  https://github.com/itkach/mwscrape2slob
 
-comment "python-mwscrape2slob needs a toolchain w/ C++"
+comment "python-mwscrape2slob needs a toolchain w/ C++, gcc >= 4.8, host gcc >= 4.8"
 	depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT
-	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_HOST_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/bsp/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk b/bsp/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk
index 4d27d8d6..519f5e5e 100644
--- a/bsp/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk
+++ b/bsp/buildroot/package/python-mwscrape2slob/python-mwscrape2slob.mk
@@ -6,7 +6,7 @@
 
 PYTHON_MWSCRAPE2SLOB_VERSION = 0f9124ed62009dff6a230947d80340f5a61a6f49
 PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION))
-PYTHON_MWSCRAPE2SLOB_LICENSE = GPLv3, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet)
+PYTHON_MWSCRAPE2SLOB_LICENSE = GPL-3.0, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet)
 PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-netaddr/python-netaddr.hash b/bsp/buildroot/package/python-netaddr/python-netaddr.hash
index 5fcdda45..59628dbd 100644
--- a/bsp/buildroot/package/python-netaddr/python-netaddr.hash
+++ b/bsp/buildroot/package/python-netaddr/python-netaddr.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=c65bb34f8bedfbbca0b316c490cd13a0, sha256 locally computed.
-md5	c65bb34f8bedfbbca0b316c490cd13a0  netaddr-0.7.18.tar.gz
-sha256	a1f5c9fcf75ac2579b9995c843dade33009543c04f218ff7c007b3c81695bd19  netaddr-0.7.18.tar.gz
+# md5 from https://pypi.python.org/pypi/netaddr/json, sha256 locally computed
+md5 51019ef59c93f3979bcb37d3b8527e07 netaddr-0.7.19.tar.gz
+sha256 38aeec7cdd035081d3a4c306394b19d677623bf76fa0913f6695127c7753aefd netaddr-0.7.19.tar.gz
diff --git a/bsp/buildroot/package/python-netaddr/python-netaddr.mk b/bsp/buildroot/package/python-netaddr/python-netaddr.mk
index c68b24fc..a539845d 100644
--- a/bsp/buildroot/package/python-netaddr/python-netaddr.mk
+++ b/bsp/buildroot/package/python-netaddr/python-netaddr.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_NETADDR_VERSION = 0.7.18
+PYTHON_NETADDR_VERSION = 0.7.19
 PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz
-PYTHON_NETADDR_SITE = http://pypi.python.org/packages/source/n/netaddr
-PYTHON_NETADDR_LICENSE = BSD-3c
+PYTHON_NETADDR_SITE = https://pypi.python.org/packages/0c/13/7cbb180b52201c07c796243eeff4c256b053656da5cfe3916c3f5b57b3a0
+PYTHON_NETADDR_LICENSE = BSD-3-Clause
 PYTHON_NETADDR_LICENSE_FILES = LICENSE
-PYTHON_NETADDR_SETUP_TYPE = distutils
+PYTHON_NETADDR_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-netifaces/python-netifaces.hash b/bsp/buildroot/package/python-netifaces/python-netifaces.hash
index 6f3e358b..335f907d 100644
--- a/bsp/buildroot/package/python-netifaces/python-netifaces.hash
+++ b/bsp/buildroot/package/python-netifaces/python-netifaces.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed
-md5     5b4d1f1310ed279e6df27ef3a9b71519                                  netifaces-0.10.5.tar.gz
-sha256  59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b  netifaces-0.10.5.tar.gz
+md5	1d424cb5ef52907c5ab913011122a98b  netifaces-0.10.6.tar.gz
+sha256	0c4da523f36d36f1ef92ee183f2512f3ceb9a9d2a45f7d19cda5a42c6689ebe0  netifaces-0.10.6.tar.gz
diff --git a/bsp/buildroot/package/python-netifaces/python-netifaces.mk b/bsp/buildroot/package/python-netifaces/python-netifaces.mk
index 3e01c248..3258be7a 100644
--- a/bsp/buildroot/package/python-netifaces/python-netifaces.mk
+++ b/bsp/buildroot/package/python-netifaces/python-netifaces.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_NETIFACES_VERSION = 0.10.5
+PYTHON_NETIFACES_VERSION = 0.10.6
 PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz
-PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/a7/4c/8e0771a59fd6e55aac993a7cc1b6a0db993f299514c464ae6a1ecf83b31d
+PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/72/01/ba076082628901bca750bf53b322a8ff10c1d757dc29196a8e6082711c9d
 PYTHON_NETIFACES_LICENSE = MIT
 PYTHON_NETIFACES_LICENSE_FILES = README.rst
 PYTHON_NETIFACES_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-networkmanager/Config.in b/bsp/buildroot/package/python-networkmanager/Config.in
index fcbce574..9b2b474d 100644
--- a/bsp/buildroot/package/python-networkmanager/Config.in
+++ b/bsp/buildroot/package/python-networkmanager/Config.in
@@ -4,7 +4,8 @@ config BR2_PACKAGE_PYTHON_NETWORKMANAGER
 	depends on BR2_USE_WCHAR # dbus-python
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-python
 	depends on BR2_PACKAGE_DBUS # dbus-python
-	select BR2_PACKAGE_DBUS_PYTHON
+	select BR2_PACKAGE_DBUS_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  python-networkmanager wraps NetworkManagers D-Bus interface
 	  so you can be less verbose when talking to NetworkManager
diff --git a/bsp/buildroot/package/python-networkmanager/python-networkmanager.hash b/bsp/buildroot/package/python-networkmanager/python-networkmanager.hash
index cbd6febc..1fed4bef 100644
--- a/bsp/buildroot/package/python-networkmanager/python-networkmanager.hash
+++ b/bsp/buildroot/package/python-networkmanager/python-networkmanager.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=97c84c19b84b1124903a06379b107f77, sha256 locally computed
-md5	97c84c19b84b1124903a06379b107f77  python-networkmanager-1.2.1.tar.gz
-sha256	7107c07383f8077cfac33fdbb3c4cda4de40be20a6b20d30840055eb519a0e89  python-networkmanager-1.2.1.tar.gz
+# md5 from https://pypi.python.org/pypi/python-networkmanager/json, sha256 locally computed
+md5	5fc644a65463031295c6b7dd51a0f1bd  python-networkmanager-2.0.1.tar.gz
+sha256	bc36507506ad29bfdac941b0987ebd1cc9633c9a9291d7378e229e4515a0a517  python-networkmanager-2.0.1.tar.gz
diff --git a/bsp/buildroot/package/python-networkmanager/python-networkmanager.mk b/bsp/buildroot/package/python-networkmanager/python-networkmanager.mk
index 875748f3..29afb5e5 100644
--- a/bsp/buildroot/package/python-networkmanager/python-networkmanager.mk
+++ b/bsp/buildroot/package/python-networkmanager/python-networkmanager.mk
@@ -4,11 +4,10 @@
 #
 ################################################################################
 
-PYTHON_NETWORKMANAGER_VERSION = 1.2.1
-PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/e7/b1/09993250ceea9e03bc65fbabcd5286540200292c011b22237b2963c11471
-PYTHON_NETWORKMANAGER_SETUP_TYPE = distutils
-PYTHON_NETWORKMANAGER_LICENSE = GPLv3+
+PYTHON_NETWORKMANAGER_VERSION = 2.0.1
+PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/d7/f9/5cbd99fd24a072875ce048e48d1754285f137aab447de8fee63b6cba990a
+PYTHON_NETWORKMANAGER_SETUP_TYPE = setuptools
+PYTHON_NETWORKMANAGER_LICENSE = Zlib
 PYTHON_NETWORKMANAGER_LICENSE_FILES = COPYING
-PYTHON_NETWORKMANAGER_DEPENDENCIES = dbus-python
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-nfc/python-nfc.mk b/bsp/buildroot/package/python-nfc/python-nfc.mk
index 87db577b..574d2e56 100644
--- a/bsp/buildroot/package/python-nfc/python-nfc.mk
+++ b/bsp/buildroot/package/python-nfc/python-nfc.mk
@@ -9,6 +9,6 @@ PYTHON_NFC_SITE = https://launchpad.net/nfcpy
 PYTHON_NFC_SITE_METHOD = bzr
 PYTHON_NFC_DEPENDENCIES = libusb libusb-compat
 PYTHON_NFC_SETUP_TYPE = distutils
-PYTHON_NFC_LICENSE = EUPLv1.1+
+PYTHON_NFC_LICENSE = EUPL-1.1+
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch b/bsp/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch
index 633dbcdf..5aa377bb 100644
--- a/bsp/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch
+++ b/bsp/buildroot/package/python-numpy/0001-no-fenv-on-uclibc.patch
@@ -1,4 +1,7 @@
-Don't use <fenv.h> on uClibc
+From 1d309b81a6fdac33dfb5148f618bafe6ebdff958 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 15 Sep 2017 12:51:36 +0300
+Subject: [PATCH] Don't use <fenv.h> on uClibc
 
 The python-numpy code already has provisions to not use <fenv.h> when
 not available. However, it uses __GLIBC__ to know whether fenv.h is
@@ -9,30 +12,30 @@ This patch fixes that by changing all defined(__GLIBC__) occurences by
 (defined(__GLIBC__) && !defined(__UCLIBC__)).
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+---
+ numpy/core/include/numpy/ufuncobject.h | 2 +-
+ numpy/core/src/npymath/ieee754.c.src   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: b/numpy/core/include/numpy/ufuncobject.h
-===================================================================
+diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h
+index d0ac1fd7d732..65e49fcd5b7a 100644
 --- a/numpy/core/include/numpy/ufuncobject.h
 +++ b/numpy/core/include/numpy/ufuncobject.h
-@@ -413,11 +413,11 @@
-         (void) fpsetsticky(0); \
-         }
- 
--#elif defined(__GLIBC__) || defined(__APPLE__) || \
-+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
+@@ -319,7 +319,7 @@ typedef struct _loop1d_info {
+ #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \
+       (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \
+       defined(__NetBSD__) || \
+-      defined(__GLIBC__) || defined(__APPLE__) || \
++      (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
        defined(__CYGWIN__) || defined(__MINGW32__) || \
-       (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- 
--#if defined(__GLIBC__) || defined(__APPLE__) || \
-+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
-     defined(__MINGW32__) || defined(__FreeBSD__)
- #include <fenv.h>
- #elif defined(__CYGWIN__)
-Index: b/numpy/core/src/npymath/ieee754.c.src
-===================================================================
+       (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \
+       defined(_AIX) || \
+diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
+index 0370ea6c77aa..e63e409b6604 100644
 --- a/numpy/core/src/npymath/ieee754.c.src
 +++ b/numpy/core/src/npymath/ieee754.c.src
-@@ -586,11 +586,11 @@
+@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void)
  }
  
  
@@ -40,40 +43,7 @@ Index: b/numpy/core/src/npymath/ieee754.c.src
 +#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
        defined(__CYGWIN__) || defined(__MINGW32__) || \
        (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- 
--# if defined(__GLIBC__) || defined(__APPLE__) || \
-+# if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \
-      defined(__MINGW32__) || defined(__FreeBSD__)
  #  include <fenv.h>
- # elif defined(__CYGWIN__)
-Index: b/numpy/numarray/_capi.c
-===================================================================
---- a/numpy/numarray/_capi.c
-+++ b/numpy/numarray/_capi.c
-@@ -10,7 +10,7 @@
- #include <sys/param.h>
- #endif
- 
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- #include <fenv.h>
- #elif defined(__CYGWIN__)
- #include "numpy/fenv/fenv.h"
-@@ -258,7 +258,7 @@
- }
- 
- /* Likewise for Integer overflows */
--#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- static int int_overflow_error(Float64 value) { /* For x86_64 */
-     feraiseexcept(FE_OVERFLOW);
-     return (int) value;
-@@ -3007,7 +3007,7 @@
-     return retstatus;
- }
- 
--#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
-+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
- 
- static int
- NA_checkFPErrors(void)
+-- 
+2.7.5
+
diff --git a/bsp/buildroot/package/python-numpy/0002-Add-support-of-ARC.patch b/bsp/buildroot/package/python-numpy/0002-Add-support-of-ARC.patch
new file mode 100644
index 00000000..c022487c
--- /dev/null
+++ b/bsp/buildroot/package/python-numpy/0002-Add-support-of-ARC.patch
@@ -0,0 +1,68 @@
+From 9a225e7d4fb1de5c99c6b5b17cae2fc4c2d1c59a Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Fri, 15 Sep 2017 11:59:14 +0300
+Subject: [PATCH] Add support of ARC
+
+Synopsys DesignWare ARC Processors are a family of 32-bit CPUs
+which in some configurations may run Linux kernel and full stack
+of applications on top of it. Among other things is Python.
+
+With that change we allow building and usage of Numpy on ARC.
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+---
+ numpy/core/include/numpy/npy_cpu.h    | 6 ++++++
+ numpy/core/include/numpy/npy_endian.h | 6 ++++--
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
+index 60abae4e0b0e..84653ea183ce 100644
+--- a/numpy/core/include/numpy/npy_cpu.h
++++ b/numpy/core/include/numpy/npy_cpu.h
+@@ -15,6 +15,8 @@
+  *              NPY_CPU_ARMEB
+  *              NPY_CPU_SH_LE
+  *              NPY_CPU_SH_BE
++ *              NPY_CPU_ARCEL
++ *              NPY_CPU_ARCEB
+  */
+ #ifndef _NPY_CPUARCH_H_
+ #define _NPY_CPUARCH_H_
+@@ -76,6 +78,10 @@
+     #define NPY_CPU_AARCH64
+ #elif defined(__mc68000__)
+     #define NPY_CPU_M68K
++#elif defined(__arc__) && defined(__LITTLE_ENDIAN__)
++    #define NPY_CPU_ARCEL
++#elif defined(__arc__) && defined(__BIG_ENDIAN__)
++    #define NPY_CPU_ARCEB
+ #else
+     #error Unknown CPU, please report this to numpy maintainers with \
+     information about your platform (OS, CPU and compiler)
+diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h
+index e34b1d97e655..1a42121db92e 100644
+--- a/numpy/core/include/numpy/npy_endian.h
++++ b/numpy/core/include/numpy/npy_endian.h
+@@ -45,7 +45,8 @@
+             || defined(NPY_CPU_AARCH64) \
+             || defined(NPY_CPU_SH_LE)   \
+             || defined(NPY_CPU_MIPSEL)  \
+-            || defined(NPY_CPU_PPC64LE)
++            || defined(NPY_CPU_PPC64LE) \
++            || defined(NPY_CPU_ARCEL)
+         #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
+     #elif defined(NPY_CPU_PPC)          \
+             || defined(NPY_CPU_SPARC)   \
+@@ -56,7 +57,8 @@
+             || defined(NPY_CPU_SH_BE)   \
+             || defined(NPY_CPU_MIPSEB)  \
+             || defined(NPY_CPU_OR1K)    \
+-            || defined(NPY_CPU_M68K)
++            || defined(NPY_CPU_M68K)    \
++            || defined(NPY_CPU_ARCEB)
+         #define NPY_BYTE_ORDER NPY_BIG_ENDIAN
+     #else
+         #error Unknown CPU: can not set endianness
+-- 
+2.7.5
+
diff --git a/bsp/buildroot/package/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch b/bsp/buildroot/package/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch
deleted file mode 100644
index 42d19418..00000000
--- a/bsp/buildroot/package/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b0a1b9628d17251bb417a063ec6c6e09f32393c2 Mon Sep 17 00:00:00 2001
-From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
-Date: Tue, 6 Oct 2015 01:20:48 +0100
-Subject: [PATCH] Don't blindly enable frexpl and ldexpl for uClibc
-
-When the size of double and long double are equal, numpy blindly
-assumes that frexpl and ldexpl will be available as well. But for
-uClibc, that's not true: it only defines the long double functions
-when long double "exists" on the architecture.
-
-So make an exception for uClibc.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
----
- numpy/core/src/private/npy_config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h
-index 453dbd0..7ecf72c 100644
---- a/numpy/core/src/private/npy_config.h
-+++ b/numpy/core/src/private/npy_config.h
-@@ -11,7 +11,7 @@
- #endif
- 
- /* Safe to use ldexp and frexp for long double for MSVC builds */
--#if (NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) || defined(_MSC_VER)
-+#if ((NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) && !defined(__UCLIBC__)) || defined(_MSC_VER)
-     #ifdef HAVE_LDEXP
-         #define HAVE_LDEXPL 1
-     #endif
--- 
-2.5.3
-
diff --git a/bsp/buildroot/package/python-numpy/Config.in b/bsp/buildroot/package/python-numpy/Config.in
index f7822efc..067085bf 100644
--- a/bsp/buildroot/package/python-numpy/Config.in
+++ b/bsp/buildroot/package/python-numpy/Config.in
@@ -1,9 +1,19 @@
 config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
 	bool
 	# Numpy has some CPU specific code
-	default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \
-		|| BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \
-		|| BR2_sh || BR2_x86_64
+	# ARCompact build fails due to toolchain issue
+	# ARC HS38 build fails on glibc due to missing FE_* definitions
+	default y if BR2_arc && BR2_archs38 && !BR2_TOOLCHAIN_USES_GLIBC
+	default y if BR2_aarch64
+	default y if BR2_arm
+	default y if BR2_armeb
+	default y if BR2_i386
+	default y if BR2_mips
+	default y if BR2_mipsel
+	default y if BR2_powerpc
+	default y if BR2_powerpc64
+	default y if BR2_sh
+	default y if BR2_x86_64
 
 config BR2_PACKAGE_PYTHON_NUMPY
 	bool "python-numpy"
diff --git a/bsp/buildroot/package/python-numpy/python-numpy.hash b/bsp/buildroot/package/python-numpy/python-numpy.hash
index 39b134be..854f2022 100644
--- a/bsp/buildroot/package/python-numpy/python-numpy.hash
+++ b/bsp/buildroot/package/python-numpy/python-numpy.hash
@@ -1,2 +1,4 @@
-# Locally computed:
-sha256  2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253  numpy-1.8.0.tar.gz
+# Copied from https://github.com/numpy/numpy/releases/tag/v1.13.3
+sha256	4c6b4eef790528bebb7ec9590d74cc193868940fe68e4109a91c196df72d8094	numpy-1.13.3.tar.gz
+# License files, locally calculated
+sha256	94eebc7c8f86a287c1e9146ed52ebcde88183806d848d8c66e0e52d1aebf3b13	LICENSE.txt
diff --git a/bsp/buildroot/package/python-numpy/python-numpy.mk b/bsp/buildroot/package/python-numpy/python-numpy.mk
index 0ab58b00..d0d38371 100644
--- a/bsp/buildroot/package/python-numpy/python-numpy.mk
+++ b/bsp/buildroot/package/python-numpy/python-numpy.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PYTHON_NUMPY_VERSION = 1.8.0
+PYTHON_NUMPY_VERSION = 1.13.3
 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
-PYTHON_NUMPY_SITE = http://downloads.sourceforge.net/numpy
-PYTHON_NUMPY_LICENSE = BSD-3c
+PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
+PYTHON_NUMPY_LICENSE = BSD-3-Clause
 PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt
-PYTHON_NUMPY_SETUP_TYPE = distutils
+PYTHON_NUMPY_SETUP_TYPE = setuptools
 
 ifeq ($(BR2_PACKAGE_CLAPACK),y)
 PYTHON_NUMPY_DEPENDENCIES += clapack
diff --git a/bsp/buildroot/package/python-oauthlib/Config.in b/bsp/buildroot/package/python-oauthlib/Config.in
new file mode 100644
index 00000000..d6617f38
--- /dev/null
+++ b/bsp/buildroot/package/python-oauthlib/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_OAUTHLIB
+	bool "python-oauthlib"
+	help
+	  A generic, spec-compliant, thorough implementation of the
+	  OAuth request-signing logic.
+
+	  https://github.com/idan/oauthlib
diff --git a/bsp/buildroot/package/python-oauthlib/python-oauthlib.hash b/bsp/buildroot/package/python-oauthlib/python-oauthlib.hash
new file mode 100644
index 00000000..f8e13242
--- /dev/null
+++ b/bsp/buildroot/package/python-oauthlib/python-oauthlib.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/oauthlib/json, sha256 locally computed
+md5	277a9a966cc8c72e492b4eeb41332445  oauthlib-2.0.6.tar.gz
+sha256	ce57b501e906ff4f614e71c36a3ab9eacbb96d35c24d1970d2539bbc3ec70ce1  oauthlib-2.0.6.tar.gz
+sha256	9e1ae8725f5815738dadb6cbb09f450453d94e07c7b5efaee864f546a6209a95  LICENSE
diff --git a/bsp/buildroot/package/python-oauthlib/python-oauthlib.mk b/bsp/buildroot/package/python-oauthlib/python-oauthlib.mk
new file mode 100644
index 00000000..ab398002
--- /dev/null
+++ b/bsp/buildroot/package/python-oauthlib/python-oauthlib.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-oauthlib
+#
+################################################################################
+
+PYTHON_OAUTHLIB_VERSION = 2.0.6
+PYTHON_OAUTHLIB_SOURCE = oauthlib-$(PYTHON_OAUTHLIB_VERSION).tar.gz
+PYTHON_OAUTHLIB_SITE = https://pypi.python.org/packages/a5/8a/212e9b47fb54be109f3ff0684165bb38c51117f34e175c379fce5c7df754
+PYTHON_OAUTHLIB_SETUP_TYPE = setuptools
+PYTHON_OAUTHLIB_LICENSE = BSD-3-Clause
+PYTHON_OAUTHLIB_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash b/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash
index 6cb3cc2b..e791d367 100644
--- a/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash
+++ b/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.hash
@@ -1,3 +1,6 @@
 # md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed
-md5	241150b3fcb920ddca4d33181f3238b1  paho-mqtt-1.2.tar.gz
-sha256	9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f  paho-mqtt-1.2.tar.gz
+md5	2cc27d8b369700b1fc99325add0dadd2  paho-mqtt-1.3.1.tar.gz
+sha256	31911f6031de306c27ed79dc77b690d7c55b0dcb0f0434ca34ec6361d0371122  paho-mqtt-1.3.1.tar.gz
+sha256	76f13729e84e9222e543303df00f87d1b2c0995b6a505cd859a285667e44babb  LICENSE.txt
+sha256	e8cf7d54ea46c19aba793983889b7f7425e1ebfcaaccec764a7db091646e203c  edl-v10
+sha256	3b9be6b894d0769de796e653571ff6cef494913c0ce78c35a97db939e7d9087c  epl-v10
diff --git a/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk b/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk
index d783a9cb..f335b35e 100644
--- a/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk
+++ b/bsp/buildroot/package/python-paho-mqtt/python-paho-mqtt.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PAHO_MQTT_VERSION = 1.2
+PYTHON_PAHO_MQTT_VERSION = 1.3.1
 PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz
-PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/82/d9/7064d3a0a1d62756a1a809c85b99f864c641b66de84c15458f72193b7708
-PYTHON_PAHO_MQTT_LICENSE = EPLv1.0 or EDLv1.0
+PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/2a/5f/cf14b8f9f8ed1891cda893a2a7d1d6fa23de2a9fb4832f05cef02b79d01f
+PYTHON_PAHO_MQTT_LICENSE = EPL-1.0 or EDLv1.0
 PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10
-PYTHON_PAHO_MQTT_SETUP_TYPE = distutils
+PYTHON_PAHO_MQTT_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pam/python-pam.mk b/bsp/buildroot/package/python-pam/python-pam.mk
index d737291c..943e01dd 100644
--- a/bsp/buildroot/package/python-pam/python-pam.mk
+++ b/bsp/buildroot/package/python-pam/python-pam.mk
@@ -9,7 +9,7 @@ PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz
 # pangalactic.org gone
 PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871
 PYTHON_PAM_SETUP_TYPE = distutils
-PYTHON_PAM_LICENSE = LGPLv2.1
+PYTHON_PAM_LICENSE = LGPL-2.1
 PYTHON_PAM_LICENSE_FILES = COPYING
 PYTHON_PAM_DEPENDENCIES = linux-pam
 
diff --git a/bsp/buildroot/package/python-paramiko/Config.in b/bsp/buildroot/package/python-paramiko/Config.in
index aad85cb1..1f86af3b 100644
--- a/bsp/buildroot/package/python-paramiko/Config.in
+++ b/bsp/buildroot/package/python-paramiko/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_PYTHON_PARAMIKO
 	bool "python-paramiko"
 	depends on BR2_INSTALL_LIBSTDCPP # python-pyasn
-	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
-	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_BCRYPT # runtime
 	select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime
 	select BR2_PACKAGE_PYTHON_PYASN # runtime
+	select BR2_PACKAGE_PYTHON_PYNACL # runtime
+	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  SSH2 protocol library.
 
diff --git a/bsp/buildroot/package/python-paramiko/python-paramiko.hash b/bsp/buildroot/package/python-paramiko/python-paramiko.hash
index fca8fd75..3b4c779c 100644
--- a/bsp/buildroot/package/python-paramiko/python-paramiko.hash
+++ b/bsp/buildroot/package/python-paramiko/python-paramiko.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/paramiko/json, sha256 locally computed
-md5	9e8abe635baa6bb75a4cd55dcb56a264  paramiko-2.1.1.tar.gz
-sha256	d51dada7ad0736c116f8bfe3263627925947e4a50e61436a83d58bfe7055b575  paramiko-2.1.1.tar.gz
+md5	d44932891b1ce4bfd3e9e9e06c90395d  paramiko-2.2.0.tar.gz
+sha256	24b6cdb42eedb50f3b9d994ab0ca63e74db57555346e97c6e4b8c2ab51cdfd81  paramiko-2.2.0.tar.gz
diff --git a/bsp/buildroot/package/python-paramiko/python-paramiko.mk b/bsp/buildroot/package/python-paramiko/python-paramiko.mk
index 6c0df4d9..0aed667c 100644
--- a/bsp/buildroot/package/python-paramiko/python-paramiko.mk
+++ b/bsp/buildroot/package/python-paramiko/python-paramiko.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PARAMIKO_VERSION = 2.1.1
+PYTHON_PARAMIKO_VERSION = 2.2.0
 PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz
-PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/d1/5a/ebd00d884f30baf208359a027eb7b38372d81d0c004724bb1aa71ae43b37
+PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/ea/a1/75393511fa6b645d28bd614ba061af99e94a6916c6b4f619f8b6b58bc35e
 PYTHON_PARAMIKO_SETUP_TYPE = setuptools
-PYTHON_PARAMIKO_LICENSE = LGPLv2.1+
+PYTHON_PARAMIKO_LICENSE = LGPL-2.1+
 PYTHON_PARAMIKO_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pathlib2/Config.in b/bsp/buildroot/package/python-pathlib2/Config.in
new file mode 100644
index 00000000..7297f0ad
--- /dev/null
+++ b/bsp/buildroot/package/python-pathlib2/Config.in
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_PYTHON_PATHLIB2
+	bool "python-pathlib2"
+	depends on BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_SCANDIR # runtime
+	help
+	  Object-oriented filesystem paths.
+
+	  The goal of pathlib2 is to provide a backport of standard
+	  pathlib module which tracks the standard library module, so
+	  all the newest features of the standard pathlib can be used
+	  also on older Python versions.
+
+	  https://pypi.python.org/pypi/pathlib2
diff --git a/bsp/buildroot/package/python-pathlib2/python-pathlib2.hash b/bsp/buildroot/package/python-pathlib2/python-pathlib2.hash
new file mode 100644
index 00000000..a9c29494
--- /dev/null
+++ b/bsp/buildroot/package/python-pathlib2/python-pathlib2.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/pathlib2/json, sha256 locally computed
+md5 6c75bfde898b6c88627621a48ee8de14 pathlib2-2.2.1.tar.gz
+sha256 ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d pathlib2-2.2.1.tar.gz
diff --git a/bsp/buildroot/package/python-pathlib2/python-pathlib2.mk b/bsp/buildroot/package/python-pathlib2/python-pathlib2.mk
new file mode 100644
index 00000000..0116420e
--- /dev/null
+++ b/bsp/buildroot/package/python-pathlib2/python-pathlib2.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-pathlib2
+#
+################################################################################
+
+PYTHON_PATHLIB2_VERSION = 2.2.1
+PYTHON_PATHLIB2_SOURCE = pathlib2-$(PYTHON_PATHLIB2_VERSION).tar.gz
+PYTHON_PATHLIB2_SITE = https://pypi.python.org/packages/ab/d8/ac7489d50146f29d0a14f65545698f4545d8a6b739b24b05859942048b56
+PYTHON_PATHLIB2_LICENSE = MIT
+PYTHON_PATHLIB2_LICENSE_FILES = LICENSE.rst
+PYTHON_PATHLIB2_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pathpy/python-pathpy.hash b/bsp/buildroot/package/python-pathpy/python-pathpy.hash
index 4824e2a3..de22f6c5 100644
--- a/bsp/buildroot/package/python-pathpy/python-pathpy.hash
+++ b/bsp/buildroot/package/python-pathpy/python-pathpy.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/path.py/json, sha256 locally computed
-md5	eb8469ad498d2e462bff8f3b2b5ea68d  path.py-10.0.tar.gz
-sha256	ba984a2b536158a8841dd33150fce16bcf04210e83f92da674cad0a8a8f61e00  path.py-10.0.tar.gz
+md5	afb4f92e4114b595f50573ecd61c31ee  path.py-10.5.tar.gz
+sha256	63a7af08676668fd51750f111affbd38c1a13c61aba15c6665b16681771c79a8  path.py-10.5.tar.gz
diff --git a/bsp/buildroot/package/python-pathpy/python-pathpy.mk b/bsp/buildroot/package/python-pathpy/python-pathpy.mk
index 57765860..45233168 100644
--- a/bsp/buildroot/package/python-pathpy/python-pathpy.mk
+++ b/bsp/buildroot/package/python-pathpy/python-pathpy.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PATHPY_VERSION = 10.0
+PYTHON_PATHPY_VERSION = 10.5
 PYTHON_PATHPY_SOURCE = path.py-$(PYTHON_PATHPY_VERSION).tar.gz
-PYTHON_PATHPY_SITE = https://pypi.python.org/packages/f3/4e/3bce93c0d9e20abc6ed3aa7866beb688e889828ca2666743df11d9a30050
+PYTHON_PATHPY_SITE = https://pypi.python.org/packages/a5/7b/7b303dc1b79fc394b67cea351455ec0db8e6ca5d8537687d40cb7c7d70bb
 PYTHON_PATHPY_SETUP_TYPE = setuptools
 PYTHON_PATHPY_LICENSE = MIT
 PYTHON_PATHPY_DEPENDENCIES = host-python-setuptools-scm
diff --git a/bsp/buildroot/package/python-pathvalidate/Config.in b/bsp/buildroot/package/python-pathvalidate/Config.in
index 60163fbe..8606696e 100644
--- a/bsp/buildroot/package/python-pathvalidate/Config.in
+++ b/bsp/buildroot/package/python-pathvalidate/Config.in
@@ -1,8 +1,5 @@
 config BR2_PACKAGE_PYTHON_PATHVALIDATE
 	bool "python-pathvalidate"
-	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
-	select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime
 	help
 	  pathvalidate is a python library to validate/sanitize a string
 	  such as filename/variable-name.
diff --git a/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.hash b/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.hash
index 68e6907d..734d4495 100644
--- a/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.hash
+++ b/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pathvalidate/json, sha256 locally computed
-md5	03f0af69596f7de52d52753c2a585fce  pathvalidate-0.13.0.tar.gz
-sha256	1ecaebfbd32794abe5f47a20189d5f7dd196a6ba445c1a07429de6ce608bf9b9  pathvalidate-0.13.0.tar.gz
+md5	fa119fcdbc744dc3a9de11185437992c  pathvalidate-0.16.0.tar.gz
+sha256	81c665a16e41203dc7698caf4f7ee15b7da97e36368e30e76e76e968ce77f468  pathvalidate-0.16.0.tar.gz
diff --git a/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.mk b/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.mk
index a8ab4ad2..c25f4ce3 100644
--- a/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.mk
+++ b/bsp/buildroot/package/python-pathvalidate/python-pathvalidate.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PATHVALIDATE_VERSION = 0.13.0
+PYTHON_PATHVALIDATE_VERSION = 0.16.0
 PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz
-PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/3a/03/ca01cdbf0f7b766b414d134e71b2eb689619dba0ddee002d53c2d58f6436
+PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/d8/c5/37474d872ca29510a10d93b103920fad551f577b696104a3574a89093e5f
 PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools
 PYTHON_PATHVALIDATE_LICENSE = MIT
 PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-pickleshare/Config.in b/bsp/buildroot/package/python-pickleshare/Config.in
new file mode 100644
index 00000000..35a26637
--- /dev/null
+++ b/bsp/buildroot/package/python-pickleshare/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_PICKLESHARE
+	bool "python-pickleshare"
+	select BR2_PACKAGE_PYTHON_PATHLIB2 if BR2_PACKAGE_PYTHON # runtime
+	help
+	  Tiny 'shelve'-like database with concurrency support
+
+	  https://pypi.python.org/pypi/pickleshare
diff --git a/bsp/buildroot/package/python-pickleshare/python-pickleshare.hash b/bsp/buildroot/package/python-pickleshare/python-pickleshare.hash
new file mode 100644
index 00000000..6e3d408e
--- /dev/null
+++ b/bsp/buildroot/package/python-pickleshare/python-pickleshare.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/pickleshare/json, sha256 locally computed
+md5 6a9e5dd8dfc023031f6b7b3f824cab12 pickleshare-0.7.4.tar.gz
+sha256 84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b pickleshare-0.7.4.tar.gz
diff --git a/bsp/buildroot/package/python-pickleshare/python-pickleshare.mk b/bsp/buildroot/package/python-pickleshare/python-pickleshare.mk
new file mode 100644
index 00000000..53fd84e4
--- /dev/null
+++ b/bsp/buildroot/package/python-pickleshare/python-pickleshare.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-pickleshare
+#
+################################################################################
+
+PYTHON_PICKLESHARE_VERSION = 0.7.4
+PYTHON_PICKLESHARE_SOURCE = pickleshare-$(PYTHON_PICKLESHARE_VERSION).tar.gz
+PYTHON_PICKLESHARE_SITE = https://pypi.python.org/packages/69/fe/dd137d84daa0fd13a709e448138e310d9ea93070620c9db5454e234af525
+PYTHON_PICKLESHARE_LICENSE = MIT
+PYTHON_PICKLESHARE_LICENSE_FILES = LICENSE
+PYTHON_PICKLESHARE_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pillow/python-pillow.hash b/bsp/buildroot/package/python-pillow/python-pillow.hash
index 182e82f8..d8c083b4 100644
--- a/bsp/buildroot/package/python-pillow/python-pillow.hash
+++ b/bsp/buildroot/package/python-pillow/python-pillow.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed
-md5	d5af224b0fa2c66dacc9814785fef9e7  Pillow-4.0.0.tar.gz
-sha256	ee26d2d7e7e300f76ba7b796014c04011394d0c4a5ed9a288264a3e443abca50  Pillow-4.0.0.tar.gz
+md5 11e5e2046cf41586716a6042d89abeeb  Pillow-4.2.1.tar.gz
+sha256 c724f65870e545316f9e82e4c6d608ab5aa9dd82d5185e5b2e72119378740073  Pillow-4.2.1.tar.gz
diff --git a/bsp/buildroot/package/python-pillow/python-pillow.mk b/bsp/buildroot/package/python-pillow/python-pillow.mk
index faa0e166..79d6a77c 100644
--- a/bsp/buildroot/package/python-pillow/python-pillow.mk
+++ b/bsp/buildroot/package/python-pillow/python-pillow.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PILLOW_VERSION = 4.0.0
+PYTHON_PILLOW_VERSION = 4.2.1
 PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
-PYTHON_PILLOW_SITE = https://pypi.python.org/packages/8d/80/eca7a2d1a3c2dafb960f32f844d570de988e609f5fd17de92e1cf6a01b0a
+PYTHON_PILLOW_SITE = https://pypi.python.org/packages/55/aa/f7f983fb72710a9daa4b3374b7c160091d3f94f5c09221f9336ade9027f3
 PYTHON_PILLOW_LICENSE = PIL Software License
 PYTHON_PILLOW_LICENSE_FILES = LICENSE
 PYTHON_PILLOW_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-portend/Config.in b/bsp/buildroot/package/python-portend/Config.in
new file mode 100644
index 00000000..6b21078c
--- /dev/null
+++ b/bsp/buildroot/package/python-portend/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_PORTEND
+	bool "python-portend"
+	select BR2_PACKAGE_PYTHON_TEMPORA # runtime
+	help
+	  TCP port monitoring utilities.
+
+	  https://github.com/jaraco/portend
diff --git a/bsp/buildroot/package/python-portend/python-portend.hash b/bsp/buildroot/package/python-portend/python-portend.hash
new file mode 100644
index 00000000..ce4d5f6f
--- /dev/null
+++ b/bsp/buildroot/package/python-portend/python-portend.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/portend/json, sha256 locally computed
+md5	a45e001d40227c4529b1a7186f4442f5  portend-1.8.tar.gz
+sha256	7de919b82c4ac60d4768fe80a2557290661aa665b7c427de6249d8cb2fde5561  portend-1.8.tar.gz
diff --git a/bsp/buildroot/package/python-portend/python-portend.mk b/bsp/buildroot/package/python-portend/python-portend.mk
new file mode 100644
index 00000000..b0e89b13
--- /dev/null
+++ b/bsp/buildroot/package/python-portend/python-portend.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-portend
+#
+################################################################################
+
+PYTHON_PORTEND_VERSION = 1.8
+PYTHON_PORTEND_SOURCE = portend-$(PYTHON_PORTEND_VERSION).tar.gz
+PYTHON_PORTEND_SITE = https://pypi.python.org/packages/3f/37/f3ab6c4a00632d53d7dfb74ba4a695e86605b92b0a94bd41fa443b60ccb6
+PYTHON_PORTEND_LICENSE = MIT
+PYTHON_PORTEND_SETUP_TYPE = setuptools
+PYTHON_PORTEND_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-posix-ipc/python-posix-ipc.mk b/bsp/buildroot/package/python-posix-ipc/python-posix-ipc.mk
index 79165375..6178c754 100644
--- a/bsp/buildroot/package/python-posix-ipc/python-posix-ipc.mk
+++ b/bsp/buildroot/package/python-posix-ipc/python-posix-ipc.mk
@@ -7,7 +7,7 @@
 PYTHON_POSIX_IPC_VERSION = 1.0.0
 PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz
 PYTHON_POSIX_IPC_SITE = https://pypi.python.org/packages/f0/e6/bff62b62b2e75f695b737695951b7a4c1c6595369268a37868f5c34e1c12
-PYTHON_POSIX_IPC_LICENSE = BSD-3c
+PYTHON_POSIX_IPC_LICENSE = BSD-3-Clause
 PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE
 PYTHON_POSIX_IPC_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-priority/Config.in b/bsp/buildroot/package/python-priority/Config.in
new file mode 100644
index 00000000..b73b7e2a
--- /dev/null
+++ b/bsp/buildroot/package/python-priority/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_PRIORITY
+	bool "python-priority"
+	help
+	  A pure-Python implementation of the HTTP/2 priority tree.
+
+	  http://python-hyper.org/priority/
diff --git a/bsp/buildroot/package/python-priority/python-priority.hash b/bsp/buildroot/package/python-priority/python-priority.hash
new file mode 100644
index 00000000..e115d6a4
--- /dev/null
+++ b/bsp/buildroot/package/python-priority/python-priority.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/priority/json, sha256 locally computed
+md5	4f1ff52f7fa448e9d9cb46337ae86d1e  priority-1.3.0.tar.gz
+sha256	6bc1961a6d7fcacbfc337769f1a382c8e746566aaa365e78047abe9f66b2ffbe  priority-1.3.0.tar.gz
diff --git a/bsp/buildroot/package/python-priority/python-priority.mk b/bsp/buildroot/package/python-priority/python-priority.mk
new file mode 100644
index 00000000..8b6dbc1e
--- /dev/null
+++ b/bsp/buildroot/package/python-priority/python-priority.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-priority
+#
+################################################################################
+
+PYTHON_PRIORITY_VERSION = 1.3.0
+PYTHON_PRIORITY_SOURCE = priority-$(PYTHON_PRIORITY_VERSION).tar.gz
+PYTHON_PRIORITY_SITE = https://pypi.python.org/packages/ba/96/7d0b024087062418dfe02a68cd6b195399266ac002fb517aad94cc93e076
+PYTHON_PRIORITY_SETUP_TYPE = setuptools
+PYTHON_PRIORITY_LICENSE = MIT
+PYTHON_PRIORITY_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash b/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash
index 0211a96f..f60fc086 100644
--- a/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash
+++ b/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/prompt-toolkit/json, sha256 locally computed
-md5	f74cd8ac84176fac1cdb136843ccb0d6  prompt_toolkit-1.0.7.tar.gz
-sha256	ef0b8188179fe7d052161ed274b43e18f5a680ff84d01462293b327e1668d2ef  prompt_toolkit-1.0.7.tar.gz
+# md5 from https://pypi.python.org/pypi/prompt_toolkit/json, sha256 locally computed
+md5 427b496d2c147bd3819bc3a7f6e0d493 prompt_toolkit-1.0.13.tar.gz
+sha256 33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776 prompt_toolkit-1.0.13.tar.gz
diff --git a/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk b/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk
index 7e85dcd2..19b7b34e 100644
--- a/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk
+++ b/bsp/buildroot/package/python-prompt-toolkit/python-prompt-toolkit.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.7
+PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.13
 PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz
-PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/dd/55/2fb4883d2b21d072204fd21ca5e6040faa253135554590d0b67380669176
+PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/23/be/4876b52d5cc159cbd4b0ff6e7aa419a26470849a43a8f647857a4a24467b
 PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools
-PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3c
+PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3-Clause
 PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-protobuf/Config.in b/bsp/buildroot/package/python-protobuf/Config.in
index 6649dfc0..500c82a5 100644
--- a/bsp/buildroot/package/python-protobuf/Config.in
+++ b/bsp/buildroot/package/python-protobuf/Config.in
@@ -1,12 +1,14 @@
 config BR2_PACKAGE_PYTHON_PROTOBUF
 	bool "python-protobuf"
-	depends on BR2_PACKAGE_PYTHON
 	# host-protobuf only builds on certain architectures
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_HOST_GCC_AT_LEAST_4_5 # host-protobuf
+	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
 	  Python implementation of the Google Protocol Buffers.
 
-	  Protocol buffers are Google's language-neutral, platform-neutral,
-	  extensible mechanism for serializing structured data.
+	  Protocol buffers are Google's language-neutral,
+	  platform-neutral, extensible mechanism for serializing
+	  structured data.
 
-	  http://code.google.com/p/protobuf/
+	  https://github.com/protobuf-c/protobuf-c
diff --git a/bsp/buildroot/package/python-protobuf/python-protobuf.hash b/bsp/buildroot/package/python-protobuf/python-protobuf.hash
deleted file mode 120000
index 57a40ce5..00000000
--- a/bsp/buildroot/package/python-protobuf/python-protobuf.hash
+++ /dev/null
@@ -1 +0,0 @@
-../protobuf/protobuf.hash
\ No newline at end of file
diff --git a/bsp/buildroot/package/python-protobuf/python-protobuf.hash b/bsp/buildroot/package/python-protobuf/python-protobuf.hash
new file mode 100644
index 00000000..91cab4ec
--- /dev/null
+++ b/bsp/buildroot/package/python-protobuf/python-protobuf.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 1faa722cf475c8e4c43ddb393d6f1477f1a56c93be38a1c8e367c358db476b5f protobuf-python-3.4.1.tar.gz
diff --git a/bsp/buildroot/package/python-protobuf/python-protobuf.mk b/bsp/buildroot/package/python-protobuf/python-protobuf.mk
index d8be76dd..b91ba493 100644
--- a/bsp/buildroot/package/python-protobuf/python-protobuf.mk
+++ b/bsp/buildroot/package/python-protobuf/python-protobuf.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION)
-PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE)
+PYTHON_PROTOBUF_SOURCE = protobuf-python-$(PYTHON_PROTOBUF_VERSION).tar.gz
 PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE)
-PYTHON_PROTOBUF_LICENSE = BSD-3c
+PYTHON_PROTOBUF_LICENSE = BSD-3-Clause
 PYTHON_PROTOBUF_LICENSE_FILES = LICENSE
 PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf
 PYTHON_PROTOBUF_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-psutil/Config.in b/bsp/buildroot/package/python-psutil/Config.in
index 1aec35d2..c64eeeed 100644
--- a/bsp/buildroot/package/python-psutil/Config.in
+++ b/bsp/buildroot/package/python-psutil/Config.in
@@ -1,13 +1,8 @@
 config BR2_PACKAGE_PYTHON_PSUTIL
 	bool "python-psutil"
-	# sys/sysinfo.h conflict with kernel headers
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
 	  psutil is a cross-platform library for retrieving
 	  information on running processes and system utilization
 	  (CPU, memory, disks, network) in Python.
 
 	  https://pypi.python.org/pypi/psutil
-
-comment "python-psutil needs a uClibc or glibc toolchain"
-	depends on BR2_TOOLCHAIN_USES_MUSL
diff --git a/bsp/buildroot/package/python-psutil/python-psutil.hash b/bsp/buildroot/package/python-psutil/python-psutil.hash
index ead2d9c5..19fb8a4f 100644
--- a/bsp/buildroot/package/python-psutil/python-psutil.hash
+++ b/bsp/buildroot/package/python-psutil/python-psutil.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed
-md5	199a366dba829c88bddaf5b41d19ddc0  psutil-4.3.1.tar.gz
-sha256  38f74182fb9e15cafd0cdf0821098a95cc17301807aed25634a18b66537ba51b  psutil-4.3.1.tar.gz
+md5	c9aa2599dcd9e5b59d71b6660d396062  psutil-5.2.0.tar.gz
+sha256  2fc91d068faa5613c093335f0e758673ef8c722ad4bfa4aded64c13ae69089eb  psutil-5.2.0.tar.gz
diff --git a/bsp/buildroot/package/python-psutil/python-psutil.mk b/bsp/buildroot/package/python-psutil/python-psutil.mk
index 10323188..2b41df74 100644
--- a/bsp/buildroot/package/python-psutil/python-psutil.mk
+++ b/bsp/buildroot/package/python-psutil/python-psutil.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PSUTIL_VERSION = 4.3.1
+PYTHON_PSUTIL_VERSION = 5.2.0
 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz
-PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/cc/f267a1371f229bf16db6a4e604428c3b032b823b83155bd33cef45e49a53
+PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/3c/2f/f3ab91349c666f009077157b12057e613a3152a46a6c3be883777546b6de
 PYTHON_PSUTIL_SETUP_TYPE = setuptools
-PYTHON_PSUTIL_LICENSE = BSD-3c
+PYTHON_PSUTIL_LICENSE = BSD-3-Clause
 PYTHON_PSUTIL_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pudb/python-pudb.hash b/bsp/buildroot/package/python-pudb/python-pudb.hash
index b06d5e8b..febf38f8 100644
--- a/bsp/buildroot/package/python-pudb/python-pudb.hash
+++ b/bsp/buildroot/package/python-pudb/python-pudb.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pudb/json, sha256 locally computed
-md5	4573b70163329c1cb59836a357bfdf7c  pudb-2016.2.tar.gz
-sha256	e958d7f7b1771cf297714e95054075df3b2a47455d7a740be4abbbd41289505a  pudb-2016.2.tar.gz
+md5 97597d9fec79494a83ec8d55987a8a82 pudb-2017.1.2.tar.gz
+sha256 29d82ed05030146e5f2f9431926cc24f6c6c284cb451a4a850625fc0303e46e7 pudb-2017.1.2.tar.gz
diff --git a/bsp/buildroot/package/python-pudb/python-pudb.mk b/bsp/buildroot/package/python-pudb/python-pudb.mk
index 5349c1e1..b6b3d538 100644
--- a/bsp/buildroot/package/python-pudb/python-pudb.mk
+++ b/bsp/buildroot/package/python-pudb/python-pudb.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PUDB_VERSION = 2016.2
+PYTHON_PUDB_VERSION = 2017.1.2
 PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz
-PYTHON_PUDB_SITE = https://pypi.python.org/packages/50/1a/d9b692e32afff09ccb5aa33c3d51c6d5a80efbb59de90307b33601e7fa62
+PYTHON_PUDB_SITE = https://pypi.python.org/packages/d3/8a/e0fa18cf6f939a63364117546c9bd933add800642004ad40fd5f5bdba0c6
 PYTHON_PUDB_SETUP_TYPE = setuptools
 PYTHON_PUDB_LICENSE = MIT
 PYTHON_PUDB_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk b/bsp/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk
index bb32227a..b5e853aa 100644
--- a/bsp/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk
+++ b/bsp/buildroot/package/python-pyasn-modules/python-pyasn-modules.mk
@@ -6,8 +6,8 @@
 
 PYTHON_PYASN_MODULES_VERSION = 0.0.8
 PYTHON_PYASN_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN_MODULES_VERSION).tar.gz
-PYTHON_PYASN_MODULES_SITE = http://pypi.python.org/packages/source/p/pyasn1-modules
-PYTHON_PYASN_MODULES_LICENSE = BSD-2c
+PYTHON_PYASN_MODULES_SITE = https://pypi.python.org/packages/source/p/pyasn1-modules
+PYTHON_PYASN_MODULES_LICENSE = BSD-2-Clause
 PYTHON_PYASN_MODULES_LICENSE_FILES = LICENSE.txt
 PYTHON_PYASN_MODULES_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-pyasn/Config.in b/bsp/buildroot/package/python-pyasn/Config.in
index 997b737f..2396194d 100644
--- a/bsp/buildroot/package/python-pyasn/Config.in
+++ b/bsp/buildroot/package/python-pyasn/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_PYTHON_PYASN
 	  perform very fast IP address to Autonomous System Number
 	  lookups.
 
-	  https://code.google.com/p/pyasn/
+	  https://github.com/hadiasghari/pyasn
 
 comment "python-pyasn needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/python-pyasn/python-pyasn.mk b/bsp/buildroot/package/python-pyasn/python-pyasn.mk
index 80d18cd1..f34520f8 100644
--- a/bsp/buildroot/package/python-pyasn/python-pyasn.mk
+++ b/bsp/buildroot/package/python-pyasn/python-pyasn.mk
@@ -7,8 +7,8 @@
 PYTHON_PYASN_VERSION = 0.1.9
 PYTHON_PYASN_SOURCE = pyasn1-$(PYTHON_PYASN_VERSION).tar.gz
 PYTHON_PYASN_SITE = https://pypi.python.org/packages/source/p/pyasn1
-PYTHON_PYASN_LICENSE = BSD-2c
+PYTHON_PYASN_LICENSE = BSD-2-Clause
 PYTHON_PYASN_LICENSE_FILES = LICENSE.txt
-PYTHON_PYASN_SETUP_TYPE = distutils
+PYTHON_PYASN_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pycli/python-pycli.hash b/bsp/buildroot/package/python-pycli/python-pycli.hash
index 8be31787..46a297e6 100644
--- a/bsp/buildroot/package/python-pycli/python-pycli.hash
+++ b/bsp/buildroot/package/python-pycli/python-pycli.hash
@@ -1,4 +1,3 @@
-# From https://pypi.python.org/pypi?:action=show_md5&digest=5cad880168f3423a1235b396735c1360
-md5 5cad880168f3423a1235b396735c1360 pyCLI-devel.tar.gz
-# Locally calculated
-sha256 d7dc3245d79ef00ba5c0d6b008eb3d1a519c0df4cfa4467eee5160a80c6ddc0a pyCLI-devel.tar.gz
+# md5 from https://pypi.python.org/pypi/pycli/json, sha256 locally computed
+md5 89c487e7c8068ce05d63394d2ae7ebad pyCLI-2.0.3.tar.gz
+sha256 bc53e6c5db031ae1c05d131641f153d22a201c5e82cc8c9324a945752efbb622 pyCLI-2.0.3.tar.gz
diff --git a/bsp/buildroot/package/python-pycli/python-pycli.mk b/bsp/buildroot/package/python-pycli/python-pycli.mk
index 8e48a065..7aff1c62 100644
--- a/bsp/buildroot/package/python-pycli/python-pycli.mk
+++ b/bsp/buildroot/package/python-pycli/python-pycli.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYCLI_VERSION = devel
+PYTHON_PYCLI_VERSION = 2.0.3
 PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz
-PYTHON_PYCLI_SITE = https://pypi.python.org/packages/source/p/pyCLI
+PYTHON_PYCLI_SITE = https://pypi.python.org/packages/95/fc/b2d86a5fbdac4072bcf70b01674b612e1a13026f54962c878fe3eca36fd1
 PYTHON_PYCLI_LICENSE = ISC-like
 PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py
 PYTHON_PYCLI_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-pycparser/python-pycparser.hash b/bsp/buildroot/package/python-pycparser/python-pycparser.hash
index a87bfd44..25747c3a 100644
--- a/bsp/buildroot/package/python-pycparser/python-pycparser.hash
+++ b/bsp/buildroot/package/python-pycparser/python-pycparser.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=a2bc8d28c923b4fe2b2c3b4b51a4f935, sha256 locally computed
-md5     a2bc8d28c923b4fe2b2c3b4b51a4f935  pycparser-2.14.tar.gz
-sha256  7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73  pycparser-2.14.tar.gz
+# md5 from https://pypi.python.org/pypi/pycparser/json, sha256 locally computed
+md5 ca98dcb50bc1276f230118f6af5a40c7 pycparser-2.17.tar.gz
+sha256 0aac31e917c24cb3357f5a4d5566f2cc91a19ca41862f6c3c22dc60a629673b6 pycparser-2.17.tar.gz
diff --git a/bsp/buildroot/package/python-pycparser/python-pycparser.mk b/bsp/buildroot/package/python-pycparser/python-pycparser.mk
index a32f1aa2..08a22b45 100644
--- a/bsp/buildroot/package/python-pycparser/python-pycparser.mk
+++ b/bsp/buildroot/package/python-pycparser/python-pycparser.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PYCPARSER_VERSION = 2.14
+PYTHON_PYCPARSER_VERSION = 2.17
 PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz
-PYTHON_PYCPARSER_SITE = https://pypi.python.org/packages/source/p/pycparser
+PYTHON_PYCPARSER_SITE = https://pypi.python.org/packages/be/64/1bb257ffb17d01f4a38d7ce686809a736837ad4371bcc5c42ba7a715c3ac
 PYTHON_PYCPARSER_SETUP_TYPE = setuptools
-PYTHON_PYCPARSER_LICENSE = BSD-3c
+PYTHON_PYCPARSER_LICENSE = BSD-3-Clause
 PYTHON_PYCPARSER_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pydal/python-pydal.hash b/bsp/buildroot/package/python-pydal/python-pydal.hash
index ad17c33c..9a3fad37 100644
--- a/bsp/buildroot/package/python-pydal/python-pydal.hash
+++ b/bsp/buildroot/package/python-pydal/python-pydal.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pydal/json, sha256 locally computed
-md5	74c6cc43d5ee57bcffa804c1204030d8  pyDAL-16.9.tar.gz
-sha256	e5e18b10df044c4328a5a2fe0400793a8f643fe3526daee8c99103fc5589476e  pyDAL-16.9.tar.gz
+md5 5a6ad0db15dc39987b4518247a9d0b4b pyDAL-17.8.tar.gz
+sha256 46abe2c978ec24013e29cf485a74c90309ebcd2f0d577687ff2d224547cebfc8  pyDAL-17.8.tar.gz
diff --git a/bsp/buildroot/package/python-pydal/python-pydal.mk b/bsp/buildroot/package/python-pydal/python-pydal.mk
index a0e9729d..c8d4b44c 100644
--- a/bsp/buildroot/package/python-pydal/python-pydal.mk
+++ b/bsp/buildroot/package/python-pydal/python-pydal.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_PYDAL_VERSION = 16.9
+PYTHON_PYDAL_VERSION = 17.8
 PYTHON_PYDAL_SOURCE = pyDAL-$(PYTHON_PYDAL_VERSION).tar.gz
-PYTHON_PYDAL_SITE = https://pypi.python.org/packages/31/cb/7537f8d848106e3e4b4063955395a5dc3177c32c2cd2cc0a1938a486d4fa
-PYTHON_PYDAL_LICENSE = BSD-3c
+PYTHON_PYDAL_SITE = https://pypi.python.org/packages/e3/bd/1d5ca8be486d845074161456637f7d73acc09dc6c8d69bf0e7ad55ce9027
+PYTHON_PYDAL_LICENSE = BSD-3-Clause
 PYTHON_PYDAL_LICENSE_FILES = LICENSE
 PYTHON_PYDAL_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash b/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash
index 9726f9f7..3ed16018 100644
--- a/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash
+++ b/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=61b23e2362df23d0dfa5fe76f6e2ab55, sha256 locally computed
-md5  61b23e2362df23d0dfa5fe76f6e2ab55  pyftpdlib-1.5.1.tar.gz
-sha256  7bcd7fc825123414a157718c6dcdcb0978208d3c865d4650564acef4acce3354  pyftpdlib-1.5.1.tar.gz
+# md5 from https://pypi.python.org/pypi/pyftpdlib/json, sha256 locally computed
+md5	f1c7e7f859b3310769149dea4ac26916  pyftpdlib-1.5.3.tar.gz
+sha256	7b9ea701f91bee280c5a930a9c4ceaea91b6d4aaf82b8b8ede82fb84a32081a7  pyftpdlib-1.5.3.tar.gz
+sha256  18a4ff1ddf890838e36504b307581e3eb42c890a7272ce28b18b3ce1205b7ea8  LICENSE
diff --git a/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk b/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk
index 85d0b56a..a34b563c 100644
--- a/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk
+++ b/bsp/buildroot/package/python-pyftpdlib/python-pyftpdlib.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYFTPDLIB_VERSION = 1.5.1
+PYTHON_PYFTPDLIB_VERSION = 1.5.3
 PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz
-PYTHON_PYFTPDLIB_SITE = https://pypi.python.org/packages/a8/f8/0f6db156898616dbcbd7bf865660295c81479071ab0fcd1898fe1b3a4fc4
+PYTHON_PYFTPDLIB_SITE = https://pypi.python.org/packages/c5/fb/74f6425fbb7f2a87969e1aa01bb9684601de431a3488b95f64509bf985ef
 PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools
 PYTHON_PYFTPDLIB_LICENSE = MIT
 PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-pygame/Config.in b/bsp/buildroot/package/python-pygame/Config.in
index 932b0f12..0a738527 100644
--- a/bsp/buildroot/package/python-pygame/Config.in
+++ b/bsp/buildroot/package/python-pygame/Config.in
@@ -2,9 +2,10 @@ config BR2_PACKAGE_PYTHON_PYGAME
 	bool "python-pygame"
 	select BR2_PACKAGE_SDL
 	help
-	  Pygame is a cross-platfrom library designed to make it easy to write
-	  multimedia software, such as games, in Python. Pygame requires the
-	  Python language and SDL multimedia library.
+	  Pygame is a cross-platfrom library designed to make it easy
+	  to write multimedia software, such as games, in
+	  Python. Pygame requires the Python language and SDL
+	  multimedia library.
 	  It can also make use of several other popular libraries.
 
 	  http://www.pygame.org/
@@ -23,7 +24,8 @@ config BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES
 	bool "pygame.examples"
 	help
 	  Include examples.
-	  Selecting this option adds about 1.5 MB to the target file system.
+	  Selecting this option adds about 1.5 MB to the target file
+	  system.
 
 config BR2_PACKAGE_PYTHON_PYGAME_FONT
 	bool "pygame.font"
diff --git a/bsp/buildroot/package/python-pygame/python-pygame.mk b/bsp/buildroot/package/python-pygame/python-pygame.mk
index 1ef2bdf6..8deb42a9 100644
--- a/bsp/buildroot/package/python-pygame/python-pygame.mk
+++ b/bsp/buildroot/package/python-pygame/python-pygame.mk
@@ -11,7 +11,7 @@ PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz
 PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame
 PYTHON_PYGAME_SITE_METHOD = hg
 PYTHON_PYGAME_SETUP_TYPE = distutils
-PYTHON_PYGAME_LICENSE = LGPLv2.1+
+PYTHON_PYGAME_LICENSE = LGPL-2.1+
 PYTHON_PYGAME_LICENSE_FILES = LGPL
 
 ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y)
diff --git a/bsp/buildroot/package/python-pygments/python-pygments.hash b/bsp/buildroot/package/python-pygments/python-pygments.hash
index 2af1597f..525aa0e2 100644
--- a/bsp/buildroot/package/python-pygments/python-pygments.hash
+++ b/bsp/buildroot/package/python-pygments/python-pygments.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pygments/json, sha256 locally computed
-md5	ed3fba2467c8afcda4d317e4ef2c6150  Pygments-2.1.3.tar.gz
-sha256	88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81  Pygments-2.1.3.tar.gz
+md5 13037baca42f16917cbd5ad2fab50844 Pygments-2.2.0.tar.gz
+sha256 dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc Pygments-2.2.0.tar.gz
diff --git a/bsp/buildroot/package/python-pygments/python-pygments.mk b/bsp/buildroot/package/python-pygments/python-pygments.mk
index 16ed90dc..6e7eae69 100644
--- a/bsp/buildroot/package/python-pygments/python-pygments.mk
+++ b/bsp/buildroot/package/python-pygments/python-pygments.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_PYGMENTS_VERSION = 2.1.3
+PYTHON_PYGMENTS_VERSION = 2.2.0
 PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz
-PYTHON_PYGMENTS_SITE = https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504
-PYTHON_PYGMENTS_LICENSE = BSD-2c
+PYTHON_PYGMENTS_SITE = https://pypi.python.org/packages/71/2a/2e4e77803a8bd6408a2903340ac498cb0a2181811af7c9ec92cb70b0308a
+PYTHON_PYGMENTS_LICENSE = BSD-2-Clause
 PYTHON_PYGMENTS_LICENSE_FILES = LICENSE
 PYTHON_PYGMENTS_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-pyicu/Config.in b/bsp/buildroot/package/python-pyicu/Config.in
index a3578f10..2d9624c1 100644
--- a/bsp/buildroot/package/python-pyicu/Config.in
+++ b/bsp/buildroot/package/python-pyicu/Config.in
@@ -1,13 +1,17 @@
 config BR2_PACKAGE_PYTHON_PYICU
 	bool "python-pyicu"
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
 	depends on !BR2_BINFMT_FLAT # icu
 	depends on BR2_INSTALL_LIBSTDCPP # icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
 	select BR2_PACKAGE_ICU
 	help
 	  Python extension wrapping the ICU C++ API.
 
-	  http://pyicu.osafoundation.org/
+	  https://github.com/ovalhub/pyicu
 
-comment "python-pyicu needs a toolchain w/ C++"
+comment "python-pyicu needs a toolchain w/ C++, gcc >= 4.8, host gcc >= 4.8"
 	depends on !BR2_BINFMT_FLAT
-	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
diff --git a/bsp/buildroot/package/python-pyicu/python-pyicu.hash b/bsp/buildroot/package/python-pyicu/python-pyicu.hash
index 69edba83..b0d75fd0 100644
--- a/bsp/buildroot/package/python-pyicu/python-pyicu.hash
+++ b/bsp/buildroot/package/python-pyicu/python-pyicu.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/PyICU/json, sha256 locally computed
-md5	30f85b7272f15b26c110c9f3e3a9e7a0  PyICU-1.9.5.tar.gz
-sha256	73b052b800861fae3281dbaf9c92d12a81cabf3d31912d94c51862e093ef359b  PyICU-1.9.5.tar.gz
+md5 7656f5cc53a7c18b40e653d6eefdee14   PyICU-1.9.7.tar.gz
+sha256 db27cd1cc150b879c5465872bec7fdaf340eca140aa922be03891d5b9f855b61  PyICU-1.9.7.tar.gz
diff --git a/bsp/buildroot/package/python-pyicu/python-pyicu.mk b/bsp/buildroot/package/python-pyicu/python-pyicu.mk
index 5c014213..c6587c39 100644
--- a/bsp/buildroot/package/python-pyicu/python-pyicu.mk
+++ b/bsp/buildroot/package/python-pyicu/python-pyicu.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYICU_VERSION = 1.9.5
+PYTHON_PYICU_VERSION = 1.9.7
 PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz
-PYTHON_PYICU_SITE = https://pypi.python.org/packages/a2/9f/1947f288143191b903e58633ee597cb98bc284de28dafb1231b6f8b67b99
+PYTHON_PYICU_SITE = https://pypi.python.org/packages/6e/88/f42a1297909ca6d9113ba37b37067011ae29432fe592fdd98cf52ad23b77
 PYTHON_PYICU_LICENSE = MIT
 PYTHON_PYICU_LICENSE_FILES = LICENSE
 PYTHON_PYICU_DEPENDENCIES = icu
diff --git a/bsp/buildroot/package/python-pylibftdi/0001-do-not-use-find-library.patch b/bsp/buildroot/package/python-pylibftdi/0001-do-not-use-find-library.patch
new file mode 100644
index 00000000..192ed43e
--- /dev/null
+++ b/bsp/buildroot/package/python-pylibftdi/0001-do-not-use-find-library.patch
@@ -0,0 +1,31 @@
+Hard code library loading
+
+Shortcut the search for the libraries in case the built in
+find_library is broken.
+
+As buildroot does not ship any of the external programs that the core
+procedure use to find libraries use the canonical name of the shared
+object and load it.
+
+In this case this affects loading libftdi and libusb.
+
+This should be reliable as we specify said libs as dependencies of
+this package.
+
+Signed-off-by: Christian Kellermann <christian.kellermann@solectrix.de>
+
+---
+diff -purN pylibftdi-0.15.0.orig/pylibftdi/driver.py pylibftdi-0.15.0/pylibftdi/driver.py
+--- pylibftdi-0.15.0.orig/pylibftdi/driver.py	2015-04-26 22:41:39.000000000 +0200
++++ pylibftdi-0.15.0/pylibftdi/driver.py	2017-02-27 13:08:56.502958000 +0100
+@@ -121,8 +121,8 @@ class Driver(object):
+                     lib = getattr(cdll, lib_path)
+                     break
+         if lib is None:
+-            raise LibraryMissingError('{} library not found (search: {})'.format(
+-                name, search_list))
++            return cdll.LoadLibrary(name + '.so')
++
+         return lib
+ 
+     @property
diff --git a/bsp/buildroot/package/python-pylibftdi/Config.in b/bsp/buildroot/package/python-pylibftdi/Config.in
new file mode 100644
index 00000000..d3409746
--- /dev/null
+++ b/bsp/buildroot/package/python-pylibftdi/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_PYLIBFTDI
+	bool "python-pylibftdi"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBFTDI
+	help
+	  This package contains the python language binding libftdi.
+
+	  https://pypi.python.org/pypi/pylibftdi
+
+comment "python-pylibftdi needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/python-pylibftdi/python-pylibftdi.hash b/bsp/buildroot/package/python-pylibftdi/python-pylibftdi.hash
new file mode 100644
index 00000000..54b33a11
--- /dev/null
+++ b/bsp/buildroot/package/python-pylibftdi/python-pylibftdi.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/pylibftdi/json, sha256 locally computed
+md5  eaee7fb3a67f33a35a164a9628daaafe pylibftdi-0.15.0.tar.gz
+sha256  51ef08ebcc4ec3eaec2366e9648d3f8fa1b737ea507a7f3a374ac58abf148e77 pylibftdi-0.15.0.tar.gz
diff --git a/bsp/buildroot/package/python-pylibftdi/python-pylibftdi.mk b/bsp/buildroot/package/python-pylibftdi/python-pylibftdi.mk
new file mode 100644
index 00000000..0a5887b2
--- /dev/null
+++ b/bsp/buildroot/package/python-pylibftdi/python-pylibftdi.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-pylibftdi
+#
+################################################################################
+
+PYTHON_PYLIBFTDI_VERSION = 0.15.0
+PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz
+PYTHON_PYLIBFTDI_SITE = https://pypi.python.org/packages/e5/bb/d7a86dbd7685e3866ea75d21c6c726d01706fdc0aa5dc9051ce18ae65693
+PYTHON_PYLIBFTDI_LICENSE = MIT
+PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt
+PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi
+PYTHON_PYLIBFTDI_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pylru/python-pylru.mk b/bsp/buildroot/package/python-pylru/python-pylru.mk
index e670f3d1..75b6de77 100644
--- a/bsp/buildroot/package/python-pylru/python-pylru.mk
+++ b/bsp/buildroot/package/python-pylru/python-pylru.mk
@@ -8,7 +8,7 @@ PYTHON_PYLRU_VERSION = 1.0.9
 PYTHON_PYLRU_SOURCE = pylru-$(PYTHON_PYLRU_VERSION).tar.gz
 PYTHON_PYLRU_SITE = https://pypi.python.org/packages/c0/7d/0de1055632f3871dfeaabe5a3f0510317cd98b93e7b792b44e4c7de2b17b
 PYTHON_PYLRU_SETUP_TYPE = distutils
-PYTHON_PYLRU_LICENSE = GPLv2
+PYTHON_PYLRU_LICENSE = GPL-2.0
 PYTHON_PYLRU_LICENSE_FILES = LICENSE.txt
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pymysql/python-pymysql.hash b/bsp/buildroot/package/python-pymysql/python-pymysql.hash
index 9e058abf..429ed5ae 100644
--- a/bsp/buildroot/package/python-pymysql/python-pymysql.hash
+++ b/bsp/buildroot/package/python-pymysql/python-pymysql.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pymysql/json, sha256 locally computed
-md5	bf82311ac2df4c43adad003a8c805b90  PyMySQL-0.7.9.tar.gz
-sha256	2331f82b7b85d407c8d9d7a8d7901a6abbeb420533e5d5d64ded5009b5c6dcc3  PyMySQL-0.7.9.tar.gz
+md5 fc96ba7c76c01ff0613b0cca9c40df75 PyMySQL-0.7.10.tar.gz
+sha256 9468bd7d54df68e49c39e91d7c223d13dedf9e4284173cb5d761673e6275024e PyMySQL-0.7.10.tar.gz
diff --git a/bsp/buildroot/package/python-pymysql/python-pymysql.mk b/bsp/buildroot/package/python-pymysql/python-pymysql.mk
index 94a93a26..863eb8be 100644
--- a/bsp/buildroot/package/python-pymysql/python-pymysql.mk
+++ b/bsp/buildroot/package/python-pymysql/python-pymysql.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYMYSQL_VERSION = 0.7.9
+PYTHON_PYMYSQL_VERSION = 0.7.10
 PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz
-PYTHON_PYMYSQL_SITE = https://pypi.python.org/packages/a4/c4/c15457f261fda9839637de044eca9b6da8f55503183fe887523801b85701
+PYTHON_PYMYSQL_SITE = https://pypi.python.org/packages/90/c2/d81638491baa572d6e79b78bde42c7449d2e45b578c919c0df1a76cb859b
 PYTHON_PYMYSQL_LICENSE = MIT
 PYTHON_PYMYSQL_LICENSE_FILES = LICENSE
 PYTHON_PYMYSQL_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-pynacl/Config.in b/bsp/buildroot/package/python-pynacl/Config.in
index 5a53648c..256f9d5e 100644
--- a/bsp/buildroot/package/python-pynacl/Config.in
+++ b/bsp/buildroot/package/python-pynacl/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYNACL
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_CFFI # runtime
 	help
-	  Python binding to the Networking and Cryptography (NaCl) library.
+	  Python binding to the Networking and Cryptography (NaCl)
+	  library.
 
 	  https://pypi.python.org/pypi/PyNaCl
diff --git a/bsp/buildroot/package/python-pynacl/python-pynacl.mk b/bsp/buildroot/package/python-pynacl/python-pynacl.mk
index e1769b8f..469ddda4 100644
--- a/bsp/buildroot/package/python-pynacl/python-pynacl.mk
+++ b/bsp/buildroot/package/python-pynacl/python-pynacl.mk
@@ -6,7 +6,7 @@
 
 PYTHON_PYNACL_VERSION = 1.0.1
 PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz
-PYTHON_PYNACL_SITE = http://pypi.python.org/packages/source/P/PyNaCl
+PYTHON_PYNACL_SITE = https://pypi.python.org/packages/source/P/PyNaCl
 PYTHON_PYNACL_LICENSE = Apache-2.0
 PYTHON_PYNACL_LICENSE_FILES = LICENSE
 PYTHON_PYNACL_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.hash b/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.hash
index 894c4f8b..74fa4e56 100644
--- a/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.hash
+++ b/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pyopenssl/json, sha256 locally computed
-md5     6635503758c65ea6f70d18d1b18e46d5  pyOpenSSL-16.2.0.tar.gz
-sha256  7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e  pyOpenSSL-16.2.0.tar.gz
+md5 0704ca95106960375cfe78259453094a  pyOpenSSL-17.0.0.tar.gz
+sha256 48abfe9d2bb8eb8d8947c8452b0223b7b1be2383b332f3b4f248fe59ef0bafdd  pyOpenSSL-17.0.0.tar.gz
diff --git a/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.mk b/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.mk
index a5312a06..3fbaf8d1 100644
--- a/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.mk
+++ b/bsp/buildroot/package/python-pyopenssl/python-pyopenssl.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYOPENSSL_VERSION = 16.2.0
+PYTHON_PYOPENSSL_VERSION = 17.0.0
 PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz
-PYTHON_PYOPENSSL_SITE = https://pypi.python.org/packages/0c/d6/b1fe519846a21614fa4f8233361574eddb223e0bc36b182140d916acfb3b
+PYTHON_PYOPENSSL_SITE = https://pypi.python.org/packages/9f/32/80fe4fddeb731b7766cd09fe0b2032a91b43dae655e216792af2a6ae3190
 PYTHON_PYOPENSSL_LICENSE = Apache-2.0
 PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE
 PYTHON_PYOPENSSL_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-pyparsing/Config.in b/bsp/buildroot/package/python-pyparsing/Config.in
index b926286c..425ffe32 100644
--- a/bsp/buildroot/package/python-pyparsing/Config.in
+++ b/bsp/buildroot/package/python-pyparsing/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_PYTHON_PYPARSING
 	bool "python-pyparsing"
 	help
-	  The pyparsing module is an alternative approach to creating and
-	  executing simple grammars, vs. the traditional lex/yacc approach,
-	  or the use of regular expressions. The pyparsing module provides
-	  a library of classes that client code uses to construct the grammar
-	  directly in Python code.
+	  The pyparsing module is an alternative approach to creating
+	  and executing simple grammars, vs. the traditional lex/yacc
+	  approach, or the use of regular expressions. The pyparsing
+	  module provides a library of classes that client code uses
+	  to construct the grammar directly in Python code.
 
 	  http://pyparsing.wikispaces.com/
diff --git a/bsp/buildroot/package/python-pyparsing/python-pyparsing.hash b/bsp/buildroot/package/python-pyparsing/python-pyparsing.hash
index 6cf686a8..61385804 100644
--- a/bsp/buildroot/package/python-pyparsing/python-pyparsing.hash
+++ b/bsp/buildroot/package/python-pyparsing/python-pyparsing.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pyparsing/json, sha256 locally computed
-md5	ee943c354eac79526533c58342f322c7  pyparsing-2.1.9.tar.gz
-sha256	93326f5490bcfe7069806ff342692e75f72529cfa82f20683b5fceeb5d4a7fc2  pyparsing-2.1.9.tar.gz
+md5 065908b92904e0d3634eb156f44cc80e pyparsing-2.1.10.tar.gz
+sha256 811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188 pyparsing-2.1.10.tar.gz
diff --git a/bsp/buildroot/package/python-pyparsing/python-pyparsing.mk b/bsp/buildroot/package/python-pyparsing/python-pyparsing.mk
index 652345d3..4a4b1bb8 100644
--- a/bsp/buildroot/package/python-pyparsing/python-pyparsing.mk
+++ b/bsp/buildroot/package/python-pyparsing/python-pyparsing.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYPARSING_VERSION = 2.1.9
+PYTHON_PYPARSING_VERSION = 2.1.10
 PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz
-PYTHON_PYPARSING_SITE = https://pypi.python.org/packages/87/ee/6f3a94d834c82a5c1a74f2fc77775ff05b5fbbf7d97f844e6fff5e2ff94b
+PYTHON_PYPARSING_SITE = https://pypi.python.org/packages/38/bb/bf325351dd8ab6eb3c3b7c07c3978f38b2103e2ab48d59726916907cd6fb
 PYTHON_PYPARSING_LICENSE = MIT
 PYTHON_PYPARSING_LICENSE_FILES = LICENSE
 PYTHON_PYPARSING_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-pyparted/Config.in b/bsp/buildroot/package/python-pyparted/Config.in
index 15015955..944796ff 100644
--- a/bsp/buildroot/package/python-pyparted/Config.in
+++ b/bsp/buildroot/package/python-pyparted/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYPARTED
 	bool "python-pyparted"
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_PYTHON_CFFI # runtime
 	select BR2_PACKAGE_PARTED
 	help
 	  Python bindings for GNU parted (libparted).
diff --git a/bsp/buildroot/package/python-pyparted/python-pyparted.hash b/bsp/buildroot/package/python-pyparted/python-pyparted.hash
index a2adc410..11995fb8 100644
--- a/bsp/buildroot/package/python-pyparted/python-pyparted.hash
+++ b/bsp/buildroot/package/python-pyparted/python-pyparted.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  5914e3a60437fe3e3758a9e86ee4a539dfa46cfe18e3df386a5cf1f75a963431  python-pyparted-v3.10.7.tar.gz
+sha256  a9ec181bf3c7c0635862413fc86cb0950b5af957541535f530ea86a0f9d14e73  python-pyparted-v3.11.0.tar.gz
diff --git a/bsp/buildroot/package/python-pyparted/python-pyparted.mk b/bsp/buildroot/package/python-pyparted/python-pyparted.mk
index 4bf58c49..03788308 100644
--- a/bsp/buildroot/package/python-pyparted/python-pyparted.mk
+++ b/bsp/buildroot/package/python-pyparted/python-pyparted.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PYPARTED_VERSION = v3.10.7
+PYTHON_PYPARTED_VERSION = v3.11.0
 PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,$(PYTHON_PYPARTED_VERSION))
 PYTHON_PYPARTED_SETUP_TYPE = distutils
-PYTHON_PYPARTED_LICENSE = GPLv2+
+PYTHON_PYPARTED_LICENSE = GPL-2.0+
 PYTHON_PYPARTED_LICENSE_FILES = COPYING
-PYTHON_PYPARTED_DEPENDENCIES = host-python-cffi parted
+PYTHON_PYPARTED_DEPENDENCIES = parted
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pypcap/Config.in b/bsp/buildroot/package/python-pypcap/Config.in
index ed336ca3..9b71575c 100644
--- a/bsp/buildroot/package/python-pypcap/Config.in
+++ b/bsp/buildroot/package/python-pypcap/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_PYTHON_PYPCAP
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_LIBPCAP
 	help
-	  The pypcap module is an object-oriented wrapper of the C libpcap library.
+	  The pypcap module is an object-oriented wrapper of the C
+	  libpcap library.
 
 	  https://code.google.com/p/pypcap/
diff --git a/bsp/buildroot/package/python-pypcap/python-pypcap.mk b/bsp/buildroot/package/python-pypcap/python-pypcap.mk
index 97d07f86..fc6fc6ed 100644
--- a/bsp/buildroot/package/python-pypcap/python-pypcap.mk
+++ b/bsp/buildroot/package/python-pypcap/python-pypcap.mk
@@ -6,15 +6,15 @@
 
 PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390
 PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION))
-PYTHON_PYPCAP_LICENSE = BSD-3c
+PYTHON_PYPCAP_LICENSE = BSD-3-Clause
 PYTHON_PYPCAP_LICENSE_FILES = LICENSE
 PYTHON_PYPCAP_SETUP_TYPE = distutils
 PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap
 
 define PYTHON_PYPCAP_CONFIGURE_CMDS
-	$(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/pyrexc $(@D)/pcap.pyx
+	$(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/pyrexc $(@D)/pcap.pyx
 	(cd $(@D); \
-		$(HOST_DIR)/usr/bin/python setup.py \
+		$(HOST_DIR)/bin/python setup.py \
 		config --with-pcap=$(STAGING_DIR)/usr)
 endef
 
diff --git a/bsp/buildroot/package/python-pyqrcode/python-pyqrcode.mk b/bsp/buildroot/package/python-pyqrcode/python-pyqrcode.mk
index 67e167a4..f3eac5a3 100644
--- a/bsp/buildroot/package/python-pyqrcode/python-pyqrcode.mk
+++ b/bsp/buildroot/package/python-pyqrcode/python-pyqrcode.mk
@@ -8,7 +8,7 @@ PYTHON_PYQRCODE_VERSION = 1.2.1
 PYTHON_PYQRCODE_SOURCE = PyQRCode-$(PYTHON_PYQRCODE_VERSION).tar.gz
 PYTHON_PYQRCODE_SITE = https://pypi.python.org/packages/37/61/f07226075c347897937d4086ef8e55f0a62ae535e28069884ac68d979316
 PYTHON_PYQRCODE_SETUP_TYPE = setuptools
-PYTHON_PYQRCODE_LICENSE = BSD-3c
+PYTHON_PYQRCODE_LICENSE = BSD-3-Clause
 PYTHON_PYQRCODE_LICENSE_FILES = setup.py
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pyqt/python-pyqt.mk b/bsp/buildroot/package/python-pyqt/python-pyqt.mk
index 50e83517..e8ae6416 100644
--- a/bsp/buildroot/package/python-pyqt/python-pyqt.mk
+++ b/bsp/buildroot/package/python-pyqt/python-pyqt.mk
@@ -7,7 +7,7 @@
 PYTHON_PYQT_VERSION = 4.11.3
 PYTHON_PYQT_SOURCE = PyQt-x11-gpl-$(PYTHON_PYQT_VERSION).tar.gz
 PYTHON_PYQT_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-$(PYTHON_PYQT_VERSION)
-PYTHON_PYQT_LICENSE = GPLv2 or GPLv3
+PYTHON_PYQT_LICENSE = GPL-2.0 or GPL-3.0
 PYTHON_PYQT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3
 
 PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt
@@ -72,7 +72,7 @@ endef
 PYTHON_PYQT_CONF_OPTS = \
 	--bindir $(TARGET_DIR)/usr/bin \
 	--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages \
-	--qmake $(HOST_DIR)/usr/bin/qmake \
+	--qmake $(HOST_DIR)/bin/qmake \
 	--sysroot $(STAGING_DIR)/usr \
 	-w --confirm-license \
 	--no-designer-plugin \
@@ -84,7 +84,7 @@ PYTHON_PYQT_CONF_OPTS = \
 # Python 3.x.
 ifeq ($(BR2_PACKAGE_PYTHON),y)
 PYTHON_PYQT_CONF_OPTS += \
-	--vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR)  \
+	--vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR) \
 	--vendorid-libdir $(STAGING_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/config
 endif
 
@@ -93,7 +93,7 @@ define PYTHON_PYQT_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) \
 		$(TARGET_CONFIGURE_OPTS) \
-		$(HOST_DIR)/usr/bin/python configure-ng.py \
+		$(HOST_DIR)/bin/python configure-ng.py \
 			$(PYTHON_PYQT_CONF_OPTS) \
 	)
 endef
diff --git a/bsp/buildroot/package/python-pyqt5/python-pyqt5.mk b/bsp/buildroot/package/python-pyqt5/python-pyqt5.mk
index e58ee5ad..cde026ef 100644
--- a/bsp/buildroot/package/python-pyqt5/python-pyqt5.mk
+++ b/bsp/buildroot/package/python-pyqt5/python-pyqt5.mk
@@ -7,7 +7,7 @@
 PYTHON_PYQT5_VERSION = 5.7
 PYTHON_PYQT5_SOURCE = PyQt5_gpl-$(PYTHON_PYQT5_VERSION).tar.gz
 PYTHON_PYQT5_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$(PYTHON_PYQT5_VERSION)
-PYTHON_PYQT5_LICENSE = GPLv3
+PYTHON_PYQT5_LICENSE = GPL-3.0
 PYTHON_PYQT5_LICENSE_FILES = LICENSE
 
 PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base
@@ -47,7 +47,7 @@ endef
 PYTHON_PYQT5_CONF_OPTS = \
 	--bindir $(TARGET_DIR)/usr/bin \
 	--destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \
-	--qmake $(HOST_DIR)/usr/bin/qmake \
+	--qmake $(HOST_DIR)/bin/qmake \
 	--sysroot $(STAGING_DIR)/usr \
 	-w --confirm-license \
 	--no-designer-plugin \
@@ -59,7 +59,7 @@ define PYTHON_PYQT5_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_MAKE_ENV) \
 		$(TARGET_CONFIGURE_OPTS) \
-		$(HOST_DIR)/usr/bin/python configure.py \
+		$(HOST_DIR)/bin/python configure.py \
 			$(PYTHON_PYQT5_CONF_OPTS) \
 	)
 endef
diff --git a/bsp/buildroot/package/python-pyrex/python-pyrex.mk b/bsp/buildroot/package/python-pyrex/python-pyrex.mk
index 6ddb2dcf..6284a5f2 100644
--- a/bsp/buildroot/package/python-pyrex/python-pyrex.mk
+++ b/bsp/buildroot/package/python-pyrex/python-pyrex.mk
@@ -7,7 +7,7 @@
 PYTHON_PYREX_VERSION = 0.9.9
 PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz
 PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex
-PYTHON_PYREX_LICENSE = Apache-v2
+PYTHON_PYREX_LICENSE = Apache-2.0
 PYTHON_PYREX_LICENSE_FILES = LICENSE.txt
 PYTHON_PYREX_SETUP_TYPE = distutils
 HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2
diff --git a/bsp/buildroot/package/python-pyro/Config.in b/bsp/buildroot/package/python-pyro/Config.in
index eb998c39..6372a1d3 100644
--- a/bsp/buildroot/package/python-pyro/Config.in
+++ b/bsp/buildroot/package/python-pyro/Config.in
@@ -2,8 +2,9 @@ config BR2_PACKAGE_PYTHON_PYRO
 	bool "python-pyro"
 	depends on BR2_PACKAGE_PYTHON
 	help
-	  python-pyro is a Python library stands for PYthon Remote Objects.
-	  It is an advanced and powerful Distributed Object Technology system
-	  written entirely in Python, that is designed to be very easy to use..
+	  python-pyro is a Python library stands for PYthon Remote
+	  Objects. It is an advanced and powerful Distributed Object
+	  Technology system written entirely in Python, that is
+	  designed to be very easy to use..
 
 	  https://pypi.python.org/pypi/Pyro/
diff --git a/bsp/buildroot/package/python-pyro/python-pyro.hash b/bsp/buildroot/package/python-pyro/python-pyro.hash
index 65ff0ae4..4db42efe 100644
--- a/bsp/buildroot/package/python-pyro/python-pyro.hash
+++ b/bsp/buildroot/package/python-pyro/python-pyro.hash
@@ -1,2 +1,3 @@
-# locally computed
-sha256  f01e32f8d1c3f427c4916e13d9e8cee24dbf924f72922a06591515911bd13756  Pyro-3.14.tar.gz
+# md5 from https://pypi.python.org/pypi/pyro/json, sha256 locally computed
+md5 59d4d3f4a8786776c9d7f9051b8f1a69 Pyro-3.16.tar.gz
+sha256 1bed508453ef7a7556b51424a58101af2349b662baab7e7331c5cb85dbe7e578 Pyro-3.16.tar.gz
diff --git a/bsp/buildroot/package/python-pyro/python-pyro.mk b/bsp/buildroot/package/python-pyro/python-pyro.mk
index 26c026e8..06b4f457 100644
--- a/bsp/buildroot/package/python-pyro/python-pyro.mk
+++ b/bsp/buildroot/package/python-pyro/python-pyro.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PYRO_VERSION = 3.14
+PYTHON_PYRO_VERSION = 3.16
 PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz
-PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro
+PYTHON_PYRO_SITE = https://pypi.python.org/packages/61/68/0978adae315261b87acd216517c2c7f00780396e4d1426c5412458c6a28f
 PYTHON_PYRO_LICENSE = MIT
 PYTHON_PYRO_LICENSE_FILES = LICENSE
-PYTHON_PYRO_SETUP_TYPE = distutils
+PYTHON_PYRO_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pyroute2/python-pyroute2.hash b/bsp/buildroot/package/python-pyroute2/python-pyroute2.hash
index ff680fc2..dbf09c97 100644
--- a/bsp/buildroot/package/python-pyroute2/python-pyroute2.hash
+++ b/bsp/buildroot/package/python-pyroute2/python-pyroute2.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pyroute2/json, sha256 locally computed
-md5	317303ba8a5e3d55b4f918fd1b7e186d  pyroute2-0.4.8.tar.gz
-sha256	a59907d2c5756f188b5f8aa48e3060e31c6f40e076f8143b99240fe0108a48d6  pyroute2-0.4.8.tar.gz
+md5 ef4282b1401bcd07a9cf4ec0696aba24 pyroute2-0.4.13.tar.gz
+sha256 93f3d72f58b3627036427b5571f8e27c93dbb6d01372dc4c452707d6610c0a39 pyroute2-0.4.13.tar.gz
diff --git a/bsp/buildroot/package/python-pyroute2/python-pyroute2.mk b/bsp/buildroot/package/python-pyroute2/python-pyroute2.mk
index 5ea4f545..eed8eb41 100644
--- a/bsp/buildroot/package/python-pyroute2/python-pyroute2.mk
+++ b/bsp/buildroot/package/python-pyroute2/python-pyroute2.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_PYROUTE2_VERSION = 0.4.8
+PYTHON_PYROUTE2_VERSION = 0.4.13
 PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz
-PYTHON_PYROUTE2_SITE = https://pypi.python.org/packages/fb/c1/2cbd9d3f91c663be7168ee2d8d6e919006ffeef57cac76bdd9e6cba7f468
-PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPLv2+
+PYTHON_PYROUTE2_SITE = https://pypi.python.org/packages/91/e7/814f60e355078dc51625cd2e7e715ed4a06111ddf2ac5580f2f10e79c94a
+PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPL-2.0+
 PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md
 PYTHON_PYROUTE2_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-pysmb/Config.in b/bsp/buildroot/package/python-pysmb/Config.in
index 42a9984e..32a6878f 100644
--- a/bsp/buildroot/package/python-pysmb/Config.in
+++ b/bsp/buildroot/package/python-pysmb/Config.in
@@ -4,10 +4,10 @@ config BR2_PACKAGE_PYTHON_PYSMB
 	select BR2_PACKAGE_PYTHON_PYASN
 	help
 	  pysmb is an experimental SMB/CIFS library written in Python.
-	  It implements the client-side SMB/CIFS protocol (SMB1 and SMB2)
-	  which allows your Python application to access and transfer files
-	  to/from SMB/CIFS shared folders like your Windows file sharing and
-	  Samba folders.
+	  It implements the client-side SMB/CIFS protocol (SMB1 and
+	  SMB2) which allows your Python application to access and
+	  transfer files to/from SMB/CIFS shared folders like your
+	  Windows file sharing and Samba folders.
 
 	  https://miketeo.net/wp/index.php/projects/pysmb
 
diff --git a/bsp/buildroot/package/python-pysmb/python-pysmb.hash b/bsp/buildroot/package/python-pysmb/python-pysmb.hash
index 4c410689..95246670 100644
--- a/bsp/buildroot/package/python-pysmb/python-pysmb.hash
+++ b/bsp/buildroot/package/python-pysmb/python-pysmb.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9fe70cbc812b2e789915bedea7e45b1a, sha256 locally computed
-md5     9fe70cbc812b2e789915bedea7e45b1a  pysmb-1.1.18.tar.gz
-sha256  580f7dcf8048656d2924c2f78731feaeaf6f9fa8ef5c251fc6964d39bfd3a6b9  pysmb-1.1.18.tar.gz
+# md5 from https://pypi.python.org/pypi/pysmb/json, sha256 locally computed
+md5 e6f9ce0032db528aae060f7019bd409c pysmb-1.1.19.tar.gz
+sha256 fa4e6b4a4f2afbfbd71e9179c491f8c77bc2ad19e0bc866d7c6cbfa9ae272602 pysmb-1.1.19.tar.gz
diff --git a/bsp/buildroot/package/python-pysmb/python-pysmb.mk b/bsp/buildroot/package/python-pysmb/python-pysmb.mk
index 51df91da..1b4c1879 100644
--- a/bsp/buildroot/package/python-pysmb/python-pysmb.mk
+++ b/bsp/buildroot/package/python-pysmb/python-pysmb.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-PYTHON_PYSMB_VERSION = 1.1.18
+PYTHON_PYSMB_VERSION = 1.1.19
 PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz
-PYTHON_PYSMB_SITE = https://pypi.python.org/packages/source/p/pysmb
-PYTHON_PYSMB_LICENSE = libpng license
+PYTHON_PYSMB_SITE = https://pypi.python.org/packages/f9/e7/1fd7faaa946cc6b43ce85bb7a177b75a4718d9c5e291201fec00112b497c
+PYTHON_PYSMB_LICENSE = Libpng
 PYTHON_PYSMB_LICENSE_FILES = LICENSE
 PYTHON_PYSMB_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-pysnmp-apps/Config.in b/bsp/buildroot/package/python-pysnmp-apps/Config.in
index b032eba1..32e32699 100644
--- a/bsp/buildroot/package/python-pysnmp-apps/Config.in
+++ b/bsp/buildroot/package/python-pysnmp-apps/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PYTHON_PYSNMP_APPS
 	bool "python-pysnmp-apps"
-	select BR2_PACKAGE_PYTHON_PYSNMP
 	depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn
+	select BR2_PACKAGE_PYTHON_PYSNMP
 	help
 	  A collection of command-line tools for SNMP management
 	  purposes built on top of the PySNMP package.
diff --git a/bsp/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk b/bsp/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk
index 2c831df1..79c436fa 100644
--- a/bsp/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk
+++ b/bsp/buildroot/package/python-pysnmp-apps/python-pysnmp-apps.mk
@@ -8,7 +8,7 @@ PYTHON_PYSNMP_APPS_VERSION = 0.4.1
 PYTHON_PYSNMP_APPS_SOURCE = pysnmp-apps-$(PYTHON_PYSNMP_APPS_VERSION).tar.gz
 PYTHON_PYSNMP_APPS_SITE = https://pypi.python.org/packages/source/p/pysnmp-apps
 PYTHON_PYSNMP_APPS_SETUP_TYPE = setuptools
-PYTHON_PYSNMP_APPS_LICENSE = BSD-3c
+PYTHON_PYSNMP_APPS_LICENSE = BSD-3-Clause
 PYTHON_PYSNMP_APPS_LICENSE_FILES = LICENSE.txt
 
 PYTHON_PYSNMP_APPS_DEPENDENCIES = python-pysnmp
diff --git a/bsp/buildroot/package/python-pysnmp-mibs/Config.in b/bsp/buildroot/package/python-pysnmp-mibs/Config.in
index eca17d26..521d95ea 100644
--- a/bsp/buildroot/package/python-pysnmp-mibs/Config.in
+++ b/bsp/buildroot/package/python-pysnmp-mibs/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PYTHON_PYSNMP_MIBS
 	bool "python-pysnmp-mibs"
-	select BR2_PACKAGE_PYTHON_PYSNMP
 	depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn
+	select BR2_PACKAGE_PYTHON_PYSNMP
 	help
 	  PySNMP MIBs is a set of IETF & IANA MIBs pre-compiled and
 	  packaged to simplify their use with the PySNMP library.
diff --git a/bsp/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.mk b/bsp/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
index a0db763c..9772b78c 100644
--- a/bsp/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
+++ b/bsp/buildroot/package/python-pysnmp-mibs/python-pysnmp-mibs.mk
@@ -8,7 +8,7 @@ PYTHON_PYSNMP_MIBS_VERSION = 0.1.6
 PYTHON_PYSNMP_MIBS_SOURCE = pysnmp-mibs-$(PYTHON_PYSNMP_MIBS_VERSION).tar.gz
 PYTHON_PYSNMP_MIBS_SITE = https://pypi.python.org/packages/bf/7c/99ab192af934ed5d41ceef92a1b949b41652f29b46241b902ffec55642f4
 PYTHON_PYSNMP_MIBS_SETUP_TYPE = setuptools
-PYTHON_PYSNMP_MIBS_LICENSE = BSD-3c
+PYTHON_PYSNMP_MIBS_LICENSE = BSD-3-Clause
 PYTHON_PYSNMP_MIBS_LICENSE_FILES = LICENSE.txt
 
 PYTHON_PYSNMP_MIBS_DEPENDENCIES = python-pysnmp
diff --git a/bsp/buildroot/package/python-pysnmp/python-pysnmp.hash b/bsp/buildroot/package/python-pysnmp/python-pysnmp.hash
index b0f0f496..7ecbf4c4 100644
--- a/bsp/buildroot/package/python-pysnmp/python-pysnmp.hash
+++ b/bsp/buildroot/package/python-pysnmp/python-pysnmp.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/pysnmp/json, sha256 locally computed
-md5	9a4d23c4c1edea1c77faed72c469d8e8  pysnmp-4.3.2.tar.gz
-sha256	7c2bd81df17aa7dca0057a68e7a32284a72231309a0237d66d5b803b5c118977  pysnmp-4.3.2.tar.gz
+md5 cc0838cdf3f2d34539f478942f648384 pysnmp-4.3.3.tar.gz
+sha256 c837d35cbb2c1e067b7b8ed752d962481ef8d7ff11e4cdd8bfb0840c4a786318 pysnmp-4.3.3.tar.gz
diff --git a/bsp/buildroot/package/python-pysnmp/python-pysnmp.mk b/bsp/buildroot/package/python-pysnmp/python-pysnmp.mk
index dff8bdd3..2721ba8a 100644
--- a/bsp/buildroot/package/python-pysnmp/python-pysnmp.mk
+++ b/bsp/buildroot/package/python-pysnmp/python-pysnmp.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PYTHON_PYSNMP_VERSION = 4.3.2
+PYTHON_PYSNMP_VERSION = 4.3.3
 PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz
-PYTHON_PYSNMP_SITE = https://pypi.python.org/packages/9e/77/795fcc9d9a01adcb6175a3bf6532132addb8904922afd7877a9930d89f2f
+PYTHON_PYSNMP_SITE = https://pypi.python.org/packages/47/b5/c65b9b6fcc36d3f4caca30d3314920f1ca75f5ceecc1f6ae2538ede24511
 PYTHON_PYSNMP_SETUP_TYPE = setuptools
 
-PYTHON_PYSNMP_LICENSE = BSD-3c
+PYTHON_PYSNMP_LICENSE = BSD-3-Clause
 PYTHON_PYSNMP_LICENSE_FILES = LICENSE.txt
 
 PYTHON_PYSNMP_DEPENDENCIES = python-pyasn python-pycrypto
diff --git a/bsp/buildroot/package/python-pysocks/python-pysocks.hash b/bsp/buildroot/package/python-pysocks/python-pysocks.hash
index 556996a2..802bd37f 100644
--- a/bsp/buildroot/package/python-pysocks/python-pysocks.hash
+++ b/bsp/buildroot/package/python-pysocks/python-pysocks.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/PySocks/json, sha256 locally computed
-md5     68f4ad7a8d4fa725656ae3e9dd142d29  PySocks-1.5.7.tar.gz
-sha256  e51c7694b10288e6fd9a28e15c0bcce9aca0327e7b32ebcd9af05fcd56f38b88  PySocks-1.5.7.tar.gz
+# md5 from https://pypi.python.org/pypi/pysocks/json, sha256 locally computed
+md5  07007ec7ed46292dab06013f2e3af365  PySocks-1.6.7.tar.gz
+sha256  d00329f27efa157db7efe3ca26fcd69033cd61f83822461ee3f8a353b48e33cf  PySocks-1.6.7.tar.gz
diff --git a/bsp/buildroot/package/python-pysocks/python-pysocks.mk b/bsp/buildroot/package/python-pysocks/python-pysocks.mk
index a99a399c..163da761 100644
--- a/bsp/buildroot/package/python-pysocks/python-pysocks.mk
+++ b/bsp/buildroot/package/python-pysocks/python-pysocks.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_PYSOCKS_VERSION = 1.5.7
+PYTHON_PYSOCKS_VERSION = 1.6.7
 PYTHON_PYSOCKS_SOURCE = PySocks-$(PYTHON_PYSOCKS_VERSION).tar.gz
-PYTHON_PYSOCKS_SITE = https://pypi.python.org/packages/16/56/9b3513078f837fa8cb88ee01ec1cd805ed8104a37bc02ca8c2588ae8fe5a
-PYTHON_PYSOCKS_LICENSE = BSD-3c
-PYTHON_PYSOCKS_LICENSE_FILES = socks.py
-PYTHON_PYSOCKS_SETUP_TYPE = distutils
+PYTHON_PYSOCKS_SITE = https://pypi.python.org/packages/7d/38/edca891ce16827a1de45cc347e4b6c22311eba25838b9825a5e6c48cf560
+PYTHON_PYSOCKS_LICENSE = BSD-3-Clause
+PYTHON_PYSOCKS_LICENSE_FILES = LICENSE
+PYTHON_PYSOCKS_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pytablereader/Config.in b/bsp/buildroot/package/python-pytablereader/Config.in
index 050ff65c..29951ab0 100644
--- a/bsp/buildroot/package/python-pytablereader/Config.in
+++ b/bsp/buildroot/package/python-pytablereader/Config.in
@@ -2,14 +2,18 @@ config BR2_PACKAGE_PYTHON_PYTABLEREADER
 	bool "python-pytablereader"
 	select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime
 	select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime
+	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime
 	select BR2_PACKAGE_PYTHON_LOGBOOK # runtime
 	select BR2_PACKAGE_PYTHON_MARKDOWN2 # runtime
 	select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
-	select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime
 	select BR2_PACKAGE_PYTHON_PATHPY # runtime
+	select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime
+	select BR2_PACKAGE_PYTHON_PYPARSING # runtime
 	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_TABLEDATA # runtime
+	select BR2_PACKAGE_PYTHON_TYPEPY # runtime
 	select BR2_PACKAGE_PYTHON_XLRD # runtime
 	help
 	  A python library to load structured table data from
diff --git a/bsp/buildroot/package/python-pytablereader/python-pytablereader.hash b/bsp/buildroot/package/python-pytablereader/python-pytablereader.hash
index 7d1438a1..ade5df3d 100644
--- a/bsp/buildroot/package/python-pytablereader/python-pytablereader.hash
+++ b/bsp/buildroot/package/python-pytablereader/python-pytablereader.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/pytablereader/json, sha256 locally computed
-md5	ae95462a1a982186d1307ee0d6e275e2  pytablereader-0.8.8.tar.gz
-sha256	6ba95dc699d2c7ab7bc4b3f0224a17404255d110a3ece8ba12217d650aa7de79  pytablereader-0.8.8.tar.gz
+md5	bad666f031a336466c0e9d5c0f4c5783  pytablereader-0.15.0.tar.gz
+sha256	edd7d78ceb1692a1b29254f45574f85f03cd04311d2dfd2256a299c6634cc022  pytablereader-0.15.0.tar.gz
+sha256  7588265082eed5e9f4afd5090c57e610b740ec547b16aaaab739ba07c5eefb15  LICENSE
diff --git a/bsp/buildroot/package/python-pytablereader/python-pytablereader.mk b/bsp/buildroot/package/python-pytablereader/python-pytablereader.mk
index 2b6f2d46..ce1de4e4 100644
--- a/bsp/buildroot/package/python-pytablereader/python-pytablereader.mk
+++ b/bsp/buildroot/package/python-pytablereader/python-pytablereader.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYTABLEREADER_VERSION = 0.8.8
+PYTHON_PYTABLEREADER_VERSION = 0.15.0
 PYTHON_PYTABLEREADER_SOURCE = pytablereader-$(PYTHON_PYTABLEREADER_VERSION).tar.gz
-PYTHON_PYTABLEREADER_SITE = https://pypi.python.org/packages/05/0c/7801617e60ce0d9b4cc57cb542cc431a95b9f43ac1ac14030017163da29d
+PYTHON_PYTABLEREADER_SITE = https://pypi.python.org/packages/34/53/e2f51f2efe42c4045ad0822d4ffe739788a74cca35ba7d0bc59a53ec9424
 PYTHON_PYTABLEREADER_SETUP_TYPE = setuptools
 PYTHON_PYTABLEREADER_LICENSE = MIT
 PYTHON_PYTABLEREADER_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-pytablewriter/Config.in b/bsp/buildroot/package/python-pytablewriter/Config.in
index f270d0da..10672dc4 100644
--- a/bsp/buildroot/package/python-pytablewriter/Config.in
+++ b/bsp/buildroot/package/python-pytablewriter/Config.in
@@ -2,12 +2,17 @@ config BR2_PACKAGE_PYTHON_PYTABLEWRITER
 	bool "python-pytablewriter"
 	select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime
 	select BR2_PACKAGE_PYTHON_DOMINATE # runtime
+	select BR2_PACKAGE_PYTHON_LOGBOOK # runtime
+	select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
 	select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime
+	select BR2_PACKAGE_PYTHON_PYTABLEREADER # runtime
+	select BR2_PACKAGE_PYTHON_SIMPLESQLITE # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_TABLEDATA # runtime
+	select BR2_PACKAGE_PYTHON_TOML # runtime
+	select BR2_PACKAGE_PYTHON_TYPEPY # runtime
 	select BR2_PACKAGE_PYTHON_XLSXWRITER # runtime
 	select BR2_PACKAGE_PYTHON_XLWT # runtime
-	select BR2_PACKAGE_PYTHON_TOML # runtime
-	select BR2_PACKAGE_PYTHON_PYTABLEREADER # runtime
 	help
 	  pytablewriter is a python library to write a table in various
 	  formats: CSV, HTML, JavaScript, JSON, Markdown, Excel, Pandas,
diff --git a/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.hash b/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.hash
index 3b5bef32..36e14539 100644
--- a/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.hash
+++ b/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/pytablewriter/json, sha256 locally computed
-md5	7b909647bb8a87373f2553a6fccdf419  pytablewriter-0.17.1.tar.gz
-sha256	20c58c41359941262bf288d2fe81ca506e2a38cfdd337d982dbcb2e26ec4a3ed  pytablewriter-0.17.1.tar.gz
+md5	7d7eff9665b1d9e0c0189c34f8c562c3  pytablewriter-0.27.1.tar.gz
+sha256	89e43bffc60ea93f0ed0cc8d8ddbf34ac0b74f8cf781c6c39f4c8bc3a7e4c436  pytablewriter-0.27.1.tar.gz
+sha256  a93d75bcb0774e2990106380cadad6dcb2de193c55d435ffc56ba345a08b1dc2  LICENSE
diff --git a/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.mk b/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.mk
index 6d2e5456..dd87213e 100644
--- a/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.mk
+++ b/bsp/buildroot/package/python-pytablewriter/python-pytablewriter.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYTABLEWRITER_VERSION = 0.17.1
+PYTHON_PYTABLEWRITER_VERSION = 0.27.1
 PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz
-PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/a2/2f/093dded4e265705c1d87d68a9062acb69b39c6ec615f74d71c62f6625afa
+PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/c2/88/6a9f6cbdabd773ba6de6c41d7a0af58eed37ca97b1d666b04819d0bf9b54
 PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools
 PYTHON_PYTABLEWRITER_LICENSE = MIT
 PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-pytrie/python-pytrie.mk b/bsp/buildroot/package/python-pytrie/python-pytrie.mk
index e3bea4f6..0fe78fdb 100644
--- a/bsp/buildroot/package/python-pytrie/python-pytrie.mk
+++ b/bsp/buildroot/package/python-pytrie/python-pytrie.mk
@@ -5,9 +5,9 @@
 ################################################################################
 
 PYTHON_PYTRIE_VERSION = 0.2
-PYTHON_PYTRIE_SITE = http://pypi.python.org/packages/source/P/PyTrie
+PYTHON_PYTRIE_SITE = https://pypi.python.org/packages/source/P/PyTrie
 PYTHON_PYTRIE_SOURCE = PyTrie-$(PYTHON_PYTRIE_VERSION).tar.gz
-PYTHON_PYTRIE_LICENSE = BSD-3c
+PYTHON_PYTRIE_LICENSE = BSD-3-Clause
 PYTHON_PYTRIE_LICENSE_FILES = LICENSE
 PYTHON_PYTRIE_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-pytz/python-pytz.hash b/bsp/buildroot/package/python-pytz/python-pytz.hash
index fbccc52b..dd3ff2c2 100644
--- a/bsp/buildroot/package/python-pytz/python-pytz.hash
+++ b/bsp/buildroot/package/python-pytz/python-pytz.hash
@@ -1,3 +1,4 @@
 # md5 from https://pypi.python.org/pypi/pytz/json, sha256 locally computed
-md5	88b1d6c50c764579292edce3493c8a3a  pytz-2016.10.tar.bz2
-sha256  7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b  pytz-2016.10.tar.bz2
+md5	7006b56c0d68a162d9fe57d4249c3171  pytz-2017.3.zip
+sha256  fae4cffc040921b8a2d60c6cf0b5d662c1190fe54d718271db4eb17d44a185b7  pytz-2017.3.zip
+sha256  a1c7102a51ef9ed37766f7388c71fd41bae2a7a95c30673c419ab84e1acc5f02  LICENSE.txt
diff --git a/bsp/buildroot/package/python-pytz/python-pytz.mk b/bsp/buildroot/package/python-pytz/python-pytz.mk
index 9a8bd07e..6e130a6b 100644
--- a/bsp/buildroot/package/python-pytz/python-pytz.mk
+++ b/bsp/buildroot/package/python-pytz/python-pytz.mk
@@ -4,11 +4,17 @@
 #
 ################################################################################
 
-PYTHON_PYTZ_VERSION = 2016.10
-PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.bz2
-PYTHON_PYTZ_SITE = https://pypi.python.org/packages/d0/e1/aca6ef73a7bd322a7fc73fd99631ee3454d4fc67dc2bee463e2adf6bb3d3
+PYTHON_PYTZ_VERSION = 2017.3
+PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).zip
+PYTHON_PYTZ_SITE = https://pypi.python.org/packages/60/88/d3152c234da4b2a1f7a989f89609ea488225eaea015bc16fbde2b3fdfefa
 PYTHON_PYTZ_SETUP_TYPE = setuptools
 PYTHON_PYTZ_LICENSE = MIT
 PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt
 
+define PYTHON_PYTZ_EXTRACT_CMDS
+	unzip $(DL_DIR)/$(PYTHON_PYTZ_SOURCE) -d $(@D)
+	mv $(@D)/pytz-$(PYTHON_PYTZ_VERSION)/* $(@D)
+	rmdir $(@D)/pytz-$(PYTHON_PYTZ_VERSION)
+endef
+
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-pyudev/Config.in b/bsp/buildroot/package/python-pyudev/Config.in
index 137a983a..fb853956 100644
--- a/bsp/buildroot/package/python-pyudev/Config.in
+++ b/bsp/buildroot/package/python-pyudev/Config.in
@@ -5,8 +5,9 @@ config BR2_PACKAGE_PYTHON_PYUDEV
 	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	help
-	  pyudev is a LGPL licenced, pure Python 2/3 binding to libudev,
-	  the device and hardware management and information library of Linux.
+	  pyudev is a LGPL licenced, pure Python 2/3 binding to
+	  libudev, the device and hardware management and information
+	  library of Linux.
 
 	  https://github.com/pyudev/pyudev
 
diff --git a/bsp/buildroot/package/python-pyudev/python-pyudev.mk b/bsp/buildroot/package/python-pyudev/python-pyudev.mk
index 70c4faf8..db941ea4 100644
--- a/bsp/buildroot/package/python-pyudev/python-pyudev.mk
+++ b/bsp/buildroot/package/python-pyudev/python-pyudev.mk
@@ -7,7 +7,7 @@
 PYTHON_PYUDEV_VERSION = 0.18
 PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz
 PYTHON_PYUDEV_SITE = https://pypi.python.org/packages/source/p/pyudev
-PYTHON_PYUDEV_LICENSE = LGPLv2.1+
+PYTHON_PYUDEV_LICENSE = LGPL-2.1+
 PYTHON_PYUDEV_LICENSE_FILES = COPYING
 PYTHON_PYUDEV_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-pyusb/python-pyusb.mk b/bsp/buildroot/package/python-pyusb/python-pyusb.mk
index cfdef533..0afcbe8b 100644
--- a/bsp/buildroot/package/python-pyusb/python-pyusb.mk
+++ b/bsp/buildroot/package/python-pyusb/python-pyusb.mk
@@ -7,7 +7,7 @@
 PYTHON_PYUSB_VERSION = 1.0.0
 PYTHON_PYUSB_SOURCE = PyUSB-$(PYTHON_PYUSB_VERSION).tar.gz
 PYTHON_PYUSB_SITE = https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d
-PYTHON_PYUSB_LICENSE = BSD-3c
+PYTHON_PYUSB_LICENSE = BSD-3-Clause
 PYTHON_PYUSB_LICENSE_FILES = LICENSE
 PYTHON_PYUSB_SETUP_TYPE = distutils
 PYTHON_PYUSB_DEPENDENCIES = libusb
diff --git a/bsp/buildroot/package/python-pyxb/Config.in b/bsp/buildroot/package/python-pyxb/Config.in
index f1226717..6555ed80 100644
--- a/bsp/buildroot/package/python-pyxb/Config.in
+++ b/bsp/buildroot/package/python-pyxb/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_PYTHON_PYXB
 	bool "python-pyxb"
 	help
-	  PyXB is a pure Python package that generates Python code
-	  for classes that correspond to data structures defined by XMLSchema.
+	  PyXB is a pure Python package that generates Python code for
+	  classes that correspond to data structures defined by
+	  XMLSchema.
 
 	  http://pyxb.sourceforge.net/
diff --git a/bsp/buildroot/package/python-pyxb/python-pyxb.hash b/bsp/buildroot/package/python-pyxb/python-pyxb.hash
index 9aa50fc7..0cfce576 100644
--- a/bsp/buildroot/package/python-pyxb/python-pyxb.hash
+++ b/bsp/buildroot/package/python-pyxb/python-pyxb.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi/pyxb/json, sha256 locally computed
-md5	197c462ab8427ea197313ca3776b252a  PyXB-1.2.5.tar.gz
-sha256	4e8f62ee2cfffc37e4f40634ab9c79e0311cfaf28cf4ce5e7f4828ec56e4ff67  PyXB-1.2.5.tar.gz
+# md5 from https://pypi.python.org/pypi/PyXB/json, sha256 locally computed
+md5	4303573fc7094ce4664c5b71cd4bdb48  PyXB-1.2.6.tar.gz
+sha256	2a00f38dd1d87b88f92d79bc5a09718d730419b88e814545f472bbd5a3bf27b4  PyXB-1.2.6.tar.gz
+sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/bsp/buildroot/package/python-pyxb/python-pyxb.mk b/bsp/buildroot/package/python-pyxb/python-pyxb.mk
index d0b2da54..6af10b51 100644
--- a/bsp/buildroot/package/python-pyxb/python-pyxb.mk
+++ b/bsp/buildroot/package/python-pyxb/python-pyxb.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_PYXB_VERSION = 1.2.5
+PYTHON_PYXB_VERSION = 1.2.6
 PYTHON_PYXB_SOURCE = PyXB-$(PYTHON_PYXB_VERSION).tar.gz
-PYTHON_PYXB_SITE = https://pypi.python.org/packages/43/7a/9d40392e4380463f37bf5aa2851dfd8ba7c0e4d2a9dc2355177b8b785794
+PYTHON_PYXB_SITE = https://pypi.python.org/packages/e3/09/4fdb190ea2b7cb43d6d3e745276ee69f4d6181be70fcbfda7df3c5f72f0e
 PYTHON_PYXB_LICENSE = Apache-2.0
 PYTHON_PYXB_LICENSE_FILES = LICENSE
 PYTHON_PYXB_SETUP_TYPE = distutils
diff --git a/bsp/buildroot/package/python-pyzmq/python-pyzmq.mk b/bsp/buildroot/package/python-pyzmq/python-pyzmq.mk
index ade2d3a2..c34c5af2 100644
--- a/bsp/buildroot/package/python-pyzmq/python-pyzmq.mk
+++ b/bsp/buildroot/package/python-pyzmq/python-pyzmq.mk
@@ -7,7 +7,7 @@
 PYTHON_PYZMQ_VERSION = 16.0.2
 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz
 PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55
-PYTHON_PYZMQ_LICENSE = LGPLv3+, BSD-3c, Apache-2.0
+PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0
 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0
 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD
 PYTHON_PYZMQ_DEPENDENCIES = zeromq
diff --git a/bsp/buildroot/package/python-raven/Config.in b/bsp/buildroot/package/python-raven/Config.in
new file mode 100644
index 00000000..0d4b26c0
--- /dev/null
+++ b/bsp/buildroot/package/python-raven/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_PYTHON_RAVEN
+	bool "python-raven"
+	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3
+	help
+	  Raven is a client for Sentry (https://getsentry.com).
+
+	  https://github.com/getsentry/raven-python
diff --git a/bsp/buildroot/package/python-raven/python-raven.hash b/bsp/buildroot/package/python-raven/python-raven.hash
new file mode 100644
index 00000000..66452a7f
--- /dev/null
+++ b/bsp/buildroot/package/python-raven/python-raven.hash
@@ -0,0 +1,5 @@
+# md5 from https://pypi.python.org/pypi/raven/json, sha256 locally computed
+md5	4471e9e881da64f057ee7740345a6b27  raven-6.5.0.tar.gz
+sha256	84da75114739191bdf2388f296ffd6177e83567a7fbaf2701e034ad6026e4f3b  raven-6.5.0.tar.gz
+# License file, locally calculated
+sha256	5ce9459bc19ced99cc9eb135d4f559ed01e336354bdf16dd998be85aa688c233  LICENSE
diff --git a/bsp/buildroot/package/python-raven/python-raven.mk b/bsp/buildroot/package/python-raven/python-raven.mk
new file mode 100644
index 00000000..4a4cdee3
--- /dev/null
+++ b/bsp/buildroot/package/python-raven/python-raven.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-raven
+#
+################################################################################
+
+PYTHON_RAVEN_VERSION = 6.5.0
+PYTHON_RAVEN_SOURCE = raven-$(PYTHON_RAVEN_VERSION).tar.gz
+PYTHON_RAVEN_SITE = https://pypi.python.org/packages/e0/26/1bdd4431f59ff92fee7f2378b7d54eb175eb69f68c40c6c9b15161f6774f
+PYTHON_RAVEN_SETUP_TYPE = setuptools
+PYTHON_RAVEN_LICENSE = BSD-3-Clause
+PYTHON_RAVEN_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-remi/Config.in b/bsp/buildroot/package/python-remi/Config.in
new file mode 100644
index 00000000..553c89c3
--- /dev/null
+++ b/bsp/buildroot/package/python-remi/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_REMI
+	bool "python-remi"
+	help
+	  Remi is a GUI library for Python applications which transpiles
+	  an application's interface into HTML to be rendered in a web
+	  browser. This removes platform-specific dependencies and lets
+	  you easily develop cross-platform applications in Python!
+
+	  https://github.com/dddomodossola/remi/tree/master
diff --git a/bsp/buildroot/package/python-remi/python-remi.hash b/bsp/buildroot/package/python-remi/python-remi.hash
new file mode 100644
index 00000000..e3df6cbb
--- /dev/null
+++ b/bsp/buildroot/package/python-remi/python-remi.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 69ab3f7438de76708bfc40396f791b76452f84bb8bca6dafbdaca510c17e9526  python-remi-v1.0.tar.gz
+sha256 bc198f9846c1da3a1c1b1fa2b12909b021365d1e7fe9b4039245edfcec3b7f7f  LICENSE
diff --git a/bsp/buildroot/package/python-remi/python-remi.mk b/bsp/buildroot/package/python-remi/python-remi.mk
new file mode 100644
index 00000000..3356430d
--- /dev/null
+++ b/bsp/buildroot/package/python-remi/python-remi.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# python-remi
+#
+################################################################################
+
+PYTHON_REMI_VERSION = v1.0
+PYTHON_REMI_SITE = $(call github,dddomodossola,remi,$(PYTHON_REMI_VERSION))
+PYTHON_REMI_LICENSE = Apache-2.0
+PYTHON_REMI_LICENSE_FILES = LICENSE
+PYTHON_REMI_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-requests-oauthlib/Config.in b/bsp/buildroot/package/python-requests-oauthlib/Config.in
new file mode 100644
index 00000000..85283b20
--- /dev/null
+++ b/bsp/buildroot/package/python-requests-oauthlib/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_REQUESTS_OAUTHLIB
+	bool "python-requests-oauthlib"
+	select BR2_PACKAGE_PYTHON_OAUTHLIB # runtime
+	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
+	help
+	  OAuthlib authentication support for Requests.
+
+	  https://github.com/requests/requests-oauthlib
diff --git a/bsp/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash b/bsp/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash
new file mode 100644
index 00000000..be0f644b
--- /dev/null
+++ b/bsp/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/requests_oauthlib/json, sha256 locally computed
+md5	4358a879a4377393bcfd37d0f9ae6d4d  requests-oauthlib-0.8.0.tar.gz
+sha256	883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468  requests-oauthlib-0.8.0.tar.gz
+sha256	ae01846afad8a8291fe6a08966f3015af9a8ff675d84b981f9793c122f7876e8  LICENSE
diff --git a/bsp/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk b/bsp/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk
new file mode 100644
index 00000000..02e3114e
--- /dev/null
+++ b/bsp/buildroot/package/python-requests-oauthlib/python-requests-oauthlib.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-requests-oauthlib
+#
+################################################################################
+
+PYTHON_REQUESTS_OAUTHLIB_VERSION = 0.8.0
+PYTHON_REQUESTS_OAUTHLIB_SOURCE = requests-oauthlib-$(PYTHON_REQUESTS_OAUTHLIB_VERSION).tar.gz
+PYTHON_REQUESTS_OAUTHLIB_SITE = https://pypi.python.org/packages/80/14/ad120c720f86c547ba8988010d5186102030591f71f7099f23921ca47fe5
+PYTHON_REQUESTS_OAUTHLIB_SETUP_TYPE = setuptools
+PYTHON_REQUESTS_OAUTHLIB_LICENSE = ISC
+PYTHON_REQUESTS_OAUTHLIB_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash b/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash
index 89f5ca11..75343b05 100644
--- a/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash
+++ b/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/requests-toolbelt/json, sha256 locally computed
-md5	bfe2009905f460f4764c32cfbbf4205f  requests-toolbelt-0.7.0.tar.gz
-sha256	33899d4a559c3f0f5e9fbc115d337c4236febdc083755a160a4132d92fc3c91a  requests-toolbelt-0.7.0.tar.gz
+# md5 from https://pypi.python.org/pypi/requests_toolbelt/json, sha256 locally computed
+md5 be245e2093a9610fb2eb399afc063ad2 requests-toolbelt-0.7.1.tar.gz
+sha256 c3843884269d79e492522f3e9f490917e074c1ddbb80111968970e721fe36eaf requests-toolbelt-0.7.1.tar.gz
diff --git a/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk b/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk
index 2e944c06..ce1d9587 100644
--- a/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk
+++ b/bsp/buildroot/package/python-requests-toolbelt/python-requests-toolbelt.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_REQUESTS_TOOLBELT_VERSION = 0.7.0
+PYTHON_REQUESTS_TOOLBELT_VERSION = 0.7.1
 PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz
-PYTHON_REQUESTS_TOOLBELT_SITE = https://pypi.python.org/packages/59/78/1d391d30ebf74079a8e4de6ab66fdca5362903ef2df64496f4697e9bb626
+PYTHON_REQUESTS_TOOLBELT_SITE = https://pypi.python.org/packages/ab/bf/2af6b25f880e2d529a524f98837d33b1048a2a15703fc4806185b54e9672
 PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools
 PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0
 PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-requests/Config.in b/bsp/buildroot/package/python-requests/Config.in
index 23ab3092..30158b8d 100644
--- a/bsp/buildroot/package/python-requests/Config.in
+++ b/bsp/buildroot/package/python-requests/Config.in
@@ -1,5 +1,12 @@
 config BR2_PACKAGE_PYTHON_REQUESTS
 	bool "python-requests"
+	select BR2_PACKAGE_PYTHON_CERTIFI # runtime
+	select BR2_PACKAGE_PYTHON_CHARDET # runtime
+	select BR2_PACKAGE_PYTHON_IDNA # runtime
+	select BR2_PACKAGE_PYTHON_URLLIB3 # runtime
+	select BR2_PACKAGE_PYTHON_HASHLIB if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime
 	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
 	help
diff --git a/bsp/buildroot/package/python-requests/python-requests.hash b/bsp/buildroot/package/python-requests/python-requests.hash
index e441c008..2f182ea3 100644
--- a/bsp/buildroot/package/python-requests/python-requests.hash
+++ b/bsp/buildroot/package/python-requests/python-requests.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/requests/json, sha256 locally computed
-md5	ad5f9c47b5c5dfdb28363ad7546b0763  requests-2.11.1.tar.gz
-sha256	5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133  requests-2.11.1.tar.gz
+md5	40f723ed01dddeaf990d0609d073f021  requests-2.18.1.tar.gz
+sha256	c6f3bdf4a4323ac7b45d01e04a6f6c20e32a052cd04de81e05103abc049ad9b9  requests-2.18.1.tar.gz
diff --git a/bsp/buildroot/package/python-requests/python-requests.mk b/bsp/buildroot/package/python-requests/python-requests.mk
index 49980bf9..504eb8d0 100644
--- a/bsp/buildroot/package/python-requests/python-requests.mk
+++ b/bsp/buildroot/package/python-requests/python-requests.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_REQUESTS_VERSION = 2.11.1
+PYTHON_REQUESTS_VERSION = 2.18.1
 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz
-PYTHON_REQUESTS_SITE = https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad
+PYTHON_REQUESTS_SITE = https://pypi.python.org/packages/2c/b5/2b6e8ef8dd18203b6399e9f28c7d54f6de7b7549853fe36d575bd31e29a7
 PYTHON_REQUESTS_SETUP_TYPE = setuptools
 PYTHON_REQUESTS_LICENSE = Apache-2.0
 PYTHON_REQUESTS_LICENSE_FILES = LICENSE
diff --git a/bsp/buildroot/package/python-rpi-gpio/Config.in b/bsp/buildroot/package/python-rpi-gpio/Config.in
old mode 100755
new mode 100644
diff --git a/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash b/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash
index a502972c..e8d390da 100644
--- a/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash
+++ b/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/rpi-gpio/json, sha256 locally computed
-md5	9db86fd5f3bae872de9dbb068ee0b096  RPi.GPIO-0.6.2.tar.gz
-sha256	82acff0ef6bbe3cdf6f4dbdd73d96add5294bb94baf7f51c1d901861af3c2392  RPi.GPIO-0.6.2.tar.gz
+# md5 from https://pypi.python.org/pypi/rpi_gpio/json, sha256 locally computed
+md5 e4abe1cfb5eacebe53078032256eb837 RPi.GPIO-0.6.3.tar.gz
+sha256 a5fc0eb5e401963b6c0a03650da6b42c4005f02d962b81241d96c98d0a578516 RPi.GPIO-0.6.3.tar.gz
diff --git a/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk b/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk
index 8f02d160..fd326742 100644
--- a/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk
+++ b/bsp/buildroot/package/python-rpi-gpio/python-rpi-gpio.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_RPI_GPIO_VERSION = 0.6.2
+PYTHON_RPI_GPIO_VERSION = 0.6.3
 PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz
-PYTHON_RPI_GPIO_SITE = https://pypi.python.org/packages/c1/a8/de92cf6d04376f541ce250de420f4fe7cbb2b32a7128929a600bc89aede5
+PYTHON_RPI_GPIO_SITE = https://pypi.python.org/packages/e2/58/6e1b775606da6439fa3fd1550e7f714ac62aa75e162eed29dbec684ecb3e
 PYTHON_RPI_GPIO_LICENSE = MIT
 PYTHON_RPI_GPIO_LICENSE_FILES = LICENCE.txt
 PYTHON_RPI_GPIO_SETUP_TYPE = distutils
diff --git a/bsp/buildroot/package/python-scandir/Config.in b/bsp/buildroot/package/python-scandir/Config.in
new file mode 100644
index 00000000..497f962a
--- /dev/null
+++ b/bsp/buildroot/package/python-scandir/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_SCANDIR
+	bool "python-scandir"
+	help
+	  scandir, a better directory iterator and faster os.walk()
+
+	  https://pypi.python.org/pypi/scandir
diff --git a/bsp/buildroot/package/python-scandir/python-scandir.hash b/bsp/buildroot/package/python-scandir/python-scandir.hash
new file mode 100644
index 00000000..aecd9a58
--- /dev/null
+++ b/bsp/buildroot/package/python-scandir/python-scandir.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/scandir/json, sha256 locally computed
+md5 a2713043de681bba6b084be42e7a8a44 scandir-1.5.tar.gz
+sha256 c2612d1a487d80fb4701b4a91ca1b8f8a695b1ae820570815e85e8c8b23f1283 scandir-1.5.tar.gz
diff --git a/bsp/buildroot/package/python-scandir/python-scandir.mk b/bsp/buildroot/package/python-scandir/python-scandir.mk
new file mode 100644
index 00000000..9b7ba700
--- /dev/null
+++ b/bsp/buildroot/package/python-scandir/python-scandir.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-scandir
+#
+################################################################################
+
+PYTHON_SCANDIR_VERSION = 1.5
+PYTHON_SCANDIR_SOURCE = scandir-$(PYTHON_SCANDIR_VERSION).tar.gz
+PYTHON_SCANDIR_SITE = https://pypi.python.org/packages/bd/f4/3143e0289faf0883228017dbc6387a66d0b468df646645e29e1eb89ea10e
+PYTHON_SCANDIR_LICENSE = BSD-3-Clause
+PYTHON_SCANDIR_LICENSE_FILES = LICENSE.txt
+PYTHON_SCANDIR_SETUP_TYPE = setuptools
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-scapy3k/python-scapy3k.mk b/bsp/buildroot/package/python-scapy3k/python-scapy3k.mk
index 661cb9d7..e858dcc7 100644
--- a/bsp/buildroot/package/python-scapy3k/python-scapy3k.mk
+++ b/bsp/buildroot/package/python-scapy3k/python-scapy3k.mk
@@ -7,6 +7,6 @@
 PYTHON_SCAPY3K_VERSION = v0.18
 PYTHON_SCAPY3K_SITE = $(call github,phaethon,scapy,$(PYTHON_SCAPY3K_VERSION))
 PYTHON_SCAPY3K_SETUP_TYPE = distutils
-PYTHON_SCAPY3K_LICENSE = GPLv2+
+PYTHON_SCAPY3K_LICENSE = GPL-2.0+
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-schedule/Config.in b/bsp/buildroot/package/python-schedule/Config.in
new file mode 100644
index 00000000..d00c2459
--- /dev/null
+++ b/bsp/buildroot/package/python-schedule/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_SCHEDULE
+	bool "python-schedule"
+	help
+	  Job scheduling for humans.
+
+	  https://github.com/dbader/schedule
diff --git a/bsp/buildroot/package/python-schedule/python-schedule.hash b/bsp/buildroot/package/python-schedule/python-schedule.hash
new file mode 100644
index 00000000..2b2f0489
--- /dev/null
+++ b/bsp/buildroot/package/python-schedule/python-schedule.hash
@@ -0,0 +1,5 @@
+# md5 from https://pypi.python.org/pypi/schedule/json, sha256 locally computed
+md5	ab135a73458547d2b836beddd168528b  schedule-0.4.3.tar.gz
+sha256	31a160546a17838842199c792ba267575cf41339ca730aaf060567b798f4f46e  schedule-0.4.3.tar.gz
+# License file, locally calculated
+sha256	30a8352c318ce1b645acde0299697342d4380ed2637d7ca18a8ad25661e3b41b  LICENSE.txt
diff --git a/bsp/buildroot/package/python-schedule/python-schedule.mk b/bsp/buildroot/package/python-schedule/python-schedule.mk
new file mode 100644
index 00000000..26a3f5bc
--- /dev/null
+++ b/bsp/buildroot/package/python-schedule/python-schedule.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-schedule
+#
+################################################################################
+
+PYTHON_SCHEDULE_VERSION = 0.4.3
+PYTHON_SCHEDULE_SOURCE = schedule-$(PYTHON_SCHEDULE_VERSION).tar.gz
+PYTHON_SCHEDULE_SITE = https://pypi.python.org/packages/ee/68/ba6b0bb69b2be13b32983971bca6c5adf22df6321945232e1419bc34a82f
+PYTHON_SCHEDULE_SETUP_TYPE = setuptools
+PYTHON_SCHEDULE_LICENSE = MIT
+PYTHON_SCHEDULE_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-secretstorage/Config.in b/bsp/buildroot/package/python-secretstorage/Config.in
new file mode 100644
index 00000000..87aaf6a7
--- /dev/null
+++ b/bsp/buildroot/package/python-secretstorage/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PYTHON_SECRETSTORAGE
+	bool "python-secretstorage"
+	depends on BR2_INSTALL_LIBSTDCPP # python-cryptography
+	select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime
+	help
+	  Python bindings to FreeDesktop.org Secret Service API.
+
+	  https://github.com/mitya57/secretstorage
+
+comment "python-secretstorage needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/python-secretstorage/python-secretstorage.hash b/bsp/buildroot/package/python-secretstorage/python-secretstorage.hash
new file mode 100644
index 00000000..b45fb571
--- /dev/null
+++ b/bsp/buildroot/package/python-secretstorage/python-secretstorage.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/secretstorage/json, sha256 locally computed
+md5	3b9465831b069e2622973afb7deb7bc2  SecretStorage-2.3.1.tar.gz
+sha256	3af65c87765323e6f64c83575b05393f9e003431959c9395d1791d51497f29b6  SecretStorage-2.3.1.tar.gz
+sha256  1debb9ff5d6759fd23cdb40e3ba34b1fa68dd0b19672b6d154599fb0ab704c57  LICENSE
diff --git a/bsp/buildroot/package/python-secretstorage/python-secretstorage.mk b/bsp/buildroot/package/python-secretstorage/python-secretstorage.mk
new file mode 100644
index 00000000..b9776d66
--- /dev/null
+++ b/bsp/buildroot/package/python-secretstorage/python-secretstorage.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-secretstorage
+#
+################################################################################
+
+PYTHON_SECRETSTORAGE_VERSION = 2.3.1
+PYTHON_SECRETSTORAGE_SOURCE = SecretStorage-$(PYTHON_SECRETSTORAGE_VERSION).tar.gz
+PYTHON_SECRETSTORAGE_SITE = https://pypi.python.org/packages/a5/a5/0830cfe34a4cfd0d1c3c8b614ede1edb2aaf999091ac8548dd19cb352e79
+PYTHON_SECRETSTORAGE_SETUP_TYPE = setuptools
+PYTHON_SECRETSTORAGE_LICENSE = BSD-3-Clause
+PYTHON_SECRETSTORAGE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-see/Config.in b/bsp/buildroot/package/python-see/Config.in
new file mode 100644
index 00000000..f3049fd8
--- /dev/null
+++ b/bsp/buildroot/package/python-see/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_SEE
+	bool "python-see"
+	help
+	  dir for humans.
+
+	  https://ljcooke.github.io/see/
diff --git a/bsp/buildroot/package/python-see/python-see.hash b/bsp/buildroot/package/python-see/python-see.hash
new file mode 100644
index 00000000..c48ee88b
--- /dev/null
+++ b/bsp/buildroot/package/python-see/python-see.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/see/json, sha256 locally computed
+md5	cb3bf4d314f73a8f7a2fd3d2d99aab54  see-1.4.1.tar.gz
+sha256	14f8f8a88a909a7d7dea81f0016e3fdfabd3b5d335992e102a382e1a71672bd1  see-1.4.1.tar.gz
+sha256  dccbd040a7deacee7f05e5e46a8eba6e786ac319f0cb94c36f92d789585911a6  LICENSE
diff --git a/bsp/buildroot/package/python-see/python-see.mk b/bsp/buildroot/package/python-see/python-see.mk
new file mode 100644
index 00000000..982962be
--- /dev/null
+++ b/bsp/buildroot/package/python-see/python-see.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-see
+#
+################################################################################
+
+PYTHON_SEE_VERSION = 1.4.1
+PYTHON_SEE_SOURCE = see-$(PYTHON_SEE_VERSION).tar.gz
+PYTHON_SEE_SITE = https://pypi.python.org/packages/ff/fc/fcabb6a9bfe7c56798285839780cae67342256b823b97e94d862b0ba21d6
+PYTHON_SEE_SETUP_TYPE = setuptools
+PYTHON_SEE_LICENSE = BSD-3-Clause
+PYTHON_SEE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-serial/python-serial.mk b/bsp/buildroot/package/python-serial/python-serial.mk
index 4b3ffadc..ce7ec070 100644
--- a/bsp/buildroot/package/python-serial/python-serial.mk
+++ b/bsp/buildroot/package/python-serial/python-serial.mk
@@ -7,7 +7,7 @@
 PYTHON_SERIAL_VERSION = 3.1
 PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz
 PYTHON_SERIAL_SITE = https://pypi.python.org/packages/ce/9c/694ce79a9d4a164e109aeba1a40fba23336f3b7554978553e22a5d41d54d
-PYTHON_SERIAL_LICENSE = Python Software Foundation License
+PYTHON_SERIAL_LICENSE = BSD-3-Clause
 PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt
 PYTHON_SERIAL_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-service-identity/python-service-identity.hash b/bsp/buildroot/package/python-service-identity/python-service-identity.hash
index 09561d8f..7caaaf99 100644
--- a/bsp/buildroot/package/python-service-identity/python-service-identity.hash
+++ b/bsp/buildroot/package/python-service-identity/python-service-identity.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/service_identity/json, sha256 locally computed
-md5	d52392597b9c44a740abf322bfdb21e6  service_identity-16.0.0.tar.gz
-sha256	0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036  service_identity-16.0.0.tar.gz
+md5 f509cb41ca2f8420bd8496291136d6cc  service_identity-17.0.0.tar.gz
+sha256 4001fbb3da19e0df22c47a06d29681a398473af4aa9d745eca525b3b2c2302ab  service_identity-17.0.0.tar.gz
diff --git a/bsp/buildroot/package/python-service-identity/python-service-identity.mk b/bsp/buildroot/package/python-service-identity/python-service-identity.mk
index 88549abf..ccc6e71a 100644
--- a/bsp/buildroot/package/python-service-identity/python-service-identity.mk
+++ b/bsp/buildroot/package/python-service-identity/python-service-identity.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SERVICE_IDENTITY_VERSION = 16.0.0
+PYTHON_SERVICE_IDENTITY_VERSION = 17.0.0
 PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz
-PYTHON_SERVICE_IDENTITY_SITE = https://pypi.python.org/packages/f3/2a/7c04e7ab74f9f2be026745a9ffa81fd9d56139fa6f5f4b4c8a8c07b2bfba
+PYTHON_SERVICE_IDENTITY_SITE = https://pypi.python.org/packages/de/2a/cab6e30be82c8fcd2339ef618036720eda954cf05daef514e386661c9221
 PYTHON_SERVICE_IDENTITY_LICENSE = MIT
 PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE
 PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-setproctitle/python-setproctitle.mk b/bsp/buildroot/package/python-setproctitle/python-setproctitle.mk
index c3c6386b..ff33c0c1 100644
--- a/bsp/buildroot/package/python-setproctitle/python-setproctitle.mk
+++ b/bsp/buildroot/package/python-setproctitle/python-setproctitle.mk
@@ -7,7 +7,7 @@
 PYTHON_SETPROCTITLE_VERSION = 1.1.10
 PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz
 PYTHON_SETPROCTITLE_SITE = https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3
-PYTHON_SETPROCTITLE_LICENSE = BSD-3c
+PYTHON_SETPROCTITLE_LICENSE = BSD-3-Clause
 PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT
 PYTHON_SETPROCTITLE_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash b/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash
index 734fc5a9..e34e8e2b 100644
--- a/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash
+++ b/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/setuptools_scm/json, sha256 locally computed
-md5	b6916c78ed6253d6602444fad4279c5b  setuptools_scm-1.15.0.tar.gz
-sha256	daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f  setuptools_scm-1.15.0.tar.gz
+md5 f17493d53f0d842bb0152f214775640b setuptools_scm-1.15.6.tar.gz
+sha256 49ab4685589986a42da85706b3311a2f74f1af567d39fee6cb1e088d7a75fb5f setuptools_scm-1.15.6.tar.gz
diff --git a/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk b/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk
index 993fbb97..acde2618 100644
--- a/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk
+++ b/bsp/buildroot/package/python-setuptools-scm/python-setuptools-scm.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SETUPTOOLS_SCM_VERSION = 1.15.0
+PYTHON_SETUPTOOLS_SCM_VERSION = 1.15.6
 PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz
-PYTHON_SETUPTOOLS_SCM_SITE = https://pypi.python.org/packages/80/b7/31b6ae5fcb188e37f7e31abe75f9be90490a5456a72860fa6e643f8a3cbc
+PYTHON_SETUPTOOLS_SCM_SITE = https://pypi.python.org/packages/03/6d/aafdd01edd227ee879b691455bf19895091872af7e48192bea1758c82032
 PYTHON_SETUPTOOLS_SCM_LICENSE = MIT
 PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE
 PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-setuptools/Config.in b/bsp/buildroot/package/python-setuptools/Config.in
index c72c59fb..f203d0f8 100644
--- a/bsp/buildroot/package/python-setuptools/Config.in
+++ b/bsp/buildroot/package/python-setuptools/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_PYTHON_SETUPTOOLS
 	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
 	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
 	help
-	  Download, build, install, upgrade, and uninstall Python packages.
+	  Download, build, install, upgrade, and uninstall Python
+	  packages.
 
 	  http://pypi.python.org/pypi/setuptools
diff --git a/bsp/buildroot/package/python-setuptools/python-setuptools.hash b/bsp/buildroot/package/python-setuptools/python-setuptools.hash
index 88113fa1..f116a69f 100644
--- a/bsp/buildroot/package/python-setuptools/python-setuptools.hash
+++ b/bsp/buildroot/package/python-setuptools/python-setuptools.hash
@@ -1,4 +1,3 @@
-# From https://pypi.python.org/pypi/setuptools/18.7.1
-md5 a0984da9cd8d7b582e1fd7de67dfdbcc setuptools-18.7.1.tar.gz
 # Locally calculated
-sha256  aff36c95035e0b311eacb1434e3f7e85f5ccaad477773847e582978f8f45bd74  setuptools-18.7.1.tar.gz
+sha256  2599b4c452e77824bbd6da28d16b1fe8159c7a4c203d8d419d8b348fde7b9549  python-setuptools-v38.4.0.tar.gz
+sha256  c32a3ac395af6321efd28be73d06a00f0db6ab887d1c21d4fec46128d2056d5a  LICENSE
diff --git a/bsp/buildroot/package/python-setuptools/python-setuptools.mk b/bsp/buildroot/package/python-setuptools/python-setuptools.mk
index 15edc6fd..004fc0db 100644
--- a/bsp/buildroot/package/python-setuptools/python-setuptools.mk
+++ b/bsp/buildroot/package/python-setuptools/python-setuptools.mk
@@ -4,12 +4,20 @@
 #
 ################################################################################
 
-PYTHON_SETUPTOOLS_VERSION = 18.7.1
-PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz
-PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools
-PYTHON_SETUPTOOLS_LICENSE = Python Software Foundation or Zope Public License
-PYTHON_SETUPTOOLS_LICENSE_FILES = PKG-INFO
+PYTHON_SETUPTOOLS_VERSION = v38.4.0
+PYTHON_SETUPTOOLS_SITE = $(call github,pypa,setuptools,$(PYTHON_SETUPTOOLS_VERSION))
+PYTHON_SETUPTOOLS_LICENSE = MIT
+PYTHON_SETUPTOOLS_LICENSE_FILES = LICENSE
 PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools
 
+# recent setuptools versions require bootstrap.py to be invoked
+# before the standard setup process.
+define PYTHON_SETUPTOOLS_RUN_BOOTSTRAP
+	cd  $(@D) && $(HOST_DIR)/bin/python ./bootstrap.py
+endef
+
+PYTHON_SETUPTOOLS_PRE_CONFIGURE_HOOKS = PYTHON_SETUPTOOLS_RUN_BOOTSTRAP
+HOST_PYTHON_SETUPTOOLS_PRE_CONFIGURE_HOOKS = PYTHON_SETUPTOOLS_RUN_BOOTSTRAP
+
 $(eval $(python-package))
 $(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-sh/python-sh.hash b/bsp/buildroot/package/python-sh/python-sh.hash
index 0445fa62..cbc6745b 100644
--- a/bsp/buildroot/package/python-sh/python-sh.hash
+++ b/bsp/buildroot/package/python-sh/python-sh.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/sh/json, sha256 locally computed
-md5	89d46b1dba32713b7df74b1bc59d74a1  sh-1.12.7.tar.gz
-sha256	5a07373657a1a704a34ea1bf73b2e55c42388c5d449634d6d7c96147f5660086  sh-1.12.7.tar.gz
+md5 a8351aef25d25f707c17e0a7a6280251 sh-1.12.14.tar.gz
+sha256 b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc sh-1.12.14.tar.gz
diff --git a/bsp/buildroot/package/python-sh/python-sh.mk b/bsp/buildroot/package/python-sh/python-sh.mk
index 1aa6bb9b..dfe80d56 100644
--- a/bsp/buildroot/package/python-sh/python-sh.mk
+++ b/bsp/buildroot/package/python-sh/python-sh.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SH_VERSION = 1.12.7
+PYTHON_SH_VERSION = 1.12.14
 PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz
-PYTHON_SH_SITE = https://pypi.python.org/packages/c2/98/565d9b566b3153607336ae9e91c1c467896f7f786c2d5d8e50fef7d75b08
+PYTHON_SH_SITE = https://pypi.python.org/packages/7c/71/199d27d3e7e78bf448bcecae0105a1d5b29173ffd2bbadaa95a74c156770
 PYTHON_SH_SETUP_TYPE = setuptools
 PYTHON_SH_LICENSE = MIT
 PYTHON_SH_LICENSE_FILES = LICENSE.txt
diff --git a/bsp/buildroot/package/python-shutilwhich/Config.in b/bsp/buildroot/package/python-shutilwhich/Config.in
index abdc8d77..a75a63bb 100644
--- a/bsp/buildroot/package/python-shutilwhich/Config.in
+++ b/bsp/buildroot/package/python-shutilwhich/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_SHUTILWHICH
 	bool "python-shutilwhich"
-	depends on BR2_PACKAGE_PYTHON
 	help
 	  shutil.which for those not using Python 3.3 yet.
 
diff --git a/bsp/buildroot/package/python-shutilwhich/python-shutilwhich.mk b/bsp/buildroot/package/python-shutilwhich/python-shutilwhich.mk
index 0497e1b6..0cf968a4 100644
--- a/bsp/buildroot/package/python-shutilwhich/python-shutilwhich.mk
+++ b/bsp/buildroot/package/python-shutilwhich/python-shutilwhich.mk
@@ -6,8 +6,8 @@
 
 PYTHON_SHUTILWHICH_VERSION = 1.1.0
 PYTHON_SHUTILWHICH_SOURCE = shutilwhich-$(PYTHON_SHUTILWHICH_VERSION).tar.gz
-PYTHON_SHUTILWHICH_SITE = http://pypi.python.org/packages/source/s/shutilwhich
-PYTHON_SHUTILWHICH_LICENSE = Python Software Foundation License
+PYTHON_SHUTILWHICH_SITE = https://pypi.python.org/packages/source/s/shutilwhich
+PYTHON_SHUTILWHICH_LICENSE = Python-2.0
 PYTHON_SHUTILWHICH_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-simpleaudio/Config.in b/bsp/buildroot/package/python-simpleaudio/Config.in
index a3e07f9e..c6fcd8b0 100644
--- a/bsp/buildroot/package/python-simpleaudio/Config.in
+++ b/bsp/buildroot/package/python-simpleaudio/Config.in
@@ -4,8 +4,9 @@ config BR2_PACKAGE_PYTHON_SIMPLEAUDIO
 	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
 	select BR2_PACKAGE_ALSA_LIB
 	help
-	  The simplaudio package provides cross-platform, dependency-free
-	  audio playback capability for Python 3 on OSX, Windows, and Linux.
+	  The simplaudio package provides cross-platform,
+	  dependency-free audio playback capability for Python 3 on
+	  OSX, Windows, and Linux.
 
 	  https://github.com/hamiltron/py-simple-audio
 
diff --git a/bsp/buildroot/package/python-simpleaudio/python-simpleaudio.mk b/bsp/buildroot/package/python-simpleaudio/python-simpleaudio.mk
index b9562ee6..24ec067d 100644
--- a/bsp/buildroot/package/python-simpleaudio/python-simpleaudio.mk
+++ b/bsp/buildroot/package/python-simpleaudio/python-simpleaudio.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
 #
 # python-simpleaudio
 #
-#############################################################
+################################################################################
 
 PYTHON_SIMPLEAUDIO_VERSION = 1.0.1
 PYTHON_SIMPLEAUDIO_SOURCE = simpleaudio-$(PYTHON_SIMPLEAUDIO_VERSION).tar.gz
diff --git a/bsp/buildroot/package/python-simplegeneric/Config.in b/bsp/buildroot/package/python-simplegeneric/Config.in
new file mode 100644
index 00000000..623b1ae9
--- /dev/null
+++ b/bsp/buildroot/package/python-simplegeneric/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_SIMPLEGENERIC
+	bool "python-simplegeneric"
+	help
+	  Simple generic functions (similar to Python's own len(),
+	  pickle.dump(), etc.)
+
+	  https://pypi.python.org/pypi/simplegeneric
diff --git a/bsp/buildroot/package/python-simplegeneric/python-simplegeneric.hash b/bsp/buildroot/package/python-simplegeneric/python-simplegeneric.hash
new file mode 100644
index 00000000..24f652c8
--- /dev/null
+++ b/bsp/buildroot/package/python-simplegeneric/python-simplegeneric.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/simplegeneric, sha256 locally computed
+md5 f9c1fab00fd981be588fc32759f474e3 simplegeneric-0.8.1.zip
+sha256 dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173 simplegeneric-0.8.1.zip
diff --git a/bsp/buildroot/package/python-simplegeneric/python-simplegeneric.mk b/bsp/buildroot/package/python-simplegeneric/python-simplegeneric.mk
new file mode 100644
index 00000000..cc843204
--- /dev/null
+++ b/bsp/buildroot/package/python-simplegeneric/python-simplegeneric.mk
@@ -0,0 +1,24 @@
+################################################################################
+#
+# python-simplegeneric
+#
+################################################################################
+
+PYTHON_SIMPLEGENERIC_VERSION = 0.8.1
+PYTHON_SIMPLEGENERIC_SOURCE = simplegeneric-$(PYTHON_SIMPLEGENERIC_VERSION).zip
+PYTHON_SIMPLEGENERIC_SITE = https://pypi.python.org/packages/3d/57/4d9c9e3ae9a255cd4e1106bb57e24056d3d0709fc01b2e3e345898e49d5b
+PYTHON_SIMPLEGENERIC_LICENSE = ZPL-2.1
+
+# Force setup-type to be 'setuptools' in order to force the package to
+# be installed with --single-version-externally-managed. Otherwise we
+# end up with a .egg file, which is a zip archive, and as such forces
+# us to have 'zlib' as a runtime dependency
+PYTHON_SIMPLEGENERIC_SETUP_TYPE = setuptools
+
+define PYTHON_SIMPLEGENERIC_EXTRACT_CMDS
+	unzip $(DL_DIR)/$(PYTHON_SIMPLEGENERIC_SOURCE) -d $(@D)
+	mv $(@D)/simplegeneric-$(PYTHON_SIMPLEGENERIC_VERSION)/* $(@D)
+	rmdir $(@D)/simplegeneric-$(PYTHON_SIMPLEGENERIC_VERSION)
+endef
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-simplejson/Config.in b/bsp/buildroot/package/python-simplejson/Config.in
index be0ee8f9..c2fd9177 100644
--- a/bsp/buildroot/package/python-simplejson/Config.in
+++ b/bsp/buildroot/package/python-simplejson/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_PYTHON_SIMPLEJSON
 	bool "python-simplejson"
-	depends on BR2_PACKAGE_PYTHON
 	help
-	  Simple, fast, extensible JSON encoder/decoder for Python
+	  Simple, fast, extensible JSON encoder/decoder for Python.
 
 	  https://pypi.python.org/pypi/simplejson/
diff --git a/bsp/buildroot/package/python-simplejson/python-simplejson.hash b/bsp/buildroot/package/python-simplejson/python-simplejson.hash
index 19421b86..f2a5fce3 100644
--- a/bsp/buildroot/package/python-simplejson/python-simplejson.hash
+++ b/bsp/buildroot/package/python-simplejson/python-simplejson.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/simplejson/json, sha256 locally computed
-md5	53b1371bbf883b129a12d594a97e9a18  simplejson-3.8.2.tar.gz
-sha256	d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f  simplejson-3.8.2.tar.gz
+md5 6e2f1bd5fb0a926facf5d89d217a7183 simplejson-3.11.1.tar.gz
+sha256 01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7 simplejson-3.11.1.tar.gz
diff --git a/bsp/buildroot/package/python-simplejson/python-simplejson.mk b/bsp/buildroot/package/python-simplejson/python-simplejson.mk
index 703bca22..afc77fec 100644
--- a/bsp/buildroot/package/python-simplejson/python-simplejson.mk
+++ b/bsp/buildroot/package/python-simplejson/python-simplejson.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_SIMPLEJSON_VERSION = 3.8.2
+PYTHON_SIMPLEJSON_VERSION = 3.11.1
 PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz
-PYTHON_SIMPLEJSON_SITE = https://pypi.python.org/packages/f0/07/26b519e6ebb03c2a74989f7571e6ae6b82e9d7d81b8de6fcdbfc643c7b58
+PYTHON_SIMPLEJSON_SITE = https://pypi.python.org/packages/08/48/c97b668d6da7d7bebe7ea1817a6f76394b0ec959cb04214ca833c34359df
 PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT
 PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt
 PYTHON_SIMPLEJSON_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-simplesqlite/Config.in b/bsp/buildroot/package/python-simplesqlite/Config.in
new file mode 100644
index 00000000..25941dd9
--- /dev/null
+++ b/bsp/buildroot/package/python-simplesqlite/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_PYTHON_SIMPLESQLITE
+	bool "python-simplesqlite"
+	select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime
+	select BR2_PACKAGE_PYTHON_LOGBOOK # runtime
+	select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
+	select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime
+	select BR2_PACKAGE_PYTHON_PYTABLEREADER # runtime
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_TYPEPY # runtime
+	help
+	  SimpleSQLite is a Python library to simplify SQLite database
+	  operations: table creation, data insertion and get data as
+	  other data formats.
+
+	  https://github.com/thombashi/SimpleSQLite
diff --git a/bsp/buildroot/package/python-simplesqlite/python-simplesqlite.hash b/bsp/buildroot/package/python-simplesqlite/python-simplesqlite.hash
new file mode 100644
index 00000000..b9dc1378
--- /dev/null
+++ b/bsp/buildroot/package/python-simplesqlite/python-simplesqlite.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/simplesqlite/json, sha256 locally computed
+md5	be05735a65f91bf0bb47c2bfcf474dd3  SimpleSQLite-0.15.0.tar.gz
+sha256	319cf4fd660a2a8ba1d77bac65e3cb3bed30ef5e2b2f98aab558026a29bbefec  SimpleSQLite-0.15.0.tar.gz
diff --git a/bsp/buildroot/package/python-simplesqlite/python-simplesqlite.mk b/bsp/buildroot/package/python-simplesqlite/python-simplesqlite.mk
new file mode 100644
index 00000000..48c37c56
--- /dev/null
+++ b/bsp/buildroot/package/python-simplesqlite/python-simplesqlite.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-simplesqlite
+#
+################################################################################
+
+PYTHON_SIMPLESQLITE_VERSION = 0.15.0
+PYTHON_SIMPLESQLITE_SOURCE = SimpleSQLite-$(PYTHON_SIMPLESQLITE_VERSION).tar.gz
+PYTHON_SIMPLESQLITE_SITE = https://pypi.python.org/packages/d5/09/e256a7d421c223505d4e89079b4936c6a6de39a5a095ec4bcaa9bfc3f933
+PYTHON_SIMPLESQLITE_SETUP_TYPE = setuptools
+PYTHON_SIMPLESQLITE_LICENSE = MIT
+PYTHON_SIMPLESQLITE_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-sip/python-sip.mk b/bsp/buildroot/package/python-sip/python-sip.mk
index 0c0a9473..76d7d041 100644
--- a/bsp/buildroot/package/python-sip/python-sip.mk
+++ b/bsp/buildroot/package/python-sip/python-sip.mk
@@ -7,7 +7,7 @@
 PYTHON_SIP_VERSION = 4.18
 PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz
 PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION)
-PYTHON_SIP_LICENSE = SIP license or GPLv2 or GPLv3
+PYTHON_SIP_LICENSE = SIP license or GPL-2.0 or GPL-3.0
 PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3
 
 ifeq ($(BR2_PACKAGE_QT5),y)
@@ -30,7 +30,7 @@ endif
 
 define HOST_PYTHON_SIP_CONFIGURE_CMDS
 	(cd $(@D); \
-		$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python configure.py)
+		$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py)
 endef
 
 define HOST_PYTHON_SIP_BUILD_CMDS
@@ -43,14 +43,14 @@ endef
 
 define PYTHON_SIP_CONFIGURE_CMDS
 	(cd $(@D); \
-		$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python configure.py \
+		$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/bin/python configure.py \
 			--bindir $(TARGET_DIR)/usr/bin \
 			--destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \
-			--incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR)  \
+			--incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \
 			--sipdir $(TARGET_DIR)/usr/share/sip \
 			--sysroot $(STAGING_DIR)/usr \
 			--use-qmake && \
-		$(HOST_DIR)/usr/bin/qmake)
+		$(HOST_DIR)/bin/qmake)
 endef
 
 define PYTHON_SIP_BUILD_CMDS
diff --git a/bsp/buildroot/package/python-six/Config.in.host b/bsp/buildroot/package/python-six/Config.in.host
new file mode 100644
index 00000000..1d37e768
--- /dev/null
+++ b/bsp/buildroot/package/python-six/Config.in.host
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_HOST_PYTHON_SIX
+	bool "host python-six"
+	help
+	  Six is a Python 2 and 3 compatibility library. It provides
+	  utility functions for smoothing over the differences between
+	  the Python versions with the goal of writing Python code that
+	  is compatible on both Python versions.
+
+	  http://pythonhosted.org/six
diff --git a/bsp/buildroot/package/python-six/python-six.hash b/bsp/buildroot/package/python-six/python-six.hash
index a90c79b7..f9dbf09e 100644
--- a/bsp/buildroot/package/python-six/python-six.hash
+++ b/bsp/buildroot/package/python-six/python-six.hash
@@ -1,2 +1,4 @@
-# Locally computed:
-sha256  105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a  six-1.10.0.tar.gz
+# md5 from https://pypi.python.org/pypi/six/json, sha256 locally computed
+md5	d12789f9baf7e9fb2524c0c64f1773f8  six-1.11.0.tar.gz
+sha256	70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9  six-1.11.0.tar.gz
+sha256  63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328  LICENSE
diff --git a/bsp/buildroot/package/python-six/python-six.mk b/bsp/buildroot/package/python-six/python-six.mk
index 0edefe34..cd806342 100644
--- a/bsp/buildroot/package/python-six/python-six.mk
+++ b/bsp/buildroot/package/python-six/python-six.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-PYTHON_SIX_VERSION = 1.10.0
+PYTHON_SIX_VERSION = 1.11.0
 PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz
-PYTHON_SIX_SITE = https://pypi.python.org/packages/source/s/six
+PYTHON_SIX_SITE = https://pypi.python.org/packages/16/d8/bc6316cf98419719bd59c91742194c111b6f2e85abac88e496adefaf7afe
 PYTHON_SIX_SETUP_TYPE = setuptools
 PYTHON_SIX_LICENSE = MIT
 PYTHON_SIX_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-slob/Config.in b/bsp/buildroot/package/python-slob/Config.in
index 2c8ddb08..6f83808a 100644
--- a/bsp/buildroot/package/python-slob/Config.in
+++ b/bsp/buildroot/package/python-slob/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_PYTHON_SLOB
 	bool "python-slob"
 	depends on !BR2_BINFMT_FLAT # python-pyicu -> icu
 	depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # python-pyicu -> icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # python-pyicu -> icu
 	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_PYTHON_PYICU # runtime
 	# although optional, it is used as default compression
@@ -12,6 +14,8 @@ config BR2_PACKAGE_PYTHON_SLOB
 
 	  https://github.com/itkach/slob
 
-comment "python-slob needs a toolchain w/ C++"
+comment "python-slob needs a toolchain w/ C++, gcc >= 4.8, host gcc >= 4.8"
 	depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT
-	depends on !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_HOST_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
diff --git a/bsp/buildroot/package/python-slob/python-slob.mk b/bsp/buildroot/package/python-slob/python-slob.mk
index 474c0c94..2db39322 100644
--- a/bsp/buildroot/package/python-slob/python-slob.mk
+++ b/bsp/buildroot/package/python-slob/python-slob.mk
@@ -6,7 +6,7 @@
 
 PYTHON_SLOB_VERSION = 31ad0e769360a5b10a4893f686587bb8e48c3895
 PYTHON_SLOB_SITE = $(call github,itkach,slob,$(PYTHON_SLOB_VERSION))
-PYTHON_SLOB_LICENSE = GPLv3
+PYTHON_SLOB_LICENSE = GPL-3.0
 PYTHON_SLOB_LICENSE_FILES = LICENSE
 PYTHON_SLOB_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/python-smbus-cffi/python-smbus-cffi.mk b/bsp/buildroot/package/python-smbus-cffi/python-smbus-cffi.mk
index 5fd9558e..bc5731d7 100644
--- a/bsp/buildroot/package/python-smbus-cffi/python-smbus-cffi.mk
+++ b/bsp/buildroot/package/python-smbus-cffi/python-smbus-cffi.mk
@@ -8,7 +8,7 @@ PYTHON_SMBUS_CFFI_VERSION = 0.5.1
 PYTHON_SMBUS_CFFI_SOURCE = smbus-cffi-$(PYTHON_SMBUS_CFFI_VERSION).tar.gz
 PYTHON_SMBUS_CFFI_SITE = https://pypi.python.org/packages/source/s/smbus-cffi
 PYTHON_SMBUS_CFFI_SETUP_TYPE = setuptools
-PYTHON_SMBUS_CFFI_LICENSE = GPLv2
+PYTHON_SMBUS_CFFI_LICENSE = GPL-2.0
 PYTHON_SMBUS_CFFI_LICENSE_FILES = LICENSE
 PYTHON_SMBUS_CFFI_DEPENDENCIES = host-python-cffi
 
diff --git a/bsp/buildroot/package/python-sortedcontainers/Config.in b/bsp/buildroot/package/python-sortedcontainers/Config.in
new file mode 100644
index 00000000..43bd1b1c
--- /dev/null
+++ b/bsp/buildroot/package/python-sortedcontainers/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_SORTEDCONTAINERS
+	bool "python-sortedcontainers"
+	help
+	  Python Sorted Container Types: SortedList, SortedDict, and
+	  SortedSet.
+
+	  http://www.grantjenks.com/docs/sortedcontainers/
diff --git a/bsp/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash b/bsp/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
new file mode 100644
index 00000000..11fa0766
--- /dev/null
+++ b/bsp/buildroot/package/python-sortedcontainers/python-sortedcontainers.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/sortedcontainers/json, sha256 locally computed
+md5	ad4f00e377ad934954ac90fcac0b185f  sortedcontainers-1.5.7.tar.gz
+sha256	0ff0442865e492bc50476b18000fb8400cf2472d14d21a92b27cd7c5184550ea  sortedcontainers-1.5.7.tar.gz
diff --git a/bsp/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk b/bsp/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
new file mode 100644
index 00000000..99606816
--- /dev/null
+++ b/bsp/buildroot/package/python-sortedcontainers/python-sortedcontainers.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-sortedcontainers
+#
+################################################################################
+
+PYTHON_SORTEDCONTAINERS_VERSION = 1.5.7
+PYTHON_SORTEDCONTAINERS_SOURCE = sortedcontainers-$(PYTHON_SORTEDCONTAINERS_VERSION).tar.gz
+PYTHON_SORTEDCONTAINERS_SITE = https://pypi.python.org/packages/8d/aa/5369362d730728639ba434318df26b5c554804578d1c48381367ea5377c6
+PYTHON_SORTEDCONTAINERS_SETUP_TYPE = setuptools
+PYTHON_SORTEDCONTAINERS_LICENSE = Apache-2.0
+PYTHON_SORTEDCONTAINERS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-spidev/python-spidev.mk b/bsp/buildroot/package/python-spidev/python-spidev.mk
index d839bb3f..17fb049c 100644
--- a/bsp/buildroot/package/python-spidev/python-spidev.mk
+++ b/bsp/buildroot/package/python-spidev/python-spidev.mk
@@ -8,7 +8,7 @@ PYTHON_SPIDEV_VERSION = 3.2
 PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz
 PYTHON_SPIDEV_SITE = https://pypi.python.org/packages/36/83/73748b6e1819b57d8e1df8090200195cdae33aaa22a49a91ded16785eedd
 PYTHON_SPIDEV_SETUP_TYPE = distutils
-PYTHON_SPIDEV_LICENSE = GPLv2
+PYTHON_SPIDEV_LICENSE = GPL-2.0
 PYTHON_SPIDEV_LICENSE_FILES = LICENSE.md
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-systemd/Config.in b/bsp/buildroot/package/python-systemd/Config.in
new file mode 100644
index 00000000..599b43f7
--- /dev/null
+++ b/bsp/buildroot/package/python-systemd/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_SYSTEMD
+	bool "python-systemd"
+	depends on BR2_PACKAGE_SYSTEMD
+	help
+	  Python module for native access to the systemd facilities.
+
+	  https://github.com/systemd/python-systemd
+
+comment "python-systemd needs systemd"
+	depends on !BR2_PACKAGE_SYSTEMD
diff --git a/bsp/buildroot/package/python-systemd/python-systemd.hash b/bsp/buildroot/package/python-systemd/python-systemd.hash
new file mode 100644
index 00000000..ae480b8f
--- /dev/null
+++ b/bsp/buildroot/package/python-systemd/python-systemd.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/systemd-python/, sha256 locally computed
+md5 5071ea5bcb976186e92a3f5e75df221d systemd-python-234.tar.gz
+sha256 fd0e44bf70eadae45aadc292cb0a7eb5b0b6372cd1b391228047d33895db83e7 systemd-python-234.tar.gz
diff --git a/bsp/buildroot/package/python-systemd/python-systemd.mk b/bsp/buildroot/package/python-systemd/python-systemd.mk
new file mode 100644
index 00000000..3ccfd57c
--- /dev/null
+++ b/bsp/buildroot/package/python-systemd/python-systemd.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-systemd
+#
+################################################################################
+
+PYTHON_SYSTEMD_VERSION = 234 # Should be kept in sync with $(SYSTEMD_VERSION)
+PYTHON_SYSTEMD_SOURCE = systemd-python-$(PYTHON_SYSTEMD_VERSION).tar.gz
+PYTHON_SYSTEMD_SITE = https://pypi.python.org/packages/e8/a8/00ba0f605837a8f69523e6c3a4fb14675a6430c163f836540129c50b3aef
+PYTHON_SYSTEMD_SETUP_TYPE = distutils
+PYTHON_SYSTEMD_LICENSE = LGPL-2.1
+PYTHON_SYSTEMD_LICENSE_FILES = LICENSE.txt
+PYTHON_SYSTEMD_DEPENDENCIES = systemd # To be able to link against libsystemd
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-tabledata/Config.in b/bsp/buildroot/package/python-tabledata/Config.in
new file mode 100644
index 00000000..9e8ca9c3
--- /dev/null
+++ b/bsp/buildroot/package/python-tabledata/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_PYTHON_TABLEDATA
+	bool "python-tabledata"
+	select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime
+	select BR2_PACKAGE_PYTHON_LOGBOOK # runtime
+	select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
+	select BR2_PACKAGE_PYTHON_TYPEPY # runtime
+	help
+	  A Python library to represent tabular data for
+	  pytablewriter/pytablereader/SimpleSQLite.
+
+	  https://github.com/thombashi/tabledata
diff --git a/bsp/buildroot/package/python-tabledata/python-tabledata.hash b/bsp/buildroot/package/python-tabledata/python-tabledata.hash
new file mode 100644
index 00000000..efc6d6a8
--- /dev/null
+++ b/bsp/buildroot/package/python-tabledata/python-tabledata.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/tabledata/json, sha256 locally computed
+md5	4ff69d8855a835890944591721d0c129  tabledata-0.0.5.tar.gz
+sha256	e16490e4c15f06ee258015431ec247a5b301aec4ebca3297cf6451efb9eb3cfb  tabledata-0.0.5.tar.gz
+sha256  cbce2ac14dd81b6a1155029034512a304505692cc63b625538916cf93bee8ca2  LICENSE
diff --git a/bsp/buildroot/package/python-tabledata/python-tabledata.mk b/bsp/buildroot/package/python-tabledata/python-tabledata.mk
new file mode 100644
index 00000000..13059093
--- /dev/null
+++ b/bsp/buildroot/package/python-tabledata/python-tabledata.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# python-tabledata
+#
+################################################################################
+
+PYTHON_TABLEDATA_VERSION = 0.0.5
+PYTHON_TABLEDATA_SOURCE = tabledata-$(PYTHON_TABLEDATA_VERSION).tar.gz
+PYTHON_TABLEDATA_SITE = https://pypi.python.org/packages/9d/03/2e96d18f2bd4b76611fc6aa3881c7e15c857eea99debea9b80ec689354ba
+PYTHON_TABLEDATA_SETUP_TYPE = setuptools
+PYTHON_TABLEDATA_LICENSE = MIT
+PYTHON_TABLEDATA_LICENSE_FILES = LICENSE
+
+# remove setup.cfg as it tries to create a wheel file and hence
+# breaks the build process
+define PYTHON_TABLEDATA_REMOVE_SETUP_CFG
+	rm $(@D)/setup.cfg
+endef
+PYTHON_TABLEDATA_POST_EXTRACT_HOOKS = PYTHON_TABLEDATA_REMOVE_SETUP_CFG
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-tempora/Config.in b/bsp/buildroot/package/python-tempora/Config.in
new file mode 100644
index 00000000..ab5c57f6
--- /dev/null
+++ b/bsp/buildroot/package/python-tempora/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_TEMPORA
+	bool "python-tempora"
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	select BR2_PACKAGE_PYTHON_PYTZ # runtime
+	help
+	  Objects and routines pertaining to date and time.
+
+	  https://github.com/jaraco/tempora
diff --git a/bsp/buildroot/package/python-tempora/python-tempora.hash b/bsp/buildroot/package/python-tempora/python-tempora.hash
new file mode 100644
index 00000000..a8367b94
--- /dev/null
+++ b/bsp/buildroot/package/python-tempora/python-tempora.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/tempora/json, sha256 locally computed
+md5	cd0dd5c51c9645285ff505ec531cbcc8  tempora-1.7.tar.gz
+sha256	a264672b7f39198eb90b531490ade4e873f6e13839253636c3bd6a5549be1984  tempora-1.7.tar.gz
diff --git a/bsp/buildroot/package/python-tempora/python-tempora.mk b/bsp/buildroot/package/python-tempora/python-tempora.mk
new file mode 100644
index 00000000..0bae36a2
--- /dev/null
+++ b/bsp/buildroot/package/python-tempora/python-tempora.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-tempora
+#
+################################################################################
+
+PYTHON_TEMPORA_VERSION = 1.7
+PYTHON_TEMPORA_SOURCE = tempora-$(PYTHON_TEMPORA_VERSION).tar.gz
+PYTHON_TEMPORA_SITE = https://pypi.python.org/packages/db/2d/c838e9e553d774962a71b832b2c6390194904bfe49fd0d9d792ce8091e8a
+PYTHON_TEMPORA_LICENSE = MIT
+PYTHON_TEMPORA_SETUP_TYPE = setuptools
+PYTHON_TEMPORA_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-thrift/Config.in b/bsp/buildroot/package/python-thrift/Config.in
index 94a75900..20d94d0c 100644
--- a/bsp/buildroot/package/python-thrift/Config.in
+++ b/bsp/buildroot/package/python-thrift/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_THRIFT
 	bool "python-thrift"
 	depends on BR2_PACKAGE_PYTHON
 	help
-	  python-thrift is a Python bindings for the Apache Thrift RPC system.
+	  python-thrift is a Python bindings for the Apache Thrift RPC
+	  system.
 
 	  http://thrift.apache.org/
diff --git a/bsp/buildroot/package/python-toml/python-toml.hash b/bsp/buildroot/package/python-toml/python-toml.hash
index cbc71a96..20737c3c 100644
--- a/bsp/buildroot/package/python-toml/python-toml.hash
+++ b/bsp/buildroot/package/python-toml/python-toml.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	aee9679726f42fb09f48b9701a321571e0b6a51305c3e0f3913b3057d8bf7083  python-toml-0.9.2.tar.gz
+sha256	633a90ecb1f5665b58f0c94153fcf519313ef53e1de0eac90929cd6b6a014235  python-toml-0.9.3.tar.gz
diff --git a/bsp/buildroot/package/python-toml/python-toml.mk b/bsp/buildroot/package/python-toml/python-toml.mk
index fec113e1..fae15f93 100644
--- a/bsp/buildroot/package/python-toml/python-toml.mk
+++ b/bsp/buildroot/package/python-toml/python-toml.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_TOML_VERSION = 0.9.2
+PYTHON_TOML_VERSION = 0.9.3
 PYTHON_TOML_SITE = $(call github,uiri,toml,$(PYTHON_TOML_VERSION))
-PYTHON_TOML_SETUP_TYPE = distutils
+PYTHON_TOML_SETUP_TYPE = setuptools
 PYTHON_TOML_LICENSE = MIT
 PYTHON_TOML_LICENSE_FILES = LICENSE
 
diff --git a/bsp/buildroot/package/python-tornado/python-tornado.hash b/bsp/buildroot/package/python-tornado/python-tornado.hash
index ee4080fe..662db6f2 100644
--- a/bsp/buildroot/package/python-tornado/python-tornado.hash
+++ b/bsp/buildroot/package/python-tornado/python-tornado.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed
-md5	b4816ea209118667ffc52ce9ff06ac85  tornado-4.4.2.tar.gz
-sha256	2898f992f898cd41eeb8d53b6df75495f2f423b6672890aadaf196ea1448edcc  tornado-4.4.2.tar.gz
+md5	838687d20923360af5ab59f101e9e02e  tornado-4.5.1.tar.gz
+sha256	db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd  tornado-4.5.1.tar.gz
diff --git a/bsp/buildroot/package/python-tornado/python-tornado.mk b/bsp/buildroot/package/python-tornado/python-tornado.mk
index e512e60f..6e616756 100644
--- a/bsp/buildroot/package/python-tornado/python-tornado.mk
+++ b/bsp/buildroot/package/python-tornado/python-tornado.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_TORNADO_VERSION = 4.4.2
+PYTHON_TORNADO_VERSION = 4.5.1
 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
-PYTHON_TORNADO_SITE = https://pypi.python.org/packages/1e/7c/ea047f7bbd1ff22a7f69fe55e7561040e3e54d6f31da6267ef9748321f98
+PYTHON_TORNADO_SITE = https://pypi.python.org/packages/df/42/a180ee540e12e2ec1007ac82a42b09dd92e5461e09c98bf465e98646d187
 PYTHON_TORNADO_LICENSE = Apache-2.0
 PYTHON_TORNADO_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-traitlets/Config.in b/bsp/buildroot/package/python-traitlets/Config.in
new file mode 100644
index 00000000..f1804e55
--- /dev/null
+++ b/bsp/buildroot/package/python-traitlets/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_TRAITLETS
+	bool "python-traitlets"
+	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_SIX  # runtime
+	select BR2_PACKAGE_PYTHON_IPYTHON_GENUTILS  # runtime
+	select BR2_PACKAGE_PYTHON_DECORATOR  # runtime
+	help
+	  A configuration system for Python applications.
+
+	  https://pypi.python.org/pypi/traitlets
diff --git a/bsp/buildroot/package/python-traitlets/python-traitlets.hash b/bsp/buildroot/package/python-traitlets/python-traitlets.hash
new file mode 100644
index 00000000..23aa1591
--- /dev/null
+++ b/bsp/buildroot/package/python-traitlets/python-traitlets.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/traitlets/json, sha256 locally computed
+md5 3068663f2f38fd939a9eb3a500ccc154 traitlets-4.3.2.tar.gz
+sha256 9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835 traitlets-4.3.2.tar.gz
diff --git a/bsp/buildroot/package/python-traitlets/python-traitlets.mk b/bsp/buildroot/package/python-traitlets/python-traitlets.mk
new file mode 100644
index 00000000..779f5936
--- /dev/null
+++ b/bsp/buildroot/package/python-traitlets/python-traitlets.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-traitlets
+#
+################################################################################
+
+PYTHON_TRAITLETS_VERSION = 4.3.2
+PYTHON_TRAITLETS_SOURCE = traitlets-$(PYTHON_TRAITLETS_VERSION).tar.gz
+PYTHON_TRAITLETS_SITE = https://pypi.python.org/packages/a5/98/7f5ef2fe9e9e071813aaf9cb91d1a732e0a68b6c44a32b38cb8e14c3f069
+PYTHON_TRAITLETS_LICENSE = BSD-3-Clause
+PYTHON_TRAITLETS_LICENSE_FILES = COPYING.md
+PYTHON_TRAITLETS_SETUP_TYPE = distutils
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-treq/Config.in b/bsp/buildroot/package/python-treq/Config.in
index 4a237373..3a121ea7 100644
--- a/bsp/buildroot/package/python-treq/Config.in
+++ b/bsp/buildroot/package/python-treq/Config.in
@@ -1,14 +1,16 @@
 config BR2_PACKAGE_PYTHON_TREQ
 	bool "python-treq"
+	depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl
+	select BR2_PACKAGE_PYTHON_ATTRS # runtime
+	select BR2_PACKAGE_PYTHON_IDNA # runtime
+	select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
 	select BR2_PACKAGE_PYTHON_REQUESTS # runtime
 	select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime
 	select BR2_PACKAGE_PYTHON_SIX # runtime
 	select BR2_PACKAGE_PYTHON_TWISTED # runtime
-	select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
-	depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl
 	help
 	  treq is an HTTP library inspired by requests but written on
-	  top of Twisted's Agents.  It provides a simple, higher level
+	  top of Twisted's Agents. It provides a simple, higher level
 	  API for making HTTP requests when using Twisted.
 
 	  https://github.com/twisted/treq
diff --git a/bsp/buildroot/package/python-treq/python-treq.hash b/bsp/buildroot/package/python-treq/python-treq.hash
index f4cc4d6f..14f39460 100644
--- a/bsp/buildroot/package/python-treq/python-treq.hash
+++ b/bsp/buildroot/package/python-treq/python-treq.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b1fb60759ad5a885cb8ea562553f2d4c, sha256 locally computed
-md5	b1fb60759ad5a885cb8ea562553f2d4c  treq-15.1.0.tar.gz
-sha256	425a47d5d52a993d51211028fb6ade252e5fbea094e878bb4b644096a7322de8  treq-15.1.0.tar.gz
+# md5 from https://pypi.python.org/pypi/treq/json, sha256 locally computed
+md5	7e1f5079b85ec104d4759fc0fb89071e  treq-17.8.0.tar.gz
+sha256	ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16  treq-17.8.0.tar.gz
+sha256  7cc1b65e1937b1cc07052bb864ec96d8e5fd413400c0842e5b89a8201a600293  LICENSE
diff --git a/bsp/buildroot/package/python-treq/python-treq.mk b/bsp/buildroot/package/python-treq/python-treq.mk
index dbf0e148..73c47152 100644
--- a/bsp/buildroot/package/python-treq/python-treq.mk
+++ b/bsp/buildroot/package/python-treq/python-treq.mk
@@ -4,11 +4,12 @@
 #
 ################################################################################
 
-PYTHON_TREQ_VERSION = 15.1.0
+PYTHON_TREQ_VERSION = 17.8.0
 PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz
-PYTHON_TREQ_SITE = http://pypi.python.org/packages/source/t/treq
+PYTHON_TREQ_SITE = https://pypi.python.org/packages/11/3e/1014f26bfd4d07db015ad48384446b3bdc4de4bbdd2eba3be7fbb149cc44
 PYTHON_TREQ_LICENSE = MIT
 PYTHON_TREQ_LICENSE_FILES = LICENSE
 PYTHON_TREQ_SETUP_TYPE = setuptools
+PYTHON_TREQ_DEPENDENCIES = host-python-incremental
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-twisted/Config.in b/bsp/buildroot/package/python-twisted/Config.in
index 7fe4289d..344edb4a 100644
--- a/bsp/buildroot/package/python-twisted/Config.in
+++ b/bsp/buildroot/package/python-twisted/Config.in
@@ -1,9 +1,12 @@
 config BR2_PACKAGE_PYTHON_TWISTED
 	bool "python-twisted"
 	select BR2_PACKAGE_PYTHON_INCREMENTAL
+	select BR2_PACKAGE_PYTHON_AUTOMAT # runtime
 	select BR2_PACKAGE_PYTHON_CONSTANTLY # runtime
+	select BR2_PACKAGE_PYTHON_HYPERLINK # runtime
 	select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime
 	help
-	  Twisted is an event-driven networking engine written in Python.
+	  Twisted is an event-driven networking engine written in
+	  Python.
 
 	  https://twistedmatrix.com/trac/
diff --git a/bsp/buildroot/package/python-twisted/python-twisted.hash b/bsp/buildroot/package/python-twisted/python-twisted.hash
index cc78a4cb..c22f3364 100644
--- a/bsp/buildroot/package/python-twisted/python-twisted.hash
+++ b/bsp/buildroot/package/python-twisted/python-twisted.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/twisted/json, sha256 locally computed
-md5	54a88ffe773d5a83c91fcfe86044b094  Twisted-16.6.0.tar.bz2
-sha256	d0fe115ea7ef8cf632d05103de60356c6e992b2153d6830bdc4476f8accb1fca  Twisted-16.6.0.tar.bz2
+md5 cd5c287802dcbaf7be15cf937c922b71 Twisted-17.5.0.tar.bz2
+sha256 f198a494f0df2482f7c5f99d7f3eef33d22763ffc76641b36fec476b878002ea Twisted-17.5.0.tar.bz2
diff --git a/bsp/buildroot/package/python-twisted/python-twisted.mk b/bsp/buildroot/package/python-twisted/python-twisted.mk
index 29fe7358..fe276d64 100644
--- a/bsp/buildroot/package/python-twisted/python-twisted.mk
+++ b/bsp/buildroot/package/python-twisted/python-twisted.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PYTHON_TWISTED_VERSION = 16.6.0
+PYTHON_TWISTED_VERSION = 17.5.0
 PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2
-PYTHON_TWISTED_SITE = https://pypi.python.org/packages/dc/c0/a0114a6d7fa211c0904b0de931e8cafb5210ad824996cc6a9d67f3bae22c
+PYTHON_TWISTED_SITE = https://pypi.python.org/packages/31/bf/7f86a8f8b9778e90d8b2921e9f442a8c8aa33fd2489fc10f236bc8af1749
 PYTHON_TWISTED_SETUP_TYPE = setuptools
 PYTHON_TWISTED_LICENSE = MIT
 PYTHON_TWISTED_LICENSE_FILES = LICENSE
-PYTHON_TWISTED_DEPENDENCIES = python-incremental
+PYTHON_TWISTED_DEPENDENCIES = python-incremental host-python-incremental
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-txaio/python-txaio.hash b/bsp/buildroot/package/python-txaio/python-txaio.hash
index 37da82b1..6fb8e78c 100644
--- a/bsp/buildroot/package/python-txaio/python-txaio.hash
+++ b/bsp/buildroot/package/python-txaio/python-txaio.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi/txaio/json, sha256 locally computed.
-md5	7b0f5321515d380ad5d32f01666b6ee7  txaio-2.5.1.tar.gz
-sha256	625076477182e2dde78b79d0b2b0d6b3cecb0e24fe0ea7eaf2abd26a4c0dd1de  txaio-2.5.1.tar.gz
+# md5 from https://pypi.python.org/pypi/txaio/json, sha256 locally computed
+md5	a20e3431c95896a49fa3ffa84f77cde1  txaio-2.8.2.tar.gz
+sha256	484cd6c4cdd3f6081b87188f3b2b9a36e02fba6816e8256917c4f6571b567571  txaio-2.8.2.tar.gz
+sha256  0387eefce570453daaa60633f28676003731eeca28b2d0a0071c628e3a0004ef  LICENSE
diff --git a/bsp/buildroot/package/python-txaio/python-txaio.mk b/bsp/buildroot/package/python-txaio/python-txaio.mk
index 34c6e99c..5e4d7101 100644
--- a/bsp/buildroot/package/python-txaio/python-txaio.mk
+++ b/bsp/buildroot/package/python-txaio/python-txaio.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_TXAIO_VERSION = 2.5.1
+PYTHON_TXAIO_VERSION = 2.8.2
 PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz
-PYTHON_TXAIO_SITE = https://pypi.python.org/packages/45/e1/f7d88767d65dbfc20d4b4aa0dad657dbbe8ca629ead2bef24da04630a12a
+PYTHON_TXAIO_SITE = https://pypi.python.org/packages/d6/95/d0c67304515f352342bc8fd14e5a3e7ca924134608acb730916073b18464
 PYTHON_TXAIO_LICENSE = MIT
 PYTHON_TXAIO_LICENSE_FILES = LICENSE
 PYTHON_TXAIO_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-txtorcon/Config.in b/bsp/buildroot/package/python-txtorcon/Config.in
new file mode 100644
index 00000000..4f91e7b0
--- /dev/null
+++ b/bsp/buildroot/package/python-txtorcon/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_PYTHON_TXTORCON
+	bool "python-txtorcon"
+	depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-service-identity
+	select BR2_PACKAGE_PYTHON_AUTOMAT # runtime
+	select BR2_PACKAGE_PYTHON_IDNA # runtime
+	select BR2_PACKAGE_PYTHON_INCREMENTAL # runtime
+	select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime
+	select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime
+	select BR2_PACKAGE_PYTHON_TWISTED # runtime
+	select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime
+	help
+	  Twisted-based Tor controller client, with state-tracking and
+	  configuration abstractions.
+
+	  https://github.com/meejah/txtorcon
+
+comment "python-txtorcon needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/python-txtorcon/python-txtorcon.hash b/bsp/buildroot/package/python-txtorcon/python-txtorcon.hash
new file mode 100644
index 00000000..71a2ec50
--- /dev/null
+++ b/bsp/buildroot/package/python-txtorcon/python-txtorcon.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/txtorcon/json, sha256 locally computed
+md5	4d7380fa7e721c77cac103d971882374  txtorcon-0.19.3.tar.gz
+sha256	f73396667909a3c7a98f4dd865edf4ed6a2518ee5a935d92e18b8a479ec244fd  txtorcon-0.19.3.tar.gz
+sha256	3ada1c32ef38c23d96d7f4e8f4a226c527f51e0202883c7543b06f9cc5228a2b  LICENSE
diff --git a/bsp/buildroot/package/python-txtorcon/python-txtorcon.mk b/bsp/buildroot/package/python-txtorcon/python-txtorcon.mk
new file mode 100644
index 00000000..f75f5043
--- /dev/null
+++ b/bsp/buildroot/package/python-txtorcon/python-txtorcon.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-txtorcon
+#
+################################################################################
+
+PYTHON_TXTORCON_VERSION = 0.19.3
+PYTHON_TXTORCON_SOURCE = txtorcon-$(PYTHON_TXTORCON_VERSION).tar.gz
+PYTHON_TXTORCON_SITE = https://pypi.python.org/packages/05/4b/d2fbfdc08ab83c299f2ad22ba38ea35f71f1c966684f5754e079108a1f64
+PYTHON_TXTORCON_SETUP_TYPE = setuptools
+PYTHON_TXTORCON_LICENSE = MIT
+PYTHON_TXTORCON_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-typepy/Config.in b/bsp/buildroot/package/python-typepy/Config.in
new file mode 100644
index 00000000..60798570
--- /dev/null
+++ b/bsp/buildroot/package/python-typepy/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_PYTHON_TYPEPY
+	bool "python-typepy"
+	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
+	select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime
+	select BR2_PACKAGE_PYTHON_PYTZ # runtime
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  A Python library for variable type
+	  checker/validator/converter at a run time.
+
+	  https://github.com/thombashi/typepy
diff --git a/bsp/buildroot/package/python-typepy/python-typepy.hash b/bsp/buildroot/package/python-typepy/python-typepy.hash
new file mode 100644
index 00000000..9ecac881
--- /dev/null
+++ b/bsp/buildroot/package/python-typepy/python-typepy.hash
@@ -0,0 +1,3 @@
+# md5 from https://pypi.python.org/pypi/typepy/json, sha256 locally computed
+md5	b9abd4d661dabe512e95ca69ddb65d55  typepy-0.0.20.tar.gz
+sha256	a1a5b9438670d4a5d9f882b7499ea85d06dc384577bb7636cb29d903288bca8c  typepy-0.0.20.tar.gz
diff --git a/bsp/buildroot/package/python-typepy/python-typepy.mk b/bsp/buildroot/package/python-typepy/python-typepy.mk
new file mode 100644
index 00000000..33d80919
--- /dev/null
+++ b/bsp/buildroot/package/python-typepy/python-typepy.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-typepy
+#
+################################################################################
+
+PYTHON_TYPEPY_VERSION = 0.0.20
+PYTHON_TYPEPY_SOURCE = typepy-$(PYTHON_TYPEPY_VERSION).tar.gz
+PYTHON_TYPEPY_SITE = https://pypi.python.org/packages/88/98/c79a19ae571d713fa0b10bc7e0fe611e53c542720b5a9dd2691ca15b3dd8
+PYTHON_TYPEPY_SETUP_TYPE = setuptools
+PYTHON_TYPEPY_LICENSE = MIT
+PYTHON_TYPEPY_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-u-msgpack/Config.in b/bsp/buildroot/package/python-u-msgpack/Config.in
index ad0f90e8..e0031649 100644
--- a/bsp/buildroot/package/python-u-msgpack/Config.in
+++ b/bsp/buildroot/package/python-u-msgpack/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_PYTHON_U_MSGPACK
 	bool "python-u-msgpack"
 	help
-	  A portable, lightweight MessagePack serializer and deserializer
-	  written in pure Python.
+	  A portable, lightweight MessagePack serializer and
+	  deserializer written in pure Python.
 
 	  https://github.com/vsergeev/u-msgpack-python
diff --git a/bsp/buildroot/package/python-u-msgpack/python-u-msgpack.mk b/bsp/buildroot/package/python-u-msgpack/python-u-msgpack.mk
index a88beeb1..89240c3f 100644
--- a/bsp/buildroot/package/python-u-msgpack/python-u-msgpack.mk
+++ b/bsp/buildroot/package/python-u-msgpack/python-u-msgpack.mk
@@ -7,7 +7,7 @@
 PYTHON_U_MSGPACK_VERSION = 2.2
 PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz
 PYTHON_U_MSGPACK_SITE = https://pypi.python.org/packages/66/5b/36fe0fcf290bd39f6ef6c1f5924cf0a9a76b0dc94575975ad7d318619cf9
-PYTHON_U_MSGPACK_SETUP_TYPE = distutils
+PYTHON_U_MSGPACK_SETUP_TYPE = setuptools
 PYTHON_U_MSGPACK_LICENSE = MIT
 PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE
 
diff --git a/bsp/buildroot/package/python-ubjson/python-ubjson.hash b/bsp/buildroot/package/python-ubjson/python-ubjson.hash
index 88c8c62b..30f65fe6 100644
--- a/bsp/buildroot/package/python-ubjson/python-ubjson.hash
+++ b/bsp/buildroot/package/python-ubjson/python-ubjson.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/py-ubjson/json, sha256 locally computed
-md5	09584b02508451a8133095c3b5f2bf41  py-ubjson-0.8.5.tar.gz
-sha256	e58e99753aaff3ed5d884989a6236bd98a4b0dfdb0e62f9753c20f485691fa9e  py-ubjson-0.8.5.tar.gz
+md5 c78bbe899eeba9604302ad746094e8d1  py-ubjson-0.9.0.tar.gz
+sha256 b405daaa82acdf5989207e1e5ff6865ef7d23bf450513a6d90a1ab64c75bdcf8  py-ubjson-0.9.0.tar.gz
diff --git a/bsp/buildroot/package/python-ubjson/python-ubjson.mk b/bsp/buildroot/package/python-ubjson/python-ubjson.mk
index e42b2dc5..a192cfb6 100644
--- a/bsp/buildroot/package/python-ubjson/python-ubjson.mk
+++ b/bsp/buildroot/package/python-ubjson/python-ubjson.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_UBJSON_VERSION = 0.8.5
+PYTHON_UBJSON_VERSION = 0.9.0
 PYTHON_UBJSON_SOURCE = py-ubjson-$(PYTHON_UBJSON_VERSION).tar.gz
-PYTHON_UBJSON_SITE = https://pypi.python.org/packages/99/12/173cd417cacdacd158f947365bb17952a93b4e9d08f8a2f4b77d6c17cb4e
+PYTHON_UBJSON_SITE = https://pypi.python.org/packages/d4/40/a80006884ec03a54a5c6c53ae76df9978536862f0683b6e6280e3808d289
 PYTHON_UBJSON_LICENSE = Apache-2.0
 PYTHON_UBJSON_LICENSE_FILES = LICENSE
 PYTHON_UBJSON_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-ujson/python-ujson.mk b/bsp/buildroot/package/python-ujson/python-ujson.mk
index 8d4a12b8..60a4ecf8 100644
--- a/bsp/buildroot/package/python-ujson/python-ujson.mk
+++ b/bsp/buildroot/package/python-ujson/python-ujson.mk
@@ -6,8 +6,8 @@
 
 PYTHON_UJSON_VERSION = 1.35
 PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz
-PYTHON_UJSON_SITE = http://pypi.python.org/packages/source/u/ujson
-PYTHON_UJSON_LICENSE = BSD-3c
+PYTHON_UJSON_SITE = https://pypi.python.org/packages/source/u/ujson
+PYTHON_UJSON_LICENSE = BSD-3-Clause
 PYTHON_UJSON_SETUP_TYPE = setuptools
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-urllib3/python-urllib3.hash b/bsp/buildroot/package/python-urllib3/python-urllib3.hash
index fb5fd9dd..226a8265 100644
--- a/bsp/buildroot/package/python-urllib3/python-urllib3.hash
+++ b/bsp/buildroot/package/python-urllib3/python-urllib3.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/urllib3/json, sha256 locally computed
-md5	1eadd93bd5e58d3528d977111f2997ea  urllib3-1.18.tar.gz
-sha256	d30dd4d1cbbc36ebab6e4a2076820cfe0c60f10adf087fecbc5a3edae79fdc81  urllib3-1.18.tar.gz
+md5	ef6c72c79b9c6bcd68c204f9b92abc86  urllib3-1.21.1.tar.gz
+sha256	b14486978518ca0901a76ba973d7821047409d7f726f22156b24e83fd71382a5  urllib3-1.21.1.tar.gz
diff --git a/bsp/buildroot/package/python-urllib3/python-urllib3.mk b/bsp/buildroot/package/python-urllib3/python-urllib3.mk
index 9043aa35..454f75fa 100644
--- a/bsp/buildroot/package/python-urllib3/python-urllib3.mk
+++ b/bsp/buildroot/package/python-urllib3/python-urllib3.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_URLLIB3_VERSION = 1.18
+PYTHON_URLLIB3_VERSION = 1.21.1
 PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz
-PYTHON_URLLIB3_SITE = https://pypi.python.org/packages/8f/45/7434a6a44d42744b74fb969a39720f0c3d4f31f921737e51a69d8b15c859
+PYTHON_URLLIB3_SITE = https://pypi.python.org/packages/96/d9/40e4e515d3e17ed0adbbde1078e8518f8c4e3628496b56eb8f026a02b9e4
 PYTHON_URLLIB3_LICENSE = MIT
 PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt
 PYTHON_URLLIB3_SETUP_TYPE = setuptools
diff --git a/bsp/buildroot/package/python-urwid/python-urwid.mk b/bsp/buildroot/package/python-urwid/python-urwid.mk
index e52a155e..4cfee477 100644
--- a/bsp/buildroot/package/python-urwid/python-urwid.mk
+++ b/bsp/buildroot/package/python-urwid/python-urwid.mk
@@ -7,7 +7,7 @@
 PYTHON_URWID_VERSION = 1.3.1
 PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz
 PYTHON_URWID_SITE = https://pypi.python.org/packages/source/u/urwid
-PYTHON_URWID_LICENSE = LGPLv2.1+
+PYTHON_URWID_LICENSE = LGPL-2.1+
 PYTHON_URWID_LICENSE_FILES = COPYING
 PYTHON_URWID_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-versiontools/Config.in b/bsp/buildroot/package/python-versiontools/Config.in
index cb260c1f..d15de1f0 100644
--- a/bsp/buildroot/package/python-versiontools/Config.in
+++ b/bsp/buildroot/package/python-versiontools/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_VERSIONTOOLS
 	bool "python-versiontools"
-	depends on BR2_PACKAGE_PYTHON
 	help
 	  Smart replacement for plain tuple used in __version__.
 
diff --git a/bsp/buildroot/package/python-versiontools/python-versiontools.mk b/bsp/buildroot/package/python-versiontools/python-versiontools.mk
index 4f763db1..b99ddecb 100644
--- a/bsp/buildroot/package/python-versiontools/python-versiontools.mk
+++ b/bsp/buildroot/package/python-versiontools/python-versiontools.mk
@@ -6,8 +6,9 @@
 
 PYTHON_VERSIONTOOLS_VERSION = 1.9.1
 PYTHON_VERSIONTOOLS_SOURCE = versiontools-$(PYTHON_VERSIONTOOLS_VERSION).tar.gz
-PYTHON_VERSIONTOOLS_SITE = http://pypi.python.org/packages/source/v/versiontools
+PYTHON_VERSIONTOOLS_SITE = https://pypi.python.org/packages/source/v/versiontools
 PYTHON_VERSIONTOOLS_SETUP_TYPE = setuptools
-PYTHON_VERSIONTOOLS_LICENSE = LGPLv3
+PYTHON_VERSIONTOOLS_LICENSE = LGPL-3.0
 
 $(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch b/bsp/buildroot/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch
new file mode 100644
index 00000000..c21e6cd0
--- /dev/null
+++ b/bsp/buildroot/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch
@@ -0,0 +1,43 @@
+From c3b3c4581b25d7e62f5c2ce1484133229d5e657a Mon Sep 17 00:00:00 2001
+From: Yegor Yefremov <yegorslists@googlemail.com>
+Date: Fri, 16 Feb 2018 13:26:23 +0100
+Subject: [PATCH] Add a workaround to support uClibc library
+
+uClibc based systems provide only libc.so.0 and libc.so.1
+symlinks.
+
+So try to find libc.so.0 if neither libc.so nor libc.so.6
+could be found.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ src/watchdog/observers/inotify_c.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/watchdog/observers/inotify_c.py b/src/watchdog/observers/inotify_c.py
+index 5f208b6..0dc7b50 100644
+--- a/src/watchdog/observers/inotify_c.py
++++ b/src/watchdog/observers/inotify_c.py
+@@ -45,7 +45,19 @@ def _load_libc():
+     try:
+         return ctypes.CDLL('libc.so')
+     except (OSError, IOError):
++        pass
++
++    try:
+         return ctypes.CDLL('libc.so.6')
++    except (OSError, IOError):
++        pass
++
++    # uClibc
++    try:
++        return ctypes.CDLL('libc.so.0')
++    except (OSError, IOError) as err:
++        raise err
++
+ 
+ libc = _load_libc()
+ 
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/python-watchdog/Config.in b/bsp/buildroot/package/python-watchdog/Config.in
index e5290897..18f569ee 100644
--- a/bsp/buildroot/package/python-watchdog/Config.in
+++ b/bsp/buildroot/package/python-watchdog/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_PYTHON_WATCHDOG
 	bool "python-watchdog"
-	select BR2_PACKAGE_PYTHON_PYYAML
-	select BR2_PACKAGE_PYTHON_ARGH
-	select BR2_PACKAGE_PYTHON_PATHTOOLS
+	select BR2_PACKAGE_PYTHON_ARGH # runtime
+	select BR2_PACKAGE_PYTHON_PATHTOOLS # runtime
+	select BR2_PACKAGE_PYTHON_PYYAML # runtime
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	help
 	  Python API and shell utilities to monitor file system events.
 
diff --git a/bsp/buildroot/package/python-web2py/Config.in b/bsp/buildroot/package/python-web2py/Config.in
index b10d3a48..bc2e6054 100644
--- a/bsp/buildroot/package/python-web2py/Config.in
+++ b/bsp/buildroot/package/python-web2py/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_PYTHON_WEB2PY
 	bool "python-web2py"
-	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON_PYDAL
-	select BR2_PACKAGE_PYTHON_ZLIB
-	select BR2_PACKAGE_PYTHON_PYEXPAT
-	select BR2_PACKAGE_PYTHON_SQLITE
+	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	select BR2_PACKAGE_PYTHON_SQLITE if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_SQLITE if BR2_PACKAGE_PYTHON3 # runtime
 	help
 	  web2py is a free open source full-stack framework for rapid
 	  development of fast, scalable, secure and portable
@@ -14,6 +16,15 @@ config BR2_PACKAGE_PYTHON_WEB2PY
 
 if BR2_PACKAGE_PYTHON_WEB2PY
 
+config BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN
+	bool "install admin panel application"
+	default y
+	help
+	  This option install web2py admin panel application.
+	  It can be removed to save space on embedded systems.
+
+if BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN
+
 config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
 	string "admin panel password"
 	default web2py
@@ -21,3 +32,5 @@ config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD
 	  Set the admin panel password.
 
 endif
+
+endif
diff --git a/bsp/buildroot/package/python-web2py/python-web2py.hash b/bsp/buildroot/package/python-web2py/python-web2py.hash
index 9c1de904..adc7bc5d 100644
--- a/bsp/buildroot/package/python-web2py/python-web2py.hash
+++ b/bsp/buildroot/package/python-web2py/python-web2py.hash
@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 6079aeaa352ec51e0da5e6abc71fa74cdb3a781e06a311b5826618624362a7b2   python-web2py-R-2.14.6.tar.gz
+sha256 e432e051ebb826b77835bda03ddb16364b37d137b37ac33005b6ac0fd5d56280  python-web2py-R-2.15.4.tar.gz
diff --git a/bsp/buildroot/package/python-web2py/python-web2py.mk b/bsp/buildroot/package/python-web2py/python-web2py.mk
index af13e69c..9ad5a778 100644
--- a/bsp/buildroot/package/python-web2py/python-web2py.mk
+++ b/bsp/buildroot/package/python-web2py/python-web2py.mk
@@ -4,19 +4,49 @@
 #
 ################################################################################
 
-PYTHON_WEB2PY_VERSION = R-2.14.6
+PYTHON_WEB2PY_VERSION = R-2.15.4
 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION))
-PYTHON_WEB2PY_LICENSE = LGPLv3
+PYTHON_WEB2PY_LICENSE = LGPL-3.0
 PYTHON_WEB2PY_LICENSE_FILES = LICENSE
-PYTHON_WEB2PY_DEPENDENCIES = python python-pydal host-python-pydal
+PYTHON_WEB2PY_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) \
+	python-pydal host-python-pydal
 
-define PYTHON_WEB2PY_INSTALL_TARGET_CMDS
-	$(HOST_DIR)/usr/bin/python2 -c 'import os; \
+PYTHON_WEB2PY_EXCLUSIONS = \
+	welcome.w2p \
+	applications/examples \
+	applications/welcome \
+	deposit \
+	docs \
+	examples \
+	extras \
+	handlers \
+	scripts \
+	ABOUT \
+	anyserver.py \
+	CHANGELOG \
+	Makefile \
+	MANIFEST.in \
+	README.markdown \
+	setup.py \
+	tox.ini
+
+define PYTHON_WEB2PY_GENERATE_PASSWORD
+	$(HOST_DIR)/bin/python -c 'import os; \
 		os.chdir("$(@D)"); \
 		from gluon.main import save_password; \
 		save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)'
+endef
+
+ifeq ($(BR2_PACKAGE_PYTHON_WEB2PY_INSTALL_ADMIN),y)
+PYTHON_WEB2PY_POST_BUILD_HOOKS += PYTHON_WEB2PY_GENERATE_PASSWORD
+else
+PYTHON_WEB2PY_EXCLUSIONS += applications/admin
+endif
+
+define PYTHON_WEB2PY_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/var/www/web2py
-	cp -dpfr $(@D)/* $(TARGET_DIR)/var/www/web2py
+	rsync -a $(@D)/ $(TARGET_DIR)/var/www/web2py/ \
+		$(addprefix --exclude=,$(PYTHON_WEB2PY_EXCLUSIONS))
 endef
 
 define PYTHON_WEB2PY_INSTALL_INIT_SYSV
diff --git a/bsp/buildroot/package/python-webpy/Config.in b/bsp/buildroot/package/python-webpy/Config.in
index 8ca23f7d..5f4df783 100644
--- a/bsp/buildroot/package/python-webpy/Config.in
+++ b/bsp/buildroot/package/python-webpy/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_PYTHON_WEBPY
 	depends on BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON_HASHLIB
 	help
-	  web.py is a web framework for Python that is as simple as it is
-	  powerful.
+	  web.py is a web framework for Python that is as simple as it
+	  is powerful.
 
 	  http://webpy.org/
diff --git a/bsp/buildroot/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch b/bsp/buildroot/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch
new file mode 100644
index 00000000..cb97b36b
--- /dev/null
+++ b/bsp/buildroot/package/python-websockets/0001-Fix-behavior-of-recv-in-the-CLOSING-state.patch
@@ -0,0 +1,261 @@
+From 402059e4a46a764632eba8a669f5b012f173ee7b Mon Sep 17 00:00:00 2001
+From: Aymeric Augustin <aymeric.augustin@m4x.org>
+Date: Tue, 1 May 2018 17:05:05 +0200
+Subject: [PATCH] Fix behavior of recv() in the CLOSING state.
+
+The behavior wasn't tested correctly: in some test cases, the connection
+had already moved to the CLOSED state, where the close code and reason
+are already known.
+
+Refactor half_close_connection_{local,remote} to allow multiple runs of
+the event loop while remaining in the CLOSING state. Refactor affected
+tests accordingly.
+
+I verified that all tests in the CLOSING state were behaving is intended
+by inserting debug statements in recv/send/ping/pong and running:
+
+$ PYTHONASYNCIODEBUG=1 python -m unittest -v websockets.test_protocol.{Client,Server}Tests.test_{recv,send,ping,pong}_on_closing_connection_{local,remote}
+
+Fix #317, #327, #350, #357.
+
+Signed-off-by: Joseph Kogut <joseph.kogut@gmail.com>
+---
+ websockets/protocol.py      | 10 ++---
+ websockets/test_protocol.py | 78 +++++++++++++++++++++++++++++--------
+ 2 files changed, 66 insertions(+), 22 deletions(-)
+
+diff --git a/websockets/protocol.py b/websockets/protocol.py
+index f8121a1..7583fe9 100644
+--- a/websockets/protocol.py
++++ b/websockets/protocol.py
+@@ -303,7 +303,7 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol):
+         # Don't yield from self.ensure_open() here because messages could be
+         # received before the closing frame even if the connection is closing.
+ 
+-        # Wait for a message until the connection is closed
++        # Wait for a message until the connection is closed.
+         next_message = asyncio_ensure_future(
+             self.messages.get(), loop=self.loop)
+         try:
+@@ -315,15 +315,15 @@ class WebSocketCommonProtocol(asyncio.StreamReaderProtocol):
+             next_message.cancel()
+             raise
+ 
+-        # Now there's no need to yield from self.ensure_open(). Either a
+-        # message was received or the connection was closed.
+-
+         if next_message in done:
+             return next_message.result()
+         else:
+             next_message.cancel()
+             if not self.legacy_recv:
+-                raise ConnectionClosed(self.close_code, self.close_reason)
++                assert self.state in [State.CLOSING, State.CLOSED]
++                # Wait until the connection is closed to raise
++                # ConnectionClosed with the correct code and reason.
++                yield from self.ensure_open()
+ 
+     @asyncio.coroutine
+     def send(self, data):
+diff --git a/websockets/test_protocol.py b/websockets/test_protocol.py
+index 70348fb..bfd4e3b 100644
+--- a/websockets/test_protocol.py
++++ b/websockets/test_protocol.py
+@@ -105,7 +105,7 @@ class CommonTests:
+         self.loop.call_soon(self.loop.stop)
+         self.loop.run_forever()
+ 
+-    def make_drain_slow(self, delay=3 * MS):
++    def make_drain_slow(self, delay=MS):
+         # Process connection_made in order to initialize self.protocol.writer.
+         self.run_loop_once()
+ 
+@@ -174,6 +174,8 @@ class CommonTests:
+         # Empty the outgoing data stream so we can make assertions later on.
+         self.assertOneFrameSent(True, OP_CLOSE, close_frame_data)
+ 
++        assert self.protocol.state is State.CLOSED
++
+     def half_close_connection_local(self, code=1000, reason='close'):
+         """
+         Start a closing handshake but do not complete it.
+@@ -181,31 +183,56 @@ class CommonTests:
+         The main difference with `close_connection` is that the connection is
+         left in the CLOSING state until the event loop runs again.
+ 
++        The current implementation returns a task that must be awaited or
++        cancelled, else asyncio complains about destroying a pending task.
++
+         """
+         close_frame_data = serialize_close(code, reason)
+-        # Trigger the closing handshake from the local side.
+-        self.ensure_future(self.protocol.close(code, reason))
++        # Trigger the closing handshake from the local endpoint.
++        close_task = self.ensure_future(self.protocol.close(code, reason))
+         self.run_loop_once()    # wait_for executes
+         self.run_loop_once()    # write_frame executes
+         # Empty the outgoing data stream so we can make assertions later on.
+         self.assertOneFrameSent(True, OP_CLOSE, close_frame_data)
+-        # Prepare the response to the closing handshake from the remote side.
+-        self.loop.call_soon(
+-            self.receive_frame, Frame(True, OP_CLOSE, close_frame_data))
+-        self.loop.call_soon(self.receive_eof_if_client)
++
++        assert self.protocol.state is State.CLOSING
++
++        # Complete the closing sequence at 1ms intervals so the test can run
++        # at each point even it goes back to the event loop several times.
++        self.loop.call_later(
++            MS, self.receive_frame, Frame(True, OP_CLOSE, close_frame_data))
++        self.loop.call_later(2 * MS, self.receive_eof_if_client)
++
++        # This task must be awaited or cancelled by the caller.
++        return close_task
+ 
+     def half_close_connection_remote(self, code=1000, reason='close'):
+         """
+-        Receive a closing handshake.
++        Receive a closing handshake but do not complete it.
+ 
+         The main difference with `close_connection` is that the connection is
+         left in the CLOSING state until the event loop runs again.
+ 
+         """
++        # On the server side, websockets completes the closing handshake and
++        # closes the TCP connection immediately. Yield to the event loop after
++        # sending the close frame to run the test while the connection is in
++        # the CLOSING state.
++        if not self.protocol.is_client:
++            self.make_drain_slow()
++
+         close_frame_data = serialize_close(code, reason)
+-        # Trigger the closing handshake from the remote side.
++        # Trigger the closing handshake from the remote endpoint.
+         self.receive_frame(Frame(True, OP_CLOSE, close_frame_data))
+-        self.receive_eof_if_client()
++        self.run_loop_once()    # read_frame executes
++        # Empty the outgoing data stream so we can make assertions later on.
++        self.assertOneFrameSent(True, OP_CLOSE, close_frame_data)
++
++        assert self.protocol.state is State.CLOSING
++
++        # Complete the closing sequence at 1ms intervals so the test can run
++        # at each point even it goes back to the event loop several times.
++        self.loop.call_later(2 * MS, self.receive_eof_if_client)
+ 
+     def process_invalid_frames(self):
+         """
+@@ -335,11 +362,13 @@ class CommonTests:
+         self.assertEqual(data, b'tea')
+ 
+     def test_recv_on_closing_connection_local(self):
+-        self.half_close_connection_local()
++        close_task = self.half_close_connection_local()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.recv())
+ 
++        self.loop.run_until_complete(close_task)    # cleanup
++
+     def test_recv_on_closing_connection_remote(self):
+         self.half_close_connection_remote()
+ 
+@@ -421,24 +450,29 @@ class CommonTests:
+         self.assertNoFrameSent()
+ 
+     def test_send_on_closing_connection_local(self):
+-        self.half_close_connection_local()
++        close_task = self.half_close_connection_local()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.send('foobar'))
++
+         self.assertNoFrameSent()
+ 
++        self.loop.run_until_complete(close_task)    # cleanup
++
+     def test_send_on_closing_connection_remote(self):
+         self.half_close_connection_remote()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.send('foobar'))
+-        self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close'))
++
++        self.assertNoFrameSent()
+ 
+     def test_send_on_closed_connection(self):
+         self.close_connection()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.send('foobar'))
++
+         self.assertNoFrameSent()
+ 
+     # Test the ping coroutine.
+@@ -466,24 +500,29 @@ class CommonTests:
+         self.assertNoFrameSent()
+ 
+     def test_ping_on_closing_connection_local(self):
+-        self.half_close_connection_local()
++        close_task = self.half_close_connection_local()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.ping())
++
+         self.assertNoFrameSent()
+ 
++        self.loop.run_until_complete(close_task)    # cleanup
++
+     def test_ping_on_closing_connection_remote(self):
+         self.half_close_connection_remote()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.ping())
+-        self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close'))
++
++        self.assertNoFrameSent()
+ 
+     def test_ping_on_closed_connection(self):
+         self.close_connection()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.ping())
++
+         self.assertNoFrameSent()
+ 
+     # Test the pong coroutine.
+@@ -506,24 +545,29 @@ class CommonTests:
+         self.assertNoFrameSent()
+ 
+     def test_pong_on_closing_connection_local(self):
+-        self.half_close_connection_local()
++        close_task = self.half_close_connection_local()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.pong())
++
+         self.assertNoFrameSent()
+ 
++        self.loop.run_until_complete(close_task)    # cleanup
++
+     def test_pong_on_closing_connection_remote(self):
+         self.half_close_connection_remote()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.pong())
+-        self.assertOneFrameSent(True, OP_CLOSE, serialize_close(1000, 'close'))
++
++        self.assertNoFrameSent()
+ 
+     def test_pong_on_closed_connection(self):
+         self.close_connection()
+ 
+         with self.assertRaises(ConnectionClosed):
+             self.loop.run_until_complete(self.protocol.pong())
++
+         self.assertNoFrameSent()
+ 
+     # Test the protocol's logic for acknowledging pings with pongs.
+-- 
+2.17.0
+
diff --git a/bsp/buildroot/package/python-websockets/Config.in b/bsp/buildroot/package/python-websockets/Config.in
new file mode 100644
index 00000000..7d80161a
--- /dev/null
+++ b/bsp/buildroot/package/python-websockets/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_PYTHON_WEBSOCKETS
+	bool "python-websockets"
+	depends on BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_ZLIB
+	select BR2_PACKAGE_PYTHON3_SSL
+	help
+	  An implementation of the WebSocket Protocol (RFC 6455)
+
+	  https://github.com/aaugustin/websockets
diff --git a/bsp/buildroot/package/python-websockets/python-websockets.hash b/bsp/buildroot/package/python-websockets/python-websockets.hash
new file mode 100644
index 00000000..18947cc6
--- /dev/null
+++ b/bsp/buildroot/package/python-websockets/python-websockets.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/websockets/json, sha256 locally computed
+md5	9e8c6b3c70def4146d75fbb0f52bdfc7  websockets-4.0.1.tar.gz
+sha256	da4d4fbe059b0453e726d6d993760065d69b823a27efc3040402a6fcfe6a1ed9  websockets-4.0.1.tar.gz
+sha256	2cd4d416e432ca7fda2c103b38b852f8d3cb327d70c3db44410b9fe97e6c4d73  LICENSE
diff --git a/bsp/buildroot/package/python-websockets/python-websockets.mk b/bsp/buildroot/package/python-websockets/python-websockets.mk
new file mode 100644
index 00000000..7c5cf8c4
--- /dev/null
+++ b/bsp/buildroot/package/python-websockets/python-websockets.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-websockets
+#
+################################################################################
+
+PYTHON_WEBSOCKETS_VERSION = 4.0.1
+PYTHON_WEBSOCKETS_SOURCE = websockets-${PYTHON_WEBSOCKETS_VERSION}.tar.gz
+PYTHON_WEBSOCKETS_SITE = https://pypi.python.org/packages/b6/12/6194aac840c65253e45a38912e318f9ac548f9ba86d75bdb8fe66841b335
+PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools
+PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause
+PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-werkzeug/python-werkzeug.hash b/bsp/buildroot/package/python-werkzeug/python-werkzeug.hash
index 3f233524..4b207507 100644
--- a/bsp/buildroot/package/python-werkzeug/python-werkzeug.hash
+++ b/bsp/buildroot/package/python-werkzeug/python-werkzeug.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/werkzeug/json, sha256 locally computed
-md5	1d34afa1f19abcef4c0da51ebc2c4ea7  Werkzeug-0.11.11.tar.gz
-sha256	e72c46bc14405cba7a26bd2ce28df734471bc9016bc8b4cb69466c2c14c2f7e5  Werkzeug-0.11.11.tar.gz
+# md5 from https://pypi.python.org/pypi/Werkzeug/json, sha256 locally computed
+md5	e385b2c5a7193cff24c689b31e1124dc  Werkzeug-0.12.2.tar.gz
+sha256	903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26  Werkzeug-0.12.2.tar.gz
diff --git a/bsp/buildroot/package/python-werkzeug/python-werkzeug.mk b/bsp/buildroot/package/python-werkzeug/python-werkzeug.mk
index 072937fc..6d478f7c 100644
--- a/bsp/buildroot/package/python-werkzeug/python-werkzeug.mk
+++ b/bsp/buildroot/package/python-werkzeug/python-werkzeug.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_WERKZEUG_VERSION = 0.11.11
+PYTHON_WERKZEUG_VERSION = 0.12.2
 PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz
-PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/43/2e/d822b4a4216804519ace92e0368dcfc4b0b2887462d852fdd476b253ecc9
+PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/56/41/c095a77eb2dd69bf278dd664a97d3416af04e9ba1a00b8c138f772741d31
 PYTHON_WERKZEUG_SETUP_TYPE = setuptools
-PYTHON_WERKZEUG_LICENSE = BSD-3c
+PYTHON_WERKZEUG_LICENSE = BSD-3-Clause
 PYTHON_WERKZEUG_LICENSE_FILES = LICENSE
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-whoosh/python-whoosh.hash b/bsp/buildroot/package/python-whoosh/python-whoosh.hash
index b14dd0f8..0621a2a2 100644
--- a/bsp/buildroot/package/python-whoosh/python-whoosh.hash
+++ b/bsp/buildroot/package/python-whoosh/python-whoosh.hash
@@ -1,3 +1,3 @@
-# md5 from https://pypi.python.org/pypi/Whoosh/json, sha256 locally computed
-md5	9a0fc2df9335e1d2e81dd84a2c4c416f  Whoosh-2.7.0.tar.gz
-sha256	cdfc0e1c5173207ac7b312afe78d83fb552cfed30427bf7b3dba8b1d26cea8f7  Whoosh-2.7.0.tar.gz
+# md5 from https://pypi.python.org/pypi/whoosh/json, sha256 locally computed
+md5 c2710105f20b3e29936bd2357383c325 Whoosh-2.7.4.tar.gz
+sha256 7ca5633dbfa9e0e0fa400d3151a8a0c4bec53bd2ecedc0a67705b17565c31a83 Whoosh-2.7.4.tar.gz
diff --git a/bsp/buildroot/package/python-whoosh/python-whoosh.mk b/bsp/buildroot/package/python-whoosh/python-whoosh.mk
index 64f3820c..a100c446 100644
--- a/bsp/buildroot/package/python-whoosh/python-whoosh.mk
+++ b/bsp/buildroot/package/python-whoosh/python-whoosh.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_WHOOSH_VERSION = 2.7.0
+PYTHON_WHOOSH_VERSION = 2.7.4
 PYTHON_WHOOSH_SOURCE = Whoosh-$(PYTHON_WHOOSH_VERSION).tar.gz
-PYTHON_WHOOSH_SITE = http://pypi.python.org/packages/source/W/Whoosh
+PYTHON_WHOOSH_SITE = https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684
 PYTHON_WHOOSH_SETUP_TYPE = setuptools
-PYTHON_WHOOSH_LICENSE = BSD-3c
+PYTHON_WHOOSH_LICENSE = BSD-3-Clause
 PYTHON_WHOOSH_LICENSE_FILES = LICENSE.txt
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-ws4py/python-ws4py.hash b/bsp/buildroot/package/python-ws4py/python-ws4py.hash
index 4d5904ee..13469cb0 100644
--- a/bsp/buildroot/package/python-ws4py/python-ws4py.hash
+++ b/bsp/buildroot/package/python-ws4py/python-ws4py.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/ws4py/json, sha256 locally computed
-md5	b0cbe30433350ef5ec98e8cbb3c3b39c  ws4py-0.3.5.tar.gz
-sha256	c4cc4a872027f6a6006a6142a38eb6d65c2ece29a4cefac98dd20a48c34ec7a9  ws4py-0.3.5.tar.gz
+md5	f0603ae376707a58d205bd87a67758a2  ws4py-0.4.2.tar.gz
+sha256	7ac69ce3e6ec6917a5d678b65f0a18e244a4dc670db6414bc0271b3f4911237f  ws4py-0.4.2.tar.gz
diff --git a/bsp/buildroot/package/python-ws4py/python-ws4py.mk b/bsp/buildroot/package/python-ws4py/python-ws4py.mk
index fac99f32..ec5b4aff 100644
--- a/bsp/buildroot/package/python-ws4py/python-ws4py.mk
+++ b/bsp/buildroot/package/python-ws4py/python-ws4py.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_WS4PY_VERSION = 0.3.5
+PYTHON_WS4PY_VERSION = 0.4.2
 PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz
-PYTHON_WS4PY_SITE = https://pypi.python.org/packages/c8/b4/1784512791fbd196a48f282ca6c79398cace9541a9c151d89c30b6add6e1
+PYTHON_WS4PY_SITE = https://pypi.python.org/packages/b8/98/a90f1d96ffcb15dfc220af524ce23e0a5881258dafa197673357ce1683dd
 PYTHON_WS4PY_SETUP_TYPE = setuptools
-PYTHON_WS4PY_LICENSE = BSD-3c
+PYTHON_WS4PY_LICENSE = BSD-3-Clause
 PYTHON_WS4PY_LICENSE_FILES = ws4py/__init__.py
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-wsaccel/python-wsaccel.mk b/bsp/buildroot/package/python-wsaccel/python-wsaccel.mk
index 3e7b3324..016ff2d7 100644
--- a/bsp/buildroot/package/python-wsaccel/python-wsaccel.mk
+++ b/bsp/buildroot/package/python-wsaccel/python-wsaccel.mk
@@ -6,7 +6,7 @@
 
 PYTHON_WSACCEL_VERSION = 0.6.2
 PYTHON_WSACCEL_SOURCE = wsaccel-$(PYTHON_WSACCEL_VERSION).tar.gz
-PYTHON_WSACCEL_SITE = http://pypi.python.org/packages/source/w/wsaccel
+PYTHON_WSACCEL_SITE = https://pypi.python.org/packages/source/w/wsaccel
 PYTHON_WSACCEL_LICENSE = Apache-2.0
 PYTHON_WSACCEL_SETUP_TYPE = setuptools
 
diff --git a/bsp/buildroot/package/python-xlib/Config.in b/bsp/buildroot/package/python-xlib/Config.in
new file mode 100644
index 00000000..081af6a2
--- /dev/null
+++ b/bsp/buildroot/package/python-xlib/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_XLIB
+	bool "python-xlib"
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  XLib in pure Python (Py2/Py3 compatible)
+
+	  https://github.com/python-xlib/python-xlib
diff --git a/bsp/buildroot/package/python-xlib/python-xlib.hash b/bsp/buildroot/package/python-xlib/python-xlib.hash
new file mode 100644
index 00000000..2c4861af
--- /dev/null
+++ b/bsp/buildroot/package/python-xlib/python-xlib.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/python-xlib/json, sha256 locally computed
+md5 cdf342aa145c2be0ccae46cfb7b62551 python-xlib-0.21.tar.bz2
+sha256 25aad0056172920552c01a163e979b02336abaf47b0792dae9c93ecb29500431 python-xlib-0.21.tar.bz2
+sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE
diff --git a/bsp/buildroot/package/python-xlib/python-xlib.mk b/bsp/buildroot/package/python-xlib/python-xlib.mk
new file mode 100644
index 00000000..0ce6e434
--- /dev/null
+++ b/bsp/buildroot/package/python-xlib/python-xlib.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# python-xlib
+#
+################################################################################
+
+PYTHON_XLIB_VERSION = 0.21
+PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2
+PYTHON_XLIB_SITE = https://pypi.python.org/packages/eb/de/b0eaaea7b8512dc41504db071824eef30293ff55c58d83081ebaebe85a38
+PYTHON_XLIB_SETUP_TYPE = setuptools
+PYTHON_XLIB_LICENSE = LGPL-2.1+
+PYTHON_XLIB_LICENSE_FILES = LICENSE
+PYTHON_XLIB_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-xlrd/Config.in b/bsp/buildroot/package/python-xlrd/Config.in
index 81331f9d..40920f7b 100644
--- a/bsp/buildroot/package/python-xlrd/Config.in
+++ b/bsp/buildroot/package/python-xlrd/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_PYTHON_XLRD
 	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
 	help
-	  Library for developers to extract data from Microsoft Excel (tm)
-	  spreadsheet files.
+	  Library for developers to extract data from Microsoft
+	  Excel(tm) spreadsheet files.
 
 	  http://www.python-excel.org/
diff --git a/bsp/buildroot/package/python-xlrd/python-xlrd.mk b/bsp/buildroot/package/python-xlrd/python-xlrd.mk
index 50f76243..e3f078c3 100644
--- a/bsp/buildroot/package/python-xlrd/python-xlrd.mk
+++ b/bsp/buildroot/package/python-xlrd/python-xlrd.mk
@@ -8,7 +8,7 @@ PYTHON_XLRD_VERSION = 1.0.0
 PYTHON_XLRD_SOURCE = xlrd-$(PYTHON_XLRD_VERSION).tar.gz
 PYTHON_XLRD_SITE = https://pypi.python.org/packages/42/85/25caf967c2d496067489e0bb32df069a8361e1fd96a7e9f35408e56b3aab
 PYTHON_XLRD_SETUP_TYPE = setuptools
-PYTHON_XLRD_LICENSE = BSD-3c
+PYTHON_XLRD_LICENSE = BSD-3-Clause
 PYTHON_XLRD_LICENSE_FILES = xlrd/licences.py
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash b/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash
index 5d9a5ac2..a7d44016 100644
--- a/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash
+++ b/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.hash
@@ -1,3 +1,3 @@
 # md5 from https://pypi.python.org/pypi/xlsxwriter/json, sha256 locally computed
-md5	17f48e222aa091b053fa2a14986b21c5  XlsxWriter-0.9.4.tar.gz
-sha256	1642cf0adc6486dd3b17db9aba72a47fd41b947da6081e97acd6ab9872a22386  XlsxWriter-0.9.4.tar.gz
+md5 3c2831e80fae83070f61f0a9226f45ac XlsxWriter-0.9.6.tar.gz
+sha256 b51c00a1d6572ba35e8c06e0af8dd14c34977ef0b5022c3d85d5f1de9f1220c3 XlsxWriter-0.9.6.tar.gz
diff --git a/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk b/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk
index bd2ca086..2c86e5d2 100644
--- a/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk
+++ b/bsp/buildroot/package/python-xlsxwriter/python-xlsxwriter.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_XLSXWRITER_VERSION = 0.9.4
+PYTHON_XLSXWRITER_VERSION = 0.9.6
 PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz
-PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/52/66/670322b9999b8e47659c8b172a11aa3c0e629a5fc86b5a8fd497b85941c0
+PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/c9/e0/c2b2f57bf53c84af3d2a41a82af7025828cb2bc8a312848a6ab7d018de56
 PYTHON_XLSXWRITER_SETUP_TYPE = setuptools
-PYTHON_XLSXWRITER_LICENSE = BSD-2c
+PYTHON_XLSXWRITER_LICENSE = BSD-2-Clause
 PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-xlwt/python-xlwt.hash b/bsp/buildroot/package/python-xlwt/python-xlwt.hash
index 4cacf2b4..45238870 100644
--- a/bsp/buildroot/package/python-xlwt/python-xlwt.hash
+++ b/bsp/buildroot/package/python-xlwt/python-xlwt.hash
@@ -1,4 +1,3 @@
-# md5 from https://pypi.python.org/pypi/xlwt/json
-md5	fadf8d1be8c5f071561c4145ed5f5b89  xlwt-1.1.2.tar.gz
-# sha256 calculated by scanpypi
-sha256	aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c  xlwt-1.1.2.tar.gz
+# md5 from https://pypi.python.org/pypi/xlwt/json, sha256 locally computed
+md5 1f2673a93c221f0195f342c578f04968 xlwt-1.2.0.tar.gz
+sha256 505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9 xlwt-1.2.0.tar.gz
diff --git a/bsp/buildroot/package/python-xlwt/python-xlwt.mk b/bsp/buildroot/package/python-xlwt/python-xlwt.mk
index 38d5f09d..f8a298a4 100644
--- a/bsp/buildroot/package/python-xlwt/python-xlwt.mk
+++ b/bsp/buildroot/package/python-xlwt/python-xlwt.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_XLWT_VERSION = 1.1.2
+PYTHON_XLWT_VERSION = 1.2.0
 PYTHON_XLWT_SOURCE = xlwt-$(PYTHON_XLWT_VERSION).tar.gz
-PYTHON_XLWT_SITE = https://pypi.python.org/packages/0b/69/644313df86e6375ec2c6b34ec8ac544b9cc7803b7d943223d32811860f3d
+PYTHON_XLWT_SITE = https://pypi.python.org/packages/5b/8d/22b9ec552a1d7865de39f54bd15f9db09c72a6bf8ab77b11dcce4ae336bb
 PYTHON_XLWT_SETUP_TYPE = setuptools
-PYTHON_XLWT_LICENSE = BSD-3c, BSD-4c
+PYTHON_XLWT_LICENSE = BSD-3-Clause, BSD-4-Clause
 PYTHON_XLWT_LICENSE_FILES = docs/licenses.rst
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python-xmltodict/Config.in b/bsp/buildroot/package/python-xmltodict/Config.in
new file mode 100644
index 00000000..cb12392c
--- /dev/null
+++ b/bsp/buildroot/package/python-xmltodict/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_PYTHON_XMLTODICT
+	bool "python-xmltodict"
+	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime
+	help
+	  Makes working with XML feel like you are working with JSON.
+
+	  https://github.com/martinblech/xmltodict
diff --git a/bsp/buildroot/package/python-xmltodict/python-xmltodict.hash b/bsp/buildroot/package/python-xmltodict/python-xmltodict.hash
new file mode 100644
index 00000000..4cb265e9
--- /dev/null
+++ b/bsp/buildroot/package/python-xmltodict/python-xmltodict.hash
@@ -0,0 +1,4 @@
+# md5 from https://pypi.python.org/pypi/xmltodict/json, sha256 locally computed
+md5	9f955947db085485873ac68154e88069  xmltodict-0.11.0.tar.gz
+sha256	8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df  xmltodict-0.11.0.tar.gz
+sha256  d66d5eb8f83a0ba21d3dd04318b8817588e8764daabea852d1035e3f07ffda55  LICENSE
diff --git a/bsp/buildroot/package/python-xmltodict/python-xmltodict.mk b/bsp/buildroot/package/python-xmltodict/python-xmltodict.mk
new file mode 100644
index 00000000..66007dfb
--- /dev/null
+++ b/bsp/buildroot/package/python-xmltodict/python-xmltodict.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-xmltodict
+#
+################################################################################
+
+PYTHON_XMLTODICT_VERSION = 0.11.0
+PYTHON_XMLTODICT_SOURCE = xmltodict-$(PYTHON_XMLTODICT_VERSION).tar.gz
+PYTHON_XMLTODICT_SITE = https://pypi.python.org/packages/57/17/a6acddc5f5993ea6eaf792b2e6c3be55e3e11f3b85206c818572585f61e1
+PYTHON_XMLTODICT_SETUP_TYPE = setuptools
+PYTHON_XMLTODICT_LICENSE = MIT
+PYTHON_XMLTODICT_LICENSE_FILES = LICENSE
+
+$(eval $(python-package))
diff --git a/bsp/buildroot/package/python-zope-interface/Config.in b/bsp/buildroot/package/python-zope-interface/Config.in
index 01f4a94c..4279aa9e 100644
--- a/bsp/buildroot/package/python-zope-interface/Config.in
+++ b/bsp/buildroot/package/python-zope-interface/Config.in
@@ -1,9 +1,12 @@
 config BR2_PACKAGE_PYTHON_ZOPE_INTERFACE
 	bool "python-zope-interface"
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	help
-	  This package provides an implementation of "object interfaces" for
-	  Python. Interfaces are a mechanism for labeling objects as conforming
-	  to a given API or contract. So, this package can be considered as
-	  implementation of the Design By Contract methodology support in Python.
+	  This package provides an implementation of "object
+	  interfaces" for Python. Interfaces are a mechanism for
+	  labeling objects as conforming to a given API or
+	  contract. So, this package can be considered as
+	  implementation of the Design By Contract methodology support
+	  in Python.
 
 	  http://docs.zope.org/zope.interface/
diff --git a/bsp/buildroot/package/python-zope-interface/python-zope-interface.hash b/bsp/buildroot/package/python-zope-interface/python-zope-interface.hash
index 7a46cd34..2aa07335 100644
--- a/bsp/buildroot/package/python-zope-interface/python-zope-interface.hash
+++ b/bsp/buildroot/package/python-zope-interface/python-zope-interface.hash
@@ -1,3 +1,4 @@
-# md5 from https://pypi.python.org/pypi/zope-interface/json, sha256 locally computed
-md5	ba3f32eacaea66094b7e2ae2788cec89  zope.interface-4.3.3.tar.gz
-sha256	8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88  zope.interface-4.3.3.tar.gz
+# md5 from https://pypi.python.org/pypi/zope.interface/json, sha256 locally computed
+md5	8700a4f527c1203b34b10c2b4e7a6912  zope.interface-4.4.3.tar.gz
+sha256	d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce  zope.interface-4.4.3.tar.gz
+sha256  3e671db11df687516cc1db5b3d65e4aa383eaca3c20cea3faf53a0f7335d0a3c  LICENSE.txt
diff --git a/bsp/buildroot/package/python-zope-interface/python-zope-interface.mk b/bsp/buildroot/package/python-zope-interface/python-zope-interface.mk
index 3e3b464b..7dd68129 100644
--- a/bsp/buildroot/package/python-zope-interface/python-zope-interface.mk
+++ b/bsp/buildroot/package/python-zope-interface/python-zope-interface.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON_ZOPE_INTERFACE_VERSION = 4.3.3
+PYTHON_ZOPE_INTERFACE_VERSION = 4.4.3
 PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz
-PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916
+PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/bd/d2/25349ed41f9dcff7b3baf87bd88a4c82396cf6e02f1f42bb68657a3132af
 PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools
-PYTHON_ZOPE_INTERFACE_LICENSE = ZPLv2.1
+PYTHON_ZOPE_INTERFACE_LICENSE = ZPL-2.1
 PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt
 
 $(eval $(python-package))
diff --git a/bsp/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch b/bsp/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
new file mode 100644
index 00000000..3b2c9833
--- /dev/null
+++ b/bsp/buildroot/package/python/0001-setup.py-do-not-add-invalid-header-locations.patch
@@ -0,0 +1,42 @@
+From 3dc31a435b67de2ba3dd3457f0c939e20b58e8de Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:17:06 +0100
+Subject: [PATCH] setup.py: do not add invalid header locations
+
+This piece of code incorrectly adds /usr/include to
+self.compiler.include_dirs, and results in the following invalid
+compilation line:
+
+/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \
+  -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
+  -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
+  -I/usr/include -I. -IInclude -I./Include \
+  -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
+  -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \
+  -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \
+  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \
+  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o
+cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories]
+[...]
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 54054c2..64001e2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -496,7 +496,7 @@ class PyBuildExt(build_ext):
+                     for directory in reversed(options.dirs):
+                         add_dir_to_list(dir_list, directory)
+ 
+-        if os.path.normpath(sys.prefix) != '/usr' \
++        if False and os.path.normpath(sys.prefix) != '/usr' \
+                 and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
+             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
+             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch b/bsp/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
new file mode 100644
index 00000000..b28ef244
--- /dev/null
+++ b/bsp/buildroot/package/python/0002-Fix-get_python_inc-for-cross-compilation.patch
@@ -0,0 +1,46 @@
+From 367ee7d103cf9f670c3925d555edf6f6a5b9d8d5 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:17:25 +0100
+Subject: [PATCH] Fix get_python_inc() for cross-compilation
+
+When we are cross compiling, doing os.path.dirname(sys.executable) to
+get the build directory is incorrect, because we're executing the host
+Python to build things for the target. Instead, we should use the
+project_base variable.
+
+This fixes cross-compilation, which was adding incorrect header paths
+pointing to the location where the host Python was built:
+
+/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC -fno-strict-aliasing \
+  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
+  -I/usr/include -I. -IInclude -I./Include -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
+  -I/home/thomas/projets/buildroot/output/host/usr/bin/Include -I/home/thomas/projets/buildroot/output/host/usr/bin \
+  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.c \
+  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.o
+
+This patch allows to fix the
+/home/thomas/projets/buildroot/output/host/usr/bin/Include and
+/home/thomas/projets/buildroot/output/host/usr/bin paths that are
+incorrectly added to the header paths.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Lib/distutils/sysconfig.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index de7da1d..d72b6e5 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -79,7 +79,7 @@ def get_python_inc(plat_specific=0, prefix=None):
+ 
+     if os.name == "posix":
+         if python_build:
+-            buildir = os.path.dirname(sys.executable)
++            buildir = project_base
+             if plat_specific:
+                 # python.h is located in the buildir
+                 inc_dir = buildir
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch b/bsp/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
new file mode 100644
index 00000000..db5bfe1a
--- /dev/null
+++ b/bsp/buildroot/package/python/0003-Change-the-install-location-of-_sysconfigdata.py.patch
@@ -0,0 +1,86 @@
+From 0ef0d4ddd3f2261e381f22061a9a451dfbb1dc9e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:17:59 +0100
+Subject: [PATCH] Change the install location of _sysconfigdata.py
+
+The _sysconfigdata.py module contains definitions that are needed when
+building Python modules. In cross-compilation mode, when building
+Python extensions for the target, we need to use the _sysconfigdata.py
+of the target Python while executing the host Python.
+
+However until now, the _sysconfigdata.py module was installed in
+build/lib.<arch>-<version> directory, together with a number of
+architecture-specific shared objects, which cannot be used with the
+host Python.
+
+To solve this problem, this patch moves _sysconfigdata.py to a
+separate location, build/sysconfigdata.<arch>-<version>/, and only
+this directory gets added to the PYTHONPATH of the host Python
+interpreter when building Python modules for the target.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.pre.in | 12 ++++++++++--
+ configure.ac    |  2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e288964..5367df7 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -529,6 +529,9 @@ pybuilddir.txt: $(BUILDPYTHON)
+ 		rm -f ./pybuilddir.txt ; \
+ 		exit 1 ; \
+ 	fi
++	echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
++	mkdir -p `cat pysysconfigdatadir.txt`
++	cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
+ 
+ # This is shared by the math and cmath modules
+ Modules/_math.o: Modules/_math.c Modules/_math.h
+@@ -1080,7 +1083,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 		else	true; \
+ 		fi; \
+ 	done
+-	@for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
++	@for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
+ 	do \
+ 		if test -x $$i; then \
+ 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
+@@ -1090,6 +1093,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
+ 		fi; \
+ 	done
++	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
++		$(DESTDIR)$(LIBDEST)
++	mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata
++	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
++		$(DESTDIR)$(LIBDEST)/sysconfigdata
+ 	@for d in $(LIBSUBDIRS); \
+ 	do \
+ 		a=$(srcdir)/Lib/$$d; \
+@@ -1418,7 +1426,7 @@ distclean: clobber
+ 		Modules/Setup Modules/Setup.local Modules/Setup.config \
+ 		Modules/ld_so_aix Modules/python.exp Misc/python.pc
+ 	-rm -f python*-gdb.py
+-	-rm -f pybuilddir.txt
++	-rm -f pybuilddir.txt pysysconfigdatadir.txt
+ 	# Issue #28258: set LC_ALL to avoid issues with Estonian locale.
+ 	# Expansion is performed here by shell (spawned by make) itself before
+ 	# arguments are passed to find. So LC_ALL=C must be set as a separate
+diff --git a/configure.ac b/configure.ac
+index 1273465..5f89797 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ if test "$cross_compiling" = yes; then
+ 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
+ 	fi
+         AC_MSG_RESULT($interp)
+-	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
++	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
+     fi
+     # Used to comment out stuff for rebuilding generated files
+     GENERATED_COMMENT='#'
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch b/bsp/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
new file mode 100644
index 00000000..3bf407d5
--- /dev/null
+++ b/bsp/buildroot/package/python/0004-Make-the-compilation-of-.pyc-and-.pyo-conditional.patch
@@ -0,0 +1,76 @@
+From 168e6c594e80395583de5ab0d082be119b2061fc Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:18:57 +0100
+Subject: [PATCH] Make the compilation of .pyc and .pyo conditional
+
+This commit adds --{enable,disable}-{pyc,pyo} options to enable/disable
+the compilation of pyc/pyo files.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.pre.in |  8 ++++++++
+ configure.ac    | 11 +++++++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 5367df7..96fc718 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1128,24 +1128,32 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+ 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ 	fi
++ifeq (@PYC_BUILD@,yes)
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
++endif
++ifeq (@PYO_BUILD@,yes)
+ 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+ 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
+ 		$(DESTDIR)$(LIBDEST)
++endif
++ifeq (@PYC_BUILD@,yes)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
++endif
++ifeq (@PYO_BUILD@,yes)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
++endif
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+diff --git a/configure.ac b/configure.ac
+index 5f89797..4aafc82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -759,6 +759,17 @@ SunOS*)
+     ;;
+ esac
+ 
++AC_SUBST(PYC_BUILD)
++
++AC_ARG_ENABLE(pyc-build,
++	AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]),
++	[ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ])
++
++AC_SUBST(PYO_BUILD)
++
++AC_ARG_ENABLE(pyo-build,
++	AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]),
++	[ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ])
+ 
+ AC_SUBST(LIBRARY)
+ AC_MSG_CHECKING(LIBRARY)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch b/bsp/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
new file mode 100644
index 00000000..e0a24ec8
--- /dev/null
+++ b/bsp/buildroot/package/python/0005-Adjust-getaddrinfo-test-for-cross-compilation.patch
@@ -0,0 +1,29 @@
+From 2d971c3cdca9ecc55f2da8aba12ca89e1a66519a Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:19:47 +0100
+Subject: [PATCH] Adjust getaddrinfo() test for cross-compilation
+
+The getaddrinfo() test in configure.ac uses AC_RUN_IFELSE(), which isn't
+cross-compilation friendly.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4aafc82..63e6918 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3527,7 +3527,7 @@ fi
+ 
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+ 
+-if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
++if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
+ then
+ 	if test $ipv6 = yes
+ 	then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch b/bsp/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
new file mode 100644
index 00000000..44a8ae2c
--- /dev/null
+++ b/bsp/buildroot/package/python/0006-Add-minimal-infrastructure-to-be-able-to-disable-ext.patch
@@ -0,0 +1,79 @@
+From 977de9474c1fb46359ab6a487e153fbd91a2b568 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:21:28 +0100
+Subject: [PATCH] Add minimal infrastructure to be able to disable extensions
+
+This commit adds some logic to the Python build system to be able to
+disable Python extensions. Follow-up commits actually add options to
+disable specific extensions.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.pre.in | 6 +++++-
+ configure.ac    | 2 ++
+ setup.py        | 5 ++++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 96fc718..33b994d 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -161,6 +161,8 @@ FILEMODE=	644
+ # configure script arguments
+ CONFIG_ARGS=	@CONFIG_ARGS@
+ 
++# disabled extensions
++DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
+ 
+ # Subdirectories with code
+ SRCDIRS= 	@SRCDIRS@
+@@ -548,6 +550,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+ 	esac; \
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
++		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ 
+ # Build static library
+@@ -1269,7 +1272,8 @@ libainstall:	all python-config
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+-	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
++	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
++		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+diff --git a/configure.ac b/configure.ac
+index 63e6918..5d4232f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2462,6 +2462,8 @@ LIBS="$withval $LIBS"
+ 
+ PKG_PROG_PKG_CONFIG
+ 
++AC_SUBST(DISABLED_EXTENSIONS)
++
+ # Check for use of the system expat library
+ AC_MSG_CHECKING(for --with-system-expat)
+ AC_ARG_WITH(system_expat,
+diff --git a/setup.py b/setup.py
+index 64001e2..3b51c0a 100644
+--- a/setup.py
++++ b/setup.py
+@@ -33,7 +33,10 @@ host_platform = get_platform()
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++try:
++    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
++except KeyError:
++    disabled_module_list = list()
+ 
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (at the front) if
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch b/bsp/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
new file mode 100644
index 00000000..c68f1bf7
--- /dev/null
+++ b/bsp/buildroot/package/python/0007-Adjust-library-header-paths-for-cross-compilation.patch
@@ -0,0 +1,64 @@
+From f3e0a677c4736f95338825a022a884f8dc7a5c14 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:22:19 +0100
+Subject: [PATCH] Adjust library/header paths for cross-compilation
+
+When cross-compiling third-party extensions, the get_python_inc() or
+get_python_lib() can be called, to return the path to headers or
+libraries. However, they use the sys.prefix of the host Python, which
+returns incorrect paths when cross-compiling (paths pointing to host
+headers and libraries).
+
+In order to fix this, we introduce the _python_sysroot, _python_prefix
+and _python_exec_prefix variables, that allow to override these
+values, and get correct header/library paths when cross-compiling
+third-party Python modules.
+
+The _python_sysroot variable is also used to prefix the LIBDIR value
+taken from the sysconfigdata module.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Lib/distutils/command/build_ext.py | 5 ++++-
+ Lib/distutils/sysconfig.py         | 9 +++++++--
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+index 2c68be3..375b08c 100644
+--- a/Lib/distutils/command/build_ext.py
++++ b/Lib/distutils/command/build_ext.py
+@@ -240,7 +240,10 @@ class build_ext (Command):
+         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
+             if not sysconfig.python_build:
+                 # building third party extensions
+-                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
++                libdir = sysconfig.get_config_var('LIBDIR')
++                if "_python_sysroot" in os.environ:
++                    libdir = os.environ.get("_python_sysroot") + libdir
++                self.library_dirs.append(libdir)
+             else:
+                 # building python standard extensions
+                 self.library_dirs.append('.')
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index d72b6e5..72151df 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -19,8 +19,13 @@ import sys
+ from distutils.errors import DistutilsPlatformError
+ 
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++if "_python_sysroot" in os.environ:
++    _sysroot=os.environ.get('_python_sysroot')
++    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
++    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
++else:
++    PREFIX = os.path.normpath(sys.prefix)
++    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+ 
+ # Path to the base directory of the project. On Windows the binary may
+ # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python3/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/bsp/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
similarity index 85%
rename from bsp/buildroot/package/python3/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
rename to bsp/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
index 47a0b832..d523b746 100644
--- a/bsp/buildroot/package/python3/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
+++ b/bsp/buildroot/package/python/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch
@@ -1,6 +1,6 @@
-From d7c568632f7cb83346096ea114a06f89a0b488d6 Mon Sep 17 00:00:00 2001
+From 87b627d8845e67fd798449b414bece04f18bd450 Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:36:00 +0100
+Date: Tue, 7 Mar 2017 22:22:40 +0100
 Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 1ebfa50..24a7153 100644
+index 3b51c0a..fa32532 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -753,12 +753,9 @@ class PyBuildExt(build_ext):
+@@ -784,12 +784,9 @@ class PyBuildExt(build_ext):
                  pass # Issue 7384: Already linked against curses or tinfo.
              elif curses_library:
                  readline_libs.append(curses_library)
@@ -27,5 +27,5 @@ index 1ebfa50..24a7153 100644
                                     libraries=readline_libs) )
          else:
 -- 
-2.6.4
+2.7.4
 
diff --git a/bsp/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch b/bsp/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
new file mode 100644
index 00000000..761d6d92
--- /dev/null
+++ b/bsp/buildroot/package/python/0009-Fix-python-config-for-cross-builds.patch
@@ -0,0 +1,227 @@
+From e5b0d225f4343e82791cb80e4e0c01a9b49eeff4 Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Tue, 7 Mar 2017 22:23:14 +0100
+Subject: [PATCH] Fix python-config for cross-builds
+
+Add a backport of http://bugs.python.org/issue16235 so we can use
+python-config for cross builds.
+
+This basically replaces the python version of python-config with a
+pure-shell version that's already preprocessed when installed and
+doesn't depend on the sysconfig import that usually leads to bad
+data/results.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Bernd: rebased for Python 2.7.15]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.pre.in          |  13 +++---
+ Misc/python-config.sh.in | 102 +++++++++++++++++++++++++++++++++++++++++++++++
+ configure.ac             |   7 +++-
+ 3 files changed, 116 insertions(+), 6 deletions(-)
+ create mode 100644 Misc/python-config.sh.in
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 33b994d..beb0837 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -171,7 +171,7 @@ SRCDIRS= 	@SRCDIRS@
+ SUBDIRSTOO=	Include Lib Misc Demo
+ 
+ # Files and directories to be distributed
+-CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in
++CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh
+ DISTFILES=	README ChangeLog $(CONFIGFILES)
+ DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
+ DIST=		$(DISTFILES) $(DISTDIRS)
+@@ -431,7 +431,7 @@ LIBRARY_OBJS=	\
+ 
+ # Default target
+ all:		@DEF_MAKE_ALL_RULE@
+-build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
++build_all:	check-clean-src $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
+ 
+ # Compile a binary with profile guided optimization.
+ profile-opt:
+@@ -1179,10 +1179,12 @@ $(srcdir)/Lib/$(PLATDIR):
+ 	fi; \
+ 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
+ 
+-python-config: $(srcdir)/Misc/python-config.in
++python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
+ 	# Substitution happens here, as the completely-expanded BINDIR
+ 	# is not available in configure
+-	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
++	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
++	# Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
++	sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config
+ 
+ # Install the include files
+ INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
+@@ -1241,7 +1243,7 @@ libainstall:	all python-config
+ 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
+ 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
+-	rm python-config
++	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
+ 	@if [ -s Modules/python.exp -a \
+ 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+ 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
+@@ -1426,6 +1428,7 @@ clobber: clean profile-removal
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+ 	-rm -rf $(PYTHONFRAMEWORKDIR)
++	-rm -f python-config.py python-config
+ 
+ # Make things extra clean, before making a distribution:
+ # remove all generated files, even Makefile[.pre]
+diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
+new file mode 100644
+index 0000000..10db4c1
+--- /dev/null
++++ b/Misc/python-config.sh.in
+@@ -0,0 +1,102 @@
++#!/bin/sh
++
++exit_with_usage ()
++{
++	echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir"
++	exit $1
++}
++
++if [ "$1" = "" ] ; then
++	exit_with_usage 1
++fi
++
++# Returns the actual prefix where this script was installed to.
++installed_prefix ()
++{
++	RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
++	if which readlink >/dev/null 2>&1 ; then
++	RESULT=$(readlink -f "$RESULT")
++	fi
++	echo $RESULT
++}
++
++prefix_build="@prefix@"
++prefix_real=$(installed_prefix "$0")
++
++# Use sed to fix paths from their built to locations to their installed to locations.
++prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
++exec_prefix_build="@exec_prefix@"
++exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
++includedir=$(echo "@includedir@")
++libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
++CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
++VERSION="@VERSION@"
++LIBM="@LIBM@"
++LIBC="@LIBC@"
++SYSLIBS="$LIBM $LIBC"
++LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}"
++BASECFLAGS="@BASECFLAGS@"
++LDLIBRARY="@LDLIBRARY@"
++LINKFORSHARED="@LINKFORSHARED@"
++OPT="@OPT@"
++PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
++LDVERSION="@LDVERSION@"
++LIBDEST=${prefix}/lib/python${VERSION}
++LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
++SO="@SO@"
++PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
++INCDIR="-I$includedir/python${VERSION}"
++PLATINCDIR="-I$includedir/python${VERSION}"
++
++# Scan for --help or unknown argument.
++for ARG in $*
++do
++	case $ARG in
++	--help)
++		exit_with_usage 0
++	;;
++	--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir)
++	;;
++	*)
++		exit_with_usage 1
++	;;
++esac
++done
++
++for ARG in "$@"
++do
++	case "$ARG" in
++	--prefix)
++		echo "$prefix"
++	;;
++	--exec-prefix)
++		echo "$exec_prefix"
++	;;
++	--includes)
++		 echo "$INCDIR $PLATINCDIR"
++	;;
++	--cflags)
++		echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT"
++	;;
++	--libs)
++		echo "$LIBS"
++	;;
++	--ldflags)
++		LINKFORSHAREDUSED=
++		if [ -z "$PYTHONFRAMEWORK" ] ; then
++			LINKFORSHAREDUSED=$LINKFORSHARED
++		fi
++		LIBPLUSED=
++		if [ "$PY_ENABLE_SHARED" = "0" ] ; then
++			LIBPLUSED="-L$LIBPL"
++		fi
++		echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED"
++	;;
++	--extension-suffix)
++		echo "$SO"
++	;;
++	--configdir)
++		echo "$LIBPL"
++	;;
++esac
++done
+diff --git a/configure.ac b/configure.ac
+index 5d4232f..183a903 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -905,6 +905,7 @@ fi
+ 
+ # Other platforms follow
+ if test $enable_shared = "yes"; then
++  PY_ENABLE_SHARED=1
+   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
+   case $ac_sys_system in
+     BeOS*)
+@@ -965,6 +966,7 @@ if test $enable_shared = "yes"; then
+ 
+   esac
+ else # shared is disabled
++  PY_ENABLE_SHARED=0
+   case $ac_sys_system in
+     CYGWIN*)
+           BLDLIBRARY='$(LIBRARY)'
+@@ -2096,6 +2098,9 @@ AC_SUBST(LDCXXSHARED)
+ AC_SUBST(BLDSHARED)
+ AC_SUBST(CCSHARED)
+ AC_SUBST(LINKFORSHARED)
++AC_SUBST(PY_ENABLE_SHARED)
++LIBPL="${prefix}/lib/python${VERSION}/config"
++AC_SUBST(LIBPL)
+ # SO is the extension of shared libraries `(including the dot!)
+ # -- usually .so, .sl on HP-UX, .dll on Cygwin
+ AC_MSG_CHECKING(SO)
+@@ -4818,7 +4823,7 @@ AC_MSG_RESULT($ENSUREPIP)
+ AC_SUBST(ENSUREPIP)
+ 
+ # generate output files
+-AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
++AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
+ AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
+ AC_OUTPUT
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/001-remove-host-header-path.patch b/bsp/buildroot/package/python/001-remove-host-header-path.patch
deleted file mode 100644
index dfb84ffa..00000000
--- a/bsp/buildroot/package/python/001-remove-host-header-path.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-setup.py: do not add invalid header locations
-
-This piece of code incorrectly adds /usr/include to
-self.compiler.include_dirs, and results in the following invalid
-compilation line:
-
-/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \
-  -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \
-  -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
-  -I/usr/include -I. -IInclude -I./Include \
-  -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
-  -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \
-  -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \
-  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \
-  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o
-cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories]
-[...]
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -480,7 +480,7 @@
-                     for directory in reversed(options.dirs):
-                         add_dir_to_list(dir_list, directory)
- 
--        if os.path.normpath(sys.prefix) != '/usr' \
-+        if False and os.path.normpath(sys.prefix) != '/usr' \
-                 and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
diff --git a/bsp/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch b/bsp/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
new file mode 100644
index 00000000..864ccbfb
--- /dev/null
+++ b/bsp/buildroot/package/python/0010-Remove-the-python-symlink-install-rules.patch
@@ -0,0 +1,41 @@
+From bddfcbb8a4c011ca2fe471f7a4124cd64b5b0f00 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Tue, 7 Mar 2017 22:23:58 +0100
+Subject: [PATCH] Remove the python symlink install rules
+
+The python symlink installation will be handled by Buildroot itself,
+because Buildroot needs to control to what python interpreter (python2
+or python3) the python symlink points to.
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Bernd: rebased against version 2.7.12.]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.pre.in | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index beb0837..dedcf61 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -968,17 +968,10 @@ bininstall:	altbininstall
+ 		echo "Creating directory $(LIBPC)"; \
+ 		$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
+ 	fi
+-	-if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
+-	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+-	else true; \
+-	fi
+-	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python2-config
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
+-	-rm -f $(DESTDIR)$(BINDIR)/python-config
+-	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config)
+ 	-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
+ 	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
+ 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch b/bsp/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
new file mode 100644
index 00000000..b84c9077
--- /dev/null
+++ b/bsp/buildroot/package/python/0011-Don-t-add-multiarch-paths.patch
@@ -0,0 +1,36 @@
+From 50a243a9c90f95e9248ac720e42e802b5922ab90 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:24:28 +0100
+Subject: [PATCH] Don't add multiarch paths
+
+The add_multiarch_paths() function leads, in certain build
+environments, to the addition of host header paths to the CFLAGS,
+which is not appropriate for cross-compilation. This patch fixes that
+by simply removing the call to add_multiarch_paths() when we're
+cross-compiling.
+
+Investigation done by David <buildroot-2014@inbox.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index fa32532..0b9ea57 100644
+--- a/setup.py
++++ b/setup.py
+@@ -461,9 +461,9 @@ class PyBuildExt(build_ext):
+         if not cross_compiling:
+             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++            self.add_multiarch_paths()
+         if cross_compiling:
+             self.add_gcc_paths()
+-        self.add_multiarch_paths()
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0012-Abort-on-failed-module-build.patch b/bsp/buildroot/package/python/0012-Abort-on-failed-module-build.patch
new file mode 100644
index 00000000..7d952ca5
--- /dev/null
+++ b/bsp/buildroot/package/python/0012-Abort-on-failed-module-build.patch
@@ -0,0 +1,30 @@
+From a131e2ff219872d97eef6585117bd2f8ff9e310d Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:24:48 +0100
+Subject: [PATCH] Abort on failed module build
+
+When building a Python module fails, the setup.py script currently
+doesn't exit with an error, and simply continues. This is not a really
+nice behavior, so this patch changes setup.py to abort with an error,
+so that the build issue is clearly noticeable.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index 0b9ea57..9a5c2b8 100644
+--- a/setup.py
++++ b/setup.py
+@@ -299,6 +299,7 @@ class PyBuildExt(build_ext):
+             print "Failed to build these modules:"
+             print_three_column(failed)
+             print
++            sys.exit(1)
+ 
+     def build_extension(self, ext):
+ 
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch b/bsp/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
new file mode 100644
index 00000000..dfc11efc
--- /dev/null
+++ b/bsp/buildroot/package/python/0013-sqlite3-fix-build-when-threads-are-not-used-availabl.patch
@@ -0,0 +1,58 @@
+From 0f0be88526ece7d2f6ee21c1f59b1546ec6dc7c0 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Tue, 7 Mar 2017 22:25:14 +0100
+Subject: [PATCH] sqlite3: fix build when threads are not used/available
+
+When threads are not used/available, a function in the sqlite3 extension
+ends up with a label at the end:
+
+    void _pysqlite_final_callback(sqlite3_context* context)
+    {
+        PyObject* function_result;
+        PyObject** aggregate_instance;
+        int ok;
+
+    #ifdef WITH_THREAD
+        PyGILState_STATE threadstate;
+
+        threadstate = PyGILState_Ensure();
+    #endif
+
+        aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
+        if (!*aggregate_instance) {
+            goto error;
+        }
+
+        [......]
+
+    error:
+    #ifdef WITH_THREAD
+        PyGILState_Release(threadstate);
+    #endif
+    }
+
+This is not valid, and gcc complains.
+
+Fix that by adding a dummy statement after the label, so that the label
+is never the last statement of the function.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+ Modules/_sqlite/connection.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
+index 237d6e4..cdf69ab 100644
+--- a/Modules/_sqlite/connection.c
++++ b/Modules/_sqlite/connection.c
+@@ -794,6 +794,7 @@ error:
+ #ifdef WITH_THREAD
+     PyGILState_Release(threadstate);
+ #endif
++    ;   /* Make gcc happy: a label can't be at the end of a function */
+ }
+ 
+ static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0014-Serial-ioctl-workaround.patch b/bsp/buildroot/package/python/0014-Serial-ioctl-workaround.patch
new file mode 100644
index 00000000..468d535a
--- /dev/null
+++ b/bsp/buildroot/package/python/0014-Serial-ioctl-workaround.patch
@@ -0,0 +1,33 @@
+From 22e5a4c5d29ddf0856d7f68f5a613aec00e26168 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 7 Mar 2017 22:25:36 +0100
+Subject: [PATCH] Serial ioctl() workaround
+
+The ioctls.h of some architectures (notably xtensa) references structs from
+linux/serial.h. Make sure to include this header as well.
+
+Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
+but isn't actually referenced in modern kernels.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ Modules/termios.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Modules/termios.c b/Modules/termios.c
+index 57f30dc..a8c9855 100644
+--- a/Modules/termios.c
++++ b/Modules/termios.c
+@@ -16,7 +16,9 @@
+  * so this needs to be included first on that platform. */
+ #include <termio.h>
+ #endif
++#include <linux/serial.h>
+ #include <sys/ioctl.h>
++#undef TIOCTTYGSTRUCT
+ 
+ /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
+  * MDTR, MRI, and MRTS (appearantly used internally by some things
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/bsp/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
new file mode 100644
index 00000000..fecf29f4
--- /dev/null
+++ b/bsp/buildroot/package/python/0015-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
@@ -0,0 +1,35 @@
+From 70049366ddf1fc9084bb02cf4459380976cdf8f7 Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
+Date: Tue, 7 Mar 2017 22:26:09 +0100
+Subject: [PATCH] Do not adjust the shebang of Python scripts for
+ cross-compilation
+
+The copy_scripts() method in distutils copies the scripts listed in
+the setup file and adjusts the first line to refer to the current
+Python interpreter. When cross-compiling, this means that the adjusted
+shebang refers to the host Python interpreter.
+
+This patch modifies copy_scripts() to preserve the shebang when
+cross-compilation is detected.
+
+Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
+---
+ Lib/distutils/command/build_scripts.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
+index 567df65..4922d50 100644
+--- a/Lib/distutils/command/build_scripts.py
++++ b/Lib/distutils/command/build_scripts.py
+@@ -89,7 +89,7 @@ class build_scripts (Command):
+                     adjust = 1
+                     post_interp = match.group(1) or ''
+ 
+-            if adjust:
++            if adjust and not '_python_sysroot' in os.environ:
+                 log.info("copying and adjusting %s -> %s", script,
+                          self.build_dir)
+                 if not self.dry_run:
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch b/bsp/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
new file mode 100644
index 00000000..2e1a054f
--- /dev/null
+++ b/bsp/buildroot/package/python/0016-Add-an-option-to-disable-installation-of-test-module.patch
@@ -0,0 +1,103 @@
+From 0eac7789c0dd4aebe9e69d3c73d0c95e96922ea3 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:27:16 +0100
+Subject: [PATCH] Add an option to disable installation of test modules
+
+The Python standard distribution comes with many test modules, that
+are not necessarly useful on embedded targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Bernd: rebased against version 2.7.14]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.pre.in | 48 ++++++++++++++++++++++++++++++++----------------
+ configure.ac    |  6 ++++++
+ 2 files changed, 38 insertions(+), 16 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index dedcf61..280cc4e 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1032,28 +1032,44 @@
+ 	plat-mac/lib-scriptpackages/SystemEvents \
+ 	plat-mac/lib-scriptpackages/Terminal
+ PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
+-LIBSUBDIRS=	lib-tk lib-tk/test lib-tk/test/test_tkinter \
+-		lib-tk/test/test_ttk site-packages test test/audiodata test/capath \
+-		test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
+-		test/imghdrdata \
+-		test/subprocessdata \
+-		test/support \
+-		test/tracedmodules \
++LIBSUBDIRS=	lib-tk site-packages \
+ 		encodings compiler hotshot \
+-		email email/mime email/test email/test/data \
++		email email/mime \
+ 		ensurepip ensurepip/_bundled \
+-		json json/tests \
+-		sqlite3 sqlite3/test \
+-		logging bsddb bsddb/test csv importlib wsgiref \
+-		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
+-		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+-		ctypes ctypes/test ctypes/macholib \
+-		idlelib idlelib/Icons idlelib/idle_test \
+-		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
++		json \
++		sqlite3  \
++		logging bsddb csv importlib wsgiref \
++		lib2to3 lib2to3/fixes lib2to3/pgen2 \
++		ctypes ctypes/macholib \
++		idlelib idlelib/Icons \
++		distutils distutils/command $(XMLLIBSUBDIRS) \
+ 		multiprocessing multiprocessing/dummy \
+-		unittest unittest/test \
++		unittest \
+ 		lib-old \
+ 		curses pydoc_data $(MACHDEPS)
++
++TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
++	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
++	test/cjkencodings test/decimaltestdata test/xmltestdata \
++	test/imghdrdata \
++	test/subprocessdata \
++	test/support \
++	test/tracedmodules \
++	email/test email/test/data \
++	json/tests \
++	sqlite3/test \
++	bsddb/test \
++	lib2to3/tests \
++ 	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
++	ctypes/test \
++	idlelib/idle_test \
++	distutils/tests \
++	unittest/test
++
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += $(TESTSUBDIRS)
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index 183a903..a1a35f6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2806,6 +2806,12 @@ if test "$posix_threads" = "yes"; then
+ fi
+ 
+ 
++AC_SUBST(TEST_MODULES)
++
++AC_ARG_ENABLE(test-modules,
++	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
++	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch b/bsp/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
new file mode 100644
index 00000000..18582f18
--- /dev/null
+++ b/bsp/buildroot/package/python/0017-Add-an-option-to-disable-pydoc.patch
@@ -0,0 +1,87 @@
+From 52463745b6c46a46a6f2e2bc17983bb3f7bdac6e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:27:34 +0100
+Subject: [PATCH] Add an option to disable pydoc
+
+It removes 0.5 MB of data from the target plus the pydoc script
+itself.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in |  6 +++++-
+ configure.ac    |  5 +++++
+ setup.py        | 10 +++++++---
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 280cc4e..84d5fc6 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1052,7 +1052,7 @@ LIBSUBDIRS=	lib-tk site-packages \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+ 		lib-old \
+-		curses pydoc_data $(MACHDEPS)
++		curses $(MACHDEPS)
+ 
+ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+ 	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
+@@ -1075,6 +1075,10 @@ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += $(TESTSUBDIRS)
+ endif
+ 
++ifeq (@PYDOC@,yes)
++LIBSUBDIRS += pydoc_data
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index a1a35f6..8bab160 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2805,6 +2805,11 @@ if test "$posix_threads" = "yes"; then
+       AC_CHECK_FUNCS(pthread_atfork)
+ fi
+ 
++AC_SUBST(PYDOC)
++
++AC_ARG_ENABLE(pydoc,
++	AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
++	[ PYDOC="${enableval}" ], [ PYDOC=yes ])
+ 
+ AC_SUBST(TEST_MODULES)
+ 
+diff --git a/setup.py b/setup.py
+index 9a5c2b8..69771e2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2233,6 +2233,12 @@ def main():
+     # turn off warnings when deprecated modules are imported
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
++
++    scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
++               'Lib/smtpd.py']
++    if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/pydoc' ]
++
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+           version = sys.version.split()[0],
+@@ -2253,9 +2259,7 @@ def main():
+           ext_modules=[Extension('_struct', ['_struct.c'])],
+ 
+           # Scripts to install
+-          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
+-                     'Tools/scripts/2to3',
+-                     'Lib/smtpd.py']
++          scripts = scripts,
+         )
+ 
+ # --install-platlib
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch b/bsp/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
new file mode 100644
index 00000000..765b05d9
--- /dev/null
+++ b/bsp/buildroot/package/python/0018-Add-an-option-to-disable-lib2to3.patch
@@ -0,0 +1,90 @@
+From d0cf9ebed6d34d820cf594578cf513797fb52772 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:27:49 +0100
+Subject: [PATCH] Add an option to disable lib2to3
+
+lib2to3 is a library to convert Python 2.x code to Python 3.x. As
+such, it is probably not very useful on embedded system targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac    |  6 ++++++
+ setup.py        |  5 +++--
+ 3 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 84d5fc6..b2a0490 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1045,7 +1045,6 @@ LIBSUBDIRS=	lib-tk site-packages \
+ 		json \
+ 		sqlite3  \
+ 		logging bsddb csv importlib wsgiref \
+-		lib2to3 lib2to3/fixes lib2to3/pgen2 \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+ 		distutils distutils/command $(XMLLIBSUBDIRS) \
+@@ -1064,8 +1063,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+ 	json/tests \
+ 	sqlite3/test \
+ 	bsddb/test \
+-	lib2to3/tests \
+- 	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
+ 	ctypes/test \
+ 	idlelib/idle_test \
+ 	distutils/tests \
+@@ -1079,6 +1076,14 @@ ifeq (@PYDOC@,yes)
+ LIBSUBDIRS += pydoc_data
+ endif
+ 
++ifeq (@LIB2TO3@,yes)
++LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
++TESTSUBDIRS += 	lib2to3/tests				\
++		lib2to3/tests/data			\
++		lib2to3/tests/data/fixers		\
++		lib2to3/tests/data/fixers/myfixes
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index 8bab160..270f337 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2817,6 +2817,12 @@ AC_ARG_ENABLE(test-modules,
+ 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
+ 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
+ 
++AC_SUBST(LIB2TO3)
++
++AC_ARG_ENABLE(lib2to3,
++	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
++	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
+diff --git a/setup.py b/setup.py
+index 69771e2..f51ef8c 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2234,10 +2234,11 @@ def main():
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
+-               'Lib/smtpd.py']
++    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc' ]
++    if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/2to3' ]
+ 
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch b/bsp/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
new file mode 100644
index 00000000..bffe3faa
--- /dev/null
+++ b/bsp/buildroot/package/python/0019-Add-option-to-disable-the-sqlite3-module.patch
@@ -0,0 +1,67 @@
+From 570e1e81484d9bcbd30a7719b07d02785a5cab24 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:28:06 +0100
+Subject: [PATCH] Add option to disable the sqlite3 module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in | 7 +++++--
+ configure.ac    | 9 +++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index b2a0490..974a052 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1043,7 +1043,6 @@ LIBSUBDIRS=	lib-tk site-packages \
+ 		email email/mime \
+ 		ensurepip ensurepip/_bundled \
+ 		json \
+-		sqlite3  \
+ 		logging bsddb csv importlib wsgiref \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+@@ -1061,7 +1060,6 @@ TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+ 	test/tracedmodules \
+ 	email/test email/test/data \
+ 	json/tests \
+-	sqlite3/test \
+ 	bsddb/test \
+ 	ctypes/test \
+ 	idlelib/idle_test \
+@@ -1084,6 +1082,11 @@ TESTSUBDIRS += 	lib2to3/tests				\
+ 		lib2to3/tests/data/fixers/myfixes
+ endif
+ 
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++TESTSUBDIRS += sqlite3/test
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index 270f337..e9e1897 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2805,6 +2805,15 @@ if test "$posix_threads" = "yes"; then
+       AC_CHECK_FUNCS(pthread_atfork)
+ fi
+ 
++AC_SUBST(SQLITE3)
++AC_ARG_ENABLE(sqlite3,
++	AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
++	[ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
++
++if test "$SQLITE3" = "no" ; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/002-fix-get-python-inc.patch b/bsp/buildroot/package/python/002-fix-get-python-inc.patch
deleted file mode 100644
index bfee03aa..00000000
--- a/bsp/buildroot/package/python/002-fix-get-python-inc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix get_python_inc() for cross-compilation
-
-When we are cross compiling, doing os.path.dirname(sys.executable) to
-get the build directory is incorrect, because we're executing the host
-Python to build things for the target. Instead, we should use the
-project_base variable.
-
-This fixes cross-compilation, which was adding incorrect header paths
-pointing to the location where the host Python was built:
-
-/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC -fno-strict-aliasing \
-  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \
-  -I/usr/include -I. -IInclude -I./Include -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \
-  -I/home/thomas/projets/buildroot/output/host/usr/bin/Include -I/home/thomas/projets/buildroot/output/host/usr/bin \
-  -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.c \
-  -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.o
-
-This patch allows to fix the
-/home/thomas/projets/buildroot/output/host/usr/bin/Include and
-/home/thomas/projets/buildroot/output/host/usr/bin paths that are
-incorrectly added to the header paths.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -79,7 +79,7 @@
- 
-     if os.name == "posix":
-         if python_build:
--            buildir = os.path.dirname(sys.executable)
-+            buildir = project_base
-             if plat_specific:
-                 # python.h is located in the buildir
-                 inc_dir = buildir
diff --git a/bsp/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch b/bsp/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
new file mode 100644
index 00000000..82df405e
--- /dev/null
+++ b/bsp/buildroot/package/python/0020-Add-an-option-to-disable-the-tk-module.patch
@@ -0,0 +1,71 @@
+From 05fbe2527b6f87edeef11f288c36bcbaa378ca02 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:28:57 +0100
+Subject: [PATCH] Add an option to disable the tk module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac    |  9 +++++++++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 974a052..f7f025f 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1038,7 +1038,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
+ 	plat-mac/lib-scriptpackages/SystemEvents \
+ 	plat-mac/lib-scriptpackages/Terminal
+ PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
+-LIBSUBDIRS=	lib-tk site-packages \
++LIBSUBDIRS=	site-packages \
+ 		encodings compiler hotshot \
+ 		email email/mime \
+ 		ensurepip ensurepip/_bundled \
+@@ -1052,8 +1052,7 @@ LIBSUBDIRS=	lib-tk site-packages \
+ 		lib-old \
+ 		curses $(MACHDEPS)
+ 
+-TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
+-	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
++TESTSUBDIRS = test test/audiodata test/capath test/data \
+ 	test/cjkencodings test/decimaltestdata test/xmltestdata \
+ 	test/imghdrdata \
+ 	test/subprocessdata \
+@@ -1087,6 +1086,12 @@ LIBSUBDIRS += sqlite3
+ TESTSUBDIRS += sqlite3/test
+ endif
+ 
++ifeq (@TK@,yes)
++LIBSUBDIRS += lib-tk
++TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
++	      lib-tk/test/test_ttk
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index e9e1897..d0f032c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2814,6 +2814,15 @@ if test "$SQLITE3" = "no" ; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+ fi
+ 
++AC_SUBST(TK)
++AC_ARG_ENABLE(tk,
++	AS_HELP_STRING([--disable-tk], [disable tk]),
++	[ TK="${enableval}" ], [ TK=yes ])
++
++if test "$TK" = "no"; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch b/bsp/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
new file mode 100644
index 00000000..c36942ad
--- /dev/null
+++ b/bsp/buildroot/package/python/0021-Add-an-option-to-disable-the-curses-module.patch
@@ -0,0 +1,59 @@
+From dba12f15baad06cc7e17a275201cc022bb6c84f7 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:29:06 +0100
+Subject: [PATCH] Add an option to disable the curses module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in | 6 +++++-
+ configure.ac    | 9 +++++++++
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index f7f025f..bd537d9 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1050,7 +1050,7 @@ LIBSUBDIRS=	site-packages \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+ 		lib-old \
+-		curses $(MACHDEPS)
++		$(MACHDEPS)
+ 
+ TESTSUBDIRS = test test/audiodata test/capath test/data \
+ 	test/cjkencodings test/decimaltestdata test/xmltestdata \
+@@ -1092,6 +1092,10 @@ TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
+ 	      lib-tk/test/test_ttk
+ endif
+ 
++ifeq (@CURSES@,yes)
++LIBSUBDIRS += curses
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index d0f032c..ab081bc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2823,6 +2823,15 @@ if test "$TK" = "no"; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
+ fi
+ 
++AC_SUBST(CURSES)
++AC_ARG_ENABLE(curses,
++	AS_HELP_STRING([--disable-curses], [disable curses]),
++	[ CURSES="${enableval}" ], [ CURSES=yes ])
++
++if test "$CURSES" = "no"; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch b/bsp/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
new file mode 100644
index 00000000..8253f112
--- /dev/null
+++ b/bsp/buildroot/package/python/0022-Add-an-option-to-disable-expat.patch
@@ -0,0 +1,90 @@
+From 5f0f30bf342cd2b13f98513c39fd8f17351b1a2f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:29:20 +0100
+Subject: [PATCH] Add an option to disable expat
+
+This patch replaces the existing --with-system-expat option with a
+--with-expat={system,builtin,none} option, which allows to tell Python
+whether we want to use the system expat (already installed), the expat
+builtin the Python sources, or no expat at all (which disables the
+installation of XML modules).
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in |  6 +++++-
+ configure.ac    | 18 +++++++++++++-----
+ setup.py        |  2 +-
+ 3 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index bd537d9..e5d0dd7 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1046,7 +1046,7 @@ LIBSUBDIRS=	site-packages \
+ 		logging bsddb csv importlib wsgiref \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+-		distutils distutils/command $(XMLLIBSUBDIRS) \
++		distutils distutils/command \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+ 		lib-old \
+@@ -1096,6 +1096,10 @@ ifeq (@CURSES@,yes)
+ LIBSUBDIRS += curses
+ endif
+ 
++ifeq (@EXPAT@,yes)
++LIBSUBDIRS += $(XMLLIBSUBDIRS)
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index ab081bc..63ee545 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2470,13 +2470,21 @@ PKG_PROG_PKG_CONFIG
+ AC_SUBST(DISABLED_EXTENSIONS)
+ 
+ # Check for use of the system expat library
+-AC_MSG_CHECKING(for --with-system-expat)
+-AC_ARG_WITH(system_expat,
+-            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
++AC_MSG_CHECKING(for --with-expat)
++AC_ARG_WITH(expat,
++            AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
+             [],
+-            [with_system_expat="no"])
++            [with_expat="builtin"])
+ 
+-AC_MSG_RESULT($with_system_expat)
++AC_MSG_RESULT($with_expat)
++
++if test "$with_expat" != "none"; then
++   EXPAT=yes
++else
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
++   EXPAT=no
++fi
++AC_SUBST(EXPAT)
+ 
+ # Check for use of the system libffi library
+ AC_MSG_CHECKING(for --with-system-ffi)
+diff --git a/setup.py b/setup.py
+index f51ef8c..c68f6b4 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1483,7 +1483,7 @@ class PyBuildExt(build_ext):
+         #
+         # More information on Expat can be found at www.libexpat.org.
+         #
+-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
++        if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
+             expat_inc = []
+             define_macros = []
+             expat_lib = ['expat']
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch b/bsp/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
new file mode 100644
index 00000000..e2c2d98b
--- /dev/null
+++ b/bsp/buildroot/package/python/0023-Add-an-option-to-disable-CJK-codecs.patch
@@ -0,0 +1,30 @@
+From cb848dae763a3f57e31d734d3be6889f660fa0d0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:29:31 +0100
+Subject: [PATCH] Add an option to disable CJK codecs
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 63ee545..6a854ab 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2822,6 +2822,12 @@ if test "$SQLITE3" = "no" ; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+ fi
+ 
++AC_ARG_ENABLE(codecs-cjk,
++	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch b/bsp/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
new file mode 100644
index 00000000..877dfd96
--- /dev/null
+++ b/bsp/buildroot/package/python/0024-Add-an-option-to-disable-NIS.patch
@@ -0,0 +1,33 @@
+From 133776d396b8eaf0243484dc990a53576de9685f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:29:41 +0100
+Subject: [PATCH] Add an option to disable NIS
+
+NIS is not necessarily available in uClibc, so we need an option to
+not compile support for it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6a854ab..4c2cbc1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2828,6 +2828,12 @@ AC_ARG_ENABLE(codecs-cjk,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
+   	  fi])
+ 
++AC_ARG_ENABLE(nis,
++	AS_HELP_STRING([--disable-nis], [disable NIS]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch b/bsp/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
new file mode 100644
index 00000000..a1255e56
--- /dev/null
+++ b/bsp/buildroot/package/python/0025-Add-an-option-to-disable-unicodedata.patch
@@ -0,0 +1,30 @@
+From aa78e3684c0e8f7a5e910e838f9eca2631262048 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:29:52 +0100
+Subject: [PATCH] Add an option to disable unicodedata
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 4c2cbc1..09cb3de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+   	  fi])
+ 
++AC_ARG_ENABLE(unicodedata,
++	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch b/bsp/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
new file mode 100644
index 00000000..e3ccd449
--- /dev/null
+++ b/bsp/buildroot/package/python/0026-Add-an-option-to-disable-bsddb.patch
@@ -0,0 +1,85 @@
+From cfad2bcae8f572a9422ce5a6adb4caa7c0e521ad Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:30:06 +0100
+Subject: [PATCH] Add an option to disable bsddb
+
+bsddb has an external dependency on Berkeley DB. Since we want to be
+able to build Python without it, this patch adds an option to disable
+the build/installation of this Python module.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ Makefile.pre.in |  8 ++++++--
+ configure.ac    | 22 ++++++++++++++++++++++
+ 2 files changed, 28 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index e5d0dd7..2582574 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1043,7 +1043,7 @@ LIBSUBDIRS=	site-packages \
+ 		email email/mime \
+ 		ensurepip ensurepip/_bundled \
+ 		json \
+-		logging bsddb csv importlib wsgiref \
++		logging csv importlib wsgiref \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+ 		distutils distutils/command \
+@@ -1059,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
+ 	test/tracedmodules \
+ 	email/test email/test/data \
+ 	json/tests \
+-	bsddb/test \
+ 	ctypes/test \
+ 	idlelib/idle_test \
+ 	distutils/tests \
+@@ -1100,6 +1099,11 @@ ifeq (@EXPAT@,yes)
+ LIBSUBDIRS += $(XMLLIBSUBDIRS)
+ endif
+ 
++ifeq (@BSDDB@,yes)
++LIBSUBDIRS += bsddb
++TESTSUBDIRS += bsddb/test
++endif
++
+ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index 09cb3de..524614c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2834,6 +2834,28 @@ AC_ARG_ENABLE(nis,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+   	  fi])
+ 
++AC_ARG_ENABLE(dbm,
++	AS_HELP_STRING([--disable-dbm], [disable DBM]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm"
++  	  fi])
++
++AC_ARG_ENABLE(gdbm,
++	AS_HELP_STRING([--disable-gdbm], [disable GDBM]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm"
++  	  fi])
++
++AC_SUBST(BSDDB)
++AC_ARG_ENABLE(bsddb,
++	AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]),
++	[ if test "$enableval" = "no"; then
++    	     BSDDB=no
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb"
++  	  else
++	     BSDDB=yes
++  	  fi], [ BSDDB=yes ])
++
+ AC_ARG_ENABLE(unicodedata,
+ 	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
+ 	[ if test "$enableval" = "no"; then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch b/bsp/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
new file mode 100644
index 00000000..5f2fb87b
--- /dev/null
+++ b/bsp/buildroot/package/python/0027-Add-an-option-to-disable-the-ssl-module.patch
@@ -0,0 +1,30 @@
+From fc16ab40e3e6a5b4deed2fa7c5475fa216ff8d17 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:30:22 +0100
+Subject: [PATCH] Add an option to disable the ssl module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 524614c..cadac82 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2834,6 +2834,12 @@ AC_ARG_ENABLE(nis,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+   	  fi])
+ 
++AC_ARG_ENABLE(ssl,
++	AS_HELP_STRING([--disable-ssl], [disable SSL]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _ssl"
++  	  fi])
++
+ AC_ARG_ENABLE(dbm,
+ 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
+ 	[ if test "$enableval" = "no"; then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch b/bsp/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
new file mode 100644
index 00000000..da914b47
--- /dev/null
+++ b/bsp/buildroot/package/python/0028-Add-an-option-to-disable-the-bz2-module.patch
@@ -0,0 +1,30 @@
+From 6b10788fa040442ace100c3a28cbfff29c9db471 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:30:33 +0100
+Subject: [PATCH] Add an option to disable the bz2 module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 743707a..f1762e9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+   	  fi])
+ 
++AC_ARG_ENABLE(bz2,
++       AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
++       [ if test "$enableval" = "no"; then
++            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
++         fi])
++
+ AC_ARG_ENABLE(dbm,
+ 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
+ 	[ if test "$enableval" = "no"; then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch b/bsp/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
new file mode 100644
index 00000000..b4354e27
--- /dev/null
+++ b/bsp/buildroot/package/python/0029-Add-an-option-to-disable-the-zlib-module.patch
@@ -0,0 +1,30 @@
+From af2c56aa0a5900272cc2d04ce667d4b38e34b596 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:30:45 +0100
+Subject: [PATCH] Add an option to disable the zlib module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index f1762e9..291ba35 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(bz2,
+             DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
+          fi])
+ 
++AC_ARG_ENABLE(zlib,
++       AS_HELP_STRING([--disable-zlib], [disable ZLIB]),
++       [ if test "$enableval" = "no"; then
++            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib"
++         fi])
++
+ AC_ARG_ENABLE(dbm,
+ 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
+ 	[ if test "$enableval" = "no"; then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch b/bsp/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
new file mode 100644
index 00000000..60e64c88
--- /dev/null
+++ b/bsp/buildroot/package/python/0030-Do-not-install-the-idle-editor.patch
@@ -0,0 +1,53 @@
+From 4b7c45c756dccfd3b5ece36fe572042353d1c2f0 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:30:56 +0100
+Subject: [PATCH] Do not install the idle editor
+
+IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's
+highly unlikely to ever be useful in an embedded Linux system
+generated by Buildroot, this patch simply disables the installation of
+idle and the related Python modules. It saves 800 KB-900 KB of
+installed .pyc files.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.pre.in | 2 --
+ setup.py        | 2 +-
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 2582574..3cfc590 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1045,7 +1045,6 @@ LIBSUBDIRS=	site-packages \
+ 		json \
+ 		logging csv importlib wsgiref \
+ 		ctypes ctypes/macholib \
+-		idlelib idlelib/Icons \
+ 		distutils distutils/command \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+@@ -1060,7 +1059,6 @@ TESTSUBDIRS = test test/audiodata test/capath test/data \
+ 	email/test email/test/data \
+ 	json/tests \
+ 	ctypes/test \
+-	idlelib/idle_test \
+ 	distutils/tests \
+ 	unittest/test
+ 
+diff --git a/setup.py b/setup.py
+index c68f6b4..8045a9b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2234,7 +2234,7 @@ def main():
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
++    scripts = ['Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc' ]
+     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch b/bsp/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
new file mode 100644
index 00000000..c2aea5ed
--- /dev/null
+++ b/bsp/buildroot/package/python/0031-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -0,0 +1,30 @@
+From 6af0f179d3db956146bbabac8748675e3abc1f78 Mon Sep 17 00:00:00 2001
+From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+Date: Tue, 7 Mar 2017 22:31:22 +0100
+Subject: [PATCH] Add an option to disable the ossaudiodev module
+
+Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 291ba35..8dc573e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2898,6 +2898,12 @@ if test "$CURSES" = "no"; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
+ fi
+ 
++AC_ARG_ENABLE(ossaudiodev,
++       AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]),
++       [ if test "$enableval" = "no"; then
++            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev"
++         fi])
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch b/bsp/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
new file mode 100644
index 00000000..bb3ccfa7
--- /dev/null
+++ b/bsp/buildroot/package/python/0032-Add-option-to-disable-the-hashlib-module.patch
@@ -0,0 +1,30 @@
+From f11dc326ae216911a67bd563b619f39522c14bf2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:33:02 +0100
+Subject: [PATCH] Add option to disable the hashlib module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 8dc573e..854724d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2840,6 +2840,12 @@ AC_ARG_ENABLE(ssl,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
+   	  fi])
+ 
++AC_ARG_ENABLE(hashlib,
++	AS_HELP_STRING([--disable-hashlib], [disable hashlib]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
++	  fi])
++
+ AC_ARG_ENABLE(bz2,
+        AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
+        [ if test "$enableval" = "no"; then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch b/bsp/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
new file mode 100644
index 00000000..ade729fb
--- /dev/null
+++ b/bsp/buildroot/package/python/0033-Add-an-option-to-disable-readline-module.patch
@@ -0,0 +1,30 @@
+From 6b461f698bd33b3493207baf79f4ee02286be8e8 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 22:33:55 +0100
+Subject: [PATCH] Add an option to disable readline module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 854724d..0a06497 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2846,6 +2846,12 @@ AC_ARG_ENABLE(hashlib,
+ 	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _hashlib"
+ 	  fi])
+ 
++AC_ARG_ENABLE(readline,
++	AS_HELP_STRING([--disable-readline], [disable readline]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
++	  fi])
++
+ AC_ARG_ENABLE(bz2,
+        AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
+        [ if test "$enableval" = "no"; then
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch b/bsp/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
new file mode 100644
index 00000000..8fe722bc
--- /dev/null
+++ b/bsp/buildroot/package/python/0034-Override-system-locale-and-set-to-default-when-addin.patch
@@ -0,0 +1,37 @@
+From d2bfa8805206db8c57c182094396d20a9d94bd8f Mon Sep 17 00:00:00 2001
+From: Samuel Cabrero <samuelcabrero@gmail.com>
+Date: Sat, 1 Apr 2017 09:31:52 +0200
+Subject: [PATCH] Override system locale and set to default when adding gcc
+ paths
+
+Forces the use of the default locale in the function
+add_gcc_paths, which is called when cross compiling to add the
+include and library paths. This is necessary because otherwise
+the gcc output is localized and the output parsing fails, which
+results in no paths added and detect_modules not able to find
+any system library (eg. libz, libssl, etc.)
+
+[Thomas: patch taken from https://bugs.python.org/issue23767.]
+
+Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 8045a9b..c14f4ab 100644
+--- a/setup.py
++++ b/setup.py
+@@ -430,7 +430,7 @@ class PyBuildExt(build_ext):
+         tmpfile = os.path.join(self.build_temp, 'gccpaths')
+         if not os.path.exists(self.build_temp):
+             os.makedirs(self.build_temp)
+-        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
++        ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
+         is_gcc = False
+         in_incdirs = False
+         inc_dirs = []
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/python/004-sysconfigdata-install-location.patch b/bsp/buildroot/package/python/004-sysconfigdata-install-location.patch
deleted file mode 100644
index 2998364f..00000000
--- a/bsp/buildroot/package/python/004-sysconfigdata-install-location.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Change the install location of _sysconfigdata.py
-
-The _sysconfigdata.py module contains definitions that are needed when
-building Python modules. In cross-compilation mode, when building
-Python extensions for the target, we need to use the _sysconfigdata.py
-of the target Python while executing the host Python.
-
-However until now, the _sysconfigdata.py module was installed in
-build/lib.<arch>-<version> directory, together with a number of
-architecture-specific shared objects, which cannot be used with the
-host Python.
-
-To solve this problem, this patch moves _sysconfigdata.py to a
-separate location, build/sysconfigdata.<arch>-<version>/, and only
-this directory gets added to the PYTHONPATH of the host Python
-interpreter when building Python modules for the target.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -462,6 +462,9 @@
- 		rm -f ./pybuilddir.txt ; \
- 		exit 1 ; \
- 	fi
-+	echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
-+	mkdir -p `cat pysysconfigdatadir.txt`
-+	cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
- 
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -1002,7 +1005,7 @@
- 		else	true; \
- 		fi; \
- 	done
--	@for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
-+	@for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \
- 	do \
- 		if test -x $$i; then \
- 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1012,6 +1015,11 @@
- 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
- 		fi; \
- 	done
-+	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
-+		$(DESTDIR)$(LIBDEST)
-+	mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata
-+	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
-+		$(DESTDIR)$(LIBDEST)/sysconfigdata
- 	@for d in $(LIBSUBDIRS); \
- 	do \
- 		a=$(srcdir)/Lib/$$d; \
-@@ -1337,7 +1345,7 @@
- 		Modules/Setup Modules/Setup.local Modules/Setup.config \
- 		Modules/ld_so_aix Modules/python.exp Misc/python.pc
- 	-rm -f python*-gdb.py
--	-rm -f pybuilddir.txt
-+	-rm -f pybuilddir.txt pysysconfigdatadir.txt
- 	# Issue #28258: set LC_ALL to avoid issues with Estonian locale.
- 	# Expansion is performed here by shell (spawned by make) itself before
- 	# arguments are passed to find. So LC_ALL=C must be set as a separate
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,7 @@
- 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
- 	fi
-         AC_MSG_RESULT($interp)
--	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
-+	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
-     fi
- elif test "$cross_compiling" = maybe; then
-     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
diff --git a/bsp/buildroot/package/python/005-pyc-pyo-conditional.patch b/bsp/buildroot/package/python/005-pyc-pyo-conditional.patch
deleted file mode 100644
index 1b677dfb..00000000
--- a/bsp/buildroot/package/python/005-pyc-pyo-conditional.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1050,24 +1050,32 @@
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
-+ifeq (@PYC_BUILD@,yes)
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
-+endif
-+ifeq (@PYO_BUILD@,yes)
- 	PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
- 		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
- 		$(DESTDIR)$(LIBDEST)
-+endif
-+ifeq (@PYC_BUILD@,yes)
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-+endif
-+ifeq (@PYO_BUILD@,yes)
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-+endif
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -739,6 +739,17 @@
-     ;;
- esac
- 
-+AC_SUBST(PYC_BUILD)
-+
-+AC_ARG_ENABLE(pyc-build,
-+	AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]),
-+	[ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ])
-+
-+AC_SUBST(PYO_BUILD)
-+
-+AC_ARG_ENABLE(pyo-build,
-+	AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]),
-+	[ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ])
- 
- AC_SUBST(LIBRARY)
- AC_MSG_CHECKING(LIBRARY)
diff --git a/bsp/buildroot/package/python/006-cross-compile-getaddrinfo.patch b/bsp/buildroot/package/python/006-cross-compile-getaddrinfo.patch
deleted file mode 100644
index dd44ec15..00000000
--- a/bsp/buildroot/package/python/006-cross-compile-getaddrinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -3353,7 +3353,7 @@
- 
- AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
- 
--if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes
-+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
- then
- 	if test $ipv6 = yes
- 	then
diff --git a/bsp/buildroot/package/python/007-disable-extensions.patch b/bsp/buildroot/package/python/007-disable-extensions.patch
deleted file mode 100644
index 9365cb1f..00000000
--- a/bsp/buildroot/package/python/007-disable-extensions.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -156,6 +156,8 @@
- # configure script arguments
- CONFIG_ARGS=	@CONFIG_ARGS@
- 
-+# disabled extensions
-+DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
- 
- # Subdirectories with code
- SRCDIRS= 	@SRCDIRS@
-@@ -477,6 +479,7 @@
- 	esac; \
- 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
-+		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
- # Build static library
-@@ -1191,7 +1194,8 @@
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
--	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-+	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
-+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
- 	   	--prefix=$(prefix) \
- 		--install-scripts=$(BINDIR) \
- 		--install-platlib=$(DESTSHARED) \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2290,6 +2290,8 @@
- 
- PKG_PROG_PKG_CONFIG
- 
-+AC_SUBST(DISABLED_EXTENSIONS)
-+
- # Check for use of the system expat library
- AC_MSG_CHECKING(for --with-system-expat)
- AC_ARG_WITH(system_expat,
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -33,7 +33,10 @@
- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+try:
-+    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
-+except KeyError:
-+    disabled_module_list = list()
- 
- def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (at the front) if
diff --git a/bsp/buildroot/package/python/008-distutils-use-python-sysroot.patch b/bsp/buildroot/package/python/008-distutils-use-python-sysroot.patch
deleted file mode 100644
index 7cd74876..00000000
--- a/bsp/buildroot/package/python/008-distutils-use-python-sysroot.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Adjust library/header paths for cross-compilation
-
-When cross-compiling third-party extensions, the get_python_inc() or
-get_python_lib() can be called, to return the path to headers or
-libraries. However, they use the sys.prefix of the host Python, which
-returns incorrect paths when cross-compiling (paths pointing to host
-headers and libraries).
-
-In order to fix this, we introduce the _python_sysroot, _python_prefix
-and _python_exec_prefix variables, that allow to override these
-values, and get correct header/library paths when cross-compiling
-third-party Python modules.
-
-The _python_sysroot variable is also used to prefix the LIBDIR value
-taken from the sysconfigdata module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Lib/distutils/sysconfig.py
-===================================================================
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -19,8 +19,13 @@
- from distutils.errors import DistutilsPlatformError
- 
- # These are needed in a couple of spots, so just compute them once.
--PREFIX = os.path.normpath(sys.prefix)
--EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-+if "_python_sysroot" in os.environ:
-+    _sysroot=os.environ.get('_python_sysroot')
-+    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
-+    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
-+else:
-+    PREFIX = os.path.normpath(sys.prefix)
-+    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
- 
- # Path to the base directory of the project. On Windows the binary may
- # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
-Index: b/Lib/distutils/command/build_ext.py
-===================================================================
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -237,7 +237,10 @@
-         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-             if not sysconfig.python_build:
-                 # building third party extensions
--                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
-+                libdir = sysconfig.get_config_var('LIBDIR')
-+                if "_python_sysroot" in os.environ:
-+                    libdir = os.environ.get("_python_sysroot") + libdir
-+                self.library_dirs.append(libdir)
-             else:
-                 # building python standard extensions
-                 self.library_dirs.append('.')
diff --git a/bsp/buildroot/package/python/009-no-termcap-host-path.patch b/bsp/buildroot/package/python/009-no-termcap-host-path.patch
deleted file mode 100644
index 781e1795..00000000
--- a/bsp/buildroot/package/python/009-no-termcap-host-path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Don't look in /usr/lib/termcap for libraries
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -764,12 +764,9 @@
-                 pass # Issue 7384: Already linked against curses or tinfo.
-             elif curses_library:
-                 readline_libs.append(curses_library)
--            elif self.compiler.find_library_file(lib_dirs +
--                                                     ['/usr/lib/termcap'],
--                                                     'termcap'):
-+            elif self.compiler.find_library_file(lib_dirs, 'termcap'):
-                 readline_libs.append('termcap')
-             exts.append( Extension('readline', ['readline.c'],
--                                   library_dirs=['/usr/lib/termcap'],
-                                    extra_link_args=readline_extra_link_args,
-                                    libraries=readline_libs) )
-         else:
diff --git a/bsp/buildroot/package/python/010-fix-python-config.patch b/bsp/buildroot/package/python/010-fix-python-config.patch
deleted file mode 100644
index b40339b4..00000000
--- a/bsp/buildroot/package/python/010-fix-python-config.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-Add a backport of http://bugs.python.org/issue16235 so we can use
-python-config for cross builds.
-This basically replaces the python version of python-config with a pure-shell
-version that's already preprocessed when installed and doesn't depend
-on the sysconfig import that usually leads to bad data/results.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -885,6 +885,7 @@
- 
- # Other platforms follow
- if test $enable_shared = "yes"; then
-+  PY_ENABLE_SHARED=1
-   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])
-   case $ac_sys_system in
-     BeOS*)
-@@ -945,6 +946,7 @@
- 
-   esac
- else # shared is disabled
-+  PY_ENABLE_SHARED=0
-   case $ac_sys_system in
-     CYGWIN*)
-           BLDLIBRARY='$(LIBRARY)'
-@@ -1921,6 +1923,9 @@
- AC_SUBST(BLDSHARED)
- AC_SUBST(CCSHARED)
- AC_SUBST(LINKFORSHARED)
-+AC_SUBST(PY_ENABLE_SHARED)
-+LIBPL="${prefix}/lib/python${VERSION}/config"
-+AC_SUBST(LIBPL)
- # SO is the extension of shared libraries `(including the dot!)
- # -- usually .so, .sl on HP-UX, .dll on Cygwin
- AC_MSG_CHECKING(SO)
-@@ -4588,7 +4593,7 @@
- AC_SUBST(ENSUREPIP)
- 
- # generate output files
--AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc)
-+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
- AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
- AC_OUTPUT
- 
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -166,7 +166,7 @@
- SUBDIRSTOO=	Include Lib Misc Demo
- 
- # Files and directories to be distributed
--CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in
-+CONFIGFILES=	configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh
- DISTFILES=	README ChangeLog $(CONFIGFILES)
- DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy
- DIST=		$(DISTFILES) $(DISTDIRS)
-@@ -410,7 +410,7 @@
- 
- # Default target
- all:		@DEF_MAKE_ALL_RULE@
--build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
-+build_all:	$(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config
- 
- # Compile a binary with gcc profile guided optimization.
- profile-opt:
-@@ -1101,10 +1101,12 @@
- 	fi; \
- 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
- 
--python-config: $(srcdir)/Misc/python-config.in
-+python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
- 	# Substitution happens here, as the completely-expanded BINDIR
- 	# is not available in configure
--	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config
-+	sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py
-+	# Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR}
-+	sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config
- 
- # Install the include files
- INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)
-@@ -1163,7 +1165,7 @@
- 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup
- 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
- 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
--	rm python-config
-+	$(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
- 	@if [ -s Modules/python.exp -a \
- 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
- 		echo; echo "Installing support files for building shared extension modules on AIX:"; \
-@@ -1345,6 +1347,7 @@
- 		config.cache config.log pyconfig.h Modules/config.c
- 	-rm -rf build platform
- 	-rm -rf $(PYTHONFRAMEWORKDIR)
-+	-rm -f python-config.py python-config
- 
- # Make things extra clean, before making a distribution:
- # remove all generated files, even Makefile[.pre]
-Index: b/Misc/python-config.sh.in
-===================================================================
---- /dev/null
-+++ b/Misc/python-config.sh.in
-@@ -0,0 +1,102 @@
-+#!/bin/sh
-+
-+exit_with_usage ()
-+{
-+	echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir"
-+	exit $1
-+}
-+
-+if [ "$1" = "" ] ; then
-+	exit_with_usage 1
-+fi
-+
-+# Returns the actual prefix where this script was installed to.
-+installed_prefix ()
-+{
-+	RESULT=$(dirname $(cd $(dirname "$1") && pwd -P))
-+	if which readlink >/dev/null 2>&1 ; then
-+	RESULT=$(readlink -f "$RESULT")
-+	fi
-+	echo $RESULT
-+}
-+
-+prefix_build="@prefix@"
-+prefix_real=$(installed_prefix "$0")
-+
-+# Use sed to fix paths from their built to locations to their installed to locations.
-+prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
-+exec_prefix_build="@exec_prefix@"
-+exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
-+includedir=$(echo "@includedir@")
-+libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
-+CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
-+VERSION="@VERSION@"
-+LIBM="@LIBM@"
-+LIBC="@LIBC@"
-+SYSLIBS="$LIBM $LIBC"
-+LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}"
-+BASECFLAGS="@BASECFLAGS@"
-+LDLIBRARY="@LDLIBRARY@"
-+LINKFORSHARED="@LINKFORSHARED@"
-+OPT="@OPT@"
-+PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
-+LDVERSION="@LDVERSION@"
-+LIBDEST=${prefix}/lib/python${VERSION}
-+LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
-+SO="@SO@"
-+PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
-+INCDIR="-I$includedir/python${VERSION}"
-+PLATINCDIR="-I$includedir/python${VERSION}"
-+
-+# Scan for --help or unknown argument.
-+for ARG in $*
-+do
-+	case $ARG in
-+	--help)
-+		exit_with_usage 0
-+	;;
-+	--prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir)
-+	;;
-+	*)
-+		exit_with_usage 1
-+	;;
-+esac
-+done
-+
-+for ARG in "$@"
-+do
-+	case "$ARG" in
-+	--prefix)
-+		echo "$prefix"
-+	;;
-+	--exec-prefix)
-+		echo "$exec_prefix"
-+	;;
-+	--includes)
-+		 echo "$INCDIR $PLATINCDIR"
-+	;;
-+	--cflags)
-+		echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT"
-+	;;
-+	--libs)
-+		echo "$LIBS"
-+	;;
-+	--ldflags)
-+		LINKFORSHAREDUSED=
-+		if [ -z "$PYTHONFRAMEWORK" ] ; then
-+			LINKFORSHAREDUSED=$LINKFORSHARED
-+		fi
-+		LIBPLUSED=
-+		if [ "$PY_ENABLE_SHARED" = "0" ] ; then
-+			LIBPLUSED="-L$LIBPL"
-+		fi
-+		echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED"
-+	;;
-+	--extension-suffix)
-+		echo "$SO"
-+	;;
-+	--configdir)
-+		echo "$LIBPL"
-+	;;
-+esac
-+done
diff --git a/bsp/buildroot/package/python/011-remove-python-symlink.patch b/bsp/buildroot/package/python/011-remove-python-symlink.patch
deleted file mode 100644
index e021d832..00000000
--- a/bsp/buildroot/package/python/011-remove-python-symlink.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Remove the python symlink install rules.
-
-The python symlink installation will be handled by Buildroot itself, because
-Buildroot needs to control to what python interpreter (python2 or python3) the
-python symlink points to.
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-(rebased against version 2.7.12)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -974,17 +974,10 @@
- 		echo "Creating directory $(LIBPC)"; \
- 		$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
- 	fi
--	-if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \
--	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
--	else true; \
--	fi
--	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON))
- 	-rm -f $(DESTDIR)$(BINDIR)/python2$(EXE)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE))
- 	-rm -f $(DESTDIR)$(BINDIR)/python2-config
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config)
--	-rm -f $(DESTDIR)$(BINDIR)/python-config
--	(cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config)
- 	-test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC)
- 	-rm -f $(DESTDIR)$(LIBPC)/python2.pc
- 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc)
diff --git a/bsp/buildroot/package/python/013-dont-add-multiarch-path.patch b/bsp/buildroot/package/python/013-dont-add-multiarch-path.patch
deleted file mode 100644
index 94fcb0f7..00000000
--- a/bsp/buildroot/package/python/013-dont-add-multiarch-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Don't add multiarch paths
-
-The add_multiarch_paths() function leads, in certain build
-environments, to the addition of host header paths to the CFLAGS,
-which is not appropriate for cross-compilation. This patch fixes that
-by simply removing the call to add_multiarch_paths() when we're
-cross-compiling.
-
-Investigation done by David <buildroot-2014@inbox.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -445,9 +445,9 @@
-         if not cross_compiling:
-             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+            self.add_multiarch_paths()
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
diff --git a/bsp/buildroot/package/python/014-abort-on-failed-modules.patch b/bsp/buildroot/package/python/014-abort-on-failed-modules.patch
deleted file mode 100644
index 4bceeb62..00000000
--- a/bsp/buildroot/package/python/014-abort-on-failed-modules.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Abort on failed module build
-
-When building a Python module fails, the setup.py script currently
-doesn't exit with an error, and simply continues. This is not a really
-nice behavior, so this patch changes setup.py to abort with an error,
-so that the build issue is clearly noticeable.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -283,6 +283,7 @@
-             print "Failed to build these modules:"
-             print_three_column(failed)
-             print
-+            sys.exit(1)
- 
-     def build_extension(self, ext):
- 
diff --git a/bsp/buildroot/package/python/015-fix-sqlite-without-threads.patch b/bsp/buildroot/package/python/015-fix-sqlite-without-threads.patch
deleted file mode 100644
index f51c37b3..00000000
--- a/bsp/buildroot/package/python/015-fix-sqlite-without-threads.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-sqlite3: fix build when threads are not used/available
-
-When threads are not used/available, a function in the sqlite3 extension
-ends up with a label at the end:
-
-    void _pysqlite_final_callback(sqlite3_context* context)
-    {
-        PyObject* function_result;
-        PyObject** aggregate_instance;
-        int ok;
-
-    #ifdef WITH_THREAD
-        PyGILState_STATE threadstate;
-
-        threadstate = PyGILState_Ensure();
-    #endif
-
-        aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
-        if (!*aggregate_instance) {
-            goto error;
-        }
-
-        [......]
-
-    error:
-    #ifdef WITH_THREAD
-        PyGILState_Release(threadstate);
-    #endif
-    }
-
-This is not valid, and gcc complains.
-
-Fix that by adding a dummy statement after the label, so that the label
-is never the last statement of the function.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-
-Index: b/Modules/_sqlite/connection.c
-===================================================================
---- a/Modules/_sqlite/connection.c
-+++ b/Modules/_sqlite/connection.c
-@@ -786,6 +786,7 @@
- #ifdef WITH_THREAD
-     PyGILState_Release(threadstate);
- #endif
-+    ;   /* Make gcc happy: a label can't be at the end of a function */
- }
- 
- static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self)
diff --git a/bsp/buildroot/package/python/016-serial-ioctl-workaround.patch b/bsp/buildroot/package/python/016-serial-ioctl-workaround.patch
deleted file mode 100644
index 80ed65e3..00000000
--- a/bsp/buildroot/package/python/016-serial-ioctl-workaround.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Serial ioctl() workaround
-
-The ioctls.h of some architectures (notably xtensa) references structs from
-linux/serial.h. Make sure to include this header as well.
-
-Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
-but isn't actually referenced in modern kernels.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Index: b/Modules/termios.c
-===================================================================
---- a/Modules/termios.c
-+++ b/Modules/termios.c
-@@ -16,7 +16,9 @@
-  * so this needs to be included first on that platform. */
- #include <termio.h>
- #endif
-+#include <linux/serial.h>
- #include <sys/ioctl.h>
-+#undef TIOCTTYGSTRUCT
- 
- /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
-  * MDTR, MRI, and MRTS (appearantly used internally by some things
diff --git a/bsp/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch b/bsp/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch
deleted file mode 100644
index da4dc36d..00000000
--- a/bsp/buildroot/package/python/017-distutils-scripts-dont-adjust-shebang.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Do not adjust the shebang of Python scripts for cross-compilation
-
-The copy_scripts() method in distutils copies the scripts listed in
-the setup file and adjusts the first line to refer to the current
-Python interpreter. When cross-compiling, this means that the adjusted
-shebang refers to the host Python interpreter.
-
-This patch modifies copy_scripts() to preserve the shebang when
-cross-compilation is detected.
-
-Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
-
-Index: b/Lib/distutils/command/build_scripts.py
-===================================================================
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -89,7 +89,7 @@
-                     adjust = 1
-                     post_interp = match.group(1) or ''
- 
--            if adjust:
-+            if adjust and not '_python_sysroot' in os.environ:
-                 log.info("copying and adjusting %s -> %s", script,
-                          self.build_dir)
-                 if not self.dry_run:
diff --git a/bsp/buildroot/package/python/018-fix-add-gcc-paths-logic.patch b/bsp/buildroot/package/python/018-fix-add-gcc-paths-logic.patch
deleted file mode 100644
index af6efcc3..00000000
--- a/bsp/buildroot/package/python/018-fix-add-gcc-paths-logic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Override system locale and set to default when adding gcc paths
-
-Forces the use of the default locale in the function
-add_gcc_paths, which is called when cross compiling to add the
-include and library paths. This is necessary because otherwise
-the gcc output is localized and the output parsing fails, which
-results in no paths added and detect_modules not able to find
-any system library (eg. libz, libssl, etc.)
-
-[Thomas: patch taken from https://bugs.python.org/issue23767.]
-
-Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -414,7 +414,7 @@
-         tmpfile = os.path.join(self.build_temp, 'gccpaths')
-         if not os.path.exists(self.build_temp):
-             os.makedirs(self.build_temp)
--        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-+        ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-         is_gcc = False
-         in_incdirs = False
-         inc_dirs = []
diff --git a/bsp/buildroot/package/python/100-optional-test-modules.patch b/bsp/buildroot/package/python/100-optional-test-modules.patch
deleted file mode 100644
index 3de6f266..00000000
--- a/bsp/buildroot/package/python/100-optional-test-modules.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Add an option to disable installation of test modules
-
-The Python standard distribution comes with many test modules, that
-are not necessarly useful on embedded targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |   40 +++++++++++++++++++++++++++-------------
- configure.in    |    6 ++++++
- 2 files changed, 33 insertions(+), 13 deletions(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -960,27 +960,43 @@
- 	plat-mac/lib-scriptpackages/SystemEvents \
- 	plat-mac/lib-scriptpackages/Terminal
- PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS=	lib-tk lib-tk/test lib-tk/test/test_tkinter \
--		lib-tk/test/test_ttk site-packages test test/audiodata test/capath \
--		test/data test/cjkencodings test/decimaltestdata test/xmltestdata \
--		test/imghdrdata \
--		test/subprocessdata \
--		test/tracedmodules \
-+LIBSUBDIRS=	lib-tk site-packages \
- 		encodings compiler hotshot \
--		email email/mime email/test email/test/data \
-+		email email/mime \
- 		ensurepip ensurepip/_bundled \
--		json json/tests \
--		sqlite3 sqlite3/test \
--		logging bsddb bsddb/test csv importlib wsgiref \
--		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
--		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
--		ctypes ctypes/test ctypes/macholib \
--		idlelib idlelib/Icons idlelib/idle_test \
--		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
-+		json \
-+		sqlite3  \
-+		logging bsddb csv importlib wsgiref \
-+		lib2to3 lib2to3/fixes lib2to3/pgen2 \
-+		ctypes ctypes/macholib \
-+		idlelib idlelib/Icons \
-+		distutils distutils/command $(XMLLIBSUBDIRS) \
- 		multiprocessing multiprocessing/dummy \
--		unittest unittest/test \
-+		unittest \
- 		lib-old \
- 		curses pydoc_data $(MACHDEPS)
-+
-+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
-+	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-+	test/cjkencodings test/decimaltestdata test/xmltestdata \
-+	test/imghdrdata \
-+	test/subprocessdata \
-+	test/tracedmodules \
-+	email/test email/test/data \
-+	json/tests \
-+	sqlite3/test \
-+	bsddb/test \
-+	lib2to3/tests \
-+ 	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
-+	ctypes/test \
-+	idlelib/idle_test \
-+	distutils/tests \
-+	unittest/test
-+
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += $(TESTSUBDIRS)
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2634,6 +2634,12 @@
- fi
- 
- 
-+AC_SUBST(TEST_MODULES)
-+
-+AC_ARG_ENABLE(test-modules,
-+	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
-+	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
diff --git a/bsp/buildroot/package/python/101-optional-pydoc.patch b/bsp/buildroot/package/python/101-optional-pydoc.patch
deleted file mode 100644
index 143e11ab..00000000
--- a/bsp/buildroot/package/python/101-optional-pydoc.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Add an option to disable pydoc
-
-It removes 0.5 MB of data from the target plus the pydoc script
-itself.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |    6 +++++-
- configure.in    |    5 +++++
- setup.py        |   10 +++++++---
- 3 files changed, 17 insertions(+), 4 deletions(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -974,7 +974,7 @@
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		lib-old \
--		curses pydoc_data $(MACHDEPS)
-+		curses $(MACHDEPS)
- 
- TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
- 	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-@@ -997,6 +997,10 @@
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
- 
-+ifeq (@PYDOC@,yes)
-+LIBSUBDIRS += pydoc_data
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2633,6 +2633,11 @@
-       AC_CHECK_FUNCS(pthread_atfork)
- fi
- 
-+AC_SUBST(PYDOC)
-+
-+AC_ARG_ENABLE(pydoc,
-+	AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
-+	[ PYDOC="${enableval}" ], [ PYDOC=yes ])
- 
- AC_SUBST(TEST_MODULES)
- 
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -2211,6 +2211,12 @@
-     # turn off warnings when deprecated modules are imported
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
-+
-+    scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
-+               'Lib/smtpd.py']
-+    if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/pydoc' ]
-+
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
-           version = sys.version.split()[0],
-@@ -2231,9 +2237,7 @@
-           ext_modules=[Extension('_struct', ['_struct.c'])],
- 
-           # Scripts to install
--          scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
--                     'Tools/scripts/2to3',
--                     'Lib/smtpd.py']
-+          scripts = scripts,
-         )
- 
- # --install-platlib
diff --git a/bsp/buildroot/package/python/102-optional-2to3.patch b/bsp/buildroot/package/python/102-optional-2to3.patch
deleted file mode 100644
index 100c417a..00000000
--- a/bsp/buildroot/package/python/102-optional-2to3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Add an option to disable lib2to3
-
-lib2to3 is a library to convert Python 2.x code to Python 3.x. As
-such, it is probably not very useful on embedded system targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |   24 +++++++++++++++++-------
- configure.in    |    6 ++++++
- setup.py        |    5 +++--
- 3 files changed, 26 insertions(+), 9 deletions(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -967,7 +967,6 @@
- 		json \
- 		sqlite3  \
- 		logging bsddb csv importlib wsgiref \
--		lib2to3 lib2to3/fixes lib2to3/pgen2 \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
- 		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -986,8 +985,6 @@
- 	json/tests \
- 	sqlite3/test \
- 	bsddb/test \
--	lib2to3/tests \
-- 	lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
- 	ctypes/test \
- 	idlelib/idle_test \
- 	distutils/tests \
-@@ -1001,6 +998,14 @@
- LIBSUBDIRS += pydoc_data
- endif
- 
-+ifeq (@LIB2TO3@,yes)
-+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
-+TESTSUBDIRS += 	lib2to3/tests				\
-+		lib2to3/tests/data			\
-+		lib2to3/tests/data/fixers		\
-+		lib2to3/tests/data/fixers/myfixes
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2645,6 +2645,12 @@
- 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
- 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
- 
-+AC_SUBST(LIB2TO3)
-+
-+AC_ARG_ENABLE(lib2to3,
-+	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
-+	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -2212,10 +2212,11 @@
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
- 
--    scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3',
--               'Lib/smtpd.py']
-+    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
-     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/pydoc' ]
-+    if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/2to3' ]
- 
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
diff --git a/bsp/buildroot/package/python/103-optional-sqlite.patch b/bsp/buildroot/package/python/103-optional-sqlite.patch
deleted file mode 100644
index 3a480119..00000000
--- a/bsp/buildroot/package/python/103-optional-sqlite.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Add option to disable the sqlite3 module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |   24 +++++++++++++++++-------
- configure.in |    9 +++++++++
- 2 file changed, 9 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2633,6 +2633,15 @@
-       AC_CHECK_FUNCS(pthread_atfork)
- fi
- 
-+AC_SUBST(SQLITE3)
-+AC_ARG_ENABLE(sqlite3,
-+	AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
-+	[ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
-+
-+if test "$SQLITE3" = "no" ; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -965,7 +965,6 @@
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
- 		json \
--		sqlite3  \
- 		logging bsddb csv importlib wsgiref \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
-@@ -983,7 +982,6 @@
- 	test/tracedmodules \
- 	email/test email/test/data \
- 	json/tests \
--	sqlite3/test \
- 	bsddb/test \
- 	ctypes/test \
- 	idlelib/idle_test \
-@@ -1006,6 +1004,11 @@
- 		lib2to3/tests/data/fixers/myfixes
- endif
- 
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+TESTSUBDIRS += sqlite3/test
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
diff --git a/bsp/buildroot/package/python/104-optional-tk.patch b/bsp/buildroot/package/python/104-optional-tk.patch
deleted file mode 100644
index 18024d3a..00000000
--- a/bsp/buildroot/package/python/104-optional-tk.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Add an option to disable the tk module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |   14 ++++++++++----
- configure.in    |    9 +++++++++
- 2 files changed, 19 insertions(+), 4 deletions(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -960,7 +960,7 @@
- 	plat-mac/lib-scriptpackages/SystemEvents \
- 	plat-mac/lib-scriptpackages/Terminal
- PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
--LIBSUBDIRS=	lib-tk site-packages \
-+LIBSUBDIRS=	site-packages \
- 		encodings compiler hotshot \
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
-@@ -974,8 +974,7 @@
- 		lib-old \
- 		curses $(MACHDEPS)
- 
--TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \
--	lib-tk/test/test_ttk test test/audiodata test/capath test/data \
-+TESTSUBDIRS = test test/audiodata test/capath test/data \
- 	test/cjkencodings test/decimaltestdata test/xmltestdata \
- 	test/imghdrdata \
- 	test/subprocessdata \
-@@ -1009,6 +1008,12 @@
- TESTSUBDIRS += sqlite3/test
- endif
- 
-+ifeq (@TK@,yes)
-+LIBSUBDIRS += lib-tk
-+TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter	\
-+	      lib-tk/test/test_ttk
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2642,6 +2642,15 @@
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_SUBST(TK)
-+AC_ARG_ENABLE(tk,
-+	AS_HELP_STRING([--disable-tk], [disable tk]),
-+	[ TK="${enableval}" ], [ TK=yes ])
-+
-+if test "$TK" = "no"; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
diff --git a/bsp/buildroot/package/python/105-optional-curses.patch b/bsp/buildroot/package/python/105-optional-curses.patch
deleted file mode 100644
index 9e1ac5ad..00000000
--- a/bsp/buildroot/package/python/105-optional-curses.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Add an option to disable the curses module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |    6 +++++-
- configure.in    |    9 +++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -972,7 +972,7 @@
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		lib-old \
--		curses $(MACHDEPS)
-+		$(MACHDEPS)
- 
- TESTSUBDIRS = test test/audiodata test/capath test/data \
- 	test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1014,6 +1014,10 @@
- 	      lib-tk/test/test_ttk
- endif
- 
-+ifeq (@CURSES@,yes)
-+LIBSUBDIRS += curses
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2651,6 +2651,15 @@
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
- fi
- 
-+AC_SUBST(CURSES)
-+AC_ARG_ENABLE(curses,
-+	AS_HELP_STRING([--disable-curses], [disable curses]),
-+	[ CURSES="${enableval}" ], [ CURSES=yes ])
-+
-+if test "$CURSES" = "no"; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
diff --git a/bsp/buildroot/package/python/106-optional-expat.patch b/bsp/buildroot/package/python/106-optional-expat.patch
deleted file mode 100644
index 6ebaf166..00000000
--- a/bsp/buildroot/package/python/106-optional-expat.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Add an option to disable expat
-
-This patch replaces the existing --with-system-expat option with a
---with-expat={system,builtin,none} option, which allows to tell Python
-whether we want to use the system expat (already installed), the expat
-builtin the Python sources, or no expat at all (which disables the
-installation of XML modules).
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |    6 +++++-
- configure.in    |   18 +++++++++++++-----
- setup.py        |    2 +-
- 3 files changed, 19 insertions(+), 7 deletions(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -968,7 +968,7 @@
- 		logging bsddb csv importlib wsgiref \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
--		distutils distutils/command $(XMLLIBSUBDIRS) \
-+		distutils distutils/command \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		lib-old \
-@@ -1018,6 +1018,10 @@
- LIBSUBDIRS += curses
- endif
- 
-+ifeq (@EXPAT@,yes)
-+LIBSUBDIRS += $(XMLLIBSUBDIRS)
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2298,13 +2298,21 @@
- AC_SUBST(DISABLED_EXTENSIONS)
- 
- # Check for use of the system expat library
--AC_MSG_CHECKING(for --with-system-expat)
--AC_ARG_WITH(system_expat,
--            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
-+AC_MSG_CHECKING(for --with-expat)
-+AC_ARG_WITH(expat,
-+            AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
-             [],
--            [with_system_expat="no"])
-+            [with_expat="builtin"])
- 
--AC_MSG_RESULT($with_system_expat)
-+AC_MSG_RESULT($with_expat)
-+
-+if test "$with_expat" != "none"; then
-+   EXPAT=yes
-+else
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
-+   EXPAT=no
-+fi
-+AC_SUBST(EXPAT)
- 
- # Check for use of the system libffi library
- AC_MSG_CHECKING(for --with-system-ffi)
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -1463,7 +1463,7 @@
-         #
-         # More information on Expat can be found at www.libexpat.org.
-         #
--        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
-             expat_inc = []
-             define_macros = []
-             expat_lib = ['expat']
diff --git a/bsp/buildroot/package/python/107-optional-codecs-cjk.patch b/bsp/buildroot/package/python/107-optional-codecs-cjk.patch
deleted file mode 100644
index 22a2fed8..00000000
--- a/bsp/buildroot/package/python/107-optional-codecs-cjk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add an option to disable CJK codecs
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2650,6 +2650,12 @@
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_ARG_ENABLE(codecs-cjk,
-+	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/bsp/buildroot/package/python/108-optional-nis.patch b/bsp/buildroot/package/python/108-optional-nis.patch
deleted file mode 100644
index d19ebe1e..00000000
--- a/bsp/buildroot/package/python/108-optional-nis.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add an option to disable NIS
-
-NIS is not necessarily available in uClibc, so we need an option to
-not compile support for it.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2656,6 +2656,12 @@
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk"
-   	  fi])
- 
-+AC_ARG_ENABLE(nis,
-+	AS_HELP_STRING([--disable-nis], [disable NIS]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/bsp/buildroot/package/python/109-optional-unicodedata.patch b/bsp/buildroot/package/python/109-optional-unicodedata.patch
deleted file mode 100644
index 841f2a77..00000000
--- a/bsp/buildroot/package/python/109-optional-unicodedata.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add an option to disable unicodedata
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2662,6 +2662,12 @@
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(unicodedata,
-+	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/bsp/buildroot/package/python/110-optional-db.patch b/bsp/buildroot/package/python/110-optional-db.patch
deleted file mode 100644
index b8c454c9..00000000
--- a/bsp/buildroot/package/python/110-optional-db.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Add an option to disable bsddb
-
-bsddb has an external dependency on Berkeley DB. Since we want to be
-able to build Python without it, this patch adds an option to disable
-the build/installation of this Python module.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
-
----
- Makefile.pre.in |   10 ++++++++--
- configure.in    |   22 ++++++++++++++++++++++
- 2 files changed, 30 insertions(+), 2 deletions(-)
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -965,7 +965,7 @@
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
- 		json \
--		logging bsddb csv importlib wsgiref \
-+		logging csv importlib wsgiref \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
- 		distutils distutils/command \
-@@ -981,7 +981,6 @@
- 	test/tracedmodules \
- 	email/test email/test/data \
- 	json/tests \
--	bsddb/test \
- 	ctypes/test \
- 	idlelib/idle_test \
- 	distutils/tests \
-@@ -1022,6 +1021,11 @@
- LIBSUBDIRS += $(XMLLIBSUBDIRS)
- endif
- 
-+ifeq (@BSDDB@,yes)
-+LIBSUBDIRS += bsddb
-+TESTSUBDIRS += bsddb/test
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2662,6 +2662,28 @@
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(dbm,
-+	AS_HELP_STRING([--disable-dbm], [disable DBM]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm"
-+  	  fi])
-+
-+AC_ARG_ENABLE(gdbm,
-+	AS_HELP_STRING([--disable-gdbm], [disable GDBM]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm"
-+  	  fi])
-+
-+AC_SUBST(BSDDB)
-+AC_ARG_ENABLE(bsddb,
-+	AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]),
-+	[ if test "$enableval" = "no"; then
-+    	     BSDDB=no
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb"
-+  	  else
-+	     BSDDB=yes
-+  	  fi], [ BSDDB=yes ])
-+
- AC_ARG_ENABLE(unicodedata,
- 	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
- 	[ if test "$enableval" = "no"; then
diff --git a/bsp/buildroot/package/python/111-optional-ssl.patch b/bsp/buildroot/package/python/111-optional-ssl.patch
deleted file mode 100644
index 956d2a07..00000000
--- a/bsp/buildroot/package/python/111-optional-ssl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Add an option to disable the ssl module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
----
- configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2662,6 +2662,12 @@
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(ssl,
-+	AS_HELP_STRING([--disable-ssl], [disable SSL]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
-+  	  fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
diff --git a/bsp/buildroot/package/python/112-optional-bzip2.patch b/bsp/buildroot/package/python/112-optional-bzip2.patch
deleted file mode 100644
index 99fe83ca..00000000
--- a/bsp/buildroot/package/python/112-optional-bzip2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add an option to disable the bz2 module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2668,6 +2668,12 @@
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl"
-   	  fi])
- 
-+AC_ARG_ENABLE(bz2,
-+       AS_HELP_STRING([--disable-bz2], [disable BZIP2]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
-+         fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
diff --git a/bsp/buildroot/package/python/113-optional-zlib.patch b/bsp/buildroot/package/python/113-optional-zlib.patch
deleted file mode 100644
index 652a586e..00000000
--- a/bsp/buildroot/package/python/113-optional-zlib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Add an option to disable the zlib module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.in |    6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2674,6 +2674,12 @@
-             DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2"
-          fi])
- 
-+AC_ARG_ENABLE(zlib,
-+       AS_HELP_STRING([--disable-zlib], [disable ZLIB]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib"
-+         fi])
-+
- AC_ARG_ENABLE(dbm,
- 	AS_HELP_STRING([--disable-dbm], [disable DBM]),
- 	[ if test "$enableval" = "no"; then
diff --git a/bsp/buildroot/package/python/114-remove-idle-editor.patch b/bsp/buildroot/package/python/114-remove-idle-editor.patch
deleted file mode 100644
index 512eedcb..00000000
--- a/bsp/buildroot/package/python/114-remove-idle-editor.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Do not install the idle editor
-
-IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's
-highly unlikely to ever be useful in an embedded Linux system
-generated by Buildroot, this patch simply disables the installation of
-idle and the related Python modules. It saves 800 KB-900 KB of
-installed .pyc files.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile.pre.in
-===================================================================
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -967,7 +967,6 @@
- 		json \
- 		logging csv importlib wsgiref \
- 		ctypes ctypes/macholib \
--		idlelib idlelib/Icons \
- 		distutils distutils/command \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
-@@ -982,7 +981,6 @@
- 	email/test email/test/data \
- 	json/tests \
- 	ctypes/test \
--	idlelib/idle_test \
- 	distutils/tests \
- 	unittest/test
- 
-Index: b/setup.py
-===================================================================
---- a/setup.py
-+++ b/setup.py
-@@ -2212,7 +2212,7 @@
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
- 
--    scripts = ['Tools/scripts/idle', 'Lib/smtpd.py']
-+    scripts = ['Lib/smtpd.py']
-     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/pydoc' ]
-     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
diff --git a/bsp/buildroot/package/python/115-optional-ossaudiodev.patch b/bsp/buildroot/package/python/115-optional-ossaudiodev.patch
deleted file mode 100644
index 89335ba2..00000000
--- a/bsp/buildroot/package/python/115-optional-ossaudiodev.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 30351d9b41a03c43d627d52d46e49ab91bfe342d Mon Sep 17 00:00:00 2001
-From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
-Date: Thu, 8 Jan 2015 11:41:40 +0100
-Subject: [PATCH 1/1] Add an option to disable the ossaudiodev module
-
-Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2726,6 +2726,12 @@
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
- fi
- 
-+AC_ARG_ENABLE(ossaudiodev,
-+       AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]),
-+       [ if test "$enableval" = "no"; then
-+            DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev"
-+         fi])
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
diff --git a/bsp/buildroot/package/python/Config.in b/bsp/buildroot/package/python/Config.in
index fa83e777..a7f16450 100644
--- a/bsp/buildroot/package/python/Config.in
+++ b/bsp/buildroot/package/python/Config.in
@@ -21,7 +21,8 @@ choice
 	prompt "python module format to install"
 	default BR2_PACKAGE_PYTHON_PYC_ONLY
 	help
-	  Select Python module format to install on target (py, pyc or both)
+	  Select Python module format to install on target (py, pyc or
+	  both)
 
 config BR2_PACKAGE_PYTHON_PY_ONLY
 	bool ".py sources only"
@@ -39,14 +40,14 @@ menu "core python modules"
 comment "The following modules are unusual or require extra libraries"
 
 config BR2_PACKAGE_PYTHON_BZIP2
-	select BR2_PACKAGE_BZIP2
 	bool "bzip2 module"
+	select BR2_PACKAGE_BZIP2
 	help
 	  bzip2 module for Python
 
 config BR2_PACKAGE_PYTHON_BSDDB
-	select BR2_PACKAGE_BERKELEYDB
 	bool "bsddb module"
+	select BR2_PACKAGE_BERKELEYDB
 	help
 	  bsddb module for Python.
 
@@ -56,8 +57,8 @@ config BR2_PACKAGE_PYTHON_CODECSCJK
 	  Chinese/Japanese/Korean codecs module for Python (large).
 
 config BR2_PACKAGE_PYTHON_CURSES
-	select BR2_PACKAGE_NCURSES
 	bool "curses module"
+	select BR2_PACKAGE_NCURSES
 	help
 	  curses module for Python.
 
@@ -67,15 +68,15 @@ config BR2_PACKAGE_PYTHON_OSSAUDIODEV
 	  ossaudiodev module for Python.
 
 config BR2_PACKAGE_PYTHON_READLINE
-	select BR2_PACKAGE_READLINE
 	bool "readline"
+	select BR2_PACKAGE_READLINE
 	help
 	  readline module for Python (required for command-line
 	  editing in the Python shell).
 
 config BR2_PACKAGE_PYTHON_SSL
-	select BR2_PACKAGE_OPENSSL
 	bool "ssl"
+	select BR2_PACKAGE_OPENSSL
 	help
 	  _ssl module for Python (required for https in urllib etc).
 
@@ -83,7 +84,8 @@ config BR2_PACKAGE_PYTHON_UNICODEDATA
 	bool "unicodedata module"
 	default y
 	help
-	  Unicode character database (used by stringprep module) (large).
+	  Unicode character database (used by stringprep module)
+	  (large).
 
 if BR2_PACKAGE_PYTHON_UNICODEDATA
 
@@ -110,8 +112,8 @@ config BR2_PACKAGE_PYTHON_SQLITE
 	  SQLite database support
 
 config BR2_PACKAGE_PYTHON_PYEXPAT
-	select BR2_PACKAGE_EXPAT
 	bool "xml module"
+	select BR2_PACKAGE_EXPAT
 	help
 	  pyexpat and xml libraries for Python
 
diff --git a/bsp/buildroot/package/python/python.hash b/bsp/buildroot/package/python/python.hash
index f285e424..feadcfdc 100644
--- a/bsp/buildroot/package/python/python.hash
+++ b/bsp/buildroot/package/python/python.hash
@@ -1,4 +1,5 @@
-# From https://www.python.org/downloads/release/python-2713/
-md5 53b43534153bb2a0363f08bae8b9d990  Python-2.7.13.tar.xz
+# From https://www.python.org/downloads/release/python-2715/
+md5 a80ae3cc478460b922242f43a1b4094d Python-2.7.15.tar.xz
 # Locally calculated
-sha256 35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731  Python-2.7.13.tar.xz
+sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574  Python-2.7.15.tar.xz
+sha256 b9a6d9320b8f2693e8d41e496ce56caadacaddcca9be2a64a61749278f425cf2  LICENSE
diff --git a/bsp/buildroot/package/python/python.mk b/bsp/buildroot/package/python/python.mk
index 8eb82b2a..79df3c46 100644
--- a/bsp/buildroot/package/python/python.mk
+++ b/bsp/buildroot/package/python/python.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 PYTHON_VERSION_MAJOR = 2.7
-PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).13
+PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).15
 PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz
-PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION)
-PYTHON_LICENSE = Python software foundation license v2, others
+PYTHON_SITE = https://python.org/ftp/python/$(PYTHON_VERSION)
+PYTHON_LICENSE = Python-2.0, others
 PYTHON_LICENSE_FILES = LICENSE
 PYTHON_LIBTOOL_PATCH = NO
 
@@ -17,23 +17,23 @@ PYTHON_LIBTOOL_PATCH = NO
 # also installed in $(HOST_DIR), as it is needed when cross-compiling
 # third-party Python modules.
 
-HOST_PYTHON_CONF_OPTS += 	\
-	--enable-static		\
-	--without-cxx-main 	\
-	--disable-sqlite3	\
-	--disable-tk		\
-	--with-expat=system	\
-	--disable-curses	\
-	--disable-codecs-cjk	\
-	--disable-nis		\
-	--enable-unicodedata	\
-	--disable-dbm		\
-	--disable-gdbm		\
-	--disable-bsddb		\
-	--disable-test-modules	\
-	--disable-bz2		\
-	--disable-ssl		\
-	--disable-ossaudiodev	\
+HOST_PYTHON_CONF_OPTS += \
+	--enable-static \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-dbm \
+	--disable-gdbm \
+	--disable-bsddb \
+	--disable-test-modules \
+	--disable-bz2 \
+	--disable-ssl \
+	--disable-ossaudiodev \
 	--disable-pyo-build
 
 # Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -54,18 +54,16 @@ HOST_PYTHON_CONF_ENV += \
 # MAKE1 has shown to workaround the problem.
 HOST_PYTHON_MAKE = $(MAKE1)
 
-PYTHON_DEPENDENCIES = host-python libffi
+PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES)
 
 HOST_PYTHON_DEPENDENCIES = host-expat host-zlib
 
 PYTHON_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-PYTHON_DEPENDENCIES += gettext
-endif
-
 ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)
 PYTHON_DEPENDENCIES += readline
+else
+PYTHON_CONF_OPTS += --disable-readline
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y)
@@ -129,6 +127,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y)
 PYTHON_DEPENDENCIES += openssl
+else
+PYTHON_CONF_OPTS += --disable-hashlib
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y)
@@ -155,17 +155,17 @@ PYTHON_CONF_ENV += ac_cv_big_endian_double=yes
 endif
 
 PYTHON_CONF_OPTS += \
-	--without-cxx-main 	\
-	--without-doc-strings	\
-	--with-system-ffi	\
-	--disable-pydoc		\
-	--disable-test-modules	\
-	--disable-lib2to3	\
-	--disable-gdbm		\
-	--disable-tk		\
-	--disable-nis		\
-	--disable-dbm		\
-	--disable-pyo-build	\
+	--without-cxx-main \
+	--without-doc-strings \
+	--with-system-ffi \
+	--disable-pydoc \
+	--disable-test-modules \
+	--disable-lib2to3 \
+	--disable-gdbm \
+	--disable-tk \
+	--disable-nis \
+	--disable-dbm \
+	--disable-pyo-build \
 	--disable-pyc-build
 
 # This is needed to make sure the Python build process doesn't try to
@@ -227,24 +227,33 @@ PYTHON_AUTORECONF = YES
 # for the target, otherwise the default python program may be missing.
 ifneq ($(BR2_PACKAGE_PYTHON3),y)
 define HOST_PYTHON_INSTALL_PYTHON_SYMLINK
-	ln -sf python2 $(HOST_DIR)/usr/bin/python
-	ln -sf python2-config $(HOST_DIR)/usr/bin/python-config
+	ln -sf python2 $(HOST_DIR)/bin/python
+	ln -sf python2-config $(HOST_DIR)/bin/python-config
 endef
 
 HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK
 endif
 
 # Provided to other packages
-PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/:$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/
+PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
+ifeq ($(BR2_REPRODUCIBLE),y)
+define PYTHON_FIX_TIME
+	find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \
+		xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH)
+endef
+endif
+
 define PYTHON_CREATE_PYC_FILES
+	$(PYTHON_FIX_TIME)
 	PYTHONPATH="$(PYTHON_PATH)" \
-	$(HOST_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR) \
-		support/scripts/pycompile.py \
-		$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)
+	cd $(TARGET_DIR) && $(HOST_DIR)/bin/python$(PYTHON_VERSION_MAJOR) \
+		$(TOPDIR)/support/scripts/pycompile.py \
+		$(if $(BR2_REPRODUCIBLE),--force) \
+		usr/lib/python$(PYTHON_VERSION_MAJOR)
 endef
 
 ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y)
diff --git a/bsp/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/bsp/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
new file mode 100644
index 00000000..4a8e4e82
--- /dev/null
+++ b/bsp/buildroot/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
@@ -0,0 +1,56 @@
+From e568f4deb7c648e3265154574db753601636cdda Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 16:21:31 -0800
+Subject: [PATCH] Make the build of pyc files conditional
+
+This commit adds a new configure option --disable-pyc-build to disable
+the compilation of pyc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[ Andrey Smrinov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 2 ++
+ configure.ac    | 6 ++++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 82e830727e..b38bd79121 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1311,6 +1311,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+ 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ 	fi
++ifeq (@PYC_BUILD@,yes)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST) -f \
+@@ -1338,6 +1339,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
++endif
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+diff --git a/configure.ac b/configure.ac
+index 962006704f..a76b5444df 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1113,6 +1113,12 @@ fi
+ 
+ AC_MSG_CHECKING(LDLIBRARY)
+ 
++AC_SUBST(PYC_BUILD)
++
++AC_ARG_ENABLE(pyc-build,
++	AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]),
++	[ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ])
++
+ # MacOSX framework builds need more magic. LDLIBRARY is the dynamic
+ # library that we build, but we do not want to link against it (we
+ # will find it with a -framework option). For this reason there is an
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0001-setup.py-do-not-add-invalid-header-locations.patch b/bsp/buildroot/package/python3/0001-setup.py-do-not-add-invalid-header-locations.patch
deleted file mode 100644
index defaad9c..00000000
--- a/bsp/buildroot/package/python3/0001-setup.py-do-not-add-invalid-header-locations.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d6093bad6c700312ff7ff4a7bb15c815dda6f46b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:28:34 +0100
-Subject: [PATCH] setup.py: do not add invalid header locations
-
-This piece of code incorrectly adds /usr/include to
-self.compiler.include_dirs, and results in the following invalid
-compilation line:
-
-/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc
-  -fPIC -Wno-unused-result -Werror=declaration-after-statement -DNDEBUG -g
-  -O3 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-  -D_FILE_OFFSET_BITS=64 -pipe -Os
-  -I./Include -I/usr/include -I. -IInclude
-  -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include
-  -I/home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Include
-  -I/home/thomas/projets/buildroot/output/build/python3-3.4.0b1
-  -c /home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Modules/_struct.c
-  -o build/temp.linux-arm-3.4/home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Modules/_struct.o
-cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories]
-
-The -I/usr/include is wrong when cross compiling, so we disable adding
-INCLUDEDIR and LIBDIR from the host when cross compiling.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index da67731..dbd2a3c 100644
---- a/setup.py
-+++ b/setup.py
-@@ -511,7 +511,8 @@ class PyBuildExt(build_ext):
-                         add_dir_to_list(dir_list, directory)
- 
-         if os.path.normpath(sys.base_prefix) != '/usr' \
--                and not sysconfig.get_config_var('PYTHONFRAMEWORK'):
-+                and not sysconfig.get_config_var('PYTHONFRAMEWORK') \
-+                and not cross_compiling:
-             # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework
-             # (PYTHONFRAMEWORK is set) to avoid # linking problems when
-             # building a framework with different architectures than
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0002-Change-the-install-location-of-_sysconfigdata.py.patch b/bsp/buildroot/package/python3/0002-Change-the-install-location-of-_sysconfigdata.py.patch
deleted file mode 100644
index 8e930abf..00000000
--- a/bsp/buildroot/package/python3/0002-Change-the-install-location-of-_sysconfigdata.py.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 4ac038d30ec71b3f223ac7c91613856dd82b6347 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:29:04 +0100
-Subject: [PATCH] Change the install location of _sysconfigdata.py
-
-The _sysconfigdata.py module contains definitions that are needed when
-building Python modules. In cross-compilation mode, when building
-Python extensions for the target, we need to use the _sysconfigdata.py
-of the target Python while executing the host Python.
-
-However until now, the _sysconfigdata.py module was installed in
-build/lib.<arch>-<version> directory, together with a number of
-architecture-specific shared objects, which cannot be used with the
-host Python.
-
-To solve this problem, this patch moves _sysconfigdata.py to a
-separate location, build/sysconfigdata.<arch>-<version>/, and only
-this directory gets added to the PYTHONPATH of the host Python
-interpreter when building Python modules for the target.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.pre.in | 12 ++++++++++--
- configure.ac    |  2 +-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 823def3..4d2a061 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -585,6 +585,9 @@ pybuilddir.txt: $(BUILDPYTHON)
- 		rm -f ./pybuilddir.txt ; \
- 		exit 1 ; \
- 	fi
-+	echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt
-+	mkdir -p `cat pysysconfigdatadir.txt`
-+	cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt`
- 
- # Build the shared modules
- # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for
-@@ -1235,7 +1238,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		else	true; \
- 		fi; \
- 	done
--	@for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py; \
-+	@for i in $(srcdir)/Lib/*.py ; \
- 	do \
- 		if test -x $$i; then \
- 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \
-@@ -1245,6 +1248,11 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 			echo $(INSTALL_DATA) $$i $(LIBDEST); \
- 		fi; \
- 	done
-+	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
-+		$(DESTDIR)$(LIBDEST)
-+	mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata
-+	$(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \
-+		$(DESTDIR)$(LIBDEST)/sysconfigdata
- 	@for d in $(LIBSUBDIRS); \
- 	do \
- 		a=$(srcdir)/Lib/$$d; \
-@@ -1580,7 +1588,7 @@ clean: pycremoval
- 	find build -name 'fficonfig.h' -exec rm -f {} ';' || true
- 	find build -name '*.py' -exec rm -f {} ';' || true
- 	find build -name '*.py[co]' -exec rm -f {} ';' || true
--	-rm -f pybuilddir.txt
-+	-rm -f pybuilddir.txt pysysconfigdatadir.txt
- 	-rm -f Lib/lib2to3/*Grammar*.pickle
- 	-rm -f Programs/_testembed Programs/_freeze_importlib
- 	-rm -rf build
-diff --git a/configure.ac b/configure.ac
-index 694293e..76b70a0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -70,7 +70,7 @@ if test "$cross_compiling" = yes; then
- 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
- 	fi
-         AC_MSG_RESULT($interp)
--	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
-+	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp
-     fi
- elif test "$cross_compiling" = maybe; then
-     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/bsp/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
new file mode 100644
index 00000000..e997f476
--- /dev/null
+++ b/bsp/buildroot/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
@@ -0,0 +1,27 @@
+From 8ec1677d16bef6d6ee5cee4ff004dfa3d0428e88 Mon Sep 17 00:00:00 2001
+From: Vanya Sergeev <vsergeev@gmail.com>
+Date: Wed, 23 Dec 2015 11:30:33 +0100
+Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling
+ with IPv6 support
+
+Signed-off-by: Vanya Sergeev <vsergeev@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a76b5444df..5f87c4db5a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3939,7 +3939,7 @@ fi
+ 
+ AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
+ 
+-if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes
++if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
+ then
+ 	if test $ipv6 = yes
+ 	then
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/bsp/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
new file mode 100644
index 00000000..76555d29
--- /dev/null
+++ b/bsp/buildroot/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
@@ -0,0 +1,109 @@
+From 2c2afc80831c518e5daf3df6c9e4c4ac0a7be001 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 16:33:22 -0800
+Subject: [PATCH] Add infrastructure to disable the build of certain extensions
+
+Some of the extensions part of the Python core have dependencies on
+external libraries (sqlite, tk, etc.) or are relatively big and not
+necessarly always useful (CJK codecs for example). By extensions, we
+mean part of Python modules that are written in C and therefore
+compiled to binary code.
+
+Therefore, we introduce a small infrastructure that allows to disable
+some of those extensions. This can be done inside the configure.ac by
+adding values to the DISABLED_EXTENSIONS variable (which is a
+word-separated list of extensions).
+
+The implementation works as follow :
+
+ * configure.ac defines a DISABLED_EXTENSIONS variable, which is
+   substituted (so that when Makefile.pre is generated from
+   Makefile.pre.in, the value of the variable is substituted). For
+   now, this DISABLED_EXTENSIONS variable is empty, later patches will
+   use it.
+
+ * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the
+   variables passed in the environment when calling the setup.py
+   script that actually builds and installs those extensions.
+
+ * setup.py is modified so that the existing "disabled_module_list" is
+   filled with those pre-disabled extensions listed in
+   DISABLED_EXTENSIONS.
+
+Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>, and
+then extended by Thomas Petazzoni
+<thomas.petazzoni@free-electrons.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 6 +++++-
+ configure.ac    | 2 ++
+ setup.py        | 6 +++++-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index b38bd79121..4ce917ab8d 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -190,6 +190,8 @@ FILEMODE=	644
+ # configure script arguments
+ CONFIG_ARGS=	@CONFIG_ARGS@
+ 
++# disabled extensions
++DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
+ 
+ # Subdirectories with code
+ SRCDIRS= 	@SRCDIRS@
+@@ -575,6 +577,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+ 	esac; \
+ 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
+ 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
++		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
+ 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
+ 
+ 
+@@ -1436,7 +1439,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+ # Install the dynamically loadable modules
+ # This goes into $(exec_prefix)
+ sharedinstall: sharedmods
+-	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
++	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
++		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
+ 	   	--prefix=$(prefix) \
+ 		--install-scripts=$(BINDIR) \
+ 		--install-platlib=$(DESTSHARED) \
+diff --git a/configure.ac b/configure.ac
+index 5f87c4db5a..d5ee2aedfb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2810,6 +2810,8 @@ LIBS="$withval $LIBS"
+ 
+ PKG_PROG_PKG_CONFIG
+ 
++AC_SUBST(DISABLED_EXTENSIONS)
++
+ # Check for use of the system expat library
+ AC_MSG_CHECKING(for --with-system-expat)
+ AC_ARG_WITH(system_expat,
+diff --git a/setup.py b/setup.py
+index fe477974bd..86643ae8bf 100644
+--- a/setup.py
++++ b/setup.py
+@@ -43,7 +43,11 @@ host_platform = get_platform()
+ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
+ 
+ # This global variable is used to hold the list of modules to be disabled.
+-disabled_module_list = []
++try:
++    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
++except KeyError:
++    disabled_module_list = list()
++
+ 
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (after any relative
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0003-Make-the-build-of-pyc-files-conditional.patch b/bsp/buildroot/package/python3/0003-Make-the-build-of-pyc-files-conditional.patch
deleted file mode 100644
index 3251da5f..00000000
--- a/bsp/buildroot/package/python3/0003-Make-the-build-of-pyc-files-conditional.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 28f81597314ea3ed03935b519453a55cf6c3c20d Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:29:35 +0100
-Subject: [PATCH] Make the build of pyc files conditional
-
-This commit adds a new configure option --disable-pyc-build to disable
-the compilation of pyc.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.pre.in | 2 ++
- configure.ac    | 6 ++++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 4d2a061..272f312 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1283,6 +1283,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
- 	fi
-+ifeq (@PYC_BUILD@,yes)
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST) -f \
-@@ -1310,6 +1311,7 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
-+endif
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
-diff --git a/configure.ac b/configure.ac
-index 76b70a0..66d4642 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1056,6 +1056,12 @@ fi
- 
- AC_MSG_CHECKING(LDLIBRARY)
- 
-+AC_SUBST(PYC_BUILD)
-+
-+AC_ARG_ENABLE(pyc-build,
-+	AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]),
-+	[ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ])
-+
- # MacOSX framework builds need more magic. LDLIBRARY is the dynamic
- # library that we build, but we do not want to link against it (we
- # will find it with a -framework option). For this reason there is an
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch b/bsp/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
new file mode 100644
index 00000000..989943e4
--- /dev/null
+++ b/bsp/buildroot/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch
@@ -0,0 +1,67 @@
+From e359a7a3c4f9e70360a068bef19c95938fdacede Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:33:14 +0100
+Subject: [PATCH] Adjust library/header paths for cross-compilation
+
+When cross-compiling third-party extensions, the get_python_inc() or
+get_python_lib() can be called, to return the path to headers or
+libraries. However, they use the sys.prefix of the host Python, which
+returns incorrect paths when cross-compiling (paths pointing to host
+headers and libraries).
+
+In order to fix this, we introduce the _python_sysroot, _python_prefix
+and _python_exec_prefix variables, that allow to override these
+values, and get correct header/library paths when cross-compiling
+third-party Python modules.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Lib/distutils/command/build_ext.py |  5 ++++-
+ Lib/distutils/sysconfig.py         | 15 +++++++++++----
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
+index 74de782d8a..d0c847b365 100644
+--- a/Lib/distutils/command/build_ext.py
++++ b/Lib/distutils/command/build_ext.py
+@@ -233,7 +233,10 @@ class build_ext(Command):
+         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
+             if not sysconfig.python_build:
+                 # building third party extensions
+-                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
++                libdir = sysconfig.get_config_var('LIBDIR')
++                if "_python_sysroot" in os.environ:
++                    libdir = os.environ.get("_python_sysroot") + libdir
++                self.library_dirs.append(libdir)
+             else:
+                 # building python standard extensions
+                 self.library_dirs.append('.')
+diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
+index 2bcd1dd288..422c13fa4f 100644
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
+@@ -17,10 +17,17 @@ import sys
+ from .errors import DistutilsPlatformError
+ 
+ # These are needed in a couple of spots, so just compute them once.
+-PREFIX = os.path.normpath(sys.prefix)
+-EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
+-BASE_PREFIX = os.path.normpath(sys.base_prefix)
+-BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
++if "_python_sysroot" in os.environ:
++    _sysroot=os.environ.get('_python_sysroot')
++    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
++    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
++    BASE_PREFIX = PREFIX
++    BASE_EXEC_PREFIX = EXEC_PREFIX
++else:
++    PREFIX = os.path.normpath(sys.prefix)
++    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
++    BASE_PREFIX = os.path.normpath(sys.base_prefix)
++    BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
+ 
+ # Path to the base directory of the project. On Windows the binary may
+ # live in project/PCBuild/win32 or project/PCBuild/amd64.
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0004-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/bsp/buildroot/package/python3/0004-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
deleted file mode 100644
index 183d6b30..00000000
--- a/bsp/buildroot/package/python3/0004-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 093caf46b7a742ee2f7bcf617a915ac1653aa8ac Mon Sep 17 00:00:00 2001
-From: Vanya Sergeev <vsergeev@gmail.com>
-Date: Wed, 23 Dec 2015 11:30:33 +0100
-Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling
- with IPv6 support
-
-Signed-off-by: Vanya Sergeev <vsergeev@gmail.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 66d4642..c492594 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3662,7 +3662,7 @@ fi
- 
- AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
- 
--if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes
-+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes
- then
- 	if test $ipv6 = yes
- 	then
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0005-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/bsp/buildroot/package/python3/0005-Add-infrastructure-to-disable-the-build-of-certain-e.patch
deleted file mode 100644
index 76a553b5..00000000
--- a/bsp/buildroot/package/python3/0005-Add-infrastructure-to-disable-the-build-of-certain-e.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 3a9f4aa255909ed152883eee787313efd20dbc58 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:31:08 +0100
-Subject: [PATCH] Add infrastructure to disable the build of certain extensions
-
-Some of the extensions part of the Python core have dependencies on
-external libraries (sqlite, tk, etc.) or are relatively big and not
-necessarly always useful (CJK codecs for example). By extensions, we
-mean part of Python modules that are written in C and therefore
-compiled to binary code.
-
-Therefore, we introduce a small infrastructure that allows to disable
-some of those extensions. This can be done inside the configure.ac by
-adding values to the DISABLED_EXTENSIONS variable (which is a
-word-separated list of extensions).
-
-The implementation works as follow :
-
- * configure.ac defines a DISABLED_EXTENSIONS variable, which is
-   substituted (so that when Makefile.pre is generated from
-   Makefile.pre.in, the value of the variable is substituted). For
-   now, this DISABLED_EXTENSIONS variable is empty, later patches will
-   use it.
-
- * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the
-   variables passed in the environment when calling the setup.py
-   script that actually builds and installs those extensions.
-
- * setup.py is modified so that the existing "disabled_module_list" is
-   filled with those pre-disabled extensions listed in
-   DISABLED_EXTENSIONS.
-
-Patch ported to python2.7 by Maxime Ripard <ripard@archos.com>, and
-then extended by Thomas Petazzoni
-<thomas.petazzoni@free-electrons.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.pre.in | 6 +++++-
- configure.ac    | 2 ++
- setup.py        | 5 ++++-
- 3 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 272f312..9420860 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -182,6 +182,8 @@ FILEMODE=	644
- # configure script arguments
- CONFIG_ARGS=	@CONFIG_ARGS@
- 
-+# disabled extensions
-+DISABLED_EXTENSIONS=	@DISABLED_EXTENSIONS@
- 
- # Subdirectories with code
- SRCDIRS= 	@SRCDIRS@
-@@ -600,6 +602,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt
- 	esac; \
- 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
- 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
-+		DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
- 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
- 
- # Build static library
-@@ -1425,7 +1428,8 @@ libainstall:	all python-config
- # Install the dynamically loadable modules
- # This goes into $(exec_prefix)
- sharedinstall: sharedmods
--	$(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
-+	$(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \
-+		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \
- 	   	--prefix=$(prefix) \
- 		--install-scripts=$(BINDIR) \
- 		--install-platlib=$(DESTSHARED) \
-diff --git a/configure.ac b/configure.ac
-index c492594..bfb599e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2588,6 +2588,8 @@ LIBS="$withval $LIBS"
- 
- PKG_PROG_PKG_CONFIG
- 
-+AC_SUBST(DISABLED_EXTENSIONS)
-+
- # Check for use of the system expat library
- AC_MSG_CHECKING(for --with-system-expat)
- AC_ARG_WITH(system_expat,
-diff --git a/setup.py b/setup.py
-index dbd2a3c..1ebfa50 100644
---- a/setup.py
-+++ b/setup.py
-@@ -44,7 +44,10 @@ host_platform = get_platform()
- COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
- 
- # This global variable is used to hold the list of modules to be disabled.
--disabled_module_list = []
-+try:
-+    disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ")
-+except KeyError:
-+    disabled_module_list = list()
- 
- def add_dir_to_list(dirlist, dir):
-     """Add the directory 'dir' to the list 'dirlist' (after any relative
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/bsp/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
new file mode 100644
index 00000000..250d6ec5
--- /dev/null
+++ b/bsp/buildroot/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
@@ -0,0 +1,31 @@
+From 01b588baf835ec95df7c5696eff1f6c07eaa1108 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:36:00 +0100
+Subject: [PATCH] Don't look in /usr/lib/termcap for libraries
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 86643ae8bf..cd00fbdbda 100644
+--- a/setup.py
++++ b/setup.py
+@@ -786,12 +786,9 @@ class PyBuildExt(build_ext):
+                 pass # Issue 7384: Already linked against curses or tinfo.
+             elif curses_library:
+                 readline_libs.append(curses_library)
+-            elif self.compiler.find_library_file(lib_dirs +
+-                                                     ['/usr/lib/termcap'],
+-                                                     'termcap'):
++            elif self.compiler.find_library_file(lib_dirs, 'termcap'):
+                 readline_libs.append('termcap')
+             exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
+                                    extra_link_args=readline_extra_link_args,
+                                    libraries=readline_libs) )
+         else:
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch b/bsp/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
new file mode 100644
index 00000000..220c54cd
--- /dev/null
+++ b/bsp/buildroot/package/python3/0006-Don-t-add-multiarch-paths.patch
@@ -0,0 +1,37 @@
+From 9055171433d5f6beae90815e8c075dc1e0938936 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:36:27 +0100
+Subject: [PATCH] Don't add multiarch paths
+
+The add_multiarch_paths() function leads, in certain build
+environments, to the addition of host header paths to the CFLAGS,
+which is not appropriate for cross-compilation. This patch fixes that
+by simply removing the call to add_multiarch_paths() when we're
+cross-compiling.
+
+Investigation done by David <buildroot-2014@inbox.com>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index cd00fbdbda..c956fa08d1 100644
+--- a/setup.py
++++ b/setup.py
+@@ -497,10 +497,10 @@ class PyBuildExt(build_ext):
+         if not cross_compiling:
+             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++            self.add_multiarch_paths()
+         # only change this for cross builds for 3.3, issues on Mageia
+         if cross_compiling:
+             self.add_gcc_paths()
+-        self.add_multiarch_paths()
+ 
+         # Add paths specified in the environment variables LDFLAGS and
+         # CPPFLAGS for header and library files.
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0006-distutils-sysconfig-use-sysconfigdata.patch b/bsp/buildroot/package/python3/0006-distutils-sysconfig-use-sysconfigdata.patch
deleted file mode 100644
index b3e41b10..00000000
--- a/bsp/buildroot/package/python3/0006-distutils-sysconfig-use-sysconfigdata.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7c560d917ee0e536c76fac275d1cb0b6136269ab Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:32:23 +0100
-Subject: [PATCH] distutils/sysconfig: use sysconfigdata
-
-In order to make the use of sysconfig cross-compilation compatible,
-use _sysconfigdata.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Lib/distutils/sysconfig.py | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 573724d..721edec 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -414,40 +414,11 @@ def expand_makefile_vars(s, vars):
- _config_vars = None
- 
- def _init_posix():
--    """Initialize the module as appropriate for POSIX systems."""
--    g = {}
--    # load the installed Makefile:
--    try:
--        filename = get_makefile_filename()
--        parse_makefile(filename, g)
--    except OSError as msg:
--        my_msg = "invalid Python installation: unable to open %s" % filename
--        if hasattr(msg, "strerror"):
--            my_msg = my_msg + " (%s)" % msg.strerror
--
--        raise DistutilsPlatformError(my_msg)
--
--    # load the installed pyconfig.h:
--    try:
--        filename = get_config_h_filename()
--        with open(filename) as file:
--            parse_config_h(file, g)
--    except OSError as msg:
--        my_msg = "invalid Python installation: unable to open %s" % filename
--        if hasattr(msg, "strerror"):
--            my_msg = my_msg + " (%s)" % msg.strerror
--
--        raise DistutilsPlatformError(my_msg)
--
--    # On AIX, there are wrong paths to the linker scripts in the Makefile
--    # -- these paths are relative to the Python source, but when installed
--    # the scripts are in another directory.
--    if python_build:
--        g['LDSHARED'] = g['BLDSHARED']
--
-+    # _sysconfigdata is generated at build time, see the sysconfig module
-+    from _sysconfigdata import build_time_vars
-     global _config_vars
--    _config_vars = g
--
-+    _config_vars = {}
-+    _config_vars.update(build_time_vars)
- 
- def _init_nt():
-     """Initialize the module as appropriate for NT"""
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0007-Abort-on-failed-module-build.patch b/bsp/buildroot/package/python3/0007-Abort-on-failed-module-build.patch
new file mode 100644
index 00000000..a44d6b3e
--- /dev/null
+++ b/bsp/buildroot/package/python3/0007-Abort-on-failed-module-build.patch
@@ -0,0 +1,30 @@
+From 63ab4a20076740bd39985c7dee3d6231cdc74c75 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:43:24 +0100
+Subject: [PATCH] Abort on failed module build
+
+When building a Python module fails, the setup.py script currently
+doesn't exit with an error, and simply continues. This is not a really
+nice behavior, so this patch changes setup.py to abort with an error,
+so that the build issue is clearly noticeable.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index c956fa08d1..b3add2be76 100644
+--- a/setup.py
++++ b/setup.py
+@@ -312,6 +312,7 @@ class PyBuildExt(build_ext):
+             print("Failed to build these modules:")
+             print_three_column(failed)
+             print()
++            sys.exit(1)
+ 
+         if self.failed_on_import:
+             failed = self.failed_on_import[:]
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0007-Adjust-library-header-paths-for-cross-compilation.patch b/bsp/buildroot/package/python3/0007-Adjust-library-header-paths-for-cross-compilation.patch
deleted file mode 100644
index 9ac65ba9..00000000
--- a/bsp/buildroot/package/python3/0007-Adjust-library-header-paths-for-cross-compilation.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From e634929f76a45f5b683dc19bc01efed2ab83e19e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:33:14 +0100
-Subject: [PATCH] Adjust library/header paths for cross-compilation
-
-When cross-compiling third-party extensions, the get_python_inc() or
-get_python_lib() can be called, to return the path to headers or
-libraries. However, they use the sys.prefix of the host Python, which
-returns incorrect paths when cross-compiling (paths pointing to host
-headers and libraries).
-
-In order to fix this, we introduce the _python_sysroot, _python_prefix
-and _python_exec_prefix variables, that allow to override these
-values, and get correct header/library paths when cross-compiling
-third-party Python modules.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Lib/distutils/command/build_ext.py |  5 ++++-
- Lib/distutils/sysconfig.py         | 15 +++++++++++----
- 2 files changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
-index d4cb11e..e7a0ba9 100644
---- a/Lib/distutils/command/build_ext.py
-+++ b/Lib/distutils/command/build_ext.py
-@@ -232,7 +232,10 @@ class build_ext(Command):
-         if (sysconfig.get_config_var('Py_ENABLE_SHARED')):
-             if not sysconfig.python_build:
-                 # building third party extensions
--                self.library_dirs.append(sysconfig.get_config_var('LIBDIR'))
-+                libdir = sysconfig.get_config_var('LIBDIR')
-+                if "_python_sysroot" in os.environ:
-+                    libdir = os.environ.get("_python_sysroot") + libdir
-+                self.library_dirs.append(libdir)
-             else:
-                 # building python standard extensions
-                 self.library_dirs.append('.')
-diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
-index 721edec..d20e2d8 100644
---- a/Lib/distutils/sysconfig.py
-+++ b/Lib/distutils/sysconfig.py
-@@ -17,10 +17,17 @@ import sys
- from .errors import DistutilsPlatformError
- 
- # These are needed in a couple of spots, so just compute them once.
--PREFIX = os.path.normpath(sys.prefix)
--EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
--BASE_PREFIX = os.path.normpath(sys.base_prefix)
--BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
-+if "_python_sysroot" in os.environ:
-+    _sysroot=os.environ.get('_python_sysroot')
-+    PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix'))
-+    EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix'))
-+    BASE_PREFIX = PREFIX
-+    BASE_EXEC_PREFIX = EXEC_PREFIX
-+else:
-+    PREFIX = os.path.normpath(sys.prefix)
-+    EXEC_PREFIX = os.path.normpath(sys.exec_prefix)
-+    BASE_PREFIX = os.path.normpath(sys.base_prefix)
-+    BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix)
- 
- # Path to the base directory of the project. On Windows the binary may
- # live in project/PCBuild/win32 or project/PCBuild/amd64.
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0008-Serial-ioctl-workaround.patch b/bsp/buildroot/package/python3/0008-Serial-ioctl-workaround.patch
new file mode 100644
index 00000000..f303bd04
--- /dev/null
+++ b/bsp/buildroot/package/python3/0008-Serial-ioctl-workaround.patch
@@ -0,0 +1,33 @@
+From 20767cb868ff271f4501a6e023f367400882d75e Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Wed, 23 Dec 2015 11:44:02 +0100
+Subject: [PATCH] Serial ioctl() workaround
+
+The ioctls.h of some architectures (notably xtensa) references structs from
+linux/serial.h. Make sure to include this header as well.
+
+Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
+but isn't actually referenced in modern kernels.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ Modules/termios.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Modules/termios.c b/Modules/termios.c
+index b78d33e688..58b0444565 100644
+--- a/Modules/termios.c
++++ b/Modules/termios.c
+@@ -9,7 +9,9 @@
+ #endif
+ 
+ #include <termios.h>
++#include <linux/serial.h>
+ #include <sys/ioctl.h>
++#undef TIOCTTYGSTRUCT
+ 
+ /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
+  * MDTR, MRI, and MRTS (appearantly used internally by some things
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/bsp/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
new file mode 100644
index 00000000..ce84d11b
--- /dev/null
+++ b/bsp/buildroot/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
@@ -0,0 +1,35 @@
+From 8869b15c754ae615203b65a99e043f56770bacd5 Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
+Date: Wed, 23 Dec 2015 11:44:30 +0100
+Subject: [PATCH] Do not adjust the shebang of Python scripts for
+ cross-compilation
+
+The copy_scripts() method in distutils copies the scripts listed in
+the setup file and adjusts the first line to refer to the current
+Python interpreter. When cross-compiling, this means that the adjusted
+shebang refers to the host Python interpreter.
+
+This patch modifies copy_scripts() to preserve the shebang when
+cross-compilation is detected.
+
+Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
+---
+ Lib/distutils/command/build_scripts.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
+index ccc70e6465..d6d54195c1 100644
+--- a/Lib/distutils/command/build_scripts.py
++++ b/Lib/distutils/command/build_scripts.py
+@@ -91,7 +91,7 @@ class build_scripts(Command):
+                     adjust = True
+                     post_interp = match.group(1) or b''
+ 
+-            if adjust:
++            if adjust and not '_python_sysroot' in os.environ:
+                 log.info("copying and adjusting %s -> %s", script,
+                          self.build_dir)
+                 updated_files.append(outfile)
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0009-Don-t-add-multiarch-paths.patch b/bsp/buildroot/package/python3/0009-Don-t-add-multiarch-paths.patch
deleted file mode 100644
index 921e25cc..00000000
--- a/bsp/buildroot/package/python3/0009-Don-t-add-multiarch-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bac5ac529cc0902a340a5cd03308433c6e80d1f6 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:36:27 +0100
-Subject: [PATCH] Don't add multiarch paths
-
-The add_multiarch_paths() function leads, in certain build
-environments, to the addition of host header paths to the CFLAGS,
-which is not appropriate for cross-compilation. This patch fixes that
-by simply removing the call to add_multiarch_paths() when we're
-cross-compiling.
-
-Investigation done by David <buildroot-2014@inbox.com>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 24a7153..8380a64 100644
---- a/setup.py
-+++ b/setup.py
-@@ -474,10 +474,10 @@ class PyBuildExt(build_ext):
-         if not cross_compiling:
-             add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-             add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+            self.add_multiarch_paths()
-         # only change this for cross builds for 3.3, issues on Mageia
-         if cross_compiling:
-             self.add_gcc_paths()
--        self.add_multiarch_paths()
- 
-         # Add paths specified in the environment variables LDFLAGS and
-         # CPPFLAGS for header and library files.
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0010-Abort-on-failed-module-build.patch b/bsp/buildroot/package/python3/0010-Abort-on-failed-module-build.patch
deleted file mode 100644
index 131354b3..00000000
--- a/bsp/buildroot/package/python3/0010-Abort-on-failed-module-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 86ef08e36597e14cac06aef176f12375a27fdef5 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:43:24 +0100
-Subject: [PATCH] Abort on failed module build
-
-When building a Python module fails, the setup.py script currently
-doesn't exit with an error, and simply continues. This is not a really
-nice behavior, so this patch changes setup.py to abort with an error,
-so that the build issue is clearly noticeable.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/setup.py b/setup.py
-index 8380a64..15b39f5 100644
---- a/setup.py
-+++ b/setup.py
-@@ -296,6 +296,7 @@ class PyBuildExt(build_ext):
-             print("Failed to build these modules:")
-             print_three_column(failed)
-             print()
-+            sys.exit(1)
- 
-         if self.failed_on_import:
-             failed = self.failed_on_import[:]
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/bsp/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
new file mode 100644
index 00000000..786e9587
--- /dev/null
+++ b/bsp/buildroot/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
@@ -0,0 +1,60 @@
+From da3880edac19100f69891f225cc2f07a82be1e52 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Thu, 20 Nov 2014 13:24:59 +0100
+Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match
+ beginning of strings
+
+The build/real prefix handling using sed breaks if build != real and the
+standard include / lib directories are used ($prefix/include and $prefix/lib).
+
+E.G.
+
+prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include".
+
+If this gets installed with make DESTDIR="/foo" install, then we end up with
+prefix_real = prefix = "/foo/usr" as expected, but
+includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of
+the double sed invocation (prefix is already expanded).  Work around it by
+ensuring we only match the beginning of the string.
+
+Submitted upstream: http://bugs.python.org/issue22907
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ Misc/python-config.sh.in | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
+index 30c6927871..f905a7132f 100644
+--- a/Misc/python-config.sh.in
++++ b/Misc/python-config.sh.in
+@@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0")
+ 
+ # Use sed to fix paths from their built-to locations to their installed-to
+ # locations.
+-prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
++prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
+ exec_prefix_build="@exec_prefix@"
+-exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
+-includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#")
+-libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
+-CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
++exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
++includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
++libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#")
++CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#")
+ VERSION="@VERSION@"
+ LIBM="@LIBM@"
+ LIBC="@LIBC@"
+@@ -48,7 +48,7 @@ OPT="@OPT@"
+ PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
+ LDVERSION="@LDVERSION@"
+ LIBDEST=${prefix}/lib/python${VERSION}
+-LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
++LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
+ SO="@EXT_SUFFIX@"
+ PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
+ INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/bsp/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
new file mode 100644
index 00000000..1c148401
--- /dev/null
+++ b/bsp/buildroot/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
@@ -0,0 +1,37 @@
+From 660ea434ad8f921db74c0e3f93aa3ff5daac44f3 Mon Sep 17 00:00:00 2001
+From: Samuel Cabrero <samuelcabrero@gmail.com>
+Date: Wed, 23 Dec 2015 11:45:48 +0100
+Subject: [PATCH] Override system locale and set to default when adding gcc
+ paths
+
+Forces the use of the default locale in the function
+add_gcc_paths, which is called when cross compiling to add the
+include and library paths. This is necessary because otherwise
+the gcc output is localized and the output parsing fails, which
+results in no paths added and detect_modules not able to find
+any system library (eg. libz, libssl, etc.)
+
+[Thomas: patch taken from https://bugs.python.org/issue23767.]
+
+Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index b3add2be76..29bfd174d2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -457,7 +457,7 @@ class PyBuildExt(build_ext):
+         tmpfile = os.path.join(self.build_temp, 'gccpaths')
+         if not os.path.exists(self.build_temp):
+             os.makedirs(self.build_temp)
+-        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
++        ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
+         is_gcc = False
+         in_incdirs = False
+         inc_dirs = []
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0011-Serial-ioctl-workaround.patch b/bsp/buildroot/package/python3/0011-Serial-ioctl-workaround.patch
deleted file mode 100644
index 9e7d79c4..00000000
--- a/bsp/buildroot/package/python3/0011-Serial-ioctl-workaround.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ace3ebd517ea0ac42208b6a06c7e8f82da3b9c1b Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Wed, 23 Dec 2015 11:44:02 +0100
-Subject: [PATCH] Serial ioctl() workaround
-
-The ioctls.h of some architectures (notably xtensa) references structs from
-linux/serial.h. Make sure to include this header as well.
-
-Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
-but isn't actually referenced in modern kernels.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
- Modules/termios.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Modules/termios.c b/Modules/termios.c
-index b78d33e..58b0444 100644
---- a/Modules/termios.c
-+++ b/Modules/termios.c
-@@ -9,7 +9,9 @@
- #endif
- 
- #include <termios.h>
-+#include <linux/serial.h>
- #include <sys/ioctl.h>
-+#undef TIOCTTYGSTRUCT
- 
- /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
-  * MDTR, MRI, and MRTS (appearantly used internally by some things
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/bsp/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
new file mode 100644
index 00000000..ed0ca26e
--- /dev/null
+++ b/bsp/buildroot/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
@@ -0,0 +1,99 @@
+From 9db508467be41bc35f06c0076c855b99a1519d24 Mon Sep 17 00:00:00 2001
+From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
+Date: Wed, 22 Feb 2017 16:48:49 -0800
+Subject: [PATCH] Add importlib fix for PEP 3147 issue
+
+Python 3 has a new standard for installing .pyc file, called PEP
+3147. Unfortunately, this standard requires both the .py and .pyc
+files to be installed for a Python module to be found. This is quite
+annoying on space-constrained embedded systems, since the .py file is
+technically not required for execution.
+
+This patch changes cache_from_source() and source_from_cache() in
+importlib to get rid of the "__pycache__" directory.
+This effectively disables PEP 3147 for:
+
+* The python standard library
+* Packages built with distutils or setuptools
+* Packages built with automake that use the `py-compile` helper
+
+Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Lib/importlib/_bootstrap_external.py | 38 +++++-------------------------------
+ 1 file changed, 5 insertions(+), 33 deletions(-)
+
+diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
+index 9feec50842..3550013d58 100644
+--- a/Lib/importlib/_bootstrap_external.py
++++ b/Lib/importlib/_bootstrap_external.py
+@@ -275,8 +275,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+     a True value is the same as setting 'optimization' to the empty string
+     while a False value is equivalent to setting 'optimization' to '1'.
+ 
+-    If sys.implementation.cache_tag is None then NotImplementedError is raised.
+-
+     """
+     if debug_override is not None:
+         _warnings.warn('the debug_override parameter is deprecated; use '
+@@ -288,10 +286,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+     path = _os.fspath(path)
+     head, tail = _path_split(path)
+     base, sep, rest = tail.rpartition('.')
+-    tag = sys.implementation.cache_tag
+-    if tag is None:
+-        raise NotImplementedError('sys.implementation.cache_tag is None')
+-    almost_filename = ''.join([(base if base else rest), sep, tag])
++    almost_filename = ''.join([(base if base else rest)])
+     if optimization is None:
+         if sys.flags.optimize == 0:
+             optimization = ''
+@@ -302,40 +297,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+         if not optimization.isalnum():
+             raise ValueError('{!r} is not alphanumeric'.format(optimization))
+         almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization)
+-    return _path_join(head, _PYCACHE, almost_filename + BYTECODE_SUFFIXES[0])
++    return _path_join(head, almost_filename + BYTECODE_SUFFIXES[0])
+ 
+ 
+ def source_from_cache(path):
+     """Given the path to a .pyc. file, return the path to its .py file.
+ 
+     The .pyc file does not need to exist; this simply returns the path to
+-    the .py file calculated to correspond to the .pyc file.  If path does
+-    not conform to PEP 3147/488 format, ValueError will be raised. If
+-    sys.implementation.cache_tag is None then NotImplementedError is raised.
+-
++    the .py file calculated to correspond to the .pyc file.
+     """
+-    if sys.implementation.cache_tag is None:
+-        raise NotImplementedError('sys.implementation.cache_tag is None')
+-    path = _os.fspath(path)
+-    head, pycache_filename = _path_split(path)
+-    head, pycache = _path_split(head)
+-    if pycache != _PYCACHE:
+-        raise ValueError('{} not bottom-level directory in '
+-                         '{!r}'.format(_PYCACHE, path))
+-    dot_count = pycache_filename.count('.')
+-    if dot_count not in {2, 3}:
+-        raise ValueError('expected only 2 or 3 dots in '
+-                         '{!r}'.format(pycache_filename))
+-    elif dot_count == 3:
+-        optimization = pycache_filename.rsplit('.', 2)[-2]
+-        if not optimization.startswith(_OPT):
+-            raise ValueError("optimization portion of filename does not start "
+-                             "with {!r}".format(_OPT))
+-        opt_level = optimization[len(_OPT):]
+-        if not opt_level.isalnum():
+-            raise ValueError("optimization level {!r} is not an alphanumeric "
+-                             "value".format(optimization))
+-    base_filename = pycache_filename.partition('.')[0]
++    head, filename = _path_split(path)
++    base_filename = filename.partition('.')[0]
+     return _path_join(head, base_filename + SOURCE_SUFFIXES[0])
+ 
+ 
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0012-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/bsp/buildroot/package/python3/0012-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
deleted file mode 100644
index 2e50c1b1..00000000
--- a/bsp/buildroot/package/python3/0012-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 45f482813de828415906e6a416c9c35450c38da7 Mon Sep 17 00:00:00 2001
-From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
-Date: Wed, 23 Dec 2015 11:44:30 +0100
-Subject: [PATCH] Do not adjust the shebang of Python scripts for
- cross-compilation
-
-The copy_scripts() method in distutils copies the scripts listed in
-the setup file and adjusts the first line to refer to the current
-Python interpreter. When cross-compiling, this means that the adjusted
-shebang refers to the host Python interpreter.
-
-This patch modifies copy_scripts() to preserve the shebang when
-cross-compilation is detected.
-
-Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
----
- Lib/distutils/command/build_scripts.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py
-index 90a8380..bdf4cf1 100644
---- a/Lib/distutils/command/build_scripts.py
-+++ b/Lib/distutils/command/build_scripts.py
-@@ -91,7 +91,7 @@ class build_scripts(Command):
-                     adjust = True
-                     post_interp = match.group(1) or b''
- 
--            if adjust:
-+            if adjust and not '_python_sysroot' in os.environ:
-                 log.info("copying and adjusting %s -> %s", script,
-                          self.build_dir)
-                 updated_files.append(outfile)
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/bsp/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
new file mode 100644
index 00000000..fc27eda1
--- /dev/null
+++ b/bsp/buildroot/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
@@ -0,0 +1,115 @@
+From bba0896a05e6406076893dd2f4c3b330e41082a6 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:01:18 -0800
+Subject: [PATCH] Add an option to disable installation of test modules
+
+The Python standard distribution comes with many test modules, that
+are not necessarly useful on embedded targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 55 ++++++++++++++++++++++++++++++++++++-------------------
+ configure.ac    |  5 +++++
+ 2 files changed, 41 insertions(+), 19 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 4ce917ab8d..4110fff4ac 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1194,8 +1194,28 @@ maninstall:	altmaninstall
+ 
+ # Install the library
+ XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
+-LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
+-		tkinter/test/test_ttk site-packages test \
++
++LIBSUBDIRS=	tkinter site-packages \
++		asyncio \
++		collections concurrent concurrent/futures encodings \
++		email email/mime \
++		ensurepip ensurepip/_bundled \
++		html json http dbm xmlrpc \
++		sqlite3 \
++		logging csv wsgiref urllib \
++		lib2to3 lib2to3/fixes lib2to3/pgen2 \
++		ctypes ctypes/macholib \
++		idlelib idlelib/Icons \
++		distutils distutils/command $(XMLLIBSUBDIRS) \
++		importlib \
++		turtledemo \
++		multiprocessing multiprocessing/dummy \
++		unittest \
++		venv venv/scripts venv/scripts/common venv/scripts/posix \
++		curses pydoc_data
++
++TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
++		tkinter/test/test_ttk test \
+ 		test/audiodata \
+ 		test/capath test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata \
+@@ -1229,29 +1249,26 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
+ 		test/test_importlib/namespace_pkgs/project3/parent/child \
+                 test/test_importlib/namespace_pkgs/module_and_namespace_package \
+                 test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
+-		asyncio \
+ 		test/test_asyncio \
+-		collections concurrent concurrent/futures encodings \
+-		email email/mime test/test_email test/test_email/data \
+-		ensurepip ensurepip/_bundled \
+-		html json test/test_json http dbm xmlrpc \
+-		sqlite3 sqlite3/test \
+-		logging csv wsgiref urllib \
+-		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
++		test/test_email test/test_email/data \
++		test/test_json \
++		sqlite3/test \
++		lib2to3/tests \
+ 		lib2to3/tests/data lib2to3/tests/data/fixers \
+ 		lib2to3/tests/data/fixers/myfixes \
+-		ctypes ctypes/test ctypes/macholib \
+-		idlelib idlelib/Icons idlelib/idle_test \
+-		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
+-		importlib test/test_importlib test/test_importlib/builtin \
++		ctypes/test \
++		idlelib/idle_test \
++		distutils/tests \
++		test/test_importlib test/test_importlib/builtin \
+ 		test/test_importlib/extension test/test_importlib/frozen \
+ 		test/test_importlib/import_ test/test_importlib/source \
+ 		test/test_tools test/test_warnings test/test_warnings/data \
+-		turtledemo \
+-		multiprocessing multiprocessing/dummy \
+-		unittest unittest/test unittest/test/testmock \
+-		venv venv/scripts venv/scripts/common venv/scripts/posix \
+-		curses pydoc_data
++		unittest/test unittest/test/testmock
++
++ifeq (@TEST_MODULES@,yes)
++LIBSUBDIRS += $(TESTSUBDIRS)
++endif
++
+ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index d5ee2aedfb..f924937fe1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3112,6 +3112,11 @@ if test "$posix_threads" = "yes"; then
+       AC_CHECK_FUNCS(pthread_atfork)
+ fi
+ 
++AC_SUBST(TEST_MODULES)
++
++AC_ARG_ENABLE(test-modules,
++	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
++	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
+ 
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/bsp/buildroot/package/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
deleted file mode 100644
index 872f0402..00000000
--- a/bsp/buildroot/package/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5858abdc25acd522869103d64b60a0c9687e2ec1 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Thu, 20 Nov 2014 13:24:59 +0100
-Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match
- beginning of strings
-
-The build/real prefix handling using sed breaks if build != real and the
-standard include / lib directories are used ($prefix/include and $prefix/lib).
-
-E.G.
-
-prefix_build="/usr", libdir="$prefix/lib", includedir="$prefix/include".
-
-If this gets installed with make DESTDIR="/foo" install, then we end up with
-prefix_real = prefix = "/foo/usr" as expected, but
-includedir="/foo/foo/usr/include" and libdir="/foo/foo/usr/lib" because of
-the double sed invocation (prefix is already expanded).  Work around it by
-ensuring we only match the beginning of the string.
-
-Submitted upstream: http://bugs.python.org/issue22907
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- Misc/python-config.sh.in | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in
-index 30c6927..f905a71 100644
---- a/Misc/python-config.sh.in
-+++ b/Misc/python-config.sh.in
-@@ -29,12 +29,12 @@ prefix_real=$(installed_prefix "$0")
- 
- # Use sed to fix paths from their built-to locations to their installed-to
- # locations.
--prefix=$(echo "$prefix_build" | sed "s#$prefix_build#$prefix_real#")
-+prefix=$(echo "$prefix_build" | sed "s#^$prefix_build#$prefix_real#")
- exec_prefix_build="@exec_prefix@"
--exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#")
--includedir=$(echo "@includedir@" | sed "s#$prefix_build#$prefix_real#")
--libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#")
--CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#")
-+exec_prefix=$(echo "$exec_prefix_build" | sed "s#^$exec_prefix_build#$prefix_real#")
-+includedir=$(echo "@includedir@" | sed "s#^$prefix_build#$prefix_real#")
-+libdir=$(echo "@libdir@" | sed "s#^$prefix_build#$prefix_real#")
-+CFLAGS=$(echo "@CFLAGS@" | sed "s#^$prefix_build#$prefix_real#")
- VERSION="@VERSION@"
- LIBM="@LIBM@"
- LIBC="@LIBC@"
-@@ -48,7 +48,7 @@ OPT="@OPT@"
- PY_ENABLE_SHARED="@PY_ENABLE_SHARED@"
- LDVERSION="@LDVERSION@"
- LIBDEST=${prefix}/lib/python${VERSION}
--LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#")
-+LIBPL=$(echo "@LIBPL@" | sed "s#^$prefix_build#$prefix_real#")
- SO="@EXT_SUFFIX@"
- PYTHONFRAMEWORK="@PYTHONFRAMEWORK@"
- INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}"
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/bsp/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
new file mode 100644
index 00000000..fc565cfe
--- /dev/null
+++ b/bsp/buildroot/package/python3/0014-Add-an-option-to-disable-pydoc.patch
@@ -0,0 +1,99 @@
+From 18a754e930e03d143d9392e49174cc370b334cdd Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:07:56 -0800
+Subject: [PATCH] Add an option to disable pydoc
+
+It removes 0.5 MB of data from the target plus the pydoc script
+itself.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 8 +++++++-
+ configure.ac    | 6 ++++++
+ setup.py        | 9 +++++++--
+ 3 files changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 4110fff4ac..badb2af35d 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1164,7 +1164,9 @@ bininstall: altbininstall
+ 	-rm -f $(DESTDIR)$(BINDIR)/idle3
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
+ 	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
++ifeq (@PYDOC@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
++endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/2to3
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
+ 	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
+@@ -1212,7 +1214,7 @@ LIBSUBDIRS=	tkinter site-packages \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+ 		venv venv/scripts venv/scripts/common venv/scripts/posix \
+-		curses pydoc_data
++		curses
+ 
+ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+ 		tkinter/test/test_ttk test \
+@@ -1269,6 +1271,10 @@ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += $(TESTSUBDIRS)
+ endif
+ 
++ifeq (@PYDOC@,yes)
++LIBSUBDIRS += pydoc_data
++endif
++
+ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+ 	@for i in $(SCRIPTDIR) $(LIBDEST); \
+ 	do \
+diff --git a/configure.ac b/configure.ac
+index f924937fe1..1621fa1611 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3112,6 +3112,12 @@ if test "$posix_threads" = "yes"; then
+       AC_CHECK_FUNCS(pthread_atfork)
+ fi
+ 
++AC_SUBST(PYDOC)
++
++AC_ARG_ENABLE(pydoc,
++	AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
++	[ PYDOC="${enableval}" ], [ PYDOC=yes ])
++
+ AC_SUBST(TEST_MODULES)
+ 
+ AC_ARG_ENABLE(test-modules,
+diff --git a/setup.py b/setup.py
+index 29bfd174d2..94dd337fef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2281,6 +2281,12 @@ def main():
+     # turn off warnings when deprecated modules are imported
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
++
++    scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
++               'Lib/smtpd.py']
++    if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/pydoc3' ]
++
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+           version = sys.version.split()[0],
+@@ -2305,8 +2311,7 @@ def main():
+           # If you change the scripts installed here, you also need to
+           # check the PyBuildScripts command above, and change the links
+           # created by the bininstall target in Makefile.pre.in
+-          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
+-                     "Tools/scripts/2to3", "Tools/scripts/pyvenv"]
++          scripts = scripts
+         )
+ 
+ # --install-platlib
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0014-Do-not-harcode-invalid-path-to-ncursesw-headers.patch b/bsp/buildroot/package/python3/0014-Do-not-harcode-invalid-path-to-ncursesw-headers.patch
deleted file mode 100644
index f11d9464..00000000
--- a/bsp/buildroot/package/python3/0014-Do-not-harcode-invalid-path-to-ncursesw-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From be44636b36086ca1b6de24265b7c3cc0c2bae913 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:45:13 +0100
-Subject: [PATCH] Do not harcode invalid path to ncursesw headers
-
-Adding /usr/include/ncursesw is obviously invalid when
-cross-compiling. Since the ncursesw headers are no longer installed in
-usr/include/ncursesw/, but directly in usr/include, there is anyway no
-need for a special header path.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 15b39f5..9e08e7e 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1296,7 +1296,6 @@ class PyBuildExt(build_ext):
-         panel_library = 'panel'
-         if curses_library == 'ncursesw':
-             curses_defines.append(('HAVE_NCURSESW', '1'))
--            curses_includes.append('/usr/include/ncursesw')
-             # Bug 1464056: If _curses.so links with ncursesw,
-             # _curses_panel.so must link with panelw.
-             panel_library = 'panelw'
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/bsp/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
new file mode 100644
index 00000000..e6a39383
--- /dev/null
+++ b/bsp/buildroot/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
@@ -0,0 +1,116 @@
+From c2d279b4a19de7a32e8a73e320423f699d408380 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:15:31 -0800
+Subject: [PATCH] Add an option to disable lib2to3
+
+lib2to3 is a library to convert Python 2.x code to Python 3.x. As
+such, it is probably not very useful on embedded system targets.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 16 ++++++++++++----
+ configure.ac    |  6 ++++++
+ setup.py        |  5 +++--
+ 3 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index badb2af35d..931cc3ed07 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1168,7 +1168,9 @@ ifeq (@PYDOC@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
+ endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/2to3
++ifeq (@LIB2TO3@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
++endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
+ 	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
+@@ -1205,7 +1207,6 @@ LIBSUBDIRS=	tkinter site-packages \
+ 		html json http dbm xmlrpc \
+ 		sqlite3 \
+ 		logging csv wsgiref urllib \
+-		lib2to3 lib2to3/fixes lib2to3/pgen2 \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+ 		distutils distutils/command $(XMLLIBSUBDIRS) \
+@@ -1255,9 +1256,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+ 		test/test_email test/test_email/data \
+ 		test/test_json \
+ 		sqlite3/test \
+-		lib2to3/tests \
+-		lib2to3/tests/data lib2to3/tests/data/fixers \
+-		lib2to3/tests/data/fixers/myfixes \
+ 		ctypes/test \
+ 		idlelib/idle_test \
+ 		distutils/tests \
+@@ -1267,6 +1265,14 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+ 		test/test_tools test/test_warnings test/test_warnings/data \
+ 		unittest/test unittest/test/testmock
+ 
++ifeq (@LIB2TO3@,yes)
++LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
++TESTSUBDIRS += lib2to3/tests			\
++	lib2to3/tests/data			\
++	lib2to3/tests/data/fixers		\
++	lib2to3/tests/data/fixers/myfixes
++endif
++
+ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += $(TESTSUBDIRS)
+ endif
+@@ -1366,10 +1372,12 @@ ifeq (@PYC_BUILD@,yes)
+ 		-d $(LIBDEST)/site-packages -f \
+ 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
+ endif
++ifeq (@LIB2TO3@,yes)
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
+ 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
++endif
+ 
+ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
+ 	# Substitution happens here, as the completely-expanded BINDIR
+diff --git a/configure.ac b/configure.ac
+index 1621fa1611..13b2edf8b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3124,6 +3124,12 @@ AC_ARG_ENABLE(test-modules,
+ 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
+ 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
+ 
++AC_SUBST(LIB2TO3)
++
++AC_ARG_ENABLE(lib2to3,
++	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
++	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
+diff --git a/setup.py b/setup.py
+index 94dd337fef..76429e1326 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2282,10 +2282,11 @@ def main():
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
+-               'Lib/smtpd.py']
++    scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc3' ]
++    if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/2to3' ]
+ 
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0015-Override-system-locale-and-set-to-default-when-addin.patch b/bsp/buildroot/package/python3/0015-Override-system-locale-and-set-to-default-when-addin.patch
deleted file mode 100644
index 22af71d1..00000000
--- a/bsp/buildroot/package/python3/0015-Override-system-locale-and-set-to-default-when-addin.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 46fda6fc83500bf5663397f9d28b618e6b6b20c1 Mon Sep 17 00:00:00 2001
-From: Samuel Cabrero <samuelcabrero@gmail.com>
-Date: Wed, 23 Dec 2015 11:45:48 +0100
-Subject: [PATCH] Override system locale and set to default when adding gcc
- paths
-
-Forces the use of the default locale in the function
-add_gcc_paths, which is called when cross compiling to add the
-include and library paths. This is necessary because otherwise
-the gcc output is localized and the output parsing fails, which
-results in no paths added and detect_modules not able to find
-any system library (eg. libz, libssl, etc.)
-
-[Thomas: patch taken from https://bugs.python.org/issue23767.]
-
-Signed-off-by: Samuel Cabrero <samuelcabrero@gmail.com>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 9e08e7e..3feca04 100644
---- a/setup.py
-+++ b/setup.py
-@@ -441,7 +441,7 @@ class PyBuildExt(build_ext):
-         tmpfile = os.path.join(self.build_temp, 'gccpaths')
-         if not os.path.exists(self.build_temp):
-             os.makedirs(self.build_temp)
--        ret = os.system('%s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-+        ret = os.system('LC_ALL=C %s -E -v - </dev/null 2>%s 1>/dev/null' % (gcc, tmpfile))
-         is_gcc = False
-         in_incdirs = False
-         inc_dirs = []
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0016-Add-importlib-fix-for-PEP-3147-issue.patch b/bsp/buildroot/package/python3/0016-Add-importlib-fix-for-PEP-3147-issue.patch
deleted file mode 100644
index 54a0b87a..00000000
--- a/bsp/buildroot/package/python3/0016-Add-importlib-fix-for-PEP-3147-issue.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From d2b5be9a0627e38d2280ef865dab3e74b7d2bde4 Mon Sep 17 00:00:00 2001
-From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
-Date: Wed, 23 Dec 2015 11:46:14 +0100
-Subject: [PATCH] Add importlib fix for PEP 3147 issue
-
-Python 3 has a new standard for installing .pyc file, called PEP
-3147. Unfortunately, this standard requires both the .py and .pyc
-files to be installed for a Python module to be found. This is quite
-annoying on space-constrained embedded systems, since the .py file is
-technically not required for execution.
-
-This patch changes cache_from_source() and source_from_cache() in
-importlib to get rid of the "__pycache__" directory.
-This effectively disables PEP 3147 for:
-
-* The python standard library
-* Packages built with distutils or setuptools
-* Packages built with automake that use the `py-compile` helper
-
-Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
----
- Lib/importlib/_bootstrap_external.py | 37 +++++-------------------------------
- 1 file changed, 5 insertions(+), 32 deletions(-)
-
-diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
-index 616b17f..e30129c 100644
---- a/Lib/importlib/_bootstrap_external.py
-+++ b/Lib/importlib/_bootstrap_external.py
-@@ -255,8 +255,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
-     a True value is the same as setting 'optimization' to the empty string
-     while a False value is equivalent to setting 'optimization' to '1'.
- 
--    If sys.implementation.cache_tag is None then NotImplementedError is raised.
--
-     """
-     if debug_override is not None:
-         _warnings.warn('the debug_override parameter is deprecated; use '
-@@ -267,10 +265,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
-         optimization = '' if debug_override else 1
-     head, tail = _path_split(path)
-     base, sep, rest = tail.rpartition('.')
--    tag = sys.implementation.cache_tag
--    if tag is None:
--        raise NotImplementedError('sys.implementation.cache_tag is None')
--    almost_filename = ''.join([(base if base else rest), sep, tag])
-+    almost_filename = ''.join([(base if base else rest)])
-     if optimization is None:
-         if sys.flags.optimize == 0:
-             optimization = ''
-@@ -281,39 +276,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
-         if not optimization.isalnum():
-             raise ValueError('{!r} is not alphanumeric'.format(optimization))
-         almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization)
--    return _path_join(head, _PYCACHE, almost_filename + BYTECODE_SUFFIXES[0])
-+    return _path_join(head, almost_filename + BYTECODE_SUFFIXES[0])
- 
- 
- def source_from_cache(path):
-     """Given the path to a .pyc. file, return the path to its .py file.
- 
-     The .pyc file does not need to exist; this simply returns the path to
--    the .py file calculated to correspond to the .pyc file.  If path does
--    not conform to PEP 3147/488 format, ValueError will be raised. If
--    sys.implementation.cache_tag is None then NotImplementedError is raised.
--
-+    the .py file calculated to correspond to the .pyc file.
-     """
--    if sys.implementation.cache_tag is None:
--        raise NotImplementedError('sys.implementation.cache_tag is None')
--    head, pycache_filename = _path_split(path)
--    head, pycache = _path_split(head)
--    if pycache != _PYCACHE:
--        raise ValueError('{} not bottom-level directory in '
--                         '{!r}'.format(_PYCACHE, path))
--    dot_count = pycache_filename.count('.')
--    if dot_count not in {2, 3}:
--        raise ValueError('expected only 2 or 3 dots in '
--                         '{!r}'.format(pycache_filename))
--    elif dot_count == 3:
--        optimization = pycache_filename.rsplit('.', 2)[-2]
--        if not optimization.startswith(_OPT):
--            raise ValueError("optimization portion of filename does not start "
--                             "with {!r}".format(_OPT))
--        opt_level = optimization[len(_OPT):]
--        if not opt_level.isalnum():
--            raise ValueError("optimization level {!r} is not an alphanumeric "
--                             "value".format(optimization))
--    base_filename = pycache_filename.partition('.')[0]
-+    head, filename = _path_split(path)
-+    base_filename = filename.partition('.')[0]
-     return _path_join(head, base_filename + SOURCE_SUFFIXES[0])
- 
- 
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/bsp/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
new file mode 100644
index 00000000..675e8282
--- /dev/null
+++ b/bsp/buildroot/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
@@ -0,0 +1,69 @@
+From f2965dfb1aa4f6b3216f3bb1d20f99326f127079 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:20:45 -0800
+Subject: [PATCH] Add option to disable the sqlite3 module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 7 +++++--
+ configure.ac    | 9 +++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 931cc3ed07..a1ce0712cd 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1205,7 +1205,6 @@ LIBSUBDIRS=	tkinter site-packages \
+ 		email email/mime \
+ 		ensurepip ensurepip/_bundled \
+ 		html json http dbm xmlrpc \
+-		sqlite3 \
+ 		logging csv wsgiref urllib \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+@@ -1255,7 +1254,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+ 		test/test_asyncio \
+ 		test/test_email test/test_email/data \
+ 		test/test_json \
+-		sqlite3/test \
+ 		ctypes/test \
+ 		idlelib/idle_test \
+ 		distutils/tests \
+@@ -1273,6 +1271,11 @@ TESTSUBDIRS += lib2to3/tests			\
+ 	lib2to3/tests/data/fixers/myfixes
+ endif
+ 
++ifeq (@SQLITE3@,yes)
++LIBSUBDIRS += sqlite3
++TESTSUBDIRS += sqlite3/test
++endif
++
+ ifeq (@TEST_MODULES@,yes)
+ LIBSUBDIRS += $(TESTSUBDIRS)
+ endif
+diff --git a/configure.ac b/configure.ac
+index 13b2edf8b7..d7582cfea4 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3112,6 +3112,15 @@ if test "$posix_threads" = "yes"; then
+       AC_CHECK_FUNCS(pthread_atfork)
+ fi
+ 
++AC_SUBST(SQLITE3)
++AC_ARG_ENABLE(sqlite3,
++	AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
++	[ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
++
++if test "$SQLITE3" = "no" ; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0017-Add-an-option-to-disable-installation-of-test-module.patch b/bsp/buildroot/package/python3/0017-Add-an-option-to-disable-installation-of-test-module.patch
deleted file mode 100644
index ee0134a5..00000000
--- a/bsp/buildroot/package/python3/0017-Add-an-option-to-disable-installation-of-test-module.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 1d2891204c6bf05d5e2eb0e5fa2ee78f6a2b755b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:47:00 +0100
-Subject: [PATCH] Add an option to disable installation of test modules
-
-The Python standard distribution comes with many test modules, that
-are not necessarly useful on embedded targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in | 56 ++++++++++++++++++++++++++++++++++++--------------------
- configure.ac    |  6 ++++++
- 2 files changed, 42 insertions(+), 20 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 9420860..d4c771a 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1166,8 +1166,30 @@ maninstall:	altmaninstall
- PLATDIR=	@PLATDIR@
- MACHDEPS=	$(PLATDIR)
- XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
--LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
--		tkinter/test/test_ttk site-packages test \
-+LIBSUBDIRS=	tkinter \
-+		site-packages \
-+		asyncio \
-+		collections concurrent concurrent/futures encodings \
-+		email email/mime \
-+		ensurepip ensurepip/_bundled \
-+		html json http dbm xmlrpc \
-+		sqlite3 \
-+		logging csv wsgiref urllib \
-+		lib2to3 lib2to3/fixes lib2to3/pgen2 \
-+		ctypes ctypes/macholib \
-+		idlelib idlelib/Icons \
-+		distutils distutils/command $(XMLLIBSUBDIRS) \
-+		importlib \
-+		turtledemo \
-+		multiprocessing multiprocessing/dummy \
-+		unittest \
-+		venv venv/scripts venv/scripts/posix \
-+		curses pydoc_data $(MACHDEPS)
-+
-+TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
-+		test test/test_asyncio \
-+		test/test_email test/test_email/data \
-+		test/test_json \
- 		test/audiodata \
- 		test/capath test/data \
- 		test/cjkencodings test/decimaltestdata test/xmltestdata \
-@@ -1199,28 +1221,22 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
- 		test/test_importlib/namespace_pkgs/project3/parent/child \
-                 test/test_importlib/namespace_pkgs/module_and_namespace_package \
-                 test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
--		asyncio \
--		test/test_asyncio \
--		collections concurrent concurrent/futures encodings \
--		email email/mime test/test_email test/test_email/data \
--		ensurepip ensurepip/_bundled \
--		html json test/test_json http dbm xmlrpc \
--		sqlite3 sqlite3/test \
--		logging csv wsgiref urllib \
--		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
-+		sqlite3/test \
-+		lib2to3/tests \
- 		lib2to3/tests/data lib2to3/tests/data/fixers \
- 		lib2to3/tests/data/fixers/myfixes \
--		ctypes ctypes/test ctypes/macholib \
--		idlelib idlelib/Icons idlelib/idle_test \
--		distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
--		importlib test/test_importlib test/test_importlib/builtin \
-+		ctypes/test \
-+		idlelib/idle_test \
-+		distutils/tests \
-+		test/test_importlib test/test_importlib/builtin \
- 		test/test_importlib/extension test/test_importlib/frozen \
- 		test/test_importlib/import_ test/test_importlib/source \
--		turtledemo \
--		multiprocessing multiprocessing/dummy \
--		unittest unittest/test unittest/test/testmock \
--		venv venv/scripts venv/scripts/posix \
--		curses pydoc_data $(MACHDEPS)
-+		unittest/test unittest/test/testmock
-+
-+ifeq (@TEST_MODULES@,yes)
-+LIBSUBDIRS += $(TESTSUBDIRS)
-+endif
-+
- libinstall:	build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c
- 	@for i in $(SCRIPTDIR) $(LIBDEST); \
- 	do \
-diff --git a/configure.ac b/configure.ac
-index bfb599e..9f3d226 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2895,6 +2895,12 @@ if test "$posix_threads" = "yes"; then
- fi
- 
- 
-+AC_SUBST(TEST_MODULES)
-+
-+AC_ARG_ENABLE(test-modules,
-+	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
-+	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/bsp/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
new file mode 100644
index 00000000..56196416
--- /dev/null
+++ b/bsp/buildroot/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
@@ -0,0 +1,73 @@
+From f96a00d42e714171f1d90501ed73594fddee570f Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:23:42 -0800
+Subject: [PATCH] Add an option to disable the tk module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 11 ++++++++---
+ configure.ac    |  9 +++++++++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index a1ce0712cd..dc1e917cc3 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1199,7 +1199,7 @@ maninstall:	altmaninstall
+ # Install the library
+ XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
+ 
+-LIBSUBDIRS=	tkinter site-packages \
++LIBSUBDIRS=	site-packages \
+ 		asyncio \
+ 		collections concurrent concurrent/futures encodings \
+ 		email email/mime \
+@@ -1216,8 +1216,7 @@ LIBSUBDIRS=	tkinter site-packages \
+ 		venv venv/scripts venv/scripts/common venv/scripts/posix \
+ 		curses
+ 
+-TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+-		tkinter/test/test_ttk test \
++TESTSUBDIRS=	test \
+ 		test/audiodata \
+ 		test/capath test/data \
+ 		test/cjkencodings test/decimaltestdata test/xmltestdata \
+@@ -1263,6 +1262,12 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+ 		test/test_tools test/test_warnings test/test_warnings/data \
+ 		unittest/test unittest/test/testmock
+ 
++ifeq (@TK@,yes)
++LIBSUBDIRS += tkinter
++TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
++	tkinter/test/test_ttk
++endif
++
+ ifeq (@LIB2TO3@,yes)
+ LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
+ TESTSUBDIRS += lib2to3/tests			\
+diff --git a/configure.ac b/configure.ac
+index d7582cfea4..6a56a5b0c1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3121,6 +3121,15 @@ if test "$SQLITE3" = "no" ; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+ fi
+ 
++AC_SUBST(TK)
++AC_ARG_ENABLE(tk,
++	AS_HELP_STRING([--disable-tk], [disable tk]),
++	[ TK="${enableval}" ], [ TK=yes ])
++
++if test "$TK" = "no"; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0018-Add-an-option-to-disable-pydoc.patch b/bsp/buildroot/package/python3/0018-Add-an-option-to-disable-pydoc.patch
deleted file mode 100644
index 670ad40c..00000000
--- a/bsp/buildroot/package/python3/0018-Add-an-option-to-disable-pydoc.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From a83b79b964700604de386800f86e5a55f53a0e17 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:47:11 +0100
-Subject: [PATCH] Add an option to disable pydoc
-
-It removes 0.5 MB of data from the target plus the pydoc script
-itself.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in | 8 +++++++-
- configure.ac    | 5 +++++
- setup.py        | 9 +++++++--
- 3 files changed, 19 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index d4c771a..a98ad65 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1134,7 +1134,9 @@ bininstall: altbininstall
- 	-rm -f $(DESTDIR)$(BINDIR)/idle3
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
- 	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
-+ifeq (@PYDOC@,yes)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-+endif
- 	-rm -f $(DESTDIR)$(BINDIR)/2to3
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
- 	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
-@@ -1184,7 +1186,7 @@ LIBSUBDIRS=	tkinter \
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		venv venv/scripts venv/scripts/posix \
--		curses pydoc_data $(MACHDEPS)
-+		curses $(MACHDEPS)
- 
- TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
- 		test test/test_asyncio \
-@@ -1233,6 +1235,10 @@ TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
- 		test/test_importlib/import_ test/test_importlib/source \
- 		unittest/test unittest/test/testmock
- 
-+ifeq (@PYDOC@,yes)
-+LIBSUBDIRS += pydoc_data
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-diff --git a/configure.ac b/configure.ac
-index 9f3d226..e9b6d6f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2894,6 +2894,11 @@ if test "$posix_threads" = "yes"; then
-       AC_CHECK_FUNCS(pthread_atfork)
- fi
- 
-+AC_SUBST(PYDOC)
-+
-+AC_ARG_ENABLE(pydoc,
-+	AS_HELP_STRING([--disable-pydoc], [disable pydoc]),
-+	[ PYDOC="${enableval}" ], [ PYDOC=yes ])
- 
- AC_SUBST(TEST_MODULES)
- 
-diff --git a/setup.py b/setup.py
-index 3feca04..137911d 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2220,6 +2220,12 @@ def main():
-     # turn off warnings when deprecated modules are imported
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
-+
-+    scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
-+               'Lib/smtpd.py']
-+    if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/pydoc3' ]
-+
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
-           version = sys.version.split()[0],
-@@ -2244,8 +2250,7 @@ def main():
-           # If you change the scripts installed here, you also need to
-           # check the PyBuildScripts command above, and change the links
-           # created by the bininstall target in Makefile.pre.in
--          scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3",
--                     "Tools/scripts/2to3", "Tools/scripts/pyvenv"]
-+          scripts = scripts,
-         )
- 
- # --install-platlib
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/bsp/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
new file mode 100644
index 00000000..b68369c1
--- /dev/null
+++ b/bsp/buildroot/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
@@ -0,0 +1,62 @@
+From 404aad42698c6d5cbd78421720f9a2bc0e8ec9fe Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:31:51 -0800
+Subject: [PATCH] Add an option to disable the curses module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 7 +++++--
+ configure.ac    | 9 +++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index dc1e917cc3..6a6bc082cd 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1213,8 +1213,7 @@ LIBSUBDIRS=	site-packages \
+ 		turtledemo \
+ 		multiprocessing multiprocessing/dummy \
+ 		unittest \
+-		venv venv/scripts venv/scripts/common venv/scripts/posix \
+-		curses
++		venv venv/scripts venv/scripts/common venv/scripts/posix
+ 
+ TESTSUBDIRS=	test \
+ 		test/audiodata \
+@@ -1268,6 +1267,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+ 	tkinter/test/test_ttk
+ endif
+ 
++ifeq (@CURSES@,yes)
++LIBSUBDIRS += curses
++endif
++
+ ifeq (@LIB2TO3@,yes)
+ LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
+ TESTSUBDIRS += lib2to3/tests			\
+diff --git a/configure.ac b/configure.ac
+index 6a56a5b0c1..5896b39ff9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3130,6 +3130,15 @@ if test "$TK" = "no"; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
+ fi
+ 
++AC_SUBST(CURSES)
++AC_ARG_ENABLE(curses,
++	AS_HELP_STRING([--disable-curses], [disable curses]),
++	[ CURSES="${enableval}" ], [ CURSES=yes ])
++
++if test "$CURSES" = "no"; then
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
++fi
++
+ AC_SUBST(PYDOC)
+ 
+ AC_ARG_ENABLE(pydoc,
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch b/bsp/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
new file mode 100644
index 00000000..0ec0b215
--- /dev/null
+++ b/bsp/buildroot/package/python3/0019-Add-an-option-to-disable-expat.patch
@@ -0,0 +1,92 @@
+From 63fc5bc90cb57460552b544cbed0c2939759ab9e Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:40:45 -0800
+Subject: [PATCH] Add an option to disable expat
+
+This patch replaces the existing --with-system-expat option with a
+--with-expat={system,builtin,none} option, which allows to tell Python
+whether we want to use the system expat (already installed), the expat
+builtin the Python sources, or no expat at all (which disables the
+installation of XML modules).
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in |  6 +++++-
+ configure.ac    | 18 +++++++++++++-----
+ setup.py        |  2 +-
+ 3 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index 6a6bc082cd..dc4b92b6fe 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1208,7 +1208,7 @@ LIBSUBDIRS=	site-packages \
+ 		logging csv wsgiref urllib \
+ 		ctypes ctypes/macholib \
+ 		idlelib idlelib/Icons \
+-		distutils distutils/command $(XMLLIBSUBDIRS) \
++		distutils distutils/command \
+ 		importlib \
+ 		turtledemo \
+ 		multiprocessing multiprocessing/dummy \
+@@ -1271,6 +1271,10 @@ ifeq (@CURSES@,yes)
+ LIBSUBDIRS += curses
+ endif
+ 
++ifeq (@EXPAT@,yes)
++LIBSUBDIRS += $(XMLLIBSUBDIRS)
++endif
++
+ ifeq (@LIB2TO3@,yes)
+ LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
+ TESTSUBDIRS += lib2to3/tests			\
+diff --git a/configure.ac b/configure.ac
+index 5896b39ff9..6f21482207 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2813,13 +2813,21 @@ PKG_PROG_PKG_CONFIG
+ AC_SUBST(DISABLED_EXTENSIONS)
+ 
+ # Check for use of the system expat library
+-AC_MSG_CHECKING(for --with-system-expat)
+-AC_ARG_WITH(system_expat,
+-            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
++AC_MSG_CHECKING(for --with-expat)
++AC_ARG_WITH(expat,
++            AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
+             [],
+-            [with_system_expat="no"])
++            [with_expat="builtin"])
+ 
+-AC_MSG_RESULT($with_system_expat)
++AC_MSG_RESULT($with_expat)
++
++if test "$with_expat" != "none"; then
++   EXPAT=yes
++else
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
++   EXPAT=no
++fi
++AC_SUBST(EXPAT)
+ 
+ # Check for use of the system libffi library
+ AC_MSG_CHECKING(for --with-system-ffi)
+diff --git a/setup.py b/setup.py
+index 76429e1326..38aa5e605e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1495,7 +1495,7 @@ class PyBuildExt(build_ext):
+         #
+         # More information on Expat can be found at www.libexpat.org.
+         #
+-        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
++        if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
+             expat_inc = []
+             define_macros = []
+             expat_lib = ['expat']
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0019-Add-an-option-to-disable-lib2to3.patch b/bsp/buildroot/package/python3/0019-Add-an-option-to-disable-lib2to3.patch
deleted file mode 100644
index f0d47701..00000000
--- a/bsp/buildroot/package/python3/0019-Add-an-option-to-disable-lib2to3.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 3c877ea9f09913586f87064b7a2b9d2b49cb05aa Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:48:44 +0100
-Subject: [PATCH] Add an option to disable lib2to3
-
-lib2to3 is a library to convert Python 2.x code to Python 3.x. As
-such, it is probably not very useful on embedded system targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in | 16 ++++++++++++----
- configure.ac    |  6 ++++++
- setup.py        |  5 +++--
- 3 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index a98ad65..3823940 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1138,7 +1138,9 @@ ifeq (@PYDOC@,yes)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
- endif
- 	-rm -f $(DESTDIR)$(BINDIR)/2to3
-+ifeq (@LIB2TO3@,yes)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
-+endif
- 	-rm -f $(DESTDIR)$(BINDIR)/pyvenv
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv)
- 	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
-@@ -1177,7 +1179,6 @@ LIBSUBDIRS=	tkinter \
- 		html json http dbm xmlrpc \
- 		sqlite3 \
- 		logging csv wsgiref urllib \
--		lib2to3 lib2to3/fixes lib2to3/pgen2 \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
- 		distutils distutils/command $(XMLLIBSUBDIRS) \
-@@ -1224,9 +1225,6 @@ TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
-                 test/test_importlib/namespace_pkgs/module_and_namespace_package \
-                 test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
- 		sqlite3/test \
--		lib2to3/tests \
--		lib2to3/tests/data lib2to3/tests/data/fixers \
--		lib2to3/tests/data/fixers/myfixes \
- 		ctypes/test \
- 		idlelib/idle_test \
- 		distutils/tests \
-@@ -1239,6 +1237,14 @@ ifeq (@PYDOC@,yes)
- LIBSUBDIRS += pydoc_data
- endif
- 
-+ifeq (@LIB2TO3@,yes)
-+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
-+TESTSUBDIRS += lib2to3/tests			\
-+	lib2to3/tests/data			\
-+	lib2to3/tests/data/fixers		\
-+	lib2to3/tests/data/fixers/myfixes
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-@@ -1337,10 +1343,12 @@ ifeq (@PYC_BUILD@,yes)
- 		-d $(LIBDEST)/site-packages -f \
- 		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
- endif
-+ifeq (@LIB2TO3@,yes)
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
- 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- 		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
-+endif
- 
- # Create the PLATDIR source directory, if one wasn't distributed..
- $(srcdir)/Lib/$(PLATDIR):
-diff --git a/configure.ac b/configure.ac
-index e9b6d6f..652ad88 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2906,6 +2906,12 @@ AC_ARG_ENABLE(test-modules,
- 	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
- 	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
- 
-+AC_SUBST(LIB2TO3)
-+
-+AC_ARG_ENABLE(lib2to3,
-+	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
-+	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
-diff --git a/setup.py b/setup.py
-index 137911d..722308b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2221,10 +2221,11 @@ def main():
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
- 
--    scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3',
--               'Lib/smtpd.py']
-+    scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py']
-     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/pydoc3' ]
-+    if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/2to3' ]
- 
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/bsp/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
new file mode 100644
index 00000000..6b316d8e
--- /dev/null
+++ b/bsp/buildroot/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
@@ -0,0 +1,30 @@
+From 3335500cb13a6bc1ab41dfcf00b33e6ade3b9764 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:49:55 +0100
+Subject: [PATCH] Add an option to disable CJK codecs
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6f21482207..c7742faf41 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3129,6 +3129,12 @@ if test "$SQLITE3" = "no" ; then
+    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
+ fi
+ 
++AC_ARG_ENABLE(codecs-cjk,
++	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
++	[ if test "$enableval" = "no"; then
++		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
++	fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0020-Add-option-to-disable-the-sqlite3-module.patch b/bsp/buildroot/package/python3/0020-Add-option-to-disable-the-sqlite3-module.patch
deleted file mode 100644
index 20936841..00000000
--- a/bsp/buildroot/package/python3/0020-Add-option-to-disable-the-sqlite3-module.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 9ae1dce0a2fa01fc3dbc83d8b8c1b56e4b1b162b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:49:01 +0100
-Subject: [PATCH] Add option to disable the sqlite3 module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in | 7 +++++--
- configure.ac    | 9 +++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3823940..c822dbd 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1177,7 +1177,6 @@ LIBSUBDIRS=	tkinter \
- 		email email/mime \
- 		ensurepip ensurepip/_bundled \
- 		html json http dbm xmlrpc \
--		sqlite3 \
- 		logging csv wsgiref urllib \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
-@@ -1224,7 +1223,6 @@ TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
- 		test/test_importlib/namespace_pkgs/project3/parent/child \
-                 test/test_importlib/namespace_pkgs/module_and_namespace_package \
-                 test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
--		sqlite3/test \
- 		ctypes/test \
- 		idlelib/idle_test \
- 		distutils/tests \
-@@ -1245,6 +1243,11 @@ TESTSUBDIRS += lib2to3/tests			\
- 	lib2to3/tests/data/fixers/myfixes
- endif
- 
-+ifeq (@SQLITE3@,yes)
-+LIBSUBDIRS += sqlite3
-+TESTSUBDIRS += sqlite3/test
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-diff --git a/configure.ac b/configure.ac
-index 652ad88..cae12ad 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2894,6 +2894,15 @@ if test "$posix_threads" = "yes"; then
-       AC_CHECK_FUNCS(pthread_atfork)
- fi
- 
-+AC_SUBST(SQLITE3)
-+AC_ARG_ENABLE(sqlite3,
-+	AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]),
-+	[ SQLITE3="${enableval}" ], [ SQLITE3=yes ])
-+
-+if test "$SQLITE3" = "no" ; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch b/bsp/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
new file mode 100644
index 00000000..f49b23f5
--- /dev/null
+++ b/bsp/buildroot/package/python3/0021-Add-an-option-to-disable-NIS.patch
@@ -0,0 +1,33 @@
+From e52d4868cc1192f7e1c147aebaf4fc6f7de30357 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:50:11 +0100
+Subject: [PATCH] Add an option to disable NIS
+
+NIS is not necessarily available in uClibc, so we need an option to
+not compile support for it.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index c7742faf41..42a871bb09 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3135,6 +3135,12 @@ AC_ARG_ENABLE(codecs-cjk,
+ 		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
+ 	fi])
+ 
++AC_ARG_ENABLE(nis,
++	AS_HELP_STRING([--disable-nis], [disable NIS]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0021-Add-an-option-to-disable-the-tk-module.patch b/bsp/buildroot/package/python3/0021-Add-an-option-to-disable-the-tk-module.patch
deleted file mode 100644
index 7dfb339e..00000000
--- a/bsp/buildroot/package/python3/0021-Add-an-option-to-disable-the-tk-module.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d0d42570e5a23c3bf559e0413ec97729fd2f9e24 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:49:14 +0100
-Subject: [PATCH] Add an option to disable the tk module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in | 11 ++++++++---
- configure.ac    |  9 +++++++++
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index c822dbd..0a93c27 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1170,7 +1170,7 @@ maninstall:	altmaninstall
- PLATDIR=	@PLATDIR@
- MACHDEPS=	$(PLATDIR)
- XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
--LIBSUBDIRS=	tkinter \
-+LIBSUBDIRS=	\
- 		site-packages \
- 		asyncio \
- 		collections concurrent concurrent/futures encodings \
-@@ -1188,8 +1188,7 @@ LIBSUBDIRS=	tkinter \
- 		venv venv/scripts venv/scripts/posix \
- 		curses $(MACHDEPS)
- 
--TESTSUBDIRS = 	tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
--		test test/test_asyncio \
-+TESTSUBDIRS = 	test test/test_asyncio \
- 		test/test_email test/test_email/data \
- 		test/test_json \
- 		test/audiodata \
-@@ -1248,6 +1247,12 @@ LIBSUBDIRS += sqlite3
- TESTSUBDIRS += sqlite3/test
- endif
- 
-+ifeq (@TK@,yes)
-+LIBSUBDIRS += tkinter
-+TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
-+	tkinter/test/test_ttk
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-diff --git a/configure.ac b/configure.ac
-index cae12ad..787b185 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2903,6 +2903,15 @@ if test "$SQLITE3" = "no" ; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_SUBST(TK)
-+AC_ARG_ENABLE(tk,
-+	AS_HELP_STRING([--disable-tk], [disable tk]),
-+	[ TK="${enableval}" ], [ TK=yes ])
-+
-+if test "$TK" = "no"; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0022-Add-an-option-to-disable-the-curses-module.patch b/bsp/buildroot/package/python3/0022-Add-an-option-to-disable-the-curses-module.patch
deleted file mode 100644
index 22f7a249..00000000
--- a/bsp/buildroot/package/python3/0022-Add-an-option-to-disable-the-curses-module.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From d04ec780bf7c0825ab260bd1d6b7292141b2dcde Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:49:30 +0100
-Subject: [PATCH] Add an option to disable the curses module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in | 6 +++++-
- configure.ac    | 9 +++++++++
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 0a93c27..b97c21e 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1186,7 +1186,7 @@ LIBSUBDIRS=	\
- 		multiprocessing multiprocessing/dummy \
- 		unittest \
- 		venv venv/scripts venv/scripts/posix \
--		curses $(MACHDEPS)
-+		$(MACHDEPS)
- 
- TESTSUBDIRS = 	test test/test_asyncio \
- 		test/test_email test/test_email/data \
-@@ -1253,6 +1253,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
- 	tkinter/test/test_ttk
- endif
- 
-+ifeq (@CURSES@,yes)
-+LIBSUBDIRS += curses
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-diff --git a/configure.ac b/configure.ac
-index 787b185..0be47b2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2912,6 +2912,15 @@ if test "$TK" = "no"; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
- fi
- 
-+AC_SUBST(CURSES)
-+AC_ARG_ENABLE(curses,
-+	AS_HELP_STRING([--disable-curses], [disable curses]),
-+	[ CURSES="${enableval}" ], [ CURSES=yes ])
-+
-+if test "$CURSES" = "no"; then
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
-+fi
-+
- AC_SUBST(PYDOC)
- 
- AC_ARG_ENABLE(pydoc,
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/bsp/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
new file mode 100644
index 00000000..9c207be6
--- /dev/null
+++ b/bsp/buildroot/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
@@ -0,0 +1,30 @@
+From 69d3e8f0438d01adde55e90eeabafa4abefd3b02 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:50:27 +0100
+Subject: [PATCH] Add an option to disable unicodedata
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 42a871bb09..1d610e132b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3141,6 +3141,12 @@ AC_ARG_ENABLE(nis,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
+   	  fi])
+ 
++AC_ARG_ENABLE(unicodedata,
++	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
++	[ if test "$enableval" = "no"; then
++    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
++  	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/bsp/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
new file mode 100644
index 00000000..da77c448
--- /dev/null
+++ b/bsp/buildroot/package/python3/0023-Add-an-option-to-disable-IDLE.patch
@@ -0,0 +1,89 @@
+From 5bbd94f014c89665d02a8a32442822ab7c5520d0 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Wed, 22 Feb 2017 17:45:14 -0800
+Subject: [PATCH] Add an option to disable IDLE
+
+IDLE is an IDE embedded into python, written using Tk, so it doesn't make
+much sense to have it into our build.
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+[ Andrey Smirnov: ported to Python 3.6 ]
+Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
+---
+ Makefile.pre.in | 7 ++++++-
+ configure.ac    | 6 ++++++
+ setup.py        | 4 +++-
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index dc4b92b6fe..3e43066d90 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -1162,7 +1162,9 @@ bininstall: altbininstall
+ 	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
+ 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
+ 	-rm -f $(DESTDIR)$(BINDIR)/idle3
++ifeq (@IDLE@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
++endif
+ 	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
+ ifeq (@PYDOC@,yes)
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
+@@ -1207,7 +1209,6 @@ LIBSUBDIRS=	site-packages \
+ 		html json http dbm xmlrpc \
+ 		logging csv wsgiref urllib \
+ 		ctypes ctypes/macholib \
+-		idlelib idlelib/Icons \
+ 		distutils distutils/command \
+ 		importlib \
+ 		turtledemo \
+@@ -1275,6 +1276,10 @@ ifeq (@EXPAT@,yes)
+ LIBSUBDIRS += $(XMLLIBSUBDIRS)
+ endif
+ 
++ifeq (@IDLE@,yes)
++LIBSUBDIRS += idlelib idlelib/Icons
++endif
++
+ ifeq (@LIB2TO3@,yes)
+ LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2
+ TESTSUBDIRS += lib2to3/tests			\
+diff --git a/configure.ac b/configure.ac
+index 1d610e132b..2699e7ceb1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3183,6 +3183,12 @@ AC_ARG_ENABLE(lib2to3,
+ 	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
+ 	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
+ 
++AC_SUBST(IDLE)
++
++AC_ARG_ENABLE(idle3,
++	AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]),
++	[ IDLE="${enableval}" ], [ IDLE=yes ])
++
+ # Check for enable-ipv6
+ AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
+ AC_MSG_CHECKING([if --enable-ipv6 is specified])
+diff --git a/setup.py b/setup.py
+index 38aa5e605e..d642825c1e 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2282,11 +2282,13 @@ def main():
+     import warnings
+     warnings.filterwarnings("ignore",category=DeprecationWarning)
+ 
+-    scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py']
++    scripts = [ 'Lib/smtpd.py']
+     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/pydoc3' ]
+     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
+         scripts += [ 'Tools/scripts/2to3' ]
++    if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"):
++        scripts += [ 'Tools/scripts/idle3' ]
+ 
+     setup(# PyPI Metadata (PEP 301)
+           name = "Python",
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0023-Add-an-option-to-disable-expat.patch b/bsp/buildroot/package/python3/0023-Add-an-option-to-disable-expat.patch
deleted file mode 100644
index 73f9b36b..00000000
--- a/bsp/buildroot/package/python3/0023-Add-an-option-to-disable-expat.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 6281850ee8c3fb6d93b4997833af0cca4a48947b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:49:42 +0100
-Subject: [PATCH] Add an option to disable expat
-
-This patch replaces the existing --with-system-expat option with a
---with-expat={system,builtin,none} option, which allows to tell Python
-whether we want to use the system expat (already installed), the expat
-builtin the Python sources, or no expat at all (which disables the
-installation of XML modules).
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- Makefile.pre.in |  6 +++++-
- configure.ac    | 18 +++++++++++++-----
- setup.py        |  2 +-
- 3 files changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index b97c21e..bdfee19 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1180,7 +1180,7 @@ LIBSUBDIRS=	\
- 		logging csv wsgiref urllib \
- 		ctypes ctypes/macholib \
- 		idlelib idlelib/Icons \
--		distutils distutils/command $(XMLLIBSUBDIRS) \
-+		distutils distutils/command \
- 		importlib \
- 		turtledemo \
- 		multiprocessing multiprocessing/dummy \
-@@ -1257,6 +1257,10 @@ ifeq (@CURSES@,yes)
- LIBSUBDIRS += curses
- endif
- 
-+ifeq (@EXPAT@,yes)
-+LIBSUBDIRS += $(XMLLIBSUBDIRS)
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-diff --git a/configure.ac b/configure.ac
-index 0be47b2..e6bcacc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2591,13 +2591,21 @@ PKG_PROG_PKG_CONFIG
- AC_SUBST(DISABLED_EXTENSIONS)
- 
- # Check for use of the system expat library
--AC_MSG_CHECKING(for --with-system-expat)
--AC_ARG_WITH(system_expat,
--            AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]),
-+AC_MSG_CHECKING(for --with-expat)
-+AC_ARG_WITH(expat,
-+            AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]),
-             [],
--            [with_system_expat="no"])
-+            [with_expat="builtin"])
- 
--AC_MSG_RESULT($with_system_expat)
-+AC_MSG_RESULT($with_expat)
-+
-+if test "$with_expat" != "none"; then
-+   EXPAT=yes
-+else
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat"
-+   EXPAT=no
-+fi
-+AC_SUBST(EXPAT)
- 
- # Check for use of the system libffi library
- AC_MSG_CHECKING(for --with-system-ffi)
-diff --git a/setup.py b/setup.py
-index 722308b..ecddb6a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1434,7 +1434,7 @@ class PyBuildExt(build_ext):
-         #
-         # More information on Expat can be found at www.libexpat.org.
-         #
--        if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"):
-             expat_inc = []
-             define_macros = []
-             expat_lib = ['expat']
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0024-Add-an-option-to-disable-CJK-codecs.patch b/bsp/buildroot/package/python3/0024-Add-an-option-to-disable-CJK-codecs.patch
deleted file mode 100644
index d3af94fb..00000000
--- a/bsp/buildroot/package/python3/0024-Add-an-option-to-disable-CJK-codecs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 18265d05ee97ad0c43995acdadce2458b57d7d64 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:49:55 +0100
-Subject: [PATCH] Add an option to disable CJK codecs
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index e6bcacc..38b7515 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2911,6 +2911,12 @@ if test "$SQLITE3" = "no" ; then
-    DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
- fi
- 
-+AC_ARG_ENABLE(codecs-cjk,
-+	AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]),
-+	[ if test "$enableval" = "no"; then
-+		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
-+	fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch b/bsp/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
new file mode 100644
index 00000000..76ef5084
--- /dev/null
+++ b/bsp/buildroot/package/python3/0024-Add-an-option-to-disable-decimal.patch
@@ -0,0 +1,62 @@
+From 0870559b9af82b55f1fd8b35528510f563577256 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:51:31 +0100
+Subject: [PATCH] Add an option to disable decimal
+
+This patch replaces the existing --with-system-libmpdec option with a
+--with-libmpdec={system,builtin,none} option, which allows to tell
+Python whether we want to use the system libmpdec (already installed),
+the libmpdec builtin the Python sources, or no libmpdec at all.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 17 ++++++++++++-----
+ setup.py     |  2 +-
+ 2 files changed, 13 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2699e7ceb1..e2c3b6f25c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2862,13 +2862,20 @@ AC_SUBST(LIBFFI_INCLUDEDIR)
+ AC_MSG_RESULT($with_system_ffi)
+ 
+ # Check for use of the system libmpdec library
+-AC_MSG_CHECKING(for --with-system-libmpdec)
+-AC_ARG_WITH(system_libmpdec,
+-            AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]),
++AC_MSG_CHECKING(for --with-libmpdec)
++AC_ARG_WITH(libmpdec,
++            AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]),
+             [],
+-            [with_system_libmpdec="no"])
++            [with_libmpdec="builtin"])
+ 
+-AC_MSG_RESULT($with_system_libmpdec)
++AC_MSG_RESULT($with_libmpdec)
++if test "$with_libmpdec" != "none"; then
++   MPDEC=yes
++else
++   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal"
++   MPDEC=no
++fi
++AC_SUBST(MPDEC)
+ 
+ # Check for support for loadable sqlite extensions
+ AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
+diff --git a/setup.py b/setup.py
+index d642825c1e..5b98255857 100644
+--- a/setup.py
++++ b/setup.py
+@@ -2058,7 +2058,7 @@ class PyBuildExt(build_ext):
+     def _decimal_ext(self):
+         extra_compile_args = []
+         undef_macros = []
+-        if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
++        if '--with-libmpdec=system' in sysconfig.get_config_var("CONFIG_ARGS"):
+             include_dirs = []
+             libraries = [':libmpdec.so.2']
+             sources = ['_decimal/_decimal.c']
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0025-Add-an-option-to-disable-NIS.patch b/bsp/buildroot/package/python3/0025-Add-an-option-to-disable-NIS.patch
deleted file mode 100644
index ef9ff427..00000000
--- a/bsp/buildroot/package/python3/0025-Add-an-option-to-disable-NIS.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 733ee65f308ec48be427463c06f372ca116ccada Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:50:11 +0100
-Subject: [PATCH] Add an option to disable NIS
-
-NIS is not necessarily available in uClibc, so we need an option to
-not compile support for it.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 38b7515..f25733a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2917,6 +2917,12 @@ AC_ARG_ENABLE(codecs-cjk,
- 		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
- 	fi])
- 
-+AC_ARG_ENABLE(nis,
-+	AS_HELP_STRING([--disable-nis], [disable NIS]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/bsp/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
new file mode 100644
index 00000000..418936cf
--- /dev/null
+++ b/bsp/buildroot/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
@@ -0,0 +1,30 @@
+From a04fb6159e394ec8346cd49993fdf70db3e1b184 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 23 Dec 2015 11:51:58 +0100
+Subject: [PATCH] Add an option to disable the ossaudiodev module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e2c3b6f25c..8e3dded25e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2877,6 +2877,12 @@ else
+ fi
+ AC_SUBST(MPDEC)
+ 
++AC_ARG_ENABLE(ossaudiodev,
++	AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]),
++	[ if test "$enableval" = "no"; then
++	  DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev"
++	  fi])
++
+ # Check for support for loadable sqlite extensions
+ AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
+ AC_ARG_ENABLE(loadable-sqlite-extensions,
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/bsp/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
new file mode 100644
index 00000000..065e5062
--- /dev/null
+++ b/bsp/buildroot/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
@@ -0,0 +1,30 @@
+From 4b001683ad1cb1d90b7c389e67447a250fa9c218 Mon Sep 17 00:00:00 2001
+From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
+Date: Wed, 22 Feb 2017 17:55:59 -0800
+Subject: [PATCH] Add an option to disable openssl support.
+
+Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 8e3dded25e..28bcdabd67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3160,6 +3160,12 @@ AC_ARG_ENABLE(unicodedata,
+     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
+   	  fi])
+ 
++AC_ARG_ENABLE(openssl,
++	AS_HELP_STRING([--disable-openssl], [disable openssl support]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
++	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0026-Add-an-option-to-disable-unicodedata.patch b/bsp/buildroot/package/python3/0026-Add-an-option-to-disable-unicodedata.patch
deleted file mode 100644
index 56a51789..00000000
--- a/bsp/buildroot/package/python3/0026-Add-an-option-to-disable-unicodedata.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 64fa1fc3a9aea7ffba7b96d08a14df91051f2b6f Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:50:27 +0100
-Subject: [PATCH] Add an option to disable unicodedata
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index f25733a..a7ddb2b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2923,6 +2923,12 @@ AC_ARG_ENABLE(nis,
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
-   	  fi])
- 
-+AC_ARG_ENABLE(unicodedata,
-+	AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]),
-+	[ if test "$enableval" = "no"; then
-+    	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
-+  	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0027-Add-an-option-to-disable-IDLE.patch b/bsp/buildroot/package/python3/0027-Add-an-option-to-disable-IDLE.patch
deleted file mode 100644
index 73fc3959..00000000
--- a/bsp/buildroot/package/python3/0027-Add-an-option-to-disable-IDLE.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 2766bcdd8f9b7395ce32a6d8480ef0a2186f2098 Mon Sep 17 00:00:00 2001
-From: Maxime Ripard <maxime.ripard@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:50:42 +0100
-Subject: [PATCH] Add an option to disable IDLE
-
-IDLE is an IDE embedded into python, written using Tk, so it doesn't make
-much sense to have it into our build.
-
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
----
- Makefile.pre.in | 7 ++++++-
- configure.ac    | 6 ++++++
- setup.py        | 4 +++-
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index bdfee19..2466615 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -1132,7 +1132,9 @@ bininstall: altbininstall
- 	-rm -f $(DESTDIR)$(LIBPC)/python3.pc
- 	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc)
- 	-rm -f $(DESTDIR)$(BINDIR)/idle3
-+ifeq (@IDLE@,yes)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
-+endif
- 	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
- ifeq (@PYDOC@,yes)
- 	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
-@@ -1179,7 +1181,6 @@ LIBSUBDIRS=	\
- 		html json http dbm xmlrpc \
- 		logging csv wsgiref urllib \
- 		ctypes ctypes/macholib \
--		idlelib idlelib/Icons \
- 		distutils distutils/command \
- 		importlib \
- 		turtledemo \
-@@ -1261,6 +1262,10 @@ ifeq (@EXPAT@,yes)
- LIBSUBDIRS += $(XMLLIBSUBDIRS)
- endif
- 
-+ifeq (@IDLE@,yes)
-+LIBSUBDIRS += idlelib idlelib/Icons
-+endif
-+
- ifeq (@TEST_MODULES@,yes)
- LIBSUBDIRS += $(TESTSUBDIRS)
- endif
-diff --git a/configure.ac b/configure.ac
-index a7ddb2b..6b59792 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2965,6 +2965,12 @@ AC_ARG_ENABLE(lib2to3,
- 	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
- 	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
- 
-+AC_SUBST(IDLE)
-+
-+AC_ARG_ENABLE(idle3,
-+	AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]),
-+	[ IDLE="${enableval}" ], [ IDLE=yes ])
-+
- # Check for enable-ipv6
- AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified])
- AC_MSG_CHECKING([if --enable-ipv6 is specified])
-diff --git a/setup.py b/setup.py
-index ecddb6a..7fe68e8 100644
---- a/setup.py
-+++ b/setup.py
-@@ -2221,11 +2221,13 @@ def main():
-     import warnings
-     warnings.filterwarnings("ignore",category=DeprecationWarning)
- 
--    scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py']
-+    scripts = ['Lib/smtpd.py']
-     if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/pydoc3' ]
-     if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"):
-         scripts += [ 'Tools/scripts/2to3' ]
-+    if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        scripts += [ 'Tools/scripts/idle3' ]
- 
-     setup(# PyPI Metadata (PEP 301)
-           name = "Python",
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/bsp/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
new file mode 100644
index 00000000..eb196753
--- /dev/null
+++ b/bsp/buildroot/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
@@ -0,0 +1,30 @@
+From d35deaa5c65c29f2a56a29fd5fc1dadadd485eaf Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 23:29:05 +0100
+Subject: [PATCH] Add an option to disable the readline module
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 28bcdabd67..484f6ebaca 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3166,6 +3166,12 @@ AC_ARG_ENABLE(openssl,
+ 	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
+ 	  fi])
+ 
++AC_ARG_ENABLE(readline,
++	AS_HELP_STRING([--disable-readline], [disable readline]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
++	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0028-Add-an-option-to-disable-decimal.patch b/bsp/buildroot/package/python3/0028-Add-an-option-to-disable-decimal.patch
deleted file mode 100644
index 1ac91dd6..00000000
--- a/bsp/buildroot/package/python3/0028-Add-an-option-to-disable-decimal.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ff77defc777a57d4caee5183796fd44dd265e78b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:51:31 +0100
-Subject: [PATCH] Add an option to disable decimal
-
-This patch replaces the existing --with-system-libmpdec option with a
---with-libmpdec={system,builtin,none} option, which allows to tell
-Python whether we want to use the system libmpdec (already installed),
-the libmpdec builtin the Python sources, or no libmpdec at all.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 17 ++++++++++++-----
- setup.py     |  2 +-
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6b59792..51e1760 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2624,13 +2624,20 @@ AC_SUBST(LIBFFI_INCLUDEDIR)
- AC_MSG_RESULT($with_system_ffi)
- 
- # Check for use of the system libmpdec library
--AC_MSG_CHECKING(for --with-system-libmpdec)
--AC_ARG_WITH(system_libmpdec,
--            AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]),
-+AC_MSG_CHECKING(for --with-libmpdec)
-+AC_ARG_WITH(libmpdec,
-+            AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]),
-             [],
--            [with_system_libmpdec="no"])
-+            [with_libmpdec="builtin"])
- 
--AC_MSG_RESULT($with_system_libmpdec)
-+AC_MSG_RESULT($with_libmpdec)
-+if test "$with_libmpdec" != "none"; then
-+   MPDEC=yes
-+else
-+   DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal"
-+   MPDEC=no
-+fi
-+AC_SUBST(MPDEC)
- 
- # Check for support for loadable sqlite extensions
- AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
-diff --git a/setup.py b/setup.py
-index 7fe68e8..364b350 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1988,7 +1988,7 @@ class PyBuildExt(build_ext):
-     def _decimal_ext(self):
-         extra_compile_args = []
-         undef_macros = []
--        if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"):
-+        if '--with-libmpdec=system' in sysconfig.get_config_var("CONFIG_ARGS"):
-             include_dirs = []
-             libraries = [':libmpdec.so.2']
-             sources = ['_decimal/_decimal.c']
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/bsp/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
new file mode 100644
index 00000000..39330ace
--- /dev/null
+++ b/bsp/buildroot/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
@@ -0,0 +1,42 @@
+From 9e95f88906f850caa789977dab4b0f256b575254 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Tue, 7 Mar 2017 23:31:11 +0100
+Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 484f6ebaca..79538df0cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3172,6 +3172,24 @@ AC_ARG_ENABLE(readline,
+ 	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
+ 	  fi])
+ 
++AC_ARG_ENABLE(bzip2,
++	AS_HELP_STRING([--disable-bzip2], [disable bzip2]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bz2"
++	  fi])
++
++AC_ARG_ENABLE(zlib,
++	AS_HELP_STRING([--disable-zlib], [disable zlib]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib"
++	  fi])
++
++AC_ARG_ENABLE(xz,
++	AS_HELP_STRING([--disable-xz], [disable xz]),
++	[ if test "$enableval" = "no"; then
++	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _lzma"
++	  fi])
++
+ AC_SUBST(TK)
+ AC_ARG_ENABLE(tk,
+ 	AS_HELP_STRING([--disable-tk], [disable tk]),
+-- 
+2.13.5
+
diff --git a/bsp/buildroot/package/python3/0029-Add-an-option-to-disable-the-ossaudiodev-module.patch b/bsp/buildroot/package/python3/0029-Add-an-option-to-disable-the-ossaudiodev-module.patch
deleted file mode 100644
index 9ac9173d..00000000
--- a/bsp/buildroot/package/python3/0029-Add-an-option-to-disable-the-ossaudiodev-module.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 789b0f99d7c1d25bfa9c05fd12f4d55bb70f377b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 11:51:58 +0100
-Subject: [PATCH] Add an option to disable the ossaudiodev module
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 51e1760..c4c2353 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2639,6 +2639,12 @@ else
- fi
- AC_SUBST(MPDEC)
- 
-+AC_ARG_ENABLE(ossaudiodev,
-+	AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]),
-+	[ if test "$enableval" = "no"; then
-+	  DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev"
-+	  fi])
-+
- # Check for support for loadable sqlite extensions
- AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions)
- AC_ARG_ENABLE(loadable-sqlite-extensions,
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0030-Support-PGEN_FOR_BUILD-and-FREEZE_IMPORTLIB_FOR_BUIL.patch b/bsp/buildroot/package/python3/0030-Support-PGEN_FOR_BUILD-and-FREEZE_IMPORTLIB_FOR_BUIL.patch
deleted file mode 100644
index 156eb295..00000000
--- a/bsp/buildroot/package/python3/0030-Support-PGEN_FOR_BUILD-and-FREEZE_IMPORTLIB_FOR_BUIL.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 4f851142b8f3149d23654117621285df34ec768b Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 23 Dec 2015 13:58:00 +0100
-Subject: [PATCH] Support PGEN_FOR_BUILD and FREEZE_IMPORTLIB_FOR_BUILD
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.pre.in | 10 ++++++++++
- configure.ac    |  3 +++
- 2 files changed, 13 insertions(+)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 2466615..fdf622d 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -712,10 +712,15 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
- ############################################################################
- # Importlib
- 
-+ifeq (@FREEZE_IMPORTLIB_FOR_BUILD@,)
- Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
- 
- Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
- 	$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
-+else
-+Programs/_freeze_importlib: @FREEZE_IMPORTLIB_FOR_BUILD@
-+	cp $^ $@
-+endif
- 
- Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
- 	./Programs/_freeze_importlib \
-@@ -789,8 +794,13 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN)
- $(GRAMMAR_C): $(GRAMMAR_H)
- 		touch $(GRAMMAR_C)
- 
-+ifeq (@PGEN_FOR_BUILD@,)
- $(PGEN): $(PGENOBJS)
- 		$(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
-+else
-+$(PGEN): @PGEN_FOR_BUILD@
-+		cp $^ $@
-+endif
- 
- Parser/grammar.o:	$(srcdir)/Parser/grammar.c \
- 				$(srcdir)/Include/token.h \
-diff --git a/configure.ac b/configure.ac
-index c4c2353..750c232 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,6 +79,9 @@ else
- fi
- AC_SUBST(PYTHON_FOR_BUILD)
- 
-+AC_SUBST(PGEN_FOR_BUILD)
-+AC_SUBST(FREEZE_IMPORTLIB_FOR_BUILD)
-+
- dnl Ensure that if prefix is specified, it does not end in a slash. If
- dnl it does, we get path names containing '//' which is both ugly and
- dnl can cause trouble.
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/python3/0031-Add-an-option-to-disable-openssl.patch b/bsp/buildroot/package/python3/0031-Add-an-option-to-disable-openssl.patch
deleted file mode 100644
index d4375203..00000000
--- a/bsp/buildroot/package/python3/0031-Add-an-option-to-disable-openssl.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
-Subject: [PATCH] Add an option to disable openssl support.
-
-Signed-off-by: Nicolas Cavallari <nicolas.cavallari@green-communications.fr>
----
- configure.ac | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -3027,6 +3027,12 @@
-     	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
-   	  fi])
- 
-+AC_ARG_ENABLE(openssl,
-+	AS_HELP_STRING([--disable-openssl], [disable openssl support]),
-+	[ if test "$enableval" = "no"; then
-+	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
-+	  fi])
-+
- AC_SUBST(TK)
- AC_ARG_ENABLE(tk,
- 	AS_HELP_STRING([--disable-tk], [disable tk]),
diff --git a/bsp/buildroot/package/python3/Config.in b/bsp/buildroot/package/python3/Config.in
index 35f57e65..623fefe4 100644
--- a/bsp/buildroot/package/python3/Config.in
+++ b/bsp/buildroot/package/python3/Config.in
@@ -22,7 +22,8 @@ choice
 	prompt "python3 module format to install"
 	default BR2_PACKAGE_PYTHON3_PYC_ONLY
 	help
-	  Select Python module format to install on target (py, pyc or both)
+	  Select Python module format to install on target (py, pyc or
+	  both)
 
 config BR2_PACKAGE_PYTHON3_PY_ONLY
 	bool ".py sources only"
@@ -84,7 +85,8 @@ config BR2_PACKAGE_PYTHON3_UNICODEDATA
 	bool "unicodedata module"
 	default y
 	help
-	  Unicode character database (used by stringprep module) (large).
+	  Unicode character database (used by stringprep module)
+	  (large).
 
 config BR2_PACKAGE_PYTHON3_SQLITE
 	bool "sqlite module"
diff --git a/bsp/buildroot/package/python3/python3.hash b/bsp/buildroot/package/python3/python3.hash
index f6f70a20..33adb188 100644
--- a/bsp/buildroot/package/python3/python3.hash
+++ b/bsp/buildroot/package/python3/python3.hash
@@ -1,4 +1,4 @@
-# From https://www.python.org/downloads/release/python-352/
-md5 8906efbacfcdc7c3c9198aeefafd159e Python-3.5.2.tar.xz
+# From https://www.python.org/downloads/release/python-363/
+md5 b9c2c36c33fb89bda1fefd37ad5af9be Python-3.6.3.tar.xz
 # Locally computed
-sha256 0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40 Python-3.5.2.tar.xz
+sha256 cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da Python-3.6.3.tar.xz
diff --git a/bsp/buildroot/package/python3/python3.mk b/bsp/buildroot/package/python3/python3.mk
index 8bfae79f..6e611086 100644
--- a/bsp/buildroot/package/python3/python3.mk
+++ b/bsp/buildroot/package/python3/python3.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-PYTHON3_VERSION_MAJOR = 3.5
-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2
+PYTHON3_VERSION_MAJOR = 3.6
+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3
 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
-PYTHON3_SITE = http://python.org/ftp/python/$(PYTHON3_VERSION)
-PYTHON3_LICENSE = Python software foundation license v2, others
+PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
+PYTHON3_LICENSE = Python-2.0, others
 PYTHON3_LICENSE_FILES = LICENSE
 
 # Python itself doesn't use libtool, but it includes the source code
@@ -18,25 +18,22 @@ PYTHON3_LICENSE_FILES = LICENSE
 # the Python sources, but instead use an external libffi library.
 PYTHON3_LIBTOOL_PATCH = NO
 
-# Python needs itself and a "pgen" program to build itself, both being
-# provided in the Python sources. So in order to cross-compile Python,
-# we need to build a host Python first. This host Python is also
-# installed in $(HOST_DIR), as it is needed when cross-compiling
-# third-party Python modules.
+# This host Python is installed in $(HOST_DIR), as it is needed when
+# cross-compiling third-party Python modules.
 
-HOST_PYTHON3_CONF_OPTS += 	\
-	--without-ensurepip	\
-	--without-cxx-main 	\
-	--disable-sqlite3	\
-	--disable-tk		\
-	--with-expat=system	\
-	--disable-curses	\
-	--disable-codecs-cjk	\
-	--disable-nis		\
-	--enable-unicodedata	\
-	--disable-test-modules	\
-	--disable-idle3		\
-	--disable-ossaudiodev	\
+HOST_PYTHON3_CONF_OPTS += \
+	--without-ensurepip \
+	--without-cxx-main \
+	--disable-sqlite3 \
+	--disable-tk \
+	--with-expat=system \
+	--disable-curses \
+	--disable-codecs-cjk \
+	--disable-nis \
+	--enable-unicodedata \
+	--disable-test-modules \
+	--disable-idle3 \
+	--disable-ossaudiodev \
 	--disable-openssl
 
 # Make sure that LD_LIBRARY_PATH overrides -rpath.
@@ -56,6 +53,8 @@ PYTHON3_INSTALL_STAGING = YES
 
 ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y)
 PYTHON3_DEPENDENCIES += readline
+else
+PYTHON3_CONF_OPTS += --disable-readline
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y)
@@ -90,6 +89,8 @@ endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y)
 PYTHON3_DEPENDENCIES += openssl
+else
+PYTHON3_CONF_OPTS += --disable-openssl
 endif
 
 ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y)
@@ -102,14 +103,20 @@ endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y)
 PYTHON3_DEPENDENCIES += bzip2
+else
+PYTHON3_CONF_OPTS += --disable-bzip2
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_XZ),y)
 PYTHON3_DEPENDENCIES += xz
+else
+PYTHON3_CONF_OPTS += --disable-xz
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y)
 PYTHON3_DEPENDENCIES += zlib
+else
+PYTHON3_CONF_OPTS += --disable-zlib
 endif
 
 ifeq ($(BR2_PACKAGE_PYTHON3_OSSAUDIODEV),y)
@@ -141,32 +148,57 @@ PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no
 endif
 
 PYTHON3_CONF_OPTS += \
-	--without-ensurepip	\
-	--without-cxx-main 	\
-	--with-system-ffi	\
-	--disable-pydoc		\
-	--disable-test-modules	\
-	--disable-lib2to3	\
-	--disable-tk		\
-	--disable-nis		\
-	--disable-idle3		\
+	--without-ensurepip \
+	--without-cxx-main \
+	--with-system-ffi \
+	--disable-pydoc \
+	--disable-test-modules \
+	--disable-lib2to3 \
+	--disable-tk \
+	--disable-nis \
+	--disable-idle3 \
 	--disable-pyc-build
 
-# Python builds two tools to generate code: 'pgen' and
-# '_freeze_importlib'. Unfortunately, for the target Python, they are
-# built for the target, while we need to run them at build time. So
-# when installing host-python, we copy them to
-# $(HOST_DIR)/usr/bin. And then, when building the target python
-# package, we tell the configure script where they are located.
-define HOST_PYTHON3_INSTALL_TOOLS
-	cp $(@D)/Parser/pgen $(HOST_DIR)/usr/bin/python-pgen
-	cp $(@D)/Programs/_freeze_importlib $(HOST_DIR)/usr/bin/python-freeze-importlib
+#
+# Some of CPython's source code is generated using Python interpreter
+# and some helper tools such as "Programs/_freeze_importlib" or
+# "Parser/pgen" (look for regen-* targets in Makefile.pre.in for more
+# info). Normally CPython codebase ships with those files
+# pre-generated, so just regular "make" with no additional steps
+# should be sufficient for a succesfull build, however due to
+# Buildroot's "Add importlib fix for PEP 3147 issue" custom patch we
+# end up modifying "Lib/importlib/_bootstrap_external.py" which means
+# we have to do "regen-importlib" step before building CPython
+# (Importlib is a builtin module that needs to be "frozen"/converted
+# to a C array of bytecode using "Programs/_freeze_importlib")
+#
+# To achive that we add pre-build steps to host-python3 as well as
+# python3 that execute "regen-importlib" target.
+#
+# Unfortunately, for the target Python, "Programs/_freeze_importlib"
+# is built for the target, while we need to run them at build time. So
+# when installing host-python3, we copy them to $(HOST_DIR)/bin...
+#
+define HOST_PYTHON3_MAKE_REGEN_IMPORTLIB
+	$(HOST_MAKE_ENV) $(PYTHON3_CONF_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) regen-importlib
+	cp $(@D)/Programs/_freeze_importlib $(HOST_DIR)/bin/python-freeze-importlib
 endef
-HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_TOOLS
 
-PYTHON3_CONF_ENV += \
-	PGEN_FOR_BUILD=$(HOST_DIR)/usr/bin/python-pgen \
-	FREEZE_IMPORTLIB_FOR_BUILD=$(HOST_DIR)/usr/bin/python-freeze-importlib
+HOST_PYTHON3_PRE_BUILD_HOOKS += HOST_PYTHON3_MAKE_REGEN_IMPORTLIB
+#
+# ... And then, when building the target python we first buid
+# 'Programs/_freeze_importlib' to force GNU Make to update all of the
+# prerequisites of 'Programs/_freeze_importlib', then copy our stashed
+# "host-usable" version over the one that was just build and then
+# build "regen-importlib" target
+#
+define PYTHON3_MAKE_REGEN_IMPORTLIB
+	$(TARGET_MAKE_ENV) $(PYTHON3_CONF_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) Programs/_freeze_importlib
+	cp $(HOST_DIR)/bin/python-freeze-importlib $(@D)/Programs/_freeze_importlib
+	$(TARGET_MAKE_ENV) $(PYTHON3_CONF_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) regen-importlib
+endef
+
+PYTHON3_PRE_BUILD_HOOKS += PYTHON3_MAKE_REGEN_IMPORTLIB
 
 #
 # Remove useless files. In the config/ directory, only the Makefile
@@ -214,24 +246,33 @@ endif
 # for the target.
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
 define HOST_PYTHON3_INSTALL_SYMLINK
-	ln -fs python3 $(HOST_DIR)/usr/bin/python
-	ln -fs python3-config $(HOST_DIR)/usr/bin/python-config
+	ln -fs python3 $(HOST_DIR)/bin/python
+	ln -fs python3-config $(HOST_DIR)/bin/python-config
 endef
 
 HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK
 endif
 
 # Provided to other packages
-PYTHON3_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/sysconfigdata/:$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/
+PYTHON3_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
+ifeq ($(BR2_REPRODUCIBLE),y)
+define PYTHON3_FIX_TIME
+	find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.py' -print0 | \
+		xargs -0 --no-run-if-empty touch -d @$(SOURCE_DATE_EPOCH)
+endef
+endif
+
 define PYTHON3_CREATE_PYC_FILES
+	$(PYTHON3_FIX_TIME)
 	PYTHONPATH="$(PYTHON3_PATH)" \
-	$(HOST_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR) \
-		support/scripts/pycompile.py \
-		$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)
+	cd $(TARGET_DIR) && $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) \
+		$(TOPDIR)/support/scripts/pycompile.py \
+		$(if $(BR2_REPRODUCIBLE),--force) \
+		usr/lib/python$(PYTHON3_VERSION_MAJOR)
 endef
 
 ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY)$(BR2_PACKAGE_PYTHON3_PY_PYC),y)
diff --git a/bsp/buildroot/package/qemu/0002-memfd-fix-configure-test.patch b/bsp/buildroot/package/qemu/0002-memfd-fix-configure-test.patch
new file mode 100644
index 00000000..3e06c0e9
--- /dev/null
+++ b/bsp/buildroot/package/qemu/0002-memfd-fix-configure-test.patch
@@ -0,0 +1,58 @@
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 28 Nov 2017 11:51:27 +0100
+Subject: [PATCH] memfd: fix configure test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc added memfd_create in sys/mman.h.  This conflicts with
+the definition in util/memfd.c:
+
+    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
+
+Fix the configure test, and remove the sys/memfd.h inclusion since the
+file actually does not exist---it is a typo in the memfd_create(2) man
+page.
+
+Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: commit 75e5b70e6b5
+
+ configure    | 2 +-
+ util/memfd.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9c8aa5a98bd4..99ccc1725ace 100755
+--- a/configure
++++ b/configure
+@@ -3923,7 +3923,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+ 
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 4571d1aba866..412e94a405fc 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -31,9 +31,7 @@
+ 
+ #include "qemu/memfd.h"
+ 
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+ 
+-- 
+2.16.2
+
diff --git a/bsp/buildroot/package/qemu/Config.in b/bsp/buildroot/package/qemu/Config.in
index f4a75fc2..13b615bf 100644
--- a/bsp/buildroot/package/qemu/Config.in
+++ b/bsp/buildroot/package/qemu/Config.in
@@ -20,18 +20,20 @@ config BR2_PACKAGE_QEMU
 	select BR2_PACKAGE_PIXMAN
 	select BR2_PACKAGE_ZLIB
 	help
-	  QEMU is a generic and open source machine emulator and virtualizer.
+	  QEMU is a generic and open source machine emulator and
+	  virtualizer.
 
-	  When used as a machine emulator, QEMU can run OSes and programs made
-	  for one machine (e.g. an ARM board) on a different machine (e.g.
-	  your own PC). By using dynamic translation, it achieves very good
-	  performance.
+	  When used as a machine emulator, QEMU can run OSes and
+	  programs made for one machine (e.g. an ARM board) on a
+	  different machine (e.g.  your own PC). By using dynamic
+	  translation, it achieves very good performance.
 
-	  When used as a virtualizer, QEMU achieves near native performances
-	  by executing the guest code directly on the host CPU. QEMU supports
-	  virtualization when executing under the Xen hypervisor or using the
-	  KVM kernel module in Linux. When using KVM, QEMU can virtualize x86,
-	  server and embedded PowerPC, and S390 guests.
+	  When used as a virtualizer, QEMU achieves near native
+	  performances by executing the guest code directly on the
+	  host CPU. QEMU supports virtualization when executing under
+	  the Xen hypervisor or using the KVM kernel module in
+	  Linux. When using KVM, QEMU can virtualize x86, server and
+	  embedded PowerPC, and S390 guests.
 
 	  http://qemu.org/
 
@@ -42,7 +44,8 @@ comment "Emulators selection"
 config BR2_PACKAGE_QEMU_CUSTOM_TARGETS
 	string "Enable specific targets"
 	help
-	  Enter here the list of QEMU targets you want to build. For example:
+	  Enter here the list of QEMU targets you want to build. For
+	  example:
 
 	    System emulation      | User-land emulation
 	    ----------------------+-----------------------
@@ -63,7 +66,8 @@ config BR2_PACKAGE_QEMU_SYSTEM
 	depends on !BR2_STATIC_LIBS # dtc
 	select BR2_PACKAGE_QEMU_FDT
 	help
-	  Say 'y' to build all system emulators/virtualisers that QEMU supports.
+	  Say 'y' to build all system emulators/virtualisers that QEMU
+	  supports.
 
 comment "systems emulation needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
@@ -73,7 +77,8 @@ config BR2_PACKAGE_QEMU_LINUX_USER
 	# Incompatible "struct sigevent" definition on musl
 	depends on !BR2_TOOLCHAIN_USES_MUSL
 	help
-	  Say 'y' to build all Linux user-land emulators that QEMU supports.
+	  Say 'y' to build all Linux user-land emulators that QEMU
+	  supports.
 
 # Note: bsd-user can not be build on Linux
 
@@ -94,8 +99,8 @@ config BR2_PACKAGE_QEMU_SDL
 	bool "Enable SDL frontend"
 	select BR2_PACKAGE_SDL
 	help
-	  Say 'y' to enable the SDL frontend, that is, a graphical window
-	  presenting the VM's display.
+	  Say 'y' to enable the SDL frontend, that is, a graphical
+	  window presenting the VM's display.
 
 comment "Misc. features"
 
@@ -104,8 +109,8 @@ config BR2_PACKAGE_QEMU_FDT
 	depends on !BR2_STATIC_LIBS # dtc
 	select BR2_PACKAGE_DTC
 	help
-	  Say 'y' here to have QEMU capable of constructing Device Trees,
-	  and passing them to the VMs.
+	  Say 'y' here to have QEMU capable of constructing Device
+	  Trees, and passing them to the VMs.
 
 comment "FDT support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
@@ -115,6 +120,7 @@ endif # BR2_PACKAGE_QEMU_HAS_EMULS
 config BR2_PACKAGE_QEMU_TOOLS
 	bool "Enable tools"
 	help
-	  Say 'y' here to include tools packaged with QEMU (e.g. qemu-img).
+	  Say 'y' here to include tools packaged with QEMU
+	  (e.g. qemu-img).
 
 endif # BR2_PACKAGE_QEMU
diff --git a/bsp/buildroot/package/qemu/Config.in.host b/bsp/buildroot/package/qemu/Config.in.host
index b3eb5906..f14bcec6 100644
--- a/bsp/buildroot/package/qemu/Config.in.host
+++ b/bsp/buildroot/package/qemu/Config.in.host
@@ -1,15 +1,16 @@
 config BR2_PACKAGE_HOST_QEMU
 	bool "host qemu"
-	select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
-	       if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
 	depends on BR2_arm       || BR2_armeb       || BR2_aarch64      || \
 		BR2_i386         || BR2_m68k        || BR2_microblazeel || \
 		BR2_microblazebe || BR2_mips        || BR2_mipsel       || \
 		BR2_mips64       || BR2_mips64el    || BR2_powerpc      || \
 		BR2_powerpc64    || BR2_powerpc64le || BR2_sh           || \
 		BR2_sparc        || BR2_x86_64
+	select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \
+		if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE
 	help
-	  QEMU is a generic and open source machine emulator and virtualizer.
+	  QEMU is a generic and open source machine emulator and
+	  virtualizer.
 
 	  This option builds an emulator for your selected architecture.
 
diff --git a/bsp/buildroot/package/qemu/qemu.hash b/bsp/buildroot/package/qemu/qemu.hash
index 405d1925..1173c1bf 100644
--- a/bsp/buildroot/package/qemu/qemu.hash
+++ b/bsp/buildroot/package/qemu/qemu.hash
@@ -1,2 +1,4 @@
 # Locally computed, tarball verified with GPG signature
-sha256 7b50634d729dcabe4a96d74062832274fa2f4c883e82904f5e6955f801edab54  qemu-2.8.1.1.tar.xz
+sha256 fcfdaa1ecdaac8aead616fe811bfb8fe4a8f2cd59796aa446c5175b5af0e829f  qemu-2.10.2.tar.xz
+sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100  COPYING
+sha256 48ffe9fc7f1d5462dbd19340bc4dd1d8a9e37c61ed535813e614cbe4a5f0d4df  COPYING.LIB
diff --git a/bsp/buildroot/package/qemu/qemu.mk b/bsp/buildroot/package/qemu/qemu.mk
index 1cb6ed11..c3a7e773 100644
--- a/bsp/buildroot/package/qemu/qemu.mk
+++ b/bsp/buildroot/package/qemu/qemu.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-QEMU_VERSION = 2.8.1.1
+QEMU_VERSION = 2.10.2
 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz
 QEMU_SITE = http://download.qemu.org
-QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c
+QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
 QEMU_LICENSE_FILES = COPYING COPYING.LIB
 # NOTE: there is no top-level license file for non-(L)GPL licenses;
 #       the non-(L)GPL license texts are specified in the affected
@@ -126,11 +126,11 @@ define HOST_QEMU_CONFIGURE_CMDS
 	cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \
 		./configure \
 		--target-list="$(HOST_QEMU_TARGETS)" \
-		--prefix="$(HOST_DIR)/usr" \
+		--prefix="$(HOST_DIR)" \
 		--interp-prefix=$(STAGING_DIR) \
 		--cc="$(HOSTCC)" \
 		--host-cc="$(HOSTCC)" \
-		--python=$(HOST_DIR)/usr/bin/python2 \
+		--python=$(HOST_DIR)/bin/python2 \
 		--extra-cflags="$(HOST_CFLAGS)" \
 		--extra-ldflags="$(HOST_LDFLAGS)" \
 		$(HOST_QEMU_OPTS)
@@ -147,7 +147,7 @@ endef
 $(eval $(host-generic-package))
 
 # variable used by other packages
-QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH)
+QEMU_USER = $(HOST_DIR)/bin/qemu-$(HOST_QEMU_ARCH)
 
 #-------------------------------------------------------------
 # Target-qemu
@@ -161,8 +161,8 @@ QEMU_LIBS = -lrt -lm
 QEMU_OPTS =
 
 QEMU_VARS = \
-	LIBTOOL=$(HOST_DIR)/usr/bin/libtool \
-	PYTHON=$(HOST_DIR)/usr/bin/python2 \
+	LIBTOOL=$(HOST_DIR)/bin/libtool \
+	PYTHON=$(HOST_DIR)/bin/python2 \
 	PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
 
 # If we want to specify only a subset of targets, we must still enable all
@@ -212,45 +212,51 @@ else
 QEMU_OPTS += --disable-tools
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSSH2),y)
+QEMU_OPTS += --enable-libssh2
+QEMU_DEPENDENCIES += libssh2
+else
+QEMU_OPTS += --disable-libssh2
+endif
+
 # Override CPP, as it expects to be able to call it like it'd
 # call the compiler.
 define QEMU_CONFIGURE_CMDS
-	( cd $(@D);                                     \
-		LIBS='$(QEMU_LIBS)'                     \
-		$(TARGET_CONFIGURE_OPTS)                \
-		$(TARGET_CONFIGURE_ARGS)                \
-		CPP="$(TARGET_CC) -E"			\
-		$(QEMU_VARS)                            \
-		./configure                             \
-			--prefix=/usr                   \
-			--cross-prefix=$(TARGET_CROSS)  \
-			--with-system-pixman            \
-			--audio-drv-list=               \
-			--enable-kvm                    \
-			--enable-attr                   \
-			--enable-vhost-net              \
-			--disable-bsd-user              \
-			--disable-xen                   \
-			--disable-slirp                 \
-			--disable-vnc                   \
-			--disable-virtfs                \
-			--disable-brlapi                \
-			--disable-curses                \
-			--disable-curl                  \
-			--disable-bluez                 \
-			--disable-uuid                  \
-			--disable-vde                   \
-			--disable-linux-aio             \
-			--disable-cap-ng                \
-			--disable-docs                  \
-			--disable-spice                 \
-			--disable-rbd                   \
-			--disable-libiscsi              \
-			--disable-usb-redir             \
-			--disable-strip                 \
-			--disable-seccomp               \
-			--disable-sparse                \
-			$(QEMU_OPTS)                    \
+	( cd $(@D); \
+		LIBS='$(QEMU_LIBS)' \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CPP="$(TARGET_CC) -E" \
+		$(QEMU_VARS) \
+		./configure \
+			--prefix=/usr \
+			--cross-prefix=$(TARGET_CROSS) \
+			--with-system-pixman \
+			--audio-drv-list= \
+			--enable-kvm \
+			--enable-attr \
+			--enable-vhost-net \
+			--disable-bsd-user \
+			--disable-xen \
+			--disable-slirp \
+			--disable-vnc \
+			--disable-virtfs \
+			--disable-brlapi \
+			--disable-curses \
+			--disable-curl \
+			--disable-bluez \
+			--disable-vde \
+			--disable-linux-aio \
+			--disable-cap-ng \
+			--disable-docs \
+			--disable-spice \
+			--disable-rbd \
+			--disable-libiscsi \
+			--disable-usb-redir \
+			--disable-strip \
+			--disable-seccomp \
+			--disable-sparse \
+			$(QEMU_OPTS) \
 	)
 endef
 
diff --git a/bsp/buildroot/package/qextserialport/Config.in b/bsp/buildroot/package/qextserialport/Config.in
index ab05920b..4e7ef137 100644
--- a/bsp/buildroot/package/qextserialport/Config.in
+++ b/bsp/buildroot/package/qextserialport/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_QEXTSERIALPORT
 	help
 	  A Qt library to manage serial ports
 
-	  http://code.google.com/p/qextserialport/
+	  http://qextserialport.github.io/
diff --git a/bsp/buildroot/package/qjson/qjson.mk b/bsp/buildroot/package/qjson/qjson.mk
index dab2381b..1777b945 100644
--- a/bsp/buildroot/package/qjson/qjson.mk
+++ b/bsp/buildroot/package/qjson/qjson.mk
@@ -10,7 +10,7 @@ QJSON_INSTALL_STAGING = YES
 QJSON_DEPENDENCIES = \
 	$(if $(BR2_PACKAGE_QT),qt) \
 	$(if $(BR2_PACKAGE_QT5),qt5base)
-QJSON_LICENSE = LGPLv2.1
+QJSON_LICENSE = LGPL-2.1
 QJSON_LICENSE_FILES = COPYING.lib
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/qlibc/Config.in b/bsp/buildroot/package/qlibc/Config.in
index 170da494..ad6f1fee 100644
--- a/bsp/buildroot/package/qlibc/Config.in
+++ b/bsp/buildroot/package/qlibc/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QLIBC
 	bool "qlibc"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  qLibc is currently one of the most functionally complete
 	  public licensed C/C++ libraries. The C/C++ library which
diff --git a/bsp/buildroot/package/qlibc/qlibc.mk b/bsp/buildroot/package/qlibc/qlibc.mk
index a146fa38..55c7aa3b 100644
--- a/bsp/buildroot/package/qlibc/qlibc.mk
+++ b/bsp/buildroot/package/qlibc/qlibc.mk
@@ -6,7 +6,7 @@
 
 QLIBC_VERSION = v2.4.1
 QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION))
-QLIBC_LICENSE = BSD-2c
+QLIBC_LICENSE = BSD-2-Clause
 QLIBC_LICENSE_FILES = LICENSE
 
 # We're patching configure.ac
diff --git a/bsp/buildroot/package/qpdf/Config.in b/bsp/buildroot/package/qpdf/Config.in
index e8ab9ba9..87a3192c 100644
--- a/bsp/buildroot/package/qpdf/Config.in
+++ b/bsp/buildroot/package/qpdf/Config.in
@@ -3,13 +3,14 @@ config BR2_PACKAGE_QPDF
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_PCRE
 	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_JPEG
 	help
-	  QPDF is a command-line program that does structural, content-
-	  preserving transformations on PDF files. It could have been called
-	  something like pdf-to-pdf. It also provides many useful capabilities
-	  to developers of PDF-producing software or for people who just want
-	  to look at the innards of a PDF file to learn more about how they
-	  work.
+	  QPDF is a command-line program that does structural,
+	  content- preserving transformations on PDF files. It could
+	  have been called something like pdf-to-pdf. It also provides
+	  many useful capabilities to developers of PDF-producing
+	  software or for people who just want to look at the innards
+	  of a PDF file to learn more about how they work.
 
 	  http://qpdf.sourceforge.net/
 
diff --git a/bsp/buildroot/package/qpdf/qpdf.hash b/bsp/buildroot/package/qpdf/qpdf.hash
index c882708b..d27c9834 100644
--- a/bsp/buildroot/package/qpdf/qpdf.hash
+++ b/bsp/buildroot/package/qpdf/qpdf.hash
@@ -1,4 +1,2 @@
-# From http://sourceforge.net/projects/qpdf/files/qpdf/6.0.0/qpdf-6.0.0.sha1/download
-sha1	15ebe09d9b9ddd2309a67e4295693fcf82494e33	qpdf-6.0.0.tar.gz
-# Locally computed
-sha256	a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233	qpdf-6.0.0.tar.gz
+# From https://sourceforge.net/projects/qpdf/files/qpdf/8.1.0/qpdf-8.1.0.sha512/download
+sha512	1831bcaaed87dae268db5d61805d1483ec5c101f6ce594be660664c119597ae67cf011c2b50092964d785a814d5f6c780935127a89401fe37a1026ae4d3af15c  qpdf-8.1.0.tar.gz
diff --git a/bsp/buildroot/package/qpdf/qpdf.mk b/bsp/buildroot/package/qpdf/qpdf.mk
index 9601f985..4776d22b 100644
--- a/bsp/buildroot/package/qpdf/qpdf.mk
+++ b/bsp/buildroot/package/qpdf/qpdf.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-QPDF_VERSION = 6.0.0
+QPDF_VERSION = 8.1.0
 QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION)
 QPDF_INSTALL_STAGING = YES
 QPDF_LICENSE = Artistic-2.0
 QPDF_LICENSE_FILES = Artistic-2.0
-QPDF_DEPENDENCIES = pcre zlib
+QPDF_DEPENDENCIES = pcre zlib jpeg
 
 QPDF_CONF_OPTS = --without-random
 
diff --git a/bsp/buildroot/package/qpid-proton/Config.in b/bsp/buildroot/package/qpid-proton/Config.in
index 47cddebe..b49a2afa 100644
--- a/bsp/buildroot/package/qpid-proton/Config.in
+++ b/bsp/buildroot/package/qpid-proton/Config.in
@@ -6,10 +6,10 @@ config BR2_PACKAGE_QPID_PROTON
 	help
 	  The AMQP messaging toolkit
 
-	  Qpid Proton is a high-performance, lightweight messaging library.
-	  It can be used in the widest range of messaging applications,
-	  including brokers, client libraries, routers, bridges, proxies, and
-	  more.
+	  Qpid Proton is a high-performance, lightweight messaging
+	  library. It can be used in the widest range of messaging
+	  applications, including brokers, client libraries, routers,
+	  bridges, proxies, and more.
 
 	  https://qpid.apache.org/proton/
 
diff --git a/bsp/buildroot/package/qpid-proton/qpid-proton.mk b/bsp/buildroot/package/qpid-proton/qpid-proton.mk
index 2e8c1d0e..c501e48c 100644
--- a/bsp/buildroot/package/qpid-proton/qpid-proton.mk
+++ b/bsp/buildroot/package/qpid-proton/qpid-proton.mk
@@ -26,7 +26,7 @@ QPID_PROTON_CONF_OPTS = \
 	-DBUILD_RUBY=OFF \
 	-DENABLE_VALGRIND=OFF \
 	-DENABLE_WARNING_ERROR=OFF \
-	-DPYTHON_EXECUTABLE=$(HOST_DIR)/usr/bin/python2
+	-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python2
 
 define QPID_PROTON_REMOVE_USELESS_FILES
 	rm -fr $(TARGET_DIR)/usr/share/proton-*/
diff --git a/bsp/buildroot/package/qt-webkit-kiosk/Config.in b/bsp/buildroot/package/qt-webkit-kiosk/Config.in
index 1b0e0dee..71b4f834 100644
--- a/bsp/buildroot/package/qt-webkit-kiosk/Config.in
+++ b/bsp/buildroot/package/qt-webkit-kiosk/Config.in
@@ -1,15 +1,17 @@
 config BR2_PACKAGE_QT_WEBKIT_KIOSK
 	bool "qt-webkit-kiosk"
 	depends on BR2_PACKAGE_QT5
+	depends on !BR2_STATIC_LIBS # qt5webkit
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5webkit -> icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5webkit -> icu
+	depends on !BR2_BINFMT_FLAT # qt5webkit -> icu
+	depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5BASE_WIDGETS
 	select BR2_PACKAGE_QT5WEBKIT
 	select BR2_PACKAGE_QT5MULTIMEDIA
-	depends on !BR2_STATIC_LIBS # qt5webkit
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit
-	depends on !BR2_BINFMT_FLAT # qt5webkit
-	depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit
 	help
 	  Simple kiosk-mode browser powered by Qt5Webkit
 
@@ -21,3 +23,10 @@ config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS
 	  Deploy browser sound files on target
 
 endif
+
+comment "qt-webkit-kiosk needs a toolchain w/ dynamic library, gcc >= 4.8, host gcc >= 4.8"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	depends on !BR2_BINFMT_FLAT
+	depends on !BR2_MIPS_SOFT_FLOAT
diff --git a/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash b/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash
new file mode 100644
index 00000000..8097c88c
--- /dev/null
+++ b/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 ec05f5bcb202265202a6f3ff74372516ce9beb82206ff67ca2b1b6fcb586ecd2  qt-webkit-kiosk-34efddb0bf0c36c8652f90dcd001db123f286f04.tar.gz
diff --git a/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk b/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
index d54c8d5e..c279cbe7 100644
--- a/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
+++ b/bsp/buildroot/package/qt-webkit-kiosk/qt-webkit-kiosk.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-QT_WEBKIT_KIOSK_VERSION = 7fe40a350abfbe5ec194e7c6c740f7099e8704cd
+QT_WEBKIT_KIOSK_VERSION = 34efddb0bf0c36c8652f90dcd001db123f286f04
 QT_WEBKIT_KIOSK_SITE = https://github.com/sergey-dryabzhinsky/qt-webkit-kiosk.git
 QT_WEBKIT_KIOSK_SITE_METHOD = git
 QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia
-QT_WEBKIT_KIOSK_LICENSE = LGPLv3
+QT_WEBKIT_KIOSK_LICENSE = LGPL-3.0
 QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html
 
 define QT_WEBKIT_KIOSK_CONFIGURE_CMDS
diff --git a/bsp/buildroot/package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch b/bsp/buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
similarity index 100%
rename from bsp/buildroot/package/qt/0011-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
rename to bsp/buildroot/package/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch
diff --git a/bsp/buildroot/package/qt/0010-Fix-library-inclusion-order-when-building-statically.patch b/bsp/buildroot/package/qt/0010-Fix-library-inclusion-order-when-building-statically.patch
deleted file mode 100644
index f6163fa0..00000000
--- a/bsp/buildroot/package/qt/0010-Fix-library-inclusion-order-when-building-statically.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 7a912823158a4113256c3113a34c38d6b241d275 Mon Sep 17 00:00:00 2001
-From: Alexey Brodkin <abrodkin@synopsys.com>
-Date: Wed, 13 Jan 2016 20:15:36 +0300
-Subject: [PATCH] Fix library inclusion order when building statically
-
-When building application statically it's important to keep
-libraries we're linking against in order. Otherwise if libA depends on
-libB but it is mentioned after libB in linker command line
-there will be unresolved symbols.
-
-Consider real example - configuration of Qt with glib for static build.
-Initially reported by Buildroot autobuilder here:
-http://autobuild.buildroot.net/results/174/174c6e47eb761f9897275b6fedff742ace2f3081
-
-What happens here:
-
-[1] Qt's configuration script tries to build glib test app
-    (in config.tests/unix/glib)
-
-[2] For that it first asks which libs to use during linkage this way:
-    QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null`
-
-    In our case we're getting something like this:
-    -L/.../sysroot/usr/lib -lintl -lgthread-2.0 -pthread -lglib-2.0 \
-    -lintl -pthread -lintl
-
-    Note "-lintl" is mentioned 3 times because libgthread depends on
-    libthread and both of them plus libglib all depend on libintl - so
-    we're getting "lintl" for each separate library mentioned above.
-
-[3] Now we execute "compileTest" for real heavy lifting this way:
-    compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB ...
-
-[4] compileTest (the one for unix) parses command-line passed to it
-    groups all entries with "-l" prefix and puts them in LFLAGS
-    variable. And finally executes qmake passing it that kind of
-    construction:
-    $OUTDIR/bin/qmake ..."LIBS*=$LFLAGS"
-
-[5] When qmake sees construction "MYVAR*=MYVAL" it populates MYVAR with
-    unique values from MYVAL string.
-
-[6] As a result qmake generated Makefile with the following:
-    LIBS = $(SUBLIBS) -pthread -L/.../sysroot/usr/lib -lintl -lgthread-2.0 \
-    -lglib-2.0
-
-[7] And essentially on attempt to link glib test app a failure happens
-    because libglib needs libintl, i.e. "-lintl" must follow "-lglib-2.0":
--------------------->8------------------
-linking glib
-
-g++ -static -Wl,-O1 -o glib glib.o -pthread -L/.../sysroot/usr/lib \
--lintl -lgthread-2.0 -lglib-2.0
-
-/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function '_g_dgettext_should_translate':
-ggettext.c:(.text+0x28): undefined reference to `libintl_textdomain'
-ggettext.c:(.text+0x36): undefined reference to `libintl_gettext'
-/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `ensure_gettext_initialized':
-ggettext.c:(.text+0xe6): undefined reference to `libintl_bindtextdomain'
-ggettext.c:(.text+0xf6): undefined reference to `libintl_bind_textdomain_codeset'
-/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `g_dgettext':
-ggettext.c:(.text+0x148): undefined reference to `libintl_dgettext'
-/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `g_dcgettext':
-ggettext.c:(.text+0x2dc): undefined reference to `libintl_dcgettext'
-/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `g_dngettext':
-ggettext.c:(.text+0x32a): undefined reference to `libintl_dngettext'
-collect2: error: ld returned 1 exit status
-Makefile:99: recipe for target 'glib' failed
-make: *** [glib] Error 1
-
-Glib disabled.
-Glib support cannot be enabled due to functionality tests!
- Turn on verbose messaging (-v) to ./configure to see the final report.
- If you believe this message is in error you may use the continue
- switch (-continue) to ./configure to continue.
--------------------->8------------------
-
-Solution to this problem is simple we have to pass all libraries exactly
-in order of their initial mention by upper layers.
-
-Change-Id: I7ff00901031a8eb85b4fbd7889b0e0c02be806bb
-
-This fix was sent to Qt Gerrit for review here:
-https://codereview.qt-project.org/#/c/145967/
-
----
- config.tests/unix/compile.test | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test
-index f484f03..dac0a4f 100755
---- a/config.tests/unix/compile.test
-+++ b/config.tests/unix/compile.test
-@@ -73,7 +73,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
- rm -f "$EXE" "${EXE}.exe"
- 
- echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache"
--"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
-+"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
- 
- if [ "$VERBOSE" = "yes" ]; then
-     $MAKE
--- 
-2.4.3
-
diff --git a/bsp/buildroot/package/qt/0012-Link-with-ldl-option-only-when-it-is-supported.patch b/bsp/buildroot/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
similarity index 100%
rename from bsp/buildroot/package/qt/0012-Link-with-ldl-option-only-when-it-is-supported.patch
rename to bsp/buildroot/package/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch
diff --git a/bsp/buildroot/package/qt/0013-OpenGL-EGL-Avoid-X11-header-collision.patch b/bsp/buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
similarity index 100%
rename from bsp/buildroot/package/qt/0013-OpenGL-EGL-Avoid-X11-header-collision.patch
rename to bsp/buildroot/package/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch
diff --git a/bsp/buildroot/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch b/bsp/buildroot/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
new file mode 100644
index 00000000..a5995484
--- /dev/null
+++ b/bsp/buildroot/package/qt/0015-configure-fix-build-on-non-x86-platforms.patch
@@ -0,0 +1,146 @@
+From 02e9698c96ca78342b82fa7239e93bab4aa45db2 Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Fri, 17 Nov 2017 22:20:06 +0100
+Subject: [PATCH] configure: fix build on non-x86 platforms
+
+When building for an uncommon platform on a ppc64le machine, Qt build
+fails because it builds qmake with the target compiler instead of
+using the host compiler. This is due to the fact that Qt configure
+script believes that both the host and target platforms are "powerpc",
+even though the target really is Xtensa or ARC for example.
+
+Qt's configure script defines a variable called PLATFORM that points to
+the mkspecs describing the host machine. For x86, its value is
+qws/linux-x86-g++ and for x86-64, its value is
+qws/linux-x86_64-g++. For any other host architecture, its value is
+qws/linux-generic-g++.
+
+In parallel to this, Qt's configure script defines a variable called
+XPLATFORM that points to the mkspecs describing the target machine. It
+points to qws/linux-${CFG_EMBEDDED}-g++, where CFG_EMBEDDED is
+simply "generic" for most uncommon architectures.
+
+Therefore, when we're building for an uncommon architecture, on a
+ppc64le machine, we have:
+
+  PLATFORM = qws/linux-generic-g++
+  XPLATFORM = qws/linux-generic-g++
+
+i.e, both values are equal. Due to this, the following condition is
+false:
+
+if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then
+
+which causes Qt's configure script to fallback to:
+
+elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then
+    CFG_ARCH=$CFG_HOST_ARCH
+fi
+
+because CFG_ARCH is not defined, and therefore gets defined to
+CFG_HOST_ARCH. So we have CFG_ARCH == CFG_HOST_ARCH, and Qt believes
+we're doing a native build.
+
+Therefore, we need to ensure that PLATFORM and XPLATFORM always have a
+different value. To achieve this, we create a
+qws/linux-host-generic-g++ mkspecs, which is always used as
+PLATFORM. It is identical to qws/linux-x86-g++. Compared to
+qws/linux-x86_64-g++, the only difference is that we're not passing
+the -m64 flag, but that isn't needed when building host tools.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure                                          |  8 +----
+ mkspecs/qws/linux-host-generic-g++/qmake.conf      | 10 ++++++
+ mkspecs/qws/linux-host-generic-g++/qplatformdefs.h | 42 ++++++++++++++++++++++
+ 3 files changed, 53 insertions(+), 7 deletions(-)
+ create mode 100644 mkspecs/qws/linux-host-generic-g++/qmake.conf
+ create mode 100644 mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
+
+diff --git a/configure b/configure
+index 10ad7ca0b0..d25f90be1e 100755
+--- a/configure
++++ b/configure
+@@ -2806,14 +2806,8 @@ if [ "$CFG_EMBEDDED" != "no" ]; then
+     Linux:*)
+         if [ -z "$PLATFORM" ]; then
+             case "$UNAME_MACHINE" in
+-            *86)
+-                PLATFORM=qws/linux-x86-g++
+-                ;;
+-            *86_64)
+-                PLATFORM=qws/linux-x86_64-g++
+-                ;;
+             *)
+-                PLATFORM=qws/linux-generic-g++
++                PLATFORM=qws/linux-host-generic-g++
+                 ;;
+             esac
+         fi
+diff --git a/mkspecs/qws/linux-host-generic-g++/qmake.conf b/mkspecs/qws/linux-host-generic-g++/qmake.conf
+new file mode 100644
+index 0000000000..55011ec52b
+--- /dev/null
++++ b/mkspecs/qws/linux-host-generic-g++/qmake.conf
+@@ -0,0 +1,10 @@
++#
++# qmake configuration for building with linux-g++
++#
++
++include(../../common/linux.conf)
++include(../../common/gcc-base-unix.conf)
++include(../../common/g++-unix.conf)
++include(../../common/qws.conf)
++
++load(qt_config)
+diff --git a/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
+new file mode 100644
+index 0000000000..a654aa78a2
+--- /dev/null
++++ b/mkspecs/qws/linux-host-generic-g++/qplatformdefs.h
+@@ -0,0 +1,42 @@
++/****************************************************************************
++**
++** Copyright (C) 2015 The Qt Company Ltd.
++** Contact: http://www.qt.io/licensing/
++**
++** This file is part of the qmake spec of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see http://www.qt.io/terms-conditions. For further
++** information use the contact form at http://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 2.1 or version 3 as published by the Free
++** Software Foundation and appearing in the file LICENSE.LGPLv21 and
++** LICENSE.LGPLv3 included in the packaging of this file. Please review the
++** following information to ensure the GNU Lesser General Public License
++** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
++** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
++**
++** As a special exception, The Qt Company gives you certain additional
++** rights. These rights are described in The Qt Company LGPL Exception
++** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 3.0 as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL included in the
++** packaging of this file.  Please review the following information to
++** ensure the GNU General Public License version 3.0 requirements will be
++** met: http://www.gnu.org/copyleft/gpl.html.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include "../../linux-g++/qplatformdefs.h"
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/qt/Config.gfx.in b/bsp/buildroot/package/qt/Config.gfx.in
index 70adeef2..5e6619c7 100644
--- a/bsp/buildroot/package/qt/Config.gfx.in
+++ b/bsp/buildroot/package/qt/Config.gfx.in
@@ -20,12 +20,12 @@ comment "directfb Qt driver not available (need directfb)"
 	depends on !BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_QT_GFX_DIRECTFB
-	depends on BR2_PACKAGE_DIRECTFB
 	bool "directFB"
+	depends on BR2_PACKAGE_DIRECTFB
 
 config BR2_PACKAGE_QT_GFX_POWERVR
+	bool "powervr"
 	depends on BR2_PACKAGE_QT_OPENGL_ES
 	depends on BR2_PACKAGE_HAS_POWERVR
-	bool "powervr"
 
 endmenu
diff --git a/bsp/buildroot/package/qt/Config.in b/bsp/buildroot/package/qt/Config.in
index fa5235d6..0ecfafad 100644
--- a/bsp/buildroot/package/qt/Config.in
+++ b/bsp/buildroot/package/qt/Config.in
@@ -3,7 +3,7 @@ comment "qt needs a toolchain w/ C++, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 menuconfig BR2_PACKAGE_QT
-	bool "Qt"
+	bool "Qt (obsolete)"
 	depends on BR2_USE_MMU # fork
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -23,8 +23,8 @@ choice
 config BR2_PACKAGE_QT_EMBEDDED
 	bool "Qt embedded"
 	help
-	  The embedded Qt installation targets embedded systems without X.org.
-	  Provides backends for framebuffer.
+	  The embedded Qt installation targets embedded systems
+	  without X.org. Provides backends for framebuffer.
 	  If unsure, say Y.
 
 comment "Qt standard (X11) not available (need X.org)"
@@ -33,7 +33,6 @@ comment "Qt standard (X11) not available (need X.org)"
 config BR2_PACKAGE_QT_X11
 	bool "Qt standard (X11)"
 	depends on BR2_PACKAGE_XORG7
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_XLIB_LIBXI
 	select BR2_PACKAGE_XLIB_LIBX11
@@ -45,8 +44,8 @@ config BR2_PACKAGE_QT_X11
 	select BR2_PACKAGE_QT_SYSTEMFREETYPE
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
-	  The standard Qt installation provides X.org backend. If you don't want to
-	  use X.org, say N.
+	  The standard Qt installation provides X.org backend. If you
+	  don't want to use X.org, say N.
 
 endchoice
 
@@ -57,7 +56,6 @@ config BR2_PACKAGE_QT_DEBUG
 
 config BR2_PACKAGE_QT_DEMOS
 	bool "Compile and install Qt demos (with code)"
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  If unsure, say N.
@@ -71,7 +69,6 @@ config BR2_PACKAGE_QT_TRANSLATION_FILES
 
 config BR2_PACKAGE_QT_EXAMPLES
 	bool "Compile and install Qt examples (with code)"
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module
 	select BR2_PACKAGE_QT_GUI_MODULE
 	help
 	  If unsure, say N.
@@ -86,30 +83,20 @@ config BR2_PACKAGE_QT_SHARED
 	depends on !BR2_STATIC_LIBS
 	help
 	  Create and use shared Qt libraries.
-	  If you have multiple programs that depend on Qt or intend to use
-	  plugins, say Y.
+	  If you have multiple programs that depend on Qt or intend to
+	  use plugins, say Y.
 
 config BR2_PACKAGE_QT_STATIC
 	bool "Static Library"
 	help
 	  Create and use static Qt libraries.
-	  If you don't have multiple programs on the target that depends on
-	  Qt, then this will save you quite some of storage space.
+	  If you don't have multiple programs on the target that
+	  depends on Qt, then this will save you quite some of storage
+	  space.
 	  If unsure, say Y.
 
 endchoice
 
-config BR2_PACKAGE_QT_LICENSE_APPROVED
-	bool "Approve free license"
-	help
-	  Select this if you approve one of the available free licenses for the
-	  Qt4 library.
-	  By doing this you will not be asked while the library is compiled.
-	  Please read and understand the license terms before approving this.
-
-	  LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html
-	  GPL  v3.0: http://doc.trolltech.com/4.5/gpl.html
-
 config BR2_PACKAGE_QT_CONFIG_FILE
 	string "Config file"
 	help
@@ -128,21 +115,17 @@ config BR2_PACKAGE_QT_QT3SUPPORT
 	depends on BR2_PACKAGE_QT_GUI_MODULE
 	select BR2_PACKAGE_QT_SQL_MODULE
 	help
-	  Turns on support for older Qt3. This will create an additional
-	  library with proxy code and increase the space required on target.
-	  If unsure say n.
+	  Turns on support for older Qt3. This will create an
+	  additional library with proxy code and increase the space
+	  required on target.  If unsure say n.
 
 config BR2_PACKAGE_QT_GUI_MODULE
 	bool "Gui Module"
-	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # nios2 Binutils 2.25.1 bug
-	select BR2_PACKAGE_QT_NETWORK
 	default y
+	select BR2_PACKAGE_QT_NETWORK
 	help
-	  Turns on support for Gui applications. If your board doesn't have
-	  video output, or you don't require Qt GUI, say n.
-
-comment "Qt Gui Module needs a toolchain not affected by Binutils bug 19405"
-	depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
+	  Turns on support for Gui applications. If your board doesn't
+	  have video output, or you don't require Qt GUI, say n.
 
 if BR2_PACKAGE_QT_GUI_MODULE
 
@@ -185,6 +168,14 @@ endmenu
 
 menu "Fonts"
 
+config BR2_PACKAGE_QT_FONT_TRUETYPE
+	bool "dejavu/vera"
+	default y
+	depends on BR2_PACKAGE_QT_QTFREETYPE || BR2_PACKAGE_QT_SYSTEMFREETYPE
+
+comment "dejavu/vera fonts need freetype support"
+	depends on !BR2_PACKAGE_QT_QTFREETYPE && !BR2_PACKAGE_QT_SYSTEMFREETYPE
+
 config BR2_PACKAGE_QT_FONT_MICRO
 	bool "micro"
 	default y
@@ -258,8 +249,8 @@ config BR2_PACKAGE_QT_NOJPEG
 	  Disable JPEG support
 
 config BR2_PACKAGE_QT_SYSTEMJPEG
-	select BR2_PACKAGE_JPEG
 	bool "System libjpeg"
+	select BR2_PACKAGE_JPEG
 	help
 	  Link against system libjpeg
 
@@ -338,9 +329,9 @@ endif
 
 config BR2_PACKAGE_QT_PHONON
 	bool "Phonon Module"
+	default y
 	depends on BR2_PACKAGE_GSTREAMER
 	select BR2_PACKAGE_GST_PLUGINS_BASE
-	default y
 	help
 	  Build the Phonon module. Support for different audio/video
 	  formats can be configured at the GStreamer package.
@@ -358,9 +349,9 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 
 config BR2_PACKAGE_QT_OPENGL
 	bool "OpenGL support"
+	default y
 	depends on (BR2_PACKAGE_HAS_LIBGL && BR2_PACKAGE_QT_X11) || \
 		   (BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES)
-	default y
 	help
 	  This option enables OpenGL support.
 
@@ -396,9 +387,9 @@ endif
 
 config BR2_PACKAGE_QT_DBUS
 	bool "DBus Module"
-	select BR2_PACKAGE_DBUS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
+	select BR2_PACKAGE_DBUS
 	help
 	  Build the Qt DBus module.
 
@@ -428,8 +419,8 @@ config BR2_PACKAGE_QT_MULTIMEDIA
 config BR2_PACKAGE_QT_AUDIO_BACKEND
 	bool "QtMultimedia Audio backend"
 	depends on BR2_PACKAGE_QT_MULTIMEDIA
-	select BR2_PACKAGE_ALSA_LIB
 	depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib
+	select BR2_PACKAGE_ALSA_LIB
 	help
 	  Build the ALSA audio backend into QtMultimedia
 
@@ -449,17 +440,14 @@ config BR2_PACKAGE_QT_NETWORK
 
 config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT
 	bool
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	# see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
 	# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
 	default y if BR2_arc || BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \
 		BR2_microblazebe || BR2_mips || BR2_mipsel || \
 		(BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \
-		BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64
-	# The CodeSourcery SuperH toolchain fails to build Webkit,
-	# with an assertion failure in binutils.
-	default y if (BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb) && \
-		!BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
+		BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || \
+		BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 
 config BR2_PACKAGE_QT_WEBKIT
 	bool "WebKit Module"
@@ -505,19 +493,19 @@ config BR2_PACKAGE_QT_OPENSSL
 
 config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
 	bool
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	# see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html
 	default y if BR2_arc || BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \
 		BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \
 		BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \
 		BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \
 		BR2_sh4a || BR2_sh4aeb || BR2_x86_64
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 
 config BR2_PACKAGE_QT_SCRIPT
 	bool "Script Module"
+	default y
 	depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np()
-	default y
 	help
 	  Build the Qt Script module.
 	  if unsure, say y.
diff --git a/bsp/buildroot/package/qt/Config.mouse.in b/bsp/buildroot/package/qt/Config.mouse.in
index 11da956f..1062facb 100644
--- a/bsp/buildroot/package/qt/Config.mouse.in
+++ b/bsp/buildroot/package/qt/Config.mouse.in
@@ -12,10 +12,6 @@ config BR2_PACKAGE_QT_MOUSE_LINUXINPUT
 config BR2_PACKAGE_QT_MOUSE_TSLIB
 	bool "tslib"
 	select BR2_PACKAGE_TSLIB
-	depends on !BR2_STATIC_LIBS # tslib
-
-comment "tslib support needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
 
 config BR2_PACKAGE_QT_MOUSE_QVFB
 	bool "qvfb"
diff --git a/bsp/buildroot/package/qt/Config.sql.in b/bsp/buildroot/package/qt/Config.sql.in
index 452edd51..6d39bb97 100644
--- a/bsp/buildroot/package/qt/Config.sql.in
+++ b/bsp/buildroot/package/qt/Config.sql.in
@@ -6,21 +6,14 @@ menuconfig BR2_PACKAGE_QT_SQL_MODULE
 if BR2_PACKAGE_QT_SQL_MODULE
 config BR2_PACKAGE_QT_MYSQL
 	bool "MySQL Driver"
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
-	depends on BR2_USE_MMU # mysql
 	help
 	  Build MySQL driver
 	  If unsure, say n.
 
-config BR2_PACKAGE_QT_IBASE
-	bool "iBase Driver"
-	depends on BROKEN # libfbclient not in BR
-	help
-	  Build iBase driver
-	  If unsure, say n.
-
 config BR2_PACKAGE_QT_ODBC
 	bool "ODBC Driver"
 	select BR2_PACKAGE_UNIXODBC
@@ -30,8 +23,8 @@ config BR2_PACKAGE_QT_ODBC
 
 config BR2_PACKAGE_QT_PSQL
 	bool "PostgreSQL Driver"
-	select BR2_PACKAGE_POSTGRESQL
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_POSTGRESQL
 	help
 	  Build PostgreSQL driver
 	  If unsure, say n.
diff --git a/bsp/buildroot/package/qt/qt.mk b/bsp/buildroot/package/qt/qt.mk
index 8809b0c7..921ff13d 100644
--- a/bsp/buildroot/package/qt/qt.mk
+++ b/bsp/buildroot/package/qt/qt.mk
@@ -1,13 +1,6 @@
 ################################################################################
 #
-# Qt Embedded for Linux
-#
-# This makefile was originally composed by Thomas Lundquist <thomasez@zelow.no>
-# Later heavily modified by buildroot developers
-#
-# BTW, this uses alot of FPU calls and it's pretty slow if you use
-# the kernels FPU emulation so it's better to choose soft float in the
-# buildroot config (and uClibc.config of course, if you have your own.)
+# qt
 #
 ################################################################################
 
@@ -18,15 +11,11 @@ QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 
-QT_LICENSE := LGPLv2.1 with exceptions or GPLv3
-ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
-QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license
-endif
+QT_LICENSE := LGPL-2.1 with exceptions or GPL-3.0
 QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
 
-ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
+# Opensource licenses are the only one we catter about
 QT_CONFIGURE_OPTS += -opensource -confirm-license
-endif
 
 QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
 
@@ -43,6 +32,15 @@ QT_LDFLAGS = $(TARGET_LDFLAGS)
 # use an older c++ standard to prevent build failure
 QT_CXXFLAGS += -std=gnu++98
 
+# gcc bug internal compiler error: in validate_condition_mode, at
+# config/rs6000/rs6000.c:180744. Bug is fixed since gcc 7.
+# Workaround is to set -mno-isel, see
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60818 and
+# https://gcc.gnu.org/ml/gcc-patches/2016-02/msg01036.html
+ifeq ($(BR2_powerpc_8540)$(BR2_powerpc_8548)$(BR2_powerpc_e500mc)$(BR2_powerpc_e5500):$(BR2_TOOLCHAIN_GCC_AT_LEAST_7),y:)
+QT_CXXFLAGS += -mno-isel
+endif
+
 # Qt has some assembly function that are not present in thumb1 mode:
 # Error: selected processor does not support Thumb mode `swp r3,r7,[r4]'
 # so, we desactivate thumb mode
@@ -76,7 +74,6 @@ else
 QT_CONFIGURE_OPTS += -no-glib
 endif
 
-
 ### Pixel depths
 QT_PIXEL_DEPTHS = # empty
 ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
@@ -356,9 +353,6 @@ endif
 
 # Qt SQL Drivers
 ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
-ifeq ($(BR2_PACKAGE_QT_IBASE),y)
-QT_CONFIGURE_OPTS += -qt-sql-ibase
-endif
 ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
 QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
 QT_DEPENDENCIES += mysql
@@ -476,7 +470,7 @@ endif
 # End of workaround.
 
 # Variable for other Qt applications to use
-QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
+QT_QMAKE = $(HOST_DIR)/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
 
 ################################################################################
 # QT_QMAKE_SET -- helper macro to set <variable> = <value> in
@@ -517,7 +511,7 @@ define QT_CONFIGURE_CMDS
 	$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
 	$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
 	$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D))
-	$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D))
+	$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/bin/pkg-config,$(@D))
 # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
 # instead of the host then. So set PKG_CONFIG* manually.
 	(cd $(@D); \
@@ -547,7 +541,6 @@ define QT_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
-
 # Build the list of libraries and plugins to install to the target
 
 QT_INSTALL_LIBS += QtCore
@@ -606,7 +599,7 @@ ifeq ($(BR2_PACKAGE_QT_TEST),y)
 QT_INSTALL_LIBS += QtTest
 endif
 
-QT_CONF_FILE = $(HOST_DIR)/usr/bin/qt.conf
+QT_CONF_FILE = $(HOST_DIR)/bin/qt.conf
 
 # Since host programs and spec files have been moved to $(HOST_DIR),
 # we need to tell qmake the new location of the various elements,
@@ -614,11 +607,11 @@ QT_CONF_FILE = $(HOST_DIR)/usr/bin/qt.conf
 define QT_INSTALL_QT_CONF
 	mkdir -p $(dir $(QT_CONF_FILE))
 	echo "[Paths]"                             > $(QT_CONF_FILE)
-	echo "Prefix=$(HOST_DIR)/usr"             >> $(QT_CONF_FILE)
+	echo "Prefix=$(HOST_DIR)"                 >> $(QT_CONF_FILE)
 	echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE)
 	echo "Libraries=$(STAGING_DIR)/usr/lib"   >> $(QT_CONF_FILE)
-	echo "Data=$(HOST_DIR)/usr"               >> $(QT_CONF_FILE)
-	echo "Binaries=$(HOST_DIR)/usr/bin"       >> $(QT_CONF_FILE)
+	echo "Data=$(HOST_DIR)"                   >> $(QT_CONF_FILE)
+	echo "Binaries=$(HOST_DIR)/bin"           >> $(QT_CONF_FILE)
 endef
 
 # After running Qt normal installation process (which installs
@@ -630,12 +623,12 @@ endef
 # automatically.
 define QT_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
-	mkdir -p $(HOST_DIR)/usr/bin
-	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
-	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
+	mkdir -p $(HOST_DIR)/bin
+	mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/bin
+	ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/mkspecs
 	$(QT_INSTALL_QT_CONF)
 	for i in moc uic rcc lupdate lrelease ; do \
-		$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/usr/bin/$${i}," \
+		$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/bin/$${i}," \
 			$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \
 	done
 	$(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
@@ -689,7 +682,7 @@ QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont
 endif
 endif # QT_FONTS
 
-ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
+ifeq ($(BR2_PACKAGE_QT_FONT_TRUETYPE),y)
 define QT_INSTALL_TARGET_FONTS_TTF
 	mkdir -p $(TARGET_DIR)/usr/lib/fonts
 	cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
diff --git a/bsp/buildroot/package/qt5/Config.in b/bsp/buildroot/package/qt5/Config.in
index 4bcbc6ef..a9ee44c1 100644
--- a/bsp/buildroot/package/qt5/Config.in
+++ b/bsp/buildroot/package/qt5/Config.in
@@ -1,15 +1,15 @@
 config BR2_PACKAGE_QT5_GL_AVAILABLE
 	bool
-	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
 	default y
+	depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES
 
 config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	bool
+	default y
 	# Javascript engine is only available on certain architectures
-	depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
+	depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel
 	# ARM needs BLX, so v5t+
 	depends on !BR2_ARM_CPU_ARMV4
-	default y
 
 comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library"
 	depends on !BR2_PACKAGE_QT
@@ -35,15 +35,15 @@ choice
 	prompt "Qt5 version"
 
 config BR2_PACKAGE_QT5_VERSION_LATEST
-	bool "Latest (5.8)"
+	bool "Latest (5.9)"
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
 	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 	# no built-in double-conversion support
 	depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa
 	help
-	  This option builds Qt 5.8, which is licensed under
-	  (L)GPLv3+.
+	  This option builds Qt 5.9, which is licensed under
+	  (L)GPL-3.0+.
 
 comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8"
 	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8
@@ -54,13 +54,14 @@ config BR2_PACKAGE_QT5_VERSION_5_6
 	bool "LTS (5.6)"
 	help
 	  This option builds Qt 5.6, which is licensed under
-	  (L)GPLv2+.
+	  (L)GPL-2.0+.
 
 endchoice
 
 source "package/qt5/qt53d/Config.in"
 source "package/qt5/qt5base/Config.in"
 source "package/qt5/qt5canvas3d/Config.in"
+source "package/qt5/qt5charts/Config.in"
 source "package/qt5/qt5connectivity/Config.in"
 source "package/qt5/qt5declarative/Config.in"
 source "package/qt5/qt5enginio/Config.in"
@@ -71,13 +72,18 @@ source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
 source "package/qt5/qt5quickcontrols2/Config.in"
 source "package/qt5/qt5script/Config.in"
+source "package/qt5/qt5scxml/Config.in"
 source "package/qt5/qt5sensors/Config.in"
 source "package/qt5/qt5serialbus/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5tools/Config.in"
+source "package/qt5/qt5virtualkeyboard/Config.in"
+source "package/qt5/qt5wayland/Config.in"
 source "package/qt5/qt5webchannel/Config.in"
 source "package/qt5/qt5webkit/Config.in"
+source "package/qt5/qt5webkit-examples/Config.in"
+source "package/qt5/qt5webengine/Config.in"
 source "package/qt5/qt5websockets/Config.in"
 source "package/qt5/qt5x11extras/Config.in"
 source "package/qt5/qt5xmlpatterns/Config.in"
diff --git a/bsp/buildroot/package/qt5/qt5.mk b/bsp/buildroot/package/qt5/qt5.mk
index 5ba5e8f0..84b7a4a4 100644
--- a/bsp/buildroot/package/qt5/qt5.mk
+++ b/bsp/buildroot/package/qt5/qt5.mk
@@ -1,14 +1,17 @@
+################################################################################
+#
+# qt5
+#
+################################################################################
+
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5_VERSION_MAJOR = 5.8
-QT5_VERSION = $(QT5_VERSION_MAJOR).0
-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
-QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
+QT5_VERSION_MAJOR = 5.9
+QT5_VERSION = $(QT5_VERSION_MAJOR).6
 else
 QT5_VERSION_MAJOR = 5.6
 QT5_VERSION = $(QT5_VERSION_MAJOR).3
-QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
-QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules
 endif
+QT5_SITE = https://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules
 
 include $(sort $(wildcard package/qt5/*/*.mk))
 
@@ -28,4 +31,4 @@ define QT5_LA_PRL_FILES_FIXUP
 endef
 
 # Variable for other Qt applications to use
-QT5_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec devices/linux-buildroot-g++
+QT5_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++
diff --git a/bsp/buildroot/package/qt5/qt53d/Config.in b/bsp/buildroot/package/qt5/qt53d/Config.in
index 27f27a80..78602a72 100644
--- a/bsp/buildroot/package/qt5/qt53d/Config.in
+++ b/bsp/buildroot/package/qt5/qt53d/Config.in
@@ -1,22 +1,22 @@
 config BR2_PACKAGE_QT53D
 	bool "qt53d"
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
 
 	  This package corresponds to the qt53d module.
 
-
 	  This module was in tech preview in Qt 5.6, and promoted
 	  to a core module in Qt 5.7.0.
 
-	  Enable the assimp package to gain the assimp sceneparser plugin.
+	  Enable the assimp package to gain the assimp sceneparser
+	  plugin.
 
 	  http://doc.qt.io/qt-5/qt3d-index.html
 
diff --git a/bsp/buildroot/package/qt5/qt53d/qt53d.hash b/bsp/buildroot/package/qt5/qt53d/qt53d.hash
index e342c126..dfa595dc 100644
--- a/bsp/buildroot/package/qt5/qt53d/qt53d.hash
+++ b/bsp/buildroot/package/qt5/qt53d/qt53d.hash
@@ -1,5 +1,10 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qt3d-opensource-src-5.8.0.tar.xz
-sha256 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5  qt3d-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qt3d-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 c89cbc12fde5a279e5b127651a194cae75003ba8113f9e7e7b24e67495ecff09  qt3d-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt53d/qt53d.mk b/bsp/buildroot/package/qt5/qt53d/qt53d.mk
index 4598da56..557f643a 100644
--- a/bsp/buildroot/package/qt5/qt53d/qt53d.mk
+++ b/bsp/buildroot/package/qt5/qt53d/qt53d.mk
@@ -14,16 +14,11 @@ ifeq ($(BR2_PACKAGE_ASSIMP),y)
 QT53D_DEPENDENCIES += assimp
 endif
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT53D_LICENSE = GPLv2 or GPLv3 or LGPLv3
+QT53D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
 QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3
-else
-QT53D_LICENSE = Commercial license
-QT53D_REDISTRIBUTE = NO
-endif
 
 define QT53D_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT53D_BUILD_CMDS
@@ -35,11 +30,27 @@ define QT53D_INSTALL_STAGING_CMDS
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+define QT53D_INSTALL_TARGET_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qt3d $(TARGET_DIR)/usr/lib/qt/examples/
+endef
+endif
+
 ifeq ($(BR2_STATIC_LIBS),)
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+# Available since 5.9
+define QT53D_INSTALL_TARGET_LATEST
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geometryloaders $(TARGET_DIR)/usr/lib/qt/plugins
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/renderplugins $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
 define QT53D_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib
 	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick $(TARGET_DIR)/usr/qml
+	$(QT53D_INSTALL_TARGET_LATEST)
+	$(QT53D_INSTALL_TARGET_EXAMPLES)
 endef
 endif
 
diff --git a/bsp/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash b/bsp/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash
new file mode 100644
index 00000000..f113f82c
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5base/5.6.3/qt5base.hash
@@ -0,0 +1,7 @@
+# Hashes for license files:
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 1d05f2662f0be7544c4cc238d0957d1ed5d0edc45210e9108f905df354241a0e header.BSD
diff --git a/bsp/buildroot/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch b/bsp/buildroot/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch
deleted file mode 100644
index 8548ef0e..00000000
--- a/bsp/buildroot/package/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 74af93f5298b54bc2327843f390bf202776f2f48 Mon Sep 17 00:00:00 2001
-From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-Date: Tue, 10 Jan 2017 14:18:02 +0100
-Subject: [PATCH] fix parallel builds with -qt-freetype -system-libpng
-
-freetype has no dependency on gui, so it needs to pull in gui's
-configuration manually, as that's where the system libpng is found.
-
-Task-number: QTBUG-58038
-Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9
-Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-Reviewed-by: Joni Poikelin <joni.poikelin@qt.io>
-
-Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/3rdparty/freetype/freetype.pro | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro
-index 5b1eb92e..390a6da7 100644
---- a/src/3rdparty/freetype/freetype.pro
-+++ b/src/3rdparty/freetype/freetype.pro
-@@ -69,6 +69,7 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB
- include(../zlib_dependency.pri)
- 
- DEFINES += FT_CONFIG_OPTION_USE_PNG
-+include($$OUT_PWD/../../gui/qtgui-config.pri)
- QMAKE_USE_PRIVATE += libpng
- 
- DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch b/bsp/buildroot/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch
deleted file mode 100644
index e7d7ee36..00000000
--- a/bsp/buildroot/package/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001
-From: Shawn Rutledge <shawn.rutledge@digia.com>
-Date: Fri, 10 Feb 2017 13:56:58 +0100
-Subject: [PATCH] fix VNC platform plugin build on big-endian machines
-
-Task-number: QTBUG-58734
-Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e
-Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
-
-Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/plugins/platforms/vnc/qvncclient.cpp | 6 +++---
- src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++-
- src/plugins/platforms/vnc/qvncscreen.h   | 2 +-
- 3 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp
-index dae3e83f..58dcfc9b 100644
---- a/src/plugins/platforms/vnc/qvncclient.cpp
-+++ b/src/plugins/platforms/vnc/qvncclient.cpp
-@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const
-         case 16: {
-             quint16 p = *reinterpret_cast<const quint16*>(src);
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--            if (swapBytes)
-+            if (m_swapBytes)
-                 p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8);
- #endif
-             r = (p >> 11) & 0x1f;
-@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat()
-         m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian;
-         m_needConversion = pixelConversionNeeded();
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--        m_swapBytes = qvnc_screen->swapBytes();
-+        m_swapBytes = server()->screen()->swapBytes();
- #endif
-     }
- }
-@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const
-         return true;
- 
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--    if (qvnc_screen->swapBytes())
-+    if (server()->screen()->swapBytes())
-         return true;
- #endif
- 
-diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp
-index 34def457..64f1bc0b 100644
---- a/src/plugins/platforms/vnc/qvncscreen.cpp
-+++ b/src/plugins/platforms/vnc/qvncscreen.cpp
-@@ -43,6 +43,7 @@
- #include <QtFbSupport/private/qfbcursor_p.h>
- 
- #include <QtGui/QPainter>
-+#include <QtGui/QScreen>
- #include <QtCore/QRegularExpression>
- 
- 
-@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con
- }
- 
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--bool QVNCScreen::swapBytes() const
-+bool QVncScreen::swapBytes() const
- {
-+    return false;
-+
-+    /* TODO
-     if (depth() != 16)
-         return false;
- 
-     if (screen())
-         return screen()->frameBufferLittleEndian();
-     return frameBufferLittleEndian();
-+    */
- }
- #endif
- 
-diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h
-index 785abd6d..0b42c3c7 100644
---- a/src/plugins/platforms/vnc/qvncscreen.h
-+++ b/src/plugins/platforms/vnc/qvncscreen.h
-@@ -73,7 +73,7 @@ public:
-     void clearDirty() { dirtyRegion = QRegion(); }
- 
- #if Q_BYTE_ORDER == Q_BIG_ENDIAN
--    bool swapBytes() const
-+    bool swapBytes() const;
- #endif
- 
-     QStringList mArgs;
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch b/bsp/buildroot/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch
deleted file mode 100644
index 3a43584e..00000000
--- a/bsp/buildroot/package/qt5/qt5base/5.8.0/0003-QAtomic-pass-explicit-failure-mode-to-std-atomic-com.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From c5d7425f8ad391112758db161e3e08f18dc9d299 Mon Sep 17 00:00:00 2001
-From: Marc Mutz <marc.mutz@kdab.com>
-Date: Thu, 26 May 2016 08:30:26 +0200
-Subject: [PATCH] QAtomic: pass explicit failure mode to
- std::atomic::compare_exchange_strong
-
-... in an attempt to avoid GCC 4.8 errors such as
-
-  bits/atomic_base.h:577:70: error: failure memory model cannot be stronger than success memory model for '__atomic_compare_exchange'
-  return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
-                                                                      ^
-
-as seen on Android.
-
-Change-Id: If046e735888cf331d2d6506d8d5ca9aa7402f9ad
-[Bug report: https://bugreports.qt.io/browse/QTBUG-59399
- Patch sent upstream: https://codereview.qt-project.org/#/c/187980/]
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.org>
----
- src/corelib/arch/qatomic_cxx11.h |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h
-index bb49aae..d6731ec 100644
---- a/src/corelib/arch/qatomic_cxx11.h
-+++ b/src/corelib/arch/qatomic_cxx11.h
-@@ -153,7 +153,7 @@ template <typename X> struct QAtomicOps
-     template <typename T>
-     static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-     {
--        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed);
-+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed);
-         if (currentValue)
-             *currentValue = expectedValue;
-         return tmp;
-@@ -162,7 +162,7 @@ template <typename X> struct QAtomicOps
-     template <typename T>
-     static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-     {
--        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire);
-+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire);
-         if (currentValue)
-             *currentValue = expectedValue;
-         return tmp;
-@@ -171,7 +171,7 @@ template <typename X> struct QAtomicOps
-     template <typename T>
-     static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-     {
--        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release);
-+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed);
-         if (currentValue)
-             *currentValue = expectedValue;
-         return tmp;
-@@ -180,7 +180,7 @@ template <typename X> struct QAtomicOps
-     template <typename T>
-     static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = Q_NULLPTR) Q_DECL_NOTHROW
-     {
--        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel);
-+        bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire);
-         if (currentValue)
-             *currentValue = expectedValue;
-         return tmp;
--- 
-1.7.10.4
-
diff --git a/bsp/buildroot/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch b/bsp/buildroot/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch
deleted file mode 100644
index 0e8bcffa..00000000
--- a/bsp/buildroot/package/qt5/qt5base/5.8.0/0003-eglfs-fix-x11-header-related-compile-failure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 8902f4d7b7c532592d1a34ad117698d3e380e9e1 Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Fri, 10 Mar 2017 22:23:06 +0100
-Subject: [PATCH] eglfs: fix x11 header related compile failure
-
-Add egl config and QT_EGL_NO_X11 define (as all other eglfs project
-files do).
-
-Task-number: QTBUG-59427
-Change-Id: Ifbb11eae0fdf0e58c0b7feecb9a7914a889c8f77
-
-Upstream: https://codereview.qt-project.org/188158
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- src/plugins/platforms/eglfs/eglfs-plugin.pro | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-index cf4863975a..ec229796e5 100644
---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro
-+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro
-@@ -2,6 +2,11 @@ TARGET = qeglfs
- 
- QT += eglfsdeviceintegration-private
- 
-+CONFIG += egl
-+
-+# Avoid X11 header collision, use generic EGL native types
-+DEFINES += QT_EGL_NO_X11
-+
- SOURCES += $$PWD/qeglfsmain.cpp
- 
- OTHER_FILES += $$PWD/eglfs.json
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch b/bsp/buildroot/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch
deleted file mode 100644
index 148ced80..00000000
--- a/bsp/buildroot/package/qt5/qt5base/5.8.0/0004-examples-fix-compile-without-gui-module.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fe8a9bacf781fcf290e04a08f2b8e37d881d58bb Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Thu, 27 Apr 2017 22:41:28 +0200
-Subject: [PATCH] examples: fix compile without gui module
-
-Fixes:
-
-  Project ERROR: Could not find feature opengl.
-
-Signed-off-by: Peter Seiderer <ps.report@gmx.net>
----
- examples/gui/gui.pro         | 2 +-
- examples/widgets/widgets.pro | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro
-index a4d960d3f5..b8080c2075 100644
---- a/examples/gui/gui.pro
-+++ b/examples/gui/gui.pro
-@@ -6,5 +6,5 @@ CONFIG += no_docs_target
- 
- SUBDIRS += analogclock
- SUBDIRS += rasterwindow
--qtConfig(opengl): \
-+qtHaveModule(gui):qtConfig(opengl): \
-     SUBDIRS += openglwindow
-diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro
-index 513ddc91f2..cef4936d32 100644
---- a/examples/widgets/widgets.pro
-+++ b/examples/widgets/widgets.pro
-@@ -22,7 +22,7 @@ SUBDIRS       = \
-                 tutorials \
-                 widgets
- 
--qtConfig(opengl): \
-+qtHaveModule(gui):qtConfig(opengl): \
-     SUBDIRS += windowcontainer
- 
- contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch b/bsp/buildroot/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch
deleted file mode 100644
index 92d93a80..00000000
--- a/bsp/buildroot/package/qt5/qt5base/5.8.0/0005-Fix-error-attribute-target-crc-is-unknown.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f0c02fb22bc277e2015a18e562b551ec7b3eed9e Mon Sep 17 00:00:00 2001
-From: Peter Seiderer <ps.report@gmx.net>
-Date: Sun, 16 Jul 2017 00:05:44 +0200
-Subject: [PATCH] Fix error attribute(target("+crc")) is unknown
-
-Task-number: QTBUG-61975
-Change-Id: I0b1b55c0737dad485b5ace8e6eb7cb842589453d
----
- src/corelib/tools/qhash.cpp | 2 ++
- src/corelib/tools/qsimd_p.h | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
-index 1f9c05c..bbf6efb 100644
---- a/src/corelib/tools/qhash.cpp
-+++ b/src/corelib/tools/qhash.cpp
-@@ -144,7 +144,9 @@ static inline bool hasFastCrc32()
- }
- 
- template <typename Char>
-+#if defined(__aarch64__)
- QT_FUNCTION_TARGET(CRC32)
-+#endif
- static uint crc32(const Char *ptr, size_t len, uint h)
- {
-     // The crc32[whbd] instructions on Aarch64/Aarch32 calculate a 32-bit CRC32 checksum
-diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
-index 023a4b0..a85d572 100644
---- a/src/corelib/tools/qsimd_p.h
-+++ b/src/corelib/tools/qsimd_p.h
-@@ -326,7 +326,10 @@
- #endif
- // AArch64/ARM64
- #if defined(Q_PROCESSOR_ARM_V8) && defined(__ARM_FEATURE_CRC32)
-+#if defined(__aarch64__)
-+// only available on aarch64
- #define QT_FUNCTION_TARGET_STRING_CRC32      "+crc"
-+#endif
- #  include <arm_acle.h>
- #endif
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/qt5/qt5base/Config.in b/bsp/buildroot/package/qt5/qt5base/Config.in
index 337dcf24..b5755e2b 100644
--- a/bsp/buildroot/package/qt5/qt5base/Config.in
+++ b/bsp/buildroot/package/qt5/qt5base/Config.in
@@ -1,9 +1,11 @@
 config BR2_PACKAGE_QT5BASE
 	bool "qt5base"
 	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_PCRE
-	select BR2_PACKAGE_PCRE_16
-	select BR2_PACKAGE_PCRE_UTF
+	select BR2_PACKAGE_PCRE if BR2_PACKAGE_QT5_VERSION_5_6
+	select BR2_PACKAGE_PCRE_16 if BR2_PACKAGE_QT5_VERSION_5_6
+	select BR2_PACKAGE_PCRE_UTF if BR2_PACKAGE_QT5_VERSION_5_6
+	select BR2_PACKAGE_PCRE2 if BR2_PACKAGE_QT5_VERSION_LATEST
+	select BR2_PACKAGE_PCRE2_16 if BR2_PACKAGE_QT5_VERSION_LATEST
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -27,18 +29,6 @@ config BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS
 	  E.g. to remove the Windows Vista style option, add the option
 	  -no-feature-style_windowsvista.
 
-config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED
-	bool "Approve free license"
-	help
-	  Select this if you approve one of the available free licenses for the
-	  Qt5 library.
-	  By doing this you will not be asked while the library is compiled.
-	  Please read and understand the license terms before approving this.
-
-	  LGPL: http://doc.qt.io/qt-5/lgpl.html
-
-	  See also http://doc.qt.io/qt-5/licensing.html
-
 config BR2_PACKAGE_QT5BASE_CONFIG_FILE
 	string "Config file"
 	help
@@ -73,19 +63,19 @@ config BR2_PACKAGE_QT5BASE_SQL
 if BR2_PACKAGE_QT5BASE_SQL
 config BR2_PACKAGE_QT5BASE_MYSQL
 	bool "MySQL Plugin"
+	depends on BR2_USE_MMU # mysql
 	select BR2_PACKAGE_MYSQL
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
-	depends on BR2_USE_MMU # mysql
 	help
 	  Build MySQL plugin
 	  If unsure, say n.
 
 config BR2_PACKAGE_QT5BASE_PSQL
 	bool "PostgreSQL Plugin"
-	select BR2_PACKAGE_POSTGRESQL
 	depends on BR2_USE_MMU # postgresql
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_POSTGRESQL
 	help
 	  Build PostgreSQL plugin
 	  If unsure, say n.
@@ -180,8 +170,9 @@ config BR2_PACKAGE_QT5BASE_OPENGL_LIB
 	bool "opengl module"
 	select BR2_PACKAGE_QT5BASE_WIDGETS
 	help
-	  This option enables the Qt5OpenGL library. This library includes
-	  OpenGL support classes provided to ease porting from Qt 4.x.
+	  This option enables the Qt5OpenGL library. This library
+	  includes OpenGL support classes provided to ease porting
+	  from Qt 4.x.
 
 endif
 
@@ -210,9 +201,9 @@ comment "X.org XCB backend available if X.org is enabled"
 
 config BR2_PACKAGE_QT5BASE_EGLFS
 	bool "eglfs support"
-	select BR2_PACKAGE_QT5BASE_OPENGL
 	depends on BR2_PACKAGE_HAS_LIBEGL
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+	select BR2_PACKAGE_QT5BASE_OPENGL
 
 comment "eglfs backend available if OpenGL and EGL are enabled"
 	depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT5_GL_AVAILABLE
@@ -221,12 +212,14 @@ config BR2_PACKAGE_QT5BASE_DEFAULT_QPA
 	string "Default graphical platform"
 	help
 	  Choose the default platform abstraction to use for graphical
-	  applications (e.g xcb, linuxfb, eglfs, ...). If this is empty, the
-	  default for your architecture will be used (usually this is eglfs).
+	  applications (e.g xcb, linuxfb, eglfs, ...). If this is
+	  empty, the default for your architecture will be used
+	  (usually this is eglfs).
 
-	  You can get a list of supported platforms by running a Qt application
-	  with the option "-platform help" on your target. You can choose a
-	  different platform at runtime with the -platform option.
+	  You can get a list of supported platforms by running a Qt
+	  application with the option "-platform help" on your
+	  target. You can choose a different platform at runtime with
+	  the -platform option.
 
 config BR2_PACKAGE_QT5BASE_PRINTSUPPORT
 	depends on BR2_PACKAGE_QT5BASE_WIDGETS
@@ -239,6 +232,14 @@ config BR2_PACKAGE_QT5BASE_FONTCONFIG
 	  This option enables Fontconfig and Freetype support using
 	  the system fontconfig and freetype2 libraries.
 
+config BR2_PACKAGE_QT5BASE_HARFBUZZ
+	bool "harfbuzz support"
+	select BR2_PACKAGE_HARFBUZZ if BR2_TOOLCHAIN_HAS_SYNC_4
+	help
+	  This option enables HarfBuzz support (either system harfbuzz
+	  if the toolchain supports __sync for 4 bytes, or the qt
+	  provided one which avoids this dependency by using QAtomic).
+
 config BR2_PACKAGE_QT5BASE_GIF
 	bool "GIF support"
 	help
@@ -262,28 +263,31 @@ endif
 
 config BR2_PACKAGE_QT5BASE_DBUS
 	bool "DBus module"
-	select BR2_PACKAGE_DBUS
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
+	select BR2_PACKAGE_DBUS
 	help
 	  This option enables the D-Bus module.
 
 config BR2_PACKAGE_QT5BASE_ICU
 	bool "Enable ICU support"
-	select BR2_PACKAGE_ICU
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
 	depends on !BR2_BINFMT_FLAT # icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
+	select BR2_PACKAGE_ICU
 	help
 	  This option enables ICU support in Qt5. This is for example
 	  needed for Qt5Webkit.
 
+comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
+	depends on !BR2_BINFMT_FLAT
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
+
 config BR2_PACKAGE_QT5BASE_TSLIB
 	bool "Enable Tslib support"
-	depends on !BR2_STATIC_LIBS # dlopen
 	select BR2_PACKAGE_TSLIB
 	help
 	  This options enables the Tslib plugin
 
-comment "tslib support needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
-
 endif
diff --git a/bsp/buildroot/package/qt5/qt5base/qmake.conf b/bsp/buildroot/package/qt5/qt5base/qmake.conf
deleted file mode 100644
index 8b6debe5..00000000
--- a/bsp/buildroot/package/qt5/qt5base/qmake.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Qt5 has a mechanism to support "device" profiles, so that people can
-# specify the compiler, compiler flags and so on for a specific device.
-
-# We leverage this mechanism in the Buildroot packaging of qt5 to
-# simplify cross-compilation: we have our own "device" definition, which
-# allows us to easily pass the cross-compiler paths and flags from our
-# qt5.mk.
-
-include(../common/linux_device_pre.conf)
-
-# modifications to g++-unix.conf
-QMAKE_CC                = $${CROSS_COMPILE}gcc
-QMAKE_CXX               = $${CROSS_COMPILE}g++
-
-# modifications to gcc-base.conf
-QMAKE_CFLAGS           += $${BR_COMPILER_CFLAGS}
-QMAKE_CXXFLAGS         += $${BR_COMPILER_CXXFLAGS}
-QMAKE_CXXFLAGS_RELEASE += -O3
-CONFIG                 += nostrip
-
-QMAKE_LIBS             += -lrt -lpthread -ldl
-QMAKE_CFLAGS_ISYSTEM   =
-
-# Architecturespecific configuration
-include(arch.conf)
-
-include(../common/linux_device_post.conf)
-load(qt_config)
diff --git a/bsp/buildroot/package/qt5/qt5base/qmake.conf.in b/bsp/buildroot/package/qt5/qt5base/qmake.conf.in
new file mode 100644
index 00000000..f14527aa
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5base/qmake.conf.in
@@ -0,0 +1,30 @@
+# Qt5 has a mechanism to support "device" profiles, so that people can
+# specify the compiler, compiler flags and so on for a specific device.
+
+# We leverage this mechanism in the Buildroot packaging of qt5 to
+# simplify cross-compilation: we have our own "device" definition, which
+# allows us to easily pass the cross-compiler paths and flags from our
+# qt5.mk.
+
+include(../common/linux_device_pre.conf)
+
+# modifications to g++-unix.conf
+QMAKE_CC                = $${CROSS_COMPILE}gcc
+QMAKE_CXX               = $${CROSS_COMPILE}g++
+
+# modifications to gcc-base.conf
+QMAKE_CFLAGS           += $${BR_COMPILER_CFLAGS}
+QMAKE_CXXFLAGS         += $${BR_COMPILER_CXXFLAGS}
+QMAKE_CXXFLAGS_RELEASE += -O3
+CONFIG                 += nostrip
+
+QMAKE_LIBS             += -lrt -lpthread -ldl
+QMAKE_CFLAGS_ISYSTEM   =
+
+# Architecture specific configuration
+include(arch.conf)
+
+@EGLFS_DEVICE@
+
+include(../common/linux_device_post.conf)
+load(qt_config)
diff --git a/bsp/buildroot/package/qt5/qt5base/qt.conf.in b/bsp/buildroot/package/qt5/qt5base/qt.conf.in
new file mode 100644
index 00000000..9a0b9cd5
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5base/qt.conf.in
@@ -0,0 +1,19 @@
+[Paths]
+Prefix=@@HOST_DIR@@
+Sysroot=@@STAGING_DIR@@
+Headers=/usr/include/qt5
+Libraries=/usr/lib
+LibraryExecutables=/usr/libexec
+Binaries=/usr/bin
+Plugins=/usr/lib/qt/plugins
+Examples=/usr/lib/qt/examples
+Qml2Imports=/usr/qml
+Imports=/usr/imports
+Translations=/usr/translations
+Examples=/usr/lib/qt/examples
+Demos=/usr/lib/qt/examples
+Tests=/usr/tests
+Settings=/usr
+Documentation=/usr/doc
+ArchData=/usr
+Data=/usr
diff --git a/bsp/buildroot/package/qt5/qt5base/qt5base.hash b/bsp/buildroot/package/qt5/qt5base/qt5base.hash
index fb27dcb7..950785c0 100644
--- a/bsp/buildroot/package/qt5/qt5base/qt5base.hash
+++ b/bsp/buildroot/package/qt5/qt5base/qt5base.hash
@@ -1,5 +1,14 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtbase-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 fef48529a6fc2617a30d75d952cb327c6be341fd104154993922184b3b3b4da1 qtbase-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz
-sha256 c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005  qtbase-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f  qtbase-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 8fdefa0b45d9f791f687da6c2c4c83c1b701aaee2c08008f55d522af214b88f0 header.BSD
+sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING
diff --git a/bsp/buildroot/package/qt5/qt5base/qt5base.mk b/bsp/buildroot/package/qt5/qt5base/qt5base.mk
index e879474e..53c98ce4 100644
--- a/bsp/buildroot/package/qt5/qt5base/qt5base.mk
+++ b/bsp/buildroot/package/qt5/qt5base/qt5base.mk
@@ -8,7 +8,7 @@ QT5BASE_VERSION = $(QT5_VERSION)
 QT5BASE_SITE = $(QT5_SITE)
 QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz
 
-QT5BASE_DEPENDENCIES = host-pkgconf zlib pcre
+QT5BASE_DEPENDENCIES = host-pkgconf zlib
 QT5BASE_INSTALL_STAGING = YES
 
 # A few comments:
@@ -27,6 +27,12 @@ QT5BASE_CONFIGURE_OPTS += \
 	-no-pch \
 	-shared
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
+QT5BASE_DEPENDENCIES += pcre
+else
+QT5BASE_DEPENDENCIES += pcre2
+endif
+
 QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
 
 # Uses libgbm from mesa3d
@@ -47,23 +53,18 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
 QT5BASE_CONFIGURE_OPTS += -largefile
 endif
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
 QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
 else
-QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5BASE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples)
+QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3-Clause (examples)
 QT5BASE_LICENSE_FILES += header.BSD
 endif
-else
-QT5BASE_LICENSE = Commercial license
-QT5BASE_REDISTRIBUTE = NO
-endif
 
 QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE))
 
@@ -104,6 +105,22 @@ QT5BASE_DEPENDENCIES += freetype
 else
 QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype
 endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_HARFBUZZ),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y)
+# system harfbuzz in case __sync for 4 bytes is supported
+QT5BASE_CONFIGURE_OPTS += -system-harfbuzz
+QT5BASE_DEPENDENCIES += harfbuzz
+else
+# qt harfbuzz otherwise (using QAtomic instead)
+QT5BASE_CONFIGURE_OPTS += -qt-harfbuzz
+QT5BASE_LICENSE := $(QT5BASE_LICENSE), MIT (harfbuzz)
+QT5BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING
+endif
+else
+QT5BASE_CONFIGURE_OPTS += -no-harfbuzz
+endif
+
 QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets)
 # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb
 # is to add a link against the "inuxfb" library.
@@ -189,6 +206,16 @@ else
 QT5BASE_CONFIGURE_OPTS += -no-libinput
 endif
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+# only enable gtk support if libgtk3 X11 backend is enabled
+ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy)
+QT5BASE_CONFIGURE_OPTS += -gtk
+QT5BASE_DEPENDENCIES += libgtk3
+else
+QT5BASE_CONFIGURE_OPTS += -no-gtk
+endif
+endif
+
 # Build the list of libraries to be installed on the target
 QT5BASE_INSTALL_LIBS_y                                 += Qt5Core
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB)        += Qt5XcbQpa
@@ -213,6 +240,11 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport
 
 QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy)
+# use vivante backend
+QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv
+endif
+
 ifneq ($(QT5BASE_CONFIG_FILE),)
 define QT5BASE_CONFIGURE_CONFIG_FILE
 	cp $(QT5BASE_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
@@ -228,7 +260,9 @@ endef
 endif
 
 define QT5BASE_CONFIGURE_CMDS
-	$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \
+	mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
+	sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
+		$(QT5BASE_PKGDIR)/qmake.conf.in > \
 		$(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf
 	$(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \
 		$(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h
@@ -244,7 +278,7 @@ define QT5BASE_CONFIGURE_CMDS
 		./configure \
 		-v \
 		-prefix /usr \
-		-hostprefix $(HOST_DIR)/usr \
+		-hostprefix $(HOST_DIR) \
 		-headerdir /usr/include/qt5 \
 		-sysroot $(STAGING_DIR) \
 		-plugindir /usr/lib/qt/plugins \
@@ -263,9 +297,17 @@ define QT5BASE_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
+# The file "qt.conf" can be used to override the hard-coded paths that are
+# compiled into the Qt library. We need it to make "qmake" relocatable.
+define QT5BASE_INSTALL_QT_CONF
+	sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \
+		$(QT5BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf
+endef
+
 define QT5BASE_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 	$(QT5_LA_PRL_FILES_FIXUP)
+	$(QT5BASE_INSTALL_QT_CONF)
 endef
 
 define QT5BASE_INSTALL_TARGET_LIBS
diff --git a/bsp/buildroot/package/qt5/qt5canvas3d/Config.in b/bsp/buildroot/package/qt5/qt5canvas3d/Config.in
index 8058a2e2..04c04730 100644
--- a/bsp/buildroot/package/qt5/qt5canvas3d/Config.in
+++ b/bsp/buildroot/package/qt5/qt5canvas3d/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QT5CANVAS3D
 	bool "qt5canvas3d"
-	select BR2_PACKAGE_QT5DECLARATIVE
-	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash b/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
index f4b35d35..be353fbc 100644
--- a/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
+++ b/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.hash
@@ -1,5 +1,10 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtcanvas3d-opensource-src-5.8.0.tar.xz
-sha256 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3  qtcanvas3d-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtcanvas3d-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 9da45991f62152c2c76931aed8a6059375fdce441b38752991e1ad2c77507c22  qtcanvas3d-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk b/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk
index 3f605ab0..97b0ec49 100644
--- a/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk
+++ b/bsp/buildroot/package/qt5/qt5canvas3d/qt5canvas3d.mk
@@ -10,16 +10,11 @@ QT5CANVAS3D_SOURCE = qtcanvas3d-opensource-src-$(QT5CANVAS3D_VERSION).tar.xz
 QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative
 QT5CANVAS3D_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5CANVAS3D_LICENSE = GPLv2 or GPLv3 or LGPLv3
+QT5CANVAS3D_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0
 QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3
-else
-QT5CANVAS3D_LICENSE = Commercial license
-QT5CANVAS3D_REDISTRIBUTE = NO
-endif
 
 define QT5CANVAS3D_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5CANVAS3D_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5charts/Config.in b/bsp/buildroot/package/qt5/qt5charts/Config.in
new file mode 100644
index 00000000..78f08fe6
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5charts/Config.in
@@ -0,0 +1,17 @@
+comment "qt5charts needs at least qt-5.7"
+	depends on !BR2_PACKAGE_QT5_VERSION_LATEST
+
+config BR2_PACKAGE_QT5CHARTS
+	bool "qt5charts"
+	depends on BR2_PACKAGE_QT5_VERSION_LATEST
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  Qt Charts module provides a set of easy to use chart
+	  components.
+
+	  https://doc.qt.io/qt-5/qtcharts-index.html
diff --git a/bsp/buildroot/package/qt5/qt5charts/qt5charts.hash b/bsp/buildroot/package/qt5/qt5charts/qt5charts.hash
new file mode 100644
index 00000000..84e89591
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5charts/qt5charts.hash
@@ -0,0 +1,5 @@
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtcharts-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 5fd60f08b1815b0e7b813c75a0ec726bffc7cc686b160bebf1e710e882ceadab  qtcharts-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
diff --git a/bsp/buildroot/package/qt5/qt5charts/qt5charts.mk b/bsp/buildroot/package/qt5/qt5charts/qt5charts.mk
new file mode 100644
index 00000000..c15e4e02
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5charts/qt5charts.mk
@@ -0,0 +1,61 @@
+################################################################################
+#
+# qt5charts
+#
+################################################################################
+
+QT5CHARTS_VERSION = $(QT5_VERSION)
+QT5CHARTS_SITE = $(QT5_SITE)
+QT5CHARTS_SOURCE = qtcharts-opensource-src-$(QT5CHARTS_VERSION).tar.xz
+QT5CHARTS_DEPENDENCIES = qt5base
+QT5CHARTS_INSTALL_STAGING = YES
+
+QT5CHARTS_LICENSE = GPL-3.0
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5CHARTS_LICENSE_FILES = LICENSE.GPL3
+endif
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+QT5CHARTS_DEPENDENCIES += qt5declarative
+endif
+
+define QT5CHARTS_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+endef
+
+define QT5CHARTS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5CHARTS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_STATIC_LIBS),)
+define QT5CHARTS_INSTALL_TARGET_LIBS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Charts*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins
+endef
+endif
+
+# this is only built with quick support enabled
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+define QT5CHARTS_INSTALL_TARGET_QMLS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtCharts $(TARGET_DIR)/usr/qml/
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+define QT5CHARTS_INSTALL_TARGET_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/charts* $(TARGET_DIR)/usr/lib/qt/examples/
+endef
+endif
+
+define QT5CHARTS_INSTALL_TARGET_CMDS
+	$(QT5CHARTS_INSTALL_TARGET_LIBS)
+	$(QT5CHARTS_INSTALL_TARGET_QMLS)
+	$(QT5CHARTS_INSTALL_TARGET_EXAMPLES)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5connectivity/Config.in b/bsp/buildroot/package/qt5/qt5connectivity/Config.in
index 8903fc94..8bda8de6 100644
--- a/bsp/buildroot/package/qt5/qt5connectivity/Config.in
+++ b/bsp/buildroot/package/qt5/qt5connectivity/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QT5CONNECTIVITY
 	bool "qt5connectivity"
+	depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_CONCURRENT
 	select BR2_PACKAGE_QT5BASE_DBUS
-	depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash b/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash
index f872721e..1da448ad 100644
--- a/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash
+++ b/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.hash
@@ -1,5 +1,5 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtconnectivity-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 fa406e3d63fa4a2acc8ecae6d110f20c766f19a21c7061a12f3c167deb07ccde qtconnectivity-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtconnectivity-opensource-src-5.8.0.tar.xz
-sha256 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1  qtconnectivity-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtconnectivity-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 6c696855c2d4e63709ba81d22c85cab30f66418eac2fb2810a02a4b47a531c57  qtconnectivity-opensource-src-5.9.6.tar.xz
diff --git a/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk b/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk
index f00dcb22..4369a411 100644
--- a/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/bsp/buildroot/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -10,20 +10,15 @@ QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION
 QT5CONNECTIVITY_DEPENDENCIES = qt5base
 QT5CONNECTIVITY_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5CONNECTIVITY_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5CONNECTIVITY_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3c (examples)
-endif
-else
-QT5CONNECTIVITY_LICENSE = Commercial license
-QT5CONNECTIVITY_REDISTRIBUTE = NO
+QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3-Clause (examples)
 endif
 
 QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative)
@@ -32,7 +27,7 @@ QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils)
 QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard)
 
 define QT5CONNECTIVITY_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5CONNECTIVITY_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch b/bsp/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
new file mode 100644
index 00000000..aeaaa917
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5declarative/5.6.3/0001-examples-photoviewer-needs-widgets-support.patch
@@ -0,0 +1,32 @@
+From b616a7e2a7e03e2eb189dca3dc428c0e19e1652b Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Thu, 6 Apr 2017 21:53:40 +0200
+Subject: [PATCH] examples: photoviewer needs widgets support
+
+Fixes:
+
+  .../qt5declarative-5.8.0/examples/quick/demos/photoviewer/photoviewer.pro
+  Project ERROR: Unknown module(s) in QT: widgets
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ examples/quick/demos/demos.pro | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro
+index 0644b81a2..5a6fd52ba 100644
+--- a/examples/quick/demos/demos.pro
++++ b/examples/quick/demos/demos.pro
+@@ -7,5 +7,7 @@ SUBDIRS = samegame \
+             photosurface \
+             stocqt
+ 
+-qtHaveModule(xmlpatterns): SUBDIRS += rssnews photoviewer
+-
++qtHaveModule(xmlpatterns) {
++    SUBDIRS += rssnews
++    qtHaveModule(widgets): SUBDIRS += photoviewer
++}
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch b/bsp/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
new file mode 100644
index 00000000..7959d389
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5declarative/5.6.3/0002-examples-qquickviewcomparison-and-quickwidget-needs-.patch
@@ -0,0 +1,64 @@
+From b4db5c6cef877b33b5e7cd5a07fe4a7e6797dcfc Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Tue, 16 May 2017 19:47:19 +0200
+Subject: [PATCH] examples: qquickviewcomparison and quickwidget needs OpenGL
+ support
+
+Fixes:
+
+  main.cpp:(.text._ZN11QQmlPrivate10createIntoI6FbItemEEvPv[_ZN11QQmlPrivate10createIntoI6FbItemEEvPv]+0x18): undefined reference to `QQuickFramebufferObject::QQuickFramebufferObject(QQuickItem*)'
+  .obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
+  main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED2Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED5Ev]+0x5c): undefined reference to `vtable for QQuickFramebufferObject'
+  .obj/main.o: In function `QQmlPrivate::QQmlElement<FbItem>::~QQmlElement()':
+  main.cpp:(.text._ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev[_ZN11QQmlPrivate11QQmlElementI6FbItemED0Ev]+0x64): undefined reference to `vtable for QQuickFramebufferObject'
+  .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x48): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
+  .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0x4c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
+  .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
+  .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xb8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
+  .obj/main.o:(.data.rel.ro._ZTVN11QQmlPrivate11QQmlElementI6FbItemEE[_ZTVN11QQmlPrivate11QQmlElementI6FbItemEE]+0xbc): undefined reference to `QQuickFramebufferObject::releaseResources()'
+  .obj/moc_fbitem.o: In function `FbItem::qt_metacast(char const*)':
+  moc_fbitem.cpp:(.text+0x70): undefined reference to `QQuickFramebufferObject::qt_metacast(char const*)'
+  .obj/moc_fbitem.o: In function `FbItem::qt_metacall(QMetaObject::Call, int, void**)':
+  moc_fbitem.cpp:(.text+0x80): undefined reference to `QQuickFramebufferObject::qt_metacall(QMetaObject::Call, int, void**)'
+  .obj/moc_fbitem.o: In function `FbItem::~FbItem()':
+  moc_fbitem.cpp:(.text._ZN6FbItemD2Ev[_ZN6FbItemD5Ev]+0x38): undefined reference to `vtable for QQuickFramebufferObject'
+  .obj/moc_fbitem.o: In function `FbItem::~FbItem()':
+  moc_fbitem.cpp:(.text._ZN6FbItemD0Ev[_ZN6FbItemD0Ev]+0x40): undefined reference to `vtable for QQuickFramebufferObject'
+  .obj/moc_fbitem.o:(.data.rel.ro+0x8): undefined reference to `typeinfo for QQuickFramebufferObject'
+  .obj/moc_fbitem.o:(.data.rel.ro+0x58): undefined reference to `QQuickFramebufferObject::isTextureProvider() const'
+  .obj/moc_fbitem.o:(.data.rel.ro+0x5c): undefined reference to `QQuickFramebufferObject::textureProvider() const'
+  .obj/moc_fbitem.o:(.data.rel.ro+0xc4): undefined reference to `QQuickFramebufferObject::geometryChanged(QRectF const&, QRectF const&)'
+  .obj/moc_fbitem.o:(.data.rel.ro+0xc8): undefined reference to `QQuickFramebufferObject::updatePaintNode(QSGNode*, QQuickItem::UpdatePaintNodeData*)'
+  .obj/moc_fbitem.o:(.data.rel.ro+0xcc): undefined reference to `QQuickFramebufferObject::releaseResources()'
+  .obj/moc_fbitem.o:(.data.rel.ro+0xf0): undefined reference to `QQuickFramebufferObject::staticMetaObject'
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+
+Note:
+An equivalent patch is upstream for qt5declarative 5.10, but it is not suitable for
+backporting to this version due to license differences.
+
+---
+ examples/quick/quick.pro | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
+index 445dfb0fa..26ca0138e 100644
+--- a/examples/quick/quick.pro
++++ b/examples/quick/quick.pro
+@@ -36,7 +36,10 @@ qtConfig(opengl(es1|es2)?) {
+ # Widget dependent examples
+ qtHaveModule(widgets) {
+     SUBDIRS += embeddedinwidgets
+-    qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
++    # OpenGL Support Required
++    qtConfig(opengl(es1|es2)?) {
++        qtHaveModule(quickwidgets): SUBDIRS += quickwidgets
++    }
+ }
+ 
+ EXAMPLE_FILES = \
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/qt5/qt5declarative/Config.in b/bsp/buildroot/package/qt5/qt5declarative/Config.in
index 853322ca..3a353a83 100644
--- a/bsp/buildroot/package/qt5/qt5declarative/Config.in
+++ b/bsp/buildroot/package/qt5/qt5declarative/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QT5DECLARATIVE
 	bool "qt5declarative"
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	select BR2_PACKAGE_QT5XMLPATTERNS
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_GUI
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -17,11 +17,11 @@ config BR2_PACKAGE_QT5DECLARATIVE
 if BR2_PACKAGE_QT5DECLARATIVE
 
 comment "quick module needs an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
 
 config BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	bool "quick module"
-	select BR2_PACKAGE_QT5BASE_OPENGL
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
+	select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE
 
 endif
diff --git a/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.hash b/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.hash
index c05a9ef1..9bbda422 100644
--- a/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.hash
+++ b/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.hash
@@ -1,5 +1,16 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz
-sha256 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46  qtdeclarative-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtdeclarative-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 058fd99a779a753fc5f5e887f1afb799aa53b9f010faa06374b1cfb6fc8bad8a  qtdeclarative-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.mk b/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.mk
index fb546bd7..de8b0483 100644
--- a/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.mk
+++ b/bsp/buildroot/package/qt5/qt5declarative/qt5declarative.mk
@@ -10,32 +10,24 @@ QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).t
 QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns
 QT5DECLARATIVE_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5DECLARATIVE_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5DECLARATIVE_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5DECLARATIVE_LICENSE = Commercial license
-QT5DECLARATIVE_REDISTRIBUTE = NO
-endif
 
 define QT5DECLARATIVE_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5DECLARATIVE_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		sub-src-all sub-tools-all
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 define QT5DECLARATIVE_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
-		sub-src-install_subtargets \
-		sub-tools-install_subtargets
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
@@ -45,6 +37,9 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS
 	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib
 endef
+define QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quick/ $(TARGET_DIR)/usr/lib/qt/examples/
+endef
 endif
 
 define QT5DECLARATIVE_INSTALL_TARGET_LIBS
@@ -55,9 +50,17 @@ endef
 
 endif
 
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+define QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/qml* $(TARGET_DIR)/usr/lib/qt/examples/
+	$(QT5DECLARATIVE_INSTALL_TARGET_QUICK_EXAMPLES)
+endef
+endif
+
 define QT5DECLARATIVE_INSTALL_TARGET_CMDS
 	cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin
 	cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr
+	$(QT5DECLARATIVE_INSTALL_TARGET_EXAMPLES)
 	$(QT5DECLARATIVE_INSTALL_TARGET_LIBS)
 endef
 
diff --git a/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.hash b/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.hash
index 3cf904a3..424c4776 100644
--- a/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.hash
+++ b/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.hash
@@ -1,2 +1,9 @@
-# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist
-sha256 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3 qtenginio-opensource-src-1.6.2.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtenginio-opensource-src-1.6.3.tar.xz.mirrorlist
+sha256 d907060b355512ceb7a8c3f6980e3979c20d54320b6804303b6c5e8ed42d3912  qtenginio-opensource-src-1.6.3.tar.xz
+
+# Hashes for license files:
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL
diff --git a/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.mk b/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.mk
index dad78897..603b2a51 100644
--- a/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.mk
+++ b/bsp/buildroot/package/qt5/qt5enginio/qt5enginio.mk
@@ -6,21 +6,16 @@
 
 # Qt5Enginio does not follow Qt versionning
 # see https://bugreports.qt.io/browse/QTBUG-50111
-QT5ENGINIO_VERSION = 1.6.2
+QT5ENGINIO_VERSION = 1.6.3
 QT5ENGINIO_SITE = $(QT5_SITE)
 QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz
 QT5ENGINIO_DEPENDENCIES = openssl qt5base
 QT5ENGINIO_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5ENGINIO_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3c (examples)
-endif
-else
-QT5ENGINIO_LICENSE = Commercial license
-QT5ENGINIO_REDISTRIBUTE = NO
+QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3-Clause (examples)
 endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
@@ -28,7 +23,7 @@ QT5ENGINIO_DEPENDENCIES += qt5declarative
 endif
 
 define QT5ENGINIO_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5ENGINIO_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5graphicaleffects/Config.in b/bsp/buildroot/package/qt5/qt5graphicaleffects/Config.in
index df234259..69b7fca4 100644
--- a/bsp/buildroot/package/qt5/qt5graphicaleffects/Config.in
+++ b/bsp/buildroot/package/qt5/qt5graphicaleffects/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QT5GRAPHICALEFFECTS
 	bool "qt5graphicaleffects"
-	select BR2_PACKAGE_QT5DECLARATIVE
-	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
index a0383ceb..c7f93129 100644
--- a/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
+++ b/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash
@@ -1,5 +1,17 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtgraphicaleffects-opensource-src-5.8.0.tar.xz
-sha256 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919  qtgraphicaleffects-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtgraphicaleffects-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 5f98bc62e8f27bd13853e90306e7e10f47fb06d7cd38f2e7be76bd907ef37154  qtgraphicaleffects-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
index aef69eb4..2f6380f7 100644
--- a/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/bsp/buildroot/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -10,21 +10,16 @@ QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFF
 QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative
 QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5GRAPHICALEFFECTS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5GRAPHICALEFFECTS_LICENSE = Commercial license
-QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
-endif
 
 define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5GRAPHICALEFFECTS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash b/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
index f6cf9c8d..d24e5505 100644
--- a/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
+++ b/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.hash
@@ -1,5 +1,14 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtimageformats-opensource-src-5.8.0.tar.xz
-sha256 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f  qtimageformats-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtimageformats-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 158272da5e49a388b43423399592372968984323bfd543a5a992bbd466ff4060  qtimageformats-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk b/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk
index d7649255..f70f131d 100644
--- a/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/bsp/buildroot/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -10,21 +10,16 @@ QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION
 QT5IMAGEFORMATS_DEPENDENCIES = qt5base
 QT5IMAGEFORMATS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
 QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
 else
-QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5IMAGEFORMATS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5IMAGEFORMATS_LICENSE = Commercial license
-QT5IMAGEFORMATS_REDISTRIBUTE = NO
-endif
 
 define QT5IMAGEFORMATS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5IMAGEFORMATS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5location/qt5location.hash b/bsp/buildroot/package/qt5/qt5location/qt5location.hash
index 8ac821c8..a21e7077 100644
--- a/bsp/buildroot/package/qt5/qt5location/qt5location.hash
+++ b/bsp/buildroot/package/qt5/qt5location/qt5location.hash
@@ -1,5 +1,14 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz
-sha256 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb  qtlocation-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtlocation-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 7d65c8e155c617719e2fb56d39f11cf2bc911a43cf6667c124d86cc1a12619c9  qtlocation-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/bsp/buildroot/package/qt5/qt5location/qt5location.mk b/bsp/buildroot/package/qt5/qt5location/qt5location.mk
index dbdc6457..e9f1e4d9 100644
--- a/bsp/buildroot/package/qt5/qt5location/qt5location.mk
+++ b/bsp/buildroot/package/qt5/qt5location/qt5location.mk
@@ -10,25 +10,20 @@ QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz
 QT5LOCATION_DEPENDENCIES = qt5base
 QT5LOCATION_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
 QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
 else
-QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5LOCATION_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5LOCATION_LICENSE = Commercial license
-QT5LOCATION_REDISTRIBUTE = NO
-endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
 QT5LOCATION_DEPENDENCIES += qt5declarative
 endif
 
 define QT5LOCATION_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5LOCATION_BUILD_CMDS
@@ -62,5 +57,4 @@ define QT5LOCATION_INSTALL_TARGET_CMDS
 	$(QT5LOCATION_INSTALL_TARGET_QMLS)
 endef
 
-
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5multimedia/Config.in b/bsp/buildroot/package/qt5/qt5multimedia/Config.in
index 5b14ac57..79d60221 100644
--- a/bsp/buildroot/package/qt5/qt5multimedia/Config.in
+++ b/bsp/buildroot/package/qt5/qt5multimedia/Config.in
@@ -9,8 +9,8 @@ config BR2_PACKAGE_QT5MULTIMEDIA
 	  developers using C++.
 
 	  The Qt Multimedia module provides a rich feature set that
-	  enables you to easily take advantage of a platform's multimedia
-	  capabilities such as media playback and the use of camera and
-	  radio devices.
+	  enables you to easily take advantage of a platform's
+	  multimedia capabilities such as media playback and the use
+	  of camera and radio devices.
 
 	  http://doc.qt.io/qt-5/multimediaoverview.html
diff --git a/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash b/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
index 9125d219..69a378f4 100644
--- a/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
+++ b/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.hash
@@ -1,5 +1,16 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz
-sha256 a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07  qtmultimedia-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtmultimedia-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 9edc11d74e10e4ef857ab38a66700259829e6b5baa4ab0b30655f549d8939fff  qtmultimedia-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk b/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk
index 4ce98d22..041ef490 100644
--- a/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/bsp/buildroot/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -10,18 +10,13 @@ QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.
 QT5MULTIMEDIA_DEPENDENCIES = qt5base
 QT5MULTIMEDIA_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5MULTIMEDIA_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5MULTIMEDIA_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5MULTIMEDIA_LICENSE = Commercial license
-QT5MULTIMEDIA_REDISTRIBUTE = NO
-endif
 
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y)
 QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base
@@ -39,8 +34,15 @@ ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
 QT5MULTIMEDIA_DEPENDENCIES += alsa-lib
 endif
 
+# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag
+# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if
+# the libxcb is not selected.
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx)
+QT5MULTIMEDIA_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS
+endif
+
 define QT5MULTIMEDIA_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5MULTIMEDIA_QMAKEFLAGS))
 endef
 
 define QT5MULTIMEDIA_BUILD_CMDS
@@ -66,7 +68,8 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS
 endef
 endif
 
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
+# this is only built with quick/opengl support enabled
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5_GL_AVAILABLE),yy)
 define QT5MULTIMEDIA_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/
 endef
@@ -74,7 +77,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
 define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES
-       cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/
 endef
 endif
 
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols/Config.in b/bsp/buildroot/package/qt5/qt5quickcontrols/Config.in
index 3ab6ded4..59f6ca41 100644
--- a/bsp/buildroot/package/qt5/qt5quickcontrols/Config.in
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QT5QUICKCONTROLS
 	bool "qt5quickcontrols"
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -14,5 +14,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS
 	  http://doc.qt.io/qt-5/qtquickcontrols-index.html
 
 comment "qt5quickcontrols needs an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
index d1843a1a..37ddd005 100644
--- a/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.hash
@@ -1,5 +1,14 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols-opensource-src-5.8.0.tar.xz
-sha256 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326  qtquickcontrols-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtquickcontrols-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 da4dd353802197c2bb53c92a36cf7749c7d9dc29b4acc919b692683e9c1c3313  qtquickcontrols-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
index 43254ba0..87b85593 100644
--- a/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -10,16 +10,16 @@ QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERS
 QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative
 QT5QUICKCONTROLS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
-QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+QT5QUICKCONTROLS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
+
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.LGPL3 LICENSE.FDL
 else
-QT5QUICKCONTROLS_LICENSE = Commercial license
-QT5QUICKCONTROLS_REDISTRIBUTE = NO
+QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
 endif
 
 define QT5QUICKCONTROLS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5QUICKCONTROLS_BUILD_CMDS
@@ -30,7 +30,6 @@ define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
 endef
 
-
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy)
 define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS
 	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash b/bsp/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
new file mode 100644
index 00000000..6f5bf294
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols2/5.6.3/qt5quickcontrols2.hash
@@ -0,0 +1,4 @@
+# Hashes for license files:
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0ec5b37a28dd638c5c05c8cc940276e55c808353fe8d942c7f993c2c8b4cbe62 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols2/Config.in b/bsp/buildroot/package/qt5/qt5quickcontrols2/Config.in
index adf89d0d..d036f74b 100644
--- a/bsp/buildroot/package/qt5/qt5quickcontrols2/Config.in
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols2/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_QT5QUICKCONTROLS2
 	bool "qt5quickcontrols2"
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
 	select BR2_PACKAGE_QT5DECLARATIVE
 	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
-	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -16,5 +16,5 @@ config BR2_PACKAGE_QT5QUICKCONTROLS2
 	  https://doc.qt.io/qt-5/qtquickcontrols2-index.html
 
 comment "qt5quickcontrols2 needs an OpenGL-capable backend"
-	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
index fae1a875..ae6fb01f 100644
--- a/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.hash
@@ -1,5 +1,10 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols2-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 ec5078470abe2da888c2be5d1749b5961ef5132487c180ce4d4aa19ea7ff81cb qtquickcontrols2-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols2-opensource-src-5.8.0.tar.xz
-sha256 b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b  qtquickcontrols2-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtquickcontrols2-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 24b41ae6acec9372190147736ba31bf0b4467c71cc4b14817e3a82a750481679  qtquickcontrols2-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3
+sha256 9e63a04ce021b8bf811b30881fa51c8c3db88afeead942cd59322f2fb69c75bc LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
index f6aca2cd..f27cafc6 100644
--- a/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
+++ b/bsp/buildroot/package/qt5/qt5quickcontrols2/qt5quickcontrols2.mk
@@ -10,16 +10,11 @@ QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_V
 QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative
 QT5QUICKCONTROLS2_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5QUICKCONTROLS2_LICENSE = GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
 QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5QUICKCONTROLS2_LICENSE = Commercial license
-QT5QUICKCONTROLS2_REDISTRIBUTE = NO
-endif
 
 define QT5QUICKCONTROLS2_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5QUICKCONTROLS2_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch b/bsp/buildroot/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch
new file mode 100644
index 00000000..7e4e524d
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5script/0001-Detect-32-bits-armv8-a-architecture.patch
@@ -0,0 +1,49 @@
+From daf2e222903bacf85f27dfb0fffc4459bbf58b77 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
+Date: Sun, 10 Jun 2018 08:23:50 -0400
+Subject: [PATCH] Detect 32-bits armv8-a architecture
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+These toolchains define __ARM_ARCH_8A__ (for ARM architecture version)
+and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits).
+
+This commit catches this new architecture (armv8a) within a #ifdef/#endif
+inside the if statement dedicated for 32-bits ARM detection. See commit
+from WebKit [1] and [2].
+
+Fixes:
+
+	In file included from ../3rdparty/javascriptcore/JavaScriptCore/config.h:26,
+	                 from ../3rdparty/javascriptcore/JavaScriptCore/pcre/pcre_compile.cpp:44:
+	../3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h:370:6: error: #error "Not supported ARM architecture"
+	 #    error "Not supported ARM architecture"
+	      ^~~~~
+
+[1]: https://github.com/WebKit/webkit/commit/313d9fc4bdd2f020a5d0cf834c3c61982f161ebb
+[2]: https://github.com/WebKit/webkit/commit/98f0de0709786f5d9b09dfd5908266990eb909d6
+
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+index 00caa6d..c4b758e 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+@@ -306,6 +306,10 @@
+     || defined(__ARM_ARCH_7R__)
+ #define WTF_ARM_ARCH_VERSION 7
+ 
++#elif defined(__ARM_ARCH_8__) \
++    || defined(__ARM_ARCH_8A__)
++#define WTF_ARM_ARCH_VERSION 8
++
+ /* RVCT sets _TARGET_ARCH_ARM */
+ #elif defined(__TARGET_ARCH_ARM)
+ #define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/qt5/qt5script/Config.in b/bsp/buildroot/package/qt5/qt5script/Config.in
index ad19727a..034b7d2f 100644
--- a/bsp/buildroot/package/qt5/qt5script/Config.in
+++ b/bsp/buildroot/package/qt5/qt5script/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QT5SCRIPT
 	bool "qt5script"
-	select BR2_PACKAGE_QT5BASE
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	select BR2_PACKAGE_QT5BASE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/bsp/buildroot/package/qt5/qt5script/qt5script.hash b/bsp/buildroot/package/qt5/qt5script/qt5script.hash
index a77ad9de..acbd3dfa 100644
--- a/bsp/buildroot/package/qt5/qt5script/qt5script.hash
+++ b/bsp/buildroot/package/qt5/qt5script/qt5script.hash
@@ -1,5 +1,14 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtscript-opensource-src-5.8.0.tar.xz
-sha256 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3  qtscript-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtscript-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 8dbf41abee35be4eb34a56ca3276fac83f3b8671db54c3c7e91c877225727220  qtscript-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 5094ecb9c9dcd0eadc34f3c11511d9b5535063032bc150164ecd1a5d5a445547 src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB
+sha256 43b007cd3ac7b7ea5284b13e9580334028e6f42e859059605d57558f39374197 src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING
diff --git a/bsp/buildroot/package/qt5/qt5script/qt5script.mk b/bsp/buildroot/package/qt5/qt5script/qt5script.mk
index 57ba6f00..9539f56d 100644
--- a/bsp/buildroot/package/qt5/qt5script/qt5script.mk
+++ b/bsp/buildroot/package/qt5/qt5script/qt5script.mk
@@ -10,16 +10,24 @@ QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz
 QT5SCRIPT_DEPENDENCIES = qt5base
 QT5SCRIPT_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
-QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+# JavaScriptCore contains files under BSD-2-Clause, BSD-3-Clause, and LGPL-2+.
+# This is linked into libQt5Script, which also contains Qt sources under
+# LGPL-2.1 (only). Therefore, the library is  LGPL-2.1 and BSD-3-Clause.
+# libQt5ScriptTools is under the normal Qt opensource license.
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-3.0 or GPL-2.0+ (libQt5ScriptTools), GFDL-1.3 (docs)
+QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv3 LICENSE.FDL
 else
-QT5SCRIPT_LICENSE = Commercial license
-QT5SCRIPT_REDISTRIBUTE = NO
+QT5SCRIPT_LICENSE = LGPL-2.1, BSD-3-Clause, LGPL-2.1 with exception or LGPL-3.0 with exception (libQt5ScriptTools), GFDL-1.3 (docs)
+QT5SCRIPT_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LGPL_EXCEPTION.txt LICENSE.FDL
 endif
+# License files from JavaScriptCore
+QT5SCRIPT_LICENSE_FILES += \
+	src/3rdparty/javascriptcore/JavaScriptCore/COPYING.LIB \
+	src/3rdparty/javascriptcore/JavaScriptCore/pcre/COPYING
 
 define QT5SCRIPT_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5SCRIPT_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5scxml/Config.in b/bsp/buildroot/package/qt5/qt5scxml/Config.in
new file mode 100644
index 00000000..d94b5ea1
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5scxml/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_QT5SCXML
+	bool "qt5scxml"
+	depends on BR2_PACKAGE_QT5_VERSION_LATEST
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5DECLARATIVE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  The Qt SCXML module provides functionality to create state
+	  machines from SCXML files.
+
+	  https://doc.qt.io/qt-5/qtscxml-index.html
+
+comment "qt5scxml needs at least qt-5.9"
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	depends on !BR2_PACKAGE_QT5_VERSION_LATEST
diff --git a/bsp/buildroot/package/qt5/qt5scxml/qt5scxml.hash b/bsp/buildroot/package/qt5/qt5scxml/qt5scxml.hash
new file mode 100644
index 00000000..4a1b3833
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5scxml/qt5scxml.hash
@@ -0,0 +1,8 @@
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtscxml-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 33947621fd6675c68d67ba11325746a82e7d582599ca0f04e03da4f60d82339a  qtscxml-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
diff --git a/bsp/buildroot/package/qt5/qt5scxml/qt5scxml.mk b/bsp/buildroot/package/qt5/qt5scxml/qt5scxml.mk
new file mode 100644
index 00000000..2d197a2b
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5scxml/qt5scxml.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# qt5scxml
+#
+################################################################################
+
+QT5SCXML_VERSION = $(QT5_VERSION)
+QT5SCXML_SITE = $(QT5_SITE)
+QT5SCXML_SOURCE = qtscxml-opensource-src-$(QT5SCXML_VERSION).tar.xz
+QT5SCXML_DEPENDENCIES = qt5base qt5declarative
+QT5SCXML_INSTALL_STAGING = YES
+
+QT5SCXML_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5SCXML_LICENSE_FILES = LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+QT5SCXML_LICENSE := $(QT5SCXML_LICENSE), BSD-3-Clause (examples)
+endif
+
+define QT5SCXML_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+endef
+
+define QT5SCXML_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5SCXML_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_STATIC_LIBS),)
+define QT5SCXML_INSTALL_TARGET_LIBS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Scxml*.so.* $(TARGET_DIR)/usr/lib
+endef
+endif
+
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+define QT5SCXML_INSTALL_TARGET_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/scxml $(TARGET_DIR)/usr/lib/qt/examples/
+endef
+endif
+
+define QT5SCXML_INSTALL_TARGET_CMDS
+	$(QT5SCXML_INSTALL_TARGET_LIBS)
+	$(QT5SCXML_INSTALL_TARGET_EXAMPLES)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.hash b/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.hash
index 51604516..cf26d8f2 100644
--- a/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.hash
+++ b/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.hash
@@ -1,5 +1,17 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsensors-opensource-src-5.8.0.tar.xz
-sha256 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796  qtsensors-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtsensors-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 047fac53c555e685c346be53faacf581cb98d9e2a3193cb55f4e7e81fc51de27  qtsensors-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.mk b/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.mk
index fb9ef32e..d4dc47e8 100644
--- a/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.mk
+++ b/bsp/buildroot/package/qt5/qt5sensors/qt5sensors.mk
@@ -10,25 +10,20 @@ QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz
 QT5SENSORS_DEPENDENCIES = qt5base
 QT5SENSORS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5SENSORS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5SENSORS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SENSORS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5SENSORS_LICENSE = Commercial license
-QT5SENSORS_REDISTRIBUTE = NO
-endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
 QT5SENSORS_DEPENDENCIES += qt5declarative
 endif
 
 define QT5SENSORS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5SENSORS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash b/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash
index 5bc6863a..8a77ab4d 100644
--- a/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash
+++ b/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -1,5 +1,11 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialbus-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 71c89be3879414e2a11cad93a4882758f9259b1c0aec980560309192c99f9a9e qtserialbus-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialbus-opensource-src-5.8.0.tar.xz
-sha256 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a  qtserialbus-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtserialbus-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 f3e8d0e6ff836198c9fc5b9a2a89dea3c5d604c63a62126fab6d11c2763f172a  qtserialbus-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 f827ad079686ba92cc94811e35492d0e8966f704008b6da9eeda0b659fb58a8d LICENSE.FDL
diff --git a/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk b/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk
index b188f5d8..218aba4e 100644
--- a/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk
+++ b/bsp/buildroot/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -10,16 +10,11 @@ QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz
 QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
 QT5SERIALBUS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALBUS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-3.0, GFDL-1.3 (docs)
 QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
-else
-QT5SERIALBUS_LICENSE = Commercial license
-QT5SERIALBUS_REDISTRIBUTE = NO
-endif
 
 define QT5SERIALBUS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5SERIALBUS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.hash b/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.hash
index 97281008..21519d83 100644
--- a/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.hash
+++ b/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.hash
@@ -1,5 +1,17 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtserialport-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 082d1fee2703aed19f840c4e4031e37c9b929e5bd8ebef2ebac4b28c509bae1a qtserialport-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialport-opensource-src-5.8.0.tar.xz
-sha256 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad  qtserialport-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtserialport-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 741dfe9d132aed411ad163304fd4485df2da0b40fe57ebce2f6ed4b4043dfcb9  qtserialport-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 e1251235ce9853eecfecfa905da9ee29e9b76e4db2a1c9c4a20699f460419b08 LICENSE.FDL
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt
diff --git a/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.mk b/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.mk
index 4fbca9ea..05442375 100644
--- a/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.mk
+++ b/bsp/buildroot/package/qt5/qt5serialport/qt5serialport.mk
@@ -10,21 +10,16 @@ QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.
 QT5SERIALPORT_DEPENDENCIES = qt5base
 QT5SERIALPORT_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5SERIALPORT_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5SERIALPORT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALPORT_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5SERIALPORT_LICENSE = Commercial license
-QT5SERIALPORT_REDISTRIBUTE = NO
-endif
 
 define QT5SERIALPORT_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5SERIALPORT_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5svg/qt5svg.hash b/bsp/buildroot/package/qt5/qt5svg/qt5svg.hash
index 237c0729..ee2a77ff 100644
--- a/bsp/buildroot/package/qt5/qt5svg/qt5svg.hash
+++ b/bsp/buildroot/package/qt5/qt5svg/qt5svg.hash
@@ -1,5 +1,13 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz
-sha256 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89  qtsvg-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtsvg-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 4318ce3c1f94ca865e3405aefb927f257ca824c5adc482302f1449ed34dbd8b8  qtsvg-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/bsp/buildroot/package/qt5/qt5svg/qt5svg.mk b/bsp/buildroot/package/qt5/qt5svg/qt5svg.mk
index 08821e48..5a12755f 100644
--- a/bsp/buildroot/package/qt5/qt5svg/qt5svg.mk
+++ b/bsp/buildroot/package/qt5/qt5svg/qt5svg.mk
@@ -10,21 +10,16 @@ QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz
 QT5SVG_DEPENDENCIES = qt5base
 QT5SVG_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
 QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
 else
-QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5SVG_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5SVG_LICENSE = Commercial license
-QT5SVG_REDISTRIBUTE = NO
-endif
 
 define QT5SVG_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5SVG_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5tools/qt5tools.hash b/bsp/buildroot/package/qt5/qt5tools/qt5tools.hash
index 6ea4c271..f3030b13 100644
--- a/bsp/buildroot/package/qt5/qt5tools/qt5tools.hash
+++ b/bsp/buildroot/package/qt5/qt5tools/qt5tools.hash
@@ -1,5 +1,16 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz
-sha256 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83  qttools-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qttools-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 50e75417ec0c74bb8b1989d1d8e981ee83690dce7dfc0c2169f7c00f397e5117  qttools-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 8ab0b8fe7c8e580e8c571b8fa455baf307e9394d4b3ac53ce50d8e960a8934c5 LICENSE.GPLv3
+sha256 66f6bb53f6d985a4d651bf1ecfe8bbcbe32b0f744708d588f047580ee85d8ec8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 68afaf3392f8c04218fbf29db43cc0b18bf651c1db086556aa584046de9f3e35 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5tools/qt5tools.mk b/bsp/buildroot/package/qt5/qt5tools/qt5tools.mk
index 51d9cf31..cf181e57 100644
--- a/bsp/buildroot/package/qt5/qt5tools/qt5tools.mk
+++ b/bsp/buildroot/package/qt5/qt5tools/qt5tools.mk
@@ -19,18 +19,13 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
 QT5TOOLS_DEPENDENCIES += qt5declarative
 endif
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+QT5TOOLS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5TOOLS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5TOOLS_LICENSE = Commercial license
-QT5TOOLS_REDISTRIBUTE = NO
-endif
 
 QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \
 	linguist/lconvert linguist/lrelease linguist/lupdate
@@ -54,7 +49,7 @@ QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
 QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo
 
 define QT5TOOLS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5TOOLS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5virtualkeyboard/Config.in b/bsp/buildroot/package/qt5/qt5virtualkeyboard/Config.in
new file mode 100644
index 00000000..f0e4f03f
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5virtualkeyboard/Config.in
@@ -0,0 +1,58 @@
+comment "qt5virtualkeyboard needs at least qt-5.7 and an OpenGL backend"
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
+
+config BR2_PACKAGE_QT5VIRTUALKEYBOARD
+	bool "qt5virtualkeyboard"
+	# needs at least Qt 5.7
+	depends on BR2_PACKAGE_QT5_VERSION_LATEST
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative/quick
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+	select BR2_PACKAGE_QT5SVG
+	help
+	  Qt Virtual Keyboard is a virtual keyboard framework that
+	  consists of a C++ backend supporting custom input methods as
+	  well as a UI frontend implemented in QML.
+
+if BR2_PACKAGE_QT5VIRTUALKEYBOARD
+
+config BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS
+	string "language layouts"
+	default "en_GB"
+	help
+	  The Virtual Keyboard supports the following languages:
+	  - Arabic (ar_AR)
+	  - Danish (da_DK)
+	  - English (en_GB)
+	  - Finnish (fi_FI)
+	  - French (fr_FR)
+	  - German (de_DE)
+	  - Hindi (hi_IN)
+	  - Italian (it_IT)
+	  - Japanese (ja_JP)
+	  - Korean (ko_KR)
+	  - Norwegian (nb_NO)
+	  - Persian/Farsi (fa_FA)
+	  - Polish (pl_PL)
+	  - Portugese (pt_PT)
+	  - Romanian (ro_RO)
+	  - Russian (ru_RU)
+	  - Simplified Chinese (zh_CN)
+	  - Traditional Chinese (zh_TW)
+	  - Spanish (es_ES)
+	  - Swedish (sv_SE)
+
+	  Note: the special value "all" can be used to install support
+	  for all supported languages.
+
+config BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING
+	bool "handwriting"
+	help
+	  Handwriting support, with gestures for fullscreen input.
+
+	  Lipi Toolkit (LipiTk) is an open source toolkit for online
+	  Handwriting Recognition.
+
+endif
diff --git a/bsp/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash b/bsp/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
new file mode 100644
index 00000000..f31129b4
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.hash
@@ -0,0 +1,6 @@
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtvirtualkeyboard-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 217d8502f3f53b62e6e9108e0afb3694cf1d8ae8a6348d3625e3192fc126128c  qtvirtualkeyboard-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 7a45a9769d19545480a241230e6ea520b5156fac00930dcd69b6886749743d10 src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
diff --git a/bsp/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/bsp/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
new file mode 100644
index 00000000..7d2201b5
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk
@@ -0,0 +1,78 @@
+################################################################################
+#
+# qt5virtualkeyboard
+#
+################################################################################
+
+QT5VIRTUALKEYBOARD_VERSION = $(QT5_VERSION)
+QT5VIRTUALKEYBOARD_SITE = $(QT5_SITE)
+QT5VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-opensource-src-$(QT5VIRTUALKEYBOARD_VERSION).tar.xz
+QT5VIRTUALKEYBOARD_DEPENDENCIES = qt5base qt5declarative qt5svg
+QT5VIRTUALKEYBOARD_INSTALL_STAGING = YES
+
+QT5VIRTUALKEYBOARD_LICENSE = GPL-3.0
+QT5VIRTUALKEYBOARD_LICENSE_FILES = LICENSE.GPL3
+
+QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS = $(call qstrip,$(BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS))
+ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
+QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))"
+
+ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
+QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (openwnn)
+QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/openwnn/NOTICE
+endif
+
+ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
+QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (pinyin)
+QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE
+endif
+
+ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
+QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (tcime), BSD-3-Clause (tcime)
+QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING
+endif
+endif
+
+ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y)
+QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
+QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting
+QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), MIT (lipi-toolkit)
+QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
+endif
+
+ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS
+	cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr
+endef
+endif
+
+define QT5VIRTUALKEYBOARD_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5VIRTUALKEYBOARD_QMAKEFLAGS))
+endef
+
+define QT5VIRTUALKEYBOARD_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5VIRTUALKEYBOARD_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/virtualkeyboard $(TARGET_DIR)/usr/lib/qt/examples/
+endef
+endif
+
+define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \
+		$(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/VirtualKeyboard $(TARGET_DIR)/usr/qml/QtQuick
+	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS)
+	$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5wayland/Config.in b/bsp/buildroot/package/qt5/qt5wayland/Config.in
new file mode 100644
index 00000000..0182d3ca
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5wayland/Config.in
@@ -0,0 +1,27 @@
+comment "qt5wayland needs an OpenGL-capable backend"
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE
+
+config BR2_PACKAGE_QT5WAYLAND
+	bool "qt5wayland"
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_WAYLAND
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5wayland module.
+
+	  http://qt.io
+
+if BR2_PACKAGE_QT5WAYLAND
+
+config BR2_PACKAGE_QT5WAYLAND_COMPOSITOR
+	bool "Enable compositor (experimental)"
+	help
+	  The compositor API is still experimental, and not built by
+	  default.
+
+endif
diff --git a/bsp/buildroot/package/qt5/qt5wayland/qt5wayland.hash b/bsp/buildroot/package/qt5/qt5wayland/qt5wayland.hash
new file mode 100644
index 00000000..6e9079b9
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5wayland/qt5wayland.hash
@@ -0,0 +1,16 @@
+# hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist
+sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz
+
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwayland-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 6dd066b1ab518b16dc2bebc4b3629528a30161cfce48ce5d8482c67a570667d8  qtwayland-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5wayland/qt5wayland.mk b/bsp/buildroot/package/qt5/qt5wayland/qt5wayland.mk
new file mode 100644
index 00000000..8a7f2e1f
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5wayland/qt5wayland.mk
@@ -0,0 +1,68 @@
+################################################################################
+#
+# qt5wayland
+#
+################################################################################
+
+QT5WAYLAND_VERSION = $(QT5_VERSION)
+QT5WAYLAND_SITE = $(QT5_SITE)
+QT5WAYLAND_SOURCE = qtwayland-opensource-src-$(QT5WAYLAND_VERSION).tar.xz
+QT5WAYLAND_DEPENDENCIES = qt5base qt5declarative wayland
+QT5WAYLAND_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y)
+QT5WAYLAND_DEPENDENCIES += libxkbcommon
+endif
+
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5WAYLAND_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5WAYLAND_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
+else
+QT5WAYLAND_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
+QT5WAYLAND_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
+endif
+
+ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)
+QT5WAYLAND_QMAKEFLAGS += CONFIG+=wayland-compositor
+endif
+
+# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag
+# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if
+# the libxcb is not selected.
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx)
+QT5WAYLAND_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS
+endif
+
+define QT5WAYLAND_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake $(QT5WAYLAND_QMAKEFLAGS))
+endef
+
+define QT5WAYLAND_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WAYLAND_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_PACKAGE_QT5WAYLAND_COMPOSITOR),y)
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+define QT5WAYLAND_INSTALL_COMPOSITOR
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandCompositor.so* $(TARGET_DIR)/usr/lib
+endef
+else
+define QT5WAYLAND_INSTALL_COMPOSITOR
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5Compositor.so* $(TARGET_DIR)/usr/lib
+endef
+endif
+endif
+
+define QT5WAYLAND_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WaylandClient.so* $(TARGET_DIR)/usr/lib
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/wayland* $(TARGET_DIR)/usr/lib/qt/plugins
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforms/libqwayland* $(TARGET_DIR)/usr/lib/qt/plugins/platforms
+	$(QT5WAYLAND_INSTALL_COMPOSITOR)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash b/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
index ac6a8278..b78f9172 100644
--- a/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
+++ b/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.hash
@@ -1,5 +1,17 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebchannel-opensource-src-5.8.0.tar.xz
-sha256 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a  qtwebchannel-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebchannel-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 222df712c661d4003eebf28806cfd25047721e1c21b70ca320c5978c4a2c7ba5  qtwebchannel-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk b/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk
index 9522a745..d46e053a 100644
--- a/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk
+++ b/bsp/buildroot/package/qt5/qt5webchannel/qt5webchannel.mk
@@ -10,20 +10,15 @@ QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.
 QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets
 QT5WEBCHANNEL_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5WEBCHANNEL_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5WEBCHANNEL_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3c (examples)
-endif
-else
-QT5WEBCHANNEL_LICENSE = Commercial license
-QT5WEBCHANNEL_REDISTRIBUTE = NO
+QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3-Clause (examples)
 endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
@@ -31,7 +26,7 @@ QT5WEBCHANNEL_DEPENDENCIES += qt5declarative
 endif
 
 define QT5WEBCHANNEL_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5WEBCHANNEL_BUILD_CMDS
@@ -43,10 +38,17 @@ define QT5WEBCHANNEL_INSTALL_STAGING_CMDS
 	$(QT5_LA_PRL_FILES_FIXUP)
 endef
 
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
+	$(INSTALL) -m 0644 -D $(@D)/examples/webchannel/shared/qwebchannel.js \
+		$(TARGET_DIR)/var/www/qwebchannel.js
+endef
+else
 define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT
 	$(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \
 		$(TARGET_DIR)/var/www/qwebchannel.js
 endef
+endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5WEBCHANNEL_INSTALL_TARGET_QMLS
diff --git a/bsp/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch b/bsp/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
new file mode 100644
index 00000000..15cd9f87
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/5.6.3/0001-Change-default-SSL-directory.patch
@@ -0,0 +1,35 @@
+From fc41c0f572ff347142cca4bf5d82b87782bb5906 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
+Date: Thu, 23 Nov 2017 16:18:06 -0500
+Subject: [PATCH] Change default SSL directory
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Change the default SSL directory, as buildroot ca-cert package is
+installed at /etc/ssl. That way, we don't have to use the SSL_CERT_DIR
+environment at runtime.
+
+Upstream-Status: Inappropriate
+Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com>
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+---
+ src/core/qtwebengine_extras.gypi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
+index 229421ef..3b2386c0 100644
+--- a/src/core/qtwebengine_extras.gypi
++++ b/src/core/qtwebengine_extras.gypi
+@@ -96,7 +96,7 @@
+             'GL_GLEXT_PROTOTYPES',
+             'EGL_EGLEXT_PROTOTYPES',
+             # At runtime the env variable SSL_CERT_DIR can be used to override this
+-            'OPENSSLDIR="/usr/lib/ssl"',
++            'OPENSSLDIR="/etc/ssl"',
+             'OPENSSL_LOAD_CONF',
+             'EGL_API_FB=1',
+             'LINUX=1',
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch b/bsp/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
new file mode 100644
index 00000000..05ed2956
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/5.6.3/0002-Load-libEGL-and-libGLES2-symbols-implicitly.patch
@@ -0,0 +1,93 @@
+From bdfd084296681bcead17c42f1e5cf0e24ee04f65 Mon Sep 17 00:00:00 2001
+From: Viktor Engelmann <viktor.engelmann@qt.io>
+Date: Fri, 7 Jul 2017 12:56:19 +0200
+Subject: [PATCH] Load libEGL and libGLES2 symbols implicitly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Instead of explicitly loading libraries from hard-coded locations,
+we now just call dlopen(NULL, RTLD_LAZY). This returns a handle to
+the host process'es context, which already contains the symbols of
+both these libraries, because we link against them.
+It was necessary to bypass LoadLibrary, because that expects a non-NULL
+file path, so we couldn't pass NULL through that interface.
+
+Upstream-Status: Merged
+Task-number: QTBUG-57761
+Change-Id: I29f037dfe542222b5188a33c7727c81a464a87bb
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Reviewed-by: Michal Klocek <michal.klocek@qt.io>
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+[gportay: backport from 5.9 and merge conflicts]
+---
+ src/core/surface_factory_qt.cpp | 40 ++++++++--------------------------------
+ 1 file changed, 8 insertions(+), 32 deletions(-)
+
+diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp
+index 48c91bfc..c6059b67 100644
+--- a/src/core/surface_factory_qt.cpp
++++ b/src/core/surface_factory_qt.cpp
+@@ -51,51 +51,27 @@
+ #if defined(USE_OZONE)
+ 
+ #include <EGL/egl.h>
+-
+-#ifndef QT_LIBDIR_EGL
+-#define QT_LIBDIR_EGL "/usr/lib"
+-#endif
+-#ifndef QT_LIBDIR_GLES2
+-#define QT_LIBDIR_GLES2 QT_LIBDIR_EGL
+-#endif
++#include <dlfcn.h>
+ 
+ namespace QtWebEngineCore {
+ 
+-base::NativeLibrary LoadLibrary(const base::FilePath& filename) {
+-    base::NativeLibraryLoadError error;
+-    base::NativeLibrary library = base::LoadNativeLibrary(filename, &error);
+-    if (!library) {
+-        LOG(ERROR) << "Failed to load " << filename.MaybeAsASCII() << ": " << error.ToString();
+-        return NULL;
+-    }
+-    return library;
+-}
+-
+ bool SurfaceFactoryQt::LoadEGLGLES2Bindings(AddGLLibraryCallback add_gl_library, SetGLGetProcAddressProcCallback set_gl_get_proc_address)
+ {
+-    base::FilePath libEGLPath = QtWebEngineCore::toFilePath(QT_LIBDIR_EGL);
+-    libEGLPath = libEGLPath.Append("libEGL.so.1");
+-    base::NativeLibrary eglLibrary = LoadLibrary(libEGLPath);
+-    if (!eglLibrary)
+-        return false;
+-
+-    base::FilePath libGLES2Path = QtWebEngineCore::toFilePath(QT_LIBDIR_GLES2);
+-    libGLES2Path = libGLES2Path.Append("libGLESv2.so.2");
+-    base::NativeLibrary gles2Library = LoadLibrary(libGLES2Path);
+-    if (!gles2Library)
++    base::NativeLibrary eglgles2Library = dlopen(NULL, RTLD_LAZY);
++    if (!eglgles2Library) {
++        LOG(ERROR) << "Failed to open EGL/GLES2 context " << dlerror();
+         return false;
++    }
+ 
+-    gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast<gfx::GLGetProcAddressProc>(base::GetFunctionPointerFromNativeLibrary(eglLibrary, "eglGetProcAddress"));
++    gfx::GLGetProcAddressProc get_proc_address = reinterpret_cast<gfx::GLGetProcAddressProc>(base::GetFunctionPointerFromNativeLibrary(eglgles2Library, "eglGetProcAddress"));
+     if (!get_proc_address) {
+         LOG(ERROR) << "eglGetProcAddress not found.";
+-        base::UnloadNativeLibrary(eglLibrary);
+-        base::UnloadNativeLibrary(gles2Library);
++        base::UnloadNativeLibrary(eglgles2Library);
+         return false;
+     }
+ 
+     gfx::SetGLGetProcAddressProc(get_proc_address);
+-    gfx::AddGLNativeLibrary(eglLibrary);
+-    gfx::AddGLNativeLibrary(gles2Library);
++    gfx::AddGLNativeLibrary(eglgles2Library);
+     return true;
+ }
+ 
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/qt5/qt5webengine/Config.in b/bsp/buildroot/package/qt5/qt5webengine/Config.in
new file mode 100644
index 00000000..7c992550
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/Config.in
@@ -0,0 +1,94 @@
+config BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+	bool
+	default y if BR2_aarch64 || BR2_arm || \
+		BR2_i386 || BR2_x86_64 || \
+		BR2_mips || BR2_mips64
+	# -m32 flag is used for 32bit builds and host tools have
+	# limited architecture support
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
+	depends on !BR2_BINFMT_FLAT # qt5base-icu
+	depends on BR2_USE_MMU # libglib2, qt5base-dbus
+
+comment "qt5webengine needs udev /dev management and a glibc toolchain w/ gcc >= 4.8, host gcc >= 4.8, threads, wchar"
+	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_USES_GLIBC || \
+		!BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+
+comment "qt5webengine needs an OpenGL and EGL-capable backend"
+	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+	depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL
+
+config BR2_PACKAGE_QT5WEBENGINE
+	bool "qt5webengine"
+	depends on BR2_PACKAGE_QT5WEBENGINE_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h, mallinfo
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # qt5base-icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # qt5base-icu
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs
+	depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs
+	depends on BR2_PACKAGE_HAS_UDEV
+	# v8 (a chromium 3rd-party) compiles its internal host-tools with the
+	# same word size as the target. For 32-bits targets, it adds the -m32
+	# flag (for 64-bits, it adds the -m64 flag).
+	# https://github.com/v8/v8/blob/5.6.326.55/gypfiles/toolchain.gypi#L1036-L1037
+	select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 # v8/chromium
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBVPX
+	select BR2_PACKAGE_OPUS
+	select BR2_PACKAGE_WEBP
+	select BR2_PACKAGE_WEBP_DEMUX
+	select BR2_PACKAGE_QT5BASE_DBUS
+	select BR2_PACKAGE_QT5BASE_EGLFS
+	select BR2_PACKAGE_QT5BASE_FONTCONFIG
+	select BR2_PACKAGE_QT5BASE_ICU
+	select BR2_PACKAGE_QT5BASE_GUI
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	select BR2_PACKAGE_QT5DECLARATIVE
+	select BR2_PACKAGE_QT5DECLARATIVE_QUICK
+	select BR2_PACKAGE_QT5QUICKCONTROLS
+	select BR2_PACKAGE_QT5QUICKCONTROLS2
+	select BR2_PACKAGE_QT5WEBCHANNEL
+	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXCURSOR if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXI if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB
+	help
+	  The Qt WebEngine module provides a web browser engine that
+	  makes it easy to embed content from the World Wide Web into
+	  your Qt application.
+
+	  Qt WebEngine provides C++ classes and QML types for rendering
+	  HTML, XHTML, and SVG documents, styled using Cascading Style
+	  Sheets (CSS) and scripted with JavaScript. HTML documents can
+	  be made fully editable by the user through the use of the
+	  contenteditable attribute on HTML elements.
+
+	  http://doc.qt.io/qt-5/qtwebengine-index.html
+
+if BR2_PACKAGE_QT5WEBENGINE
+
+config BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS
+	bool "proprietary codecs"
+	help
+	  Qt WebEngine supports the MPEG-4 Part 14 (MP4) file format,
+	  which includes required proprietary audio and video codecs,
+	  such as H.264 and MPEG layer-3 (MP3).
+
+config BR2_PACKAGE_QT5WEBENGINE_ALSA
+	bool "alsa"
+	select BR2_PACKAGE_ALSA_LIB
+	select BR2_PACKAGE_ALSA_LIB_MIXER
+	select BR2_PACKAGE_ALSA_LIB_RAWMIDI
+	select BR2_PACKAGE_ALSA_LIB_HWDEP
+	select BR2_PACKAGE_ALSA_LIB_SEQ
+	help
+	  Enable ALSA support.
+
+endif
diff --git a/bsp/buildroot/package/qt5/qt5webengine/chromium-latest.inc b/bsp/buildroot/package/qt5/qt5webengine/chromium-latest.inc
new file mode 100644
index 00000000..da709fd5
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/chromium-latest.inc
@@ -0,0 +1,310 @@
+CHROMIUM_LICENSE_FILES = \
+	src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \
+	src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \
+	src/3rdparty/chromium/base/third_party/icu/LICENSE \
+	src/3rdparty/chromium/base/third_party/libevent/LICENSE \
+	src/3rdparty/chromium/base/third_party/nspr/LICENSE \
+	src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \
+	src/3rdparty/chromium/base/third_party/symbolize/LICENSE \
+	src/3rdparty/chromium/base/third_party/valgrind/LICENSE \
+	src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \
+	src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \
+	src/3rdparty/chromium/buildtools/LICENSE \
+	src/3rdparty/chromium/buildtools/third_party/libc++abi/trunk/LICENSE.TXT \
+	src/3rdparty/chromium/buildtools/third_party/libc++/trunk/LICENSE.TXT \
+	src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \
+	src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \
+	src/3rdparty/chromium/LICENSE \
+	src/3rdparty/chromium/LICENSE.chromium_os \
+	src/3rdparty/chromium/mojo/public/LICENSE \
+	src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \
+	src/3rdparty/chromium/net/third_party/nss/LICENSE \
+	src/3rdparty/chromium/ppapi/LICENSE \
+	src/3rdparty/chromium/sdch/open-vcdiff/COPYING \
+	src/3rdparty/chromium/testing/gmock/LICENSE \
+	src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \
+	src/3rdparty/chromium/testing/gtest/LICENSE \
+	src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \
+	src/3rdparty/chromium/third_party/afl/src/docs/COPYING \
+	src/3rdparty/chromium/third_party/angle/LICENSE \
+	src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \
+	src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \
+	src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \
+	src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \
+	src/3rdparty/chromium/third_party/apache_velocity/LICENSE \
+	src/3rdparty/chromium/third_party/apple_apsl/LICENSE \
+	src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \
+	src/3rdparty/chromium/third_party/blanketjs/LICENSE \
+	src/3rdparty/chromium/third_party/blimp_fonts/LICENSE \
+	src/3rdparty/chromium/third_party/blimp_fonts/LICENSE.Apache \
+	src/3rdparty/chromium/third_party/blimp_fonts/LICENSE.OFL \
+	src/3rdparty/chromium/third_party/boringssl/src/LICENSE \
+	src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \
+	src/3rdparty/chromium/third_party/bouncycastle/LICENSE \
+	src/3rdparty/chromium/third_party/brotli/LICENSE \
+	src/3rdparty/chromium/third_party/bspatch/LICENSE \
+	src/3rdparty/chromium/third_party/byte_buddy/LICENSE \
+	src/3rdparty/chromium/third_party/ced/LICENSE \
+	src/3rdparty/chromium/third_party/ced/src/LICENSE \
+	src/3rdparty/chromium/third_party/chaijs/LICENSE \
+	src/3rdparty/chromium/third_party/checkstyle/LICENSE \
+	src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \
+	src/3rdparty/chromium/third_party/cld_3/LICENSE \
+	src/3rdparty/chromium/third_party/cld_3/src/LICENSE \
+	src/3rdparty/chromium/third_party/cld/LICENSE \
+	src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \
+	src/3rdparty/chromium/third_party/closure_compiler/LICENSE \
+	src/3rdparty/chromium/third_party/closure_linter/LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \
+	src/3rdparty/chromium/third_party/cros_system_api/LICENSE \
+	src/3rdparty/chromium/third_party/cros_system_api/MODULE_LICENSE_BSD \
+	src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \
+	src/3rdparty/chromium/third_party/d3/src/LICENSE \
+	src/3rdparty/chromium/third_party/decklink/LICENSE \
+	src/3rdparty/chromium/third_party/devscripts/COPYING \
+	src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \
+	src/3rdparty/chromium/third_party/dpkg-dev/LICENSE \
+	src/3rdparty/chromium/third_party/drmemory/LICENSE \
+	src/3rdparty/chromium/third_party/errorprone/LICENSE \
+	src/3rdparty/chromium/third_party/espresso/LICENSE \
+	src/3rdparty/chromium/third_party/expat/files/COPYING \
+	src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \
+	src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \
+	src/3rdparty/chromium/third_party/fips181/COPYING \
+	src/3rdparty/chromium/third_party/flac/COPYING.FDL \
+	src/3rdparty/chromium/third_party/flac/COPYING.GPL \
+	src/3rdparty/chromium/third_party/flac/COPYING.LGPL \
+	src/3rdparty/chromium/third_party/flac/COPYING.Xiph \
+	src/3rdparty/chromium/third_party/flatbuffers/LICENSE \
+	src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \
+	src/3rdparty/chromium/third_party/flot/LICENSE.txt \
+	src/3rdparty/chromium/third_party/fontconfig/LICENSE \
+	src/3rdparty/chromium/third_party/fontconfig/src/COPYING \
+	src/3rdparty/chromium/third_party/freetype2/src/docs/GPLv2.TXT \
+	src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \
+	src/3rdparty/chromium/third_party/gif_player/LICENSE \
+	src/3rdparty/chromium/third_party/glslang/LICENSE \
+	src/3rdparty/chromium/third_party/grpc/LICENSE \
+	src/3rdparty/chromium/third_party/grpc/src/node/health_check/LICENSE \
+	src/3rdparty/chromium/third_party/grpc/src/php/ext/grpc/LICENSE \
+	src/3rdparty/chromium/third_party/grpc/third_party/nanopb/LICENSE.txt \
+	src/3rdparty/chromium/third_party/grpc/third_party/rake-compiler-dock/LICENSE.txt \
+	src/3rdparty/chromium/third_party/guava/LICENSE \
+	src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \
+	src/3rdparty/chromium/third_party/haha/LICENSE \
+	src/3rdparty/chromium/third_party/hamcrest/LICENSE \
+	src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \
+	src/3rdparty/chromium/third_party/hunspell/COPYING \
+	src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \
+	src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \
+	src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \
+	src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \
+	src/3rdparty/chromium/third_party/hwcplus/LICENSE \
+	src/3rdparty/chromium/third_party/iaccessible2/LICENSE \
+	src/3rdparty/chromium/third_party/iccjpeg/LICENSE \
+	src/3rdparty/chromium/third_party/icu4j/LICENSE \
+	src/3rdparty/chromium/third_party/icu/LICENSE \
+	src/3rdparty/chromium/third_party/icu/license.html \
+	src/3rdparty/chromium/third_party/icu/scripts/LICENSE \
+	src/3rdparty/chromium/third_party/ijar/LICENSE \
+	src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \
+	src/3rdparty/chromium/third_party/intellij/LICENSE \
+	src/3rdparty/chromium/third_party/isimpledom/LICENSE \
+	src/3rdparty/chromium/third_party/javax_inject/LICENSE \
+	src/3rdparty/chromium/third_party/jinja2/LICENSE \
+	src/3rdparty/chromium/third_party/jmake/LICENSE \
+	src/3rdparty/chromium/third_party/jsoncpp/LICENSE \
+	src/3rdparty/chromium/third_party/jstemplate/COPYING \
+	src/3rdparty/chromium/third_party/khronos/LICENSE \
+	src/3rdparty/chromium/third_party/leakcanary/LICENSE \
+	src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \
+	src/3rdparty/chromium/third_party/libaddressinput/LICENSE \
+	src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \
+	src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \
+	src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/libjpeg/LICENSE \
+	src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \
+	src/3rdparty/chromium/third_party/libpng/LICENSE \
+	src/3rdparty/chromium/third_party/libsecret/LICENSE \
+	src/3rdparty/chromium/third_party/libsrtp/LICENSE \
+	src/3rdparty/chromium/third_party/libsync/LICENSE \
+	src/3rdparty/chromium/third_party/libudev/LICENSE \
+	src/3rdparty/chromium/third_party/libusb/src/COPYING \
+	src/3rdparty/chromium/third_party/libva/COPYING \
+	src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \
+	src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \
+	src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \
+	src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/libwebp/LICENSE \
+	src/3rdparty/chromium/third_party/libxml/src/COPYING \
+	src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \
+	src/3rdparty/chromium/third_party/libxslt/linux/COPYING \
+	src/3rdparty/chromium/third_party/libyuv/LICENSE \
+	src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \
+	src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \
+	src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \
+	src/3rdparty/chromium/third_party/mach_override/LICENSE \
+	src/3rdparty/chromium/third_party/markupsafe/LICENSE \
+	src/3rdparty/chromium/third_party/mesa/LICENSE \
+	src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \
+	src/3rdparty/chromium/third_party/mesa/src/docs/license.html \
+	src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/minigbm/LICENSE \
+	src/3rdparty/chromium/third_party/mocha/LICENSE \
+	src/3rdparty/chromium/third_party/mockito/LICENSE \
+	src/3rdparty/chromium/third_party/modp_b64/LICENSE \
+	src/3rdparty/chromium/third_party/molokocacao/LICENSE \
+	src/3rdparty/chromium/third_party/motemplate/LICENSE \
+	src/3rdparty/chromium/third_party/mozilla/LICENSE \
+	src/3rdparty/chromium/third_party/mt19937ar/LICENSE \
+	src/3rdparty/chromium/third_party/netty4/LICENSE \
+	src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \
+	src/3rdparty/chromium/third_party/objenesis/LICENSE \
+	src/3rdparty/chromium/third_party/ocmock/License.txt \
+	src/3rdparty/chromium/third_party/openh264/src/LICENSE \
+	src/3rdparty/chromium/third_party/openmax_dl/LICENSE \
+	src/3rdparty/chromium/third_party/opus/src/COPYING \
+	src/3rdparty/chromium/third_party/ots/LICENSE \
+	src/3rdparty/chromium/third_party/ow2_asm/LICENSE \
+	src/3rdparty/chromium/third_party/pdfium/LICENSE \
+	src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \
+	src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \
+	src/3rdparty/chromium/third_party/pexpect/LICENSE \
+	src/3rdparty/chromium/third_party/ply/LICENSE \
+	src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \
+	src/3rdparty/chromium/third_party/proguard/LICENSE \
+	src/3rdparty/chromium/third_party/protobuf/LICENSE \
+	src/3rdparty/chromium/third_party/pycoverage/LICENSE \
+	src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \
+	src/3rdparty/chromium/third_party/pyelftools/LICENSE \
+	src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \
+	src/3rdparty/chromium/third_party/pymock/LICENSE.txt \
+	src/3rdparty/chromium/third_party/python_gflags/COPYING \
+	src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \
+	src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \
+	src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \
+	src/3rdparty/chromium/third_party/qcms/src/COPYING \
+	src/3rdparty/chromium/third_party/qunit/LICENSE \
+	src/3rdparty/chromium/third_party/re2/LICENSE \
+	src/3rdparty/chromium/third_party/re2/src/LICENSE \
+	src/3rdparty/chromium/third_party/requests/LICENSE \
+	src/3rdparty/chromium/third_party/robolectric/LICENSE \
+	src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \
+	src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \
+	src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \
+	src/3rdparty/chromium/third_party/sfntly/COPYING.txt \
+	src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \
+	src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \
+	src/3rdparty/chromium/third_party/shaderc/LICENSE \
+	src/3rdparty/chromium/third_party/shaderc/src/LICENSE \
+	src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \
+	src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \
+	src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \
+	src/3rdparty/chromium/third_party/sinonjs/LICENSE \
+	src/3rdparty/chromium/third_party/skia/LICENSE \
+	src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \
+	src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \
+	src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \
+	src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \
+	src/3rdparty/chromium/third_party/smhasher/LICENSE \
+	src/3rdparty/chromium/third_party/snappy/src/COPYING \
+	src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \
+	src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \
+	src/3rdparty/chromium/third_party/sqlite4java/LICENSE \
+	src/3rdparty/chromium/third_party/sqlite/LICENSE \
+	src/3rdparty/chromium/third_party/sqlite/sqlite-src-3100200/autoconf/tea/license.terms \
+	src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \
+	src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \
+	src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \
+	src/3rdparty/chromium/third_party/tcmalloc/LICENSE \
+	src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \
+	src/3rdparty/chromium/third_party/tlslite/LICENSE \
+	src/3rdparty/chromium/third_party/typ/LICENSE \
+	src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \
+	src/3rdparty/chromium/third_party/usb_ids/LICENSE \
+	src/3rdparty/chromium/third_party/usrsctp/LICENSE \
+	src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \
+	src/3rdparty/chromium/third_party/v4l2capture/LICENSE \
+	src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \
+	src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \
+	src/3rdparty/chromium/third_party/vulkan/LICENSE \
+	src/3rdparty/chromium/third_party/wayland/LICENSE \
+	src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \
+	src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \
+	src/3rdparty/chromium/third_party/wayland/src/COPYING \
+	src/3rdparty/chromium/third_party/wds/LICENSE \
+	src/3rdparty/chromium/third_party/wds/src/COPYING \
+	src/3rdparty/chromium/third_party/web-animations-js/LICENSE \
+	src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \
+	src/3rdparty/chromium/third_party/webdriver/COPYING \
+	src/3rdparty/chromium/third_party/webdriver/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \
+	src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \
+	src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \
+	src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/formatter_worker/acorn/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/gonzales/MIT-LICENSE.txt \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/terminal/xterm.js/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \
+	src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \
+	src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \
+	src/3rdparty/chromium/third_party/webpagereplay/COPYING \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/jsmin/LICENSE.txt \
+	src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \
+	src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \
+	src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \
+	src/3rdparty/chromium/third_party/webrtc/LICENSE \
+	src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \
+	src/3rdparty/chromium/third_party/webtreemap/src/COPYING \
+	src/3rdparty/chromium/third_party/woff2/LICENSE \
+	src/3rdparty/chromium/third_party/x86inc/LICENSE \
+	src/3rdparty/chromium/third_party/xdg-utils/LICENSE \
+	src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \
+	src/3rdparty/chromium/third_party/yasm/source/patched-yasm/GNU_GPL-2.0 \
+	src/3rdparty/chromium/third_party/yasm/source/patched-yasm/GNU_LGPL-2.0 \
+	src/3rdparty/chromium/third_party/zlib/LICENSE \
+	src/3rdparty/chromium/tools/gn/out/Release/obj/third_party/widevine/cdm/widevine_test_license_server.ninja \
+	src/3rdparty/chromium/tools/gyp/LICENSE \
+	src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \
+	src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \
+	src/3rdparty/chromium/tools/symsrc/COPYING-pefile \
+	src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \
+	src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \
+	src/3rdparty/chromium/v8/LICENSE \
+	src/3rdparty/chromium/v8/LICENSE.fdlibm \
+	src/3rdparty/chromium/v8/LICENSE.strongtalk \
+	src/3rdparty/chromium/v8/LICENSE.v8 \
+	src/3rdparty/chromium/v8/LICENSE.valgrind \
+	src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \
+	src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \
+	src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \
+
diff --git a/bsp/buildroot/package/qt5/qt5webengine/chromium-lts.inc b/bsp/buildroot/package/qt5/qt5webengine/chromium-lts.inc
new file mode 100644
index 00000000..bff79316
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/chromium-lts.inc
@@ -0,0 +1,248 @@
+CHROMIUM_LICENSE_FILES = \
+	src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \
+	src/3rdparty/chromium/sdch/open-vcdiff/COPYING \
+	src/3rdparty/chromium/tools/gyp/LICENSE \
+	src/3rdparty/chromium/v8/LICENSE.v8 \
+	src/3rdparty/chromium/v8/LICENSE.strongtalk \
+	src/3rdparty/chromium/v8/LICENSE.valgrind \
+	src/3rdparty/chromium/v8/LICENSE \
+	src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \
+	src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \
+	src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \
+	src/3rdparty/chromium/base/third_party/nspr/LICENSE \
+	src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \
+	src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \
+	src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \
+	src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \
+	src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \
+	src/3rdparty/chromium/base/third_party/valgrind/LICENSE \
+	src/3rdparty/chromium/base/third_party/icu/LICENSE \
+	src/3rdparty/chromium/base/third_party/libevent/LICENSE \
+	src/3rdparty/chromium/base/third_party/symbolize/LICENSE \
+	src/3rdparty/chromium/testing/gtest/LICENSE \
+	src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \
+	src/3rdparty/chromium/testing/gmock/LICENSE \
+	src/3rdparty/chromium/ppapi/LICENSE \
+	src/3rdparty/chromium/third_party/class-dump/LICENSE \
+	src/3rdparty/chromium/third_party/libxslt/linux/COPYING \
+	src/3rdparty/chromium/third_party/proguard/LICENSE \
+	src/3rdparty/chromium/third_party/pexpect/LICENSE \
+	src/3rdparty/chromium/third_party/webtreemap/src/COPYING \
+	src/3rdparty/chromium/third_party/usb_ids/LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \
+	src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \
+	src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \
+	src/3rdparty/chromium/third_party/fips181/COPYING \
+	src/3rdparty/chromium/third_party/talloc/LICENSE \
+	src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \
+	src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \
+	src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \
+	src/3rdparty/chromium/third_party/devscripts/COPYING \
+	src/3rdparty/chromium/third_party/webdriver/COPYING \
+	src/3rdparty/chromium/third_party/webdriver/LICENSE \
+	src/3rdparty/chromium/third_party/cld/LICENSE \
+	src/3rdparty/chromium/third_party/jsoncpp/LICENSE \
+	src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \
+	src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \
+	src/3rdparty/chromium/third_party/libva/COPYING \
+	src/3rdparty/chromium/third_party/bspatch/LICENSE \
+	src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \
+	src/3rdparty/chromium/third_party/v4l2capture/LICENSE \
+	src/3rdparty/chromium/third_party/boringssl/src/LICENSE \
+	src/3rdparty/chromium/third_party/cardboard-java/LICENSE \
+	src/3rdparty/chromium/third_party/errorprone/LICENSE \
+	src/3rdparty/chromium/third_party/fontconfig/LICENSE \
+	src/3rdparty/chromium/third_party/fontconfig/src/COPYING \
+	src/3rdparty/chromium/third_party/python_gflags/COPYING \
+	src/3rdparty/chromium/third_party/gif_player/LICENSE \
+	src/3rdparty/chromium/third_party/libexif/sources/COPYING \
+	src/3rdparty/chromium/third_party/sinonjs/LICENSE \
+	src/3rdparty/chromium/third_party/lcov/COPYING \
+	src/3rdparty/chromium/third_party/iaccessible2/LICENSE \
+	src/3rdparty/chromium/third_party/cros_system_api/LICENSE \
+	src/3rdparty/chromium/third_party/libpng/LICENSE \
+	src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \
+	src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \
+	src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \
+	src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \
+	src/3rdparty/chromium/third_party/skia/LICENSE \
+	src/3rdparty/chromium/third_party/drmemory/LICENSE \
+	src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \
+	src/3rdparty/chromium/third_party/iccjpeg/LICENSE \
+	src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \
+	src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \
+	src/3rdparty/chromium/third_party/qunit/LICENSE \
+	src/3rdparty/chromium/third_party/zlib/LICENSE \
+	src/3rdparty/chromium/third_party/minigbm/LICENSE \
+	src/3rdparty/chromium/third_party/tlslite/LICENSE \
+	src/3rdparty/chromium/third_party/qcms/src/COPYING \
+	src/3rdparty/chromium/third_party/mach_override/LICENSE \
+	src/3rdparty/chromium/third_party/mesa/LICENSE \
+	src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \
+	src/3rdparty/chromium/third_party/mesa/src/docs/license.html \
+	src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/mesa/src/src/mapi/glapi/gen/license.py \
+	src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \
+	src/3rdparty/chromium/third_party/usrsctp/LICENSE \
+	src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \
+	src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \
+	src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \
+	src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \
+	src/3rdparty/chromium/third_party/webrtc/LICENSE \
+	src/3rdparty/chromium/third_party/libwebp/LICENSE \
+	src/3rdparty/chromium/third_party/snappy/src/COPYING \
+	src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \
+	src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \
+	src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \
+	src/3rdparty/chromium/third_party/robolectric/LICENSE \
+	src/3rdparty/chromium/third_party/flot/LICENSE.txt \
+	src/3rdparty/chromium/third_party/openmax_dl/LICENSE \
+	src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \
+	src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \
+	src/3rdparty/chromium/third_party/protobuf/COPYING.txt \
+	src/3rdparty/chromium/third_party/typ/LICENSE \
+	src/3rdparty/chromium/third_party/d3/src/LICENSE \
+	src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \
+	src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/expat/files/COPYING \
+	src/3rdparty/chromium/third_party/smhasher/LICENSE \
+	src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \
+	src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \
+	src/3rdparty/chromium/third_party/closure_compiler/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \
+	src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \
+	src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \
+	src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \
+	src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \
+	src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \
+	src/3rdparty/chromium/third_party/WebKit/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \
+	src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \
+	src/3rdparty/chromium/third_party/modp_b64/LICENSE \
+	src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \
+	src/3rdparty/chromium/third_party/molokocacao/LICENSE \
+	src/3rdparty/chromium/third_party/wayland/LICENSE \
+	src/3rdparty/chromium/third_party/wayland/src/COPYING \
+	src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \
+	src/3rdparty/chromium/third_party/ocmock/License.txt \
+	src/3rdparty/chromium/third_party/swiftshader/LICENSE \
+	src/3rdparty/chromium/third_party/hwcplus/LICENSE \
+	src/3rdparty/chromium/third_party/libsecret/LICENSE \
+	src/3rdparty/chromium/third_party/nss/nspr/LICENSE \
+	src/3rdparty/chromium/third_party/nss/nss/COPYING \
+	src/3rdparty/chromium/third_party/jinja2/LICENSE \
+	src/3rdparty/chromium/third_party/decklink/LICENSE \
+	src/3rdparty/chromium/third_party/hunspell/COPYING \
+	src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \
+	src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \
+	src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \
+	src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \
+	src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \
+	src/3rdparty/chromium/third_party/pyelftools/LICENSE \
+	src/3rdparty/chromium/third_party/jmake/LICENSE \
+	src/3rdparty/chromium/third_party/requests/LICENSE \
+	src/3rdparty/chromium/third_party/ijar/LICENSE \
+	src/3rdparty/chromium/third_party/pycoverage/LICENSE \
+	src/3rdparty/chromium/third_party/re2/LICENSE \
+	src/3rdparty/chromium/third_party/re2/src/LICENSE \
+	src/3rdparty/chromium/third_party/blanketjs/LICENSE \
+	src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \
+	src/3rdparty/chromium/third_party/closure_linter/LICENSE \
+	src/3rdparty/chromium/third_party/webpagereplay/COPYING \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \
+	src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \
+	src/3rdparty/chromium/third_party/libusb/src/COPYING \
+	src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \
+	src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \
+	src/3rdparty/chromium/third_party/opus/src/COPYING \
+	src/3rdparty/chromium/third_party/isimpledom/LICENSE \
+	src/3rdparty/chromium/third_party/mt19937ar/LICENSE \
+	src/3rdparty/chromium/third_party/openh264/src/LICENSE \
+	src/3rdparty/chromium/third_party/markupsafe/LICENSE \
+	src/3rdparty/chromium/third_party/ply/license.patch \
+	src/3rdparty/chromium/third_party/ply/LICENSE \
+	src/3rdparty/chromium/third_party/khronos/LICENSE \
+	src/3rdparty/chromium/third_party/sfntly/COPYING.txt \
+	src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \
+	src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \
+	src/3rdparty/chromium/third_party/ots/LICENSE \
+	src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \
+	src/3rdparty/chromium/third_party/brotli/LICENSE \
+	src/3rdparty/chromium/third_party/icu/license.html \
+	src/3rdparty/chromium/third_party/icu/LICENSE \
+	src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \
+	src/3rdparty/chromium/third_party/motemplate/LICENSE \
+	src/3rdparty/chromium/third_party/apple_apsl/LICENSE \
+	src/3rdparty/chromium/third_party/angle/LICENSE \
+	src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \
+	src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \
+	src/3rdparty/chromium/third_party/npapi/LICENSE \
+	src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \
+	src/3rdparty/chromium/third_party/libjpeg/LICENSE \
+	src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \
+	src/3rdparty/chromium/third_party/woff2/LICENSE \
+	src/3rdparty/chromium/third_party/appurify-python/LICENSE \
+	src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \
+	src/3rdparty/chromium/third_party/tcmalloc/LICENSE \
+	src/3rdparty/chromium/third_party/jstemplate/COPYING \
+	src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \
+	src/3rdparty/chromium/third_party/mocha/LICENSE \
+	src/3rdparty/chromium/third_party/x86inc/LICENSE \
+	src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \
+	src/3rdparty/chromium/third_party/checkstyle/LICENSE \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \
+	src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \
+	src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \
+	src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \
+	src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \
+	src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \
+	src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \
+	src/3rdparty/chromium/third_party/flac/COPYING.Xiph \
+	src/3rdparty/chromium/third_party/flac/COPYING.GPL \
+	src/3rdparty/chromium/third_party/flac/COPYING.LGPL \
+	src/3rdparty/chromium/third_party/flac/COPYING.FDL \
+	src/3rdparty/chromium/third_party/pymock/LICENSE.txt \
+	src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \
+	src/3rdparty/chromium/third_party/sqlite/LICENSE \
+	src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \
+	src/3rdparty/chromium/third_party/xdg-utils/LICENSE \
+	src/3rdparty/chromium/third_party/mockito/LICENSE \
+	src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \
+	src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \
+	src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \
+	src/3rdparty/chromium/third_party/libudev/LICENSE \
+	src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \
+	src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \
+	src/3rdparty/chromium/third_party/libyuv/LICENSE \
+	src/3rdparty/chromium/third_party/mojo/LICENSE \
+	src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \
+	src/3rdparty/chromium/third_party/chaijs/LICENSE \
+	src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \
+	src/3rdparty/chromium/third_party/web-animations-js/LICENSE \
+	src/3rdparty/chromium/third_party/mozilla/LICENSE \
+	src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \
+	src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \
+	src/3rdparty/chromium/LICENSE.chromium_os \
+	src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \
+	src/3rdparty/chromium/net/third_party/nss/LICENSE \
+	src/3rdparty/chromium/crypto/third_party/nss/LICENSE \
+	src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \
+	src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \
+	src/3rdparty/chromium/LICENSE \
+	src/3rdparty/chromium/mojo/public/LICENSE \
+	src/3rdparty/chromium/buildtools/LICENSE \
+	src/3rdparty/ninja/COPYING
diff --git a/bsp/buildroot/package/qt5/qt5webengine/qt5webengine.hash b/bsp/buildroot/package/qt5/qt5webengine/qt5webengine.hash
new file mode 100644
index 00000000..27ce5898
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/qt5webengine.hash
@@ -0,0 +1,5 @@
+# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist
+sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz
+
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebengine-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 4766707f5d8c174a284c0ed813bc6163db0220d69736424d3370b44b640443a1  qtwebengine-opensource-src-5.9.6.tar.xz
diff --git a/bsp/buildroot/package/qt5/qt5webengine/qt5webengine.mk b/bsp/buildroot/package/qt5/qt5webengine/qt5webengine.mk
new file mode 100644
index 00000000..0efc34cc
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webengine/qt5webengine.mk
@@ -0,0 +1,90 @@
+################################################################################
+#
+# qt5webengine
+#
+################################################################################
+
+QT5WEBENGINE_VERSION = $(QT5_VERSION)
+QT5WEBENGINE_SITE = $(QT5_SITE)
+QT5WEBENGINE_SOURCE = qtwebengine-opensource-src-$(QT5WEBENGINE_VERSION).tar.xz
+QT5WEBENGINE_DEPENDENCIES = ffmpeg libglib2 libvpx opus webp qt5base \
+	qt5declarative qt5webchannel host-bison host-flex host-gperf \
+	host-pkgconf host-python
+QT5WEBENGINE_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+include package/qt5/qt5webengine/chromium-latest.inc
+else
+include package/qt5/qt5webengine/chromium-lts.inc
+endif
+QT5WEBENGINE_LICENSE = GPL-2.0 or LGPL-3.0 or GPL-3.0 or GPL-3.0 with exception
+QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \
+	LICENSE.GPLv3 LICENSE.LGPL3 $(CHROMIUM_LICENSE_FILES)
+
+ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
+QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \
+	xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst
+endif
+
+QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_system_ffmpeg
+
+ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)
+QT5WEBENGINE_QMAKEFLAGS += WEBENGINE_CONFIG+=use_proprietary_codecs
+endif
+
+ifeq ($(BR2_PACKAGE_QT5WEBENGINE_ALSA),y)
+QT5WEBENGINE_DEPENDENCIES += alsa-lib
+else
+QT5WEBENGINE_QMAKEFLAGS += QT_CONFIG-=alsa
+endif
+
+# QtWebengine's build system uses python, but only supports python2. We work
+# around this by forcing python2 early in the PATH, via a python->python2
+# symlink.
+QT5WEBENGINE_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
+define QT5WEBENGINE_PYTHON2_SYMLINK
+	mkdir -p $(@D)/host-bin
+	ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
+endef
+QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
+
+define QT5WEBENGINE_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBENGINE_QMAKEFLAGS))
+endef
+
+define QT5WEBENGINE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBENGINE_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(QT5WEBENGINE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+define QT5WEBENGINE_INSTALL_TARGET_QMLS
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebEngine $(TARGET_DIR)/usr/qml/
+endef
+
+ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
+define QT5WEBENGINE_INSTALL_TARGET_EXAMPLES
+	cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webengine* $(TARGET_DIR)/usr/lib/qt/examples/
+endef
+endif
+
+ifneq ($(BR2_STATIC_LIBS),y)
+define QT5WEBENGINE_INSTALL_TARGET_LIBS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebEngine*.so.* $(TARGET_DIR)/usr/lib
+	cp -dpf $(STAGING_DIR)/usr/libexec/QtWebEngineProcess $(TARGET_DIR)/usr/libexec/
+	cp -dpfr $(STAGING_DIR)/usr/resources/ $(TARGET_DIR)/usr/
+	mkdir -p $(TARGET_DIR)/usr/translations/qtwebengine_locales/
+	cp -dpfr $(STAGING_DIR)/usr/translations/qtwebengine_locales $(TARGET_DIR)/usr/translations/qtwebengine_locales/
+endef
+endif
+
+define QT5WEBENGINE_INSTALL_TARGET_CMDS
+	$(QT5WEBENGINE_INSTALL_TARGET_LIBS)
+	$(QT5WEBENGINE_INSTALL_TARGET_QMLS)
+	$(QT5WEBENGINE_INSTALL_TARGET_EXAMPLES)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5webkit-examples/0001-Build-examples.patch b/bsp/buildroot/package/qt5/qt5webkit-examples/0001-Build-examples.patch
new file mode 100644
index 00000000..6303006f
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit-examples/0001-Build-examples.patch
@@ -0,0 +1,52 @@
+From 78f558df35860484711a600d155ae7a13ebf44b2 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
+Date: Tue, 28 Nov 2017 23:14:42 -0500
+Subject: [PATCH 1/1] Build examples
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+This patch improves the qt5webkit examples build for 2 aspects:
+
+	- Allows to build even if qt5base examples are not enabled
+	- Builds xmlpatterns example only if the qt5xmlpattern package
+	has been built
+
+Signed-off-by: Massimo Callegari <massimocallegari@yahoo.it>
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+[gportay: build imageanalyzer example if concurrent module is built]
+---
+ examples/webkitwidgets/webkitwidgets.pro | 7 ++++---
+ qtwebkit-examples.pro                    | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro
+index ab20df4..67f6785 100644
+--- a/examples/webkitwidgets/webkitwidgets.pro
++++ b/examples/webkitwidgets/webkitwidgets.pro
+@@ -4,9 +4,10 @@ SUBDIRS +=  domtraversal \
+             previewer \
+             fancybrowser \
+             simpleselector \
+-            imageanalyzer \
+             framecapture \
+             browser \
+             embedded \
+-            scroller \
+-            xmlpatterns
++            scroller
++
++qtHaveModule(xmlpatterns): SUBDIRS += xmlpatterns
++qtHaveModule(concurrent): SUBDIRS += imageanalyzer
+diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro
+index 3fcecf1..2ade7ff 100644
+--- a/qtwebkit-examples.pro
++++ b/qtwebkit-examples.pro
+@@ -3,3 +3,4 @@ requires(qtHaveModule(webkit))
+ load(qt_parts)
+ 
+ SUBDIRS += doc
++SUBDIRS += examples
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/qt5/qt5webkit-examples/Config.in b/bsp/buildroot/package/qt5/qt5webkit-examples/Config.in
new file mode 100644
index 00000000..47bbcbaa
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit-examples/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_QT5WEBKIT_EXAMPLES
+	bool "qt5webkit-examples"
+	depends on BR2_PACKAGE_QT5WEBKIT
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package contains examples for the qt5webkit module.
+
+	  http://qt.io
diff --git a/bsp/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash b/bsp/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
new file mode 100644
index 00000000..6e4c090f
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.hash
@@ -0,0 +1,5 @@
+# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-examples-opensource-src-5.6.3.tar.xz.mirrorlist
+sha256 2d6ce7146298d03b443cca4390bbfee17c4c0b08a31efcbf9fe0732291a6169e qtwebkit-examples-opensource-src-5.6.3.tar.xz
+
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-examples-opensource-src-5.9.1.tar.xz.mirrorlist
+sha256 e4ce4de6b468243abad2baabbe8ddfb05d25b186529bfe88cb8662fc983f54d0 qtwebkit-examples-opensource-src-5.9.1.tar.xz
diff --git a/bsp/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk b/bsp/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
new file mode 100644
index 00000000..4c01d831
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit-examples/qt5webkit-examples.mk
@@ -0,0 +1,54 @@
+################################################################################
+#
+# qt5webkit-examples
+#
+################################################################################
+
+# no 5.9.2 package available, fall back to 5.9.1 version
+ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
+QT5WEBKIT_EXAMPLES_VERSION = 5.9.1
+QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
+else
+QT5WEBKIT_EXAMPLES_VERSION = $(QT5_VERSION)
+QT5WEBKIT_EXAMPLES_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION)
+endif
+
+QT5WEBKIT_EXAMPLES_SOURCE = qtwebkit-examples-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
+QT5WEBKIT_EXAMPLES_DEPENDENCIES = qt5base qt5webkit
+
+QT5WEBKIT_EXAMPLES_LICENSE_FILES = LICENSE.LGPLv21 LICENSE.LGPLv3 LICENSE.GPLv2 LICENSE.GPLv3
+
+QT5WEBKIT_EXAMPLES_LICENSE = LGPL-2.1 with exception or LGPL-3 or GPL-2 or GPL-3
+# Source files contain references to LGPL_EXCEPTION.txt but it is not included
+# in the archive.
+
+ifeq ($(BR2_PACKAGE_QT5XMLPATTERNS),y)
+QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5xmlpatterns
+endif
+
+define QT5WEBKIT_EXAMPLES_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
+endef
+
+define QT5WEBKIT_EXAMPLES_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5WEBKIT_EXAMPLES_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
+QT5WEBKIT_EXAMPLES_DEPENDENCIES += qt5declarative
+define QT5WEBKIT_EXAMPLES_INSTALL_QML
+	cp -dpfr $(@D)/examples/webkitqml $(TARGET_DIR)/usr/lib/qt/examples
+endef
+endif
+
+define QT5WEBKIT_EXAMPLES_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/usr/lib/qt/examples
+	cp -dpfr $(@D)/examples/webkitwidgets $(TARGET_DIR)/usr/lib/qt/examples
+	$(QT5WEBKIT_EXAMPLES_INSTALL_QML)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
similarity index 100%
rename from bsp/buildroot/package/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
rename to bsp/buildroot/package/qt5/qt5webkit/5.6.3/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
diff --git a/bsp/buildroot/package/qt5/qt5webkit/0002-Remove-TEXTREL-tag-in-x86.patch b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
similarity index 100%
rename from bsp/buildroot/package/qt5/qt5webkit/0002-Remove-TEXTREL-tag-in-x86.patch
rename to bsp/buildroot/package/qt5/qt5webkit/5.6.3/0002-Remove-TEXTREL-tag-in-x86.patch
diff --git a/bsp/buildroot/package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
similarity index 100%
rename from bsp/buildroot/package/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
rename to bsp/buildroot/package/qt5/qt5webkit/5.6.3/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
diff --git a/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
new file mode 100644
index 00000000..f3b590ea
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0004-Fix-compilation-with-ICU-59.patch
@@ -0,0 +1,93 @@
+From bf172ae289a1348842005a9421797970f9b72060 Mon Sep 17 00:00:00 2001
+From: Konstantin Tokarev <annulen@yandex.ru>
+Date: Thu, 4 May 2017 15:12:37 +0300
+Subject: [PATCH] Fix compilation with ICU 59
+
+Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612
+
+Task-number: QTBUG-60532
+Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ Source/JavaScriptCore/API/JSStringRef.cpp        | 6 +++---
+ Source/JavaScriptCore/runtime/DateConversion.cpp | 3 ++-
+ Source/WTF/wtf/TypeTraits.h                      | 3 +++
+ Source/WebKit2/Shared/API/c/WKString.cpp         | 2 +-
+ 4 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp
+index 812f3d413..77a3fd0f4 100644
+--- a/Source/JavaScriptCore/API/JSStringRef.cpp
++++ b/Source/JavaScriptCore/API/JSStringRef.cpp
+@@ -37,7 +37,7 @@ using namespace WTF::Unicode;
+ JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(chars, numChars).leakRef();
++    return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef();
+ }
+ 
+ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string)
+ JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars)
+ {
+     initializeThreading();
+-    return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
++    return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef();
+ }
+ 
+ JSStringRef JSStringRetain(JSStringRef string)
+@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
+ 
+ const JSChar* JSStringGetCharactersPtr(JSStringRef string)
+ {
+-    return string->characters();
++    return reinterpret_cast<const JSChar*>(string->characters());
+ }
+ 
+ size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
+diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp
+index 0b57f012d..05e27338b 100644
+--- a/Source/JavaScriptCore/runtime/DateConversion.cpp
++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp
+@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as
+ #if OS(WINDOWS)
+             TIME_ZONE_INFORMATION timeZoneInformation;
+             GetTimeZoneInformation(&timeZoneInformation);
+-            const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName;
++            String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName));
+ #else
+             struct tm gtm = t;
+             char timeZoneName[70];
+diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h
+index 9df2c95cf..f5d6121fd 100644
+--- a/Source/WTF/wtf/TypeTraits.h
++++ b/Source/WTF/wtf/TypeTraits.h
+@@ -72,6 +72,9 @@ namespace WTF {
+     template<> struct IsInteger<unsigned long>      { static const bool value = true; };
+     template<> struct IsInteger<long long>          { static const bool value = true; };
+     template<> struct IsInteger<unsigned long long> { static const bool value = true; };
++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT)
++    template<> struct IsInteger<char16_t>           { static const bool value = true; };
++#endif
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+     template<> struct IsInteger<wchar_t>            { static const bool value = true; };
+ #endif
+diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp
+index cbac67dd8..23400a64e 100644
+--- a/Source/WebKit2/Shared/API/c/WKString.cpp
++++ b/Source/WebKit2/Shared/API/c/WKString.cpp
+@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef)
+ size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength)
+ {
+     COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar);
+-    return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength));
++    return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength));
+ }
+ 
+ size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef)
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
new file mode 100644
index 00000000..9c2205dd
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit/5.6.3/0005-Detect-32-bits-armv8-a-architecture.patch
@@ -0,0 +1,48 @@
+From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
+Date: Tue, 15 Aug 2017 18:28:49 -0400
+Subject: [PATCH] Detect 32-bits armv8-a architecture
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Adds WTF platform support for the 32-bits armv8-a architectures.
+
+Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version)
+and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits).
+
+This commit catches this new architecture (armv8a) within a #ifdef/#endif
+inside the if statement dedicated for 32-bits ARM detection.
+
+Fixes:
+
+	In file included from ./config.h:30:0,
+	                 from ...
+	./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture"
+	 #    error "Not supported ARM architecture"
+	      ^~~~~
+
+Upstream-Status: Backport [with adaptations]
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+---
+ Source/WTF/wtf/Platform.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 562840cf7..9cf656845 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -243,6 +243,10 @@
+     || defined(__ARM_ARCH_7S__)
+ #define WTF_ARM_ARCH_VERSION 7
+ 
++#elif defined(__ARM_ARCH_8__) \
++    || defined(__ARM_ARCH_8A__)
++#define WTF_ARM_ARCH_VERSION 8
++
+ /* MSVC sets _M_ARM */
+ #elif defined(_M_ARM)
+ #define WTF_ARM_ARCH_VERSION _M_ARM
+-- 
+2.16.1
+
diff --git a/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
new file mode 100644
index 00000000..669c7e6a
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
@@ -0,0 +1,36 @@
+From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <trevor.woerner@linaro.org>
+Date: Fri, 7 Feb 2014 04:07:17 +0100
+Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH)
+
+Building qtwebkit causes a QA issue such that QtWebPluginProcess and
+QtWebProcess contain bad RPATHs which point into the build location. This fix
+adds a patch to not include the rpath.prf which causes this problem.
+
+Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org>
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
+Downloaded from:
+https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
+0001-qtwebkit-fix-QA-issue-bad-RPATH.patch
+
+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
+---
+ Tools/qmake/mkspecs/features/unix/default_post.prf | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
+index fd66af6..ef754c3 100644
+--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
++++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
+@@ -61,7 +61,6 @@ linux-*g++* {
+     }
+ }
+ 
+-contains(TEMPLATE, app): CONFIG += rpath
+ 
+ CONFIG(debug, debug|release)|force_debug_info {
+     # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
+-- 
+2.7.0
+
diff --git a/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch b/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
new file mode 100644
index 00000000..a2597a54
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0002-Exclude-backtrace-API-for-non-glibc-libraries.patch
@@ -0,0 +1,44 @@
+From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 5 Jun 2015 19:55:05 -0700
+Subject: [PATCH] Exclude backtrace() API for non-glibc libraries
+
+It was excluding musl with current checks, so lets make it such that it
+considers only glibc when using backtrace API
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Downloaded from:
+https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/
+0003-Exclude-backtrace-API-for-non-glibc-libraries.patch
+
+Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
+---
+ Source/WTF/wtf/Assertions.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp
+index 1b2091f..ba03a28 100644
+--- a/Source/WTF/wtf/Assertions.cpp
++++ b/Source/WTF/wtf/Assertions.cpp
+@@ -61,7 +61,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
+ #include <cxxabi.h>
+ #include <dlfcn.h>
+ #include <execinfo.h>
+@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f
+ 
+ void WTFGetBacktrace(void** stack, int* size)
+ {
+-#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
++#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID)
+     *size = backtrace(stack, *size);
+ #elif OS(WINDOWS) && !OS(WINCE)
+     // The CaptureStackBackTrace function is available in XP, but it is not defined
+-- 
+2.7.0
+
diff --git a/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch b/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch
new file mode 100644
index 00000000..9c2205dd
--- /dev/null
+++ b/bsp/buildroot/package/qt5/qt5webkit/5.9.1/0003-Detect-32-bits-armv8-a-architecture.patch
@@ -0,0 +1,48 @@
+From 068bf2d2d91382ea0d8ec24a142a30ea429704db Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@savoirfairelinux.com>
+Date: Tue, 15 Aug 2017 18:28:49 -0400
+Subject: [PATCH] Detect 32-bits armv8-a architecture
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Adds WTF platform support for the 32-bits armv8-a architectures.
+
+Theses toolchains define __ARM_ARCH_8A__ (for ARM architecture version)
+and __arm__ (for 32-bits word-size; __aarch64__ for 64-bits).
+
+This commit catches this new architecture (armv8a) within a #ifdef/#endif
+inside the if statement dedicated for 32-bits ARM detection.
+
+Fixes:
+
+	In file included from ./config.h:30:0,
+	                 from ...
+	./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture"
+	 #    error "Not supported ARM architecture"
+	      ^~~~~
+
+Upstream-Status: Backport [with adaptations]
+Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
+---
+ Source/WTF/wtf/Platform.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
+index 562840cf7..9cf656845 100644
+--- a/Source/WTF/wtf/Platform.h
++++ b/Source/WTF/wtf/Platform.h
+@@ -243,6 +243,10 @@
+     || defined(__ARM_ARCH_7S__)
+ #define WTF_ARM_ARCH_VERSION 7
+ 
++#elif defined(__ARM_ARCH_8__) \
++    || defined(__ARM_ARCH_8A__)
++#define WTF_ARM_ARCH_VERSION 8
++
+ /* MSVC sets _M_ARM */
+ #elif defined(_M_ARM)
+ #define WTF_ARM_ARCH_VERSION _M_ARM
+-- 
+2.16.1
+
diff --git a/bsp/buildroot/package/qt5/qt5webkit/Config.in b/bsp/buildroot/package/qt5/qt5webkit/Config.in
index 25343604..72c641b9 100644
--- a/bsp/buildroot/package/qt5/qt5webkit/Config.in
+++ b/bsp/buildroot/package/qt5/qt5webkit/Config.in
@@ -1,16 +1,18 @@
 config BR2_PACKAGE_QT5WEBKIT
 	bool "qt5webkit"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu
+	depends on !BR2_BINFMT_FLAT # icu
+	# assumes a FPU is available on MIPS
+	depends on !BR2_MIPS_SOFT_FLOAT
 	select BR2_PACKAGE_QT5BASE
 	select BR2_PACKAGE_QT5BASE_ICU
 	select BR2_PACKAGE_QT5BASE_GUI
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
-	depends on !BR2_BINFMT_FLAT # icu
-	# assumes a FPU is available on MIPS
-	depends on !BR2_MIPS_SOFT_FLOAT
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
@@ -19,15 +21,17 @@ config BR2_PACKAGE_QT5WEBKIT
 	  allows QML applications to render regions of dynamic
 	  web content.
 
-	  This package has been removed from the official release packages
-	  since Qt5.6.0, but it is still available for users to build it
-	  from source. This is useful for platforms without GPU since the
-	  successor (QtWebEngine) requires OpenGL support.
+	  This package has been removed from the official release
+	  packages since Qt5.6.0, but it is still available for users
+	  to build it from source. This is useful for platforms
+	  without GPU since the successor (QtWebEngine) requires
+	  OpenGL support.
 
 	  http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html
 
-comment "qt5webkit needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
+comment "qt5webkit needs a toolchain w/ dynamic library, gcc >= 4.8, host gcc >= 4.8"
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
 	depends on !BR2_BINFMT_FLAT
 	depends on !BR2_MIPS_SOFT_FLOAT
diff --git a/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.hash b/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.hash
index d4e772c4..57ff2ac1 100644
--- a/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.hash
+++ b/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.hash
@@ -1,5 +1,10 @@
-# Hash from: http://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist
+# Hash from: https://download.qt.io/community_releases/5.6/5.6.3/qtwebkit-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256  098c6bb25798fbf1b619b540621287787064efc9b586d76ac0ce7e39b87a3896  qtwebkit-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebkit-opensource-src-5.8.0.tar.xz
-sha256 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec  qtwebkit-opensource-src-5.8.0.tar.xz
+# hash from: https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz.mirrorlist
+sha256  28a560becd800a4229bfac317c2e5407cd3cc95308bc4c3ca90dba2577b052cf  qtwebkit-opensource-src-5.9.1.tar.xz
+
+# Hashes for license files:
+sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 Source/WebCore/LICENSE-LGPL-2
+sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1
+sha256 a3db6c7f3027aa27489c25a2fa259185cdee945780c32e01c60cbfabf4743b6c LICENSE.LGPLv21
diff --git a/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.mk b/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.mk
index 244f78c4..51866716 100644
--- a/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.mk
+++ b/bsp/buildroot/package/qt5/qt5webkit/qt5webkit.mk
@@ -4,11 +4,13 @@
 #
 ################################################################################
 
-QT5WEBKIT_VERSION = $(QT5_VERSION)
+# no 5.9.2 package available, fall back to 5.9.1 version
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE)
+QT5WEBKIT_VERSION = 5.9.1
+QT5WEBKIT_SITE = https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules
 else
-QT5WEBKIT_SITE = http://download.qt.io/community_releases/5.6/$(QT5_VERSION)
+QT5WEBKIT_VERSION = $(QT5_VERSION)
+QT5WEBKIT_SITE = https://download.qt.io/community_releases/5.6/$(QT5_VERSION)
 endif
 
 QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz
@@ -19,15 +21,10 @@ QT5WEBKIT_INSTALL_STAGING = YES
 
 QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
-QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c
+QT5WEBKIT_LICENSE = LGPL-2.1+, BSD-3-Clause, BSD-2-Clause
 # Source files contain references to LGPL_EXCEPTION.txt but it is not included
 # in the archive.
 QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21
-else
-QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license
-QT5WEBKIT_REDISTRIBUTE = NO
-endif
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
 QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender
@@ -43,12 +40,19 @@ endif
 QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH)
 define QT5WEBKIT_PYTHON2_SYMLINK
 	mkdir -p $(@D)/host-bin
-	ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python
+	ln -sf $(HOST_DIR)/bin/python2 $(@D)/host-bin/python
 endef
 QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK
 
+# The mesa's EGL/eglplatform.h header includes X11 headers unless the flag
+# MESA_EGL_NO_X11_HEADERS is defined. Tell to not include X11 headers if
+# the libxcb is not selected.
+ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)x$(BR2_PACKAGE_LIBXCB),yx)
+QT5WEBKIT_QMAKEFLAGS += QMAKE_CXXFLAGS+=-DMESA_EGL_NO_X11_HEADERS
+endif
+
 define QT5WEBKIT_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake $(QT5WEBKIT_QMAKEFLAGS))
 endef
 
 define QT5WEBKIT_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.hash b/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.hash
index f69c8054..28f0f89a 100644
--- a/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.hash
+++ b/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.hash
@@ -1,5 +1,15 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebsockets-opensource-src-5.8.0.tar.xz
-sha256 aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5  qtwebsockets-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebsockets-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 7609eba33ebc9c6954644470ebbb1292cdae50f36d0c8ff5ab068b249e4a3c8e  qtwebsockets-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 79949ee74297883df6e4e7c4bfe1e75a6e7695376b4a87ffc013e27bda509cb2 LGPL_EXCEPTION.txt
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
diff --git a/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.mk b/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.mk
index 975ea643..661bc83e 100644
--- a/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.mk
+++ b/bsp/buildroot/package/qt5/qt5websockets/qt5websockets.mk
@@ -10,20 +10,15 @@ QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.
 QT5WEBSOCKETS_DEPENDENCIES = qt5base
 QT5WEBSOCKETS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools)
-QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3
+QT5WEBSOCKETS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools)
+QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3
 else
-QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3
+QT5WEBSOCKETS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0
 QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3
 endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3c (examples)
-endif
-else
-QT5WEBSOCKETS_LICENSE = Commercial license
-QT5WEBSOCKETS_REDISTRIBUTE = NO
+QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3-Clause (examples)
 endif
 
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
@@ -31,7 +26,7 @@ QT5WEBSOCKETS_DEPENDENCIES += qt5declarative
 endif
 
 define QT5WEBSOCKETS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5WEBSOCKETS_BUILD_CMDS
@@ -46,6 +41,7 @@ endef
 ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y)
 define QT5WEBSOCKETS_INSTALL_TARGET_QMLS
 	cp -dpfr $(STAGING_DIR)/usr/qml/Qt/WebSockets $(TARGET_DIR)/usr/qml/Qt/
+	cp -dpfr $(STAGING_DIR)/usr/qml/QtWebSockets $(TARGET_DIR)/usr/qml/
 endef
 endif
 
diff --git a/bsp/buildroot/package/qt5/qt5x11extras/Config.in b/bsp/buildroot/package/qt5/qt5x11extras/Config.in
index 9c514cdd..ff4cc115 100644
--- a/bsp/buildroot/package/qt5/qt5x11extras/Config.in
+++ b/bsp/buildroot/package/qt5/qt5x11extras/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_QT5X11EXTRAS
 	bool "qt5x11extras"
-	select BR2_PACKAGE_QT5BASE_WIDGETS
 	depends on BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_QT5BASE_WIDGETS
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash b/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash
index b2518992..b52d2da5 100644
--- a/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash
+++ b/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.hash
@@ -1,5 +1,12 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtx11extras-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 1e7a8e96e0629f2b2b78de684b156b357210cf5df6b42f30789423f2cb07677f qtx11extras-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtx11extras-opensource-src-5.8.0.tar.xz
-sha256 bed7f2b5123a9849ec94afa67db5f296e6f527c6330f47a680c83586d3a4280e  qtx11extras-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtx11extras-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 65b83df79d87043d63808e709778b3c6fddaafa3c7864d7104ee9a9da5909493  qtx11extras-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
diff --git a/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk b/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk
index 996056b7..0905d5f7 100644
--- a/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/bsp/buildroot/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -10,21 +10,16 @@ QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz
 QT5X11EXTRAS_DEPENDENCIES = qt5base
 QT5X11EXTRAS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
 QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
 else
-QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5X11EXTRAS_LICENSE = GPL-2.0 or GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
-else
-QT5X11EXTRAS_LICENSE = Commercial license
-QT5X11EXTRAS_REDISTRIBUTE = NO
-endif
 
 define QT5X11EXTRAS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5X11EXTRAS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
index f9db184b..13876777 100644
--- a/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
+++ b/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash
@@ -1,5 +1,16 @@
 # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist
 sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz
 
-# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz
-sha256 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04  qtxmlpatterns-opensource-src-5.8.0.tar.xz
+# Hash from: https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtxmlpatterns-opensource-src-5.9.6.tar.xz.mirrorlist
+sha256 6a435b14b85e17268b7acf764e7ed92430045a7bb6eb741a1ea200d2df0986dc  qtxmlpatterns-opensource-src-5.9.6.tar.xz
+
+# Hashes for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3
+sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3
+sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT
+sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSE.LGPL3
+sha256 5ceb37d1c7c1d92878b82af3c0fd5558087f3d5a08a3a4d43850bad4ad265a52 LICENSE.LGPLv3
+sha256 ed8742a95cb9db653a09b050e27ccff5e67ba69c14aa2c3137f2a4e1892f6c0d LICENSE.FDL
+sha256 1996a36160b2158c2be264d2ddfa6148ebe0f1ececff55aca8d754a1ddcc7bb8 LICENSE.LGPLv21
+sha256 438c1f9a2b256e47dac33249f2ad6d4a9df643f1ec5312216d528a2f7ad82084 LGPL_EXCEPTION.txt
diff --git a/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
index e5981af5..0e02258a 100644
--- a/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/bsp/buildroot/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -10,24 +10,19 @@ QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).t
 QT5XMLPATTERNS_DEPENDENCIES = qt5base
 QT5XMLPATTERNS_INSTALL_STAGING = YES
 
-ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
-QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs)
-QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL
+QT5XMLPATTERNS_LICENSE = GPL-2.0+ or LGPL-3.0, GPL-3.0 with exception(tools), GFDL-1.3 (docs)
+QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT LICENSE.LGPL3 LICENSE.FDL
 else
-QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs)
+QT5XMLPATTERNS_LICENSE = GPL-3.0 or LGPL-2.1 with exception or LGPL-3.0, GFDL-1.3 (docs)
 QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL
 endif
 ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y)
-QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3c (examples)
-endif
-else
-QT5XMLPATTERNS_LICENSE = Commercial license
-QT5XMLPATTERNS_REDISTRIBUTE = NO
+QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3-Clause (examples)
 endif
 
 define QT5XMLPATTERNS_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake)
 endef
 
 define QT5XMLPATTERNS_BUILD_CMDS
diff --git a/bsp/buildroot/package/qt5cinex/Config.in b/bsp/buildroot/package/qt5cinex/Config.in
index b273231b..8dbf4842 100644
--- a/bsp/buildroot/package/qt5cinex/Config.in
+++ b/bsp/buildroot/package/qt5cinex/Config.in
@@ -6,19 +6,19 @@ comment "qt5cinex needs an Open(E)GL-capable backend"
 config BR2_PACKAGE_QT5CINEX
 	bool "qt5cinex"
 	depends on BR2_PACKAGE_QT5
-	select BR2_PACKAGE_QT5BASE_NETWORK
-	select BR2_PACKAGE_QT5BASE_PNG
-	select BR2_PACKAGE_QT5BASE_WIDGETS
-	select BR2_PACKAGE_QT5BASE_EGLFS
-	select BR2_PACKAGE_QT5GRAPHICALEFFECTS
 	depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs
 	depends on BR2_PACKAGE_QT5_GL_AVAILABLE
 	# No comment needed for this option, it's an architecture
 	# dependency.
 	depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
+	select BR2_PACKAGE_QT5BASE_NETWORK
+	select BR2_PACKAGE_QT5BASE_PNG
+	select BR2_PACKAGE_QT5BASE_WIDGETS
+	select BR2_PACKAGE_QT5BASE_EGLFS
+	select BR2_PACKAGE_QT5GRAPHICALEFFECTS
 	help
-	  This application demonstrates the power of Qt5 and few of the new
-	  additions available in QtQuick 2.0.
+	  This application demonstrates the power of Qt5 and few of
+	  the new additions available in QtQuick 2.0.
 
 	  http://quitcoding.com/?page=work#cinex
 
diff --git a/bsp/buildroot/package/qt5cinex/qt5cinex.mk b/bsp/buildroot/package/qt5cinex/qt5cinex.mk
index bfe14ce7..d9254f53 100644
--- a/bsp/buildroot/package/qt5cinex/qt5cinex.mk
+++ b/bsp/buildroot/package/qt5cinex/qt5cinex.mk
@@ -18,7 +18,7 @@ QT5CINEX_LICENSE = CC-BY-3.0
 QT5CINEX_LICENSE_FILES = README
 
 define QT5CINEX_CONFIGURE_CMDS
-	cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake
+	cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/bin/qmake
 endef
 
 define QT5CINEX_BUILD_CMDS
diff --git a/bsp/buildroot/package/qtuio/qtuio.mk b/bsp/buildroot/package/qtuio/qtuio.mk
index 6238b50f..6b90a2c0 100644
--- a/bsp/buildroot/package/qtuio/qtuio.mk
+++ b/bsp/buildroot/package/qtuio/qtuio.mk
@@ -9,7 +9,7 @@ QTUIO_SITE = $(call github,x29a,qTUIO,$(QTUIO_VERSION))
 QTUIO_INSTALL_STAGING = YES
 QTUIO_DEPENDENCIES = qt
 
-QTUIO_LICENSE = GPLv3+
+QTUIO_LICENSE = GPL-3.0+
 QTUIO_LICENSE_FILES = COPYING
 
 # The pong example needs QtOpenGL support, which might become available
diff --git a/bsp/buildroot/package/quagga/Config.in b/bsp/buildroot/package/quagga/Config.in
index 4eacaf04..98b9d348 100644
--- a/bsp/buildroot/package/quagga/Config.in
+++ b/bsp/buildroot/package/quagga/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_QUAGGA
 	bool "quagga"
 	depends on BR2_USE_MMU # fork()
 	help
-	  Routing software suite, providing implementations of
-	  OSPFv2, OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+.
+	  Routing software suite, providing implementations of OSPFv2,
+	  OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+.
 
 	  http://www.quagga.net/
 
@@ -18,11 +18,11 @@ config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
 	bool "Use TCP sockets between zebra and protocol daemons"
 	depends on BR2_PACKAGE_QUAGGA_ZEBRA
 	help
-	  Use a TCP socket to communicate between zebra (supervisor) and
-	  the different protocol daemons.
+	  Use a TCP socket to communicate between zebra (supervisor)
+	  and the different protocol daemons.
 
-	  You'll want this enabled if zebra and the protocol daemon(s) run
-	  on different hosts.
+	  You'll want this enabled if zebra and the protocol daemon(s)
+	  run on different hosts.
 
 config BR2_PACKAGE_QUAGGA_BGPD
 	bool "BGPv4+ protocol"
@@ -66,7 +66,8 @@ config BR2_PACKAGE_QUAGGA_PIMD
 config BR2_PACKAGE_QUAGGA_WATCHQUAGGA
 	bool "Build watchquagga"
 	help
-	  Build and install watchquagga, a zebra/protocol daemon supervisor.
+	  Build and install watchquagga, a zebra/protocol daemon
+	  supervisor.
 
 config BR2_PACKAGE_QUAGGA_VTYSH
 	bool "Build vtysh"
diff --git a/bsp/buildroot/package/quagga/quagga.mk b/bsp/buildroot/package/quagga/quagga.mk
index c17ceaad..b2b4e2a1 100644
--- a/bsp/buildroot/package/quagga/quagga.mk
+++ b/bsp/buildroot/package/quagga/quagga.mk
@@ -7,7 +7,7 @@
 QUAGGA_VERSION = 1.1.1
 QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga
 QUAGGA_DEPENDENCIES = host-gawk host-pkgconf
-QUAGGA_LICENSE = GPLv2+
+QUAGGA_LICENSE = GPL-2.0+
 QUAGGA_LICENSE_FILES = COPYING
 
 # We need to override the sysconf and localstate directories so that
diff --git a/bsp/buildroot/package/quazip/quazip.hash b/bsp/buildroot/package/quazip/quazip.hash
index 2f73c459..87bf7c2c 100644
--- a/bsp/buildroot/package/quazip/quazip.hash
+++ b/bsp/buildroot/package/quazip/quazip.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4 quazip-0.7.2.tar.gz
+sha256 2ad4f354746e8260d46036cde1496c223ec79765041ea28eb920ced015e269b5 quazip-0.7.3.tar.gz
diff --git a/bsp/buildroot/package/quazip/quazip.mk b/bsp/buildroot/package/quazip/quazip.mk
index 91b2f563..09037a54 100644
--- a/bsp/buildroot/package/quazip/quazip.mk
+++ b/bsp/buildroot/package/quazip/quazip.mk
@@ -4,14 +4,14 @@
 #
 ################################################################################
 
-QUAZIP_VERSION = 0.7.2
+QUAZIP_VERSION = 0.7.3
 QUAZIP_SITE = http://sourceforge.net/projects/quazip/files/quazip/$(QUAZIP_VERSION)
 QUAZIP_INSTALL_STAGING = YES
 QUAZIP_DEPENDENCIES = \
 	zlib \
 	$(if $(BR2_PACKAGE_QT),qt) \
 	$(if $(BR2_PACKAGE_QT5),qt5base)
-QUAZIP_LICENSE = LGPLv2.1
+QUAZIP_LICENSE = LGPL-2.1
 QUAZIP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_QT5),y)
diff --git a/bsp/buildroot/package/quota/Config.in b/bsp/buildroot/package/quota/Config.in
index c8ab0d7e..051a7655 100644
--- a/bsp/buildroot/package/quota/Config.in
+++ b/bsp/buildroot/package/quota/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_QUOTA
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Implementation of the disk quota system.
diff --git a/bsp/buildroot/package/quota/quota.mk b/bsp/buildroot/package/quota/quota.mk
index a1e343a3..38e18a60 100644
--- a/bsp/buildroot/package/quota/quota.mk
+++ b/bsp/buildroot/package/quota/quota.mk
@@ -6,18 +6,14 @@
 
 QUOTA_VERSION = 4.01
 QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION)
-QUOTA_DEPENDENCIES = host-gettext
+QUOTA_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-nfs-utils
 QUOTA_AUTORECONF = YES
-QUOTA_LICENSE = GPLv2+
+QUOTA_LICENSE = GPL-2.0+
 QUOTA_CONF_OPTS = --disable-strip-binaries
+QUOTA_LIBS = $(TARGET_NLS_LIBS)
 
 QUOTA_CFLAGS = $(TARGET_CFLAGS)
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-QUOTA_DEPENDENCIES += gettext
-QUOTA_LIBS += -lintl
-endif
-
 ifeq ($(BR2_PACKAGE_E2FSPROGS),y)
 QUOTA_DEPENDENCIES += e2fsprogs
 QUOTA_CONF_OPTS += --enable-ext2direct
diff --git a/bsp/buildroot/package/qwt/Config.in b/bsp/buildroot/package/qwt/Config.in
index a678637b..041c2d10 100644
--- a/bsp/buildroot/package/qwt/Config.in
+++ b/bsp/buildroot/package/qwt/Config.in
@@ -1,10 +1,6 @@
-comment "qwt needs a toolchain not affected by Binutils bug 19405"
-	depends on BR2_PACKAGE_QT && BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
-
 config BR2_PACKAGE_QWT
 	bool "qwt"
-	depends on (BR2_PACKAGE_QT && !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405) || \
-		BR2_PACKAGE_QT5
+	depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT
 	select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5
 	select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport
diff --git a/bsp/buildroot/package/qwt/qwt.mk b/bsp/buildroot/package/qwt/qwt.mk
index 043bc3f3..619453bf 100644
--- a/bsp/buildroot/package/qwt/qwt.mk
+++ b/bsp/buildroot/package/qwt/qwt.mk
@@ -16,7 +16,7 @@ QWT_DEPENDENCIES += qt5base
 QWT_QMAKE = $(QT5_QMAKE)
 endif
 
-QWT_LICENSE = LGPLv2.1 with exceptions
+QWT_LICENSE = LGPL-2.1 with exceptions
 QWT_LICENSE_FILES = COPYING
 
 QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%'
diff --git a/bsp/buildroot/package/rabbitmq-c/rabbitmq-c.mk b/bsp/buildroot/package/rabbitmq-c/rabbitmq-c.mk
index eef09ec0..d496a4c0 100644
--- a/bsp/buildroot/package/rabbitmq-c/rabbitmq-c.mk
+++ b/bsp/buildroot/package/rabbitmq-c/rabbitmq-c.mk
@@ -13,12 +13,13 @@ RABBITMQ_C_CONF_OPTS = \
 	-DBUILD_API_DOCS=OFF \
 	-DBUILD_TOOLS_DOCS=OFF
 
+# BUILD_SHARED_LIBS is handled in pkg-cmake.mk as it is a generic cmake variable
 ifeq ($(BR2_STATIC_LIBS),y)
-RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON
+RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
 else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
-RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON
+RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
 else ifeq ($(BR2_SHARED_LIBS),y)
-RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
+RABBITMQ_C_CONF_OPTS += -DBUILD_STATIC_LIBS=OFF
 endif
 
 # CMake OpenSSL detection is buggy, and doesn't properly use
diff --git a/bsp/buildroot/package/rabbitmq-server/Config.in b/bsp/buildroot/package/rabbitmq-server/Config.in
index 6a323aff..b3b7639e 100644
--- a/bsp/buildroot/package/rabbitmq-server/Config.in
+++ b/bsp/buildroot/package/rabbitmq-server/Config.in
@@ -5,7 +5,8 @@ config BR2_PACKAGE_RABBITMQ_SERVER
 	select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl
 	                           # applications
 	help
-	  High-performance AMQP-compliant message broker written in Erlang.
+	  High-performance AMQP-compliant message broker written in
+	  Erlang.
 
 	  http://www.rabbitmq.com
 
diff --git a/bsp/buildroot/package/rabbitmq-server/rabbitmq-server.mk b/bsp/buildroot/package/rabbitmq-server/rabbitmq-server.mk
index d55a8cc4..6df77079 100644
--- a/bsp/buildroot/package/rabbitmq-server/rabbitmq-server.mk
+++ b/bsp/buildroot/package/rabbitmq-server/rabbitmq-server.mk
@@ -1,13 +1,13 @@
-#############################################################
+################################################################################
 #
 # rabbitmq-server
 #
-#############################################################
+################################################################################
 
 RABBITMQ_SERVER_VERSION = 3.6.6
 RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION)
 RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz
-RABBITMQ_SERVER_LICENSE = MPLv1.1, Apache-2.0, BSD-2c, EPL, MIT, MPLv2.0
+RABBITMQ_SERVER_LICENSE = MPL-1.1, Apache-2.0, BSD-2-Clause, EPL, MIT, MPL-2.0
 RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \
 				LICENSE LICENSE-APACHE2-ExplorerCanvas \
 				LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \
diff --git a/bsp/buildroot/package/racehound/racehound.mk b/bsp/buildroot/package/racehound/racehound.mk
index 8e282c1e..6499e166 100644
--- a/bsp/buildroot/package/racehound/racehound.mk
+++ b/bsp/buildroot/package/racehound/racehound.mk
@@ -6,7 +6,7 @@
 
 RACEHOUND_VERSION = f09f06fcc3c77c8c5541be3ba5be80aa8148ce0c
 RACEHOUND_SITE = $(call github,winnukem,racehound,$(RACEHOUND_VERSION))
-RACEHOUND_LICENSE = GPLv2
+RACEHOUND_LICENSE = GPL-2.0
 RACEHOUND_LICENSE_FILES = LICENSE
 RACEHOUND_SUPPORTS_IN_SOURCE_BUILD = NO
 
diff --git a/bsp/buildroot/package/radvd/radvd.mk b/bsp/buildroot/package/radvd/radvd.mk
index 8b6e5b2d..88221875 100644
--- a/bsp/buildroot/package/radvd/radvd.mk
+++ b/bsp/buildroot/package/radvd/radvd.mk
@@ -8,10 +8,14 @@ RADVD_VERSION = 2.12
 RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.xz
 RADVD_SITE = http://www.litech.org/radvd/dist
 RADVD_DEPENDENCIES = host-bison flex host-flex host-pkgconf
-RADVD_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
+# We need to ignore <linux/if_arp.h>, because radvd already includes
+# <net/if_arp.h>, which conflicts with <linux/if_arp.h>.
+RADVD_CONF_ENV = \
+	ac_cv_prog_cc_c99='-std=gnu99' \
+	ac_cv_header_linux_if_arp_h=no
 # For 0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch
 RADVD_AUTORECONF = YES
-RADVD_LICENSE = BSD-4c-like
+RADVD_LICENSE = BSD-4-Clause-like
 RADVD_LICENSE_FILES = COPYRIGHT
 
 define RADVD_INSTALL_INIT_SYSV
diff --git a/bsp/buildroot/package/ramsmp/Config.in b/bsp/buildroot/package/ramsmp/Config.in
index ecab6a46..411e7de9 100644
--- a/bsp/buildroot/package/ramsmp/Config.in
+++ b/bsp/buildroot/package/ramsmp/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_RAMSMP
 	bool "ramspeed/smp"
 	depends on BR2_USE_MMU # fork()
 	help
-	  RAMspeed/SMP is a free open source command line utility
-	  to measure cache and memory performance of multiprocessor machines.
+	  RAMspeed/SMP is a free open source command line utility to
+	  measure cache and memory performance of multiprocessor
+	  machines.
 
 	  http://alasir.com/software/ramspeed/
diff --git a/bsp/buildroot/package/ranger/ranger.mk b/bsp/buildroot/package/ranger/ranger.mk
index fd6809a6..aaca4386 100644
--- a/bsp/buildroot/package/ranger/ranger.mk
+++ b/bsp/buildroot/package/ranger/ranger.mk
@@ -7,7 +7,7 @@
 RANGER_VERSION = 1.7.2
 RANGER_SITE = http://ranger.nongnu.org
 RANGER_SETUP_TYPE = distutils
-RANGER_LICENSE = GPLv3
+RANGER_LICENSE = GPL-3.0
 RANGER_LICENSE_FILES = AUTHORS
 
 # The ranger script request python to be called with -O (optimize generated
diff --git a/bsp/buildroot/package/rapidjson/Config.in b/bsp/buildroot/package/rapidjson/Config.in
index b8c8bcf6..abf8996a 100644
--- a/bsp/buildroot/package/rapidjson/Config.in
+++ b/bsp/buildroot/package/rapidjson/Config.in
@@ -1,6 +1,11 @@
 config BR2_PACKAGE_RAPIDJSON
 	bool "rapidjson"
+	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  A fast JSON parser/generator for C++ with both SAX/DOM style API.
+	  A fast JSON parser/generator for C++ with both SAX/DOM style
+	  API.
 
 	  http://rapidjson.org/
+
+comment "rapidjson needs a toolchain w/ C++"
+	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/rapidjson/rapidjson.hash b/bsp/buildroot/package/rapidjson/rapidjson.hash
index bde8319c..a4b02cff 100644
--- a/bsp/buildroot/package/rapidjson/rapidjson.hash
+++ b/bsp/buildroot/package/rapidjson/rapidjson.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e  rapidjson-v1.1.0.tar.gz
+sha256 a140e5d46fe734a1c78f1a3c3ef207871dd75648be71fdda8e309b23ab8b1f32  license.txt
diff --git a/bsp/buildroot/package/rapidjson/rapidjson.mk b/bsp/buildroot/package/rapidjson/rapidjson.mk
index d06f5296..4d69bc34 100644
--- a/bsp/buildroot/package/rapidjson/rapidjson.mk
+++ b/bsp/buildroot/package/rapidjson/rapidjson.mk
@@ -13,8 +13,9 @@ RAPIDJSON_LICENSE_FILES = license.txt
 RAPIDJSON_INSTALL_TARGET = NO
 RAPIDJSON_INSTALL_STAGING = YES
 
-define RAPIDJSON_INSTALL_STAGING_CMDS
-	cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include
-endef
+RAPIDJSON_CONF_OPTS = \
+	-DRAPIDJSON_BUILD_DOC=OFF \
+	-DRAPIDJSON_BUILD_EXAMPLES=OFF \
+	-DRAPIDJSON_BUILD_TESTS=OFF
 
-$(eval $(generic-package))
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/rapidxml/rapidxml.mk b/bsp/buildroot/package/rapidxml/rapidxml.mk
index a76a21b4..2bec8fe1 100644
--- a/bsp/buildroot/package/rapidxml/rapidxml.mk
+++ b/bsp/buildroot/package/rapidxml/rapidxml.mk
@@ -7,7 +7,7 @@
 RAPIDXML_VERSION = 1.13
 RAPIDXML_SOURCE = rapidxml-$(RAPIDXML_VERSION).zip
 RAPIDXML_SITE = http://downloads.sourceforge.net/project/rapidxml/rapidxml/rapidxml%20$(RAPIDXML_VERSION)
-RAPIDXML_LICENSE = Boost Software License 1.0 or MIT
+RAPIDXML_LICENSE = BSL-1.0 or MIT
 RAPIDXML_LICENSE_FILES = license.txt
 
 # C++ headers only
diff --git a/bsp/buildroot/package/raptor/raptor.mk b/bsp/buildroot/package/raptor/raptor.mk
index aea14e39..4c7135fc 100644
--- a/bsp/buildroot/package/raptor/raptor.mk
+++ b/bsp/buildroot/package/raptor/raptor.mk
@@ -8,8 +8,9 @@ RAPTOR_VERSION = 2.0.15
 RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz
 RAPTOR_SITE = http://download.librdf.org/source
 RAPTOR_DEPENDENCIES = libxml2 libxslt
-RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+
+RAPTOR_LICENSE = GPL-2.0+ or LGPL-2.1+ or Apache-2.0+
 RAPTOR_LICENSE_FILES = LICENSE.txt
+RAPTOR_INSTALL_STAGING = YES
 
 # Flag is added to make sure the patch is applied for the configure.ac of raptor.
 RAPTOR_AUTORECONF = YES
diff --git a/bsp/buildroot/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch b/bsp/buildroot/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch
index c37d5a1e..a757cb0e 100644
--- a/bsp/buildroot/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch
+++ b/bsp/buildroot/package/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch
@@ -7,6 +7,8 @@ This allows installing rpiboot outside of /usr if needed.
 
 Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Arnout: remove /usr]
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
 ---
  Makefile | 20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
@@ -24,11 +26,11 @@ index d9a7220..7835b7f 100755
 -	cp usbbootcode.bin /usr/share/rpiboot
 -	cp msd.elf /usr/share/rpiboot
 -	cp buildroot.elf /usr/share/rpiboot
-+	cp rpiboot $(DESTDIR)/usr/bin
-+	mkdir -p $(DESTDIR)//usr/share/rpiboot
-+	cp usbbootcode.bin $(DESTDIR)/usr/share/rpiboot
-+	cp msd.elf $(DESTDIR)/usr/share/rpiboot
-+	cp buildroot.elf $(DESTDIR)/usr/share/rpiboot
++	cp rpiboot $(DESTDIR)bin
++	mkdir -p $(DESTDIR)/share/rpiboot
++	cp usbbootcode.bin $(DESTDIR)/share/rpiboot
++	cp msd.elf $(DESTDIR)/share/rpiboot
++	cp buildroot.elf $(DESTDIR)/share/rpiboot
  
  uninstall:
 -	rm -f /usr/bin/rpiboot
@@ -36,11 +38,11 @@ index d9a7220..7835b7f 100755
 -	rm -f /usr/share/rpiboot/msd.elf
 -	rm -f /usr/share/rpiboot/buildroot.elf
 -	rmdir --ignore-fail-on-non-empty /usr/share/rpiboot/
-+	rm -f $(DESTDIR)/usr/bin/rpiboot
-+	rm -f $(DESTDIR)/usr/share/rpiboot/usbbootcode.bin
-+	rm -f $(DESTDIR)/usr/share/rpiboot/msd.elf
-+	rm -f $(DESTDIR)/usr/share/rpiboot/buildroot.elf
-+	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/rpiboot/
++	rm -f $(DESTDIR)/bin/rpiboot
++	rm -f $(DESTDIR)/share/rpiboot/usbbootcode.bin
++	rm -f $(DESTDIR)/share/rpiboot/msd.elf
++	rm -f $(DESTDIR)/share/rpiboot/buildroot.elf
++	rmdir --ignore-fail-on-non-empty $(DESTDIR)/share/rpiboot/
  
  clean: 
  	rm rpiboot
diff --git a/bsp/buildroot/package/ratpoison/Config.in b/bsp/buildroot/package/ratpoison/Config.in
new file mode 100644
index 00000000..7b724290
--- /dev/null
+++ b/bsp/buildroot/package/ratpoison/Config.in
@@ -0,0 +1,17 @@
+config BR2_PACKAGE_RATPOISON
+	bool "ratpoison"
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_FONTCONFIG
+	select BR2_PACKAGE_LIBERATION
+	select BR2_PACKAGE_XLIB_LIBX11
+	help
+	  Ratpoison is a simple Window Manager. It is largely modelled
+	  after GNU Screen and focuses on the keyboard instead of a
+	  mouse.
+
+	  The screen can be split into non-overlapping frames.  All
+	  windows are kept maximized inside their frames to take full
+	  advantage of your precious screen real estate.
+
+	  http://www.nongnu.org/ratpoison/
diff --git a/bsp/buildroot/package/ratpoison/ratpoison.hash b/bsp/buildroot/package/ratpoison/ratpoison.hash
new file mode 100644
index 00000000..44781b07
--- /dev/null
+++ b/bsp/buildroot/package/ratpoison/ratpoison.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 d98fa4be025ecca453c407ff311ab3949f29f20d6d8abedf8f0716b85fc8d1f1 ratpoison-1.4.9.tar.xz
diff --git a/bsp/buildroot/package/ratpoison/ratpoison.mk b/bsp/buildroot/package/ratpoison/ratpoison.mk
new file mode 100644
index 00000000..27cca849
--- /dev/null
+++ b/bsp/buildroot/package/ratpoison/ratpoison.mk
@@ -0,0 +1,28 @@
+################################################################################
+#
+# ratpoison
+#
+################################################################################
+
+RATPOISON_VERSION = 1.4.9
+RATPOISON_SOURCE = ratpoison-$(RATPOISON_VERSION).tar.xz
+RATPOISON_SITE = http://download.savannah.nongnu.org/releases/ratpoison
+RATPOISON_LICENSE = GPL-2.0+
+RATPOISON_LICENSE_FILES = COPYING
+
+RATPOISON_CONF_OPTS = \
+	--x-includes=$(STAGING_DIR)/usr/include/X11 \
+	--x-libraries=$(STAGING_DIR)/usr/lib \
+	--without-xkb \
+	--without-xft
+
+RATPOISON_DEPENDENCIES = xlib_libX11
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+RATPOISON_DEPENDENCIES += xlib_libXrandr
+RATPOISON_CONF_OPTS += --with-xrandr
+else
+RATPOISON_CONF_OPTS += --without-xrandr
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/rauc/Config.in b/bsp/buildroot/package/rauc/Config.in
new file mode 100644
index 00000000..6433b827
--- /dev/null
+++ b/bsp/buildroot/package/rauc/Config.in
@@ -0,0 +1,37 @@
+config BR2_PACKAGE_RAUC
+	bool "rauc"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	depends on BR2_USE_MMU # glib2
+	depends on BR2_USE_WCHAR # glib2
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_DBUS # run-time dependency
+	help
+	  RAUC is the Robust Auto-Update Controller developed by
+	  Pengutronix. It supports updating embedded Linux
+	  systems over the network or from disks and provides a
+	  d-bus interface.
+
+	  http://rauc.io/
+
+if BR2_PACKAGE_RAUC
+
+config BR2_PACKAGE_RAUC_NETWORK
+	bool "network support"
+	select BR2_PACKAGE_LIBCURL
+	help
+	  This option enables support for updating firmware over
+	  the network using libcurl.
+
+config BR2_PACKAGE_RAUC_JSON
+	bool "JSON output support"
+	select BR2_PACKAGE_JSON_GLIB
+	help
+	  This option enables support for providing output in
+	  JSON format.
+
+endif
+
+comment "rauc needs a toolchain w/ wchar, threads"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/rauc/Config.in.host b/bsp/buildroot/package/rauc/Config.in.host
new file mode 100644
index 00000000..1bd9a793
--- /dev/null
+++ b/bsp/buildroot/package/rauc/Config.in.host
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_HOST_RAUC
+	bool "host rauc"
+	select BR2_PACKAGE_HOST_SQUASHFS # run-time dependency
+	help
+	  RAUC is the Robust Auto-Update Controller developed by
+	  Pengutronix. Enable this option to build the rauc
+	  host tool which may be used to generate firmware
+	  bundles that are handled by the target rauc service.
+
+	  http://rauc.io/
diff --git a/bsp/buildroot/package/rauc/rauc.hash b/bsp/buildroot/package/rauc/rauc.hash
new file mode 100644
index 00000000..91d7c1d6
--- /dev/null
+++ b/bsp/buildroot/package/rauc/rauc.hash
@@ -0,0 +1,3 @@
+# Locally calculated, after verifying against
+# https://github.com/rauc/rauc/releases/download/v0.3/rauc-0.3.tar.xz.asc
+sha256 dc01bfb08b1830376782f9a51cfec290171519267ab97cc909435da9ac6d6d98 rauc-0.3.tar.xz
diff --git a/bsp/buildroot/package/rauc/rauc.mk b/bsp/buildroot/package/rauc/rauc.mk
new file mode 100644
index 00000000..63fbc530
--- /dev/null
+++ b/bsp/buildroot/package/rauc/rauc.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# rauc
+#
+################################################################################
+
+RAUC_VERSION = 0.3
+RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)
+RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz
+RAUC_LICENSE = LGPL-2.1
+RAUC_DEPENDENCIES = host-pkgconf openssl libglib2
+
+ifeq ($(BR2_PACKAGE_RAUC_NETWORK),y)
+RAUC_CONF_OPTS += --enable-network
+RAUC_DEPENDENCIES += libcurl
+else
+RAUC_CONF_OPTS += --disable-network
+endif
+
+ifeq ($(BR2_PACKAGE_RAUC_JSON),y)
+RAUC_CONF_OPTS += --enable-json
+RAUC_DEPENDENCIES += json-glib
+else
+RAUC_CONF_OPTS += --disable-json
+endif
+
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+# configure uses pkg-config --variable=systemdsystemunitdir systemd
+RAUC_DEPENDENCIES += systemd
+endif
+
+HOST_RAUC_DEPENDENCIES = host-pkgconf host-openssl host-libglib2 host-squashfs
+HOST_RAUC_CONF_OPTS += --disable-network --disable-json --disable-service
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/rdesktop/Config.in b/bsp/buildroot/package/rdesktop/Config.in
index f683ed31..0335bee2 100644
--- a/bsp/buildroot/package/rdesktop/Config.in
+++ b/bsp/buildroot/package/rdesktop/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_RDESKTOP
 	bool "rdesktop"
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXT
-	depends on BR2_PACKAGE_XORG7
 	help
 	  rdesktop is an open source client for Windows NT Terminal
 	  Server and Windows 2000/2003 Terminal Services, capable of
diff --git a/bsp/buildroot/package/rdesktop/rdesktop.mk b/bsp/buildroot/package/rdesktop/rdesktop.mk
index 79187b5c..da8a80ef 100644
--- a/bsp/buildroot/package/rdesktop/rdesktop.mk
+++ b/bsp/buildroot/package/rdesktop/rdesktop.mk
@@ -11,7 +11,7 @@ RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \
 	$(if $(BR2_PACKAGE_LIBAO),libao) \
 	$(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate)
 RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp
-RDESKTOP_LICENSE = GPLv3+
+RDESKTOP_LICENSE = GPL-3.0+
 RDESKTOP_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_PCSC_LITE),y)
diff --git a/bsp/buildroot/package/readline/readline.mk b/bsp/buildroot/package/readline/readline.mk
index ed4e1442..cc5d4f29 100644
--- a/bsp/buildroot/package/readline/readline.mk
+++ b/bsp/buildroot/package/readline/readline.mk
@@ -11,7 +11,7 @@ READLINE_DEPENDENCIES = ncurses
 HOST_READLINE_DEPENDENCIES = host-ncurses
 READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \
 	bash_cv_wcwidth_broken=no
-READLINE_LICENSE = GPLv3+
+READLINE_LICENSE = GPL-3.0+
 READLINE_LICENSE_FILES = COPYING
 
 define READLINE_PURGE_EXAMPLES
diff --git a/bsp/buildroot/package/redis/redis.hash b/bsp/buildroot/package/redis/redis.hash
index ce2d66b8..d9a14cef 100644
--- a/bsp/buildroot/package/redis/redis.hash
+++ b/bsp/buildroot/package/redis/redis.hash
@@ -1,4 +1,4 @@
 # From https://github.com/antirez/redis-hashes/blob/master/README
-sha256 31ae927cab09f90c9ca5954aab7aeecc3bb4da6087d3d12ba0a929ceb54081b5  redis-3.2.11.tar.gz
+sha256 98c4254ae1be4e452aa7884245471501c9aa657993e0318d88f048093e7f88fd  redis-3.2.12.tar.gz
 # Locally calculated
 sha256 cbf420a3672475a6e2765e3c0984c1f81efe0212afb94a3c998ee63bfd661063  COPYING
diff --git a/bsp/buildroot/package/redis/redis.mk b/bsp/buildroot/package/redis/redis.mk
index d356b23a..cbd2d7bd 100644
--- a/bsp/buildroot/package/redis/redis.mk
+++ b/bsp/buildroot/package/redis/redis.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-REDIS_VERSION = 3.2.11
+REDIS_VERSION = 3.2.12
 REDIS_SITE = http://download.redis.io/releases
-REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components)
+REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components)
 REDIS_LICENSE_FILES = COPYING
 
 define REDIS_USERS
diff --git a/bsp/buildroot/package/refpolicy/Config.in b/bsp/buildroot/package/refpolicy/Config.in
new file mode 100644
index 00000000..954dc3a0
--- /dev/null
+++ b/bsp/buildroot/package/refpolicy/Config.in
@@ -0,0 +1,69 @@
+config BR2_PACKAGE_REFPOLICY
+	bool "refpolicy"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # policycoreutils
+	depends on BR2_TOOLCHAIN_USES_GLIBC # policycoreutils
+	depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # policycoreutils
+	depends on !BR2_STATIC_LIBS # policycoreutils
+	depends on !BR2_arc # policycoreutils
+	select BR2_PACKAGE_POLICYCOREUTILS
+	select BR2_PACKAGE_BUSYBOX_SELINUX if BR2_PACKAGE_BUSYBOX
+	help
+	  The SELinux Reference Policy project (refpolicy) is a
+	  complete SELinux policy that can be used as the system
+	  policy for a variety of systems and used as the basis for
+	  creating other policies. Reference Policy was originally
+	  based on the NSA example policy, but aims to accomplish many
+	  additional goals.
+
+	  The current refpolicy does not fully support Buildroot and
+	  needs modifications to work with the default system file
+	  layout. These changes should be added as patches to the
+	  refpolicy that modify a single SELinux policy.
+
+	  The refpolicy works for the most part in permissive
+	  mode. Only the basic set of utilities are enabled in the
+	  example policy config and some of the pathing in the
+	  policies is not correct.  Individual policies would need to
+	  be tweaked to get everything functioning properly.
+
+	  https://github.com/TresysTechnology/refpolicy
+
+comment "refpolicy needs a glibc toolchain w/ threads, dynamic library"
+	depends on !BR2_arc
+	depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_USES_GLIBC
+
+if BR2_PACKAGE_REFPOLICY
+
+config BR2_PACKAGE_REFPOLICY_POLICY_VERSION
+	string "Policy version"
+	default "30"
+
+choice
+	prompt "SELinux default state"
+	default BR2_PACKAGE_REFPOLICY_POLICY_STATE_PERMISSIVE
+
+config BR2_PACKAGE_REFPOLICY_POLICY_STATE_ENFORCING
+	bool "Enforcing"
+	help
+	  SELinux security policy is enforced
+
+config BR2_PACKAGE_REFPOLICY_POLICY_STATE_PERMISSIVE
+	bool "Permissive"
+	help
+	  SELinux prints warnings instead of enforcing
+
+config BR2_PACKAGE_REFPOLICY_POLICY_STATE_DISABLED
+	bool "Disabled"
+	help
+	  No SELinux policy is loaded
+endchoice
+
+config BR2_PACKAGE_REFPOLICY_POLICY_STATE
+	string
+	default "permissive" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_PERMISSIVE
+	default "enforcing" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_ENFORCING
+	default "disabled" if BR2_PACKAGE_REFPOLICY_POLICY_STATE_DISABLED
+
+endif
diff --git a/bsp/buildroot/package/refpolicy/config b/bsp/buildroot/package/refpolicy/config
new file mode 100644
index 00000000..087297c1
--- /dev/null
+++ b/bsp/buildroot/package/refpolicy/config
@@ -0,0 +1,8 @@
+# This file controls the state of SELinux on the system.
+# SELINUX= can take one of these three values:
+#     enforcing - SELinux security policy is enforced.
+#     permissive - SELinux prints warnings instead of enforcing.
+#     disabled - No SELinux policy is loaded.
+SELINUX=disabled
+
+SELINUXTYPE=targeted
diff --git a/bsp/buildroot/package/refpolicy/refpolicy.hash b/bsp/buildroot/package/refpolicy/refpolicy.hash
new file mode 100644
index 00000000..f341566f
--- /dev/null
+++ b/bsp/buildroot/package/refpolicy/refpolicy.hash
@@ -0,0 +1,5 @@
+# From https://github.com/TresysTechnology/refpolicy/wiki/DownloadRelease
+sha256 e826f7d7f899a548e538964487e9fc1bc67ca94756ebdce0bfb6532b4eb0d06b  refpolicy-2.20180114.tar.bz2
+
+# Locally computed
+sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 COPYING
diff --git a/bsp/buildroot/package/refpolicy/refpolicy.mk b/bsp/buildroot/package/refpolicy/refpolicy.mk
new file mode 100644
index 00000000..590e0ebd
--- /dev/null
+++ b/bsp/buildroot/package/refpolicy/refpolicy.mk
@@ -0,0 +1,62 @@
+################################################################################
+#
+# refpolicy
+#
+################################################################################
+
+REFPOLICY_VERSION = 2.20180114
+REFPOLICY_SOURCE = refpolicy-$(REFPOLICY_VERSION).tar.bz2
+REFPOLICY_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/refpolicy/files
+REFPOLICY_LICENSE = GPL-2.0
+REFPOLICY_LICENSE_FILES = COPYING
+REFPOLICY_INSTALL_STAGING = YES
+REFPOLICY_DEPENDENCIES = \
+	host-m4 \
+	host-checkpolicy \
+	host-policycoreutils \
+	host-setools \
+	host-gawk \
+	policycoreutils
+
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+REFPOLICY_DEPENDENCIES += host-python3
+else
+REFPOLICY_DEPENDENCIES += host-python
+endif
+
+# Cannot use multiple threads to build the reference policy
+REFPOLICY_MAKE = \
+	TEST_TOOLCHAIN=$(HOST_DIR) \
+	$(TARGET_MAKE_ENV) \
+	$(MAKE1)
+
+REFPOLICY_POLICY_VERSION = \
+	$(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_VERSION))
+REFPOLICY_POLICY_STATE = \
+	$(call qstrip,$(BR2_PACKAGE_REFPOLICY_POLICY_STATE))
+
+define REFPOLICY_CONFIGURE_CMDS
+	$(SED) "/OUTPUT_POLICY/c\OUTPUT_POLICY = $(REFPOLICY_POLICY_VERSION)" \
+		$(@D)/build.conf
+	$(SED) "/MONOLITHIC/c\MONOLITHIC = y" $(@D)/build.conf
+	$(SED) "/NAME/c\NAME = targeted" $(@D)/build.conf
+endef
+
+define REFPOLICY_BUILD_CMDS
+	$(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) bare conf
+endef
+
+define REFPOLICY_INSTALL_STAGING_CMDS
+	$(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) \
+		install-src install-headers
+endef
+
+define REFPOLICY_INSTALL_TARGET_CMDS
+	$(REFPOLICY_MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+	$(INSTALL) -m 0755 -D package/refpolicy/config \
+		$(TARGET_DIR)/etc/selinux/config
+	$(SED) "/^SELINUX=/c\SELINUX=$(REFPOLICY_POLICY_STATE)" \
+		$(TARGET_DIR)/etc/selinux/config
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/restorecond/Config.in b/bsp/buildroot/package/restorecond/Config.in
new file mode 100644
index 00000000..54a5545a
--- /dev/null
+++ b/bsp/buildroot/package/restorecond/Config.in
@@ -0,0 +1,24 @@
+config BR2_PACKAGE_RESTORECOND
+	bool "restorecond"
+	depends on !BR2_arc
+	depends on BR2_USE_MMU # libglib2
+	depends on BR2_USE_WCHAR # libglib2
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
+	depends on !BR2_STATIC_LIBS # libselinux
+	depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_DBUS_GLIB
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBSELINUX
+	select BR2_PACKAGE_LIBSEPOL
+	help
+	  restorecond is a daemon that watches for file creation and
+	  then sets the default SELinux file context for that file.
+
+	  https://github.com/SELinuxProject/selinux/wiki/Releases
+
+comment "restorecond needs a toolchain w/ wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_arc
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/restorecond/restorecond.hash b/bsp/buildroot/package/restorecond/restorecond.hash
new file mode 100644
index 00000000..f52bbd21
--- /dev/null
+++ b/bsp/buildroot/package/restorecond/restorecond.hash
@@ -0,0 +1,2 @@
+# https://github.com/SELinuxProject/selinux/wiki/Releases
+sha256 cb8e0a8d706cb2c1f105125f3514dffffefcbcfb49199183a7f91ab0bdf1f24d restorecond-2.7.tar.gz
diff --git a/bsp/buildroot/package/restorecond/restorecond.mk b/bsp/buildroot/package/restorecond/restorecond.mk
new file mode 100644
index 00000000..aaa59b33
--- /dev/null
+++ b/bsp/buildroot/package/restorecond/restorecond.mk
@@ -0,0 +1,52 @@
+################################################################################
+#
+# restorecond
+#
+################################################################################
+
+RESTORECOND_VERSION = 2.7
+RESTORECOND_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+RESTORECOND_LICENSE = GPL-2.0
+RESTORECOND_LICENSE_FILES = COPYING
+
+RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib
+
+# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h
+# large file support.
+# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information
+RESTORECOND_MAKE_OPTS += \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \
+	CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \
+	ARCH="$(BR2_ARCH)"
+
+# We need to pass DESTDIR at build time because it's used by
+# restorecond build system to find headers and libraries.
+define RESTORECOND_BUILD_CMDS
+	$(MAKE) -C $(@D) $(RESTORECOND_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all
+endef
+
+define RESTORECOND_INSTALL_INIT_SYSV
+	$(INSTALL) -m 0755 -D $(@D)/restorecond.init \
+		$(TARGET_DIR)/etc/init.d/S20restorecond
+endef
+
+define RESTORECOND_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -m 0644 -D $(@D)/restorecond.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/restorecond.service
+
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../../../../usr/lib/systemd/system/restorecond.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/restorecond.service
+
+	$(INSTALL) -m 0600 -D $(@D)/org.selinux.Restorecond.service \
+		$(TARGET_DIR)/etc/systemd/system/org.selinux.Restorecond.service
+endef
+
+define RESTORECOND_INSTALL_TARGET_CMDS
+	$(INSTALL) -m 0644 -D $(@D)/restorecond.conf $(TARGET_DIR)/etc/selinux/restorecond.conf
+	$(INSTALL) -m 0644 -D $(@D)/restorecond_user.conf $(TARGET_DIR)/etc/selinux/restorecond_user.conf
+	$(INSTALL) -m 0755 -D $(@D)/restorecond $(TARGET_DIR)/usr/sbin/restorecond
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/rfkill/Config.in b/bsp/buildroot/package/rfkill/Config.in
deleted file mode 100644
index 0d079138..00000000
--- a/bsp/buildroot/package/rfkill/Config.in
+++ /dev/null
@@ -1,7 +0,0 @@
-config BR2_PACKAGE_RFKILL
-	bool "rfkill"
-	help
-	  rfkill is a small userspace tool to query the state of the
-	  rfkill switches.
-
-	  https://wireless.wiki.kernel.org/en/users/documentation/rfkill
diff --git a/bsp/buildroot/package/rfkill/rfkill.hash b/bsp/buildroot/package/rfkill/rfkill.hash
deleted file mode 100644
index 21be0a20..00000000
--- a/bsp/buildroot/package/rfkill/rfkill.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From: https://www.kernel.org/pub/software/network/rfkill/sha256sums.asc
-sha256	e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a  rfkill-0.5.tar.xz
diff --git a/bsp/buildroot/package/rfkill/rfkill.mk b/bsp/buildroot/package/rfkill/rfkill.mk
deleted file mode 100644
index 2f9fe9f9..00000000
--- a/bsp/buildroot/package/rfkill/rfkill.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-################################################################################
-#
-# rfkill
-#
-################################################################################
-
-RFKILL_VERSION = 0.5
-RFKILL_SOURCE = rfkill-$(RFKILL_VERSION).tar.xz
-RFKILL_SITE = https://www.kernel.org/pub/software/network/rfkill
-RFKILL_LICENSE = ISC
-RFKILL_LICENSE_FILES = COPYING
-
-define RFKILL_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
-		VERSION_SUFFIX="br"
-endef
-
-define RFKILL_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
-endef
-
-$(eval $(generic-package))
diff --git a/bsp/buildroot/package/rhash/Config.in b/bsp/buildroot/package/rhash/Config.in
new file mode 100644
index 00000000..2ddcb00f
--- /dev/null
+++ b/bsp/buildroot/package/rhash/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_RHASH
+	bool "rhash"
+	help
+	  LibRHash is a professional, portable, thread-safe C library
+	  for computing a wide variety of hash sums, such as CRC32,
+	  MD4, MD5, SHA1, SHA256, SHA512, SHA3, AICH, ED2K, Tiger,
+	  DC++ TTH, BitTorrent BTIH, GOST R 34.11-94, RIPEMD-160,
+	  HAS-160, EDON-R, Whirlpool and Snefru.
+
+	  https://github.com/rhash/RHash
+
+if BR2_PACKAGE_RHASH
+
+config BR2_PACKAGE_RHASH_BIN
+	bool "rhash binary"
+	depends on !BR2_STATIC_LIBS
+	help
+	  Install rhash console utility
+
+comment "rhash binary needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
+endif
diff --git a/bsp/buildroot/package/rhash/rhash.hash b/bsp/buildroot/package/rhash/rhash.hash
new file mode 100644
index 00000000..5efc3a67
--- /dev/null
+++ b/bsp/buildroot/package/rhash/rhash.hash
@@ -0,0 +1,3 @@
+# From https://sourceforge.net/projects/rhash/files/rhash/1.3.4/
+md5 0b51010604659e9e99f6307b053ba13b  rhash-1.3.4-src.tar.gz
+sha1 411d8c7ba84fa9763bc49fa2fd3a7587712fd52c  rhash-1.3.4-src.tar.gz
diff --git a/bsp/buildroot/package/rhash/rhash.mk b/bsp/buildroot/package/rhash/rhash.mk
new file mode 100644
index 00000000..53f49d8d
--- /dev/null
+++ b/bsp/buildroot/package/rhash/rhash.mk
@@ -0,0 +1,63 @@
+################################################################################
+#
+# rhash
+#
+################################################################################
+
+RHASH_VERSION = 1.3.4
+RHASH_SOURCE = rhash-$(RHASH_VERSION)-src.tar.gz
+RHASH_SITE = https://sourceforge.net/projects/rhash/files/rhash/$(RHASH_VERSION)
+RHASH_LICENSE = MIT
+RHASH_LICENSE_FILES = COPYING
+RHASH_INSTALL_STAGING = YES
+RHASH_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+RHASH_ADDLDFLAGS = $(TARGET_NLS_LIBS)
+RHASH_ADDCFLAGS = $(if $(BR2_SYSTEM_ENABLE_NLS),-DUSE_GETTEXT)
+
+ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx)
+RHASH_DEPENDENCIES += openssl
+RHASH_ADDCFLAGS += -DOPENSSL_RUNTIME -rdynamic
+RHASH_ADDLDFLAGS += -ldl
+endif
+
+RHASH_MAKE_OPTS = \
+	ADDCFLAGS="$(RHASH_ADDCFLAGS)" \
+	ADDLDFLAGS="$(RHASH_ADDLDFLAGS)" \
+	PREFIX="/usr"
+
+ifeq ($(BR2_SHARED_LIBS),y)
+RHASH_BUILD_TARGETS = lib-shared build-shared
+RHASH_INSTALL_TARGETS = install-lib-shared install-so-link
+else ifeq ($(BR2_STATIC_LIBS),y)
+RHASH_BUILD_TARGETS = lib-static
+RHASH_INSTALL_TARGETS = install-lib-static
+else
+RHASH_BUILD_TARGETS = lib-static lib-shared build-shared
+RHASH_INSTALL_TARGETS = install-lib-static install-lib-shared install-so-link
+endif
+
+define RHASH_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		$(RHASH_MAKE_OPTS) $(RHASH_BUILD_TARGETS)
+endef
+
+define RHASH_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/librhash \
+		DESTDIR="$(STAGING_DIR)" $(RHASH_MAKE_OPTS) $(RHASH_INSTALL_TARGETS) \
+		install-headers
+endef
+
+ifeq ($(BR2_PACKAGE_RHASH_BIN),y)
+define RHASH_INSTALL_TARGET_RHASH_BIN
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) install-shared
+endef
+endif
+
+define RHASH_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/librhash \
+		DESTDIR="$(TARGET_DIR)" $(RHASH_MAKE_OPTS) $(RHASH_INSTALL_TARGETS)
+	$(RHASH_INSTALL_TARGET_RHASH_BIN)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/riemann-c-client/Config.in b/bsp/buildroot/package/riemann-c-client/Config.in
index e9982b2f..91b13b79 100644
--- a/bsp/buildroot/package/riemann-c-client/Config.in
+++ b/bsp/buildroot/package/riemann-c-client/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT
 	depends on BR2_INSTALL_LIBSTDCPP # protobuf-c
 	depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c
+	depends on BR2_HOST_GCC_AT_LEAST_4_5 # protobuf-c
 	select BR2_PACKAGE_PROTOBUF_C
 	help
 	  Riemann-c-client is a C client library for the Riemann
@@ -12,6 +13,7 @@ config BR2_PACKAGE_RIEMANN_C_CLIENT
 
 	  https://github.com/algernon/riemann-c-client
 
-comment "riemann-c-client needs a toolchain w/ C++, threads"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
+comment "riemann-c-client needs a toolchain w/ C++, threads, host gcc >= 4.5"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_HOST_GCC_AT_LEAST_4_5
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
diff --git a/bsp/buildroot/package/riemann-c-client/riemann-c-client.mk b/bsp/buildroot/package/riemann-c-client/riemann-c-client.mk
index c8a411c3..09f79009 100644
--- a/bsp/buildroot/package/riemann-c-client/riemann-c-client.mk
+++ b/bsp/buildroot/package/riemann-c-client/riemann-c-client.mk
@@ -7,7 +7,7 @@
 RIEMANN_C_CLIENT_VERSION = 1.9.1
 RIEMANN_C_CLIENT_SOURCE = riemann-c-client-$(RIEMANN_C_CLIENT_VERSION).tar.xz
 RIEMANN_C_CLIENT_SITE = https://github.com/algernon/riemann-c-client/releases/download/riemann-c-client-$(RIEMANN_C_CLIENT_VERSION)
-RIEMANN_C_CLIENT_LICENSE = LGPLv3+
+RIEMANN_C_CLIENT_LICENSE = LGPL-3.0+
 RIEMANN_C_CLIENT_LICENSE_FILES = LICENSE
 RIEMANN_C_CLIENT_INSTALL_STAGING = YES
 RIEMANN_C_CLIENT_MAKE = $(MAKE1)
diff --git a/bsp/buildroot/package/rings/rings.mk b/bsp/buildroot/package/rings/rings.mk
index 151546ae..92001bbf 100644
--- a/bsp/buildroot/package/rings/rings.mk
+++ b/bsp/buildroot/package/rings/rings.mk
@@ -8,5 +8,6 @@ RINGS_VERSION_MAJOR = 1.3.0
 RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
 RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
 RINGS_LICENSE = MIT
+RINGS_LICENSE_FILES = $(RINGS_SUBDIR)/doc/us/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/rng-tools/rng-tools.mk b/bsp/buildroot/package/rng-tools/rng-tools.mk
index cc07bdf1..bbb1a64c 100644
--- a/bsp/buildroot/package/rng-tools/rng-tools.mk
+++ b/bsp/buildroot/package/rng-tools/rng-tools.mk
@@ -6,7 +6,7 @@
 
 RNG_TOOLS_VERSION = 5
 RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION)
-RNG_TOOLS_LICENSE = GPLv2
+RNG_TOOLS_LICENSE = GPL-2.0
 RNG_TOOLS_LICENSE_FILES = COPYING
 
 # Work around for uClibc or musl toolchains which lack argp_*()
diff --git a/bsp/buildroot/package/rp-pppoe/Config.in b/bsp/buildroot/package/rp-pppoe/Config.in
index a41de333..8a692711 100644
--- a/bsp/buildroot/package/rp-pppoe/Config.in
+++ b/bsp/buildroot/package/rp-pppoe/Config.in
@@ -9,10 +9,11 @@ config BR2_PACKAGE_RP_PPPOE
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_PPPD
 	help
-	  An implementation of the Point-to-point protocol over Ethernet.
-	  Has userspace client and server deamons. You likely only need
-	  this package if you are implementing the pppoe server that will
-	  service other pppoe client devices. Otherwise the normal client
-	  functionality already exists in the pppd package (and kernel).
+	  An implementation of the Point-to-point protocol over
+	  Ethernet.  Has userspace client and server deamons. You
+	  likely only need this package if you are implementing the
+	  pppoe server that will service other pppoe client
+	  devices. Otherwise the normal client functionality already
+	  exists in the pppd package (and kernel).
 
 	  http://www.roaringpenguin.com/pppoe.html
diff --git a/bsp/buildroot/package/rp-pppoe/rp-pppoe.mk b/bsp/buildroot/package/rp-pppoe/rp-pppoe.mk
index 99d231e5..4214df92 100644
--- a/bsp/buildroot/package/rp-pppoe/rp-pppoe.mk
+++ b/bsp/buildroot/package/rp-pppoe/rp-pppoe.mk
@@ -6,7 +6,7 @@
 
 RP_PPPOE_VERSION = 3.12
 RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download
-RP_PPPOE_LICENSE = GPLv2
+RP_PPPOE_LICENSE = GPL-2.0
 RP_PPPOE_LICENSE_FILES = doc/LICENSE
 RP_PPPOE_DEPENDENCIES = pppd
 RP_PPPOE_SUBDIR = src
diff --git a/bsp/buildroot/package/rpcbind/Config.in b/bsp/buildroot/package/rpcbind/Config.in
index 9ff64a58..ced2d409 100644
--- a/bsp/buildroot/package/rpcbind/Config.in
+++ b/bsp/buildroot/package/rpcbind/Config.in
@@ -3,12 +3,11 @@ config BR2_PACKAGE_RPCBIND
 	# We really need libtirpc and can't work with the native RPC
 	# implementation of toolchains.
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc
+	depends on BR2_USE_MMU 	# fork()
 	select BR2_PACKAGE_LIBTIRPC
-	# fork()
-	depends on BR2_USE_MMU
 	help
-	  The rpcbind utility is a server that converts RPC program numbers
-	  into universal addresses.
+	  The rpcbind utility is a server that converts RPC program
+	  numbers into universal addresses.
 
 comment "rpcbind needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/rpcbind/rpcbind.mk b/bsp/buildroot/package/rpcbind/rpcbind.mk
index f8f8c418..5c216afc 100644
--- a/bsp/buildroot/package/rpcbind/rpcbind.mk
+++ b/bsp/buildroot/package/rpcbind/rpcbind.mk
@@ -7,7 +7,7 @@
 RPCBIND_VERSION = 0.2.3
 RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION)
 RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
-RPCBIND_LICENSE = BSD-3c
+RPCBIND_LICENSE = BSD-3-Clause
 RPCBIND_LICENSE_FILES = COPYING
 
 RPCBIND_CONF_ENV += \
@@ -36,5 +36,4 @@ define RPCBIND_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S30rpcbind
 endef
 
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/rpi-bt-firmware/Config.in b/bsp/buildroot/package/rpi-bt-firmware/Config.in
new file mode 100644
index 00000000..dfc1cee0
--- /dev/null
+++ b/bsp/buildroot/package/rpi-bt-firmware/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_RPI_BT_FIRMWARE
+	bool "rpi-bt-firmware"
+	depends on BR2_arm || BR2_aarch64
+	help
+	  Raspberry Pi 3 and Zero W Broadcom BCM43438 Bluetooth module
+	  firmware.
+
+	  https://aur.archlinux.org/packages/pi-bluetooth
diff --git a/bsp/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash b/bsp/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
new file mode 100644
index 00000000..f1d06e8c
--- /dev/null
+++ b/bsp/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 5d9c9364277414ffd67b4a266cdf88e92f28eb937e5a413750e87b7a94161bef  rpi-bt-firmware-a439f892bf549ddfefa9ba7ad1999cc515f233bf.tar.gz
diff --git a/bsp/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk b/bsp/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
new file mode 100644
index 00000000..255da192
--- /dev/null
+++ b/bsp/buildroot/package/rpi-bt-firmware/rpi-bt-firmware.mk
@@ -0,0 +1,21 @@
+################################################################################
+#
+# rpi-bt-firmware
+#
+################################################################################
+
+RPI_BT_FIRMWARE_VERSION = a439f892bf549ddfefa9ba7ad1999cc515f233bf
+RPI_BT_FIRMWARE_SITE = https://aur.archlinux.org/pi-bluetooth.git
+RPI_BT_FIRMWARE_SITE_METHOD = git
+RPI_BT_FIRMWARE_LICENSE = PROPRIETARY
+RPI_BT_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
+
+# The BlueZ hciattach utility looks for firmware in /etc/firmware. Add a
+# compatibility symlink.
+define RPI_BT_FIRMWARE_INSTALL_TARGET_CMDS
+	ln -sf ../lib/firmware $(TARGET_DIR)/etc/firmware
+	$(INSTALL) -D -m 0644 $(@D)/BCM43430A1.hcd \
+		$(TARGET_DIR)/lib/firmware/BCM43430A1.hcd
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/rpi-firmware/Config.in b/bsp/buildroot/package/rpi-firmware/Config.in
index c2983aa8..0ebbe7a4 100644
--- a/bsp/buildroot/package/rpi-firmware/Config.in
+++ b/bsp/buildroot/package/rpi-firmware/Config.in
@@ -1,9 +1,11 @@
 config BR2_PACKAGE_RPI_FIRMWARE
 	bool "rpi-firmware"
-	depends on BR2_arm
+	depends on BR2_arm || BR2_aarch64
 	help
 	  RaspberryPi Firmware
-	  Pre-compiled binaries of the current bootloader and GPU firmware
+
+	  Pre-compiled binaries of the current bootloader and GPU
+	  firmware
 
 	  https://github.com/raspberrypi/firmware
 
@@ -14,11 +16,12 @@ choice
 	default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT
 	help
 	  There are three different firmware files:
-	    - the default firmware, that enables standard GPU features;
-	    - the extended firmware, that enables additional GPU features
-	      (eg. more audio/video codecs);
-	    - the cut-down firmware, for emergency situations, with only
-	      features required to boot a Linux kernel.
+	    - the default firmware, that enables standard GPU
+	      features;
+	    - the extended firmware, that enables additional GPU
+	      features (eg. more audio/video codecs);
+	    - the cut-down firmware, for emergency situations, with
+	      only features required to boot a Linux kernel.
 
 config BR2_PACKAGE_RPI_FIRMWARE_DEFAULT
 	bool "default"
@@ -47,26 +50,29 @@ config BR2_PACKAGE_RPI_FIRMWARE_BOOT
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS
 	bool "Install Device Tree Blobs (DTBs)"
-	depends on !BR2_LINUX_KERNEL_DTS_SUPPORT
 	default y
+	depends on !BR2_LINUX_KERNEL_DTS_SUPPORT
 	help
-	  If you are using a Linux kernel <= 3.18, you should say 'y' here.
+	  If you are using a Linux kernel <= 3.18, you should say 'y'
+	  here.
 
-	  If you are using a Linux kernel >= 3.19, you should say 'n' here,
-	  and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the kernel build
-	  the DTB.
+	  If you are using a Linux kernel >= 3.19, you should say 'n'
+	  here, and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the
+	  kernel build the DTB.
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 	bool "Install DTB overlays"
+	default y
 	depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \
 		|| BR2_LINUX_KERNEL_DTS_SUPPORT
-	default y
 	help
-	  Say 'y' here if you need to load one or more of the DTB overlays,
-	  to support HATs (Hardware Attached on Top, add-on modules).
+	  Say 'y' here if you need to load one or more of the DTB
+	  overlays, to support HATs (Hardware Attached on Top, add-on
+	  modules).
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	bool "vcdbg"
+	depends on BR2_arm # prebuilt arm binary, rpi-userland
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
 	select BR2_PACKAGE_RPI_USERLAND
@@ -74,6 +80,7 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	  Install vcdbg, to help debug communication with the GPU.
 
 comment "vcdbg needs a glibc toolchain w/ C++"
+	depends on BR2_arm
 	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP
 
 endif # BR2_PACKAGE_RPI_FIRMWARE
diff --git a/bsp/buildroot/package/rpi-firmware/rpi-firmware.hash b/bsp/buildroot/package/rpi-firmware/rpi-firmware.hash
index 8161d7ae..833a7fbe 100644
--- a/bsp/buildroot/package/rpi-firmware/rpi-firmware.hash
+++ b/bsp/buildroot/package/rpi-firmware/rpi-firmware.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 144de63ee1999155fc1ff597630f1a13f798e597e7c4d144b8b625fa774c1f9b rpi-firmware-7f8ac8dac0b80291cbf5e56580139034a0a42070.tar.gz
+sha256 0451e1a843bf02df81126a1625d9a15dfdf19dcb2f9e95b0613a63e59fd31ca8 rpi-firmware-2067241bc7cdf238fdeab7f5a3c22faa57dd5617.tar.gz
diff --git a/bsp/buildroot/package/rpi-firmware/rpi-firmware.mk b/bsp/buildroot/package/rpi-firmware/rpi-firmware.mk
index 8575e7f2..22eaaa28 100644
--- a/bsp/buildroot/package/rpi-firmware/rpi-firmware.mk
+++ b/bsp/buildroot/package/rpi-firmware/rpi-firmware.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = 7f8ac8dac0b80291cbf5e56580139034a0a42070
+RPI_FIRMWARE_VERSION = 2067241bc7cdf238fdeab7f5a3c22faa57dd5617
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
-RPI_FIRMWARE_LICENSE = BSD-3c
+RPI_FIRMWARE_LICENSE = BSD-3-Clause
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
 RPI_FIRMWARE_INSTALL_IMAGES = YES
 
diff --git a/bsp/buildroot/package/rpi-userland/Config.in b/bsp/buildroot/package/rpi-userland/Config.in
index 9bb2bfc5..8d349f21 100644
--- a/bsp/buildroot/package/rpi-userland/Config.in
+++ b/bsp/buildroot/package/rpi-userland/Config.in
@@ -9,11 +9,12 @@ config BR2_PACKAGE_RPI_USERLAND
 	select BR2_PACKAGE_HAS_LIBOPENVG
 	select BR2_PACKAGE_HAS_LIBOPENMAX
 	help
-	  Raspberry Pi Userland contains the necessary library to use the
-	  VideoCore driver.
+	  Raspberry Pi Userland contains the necessary library to use
+	  the VideoCore driver.
 
-	  Includes source for the ARM side code to interface to:
-	  EGL, mmal, GLESv2, vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG.
+	  Includes source for the ARM side code to interface to: EGL,
+	  mmal, GLESv2, vcos, openmaxil, vchiq_arm, bcm_host, WFC,
+	  OpenVG.
 
 	  https://github.com/raspberrypi/userland/
 
@@ -35,8 +36,8 @@ config BR2_PACKAGE_RPI_USERLAND_START_VCFILED
 	bool "Start vcfiled"
 	depends on BR2_INIT_SYSV || BR2_INIT_BUSYBOX
 	help
-	  vcfiled is a daemon serving files to VideoCore from the host file
-	  system.
+	  vcfiled is a daemon serving files to VideoCore from the host
+	  file system.
 
 config BR2_PACKAGE_RPI_USERLAND_HELLO
 	bool "hello_pi examples"
diff --git a/bsp/buildroot/package/rpi-userland/rpi-userland.hash b/bsp/buildroot/package/rpi-userland/rpi-userland.hash
index 24b6584b..f1bb5e67 100644
--- a/bsp/buildroot/package/rpi-userland/rpi-userland.hash
+++ b/bsp/buildroot/package/rpi-userland/rpi-userland.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 f229c29ceae611101bf4716b112251b2f2a33cfbb6636d736deda4e1314bb9d9 rpi-userland-c139376e9bc6fbd93f777c7fc3c7d7cf2cc35122.tar.gz
+sha256 8ed745ea28ef9d5e6d2e5534acabe1ea1a6c6be9bab7f683527ce5da5a3f77cb rpi-userland-a7976021a89451de0d008aa48f16c4e88872899b.tar.gz
diff --git a/bsp/buildroot/package/rpi-userland/rpi-userland.mk b/bsp/buildroot/package/rpi-userland/rpi-userland.mk
index 4e3b4ec4..a798795b 100644
--- a/bsp/buildroot/package/rpi-userland/rpi-userland.mk
+++ b/bsp/buildroot/package/rpi-userland/rpi-userland.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-RPI_USERLAND_VERSION = c139376e9bc6fbd93f777c7fc3c7d7cf2cc35122
+RPI_USERLAND_VERSION = a7976021a89451de0d008aa48f16c4e88872899b
 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
-RPI_USERLAND_LICENSE = BSD-3c
+RPI_USERLAND_LICENSE = BSD-3-Clause
 RPI_USERLAND_LICENSE_FILES = LICENCE
 RPI_USERLAND_INSTALL_STAGING = YES
 RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \
diff --git a/bsp/buildroot/package/rpi-wifi-firmware/Config.in b/bsp/buildroot/package/rpi-wifi-firmware/Config.in
new file mode 100644
index 00000000..2c87c758
--- /dev/null
+++ b/bsp/buildroot/package/rpi-wifi-firmware/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_RPI_WIFI_FIRMWARE
+	bool "rpi-wifi-firmware"
+	depends on BR2_arm || BR2_aarch64
+	select BR2_PACKAGE_LINUX_FIRMWARE
+	select BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX # runtime
+	help
+	  Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module
+	  NVRAM data.
+
+	  https://github.com/RPi-Distro/firmware-nonfree/
diff --git a/bsp/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/bsp/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
new file mode 100644
index 00000000..c2050653
--- /dev/null
+++ b/bsp/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  872fde4f9942d9aba805880d6eaddfe050305626fd58ad955bfe77c04f6b75a5  brcmfmac43430-sdio.txt
diff --git a/bsp/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/bsp/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
new file mode 100644
index 00000000..6c855a8e
--- /dev/null
+++ b/bsp/buildroot/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# rpi-wifi-firmware
+#
+################################################################################
+
+RPI_WIFI_FIRMWARE_VERSION = 54bab3d6a6d43239c71d26464e6e10e5067ffea7
+# brcmfmac43430-sdio.bin comes from linux-firmware
+RPI_WIFI_FIRMWARE_SOURCE = brcmfmac43430-sdio.txt
+# git repo contains a lot of unrelated files
+RPI_WIFI_FIRMWARE_SITE = https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(RPI_WIFI_FIRMWARE_VERSION)/brcm80211/brcm
+RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
+
+define RPI_WIFI_FIRMWARE_EXTRACT_CMDS
+	cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
+endef
+
+define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0644 $(@D)/$(RPI_WIFI_FIRMWARE_SOURCE) \
+		$(TARGET_DIR)/lib/firmware/brcm/$(RPI_WIFI_FIRMWARE_SOURCE)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch b/bsp/buildroot/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
new file mode 100644
index 00000000..6f6a2aba
--- /dev/null
+++ b/bsp/buildroot/package/rpm/0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
@@ -0,0 +1,33 @@
+From b5f1895aae096836d6e8e155ee289e1b10fcabcb Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 10 Oct 2015 23:17:44 +0200
+Subject: [PATCH] configure.ac: use link instead of compile for gcc flags test
+
+The logic that tests whether gcc supports or not certain flags uses
+AC_COMPILE_IFELSE(). However, when checking for stack smashing
+protection support, an AC_LINK_IFELSE() test is needed, since the
+build might work but not the link stage if certain libraries are
+missing for proper stack smashing protection support.
+
+Therefore, this commit switches to use AC_LINK_IFELSE().
+
+[Upstream commit: https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: James Knight <james.d.knight@live.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6ece8c9fd..822294c3f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ if test "$GCC" = yes; then
+     echo
+     for flag in $cflags_to_try; do
+         CFLAGS="$CFLAGS $flag -Werror"
+-        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[
+                 echo "   $flag"
+                 RPMCFLAGS="$RPMCFLAGS $flag"
+         ],[])
diff --git a/bsp/buildroot/package/rpm/0002-configure-ac-correct-stack-protector-check.patch b/bsp/buildroot/package/rpm/0002-configure-ac-correct-stack-protector-check.patch
new file mode 100644
index 00000000..9d2942b4
--- /dev/null
+++ b/bsp/buildroot/package/rpm/0002-configure-ac-correct-stack-protector-check.patch
@@ -0,0 +1,45 @@
+From c810a0aca3f1148d2072d44b91b8cc9caeb4cf19 Mon Sep 17 00:00:00 2001
+From: James Knight <james.knight@rockwellcollins.com>
+Date: Wed, 16 Nov 2016 15:54:46 -0500
+Subject: [PATCH] configure.ac: correct stack protector check
+
+If a used toolchain accepts the `-fstack-protector` option but does not
+provide a stack smashing protector implementation (ex. libssp), linking
+will fail:
+
+ .libs/rpmio.o: In function `Fdescr':
+ rpmio.c:(.text+0x672): undefined reference to `__stack_chk_fail_local'
+ .libs/rpmio.o: In function `Fdopen':
+ rpmio.c:(.text+0xce9): undefined reference to `__stack_chk_fail_local'
+ .libs/rpmio.o: In function `ufdCopy':
+ rpmio.c:(.text+0x10f7): undefined reference to `__stack_chk_fail_local'
+ ...
+
+This is a result of testing for `-fstack-protector` support using a main
+that GCC does not inject guards. GCC's manual notes that stack protector
+code is only added when "[functions] that call alloca, and functions
+with buffers larger than 8 bytes" [1]. This commit adjusts the stack
+protector check to allocate memory on the stack (via `alloca`).
+
+[1]: https://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Optimize-Options.html
+
+Signed-off-by: James Knight <james.knight@rockwellcollins.com>
+[Upstream commit: https://github.com/rpm-software-management/rpm/commit/c810a0aca3f1148d2072d44b91b8cc9caeb4cf19]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index a9730d3bc..b4b3fe8fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ if test "$GCC" = yes; then
+     echo
+     for flag in $cflags_to_try; do
+         CFLAGS="$CFLAGS $flag -Werror"
+-        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],[
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])],[
+                 echo "   $flag"
+                 RPMCFLAGS="$RPMCFLAGS $flag"
+         ],[])
diff --git a/bsp/buildroot/package/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch b/bsp/buildroot/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch
similarity index 100%
rename from bsp/buildroot/package/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch
rename to bsp/buildroot/package/rpm/0003-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch
diff --git a/bsp/buildroot/package/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch b/bsp/buildroot/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch
similarity index 100%
rename from bsp/buildroot/package/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch
rename to bsp/buildroot/package/rpm/0004-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch
diff --git a/bsp/buildroot/package/rpm/Config.in b/bsp/buildroot/package/rpm/Config.in
index 9b4c8a7e..aa857ef2 100644
--- a/bsp/buildroot/package/rpm/Config.in
+++ b/bsp/buildroot/package/rpm/Config.in
@@ -12,7 +12,6 @@ config BR2_PACKAGE_RPM
 	select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS
 	select BR2_PACKAGE_BERKELEYDB
 	select BR2_PACKAGE_FILE
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_ZLIB
 	help
diff --git a/bsp/buildroot/package/rpm/rpm.hash b/bsp/buildroot/package/rpm/rpm.hash
index fd77d33f..7ae9ec73 100644
--- a/bsp/buildroot/package/rpm/rpm.hash
+++ b/bsp/buildroot/package/rpm/rpm.hash
@@ -1,5 +1,2 @@
 # From http://rpm.org/wiki/Releases/4.13.0.1
 sha1 9566f95f38fcb214e439c552f378c2f64ba0aff9  rpm-4.13.0.1.tar.bz2
-# Locally computed
-sha256	a3e5568d721737a24141737e6036bb39ba9dfbeaa03fa4a51cc7881a243e0c5d b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch
-sha256	7ab0e08e143bb2d43d5b0553ee22ea34da15a611c597860a6110745467d20fa8 c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch
diff --git a/bsp/buildroot/package/rpm/rpm.mk b/bsp/buildroot/package/rpm/rpm.mk
index 1c03f2ea..159ae72a 100644
--- a/bsp/buildroot/package/rpm/rpm.mk
+++ b/bsp/buildroot/package/rpm/rpm.mk
@@ -9,14 +9,12 @@ RPM_VERSION = $(RPM_VERSION_MAJOR).0.1
 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2
 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x
 RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib
-RPM_LICENSE = GPLv2 or LGPLv2 (library only)
+RPM_LICENSE = GPL-2.0 or LGPL-2.0 (library only)
 RPM_LICENSE_FILES = COPYING
-RPM_PATCH = \
-	https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch \
-	https://github.com/rpm-software-management/rpm/commit/c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch
+RPM_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
-# b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch
-# c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch
+# 0001-configure-ac-use-link-instead-of-compile-for-gcc-flags-test.patch
+# 0002-configure-ac-correct-stack-protector-check.patch
 RPM_AUTORECONF = YES
 
 RPM_CONF_OPTS = \
@@ -45,8 +43,7 @@ RPM_CONF_OPTS += --with-beecrypt
 RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-RPM_DEPENDENCIES += gettext
+ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
 RPM_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr
 else
 RPM_CONF_OPTS += --without-libintl-prefix
@@ -76,12 +73,6 @@ ifeq ($(BR2_PACKAGE_BINUTILS),y)
 RPM_DEPENDENCIES += binutils
 endif
 
-# RPM, when using NLS, requires GNU gettext's _nl_msg_cat_cntr, which is not
-# provided in musl.
-ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
-RPM_CONF_OPTS += --disable-nls
-endif
-
 # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`).
 RPM_CONF_ENV = \
 	ac_cv_prog_cc_c99='-std=gnu99' \
diff --git a/bsp/buildroot/package/rrdtool/Config.in b/bsp/buildroot/package/rrdtool/Config.in
index 3d8c0c64..631ed328 100644
--- a/bsp/buildroot/package/rrdtool/Config.in
+++ b/bsp/buildroot/package/rrdtool/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_RRDTOOL
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
 	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  RRDtool is the OpenSource industry standard, high performance
 	  data logging and graphing system for time series data.
diff --git a/bsp/buildroot/package/rrdtool/rrdtool.mk b/bsp/buildroot/package/rrdtool/rrdtool.mk
index abca1d80..ea5c892e 100644
--- a/bsp/buildroot/package/rrdtool/rrdtool.mk
+++ b/bsp/buildroot/package/rrdtool/rrdtool.mk
@@ -6,9 +6,9 @@
 
 RRDTOOL_VERSION = 1.6.0
 RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub
-RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT
+RRDTOOL_LICENSE = GPL-2.0+ with FLOSS license exceptions as explained in COPYRIGHT
 RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE
-RRDTOOL_DEPENDENCIES = host-pkgconf libglib2
+RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES)
 # autoreconf needed to avoid link failure due to missing -lintl,
 # gettextize needed as a consequence of autoreconf
 RRDTOOL_AUTORECONF = YES
@@ -25,11 +25,6 @@ RRDTOOL_CONF_OPTS = \
 	--disable-ruby \
 	--disable-tcl
 
-
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-RRDTOOL_DEPENDENCIES += gettext
-endif
-
 ifeq ($(BR2_PACKAGE_RRDTOOL_RRDGRAPH),y)
 RRDTOOL_DEPENDENCIES += cairo pango
 else
diff --git a/bsp/buildroot/package/rs485conf/rs485conf.mk b/bsp/buildroot/package/rs485conf/rs485conf.mk
index 8749268f..9d1b7642 100644
--- a/bsp/buildroot/package/rs485conf/rs485conf.mk
+++ b/bsp/buildroot/package/rs485conf/rs485conf.mk
@@ -6,7 +6,7 @@
 
 RS485CONF_VERSION = 5c8d00cf70950fab3454549b81dea843d844492a
 RS485CONF_SITE = $(call github,mniestroj,rs485conf,$(RS485CONF_VERSION))
-RS485CONF_LICENSE = BSD-3c
+RS485CONF_LICENSE = BSD-3-Clause
 RS485CONF_LICENSE_FILES = LICENSE
 
 define RS485CONF_BUILD_CMDS
diff --git a/bsp/buildroot/package/rsh-redone/Config.in b/bsp/buildroot/package/rsh-redone/Config.in
index 6a8aec03..1335c857 100644
--- a/bsp/buildroot/package/rsh-redone/Config.in
+++ b/bsp/buildroot/package/rsh-redone/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_RSH_REDONE
 	bool "rsh-redone"
 	help
-	  Rsh-redone is a reimplementation of the remote shell clients and
-	  servers. It is written from the ground up to avoid the bugs found
-	  in the standard clients and servers. It also fully supports IPv6.
+	  Rsh-redone is a reimplementation of the remote shell clients
+	  and servers. It is written from the ground up to avoid the
+	  bugs found in the standard clients and servers. It also
+	  fully supports IPv6.
 
 	  http://packages.debian.org/source/sid/rsh-redone
 
diff --git a/bsp/buildroot/package/rsh-redone/rsh-redone.mk b/bsp/buildroot/package/rsh-redone/rsh-redone.mk
index a62c2df1..f63da648 100644
--- a/bsp/buildroot/package/rsh-redone/rsh-redone.mk
+++ b/bsp/buildroot/package/rsh-redone/rsh-redone.mk
@@ -7,7 +7,7 @@
 RSH_REDONE_VERSION = 85
 RSH_REDONE_SOURCE = rsh-redone_$(RSH_REDONE_VERSION).orig.tar.gz
 RSH_REDONE_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/r/rsh-redone
-RSH_REDONE_LICENSE = GPLv2
+RSH_REDONE_LICENSE = GPL-2.0
 RSH_REDONE_LICENSE_FILES = rsh.c
 
 RSH_REDONE_BINS-y =
diff --git a/bsp/buildroot/package/rsync/rsync.mk b/bsp/buildroot/package/rsync/rsync.mk
index 89220200..52875e42 100644
--- a/bsp/buildroot/package/rsync/rsync.mk
+++ b/bsp/buildroot/package/rsync/rsync.mk
@@ -6,7 +6,7 @@
 
 RSYNC_VERSION = 3.1.3
 RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src
-RSYNC_LICENSE = GPLv3+
+RSYNC_LICENSE = GPL-3.0+
 RSYNC_LICENSE_FILES = COPYING
 RSYNC_DEPENDENCIES = zlib popt
 RSYNC_CONF_OPTS = \
diff --git a/bsp/buildroot/package/rsyslog/Config.in b/bsp/buildroot/package/rsyslog/Config.in
index c4dc97af..8c024e69 100644
--- a/bsp/buildroot/package/rsyslog/Config.in
+++ b/bsp/buildroot/package/rsyslog/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_RSYSLOG
 	bool "rsyslog"
-	select BR2_PACKAGE_ZLIB
-	select BR2_PACKAGE_LIBESTR
-	select BR2_PACKAGE_LIBLOGGING
-	select BR2_PACKAGE_LIBFASTJSON
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS # modules
@@ -12,6 +8,10 @@ config BR2_PACKAGE_RSYSLOG
 	# even though rsyslog already depends on threads for itself:
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LIBESTR
+	select BR2_PACKAGE_LIBLOGGING
+	select BR2_PACKAGE_LIBFASTJSON
 	help
 	  Rsyslog is a powerful and flexible syslog implementation
 
diff --git a/bsp/buildroot/package/rsyslog/rsyslog.mk b/bsp/buildroot/package/rsyslog/rsyslog.mk
index 3254d999..e32505be 100644
--- a/bsp/buildroot/package/rsyslog/rsyslog.mk
+++ b/bsp/buildroot/package/rsyslog/rsyslog.mk
@@ -6,7 +6,7 @@
 
 RSYSLOG_VERSION = 8.22.0
 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog
-RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0
+RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0
 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20
 RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf
 RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99'
@@ -91,7 +91,7 @@ define RSYSLOG_INSTALL_INIT_SYSTEMD
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
 	ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \
 		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service
-	ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \
+	ln -sf ../../../usr/lib/systemd/system/rsyslog.service \
 		$(TARGET_DIR)/etc/systemd/system/syslog.service
 endef
 
diff --git a/bsp/buildroot/package/rt-tests/Config.in b/bsp/buildroot/package/rt-tests/Config.in
index b39856d3..23e911b9 100644
--- a/bsp/buildroot/package/rt-tests/Config.in
+++ b/bsp/buildroot/package/rt-tests/Config.in
@@ -23,7 +23,6 @@ config BR2_PACKAGE_RT_TESTS
 
 	  http://rt.wiki.kernel.org
 
-
 comment "rt-tests may not work on MIPS with an external uClibc toolchain"
 	depends on BR2_PACKAGE_RT_TESTS
 	depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC
diff --git a/bsp/buildroot/package/rt-tests/rt-tests.mk b/bsp/buildroot/package/rt-tests/rt-tests.mk
index addc15e6..273949a9 100644
--- a/bsp/buildroot/package/rt-tests/rt-tests.mk
+++ b/bsp/buildroot/package/rt-tests/rt-tests.mk
@@ -7,7 +7,7 @@
 RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests
 RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz
 RT_TESTS_VERSION = 1.0
-RT_TESTS_LICENSE = GPLv2+
+RT_TESTS_LICENSE = GPL-2.0+
 RT_TESTS_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_PYTHON),y)
@@ -15,16 +15,16 @@ RT_TESTS_DEPENDENCIES = python
 endif
 
 define RT_TESTS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)	\
-		CC="$(TARGET_CC)" 		\
-		CFLAGS="$(TARGET_CFLAGS)"	\
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		prefix=/usr
 endef
 
 define RT_TESTS_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)		\
-		DESTDIR="$(TARGET_DIR)" 		\
-		prefix=/usr 				\
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \
+		DESTDIR="$(TARGET_DIR)" \
+		prefix=/usr \
 		$(if $(BR2_PACKAGE_PYTHON),PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/,PYLIB="") \
 		install
 endef
diff --git a/bsp/buildroot/package/rtai/rtai.mk b/bsp/buildroot/package/rtai/rtai.mk
index dfd8e0c1..90f2cc4c 100644
--- a/bsp/buildroot/package/rtai/rtai.mk
+++ b/bsp/buildroot/package/rtai/rtai.mk
@@ -20,11 +20,11 @@ RTAI_DEPENDENCIES = linux
 
 RTAI_CONF_OPTS = \
 	--includedir=/usr/include/rtai \
-	--with-linux-dir=$(LINUX_DIR) 	\
-	--disable-leds		      	\
-	--enable-usi			\
-	--enable-align-priority		\
-	--disable-rtailab		\
+	--with-linux-dir=$(LINUX_DIR) \
+	--disable-leds \
+	--enable-usi \
+	--enable-align-priority \
+	--disable-rtailab \
 	--with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai
 
 RTAI_MAKE = $(MAKE1)
diff --git a/bsp/buildroot/package/rtl8188eu/Config.in b/bsp/buildroot/package/rtl8188eu/Config.in
index 09cde24a..9263802e 100644
--- a/bsp/buildroot/package/rtl8188eu/Config.in
+++ b/bsp/buildroot/package/rtl8188eu/Config.in
@@ -4,14 +4,14 @@ config BR2_PACKAGE_RTL8188EU
 	help
 	  A standalone driver for the RTL8188EU USB Wi-Fi adapter.
 	  This is needed only for Linux kernels before 3.12.
-	  Since 3.12, there is a (staging) driver in mainline, with a similar
-	  codebase.
+	  Since 3.12, there is a (staging) driver in mainline, with a
+	  similar codebase.
 
-	  Make sure your target kernel has the CONFIG_WIRELESS_EXT config
-	  option enabled.
+	  Make sure your target kernel has the CONFIG_WIRELESS_EXT
+	  config option enabled.
 
-	  Note: this package needs a firmware loading mechanism to load the
-	  binary blob for the chip to work.
+	  Note: this package needs a firmware loading mechanism to load
+	  the binary blob for the chip to work.
 
 	  https://github.com/lwfinger/rtl8188eu
 
diff --git a/bsp/buildroot/package/rtl8188eu/rtl8188eu.mk b/bsp/buildroot/package/rtl8188eu/rtl8188eu.mk
index 8560be29..5c1cc73d 100644
--- a/bsp/buildroot/package/rtl8188eu/rtl8188eu.mk
+++ b/bsp/buildroot/package/rtl8188eu/rtl8188eu.mk
@@ -6,7 +6,7 @@
 
 RTL8188EU_VERSION = ced2b64a1139dcaf86947e3a9f7617dffbd64239
 RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION))
-RTL8188EU_LICENSE = GPLv2, proprietary (rtl8188eufw.bin firmware blob)
+RTL8188EU_LICENSE = GPL-2.0, proprietary (rtl8188eufw.bin firmware blob)
 RTL8188EU_LICENSE_FILES = COPYING
 RTL8188EU_MODULE_MAKE_OPTS = CONFIG_RTL8188EU=m
 
diff --git a/bsp/buildroot/package/rtl8189fs/Config.in b/bsp/buildroot/package/rtl8189fs/Config.in
new file mode 100644
index 00000000..ae69b792
--- /dev/null
+++ b/bsp/buildroot/package/rtl8189fs/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_RTL8189FS
+	bool "rtl8189fs"
+	depends on BR2_LINUX_KERNEL
+	help
+	  Wireless driver rtl8189fs.
+
+	  https://github.com/jwrdegoede/rtl8189ES_linux.git
+
+comment "rtl8189fs needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/rtl8189fs/rtl8189fs.hash b/bsp/buildroot/package/rtl8189fs/rtl8189fs.hash
new file mode 100644
index 00000000..d6ce6c1e
--- /dev/null
+++ b/bsp/buildroot/package/rtl8189fs/rtl8189fs.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 93472471e1769f92984792f40a0898dd8dd02122d745d48e8edd1a8cc869bc82 rtl8189fs-569bdb91f2cc76e2f5b77df42471db2a62fd2376.tar.gz
diff --git a/bsp/buildroot/package/rtl8189fs/rtl8189fs.mk b/bsp/buildroot/package/rtl8189fs/rtl8189fs.mk
new file mode 100644
index 00000000..d463bba7
--- /dev/null
+++ b/bsp/buildroot/package/rtl8189fs/rtl8189fs.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# rtl8189fs
+#
+################################################################################
+
+RTL8189FS_VERSION = 569bdb91f2cc76e2f5b77df42471db2a62fd2376
+RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION))
+RTL8189FS_LICENSE = GPL-2.0
+
+RTL8189FS_MODULE_MAKE_OPTS = \
+	CONFIG_RTL8189FS=m \
+	KVER=$(LINUX_VERSION_PROBED) \
+	KSRC=$(LINUX_DIR)
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/rtl8723bs/rtl8723bs.mk b/bsp/buildroot/package/rtl8723bs/rtl8723bs.mk
index f5bc1acd..4c6303c2 100644
--- a/bsp/buildroot/package/rtl8723bs/rtl8723bs.mk
+++ b/bsp/buildroot/package/rtl8723bs/rtl8723bs.mk
@@ -6,7 +6,7 @@
 
 RTL8723BS_VERSION = 11ab92d8ccd71c80f0102828366b14ef6b676fb2
 RTL8723BS_SITE = $(call github,hadess,rtl8723bs,$(RTL8723BS_VERSION))
-RTL8723BS_LICENSE = GPLv2, proprietary (*.bin firmware blobs)
+RTL8723BS_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs)
 
 RTL8723BS_MODULE_MAKE_OPTS = \
 	CONFIG_RTL8723BS=m \
diff --git a/bsp/buildroot/package/rtl8723bu/Config.in b/bsp/buildroot/package/rtl8723bu/Config.in
new file mode 100644
index 00000000..266a794a
--- /dev/null
+++ b/bsp/buildroot/package/rtl8723bu/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_RTL8723BU
+	bool "rtl8723bu"
+	depends on BR2_LINUX_KERNEL
+	help
+	  rtl8723bu wifi driver
+
+	  https://github.com/lwfinger/rtl8723bu
+
+comment "rtl8723bu needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/rtl8723bu/rtl8723bu.hash b/bsp/buildroot/package/rtl8723bu/rtl8723bu.hash
new file mode 100644
index 00000000..ef4eddaa
--- /dev/null
+++ b/bsp/buildroot/package/rtl8723bu/rtl8723bu.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 da04cffc306d9738abdc67d234b8948db6ca97ed77760c68d99d18817839a513 rtl8723bu-b922079a090dcaad58179d478442ff97f18521c9.tar.gz
diff --git a/bsp/buildroot/package/rtl8723bu/rtl8723bu.mk b/bsp/buildroot/package/rtl8723bu/rtl8723bu.mk
new file mode 100644
index 00000000..942b13bb
--- /dev/null
+++ b/bsp/buildroot/package/rtl8723bu/rtl8723bu.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# rtl8723bu
+#
+################################################################################
+
+RTL8723BU_VERSION = b922079a090dcaad58179d478442ff97f18521c9
+RTL8723BU_SITE = $(call github,lwfinger,rtl8723bu,$(RTL8723BU_VERSION))
+RTL8723BU_LICENSE = GPL-2.0, proprietary (*.bin firmware blobs)
+
+RTL8723BU_MODULE_MAKE_OPTS = \
+	KVER=$(LINUX_VERSION_PROBED) \
+	KSRC=$(LINUX_DIR)
+
+define RTL8723BU_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 644 $(@D)/rtl8723b_fw.bin $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8723b_fw.bin
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/rtl8821au/rtl8821au.hash b/bsp/buildroot/package/rtl8821au/rtl8821au.hash
index 01f22cc0..f35d5791 100644
--- a/bsp/buildroot/package/rtl8821au/rtl8821au.hash
+++ b/bsp/buildroot/package/rtl8821au/rtl8821au.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 6e4334b0718b2ac611bf8b4d7a493b016bdb1c24daa7b459f091b92b6fd961c7  rtl8821au-c33ddb05a77741d2a9c9b974ad0cf0fa26d17b6e.tar.gz
+sha256 23889fe4bf518dbadcbfac613f64a74bbce177267d9337a98843e4e7de8f1896  rtl8821au-b018b446fb0729fa659e7eead475d6c13f192642.tar.gz
diff --git a/bsp/buildroot/package/rtl8821au/rtl8821au.mk b/bsp/buildroot/package/rtl8821au/rtl8821au.mk
index 36454dc7..b6ad431b 100644
--- a/bsp/buildroot/package/rtl8821au/rtl8821au.mk
+++ b/bsp/buildroot/package/rtl8821au/rtl8821au.mk
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-RTL8821AU_VERSION = c33ddb05a77741d2a9c9b974ad0cf0fa26d17b6e
+RTL8821AU_VERSION = b018b446fb0729fa659e7eead475d6c13f192642
 RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION))
-RTL8821AU_LICENSE = GPLv2
+RTL8821AU_LICENSE = GPL-2.0
 RTL8821AU_LICENSE_FILES = LICENSE
 
 RTL8821AU_MODULE_MAKE_OPTS = \
 	CONFIG_RTL8812AU_8821AU=m \
 	KVER=$(LINUX_VERSION_PROBED) \
-	USER_EXTRA_CFLAGS=-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN
+	USER_EXTRA_CFLAGS="-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \
+		-Wno-error"
 
 $(eval $(kernel-module))
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/rtmpdump/rtmpdump.mk b/bsp/buildroot/package/rtmpdump/rtmpdump.mk
index eb2d8107..f5d430ce 100644
--- a/bsp/buildroot/package/rtmpdump/rtmpdump.mk
+++ b/bsp/buildroot/package/rtmpdump/rtmpdump.mk
@@ -7,9 +7,9 @@
 RTMPDUMP_VERSION = fa8646daeb19dfd12c181f7d19de708d623704c0
 RTMPDUMP_SITE = git://git.ffmpeg.org/rtmpdump
 RTMPDUMP_INSTALL_STAGING = YES
-# Note that rtmpdump is GPLv2 but librtmp has its own license and since we only
-# care about librtmp, it's LGPLv2.1+
-RTMPDUMP_LICENSE = LGPLv2.1+
+# Note that rtmpdump is GPL-2.0 but librtmp has its own license and since we only
+# care about librtmp, it's LGPL-2.1+
+RTMPDUMP_LICENSE = LGPL-2.1+
 RTMPDUMP_LICENSE_FILES = librtmp/COPYING
 RTMPDUMP_DEPENDENCIES = zlib
 
diff --git a/bsp/buildroot/package/rtorrent/rtorrent.mk b/bsp/buildroot/package/rtorrent/rtorrent.mk
index edde02ee..51dc9eec 100644
--- a/bsp/buildroot/package/rtorrent/rtorrent.mk
+++ b/bsp/buildroot/package/rtorrent/rtorrent.mk
@@ -8,7 +8,7 @@ RTORRENT_VERSION = 0.9.6
 RTORRENT_SITE = http://rtorrent.net/downloads
 RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses
 RTORRENT_AUTORECONF = YES
-RTORRENT_LICENSE = GPLv2
+RTORRENT_LICENSE = GPL-2.0
 RTORRENT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/ruby/ruby.hash b/bsp/buildroot/package/ruby/ruby.hash
index d066186d..dd4cfc20 100644
--- a/bsp/buildroot/package/ruby/ruby.hash
+++ b/bsp/buildroot/package/ruby/ruby.hash
@@ -1,5 +1,5 @@
-# From https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/
-sha256 748a8980d30141bd1a4124e11745bb105b436fb1890826e0d2b9ea31af27f735  ruby-2.4.2.tar.xz
+# From https://www.ruby-lang.org/en/news/2018/03/28/ruby-2-4-4-released/
+sha256 1d0034071d675193ca769f64c91827e5f54cb3a7962316a41d5217c7bc6949f0  ruby-2.4.4.tar.xz
 # License files, Locally calculated
 sha256 5cda9584acd5e1096276a375085b7e659fa67a072fd69ec2c3931e54f7f563bb  LEGAL
 sha256 f5eb1b2956d5f7a67b2e5722a3749bc2fe86f9c580f2e3f5a08519cf073b5864  COPYING
diff --git a/bsp/buildroot/package/ruby/ruby.mk b/bsp/buildroot/package/ruby/ruby.mk
index dd3b1d24..93c3170c 100644
--- a/bsp/buildroot/package/ruby/ruby.mk
+++ b/bsp/buildroot/package/ruby/ruby.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 RUBY_VERSION_MAJOR = 2.4
-RUBY_VERSION = $(RUBY_VERSION_MAJOR).2
+RUBY_VERSION = $(RUBY_VERSION_MAJOR).4
 RUBY_VERSION_EXT = 2.4.0
 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR)
 RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz
@@ -17,7 +17,7 @@ HOST_RUBY_CONF_OPTS = \
 	--disable-install-doc \
 	--with-out-ext=curses,openssl,readline \
 	--without-gmp
-RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others
+RUBY_LICENSE = Ruby or BSD-2-Clause, BSD-3-Clause, others
 RUBY_LICENSE_FILES = LEGAL COPYING BSDL
 
 RUBY_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/runc/runc.hash b/bsp/buildroot/package/runc/runc.hash
index 0b6a24ff..3e188c5c 100644
--- a/bsp/buildroot/package/runc/runc.hash
+++ b/bsp/buildroot/package/runc/runc.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 374822cc2895ed3899b7a3a03b566413ea782fccec1307231f27894e9c6d5bea  runc-50a19c6ff828c58e5dab13830bd3dacde268afe5.tar.gz
+sha256	b5c50d7d9a5f610d5424f96196efa306ec708fd9299302dd919545099c16b7c1	runc-9c2d8d184e5da67c95d601382adf14862e4f2228.tar.gz
diff --git a/bsp/buildroot/package/runc/runc.mk b/bsp/buildroot/package/runc/runc.mk
index 95afcaaf..fb3fec20 100644
--- a/bsp/buildroot/package/runc/runc.mk
+++ b/bsp/buildroot/package/runc/runc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RUNC_VERSION = 50a19c6ff828c58e5dab13830bd3dacde268afe5
+RUNC_VERSION = 9c2d8d184e5da67c95d601382adf14862e4f2228
 RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
 RUNC_LICENSE = Apache-2.0
 RUNC_LICENSE_FILES = LICENSE
@@ -38,7 +38,7 @@ define RUNC_CONFIGURE_CMDS
 endef
 
 define RUNC_BUILD_CMDS
-	cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/usr/bin/go \
+	cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
 		build -v -o $(@D)/bin/runc \
 		-tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" .
 endef
diff --git a/bsp/buildroot/package/rust-bin/rust-bin.hash b/bsp/buildroot/package/rust-bin/rust-bin.hash
new file mode 100644
index 00000000..5b34a6aa
--- /dev/null
+++ b/bsp/buildroot/package/rust-bin/rust-bin.hash
@@ -0,0 +1,33 @@
+# From https://static.rust-lang.org/dist/rustc-1.23.0-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 243de2826b2d545b8428414a3f7e86ce5e86163ec927a374958052a047b55e69  rustc-1.23.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rustc-1.23.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 d72674a683dcc8a07ad72d6ae08b96a7dfc72cf08433e2ae69c0f8a2b9c79c17  rustc-1.23.0-x86_64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-aarch64-unknown-linux-gnu.tar.xz.sha256
+sha256 0d9c976c46a277ef860ce5766387ea8e40f84657e5f9962cba91be62a00ca345  rust-std-1.23.0-aarch64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-arm-unknown-linux-gnueabi.tar.xz.sha256
+sha256 3d7ce58f6d2bbf6faf91049893e96611a172b0af02d98190e36a49e8b0f974ee  rust-std-1.23.0-arm-unknown-linux-gnueabi.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-arm-unknown-linux-gnueabihf.tar.xz.sha256
+sha256 0a2a43668c2ddc2516e85e1c097d2672acaf61541d2b70f40daba548b3ccbee1  rust-std-1.23.0-arm-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256
+sha256 b2f7f4e2e31d86302e929d0435b6f40778c22fc9306f0850b0edc4738ff2634e  rust-std-1.23.0-armv7-unknown-linux-gnueabihf.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-i686-unknown-linux-gnu.tar.xz.sha256
+sha256 f9659f844ccd2e25e9f01a49fb7adf0ce26cbbec7a4df7081dd2d0929a86b2d3  rust-std-1.23.0-i686-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-mips-unknown-linux-gnu.tar.xz.sha256
+sha256 8324d9c1eacba0de31fff29841d0f0567261489ee46a270e30be929095bfe19a  rust-std-1.23.0-mips-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256
+sha256 521f70f3346ff8e28e33350fd5ad9bbba7dfc9038389f3965bcfa2f1d1a498a5  rust-std-1.23.0-mips64-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256
+sha256 d08f5792bd0d4f5d3d81a4ec1b3a2b36e7c389de2ecf2e777e390461ff015d08  rust-std-1.23.0-mips64el-unknown-linux-gnuabi64.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-mipsel-unknown-linux-gnu.tar.xz.sha256
+sha256 77291fff357b9e1764a4d7975bdbecdb37aeb0d37d85ccb68f7d785f4da1a056  rust-std-1.23.0-mipsel-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-powerpc-unknown-linux-gnu.tar.xz.sha256
+sha256 d1b862d32c4921058ff4ea5b7fead3b2954b5f0f036603b1c58a600e602d1f25  rust-std-1.23.0-powerpc-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-powerpc64-unknown-linux-gnu.tar.xz.sha256
+sha256 e03bf7907914c88d2f19e719f07641b1b1ffbb65cf9daae8b028f4ab4619b4ff  rust-std-1.23.0-powerpc64-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256
+sha256 674f74245341119409e203109c22d432d0ed3312a6ff4d3b03cab251e61cc53a  rust-std-1.23.0-powerpc64le-unknown-linux-gnu.tar.xz
+# From https://static.rust-lang.org/dist/rust-std-1.23.0-x86_64-unknown-linux-gnu.tar.xz.sha256
+sha256 0d87225dd081c7ea5002fdeb21983d23bc52fa37d23c88d5c97b2c44660f8af9  rust-std-1.23.0-x86_64-unknown-linux-gnu.tar.xz
+# Locally generated
+sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
+sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
diff --git a/bsp/buildroot/package/rust-bin/rust-bin.mk b/bsp/buildroot/package/rust-bin/rust-bin.mk
new file mode 100644
index 00000000..cd5844b1
--- /dev/null
+++ b/bsp/buildroot/package/rust-bin/rust-bin.mk
@@ -0,0 +1,61 @@
+################################################################################
+#
+# rust-bin
+#
+################################################################################
+
+RUST_BIN_VERSION = 1.23.0
+RUST_BIN_SITE = https://static.rust-lang.org/dist
+RUST_BIN_LICENSE = Apache-2.0 or MIT
+RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+
+HOST_RUST_BIN_PROVIDES = host-rustc
+
+HOST_RUST_BIN_SOURCE = rustc-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz
+
+HOST_RUST_BIN_EXTRA_DOWNLOADS = \
+	rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME).tar.xz \
+	rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME).tar.xz
+
+HOST_RUST_BIN_LIBSTD_HOST_PREFIX = rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME)/rust-std-$(RUSTC_HOST_NAME)
+
+define HOST_RUST_BIN_LIBSTD_EXTRACT
+	mkdir -p $(@D)/std
+	$(foreach f,$(HOST_RUST_BIN_EXTRA_DOWNLOADS), \
+		$(call suitable-extractor,$(f)) $(DL_DIR)/$(f) | \
+			$(TAR) -C $(@D)/std $(TAR_OPTIONS) -
+	)
+	cd $(@D)/rustc/lib/rustlib; \
+		ln -sf ../../../std/$(HOST_RUST_BIN_LIBSTD_HOST_PREFIX)/lib/rustlib/$(RUSTC_HOST_NAME)
+endef
+
+HOST_RUST_BIN_POST_EXTRACT_HOOKS += HOST_RUST_BIN_LIBSTD_EXTRACT
+
+HOST_RUST_BIN_INSTALL_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--disable-ldconfig
+
+ifeq ($(BR2_PACKAGE_HOST_RUST_BIN),y)
+define HOST_RUST_BIN_INSTALL_RUSTC
+	(cd $(@D); \
+		./install.sh $(HOST_RUST_BIN_INSTALL_OPTS))
+endef
+
+define HOST_RUST_BIN_INSTALL_LIBSTD_HOST
+	(cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_HOST_NAME); \
+		./install.sh $(HOST_RUST_BIN_INSTALL_OPTS))
+endef
+
+define HOST_RUST_BIN_INSTALL_LIBSTD_TARGET
+	(cd $(@D)/std/rust-std-$(RUST_BIN_VERSION)-$(RUSTC_TARGET_NAME); \
+		./install.sh $(HOST_RUST_BIN_INSTALL_OPTS))
+endef
+endif
+
+define HOST_RUST_BIN_INSTALL_CMDS
+	$(HOST_RUST_BIN_INSTALL_RUSTC)
+	$(HOST_RUST_BIN_INSTALL_LIBSTD_HOST)
+	$(HOST_RUST_BIN_INSTALL_LIBSTD_TARGET)
+endef
+
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/rust/rust.hash b/bsp/buildroot/package/rust/rust.hash
new file mode 100644
index 00000000..d6731b6d
--- /dev/null
+++ b/bsp/buildroot/package/rust/rust.hash
@@ -0,0 +1,5 @@
+# From https://static.rust-lang.org/dist/rustc-1.23.0-src.tar.xz.sha256
+sha256 7196032371b50dd5582465b3bfa79ffd783b74f0711420d99b61b26c96fb3d80  rustc-1.23.0-src.tar.xz
+# Locally generated
+sha256 a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2  LICENSE-APACHE
+sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3  LICENSE-MIT
diff --git a/bsp/buildroot/package/rust/rust.mk b/bsp/buildroot/package/rust/rust.mk
new file mode 100644
index 00000000..ff2634b9
--- /dev/null
+++ b/bsp/buildroot/package/rust/rust.mk
@@ -0,0 +1,79 @@
+################################################################################
+#
+# rust
+#
+################################################################################
+
+RUST_VERSION = 1.23.0
+RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz
+RUST_SITE = https://static.rust-lang.org/dist
+RUST_LICENSE = Apache-2.0 or MIT
+RUST_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT
+
+HOST_RUST_PROVIDES = host-rustc
+
+HOST_RUST_DEPENDENCIES = \
+	toolchain \
+	host-rust-bin \
+	host-cargo-bin \
+	host-python \
+	$(BR2_CMAKE_HOST_DEPENDENCY)
+
+ifeq ($(BR2_PACKAGE_JEMALLOC),y)
+HOST_RUST_DEPENDENCIES += jemalloc
+HOST_RUST_JEMALLOC_ENABLED = true
+HOST_RUST_JEMALLOC_CONF = 'jemalloc = "$(STAGING_DIR)/usr/lib/libjemalloc_pic.a"'
+else
+HOST_RUST_JEMALLOC_ENABLED = false
+endif
+
+HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0)
+
+# Some vendor crates contain Cargo.toml.orig files. The associated
+# .cargo-checksum.json file will contain a checksum for Cargo.toml.orig but
+# support/scripts/apply-patches.sh will delete them. This will cause the build
+# to fail, as Cargo will not be able to find the file and verify the checksum.
+# So, remove all Cargo.toml.orig entries from the affected .cargo-checksum.json
+# files
+define HOST_RUST_EXCLUDE_ORIG_FILES
+	for file in $$(find $(@D) -name '*.orig'); do \
+		crate=$$(dirname $${file}); \
+		fn=$${crate}/.cargo-checksum.json; \
+		sed -i -e 's/"Cargo.toml.orig":"[a-z0-9]\+",//g' $${fn}; \
+	done
+endef
+
+HOST_RUST_POST_EXTRACT_HOOKS += HOST_RUST_EXCLUDE_ORIG_FILES
+
+define HOST_RUST_CONFIGURE_CMDS
+	( \
+		echo '[build]'; \
+		echo 'target = ["$(RUSTC_TARGET_NAME)"]'; \
+		echo 'cargo = "$(HOST_CARGO_BIN_DIR)/cargo/bin/cargo"'; \
+		echo 'rustc = "$(HOST_RUST_BIN_DIR)/rustc/bin/rustc"'; \
+		echo 'python = "$(HOST_DIR)/bin/python2"'; \
+		echo 'submodules = false'; \
+		echo 'vendor = true'; \
+		echo 'compiler-docs = false'; \
+		echo 'docs = false'; \
+		echo 'verbose = $(HOST_RUST_VERBOSITY)'; \
+		echo '[install]'; \
+		echo 'prefix = "$(HOST_DIR)"'; \
+		echo '[rust]'; \
+		echo 'use-jemalloc = $(HOST_RUST_JEMALLOC_ENABLED)'; \
+		echo '[target.$(RUSTC_TARGET_NAME)]'; \
+		echo 'cc = "$(TARGET_CROSS)gcc"'; \
+		echo $(HOST_RUST_JEMALLOC_CONF); \
+	) > $(@D)/config.toml
+endef
+
+define HOST_RUST_BUILD_CMDS
+	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py build
+endef
+
+define HOST_RUST_INSTALL_CMDS
+	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py dist
+	cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python2 x.py install
+endef
+
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/rustc/Config.in.host b/bsp/buildroot/package/rustc/Config.in.host
new file mode 100644
index 00000000..1c79eede
--- /dev/null
+++ b/bsp/buildroot/package/rustc/Config.in.host
@@ -0,0 +1,79 @@
+config BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+	bool
+	# The pre-built Rust standard library is only available for the
+	# following architectures/ABIs, and is built against glibc.
+	default y if BR2_i386
+	default y if BR2_x86_64
+	default y if BR2_aarch64
+	default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 \
+	        && !(BR2_ARM_CPU_ARMV7A && BR2_ARM_EABI)
+	default y if BR2_powerpc || BR2_powerpc64
+	default y if (BR2_mips || BR2_mipsel) && !BR2_MIPS_CPU_MIPS32R6
+	default y if (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_CPU_MIPS64R6 \
+		&& BR2_MIPS_NABI64
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
+
+config BR2_PACKAGE_HOST_RUSTC_ARCH
+	string
+	default "armv7"  if BR2_ARM_CPU_ARMV7A
+	default BR2_ARCH if !BR2_ARM_CPU_ARMV7A
+
+config BR2_PACKAGE_HOST_RUSTC_ABI
+	string
+	default "eabi"   if BR2_ARM_EABI
+	default "eabihf" if BR2_ARM_EABIHF
+	default "abi64"  if BR2_MIPS_NABI64
+
+config BR2_PACKAGE_HOST_RUSTC
+	bool "host rustc"
+	depends on BR2_PACKAGE_HOST_RUSTC_ARCH_SUPPORTS
+	help
+	  Compiler for the Rust language
+
+	  http://www.rust-lang.org
+
+if BR2_PACKAGE_HOST_RUSTC
+
+choice
+	prompt "Rust compiler variant"
+	default BR2_PACKAGE_HOST_RUST_BIN
+	help
+	  Select a Rust compiler
+
+config BR2_PACKAGE_HOST_RUST
+	bool "host rust"
+	depends on BR2_HOST_GCC_AT_LEAST_4_7 # required by LLVM
+	# triggers ICE on trunc_int_for_mode, at explow.c:56
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_aarch64
+	select BR2_PACKAGE_HAS_HOST_RUSTC
+	help
+	  This package will build the compiler for the host as well as
+	  two flavors of the standard library: one for the host, another
+	  for the target. Both are installed in the host directory.
+
+comment "host-rust needs a toolchain w/ gcc >= 5"
+	depends on BR2_aarch64
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5
+
+comment "host-rust needs host gcc >= 4.7"
+	depends on !BR2_HOST_GCC_AT_LEAST_4_7
+
+config BR2_PACKAGE_HOST_RUST_BIN
+	bool "host rust (pre-built)"
+	select BR2_PACKAGE_HAS_HOST_RUSTC
+	help
+	  This package will install pre-built versions of the compiler
+	  for the host and the Rust standard library for the target.
+
+endchoice
+
+config BR2_PACKAGE_HAS_HOST_RUSTC
+	bool
+
+config BR2_PACKAGE_PROVIDES_HOST_RUSTC
+	string
+	default "host-rust" if BR2_PACKAGE_HOST_RUST
+	default "host-rust-bin" if BR2_PACKAGE_HOST_RUST_BIN
+
+endif
diff --git a/bsp/buildroot/package/rustc/rustc.mk b/bsp/buildroot/package/rustc/rustc.mk
new file mode 100644
index 00000000..bed74f3c
--- /dev/null
+++ b/bsp/buildroot/package/rustc/rustc.mk
@@ -0,0 +1,20 @@
+################################################################################
+#
+# rustc
+#
+################################################################################
+
+RUSTC_ARCH = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ARCH))
+RUSTC_ABI = $(call qstrip,$(BR2_PACKAGE_HOST_RUSTC_ABI))
+
+RUSTC_TARGET_NAME = $(RUSTC_ARCH)-unknown-linux-gnu$(RUSTC_ABI)
+
+ifeq ($(HOSTARCH),x86)
+RUSTC_HOST_ARCH = i686
+else
+RUSTC_HOST_ARCH = $(HOSTARCH)
+endif
+
+RUSTC_HOST_NAME = $(RUSTC_HOST_ARCH)-unknown-linux-gnu
+
+$(eval $(host-virtual-package))
diff --git a/bsp/buildroot/package/rygel/0001-Allow-UI-build-without-gstreamer-video.patch b/bsp/buildroot/package/rygel/0001-Allow-UI-build-without-gstreamer-video.patch
new file mode 100644
index 00000000..6e1f5287
--- /dev/null
+++ b/bsp/buildroot/package/rygel/0001-Allow-UI-build-without-gstreamer-video.patch
@@ -0,0 +1,37 @@
+From f3a49ad1a4ba172e97bd860bc067f7e9ebe69509 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Mon, 8 Jan 2018 13:27:42 +0100
+Subject: [PATCH] Allow UI build without gstreamer-video
+
+If EXAMPLE_UI dependencies are not met, only display a warning.
+Indeed, currently, we can't build rygel UI without gstreamer-video which
+is only a dependency of fullscreen-renderer application.
+
+fullscreen-renderer won't be build without gstreamer as HAVE_GSTREAMER
+has to be true to check HAVE_UI in examples/Makefile.am
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 00b94da..d140a27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -359,7 +359,11 @@ if test x$try_ui = xyes ; then
+                           [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED
+                            gssdp-1.0 >= $GSSDP_REQUIRED
+                            gstreamer-video-1.0 >= $GSTREAMER_REQUIRED
+-                           gtk+-3.0 >= $GTK_REQUIRED])
++                           gtk+-3.0 >= $GTK_REQUIRED],,
++                          [
++                           AC_MSG_WARN([Example UI dependencies not found.])
++                           AC_MSG_WARN([Example UI applications will not be built.])
++                          ])
+       ],
+       [
+         AC_MSG_WARN([UI dependencies not found.])
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/rygel/Config.in b/bsp/buildroot/package/rygel/Config.in
new file mode 100644
index 00000000..86d6a38e
--- /dev/null
+++ b/bsp/buildroot/package/rygel/Config.in
@@ -0,0 +1,51 @@
+config BR2_PACKAGE_RYGEL
+	bool "rygel"
+	depends on BR2_USE_WCHAR # gupnp-av
+	depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av
+	depends on BR2_USE_MMU # gupnp-av
+	select BR2_PACKAGE_GUPNP_AV
+	select BR2_PACKAGE_LIBGEE
+	select BR2_PACKAGE_LIBMEDIAART
+	select BR2_PACKAGE_SQLITE
+	help
+	  Rygel is a home media solution (UPnP AV MediaServer) that
+	  allows you to easily share audio, video and pictures to other
+	  devices.
+
+	  Additionally, media player software may use Rygel to become a
+	  MediaRenderer that may be controlled remotely by a UPnP or
+	  DLNA Controller.
+
+	  Rygel achieves interoperability with other devices in the
+	  market by trying to conform to the very strict requirements of
+	  DLNA and by converting media on-the-fly to formats that client
+	  devices can handle.
+
+	  Most Rygel functionality is implemented through a plug-in
+	  mechanism.
+
+	  https://wiki.gnome.org/Projects/Rygel
+
+if BR2_PACKAGE_RYGEL
+
+choice
+	prompt "media engine"
+	default BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE
+
+config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE
+	bool "simple"
+
+config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1
+	bool "gstreamer1"
+	select BR2_PACKAGE_GDK_PIXBUF
+	select BR2_PACKAGE_GUPNP_DLNA
+	select BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BASE
+
+endchoice
+
+comment "rygel needs a toolchain w/ wchar, threads"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+
+endif # BR2_PACKAGE_RYGEL
diff --git a/bsp/buildroot/package/rygel/S99rygel b/bsp/buildroot/package/rygel/S99rygel
new file mode 100644
index 00000000..ee832e9b
--- /dev/null
+++ b/bsp/buildroot/package/rygel/S99rygel
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+NAME=rygel
+PIDFILE=/var/run/$NAME.pid
+DAEMON=/usr/bin/$NAME
+
+start() {
+	printf "Starting $NAME: "
+	start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+stop() {
+	printf "Stopping $NAME: "
+	start-stop-daemon -K -q -p $PIDFILE
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	restart
+	;;
+  *)
+	echo "Usage: $0 {start|stop|restart|reload}"
+	exit 1
+esac
+
+exit $?
diff --git a/bsp/buildroot/package/rygel/rygel.hash b/bsp/buildroot/package/rygel/rygel.hash
new file mode 100644
index 00000000..028af21b
--- /dev/null
+++ b/bsp/buildroot/package/rygel/rygel.hash
@@ -0,0 +1,6 @@
+# Hash from: http://ftp.gnome.org/pub/gnome/sources/rygel/0.36/rygel-0.36.0.sha256sum:
+sha256	31e8ade78b4ea59978d1b59056fa5cd8aef6b9c1457d3dd06de4d2e75a01813f	rygel-0.36.0.tar.xz
+
+# Locally calculated
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING
+sha256	c7d881be8ae01162510e982a32001446c6d6d18a9cecc89cc41a28bd215a0262	COPYING.logo
diff --git a/bsp/buildroot/package/rygel/rygel.mk b/bsp/buildroot/package/rygel/rygel.mk
new file mode 100644
index 00000000..cd8897ce
--- /dev/null
+++ b/bsp/buildroot/package/rygel/rygel.mk
@@ -0,0 +1,74 @@
+################################################################################
+#
+# rygel
+#
+################################################################################
+
+RYGEL_VERSION_MAJOR = 0.36
+RYGEL_VERSION = $(RYGEL_VERSION_MAJOR).0
+RYGEL_SOURCE = rygel-$(RYGEL_VERSION).tar.xz
+RYGEL_SITE = http://ftp.gnome.org/pub/gnome/sources/rygel/$(RYGEL_VERSION_MAJOR)
+RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo)
+RYGEL_LICENSE_FILES = COPYING COPYING.logo
+RYGEL_DEPENDENCIES = \
+	gupnp-av \
+	libgee \
+	libmediaart \
+	sqlite
+RYGEL_INSTALL_STAGING = YES
+# We're patching configure.ac
+RYGEL_AUTORECONF = YES
+
+RYGEL_CONF_OPTS += \
+	--disable-apidocs \
+	--disable-coverage \
+	--disable-example-plugins \
+	--enable-external-plugin \
+	--enable-lms-plugin \
+	--enable-mpris-plugin \
+	--enable-ruih-plugin \
+	--disable-tracker-plugin
+
+ifeq ($(BR2_PACKAGE_GDK_PIXBUF),y)
+RYGEL_DEPENDENCIES += gdk-pixbuf
+endif
+
+ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y)
+RYGEL_CONF_OPTS += \
+	--with-media-engine=gstreamer \
+	--enable-playbin-plugin \
+	--enable-media_export-plugin \
+	--enable-gst-launch-plugin
+RYGEL_DEPENDENCIES += \
+	gupnp-dlna \
+	gst1-plugins-base \
+	gstreamer1
+else ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE),y)
+RYGEL_CONF_OPTS += \
+	--with-media-engine=simple \
+	--disable-playbin-plugin \
+	--disable-media_export-plugin \
+	--disable-gst-launch-plugin
+endif
+
+ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
+RYGEL_CONF_OPTS += --with-ui
+RYGEL_DEPENDENCIES += libgtk3
+else
+RYGEL_CONF_OPTS += --without-ui
+endif
+
+define RYGEL_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 package/rygel/S99rygel \
+		$(TARGET_DIR)/etc/init.d/S99rygel
+endef
+
+define RYGEL_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/rygel/rygel.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/rygel.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/rygel.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rygel.service
+endef
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/rygel/rygel.service b/bsp/buildroot/package/rygel/rygel.service
new file mode 100644
index 00000000..6ae8ee72
--- /dev/null
+++ b/bsp/buildroot/package/rygel/rygel.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Rygel DLNA server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/rygel
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bsp/buildroot/package/s6-dns/Config.in b/bsp/buildroot/package/s6-dns/Config.in
new file mode 100644
index 00000000..e982fdad
--- /dev/null
+++ b/bsp/buildroot/package/s6-dns/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_S6_DNS
+	bool "s6-dns"
+	depends on BR2_USE_MMU # skalibs
+	select BR2_PACKAGE_SKALIBS
+	help
+	  s6-dns is a suite of DNS client programs and libraries for
+	  Unix systems, as an alternative to the BIND, djbdns or other
+	  DNS clients.
+
+	  http://skarnet.org/software/s6-dns/
diff --git a/bsp/buildroot/package/s6-dns/s6-dns.hash b/bsp/buildroot/package/s6-dns/s6-dns.hash
new file mode 100644
index 00000000..483d4f0e
--- /dev/null
+++ b/bsp/buildroot/package/s6-dns/s6-dns.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 a828583e48741927c88de3822283c317c792ffc15d5e9043f29625b87ba38740  s6-dns-2.3.0.0.tar.gz
+sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f  COPYING
diff --git a/bsp/buildroot/package/s6-dns/s6-dns.mk b/bsp/buildroot/package/s6-dns/s6-dns.mk
new file mode 100644
index 00000000..42639aa9
--- /dev/null
+++ b/bsp/buildroot/package/s6-dns/s6-dns.mk
@@ -0,0 +1,45 @@
+################################################################################
+#
+# s6-dns
+#
+################################################################################
+
+S6_DNS_VERSION = 2.3.0.0
+S6_DNS_SITE = http://skarnet.org/software/s6-dns
+S6_DNS_LICENSE = ISC
+S6_DNS_LICENSE_FILES = COPYING
+S6_DNS_INSTALL_STAGING = YES
+S6_DNS_DEPENDENCIES = skalibs
+
+S6_DNS_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define S6_DNS_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_DNS_CONF_OPTS))
+endef
+
+define S6_DNS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_DNS_REMOVE_STATIC_LIB_DIR
+	rm -rf $(TARGET_DIR)/usr/lib/s6-dns
+endef
+
+S6_DNS_POST_INSTALL_TARGET_HOOKS += S6_DNS_REMOVE_STATIC_LIB_DIR
+
+define S6_DNS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define S6_DNS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/s6-linux-init/Config.in b/bsp/buildroot/package/s6-linux-init/Config.in
new file mode 100644
index 00000000..b56b861f
--- /dev/null
+++ b/bsp/buildroot/package/s6-linux-init/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_S6_LINUX_INIT
+	bool "s6-linux-init"
+	depends on BR2_USE_MMU # s6
+	select BR2_PACKAGE_S6
+	select BR2_PACKAGE_S6_LINUX_UTILS
+	select BR2_PACKAGE_S6_PORTABLE_UTILS
+	help
+	  s6-linux-init is a set of minimalistic tools to create a
+	  s6-based init system, including a /sbin/init binary, on a
+	  Linux kernel.
+
+	  http://skarnet.org/software/s6-linux-init/
diff --git a/bsp/buildroot/package/s6-linux-init/s6-linux-init.hash b/bsp/buildroot/package/s6-linux-init/s6-linux-init.hash
new file mode 100644
index 00000000..03aeaf3a
--- /dev/null
+++ b/bsp/buildroot/package/s6-linux-init/s6-linux-init.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 9ee2e8a5abc250bcb2be7d07566592ba5cbe3abce858f60853d3ac45b1ccdd79  s6-linux-init-0.3.1.1.tar.gz
+sha256 43cdbc05eceb0781d71a0661bbb6b9335efc4b733fbd02847c0c6667fd440993  COPYING
diff --git a/bsp/buildroot/package/s6-linux-init/s6-linux-init.mk b/bsp/buildroot/package/s6-linux-init/s6-linux-init.mk
new file mode 100644
index 00000000..c5dee028
--- /dev/null
+++ b/bsp/buildroot/package/s6-linux-init/s6-linux-init.mk
@@ -0,0 +1,36 @@
+################################################################################
+#
+# s6-linux-init
+#
+################################################################################
+
+S6_LINUX_INIT_VERSION = 0.3.1.1
+S6_LINUX_INIT_SITE = http://skarnet.org/software/s6-linux-init
+S6_LINUX_INIT_LICENSE = ISC
+S6_LINUX_INIT_LICENSE_FILES = COPYING
+S6_LINUX_INIT_DEPENDENCIES = s6 s6-linux-utils s6-portable-utils
+
+S6_LINUX_INIT_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/execline \
+	--with-lib=$(STAGING_DIR)/usr/lib/s6 \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define S6_LINUX_INIT_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_LINUX_INIT_CONF_OPTS))
+endef
+
+define S6_LINUX_INIT_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_LINUX_INIT_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/s6-linux-utils/Config.in b/bsp/buildroot/package/s6-linux-utils/Config.in
new file mode 100644
index 00000000..43e6bb91
--- /dev/null
+++ b/bsp/buildroot/package/s6-linux-utils/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_S6_LINUX_UTILS
+	bool "s6-linux-utils"
+	depends on BR2_USE_MMU # skalibs
+	select BR2_PACKAGE_SKALIBS
+	help
+	  s6-linux-utils is a set of minimalistic Linux-specific
+	  system utilities.
+
+	  http://skarnet.org/software/s6-linux-utils/
diff --git a/bsp/buildroot/package/s6-linux-utils/s6-linux-utils.hash b/bsp/buildroot/package/s6-linux-utils/s6-linux-utils.hash
new file mode 100644
index 00000000..34fc5ea9
--- /dev/null
+++ b/bsp/buildroot/package/s6-linux-utils/s6-linux-utils.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 9562ef293c916c4448d16fcbbc065eb28fd995ac34cd3538179cbc3ee056ab93  s6-linux-utils-2.4.0.1.tar.gz
+sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f  COPYING
diff --git a/bsp/buildroot/package/s6-linux-utils/s6-linux-utils.mk b/bsp/buildroot/package/s6-linux-utils/s6-linux-utils.mk
new file mode 100644
index 00000000..3f174570
--- /dev/null
+++ b/bsp/buildroot/package/s6-linux-utils/s6-linux-utils.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# s6-linux-utils
+#
+################################################################################
+
+S6_LINUX_UTILS_VERSION = 2.4.0.1
+S6_LINUX_UTILS_SITE = http://skarnet.org/software/s6-linux-utils
+S6_LINUX_UTILS_LICENSE = ISC
+S6_LINUX_UTILS_LICENSE_FILES = COPYING
+S6_LINUX_UTILS_DEPENDENCIES = skalibs
+
+S6_LINUX_UTILS_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define S6_LINUX_UTILS_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_LINUX_UTILS_CONF_OPTS))
+endef
+
+define S6_LINUX_UTILS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_LINUX_UTILS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/s6-networking/Config.in b/bsp/buildroot/package/s6-networking/Config.in
new file mode 100644
index 00000000..bdf58476
--- /dev/null
+++ b/bsp/buildroot/package/s6-networking/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_S6_NETWORKING
+	bool "s6-networking"
+	depends on BR2_USE_MMU # s6
+	select BR2_PACKAGE_S6_DNS
+	select BR2_PACKAGE_S6
+	help
+	  s6-networking is a suite of small networking utilities for
+	  Unix systems. It includes command-line client and server
+	  management, TCP access control, privilege escalation across
+	  UNIX domain sockets, IDENT protocol management and clock
+	  synchronization.
+
+	  http://skarnet.org/software/s6-networking/
diff --git a/bsp/buildroot/package/s6-networking/s6-networking.hash b/bsp/buildroot/package/s6-networking/s6-networking.hash
new file mode 100644
index 00000000..46f88e03
--- /dev/null
+++ b/bsp/buildroot/package/s6-networking/s6-networking.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 d81968756abbcecde6a872c89d82f643cd621a0c295c2c57650705dbe875481a  s6-networking-2.3.0.2.tar.gz
+sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f  COPYING
diff --git a/bsp/buildroot/package/s6-networking/s6-networking.mk b/bsp/buildroot/package/s6-networking/s6-networking.mk
new file mode 100644
index 00000000..7c9f0870
--- /dev/null
+++ b/bsp/buildroot/package/s6-networking/s6-networking.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# s6-networking
+#
+################################################################################
+
+S6_NETWORKING_VERSION = 2.3.0.2
+S6_NETWORKING_SITE = http://skarnet.org/software/s6-networking
+S6_NETWORKING_LICENSE = ISC
+S6_NETWORKING_LICENSE_FILES = COPYING
+S6_NETWORKING_INSTALL_STAGING = YES
+S6_NETWORKING_DEPENDENCIES = s6-dns s6
+
+S6_NETWORKING_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/execline \
+	--with-lib=$(STAGING_DIR)/usr/lib/s6 \
+	--with-lib=$(STAGING_DIR)/usr/lib/s6-dns \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+ifeq ($(BR2_PACKAGE_LIBRESSL),y)
+S6_NETWORKING_CONF_OPTS += --enable-ssl=libressl
+S6_NETWORKING_DEPENDENCIES = libressl
+endif
+
+define S6_NETWORKING_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_NETWORKING_CONF_OPTS))
+endef
+
+define S6_NETWORKING_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_NETWORKING_REMOVE_STATIC_LIB_DIR
+	rm -rf $(TARGET_DIR)/usr/lib/s6-networking
+endef
+
+S6_NETWORKING_POST_INSTALL_TARGET_HOOKS += S6_NETWORKING_REMOVE_STATIC_LIB_DIR
+
+define S6_NETWORKING_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define S6_NETWORKING_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/s6-portable-utils/Config.in b/bsp/buildroot/package/s6-portable-utils/Config.in
new file mode 100644
index 00000000..8521ecfa
--- /dev/null
+++ b/bsp/buildroot/package/s6-portable-utils/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_S6_PORTABLE_UTILS
+	bool "s6-portable-utils"
+	depends on BR2_USE_MMU # skalibs
+	select BR2_PACKAGE_SKALIBS
+	help
+	  s6-portable-utils is a set of tiny general Unix utilities,
+	  often performing well-known tasks such as cut and grep, but
+	  optimized for simplicity and small size. They were designed
+	  for embedded systems and other constrained environments, but
+	  they work everywhere.
+
+	  http://skarnet.org/software/s6-portable-utils/
diff --git a/bsp/buildroot/package/s6-portable-utils/s6-portable-utils.hash b/bsp/buildroot/package/s6-portable-utils/s6-portable-utils.hash
new file mode 100644
index 00000000..f27d0b8c
--- /dev/null
+++ b/bsp/buildroot/package/s6-portable-utils/s6-portable-utils.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 6ae239d2c458a81c92b5d616129e443874f925bf3da02589913a1a3b708c4531  s6-portable-utils-2.2.1.1.tar.gz
+sha256 6ee77e7199d69b707ab864ea7a838f9562717aaa41c89413bdb2cf835f95052f  COPYING
diff --git a/bsp/buildroot/package/s6-portable-utils/s6-portable-utils.mk b/bsp/buildroot/package/s6-portable-utils/s6-portable-utils.mk
new file mode 100644
index 00000000..a15bca1e
--- /dev/null
+++ b/bsp/buildroot/package/s6-portable-utils/s6-portable-utils.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# s6-portable-utils
+#
+################################################################################
+
+S6_PORTABLE_UTILS_VERSION = 2.2.1.1
+S6_PORTABLE_UTILS_SITE = http://skarnet.org/software/s6-portable-utils
+S6_PORTABLE_UTILS_LICENSE = ISC
+S6_PORTABLE_UTILS_LICENSE_FILES = COPYING
+S6_PORTABLE_UTILS_DEPENDENCIES = skalibs
+
+S6_PORTABLE_UTILS_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define S6_PORTABLE_UTILS_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_PORTABLE_UTILS_CONF_OPTS))
+endef
+
+define S6_PORTABLE_UTILS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_PORTABLE_UTILS_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/s6-rc/Config.in b/bsp/buildroot/package/s6-rc/Config.in
new file mode 100644
index 00000000..39a924ea
--- /dev/null
+++ b/bsp/buildroot/package/s6-rc/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_S6_RC
+	bool "s6-rc"
+	depends on BR2_USE_MMU # s6
+	select BR2_PACKAGE_S6
+	help
+	  s6-rc is a service manager for s6-based systems, i.e. a
+	  suite of programs that can start and stop services, both
+	  long-running daemons and one-time initialization scripts, in
+	  the proper order according to a dependency tree.
+
+	  http://skarnet.org/software/s6-rc/
diff --git a/bsp/buildroot/package/s6-rc/Config.in.host b/bsp/buildroot/package/s6-rc/Config.in.host
new file mode 100644
index 00000000..f250b9fb
--- /dev/null
+++ b/bsp/buildroot/package/s6-rc/Config.in.host
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_HOST_S6_RC
+	bool "host s6-rc"
+	depends on BR2_PACKAGE_S6_RC
+	help
+	  This package provides the host variant of the s6-rc tools,
+	  required to build the s6-rc service database offline.
+
+	  http://skarnet.org/software/s6-rc/
diff --git a/bsp/buildroot/package/s6-rc/s6-rc.hash b/bsp/buildroot/package/s6-rc/s6-rc.hash
new file mode 100644
index 00000000..76ab69df
--- /dev/null
+++ b/bsp/buildroot/package/s6-rc/s6-rc.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 96b8e7f275d42113b9ba7ef1d8856f64183b9421c39702f8332e6f5686496fba  s6-rc-0.4.0.0.tar.gz
+sha256 1377d3b18a31de11e8bb06f0f46888a23bc16cbc57285035793bf7e7943bbcb3  COPYING
diff --git a/bsp/buildroot/package/s6-rc/s6-rc.mk b/bsp/buildroot/package/s6-rc/s6-rc.mk
new file mode 100644
index 00000000..396adaea
--- /dev/null
+++ b/bsp/buildroot/package/s6-rc/s6-rc.mk
@@ -0,0 +1,73 @@
+################################################################################
+#
+# s6-rc
+#
+################################################################################
+
+S6_RC_VERSION = 0.4.0.0
+S6_RC_SITE = http://skarnet.org/software/s6-rc
+S6_RC_LICENSE = ISC
+S6_RC_LICENSE_FILES = COPYING
+S6_RC_INSTALL_STAGING = YES
+S6_RC_DEPENDENCIES = s6
+
+S6_RC_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/execline \
+	--with-lib=$(STAGING_DIR)/usr/lib/s6 \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define S6_RC_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_RC_CONF_OPTS))
+endef
+
+define S6_RC_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_RC_REMOVE_STATIC_LIB_DIR
+	rm -rf $(TARGET_DIR)/usr/lib/s6-rc
+endef
+
+S6_RC_POST_INSTALL_TARGET_HOOKS += S6_RC_REMOVE_STATIC_LIB_DIR
+
+define S6_RC_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define S6_RC_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+HOST_S6_RC_DEPENDENCIES = host-s6
+
+HOST_S6_RC_CONF_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--libexecdir=/usr/libexec \
+	--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
+	--with-include=$(HOST_DIR)/include \
+	--with-dynlib=$(HOST_DIR)/lib \
+	--disable-static \
+	--enable-shared \
+	--disable-allstatic
+
+define HOST_S6_RC_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_S6_RC_CONF_OPTS))
+endef
+
+define HOST_S6_RC_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_S6_RC_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install-dynlib install-bin
+	rm -f $(HOST_DIR)/bin/s6-rc-dryrun
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/s6/Config.in b/bsp/buildroot/package/s6/Config.in
new file mode 100644
index 00000000..043380f4
--- /dev/null
+++ b/bsp/buildroot/package/s6/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_S6
+	bool "s6"
+	depends on BR2_USE_MMU # execline
+	select BR2_PACKAGE_EXECLINE
+	help
+	  s6 is a small suite of programs for UNIX, designed to allow
+	  process supervision (a.k.a service supervision), in the line
+	  of daemontools and runit, as well as various operations on
+	  processes and daemons.
+
+	  http://skarnet.org/software/s6/
diff --git a/bsp/buildroot/package/s6/s6.hash b/bsp/buildroot/package/s6/s6.hash
new file mode 100644
index 00000000..4a20e0f9
--- /dev/null
+++ b/bsp/buildroot/package/s6/s6.hash
@@ -0,0 +1,3 @@
+# Locally generated
+sha256 6617cbf82c73273c67c6102a1a5c48449ef65ffbe8d0db6a587b7f0078dc6e13  s6-2.7.0.0.tar.gz
+sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012  COPYING
diff --git a/bsp/buildroot/package/s6/s6.mk b/bsp/buildroot/package/s6/s6.mk
new file mode 100644
index 00000000..5556bfff
--- /dev/null
+++ b/bsp/buildroot/package/s6/s6.mk
@@ -0,0 +1,70 @@
+################################################################################
+#
+# s6
+#
+################################################################################
+
+S6_VERSION = 2.7.0.0
+S6_SITE = http://skarnet.org/software/s6
+S6_LICENSE = ISC
+S6_LICENSE_FILES = COPYING
+S6_INSTALL_STAGING = YES
+S6_DEPENDENCIES = execline
+
+S6_CONF_OPTS = \
+	--prefix=/usr \
+	--with-sysdeps=$(STAGING_DIR)/usr/lib/skalibs/sysdeps \
+	--with-include=$(STAGING_DIR)/usr/include \
+	--with-dynlib=$(STAGING_DIR)/usr/lib \
+	--with-lib=$(STAGING_DIR)/usr/lib/execline \
+	--with-lib=$(STAGING_DIR)/usr/lib/skalibs \
+	$(if $(BR2_STATIC_LIBS),,--disable-allstatic) \
+	$(SHARED_STATIC_LIBS_OPTS)
+
+define S6_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(S6_CONF_OPTS))
+endef
+
+define S6_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define S6_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
+endef
+
+define S6_REMOVE_STATIC_LIB_DIR
+	rm -rf $(TARGET_DIR)/usr/lib/s6
+endef
+
+S6_POST_INSTALL_TARGET_HOOKS += S6_REMOVE_STATIC_LIB_DIR
+
+define S6_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
+HOST_S6_DEPENDENCIES = host-execline
+
+HOST_S6_CONF_OPTS = \
+	--prefix=$(HOST_DIR) \
+	--with-sysdeps=$(HOST_DIR)/lib/skalibs/sysdeps \
+	--with-include=$(HOST_DIR)/include \
+	--with-dynlib=$(HOST_DIR)/lib \
+	--disable-static \
+	--enable-shared \
+	--disable-allstatic
+
+define HOST_S6_CONFIGURE_CMDS
+	(cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_S6_CONF_OPTS))
+endef
+
+define HOST_S6_BUILD_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define HOST_S6_INSTALL_CMDS
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) install-dynlib install-include
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch b/bsp/buildroot/package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch
new file mode 100644
index 00000000..c34002d2
--- /dev/null
+++ b/bsp/buildroot/package/safeclib/0001-Fix-install-when-HAVE_WCHAR-is-unset.patch
@@ -0,0 +1,50 @@
+From 5991f0d4b86c02a3d7739509b96815ccfa734be7 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fabrice.fontaine@orange.com>
+Date: Mon, 18 Dec 2017 17:17:54 +0100
+Subject: [PATCH] Fix install when HAVE_WCHAR is unset
+
+Don't build WCSNORM_xxx man pages if HAVE_WHCAR is not set otherwise
+installation will fail as the wcsnorm_mode enum is not defined in
+safe_str_lib.h when SAFECLIB_DISABLE_WCHAR is set
+
+Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
+---
+ Makefile.am | 15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 31398d1..b7e65a5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -142,12 +142,6 @@ dist_man_MANS += \
+ 	doc/man/man3/SAFE_STR_PASSWORD_MIN_LENGTH.3	\
+ 	doc/man/man3/STRTOK_DELIM_MAX_LEN.3	\
+ 	doc/man/man3/TMP_MAX_S.3	\
+-	doc/man/man3/WCSNORM_FCC.3	\
+-	doc/man/man3/WCSNORM_FCD.3	\
+-	doc/man/man3/WCSNORM_NFC.3	\
+-	doc/man/man3/WCSNORM_NFD.3	\
+-	doc/man/man3/WCSNORM_NFKC.3	\
+-	doc/man/man3/WCSNORM_NFKD.3	\
+ 	doc/man/man3/abort_handler_s.3	\
+ 	doc/man/man3/abort_handler_s.c.3	\
+ 	doc/man/man3/asctime_s.3	\
+@@ -461,6 +455,15 @@ dist_man_MANS += \
+ 	doc/man/man3/wprintf_s.c.3	\
+ 	doc/man/man3/wscanf_s.3	\
+ 	doc/man/man3/wscanf_s.c.3
++if ENABLE_WCHAR
++dist_man_MANS += \
++	doc/man/man3/WCSNORM_FCC.3      \
++	doc/man/man3/WCSNORM_FCD.3      \
++	doc/man/man3/WCSNORM_NFC.3      \
++	doc/man/man3/WCSNORM_NFD.3      \
++	doc/man/man3/WCSNORM_NFKC.3     \
++	doc/man/man3/WCSNORM_NFKD.3
++endif
+ CLEANFILES += Doxyfile doc/footer README.md
+ 
+ # avoid parallel doxygen
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/safeclib/Config.in b/bsp/buildroot/package/safeclib/Config.in
new file mode 100644
index 00000000..5117c49d
--- /dev/null
+++ b/bsp/buildroot/package/safeclib/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SAFECLIB
+	bool "safeclib"
+	help
+	  safec fork with all C11 Annex K functions
+
+	  This library implements the secure C11 Annex K functions on
+	  top of most libc implementations, which are missing from them.
+
+	  https://rurban.github.io/safeclib/
diff --git a/bsp/buildroot/package/safeclib/safeclib.hash b/bsp/buildroot/package/safeclib/safeclib.hash
new file mode 100644
index 00000000..95a862ee
--- /dev/null
+++ b/bsp/buildroot/package/safeclib/safeclib.hash
@@ -0,0 +1,3 @@
+# Locally computed:
+sha256	9c09c6e9fc95207c7d45944f8b669f2454056bef2bbaef70c94ba3f81be1cbb2	safeclib-v09102017.tar.gz
+sha256	c33e77efd5781e3d59a2bb648c82d2a615035ef0d24cf58880380e3af906510b	COPYING
diff --git a/bsp/buildroot/package/safeclib/safeclib.mk b/bsp/buildroot/package/safeclib/safeclib.mk
new file mode 100644
index 00000000..b1aa2599
--- /dev/null
+++ b/bsp/buildroot/package/safeclib/safeclib.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# safeclib
+#
+################################################################################
+
+SAFECLIB_VERSION = v09102017
+SAFECLIB_SITE = $(call github,rurban,safeclib,$(SAFECLIB_VERSION))
+SAFECLIB_LICENSE = MIT
+SAFECLIB_LICENSE_FILES = COPYING
+SAFECLIB_INSTALL_STAGING = YES
+# From git
+SAFECLIB_AUTORECONF = YES
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sam-ba/sam-ba.mk b/bsp/buildroot/package/sam-ba/sam-ba.mk
index 7fc65c01..a7941459 100644
--- a/bsp/buildroot/package/sam-ba/sam-ba.mk
+++ b/bsp/buildroot/package/sam-ba/sam-ba.mk
@@ -8,7 +8,7 @@ SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents
 SAM_BA_VERSION = 2.16
 SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)_linux.zip
 SAM_BA_LICENSE = SAM-BA license (sam-ba executable), \
-		BSD-2c like, BSD-4c (TCL and applets code)
+		BSD-2-Clause like, BSD-4-Clause (TCL and applets code)
 SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \
 		applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h
 
@@ -20,13 +20,19 @@ endef
 
 # Since it's a prebuilt application and it does not conform to the
 # usual Unix hierarchy, we install it in $(HOST_DIR)/opt/sam-ba and
-# then create a symbolic link from $(HOST_DIR)/usr/bin to the
+# then create a symbolic link from $(HOST_DIR)/bin to the
 # application binary, for easier usage.
 
+ifeq ($(HOSTARCH),x86_64)
+SAM_BA_BIN_NAME = sam-ba_64
+else
+SAM_BA_BIN_NAME = sam-ba
+endif
+
 define HOST_SAM_BA_INSTALL_CMDS
 	mkdir -p $(HOST_DIR)/opt/sam-ba/
 	cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/
-	ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba
+	ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch b/bsp/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch
index 4d0c770a..4794cb02 100644
--- a/bsp/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch
+++ b/bsp/buildroot/package/samba4/0001-libreplace-disable-libbsd-support.patch
@@ -9,6 +9,8 @@ This causes redefinition conflicts for link(2) when both standard
 unistd.h and bsd/unistd.h get included.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+(rebased for versions 4.7.3 & 4.8.0)
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 ---
  lib/replace/wscript | 12 ------------
  1 file changed, 12 deletions(-)
@@ -17,18 +19,21 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript
 index 1dfd902..456be9b 100644
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
-@@ -248,18 +248,6 @@ def configure(conf):
+@@ -296,21 +296,6 @@
  
-     conf.CHECK_FUNCS('prctl dirname basename')
+     strlcpy_in_bsd = False
  
 -    # libbsd on some platforms provides strlcpy and strlcat
 -    if not conf.CHECK_FUNCS('strlcpy strlcat'):
--        conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
--                checklibc=True)
+-        if conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h',
+-                               checklibc=True):
+-            strlcpy_in_bsd = True
 -    if not conf.CHECK_FUNCS('getpeereid'):
 -        conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h')
 -    if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'):
 -        conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h')
+-    if not conf.CHECK_FUNCS('setproctitle_init'):
+-        conf.CHECK_FUNCS_IN('setproctitle_init', 'bsd', headers='sys/types.h bsd/unistd.h')
 -
 -    if not conf.CHECK_FUNCS('closefrom'):
 -        conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h')
diff --git a/bsp/buildroot/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch b/bsp/buildroot/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch
new file mode 100644
index 00000000..45d3050a
--- /dev/null
+++ b/bsp/buildroot/package/samba4/0002-Fix-compilation-of-Samba-4.7.4-with-disabled-ADS.patch
@@ -0,0 +1,41 @@
+From da2f2cf8e7a1dfcb661b707e4649cec1e8a0e79c Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 9 Aug 2018 10:03:06 +0200
+Subject: [PATCH] Fix compilation of Samba 4.7.4 with disabled ADS
+
+Downloaded from upstream mailinglist
+https://lists.samba.org/archive/samba-technical/2017-December/124629.html
+
+Patch originates from FreeBSD:
+https://svnweb.freebsd.org/ports/head/net/samba47/files/patch-source3__libads__kerberos_keytab.c?revision=457119&view=markup
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ source3/libads/kerberos_keytab.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
+index 37ac7ba985e..71250962090 100644
+--- a/source3/libads/kerberos_keytab.c
++++ b/source3/libads/kerberos_keytab.c
+@@ -32,8 +32,6 @@
+ 
+ #ifdef HAVE_KRB5
+ 
+-#ifdef HAVE_ADS
+-
+ /* This MAX_NAME_LEN is a constant defined in krb5.h */
+ #ifndef MAX_KEYTAB_NAME_LEN
+ #define MAX_KEYTAB_NAME_LEN 1100
+@@ -85,6 +83,8 @@ out:
+ 	return ret;
+ }
+ 
++#ifdef HAVE_ADS
++
+ /**********************************************************************
+  Adds a single service principal, i.e. 'host' to the system keytab
+ ***********************************************************************/
+-- 
+2.14.4
+
diff --git a/bsp/buildroot/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch b/bsp/buildroot/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch
new file mode 100644
index 00000000..0f174d53
--- /dev/null
+++ b/bsp/buildroot/package/samba4/0003-Fix-uClibc-build-on-64bit-platforms-by-including-std.patch
@@ -0,0 +1,83 @@
+From 3d91847322eba55e97adc76c5c95570382af7059 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 28 Jan 2018 11:57:11 +0100
+Subject: [PATCH] Fix uClibc build on 64bit platforms by including stdint.h
+
+Fixes an error detected by buildroot autobuilders:
+http://autobuild.buildroot.net/results/573/573e2268e205e10d1352fa81122d8f225fdb4575/build-end.log
+
+/home/rclinux/rc-buildroot-test/scripts/instance-1/output/host/mips64el-buildroot-linux-uclibc/sysroot/usr/include/stdint.h:122:27:
+error: conflicting types for 'uintptr_t'
+ typedef unsigned long int uintptr_t;
+                           ^
+In file included from ../lib/ldb/tests/ldb_msg.c:17:0:
+../third_party/cmocka/cmocka.h:126:28: note: previous declaration of 'uintptr_t' was here
+       typedef unsigned int uintptr_t;
+
+The define __WORDSIZE is missing when cmocka.h decides how to
+define uintptr_t, this patch includes stdint.h when needed.
+
+Patch sent upstream:
+https://lists.samba.org/archive/samba-technical/2018-January/125306.html
+
+[updated for samba-4.8.4, v2 sent upstream
+ https://lists.samba.org/archive/samba-technical/2018-August/129732.html]
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ lib/ldb/tests/ldb_mod_op_test.c   | 1 +
+ lib/ldb/tests/ldb_msg.c           | 1 +
+ libcli/auth/tests/ntlm_check.c    | 1 +
+ libcli/smb/test_smb1cli_session.c | 1 +
+ 4 files changed, 4 insertions(+)
+
+diff --git a/lib/ldb/tests/ldb_mod_op_test.c b/lib/ldb/tests/ldb_mod_op_test.c
+index c8b9c1aa9ff..4893dc3b38b 100644
+--- a/lib/ldb/tests/ldb_mod_op_test.c
++++ b/lib/ldb/tests/ldb_mod_op_test.c
+@@ -13,6 +13,7 @@
+  */
+ #include <stdarg.h>
+ #include <stddef.h>
++#include <stdint.h>
+ #include <setjmp.h>
+ #include <cmocka.h>
+ 
+diff --git a/lib/ldb/tests/ldb_msg.c b/lib/ldb/tests/ldb_msg.c
+index f8de418e0dc..31786a9a318 100644
+--- a/lib/ldb/tests/ldb_msg.c
++++ b/lib/ldb/tests/ldb_msg.c
+@@ -13,6 +13,7 @@
+  */
+ #include <stdarg.h>
+ #include <stddef.h>
++#include <stdint.h>
+ #include <setjmp.h>
+ #include <cmocka.h>
+ 
+diff --git a/libcli/auth/tests/ntlm_check.c b/libcli/auth/tests/ntlm_check.c
+index e87a0a276d4..65c7b086008 100644
+--- a/libcli/auth/tests/ntlm_check.c
++++ b/libcli/auth/tests/ntlm_check.c
+@@ -40,6 +40,7 @@
+  */
+ #include <stdarg.h>
+ #include <stddef.h>
++#include <stdint.h>
+ #include <setjmp.h>
+ #include <cmocka.h>
+ 
+diff --git a/libcli/smb/test_smb1cli_session.c b/libcli/smb/test_smb1cli_session.c
+index d1e21d5431e..6a526c96b61 100644
+--- a/libcli/smb/test_smb1cli_session.c
++++ b/libcli/smb/test_smb1cli_session.c
+@@ -1,5 +1,6 @@
+ #include <stdarg.h>
+ #include <stddef.h>
++#include <stdint.h>
+ #include <setjmp.h>
+ #include <cmocka.h>
+ 
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch b/bsp/buildroot/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch
new file mode 100644
index 00000000..41a06801
--- /dev/null
+++ b/bsp/buildroot/package/samba4/0004-Disable-build-of-manpages-and-documentation.patch
@@ -0,0 +1,116 @@
+From 3cd608170b99492bdd5fe3b7b8e7db61af199845 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 9 Aug 2018 09:59:06 +0200
+Subject: [PATCH] Disable build of manpages and documentation
+
+This patch fixes a bug described in an upstream bug report
+https://bugzilla.samba.org/show_bug.cgi?id=9515
+which was closed as WONTFIX by disabling the build of manpages and
+documentation.
+
+If installed on the host, samba4 uses the docbook-xsl package to build
+parts of the documentation. This package is broken, on Debian for
+example the bug reported to samba4 was fixed in the docbook-xsl package:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567
+
+Since we do not provide a host version of docbook-xsl we need to disable
+the build of manpages and documentation.
+
+Patch was downloaded from
+https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/network/samba/patches/samba-950-no-man.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ buildtools/wafsamba/wafsamba.py | 10 +++++-----
+ docs-xml/wscript_build          | 34 +++++++++++++++++-----------------
+ source4/scripting/wscript_build |  4 ++--
+ 3 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
+index 4bb19d070e2..a255d841111 100644
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -335,9 +335,9 @@ def SAMBA_LIBRARY(bld, libname, source,
+         else:
+             bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
+ 
+-    if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
+-        bld.env['XSLTPROC_MANPAGES']):
+-        bld.MANPAGES(manpages, install)
++#    if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
++#        bld.env['XSLTPROC_MANPAGES']):
++#        bld.MANPAGES(manpages, install)
+ 
+ 
+ Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
+@@ -442,8 +442,8 @@ def SAMBA_BINARY(bld, binname, source,
+         samba_ldflags  = pie_ldflags
+         )
+ 
+-    if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+-        bld.MANPAGES(manpages, install)
++#    if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
++#        bld.MANPAGES(manpages, install)
+ 
+ Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
+ 
+diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
+index 954c62a29bc..1169158fd57 100644
+--- a/docs-xml/wscript_build
++++ b/docs-xml/wscript_build
+@@ -147,20 +147,20 @@ bld.SAMBA_GENERATOR(parameter_all,
+                     rule=smbdotconf_generate_parameter_list,
+                     dep_vars=bld.dynconfig_varnames())
+ 
+-def SMBDOTCONF_MANPAGE(bld, target):
+-    ''' assemble and build smb.conf.5 manual page'''
+-    bld.SAMBAMANPAGES(target, parameter_all)
+-
+-if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
+-
+-    SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
+-    bld.SAMBAMANPAGES(manpages)
+-
+-    if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
+-        bld.SAMBAMANPAGES(pam_winbind_manpages)
+-
+-    if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+-        bld.SAMBAMANPAGES(krb5_locator_manpages)
+-
+-    if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+-        bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
++#def SMBDOTCONF_MANPAGE(bld, target):
++#    ''' assemble and build smb.conf.5 manual page'''
++#    bld.SAMBAMANPAGES(target, parameter_all)
++#
++#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
++#
++#    SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
++#    bld.SAMBAMANPAGES(manpages)
++#
++#    if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
++#        bld.SAMBAMANPAGES(pam_winbind_manpages)
++#
++#    if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
++#        bld.SAMBAMANPAGES(krb5_locator_manpages)
++#
++#    if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
++#        bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')
+diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
+index 2f53cce12b7..9841ae0a116 100644
+--- a/source4/scripting/wscript_build
++++ b/source4/scripting/wscript_build
+@@ -12,8 +12,8 @@ if sbin_files:
+     bld.INSTALL_FILES('${SBINDIR}',
+                       sbin_files,
+                       chmod=MODE_755, python_fixup=True, flat=True)
+-    if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
+-        bld.MANPAGES(man_files, True)
++#    if 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
++#        bld.MANPAGES(man_files, True)
+ 
+ if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
+     bld.INSTALL_FILES('${BINDIR}',
+-- 
+2.14.4
+
diff --git a/bsp/buildroot/package/samba4/Config.in b/bsp/buildroot/package/samba4/Config.in
index 44741856..298fdc66 100644
--- a/bsp/buildroot/package/samba4/Config.in
+++ b/bsp/buildroot/package/samba4/Config.in
@@ -1,6 +1,6 @@
-comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, NPTL"
+comment "samba4 needs a uClibc or glibc toolchain w/ wchar, dynamic library, NPTL"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_NATIVE_RPC \
+	depends on !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL \
 		|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_USE_MMU
 
@@ -8,12 +8,13 @@ config BR2_PACKAGE_SAMBA4
 	bool "samba4"
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # python
-	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi
-	depends on !BR2_STATIC_LIBS # python
+	depends on !BR2_STATIC_LIBS # python, gnutls
 	depends on !BR2_nios2 # binary too large, relocations don't fit
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	depends on !BR2_TOOLCHAIN_USES_MUSL
 	select BR2_PACKAGE_E2FSPROGS
+	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_PACKAGE_POPT
 	select BR2_PACKAGE_PYTHON
 	select BR2_PACKAGE_ZLIB
diff --git a/bsp/buildroot/package/samba4/samba4-cache.txt b/bsp/buildroot/package/samba4/samba4-cache.txt
index 3ba8a75e..0485f0db 100644
--- a/bsp/buildroot/package/samba4/samba4-cache.txt
+++ b/bsp/buildroot/package/samba4/samba4-cache.txt
@@ -37,3 +37,5 @@ Checking value of NSIG: "65"
 Checking value of _NSIG: "65"
 Checking value of SIGRTMAX: "64"
 Checking value of SIGRTMIN: "34"
+Checking errno of iconv for illegal multibyte sequence: "0"
+checking for clnt_create(): OK
diff --git a/bsp/buildroot/package/samba4/samba4.hash b/bsp/buildroot/package/samba4/samba4.hash
index 65d8d68d..00c84660 100644
--- a/bsp/buildroot/package/samba4/samba4.hash
+++ b/bsp/buildroot/package/samba4/samba4.hash
@@ -1,2 +1,4 @@
-# Locally calculated
-sha256  3a3356faab1694680e2ccd7fdf051ab1bbd3b0d058fc1f671e135dd2d1eae1aa samba-4.5.16.tar.gz
+# Locally calculated after checking pgp signature
+# https://download.samba.org/pub/samba/stable/samba-4.8.4.tar.asc
+sha256 f5044d149e01894a08b1d114b8b69aed78171a7bb19608bd1fd771453b9a5406  samba-4.8.4.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/bsp/buildroot/package/samba4/samba4.mk b/bsp/buildroot/package/samba4/samba4.mk
index bb77b23f..03ef6eee 100644
--- a/bsp/buildroot/package/samba4/samba4.mk
+++ b/bsp/buildroot/package/samba4/samba4.mk
@@ -4,18 +4,30 @@
 #
 ################################################################################
 
-SAMBA4_VERSION = 4.5.16
+SAMBA4_VERSION = 4.8.4
 SAMBA4_SITE = https://download.samba.org/pub/samba/stable
 SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
 SAMBA4_INSTALL_STAGING = YES
-SAMBA4_LICENSE = GPLv3+
+SAMBA4_LICENSE = GPL-3.0+
 SAMBA4_LICENSE_FILES = COPYING
 SAMBA4_DEPENDENCIES = \
-	host-e2fsprogs host-heimdal host-python \
+	host-e2fsprogs host-heimdal host-python host-nfs-utils \
 	e2fsprogs popt python zlib \
 	$(if $(BR2_PACKAGE_LIBAIO),libaio) \
 	$(if $(BR2_PACKAGE_LIBCAP),libcap) \
-	$(if $(BR2_PACKAGE_READLINE),readline)
+	$(if $(BR2_PACKAGE_READLINE),readline) \
+	$(TARGET_NLS_DEPENDENCIES)
+SAMBA4_CFLAGS = $(TARGET_CFLAGS)
+SAMBA4_LDFLAGS = $(TARGET_LDFLAGS)
+SAMBA4_CONF_ENV = \
+	CFLAGS="$(SAMBA4_CFLAGS)" \
+	LDFLAGS="$(SAMBA4_LDFLAGS)"
+
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+SAMBA4_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`
+SAMBA4_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`
+SAMBA4_DEPENDENCIES += libtirpc host-pkgconf
+endif
 
 ifeq ($(BR2_PACKAGE_ACL),y)
 SAMBA4_CONF_OPTS += --with-acl-support
@@ -50,12 +62,6 @@ else
 SAMBA4_CONF_OPTS += --without-fam
 endif
 
-ifeq ($(BR2_PACKAGE_GETTEXT),y)
-SAMBA4_DEPENDENCIES += gettext
-else
-SAMBA4_CONF_OPTS += --without-gettext
-endif
-
 ifeq ($(BR2_PACKAGE_GNUTLS),y)
 SAMBA4_CONF_OPTS += --enable-gnutls
 SAMBA4_DEPENDENCIES += gnutls
diff --git a/bsp/buildroot/package/sane-backends/Config.in b/bsp/buildroot/package/sane-backends/Config.in
index 3e5a27ff..48ae9f79 100644
--- a/bsp/buildroot/package/sane-backends/Config.in
+++ b/bsp/buildroot/package/sane-backends/Config.in
@@ -7,9 +7,9 @@ config BR2_PACKAGE_SANE_BACKENDS
 
 	  http://www.sane-project.org
 
-	  Backends are included automatically based on the libraries that have
-	  been selected: libusb, jpeg, tiff, avahi (with dbus and libglib2),
-	  and netsnmp.
+	  Backends are included automatically based on the libraries
+	  that have been selected: libusb, jpeg, tiff, avahi (with
+	  dbus and libglib2), and netsnmp.
 
 comment "sane-backends needs a toolchain w/ dynamic library"
 	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/sane-backends/sane-backends.mk b/bsp/buildroot/package/sane-backends/sane-backends.mk
index 37e5136c..ed3b9124 100644
--- a/bsp/buildroot/package/sane-backends/sane-backends.mk
+++ b/bsp/buildroot/package/sane-backends/sane-backends.mk
@@ -7,7 +7,7 @@
 SANE_BACKENDS_VERSION = 1.0.25
 SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/4146
 SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
-SANE_BACKENDS_LICENSE = GPLv2+
+SANE_BACKENDS_LICENSE = GPL-2.0+
 SANE_BACKENDS_LICENSE_FILES = COPYING
 SANE_BACKENDS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/sbc/sbc.mk b/bsp/buildroot/package/sbc/sbc.mk
index 60ebc748..77661c18 100644
--- a/bsp/buildroot/package/sbc/sbc.mk
+++ b/bsp/buildroot/package/sbc/sbc.mk
@@ -9,7 +9,7 @@ SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz
 SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth
 SBC_INSTALL_STAGING = YES
 SBC_DEPENDENCIES = libsndfile host-pkgconf
-SBC_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)
+SBC_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
 SBC_LICENSE_FILES = COPYING COPYING.LIB
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sconeserver/Config.in b/bsp/buildroot/package/sconeserver/Config.in
index f03af8dd..7027bd9a 100644
--- a/bsp/buildroot/package/sconeserver/Config.in
+++ b/bsp/buildroot/package/sconeserver/Config.in
@@ -5,8 +5,9 @@ menuconfig BR2_PACKAGE_SCONESERVER
 	depends on !BR2_STATIC_LIBS # dlopen()
 	select BR2_PACKAGE_PCRE
 	help
-	  Sconeserver is a modular, object-orientated and extremely versatile
-	  network server framework for GNU/Linux and UNIX-like platforms.
+	  Sconeserver is a modular, object-orientated and extremely
+	  versatile network server framework for GNU/Linux and
+	  UNIX-like platforms.
 
 	  http://www.sconemad.com/sconeserver/
 
diff --git a/bsp/buildroot/package/sconeserver/sconeserver.mk b/bsp/buildroot/package/sconeserver/sconeserver.mk
index 793ca6fb..cf7bcbcb 100644
--- a/bsp/buildroot/package/sconeserver/sconeserver.mk
+++ b/bsp/buildroot/package/sconeserver/sconeserver.mk
@@ -6,7 +6,7 @@
 
 SCONESERVER_VERSION = d659468cd164e6a6cc12932cc6780566b04f8328
 SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION))
-SCONESERVER_LICENSE = GPLv2+
+SCONESERVER_LICENSE = GPL-2.0+
 SCONESERVER_LICENSE_FILES = COPYING
 # fetching from Git, we need to generate the configure script
 SCONESERVER_AUTORECONF = YES
diff --git a/bsp/buildroot/package/scons/scons.hash b/bsp/buildroot/package/scons/scons.hash
index 1b47d645..b3cdea0d 100644
--- a/bsp/buildroot/package/scons/scons.hash
+++ b/bsp/buildroot/package/scons/scons.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b  scons-2.3.0.tar.gz
+sha256  0b25218ae7b46a967db42f2a53721645b3d42874a65f9552ad16ce26d30f51f2  scons-2.5.1.tar.gz
diff --git a/bsp/buildroot/package/scons/scons.mk b/bsp/buildroot/package/scons/scons.mk
index 39fb258d..14be589e 100644
--- a/bsp/buildroot/package/scons/scons.mk
+++ b/bsp/buildroot/package/scons/scons.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SCONS_VERSION = 2.3.0
+SCONS_VERSION = 2.5.1
 SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION)
 SCONS_LICENSE = MIT
 SCONS_LICENSE_FILES = LICENSE.txt
@@ -13,9 +13,9 @@ SCONS_SETUP_TYPE = distutils
 HOST_SCONS_NEEDS_HOST_PYTHON = python2
 
 HOST_SCONS_INSTALL_OPTS = \
-	--install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION)
+	--install-lib=$(HOST_DIR)/lib/scons-$(SCONS_VERSION)
 
 $(eval $(host-python-package))
 
 # variables used by other packages
-SCONS = $(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/scons $(if $(QUIET),-s)
+SCONS = $(HOST_DIR)/bin/python2 $(HOST_DIR)/bin/scons $(if $(QUIET),-s)
diff --git a/bsp/buildroot/package/screen/0006-install-no-backup-binary.patch b/bsp/buildroot/package/screen/0006-install-no-backup-binary.patch
index 504862a2..7842662b 100644
--- a/bsp/buildroot/package/screen/0006-install-no-backup-binary.patch
+++ b/bsp/buildroot/package/screen/0006-install-no-backup-binary.patch
@@ -5,6 +5,8 @@ Subject: Do not create backup of old installed binary
 This is a rather unusual feature that packagers will not expect.
 
 Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
+[baruch: update for 4.6.2]
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 ---
  Makefile.in | 4 ----
  1 file changed, 4 deletions(-)
@@ -16,7 +18,7 @@ index 187a69b..65549e9 100644
 @@ -83,12 +83,9 @@ screen: $(OFILES)
  	    $(OPTIONS) $(CFLAGS) $<
  
- install_bin: .version screen
+ install_bin: .version screen installdirs
 -	-if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
 -		then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
  	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
diff --git a/bsp/buildroot/package/screen/0009-install-dir-dependency.patch b/bsp/buildroot/package/screen/0009-install-dir-dependency.patch
deleted file mode 100644
index 9016cb90..00000000
--- a/bsp/buildroot/package/screen/0009-install-dir-dependency.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Maarten ter Huurne <maarten@treewalker.org>
-Date: Mon, 15 Sep 2014 02:27:09 +0200
-Subject: Ensure that installation dirs exist before copying files into them
-
-Since the "install_bin" target requires the installation directories
-to exist, it should depend on the "installdirs" target. The previous
-approach of having "install" depend on "installdirs" is not reliable.
-
-For example, in a parallel build, there was no guarantee that
-"installdirs" would be finished before "install_bin" runs. Also if
-the user requested only "install_bin" to be made, "installdirs" would
-be skipped altogether.
-
-Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
----
- Makefile.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 860f351..f0fe08d 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -82,7 +82,7 @@ screen: $(OFILES)
- 	$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
- 	    $(OPTIONS) $(CFLAGS) $<
- 
--install_bin: .version screen
-+install_bin: .version screen installdirs
- 	$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
- 	-chown root $(DESTDIR)$(bindir)/$(SCREEN)
- 	-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
-@@ -94,7 +94,7 @@ endif
- 	cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
- 
- ###############################################################################
--install: installdirs install_bin
-+install: install_bin
- 	cd doc ; $(MAKE) install
- 	-if [ -d /usr/lib/terminfo ]; then \
- 		PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
--- 
-1.8.4.5
-
diff --git a/bsp/buildroot/package/screen/0010-rename-sched_h.patch b/bsp/buildroot/package/screen/0009-rename-sched_h.patch
similarity index 100%
rename from bsp/buildroot/package/screen/0010-rename-sched_h.patch
rename to bsp/buildroot/package/screen/0009-rename-sched_h.patch
diff --git a/bsp/buildroot/package/screen/0010-comm-h-now-depends-on-term-h.patch b/bsp/buildroot/package/screen/0010-comm-h-now-depends-on-term-h.patch
new file mode 100644
index 00000000..6ff6f3da
--- /dev/null
+++ b/bsp/buildroot/package/screen/0010-comm-h-now-depends-on-term-h.patch
@@ -0,0 +1,28 @@
+From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001
+From: Mike Gerwitz <mike@mikegerwitz.com>
+Date: Tue, 24 Dec 2013 22:16:31 -0500
+Subject: comm.h now depends on term.h
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Patch retrieved and updated from:
+http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c]
+---
+ src/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index e791e79..d4f7c0b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -113,7 +113,7 @@ term.h: term.c term.sh
+ 
+ kmapdef.c: term.h
+ 
+-comm.h: comm.c comm.sh config.h
++comm.h: comm.c comm.sh config.h term.h
+ 	AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
+ 
+ docs:
+-- 
+cgit v1.0-41-gc330
+
diff --git a/bsp/buildroot/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch b/bsp/buildroot/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch
new file mode 100644
index 00000000..f406a1af
--- /dev/null
+++ b/bsp/buildroot/package/screen/0011-comm.h-needed-for-list_-display-generic-.o.patch
@@ -0,0 +1,35 @@
+From b719314d201a3e9e1e57c65746a468c47bfc847f Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 3 Oct 2018 22:29:32 +0200
+Subject: [PATCH] comm.h needed for list_{display,generic}.o
+
+comm.h is needed to build list_display.o and list_generic.o otherwise
+parallel builds will sometimes fail
+
+Fixes:
+ - http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc
+ - http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://savannah.gnu.org/bugs/index.php?54776]
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index af5938b..e6d5247 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -265,7 +265,7 @@  braille.h
+ viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \
+  comm.h layer.h term.h image.h display.h window.h extern.h \
+  braille.h
+-list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h
+-list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h
++list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h
++list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h
+ list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h
+ 
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/screen/Config.in b/bsp/buildroot/package/screen/Config.in
index b5876e87..ee4c04ca 100644
--- a/bsp/buildroot/package/screen/Config.in
+++ b/bsp/buildroot/package/screen/Config.in
@@ -3,11 +3,12 @@ config BR2_PACKAGE_SCREEN
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_NCURSES
 	help
-	  Screen is a full-screen window manager that multiplexes a physical
-	  terminal between several processes, typically interactive shells.
-	  Each virtual terminal provides the functions of the DEC VT100
-	  terminal and, in addition, several control functions from the ANSI
-	  X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line
-	  and support for multiple character sets).
+	  Screen is a full-screen window manager that multiplexes a
+	  physical terminal between several processes, typically
+	  interactive shells.  Each virtual terminal provides the
+	  functions of the DEC VT100 terminal and, in addition,
+	  several control functions from the ANSI X3.64 (ISO 6429) and
+	  ISO 2022 standards (e.g., insert/delete line and support for
+	  multiple character sets).
 
 	  http://www.gnu.org/software/screen/
diff --git a/bsp/buildroot/package/screen/screen.hash b/bsp/buildroot/package/screen/screen.hash
index 7ddc3370..0e1613b2 100644
--- a/bsp/buildroot/package/screen/screen.hash
+++ b/bsp/buildroot/package/screen/screen.hash
@@ -1,2 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0  screen-4.5.0.tar.gz
+# https://ftp.gnu.org/gnu/screen/screen-4.6.2.tar.gz.sig
+sha256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a  screen-4.6.2.tar.gz
+# Locally calculated
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/bsp/buildroot/package/screen/screen.mk b/bsp/buildroot/package/screen/screen.mk
index 519a02ab..8d67c04b 100644
--- a/bsp/buildroot/package/screen/screen.mk
+++ b/bsp/buildroot/package/screen/screen.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SCREEN_VERSION = 4.5.0
+SCREEN_VERSION = 4.6.2
 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
-SCREEN_LICENSE = GPLv3+
+SCREEN_LICENSE = GPL-3.0+
 SCREEN_LICENSE_FILES = COPYING
 SCREEN_DEPENDENCIES = ncurses
 SCREEN_AUTORECONF = YES
diff --git a/bsp/buildroot/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch b/bsp/buildroot/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch
new file mode 100644
index 00000000..d8729b4a
--- /dev/null
+++ b/bsp/buildroot/package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch
@@ -0,0 +1,45 @@
+From 11d30916dd9c11a26c7c8a0f6db9e6ebca301594 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Mon, 18 Jan 2016 21:45:23 +0100
+Subject: [PATCH] configure.ac: make sure m4 macros are included in the build
+
+This change prevents the following error to occur when calling
+autoreconf:
+
+  >>> scrub 2.6.1 Autoreconfiguring
+  cd /work/build/scrub/build/scrub-2.6.1/ &&  PATH="/work/build/scrub/host/bin:/work/build/scrub/host/sbin:/work/build/scrub/host/usr/bin:/work/build/scrub/host/usr/sbin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/sbin:/usr/sbin" AR="/usr/bin/ar" AS="/usr/bin/as" LD="/usr/bin/ld" NM="/usr/bin/nm" CC="/usr/bin/gcc" GCC="/usr/bin/gcc" CXX="/usr/bin/g++" CPP="/usr/bin/cpp" OBJCOPY="/usr/bin/objcopy" RANLIB="/usr/bin/ranlib" CPPFLAGS="-I/work/build/scrub/host/usr/include" CFLAGS="-O2 -I/work/build/scrub/host/usr/include" CXXFLAGS="-O2 -I/work/build/scrub/host/usr/include" LDFLAGS="-L/work/build/scrub/host/lib -L/work/build/scrub/host/usr/lib -Wl,-rpath,/work/build/scrub/host/usr/lib" PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 PKG_CONFIG="/work/build/scrub/host/usr/bin/pkg-config" PKG_CONFIG_SYSROOT_DIR="/" PKG_CONFIG_LIBDIR="/work/build/scrub/host/usr/lib/pkgconfig:/work/build/scrub/host/usr/share/pkgconfig" INTLTOOL_PERL=/usr/bin/perl ACLOCAL="/work/build/scrub/host/usr/bin/aclocal -I /work/build/scrub/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/share/aclocal" AUTOCONF="/work/build/scrub/host/usr/bin/autoconf" AUTOHEADER="/work/build/scrub/host/usr/bin/autoheader" AUTOMAKE="/work/build/scrub/host/usr/bin/automake" AUTOPOINT=/bin/true /work/build/scrub/host/usr/bin/autoreconf -f -i -I "/work/build/scrub/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/share/aclocal" -I "/work/build/scrub/host/usr/share/aclocal"
+  libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, 'config'.
+  libtoolize: copying file 'config/ltmain.sh'
+  libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([m4])' to configure.ac,
+  libtoolize: and rerunning libtoolize and aclocal.
+  libtoolize: Consider adding '-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
+  configure.ac:10: error possibly undefined macro: X_AC_META
+        If this token and others are legitimate, please use m4_pattern_allow.
+        See the Autoconf documentation.
+  configure.ac:11: error possibly undefined macro: X_AC_EXPAND_INSTALL_DIRS
+  configure.ac:51: error possibly undefined macro: AC_PKGCONFIG
+  configure.ac:70: error possibly undefined macro: X_AC_CHECK_PTHREADS
+  autoreconf: /work/build/scrub/host/usr/bin/autoconf failed with exit status: 1
+  package/pkg-generic.mk:185: recipe for target '/work/build/scrub/build/scrub-2.6.1/.stamp_configured' failed
+  make: *** [/work/build/scrub/build/scrub-2.6.1/.stamp_configured] Error 1
+  make: Leaving directory '/work/repos/buildroot'
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+[Upstream commit: https://github.com/chaos/scrub/commit/11d30916dd9c11a26c7c8a0f6db9e6ebca301594]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 3d71289..07eaf33 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@ AC_INIT(m4_esyscmd([awk '/Name:/ {printf "%s",$2; exit}' META]),
+ AC_CONFIG_AUX_DIR([config])
+ AC_CONFIG_SRCDIR([NEWS])
+ AC_CANONICAL_SYSTEM
++AC_CONFIG_MACRO_DIR([config])
+ X_AC_META
+ X_AC_EXPAND_INSTALL_DIRS
+ 
diff --git a/bsp/buildroot/package/scrub/scrub.hash b/bsp/buildroot/package/scrub/scrub.hash
index 0041fd05..4cb8189c 100644
--- a/bsp/buildroot/package/scrub/scrub.hash
+++ b/bsp/buildroot/package/scrub/scrub.hash
@@ -1,3 +1,5 @@
 # Locally computed
 sha256  838b061b2e1932b342fb9695c5579cdff5d2d72506cb41d6d8032eba18aed969  scrub-2.6.1.tar.gz
-sha256  6a129b4e0df6ebe02d449fa481db7b75be5eff08ce518aa77edd74c6b17c5ae4  11d30916dd9c11a26c7c8a0f6db9e6ebca301594.patch
+# License files, locally calculated
+sha256  204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994  COPYING
+sha256  f76abbfb80cde1036cb553cdecb08bb846a48e33c91ef56c0f494172fd407f33  DISCLAIMER
diff --git a/bsp/buildroot/package/scrub/scrub.mk b/bsp/buildroot/package/scrub/scrub.mk
index b8162721..ace19d5b 100644
--- a/bsp/buildroot/package/scrub/scrub.mk
+++ b/bsp/buildroot/package/scrub/scrub.mk
@@ -6,9 +6,8 @@
 
 SCRUB_VERSION = 2.6.1
 SCRUB_SITE = $(call github,chaos,scrub,$(SCRUB_VERSION))
-SCRUB_LICENSE = GPLv2+
+SCRUB_LICENSE = GPL-2.0+
 SCRUB_LICENSE_FILES = COPYING DISCLAIMER
-SCRUB_PATCH = https://github.com/chaos/scrub/commit/11d30916dd9c11a26c7c8a0f6db9e6ebca301594.patch
 
 # Fetching from the git repo, no configure/Makefile generated, and patching
 # configure.ac
diff --git a/bsp/buildroot/package/scrypt/scrypt.mk b/bsp/buildroot/package/scrypt/scrypt.mk
index 7ffa7ccf..ae5a64e7 100644
--- a/bsp/buildroot/package/scrypt/scrypt.mk
+++ b/bsp/buildroot/package/scrypt/scrypt.mk
@@ -7,7 +7,7 @@
 SCRYPT_VERSION = 1.2.0
 SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz
 SCRYPT_SITE = http://www.tarsnap.com/scrypt
-SCRYPT_LICENSE = BSD-2c
+SCRYPT_LICENSE = BSD-2-Clause
 SCRYPT_LICENSE_FILES = main.c
 SCRYPT_DEPENDENCIES = openssl
 SCRYPT_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/sdl/sdl.mk b/bsp/buildroot/package/sdl/sdl.mk
index 38b4b977..0a6a7de1 100644
--- a/bsp/buildroot/package/sdl/sdl.mk
+++ b/bsp/buildroot/package/sdl/sdl.mk
@@ -7,7 +7,7 @@
 SDL_VERSION = 1.2.15
 SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz
 SDL_SITE = http://www.libsdl.org/release
-SDL_LICENSE = LGPLv2.1+
+SDL_LICENSE = LGPL-2.1+
 SDL_LICENSE_FILES = COPYING
 SDL_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch b/bsp/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch
new file mode 100644
index 00000000..53926c03
--- /dev/null
+++ b/bsp/buildroot/package/sdl2/0001-Fixed-the-DirectFB-renderer-not-being-enabled-in-aut.patch
@@ -0,0 +1,42 @@
+From a0acea5bcce3f47badbfeeab7bc2e36eba08fd84 Mon Sep 17 00:00:00 2001
+From: Sam Lantinga <slouken@libsdl.org>
+Date: Mon, 27 Aug 2018 11:51:05 -0700
+Subject: [PATCH] Fixed the DirectFB renderer not being enabled in autoconf
+ builds
+
+Upstream-url: https://hg.libsdl.org/SDL/raw-rev/751cdc74d55c
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ configure    | 3 +++
+ configure.in | 1 +
+ 2 files changed, 4 insertions(+)
+
+diff --git a/configure b/configure
+index e88b38001..40ac14d21 100755
+--- a/configure
++++ b/configure
+@@ -21501,6 +21501,9 @@ fi
+ 
+ $as_echo "#define SDL_VIDEO_DRIVER_DIRECTFB 1" >>confdefs.h
+ 
++
++$as_echo "#define SDL_VIDEO_RENDER_DIRECTFB 1" >>confdefs.h
++
+             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
+ 
+diff --git a/configure.in b/configure.in
+index 5bf5d717b..ce1d57ea1 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2163,6 +2163,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
+                               , enable_directfb_shared=yes)
+ 
+             AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB, 1, [ ])
++            AC_DEFINE(SDL_VIDEO_RENDER_DIRECTFB, 1, [ ])
+             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/sdl2/Config.in b/bsp/buildroot/package/sdl2/Config.in
index 8fc14ee7..f29b3c7c 100644
--- a/bsp/buildroot/package/sdl2/Config.in
+++ b/bsp/buildroot/package/sdl2/Config.in
@@ -29,6 +29,31 @@ comment "X11 video driver needs X.org"
 	depends on !BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU
 
+config BR2_PACKAGE_SDL2_KMSDRM
+	bool "KMS/DRM video driver"
+	depends on BR2_PACKAGE_LIBDRM
+
+comment "KMS/DRM video driver needs libdrm"
+	depends on !BR2_PACKAGE_LIBDRM
+
+config BR2_PACKAGE_SDL2_OPENGL
+	bool "OpenGL (GLX)"
+	depends on BR2_PACKAGE_HAS_LIBGL
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU # X11 video driver
+	select BR2_PACKAGE_SDL2_X11
+
+comment "OpenGL support needs X11 and an OpenGL provider"
+	depends on BR2_USE_MMU
+	depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7
+
+config BR2_PACKAGE_SDL2_OPENGLES
+	bool "OpenGL ES"
+	depends on BR2_PACKAGE_HAS_LIBGLES
+
+comment "OpenGL ES support needs an OpenGL ES provider"
+	depends on !BR2_PACKAGE_HAS_LIBGLES
+
 endif
 
 comment "sdl2 needs a toolchain w/ dynamic library"
diff --git a/bsp/buildroot/package/sdl2/sdl2.hash b/bsp/buildroot/package/sdl2/sdl2.hash
index 588f8f49..997b4a5d 100644
--- a/bsp/buildroot/package/sdl2/sdl2.hash
+++ b/bsp/buildroot/package/sdl2/sdl2.hash
@@ -1,4 +1,4 @@
-# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.7.tar.gz.sig
-sha256 ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e  SDL2-2.0.7.tar.gz
+# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.8.tar.gz.sig
+sha256 edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec  SDL2-2.0.8.tar.gz
 # Locally calculated
-sha256 bbd2edb1789c33de29bb9f8d1dbe2774584a9ce8c4e3162944b7a3a447f5e85d  COPYING.txt
+sha256 61e627031e1160bf8b9bdbc9cda27656d422ea8eaab199b64b4a4a4168437154  COPYING.txt
diff --git a/bsp/buildroot/package/sdl2/sdl2.mk b/bsp/buildroot/package/sdl2/sdl2.mk
index ce5f0741..bd71485f 100644
--- a/bsp/buildroot/package/sdl2/sdl2.mk
+++ b/bsp/buildroot/package/sdl2/sdl2.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-SDL2_VERSION = 2.0.7
+SDL2_VERSION = 2.0.8
 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
 SDL2_SITE = http://www.libsdl.org/release
-SDL2_LICENSE = zlib
+SDL2_LICENSE = Zlib
 SDL2_LICENSE_FILES = COPYING.txt
 SDL2_INSTALL_STAGING = YES
 SDL2_CONFIG_SCRIPTS = sdl2-config
@@ -18,10 +18,7 @@ SDL2_CONF_OPTS += \
 	--disable-esd \
 	--disable-dbus \
 	--disable-pulseaudio \
-	--disable-video-opengl \
-	--disable-video-opengles \
-	--disable-video-wayland \
-	--disable-video-rpi
+	--disable-video-wayland
 
 # We must enable static build to get compilation successful.
 SDL2_CONF_OPTS += --enable-static
@@ -41,6 +38,13 @@ else
 SDL2_CONF_OPTS += --disable-video-directfb
 endif
 
+ifeq ($(BR2_PACKAGE_SDL2_OPENGLES)$(BR2_PACKAGE_RPI_USERLAND),yy)
+SDL2_DEPENDENCIES += rpi-userland
+SDL2_CONF_OPTS += --enable-video-rpi
+else
+SDL2_CONF_OPTS += --disable-video-rpi
+endif
+
 # x-includes and x-libraries must be set for cross-compiling
 # By default x_includes and x_libraries contains unsafe paths.
 # (/usr/X11R6/include and /usr/X11R6/lib)
@@ -51,7 +55,7 @@ SDL2_DEPENDENCIES += xlib_libX11 xlib_libXext
 SDL2_CONF_OPTS += --enable-video-x11 \
 	--with-x=$(STAGING_DIR) \
 	--x-includes=$(STAGING_DIR)/usr/include \
-	--x-libraries=$(STAGING_DIR)/usr/lib  \
+	--x-libraries=$(STAGING_DIR)/usr/lib \
 	--enable-video-x11-xshape
 
 ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y)
@@ -100,6 +104,20 @@ else
 SDL2_CONF_OPTS += --disable-video-x11 --without-x
 endif
 
+ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y)
+SDL2_CONF_OPTS += --enable-video-opengl
+SDL2_DEPENDENCIES += libgl
+else
+SDL2_CONF_OPTS += --disable-video-opengl
+endif
+
+ifeq ($(BR2_PACKAGE_SDL2_OPENGLES),y)
+SDL2_CONF_OPTS += --enable-video-opengles
+SDL2_DEPENDENCIES += libgles
+else
+SDL2_CONF_OPTS += --disable-video-opengles
+endif
+
 ifeq ($(BR2_PACKAGE_TSLIB),y)
 SDL2_DEPENDENCIES += tslib
 SDL2_CONF_OPTS += --enable-input-tslib
@@ -114,4 +132,11 @@ else
 SDL2_CONF_OPTS += --disable-alsa
 endif
 
+ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y)
+SDL2_DEPENDENCIES += libdrm
+SDL2_CONF_OPTS += --enable-video-kmsdrm
+else
+SDL2_CONF_OPTS += --disable-video-kmsdrm
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sdl2_gfx/sdl2_gfx.mk b/bsp/buildroot/package/sdl2_gfx/sdl2_gfx.mk
index 975bca73..1ec13871 100644
--- a/bsp/buildroot/package/sdl2_gfx/sdl2_gfx.mk
+++ b/bsp/buildroot/package/sdl2_gfx/sdl2_gfx.mk
@@ -7,7 +7,7 @@
 SDL2_GFX_VERSION = 1.0.1
 SDL2_GFX_SOURCE = SDL2_gfx-$(SDL2_GFX_VERSION).tar.gz
 SDL2_GFX_SITE = http://www.ferzkopp.net/Software/SDL2_gfx
-SDL2_GFX_LICENSE = zlib
+SDL2_GFX_LICENSE = Zlib
 SDL2_GFX_LICENSE_FILES = COPYING SDL2_framerate.h
 SDL2_GFX_INSTALL_STAGING = YES
 SDL2_GFX_DEPENDENCIES = sdl2 host-pkgconf
diff --git a/bsp/buildroot/package/sdl2_image/sdl2_image.hash b/bsp/buildroot/package/sdl2_image/sdl2_image.hash
index 26d0a88c..cf325352 100644
--- a/bsp/buildroot/package/sdl2_image/sdl2_image.hash
+++ b/bsp/buildroot/package/sdl2_image/sdl2_image.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64  SDL2_image-2.0.1.tar.gz
+sha256 3510c25da735ffcd8ce3b65073150ff4f7f9493b866e85b83738083b556d2368  SDL2_image-2.0.3.tar.gz
+sha256 13240ed78c8726c510b9634976430d3d3a9ea2d1ced3214119766e9e71568a35  COPYING.txt
diff --git a/bsp/buildroot/package/sdl2_image/sdl2_image.mk b/bsp/buildroot/package/sdl2_image/sdl2_image.mk
index cf3b738e..8c1c5f6e 100644
--- a/bsp/buildroot/package/sdl2_image/sdl2_image.mk
+++ b/bsp/buildroot/package/sdl2_image/sdl2_image.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-SDL2_IMAGE_VERSION = 2.0.1
+SDL2_IMAGE_VERSION = 2.0.3
 SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz
 SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
 SDL2_IMAGE_INSTALL_STAGING = YES
-SDL2_IMAGE_LICENSE = zlib
+SDL2_IMAGE_LICENSE = Zlib
 SDL2_IMAGE_LICENSE_FILES = COPYING.txt
 
 # Unconditionally enable support for image formats that don't require
diff --git a/bsp/buildroot/package/sdl2_mixer/Config.in b/bsp/buildroot/package/sdl2_mixer/Config.in
new file mode 100644
index 00000000..8e1cf585
--- /dev/null
+++ b/bsp/buildroot/package/sdl2_mixer/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SDL2_MIXER
+	bool "sdl2_mixer"
+	depends on BR2_PACKAGE_SDL2
+	help
+	  SDL_mixer is a sample multi-channel audio mixer library.  It
+	  supports any number of simultaneously playing channels of 16
+	  bit stereo audio, plus a single channel of music, mixed by
+	  the popular FLAC, MikMod MOD, Timidity MIDI, Ogg Vorbis, and
+	  SMPEG MP3 libraries.
+
+	  http://www.libsdl.org/projects/SDL_mixer/
diff --git a/bsp/buildroot/package/sdl2_mixer/sdl2_mixer.hash b/bsp/buildroot/package/sdl2_mixer/sdl2_mixer.hash
new file mode 100644
index 00000000..48bc887a
--- /dev/null
+++ b/bsp/buildroot/package/sdl2_mixer/sdl2_mixer.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 5a24f62a610249d744cbd8d28ee399d8905db7222bf3bdbc8a8b4a76e597695f  SDL2_mixer-2.0.1.tar.gz
diff --git a/bsp/buildroot/package/sdl2_mixer/sdl2_mixer.mk b/bsp/buildroot/package/sdl2_mixer/sdl2_mixer.mk
new file mode 100644
index 00000000..c9908479
--- /dev/null
+++ b/bsp/buildroot/package/sdl2_mixer/sdl2_mixer.mk
@@ -0,0 +1,40 @@
+################################################################################
+#
+# sdl2_mixer
+#
+################################################################################
+
+SDL2_MIXER_VERSION = 2.0.1
+SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz
+SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
+SDL2_MIXER_LICENSE = Zlib
+SDL2_MIXER_LICENSE_FILES = COPYING.txt
+SDL2_MIXER_INSTALL_STAGING = YES
+SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf
+
+SDL2_MIXER_CONF_OPTS = \
+	--disable-fluidsynth \
+	--disable-music-mp3
+
+ifeq ($(BR2_PACKAGE_FLAC),y)
+SDL2_MIXER_CONF_OPTS += --enable-music-flac
+SDL2_MIXER_DEPENDENCIES += flac
+else
+SDL2_MIXER_CONF_OPTS += --disable-music-flac
+endif
+
+ifeq ($(BR2_PACKAGE_LIBMODPLUG),y)
+SDL2_MIXER_CONF_OPTS += --enable-music-mod-modplug
+SDL2_MIXER_DEPENDENCIES += libmodplug
+else
+SDL2_MIXER_CONF_OPTS += --disable-music-mod-modplug
+endif
+
+ifeq ($(BR2_PACKAGE_TREMOR),y)
+SDL2_MIXER_CONF_OPTS += --enable-music-ogg-tremor
+SDL2_MIXER_DEPENDENCIES += tremor
+else
+SDL2_MIXER_CONF_OPTS += --disable-music-ogg-tremor
+endif
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sdl2_net/Config.in b/bsp/buildroot/package/sdl2_net/Config.in
new file mode 100644
index 00000000..d5e749f5
--- /dev/null
+++ b/bsp/buildroot/package/sdl2_net/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SDL2_NET
+	bool "sdl2_net"
+	depends on BR2_PACKAGE_SDL2
+	help
+	  This is a small sample cross-platform networking library,
+	  with a sample chat client and server application. The chat
+	  client uses the GUIlib GUI framework library.
+
+	  http://www.libsdl.org/projects/SDL_net/
diff --git a/bsp/buildroot/package/sdl2_net/sdl2_net.hash b/bsp/buildroot/package/sdl2_net/sdl2_net.hash
new file mode 100644
index 00000000..c5f44338
--- /dev/null
+++ b/bsp/buildroot/package/sdl2_net/sdl2_net.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21  SDL2_net-2.0.1.tar.gz
diff --git a/bsp/buildroot/package/sdl2_net/sdl2_net.mk b/bsp/buildroot/package/sdl2_net/sdl2_net.mk
new file mode 100644
index 00000000..2fa4a8c2
--- /dev/null
+++ b/bsp/buildroot/package/sdl2_net/sdl2_net.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# sdl2_net
+#
+################################################################################
+
+SDL2_NET_VERSION = 2.0.1
+SDL2_NET_SOURCE = SDL2_net-$(SDL2_NET_VERSION).tar.gz
+SDL2_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
+SDL2_NET_LICENSE = Zlib
+SDL2_NET_LICENSE_FILES = COPYING.txt
+SDL2_NET_INSTALL_STAGING = YES
+SDL2_NET_DEPENDENCIES = sdl2
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sdl2_ttf/sdl2_ttf.mk b/bsp/buildroot/package/sdl2_ttf/sdl2_ttf.mk
index 86916c34..dbe30dd5 100644
--- a/bsp/buildroot/package/sdl2_ttf/sdl2_ttf.mk
+++ b/bsp/buildroot/package/sdl2_ttf/sdl2_ttf.mk
@@ -7,7 +7,7 @@
 SDL2_TTF_VERSION = 2.0.14
 SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz
 SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release
-SDL2_TTF_LICENSE = zlib
+SDL2_TTF_LICENSE = Zlib
 SDL2_TTF_LICENSE_FILES = COPYING.txt
 SDL2_TTF_INSTALL_STAGING = YES
 SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf
diff --git a/bsp/buildroot/package/sdl_gfx/sdl_gfx.mk b/bsp/buildroot/package/sdl_gfx/sdl_gfx.mk
index 7f3a2ffe..e7420de1 100644
--- a/bsp/buildroot/package/sdl_gfx/sdl_gfx.mk
+++ b/bsp/buildroot/package/sdl_gfx/sdl_gfx.mk
@@ -8,7 +8,7 @@ SDL_GFX_VERSION_MAJOR = 2.0
 SDL_GFX_VERSION = $(SDL_GFX_VERSION_MAJOR).23
 SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz
 SDL_GFX_SITE = http://www.ferzkopp.net/Software/SDL_gfx-$(SDL_GFX_VERSION_MAJOR)
-SDL_GFX_LICENSE = zlib
+SDL_GFX_LICENSE = Zlib
 SDL_GFX_LICENSE_FILES = COPYING LICENSE
 SDL_GFX_INSTALL_STAGING = YES
 SDL_GFX_DEPENDENCIES = sdl
diff --git a/bsp/buildroot/package/sdl_image/sdl_image.mk b/bsp/buildroot/package/sdl_image/sdl_image.mk
index f88aa0e7..ee0712cc 100644
--- a/bsp/buildroot/package/sdl_image/sdl_image.mk
+++ b/bsp/buildroot/package/sdl_image/sdl_image.mk
@@ -8,7 +8,7 @@ SDL_IMAGE_VERSION = 1.2.12
 SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release
 SDL_IMAGE_INSTALL_STAGING = YES
-SDL_IMAGE_LICENSE = zlib
+SDL_IMAGE_LICENSE = Zlib
 SDL_IMAGE_LICENSE_FILES = COPYING
 
 SDL_IMAGE_CONF_OPTS = \
@@ -37,8 +37,8 @@ SDL_IMAGE_DEPENDENCIES = sdl \
 	$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp)
 
 HOST_SDL_IMAGE_CONF_OPTS = \
-	--with-sdl-prefix=$(HOST_DIR)/usr \
-	--with-sdl-exec-prefix=$(HOST_DIR)/usr \
+	--with-sdl-prefix=$(HOST_DIR) \
+	--with-sdl-exec-prefix=$(HOST_DIR) \
 	--disable-sdltest \
 	--disable-static \
 	--disable-jpg-shared \
diff --git a/bsp/buildroot/package/sdl_mixer/sdl_mixer.mk b/bsp/buildroot/package/sdl_mixer/sdl_mixer.mk
index 897b308e..1c6912ac 100644
--- a/bsp/buildroot/package/sdl_mixer/sdl_mixer.mk
+++ b/bsp/buildroot/package/sdl_mixer/sdl_mixer.mk
@@ -7,7 +7,7 @@
 SDL_MIXER_VERSION = 1.2.12
 SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz
 SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
-SDL_MIXER_LICENSE = zlib
+SDL_MIXER_LICENSE = Zlib
 SDL_MIXER_LICENSE_FILES = COPYING
 
 SDL_MIXER_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/sdl_net/Config.in b/bsp/buildroot/package/sdl_net/Config.in
index 2001d230..2d9cbe1c 100644
--- a/bsp/buildroot/package/sdl_net/Config.in
+++ b/bsp/buildroot/package/sdl_net/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_SDL_NET
 	bool "SDL_net"
 	depends on BR2_PACKAGE_SDL
 	help
-	  SDL_net is a small, low-level, cross-platform network library, that
-	  can be used with the Simple DirectMedia Layer library (SDL).
+	  SDL_net is a small, low-level, cross-platform network
+	  library, that can be used with the Simple DirectMedia Layer
+	  library (SDL).
 
 	  http://www.libsdl.org/projects/SDL_net/
diff --git a/bsp/buildroot/package/sdl_net/sdl_net.mk b/bsp/buildroot/package/sdl_net/sdl_net.mk
index 4534dee3..c7e409a1 100644
--- a/bsp/buildroot/package/sdl_net/sdl_net.mk
+++ b/bsp/buildroot/package/sdl_net/sdl_net.mk
@@ -7,7 +7,7 @@
 SDL_NET_VERSION = 1.2.8
 SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
 SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz
-SDL_NET_LICENSE = zlib
+SDL_NET_LICENSE = Zlib
 SDL_NET_LICENSE_FILES = COPYING
 
 SDL_NET_CONF_OPTS = \
diff --git a/bsp/buildroot/package/sdl_sound/0003-renamed-physfs-export.patch b/bsp/buildroot/package/sdl_sound/0003-renamed-physfs-export.patch
new file mode 100644
index 00000000..3aeded32
--- /dev/null
+++ b/bsp/buildroot/package/sdl_sound/0003-renamed-physfs-export.patch
@@ -0,0 +1,32 @@
+This patch is taken from the Arch Linux User Repository, see:
+https://aur.archlinux.org/packages/sdl_sound-patched-hg/
+
+Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
+
+diff -ru SDL_sound.orig/playsound/physfsrwops.h SDL_sound/playsound/physfsrwops.h
+--- SDL_sound.orig/playsound/physfsrwops.h	2014-01-11 06:28:35.494936000 +0100
++++ SDL_sound/playsound/physfsrwops.h	2014-01-11 06:31:38.315675483 +0100
+@@ -29,6 +29,11 @@
+ extern "C" {
+ #endif
+ 
++/* renamed in physfs dev, add alias */
++#ifdef PHYSFS_DECL
++#define __EXPORT__ PHYSFS_DECL
++#endif
++
+ /**
+  * Open a platform-independent filename for reading, and make it accessible
+  *  via an SDL_RWops structure. The file will be closed in PhysicsFS when the
+@@ -77,6 +82,11 @@
+  */
+ __EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
+ 
++/* renamed in physfs dev, remove alias */
++#ifdef PHYSFS_DECL
++#undef __EXPORT__
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/bsp/buildroot/package/sdl_sound/sdl_sound.mk b/bsp/buildroot/package/sdl_sound/sdl_sound.mk
index 4fa7d9be..2544b598 100644
--- a/bsp/buildroot/package/sdl_sound/sdl_sound.mk
+++ b/bsp/buildroot/package/sdl_sound/sdl_sound.mk
@@ -7,7 +7,7 @@
 SDL_SOUND_VERSION = 1.0.3
 SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz
 SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads
-SDL_SOUND_LICENSE = LGPLv2.1+
+SDL_SOUND_LICENSE = LGPL-2.1+
 SDL_SOUND_LICENSE_FILES = COPYING
 SDL_SOUND_INSTALL_STAGING = YES
 SDL_SOUND_DEPENDENCIES = sdl
@@ -45,6 +45,13 @@ else
 SDL_SOUND_CONF_OPTS += --disable-speex
 endif
 
+ifeq ($(BR2_PACKAGE_PHYSFS),y)
+SDL_SOUND_CONF_OPTS += --enable-physfs
+SDL_SOUND_DEPENDENCIES += physfs
+else
+SDL_SOUND_CONF_OPTS += --disable-physfs
+endif
+
 SDL_SOUND_CONF_OPTS = \
 	--with-sdl-prefix=$(STAGING_DIR)/usr \
 	--with-sdl-exec-prefix=$(STAGING_DIR)/usr \
diff --git a/bsp/buildroot/package/sdl_ttf/sdl_ttf.mk b/bsp/buildroot/package/sdl_ttf/sdl_ttf.mk
index 3e494b4c..1d94c6c5 100644
--- a/bsp/buildroot/package/sdl_ttf/sdl_ttf.mk
+++ b/bsp/buildroot/package/sdl_ttf/sdl_ttf.mk
@@ -7,7 +7,7 @@
 SDL_TTF_VERSION = 2.0.11
 SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz
 SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release
-SDL_TTF_LICENSE = zlib
+SDL_TTF_LICENSE = Zlib
 SDL_TTF_LICENSE_FILES = COPYING
 
 SDL_TTF_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/sdparm/sdparm.mk b/bsp/buildroot/package/sdparm/sdparm.mk
index ed1606c1..b9fac518 100644
--- a/bsp/buildroot/package/sdparm/sdparm.mk
+++ b/bsp/buildroot/package/sdparm/sdparm.mk
@@ -7,7 +7,7 @@
 SDPARM_VERSION = 1.10
 SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz
 SDPARM_SITE = http://sg.danny.cz/sg/p
-SDPARM_LICENSE = BSD-3c
+SDPARM_LICENSE = BSD-3-Clause
 SDPARM_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_SG3_UTILS),y)
diff --git a/bsp/buildroot/package/sed/Config.in b/bsp/buildroot/package/sed/Config.in
index 6adebf24..b8d182aa 100644
--- a/bsp/buildroot/package/sed/Config.in
+++ b/bsp/buildroot/package/sed/Config.in
@@ -3,9 +3,10 @@ config BR2_PACKAGE_SED
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  Super-useful stream editor.
+	  sed (stream editor) is a non-interactive command-line text
+	  editor.
 
-	  http://sed.sourceforge.net/
+	  https://www.gnu.org/software/sed/
 
 comment "sed needs a toolchain w/ wchar"
 	depends on !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/sed/sed.hash b/bsp/buildroot/package/sed/sed.hash
index e7f2db59..652c5736 100644
--- a/bsp/buildroot/package/sed/sed.hash
+++ b/bsp/buildroot/package/sed/sed.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff	sed-4.2.2.tar.gz
+sha256	cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b	sed-4.4.tar.xz
diff --git a/bsp/buildroot/package/sed/sed.mk b/bsp/buildroot/package/sed/sed.mk
index 71c62d0f..28df140d 100644
--- a/bsp/buildroot/package/sed/sed.mk
+++ b/bsp/buildroot/package/sed/sed.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-SED_VERSION = 4.2.2
+SED_VERSION = 4.4
+SED_SOURCE = sed-$(SED_VERSION).tar.xz
 SED_SITE = $(BR2_GNU_MIRROR)/sed
-SED_LICENSE = GPLv3
+SED_LICENSE = GPL-3.0
 SED_LICENSE_FILES = COPYING
 
 SED_CONF_OPTS = \
diff --git a/bsp/buildroot/package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch b/bsp/buildroot/package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch
new file mode 100644
index 00000000..156701a8
--- /dev/null
+++ b/bsp/buildroot/package/selinux-python/0001-python-build-follow-standard-semantics-for-DESTD.patch
@@ -0,0 +1,117 @@
+python: build: follow standard semantics for DESTDIR and PREFIX
+
+Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
+
+diff -durN python.orig/audit2allow/Makefile python/audit2allow/Makefile
+--- python.orig/audit2allow/Makefile	2017-08-04 15:31:00.000000000 +0200
++++ python/audit2allow/Makefile	2018-01-17 09:44:35.659573123 +0100
+@@ -1,19 +1,17 @@
+ PYTHON ?= python
+ 
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-BINDIR ?= $(PREFIX)/bin
+-LIBDIR ?= $(PREFIX)/lib
+-MANDIR ?= $(PREFIX)/share/man
+-LOCALEDIR ?= /usr/share/locale
+-INCLUDEDIR ?= $(PREFIX)/include
+-LIBSEPOLA ?= $(LIBDIR)/libsepol.a
++PREFIX ?= /usr
++BINDIR ?= $(DESTDIR)$(PREFIX)/bin
++LIBDIR ?= $(DESTDIR)$(PREFIX)/lib
++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
+ 
+ CFLAGS ?= -Werror -Wall -W
+ 
+ all: audit2why sepolgen-ifgen-attr-helper
+ 
+-sepolgen-ifgen-attr-helper: sepolgen-ifgen-attr-helper.o $(LIBSEPOLA)
++sepolgen-ifgen-attr-helper: sepolgen-ifgen-attr-helper.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -l:libsepol.a
+ 
+ audit2why:
+ 	ln -sf audit2allow audit2why
+diff -durN python.orig/chcat/Makefile python/chcat/Makefile
+--- python.orig/chcat/Makefile	2017-08-04 15:31:00.000000000 +0200
++++ python/chcat/Makefile	2018-01-17 09:44:35.659573123 +0100
+@@ -1,8 +1,8 @@
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-BINDIR ?= $(PREFIX)/bin
+-MANDIR ?= $(PREFIX)/share/man
+-LOCALEDIR ?= $(PREFIX)/share/locale
++PREFIX ?= /usr
++BINDIR ?= $(DESTDIR)$(PREFIX)/bin
++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
++LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale
+ 
+ .PHONY: all
+ all: chcat
+diff -durN python.orig/semanage/Makefile python/semanage/Makefile
+--- python.orig/semanage/Makefile	2017-08-04 15:31:00.000000000 +0200
++++ python/semanage/Makefile	2018-01-17 09:44:43.676239705 +0100
+@@ -1,13 +1,12 @@
+ PYTHON ?= python
+ 
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-LIBDIR ?= $(PREFIX)/lib
+-SBINDIR ?= $(PREFIX)/sbin
+-MANDIR = $(PREFIX)/share/man
+-PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(1))")
++PREFIX ?= /usr
++SBINDIR ?= $(DESTDIR)$(PREFIX)/sbin
++MANDIR = $(DESTDIR)$(PREFIX)/share/man
++PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))")
+ PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)
+-BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions
++BASHCOMPLETIONDIR ?= $(DESTDIR)$(PREFIX)/share/bash-completion/completions
+ 
+ TARGETS=semanage
+ 
+diff -durN python.orig/sepolgen/src/sepolgen/Makefile python/sepolgen/src/sepolgen/Makefile
+--- python.orig/sepolgen/src/sepolgen/Makefile	2017-08-04 15:31:00.000000000 +0200
++++ python/sepolgen/src/sepolgen/Makefile	2018-01-17 09:44:35.659573123 +0100
+@@ -1,5 +1,6 @@
++PREFIX ?= /usr
+ PYTHON ?= python
+-PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(1))")
++PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))")
+ PACKAGEDIR ?= $(DESTDIR)/$(PYTHONLIBDIR)/sepolgen
+ 
+ all:
+diff -durN python.orig/sepolicy/Makefile python/sepolicy/Makefile
+--- python.orig/sepolicy/Makefile	2017-08-04 15:31:00.000000000 +0200
++++ python/sepolicy/Makefile	2018-01-17 09:44:35.659573123 +0100
+@@ -1,14 +1,14 @@
+ PYTHON ?= python
+ 
+ # Installation directories.
+-PREFIX ?= $(DESTDIR)/usr
+-LIBDIR ?= $(PREFIX)/lib
+-BINDIR ?= $(PREFIX)/bin
+-DATADIR ?= $(PREFIX)/share
+-MANDIR ?= $(PREFIX)/share/man
+-LOCALEDIR ?= /usr/share/locale
+-BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions
+-SHAREDIR ?= $(PREFIX)/share/sandbox
++PREFIX ?= /usr
++LIBDIR ?= $(DESTDIR)$(PREFIX)/lib
++BINDIR ?= $(DESTDIR)$(PREFIX)/bin
++DATADIR ?= $(DESTDIR)$(PREFIX)/share
++MANDIR ?= $(DESTDIR)$(PREFIX)/share/man
++LOCALEDIR ?= $(DESTDIR)$(PREFIX)/share/locale
++BASHCOMPLETIONDIR ?= $(DESTDIR)$(PREFIX)/share/bash-completion/completions
++SHAREDIR ?= $(DESTDIR)$(PREFIX)/share/sandbox
+ CFLAGS ?= -Wall -Werror -Wextra -W
+ override CFLAGS += -DPACKAGE="policycoreutils" -DSHARED -shared
+ 
+@@ -30,7 +30,7 @@
+ 	@$(PYTHON) test_sepolicy.py -v
+ 
+ install:
+-	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
++	$(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
+ 	[ -d $(BINDIR) ] || mkdir -p $(BINDIR)
+ 	install -m 755 sepolicy.py $(BINDIR)/sepolicy
+ 	(cd $(BINDIR); ln -sf sepolicy sepolgen)
diff --git a/bsp/buildroot/package/selinux-python/Config.in b/bsp/buildroot/package/selinux-python/Config.in
new file mode 100644
index 00000000..b9fab9aa
--- /dev/null
+++ b/bsp/buildroot/package/selinux-python/Config.in
@@ -0,0 +1,63 @@
+menuconfig BR2_PACKAGE_SELINUX_PYTHON
+	bool "selinux-python"
+	depends on BR2_USE_MMU
+	depends on BR2_USE_WCHAR
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	help
+	  A set of SELinux tools written in python that help with
+	  managing a system with SELinux enabled. If no packages are
+	  selected nothing will actually be built.
+	  https://github.com/SELinuxProject/selinux/wiki
+
+if BR2_PACKAGE_SELINUX_PYTHON
+
+config BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW
+	bool "audit2allow"
+	depends on BR2_USE_WCHAR # sepolgen
+	depends on BR2_USE_MMU # sepolgen
+	depends on BR2_TOOLCHAIN_HAS_THREADS # sepolgen, checkpolicy
+	depends on !BR2_STATIC_LIBS # sepolgen
+	depends on BR2_TOOLCHAIN_USES_GLIBC # checkpolicy
+	depends on !BR2_arc # checkpolicy
+	select BR2_PACKAGE_CHECKPOLICY
+	select BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
+	select BR2_PACKAGE_SEMODULE_UTILS
+	help
+	  This module installs two programs:
+
+	  audit2allow - Generate SELinux policy allow/dontaudit rules
+	  from logs of denied operations.
+
+	  audit2why - translates SELinux audit messages into a
+	  description of why the access was denied (audit2allow -w)
+
+comment "audit2allow needs a glibc toolchain w/ wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_arc
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_STATIC_LIBS
+
+config BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN
+	bool "sepolgen"
+	depends on BR2_USE_WCHAR
+	depends on BR2_USE_MMU
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_SEMODULE_UTILS
+	help
+	  This package contains a Python module that allows you to
+	  generate an initial SELinux policy module template.
+
+comment "sepolgen needs a toolchain w/ wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_STATIC_LIBS
+
+endif
+
+comment "selinux-python packages needs a toolchain w/ wchar, threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+		BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/selinux-python/selinux-python.hash b/bsp/buildroot/package/selinux-python/selinux-python.hash
new file mode 100644
index 00000000..42fe575e
--- /dev/null
+++ b/bsp/buildroot/package/selinux-python/selinux-python.hash
@@ -0,0 +1,2 @@
+# https://github.com/SELinuxProject/selinux/wiki/Releases
+sha256 4217cb965ecda96c91e15ffcc2e7ddd13ecc2bf5631100f3cd072a7616f140ed selinux-python-2.7.tar.gz
diff --git a/bsp/buildroot/package/selinux-python/selinux-python.mk b/bsp/buildroot/package/selinux-python/selinux-python.mk
new file mode 100644
index 00000000..25a2d041
--- /dev/null
+++ b/bsp/buildroot/package/selinux-python/selinux-python.mk
@@ -0,0 +1,50 @@
+################################################################################
+#
+# selinux-python
+#
+################################################################################
+
+SELINUX_PYTHON_VERSION = 2.7
+SELINUX_PYTHON_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+SELINUX_PYTHON_LICENSE = GPL-2.0
+SELINUX_PYTHON_LICENSE_FILES = COPYING
+
+SELINUX_PYTHON_MAKE_OPTS += \
+	$(TARGET_CONFIGURE_OPTS) \
+	ARCH="$(BR2_ARCH)" \
+	LIBDIR="$(STAGING_DIR)/usr/lib"
+
+ifeq ($(BR2_PACKAGE_PYTHON3),y)
+SELINUX_PYTHON_DEPENDENCIES += python3
+SELINUX_PYTHON_MAKE_OPTS += \
+	PYTHONLIBDIR="usr/lib/python$(PYTHON3_VERSION_MAJOR)"
+else
+SELINUX_PYTHON_DEPENDENCIES += python
+SELINUX_PYTHON_MAKE_OPTS += \
+	PYTHONLIBDIR="usr/lib/python$(PYTHON_VERSION_MAJOR)"
+endif
+
+ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_AUDIT2ALLOW),y)
+SELINUX_PYTHON_DEPENDENCIES += checkpolicy
+SELINUX_PYTHON_MAKE_DIRS += audit2allow
+endif
+
+ifeq ($(BR2_PACKAGE_SELINUX_PYTHON_SEPOLGEN),y)
+SELINUX_PYTHON_MAKE_DIRS += sepolgen/src/sepolgen
+endif
+
+define SELINUX_PYTHON_BUILD_CMDS
+	$(foreach d,$(SELINUX_PYTHON_MAKE_DIRS),
+		$(MAKE) -C $(@D)/$(d) $(SELINUX_PYTHON_MAKE_OPTS) \
+			all
+	)
+endef
+
+define SELINUX_PYTHON_INSTALL_TARGET_CMDS
+	$(foreach d,$(SELINUX_PYTHON_MAKE_DIRS),
+		$(MAKE) -C $(@D)/$(d) $(SELINUX_PYTHON_MAKE_OPTS) \
+			DESTDIR=$(TARGET_DIR) install
+	)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/semodule-utils/Config.in b/bsp/buildroot/package/semodule-utils/Config.in
new file mode 100644
index 00000000..38e043dc
--- /dev/null
+++ b/bsp/buildroot/package/semodule-utils/Config.in
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_SEMODULE_UTILS
+	bool "semodule-utils"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libsepol
+	select BR2_PACKAGE_LIBSEPOL
+	help
+	  semodule-utils is a package that contains tools for handling
+	  selinux modules.
+
+	  The package will install the following utilities:
+	  * semodule_deps - Show the dependencies between SELinux
+	    policy packages.
+	  * semodule_expand - Expand a SELinux policy module package.
+	  * semodule_link - Link SELinux policy module packages together
+	  * semodule_package - Create a SELinux policy module package.
+
+	  https://github.com/SELinuxProject/selinux/wiki/Releases
+
+comment "semodule-utils needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/semodule-utils/semodule-utils.hash b/bsp/buildroot/package/semodule-utils/semodule-utils.hash
new file mode 100644
index 00000000..18c8217c
--- /dev/null
+++ b/bsp/buildroot/package/semodule-utils/semodule-utils.hash
@@ -0,0 +1,2 @@
+# https://github.com/SELinuxProject/selinux/wiki/Releases
+sha256 90c98b3362a43b4da2a51a9176820a56f3e615225e23e3395bc566c4490786ba semodule-utils-2.7.tar.gz
diff --git a/bsp/buildroot/package/semodule-utils/semodule-utils.mk b/bsp/buildroot/package/semodule-utils/semodule-utils.mk
new file mode 100644
index 00000000..8f07fa0a
--- /dev/null
+++ b/bsp/buildroot/package/semodule-utils/semodule-utils.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# semodule-utils
+#
+################################################################################
+
+SEMODULE_UTILS_VERSION = 2.7
+SEMODULE_UTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20170804
+SEMODULE_UTILS_LICENSE = GPL-2.0
+SEMODULE_UTILS_LICENSE_FILES = COPYING
+SEMODULE_UTILS_DEPENDENCIES = libsepol
+
+SEMODULE_UTILS_MAKE_OPTS += \
+	$(TARGET_CONFIGURE_OPTS) \
+	LIBSEPOLA=$(STAGING_DIR)/usr/lib/libsepol.a
+
+# We need to pass DESTDIR at build time because it's used by
+# semodule-utils build system to find headers and libraries.
+define SEMODULE_UTILS_BUILD_CMDS
+	$(MAKE) -C $(@D) $(SEMODULE_UTILS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all
+endef
+
+define SEMODULE_UTILS_INSTALL_TARGET_CMDS
+	$(MAKE) -C $(@D) $(SEMODULE_UTILS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/sepolgen/sepolgen.hash b/bsp/buildroot/package/sepolgen/sepolgen.hash
deleted file mode 100644
index b338a701..00000000
--- a/bsp/buildroot/package/sepolgen/sepolgen.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://github.com/SELinuxProject/selinux/wiki/Releases
-sha256 6a327b1576d914e57ad796a541a7a9bcceefb14c445355559993de0fdb8e7a60  sepolgen-2.6.tar.gz
diff --git a/bsp/buildroot/package/sepolgen/sepolgen.mk b/bsp/buildroot/package/sepolgen/sepolgen.mk
deleted file mode 100644
index 137eaed6..00000000
--- a/bsp/buildroot/package/sepolgen/sepolgen.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-################################################################################
-#
-# sepolgen
-#
-################################################################################
-
-SEPOLGEN_VERSION = 2.6
-SEPOLGEN_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014
-SEPOLGEN_LICENSE = GPLv2
-SEPOLGEN_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
-HOST_SEPOLGEN_DEPENDENCIES = host-python3
-HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \
-	PYTHONLIBDIR=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages
-else
-HOST_SEPOLGEN_DEPENDENCIES = host-python
-HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \
-	PYTHONLIBDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages
-endif
-
-define HOST_SEPOLGEN_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR)
-endef
-
-define HOST_SEPOLGEN_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) install
-endef
-
-$(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/ser2net/ser2net.hash b/bsp/buildroot/package/ser2net/ser2net.hash
index ae45e9ce..67782357 100644
--- a/bsp/buildroot/package/ser2net/ser2net.hash
+++ b/bsp/buildroot/package/ser2net/ser2net.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 3d1cef5f48df8291e57d4d7d4eac2fc809ae644a5524ffca4aebef0f4e4153dc  ser2net-3.3.tar.gz
+sha256 d846066e27c3072565990745d030357aa0c278f96b7d1d4f59023347c1db8824  ser2net-3.4.tar.gz
diff --git a/bsp/buildroot/package/ser2net/ser2net.mk b/bsp/buildroot/package/ser2net/ser2net.mk
index a786b1a2..833becc3 100644
--- a/bsp/buildroot/package/ser2net/ser2net.mk
+++ b/bsp/buildroot/package/ser2net/ser2net.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SER2NET_VERSION = 3.3
+SER2NET_VERSION = 3.4
 SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
-SER2NET_LICENSE = GPLv2+
+SER2NET_LICENSE = GPL-2.0+
 SER2NET_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/bsp/buildroot/package/setools/0001-cross-compile-fixes.patch b/bsp/buildroot/package/setools/0001-cross-compile-fixes.patch
deleted file mode 100644
index 1a4af0ce..00000000
--- a/bsp/buildroot/package/setools/0001-cross-compile-fixes.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Correct build issues to enable cross compiling.  These changes require the
-package to be auto reconfigured.
-
-These updates were not upsteamed as the 3.3.x version has stablized and they
-were only taking bug fixes.  Also the 4.0 preview has completely reworked
-the build infrastructure which will require this to be revisited.
-
-Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com>
-
-diff -urN a/configure.ac b/configure.ac
---- a/configure.ac	2013-01-16 10:36:24.000000000 -0600
-+++ b/configure.ac	2013-07-12 08:22:10.380255248 -0500
-@@ -448,8 +448,9 @@
-               sepol_srcdir="")
- if test "x${sepol_srcdir}" = "x"; then
-    sepol_srcdir=${sepol_devel_libdir}
--   AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
--      AC_MSG_ERROR([make sure libsepol-static is installed]))
-+   if test ! -f ${sepol_srcdir}/libsepol.a; then
-+      AC_MSG_ERROR([could not find precompiled libsepol.a])
-+   fi
- else
-    AC_MSG_CHECKING([for compatible sepol source tree])
-    sepol_version=${sepol_srcdir}/VERSION
-@@ -484,8 +485,9 @@
-    AC_CHECK_HEADER([sepol/policydb/policydb.h], , AC_MSG_ERROR([could not find sepol source tree]))
-    CFLAGS="${sepol_src_save_CFLAGS}"
-    CPPFLAGS="${sepol_src_save_CPPFLAGS}"
--   AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],,
--      AC_MSG_ERROR([could not find precompiled libsepol.a]))
-+   if test ! -f ${sepol_srcdir}/libsepol.a; then
-+      AC_MSG_ERROR([could not find precompiled libsepol.a])
-+   fi
-    sepol_devel_incdir="${sepol_srcdir}/../include"
- fi
- SELINUX_CFLAGS="-I${sepol_devel_incdir} -I${selinux_devel_incdir}"
-@@ -578,12 +580,13 @@
-                          [AC_LANG_SOURCE([
- #include <sepol/policydb/expand.h>
- int main () {
--  return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0);
-+  return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0);
- }])],
-                          AC_MSG_RESULT([yes]),
-                          AC_MSG_ERROR([this version of libsepol is incompatible with SETools]))
-     fi
-     sepol_new_expand_boolmap="yes"
-+    sepol_new_user_role_mapping="yes"
- else
-     sepol_new_expand_boolmap="no"
- fi
-@@ -607,7 +610,8 @@
-     exit(EXIT_FAILURE);
- }])],
-     sepol_policy_version_max=`cat conftest.data`,
--    AC_MSG_FAILURE([could not determine maximum libsepol policy version]))
-+    AC_MSG_FAILURE([could not determine maximum libsepol policy version]),
-+    sepol_policy_version_max="26")
- AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol])
- CFLAGS="${sepol_save_CFLAGS}"
- CPPFLAGS="${sepol_save_CPPFLAGS}"
-@@ -631,7 +635,7 @@
-     changequote([,])dnl
-     selinux_save_CFLAGS="${CFLAGS}"
-     CFLAGS="${SELINUX_CFLAGS} ${SELINUX_LIB_FLAG} -lselinux -lsepol ${CFLAGS}"
--    gcc ${CFLAGS} -o conftest conftest.c >&5
-+    ${CC} ${CFLAGS} -o conftest conftest.c >&5
-     selinux_policy_dir=`./conftest`
-     AC_MSG_RESULT(${selinux_policy_dir})
-     CFLAGS="${selinux_save_CFLAGS}"
-diff -urN a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c
---- a/libqpol/src/policy_define.c	2013-01-16 10:36:24.000000000 -0600
-+++ b/libqpol/src/policy_define.c	2013-07-12 08:22:10.380255248 -0500
-@@ -2135,7 +2135,7 @@
- #ifdef HAVE_SEPOL_ROLE_ATTRS
- 	if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL))
- #elif HAVE_SEPOL_USER_ROLE_MAPPING
--	if (role_set_expand(&roles, &e_roles, policydbp, NULL))
-+	if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL))
- #else
- 	if (role_set_expand(&roles, &e_roles, policydbp))
- #endif
-diff -urN a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4
---- a/m4/ac_python_devel.m4	2013-01-16 10:36:22.000000000 -0600
-+++ b/m4/ac_python_devel.m4	2013-07-12 08:22:10.380255248 -0500
-@@ -234,7 +234,7 @@
- 	AC_MSG_CHECKING([consistency of all components of python development environment])
- 	AC_LANG_PUSH([C])
- 	# save current global flags
--	LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
-+	LIBS="$ac_save_LIBS $PYTHON_EXTRA_LIBS $PYTHON_LDFLAGS"
- 	CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
- 	AC_TRY_LINK([
- 		#include <Python.h>
-diff -urN a/python/setools/Makefile.am b/python/setools/Makefile.am
---- a/python/setools/Makefile.am	2013-01-16 10:36:22.000000000 -0600
-+++ b/python/setools/Makefile.am	2013-07-12 08:22:19.200251011 -0500
-@@ -22,13 +22,13 @@
- python-build: sesearch.c seinfo.c
- 	@mkdir -p setools
- 	@cp __init__.py setools
--	LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build
-+	LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" LIBDIRS="$(PYTHON_LDFLAGS)" INCLUDES="$(PYTHON_CPPFLAGS) $(QPOL_CFLAGS) $(APOL_CFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDSHARED="$(CC) -shared" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext
- 
- install-exec-hook:
--	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
-+	$(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --prefix=$(DESTDIR)/usr`
- 
- uninstall-hook: 
--	$(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
-+	$(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --prefix=$(DESTDIR)/usr`
- 
- clean-local:
- 	$(PYTHON) setup.py clean -a 
---- a/python/setools/setup.py	2013-01-16 10:36:22.000000000 -0600
-+++ b/python/setools/setup.py	2013-09-04 09:17:48.452916991 -0500
-@@ -8,7 +8,7 @@
- try:
-     inc=os.getenv("INCLUDES").split(" ")    
-     INCLUDES=map(lambda x: x[2:], inc)
--    LIBDIRS=map(lambda x: "/".join(x.split("/")[:-1]), os.getenv("LIBS").split())
-+    LIBDIRS=map(lambda x: "/".join(x.split("/")[:-1]), os.getenv("LIBS").split()) + map(lambda x: x[2:], os.getenv("LIBDIRS").split())
- except:
-     INCLUDES=""
-     LIBDIRS=""
diff --git a/bsp/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch b/bsp/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch
new file mode 100644
index 00000000..b1446e2e
--- /dev/null
+++ b/bsp/buildroot/package/setools/0001-remove-werror-flag-from-setup.patch
@@ -0,0 +1,29 @@
+From b2fe84bfd00117d4897f1f2e8f83d3410eb188b8 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Thu, 12 Oct 2017 22:04:58 -0400
+Subject: [PATCH] remove werror flag from setup
+
+Compilers older than gcc6 will generate uninitialized variable warnings which
+will cause compiling to fail.
+
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2ca44c9..9319bf6 100644
+--- a/setup.py
++++ b/setup.py
+@@ -146,7 +146,7 @@ ext_py_mods = [Extension('setools.policyrep._qpol',
+                           'libqpol/policy_scan.c',
+                           'libqpol/xen_query.c'],
+                          include_dirs=include_dirs,
+-                         extra_compile_args=['-Werror', '-Wextra',
++                         extra_compile_args=['-Wextra',
+                                              '-Waggregate-return',
+                                              '-Wfloat-equal',
+                                              '-Wformat', '-Wformat=2',
+-- 
+2.13.6
+
diff --git a/bsp/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch b/bsp/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
new file mode 100644
index 00000000..1ef1cd69
--- /dev/null
+++ b/bsp/buildroot/package/setools/0002-Do-not-export-use-setools.InfoFlowAnalysis-and-setoo.patch
@@ -0,0 +1,142 @@
+From 2512c3ba608077db3a5e0286b976fadc8a04a5c4 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 23 Feb 2017 08:17:07 +0100
+Subject: [PATCH] Do not export/use setools.InfoFlowAnalysis and
+ setools.DomainTransitionAnalysis
+
+dta and infoflow modules require networkx which brings lot of dependencies.
+These dependencies are not necessary for setools module itself as it's
+used in policycoreutils.
+
+Therefore it's better to use setools.infoflow.InfoFlowAnalysis and
+setools.dta.DomainTransitionAnalysis and let the package containing
+sedta and seinfoflow to require python3-networkx
+
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+---
+ sedta                       | 3 ++-
+ seinfoflow                  | 3 ++-
+ setools/__init__.py         | 4 ++--
+ setoolsgui/apol/dta.py      | 2 +-
+ setoolsgui/apol/infoflow.py | 2 +-
+ tests/dta.py                | 3 ++-
+ tests/infoflow.py           | 3 ++-
+ 7 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/sedta b/sedta
+index 1c76ebb..255ad49 100755
+--- a/sedta
++++ b/sedta
+@@ -23,6 +23,7 @@ import argparse
+ import logging
+ 
+ import setools
++import setools.dta
+ 
+ 
+ def print_transition(trans):
+@@ -111,7 +112,7 @@ else:
+ 
+ try:
+     p = setools.SELinuxPolicy(args.policy)
+-    g = setools.DomainTransitionAnalysis(p, reverse=args.reverse, exclude=args.exclude)
++    g = setools.dta.DomainTransitionAnalysis(p, reverse=args.reverse, exclude=args.exclude)
+ 
+     if args.shortest_path or args.all_paths:
+         if args.shortest_path:
+diff --git a/seinfoflow b/seinfoflow
+index b287921..d53bdef 100755
+--- a/seinfoflow
++++ b/seinfoflow
+@@ -19,6 +19,7 @@
+ 
+ from __future__ import print_function
+ import setools
++import setools.infoflow
+ import argparse
+ import sys
+ import logging
+@@ -79,7 +80,7 @@ else:
+ try:
+     p = setools.SELinuxPolicy(args.policy)
+     m = setools.PermissionMap(args.map)
+-    g = setools.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude)
++    g = setools.infoflow.InfoFlowAnalysis(p, m, min_weight=args.min_weight, exclude=args.exclude)
+ 
+     if args.shortest_path or args.all_paths:
+         if args.shortest_path:
+diff --git a/setools/__init__.py b/setools/__init__.py
+index a84c846..a53c5a7 100644
+--- a/setools/__init__.py
++++ b/setools/__init__.py
+@@ -74,11 +74,11 @@ from .pcideviceconquery import PcideviceconQuery
+ from .devicetreeconquery import DevicetreeconQuery
+ 
+ # Information Flow Analysis
+-from .infoflow import InfoFlowAnalysis
++# from .infoflow import InfoFlowAnalysis
+ from .permmap import PermissionMap
+ 
+ # Domain Transition Analysis
+-from .dta import DomainTransitionAnalysis
++# from .dta import DomainTransitionAnalysis
+ 
+ # Policy difference
+ from .diff import PolicyDifference
+diff --git a/setoolsgui/apol/dta.py b/setoolsgui/apol/dta.py
+index 0aaf13f..5b1ea20 100644
+--- a/setoolsgui/apol/dta.py
++++ b/setoolsgui/apol/dta.py
+@@ -23,7 +23,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
+ from PyQt5.QtGui import QPalette, QTextCursor
+ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
+                             QTreeWidgetItem
+-from setools import DomainTransitionAnalysis
++from setools.dta import DomainTransitionAnalysis
+ 
+ from ..logtosignal import LogHandlerToSignal
+ from .analysistab import AnalysisTab
+diff --git a/setoolsgui/apol/infoflow.py b/setoolsgui/apol/infoflow.py
+index 1ae16de..fdf8f7b 100644
+--- a/setoolsgui/apol/infoflow.py
++++ b/setoolsgui/apol/infoflow.py
+@@ -25,7 +25,7 @@ from PyQt5.QtCore import pyqtSignal, Qt, QStringListModel, QThread
+ from PyQt5.QtGui import QPalette, QTextCursor
+ from PyQt5.QtWidgets import QCompleter, QHeaderView, QMessageBox, QProgressDialog, \
+                             QTreeWidgetItem
+-from setools import InfoFlowAnalysis
++from setools.infoflow import InfoFlowAnalysis
+ from setools.exception import UnmappedClass, UnmappedPermission
+ 
+ from ..logtosignal import LogHandlerToSignal
+diff --git a/tests/dta.py b/tests/dta.py
+index 32b9271..2bdd052 100644
+--- a/tests/dta.py
++++ b/tests/dta.py
+@@ -17,7 +17,8 @@
+ #
+ import unittest
+ 
+-from setools import SELinuxPolicy, DomainTransitionAnalysis
++from setools import SELinuxPolicy
++from setools.dta import DomainTransitionAnalysis
+ from setools import TERuletype as TERT
+ from setools.policyrep.exception import InvalidType
+ from setools.policyrep.typeattr import Type
+diff --git a/tests/infoflow.py b/tests/infoflow.py
+index 7751dda..a21c683 100644
+--- a/tests/infoflow.py
++++ b/tests/infoflow.py
+@@ -17,7 +17,8 @@
+ #
+ import unittest
+ 
+-from setools import SELinuxPolicy, InfoFlowAnalysis
++from setools import SELinuxPolicy
++from setools.infoflow import InfoFlowAnalysis
+ from setools import TERuletype as TERT
+ from setools.permmap import PermissionMap
+ from setools.policyrep.exception import InvalidType
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/setools/0002-move-python-check.patch b/bsp/buildroot/package/setools/0002-move-python-check.patch
deleted file mode 100644
index cef2cec9..00000000
--- a/bsp/buildroot/package/setools/0002-move-python-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Correct a build issue that occurs when python is not found
-in the path. This check should only be done if swig-python
-option is selected.
-
-Signed-off-by Clayton Shotwell <clshotwe@rockwellcollins.com>
-
---- a/configure.ac	2015-05-15 12:28:07.566060349 -0500
-+++ b/configure.ac	2015-05-28 15:07:25.357072800 -0500
-@@ -217,8 +217,6 @@
-    do_swigify=yes
- fi
- 
--AM_PATH_PYTHON(2.7)
--
- AC_ARG_ENABLE(swig-python,
-               AC_HELP_STRING([--enable-swig-python],
-                              [build SWIG interfaces for Python]),
-@@ -227,6 +225,7 @@
-    if test ${do_swigify} = no; then
-       AC_PROG_SWIG(2.0.0)
-    fi
-+   AM_PATH_PYTHON(2.7)
-    SWIG_PYTHON
-    do_swigify_python=yes
-    do_swigify=yes
diff --git a/bsp/buildroot/package/setools/0003-setools-Update-for-2015-02-02-Userspace-release.patch b/bsp/buildroot/package/setools/0003-setools-Update-for-2015-02-02-Userspace-release.patch
deleted file mode 100644
index b0842d96..00000000
--- a/bsp/buildroot/package/setools/0003-setools-Update-for-2015-02-02-Userspace-release.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-setools: Add patch to support 2.4 toolstack.
-Signed-off-by: Philip Tricca <flihp@twobit.us>
-Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-URL: https://github.com/flihp/meta-selinux/commit/e09eaef7a9acb552a4a5e1f90117154ae06b6fda
-
-Signed-off-by: Adam Duskett <Aduskett@gmail.com>
-
-diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c
-index fad6b60..231962f 100644
---- a/libqpol/src/policy_define.c
-+++ b/libqpol/src/policy_define.c
-@@ -1449,7 +1449,7 @@ int define_compute_type_helper(int which, avrule_t ** rule)
- 				return -1;
- 			}
- 			class_perm_node_init(perm);
--			perm->class = i + 1;
-+			perm->tclass = i + 1;
- 			perm->data = datum->s.value;
- 			perm->next = avrule->perms;
- 			avrule->perms = perm;
-@@ -1699,7 +1699,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule)
- 			goto out;
- 		}
- 		class_perm_node_init(cur_perms);
--		cur_perms->class = i + 1;
-+		cur_perms->tclass = i + 1;
- 		if (!perms)
- 			perms = cur_perms;
- 		if (tail)
-diff --git a/libqpol/src/policy_extend.c b/libqpol/src/policy_extend.c
-index 5325a87..1417271 100644
---- a/libqpol/src/policy_extend.c
-+++ b/libqpol/src/policy_extend.c
-@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
- 			for (class_node = rule->perms; class_node; class_node = class_node->next) {
- 				key.rule_type = rule->specified;
- 				key.source_val = key.target_val = i + 1;
--				key.class_val = class_node->class;
-+				key.class_val = class_node->tclass;
- 				key.cond = cond;
- 				if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
- 					goto err;
-@@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
- 				key.rule_type = rule->specified;
- 				key.source_val = i + 1;
- 				key.target_val = j + 1;
--				key.class_val = class_node->class;
-+				key.class_val = class_node->tclass;
- 				key.cond = cond;
- 				if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
- 					goto err;
-diff --git a/libqpol/src/syn_rule_query.c b/libqpol/src/syn_rule_query.c
-index 3e63204..d7578f1 100644
---- a/libqpol/src/syn_rule_query.c
-+++ b/libqpol/src/syn_rule_query.c
-@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter)
- 		return NULL;
- 	}
-
--	return db->class_val_to_struct[srcs->cur->class - 1];
-+	return db->class_val_to_struct[srcs->cur->tclass - 1];
- }
-
- static int syn_rule_class_state_next(qpol_iterator_t * iter)
-@@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const qpol_policy_t * policy, const qpol_syn_a
- 	}
-
- 	for (node = internal_rule->perms; node; node = node->next) {
--		for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) {
-+		for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) {
- 			if (!(node->data & (1 << i)))
- 				continue;
--			tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i));
-+			tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i));
- 			if (tmp) {
- 				tmp++; /* remove prepended space */
- 				for (cur = 0; cur < perm_list_sz; cur++)
-diff --git a/secmds/replcon.cc b/secmds/replcon.cc
-index 34f7c1a..307c39f 100644
---- a/secmds/replcon.cc
-+++ b/secmds/replcon.cc
-@@ -60,7 +60,7 @@ static struct option const longopts[] = {
- 	{NULL, 0, NULL, 0}
- };
-
--extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak));
-+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak));
-
- /**
-  * As that setools must work with older libselinux versions that may
diff --git a/bsp/buildroot/package/setools/Config.in b/bsp/buildroot/package/setools/Config.in
index 5e7f39d6..ae0c45fe 100644
--- a/bsp/buildroot/package/setools/Config.in
+++ b/bsp/buildroot/package/setools/Config.in
@@ -1,36 +1,27 @@
 config BR2_PACKAGE_SETOOLS
 	bool "setools"
-	select BR2_PACKAGE_LIBSELINUX
-	select BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_LIBXML2
-	select BR2_PACKAGE_BZIP2
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_arc # arc: libselinux not available
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux
-	# bfin: infamous _ symbol prefix issue
-	# nios2: triggers some toolchain issue "No symbol version
-	# section for versioned symbol"
-	# arc: libselinux not available
-	depends on !BR2_nios2 && !BR2_bfin && !BR2_arc
+	depends on BR2_USE_MMU
+	select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_ENUM34 if !BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS
+	select BR2_PACKAGE_LIBSELINUX
 	help
 	  SETools is an open source project designed to facilitate
 	  SELinux policy analysis. The primary tools are:
-	   * apol - analyze a SELinux policy.
-	   * seaudit - analyze audit messages from SELinux.
-	   * seaudit-report - generate highly-customized audit log
-	     reports.
-	   * sechecker - command line tool for performing modular
-	     checks on an SELinux policy.
+	   * apol - analyze a SELinux policy. (requires python-qt5)
 	   * sediff - semantic policy difference tool for SELinux.
-	   * secmds - command-line tools to analyze and search SELinux
-	     policy.
+	   * sedta - Perform domain transition analyses
+	   * sesearch - Search rules (allow, type_transition, etc.)
 
-	  https://github.com/TresysTechnology/setools3/wiki
+	  https://github.com/TresysTechnology/setools
 
 comment "setools needs a glibc toolchain w/ threads, C++, wchar, dynamic library"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
-		|| !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \
-		|| !BR2_TOOLCHAIN_USES_GLIBC
-	depends on !BR2_nios2 && !BR2_bfin && !BR2_arc
+	depends on BR2_USE_MMU && !BR2_arc
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
+		!BR2_USE_WCHAR || !BR2_TOOLCHAIN_USES_GLIBC || \
+		!BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/setools/setools.hash b/bsp/buildroot/package/setools/setools.hash
index d422e660..87292970 100644
--- a/bsp/buildroot/package/setools/setools.hash
+++ b/bsp/buildroot/package/setools/setools.hash
@@ -1,4 +1,7 @@
 # From https://github.com/TresysTechnology/setools3/wiki/Download
-md5	d68d0d4e4da0f01da0f208782ff04b91	setools-3.3.8.tar.bz2
+md5	d68d0d4e4da0f01da0f208782ff04b91	setools-4.1.1.tar.bz2
 # Locally computed
-sha256	44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999	setools-3.3.8.tar.bz2
+sha256	46a927ea2b163cbe1d35cc35da43e45853e13720c7e02d4cf75a498783c19610 setools-4.1.1.tar.gz
+sha256  2f7547e10f76a382c24c053595f38a5cc6dda9347f508f254ca490e0046a9624 COPYING
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPL
+sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL
diff --git a/bsp/buildroot/package/setools/setools.mk b/bsp/buildroot/package/setools/setools.mk
index 87a19cf5..6748c95c 100644
--- a/bsp/buildroot/package/setools/setools.mk
+++ b/bsp/buildroot/package/setools/setools.mk
@@ -4,81 +4,66 @@
 #
 ################################################################################
 
-SETOOLS_VERSION = 3.3.8
-SETOOLS_SOURCE = setools-$(SETOOLS_VERSION).tar.bz2
-SETOOLS_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/setools3/files/dists/setools-$(SETOOLS_VERSION)
-SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison host-flex
+SETOOLS_VERSION = 4.1.1
+SETOOLS_SITE = $(call github,TresysTechnology,setools,$(SETOOLS_VERSION))
+SETOOLS_DEPENDENCIES = libselinux libsepol python-setuptools host-bison host-flex host-swig
 SETOOLS_INSTALL_STAGING = YES
-SETOOLS_LICENSE = GPLv2+, LGPLv2.1+
+SETOOLS_LICENSE = GPL-2.0+, LGPL-2.1+
 SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL
-
-# configure.ac is patched by the cross compile patch,
-# so autoreconf is necessary
-SETOOLS_AUTORECONF = YES
-
-# Notes: Need "disable-selinux-check" so the configure does not check to see
-#        if host has selinux enabled.
-#        No python support as only the libraries and commandline tools are
-#        installed on target
-SETOOLS_CONF_OPTS = \
-	--disable-debug \
-	--disable-gui \
-	--disable-bwidget-check \
-	--disable-selinux-check \
-	--disable-swig-java \
-	--disable-swig-python \
-	--disable-swig-tcl \
-	--with-sepol-devel="$(STAGING_DIR)/usr" \
-	--with-selinux-devel="$(STAGING_DIR)/usr"
-
-ifeq ($(BR2_sparc64):$(BR2_STATIC_LIBS),y:)
-SETOOLS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC"
-endif
-
-HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-sqlite \
-	host-libxml2 host-bzip2 host-bison
+SETOOLS_SETUP_TYPE = setuptools
+HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol
 
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
-HOST_SETOOLS_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR)
-HOST_SETOOLS_DEPENDENCIES += host-python3
-HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON3_VERSION)
+SETOOLS_PYLIBVER = python$(PYTHON3_VERSION_MAJOR)
 else
-HOST_SETOOLS_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR)
-HOST_SETOOLS_DEPENDENCIES += host-python
-HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON_VERSION)
+SETOOLS_PYLIBVER = python$(PYTHON_VERSION_MAJOR)
+SETOOLS_DEPENDENCIES += python-enum34
 endif
 
-HOST_SETOOLS_PYTHON_SITE_PACKAGES = $(HOST_DIR)/usr/lib/python$(HOST_SETOOLS_PYTHON_VERSION)/site-packages
-HOST_SETOOLS_PYTHON_INCLUDES = $(HOST_DIR)/usr/include/python$(HOST_SETOOLS_PYTHON_VERSION)
-HOST_SETOOLS_PYTHON_LIB = -lpython$(HOST_SETOOLS_PYTHON_VERSION)
+define SETOOLS_FIX_SETUP
+	# By default, setup.py will look for libsepol.a in the host machines
+	# /usr/lib directory. This needs to be changed to the staging directory.
+	$(SED) "s@base_lib_dirs =.*@base_lib_dirs = ['$(STAGING_DIR)/usr/lib']@g" \
+		$(@D)/setup.py
+endef
+SETOOLS_POST_PATCH_HOOKS += SETOOLS_FIX_SETUP
 
-# Notes: Need "disable-selinux-check" so the configure does not check to see
-#        if host has selinux enabled.
-#        Host builds with python support to enable tools for offline target
-#        policy analysis
-HOST_SETOOLS_CONF_OPTS = \
-	--disable-debug \
-	--disable-gui \
-	--disable-bwidget-check \
-	--disable-selinux-check \
-	--disable-swig-java \
-	--disable-swig-python \
-	--disable-swig-tcl \
-	--with-sepol-devel="$(HOST_DIR)/usr" \
-	--with-selinux-devel="$(HOST_DIR)/usr" \
-	PYTHON_LDFLAGS="-L$(HOST_DIR)/usr/lib/" \
-	PYTHON_CPPFLAGS="-I$(HOST_SETOOLS_PYTHON_INCLUDES)" \
-	PYTHON_SITE_PKG="$(HOST_SETOOLS_PYTHON_SITE_PACKAGES)" \
-	PYTHON_EXTRA_LIBS="-lpthread -ldl -lutil $(HOST_SETOOLS_PYTHON_LIB)"
+define HOST_SETOOLS_FIX_SETUP
+	# By default, setup.py will look for libsepol.a in the host machines
+	# /usr/lib directory. This needs to be changed to the host directory.
+	$(SED) "s@base_lib_dirs =.*@base_lib_dirs = ['$(HOST_DIR)/lib']@g" \
+		$(@D)/setup.py
+endef
+HOST_SETOOLS_POST_PATCH_HOOKS += HOST_SETOOLS_FIX_SETUP
 
-HOST_SETOOLS_CONF_ENV += \
-	am_cv_pathless_PYTHON=python \
-	ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \
-	am_cv_python_platform=linux2 \
-	am_cv_python_version=$(HOST_SETOOLS_PYTHON_VERSION) \
-	am_cv_python_pythondir=$(HOST_SETOOLS_PYTHON_SITE_PACKAGES) \
-	am_cv_python_pyexecdir=$(HOST_SETOOLS_PYTHON_SITE_PACKAGES) \
-	am_cv_python_includes=-I$(HOST_SETOOLS_PYTHON_INCLUDES)
+# sedta and seinfoflow depend on python-networkx. This package is not
+# available in buildroot.
+define SETOOLS_REMOVE_BROKEN_SCRIPTS
+	$(RM) $(TARGET_DIR)/usr/bin/sedta
+	$(RM) $(TARGET_DIR)/usr/bin/seinfoflow
+endef
+SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_BROKEN_SCRIPTS
 
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+# apol requires pyqt5. However, the setools installation
+# process will install apol even if pyqt5 is missing.
+# Remove these scripts from the target it pyqt5 is not selected.
+ifeq ($(BR2_PACKAGE_PYTHON_PYQT5),)
+define SETOOLS_REMOVE_QT_SCRIPTS
+	$(RM) $(TARGET_DIR)/usr/bin/apol
+	$(RM) -r $(TARGET_DIR)/lib/$(SETOOLS_PYLIBVER)/site-packages/setoolsgui/
+endef
+SETOOLS_POST_INSTALL_TARGET_HOOKS += SETOOLS_REMOVE_QT_SCRIPTS
+endif
+
+# sedta and seinfoflow depend on python-networkx. This package is not
+# available in buildroot. pyqt5 is not a host-package, remove apol
+# from the host directory as well.
+define HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
+	$(RM) $(HOST_DIR)/bin/sedta
+	$(RM) $(HOST_DIR)/bin/seinfoflow
+	$(RM) $(HOST_DIR)/bin/apol
+endef
+HOST_SETOOLS_POST_INSTALL_HOOKS += HOST_SETOOLS_REMOVE_BROKEN_SCRIPTS
+
+$(eval $(python-package))
+$(eval $(host-python-package))
diff --git a/bsp/buildroot/package/setserial/setserial.mk b/bsp/buildroot/package/setserial/setserial.mk
index 561fbe98..66ca59d7 100644
--- a/bsp/buildroot/package/setserial/setserial.mk
+++ b/bsp/buildroot/package/setserial/setserial.mk
@@ -8,7 +8,7 @@ SETSERIAL_VERSION = 2.17
 SETSERIAL_PATCH = setserial_2.17-45.3.diff.gz
 SETSERIAL_SOURCE = setserial_$(SETSERIAL_VERSION).orig.tar.gz
 SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial
-SETSERIAL_LICENSE = GPLv2
+SETSERIAL_LICENSE = GPL-2.0
 SETSERIAL_LICENSE_FILES = debian/copyright
 # make all also builds setserial.cat which needs nroff
 SETSERIAL_MAKE_OPTS = setserial
diff --git a/bsp/buildroot/package/sg3_utils/sg3_utils.mk b/bsp/buildroot/package/sg3_utils/sg3_utils.mk
index e7af83a5..88827f33 100644
--- a/bsp/buildroot/package/sg3_utils/sg3_utils.mk
+++ b/bsp/buildroot/package/sg3_utils/sg3_utils.mk
@@ -7,10 +7,10 @@
 SG3_UTILS_VERSION = 1.42
 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz
 SG3_UTILS_SITE = http://sg.danny.cz/sg/p
-SG3_UTILS_LICENSE = BSD-3c
-# utils progs are GPLv2+ licenced
+SG3_UTILS_LICENSE = BSD-3-Clause (library)
+# Some utils progs are GPL-2.0+ licensed while others are BSD-3-Clause
 ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y)
-SG3_UTILS_LICENSE += GPLv2+
+SG3_UTILS_LICENSE := $(SG3_UTILS_LICENSE), GPL-2.0+ (programs), BSD-3-Clause (programs)
 endif
 SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
 
diff --git a/bsp/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch b/bsp/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch
new file mode 100644
index 00000000..32c52add
--- /dev/null
+++ b/bsp/buildroot/package/shairport-sync/0001-Sometimes-libsoxr-is-built-to-rely-on-libavutil.patch
@@ -0,0 +1,63 @@
+From 5101ab2d13e2b89ea3c1276df5fb7413634eeccd Mon Sep 17 00:00:00 2001
+From: Mike Brady <mikebrady@eircom.net>
+Date: Sat, 25 Aug 2018 13:08:37 +0100
+Subject: [PATCH] Sometimes libsoxr is built to rely on libavutil. If libavutil
+ is detected, link to it when building libsoxr. Add pgk_config support to soxr
+ selection.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The Buildroot autobuilder detected a build issue [0] when building
+shairport-sync statically:
+
+```
+arm-buildroot-linux-uclibcgnueabi/sysroot/usr//lib/libsoxr.a(soxr.c.o): In function `soxr_create':
+soxr.c:(.text+0xd4c): undefined reference to `av_get_cpu_flags'
+collect2: error: ld returned 1 exit status
+```
+
+A quick look at the soxr source code shows that `soxr_create()` might use
+`av_get_cpu_flags()` depending on the architecture.
+
+For the sake of simplicity link with `-lavutil` if it is found when using soxr.
+
+Even better, as soxr provides a pkg-config file, this should be prefered.
+
+[0] http://autobuild.buildroot.org/results/53d/53d21686780aa2485745b59e812b6280dd39f1c5
+
+Upstream status: 5101ab2d13e2b89ea3c1276df5fb7413634eeccd
+
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ configure.ac | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c917a4..2b6fddb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,7 +176,20 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl, --with-ssl=mbedtls or --with-ssl=p
+ # Look for soxr flag
+ AC_ARG_WITH(soxr, [  --with-soxr = choose libsoxr for high-quality interpolation], [
+   AC_MSG_RESULT(>>Including support for soxr-based interpolation)
+-  AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))], )
++  if  test "x${with_pkg_config}" = xyes ; then
++    PKG_CHECK_MODULES(
++        [SOXR], [soxr],
++        [LIBS="${SOXR_LIBS} ${LIBS}"])
++  else
++    AC_CHECK_LIB([avutil],[av_get_cpu_flags])
++    if  test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then
++      # soxr may link against libavutil, depending on the architecture, but for the sake of simplicity link with it if it is found
++      AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!), [-lavutil])
++    else
++      AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))
++    fi
++  fi
++], )
+ 
+ # Look for metadata flag -- set flag for conditional compilation
+ AC_ARG_WITH(metadata, [  --with-metadata = include support for a metadata feed], [
+-- 
+2.18.0
diff --git a/bsp/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch b/bsp/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch
new file mode 100644
index 00000000..66ce961a
--- /dev/null
+++ b/bsp/buildroot/package/shairport-sync/0002-Include-a-definition-of-HAVE_LIBSOXR-with-using-pkg_config.patch
@@ -0,0 +1,35 @@
+From cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9 Mon Sep 17 00:00:00 2001
+From: Mike Brady <mikebrady@eircom.net>
+Date: Sat, 8 Sep 2018 15:06:18 +0100
+Subject: [PATCH] Include a definition of HAVE_LIBSOXR with using pkg_config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit e047dee241fe0660d92311a124757065c6c4c93d adds an upstream patch
+to fix a build issue with soxr.  The patch also adds detecting soxr
+using pkg-config. Upstream detected a config issue [1], where the
+resulting binary lacks soxr support, although libsoxr was correctly
+detected.
+
+Backported from: cd6a99a7cfde1c5e1c1cc74ee6a77041bb4012d9
+
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index ceec4af..690a774 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,6 +180,7 @@ AC_ARG_WITH(soxr, [  --with-soxr = choose libsoxr for high-quality interpolation
+     PKG_CHECK_MODULES(
+         [SOXR], [soxr],
+         [LIBS="${SOXR_LIBS} ${LIBS}"])
++    AC_DEFINE([HAVE_LIBSOXR],[1],[Define to 1 if you are including support for soxr interpolation])
+   else
+     AC_CHECK_LIB([avutil],[av_get_cpu_flags])
+     if  test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then
+-- 
+2.18.0
diff --git a/bsp/buildroot/package/shairport-sync/Config.in b/bsp/buildroot/package/shairport-sync/Config.in
index c558a64c..5df4c194 100644
--- a/bsp/buildroot/package/shairport-sync/Config.in
+++ b/bsp/buildroot/package/shairport-sync/Config.in
@@ -2,18 +2,20 @@ config BR2_PACKAGE_SHAIRPORT_SYNC
 	bool "shairport-sync"
 	depends on BR2_USE_MMU # libdaemon
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_ALSA_LIB_MIXER
 	select BR2_PACKAGE_LIBCONFIG
 	select BR2_PACKAGE_LIBDAEMON
-	select BR2_PACKAGE_POLARSSL if !BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS
 	select BR2_PACKAGE_POPT
 	help
-	  Shairport Sync emulates an AirPort Express for the purpose of
-	  streaming audio from iTunes, iPods, iPhones, iPads and AppleTVs.
-	  Audio played by a Shairport Sync-powered device stays in synchrony
-	  with the source and thus with other devices that are playing the same
-	  source synchronously. Thus, for example, synchronised multi-room
+	  Shairport Sync emulates an AirPort Express for the purpose
+	  of streaming audio from iTunes, iPods, iPhones, iPads and
+	  AppleTVs.  Audio played by a Shairport Sync-powered device
+	  stays in synchrony with the source and thus with other
+	  devices that are playing the same source
+	  synchronously. Thus, for example, synchronised multi-room
 	  audio is possible without difficulty.
 
 	  https://github.com/mikebrady/shairport-sync
@@ -26,14 +28,14 @@ config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR
 	help
 	  Enable support for libsoxr, the SoX Resampler library.
 
-	  Briefly, Shairport Sync keeps in step with the audio source by
-	  deleting or inserting frames of audio into the stream as needed. This
-	  "interpolation" is normally inaudible, but it can be heard in some
-	  circumstances. Libsoxr allows this interpolation to be done much more
-	  smoothly and subtly.
+	  Briefly, Shairport Sync keeps in step with the audio source
+	  by deleting or inserting frames of audio into the stream as
+	  needed. This "interpolation" is normally inaudible, but it
+	  can be heard in some circumstances. Libsoxr allows this
+	  interpolation to be done much more smoothly and subtly.
 
 endif
 
-comment "shairport-sync needs a toolchain w/ NPTL"
+comment "shairport-sync needs a toolchain w/ C++, NPTL"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/bsp/buildroot/package/shairport-sync/shairport-sync.hash b/bsp/buildroot/package/shairport-sync/shairport-sync.hash
index 45bce101..e0eea4c4 100644
--- a/bsp/buildroot/package/shairport-sync/shairport-sync.hash
+++ b/bsp/buildroot/package/shairport-sync/shairport-sync.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  2e73416ac8fdda1657034afaa143f1710852ebed06e0aa43dafc2b7dc5eb653d  shairport-sync-2.8.6.tar.gz
+sha256  90555f1a5e05bd777741147d5c0104543d0f26d4f95b9bfd44143c818a6f50f1  shairport-sync-3.1.6.tar.gz
diff --git a/bsp/buildroot/package/shairport-sync/shairport-sync.mk b/bsp/buildroot/package/shairport-sync/shairport-sync.mk
index 00d6a695..53ebcc58 100644
--- a/bsp/buildroot/package/shairport-sync/shairport-sync.mk
+++ b/bsp/buildroot/package/shairport-sync/shairport-sync.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-SHAIRPORT_SYNC_VERSION = 2.8.6
+SHAIRPORT_SYNC_VERSION = 3.1.6
 SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION))
 
-SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c
+SHAIRPORT_SYNC_LICENSE = MIT, BSD-3-Clause
 SHAIRPORT_SYNC_LICENSE_FILES = LICENSES
 SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf
 
@@ -19,6 +19,8 @@ SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \
 	--with-pipe \
 	--with-stdout
 
+SHAIRPORT_SYNC_CONF_ENV += LIBS="$(SHAIRPORT_SYNC_CONF_LIBS)"
+
 # Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns).
 # Avahi support needs libavahi-client, which is built by avahi if avahi-daemon
 # and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config
@@ -31,13 +33,17 @@ else
 SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns
 endif
 
-# OpenSSL or PolarSSL
+# OpenSSL or mbedTLS
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SHAIRPORT_SYNC_DEPENDENCIES += openssl
 SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=openssl
 else
-SHAIRPORT_SYNC_DEPENDENCIES += polarssl
-SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=polarssl
+SHAIRPORT_SYNC_DEPENDENCIES += mbedtls
+SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=mbedtls
+SHAIRPORT_SYNC_CONF_LIBS += -lmbedx509 -lmbedcrypto
+ifeq ($(BR2_PACKAGE_MBEDTLS_COMPRESSION),y)
+SHAIRPORT_SYNC_CONF_LIBS += -lz
+endif
 endif
 
 ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y)
diff --git a/bsp/buildroot/package/shapelib/Config.in b/bsp/buildroot/package/shapelib/Config.in
index aa2297b2..553d3483 100644
--- a/bsp/buildroot/package/shapelib/Config.in
+++ b/bsp/buildroot/package/shapelib/Config.in
@@ -1,5 +1,8 @@
 config BR2_PACKAGE_SHAPELIB
 	bool "shapelib"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_PROJ
 	help
 	  The Shapefile C Library provides the ability to write simple
 	  C programs for reading, writing and updating (to a limited
@@ -7,3 +10,6 @@ config BR2_PACKAGE_SHAPELIB
 	  (.dbf).
 
 	  http://shapelib.maptools.org/
+
+comment "shapelib needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/shapelib/shapelib.hash b/bsp/buildroot/package/shapelib/shapelib.hash
index f3f812eb..6abddb2a 100644
--- a/bsp/buildroot/package/shapelib/shapelib.hash
+++ b/bsp/buildroot/package/shapelib/shapelib.hash
@@ -1,2 +1,4 @@
 # Locally computed
-sha256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f  shapelib-1.3.0.tar.gz
+sha256 a4c94817365761a3a4c21bb3ca1c680a6bdfd3edd61df9fdd291d3e7645923b3  shapelib-1.4.1.tar.gz
+sha256 7eb803a70990017a1c4e38a8342d7413c5dfeec3ed1ac407e15ae2c274e560ff  COPYING
+sha256 a638278f7f1cb7d0cdc73b47a6c87261b882e356a8e79922e90d44d7ef1dd2c7  web/license.html
diff --git a/bsp/buildroot/package/shapelib/shapelib.mk b/bsp/buildroot/package/shapelib/shapelib.mk
index 2e8fe6d7..b76c3bb2 100644
--- a/bsp/buildroot/package/shapelib/shapelib.mk
+++ b/bsp/buildroot/package/shapelib/shapelib.mk
@@ -4,22 +4,11 @@
 #
 ################################################################################
 
-SHAPELIB_VERSION = 1.3.0
+SHAPELIB_VERSION = 1.4.1
 SHAPELIB_SITE = http://download.osgeo.org/shapelib
-SHAPELIB_LICENSE = MIT or LGPLv2
-SHAPELIB_LICENSE_FILES = web/license.html LICENSE.LGPL
+SHAPELIB_LICENSE = MIT or LGPL-2.0
+SHAPELIB_LICENSE_FILES = web/license.html COPYING
 SHAPELIB_INSTALL_STAGING = YES
+SHAPELIB_DEPENDENCIES = proj
 
-define SHAPELIB_BUILD_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
-endef
-
-define SHAPELIB_INSTALL_STAGING_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install
-endef
-
-define SHAPELIB_INSTALL_TARGET_CMDS
-	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install
-endef
-
-$(eval $(generic-package))
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/shared-mime-info/shared-mime-info.mk b/bsp/buildroot/package/shared-mime-info/shared-mime-info.mk
index 64bb4d51..e68d631a 100644
--- a/bsp/buildroot/package/shared-mime-info/shared-mime-info.mk
+++ b/bsp/buildroot/package/shared-mime-info/shared-mime-info.mk
@@ -8,7 +8,9 @@ SHARED_MIME_INFO_VERSION = 1.8
 SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz
 SHARED_MIME_INFO_SITE = https://people.freedesktop.org/~hadess
 SHARED_MIME_INFO_INSTALL_STAGING = YES
-SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint
+# 0001-Remove-incorrect-dependency-from-install-data-hook.patch
+SHARED_MIME_INFO_AUTORECONF = YES
+SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/bin/xmllint
 SHARED_MIME_INFO_DEPENDENCIES = host-shared-mime-info libxml2 libglib2
 SHARED_MIME_INFO_CONF_OPTS = \
 	--disable-update-mimedb \
@@ -16,7 +18,7 @@ SHARED_MIME_INFO_CONF_OPTS = \
 HOST_SHARED_MIME_INFO_CONF_OPTS = \
 	--disable-update-mimedb \
 	--disable-default-make-check
-SHARED_MIME_INFO_LICENSE = GPLv2
+SHARED_MIME_INFO_LICENSE = GPL-2.0
 SHARED_MIME_INFO_LICENSE_FILES = COPYING
 
 HOST_SHARED_MIME_INFO_DEPENDENCIES = \
@@ -31,4 +33,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # shared-mime-info for the host
-SHARED_MIME_INFO_HOST_BINARY = $(HOST_DIR)/usr/bin/update-mime-database
+SHARED_MIME_INFO_HOST_BINARY = $(HOST_DIR)/bin/update-mime-database
diff --git a/bsp/buildroot/package/shellinabox/shellinabox.mk b/bsp/buildroot/package/shellinabox/shellinabox.mk
index 1173ef7d..1db62e60 100644
--- a/bsp/buildroot/package/shellinabox/shellinabox.mk
+++ b/bsp/buildroot/package/shellinabox/shellinabox.mk
@@ -6,7 +6,7 @@
 
 SHELLINABOX_VERSION = v2.19
 SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,$(SHELLINABOX_VERSION))
-SHELLINABOX_LICENSE = GPLv2 with OpenSSL exception
+SHELLINABOX_LICENSE = GPL-2.0 with OpenSSL exception
 SHELLINABOX_LICENSE_FILES = COPYING GPL-2
 
 # Fetching from Github, and patching Makefile.am, so we need to autoreconf
diff --git a/bsp/buildroot/package/sigrok-cli/Config.in b/bsp/buildroot/package/sigrok-cli/Config.in
index b8eb60d1..75bd8c6d 100644
--- a/bsp/buildroot/package/sigrok-cli/Config.in
+++ b/bsp/buildroot/package/sigrok-cli/Config.in
@@ -1,18 +1,21 @@
 config BR2_PACKAGE_SIGROK_CLI
 	bool "sigrok-cli"
-	select BR2_PACKAGE_LIBSIGROK
 	# libsigrok->libglib2:
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
+	# libsigrok->libzip
+	depends on !BR2_STATIC_LIBS
 	# libsigrok
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	select BR2_PACKAGE_LIBSIGROK
 	help
 	  Sigrok-cli is a command-line frontend for the sigrok
 	  software suite.
 
 	  http://sigrok.org/wiki/Sigrok-cli
 
-comment "sigrok-cli needs a toolchain w/ wchar, threads, gcc >= 4.7"
+comment "sigrok-cli needs a toolchain w/ wchar, threads, dynamic library, gcc >= 4.7"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/sigrok-cli/sigrok-cli.hash b/bsp/buildroot/package/sigrok-cli/sigrok-cli.hash
index b60b57e7..42bbdc18 100644
--- a/bsp/buildroot/package/sigrok-cli/sigrok-cli.hash
+++ b/bsp/buildroot/package/sigrok-cli/sigrok-cli.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256	ab2ede4e245f3987e19a89a530bd204e0d792c07474d9fed3345d4af4e84723c	sigrok-cli-0.6.0.tar.gz
+sha256	5669d968c2de3dfc6adfda76e83789b6ba76368407c832438cef5e7099a65e1c	sigrok-cli-0.7.0.tar.gz
diff --git a/bsp/buildroot/package/sigrok-cli/sigrok-cli.mk b/bsp/buildroot/package/sigrok-cli/sigrok-cli.mk
index ec5c8bd8..1e017d69 100644
--- a/bsp/buildroot/package/sigrok-cli/sigrok-cli.mk
+++ b/bsp/buildroot/package/sigrok-cli/sigrok-cli.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SIGROK_CLI_VERSION = 0.6.0
+SIGROK_CLI_VERSION = 0.7.0
 SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli
-SIGROK_CLI_LICENSE = GPLv3+
+SIGROK_CLI_LICENSE = GPL-3.0+
 SIGROK_CLI_LICENSE_FILES = COPYING
 SIGROK_CLI_DEPENDENCIES = host-pkgconf libsigrok
 
diff --git a/bsp/buildroot/package/simicsfs/Config.in b/bsp/buildroot/package/simicsfs/Config.in
deleted file mode 100644
index 12b05c17..00000000
--- a/bsp/buildroot/package/simicsfs/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@
-comment "simicsfs needs a Linux kernel to be built"
-	depends on !BR2_LINUX_KERNEL
-
-config BR2_PACKAGE_SIMICSFS
-	bool "simicsfs"
-	depends on BR2_LINUX_KERNEL
-	help
-	  A kernel driver that provides access to a host computer's local
-	  filesystem when the target is executing within a SIMICS simulation.
-
-	  http://www.cs.sfu.ca/~fedorova/Tech/simics-guides-3.0.26/simics-user-guide-unix/topic33.html
diff --git a/bsp/buildroot/package/simicsfs/simicsfs.hash b/bsp/buildroot/package/simicsfs/simicsfs.hash
deleted file mode 100644
index 42ada910..00000000
--- a/bsp/buildroot/package/simicsfs/simicsfs.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally calculated
-sha256	d0cf7caf888dc1e7dc9496c4b59af98eb2b69d6113d6920757465902e1f21f38	simicsfs-1.18.tar.gz
diff --git a/bsp/buildroot/package/simicsfs/simicsfs.mk b/bsp/buildroot/package/simicsfs/simicsfs.mk
deleted file mode 100644
index 91ed4138..00000000
--- a/bsp/buildroot/package/simicsfs/simicsfs.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# simicsfs
-#
-################################################################################
-
-SIMICSFS_VERSION = 1.18
-SIMICSFS_SITE = http://download.simics.net/pub
-SIMICSFS_LICENSE = GPLv2+
-SIMICSFS_LICENSE_FILES = hostfs.h
-
-$(eval $(kernel-module))
-$(eval $(generic-package))
diff --git a/bsp/buildroot/package/sispmctl/Config.in b/bsp/buildroot/package/sispmctl/Config.in
index 976b08f8..6066dc05 100644
--- a/bsp/buildroot/package/sispmctl/Config.in
+++ b/bsp/buildroot/package/sispmctl/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_SISPMCTL
 	bool "sispmctl"
-	select BR2_PACKAGE_LIBUSB
-	select BR2_PACKAGE_LIBUSB_COMPAT
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBUSB
+	select BR2_PACKAGE_LIBUSB_COMPAT
 	help
 	  sispmctl is an application enabling the use of the GEMBIRD
 	  SiS-PM and mSiS(sispm) USB-controlled power-outlet device
diff --git a/bsp/buildroot/package/sispmctl/sispmctl.mk b/bsp/buildroot/package/sispmctl/sispmctl.mk
index 3f3635e1..85c03382 100644
--- a/bsp/buildroot/package/sispmctl/sispmctl.mk
+++ b/bsp/buildroot/package/sispmctl/sispmctl.mk
@@ -6,7 +6,7 @@
 
 SISPMCTL_VERSION = 3.1
 SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION)
-SISPMCTL_LICENSE = GPLv2+
+SISPMCTL_LICENSE = GPL-2.0+
 SISPMCTL_LICENSE_FILES = LICENCE
 SISPMCTL_DEPENDENCIES = libusb-compat
 
diff --git a/bsp/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch b/bsp/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch
index 5f763c42..eb70b4ed 100644
--- a/bsp/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch
+++ b/bsp/buildroot/package/skalibs/0001-No-runtime-tests-for-endianness.patch
@@ -1,6 +1,6 @@
-From 6754b208e7ec3bd1d4265db18fa4c0e7961a77bf Mon Sep 17 00:00:00 2001
+From d3920dce139734e00bbe4447a16ef24dfe4d704a Mon Sep 17 00:00:00 2001
 From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Mon, 20 Mar 2017 20:05:00 +0100
+Date: Tue, 10 Oct 2017 19:51:02 +0200
 Subject: [PATCH] No runtime tests for endianness
 
 Replace build and execution of runtime test programs for determining
@@ -10,29 +10,27 @@ This improves support for cross-compilation.
 
 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
 ---
- configure                     | 15 +++++++++++----
+ configure                     | 13 ++++++++++---
  src/sysdeps/trybigendian.c    | 16 ++++++++++++++++
  src/sysdeps/trylittleendian.c | 19 +++++++++++++++++++
- 3 files changed, 46 insertions(+), 4 deletions(-)
+ 3 files changed, 45 insertions(+), 3 deletions(-)
  create mode 100644 src/sysdeps/trybigendian.c
  create mode 100644 src/sysdeps/trylittleendian.c
 
 diff --git a/configure b/configure
-index 1579025..4da9c5e 100755
+index f34dcd0..f2a77f3 100755
 --- a/configure
 +++ b/configure
-@@ -463,13 +463,20 @@ EOF
-   fi
+@@ -478,12 +478,19 @@ EOF
    exec 3>&-
  
--  echo "Checking system endianness..."
--  $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o tryendianness src/sysdeps/tryendianness.c
+   echo "Checking system endianness..."
+-  $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o tryendianness src/sysdeps/tryendianness.c
 -  endianness=$(./tryendianness) || fail "$0: unable to determine endianness"
-+    echo "Checking system endianness..."
-+  if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o trybigendian src/sysdeps/trybigendian.c 2>/dev/null; then
++  if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trybigendian src/sysdeps/trybigendian.c 2>/dev/null; then
 +      endianness=big
 +  else
-+      if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o trylittleendian src/sysdeps/trylittleendian.c 2>/dev/null; then
++      if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trylittleendian src/sysdeps/trylittleendian.c 2>/dev/null; then
 +          endianness=little
 +      else
 +          fail "$0: unable to determine endianness"
@@ -44,8 +42,8 @@ index 1579025..4da9c5e 100755
 -  rm -f tryendianness
 +  rm -f trybigendian trylittleendian
  
-   trytypesize ushort USHORT "unsigned short"
-   trytypesize uint UINT "unsigned int"
+   trytypes
+   choose clr accept4 ACCEPT4 'accept4()'
 diff --git a/src/sysdeps/trybigendian.c b/src/sysdeps/trybigendian.c
 new file mode 100644
 index 0000000..d857572
@@ -94,5 +92,5 @@ index 0000000..68b93c1
 +	return 0;
 +}
 -- 
-2.1.4
+2.13.6
 
diff --git a/bsp/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch b/bsp/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch
index 3f16171e..3ee0cddb 100644
--- a/bsp/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch
+++ b/bsp/buildroot/package/skalibs/0002-No-runtime-tests-for-type-sizes.patch
@@ -1,6 +1,6 @@
-From d868600a3f437750bc44a783d677a25a48100096 Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Sun, 4 Dec 2016 19:11:25 +0100
+From df3a3e708653ca1cdb0eda77bbda5cb8de177571 Mon Sep 17 00:00:00 2001
+From: "Van Bemten, Lionel (Nokia - BE/Antwerp)" <lionel.van_bemten@nokia.com>
+Date: Tue, 10 Oct 2017 19:51:18 +0200
 Subject: [PATCH] No runtime tests for type sizes
 
 Replace build and execution of runtime test programs for determining
@@ -8,47 +8,102 @@ some type sizes of the target with compile time test programs.
 
 This improves support for cross-compilation.
 
+Signed-off-by: "Van Bemten, Lionel (Nokia - BE/Antwerp)" <lionel.van_bemten@nokia.com>
 Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
 ---
- configure | 24 +++++++++++++++++++++---
- 1 file changed, 21 insertions(+), 3 deletions(-)
+ configure | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 61 insertions(+), 16 deletions(-)
 
 diff --git a/configure b/configure
-index 4da9c5e..b5926ca 100755
+index f2a77f3..8348b1f 100755
 --- a/configure
 +++ b/configure
-@@ -157,10 +157,28 @@ choose () {
+@@ -154,25 +154,70 @@ choose () {
+   fi
+ }
  
- trytypesize () {
-   echo "Checking size of $3..."
--  $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o trysizeof$1 src/sysdeps/trysizeof$1.c
--  type_size=$(./trysizeof$1) || fail "$0: unable to determine size of $3"
++findtypesize () {
++  typ=$1
++  abbr=$2
 +  r=false
 +  type_size=0
 +  while true; do
-+    cat<<EOF>trysizeof$1.c
++    cat>trysizeof${abbr}.c<<EOF
 +#include <sys/types.h>
 +
 +int main(void)
 +{
-+  static int v = 1 / !!((sizeof($3) == $type_size));
++  static int v = 1 / !!((sizeof($typ) == $type_size));
 +  return 0;
 +}
 +EOF
-+    if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o trysizeof$1 trysizeof$1.c 2>/dev/null; then
++    if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trysizeof${abbr} trysizeof${abbr}.c 2>/dev/null; then
 +        r=true
 +        break
 +    fi
 +    type_size=$(expr $type_size + 1)
 +    test $type_size -le 16 || break
 +  done
-+  test $r = true || fail "$0: unable to determine size of $3"
-   type_bits=$(expr 8 \* $type_size)
--  rm -f trysizeof$1
-+  rm -f trysizeof$1 trysizeof$1.c
-   echo "sizeof$1: $type_size" >> $sysdeps/sysdeps
-   echo "#define ${package_macro_name}_SIZEOF$2 $type_size" >> $sysdeps/sysdeps.h
-   echo "#define ${package_macro_name}_$2_BITS $type_bits" >> $sysdeps/sysdeps.h
++  rm -f trysizeof${abbr} trysizeof${abbr}.c
++  test $r = true || fail "$0: unable to determine size of $typ"
++  caps=$(echo "sizeof${abbr}" | tr a-z A-Z)
++  echo "#define ${package_macro_name}_${caps} $type_size" >> $sysdeps/sysdeps.h
++  echo "sizeof${abbr}: $type_size" >> $sysdeps/sysdeps
++}
++
++findtypesign () {
++  typ=$1
++  abbr=$2
++  caps=$(echo "signed${abbr}" | tr a-z A-Z)
++  cat>trysignof${abbr}.c<<EOF
++#include <sys/types.h>
++
++int main(void)
++{
++  static int v = 1 / !!(((($typ) -1) < 0));
++  return 0;
++}
++EOF
++  if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o trysignof${abbr} trysignof${abbr}.c 2>/dev/null; then
++    echo "#define ${package_macro_name}_HASSIGNED${caps}" >> $sysdeps/sysdeps.h
++    echo "#undef ${package_macro_name}_HASUNSIGNED${caps}" >> $sysdeps/sysdeps.h
++    echo "signed${abbr}: yes" >> $sysdeps/sysdeps
++  else
++    echo "#undef ${package_macro_name}_HASSIGNED${caps}" >> $sysdeps/sysdeps.h
++    echo "#define ${package_macro_name}_HASUNSIGNED${caps}" >> $sysdeps/sysdeps.h
++    echo "signed${abbr}: no" >> $sysdeps/sysdeps
++  fi
++  rm -f trysignof${abbr} trysignof${abbr}.c
++}
++
+ trytypes () {
+   echo "Checking size and signedness of standard types..."
+-  $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o output-types src/sysdeps/output-types.c
+-  ./output-types >> $sysdeps/sysdeps
+-  ./output-types | grep -F sizeof | while read key value ; do
+-    caps=$(echo $key | sed s/:\$// | tr a-z A-Z)
+-    echo "#define ${package_macro_name}_${caps} $value" >> $sysdeps/sysdeps.h
++  for t in "unsigned short" "unsigned int" "unsigned long"; do
++    abbr=$(echo "$t" | sed -e 's/nsigned //')
++    findtypesize "$t" "${abbr}"
+   done
+-  ./output-types | grep -F signed | while read key value ; do
+-    caps=$(echo $key | sed s/:\$// | tr a-z A-Z)
+-    if test $value = yes ; then
+-      echo "#define ${package_macro_name}_HASSIGNED${caps}"
+-      echo "#undef ${package_macro_name}_HASUNSIGNED${caps}"
+-    else
+-      echo "#undef ${package_macro_name}_HASSIGNED${caps}"
+-      echo "#define ${package_macro_name}_HASUNSIGNED${caps}"
+-    fi >> $sysdeps/sysdeps.h
++  for t in size uid gid pid time dev ino; do
++    findtypesize "${t}_t" "$t"
++    findtypesign "${t}_t" "$t"
+   done
+-  rm -f output-types
+   echo "  ... done"
+ }
+ 
 -- 
-2.5.5
+2.13.6
 
diff --git a/bsp/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch b/bsp/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch
index ef0e173b..08411793 100644
--- a/bsp/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch
+++ b/bsp/buildroot/package/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch
@@ -1,6 +1,6 @@
-From da293110f429e1206728c1551cf0f6b462b3d8c0 Mon Sep 17 00:00:00 2001
+From 02ef4599179ead87cc6d154a32acaa6627cbfca2 Mon Sep 17 00:00:00 2001
 From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Thu, 29 Dec 2016 19:36:24 +0100
+Date: Tue, 10 Oct 2017 19:51:34 +0200
 Subject: [PATCH] Make linker use dummy file when testing libs
 
 For some architectures, like Xtensa or HPPA, ld from binutils requires
@@ -18,19 +18,19 @@ Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 1579025..12980fb 100755
+index 8348b1f..62e5981 100755
 --- a/configure
 +++ b/configure
-@@ -173,7 +173,7 @@ trylibs () {
+@@ -227,7 +227,7 @@ trylibs () {
    echo "Checking whether system has $2..." >&3
    shift 2
-   if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -c -o try$name.o src/sysdeps/try$name.c 2>/dev/null ; then
--    until $CC_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o /dev/null try$name.o $args 2>/dev/null ; do
-+    until $CC_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o try$name try$name.o $args 2>/dev/null ; do
+   if $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -c -o try$name.o src/sysdeps/try$name.c 2>/dev/null ; then
+-    until $CC_AUTO $CFLAGS_AUTO $CFLAGS $CFLAGS_POST $LDFLAGS_AUTO $LDFLAGS $LDFLAGS_POST -o /dev/null try$name.o $args 2>/dev/null ; do
++    until $CC_AUTO $CPPFLAGS_AUTO $CPPFLAGS $CPPFLAGS_POST $CFLAGS_AUTO $CFLAGS $CFLAGS_POST -o try$name try$name.o $args 2>/dev/null ; do
        if test -z "$*" ; then
          rm -f try$name.o
          echo
-@@ -189,7 +189,7 @@ trylibs () {
+@@ -243,7 +243,7 @@ trylibs () {
      else
        echo "  ... yes, with$args" >&3
      fi
@@ -40,5 +40,5 @@ index 1579025..12980fb 100755
    else
      echo
 -- 
-2.4.11
+2.13.6
 
diff --git a/bsp/buildroot/package/skalibs/skalibs.hash b/bsp/buildroot/package/skalibs/skalibs.hash
index 195ac479..a65aaadb 100644
--- a/bsp/buildroot/package/skalibs/skalibs.hash
+++ b/bsp/buildroot/package/skalibs/skalibs.hash
@@ -1,2 +1,3 @@
 # Locally generated
-sha256 0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8 skalibs-2.4.0.2.tar.gz
+sha256 8508ca00d4e2355e9ec0ec7f4808e98b349999d6732d2f123ac53b4df5260c81  skalibs-2.6.3.1.tar.gz
+sha256 3eadcf980c40da0f257b8292d805ff41e5e5a908c1942315d9a627732e1aa012  COPYING
diff --git a/bsp/buildroot/package/skalibs/skalibs.mk b/bsp/buildroot/package/skalibs/skalibs.mk
index 55b8a293..2ce0c33f 100644
--- a/bsp/buildroot/package/skalibs/skalibs.mk
+++ b/bsp/buildroot/package/skalibs/skalibs.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SKALIBS_VERSION = 2.4.0.2
+SKALIBS_VERSION = 2.6.3.1
 SKALIBS_SITE = http://skarnet.org/software/skalibs
 SKALIBS_LICENSE = ISC
 SKALIBS_LICENSE_FILES = COPYING
@@ -33,7 +33,7 @@ define SKALIBS_INSTALL_STAGING_CMDS
 endef
 
 HOST_SKALIBS_CONF_OPTS = \
-	--prefix=$(HOST_DIR)/usr \
+	--prefix=$(HOST_DIR) \
 	--disable-static \
 	--enable-shared \
 	--disable-allstatic
diff --git a/bsp/buildroot/package/skeleton-custom/Config.in b/bsp/buildroot/package/skeleton-custom/Config.in
new file mode 100644
index 00000000..601c3b24
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-custom/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_SKELETON_CUSTOM
+	bool
+	select BR2_PACKAGE_HAS_SKELETON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+	default "skeleton-custom" if BR2_PACKAGE_SKELETON_CUSTOM
diff --git a/bsp/buildroot/package/skeleton-custom/skeleton-custom.mk b/bsp/buildroot/package/skeleton-custom/skeleton-custom.mk
new file mode 100644
index 00000000..8c575317
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-custom/skeleton-custom.mk
@@ -0,0 +1,81 @@
+################################################################################
+#
+# skeleton-custom
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_CUSTOM_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_CUSTOM_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_CUSTOM_PROVIDES = skeleton
+
+SKELETON_CUSTOM_INSTALL_STAGING = YES
+
+SKELETON_CUSTOM_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
+
+ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy)
+ifeq ($(SKELETON_CUSTOM_PATH),)
+$(error No path specified for the custom skeleton)
+endif
+endif
+
+# Extract the inode numbers for all of those directories. In case any is
+# a symlink, we want to get the inode of the pointed-to directory, so we
+# append '/.' to be sure we get the target directory. Since the symlinks
+# can be anyway (/bin -> /usr/bin or /usr/bin -> /bin), we do that for
+# all of them.
+#
+SKELETON_CUSTOM_LIB_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/lib/. 2>/dev/null)
+SKELETON_CUSTOM_BIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/bin/. 2>/dev/null)
+SKELETON_CUSTOM_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/sbin/. 2>/dev/null)
+SKELETON_CUSTOM_USR_LIB_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/lib/. 2>/dev/null)
+SKELETON_CUSTOM_USR_BIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/bin/. 2>/dev/null)
+SKELETON_CUSTOM_USR_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_CUSTOM_PATH)/usr/sbin/. 2>/dev/null)
+
+# For a merged /usr, ensure that /lib, /bin and /sbin and their /usr
+# counterparts are appropriately setup as symlinks ones to the others.
+ifeq ($(BR2_ROOTFS_MERGED_USR),y)
+
+ifneq ($(SKELETON_CUSTOM_LIB_INODE),$(SKELETON_CUSTOM_USR_LIB_INODE))
+SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /lib
+endif
+ifneq ($(SKELETON_CUSTOM_BIN_INODE),$(SKELETON_CUSTOM_USR_BIN_INODE))
+SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /bin
+endif
+ifneq ($(SKELETON_CUSTOM_SBIN_INODE),$(SKELETON_CUSTOM_USR_SBIN_INODE))
+SKELETON_CUSTOM_NOT_MERGED_USR_DIRS += /sbin
+endif
+
+endif # merged /usr
+
+ifeq ($(BR2_PACKAGE_SKELETON_CUSTOM)$(BR_BUILDING),yy)
+ifneq ($(SKELETON_CUSTOM_NOT_MERGED_USR_DIRS),)
+$(error The custom skeleton in $(SKELETON_CUSTOM_PATH) is not \
+	using a merged /usr for the following directories: \
+	$(SKELETON_CUSTOM_NOT_MERGED_USR_DIRS))
+endif
+endif
+
+# The target-dir-warning file and the lib{32,64} symlinks are the only
+# things we customise in the custom skeleton.
+define SKELETON_CUSTOM_INSTALL_TARGET_CMDS
+	$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(TARGET_DIR))
+	$(call SYSTEM_LIB_SYMLINK,$(TARGET_DIR))
+	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
+		$(TARGET_DIR_WARNING_FILE)
+endef
+
+# For the staging dir, we don't really care what we install, but we
+# need the /lib and /usr/lib appropriately setup. Since we ensure,
+# above, that they are correct in the skeleton, we can simply copy the
+# skeleton to staging.
+define SKELETON_CUSTOM_INSTALL_STAGING_CMDS
+	$(call SYSTEM_RSYNC,$(SKELETON_CUSTOM_PATH),$(STAGING_DIR))
+	$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/skeleton-init-common/Config.in b/bsp/buildroot/package/skeleton-init-common/Config.in
new file mode 100644
index 00000000..0fd95de8
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-common/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_SKELETON_INIT_COMMON
+	bool
diff --git a/bsp/buildroot/package/skeleton-init-common/skeleton-init-common.mk b/bsp/buildroot/package/skeleton-init-common/skeleton-init-common.mk
new file mode 100644
index 00000000..8228a810
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-common/skeleton-init-common.mk
@@ -0,0 +1,90 @@
+################################################################################
+#
+# skeleton-init-common
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_INIT_COMMON_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_COMMON_ADD_SKELETON_DEPENDENCY = NO
+
+# The skeleton also handles the merged /usr case in the sysroot
+SKELETON_INIT_COMMON_INSTALL_STAGING = YES
+
+SKELETON_INIT_COMMON_PATH = system/skeleton
+
+define SKELETON_INIT_COMMON_INSTALL_TARGET_CMDS
+	$(call SYSTEM_RSYNC,$(SKELETON_INIT_COMMON_PATH),$(TARGET_DIR))
+	$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
+	$(call SYSTEM_LIB_SYMLINK,$(TARGET_DIR))
+	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
+		$(TARGET_DIR_WARNING_FILE)
+endef
+
+# We don't care much about what goes in staging, as long as it is
+# correctly setup for merged/non-merged /usr. The simplest is to
+# fill it in with the content of the skeleton.
+define SKELETON_INIT_COMMON_INSTALL_STAGING_CMDS
+	$(call SYSTEM_RSYNC,$(SKELETON_INIT_COMMON_PATH),$(STAGING_DIR))
+	$(call SYSTEM_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
+	$(call SYSTEM_LIB_SYMLINK,$(STAGING_DIR))
+	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include
+endef
+
+SKELETON_INIT_COMMON_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
+SKELETON_INIT_COMMON_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
+SKELETON_INIT_COMMON_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
+SKELETON_INIT_COMMON_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
+SKELETON_INIT_COMMON_BIN_SH = $(call qstrip,$(BR2_SYSTEM_BIN_SH))
+
+ifneq ($(SKELETON_INIT_COMMON_HOSTNAME),)
+define SKELETON_INIT_COMMON_SET_HOSTNAME
+	mkdir -p $(TARGET_DIR)/etc
+	echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
+	$(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTNAME)' \
+		-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts
+endef
+SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_HOSTNAME
+endif
+
+ifneq ($(SKELETON_INIT_COMMON_ISSUE),)
+define SKELETON_INIT_COMMON_SET_ISSUE
+	mkdir -p $(TARGET_DIR)/etc
+	echo "$(SKELETON_INIT_COMMON_ISSUE)" > $(TARGET_DIR)/etc/issue
+endef
+SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_ISSUE
+endif
+
+ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y)
+ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_INIT_COMMON_ROOT_PASSWD)),)
+SKELETON_INIT_COMMON_ROOT_PASSWORD = '$(SKELETON_INIT_COMMON_ROOT_PASSWD)'
+else ifneq ($(SKELETON_INIT_COMMON_ROOT_PASSWD),)
+# This variable will only be evaluated in the finalize stage, so we can
+# be sure that host-mkpasswd will have already been built by that time.
+SKELETON_INIT_COMMON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_INIT_COMMON_PASSWD_METHOD)" "$(SKELETON_INIT_COMMON_ROOT_PASSWD)"`"
+endif
+else # !BR2_TARGET_ENABLE_ROOT_LOGIN
+SKELETON_INIT_COMMON_ROOT_PASSWORD = "*"
+endif
+define SKELETON_INIT_COMMON_SET_ROOT_PASSWD
+	$(SED) s,^root:[^:]*:,root:$(SKELETON_INIT_COMMON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow
+endef
+SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_ROOT_PASSWD
+
+ifeq ($(BR2_SYSTEM_BIN_SH_NONE),y)
+define SKELETON_INIT_COMMON_SET_BIN_SH
+	rm -f $(TARGET_DIR)/bin/sh
+endef
+else
+ifneq ($(SKELETON_INIT_COMMON_BIN_SH),)
+define SKELETON_INIT_COMMON_SET_BIN_SH
+	ln -sf $(SKELETON_INIT_COMMON_BIN_SH) $(TARGET_DIR)/bin/sh
+endef
+endif
+endif
+SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_BIN_SH
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/skeleton-init-none/Config.in b/bsp/buildroot/package/skeleton-init-none/Config.in
new file mode 100644
index 00000000..449bf661
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-none/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SKELETON_INIT_NONE
+	bool
+	select BR2_PACKAGE_HAS_SKELETON
+	select BR2_PACKAGE_SKELETON_INIT_COMMON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+	default "skeleton-init-none" if BR2_PACKAGE_SKELETON_INIT_NONE
diff --git a/bsp/buildroot/package/skeleton-init-none/skeleton-init-none.mk b/bsp/buildroot/package/skeleton-init-none/skeleton-init-none.mk
new file mode 100644
index 00000000..8181aa03
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-none/skeleton-init-none.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# skeleton-init-none
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_INIT_NONE_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_NONE_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_INIT_NONE_DEPENDENCIES = skeleton-init-common
+
+SKELETON_INIT_NONE_PROVIDES = skeleton
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/skeleton-init-systemd/Config.in b/bsp/buildroot/package/skeleton-init-systemd/Config.in
new file mode 100644
index 00000000..59b21d15
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-systemd/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SKELETON_INIT_SYSTEMD
+	bool
+	select BR2_PACKAGE_HAS_SKELETON
+	select BR2_PACKAGE_SKELETON_INIT_COMMON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+	default "skeleton-init-systemd" if BR2_PACKAGE_SKELETON_INIT_SYSTEMD
diff --git a/bsp/buildroot/package/skeleton-init-systemd/skeleton-init-systemd.mk b/bsp/buildroot/package/skeleton-init-systemd/skeleton-init-systemd.mk
new file mode 100644
index 00000000..ff64205c
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-systemd/skeleton-init-systemd.mk
@@ -0,0 +1,74 @@
+################################################################################
+#
+# skeleton-init-systemd
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_INIT_SYSTEMD_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_SYSTEMD_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_INIT_SYSTEMD_DEPENDENCIES = skeleton-init-common
+
+SKELETON_INIT_SYSTEMD_PROVIDES = skeleton
+
+ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
+
+define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW
+	echo "/dev/root / auto rw 0 1" >$(TARGET_DIR)/etc/fstab
+endef
+
+else
+
+# On a R/O rootfs, /var is a tmpfs filesystem. So, at build time, we
+# redirect /var to the "factory settings" location. Just before the
+# filesystem gets created, the /var symlink will be replaced with
+# a real (but empty) directory, and the "factory files" will be copied
+# back there by the tmpfiles.d mechanism.
+define SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW
+	mkdir -p $(TARGET_DIR)/etc/systemd/tmpfiles.d
+	echo "/dev/root / auto ro 0 1" >$(TARGET_DIR)/etc/fstab
+	echo "tmpfs /var tmpfs mode=1777 0 0" >>$(TARGET_DIR)/etc/fstab
+endef
+
+define SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR
+	rm -rf $(TARGET_DIR)/usr/share/factory/var
+	mv $(TARGET_DIR)/var $(TARGET_DIR)/usr/share/factory/var
+	mkdir -p $(TARGET_DIR)/var
+	for i in $(TARGET_DIR)/usr/share/factory/var/* \
+		 $(TARGET_DIR)/usr/share/factory/var/lib/* \
+		 $(TARGET_DIR)/usr/share/factory/var/lib/systemd/*; do \
+		[ -e "$${i}" ] || continue; \
+		j="$${i#$(TARGET_DIR)/usr/share/factory}"; \
+		if [ -L "$${i}" ]; then \
+			printf "L+! %s - - - - %s\n" \
+				"$${j}" "../usr/share/factory/$${j}" \
+			|| exit 1; \
+		else \
+			printf "C! %s - - - -\n" "$${j}" \
+			|| exit 1; \
+		fi; \
+	done >$(TARGET_DIR)/etc/tmpfiles.d/var-factory.conf
+endef
+SKELETON_INIT_SYSTEMD_ROOTFS_PRE_CMD_HOOKS += SKELETON_INIT_SYSTEMD_PRE_ROOTFS_VAR
+
+define SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR
+	rm -rf $(TARGET_DIR)/var
+	mv $(TARGET_DIR)/usr/share/factory/var $(TARGET_DIR)/var
+endef
+SKELETON_INIT_SYSTEMD_ROOTFS_POST_CMD_HOOKS += SKELETON_INIT_SYSTEMD_POST_ROOTFS_VAR
+
+endif
+
+define SKELETON_INIT_SYSTEMD_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/home
+	mkdir -p $(TARGET_DIR)/srv
+	mkdir -p $(TARGET_DIR)/var
+	ln -s ../run $(TARGET_DIR)/var/run
+	$(SKELETON_INIT_SYSTEMD_ROOT_RO_OR_RW)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/skeleton-init-sysv/Config.in b/bsp/buildroot/package/skeleton-init-sysv/Config.in
new file mode 100644
index 00000000..6f645f9e
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-sysv/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_SKELETON_INIT_SYSV
+	bool
+	select BR2_PACKAGE_HAS_SKELETON
+	select BR2_PACKAGE_SKELETON_INIT_COMMON
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+	default "skeleton-init-sysv" if BR2_PACKAGE_SKELETON_INIT_SYSV
diff --git a/bsp/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk b/bsp/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk
new file mode 100644
index 00000000..c89c2dc1
--- /dev/null
+++ b/bsp/buildroot/package/skeleton-init-sysv/skeleton-init-sysv.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# skeleton-init-sysv
+#
+################################################################################
+
+# The skeleton can't depend on the toolchain, since all packages depends on the
+# skeleton and the toolchain is a target package, as is skeleton.
+# Hence, skeleton would depends on the toolchain and the toolchain would depend
+# on skeleton.
+SKELETON_INIT_SYSV_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_INIT_SYSV_ADD_SKELETON_DEPENDENCY = NO
+
+SKELETON_INIT_SYSV_DEPENDENCIES = skeleton-init-common
+
+SKELETON_INIT_SYSV_PROVIDES = skeleton
+
+define SKELETON_INIT_SYSV_INSTALL_TARGET_CMDS
+	$(call SYSTEM_RSYNC,$(SKELETON_INIT_SYSV_PKGDIR)/skeleton,$(TARGET_DIR))
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/system/skeleton/dev/log b/bsp/buildroot/package/skeleton-init-sysv/skeleton/dev/log
similarity index 100%
rename from bsp/buildroot/system/skeleton/dev/log
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/dev/log
diff --git a/bsp/buildroot/system/skeleton/etc/network/if-post-down.d/.empty b/bsp/buildroot/package/skeleton-init-sysv/skeleton/dev/pts/.empty
similarity index 100%
rename from bsp/buildroot/system/skeleton/etc/network/if-post-down.d/.empty
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/dev/pts/.empty
diff --git a/bsp/buildroot/system/skeleton/etc/network/if-up.d/.empty b/bsp/buildroot/package/skeleton-init-sysv/skeleton/dev/shm/.empty
similarity index 100%
rename from bsp/buildroot/system/skeleton/etc/network/if-up.d/.empty
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/dev/shm/.empty
diff --git a/bsp/buildroot/system/skeleton/etc/fstab b/bsp/buildroot/package/skeleton-init-sysv/skeleton/etc/fstab
similarity index 100%
rename from bsp/buildroot/system/skeleton/etc/fstab
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/etc/fstab
diff --git a/bsp/buildroot/system/skeleton/var/cache b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/cache
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/cache
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/cache
diff --git a/bsp/buildroot/system/skeleton/var/lib/misc b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/lib/misc
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/lib/misc
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/lib/misc
diff --git a/bsp/buildroot/system/skeleton/var/lock b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/lock
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/lock
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/lock
diff --git a/bsp/buildroot/system/skeleton/var/log b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/log
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/log
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/log
diff --git a/bsp/buildroot/system/skeleton/var/run b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/run
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/run
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/run
diff --git a/bsp/buildroot/system/skeleton/var/spool b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/spool
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/spool
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/spool
diff --git a/bsp/buildroot/system/skeleton/var/tmp b/bsp/buildroot/package/skeleton-init-sysv/skeleton/var/tmp
similarity index 100%
rename from bsp/buildroot/system/skeleton/var/tmp
rename to bsp/buildroot/package/skeleton-init-sysv/skeleton/var/tmp
diff --git a/bsp/buildroot/package/skeleton/Config.in b/bsp/buildroot/package/skeleton/Config.in
index d25147bd..efaa1e13 100644
--- a/bsp/buildroot/package/skeleton/Config.in
+++ b/bsp/buildroot/package/skeleton/Config.in
@@ -1,5 +1,9 @@
 config BR2_PACKAGE_SKELETON
 	bool
 	default y
-	help
-	  The basic skeleton for your rootfs.
+
+config BR2_PACKAGE_HAS_SKELETON
+	bool
+
+config BR2_PACKAGE_PROVIDES_SKELETON
+	string
diff --git a/bsp/buildroot/package/skeleton/skeleton.mk b/bsp/buildroot/package/skeleton/skeleton.mk
index 99409443..d380f416 100644
--- a/bsp/buildroot/package/skeleton/skeleton.mk
+++ b/bsp/buildroot/package/skeleton/skeleton.mk
@@ -9,241 +9,6 @@
 # Hence, skeleton would depends on the toolchain and the toolchain would depend
 # on skeleton.
 SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO
+SKELETON_ADD_SKELETON_DEPENDENCY = NO
 
-# The skeleton also handles the merged /usr case in the sysroot
-SKELETON_INSTALL_STAGING = YES
-
-ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y)
-
-SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH))
-
-ifeq ($(BR_BUILDING),y)
-ifeq ($(SKELETON_PATH),)
-$(error No path specified for the custom skeleton)
-endif
-endif
-
-ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-
-# Ensure the user has prepared a merged /usr.
-#
-# Extract the inode numbers for all of those directories. In case any is
-# a symlink, we want to get the inode of the pointed-to directory, so we
-# append '/.' to be sure we get the target directory. Since the symlinks
-# can be anyway (/bin -> /usr/bin or /usr/bin -> /bin), we do that for
-# all of them.
-#
-SKELETON_LIB_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/lib/.)
-SKELETON_BIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/bin/.)
-SKELETON_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/sbin/.)
-SKELETON_USR_LIB_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/lib/.)
-SKELETON_USR_BIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/bin/.)
-SKELETON_USR_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/sbin/.)
-
-ifneq ($(SKELETON_LIB_INODE),$(SKELETON_USR_LIB_INODE))
-SKELETON_CUSTOM_NOT_MERGED_USR += /lib
-endif
-ifneq ($(SKELETON_BIN_INODE),$(SKELETON_USR_BIN_INODE))
-SKELETON_CUSTOM_NOT_MERGED_USR += /bin
-endif
-ifneq ($(SKELETON_SBIN_INODE),$(SKELETON_USR_SBIN_INODE))
-SKELETON_CUSTOM_NOT_MERGED_USR += /sbin
-endif
-
-ifneq ($(SKELETON_CUSTOM_NOT_MERGED_USR),)
-$(error The custom skeleton in $(SKELETON_PATH) is not \
-	using a merged /usr for the following directories: \
-	$(SKELETON_CUSTOM_NOT_MERGED_USR))
-endif
-
-endif # merged /usr
-
-else # ! custom skeleton
-
-SKELETON_PATH = system/skeleton
-
-endif # ! custom skeleton
-
-# This function handles the merged or non-merged /usr cases
-ifeq ($(BR2_ROOTFS_MERGED_USR),y)
-define SKELETON_USR_SYMLINKS_OR_DIRS
-	ln -snf usr/bin $(1)/bin
-	ln -snf usr/sbin $(1)/sbin
-	ln -snf usr/lib $(1)/lib
-endef
-else
-define SKELETON_USR_SYMLINKS_OR_DIRS
-	$(INSTALL) -d -m 0755 $(1)/bin
-	$(INSTALL) -d -m 0755 $(1)/sbin
-	$(INSTALL) -d -m 0755 $(1)/lib
-endef
-endif
-
-# We make a symlink lib32->lib or lib64->lib as appropriate
-# MIPS64/n32 requires lib32 even though it's a 64-bit arch.
-ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y)
-SKELETON_LIB_SYMLINK = lib64
-else
-SKELETON_LIB_SYMLINK = lib32
-endif
-
-define SKELETON_INSTALL_TARGET_CMDS
-	rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
-		--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
-		$(SKELETON_PATH)/ $(TARGET_DIR)/
-	$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR))
-	ln -snf lib $(TARGET_DIR)/$(SKELETON_LIB_SYMLINK)
-	ln -snf lib $(TARGET_DIR)/usr/$(SKELETON_LIB_SYMLINK)
-	$(INSTALL) -m 0644 support/misc/target-dir-warning.txt \
-		$(TARGET_DIR_WARNING_FILE)
-endef
-
-# For the staging dir, we don't really care about /bin and /sbin.
-# But for consistency with the target dir, and to simplify the code,
-# we still handle them for the merged or non-merged /usr cases.
-# Since the toolchain is not yet available, the staging is not yet
-# populated, so we need to create the directories in /usr
-define SKELETON_INSTALL_STAGING_CMDS
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/bin
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/sbin
-	$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include
-	$(call SKELETON_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR))
-	ln -snf lib $(STAGING_DIR)/$(SKELETON_LIB_SYMLINK)
-	ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK)
-endef
-
-# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the
-# default skeleton.
-ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y)
-
-SKELETON_TARGET_GENERIC_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
-SKELETON_TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE))
-SKELETON_TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD))
-SKELETON_TARGET_GENERIC_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD))
-SKELETON_TARGET_GENERIC_BIN_SH = $(call qstrip,$(BR2_SYSTEM_BIN_SH))
-SKELETON_TARGET_GENERIC_GETTY_PORT = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
-SKELETON_TARGET_GENERIC_GETTY_BAUDRATE = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
-SKELETON_TARGET_GENERIC_GETTY_TERM = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
-SKELETON_TARGET_GENERIC_GETTY_OPTIONS = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_OPTIONS))
-
-ifneq ($(SKELETON_TARGET_GENERIC_HOSTNAME),)
-define SKELETON_SET_HOSTNAME
-	mkdir -p $(TARGET_DIR)/etc
-	echo "$(SKELETON_TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname
-	$(SED) '$$a \127.0.1.1\t$(SKELETON_TARGET_GENERIC_HOSTNAME)' \
-		-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts
-endef
-TARGET_FINALIZE_HOOKS += SKELETON_SET_HOSTNAME
-endif
-
-ifneq ($(SKELETON_TARGET_GENERIC_ISSUE),)
-define SKELETON_SET_ISSUE
-	mkdir -p $(TARGET_DIR)/etc
-	echo "$(SKELETON_TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue
-endef
-TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE
-endif
-
-define SKELETON_SET_NETWORK_LOCALHOST
-	( \
-		echo "# interface file auto-generated by buildroot"; \
-		echo ;                                               \
-		echo "auto lo";                                      \
-		echo "iface lo inet loopback";                       \
-	) > $(TARGET_DIR)/etc/network/interfaces
-endef
-
-SKELETON_NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP))
-
-ifneq ($(SKELETON_NETWORK_DHCP_IFACE),)
-define SKELETON_SET_NETWORK_DHCP
-	( \
-		echo ;                                               \
-		echo "auto $(SKELETON_NETWORK_DHCP_IFACE)";                   \
-		echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp";        \
-		echo "	pre-up /etc/network/nfs_check";              \
-		echo "	wait-delay 15";                              \
-	) >> $(TARGET_DIR)/etc/network/interfaces
-	$(INSTALL) -m 0755 -D $(SKELETON_PKGDIR)/nfs_check \
-		$(TARGET_DIR)/etc/network/nfs_check
-endef
-endif
-
-define SKELETON_SET_NETWORK
-	mkdir -p $(TARGET_DIR)/etc/network/
-	$(SKELETON_SET_NETWORK_LOCALHOST)
-	$(SKELETON_SET_NETWORK_DHCP)
-endef
-
-TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK
-
-ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y)
-ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),)
-SKELETON_ROOT_PASSWORD =
-else ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)),)
-SKELETON_ROOT_PASSWORD = '$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)'
-else
-SKELETON_DEPENDENCIES += host-mkpasswd
-# This variable will only be evaluated in the finalize stage, so we can
-# be sure that host-mkpasswd will have already been built by that time.
-SKELETON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_TARGET_GENERIC_PASSWD_METHOD)" "$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)"`"
-endif
-else # !BR2_TARGET_ENABLE_ROOT_LOGIN
-SKELETON_ROOT_PASSWORD = "*"
-endif
-
-define SKELETON_SET_ROOT_PASSWD
-	$(SED) s,^root:[^:]*:,root:$(SKELETON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow
-endef
-TARGET_FINALIZE_HOOKS += SKELETON_SET_ROOT_PASSWD
-
-ifeq ($(BR2_SYSTEM_BIN_SH_NONE),y)
-define SKELETON_BIN_SH
-	rm -f $(TARGET_DIR)/bin/sh
-endef
-else
-ifneq ($(SKELETON_TARGET_GENERIC_BIN_SH),)
-define SKELETON_BIN_SH
-	ln -sf $(SKELETON_TARGET_GENERIC_BIN_SH) $(TARGET_DIR)/bin/sh
-endef
-endif
-endif
-TARGET_FINALIZE_HOOKS += SKELETON_BIN_SH
-
-ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
-ifeq ($(BR2_INIT_SYSV),y)
-# In sysvinit inittab, the "id" must not be longer than 4 bytes, so we
-# skip the "tty" part and keep only the remaining.
-define SKELETON_SET_GETTY
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(SKELETON_TARGET_GENERIC_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(SKELETON_TARGET_GENERIC_GETTY_OPTIONS) $(SKELETON_TARGET_GENERIC_GETTY_PORT) $(SKELETON_TARGET_GENERIC_GETTY_BAUDRATE) $(SKELETON_TARGET_GENERIC_GETTY_TERM) #~' \
-		$(TARGET_DIR)/etc/inittab
-endef
-else ifeq ($(BR2_INIT_BUSYBOX),y)
-# Add getty to busybox inittab
-define SKELETON_SET_GETTY
-	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(SKELETON_TARGET_GENERIC_GETTY_PORT)::respawn:/sbin/getty -L $(SKELETON_TARGET_GENERIC_GETTY_OPTIONS) $(SKELETON_TARGET_GENERIC_GETTY_PORT) $(SKELETON_TARGET_GENERIC_GETTY_BAUDRATE) $(SKELETON_TARGET_GENERIC_GETTY_TERM) #~' \
-		$(TARGET_DIR)/etc/inittab
-endef
-endif
-TARGET_FINALIZE_HOOKS += SKELETON_SET_GETTY
-endif
-
-ifeq ($(BR2_INIT_BUSYBOX)$(BR2_INIT_SYSV),y)
-ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
-# Find commented line, if any, and remove leading '#'s
-define SKELETON_REMOUNT_RW
-	$(SED) '/^#.*-o remount,rw \/$$/s~^#\+~~' $(TARGET_DIR)/etc/inittab
-endef
-else
-# Find uncommented line, if any, and add a leading '#'
-define SKELETON_REMOUNT_RW
-	$(SED) '/^[^#].*-o remount,rw \/$$/s~^~#~' $(TARGET_DIR)/etc/inittab
-endef
-endif
-TARGET_FINALIZE_HOOKS += SKELETON_REMOUNT_RW
-endif # BR2_INIT_BUSYBOX || BR2_INIT_SYSV
-
-endif # BR2_ROOTFS_SKELETON_DEFAULT
-
-$(eval $(generic-package))
+$(eval $(virtual-package))
diff --git a/bsp/buildroot/package/slang/0001-slsh-libs.patch b/bsp/buildroot/package/slang/0001-slsh-libs.patch
index e8b6e6d2..211cb4a0 100644
--- a/bsp/buildroot/package/slang/0001-slsh-libs.patch
+++ b/bsp/buildroot/package/slang/0001-slsh-libs.patch
@@ -3,15 +3,17 @@ Patch taken from gentoo portage, upstream status unknown, author
 probably Diego Pettenò.
 
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[Bernd: rebased against 2.3.1a]
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 
 --- a/slsh/Makefile.in
 +++ b/slsh/Makefile.in
-@@ -80,7 +80,7 @@
+@@ -92,7 +92,7 @@
  $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
+    $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
  $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
--	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS)
-+	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
- 	cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c
- $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
+-	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(INST_LIBS)
++	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR_TSTAMP) slsh.c slsh.h config.h Makefile
+    cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR_TSTAMP) readline.c slsh.h config.h Makefile
diff --git a/bsp/buildroot/package/slang/0002-Enable-a-statically-linked-version-of-slsh.patch b/bsp/buildroot/package/slang/0002-Enable-a-statically-linked-version-of-slsh.patch
deleted file mode 100644
index ee306a1d..00000000
--- a/bsp/buildroot/package/slang/0002-Enable-a-statically-linked-version-of-slsh.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Enable a statically-linked version of slsh to be built and installed
-
-Adapt an upstream patch to make it apply on 2.3.0. Unnecessary changes
-have been ignored.
-
-Repository: git://git.jedsoft.org/git/slang.git
-Commit ID: 3796db6fb94a2fc7fe2fb0b6918501b69a4d3a02
-Author: John E. Davis <jed@jedsoft.org>
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
-diff -rup a/autoconf/Makefile.in b/autoconf/Makefile.in
---- a/autoconf/Makefile.in	2014-09-18 04:02:24.000000000 +0100
-+++ b/autoconf/Makefile.in	2014-12-08 11:59:30.879313080 +0000
-@@ -41,16 +41,19 @@ src/Makefile: configure src/Makefile.in 
- #
- makefiles: Makefile slsh/Makefile modules/Makefile src/Makefile
- help:
--	@echo "make install : install a shared version of the library"
--	@echo "make install-static : install a static version"
--	@echo "make install-all : install both shared and static versions"
--	@echo "make check : Build the library and run the regression tests"
-+	@echo "make install ==> shared version of the library, slsh and modules"
-+	@echo "make install-static ==> static version of the library and slsh; no modules"
-+	@echo "make install-all ==> shared/static versions of the library/modules + shared slsh."
-+	@echo "make install-modules ==> install the modules"
-+	@echo "make check ==> Build the library and run the regression tests"
- slang.pc: configure autoconf/slangpc.in
- 	@echo "slang.pc needs to be updated -- rerun configure"
- 	@exit 1
- static: makefiles slang.pc
- 	cd src; $(MAKE) static
--	cd slsh; $(MAKE) all
-+	cd slsh; $(MAKE) static
-+modules:
-+	cd modules; $(MAKE) all
- elf: makefiles slang.pc
- 	cd src; $(MAKE) elf
- 	cd slsh; $(MAKE) all
-@@ -73,10 +76,11 @@ clean:
- 	cd demo; $(MAKE) clean
- install-static:
- 	cd src; $(MAKE) install-static
-+	cd slsh; $(MAKE) install-static
- install-pkgconfig: slang.pc
- 	$(MKINSDIR) $(DEST_PKGCONFIGDIR)
- 	$(INSTALL_DATA) slang.pc $(DEST_PKGCONFIGDIR)/
--install-elf:
-+install-elf: install-pkgconfig
- 	cd src; $(MAKE) install-elf
- 	@echo Now installing slsh
- 	cd slsh; $(MAKE) install
-@@ -86,7 +90,10 @@ install-elf:
- 	@echo "On some systems, e.g., linux, you may also have to run ldconfig."
- 	@echo ""
- install: install-elf install-pkgconfig
--install-all: install-elf install-static install-pkgconfig
-+install-all: install-elf
-+	cd src; $(MAKE) install-static
-+install-modules:
-+	cd modules; $(MAKE) install
- install-links:
- 	cd src; $(MAKE) install-links
- #
-diff -rup a/slsh/Makefile.in b/slsh/Makefile.in
---- a/slsh/Makefile.in	2014-12-08 11:52:51.303284637 +0000
-+++ b/slsh/Makefile.in	2014-12-08 12:06:44.811939732 +0000
-@@ -16,7 +16,8 @@ SLANG_INST_INC	= -I@includedir@
- SLANG_INST_LIB	= -L$(INST_LIB_DIR)
- #---------------------------------------------------------------------------
- SLANG_SRCINC	= -I@SRCDIR@
--SLANG_SRCLIB	= -L@ELFDIR@
-+SLANG_ELFLIB	= -L@ELFDIR@#  for dynamically linked
-+SLANG_OBJLIB	= -L@OBJDIR@#  for statically linked
- #---------------------------------------------------------------------------
- OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
- RPATH		= @RPATH@
-@@ -73,10 +74,12 @@ INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(S
- DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
--SRC_LIBS = $(SLANG_SRCLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
- #
- all: $(OBJDIR)/slsh_exe
- slsh: $(OBJDIR)/slsh
-+static: $(OBJDIR)/slsh_static
- $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
- 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
-@@ -85,6 +88,8 @@ $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.
- 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
- $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
- 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
-+$(OBJDIR)/slsh_static: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
-+	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_static $(LDFLAGS) $(STATIC_SRC_LIBS)
- $(OBJDIR):
- 	-$(MKINSDIR) $(OBJDIR)
- config.h: ../src/config.h
-@@ -151,6 +156,12 @@ install: slsh install_directories instal
- 	$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
- 	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
- 	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
-+install-static: static install_directories install_lib_files install_rline_files \
-+ install_scripts install_help install_docs
-+	$(INSTALL) $(OBJDIR)/slsh_static $(DEST_BIN_DIR)/slsh
-+	$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
-+	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
-+	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
- #---------------------------------------------------------------------------
- # Housekeeping
- #---------------------------------------------------------------------------
-@@ -161,5 +172,5 @@ distclean: clean
- #
- .PHONY: all clean distclean symlinks slsh install install_directories \
-   install_lib_files install_rline_files install_scripts install_help \
--  install_docs
-+  install_docs install-static static
- 
diff --git a/bsp/buildroot/package/slang/0003-Disable-module-support-in-the-statically-linked-version-of-slsh.patch b/bsp/buildroot/package/slang/0003-Disable-module-support-in-the-statically-linked-version-of-slsh.patch
deleted file mode 100644
index 4bc8f768..00000000
--- a/bsp/buildroot/package/slang/0003-Disable-module-support-in-the-statically-linked-version-of-slsh.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-Disable module support in the statically linked version of slsh
-
-Adapt an upstream patch to make it apply on 2.3.0. Unnecessary changes
-have been ignored.
-
-Repository: git://git.jedsoft.org/git/slang.git
-Commit ID: 997c85f5cdb19802a5c97afe44e366a60f94a069
-Author: John E. Davis <jed@jedsoft.org>
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
-diff -rup a/slsh/Makefile.in b/slsh/Makefile.in
---- a/slsh/Makefile.in	2014-12-09 10:04:44.084899944 +0000
-+++ b/slsh/Makefile.in	2014-12-09 10:16:11.545897275 +0000
-@@ -1,9 +1,11 @@
- #-*-sh-*-
- CC		= @CC@
- CFLAGS		= @CFLAGS@ @SLANG_DLL_CFLAGS@
--LDFLAGS		= @LDFLAGS@ @DYNAMIC_LINK_FLAGS@
-+LDFLAGS		= @LDFLAGS@
-+DLINK_FLAGS	= @DYNAMIC_LINK_FLAGS@
- CONFIG_DIR	= @CONFIG_DIR@
- OBJDIR		= $(ARCH)objs
-+SOBJDIR		= static_objs
- SRCDIR		= $(CONFIG_DIR)/slsh
- #---------------------------------------------------------------------------
- # Installation location of the slang library
-@@ -19,7 +21,8 @@ SLANG_SRCINC	= -I@SRCDIR@
- SLANG_ELFLIB	= -L@ELFDIR@#  for dynamically linked
- SLANG_OBJLIB	= -L@OBJDIR@#  for statically linked
- #---------------------------------------------------------------------------
--OTHER_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-+DYNAMIC_LIBS	= @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@
-+STATIC_LIBS	= @TERMCAP@ @LIBS@ @M_LIB@
- RPATH		= @RPATH@
- #----------------------------------------------------------------------------
- INSTALL		= @INSTALL@
-@@ -69,29 +72,37 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_
- #----------------------------------------------------------------------------
- @SET_MAKE@
- SHELL = /bin/sh
--#INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS)
--INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
- DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \
-  -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \
-  -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)'
--SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
--STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS)
-+SDEFS = $(DEFS) -DSLSH_STATIC
-+SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS)
-+STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(STATIC_LIBS)
- #
- all: $(OBJDIR)/slsh_exe
- slsh: $(OBJDIR)/slsh
--static: $(OBJDIR)/slsh_static
- $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
--	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
-+	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
--	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
-+	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS)
- $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
- 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c
- $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
- 	cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
--$(OBJDIR)/slsh_static: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
--	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_static $(LDFLAGS) $(STATIC_SRC_LIBS)
- $(OBJDIR):
- 	-$(MKINSDIR) $(OBJDIR)
-+#
-+static: $(SOBJDIR)/slsh
-+$(SOBJDIR)/slsh: $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o
-+	$(CC) $(CFLAGS) $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o -o $(SOBJDIR)/slsh $(LDFLAGS) $(STATIC_SRC_LIBS)
-+$(SOBJDIR)/slsh.o: $(SOBJDIR) slsh.c slsh.h config.h Makefile
-+	cd $(SOBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(SDEFS) $(SRCDIR)/slsh.c
-+$(SOBJDIR)/readline.o: $(SOBJDIR) readline.c slsh.h config.h Makefile
-+	cd $(SOBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(SDEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c
-+$(SOBJDIR):
-+	-$(MKINSDIR) $(SOBJDIR)
-+#
- config.h: ../src/config.h
- 	cp ../src/config.h .
- install_directories:
-@@ -158,7 +169,7 @@ install: slsh install_directories instal
- 	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
- install-static: static install_directories install_lib_files install_rline_files \
-  install_scripts install_help install_docs
--	$(INSTALL) $(OBJDIR)/slsh_static $(DEST_BIN_DIR)/slsh
-+	$(INSTALL) $(SOBJDIR)/slsh $(DEST_BIN_DIR)/
- 	$(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/
- 	echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc
- 	$(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/
-@@ -167,6 +178,7 @@ install-static: static install_directori
- #---------------------------------------------------------------------------
- clean:
- 	-/bin/rm -f *~ $(OBJDIR)/slsh.o $(OBJDIR)/readline.o $(OBJDIR)/slsh $(OBJDIR)/slsh_exe scripts/*~ lib/*~
-+	-/bin/rm -f $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o $(SOBJDIR)/slsh $(SOBJDIR)/slsh_exe
- distclean: clean
- 	-/bin/rm -f Makefile config.h
- #
-diff -rup a/slsh/slsh.c b/slsh/slsh.c
---- a/slsh/slsh.c	2014-09-18 04:02:24.000000000 +0100
-+++ b/slsh/slsh.c	2014-12-09 10:17:04.602824146 +0000
-@@ -514,7 +514,9 @@ int main (int argc, char **argv)
- 
-    if ((-1 == SLang_init_all ())
-        || (-1 == SLang_init_array_extra ())
-+#ifndef SLSH_STATIC
-        || (-1 == SLang_init_import ()) /* dynamic linking */
-+#endif
-        || (-1 == SLadd_intrin_fun_table (Intrinsics, NULL))
-        || (-1 == slsh_init_readline_intrinsics ()))
-      {
diff --git a/bsp/buildroot/package/slang/0004-Rename-posix_close-function-to-posix_close_slfile.patch b/bsp/buildroot/package/slang/0004-Rename-posix_close-function-to-posix_close_slfile.patch
deleted file mode 100644
index 4b3c869a..00000000
--- a/bsp/buildroot/package/slang/0004-Rename-posix_close-function-to-posix_close_slfile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 055b02cf98ab9b7301988c3be2d277f262f0957e Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 18 Nov 2015 23:12:15 +0100
-Subject: [PATCH] Rename posix_close() function to posix_close_slfile()
-
-posix_close() is a function that will be implemented as part of an
-upcoming of the POSIX standard. For this reason, the musl C library
-has already started implementing this function call. Unfortunately,
-since slang already defines a function with the same name, it cannot
-build properly with the musl C library.
-
-This commit fixes that by renaming the slang function to
-posix_close_slfile().
-
-This patch has been taken from the Alpine Linux repository, at
-http://git.alpinelinux.org/cgit/aports/plain/main/slang/musl-fix-posix_close-clash.patch.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/slposio.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/slposio.c b/src/slposio.c
-index 94f20dd..475e2c9 100644
---- a/src/slposio.c
-+++ b/src/slposio.c
-@@ -372,7 +372,7 @@ static int posix_close_fd (int *fd)
-    return 0;
- }
- 
--static int posix_close (SLFile_FD_Type *f)
-+static int posix_close_slfile (SLFile_FD_Type *f)
- {
-    int status = do_close (f);
- 
-@@ -1011,7 +1011,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] =
-    MAKE_INTRINSIC_2("write", posix_write, V, F, B),
-    MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F),
-    MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I),
--   MAKE_INTRINSIC_1("close", posix_close, I, F),
-+   MAKE_INTRINSIC_1("close", posix_close_slfile, I, F),
-    MAKE_INTRINSIC_1("_close", posix_close_fd, I, I),
- #if defined(TTYNAME_R)
-    MAKE_INTRINSIC_0("ttyname", posix_ttyname, V),
--- 
-2.6.3
-
diff --git a/bsp/buildroot/package/slang/0005-make-install-static-do-install-pkgconfig-as-install-.patch b/bsp/buildroot/package/slang/0005-make-install-static-do-install-pkgconfig-as-install-.patch
deleted file mode 100644
index 1572e09b..00000000
--- a/bsp/buildroot/package/slang/0005-make-install-static-do-install-pkgconfig-as-install-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 294bcde1afa0b3866f339f82709e867d827cea6c Mon Sep 17 00:00:00 2001
-From: Max Filippov <jcmvbkbc@gmail.com>
-Date: Mon, 14 Mar 2016 07:28:56 +0300
-Subject: [PATCH] make install-static do install-pkgconfig as install-elf does
-
-...so that install-static installs everything needed for linking with
-slang. This fixes e.g. the following mc build:
-
-  http://autobuild.buildroot.net/results/085/085194f18bc7db1e801d98e6620e3a75fd988cc5/build-end.log
-
-Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
----
- autoconf/Makefile.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in
-index a6defa6..ca1ffb2 100644
---- a/autoconf/Makefile.in
-+++ b/autoconf/Makefile.in
-@@ -74,7 +74,7 @@ clean:
- 	cd modules; $(MAKE) clean
- 	cd slsh; $(MAKE) clean
- 	cd demo; $(MAKE) clean
--install-static:
-+install-static: install-pkgconfig
- 	cd src; $(MAKE) install-static
- 	cd slsh; $(MAKE) install-static
- install-pkgconfig: slang.pc
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/slang/slang.hash b/bsp/buildroot/package/slang/slang.hash
index 000ac11e..bd806e8a 100644
--- a/bsp/buildroot/package/slang/slang.hash
+++ b/bsp/buildroot/package/slang/slang.hash
@@ -1,2 +1,6 @@
-# From http://www.jedsoft.org/releases/slang/
-sha1	c3270b58a58e6cbfd47f0a6e3d2194dd9e7c7d14	slang-2.3.0.tar.gz
+# sha1 from http://www.jedsoft.org/releases/slang/, sha256 locally computed
+sha1 a8ea7f1b5736160a94efb67b137a0f5b9916bdf2  slang-2.3.1a.tar.bz2
+sha256 54f0c3007fde918039c058965dffdfd6c5aec0bad0f4227192cc486021f08c36  slang-2.3.1a.tar.bz2
+
+# License file, locally computed
+sha256 ff05a90962e7773f8bdc47b2a9585130526039102759b524c1dffbd57cfe469b  COPYING
diff --git a/bsp/buildroot/package/slang/slang.mk b/bsp/buildroot/package/slang/slang.mk
index e6abdeeb..d0c0e763 100644
--- a/bsp/buildroot/package/slang/slang.mk
+++ b/bsp/buildroot/package/slang/slang.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-SLANG_VERSION = 2.3.0
+SLANG_VERSION = 2.3.1a
+SLANG_SOURCE = slang-$(SLANG_VERSION).tar.bz2
 SLANG_SITE = http://www.jedsoft.org/releases/slang
-SLANG_LICENSE = GPLv2+
+SLANG_LICENSE = GPL-2.0+
 SLANG_LICENSE_FILES = COPYING
 SLANG_INSTALL_STAGING = YES
 SLANG_CONF_OPTS = --with-onig=no
diff --git a/bsp/buildroot/package/slirp/Config.in b/bsp/buildroot/package/slirp/Config.in
index ecd492dd..51dea970 100644
--- a/bsp/buildroot/package/slirp/Config.in
+++ b/bsp/buildroot/package/slirp/Config.in
@@ -7,8 +7,8 @@ config BR2_PACKAGE_SLIRP
 	  and the front-end. Interaction between front-end and
 	  back-end is done using VD-Interfaces.
 
-	  This package implements the slirp-part for Spice.
-	  Slirp emulates a PPP or SLIP connection over a normal terminal.
+	  This package implements the slirp-part for Spice. Slirp
+	  emulates a PPP or SLIP connection over a normal terminal.
 
 	  http://www.spice-space.org/
 
diff --git a/bsp/buildroot/package/slirp/slirp.mk b/bsp/buildroot/package/slirp/slirp.mk
index be3e72d9..7cfead65 100644
--- a/bsp/buildroot/package/slirp/slirp.mk
+++ b/bsp/buildroot/package/slirp/slirp.mk
@@ -9,7 +9,7 @@
 # of today)
 SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550
 SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp
-SLIRP_LICENSE = BSD-4c, BSD-2c
+SLIRP_LICENSE = BSD-4-Clause, BSD-2-Clause
 # Note: The license file 'COPYRIGHT' is missing from the sources,
 # although some files refer to it.
 SLIRP_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/smack/0001-libsmack-common.c-Include-limits.h-for-PATH_MAX.patch b/bsp/buildroot/package/smack/0001-libsmack-common.c-Include-limits.h-for-PATH_MAX.patch
deleted file mode 100644
index 0e30ef5e..00000000
--- a/bsp/buildroot/package/smack/0001-libsmack-common.c-Include-limits.h-for-PATH_MAX.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 316c911aa741b14513622a4206ed6d324e951fa0 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Wed, 20 May 2015 21:25:22 +0200
-Subject: [PATCH 1/1] libsmack/common.c: Include <limits.h> for PATH_MAX
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
-Downloaded from upstream commit
-https://github.com/smack-team/smack/commit/316c911aa741b14513622a4206ed6d324e951fa0
-
- libsmack/common.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libsmack/common.c b/libsmack/common.c
-index 55fee1a..55b59e3 100644
---- a/libsmack/common.c
-+++ b/libsmack/common.c
-@@ -22,6 +22,7 @@
- #include <dirent.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--- 
-2.7.0
-
diff --git a/bsp/buildroot/package/smack/Config.in b/bsp/buildroot/package/smack/Config.in
index 67c70bb6..3e88f8d0 100644
--- a/bsp/buildroot/package/smack/Config.in
+++ b/bsp/buildroot/package/smack/Config.in
@@ -7,12 +7,12 @@ config BR2_PACKAGE_SMACK
 	  User space programs and libraries for SMACK.
 
 	  SMACK stands for Simplified Mandatory Access Control Kernel.
-	  It is a Linux Security Module which provides a Mandatory Access
-	  Control mechanism, aimed towards simplicity.
+	  It is a Linux Security Module which provides a Mandatory
+	  Access Control mechanism, aimed towards simplicity.
 
-	  This package provides a library which allows applications to work
-	  with SMACK and tools to load/unload rules from the kernel, as well
-	  as query the policy.
+	  This package provides a library which allows applications to
+	  work with SMACK and tools to load/unload rules from the
+	  kernel, as well as query the policy.
 
 	  SMACK requires the following kernel options to be enabled:
 
@@ -20,13 +20,13 @@ config BR2_PACKAGE_SMACK
 	  - CONFIG_SECURITY_SMACK
 	  - CONFIG_SECURITY_NETWORK
 
-	  These options will be automatically enabled by Buildroot if it is
-	  responsible for building the kernel. Otherwise, if you are building
-	  your kernel outside of Buildroot, make sure these options are
-	  enabled.
+	  These options will be automatically enabled by Buildroot if
+	  it is responsible for building the kernel. Otherwise, if you
+	  are building your kernel outside of Buildroot, make sure
+	  these options are enabled.
 
-	  To activate SMACK, do not forget to add "security=smack" to your
-	  kernel command line.
+	  To activate SMACK, do not forget to add "security=smack" to
+	  your kernel command line.
 
 	  https://github.com/smack-team/smack
 
diff --git a/bsp/buildroot/package/smack/smack.hash b/bsp/buildroot/package/smack/smack.hash
index fd512498..2c1f4462 100644
--- a/bsp/buildroot/package/smack/smack.hash
+++ b/bsp/buildroot/package/smack/smack.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256  94dc21b4a5e570af0eb44debf57491170cccdbf60e03b5a3210f2a14d6448390  smack-v1.1.0.tar.gz
+sha256 1a607da3b1a661dc76b7a5b8571f4a2d56b4d61d78376088d19f2d8637dc6822  smack-1.3.1.tar.gz
diff --git a/bsp/buildroot/package/smack/smack.mk b/bsp/buildroot/package/smack/smack.mk
index 3ef4d476..d2ac005a 100644
--- a/bsp/buildroot/package/smack/smack.mk
+++ b/bsp/buildroot/package/smack/smack.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SMACK_VERSION = v1.1.0
-SMACK_SITE = $(call github,smack-team,smack,$(SMACK_VERSION))
-SMACK_LICENSE = LGPLv2.1
+SMACK_VERSION = 1.3.1
+SMACK_SITE = $(call github,smack-team,smack,v$(SMACK_VERSION))
+SMACK_LICENSE = LGPL-2.1
 SMACK_LICENSE_FILES = COPYING
 SMACK_INSTALL_STAGING = YES
 SMACK_DEPENDENCIES = host-pkgconf
diff --git a/bsp/buildroot/package/smartmontools/smartmontools.mk b/bsp/buildroot/package/smartmontools/smartmontools.mk
index cd0c076e..137c00a5 100644
--- a/bsp/buildroot/package/smartmontools/smartmontools.mk
+++ b/bsp/buildroot/package/smartmontools/smartmontools.mk
@@ -6,7 +6,7 @@
 
 SMARTMONTOOLS_VERSION = 6.5
 SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION)
-SMARTMONTOOLS_LICENSE = GPLv2+
+SMARTMONTOOLS_LICENSE = GPL-2.0+
 SMARTMONTOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/smcroute/Config.in b/bsp/buildroot/package/smcroute/Config.in
old mode 100755
new mode 100644
index f1040752..0d0f5f7a
--- a/bsp/buildroot/package/smcroute/Config.in
+++ b/bsp/buildroot/package/smcroute/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_SMCROUTE
 	depends on BR2_USE_MMU # fork()
 	help
 	  SMCRoute is a command line tool to manipulate the multicast
-	  routes of a UNIX kernel. It supports both IPv4 and IPv6 multicast
-	  routing. SMCRoute can be used as an alternative to dynamic
-	  multicast routers like mrouted or pimd in setups where static
-	  multicast routes should be maintained and/or no proper IGMP or
-	  MLD signaling exists.
+	  routes of a UNIX kernel. It supports both IPv4 and IPv6
+	  multicast routing. SMCRoute can be used as an alternative to
+	  dynamic multicast routers like mrouted or pimd in setups
+	  where static multicast routes should be maintained and/or no
+	  proper IGMP or MLD signaling exists.
 
 	  https://github.com/troglobit/smcroute
diff --git a/bsp/buildroot/package/smcroute/smcroute.hash b/bsp/buildroot/package/smcroute/smcroute.hash
index e1483ec1..0487ef6c 100644
--- a/bsp/buildroot/package/smcroute/smcroute.hash
+++ b/bsp/buildroot/package/smcroute/smcroute.hash
@@ -1,4 +1,4 @@
 # Locally generated
-sha256  cf344922b4298b94e53fa2db8f2b064bece60f75926966f330437dfcbd76d425  smcroute-2.1.1.tar.xz
-# From https://github.com/troglobit/smcroute/releases/download/2.1.1/smcroute-2.1.1.tar.xz.md5
-md5     cd9256577fe06beaf8da2eba1a02f953  smcroute-2.1.1.tar.xz
+sha256  cd6c5cc2edfa1348acb07ed026180ebfc8dd0f87153f5382cb27cb5557724c56  smcroute-2.3.1.tar.xz
+# From https://github.com/troglobit/smcroute/releases/download/2.3.1/smcroute-2.3.1.tar.xz.md5
+md5     d8080828b7730bffb86969afd2bf94cb  smcroute-2.3.1.tar.xz
diff --git a/bsp/buildroot/package/smcroute/smcroute.mk b/bsp/buildroot/package/smcroute/smcroute.mk
old mode 100755
new mode 100644
index a3d4bc4f..e7e6ef15
--- a/bsp/buildroot/package/smcroute/smcroute.mk
+++ b/bsp/buildroot/package/smcroute/smcroute.mk
@@ -4,14 +4,21 @@
 #
 ################################################################################
 
-SMCROUTE_VERSION = 2.1.1
+SMCROUTE_VERSION = 2.3.1
 SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz
 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)
-SMCROUTE_LICENSE = GPLv2+
+SMCROUTE_LICENSE = GPL-2.0+
 SMCROUTE_LICENSE_FILES = COPYING
 
 SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes
 #BUG:The package Makefile uses CC?= even though the package is autotools based
 SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+SMCROUTE_DEPENDENCIES = libcap
+SMCROUTE_CONF_OPTS += --with-libcap
+else
+SMCROUTE_CONF_OPTS += --without-libcap
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/smstools3/Config.in b/bsp/buildroot/package/smstools3/Config.in
index 3e2ea252..dca3996e 100644
--- a/bsp/buildroot/package/smstools3/Config.in
+++ b/bsp/buildroot/package/smstools3/Config.in
@@ -4,8 +4,9 @@ config BR2_PACKAGE_SMSTOOLS3
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  The SMS Server Tools 3 is a SMS Gateway software which can send and
-	  receive short messages through GSM modems and mobile phones.
+	  The SMS Server Tools 3 is a SMS Gateway software which can
+	  send and receive short messages through GSM modems and
+	  mobile phones.
 
 	  http://smstools3.kekekasvi.com/
 
@@ -15,9 +16,9 @@ config BR2_PACKAGE_SMSTOOLS3_NB_MODEMS
 	int "Number of modems to support"
 	default 1
 	help
-	  To reduce memory footprint of SMS Server Tools, you can specify the
-	  exact number of modems connected to your board. By default only 1
-	  modem is used.
+	  To reduce memory footprint of SMS Server Tools, you can
+	  specify the exact number of modems connected to your
+	  board. By default only 1 modem is used.
 
 endif
 
diff --git a/bsp/buildroot/package/smstools3/smstools3.mk b/bsp/buildroot/package/smstools3/smstools3.mk
index 52f9b319..2dfd11b8 100644
--- a/bsp/buildroot/package/smstools3/smstools3.mk
+++ b/bsp/buildroot/package/smstools3/smstools3.mk
@@ -6,7 +6,7 @@
 
 SMSTOOLS3_VERSION = 3.1.15
 SMSTOOLS3_SITE = http://smstools3.kekekasvi.com/packages
-SMSTOOLS3_LICENSE = GPLv2+
+SMSTOOLS3_LICENSE = GPL-2.0+
 SMSTOOLS3_LICENSE_FILES = doc/license.html LICENSE
 
 SMSTOOLS3_CFLAGS = $(TARGET_CFLAGS)
diff --git a/bsp/buildroot/package/snappy/Config.in b/bsp/buildroot/package/snappy/Config.in
index 06d537f1..1bd3d6ec 100644
--- a/bsp/buildroot/package/snappy/Config.in
+++ b/bsp/buildroot/package/snappy/Config.in
@@ -2,12 +2,12 @@ config BR2_PACKAGE_SNAPPY
 	bool "snappy"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  Snappy is a compression/decompression library. It does not aim for
-	  maximum compression, or compatibility with any other compression
-	  library; instead, it aims for very high speeds and reasonable
-	  compression.
+	  Snappy is a compression/decompression library. It does not
+	  aim for maximum compression, or compatibility with any other
+	  compression library; instead, it aims for very high speeds
+	  and reasonable compression.
 
-	  http://code.google.com/p/snappy/
+	  http://google.github.io/snappy/
 
 comment "snappy needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/bsp/buildroot/package/snappy/snappy.hash b/bsp/buildroot/package/snappy/snappy.hash
index bb7f104c..71a2500f 100644
--- a/bsp/buildroot/package/snappy/snappy.hash
+++ b/bsp/buildroot/package/snappy/snappy.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 f50719c6dc7103d65df66882a3b4569d598eda251266463eca716928187dc12b  snappy-32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda.tar.gz
+sha256 e701cd80f1154d648c762c86140ad6873a5c9b09ed1d754e3157be8193d2c39e  snappy-be6dc3db83c4701e3e79694dcbfd1c3da03b91dd.tar.gz
diff --git a/bsp/buildroot/package/snappy/snappy.mk b/bsp/buildroot/package/snappy/snappy.mk
index bad0ef0a..a537ade5 100644
--- a/bsp/buildroot/package/snappy/snappy.mk
+++ b/bsp/buildroot/package/snappy/snappy.mk
@@ -4,25 +4,11 @@
 #
 ################################################################################
 
-SNAPPY_VERSION = 32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda
+SNAPPY_VERSION = be6dc3db83c4701e3e79694dcbfd1c3da03b91dd
 SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION))
-SNAPPY_LICENSE = BSD-3c
+SNAPPY_LICENSE = BSD-3-Clause
 SNAPPY_LICENSE_FILES = COPYING
-# from git
-SNAPPY_AUTORECONF = YES
-SNAPPY_DEPENDENCIES = host-pkgconf
 SNAPPY_INSTALL_STAGING = YES
+SNAPPY_CONF_OPTS = -DSNAPPY_BUILD_TESTS=OFF
 
-# Disable tests
-SNAPPY_CONF_OPTS = --disable-gtest
-
-# libsnappy links with libstdc++. Some libstdc++/arch variants use
-# pthread symbols for internal locking if built with thread
-# support. libstdc++ does not have a .pc file, and its .la file does
-# not mention -pthread.  So, static linkig to libstdc++ will fail if
-# -pthread is not explicity linked to. Only do that for static builds.
-ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
-SNAPPY_CONF_OPTS += LIBS=-pthread
-endif
-
-$(eval $(autotools-package))
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch b/bsp/buildroot/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
deleted file mode 100644
index 3d982034..00000000
--- a/bsp/buildroot/package/sngrep/0001-src-Makefile.am-don-t-use-VPATH.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b6dcae8ec4334e2436cfa19a8052c3473f57a586 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 4 Mar 2017 15:02:43 +0100
-Subject: [PATCH 1/2] src/Makefile.am: don't use VPATH
-
-VPATH is a mechanism used to allow out-of-tree build, not to use source
-code from a different directory. For this purpose, one should simply use
-the "subdir-objects" AUTOMAKE_OPTIONS, and reference the source code of
-the sub-directory in the <prog>_SOURCES variable.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Upstream-status: https://github.com/irontec/sngrep/pull/176
----
- src/Makefile.am | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 931ee06..961f4a0 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,5 @@
-+AUTOMAKE_OPTIONS=subdir-objects
- bin_PROGRAMS=sngrep
--VPATH=curses
- sngrep_SOURCES=capture.c
- if USE_EEP
- sngrep_SOURCES+=capture_eep.c
-@@ -12,8 +12,8 @@ sngrep_SOURCES+=capture_openssl.c
- endif
- sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c
- sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c
--sngrep_SOURCES+=util.c hash.c vector.c ui_panel.c scrollbar.c
--sngrep_SOURCES+=ui_manager.c ui_call_list.c ui_call_flow.c ui_call_raw.c
--sngrep_SOURCES+=ui_stats.c ui_filter.c ui_save.c ui_msg_diff.c
--sngrep_SOURCES+=ui_column_select.c ui_settings.c
-+sngrep_SOURCES+=util.c hash.c vector.c curses/ui_panel.c curses/scrollbar.c
-+sngrep_SOURCES+=curses/ui_manager.c curses/ui_call_list.c curses/ui_call_flow.c curses/ui_call_raw.c
-+sngrep_SOURCES+=curses/ui_stats.c curses/ui_filter.c curses/ui_save.c curses/ui_msg_diff.c
-+sngrep_SOURCES+=curses/ui_column_select.c curses/ui_settings.c
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch b/bsp/buildroot/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch
deleted file mode 100644
index b51581f5..00000000
--- a/bsp/buildroot/package/sngrep/0002-configure.ac-switch-to-pkg-config-to-find-openssl.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 22b08ab1a45eb3773b3c90dc37a31a7574520daa Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 4 Mar 2017 14:56:53 +0100
-Subject: [PATCH 2/2] configure.ac: switch to pkg-config to find openssl
-
-Using AC_CHECK_LIB() doesn't work properly for static linking, because
-it doesn't return information on transitive dependencies of
-libraries. For example, if library A internally uses library B, then
-with dynamic linking, doing -lA is sufficient. However, with static
-linking, one must do -lA -lB, and AC_CHECK_LIB() will only give the -lA
-information. This for example causes a build failure when building
-sngrep statically with openssl enabled:
-
-checking for SSL_new in -lssl... no
-configure: error:  You need to have libssl installed to compile sngrep
-
-due to undefined symbols in the OpenSSL library.
-
-The proper solution for this is to discover the library using
-pkg-config, because pkg-config properly returns the list of necessary
-libraries, as it understands the concept of "list of libraries needed
-when dynamic linking" and "list of libraries needed for static linking".
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Upstream-status: https://github.com/irontec/sngrep/pull/176
----
- configure.ac    | 9 +--------
- src/Makefile.am | 4 ++++
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 42e00e9..9f8e6d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,14 +129,7 @@ AS_IF([test "x$WITH_OPENSSL" == "xyes"], [
- 	AS_IF([test "x$WITH_GNUTLS" == "xyes"], [
- 	    AC_MSG_ERROR([ GnuTLS and OpenSSL can not be enabled at the same time ])
- 	], [])
--
--	AC_CHECK_LIB([ssl], [SSL_new], [], [
--	    AC_MSG_ERROR([ You need to have libssl installed to compile sngrep])
--	])
--
--	AC_CHECK_LIB([crypto], [EVP_get_cipherbyname], [], [
--	    AC_MSG_ERROR([ You need to have libcrypto installed to compile sngrep])
--	])
-+	PKG_CHECK_MODULES([SSL], [libssl libcrypto])
- 	AC_DEFINE([WITH_OPENSSL],[],[Compile With Openssl compatibility])
- ], [])
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 961f4a0..3a471b7 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,6 +1,8 @@
- AUTOMAKE_OPTIONS=subdir-objects
- bin_PROGRAMS=sngrep
- sngrep_SOURCES=capture.c
-+sngrep_CFLAGS=
-+sngrep_LDADD=
- if USE_EEP
- sngrep_SOURCES+=capture_eep.c
- endif
-@@ -9,6 +11,8 @@ sngrep_SOURCES+=capture_gnutls.c
- endif
- if WITH_OPENSSL
- sngrep_SOURCES+=capture_openssl.c
-+sngrep_CFLAGS+=$(SSL_CFLAGS)
-+sngrep_LDADD+=$(SSL_LIBS)
- endif
- sngrep_SOURCES+=address.c packet.c sip.c sip_call.c sip_msg.c sip_attr.c main.c
- sngrep_SOURCES+=option.c group.c filter.c keybinding.c media.c setting.c rtp.c
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/sngrep/sngrep.hash b/bsp/buildroot/package/sngrep/sngrep.hash
index dd75f895..cd2dff55 100644
--- a/bsp/buildroot/package/sngrep/sngrep.hash
+++ b/bsp/buildroot/package/sngrep/sngrep.hash
@@ -1 +1,6 @@
-sha256 30fbfb4f90ed8805194b39683a8a2ed465776ffd60df4482bd029d63b316b3f1 sngrep-v1.4.2.tar.gz
+# From https://github.com/irontec/sngrep/releases/download/v1.4.4/sngrep-1.4.4.tar.gz.md5sum
+md5 8e2286c2e23f4b29667025e5809dc303  sngrep-1.4.4.tar.gz
+
+# Locally computed
+sha256 2379b8b3e9498d426a0bc03b90d74170a80f98f167f89c126d53dcc66bc5f60b sngrep-v1.4.4.tar.gz
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE
diff --git a/bsp/buildroot/package/sngrep/sngrep.mk b/bsp/buildroot/package/sngrep/sngrep.mk
index a76887e7..93a0c3f1 100644
--- a/bsp/buildroot/package/sngrep/sngrep.mk
+++ b/bsp/buildroot/package/sngrep/sngrep.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SNGREP_VERSION = v1.4.2
+SNGREP_VERSION = v1.4.4
 SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
-SNGREP_LICENSE = GPLv3+
+SNGREP_LICENSE = GPL-3.0+
 SNGREP_LICENSE_FILES = LICENSE
 SNGREP_AUTORECONF = YES
 SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf
@@ -14,7 +14,6 @@ SNGREP_DEPENDENCIES = libpcap ncurses host-pkgconf
 SNGREP_CONF_ENV += \
 	$(if $(BR2_STATIC_LIBS),LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`")
 
-# our ncurses wchar support is not properly detected
 SNGREP_CONF_OPTS += --disable-unicode
 
 # openssl and gnutls can't be enabled at the same time.
diff --git a/bsp/buildroot/package/snmppp/Config.in b/bsp/buildroot/package/snmppp/Config.in
index 9e800fd5..8d284673 100644
--- a/bsp/buildroot/package/snmppp/Config.in
+++ b/bsp/buildroot/package/snmppp/Config.in
@@ -14,8 +14,9 @@ config BR2_PACKAGE_SNMPPP_LOGGING
 	bool "enable logging"
 	help
 	  Enable logging output for SNMP++.
-	  According to the SNMP++ documentation, disabling logging "increases
-	  performance drastically and minimizes memory consumption".
+	  According to the SNMP++ documentation, disabling logging
+	  "increases performance drastically and minimizes memory
+	  consumption".
 
 config BR2_PACKAGE_SNMPPP_SNMPV3
 	bool "enable SNMPv3"
diff --git a/bsp/buildroot/package/socat/Config.in b/bsp/buildroot/package/socat/Config.in
index 09eb2b61..af456ab7 100644
--- a/bsp/buildroot/package/socat/Config.in
+++ b/bsp/buildroot/package/socat/Config.in
@@ -1,12 +1,7 @@
 config BR2_PACKAGE_SOCAT
 	bool "socat"
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	help
 	  Multipurpose socket relay program.
 
 	  http://www.dest-unreach.org/socat/
-
-comment "socat needs a toolchain w/ threads"
-	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/socat/socat.hash b/bsp/buildroot/package/socat/socat.hash
index d867d8ac..77abcf29 100644
--- a/bsp/buildroot/package/socat/socat.hash
+++ b/bsp/buildroot/package/socat/socat.hash
@@ -1,4 +1,8 @@
 # From http://www.dest-unreach.org/socat/download.md5sum
-md5	553b1593d0a192cb09cbdc687ef1baac	socat-2.0.0-b9.tar.bz2
+md5	607a24c15bd2cb54e9328bfbbd3a1ae9	socat-1.7.3.2.tar.bz2
 # Calculated based on the hash above
-sha256	49efb0a5c66b94b279014addc2851faf8ebbd1ec4b7e31c1de7e912d7b4983d2	socat-2.0.0-b9.tar.bz2
+sha256	e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251	socat-1.7.3.2.tar.bz2
+# Locally calculated
+sha256	4846488cea98a2905dc75b7aa5eea721568e372447efe06b85bd896ee8c54f10	README
+sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643	COPYING
+sha256	fd9e48ca316a5032069b9521f4f4b4d9b1c60365012bae1e62286bcd5bd2e761	COPYING.OpenSSL
diff --git a/bsp/buildroot/package/socat/socat.mk b/bsp/buildroot/package/socat/socat.mk
index b44b8e61..5fea067d 100644
--- a/bsp/buildroot/package/socat/socat.mk
+++ b/bsp/buildroot/package/socat/socat.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-SOCAT_VERSION = 2.0.0-b9
+SOCAT_VERSION = 1.7.3.2
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download
-SOCAT_LICENSE = GPLv2
-SOCAT_LICENSE_FILES = COPYING
+SOCAT_LICENSE = GPL-2.0 with OpenSSL exception
+SOCAT_LICENSE_FILES = README COPYING COPYING.OpenSSL
 
 SOCAT_CONF_ENV = sc_cv_termios_ispeed=no
 
@@ -24,10 +24,9 @@ SOCAT_CONF_ENV += \
 	sc_cv_sys_csize_shift=4
 endif
 
-# We need to run autoconf to regenerate the configure script, in order
-# to ensure that the test checking linux/ext2_fs.h works
-# properly. However, the package only uses autoconf and not automake,
-# so we can't use the normal autoreconf logic.
+# We need to run autoconf to regenerate the configure script, since we patch
+# configure.in and Makefile.in. However, the package only uses autoconf and not
+# automake, so we can't use the normal autoreconf logic.
 
 SOCAT_DEPENDENCIES = host-autoconf
 
@@ -44,7 +43,7 @@ SOCAT_CONF_OPTS += --disable-readline
 endif
 
 define SOCAT_RUN_AUTOCONF
-	(cd $(@D); $(HOST_DIR)/usr/bin/autoconf)
+	(cd $(@D); $(HOST_DIR)/bin/autoconf)
 endef
 
 SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
diff --git a/bsp/buildroot/package/socketcand/socketcand.mk b/bsp/buildroot/package/socketcand/socketcand.mk
index 0cc56ef9..aeb052c8 100644
--- a/bsp/buildroot/package/socketcand/socketcand.mk
+++ b/bsp/buildroot/package/socketcand/socketcand.mk
@@ -7,7 +7,7 @@
 SOCKETCAND_VERSION = df7fb4ff8a4439d7737fe2df3540e1ab7465721a
 SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION))
 SOCKETCAND_AUTORECONF = YES
-SOCKETCAND_LICENSE = BSD-3c or GPLv2
+SOCKETCAND_LICENSE = BSD-3-Clause or GPL-2.0
 SOCKETCAND_LICENSE_FILES = socketcand.c
 
 ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
diff --git a/bsp/buildroot/package/sofia-sip/sofia-sip.mk b/bsp/buildroot/package/sofia-sip/sofia-sip.mk
index 5ece4483..831b9ea5 100644
--- a/bsp/buildroot/package/sofia-sip/sofia-sip.mk
+++ b/bsp/buildroot/package/sofia-sip/sofia-sip.mk
@@ -8,7 +8,7 @@ SOFIA_SIP_VERSION = 1.12.11
 SOFIA_SIP_SITE = http://downloads.sourceforge.net/project/sofia-sip/sofia-sip/$(SOFIA_SIP_VERSION)
 SOFIA_SIP_INSTALL_STAGING = YES
 SOFIA_SIP_DEPENDENCIES = host-pkgconf
-SOFIA_SIP_LICENSE = LGPLv2.1+
+SOFIA_SIP_LICENSE = LGPL-2.1+
 SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS
 SOFIA_SIP_CONF_OPTS = --with-doxygen=no
 
diff --git a/bsp/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch b/bsp/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
new file mode 100644
index 00000000..3f17a74d
--- /dev/null
+++ b/bsp/buildroot/package/softether/0001-Create-autotools-plumbing-for-SoftEther.patch
@@ -0,0 +1,2105 @@
+From c5e5d7e93c6f3302adf5821c29c4efdb7630e418 Mon Sep 17 00:00:00 2001
+From: Darik Horn <dajhorn@vanadac.com>
+Date: Sat, 12 Apr 2014 17:46:04 -0400
+Subject: [PATCH] Create autotools plumbing for SoftEther.
+
+Add autoconf and automake capabilities to SoftEther so that it can be built
+like this:
+
+	# autoreconf --force --install
+	# ./configure
+	# make install DESTDIR=/tmp/softether
+
+All standard configure parameters are supported, plus:
+
+	# ./configure --enable-debug
+
+Autotools support makes porting, cross compiling, and optimization much easier.
+
+These GNU autoconf-archive components are used for dependency checking:
+
+  * ax_check_openssl.m4
+  * ax_check_zlib.m4
+  * ax_lib_readline.m4
+  * ax_pthread.m4
+  * ax_with_curses.m4
+
+NB: http://www.gnu.org/software/autoconf-archive/
+
+[Upstream commit: https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ Makefile.am                    |  21 ++
+ autotools/ax_check_openssl.m4  | 124 ++++++++++
+ autotools/ax_check_zlib.m4     | 142 +++++++++++
+ autotools/ax_lib_readline.m4   | 107 +++++++++
+ autotools/ax_pthread.m4        | 332 ++++++++++++++++++++++++++
+ autotools/ax_with_curses.m4    | 518 +++++++++++++++++++++++++++++++++++++++++
+ autotools/softether.am         |  39 ++++
+ configure.ac                   |  96 ++++++++
+ configure => manual_configure  |   0
+ src/Cedar/Makefile.am          |  82 +++++++
+ src/Makefile.am                |  26 +++
+ src/Mayaqua/Makefile.am        |  43 ++++
+ src/bin/hamcore/Makefile.am    |  29 +++
+ src/hamcorebuilder/Makefile.am |  29 +++
+ src/vpnbridge/Makefile.am      |  29 +++
+ src/vpnclient/Makefile.am      |  29 +++
+ src/vpncmd/Makefile.am         |  29 +++
+ src/vpnserver/Makefile.am      |  29 +++
+ 18 files changed, 1704 insertions(+)
+ create mode 100644 Makefile.am
+ create mode 100644 autotools/ax_check_openssl.m4
+ create mode 100644 autotools/ax_check_zlib.m4
+ create mode 100644 autotools/ax_lib_readline.m4
+ create mode 100644 autotools/ax_pthread.m4
+ create mode 100644 autotools/ax_with_curses.m4
+ create mode 100644 autotools/softether.am
+ create mode 100644 configure.ac
+ rename configure => manual_configure (100%)
+ create mode 100644 src/Cedar/Makefile.am
+ create mode 100644 src/Makefile.am
+ create mode 100644 src/Mayaqua/Makefile.am
+ create mode 100644 src/bin/hamcore/Makefile.am
+ create mode 100644 src/hamcorebuilder/Makefile.am
+ create mode 100644 src/vpnbridge/Makefile.am
+ create mode 100644 src/vpnclient/Makefile.am
+ create mode 100644 src/vpncmd/Makefile.am
+ create mode 100644 src/vpnserver/Makefile.am
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 00000000..aa73b2ba
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,21 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++ACLOCAL_AMFLAGS = -I autotools
++include $(top_srcdir)/autotools/softether.am
++SUBDIRS = src
+diff --git a/autotools/ax_check_openssl.m4 b/autotools/ax_check_openssl.m4
+new file mode 100644
+index 00000000..a87c5a6b
+--- /dev/null
++++ b/autotools/ax_check_openssl.m4
+@@ -0,0 +1,124 @@
++# ===========================================================================
++#     http://www.gnu.org/software/autoconf-archive/ax_check_openssl.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CHECK_OPENSSL([action-if-found[, action-if-not-found]])
++#
++# DESCRIPTION
++#
++#   Look for OpenSSL in a number of default spots, or in a user-selected
++#   spot (via --with-openssl).  Sets
++#
++#     OPENSSL_INCLUDES to the include directives required
++#     OPENSSL_LIBS to the -l directives required
++#     OPENSSL_LDFLAGS to the -L or -R flags required
++#
++#   and calls ACTION-IF-FOUND or ACTION-IF-NOT-FOUND appropriately
++#
++#   This macro sets OPENSSL_INCLUDES such that source files should use the
++#   openssl/ directory in include directives:
++#
++#     #include <openssl/hmac.h>
++#
++# LICENSE
++#
++#   Copyright (c) 2009,2010 Zmanda Inc. <http://www.zmanda.com/>
++#   Copyright (c) 2009,2010 Dustin J. Mitchell <dustin@zmanda.com>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 8
++
++AU_ALIAS([CHECK_SSL], [AX_CHECK_OPENSSL])
++AC_DEFUN([AX_CHECK_OPENSSL], [
++    found=false
++    AC_ARG_WITH([openssl],
++        [AS_HELP_STRING([--with-openssl=DIR],
++            [root of the OpenSSL directory])],
++        [
++            case "$withval" in
++            "" | y | ye | yes | n | no)
++            AC_MSG_ERROR([Invalid --with-openssl value])
++              ;;
++            *) ssldirs="$withval"
++              ;;
++            esac
++        ], [
++            # if pkg-config is installed and openssl has installed a .pc file,
++            # then use that information and don't search ssldirs
++            AC_PATH_PROG([PKG_CONFIG], [pkg-config])
++            if test x"$PKG_CONFIG" != x""; then
++                OPENSSL_LDFLAGS=`$PKG_CONFIG openssl --libs-only-L 2>/dev/null`
++                if test $? = 0; then
++                    OPENSSL_LIBS=`$PKG_CONFIG openssl --libs-only-l 2>/dev/null`
++                    OPENSSL_INCLUDES=`$PKG_CONFIG openssl --cflags-only-I 2>/dev/null`
++                    found=true
++                fi
++            fi
++
++            # no such luck; use some default ssldirs
++            if ! $found; then
++                ssldirs="/usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
++            fi
++        ]
++        )
++
++
++    # note that we #include <openssl/foo.h>, so the OpenSSL headers have to be in
++    # an 'openssl' subdirectory
++
++    if ! $found; then
++        OPENSSL_INCLUDES=
++        for ssldir in $ssldirs; do
++            AC_MSG_CHECKING([for openssl/ssl.h in $ssldir])
++            if test -f "$ssldir/include/openssl/ssl.h"; then
++                OPENSSL_INCLUDES="-I$ssldir/include"
++                OPENSSL_LDFLAGS="-L$ssldir/lib"
++                OPENSSL_LIBS="-lssl -lcrypto"
++                found=true
++                AC_MSG_RESULT([yes])
++                break
++            else
++                AC_MSG_RESULT([no])
++            fi
++        done
++
++        # if the file wasn't found, well, go ahead and try the link anyway -- maybe
++        # it will just work!
++    fi
++
++    # try the preprocessor and linker with our new flags,
++    # being careful not to pollute the global LIBS, LDFLAGS, and CPPFLAGS
++
++    AC_MSG_CHECKING([whether compiling and linking against OpenSSL works])
++    echo "Trying link with OPENSSL_LDFLAGS=$OPENSSL_LDFLAGS;" \
++        "OPENSSL_LIBS=$OPENSSL_LIBS; OPENSSL_INCLUDES=$OPENSSL_INCLUDES" >&AS_MESSAGE_LOG_FD
++
++    save_LIBS="$LIBS"
++    save_LDFLAGS="$LDFLAGS"
++    save_CPPFLAGS="$CPPFLAGS"
++    LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
++    LIBS="$OPENSSL_LIBS $LIBS"
++    CPPFLAGS="$OPENSSL_INCLUDES $CPPFLAGS"
++    AC_LINK_IFELSE(
++        [AC_LANG_PROGRAM([#include <openssl/ssl.h>], [SSL_new(NULL)])],
++        [
++            AC_MSG_RESULT([yes])
++            $1
++        ], [
++            AC_MSG_RESULT([no])
++            $2
++        ])
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++
++    AC_SUBST([OPENSSL_INCLUDES])
++    AC_SUBST([OPENSSL_LIBS])
++    AC_SUBST([OPENSSL_LDFLAGS])
++])
+diff --git a/autotools/ax_check_zlib.m4 b/autotools/ax_check_zlib.m4
+new file mode 100644
+index 00000000..ae5705f6
+--- /dev/null
++++ b/autotools/ax_check_zlib.m4
+@@ -0,0 +1,142 @@
++# ===========================================================================
++#       http://www.gnu.org/software/autoconf-archive/ax_check_zlib.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_CHECK_ZLIB([action-if-found], [action-if-not-found])
++#
++# DESCRIPTION
++#
++#   This macro searches for an installed zlib library. If nothing was
++#   specified when calling configure, it searches first in /usr/local and
++#   then in /usr, /opt/local and /sw. If the --with-zlib=DIR is specified,
++#   it will try to find it in DIR/include/zlib.h and DIR/lib/libz.a. If
++#   --without-zlib is specified, the library is not searched at all.
++#
++#   If either the header file (zlib.h) or the library (libz) is not found,
++#   shell commands 'action-if-not-found' is run. If 'action-if-not-found' is
++#   not specified, the configuration exits on error, asking for a valid zlib
++#   installation directory or --without-zlib.
++#
++#   If both header file and library are found, shell commands
++#   'action-if-found' is run. If 'action-if-found' is not specified, the
++#   default action appends '-I${ZLIB_HOME}/include' to CPFLAGS, appends
++#   '-L$ZLIB_HOME}/lib' to LDFLAGS, prepends '-lz' to LIBS, and calls
++#   AC_DEFINE(HAVE_LIBZ). You should use autoheader to include a definition
++#   for this symbol in a config.h file. Sample usage in a C/C++ source is as
++#   follows:
++#
++#     #ifdef HAVE_LIBZ
++#     #include <zlib.h>
++#     #endif /* HAVE_LIBZ */
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Loic Dachary <loic@senga.org>
++#   Copyright (c) 2010 Bastien Chevreux <bach@chevreux.org>
++#
++#   This program is free software; you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation; either version 2 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 14
++
++AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB])
++AC_DEFUN([AX_CHECK_ZLIB],
++#
++# Handle user hints
++#
++[AC_MSG_CHECKING(if zlib is wanted)
++zlib_places="/usr/local /usr /opt/local /sw"
++AC_ARG_WITH([zlib],
++[  --with-zlib=DIR         root directory path of zlib installation @<:@defaults to
++                          /usr/local or /usr if not found in /usr/local@:>@
++  --without-zlib          to disable zlib usage completely],
++[if test "$withval" != no ; then
++  AC_MSG_RESULT(yes)
++  if test -d "$withval"
++  then
++    zlib_places="$withval $zlib_places"
++  else
++    AC_MSG_WARN([Sorry, $withval does not exist, checking usual places])
++  fi
++else
++  zlib_places=
++  AC_MSG_RESULT(no)
++fi],
++[AC_MSG_RESULT(yes)])
++
++#
++# Locate zlib, if wanted
++#
++if test -n "${zlib_places}"
++then
++	# check the user supplied or any other more or less 'standard' place:
++	#   Most UNIX systems      : /usr/local and /usr
++	#   MacPorts / Fink on OSX : /opt/local respectively /sw
++	for ZLIB_HOME in ${zlib_places} ; do
++	  if test -f "${ZLIB_HOME}/include/zlib.h"; then break; fi
++	  ZLIB_HOME=""
++	done
++
++  ZLIB_OLD_LDFLAGS=$LDFLAGS
++  ZLIB_OLD_CPPFLAGS=$CPPFLAGS
++  if test -n "${ZLIB_HOME}"; then
++        LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
++        CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
++  fi
++  AC_LANG_SAVE
++  AC_LANG_C
++  AC_CHECK_LIB([z], [inflateEnd], [zlib_cv_libz=yes], [zlib_cv_libz=no])
++  AC_CHECK_HEADER([zlib.h], [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
++  AC_LANG_RESTORE
++  if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes"
++  then
++    #
++    # If both library and header were found, action-if-found
++    #
++    m4_ifblank([$1],[
++                CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
++                LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
++                LIBS="-lz $LIBS"
++                AC_DEFINE([HAVE_LIBZ], [1],
++                          [Define to 1 if you have `z' library (-lz)])
++               ],[
++                # Restore variables
++                LDFLAGS="$ZLIB_OLD_LDFLAGS"
++                CPPFLAGS="$ZLIB_OLD_CPPFLAGS"
++                $1
++               ])
++  else
++    #
++    # If either header or library was not found, action-if-not-found
++    #
++    m4_default([$2],[
++                AC_MSG_ERROR([either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib])
++                ])
++  fi
++fi
++])
+diff --git a/autotools/ax_lib_readline.m4 b/autotools/ax_lib_readline.m4
+new file mode 100644
+index 00000000..056f25c2
+--- /dev/null
++++ b/autotools/ax_lib_readline.m4
+@@ -0,0 +1,107 @@
++# ===========================================================================
++#      http://www.gnu.org/software/autoconf-archive/ax_lib_readline.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_LIB_READLINE
++#
++# DESCRIPTION
++#
++#   Searches for a readline compatible library. If found, defines
++#   `HAVE_LIBREADLINE'. If the found library has the `add_history' function,
++#   sets also `HAVE_READLINE_HISTORY'. Also checks for the locations of the
++#   necessary include files and sets `HAVE_READLINE_H' or
++#   `HAVE_READLINE_READLINE_H' and `HAVE_READLINE_HISTORY_H' or
++#   'HAVE_HISTORY_H' if the corresponding include files exists.
++#
++#   The libraries that may be readline compatible are `libedit',
++#   `libeditline' and `libreadline'. Sometimes we need to link a termcap
++#   library for readline to work, this macro tests these cases too by trying
++#   to link with `libtermcap', `libcurses' or `libncurses' before giving up.
++#
++#   Here is an example of how to use the information provided by this macro
++#   to perform the necessary includes or declarations in a C file:
++#
++#     #ifdef HAVE_LIBREADLINE
++#     #  if defined(HAVE_READLINE_READLINE_H)
++#     #    include <readline/readline.h>
++#     #  elif defined(HAVE_READLINE_H)
++#     #    include <readline.h>
++#     #  else /* !defined(HAVE_READLINE_H) */
++#     extern char *readline ();
++#     #  endif /* !defined(HAVE_READLINE_H) */
++#     char *cmdline = NULL;
++#     #else /* !defined(HAVE_READLINE_READLINE_H) */
++#       /* no readline */
++#     #endif /* HAVE_LIBREADLINE */
++#
++#     #ifdef HAVE_READLINE_HISTORY
++#     #  if defined(HAVE_READLINE_HISTORY_H)
++#     #    include <readline/history.h>
++#     #  elif defined(HAVE_HISTORY_H)
++#     #    include <history.h>
++#     #  else /* !defined(HAVE_HISTORY_H) */
++#     extern void add_history ();
++#     extern int write_history ();
++#     extern int read_history ();
++#     #  endif /* defined(HAVE_READLINE_HISTORY_H) */
++#       /* no history */
++#     #endif /* HAVE_READLINE_HISTORY */
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Ville Laurikari <vl@iki.fi>
++#
++#   Copying and distribution of this file, with or without modification, are
++#   permitted in any medium without royalty provided the copyright notice
++#   and this notice are preserved. This file is offered as-is, without any
++#   warranty.
++
++#serial 6
++
++AU_ALIAS([VL_LIB_READLINE], [AX_LIB_READLINE])
++AC_DEFUN([AX_LIB_READLINE], [
++  AC_CACHE_CHECK([for a readline compatible library],
++                 ax_cv_lib_readline, [
++    ORIG_LIBS="$LIBS"
++    for readline_lib in readline edit editline; do
++      for termcap_lib in "" termcap curses ncurses; do
++        if test -z "$termcap_lib"; then
++          TRY_LIB="-l$readline_lib"
++        else
++          TRY_LIB="-l$readline_lib -l$termcap_lib"
++        fi
++        LIBS="$ORIG_LIBS $TRY_LIB"
++        AC_TRY_LINK_FUNC(readline, ax_cv_lib_readline="$TRY_LIB")
++        if test -n "$ax_cv_lib_readline"; then
++          break
++        fi
++      done
++      if test -n "$ax_cv_lib_readline"; then
++        break
++      fi
++    done
++    if test -z "$ax_cv_lib_readline"; then
++      ax_cv_lib_readline="no"
++    fi
++    LIBS="$ORIG_LIBS"
++  ])
++
++  if test "$ax_cv_lib_readline" != "no"; then
++    LIBS="$LIBS $ax_cv_lib_readline"
++    AC_DEFINE(HAVE_LIBREADLINE, 1,
++              [Define if you have a readline compatible library])
++    AC_CHECK_HEADERS(readline.h readline/readline.h)
++    AC_CACHE_CHECK([whether readline supports history],
++                   ax_cv_lib_readline_history, [
++      ax_cv_lib_readline_history="no"
++      AC_TRY_LINK_FUNC(add_history, ax_cv_lib_readline_history="yes")
++    ])
++    if test "$ax_cv_lib_readline_history" = "yes"; then
++      AC_DEFINE(HAVE_READLINE_HISTORY, 1,
++                [Define if your readline library has \`add_history'])
++      AC_CHECK_HEADERS(history.h readline/history.h)
++    fi
++  fi
++])dnl
+diff --git a/autotools/ax_pthread.m4 b/autotools/ax_pthread.m4
+new file mode 100644
+index 00000000..d383ad5c
+--- /dev/null
++++ b/autotools/ax_pthread.m4
+@@ -0,0 +1,332 @@
++# ===========================================================================
++#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
++#
++# DESCRIPTION
++#
++#   This macro figures out how to build C programs using POSIX threads. It
++#   sets the PTHREAD_LIBS output variable to the threads library and linker
++#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
++#   flags that are needed. (The user can also force certain compiler
++#   flags/libs to be tested by setting these environment variables.)
++#
++#   Also sets PTHREAD_CC to any special C compiler that is needed for
++#   multi-threaded programs (defaults to the value of CC otherwise). (This
++#   is necessary on AIX to use the special cc_r compiler alias.)
++#
++#   NOTE: You are assumed to not only compile your program with these flags,
++#   but also link it with them as well. e.g. you should link with
++#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
++#
++#   If you are only building threads programs, you may wish to use these
++#   variables in your default LIBS, CFLAGS, and CC:
++#
++#     LIBS="$PTHREAD_LIBS $LIBS"
++#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++#     CC="$PTHREAD_CC"
++#
++#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
++#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
++#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#
++#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
++#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
++#   PTHREAD_CFLAGS.
++#
++#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
++#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
++#   is not found. If ACTION-IF-FOUND is not specified, the default action
++#   will define HAVE_PTHREAD.
++#
++#   Please let the authors know if this macro fails on any platform, or if
++#   you have any other suggestions or comments. This macro was based on work
++#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
++#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
++#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
++#   grateful for the helpful feedback of numerous users.
++#
++#   Updated for Autoconf 2.68 by Daniel Richard G.
++#
++# LICENSE
++#
++#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
++#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 21
++
++AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
++AC_DEFUN([AX_PTHREAD], [
++AC_REQUIRE([AC_CANONICAL_HOST])
++AC_LANG_PUSH([C])
++ax_pthread_ok=no
++
++# We used to check for pthread.h first, but this fails if pthread.h
++# requires special compiler flags (e.g. on True64 or Sequent).
++# It gets checked for in the link test anyway.
++
++# First of all, check if the user has set any of the PTHREAD_LIBS,
++# etcetera environment variables, and if threads linking works using
++# them:
++if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
++        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test x"$ax_pthread_ok" = xno; then
++                PTHREAD_LIBS=""
++                PTHREAD_CFLAGS=""
++        fi
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++fi
++
++# We must check for the threads library under a number of different
++# names; the ordering is very important because some systems
++# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
++# libraries is broken (non-POSIX).
++
++# Create a list of thread flags to try.  Items starting with a "-" are
++# C compiler flags, and other items are library names, except for "none"
++# which indicates that we try without any flags at all, and "pthread-config"
++# which is a program returning the flags for the Pth emulation library.
++
++ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++
++# The ordering *is* (sometimes) important.  Some notes on the
++# individual items follow:
++
++# pthreads: AIX (must check this before -lpthread)
++# none: in case threads are in libc; should be tried before -Kthread and
++#       other compiler flags to prevent continual compiler warnings
++# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
++# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
++# -pthreads: Solaris/gcc
++# -mthreads: Mingw32/gcc, Lynx/gcc
++# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
++#      doesn't hurt to check since this sometimes defines pthreads too;
++#      also defines -D_REENTRANT)
++#      ... -mt is also the pthreads flag for HP/aCC
++# pthread: Linux, etcetera
++# --thread-safe: KAI C++
++# pthread-config: use pthread-config program (for GNU Pth library)
++
++case ${host_os} in
++        solaris*)
++
++        # On Solaris (at least, for some versions), libc contains stubbed
++        # (non-functional) versions of the pthreads routines, so link-based
++        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
++        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
++        # a function called by this macro, so we could check for that, but
++        # who knows whether they'll stub that too in a future libc.)  So,
++        # we'll just look for -pthreads and -lpthread first:
++
++        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++        ;;
++
++        darwin*)
++        ax_pthread_flags="-pthread $ax_pthread_flags"
++        ;;
++esac
++
++# Clang doesn't consider unrecognized options an error unless we specify
++# -Werror. We throw in some extra Clang-specific options to ensure that
++# this doesn't happen for GCC, which also accepts -Werror.
++
++AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
++save_CFLAGS="$CFLAGS"
++ax_pthread_extra_flags="-Werror"
++CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
++                  [AC_MSG_RESULT([yes])],
++                  [ax_pthread_extra_flags=
++                   AC_MSG_RESULT([no])])
++CFLAGS="$save_CFLAGS"
++
++if test x"$ax_pthread_ok" = xno; then
++for flag in $ax_pthread_flags; do
++
++        case $flag in
++                none)
++                AC_MSG_CHECKING([whether pthreads work without any flags])
++                ;;
++
++                -*)
++                AC_MSG_CHECKING([whether pthreads work with $flag])
++                PTHREAD_CFLAGS="$flag"
++                ;;
++
++                pthread-config)
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                if test x"$ax_pthread_config" = xno; then continue; fi
++                PTHREAD_CFLAGS="`pthread-config --cflags`"
++                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
++                ;;
++
++                *)
++                AC_MSG_CHECKING([for the pthreads library -l$flag])
++                PTHREAD_LIBS="-l$flag"
++                ;;
++        esac
++
++        save_LIBS="$LIBS"
++        save_CFLAGS="$CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
++
++        # Check for various functions.  We must include pthread.h,
++        # since some functions may be macros.  (On the Sequent, we
++        # need a special flag -Kthread to make this header compile.)
++        # We check for pthread_join because it is in -lpthread on IRIX
++        # while pthread_create is in libc.  We check for pthread_attr_init
++        # due to DEC craziness with -lpthreads.  We check for
++        # pthread_cleanup_push because it is one of the few pthread
++        # functions on Solaris that doesn't have a non-functional libc stub.
++        # We try pthread_create on general principles.
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++                        static void routine(void *a) { a = 0; }
++                        static void *start_routine(void *a) { return a; }],
++                       [pthread_t th; pthread_attr_t attr;
++                        pthread_create(&th, 0, start_routine, 0);
++                        pthread_join(th, 0);
++                        pthread_attr_init(&attr);
++                        pthread_cleanup_push(routine, 0);
++                        pthread_cleanup_pop(0) /* ; */])],
++                [ax_pthread_ok=yes],
++                [])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = xyes; then
++                break;
++        fi
++
++        PTHREAD_LIBS=""
++        PTHREAD_CFLAGS=""
++done
++fi
++
++# Various other checks:
++if test "x$ax_pthread_ok" = xyes; then
++        save_LIBS="$LIBS"
++        LIBS="$PTHREAD_LIBS $LIBS"
++        save_CFLAGS="$CFLAGS"
++        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++
++        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
++        AC_MSG_CHECKING([for joinable pthread attribute])
++        attr_name=unknown
++        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                           [int attr = $attr; return attr /* ; */])],
++                [attr_name=$attr; break],
++                [])
++        done
++        AC_MSG_RESULT([$attr_name])
++        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
++            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
++                               [Define to necessary symbol if this constant
++                                uses a non-standard name on your system.])
++        fi
++
++        AC_MSG_CHECKING([if more special flags are required for pthreads])
++        flag=no
++        case ${host_os} in
++            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
++            osf* | hpux*) flag="-D_REENTRANT";;
++            solaris*)
++            if test "$GCC" = "yes"; then
++                flag="-D_REENTRANT"
++            else
++                # TODO: What about Clang on Solaris?
++                flag="-mt -D_REENTRANT"
++            fi
++            ;;
++        esac
++        AC_MSG_RESULT([$flag])
++        if test "x$flag" != xno; then
++            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
++        fi
++
++        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
++            [ax_cv_PTHREAD_PRIO_INHERIT], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
++            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
++
++        LIBS="$save_LIBS"
++        CFLAGS="$save_CFLAGS"
++
++        # More AIX lossage: compile with *_r variant
++        if test "x$GCC" != xyes; then
++            case $host_os in
++                aix*)
++                AS_CASE(["x/$CC"],
++                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                  [#handle absolute path differently from PATH based program lookup
++                   AS_CASE(["x$CC"],
++                     [x/*],
++                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                ;;
++            esac
++        fi
++fi
++
++test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
++
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
++
++# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
++if test x"$ax_pthread_ok" = xyes; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
++        :
++else
++        ax_pthread_ok=no
++        $2
++fi
++AC_LANG_POP
++])dnl AX_PTHREAD
+diff --git a/autotools/ax_with_curses.m4 b/autotools/ax_with_curses.m4
+new file mode 100644
+index 00000000..e4cbd31b
+--- /dev/null
++++ b/autotools/ax_with_curses.m4
+@@ -0,0 +1,518 @@
++# ===========================================================================
++#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
++# ===========================================================================
++#
++# SYNOPSIS
++#
++#   AX_WITH_CURSES
++#
++# DESCRIPTION
++#
++#   This macro checks whether a SysV or X/Open-compatible Curses library is
++#   present, along with the associated header file.  The NcursesW
++#   (wide-character) library is searched for first, followed by Ncurses,
++#   then the system-default plain Curses.  The first library found is the
++#   one returned.
++#
++#   The following options are understood: --with-ncursesw, --with-ncurses,
++#   --without-ncursesw, --without-ncurses.  The "--with" options force the
++#   macro to use that particular library, terminating with an error if not
++#   found.  The "--without" options simply skip the check for that library.
++#   The effect on the search pattern is:
++#
++#     (no options)                           - NcursesW, Ncurses, Curses
++#     --with-ncurses     --with-ncursesw     - NcursesW only [*]
++#     --without-ncurses  --with-ncursesw     - NcursesW only [*]
++#                        --with-ncursesw     - NcursesW only [*]
++#     --with-ncurses     --without-ncursesw  - Ncurses only [*]
++#     --with-ncurses                         - NcursesW, Ncurses [**]
++#     --without-ncurses  --without-ncursesw  - Curses only
++#                        --without-ncursesw  - Ncurses, Curses
++#     --without-ncurses                      - NcursesW, Curses
++#
++#   [*]  If the library is not found, abort the configure script.
++#
++#   [**] If the second library (Ncurses) is not found, abort configure.
++#
++#   The following preprocessor symbols may be defined by this macro if the
++#   appropriate conditions are met:
++#
++#     HAVE_CURSES             - if any SysV or X/Open Curses library found
++#     HAVE_CURSES_ENHANCED    - if library supports X/Open Enhanced functions
++#     HAVE_CURSES_COLOR       - if library supports color (enhanced functions)
++#     HAVE_CURSES_OBSOLETE    - if library supports certain obsolete features
++#     HAVE_NCURSESW           - if NcursesW (wide char) library is to be used
++#     HAVE_NCURSES            - if the Ncurses library is to be used
++#
++#     HAVE_CURSES_H           - if <curses.h> is present and should be used
++#     HAVE_NCURSESW_H         - if <ncursesw.h> should be used
++#     HAVE_NCURSES_H          - if <ncurses.h> should be used
++#     HAVE_NCURSESW_CURSES_H  - if <ncursesw/curses.h> should be used
++#     HAVE_NCURSES_CURSES_H   - if <ncurses/curses.h> should be used
++#
++#   (These preprocessor symbols are discussed later in this document.)
++#
++#   The following output variable is defined by this macro; it is precious
++#   and may be overridden on the ./configure command line:
++#
++#     CURSES_LIB  - library to add to xxx_LDADD
++#
++#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
++#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
++#   Makefile.am.  For example:
++#
++#     prog_LDADD = @CURSES_LIB@
++#
++#   If CURSES_LIB is set on the configure command line (such as by running
++#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
++#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
++#   override the standard #include search path.  If the user needs to
++#   specify an alternative path for a library (such as for a non-standard
++#   NcurseW), the user should use the LDFLAGS variable.
++#
++#   The following shell variables may be defined by this macro:
++#
++#     ax_cv_curses           - set to "yes" if any Curses library found
++#     ax_cv_curses_enhanced  - set to "yes" if Enhanced functions present
++#     ax_cv_curses_color     - set to "yes" if color functions present
++#     ax_cv_curses_obsolete  - set to "yes" if obsolete features present
++#
++#     ax_cv_ncursesw      - set to "yes" if NcursesW library found
++#     ax_cv_ncurses       - set to "yes" if Ncurses library found
++#     ax_cv_plaincurses   - set to "yes" if plain Curses library found
++#     ax_cv_curses_which  - set to "ncursesw", "ncurses", "plaincurses" or "no"
++#
++#   These variables can be used in your configure.ac to determine the level
++#   of support you need from the Curses library.  For example, if you must
++#   have either Ncurses or NcursesW, you could include:
++#
++#     AX_WITH_CURSES
++#     if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
++#         AC_MSG_ERROR([requires either NcursesW or Ncurses library])
++#     fi
++#
++#   If any Curses library will do (but one must be present and must support
++#   color), you could use:
++#
++#     AX_WITH_CURSES
++#     if test "x$ax_cv_curses" != xyes || test "x$ax_cv_curses_color" != xyes; then
++#         AC_MSG_ERROR([requires an X/Open-compatible Curses library with color])
++#     fi
++#
++#   Certain preprocessor symbols and shell variables defined by this macro
++#   can be used to determine various features of the Curses library.  In
++#   particular, HAVE_CURSES and ax_cv_curses are defined if the Curses
++#   library found conforms to the traditional SysV and/or X/Open Base Curses
++#   definition.  Any working Curses library conforms to this level.
++#
++#   HAVE_CURSES_ENHANCED and ax_cv_curses_enhanced are defined if the
++#   library supports the X/Open Enhanced Curses definition.  In particular,
++#   the wide-character types attr_t, cchar_t and wint_t, the functions
++#   wattr_set() and wget_wch() and the macros WA_NORMAL and _XOPEN_CURSES
++#   are checked.  The Ncurses library does NOT conform to this definition,
++#   although NcursesW does.
++#
++#   HAVE_CURSES_COLOR and ax_cv_curses_color are defined if the library
++#   supports color functions and macros such as COLOR_PAIR, A_COLOR,
++#   COLOR_WHITE, COLOR_RED and init_pair().  These are NOT part of the
++#   X/Open Base Curses definition, but are part of the Enhanced set of
++#   functions.  The Ncurses library DOES support these functions, as does
++#   NcursesW.
++#
++#   HAVE_CURSES_OBSOLETE and ax_cv_curses_obsolete are defined if the
++#   library supports certain features present in SysV and BSD Curses but not
++#   defined in the X/Open definition.  In particular, the functions
++#   getattrs(), getcurx() and getmaxx() are checked.
++#
++#   To use the HAVE_xxx_H preprocessor symbols, insert the following into
++#   your system.h (or equivalent) header file:
++#
++#     #if defined HAVE_NCURSESW_CURSES_H
++#     #  include <ncursesw/curses.h>
++#     #elif defined HAVE_NCURSESW_H
++#     #  include <ncursesw.h>
++#     #elif defined HAVE_NCURSES_CURSES_H
++#     #  include <ncurses/curses.h>
++#     #elif defined HAVE_NCURSES_H
++#     #  include <ncurses.h>
++#     #elif defined HAVE_CURSES_H
++#     #  include <curses.h>
++#     #else
++#     #  error "SysV or X/Open-compatible Curses header file required"
++#     #endif
++#
++#   For previous users of this macro: you should not need to change anything
++#   in your configure.ac or Makefile.am, as the previous (serial 10)
++#   semantics are still valid.  However, you should update your system.h (or
++#   equivalent) header file to the fragment shown above. You are encouraged
++#   also to make use of the extended functionality provided by this version
++#   of AX_WITH_CURSES, as well as in the additional macros
++#   AX_WITH_CURSES_PANEL, AX_WITH_CURSES_MENU and AX_WITH_CURSES_FORM.
++#
++# LICENSE
++#
++#   Copyright (c) 2009 Mark Pulford <mark@kyne.com.au>
++#   Copyright (c) 2009 Damian Pietras <daper@daper.net>
++#   Copyright (c) 2012 Reuben Thomas <rrt@sc3d.org>
++#   Copyright (c) 2011 John Zaitseff <J.Zaitseff@zap.org.au>
++#
++#   This program is free software: you can redistribute it and/or modify it
++#   under the terms of the GNU General Public License as published by the
++#   Free Software Foundation, either version 3 of the License, or (at your
++#   option) any later version.
++#
++#   This program is distributed in the hope that it will be useful, but
++#   WITHOUT ANY WARRANTY; without even the implied warranty of
++#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
++#   Public License for more details.
++#
++#   You should have received a copy of the GNU General Public License along
++#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#
++#   As a special exception, the respective Autoconf Macro's copyright owner
++#   gives unlimited permission to copy, distribute and modify the configure
++#   scripts that are the output of Autoconf when processing the Macro. You
++#   need not follow the terms of the GNU General Public License when using
++#   or distributing such scripts, even though portions of the text of the
++#   Macro appear in them. The GNU General Public License (GPL) does govern
++#   all other use of the material that constitutes the Autoconf Macro.
++#
++#   This special exception to the GPL applies to versions of the Autoconf
++#   Macro released by the Autoconf Archive. When you make and distribute a
++#   modified version of the Autoconf Macro, you may extend this special
++#   exception to the GPL to apply to your modified version as well.
++
++#serial 15
++
++AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
++AC_DEFUN([AX_WITH_CURSES], [
++    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
++    AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
++        [force the use of Ncurses or NcursesW])],
++        [], [with_ncurses=check])
++    AC_ARG_WITH([ncursesw], [AS_HELP_STRING([--without-ncursesw],
++        [do not use NcursesW (wide character support)])],
++        [], [with_ncursesw=check])
++
++    ax_saved_LIBS=$LIBS
++    AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
++        [ax_with_plaincurses=no], [ax_with_plaincurses=check])
++
++    ax_cv_curses_which=no
++
++    # Test for NcursesW
++
++    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
++        LIBS="$ax_saved_LIBS -lncursesw"
++
++        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
++        ])
++        AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
++            AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
++        ])
++
++        AS_IF([test "x$ax_cv_ncursesw" = xyes], [
++            ax_cv_curses=yes
++            ax_cv_curses_which=ncursesw
++            CURSES_LIB="-lncursesw"
++            AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
++            AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
++
++            AC_CACHE_CHECK([for working ncursesw/curses.h], [ax_cv_header_ncursesw_curses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <ncursesw/curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        attr_t d = WA_NORMAL;
++                        cchar_t e;
++                        wint_t f;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                        wattr_set(stdscr, d, 0, NULL);
++                        wget_wch(stdscr, &f);
++                    ]])],
++                    [ax_cv_header_ncursesw_curses_h=yes],
++                    [ax_cv_header_ncursesw_curses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xyes], [
++                ax_cv_curses_enhanced=yes
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_ENHANCED],   [1], [Define to 1 if library supports X/Open Enhanced functions])
++                AC_DEFINE([HAVE_CURSES_COLOR],      [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE],   [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSESW_CURSES_H], [1], [Define to 1 if <ncursesw/curses.h> is present])
++            ])
++
++            AC_CACHE_CHECK([for working ncursesw.h], [ax_cv_header_ncursesw_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <ncursesw.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        attr_t d = WA_NORMAL;
++                        cchar_t e;
++                        wint_t f;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                        wattr_set(stdscr, d, 0, NULL);
++                        wget_wch(stdscr, &f);
++                    ]])],
++                    [ax_cv_header_ncursesw_h=yes],
++                    [ax_cv_header_ncursesw_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncursesw_h" = xyes], [
++                ax_cv_curses_enhanced=yes
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSESW_H],      [1], [Define to 1 if <ncursesw.h> is present])
++            ])
++
++            AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h_with_ncursesw], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <ncurses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        attr_t d = WA_NORMAL;
++                        cchar_t e;
++                        wint_t f;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                        wattr_set(stdscr, d, 0, NULL);
++                        wget_wch(stdscr, &f);
++                    ]])],
++                    [ax_cv_header_ncurses_h_with_ncursesw=yes],
++                    [ax_cv_header_ncurses_h_with_ncursesw=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncurses_h_with_ncursesw" = xyes], [
++                ax_cv_curses_enhanced=yes
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSES_H],       [1], [Define to 1 if <ncurses.h> is present])
++            ])
++
++            AS_IF([test "x$ax_cv_header_ncursesw_curses_h" = xno && test "x$ax_cv_header_ncursesw_h" = xno && test "x$ax_cv_header_ncurses_h_with_ncursesw" = xno], [
++                AC_MSG_WARN([could not find a working ncursesw/curses.h, ncursesw.h or ncurses.h])
++            ])
++        ])
++    ])
++
++    # Test for Ncurses
++
++    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
++        LIBS="$ax_saved_LIBS -lncurses"
++
++        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
++        ])
++        AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
++            AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
++        ])
++
++        AS_IF([test "x$ax_cv_ncurses" = xyes], [
++            ax_cv_curses=yes
++            ax_cv_curses_which=ncurses
++            CURSES_LIB="-lncurses"
++            AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
++            AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
++
++            AC_CACHE_CHECK([for working ncurses/curses.h], [ax_cv_header_ncurses_curses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <ncurses/curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                    ]])],
++                    [ax_cv_header_ncurses_curses_h=yes],
++                    [ax_cv_header_ncurses_curses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xyes], [
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_COLOR],     [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE],  [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSES_CURSES_H], [1], [Define to 1 if <ncurses/curses.h> is present])
++            ])
++
++            AC_CACHE_CHECK([for working ncurses.h], [ax_cv_header_ncurses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <ncurses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        chtype c = COLOR_PAIR(1) & A_COLOR;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                        init_pair(1, COLOR_WHITE, COLOR_RED);
++                    ]])],
++                    [ax_cv_header_ncurses_h=yes],
++                    [ax_cv_header_ncurses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_ncurses_h" = xyes], [
++                ax_cv_curses_color=yes
++                ax_cv_curses_obsolete=yes
++                AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                AC_DEFINE([HAVE_NCURSES_H],       [1], [Define to 1 if <ncurses.h> is present])
++            ])
++
++            AS_IF([test "x$ax_cv_header_ncurses_curses_h" = xno && test "x$ax_cv_header_ncurses_h" = xno], [
++                AC_MSG_WARN([could not find a working ncurses/curses.h or ncurses.h])
++            ])
++        ])
++    ])
++
++    # Test for plain Curses (or if CURSES_LIB was set by user)
++
++    AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
++        AS_IF([test "x$CURSES_LIB" != x], [
++            LIBS="$ax_saved_LIBS $CURSES_LIB"
++        ], [
++            LIBS="$ax_saved_LIBS -lcurses"
++        ])
++
++        AC_CACHE_CHECK([for Curses library], [ax_cv_plaincurses], [
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [ax_cv_plaincurses=yes], [ax_cv_plaincurses=no])
++        ])
++
++        AS_IF([test "x$ax_cv_plaincurses" = xyes], [
++            ax_cv_curses=yes
++            ax_cv_curses_which=plaincurses
++            AS_IF([test "x$CURSES_LIB" = x], [
++                CURSES_LIB="-lcurses"
++            ])
++            AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
++
++            # Check for base conformance (and header file)
++
++            AC_CACHE_CHECK([for working curses.h], [ax_cv_header_curses_h], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        initscr();
++                    ]])],
++                    [ax_cv_header_curses_h=yes],
++                    [ax_cv_header_curses_h=no])
++            ])
++            AS_IF([test "x$ax_cv_header_curses_h" = xyes], [
++                AC_DEFINE([HAVE_CURSES_H], [1], [Define to 1 if <curses.h> is present])
++
++                # Check for X/Open Enhanced conformance
++
++                AC_CACHE_CHECK([for X/Open Enhanced Curses conformance], [ax_cv_plaincurses_enhanced], [
++                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                            @%:@define _XOPEN_SOURCE_EXTENDED 1
++                            @%:@include <curses.h>
++                            @%:@ifndef _XOPEN_CURSES
++                            @%:@error "this Curses library is not enhanced"
++                            "this Curses library is not enhanced"
++                            @%:@endif
++                        ]], [[
++                            chtype a = A_BOLD;
++                            int b = KEY_LEFT;
++                            chtype c = COLOR_PAIR(1) & A_COLOR;
++                            attr_t d = WA_NORMAL;
++                            cchar_t e;
++                            wint_t f;
++                            initscr();
++                            init_pair(1, COLOR_WHITE, COLOR_RED);
++                            wattr_set(stdscr, d, 0, NULL);
++                            wget_wch(stdscr, &f);
++                        ]])],
++                        [ax_cv_plaincurses_enhanced=yes],
++                        [ax_cv_plaincurses_enhanced=no])
++                ])
++                AS_IF([test "x$ax_cv_plaincurses_enhanced" = xyes], [
++                    ax_cv_curses_enhanced=yes
++                    ax_cv_curses_color=yes
++                    AC_DEFINE([HAVE_CURSES_ENHANCED], [1], [Define to 1 if library supports X/Open Enhanced functions])
++                    AC_DEFINE([HAVE_CURSES_COLOR],    [1], [Define to 1 if library supports color (enhanced functions)])
++                ])
++
++                # Check for color functions
++
++                AC_CACHE_CHECK([for Curses color functions], [ax_cv_plaincurses_color], [
++                    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@define _XOPEN_SOURCE_EXTENDED 1
++                        @%:@include <curses.h>
++                        ]], [[
++                            chtype a = A_BOLD;
++                            int b = KEY_LEFT;
++                            chtype c = COLOR_PAIR(1) & A_COLOR;
++                            initscr();
++                            init_pair(1, COLOR_WHITE, COLOR_RED);
++                        ]])],
++                        [ax_cv_plaincurses_color=yes],
++                        [ax_cv_plaincurses_color=no])
++                ])
++                AS_IF([test "x$ax_cv_plaincurses_color" = xyes], [
++                    ax_cv_curses_color=yes
++                    AC_DEFINE([HAVE_CURSES_COLOR], [1], [Define to 1 if library supports color (enhanced functions)])
++                ])
++
++                # Check for obsolete functions
++
++                AC_CACHE_CHECK([for obsolete Curses functions], [ax_cv_plaincurses_obsolete], [
++                AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++                        @%:@include <curses.h>
++                    ]], [[
++                        chtype a = A_BOLD;
++                        int b = KEY_LEFT;
++                        int g = getattrs(stdscr);
++                        int h = getcurx(stdscr) + getmaxx(stdscr);
++                        initscr();
++                    ]])],
++                    [ax_cv_plaincurses_obsolete=yes],
++                    [ax_cv_plaincurses_obsolete=no])
++                ])
++                AS_IF([test "x$ax_cv_plaincurses_obsolete" = xyes], [
++                    ax_cv_curses_obsolete=yes
++                    AC_DEFINE([HAVE_CURSES_OBSOLETE], [1], [Define to 1 if library supports certain obsolete features])
++                ])
++            ])
++
++            AS_IF([test "x$ax_cv_header_curses_h" = xno], [
++                AC_MSG_WARN([could not find a working curses.h])
++            ])
++        ])
++    ])
++
++    AS_IF([test "x$ax_cv_curses"          != xyes], [ax_cv_curses=no])
++    AS_IF([test "x$ax_cv_curses_enhanced" != xyes], [ax_cv_curses_enhanced=no])
++    AS_IF([test "x$ax_cv_curses_color"    != xyes], [ax_cv_curses_color=no])
++    AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
++
++    LIBS=$ax_saved_LIBS
++])dnl
+diff --git a/autotools/softether.am b/autotools/softether.am
+new file mode 100644
+index 00000000..e5e91eeb
+--- /dev/null
++++ b/autotools/softether.am
+@@ -0,0 +1,39 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++if CONFIGURE_ENABLE_DEBUG
++DEBUG_CFLAGS = -g -D_DEBUG -DDEBUG
++else
++DEBUG_CFLAGS = -DNDEBUG -DVPN_SPEED
++endif
++
++AM_CFLAGS = \
++	$(DEBUG_CFLAGS) \
++	-I$(top_srcdir)/src \
++	-I$(top_srcdir)/src/Mayaqua \
++	-I$(top_srcdir)/src/Cedar \
++	-DUNIX \
++	-DUNIX_LINUX \
++	-D_REENTRANT \
++	-DREENTRANT \
++	-D_THREAD_SAFE \
++	-D_THREADSAFE \
++	-DTHREAD_SAFE \
++	-DTHREADSAFE \
++	-D_FILE_OFFSET_BITS=64 \
++	-fsigned-char
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 00000000..4a3fc2ba
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,96 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++AC_INIT([SoftEther], [1], [http://www.vpnusers.com/], [softether], [http://www.softether.org/])
++AC_CONFIG_AUX_DIR([autotools])
++AC_CONFIG_MACRO_DIR([autotools])
++AM_INIT_AUTOMAKE([foreign -Wall -Werror])
++AM_PROG_AR
++AC_PROG_CC
++AC_PROG_LIBTOOL
++AC_CONFIG_HEADERS([softether_config.h])
++AC_CONFIG_FILES([
++	Makefile
++	src/Makefile
++	src/Mayaqua/Makefile
++	src/Cedar/Makefile
++	src/hamcorebuilder/Makefile
++	src/bin/hamcore/Makefile
++	src/vpnserver/Makefile
++	src/vpnclient/Makefile
++	src/vpnbridge/Makefile
++	src/vpncmd/Makefile
++])
++
++
++AC_ARG_ENABLE(
++	[debug],
++	AS_HELP_STRING([--enable-debug], [build SoftEther with debugging features]),
++	[debug=yes]
++)
++AM_CONDITIONAL([CONFIGURE_ENABLE_DEBUG], [test _"$debug" = _yes])
++
++
++AX_PTHREAD([
++	AC_SUBST(PTHREAD_CC)
++	AC_SUBST(PTHREAD_CFLAGS)
++	AC_SUBST(PTHREAD_LIBS)
++],[
++	AC_MSG_ERROR([pthread capabilities not found])
++])
++
++CC="$PTHREAD_CC"
++CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++LIBS="$PTHREAD_LIBS $LIBS"
++
++
++AX_CHECK_OPENSSL([
++	AC_SUBST(OPENSSL_LIBS)
++	AC_SUBST(OPENSSL_LDFLAGS)
++],[
++	AC_MSG_ERROR([openssl not found])
++])
++
++LIBS="$LIBS $OPENSSL_LIBS"
++LDFLAGS="$LDFLAGS $OPENSSL_LDFLAGS"
++
++
++# This macro automatically updates build variables.
++AX_CHECK_ZLIB(, AC_MSG_ERROR([zlib not found]))
++
++
++AX_WITH_CURSES
++if test "_$ax_cv_curses" != _yes
++then
++	AC_MSG_ERROR([libcurses, libncurses, or libncursesw not found])
++else
++	AC_SUBST(CURSES_LIB)
++	LIBS="$LIBS $CURSES_LIB"
++fi
++
++
++AX_LIB_READLINE
++if test "_$ax_cv_lib_readline" = _no
++then
++	AC_MSG_ERROR([libreadline not found])
++else
++	: This macro automatically updates build variables.
++fi
++
++
++AC_OUTPUT
+--- a/configure	2017-07-16 04:53:31.000000000 +0200
++++ b/configure	1970-01-01 01:00:00.000000000 +0100
+@@ -1,112 +0,0 @@
+-#!/bin/sh
+-
+-echo '---------------------------------------------------------------------'
+-echo 'SoftEther VPN for Unix'
+-echo
+-echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'
+-echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'
+-echo
+-echo 'This program is free software; you can redistribute it and/or'
+-echo 'modify it under the terms of the GNU General Public License'
+-echo 'version 2 as published by the Free Software Foundation.'
+-echo
+-echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'
+-echo '---------------------------------------------------------------------'
+-echo
+-
+-echo 'Welcome to the corner-cutting configure script !'
+-echo
+-
+-OS=""
+-case "`uname -s`" in
+-Linux)
+-	OS="linux"
+-	;;
+-FreeBSD)
+-	OS="freebsd"
+-	;;
+-SunOS)
+-	OS="solaris"
+-	;;
+-Darwin)
+-	OS="macos"
+-	;;
+-OpenBSD)
+-	OS="openbsd"
+-	;;
+-*)
+-	echo 'Select your operating system below:'
+-	echo ' 1: Linux'
+-	echo ' 2: FreeBSD'
+-	echo ' 3: Solaris'
+-	echo ' 4: Mac OS X'
+-	echo ' 5: OpenBSD'
+-	echo
+-	echo -n 'Which is your operating system (1 - 5) ? : '
+-	read TMP
+-	echo
+-	if test "$TMP" = "1"
+-	then
+-		OS="linux"
+-	fi
+-	if test "$TMP" = "2"
+-	then
+-		OS="freebsd"
+-	fi
+-	if test "$TMP" = "3"
+-	then
+-		OS="solaris"
+-	fi
+-	if test "$TMP" = "4"
+-	then
+-		OS="macos"
+-	fi
+-	if test "$TMP" = "5"
+-	then
+-		OS="openbsd"
+-	fi
+-
+-	if test "$OS" = ""
+-	then
+-		echo "Wrong number."
+-		exit 1
+-	fi
+-	;;
+-esac
+-
+-CPU=""
+-case "`uname -m`" in
+-x86_64|amd64|aarch64|arm64|armv8*|mips64|ppc64|sparc64|alpha|ia64)
+-	CPU=64bit
+-	;;
+-i?86|x86pc|i86pc|armv4*|armv5*|armv6*|armv7*)
+-	CPU=32bit
+-	;;
+-*)
+-	echo 'Select your CPU bits below:'
+-	echo ' 1: 32-bit'
+-	echo ' 2: 64-bit'
+-	echo
+-	echo -n 'Which is the type of your CPU (1 - 2) ? : '
+-	read TMP
+-	echo
+-	if test "$TMP" = "1"
+-	then
+-		CPU="32bit"
+-	fi
+-	if test "$TMP" = "2"
+-	then
+-		CPU="64bit"
+-	fi
+-
+-	if test "$CPU" = ""
+-	then
+-		echo "Wrong number."
+-		exit 1
+-	fi
+-	;;
+-esac
+-
+-cp src/makefiles/${OS}_${CPU}.mak Makefile
+-
+-echo "The Makefile is generated. Run 'make' to build SoftEther VPN."
+--- a/manual_configure	1970-01-01 01:00:00.000000000 +0100
++++ b/manual_configure	2017-07-16 04:53:31.000000000 +0200
+@@ -0,0 +1,112 @@
++#!/bin/sh
++
++echo '---------------------------------------------------------------------'
++echo 'SoftEther VPN for Unix'
++echo
++echo 'Copyright (c) SoftEther VPN Project at University of Tsukuba, Japan.'
++echo 'Copyright (c) Daiyuu Nobori. All Rights Reserved.'
++echo
++echo 'This program is free software; you can redistribute it and/or'
++echo 'modify it under the terms of the GNU General Public License'
++echo 'version 2 as published by the Free Software Foundation.'
++echo
++echo 'Read and understand README.TXT, LICENSE.TXT and WARNING.TXT before use.'
++echo '---------------------------------------------------------------------'
++echo
++
++echo 'Welcome to the corner-cutting configure script !'
++echo
++
++OS=""
++case "`uname -s`" in
++Linux)
++	OS="linux"
++	;;
++FreeBSD)
++	OS="freebsd"
++	;;
++SunOS)
++	OS="solaris"
++	;;
++Darwin)
++	OS="macos"
++	;;
++OpenBSD)
++	OS="openbsd"
++	;;
++*)
++	echo 'Select your operating system below:'
++	echo ' 1: Linux'
++	echo ' 2: FreeBSD'
++	echo ' 3: Solaris'
++	echo ' 4: Mac OS X'
++	echo ' 5: OpenBSD'
++	echo
++	echo -n 'Which is your operating system (1 - 5) ? : '
++	read TMP
++	echo
++	if test "$TMP" = "1"
++	then
++		OS="linux"
++	fi
++	if test "$TMP" = "2"
++	then
++		OS="freebsd"
++	fi
++	if test "$TMP" = "3"
++	then
++		OS="solaris"
++	fi
++	if test "$TMP" = "4"
++	then
++		OS="macos"
++	fi
++	if test "$TMP" = "5"
++	then
++		OS="openbsd"
++	fi
++
++	if test "$OS" = ""
++	then
++		echo "Wrong number."
++		exit 1
++	fi
++	;;
++esac
++
++CPU=""
++case "`uname -m`" in
++x86_64|amd64|aarch64|arm64|armv8*|mips64|ppc64|sparc64|alpha|ia64)
++	CPU=64bit
++	;;
++i?86|x86pc|i86pc|armv4*|armv5*|armv6*|armv7*)
++	CPU=32bit
++	;;
++*)
++	echo 'Select your CPU bits below:'
++	echo ' 1: 32-bit'
++	echo ' 2: 64-bit'
++	echo
++	echo -n 'Which is the type of your CPU (1 - 2) ? : '
++	read TMP
++	echo
++	if test "$TMP" = "1"
++	then
++		CPU="32bit"
++	fi
++	if test "$TMP" = "2"
++	then
++		CPU="64bit"
++	fi
++
++	if test "$CPU" = ""
++	then
++		echo "Wrong number."
++		exit 1
++	fi
++	;;
++esac
++
++cp src/makefiles/${OS}_${CPU}.mak Makefile
++
++echo "The Makefile is generated. Run 'make' to build SoftEther VPN."
+diff --git a/src/Cedar/Makefile.am b/src/Cedar/Makefile.am
+new file mode 100644
+index 00000000..5346537d
+--- /dev/null
++++ b/src/Cedar/Makefile.am
+@@ -0,0 +1,82 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++noinst_LTLIBRARIES = libcedar.la
++
++libcedar_la_SOURCES = \
++	Account.c \
++	Admin.c \
++	AzureClient.c \
++	AzureServer.c \
++	Bridge.c \
++	BridgeUnix.c \
++	BridgeWin32.c \
++	Cedar.c \
++	CedarPch.c \
++	Client.c \
++	CM.c \
++	Command.c \
++	Connection.c \
++	Console.c \
++	Database.c \
++	DDNS.c \
++	EM.c \
++	EtherLog.c \
++	Hub.c \
++	Interop_OpenVPN.c \
++	Interop_SSTP.c \
++	IPsec.c \
++	IPsec_EtherIP.c \
++	IPsec_IKE.c \
++	IPsec_IkePacket.c \
++	IPsec_IPC.c \
++	IPsec_L2TP.c \
++	IPsec_PPP.c \
++	IPsec_Win7.c \
++	Layer3.c \
++	Link.c \
++	Listener.c \
++	Logging.c \
++	Nat.c \
++	NativeStack.c \
++	NM.c \
++	NullLan.c \
++	Protocol.c \
++	Radius.c \
++	Remote.c \
++	Sam.c \
++	SecureInfo.c \
++	SecureNAT.c \
++	SeLowUser.c \
++	Server.c \
++	Session.c \
++	SM.c \
++	SW.c \
++	UdpAccel.c \
++	UT.c \
++	VG.c \
++	Virtual.c \
++	VLan.c \
++	VLanUnix.c \
++	VLanWin32.c \
++	WaterMark.c \
++	WebUI.c \
++	WinUi.c \
++	Wpc.c
+diff --git a/src/Makefile.am b/src/Makefile.am
+new file mode 100644
+index 00000000..dc745426
+--- /dev/null
++++ b/src/Makefile.am
+@@ -0,0 +1,26 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++# These components are built as libtool convenience libraries.
++SUBDIRS = Mayaqua Cedar
++
++# This is a nodist helper.
++SUBDIRS += hamcorebuilder
++
++# These are final build products.
++SUBDIRS += bin/hamcore vpnserver vpnclient vpnbridge vpncmd
+diff --git a/src/Mayaqua/Makefile.am b/src/Mayaqua/Makefile.am
+new file mode 100644
+index 00000000..6b8dc1a6
+--- /dev/null
++++ b/src/Mayaqua/Makefile.am
+@@ -0,0 +1,43 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++noinst_LTLIBRARIES = libmayaqua.la
++
++libmayaqua_la_SOURCES = \
++	Cfg.c \
++	Encrypt.c \
++	FileIO.c \
++	Internat.c \
++	Kernel.c \
++	Mayaqua.c \
++	Memory.c \
++	Microsoft.c \
++	Network.c \
++	Object.c \
++	OS.c \
++	Pack.c \
++	Secure.c \
++	Str.c \
++	Table.c \
++	TcpIp.c \
++	Tick64.c \
++	Tracking.c \
++	Unix.c \
++	Win32.c
+diff --git a/src/bin/hamcore/Makefile.am b/src/bin/hamcore/Makefile.am
+new file mode 100644
+index 00000000..37b0291e
+--- /dev/null
++++ b/src/bin/hamcore/Makefile.am
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++# This is required to use a custom build rule with -Wall and -Werror enabled.
++AUTOMAKE_OPTIONS = -Wno-override
++EXEEXT =
++HAMCOREBUILDER = $(top_builddir)/src/hamcorebuilder/hamcorebuilder
++
++sbin_PROGRAMS = hamcore.se2
++
++hamcore.se2$(EXEEXT): $(HAMCOREBUILDER)
++	$(HAMCOREBUILDER) $(top_srcdir)/src/bin/hamcore $@
+diff --git a/src/hamcorebuilder/Makefile.am b/src/hamcorebuilder/Makefile.am
+new file mode 100644
+index 00000000..a22429f0
+--- /dev/null
++++ b/src/hamcorebuilder/Makefile.am
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++noinst_PROGRAMS = \
++	hamcorebuilder
++
++hamcorebuilder_SOURCES = \
++	hamcorebuilder.c
++
++hamcorebuilder_LDADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
+diff --git a/src/vpnbridge/Makefile.am b/src/vpnbridge/Makefile.am
+new file mode 100644
+index 00000000..35fe043d
+--- /dev/null
++++ b/src/vpnbridge/Makefile.am
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++sbin_PROGRAMS = \
++	vpnbridge
++
++vpnbridge_SOURCES = \
++	vpnbridge.c
++
++vpnbridge_LDADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
+diff --git a/src/vpnclient/Makefile.am b/src/vpnclient/Makefile.am
+new file mode 100644
+index 00000000..1aa55330
+--- /dev/null
++++ b/src/vpnclient/Makefile.am
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++sbin_PROGRAMS = \
++	vpnclient
++
++vpnclient_SOURCES = \
++	vpncsvc.c
++
++vpnclient_LDADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
+diff --git a/src/vpncmd/Makefile.am b/src/vpncmd/Makefile.am
+new file mode 100644
+index 00000000..d8042aa2
+--- /dev/null
++++ b/src/vpncmd/Makefile.am
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++sbin_PROGRAMS = \
++	vpncmd
++
++vpncmd_SOURCES = \
++	vpncmd.c
++
++vpncmd_LDADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
+diff --git a/src/vpnserver/Makefile.am b/src/vpnserver/Makefile.am
+new file mode 100644
+index 00000000..c1c33570
+--- /dev/null
++++ b/src/vpnserver/Makefile.am
+@@ -0,0 +1,29 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++sbin_PROGRAMS = \
++	vpnserver
++
++vpnserver_SOURCES = \
++	vpnserver.c
++
++vpnserver_LDADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
diff --git a/bsp/buildroot/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch b/bsp/buildroot/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch
new file mode 100644
index 00000000..1fdf1187
--- /dev/null
+++ b/bsp/buildroot/package/softether/0002-Create-libsoftether.so-and-dynamically-link.patch
@@ -0,0 +1,133 @@
+From 75625af541fd128f51079d0ffe5ef24645b8f421 Mon Sep 17 00:00:00 2001
+From: Darik Horn <dajhorn@vanadac.com>
+Date: Sun, 13 Apr 2014 12:51:15 -0400
+Subject: [PATCH] Create libsoftether.so and dynamically link the userland.
+
+Sharing object code between vpnbridge, vpnclient, vpnserver, and vpncmd
+reduces the binary size of SoftEther by 85% and its administrative memory
+footprint by 50%.
+
+[Upstream commit https://github.com/dajhorn/SoftEtherVPN/commit/75625af541fd128f51079d0ffe5ef24645b8f421]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ configure.ac                 |  1 +
+ src/Makefile.am              |  7 +++++--
+ src/libsoftether/Makefile.am | 34 ++++++++++++++++++++++++++++++++++
+ src/vpnbridge/Makefile.am    |  3 +--
+ src/vpnclient/Makefile.am    |  3 +--
+ src/vpncmd/Makefile.am       |  3 +--
+ src/vpnserver/Makefile.am    |  3 +--
+ 7 files changed, 44 insertions(+), 10 deletions(-)
+ create mode 100644 src/libsoftether/Makefile.am
+
+diff --git a/configure.ac b/configure.ac
+index 4a3fc2ba..94639c44 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,6 +30,7 @@ AC_CONFIG_FILES([
+ 	src/Mayaqua/Makefile
+ 	src/Cedar/Makefile
+ 	src/hamcorebuilder/Makefile
++	src/libsoftether/Makefile
+ 	src/bin/hamcore/Makefile
+ 	src/vpnserver/Makefile
+ 	src/vpnclient/Makefile
+diff --git a/src/Makefile.am b/src/Makefile.am
+index dc745426..1d041d47 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -22,5 +22,8 @@ SUBDIRS = Mayaqua Cedar
+ # This is a nodist helper.
+ SUBDIRS += hamcorebuilder
+ 
+-# These are final build products.
+-SUBDIRS += bin/hamcore vpnserver vpnclient vpnbridge vpncmd
++# These are shared components.
++SUBDIRS += libsoftether bin/hamcore
++
++# These are the final build products.
++SUBDIRS += vpnserver vpnclient vpnbridge vpncmd
+diff --git a/src/libsoftether/Makefile.am b/src/libsoftether/Makefile.am
+new file mode 100644
+index 00000000..601920d9
+--- /dev/null
++++ b/src/libsoftether/Makefile.am
+@@ -0,0 +1,34 @@
++#  Copyright 2014 Darik Horn <dajhorn@vanadac.com>
++#
++#  This file is part of SoftEther.
++#
++#  SoftEther is free software: you can redistribute it and/or modify it under
++#  the terms of the GNU General Public License as published by the Free 
++#  Software Foundation, either version 2 of the License, or (at your option)
++#  any later version.
++#
++#  SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY
++#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++#  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
++#  details.
++#
++#  You should have received a copy of the GNU General Public License along with
++#  SoftEther.  If not, see <http://www.gnu.org/licenses/>.
++
++
++include $(top_srcdir)/autotools/softether.am
++
++lib_LTLIBRARIES = \
++	libsoftether.la
++
++libsoftether_la_SOURCES =
++
++libsoftether_la_LDFLAGS = \
++	-avoid-version
++
++libsoftether_la_LIBTOOLFLAGS = \
++	--tag=disable-static
++
++libsoftether_la_LIBADD = \
++	$(top_builddir)/src/Mayaqua/libmayaqua.la \
++	$(top_builddir)/src/Cedar/libcedar.la
+diff --git a/src/vpnbridge/Makefile.am b/src/vpnbridge/Makefile.am
+index 35fe043d..fb91dd2d 100644
+--- a/src/vpnbridge/Makefile.am
++++ b/src/vpnbridge/Makefile.am
+@@ -25,5 +25,4 @@ vpnbridge_SOURCES = \
+ 	vpnbridge.c
+ 
+ vpnbridge_LDADD = \
+-	$(top_builddir)/src/Mayaqua/libmayaqua.la \
+-	$(top_builddir)/src/Cedar/libcedar.la
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff --git a/src/vpnclient/Makefile.am b/src/vpnclient/Makefile.am
+index 1aa55330..c225c416 100644
+--- a/src/vpnclient/Makefile.am
++++ b/src/vpnclient/Makefile.am
+@@ -25,5 +25,4 @@ vpnclient_SOURCES = \
+ 	vpncsvc.c
+ 
+ vpnclient_LDADD = \
+-	$(top_builddir)/src/Mayaqua/libmayaqua.la \
+-	$(top_builddir)/src/Cedar/libcedar.la
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff --git a/src/vpncmd/Makefile.am b/src/vpncmd/Makefile.am
+index d8042aa2..271affb0 100644
+--- a/src/vpncmd/Makefile.am
++++ b/src/vpncmd/Makefile.am
+@@ -25,5 +25,4 @@ vpncmd_SOURCES = \
+ 	vpncmd.c
+ 
+ vpncmd_LDADD = \
+-	$(top_builddir)/src/Mayaqua/libmayaqua.la \
+-	$(top_builddir)/src/Cedar/libcedar.la
++	$(top_builddir)/src/libsoftether/libsoftether.la
+diff --git a/src/vpnserver/Makefile.am b/src/vpnserver/Makefile.am
+index c1c33570..1f7b7f98 100644
+--- a/src/vpnserver/Makefile.am
++++ b/src/vpnserver/Makefile.am
+@@ -25,5 +25,4 @@ vpnserver_SOURCES = \
+ 	vpnserver.c
+ 
+ vpnserver_LDADD = \
+-	$(top_builddir)/src/Mayaqua/libmayaqua.la \
+-	$(top_builddir)/src/Cedar/libcedar.la
++	$(top_builddir)/src/libsoftether/libsoftether.la
diff --git a/bsp/buildroot/package/softether/0001-use-fhs-install-directories.patch b/bsp/buildroot/package/softether/0003-use-fhs-install-directories.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0001-use-fhs-install-directories.patch
rename to bsp/buildroot/package/softether/0003-use-fhs-install-directories.patch
diff --git a/bsp/buildroot/package/softether/0002-create-non-forking-softetherd-for-upstart-and-systemd.patch b/bsp/buildroot/package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0002-create-non-forking-softetherd-for-upstart-and-systemd.patch
rename to bsp/buildroot/package/softether/0004-create-non-forking-softetherd-for-upstart-and-systemd.patch
diff --git a/bsp/buildroot/package/softether/0003-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch b/bsp/buildroot/package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0003-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch
rename to bsp/buildroot/package/softether/0005-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch
diff --git a/bsp/buildroot/package/softether/0004-cross-compile.patch b/bsp/buildroot/package/softether/0006-cross-compile.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0004-cross-compile.patch
rename to bsp/buildroot/package/softether/0006-cross-compile.patch
diff --git a/bsp/buildroot/package/softether/0005-iconv.patch b/bsp/buildroot/package/softether/0007-iconv.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0005-iconv.patch
rename to bsp/buildroot/package/softether/0007-iconv.patch
diff --git a/bsp/buildroot/package/softether/0006-librt.patch b/bsp/buildroot/package/softether/0008-librt.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0006-librt.patch
rename to bsp/buildroot/package/softether/0008-librt.patch
diff --git a/bsp/buildroot/package/softether/0007-uclibc-ai-addrconfig.patch b/bsp/buildroot/package/softether/0009-uclibc-ai-addrconfig.patch
similarity index 100%
rename from bsp/buildroot/package/softether/0007-uclibc-ai-addrconfig.patch
rename to bsp/buildroot/package/softether/0009-uclibc-ai-addrconfig.patch
diff --git a/bsp/buildroot/package/softether/Config.in b/bsp/buildroot/package/softether/Config.in
index 60f13575..bfb45b03 100644
--- a/bsp/buildroot/package/softether/Config.in
+++ b/bsp/buildroot/package/softether/Config.in
@@ -1,24 +1,27 @@
 config BR2_PACKAGE_SOFTETHER
 	bool "softether"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_READLINE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
+	select BR2_PACKAGE_READLINE
 	help
-	  The SoftEther Server is a fully integrated implementation of the SSTP,
-	  L2TP, L2TPv3, OpenVPN, and IPSec virtual private networking protocols
-	  on Linux and several other platforms. It is generally compatible with
-	  other implementations by Apple, Cisco, Juniper, Microsoft, et al.
+	  The SoftEther Server is a fully integrated implementation of
+	  the SSTP, L2TP, L2TPv3, OpenVPN, and IPSec virtual private
+	  networking protocols on Linux and several other
+	  platforms. It is generally compatible with other
+	  implementations by Apple, Cisco, Juniper, Microsoft, et al.
 
-	  Convenient Layer-2 and Layer-3 bridging capabilities can connect
-	  several branch offices into a single broadcast or routing domain, even
-	  behind a NAT or without a static IPv4 address.
+	  Convenient Layer-2 and Layer-3 bridging capabilities can
+	  connect several branch offices into a single broadcast or
+	  routing domain, even behind a NAT or without a static IPv4
+	  address.
 
-	  In addition to supporting most VPN protocols, the SoftEther Client can
-	  penetrate hardened firewalls and captured gateways through HTTPS, DNS,
-	  and ICMP exfiltration.
+	  In addition to supporting most VPN protocols, the SoftEther
+	  Client can penetrate hardened firewalls and captured
+	  gateways through HTTPS, DNS, and ICMP exfiltration.
 
 	  http://www.softether.org
 
diff --git a/bsp/buildroot/package/softether/softether.hash b/bsp/buildroot/package/softether/softether.hash
index ecc5d25d..ec6e0603 100644
--- a/bsp/buildroot/package/softether/softether.hash
+++ b/bsp/buildroot/package/softether/softether.hash
@@ -1,4 +1,3 @@
 # Locally computed
-sha256 4bdcc05fcd163eea735444283264e40b86626d24fddf110aa416f2c8cb82448b softether-1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a.tar.gz
-sha256 fe5ff8f13b42737dfd5eb53f14c55aed714c380f181a1ae112055b04e8c97229 c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch
-sha256 b5a8750426387b9211754b199f7f9f6a013dba6a1cd731c210a205679ffa1d1c 75625af541fd128f51079d0ffe5ef24645b8f421.patch
+sha256 8e6310d36e579ea07171ce5fcb9ebe31235d218444c4e4836ca6c32aa49c1f93 softether-v4.22-9634-beta.tar.gz
+sha256 7aeb873293fa0e44425dabf68a8e46e26c848fe58efcfd3ac7c90a3386f3edd1 LICENSE
diff --git a/bsp/buildroot/package/softether/softether.mk b/bsp/buildroot/package/softether/softether.mk
index da7d1297..05d2f20f 100644
--- a/bsp/buildroot/package/softether/softether.mk
+++ b/bsp/buildroot/package/softether/softether.mk
@@ -4,14 +4,11 @@
 #
 ################################################################################
 
-SOFTETHER_VERSION = 1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a
+SOFTETHER_VERSION = v4.22-9634-beta
 SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION))
-SOFTETHER_PATCH = \
-	https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch \
-	https://github.com/dajhorn/SoftEtherVPN/commit/75625af541fd128f51079d0ffe5ef24645b8f421.patch
-SOFTETHER_LICENSE = GPLv2
+SOFTETHER_LICENSE = GPL-2.0
 SOFTETHER_LICENSE_FILES = LICENSE
-SOFTETHER_DEPENDENCIES = host-softether openssl readline
+SOFTETHER_DEPENDENCIES = host-softether libopenssl readline
 SOFTETHER_AUTORECONF = YES
 
 ifeq ($(BR2_ENABLE_LOCALE),)
@@ -29,7 +26,7 @@ SOFTETHER_CONF_OPTS = \
 	--with-zlib="$(STAGING_DIR)/usr"
 
 # host-libiconv does not exist, therefore we need this extra line
-HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-openssl host-readline
+HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-libopenssl host-readline
 
 # target build creates the file hamcore.se2 which needs the host variant of
 # hamcorebuilder, for details see http://www.vpnusers.com/viewtopic.php?p=5426
@@ -40,7 +37,7 @@ define HOST_SOFTETHER_BUILD_CMDS
 endef
 
 define HOST_SOFTETHER_INSTALL_CMDS
-	$(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/usr/bin/hamcorebuilder
+	$(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/bin/hamcorebuilder
 endef
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/solarus/0001-cmake-remove-Werror.patch b/bsp/buildroot/package/solarus/0001-cmake-remove-Werror.patch
new file mode 100644
index 00000000..b27908c8
--- /dev/null
+++ b/bsp/buildroot/package/solarus/0001-cmake-remove-Werror.patch
@@ -0,0 +1,27 @@
+From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Thu, 22 Jun 2017 00:19:56 +0200
+Subject: [PATCH] cmake: remove Werror
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ cmake/AddCompilationFlags.cmake | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake
+index 5159ff9..a506033 100644
+--- a/cmake/AddCompilationFlags.cmake
++++ b/cmake/AddCompilationFlags.cmake
+@@ -24,9 +24,6 @@ endif()
+ # Be less pedantic in release builds for users.
+ set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}")
+ 
+-# Be more pedantic in debug mode for developers.
+-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}")
+-
+ # Platform-specific flags.
+ if(WIN32)
+   # MinGW: disable the console by default.
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/solarus/Config.in b/bsp/buildroot/package/solarus/Config.in
new file mode 100644
index 00000000..30c7aa28
--- /dev/null
+++ b/bsp/buildroot/package/solarus/Config.in
@@ -0,0 +1,31 @@
+config BR2_PACKAGE_SOLARUS
+	bool "solarus"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
+	depends on !BR2_STATIC_LIBS # SDL2
+	select BR2_PACKAGE_LIBMODPLUG
+	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBPNG # runtime
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_LUAJIT
+	select BR2_PACKAGE_OPENAL
+	select BR2_PACKAGE_PHYSFS
+	select BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_SDL2_IMAGE
+	select BR2_PACKAGE_SDL2_TTF
+	help
+	  Solarus is an open-source Zelda-like 2D game engine written
+	  in C++. It can run games scripted in Lua. This engine is used
+	  by our Zelda fangames. Solarus is licensed under GPL v3.
+
+	  http://www.solarus-games.org
+	  https://github.com/solarus-games/solarus
+
+comment "solarus needs a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
+		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/solarus/solarus.hash b/bsp/buildroot/package/solarus/solarus.hash
new file mode 100644
index 00000000..8ed5cafa
--- /dev/null
+++ b/bsp/buildroot/package/solarus/solarus.hash
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256 5930584e7c333089a2c1bf372ccc25ad3fb5c1d973189d2bf67f2308189af94d  solarus-v1.5.3.tar.gz
+
+sha256 09cb24006b6a3f2698d8851dc5df4f413c1a98e20d4008bffd76ec236f14244d  license.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  license_gpl.txt
diff --git a/bsp/buildroot/package/solarus/solarus.mk b/bsp/buildroot/package/solarus/solarus.mk
new file mode 100644
index 00000000..af37f81a
--- /dev/null
+++ b/bsp/buildroot/package/solarus/solarus.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# solarus
+#
+################################################################################
+
+SOLARUS_VERSION = v1.5.3
+SOLARUS_SITE = $(call github,solarus-games,solarus,$(SOLARUS_VERSION))
+
+SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
+	CC-BY-SA-3.0 (GUI icons)
+SOLARUS_LICENSE_FILES = license.txt license_gpl.txt
+
+# Install libsolarus.so
+SOLARUS_INSTALL_STAGING = YES
+
+SOLARUS_DEPENDENCIES = libmodplug libogg libvorbis luajit openal physfs sdl2 \
+	sdl2_image sdl2_ttf
+
+# Disable launcher GUI (requires Qt5)
+SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/sox/Config.in b/bsp/buildroot/package/sox/Config.in
index a96553a2..5325ed68 100644
--- a/bsp/buildroot/package/sox/Config.in
+++ b/bsp/buildroot/package/sox/Config.in
@@ -1,10 +1,12 @@
 config BR2_PACKAGE_SOX
 	bool "sox"
 	help
-	  SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line
-	  utility that can convert various formats of computer audio files
-	  into other formats.
-	  It can also apply various effects to these sound files, and, as an
-	  added bonus, SoX can play and record audio files on most platforms.
+	  SoX is a cross-platform (Windows, Linux, MacOS X, etc.)
+	  command line utility that can convert various formats of
+	  computer audio files into other formats.
+
+	  It can also apply various effects to these sound files, and,
+	  as an added bonus, SoX can play and record audio files on
+	  most platforms.
 
 	  http://sox.sourceforge.net/
diff --git a/bsp/buildroot/package/sox/sox.mk b/bsp/buildroot/package/sox/sox.mk
index 61f52201..0b3dc136 100644
--- a/bsp/buildroot/package/sox/sox.mk
+++ b/bsp/buildroot/package/sox/sox.mk
@@ -10,7 +10,7 @@ SOX_SOURCE = sox-$(SOX_VERSION).tar.bz2
 SOX_DEPENDENCIES = host-pkgconf
 SOX_CONF_OPTS = --with-distro="Buildroot" --without-ffmpeg --disable-gomp \
 	$(if $(BR2_TOOLCHAIN_HAS_SSP),,--disable-stack-protector)
-SOX_LICENSE = GPLv2+ (sox binary), LGPLv2.1+ (libraries)
+SOX_LICENSE = GPL-2.0+ (sox binary), LGPL-2.1+ (libraries)
 SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL
 
 # MIPS Codescape toolchains don't support stack-smashing protection
diff --git a/bsp/buildroot/package/sp-oops-extract/sp-oops-extract.mk b/bsp/buildroot/package/sp-oops-extract/sp-oops-extract.mk
index 99198071..a3ff46c5 100644
--- a/bsp/buildroot/package/sp-oops-extract/sp-oops-extract.mk
+++ b/bsp/buildroot/package/sp-oops-extract/sp-oops-extract.mk
@@ -7,7 +7,7 @@
 SP_OOPS_EXTRACT_VERSION = 0.0.7-1
 SP_OOPS_EXTRACT_SITE = http://repository.maemo.org/pool/maemo5.0/free/s/sp-oops-extract
 SP_OOPS_EXTRACT_SOURCE = sp-oops-extract_$(SP_OOPS_EXTRACT_VERSION).tar.gz
-SP_OOPS_EXTRACT_LICENSE = GPLv2
+SP_OOPS_EXTRACT_LICENSE = GPL-2.0
 SP_OOPS_EXTRACT_LICENSE_FILES = COPYING
 
 define SP_OOPS_EXTRACT_BUILD_CMDS
diff --git a/bsp/buildroot/package/spawn-fcgi/spawn-fcgi.mk b/bsp/buildroot/package/spawn-fcgi/spawn-fcgi.mk
index 13357bba..ed97d0a7 100644
--- a/bsp/buildroot/package/spawn-fcgi/spawn-fcgi.mk
+++ b/bsp/buildroot/package/spawn-fcgi/spawn-fcgi.mk
@@ -7,7 +7,7 @@
 SPAWN_FCGI_VERSION = 1.6.4
 SPAWN_FCGI_SITE = http://www.lighttpd.net/download
 SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2
-SPAWN_FCGI_LICENSE = BSD-3c
+SPAWN_FCGI_LICENSE = BSD-3-Clause
 SPAWN_FCGI_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/speex/Config.in b/bsp/buildroot/package/speex/Config.in
index f18e866f..c4e3df5d 100644
--- a/bsp/buildroot/package/speex/Config.in
+++ b/bsp/buildroot/package/speex/Config.in
@@ -16,8 +16,8 @@ config BR2_PACKAGE_SPEEX_ARM4
 	depends on BR2_ARM_CPU_ARMV4
 
 config BR2_PACKAGE_SPEEX_ARM5E
-	default y
 	bool
+	default y
 	depends on BR2_arm && !BR2_PACKAGE_SPEEX_ARM4
 
 endif
diff --git a/bsp/buildroot/package/speex/speex.mk b/bsp/buildroot/package/speex/speex.mk
index a34bfaca..1b278ea2 100644
--- a/bsp/buildroot/package/speex/speex.mk
+++ b/bsp/buildroot/package/speex/speex.mk
@@ -6,7 +6,7 @@
 
 SPEEX_VERSION = 1.2rc1
 SPEEX_SITE = http://downloads.us.xiph.org/releases/speex
-SPEEX_LICENSE = BSD-3c
+SPEEX_LICENSE = BSD-3-Clause
 SPEEX_LICENSE_FILES = COPYING
 
 SPEEX_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/sphinxbase/sphinxbase.mk b/bsp/buildroot/package/sphinxbase/sphinxbase.mk
index 5c87c89a..86f9089b 100644
--- a/bsp/buildroot/package/sphinxbase/sphinxbase.mk
+++ b/bsp/buildroot/package/sphinxbase/sphinxbase.mk
@@ -6,7 +6,7 @@
 
 SPHINXBASE_VERSION = 5prealpha
 SPHINXBASE_SITE = http://downloads.sourceforge.net/project/cmusphinx/sphinxbase/5prealpha
-SPHINXBASE_LICENSE = BSD-2c
+SPHINXBASE_LICENSE = BSD-2-Clause
 # Note http://sourceforge.net/p/cmusphinx/bugs/441/ "LICENSE file missing in"
 # 5prealpha tarballs". The license is contained in the copyright notice at the
 # top of each source file. For example:
diff --git a/bsp/buildroot/package/spi-tools/spi-tools.mk b/bsp/buildroot/package/spi-tools/spi-tools.mk
index 384ae41e..e5f3774b 100644
--- a/bsp/buildroot/package/spi-tools/spi-tools.mk
+++ b/bsp/buildroot/package/spi-tools/spi-tools.mk
@@ -8,7 +8,7 @@ SPI_TOOLS_VERSION = 0.8.1
 SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION))
 # autoreconf must be run as specified in package documentation
 SPI_TOOLS_AUTORECONF = YES
-SPI_TOOLS_LICENSE = GPLv2
+SPI_TOOLS_LICENSE = GPL-2.0
 SPI_TOOLS_LICENSE_FILES = LICENSE
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/spice-protocol/spice-protocol.mk b/bsp/buildroot/package/spice-protocol/spice-protocol.mk
index 4e81e6cd..dcc6feeb 100644
--- a/bsp/buildroot/package/spice-protocol/spice-protocol.mk
+++ b/bsp/buildroot/package/spice-protocol/spice-protocol.mk
@@ -7,7 +7,7 @@
 SPICE_PROTOCOL_VERSION = 0.12.10
 SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2
 SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases
-SPICE_PROTOCOL_LICENSE = BSD-3c
+SPICE_PROTOCOL_LICENSE = BSD-3-Clause
 SPICE_PROTOCOL_LICENSE_FILES = COPYING
 SPICE_PROTOCOL_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/spice/spice.mk b/bsp/buildroot/package/spice/spice.mk
index 6ac209ed..7b09f39f 100644
--- a/bsp/buildroot/package/spice/spice.mk
+++ b/bsp/buildroot/package/spice/spice.mk
@@ -7,23 +7,23 @@
 SPICE_VERSION = 0.12.8
 SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2
 SPICE_SITE = http://www.spice-space.org/download/releases
-SPICE_LICENSE = LGPLv2.1+
+SPICE_LICENSE = LGPL-2.1+
 SPICE_LICENSE_FILES = COPYING
 SPICE_INSTALL_STAGING = YES
-SPICE_DEPENDENCIES =        \
-	jpeg                \
-	libglib2            \
-	openssl             \
-	pixman              \
+SPICE_DEPENDENCIES = \
+	jpeg \
+	libglib2 \
+	openssl \
+	pixman \
 	spice-protocol
 
 # We disable everything for now, because the dependency tree can become
 # quite deep if we try to enable some features, and I have not tested that.
-SPICE_CONF_OPTS =                 \
-	--disable-opengl          \
-	--disable-smartcard       \
+SPICE_CONF_OPTS = \
+	--disable-opengl \
+	--disable-smartcard \
 	--disable-automated-tests \
-	--without-sasl            \
+	--without-sasl \
 	--disable-manual
 
 SPICE_DEPENDENCIES += host-pkgconf
@@ -51,7 +51,7 @@ endif
 # it should link against libz and libjpeg. libz is pkg-config-aware, while
 # libjpeg isn't, hence the two-line tweak
 define SPICE_POST_INSTALL_STAGING_FIX_PC
-	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;'    \
+	$(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \
 		"$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc"
 endef
 SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC
diff --git a/bsp/buildroot/package/spidev_test/spidev_test.hash b/bsp/buildroot/package/spidev_test/spidev_test.hash
index 6871288c..7bc4a27e 100644
--- a/bsp/buildroot/package/spidev_test/spidev_test.hash
+++ b/bsp/buildroot/package/spidev_test/spidev_test.hash
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3  spidev_test.c?id=v3.0
-sha256 57fa6c534e0b7b4d234075e18bc89e2f3c9fc4ecc27e80f349a8057708e0de46  spidev_test.c?id=v3.15
+sha256 3cf76b15d9a8644f3f5cbc0387cc02a7d4a392ade39788cbc6367cce98552e2f  spidev_test.c?id=v4.10
diff --git a/bsp/buildroot/package/spidev_test/spidev_test.mk b/bsp/buildroot/package/spidev_test/spidev_test.mk
index 52441bb3..1d657803 100644
--- a/bsp/buildroot/package/spidev_test/spidev_test.mk
+++ b/bsp/buildroot/package/spidev_test/spidev_test.mk
@@ -4,17 +4,23 @@
 #
 ################################################################################
 
+# Build the latest version that is compatible with the toolchain's kernel headers
 # v3.15+ requires SPI_TX_QUAD/SPI_RX_QUAD to build
 # Normally kernel headers can't be newer than kernel so switch based on that.
 # If you need quad-pumped spi support you need to upgrade your toolchain.
+# Note that the location of spidev_test.c changes from v4.5 onwards.
+
 ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y)
-SPIDEV_TEST_VERSION = v3.15
+SPIDEV_TEST_VERSION = v4.10
+SPIDEV_TEST_PATH = tools/spi
 else
 SPIDEV_TEST_VERSION = v3.0
+SPIDEV_TEST_PATH = Documentation/spi
 endif
-SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/spi
+
+SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/$(SPIDEV_TEST_PATH)
 SPIDEV_TEST_SOURCE = spidev_test.c?id=$(SPIDEV_TEST_VERSION)
-SPIDEV_TEST_LICENSE = GPLv2
+SPIDEV_TEST_LICENSE = GPL-2.0
 
 # musl libc requires linux/ioctl.h for _IOC_SIZEBITS. Do a sed patch to keep
 # compatibility with different spidev_test.c versions that we support.
@@ -26,7 +32,7 @@ endef
 SPIDEV_TEST_POST_PATCH_HOOKS += SPIDEV_ADD_LINUX_IOCTL
 
 define SPIDEV_TEST_EXTRACT_CMDS
-	cp $(BR2_DL_DIR)/$(SPIDEV_TEST_SOURCE) $(@D)/spidev_test.c
+	cp $(DL_DIR)/$(SPIDEV_TEST_SOURCE) $(@D)/spidev_test.c
 endef
 
 define SPIDEV_TEST_BUILD_CMDS
diff --git a/bsp/buildroot/package/sqlcipher/Config.in b/bsp/buildroot/package/sqlcipher/Config.in
index 98b2f895..332754b1 100644
--- a/bsp/buildroot/package/sqlcipher/Config.in
+++ b/bsp/buildroot/package/sqlcipher/Config.in
@@ -5,8 +5,8 @@ config BR2_PACKAGE_SQLCIPHER
 	select BR2_PACKAGE_OPENSSL
 	help
 	  SQLCipher is an SQLite extension that provides 256 bits AES
-	  encryption of database files. Note that it is a fork of SQLite
-	  and they cannot be installed side-by-side.
+	  encryption of database files. Note that it is a fork of
+	  SQLite and they cannot be installed side-by-side.
 
 	  http://sqlcipher.net
 
@@ -17,14 +17,15 @@ config BR2_PACKAGE_SQLCIPHER_READLINE
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_READLINE
 	help
-	  Enable command-line editing. This requires ncurses and readline.
+	  Enable command-line editing. This requires ncurses and
+	  readline.
 
 config BR2_PACKAGE_SQLCIPHER_STAT3
 	bool "Additional query optimizations (stat3)"
 	help
-	  Adds additional logic to the ANALYZE command and to the query
-	  planner that can help SQLite to choose a better query plan under
-	  certain situations.
+	  Adds additional logic to the ANALYZE command and to the
+	  query planner that can help SQLite to choose a better query
+	  plan under certain situations.
 
 endif
 
diff --git a/bsp/buildroot/package/sqlcipher/sqlcipher.mk b/bsp/buildroot/package/sqlcipher/sqlcipher.mk
index 196f1627..db94d06c 100644
--- a/bsp/buildroot/package/sqlcipher/sqlcipher.mk
+++ b/bsp/buildroot/package/sqlcipher/sqlcipher.mk
@@ -11,7 +11,7 @@ SQLCIPHER_INSTALL_STAGING = YES
 
 SQLCIPHER_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) $(SQLCIPHER_CFLAGS)" \
-	TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)
+	TCLSH_CMD=$(HOST_DIR)/bin/tclsh$(TCL_VERSION_MAJOR)
 
 SQLCIPHER_CONF_OPTS = \
 	--enable-threadsafe \
diff --git a/bsp/buildroot/package/sqlite/Config.in b/bsp/buildroot/package/sqlite/Config.in
index c9fde53b..ec739686 100644
--- a/bsp/buildroot/package/sqlite/Config.in
+++ b/bsp/buildroot/package/sqlite/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_SQLITE
 	bool "sqlite"
 	help
-	  SQLite is a small C library that implements a self-contained,
-	  embeddable, zero-configuration SQL database engine.
+	  SQLite is a small C library that implements a
+	  self-contained, embeddable, zero-configuration SQL database
+	  engine.
 
 	  http://www.sqlite.org/
 
@@ -11,48 +12,55 @@ if BR2_PACKAGE_SQLITE
 config BR2_PACKAGE_SQLITE_STAT3
 	bool "Additional query optimizations (stat3)"
 	help
-	  Adds additional logic to the ANALYZE command and to the query
-	  planner that can help SQLite to choose a better query plan under
-	  certain situations.
+	  Adds additional logic to the ANALYZE command and to the
+	  query planner that can help SQLite to choose a better query
+	  plan under certain situations.
 
 config BR2_PACKAGE_SQLITE_ENABLE_FTS3
 	bool "Enable version 3 of the full-text search engine"
 	help
-	  When this option is defined in the amalgamation
-	  (see http://www.sqlite.org/amalgamation.html), version 3 of
-	  the full-text search engine is added to the build automatically.
+	  When this option is defined in the amalgamation (see
+	  http://www.sqlite.org/amalgamation.html), version 3 of the
+	  full-text search engine is added to the build automatically.
+
+config BR2_PACKAGE_SQLITE_ENABLE_JSON1
+	bool "Enable the JSON extensions for SQLite"
+	help
+	  When this option is defined in the amalgamation, the JSON
+	  extensions are added to the build automatically.
 
 config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY
 	bool "Enable sqlite3_unlock_notify() interface"
 	help
-	  This option enables the sqlite3_unlock_notify() interface and its
-	  accosiated functionality. See the documentation
-	  http://www.sqlite.org/unlock_notify.html for additional information.
+	  This option enables the sqlite3_unlock_notify() interface
+	  and its accosiated functionality. See the documentation
+	  http://www.sqlite.org/unlock_notify.html for additional
+	  information.
 
 config BR2_PACKAGE_SQLITE_SECURE_DELETE
 	bool "Set the secure_delete pragma on by default"
 	help
 	  This compile-time option changes the default settings of the
-	  secure_delete pragma. When this option is not used, secure_delete
-	  defaults to off. When this option is present, secure_delete defaults
-	  to on.
+	  secure_delete pragma. When this option is not used,
+	  secure_delete defaults to off. When this option is present,
+	  secure_delete defaults to on.
 
-	  The secure_delete setting causes deleted content to be overwritten
-	  with zeros. There is a small performance penalty for this since
-	  additional I/O must occur. On the other hand, secure_delete can
-	  prevent sensitive information from lingering in unused parts
-	  of the database file after it has allegedly been deleted.
-	  See the documentation on the
-	  http://www.sqlite.org/pragma.html#pragma_secure_delete
-	  for additional information.
+	  The secure_delete setting causes deleted content to be
+	  overwritten with zeros. There is a small performance penalty
+	  for this since additional I/O must occur. On the other hand,
+	  secure_delete can prevent sensitive information from
+	  lingering in unused parts of the database file after it has
+	  allegedly been deleted. See the documentation on the
+	  http://www.sqlite.org/pragma.html#pragma_secure_delete for
+	  additional information.
 
 config BR2_PACKAGE_SQLITE_NO_SYNC
 	bool "Disable fsync"
 	help
-	  By default SQLite forces all database transactions to storage
-	  immediately using fsync() to protect against data loss in case
-	  of power failure.
-	  This option turns this behavior off resulting in higher performance
-	  especially when using slow flash storage.
+	  By default SQLite forces all database transactions to
+	  storage immediately using fsync() to protect against data
+	  loss in case of power failure. This option turns this
+	  behavior off resulting in higher performance especially when
+	  using slow flash storage.
 
 endif
diff --git a/bsp/buildroot/package/sqlite/sqlite.hash b/bsp/buildroot/package/sqlite/sqlite.hash
index bb3707da..be5820e1 100644
--- a/bsp/buildroot/package/sqlite/sqlite.hash
+++ b/bsp/buildroot/package/sqlite/sqlite.hash
@@ -1,4 +1,6 @@
 # From http://www.sqlite.org/download.html
-sha1 64ca578ad44a94115b1db0406740e14288f74bb8  sqlite-autoconf-3160200.tar.gz
+sha1 f56fe3407d8297fc0a68a058f4c9e6b77e83575c  sqlite-autoconf-3210000.tar.gz
 # Calculated based on the hash above
-sha256 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615  sqlite-autoconf-3160200.tar.gz
+sha256 d7dd516775005ad87a57f428b6f86afd206cb341722927f104d3f0cf65fbbbe3  sqlite-autoconf-3210000.tar.gz
+# Locally calculated
+sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9  tea/license.terms
diff --git a/bsp/buildroot/package/sqlite/sqlite.mk b/bsp/buildroot/package/sqlite/sqlite.mk
index 790caaf4..5239592f 100644
--- a/bsp/buildroot/package/sqlite/sqlite.mk
+++ b/bsp/buildroot/package/sqlite/sqlite.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SQLITE_VERSION = 3160200
+SQLITE_VERSION = 3210000
 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
 SQLITE_SITE = http://www.sqlite.org/2017
 SQLITE_LICENSE = Public domain
@@ -19,6 +19,10 @@ ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3
 endif
 
+ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_JSON1),y)
+SQLITE_CFLAGS += -DSQLITE_ENABLE_JSON1
+endif
+
 ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y)
 SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY
 endif
diff --git a/bsp/buildroot/package/squashfs/0001-include-sysmacros.patch b/bsp/buildroot/package/squashfs/0001-include-sysmacros.patch
new file mode 100644
index 00000000..d794836c
--- /dev/null
+++ b/bsp/buildroot/package/squashfs/0001-include-sysmacros.patch
@@ -0,0 +1,47 @@
+From 968aa53dd6d2c0831a9af01873441767c06b88d0 Mon Sep 17 00:00:00 2001
+From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
+Date: Wed, 1 Aug 2018 12:17:10 +0200
+Subject: [PATCH] mksquashfs/unsquashfs: fix compilation with glibc 2.25+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From glibc 2.25 release notes:
+https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html
+"* The inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated.
+  This means that in a future release, the macros “major”, “minor”, and
+  “makedev” will only be available from <sys/sysmacros.h>."
+
+See glibc bug https://sourceware.org/bugzilla/show_bug.cgi?id=19239 .
+
+Fetch from: https://github.com/plougher/squashfs-tools/pull/52.patch
+Signed-off-by: Richard Kunze <richard.kunze@web.de>
+---
+ squashfs-tools/mksquashfs.c | 1 +
+ squashfs-tools/unsquashfs.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d696a51..8d57c3e 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -35,6 +35,7 @@
+ #include <stddef.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <dirent.h>
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index a57f85c..a492b27 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -33,6 +33,7 @@
+ #include "fnmatch_compat.h"
+ 
+ #include <sys/sysinfo.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
diff --git a/bsp/buildroot/package/squashfs/0001-musl.patch b/bsp/buildroot/package/squashfs/0001-musl.patch
deleted file mode 100644
index 891b1717..00000000
--- a/bsp/buildroot/package/squashfs/0001-musl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Fix musl build
-
-Downloaded from
-http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch
-and adjusted paths.
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-Define FNM_EXTMATCH if not defined its glibc specific define
-include missing sys/stat.h for stat* function declarations
-
-Upstream-Status: Pending
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: squashfs-tools/action.c
-===================================================================
---- a/squashfs-tools.orig/action.c
-+++ b/squashfs-tools/action.c
-@@ -44,6 +44,10 @@
- #include "action.h"
- #include "error.h"
- 
-+#if !defined(FNM_EXTMATCH)
-+#define FNM_EXTMATCH 0
-+#endif
-+
- /*
-  * code to parse actions
-  */
-Index: squashfs-tools/mksquashfs.c
-===================================================================
---- a/squashfs-tools.orig/mksquashfs.c
-+++ b/squashfs-tools/mksquashfs.c
-@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st
- 		dir_size + 3, directory_block, directory_offset, NULL, NULL,
- 		dir, 0);
- 
-+#if !defined(FNM_EXTMATCH)
-+#define FNM_EXTMATCH 0
-+#endif
-+
- #ifdef SQUASHFS_TRACE
- 	{
- 		unsigned char *dirp;
-Index: squashfs-tools/pseudo.c
-===================================================================
---- a/squashfs-tools.orig/pseudo.c
-+++ b/squashfs-tools/pseudo.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/stat.h>
- #include <ctype.h>
- 
- #include "pseudo.h"
-Index: squashfs-tools/unsquashfs.c
-===================================================================
---- a/squashfs-tools.orig/unsquashfs.c
-+++ b/squashfs-tools/unsquashfs.c
-@@ -38,6 +38,10 @@
- #include <limits.h>
- #include <ctype.h>
- 
-+#ifndef FNM_EXTMATCH
-+#define FNM_EXTMATCH 0
-+#endif
-+
- struct cache *fragment_cache, *data_cache;
- struct queue *to_reader, *to_inflate, *to_writer, *from_writer;
- pthread_t *thread, *inflator_thread;
diff --git a/bsp/buildroot/package/squashfs/squashfs.hash b/bsp/buildroot/package/squashfs/squashfs.hash
index 74fdb443..4464e62c 100644
--- a/bsp/buildroot/package/squashfs/squashfs.hash
+++ b/bsp/buildroot/package/squashfs/squashfs.hash
@@ -1,2 +1,5 @@
 # Locally computed
-sha256	2c49392816615b73bf5d6cdce9776cb66a01f5a1494b1d9af580667e32bab001  squashfs-3de1687d7432ea9b302c2db9521996f506c140a3.tar.gz
+sha256 bd0aa3011320b8ebee68aa406060de277bef16daf81bad5b9f70cbea6db1a779 squashfs-e38956b92f738518c29734399629e7cdb33072d3.tar.gz
+
+# License files
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/bsp/buildroot/package/squashfs/squashfs.mk b/bsp/buildroot/package/squashfs/squashfs.mk
index e8321ed6..e656218f 100644
--- a/bsp/buildroot/package/squashfs/squashfs.mk
+++ b/bsp/buildroot/package/squashfs/squashfs.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3
+SQUASHFS_VERSION = e38956b92f738518c29734399629e7cdb33072d3
 SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git
 SQUASHFS_SITE_METHOD = git
-SQUASHFS_LICENSE = GPLv2+
+SQUASHFS_LICENSE = GPL-2.0+
 SQUASHFS_LICENSE_FILES = COPYING
-SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
+SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 ZSTD_SUPPORT=0
 
 ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
 SQUASHFS_DEPENDENCIES += lz4
@@ -50,16 +50,17 @@ HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz
 
 HOST_SQUASHFS_MAKE_ARGS = \
 	XATTR_SUPPORT=1 \
-	XZ_SUPPORT=1    \
-	GZIP_SUPPORT=1  \
-	LZ4_SUPPORT=1	\
-	LZO_SUPPORT=1	\
-	LZMA_XZ_SUPPORT=1
+	XZ_SUPPORT=1 \
+	GZIP_SUPPORT=1 \
+	LZ4_SUPPORT=1 \
+	LZO_SUPPORT=1 \
+	LZMA_XZ_SUPPORT=1 \
+	ZSTD_SUPPORT=0
 
 define SQUASHFS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE)    \
-		CC="$(TARGET_CC)"           \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline"   \
+	$(TARGET_MAKE_ENV) $(MAKE) \
+		CC="$(TARGET_CC)" \
+		EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \
 		EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		$(SQUASHFS_MAKE_ARGS) \
 		-C $(@D)/squashfs-tools/
@@ -73,7 +74,7 @@ endef
 define HOST_SQUASHFS_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) \
 		CC="$(HOSTCC)" \
-		EXTRA_CFLAGS="$(HOST_CFLAGS)"   \
+		EXTRA_CFLAGS="$(HOST_CFLAGS)" \
 		EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
 		$(HOST_SQUASHFS_MAKE_ARGS) \
 		-C $(@D)/squashfs-tools/
@@ -81,7 +82,7 @@ endef
 
 define HOST_SQUASHFS_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
-		-C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
+		-C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/bin install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/squeezelite/squeezelite.mk b/bsp/buildroot/package/squeezelite/squeezelite.mk
index 7a82f4a0..3b23b103 100644
--- a/bsp/buildroot/package/squeezelite/squeezelite.mk
+++ b/bsp/buildroot/package/squeezelite/squeezelite.mk
@@ -6,7 +6,7 @@
 
 SQUEEZELITE_VERSION = v1.8
 SQUEEZELITE_SITE = $(call github,robadenshi,squeezelite,$(SQUEEZELITE_VERSION))
-SQUEEZELITE_LICENSE = GPLv3
+SQUEEZELITE_LICENSE = GPL-3.0
 SQUEEZELITE_LICENSE_FILES = LICENSE.txt
 SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123
 SQUEEZELITE_MAKE_OPTS = -DLINKALL
diff --git a/bsp/buildroot/package/squid/Config.in b/bsp/buildroot/package/squid/Config.in
index 12bfe19a..141a5029 100644
--- a/bsp/buildroot/package/squid/Config.in
+++ b/bsp/buildroot/package/squid/Config.in
@@ -9,6 +9,7 @@ config BR2_PACKAGE_SQUID
 	depends on BR2_USE_MMU
 	select BR2_PACKAGE_LIBCAP
 	help
-	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
+	  Caching proxy for the Web supporting HTTP, HTTPS, FTP, and
+	  more.
 
 	  http://www.squid-cache.org/
diff --git a/bsp/buildroot/package/squid/squid.mk b/bsp/buildroot/package/squid/squid.mk
index cd91600e..8ade55ee 100644
--- a/bsp/buildroot/package/squid/squid.mk
+++ b/bsp/buildroot/package/squid/squid.mk
@@ -8,7 +8,7 @@ SQUID_VERSION_MAJOR = 3.5
 SQUID_VERSION = $(SQUID_VERSION_MAJOR).27
 SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz
 SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR)
-SQUID_LICENSE = GPLv2+
+SQUID_LICENSE = GPL-2.0+
 SQUID_LICENSE_FILES = COPYING
 # For 0001-assume-get-certificate-ok.patch
 SQUID_AUTORECONF = YES
@@ -50,11 +50,6 @@ else
 SQUID_CONF_ENV += squid_cv_gnu_atomics=no
 endif
 
-# On uClibc librt needs libpthread
-ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy)
-SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread"
-endif
-
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SQUID_CONF_OPTS += --with-openssl
 SQUID_DEPENDENCIES += openssl
diff --git a/bsp/buildroot/package/sredird/sredird.mk b/bsp/buildroot/package/sredird/sredird.mk
index b564f1ac..723c10ac 100644
--- a/bsp/buildroot/package/sredird/sredird.mk
+++ b/bsp/buildroot/package/sredird/sredird.mk
@@ -6,7 +6,7 @@
 
 SREDIRD_VERSION = 2.2.2
 SREDIRD_SITE = http://www.ibiblio.org/pub/Linux/system/serial
-SREDIRD_LICENSE = GPLv2+
+SREDIRD_LICENSE = GPL-2.0+
 SREDIRD_LICENSE_FILES = COPYING
 
 define SREDIRD_BUILD_CMDS
diff --git a/bsp/buildroot/package/sshfs/Config.in b/bsp/buildroot/package/sshfs/Config.in
index 31fef9fc..7383b609 100644
--- a/bsp/buildroot/package/sshfs/Config.in
+++ b/bsp/buildroot/package/sshfs/Config.in
@@ -1,16 +1,16 @@
 config BR2_PACKAGE_SSHFS
 	bool "sshfs (FUSE)"
-	select BR2_PACKAGE_LIBFUSE
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	select BR2_PACKAGE_OPENSSH
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2
 	depends on BR2_USE_MMU # libfuse, glib2
 	depends on !BR2_STATIC_LIBS # libfuse
+	select BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	select BR2_PACKAGE_OPENSSH
 	help
-	  FUSE filesystem client based on the SSH File Transfer Protocol.
+	  FUSE filesystem client based on the SSH File Transfer
+	  Protocol.
 
 	  https://github.com/libfuse/sshfs
 
diff --git a/bsp/buildroot/package/sshfs/sshfs.mk b/bsp/buildroot/package/sshfs/sshfs.mk
index de4c361d..ee96ad67 100644
--- a/bsp/buildroot/package/sshfs/sshfs.mk
+++ b/bsp/buildroot/package/sshfs/sshfs.mk
@@ -6,11 +6,11 @@
 
 SSHFS_VERSION = 2.8
 SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs_$(SSHFS_VERSION)
-SSHFS_LICENSE = GPLv2
+SSHFS_LICENSE = GPL-2.0
 SSHFS_LICENSE_FILES = COPYING
 SSHFS_DEPENDENCIES = \
 	libglib2 libfuse openssh \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	$(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_ENABLE_LOCALE),,libiconv)
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sshpass/sshpass.mk b/bsp/buildroot/package/sshpass/sshpass.mk
index de466048..6c14f0fe 100644
--- a/bsp/buildroot/package/sshpass/sshpass.mk
+++ b/bsp/buildroot/package/sshpass/sshpass.mk
@@ -6,7 +6,7 @@
 
 SSHPASS_VERSION = 1.06
 SSHPASS_SITE = http://downloads.sourceforge.net/project/sshpass/sshpass/$(SSHPASS_VERSION)
-SSHPASS_LICENSE = GPLv2+
+SSHPASS_LICENSE = GPL-2.0+
 SSHPASS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/sslh/sslh.mk b/bsp/buildroot/package/sslh/sslh.mk
index 17aafd16..3a9223b2 100644
--- a/bsp/buildroot/package/sslh/sslh.mk
+++ b/bsp/buildroot/package/sslh/sslh.mk
@@ -6,7 +6,7 @@
 
 SSLH_VERSION = v1.18
 SSLH_SITE = http://www.rutschle.net/tech/sslh
-SSLH_LICENSE = GPLv2+
+SSLH_LICENSE = GPL-2.0+
 SSLH_LICENSE_FILES = COPYING
 
 SSLH_DEPENDENCIES = libconfig
diff --git a/bsp/buildroot/package/start-stop-daemon/Config.in b/bsp/buildroot/package/start-stop-daemon/Config.in
index 8cf44f78..8f0dda13 100644
--- a/bsp/buildroot/package/start-stop-daemon/Config.in
+++ b/bsp/buildroot/package/start-stop-daemon/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_START_STOP_DAEMON
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  start-stop-daemon is used to control the creation and termination
-	  of system-level processes.
+	  start-stop-daemon is used to control the creation and
+	  termination of system-level processes.
 
 	  https://tracker.debian.org/pkg/dpkg
diff --git a/bsp/buildroot/package/start-stop-daemon/start-stop-daemon.mk b/bsp/buildroot/package/start-stop-daemon/start-stop-daemon.mk
index 5aac5417..7071f561 100644
--- a/bsp/buildroot/package/start-stop-daemon/start-stop-daemon.mk
+++ b/bsp/buildroot/package/start-stop-daemon/start-stop-daemon.mk
@@ -23,7 +23,7 @@ START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
 # Patching m4/dpkg-arch.m4
 START_STOP_DAEMON_AUTORECONF = YES
-START_STOP_DAEMON_LICENSE = GPLv2+
+START_STOP_DAEMON_LICENSE = GPL-2.0+
 START_STOP_DAEMON_LICENSE_FILES = COPYING
 
 define START_STOP_DAEMON_BUILD_CMDS
diff --git a/bsp/buildroot/package/startup-notification/Config.in b/bsp/buildroot/package/startup-notification/Config.in
index 1fc6dad1..88d18174 100644
--- a/bsp/buildroot/package/startup-notification/Config.in
+++ b/bsp/buildroot/package/startup-notification/Config.in
@@ -1,9 +1,10 @@
 config BR2_PACKAGE_STARTUP_NOTIFICATION
 	bool "startup-notification"
-	select BR2_PACKAGE_XLIB_LIBX11
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_XLIB_LIBX11
 	help
-	  Startup-notification is a library used to monitor application startup.
+	  Startup-notification is a library used to monitor
+	  application startup.
 
 	  http://freedesktop.org/software/startup-notification/releases
diff --git a/bsp/buildroot/package/startup-notification/startup-notification.mk b/bsp/buildroot/package/startup-notification/startup-notification.mk
index e8dd0a35..b3314087 100644
--- a/bsp/buildroot/package/startup-notification/startup-notification.mk
+++ b/bsp/buildroot/package/startup-notification/startup-notification.mk
@@ -12,7 +12,7 @@ STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes
 STARTUP_NOTIFICATION_CONF_OPTS = --with-x \
 	--x-includes="$(STAGING_DIR)/usr/include/X11" \
 	--x-libraries="$(STAGING_DIR)/usr/lib"
-STARTUP_NOTIFICATION_LICENSE = LGPLv2
+STARTUP_NOTIFICATION_LICENSE = LGPL-2.0
 STARTUP_NOTIFICATION_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/statserial/statserial.mk b/bsp/buildroot/package/statserial/statserial.mk
index 22b468eb..f9b131fc 100644
--- a/bsp/buildroot/package/statserial/statserial.mk
+++ b/bsp/buildroot/package/statserial/statserial.mk
@@ -7,7 +7,7 @@
 STATSERIAL_VERSION = 1.1
 STATSERIAL_SITE = http://www.ibiblio.org/pub/Linux/system/serial
 STATSERIAL_DEPENDENCIES = ncurses
-STATSERIAL_LICENSE = GPLv2+
+STATSERIAL_LICENSE = GPL-2.0+
 STATSERIAL_LICENSE_FILES = COPYING
 
 define STATSERIAL_BUILD_CMDS
diff --git a/bsp/buildroot/package/stella/0001-Add-cross-compilation-support.patch b/bsp/buildroot/package/stella/0001-Add-cross-compilation-support.patch
index 3266d31d..1aefd86c 100644
--- a/bsp/buildroot/package/stella/0001-Add-cross-compilation-support.patch
+++ b/bsp/buildroot/package/stella/0001-Add-cross-compilation-support.patch
@@ -1,6 +1,6 @@
-From fba2627bebc7d497f64827a0517316e9b5c64c0a Mon Sep 17 00:00:00 2001
+From ef1cffc526d3cf9562d50efbf8addc2aa4c06b52 Mon Sep 17 00:00:00 2001
 From: Sergio Prado <sergio.prado@e-labworks.com>
-Date: Tue, 26 Jul 2016 13:24:00 -0300
+Date: Sun, 30 Jul 2017 18:23:23 -0300
 Subject: [PATCH 1/2] Add cross-compilation support
 
 Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
@@ -9,10 +9,10 @@ Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/configure b/configure
-index 0d90a4f0acde..a4afea8e1880 100755
+index c2f304729651..b05321aac3da 100755
 --- a/configure
 +++ b/configure
-@@ -502,8 +502,9 @@ if test -n "$_host"; then
+@@ -499,8 +499,9 @@ if test -n "$_host"; then
  			_host_os=win32
  			;;
  		*)
@@ -23,7 +23,7 @@ index 0d90a4f0acde..a4afea8e1880 100755
 +			_host_os=unix
  			;;
  	esac
- 	
+ 
 -- 
 1.9.1
 
diff --git a/bsp/buildroot/package/stella/0002-Do-not-strip-when-installing.patch b/bsp/buildroot/package/stella/0002-Do-not-strip-when-installing.patch
index cba4b088..8a95a81a 100644
--- a/bsp/buildroot/package/stella/0002-Do-not-strip-when-installing.patch
+++ b/bsp/buildroot/package/stella/0002-Do-not-strip-when-installing.patch
@@ -1,6 +1,6 @@
-From a86140353cb2e162d88da9caa1716915be2f6893 Mon Sep 17 00:00:00 2001
+From d506a586b299682a425d3c3de68baefb7221fa9a Mon Sep 17 00:00:00 2001
 From: Sergio Prado <sergio.prado@e-labworks.com>
-Date: Tue, 26 Jul 2016 13:25:12 -0300
+Date: Sun, 30 Jul 2017 18:25:12 -0300
 Subject: [PATCH 2/2] Do not strip when installing
 
 Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
@@ -9,10 +9,10 @@ Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 6dd0129587b3..b1aea5eed4a1 100644
+index 346640e53bea..fedaed05a4d6 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -172,7 +172,7 @@ config.mak: $(srcdir)/configure
+@@ -173,7 +173,7 @@ config.mak: $(srcdir)/configure
  
  install: all
  	$(INSTALL) -d "$(DESTDIR)$(BINDIR)"
diff --git a/bsp/buildroot/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch b/bsp/buildroot/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch
new file mode 100644
index 00000000..ffbc8318
--- /dev/null
+++ b/bsp/buildroot/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch
@@ -0,0 +1,54 @@
+From 36d5c8bc3592b4dffbec222a179c3956787a0694 Mon Sep 17 00:00:00 2001
+From: Sergio Prado <sergio.prado@e-labworks.com>
+Date: Sat, 9 Sep 2017 15:04:58 -0300
+Subject: [PATCH] Fix error when building with uClibc-ng
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The uClibc-ng C library defines a type called R0 that conflits with a
+global variable called R0 from PaddleReader.cxx.
+
+src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol
+   R0 = 1.5e3,
+   ^
+/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘<anonymous enum> R0’
+   R0 = 0,
+   ^~
+
+So let's redefine R0 as a private member of the PaddleReader class.
+
+Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
+---
+ src/emucore/tia/PaddleReader.cxx | 1 -
+ src/emucore/tia/PaddleReader.hxx | 2 ++
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx
+index 69c828ea6c5c..27ff828200ee 100644
+--- a/src/emucore/tia/PaddleReader.cxx
++++ b/src/emucore/tia/PaddleReader.cxx
+@@ -22,7 +22,6 @@
+ static constexpr double
+   C = 68e-9,
+   RPOT = 1e6,
+-  R0 = 1.5e3,
+   USUPP = 5;
+ 
+ static constexpr double TRIPPOINT_LINES = 379;
+diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx
+index 00238a4fe5b5..0032e6efd015 100644
+--- a/src/emucore/tia/PaddleReader.hxx
++++ b/src/emucore/tia/PaddleReader.hxx
+@@ -65,6 +65,8 @@ class PaddleReader : public Serializable
+ 
+     bool myIsDumped;
+ 
++    static constexpr double R0 = 1.5e3;
++
+   private:
+     PaddleReader(const PaddleReader&) = delete;
+     PaddleReader(PaddleReader&&) = delete;
+-- 
+1.9.1
+
diff --git a/bsp/buildroot/package/stella/0003-configure-Add-CXXFLAGS-for-test-compilations.patch b/bsp/buildroot/package/stella/0003-configure-Add-CXXFLAGS-for-test-compilations.patch
deleted file mode 100644
index c548d082..00000000
--- a/bsp/buildroot/package/stella/0003-configure-Add-CXXFLAGS-for-test-compilations.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 28f0c20302e5c64712899848cae3d0a48a9dc952 Mon Sep 17 00:00:00 2001
-From: Vlad Zakharov <vzakhar@synopsys.com>
-Date: Wed, 10 Aug 2016 18:02:59 +0300
-Subject: [PATCH] configure: Add $CXXFLAGS for test compilations
-
-Why we are passing only linker flags when compiling test code?
-Loosing compiler flags leads to errors.
-
-Signed-off-by: Vlad Zakharov <vzakhar@synopsys.com>
----
- configure | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index 0d90a4f..618fe78 100755
---- a/configure
-+++ b/configure
-@@ -63,9 +63,9 @@ cc_check() {
- 	echo >> "$TMPLOG"
- 	cat "$TMPC" >> "$TMPLOG"
- 	echo >> "$TMPLOG"
--	echo "$CXX $TMPC $LDFLAGS -o $TMPO$EXEEXT $@" >> "$TMPLOG"
-+	echo "$CXX $TMPC $CXXFLAGS $LDFLAGS -o $TMPO$EXEEXT $@" >> "$TMPLOG"
- 	rm -f "$TMPO$EXEEXT"
--	( $CXX "$TMPC" $LDFLAGS -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
-+	( $CXX "$TMPC" $CXXFLAGS $LDFLAGS -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1
- 	TMP="$?"
- 	echo >> "$TMPLOG"
- 	return "$TMP"
-@@ -107,9 +107,9 @@ EOF
- 
- if test -n "$_host"; then
- 	# In cross-compiling mode, we cannot run the result
--	eval "$1 $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
-+	eval "$1 $CXXFLAGS $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
- else
--	eval "$1 $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
-+	eval "$1 $CXXFLAGS $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp
- fi
- }
- 
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch b/bsp/buildroot/package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch
deleted file mode 100644
index 76d12a2c..00000000
--- a/bsp/buildroot/package/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6946a491cae42b971aad3bc5d822e0e549eca8bd Mon Sep 17 00:00:00 2001
-From: Sergio Prado <sergio.prado@e-labworks.com>
-Date: Thu, 1 Dec 2016 15:20:33 -0200
-Subject: [PATCH] Use gnu++11 standard to prevent errors on PPC.
-
-PPC altivec vectorization triggers a bug when compiling with -std=c++11
-because "bool" is redefined in altivec.h.
-
-Acording to a bug report in GCC, "You need to use -std=g++11 or
-undefine bool after the include of altivec.h as context sensitive
-keywords is not part of the C++11 standard".
-
-So let's use gnu++11 standard.
-
-Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6dd0129587b3..6ed50ea4c335 100644
---- a/Makefile
-+++ b/Makefile
-@@ -51,7 +51,7 @@ else
- endif
- CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers
- ifdef HAVE_GCC
--  CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++11
-+  CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=gnu++11
- endif
- 
- ifdef PROFILE
--- 
-1.9.1
-
diff --git a/bsp/buildroot/package/stella/Config.in b/bsp/buildroot/package/stella/Config.in
index 55f177f7..639b9e4a 100644
--- a/bsp/buildroot/package/stella/Config.in
+++ b/bsp/buildroot/package/stella/Config.in
@@ -1,16 +1,18 @@
 config BR2_PACKAGE_STELLA
 	bool "stella"
+	depends on !BR2_STATIC_LIBS # sdl2
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14
 	select BR2_PACKAGE_SDL2
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_ZLIB
-	depends on !BR2_STATIC_LIBS # sdl2
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	help
 	  Stella is a multi-platform Atari 2600 VCS emulator.
 
-	  http://stella.sourceforge.net/
+	  https://stella-emu.github.io/
 
-comment "stella needs a toolchain w/ dynamic library, C++, gcc >= 4.8"
+comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 4.9"
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+		!BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/bsp/buildroot/package/stella/stella.hash b/bsp/buildroot/package/stella/stella.hash
index 71defd28..ef17ff75 100644
--- a/bsp/buildroot/package/stella/stella.hash
+++ b/bsp/buildroot/package/stella/stella.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256 b2727a0e2d3b112d35dcb89b4bdc789e2c7f15e9d9c7054a69a2f67facd7416e  stella-4.7.2-src.tar.xz
+sha256 74ee708b68340b65519a04a22c61921cdcf69a1d308600c212414b28e9e689ac  stella-5.0.2-src.tar.xz
diff --git a/bsp/buildroot/package/stella/stella.mk b/bsp/buildroot/package/stella/stella.mk
index 2e9d57b8..158a5110 100644
--- a/bsp/buildroot/package/stella/stella.mk
+++ b/bsp/buildroot/package/stella/stella.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-STELLA_VERSION = 4.7.2
+STELLA_VERSION = 5.0.2
 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz
-STELLA_SITE = http://downloads.sourceforge.net/stella
-STELLA_LICENSE = GPLv2+
+STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION)
+STELLA_LICENSE = GPL-2.0+
 STELLA_LICENSE_FILES = Copyright.txt License.txt
 
 STELLA_DEPENDENCIES = sdl2 libpng zlib
diff --git a/bsp/buildroot/package/stm32flash/Config.in b/bsp/buildroot/package/stm32flash/Config.in
index cb6f4805..87afe3b8 100644
--- a/bsp/buildroot/package/stm32flash/Config.in
+++ b/bsp/buildroot/package/stm32flash/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_STM32FLASH
 	bool "stm32flash"
 	help
 	  Open source cross platform flash program for the STM32 ARM
-	  microcontrollers using the built-in ST serial bootloader over UART
-	  or I2C.
+	  microcontrollers using the built-in ST serial bootloader
+	  over UART or I2C.
 
 	  http://sourceforge.net/projects/stm32flash/
diff --git a/bsp/buildroot/package/stm32flash/stm32flash.mk b/bsp/buildroot/package/stm32flash/stm32flash.mk
index 2c0fa56a..c41fc76d 100644
--- a/bsp/buildroot/package/stm32flash/stm32flash.mk
+++ b/bsp/buildroot/package/stm32flash/stm32flash.mk
@@ -6,7 +6,7 @@
 
 STM32FLASH_VERSION = 4ac0566f188f39eace0223d966d349cd2f2c5895
 STM32FLASH_SITE = git://git.code.sf.net/p/stm32flash/code
-STM32FLASH_LICENSE = GPLv2+
+STM32FLASH_LICENSE = GPL-2.0+
 STM32FLASH_LICENSE_FILES = gpl-2.0.txt
 
 define STM32FLASH_BUILD_CMDS
diff --git a/bsp/buildroot/package/strace/Config.in b/bsp/buildroot/package/strace/Config.in
index bbb582ad..b84b3fd1 100644
--- a/bsp/buildroot/package/strace/Config.in
+++ b/bsp/buildroot/package/strace/Config.in
@@ -1,8 +1,14 @@
 config BR2_PACKAGE_STRACE
 	bool "strace"
+	# needs at least kernel headers 4.0 on nios2
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2
 	help
 	  A useful diagnostic, instructional, and debugging tool.
 	  Allows you to track what system calls a program makes
 	  while it is running.
 
-	  http://sourceforge.net/projects/strace/
+	  https://strace.io
+
+comment "strace needs a toolchain w/ headers >= 4.0 on nios2"
+	depends on BR2_nios2
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0
diff --git a/bsp/buildroot/package/strace/strace.hash b/bsp/buildroot/package/strace/strace.hash
index c7695ff3..404be397 100644
--- a/bsp/buildroot/package/strace/strace.hash
+++ b/bsp/buildroot/package/strace/strace.hash
@@ -1,3 +1,7 @@
-# From https://sourceforge.net/projects/strace/files/strace/4.15/
-md5	1ff96209fec19914c920608ed0791864	strace-4.15.tar.xz
-sha1	18fbaeb07d089023764f618f179091b663a0d21e	strace-4.15.tar.xz
+# From https://sourceforge.net/projects/strace/files/strace/4.20/
+md5	f2271ab0fac49ebee9cbd7f3469227cb	strace-4.20.tar.xz
+sha1	9cebc754af3434e4027a07745770892f685c0316	strace-4.20.tar.xz
+# Locally calculated after checking signature
+# https://sourceforge.net/projects/strace/files/strace/4.20/strace-4.20.tar.xz.asc
+sha256	5bf3148dd17306a42566f7da17368fdd781afa147db05ea63a4ca2b50f58c523	strace-4.20.tar.xz
+sha256	ea7ff222f36c9df0aa2924a8f7c7d2aec3ea11e752feba4b15ec79b695b6236a	COPYING
diff --git a/bsp/buildroot/package/strace/strace.mk b/bsp/buildroot/package/strace/strace.mk
index b8de81af..ba57774e 100644
--- a/bsp/buildroot/package/strace/strace.mk
+++ b/bsp/buildroot/package/strace/strace.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-STRACE_VERSION = 4.15
+STRACE_VERSION = 4.20
 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz
 STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION)
-STRACE_LICENSE = BSD-3c
+STRACE_LICENSE = BSD-3-Clause
 STRACE_LICENSE_FILES = COPYING
 
 # strace bundle some kernel headers to build libmpers, this mixes userspace
diff --git a/bsp/buildroot/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch b/bsp/buildroot/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch
new file mode 100644
index 00000000..6cbba5e7
--- /dev/null
+++ b/bsp/buildroot/package/stress-ng/0001-stress-netlink-proc-fix-build-with-kernel-v3.9.patch
@@ -0,0 +1,38 @@
+From f3aa381322a4b73b9ca4e7940f802d74324ef24b Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Mon, 2 Jul 2018 21:06:43 +0300
+Subject: [PATCH] stress-netlink-proc: fix build with kernel v3.9
+
+The PROC_EVENT_COREDUMP has been introduced in kernel version 3.10.
+Don't use it with 3.9 headers.
+
+Fixes build failure:
+
+stress-netlink-proc.c: In function 'monitor':
+stress-netlink-proc.c:108:8: error: 'PROC_EVENT_COREDUMP' undeclared (first use in this function)
+   case PROC_EVENT_COREDUMP:
+        ^
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/ColinIanKing/stress-ng/pull/24
+
+ stress-netlink-proc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stress-netlink-proc.c b/stress-netlink-proc.c
+index 5845610dc816..6114a0b92af1 100644
+--- a/stress-netlink-proc.c
++++ b/stress-netlink-proc.c
+@@ -104,7 +104,7 @@ static int monitor(const args_t *args, const int sock)
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
+ 		case PROC_EVENT_SID:
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
+ 		case PROC_EVENT_COREDUMP:
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/stress-ng/Config.in b/bsp/buildroot/package/stress-ng/Config.in
index 20ec93af..88163221 100644
--- a/bsp/buildroot/package/stress-ng/Config.in
+++ b/bsp/buildroot/package/stress-ng/Config.in
@@ -7,8 +7,9 @@ config BR2_PACKAGE_STRESS_NG
 	# perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
 	depends on !BR2_microblaze # keyutils
-	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
+	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 and ARC
 	depends on !BR2_nios2
+	depends on !BR2_arc
 	depends on !BR2_STATIC_LIBS # keyutils
 	select BR2_PACKAGE_KEYUTILS # stress-key.c needs keyutils.h
 	select BR2_PACKAGE_ATTR # stress-xattr.c needs xattr.h
@@ -21,7 +22,7 @@ config BR2_PACKAGE_STRESS_NG
 	  http://kernel.ubuntu.com/~cking/stress-ng/
 
 comment "stress-ng needs a glibc toolchain w/ dynamic library, headers >= 3.3"
-	depends on !BR2_microblaze && !BR2_nios2
+	depends on !BR2_microblaze && !BR2_nios2 && !BR2_arc
 	depends on BR2_USE_MMU
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 \
 		|| !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/bsp/buildroot/package/stress-ng/stress-ng.hash b/bsp/buildroot/package/stress-ng/stress-ng.hash
index e735439a..7455288c 100644
--- a/bsp/buildroot/package/stress-ng/stress-ng.hash
+++ b/bsp/buildroot/package/stress-ng/stress-ng.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
+sha256  0de97212a83b2f8a34ee31ef32a7bc69066ed49ebdc59b51aa4060cb95e29321  stress-ng-0.09.32.tar.xz
diff --git a/bsp/buildroot/package/stress-ng/stress-ng.mk b/bsp/buildroot/package/stress-ng/stress-ng.mk
index b4d46993..d8324081 100644
--- a/bsp/buildroot/package/stress-ng/stress-ng.mk
+++ b/bsp/buildroot/package/stress-ng/stress-ng.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-STRESS_NG_VERSION = 0.06.15
+STRESS_NG_VERSION = 0.09.32
+STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
 STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
-STRESS_NG_LICENSE = GPLv2+
+STRESS_NG_LICENSE = GPL-2.0+
 STRESS_NG_LICENSE_FILES = COPYING
 
 STRESS_NG_DEPENDENCIES = attr keyutils
diff --git a/bsp/buildroot/package/stress/stress.mk b/bsp/buildroot/package/stress/stress.mk
index 1b5ba06a..4d2d4cb8 100644
--- a/bsp/buildroot/package/stress/stress.mk
+++ b/bsp/buildroot/package/stress/stress.mk
@@ -6,7 +6,7 @@
 
 STRESS_VERSION = 1.0.4
 STRESS_SITE = http://people.seas.harvard.edu/~apw/stress
-STRESS_LICENSE = GPLv2+
+STRESS_LICENSE = GPL-2.0+
 STRESS_LICENSE_FILES = COPYING
 
 # Stress is linked statically if the --enable-static is specified.
diff --git a/bsp/buildroot/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch b/bsp/buildroot/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch
deleted file mode 100644
index 442e53eb..00000000
--- a/bsp/buildroot/package/strongswan/0001-af_alg-fix-crypt-definition-conflict.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 0b906cb025a506be1b73e5b485179585d1a90be2 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 11 May 2017 14:04:47 +0300
-Subject: [PATCH] af_alg: fix crypt() definition conflict
-
-Rename the crypt() method to avoid conflict with POSIX crypt(). Fixes the
-following build failure with musl libc:
-
-In file included from ../../../../src/libstrongswan/utils/utils.h:53:0,
-                 from ../../../../src/libstrongswan/library.h:101,
-                 from af_alg_ops.h:24,
-                 from af_alg_ops.c:16:
-af_alg_ops.c:110:22: error: conflicting types for 'crypt'
- METHOD(af_alg_ops_t, crypt, bool,
-                      ^
-../../../../src/libstrongswan/utils/utils/object.h:99:13: note: in definition of macro 'METHOD'
-  static ret name(union {iface *_public; this;} \
-             ^
-In file included from af_alg_ops.c:18:0:
-.../host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/unistd.h:144:7: note: previous declaration of 'crypt' was here
- char *crypt(const char *, const char *);
-       ^
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: https://github.com/strongswan/strongswan/pull/72
-
- src/libstrongswan/plugins/af_alg/af_alg_ops.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libstrongswan/plugins/af_alg/af_alg_ops.c b/src/libstrongswan/plugins/af_alg/af_alg_ops.c
-index 331d1e8010aa..452cd1ac30c9 100644
---- a/src/libstrongswan/plugins/af_alg/af_alg_ops.c
-+++ b/src/libstrongswan/plugins/af_alg/af_alg_ops.c
-@@ -107,7 +107,7 @@ METHOD(af_alg_ops_t, hash, bool,
- 	return TRUE;
- }
- 
--METHOD(af_alg_ops_t, crypt, bool,
-+METHOD(af_alg_ops_t, crypt_, bool,
- 	private_af_alg_ops_t *this, u_int32_t type, chunk_t iv, chunk_t data,
- 	char *out)
- {
-@@ -224,7 +224,7 @@ af_alg_ops_t *af_alg_ops_create(char *type, char *alg)
- 		.public = {
- 			.hash = _hash,
- 			.reset = _reset,
--			.crypt = _crypt,
-+			.crypt = _crypt_,
- 			.set_key = _set_key,
- 			.destroy = _destroy,
- 		},
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/strongswan/Config.in b/bsp/buildroot/package/strongswan/Config.in
index 0a95ac02..0438eece 100644
--- a/bsp/buildroot/package/strongswan/Config.in
+++ b/bsp/buildroot/package/strongswan/Config.in
@@ -15,11 +15,13 @@ menuconfig BR2_PACKAGE_STRONGSWAN
 	  FreeS/WAN project and the X.509 patch.
 
 	  The focus is on:
-	     - simplicity of configuration
-	     - strong encryption and authentication methods
-	     - powerful IPsec policies supporting large and complex VPN networks
+	   - simplicity of configuration
+	   - strong encryption and authentication methods
+	   - powerful IPsec policies supporting large and complex
+	     VPN networks
 
-	  strongSwan provide many plugins. Only a few are presented here.
+	  strongSwan provide many plugins. Only a few are presented
+	  here.
 
 	  http://www.strongswan.org/
 
@@ -120,12 +122,12 @@ config BR2_PACKAGE_STRONGSWAN_SCEP
 
 config BR2_PACKAGE_STRONGSWAN_SCRIPTS
 	bool "Enable additional utilities (found in scripts directory)"
-	depends on BR2_PACKAGE_STRONGSWAN_CHARON
 	default y
+	depends on BR2_PACKAGE_STRONGSWAN_CHARON
 
 config BR2_PACKAGE_STRONGSWAN_VICI
 	bool "Enable vici/swanctl"
-	depends on BR2_PACKAGE_STRONGSWAN_CHARON
 	default y
+	depends on BR2_PACKAGE_STRONGSWAN_CHARON
 
 endif
diff --git a/bsp/buildroot/package/strongswan/strongswan.hash b/bsp/buildroot/package/strongswan/strongswan.hash
index 820c7128..4d1a593a 100644
--- a/bsp/buildroot/package/strongswan/strongswan.hash
+++ b/bsp/buildroot/package/strongswan/strongswan.hash
@@ -1,10 +1,9 @@
-# From http://download.strongswan.org/strongswan-5.4.0.tar.bz2.md5
-md5	9d7c77b0da9b69f859624897e5e9ebbf	strongswan-5.4.0.tar.bz2
+# From http://download.strongswan.org/strongswan-5.6.3.tar.bz2.md5
+md5	a6a28eeb22aa58080a7581771a5b63f9	strongswan-5.6.3.tar.bz2
 # Calculated based on the hash above
-sha256	f8288faaea6a9cd8a7d413c0b76b7922be5da3dfcd01fd05cb30d2c55d3bbe89	strongswan-5.4.0.tar.bz2
+sha256	c3c7dc8201f40625bba92ffd32eb602a8909210d8b3fac4d214c737ce079bf24	strongswan-5.6.3.tar.bz2
 # Locally calculated
-sha256	f5ba7f46cf7ae81dd81bc86f9e4cfa0c5c7c6987149b3bc9c0b8bf08598a1063  strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch
-sha256	03db8c7a4133e877e8992e155c046dd27ec4810d50f239abf55595f0280caf31  strongswan-5.0.0-5.5.2_asn1_choice.patch
-sha256	c80e02c9a5eeaf10f0a8bdde3be6375dd2833e515af03dad3a700e93c4fd041a  strongswan-4.4.0-5.5.3_gmp_mpz_export.patch
+sha256	e66c243593ee0713f5fd13bcd7f624bc50eebc54bf87f790ced429ff698077e7  strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch
+sha256	415d104717cb0781770e9077d00b3df310b11e65e4b9c1d35b62fbba04549263  strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch
 sha256	8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
 sha256	2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0  LICENSE
diff --git a/bsp/buildroot/package/strongswan/strongswan.mk b/bsp/buildroot/package/strongswan/strongswan.mk
index ce837d09..30693de7 100644
--- a/bsp/buildroot/package/strongswan/strongswan.mk
+++ b/bsp/buildroot/package/strongswan/strongswan.mk
@@ -4,14 +4,13 @@
 #
 ################################################################################
 
-STRONGSWAN_VERSION = 5.4.0
+STRONGSWAN_VERSION = 5.6.3
 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
 STRONGSWAN_SITE = http://download.strongswan.org
 STRONGSWAN_PATCH = \
-	$(STRONGSWAN_SITE)/patches/21_gmp_mpz_powm_sec_patch/strongswan-4.4.0-5.5.2_gmp_mpz_powm_sec.patch \
-	$(STRONGSWAN_SITE)/patches/22_asn1_choice_patch/strongswan-5.0.0-5.5.2_asn1_choice.patch \
-	$(STRONGSWAN_SITE)/patches/23_gmp_mpz_export_patch/strongswan-4.4.0-5.5.3_gmp_mpz_export.patch
-STRONGSWAN_LICENSE = GPLv2+
+	$(STRONGSWAN_SITE)/patches/27_gmp_pkcs1_verify_patch/strongswan-5.6.1-5.6.3_gmp-pkcs1-verify.patch \
+	$(STRONGSWAN_SITE)/patches/28_gmp_pkcs1_overflow_patch/strongswan-4.4.0-5.7.0_gmp-pkcs1-overflow.patch
+STRONGSWAN_LICENSE = GPL-2.0+
 STRONGSWAN_LICENSE_FILES = COPYING LICENSE
 STRONGSWAN_DEPENDENCIES = host-pkgconf
 STRONGSWAN_CONF_OPTS += \
@@ -37,7 +36,10 @@ STRONGSWAN_CONF_OPTS += \
 	--enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no) \
 	--enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \
 	--enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \
-	--enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no)
+	--enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \
+	--with-ipseclibdir=/usr/lib \
+	--with-plugindir=/usr/lib/ipsec/plugins \
+	--with-imcvdir=/usr/lib/ipsec/imcvs
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 STRONGSWAN_CONF_ENV += LIBS='-latomic'
diff --git a/bsp/buildroot/package/stunnel/stunnel.hash b/bsp/buildroot/package/stunnel/stunnel.hash
index c4e70a7f..d3b9451c 100644
--- a/bsp/buildroot/package/stunnel/stunnel.hash
+++ b/bsp/buildroot/package/stunnel/stunnel.hash
@@ -1,2 +1,5 @@
-# From http://www.stunnel.org/pipermail/stunnel-announce/2016-September/000125.html
-sha256	eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea	stunnel-5.36.tar.gz
+# From https://www.stunnel.org/downloads/stunnel-5.44.tar.gz.sha256
+sha256	990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299	stunnel-5.44.tar.gz
+# Locally calculated
+sha256	c43821865591e4d893906e2801b5ec4de58e51978f5563a61475cd0adc0bec4d	COPYING
+sha256	1ee2b290e92c211b08df10e9fcaf32596cdb22b8eae731b18c2c074a4a83eebe	COPYRIGHT.GPL
diff --git a/bsp/buildroot/package/stunnel/stunnel.mk b/bsp/buildroot/package/stunnel/stunnel.mk
index f98e7b59..4a5d2a03 100644
--- a/bsp/buildroot/package/stunnel/stunnel.mk
+++ b/bsp/buildroot/package/stunnel/stunnel.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 STUNNEL_VERSION_MAJOR = 5
-STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).36
+STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).44
 STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x
 STUNNEL_DEPENDENCIES = openssl
 STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \
@@ -13,7 +13,7 @@ STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \
 STUNNEL_CONF_ENV = \
 	ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \
 	LIBS=$(if $(BR2_STATIC_LIBS),-lz)
-STUNNEL_LICENSE = GPLv2+
+STUNNEL_LICENSE = GPL-2.0+
 STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL
 
 ifeq ($(BR2_INIT_SYSTEMD),y)
diff --git a/bsp/buildroot/package/subversion/Config.in b/bsp/buildroot/package/subversion/Config.in
index ffe424a7..ecac5181 100644
--- a/bsp/buildroot/package/subversion/Config.in
+++ b/bsp/buildroot/package/subversion/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_SUBVERSION
 	bool "subversion"
-	select BR2_PACKAGE_APR
-	select BR2_PACKAGE_APR_UTIL
 	# apr really needs shared library support
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_MMU # apr
+	select BR2_PACKAGE_APR
+	select BR2_PACKAGE_APR_UTIL
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_SQLITE
diff --git a/bsp/buildroot/package/sudo/0001-fix-CVE-2017-1000367.patch b/bsp/buildroot/package/sudo/0001-fix-CVE-2017-1000367.patch
deleted file mode 100644
index 6e44399c..00000000
--- a/bsp/buildroot/package/sudo/0001-fix-CVE-2017-1000367.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-Downloaded from upstream: https://www.sudo.ws/repos/sudo/raw-rev/b5460cbbb11b
-
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller@courtesan.com>
-# Date 1496089973 21600
-# Node ID b5460cbbb11bbf9d92ffcc6798a686cf4125efd3
-# Parent  c303e6eecc7841e2f891d70613e80fcf27fa6e86
-Fix for CVE-2017-1000367, parsing of /proc/pid/stat on Linux when
-the process name contains spaces.  Since the user has control over
-the command name this could be used by a user with sudo access to
-overwrite an arbitrary file.
-Thanks to Qualys for investigating and reporting this bug.
-
-Also stop performing a breadth-first traversal of /dev when looking
-for the device.  Only the directories specified in search_devs[]
-are checked.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-diff -r c303e6eecc78 -r b5460cbbb11b src/ttyname.c
---- a/src/ttyname.c	Tue May 23 13:26:54 2017 -0600
-+++ b/src/ttyname.c	Mon May 29 14:32:53 2017 -0600
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2012-2016 Todd C. Miller <Todd.Miller@courtesan.com>
-+ * Copyright (c) 2012-2017 Todd C. Miller <Todd.Miller@courtesan.com>
-  *
-  * Permission to use, copy, modify, and distribute this software for any
-  * purpose with or without fee is hereby granted, provided that the above
-@@ -145,20 +145,22 @@
- }
- #elif defined(HAVE_STRUCT_PSINFO_PR_TTYDEV) || defined(HAVE_PSTAT_GETPROC) || defined(__linux__)
- /*
-- * Devices to search before doing a breadth-first scan.
-+ * Device nodes and directories to search before searching all of /dev
-  */
- static char *search_devs[] = {
-     "/dev/console",
--    "/dev/wscons",
--    "/dev/pts/",
--    "/dev/vt/",
--    "/dev/term/",
--    "/dev/zcons/",
-+    "/dev/pts/",	/* POSIX pty */
-+    "/dev/vt/",		/* Solaris virtual console */
-+    "/dev/term/",	/* Solaris serial ports */
-+    "/dev/zcons/",	/* Solaris zone console */
-+    "/dev/pty/",	/* HP-UX old-style pty */
-     NULL
- };
- 
-+/*
-+ * Device nodes to ignore when searching all of /dev
-+ */
- static char *ignore_devs[] = {
--    "/dev/fd/",
-     "/dev/stdin",
-     "/dev/stdout",
-     "/dev/stderr",
-@@ -166,16 +168,18 @@
- };
- 
- /*
-- * Do a breadth-first scan of dir looking for the specified device.
-+ * Do a scan of a directory looking for the specified device.
-+ * Does not descend into subdirectories.
-  * Returns name on success and NULL on failure, setting errno.
-  */
- static char *
--sudo_ttyname_scan(const char *dir, dev_t rdev, bool builtin, char *name, size_t namelen)
-+sudo_ttyname_scan(const char *dir, dev_t rdev, char *name, size_t namelen)
- {
--    size_t sdlen, num_subdirs = 0, max_subdirs = 0;
--    char pathbuf[PATH_MAX], **subdirs = NULL;
-+    size_t sdlen;
-+    char pathbuf[PATH_MAX];
-     char *ret = NULL;
-     struct dirent *dp;
-+    struct stat sb;
-     unsigned int i;
-     DIR *d = NULL;
-     debug_decl(sudo_ttyname_scan, SUDO_DEBUG_UTIL)
-@@ -187,6 +191,18 @@
-     if ((d = opendir(dir)) == NULL)
- 	goto done;
- 
-+    if (fstat(dirfd(d), &sb) == -1) {
-+	sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
-+	    "unable to fstat %s", dir);
-+	goto done;
-+    }
-+    if ((sb.st_mode & S_IWOTH) != 0) {
-+	sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
-+	    "ignoring world-writable directory %s", dir);
-+	errno = ENOENT;
-+	goto done;
-+    }
-+
-     sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
- 	"scanning for dev %u in %s", (unsigned int)rdev, dir);
- 
-@@ -224,18 +240,6 @@
- 	}
- 	if (ignore_devs[i] != NULL)
- 	    continue;
--	if (!builtin) {
--	    /* Skip entries in search_devs; we already checked them. */
--	    for (i = 0; search_devs[i] != NULL; i++) {
--		len = strlen(search_devs[i]);
--		if (search_devs[i][len - 1] == '/')
--		    len--;
--		if (d_len == len && strncmp(pathbuf, search_devs[i], len) == 0)
--		    break;
--	    }
--	    if (search_devs[i] != NULL)
--		continue;
--	}
- # if defined(HAVE_STRUCT_DIRENT_D_TYPE) && defined(DTTOIF)
- 	/*
- 	 * Avoid excessive stat() calls by checking dp->d_type.
-@@ -248,39 +252,14 @@
- 		if (stat(pathbuf, &sb) == -1)
- 		    continue;
- 		break;
--	    case DT_DIR:
--		/* Directory, no need to stat() it. */
--		sb.st_mode = DTTOIF(dp->d_type);
--		sb.st_rdev = 0;		/* quiet ccc-analyzer false positive */
--		break;
- 	    default:
--		/* Not a character device, link or directory, skip it. */
-+		/* Not a character device or link, skip it. */
- 		continue;
- 	}
- # else
- 	if (stat(pathbuf, &sb) == -1)
- 	    continue;
- # endif
--	if (S_ISDIR(sb.st_mode)) {
--	    if (!builtin) {
--		/* Add to list of subdirs to search. */
--		if (num_subdirs + 1 > max_subdirs) {
--		    char **new_subdirs;
--
--		    new_subdirs = reallocarray(subdirs, max_subdirs + 64,
--			sizeof(char *));
--		    if (new_subdirs == NULL)
--			goto done;
--		    subdirs = new_subdirs;
--		    max_subdirs += 64;
--		}
--		subdirs[num_subdirs] = strdup(pathbuf);
--		if (subdirs[num_subdirs] == NULL)
--		    goto done;
--		num_subdirs++;
--	    }
--	    continue;
--	}
- 	if (S_ISCHR(sb.st_mode) && sb.st_rdev == rdev) {
- 	    sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
- 		"resolved dev %u as %s", (unsigned int)rdev, pathbuf);
-@@ -296,16 +275,9 @@
- 	}
-     }
- 
--    /* Search subdirs if we didn't find it in the root level. */
--    for (i = 0; ret == NULL && i < num_subdirs; i++)
--	ret = sudo_ttyname_scan(subdirs[i], rdev, false, name, namelen);
--
- done:
-     if (d != NULL)
- 	closedir(d);
--    for (i = 0; i < num_subdirs; i++)
--	free(subdirs[i]);
--    free(subdirs);
-     debug_return_str(ret);
- }
- 
-@@ -324,7 +296,7 @@
-     debug_decl(sudo_ttyname_dev, SUDO_DEBUG_UTIL)
- 
-     /*
--     * First check search_devs for common tty devices.
-+     * First check search_devs[] for common tty devices.
-      */
-     for (sd = search_devs; (devname = *sd) != NULL; sd++) {
- 	len = strlen(devname);
-@@ -349,7 +321,7 @@
- 		    "comparing dev %u to %s: no", (unsigned int)rdev, buf);
- 	    } else {
- 		/* Traverse directory */
--		ret = sudo_ttyname_scan(devname, rdev, true, name, namelen);
-+		ret = sudo_ttyname_scan(devname, rdev, name, namelen);
- 		if (ret != NULL || errno == ENOMEM)
- 		    goto done;
- 	    }
-@@ -367,9 +339,9 @@
-     }
- 
-     /*
--     * Not found?  Do a breadth-first traversal of /dev/.
-+     * Not found?  Check all device nodes in /dev.
-      */
--    ret = sudo_ttyname_scan(_PATH_DEV, rdev, false, name, namelen);
-+    ret = sudo_ttyname_scan(_PATH_DEV, rdev, name, namelen);
- 
- done:
-     debug_return_str(ret);
-@@ -493,28 +465,35 @@
- 	len = getline(&line, &linesize, fp);
- 	fclose(fp);
- 	if (len != -1) {
--	    /* Field 7 is the tty dev (0 if no tty) */
--	    char *cp = line;
--	    char *ep = line;
--	    const char *errstr;
--	    int field = 0;
--	    while (*++ep != '\0') {
--		if (*ep == ' ') {
--		    *ep = '\0';
--		    if (++field == 7) {
--			dev_t tdev = strtonum(cp, INT_MIN, INT_MAX, &errstr);
--			if (errstr) {
--			    sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
--				"%s: tty device %s: %s", path, cp, errstr);
-+	    /*
-+	     * Field 7 is the tty dev (0 if no tty).
-+	     * Since the process name at field 2 "(comm)" may include spaces,
-+	     * start at the last ')' found.
-+	     */
-+	    char *cp = strrchr(line, ')');
-+	    if (cp != NULL) {
-+		char *ep = cp;
-+		const char *errstr;
-+		int field = 1;
-+
-+		while (*++ep != '\0') {
-+		    if (*ep == ' ') {
-+			*ep = '\0';
-+			if (++field == 7) {
-+			    dev_t tdev = strtonum(cp, INT_MIN, INT_MAX, &errstr);
-+			    if (errstr) {
-+				sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
-+				    "%s: tty device %s: %s", path, cp, errstr);
-+			    }
-+			    if (tdev > 0) {
-+				errno = serrno;
-+				ret = sudo_ttyname_dev(tdev, name, namelen);
-+				goto done;
-+			    }
-+			    break;
- 			}
--			if (tdev > 0) {
--			    errno = serrno;
--			    ret = sudo_ttyname_dev(tdev, name, namelen);
--			    goto done;
--			}
--			break;
-+			cp = ep + 1;
- 		    }
--		    cp = ep + 1;
- 		}
- 	    }
- 	}
-
diff --git a/bsp/buildroot/package/sudo/sudo.hash b/bsp/buildroot/package/sudo/sudo.hash
index 82e1ad66..80448ff7 100644
--- a/bsp/buildroot/package/sudo/sudo.hash
+++ b/bsp/buildroot/package/sudo/sudo.hash
@@ -1,2 +1,2 @@
 # From: http://www.sudo.ws/download.html
-sha256 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0  sudo-1.8.19p2.tar.gz
+sha256 74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368  sudo-1.8.21p2.tar.gz
diff --git a/bsp/buildroot/package/sudo/sudo.mk b/bsp/buildroot/package/sudo/sudo.mk
index 7f0b1325..77a95bd6 100644
--- a/bsp/buildroot/package/sudo/sudo.mk
+++ b/bsp/buildroot/package/sudo/sudo.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SUDO_VERSION = 1.8.19p2
-SUDO_SITE = http://www.sudo.ws/sudo/dist
-SUDO_LICENSE = ISC, BSD-3c
+SUDO_VERSION = 1.8.21p2
+SUDO_SITE = https://www.sudo.ws/sudo/dist
+SUDO_LICENSE = ISC, BSD-3-Clause
 SUDO_LICENSE_FILES = doc/LICENSE
 # This is to avoid sudo's make install from chown()ing files which fails
 SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install
diff --git a/bsp/buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch b/bsp/buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
new file mode 100644
index 00000000..62e1b178
--- /dev/null
+++ b/bsp/buildroot/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch
@@ -0,0 +1,57 @@
+From 5bf4d4f9c759fdb3c0db61a781042223236169c6 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Mon, 5 Jun 2017 12:40:16 +0200
+Subject: [PATCH] fix conflicting data types between GLES2/gl2.h and GLES/gl.h
+
+When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the
+build fail since GLintptr and GLsizeiptr data type are not the same in
+GLES2/gl2.h and GLES/gl.h.
+
+Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and
+GLfixed.
+
+Fixes:
+http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ include/GLES/gl.h | 15 +++++++--------
+ 1 file changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/include/GLES/gl.h b/include/GLES/gl.h
+index a6bb591..799408b 100644
+--- a/include/GLES/gl.h
++++ b/include/GLES/gl.h
+@@ -18,22 +18,21 @@ typedef void             GLvoid;
+ typedef unsigned int     GLenum;
+ typedef unsigned char    GLboolean;
+ typedef unsigned int     GLbitfield;
+-typedef signed char		   GLbyte;
++typedef khronos_int8_t   GLbyte;
+ typedef short            GLshort;
+ typedef int              GLint;
+ typedef int              GLsizei;
+-typedef unsigned char			GLubyte;
++typedef khronos_uint8_t  GLubyte;
+ typedef unsigned short   GLushort;
+ typedef unsigned int     GLuint;
+-typedef float  GLfloat;
+-typedef float  GLclampf;
+-typedef signed int  GLfixed;
++typedef khronos_float_t  GLfloat;
++typedef khronos_float_t  GLclampf;
++typedef khronos_int32_t  GLfixed;
+ typedef signed int  GLclampx;
+ typedef char GLchar;
+ 
+-typedef int * GLintptr;
+-typedef int *  GLsizeiptr;
+-
++typedef khronos_intptr_t GLintptr;
++typedef khronos_ssize_t  GLsizeiptr;
+ 
+ /*************************************************************/
+ 
+-- 
+2.9.4
+
diff --git a/bsp/buildroot/package/sunxi-mali/Config.in b/bsp/buildroot/package/sunxi-mali/Config.in
index c6754c28..554ee684 100644
--- a/bsp/buildroot/package/sunxi-mali/Config.in
+++ b/bsp/buildroot/package/sunxi-mali/Config.in
@@ -1,6 +1,12 @@
 config BR2_PACKAGE_SUNXI_MALI
 	bool "sunxi-mali"
 	depends on BR2_arm
+	# libump package only provide libUMP.so.3 which is used by
+	# libMali for r3p0 and r3p1 Mali kernel module. This version
+	# is only available for ARM EABIhf.
+	# libMali for r2p4 Mali kernel module (available for ARM EABI)
+	# requires libUMP.so.2.
+	depends on BR2_ARM_EABIHF # libUMP.so.3 only
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	select BR2_PACKAGE_HAS_LIBEGL
 	select BR2_PACKAGE_HAS_LIBGLES
@@ -25,42 +31,29 @@ config BR2_PACKAGE_PROVIDES_LIBGLES
 config BR2_PACKAGE_SUNXI_MALI_DBG
 	bool "install malitest and maliver tools"
 	help
-	  Install 3D triangle demo malitest application and the maliver application
-	  which describes the kernel module version.
+	  Install 3D triangle demo malitest application and the
+	  maliver application which describes the kernel module
+	  version.
 
 choice
 	prompt "Version"
 	default BR2_PACKAGE_SUNXI_MALI_R3P0
 	help
-	  Select the version of the kernel module. For the sunxi-kernel, the
-	  appropriate version number is r3p0. For other kernels, use the maliver
-	  application to determine the appropriate version.
-
-config BR2_PACKAGE_SUNXI_MALI_R2P4
-	bool "r2p4"
-	depends on BR2_ARM_EABI
-
-comment "r2p4 requires an EABI toolchain"
-	depends on !BR2_ARM_EABI
+	  Select the version of the kernel module. For the
+	  sunxi-kernel, the appropriate version number is r3p0. For
+	  other kernels, use the maliver application to determine the
+	  appropriate version.
 
 config BR2_PACKAGE_SUNXI_MALI_R3P0
 	bool "r3p0"
-	depends on BR2_ARM_EABIHF
-
-comment "r3p0 requires an EABIhf toolchain"
-	depends on !BR2_ARM_EABIHF
 
 config BR2_PACKAGE_SUNXI_MALI_R3P1
-	depends on BR2_ARM_EABIHF
 	bool "r3p1"
 
-comment "r3p1 requires an EABIhf toolchain"
-	depends on !BR2_ARM_EABIHF
-
 endchoice
 
 endif
 
-comment "sunxi-mali needs a glibc toolchain"
+comment "sunxi-mali needs an EABIhf glibc toolchain"
 	depends on BR2_arm
-	depends on !BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF
diff --git a/bsp/buildroot/package/sunxi-mali/sunxi-mali.hash b/bsp/buildroot/package/sunxi-mali/sunxi-mali.hash
new file mode 100644
index 00000000..31b5990d
--- /dev/null
+++ b/bsp/buildroot/package/sunxi-mali/sunxi-mali.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 c5f58b2c0533a74f491634ddbd80d888781f4ea29ecc5c24bd7300c02bef1145  sunxi-mali-d343311efc8db166d8371b28494f0f27b6a5872.tar.gz
diff --git a/bsp/buildroot/package/sunxi-mali/sunxi-mali.mk b/bsp/buildroot/package/sunxi-mali/sunxi-mali.mk
index c808db6c..90b580f5 100644
--- a/bsp/buildroot/package/sunxi-mali/sunxi-mali.mk
+++ b/bsp/buildroot/package/sunxi-mali/sunxi-mali.mk
@@ -28,17 +28,9 @@ SUNXI_MALI_MAKE_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \
 	$(TARGET_MAKE_ENV)
 
-ifeq ($(BR2_ARM_EABIHF),y)
-SUNXI_MALI_MAKE_OPTS += ABI=armhf
-else
-SUNXI_MALI_MAKE_OPTS += ABI=armel
-endif
+SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \
+	ABI=armhf
 
-SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer
-
-ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y)
-SUNXI_MALI_MAKE_OPTS += VERSION=r2p4
-endif
 ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y)
 SUNXI_MALI_MAKE_OPTS += VERSION=r3p0
 endif
diff --git a/bsp/buildroot/package/sunxi-tools/Config.in b/bsp/buildroot/package/sunxi-tools/Config.in
index 16bf2dc5..02eba956 100644
--- a/bsp/buildroot/package/sunxi-tools/Config.in
+++ b/bsp/buildroot/package/sunxi-tools/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_SUNXI_TOOLS
 	bool "sunxi nand-part"
 	depends on BR2_arm
 	help
-	  nand-part is part of sunxi-tools for Allwinner A10 (aka sun4i) and
-	  A13 (aka sun5i) based devices. It is a tool to repartition the
-	  internal NAND on sunxi devices.
+	  nand-part is part of sunxi-tools for Allwinner A10 (aka
+	  sun4i) and A13 (aka sun5i) based devices. It is a tool to
+	  repartition the internal NAND on sunxi devices.
 
 	  http://linux-sunxi.org/Sunxi-tools
diff --git a/bsp/buildroot/package/sunxi-tools/sunxi-tools.mk b/bsp/buildroot/package/sunxi-tools/sunxi-tools.mk
index 1a58aff1..3a44cf6f 100644
--- a/bsp/buildroot/package/sunxi-tools/sunxi-tools.mk
+++ b/bsp/buildroot/package/sunxi-tools/sunxi-tools.mk
@@ -6,19 +6,19 @@
 
 SUNXI_TOOLS_VERSION = v1.4.1
 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION))
-SUNXI_TOOLS_LICENSE = GPLv2+
+SUNXI_TOOLS_LICENSE = GPL-2.0+
 SUNXI_TOOLS_LICENSE_FILES = LICENSE.md
 HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
-FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin
+FEX2BIN = $(HOST_DIR)/bin/fex2bin
 
 define HOST_SUNXI_TOOLS_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR)/usr \
+	$(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR) \
 		EXTRA_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
 		-C $(@D) tools
 endef
 
 define HOST_SUNXI_TOOLS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR)/usr \
+	$(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR) \
 		-C $(@D) install-tools
 endef
 
diff --git a/bsp/buildroot/package/supertux/Config.in b/bsp/buildroot/package/supertux/Config.in
new file mode 100644
index 00000000..684c2cc9
--- /dev/null
+++ b/bsp/buildroot/package/supertux/Config.in
@@ -0,0 +1,39 @@
+config BR2_PACKAGE_SUPERTUX
+	bool "supertux"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_HAS_LIBGL # libglew
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_XORG7 # libglew, SDL2 OpenGL (GLX)
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 gcc attributes noreturn
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
+	depends on BR2_USE_MMU # SDL2 OpenGL (GLX)
+	depends on !BR2_STATIC_LIBS # SDL2
+	depends on BR2_USE_WCHAR # Boost
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_BOOST_DATE_TIME
+	select BR2_PACKAGE_BOOST_FILESYSTEM
+	select BR2_PACKAGE_BOOST_SYSTEM
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_LIBGLEW
+	select BR2_PACKAGE_LIBGLU # GL/glu.h
+	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_OPENAL
+	select BR2_PACKAGE_PHYSFS
+	select BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_SDL2_IMAGE
+	select BR2_PACKAGE_SDL2_OPENGL
+	help
+	  SuperTux is a free classic 2D jump'n run sidescroller game in
+	  a style similar to the original Super Mario games covered
+	  under the GNU GPL.
+
+	  http://supertux.github.io/
+
+comment "supertux needs OpenGL and a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library, wchar"
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_HAS_LIBGL || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
+		BR2_STATIC_LIBS || !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/supertux/supertux.hash b/bsp/buildroot/package/supertux/supertux.hash
new file mode 100644
index 00000000..c56f608e
--- /dev/null
+++ b/bsp/buildroot/package/supertux/supertux.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 c9dc3b42991ce5c5d0d0cb94e44c4ec2373ad09029940f0e92331e7e9ada0ac5 SuperTux-v0.5.1-Source.tar.gz
diff --git a/bsp/buildroot/package/supertux/supertux.mk b/bsp/buildroot/package/supertux/supertux.mk
new file mode 100644
index 00000000..e3974418
--- /dev/null
+++ b/bsp/buildroot/package/supertux/supertux.mk
@@ -0,0 +1,70 @@
+################################################################################
+#
+# supertux
+#
+################################################################################
+
+SUPERTUX_VERSION = 0.5.1
+SUPERTUX_SITE = https://github.com/SuperTux/supertux/releases/download/v$(SUPERTUX_VERSION)
+SUPERTUX_SOURCE = SuperTux-v$(SUPERTUX_VERSION)-Source.tar.gz
+
+# Supertux itself is GPL-3.0+, but it bundles a few libraries with different
+# licenses (sexp-cpp, squirrel, tinygettext) which are linked statically.
+SUPERTUX_LICENSE = GPL-3.0+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, GPL-2.0+ (images music sounds)
+SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS
+
+# Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in
+# the CMake build system.
+SUPERTUX_DEPENDENCIES = host-pkgconf boost libcurl libgl libglew libglu \
+	libogg libvorbis openal physfs sdl2 sdl2_image
+
+# ENABLE_BOOST_STATIC_LIBS=OFF: use boost shared libraries since supertux
+# depends on !BR2_STATIC_LIBS and boost provide only shared libraries with
+# BR2_SHARED_LIBS.
+# ENABLE_OPENGL=ON: Can be disabled but will make SuperTux unplayable slow.
+# GLBINDING_ENABLED=OFF: use GLEW (default) instead of glbinding.
+# Install the game directly in /usr/bin and game data in /usr/share/supertux2.
+# Force using physfs.so from staging since the check on PHYSFS_getPrefDir symbol
+# in physfs.h (CHECK_SYMBOL_EXISTS) doesn't work.
+SUPERTUX_CONF_OPTS += \
+	-DENABLE_BOOST_STATIC_LIBS=OFF \
+	-DBUILD_DOCUMENTATION=OFF \
+	-DENABLE_OPENGL=ON \
+	-DGLBINDING_ENABLED=OFF \
+	-DINSTALL_SUBDIR_BIN="bin" \
+	-DINSTALL_SUBDIR_SHARE="share/supertux2" \
+	-DUSE_SYSTEM_PHYSFS=ON
+
+# Avoid incompatible posix_memalign declaration on x86 and x86_64 with
+# musl.
+# https://gcc.gnu.org/ml/gcc-patches/2015-05/msg01425.html
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL):$(BR2_i386)$(BR2_x86_64),y:y)
+define SUPERTUX_REMOVE_PEDANTIC
+	$(SED) 's% -pedantic%%' $(@D)/CMakeLists.txt
+	$(SED) 's%CHECK_CXX_FLAG(pedantic)%%' $(@D)/external/tinygettext/CMakeLists.txt
+endef
+SUPERTUX_POST_PATCH_HOOKS += SUPERTUX_REMOVE_PEDANTIC
+endif
+
+# From https://bugs.debian.org/cgi-bin/bugreport.cgi/?bug=770670
+# "The problem lies within SDL_cpuinfo.h.  It includes altivec.h, which by
+# definition provides an unconditional vector, pixel and bool define in
+# standard-c++ mode.  In GNU-c++ mode this names are only defined
+# context-sensitive by cpp.  SDL_cpuinfo.h is included by SDL.h.
+# Including altivec.h makes arbitrary code break."
+#
+# Acording to a bug report in GCC [1]:
+# "You need to use -std=g++11 or undefine bool after the include of altivec.h
+# as context sensitive keywords is not part of the C++11 standard".
+# So use gnu++11 instead of c++11 only for altivec system.
+# [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58241#c3
+ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
+define SUPERTUX_FIX_ALTIVEC_ISSUE
+	$(SED) 's%std=c++0x%std=gnu++0x%' $(@D)/CMakeLists.txt
+	$(SED) 's%std=c++11%std=gnu++11%' $(@D)/CMakeLists.txt
+	$(SED) 's%std=c++0x%std=gnu++0x%' $(@D)/external/tinygettext/CMakeLists.txt
+endef
+SUPERTUX_POST_PATCH_HOOKS += SUPERTUX_FIX_ALTIVEC_ISSUE
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch b/bsp/buildroot/package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch
deleted file mode 100644
index 351b5875..00000000
--- a/bsp/buildroot/package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 73bed675202cf1f1c748540a4363d7d99e161dca Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-Date: Thu, 9 Jun 2016 18:58:51 -0300
-Subject: [PATCH 1/2] irrlicht: Get rid of unprefixed cflags
-
-Cross-building requires proper include paths. This commit
-removes the unprefixed -I/usr/X11R6/include in irrlicht cflags.
-
-Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
----
-Fix sent upstream as part of pull:
-https://github.com/supertuxkart/stk-code/pull/2554
-
- lib/irrlicht/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
-index 46d54008c291..5f4975e3a6f9 100644
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -25,8 +25,8 @@ elseif(MINGW)
-   add_definitions(-D_IRR_STATIC_LIB_)
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
- else()
--  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
--  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
-+  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
-   if(CMAKE_COMPILER_IS_GNUCC)
- 	  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
-   endif()
--- 
-2.9.0
-
diff --git a/bsp/buildroot/package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch b/bsp/buildroot/package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch
deleted file mode 100644
index 1a89bead..00000000
--- a/bsp/buildroot/package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fe71624eb39e0bc302a7603c79503fb12667dc2b Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-Date: Sun, 3 Jul 2016 15:16:59 -0300
-Subject: [PATCH 2/2] irrlicht: Fix boolean return type for jpeglib's callback
-
-Building on certain toolchains can fail due to returning an integer
-instead of TRUE. In any case, only {TRUE,FALSE} should be used
-as 'boolean' jpeglib type. Fix this by returning TRUE.
-
-  CImageLoaderJPG.cpp: In static member function 'static boolean
-  irr::video::CImageLoaderJPG::fill_input_buffer(j_decompress_ptr)':
-  CImageLoaderJPG.cpp:69:9: error: invalid conversion from 'int' to 'boolean'
-  [-fpermissive]
-
-Signed-off-by: Romain Naour <romain.naour@smile.fr>
-Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
----
-Fix sent upstream as part of pull:
-https://github.com/supertuxkart/stk-code/pull/2554
-
- lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp b/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-index 8fc5222a1e9b..1811f31dd28f 100644
---- a/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-+++ b/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-@@ -66,7 +66,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
- 	// DO NOTHING
--	return 1;
-+	return TRUE;
- }
- 
- 
--- 
-2.9.0
-
diff --git a/bsp/buildroot/package/supertuxkart/Config.in b/bsp/buildroot/package/supertuxkart/Config.in
index 4919b50a..51759160 100644
--- a/bsp/buildroot/package/supertuxkart/Config.in
+++ b/bsp/buildroot/package/supertuxkart/Config.in
@@ -9,6 +9,7 @@ config BR2_PACKAGE_SUPERTUXKART
 	depends on BR2_PACKAGE_HAS_LIBGL
 	depends on BR2_PACKAGE_XORG7
 	depends on !BR2_TOOLCHAIN_USES_MUSL
+	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_LIBGLU
diff --git a/bsp/buildroot/package/supertuxkart/supertuxkart.hash b/bsp/buildroot/package/supertuxkart/supertuxkart.hash
index 45ad8c50..4bba3f2c 100644
--- a/bsp/buildroot/package/supertuxkart/supertuxkart.hash
+++ b/bsp/buildroot/package/supertuxkart/supertuxkart.hash
@@ -1,5 +1,5 @@
 # Locally computed
-sha256	0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282  supertuxkart-0.9.2-src.tar.xz
-# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2/
-sha1	df3805a8f9dc556a0fc5af44442dae8126db5d5a  supertuxkart-0.9.2-src.tar.xz
-md5	f1f5081fd41b8eeb310b4edc07b9ee12  supertuxkart-0.9.2-src.tar.xz
+sha256	d8014e7106ba84f98b5ec5f146249dcffc284fc4083f8f237ff420b9e2219cb0  supertuxkart-0.9.3-src.tar.xz
+# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.3/
+sha1	2650ba20976472f10122a8600cc239507a9b6f24  supertuxkart-0.9.3-src.tar.xz
+md5	8de5455b8fdbb92679e302b76c9041cf  supertuxkart-0.9.3-src.tar.xz
diff --git a/bsp/buildroot/package/supertuxkart/supertuxkart.mk b/bsp/buildroot/package/supertuxkart/supertuxkart.mk
index 037c6f35..37756213 100644
--- a/bsp/buildroot/package/supertuxkart/supertuxkart.mk
+++ b/bsp/buildroot/package/supertuxkart/supertuxkart.mk
@@ -4,17 +4,18 @@
 #
 ################################################################################
 
-SUPERTUXKART_VERSION = 0.9.2
+SUPERTUXKART_VERSION = 0.9.3
 SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz
 SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION)
 
-# Supertuxkart itself is GPLv3+, but it bundles a few libraries with different
-# licenses. Irrlicht, bullet and angelscript have zlib license, while glew is
-# BSD-3c. Since they are linked statically, the result is GPLv3+.
-SUPERTUXKART_LICENSE = GPLv3+
+# Supertuxkart itself is GPL-3.0+, but it bundles a few libraries with different
+# licenses. Irrlicht, bullet and angelscript have Zlib license, while glew is
+# BSD-3-Clause. Since they are linked statically, the result is GPL-3.0+.
+SUPERTUXKART_LICENSE = GPL-3.0+
 SUPERTUXKART_LICENSE_FILES = COPYING
 
 SUPERTUXKART_DEPENDENCIES = \
+	freetype \
 	jpeg \
 	libcurl \
 	libgl \
@@ -28,7 +29,9 @@ SUPERTUXKART_DEPENDENCIES = \
 
 # Since supertuxkart is not installing libstkirrlicht.so, and since it is
 # the only user of the bundled libraries, turn off shared libraries entirely.
-SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
+# Disable In-game recorder (there is no libopenglrecorder package)
+SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_RECORDER=OFF
 
 ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
 SUPERTUXKART_DEPENDENCIES += libfribidi
diff --git a/bsp/buildroot/package/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch b/bsp/buildroot/package/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch
new file mode 100644
index 00000000..7f3002d4
--- /dev/null
+++ b/bsp/buildroot/package/swig/0001-Add-Node-7.x-aka-V8-5.2-support.patch
@@ -0,0 +1,328 @@
+From f08d7a63a92a3ba89d97bdfcc206e1e1c4804c0f Mon Sep 17 00:00:00 2001
+From: Patrick Schneider <patrick.schneider@meetnow.eu>
+Date: Thu, 13 Apr 2017 15:02:53 +0200
+Subject: [PATCH 1/2] Add Node 7.x aka V8 5.2+ support
+
+* Use WeakCallbackInfo instead of WeakCallbackData
+* Use GetPrivate instead of GetHiddenValue
+* Adopted new signature for SetWeak to support destructor calling
+* SetAccessor deprecation fixed
+* Proper version checks where applicable
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ Lib/javascript/v8/javascriptcode.swg    | 27 +++++++++++++++++-----
+ Lib/javascript/v8/javascripthelpers.swg | 29 +++++++++++++++++++++---
+ Lib/javascript/v8/javascriptinit.swg    | 16 +++++++++++--
+ Lib/javascript/v8/javascriptrun.swg     | 40 ++++++++++++++++++++++++++++-----
+ 4 files changed, 95 insertions(+), 17 deletions(-)
+
+diff --git a/Lib/javascript/v8/javascriptcode.swg b/Lib/javascript/v8/javascriptcode.swg
+index fb7d55c..b8c5089 100644
+--- a/Lib/javascript/v8/javascriptcode.swg
++++ b/Lib/javascript/v8/javascriptcode.swg
+@@ -133,10 +133,13 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
+   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SWIGV8_Proxy *proxy) {
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+   v8::Local<v8::Object> object = data.GetValue();
+   SWIGV8_Proxy *proxy = data.GetParameter();
++#else
++  static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
++  SWIGV8_Proxy *proxy = data.GetParameter();
+ #endif
+ 
+   if(proxy->swigCMemOwn && proxy->swigCObject) {
+@@ -147,7 +150,9 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
+   }
+   delete proxy;
+ 
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   object.Clear();
++#endif
+   
+ #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
+   object.Dispose();
+@@ -155,7 +160,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
+   object.Dispose(isolate);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
+   object->Dispose(isolate);
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   object->Dispose();
+ #endif
+ }
+@@ -177,10 +182,13 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
+   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) {
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+   v8::Local<v8::Object> object = data.GetValue();
+   SWIGV8_Proxy *proxy = data.GetParameter();
++#else
++static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
++  SWIGV8_Proxy *proxy = data.GetParameter();
+ #endif
+ 
+   if(proxy->swigCMemOwn && proxy->swigCObject) {
+@@ -197,7 +205,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
+   object->Dispose(isolate);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   object->Dispose();
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   object.Clear();
+ #endif
+ }
+@@ -211,7 +219,11 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
+  * ----------------------------------------------------------------------------- */
+ %fragment("js_getter", "templates")
+ %{
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+ static SwigV8ReturnValue $jswrapper(v8::Local<v8::String> property, const SwigV8PropertyCallbackInfo &info) {
++#else
++static SwigV8ReturnValue $jswrapper(v8::Local<v8::Name> property, const SwigV8PropertyCallbackInfo &info) {
++#endif
+   SWIGV8_HANDLESCOPE();
+   
+   v8::Handle<v8::Value> jsresult;
+@@ -233,8 +245,11 @@ fail:
+  * ----------------------------------------------------------------------------- */
+ %fragment("js_setter", "templates")
+ %{
+-static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value,
+-  const SwigV8PropertyCallbackInfoVoid &info) {
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
++#else
++static void $jswrapper(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
++#endif
+   SWIGV8_HANDLESCOPE();
+   
+   $jslocals
+diff --git a/Lib/javascript/v8/javascripthelpers.swg b/Lib/javascript/v8/javascripthelpers.swg
+index 091467d..7461079 100644
+--- a/Lib/javascript/v8/javascripthelpers.swg
++++ b/Lib/javascript/v8/javascripthelpers.swg
+@@ -6,11 +6,16 @@ typedef v8::InvocationCallback  SwigV8FunctionCallback;
+ typedef v8::AccessorGetter      SwigV8AccessorGetterCallback;
+ typedef v8::AccessorSetter      SwigV8AccessorSetterCallback;
+ typedef v8::AccessorInfo        SwigV8PropertyCallbackInfoVoid;
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+ typedef v8::FunctionCallback            SwigV8FunctionCallback;
+ typedef v8::AccessorGetterCallback      SwigV8AccessorGetterCallback;
+ typedef v8::AccessorSetterCallback      SwigV8AccessorSetterCallback;
+ typedef v8::PropertyCallbackInfo<void>  SwigV8PropertyCallbackInfoVoid;
++#else
++typedef v8::FunctionCallback            SwigV8FunctionCallback;
++typedef v8::AccessorNameGetterCallback  SwigV8AccessorGetterCallback;
++typedef v8::AccessorNameSetterCallback  SwigV8AccessorSetterCallback;
++typedef v8::PropertyCallbackInfo<void>  SwigV8PropertyCallbackInfoVoid;
+ #endif
+ 
+ /**
+@@ -65,18 +70,36 @@ SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle<v8::Object> obj, const char
+  */
+ SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle<v8::Object> obj, const char* symbol,
+   SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) {
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter);
++#else
++  obj->SetAccessor(SWIGV8_CURRENT_CONTEXT(), SWIGV8_SYMBOL_NEW(symbol), getter, setter);
++#endif
+ }
+ 
+-SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value,
+-  const SwigV8PropertyCallbackInfoVoid& info)
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
++#else
++SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
++#endif
+ {
+     char buffer[256];
+     char msg[512];
+     int res;
+ 
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+     property->WriteUtf8(buffer, 256);
+     res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
++#else
++    v8::Local<v8::String> sproperty;
++    if (property->ToString(SWIGV8_CURRENT_CONTEXT()).ToLocal(&sproperty)) {
++      sproperty->WriteUtf8(buffer, 256);
++      res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
++    }
++    else {
++      res = -1;
++    }
++#endif
+ 
+     if(res<0) {
+       SWIG_exception(SWIG_ERROR, "Tried to write read-only variable.");
+diff --git a/Lib/javascript/v8/javascriptinit.swg b/Lib/javascript/v8/javascriptinit.swg
+index 34befa7..86008d9 100644
+--- a/Lib/javascript/v8/javascriptinit.swg
++++ b/Lib/javascript/v8/javascriptinit.swg
+@@ -7,15 +7,27 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
+   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
+   v8::Local<v8::External> mod = SWIGV8_EXTERNAL_NEW(swig_module);
+   assert(!mod.IsEmpty());
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod);
++#else
++  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
++  global_obj->SetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey, mod);
++#endif
+ }
+ 
+ SWIGRUNTIME swig_module_info *
+ SWIG_V8_GetModule(void *) {
+   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   v8::Local<v8::Value> moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"));
++#else
++  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
++  v8::Local<v8::Value> moduleinfo;
++  if (!global_obj->GetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey).ToLocal(&moduleinfo))
++    return 0;
++#endif
+ 
+-  if (moduleinfo.IsEmpty())
++  if (moduleinfo.IsEmpty() || moduleinfo->IsNull() || moduleinfo->IsUndefined())
+   {
+     // It's not yet loaded
+     return 0;
+@@ -23,7 +35,7 @@ SWIG_V8_GetModule(void *) {
+ 
+   v8::Local<v8::External> moduleinfo_extern = v8::Local<v8::External>::Cast(moduleinfo);
+ 
+-  if (moduleinfo_extern.IsEmpty())
++  if (moduleinfo_extern.IsEmpty() || moduleinfo_extern->IsNull() || moduleinfo_extern->IsUndefined())
+   {
+     // Something's not right
+     return 0;
+diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg
+index 5ac52a5..30002c0 100644
+--- a/Lib/javascript/v8/javascriptrun.swg
++++ b/Lib/javascript/v8/javascriptrun.swg
+@@ -193,8 +193,10 @@ public:
+   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   void (*dtor) (const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data);
++#else
++  void (*dtor) (const v8::WeakCallbackInfo<SWIGV8_Proxy> &data);
+ #endif
+ };
+ 
+@@ -241,9 +243,12 @@ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Val
+   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+   SWIGV8_Proxy *proxy = data.GetParameter();
++#else
++SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
++  SWIGV8_Proxy *proxy = data.GetParameter();
+ #endif
+ 
+   delete proxy;
+@@ -312,12 +317,18 @@ SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, sw
+   } else {
+     cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
+   }
+-#else
++#elifif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
+     cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
+   } else {
+     cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor);
+   }
++#else
++  if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
++    cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor, v8::WeakCallbackType::kParameter);
++  } else {
++    cdata->handle.SetWeak(cdata, SWIGV8_Proxy_DefaultDtor, v8::WeakCallbackType::kParameter);
++  }
+ #endif
+ 
+ #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
+@@ -470,7 +481,14 @@ int SwigV8Packed_Check(v8::Handle<v8::Value> valRef) {
+   
+   v8::Handle<v8::Object> objRef = valRef->ToObject();
+   if(objRef->InternalFieldCount() < 1) return false;
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   v8::Handle<v8::Value> flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"));
++#else
++  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
++  v8::Local<v8::Value> flag;
++  if (!objRef->GetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey).ToLocal(&flag))
++    return false;
++#endif
+   return (flag->IsBoolean() && flag->BooleanValue());
+ }
+ 
+@@ -519,10 +537,13 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persist
+   SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
+   v8::Local<v8::Object> object = data.GetValue();
+   SwigV8PackedData *cdata = data.GetParameter();
++#else
++SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackInfo<SwigV8PackedData> &data) {
++  SwigV8PackedData *cdata = data.GetParameter();
+ #endif
+ 
+   delete cdata;
+@@ -537,7 +558,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Ob
+   object->Dispose(isolate);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   object->Dispose();
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   object.Clear();
+ #endif
+ }
+@@ -550,7 +571,12 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
+ //  v8::Handle<v8::Object> obj = SWIGV8_OBJECT_NEW();
+   v8::Local<v8::Object> obj = SWIGV8_OBJECT_NEW();
+ 
++#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true));
++#else
++  v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
++  obj->SetPrivate(SWIGV8_CURRENT_CONTEXT(), privateKey, SWIGV8_BOOLEAN_NEW(true));
++#endif
+ 
+ #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031511)
+   obj->SetPointerInInternalField(0, cdata);
+@@ -573,9 +599,11 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
+   cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete);
+-#else
++#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
+   cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete);
+ //  v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete);
++#else
++  cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete, v8::WeakCallbackType::kParameter);
+ #endif
+ 
+ #if (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x031710)
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/swig/0002-Remove-warnings-on-Node-6.x-aka-V8-5.0-and-5.1.patch b/bsp/buildroot/package/swig/0002-Remove-warnings-on-Node-6.x-aka-V8-5.0-and-5.1.patch
new file mode 100644
index 00000000..67242204
--- /dev/null
+++ b/bsp/buildroot/package/swig/0002-Remove-warnings-on-Node-6.x-aka-V8-5.0-and-5.1.patch
@@ -0,0 +1,222 @@
+From 9ce8d7e7c99e75163318428aeff6e60d398fcdca Mon Sep 17 00:00:00 2001
+From: Patrick Schneider <patrick.schneider@meetnow.eu>
+Date: Thu, 13 Apr 2017 19:39:44 +0200
+Subject: [PATCH 2/2] Remove warnings on Node 6.x aka V8 5.0 and 5.1
+
+The proposed changes targetted at 5.2 (or 5.4 to be more precise, since there is no Node release with V8 5.2 or 5.3) work for lower versions as well and bust the deprecation warnings there.
+
+Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
+---
+ Lib/javascript/v8/javascriptcode.swg    | 14 +++++++-------
+ Lib/javascript/v8/javascripthelpers.swg |  8 ++++----
+ Lib/javascript/v8/javascriptinit.swg    |  4 ++--
+ Lib/javascript/v8/javascriptrun.swg     | 16 ++++++++--------
+ 4 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/Lib/javascript/v8/javascriptcode.swg b/Lib/javascript/v8/javascriptcode.swg
+index b8c5089..c4aaf3d 100644
+--- a/Lib/javascript/v8/javascriptcode.swg
++++ b/Lib/javascript/v8/javascriptcode.swg
+@@ -133,7 +133,7 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
+   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SWIGV8_Proxy *proxy) {
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+   v8::Local<v8::Object> object = data.GetValue();
+   SWIGV8_Proxy *proxy = data.GetParameter();
+@@ -150,7 +150,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
+   }
+   delete proxy;
+ 
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+   object.Clear();
+ #endif
+   
+@@ -160,7 +160,7 @@ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &dat
+   object.Dispose(isolate);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < 0x032100)
+   object->Dispose(isolate);
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+   object->Dispose();
+ #endif
+ }
+@@ -182,7 +182,7 @@ static void $jswrapper(v8::Isolate *isolate, v8::Persistent<v8::Value> object, v
+   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ static void $jswrapper(v8::Isolate *isolate, v8::Persistent< v8::Object> *object, SWIGV8_Proxy *proxy) {
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+ static void $jswrapper(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+   v8::Local<v8::Object> object = data.GetValue();
+   SWIGV8_Proxy *proxy = data.GetParameter();
+@@ -205,7 +205,7 @@ static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
+   object->Dispose(isolate);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   object->Dispose();
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+   object.Clear();
+ #endif
+ }
+@@ -219,7 +219,7 @@ static void $jswrapper(const v8::WeakCallbackInfo<SWIGV8_Proxy> &data) {
+  * ----------------------------------------------------------------------------- */
+ %fragment("js_getter", "templates")
+ %{
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+ static SwigV8ReturnValue $jswrapper(v8::Local<v8::String> property, const SwigV8PropertyCallbackInfo &info) {
+ #else
+ static SwigV8ReturnValue $jswrapper(v8::Local<v8::Name> property, const SwigV8PropertyCallbackInfo &info) {
+@@ -245,7 +245,7 @@ fail:
+  * ----------------------------------------------------------------------------- */
+ %fragment("js_setter", "templates")
+ %{
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+ static void $jswrapper(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
+ #else
+ static void $jswrapper(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid &info) {
+diff --git a/Lib/javascript/v8/javascripthelpers.swg b/Lib/javascript/v8/javascripthelpers.swg
+index 7461079..7b8a5ec 100644
+--- a/Lib/javascript/v8/javascripthelpers.swg
++++ b/Lib/javascript/v8/javascripthelpers.swg
+@@ -6,7 +6,7 @@ typedef v8::InvocationCallback  SwigV8FunctionCallback;
+ typedef v8::AccessorGetter      SwigV8AccessorGetterCallback;
+ typedef v8::AccessorSetter      SwigV8AccessorSetterCallback;
+ typedef v8::AccessorInfo        SwigV8PropertyCallbackInfoVoid;
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+ typedef v8::FunctionCallback            SwigV8FunctionCallback;
+ typedef v8::AccessorGetterCallback      SwigV8AccessorGetterCallback;
+ typedef v8::AccessorSetterCallback      SwigV8AccessorSetterCallback;
+@@ -70,14 +70,14 @@ SWIGRUNTIME void SWIGV8_AddStaticFunction(v8::Handle<v8::Object> obj, const char
+  */
+ SWIGRUNTIME void SWIGV8_AddStaticVariable(v8::Handle<v8::Object> obj, const char* symbol,
+   SwigV8AccessorGetterCallback getter, SwigV8AccessorSetterCallback setter) {
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+   obj->SetAccessor(SWIGV8_SYMBOL_NEW(symbol), getter, setter);
+ #else
+   obj->SetAccessor(SWIGV8_CURRENT_CONTEXT(), SWIGV8_SYMBOL_NEW(symbol), getter, setter);
+ #endif
+ }
+ 
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+ SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::String> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
+ #else
+ SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::Name> property, v8::Local<v8::Value> value, const SwigV8PropertyCallbackInfoVoid& info)
+@@ -87,7 +87,7 @@ SWIGRUNTIME void JS_veto_set_variable(v8::Local<v8::Name> property, v8::Local<v8
+     char msg[512];
+     int res;
+ 
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+     property->WriteUtf8(buffer, 256);
+     res = sprintf(msg, "Tried to write read-only variable: %s.", buffer);
+ #else
+diff --git a/Lib/javascript/v8/javascriptinit.swg b/Lib/javascript/v8/javascriptinit.swg
+index 86008d9..e83f478 100644
+--- a/Lib/javascript/v8/javascriptinit.swg
++++ b/Lib/javascript/v8/javascriptinit.swg
+@@ -7,7 +7,7 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
+   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
+   v8::Local<v8::External> mod = SWIGV8_EXTERNAL_NEW(swig_module);
+   assert(!mod.IsEmpty());
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+   global_obj->SetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"), mod);
+ #else
+   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
+@@ -18,7 +18,7 @@ SWIG_V8_SetModule(void *, swig_module_info *swig_module) {
+ SWIGRUNTIME swig_module_info *
+ SWIG_V8_GetModule(void *) {
+   v8::Local<v8::Object> global_obj = SWIGV8_CURRENT_CONTEXT()->Global();
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+   v8::Local<v8::Value> moduleinfo = global_obj->GetHiddenValue(SWIGV8_STRING_NEW("swig_module_info_data"));
+ #else
+   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("swig_module_info_data"));
+diff --git a/Lib/javascript/v8/javascriptrun.swg b/Lib/javascript/v8/javascriptrun.swg
+index 30002c0..0af9f4e 100644
+--- a/Lib/javascript/v8/javascriptrun.swg
++++ b/Lib/javascript/v8/javascriptrun.swg
+@@ -193,7 +193,7 @@ public:
+   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Value> object, void *parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   void (*dtor) (v8::Isolate *isolate, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy);
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+   void (*dtor) (const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data);
+ #else
+   void (*dtor) (const v8::WeakCallbackInfo<SWIGV8_Proxy> &data);
+@@ -243,7 +243,7 @@ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Val
+   SWIGV8_Proxy *proxy = static_cast<SWIGV8_Proxy *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(v8::Isolate *, v8::Persistent< v8::Object > *object, SWIGV8_Proxy *proxy) {
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+ SWIGRUNTIME void SWIGV8_Proxy_DefaultDtor(const v8::WeakCallbackData<v8::Object, SWIGV8_Proxy> &data) {
+   SWIGV8_Proxy *proxy = data.GetParameter();
+ #else
+@@ -317,7 +317,7 @@ SWIGRUNTIME void SWIGV8_SetPrivateData(v8::Handle<v8::Object> obj, void *ptr, sw
+   } else {
+     cdata->handle.MakeWeak(cdata, SWIGV8_Proxy_DefaultDtor);
+   }
+-#elifif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+   if(cdata->swigCMemOwn && (SWIGV8_ClientData*)info->clientdata) {
+     cdata->handle.SetWeak(cdata, ((SWIGV8_ClientData*)info->clientdata)->dtor);
+   } else {
+@@ -481,7 +481,7 @@ int SwigV8Packed_Check(v8::Handle<v8::Value> valRef) {
+   
+   v8::Handle<v8::Object> objRef = valRef->ToObject();
+   if(objRef->InternalFieldCount() < 1) return false;
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+   v8::Handle<v8::Value> flag = objRef->GetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"));
+ #else
+   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
+@@ -537,7 +537,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persist
+   SwigV8PackedData *cdata = static_cast<SwigV8PackedData *>(parameter);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(v8::Isolate *isolate, v8::Persistent<v8::Object> *object, SwigV8PackedData *cdata) {
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackData<v8::Object, SwigV8PackedData> &data) {
+   v8::Local<v8::Object> object = data.GetValue();
+   SwigV8PackedData *cdata = data.GetParameter();
+@@ -558,7 +558,7 @@ SWIGRUNTIME void _wrap_SwigV8PackedData_delete(const v8::WeakCallbackInfo<SwigV8
+   object->Dispose(isolate);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   object->Dispose();
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+   object.Clear();
+ #endif
+ }
+@@ -571,7 +571,7 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
+ //  v8::Handle<v8::Object> obj = SWIGV8_OBJECT_NEW();
+   v8::Local<v8::Object> obj = SWIGV8_OBJECT_NEW();
+ 
+-#if (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#if (V8_MAJOR_VERSION-0) < 5
+   obj->SetHiddenValue(SWIGV8_STRING_NEW("__swig__packed_data__"), SWIGV8_BOOLEAN_NEW(true));
+ #else
+   v8::Local<v8::Private> privateKey = v8::Private::ForApi(v8::Isolate::GetCurrent(), SWIGV8_STRING_NEW("__swig__packed_data__"));
+@@ -599,7 +599,7 @@ v8::Handle<v8::Value> SWIGV8_NewPackedObj(void *data, size_t size, swig_type_inf
+   cdata->handle.MakeWeak(v8::Isolate::GetCurrent(), cdata, _wrap_SwigV8PackedData_delete);
+ #elif (V8_MAJOR_VERSION-0) < 4 && (SWIG_V8_VERSION < SWIGV8_SETWEAK_VERSION)
+   cdata->handle.MakeWeak(cdata, _wrap_SwigV8PackedData_delete);
+-#elif (V8_MAJOR_VERSION-0) < 5 || (V8_MAJOR_VERSION == 5 && V8_MINOR_VERSION < 2)
++#elif (V8_MAJOR_VERSION-0) < 5
+   cdata->handle.SetWeak(cdata, _wrap_SwigV8PackedData_delete);
+ //  v8::V8::SetWeak(&cdata->handle, cdata, _wrap_SwigV8PackedData_delete);
+ #else
+-- 
+2.1.4
+
diff --git a/bsp/buildroot/package/swig/swig.hash b/bsp/buildroot/package/swig/swig.hash
index 92ddc110..77c93a96 100644
--- a/bsp/buildroot/package/swig/swig.hash
+++ b/bsp/buildroot/package/swig/swig.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256	2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c	swig-3.0.10.tar.gz
+sha256	7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d	swig-3.0.12.tar.gz
diff --git a/bsp/buildroot/package/swig/swig.mk b/bsp/buildroot/package/swig/swig.mk
index 8fed8dab..157d3a39 100644
--- a/bsp/buildroot/package/swig/swig.mk
+++ b/bsp/buildroot/package/swig/swig.mk
@@ -5,32 +5,32 @@
 ################################################################################
 
 SWIG_VERSION_MAJOR = 3.0
-SWIG_VERSION = $(SWIG_VERSION_MAJOR).10
+SWIG_VERSION = $(SWIG_VERSION_MAJOR).12
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
 HOST_SWIG_DEPENDENCIES = host-bison
 HOST_SWIG_CONF_OPTS = \
 	--without-pcre \
 	--disable-ccache \
 	--without-octave
-SWIG_LICENSE = GPLv3+, BSD-2c, BSD-3c
+SWIG_LICENSE = GPL-3.0+, BSD-2-Clause, BSD-3-Clause
 SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
 
 # CMake looks first at swig3.0, then swig2.0 and then swig. However,
 # when doing the search, it will look into the PATH for swig2.0 first,
 # and then for swig.
-# While the PATH contains first our $(HOST_DIR)/usr/bin, it also contains
+# While the PATH contains first our $(HOST_DIR)/bin, it also contains
 # /usr/bin and other system directories. Therefore, if there is an
 # installed swig3.0 on the system, it will get the preference over the
-# swig installed in $(HOST_DIR)/usr/bin, which isn't nice. To prevent
+# swig installed in $(HOST_DIR)/bin, which isn't nice. To prevent
 # this from happening we create a symbolic link swig3.0 -> swig, so that
 # our swig always gets used.
 
 define HOST_SWIG_INSTALL_SYMLINK
-	ln -fs swig $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR)
+	ln -fs swig $(HOST_DIR)/bin/swig$(SWIG_VERSION_MAJOR)
 endef
 
 HOST_SWIG_POST_INSTALL_HOOKS += HOST_SWIG_INSTALL_SYMLINK
 
 $(eval $(host-autotools-package))
 
-SWIG = $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR)
+SWIG = $(HOST_DIR)/bin/swig$(SWIG_VERSION_MAJOR)
diff --git a/bsp/buildroot/package/swupdate/0001-compat.h-introduce-compatibility-header.patch b/bsp/buildroot/package/swupdate/0001-compat.h-introduce-compatibility-header.patch
new file mode 100644
index 00000000..5e3bfb0f
--- /dev/null
+++ b/bsp/buildroot/package/swupdate/0001-compat.h-introduce-compatibility-header.patch
@@ -0,0 +1,87 @@
+From 9867a9d6a21e6b0b9bcba57c3e2398fe671cea17 Mon Sep 17 00:00:00 2001
+From: Christian Storm <christian.storm@siemens.com>
+Date: Tue, 16 Jan 2018 10:34:52 +0100
+Subject: [PATCH] compat.h: introduce compatibility header
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Introduce a compat.h housing compatibility definitions
+and macros along the lines of commit 7b49b8d having
+introduced a compatibility mechanism for Lua.
+
+First use case (and motivation) is the support for
+musl (https://www.musl-libc.org/) which doesn't
+bother to provide
+    char *strndupa(const char *s, size_t n)
+
+Backported from: 9867a9d6a21e6b0b9bcba57c3e2398fe671cea17
+
+Reviewed-by: Stefano Babic <sbabic@denx.de>
+Reported-by: Jörg Krause <joerg.krause@embedded.rocks>
+Signed-off-by: Christian Storm <christian.storm@siemens.com>
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ include/compat.h  | 24 ++++++++++++++++++++++++
+ include/util.h    |  1 +
+ ipc/network_ipc.c |  1 +
+ 3 files changed, 26 insertions(+)
+ create mode 100644 include/compat.h
+
+diff --git a/include/compat.h b/include/compat.h
+new file mode 100644
+index 0000000..29d7af1
+--- /dev/null
++++ b/include/compat.h
+@@ -0,0 +1,24 @@
++/*
++ * Author: Christian Storm
++ * Copyright (C) 2018, Siemens AG
++ *
++ * SPDX-License-Identifier:     GPL-2.0-or-later
++ */
++
++#pragma once
++
++#ifndef strndupa
++/*
++ * Define char *strndupa(const char *s, size_t n)
++ * for, e.g., musl (https://www.musl-libc.org/)
++ * which does not bother to implement this function.
++ */
++#define strndupa(s, n)                          \
++	(__extension__({                            \
++		const char *__in = (s);                 \
++		size_t __len = strnlen(__in, (n)) + 1;  \
++		char *__out = (char *)alloca(__len);    \
++		__out[__len - 1] = '\0';                \
++		(char *)memcpy(__out, __in, __len - 1); \
++	}))
++#endif
+diff --git a/include/util.h b/include/util.h
+index bec2975..d43cd8c 100644
+--- a/include/util.h
++++ b/include/util.h
+@@ -12,6 +12,7 @@
+ #include <string.h>
+ #include "swupdate.h"
+ #include "swupdate_status.h"
++#include "compat.h"
+ 
+ #define NOTIFY_BUF_SIZE 	2048
+ #define ENOMEM_ASPRINTF		-1
+diff --git a/ipc/network_ipc.c b/ipc/network_ipc.c
+index 3f197c7..48f6fcc 100644
+--- a/ipc/network_ipc.c
++++ b/ipc/network_ipc.c
+@@ -27,6 +27,7 @@
+ #include <pthread.h>
+ 
+ #include "network_ipc.h"
++#include "compat.h"
+ 
+ #ifdef CONFIG_SOCKET_CTRL_PATH
+ static char* SOCKET_CTRL_PATH = (char*)CONFIG_SOCKET_CTRL_PATH;
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/swupdate/0002-Fix-build-if-DOWNLOAD-is-set-but-no-JSON.patch b/bsp/buildroot/package/swupdate/0002-Fix-build-if-DOWNLOAD-is-set-but-no-JSON.patch
new file mode 100644
index 00000000..5e079955
--- /dev/null
+++ b/bsp/buildroot/package/swupdate/0002-Fix-build-if-DOWNLOAD-is-set-but-no-JSON.patch
@@ -0,0 +1,107 @@
+From 37a6666a532e9cbc42b56301f27919ae7c00d2eb Mon Sep 17 00:00:00 2001
+From: Stefano Babic <sbabic@denx.de>
+Date: Tue, 23 Jan 2018 16:52:32 +0100
+Subject: [PATCH] Fix build if DOWNLOAD is set, but no JSON
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The downloader does not require JSON, but channel_curl is built
+even if not called. Build fails with the error:
+
+corelib/channel_curl.c:27:10: fatal error: json-c/json.h: No such file or directory
+
+Add a CONFIG_CHANNEL_CURL that is automatically set by the modules
+reuiring it (suricatta and swuforwarder).
+
+Backported from: 37a6666a532e9cbc42b56301f27919ae7c00d2eb
+
+Signed-off-by: Stefano Babic <sbabic@denx.de>
+Reported-by: Jörg Krause <joerg.krause@embedded.rocks>
+Acked-by: Jörg Krause <joerg.krause@embedded.rocks>
+Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ Kconfig             | 7 +++++++
+ corelib/Makefile    | 2 +-
+ handlers/Config.in  | 8 +++++---
+ suricatta/Config.in | 3 +--
+ 4 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/Kconfig b/Kconfig
+index 4469096..e344572 100644
+--- a/Kconfig
++++ b/Kconfig
+@@ -294,6 +294,13 @@ config DOWNLOAD
+ comment "Image downloading support needs libcurl"
+ 	depends on !HAVE_LIBCURL
+ 
++config CHANNEL_CURL
++	bool
++	depends on HAVE_LIBCURL
++	depends on HAVE_JSON_C
++	select CURL
++	select JSON
++
+ config HASH_VERIFY
+ 	bool "Allow to add sha256 hash to each image"
+ 	depends on HAVE_LIBSSL
+diff --git a/corelib/Makefile b/corelib/Makefile
+index 282bffd..4b30f9c 100644
+--- a/corelib/Makefile
++++ b/corelib/Makefile
+@@ -17,4 +17,4 @@ lib-$(CONFIG_ENCRYPTED_IMAGES)	+= swupdate_decrypt.o
+ lib-$(CONFIG_LIBCONFIG)		+= swupdate_settings.o \
+ 				   parsing_library_libconfig.o
+ lib-$(CONFIG_JSON)		+= parsing_library_libjson.o
+-lib-$(CONFIG_CURL)		+= channel_curl.o
++lib-$(CONFIG_CHANNEL_CURL)	+= channel_curl.o
+diff --git a/handlers/Config.in b/handlers/Config.in
+index 596f069..6226b59 100644
+--- a/handlers/Config.in
++++ b/handlers/Config.in
+@@ -54,7 +54,6 @@ config UBIVIDOFFSET
+ 	  if your NAND driver incorrectly reports that it can handle
+ 	  sub-page accesses when it should not.
+ 
+-
+ config CFI
+ 	bool "cfi"
+ 	depends on MTD
+@@ -164,8 +163,8 @@ comment "remote handler needs zeromq"
+ config SWUFORWARDER_HANDLER
+ 	bool "SWU forwarder"
+ 	depends on HAVE_LIBCURL
+-	select CURL
+-	select JSON
++	depends on HAVE_JSON_C
++	select CHANNEL_CURL
+ 	default n
+ 	help
+ 	  This allows to build a chain of updater. A
+@@ -174,6 +173,9 @@ config SWUFORWARDER_HANDLER
+ 	  embedded SWU to the other devices using the
+ 	  Webserver REST API.
+ 
++comment "swuforward handler needs json-c and curl"
++	depends on !HAVE_JSON_C || !HAVE_LIBCURL
++
+ comment "SWU forwarder requires libcurl"
+ 	depends on !HAVE_LIBCURL
+ 
+diff --git a/suricatta/Config.in b/suricatta/Config.in
+index 62e448a..2586169 100644
+--- a/suricatta/Config.in
++++ b/suricatta/Config.in
+@@ -71,8 +71,7 @@ config SURICATTA_HAWKBIT
+ 	bool "hawkBit support"
+ 	depends on HAVE_LIBCURL
+ 	depends on HAVE_JSON_C
+-	select JSON
+-	select CURL
++	select CHANNEL_CURL
+ 	help
+ 	  Support for hawkBit server.
+ 	  https://projects.eclipse.org/projects/iot.hawkbit
+-- 
+2.16.1
+
diff --git a/bsp/buildroot/package/swupdate/Config.in b/bsp/buildroot/package/swupdate/Config.in
index d9ef1bc7..ca2eaf29 100644
--- a/bsp/buildroot/package/swupdate/Config.in
+++ b/bsp/buildroot/package/swupdate/Config.in
@@ -6,32 +6,34 @@ config BR2_PACKAGE_SWUPDATE
 	select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_JSON_C && \
 		!BR2_PACKAGE_HAS_LUAINTERPRETER
 	help
-	  swupdate provides a reliable way to update the software on an
-	  embedded system.
+	  swupdate provides a reliable way to update the software on
+	  an embedded system.
 
-	  swupdate is highly configurable to fit the targets requirements and
-	  to minimize the footprint. The provided default configuration file
-	  BR2_PACKAGE_SWUPDATE_CONFIG will enable swupdate with an embedded
-	  webserver, a parser and a handler for raw NAND or NOR flash.
+	  swupdate is highly configurable to fit the targets
+	  requirements and to minimize the footprint. The provided
+	  default configuration file BR2_PACKAGE_SWUPDATE_CONFIG will
+	  enable swupdate with an embedded webserver, a parser and a
+	  handler for raw NAND or NOR flash.
 
-	  The default configuration file builds a reasonable firmware update
-	  system with minimal external dependencies in my mind. If you like to
-	  use your own modified configuration, you have to select the
-	  necessary packages manually:
+	  The default configuration file builds a reasonable firmware
+	  update system with minimal external dependencies in mind.
+	  If you like to use your own modified configuration,
+	  you have to select the necessary packages manually:
 
 	  * Select BR2_PACKAGE_LUA or BR2_PACKAGE_LUAJIT if you want
-	    to have Lua support.
-	    CONFIG_HANDLER_IN_LUA is not supported in LuaJIT or Lua 5.1.
-	    Note that for LuaJIT support, you need to set
-	    CONFIG_LUAVERSION="jit-5.1".
-	  * Select BR2_LIBCURL if you want to use the download feature.
-	  * Select BR2_PACKAGE_OPENSSL is you want to add encryption support.
-	  * Select BR2_PACKAGE_MTD if you want to use swupdate with UBI
-	    partitions.
-	  * Select BR2_PACKAGE_ZLIB if you want to deal with gzip compressed
-	    archives.
-	  * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add support
-	    for setting the U-Boot environment.
+	    want to have Lua support.
+	  * Select BR2_LIBCURL if you want to use the download
+	    feature.
+	  * Select BR2_PACKAGE_OPENSSL is you want to add encryption
+	    support.
+	  * Select BR2_PACKAGE_MTD if you want to use swupdate with
+	    UBI partitions.
+	  * Select BR2_PACKAGE_ZLIB if you want to deal with gzip
+	    compressed archives.
+	  * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add
+	    support for setting the U-Boot environment.
+	  * Select BR2_PACKAGE_ZEROMQ to add support for using a
+	    remote handler.
 
 	  https://sbabic.github.io/swupdate
 
@@ -43,8 +45,8 @@ config BR2_PACKAGE_SWUPDATE_CONFIG
 	help
 	  Path to the swupdate configuration file.
 
-	  I you wish to use your own modified swupdate configuration file
-	  specify the config file location with this option.
+	  I you wish to use your own modified swupdate configuration
+	  file specify the config file location with this option.
 
 config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE
 	bool "install default website"
@@ -52,9 +54,9 @@ config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE
 	help
 	  Install the provided website to /var/www/swupdate.
 
-	  This is necessary if you want to run swupdate with the embedded
-	  webserver and do not provide an own website to be installed to
-	  /var/www/swupdate.
+	  This is necessary if you want to run swupdate with the
+	  embedded webserver and do not provide an own website to be
+	  installed to /var/www/swupdate.
 endif
 
 comment "swupdate needs a toolchain w/ threads"
diff --git a/bsp/buildroot/package/swupdate/swupdate.config b/bsp/buildroot/package/swupdate/swupdate.config
index 51869bb9..0f6e9615 100644
--- a/bsp/buildroot/package/swupdate/swupdate.config
+++ b/bsp/buildroot/package/swupdate/swupdate.config
@@ -11,17 +11,31 @@ CONFIG_HAVE_DOT_CONFIG=y
 #
 # General Configuration
 #
+# CONFIG_CURL is not set
+# CONFIG_SYSTEMD is not set
 CONFIG_SCRIPTS=y
 # CONFIG_HW_COMPATIBILITY is not set
 CONFIG_SW_VERSIONS_FILE="/etc/sw-versions"
-# CONFIG_MTD is not set
-# CONFIG_LUA is not set
+
+#
+# Socket Paths
+#
+CONFIG_SOCKET_CTRL_PATH="/tmp/sockinstctrl"
+CONFIG_SOCKET_PROGRESS_PATH="/tmp/swupdateprog"
+CONFIG_SOCKET_REMOTE_HANDLER_DIRECTORY="/tmp/"
+
+#
+# MTD support needs libmtd
+#
+
+#
+# Lua support needs a Lua interpreter
+#
 # CONFIG_FEATURE_SYSLOG is not set
 
 #
 # Build Options
 #
-# CONFIG_STATIC is not set
 CONFIG_CROSS_COMPILE=""
 CONFIG_SYSROOT=""
 CONFIG_EXTRA_CFLAGS=""
@@ -34,8 +48,28 @@ CONFIG_EXTRA_LDLIBS=""
 # CONFIG_DEBUG is not set
 # CONFIG_WERROR is not set
 # CONFIG_NOCLEANUP is not set
-# CONFIG_DOWNLOAD is not set
-# CONFIG_SIGNED_IMAGES is not set
+
+#
+# U-Boot support needs libubootenv, libz
+#
+CONFIG_BOOTLOADER_NONE=y
+# CONFIG_BOOTLOADER_GRUB is not set
+
+#
+# Image downloading support needs libcurl
+#
+
+#
+# Hash verification needs libssl
+#
+
+#
+# Image verification (signed images) needs libssl
+#
+
+#
+# Image encryption needs libssl
+#
 # CONFIG_SURICATTA is not set
 CONFIG_WEBSERVER=y
 
@@ -48,25 +82,49 @@ CONFIG_MONGOOSE=y
 # Mongoose Feature
 #
 CONFIG_MONGOOSEIPV6=y
-# CONFIG_MONGOOSESSL is not set
+
+#
+# SSL support needs libcrypto, libssl
+#
 
 #
 # Archival Features
 #
-# CONFIG_GUNZIP is not set
+
+#
+# gunzip support needs libz
+#
 
 #
 # Parser Features
 #
 CONFIG_LIBCONFIG=y
-CONFIG_LIBCONFIGROOT=""
-# CONFIG_JSON is not set
+CONFIG_PARSERROOT=""
+
+#
+# JSON config parser support needs json-c
+#
 # CONFIG_SETSWDESCRIPTION is not set
 
 #
 # Image Handlers
 #
+
+#
+# ubivol support needs libubi
+#
 CONFIG_RAW=y
 # CONFIG_SHELLSCRIPTHANDLER is not set
-# CONFIG_ARCHIVE is not set
-# CONFIG_UBOOT is not set
\ No newline at end of file
+
+#
+# archive support needs libarchive
+#
+
+#
+# remote handler needs zeromq
+#
+
+#
+# SWU forwarder requires libcurl
+#
+# CONFIG_BOOTLOADERHANDLER is not set
diff --git a/bsp/buildroot/package/swupdate/swupdate.hash b/bsp/buildroot/package/swupdate/swupdate.hash
index 1ba10f64..d1b69c9a 100644
--- a/bsp/buildroot/package/swupdate/swupdate.hash
+++ b/bsp/buildroot/package/swupdate/swupdate.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  840d6287a41f7a42e08a74045ee40b7c2f82c1ecfedf8c915e3935d4f0084376  swupdate-2016.10.tar.gz
+sha256  1e15d9675cf7e23886dca7ea058498282c35679a555845dbc85ffe688f2cc681  swupdate-2017.11.tar.gz
diff --git a/bsp/buildroot/package/swupdate/swupdate.mk b/bsp/buildroot/package/swupdate/swupdate.mk
index 688f4eef..aa232e58 100644
--- a/bsp/buildroot/package/swupdate/swupdate.mk
+++ b/bsp/buildroot/package/swupdate/swupdate.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-SWUPDATE_VERSION = 2016.10
+SWUPDATE_VERSION = 2017.11
 SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION))
-SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain
+SWUPDATE_LICENSE = GPL-2.0+, MIT, Public Domain
 SWUPDATE_LICENSE_FILES = COPYING
 
 # swupdate bundles its own version of mongoose (version 3.8)
@@ -41,6 +41,10 @@ endif
 
 ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y)
 SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf
+# defines the base name for the pkg-config file ("lua" or "luajit")
+define SWUPDATE_SET_LUA_VERSION
+	$(call KCONFIG_SET_OPT,CONFIG_LUAPKG,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER),$(SWUPDATE_BUILD_CONFIG))
+endef
 SWUPDATE_MAKE_ENV += HAVE_LUA=y
 else
 SWUPDATE_MAKE_ENV += HAVE_LUA=n
@@ -71,6 +75,13 @@ else
 SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n
 endif
 
+ifeq ($(BR2_PACKAGE_ZEROMQ),y)
+SWUPDATE_DEPENDENCIES += zeromq
+SWUPDATE_MAKE_ENV += HAVE_LIBZEROMQ=y
+else
+SWUPDATE_MAKE_ENV += HAVE_LIBZEROMQ=n
+endif
+
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 SWUPDATE_DEPENDENCIES += zlib
 SWUPDATE_MAKE_ENV += HAVE_ZLIB=y
@@ -103,6 +114,7 @@ endef
 define SWUPDATE_KCONFIG_FIXUP_CMDS
 	$(SWUPDATE_PREFER_STATIC)
 	$(SWUPDATE_SET_BUILD_OPTIONS)
+	$(SWUPDATE_SET_LUA_VERSION)
 endef
 
 define SWUPDATE_BUILD_CMDS
diff --git a/bsp/buildroot/package/sylpheed/sylpheed.mk b/bsp/buildroot/package/sylpheed/sylpheed.mk
index 8d426233..14107f0a 100644
--- a/bsp/buildroot/package/sylpheed/sylpheed.mk
+++ b/bsp/buildroot/package/sylpheed/sylpheed.mk
@@ -8,7 +8,7 @@ SYLPHEED_VERSION_MAJOR = 3.2
 SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0
 SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2
 SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR)
-SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin)
+SYLPHEED_LICENSE = GPL-2.0+ (executables), LGPL-2.1+ (library, attachment plugin)
 SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB
 SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme
 SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2
diff --git a/bsp/buildroot/package/synergy/0001-allow-building-of-synergy-without-tests.patch b/bsp/buildroot/package/synergy/0001-allow-building-of-synergy-without-tests.patch
new file mode 100644
index 00000000..0c550eec
--- /dev/null
+++ b/bsp/buildroot/package/synergy/0001-allow-building-of-synergy-without-tests.patch
@@ -0,0 +1,86 @@
+From cb6b00947ea125c3246654bb3dd3986b64e974d4 Mon Sep 17 00:00:00 2001
+From: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
+Date: Mon, 27 Mar 2017 21:51:59 +0200
+Subject: [PATCH] allow building of synergy without tests
+
+Upstream status: https://github.com/symless/synergy/pull/5943
+
+Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
+---
+ CMakeLists.txt                             | 2 ++
+ src/CMakeLists.txt                         | 2 +-
+ src/lib/synergy/KeyMap.h                   | 4 ++++
+ src/test/unittests/synergy/KeyMapTests.cpp | 2 ++
+ 4 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94c474e..cceac45 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -39,6 +39,8 @@ endif()
+ # First, declare project (important for prerequisite checks).
+ project(synergy C CXX)
+ 
++option(BUILD_TESTS "Override building of tests" ON)
++
+ # put binaries in a different dir to make them easier to find.
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 237ba48..96dadd2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -50,6 +50,6 @@ add_subdirectory(lib)
+ add_subdirectory(cmd)
+ add_subdirectory(micro)
+ 
+-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
++if (BUILD_TESTS AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")
+ 	add_subdirectory(test)
+ endif()
+diff --git a/src/lib/synergy/KeyMap.h b/src/lib/synergy/KeyMap.h
+index de869e6..51e7e07 100644
+--- a/src/lib/synergy/KeyMap.h
++++ b/src/lib/synergy/KeyMap.h
+@@ -24,7 +24,9 @@
+ #include "common/stdset.h"
+ #include "common/stdvector.h"
+ 
++#ifdef TEST_ENV
+ #include "gtest/gtest_prod.h"
++#endif
+ 
+ namespace synergy {
+ 
+@@ -326,6 +328,7 @@ public:
+ 
+ 	//@}
+ 
++#ifdef TEST_ENV
+ private:
+ 	FRIEND_TEST(KeyMapTests,
+ 				findBestKey_requiredDown_matchExactFirstItem);
+@@ -340,6 +343,7 @@ private:
+ 	FRIEND_TEST(KeyMapTests,
+ 				findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
+ 	FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
++#endif
+ 
+ private:
+ 	//! Ways to synthesize a key
+diff --git a/src/test/unittests/synergy/KeyMapTests.cpp b/src/test/unittests/synergy/KeyMapTests.cpp
+index 1a195af..fe2a5e4 100644
+--- a/src/test/unittests/synergy/KeyMapTests.cpp
++++ b/src/test/unittests/synergy/KeyMapTests.cpp
+@@ -15,6 +15,8 @@
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#define TEST_ENV
++
+ #include "synergy/KeyMap.h"
+ 
+ #include "test/global/gtest.h"
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/synergy/0001-includes.patch b/bsp/buildroot/package/synergy/0001-includes.patch
deleted file mode 100644
index accaf829..00000000
--- a/bsp/buildroot/package/synergy/0001-includes.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-[PATCH] fix build with modern toolchains
-
-Several files are missing the correct includes for exit/getenvmemcpy/strlen/..
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- lib/arch/CArchDaemonUnix.cpp        |    1 +
- lib/arch/CMultibyte.cpp             |    1 +
- lib/base/CStringUtil.cpp            |    1 +
- lib/client/CClient.cpp              |    3 ++-
- lib/client/CServerProxy.cpp         |    1 +
- lib/net/CTCPSocket.cpp              |    2 +-
- lib/platform/CXWindowsScreen.cpp    |    1 +
- lib/server/CClientProxy1_3.cpp      |    1 +
- lib/server/CServer.cpp              |    1 +
- lib/synergy/CPacketStreamFilter.cpp |    1 +
- lib/synergy/IKeyState.cpp           |    1 +
- lib/synergy/IPrimaryScreen.cpp      |    1 +
- 12 files changed, 13 insertions(+), 2 deletions(-)
-
-Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp
-+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp
-@@ -19,6 +19,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <stdlib.h>
- 
- //
- // CArchDaemonUnix
-Index: synergy-1.3.1/lib/arch/CMultibyte.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp
-+++ synergy-1.3.1/lib/arch/CMultibyte.cpp
-@@ -19,6 +19,7 @@
- #include "CArch.h"
- #include <limits.h>
- #include <string.h>
-+#include <stdlib.h>
- #if HAVE_LOCALE_H
- #	include <locale.h>
- #endif
-Index: synergy-1.3.1/lib/base/CStringUtil.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/base/CStringUtil.cpp
-+++ synergy-1.3.1/lib/base/CStringUtil.cpp
-@@ -19,6 +19,7 @@
- #include <cctype>
- #include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- #include <algorithm>
- 
- //
-Index: synergy-1.3.1/lib/client/CClient.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/client/CClient.cpp
-+++ synergy-1.3.1/lib/client/CClient.cpp
-@@ -26,7 +26,8 @@
- #include "CLog.h"
- #include "IEventQueue.h"
- #include "TMethodEventJob.h"
--
-+#include <string.h>
-+#include <stdlib.h>
- //
- // CClient
- //
-Index: synergy-1.3.1/lib/client/CServerProxy.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/client/CServerProxy.cpp
-+++ synergy-1.3.1/lib/client/CServerProxy.cpp
-@@ -24,6 +24,7 @@
- #include "TMethodEventJob.h"
- #include "XBase.h"
- #include <memory>
-+#include <string.h>
- 
- //
- // CServerProxy
-Index: synergy-1.3.1/lib/net/CTCPSocket.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp
-+++ synergy-1.3.1/lib/net/CTCPSocket.cpp
-@@ -24,7 +24,7 @@
- #include "CArch.h"
- #include "XArch.h"
- #include <string.h>
--
-+#include <stdlib.h>
- //
- // CTCPSocket
- //
-Index: synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp
-+++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
-@@ -27,6 +27,7 @@
- #include "IEventQueue.h"
- #include "TMethodEventJob.h"
- #include <cstring>
-+#include <stdlib.h>
- #if X_DISPLAY_MISSING
- #	error X11 is required to build synergy
- #else
-Index: synergy-1.3.1/lib/server/CClientProxy1_3.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp
-+++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp
-@@ -17,6 +17,7 @@
- #include "CLog.h"
- #include "IEventQueue.h"
- #include "TMethodEventJob.h"
-+#include <string.h>
- 
- //
- // CClientProxy1_3
-Index: synergy-1.3.1/lib/server/CServer.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/server/CServer.cpp
-+++ synergy-1.3.1/lib/server/CServer.cpp
-@@ -29,6 +29,7 @@
- #include "TMethodEventJob.h"
- #include "CArch.h"
- #include <string.h>
-+#include <stdlib.h>
- 
- //
- // CServer
-Index: synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp
-+++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp
-@@ -16,6 +16,7 @@
- #include "IEventQueue.h"
- #include "CLock.h"
- #include "TMethodEventJob.h"
-+#include <string.h>
- 
- //
- // CPacketStreamFilter
-Index: synergy-1.3.1/lib/synergy/IKeyState.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp
-+++ synergy-1.3.1/lib/synergy/IKeyState.cpp
-@@ -14,6 +14,7 @@
- 
- #include "IKeyState.h"
- #include <string.h>
-+#include <stdlib.h>
- 
- //
- // IKeyState
-Index: synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
-===================================================================
---- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp
-+++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp
-@@ -13,6 +13,7 @@
-  */
- 
- #include "IPrimaryScreen.h"
-+#include <stdlib.h>
- 
- //
- // IPrimaryScreen
diff --git a/bsp/buildroot/package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch b/bsp/buildroot/package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch
new file mode 100644
index 00000000..a261b6b1
--- /dev/null
+++ b/bsp/buildroot/package/synergy/0002-do-not-change-output-path-when-building-in-debug.patch
@@ -0,0 +1,33 @@
+From 2868add1b7375ef4e2427edb85e27759c5ee226b Mon Sep 17 00:00:00 2001
+From: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
+Date: Fri, 31 Mar 2017 20:05:30 +0200
+Subject: [PATCH] do not change output path when building in debug
+
+Signed-off-by: Pieterjan Camerlynck <pieterjan.camerlynck@gmail.com>
+---
+ CMakeLists.txt | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94c474e..1080e41 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,15 +43,6 @@ project(synergy C CXX)
+ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
+ set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
+ 
+-# for unix, put debug files in a separate bin "debug" dir.
+-# release bin files should stay in the root of the bin dir.
+-if (CMAKE_GENERATOR STREQUAL "Unix Makefiles")
+-	if (CMAKE_BUILD_TYPE STREQUAL Debug)
+-		set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin/debug)
+-		set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib/debug)
+-	endif()
+-endif()
+-
+ # Set some easy to type variables.
+ set(root_dir ${CMAKE_SOURCE_DIR})
+ set(cmake_dir ${root_dir}/res)
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/synergy/0002-remove-werror.patch b/bsp/buildroot/package/synergy/0002-remove-werror.patch
deleted file mode 100644
index 31a8c2b5..00000000
--- a/bsp/buildroot/package/synergy/0002-remove-werror.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Remove -Werror from CXXFLAGS
-
-Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
-
-Index: synergy-1.3.1/configure.in
-===================================================================
---- synergy-1.3.1.orig/configure.in
-+++ synergy-1.3.1/configure.in
-@@ -239,7 +239,6 @@ dnl checks for system services
- 
- dnl enable maximum compiler warnings and warnings are errors.
- ACX_CXX_WARNINGS
--ACX_CXX_WARNINGS_ARE_ERRORS
- 
- dnl adjust compiler and linker variables
- CXXFLAGS="$CXXFLAGS $SYNERGY_CXXFLAGS $ARCH_CFLAGS"
diff --git a/bsp/buildroot/package/synergy/0003-Fix-build-with-gcc-6.patch b/bsp/buildroot/package/synergy/0003-Fix-build-with-gcc-6.patch
deleted file mode 100644
index 843078fe..00000000
--- a/bsp/buildroot/package/synergy/0003-Fix-build-with-gcc-6.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From b79d478c21ed6af20554ead97da72de845dc3206 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Sat, 25 Feb 2017 21:57:19 +0100
-Subject: [PATCH] Fix build with gcc 6
-
-Gcc 6.x defaults to C++14, and the iostream operator bool behaviour changed
-in C++11.  In previous versions, a somewhat odd operator void* was used to
-return the status of the stream as a pointer.  Since C++11 a more sensible
-operator bool is used to return the stream staus.
-
-For details, see:
-
-http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool
-
-The code in CConfigReadContext assumes the pre-C++11 behaviour and provides
-its own operator void overload to return the status of the embedded
-iostream.  With C++11, iostream no longer provides this overload, breaking
-the build:
-
-CConfig.cpp: In member function 'CConfigReadContext::operator void*() const':
-CConfig.cpp:1851:9: error: cannot convert 'std::istream {aka std::basic_istream<char>}' to 'void*' in return
-  return m_stream;
-
-To fix it, backport part of upstream commit 3d963bfbe7897d0a33ad (possible
-fix for mavericks) which changes the code to simply provide a getStream()
-method which returns a reference to the embedded stream and the calling code
-is changed to use operator bool on the returned stream, making the code
-compatible with both old and new compilers.
-
-This upstream commit is part of the 1.6.0 release, so can be dropped when
-the version is bumped.
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- lib/server/CConfig.cpp | 7 +------
- lib/server/CConfig.h   | 2 +-
- 2 files changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/lib/server/CConfig.cpp b/lib/server/CConfig.cpp
-index a502fe78..d67dde20 100644
---- a/lib/server/CConfig.cpp
-+++ b/lib/server/CConfig.cpp
-@@ -607,7 +607,7 @@ void
- CConfig::read(CConfigReadContext& context)
- {
- 	CConfig tmp;
--	while (context) {
-+	while (context.getStream()) {
- 		tmp.readSection(context);
- 	}
- 	*this = tmp;
-@@ -1846,11 +1846,6 @@ CConfigReadContext::getLineNumber() const
- 	return m_line;
- }
- 
--CConfigReadContext::operator void*() const
--{
--	return m_stream;
--}
--
- bool
- CConfigReadContext::operator!() const
- {
-diff --git a/lib/server/CConfig.h b/lib/server/CConfig.h
-index c0d2faa8..0ee453cb 100644
---- a/lib/server/CConfig.h
-+++ b/lib/server/CConfig.h
-@@ -480,7 +480,6 @@ public:
- 	bool			readLine(CString&);
- 	UInt32			getLineNumber() const;
- 
--	operator void*() const;
- 	bool			operator!() const;
- 
- 	OptionValue		parseBoolean(const CString&) const;
-@@ -502,6 +501,7 @@ public:
- 	IPlatformScreen::CButtonInfo*
- 					parseMouse(const CString& mouse) const;
- 	KeyModifierMask	parseModifier(const CString& modifiers) const;
-+	std::istream&	getStream() const { return m_stream; };
- 
- private:
- 	// not implemented
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/synergy/Config.in b/bsp/buildroot/package/synergy/Config.in
index 6b64b79e..3bb8b8e9 100644
--- a/bsp/buildroot/package/synergy/Config.in
+++ b/bsp/buildroot/package/synergy/Config.in
@@ -4,6 +4,9 @@ config BR2_PACKAGE_SYNERGY
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXTST
 	help
 	  Synergy lets you easily share a single mouse and
@@ -11,7 +14,7 @@ config BR2_PACKAGE_SYNERGY
 	  operating systems, each with its own display,
 	  without special hardware.
 
-	  http://synergy2.sourceforge.net/
+	  https://github.com/symless/synergy/
 
 comment "synergy needs a toolchain w/ C++, wchar"
 	depends on BR2_PACKAGE_XORG7
diff --git a/bsp/buildroot/package/synergy/synergy.hash b/bsp/buildroot/package/synergy/synergy.hash
index 2a6950e3..52f9d74d 100644
--- a/bsp/buildroot/package/synergy/synergy.hash
+++ b/bsp/buildroot/package/synergy/synergy.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691  synergy-1.3.1.tar.gz
+sha256  85c388f93881d741981ce3c675e840a52a76883cb2cea1da306c0c453c5d7d9b  synergy-v1.8.8-stable.tar.gz
diff --git a/bsp/buildroot/package/synergy/synergy.mk b/bsp/buildroot/package/synergy/synergy.mk
index 7b52085a..76a4004f 100644
--- a/bsp/buildroot/package/synergy/synergy.mk
+++ b/bsp/buildroot/package/synergy/synergy.mk
@@ -4,16 +4,31 @@
 #
 ################################################################################
 
-SYNERGY_VERSION = 1.3.1
-SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION)
-SYNERGY_AUTORECONF = YES
-SYNERGY_CONF_OPTS = \
-	--x-includes=$(STAGING_DIR)/usr/include/X11 \
-	--x-libraries=$(STAGING_DIR)/usr/lib
-SYNERGY_DEPENDENCIES = \
-	xlib_libXtst \
-	$(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama)
-SYNERGY_LICENSE = GPLv2
-SYNERGY_LICENSE_FILES = COPYING
+SYNERGY_VERSION = v1.8.8-stable
+SYNERGY_SITE = $(call github,symless,synergy,$(SYNERGY_VERSION))
+SYNERGY_LICENSE = GPL-2.0
+SYNERGY_LICENSE_FILES = LICENSE
+SYNERGY_DEPENDENCIES = libcurl openssl xlib_libX11 xlib_libXtst
 
-$(eval $(autotools-package))
+ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y)
+SYNERGY_DEPENDENCIES += xlib_libXext
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y)
+SYNERGY_DEPENDENCIES += xlib_libXi
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y)
+SYNERGY_DEPENDENCIES += xlib_libXinerama
+endif
+
+ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y)
+SYNERGY_DEPENDENCIES += xlib_libXrandr
+endif
+
+define SYNERGY_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/bin/synergyc $(TARGET_DIR)/usr/bin/synergyc
+	$(INSTALL) -D -m 0755 $(@D)/bin/synergys $(TARGET_DIR)/usr/bin/synergys
+endef
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/sysdig/Config.in b/bsp/buildroot/package/sysdig/Config.in
index dfb9db50..6ccb706a 100644
--- a/bsp/buildroot/package/sysdig/Config.in
+++ b/bsp/buildroot/package/sysdig/Config.in
@@ -3,21 +3,26 @@ config BR2_PACKAGE_SYSDIG
 	depends on BR2_LINUX_KERNEL
 	depends on BR2_INSTALL_LIBSTDCPP # libjson
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 	depends on !BR2_STATIC_LIBS # luajit
 	select BR2_PACKAGE_ZLIB
 	select BR2_PACKAGE_LUAJIT
 	select BR2_PACKAGE_JSONCPP
+	select BR2_PACKAGE_LIBCURL
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_JQ
+	select BR2_PACKAGE_LIBB64
 	help
 	  Sysdig is open source, system-level exploration:
-	  capture system state and activity from a running Linux instance,
-	  then save, filter and analyze.
+	  capture system state and activity from a running Linux
+	  instance, then save, filter and analyze.
 	  Think of it as strace + tcpdump + lsof + awesome sauce.
 	  With a little Lua cherry on top.
 
 	  http://sysdig.org
 
-comment "sysdig needs a toolchain w/ C++, gcc >= 4.7, dynamic library and a Linux kernel to be built"
+comment "sysdig needs a toolchain w/ C++, gcc >= 4.8, dynamic library and a Linux kernel to be built"
 	depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \
-		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS
+		|| !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS
 	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
diff --git a/bsp/buildroot/package/sysdig/sysdig.hash b/bsp/buildroot/package/sysdig/sysdig.hash
index f64ef9e7..63a9e385 100644
--- a/bsp/buildroot/package/sysdig/sysdig.hash
+++ b/bsp/buildroot/package/sysdig/sysdig.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256  e72490eaf413745aef87965a5abb1024908053064f86593b257f12bf5b0d6b97  sysdig-0.1.100.tar.gz
+sha256  480d5d8fd7e7373c08008c30bd8e2c7595d5c45d710bf07bd15a522021b560f6  sysdig-0.19.1.tar.gz
diff --git a/bsp/buildroot/package/sysdig/sysdig.mk b/bsp/buildroot/package/sysdig/sysdig.mk
index 85d16a4d..a9c9f21b 100644
--- a/bsp/buildroot/package/sysdig/sysdig.mk
+++ b/bsp/buildroot/package/sysdig/sysdig.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-SYSDIG_VERSION = 0.1.100
+SYSDIG_VERSION = 0.19.1
 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
-SYSDIG_LICENSE = GPLv2
+SYSDIG_LICENSE = GPL-2.0
 SYSDIG_LICENSE_FILES = COPYING
 SYSDIG_CONF_OPTS = -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF \
-	-DUSE_BUNDLED_JSONCPP=OFF -DENABLE_DKMS=OFF
-SYSDIG_DEPENDENCIES = zlib luajit jsoncpp
+	-DUSE_BUNDLED_JSONCPP=OFF -DENABLE_DKMS=OFF -DUSE_BUNDLED_CURL=OFF \
+	-DUSE_BUNDLED_NCURSES=OFF -DUSE_BUNDLED_OPENSSL=OFF \
+	-DUSE_BUNDLED_JQ=OFF -DUSE_BUNDLED_B64=OFF
+SYSDIG_DEPENDENCIES = zlib luajit jsoncpp libcurl ncurses openssl jq libb64
 SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO
 
 # sysdig creates the module Makefile from a template, which contains a
@@ -22,6 +24,7 @@ SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO
 define SYSDIG_MODULE_GEN_MAKEFILE
 	$(INSTALL) -m 0644 $(@D)/driver/Makefile.in $(@D)/driver/Makefile
 	$(SED) 's/@KBUILD_FLAGS@//;' $(@D)/driver/Makefile
+	$(SED) 's/@PROBE_NAME@/sysdig-probe/;' $(@D)/driver/Makefile
 endef
 SYSDIG_POST_PATCH_HOOKS += SYSDIG_MODULE_GEN_MAKEFILE
 
diff --git a/bsp/buildroot/package/sysklogd/klogd.service b/bsp/buildroot/package/sysklogd/klogd.service
new file mode 100644
index 00000000..c66795b4
--- /dev/null
+++ b/bsp/buildroot/package/sysklogd/klogd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Kernel Log Daemon
+
+[Service]
+ExecStart=/usr/sbin/klogd -n
+StandardOutput=null
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+WantedBy=syslogd.service
diff --git a/bsp/buildroot/package/sysklogd/sysklogd.mk b/bsp/buildroot/package/sysklogd/sysklogd.mk
index 49997d4f..1c8259a9 100644
--- a/bsp/buildroot/package/sysklogd/sysklogd.mk
+++ b/bsp/buildroot/package/sysklogd/sysklogd.mk
@@ -6,7 +6,7 @@
 
 SYSKLOGD_VERSION = 1.5.1
 SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download
-SYSKLOGD_LICENSE = GPLv2+
+SYSKLOGD_LICENSE = GPL-2.0+
 SYSKLOGD_LICENSE_FILES = COPYING
 
 # Override BusyBox implementations if BusyBox is enabled.
@@ -32,4 +32,16 @@ define SYSKLOGD_INSTALL_INIT_SYSV
 		$(TARGET_DIR)/etc/init.d/S01logging
 endef
 
+define SYSKLOGD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/syslogd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/syslogd.service
+	$(INSTALL) -D -m 644 $(SYSKLOGD_PKGDIR)/klogd.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/klogd.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -sf ../../../../usr/lib/systemd/system/syslogd.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/syslogd.service
+	ln -sf ../../../usr/lib/systemd/system/syslogd.service \
+		$(TARGET_DIR)/etc/systemd/system/syslog.service
+endef
+
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/sysklogd/syslogd.service b/bsp/buildroot/package/sysklogd/syslogd.service
new file mode 100644
index 00000000..70e4cff2
--- /dev/null
+++ b/bsp/buildroot/package/sysklogd/syslogd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=System Logging Service
+Requires=syslog.socket
+Wants=klogd.service
+
+[Service]
+ExecStart=/usr/sbin/syslogd -m 0 -n
+StandardOutput=null
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service
diff --git a/bsp/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch b/bsp/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch
new file mode 100644
index 00000000..b307ab5a
--- /dev/null
+++ b/bsp/buildroot/package/syslog-ng/0001-modules-json-Adaptions-for-json-c-v0.13.patch
@@ -0,0 +1,39 @@
+From 1b824dd6389e209eab752d5a698c6093f311e3e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
+Date: Mon, 11 Dec 2017 15:46:06 +0100
+Subject: [PATCH] modules/json: Adaptions for json-c v0.13
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit 1b824dd6389e
+
+ modules/json/json-parser.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/modules/json/json-parser.c b/modules/json/json-parser.c
+index 0368ed8f7ffe..356df48b9fc7 100644
+--- a/modules/json/json-parser.c
++++ b/modules/json/json-parser.c
+@@ -20,6 +20,8 @@
+  * COPYING for details.
+  */
+ 
++#define JSON_C_VER_013 (13 << 8)
++
+ #include "json-parser.h"
+ #include "dot-notation.h"
+ #include "scratch-buffers.h"
+@@ -28,7 +30,10 @@
+ #include <ctype.h>
+ 
+ #include <json.h>
++
++#if (!defined(JSON_C_VERSION_NUM)) || (JSON_C_VERSION_NUM < JSON_C_VER_013)
+ #include <json_object_private.h>
++#endif
+ 
+ typedef struct _JSONParser
+ {
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/syslog-ng/Config.in b/bsp/buildroot/package/syslog-ng/Config.in
index 7f47d86b..fbc23622 100644
--- a/bsp/buildroot/package/syslog-ng/Config.in
+++ b/bsp/buildroot/package/syslog-ng/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_SYSLOG_NG
 	bool "syslog-ng"
-	select BR2_PACKAGE_EVENTLOG
-	select BR2_PACKAGE_LIBGLIB2
-	select BR2_PACKAGE_PCRE
-	select BR2_PACKAGE_OPENSSL
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	select BR2_PACKAGE_EVENTLOG
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_PCRE
+	select BR2_PACKAGE_OPENSSL
 	help
 	  syslog-ng is an enhanced log daemon, supporting a wide range
 	  of input and output methods: syslog, unstructured text,
diff --git a/bsp/buildroot/package/syslog-ng/syslog-ng.conf b/bsp/buildroot/package/syslog-ng/syslog-ng.conf
index a3384eeb..e767255d 100644
--- a/bsp/buildroot/package/syslog-ng/syslog-ng.conf
+++ b/bsp/buildroot/package/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.9
+@version: 3.10
 
 source s_sys {
 	file("/proc/kmsg" program_override("kernel"));
diff --git a/bsp/buildroot/package/syslog-ng/syslog-ng.hash b/bsp/buildroot/package/syslog-ng/syslog-ng.hash
index ba066d13..d9c51e9f 100644
--- a/bsp/buildroot/package/syslog-ng/syslog-ng.hash
+++ b/bsp/buildroot/package/syslog-ng/syslog-ng.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 5678856a550ae790618fabde9d1447f932ce7a9080d55dca8fc5df1202c70a17  syslog-ng-3.9.1.tar.gz
+sha256 a905fe7bad09dcf40bf03650ef1c287b511bf262d004464b8993a28ce58c9136  syslog-ng-3.10.1.tar.gz
diff --git a/bsp/buildroot/package/syslog-ng/syslog-ng.mk b/bsp/buildroot/package/syslog-ng/syslog-ng.mk
index 61fc48fd..2b6f2c09 100644
--- a/bsp/buildroot/package/syslog-ng/syslog-ng.mk
+++ b/bsp/buildroot/package/syslog-ng/syslog-ng.mk
@@ -4,16 +4,18 @@
 #
 ################################################################################
 
-SYSLOG_NG_VERSION = 3.9.1
+# When updating the version, please check at runtime if the version in
+# syslog-ng.conf header needs to be updated
+SYSLOG_NG_VERSION = 3.10.1
 SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION)
-SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPLv2+ (modules)
+SYSLOG_NG_LICENSE = LGPL-2.1+ (syslog-ng core), GPL-2.0+ (modules)
 SYSLOG_NG_LICENSE_FILES = COPYING
 SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \
 	eventlog libglib2 openssl pcre
 # rabbit-mq needs -lrt
 SYSLOG_NG_CONF_ENV = LIBS=-lrt
 SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \
-	--disable-java --disable-java-modules
+	--disable-java --disable-java-modules --disable-mongodb
 
 # We override busybox's S01logging init script
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
@@ -71,7 +73,9 @@ endif
 
 ifeq ($(BR2_PACKAGE_LIBNET),y)
 SYSLOG_NG_DEPENDENCIES += libnet
-SYSLOG_NG_CONF_OPTS += --enable-spoof-source
+SYSLOG_NG_CONF_OPTS += \
+	--with-libnet=$(STAGING_DIR)/usr/bin \
+	--enable-spoof-source
 else
 SYSLOG_NG_CONF_OPTS += --disable-spoof-source
 endif
diff --git a/bsp/buildroot/package/sysprof/Config.in b/bsp/buildroot/package/sysprof/Config.in
index e1b0488e..3913274b 100644
--- a/bsp/buildroot/package/sysprof/Config.in
+++ b/bsp/buildroot/package/sysprof/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_SYSPROF
 	bool "sysprof"
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_USE_MMU # glib2
 	# In its util.h file, sysprof contains architecture-specific
 	# code
 	depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Sysprof is a statistical, system-wide profiler that can
 	  profile user and kernel code using the perf API.
diff --git a/bsp/buildroot/package/sysprof/sysprof.mk b/bsp/buildroot/package/sysprof/sysprof.mk
index 0650781e..033194a5 100644
--- a/bsp/buildroot/package/sysprof/sysprof.mk
+++ b/bsp/buildroot/package/sysprof/sysprof.mk
@@ -7,7 +7,7 @@
 SYSPROF_VERSION = 1.2.0
 SYSPROF_SITE = http://sysprof.com
 SYSPROF_DEPENDENCIES = libglib2
-SYSPROF_LICENSE = GPLv2+
+SYSPROF_LICENSE = GPL-2.0+
 SYSPROF_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y)
diff --git a/bsp/buildroot/package/sysstat/Config.in b/bsp/buildroot/package/sysstat/Config.in
index c2627991..442b7876 100644
--- a/bsp/buildroot/package/sysstat/Config.in
+++ b/bsp/buildroot/package/sysstat/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_SYSSTAT
 	bool "sysstat"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
-	# Uses fork()
-	depends on BR2_USE_MMU
+	depends on BR2_USE_MMU 	# fork()
 	help
 	  The sysstat utilities are a collection of performance
 	  monitoring tools for Linux. These include sar, sadf, mpstat,
diff --git a/bsp/buildroot/package/sysstat/sysstat.hash b/bsp/buildroot/package/sysstat/sysstat.hash
index 3b4dda8f..a3563107 100644
--- a/bsp/buildroot/package/sysstat/sysstat.hash
+++ b/bsp/buildroot/package/sysstat/sysstat.hash
@@ -1,4 +1,5 @@
 # From: http://sebastien.godard.pagesperso-orange.fr/download.html
-sha1 805002b2bef00cd9ab44c5037d09b29cb71a17f8  sysstat-11.4.3.tar.xz
+sha1 2eb3d20016084c9e6ff94c9b2f3b2ada7e8d26c6  sysstat-11.6.1.tar.xz
 # Locally calculated
-sha256 02e9cafa5557fbae435d33e592373655df929d817ae711d31142dd2f7d4dcee7  sysstat-11.4.3.tar.xz
+sha256 4b2a2cfa8c8fe6ae0155e168ed9a7066caebc3ecb903b0e64a9ede28ecb68fcb  sysstat-11.6.1.tar.xz
+sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73  COPYING
diff --git a/bsp/buildroot/package/sysstat/sysstat.mk b/bsp/buildroot/package/sysstat/sysstat.mk
index c2853422..bdc0610e 100644
--- a/bsp/buildroot/package/sysstat/sysstat.mk
+++ b/bsp/buildroot/package/sysstat/sysstat.mk
@@ -4,21 +4,13 @@
 #
 ################################################################################
 
-SYSSTAT_VERSION = 11.4.3
+SYSSTAT_VERSION = 11.6.1
 SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz
 SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard
-SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors
-SYSSTAT_DEPENDENCIES = host-gettext
-SYSSTAT_LICENSE = GPLv2+
+SYSSTAT_CONF_OPTS = --disable-file-attr --disable-sensors
+SYSSTAT_DEPENDENCIES = host-gettext $(TARGET_NLS_DEPENDENCIES)
+SYSSTAT_LICENSE = GPL-2.0+
 SYSSTAT_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-SYSSTAT_DEPENDENCIES += gettext
-SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) -lintl"
-endif
-
-# The isag tool is a post processing script that depends on tcl/tk
-# among other things. So we don't install it.
-SYSSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install
+SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.hash b/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.hash
index 2d2175a0..40643dbc 100644
--- a/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.hash
+++ b/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.hash
@@ -1,2 +1,2 @@
 # sha256 locally computed
-sha256 1ef7b4f440bf53aced26979cf8153482840699c556700671eb5dadb4222c70bd systemd-bootchart-231.tar.xz
+sha256 f4cb17b21928e36ec27de5c5294dea6ec1de4acd7ee6c56d6ecc75319cbcaefa systemd-bootchart-233.tar.xz
diff --git a/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.mk b/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.mk
index 31b9413b..bcc3dbe2 100644
--- a/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.mk
+++ b/bsp/buildroot/package/systemd-bootchart/systemd-bootchart.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-SYSTEMD_BOOTCHART_VERSION = 231
+SYSTEMD_BOOTCHART_VERSION = 233
 SYSTEMD_BOOTCHART_SOURCE = systemd-bootchart-$(SYSTEMD_BOOTCHART_VERSION).tar.xz
 # Do not use the github helper here: the uploaded release tarball already
 # contains the generated autotools scripts. It also slightly differs with
 # two missing source files... :-/
 SYSTEMD_BOOTCHART_SITE = https://github.com/systemd/systemd-bootchart/releases/download/v$(SYSTEMD_BOOTCHART_VERSION)
-SYSTEMD_BOOTCHART_LICENSE = LGPLv2.1+
+SYSTEMD_BOOTCHART_LICENSE = LGPL-2.1+
 SYSTEMD_BOOTCHART_LICENSE_FILES = LICENSE.LGPL2.1
 SYSTEMD_BOOTCHART_DEPENDENCIES = systemd
 
diff --git a/bsp/buildroot/package/systemd/0001-fix-getty-unit.patch b/bsp/buildroot/package/systemd/0001-fix-getty-unit.patch
new file mode 100644
index 00000000..b6947626
--- /dev/null
+++ b/bsp/buildroot/package/systemd/0001-fix-getty-unit.patch
@@ -0,0 +1,48 @@
+From 7deb6387aeb07fa4300fa3cf9d6c039dabd120d7 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Mon, 31 Jul 2017 10:08:46 -0400
+Subject: [PATCH] fix-getty-unit
+
+Prefer getty to agetty in console setup systemd units
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+[aduskett@gmail.com: Update for systemd v237]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ units/getty@.service.m4        | 5 +----
+ units/serial-getty@.service.m4 | 2 +-
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
+index 2a84061..7ad588f 100644
+--- a/units/getty@.service.m4
++++ b/units/getty@.service.m4
+@@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0
+ 
+ [Service]
+ # the VT is cleared by TTYVTDisallocate
+-# The '-o' option value tells agetty to replace 'login' arguments with an
+-# option to preserve environment (-p), followed by '--' for safety, and then
+-# the entered username.
+-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Type=idle
+ Restart=always
+ RestartSec=0
+diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
+index b7caeaf..c663612 100644
+--- a/units/serial-getty@.service.m4
++++ b/units/serial-getty@.service.m4
+@@ -33,7 +33,7 @@ Before=rescue.service
+ # The '-o' option value tells agetty to replace 'login' arguments with an
+ # option to preserve environment (-p), followed by '--' for safety, and then
+ # the entered username.
+-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM
++ExecStart=-/sbin/getty -L %I 115200 vt100
+ Type=idle
+ Restart=always
+ UtmpIdentifier=%I
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch b/bsp/buildroot/package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch
deleted file mode 100644
index 81cecefa..00000000
--- a/bsp/buildroot/package/systemd/0001-resolved-bugfix-of-null-pointer-p-question-dereferencing.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a924f43f30f9c4acaf70618dd2a055f8b0f166be Mon Sep 17 00:00:00 2001
-From: Evgeny Vereshchagin <evvers@ya.ru>
-Date: Wed, 24 May 2017 08:56:48 +0300
-Subject: [PATCH] resolved: bugfix of null pointer p->question dereferencing
- (#6020)
-
-See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1621396
-
-[Upstream commit: https://github.com/systemd/systemd/commit/a924f43f30f9c4acaf70618dd2a055f8b0f166be]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/resolve/resolved-dns-packet.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 652970284e..240ee448f4 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -2269,6 +2269,9 @@ int dns_packet_is_reply_for(DnsPacket *p, const DnsResourceKey *key) {
-         if (r < 0)
-                 return r;
- 
-+        if (!p->question)
-+                return 0;
-+
-         if (p->question->n_keys != 1)
-                 return 0;
- 
diff --git a/bsp/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch b/bsp/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch
new file mode 100644
index 00000000..61a139e2
--- /dev/null
+++ b/bsp/buildroot/package/systemd/0002-install-don-t-use-ln-relative.patch
@@ -0,0 +1,80 @@
+From 17560d52e9ec0afebbfe31e694870c6433b36f60 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <Adamduskett@outlook.com>
+Date: Sun, 31 Dec 2017 12:46:04 -0500
+Subject: [PATCH] install: don't use ln --relative
+
+Oldish enterprise-class distributions have too old versions of
+coreutils, with ln not supporting --relative.
+
+So we fake it.
+
+ln --relative would create minimalist relative paths, but they are not
+trivial to generate. Instead, we always create paths relative to the
+root, i.e.:
+
+    ln -s --relative /usr/bin/foo /usr/sbin/foo
+
+would create:  /usr/sbin/foo -> ../bin/foo
+while we do :  /usr/sbin/foo -> ../../usr/bin/foo
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+[aduskett@gmail.com: Added meson.build section and dirname wrapper in add-wants]
+[aduskett@gmail.com: Update for systemd v237]
+Signed-off-by: Adam Duskett <Adamduskett@outlook.com>
+[tpiepho@impinj.com: Fix add-wants wrapper]
+Signed-off-by: Trent Piepho <tpiepho@impinj.com>
+---
+ meson.build                 | 2 +-
+ tools/meson-make-symlink.sh | 3 ++-
+ units/meson-add-wants.sh    | 6 ++++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d4af95a44..d75f2b34c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -586,7 +586,7 @@ endforeach
+ conf.set_quoted('TELINIT', get_option('telinit-path'))
+ 
+ if run_command('ln', '--relative', '--help').returncode() != 0
+-        error('ln does not support --relative')
++        message('ln does not support --relative')
+ endif
+ 
+ ############################################################
+diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
+index 501cd43d4..25e7f89fd 100755
+--- a/tools/meson-make-symlink.sh
++++ b/tools/meson-make-symlink.sh
+@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
+ if [ "$(dirname $1)" = . ]; then
+         ln -vfs -T "$1" "${DESTDIR:-}$2"
+ else
+-        ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
++        dds="$( dirname "$2" |sed -r -e 's:/+[^/]+:../:g; s:/$::' )"
++        ln -vfs -T "${dds}$1" "${DESTDIR:-}$2"
+ fi
+diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
+index 70f7172ae..bb8155075 100755
+--- a/units/meson-add-wants.sh
++++ b/units/meson-add-wants.sh
+@@ -14,7 +14,7 @@ case "$target" in
+                 ;;
+ esac
+ 
+-unitpath="${DESTDIR:-}${unitdir}/${unit}"
++unitpath="${unitdir}/${unit}"
+ 
+ case "$target" in
+         */)
+@@ -25,4 +25,6 @@ case "$target" in
+                 ;;
+ esac
+ 
+-ln -vfs --relative "$unitpath" "$dir"
++[ ! -d "${dir}" ] && linkdir=`dirname "${dir}"` || linkdir="${dir}"
++dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')"
++ln -vfs "$dds$unitpath" "$dir"
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/systemd/0002-resolved-simplify-alloc-size-calculation.patch b/bsp/buildroot/package/systemd/0002-resolved-simplify-alloc-size-calculation.patch
deleted file mode 100644
index 5fab9056..00000000
--- a/bsp/buildroot/package/systemd/0002-resolved-simplify-alloc-size-calculation.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From db848813bae4d28c524b3b6a7dad135e426659ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 18 Jun 2017 16:07:57 -0400
-Subject: [PATCH] resolved: simplify alloc size calculation
-
-The allocation size was calculated in a complicated way, and for values
-close to the page size we would actually allocate less than requested.
-
-Reported by Chris Coulson <chris.coulson@canonical.com>.
-
-CVE-2017-9445
-
-[Upstream commit: https://github.com/systemd/systemd/commit/db848813bae4d28c524b3b6a7dad135e426659ce]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/resolve/resolved-dns-packet.c | 8 +-------
- src/resolve/resolved-dns-packet.h | 2 --
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 240ee448f4..821b66e266 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -47,13 +47,7 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
- 
-         assert(ret);
- 
--        if (mtu <= UDP_PACKET_HEADER_SIZE)
--                a = DNS_PACKET_SIZE_START;
--        else
--                a = mtu - UDP_PACKET_HEADER_SIZE;
--
--        if (a < DNS_PACKET_HEADER_SIZE)
--                a = DNS_PACKET_HEADER_SIZE;
-+        a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
- 
-         /* round up to next page size */
-         a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));
-diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
-index 2c92392e4d..3abcaf8cf3 100644
---- a/src/resolve/resolved-dns-packet.h
-+++ b/src/resolve/resolved-dns-packet.h
-@@ -66,8 +66,6 @@ struct DnsPacketHeader {
- /* With EDNS0 we can use larger packets, default to 4096, which is what is commonly used */
- #define DNS_PACKET_UNICAST_SIZE_LARGE_MAX 4096
- 
--#define DNS_PACKET_SIZE_START 512
--
- struct DnsPacket {
-         int n_ref;
-         DnsProtocol protocol;
diff --git a/bsp/buildroot/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch b/bsp/buildroot/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch
new file mode 100644
index 00000000..1861a421
--- /dev/null
+++ b/bsp/buildroot/package/systemd/0003-fix-am-path-libgcrypt-no-found.patch
@@ -0,0 +1,159 @@
+From cb47c1da9c4a8f69662f9c17497aeeb8a922d41a Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Fri, 28 Jul 2017 07:13:51 -0400
+Subject: [PATCH] Fix AM_PATH_LIBGCRYPT not found
+
+This patch installs a copy of libgcrypt.m4 from the libgcrypt source tarball
+to systemd m4 directory.
+
+Libgcrypt uses a custom m4 macro and not pkg-config to check if the
+development files are available. Though libgcrypt support is optional in
+systemd, this macro should be available whenever autoreconf is used, otherwise
+the re-configuration will fail with:
+
+  configure.ac:616: warning: macro 'AM_PATH_LIBGCRYPT' not found in library
+
+As asking the user to install the development package of libgcrypt on the host
+machine or adding libgcrypt as a build dependency to systemd is not
+acceptable, the required file is added to the m4 directory.
+
+Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+[Adam: Refresh for 234]
+Signed-off-by: Adam Duskett <aduskett@gmail.com>
+---
+ m4/libgcrypt.m4 | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 123 insertions(+)
+ create mode 100644 m4/libgcrypt.m4
+
+diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
+new file mode 100644
+index 0000000..831dc0c
+--- /dev/null
++++ b/m4/libgcrypt.m4
+@@ -0,0 +1,123 @@
++dnl Autoconf macros for libgcrypt
++dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++dnl
++dnl This file is free software; as a special exception the author gives
++dnl unlimited permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++dnl This file is distributed in the hope that it will be useful, but
++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++
++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
++dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
++dnl with the API version to also check the API compatibility. Example:
++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
++dnl this features allows to prevent build against newer versions of libgcrypt
++dnl with a changed API.
++dnl
++AC_DEFUN([AM_PATH_LIBGCRYPT],
++[ AC_ARG_WITH(libgcrypt-prefix,
++            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
++                           [prefix where LIBGCRYPT is installed (optional)]),
++     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
++  if test x$libgcrypt_config_prefix != x ; then
++     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
++        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
++     fi
++  fi
++
++  AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
++  tmp=ifelse([$1], ,1:1.2.0,$1)
++  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
++     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
++     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
++  else
++     req_libgcrypt_api=0
++     min_libgcrypt_version="$tmp"
++  fi
++
++  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
++  ok=no
++  if test "$LIBGCRYPT_CONFIG" != "no" ; then
++    req_major=`echo $min_libgcrypt_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
++    req_minor=`echo $min_libgcrypt_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
++    req_micro=`echo $min_libgcrypt_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
++    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
++    major=`echo $libgcrypt_config_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
++    minor=`echo $libgcrypt_config_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
++    micro=`echo $libgcrypt_config_version | \
++               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
++    if test "$major" -gt "$req_major"; then
++        ok=yes
++    else
++        if test "$major" -eq "$req_major"; then
++            if test "$minor" -gt "$req_minor"; then
++               ok=yes
++            else
++               if test "$minor" -eq "$req_minor"; then
++                   if test "$micro" -ge "$req_micro"; then
++                     ok=yes
++                   fi
++               fi
++            fi
++        fi
++    fi
++  fi
++  if test $ok = yes; then
++    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
++  else
++    AC_MSG_RESULT(no)
++  fi
++  if test $ok = yes; then
++     # If we have a recent libgcrypt, we should also check that the
++     # API is compatible
++     if test "$req_libgcrypt_api" -gt 0 ; then
++        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
++        if test "$tmp" -gt 0 ; then
++           AC_MSG_CHECKING([LIBGCRYPT API version])
++           if test "$req_libgcrypt_api" -eq "$tmp" ; then
++             AC_MSG_RESULT([okay])
++           else
++             ok=no
++             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
++           fi
++        fi
++     fi
++  fi
++  if test $ok = yes; then
++    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++    ifelse([$2], , :, [$2])
++    if test x"$host" != x ; then
++      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
++      if test x"$libgcrypt_config_host" != xnone ; then
++        if test x"$libgcrypt_config_host" != x"$host" ; then
++  AC_MSG_WARN([[
++***
++*** The config script $LIBGCRYPT_CONFIG was
++*** built for $libgcrypt_config_host and thus may not match the
++*** used host $host.
++*** You may want to use the configure option --with-libgcrypt-prefix
++*** to specify a matching config script.
++***]])
++        fi
++      fi
++    fi
++  else
++    LIBGCRYPT_CFLAGS=""
++    LIBGCRYPT_LIBS=""
++    ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(LIBGCRYPT_CFLAGS)
++  AC_SUBST(LIBGCRYPT_LIBS)
++])
+-- 
+2.13.3
+
diff --git a/bsp/buildroot/package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch b/bsp/buildroot/package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch
deleted file mode 100644
index 75091138..00000000
--- a/bsp/buildroot/package/systemd/0003-resolved-do-not-allocate-packets-with-minimum-size.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 88795538726a5bbfd9efc13d441cb05e1d7fc139 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 27 Jun 2017 14:20:00 -0400
-Subject: [PATCH] resolved: do not allocate packets with minimum size
-
-dns_packet_new() is sometimes called with mtu == 0, and in that case we should
-allocate more than the absolute minimum (which is the dns packet header size),
-otherwise we have to resize immediately again after appending the first data to
-the packet.
-
-This partially reverts the previous commit.
-
-[Upstream commit: https://github.com/systemd/systemd/commit/88795538726a5bbfd9efc13d441cb05e1d7fc139]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/resolve/resolved-dns-packet.c | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c
-index 821b66e266..d1f0f760a4 100644
---- a/src/resolve/resolved-dns-packet.c
-+++ b/src/resolve/resolved-dns-packet.c
-@@ -28,6 +28,9 @@
- 
- #define EDNS0_OPT_DO (1<<15)
- 
-+#define DNS_PACKET_SIZE_START 512
-+assert_cc(DNS_PACKET_SIZE_START > UDP_PACKET_HEADER_SIZE)
-+
- typedef struct DnsPacketRewinder {
-         DnsPacket *packet;
-         size_t saved_rindex;
-@@ -47,7 +50,14 @@ int dns_packet_new(DnsPacket **ret, DnsProtocol protocol, size_t mtu) {
- 
-         assert(ret);
- 
--        a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
-+        /* When dns_packet_new() is called with mtu == 0, allocate more than the
-+         * absolute minimum (which is the dns packet header size), to avoid
-+         * resizing immediately again after appending the first data to the packet.
-+         */
-+        if (mtu < UDP_PACKET_HEADER_SIZE)
-+                a = DNS_PACKET_SIZE_START;
-+        else
-+                a = MAX(mtu, DNS_PACKET_HEADER_SIZE);
- 
-         /* round up to next page size */
-         a = PAGE_ALIGN(ALIGN(sizeof(DnsPacket)) + a) - ALIGN(sizeof(DnsPacket));
diff --git a/bsp/buildroot/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch b/bsp/buildroot/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch
new file mode 100644
index 00000000..b91d0972
--- /dev/null
+++ b/bsp/buildroot/package/systemd/0004-core-dont-include-libmount-h-in-a-header-file.patch
@@ -0,0 +1,75 @@
+From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 26 Mar 2018 17:34:53 +0200
+Subject: [PATCH] core: don't include libmount.h in a header file (#8580)
+
+linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_*
+definitions.
+
+To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h
+should be included. And missing.h must be included last.
+
+Without this, building systemd may fail with:
+
+In file included from [...]/libmount/libmount.h:31:0,
+                 from ../systemd-238/src/core/manager.h:23,
+                 from ../systemd-238/src/core/emergency-action.h:37,
+                 from ../systemd-238/src/core/unit.h:34,
+                 from ../systemd-238/src/core/dbus-timer.h:25,
+                 from ../systemd-238/src/core/timer.c:26:
+[...]/sys/mount.h:57:2: error: expected identifier before numeric constant
+
+Upstream: https://github.com/systemd/systemd/pull/8580
+Signed-off-by: Stefan Becker <chemobejk@gmail.com>
+---
+ src/core/dbus-execute.c | 1 +
+ src/core/manager.h      | 3 ++-
+ src/core/mount.c        | 2 ++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
+index 7344623ebf6..c342093bca4 100644
+--- a/src/core/dbus-execute.c
++++ b/src/core/dbus-execute.c
+@@ -18,6 +18,7 @@
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
++#include <sys/mount.h>
+ #include <sys/prctl.h>
+ #include <stdio_ext.h>
+ 
+diff --git a/src/core/manager.h b/src/core/manager.h
+index 28c5da225b1..e09e0cdf5e9 100644
+--- a/src/core/manager.h
++++ b/src/core/manager.h
+@@ -20,7 +20,6 @@
+   along with systemd; If not, see <http://www.gnu.org/licenses/>.
+ ***/
+ 
+-#include <libmount.h>
+ #include <stdbool.h>
+ #include <stdio.h>
+ 
+@@ -34,6 +33,8 @@
+ #include "list.h"
+ #include "ratelimit.h"
+ 
++struct libmnt_monitor;
++
+ /* Enforce upper limit how many names we allow */
+ #define MANAGER_MAX_NAMES 131072 /* 128K */
+ 
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 0e755da5c02..0154ebda5d6 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -23,6 +23,8 @@
+ #include <stdio.h>
+ #include <sys/epoll.h>
+ 
++#include <libmount.h>
++
+ #include "sd-messages.h"
+ 
+ #include "alloc-util.h"
diff --git a/bsp/buildroot/package/systemd/0004-fix-getty-unit.patch b/bsp/buildroot/package/systemd/0004-fix-getty-unit.patch
deleted file mode 100644
index 8ec3bcf2..00000000
--- a/bsp/buildroot/package/systemd/0004-fix-getty-unit.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Prefer getty to agetty in console setup systemd units
-
-Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
-
-diff -aburN systemd-212.orig/units/getty@.service.m4 systemd-212/units/getty@.service.m4
---- systemd-212.orig/units/getty@.service.m4	2014-01-28 11:08:51.000000000 +0100
-+++ systemd-212/units/getty@.service.m4	2014-03-26 11:06:27.000000000 +0100
-@@ -27,7 +27,7 @@
- 
- [Service]
- # the VT is cleared by TTYVTDisallocate
--ExecStart=-/sbin/agetty --noclear %I $TERM
-+ExecStart=-/sbin/getty -L %I 115200 vt100
- Type=idle
- Restart=always
- RestartSec=0
-diff -aburN systemd-212.orig/units/serial-getty@.service.m4 systemd-212/units/serial-getty@.service.m4
---- systemd-212.orig/units/serial-getty@.service.m4	2014-03-13 18:47:24.000000000 +0100
-+++ systemd-212/units/serial-getty@.service.m4	2014-03-26 11:07:01.000000000 +0100
-@@ -22,7 +22,7 @@
- IgnoreOnIsolate=yes
- 
- [Service]
--ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
-+ExecStart=-/sbin/getty -L %I 115200 vt100
- Type=idle
- Restart=always
- RestartSec=0
diff --git a/bsp/buildroot/package/systemd/0005-basic-macros-rename-noreturn.patch b/bsp/buildroot/package/systemd/0005-basic-macros-rename-noreturn.patch
new file mode 100644
index 00000000..6cd84709
--- /dev/null
+++ b/bsp/buildroot/package/systemd/0005-basic-macros-rename-noreturn.patch
@@ -0,0 +1,201 @@
+From 848e863acc51ecfb0f3955c498874588201d9130 Mon Sep 17 00:00:00 2001
+From: Franck Bui <fbui@suse.com>
+Date: Thu, 15 Mar 2018 06:23:46 +0100
+Subject: [PATCH] basic/macros: rename noreturn into _noreturn_ (#8456)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+"noreturn" is reserved and can be used in other header files we include:
+
+  [   16s] In file included from /usr/include/gcrypt.h:30:0,
+  [   16s]                  from ../src/journal/journal-file.h:26,
+  [   16s]                  from ../src/journal/journal-vacuum.c:31:
+  [   16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token
+  [   16s]  void gpgrt_log_bug (const char *fmt, ...)    GPGRT_ATTR_NR_PRINTF(1,2);
+
+Here we include grcrypt.h (which in turns include gpg-error.h) *after* we
+"noreturn" was defined in macro.h.
+
+Upstream: https://github.com/systemd/systemd/pull/8456
+Signed-off-by: Stefan Becker <chemobejk@gmail.com>
+---
+ src/basic/log.c                         |  4 ++--
+ src/basic/log.h                         |  4 ++--
+ src/basic/macro.h                       | 19 +++++++++----------
+ src/basic/process-util.c                |  2 +-
+ src/basic/process-util.h                |  2 +-
+ src/core/main.c                         |  4 ++--
+ src/journal/test-journal-interleaving.c |  2 +-
+ src/shared/pager.c                      |  2 +-
+ src/udev/collect/collect.c              |  2 +-
+ 9 files changed, 20 insertions(+), 21 deletions(-)
+
+diff --git a/src/basic/log.c b/src/basic/log.c
+index 7a7f2cbec13..16a2431c548 100644
+--- a/src/basic/log.c
++++ b/src/basic/log.c
+@@ -814,7 +814,7 @@ static void log_assert(
+         log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer);
+ }
+ 
+-noreturn void log_assert_failed_realm(
++_noreturn_ void log_assert_failed_realm(
+                 LogRealm realm,
+                 const char *text,
+                 const char *file,
+@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm(
+         abort();
+ }
+ 
+-noreturn void log_assert_failed_unreachable_realm(
++_noreturn_ void log_assert_failed_unreachable_realm(
+                 LogRealm realm,
+                 const char *text,
+                 const char *file,
+diff --git a/src/basic/log.h b/src/basic/log.h
+index efcf0f1bfc1..314be128a23 100644
+--- a/src/basic/log.h
++++ b/src/basic/log.h
+@@ -186,7 +186,7 @@ int log_dump_internal(
+                 char *buffer);
+ 
+ /* Logging for various assertions */
+-noreturn void log_assert_failed_realm(
++_noreturn_ void log_assert_failed_realm(
+                 LogRealm realm,
+                 const char *text,
+                 const char *file,
+@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm(
+ #define log_assert_failed(text, ...) \
+         log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__)
+ 
+-noreturn void log_assert_failed_unreachable_realm(
++_noreturn_ void log_assert_failed_unreachable_realm(
+                 LogRealm realm,
+                 const char *text,
+                 const char *file,
+diff --git a/src/basic/macro.h b/src/basic/macro.h
+index 95be63a2040..8911edfc4be 100644
+--- a/src/basic/macro.h
++++ b/src/basic/macro.h
+@@ -53,6 +53,15 @@
+ #else
+ #define _fallthrough_
+ #endif
++/* Define C11 noreturn without <stdnoreturn.h> and even on older gcc
++ * compiler versions */
++#ifndef _noreturn_
++#if __STDC_VERSION__ >= 201112L
++#define _noreturn_ _Noreturn
++#else
++#define _noreturn_ __attribute__((noreturn))
++#endif
++#endif
+ 
+ /* Temporarily disable some warnings */
+ #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT                     \
+@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
+ #endif
+ #endif
+ 
+-/* Define C11 noreturn without <stdnoreturn.h> and even on older gcc
+- * compiler versions */
+-#ifndef noreturn
+-#if __STDC_VERSION__ >= 201112L
+-#define noreturn _Noreturn
+-#else
+-#define noreturn __attribute__((noreturn))
+-#endif
+-#endif
+-
+ #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func)                 \
+         static inline void func##p(type *p) {                   \
+                 if (*p)                                         \
+diff --git a/src/basic/process-util.c b/src/basic/process-util.c
+index aa9846db5dc..e6120af5b68 100644
+--- a/src/basic/process-util.c
++++ b/src/basic/process-util.c
+@@ -987,7 +987,7 @@ bool is_main_thread(void) {
+         return cached > 0;
+ }
+ 
+-noreturn void freeze(void) {
++_noreturn_ void freeze(void) {
+ 
+         log_close();
+ 
+diff --git a/src/basic/process-util.h b/src/basic/process-util.h
+index 93029e36e5f..5170adec7bb 100644
+--- a/src/basic/process-util.h
++++ b/src/basic/process-util.h
+@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid);
+ 
+ bool is_main_thread(void);
+ 
+-noreturn void freeze(void);
++_noreturn_ void freeze(void);
+ 
+ bool oom_score_adjust_is_valid(int oa);
+ 
+diff --git a/src/core/main.c b/src/core/main.c
+index 076846a41c0..4b2d1492373 100644
+--- a/src/core/main.c
++++ b/src/core/main.c
+@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX;
+ static sd_id128_t arg_machine_id = {};
+ static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE;
+ 
+-noreturn static void freeze_or_reboot(void) {
++_noreturn_ static void freeze_or_reboot(void) {
+ 
+         if (arg_crash_reboot) {
+                 log_notice("Rebooting in 10s...");
+@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) {
+         freeze();
+ }
+ 
+-noreturn static void crash(int sig) {
++_noreturn_ static void crash(int sig) {
+         struct sigaction sa;
+         pid_t pid;
+ 
+diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
+index 5a88b2774fa..d87bdbdd32a 100644
+--- a/src/journal/test-journal-interleaving.c
++++ b/src/journal/test-journal-interleaving.c
+@@ -37,7 +37,7 @@
+ 
+ static bool arg_keep = false;
+ 
+-noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) {
++_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) {
+         log_internal(LOG_CRIT, error, file, line, func,
+                      "'%s' failed at %s:%u (%s): %m", text, file, line, func);
+         abort();
+diff --git a/src/shared/pager.c b/src/shared/pager.c
+index 75db3c985bd..681af9c40e3 100644
+--- a/src/shared/pager.c
++++ b/src/shared/pager.c
+@@ -47,7 +47,7 @@ static int stored_stderr = -1;
+ static bool stdout_redirected = false;
+ static bool stderr_redirected = false;
+ 
+-noreturn static void pager_fallback(void) {
++_noreturn_ static void pager_fallback(void) {
+         int r;
+ 
+         r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0);
+diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
+index 2821640e93b..c8fa47b3d7d 100644
+--- a/src/udev/collect/collect.c
++++ b/src/udev/collect/collect.c
+@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node)
+         return container_of(node, struct _mate, node);
+ }
+ 
+-noreturn static void sig_alrm(int signo)
++_noreturn_ static void sig_alrm(int signo)
+ {
+         exit(4);
+ }
diff --git a/bsp/buildroot/package/systemd/0005-build-sys-revert-use-of-ln-relative-option.patch b/bsp/buildroot/package/systemd/0005-build-sys-revert-use-of-ln-relative-option.patch
deleted file mode 100644
index 2c1d929e..00000000
--- a/bsp/buildroot/package/systemd/0005-build-sys-revert-use-of-ln-relative-option.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 32b6c22006767f0762edfa116b8b0f7be0c5c121 Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Wed, 27 Jul 2016 15:43:16 +0200
-Subject: [PATCH] build-sys: revert use of ln relative option.
-
-Systemd build system now uses the `--relative` option from `ln(1)`.
-
-This option was added to GNU coreutils 8.16, which is not widely
-deployed yet by GNU/Linux distributions (not available in Debian Wheezy
-for example).
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-[Maxime: refresh the patch]
-[Vincent:
-  refresh the patch, move-to-rootlibdir removed by:
-  https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff
-]
-Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- Makefile.am  | 11 ++---------
- configure.ac |  2 --
- 2 files changed, 2 insertions(+), 11 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 0c27f81..4de1595 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -312,9 +312,9 @@ install-aliases-hook:
- 	set -- $(SYSTEM_UNIT_ALIASES) && \
- 		dir=$(systemunitdir) && $(install-aliases)
- 	set -- $(USER_UNIT_ALIASES) && \
--		dir=$(userunitdir) && $(install-relative-aliases)
-+		dir=$(userunitdir) && $(install-aliases)
- 	set -- $(GENERAL_ALIASES) && \
--		dir= && $(install-relative-aliases)
-+		dir= && $(install-aliases)
-
- define install-aliases
- 	while [ -n "$$1" ]; do \
-@@ -325,15 +325,6 @@ define install-aliases
- 	done
- endef
-
--define install-relative-aliases
--	while [ -n "$$1" ]; do \
--		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
--		rm -f $(DESTDIR)$$dir/$$2 && \
--		$(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
--		shift 2 || exit $$?; \
--	done
--endef
--
- install-touch-usr-hook:
- 	touch -c $(DESTDIR)/$(prefix)
-
-diff --git a/configure.ac b/configure.ac
-index cf595e6..d58f303 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
- AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin])
- AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin])
-
--AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
--
- M4_DEFINES=
-
- AC_CHECK_TOOL(OBJCOPY, objcopy)
---
-2.8.1
-
diff --git a/bsp/buildroot/package/systemd/0006-fix-am-path-libgcrypt-no-found.patch b/bsp/buildroot/package/systemd/0006-fix-am-path-libgcrypt-no-found.patch
deleted file mode 100644
index 2287ac51..00000000
--- a/bsp/buildroot/package/systemd/0006-fix-am-path-libgcrypt-no-found.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Fix AM_PATH_LIBGCRYPT not found
-
-This patch installs a copy of libgcrypt.m4 from the libgcrypt source tarball
-to systemd m4 directory.
-
-Libgcrypt uses a custom m4 macro and not pkg-config to check if the
-development files are available. Though libgcrypt support is optional in
-systemd, this macro should be available whenever autoreconf is used, otherwise
-the re-configuration will fail with:
-
-  configure.ac:616: warning: macro 'AM_PATH_LIBGCRYPT' not found in library
-
-As asking the user to install the development package of libgcrypt on the host
-machine or adding libgcrypt as a build dependency to systemd is not
-acceptable, the required file is added to the m4 directory.
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Index: systemd-213/m4/libgcrypt.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ systemd-213/m4/libgcrypt.m4	2014-06-11 10:41:11.749305509 +0200
-@@ -0,0 +1,123 @@
-+dnl Autoconf macros for libgcrypt
-+dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-+dnl
-+dnl This file is free software; as a special exception the author gives
-+dnl unlimited permission to copy and/or distribute it, with or without
-+dnl modifications, as long as this notice is preserved.
-+dnl
-+dnl This file is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+
-+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
-+dnl with the API version to also check the API compatibility. Example:
-+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
-+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
-+dnl this features allows to prevent build against newer versions of libgcrypt
-+dnl with a changed API.
-+dnl
-+AC_DEFUN([AM_PATH_LIBGCRYPT],
-+[ AC_ARG_WITH(libgcrypt-prefix,
-+            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
-+                           [prefix where LIBGCRYPT is installed (optional)]),
-+     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
-+  if test x$libgcrypt_config_prefix != x ; then
-+     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
-+        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
-+     fi
-+  fi
-+
-+  AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
-+  tmp=ifelse([$1], ,1:1.2.0,$1)
-+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-+     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-+     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-+  else
-+     req_libgcrypt_api=0
-+     min_libgcrypt_version="$tmp"
-+  fi
-+
-+  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
-+  ok=no
-+  if test "$LIBGCRYPT_CONFIG" != "no" ; then
-+    req_major=`echo $min_libgcrypt_version | \
-+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-+    req_minor=`echo $min_libgcrypt_version | \
-+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-+    req_micro=`echo $min_libgcrypt_version | \
-+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
-+    major=`echo $libgcrypt_config_version | \
-+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-+    minor=`echo $libgcrypt_config_version | \
-+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-+    micro=`echo $libgcrypt_config_version | \
-+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-+    if test "$major" -gt "$req_major"; then
-+        ok=yes
-+    else
-+        if test "$major" -eq "$req_major"; then
-+            if test "$minor" -gt "$req_minor"; then
-+               ok=yes
-+            else
-+               if test "$minor" -eq "$req_minor"; then
-+                   if test "$micro" -ge "$req_micro"; then
-+                     ok=yes
-+                   fi
-+               fi
-+            fi
-+        fi
-+    fi
-+  fi
-+  if test $ok = yes; then
-+    AC_MSG_RESULT([yes ($libgcrypt_config_version)])
-+  else
-+    AC_MSG_RESULT(no)
-+  fi
-+  if test $ok = yes; then
-+     # If we have a recent libgcrypt, we should also check that the
-+     # API is compatible
-+     if test "$req_libgcrypt_api" -gt 0 ; then
-+        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
-+        if test "$tmp" -gt 0 ; then
-+           AC_MSG_CHECKING([LIBGCRYPT API version])
-+           if test "$req_libgcrypt_api" -eq "$tmp" ; then
-+             AC_MSG_RESULT([okay])
-+           else
-+             ok=no
-+             AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
-+           fi
-+        fi
-+     fi
-+  fi
-+  if test $ok = yes; then
-+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-+    ifelse([$2], , :, [$2])
-+    if test x"$host" != x ; then
-+      libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
-+      if test x"$libgcrypt_config_host" != xnone ; then
-+        if test x"$libgcrypt_config_host" != x"$host" ; then
-+  AC_MSG_WARN([[
-+***
-+*** The config script $LIBGCRYPT_CONFIG was
-+*** built for $libgcrypt_config_host and thus may not match the
-+*** used host $host.
-+*** You may want to use the configure option --with-libgcrypt-prefix
-+*** to specify a matching config script.
-+***]])
-+        fi
-+      fi
-+    fi
-+  else
-+    LIBGCRYPT_CFLAGS=""
-+    LIBGCRYPT_LIBS=""
-+    ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(LIBGCRYPT_CFLAGS)
-+  AC_SUBST(LIBGCRYPT_LIBS)
-+])
diff --git a/bsp/buildroot/package/systemd/Config.in b/bsp/buildroot/package/systemd/Config.in
index 47d47c6a..7b613df0 100644
--- a/bsp/buildroot/package/systemd/Config.in
+++ b/bsp/buildroot/package/systemd/Config.in
@@ -27,18 +27,20 @@ menuconfig BR2_PACKAGE_SYSTEMD
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools
 	select BR2_PACKAGE_KMOD_TOOLS
 	select BR2_TARGET_TZ_INFO
+	select BR2_NEEDS_HOST_UTF8_LOCALE
 	help
-	  systemd is a system and service manager for Linux, compatible with
-	  SysV and LSB init scripts. systemd provides aggressive parallelization
-	  capabilities, uses socket and D-Bus activation for starting services,
-	  offers on-demand starting of daemons, keeps track of processes using
-	  Linux cgroups, supports snapshotting and restoring of the system
-	  state, maintains mount and automount points and implements an
-	  elaborate transactional dependency-based service control logic.
-	  It can work as a drop-in replacement for sysvinit.
+	  systemd is a system and service manager for Linux,
+	  compatible with SysV and LSB init scripts. systemd provides
+	  aggressive parallelization capabilities, uses socket and
+	  D-Bus activation for starting services, offers on-demand
+	  starting of daemons, keeps track of processes using Linux
+	  cgroups, supports snapshotting and restoring of the system
+	  state, maintains mount and automount points and implements
+	  an elaborate transactional dependency-based service control
+	  logic.  It can work as a drop-in replacement for sysvinit.
 
-	  Systemd requires a Linux kernel >= 3.0 with the following options
-	  enabled:
+	  Systemd requires a Linux kernel >= 3.0 with the following
+	  options enabled:
 
 	  - CONFIG_CGROUPS
 	  - CONFIG_INOTIFY_USER
@@ -65,8 +67,8 @@ menuconfig BR2_PACKAGE_SYSTEMD
 
 	  Notice that systemd selects the fsck wrapper from util-linux
 	  but no particular fsck.<fstype> is selected. You must choose
-	  the apropriate ones (e.g. e2fsck, from the e2fsprogs package)
-	  according to the system configuration.
+	  the apropriate ones (e.g. e2fsck, from the e2fsprogs
+	  package) according to the system configuration.
 
 	  http://freedesktop.org/wiki/Software/systemd
 
@@ -162,11 +164,6 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD
 
 	  http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands
 
-config BR2_PACKAGE_SYSTEMD_KDBUS
-	bool "enable kdbus support"
-	help
-	  Enable kdbus support for Systemd.
-
 config BR2_PACKAGE_SYSTEMD_LOCALED
 	bool "enable locale daemon"
 	help
@@ -208,11 +205,11 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD
 	default y
 	help
 	  systemd-networkd is a system service that manages networks.
-	  It detects and configures network devices as they appear, as well as
-	  creating virtual network devices.
+	  It detects and configures network devices as they appear, as
+	  well as creating virtual network devices.
 
-	  This simple network configuration solution is an alternative to
-	  dhcpcd or ISC dhcp.
+	  This simple network configuration solution is an alternative
+	  to dhcpcd or ISC dhcp.
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-networkd.html
 
@@ -271,14 +268,14 @@ config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT
 	select BR2_PACKAGE_ATTR
 	select BR2_PACKAGE_SMACK
 	help
-	  Enable support for SMACK, the Simple Mandatory Access Control
-	  Kernel, a minimal approach to Access Control implemented as a kernel
-	  LSM.
+	  Enable support for SMACK, the Simple Mandatory Access
+	  Control Kernel, a minimal approach to Access Control
+	  implemented as a kernel LSM.
 
 	  This feature requires a kernel >= 3.8.
 
-	  When this feature is enabled, Systemd mounts smackfs and manages
-	  security labels for sockets.
+	  When this feature is enabled, Systemd mounts smackfs and
+	  manages security labels for sockets.
 
 config BR2_PACKAGE_SYSTEMD_SYSUSERS
 	bool "enable sysusers support"
@@ -302,11 +299,12 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD
 	bool "enable timesync daemon"
 	default y
 	help
-	  systemd-timesyncd is a service that may be used to synchronize the
-	  local system clock with a Network Time Protocol server.
+	  systemd-timesyncd is a service that may be used to
+	  synchronize the local system clock with a Network Time
+	  Protocol server.
 
-	  This simple NTP solution is an alternative to sntp/ntpd from the ntp
-	  package.
+	  This simple NTP solution is an alternative to sntp/ntpd from
+	  the ntp package.
 
 	  http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html
 
diff --git a/bsp/buildroot/package/systemd/systemd.hash b/bsp/buildroot/package/systemd/systemd.hash
index 0acaa3cd..d580a29b 100644
--- a/bsp/buildroot/package/systemd/systemd.hash
+++ b/bsp/buildroot/package/systemd/systemd.hash
@@ -1,2 +1,5 @@
 # sha256 locally computed
-sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880  systemd-232.tar.gz
+sha256	c83dabbe1c9de6b9db1dafdb7e04140c7d0535705c68842f6c0768653ba4913c	systemd-237.tar.gz
+sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6	LICENSE.GPL2
+sha256	dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	LICENSE.LGPL2.1
+sha256	9c7709aa401a41c4c3f33ea75c34ae5d5354d62c310c3391c2a5958952d8aadd	README
diff --git a/bsp/buildroot/package/systemd/systemd.mk b/bsp/buildroot/package/systemd/systemd.mk
index d5806741..4dea7d34 100644
--- a/bsp/buildroot/package/systemd/systemd.mk
+++ b/bsp/buildroot/package/systemd/systemd.mk
@@ -4,20 +4,20 @@
 #
 ################################################################################
 
-SYSTEMD_VERSION = 232
+SYSTEMD_VERSION = 237
 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION))
-SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README)
+SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README)
 SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README
 SYSTEMD_INSTALL_STAGING = YES
 SYSTEMD_DEPENDENCIES = \
+	host-gperf \
 	host-intltool \
-	libcap \
-	util-linux \
+	host-meson \
 	kmod \
-	host-gperf
+	libcap \
+	util-linux
 
 SYSTEMD_PROVIDES = udev
-SYSTEMD_AUTORECONF = YES
 
 # Make sure that systemd will always be built after busybox so that we have
 # a consistent init setup between two builds
@@ -26,268 +26,253 @@ SYSTEMD_DEPENDENCIES += busybox
 endif
 
 SYSTEMD_CONF_OPTS += \
-	--with-rootprefix= \
-	--enable-blkid \
-	--enable-static=no \
-	--disable-manpages \
-	--disable-pam \
-	--disable-ima \
-	--disable-libcryptsetup \
-	--disable-efi \
-	--disable-gnuefi \
-	--disable-ldconfig \
-	--disable-tests \
-	--disable-coverage \
-	--with-default-dnssec=no \
-	--without-python
-
-SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto
-
-# Override paths to a few utilities needed at runtime, to
-# avoid finding those we would install in $(HOST_DIR).
-SYSTEMD_CONF_ENV = \
-	CFLAGS="$(SYSTEMD_CFLAGS)" \
-	ac_cv_path_KILL=/usr/bin/kill \
-	ac_cv_path_KMOD=/usr/bin/kmod \
-	ac_cv_path_KEXEC=/usr/sbin/kexec \
-	ac_cv_path_SULOGIN=/usr/sbin/sulogin \
-	ac_cv_path_MOUNT_PATH=/usr/bin/mount \
-	ac_cv_path_UMOUNT_PATH=/usr/bin/umount
-
-define SYSTEMD_RUN_INTLTOOLIZE
-	cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake
-endef
-SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE
+	--prefix=/usr \
+	--libdir='/usr/lib' \
+	--buildtype $(if $(BR2_ENABLE_DEBUG),debug,release) \
+	--cross-file $(HOST_DIR)/etc/meson/cross-compilation.conf \
+	-Drootlibdir='/usr/lib' \
+	-Dblkid=true \
+	-Dman=false \
+	-Dima=false \
+	-Dlibcryptsetup=false \
+	-Defi=false \
+	-Dgnu-efi=false \
+	-Dldconfig=false \
+	-Ddefault-dnssec=no \
+	-Dtests=false \
+	-Dsystem-uid-max=999 \
+	-Dsystem-gid-max=999 \
+	-Dtelinit-path=$(TARGET_DIR)/sbin/telinit \
+	-Dkill-path=/usr/bin/kill \
+	-Dkmod-path=/usr/bin/kmod \
+	-Dkexec-path=/usr/sbin/kexec \
+	-Dsulogin-path=/usr/sbin/sulogin \
+	-Dmount-path=/usr/bin/mount \
+	-Dumount-path=/usr/bin/umount \
+	-Dnobody-group=nogroup
 
 ifeq ($(BR2_PACKAGE_ACL),y)
-SYSTEMD_CONF_OPTS += --enable-acl
 SYSTEMD_DEPENDENCIES += acl
+SYSTEMD_CONF_OPTS += -Dacl=true
 else
-SYSTEMD_CONF_OPTS += --disable-acl
+SYSTEMD_CONF_OPTS += -Dacl=false
 endif
 
 ifeq ($(BR2_PACKAGE_AUDIT),y)
-SYSTEMD_CONF_OPTS += --enable-audit
 SYSTEMD_DEPENDENCIES += audit
+SYSTEMD_CONF_OPTS += -Daudit=true
 else
-SYSTEMD_CONF_OPTS += --disable-audit
+SYSTEMD_CONF_OPTS += -Daudit=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBIDN),y)
-SYSTEMD_CONF_OPTS += --enable-libidn
 SYSTEMD_DEPENDENCIES += libidn
+SYSTEMD_CONF_OPTS += -Dlibidn=true
 else
-SYSTEMD_CONF_OPTS += --disable-libidn
+SYSTEMD_CONF_OPTS += -Dlibidn=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-SYSTEMD_CONF_OPTS += --enable-seccomp
 SYSTEMD_DEPENDENCIES += libseccomp
+SYSTEMD_CONF_OPTS += -Dseccomp=true
 else
-SYSTEMD_CONF_OPTS += --disable-seccomp
+SYSTEMD_CONF_OPTS += -Dseccomp=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y)
-SYSTEMD_CONF_OPTS += --enable-xkbcommon
 SYSTEMD_DEPENDENCIES += libxkbcommon
+SYSTEMD_CONF_OPTS += -Dxkbcommon=true
 else
-SYSTEMD_CONF_OPTS += --disable-xkbcommon
-endif
-
-ifeq ($(BR2_PACKAGE_SYSTEMD_KDBUS),y)
-SYSTEMD_CONF_OPTS += --enable-kdbus
-else
-SYSTEMD_CONF_OPTS += --disable-kdbus
+SYSTEMD_CONF_OPTS += -Dxkbcommon=false
 endif
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
 SYSTEMD_DEPENDENCIES += bzip2
-SYSTEMD_CONF_OPTS += --enable-bzip2
+SYSTEMD_CONF_OPTS += -Dbzip2=true
 else
-SYSTEMD_CONF_OPTS += --disable-bzip2
+SYSTEMD_CONF_OPTS += -Dbzip2=false
 endif
 
 ifeq ($(BR2_PACKAGE_LZ4),y)
 SYSTEMD_DEPENDENCIES += lz4
-SYSTEMD_CONF_OPTS += --enable-lz4
+SYSTEMD_CONF_OPTS += -Dlz4=true
 else
-SYSTEMD_CONF_OPTS += --disable-lz4
+SYSTEMD_CONF_OPTS += -Dlz4=false
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+SYSTEMD_DEPENDENCIES += linux-pam
+SYSTEMD_CONF_OPTS += -Dpam=true
+else
+SYSTEMD_CONF_OPTS += -Dpam=false
 endif
 
 ifeq ($(BR2_PACKAGE_XZ),y)
 SYSTEMD_DEPENDENCIES += xz
-SYSTEMD_CONF_OPTS += --enable-xz
+SYSTEMD_CONF_OPTS += -Dxz=true
 else
-SYSTEMD_CONF_OPTS += --disable-xz
+SYSTEMD_CONF_OPTS += -Dxz=false
 endif
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
 SYSTEMD_DEPENDENCIES += zlib
-SYSTEMD_CONF_OPTS += --enable-zlib
+SYSTEMD_CONF_OPTS += -Dzlib=true
 else
-SYSTEMD_CONF_OPTS += --disable-zlib
+SYSTEMD_CONF_OPTS += -Dzlib=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 SYSTEMD_DEPENDENCIES += libcurl
-SYSTEMD_CONF_OPTS += --enable-libcurl
+SYSTEMD_CONF_OPTS += -Dlibcurl=true
 else
-SYSTEMD_CONF_OPTS += --disable-libcurl
+SYSTEMD_CONF_OPTS += -Dlibcurl=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
 SYSTEMD_DEPENDENCIES += libgcrypt
-SYSTEMD_CONF_OPTS += \
-	--enable-gcrypt	\
-	--with-libgcrypt-prefix=$(STAGING_DIR)/usr \
-	--with-libgpg-error-prefix=$(STAGING_DIR)/usr
+SYSTEMD_CONF_OPTS += -Dgcrypt=true
 else
-SYSTEMD_CONF_OPTS += --disable-gcrypt
+SYSTEMD_CONF_OPTS += -Dgcrypt=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y)
 SYSTEMD_DEPENDENCIES += libmicrohttpd
-SYSTEMD_CONF_OPTS += --enable-microhttpd
+SYSTEMD_CONF_OPTS += -Dmicrohttpd=true
 ifeq ($(BR2_PACKAGE_LIBQRENCODE),y)
-SYSTEMD_CONF_OPTS += --enable-qrencode
+SYSTEMD_CONF_OPTS += -Dqrencode=true
 SYSTEMD_DEPENDENCIES += libqrencode
 else
-SYSTEMD_CONF_OPTS += --disable-qrencode
+SYSTEMD_CONF_OPTS += -Dqrencode=false
 endif
 else
-SYSTEMD_CONF_OPTS += --disable-microhttpd --disable-qrencode
+SYSTEMD_CONF_OPTS += -Dmicrohttpd=false -Dqrencode=false
 endif
 
 ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
 SYSTEMD_DEPENDENCIES += libselinux
-SYSTEMD_CONF_OPTS += --enable-selinux
+SYSTEMD_CONF_OPTS += -Dselinux=true
 else
-SYSTEMD_CONF_OPTS += --disable-selinux
+SYSTEMD_CONF_OPTS += -Dselinux=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y)
-SYSTEMD_CONF_OPTS += --enable-hwdb
+SYSTEMD_CONF_OPTS += -Dhwdb=true
 else
-SYSTEMD_CONF_OPTS += --disable-hwdb
+SYSTEMD_CONF_OPTS += -Dhwdb=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_BINFMT),y)
-SYSTEMD_CONF_OPTS += --enable-binfmt
+SYSTEMD_CONF_OPTS += -Dbinfmt=true
 else
-SYSTEMD_CONF_OPTS += --disable-binfmt
+SYSTEMD_CONF_OPTS += -Dbinfmt=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y)
-SYSTEMD_CONF_OPTS += --enable-vconsole
+SYSTEMD_CONF_OPTS += -Dvconsole=true
 else
-SYSTEMD_CONF_OPTS += --disable-vconsole
+SYSTEMD_CONF_OPTS += -Dvconsole=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y)
-SYSTEMD_CONF_OPTS += --enable-quotacheck
-SYSTEMD_CONF_ENV += \
-	ac_cv_path_QUOTAON=/usr/sbin/quotaon \
-	ac_cv_path_QUOTACHECK=/usr/sbin/quotacheck
+SYSTEMD_CONF_OPTS += -Dquotacheck=true
 else
-SYSTEMD_CONF_OPTS += --disable-quotacheck
-SYSTEMD_CONF_ENV += \
-	ac_cv_path_QUOTAON=/.missing \
-	ac_cv_path_QUOTACHECK=/.missing
+SYSTEMD_CONF_OPTS += -Dquotacheck=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y)
-SYSTEMD_CONF_OPTS += --enable-tmpfiles
+SYSTEMD_CONF_OPTS += -Dtmpfiles=true
 else
-SYSTEMD_CONF_OPTS += --disable-tmpfiles
+SYSTEMD_CONF_OPTS += -Dtmpfiles=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y)
-SYSTEMD_CONF_OPTS += --enable-sysusers
+SYSTEMD_CONF_OPTS += -Dsysusers=true
 else
-SYSTEMD_CONF_OPTS += --disable-sysusers
+SYSTEMD_CONF_OPTS += -Dsysusers=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_FIRSTBOOT),y)
-SYSTEMD_CONF_OPTS += --enable-firstboot
+SYSTEMD_CONF_OPTS += -Dfirstboot=true
 else
-SYSTEMD_CONF_OPTS += --disable-firstboot
+SYSTEMD_CONF_OPTS += -Dfirstboot=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_RANDOMSEED),y)
-SYSTEMD_CONF_OPTS += --enable-randomseed
+SYSTEMD_CONF_OPTS += -Drandomseed=true
 else
-SYSTEMD_CONF_OPTS += --disable-randomseed
+SYSTEMD_CONF_OPTS += -Drandomseed=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_BACKLIGHT),y)
-SYSTEMD_CONF_OPTS += --enable-backlight
+SYSTEMD_CONF_OPTS += -Dbacklight=true
 else
-SYSTEMD_CONF_OPTS += --disable-backlight
+SYSTEMD_CONF_OPTS += -Dbacklight=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_RFKILL),y)
-SYSTEMD_CONF_OPTS += --enable-rfkill
+SYSTEMD_CONF_OPTS += -Drfkill=true
 else
-SYSTEMD_CONF_OPTS += --disable-rfkill
+SYSTEMD_CONF_OPTS += -Drfkill=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y)
-SYSTEMD_CONF_OPTS += --enable-logind
+SYSTEMD_CONF_OPTS += -Dlogind=true
 else
-SYSTEMD_CONF_OPTS += --disable-logind
+SYSTEMD_CONF_OPTS += -Dlogind=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y)
-SYSTEMD_CONF_OPTS += --enable-machined
+SYSTEMD_CONF_OPTS += -Dmachined=true
 else
-SYSTEMD_CONF_OPTS += --disable-machined
+SYSTEMD_CONF_OPTS += -Dmachined=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_IMPORTD),y)
-SYSTEMD_CONF_OPTS += --enable-importd
+SYSTEMD_CONF_OPTS += -Dimportd=true
 else
-SYSTEMD_CONF_OPTS += --disable-importd
+SYSTEMD_CONF_OPTS += -Dimportd=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_HOSTNAMED),y)
-SYSTEMD_CONF_OPTS += --enable-hostnamed
+SYSTEMD_CONF_OPTS += -Dhostnamed=true
 else
-SYSTEMD_CONF_OPTS += --disable-hostnamed
+SYSTEMD_CONF_OPTS += -Dhostnamed=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_MYHOSTNAME),y)
-SYSTEMD_CONF_OPTS += --enable-myhostname
+SYSTEMD_CONF_OPTS += -Dmyhostname=true
 else
-SYSTEMD_CONF_OPTS += --disable-myhostname
+SYSTEMD_CONF_OPTS += -Dmyhostname=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_TIMEDATED),y)
-SYSTEMD_CONF_OPTS += --enable-timedated
+SYSTEMD_CONF_OPTS += -Dtimedated=true
 else
-SYSTEMD_CONF_OPTS += --disable-timedated
+SYSTEMD_CONF_OPTS += -Dtimedated=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_LOCALED),y)
-SYSTEMD_CONF_OPTS += --enable-localed
+SYSTEMD_CONF_OPTS += -Dlocaled=true
 else
-SYSTEMD_CONF_OPTS += --disable-localed
+SYSTEMD_CONF_OPTS += -Dlocaled=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y)
-SYSTEMD_CONF_OPTS += --enable-coredump
+SYSTEMD_CONF_OPTS += -Dcoredump=true
 SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper
 else
-SYSTEMD_CONF_OPTS += --disable-coredump
+SYSTEMD_CONF_OPTS += -Dcoredump=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_POLKIT),y)
-SYSTEMD_CONF_OPTS += --enable-polkit
+SYSTEMD_CONF_OPTS += -Dpolkit=true
+SYSTEMD_DEPENDENCIES += polkit
 else
-SYSTEMD_CONF_OPTS += --disable-polkit
+SYSTEMD_CONF_OPTS += -Dpolkit=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y)
-SYSTEMD_CONF_OPTS += --enable-networkd
+SYSTEMD_CONF_OPTS += -Dnetworkd=true
 SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager
 define SYSTEMD_INSTALL_RESOLVCONF_HOOK
 	ln -sf ../run/systemd/resolve/resolv.conf \
@@ -302,25 +287,18 @@ define SYSTEMD_INSTALL_NETWORK_CONFS
 endef
 endif
 else
-SYSTEMD_CONF_OPTS += --disable-networkd
-define SYSTEMD_INSTALL_SERVICE_NETWORK
-	$(INSTALL) -D -m 644 package/systemd/network.service \
-		$(TARGET_DIR)/etc/systemd/system/network.service
-	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
-	ln -fs ../network.service \
-		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service
-endef
+SYSTEMD_CONF_OPTS += -Dnetworkd=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y)
-SYSTEMD_CONF_OPTS += --enable-resolved
+SYSTEMD_CONF_OPTS += -Dresolve=true
 SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager
 else
-SYSTEMD_CONF_OPTS += --disable-resolved
+SYSTEMD_CONF_OPTS += -Dresolve=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y)
-SYSTEMD_CONF_OPTS += --enable-timesyncd
+SYSTEMD_CONF_OPTS += -Dtimesyncd=true
 SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization
 define SYSTEMD_INSTALL_SERVICE_TIMESYNC
 	mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
@@ -328,19 +306,24 @@ define SYSTEMD_INSTALL_SERVICE_TIMESYNC
 		$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
 endef
 else
-SYSTEMD_CONF_OPTS += --disable-timesyncd
+SYSTEMD_CONF_OPTS += -Dtimesyncd=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT),y)
-SYSTEMD_CONF_OPTS += --enable-smack
+SYSTEMD_CONF_OPTS += -Dsmack=true
 else
-SYSTEMD_CONF_OPTS += --disable-smack
+SYSTEMD_CONF_OPTS += -Dsmack=false
 endif
 
 ifeq ($(BR2_PACKAGE_SYSTEMD_HIBERNATE),y)
-SYSTEMD_CONF_OPTS += --enable-hibernate
+SYSTEMD_CONF_OPTS += -Dhibernate=true
 else
-SYSTEMD_CONF_OPTS += --disable-hibernate
+SYSTEMD_CONF_OPTS += -Dhibernate=false
+endif
+
+SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME))
+ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),)
+SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME)
 endif
 
 define SYSTEMD_INSTALL_INIT_HOOK
@@ -348,7 +331,7 @@ define SYSTEMD_INSTALL_INIT_HOOK
 	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt
 	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff
 	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot
-
+	ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/shutdown
 	ln -fs ../../../lib/systemd/system/multi-user.target \
 		$(TARGET_DIR)/etc/systemd/system/default.target
 endef
@@ -365,6 +348,8 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \
 define SYSTEMD_USERS
 	- - input -1 * - - - Input device group
 	- - systemd-journal -1 * - - - Journal
+	- - render -1 * - - - DRI rendering nodes
+	- - kvm -1 * - - - kvm nodes
 	systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus
 	systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway
 	systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote
@@ -401,9 +386,32 @@ endif
 define SYSTEMD_INSTALL_INIT_SYSTEMD
 	$(SYSTEMD_DISABLE_SERVICE_TTY1)
 	$(SYSTEMD_INSTALL_SERVICE_TTY)
-	$(SYSTEMD_INSTALL_SERVICE_NETWORK)
 	$(SYSTEMD_INSTALL_SERVICE_TIMESYNC)
 	$(SYSTEMD_INSTALL_NETWORK_CONFS)
 endef
 
-$(eval $(autotools-package))
+SYSTEMD_NINJA_OPTS = $(if $(VERBOSE),-v) -j$(PARALLEL_JOBS)
+
+SYSTEMD_ENV = $(TARGET_MAKE_ENV) $(HOST_UTF8_LOCALE_ENV)
+
+define SYSTEMD_CONFIGURE_CMDS
+	rm -rf $(@D)/build
+	mkdir -p $(@D)/build
+	$(SYSTEMD_ENV) meson $(SYSTEMD_CONF_OPTS) $(@D) $(@D)/build
+endef
+
+define SYSTEMD_BUILD_CMDS
+	$(SYSTEMD_ENV) ninja $(SYSTEMD_NINJA_OPTS) -C $(@D)/build
+endef
+
+define SYSTEMD_INSTALL_TARGET_CMDS
+	$(SYSTEMD_ENV) DESTDIR=$(TARGET_DIR) ninja $(SYSTEMD_NINJA_OPTS) \
+		-C $(@D)/build install
+endef
+
+define SYSTEMD_INSTALL_STAGING_CMDS
+	$(SYSTEMD_ENV) DESTDIR=$(STAGING_DIR) ninja $(SYSTEMD_NINJA_OPTS) \
+		-C $(@D)/build install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/sysvinit/inittab b/bsp/buildroot/package/sysvinit/inittab
index fad91eae..a3147103 100644
--- a/bsp/buildroot/package/sysvinit/inittab
+++ b/bsp/buildroot/package/sysvinit/inittab
@@ -6,10 +6,14 @@ id:3:initdefault:
 
 si0::sysinit:/bin/mount -t proc proc /proc
 si1::sysinit:/bin/mount -o remount,rw /
-si2::sysinit:/bin/mkdir -p /dev/pts
-si3::sysinit:/bin/mkdir -p /dev/shm
-si4::sysinit:/bin/mount -a
-si5::sysinit:/bin/hostname -F /etc/hostname
+si2::sysinit:/bin/mkdir -p /dev/pts /dev/shm
+si3::sysinit:/bin/mount -a
+si4::sysinit:/sbin/swapon -a
+si5::sysinit:/bin/ln -sf /proc/self/fd /dev/fd 2>/dev/null
+si6::sysinit:/bin/ln -sf /proc/self/fd/0 /dev/stdin 2>/dev/null
+si7::sysinit:/bin/ln -sf /proc/self/fd/1 /dev/stdout 2>/dev/null
+si8::sysinit:/bin/ln -sf /proc/self/fd/2 /dev/stderr 2>/dev/null
+si9::sysinit:/bin/hostname -F /etc/hostname
 rcS:12345:wait:/etc/init.d/rcS
 
 # S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL
diff --git a/bsp/buildroot/package/sysvinit/sysvinit.mk b/bsp/buildroot/package/sysvinit/sysvinit.mk
index faefd5c9..a606ddab 100644
--- a/bsp/buildroot/package/sysvinit/sysvinit.mk
+++ b/bsp/buildroot/package/sysvinit/sysvinit.mk
@@ -8,7 +8,7 @@ SYSVINIT_VERSION = 2.88
 SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz
 SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1+squeeze1.diff.gz
 SYSVINIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/sysvinit
-SYSVINIT_LICENSE = GPLv2+
+SYSVINIT_LICENSE = GPL-2.0+
 SYSVINIT_LICENSE_FILES = COPYING
 
 SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR)
@@ -47,4 +47,14 @@ define SYSVINIT_INSTALL_TARGET_CMDS
 	ln -sf killall5 $(TARGET_DIR)/sbin/pidof
 endef
 
+ifeq ($(BR2_TARGET_GENERIC_GETTY),y)
+define SYSVINIT_SET_GETTY
+	$(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(SYSTEM_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) #~' \
+		$(TARGET_DIR)/etc/inittab
+endef
+SYSVINIT_TARGET_FINALIZE_HOOKS += SYSVINIT_SET_GETTY
+endif # BR2_TARGET_GENERIC_GETTY
+
+SYSVINIT_TARGET_FINALIZE_HOOKS += SYSTEM_REMOUNT_ROOT_INITTAB
+
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/taglib/Config.in b/bsp/buildroot/package/taglib/Config.in
index a95f332a..9e6bb707 100644
--- a/bsp/buildroot/package/taglib/Config.in
+++ b/bsp/buildroot/package/taglib/Config.in
@@ -4,9 +4,10 @@ config BR2_PACKAGE_TAGLIB
 	depends on BR2_USE_WCHAR
 	help
 	  TagLib is a library for reading and editing the meta-data of
-	  several popular audio formats. Currently it supports both ID3v1
-	  and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and
-	  Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files.
+	  several popular audio formats. Currently it supports both
+	  ID3v1 and ID3v2 for MP3 files, Ogg Vorbis comments and ID3
+	  tags and Vorbis comments in FLAC, MPC, Speex, WavPack and
+	  TrueAudio files.
 
 	  http://taglib.org/
 
diff --git a/bsp/buildroot/package/taglib/taglib.mk b/bsp/buildroot/package/taglib/taglib.mk
index 58bb889f..6f36347e 100644
--- a/bsp/buildroot/package/taglib/taglib.mk
+++ b/bsp/buildroot/package/taglib/taglib.mk
@@ -7,7 +7,7 @@
 TAGLIB_VERSION = 1.11.1
 TAGLIB_SITE = http://taglib.github.io/releases
 TAGLIB_INSTALL_STAGING = YES
-TAGLIB_LICENSE = LGPLv2.1 or MPL-1.1
+TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1
 TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL
 
 ifeq ($(BR2_PACKAGE_ZLIB),y)
diff --git a/bsp/buildroot/package/tar/Config.in b/bsp/buildroot/package/tar/Config.in
index 0eea1b84..b0be7a38 100644
--- a/bsp/buildroot/package/tar/Config.in
+++ b/bsp/buildroot/package/tar/Config.in
@@ -4,8 +4,9 @@ config BR2_PACKAGE_TAR
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	help
-	  A program that saves many files together into a single tape or disk
-	  archive, and can restore individual files from the archive.
+	  A program that saves many files together into a single tape
+	  or disk archive, and can restore individual files from the
+	  archive.
 
 	  http://www.gnu.org/software/tar/
 
diff --git a/bsp/buildroot/package/tar/tar.mk b/bsp/buildroot/package/tar/tar.mk
index 4ba28339..a8a15d95 100644
--- a/bsp/buildroot/package/tar/tar.mk
+++ b/bsp/buildroot/package/tar/tar.mk
@@ -10,7 +10,7 @@ TAR_SITE = $(BR2_GNU_MIRROR)/tar
 # busybox installs in /bin, so we need tar to install as well in /bin
 # so that it overrides the Busybox symlinks.
 TAR_CONF_OPTS = --exec-prefix=/
-TAR_LICENSE = GPLv3+
+TAR_LICENSE = GPL-3.0+
 TAR_LICENSE_FILES = COPYING
 
 # Prefer full-blown tar over buybox's version
diff --git a/bsp/buildroot/package/taskd/Config.in b/bsp/buildroot/package/taskd/Config.in
index 7d26abaa..19d123fb 100644
--- a/bsp/buildroot/package/taskd/Config.in
+++ b/bsp/buildroot/package/taskd/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_TASKD
 	bool "taskd"
+	depends on !BR2_STATIC_LIBS # gnutls
 	depends on BR2_USE_WCHAR # gnutls
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -11,6 +12,7 @@ config BR2_PACKAGE_TASKD
 
 	  http://taskwarrior.org/
 
-comment "taskd needs a toolchain w/ C++, wchar"
+comment "taskd needs a toolchain w/ C++, wchar, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \
+		BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch b/bsp/buildroot/package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch
new file mode 100644
index 00000000..fd2d61f3
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/0001-agent-add-install-target-to-the-CMakeLists.patch
@@ -0,0 +1,48 @@
+From 96c43b223c90746cb2f680d6d5e198afc690dd4d Mon Sep 17 00:00:00 2001
+From: Norbert Lange <nolange79@gmail.com>
+Date: Mon, 4 Dec 2017 10:56:45 +0100
+Subject: [PATCH] agent: add install target to the CMakeLists
+
+It is common for CMake packages to make sure that 'make install'
+works properly, and that's what most users expect.
+
+More specifically, build systems such as Buildroot also expect
+'make install' to do the right thing for CMake-based packages
+
+Signed-off-by: Norbert Lange <nolange79@gmail.com>
+---
+ agent/CMakeLists.txt | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/agent/CMakeLists.txt b/agent/CMakeLists.txt
+index aef15b96..605862b2 100644
+--- a/agent/CMakeLists.txt
++++ b/agent/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ # -*- cmake -*-
+ 
+ cmake_minimum_required(VERSION 2.8)
++project(tcfagent C)
++include(GNUInstallDirs)
+ 
+ set(CMAKE_COLOR_MAKEFILE OFF)
+ 
+@@ -43,3 +45,15 @@ message(STATUS "machine:" ${TCF_MACHINE})
+ 
+ add_executable(agent tcf/main/main.c)
+ target_link_libraries(agent ${TCF_LIB_NAME})
++
++# executable and library cant have the same target name,
++# but we can rename the output
++set_target_properties(agent
++        PROPERTIES OUTPUT_NAME tcf-agent)
++
++# add target to install all outputs
++install(TARGETS agent ${TCF_LIB_NAME}
++  RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}
++  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch b/bsp/buildroot/package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch
new file mode 100644
index 00000000..5c820394
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/0002-linux-remove-explicit-uses-of-__ptrace_request.patch
@@ -0,0 +1,103 @@
+From 3e662598e1d9ad682e470988764c3af5b1a78cb7 Mon Sep 17 00:00:00 2001
+From: Norbert Lange <nolange79@gmail.com>
+Date: Fri, 1 Dec 2017 13:15:50 +0100
+Subject: [PATCH] linux: remove explicit uses of __ptrace_request
+
+This type is not to be used directly, and with musl it wont build
+
+Signed-off-by: Norbert Lange <nolange79@gmail.com>
+---
+ agent/machine/arm/tcf/cpudefs-mdep.c       |  4 ++--
+ agent/machine/arm/tcf/regset-mdep.h        |  4 ++--
+ agent/system/GNU/Linux/tcf/context-linux.c | 18 +++++++++---------
+ 3 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/agent/machine/arm/tcf/cpudefs-mdep.c b/agent/machine/arm/tcf/cpudefs-mdep.c
+index 27ab0129..0bc8b146 100644
+--- a/agent/machine/arm/tcf/cpudefs-mdep.c
++++ b/agent/machine/arm/tcf/cpudefs-mdep.c
+@@ -89,10 +89,10 @@ static RegisterDefinition * lr_def = NULL;
+ static RegisterDefinition * cpsr_def = NULL;
+ 
+ #if !defined(PTRACE_GETHBPREGS)
+-#define PTRACE_GETHBPREGS (enum __ptrace_request)29
++#define PTRACE_GETHBPREGS 29
+ #endif
+ #if !defined(PTRACE_SETHBPREGS)
+-#define PTRACE_SETHBPREGS (enum __ptrace_request)30
++#define PTRACE_SETHBPREGS 30
+ #endif
+ 
+ #define ARM_DEBUG_ARCH_V6       1
+diff --git a/agent/machine/arm/tcf/regset-mdep.h b/agent/machine/arm/tcf/regset-mdep.h
+index e5516042..893ba64f 100644
+--- a/agent/machine/arm/tcf/regset-mdep.h
++++ b/agent/machine/arm/tcf/regset-mdep.h
+@@ -28,11 +28,11 @@
+ #endif
+ 
+ #ifndef PTRACE_GETREGSET
+-#define PTRACE_GETREGSET (enum __ptrace_request)0x4204
++#define PTRACE_GETREGSET 0x4204
+ #endif
+ 
+ #ifndef PTRACE_SETREGSET
+-#define PTRACE_SETREGSET (enum __ptrace_request)0x4205
++#define PTRACE_SETREGSET 0x4205
+ #endif
+ 
+ struct regset_gp {
+diff --git a/agent/system/GNU/Linux/tcf/context-linux.c b/agent/system/GNU/Linux/tcf/context-linux.c
+index d4eb5e6b..4c86021e 100644
+--- a/agent/system/GNU/Linux/tcf/context-linux.c
++++ b/agent/system/GNU/Linux/tcf/context-linux.c
+@@ -60,10 +60,10 @@
+ #endif
+ 
+ #if !defined(PTRACE_SETOPTIONS)
+-#define PTRACE_SETOPTIONS       (enum __ptrace_request)0x4200
+-#define PTRACE_GETEVENTMSG      (enum __ptrace_request)0x4201
+-#define PTRACE_GETSIGINFO       (enum __ptrace_request)0x4202
+-#define PTRACE_SETSIGINFO       (enum __ptrace_request)0x4203
++#define PTRACE_SETOPTIONS       0x4200
++#define PTRACE_GETEVENTMSG      0x4201
++#define PTRACE_GETSIGINFO       0x4202
++#define PTRACE_SETSIGINFO       0x4203
+ 
+ #define PTRACE_O_TRACESYSGOOD   0x00000001
+ #define PTRACE_O_TRACEFORK      0x00000002
+@@ -85,8 +85,8 @@
+ 
+ #if defined(__arm__) || defined(__aarch64__)
+ #if !defined(PTRACE_GETVFPREGS)
+-#define PTRACE_GETVFPREGS       (enum __ptrace_request)27
+-#define PTRACE_SETVFPREGS       (enum __ptrace_request)28
++#define PTRACE_GETVFPREGS       27
++#define PTRACE_SETVFPREGS       28
+ #endif
+ #endif
+ 
+@@ -483,7 +483,7 @@ static const char * get_ptrace_cmd_name(int cmd) {
+ static int do_single_step(Context * ctx) {
+     uint32_t is_cont = 0;
+     ContextExtensionLinux * ext = EXT(ctx);
+-    enum __ptrace_request cmd = PTRACE_SINGLESTEP;
++    int cmd = PTRACE_SINGLESTEP;
+ 
+     assert(!ext->pending_step);
+ 
+@@ -540,9 +540,9 @@ int context_continue(Context * ctx) {
+     int signal = 0;
+     ContextExtensionLinux * ext = EXT(ctx);
+ #if USE_PTRACE_SYSCALL
+-    enum __ptrace_request cmd = PTRACE_SYSCALL;
++    int cmd = PTRACE_SYSCALL;
+ #else
+-    enum __ptrace_request cmd = PTRACE_CONT;
++    int cmd = PTRACE_CONT;
+ #endif
+ 
+     assert(is_dispatch_thread());
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch b/bsp/buildroot/package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch
new file mode 100644
index 00000000..8532307d
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/0003-linux-provide-canonicalize_file_name-for-all-c-libs-.patch
@@ -0,0 +1,46 @@
+From 1323aa4459004b9817f0cfbf4b59c31480d527cf Mon Sep 17 00:00:00 2001
+From: Norbert Lange <nolange79@gmail.com>
+Date: Fri, 1 Dec 2017 13:34:08 +0100
+Subject: [PATCH] linux: provide canonicalize_file_name for all c libs except
+ glibc
+
+musl was not covered so far, and this library does not define a
+macro for detection.
+unless glibc is detected, a canonicalize_file_name implementation
+will be provided.
+
+Signed-off-by: Norbert Lange <nolange79@gmail.com>
+---
+ agent/tcf/framework/mdep.c | 2 +-
+ agent/tcf/framework/mdep.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/agent/tcf/framework/mdep.c b/agent/tcf/framework/mdep.c
+index 8aee811f..d38036be 100644
+--- a/agent/tcf/framework/mdep.c
++++ b/agent/tcf/framework/mdep.c
+@@ -1097,7 +1097,7 @@ char * canonicalize_file_name(const char * path) {
+     return strdup(res);
+ }
+ 
+-#elif defined(__UCLIBC__)
++#elif defined(__UCLIBC__) || !defined(__GLIBC_)
+ 
+ char * canonicalize_file_name(const char * path) {
+     return realpath(path, NULL);
+diff --git a/agent/tcf/framework/mdep.h b/agent/tcf/framework/mdep.h
+index f90f03f2..3e331383 100644
+--- a/agent/tcf/framework/mdep.h
++++ b/agent/tcf/framework/mdep.h
+@@ -292,7 +292,7 @@ extern int loc_clock_gettime(int, struct timespec *);
+ 
+ #define O_BINARY 0
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__sun__)
++#if (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) || defined(__sun__)) | !defined (__GLIBC__)
+ #  define O_LARGEFILE 0
+ extern char ** environ;
+ extern char * canonicalize_file_name(const char * path);
+-- 
+2.15.1
+
diff --git a/bsp/buildroot/package/tcf-agent/Config.in b/bsp/buildroot/package/tcf-agent/Config.in
new file mode 100644
index 00000000..9cd28310
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/Config.in
@@ -0,0 +1,42 @@
+config BR2_PACKAGE_TCF_AGENT
+	bool "tcf-agent"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS
+	depends on BR2_USE_MMU # util-linux
+	select BR2_PACKAGE_UTIL_LINUX
+	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
+	help
+	  Target Communication Framework Agent is an example
+	  application using the Target Communication Framework
+	  Library.
+
+	  Target Communication Framework is universal, extensible,
+	  simple, lightweight, vendor agnostic framework for tools and
+	  targets to communicate for purpose of debugging, profiling,
+	  code patching and other device software development needs.
+
+	  tcf-agent is a daemon, which provides TCF services that can
+	  be used by local and remote clients.
+
+	  https://wiki.eclipse.org/TCF
+
+config BR2_PACKAGE_TCF_AGENT_ARCH
+	string
+	default "arm"        if BR2_arm || BR2_armeb
+	default "a64"        if BR2_aarch64 || BR2_aarch64_be
+	default "i686"       if BR2_i386 && BR2_ARCH="i686"
+	default "i386"       if BR2_i386 && !BR2_ARCH="i686"
+	default "x86_64"     if BR2_x86_64
+	default "powerpc"    if BR2_powerpc || BR2_powerpcle
+#	those architectures fail to build currently
+#	default "ppc64"      if BR2_powerpc64 || BR2_powerpc64le
+#	default "microblaze" if BR2_microblaze || BR2_microblazeel
+
+config BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS
+	bool
+	default y if BR2_PACKAGE_TCF_AGENT_ARCH != ""
+
+comment "tcf-agent needs a toolchain w/ threads"
+	depends on BR2_PACKAGE_TCF_AGENT_ARCH_SUPPORTS
+	depends on BR2_USE_MMU
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/tcf-agent/S55tcf-agent b/bsp/buildroot/package/tcf-agent/S55tcf-agent
new file mode 100755
index 00000000..4418a543
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/S55tcf-agent
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+DAEMON_PATH=/usr/sbin/tcf-agent
+DAEMON_NAME=tcf-agent
+DAEMON_ARGS="-L- -l0"
+
+PIDFILE=/var/run/$DAEMON_NAME.pid
+[ -r /etc/default/$DAEMON_NAME ] && . /etc/default/$DAEMON_NAME
+
+start() {
+	printf "Starting $DAEMON_NAME: "
+	start-stop-daemon -S -o -q -p $PIDFILE -m -b \
+		-x $DAEMON_PATH -- $DAEMON_ARGS
+
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+
+stop() {
+	printf "Stopping $DAEMON_NAME: "
+	start-stop-daemon -K -o -q -p $PIDFILE \
+		-x $DAEMON_PATH
+
+	[ $? = 0 ] && echo "OK" || echo "FAIL"
+}
+
+case "$1" in
+	start)
+	start
+	;;
+	stop)
+	stop
+	;;
+	restart|reload)
+	stop
+	start
+	;;
+	*)
+	echo "Usage: $0 {start|stop|restart}"
+	exit 1
+esac
diff --git a/bsp/buildroot/package/tcf-agent/tcf-agent.hash b/bsp/buildroot/package/tcf-agent/tcf-agent.hash
new file mode 100644
index 00000000..d46d5206
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/tcf-agent.hash
@@ -0,0 +1,5 @@
+# Locally computed:
+sha256  94e9277a52929791417d59b515235bf28ca29ffb05c9e89ad331ebc3256fb5df  org.eclipse.tcf.agent-1.6.0.tar.gz
+
+# Hash for license files:
+sha256  f82d01b74a513bd3504d08136026a5ac2a7e6ff62ebcde391fa74aa222d11ce0  agent/edl-v10.html
diff --git a/bsp/buildroot/package/tcf-agent/tcf-agent.mk b/bsp/buildroot/package/tcf-agent/tcf-agent.mk
new file mode 100644
index 00000000..7b615d31
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/tcf-agent.mk
@@ -0,0 +1,37 @@
+################################################################################
+#
+# tcf-agent
+#
+################################################################################
+
+TCF_AGENT_VERSION = 1.6.0
+# the tar.xz link was broken the time this file got authored
+TCF_AGENT_SOURCE = org.eclipse.tcf.agent-$(TCF_AGENT_VERSION).tar.gz
+TCF_AGENT_SITE = http://git.eclipse.org/c/tcf/org.eclipse.tcf.agent.git/snapshot
+# see https://wiki.spdx.org/view/Legal_Team/License_List/Licenses_Under_Consideration
+TCF_AGENT_LICENSE = BSD-3-Clause
+TCF_AGENT_LICENSE_FILES = agent/edl-v10.html
+
+TCF_AGENT_DEPENDENCIES = util-linux
+TCF_AGENT_SUBDIR = agent
+
+# there is not much purpose for the shared lib,
+# if wont be used (unmodifed) outside the tcf-agent application
+TCF_AGENT_CONF_OPTS = \
+	-DBUILD_SHARED_LIBS=OFF \
+	-DTCF_MACHINE=$(call qstrip,$(BR2_PACKAGE_TCF_AGENT_ARCH))
+
+define TCF_AGENT_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 package/tcf-agent/tcf-agent.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/tcf-agent.service
+	mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
+	ln -fs ../../../../usr/lib/systemd/system/tcf-agent.service \
+		$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tcf-agent.service
+endef
+
+define TCF_AGENT_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 755 package/tcf-agent/S55tcf-agent \
+		$(TARGET_DIR)/etc/init.d/S55tcf-agent
+endef
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/tcf-agent/tcf-agent.service b/bsp/buildroot/package/tcf-agent/tcf-agent.service
new file mode 100644
index 00000000..8d2023b1
--- /dev/null
+++ b/bsp/buildroot/package/tcf-agent/tcf-agent.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Target Communication Framework Agent
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/tcf-agent -L- -l0
+
+[Install]
+WantedBy=multi-user.target
diff --git a/bsp/buildroot/package/tcl/tcl.hash b/bsp/buildroot/package/tcl/tcl.hash
index b344d265..359b5433 100644
--- a/bsp/buildroot/package/tcl/tcl.hash
+++ b/bsp/buildroot/package/tcl/tcl.hash
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07  tcl8.6.6-src.tar.gz
+sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16  license.terms
diff --git a/bsp/buildroot/package/tcl/tcl.mk b/bsp/buildroot/package/tcl/tcl.mk
index ffef9cf8..b9fb7afb 100644
--- a/bsp/buildroot/package/tcl/tcl.mk
+++ b/bsp/buildroot/package/tcl/tcl.mk
@@ -8,7 +8,7 @@ TCL_VERSION_MAJOR = 8.6
 TCL_VERSION = $(TCL_VERSION_MAJOR).6
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
-TCL_LICENSE = tcl license
+TCL_LICENSE = TCL
 TCL_LICENSE_FILES = license.terms
 TCL_SUBDIR = unix
 TCL_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/tclap/Config.in b/bsp/buildroot/package/tclap/Config.in
index 667117d9..560cf331 100644
--- a/bsp/buildroot/package/tclap/Config.in
+++ b/bsp/buildroot/package/tclap/Config.in
@@ -5,13 +5,14 @@ config BR2_PACKAGE_TCLAP
 	bool "tclap"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  This is a small, flexible library that provides a simple interface
-	  for defining and accessing command line arguments. It was initially
-	  inspired by the user friendly CLAP libary. The difference is that
-	  this library is templatized, so the argument class is type
-	  independent. Type independence avoids identical-except-for-type
-	  objects, such as IntArg, FloatArg, and StringArg. While the library
-	  is not strictly compliant with the GNU or POSIX standards, it is
+	  This is a small, flexible library that provides a simple
+	  interface for defining and accessing command line
+	  arguments. It was initially inspired by the user friendly
+	  CLAP libary. The difference is that this library is
+	  templatized, so the argument class is type independent. Type
+	  independence avoids identical-except-for-type objects, such
+	  as IntArg, FloatArg, and StringArg. While the library is not
+	  strictly compliant with the GNU or POSIX standards, it is
 	  close.
 
 	  http://tclap.sourceforge.net/
diff --git a/bsp/buildroot/package/tcllib/tcllib.hash b/bsp/buildroot/package/tcllib/tcllib.hash
index eb990a2a..d08b5a17 100644
--- a/bsp/buildroot/package/tcllib/tcllib.hash
+++ b/bsp/buildroot/package/tcllib/tcllib.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  0db9e17d6c0f44d3ca2df2ea5023e35c0f3767e7008c3cb26d201446eb68add1  tcllib-1.13.tar.bz2
+sha256  530ec70eb11a455bd582d86b6d74c2dd7cc367d90b8bbdd59fcb43ae02f95a4b  license.terms
diff --git a/bsp/buildroot/package/tcllib/tcllib.mk b/bsp/buildroot/package/tcllib/tcllib.mk
index 9eb3b7db..dfa35c89 100644
--- a/bsp/buildroot/package/tcllib/tcllib.mk
+++ b/bsp/buildroot/package/tcllib/tcllib.mk
@@ -7,9 +7,9 @@
 TCLLIB_VERSION = 1.13
 TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
 TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
-TCLLIB_LICENSE = tcl license
+TCLLIB_LICENSE = TCL
 TCLLIB_LICENSE_FILES = license.terms
 TCLLIB_DEPENDENCIES = host-tcl
-TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)"
+TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/bin/tclsh$(TCL_VERSION_MAJOR)"
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tcpdump/tcpdump.mk b/bsp/buildroot/package/tcpdump/tcpdump.mk
index 7bea4bf1..2a6d095c 100644
--- a/bsp/buildroot/package/tcpdump/tcpdump.mk
+++ b/bsp/buildroot/package/tcpdump/tcpdump.mk
@@ -6,7 +6,7 @@
 
 TCPDUMP_VERSION = 4.9.2
 TCPDUMP_SITE = http://www.tcpdump.org/release
-TCPDUMP_LICENSE = BSD-3c
+TCPDUMP_LICENSE = BSD-3-Clause
 TCPDUMP_LICENSE_FILES = LICENSE
 TCPDUMP_CONF_ENV = \
 	ac_cv_linux_vers=2 \
diff --git a/bsp/buildroot/package/tcping/tcping.mk b/bsp/buildroot/package/tcping/tcping.mk
index f5919bb8..7edf45eb 100644
--- a/bsp/buildroot/package/tcping/tcping.mk
+++ b/bsp/buildroot/package/tcping/tcping.mk
@@ -6,7 +6,7 @@
 
 TCPING_VERSION = 1.3.5
 TCPING_SITE = http://linuxco.de/tcping
-TCPING_LICENSE = GPLv3+
+TCPING_LICENSE = GPL-3.0+
 TCPING_LICENSE_FILES = LICENSE
 
 define TCPING_BUILD_CMDS
diff --git a/bsp/buildroot/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch b/bsp/buildroot/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch
deleted file mode 100644
index 233b6d95..00000000
--- a/bsp/buildroot/package/tcpreplay/0001-278-fail-if-capture-has-a-packet-that-is-too-large-2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d689d14dbcd768c028eab2fb378d849e543dcfe9 Mon Sep 17 00:00:00 2001
-From: Fred Klassen <fklassen@appneta.com>
-Date: Sun, 26 Feb 2017 20:45:59 -0800
-Subject: [PATCH] #278 fail if capture has a packet that is too large (#286)
-
-* #278 fail if capture has a packet that is too large
-
-[baruch: remove the CHANGELOG update]
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Upstream status: upstream commit d689d14db
-
-diff --git a/src/tcpcapinfo.c b/src/tcpcapinfo.c
-index 775f1625b00f..96928820fe94 100644
---- a/src/tcpcapinfo.c
-+++ b/src/tcpcapinfo.c
-@@ -281,6 +281,15 @@ main(int argc, char *argv[])
-                 caplen = pcap_ph.caplen;
-             }
- 
-+            if (caplentoobig) {
-+                printf("\n\nCapture file appears to be damaged or corrupt.\n"
-+                        "Contains packet of size %u, bigger than snap length %u\n",
-+                        caplen, pcap_fh.snaplen);
-+
-+                close(fd);
-+                break;
-+            }
-+
-             /* check to make sure timestamps don't go backwards */
-             if (last_sec > 0 && last_usec > 0) {
-                 if ((pcap_ph.ts.tv_sec == last_sec) ? 
-@@ -306,7 +315,7 @@ main(int argc, char *argv[])
-                 }
- 
-                 close(fd);
--                continue;
-+                break;
-             }
- 
-             /* print the frame checksum */
--- 
-2.11.0
-
diff --git a/bsp/buildroot/package/tcpreplay/Config.in b/bsp/buildroot/package/tcpreplay/Config.in
index 2ba2eb59..5e36452c 100644
--- a/bsp/buildroot/package/tcpreplay/Config.in
+++ b/bsp/buildroot/package/tcpreplay/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_TCPREPLAY
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBPCAP
 	help
-	  Tcpreplay is a tool for replaying network traffic from files saved
-	  with tcpdump or other tools which write pcap(3) files.
+	  Tcpreplay is a tool for replaying network traffic from files
+	  saved with tcpdump or other tools which write pcap(3) files.
 
 	  http://tcpreplay.appneta.com/
diff --git a/bsp/buildroot/package/tcpreplay/tcpreplay.hash b/bsp/buildroot/package/tcpreplay/tcpreplay.hash
index e7ba4400..b033d3c3 100644
--- a/bsp/buildroot/package/tcpreplay/tcpreplay.hash
+++ b/bsp/buildroot/package/tcpreplay/tcpreplay.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea	tcpreplay-4.1.2.tar.gz
+sha256 043756c532dab93e2be33a517ef46b1341f7239278a1045ae670041dd8a4531d  tcpreplay-4.2.6.tar.gz
diff --git a/bsp/buildroot/package/tcpreplay/tcpreplay.mk b/bsp/buildroot/package/tcpreplay/tcpreplay.mk
index a8bcf1c5..adccde0e 100644
--- a/bsp/buildroot/package/tcpreplay/tcpreplay.mk
+++ b/bsp/buildroot/package/tcpreplay/tcpreplay.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TCPREPLAY_VERSION = 4.1.2
+TCPREPLAY_VERSION = 4.2.6
 TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION)
-TCPREPLAY_LICENSE = GPLv3
+TCPREPLAY_LICENSE = GPL-3.0
 TCPREPLAY_LICENSE_FILES = docs/LICENSE
 TCPREPLAY_CONF_ENV = \
 	tr_cv_libpcap_version=">= 0.7.0" \
diff --git a/bsp/buildroot/package/tegrarcm/Config.in.host b/bsp/buildroot/package/tegrarcm/Config.in.host
index 47590fa1..d8cbb947 100644
--- a/bsp/buildroot/package/tegrarcm/Config.in.host
+++ b/bsp/buildroot/package/tegrarcm/Config.in.host
@@ -2,7 +2,7 @@ config BR2_PACKAGE_HOST_TEGRARCM
 	bool "host tegrarcm"
 	depends on BR2_arm || BR2_armeb
 	help
-	  This program is used to send code to a Tegra device in recovery
-	  mode.
+	  This program is used to send code to a Tegra device in
+	  recovery mode.
 
 	  https://github.com/NVIDIA/tegrarcm
diff --git a/bsp/buildroot/package/tegrarcm/tegrarcm.mk b/bsp/buildroot/package/tegrarcm/tegrarcm.mk
index 06fd0396..ad4c317b 100644
--- a/bsp/buildroot/package/tegrarcm/tegrarcm.mk
+++ b/bsp/buildroot/package/tegrarcm/tegrarcm.mk
@@ -6,7 +6,7 @@
 
 TEGRARCM_VERSION = v1.7
 TEGRARCM_SITE = $(call github,NVIDIA,tegrarcm,$(TEGRARCM_VERSION))
-TEGRARCM_LICENSE = BSD-3c / NVIDIA Software License (src/miniloader)
+TEGRARCM_LICENSE = BSD-3-Clause / NVIDIA Software License (src/miniloader)
 TEGRARCM_LICENSE_FILES = LICENSE
 TEGRARCM_AUTORECONF = YES
 HOST_TEGRARCM_DEPENDENCIES = host-libusb host-pkgconf host-cryptopp
diff --git a/bsp/buildroot/package/tekui/Config.in b/bsp/buildroot/package/tekui/Config.in
index 1203667b..067a6dd7 100644
--- a/bsp/buildroot/package/tekui/Config.in
+++ b/bsp/buildroot/package/tekui/Config.in
@@ -1,18 +1,19 @@
 config BR2_PACKAGE_TEKUI
 	bool "tekui"
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LUAFILESYSTEM	# runtime only
 	select BR2_PACKAGE_LUAEXPAT		# runtime only
 	select BR2_PACKAGE_LUASOCKET		# runtime only
 	select BR2_PACKAGE_LUAPOSIX		# runtime only
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_PACKAGE_HAS_LUAINTERPRETER
-	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
-	  TekUI is a small, freestanding and portable graphical user interface
-	  (GUI) toolkit written in Lua and C. It was initially developed for
-	  the X Window System and has been ported to DirectFB, Windows, Nano-X
-	  and a raw framebuffer since
+	  TekUI is a small, freestanding and portable graphical user
+	  interface (GUI) toolkit written in Lua and C. It was
+	  initially developed for the X Window System and has been
+	  ported to DirectFB, Windows, Nano-X and a raw framebuffer
+	  since
 
 	  http://tekui.neoscientists.org/
 
diff --git a/bsp/buildroot/package/terminology/terminology.hash b/bsp/buildroot/package/terminology/terminology.hash
index 86f6606a..81ae5d8d 100644
--- a/bsp/buildroot/package/terminology/terminology.hash
+++ b/bsp/buildroot/package/terminology/terminology.hash
@@ -1,2 +1,2 @@
-# From https://sourceforge.net/p/enlightenment/mailman/message/35600707/
-sha256	bfed42b83bce854d35ba33a4d38373c6d42fb2c0ea0335d76420488c091692f4	terminology-1.0.0.tar.xz
+# From https://sourceforge.net/p/enlightenment/mailman/message/36026490/
+sha256	da12b8a24ca5248b2d292d9b1e19cabc61ae29b21f96d4b6f4f3e7b4feeecc16	terminology-1.1.1.tar.xz
diff --git a/bsp/buildroot/package/terminology/terminology.mk b/bsp/buildroot/package/terminology/terminology.mk
index d7e98270..ed811b3a 100644
--- a/bsp/buildroot/package/terminology/terminology.mk
+++ b/bsp/buildroot/package/terminology/terminology.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-TERMINOLOGY_VERSION = 1.0.0
+TERMINOLOGY_VERSION = 1.1.1
 TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz
 TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology
-TERMINOLOGY_LICENSE = BSD-2c
+TERMINOLOGY_LICENSE = BSD-2-Clause
 TERMINOLOGY_LICENSE_FILES = COPYING
 
 TERMINOLOGY_DEPENDENCIES = efl host-pkgconf
-TERMINOLOGY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc
+TERMINOLOGY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/bin/edje_cc
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tesseract-ocr/Config.in b/bsp/buildroot/package/tesseract-ocr/Config.in
new file mode 100644
index 00000000..3afaca77
--- /dev/null
+++ b/bsp/buildroot/package/tesseract-ocr/Config.in
@@ -0,0 +1,44 @@
+comment "tesseract-ocr needs a toolchain w/ threads, C++, gcc >= 4.8, dynamic library, wchar"
+	depends on BR2_USE_MMU
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_STATIC_LIBS || !BR2_USE_WCHAR
+
+menuconfig BR2_PACKAGE_TESSERACT_OCR
+	bool "tesseract-ocr"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_USE_WCHAR
+	select BR2_PACKAGE_LEPTONICA
+	help
+	  Tesseract is an OCR (Optical Character Recognition) engine,
+	  It can be used directly, or (for programmers) using an API.
+	  It supports a wide variety of languages.
+
+	  https://github.com/tesseract-ocr/tesseract
+
+if BR2_PACKAGE_TESSERACT_OCR
+
+comment "tesseract-ocr languages support"
+
+config BR2_PACKAGE_TESSERACT_OCR_LANG_ENG
+	bool "English"
+
+config BR2_PACKAGE_TESSERACT_OCR_LANG_FRA
+	bool "French"
+
+config BR2_PACKAGE_TESSERACT_OCR_LANG_GER
+	bool "German"
+
+config BR2_PACKAGE_TESSERACT_OCR_LANG_SPA
+	bool "Spanish"
+
+config BR2_PACKAGE_TESSERACT_OCR_LANG_CHI_SIM
+	bool "Simplified Chinese"
+
+config BR2_PACKAGE_TESSERACT_OCR_LANG_CHI_TRA
+	bool "Traditional Chinese"
+
+endif
diff --git a/bsp/buildroot/package/tesseract-ocr/tesseract-ocr.hash b/bsp/buildroot/package/tesseract-ocr/tesseract-ocr.hash
new file mode 100644
index 00000000..9bb5b522
--- /dev/null
+++ b/bsp/buildroot/package/tesseract-ocr/tesseract-ocr.hash
@@ -0,0 +1,8 @@
+# locally computed
+sha256  3fe83e06d0f73b39f6e92ed9fc7ccba3ef734877b76aa5ddaaa778fac095d996  tesseract-ocr-3.05.00.tar.gz
+sha256  c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d  eng.traineddata
+sha256  86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab  fra.traineddata
+sha256  cb7eb42a7e972cec7ef904fe81825d7b547c46df684c814fdb11a930b13bca3a  deu.traineddata
+sha256  f23985996bbcfe2b57864ccb082783c1c74c87429f04411a04a6ba4d3da2efda  spa.traineddata
+sha256  323ae74d4a2ff49e932dbb4d6282fe0e67ddfafda075ec85803ecd077207454c  chi_sim.traineddata
+sha256  774d566bd0b36e4b6c07415dfa5b6b57feb2575b1f5f231d7fe01a52dac5dd0e  chi_tra.traineddata
diff --git a/bsp/buildroot/package/tesseract-ocr/tesseract-ocr.mk b/bsp/buildroot/package/tesseract-ocr/tesseract-ocr.mk
new file mode 100644
index 00000000..9e315b23
--- /dev/null
+++ b/bsp/buildroot/package/tesseract-ocr/tesseract-ocr.mk
@@ -0,0 +1,72 @@
+################################################################################
+#
+# tesseract-ocr
+#
+################################################################################
+
+TESSERACT_OCR_VERSION = 3.05.00
+TESSERACT_OCR_DATA_VERSION = 3.04.00
+TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION))
+TESSERACT_OCR_LICENSE = Apache-2.0
+TESSERACT_OCR_LICENSE_FILES = COPYING
+
+# Source from github, no configure script provided
+TESSERACT_OCR_AUTORECONF = YES
+
+# cairo, pango and icu are optional dependencies, but only needed for
+# building training tools, which are only built explicitly with "make
+# training", which is not done by this package.
+TESSERACT_OCR_DEPENDENCIES = leptonica host-pkgconf
+TESSERACT_OCR_INSTALL_STAGING = YES
+TESSERACT_OCR_CONF_ENV = \
+	LIBLEPT_HEADERSDIR=$(STAGING_DIR)/usr/include/leptonica
+TESSERACT_OCR_CONF_OPTS = \
+	--disable-opencl
+
+# Language data files download
+ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_ENG),y)
+TESSERACT_OCR_DATA_FILES += eng.traineddata
+endif
+
+ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_FRA),y)
+TESSERACT_OCR_DATA_FILES += fra.traineddata
+endif
+
+ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_DEU),y)
+TESSERACT_OCR_DATA_FILES += deu.traineddata
+endif
+
+ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_SPA),y)
+TESSERACT_OCR_DATA_FILES += spa.traineddata
+endif
+
+ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_CHI_SIM),y)
+TESSERACT_OCR_DATA_FILES += chi_sim.traineddata
+endif
+
+ifeq ($(BR2_PACKAGE_TESSERACT_OCR_LANG_CHI_TRA),y)
+TESSERACT_OCR_DATA_FILES += chi_tra.traineddata
+endif
+
+TESSERACT_OCR_EXTRA_DOWNLOADS = \
+	$(addprefix https://github.com/tesseract-ocr/tessdata/raw/$(TESSERACT_OCR_DATA_VERSION)/,\
+		$(TESSERACT_OCR_DATA_FILES))
+
+define TESSERACT_OCR_PRECONFIGURE
+	# Autoreconf step fails due to missing m4 directory
+	mkdir -p $(@D)/m4
+endef
+
+TESSERACT_OCR_PRE_CONFIGURE_HOOKS += TESSERACT_OCR_PRECONFIGURE
+
+# Language data files installation
+define TESSERACT_OCR_INSTALL_LANG_DATA
+	$(foreach langfile,$(TESSERACT_OCR_DATA_FILES), \
+		$(INSTALL) -D -m 0644 $(DL_DIR)/$(langfile) \
+			$(TARGET_DIR)/usr/share/tessdata/$(langfile)
+	)
+endef
+
+TESSERACT_OCR_POST_INSTALL_TARGET_HOOKS += TESSERACT_OCR_INSTALL_LANG_DATA
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/thrift/Config.in b/bsp/buildroot/package/thrift/Config.in
index 0ee3f000..2fa04705 100644
--- a/bsp/buildroot/package/thrift/Config.in
+++ b/bsp/buildroot/package/thrift/Config.in
@@ -8,12 +8,12 @@ config BR2_PACKAGE_THRIFT
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
 	help
-	  The Apache Thrift software framework, for scalable cross-language
-	  services development, combines a software stack with a
-	  code generation engine to build services that work
-	  efficiently and seamlessly between C++, Java, Python, PHP, Ruby,
-	  Erlang, Perl, Haskell, C#, Cocoa, JavaScript, Node.js, Smalltalk,
-	  OCaml and Delphi and other languages.
+	  The Apache Thrift software framework, for scalable
+	  cross-language services development, combines a software
+	  stack with a code generation engine to build services that
+	  work efficiently and seamlessly between C++, Java, Python,
+	  PHP, Ruby, Erlang, Perl, Haskell, C#, Cocoa, JavaScript,
+	  Node.js, Smalltalk, OCaml and Delphi and other languages.
 
 	  http://thrift.apache.org/
 
diff --git a/bsp/buildroot/package/thrift/thrift.mk b/bsp/buildroot/package/thrift/thrift.mk
index 185e1ec1..741d33f5 100644
--- a/bsp/buildroot/package/thrift/thrift.mk
+++ b/bsp/buildroot/package/thrift/thrift.mk
@@ -21,7 +21,7 @@ HOST_THRIFT_CONF_OPTS = --with-sysroot=$(HOST_DIR) \
 	--disable-tests \
 	--disable-tutorial
 THRIFT_AUTORECONF = YES
-THRIFT_AUTORECONF_OPTS = -I $(HOST_DIR)/usr/share/autoconf-archive
+THRIFT_AUTORECONF_OPTS = -I $(HOST_DIR)/share/autoconf-archive
 THRIFT_LICENSE = Apache-2.0
 THRIFT_LICENSE_FILES = LICENSE
 
@@ -63,7 +63,7 @@ endef
 THRIFT_POST_PATCH_HOOKS += THRIFT_TOOL_NO_HARDCODE
 
 define THRIFT_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) THRIFT=$(HOST_DIR)/usr/bin/thrift -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) THRIFT=$(HOST_DIR)/bin/thrift -C $(@D)
 endef
 
 # Install runtime only
@@ -75,4 +75,4 @@ $(eval $(autotools-package))
 $(eval $(host-autotools-package))
 
 # to be used by other packages
-THRIFT = $(HOST_DIR)/usr/bin/thrift
+THRIFT = $(HOST_DIR)/bin/thrift
diff --git a/bsp/buildroot/package/thttpd/Config.in b/bsp/buildroot/package/thttpd/Config.in
index d3597854..66537aa2 100644
--- a/bsp/buildroot/package/thttpd/Config.in
+++ b/bsp/buildroot/package/thttpd/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_THTTPD
 	bool "thttpd"
 	depends on BR2_USE_MMU # fork()
 	help
-	  thttpd is a simple, small, portable, fast, and secure HTTP server
+	  thttpd is a simple, small, portable, fast, and secure HTTP
+	  server
 
 	  http://www.acme.com/software/thttpd/
diff --git a/bsp/buildroot/package/thttpd/thttpd.mk b/bsp/buildroot/package/thttpd/thttpd.mk
index 5b4b0c45..f1bee013 100644
--- a/bsp/buildroot/package/thttpd/thttpd.mk
+++ b/bsp/buildroot/package/thttpd/thttpd.mk
@@ -8,7 +8,7 @@ THTTPD_VERSION = 2.25b
 THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz
 THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
 THTTPD_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd
-THTTPD_LICENSE = BSD-2c
+THTTPD_LICENSE = BSD-2-Clause
 THTTPD_LICENSE_FILES = thttpd.c
 
 ifneq ($(THTTPD_PATCH),)
diff --git a/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk b/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk
index 4849543e..0b9a64b3 100644
--- a/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk
+++ b/bsp/buildroot/package/ti-cgt-pru/ti-cgt-pru.mk
@@ -8,8 +8,7 @@ TI_CGT_PRU_VERSION = 2.2.1
 TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin
 TI_CGT_PRU_SITE = http://downloads.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION)
 TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \
-	Boost Software License 1.0 (compiler), \
-	BSD-2c, BSD-3c, MIT, Academic Free License 3.0, Hewlett-Packard (PRU library)
+	BSL-1.0 (compiler), BSD-2-Clause, BSD-3-Clause, MIT, AFL-3.0, Hewlett-Packard (PRU library)
 TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \
 	pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx
 
@@ -21,10 +20,10 @@ define HOST_TI_CGT_PRU_EXTRACT_CMDS
 endef
 
 # Since this is largely prebuilt toolchain and likes to live in its
-# own directory, put it in $(HOST_DIR)/usr/share/ti-cgt-pru/.
+# own directory, put it in $(HOST_DIR)/share/ti-cgt-pru/.
 # Packages wanting to use this toolchain need to use this path as TI's
 # standard PRU_CGT path e.g. make PRU_CGT=$(TI_CGT_PRU_INSTALLDIR)...
-TI_CGT_PRU_INSTALLDIR = $(HOST_DIR)/usr/share/ti-cgt-pru
+TI_CGT_PRU_INSTALLDIR = $(HOST_DIR)/share/ti-cgt-pru
 
 define HOST_TI_CGT_PRU_INSTALL_CMDS
 	mkdir -p $(TI_CGT_PRU_INSTALLDIR)
diff --git a/bsp/buildroot/package/ti-gfx/Config.in b/bsp/buildroot/package/ti-gfx/Config.in
index dc49d822..76aabcb8 100644
--- a/bsp/buildroot/package/ti-gfx/Config.in
+++ b/bsp/buildroot/package/ti-gfx/Config.in
@@ -32,8 +32,9 @@ config BR2_PACKAGE_PROVIDES_POWERVR
 config BR2_PACKAGE_TI_GFX_DEBUG
 	bool "enable debug support"
 	help
-	  Turns on debugging in the kernel module, install libraries built with
-	  debugging enabled, installs various tests and installs esrev script.
+	  Turns on debugging in the kernel module, install libraries
+	  built with debugging enabled, installs various tests and
+	  installs esrev script.
 
 config BR2_PACKAGE_TI_GFX_DEMOS
 	bool "install demos"
@@ -50,8 +51,8 @@ choice
 	prompt "Target"
 	default BR2_PACKAGE_TI_GFX_ES3
 	help
-	  Select the SOC for which you would like to install drivers. Please use the
-	  chart at
+	  Select the SOC for which you would like to install
+	  drivers. Please use the chart at
 	  http://processors.wiki.ti.com/index.php/OMAP35x_Graphics_SDK_Getting_Started_Guide
 
 config BR2_PACKAGE_TI_GFX_ES3
diff --git a/bsp/buildroot/package/ti-sgx-km/ti-sgx-km.mk b/bsp/buildroot/package/ti-sgx-km/ti-sgx-km.mk
index 48c8a6d1..db74da9b 100644
--- a/bsp/buildroot/package/ti-sgx-km/ti-sgx-km.mk
+++ b/bsp/buildroot/package/ti-sgx-km/ti-sgx-km.mk
@@ -7,7 +7,7 @@
 # This correpsonds to SDK 02.00.00.00
 TI_SGX_KM_VERSION = 2b7523d07a13ab704a24a7664749551f4a13ed32
 TI_SGX_KM_SITE = git://git.ti.com/graphics/omap5-sgx-ddk-linux.git
-TI_SGX_KM_LICENSE = GPLv2
+TI_SGX_KM_LICENSE = GPL-2.0
 TI_SGX_KM_LICENSE_FILES = GPL-COPYING
 
 TI_SGX_KM_DEPENDENCIES = linux
diff --git a/bsp/buildroot/package/ti-uim/ti-uim.hash b/bsp/buildroot/package/ti-uim/ti-uim.hash
new file mode 100644
index 00000000..ea64540b
--- /dev/null
+++ b/bsp/buildroot/package/ti-uim/ti-uim.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 da8a66968f4bf99366ab2b63baf358d937a6b1a5636ef6179c3aa7c852cbd1b2 ti-uim-a0236bc252e6484835ce266ae4a50b361f6a902d.tar.gz
diff --git a/bsp/buildroot/package/ti-uim/ti-uim.mk b/bsp/buildroot/package/ti-uim/ti-uim.mk
index b4981800..8b1678f6 100644
--- a/bsp/buildroot/package/ti-uim/ti-uim.mk
+++ b/bsp/buildroot/package/ti-uim/ti-uim.mk
@@ -4,9 +4,10 @@
 #
 ################################################################################
 
-TI_UIM_VERSION = c73894456df5def97111cb33d2106b684b8b7959
-TI_UIM_SITE = git://gitorious.org/uim/uim.git
-TI_UIM_LICENSE = GPLv2+
+TI_UIM_VERSION = a0236bc252e6484835ce266ae4a50b361f6a902d
+TI_UIM_SITE = $(call github,96boards,uim,$(TI_UIM_VERSION))
+TI_UIM_LICENSE = GPL-2.0+
+TI_UIM_LICENSE_FILES = uim.h
 
 define TI_UIM_BUILD_CMDS
 	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
diff --git a/bsp/buildroot/package/ti-utils/Config.in b/bsp/buildroot/package/ti-utils/Config.in
index e48e10bd..99232348 100644
--- a/bsp/buildroot/package/ti-utils/Config.in
+++ b/bsp/buildroot/package/ti-utils/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_TI_UTILS
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
 	select BR2_PACKAGE_LIBNL
 	help
-	  The calibrator and other useful utilities for TI wireless solution,
-	  based on wl12xx driver.
+	  The calibrator and other useful utilities for TI wireless
+	  solution, based on wl12xx driver.
 
-	  http://linuxwireless.org/en/users/Drivers/wl12xx/calibrator
+	  http://linuxwireless.sipsolutions.net/en/users/Drivers/wl12xx/calibrator/
 
 comment "ti-utils needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/ti-utils/ti-utils.mk b/bsp/buildroot/package/ti-utils/ti-utils.mk
index cfb0cb87..73048080 100644
--- a/bsp/buildroot/package/ti-utils/ti-utils.mk
+++ b/bsp/buildroot/package/ti-utils/ti-utils.mk
@@ -7,7 +7,7 @@
 TI_UTILS_VERSION = 06dbdb2727354b5f3ad7c723897f40051fddee49
 TI_UTILS_SITE = $(call github,gxk,ti-utils,$(TI_UTILS_VERSION))
 TI_UTILS_DEPENDENCIES = libnl host-pkgconf
-TI_UTILS_LICENSE = BSD-3c
+TI_UTILS_LICENSE = BSD-3-Clause
 TI_UTILS_LICENSE_FILES = COPYING
 
 TI_UTILS_CFLAGS = `$(PKG_CONFIG_HOST_BINARY) --cflags libnl-genl-3.0`
diff --git a/bsp/buildroot/package/tiff/Config.in b/bsp/buildroot/package/tiff/Config.in
index 092a7f3f..f842c2ea 100644
--- a/bsp/buildroot/package/tiff/Config.in
+++ b/bsp/buildroot/package/tiff/Config.in
@@ -37,8 +37,8 @@ config BR2_PACKAGE_TIFF_MDI
 
 config BR2_PACKAGE_TIFF_ZLIB
 	bool "Zlib usage (required for Deflate compression)"
-	select BR2_PACKAGE_ZLIB
 	default y
+	select BR2_PACKAGE_ZLIB
 
 config BR2_PACKAGE_TIFF_XZ
 	bool "XZ compression"
@@ -46,13 +46,13 @@ config BR2_PACKAGE_TIFF_XZ
 
 config BR2_PACKAGE_TIFF_PIXARLOG
 	bool "Pixar log-format algorithm (requires Zlib)"
-	select BR2_PACKAGE_TIFF_ZLIB
 	default y
+	select BR2_PACKAGE_TIFF_ZLIB
 
 config BR2_PACKAGE_TIFF_JPEG
 	bool "JPEG compression"
-	select BR2_PACKAGE_JPEG
 	default y
+	select BR2_PACKAGE_JPEG
 
 config BR2_PACKAGE_TIFF_OLD_JPEG
 	bool "Old JPEG decompression"
diff --git a/bsp/buildroot/package/tiff/tiff.mk b/bsp/buildroot/package/tiff/tiff.mk
index ad85a47a..405cb925 100644
--- a/bsp/buildroot/package/tiff/tiff.mk
+++ b/bsp/buildroot/package/tiff/tiff.mk
@@ -11,7 +11,7 @@ TIFF_LICENSE_FILES = COPYRIGHT
 TIFF_INSTALL_STAGING = YES
 TIFF_CONF_OPTS = \
 	--disable-cxx \
-	--without-x \
+	--without-x
 
 TIFF_DEPENDENCIES = host-pkgconf
 
diff --git a/bsp/buildroot/package/time/time.hash b/bsp/buildroot/package/time/time.hash
index 6ad8c24e..7d395bfb 100644
--- a/bsp/buildroot/package/time/time.hash
+++ b/bsp/buildroot/package/time/time.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d	time-1.7.tar.gz
+sha256	8a2f540155961a35ba9b84aec5e77e3ae36c74cecb4484db455960601b7a2e1b	time-1.8.tar.gz
+sha256	8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903	COPYING
diff --git a/bsp/buildroot/package/time/time.mk b/bsp/buildroot/package/time/time.mk
index 56f28ff4..c238ee6e 100644
--- a/bsp/buildroot/package/time/time.mk
+++ b/bsp/buildroot/package/time/time.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-TIME_VERSION = 1.7
+TIME_VERSION = 1.8
 TIME_SITE = $(BR2_GNU_MIRROR)/time
 TIME_CONF_ENV = ac_cv_func_wait3=yes
-TIME_LICENSE = GPLv2+
+TIME_LICENSE = GPL-3.0+
 TIME_LICENSE_FILES = COPYING
 
 # time uses an old version of automake that does not support
diff --git a/bsp/buildroot/package/tinc/Config.in b/bsp/buildroot/package/tinc/Config.in
index 1d8e2c42..837f556b 100644
--- a/bsp/buildroot/package/tinc/Config.in
+++ b/bsp/buildroot/package/tinc/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_TINC
 	bool "tinc"
+	depends on !BR2_STATIC_LIBS # tinc requires libdl for OpenSSL
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
-	depends on !BR2_STATIC_LIBS # tinc requires libdl for OpenSSL
-	depends on BR2_USE_MMU # fork()
 	help
 	  tinc is a Virtual Private Network (VPN) daemon that uses
 	  tunnelling and encryption to create a secure private network
diff --git a/bsp/buildroot/package/tinc/tinc.hash b/bsp/buildroot/package/tinc/tinc.hash
index 135a4f39..b0cdde83 100644
--- a/bsp/buildroot/package/tinc/tinc.hash
+++ b/bsp/buildroot/package/tinc/tinc.hash
@@ -1,2 +1,4 @@
 # Locally calculated after checking pgp signature
-sha256	abc17e25afc1b9e74423c78fef586b11d503cbbbe5e4a2ed323870f4a82faa73 tinc-1.0.30.tar.gz
+sha256	7f6f5dc6444bc651ac635c81f4745bcce581bbd1d45ed60cbdc4ee11bebb10f4 tinc-1.0.33.tar.gz
+sha256  10618781fe68ee0958d627f9f4b279b55eaff6c852f7742bbef64dc470c0077c COPYING
+sha256  9bf76a8aa304d807df20bf3d221c21d259764be63e39b58f299b80ba3ac14b5b COPYING.README
diff --git a/bsp/buildroot/package/tinc/tinc.mk b/bsp/buildroot/package/tinc/tinc.mk
index 6d87cbf1..00278530 100644
--- a/bsp/buildroot/package/tinc/tinc.mk
+++ b/bsp/buildroot/package/tinc/tinc.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-TINC_VERSION = 1.0.30
+TINC_VERSION = 1.0.33
 TINC_SITE = http://www.tinc-vpn.org/packages
 TINC_DEPENDENCIES = lzo openssl zlib
-TINC_LICENSE = GPLv2+ with OpenSSL exception
+TINC_LICENSE = GPL-2.0+ with OpenSSL exception
 TINC_LICENSE_FILES = COPYING COPYING.README
 TINC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99"
 
@@ -17,4 +17,9 @@ TINC_CONF_ENV += \
 	ax_cv_check_ldflags___pie=no
 endif
 
+ifeq ($(BR2_INIT_SYSTEMD),y)
+TINC_DEPENDENCIES += systemd
+TINC_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tinyalsa/0001-disable-doxygen-usage.patch b/bsp/buildroot/package/tinyalsa/0001-disable-doxygen-usage.patch
index 9c867a8f..ed939fb9 100644
--- a/bsp/buildroot/package/tinyalsa/0001-disable-doxygen-usage.patch
+++ b/bsp/buildroot/package/tinyalsa/0001-disable-doxygen-usage.patch
@@ -4,29 +4,32 @@ In order to avoid a dependency on doxygen on the build machine, this
 patch adjusts the main Makefile to not build and install the
 documentation.
 
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[Vincent: tweak patch for 1.1.1 version]
 
-Index: b/Makefile
-===================================================================
---- a/Makefile
-+++ b/Makefile
-@@ -13,13 +13,11 @@
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+
+diff -rup a/Makefile b/Makefile
+--- a/Makefile	2017-05-24 05:23:57.000000000 +0100
++++ b/Makefile	2017-05-25 10:35:20.781747053 +0100
+@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man
  all:
  	$(MAKE) -C src
  	$(MAKE) -C utils
 -	$(MAKE) -C doxygen
+ 	$(MAKE) -C examples
  
  .PHONY: clean
  clean:
  	$(MAKE) -C src clean
  	$(MAKE) -C utils clean
 -	$(MAKE) -C doxygen clean
+ 	$(MAKE) -C examples clean
  
  .PHONY: install
- install:
-@@ -27,5 +25,3 @@
- 	cp -Ru include/tinyalsa $(DESTDIR)$(INCDIR)/
+@@ -30,5 +28,4 @@ install:
+ 	install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/
  	$(MAKE) -C src install
  	$(MAKE) -C utils install
 -	$(MAKE) -C doxygen install
--
+ 
diff --git a/bsp/buildroot/package/tinyalsa/0002-interval.h-add-missing-header.patch b/bsp/buildroot/package/tinyalsa/0002-interval.h-add-missing-header.patch
new file mode 100644
index 00000000..c043145b
--- /dev/null
+++ b/bsp/buildroot/package/tinyalsa/0002-interval.h-add-missing-header.patch
@@ -0,0 +1,36 @@
+From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 2 Jun 2017 12:19:03 +0300
+Subject: [PATCH] interval.h: add missing header
+
+The ssize_t type requires the unistd.h header. This fixes build with musl
+libc:
+
+In file included from ../include/tinyalsa/limits.h:32:0,
+                 from limits.c:1:
+../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t'
+  ssize_t max;
+  ^
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98
+
+ include/tinyalsa/interval.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h
+index 3f6f3dce5d90..068571df5a63 100644
+--- a/include/tinyalsa/interval.h
++++ b/include/tinyalsa/interval.h
+@@ -30,6 +30,7 @@
+ #define TINYALSA_INTERVAL_H
+ 
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ /** A closed range signed interval. */
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/tinyalsa/Config.in b/bsp/buildroot/package/tinyalsa/Config.in
index 9ee47676..d9ce22c8 100644
--- a/bsp/buildroot/package/tinyalsa/Config.in
+++ b/bsp/buildroot/package/tinyalsa/Config.in
@@ -8,8 +8,8 @@ config BR2_PACKAGE_TINYALSA
 
 	  - Provide a basic pcm and mixer API
 	  - If it's not absolutely needed, don't add it to the API
-	  - Avoid supporting complex and unnecessary operations that could be dealt
-	    with at a higher level
+	  - Avoid supporting complex and unnecessary operations that
+	    could be dealt with at a higher level
 
 	  https://github.com/tinyalsa/tinyalsa
 
diff --git a/bsp/buildroot/package/tinyalsa/tinyalsa.hash b/bsp/buildroot/package/tinyalsa/tinyalsa.hash
index b6bea47e..f9be664c 100644
--- a/bsp/buildroot/package/tinyalsa/tinyalsa.hash
+++ b/bsp/buildroot/package/tinyalsa/tinyalsa.hash
@@ -1,2 +1,2 @@
 # locally computed
-sha256  93f4ca1e6345974167dc5577e8151a31fa2e6a628727a72d59e18db2289e7a1c  tinyalsa-1.1.0.tar.gz
+sha256 d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1  tinyalsa-1.1.1.tar.gz
diff --git a/bsp/buildroot/package/tinyalsa/tinyalsa.mk b/bsp/buildroot/package/tinyalsa/tinyalsa.mk
index d44155f9..bd9d9a00 100644
--- a/bsp/buildroot/package/tinyalsa/tinyalsa.mk
+++ b/bsp/buildroot/package/tinyalsa/tinyalsa.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TINYALSA_VERSION = 1.1.0
+TINYALSA_VERSION = 1.1.1
 TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION))
-TINYALSA_LICENSE = BSD-3c
+TINYALSA_LICENSE = BSD-3-Clause
 TINYALSA_LICENSE_FILES = NOTICE
 TINYALSA_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/tinycbor/0001-Update-cjson-include-path.patch b/bsp/buildroot/package/tinycbor/0001-Update-cjson-include-path.patch
deleted file mode 100644
index 5eea937d..00000000
--- a/bsp/buildroot/package/tinycbor/0001-Update-cjson-include-path.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 9aa79d8e9e38b31b34d9933a266c698e79808a79 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Sun, 13 Nov 2016 15:43:40 +0100
-Subject: [PATCH] Update cjson include path
-
-Since cjson-v1.0.0 (https://github.com/DaveGamble/cJSON/releases),
-cJSON.h is installed into cjson/cJSON.h and library has been renamed
-from cJSON to cjson
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
----
- Makefile                    | 4 ++--
- Makefile.configure          | 4 ++--
- tools/json2cbor/json2cbor.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index acd52eb..905fbdf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -82,12 +82,12 @@ ifeq ($(open_memstream-pass),)
-   endif
- endif
- 
--# json2cbor depends on an external library (cJSON)
-+# json2cbor depends on an external library (cjson)
- ifneq ($(cjson-pass)$(system-cjson-pass),)
-   JSON2CBOR_SOURCES = tools/json2cbor/json2cbor.c
-   INSTALL_TARGETS += $(bindir)/json2cbor
-   ifeq ($(system-cjson-pass),1)
--    LDFLAGS_CJSON = -lcJSON
-+    LDFLAGS_CJSON = -lcjson
-   else
-     JSON2CBOR_SOURCES += src/cjson/cJSON.c
-     json2cbor_CCFLAGS = -I$(SRCDIR)src/cjson
-diff --git a/Makefile.configure b/Makefile.configure
-index 28f4c92..424efb3 100644
---- a/Makefile.configure
-+++ b/Makefile.configure
-@@ -10,11 +10,11 @@ PROGRAM-gc_sections = int main() {}
- CCFLAGS-gc_sections = -Wl,--gc-sections
- 
- PROGRAM-cjson  = \#include <stdlib.h>\n
--PROGRAM-cjson += \#include <cJSON.h>\n
-+PROGRAM-cjson += \#include <cjson/cJSON.h>\n
- PROGRAM-cjson += int main() { return cJSON_False; }
- CCFLAGS-cjson = -I$(dir $(MAKEFILE))src/cjson
- PROGRAM-system-cjson = $(PROGRAM-cjson)
--CCFLAGS-system-cjson = -lcJSON
-+CCFLAGS-system-cjson = -lcjson
- 
- sink:
- 	@echo >&2 Please run from the top-level Makefile.
-diff --git a/tools/json2cbor/json2cbor.c b/tools/json2cbor/json2cbor.c
-index 96d3ed1..e194299 100644
---- a/tools/json2cbor/json2cbor.c
-+++ b/tools/json2cbor/json2cbor.c
-@@ -27,7 +27,7 @@
- #include "cbor.h"
- #include "compilersupport_p.h"
- 
--#include <cJSON.h>
-+#include <cjson/cJSON.h>
- 
- #include <errno.h>
- #include <math.h>
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch b/bsp/buildroot/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch
deleted file mode 100644
index dfea4ca6..00000000
--- a/bsp/buildroot/package/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1be7da8d81bbd52d722ec60250567ea876f6f4b5 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fabrice.fontaine@orange.com>
-Date: Sat, 3 Dec 2016 20:15:41 +0100
-Subject: [PATCH] Fix static compilation of json2cbor
-
-json2cbor depends on cjson so tools/json2cbor/json2cbor.o must before
--lcjson
-
-Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 905fbdf..7b5fefc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a | bin
- 	$(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) -lm
- 
- bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a | bin
--	$(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm
-+	$(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm
- 
- tinycbor.pc: tinycbor.pc.in
- 	$(SED) > $@ < $< \
--- 
-2.5.0
-
diff --git a/bsp/buildroot/package/tinycbor/tinycbor.hash b/bsp/buildroot/package/tinycbor/tinycbor.hash
index 88300e8e..affc7a6e 100644
--- a/bsp/buildroot/package/tinycbor/tinycbor.hash
+++ b/bsp/buildroot/package/tinycbor/tinycbor.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256	302ac9de66f1048725040ccc9a99e03c20529ac2b150ccf35cfd1e2dafa81c4b	tinycbor-v0.4.tar.gz
+sha256	37a06c618ccddd7edc3747277425fcd38fa71eab37c7aaf0b03818a49950da81	tinycbor-v0.4.2.tar.gz
+sha256	3c6ba0b5bfa7830505301ffb336a17b0748e0d61c4d34216e9dc98f10e40395e	LICENSE
diff --git a/bsp/buildroot/package/tinycbor/tinycbor.mk b/bsp/buildroot/package/tinycbor/tinycbor.mk
index 65deacd2..b1848b56 100644
--- a/bsp/buildroot/package/tinycbor/tinycbor.mk
+++ b/bsp/buildroot/package/tinycbor/tinycbor.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-TINYCBOR_VERSION = v0.4
-TINYCBOR_SITE = $(call github,01org,tinycbor,$(TINYCBOR_VERSION))
+TINYCBOR_VERSION = v0.4.2
+TINYCBOR_SITE = $(call github,intel,tinycbor,$(TINYCBOR_VERSION))
 TINYCBOR_LICENSE = MIT
 TINYCBOR_LICENSE_FILES = LICENSE
 
diff --git a/bsp/buildroot/package/tinydtls/tinydtls.hash b/bsp/buildroot/package/tinydtls/tinydtls.hash
index 909c8d16..66644df7 100644
--- a/bsp/buildroot/package/tinydtls/tinydtls.hash
+++ b/bsp/buildroot/package/tinydtls/tinydtls.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	ccf6d8fbae03fb2e0ba32878ed8e57d8b4f73538b1064df90a3e764da5fac010	tinydtls-0.8.2.tar.gz
+sha256	65fbf31c3551633e7dcc051fac80f2c1a73b0b077af9ed564d726155dfc40513	tinydtls.h
diff --git a/bsp/buildroot/package/tinyhttpd/Config.in b/bsp/buildroot/package/tinyhttpd/Config.in
index f7365afa..f648bcd3 100644
--- a/bsp/buildroot/package/tinyhttpd/Config.in
+++ b/bsp/buildroot/package/tinyhttpd/Config.in
@@ -2,7 +2,8 @@ config BR2_PACKAGE_TINYHTTPD
 	bool "tinyhttpd"
 	depends on BR2_USE_MMU # fork()
 	help
-	  A relatively simple webserver written as a school project. It is
-	  exceedingly simple, threaded and handles basic CGI scripts.
+	  A relatively simple webserver written as a school
+	  project. It is exceedingly simple, threaded and handles
+	  basic CGI scripts.
 
 	  http://sourceforge.net/projects/tinyhttpd/
diff --git a/bsp/buildroot/package/tinyxml/tinyxml.mk b/bsp/buildroot/package/tinyxml/tinyxml.mk
index df7b29fe..15280517 100644
--- a/bsp/buildroot/package/tinyxml/tinyxml.mk
+++ b/bsp/buildroot/package/tinyxml/tinyxml.mk
@@ -10,7 +10,7 @@ TINYXML_SITE = http://mirrors.xbmc.org/build-deps/sources
 # configure.ac which is not present in mainline.
 TINYXML_AUTORECONF = YES
 TINYXML_INSTALL_STAGING = YES
-TINYXML_LICENSE = zlib
+TINYXML_LICENSE = Zlib
 TINYXML_LICENSE_FILES = README
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tinyxml2/Config.in b/bsp/buildroot/package/tinyxml2/Config.in
index 25bc5941..2f575012 100644
--- a/bsp/buildroot/package/tinyxml2/Config.in
+++ b/bsp/buildroot/package/tinyxml2/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_TINYXML2
 	bool "tinyxml2"
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
-	  TinyXML-2 is a simple, small, efficient, C++ XML parser that can be
-	  easily integrating into other programs.
+	  TinyXML-2 is a simple, small, efficient, C++ XML parser that
+	  can be easily integrating into other programs.
 
 	  http://www.grinninglizard.com/tinyxml2/index.html
 
diff --git a/bsp/buildroot/package/tinyxml2/tinyxml2.hash b/bsp/buildroot/package/tinyxml2/tinyxml2.hash
index acbee093..e5e4d238 100644
--- a/bsp/buildroot/package/tinyxml2/tinyxml2.hash
+++ b/bsp/buildroot/package/tinyxml2/tinyxml2.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 128aa1553e88403833e0cccf1b651f45ce87bc207871f53fdcc8e7f9ec795747 tinyxml2-3.0.0.tar.gz
+sha256 14b38ef25cc136d71339ceeafb4856bb638d486614103453eccd323849267f20  tinyxml2-4.0.1.tar.gz
diff --git a/bsp/buildroot/package/tinyxml2/tinyxml2.mk b/bsp/buildroot/package/tinyxml2/tinyxml2.mk
index 053e46ea..e289ca9c 100644
--- a/bsp/buildroot/package/tinyxml2/tinyxml2.mk
+++ b/bsp/buildroot/package/tinyxml2/tinyxml2.mk
@@ -4,10 +4,14 @@
 #
 ################################################################################
 
-TINYXML2_VERSION = 3.0.0
+TINYXML2_VERSION = 4.0.1
 TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION))
-TINYXML2_LICENSE = zlib
+TINYXML2_LICENSE = Zlib
 TINYXML2_LICENSE_FILES = readme.md
 TINYXML2_INSTALL_STAGING = YES
 
+ifeq ($(BR2_STATIC_LIBS),y)
+TINYXML2_CONF_OPTS += -DBUILD_STATIC_LIBS=ON
+endif
+
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch b/bsp/buildroot/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch
deleted file mode 100644
index bddc2c72..00000000
--- a/bsp/buildroot/package/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9b18a98614a9f201b0883c2b15e7c7bde0aa0ff2 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Sun, 5 Feb 2017 17:12:00 +0100
-Subject: [PATCH] compat: don't re-define program_invocation_short_name
-
-program_invocation_short_name is defined in errno.h, and its definition
-can differ between the various C libraries: glibc defines it as:
-    extern char *program_invocation_short_name;
-
-while uClibc defines it as:
-    extern const char *program_invocation_short_name;
-
-So there is not simple solution to know the prototype.
-
-But since it is defined in errno.h, there is no reason to try and define
-it ourselves; let's just trust what the header provides.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- compat/getprogname.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/compat/getprogname.c b/compat/getprogname.c
-index 80a496d..ad619fc 100644
---- a/compat/getprogname.c
-+++ b/compat/getprogname.c
-@@ -19,11 +19,10 @@
- #include "compat.h"
- 
- #if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME)
-+#include <errno.h>
- const char *
- getprogname(void)
- {
--	extern char	*program_invocation_short_name;
--
- 	return (program_invocation_short_name);
- }
- #elif defined(HAVE___PROGNAME)
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/tmux/tmux.hash b/bsp/buildroot/package/tmux/tmux.hash
index 9195a168..752bbb45 100644
--- a/bsp/buildroot/package/tmux/tmux.hash
+++ b/bsp/buildroot/package/tmux/tmux.hash
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b  tmux-2.3.tar.gz
+sha256 b17cd170a94d7b58c0698752e1f4f263ab6dc47425230df7e53a6435cc7cd7e8  tmux-2.6.tar.gz
+sha256 94e2b1feb1202d3308cc7ab7ec42278d24f10562394bdf269f44649327c8198f  README
diff --git a/bsp/buildroot/package/tmux/tmux.mk b/bsp/buildroot/package/tmux/tmux.mk
index f6dd1a9c..6e03d01a 100644
--- a/bsp/buildroot/package/tmux/tmux.mk
+++ b/bsp/buildroot/package/tmux/tmux.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TMUX_VERSION = 2.3
+TMUX_VERSION = 2.6
 TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION)
 TMUX_LICENSE = ISC
 TMUX_LICENSE_FILES = README
diff --git a/bsp/buildroot/package/tn5250/tn5250.mk b/bsp/buildroot/package/tn5250/tn5250.mk
index bbaa686d..4c457a5d 100644
--- a/bsp/buildroot/package/tn5250/tn5250.mk
+++ b/bsp/buildroot/package/tn5250/tn5250.mk
@@ -8,7 +8,7 @@ TN5250_VERSION = 0.17.4
 TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION)
 TN5250_MAKE_OPTS = CPPFLAGS=""
 TN5250_DEPENDENCIES = ncurses
-TN5250_LICENSE = LGPLv2.1+
+TN5250_LICENSE = LGPL-2.1+
 TN5250_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
diff --git a/bsp/buildroot/package/tor/0001-openssl-libz.patch b/bsp/buildroot/package/tor/0001-openssl-libz.patch
index 93fb942a..9d3cf6e1 100644
--- a/bsp/buildroot/package/tor/0001-openssl-libz.patch
+++ b/bsp/buildroot/package/tor/0001-openssl-libz.patch
@@ -3,15 +3,15 @@ and remove host paths when looking for openssl.
 
 [Vincent:
  - Adapt the patch to make it apply on the new version.]
-[Bernd: rebased for tor-0.2.7.6, 0.2.8.10 & 0.2.9.9]
+[Bernd: rebased for tor-0.2.7.6, 0.2.8.10, 0.2.9.9 & 0.3.1.7]
 
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 
-diff -uNr tor-0.2.7.6.org/configure.ac tor-0.2.7.6/configure.ac
---- tor-0.2.7.6.org/configure.ac	2015-12-10 16:15:25.000000000 +0100
-+++ tor-0.2.7.6/configure.ac	2016-01-31 20:21:34.850408145 +0100
-@@ -612,11 +612,11 @@
+diff -uNr tor-0.3.1.7.org/configure.ac tor-0.3.1.7/configure.ac
+--- tor-0.3.1.7.org/configure.ac	2017-09-15 15:34:06.000000000 +0200
++++ tor-0.3.1.7/configure.ac	2017-09-19 19:40:17.090538467 +0200
+@@ -709,11 +709,11 @@
        fi
    ])
  
@@ -25,78 +25,100 @@ diff -uNr tor-0.2.7.6.org/configure.ac tor-0.2.7.6/configure.ac
  
  dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()
  
-diff -uNr tor-0.2.7.6.org/src/or/include.am tor-0.2.7.6/src/or/include.am
---- tor-0.2.7.6.org/src/or/include.am	2015-12-08 18:35:17.000000000 +0100
-+++ tor-0.2.7.6/src/or/include.am	2016-01-31 20:22:09.322777527 +0100
-@@ -108,7 +108,7 @@
- src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a \
+diff -uNr tor-0.3.1.7.org/src/or/include.am tor-0.3.1.7/src/or/include.am
+--- tor-0.3.1.7.org/src/or/include.am	2017-06-19 17:56:51.000000000 +0200
++++ tor-0.3.1.7/src/or/include.am	2017-09-19 19:41:02.015861546 +0200
+@@ -122,7 +122,7 @@
  	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
  	src/common/libor-event.a src/trunnel/libor-trunnel.a \
+ 	src/trace/libor-trace.a \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \
 +	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
- 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@
- 
- if COVERAGE_ENABLED
-diff -uNr tor-0.2.7.6.org/src/test/include.am tor-0.2.7.6/src/test/include.am
---- tor-0.2.7.6.org/src/test/include.am	2015-12-08 18:35:17.000000000 +0100
-+++ tor-0.2.7.6/src/test/include.am	2016-01-31 20:25:59.673127854 +0100
-@@ -177,8 +177,8 @@
- 	src/common/libor-ctime-testing.a \
+ 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \
+ 	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \
+ 	$(rust_ldadd)
+diff -uNr tor-0.3.1.7.org/src/test/include.am tor-0.3.1.7/src/test/include.am
+--- tor-0.3.1.7.org/src/test/include.am	2017-08-29 17:01:19.000000000 +0200
++++ tor-0.3.1.7/src/test/include.am	2017-09-19 19:42:39.103903406 +0200
+@@ -206,8 +206,8 @@
  	src/common/libor-event-testing.a \
  	src/trunnel/libor-trunnel-testing.a \
+ 	src/trace/libor-trace.a \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 -	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
 +	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 +	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
- 	@TOR_SYSTEMD_LIBS@
+ 	@TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \
+ 	$(rust_ldadd)
  
- src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS)
-@@ -200,8 +200,8 @@
- 	src/common/libor-ctime.a \
+@@ -231,8 +231,8 @@
  	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
  	src/common/libor-event.a src/trunnel/libor-trunnel.a \
+ 	src/trace/libor-trace.a \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 -	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
 +	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
 +	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
- 	@TOR_SYSTEMD_LIBS@
+ 	@TOR_SYSTEMD_LIBS@ @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \
+ 	$(rust_ldadd)
  
- src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \
-@@ -211,8 +211,8 @@
- 	src/common/libor-ctime-testing.a \
+@@ -244,8 +244,8 @@
  	src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
  	src/common/libor-event-testing.a \
+ 	src/trace/libor-trace.a \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
--	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+-	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
 +	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
-+	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
++	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
+ 	@TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ \
+ 	$(rust_ldadd)
  
- src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS)
- src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS)
-@@ -245,8 +245,8 @@
- src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
+@@ -256,8 +256,8 @@
+ 	src/common/libor-ctime-testing.a \
+ 	src/common/libor-event-testing.a \
+ 	src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \
+-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
+-	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
++	@TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \
++	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
+ 	@TOR_LZMA_LIBS@ \
+ 	$(rust_ldadd)
+ src_test_test_timers_LDFLAGS = $(src_test_test_LDFLAGS)
+@@ -286,8 +286,8 @@
+ 	src/common/libor-ctime.a \
+ 	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
+ 	src/trace/libor-trace.a \
+-	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
+-	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
++	@TOR_LIB_MATH@ \
++	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
+ 	@TOR_LZMA_LIBS@ \
+ 	$(rust_ldadd)
+ src_test_test_ntor_cl_AM_CPPFLAGS =	       \
+@@ -298,8 +298,8 @@
+ src_test_test_hs_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
  	src/common/libor-ctime.a \
  	src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \
 -	@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
 -	@TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
 +	@TOR_LIB_MATH@ \
 +	@TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
- src_test_test_ntor_cl_AM_CPPFLAGS =	       \
+ src_test_test_hs_ntor_cl_AM_CPPFLAGS =	       \
  	-I"$(top_srcdir)/src/or"
  
-diff -uNr tor-0.2.7.6.org/src/tools/include.am tor-0.2.7.6/src/tools/include.am
---- tor-0.2.7.6.org/src/tools/include.am	2015-11-13 14:33:26.000000000 +0100
-+++ tor-0.2.7.6/src/tools/include.am	2016-01-31 20:27:29.954004495 +0100
+diff -uNr tor-0.3.1.7.org/src/tools/include.am tor-0.3.1.7/src/tools/include.am
+--- tor-0.3.1.7.org/src/tools/include.am	2017-06-19 17:56:51.000000000 +0200
++++ tor-0.3.1.7/src/tools/include.am	2017-09-19 19:43:08.880223260 +0200
 @@ -26,7 +26,7 @@
-     src/common/libor-ctime.a \
-     $(LIBKECCAK_TINY) \
-     $(LIBDONNA) \
--    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-+    @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
-     @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
+ 	src/common/libor-ctime.a \
+ 	$(LIBKECCAK_TINY) \
+ 	$(LIBDONNA) \
+-	@TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
++	@TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
+ 	@TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \
+ 	$(rust_ldadd)
  
- if COVERAGE_ENABLED
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
      src/common/libor-ctime-testing.a \
      $(LIBKECCAK_TINY) \
      $(LIBDONNA) \
@@ -105,12 +127,3 @@ diff -uNr tor-0.2.7.6.org/src/tools/include.am tor-0.2.7.6/src/tools/include.am
      @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
  endif
  
-@@ -50,7 +50,7 @@
-     src/common/libor-crypto.a \
-     $(LIBKECCAK_TINY) \
-     $(LIBDONNA) \
--    @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \
-+    @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \
-     @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@
- 
- EXTRA_DIST += src/tools/tor-fw-helper/README
diff --git a/bsp/buildroot/package/tor/tor.hash b/bsp/buildroot/package/tor/tor.hash
index 8b5a3958..db946eec 100644
--- a/bsp/buildroot/package/tor/tor.hash
+++ b/bsp/buildroot/package/tor/tor.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256 44d9ddca1479f517b74067fe55e919d8d3643645618d5a1f6a5e033765781979  tor-0.2.9.14.tar.gz
+sha256 c0e1a71e8e079ddd7951f846bcbd79d5e716b602faa5b890c70762fe95cd04e0  tor-0.3.1.10.tar.gz
+sha256 f9a4f724d8037711dde7d3f1d17094fb7d211545b3a3bbb1b03e769e13ca5608  LICENSE
diff --git a/bsp/buildroot/package/tor/tor.mk b/bsp/buildroot/package/tor/tor.mk
index f87b10f3..ddf912fe 100644
--- a/bsp/buildroot/package/tor/tor.mk
+++ b/bsp/buildroot/package/tor/tor.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TOR_VERSION = 0.2.9.14
+TOR_VERSION = 0.3.1.10
 TOR_SITE = https://dist.torproject.org
-TOR_LICENSE = BSD-3c
+TOR_LICENSE = BSD-3-Clause
 TOR_LICENSE_FILES = LICENSE
 TOR_DEPENDENCIES = libevent openssl zlib
 TOR_AUTORECONF = YES
@@ -30,6 +30,13 @@ ifeq ($(BR2_PACKAGE_LIBCAP),y)
 TOR_DEPENDENCIES += libcap
 endif
 
+ifeq ($(BR2_PACKAGE_XZ),y)
+TOR_CONF_OPTS += --enable-lzma
+TOR_DEPENDENCIES += host-pkgconf xz
+else
+TOR_CONF_OPTS += --disable-lzma
+endif
+
 ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_i386)$(BR2_x86_64)$(BR2_PACKAGE_LIBSECCOMP),yy)
 TOR_CONF_OPTS += --enable-seccomp
 TOR_DEPENDENCIES += libseccomp
@@ -40,4 +47,16 @@ endif
 # uses gnu extensions
 TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
 
+define TOR_INSTALL_CONF
+	$(INSTALL) -D -m 644 $(@D)/src/config/torrc.minimal \
+		$(TARGET_DIR)/etc/tor/torrc
+endef
+
+TOR_POST_INSTALL_TARGET_HOOKS += TOR_INSTALL_CONF
+
+define TOR_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 644 $(@D)/contrib/dist/tor.service \
+		$(TARGET_DIR)/usr/lib/systemd/system/tor.service
+endef
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tovid/Config.in b/bsp/buildroot/package/tovid/Config.in
index d8052ea3..a22dca8e 100644
--- a/bsp/buildroot/package/tovid/Config.in
+++ b/bsp/buildroot/package/tovid/Config.in
@@ -8,6 +8,7 @@ config BR2_PACKAGE_TOVID
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer
+	depends on !BR2_TOOLCHAIN_USES_MUSL # procps-ng
 	# The below dependencies are runtime dependencies only
 	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng
 	select BR2_PACKAGE_DVDAUTHOR
@@ -27,14 +28,15 @@ config BR2_PACKAGE_TOVID
 
 	  http://tovid.wikia.com/wiki/Installing_tovid
 
-comment "tovid needs a toolchain w/ threads, C++, wchar"
+comment "tovid needs a glibc or uclibc toolchain w/ threads, C++, wchar"
 	depends on BR2_USE_MMU
 	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_INSTALL_LIBSTDCPP \
-		|| !BR2_USE_WCHAR
+		|| !BR2_USE_WCHAR \
+		|| BR2_TOOLCHAIN_USES_MUSL
 
 comment "tovid depends on python or python3"
 	depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3
diff --git a/bsp/buildroot/package/tovid/tovid.hash b/bsp/buildroot/package/tovid/tovid.hash
index 9ddd7503..0bd7668f 100644
--- a/bsp/buildroot/package/tovid/tovid.hash
+++ b/bsp/buildroot/package/tovid/tovid.hash
@@ -1,2 +1,2 @@
-# Locally computed:
-sha256  06f7cb00b213bbe83d72f4f2076b675a662697034e1d2cdc2dce987e35c827bc  tovid-0.35.0.tar.gz
+# Locally calculated
+sha256 3193d081a7aa8e00f946b7514066f1fb7647f533ab1ebcc36b5ced927b0a1ab5  tovid-0.35.2.tar.gz
diff --git a/bsp/buildroot/package/tovid/tovid.mk b/bsp/buildroot/package/tovid/tovid.mk
index 3069d67e..c904b981 100644
--- a/bsp/buildroot/package/tovid/tovid.mk
+++ b/bsp/buildroot/package/tovid/tovid.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-TOVID_VERSION = 0.35.0
-TOVID_SITE = https://github.com/tovid-suite/tovid/releases/download/v$(TOVID_VERSION)
-TOVID_LICENSE = GPLv2+
+TOVID_VERSION = 0.35.2
+TOVID_SITE = https://github.com/tovid-suite/tovid/releases/download/$(TOVID_VERSION)
+TOVID_LICENSE = GPL-2.0+
 TOVID_LICENSE_FILES = COPYING
 TOVID_SETUP_TYPE = distutils
 
diff --git a/bsp/buildroot/package/tpm-tools/0001-tpm_nvread-include-sys-stat.h-for-open-modes.patch b/bsp/buildroot/package/tpm-tools/0001-tpm_nvread-include-sys-stat.h-for-open-modes.patch
deleted file mode 100644
index 35fd7632..00000000
--- a/bsp/buildroot/package/tpm-tools/0001-tpm_nvread-include-sys-stat.h-for-open-modes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5fedfd32a226e3ac8a6022227ec2d8fc6df26901 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 24 Dec 2015 08:57:09 +0100
-Subject: [PATCH] tpm_nvread: include <sys/stat.h> for open() modes
-
-As the manual page of open(2) indicates, the <sys/stat.h> header
-should be included. Indeed, it is this header that provides the mode_t
-macros such as S_IRUSR and S_IWUSR.
-
-While the build happens to work with glibc without this included
-header, it fails with other C libraries such as uClibc, due to the
-missing inclusion.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/tpm_mgmt/tpm_nvread.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/tpm_mgmt/tpm_nvread.c b/src/tpm_mgmt/tpm_nvread.c
-index 35fe17c..92f047c 100644
---- a/src/tpm_mgmt/tpm_nvread.c
-+++ b/src/tpm_mgmt/tpm_nvread.c
-@@ -23,6 +23,7 @@
- #include <ctype.h>
- #include <fcntl.h>
- #include <unistd.h>
-+#include <sys/stat.h>
- 
- #include "tpm_nvcommon.h"
- #include "tpm_tspi.h"
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch b/bsp/buildroot/package/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch
deleted file mode 100644
index fac7b2cc..00000000
--- a/bsp/buildroot/package/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Fetched from: http://sourceforge.net/p/trousers/mailman/message/34728585/
-Upstream status: Submitted
-
-From 924cbdfc67ca405aa4df2f9d3787365618b58630 Mon Sep 17 00:00:00 2001
-From: Samuel Martin <s.martin49@gmail.com>
-Date: Wed, 30 Dec 2015 00:06:33 +0100
-Subject: [PATCH] Makefile.am: make sure libintl is in LDFLAGS when needed
-
-The build-system internally builds a couple of static libraries used to
-build the final programs.
-
-When linking these libraries and the final programs, we need to
-explicitly tell libtool to link with libintl in order to resolve all the
-missing symbols.
-
-This is done in the appropriate LDADD/LIBADD variables (or the per-target
-*_LDADD/*_LIBADD ones when they do not default to LDADD or LIBADD), for
-any sources using gettext/libintl functionalities.
-
-This change fixes build failures [2,3] in cross-compilation, triggered by
-Buildroot buildfarms [1].
-
-[1] http://autobuild.buildroot.org/
-[2] http://autobuild.buildroot.org/?reason=tpm-tools-1.3.8
-[3] http://autobuild.buildroot.org/results/c82/c82a6c1f41c561b15f10e7b7ffcaed15fa0ec895/build-end.log
-
-Signed-off-by: Samuel Martin <s.martin49@gmail.com>
----
- lib/Makefile.am           | 6 +++---
- src/cmds/Makefile.am      | 2 +-
- src/data_mgmt/Makefile.am | 2 +-
- src/tpm_mgmt/Makefile.am  | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index cef6a2f..c1d7009 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES	=	tpm_utils.c \
- #
- # TSPI interface library
- libtpm_tspi_la_SOURCES	=	tpm_tspi.c
--libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ldl
-+libtpm_tspi_la_LIBADD	=	libtpm_utils.la -ldl @INTLLIBS@
- 
- #
- # PKCS#11 interface library
-@@ -52,7 +52,7 @@ if P11_SUPPORT
- noinst_LTLIBRARIES	+=	libtpm_pkcs11.la
- 
- libtpm_pkcs11_la_SOURCES=	tpm_pkcs11.c
--libtpm_pkcs11_la_LIBADD	=	libtpm_utils.la
-+libtpm_pkcs11_la_LIBADD	=	libtpm_utils.la @INTLLIBS@
- endif
- 
- #
-@@ -80,4 +80,4 @@ endif
- # Unseal library - for addition to existing apps, counter part of seal cmd
- libtpm_unseal_la_SOURCES =	tpm_unseal.c
- libtpm_unseal_la_LDFLAGS =	-shared -version-info 1:0:0
--libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la
-+libtpm_unseal_la_LIBADD  =	-ltspi  libtpm_tspi.la @INTLLIBS@
-diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am
-index de73ecf..27fc9ef 100644
---- a/src/cmds/Makefile.am
-+++ b/src/cmds/Makefile.am
-@@ -30,7 +30,7 @@ else
- AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
- endif
- 
--LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto
-+LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@
- 
- tpm_sealdata_SOURCES = tpm_sealdata.c
- tpm_unsealdata_SOURCES = tpm_unsealdata.c
-diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am
-index f8bf41c..de505e4 100644
---- a/src/data_mgmt/Makefile.am
-+++ b/src/data_mgmt/Makefile.am
-@@ -38,7 +38,7 @@ noinst_HEADERS =	data_common.h \
- # Common build flags
- AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
- 
--LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl
-+LDADD		=	$(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@
- 
- 
- #
-diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am
-index 195fba9..7ca47c9 100644
---- a/src/tpm_mgmt/Makefile.am
-+++ b/src/tpm_mgmt/Makefile.am
-@@ -55,7 +55,7 @@ else
- AM_CPPFLAGS	=	-I$(top_srcdir)/include -D_LINUX
- endif
- 
--LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi
-+LDADD		=	$(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@
- 
- tpm_startup_SOURCES =		tpm_startup.c
- tpm_reset_SOURCES =		tpm_reset.c
--- 
-2.6.4
-
diff --git a/bsp/buildroot/package/tpm-tools/0002-configure.in-remove-Werror.patch b/bsp/buildroot/package/tpm-tools/0002-configure.in-remove-Werror.patch
deleted file mode 100644
index c101a951..00000000
--- a/bsp/buildroot/package/tpm-tools/0002-configure.in-remove-Werror.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b060873f444d79f3f5aa388427cb1ede6665834a Mon Sep 17 00:00:00 2001
-From: Kent Yoder <key@linux.vnet.ibm.com>
-Date: Mon, 5 Nov 2012 14:58:31 -0600
-Subject: [PATCH] configure.in: remove -Werror
-
-Signed-off-by: Kent Yoder <key@linux.vnet.ibm.com>
-Signed-off-by: Noe Rubinstein <nrubinstein@aldebaran.com>
----
- configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index da170d0..0f175be 100644
---- a/configure.in
-+++ b/configure.in
-@@ -138,7 +138,7 @@ AC_TYPE_SIZE_T
- AC_TYPE_SIGNAL
- AC_TYPE_UID_T
- 
--CFLAGS="$CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare"
-+CFLAGS="$CFLAGS -Wall -Wreturn-type -Wsign-compare"
- 
- AC_CONFIG_FILES(./Makefile		\
- 		po/Makefile.in		\
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/tpm-tools/Config.in b/bsp/buildroot/package/tpm-tools/Config.in
index 83b65f3a..e1156872 100644
--- a/bsp/buildroot/package/tpm-tools/Config.in
+++ b/bsp/buildroot/package/tpm-tools/Config.in
@@ -1,11 +1,10 @@
 config BR2_PACKAGE_TPM_TOOLS
 	bool "tpm-tools"
-	select BR2_PACKAGE_TROUSERS
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # trousers
 	depends on !BR2_STATIC_LIBS # trousers
 	depends on !BR2_arc # trousers
+	select BR2_PACKAGE_TROUSERS
+	select BR2_PACKAGE_OPENSSL
 	help
 	  Tools to manage and diagnose a TPM
 
diff --git a/bsp/buildroot/package/tpm-tools/tpm-tools.hash b/bsp/buildroot/package/tpm-tools/tpm-tools.hash
index 8c1ff899..a2da230a 100644
--- a/bsp/buildroot/package/tpm-tools/tpm-tools.hash
+++ b/bsp/buildroot/package/tpm-tools/tpm-tools.hash
@@ -1,3 +1,7 @@
-# http://sourceforge.net/projects/trousers/files/tpm-tools/1.3.8/
-sha1 f2c799ac8dc78f3537e1dbe4ae7c6e93f37e868c tpm-tools-1.3.8.tar.gz
-md5  85a978c4e03fefd4b73cbeadde7c4d0b         tpm-tools-1.3.8.tar.gz
+# http://sourceforge.net/projects/trousers/files/tpm-tools/1.3.9.1/
+sha1 c35cb031c6b5220dd1c8a03995654fdd12aa3031 tpm-tools-1.3.9.1.tar.gz
+md5  1532293aa632a0eaa7e60df87c779855         tpm-tools-1.3.9.1.tar.gz
+
+# Locally calculated
+sha256 9cb714e2650826e2e932f65bc0ba9d61b927dc5fea47f2c2a2b64f0fdfcbfa68 tpm-tools-1.3.9.1.tar.gz
+sha256 7b47225a5b77cb7825efc6a4d7e0ac57864c790542cf92f5080ec2bf310c00e5 LICENSE
diff --git a/bsp/buildroot/package/tpm-tools/tpm-tools.mk b/bsp/buildroot/package/tpm-tools/tpm-tools.mk
index c90edbb8..b6738251 100644
--- a/bsp/buildroot/package/tpm-tools/tpm-tools.mk
+++ b/bsp/buildroot/package/tpm-tools/tpm-tools.mk
@@ -4,16 +4,11 @@
 #
 ################################################################################
 
-TPM_TOOLS_VERSION = 1.3.8
+TPM_TOOLS_VERSION = 1.3.9.1
 TPM_TOOLS_SITE = http://downloads.sourceforge.net/project/trousers/tpm-tools/$(TPM_TOOLS_VERSION)
-TPM_TOOLS_STRIP_COMPONENTS = 2
 TPM_TOOLS_LICENSE = Common Public License Version 1.0
 TPM_TOOLS_LICENSE_FILES = LICENSE
-TPM_TOOLS_DEPENDENCIES = trousers openssl \
-	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
-# configure.in and lib/Makefile.am is patched
-TPM_TOOLS_AUTORECONF = YES
-TPM_TOOLS_GETTEXTIZE = YES
+TPM_TOOLS_DEPENDENCIES = trousers openssl $(TARGET_NLS_DEPENDENCIES)
 
 TPM_TOOLS_CONF_OPTS = --disable-pkcs11-support
 
diff --git a/bsp/buildroot/package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch b/bsp/buildroot/package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch
deleted file mode 100644
index 5f7d2bab..00000000
--- a/bsp/buildroot/package/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From bdfcddd4f135dc1d4fefb0373d9ebb93ef5110cb Mon Sep 17 00:00:00 2001
-From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>
-Date: Mon, 7 Dec 2015 16:41:19 -0500
-Subject: [PATCH] trace-cmd: Fix trace-record.c with non ptrace compile
-
-Fix ptrace_wait() when NO_PTRACE=1 is defined.
-
-Status: upstream
-
-Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-[Romain backport to 2.6]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- trace-record.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/trace-record.c b/trace-record.c
-index df82883..f83ec4b 100644
---- a/trace-record.c
-+++ b/trace-record.c
-@@ -1099,7 +1099,7 @@ static void ptrace_wait(enum trace_type type, int main_pid)
- 		 (!WIFEXITED(status) || pid != main_pid));
- }
- #else
--static inline void ptrace_wait(int main_pid) { }
-+static inline void ptrace_wait(enum trace_type type, int main_pid) { }
- static inline void enable_ptrace(void) { }
- static inline void ptrace_attach(int pid) { }
- 
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch b/bsp/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch
new file mode 100644
index 00000000..350e5230
--- /dev/null
+++ b/bsp/buildroot/package/trace-cmd/0001-trace-listen-add-missing-header.patch
@@ -0,0 +1,38 @@
+From c68c868b573acc73e144312326750be2ed96632f Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Thu, 29 Jun 2017 14:43:19 +0300
+Subject: [PATCH] trace-listen: add missing header
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The PATH_MAX macro requires the limits.h header. This fixes build with musl
+libc:
+
+.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c: In function ‘make_pid_name’:
+.../trace-cmd-trace-cmd-v2.6.1/trace-listen.c:167:16: error: ‘PATH_MAX’ undeclared (first use in this function)
+  snprintf(buf, PATH_MAX, VAR_RUN_DIR "/trace-cmd-net.pid");
+                ^~~~~~~~
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://lkml.org/lkml/2017/6/29/286
+
+ trace-listen.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/trace-listen.c b/trace-listen.c
+index 17ff9d8c160c..838d6bcf3649 100644
+--- a/trace-listen.c
++++ b/trace-listen.c
+@@ -31,6 +31,7 @@
+ #include <fcntl.h>
+ #include <signal.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #include "trace-local.h"
+ #include "trace-msg.h"
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/trace-cmd/Config.in b/bsp/buildroot/package/trace-cmd/Config.in
index fcec1027..574541c5 100644
--- a/bsp/buildroot/package/trace-cmd/Config.in
+++ b/bsp/buildroot/package/trace-cmd/Config.in
@@ -6,10 +6,10 @@ config BR2_PACKAGE_TRACE_CMD
 	help
 	  Command line reader for ftrace.
 
-	  To use this profiling tool, you should enable ftrace in your kernel
-	  configuration. This command collect traces on your target.
-	  You can analyse these traces on the target or on the host via the gui
-	  "kernel shark"
+	  To use this profiling tool, you should enable ftrace in your
+	  kernel configuration. This command collect traces on your
+	  target.  You can analyse these traces on the target or on
+	  the host via the gui "kernel shark"
 
 	  http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git
 
diff --git a/bsp/buildroot/package/trace-cmd/trace-cmd.hash b/bsp/buildroot/package/trace-cmd/trace-cmd.hash
new file mode 100644
index 00000000..5bf4154b
--- /dev/null
+++ b/bsp/buildroot/package/trace-cmd/trace-cmd.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 f088534808274f6233fe15130791238fb14ce9bf6e7234f9b3fe6b5a42a1245d  trace-cmd-trace-cmd-v2.6.1.tar.gz
diff --git a/bsp/buildroot/package/trace-cmd/trace-cmd.mk b/bsp/buildroot/package/trace-cmd/trace-cmd.mk
index 2348155c..0dc14567 100644
--- a/bsp/buildroot/package/trace-cmd/trace-cmd.mk
+++ b/bsp/buildroot/package/trace-cmd/trace-cmd.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-TRACE_CMD_VERSION = trace-cmd-v2.6
+TRACE_CMD_VERSION = trace-cmd-v2.6.1
 TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git
 TRACE_CMD_SITE_METHOD = git
 TRACE_CMD_INSTALL_STAGING = YES
-TRACE_CMD_LICENSE = GPLv2, LGPLv2.1
+TRACE_CMD_LICENSE = GPL-2.0, LGPL-2.1
 TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB
 
 TRACE_CMD_DEPENDENCIES = host-pkgconf
diff --git a/bsp/buildroot/package/traceroute/Config.in b/bsp/buildroot/package/traceroute/Config.in
new file mode 100644
index 00000000..42ae5a30
--- /dev/null
+++ b/bsp/buildroot/package/traceroute/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_TRACEROUTE
+	bool "traceroute"
+	help
+	  A new modern implementation of the traceroute(8) utility for
+	  Linux systems. It tracks the route packets taken from an IP
+	  network on their way to a given host.
+
+	  http://traceroute.sourceforge.net/
diff --git a/bsp/buildroot/package/traceroute/traceroute.hash b/bsp/buildroot/package/traceroute/traceroute.hash
new file mode 100644
index 00000000..b9525487
--- /dev/null
+++ b/bsp/buildroot/package/traceroute/traceroute.hash
@@ -0,0 +1,6 @@
+# Locally computed:
+sha256 3669d22a34d3f38ed50caba18cd525ba55c5c00d5465f2d20d7472e5d81603b6  traceroute-2.1.0.tar.gz
+
+# Hash for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
diff --git a/bsp/buildroot/package/traceroute/traceroute.mk b/bsp/buildroot/package/traceroute/traceroute.mk
new file mode 100644
index 00000000..d01c62d5
--- /dev/null
+++ b/bsp/buildroot/package/traceroute/traceroute.mk
@@ -0,0 +1,29 @@
+################################################################################
+#
+# traceroute
+#
+################################################################################
+
+TRACEROUTE_VERSION = 2.1.0
+TRACEROUTE_SITE = http://downloads.sourceforge.net/traceroute/traceroute/traceroute-$(TRACEROUTE_VERSION)
+
+TRACEROUTE_LICENSE = GPL-2.0+, LGPL-2.1+
+TRACEROUTE_LICENSE_FILES = COPYING COPYING.LIB
+
+# Prefer full-featured traceroute over busybox's version
+ifeq ($(BR2_PACKAGE_BUSYBOX),y)
+TRACEROUTE_DEPENDENCIES += busybox
+endif
+
+define TRACEROUTE_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" -C $(@D)
+endef
+
+define TRACEROUTE_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		DESTDIR=$(TARGET_DIR) prefix=/usr install \
+		INSTALL=$(INSTALL) -C $(@D)
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/transmission/Config.in b/bsp/buildroot/package/transmission/Config.in
index 38a459cd..dac4d1b3 100644
--- a/bsp/buildroot/package/transmission/Config.in
+++ b/bsp/buildroot/package/transmission/Config.in
@@ -32,19 +32,14 @@ config BR2_PACKAGE_TRANSMISSION_DAEMON
 	help
 	  Install transmission daemon.
 
-config BR2_PACKAGE_TRANSMISSION_REMOTE
-	bool "transmission-remote"
-	help
-	  Install transmission remote management tool.
-
 config BR2_PACKAGE_TRANSMISSION_GTK
 	bool "transmission-gtk"
-	depends on BR2_PACKAGE_LIBGTK3 && BR2_ENABLE_LOCALE
+	depends on BR2_PACKAGE_LIBGTK3 && BR2_SYSTEM_ENABLE_NLS
 	help
 	  Install transmission GTK-based GUI interface.
 
-comment "transmission-gtk needs a toolchain w/ locale"
-	depends on BR2_PACKAGE_LIBGTK3 && !BR2_ENABLE_LOCALE
+comment "transmission-gtk needs NLS enabled"
+	depends on BR2_PACKAGE_LIBGTK3 && !BR2_SYSTEM_ENABLE_NLS
 endif
 
 comment "transmission needs a toolchain w/ threads"
diff --git a/bsp/buildroot/package/transmission/S92transmission b/bsp/buildroot/package/transmission/S92transmission
index e5976b0c..29d7cd58 100644
--- a/bsp/buildroot/package/transmission/S92transmission
+++ b/bsp/buildroot/package/transmission/S92transmission
@@ -51,9 +51,6 @@ DAEMON=$(which $NAME)
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
-# Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
-
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
diff --git a/bsp/buildroot/package/transmission/transmission.mk b/bsp/buildroot/package/transmission/transmission.mk
index 34b310bf..65add0d8 100644
--- a/bsp/buildroot/package/transmission/transmission.mk
+++ b/bsp/buildroot/package/transmission/transmission.mk
@@ -16,9 +16,9 @@ TRANSMISSION_DEPENDENCIES = \
 	zlib
 TRANSMISSION_AUTORECONF = YES
 TRANSMISSION_CONF_OPTS = \
-	--disable-libnotify \
+	--without-inotify \
 	--enable-lightweight
-TRANSMISSION_LICENSE = GPLv2 or GPLv3 with OpenSSL exception
+TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception
 TRANSMISSION_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
@@ -49,9 +49,9 @@ TRANSMISSION_CONF_OPTS += --enable-daemon
 
 ifeq ($(BR2_PACKAGE_SYSTEMD),y)
 TRANSMISSION_DEPENDENCIES += systemd
-TRANSMISSION_CONF_OPTS += --with-systemd-daemon
+TRANSMISSION_CONF_OPTS += --with-systemd
 else
-TRANSMISSION_CONF_OPTS += --without-systemd-daemon
+TRANSMISSION_CONF_OPTS += --without-systemd
 endif
 
 define TRANSMISSION_USERS
@@ -75,12 +75,6 @@ else
 TRANSMISSION_CONF_OPTS += --disable-daemon
 endif
 
-ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y)
-TRANSMISSION_CONF_OPTS += --enable-remote
-else
-TRANSMISSION_CONF_OPTS += --disable-remote
-endif
-
 ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y)
 TRANSMISSION_CONF_OPTS += --with-gtk
 TRANSMISSION_DEPENDENCIES += libgtk3
diff --git a/bsp/buildroot/package/tree/tree.mk b/bsp/buildroot/package/tree/tree.mk
index b8988bd4..34b6c60a 100644
--- a/bsp/buildroot/package/tree/tree.mk
+++ b/bsp/buildroot/package/tree/tree.mk
@@ -7,7 +7,7 @@
 TREE_VERSION = 1.7.0
 TREE_SOURCE = tree-$(TREE_VERSION).tgz
 TREE_SITE = http://mama.indstate.edu/users/ice/tree/src
-TREE_LICENSE = GPLv2+
+TREE_LICENSE = GPL-2.0+
 TREE_LICENSE_FILES = LICENSE
 
 define TREE_BUILD_CMDS
diff --git a/bsp/buildroot/package/tremor/Config.in b/bsp/buildroot/package/tremor/Config.in
index 1a478c47..ec7b8f8c 100644
--- a/bsp/buildroot/package/tremor/Config.in
+++ b/bsp/buildroot/package/tremor/Config.in
@@ -6,3 +6,5 @@ config BR2_PACKAGE_TREMOR
 	  decoder. It provides a decoding API similar to libvorbis,
 	  but gives much better performance on systems without a
 	  floating-point unit.
+
+	  https://wiki.xiph.org/Tremor
diff --git a/bsp/buildroot/package/tremor/tremor.mk b/bsp/buildroot/package/tremor/tremor.mk
index 82766280..835fe361 100644
--- a/bsp/buildroot/package/tremor/tremor.mk
+++ b/bsp/buildroot/package/tremor/tremor.mk
@@ -7,7 +7,7 @@
 TREMOR_VERSION = 7c30a66346199f3f09017a09567c6c8a3a0eedc8
 TREMOR_SITE = https://git.xiph.org/tremor.git
 TREMOR_SITE_METHOD = git
-TREMOR_LICENSE = BSD-3c
+TREMOR_LICENSE = BSD-3-Clause
 TREMOR_LICENSE_FILES = COPYING
 
 TREMOR_AUTORECONF = YES
diff --git a/bsp/buildroot/package/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch b/bsp/buildroot/package/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch
deleted file mode 100644
index 80f26403..00000000
--- a/bsp/buildroot/package/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From d3cfa80631a7e314fee9b2e0822e403fcf2a5c5c Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Sun, 31 Jul 2016 10:28:43 +0200
-Subject: [PATCH] eventtable.h: use correct array sizes to fix building against
- 4.7+ headers
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-During the 4.7 development cycle, commit 9a9b6aa6a8 (Input: add
-SW_PEN_INSERTED define) got added, which has the same numerical value as
-SW_MAX:
-
-+#define SW_PEN_INSERTED                0x0f  /* set = pen inserted */
-+#define SW_MAX                 0x0f
-
-This breaks the build as the SW_NAME array is sized using the SW_MAX macro:
-
-In file included from eventtable.h:21:0,
-                 from eventnames.c:11:
-evtable_SW.inc:17:1: error: array index in initializer exceeds array bounds
- EV_MAP(SW_PEN_INSERTED),
- ^
-evtable_SW.inc:17:1: error: (near initialization for ‘SW_NAME’)
-
-The arrays should be sized using the <foo>_CNT (which is MAX+1) macros
-instead of <foo>_MAX.  These got added during the 2.6.24 development cycle,
-so it should be safe to do so unconditially:
-
-commit 7b19ada2ed3c1eccb9fe94d74b05e1428224663d
-Author: Jiri Slaby <jirislaby@gmail.com>
-Date:   Thu Oct 18 23:40:32 2007 -0700
-
-    get rid of input BIT* duplicate defines
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- eventtable.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/eventtable.h b/eventtable.h
-index 349d9d7..7cd99aa 100644
---- a/eventtable.h
-+++ b/eventtable.h
-@@ -8,15 +8,15 @@
- 
- #define EV_MAP( N ) [ N ] = #N
- 
--static const char *EV_NAME[EV_MAX] = {
-+static const char *EV_NAME[EV_CNT] = {
- #include "evtable_EV.inc"
- };
- 
--static const char *KEY_NAME[KEY_MAX] = {
-+static const char *KEY_NAME[KEY_CNT] = {
- #include "evtable_KEY.inc"
- #include "evtable_BTN.inc"
- };
- 
--static const char *SW_NAME[SW_MAX] = {
-+static const char *SW_NAME[SW_CNT] = {
- #include "evtable_SW.inc"
- };
--- 
-2.8.1
-
diff --git a/bsp/buildroot/package/triggerhappy/triggerhappy.hash b/bsp/buildroot/package/triggerhappy/triggerhappy.hash
index 17eefdb2..5a1d7672 100644
--- a/bsp/buildroot/package/triggerhappy/triggerhappy.hash
+++ b/bsp/buildroot/package/triggerhappy/triggerhappy.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	6b01497377e522c368818c5f6c726362f42530e3dc24a01c6d77b1b4d6068308  triggerhappy-7e5abc69f215678e93a6b999524981c8b40bdcd9.tar.gz
+sha256 1b3221963b9adca26eacc5442d8c2422cf2072f8adde1dbd691a69b37a583fb1  triggerhappy-b822888066129350e51ad79f1cf307fa38dae4f7.tar.gz
diff --git a/bsp/buildroot/package/triggerhappy/triggerhappy.mk b/bsp/buildroot/package/triggerhappy/triggerhappy.mk
index 5a29ca77..4c39ab5e 100644
--- a/bsp/buildroot/package/triggerhappy/triggerhappy.mk
+++ b/bsp/buildroot/package/triggerhappy/triggerhappy.mk
@@ -4,13 +4,15 @@
 #
 ################################################################################
 
-TRIGGERHAPPY_VERSION = 7e5abc69f215678e93a6b999524981c8b40bdcd9
+TRIGGERHAPPY_VERSION = b822888066129350e51ad79f1cf307fa38dae4f7
 TRIGGERHAPPY_SITE = $(call github,wertarbyte,triggerhappy,$(TRIGGERHAPPY_VERSION))
-TRIGGERHAPPY_LICENSE = GPLv3+
+TRIGGERHAPPY_LICENSE = GPL-3.0+
 TRIGGERHAPPY_LICENSE_FILES = COPYING
+TRIGGERHAPPY_DEPENDENCIES = host-pkgconf
 
 define TRIGGERHAPPY_BUILD_CMDS
-	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) thd th-cmd
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) PKGCONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		-C $(@D) thd th-cmd
 endef
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
diff --git a/bsp/buildroot/package/triggerhappy/triggerhappy.service b/bsp/buildroot/package/triggerhappy/triggerhappy.service
index 8449c1c9..8431afe9 100644
--- a/bsp/buildroot/package/triggerhappy/triggerhappy.service
+++ b/bsp/buildroot/package/triggerhappy/triggerhappy.service
@@ -2,7 +2,7 @@
 Description=Triggerhappy daemon
 
 [Service]
-ExecStart=/usr/sbin/thd --triggers /etc/triggerhappy/triggers.d --socket /var/run/thd.socket --user nobody /dev/input/event*
+ExecStart=/usr/sbin/thd --triggers /etc/triggerhappy/triggers.d --socket /var/run/thd.socket --user nobody --deviceglob /dev/input/event*
 Restart=always
 
 [Install]
diff --git a/bsp/buildroot/package/trinity/0001-compat-handle-removed-autofs-macros.patch b/bsp/buildroot/package/trinity/0001-compat-handle-removed-autofs-macros.patch
new file mode 100644
index 00000000..e3c6ee3b
--- /dev/null
+++ b/bsp/buildroot/package/trinity/0001-compat-handle-removed-autofs-macros.patch
@@ -0,0 +1,61 @@
+From e4f31d5a1ce65974c2a6b2e6e1a2b16fffc51518 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Tue, 28 Nov 2017 10:15:22 +0100
+Subject: [PATCH] compat: handle removed autofs macros
+
+In file included from ioctls/autofs.c:4:0:
+ioctls/autofs.c:241:8: error: 'AUTOFS_IOC_EXPIRE_INDIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_CMD'?
+  IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
+        ^
+include/ioctls.h:53:15: note: in definition of macro 'IOCTL'
+  { .request = _request, .name = #_request, }
+               ^~~~~~~~
+ioctls/autofs.c:242:8: error: 'AUTOFS_IOC_EXPIRE_DIRECT' undeclared here (not in a function); did you mean 'AUTOFS_IOC_EXPIRE_INDIRECT'?
+  IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
+        ^
+include/ioctls.h:53:15: note: in definition of macro 'IOCTL'
+  { .request = _request, .name = #_request, }
+               ^~~~~~~~
+
+Define them as AUTOFS_IOC_EXPIRE_MULTI as they used to be.
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Patch status: upstream commit e4f31d5a1ce
+
+ include/compat.h | 8 ++++++++
+ ioctls/autofs.c  | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/include/compat.h b/include/compat.h
+index 10065ceca5f6..fc9a1b95ac4c 100644
+--- a/include/compat.h
++++ b/include/compat.h
+@@ -1209,3 +1209,11 @@ struct kvm_get_htab_fd {
+ #ifndef SO_IP_SET
+ #define SO_IP_SET 83
+ #endif
++
++/* linux/auto_fs4.h */
++#ifndef AUTOFS_IOC_EXPIRE_INDIRECT
++#define AUTOFS_IOC_EXPIRE_INDIRECT AUTOFS_IOC_EXPIRE_MULTI
++#endif
++#ifndef AUTOFS_IOC_EXPIRE_DIRECT
++#define AUTOFS_IOC_EXPIRE_DIRECT AUTOFS_IOC_EXPIRE_MULTI
++#endif
+diff --git a/ioctls/autofs.c b/ioctls/autofs.c
+index 04a3eb811326..a39ccccc056b 100644
+--- a/ioctls/autofs.c
++++ b/ioctls/autofs.c
+@@ -8,6 +8,7 @@
+ #include "shm.h"
+ #include "syscall.h"
+ #include "utils.h"
++#include "compat.h"
+ 
+ /* include/linux/auto_dev-ioctl.h */
+ /*
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/trinity/0001-mips-fix-prctl-s.patch b/bsp/buildroot/package/trinity/0001-mips-fix-prctl-s.patch
deleted file mode 100644
index aacd8d5b..00000000
--- a/bsp/buildroot/package/trinity/0001-mips-fix-prctl-s.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d61dd102b95b9791e45d6bbf1e34814b8c6c1731 Mon Sep 17 00:00:00 2001
-From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-Date: Mon, 14 Dec 2015 14:46:37 +0000
-Subject: [PATCH] mips: fix prctl's
-
-It looks like a typo in the syscalls/prctl.c file. It's lacking the PR_
-preffix, and due to that is causing build failures like this one:
-
-  CC	syscalls/prctl.o
-syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a
-function)
-  GET_FP_MODE, SET_FP_MODE,
-  ^
-syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not
-in a function)
-  GET_FP_MODE, SET_FP_MODE,
-               ^
-
-Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
----
- syscalls/prctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/syscalls/prctl.c b/syscalls/prctl.c
-index 523f03e..5a64fb3 100644
---- a/syscalls/prctl.c
-+++ b/syscalls/prctl.c
-@@ -34,7 +34,7 @@ static int prctl_opts[] = {
- 	PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE,
- 	PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT,
- #ifdef __mips__
--	GET_FP_MODE, SET_FP_MODE,
-+	PR_GET_FP_MODE, PR_SET_FP_MODE,
- #endif
- 	PR_CAP_AMBIENT,
- };
--- 
-2.4.10
-
diff --git a/bsp/buildroot/package/trinity/Config.in b/bsp/buildroot/package/trinity/Config.in
index 0ce1f9aa..31a93057 100644
--- a/bsp/buildroot/package/trinity/Config.in
+++ b/bsp/buildroot/package/trinity/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
 	bool
 	default y
 	depends on BR2_USE_MMU # fork()
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # __sync_val_compare_and_swap_4
 	depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \
 		BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \
 		BR2_powerpc64le || BR2_sparc || BR2_x86_64
@@ -9,14 +10,12 @@ config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
 config BR2_PACKAGE_TRINITY
 	bool "trinity"
 	depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # IPV6_UNICAST_IF
 	help
 	  A Linux System call fuzz tester
 
 	  http://codemonkey.org.uk/projects/trinity/
 
-comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4"
+comment "trinity needs a toolchain w/ headers >= 3.4"
 	depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_USES_MUSL || \
-		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
diff --git a/bsp/buildroot/package/trinity/trinity.hash b/bsp/buildroot/package/trinity/trinity.hash
index 5bf9992d..20006533 100644
--- a/bsp/buildroot/package/trinity/trinity.hash
+++ b/bsp/buildroot/package/trinity/trinity.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9  trinity-v1.6.tar.gz
-sha256 5601474b10973b99f6f4ecc67c8ac54000754d7110553cc81c7648bd7e73c810  b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch
+sha256 8cadc4221660b7accc4728311ce1a130ac9b9d1f3b04e35508ba0cc80d9c3f94  trinity-1.8.tar.xz
+sha256 35e3fc68c89fd7b8f72fd910b521cb3292f859e9181f3c26bd0df84d144bc1d4  COPYING
diff --git a/bsp/buildroot/package/trinity/trinity.mk b/bsp/buildroot/package/trinity/trinity.mk
index ee00d782..b75c4694 100644
--- a/bsp/buildroot/package/trinity/trinity.mk
+++ b/bsp/buildroot/package/trinity/trinity.mk
@@ -4,15 +4,14 @@
 #
 ################################################################################
 
-TRINITY_VERSION = v1.6
-TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION))
-TRINITY_LICENSE = GPLv2
+TRINITY_VERSION = 1.8
+TRINITY_SITE = http://codemonkey.org.uk/projects/trinity
+TRINITY_SOURCE = trinity-$(TRINITY_VERSION).tar.xz
+TRINITY_LICENSE = GPL-2.0
 TRINITY_LICENSE_FILES = COPYING
 
-TRINITY_PATCH = https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch
-
 define TRINITY_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh)
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure)
 endef
 
 define TRINITY_BUILD_CMDS
diff --git a/bsp/buildroot/package/trousers/Config.in b/bsp/buildroot/package/trousers/Config.in
index de3b9519..7a147062 100644
--- a/bsp/buildroot/package/trousers/Config.in
+++ b/bsp/buildroot/package/trousers/Config.in
@@ -1,18 +1,18 @@
 config BR2_PACKAGE_TROUSERS
 	bool "trousers"
-	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# doesn't build properly in static only configurations
 	depends on !BR2_STATIC_LIBS
 	# ARC toolchain issue
 	depends on !BR2_arc
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  The open-source TCG Software Stack (TSS).
 
-	  This library enables the use of a Trusted Platform Module that
-	  complies with the TPM specification, version 1.2. It implements the
-	  TSS specification, version 1.2.
+	  This library enables the use of a Trusted Platform Module
+	  that complies with the TPM specification, version 1.2. It
+	  implements the TSS specification, version 1.2.
 
 	  http://trousers.sourceforge.net/
 
diff --git a/bsp/buildroot/package/trousers/trousers.mk b/bsp/buildroot/package/trousers/trousers.mk
index 41129eb0..e49c2ac1 100644
--- a/bsp/buildroot/package/trousers/trousers.mk
+++ b/bsp/buildroot/package/trousers/trousers.mk
@@ -1,12 +1,12 @@
-#############################################################
+################################################################################
 #
 # trousers
 #
-##############################################################
+################################################################################
 
 TROUSERS_VERSION = 0.3.13
 TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION)
-TROUSERS_LICENSE = BSD-3c
+TROUSERS_LICENSE = BSD-3-Clause
 TROUSERS_LICENSE_FILES = LICENSE
 TROUSERS_INSTALL_STAGING = YES
 # Need autoreconf because of a patch touching configure.in and Makefile.am
diff --git a/bsp/buildroot/package/ts4900-fpga/Config.in b/bsp/buildroot/package/ts4900-fpga/Config.in
index 7910631b..7aa94e26 100644
--- a/bsp/buildroot/package/ts4900-fpga/Config.in
+++ b/bsp/buildroot/package/ts4900-fpga/Config.in
@@ -2,11 +2,10 @@ config BR2_PACKAGE_TS4900_FPGA
 	bool "ts4900-fpga"
 	depends on BR2_arm
 	help
-	  TS-4900's FPGA implements clocks, UART MUX, and GPIOs. One of these
-	  GPIOs is used to enable the wifi module.
+	  TS-4900's FPGA implements clocks, UART MUX, and GPIOs. One
+	  of these GPIOs is used to enable the wifi module.
 
-	  It is loaded by U-Boot during the boot sequence, the default U-boot
-	  script expects to find it in the /boot folder.
+	  It is loaded by U-Boot during the boot sequence, the default
+	  U-boot script expects to find it in the /boot folder.
 
 	  http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog
-
diff --git a/bsp/buildroot/package/tslib/Config.in b/bsp/buildroot/package/tslib/Config.in
index bc5d7901..a2e1e7ff 100644
--- a/bsp/buildroot/package/tslib/Config.in
+++ b/bsp/buildroot/package/tslib/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_TSLIB
 	bool "tslib"
-	depends on !BR2_STATIC_LIBS # dlopen
 	help
 	  Tslib is a filtering layer for touchscreen panel events.
 
-	  https://github.com/kergoth/tslib
-
-comment "tslib needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
+	  http://tslib.org
diff --git a/bsp/buildroot/package/tslib/tslib.hash b/bsp/buildroot/package/tslib/tslib.hash
index d7ae4dce..f0c6ff84 100644
--- a/bsp/buildroot/package/tslib/tslib.hash
+++ b/bsp/buildroot/package/tslib/tslib.hash
@@ -1,2 +1,5 @@
-# https://github.com/kergoth/tslib/releases/download/1.5/tslib-1.5.tar.xz.sha256
-sha256  94874fe72c5af5c9be642a2ce524f014eb1d59d15cf852f2d3b2cf380f04252d  tslib-1.5.tar.xz
+# https://github.com/kergoth/tslib/releases/download/1.15/tslib-1.15.tar.xz.sha256
+sha256  7ce48807cab655076d71a1ceef3ed0ab8a25df98074981d4a8fd1477ee5f710c  tslib-1.15.tar.xz
+
+# Locally computed
+sha256  9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9  COPYING
diff --git a/bsp/buildroot/package/tslib/tslib.mk b/bsp/buildroot/package/tslib/tslib.mk
index 36506502..3ba94d25 100644
--- a/bsp/buildroot/package/tslib/tslib.mk
+++ b/bsp/buildroot/package/tslib/tslib.mk
@@ -4,13 +4,12 @@
 #
 ################################################################################
 
-TSLIB_VERSION = 1.5
+TSLIB_VERSION = 1.15
 TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION)
 TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz
 TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 TSLIB_LICENSE_FILES = COPYING
 
-TSLIB_AUTORECONF = YES
 TSLIB_INSTALL_STAGING = YES
 TSLIB_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install
 
@@ -18,4 +17,18 @@ ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6),)
 TSLIB_CONF_OPTS += --disable-tools
 endif
 
+ifeq ($(BR2_STATIC_LIBS),y)
+TSLIB_CONF_OPTS += \
+	--enable-input=static \
+	--enable-linear=static \
+	--enable-median=static \
+	--enable-pthres=static \
+	--enable-iir=static \
+	--enable-dejitter=static \
+	--enable-debounce=static \
+	--enable-skip=static \
+	--enable-lowpass=static \
+	--enable-invert=static
+endif
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tstools/Config.in b/bsp/buildroot/package/tstools/Config.in
index ca5f8fc2..0c55bde9 100644
--- a/bsp/buildroot/package/tstools/Config.in
+++ b/bsp/buildroot/package/tstools/Config.in
@@ -3,16 +3,17 @@ config BR2_PACKAGE_TSTOOLS
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
 	help
-	  This is a set of cross-platform command line tools for working with
-	  MPEG data.
+	  This is a set of cross-platform command line tools for
+	  working with MPEG data.
 
-	  The emphasis is on relatively simple tools which concentrate on MPEG
-	  (H.264 and H.262) data packaged according to H.222 (i.e., TS or PS),
-	  with a particular interest in checking for conformance.
+	  The emphasis is on relatively simple tools which concentrate
+	  on MPEG (H.264 and H.262) data packaged according to H.222
+	  (i.e., TS or PS), with a particular interest in checking for
+	  conformance.
 
-	  Transport Stream (TS) is typically used for distribution of cable
-	  and satellite data. Program Stream (PS) is typically used to store
-	  data on DVDs.
+	  Transport Stream (TS) is typically used for distribution of
+	  cable and satellite data. Program Stream (PS) is typically
+	  used to store data on DVDs.
 
 	  https://github.com/kynesim/tstools/
 
diff --git a/bsp/buildroot/package/tstools/tstools.mk b/bsp/buildroot/package/tstools/tstools.mk
index 3355db86..99f7ca9b 100644
--- a/bsp/buildroot/package/tstools/tstools.mk
+++ b/bsp/buildroot/package/tstools/tstools.mk
@@ -9,7 +9,7 @@ TSTOOLS_VERSION = 08f6be304040e7b84760ac3920bcff4a563b6cd2
 TSTOOLS_SITE = $(call github,kynesim,tstools,$(TSTOOLS_VERSION))
 # tstools upstream doesn't contain any license file so far. See:
 # https://github.com/kynesim/tstools/issues/32
-TSTOOLS_LICENSE = MPLv1.1
+TSTOOLS_LICENSE = MPL-1.1
 TSTOOLS_LICENSE_FILES =
 
 define TSTOOLS_BUILD_CMDS
diff --git a/bsp/buildroot/package/tunctl/tunctl.mk b/bsp/buildroot/package/tunctl/tunctl.mk
index 30dbbd13..0d7b88df 100644
--- a/bsp/buildroot/package/tunctl/tunctl.mk
+++ b/bsp/buildroot/package/tunctl/tunctl.mk
@@ -7,7 +7,7 @@
 TUNCTL_VERSION = 1.5
 TUNCTL_SITE = http://downloads.sourceforge.net/project/tunctl/tunctl/$(TUNCTL_VERSION)
 
-TUNCTL_LICENSE = GPLv2
+TUNCTL_LICENSE = GPL-2.0
 TUNCTL_LICENSE_FILES = tunctl.c
 
 define TUNCTL_BUILD_CMDS
diff --git a/bsp/buildroot/package/turbolua/turbolua.hash b/bsp/buildroot/package/turbolua/turbolua.hash
index d460b4f6..c2a60444 100644
--- a/bsp/buildroot/package/turbolua/turbolua.hash
+++ b/bsp/buildroot/package/turbolua/turbolua.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 bff771b6a670f764366eff50e1644f1c5d8d526324e0b6adfda42d9f69791833 turbolua-6fbc5cbfed1cc8c3820d4c1bfb55258c764040f0.tar.gz
+sha256 a2c30534706fb475545b17a017c63479e93e5e9bf1f5ed88c0db22bb4ea7b4b1 turbolua-v2.1.2.tar.gz
diff --git a/bsp/buildroot/package/turbolua/turbolua.mk b/bsp/buildroot/package/turbolua/turbolua.mk
index bf9e27f1..49a5559e 100644
--- a/bsp/buildroot/package/turbolua/turbolua.mk
+++ b/bsp/buildroot/package/turbolua/turbolua.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TURBOLUA_VERSION = 6fbc5cbfed1cc8c3820d4c1bfb55258c764040f0
+TURBOLUA_VERSION = v2.1.2
 TURBOLUA_SITE = $(call github,kernelsauce,turbo,$(TURBOLUA_VERSION))
 TURBOLUA_DEPENDENCIES = luajit
 TURBOLUA_LICENSE = Apache-2.0
diff --git a/bsp/buildroot/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch b/bsp/buildroot/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch
new file mode 100644
index 00000000..deed9f98
--- /dev/null
+++ b/bsp/buildroot/package/tvheadend/0002-sbuf-fix-uclibc-compilation-error.patch
@@ -0,0 +1,33 @@
+From b16ad4d258409fbd6acf843d62a7a84f621e3b70 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Mon, 18 Dec 2017 20:52:06 +0100
+Subject: [PATCH] sbuf: fix uclibc compilation error
+
+Fixes build error
+
+tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3/src/sbuf.h:77:1:
+ error: unknown type name 'ssize_t'; did you mean 'size_t'?
+ ssize_t sbuf_read(sbuf_t *sb, int fd);
+
+Patch sent upstream: https://github.com/tvheadend/tvheadend/pull/1062
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/sbuf.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/sbuf.h b/src/sbuf.h
+index 78aa546b3..d5aa53042 100644
+--- a/src/sbuf.h
++++ b/src/sbuf.h
+@@ -23,6 +23,7 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <stdint.h>
++#include <unistd.h>
+ 
+ /**
+  * Simple dynamically growing buffer
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/tvheadend/Config.in b/bsp/buildroot/package/tvheadend/Config.in
index fc39d6f4..de37b614 100644
--- a/bsp/buildroot/package/tvheadend/Config.in
+++ b/bsp/buildroot/package/tvheadend/Config.in
@@ -1,30 +1,45 @@
 comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library"
+	depends on !BR2_microblazeel
 	depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 
 config BR2_PACKAGE_TVHEADEND
 	bool "tvheadend"
+	depends on !BR2_microblazeel # assertion failure in binutils
 	depends on !BR2_STATIC_LIBS # dladdr()
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	select BR2_PACKAGE_DTV_SCAN_TABLES
-	select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG
-	select BR2_PACKAGE_LIBVPX if BR2_PACKAGE_FFMPEG && !BR2_bfin # libvpx
-	select BR2_PACKAGE_X264 if BR2_PACKAGE_FFMPEG
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	select BR2_PACKAGE_OPENSSL
 	help
-	  Tvheadend is a TV streaming server for Linux supporting DVB-S,
-	  DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as
-	  input sources.
+
+	  Tvheadend is a TV streaming server for Linux supporting
+	  DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video
+	  (V4L) as input sources.
 
 	  https://www.lonelycoder.com/redmine/projects/tvheadend/
 
 	  Note:
-	    - on first run, tvheadend will start in wizard mode; the webUI
-	      is available on port 9981.
+	    - on first run, tvheadend will start in wizard mode; the
+	      webUI is available on port 9981.
 	    - if you want Avahi support, you'll need to enable:
 	          Avahi, D-Bus, libdaemon
+
+if BR2_PACKAGE_TVHEADEND
+
+config BR2_PACKAGE_TVHEADEND_TRANSCODING
+	bool "transcoding support"
+	depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
+	select BR2_PACKAGE_FFMPEG
+	select BR2_PACKAGE_FFMPEG_AVRESAMPLE
+	select BR2_PACKAGE_FFMPEG_GPL # needed for x264 support
+	select BR2_PACKAGE_FFMPEG_SWSCALE
+	select BR2_PACKAGE_LIBVPX if !BR2_bfin # libvpx
+	select BR2_PACKAGE_X264
+	help
+	  Enable transcoding support.
+
+endif
diff --git a/bsp/buildroot/package/tvheadend/tvheadend.hash b/bsp/buildroot/package/tvheadend/tvheadend.hash
index d34dbf1f..4e890a82 100644
--- a/bsp/buildroot/package/tvheadend/tvheadend.hash
+++ b/bsp/buildroot/package/tvheadend/tvheadend.hash
@@ -1,2 +1,3 @@
 # Locally computed
-sha256 ac3c088654864781f2b2a2797e3a8b03a1b2e86db731c08cb5f296a04069560d  tvheadend-e5f5a4278949afc96e26d6cd50cf968e0e92d7b6.tar.gz
+sha256 32f96937a3ffa72b5bdbfde9a5f9f9535f88e94e44864d4c8c6a152985c16569  tvheadend-e06ffd87beff16103c47d6fa542df2374fca6fd3.tar.gz
+sha256 54dc3cbc00bf126bcba43e2af7f3ad1dc00f335985da1409fa943c7b7256d942  LICENSE.md
diff --git a/bsp/buildroot/package/tvheadend/tvheadend.mk b/bsp/buildroot/package/tvheadend/tvheadend.mk
index 42c6767f..45ea7bfc 100644
--- a/bsp/buildroot/package/tvheadend/tvheadend.mk
+++ b/bsp/buildroot/package/tvheadend/tvheadend.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-TVHEADEND_VERSION = e5f5a4278949afc96e26d6cd50cf968e0e92d7b6
+TVHEADEND_VERSION = e06ffd87beff16103c47d6fa542df2374fca6fd3
 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION))
-TVHEADEND_LICENSE = GPLv3+
+TVHEADEND_LICENSE = GPL-3.0+
 TVHEADEND_LICENSE_FILES = LICENSE.md
 TVHEADEND_DEPENDENCIES = \
 	host-gettext \
 	host-pkgconf \
+	host-pngquant \
 	$(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \
 	openssl
 
@@ -25,11 +26,41 @@ else
 TVHEADEND_CONF_OPTS += --disable-dbus-1
 endif
 
-ifeq ($(BR2_PACKAGE_FFMPEG),y)
-TVHEADEND_DEPENDENCIES += ffmpeg
-TVHEADEND_CONF_OPTS += --enable-libav
+ifeq ($(BR2_PACKAGE_TVHEADEND_TRANSCODING),y)
+TVHEADEND_CONF_OPTS += --enable-libav --enable-libx264
+TVHEADEND_DEPENDENCIES += ffmpeg x264
+ifeq ($(BR2_PACKAGE_LIBVA)$(BR2_PACKAGE_XORG7),yy)
+TVHEADEND_CONF_OPTS += --enable-vaapi
+TVHEADEND_DEPENDENCIES += libva
 else
-TVHEADEND_CONF_OPTS += --disable-libav
+TVHEADEND_CONF_OPTS += --disable-vaapi
+endif
+ifeq ($(BR2_PACKAGE_OPUS),y)
+TVHEADEND_CONF_OPTS += --enable-libopus
+TVHEADEND_DEPENDENCIES += opus
+else
+TVHEADEND_CONF_OPTS += --disable-libopus
+endif
+ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
+TVHEADEND_CONF_OPTS += --enable-omx
+TVHEADEND_DEPENDENCIES += rpi-userland
+else
+TVHEADEND_CONF_OPTS += --disable-omx
+endif
+ifeq ($(BR2_PACKAGE_X265),y)
+TVHEADEND_CONF_OPTS += --enable-libx265
+TVHEADEND_DEPENDENCIES += x265
+else
+TVHEADEND_CONF_OPTS += --disable-libx265
+endif
+else
+TVHEADEND_CONF_OPTS += \
+	--disable-libav \
+	--disable-libopus \
+	--disable-omx \
+	--disable-vaapi \
+	--disable-libx264 \
+	--disable-libx265
 endif
 
 ifeq ($(BR2_PACKAGE_LIBDVBCSA),y)
@@ -56,6 +87,13 @@ TVHEADEND_DEPENDENCIES += liburiparser
 TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 endif
 
+ifeq ($(BR2_PACKAGE_PCRE),y)
+TVHEADEND_DEPENDENCIES += pcre
+TVHEADEND_CONF_OPTS += --enable-pcre
+else
+TVHEADEND_CONF_OPTS += --disable-pcre
+endif
+
 TVHEADEND_DEPENDENCIES += dtv-scan-tables
 
 # The tvheadend build system expects the transponder data to be present inside
@@ -69,24 +107,31 @@ endef
 TVHEADEND_PRE_CONFIGURE_HOOKS += TVHEADEND_INSTALL_DTV_SCAN_TABLES
 
 define TVHEADEND_CONFIGURE_CMDS
-	(cd $(@D);						\
-		$(TARGET_CONFIGURE_OPTS)			\
-		$(TARGET_CONFIGURE_ARGS)			\
-		CFLAGS="$(TVHEADEND_CFLAGS)"			\
-		./configure					\
-			--prefix=/usr				\
-			--arch="$(ARCH)"			\
-			--cpu="$(BR2_GCC_TARGET_CPU)"		\
-			--nowerror				\
-			--python="$(HOST_DIR)/usr/bin/python"	\
-			--enable-dvbscan			\
-			--enable-bundle				\
-			--disable-ffmpeg_static			\
-			--disable-hdhomerun_static		\
-			$(TVHEADEND_CONF_OPTS)			\
+	(cd $(@D); \
+		$(TARGET_CONFIGURE_OPTS) \
+		$(TARGET_CONFIGURE_ARGS) \
+		CFLAGS="$(TVHEADEND_CFLAGS)" \
+		./configure \
+			--prefix=/usr \
+			--arch="$(ARCH)" \
+			--cpu="$(BR2_GCC_TARGET_CPU)" \
+			--nowerror \
+			--python="$(HOST_DIR)/bin/python" \
+			--enable-dvbscan \
+			--enable-bundle \
+			--enable-pngquant \
+			--disable-ffmpeg_static \
+			--disable-hdhomerun_static \
+			$(TVHEADEND_CONF_OPTS) \
 	)
 endef
 
+define TVHEADEND_FIX_PNGQUANT_PATH
+	$(SED) "s%^pngquant_bin =.*%pngquant_bin = '$(HOST_DIR)/bin/pngquant'%" \
+		$(@D)/support/mkbundle
+endef
+TVHEADEND_POST_CONFIGURE_HOOKS += TVHEADEND_FIX_PNGQUANT_PATH
+
 define TVHEADEND_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
diff --git a/bsp/buildroot/package/twolame/Config.in b/bsp/buildroot/package/twolame/Config.in
index 3d8f23d6..95b148b8 100644
--- a/bsp/buildroot/package/twolame/Config.in
+++ b/bsp/buildroot/package/twolame/Config.in
@@ -2,8 +2,8 @@ config BR2_PACKAGE_TWOLAME
 	bool "twolame"
 	select BR2_PACKAGE_LIBSNDFILE
 	help
-	  TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
-	  tooLAME by Mike Cheng, which in turn is based upon the ISO dist10
-	  code and portions of LAME.
+	  TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder
+	  based on tooLAME by Mike Cheng, which in turn is based upon
+	  the ISO dist10 code and portions of LAME.
 
 	  http://www.twolame.org/
diff --git a/bsp/buildroot/package/twolame/twolame.mk b/bsp/buildroot/package/twolame/twolame.mk
index a26491f4..d5628d1b 100644
--- a/bsp/buildroot/package/twolame/twolame.mk
+++ b/bsp/buildroot/package/twolame/twolame.mk
@@ -8,7 +8,7 @@ TWOLAME_VERSION = 0.3.13
 TWOLAME_SITE = http://downloads.sourceforge.net/project/twolame/twolame/$(TWOLAME_VERSION)
 TWOLAME_DEPENDENCIES = host-pkgconf libsndfile
 TWOLAME_INSTALL_STAGING = YES
-TWOLAME_LICENSE = LGPLv2.1+
+TWOLAME_LICENSE = LGPL-2.1+
 TWOLAME_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/tz/tz.mk b/bsp/buildroot/package/tz/tz.mk
index f0daf465..1e797046 100644
--- a/bsp/buildroot/package/tz/tz.mk
+++ b/bsp/buildroot/package/tz/tz.mk
@@ -10,30 +10,27 @@ TZ_LICENSE = Public domain
 TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME))
 
 define TZ_BUILD_CMDS
-	(cd $(HOST_DIR)/usr/share/zoneinfo/posix/;                 \
-		for i in $$(find . -type f); do                    \
-			mkdir -p $(@D)/output/$$(dirname $$i);         \
+	(cd $(HOST_DIR)/share/zoneinfo/posix/; \
+		for i in $$(find . -type f); do \
+			mkdir -p $(@D)/output/$$(dirname $$i); \
 			$(TZDUMP) -p . -q $${i#./} | sed '1d' > $(@D)/output/$$i; \
-		done                                               \
+		done \
 	)
 endef
 
 define TZ_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/zone.tab \
+	$(INSTALL) -D -m 0644 $(HOST_DIR)/share/zoneinfo/zone.tab \
 		$(TARGET_DIR)/usr/share/zoneinfo/zone.tab
-	$(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/iso3166.tab \
+	$(INSTALL) -D -m 0644 $(HOST_DIR)/share/zoneinfo/iso3166.tab \
 		$(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab
 	mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc
 	cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc
-	if [ -n "$(TZ_LOCALTIME)" ]; then                               \
-		if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \
-			printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
-			"$(TZDATA_LOCALTIME)";                              \
-			exit 1;                                             \
-		fi;                                                         \
-		cd $(TARGET_DIR)/etc;                                       \
-		ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \
+	if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZ_LOCALTIME) ]; then \
+		printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
+			"$(TZ_LOCALTIME)"; \
+		exit 1; \
 	fi
+	ln -sf ../usr/share/zoneinfo/uclibc/$(TZ_LOCALTIME) $(TARGET_DIR)/etc/TZ
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/tzdata/tzdata.hash b/bsp/buildroot/package/tzdata/tzdata.hash
index b98e579e..cfcd49ef 100644
--- a/bsp/buildroot/package/tzdata/tzdata.hash
+++ b/bsp/buildroot/package/tzdata/tzdata.hash
@@ -1,2 +1,2 @@
-# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html
-sha512 ce0b9958b764479fac7df6b5ba0933fc4c6d815ebccc2537c75c4be105691cd58054704eebfb50ca755d7d48504480d4925ce8836eb499ae4798e3d5503d7e0e	tzdata2016j.tar.gz
+# From http://mm.icann.org/pipermail/tz-announce/2018-January/000048.html
+sha512 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835	tzdata2018c.tar.gz
diff --git a/bsp/buildroot/package/tzdata/tzdata.mk b/bsp/buildroot/package/tzdata/tzdata.mk
index d6285145..28323e84 100644
--- a/bsp/buildroot/package/tzdata/tzdata.mk
+++ b/bsp/buildroot/package/tzdata/tzdata.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TZDATA_VERSION = 2016j
+TZDATA_VERSION = 2018c
 TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz
 TZDATA_SITE = http://www.iana.org/time-zones/repository/releases
 TZDATA_STRIP_COMPONENTS = 0
@@ -31,21 +31,18 @@ TZDATA_EXTRACT_CMDS =
 
 define TZDATA_INSTALL_TARGET_CMDS
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo
-	cp -a $(HOST_DIR)/usr/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo
-	cd $(TARGET_DIR)/usr/share/zoneinfo;    \
-	for zone in posix/*; do                 \
-	    ln -sfn "$${zone}" "$${zone##*/}";  \
+	cp -a $(HOST_DIR)/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo
+	cd $(TARGET_DIR)/usr/share/zoneinfo; \
+	for zone in posix/*; do \
+	    ln -sfn "$${zone}" "$${zone##*/}"; \
 	done
-	if [ -n "$(TZDATA_LOCALTIME)" ]; then                           \
-	    if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
-	        printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
-	               "$(TZDATA_LOCALTIME)";                           \
-	        exit 1;                                                 \
-	    fi;                                                         \
-	    cd $(TARGET_DIR)/etc;                                       \
-	    ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \
-	    echo "$(TZDATA_LOCALTIME)" >timezone;                       \
+	if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \
+		printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \
+			"$(TZDATA_LOCALTIME)"; \
+		exit 1; \
 	fi
+	ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) $(TARGET_DIR)/etc/localtime
+	echo "$(TZDATA_LOCALTIME)" >$(TARGET_DIR)/etc/timezone
 endef
 
 define HOST_TZDATA_BUILD_CMDS
@@ -58,8 +55,8 @@ define HOST_TZDATA_BUILD_CMDS
 endef
 
 define HOST_TZDATA_INSTALL_CMDS
-	$(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/zoneinfo
-	cp -a $(@D)/_output/* $(@D)/*.tab $(HOST_DIR)/usr/share/zoneinfo
+	$(INSTALL) -d -m 0755 $(HOST_DIR)/share/zoneinfo
+	cp -a $(@D)/_output/* $(@D)/*.tab $(HOST_DIR)/share/zoneinfo
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/tzdump/tzdump.mk b/bsp/buildroot/package/tzdump/tzdump.mk
index 3f035a56..baad978c 100644
--- a/bsp/buildroot/package/tzdump/tzdump.mk
+++ b/bsp/buildroot/package/tzdump/tzdump.mk
@@ -13,9 +13,9 @@ define HOST_TZDUMP_BUILD_CMDS
 endef
 
 define HOST_TZDUMP_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/tzdump $(HOST_DIR)/usr/sbin/tzdump
+	$(INSTALL) -m 0755 -D $(@D)/tzdump $(HOST_DIR)/sbin/tzdump
 endef
 
 $(eval $(host-generic-package))
 
-TZDUMP = $(HOST_DIR)/usr/sbin/tzdump
+TZDUMP = $(HOST_DIR)/sbin/tzdump
diff --git a/bsp/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch b/bsp/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch
index fbc96084..f19cebee 100644
--- a/bsp/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch
+++ b/bsp/buildroot/package/uboot-tools/0001-drop-configh-from-tools.patch
@@ -1,4 +1,4 @@
-From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001
+From 216832de3bc3e6ef093305c6d07f464f7606f2d6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
 Date: Tue, 4 Aug 2015 22:13:20 +0200
 Subject: [PATCH] drop configh from tools
@@ -13,17 +13,20 @@ image, so it really isn't mandatory.
 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 [Jörg Krause: update for version 2015.07]
 Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
+[Romain: update for version 2017.05
+    after commit 9d80b49a671c9922931adcd823aab0ed319a42d1]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
- tools/env/fw_env.h | 11 -----------
+ tools/env/fw_env_private.h | 11 -----------
  1 file changed, 11 deletions(-)
 
-diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h
-index 57149e7..50049fe 100644
---- a/tools/env/fw_env.h
-+++ b/tools/env/fw_env.h
-@@ -8,17 +8,6 @@
- #include <aes.h>
- #include <stdint.h>
+diff --git a/tools/env/fw_env_private.h b/tools/env/fw_env_private.h
+index 0c27da0..e550463 100644
+--- a/tools/env/fw_env_private.h
++++ b/tools/env/fw_env_private.h
+@@ -5,17 +5,6 @@
+  * SPDX-License-Identifier:	GPL-2.0+
+  */
  
 -/* Pull in the current config to define the default environment */
 -#include <linux/kconfig.h>
@@ -40,5 +43,5 @@ index 57149e7..50049fe 100644
   * To build the utility with the static configuration
   * comment out the next line.
 -- 
-2.7.4
+2.9.4
 
diff --git a/bsp/buildroot/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch b/bsp/buildroot/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch
new file mode 100644
index 00000000..9f183428
--- /dev/null
+++ b/bsp/buildroot/package/uboot-tools/0004-tools-Include-U-Boot-libfdt-headers-from-their-actua.patch
@@ -0,0 +1,33 @@
+From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001
+From: Paul Kocialkowski <contact@paulk.fr>
+Date: Fri, 2 Mar 2018 23:13:42 +0100
+Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path
+
+There are no headers for libfdt in lib/libfdt, as they are instead
+located in scripts/dtc/libfdt. Specifying lib/libfdt for headers
+inclusion in host tools results in using the system libfdt headers,
+which is not what we want. Change this to the proper path.
+
+Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
+[Backport from upstream commit e0d20dc1521e74b82dbd69be53a048847798a90a]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ tools/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/Makefile b/tools/Makefile
+index d3387fad69..f38f68ee47 100644
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -244,7 +244,7 @@ endif # !LOGO_BMP
+ #
+ HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \
+ 		$(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \
+-		-I$(srctree)/lib/libfdt \
++		-I$(srctree)/scripts/dtc/libfdt \
+ 		-I$(srctree)/tools \
+ 		-DUSE_HOSTCC \
+ 		-D__KERNEL_STRICT_NAMES \
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/uboot-tools/Config.in b/bsp/buildroot/package/uboot-tools/Config.in
index f55614ba..63a058e8 100644
--- a/bsp/buildroot/package/uboot-tools/Config.in
+++ b/bsp/buildroot/package/uboot-tools/Config.in
@@ -63,8 +63,8 @@ config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE
 	  Install the mkenvimage tool on the target system
 
 	  The mkenvimage tool from Das U-Boot bootloader, which allows
-	  generation of a valid binary environment image from a text file
-	  describing the key=value pairs of the environment.
+	  generation of a valid binary environment image from a text
+	  file describing the key=value pairs of the environment.
 
 config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV
 	bool "fw_printenv"
diff --git a/bsp/buildroot/package/uboot-tools/uboot-tools.hash b/bsp/buildroot/package/uboot-tools/uboot-tools.hash
index 5473cfea..9425df3f 100644
--- a/bsp/buildroot/package/uboot-tools/uboot-tools.hash
+++ b/bsp/buildroot/package/uboot-tools/uboot-tools.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2  u-boot-2017.01.tar.bz2
+sha256  938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda  u-boot-2018.01.tar.bz2
diff --git a/bsp/buildroot/package/uboot-tools/uboot-tools.mk b/bsp/buildroot/package/uboot-tools/uboot-tools.mk
index fe363e7e..94648cc6 100644
--- a/bsp/buildroot/package/uboot-tools/uboot-tools.mk
+++ b/bsp/buildroot/package/uboot-tools/uboot-tools.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-UBOOT_TOOLS_VERSION = 2017.01
+UBOOT_TOOLS_VERSION = 2018.01
 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2
 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot
-UBOOT_TOOLS_LICENSE = GPLv2+
+UBOOT_TOOLS_LICENSE = GPL-2.0+
 UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt
 UBOOT_TOOLS_INSTALL_STAGING = YES
 
@@ -19,10 +19,11 @@ endef
 UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \
 	CFLAGS="$(TARGET_CFLAGS)" \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
+	HOSTCFLAGS="$(HOST_CFLAGS)" \
 	STRIP=$(TARGET_STRIP)
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),y)
-UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y
+UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y CONFIG_MKIMAGE_DTC_PATH=dtc
 UBOOT_TOOLS_DEPENDENCIES += dtc
 endif
 
@@ -35,7 +36,7 @@ define UBOOT_TOOLS_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \
 		CROSS_BUILD_TOOLS=y tools-only
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \
-		env no-dot-config-targets=env
+		envtools no-dot-config-targets=envtools
 endef
 
 ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y)
@@ -63,9 +64,6 @@ define UBOOT_TOOLS_INSTALL_DUMPIMAGE
 endef
 endif
 
-define UBOOT_TOOLS_INSTALL_LIBUBOOTENV
-endef
-
 define UBOOT_TOOLS_INSTALL_STAGING_CMDS
 	$(INSTALL) -D -m 0755 $(@D)/tools/env/lib.a $(STAGING_DIR)/usr/lib/libubootenv.a
 	$(INSTALL) -D -m 0644 $(@D)/tools/env/fw_env.h $(STAGING_DIR)/usr/include/fw_env.h
@@ -88,7 +86,7 @@ HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \
 	HOSTLDFLAGS="$(HOST_LDFLAGS)"
 
 ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),y)
-HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y
+HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y CONFIG_MKIMAGE_DTC_PATH=dtc
 HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc
 endif
 
@@ -102,9 +100,9 @@ define HOST_UBOOT_TOOLS_BUILD_CMDS
 endef
 
 define HOST_UBOOT_TOOLS_INSTALL_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage
-	$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage
-	$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/usr/bin/dumpimage
+	$(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/bin/mkimage
+	$(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/bin/mkenvimage
+	$(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/bin/dumpimage
 endef
 
 $(eval $(generic-package))
@@ -112,7 +110,7 @@ $(eval $(host-generic-package))
 
 # Convenience variables for other mk files that make use of mkimage
 
-MKIMAGE = $(HOST_DIR)/usr/bin/mkimage
+MKIMAGE = $(HOST_DIR)/bin/mkimage
 
 # mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86
 # KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa
diff --git a/bsp/buildroot/package/ubus/0001-Install-server-and-client-examples.patch b/bsp/buildroot/package/ubus/0001-Install-server-and-client-examples.patch
index 0ee4d3e6..5c985d8c 100644
--- a/bsp/buildroot/package/ubus/0001-Install-server-and-client-examples.patch
+++ b/bsp/buildroot/package/ubus/0001-Install-server-and-client-examples.patch
@@ -1,23 +1,28 @@
-Install server and client examples
+From aa4aea68a9d2a38fabb5ae8e5a0d05dfd7bcf907 Mon Sep 17 00:00:00 2001
+From: Rahul Jain <Rahul.Jain@imgtec.com>
+Date: Fri, 24 Mar 2017 18:03:24 +0530
+Subject: [PATCH] Install server and client examples
 
 Signed-off-by: Sergio Prado <sergio.prado@e-labworks.com>
+Signed-off-by: Rahul Jain <Rahul.Jain@imgtec.com>
+[Rahul Jain: rebase the patch on latest version]
 ---
  examples/CMakeLists.txt | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
-index 0279f6e66b50..2f8f4e026e20 100644
+index 81f9997..38f153f 100644
 --- a/examples/CMakeLists.txt
 +++ b/examples/CMakeLists.txt
 @@ -9,4 +9,8 @@ IF (BUILD_EXAMPLES)
  
  	ADD_EXECUTABLE(client client.c count.c)
- 	TARGET_LINK_LIBRARIES(client ubus ubox)
+ 	TARGET_LINK_LIBRARIES(client ubus ${ubox_library})
 +
 +	INSTALL(TARGETS server client
-+	        RUNTIME DESTINATION sbin
++		RUNTIME DESTINATION sbin
 +	)
  ENDIF()
 -- 
-1.9.1
+2.6.2
 
diff --git a/bsp/buildroot/package/ubus/Config.in b/bsp/buildroot/package/ubus/Config.in
index c14f6a86..28bf8e9a 100644
--- a/bsp/buildroot/package/ubus/Config.in
+++ b/bsp/buildroot/package/ubus/Config.in
@@ -4,19 +4,20 @@ comment "ubus needs a toolchain w/ dynamic library"
 
 config BR2_PACKAGE_UBUS
 	bool "ubus"
-	select BR2_PACKAGE_LIBUBOX
-	select BR2_PACKAGE_JSON_C
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
 	depends on !BR2_STATIC_LIBS # libubox
+	select BR2_PACKAGE_LIBUBOX
+	select BR2_PACKAGE_JSON_C
 	help
 	  IPC/RPC bus that allows communication between processes.
 
-	  It consists of few parts including a daemon (ubusd), a library
-	  (libubus) and a command line interface (ubus). Although created
-	  for the OpenWRT project, it can be used as a general IPC/RPC
-	  mechanism in other projects.
+	  It consists of few parts including a daemon (ubusd), a
+	  library (libubus) and a command line interface
+	  (ubus). Although created for the OpenWRT project, it can be
+	  used as a general IPC/RPC mechanism in other projects.
 
-	  * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua support.
+	  * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua
+	    support.
 
 	  https://wiki.openwrt.org/doc/techref/ubus
 
diff --git a/bsp/buildroot/package/ubus/ubus.hash b/bsp/buildroot/package/ubus/ubus.hash
index af9b652b..08297348 100644
--- a/bsp/buildroot/package/ubus/ubus.hash
+++ b/bsp/buildroot/package/ubus/ubus.hash
@@ -1,2 +1,2 @@
-# No hash for this git snapshot
-none  xxx  ubus-259450f414d8c9ee41896e8e6d6bc57ec00e2b63.tar.gz
+# Locally calculated
+sha256  93ef2612853641ca8d16d07527115c72ed03f8eaa1c727a01b069a4e814247c0  ubus-34c6e818e431cc53478a0f7c7c1eca07d194d692.tar.gz
diff --git a/bsp/buildroot/package/ubus/ubus.mk b/bsp/buildroot/package/ubus/ubus.mk
index cd66b868..5fb57ead 100644
--- a/bsp/buildroot/package/ubus/ubus.mk
+++ b/bsp/buildroot/package/ubus/ubus.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-UBUS_VERSION = 259450f414d8c9ee41896e8e6d6bc57ec00e2b63
+UBUS_VERSION = 34c6e818e431cc53478a0f7c7c1eca07d194d692
 UBUS_SITE = git://git.openwrt.org/project/ubus.git
 
-UBUS_LICENSE = LGPLv2.1
+UBUS_LICENSE = LGPL-2.1
 UBUS_LICENSE_FILES = ubusd_acl.h
 
 UBUS_INSTALL_STAGING = YES
diff --git a/bsp/buildroot/package/uccp420wlan/Config.in b/bsp/buildroot/package/uccp420wlan/Config.in
new file mode 100644
index 00000000..ef6a9db8
--- /dev/null
+++ b/bsp/buildroot/package/uccp420wlan/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_UCCP420WLAN
+	bool "uccp420wlan"
+	depends on BR2_LINUX_KERNEL
+	help
+	  SoftMAC (mac80211) based WiFi driver for Imagination's
+	  Explorer RPU uccp420. This supports Dual Band WiFi with
+	  2.4GHz - 2x2 b/g/n 40MHz, 5GHz - 2x2 a/n/11ac 80MHz modes
+
+	  Used in creator ci40 board.
+
+	  This module needs a Linux kernel >= v4.2.
+
+	  https://github.com/CreatorDev/uccp420wlan
+
+comment "uccp420wlan needs a Linux kernel >= 4.2 to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/uccp420wlan/uccp420wlan.hash b/bsp/buildroot/package/uccp420wlan/uccp420wlan.hash
new file mode 100644
index 00000000..41f60a46
--- /dev/null
+++ b/bsp/buildroot/package/uccp420wlan/uccp420wlan.hash
@@ -0,0 +1,2 @@
+# locally computed hash
+sha256 1d4de62fc842dbab739708cf0d9ebce270fcdf63c1c13ac676cbc253acdaa3bb uccp420wlan-v6.9.1.tar.gz
diff --git a/bsp/buildroot/package/uccp420wlan/uccp420wlan.mk b/bsp/buildroot/package/uccp420wlan/uccp420wlan.mk
new file mode 100644
index 00000000..bd89e070
--- /dev/null
+++ b/bsp/buildroot/package/uccp420wlan/uccp420wlan.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# uccp420wlan
+#
+################################################################################
+
+UCCP420WLAN_VERSION = v6.9.1
+UCCP420WLAN_SITE = $(call github,CreatorDev,uccp420wlan,$(UCCP420WLAN_VERSION))
+UCCP420WLAN_LICENSE = GPL-2.0 (kernel module), proprietary (firmware blob)
+UCCP420WLAN_LICENSE_FILES = COPYING firmware/LICENSE.imagination
+
+define UCCP420WLAN_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware/img/uccp420wlan
+	cp $(@D)/firmware/*.ldr $(TARGET_DIR)/lib/firmware/img/uccp420wlan
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/ucl/ucl.mk b/bsp/buildroot/package/ucl/ucl.mk
index b183a13b..aac068ef 100644
--- a/bsp/buildroot/package/ucl/ucl.mk
+++ b/bsp/buildroot/package/ucl/ucl.mk
@@ -6,7 +6,7 @@
 
 UCL_VERSION = 1.03
 UCL_SITE = http://www.oberhumer.com/opensource/ucl/download
-UCL_LICENSE = GPLv2+
+UCL_LICENSE = GPL-2.0+
 UCL_LICENSE_FILES = COPYING
 
 # Fix ACC conformance test failure for host gcc 6.x
diff --git a/bsp/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch b/bsp/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch
new file mode 100644
index 00000000..ca433261
--- /dev/null
+++ b/bsp/buildroot/package/uclibc-ng-test/0001-misc-tst-syscall6-fix-build-with-musl-and-older-kenr.patch
@@ -0,0 +1,45 @@
+From 9a09c89fdd0e0cebec48d1bb7bc187bf92ae361c Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Tue, 13 Mar 2018 12:58:59 +0200
+Subject: [PATCH] misc/tst-syscall6: fix build with musl and older kenrel
+ headers
+
+The RWF_DSYNC and RWF_HIPRI macros were introduced in kernel version 4.6
+with the preadv2/pwritev2 system calls. musl libc provides its own
+syscall definitions, even when the kernel headers are older. This leads
+to the following build failure:
+
+tst-syscall6.c: In function 'main':
+tst-syscall6.c:32:48: error: 'RWF_DSYNC' undeclared (first use in this function)
+  nio = syscall(SYS_pwritev2, fd, iov, 2, 0, 0, RWF_DSYNC);
+                                                ^~~~~~~~~
+tst-syscall6.c:32:48: note: each undeclared identifier is reported only once for each function it appears in
+tst-syscall6.c:42:58: error: 'RWF_HIPRI' undeclared (first use in this function)
+  nio = syscall(SYS_preadv2, fd, iov, 1, strlen(str0), 0, RWF_HIPRI);
+                                                          ^~~~~~~~~
+
+Make the code depend also on RWF_HIPRI to fix this failure.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: patch sent to Waldemar Brodkorb <wbx@openadk.org>
+
+ test/misc/tst-syscall6.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/misc/tst-syscall6.c b/test/misc/tst-syscall6.c
+index fa51c275e4a5..9ad2ddac2b8f 100644
+--- a/test/misc/tst-syscall6.c
++++ b/test/misc/tst-syscall6.c
+@@ -9,7 +9,7 @@
+ 
+ int main()
+ {
+-#if defined SYS_preadv2 && defined SYS_pwritev2
++#if defined SYS_preadv2 && defined SYS_pwritev2 && defined RWF_HIPRI
+ 	char tmp[] = "/tmp/tst-preadv2-XXXXXX";
+ 	int fd;
+ 	struct iovec iov[2];
+-- 
+2.16.1
+
diff --git a/bsp/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk b/bsp/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk
index 610ca010..0e6433c8 100644
--- a/bsp/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk
+++ b/bsp/buildroot/package/uclibc-ng-test/uclibc-ng-test.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-UCLIBC_NG_TEST_VERSION = c9b9876cefc142a23aa622b821290ed16af80058
+UCLIBC_NG_TEST_VERSION = c6d62cbc60504c7f6867b486248b0ef7cc2da554
 UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test
-UCLIBC_NG_TEST_LICENSE = LGPLv2.1+
+UCLIBC_NG_TEST_LICENSE = LGPL-2.1+
 UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB
 
 # the math tests are recently synced from glibc and need more adaption before
@@ -48,7 +48,7 @@ define UCLIBC_NG_TEST_BUILD_CMDS
 endef
 
 define UCLIBC_NG_TEST_INSTALL_TARGET_CMDS
-        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/uclibc/0001-aarch64-sys-ucontext.h-include-bits-sigcontext.h.patch b/bsp/buildroot/package/uclibc/0001-aarch64-sys-ucontext.h-include-bits-sigcontext.h.patch
new file mode 100644
index 00000000..0a1fdf6c
--- /dev/null
+++ b/bsp/buildroot/package/uclibc/0001-aarch64-sys-ucontext.h-include-bits-sigcontext.h.patch
@@ -0,0 +1,49 @@
+From 1c27982bb8a007bb1a6a29db8e6efb1f40975879 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sun, 28 Jan 2018 13:59:30 +0100
+Subject: [PATCH 1/1] aarch64/sys/ucontext.h: include bits/sigcontext.h
+
+Fixes a buildroot build error with ffmpeg
+
+In file included from /home/bernd/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/signal.h:329:0,
+                 from fftools/ffmpeg.h:26,
+                 from fftools/ffmpeg_opt.c:23:
+/home/bernd/buildroot/output/host/aarch64-buildroot-linux-uclibc/sysroot/usr/include/sys/ucontext.h:52:16:
+ error: field 'uc_mcontext' has incomplete type
+     mcontext_t uc_mcontext;
+                ^~~~~~~~~~~
+
+using this defconfig:
+
+BR2_aarch64=y
+BR2_PACKAGE_FFMPEG=y
+
+sys/ucontext.h for other archs already include bits/sigcontext.h,
+on aarch64 this is needed as well.
+
+Patch sent upstream:
+https://mailman.uclibc-ng.org/pipermail/devel/2018-January/001622.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ libc/sysdeps/linux/aarch64/sys/ucontext.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/libc/sysdeps/linux/aarch64/sys/ucontext.h b/libc/sysdeps/linux/aarch64/sys/ucontext.h
+index d17458896..dc7303b54 100644
+--- a/libc/sysdeps/linux/aarch64/sys/ucontext.h
++++ b/libc/sysdeps/linux/aarch64/sys/ucontext.h
+@@ -26,6 +26,10 @@
+ 
+ #include <sys/procfs.h>
+ 
++/* We need the signal context definitions even if they are not used
++   included in <signal.h>.  */
++#include <bits/sigcontext.h>
++
+ typedef elf_greg_t greg_t;
+ 
+ /* Container for all general registers.  */
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch b/bsp/buildroot/package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch
deleted file mode 100644
index eb0198d4..00000000
--- a/bsp/buildroot/package/uclibc/0001-fstat-make-new-code-aarch64-specific.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 71127e5cc937878883e6021da3da337a7aa9c099 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 3 Feb 2017 06:04:16 +0100
-Subject: [PATCH 10229/10229] fstat: make new code aarch64 specific
-
-The new code get's used by MIPS64 N64 and fails.
-Make the new code aarch64 specific.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- libc/sysdeps/linux/common/fstat.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
-index ac77eb2..c27f926 100644
---- a/libc/sysdeps/linux/common/fstat.c
-+++ b/libc/sysdeps/linux/common/fstat.c
-@@ -21,7 +21,7 @@ int fstat(int fd, struct stat *buf)
- }
- libc_hidden_def(fstat)
- 
--#elif __WORDSIZE == 64 && defined __NR_newfstatat
-+#elif __WORDSIZE == 64 && defined __NR_newfstatat && __aarch64__
- #include <fcntl.h>
- 
- int fstat(int fd, struct stat *buf)
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/uclibc/0002-arm-fix-static-linking-issues.patch b/bsp/buildroot/package/uclibc/0002-arm-fix-static-linking-issues.patch
deleted file mode 100644
index 5480b0dc..00000000
--- a/bsp/buildroot/package/uclibc/0002-arm-fix-static-linking-issues.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 94810a91c48ac62daed55b4aec70d04a44c10795 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Thu, 16 Feb 2017 20:22:21 +0100
-Subject: [PATCH] arm: fix static linking issues
-
-As reported by Buildroot developers these files causing static
-linking issues. The original contribution with the ARM unwind-resume
-rework and GNU libc sync was made before the combined libc change.
-But the patch was applied later, after the libc change and
-it seems the test coverage for static linking didn't catch it in
-the regression testing. Remove the files.
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c | 2 --
- libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c | 1 -
- 2 files changed, 3 deletions(-)
- delete mode 100644 libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
- delete mode 100644 libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
-
-diff --git a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
-deleted file mode 100644
-index fd0cec4..0000000
---- a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--__asm__ (".set __libgcc_s_init, pthread_cancel_init");
--#include <arm-unwind-resume.c>
-diff --git a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
-deleted file mode 100644
-index 2641dc5..0000000
---- a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c
-+++ /dev/null
-@@ -1 +0,0 @@
--#include <arm-unwind-resume.c>
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch b/bsp/buildroot/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch
deleted file mode 100644
index 7c602281..00000000
--- a/bsp/buildroot/package/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 228d03bf0032e5799e9bf04810170c0653ca846d Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Fri, 17 Feb 2017 22:33:49 +0100
-Subject: [PATCH] or1k: add missing definition of ucontext
-
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- libc/sysdeps/linux/or1k/sys/ucontext.h | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/or1k/sys/ucontext.h b/libc/sysdeps/linux/or1k/sys/ucontext.h
-index b11928e..dd97b60 100644
---- a/libc/sysdeps/linux/or1k/sys/ucontext.h
-+++ b/libc/sysdeps/linux/or1k/sys/ucontext.h
-@@ -20,6 +20,14 @@
- 
- #include <features.h>
- #include <signal.h>
--#include <asm/ucontext.h>
-+#include <bits/sigcontext.h>
-+
-+typedef struct ucontext {
-+	unsigned long	  uc_flags;
-+	struct ucontext  *uc_link;
-+	stack_t		  uc_stack;
-+	struct sigcontext uc_mcontext;
-+	sigset_t	  uc_sigmask;	/* mask last for extensibility */
-+} ucontext_t;
- 
- #endif /* sys/ucontext.h */
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/uclibc/Config.in b/bsp/buildroot/package/uclibc/Config.in
index 0628af30..0e24b254 100644
--- a/bsp/buildroot/package/uclibc/Config.in
+++ b/bsp/buildroot/package/uclibc/Config.in
@@ -11,23 +11,16 @@ config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
 	default "package/uclibc/uClibc-ng.config"
 	help
-	  Some people may wish to use their own modified uClibc configuration
-	  file and will specify their config file location with this option.
-	  See also docs/README in this package.
-	  If unsure, use the default.
+	  Some people may wish to use their own modified uClibc
+	  configuration file and will specify their config file
+	  location with this option.  See also docs/README in this
+	  package.  If unsure, use the default.
 
 config BR2_UCLIBC_CONFIG_FRAGMENT_FILES
 	string "Additional uClibc configuration fragment files"
 	help
-	  A space-separated list of configuration fragment files,
-	  that will be merged to the main uClibc configuration file.
-
-config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
-	bool "Enable RPC support"
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	help
-	  Enable this option if you want your toolchain to support
-	  RPC (needed for NFS, for example).
+	  A space-separated list of configuration fragment files, that
+	  will be merged to the main uClibc configuration file.
 
 config BR2_TOOLCHAIN_BUILDROOT_WCHAR
 	bool "Enable WCHAR support"
@@ -52,20 +45,19 @@ choice
 	  Use this option to select the thread library implementation
 	  that should be used in your toolchain.
 
-	config BR2_PTHREADS_NATIVE
-		bool "Native POSIX Threading (NPTL)"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		select BR2_TOOLCHAIN_HAS_THREADS_NPTL
-		depends on BR2_USE_MMU
-		depends on !BR2_m68k && !BR2_microblaze && !BR2_or1k
+config BR2_PTHREADS_NATIVE
+	bool "Native POSIX Threading (NPTL)"
+	depends on BR2_USE_MMU
+	select BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
-	config BR2_PTHREADS
-		bool "linuxthreads"
-		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
+config BR2_PTHREADS
+	bool "linuxthreads"
+	depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa
+	select BR2_TOOLCHAIN_HAS_THREADS
 
-	config BR2_PTHREADS_NONE
-		bool "none"
+config BR2_PTHREADS_NONE
+	bool "none"
 
 endchoice
 
@@ -83,7 +75,8 @@ config BR2_TOOLCHAIN_BUILDROOT_USE_SSP
 	  Enable stack smashing protection support using GCCs
 	  -fstack-protector-all option in uClibc.
 
-	  See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
+	  See
+	  http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt
 	  for details.
 
 config BR2_UCLIBC_INSTALL_UTILS
@@ -116,45 +109,44 @@ config BR2_UCLIBC_TARGET_ARCH
 
 config BR2_UCLIBC_ARC_TYPE
 	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "arc"
 	default "ARC_CPU_700"	if BR2_arc750d
 	default "ARC_CPU_700"	if BR2_arc770d
 	default "ARC_CPU_HS"	if BR2_archs38
+	depends on BR2_UCLIBC_TARGET_ARCH = "arc"
 
 config BR2_UCLIBC_MIPS_ABI
 	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "mips"
 	default "O32" if BR2_MIPS_OABI32
 	default "N32" if BR2_MIPS_NABI32
 	default "N64" if BR2_MIPS_NABI64
+	depends on BR2_UCLIBC_TARGET_ARCH = "mips"
 
 config BR2_UCLIBC_MIPS_NAN
 	string
+	default "LEGACY" if BR2_MIPS_NAN_LEGACY
+	default "2008" if BR2_MIPS_NAN_2008
 	depends on BR2_UCLIBC_TARGET_ARCH = "mips"
-	default "LEGACY" if BR2_MIPS_CPU_MIPS32 || BR2_MIPS_CPU_MIPS64
-	default "2008" if BR2_MIPS_CPU_MIPS32R6 || BR2_MIPS_CPU_MIPS64R6
 
 config BR2_UCLIBC_SH_TYPE
 	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "sh"
 	default "SH2A" if BR2_sh2a
 	default "SH4"  if BR2_sh4 || BR2_sh4eb
+	depends on BR2_UCLIBC_TARGET_ARCH = "sh"
 
 config BR2_UCLIBC_SPARC_TYPE
 	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "sparc"
 	default "V7"	if BR2_sparc_v7 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon
 	default "V8"	if BR2_sparc_v8 || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8
+	depends on BR2_UCLIBC_TARGET_ARCH = "sparc"
 
 config BR2_UCLIBC_POWERPC_TYPE
 	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "powerpc"
 	default "CLASSIC" if !BR2_powerpc_8540 && !BR2_powerpc_8548
 	default "E500"    if BR2_powerpc_8540 || BR2_powerpc_8548
+	depends on BR2_UCLIBC_TARGET_ARCH = "powerpc"
 
 config BR2_UCLIBC_X86_TYPE
 	string
-	depends on BR2_UCLIBC_TARGET_ARCH = "i386"
 	default "486"        if BR2_x86_i486
 	default "586"        if BR2_x86_i586
 	default "586MMX"     if BR2_x86_pentium_mmx
@@ -163,5 +155,6 @@ config BR2_UCLIBC_X86_TYPE
 	default "PENTIUMIII" if BR2_x86_pentium3
 	default "PENTIUM4"   if BR2_x86_pentium4 || BR2_x86_pentium_m || \
 	                        BR2_x86_nocona || BR2_x86_core2 || BR2_x86_corei7
+	depends on BR2_UCLIBC_TARGET_ARCH = "i386"
 
 endif # BR2_TOOLCHAIN_BUILDROOT_UCLIBC
diff --git a/bsp/buildroot/package/uclibc/uClibc-ng.config b/bsp/buildroot/package/uclibc/uClibc-ng.config
index 528bce96..5beb2bd9 100644
--- a/bsp/buildroot/package/uclibc/uClibc-ng.config
+++ b/bsp/buildroot/package/uclibc/uClibc-ng.config
@@ -23,6 +23,7 @@ UCLIBC_HAS_RESOLVER_SUPPORT=y
 UCLIBC_HAS_LIBRESOLV_STUB=y
 UCLIBC_HAS_LIBNSL_STUB=y
 UCLIBC_HAS_CTYPE_CHECKED=y
+UCLIBC_HAS_LIBINTL=y
 UCLIBC_HAS_HEXADECIMAL_FLOATS=y
 UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
 UCLIBC_HAS_STDIO_GETC_MACRO=y
@@ -30,8 +31,7 @@ UCLIBC_HAS_STDIO_PUTC_MACRO=y
 UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
 UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
 UCLIBC_HAS_PRINTF_M_SPEC=y
-# UCLIBC_HAS_REGEX_OLD is not set
-# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
 UCLIBC_HAS_NFTW=y
 UCLIBC_HAS_FTW=y
 UCLIBC_HAS_GNU_GLOB=y
diff --git a/bsp/buildroot/package/uclibc/uclibc.hash b/bsp/buildroot/package/uclibc/uclibc.hash
index d2fbd0ae..0a156836 100644
--- a/bsp/buildroot/package/uclibc/uclibc.hash
+++ b/bsp/buildroot/package/uclibc/uclibc.hash
@@ -1,2 +1,2 @@
-# From http://www.uclibc-ng.org/
-sha256  f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b        uClibc-ng-1.0.22.tar.xz
+# From https://uclibc-ng.org/
+sha256  a1504ddc34a29cc9bfd1f5a7419c4b63bb510d9e2faed81618d1b596ceb0a5a9        uClibc-ng-1.0.28.tar.xz
diff --git a/bsp/buildroot/package/uclibc/uclibc.mk b/bsp/buildroot/package/uclibc/uclibc.mk
index 8f6035ec..c5b0c6b1 100644
--- a/bsp/buildroot/package/uclibc/uclibc.mk
+++ b/bsp/buildroot/package/uclibc/uclibc.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.22
+UCLIBC_VERSION = 1.0.28
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
-UCLIBC_LICENSE = LGPLv2.1+
+UCLIBC_LICENSE = LGPL-2.1+
 UCLIBC_LICENSE_FILES = COPYING.LIB
 UCLIBC_INSTALL_STAGING = YES
 
@@ -35,7 +35,7 @@ UCLIBC_KCONFIG_OPTS = \
 	$(UCLIBC_MAKE_FLAGS) \
 	PREFIX=$(STAGING_DIR) \
 	DEVEL_PREFIX=/usr/ \
-	RUNTIME_PREFIX=$(STAGING_DIR)/ \
+	RUNTIME_PREFIX=$(STAGING_DIR)/
 
 UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH))
 
@@ -54,34 +54,34 @@ endif
 # noMMU binary formats
 ifeq ($(BR2_BINFMT_FDPIC),y)
 define UCLIBC_BINFMT_CONFIG
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-       $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 ifeq ($(BR2_BINFMT_FLAT_ONE),y)
 define UCLIBC_BINFMT_CONFIG
-       $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y)
 define UCLIBC_BINFMT_CONFIG
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-       $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
 define UCLIBC_BINFMT_CONFIG
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
-       $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
-       $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config)
+	$(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config)
+	$(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config)
 endef
 endif
 
@@ -101,6 +101,12 @@ define UCLIBC_ARC_PAGE_SIZE_CONFIG
 	$(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config)
 endef
 
+ifeq ($(BR2_ARC_ATOMIC_EXT),)
+define UCLIBC_ARC_ATOMICS_CONFIG
+	$(call KCONFIG_DISABLE_OPT,CONFIG_ARC_HAS_ATOMICS,$(@D)/.config)
+endef
+endif
+
 endif # arc
 
 #
@@ -113,12 +119,6 @@ define UCLIBC_ARM_ABI_CONFIG
 	$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config)
 endef
 
-# Thumb1 build is broken with threads with old gcc versions (< 4.8). Since
-# all cores supporting Thumb1 also support ARM, we use ARM code in this case.
-ifeq ($(BR2_GCC_VERSION_4_8_X)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yyy)
-UCLIBC_EXTRA_CFLAGS += -marm
-endif
-
 ifeq ($(BR2_BINFMT_FLAT),y)
 define UCLIBC_ARM_BINFMT_FLAT
 	$(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config)
@@ -253,10 +253,12 @@ endif
 
 ifeq ($(BR2_USE_MMU),y)
 define UCLIBC_MMU_CONFIG
+	$(call KCONFIG_ENABLE_OPT,ARCH_HAS_MMU,$(@D)/.config)
 	$(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
 endef
 else
 define UCLIBC_MMU_CONFIG
+	$(call KCONFIG_DISABLE_OPT,ARCH_HAS_MMU,$(@D)/.config)
 	$(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config)
 endef
 endif
@@ -267,24 +269,6 @@ endif
 
 UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
 
-#
-# RPC
-#
-
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y)
-define UCLIBC_RPC_CONFIG
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
-	$(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
-endef
-else
-define UCLIBC_RPC_CONFIG
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config)
-	$(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config)
-endef
-endif
-
 #
 # soft-float
 #
@@ -413,6 +397,7 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
 	$(UCLIBC_BINFMT_CONFIG)
 	$(UCLIBC_ARC_TYPE_CONFIG)
 	$(UCLIBC_ARC_PAGE_SIZE_CONFIG)
+	$(UCLIBC_ARC_ATOMICS_CONFIG)
 	$(UCLIBC_ARM_ABI_CONFIG)
 	$(UCLIBC_ARM_BINFMT_FLAT)
 	$(UCLIBC_ARM_NO_CONTEXT_FUNCS)
@@ -427,7 +412,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
 	$(UCLIBC_ENDIAN_CONFIG)
 	$(UCLIBC_LARGEFILE_CONFIG)
 	$(UCLIBC_IPV6_CONFIG)
-	$(UCLIBC_RPC_CONFIG)
 	$(UCLIBC_FLOAT_CONFIG)
 	$(UCLIBC_SSP_CONFIG)
 	$(UCLIBC_THREAD_CONFIG)
@@ -469,10 +453,10 @@ endef
 # STATIC has no ld* tools, only getconf
 ifeq ($(BR2_STATIC_LIBS),)
 define UCLIBC_INSTALL_UTILS_STAGING
-	$(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd
-	ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd
-	$(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig
-	ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig
+	$(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/bin/ldd
+	ln -sf ldd $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-ldd
+	$(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/bin/ldconfig
+	ln -sf ldconfig $(HOST_DIR)/bin/$(GNU_TARGET_NAME)-ldconfig
 endef
 endif
 
diff --git a/bsp/buildroot/package/udev/Config.in b/bsp/buildroot/package/udev/Config.in
index 941a5152..814a6251 100644
--- a/bsp/buildroot/package/udev/Config.in
+++ b/bsp/buildroot/package/udev/Config.in
@@ -2,5 +2,5 @@ config BR2_PACKAGE_HAS_UDEV
 	bool
 
 config BR2_PACKAGE_PROVIDES_UDEV
-	depends on BR2_PACKAGE_HAS_UDEV
 	string
+	depends on BR2_PACKAGE_HAS_UDEV
diff --git a/bsp/buildroot/package/udisks/Config.in b/bsp/buildroot/package/udisks/Config.in
index 029860fc..6573cda2 100644
--- a/bsp/buildroot/package/udisks/Config.in
+++ b/bsp/buildroot/package/udisks/Config.in
@@ -5,9 +5,9 @@ config BR2_PACKAGE_UDISKS
 	depends on BR2_USE_MMU # lvm2
 	depends on !BR2_STATIC_LIBS # lvm2
 	depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2
+	depends on BR2_USE_WCHAR # dbus-glib -> glib2
 	select BR2_PACKAGE_DBUS
 	select BR2_PACKAGE_DBUS_GLIB
-	depends on BR2_USE_WCHAR # dbus-glib -> glib2
 	select BR2_PACKAGE_SG3_UTILS
 	select BR2_PACKAGE_POLKIT
 	select BR2_PACKAGE_PARTED
diff --git a/bsp/buildroot/package/udisks/udisks.mk b/bsp/buildroot/package/udisks/udisks.mk
index 4d3ede71..fe8932a9 100644
--- a/bsp/buildroot/package/udisks/udisks.mk
+++ b/bsp/buildroot/package/udisks/udisks.mk
@@ -6,21 +6,21 @@
 
 UDISKS_VERSION = 1.0.5
 UDISKS_SITE = http://hal.freedesktop.org/releases
-UDISKS_LICENSE = GPLv2+
+UDISKS_LICENSE = GPL-2.0+
 UDISKS_LICENSE_FILES = COPYING
 # For 0002-Fix-systemd-service-file.patch
 UDISKS_AUTORECONF = YES
 
-UDISKS_DEPENDENCIES = 	\
-	sg3_utils	\
-	host-pkgconf	\
-	udev		\
-	dbus		\
-	dbus-glib	\
-	polkit		\
-	parted		\
-	lvm2		\
-	libatasmart	\
+UDISKS_DEPENDENCIES = \
+	sg3_utils \
+	host-pkgconf \
+	udev \
+	dbus \
+	dbus-glib \
+	polkit \
+	parted \
+	lvm2 \
+	libatasmart \
 	libgudev
 
 UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages
diff --git a/bsp/buildroot/package/udpcast/udpcast.mk b/bsp/buildroot/package/udpcast/udpcast.mk
index b0ce6433..e9116d2d 100644
--- a/bsp/buildroot/package/udpcast/udpcast.mk
+++ b/bsp/buildroot/package/udpcast/udpcast.mk
@@ -7,7 +7,7 @@
 UDPCAST_VERSION = 20120424
 UDPCAST_SITE = http://www.udpcast.linux.lu/download
 UDPCAST_DEPENDENCIES = host-m4
-UDPCAST_LICENSE = BSD-2c, GPLv2+
+UDPCAST_LICENSE = BSD-2-Clause, GPL-2.0+
 UDPCAST_LICENSE_FILES = COPYING
 
 define UDPCAST_REMOVE_UDP_SENDER
diff --git a/bsp/buildroot/package/udpxy/udpxy.mk b/bsp/buildroot/package/udpxy/udpxy.mk
index dd8c91fc..22467948 100644
--- a/bsp/buildroot/package/udpxy/udpxy.mk
+++ b/bsp/buildroot/package/udpxy/udpxy.mk
@@ -2,12 +2,12 @@
 #
 # udpxy
 #
-#################################################################################
+################################################################################
 
 UDPXY_VERSION = 1.0.23-9-prod
 UDPXY_SOURCE = udpxy.$(UDPXY_VERSION).tar.gz
 UDPXY_SITE = http://www.udpxy.com/download/1_23
-UDPXY_LICENSE = GPLv3+
+UDPXY_LICENSE = GPL-3.0+
 UDPXY_LICENSE_FILES = README
 
 define UDPXY_BUILD_CMDS
diff --git a/bsp/buildroot/package/uemacs/uemacs.hash b/bsp/buildroot/package/uemacs/uemacs.hash
new file mode 100644
index 00000000..a88be88b
--- /dev/null
+++ b/bsp/buildroot/package/uemacs/uemacs.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 c6772ccb519f89731ac927c6bd229617fa4a488b966251e9147a03f998c39960  uemacs-8841922689769960fa074fbb053cb8507f2f3ed9.tar.gz
diff --git a/bsp/buildroot/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch b/bsp/buildroot/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch
new file mode 100644
index 00000000..fb3ff54a
--- /dev/null
+++ b/bsp/buildroot/package/uhttpd/0002-Fix-TCP_FASTOPEN-related-compile-error.patch
@@ -0,0 +1,30 @@
+From adbab70d3602d77736781be344cfdc5508cb0600 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Mon, 3 Apr 2017 19:22:30 +0200
+Subject: [PATCH] Fix TCP_FASTOPEN related compile error.
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ listen.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/listen.c b/listen.c
+index 2a54888..4dabe34 100644
+--- a/listen.c
++++ b/listen.c
+@@ -96,6 +96,12 @@ static void listener_cb(struct uloop_fd *fd, unsigned int events)
+ 		uh_block_listener(l);
+ }
+ 
++#ifdef linux
++#ifndef TCP_FASTOPEN
++#define TCP_FASTOPEN 23
++#endif
++#endif
++
+ void uh_setup_listeners(void)
+ {
+ 	struct listener *l;
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/uhttpd/Config.in b/bsp/buildroot/package/uhttpd/Config.in
index e463b930..8d5d8bee 100644
--- a/bsp/buildroot/package/uhttpd/Config.in
+++ b/bsp/buildroot/package/uhttpd/Config.in
@@ -6,9 +6,9 @@ config BR2_PACKAGE_UHTTPD
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_JSON_C
 	help
-	  uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua
-	  support. It is intended as a drop-in replacement for the Busybox
-	  HTTP daemon.
+	  uHTTPd is a tiny single threaded HTTP server with TLS, CGI
+	  and Lua support. It is intended as a drop-in replacement for
+	  the Busybox HTTP daemon.
 
 	  https://wiki.openwrt.org/doc/howto/http.uhttpd
 
diff --git a/bsp/buildroot/package/uhttpd/uhttpd.hash b/bsp/buildroot/package/uhttpd/uhttpd.hash
index 59e54ad4..7e09f180 100644
--- a/bsp/buildroot/package/uhttpd/uhttpd.hash
+++ b/bsp/buildroot/package/uhttpd/uhttpd.hash
@@ -1,2 +1,2 @@
-# No hash for this git snapshot
-none	xxx	uhttpd-59e0c739634f46a164d939e54416287b91ff8a9b.tar.gz
+# Locally calculated
+sha256 9325c95c9bb1c51bf135700a65738884fa9cd548ff8166c8b61fdbf99825cd6d  uhttpd-a8bf9c00842224edb394e79909053f7628ee6a82.tar.gz
diff --git a/bsp/buildroot/package/uhttpd/uhttpd.mk b/bsp/buildroot/package/uhttpd/uhttpd.mk
index be0d7d63..cc7649d0 100644
--- a/bsp/buildroot/package/uhttpd/uhttpd.mk
+++ b/bsp/buildroot/package/uhttpd/uhttpd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b
+UHTTPD_VERSION = a8bf9c00842224edb394e79909053f7628ee6a82
 UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git
 UHTTPD_SITE_METHOD = git
 UHTTPD_LICENSE = ISC
diff --git a/bsp/buildroot/package/uhubctl/Config.in b/bsp/buildroot/package/uhubctl/Config.in
new file mode 100644
index 00000000..c000b5ab
--- /dev/null
+++ b/bsp/buildroot/package/uhubctl/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_UHUBCTL
+	bool "uhubctl"
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_LIBUSB
+	help
+	  Control USB power per-port on smart USB hubs.
+
+	  https://github.com/mvp/uhubctl
+
+comment "uhubctl needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/uhubctl/uhubctl.hash b/bsp/buildroot/package/uhubctl/uhubctl.hash
new file mode 100644
index 00000000..6afee905
--- /dev/null
+++ b/bsp/buildroot/package/uhubctl/uhubctl.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 dfc85571ad86a071bf7a0db7cadf97a870e628777e47176520de6866b4f042b6 uhubctl-047bb1e392efd3e0ea5d5caf351e20761e12cd44.tar.gz
diff --git a/bsp/buildroot/package/uhubctl/uhubctl.mk b/bsp/buildroot/package/uhubctl/uhubctl.mk
new file mode 100644
index 00000000..74845001
--- /dev/null
+++ b/bsp/buildroot/package/uhubctl/uhubctl.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# uhubctl
+#
+################################################################################
+
+UHUBCTL_VERSION = 047bb1e392efd3e0ea5d5caf351e20761e12cd44
+UHUBCTL_SITE = $(call github,mvp,uhubctl,$(UHUBCTL_VERSION))
+UHUBCTL_LICENSE = GPL-2.0
+UHUBCTL_LICENSE_FILES = LICENSE
+UHUBCTL_DEPENDENCIES = libusb
+
+define UHUBCTL_BUILD_CMDS
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)
+endef
+
+define UHUBCTL_INSTALL_TARGET_CMDS
+	$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \
+		$(MAKE) -C $(@D) install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/ulogd/Config.in b/bsp/buildroot/package/ulogd/Config.in
index dc36c0bc..e0e19996 100644
--- a/bsp/buildroot/package/ulogd/Config.in
+++ b/bsp/buildroot/package/ulogd/Config.in
@@ -8,7 +8,8 @@ config BR2_PACKAGE_ULOGD
 	select BR2_PACKAGE_LIBNETFILTER_LOG
 	select BR2_PACKAGE_LIBNFNETLINK
 	help
-	  ulogd is a userspace logging daemon for netfilter/iptables related logging.
+	  ulogd is a userspace logging daemon for netfilter/iptables
+	  related logging.
 
 	  http://www.netfilter.org/projects/ulogd/
 
diff --git a/bsp/buildroot/package/ulogd/ulogd.mk b/bsp/buildroot/package/ulogd/ulogd.mk
index 4017edc7..5b0e5589 100644
--- a/bsp/buildroot/package/ulogd/ulogd.mk
+++ b/bsp/buildroot/package/ulogd/ulogd.mk
@@ -11,7 +11,7 @@ ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no
 ULOGD_DEPENDENCIES = host-pkgconf \
 	libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \
 	libnfnetlink
-ULOGD_LICENSE = GPLv2
+ULOGD_LICENSE = GPL-2.0
 ULOGD_LICENSE_FILES = COPYING
 
 # DB backends need threads
diff --git a/bsp/buildroot/package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch b/bsp/buildroot/package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch
deleted file mode 100644
index 228441b3..00000000
--- a/bsp/buildroot/package/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 93c2f9bd8b058b28016e6db2421e5b38eac0606c Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <peter@korsgaard.com>
-Date: Thu, 17 Dec 2015 15:06:38 +0100
-Subject: [PATCH] Revert to old pre-1.0 meta directory
-
-Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the
-unionfs -> unionfs-fuse rename.  The rename later got reverted everywhere
-but the meta directory, so now unionfs doesn't find the whiteout files from
-older releases.
-
-Revert back to the pre-1.0 behaviour to fix this.
-
-Committed upstream:
-https://github.com/rpodgorny/unionfs-fuse/commit/93c2f9bd8b058b28016e6db2421e5b38eac0606c
-
-Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
----
- src/unionfs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/unionfs.h b/src/unionfs.h
-index c2b5ee3..74b824f 100644
---- a/src/unionfs.h
-+++ b/src/unionfs.h
-@@ -10,7 +10,7 @@
- #define PATHLEN_MAX 1024
- #define HIDETAG "_HIDDEN~"
- 
--#define METANAME ".unionfs-fuse"
-+#define METANAME ".unionfs"
- #define METADIR (METANAME  "/") // string concetanation!
- 
- // fuse meta files, we might want to hide those
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch b/bsp/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
new file mode 100644
index 00000000..f3d8fa15
--- /dev/null
+++ b/bsp/buildroot/package/unionfs/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
@@ -0,0 +1,26 @@
+From d33635fe940ff898e026d3fb77446e52f8f2bd3f Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Thu, 16 Feb 2017 14:59:30 -0300
+Subject: [PATCH] include asm/ioctl.h for _IOC_SIZE
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+---
+ src/unionfs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/unionfs.c b/src/unionfs.c
+index 5aed5ce..f6cd368 100644
+--- a/src/unionfs.c
++++ b/src/unionfs.c
+@@ -32,7 +32,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <inttypes.h>
+-#include <sys/ioctl.h>
++#include <asm/ioctl.h>
+ 
+ #ifdef linux
+ 	#include <sys/vfs.h>
+-- 
+2.10.2
+
diff --git a/bsp/buildroot/package/unionfs/Config.in b/bsp/buildroot/package/unionfs/Config.in
index ece83a5f..fe03b95f 100644
--- a/bsp/buildroot/package/unionfs/Config.in
+++ b/bsp/buildroot/package/unionfs/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_UNIONFS
 	bool "unionfs (FUSE)"
-	select BR2_PACKAGE_LIBFUSE
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
 	depends on BR2_USE_MMU # libfuse
 	depends on !BR2_STATIC_LIBS # libfuse
+	select BR2_PACKAGE_LIBFUSE
 	help
 	  A userspace unionfs implementation.
 
diff --git a/bsp/buildroot/package/unionfs/unionfs.hash b/bsp/buildroot/package/unionfs/unionfs.hash
index c843a0e8..fcc1d58d 100644
--- a/bsp/buildroot/package/unionfs/unionfs.hash
+++ b/bsp/buildroot/package/unionfs/unionfs.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256	2ee80bd0634a61adb2159212e155d607a0a82ad659214ae6edb3530396cccc09	unionfs-1.0.tar.gz
-sha256	c8526f80448f344fba0100e5510793b6de985b24a8b526d9a6803bcd713d9de2	0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
+sha256	f24d7dd64c678cefacbebf2727b61e3127b8ecb6bb9176d7117dd31503455643	unionfs-2.0.tar.gz
+sha256	976ca25b7706911f1a6e981c0fd236b607f497aa0b23d407825b0aad41f7c896	0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
diff --git a/bsp/buildroot/package/unionfs/unionfs.mk b/bsp/buildroot/package/unionfs/unionfs.mk
index 0fa9c940..e8b29533 100644
--- a/bsp/buildroot/package/unionfs/unionfs.mk
+++ b/bsp/buildroot/package/unionfs/unionfs.mk
@@ -4,12 +4,10 @@
 #
 ################################################################################
 
-UNIONFS_VERSION = 1.0
+UNIONFS_VERSION = 2.0
 UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION))
-UNIONFS_PATCH = \
-	http://git.alpinelinux.org/cgit/aports/plain/main/unionfs-fuse/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch
 UNIONFS_DEPENDENCIES = libfuse host-pkgconf
-UNIONFS_LICENSE = BSD-3c
+UNIONFS_LICENSE = BSD-3-Clause
 UNIONFS_LICENSE_FILES = LICENSE
 
 $(eval $(cmake-package))
diff --git a/bsp/buildroot/package/unixodbc/Config.in b/bsp/buildroot/package/unixodbc/Config.in
index c23e0a56..d5434d1e 100644
--- a/bsp/buildroot/package/unixodbc/Config.in
+++ b/bsp/buildroot/package/unixodbc/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_UNIXODBC
 	bool "unixodbc"
 	help
-	  The unixODBC Project goals are to develop and promote unixODBC
-	  to be the definitive standard for ODBC on non MS Windows platforms.
+	  The unixODBC Project goals are to develop and promote
+	  unixODBC to be the definitive standard for ODBC on non MS
+	  Windows platforms.
 
 	  http://www.unixodbc.org
diff --git a/bsp/buildroot/package/unixodbc/unixodbc.mk b/bsp/buildroot/package/unixodbc/unixodbc.mk
index 280fe579..d4aa02ee 100644
--- a/bsp/buildroot/package/unixodbc/unixodbc.mk
+++ b/bsp/buildroot/package/unixodbc/unixodbc.mk
@@ -8,7 +8,7 @@ UNIXODBC_VERSION = 2.3.4
 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
 UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
 UNIXODBC_INSTALL_STAGING = YES
-UNIXODBC_LICENSE = LGPLv2.1+ (library), GPLv2+ (programs)
+UNIXODBC_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs)
 UNIXODBC_LICENSE_FILES = COPYING exe/COPYING
 
 UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf
diff --git a/bsp/buildroot/package/unscd/unscd.mk b/bsp/buildroot/package/unscd/unscd.mk
index 54caeb1f..f0eb5d6a 100644
--- a/bsp/buildroot/package/unscd/unscd.mk
+++ b/bsp/buildroot/package/unscd/unscd.mk
@@ -7,7 +7,7 @@
 UNSCD_VERSION = 0.52
 UNSCD_SOURCE = nscd-$(UNSCD_VERSION).c
 UNSCD_SITE = http://busybox.net/~vda/unscd
-UNSCD_LICENSE = GPLv2
+UNSCD_LICENSE = GPL-2.0
 UNSCD_LICENSE_FILES = $(UNSCD_SOURCE)
 
 define UNSCD_EXTRACT_CMDS
diff --git a/bsp/buildroot/package/upmpdcli/Config.in b/bsp/buildroot/package/upmpdcli/Config.in
index 48720347..cf85a793 100644
--- a/bsp/buildroot/package/upmpdcli/Config.in
+++ b/bsp/buildroot/package/upmpdcli/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_UPMPDCLI
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp, libmicrohttpd
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11, libupnpp
 	select BR2_PACKAGE_JSONCPP
 	select BR2_PACKAGE_LIBMICROHTTPD
 	select BR2_PACKAGE_LIBMPDCLIENT
@@ -15,6 +15,6 @@ config BR2_PACKAGE_UPMPDCLI
 
 	  http://www.lesbonscomptes.com/upmpdcli/
 
-comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.7"
+comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.9"
 	depends on BR2_USE_MMU
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/bsp/buildroot/package/upmpdcli/upmpdcli.hash b/bsp/buildroot/package/upmpdcli/upmpdcli.hash
index bcd78318..e4973526 100644
--- a/bsp/buildroot/package/upmpdcli/upmpdcli.hash
+++ b/bsp/buildroot/package/upmpdcli/upmpdcli.hash
@@ -1,2 +1,5 @@
-# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.12.tar.gz.sha256:
-sha256  20d97c2e5ff6911e1e1538edb1487823479802cba6bd4f4c4a74035edf61cb26  upmpdcli-1.2.12.tar.gz
+# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.15.tar.gz.sha256:
+sha256  93d2b9cfd6cb8643c5a23d4115b44622d76c71abe15db9bb8d5b4d83f4d9b49c  upmpdcli-1.2.15.tar.gz
+
+# Hash for license file:
+sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
diff --git a/bsp/buildroot/package/upmpdcli/upmpdcli.mk b/bsp/buildroot/package/upmpdcli/upmpdcli.mk
index a9b057d8..ad41f85c 100644
--- a/bsp/buildroot/package/upmpdcli/upmpdcli.mk
+++ b/bsp/buildroot/package/upmpdcli/upmpdcli.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-UPMPDCLI_VERSION = 1.2.12
+UPMPDCLI_VERSION = 1.2.15
 UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
-UPMPDCLI_LICENSE = GPLv2+
+UPMPDCLI_LICENSE = GPL-2.0+
 UPMPDCLI_LICENSE_FILES = COPYING
 UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp
 
diff --git a/bsp/buildroot/package/upower/Config.in b/bsp/buildroot/package/upower/Config.in
index 8d9e84e6..e5643843 100644
--- a/bsp/buildroot/package/upower/Config.in
+++ b/bsp/buildroot/package/upower/Config.in
@@ -7,13 +7,14 @@ config BR2_PACKAGE_UPOWER
 	select BR2_PACKAGE_LIBGUDEV
 	select BR2_PACKAGE_LIBUSB
 	help
-	  UPower is an abstraction for enumerating power devices, listening
-	  to device events and querying history and statistics. Any
-	  application or service on the system can access the
-	  org.freedesktop.UPower service via the system message bus.
+	  UPower is an abstraction for enumerating power devices,
+	  listening to device events and querying history and
+	  statistics. Any application or service on the system can
+	  access the org.freedesktop.UPower service via the system
+	  message bus.
 
-	  Note: upowerd require CONFIG_TIMER_STATS enabled in the Linux
-	  kernel.
+	  Note: upowerd require CONFIG_TIMER_STATS enabled in the
+	  Linux kernel.
 
 	  https://upower.freedesktop.org/
 
diff --git a/bsp/buildroot/package/upower/upower.mk b/bsp/buildroot/package/upower/upower.mk
index 471eb419..79dc5e87 100644
--- a/bsp/buildroot/package/upower/upower.mk
+++ b/bsp/buildroot/package/upower/upower.mk
@@ -7,7 +7,7 @@
 UPOWER_VERSION = 0.99.4
 UPOWER_SOURCE = upower-$(UPOWER_VERSION).tar.xz
 UPOWER_SITE = https://upower.freedesktop.org/releases
-UPOWER_LICENSE = GPLv2+
+UPOWER_LICENSE = GPL-2.0+
 UPOWER_LICENSE_FILES = COPYING
 
 # libupower-glib.so
diff --git a/bsp/buildroot/package/upx/upx.mk b/bsp/buildroot/package/upx/upx.mk
index eaef2759..1fe7162c 100644
--- a/bsp/buildroot/package/upx/upx.mk
+++ b/bsp/buildroot/package/upx/upx.mk
@@ -7,7 +7,7 @@
 UPX_VERSION = 3.91
 UPX_SITE = http://upx.sourceforge.net/download
 UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.bz2
-UPX_LICENSE = GPLv2+
+UPX_LICENSE = GPL-2.0+
 UPX_LICENSE_FILES = COPYING
 
 HOST_UPX_DEPENDENCIES = host-ucl host-zlib
@@ -16,14 +16,14 @@ HOST_UPX_DEPENDENCIES = host-ucl host-zlib
 # stating to "please choose a target for 'make'"... :-(
 define HOST_UPX_BUILD_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) CPPFLAGS="$(HOST_CPPFLAGS)" \
-		LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR)/usr \
+		LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR) \
 		CXXFLAGS_WERROR= \
 		-C $(@D) all
 endef
 
 # UPX has no install procedure, so install it manually.
 define HOST_UPX_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/usr/bin/upx
+	$(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/bin/upx
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/urg/urg.hash b/bsp/buildroot/package/urg/urg.hash
index 41749d72..f2c5f143 100644
--- a/bsp/buildroot/package/urg/urg.hash
+++ b/bsp/buildroot/package/urg/urg.hash
@@ -2,3 +2,5 @@
 md5		93f90d2ccc36e784407c5282ef6bd2cb	urg-0.8.18.zip
 # Locally calculated
 sha256	b2cab7e539c90c60fc99a2350a42b5d5390ff952b694b196c3cbb54623cfee7f	urg-0.8.18.zip
+# License files, locally calculated
+sha256	9ccf26cfe845e0eb8bb58053e47366e7ab6b697ae010f7650978d4b71b7d1fc1	COPYING
diff --git a/bsp/buildroot/package/urg/urg.mk b/bsp/buildroot/package/urg/urg.mk
index 5d49aeb4..966627fe 100644
--- a/bsp/buildroot/package/urg/urg.mk
+++ b/bsp/buildroot/package/urg/urg.mk
@@ -7,7 +7,7 @@
 URG_VERSION = 0.8.18
 URG_SITE = http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/md5/93f90d2ccc36e784407c5282ef6bd2cb
 URG_SOURCE = urg-$(URG_VERSION).zip
-URG_LICENSE = LGPLv3
+URG_LICENSE = LGPL-3.0
 URG_LICENSE_FILES = COPYING
 
 URG_INSTALL_STAGING = YES
@@ -25,10 +25,7 @@ endif
 URG_CONFIG_SCRIPTS = c_urg-config urg-config
 
 define URG_EXTRACT_CMDS
-	$(RM) -rf $(URG_DIR)
-	$(UNZIP) -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE)
-	test -d $(URG_DIR) || \
-		mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR)
+	$(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(URG_SOURCE)
 endef
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch b/bsp/buildroot/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch
new file mode 100644
index 00000000..9e1e681f
--- /dev/null
+++ b/bsp/buildroot/package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch
@@ -0,0 +1,29 @@
+From 1309df373c882f27f476130b06746a6d1e1a0f85 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Fri, 3 Nov 2017 23:21:44 +0100
+Subject: [PATCH] Makefile: allow extra configure flags to be passed to jimtcl
+ on the make command line
+
+E.G. to pass --host / --build for cross compilation.
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a151e2a..94dabd9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ TCL        ?= $(HOST_TCL)
+ else
+ TCL        ?= /usr/bin/tclsh
+ endif
+-JIM_CONFIGURE_OPTS = --disable-lineedit \
++override JIM_CONFIGURE_OPTS += --disable-lineedit \
+ 	--with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr
+ 
+ .PHONY: clean install install-common uninstall \
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.hash b/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.hash
index 807b63f0..b202e635 100644
--- a/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.hash
+++ b/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	17dc32bf10df8e370f2369b5137d34dfd8f2347faaa51524c5f21c922f42e212	usb-modeswitch-2.4.0.tar.bz2
+sha256	31c0be280d49a99ec3dc0be3325bef320d9c04b50714ef0ce1e36a614d687633	usb-modeswitch-2.5.0.tar.bz2
diff --git a/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.mk b/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.mk
index e196db58..8dd712f2 100644
--- a/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.mk
+++ b/bsp/buildroot/package/usb_modeswitch/usb_modeswitch.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-USB_MODESWITCH_VERSION = 2.4.0
+USB_MODESWITCH_VERSION = 2.5.0
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb
-USB_MODESWITCH_LICENSE = GPLv2+
+USB_MODESWITCH_LICENSE = GPL-2.0+
 USB_MODESWITCH_LICENSE_FILES = COPYING
 
 USB_MODESWITCH_BUILD_TARGETS = static
@@ -20,9 +20,17 @@ USB_MODESWITCH_BUILD_TARGETS = script
 USB_MODESWITCH_INSTALL_TARGETS = install-script
 endif
 
+# build system of embedded jimtcl doesn't use autotools, but does use
+# an old version of gnuconfig which doesn't know all the architectures
+# supported by Buildroot, so update config.guess / config.sub like we
+# do in pkg-autotools.mk
+USB_MODESWITCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
+
 define USB_MODESWITCH_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+		$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
 		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \
+		JIM_CONFIGURE_OPTS="--host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME)" \
 		-C $(@D) $(USB_MODESWITCH_BUILD_TARGETS)
 endef
 
diff --git a/bsp/buildroot/package/usb_modeswitch_data/0001-makefile.patch b/bsp/buildroot/package/usb_modeswitch_data/0001-makefile.patch
deleted file mode 100644
index 28441fe0..00000000
--- a/bsp/buildroot/package/usb_modeswitch_data/0001-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fixed Makefile install sections to not reload udev rules. In a 
-cross-compiler environment, it is not wanted to reload the host udev rules.
-
-Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
-Signed-off-by: Patrick Ziegler <patrick.ziegler@fh-kl.de>
---- a/Makefile	2013-06-10 22:32:53.000000000 +0200
-+++ b/Makefile	2013-06-11 10:38:03.181161401 +0200
-@@ -13,9 +13,9 @@
- clean:
- 	$(RM) 40-usb_modeswitch.rules
- 
--install: all files-install db-install rules-reload
-+install: all files-install db-install
- 
--install-packed: files-install db-install-packed rules-reload
-+install-packed: files-install db-install-packed
- 
- files-install: 
- 	install -d $(PREFIX)/share/usb_modeswitch
-@@ -54,7 +54,7 @@
- 		fi \
- 	fi
- 
--uninstall: files-uninstall rules-reload
-+uninstall: files-uninstall
- 
- files-uninstall:
- 	$(RM) $(RULESDIR)/40-usb_modeswitch.rules
diff --git a/bsp/buildroot/package/usb_modeswitch_data/Config.in b/bsp/buildroot/package/usb_modeswitch_data/Config.in
index ad96726a..95b2a073 100644
--- a/bsp/buildroot/package/usb_modeswitch_data/Config.in
+++ b/bsp/buildroot/package/usb_modeswitch_data/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_USB_MODESWITCH_DATA
 	bool "usb_modeswitch_data"
-	select BR2_PACKAGE_USB_MODESWITCH
 	depends on BR2_TOOLCHAIN_HAS_THREADS # usb_modeswitch -> libusb
+	select BR2_PACKAGE_USB_MODESWITCH
 	help
 	  USB mode switch data
 	  Contains udev rules and events to allow usb_modeswitch to
diff --git a/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash b/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash
index 0df5475e..e19fcac6 100644
--- a/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash
+++ b/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	d679a44a48b1d1f243fea6b4d2bd54e0e08010ff579dd81eaf698954c0c6dfa7	usb-modeswitch-data-20160112.tar.bz2
+sha256	e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1	usb-modeswitch-data-20170205.tar.bz2
diff --git a/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk b/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk
index a0cbc126..4f634cda 100644
--- a/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk
+++ b/bsp/buildroot/package/usb_modeswitch_data/usb_modeswitch_data.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-USB_MODESWITCH_DATA_VERSION = 20160112
+USB_MODESWITCH_DATA_VERSION = 20170205
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch
-USB_MODESWITCH_DATA_LICENSE = GPLv2+
+USB_MODESWITCH_DATA_LICENSE = GPL-2.0+
 USB_MODESWITCH_DATA_LICENSE_FILES = COPYING
 
 # Nothing to build, it is a pure data package
diff --git a/bsp/buildroot/package/usbmount/Config.in b/bsp/buildroot/package/usbmount/Config.in
index 0bb8883b..f87bd911 100644
--- a/bsp/buildroot/package/usbmount/Config.in
+++ b/bsp/buildroot/package/usbmount/Config.in
@@ -3,8 +3,9 @@ config BR2_PACKAGE_USBMOUNT
 	depends on BR2_PACKAGE_HAS_UDEV
 	select BR2_PACKAGE_LOCKFILE_PROGS
 	help
-	  The usbmount package automatically mounts USB mass storage devices
-	  when they are plugged in, and unmounts them when they are removed.
+	  The usbmount package automatically mounts USB mass storage
+	  devices when they are plugged in, and unmounts them when
+	  they are removed.
 
 	  http://usbmount.alioth.debian.org/
 
diff --git a/bsp/buildroot/package/usbmount/usbmount.mk b/bsp/buildroot/package/usbmount/usbmount.mk
index 066cbb82..538602fd 100644
--- a/bsp/buildroot/package/usbmount/usbmount.mk
+++ b/bsp/buildroot/package/usbmount/usbmount.mk
@@ -8,15 +8,15 @@ USBMOUNT_VERSION = 0.0.22
 USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz
 USBMOUNT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/u/usbmount
 USBMOUNT_DEPENDENCIES = udev lockfile-progs
-USBMOUNT_LICENSE = BSD-2c
+USBMOUNT_LICENSE = BSD-2-Clause
 USBMOUNT_LICENSE_FILES = debian/copyright
 
 define USBMOUNT_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount
 
-	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink 	\
+	$(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \
 		$(TARGET_DIR)/etc/usbmount/mount.d/00_create_model_symlink
-	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink 	\
+	$(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \
 		$(TARGET_DIR)/etc/usbmount/umount.d/00_remove_model_symlink
 
 	$(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules
diff --git a/bsp/buildroot/package/usbredir/Config.in b/bsp/buildroot/package/usbredir/Config.in
index 2157f9ce..78b0bff6 100644
--- a/bsp/buildroot/package/usbredir/Config.in
+++ b/bsp/buildroot/package/usbredir/Config.in
@@ -6,13 +6,14 @@ config BR2_PACKAGE_USBREDIR
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
 	select BR2_PACKAGE_LIBUSB
 	help
-	  usbredir is the name of a network protocol for sending usb device
-	  traffic over a network connection. It is also the name of the
-	  software package offering a parsing library, a usbredirhost library
-	  and several utilities implementing this protocol.
+	  usbredir is the name of a network protocol for sending usb
+	  device traffic over a network connection. It is also the
+	  name of the software package offering a parsing library, a
+	  usbredirhost library and several utilities implementing this
+	  protocol.
 
-	  Note: only the library is installed, not the utilities. Say 'y'
-	  below if you want the server too.
+	  Note: only the library is installed, not the utilities. Say
+	  'y' below if you want the server too.
 
 	  http://www.spice-space.org/page/UsbRedir
 
@@ -21,8 +22,8 @@ if BR2_PACKAGE_USBREDIR
 config BR2_PACKAGE_USBREDIR_SERVER
 	bool "usbredirserver on target"
 	help
-	  If you want to serve usbredir requests on your target, say 'y'
-	  here to have the usbredir server on the target.
+	  If you want to serve usbredir requests on your target, say
+	  'y' here to have the usbredir server on the target.
 
 	  Note: the server is not required to use the library.
 
diff --git a/bsp/buildroot/package/usbredir/usbredir.mk b/bsp/buildroot/package/usbredir/usbredir.mk
index 6765a9ba..02cd47cf 100644
--- a/bsp/buildroot/package/usbredir/usbredir.mk
+++ b/bsp/buildroot/package/usbredir/usbredir.mk
@@ -7,14 +7,14 @@
 USBREDIR_VERSION = 0.7.1
 USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2
 USBREDIR_SITE = http://spice-space.org/download/usbredir
-USBREDIR_LICENSE = LGPLv2.1+ (libraries)
+USBREDIR_LICENSE = LGPL-2.1+ (libraries)
 USBREDIR_LICENSE_FILES = COPYING.LIB
 USBREDIR_INSTALL_STAGING = YES
 USBREDIR_DEPENDENCIES = host-pkgconf libusb
 
 ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y)
 
-USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPLv2+ (program)
+USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPL-2.0+ (program)
 USBREDIR_LICENSE_FILES += COPYING
 
 else # BR2_PACKAGE_USBREDIR_SERVER != y
diff --git a/bsp/buildroot/package/usbutils/usbutils.hash b/bsp/buildroot/package/usbutils/usbutils.hash
index 37c829a1..4e55c9b1 100644
--- a/bsp/buildroot/package/usbutils/usbutils.hash
+++ b/bsp/buildroot/package/usbutils/usbutils.hash
@@ -1,2 +1,2 @@
 # From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc
-sha256	44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c	usbutils-008.tar.xz
+sha256	8bbff0e54cb5f65a52be4feb9162fc0b022a97eb841b44784f7a89a9ea567160	usbutils-009.tar.xz
diff --git a/bsp/buildroot/package/usbutils/usbutils.mk b/bsp/buildroot/package/usbutils/usbutils.mk
index c96a1f54..84702ebc 100644
--- a/bsp/buildroot/package/usbutils/usbutils.mk
+++ b/bsp/buildroot/package/usbutils/usbutils.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-USBUTILS_VERSION = 008
+USBUTILS_VERSION = 009
 USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz
 USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils
 USBUTILS_DEPENDENCIES = host-pkgconf libusb udev
-USBUTILS_LICENSE = GPLv2+
+USBUTILS_LICENSE = GPL-2.0+
 USBUTILS_LICENSE_FILES = COPYING
 
 # Build after busybox since it's got a lightweight lsusb
diff --git a/bsp/buildroot/package/ushare/Config.in b/bsp/buildroot/package/ushare/Config.in
index eba7acf6..2dcd7737 100644
--- a/bsp/buildroot/package/ushare/Config.in
+++ b/bsp/buildroot/package/ushare/Config.in
@@ -1,16 +1,15 @@
 config BR2_PACKAGE_USHARE
 	bool "ushare"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp
-	select BR2_PACKAGE_LIBUPNP
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	# ushare has a completely custom configure script that does
 	# broken things with library ordering, which breaks static
 	# linking.
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBUPNP
 	help
 	  uShare is a UPnP (TM) A/V & DLNA Media Server.
-	  It implements the server component that provides UPnP media devices
-	  with information on available multimedia files.
+	  It implements the server component that provides UPnP media
+	  devices with information on available multimedia files.
 
 	  http://ushare.geexbox.org/
 
diff --git a/bsp/buildroot/package/ushare/ushare.mk b/bsp/buildroot/package/ushare/ushare.mk
index 62d269c4..bb194f63 100644
--- a/bsp/buildroot/package/ushare/ushare.mk
+++ b/bsp/buildroot/package/ushare/ushare.mk
@@ -7,21 +7,27 @@
 USHARE_VERSION = 1.1a
 USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2
 USHARE_SITE = http://ushare.geexbox.org/releases
-USHARE_DEPENDENCIES = host-pkgconf libupnp
-USHARE_LICENSE = GPLv2+
+USHARE_DEPENDENCIES = host-pkgconf libupnp $(TARGET_NLS_DEPENDENCIES)
+USHARE_LICENSE = GPL-2.0+
 USHARE_LICENSE_FILES = COPYING
+USHARE_LDFLAGS = $(TARGET_NLS_LIBS)
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-USHARE_DEPENDENCIES += gettext
-USHARE_LDFLAGS += -lintl
+USHARE_CONF_OPTS = \
+	--prefix=/usr \
+	--cross-compile \
+	--cross-prefix="$(TARGET_CROSS)" \
+	--sysconfdir=/etc \
+	--disable-strip
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
+USHARE_CONF_OPTS += --disable-nls
 endif
 
 define USHARE_CONFIGURE_CMDS
 	(cd $(@D); \
 		$(TARGET_CONFIGURE_OPTS) \
-		./configure --prefix=/usr $(DISABLE_NLS) --cross-compile \
-		--cross-prefix="$(TARGET_CROSS)" --sysconfdir=/etc \
-		--disable-strip \
+		./configure \
+			$(USHARE_CONF_OPTS) \
 	)
 endef
 
diff --git a/bsp/buildroot/package/ussp-push/0002-fix-build-again-obex-bluez.patch b/bsp/buildroot/package/ussp-push/0002-fix-build-again-obex-bluez.patch
new file mode 100644
index 00000000..e98fe6ef
--- /dev/null
+++ b/bsp/buildroot/package/ussp-push/0002-fix-build-again-obex-bluez.patch
@@ -0,0 +1,28 @@
+From 2d732026044d8e6cd16465ee87a73ac9692c021b Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Fri, 3 Nov 2017 09:04:12 +0100
+Subject: [PATCH] fix build again obex/bluez
+
+[fetch from debian source: http://http.debian.net/debian/pool/main/u/ussp-push/ussp-push_0.11-4.debian.tar.xz]
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ src/obex_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/obex_main.c b/src/obex_main.c
+index a7126e6..6233d7e 100644
+--- a/src/obex_main.c
++++ b/src/obex_main.c
+@@ -197,7 +197,7 @@ obex_t *__obex_connect(int devid, void *addr, int timeout, int *err)
+ 		*err = -1;
+ 		return NULL;
+ 	}
+-	if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) {
++	if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) {
+ 		BTERROR("OBEX_Init failed: %s\n", strerror(errno));
+ 		obex_free(gt);
+ 		*err = -1;
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/ussp-push/0003-add-OBEX_CharToUnicode.patch b/bsp/buildroot/package/ussp-push/0003-add-OBEX_CharToUnicode.patch
new file mode 100644
index 00000000..a660b552
--- /dev/null
+++ b/bsp/buildroot/package/ussp-push/0003-add-OBEX_CharToUnicode.patch
@@ -0,0 +1,47 @@
+From eafac77d76d2a23c191a56f715d6c4afc0800da8 Mon Sep 17 00:00:00 2001
+From: Samuel Martin <s.martin49@gmail.com>
+Date: Fri, 3 Nov 2017 09:10:01 +0100
+Subject: [PATCH] add OBEX_CharToUnicode
+
+[fetch from debian source: http://http.debian.net/debian/pool/main/u/ussp-push/ussp-push_0.11-4.debian.tar.xz]
+
+Signed-off-by: Samuel Martin <s.martin49@gmail.com>
+---
+ src/obex_main.c | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/src/obex_main.c b/src/obex_main.c
+index 6233d7e..971cc37 100644
+--- a/src/obex_main.c
++++ b/src/obex_main.c
+@@ -84,7 +84,27 @@ void request_done(obex_t * handle, obex_object_t * object, int obex_cmd, int obe
+ 
+ int bt_debug;
+ 
++static int OBEX_CharToUnicode(uint8_t *uc, const uint8_t *c, int size)
++{
++	int len, n;
++
++	if (uc == NULL || c == NULL)
++		return -1;
++
++	len = n = strlen((char *) c);
++	if (n*2+2 > size)
++		return -1;
++
++	uc[n*2+1] = 0;
++	uc[n*2] = 0;
+ 
++	while (n--) {
++		uc[n*2+1] = c[n];
++		uc[n*2] = 0;
++	}
++
++	return (len * 2) + 2;
++}
+ 
+ /*
+  * These two functions are from affix/profiles/obex/obex_io.c
+-- 
+2.15.0
+
diff --git a/bsp/buildroot/package/ussp-push/Config.in b/bsp/buildroot/package/ussp-push/Config.in
index e6695bb1..aefec85a 100644
--- a/bsp/buildroot/package/ussp-push/Config.in
+++ b/bsp/buildroot/package/ussp-push/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_USSP_PUSH
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
 	depends on BR2_USE_MMU # dbus
 	select BR2_PACKAGE_OPENOBEX
-	select BR2_PACKAGE_OPENOBEX_BLUEZ
 	select BR2_PACKAGE_BLUEZ_UTILS
 	help
 	  ussp-push is an OBEX object pusher for Linux, using the BlueZ
diff --git a/bsp/buildroot/package/ussp-push/ussp-push.hash b/bsp/buildroot/package/ussp-push/ussp-push.hash
index 91afb9d9..36c79cfa 100644
--- a/bsp/buildroot/package/ussp-push/ussp-push.hash
+++ b/bsp/buildroot/package/ussp-push/ussp-push.hash
@@ -1,2 +1,4 @@
 # Locally calculated
 sha256	bb2748eaed6164812555b4a1e186c4f2820c5ef9ce30f12d7aac28a452719bbd	ussp-push-0.11.tar.gz
+# License files, locally calculated
+sha256	204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994	COPYING
diff --git a/bsp/buildroot/package/ussp-push/ussp-push.mk b/bsp/buildroot/package/ussp-push/ussp-push.mk
index c3d11f97..0c45c291 100644
--- a/bsp/buildroot/package/ussp-push/ussp-push.mk
+++ b/bsp/buildroot/package/ussp-push/ussp-push.mk
@@ -6,7 +6,7 @@
 
 USSP_PUSH_VERSION = 0.11
 USSP_PUSH_SITE = http://www.xmailserver.org
-USSP_PUSH_LICENSE = GPLv2+
+USSP_PUSH_LICENSE = GPL-2.0+
 USSP_PUSH_LICENSE_FILES = COPYING
 
 USSP_PUSH_DEPENDENCIES = bluez_utils openobex
diff --git a/bsp/buildroot/package/ustr/ustr.hash b/bsp/buildroot/package/ustr/ustr.hash
index 214d37a7..878c6073 100644
--- a/bsp/buildroot/package/ustr/ustr.hash
+++ b/bsp/buildroot/package/ustr/ustr.hash
@@ -1,4 +1,4 @@
 # Locally computed
 sha256 3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4 ustr-1.0.4.tar.bz2
-# From http://debian.gtisc.gatech.edu/debian/pool/main/u/ustr/ustr_1.0.4-5.dsc
-sha256 a21e78acf82dcccef2893932ef7b85852419bfd9b18382e63c34e7710c1d7762 ustr_1.0.4-5.debian.tar.xz
+# From http://debian.gtisc.gatech.edu/debian/pool/main/u/ustr/ustr_1.0.4-6.dsc
+sha256 75aa6be2c70eba632ac63078e55ecb4b5a45e6624501a8ed6d81b9a2014d149e ustr_1.0.4-6.debian.tar.xz
diff --git a/bsp/buildroot/package/ustr/ustr.mk b/bsp/buildroot/package/ustr/ustr.mk
index 715914ca..8346adbc 100644
--- a/bsp/buildroot/package/ustr/ustr.mk
+++ b/bsp/buildroot/package/ustr/ustr.mk
@@ -9,11 +9,11 @@
 USTR_VERSION = 1.0.4
 USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2
 USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION)
-USTR_LICENSE = BSD-2c, MIT, LGPLv2+
+USTR_LICENSE = BSD-2-Clause, MIT, LGPL-2.0+
 USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT
 USTR_AUTORECONF = YES
 USTR_PATCH = \
-	http://http.debian.net/debian/pool/main/u/ustr/ustr_$(USTR_VERSION)-5.debian.tar.xz
+	http://snapshot.debian.org/archive/debian/20180131T223129Z/pool/main/u/ustr/ustr_$(USTR_VERSION)-6.debian.tar.xz
 
 USTR_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/ustream-ssl/ustream-ssl.mk b/bsp/buildroot/package/ustream-ssl/ustream-ssl.mk
index b83d129a..9b107882 100644
--- a/bsp/buildroot/package/ustream-ssl/ustream-ssl.mk
+++ b/bsp/buildroot/package/ustream-ssl/ustream-ssl.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-USTREAM_SSL_VERSION = ec80adaa1b47f28d426fa19c692011ce60b992d6
+USTREAM_SSL_VERSION = 45ac93088bc6f2d8ef3b0512d8e1ddfd9c4ee9e5
 USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git
 USTREAM_SSL_LICENSE = ISC
 USTREAM_SSL_LICENSE_FILES = ustream-ssl.h
diff --git a/bsp/buildroot/package/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch b/bsp/buildroot/package/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch
deleted file mode 100644
index cbf1a819..00000000
--- a/bsp/buildroot/package/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 02283be90292b2f57183aa930c4d69375f1d905d Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Wed, 18 Jan 2017 13:17:21 +0100
-Subject: [PATCH] build-sys: use -lm for scriptreplay if necessary
-
-Reported-by: Bert van Hall <bert.vanhall@avionic-design.de>
-Addresses: https://github.com/karelzak/util-linux/pull/397
-Signed-off-by: Karel Zak <kzak@redhat.com>
-(cherry picked from commit feda4342df1ced25df3d200ed23469e740196c86)
-Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
----
- term-utils/Makemodule.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am
-index 1b7c5fc..ad1bb1f 100644
---- a/term-utils/Makemodule.am
-+++ b/term-utils/Makemodule.am
-@@ -21,7 +21,7 @@ if BUILD_SCRIPTREPLAY
- usrbin_exec_PROGRAMS += scriptreplay
- dist_man_MANS += term-utils/scriptreplay.1
- scriptreplay_SOURCES = term-utils/scriptreplay.c
--scriptreplay_LDADD = $(LDADD) libcommon.la
-+scriptreplay_LDADD = $(LDADD) libcommon.la $(MATH_LIBS)
- endif # BUILD_SCRIPTREPLAY
- 
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/util-linux/0001-docs-add-ISC-licence.patch b/bsp/buildroot/package/util-linux/0001-docs-add-ISC-licence.patch
new file mode 100644
index 00000000..aea7b971
--- /dev/null
+++ b/bsp/buildroot/package/util-linux/0001-docs-add-ISC-licence.patch
@@ -0,0 +1,38 @@
+From a9e4662d26b10789b28282d7e77ab189ef34cf5c Mon Sep 17 00:00:00 2001
+From: Carlos Santos <casantos@datacom.ind.br>
+Date: Sun, 14 Jan 2018 16:39:31 -0200
+Subject: [PATCH] docs: add ISC licence
+
+Save the top 21 lines of sys-utils/rfkill.c as COPYING.ISC. This is
+useful for Linux distributions an integration tools like Buildroot,
+to collect detailed legal information for each package.
+
+[kzak@redhat.com: - remove C-comments and rfkill header]
+
+Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ Documentation/licenses/COPYING.ISC | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+ create mode 100644 Documentation/licenses/COPYING.ISC
+
+diff --git a/Documentation/licenses/COPYING.ISC b/Documentation/licenses/COPYING.ISC
+new file mode 100644
+index 000000000..8351a30e3
+--- /dev/null
++++ b/Documentation/licenses/COPYING.ISC
+@@ -0,0 +1,11 @@
++Permission to use, copy, modify, and/or distribute this software for any
++purpose with or without fee is hereby granted, provided that the above
++copyright notice and this permission notice appear in all copies.
++
++THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+-- 
+2.14.3
+
diff --git a/bsp/buildroot/package/util-linux/0002-lib-randutils-Do-not-block-on-getrandom.patch b/bsp/buildroot/package/util-linux/0002-lib-randutils-Do-not-block-on-getrandom.patch
new file mode 100644
index 00000000..79fa577c
--- /dev/null
+++ b/bsp/buildroot/package/util-linux/0002-lib-randutils-Do-not-block-on-getrandom.patch
@@ -0,0 +1,52 @@
+From a9cf659e0508c1f56813a7d74c64f67bbc962538 Mon Sep 17 00:00:00 2001
+From: Carlo Caione <carlo@endlessm.com>
+Date: Mon, 19 Mar 2018 10:31:07 +0000
+Subject: [PATCH] lib/randutils: Do not block on getrandom()
+
+In Endless we have hit a problem when using 'sfdisk' on the really first
+boot to automatically expand the rootfs partition. On this platform
+'sfdisk' is blocking on getrandom() because not enough random bytes are
+available. This is an ARM platform without a hwrng.
+
+We fix this passing GRND_NONBLOCK to getrandom(). 'sfdisk' will use the
+best entropy it has available and fallback only as necessary.
+
+Signed-off-by: Carlo Caione <carlo@endlessm.com>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ lib/randutils.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/randutils.c b/lib/randutils.c
+index e1c4059e1..02c3d9eb0 100644
+--- a/lib/randutils.c
++++ b/lib/randutils.c
+@@ -36,6 +36,8 @@
+ 
+ #if !defined(HAVE_GETRANDOM) && defined(SYS_getrandom)
+ /* libc without function, but we have syscal */
++#define GRND_NONBLOCK 0x01
++#define GRND_RANDOM 0x02
+ static int getrandom(void *buf, size_t buflen, unsigned int flags)
+ {
+ 	return (syscall(SYS_getrandom, buf, buflen, flags));
+@@ -104,13 +106,15 @@ void random_get_bytes(void *buf, size_t nbytes)
+ 		int x;
+ 
+ 		errno = 0;
+-		x = getrandom(cp, n, 0);
++		x = getrandom(cp, n, GRND_NONBLOCK);
+ 		if (x > 0) {			/* success */
+ 		       n -= x;
+ 		       cp += x;
+ 		       lose_counter = 0;
+ 		} else if (errno == ENOSYS)	/* kernel without getrandom() */
+ 			break;
++		else if (errno == EAGAIN)
++			break;
+ 		else if (lose_counter++ > 16)	/* entropy problem? */
+ 			break;
+ 	}
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/util-linux/0003-lib-randutils-don-t-break-on-EAGAIN-use-usleep.patch b/bsp/buildroot/package/util-linux/0003-lib-randutils-don-t-break-on-EAGAIN-use-usleep.patch
new file mode 100644
index 00000000..a48f12fc
--- /dev/null
+++ b/bsp/buildroot/package/util-linux/0003-lib-randutils-don-t-break-on-EAGAIN-use-usleep.patch
@@ -0,0 +1,71 @@
+From edc1c90cb972fdca1f66be5a8e2b0706bd2a4949 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 20 Mar 2018 14:17:24 +0100
+Subject: [PATCH] lib/randutils: don't break on EAGAIN, use usleep()
+
+The current code uses lose_counter to make more attempts to read
+random numbers. It seems better to wait a moment between attempts to
+avoid busy loop (we do the same in all-io.h).
+
+The worst case is 1 second delay for all random_get_bytes() on systems
+with uninitialized entropy pool -- for example you call sfdisk (MBR Id
+or GPT UUIDs) on very first boot, etc. In this case it will use libc
+rand() as a fallback solution.
+
+Note that we do not use random numbers for security sensitive things
+like keys or so. It's used for random based UUIDs etc.
+
+Addresses: https://github.com/karelzak/util-linux/pull/603
+Signed-off-by: Karel Zak <kzak@redhat.com>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ lib/randutils.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/lib/randutils.c b/lib/randutils.c
+index 02c3d9eb0..de4279530 100644
+--- a/lib/randutils.c
++++ b/lib/randutils.c
+@@ -95,6 +95,9 @@ int random_get_fd(void)
+  * Use /dev/urandom if possible, and if not,
+  * use glibc pseudo-random functions.
+  */
++#define UL_RAND_READ_ATTEMPTS	8
++#define UL_RAND_READ_DELAY	125000	/* microseconds */
++
+ void random_get_bytes(void *buf, size_t nbytes)
+ {
+ 	unsigned char *cp = (unsigned char *)buf;
+@@ -111,11 +114,14 @@ void random_get_bytes(void *buf, size_t nbytes)
+ 		       n -= x;
+ 		       cp += x;
+ 		       lose_counter = 0;
+-		} else if (errno == ENOSYS)	/* kernel without getrandom() */
+-			break;
+-		else if (errno == EAGAIN)
++
++		} else if (errno == ENOSYS) {	/* kernel without getrandom() */
+ 			break;
+-		else if (lose_counter++ > 16)	/* entropy problem? */
++
++		} else if (errno == EAGAIN && lose_counter < UL_RAND_READ_ATTEMPTS) {
++			xusleep(UL_RAND_READ_DELAY);	/* no etropy, wait and try again */
++			lose_counter++;
++		} else
+ 			break;
+ 	}
+ 
+@@ -134,8 +140,9 @@ void random_get_bytes(void *buf, size_t nbytes)
+ 			while (n > 0) {
+ 				ssize_t x = read(fd, cp, n);
+ 				if (x <= 0) {
+-					if (lose_counter++ > 16)
++					if (lose_counter++ > UL_RAND_READ_ATTEMPTS)
+ 						break;
++					xusleep(UL_RAND_READ_DELAY);
+ 					continue;
+ 				}
+ 				n -= x;
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/util-linux/Config.in b/bsp/buildroot/package/util-linux/Config.in
index e957f848..5f0a35cd 100644
--- a/bsp/buildroot/package/util-linux/Config.in
+++ b/bsp/buildroot/package/util-linux/Config.in
@@ -1,6 +1,5 @@
 menuconfig BR2_PACKAGE_UTIL_LINUX
 	bool "util-linux"
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  Various useful/essential linux libraries and utilities.
 
@@ -55,12 +54,13 @@ config BR2_PACKAGE_UTIL_LINUX_BINARIES
 	  Install the basic set of util-linux binaries.
 
 	  blkdiscard, blkid, blockdev, chcpu, col, colcrt, colrm,
-	  column, ctrlaltdel, dmesg, fdisk, findfs, findmnt, flock,
-	  fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, ldattach,
-	  look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, mkfs,
-	  mkswap, namei, prlimit, readprofile, renice, rev, rtcwake,
-	  script, scriptreplay, setarch, setsid, sfdisk, swaplabel,
-	  swapoff, swapon, tailf, uuidgen, whereis, wipefs
+	  column, ctrlaltdel, dmesg, fdisk, fincore, findfs, findmnt,
+	  flock, fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize,
+	  ldattach, look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie,
+	  mkfs, mkswap, namei, prlimit, readprofile, renice, rev,
+	  rtcwake, script, scriptreplay, setarch, setsid, sfdisk,
+	  swaplabel, swapoff, swapon, uuidgen, uuidparse, whereis,
+	  wipefs
 
 	  The setarch utility also installs architecture-specific
 	  symlinks like linux32, linux64, uname26, i386 and x86_64.
@@ -95,11 +95,17 @@ comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic l
 	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
 		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
 
+config BR2_PACKAGE_UTIL_LINUX_CHMEM
+	bool "chmem"
+	help
+	  Sets a particular size or range of memory online or offline
+
 config BR2_PACKAGE_UTIL_LINUX_CRAMFS
 	bool "cramfs utilities"
 	select BR2_PACKAGE_ZLIB
 	help
-	  Utilities for compressed ROM file system (fsck.cramfs, mkfs.cramfs)
+	  Utilities for compressed ROM file system (fsck.cramfs,
+	  mkfs.cramfs)
 
 config BR2_PACKAGE_UTIL_LINUX_EJECT
 	bool "eject"
@@ -159,26 +165,26 @@ config BR2_PACKAGE_UTIL_LINUX_LINE
 	help
 	  Read one line
 
-config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS
-	bool "login utilities"
-	depends on BR2_USE_MMU # fork() (login, runuser, su, sulogin)
-	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
-	depends on !BR2_STATIC_LIBS
-	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
-	depends on BR2_USE_MMU # linux-pam
-	select BR2_PACKAGE_LINUX_PAM
-	help
-	  Login utilities (last, login, runuser, su, sulogin)
-
-comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
-	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
-		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
-
 config BR2_PACKAGE_UTIL_LINUX_LOGGER
 	bool "logger"
 	help
 	  Enter messages into the system log
 
+config BR2_PACKAGE_UTIL_LINUX_LOGIN
+	bool "login"
+	depends on BR2_ENABLE_LOCALE # linux-pam
+	depends on BR2_USE_WCHAR # linux-pam
+	depends on !BR2_STATIC_LIBS # linux-pam
+	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
+	depends on BR2_USE_MMU # fork(), linux-pam
+	select BR2_PACKAGE_LINUX_PAM
+	help
+	  Begin a session on the system
+
+comment "login needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
+
 config BR2_PACKAGE_UTIL_LINUX_LOSETUP
 	bool "losetup"
 	depends on BR2_USE_MMU # libsmartcols
@@ -193,6 +199,13 @@ config BR2_PACKAGE_UTIL_LINUX_LSLOGINS
 	help
 	  Display information about known users in the system
 
+config BR2_PACKAGE_UTIL_LINUX_LSMEM
+	bool "lsmem"
+	depends on BR2_USE_MMU # libsmartcols
+	select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
+	help
+	  List the ranges of available memory with their online status
+
 config BR2_PACKAGE_UTIL_LINUX_MESG
 	bool "mesg"
 	help
@@ -279,10 +292,30 @@ config BR2_PACKAGE_UTIL_LINUX_RENAME
 	help
 	  Rename files
 
-config BR2_PACKAGE_UTIL_LINUX_RESET
-	bool "reset"
+config BR2_PACKAGE_UTIL_LINUX_RFKILL
+	bool "rfkill"
+	depends on BR2_USE_MMU # libsmartcols
+	select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS
 	help
-	  Reset the terminal
+	  Tool for enabling and disabling wireless devices. This new
+	  implementation is based upon, and backward compatible with,
+	  the original rfkill from Johannes Berg and Marcel Holtmann.
+
+config BR2_PACKAGE_UTIL_LINUX_RUNUSER
+	bool "runuser"
+	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
+	depends on !BR2_STATIC_LIBS
+	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
+	depends on BR2_USE_MMU # fork(), linux-pam
+	select BR2_PACKAGE_LINUX_PAM
+	help
+	  Run a command with substitute user and group ID (does not need
+	  to ask for a password, because it may be executed by the root
+	  user only)
+
+comment "runuser needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
 
 config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS
 	bool "scheduling utilities"
@@ -301,6 +334,26 @@ config BR2_PACKAGE_UTIL_LINUX_SETTERM
 	help
 	  Set terminal attributes
 
+config BR2_PACKAGE_UTIL_LINUX_SU
+	bool "su"
+	depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam
+	depends on !BR2_STATIC_LIBS
+	depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam
+	depends on BR2_USE_MMU # fork(), linux-pam
+	select BR2_PACKAGE_LINUX_PAM
+	help
+	  Run a command with substitute user and group ID
+
+comment "su needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library"
+	depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \
+		|| BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL
+
+config BR2_PACKAGE_UTIL_LINUX_SULOGIN
+	bool "sulogin"
+	depends on BR2_USE_MMU # fork()
+	help
+	  Single-user login
+
 config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT
 	bool "switch_root"
 	depends on BR2_USE_MMU # fork()
diff --git a/bsp/buildroot/package/util-linux/util-linux.hash b/bsp/buildroot/package/util-linux/util-linux.hash
index 71b4982f..068bb45e 100644
--- a/bsp/buildroot/package/util-linux/util-linux.hash
+++ b/bsp/buildroot/package/util-linux/util-linux.hash
@@ -1,2 +1,9 @@
-# From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/sha256sums.asc
-sha256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3  util-linux-2.29.2.tar.xz
+# From https://www.kernel.org/pub/linux/utils/util-linux/v2.31/sha256sums.asc
+sha256 1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11  util-linux-2.31.1.tar.xz
+# License files, locally calculated
+sha256 1e4b65802b0df8115395c697029d03339f983d451a473a08643309c684410d9a  README.licensing
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  Documentation/licenses/COPYING.GPLv2
+sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8  Documentation/licenses/COPYING.UCB
+sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  Documentation/licenses/COPYING.LGPLv2.1
+sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d  Documentation/licenses/COPYING.BSD-3
+sha256 e53348ce276358e9997014071c5294b36a18c4b34f32f00ee57b9acce0aafd63  Documentation/licenses/COPYING.ISC
diff --git a/bsp/buildroot/package/util-linux/util-linux.mk b/bsp/buildroot/package/util-linux/util-linux.mk
index d7358fe5..72a6d181 100644
--- a/bsp/buildroot/package/util-linux/util-linux.mk
+++ b/bsp/buildroot/package/util-linux/util-linux.mk
@@ -4,20 +4,18 @@
 #
 ################################################################################
 
-UTIL_LINUX_VERSION_MAJOR = 2.29
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
+UTIL_LINUX_VERSION_MAJOR = 2.31
+UTIL_LINUX_VERSION_MINOR = 1
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).$(UTIL_LINUX_VERSION_MINOR)
 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz
 UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
 
-# 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch
-UTIL_LINUX_AUTORECONF = YES
-
-# README.licensing claims that some files are GPLv2-only, but this is not true.
-# Some files are GPLv3+ but only in tests.
-UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid)
-UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3
+# README.licensing claims that some files are GPL-2.0 only, but this is not true.
+# Some files are GPL-3.0+ but only in tests. rfkill uses an ISC-style license.
+UTIL_LINUX_LICENSE = GPL-2.0+, BSD-4-Clause, LGPL-2.1+ (libblkid, libfdisk, libmount), BSD-3-Clause (libuuid) ISC (rfkill)
+UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 Documentation/licenses/COPYING.ISC
 UTIL_LINUX_INSTALL_STAGING = YES
-UTIL_LINUX_DEPENDENCIES = host-pkgconf
+UTIL_LINUX_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 # uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support
 # (used in logger.c), and the common default is N.
 UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \
@@ -25,6 +23,7 @@ UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \
 UTIL_LINUX_CONF_OPTS += \
 	--disable-rpath \
 	--disable-makeinstall-chown
+UTIL_LINUX_LIBS = $(TARGET_NLS_LIBS)
 
 # system depends on util-linux so we enable systemd support
 # (which needs systemd to be installed)
@@ -32,7 +31,6 @@ UTIL_LINUX_CONF_OPTS += \
 	--without-systemd \
 	--with-systemdsystemunitdir=no
 
-# We don't want the host-busybox dependency to be added automatically
 HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf
 
 # We also don't want the host-python dependency
@@ -44,14 +42,21 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 UTIL_LINUX_DEPENDENCIES += busybox
 endif
 
+# Prevent the installation from attempting to move shared libraries from
+# ${usrlib_execdir} (/usr/lib) to ${libdir} (/lib), since both paths are
+# the same when merged usr is in use.
+ifeq ($(BR2_ROOTFS_MERGED_USR),y)
+UTIL_LINUX_CONF_OPTS += --bindir=/usr/bin --sbindir=/usr/sbin --libdir=/usr/lib
+endif
+
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 UTIL_LINUX_DEPENDENCIES += ncurses
 ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y)
 UTIL_LINUX_CONF_OPTS += --with-ncursesw
-UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
+UTIL_LINUX_CONF_ENV += NCURSESW6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 else
 UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar
-UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
+UTIL_LINUX_CONF_ENV += NCURSES6_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
 endif
 else
 ifeq ($(BR2_USE_WCHAR),y)
@@ -62,11 +67,6 @@ endif
 UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses
 endif
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y)
-UTIL_LINUX_DEPENDENCIES += gettext
-UTIL_LINUX_LIBS += -lintl
-endif
-
 ifeq ($(BR2_PACKAGE_LIBCAP_NG),y)
 UTIL_LINUX_DEPENDENCIES += libcap-ng
 endif
@@ -104,6 +104,7 @@ UTIL_LINUX_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_CHMEM),--enable-chmem,--disable-chmem) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
@@ -121,9 +122,10 @@ UTIL_LINUX_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN),--enable-login,--disable-login) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_LSMEM),--enable-lsmem,--disable-lsmem) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \
@@ -137,10 +139,13 @@ UTIL_LINUX_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
-	$(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RFKILL),--enable-rfkill,--disable-rfkill) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_RUNUSER),--enable-runuser,--disable-runuser) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SU),--enable-su,--disable-su) \
+	$(if $(BR2_PACKAGE_UTIL_LINUX_SULOGIN),--enable-sulogin,--disable-sulogin) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \
@@ -231,7 +236,7 @@ UTIL_LINUX_CONF_OPTS += --without-audit
 endif
 
 # Install PAM configuration files
-ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y)
+ifeq ($(BR2_PACKAGE_UTIL_LINUX_SU)$(BR2_PACKAGE_LINUX_PAM),yy)
 define UTIL_LINUX_INSTALL_PAMFILES
 	$(INSTALL) -m 0644 package/util-linux/su.pam \
 		$(TARGET_DIR)/etc/pam.d/su
@@ -239,9 +244,8 @@ define UTIL_LINUX_INSTALL_PAMFILES
 		$(TARGET_DIR)/etc/pam.d/su-l
 	$(UTIL_LINUX_SELINUX_PAMFILES_TWEAK)
 endef
-endif
-
 UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_INSTALL_PAMFILES
+endif
 
 # Install agetty->getty symlink to avoid breakage when there's no busybox
 ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y)
@@ -254,13 +258,5 @@ endif
 
 UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK
 
-ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy)
-define UTIL_LINUX_TWEAK_UUID_PC
-	$(SED) '/Libs\.private: .*/d' $(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc
-	printf "Libs.private: -lintl\n" >>$(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc
-endef
-UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_TWEAK_UUID_PC
-endif
-
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/ux500-firmware/Config.in b/bsp/buildroot/package/ux500-firmware/Config.in
index 7e8a94b2..1c182373 100644
--- a/bsp/buildroot/package/ux500-firmware/Config.in
+++ b/bsp/buildroot/package/ux500-firmware/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_UX500_FIRMWARE
 	bool "ux500-firmware"
 	help
-	  This package provides various binary firmware files (closed binary blobs)
-	  for the Azurewave AW-NH580 combo module (wifi, bt, gps).
+	  This package provides various binary firmware files (closed
+	  binary blobs) for the Azurewave AW-NH580 combo module (wifi,
+	  bt, gps).
 
 	  https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files/
diff --git a/bsp/buildroot/package/v4l2grab/v4l2grab.mk b/bsp/buildroot/package/v4l2grab/v4l2grab.mk
index f3a8967d..68efe27f 100644
--- a/bsp/buildroot/package/v4l2grab/v4l2grab.mk
+++ b/bsp/buildroot/package/v4l2grab/v4l2grab.mk
@@ -6,7 +6,7 @@
 
 V4L2GRAB_VERSION = f8d8844d52387b3db7b8736f5e86156d9374f781
 V4L2GRAB_SITE = $(call github,twam,v4l2grab,$(V4L2GRAB_VERSION))
-V4L2GRAB_LICENSE = GPLv2+
+V4L2GRAB_LICENSE = GPL-2.0+
 V4L2GRAB_LICENSE_FILES = LICENSE.md
 # Fetched from github, no pre-generated configure script provided
 V4L2GRAB_AUTORECONF = YES
diff --git a/bsp/buildroot/package/v4l2loopback/Config.in b/bsp/buildroot/package/v4l2loopback/Config.in
new file mode 100644
index 00000000..d8ca31e5
--- /dev/null
+++ b/bsp/buildroot/package/v4l2loopback/Config.in
@@ -0,0 +1,30 @@
+config BR2_PACKAGE_V4L2LOOPBACK
+	bool "v4l2loopback"
+	depends on BR2_LINUX_KERNEL
+	help
+	  This module allows you to create "virtual video devices".
+	  Normal (v4l2) applications will read these devices as if
+	  they were ordinary video devices, but the video will not be
+	  read from e.g. a capture card but instead it is generated by
+	  another application.
+
+	  https://github.com/umlaeute/v4l2loopback
+
+if BR2_PACKAGE_V4L2LOOPBACK
+
+config BR2_PACKAGE_V4L2LOOPBACK_UTILS
+	bool "utils"
+	depends on BR2_USE_MMU # bash
+	select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash
+	select BR2_PACKAGE_BASH # runtime dependency
+	select BR2_PACKAGE_SUDO # runtime dependency
+	help
+	  Install applications to interact with v4l2-loopback devices
+	  ("virtual video devices").  Currently there is only a single
+	  command line utility: v4l2loopback-ctl: tool to set
+	  framerate, format and timeout image.
+
+endif
+
+comment "v4l2loopback needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/v4l2loopback/v4l2loopback.hash b/bsp/buildroot/package/v4l2loopback/v4l2loopback.hash
new file mode 100644
index 00000000..2b69fd7f
--- /dev/null
+++ b/bsp/buildroot/package/v4l2loopback/v4l2loopback.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 9bb1e8d544019bead20813877415ae974fbc22f87c69772984a4abac433f36dd  v4l2loopback-v0.10.0.tar.gz
diff --git a/bsp/buildroot/package/v4l2loopback/v4l2loopback.mk b/bsp/buildroot/package/v4l2loopback/v4l2loopback.mk
new file mode 100644
index 00000000..669f8fc6
--- /dev/null
+++ b/bsp/buildroot/package/v4l2loopback/v4l2loopback.mk
@@ -0,0 +1,19 @@
+################################################################################
+#
+# v4l2loopback
+#
+################################################################################
+
+V4L2LOOPBACK_VERSION = v0.10.0
+V4L2LOOPBACK_SITE = $(call github,umlaeute,v4l2loopback,$(V4L2LOOPBACK_VERSION))
+V4L2LOOPBACK_LICENSE = GPL-2.0+
+V4L2LOOPBACK_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_V4L2LOOPBACK_UTILS),y)
+define V4L2LOOPBACK_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/utils/v4l2loopback-ctl $(TARGET_DIR)/usr/bin/v4l2loopback-ctl
+endef
+endif
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/vala/vala.hash b/bsp/buildroot/package/vala/vala.hash
index ca5873c5..48212b22 100644
--- a/bsp/buildroot/package/vala/vala.hash
+++ b/bsp/buildroot/package/vala/vala.hash
@@ -1,2 +1,2 @@
-# From https://download.gnome.org/sources/vala/0.34/vala-0.34.4.sha256sum
-sha256 6b17bd339414563ebc51f64b0b837919ea7552d8a8ffa71cdc837d25c9696b83  vala-0.34.4.tar.xz
+# From https://download.gnome.org/sources/vala/0.34/vala-0.34.7.sha256sum
+sha256 1b2cb14f377d4c41fa3a86d3d01b93017015ce91b6714a85f27346073b4034fa  vala-0.34.7.tar.xz
diff --git a/bsp/buildroot/package/vala/vala.mk b/bsp/buildroot/package/vala/vala.mk
index dadfdfc1..ad0a5650 100644
--- a/bsp/buildroot/package/vala/vala.mk
+++ b/bsp/buildroot/package/vala/vala.mk
@@ -5,10 +5,10 @@
 ################################################################################
 
 VALA_VERSION_MAJOR = 0.34
-VALA_VERSION = $(VALA_VERSION_MAJOR).4
+VALA_VERSION = $(VALA_VERSION_MAJOR).7
 VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR)
 VALA_SOURCE = vala-$(VALA_VERSION).tar.xz
-VALA_LICENSE = LGPLv2.1+
+VALA_LICENSE = LGPL-2.1+
 VALA_LICENSE_FILES = COPYING
 
 HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2
@@ -20,12 +20,12 @@ HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=:
 # Otherwise we'll get host directory data which isn't enough
 define HOST_VALA_INSTALL_WRAPPER
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
-		$(HOST_DIR)/usr/bin/vala
+		$(HOST_DIR)/bin/vala
 	$(INSTALL) -D -m 0755 package/vala/vala-wrapper \
-		$(HOST_DIR)/usr/bin/valac
+		$(HOST_DIR)/bin/valac
 	$(SED) 's,@VALA_VERSION@,$(VALA_VERSION_MAJOR),' \
-		$(HOST_DIR)/usr/bin/vala \
-		$(HOST_DIR)/usr/bin/valac
+		$(HOST_DIR)/bin/vala \
+		$(HOST_DIR)/bin/valac
 endef
 HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER
 
diff --git a/bsp/buildroot/package/valgrind/valgrind.mk b/bsp/buildroot/package/valgrind/valgrind.mk
index ccc6cc39..32aeb97c 100644
--- a/bsp/buildroot/package/valgrind/valgrind.mk
+++ b/bsp/buildroot/package/valgrind/valgrind.mk
@@ -7,7 +7,7 @@
 VALGRIND_VERSION = 3.12.0
 VALGRIND_SITE = http://valgrind.org/downloads
 VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2
-VALGRIND_LICENSE = GPLv2, GFDLv1.2
+VALGRIND_LICENSE = GPL-2.0, GFDL-1.2
 VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS
 VALGRIND_CONF_OPTS = \
 	--disable-ubsan \
diff --git a/bsp/buildroot/package/valijson/valijson.mk b/bsp/buildroot/package/valijson/valijson.mk
index e0813b38..71bd6a8f 100644
--- a/bsp/buildroot/package/valijson/valijson.mk
+++ b/bsp/buildroot/package/valijson/valijson.mk
@@ -6,7 +6,7 @@
 
 VALIJSON_VERSION = 424b706f990a9eb96dfc19cc8e54f2cd6ce5e186
 VALIJSON_SITE = $(call github,tristanpenman,valijson,$(VALIJSON_VERSION))
-VALIJSON_LICENSE = BSD-2c
+VALIJSON_LICENSE = BSD-2-Clause
 VALIJSON_LICENSE_FILES = LICENSE
 VALIJSON_INSTALL_STAGING = YES
 VALIJSON_INSTALL_TARGET = NO
diff --git a/bsp/buildroot/package/vboot-utils/0004-Disable-static-futility.patch b/bsp/buildroot/package/vboot-utils/0004-Disable-static-futility.patch
new file mode 100644
index 00000000..649d3162
--- /dev/null
+++ b/bsp/buildroot/package/vboot-utils/0004-Disable-static-futility.patch
@@ -0,0 +1,30 @@
+The package attempts to build a statically-linked host binary, futility_s,
+which is not used anywhere in buildroot but may be causing build failures
+if the build host lacks static libc.
+
+Signed-off-by: Alex Suykov <alex.suykov@gmail.com>
+
+--- a/Makefile
++++ b/Makefile
+@@ -1079,7 +1079,7 @@
+ # new Firmware Utility
+ 
+ .PHONY: futil
+-futil: ${FUTIL_STATIC_BIN} ${FUTIL_BIN}
++futil: ${FUTIL_BIN}
+ 
+ ${FUTIL_STATIC_BIN}: ${FUTIL_STATIC_OBJS} ${UTILLIB}
+ 	@${PRINTF} "    LD            $(subst ${BUILD}/,,$@)\n"
+@@ -1091,10 +1091,10 @@
+ 	${Q}${LD} -o $@ ${CFLAGS} ${LDFLAGS} $^ ${LDLIBS}
+ 
+ .PHONY: futil_install
+-futil_install: ${FUTIL_BIN} ${FUTIL_STATIC_BIN}
++futil_install: ${FUTIL_BIN}
+ 	@${PRINTF} "    INSTALL       futility\n"
+ 	${Q}mkdir -p ${UB_DIR}
+-	${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN} ${FUTIL_STATIC_BIN}
++	${Q}${INSTALL} -t ${UB_DIR} ${FUTIL_BIN}
+ 	${Q}for prog in ${FUTIL_SYMLINKS}; do \
+ 		ln -sf futility "${UB_DIR}/$$prog"; done
+ 
diff --git a/bsp/buildroot/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch b/bsp/buildroot/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
new file mode 100644
index 00000000..5d76428e
--- /dev/null
+++ b/bsp/buildroot/package/vboot-utils/0005-include-sys-sysmacros.h-for-major.patch
@@ -0,0 +1,51 @@
+From 435fbcee218b37a87368e2b22fa33366875d458c Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 19 Apr 2016 13:58:49 -0400
+Subject: [PATCH] include sys/sysmacros.h for major()
+
+The major() func is defined in the sys/sysmacros.h header, so include it
+explicitly for the prototype.  Upstream C libs are moving away from having
+sys/types.h include it all the time implicitly.
+
+BUG=None
+TEST=precq passes
+BRANCH=None
+
+Change-Id: I56b84138f08ded2376193403f9c9db22c5f24f71
+Reviewed-on: https://chromium-review.googlesource.com/339680
+Commit-Ready: Mike Frysinger <vapier@chromium.org>
+Tested-by: Mike Frysinger <vapier@chromium.org>
+Reviewed-by: Bill Richardson <wfrichar@google.com>
+Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
+---
+ cgpt/cgpt_wrapper.c               | 1 +
+ futility/dump_kernel_config_lib.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c
+index dcfaab9c..1716cdde 100644
+--- a/cgpt/cgpt_wrapper.c
++++ b/cgpt/cgpt_wrapper.c
+@@ -18,6 +18,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+diff --git a/futility/dump_kernel_config_lib.c b/futility/dump_kernel_config_lib.c
+index 4fe990c3..abf37ae1 100644
+--- a/futility/dump_kernel_config_lib.c
++++ b/futility/dump_kernel_config_lib.c
+@@ -10,6 +10,7 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+-- 
+2.17.1
+
diff --git a/bsp/buildroot/package/vboot-utils/vboot-utils.hash b/bsp/buildroot/package/vboot-utils/vboot-utils.hash
index e1614238..4ff6c398 100644
--- a/bsp/buildroot/package/vboot-utils/vboot-utils.hash
+++ b/bsp/buildroot/package/vboot-utils/vboot-utils.hash
@@ -1,2 +1,2 @@
-# Git shapshot
-none	xxx	bbdd62f9b030db7ad8eef789aaf58a7ff9a25656.tar.gz
+# Locally computed
+sha256  d95b64b1f1de4a3ffa5c2e446d7c8e92aa197aee10de24206b2ea2deb5a8b947  vboot-utils-bbdd62f9b030db7ad8eef789aaf58a7ff9a25656.tar.gz
diff --git a/bsp/buildroot/package/vboot-utils/vboot-utils.mk b/bsp/buildroot/package/vboot-utils/vboot-utils.mk
index a64e1d54..3f63f458 100644
--- a/bsp/buildroot/package/vboot-utils/vboot-utils.mk
+++ b/bsp/buildroot/package/vboot-utils/vboot-utils.mk
@@ -7,7 +7,7 @@
 VBOOT_UTILS_VERSION = bbdd62f9b030db7ad8eef789aaf58a7ff9a25656
 VBOOT_UTILS_SITE = https://chromium.googlesource.com/chromiumos/platform/vboot_reference
 VBOOT_UTILS_SITE_METHOD = git
-VBOOT_UTILS_LICENSE = BSD-3c
+VBOOT_UTILS_LICENSE = BSD-3-Clause
 VBOOT_UTILS_LICENSE_FILES = LICENSE
 
 HOST_VBOOT_UTILS_DEPENDENCIES = host-openssl host-util-linux host-pkgconf
@@ -36,7 +36,7 @@ define HOST_VBOOT_UTILS_BUILD_CMDS
 endef
 
 define HOST_VBOOT_UTILS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR)/usr \
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \
 		futil_install cgpt_install devkeys_install
 endef
 
diff --git a/bsp/buildroot/package/vde2/0002-fstp-Add-static-to-inline-functions.patch b/bsp/buildroot/package/vde2/0002-fstp-Add-static-to-inline-functions.patch
new file mode 100644
index 00000000..0dbe083d
--- /dev/null
+++ b/bsp/buildroot/package/vde2/0002-fstp-Add-static-to-inline-functions.patch
@@ -0,0 +1,44 @@
+From 67bc8443ac7e8144a78d84dee30a5cac3b5c99a4 Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 27 Aug 2017 23:56:05 +0200
+Subject: [PATCH] fstp: Add static to inline functions
+
+From [1]
+"This is needed to avoid a link error where the inline functions appear
+missing at link time.
+From c99 standard inline function should either be declared static or
+have an extern instance in a c file for linking.
+This fix is necessary to build with gcc 7; for some reason it was not
+trigerred before."
+
+[1] https://git.buildroot.net/buildroot/commit/?id=21133ada326c87627f7bdee4493d8086587c3cca
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/vde_switch/fstp.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/vde_switch/fstp.c b/src/vde_switch/fstp.c
+index aab7324..b1e7ee8 100644
+--- a/src/vde_switch/fstp.c
++++ b/src/vde_switch/fstp.c
+@@ -30,14 +30,14 @@ static int numports;
+ #ifdef FSTP
+ #include <fstp.h>
+ /*********************** sending macro used by FSTP & Core ******************/
+-void inline ltonstring(unsigned long l,unsigned char *s) {
++static void inline ltonstring(unsigned long l,unsigned char *s) {
+ 	s[3]=l; l>>=8;
+ 	s[2]=l; l>>=8;
+ 	s[1]=l; l>>=8;
+ 	s[0]=l;
+ }
+ 
+-unsigned long inline nstringtol(unsigned char *s) {
++static unsigned long inline nstringtol(unsigned char *s) {
+ 	return (s[0]<<24)+(s[1]<<16)+(s[2]<<8)+s[3];
+ }
+ 
+-- 
+2.9.5
+
diff --git a/bsp/buildroot/package/vde2/vde2.mk b/bsp/buildroot/package/vde2/vde2.mk
index 3bbfd5f5..e2ec1241 100644
--- a/bsp/buildroot/package/vde2/vde2.mk
+++ b/bsp/buildroot/package/vde2/vde2.mk
@@ -7,7 +7,7 @@
 VDE2_VERSION = 2.3.2
 VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2
 VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION)
-VDE2_LICENSE = GPLv2+, LGPLv2.1+, BSD-3c
+VDE2_LICENSE = GPL-2.0+, LGPL-2.1+, BSD-3-Clause
 VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde
 VDE2_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash b/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash
index cf403f50..97cb4b42 100644
--- a/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash
+++ b/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 fd00fb6d833cad6a32a0d8259bb125abdf1716680650ba24b34bca2201745877  vdr-plugin-vnsiserver-v1.5.0.tar.gz
+sha256 f8170b4d6f983e7b5b5110e0432ff46355998e170f66459588170cc320717f7f  vdr-plugin-vnsiserver-v1.5.2.tar.gz
diff --git a/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
index aaa0859e..a25a99df 100644
--- a/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
+++ b/bsp/buildroot/package/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-VDR_PLUGIN_VNSISERVER_VERSION = v1.5.0
+VDR_PLUGIN_VNSISERVER_VERSION = v1.5.2
 VDR_PLUGIN_VNSISERVER_SITE = $(call github,FernetMenta,vdr-plugin-vnsiserver,$(VDR_PLUGIN_VNSISERVER_VERSION))
-VDR_PLUGIN_VNSISERVER_LICENSE = GPLv2+
+VDR_PLUGIN_VNSISERVER_LICENSE = GPL-2.0+
 VDR_PLUGIN_VNSISERVER_LICENSE_FILES = COPYING
 VDR_PLUGIN_VNSISERVER_DEPENDENCIES = vdr
 
diff --git a/bsp/buildroot/package/vdr/Config.in b/bsp/buildroot/package/vdr/Config.in
index d283b462..65117f54 100644
--- a/bsp/buildroot/package/vdr/Config.in
+++ b/bsp/buildroot/package/vdr/Config.in
@@ -3,10 +3,10 @@ config BR2_PACKAGE_VDR
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
 	depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	select BR2_PACKAGE_FONTCONFIG
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_JPEG
@@ -18,8 +18,9 @@ config BR2_PACKAGE_VDR
 
 	  http://www.tvdr.de
 
-comment "vdr needs a glibc or uClibc toolchain w/ C++, dynamic library, NPTL, wchar"
+comment "vdr needs a glibc or uClibc toolchain w/ C++, dynamic library, NPTL, wchar, headers >= 3.9"
 	depends on BR2_USE_MMU
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
-		BR2_TOOLCHAIN_USES_MUSL || !BR2_USE_WCHAR
+		BR2_TOOLCHAIN_USES_MUSL || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9
diff --git a/bsp/buildroot/package/vdr/vdr.hash b/bsp/buildroot/package/vdr/vdr.hash
index edbcd3fc..2ced98d9 100644
--- a/bsp/buildroot/package/vdr/vdr.hash
+++ b/bsp/buildroot/package/vdr/vdr.hash
@@ -1,4 +1,4 @@
-# From https://www.linuxtv.org/pipermail/vdr/2016-December/029178.html
-md5 6dbb208ea3d59658a18912b49af175b3  vdr-2.3.2.tar.bz2
+# From https://www.linuxtv.org/pipermail/vdr/2017-May/029263.html
+md5 01fabef4d20ec01f11d53354d99a9642  vdr-2.3.5.tar.bz2
 # Locally computed
-sha256 6c6ab08cf4dadd296e5e4a1c13f793c2e9222ec23103ae7aa9d616619f1496c0  vdr-2.3.2.tar.bz2
+sha256 323fd01e4f8daef24bbdcb906023d18c998a204a22de110d1cb0089532e818b5  vdr-2.3.5.tar.bz2
diff --git a/bsp/buildroot/package/vdr/vdr.mk b/bsp/buildroot/package/vdr/vdr.mk
index cdfa7e3a..242c5798 100644
--- a/bsp/buildroot/package/vdr/vdr.mk
+++ b/bsp/buildroot/package/vdr/vdr.mk
@@ -4,17 +4,18 @@
 #
 ################################################################################
 
-VDR_VERSION = 2.3.2
+VDR_VERSION = 2.3.5
 VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2
 VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer
-VDR_LICENSE = GPLv2+
+VDR_LICENSE = GPL-2.0+
 VDR_LICENSE_FILES = COPYING
 VDR_INSTALL_STAGING = YES
 VDR_DEPENDENCIES = \
 	freetype \
 	fontconfig \
 	jpeg \
-	libcap
+	libcap \
+	$(TARGET_NLS_DEPENDENCIES)
 
 VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2
 VDR_MAKE_FLAGS = \
@@ -22,11 +23,7 @@ VDR_MAKE_FLAGS = \
 	PLUGINLIBDIR=/usr/lib/vdr \
 	PREFIX=/usr \
 	VIDEODIR=/var/lib/vdr
-
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-VDR_DEPENDENCIES += gettext
-VDR_LDFLAGS += -lintl
-endif
+VDR_LDFLAGS = $(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
 VDR_DEPENDENCIES += libfribidi
diff --git a/bsp/buildroot/package/vim/Config.in b/bsp/buildroot/package/vim/Config.in
index b851627c..1469be8d 100644
--- a/bsp/buildroot/package/vim/Config.in
+++ b/bsp/buildroot/package/vim/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_VIM
 	depends on BR2_USE_WCHAR
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
 	  VIM Text editor
 
diff --git a/bsp/buildroot/package/vim/vim.mk b/bsp/buildroot/package/vim/vim.mk
index 9ea3fc21..0cc65125 100644
--- a/bsp/buildroot/package/vim/vim.mk
+++ b/bsp/buildroot/package/vim/vim.mk
@@ -8,7 +8,7 @@ VIM_VERSION = v8.0.0329
 VIM_SITE = $(call github,vim,vim,$(VIM_VERSION))
 # Win over busybox vi since vim is more feature-rich
 VIM_DEPENDENCIES = \
-	ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \
+	ncurses $(TARGET_NLS_DEPENDENCIES) \
 	$(if $(BR2_PACKAGE_BUSYBOX),busybox)
 VIM_SUBDIR = src
 VIM_CONF_ENV = \
@@ -65,9 +65,15 @@ define VIM_REMOVE_DOCS
 endef
 
 # Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation
+ifeq ($(BR2_ROOTFS_MERGED_USR),y)
 define VIM_INSTALL_VI_SYMLINK
-	ln -sf /usr/bin/vim $(TARGET_DIR)/bin/vi
+	ln -sf vim $(TARGET_DIR)/usr/bin/vi
 endef
+else
+define VIM_INSTALL_VI_SYMLINK
+	ln -sf ../usr/bin/vim $(TARGET_DIR)/bin/vi
+endef
+endif
 VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VI_SYMLINK
 
 ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y)
diff --git a/bsp/buildroot/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch b/bsp/buildroot/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch
new file mode 100644
index 00000000..8490cbda
--- /dev/null
+++ b/bsp/buildroot/package/vlc/0012-Fix-build-with-libupnp-above-1.6.23.patch
@@ -0,0 +1,64 @@
+From 0c8d631f4f9fa24f1bbd56a4dbe9d6f1e2360685 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 17 Dec 2017 12:26:33 +0100
+Subject: [PATCH] Fix build with libupnp above 1.6.23
+
+Starting from this release, libupnp has its own compat functions,
+backport patch from mainstream:
+https://github.com/videolan/vlc/commit/f9c5a343f1a8cad9c2c153f9c05e4e7201675a43#diff-2e66eb8b4fb06845a6426bd4a541d2f7
+
+Move UpnpEventPtr declaration in upnp.hpp as done in:
+https://github.com/videolan/vlc/commit/3eb4e03512f45c1fa27c7f9a6759e8e7d3905720#diff-ac39568c5e5e1c68776a93dfe0b3c1e6
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ modules/services_discovery/upnp.cpp | 5 +----
+ modules/services_discovery/upnp.hpp | 6 ++++++
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
+index 9b6ed8727a..cf846602b8 100644
+--- a/modules/services_discovery/upnp.cpp
++++ b/modules/services_discovery/upnp.cpp
+@@ -40,11 +40,10 @@
+ #include <assert.h>
+ #include <limits.h>
+ 
+-#if UPNP_VERSION < 10800
++#if UPNP_VERSION < 10623
+ /*
+  * Compat functions and typedefs for libupnp prior to 1.8
+  */
+-typedef void* UpnpEventPtr;
+ typedef Upnp_Discovery UpnpDiscovery;
+ typedef Upnp_Action_Complete UpnpActionComplete;
+ typedef Upnp_Event UpnpEvent;
+@@ -74,8 +73,6 @@ static const char* UpnpEventSubscribe_get_SID_cstr( const UpnpEventSubscribe* p_
+ {
+   return p_s->Sid;
+ }
+-#else
+-typedef const void* UpnpEventPtr;
+ #endif
+ 
+ /*
+diff --git a/modules/services_discovery/upnp.hpp b/modules/services_discovery/upnp.hpp
+index 23fe4db9ab..c369a04da6 100644
+--- a/modules/services_discovery/upnp.hpp
++++ b/modules/services_discovery/upnp.hpp
+@@ -33,6 +33,12 @@
+ 
+ #include <vlc_common.h>
+ 
++#if UPNP_VERSION < 10800
++typedef void* UpnpEventPtr;
++#else
++typedef const void* UpnpEventPtr;
++#endif
++
+ // Classes
+ class Container;
+ 
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/vlc/Config.in b/bsp/buildroot/package/vlc/Config.in
index 78023fb5..166e7d25 100644
--- a/bsp/buildroot/package/vlc/Config.in
+++ b/bsp/buildroot/package/vlc/Config.in
@@ -11,8 +11,6 @@ config BR2_PACKAGE_VLC
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
-	# ARC toolchain issue
-	depends on !BR2_arc
 	select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
 	select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV
 	select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3
@@ -36,6 +34,5 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND
 
 comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
 	depends on BR2_USE_MMU
-	depends on !BR2_arc
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
 		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
diff --git a/bsp/buildroot/package/vlc/vlc.mk b/bsp/buildroot/package/vlc/vlc.mk
index dfa84c3f..56bfdced 100644
--- a/bsp/buildroot/package/vlc/vlc.mk
+++ b/bsp/buildroot/package/vlc/vlc.mk
@@ -7,7 +7,7 @@
 VLC_VERSION = 2.2.8
 VLC_SITE = https://get.videolan.org/vlc/$(VLC_VERSION)
 VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz
-VLC_LICENSE = GPLv2+, LGPLv2.1+
+VLC_LICENSE = GPL-2.0+, LGPL-2.1+
 VLC_LICENSE_FILES = COPYING COPYING.LIB
 VLC_DEPENDENCIES = host-pkgconf
 VLC_AUTORECONF = YES
@@ -61,7 +61,7 @@ VLC_CONF_OPTS += \
 	--disable-mfx \
 	--disable-vdpau \
 	--disable-addonmanagermodules \
-	--enable-run-as-root \
+	--enable-run-as-root
 
 # Uses __atomic_fetch_add_4
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
@@ -281,9 +281,9 @@ else
 VLC_CONF_OPTS += --disable-theora
 endif
 
-ifeq ($(BR2_PACKAGE_LIBUPNP),y)
+ifeq ($(BR2_PACKAGE_LIBUPNP)$(BR2_PACKAGE_LIBUPNP18),y)
 VLC_CONF_OPTS += --enable-upnp
-VLC_DEPENDENCIES += libupnp
+VLC_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
 else
 VLC_CONF_OPTS += --disable-upnp
 endif
@@ -359,9 +359,9 @@ endif
 ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
 VLC_CONF_OPTS += --enable-qt
 VLC_CONF_ENV += \
-	ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \
-	ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \
-	ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic
+	ac_cv_path_MOC=$(HOST_DIR)/bin/moc \
+	ac_cv_path_RCC=$(HOST_DIR)/bin/rcc \
+	ac_cv_path_UIC=$(HOST_DIR)/bin/uic
 VLC_DEPENDENCIES += qt
 else
 VLC_CONF_OPTS += --disable-qt
diff --git a/bsp/buildroot/package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch b/bsp/buildroot/package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch
deleted file mode 100644
index e46ef078..00000000
--- a/bsp/buildroot/package/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8a4a9b82d4f8fd39db8417fd06d969505fde9d0a Mon Sep 17 00:00:00 2001
-From: Rodrigo Rebello <rprebello@gmail.com>
-Date: Tue, 22 Dec 2015 18:02:22 -0200
-Subject: [PATCH 1/1] configure.ac: add option to disable image output
-
-Even when the gd library is present, it may be desirable to not build
-'vnstati' as image output is an optional feature.
-
-Also, when testing for the gd library, use gdImagePng() instead of
-gdImageLine() since it's possible that the installed gd library doesn't
-have PNG support. In such cases, the test in the configure script passed
-(because gdImageLine() is always present), but the build failed with:
-
-  src/vnstati.o: In function `writeoutput':
-  vnstati.c:(.text+0x3fc): undefined reference to `gdImagePng'
-  collect2: error: ld returned 1 exit status
-
-Upstream status: accepted, not yet released.
-https://github.com/vergoh/vnstat/pull/35
-
-Signed-off-by: Rodrigo Rebello <rprebello@gmail.com>
----
- configure.ac | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index be3d449..89f71ef 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,10 +13,16 @@ AM_PROG_CC_C_O
- AC_PROG_MAKE_SET
- AC_PROG_MKDIR_P
- 
-+AC_ARG_ENABLE([image-output], [
-+AS_HELP_STRING([--disable-image-output], [disable PNG image output])])
-+
- # Checks for libraries.
- AC_CHECK_LIB([m], [pow])
--AC_CHECK_LIB([gd], [gdImageLine], [IMAGELIBS=-lgd])
--AC_SUBST([IMAGELIBS])
-+
-+AS_IF([test "x$enable_image_output" != "xno"], [
-+AC_CHECK_LIB([gd], [gdImagePng], [IMAGELIBS=-lgd])
-+AC_SUBST([IMAGELIBS])])
-+
- AM_CONDITIONAL([HAVE_LIBGD], [test "$IMAGELIBS" = "-lgd"])
- PKG_CHECK_MODULES([CHECK], [check >= 0.9.6], [], [AC_MSG_NOTICE([testcases can not be execute without check installed])])
- AM_CONDITIONAL([HAVE_CHECK], [test "$CHECK_LIBS"])
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/vnstat/vnstat.hash b/bsp/buildroot/package/vnstat/vnstat.hash
index 82ee8c02..1f515290 100644
--- a/bsp/buildroot/package/vnstat/vnstat.hash
+++ b/bsp/buildroot/package/vnstat/vnstat.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39	vnstat-1.15.tar.gz
+sha256	18e4c53576ca9e1ef2f0e063a6d83b0c44e3b1cf008560d658745df5c9aa7971	vnstat-1.17.tar.gz
diff --git a/bsp/buildroot/package/vnstat/vnstat.mk b/bsp/buildroot/package/vnstat/vnstat.mk
index 576f240a..18fb3191 100644
--- a/bsp/buildroot/package/vnstat/vnstat.mk
+++ b/bsp/buildroot/package/vnstat/vnstat.mk
@@ -4,13 +4,11 @@
 #
 ################################################################################
 
-VNSTAT_VERSION = 1.15
+VNSTAT_VERSION = 1.17
 VNSTAT_SITE = http://humdi.net/vnstat
-VNSTAT_LICENSE = GPLv2
+VNSTAT_LICENSE = GPL-2.0
 VNSTAT_LICENSE_FILES = COPYING
 VNSTAT_DEPENDENCIES = host-pkgconf
-# We're patching configure.ac, so we need to autoreconf
-VNSTAT_AUTORECONF = YES
 
 ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy)
 VNSTAT_DEPENDENCIES += gd
@@ -19,10 +17,4 @@ else
 VNSTAT_CONF_OPTS = --disable-image-output
 endif
 
-# vnStat declares an 'install-data-hook' rule that tries to run
-# 'vnstat --showconfig' on the host to generate a default config file.
-# That obviously doesn't work when cross-compiling, so avoid it
-# entirely.
-VNSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/vorbis-tools/vorbis-tools.mk b/bsp/buildroot/package/vorbis-tools/vorbis-tools.mk
index fc8e7dd1..1bec1e2b 100644
--- a/bsp/buildroot/package/vorbis-tools/vorbis-tools.mk
+++ b/bsp/buildroot/package/vorbis-tools/vorbis-tools.mk
@@ -6,7 +6,7 @@
 
 VORBIS_TOOLS_VERSION = 1.4.0
 VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis
-VORBIS_TOOLS_LICENSE = GPLv2
+VORBIS_TOOLS_LICENSE = GPL-2.0
 VORBIS_TOOLS_LICENSE_FILES = COPYING
 VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl
 VORBIS_TOOLS_CONF_OPTS = --program-transform-name=''
diff --git a/bsp/buildroot/package/vpnc/Config.in b/bsp/buildroot/package/vpnc/Config.in
index 2049c457..6455b0d8 100644
--- a/bsp/buildroot/package/vpnc/Config.in
+++ b/bsp/buildroot/package/vpnc/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_VPNC
 	bool "vpnc"
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
+	depends on !BR2_STATIC_LIBS # gnutls
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_USE_WCHAR # gnutls
 	select BR2_PACKAGE_LIBGCRYPT
@@ -15,6 +16,6 @@ config BR2_PACKAGE_VPNC
 
 	  http://www.unix-ag.uni-kl.de/~massar/vpnc
 
-comment "vpnc needs a toolchain w/ wchar"
+comment "vpnc needs a toolchain w/ wchar, dynamic library"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
diff --git a/bsp/buildroot/package/vpnc/vpnc.mk b/bsp/buildroot/package/vpnc/vpnc.mk
index 282a4225..81cd830e 100644
--- a/bsp/buildroot/package/vpnc/vpnc.mk
+++ b/bsp/buildroot/package/vpnc/vpnc.mk
@@ -6,7 +6,7 @@
 
 VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740
 VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION))
-VPNC_LICENSE = GPLv2+
+VPNC_LICENSE = GPL-2.0+
 VPNC_LICENSE_FILES = COPYING
 
 VPNC_DEPENDENCIES = libgcrypt libgpg-error gnutls host-pkgconf
diff --git a/bsp/buildroot/package/vsftpd/vsftpd.mk b/bsp/buildroot/package/vsftpd/vsftpd.mk
index fd923460..2f86d91b 100644
--- a/bsp/buildroot/package/vsftpd/vsftpd.mk
+++ b/bsp/buildroot/package/vsftpd/vsftpd.mk
@@ -7,7 +7,7 @@
 VSFTPD_VERSION = 3.0.3
 VSFTPD_SITE = https://security.appspot.com/downloads
 VSFTPD_LIBS = -lcrypt
-VSFTPD_LICENSE = GPLv2
+VSFTPD_LICENSE = GPL-2.0
 VSFTPD_LICENSE_FILES = COPYING
 
 define VSFTPD_DISABLE_UTMPX
diff --git a/bsp/buildroot/package/vtun/Config.in b/bsp/buildroot/package/vtun/Config.in
index c1f6d384..bb8919c3 100644
--- a/bsp/buildroot/package/vtun/Config.in
+++ b/bsp/buildroot/package/vtun/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_VTUN
 	bool "vtun"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LZO
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_ZLIB
-	depends on BR2_USE_MMU # fork()
 	help
 	  Tool for easily creating Virtual Tunnels over TCP/IP networks
 	  with traffic shaping, compression, and encryption.
diff --git a/bsp/buildroot/package/vtun/vtun.mk b/bsp/buildroot/package/vtun/vtun.mk
index 5e0e2666..9c46559f 100644
--- a/bsp/buildroot/package/vtun/vtun.mk
+++ b/bsp/buildroot/package/vtun/vtun.mk
@@ -6,7 +6,7 @@
 
 VTUN_VERSION = 3.0.3
 VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION)
-VTUN_LICENSE = GPLv2+ with OpenSSL exception
+VTUN_LICENSE = GPL-2.0+ with OpenSSL exception
 VTUN_LICENSE_FILES = README.OpenSSL
 VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl
 VTUN_AUTORECONF = YES
diff --git a/bsp/buildroot/package/w_scan/0001-musl.patch b/bsp/buildroot/package/w_scan/0001-musl.patch
index 7633d551..46d67677 100644
--- a/bsp/buildroot/package/w_scan/0001-musl.patch
+++ b/bsp/buildroot/package/w_scan/0001-musl.patch
@@ -20,7 +20,7 @@ diff -uNr w_scan-20141122.org/version.h w_scan-20141122/version.h
  /* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */
  #ifndef W_SCAN_VERSION_H
  #define W_SCAN_VERSION_H
--uint version=20141122;
-+unsigned int version=20141122;
+-uint version=20170107;
++unsigned int version=20170107;
  #endif
  
diff --git a/bsp/buildroot/package/w_scan/Config.in b/bsp/buildroot/package/w_scan/Config.in
index 2d4f6343..01dbbae1 100644
--- a/bsp/buildroot/package/w_scan/Config.in
+++ b/bsp/buildroot/package/w_scan/Config.in
@@ -6,9 +6,9 @@ config BR2_PACKAGE_W_SCAN
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
-	  w_scan is a small command line utility used to perform frequency
-	  scans for DVB and ATSC transmissions. It is capable of creating
-	  channels.conf files (in different output formats !) as well as
-	  initial tuning data for scan.
+	  w_scan is a small command line utility used to perform
+	  frequency scans for DVB and ATSC transmissions. It is
+	  capable of creating channels.conf files (in different output
+	  formats !) as well as initial tuning data for scan.
 
 	  http://wirbel.htpc-forum.de/w_scan/index_en.html
diff --git a/bsp/buildroot/package/w_scan/w_scan.hash b/bsp/buildroot/package/w_scan/w_scan.hash
index 4c336f3d..e04a0843 100644
--- a/bsp/buildroot/package/w_scan/w_scan.hash
+++ b/bsp/buildroot/package/w_scan/w_scan.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  b6d7c9ab997c53a0b0d92e8390f313cc3b82ee8ece1756b4e526119fd5ba09b4  w_scan-20141122.tar.bz2
+sha256 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe  w_scan-20170107.tar.bz2
diff --git a/bsp/buildroot/package/w_scan/w_scan.mk b/bsp/buildroot/package/w_scan/w_scan.mk
index 3ec84ed8..c63f20cc 100644
--- a/bsp/buildroot/package/w_scan/w_scan.mk
+++ b/bsp/buildroot/package/w_scan/w_scan.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-W_SCAN_VERSION = 20141122
+W_SCAN_VERSION = 20170107
 W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2
 W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan
-W_SCAN_LICENSE = GPLv2+
+W_SCAN_LICENSE = GPL-2.0+
 W_SCAN_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
diff --git a/bsp/buildroot/package/waf/waf.mk b/bsp/buildroot/package/waf/waf.mk
index 3d61f267..e7ac891b 100644
--- a/bsp/buildroot/package/waf/waf.mk
+++ b/bsp/buildroot/package/waf/waf.mk
@@ -13,7 +13,7 @@ define HOST_WAF_EXTRACT_CMDS
 endef
 
 define HOST_WAF_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/waf $(HOST_DIR)/usr/bin/waf
+	$(INSTALL) -D -m 0755 $(@D)/waf $(HOST_DIR)/bin/waf
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/wavemon/Config.in b/bsp/buildroot/package/wavemon/Config.in
index e073dee9..b72a6177 100644
--- a/bsp/buildroot/package/wavemon/Config.in
+++ b/bsp/buildroot/package/wavemon/Config.in
@@ -4,13 +4,14 @@ config BR2_PACKAGE_WAVEMON
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBNL
 	help
-	  wavemon is a wireless device monitoring application that allows you
-	  to watch signal and noise levels, packet statistics, device
-	  configuration and network parameters of your wireless network
-	  hardware.
+	  wavemon is a wireless device monitoring application that
+	  allows you to watch signal and noise levels, packet
+	  statistics, device configuration and network parameters of
+	  your wireless network hardware.
 
-	  Note that you need a Linux Kernel configuration with wireless
-	  extensions or with wireless extensions compatibility enabled.
+	  Note that you need a Linux Kernel configuration with
+	  wireless extensions or with wireless extensions
+	  compatibility enabled.
 
 	  https://github.com/uoaerg/wavemon
 
diff --git a/bsp/buildroot/package/wavemon/wavemon.mk b/bsp/buildroot/package/wavemon/wavemon.mk
index 5a1b7ee0..e87ab7a3 100644
--- a/bsp/buildroot/package/wavemon/wavemon.mk
+++ b/bsp/buildroot/package/wavemon/wavemon.mk
@@ -6,7 +6,7 @@
 
 WAVEMON_VERSION = v0.8.1
 WAVEMON_SITE = $(call github,uoaerg,wavemon,$(WAVEMON_VERSION))
-WAVEMON_LICENSE = GPLv3+
+WAVEMON_LICENSE = GPL-3.0+
 WAVEMON_LICENSE_FILES = COPYING
 WAVEMON_DEPENDENCIES = host-pkgconf libnl ncurses
 
diff --git a/bsp/buildroot/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch b/bsp/buildroot/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch
new file mode 100644
index 00000000..f837a0e9
--- /dev/null
+++ b/bsp/buildroot/package/wavpack/0005-issue-30-issue-31-issue-32-no-multiple-format-chunks.patch
@@ -0,0 +1,64 @@
+From 26cb47f99d481ad9b93eeff80d26e6b63bbd7e15 Mon Sep 17 00:00:00 2001
+From: David Bryant <david@wavpack.com>
+Date: Tue, 24 Apr 2018 22:18:07 -0700
+Subject: [PATCH] issue #30 issue #31 issue #32: no multiple format chunks in
+ WAV or W64
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ cli/riff.c   | 7 ++++++-
+ cli/wave64.c | 6 ++++++
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/cli/riff.c b/cli/riff.c
+index 7bddf63..5d6452e 100644
+--- a/cli/riff.c
++++ b/cli/riff.c
+@@ -53,7 +53,7 @@ extern int debug_logging_mode;
+ 
+ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, WavpackContext *wpc, WavpackConfig *config)
+ {
+-    int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0;
++    int is_rf64 = !strncmp (fourcc, "RF64", 4), got_ds64 = 0, format_chunk = 0;
+     int64_t total_samples = 0, infilesize;
+     RiffChunkHeader riff_chunk_header;
+     ChunkHeader chunk_header;
+@@ -140,6 +140,11 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+         else if (!strncmp (chunk_header.ckID, "fmt ", 4)) {     // if it's the format chunk, we want to get some info out of there and
+             int supported = TRUE, format;                        // make sure it's a .wav file we can handle
+ 
++            if (format_chunk++) {
++                error_line ("%s is not a valid .WAV file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
+             if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) ||
+                 !DoReadFile (infile, &WaveHeader, chunk_header.ckSize, &bcount) ||
+                 bcount != chunk_header.ckSize) {
+diff --git a/cli/wave64.c b/cli/wave64.c
+index fa928a0..0388dc7 100644
+--- a/cli/wave64.c
++++ b/cli/wave64.c
+@@ -53,6 +53,7 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+     Wave64ChunkHeader chunk_header;
+     Wave64FileHeader filehdr;
+     WaveHeader WaveHeader;
++    int format_chunk = 0;
+     uint32_t bcount;
+ 
+     infilesize = DoGetFileSize (infile);
+@@ -104,6 +105,11 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+         if (!memcmp (chunk_header.ckID, fmt_guid, sizeof (fmt_guid))) {
+             int supported = TRUE, format;
+ 
++            if (format_chunk++) {
++                error_line ("%s is not a valid .W64 file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
+             chunk_header.ckSize = (chunk_header.ckSize + 7) & ~7L;
+ 
+             if (chunk_header.ckSize < 16 || chunk_header.ckSize > sizeof (WaveHeader) ||
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch b/bsp/buildroot/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch
new file mode 100644
index 00000000..76ebce66
--- /dev/null
+++ b/bsp/buildroot/package/wavpack/0006-issue-33-sanitize-size-of-unknown-chunks-before-mall.patch
@@ -0,0 +1,75 @@
+From 6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d Mon Sep 17 00:00:00 2001
+From: David Bryant <david@wavpack.com>
+Date: Tue, 24 Apr 2018 17:27:01 -0700
+Subject: [PATCH] issue #33, sanitize size of unknown chunks before malloc()
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ cli/dsdiff.c | 9 ++++++++-
+ cli/riff.c   | 9 ++++++++-
+ cli/wave64.c | 9 ++++++++-
+ 3 files changed, 24 insertions(+), 3 deletions(-)
+
+diff --git a/cli/dsdiff.c b/cli/dsdiff.c
+index c016df9..fa56bbb 100644
+--- a/cli/dsdiff.c
++++ b/cli/dsdiff.c
+@@ -279,7 +279,14 @@ int ParseDsdiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+         else {          // just copy unknown chunks to output file
+ 
+             int bytes_to_copy = (int)(((dff_chunk_header.ckDataSize) + 1) & ~(int64_t)1);
+-            char *buff = malloc (bytes_to_copy);
++            char *buff;
++
++            if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
++                error_line ("%s is not a valid .DFF file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
+diff --git a/cli/riff.c b/cli/riff.c
+index de98c1e..7bddf63 100644
+--- a/cli/riff.c
++++ b/cli/riff.c
+@@ -286,7 +286,14 @@ int ParseRiffHeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpack
+         else {          // just copy unknown chunks to output file
+ 
+             int bytes_to_copy = (chunk_header.ckSize + 1) & ~1L;
+-            char *buff = malloc (bytes_to_copy);
++            char *buff;
++
++            if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
++                error_line ("%s is not a valid .WAV file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
+diff --git a/cli/wave64.c b/cli/wave64.c
+index 591d640..fa928a0 100644
+--- a/cli/wave64.c
++++ b/cli/wave64.c
+@@ -241,7 +241,14 @@ int ParseWave64HeaderConfig (FILE *infile, char *infilename, char *fourcc, Wavpa
+         }
+         else {          // just copy unknown chunks to output file
+             int bytes_to_copy = (chunk_header.ckSize + 7) & ~7L;
+-            char *buff = malloc (bytes_to_copy);
++            char *buff;
++
++            if (bytes_to_copy < 0 || bytes_to_copy > 4194304) {
++                error_line ("%s is not a valid .W64 file!", infilename);
++                return WAVPACK_SOFT_ERROR;
++            }
++
++            buff = malloc (bytes_to_copy);
+ 
+             if (debug_logging_mode)
+                 error_line ("extra unknown chunk \"%c%c%c%c\" of %d bytes",
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/wavpack/wavpack.mk b/bsp/buildroot/package/wavpack/wavpack.mk
index daa0888d..c23b1275 100644
--- a/bsp/buildroot/package/wavpack/wavpack.mk
+++ b/bsp/buildroot/package/wavpack/wavpack.mk
@@ -9,7 +9,7 @@ WAVPACK_SITE = http://www.wavpack.com
 WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
 WAVPACK_INSTALL_STAGING = YES
 WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv)
-WAVPACK_LICENSE = BSD-3c
+WAVPACK_LICENSE = BSD-3-Clause
 WAVPACK_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
diff --git a/bsp/buildroot/package/wayland-protocols/wayland-protocols.hash b/bsp/buildroot/package/wayland-protocols/wayland-protocols.hash
index a3166980..d1d643ca 100644
--- a/bsp/buildroot/package/wayland-protocols/wayland-protocols.hash
+++ b/bsp/buildroot/package/wayland-protocols/wayland-protocols.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030606.html
-sha256	635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f	wayland-protocols-1.7.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2017-December/036037.html
+md5 ac83c4704003323b6bd5a1b91fb1be53  wayland-protocols-1.12.tar.xz
+sha1 ac908e91c6c5e7802c0af48f55725ad683017e72  wayland-protocols-1.12.tar.xz
+sha256 3b19e8a9e1e19474756a7069db23b90ca9b8ebb438448c6063b4a7fc89b7c8b2  wayland-protocols-1.12.tar.xz
+sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124  COPYING
diff --git a/bsp/buildroot/package/wayland-protocols/wayland-protocols.mk b/bsp/buildroot/package/wayland-protocols/wayland-protocols.mk
index 54c2ec13..0d23e9af 100644
--- a/bsp/buildroot/package/wayland-protocols/wayland-protocols.mk
+++ b/bsp/buildroot/package/wayland-protocols/wayland-protocols.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_PROTOCOLS_VERSION = 1.7
+WAYLAND_PROTOCOLS_VERSION = 1.12
 WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz
 WAYLAND_PROTOCOLS_LICENSE = MIT
diff --git a/bsp/buildroot/package/wayland/0002-configure-add-option-to-disable-tests.patch b/bsp/buildroot/package/wayland/0002-configure-add-option-to-disable-tests.patch
new file mode 100644
index 00000000..8c67d9a3
--- /dev/null
+++ b/bsp/buildroot/package/wayland/0002-configure-add-option-to-disable-tests.patch
@@ -0,0 +1,68 @@
+From 33b025e04bf3fa94b74ea3325b3fd7c3f546bcb1 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sun, 5 Mar 2017 10:06:02 +0100
+Subject: [PATCH] configure: add option to disable tests
+
+When building for a product, tests are not needed.
+
+Besides, one test requires a C++ compiler, which is not always
+available.
+
+So, add an option to configure to disable building tests altogether.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Patch submitted upstream:
+https://lists.freedesktop.org/archives/wayland-devel/2017-March/033359.html
+---
+ Makefile.am  | 3 ++-
+ configure.ac | 8 ++++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d0c8bd3..9c2541d 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -143,7 +143,7 @@ libwayland_cursor_la_CFLAGS =			\
+ 	-I$(top_srcdir)/src			\
+ 	-DICONDIR=\"$(ICONDIR)\"
+ 
+-
++if ENABLE_TESTS
+ built_test_programs =				\
+ 	array-test				\
+ 	client-test				\
+@@ -258,6 +258,7 @@ os_wrappers_test_LDADD = libtest-runner.la
+ 
+ exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
+ exec_fd_leak_checker_LDADD = libtest-runner.la
++endif
+ 
+ EXTRA_DIST += tests/scanner-test.sh			\
+ 	tests/data/example.xml				\
+diff --git a/configure.ac b/configure.ac
+index b583bef..96a5575 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -87,10 +87,18 @@ AC_ARG_ENABLE([dtd-validation],
+ 	      [],
+ 	      [enable_dtd_validation=yes])
+ 
++AC_ARG_ENABLE([tests],
++	      [AC_HELP_STRING([--disable-tests],
++			      [Disable compilation of test programs])],
++	      [],
++	      [enable_tests=yes])
++
+ AM_CONDITIONAL(USE_HOST_SCANNER, test "x$with_host_scanner" = xyes)
+ 
+ AM_CONDITIONAL(ENABLE_LIBRARIES, test "x$enable_libraries" = xyes)
+ 
++AM_CONDITIONAL(ENABLE_TESTS, test "x$enable_tests" = "yes")
++
+ AC_ARG_WITH(icondir, [  --with-icondir=<dir>    Look for cursor icons here],
+ 		     [  ICONDIR=$withval],
+ 		     [  ICONDIR=${datadir}/icons])
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/wayland/wayland.hash b/bsp/buildroot/package/wayland/wayland.hash
index 9a58c56b..c46aca2b 100644
--- a/bsp/buildroot/package/wayland/wayland.hash
+++ b/bsp/buildroot/package/wayland/wayland.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031121.html
-sha256  d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1	wayland-1.12.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2017-August/034748.html
+md5  0235f6075c32c3be61cff94fa0b9f108  wayland-1.14.0.tar.xz
+sha1 53a443be3bafe73209bbc49ef2cb134ed16e0141  wayland-1.14.0.tar.xz
+sha256 ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8  wayland-1.14.0.tar.xz
+sha512 bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5  wayland-1.14.0.tar.xz
diff --git a/bsp/buildroot/package/wayland/wayland.mk b/bsp/buildroot/package/wayland/wayland.mk
index a8623943..10710a81 100644
--- a/bsp/buildroot/package/wayland/wayland.mk
+++ b/bsp/buildroot/package/wayland/wayland.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WAYLAND_VERSION = 1.12.0
+WAYLAND_VERSION = 1.14.0
 WAYLAND_SITE = http://wayland.freedesktop.org/releases
 WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz
 WAYLAND_LICENSE = MIT
@@ -13,8 +13,12 @@ WAYLAND_INSTALL_STAGING = YES
 WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2
 HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2
 
+# 0002-configure-add-option-to-disable-tests.patch
+WAYLAND_AUTORECONF = YES
+
 # wayland-scanner is only needed for building, not on the target
-WAYLAND_CONF_OPTS = --disable-scanner --with-host-scanner
+WAYLAND_CONF_OPTS = --with-host-scanner --disable-tests
+HOST_WAYLAND_CONF_OPTS = --disable-tests
 
 # Remove the DTD from the target, it's not needed at runtime
 define WAYLAND_TARGET_CLEANUP
diff --git a/bsp/buildroot/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch b/bsp/buildroot/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch
new file mode 100644
index 00000000..ad5b8425
--- /dev/null
+++ b/bsp/buildroot/package/waylandpp/0001-scanner-Fix-compiler-error-missing-stdexcept-to-use-.patch
@@ -0,0 +1,28 @@
+From 85b61589b0c73f6c6974862af678ed2f82806ac5 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Thu, 9 Aug 2018 21:44:46 +0200
+Subject: [PATCH] [scanner] Fix compiler error: missing <stdexcept> to use
+ std::runtime_error
+
+Patch sent upstream as PR 50.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ scanner/scanner.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp
+index 9c97b7c..7019e0a 100644
+--- a/scanner/scanner.cpp
++++ b/scanner/scanner.cpp
+@@ -22,6 +22,7 @@
+ #include <sstream>
+ #include <cctype>
+ #include <cmath>
++#include <stdexcept>
+ 
+ #include "pugixml.hpp"
+ 
+-- 
+2.18.0
+
diff --git a/bsp/buildroot/package/waylandpp/Config.in b/bsp/buildroot/package/waylandpp/Config.in
new file mode 100644
index 00000000..3d7362b3
--- /dev/null
+++ b/bsp/buildroot/package/waylandpp/Config.in
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_WAYLANDPP
+	bool "waylandpp"
+	depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
+	depends on BR2_HOST_GCC_AT_LEAST_4_9
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+	depends on BR2_PACKAGE_WAYLAND
+	help
+	  Wayland C++ bindings
+
+	  https://github.com/NilsBrause/waylandpp
+
+comment "waylandpp needs an OpenGL-EGL/wayland backend, a toolchain w/ gcc >= 4.9, host gcc >= 4.9"
+	depends on BR2_PACKAGE_WAYLAND
+	depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \
+		!BR2_HOST_GCC_AT_LEAST_4_9 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
diff --git a/bsp/buildroot/package/waylandpp/waylandpp.hash b/bsp/buildroot/package/waylandpp/waylandpp.hash
new file mode 100644
index 00000000..1b14814c
--- /dev/null
+++ b/bsp/buildroot/package/waylandpp/waylandpp.hash
@@ -0,0 +1,4 @@
+# Locally computed
+sha256 ebd4a8447bb65f288cad0e04538f6ec704e155213fc2b9cc1a851534c70aacac  waylandpp-0.2.3.tar.gz
+sha256 49aa6d728fd13226952c9e3a5a9cae46379b2a501010064760172b5ce7cd94bb  LICENSE
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  scanner/gpl-3.0.txt
diff --git a/bsp/buildroot/package/waylandpp/waylandpp.mk b/bsp/buildroot/package/waylandpp/waylandpp.mk
new file mode 100644
index 00000000..ff17c35c
--- /dev/null
+++ b/bsp/buildroot/package/waylandpp/waylandpp.mk
@@ -0,0 +1,27 @@
+################################################################################
+#
+# waylandpp
+#
+################################################################################
+
+WAYLANDPP_VERSION = 0.2.3
+WAYLANDPP_SITE = $(call github,NilsBrause,waylandpp,$(WAYLANDPP_VERSION))
+WAYLANDPP_LICENSE = MIT, GPL-3.0+ (wayland_scanner)
+WAYLANDPP_LICENSE_FILES = LICENSE scanner/gpl-3.0.txt
+WAYLANDPP_INSTALL_STAGING = YES
+HOST_WAYLANDPP_DEPENDENCIES = host-pkgconf host-wayland
+WAYLANDPP_DEPENDENCIES = libegl host-pkgconf wayland host-waylandpp
+
+# host variant of wayland-scanner++ is needed for building the target
+# package
+HOST_WAYLANDPP_CONF_OPTS = \
+	-DBUILD_LIBRARIES=OFF \
+	-DBUILD_SCANNER=ON
+
+WAYLANDPP_CONF_OPTS = \
+	-DBUILD_LIBRARIES=ON \
+	-DBUILD_SCANNER=OFF \
+	-DWAYLAND_SCANNERPP=$(HOST_DIR)/bin/wayland-scanner++
+
+$(eval $(cmake-package))
+$(eval $(host-cmake-package))
diff --git a/bsp/buildroot/package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch b/bsp/buildroot/package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch
new file mode 100644
index 00000000..6fb309d9
--- /dev/null
+++ b/bsp/buildroot/package/webkitgtk/0001-ARM-Building-FELightingNEON.cpp-fails-due-to-missing.patch
@@ -0,0 +1,41 @@
+From b252c7aed3fa6f22db8a26c3ab0bfe66e3490eef Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Sun, 23 Sep 2018 02:34:26 +0300
+Subject: [PATCH xserver] [ARM] Building FELightingNEON.cpp fails due to
+ missing lightVector member https://bugs.webkit.org/show_bug.cgi?id=189890
+
+Reviewed by NOBODY (OOPS!).
+
+No new tests needed.
+
+* platform/graphics/cpu/arm/filters/FELightingNEON.h:
+(WebCore::FELighting::platformApplyNeon): Adapt to new layout of "struct PaintingData" after r225122.
+---
+ Source/WebCore/ChangeLog                             | 12 ++++++++++++
+ .../graphics/cpu/arm/filters/FELightingNEON.h        |  6 +++---
+ 2 files changed, 15 insertions(+), 3 deletions(-)
+
+Fetch from: https://bugs.webkit.org/show_bug.cgi?id=189890
+Upstream-Status: Pending
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+
+diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
+index 42af922374b..b542a4c81aa 100644
+--- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
++++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h
+@@ -144,9 +144,9 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS
+             neonData.flags |= FLAG_CONE_EXPONENT_IS_1;
+     } else {
+         ASSERT(m_lightSource->type() == LS_DISTANT);
+-        floatArguments.lightX = paintingData.lightVector.x();
+-        floatArguments.lightY = paintingData.lightVector.y();
+-        floatArguments.lightZ = paintingData.lightVector.z();
++        floatArguments.lightX = paintingData.initialLightingData.lightVector.x();
++        floatArguments.lightY = paintingData.initialLightingData.lightVector.y();
++        floatArguments.lightZ = paintingData.initialLightingData.lightVector.z();
+         floatArguments.padding2 = 1;
+     }
+ 
+-- 
+2.19.0
+
diff --git a/bsp/buildroot/package/webkitgtk/Config.in b/bsp/buildroot/package/webkitgtk/Config.in
index 93f286bb..96a7ab0c 100644
--- a/bsp/buildroot/package/webkitgtk/Config.in
+++ b/bsp/buildroot/package/webkitgtk/Config.in
@@ -11,17 +11,19 @@ config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 
-comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 5"
+comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8"
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
 	depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_USES_GLIBC || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_5
+		!BR2_HOST_GCC_AT_LEAST_4_8 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	depends on BR2_USE_MMU
 
 config BR2_PACKAGE_WEBKITGTK
 	bool "webkitgtk"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_PACKAGE_LIBGTK3
 	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
@@ -39,12 +41,15 @@ config BR2_PACKAGE_WEBKITGTK
 	select BR2_PACKAGE_LIBXSLT
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_WEBP
+	select BR2_PACKAGE_WEBP_DEMUX
+	select BR2_PACKAGE_WOFF2
 	select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11
 	select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK3_X11
 	help
-	  WebKit is an open source, standards compliant web browser engine.
+	  WebKit is an open source, standards compliant web browser
+	  engine.
 
 	  http://www.webkitgtk.org/
 
@@ -52,14 +57,20 @@ if BR2_PACKAGE_WEBKITGTK
 
 config BR2_PACKAGE_WEBKITGTK_HTTPS
 	bool "HTTPS support"
+	depends on !BR2_STATIC_LIBS # gnutls -> libsoup
 	select BR2_PACKAGE_CA_CERTIFICATES # runtime
 	select BR2_PACKAGE_LIBSOUP_SSL
 	help
 	  Enable HTTPS protocol support.
 
+comment "webkitgtk https support needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
+
 config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
 	bool "multimedia support"
 	select BR2_PACKAGE_GSTREAMER1
+	select BR2_PACKAGE_GST1_PLUGINS_BAD
+	select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX
 	select BR2_PACKAGE_GST1_PLUGINS_BASE
 	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA
 	select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP
@@ -77,4 +88,10 @@ config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
 	  This option pulls in all of the required dependencies
 	  to enable multimedia (video/audio) support.
 
+config BR2_PACKAGE_WEBKITGTK_WEBDRIVER
+	bool "WebDriver support"
+	help
+	  Enable support for WebDriver. This will build and install the
+	  WebKitWebDriver program in the target.
+
 endif
diff --git a/bsp/buildroot/package/webkitgtk/webkitgtk.hash b/bsp/buildroot/package/webkitgtk/webkitgtk.hash
index dd2b28d3..0b9b94ca 100644
--- a/bsp/buildroot/package/webkitgtk/webkitgtk.hash
+++ b/bsp/buildroot/package/webkitgtk/webkitgtk.hash
@@ -1,7 +1,7 @@
-# From https://webkitgtk.org/releases/webkitgtk-2.18.6.tar.xz.sums
-md5 c1a548595135ee75ad3bf2e18ac83112 webkitgtk-2.18.6.tar.xz
-sha1 fb0daa85142cfe8822de518dfaa7bd5c3cdd6c23 webkitgtk-2.18.6.tar.xz
-sha256 93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c webkitgtk-2.18.6.tar.xz
+# From https://webkitgtk.org/releases/webkitgtk-2.22.2.tar.xz.sums
+md5 207d50d313c07b03726f3a7f22643934 webkitgtk-2.22.2.tar.xz
+sha1 ff0c40e81e240aa0743f7e6483f175defebd1417 webkitgtk-2.22.2.tar.xz
+sha256 345487d4d1896e711683f951d1e09387d3b90d7cf59295c0e634af7f515e99ba webkitgtk-2.22.2.tar.xz
 
 # Hashes for license files:
 sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
diff --git a/bsp/buildroot/package/webkitgtk/webkitgtk.mk b/bsp/buildroot/package/webkitgtk/webkitgtk.mk
index 99b2b499..f28417ac 100644
--- a/bsp/buildroot/package/webkitgtk/webkitgtk.mk
+++ b/bsp/buildroot/package/webkitgtk/webkitgtk.mk
@@ -4,17 +4,17 @@
 #
 ################################################################################
 
-WEBKITGTK_VERSION = 2.18.6
+WEBKITGTK_VERSION = 2.22.2
 WEBKITGTK_SITE = http://www.webkitgtk.org/releases
 WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
 WEBKITGTK_INSTALL_STAGING = YES
-WEBKITGTK_LICENSE = LGPLv2.1+, BSD-2c
+WEBKITGTK_LICENSE = LGPL-2.1+, BSD-2-Clause
 WEBKITGTK_LICENSE_FILES = \
 	Source/WebCore/LICENSE-APPLE \
 	Source/WebCore/LICENSE-LGPL-2.1
 WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \
 	enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \
-	libtasn1 libxml2 libxslt sqlite webp
+	libtasn1 libxml2 libxslt sqlite webp woff2
 WEBKITGTK_CONF_OPTS = \
 	-DENABLE_API_TESTS=OFF \
 	-DENABLE_GEOLOCATION=OFF \
@@ -22,6 +22,7 @@ WEBKITGTK_CONF_OPTS = \
 	-DENABLE_INTROSPECTION=OFF \
 	-DENABLE_MINIBROWSER=ON \
 	-DENABLE_SPELLCHECK=ON \
+	-DENABLE_WOFF2=ON \
 	-DPORT=GTK \
 	-DUSE_LIBNOTIFY=OFF \
 	-DUSE_LIBHYPHEN=OFF
@@ -49,6 +50,12 @@ WEBKITGTK_CONF_OPTS += \
 	-DENABLE_MEDIA_STREAM=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_WEBKITGTK_WEBDRIVER),y)
+WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=ON
+else
+WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
+endif
+
 # Only one target platform can be built, assume X11 > Wayland
 
 # GTK3-X11 target gives OpenGL from newer libgtk3 versions
diff --git a/bsp/buildroot/package/webp/Config.in b/bsp/buildroot/package/webp/Config.in
index 646eb9ef..e8263a95 100644
--- a/bsp/buildroot/package/webp/Config.in
+++ b/bsp/buildroot/package/webp/Config.in
@@ -15,4 +15,11 @@ config BR2_PACKAGE_WEBP_DEMUX
 	  of an extended format WebP file, which can have features
 	  like color profile, metadata and animation.
 
+config BR2_PACKAGE_WEBP_MUX
+	bool "webpmux"
+	help
+	  Mux is a part of WebPMux for creation and manipulation
+	  of an extended format WebP file, which can have features
+	  like color profile, metadata and animation.
+
 endif
diff --git a/bsp/buildroot/package/webp/webp.hash b/bsp/buildroot/package/webp/webp.hash
index bf4ee8fb..ffb63b8e 100644
--- a/bsp/buildroot/package/webp/webp.hash
+++ b/bsp/buildroot/package/webp/webp.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256	b75310c810b3eda222c77f6d6c26b061240e3d9060095de44b2c1bae291ecdef	libwebp-0.5.2.tar.gz
+sha256	06503c782d9f151baa325591c3579c68ed700ffc62d4f5a32feead0ff017d8ab	libwebp-0.6.1.tar.gz
+sha256	5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf	COPYING
diff --git a/bsp/buildroot/package/webp/webp.mk b/bsp/buildroot/package/webp/webp.mk
index d579d56c..f5ca3424 100644
--- a/bsp/buildroot/package/webp/webp.mk
+++ b/bsp/buildroot/package/webp/webp.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-WEBP_VERSION = 0.5.2
+WEBP_VERSION = 0.6.1
 WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz
 WEBP_SITE = http://downloads.webmproject.org/releases/webp
-WEBP_LICENSE = BSD-3c
+WEBP_LICENSE = BSD-3-Clause
 WEBP_LICENSE_FILES = COPYING
 WEBP_INSTALL_STAGING = YES
 
@@ -23,6 +23,26 @@ else
 WEBP_CONF_OPTS += --disable-libwebpdemux
 endif
 
+ifeq ($(BR2_PACKAGE_WEBP_MUX),y)
+WEBP_CONF_OPTS += --enable-libwebpmux
+else
+WEBP_CONF_OPTS += --disable-libwebpmux
+endif
+
+ifeq ($(BR2_PACKAGE_GIFLIB),y)
+WEBP_DEPENDENCIES += giflib
+WEBP_CONF_OPTS += --enable-gif
+else
+WEBP_CONF_OPTS += --disable-gif
+endif
+
+ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y)
+WEBP_DEPENDENCIES += libfreeglut
+WEBP_CONF_OPTS += --enable-gl
+else
+WEBP_CONF_OPTS += --disable-gl
+endif
+
 ifeq ($(BR2_PACKAGE_LIBPNG),y)
 WEBP_DEPENDENCIES += libpng
 WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config
diff --git a/bsp/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk b/bsp/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk
index 75e3c883..668e20d7 100644
--- a/bsp/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk
+++ b/bsp/buildroot/package/webrtc-audio-processing/webrtc-audio-processing.mk
@@ -8,7 +8,7 @@ WEBRTC_AUDIO_PROCESSING_VERSION = 0.3
 WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz
 WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing
 WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES
-WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3c
+WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3-Clause
 WEBRTC_AUDIO_PROCESSING_LICENSE_FILES = COPYING
 # 0001-configure.ac-fix-architecture-detection.patch
 # 0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch
diff --git a/bsp/buildroot/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch b/bsp/buildroot/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch
deleted file mode 100644
index baa3a4fc..00000000
--- a/bsp/buildroot/package/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e338ced1e04bf4b97322d5eed2b5bdf5b052095a Mon Sep 17 00:00:00 2001
-From: Krzysztof Konopko <kris@youview.com>
-Date: Thu, 15 Sep 2016 13:01:49 +0200
-Subject: [PATCH] shared/platform: include weston-egl-ext.h only if ENABLE_EGL
- is defined
-
-Including `weston-egl-ext.h` causes compilation failure for configurations
-with EGL disabled.
-
-Verified with `--disable-egl`, `--disable-x11-compositor`
-and `--disable-drm-compositor`.
-
-Signed-off-by: Krzysztof Konopko <kris@youview.com>
-Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-[yann.morin.1998@free.fr: backported from upstream]
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
- shared/platform.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shared/platform.h b/shared/platform.h
-index 1eb96fd..30db1a6 100644
---- a/shared/platform.h
-+++ b/shared/platform.h
-@@ -33,9 +33,9 @@
- #include <wayland-egl.h>
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
--#endif
- 
- #include "weston-egl-ext.h"
-+#endif
- 
- #ifdef  __cplusplus
- extern "C" {
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/weston/0002-shared-struct-timespec-is-in-time.h.patch b/bsp/buildroot/package/weston/0002-shared-struct-timespec-is-in-time.h.patch
new file mode 100644
index 00000000..28476d32
--- /dev/null
+++ b/bsp/buildroot/package/weston/0002-shared-struct-timespec-is-in-time.h.patch
@@ -0,0 +1,44 @@
+From 47535b50c4178d62b848b3e9d3524e4f6282c815 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Sun, 1 Oct 2017 14:17:21 +0200
+Subject: [PATCH] shared: struct timespec is in time.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On the musl C library, tests/timespec-text.c does not build, with the
+following error:
+
+    In file included from tests/timespec-test.c:36:0:
+    ./shared/timespec-util.h:41:21: warning: ‘struct timespec’ declared
+    inside parameter list will not be visible outside of this definition
+    or declaration
+     timespec_sub(struct timespec *r,
+                         ^~~~~~~~
+   [...]
+
+Indeed, struct timespec is defined in time.h, so we must include it.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+---
+Upstream status: submitted
+    https://lists.freedesktop.org/archives/wayland-devel/2017-October/035306.html
+---
+ shared/timespec-util.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/shared/timespec-util.h b/shared/timespec-util.h
+index 576b3e8f..34a120ae 100644
+--- a/shared/timespec-util.h
++++ b/shared/timespec-util.h
+@@ -28,6 +28,7 @@
+ 
+ #include <stdint.h>
+ #include <assert.h>
++#include <time.h>
+ 
+ #define NSEC_PER_SEC 1000000000
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/weston/0003-configure-search-for-lib-with-clock_getres.patch b/bsp/buildroot/package/weston/0003-configure-search-for-lib-with-clock_getres.patch
deleted file mode 100644
index a8ad9eaa..00000000
--- a/bsp/buildroot/package/weston/0003-configure-search-for-lib-with-clock_getres.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From e269012c4b919624ca92d80afd1d6a6f5399e041 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Mon, 19 Dec 2016 18:07:07 +0100
-Subject: [PATCH] configure: search for lib with clock_getres()
-
-Like clock_gettime(), clock_getres() is in -lrt for glibc < 2.17.
-Add a check for it, like is done for clock_gettime().
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
-Upstream status: submitted
-https://lists.freedesktop.org/archives/wayland-devel/2016-December/032354.html
----
- Makefile.am  | 1 +
- configure.ac | 3 ++-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 2219e3d..53f8f51 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -190,6 +190,7 @@ weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS)
- weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \
- 	$(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \
- 	$(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \
-+	$(CLOCK_GETRES_LIBS) \
- 	-lm
- 
- weston_SOURCES = 					\
-diff --git a/configure.ac b/configure.ac
-index 1e251bf..604f51b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,8 +88,9 @@ PKG_PROG_PKG_CONFIG()
- 
- WESTON_SEARCH_LIBS([DLOPEN], [dl], [dlopen])
- 
--# In old glibc versions (< 2.17) clock_gettime() is in librt
-+# In old glibc versions (< 2.17) clock_gettime() and clock_getres() are in librt
- WESTON_SEARCH_LIBS([CLOCK_GETTIME], [rt], [clock_gettime])
-+WESTON_SEARCH_LIBS([CLOCK_GETRES], [rt], [clock_getres])
- 
- AC_CHECK_DECL(SFD_CLOEXEC,[],
- 	      [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile weston")],
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch b/bsp/buildroot/package/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch
deleted file mode 100644
index 9012f5f3..00000000
--- a/bsp/buildroot/package/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c950667e87dc175bd2741a51460ebd3e29a57c92 Mon Sep 17 00:00:00 2001
-From: Vincent Abriou <vincent.abriou@st.com>
-Date: Wed, 5 Oct 2016 16:14:07 +0200
-Subject: [PATCH] libweston: include weston-egl-ext.h in drm, x11 and wayland
- compositor
-
-As to what is done for gl-renderer.c, weston-egl-ext.h should be
-include in compositor-drm.c, compositor-x11.c and compositor-wayland.c.
-This fix building issue with GPU that does not have EGL_PLATFORM_xxx_KHR
-in their extension header file eglext.h.
-
-Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
-Reviewed-by: Daniel Stone <daniels@collabora.com>
----
- libweston/compositor-drm.c     | 1 +
- libweston/compositor-wayland.c | 1 +
- libweston/compositor-x11.c     | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
-index 567240f..f61e3d9 100644
---- a/libweston/compositor-drm.c
-+++ b/libweston/compositor-drm.c
-@@ -52,6 +52,7 @@
- #include "shared/helpers.h"
- #include "shared/timespec-util.h"
- #include "gl-renderer.h"
-+#include "weston-egl-ext.h"
- #include "pixman-renderer.h"
- #include "libbacklight.h"
- #include "libinput-seat.h"
-diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
-index 580c7b5..46fdde1 100644
---- a/libweston/compositor-wayland.c
-+++ b/libweston/compositor-wayland.c
-@@ -44,6 +44,7 @@
- #include "compositor.h"
- #include "compositor-wayland.h"
- #include "gl-renderer.h"
-+#include "weston-egl-ext.h"
- #include "pixman-renderer.h"
- #include "shared/helpers.h"
- #include "shared/image-loader.h"
-diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
-index dadcd10..1c6de08 100644
---- a/libweston/compositor-x11.c
-+++ b/libweston/compositor-x11.c
-@@ -56,6 +56,7 @@
- #include "shared/helpers.h"
- #include "shared/image-loader.h"
- #include "gl-renderer.h"
-+#include "weston-egl-ext.h"
- #include "pixman-renderer.h"
- #include "presentation-time-server-protocol.h"
- #include "linux-dmabuf.h"
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch b/bsp/buildroot/package/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch
deleted file mode 100644
index 6a5b1926..00000000
--- a/bsp/buildroot/package/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7327d5a7a29ad31af871e144ebe053cb1ab478f7 Mon Sep 17 00:00:00 2001
-From: Vincent Abriou <vincent.abriou@st.com>
-Date: Tue, 11 Oct 2016 13:47:03 +0200
-Subject: [PATCH] libweston: fix building issue when EGL support is not enabled
-
-weston-egl-ext.h has been include in compositor-xx.c file in order to
-define EGL_PLATFORM_xxx_KHR extensions used by the compositors.
-But in case EGL support is not enabled, all EGL related definition must
-be skipped except EGL_PLATFORM_xxx_KHR that must be still defined to
-allow compositor-xx.c to build.
-
-Signed-off-by: Vincent Abriou <vincent.abriou@st.com>
-Reviewed-by: Giulio Camuffo <giuliocamuffo@gmail.com>
----
- libweston/weston-egl-ext.h | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libweston/weston-egl-ext.h b/libweston/weston-egl-ext.h
-index 6e36996..70556fd 100644
---- a/libweston/weston-egl-ext.h
-+++ b/libweston/weston-egl-ext.h
-@@ -28,6 +28,8 @@
- #ifndef WESTON_EGL_EXT_H
- #define WESTON_EGL_EXT_H
- 
-+#ifdef ENABLE_EGL
-+
- #ifndef EGL_WL_bind_wayland_display
- #define EGL_WL_bind_wayland_display 1
- 
-@@ -152,5 +154,13 @@ typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC) (EGLD
- #define EGL_PLATFORM_X11_KHR 0x31D5
- #endif
- 
-+#else /* ENABLE_EGL */
-+
-+/* EGL platform definition are keept to allow compositor-xx.c to build */
-+#define EGL_PLATFORM_GBM_KHR     0x31D7
-+#define EGL_PLATFORM_WAYLAND_KHR 0x31D8
-+#define EGL_PLATFORM_X11_KHR     0x31D5
-+
-+#endif /* ENABLE_EGL */
- 
- #endif
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/weston/0006-tests-add-missing-include.patch b/bsp/buildroot/package/weston/0006-tests-add-missing-include.patch
deleted file mode 100644
index 67dc3df2..00000000
--- a/bsp/buildroot/package/weston/0006-tests-add-missing-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4c9e149d641a9945c3a8e15707b8712834f08c4f Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Sun, 22 Jan 2017 14:46:28 +0100
-Subject: [PATCH] tests: add missing include
-
-The int32_t type is defined in stdint.h.
-
-The musl C library is very conservative in the headers that it
-internally includes, and stdint.h is not included by any other header,
-unlike with glibc or uClibc, which breaks the build.
-
-Add the missing header.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
----
-Status: sent upstream
-    https://lists.freedesktop.org/archives/wayland-devel/2017-January/032771.html
----
- tests/string-test.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/string-test.c b/tests/string-test.c
-index a72ec30..5571b52 100644
---- a/tests/string-test.c
-+++ b/tests/string-test.c
-@@ -28,6 +28,7 @@
- #include <stdlib.h>
- #include <stdbool.h>
- #include <stdio.h>
-+#include <stdint.h>
- #include <assert.h>
- 
- #include "shared/string-helpers.h"
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/weston/Config.in b/bsp/buildroot/package/weston/Config.in
index b4e198d8..f874b0cc 100644
--- a/bsp/buildroot/package/weston/Config.in
+++ b/bsp/buildroot/package/weston/Config.in
@@ -5,6 +5,11 @@ comment "weston needs udev and a toolchain w/ locale, threads, dynamic library,
 
 config BR2_PACKAGE_WESTON
 	bool "weston"
+	depends on BR2_ENABLE_LOCALE # libinput
+	depends on BR2_PACKAGE_HAS_UDEV
+	depends on !BR2_STATIC_LIBS # wayland
+	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 	select BR2_PACKAGE_WAYLAND
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS
 	select BR2_PACKAGE_LIBXKBCOMMON
@@ -12,13 +17,8 @@ config BR2_PACKAGE_WESTON
 	select BR2_PACKAGE_CAIRO_PNG
 	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_JPEG
-	select BR2_PACKAGE_MTDEV
 	select BR2_PACKAGE_LIBINPUT
-	depends on BR2_ENABLE_LOCALE # libinput
-	depends on BR2_PACKAGE_HAS_UDEV
-	depends on !BR2_STATIC_LIBS # wayland
-	depends on BR2_TOOLCHAIN_HAS_THREADS # wayland
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	select BR2_PACKAGE_LIBDRM
 	# Runtime dependency
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
 	# Make sure at least one compositor is selected.
@@ -40,7 +40,6 @@ config BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 config BR2_PACKAGE_WESTON_DRM
 	bool "DRM compositor"
 	depends on BR2_PACKAGE_MESA3D_OPENGL_EGL
-	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_WESTON_HAS_COMPOSITOR
 
 # Uses libgbm from mesa3d
@@ -68,9 +67,9 @@ config BR2_PACKAGE_WESTON_RDP
 	    --rdp-tls-cert=/path/to/server.crt
 	    --rdp-tls-key=/path/to/server.key
 
-	  By default, Buildroot installs such files in /etc/freerdp/server/
-	  so you may want to change them in a post-build script or a rootfs
-	  overlay.
+	  By default, Buildroot installs such files in
+	  /etc/freerdp/server/ so you may want to change them in a
+	  post-build script or a rootfs overlay.
 
 comment "RDP compositor needs a toolchain w/ wchar, C++"
 	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/weston/weston.hash b/bsp/buildroot/package/weston/weston.hash
index c9668640..82c97b8c 100644
--- a/bsp/buildroot/package/weston/weston.hash
+++ b/bsp/buildroot/package/weston/weston.hash
@@ -1,2 +1,5 @@
-# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031123.html
-sha256  ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033  weston-1.12.0.tar.xz
+# From https://lists.freedesktop.org/archives/wayland-devel/2017-August/034749.html
+md5 9c42a4c51a1b9f35d040fa9d45ada36d  weston-3.0.0.tar.xz
+sha1 0a75c2ee10f2453a073411157bb6ed029080669f  weston-3.0.0.tar.xz
+sha256 cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5  weston-3.0.0.tar.xz
+sha512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58  weston-3.0.0.tar.xz
diff --git a/bsp/buildroot/package/weston/weston.mk b/bsp/buildroot/package/weston/weston.mk
index 9bd127c6..3d17a615 100644
--- a/bsp/buildroot/package/weston/weston.mk
+++ b/bsp/buildroot/package/weston/weston.mk
@@ -4,16 +4,14 @@
 #
 ################################################################################
 
-WESTON_VERSION = 1.12.0
+WESTON_VERSION = 3.0.0
 WESTON_SITE = http://wayland.freedesktop.org/releases
 WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz
 WESTON_LICENSE = MIT
 WESTON_LICENSE_FILES = COPYING
-# configure.ac patched by 0003-configure-search-for-lib-with-clock_getres.patch
-WESTON_AUTORECONF = YES
 
 WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \
-	libxkbcommon pixman libpng jpeg mtdev udev cairo libinput \
+	libxkbcommon pixman libpng jpeg udev cairo libinput libdrm \
 	$(if $(BR2_PACKAGE_WEBP),webp)
 
 WESTON_CONF_OPTS = \
@@ -59,6 +57,7 @@ WESTON_DEPENDENCIES += libegl
 else
 WESTON_CONF_OPTS += \
 	--disable-egl \
+	--disable-simple-dmabuf-drm-client \
 	--disable-simple-egl-clients
 endif
 
@@ -87,7 +86,6 @@ ifeq ($(BR2_PACKAGE_WESTON_DRM),y)
 WESTON_CONF_OPTS += \
 	--enable-drm-compositor \
 	WESTON_NATIVE_BACKEND=drm-backend.so
-WESTON_DEPENDENCIES += libdrm
 else
 WESTON_CONF_OPTS += --disable-drm-compositor
 endif
diff --git a/bsp/buildroot/package/wf111/Config.in b/bsp/buildroot/package/wf111/Config.in
index cfce8b4c..7b61ea19 100644
--- a/bsp/buildroot/package/wf111/Config.in
+++ b/bsp/buildroot/package/wf111/Config.in
@@ -6,29 +6,18 @@ config BR2_PACKAGE_WF111
 	# dynamically linked against the glibc.
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
-	  BlueGiga WF111 WiFi driver and utilities.
+	  Silicon Labs WF111 WiFi driver and utilities.
 
 	  Warning: CONFIG_WIRELESS_EXT and CONFIG_WEXT_PRIV must be
 	  selected in the Linux kernel configuration. These are blind
 	  options (i.e. not selectable directly) so they cannot be
 	  enabled by a change in linux/linux.mk. There are two choices
 	  to enable these options:
-	  - By making them non blind, with a "WF111 support" configuration
-	    entry that selects them, for example.
+	  - By making them non blind, with a "WF111 support"
+	    configuration entry that selects them, for example.
 	  - By enabling another random WiFi driver that select them.
 
-	  http://www.bluegiga.com/en-US/products/wifi-modules/wf111-wifi-module/
-
-if BR2_PACKAGE_WF111
-
-config BR2_PACKAGE_WF111_TARBALL_PATH
-	string "Local tarball location"
-	help
-	  The WF111 tarball can be retrieved on the BlueGiga website
-	  after registration. This option specifies the path where the
-	  tarball is locally saved.
-
-endif
+	  https://www.silabs.com/products/wireless/wi-fi/wf111-bluegiga-module
 
 comment "wf111 needs a glibc toolchain"
 	depends on BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/wf111/wf111.mk b/bsp/buildroot/package/wf111/wf111.mk
index ad9d8914..72526333 100644
--- a/bsp/buildroot/package/wf111/wf111.mk
+++ b/bsp/buildroot/package/wf111/wf111.mk
@@ -4,21 +4,16 @@
 #
 ################################################################################
 
-WF111_VERSION = 5.2.2-r2
-WF111_SITE_METHOD = file
-WF111_SITE = $(call qstrip,$(BR2_PACKAGE_WF111_TARBALL_PATH))
+WF111_VERSION = 5-2-2-r3
+WF111_SITE = https://www.silabs.com/documents/login/software
 WF111_DEPENDENCIES = linux
 
-ifeq ($(BR2_PACKAGE_WF111)$(call qstrip,$(BR2_PACKAGE_WF111_TARBALL_PATH)),y)
-$(error No tarball location specified, check BR2_PACKAGE_WF111_TARBALL_PATH)
-endif
-
 ifeq ($(BR2_ARM_CPU_ARMV7A),y)
-WF111_SOURCE = wf111-linux-driver_$(WF111_VERSION)_armv7-a.tar.gz
+WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-armv7-a.tar.gz
 else ifeq ($(BR2_ARM_CPU_ARMV5),y)
-WF111_SOURCE = wf111-linux-driver_$(WF111_VERSION)_armv5t.tar.gz
+WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-armv5te.tar.gz
 else ifeq ($(BR2_i386),y)
-WF111_SOURCE = wf111-linux-driver_$(WF111_VERSION)_x86.tar.gz
+WF111_SOURCE = wf111-linux-driver-$(WF111_VERSION)-x86.tar.gz
 endif
 
 # Due to the stupidity of the package Makefile, we can't invoke
diff --git a/bsp/buildroot/package/wget/wget.hash b/bsp/buildroot/package/wget/wget.hash
index 00485579..eee4a519 100644
--- a/bsp/buildroot/package/wget/wget.hash
+++ b/bsp/buildroot/package/wget/wget.hash
@@ -1,4 +1,5 @@
 # Locally calculated after checking pgp signature
-sha256 d59a745ad2c522970660bb30d38601f9457b151b322e01fa20a5a0da0f55df07  wget-1.19.2.tar.lz
+# https://ftp.gnu.org/gnu/wget/wget-1.19.5.tar.lz.sig
+sha256 29fbe6f3d5408430c572a63fe32bd43d5860f32691173dfd84edc06869edca75  wget-1.19.5.tar.lz
 # Locally calculated
-sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
+sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b  COPYING
diff --git a/bsp/buildroot/package/wget/wget.mk b/bsp/buildroot/package/wget/wget.mk
index 719e2dad..72a73cce 100644
--- a/bsp/buildroot/package/wget/wget.mk
+++ b/bsp/buildroot/package/wget/wget.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-WGET_VERSION = 1.19.2
+WGET_VERSION = 1.19.5
 WGET_SOURCE = wget-$(WGET_VERSION).tar.lz
 WGET_SITE = $(BR2_GNU_MIRROR)/wget
 WGET_DEPENDENCIES = host-pkgconf
-WGET_LICENSE = GPLv3+
+WGET_LICENSE = GPL-3.0+
 WGET_LICENSE_FILES = COPYING
 
 # Prefer full-blown wget over busybox
diff --git a/bsp/buildroot/package/which/which.mk b/bsp/buildroot/package/which/which.mk
index 938b770e..c96e8937 100644
--- a/bsp/buildroot/package/which/which.mk
+++ b/bsp/buildroot/package/which/which.mk
@@ -6,7 +6,7 @@
 
 WHICH_VERSION = 2.21
 WHICH_SITE = $(BR2_GNU_MIRROR)/which
-WHICH_LICENSE = GPLv3+
+WHICH_LICENSE = GPL-3.0+
 WHICH_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/whois/Config.in b/bsp/buildroot/package/whois/Config.in
index 0fbaf904..d2a03028 100644
--- a/bsp/buildroot/package/whois/Config.in
+++ b/bsp/buildroot/package/whois/Config.in
@@ -1,13 +1,7 @@
 config BR2_PACKAGE_WHOIS
 	bool "whois"
-	depends on BR2_USE_WCHAR # gettext
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
 	help
 	  Improved whois client.
 
-	  http://www.linux.it/~md/software/
-
-comment "whois needs a toolchain w/ wchar"
-	depends on !BR2_USE_WCHAR
-	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	  https://github.com/rfc1036/whois
diff --git a/bsp/buildroot/package/whois/whois.mk b/bsp/buildroot/package/whois/whois.mk
index 5836e1d7..22117cf3 100644
--- a/bsp/buildroot/package/whois/whois.mk
+++ b/bsp/buildroot/package/whois/whois.mk
@@ -8,17 +8,13 @@ WHOIS_VERSION = 5.2.17
 WHOIS_SITE = http://snapshot.debian.org/archive/debian/20170727T214450Z/pool/main/w/whois
 WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
 # take precedence over busybox implementation
-WHOIS_DEPENDENCIES = host-gettext $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) $(TARGET_NLS_DEPENDENCIES)
 WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV)
 WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
 	LIBS="$(WHOIS_EXTRA_LIBS)"
-WHOIS_LICENSE = GPLv2+
+WHOIS_LICENSE = GPL-2.0+
 WHOIS_LICENSE_FILES = COPYING
-
-ifeq ($(BR2_NEEDS_GETTEXT),y)
-WHOIS_DEPENDENCIES += gettext
-WHOIS_EXTRA_LIBS += -lintl
-endif
+WHOIS_EXTRA_LIBS = $(TARGET_NLS_LIBS)
 
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 WHOIS_DEPENDENCIES += libiconv
@@ -31,13 +27,22 @@ WHOIS_DEPENDENCIES += libidn
 WHOIS_MAKE_ENV += HAVE_LIBIDN=1
 endif
 
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
+WHOIS_BUILD_TARGETS =
+WHOIS_INSTALL_TARGETS = install
+else
+WHOIS_BUILD_TARGETS = Makefile.depend whois mkpasswd
+WHOIS_INSTALL_TARGETS = install-whois install-mkpasswd
+endif
+
 define WHOIS_BUILD_CMDS
-	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D)
+	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \
+		$(WHOIS_BUILD_TARGETS) -C $(@D)
 endef
 
 define WHOIS_INSTALL_TARGET_CMDS
 	$(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \
-		BASEDIR="$(TARGET_DIR)" install -C $(@D)
+		BASEDIR="$(TARGET_DIR)" $(WHOIS_INSTALL_TARGETS) -C $(@D)
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/wilink-bt-firmware/Config.in b/bsp/buildroot/package/wilink-bt-firmware/Config.in
new file mode 100644
index 00000000..26683043
--- /dev/null
+++ b/bsp/buildroot/package/wilink-bt-firmware/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_WILINK_BT_FIRMWARE
+	bool "wilink-bt-firmware"
+	help
+	  Texas Instruments Wilink7 and Wilink8 (wl12xx/wl18xx) UART
+	  attached Bluetooth firmware.
+
+	  https://github.com/TI-ECS/bt-firmware
diff --git a/bsp/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash b/bsp/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash
new file mode 100644
index 00000000..2cb6c880
--- /dev/null
+++ b/bsp/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256 b99700f6d504d76878de83ac50f18a0270b6edd0b52a0458c60fc606ed3332f0 wilink-bt-firmware-169b2df5b968f0ede32ea9044859942fc220c435.tar.gz
diff --git a/bsp/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk b/bsp/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk
new file mode 100644
index 00000000..180a85e2
--- /dev/null
+++ b/bsp/buildroot/package/wilink-bt-firmware/wilink-bt-firmware.mk
@@ -0,0 +1,17 @@
+################################################################################
+#
+# wilink-bt-firmware
+#
+################################################################################
+
+WILINK_BT_FIRMWARE_VERSION = 169b2df5b968f0ede32ea9044859942fc220c435
+WILINK_BT_FIRMWARE_SITE = $(call github,TI-ECS,bt-firmware,$(WILINK_BT_FIRMWARE_VERSION))
+WILINK_BT_FIRMWARE_LICENSE = PROPRIETARY
+WILINK_BT_FIRMWARE_LICENSE_FILES = LICENCE
+
+define WILINK_BT_FIRMWARE_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware/ti-connectivity
+	cp $(@D)/TIInit_*.bts $(TARGET_DIR)/lib/firmware/ti-connectivity
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/wine/wine.hash b/bsp/buildroot/package/wine/wine.hash
index b4b67cd9..176e0ee6 100644
--- a/bsp/buildroot/package/wine/wine.hash
+++ b/bsp/buildroot/package/wine/wine.hash
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 wine-2.0.tar.bz2
+sha256 346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec wine-3.0.tar.xz
diff --git a/bsp/buildroot/package/wine/wine.mk b/bsp/buildroot/package/wine/wine.mk
index f9b2e1a3..02c4c0f1 100644
--- a/bsp/buildroot/package/wine/wine.mk
+++ b/bsp/buildroot/package/wine/wine.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-WINE_VERSION = 2.0
-WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2
-WINE_SITE = https://dl.winehq.org/wine/source/2.0
-WINE_LICENSE = LGPLv2.1+
+WINE_VERSION = 3.0
+WINE_SOURCE = wine-$(WINE_VERSION).tar.xz
+WINE_SITE = https://dl.winehq.org/wine/source/3.0
+WINE_LICENSE = LGPL-2.1+
 WINE_LICENSE_FILES = COPYING.LIB LICENSE
 WINE_DEPENDENCIES = host-bison host-flex host-wine
 
@@ -23,6 +23,7 @@ WINE_CONF_OPTS = \
 	--without-gphoto \
 	--without-gsm \
 	--without-hal \
+	--without-krb5 \
 	--without-opencl \
 	--without-oss
 
@@ -347,6 +348,7 @@ HOST_WINE_CONF_OPTS += \
 	--without-gstreamer \
 	--without-hal \
 	--without-jpeg \
+	--without-krb5 \
 	--without-ldap \
 	--without-mpg123 \
 	--without-netapi \
diff --git a/bsp/buildroot/package/wipe/wipe.mk b/bsp/buildroot/package/wipe/wipe.mk
index 9ec7faf6..83a8c875 100644
--- a/bsp/buildroot/package/wipe/wipe.mk
+++ b/bsp/buildroot/package/wipe/wipe.mk
@@ -7,7 +7,7 @@
 WIPE_VERSION = 2.3.1
 WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION)
 WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2
-WIPE_LICENSE = GPLv2+
+WIPE_LICENSE = GPL-2.0+
 WIPE_LICENSE_FILES = LICENSE
 
 define WIPE_INSTALL_TARGET_CMDS
diff --git a/bsp/buildroot/package/wireguard/Config.in b/bsp/buildroot/package/wireguard/Config.in
new file mode 100644
index 00000000..fe92fd6c
--- /dev/null
+++ b/bsp/buildroot/package/wireguard/Config.in
@@ -0,0 +1,23 @@
+config BR2_PACKAGE_WIREGUARD
+	bool "wireguard"
+	# kernel module requires 3.10+, userspace makes no sense without it
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+	select BR2_PACKAGE_LIBMNL
+	help
+	  WireGuard is an extremely simple yet fast and modern VPN
+	  that utilizes state-of-the-art cryptography. It aims to be
+	  faster, simpler, leaner, and more useful than IPSec, while
+	  avoiding the massive headache. It intends to be considerably
+	  more performant than OpenVPN. WireGuard is designed as a
+	  general purpose VPN for running on embedded interfaces and
+	  super computers alike, fit for many different
+	  circumstances. Initially released for the Linux kernel, it
+	  plans to be cross-platform and widely deployable. It is
+	  currently under heavy development, but already it might be
+	  regarded as the most secure, easiest to use, and simplest
+	  VPN solution in the industry.
+
+	  https://www.wireguard.com
+
+comment "wireguard needs a toolchain w/ headers >= 3.10"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
diff --git a/bsp/buildroot/package/wireguard/wireguard.hash b/bsp/buildroot/package/wireguard/wireguard.hash
new file mode 100644
index 00000000..fe6439fb
--- /dev/null
+++ b/bsp/buildroot/package/wireguard/wireguard.hash
@@ -0,0 +1,4 @@
+# From https://lists.zx2c4.com/pipermail/wireguard/2018-September/003395.html
+sha256 4a0488a07e40ec17e798f3e40a85cedf55f0560b1c3a8fd95806c7d4266cb0e8  WireGuard-0.0.20180925.tar.xz
+# Locally calculated
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
diff --git a/bsp/buildroot/package/wireguard/wireguard.mk b/bsp/buildroot/package/wireguard/wireguard.mk
new file mode 100644
index 00000000..faddbf93
--- /dev/null
+++ b/bsp/buildroot/package/wireguard/wireguard.mk
@@ -0,0 +1,41 @@
+################################################################################
+#
+# wireguard
+#
+################################################################################
+
+WIREGUARD_VERSION = 0.0.20180925
+WIREGUARD_SITE = https://git.zx2c4.com/WireGuard/snapshot
+WIREGUARD_SOURCE = WireGuard-$(WIREGUARD_VERSION).tar.xz
+WIREGUARD_LICENSE = GPL-2.0
+WIREGUARD_LICENSE_FILES = COPYING
+WIREGUARD_DEPENDENCIES = host-pkgconf libmnl
+
+ifeq ($(BR2_INIT_SYSTEMD),y)
+WIREGUARD_MAKE_OPTS += WITH_SYSTEMDUNITS=yes
+else
+WIREGUARD_MAKE_OPTS += WITH_SYSTEMDUNITS=no
+endif
+
+ifeq ($(BR2_PACKAGE_BASH),y)
+WIREGUARD_MAKE_OPTS += WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes
+else
+WIREGUARD_MAKE_OPTS += WITH_BASHCOMPLETION=no WITH_WGQUICK=no
+endif
+
+define WIREGUARD_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_MAKE_OPTS) \
+		-C $(@D)/src/tools
+endef
+
+define WIREGUARD_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(WIREGUARD_MAKE_OPTS) \
+		-C $(@D)/src/tools install DESTDIR=$(TARGET_DIR)
+endef
+
+ifeq ($(BR2_LINUX_KERNEL),y)
+WIREGUARD_MODULE_SUBDIRS = src
+$(eval $(kernel-module))
+endif
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/wireless-regdb/Config.in b/bsp/buildroot/package/wireless-regdb/Config.in
index d9c7b8d2..0c9896de 100644
--- a/bsp/buildroot/package/wireless-regdb/Config.in
+++ b/bsp/buildroot/package/wireless-regdb/Config.in
@@ -6,4 +6,4 @@ config BR2_PACKAGE_WIRELESS_REGDB
 	  Wireless regulatory database for CRDA. The database lists the
 	  allowed radio frequencies for each local jurisdiction.
 
-	  http://linuxwireless.org/en/developers/Regulatory
+	  https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb
diff --git a/bsp/buildroot/package/wireless-regdb/wireless-regdb.hash b/bsp/buildroot/package/wireless-regdb/wireless-regdb.hash
index b8ca2e75..65ae735c 100644
--- a/bsp/buildroot/package/wireless-regdb/wireless-regdb.hash
+++ b/bsp/buildroot/package/wireless-regdb/wireless-regdb.hash
@@ -1,2 +1,4 @@
 # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc
-sha256	cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7	wireless-regdb-2016.06.10.tar.xz
+sha256 e1dfbc3b97771373077f430c3c05082fae883145b37db5b2cfd12c56676fbe7b  wireless-regdb-2018.05.31.tar.xz
+# Locally computed
+sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1  LICENSE
diff --git a/bsp/buildroot/package/wireless-regdb/wireless-regdb.mk b/bsp/buildroot/package/wireless-regdb/wireless-regdb.mk
index 6ad42589..829374ed 100644
--- a/bsp/buildroot/package/wireless-regdb/wireless-regdb.mk
+++ b/bsp/buildroot/package/wireless-regdb/wireless-regdb.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRELESS_REGDB_VERSION = 2016.06.10
+WIRELESS_REGDB_VERSION = 2018.05.31
 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz
 WIRELESS_REGDB_SITE = http://kernel.org/pub/software/network/wireless-regdb
 WIRELESS_REGDB_LICENSE = ISC
@@ -15,6 +15,10 @@ define WIRELESS_REGDB_INSTALL_TARGET_CMDS
 		$(TARGET_DIR)/usr/lib/crda/regulatory.bin
 	$(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \
 		$(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem
+	$(INSTALL) -m 644 -D -T $(@D)/regulatory.db \
+		$(TARGET_DIR)/lib/firmware/regulatory.db
+	$(INSTALL) -m 644 -D -T $(@D)/regulatory.db.p7s \
+		$(TARGET_DIR)/lib/firmware/regulatory.db.p7s
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/wireless_tools/Config.in b/bsp/buildroot/package/wireless_tools/Config.in
index e33af25b..349908db 100644
--- a/bsp/buildroot/package/wireless_tools/Config.in
+++ b/bsp/buildroot/package/wireless_tools/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_WIRELESS_TOOLS
 	help
 	  A collection of tools to configure wireless lan cards.
 
-	  http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+	  https://hewlettpackard.github.io/wireless-tools/
 
 if BR2_PACKAGE_WIRELESS_TOOLS
 
diff --git a/bsp/buildroot/package/wireless_tools/wireless_tools.mk b/bsp/buildroot/package/wireless_tools/wireless_tools.mk
index f4e0ffb4..b87ab20f 100644
--- a/bsp/buildroot/package/wireless_tools/wireless_tools.mk
+++ b/bsp/buildroot/package/wireless_tools/wireless_tools.mk
@@ -6,9 +6,9 @@
 
 WIRELESS_TOOLS_VERSION_MAJOR = 30
 WIRELESS_TOOLS_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR).pre9
-WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux
+WIRELESS_TOOLS_SITE = https://hewlettpackard.github.io/wireless-tools
 WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz
-WIRELESS_TOOLS_LICENSE = GPLv2
+WIRELESS_TOOLS_LICENSE = GPL-2.0
 WIRELESS_TOOLS_LICENSE_FILES = COPYING
 WIRELESS_TOOLS_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/wireshark/Config.in b/bsp/buildroot/package/wireshark/Config.in
index c5b5c3e3..4d5a2157 100644
--- a/bsp/buildroot/package/wireshark/Config.in
+++ b/bsp/buildroot/package/wireshark/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_WIRESHARK
 	bool "wireshark"
-	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_USE_MMU # fork(), glib2
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
+	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Network traffic sniffer and protocol decoder.
 
diff --git a/bsp/buildroot/package/wireshark/wireshark.hash b/bsp/buildroot/package/wireshark/wireshark.hash
index 2b44cc07..30b00b4d 100644
--- a/bsp/buildroot/package/wireshark/wireshark.hash
+++ b/bsp/buildroot/package/wireshark/wireshark.hash
@@ -1,4 +1,4 @@
-# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.14.txt
-sha256 e7a3d4f9bbde20ea5ee09103f9f6dba38e3666dfe1d6a6a1c004602b5fac378b  wireshark-2.2.14.tar.bz2
+# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.16.txt
+sha256 7dcc4e9f29ad8dd75849aa3b6f70b6ec82ab6899cb168096572775a6d97ced8a  wireshark-2.2.16.tar.bz2
 # Locally calculated
 sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf  COPYING
diff --git a/bsp/buildroot/package/wireshark/wireshark.mk b/bsp/buildroot/package/wireshark/wireshark.mk
index a45005ed..3d729ae0 100644
--- a/bsp/buildroot/package/wireshark/wireshark.mk
+++ b/bsp/buildroot/package/wireshark/wireshark.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WIRESHARK_VERSION = 2.2.14
+WIRESHARK_VERSION = 2.2.16
 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
 WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions
 WIRESHARK_LICENSE = wireshark license
@@ -44,9 +44,9 @@ WIRESHARK_DEPENDENCIES += qt5base qt5tools
 WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER=""
 # Seems it expects wrappers and passes a -qt=X parameter for version
 WIRESHARK_MAKE_OPTS += \
-	MOC="$(HOST_DIR)/usr/bin/moc" \
-	RCC="$(HOST_DIR)/usr/bin/rcc" \
-	UIC="$(HOST_DIR)/usr/bin/uic"
+	MOC="$(HOST_DIR)/bin/moc" \
+	RCC="$(HOST_DIR)/bin/rcc" \
+	UIC="$(HOST_DIR)/bin/uic"
 else
 WIRESHARK_CONF_OPTS += --with-qt=no
 endif
diff --git a/bsp/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/bsp/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch
index 4fddc995..520555c8 100644
--- a/bsp/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch
+++ b/bsp/buildroot/package/wiringpi/0001-Adjust-for-buildroot-build.patch
@@ -1,4 +1,4 @@
-From 10d5bde8d628a93993dd7305dc9a406da69f65a9 Mon Sep 17 00:00:00 2001
+From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001
 From: Peter Seiderer <ps.report@gmx.net>
 Date: Wed, 2 Dec 2015 00:22:26 +0100
 Subject: [PATCH] Adjust for buildroot build.
@@ -19,7 +19,7 @@ Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  3 files changed, 18 insertions(+), 12 deletions(-)
 
 diff --git a/devLib/Makefile b/devLib/Makefile
-index 1b1ebe0..84b4d2a 100644
+index cf665d6..3fb41e8 100644
 --- a/devLib/Makefile
 +++ b/devLib/Makefile
 @@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
@@ -54,7 +54,7 @@ index 1b1ebe0..84b4d2a 100644
  
  .PHONY:	install-static
 diff --git a/gpio/Makefile b/gpio/Makefile
-index 7dcd090..dc4be72 100644
+index f41a005..7095fa5 100644
 --- a/gpio/Makefile
 +++ b/gpio/Makefile
 @@ -32,11 +32,11 @@ endif
@@ -63,14 +63,14 @@ index 7dcd090..dc4be72 100644
  DEBUG	= -O2
 -CC	= gcc
 -INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
--CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
 +CC	?= gcc
 +INCLUDE	= -I../wiringPi -I../devLib
-+CFLAGS	+= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++CFLAGS	+= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
  
 -LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 +LDFLAGS	= -L../wiringPi -L../devLib
- LIBS    = -lwiringPi -lwiringPiDev -lpthread
+ LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
  
  # May not need to  alter anything below this line
 @@ -52,9 +52,13 @@ version.h:	../VERSION
@@ -89,7 +89,7 @@ index 7dcd090..dc4be72 100644
  	$Q echo [Compile] $<
  	$Q $(CC) -c $(CFLAGS) $< -o $@
 diff --git a/wiringPi/Makefile b/wiringPi/Makefile
-index acb6e58..8b84dc6 100644
+index e1868b9..68c950e 100644
 --- a/wiringPi/Makefile
 +++ b/wiringPi/Makefile
 @@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
@@ -100,20 +100,20 @@ index acb6e58..8b84dc6 100644
 +CC	?= gcc
  INCLUDE	= -I.
  DEFS	= -D_GNU_SOURCE
--CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
-+CFLAGS	+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
++CFLAGS	+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
  
- LIBS    =
+ LIBS    = -lm -lpthread -lrt -lcrypt
  
-@@ -90,6 +90,7 @@ $(STATIC):	$(OBJ)
+@@ -79,6 +79,7 @@ $(STATIC):	$(OBJ)
  $(DYNAMIC):	$(OBJ)
  	$Q echo "[Link (Dynamic)]"
- 	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) -lpthread $(OBJ)
+ 	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
 +	$Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so
  
  .c.o:
  	$Q echo [Compile] $<
-@@ -115,7 +116,7 @@ install:	$(DYNAMIC)
+@@ -104,7 +105,7 @@ install:	$(DYNAMIC)
  	$Q echo "[Install Dynamic Lib]"
  	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
  	$Q install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
diff --git a/bsp/buildroot/package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch b/bsp/buildroot/package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
deleted file mode 100644
index 6480e3c4..00000000
--- a/bsp/buildroot/package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 7f65eb37a82a6d9b095d9c8f262ad9dd205acd03 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Jan 2016 16:57:38 -0800
-Subject: [PATCH] include <asm/ioctl.h> directly for _IOC_SIZEBITS
-
-Fixes errors like
-| wiringPiSPI.c: In function 'wiringPiSPIDataRW':
-| wiringPiSPI.c:89:35: error: '_IOC_SIZEBITS' undeclared (first use in
-this function)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Patch from https://raw.githubusercontent.com/agherzan/meta-raspberrypi/master/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch]
-Signed-off-by: Peter Seiderere <ps.report@gmx.net>
----
-Upstream-Status: Submitted
-
- wiringPi/wiringPi.c    | 1 +
- wiringPi/wiringPiI2C.c | 1 +
- wiringPi/wiringPiSPI.c | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
-index 32e5100..cb5db9d 100644
---- a/wiringPi/wiringPi.c
-+++ b/wiringPi/wiringPi.c
-@@ -64,6 +64,7 @@
- #include <time.h>
- #include <fcntl.h>
- #include <pthread.h>
-+#include <asm/ioctl.h>
- #include <sys/time.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c
-index c787bce..efdf53c 100644
---- a/wiringPi/wiringPiI2C.c
-+++ b/wiringPi/wiringPiI2C.c
-@@ -52,6 +52,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <asm/ioctl.h>
- 
- #include "wiringPi.h"
- #include "wiringPiI2C.h"
-diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
-index 453df31..ae3c7d9 100644
---- a/wiringPi/wiringPiSPI.c
-+++ b/wiringPi/wiringPiSPI.c
-@@ -27,6 +27,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
-+#include <asm/ioctl.h>
- #include <sys/ioctl.h>
- #include <linux/spi/spidev.h>
- 
--- 
-2.7.0
-
diff --git a/bsp/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch b/bsp/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch
new file mode 100644
index 00000000..c9c4385d
--- /dev/null
+++ b/bsp/buildroot/package/wiringpi/0002-wiringPi-wiringSerial-fix-compile-for-missing-baud-d.patch
@@ -0,0 +1,47 @@
+From 1e7a7a625ca20633062406ce525b19d168c356af Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Mon, 20 Mar 2017 20:51:20 +0100
+Subject: [PATCH] wiringPi/wiringSerial: fix compile for missing baud defines
+
+For sparc-buildroot-linux-uclibc/sysroot/usr/include/asm/termbits.h
+containing:
+
+  /* These have totally bogus values and nobody uses them
+     so far. Later on we'd have to use say 0x10000x and
+     adjust CBAUD constant and drivers accordingly.
+  #define B2500000  0x00001010
+  #define B3000000  0x00001011
+  #define B3500000  0x00001012
+  #define B4000000  0x00001013  */
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ wiringPi/wiringSerial.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/wiringPi/wiringSerial.c b/wiringPi/wiringSerial.c
+index e1587ad..4ac8d1e 100644
+--- a/wiringPi/wiringSerial.c
++++ b/wiringPi/wiringSerial.c
+@@ -75,10 +75,18 @@ int serialOpen (const char *device, const int baud)
+     case 1152000:	myBaud = B1152000 ; break ;
+     case 1500000:	myBaud = B1500000 ; break ;
+     case 2000000:	myBaud = B2000000 ; break ;
++#if defined(B2500000)
+     case 2500000:	myBaud = B2500000 ; break ;
++#endif
++#if defined(B3000000)
+     case 3000000:	myBaud = B3000000 ; break ;
++#endif
++#if defined(B3500000)
+     case 3500000:	myBaud = B3500000 ; break ;
++#endif
++#if defined(B4000000)
+     case 4000000:	myBaud = B4000000 ; break ;
++#endif
+ 
+     default:
+       return -2 ;
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/wiringpi/wiringpi.hash b/bsp/buildroot/package/wiringpi/wiringpi.hash
index abddaf9b..f4832e5f 100644
--- a/bsp/buildroot/package/wiringpi/wiringpi.hash
+++ b/bsp/buildroot/package/wiringpi/wiringpi.hash
@@ -1,2 +1,2 @@
-# locally computed
-sha256 0775e3bfa2df2131746c75d611ad354e5c884661be0d9de9fd786fc96f6ad918 wiringPi-2.32.tar.gz
+# Locally calculated
+sha256 4eae1d4f37f77534b1e2db4678a1003a5fd7ced4721c340527e3476d0bed1d9f wiringpi-96344ff7125182989f98d3be8d111952a8f74e15.tar.gz
diff --git a/bsp/buildroot/package/wiringpi/wiringpi.mk b/bsp/buildroot/package/wiringpi/wiringpi.mk
index ce0819da..f2e9e246 100644
--- a/bsp/buildroot/package/wiringpi/wiringpi.mk
+++ b/bsp/buildroot/package/wiringpi/wiringpi.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-WIRINGPI_VERSION = 2.32
+# using git commit id instead of (wrong) 2.44 git tag (Bug 10391)
+WIRINGPI_VERSION = 96344ff7125182989f98d3be8d111952a8f74e15
 WIRINGPI_SITE = git://git.drogon.net/wiringPi
 
-WIRINGPI_LICENSE = LGPLv3+
+WIRINGPI_LICENSE = LGPL-3.0+
 WIRINGPI_LICENSE_FILES = COPYING.LESSER
 WIRINGPI_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/wmctrl/Config.in b/bsp/buildroot/package/wmctrl/Config.in
index bc09431e..37a1f252 100644
--- a/bsp/buildroot/package/wmctrl/Config.in
+++ b/bsp/buildroot/package/wmctrl/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_WMCTRL
 	bool "wmctrl"
-	select BR2_PACKAGE_XLIB_LIBX11
-	select BR2_PACKAGE_XLIB_LIBXMU
-	select BR2_PACKAGE_LIBGLIB2
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_WCHAR # libglib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXMU
+	select BR2_PACKAGE_LIBGLIB2
 	help
 	  Provides command line access to almost all the features
 	  defined in the EWMH specification. It can be used, for
diff --git a/bsp/buildroot/package/wmctrl/wmctrl.mk b/bsp/buildroot/package/wmctrl/wmctrl.mk
index f26b23e1..36ad3513 100644
--- a/bsp/buildroot/package/wmctrl/wmctrl.mk
+++ b/bsp/buildroot/package/wmctrl/wmctrl.mk
@@ -6,9 +6,13 @@
 
 WMCTRL_VERSION = 1.07
 WMCTRL_SITE = https://sites.google.com/site/tstyblo/wmctrl
-WMCTRL_LICENSE = GPLv2+
+WMCTRL_LICENSE = GPL-2.0+
 WMCTRL_LICENSE_FILES = COPYING
 
 WMCTRL_DEPENDENCIES = libglib2 xlib_libX11 xlib_libXmu
 
+WMCTRL_CONF_OPTS = \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
+
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch b/bsp/buildroot/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch
new file mode 100644
index 00000000..142eab27
--- /dev/null
+++ b/bsp/buildroot/package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch
@@ -0,0 +1,80 @@
+From 9a6d50b3f355c1e4d72a235aa0bac4856dff1785 Mon Sep 17 00:00:00 2001
+From: Adrian Perez de Castro <aperez@igalia.com>
+Date: Tue, 27 Mar 2018 19:59:23 +0100
+Subject: [PATCH] CMake: Handle multiple libraries being returned for Brotli
+
+Brotli is built as three libraries: libbrotlienc, libbrotlidec, and
+libbrotlicommon. When requesting the linker flags using pkg-config for
+e.g. libbrotlidec, it will return both libbrotlidec and libbrotlicommon.
+The FindBrotli*.cmake files ignore the names of the libraries returned
+by pkg-config, and hardcode only the libbrotli{enc,dec} names. While
+this is fine when using shared libraries (they contain an entry for
+libbrotlicommon as required library in their headers), it will cause
+linker errors when Brotli has been built as static libraries, due to
+the missing symbols from libbrotlicommon being unknown to the linker.
+
+This fixes FindBrotli*.cmake files by using the library names reported
+by pkg-config (instead of hardcoding them), and applying find_library()
+to each of the libraries to find their absolute paths. If any of the
+libraries is missing, the corresponding BROTLI{ENC,DEC}_LIBRARIES is
+unset to let find_package_handle_standard_args() report an error.
+---
+ cmake/FindBrotliDec.cmake | 13 +++++++++----
+ cmake/FindBrotliEnc.cmake | 14 ++++++++++----
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
+Upstream-Status: Submitted [https://github.com/google/woff2/pull/112]
+
+diff --git a/cmake/FindBrotliDec.cmake b/cmake/FindBrotliDec.cmake
+index abb06f4..9cbb415 100644
+--- a/cmake/FindBrotliDec.cmake
++++ b/cmake/FindBrotliDec.cmake
+@@ -18,10 +18,15 @@ find_path(BROTLIDEC_INCLUDE_DIRS
+     HINTS ${PC_BROTLIDEC_INCLUDEDIR}
+ )
+ 
+-find_library(BROTLIDEC_LIBRARIES
+-    NAMES brotlidec
+-    HINTS ${PC_BROTLIDEC_LIBDIR}
+-)
++set(BROTLIDEC_LIBRARIES "")
++foreach(_lib ${PC_BROTLIDEC_LIBRARIES})
++	find_library(PC_BROTLIDEC_PATH_${_lib} ${_lib} HINTS ${PC_BROTLIDEC_LIBRARY_DIRS})
++	if(NOT PC_BROTLIDEC_PATH_${_lib})
++		unset(BROTLIDEC_LIBRARIES)
++		break()
++	endif()
++	list(APPEND BROTLIDEC_LIBRARIES "${PC_BROTLIDEC_PATH_${_lib}}")
++endforeach()
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(BrotliDec
+diff --git a/cmake/FindBrotliEnc.cmake b/cmake/FindBrotliEnc.cmake
+index 4be347d..55f3932 100644
+--- a/cmake/FindBrotliEnc.cmake
++++ b/cmake/FindBrotliEnc.cmake
+@@ -18,10 +18,16 @@ find_path(BROTLIENC_INCLUDE_DIRS
+     HINTS ${PC_BROTLIENC_INCLUDEDIR}
+ )
+ 
+-find_library(BROTLIENC_LIBRARIES
+-    NAMES brotlienc
+-    HINTS ${PC_BROTLIENC_LIBDIR}
+-)
++set(BROTLIENC_LIBRARIES "")
++foreach(_lib ${PC_BROTLIENC_LIBRARIES})
++	find_library(PC_BROTLIENC_PATH_${_lib} ${_lib}
++		HINTS ${PC_BROTLIENC_LIBRARY_DIRS})
++	if(NOT PC_BROTLIENC_PATH_${_lib})
++		unset(BROTLIENC_LIBRARIES)
++		break()
++	endif()
++	list(APPEND BROTLIENC_LIBRARIES "${PC_BROTLIENC_PATH_${_lib}}")
++endforeach()
+ 
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(BrotliEnc
+-- 
+2.16.3
+
diff --git a/bsp/buildroot/package/woff2/Config.in b/bsp/buildroot/package/woff2/Config.in
new file mode 100644
index 00000000..48672570
--- /dev/null
+++ b/bsp/buildroot/package/woff2/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_WOFF2
+	bool "woff2"
+	depends on BR2_INSTALL_LIBSTDCPP
+	select BR2_PACKAGE_BROTLI
+	help
+	  Reference implementation for the WOFF2 font file format,
+	  typically used for Web fonts
+
+	  https://github.com/google/woff2
diff --git a/bsp/buildroot/package/woff2/woff2.hash b/bsp/buildroot/package/woff2/woff2.hash
new file mode 100644
index 00000000..469071e3
--- /dev/null
+++ b/bsp/buildroot/package/woff2/woff2.hash
@@ -0,0 +1,5 @@
+# Locally generated:
+sha512  c788bba1530aec463e755e901f9342f4b599e3a07f54645fef1dc388ab5d5c30625535e5dd38e9e792e04a640574baa50eeefb6b7338ab403755f4a4e0c3044d  v1.0.2.tar.gz
+
+# Hash for license files:
+sha512  8ee924da3fb5d16135adcf6a8fbe9e2e8f3d2d80468617e72ca4fa059a60f8455c9a5f68a8dc381b1297c8bf39c887a912d0f69246d2604ada74d3da9e8e490b  LICENSE
diff --git a/bsp/buildroot/package/woff2/woff2.mk b/bsp/buildroot/package/woff2/woff2.mk
new file mode 100644
index 00000000..2f0206c8
--- /dev/null
+++ b/bsp/buildroot/package/woff2/woff2.mk
@@ -0,0 +1,30 @@
+################################################################################
+#
+# woff2
+#
+################################################################################
+
+WOFF2_VERSION = 1.0.2
+WOFF2_SOURCE = v$(WOFF2_VERSION).tar.gz
+WOFF2_SITE = https://github.com/google/woff2/archive
+WOFF2_LICENSE = MIT
+WOFF2_LICENSE_FILES = LICENSE
+WOFF2_INSTALL_STAGING = YES
+WOFF2_DEPENDENCIES = brotli
+WOFF2_CONF_OPTS = \
+	-DNOISY_LOGGING=OFF
+
+# The CMake build files for woff2 manually set some RPATH handling options
+# which make the installation steps fail with static builds, so pass this
+# to prevent any attempt of mangling RPATH that CMake would do.
+ifneq ($(BR2_SHARED_LIBS),y)
+WOFF2_CONF_OPTS += -DCMAKE_SKIP_RPATH=ON
+endif
+
+# Internal error, aborting at dw2gencfi.c:215 in emit_expr_encoded
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509
+ifeq ($(BR2_m68k_cf),y)
+WOFF2_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm"
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/wolfssl/Config.in b/bsp/buildroot/package/wolfssl/Config.in
new file mode 100644
index 00000000..3c6d68f5
--- /dev/null
+++ b/bsp/buildroot/package/wolfssl/Config.in
@@ -0,0 +1,27 @@
+config BR2_PACKAGE_WOLFSSL
+	bool "wolfssl"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	help
+	  The wolfSSL embedded SSL library (formerly CyaSSL) is a
+	  lightweight, portable, C-language-based SSL/TLS library
+	  targeted at IoT, embedded, and RTOS environments primarily
+	  because of its size, speed, and feature set.
+
+	  https://www.wolfssl.com/
+
+if BR2_PACKAGE_WOLFSSL
+
+config BR2_PACKAGE_WOLFSSL_ALL
+	bool "enable all features, except SSLv3"
+	help
+	  Enable all wolfSSL features, except SSL version 3.0 support.
+
+config BR2_PACKAGE_WOLFSSL_SSLV3
+	bool "enable SSLv3"
+	help
+	  Enable SSL version 3.0 support.
+
+endif
+
+comment "wolfssl needs a toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/bsp/buildroot/package/wolfssl/wolfssl.hash b/bsp/buildroot/package/wolfssl/wolfssl.hash
new file mode 100644
index 00000000..204f2f09
--- /dev/null
+++ b/bsp/buildroot/package/wolfssl/wolfssl.hash
@@ -0,0 +1,6 @@
+# Locally computed:
+sha256 3bafeb0cb7eaff80002ba3f7cbb70023757bcc35fc4d82181945b143f1f927c6  v3.13.0-stable.tar.gz
+
+# Hash for license files:
+sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
+sha256 74adaaef40b96c71378b6daa3feb8ccd4a1bfd9b76debf3f3f29cf3a0e86c9a0  LICENSING
diff --git a/bsp/buildroot/package/wolfssl/wolfssl.mk b/bsp/buildroot/package/wolfssl/wolfssl.mk
new file mode 100644
index 00000000..84073f33
--- /dev/null
+++ b/bsp/buildroot/package/wolfssl/wolfssl.mk
@@ -0,0 +1,35 @@
+################################################################################
+#
+# wolfssl
+#
+################################################################################
+
+WOLFSSL_VERSION = 3.13.0
+WOLFSSL_SITE = https://github.com/wolfSSL/wolfssl/archive
+WOLFSSL_SOURCE = v$(WOLFSSL_VERSION)-stable.tar.gz
+
+WOLFSSL_LICENSE = GPL-2.0
+WOLFSSL_LICENSE_FILES = COPYING LICENSING
+
+WOLFSSL_DEPENDENCIES = host-pkgconf
+
+# wolfssl's source code is released without a configure
+# script, so we need autoreconf
+WOLFSSL_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_WOLFSSL_ALL),y)
+WOLFSSL_CONF_OPTS += --enable-all
+else
+WOLFSSL_CONF_OPTS += --disable-all
+endif
+
+ifeq ($(BR2_PACKAGE_WOLFSSL_SSLV3),y)
+WOLFSSL_CONF_OPTS += --enable-sslv3
+else
+WOLFSSL_CONF_OPTS += --disable-sslv3
+endif
+
+# build fails when ARMv8 hardware acceleration is enabled
+WOLFSSL_CONF_OPTS += --disable-armasm
+
+$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/wpa_supplicant/Config.in b/bsp/buildroot/package/wpa_supplicant/Config.in
index 1b2baf4e..58a074fa 100644
--- a/bsp/buildroot/package/wpa_supplicant/Config.in
+++ b/bsp/buildroot/package/wpa_supplicant/Config.in
@@ -11,8 +11,8 @@ if BR2_PACKAGE_WPA_SUPPLICANT
 config BR2_PACKAGE_WPA_SUPPLICANT_NL80211
 	bool "Enable nl80211 support"
 	default y
-	select BR2_PACKAGE_LIBNL
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
+	select BR2_PACKAGE_LIBNL
 	help
 	  Enable support for nl80211.  This is the current wireless
 	  API for Linux, supported by all wireless drivers in vanilla
@@ -34,10 +34,11 @@ config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
 	depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211
 	help
 	  With this option enabled, wpa_supplicant can act as an
-	  access point much like hostapd does with a limited feature set.
-	  This links in parts of hostapd functionality into wpa_supplicant,
-	  making it bigger but dispensing the need for a separate hostapd
-	  binary in some applications hence being smaller overall.
+	  access point much like hostapd does with a limited feature
+	  set.  This links in parts of hostapd functionality into
+	  wpa_supplicant, making it bigger but dispensing the need for
+	  a separate hostapd binary in some applications hence being
+	  smaller overall.
 
 config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY
 	bool "Enable Wi-Fi Display"
@@ -48,6 +49,8 @@ config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY
 config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING
 	bool "Enable mesh networking"
 	depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
 	help
 	  Enable support for open and secured mesh networking
 	  (IEEE 802.11s)
@@ -65,7 +68,8 @@ config BR2_PACKAGE_WPA_SUPPLICANT_EAP
 config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT
 	bool "Enable HS20"
 	help
-	  Enable Hotspot 2.0 and IEEE 802.11u interworking functionality.
+	  Enable Hotspot 2.0 and IEEE 802.11u interworking
+	  functionality.
 
 config BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG
 	bool "Enable syslog support"
@@ -83,8 +87,8 @@ config BR2_PACKAGE_WPA_SUPPLICANT_CLI
 	  Install wpa_cli command line utility
 
 config BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO
-	depends on !BR2_STATIC_LIBS
 	bool "Install wpa_client shared library"
+	depends on !BR2_STATIC_LIBS
 	help
 	  Install libwpa_client.so.
 
@@ -107,7 +111,8 @@ config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW
 	bool "Enable support for new DBus control interface"
 	depends on BR2_PACKAGE_DBUS
 	help
-	  Enable support for new DBus control interface (fi.w1.wpa_supplicant1).
+	  Enable support for new DBus control interface
+	  (fi.w1.wpa_supplicant1).
 
 config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION
 	bool "Introspection support"
diff --git a/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.hash b/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.hash
index 65a6ae24..dbc44382 100644
--- a/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.hash
+++ b/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.hash
@@ -7,3 +7,5 @@ sha256  793a54748161b5af430dd9de4a1988d19cb8e85ab29bc2340f886b0297cee20b  rebase
 sha256  596d4d3b63ea859ed7ea9791b3a21cb11b6173b04c0a14a2afa47edf1666afa6  rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch
 sha256  c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736  rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch
 sha256  c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1  rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
+sha256  960c3cf2a514479b0b4cf09665186a1a9f5d28e8b05dec23db75c6cc13eb1f7c  rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+sha256  3f6ca36d86668d6607389e01cf4766f38aa3b8ab2c144ad132541087b41c061d  README
diff --git a/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.mk b/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.mk
index 7ac12ca3..2b451996 100644
--- a/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.mk
+++ b/bsp/buildroot/package/wpa_supplicant/wpa_supplicant.mk
@@ -13,8 +13,9 @@ WPA_SUPPLICANT_PATCH = \
 	http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \
 	http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \
 	http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch \
-	http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch
-WPA_SUPPLICANT_LICENSE = BSD-3c
+	http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch \
+	http://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch
+WPA_SUPPLICANT_LICENSE = BSD-3-Clause
 WPA_SUPPLICANT_LICENSE_FILES = README
 WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config
 WPA_SUPPLICANT_SUBDIR = wpa_supplicant
@@ -32,9 +33,9 @@ WPA_SUPPLICANT_CONFIG_EDITS =
 WPA_SUPPLICANT_CONFIG_SET = CONFIG_BGSCAN_SIMPLE
 
 WPA_SUPPLICANT_CONFIG_ENABLE = \
-	CONFIG_IEEE80211AC	\
-	CONFIG_IEEE80211N	\
-	CONFIG_IEEE80211R	\
+	CONFIG_IEEE80211AC \
+	CONFIG_IEEE80211N \
+	CONFIG_IEEE80211R \
 	CONFIG_INTERNAL_LIBTOMMATH \
 	CONFIG_DEBUG_FILE \
 	CONFIG_MATCH_IFACE
@@ -97,8 +98,8 @@ WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WPS
 endif
 
 # Try to use openssl if it's already available
-ifeq ($(BR2_PACKAGE_OPENSSL),y)
-WPA_SUPPLICANT_DEPENDENCIES += openssl
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
+WPA_SUPPLICANT_DEPENDENCIES += libopenssl
 WPA_SUPPLICANT_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz)
 WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/'
 else
@@ -109,7 +110,7 @@ endif
 ifeq ($(BR2_PACKAGE_DBUS),y)
 WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus
 WPA_SUPPLICANT_MAKE_ENV = \
-	PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)"	\
+	PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 	PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y)
diff --git a/bsp/buildroot/package/wpan-tools/0001-fix-build-with-newer-libnl.patch b/bsp/buildroot/package/wpan-tools/0001-fix-build-with-newer-libnl.patch
deleted file mode 100644
index 03e1a033..00000000
--- a/bsp/buildroot/package/wpan-tools/0001-fix-build-with-newer-libnl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 51ab69d76aa708c79aed971ee4083abb8cc07201 Mon Sep 17 00:00:00 2001
-From: Stefan Schmidt <stefan@osg.samsung.com>
-Date: Mon, 9 Nov 2015 19:06:25 +0100
-Subject: [PATCH] build: avoid redefinition errors with libnl >= 3.2.27
-
-From 3.2.17 onwards we have nla for s8, s16, etc defined directly in libnl.
-If we keep including this file anyway we run into redefinition errors. Better
-include use our own only for earlier versions.
-
-Happened to me on Fedora 22 after my last update.
-
-Signed-off-by: Stefan Schmidt <stefan@osg.samsung.com>
-Acked-by: Alexander Aring <alex.aring@gmail.com>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
-Patch status: upstream
-
- src/nl_extras.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/nl_extras.h b/src/nl_extras.h
-index 9d841aa..c4d1d14 100644
---- a/src/nl_extras.h
-+++ b/src/nl_extras.h
-@@ -1,6 +1,8 @@
- #ifndef __NL_EXTRAS_H
- #define __NL_EXTRAS_H
- 
-+#if LIBNL_VER_MIC <= 26
-+
- #ifndef NLA_S8
- 
- #define NLA_S8	13
-@@ -43,4 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla)
- 
- #endif /* NLA_S64 */
- 
-+#endif /* LIBNL_VER_MIC */
-+
- #endif /* __NL_EXTRAS_H */
diff --git a/bsp/buildroot/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch b/bsp/buildroot/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch
new file mode 100644
index 00000000..8b881ad3
--- /dev/null
+++ b/bsp/buildroot/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch
@@ -0,0 +1,49 @@
+From bb522bd584f05e6658d5dba97f48ca018f46394c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sat, 6 May 2017 14:36:08 +0200
+Subject: [PATCH] src/nl_extras.h: fix compatibility with libnl 3.3.0
+
+nl_extras.h defines a set of nla_set_s*() functions if not provided by
+libnl. They are provided by libnl since version 3.2.26. The test
+(LIBNL_VER_MIC <= 26) was working fine while libnl was in the 3.2.x
+series, but now that they have incremented the minor version, the
+micro version was reset to 0, with the latest libnl version being
+3.3.0.
+
+Due to this, the condition (LIBNL_VER_MIC <= 26) is true, and we get
+redefinition errors because nl_extras.h redefines functions already
+provided by libnl.
+
+This commit improves the condition so that nl_extras.h provides the
+missing functions only if the minor version is < 2, or if minor is 2
+and micro is < 26.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ src/nl_extras.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nl_extras.h b/src/nl_extras.h
+index c4d1d14..37844f9 100644
+--- a/src/nl_extras.h
++++ b/src/nl_extras.h
+@@ -1,7 +1,7 @@
+ #ifndef __NL_EXTRAS_H
+ #define __NL_EXTRAS_H
+ 
+-#if LIBNL_VER_MIC <= 26
++#if (LIBNL_VER_MIN < 2) || (LIBNL_VER_MIN == 2) && (LIBNL_VER_MIC <= 26)
+ 
+ #ifndef NLA_S8
+ 
+@@ -45,6 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla)
+ 
+ #endif /* NLA_S64 */
+ 
+-#endif /* LIBNL_VER_MIC */
++#endif /* LIBNL_VER_* */
+ 
+ #endif /* __NL_EXTRAS_H */
+-- 
+2.7.4
+
diff --git a/bsp/buildroot/package/wpan-tools/wpan-tools.hash b/bsp/buildroot/package/wpan-tools/wpan-tools.hash
index fbcf64c0..cfad89aa 100644
--- a/bsp/buildroot/package/wpan-tools/wpan-tools.hash
+++ b/bsp/buildroot/package/wpan-tools/wpan-tools.hash
@@ -1,4 +1,4 @@
 # From http://wpan.cakelab.org/releases/md5sum
-md5	c6356f7be4de2e9f2084283b9ed7e1ab	wpan-tools-0.5.tar.gz
+md5	91f0b640ff66910e977fab6525625624	wpan-tools-0.7.tar.xz
 # Calculated based on the hash above
-sha256	f381f24eb1962aa9e21751004560371bb9ad8bd0b735bc493930f50e8c1f3d99	wpan-tools-0.5.tar.gz
+sha256	c16de9d7861c2d9b6a4436a0fac730f9f545ee290b92bc770c538ec6a3f22309	wpan-tools-0.7.tar.xz
diff --git a/bsp/buildroot/package/wpan-tools/wpan-tools.mk b/bsp/buildroot/package/wpan-tools/wpan-tools.mk
index d2238004..d5e43a92 100644
--- a/bsp/buildroot/package/wpan-tools/wpan-tools.mk
+++ b/bsp/buildroot/package/wpan-tools/wpan-tools.mk
@@ -4,10 +4,11 @@
 #
 ################################################################################
 
-WPAN_TOOLS_VERSION = 0.5
+WPAN_TOOLS_VERSION = 0.7
+WPAN_TOOLS_SOURCE = wpan-tools-$(WPAN_TOOLS_VERSION).tar.xz
 WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases
 WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl
-WPAN_TOOLS_LICENSE = iw license
+WPAN_TOOLS_LICENSE = ISC
 WPAN_TOOLS_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/wsapi-fcgi/Config.in b/bsp/buildroot/package/wsapi-fcgi/Config.in
new file mode 100644
index 00000000..b4304a06
--- /dev/null
+++ b/bsp/buildroot/package/wsapi-fcgi/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_WSAPI_FCGI
+	bool "wsapi-fcgi"
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBFCGI
+	# Runtime dependency only
+	select BR2_PACKAGE_WSAPI
+	help
+	  WSAPI is an API that abstracts the web server from Lua web
+	  applications. This is the rock that contains the FCGI module
+	  lfcgi.
+
+	  http://keplerproject.github.com/wsapi/
diff --git a/bsp/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash b/bsp/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
new file mode 100644
index 00000000..f82ce9cf
--- /dev/null
+++ b/bsp/buildroot/package/wsapi-fcgi/wsapi-fcgi.hash
@@ -0,0 +1,2 @@
+# locally computed hash
+sha256 73dc200889bc185953cd3a7c5350c998c090f901fcd10771273b7a63a3ffcdcf  wsapi-fcgi-1.6.1-1.src.rock
diff --git a/bsp/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk b/bsp/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
new file mode 100644
index 00000000..2b0e6b25
--- /dev/null
+++ b/bsp/buildroot/package/wsapi-fcgi/wsapi-fcgi.mk
@@ -0,0 +1,14 @@
+################################################################################
+#
+# wsapi-fcgi
+#
+################################################################################
+
+WSAPI_FCGI_VERSION_MAJOR = 1.6.1
+WSAPI_FCGI_VERSION = $(WSAPI_FCGI_VERSION_MAJOR)-1
+WSAPI_FCGI_SUBDIR = wsapi-$(WSAPI_FCGI_VERSION_MAJOR)
+WSAPI_FCGI_DEPENDENCIES = libfcgi
+WSAPI_FCGI_LICENSE = MIT
+WSAPI_FCGI_LICENSE_FILES = $(WSAPI_FCGI_SUBDIR)/doc/us/license.html
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/wsapi-xavante/Config.in b/bsp/buildroot/package/wsapi-xavante/Config.in
new file mode 100644
index 00000000..3e494bba
--- /dev/null
+++ b/bsp/buildroot/package/wsapi-xavante/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_WSAPI_XAVANTE
+	bool "wsapi-xavante"
+	# Runtime dependencies
+	select BR2_PACKAGE_COXPCALL
+	select BR2_PACKAGE_RINGS
+	select BR2_PACKAGE_WSAPI
+	select BR2_PACKAGE_XAVANTE
+	help
+	  WSAPI is an API that abstracts the web server from Lua web
+	  applications. This is the rock that contains the Xavante
+	  adapter and launcher.
+
+	  http://keplerproject.github.com/wsapi/
diff --git a/bsp/buildroot/package/wsapi-xavante/wsapi-xavante.hash b/bsp/buildroot/package/wsapi-xavante/wsapi-xavante.hash
new file mode 100644
index 00000000..9e8132df
--- /dev/null
+++ b/bsp/buildroot/package/wsapi-xavante/wsapi-xavante.hash
@@ -0,0 +1,2 @@
+# locally computed hash
+sha256 b30b171e3d4d6fd7e129f14576e1cfc5adf00c0780ef8350f2f9e6f1d4259346  wsapi-xavante-1.6.1-1.src.rock
diff --git a/bsp/buildroot/package/wsapi-xavante/wsapi-xavante.mk b/bsp/buildroot/package/wsapi-xavante/wsapi-xavante.mk
new file mode 100644
index 00000000..86f5dee5
--- /dev/null
+++ b/bsp/buildroot/package/wsapi-xavante/wsapi-xavante.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# wsapi-xavante
+#
+################################################################################
+
+WSAPI_XAVANTE_VERSION_MAJOR = 1.6.1
+WSAPI_XAVANTE_VERSION = $(WSAPI_XAVANTE_VERSION_MAJOR)-1
+WSAPI_XAVANTE_SUBDIR = wsapi-$(WSAPI_XAVANTE_VERSION_MAJOR)
+WSAPI_XAVANTE_LICENSE = MIT
+WSAPI_XAVANTE_LICENSE_FILES = $(WSAPI_XAVANTE_SUBDIR)/doc/us/license.html
+
+$(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/wsapi/0001-Lua-5.3-compatibility.patch b/bsp/buildroot/package/wsapi/0001-Lua-5.3-compatibility.patch
new file mode 100644
index 00000000..9165ef2b
--- /dev/null
+++ b/bsp/buildroot/package/wsapi/0001-Lua-5.3-compatibility.patch
@@ -0,0 +1,41 @@
+From 2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611 Mon Sep 17 00:00:00 2001
+From: mpeterv <mpeterval@gmail.com>
+Date: Thu, 3 Dec 2015 13:10:14 +0300
+Subject: [PATCH] Lua 5.3 compatibility
+
+Fetched from: https://github.com/keplerproject/wsapi/commit/2d824d2fce31b6a9cc60b2c3f215fbbf1d99c611
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+---
+ src/wsapi/ringer.lua | 1 +
+ src/wsapi/util.lua   | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/wsapi-1.6.1/src/wsapi/ringer.lua b/wsapi-1.6.1/src/wsapi/ringer.lua
+index 58309f2..db7b68f 100644
+--- a/wsapi-1.6.1/src/wsapi/ringer.lua
++++ b/wsapi-1.6.1/src/wsapi/ringer.lua
+@@ -5,6 +5,7 @@ local rings = require "rings"
+ local _M = {}
+ 
+ local init = [==[
++  local loadstring = loadstring or load
+   local app_name, bootstrap_code, is_file = ...
+   if bootstrap_code then
+     local bootstrap, err
+diff --git a/wsapi-1.6.1/src/wsapi/util.lua b/wsapi-1.6.1/src/wsapi/util.lua
+index 24d3cfe..34e5816 100644
+--- a/wsapi-1.6.1/src/wsapi/util.lua
++++ b/wsapi-1.6.1/src/wsapi/util.lua
+@@ -174,7 +174,7 @@ function _M.make_env_post(pd, type, qs)
+ end
+ 
+ function _M.loadfile(filename, env)
+-  if _VERSION == "Lua 5.2" then
++  if _VERSION ~= "Lua 5.1" then
+     return loadfile(filename, "bt", env)
+   else
+     local f, err = loadfile(filename)
+-- 
+2.14.1
+
diff --git a/bsp/buildroot/package/wsapi/wsapi.mk b/bsp/buildroot/package/wsapi/wsapi.mk
index 0cca6cb4..64a27579 100644
--- a/bsp/buildroot/package/wsapi/wsapi.mk
+++ b/bsp/buildroot/package/wsapi/wsapi.mk
@@ -6,5 +6,6 @@
 
 WSAPI_VERSION = 1.6.1-1
 WSAPI_LICENSE = MIT
+WSAPI_LICENSE_FILES = $(WSAPI_SUBDIR)/doc/us/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/x11r7/Config.in b/bsp/buildroot/package/x11r7/Config.in
index c40a6438..ddceaa40 100644
--- a/bsp/buildroot/package/x11r7/Config.in
+++ b/bsp/buildroot/package/x11r7/Config.in
@@ -164,7 +164,6 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdriver_xf86-video-fbdev/Config.in
 		source package/x11r7/xdriver_xf86-video-fbturbo/Config.in
 		source package/x11r7/xdriver_xf86-video-geode/Config.in
-		source package/x11r7/xdriver_xf86-video-glide/Config.in
 		source package/x11r7/xdriver_xf86-video-glint/Config.in
 		source package/x11r7/xdriver_xf86-video-i128/Config.in
 		source package/x11r7/xdriver_xf86-video-imx/Config.in
@@ -184,11 +183,9 @@ if BR2_PACKAGE_XORG7
 		source package/x11r7/xdriver_xf86-video-tdfx/Config.in
 		source package/x11r7/xdriver_xf86-video-tga/Config.in
 		source package/x11r7/xdriver_xf86-video-trident/Config.in
-		source package/x11r7/xdriver_xf86-video-v4l/Config.in
 		source package/x11r7/xdriver_xf86-video-vesa/Config.in
 		source package/x11r7/xdriver_xf86-video-vmware/Config.in
 		source package/x11r7/xdriver_xf86-video-voodoo/Config.in
-		source package/x11r7/xdriver_xf86-video-wsfb/Config.in
 	endmenu
 	endif
 	menu "X11R7 Fonts"
diff --git a/bsp/buildroot/package/x11r7/libxcb/Config.in b/bsp/buildroot/package/x11r7/libxcb/Config.in
index 32569f79..7439741f 100644
--- a/bsp/buildroot/package/x11r7/libxcb/Config.in
+++ b/bsp/buildroot/package/x11r7/libxcb/Config.in
@@ -6,7 +6,8 @@ config BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XLIB_LIBXAU
 	help
 	  The X protocol C-language Binding (XCB) is a replacement for
-	  Xlib featuring a small footprint, latency hiding, direct access
-	  to the protocol, improved threading support, and extensibility.
+	  Xlib featuring a small footprint, latency hiding, direct
+	  access to the protocol, improved threading support, and
+	  extensibility.
 
 	  http://xcb.freedesktop.org/
diff --git a/bsp/buildroot/package/x11r7/libxcb/libxcb.mk b/bsp/buildroot/package/x11r7/libxcb/libxcb.mk
index ba424186..32edbb9e 100644
--- a/bsp/buildroot/package/x11r7/libxcb/libxcb.mk
+++ b/bsp/buildroot/package/x11r7/libxcb/libxcb.mk
@@ -23,8 +23,8 @@ LIBXCB_CONF_OPTS = --with-doxygen=no
 HOST_LIBXCB_CONF_OPTS = --with-doxygen=no
 
 # libxcb is not python3 friendly, so force the python interpreter
-HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
-LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
+HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
+LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/bin/python2
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash
index 7bb7fd36..65973a50 100644
--- a/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash
+++ b/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash
@@ -1,2 +1,5 @@
-# From http://lists.x.org/archives/xorg-announce/2014-December/002509.html
-sha256	38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026	bdftopcf-1.0.5.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-November/002821.html
+md5 2a455d3c02390597feb9cefb3fe97a45  bdftopcf-1.1.tar.bz2
+sha1 48a783337a5aa49ebc102c9788ff0f43ea35c5c4  bdftopcf-1.1.tar.bz2
+sha256 4b4df05fc53f1e98993638d6f7e178d95b31745c4568cee407e167491fd311a2  bdftopcf-1.1.tar.bz2
+sha512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec  bdftopcf-1.1.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
index 489bbba4..7ee618d6 100644
--- a/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
+++ b/bsp/buildroot/package/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_BDFTOPCF_VERSION = 1.0.5
+XAPP_BDFTOPCF_VERSION = 1.1
 XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2
 XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_BDFTOPCF_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xapp_luit/Config.in b/bsp/buildroot/package/x11r7/xapp_luit/Config.in
index 3e314de1..69da5706 100644
--- a/bsp/buildroot/package/x11r7/xapp_luit/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_luit/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XAPP_LUIT
 	bool "luit"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBFONTENC
-	depends on BR2_USE_MMU # fork()
 	help
 	  Locale and ISO 2022 support for Unicode terminals
diff --git a/bsp/buildroot/package/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch b/bsp/buildroot/package/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch
deleted file mode 100644
index 5c3e91a4..00000000
--- a/bsp/buildroot/package/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d Mon Sep 17 00:00:00 2001
-From: Stefan Dirsch <sndirsch@suse.de>
-Date: Wed, 9 Sep 2015 23:44:06 +0200
-Subject: [PATCH] Pass -P to the preprocessor when generating filenames for the
- manpage.
-
-Fixes build with GCC 5. Patch by Richard Biener <rguenther@suse.com>
-
-Tested-by: Matt Turner <mattst88@gmail.com>
-Signed-off-by: Matt Turner <mattst88@gmail.com>
-[Thomas: backport from upstream commit 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- man/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/Makefile.am b/man/Makefile.am
-index 665ace5..2e5f146 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
- 
- AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
- filenames.sed: filenames.sed.c
--	$(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	    $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
- 	    $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
- 
--- 
-2.6.3
-
diff --git a/bsp/buildroot/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch b/bsp/buildroot/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch
similarity index 100%
rename from bsp/buildroot/package/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch
rename to bsp/buildroot/package/x11r7/xapp_sessreg/0001-missing_path_wtmpx.patch
diff --git a/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash b/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash
index 9c1a8029..47495b23 100644
--- a/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash
+++ b/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.hash
@@ -1,2 +1,2 @@
-# From http://lists.x.org/archives/xorg-announce/2015-January/002522.html
-sha256	551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c	sessreg-1.1.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-February/002778.html
+sha256 78a76ae3f3f6a26547a34630d1b740f42344848b5fb6d7c9c7f7da255e35a6e1  sessreg-1.1.1.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index 08811c01..c6e9463d 100644
--- a/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/bsp/buildroot/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XAPP_SESSREG_VERSION = 1.1.0
+XAPP_SESSREG_VERSION = 1.1.1
 XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
-XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app
+XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app
 XAPP_SESSREG_LICENSE = MIT
 XAPP_SESSREG_LICENSE_FILES = COPYING
 XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
diff --git a/bsp/buildroot/package/x11r7/xapp_xcmsdb/Config.in b/bsp/buildroot/package/x11r7/xapp_xcmsdb/Config.in
index 99c9cbb4..82c9da3a 100644
--- a/bsp/buildroot/package/x11r7/xapp_xcmsdb/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_xcmsdb/Config.in
@@ -2,4 +2,5 @@ config BR2_PACKAGE_XAPP_XCMSDB
 	bool "xcmsdb"
 	select BR2_PACKAGE_XLIB_LIBX11
 	help
-	  Device Color Characterization utility for X Color Management System
+	  Device Color Characterization utility for X Color Management
+	  System
diff --git a/bsp/buildroot/package/x11r7/xapp_xconsole/Config.in b/bsp/buildroot/package/x11r7/xapp_xconsole/Config.in
index 1aaa1187..7baf4ff6 100644
--- a/bsp/buildroot/package/x11r7/xapp_xconsole/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_xconsole/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_XAPP_XCONSOLE
 	bool "xconsole"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXAW
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XLIB_LIBXMU
-	depends on BR2_USE_MMU # fork()
 	help
 	  xconsole - monitor system console messages with X
diff --git a/bsp/buildroot/package/x11r7/xapp_xdriinfo/Config.in b/bsp/buildroot/package/x11r7/xapp_xdriinfo/Config.in
index 36dc5770..2b204d91 100644
--- a/bsp/buildroot/package/x11r7/xapp_xdriinfo/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_xdriinfo/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_XAPP_XDRIINFO
 	bool "xdriinfo"
+	depends on BR2_PACKAGE_HAS_LIBGL
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XPROTO_GLPROTO
-	depends on BR2_PACKAGE_HAS_LIBGL
 	help
 	  query configuration information of DRI drivers
 
diff --git a/bsp/buildroot/package/x11r7/xapp_xedit/Config.in b/bsp/buildroot/package/x11r7/xapp_xedit/Config.in
index feaea748..876d5412 100644
--- a/bsp/buildroot/package/x11r7/xapp_xedit/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_xedit/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XAPP_XEDIT
 	bool "xedit"
-	select BR2_PACKAGE_XLIB_LIBXAW
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_XLIB_LIBXAW
 	help
 	  simple text editor for X
diff --git a/bsp/buildroot/package/x11r7/xapp_xf86dga/Config.in b/bsp/buildroot/package/x11r7/xapp_xf86dga/Config.in
index 8a13bd4d..5d812033 100644
--- a/bsp/buildroot/package/x11r7/xapp_xf86dga/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_xf86dga/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XAPP_XF86DGA
 	bool "xf86dga"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXXF86DGA
-	depends on BR2_USE_MMU # fork()
 	help
 	  test program for the XFree86-DGA extension
diff --git a/bsp/buildroot/package/x11r7/xapp_xfs/Config.in b/bsp/buildroot/package/x11r7/xapp_xfs/Config.in
index 8b72445f..b708af8c 100644
--- a/bsp/buildroot/package/x11r7/xapp_xfs/Config.in
+++ b/bsp/buildroot/package/x11r7/xapp_xfs/Config.in
@@ -1,8 +1,8 @@
 config BR2_PACKAGE_XAPP_XFS
 	bool "xfs"
-	select BR2_PACKAGE_XLIB_LIBFS
-	select BR2_PACKAGE_XLIB_LIBXFONT
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_XLIB_LIBFS
+	select BR2_PACKAGE_XLIB_LIBXFONT2
+	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	help
 	  X font server
diff --git a/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash b/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash
index 67823742..27577ba2 100644
--- a/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash
+++ b/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.hash
@@ -1,2 +1,5 @@
-# From http://lists.x.org/archives/xorg-announce/2014-August/002472.html
-sha256	a40b75e674c091464f85739292b6bf24e2d153f4a2ac456d3ea6b8a64e269ffa	xfs-1.1.4.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-November/002826.html
+md5  b4d2e644bfb35cae8858d2411501b07e  xfs-1.2.0.tar.bz2
+sha1 00848fcc2915ed8b00e75ac311c4727327324f57  xfs-1.2.0.tar.bz2
+sha256 db2212115783498f8eeaaee1349461d6c4e9d2005e142bacd3a984fe57269860  xfs-1.2.0.tar.bz2
+sha512 557b08aa07919239ce345d60b288b886640200bb1a59649fc890c3ccaa8559cc6745189614e696ab1b390ec024b393be5493787b7b0d2b3545b342d743c2e0ef  xfs-1.2.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.mk b/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.mk
index 3e704554..f4fe35df 100644
--- a/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/bsp/buildroot/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-XAPP_XFS_VERSION = 1.1.4
+XAPP_XFS_VERSION = 1.2.0
 XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
 XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XFS_LICENSE = MIT
 XAPP_XFS_LICENSE_FILES = COPYING
-XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto
+XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xproto_fontsproto
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash
index bc85caa6..4d0b5fee 100644
--- a/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash
+++ b/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash
@@ -1,2 +1,5 @@
-# From http://lists.x.org/archives/xorg-announce/2015-November/002653.html
-sha256	0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d	xkbcomp-1.3.1.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-May/002797.html
+md5 cc22b232bc78a303371983e1b48794ab  xkbcomp-1.4.0.tar.bz2
+sha1 9578a564ff8fcf96581fb52860828fbab8c67b4f  xkbcomp-1.4.0.tar.bz2
+sha256 bc69c8748c03c5ad9afdc8dff9db11994dd871b614c65f8940516da6bf61ce6b  xkbcomp-1.4.0.tar.bz2
+sha512 c96a63fc2d9a6ac17123297574966c45d0dcfd4ae3d4073ce863c7738d453f4c0a5f7a87c06efdec19f0b270207a7170fe1aa72a73ef1b50f95c7ca262f4882e  xkbcomp-1.4.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
index 4fc4372f..cc885618 100644
--- a/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
+++ b/bsp/buildroot/package/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XAPP_XKBCOMP_VERSION = 1.3.1
+XAPP_XKBCOMP_VERSION = 1.4.0
 XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2
 XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app
 XAPP_XKBCOMP_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xcb-proto/Config.in b/bsp/buildroot/package/x11r7/xcb-proto/Config.in
index 1d66372d..a4c93831 100644
--- a/bsp/buildroot/package/x11r7/xcb-proto/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-proto/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_XCB_PROTO
 	bool "xcb-proto"
 	help
-		The protocol headers that define XCB.
+	  The protocol headers that define XCB.
 
-		http://xcb.freedesktop.org/
+	  http://xcb.freedesktop.org/
diff --git a/bsp/buildroot/package/x11r7/xcb-util-cursor/Config.in b/bsp/buildroot/package/x11r7/xcb-util-cursor/Config.in
index ca304941..aa81615c 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-cursor/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-util-cursor/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_XCB_UTIL_CURSOR
 	bool "xcb-util-cursor"
+	depends on BR2_PACKAGE_LIBXCB
 	select BR2_PACKAGE_XCB_UTIL
 	select BR2_PACKAGE_XCB_UTIL_IMAGE
 	select BR2_PACKAGE_XCB_UTIL_RENDERUTIL
-	depends on BR2_PACKAGE_LIBXCB
 	help
 	  The XCB util modules provides a number of libraries which
 	  sit on top of libxcb, the core X protocol library, and some
diff --git a/bsp/buildroot/package/x11r7/xcb-util-image/Config.in b/bsp/buildroot/package/x11r7/xcb-util-image/Config.in
index 31fc61a5..c8d7ef8a 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-image/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-util-image/Config.in
@@ -2,12 +2,14 @@ config BR2_PACKAGE_XCB_UTIL_IMAGE
 	bool "xcb-util-image"
 	select BR2_PACKAGE_XCB_UTIL
 	help
-	  The XCB util modules provides a number of libraries which sit on top
-	  of libxcb, the core X protocol library, and some of the extension
-	  libraries. These experimental libraries provide convenience functions
-	  and interfaces which make the raw X protocol more usable. Some of the
-	  libraries also provide client-side code which is not strictly part of
-	  the X protocol but which have traditionally been provided by Xlib.
+
+	  The XCB util modules provides a number of libraries which
+	  sit on top of libxcb, the core X protocol library, and some
+	  of the extension libraries. These experimental libraries
+	  provide convenience functions and interfaces which make the
+	  raw X protocol more usable. Some of the libraries also
+	  provide client-side code which is not strictly part of the X
+	  protocol but which have traditionally been provided by Xlib.
 
 	  XCB util-image module provides the following library:
 	    - image: Port of Xlib's XImage and XShmImage functions.
diff --git a/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.hash b/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.hash
index 1cc82ac9..a9a2eaab 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.hash
+++ b/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.hash
@@ -1,2 +1,4 @@
 # From http://lists.x.org/archives/xorg-announce/2014-October/002489.html
 sha256	2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc	xcb-util-image-0.4.0.tar.bz2
+# License file, locally calculated
+sha256	19672c6153d8c4870abe734fa4dd2197481a311f4788d02ad729be07e116b26b	COPYING
diff --git a/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.mk b/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.mk
index 705b8a76..8ddb0be8 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.mk
+++ b/bsp/buildroot/package/x11r7/xcb-util-image/xcb-util-image.mk
@@ -9,6 +9,7 @@ XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist
 XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2
 XCB_UTIL_IMAGE_INSTALL_STAGING = YES
 XCB_UTIL_IMAGE_LICENSE = MIT
+XCB_UTIL_IMAGE_LICENSE_FILES = COPYING
 XCB_UTIL_IMAGE_DEPENDENCIES = xcb-util
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xcb-util-keysyms/Config.in b/bsp/buildroot/package/x11r7/xcb-util-keysyms/Config.in
index 0c1d8cc4..9ca2e0ef 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-keysyms/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-util-keysyms/Config.in
@@ -2,14 +2,16 @@ config BR2_PACKAGE_XCB_UTIL_KEYSYMS
 	bool "xcb-util-keysyms"
 	select BR2_PACKAGE_LIBXCB
 	help
-	  The XCB util modules provides a number of libraries which sit on top
-	  of libxcb, the core X protocol library, and some of the extension
-	  libraries. These experimental libraries provide convenience functions
-	  and interfaces which make the raw X protocol more usable. Some of the
-	  libraries also provide client-side code which is not strictly part of
-	  the X protocol but which have traditionally been provided by Xlib.
+	  The XCB util modules provides a number of libraries which
+	  sit on top of libxcb, the core X protocol library, and some
+	  of the extension libraries. These experimental libraries
+	  provide convenience functions and interfaces which make the
+	  raw X protocol more usable. Some of the libraries also
+	  provide client-side code which is not strictly part of the X
+	  protocol but which have traditionally been provided by Xlib.
 
-	  XCB util-keysyms module provides the following library: keysyms:
-	  Standard X key constants and conversion to/from keycodes.
+	  XCB util-keysyms module provides the following library:
+	  keysyms: Standard X key constants and conversion to/from
+	  keycodes.
 
 	  http://xcb.freedesktop.org/
diff --git a/bsp/buildroot/package/x11r7/xcb-util-renderutil/Config.in b/bsp/buildroot/package/x11r7/xcb-util-renderutil/Config.in
index 53b2a8c4..088bb18f 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-renderutil/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-util-renderutil/Config.in
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_XCB_UTIL_RENDERUTIL
 	bool "xcb-util-renderutil"
-	select BR2_PACKAGE_XCB_UTIL
 	depends on BR2_PACKAGE_LIBXCB # xcb-util
+	select BR2_PACKAGE_XCB_UTIL
 	help
 	  The XCB util modules provides a number of libraries which
 	  sit on top of libxcb, the core X protocol library, and some
diff --git a/bsp/buildroot/package/x11r7/xcb-util-wm/Config.in b/bsp/buildroot/package/x11r7/xcb-util-wm/Config.in
index 5e7d94e1..26096008 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-wm/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-util-wm/Config.in
@@ -2,12 +2,13 @@ config BR2_PACKAGE_XCB_UTIL_WM
 	bool "xcb-util-wm"
 	select BR2_PACKAGE_LIBXCB
 	help
-	  The XCB util modules provides a number of libraries which sit on top
-	  of libxcb, the core X protocol library, and some of the extension
-	  libraries. These experimental libraries provide convenience functions
-	  and interfaces which make the raw X protocol more usable. Some of the
-	  libraries also provide client-side code which is not strictly part of
-	  the X protocol but which have traditionally been provided by Xlib.
+	  The XCB util modules provides a number of libraries which
+	  sit on top of libxcb, the core X protocol library, and some
+	  of the extension libraries. These experimental libraries
+	  provide convenience functions and interfaces which make the
+	  raw X protocol more usable. Some of the libraries also
+	  provide client-side code which is not strictly part of the X
+	  protocol but which have traditionally been provided by Xlib.
 
 	  XCB util-wm module provides the following libraries:
 	    - ewmh: Both client and window-manager helpers for EWMH.
diff --git a/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.hash b/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.hash
index 45a6c95e..e31228fc 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.hash
+++ b/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.hash
@@ -1,2 +1,4 @@
 # From http://lists.x.org/archives/xorg-announce/2014-February/002401.html
 sha256	28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f	xcb-util-wm-0.4.1.tar.bz2
+# License file, locally calculated
+sha256	12ab3559977a4b22ae3030b90c64a386e6ec51ab0e4eab1ff530f81a2639400a	COPYING
diff --git a/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.mk b/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.mk
index 95aeb22a..37df3fd9 100644
--- a/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.mk
+++ b/bsp/buildroot/package/x11r7/xcb-util-wm/xcb-util-wm.mk
@@ -9,6 +9,7 @@ XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist
 XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2
 XCB_UTIL_WM_INSTALL_STAGING = YES
 XCB_UTIL_WM_LICENSE = MIT
+XCB_UTIL_WM_LICENSE_FILES = COPYING
 XCB_UTIL_WM_DEPENDENCIES = libxcb
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xcb-util/Config.in b/bsp/buildroot/package/x11r7/xcb-util/Config.in
index dd77b1d9..350afd06 100644
--- a/bsp/buildroot/package/x11r7/xcb-util/Config.in
+++ b/bsp/buildroot/package/x11r7/xcb-util/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XCB_UTIL
 	bool "xcb-util"
 	depends on BR2_PACKAGE_LIBXCB
 	help
-	  Libraries which sit on top of libxcb, the core X protocol library,
-	  and some of the extension libraries.
+	  Libraries which sit on top of libxcb, the core X protocol
+	  library, and some of the extension libraries.
 
 	  http://xcb.freedesktop.org/
diff --git a/bsp/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/bsp/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
index 5c6f2d27..ddcc6ac9 100644
--- a/bsp/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
+++ b/bsp/buildroot/package/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk
@@ -7,7 +7,7 @@
 XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1
 XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils
 XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen
-XCURSOR_TRANSPARENT_THEME_LICENSE = GPLv2
+XCURSOR_TRANSPARENT_THEME_LICENSE = GPL-2.0
 XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING
 
 define ICONS_DEFAULT_CONFIG_INSTALL
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in
index 69697ed0..0f2db1bd 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/Config.in
@@ -6,9 +6,9 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
-	  This is an X driver based on libinput. It is a thin wrapper around
-	  libinput, so while it does provide all features that libinput supports
-	  it does little beyond.
+	  This is an X driver based on libinput. It is a thin wrapper
+	  around libinput, so while it does provide all features that
+	  libinput supports it does little beyond.
 
 comment "xf86-input-libinput needs udev /dev management and a toolchain w/ locale"
 	depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
index 0d352949..43b8f78f 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash
@@ -1,2 +1,5 @@
-# From https://lists.x.org/archives/xorg-announce/2017-February/002776.html
-sha256 ddcb07350aed59b2996a92a1b4ff64d1c0b0c86a3f0ddca15b2b1c8c8bb13628  xf86-input-libinput-0.24.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-September/002807.html
+md5 da47ef62eab1d0e922a8fa929ff81758  xf86-input-libinput-0.26.0.tar.bz2
+sha1 3f55b8a5d4ff51d4f0cfe3fe9ace66227193abd4  xf86-input-libinput-0.26.0.tar.bz2
+sha256 abca558fc2226f295691f1cf3412d4c0edeaa439f677ca25b5c9fab310d2387b  xf86-input-libinput-0.26.0.tar.bz2
+sha512 b52a27e916f7e86576500ef2bc3ce640676f5a710543755865a723628c0e01a575989460853bac184ed696961e3f8fca72ecba8ad4625be8cd9e31f9a55f5e97  xf86-input-libinput-0.26.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
index e293b4e8..dab24b12 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.24.0
+XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.26.0
 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch
deleted file mode 100644
index adef18b3..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
-
-Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
----
---- xf86-input-tslib-0.0.6/src/tslib.c	2009-10-19 18:07:18.000000000 +0300
-+++ xf86-input-tslib-0.0.6.new/src/tslib.c	2010-02-12 16:15:05.000000000 +0200
-@@ -103,8 +103,6 @@
- static void
- PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
- {
--	ErrorF("%s\n", __FUNCTION__);
--	return;
- }
- 
- static Bool
-@@ -406,7 +404,9 @@
- 		xf86MotionHistoryAllocate(pInfo);
- #endif
- 
--		break;
-+		if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
-+			return !Success;
-+		break;
- 
- 	case DEVICE_ON:
- 		AddEnabledDevice(pInfo->fd);
-@@ -435,6 +435,7 @@
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
- 	xfree(pInfo->private);
-+	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
- 
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch
deleted file mode 100644
index eb8fb542..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
-Fixes build against newer versions of xorg.
-
-Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
----
-Index: xf86-input-tslib-trunk/src/tslib.c
-===================================================================
---- xf86-input-tslib-trunk/src/tslib.c	(revision 48)
-+++ xf86-input-tslib-trunk/src/tslib.c	(working copy)
-@@ -69,6 +69,13 @@
- #define DEFAULT_HEIGHT		240
- #define DEFAULT_WIDTH		320
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL)
-+#else
-+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options))
-+#endif
-+
-+
- enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 };
- 
- enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 };
-@@ -106,7 +113,7 @@
- }
- 
- static Bool
--ConvertProc( LocalDevicePtr local,
-+ConvertProc( InputInfoPtr local,
- 			 int first,
- 			 int num,
- 			 int v0,
-@@ -135,7 +142,7 @@
-     return t;
- }
- 
--static void ReadInput (LocalDevicePtr local)
-+static void ReadInput (InputInfoPtr local)
- {
- 	struct ts_priv *priv = (struct ts_priv *) (local->private);
- 	struct ts_sample samp;
-@@ -382,7 +389,11 @@
- 					       axiswidth - 1,	/* max val */
- 					       axiswidth,	/* resolution */
- 					       0,		/* min_res */
--					       axiswidth);	/* max_res */
-+					       axiswidth	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		InitValuatorAxisStruct(device, 1,
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-@@ -392,7 +403,11 @@
- 					       axisheight - 1,	/* max val */
- 					       axisheight,	/* resolution */
- 					       0,		/* min_res */
--					       axisheight);	/* max_res */
-+					       axisheight	/* max_res */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+					       ,Absolute
-+#endif
-+					       );
- 
- 		if (InitProximityClassDeviceStruct (device) == FALSE) {
- 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
-@@ -434,7 +449,7 @@
- 	ErrorF("%s\n", __FUNCTION__);
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
--	xfree(pInfo->private);
-+	free(pInfo->private);
- 	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
-@@ -444,47 +459,57 @@
-  *
-  * called when the module subsection is found in XF86Config
-  */
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
-+static int 
-+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-+#else
- static InputInfoPtr
- xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
-+#endif
- {
- 	struct ts_priv *priv;
- 	char *s;
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	InputInfoPtr pInfo;
-+#endif
- 
--	priv = xcalloc (1, sizeof (struct ts_priv));
-+	priv = calloc (1, sizeof (struct ts_priv));
-         if (!priv)
--                return NULL;
-+                return BadValue;
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	if (!(pInfo = xf86AllocateInput(drv, 0))) {
--		xfree(priv);
--		return NULL;
-+		free(priv);
-+		return BadValue;
- 	}
- 
- 	/* Initialise the InputInfoRec. */
- 	pInfo->name = dev->identifier;
--	pInfo->type_name = XI_TOUCHSCREEN;
- 	pInfo->flags =
- 	    XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE |
- 	    XI86_SEND_DRAG_EVENTS;
--	pInfo->device_control = xf86TslibControlProc;
--	pInfo->read_input = ReadInput;
- #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- 	pInfo->motion_history_proc = xf86GetMotionEvents;
- 	pInfo->history_size = 0;
- #endif
--	pInfo->control_proc = NULL;
-+	pInfo->conf_idev = dev;
- 	pInfo->close_proc = NULL;
--	pInfo->switch_mode = NULL;
- 	pInfo->conversion_proc = ConvertProc;
- 	pInfo->reverse_conversion_proc = NULL;
--	pInfo->dev = NULL;
- 	pInfo->private_flags = 0;
- 	pInfo->always_core_feedback = 0;
--	pInfo->conf_idev = dev;
-+#endif
-+
-+	pInfo->type_name = XI_TOUCHSCREEN;
-+	pInfo->control_proc = NULL;
-+	pInfo->read_input = ReadInput;
-+	pInfo->device_control = xf86TslibControlProc;
-+	pInfo->switch_mode = NULL;
- 	pInfo->private = priv;
-+	pInfo->dev = NULL;
- 
- 	/* Collect the options, and process the common options. */
--	xf86CollectInputOptions(pInfo, NULL, NULL);
-+	COLLECT_INPUT_OPTIONS(pInfo, NULL);
- 	xf86ProcessCommonOptions(pInfo, pInfo->options);
- 
- 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
-@@ -510,23 +535,31 @@
- 		priv->rotate = TSLIB_ROTATE_NONE;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
-  	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
-+#else
-+	s = xf86CheckStrOption(pInfo->options, "path", NULL);
-+#endif
-   	if (!s)
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
-+#else
-+		s = xf86CheckStrOption(pInfo->options, "Device", NULL);
-+#endif
-  
- 	priv->ts = ts_open(s, 1);
--	xfree(s);
-+	free(s);
- 
- 	if (!priv->ts) {
- 		ErrorF("ts_open failed (device=%s)\n",s);
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	if (ts_config(priv->ts)) {
- 		ErrorF("ts_config failed\n");
- 		xf86DeleteInput(pInfo, 0);
--		return NULL;
-+		return BadValue;
- 	}
- 
- 	pInfo->fd = ts_fd(priv->ts);
-@@ -536,11 +569,13 @@
- 		priv->state = BUTTON_EMULATION_OFF;
- 	}
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
- 	/* Mark the device configured */
- 	pInfo->flags |= XI86_CONFIGURED;
-+#endif
- 
- 	/* Return the configured device */
--	return (pInfo);
-+	return Success;
- }
- 
- _X_EXPORT InputDriverRec TSLIB = {
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/Config.in
index 9c6e2961..4e77abcb 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/Config.in
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	bool "xf86-input-tslib"
-	depends on !BR2_STATIC_LIBS # tslib
 	select BR2_PACKAGE_XPROTO_INPUTPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
@@ -8,7 +7,4 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	help
 	  Touch screen library input driver
 
-	  http://www.ptxdist.org/software/xf86-input-tslib/index_en.html
-
-comment "xf86-input-tslib needs a toolchain w/ dynamic library"
-	depends on BR2_STATIC_LIBS
+	  https://github.com/merge/xf86-input-tslib
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash
index 9eb3f1de..d2c1d8ed 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash
@@ -1,2 +1,5 @@
-# Locally calculated
-sha256 5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105  xf86-input-tslib-0.0.6.tar.bz2
+# https://github.com/merge/xf86-input-tslib/releases/download/1.1.1/xf86-input-tslib-1.1.1.tar.bz2.sha256
+sha256 8b6a9f2ad73598a3619e66e252bd54b1792c4deba0213101fa4d272b5e9217ec  xf86-input-tslib-1.1.1.tar.bz2
+
+# Locally computed
+sha256  edfc46c9b91499699fc54d39e986756a2dcce8a919c6066be177123441532856  COPYING
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
index cd8c10ad..bf0ee486 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
+XDRIVER_XF86_INPUT_TSLIB_VERSION = 1.1.1
 XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.pengutronix.de/software/xf86-input-tslib/download
+XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releases/download/$(XDRIVER_XF86_INPUT_TSLIB_VERSION)
 XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT
 XDRIVER_XF86_INPUT_TSLIB_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash
index 32ff1646..b5910f3c 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash
@@ -1,2 +1,5 @@
-# From https://lists.x.org/archives/xorg-announce/2016-November/002741.html
-sha256 275b1aac5f127f55ba3d7480a1df89eace1d02650e24e46908067fc875e76c8f  xf86-video-amdgpu-1.2.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-September/002805.html
+md5 15a54f0a7870a57e3f611c9114924137  xf86-video-amdgpu-1.4.0.tar.bz2
+sha1 d9971cc6177095219a6687328aef25a72df3dd9d  xf86-video-amdgpu-1.4.0.tar.bz2
+sha256 f8cac4bf3dd795b93cc337e5c0c62618026f597890a10d996f09c73eb88ba67c  xf86-video-amdgpu-1.4.0.tar.bz2
+sha512 cae6417a45f6b981e007e080486083f1c38eaca58c6e331b04bbf46c86f23394742a722ae0d798d8dcad66879e99d90e57f04ae9ccb198f3ed26ec745878ccc2  xf86-video-amdgpu-1.4.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
index d858e140..50e5310e 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.2.0
+XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.4.0
 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash
index fe5ae0ea..117c5749 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash
@@ -1,2 +1,5 @@
-# From https://lists.x.org/archives/xorg-announce/2016-November/002738.html
-sha256 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa  xf86-video-ati-7.8.0.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-September/002806.html
+md5 0ff538f78ae82ccce384dadf7a705863  xf86-video-ati-7.10.0.tar.bz2
+sha1 38e535ecc8445c1b9464ac34db959337929887f7  xf86-video-ati-7.10.0.tar.bz2
+sha256 ee51d642e3105cb5424f02622dc2966b87b42d498bb34104a70fcf6d4a8f4e79  xf86-video-ati-7.10.0.tar.bz2
+sha512 1f2f4af1d299af62644693e6fbc47a5078c9bc5e7887a1ac217121ef2fd29d8c9f50a8d9be9ddb0887d0b49141bb33484f82c1313a472ad6867266b53b4a11ad  xf86-video-ati-7.10.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index ea701672..f8b8f70c 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_ATI_VERSION = 7.8.0
+XDRIVER_XF86_VIDEO_ATI_VERSION = 7.10.0
 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-geode/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-video-geode/Config.in
index 0b45fb16..fe217b92 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-geode/Config.in
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-geode/Config.in
@@ -1,10 +1,10 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
 	bool "xf86-video-geode"
+	depends on BR2_i386
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
 	select BR2_PACKAGE_XPROTO_VIDEOPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
-	depends on BR2_i386
 	help
 	  video driver for geode device
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/Config.in
deleted file mode 100644
index 413acce0..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLIDE
-	bool "xf86-video-glide"
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	depends on BROKEN # needs glide library from http://glide.sourceforge.net/
-	help
-	  video driver for glide device
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.hash
deleted file mode 100644
index e5b344af..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2013-September/002323.html
-sha256	9eb04477ee559cd114917936916303f4ded95695163fae1cc10058d2a7d94aed	xf86-video-glide-1.2.2.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
deleted file mode 100644
index 35187891..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-glide
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.2.2
-XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_GLIDE_LICENSE = MIT
-XDRIVER_XF86_VIDEO_GLIDE_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
-
-$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch
deleted file mode 100644
index 2117e725..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 69a92f4576a1e789ba2fcf957164d2c4013020c5 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Wed, 2 Dec 2015 13:36:25 +0000
-Subject: [PATCH] Stop using Git to write local version
-Organization: O.S. Systems Software LTDA.
-
-The standard version does not use a Git repository so we should not
-use Git to identify the commit of the build as it can end getting the
-version from a wrong repository and can be misleading.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-[Downloaded from
-https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch]
-Signed-off-by: Andrew Webster <awebster@arcx.com>
----
- EXA/src/makefile.tc         | 6 +++---
- FslExt/src/makefile.tc      | 6 +++---
- util/autohdmi/makefile.tc   | 6 +++---
- util/pandisplay/makefile.tc | 6 +++---
- 4 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/EXA/src/makefile.tc b/EXA/src/makefile.tc
-index 0b9a9e6..ec6e68d 100644
---- a/EXA/src/makefile.tc
-+++ b/EXA/src/makefile.tc
-@@ -52,8 +52,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/FslExt/src/makefile.tc b/FslExt/src/makefile.tc
-index 0b9a9e6..ec6e68d 100644
---- a/FslExt/src/makefile.tc
-+++ b/FslExt/src/makefile.tc
-@@ -52,8 +52,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/util/autohdmi/makefile.tc b/util/autohdmi/makefile.tc
-index c9de0a6..d0a468c 100644
---- a/util/autohdmi/makefile.tc
-+++ b/util/autohdmi/makefile.tc
-@@ -64,8 +64,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
-diff --git a/util/pandisplay/makefile.tc b/util/pandisplay/makefile.tc
-index 28732b9..bf54c20 100644
---- a/util/pandisplay/makefile.tc
-+++ b/util/pandisplay/makefile.tc
-@@ -64,8 +64,8 @@ prefix ?= /usr
- sysroot ?= /
- 
- # get git commit number
--COMMITNR := `git log -n 1 --format=%H`
--DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
--LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
-+#COMMITNR := `git log -n 1 --format=%H`
-+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'`
-+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}"
- 
- 
--- 
-2.1.4
-
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
index fb64d065..5a025730 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
 	bool "xf86-video-imx-viv"
 	depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
+	depends on BR2_PACKAGE_IMX_GPU_G2D
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
 	select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri
 	select BR2_PACKAGE_MESA3D_DRI_DRIVER
@@ -10,9 +11,10 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
 	help
 	  X.Org driver for iMX6 GPU (Vivante)
 
-	  Notice EGL and GLes2 APIs are correctly supported. This driver should
-	  also be able to provide Desktop OpenGL implementation but, this
-	  feature seems broken since quite some time.
+	  Notice EGL and GLes2 APIs are correctly supported. This
+	  driver should also be able to provide Desktop OpenGL
+	  implementation but, this feature seems broken since quite
+	  some time.
 
 	  To use this driver, add correct configuration to your
 	  /etc/X11/xorg.conf:
@@ -23,11 +25,17 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
 	    Option          "vivante_fbdev" "/dev/fbX"
 	  EndSection
 
-	  Don't forget to load galcore.ko and create /dev/galcore before using
-	  this driver (else, Xorg will exit with an obscur message like
-	  "Segmentation fault at address 0xc").
+	  Don't forget to load galcore.ko and create /dev/galcore
+	  before using this driver (else, Xorg will exit with an
+	  obscur message like "Segmentation fault at address 0xc").
 
 comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output"
 	depends on BR2_arm
 	depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
+
+comment "xf86-video-imx-viv depends on imx-gpu-g2d"
+	depends on BR2_arm
+	depends on !BR2_PACKAGE_IMX_GPU_G2D
+	depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
+	depends on BR2_TOOLCHAIN_HAS_SYNC_1
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
index 7d7da84e..be41cb09 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash
@@ -1 +1 @@
-sha256	3eed38193e31bb5ba8d2c817bd9b4f6e2fe7540d2cab36de9098cb4f11946a9f  xserver-xorg-video-imx-viv-5.0.11.p8.6.tar.gz
+sha256	61b3a7a22f80d1cbc797c329615e1699f3906c9261de7eabcf0de2bf2399de55  xdriver_xf86-video-imx-viv-rel_imx_4.9.x_1.0.0_ga.tar.gz
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
index 2a3e9974..222d74ac 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 5.0.11.p8.6
-XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE)
-XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz
-XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \
+XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga
+XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante
+XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git
+XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \
 	xproto_xproto xproto_xf86driproto libdrm
 XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT
 XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT
@@ -17,7 +17,7 @@ XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)
 define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS
 	$(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \
 		BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \
-		CFLAGS="$(TARGET_CFLAGS) -I$(@D)/DRI_1.10.4/src"
+		CFLAGS="$(TARGET_CFLAGS)"
 endef
 
 define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS
@@ -33,4 +33,3 @@ define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index 29228bbf..6debdd09 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 9ac7a3370ab265d4cbdbbf3dc588af88c37048e1
+XDRIVER_XF86_VIDEO_INTEL_VERSION = b57abe20e81f4b8e4dd203b6a9eda7ff441bc8ce
 XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
 XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
 XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
@@ -19,7 +19,6 @@ XDRIVER_XF86_VIDEO_INTEL_CONF_ENV = \
 XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS = \
 	--disable-xvmc \
 	--enable-sna \
-	--disable-glamor \
 	--disable-xaa \
 	--disable-dga \
 	--disable-async-swap
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
index cfba3a00..5b69e4e2 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash
@@ -1,4 +1,4 @@
-# Locally computed
-sha256 6d9242ba139c3df7afefffb455573b52f4427920b978161c00483c64a6da47cb  xf86-video-nouveau-1.0.13.tar.bz2
-# From http://www.linuxfromscratch.org/blfs/view/svn/x/x7driver.html#xorg-nouveau-driver
-md5 2d7b2917ef18c6e97a6f3817c3e9387b  xf86-video-nouveau-1.0.13.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-April/002796.html
+md5 717203cb87029cddcbccf7398f9ad8c3  xf86-video-nouveau-1.0.15.tar.bz2
+sha1 ed699a59ea509550f60019eef1e092ed0ccdea08  xf86-video-nouveau-1.0.15.tar.bz2
+sha256 aede10fd395610a328697adca3434fb14e9afbd79911d6c8545cfa2c0e541d4c  xf86-video-nouveau-1.0.15.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
index 70a7d879..e3969a26 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.13
+XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.15
 XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2
 XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index c970b9e2..02723eca 100644
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/bsp/buildroot/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -12,8 +12,8 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
 	select BR2_PACKAGE_XPROTO_XF86DRIPROTO
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
-	  Openchrome, A free and Open Source video driver for the VIA/S3G
-	  UniChrome and UniChrome Pro graphics chipsets.
+	  Openchrome, A free and Open Source video driver for the
+	  VIA/S3G UniChrome and UniChrome Pro graphics chipsets.
 
 	  https://www.freedesktop.org/wiki/Openchrome/
 
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/Config.in
deleted file mode 100644
index 27ffd871..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_V4L
-	bool "xf86-video-v4l"
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_VIDEOPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	depends on BROKEN # Fails to build with xorg xserver >= 1.17
-	help
-	  video4linux driver
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.hash
deleted file mode 100644
index c4bcfadc..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2008-March/000504.html
-sha1	7f2212c529a5bcc34f67858a9d0167a0d4848aaa	xf86-video-v4l-0.2.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
deleted file mode 100644
index 607b605f..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-v4l
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0
-XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_V4L_LICENSE = MIT
-XDRIVER_XF86_VIDEO_V4L_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto
-
-$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/Config.in b/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/Config.in
deleted file mode 100644
index 968ee10c..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_XDRIVER_XF86_VIDEO_WSFB
-	bool "xf86-video-wsfb"
-	select BR2_PACKAGE_XPROTO_FONTSPROTO
-	select BR2_PACKAGE_XPROTO_RANDRPROTO
-	select BR2_PACKAGE_XPROTO_RENDERPROTO
-	select BR2_PACKAGE_XPROTO_XEXTPROTO
-	select BR2_PACKAGE_XPROTO_XPROTO
-	depends on BROKEN # Fails to build. Actually this is OpenBSD/NetBSD stuff.
-	help
-	  WSFB based chips video driver
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.hash b/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.hash
deleted file mode 100644
index 1258b719..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2012-January/001786.html
-sha256	975ce3e5a063168ec6fe8f3fac50c30d0fae6cc6d81dc260f00bb4cb4f1a2843	xf86-video-wsfb-0.4.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
deleted file mode 100644
index c2d7d4df..00000000
--- a/bsp/buildroot/package/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-################################################################################
-#
-# xdriver_xf86-video-wsfb
-#
-################################################################################
-
-XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.4.0
-XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2
-XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver
-XDRIVER_XF86_VIDEO_WSFB_LICENSE = MIT
-XDRIVER_XF86_VIDEO_WSFB_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
-
-$(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
index 85a6884a..9f018386 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/f
 XFONT_FONT_ADOBE_100DPI_LICENSE = MIT
 XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
index bb0a1843..1a8af2bd 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_ADOBE_75DPI_LICENSE = MIT
 XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
index 390ca678..4ff89f6b 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/indiv
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
index 7ecd46ef..61005f79 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ADOBE_UTOPIA_75DPI_SITE = http://xorg.freedesktop.org/releases/indivi
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
index 6c780e20..9264eaf4 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/indivi
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed)
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk b/bsp/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk
index e2ac2363..f6b3008a 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-alias/xfont_font-alias.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ALIAS_LICENSE = MIT
 XFONT_FONT_ALIAS_LICENSE_FILES = COPYING
 
-XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
index fa1269b4..0043a00c 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_ARABIC_MISC_LICENSE = MIT
 XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
index fb166589..91972727 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
index c8ade590..62bee420 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
index a1b61db4..0f039a1d 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/release
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
index 00a6bd6d..892f9eea 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/bsp/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
index f393dd32..f4fcde9c 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BH_TTF_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/bsp/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
index bf418d52..f5e6e892 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BH_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification)
 XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
index 5ddca73e..931058f7 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individu
 XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT
 XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/bsp/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
index d7fea275..9e775243 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT
 XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING
 
-XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/bsp/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
index 813e3cb5..a4d4f73c 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk
@@ -10,8 +10,8 @@ XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT
 XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/bsp/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
index 6dc90152..83ded01e 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk
@@ -10,8 +10,8 @@ XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT
 XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
index 59d6a840..00867a6f 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered
 XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
index 59a84c70..f33088eb 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk
@@ -9,8 +9,8 @@ XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSIO
 XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
index b26296d2..fd7e2865 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_DEC_MISC_LICENSE = MIT
 XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/bsp/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
index 6cec1986..045a6bfe 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk
@@ -10,8 +10,8 @@ XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification)
 XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
index 4ac4b9b1..7ca1388e 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_ISAS_MISC_LICENSE = MIT
 XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
index 5f8b0016..12cf8c86 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk
@@ -9,8 +9,8 @@ XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz
 XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
index 11b4199e..ea119b63 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/fon
 XFONT_FONT_MICRO_MISC_LICENSE = Public Domain
 XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/bsp/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
index 16fd46b0..d72f9885 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk
@@ -10,8 +10,8 @@ XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/
 XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain
 XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/bsp/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
index 7d0825ee..8214040f 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk
@@ -10,8 +10,8 @@ XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/
 XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT
 XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/bsp/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
index 56678699..1b801df6 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk
@@ -10,8 +10,8 @@ XFONT_FONT_MISC_MELTHO_SITE = http://xorg.freedesktop.org/releases/individual/fo
 XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License
 XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
index 700837c1..f9e1ba64 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MISC_MISC_LICENSE = Public Domain
 XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
index 53fc192a..1312e379 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_MUTT_MISC_LICENSE = MIT
 XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
index 0fa4d396..65256ad9 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT
 XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/bsp/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
index 8158ce56..5687fd66 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk
@@ -10,8 +10,8 @@ XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individua
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT
 XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
index 035255f7..f13fca5d 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SONY_MISC_LICENSE = MIT
 XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/bsp/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
index 395cb87e..4b1a06c0 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk
@@ -10,8 +10,8 @@ XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font
 XFONT_FONT_SUN_MISC_LICENSE = MIT
 XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING
 
-XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-util/xfont_font-util.mk b/bsp/buildroot/package/x11r7/xfont_font-util/xfont_font-util.mk
index 36853770..89b138b6 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-util/xfont_font-util.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-util/xfont_font-util.mk
@@ -7,7 +7,7 @@
 XFONT_FONT_UTIL_VERSION = 1.3.1
 XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2
 XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font
-XFONT_FONT_UTIL_LICENSE = MIT/BSD-2c
+XFONT_FONT_UTIL_LICENSE = MIT/BSD-2-Clause
 XFONT_FONT_UTIL_LICENSE_FILES = COPYING
 
 XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf
diff --git a/bsp/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/bsp/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
index 665fb908..f8945227 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk
@@ -10,8 +10,8 @@ XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individ
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain
 XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING
 
-XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/bsp/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
index e1a2ef60..5aced630 100644
--- a/bsp/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
+++ b/bsp/buildroot/package/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk
@@ -10,8 +10,8 @@ XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/
 XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT
 XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING
 
-XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install
-XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data
+XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install
+XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/bin/mkfontdir install-data
 XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash b/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash
index 104a5aba..a0f781d8 100644
--- a/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash
+++ b/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.hash
@@ -1,2 +1,4 @@
-# From https://lists.x.org/archives/xorg-announce/2017-February/002775.html
-sha256 d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134  xkeyboard-config-2.20.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-October/002811.html
+md5 eb61fb3fd419e817df572b0c8d94a883  xkeyboard-config-2.22.tar.bz2
+sha1 1e252098685afc3e802c98f3fd70d683654a13ab  xkeyboard-config-2.22.tar.bz2
+sha256 deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd  xkeyboard-config-2.22.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk b/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk
index bdaf0268..ae88db78 100644
--- a/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk
+++ b/bsp/buildroot/package/x11r7/xkeyboard-config/xkeyboard-config.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XKEYBOARD_CONFIG_VERSION = 2.20
+XKEYBOARD_CONFIG_VERSION = 2.22
 XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2
 XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config
 XKEYBOARD_CONFIG_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash b/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash
index aeb0e9d7..b1a87b18 100644
--- a/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash
+++ b/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.hash
@@ -1,2 +1,2 @@
-# From https://lists.x.org/archives/xorg-announce/2016-October/002721.html
-sha256 b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441  libX11-1.6.4.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-February/002777.html
+sha256 4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d  libX11-1.6.5.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk b/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk
index 80e89b48..64344da7 100644
--- a/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/bsp/buildroot/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-XLIB_LIBX11_VERSION = 1.6.4
+XLIB_LIBX11_VERSION = 1.6.5
 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2
-XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib
 XLIB_LIBX11_LICENSE = MIT
 XLIB_LIBX11_LICENSE_FILES = COPYING
 XLIB_LIBX11_INSTALL_STAGING = YES
@@ -48,7 +48,7 @@ HOST_XLIB_LIBX11_CONF_OPTS = \
 # src/util/makekeys is executed at build time to generate ks_tables.h, so
 # it should get compiled for the host. The libX11 makefile unfortunately
 # doesn't have X11_CFLAGS_FOR_BUILD so this doesn't work.  For buildroot,
-# we know the X11 includes are in $(HOST_DIR)/usr/include, which are already
+# we know the X11 includes are in $(HOST_DIR)/include, which are already
 # in the CFLAGS_FOR_BUILD, so we can just remove the X11_CFLAGS
 define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS
 	$(SED) '/X11_CFLAGS/d' $(@D)/src/util/Makefile*
diff --git a/bsp/buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/bsp/buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 30163eec..420bbd1d 100644
--- a/bsp/buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/bsp/buildroot/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -9,7 +9,6 @@ XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2
 XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFONT_LICENSE = MIT
 XLIB_LIBXFONT_LICENSE_FILES = COPYING
-XLIB_LIBXFONT_AUTORECONF = YES
 XLIB_LIBXFONT_INSTALL_STAGING = YES
 
 XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
diff --git a/bsp/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk b/bsp/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk
index de9b4709..73fe6bb6 100644
--- a/bsp/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/bsp/buildroot/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -9,7 +9,6 @@ XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2
 XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXFT_LICENSE = MIT
 XLIB_LIBXFT_LICENSE_FILES = COPYING
-XLIB_LIBXFT_AUTORECONF = YES
 XLIB_LIBXFT_INSTALL_STAGING = YES
 XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
 
diff --git a/bsp/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/bsp/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index c8c54965..09f897ea 100644
--- a/bsp/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/bsp/buildroot/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -13,8 +13,11 @@ XLIB_LIBXPM_INSTALL_STAGING = YES
 # we patch configure.ac
 XLIB_LIBXPM_AUTORECONF = YES
 XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) \
 	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
-	host-gettext
+	$(TARGET_NLS_DEPENDENCIES)
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
+XLIB_LIBXPM_CONF_ENV = ac_cv_search_gettext=no
+endif
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash b/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash
index 063df8e9..12a03518 100644
--- a/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash
+++ b/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.hash
@@ -1,2 +1,5 @@
-# From http://lists.x.org/archives/xorg-announce/2013-May/002233.html
-sha256	26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5	libXres-1.0.7.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-October/002812.html
+md5 5d6d443d1abc8e1f6fc1c57fb27729bb  libXres-1.2.0.tar.bz2
+sha1 b6996ab05460a3b7311f02da23ddf117a5442fd9  libXres-1.2.0.tar.bz2
+sha256 ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4  libXres-1.2.0.tar.bz2
+sha512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172  libXres-1.2.0.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk b/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk
index 853f5420..0075e8f6 100644
--- a/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/bsp/buildroot/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XLIB_LIBXRES_VERSION = 1.0.7
+XLIB_LIBXRES_VERSION = 1.2.0
 XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2
 XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
 XLIB_LIBXRES_LICENSE = MIT
diff --git a/bsp/buildroot/package/x11r7/xlib_libxshmfence/Config.in b/bsp/buildroot/package/x11r7/xlib_libxshmfence/Config.in
index d0595f6d..d4e87b3e 100644
--- a/bsp/buildroot/package/x11r7/xlib_libxshmfence/Config.in
+++ b/bsp/buildroot/package/x11r7/xlib_libxshmfence/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XLIB_LIBXSHMFENCE
 	bool "libxshmfence"
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	select BR2_PACKAGE_XPROTO_XPROTO
 	help
 	  X.Org shmfence library
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.5/0001-modesettings-needs-dri2.patch b/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0001-modesettings-needs-dri2.patch
similarity index 100%
rename from bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.5/0001-modesettings-needs-dri2.patch
rename to bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0001-modesettings-needs-dri2.patch
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.5/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
similarity index 100%
rename from bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.5/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
rename to bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.5/0003-Remove-check-for-useSIGIO-option.patch b/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0003-Remove-check-for-useSIGIO-option.patch
similarity index 100%
rename from bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.5/0003-Remove-check-for-useSIGIO-option.patch
rename to bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0003-Remove-check-for-useSIGIO-option.patch
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch b/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch
new file mode 100644
index 00000000..93be91ae
--- /dev/null
+++ b/bsp/buildroot/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch
@@ -0,0 +1,31 @@
+From d16133e3e293fe16b291114d344fbd5a61d5ed65 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date: Thu, 20 Jul 2017 19:48:26 -0700
+Subject: [PATCH] glx: Only include compositeext.h if COMPOSITE is
+ supported
+
+Regressed-in: ea483af99a6351323afe00a0b630cd63310efdb1
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ glx/glxscreens.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/glx/glxscreens.c b/glx/glxscreens.c
+index 78e0aaff9..609661274 100644
+--- a/glx/glxscreens.c
++++ b/glx/glxscreens.c
+@@ -43,7 +43,10 @@
+ #include "glxutil.h"
+ #include "glxext.h"
+ #include "protocol-versions.h"
++
++#ifdef COMPOSITE
+ #include "compositeext.h"
++#endif
+ 
+ static DevPrivateKeyRec glxScreenPrivateKeyRec;
+ 
+-- 
+2.11.0
+
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/Config.in b/bsp/buildroot/package/x11r7/xserver_xorg-server/Config.in
index 787c9d7d..3107e2c1 100644
--- a/bsp/buildroot/package/x11r7/xserver_xorg-server/Config.in
+++ b/bsp/buildroot/package/x11r7/xserver_xorg-server/Config.in
@@ -79,7 +79,7 @@ choice
 	bool "X Window System server version"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
-	bool "1.19.5"
+	bool "1.19.6"
 	select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
 	select BR2_PACKAGE_XLIB_LIBXFONT2
 	select BR2_PACKAGE_XPROTO_PRESENTPROTO
@@ -99,7 +99,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
 	string
-	default "1.19.5" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+	default "1.19.6" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
 	default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
 	default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
@@ -114,7 +114,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
 		BR2_PACKAGE_XPROTO_DRI2PROTO)
 	select BR2_PACKAGE_LIBPCIACCESS
-	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
+	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
+		(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
 	help
 	  This variant of the X.org server is the full-blown variant,
 	  as used by desktop GNU/Linux distributions. The drivers (for
@@ -155,7 +156,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
 	  This driver can then be enabled by running the X server
 	  using:
 
-	  Xfbdev -keybd evdev,,device=/dev/input/eventX -mouse evdev,,device=/dev/input/eventY.
+	  Xfbdev -keybd evdev,,device=/dev/input/eventX
+	         -mouse evdev,,device=/dev/input/eventY
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
 	bool "Enable KDrive/TinyX kbd input driver"
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index c0feb985..10285abf 100644
--- a/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -3,8 +3,8 @@ sha1   7a95765e56b124758fcd7b609589e65b8870880b                                x
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
 sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
-# From https://lists.x.org/archives/xorg-announce/2017-October/002814.html
-md5 4ac6feeae6790436ce9de879ca9a3bf8  xorg-server-1.19.5.tar.bz2
-sha1 307d3405f709f7e41966c850b37deefe7f83eb9b  xorg-server-1.19.5.tar.bz2
-sha256 18fffa8eb93d06d2800d06321fc0df4d357684d8d714315a66d8dfa7df251447  xorg-server-1.19.5.tar.bz2
-sha512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c  xorg-server-1.19.5.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2017-December/002830.html
+md5 3e47777ff034a331aed2322b078694a8  xorg-server-1.19.6.tar.bz2
+sha1 2dd560ac49bdbda7f67166546af43541fabf517f  xorg-server-1.19.6.tar.bz2
+sha256 a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197  xorg-server-1.19.6.tar.bz2
+sha512 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412  xorg-server-1.19.6.tar.bz2
diff --git a/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 4404de83..45a2c81f 100644
--- a/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/bsp/buildroot/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -12,47 +12,47 @@ XSERVER_XORG_SERVER_LICENSE_FILES = COPYING
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 # xfont_font-util is needed only for autoreconf
 XSERVER_XORG_SERVER_AUTORECONF = YES
-XSERVER_XORG_SERVER_DEPENDENCIES = 	\
-	xfont_font-util			\
-	xutil_util-macros 		\
-	xlib_libX11 			\
-	xlib_libXau 			\
-	xlib_libXdmcp 			\
-	xlib_libXext 			\
-	xlib_libXfixes 			\
-	xlib_libXi 			\
-	xlib_libXrender 		\
-	xlib_libXres 			\
-	xlib_libXft 			\
-	xlib_libXcursor 		\
-	xlib_libXinerama 		\
-	xlib_libXrandr 			\
-	xlib_libXdamage 		\
-	xlib_libXxf86vm 		\
-	xlib_libxkbfile 		\
-	xlib_xtrans 			\
-	xdata_xbitmaps 			\
-	xproto_bigreqsproto 		\
-	xproto_compositeproto 		\
-	xproto_damageproto 		\
-	xproto_fixesproto 		\
-	xproto_fontsproto 		\
-	xproto_glproto 			\
-	xproto_inputproto 		\
-	xproto_kbproto 			\
-	xproto_randrproto 		\
-	xproto_renderproto 		\
-	xproto_resourceproto 		\
-	xproto_videoproto 		\
-	xproto_xcmiscproto 		\
-	xproto_xextproto 		\
-	xproto_xf86bigfontproto 	\
-	xproto_xf86dgaproto 		\
-	xproto_xf86vidmodeproto 	\
-	xproto_xproto 			\
-	xkeyboard-config		\
-	pixman 				\
-	mcookie 			\
+XSERVER_XORG_SERVER_DEPENDENCIES = \
+	xfont_font-util \
+	xutil_util-macros \
+	xlib_libX11 \
+	xlib_libXau \
+	xlib_libXdmcp \
+	xlib_libXext \
+	xlib_libXfixes \
+	xlib_libXi \
+	xlib_libXrender \
+	xlib_libXres \
+	xlib_libXft \
+	xlib_libXcursor \
+	xlib_libXinerama \
+	xlib_libXrandr \
+	xlib_libXdamage \
+	xlib_libXxf86vm \
+	xlib_libxkbfile \
+	xlib_xtrans \
+	xdata_xbitmaps \
+	xproto_bigreqsproto \
+	xproto_compositeproto \
+	xproto_damageproto \
+	xproto_fixesproto \
+	xproto_fontsproto \
+	xproto_glproto \
+	xproto_inputproto \
+	xproto_kbproto \
+	xproto_randrproto \
+	xproto_renderproto \
+	xproto_resourceproto \
+	xproto_videoproto \
+	xproto_xcmiscproto \
+	xproto_xextproto \
+	xproto_xf86bigfontproto \
+	xproto_xf86dgaproto \
+	xproto_xf86vidmodeproto \
+	xproto_xproto \
+	xkeyboard-config \
+	pixman \
+	mcookie \
 	host-pkgconf
 
 # We force -O2 regardless of the optimization level chosen by the
@@ -220,7 +220,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2
 endif
-ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
+ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
 XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
diff --git a/bsp/buildroot/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch b/bsp/buildroot/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch
new file mode 100644
index 00000000..31b5cfed
--- /dev/null
+++ b/bsp/buildroot/package/x11vnc/0001-Fix-compiler-detection-when-using-without-crypt-cryp.patch
@@ -0,0 +1,27 @@
+From d6919c0be7f531b20cbfcb9929d697ac3c132c40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <github@kempniu.pl>
+Date: Wed, 12 Oct 2016 15:17:51 +0200
+Subject: [PATCH] Fix compiler detection when using
+ --without-{crypt,crypto,ssl}
+
+(cherry picked from commit d6919c0be7f531b20cbfcb9929d697ac3c132c40)
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 55724bc..bdfff94 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ 
++AC_PROG_CC
+ AC_PROG_SED
+ 
+ # some OS's need both -lssl and -lcrypto on link line:
+-- 
+2.9.3
+
diff --git a/bsp/buildroot/package/x11vnc/Config.in b/bsp/buildroot/package/x11vnc/Config.in
index 0909b9ae..9e91a11a 100644
--- a/bsp/buildroot/package/x11vnc/Config.in
+++ b/bsp/buildroot/package/x11vnc/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_X11VNC
 	bool "x11vnc"
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU # fork()
+	depends on !BR2_nios2 # libvncserver
+	select BR2_PACKAGE_LIBVNCSERVER
 	select BR2_PACKAGE_XLIB_LIBXT
 	select BR2_PACKAGE_XLIB_LIBXEXT
 	select BR2_PACKAGE_XLIB_LIBXTST
diff --git a/bsp/buildroot/package/x11vnc/x11vnc.hash b/bsp/buildroot/package/x11vnc/x11vnc.hash
index 5828b12c..3cdbfa1b 100644
--- a/bsp/buildroot/package/x11vnc/x11vnc.hash
+++ b/bsp/buildroot/package/x11vnc/x11vnc.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256  f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b  x11vnc-0.9.13.tar.gz
+sha256  45f87c5e4382988c73e8c7891ac2bfb45d8f9ce1196ae06651c84636684ea143  x11vnc-0.9.14.tar.gz
diff --git a/bsp/buildroot/package/x11vnc/x11vnc.mk b/bsp/buildroot/package/x11vnc/x11vnc.mk
index cdb32378..f1f4da21 100644
--- a/bsp/buildroot/package/x11vnc/x11vnc.mk
+++ b/bsp/buildroot/package/x11vnc/x11vnc.mk
@@ -4,15 +4,18 @@
 #
 ################################################################################
 
-X11VNC_VERSION = 0.9.13
-X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION)
+X11VNC_VERSION = 0.9.14
+X11VNC_SITE = $(call github,LibVNC,x11vnc,$(X11VNC_VERSION))
 # sdl support is not used in x11vnc, but host include / library search paths
 # leak in if host has sdl-config
 X11VNC_CONF_OPTS = --without-sdl
-X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
-X11VNC_LICENSE = GPLv2+
+X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst libvncserver
+X11VNC_LICENSE = GPL-2.0+
 X11VNC_LICENSE_FILES = COPYING
 
+# Source coming from github, no configure included
+X11VNC_AUTORECONF = YES
+
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
 X11VNC_DEPENDENCIES += avahi dbus
 else
@@ -61,5 +64,4 @@ else
 X11VNC_CONF_OPTS += --without-zlib
 endif
 
-
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/x264/x264.hash b/bsp/buildroot/package/x264/x264.hash
index 95510938..f0e9f1b8 100644
--- a/bsp/buildroot/package/x264/x264.hash
+++ b/bsp/buildroot/package/x264/x264.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 9fc4651981453d0428a2ad16889b6b63d1f2e7347ea321f20347fc3a021ee912  x264-97eaef2ab82a46d13ea5e00270712d6475fbe42b.tar.gz
+sha256 986863122b0b3ac2c1fa27c6e3932c3490b84287335fa162bca020aa815aa695  x264-ba24899b0bf23345921da022f7a51e0c57dbe73d.tar.gz
diff --git a/bsp/buildroot/package/x264/x264.mk b/bsp/buildroot/package/x264/x264.mk
index 307bf6c2..e14077a2 100644
--- a/bsp/buildroot/package/x264/x264.mk
+++ b/bsp/buildroot/package/x264/x264.mk
@@ -4,18 +4,18 @@
 #
 ################################################################################
 
-X264_VERSION = 97eaef2ab82a46d13ea5e00270712d6475fbe42b
+X264_VERSION = ba24899b0bf23345921da022f7a51e0c57dbe73d
 X264_SITE = git://git.videolan.org/x264.git
-X264_LICENSE = GPLv2+
+X264_LICENSE = GPL-2.0+
 X264_DEPENDENCIES = host-pkgconf
 X264_LICENSE_FILES = COPYING
 X264_INSTALL_STAGING = YES
 X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
-# yasm needed for assembly files
-X264_DEPENDENCIES += host-yasm
-X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm"
+# nasm needed for assembly files
+X264_DEPENDENCIES += host-nasm
+X264_CONF_ENV += AS="$(HOST_DIR)/bin/nasm"
 else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
 # We need to pass gcc as AS, because the ARM assembly files have to be
 # preprocessed
@@ -36,6 +36,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
 X264_CONF_OPTS += --disable-thread
 endif
 
+# Even though the configure script is not generated by autoconf, x264
+# uses config.sub/config.guess, so we want up-to-date versions of
+# them.
+X264_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
+
 # the configure script is not generated by autoconf
 define X264_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \
diff --git a/bsp/buildroot/package/x265/Config.in b/bsp/buildroot/package/x265/Config.in
index 1d6eda20..cc39d6c6 100644
--- a/bsp/buildroot/package/x265/Config.in
+++ b/bsp/buildroot/package/x265/Config.in
@@ -5,10 +5,11 @@ config BR2_PACKAGE_X265
 	depends on !BR2_STATIC_LIBS # dlfcn
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	help
-	  x265 is an open source free software and library for encoding video
-	  using the High Efficiency Video Coding (HEVC/H.265) standard. x265 is
-	  offered under either the GNU General Public License (GPL) 2 license or
-	  a commercial license, similar to the x264 project.
+	  x265 is an open source free software and library for
+	  encoding video using the High Efficiency Video Coding
+	  (HEVC/H.265) standard. x265 is offered under either the GNU
+	  General Public License (GPL) 2 license or a commercial
+	  license, similar to the x264 project.
 
 	  http://x265.org
 
diff --git a/bsp/buildroot/package/x265/x265.hash b/bsp/buildroot/package/x265/x265.hash
index 5672d79e..3e44b036 100644
--- a/bsp/buildroot/package/x265/x265.hash
+++ b/bsp/buildroot/package/x265/x265.hash
@@ -1,2 +1,2 @@
 # Locally generated
-sha256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b  x265_2.2.tar.gz
+sha256 2e53259b504a7edb9b21b9800163b1ff4c90e60c74e23e7001d423c69c5d3d17  x265_2.5.tar.gz
diff --git a/bsp/buildroot/package/x265/x265.mk b/bsp/buildroot/package/x265/x265.mk
index 8ffec80a..86709e62 100644
--- a/bsp/buildroot/package/x265/x265.mk
+++ b/bsp/buildroot/package/x265/x265.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-X265_VERSION = 2.2
+X265_VERSION = 2.5
 X265_SOURCE = x265_$(X265_VERSION).tar.gz
 X265_SITE = https://bitbucket.org/multicoreware/x265/downloads
-X265_LICENSE = GPLv2+
+X265_LICENSE = GPL-2.0+
 X265_LICENSE_FILES = COPYING
 X265_SUBDIR = source
 X265_INSTALL_STAGING = YES
+X265_MAKE = $(MAKE1)
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 X265_DEPENDENCIES += host-yasm
diff --git a/bsp/buildroot/package/xavante/Config.in b/bsp/buildroot/package/xavante/Config.in
index be8e6d90..d66ca1f0 100644
--- a/bsp/buildroot/package/xavante/Config.in
+++ b/bsp/buildroot/package/xavante/Config.in
@@ -1,14 +1,14 @@
 config BR2_PACKAGE_XAVANTE
 	bool "xavante"
 	# Runtime dependency only
-	select BR2_PACKAGE_CGILUA
 	select BR2_PACKAGE_COPAS
-	select BR2_PACKAGE_COXPCALL
 	select BR2_PACKAGE_LUAFILESYSTEM
 	select BR2_PACKAGE_LUASOCKET
-	select BR2_PACKAGE_WSAPI
 	help
 	  Xavante is a Lua HTTP 1.1 Web server that uses a modular
-	  architecture based on URI mapped handlers.
+	  architecture based on URI mapped handlers. Xavante currently
+	  offers a file handler, a redirect handler and a WSAPI handler.
+	  Those are used for general files, URI remapping and WSAPI
+	  applications respectively.
 
 	  http://keplerproject.github.com/xavante/
diff --git a/bsp/buildroot/package/xavante/xavante.hash b/bsp/buildroot/package/xavante/xavante.hash
index d960c2d0..09b2a22d 100644
--- a/bsp/buildroot/package/xavante/xavante.hash
+++ b/bsp/buildroot/package/xavante/xavante.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	d683bebdb3e1b497dc04ceb3fb8f1c8c67a6486ab0c6da0c23f281cc07a63657  xavante-2.3.0-1.src.rock
+sha256 67c738f981e7d65d18c717f3acac59a37f95d5139c00fb0de5d3167262025273  xavante-2.4.0-1.src.rock
diff --git a/bsp/buildroot/package/xavante/xavante.mk b/bsp/buildroot/package/xavante/xavante.mk
index 07f9ee6f..d962e7bc 100644
--- a/bsp/buildroot/package/xavante/xavante.mk
+++ b/bsp/buildroot/package/xavante/xavante.mk
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-XAVANTE_VERSION = 2.3.0-1
+XAVANTE_VERSION = 2.4.0-1
 XAVANTE_LICENSE = MIT
+XAVANTE_LICENSE_FILES = $(XAVANTE_SUBDIR)/doc/us/license.html
 
 $(eval $(luarocks-package))
diff --git a/bsp/buildroot/package/xdotool/xdotool.mk b/bsp/buildroot/package/xdotool/xdotool.mk
index a799ea47..c18885c5 100644
--- a/bsp/buildroot/package/xdotool/xdotool.mk
+++ b/bsp/buildroot/package/xdotool/xdotool.mk
@@ -6,7 +6,7 @@
 
 XDOTOOL_VERSION = v3.20150503.1
 XDOTOOL_SITE = $(call github,jordansissel,xdotool,$(XDOTOOL_VERSION))
-XDOTOOL_LICENSE = BSD-3c
+XDOTOOL_LICENSE = BSD-3-Clause
 XDOTOOL_LICENSE_FILES = COPYRIGHT
 XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11
 
diff --git a/bsp/buildroot/package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch b/bsp/buildroot/package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch
deleted file mode 100644
index ca772ddf..00000000
--- a/bsp/buildroot/package/xen/0001-Remove-hardcoded-strict-Werror-checking.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 234847440a5d3cf95540ea79f7a08d50cccfef73 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@xilinx.com>
-Date: Tue, 13 Sep 2016 10:48:31 -0700
-Subject: [PATCH] Remove hardcoded strict -Werror checking
-
-Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
----
- Config.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Config.mk b/Config.mk
-index bd991c6..e7ac662 100644
---- a/Config.mk
-+++ b/Config.mk
-@@ -36,7 +36,7 @@ CONFIG_$(XEN_OS) := y
- SHELL     ?= /bin/sh
- 
- # Tools to run on system hosting the build
--HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS  = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
- HOSTCFLAGS += -fno-strict-aliasing
- 
- DISTDIR     ?= $(XEN_ROOT)/dist
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/bsp/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
similarity index 100%
rename from bsp/buildroot/package/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
rename to bsp/buildroot/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch
diff --git a/bsp/buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch b/bsp/buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
new file mode 100644
index 00000000..b681b941
--- /dev/null
+++ b/bsp/buildroot/package/xen/0002-9pfs-include-linux-limits.h-for-XATTR_SIZE_MAX.patch
@@ -0,0 +1,43 @@
+Message-Id: <07010a2ad79559c412949f0005dbe3cb03d8416e.1498504812.git.ps@pks.im>
+From: Patrick Steinhardt <ps@pks.im>
+Date: Mon, 26 Jun 2017 21:20:45 +0200
+Subject: [PATCH] 9pfs: include <linux/limits.h> for XATTR_SIZE_MAX
+
+The function `v9fs_xattrcreate` makes use of the define `XATTR_SIZE_MAX`
+to reject attempts of creating xattrs with an invalid size, which is
+defined in <linux/limits.h>. On glibc-based systems, this header is
+indirectly included via <limits.h>, <bits/posix1_lim.h>,
+<bitts/local_lim.h>, but on other platforms this is not guaranteed due
+to not being part of the POSIX standard. One examples are systems based
+on musl libc, which do not include the <linux/limits.h> indirectly,
+which leads to `XATTR_SIZE_MAX` being undefined.
+
+Fix this error by directly include <linux/limits.h>. As the 9P fs code
+is being Linux-based either way, we can simply do so without breaking
+other platforms. This enables building 9pfs on musl-based systems.
+
+Signed-off-by: Patrick Steinhardt <ps@pks.im>
+[ Changes by AF
+ - Apply to the QEMU tree inside of Xen
+]
+Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
+---
+Upstream Status: Pending review and acceptance
+
+ tools/qemu-xen/hw/9pfs/9p.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tools/qemu-xen/hw/9pfs/9p.c b/tools/qemu-xen/hw/9pfs/9p.c
+index 96d2683348..48cd558e96 100644
+--- a/tools/qemu-xen/hw/9pfs/9p.c
++++ b/tools/qemu-xen/hw/9pfs/9p.c
+@@ -13,6 +13,7 @@
+ 
+ #include "qemu/osdep.h"
+ #include <glib/gprintf.h>
++#include <linux/limits.h>
+ #include "hw/virtio/virtio.h"
+ #include "qapi/error.h"
+ #include "qemu/error-report.h"
+-- 
+2.13.2
diff --git a/bsp/buildroot/package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch b/bsp/buildroot/package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch
deleted file mode 100644
index 80c0b322..00000000
--- a/bsp/buildroot/package/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19f1e70041044fde1542109a0525424cc6d5d053 Mon Sep 17 00:00:00 2001
-From: Alistair Francis <alistair.francis@xilinx.com>
-Date: Wed, 7 Dec 2016 11:35:10 -0800
-Subject: [PATCH] tools/libxl: Disable strict Werror checking
-
-Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
----
- tools/libxl/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
-index defeb40..239faf3 100644
---- a/tools/libxl/Makefile
-+++ b/tools/libxl/Makefile
-@@ -11,7 +11,7 @@ MINOR = 0
- XLUMAJOR = 4.7
- XLUMINOR = 0
- 
--CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \
-+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \
- 	-Wno-declaration-after-statement -Wformat-nonliteral
- CFLAGS += -I. -fPIC
- 
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/xen/Config.in b/bsp/buildroot/package/xen/Config.in
index b5dcbf25..819af37e 100644
--- a/bsp/buildroot/package/xen/Config.in
+++ b/bsp/buildroot/package/xen/Config.in
@@ -13,9 +13,9 @@ if BR2_PACKAGE_XEN
 config BR2_PACKAGE_XEN_HYPERVISOR
 	bool "Xen hypervisor"
 	help
-	  The Xen binaries are avaliable in /usr/lib/xen/
-	  See http://wiki.xenproject.org/wiki/Getting_Started for using the
-	  Xen hypervisor.
+	  The Xen binaries are avaliable in /usr/lib/xen/ See
+	  http://wiki.xenproject.org/wiki/Getting_Started for using
+	  the Xen hypervisor.
 
 config BR2_PACKAGE_XEN_TOOLS
 	bool "Xen tools"
diff --git a/bsp/buildroot/package/xen/xen.hash b/bsp/buildroot/package/xen/xen.hash
index 8a9f65a4..1b3fc12f 100644
--- a/bsp/buildroot/package/xen/xen.hash
+++ b/bsp/buildroot/package/xen/xen.hash
@@ -1,13 +1,3 @@
 # Locally computed
-sha256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f xen-4.7.3.tar.gz
-sha256 fffcc0a4428723e6aea391ff4f1d27326b5a3763d2308cbde64e6a786502c702 xsa226-4.7.patch
-sha256 9923a47e5f86949800887596f098954a08ef73a01d74b1dbe16cab2e6b1fabb2 xsa227.patch
-sha256 5a7416f15ac9cd7cace354b6102ff58199fe0581f65a36a36869650c71784e48 xsa228-4.8.patch
-sha256 77a73f1c32d083e315ef0b1bbb119cb8840ceb5ada790cad76cbfb9116f725cc xsa230.patch
-sha256 ce29b56a0480f4835b37835b351e704d204bb0ccd22325f487127aa2776cc2cf xsa231-4.7.patch
-sha256 5068a78293daa58557c30c95141b775becfb650de6a5eda0d82a4a321ced551c xsa232.patch
-sha256 f721cc49ba692b2f36299b631451f51d7340b8b4732f74c98f01cb7a80d8662b xsa233.patch
-sha256 169e4e0eaa6b27e58ff0f4ce50e8fcc3f81b1e0a10210decf22d1b4cac7501fb xsa234-4.8.patch
-sha256 f30848eee71e66687b421b87be1d8e3f454c0eb395422546c62a689153d1e31c xsa235-4.7.patch
-sha256 526f9e1b127fbb316762ce8e8f4563bc9de0c55a1db581456a3017d570d35bdd 0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch
-sha256 7164010112fcccd9cd88e72ace2eeabdb364dd6f4d05c434686267d18067f420 0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch
+sha256 d5a944a34e47e9d52b2837f616821eb4a9514c8fd0955dcc723111dba499acd4 xen-4.10.2.tar.gz
+sha256 dba0d79260259c013c52e5d4daeaea564a2fbb9ff7fc6778c377a401ec3898de COPYING
diff --git a/bsp/buildroot/package/xen/xen.mk b/bsp/buildroot/package/xen/xen.mk
index 66b81dfb..fb34d64c 100644
--- a/bsp/buildroot/package/xen/xen.mk
+++ b/bsp/buildroot/package/xen/xen.mk
@@ -4,23 +4,11 @@
 #
 ################################################################################
 
-XEN_VERSION = 4.7.3
+XEN_VERSION = 4.10.2
 XEN_SITE = https://downloads.xenproject.org/release/xen/$(XEN_VERSION)
-XEN_PATCH = \
-	https://xenbits.xenproject.org/xsa/xsa226-4.7.patch \
-	https://xenbits.xenproject.org/xsa/xsa227.patch \
-	https://xenbits.xenproject.org/xsa/xsa228-4.8.patch \
-	https://xenbits.xenproject.org/xsa/xsa230.patch \
-	https://xenbits.xenproject.org/xsa/xsa231-4.7.patch \
-	https://xenbits.xenproject.org/xsa/xsa232.patch \
-	https://xenbits.xenproject.org/xsa/xsa233.patch \
-	https://xenbits.xenproject.org/xsa/xsa234-4.8.patch \
-	https://xenbits.xenproject.org/xsa/xsa235-4.7.patch \
-	https://xenbits.xenproject.org/xsa/xsa245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in.patch \
-	https://xenbits.xenproject.org/xsa/xsa245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du.patch
-XEN_LICENSE = GPLv2
+XEN_LICENSE = GPL-2.0
 XEN_LICENSE_FILES = COPYING
-XEN_DEPENDENCIES = host-python
+XEN_DEPENDENCIES = host-acpica host-python
 
 # Calculate XEN_ARCH
 ifeq ($(ARCH),aarch64)
@@ -29,12 +17,15 @@ else ifeq ($(ARCH),arm)
 XEN_ARCH = arm32
 endif
 
-XEN_CONF_OPTS = --disable-ocamltools
+XEN_CONF_OPTS = \
+	--disable-ocamltools \
+	--with-initddir=/etc/init.d
 
-XEN_CONF_ENV = PYTHON=$(HOST_DIR)/usr/bin/python2
+XEN_CONF_ENV = PYTHON=$(HOST_DIR)/bin/python2
 XEN_MAKE_ENV = \
 	XEN_TARGET_ARCH=$(XEN_ARCH) \
 	CROSS_COMPILE=$(TARGET_CROSS) \
+	HOST_EXTRACFLAGS="-Wno-error" \
 	$(TARGET_CONFIGURE_OPTS)
 
 ifeq ($(BR2_PACKAGE_XEN_HYPERVISOR),y)
@@ -54,7 +45,7 @@ XEN_DEPENDENCIES += argp-standalone
 endif
 XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
 XEN_MAKE_OPTS += dist-tools
-XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl"
+XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl --disable-opengl"
 
 define XEN_INSTALL_INIT_SYSV
 	mv $(TARGET_DIR)/etc/init.d/xencommons $(TARGET_DIR)/etc/init.d/S50xencommons
diff --git a/bsp/buildroot/package/xenomai/0001-bfin-remove-inline-keyword.patch b/bsp/buildroot/package/xenomai/0001-bfin-remove-inline-keyword.patch
deleted file mode 100644
index 376bd21c..00000000
--- a/bsp/buildroot/package/xenomai/0001-bfin-remove-inline-keyword.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 2a96c8bbe19a193d9ae6d0780fc274abc4df03e3 Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sat, 5 Nov 2016 19:09:00 +0100
-Subject: [PATCH] bfin: remove inline keyword
-
-Xenomai user space tools fail to build for bfin target since it's
-provide it's own pthread_atfork(), shm_open() and shm_unlink()
-definition using the inline keyword and weak attribute.
-
-With gcc 5+ the weak attribute is discarded by the inline keyword,
-so each symbol are global and are redefined several time while
-linking.
-
-Fixes:
-http://autobuild.buildroot.net/results/0c2/0c2e5eb4edd4f9427f61d3c9b67a12a7a0e24140
-
-Patch status: upstream,
-https://git.xenomai.org/xenomai-2.6.git/commit/?id=917dcebb26ec492f276cdc3b55867aa90e01fa12
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- include/asm-blackfin/syscall.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/include/asm-blackfin/syscall.h b/include/asm-blackfin/syscall.h
-index 9eda8b9..b5728b5 100644
---- a/include/asm-blackfin/syscall.h
-+++ b/include/asm-blackfin/syscall.h
-@@ -132,9 +132,9 @@ static inline int __xn_interrupted_p(struct pt_regs *regs)
- #define XENOMAI_SKINCALL5(id,op,a1,a2,a3,a4,a5) XENOMAI_DO_SYSCALL(5,id,op,a1,a2,a3,a4,a5)
- 
- /* uClibc does not provide pthread_atfork() for this arch; provide it
--   here. Note: let the compiler decides whether it wants to actually
--   inline this routine, i.e. do not force always_inline. */
--inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void),
-+   here.
-+*/
-+__attribute__((weak)) int pthread_atfork(void (*prepare)(void),
- 						void (*parent)(void),
- 						void (*child)(void))
- {
-@@ -143,7 +143,7 @@ inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void),
- 
- #include <errno.h>
- 
--inline __attribute__((weak)) int shm_open(const char *name,
-+__attribute__((weak)) int shm_open(const char *name,
- 					  int oflag,
- 					  mode_t mode)
- {
-@@ -151,7 +151,7 @@ inline __attribute__((weak)) int shm_open(const char *name,
- 	return -1;
- }
- 
--inline __attribute__((weak)) int shm_unlink(const char *name)
-+__attribute__((weak)) int shm_unlink(const char *name)
- {
- 	errno = ENOSYS;
- 	return -1;
--- 
-2.5.5
-
diff --git a/bsp/buildroot/package/xenomai/Config.in b/bsp/buildroot/package/xenomai/Config.in
index 32c5124e..e0118c11 100644
--- a/bsp/buildroot/package/xenomai/Config.in
+++ b/bsp/buildroot/package/xenomai/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS
 	bool
 	default y
 	depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \
-		BR2_bfin || BR2_powerpc || BR2_sh4
+		BR2_bfin || BR2_powerpc
 
 comment "xenomai needs an glibc or uClibc toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL
@@ -51,6 +51,81 @@ config BR2_PACKAGE_XENOMAI_VERSION
 	  BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux
 	  Kernel -> Linux Kernel Extensions menu.
 
+choice
+	prompt "Xenomai core"
+	default BR2_PACKAGE_XENOMAI_MERCURY
+	help
+	  Select the Xenomai core: dual kernel (Cobalt)
+	  or native Linux Kernel (Mercury).
+
+config BR2_PACKAGE_XENOMAI_MERCURY
+	bool "Mercury"
+	depends on !BR2_LINUX_KERNEL_EXT_XENOMAI
+	help
+	  Select Mercury core for the Xenomai userspace.
+	  You want to use it if you have the native Linux Kernel.
+
+config BR2_PACKAGE_XENOMAI_COBALT
+	bool "Cobalt"
+	help
+	  Select Cobalt core (dual kernel) for the Xenomai
+	  userspace. Use this if you use a Xenomai-patched
+	  Linux kernel.
+
+	  If you want to use Cobalt core, your kernel must have
+	  the Adeos and Xenomai patches applied to it. You can
+	  add these through the BR2_LINUX_KERNEL_EXT_XENOMAI option
+	  in the Linux Kernel Extensions menu.
+endchoice
+
+config BR2_PACKAGE_XENOMAI_ENABLE_SMP
+	bool "Enable SMP support"
+	default y
+	help
+	  This option enables SMP support in Xenomai userspace.
+
+	  If this option is turned on while no SMP support is enabled
+	  in the kernel, things will still work. However, if SMP is
+	  enabled in the kernel but this option is not turned on,
+	  Xenomai applications will complain with:
+
+	    feature mismatch: missing="smp/nosmp"
+
+	  Please refer to this troubleshooting guide for more
+	  information:
+
+	  http://xenomai.org/troubleshooting-a-dual-kernel-configuration/#feature_mismatch_missing8221smpnosmp8221
+
+config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
+	bool "Enable registry"
+	depends on !BR2_STATIC_LIBS # libfuse
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse
+	depends on BR2_USE_MMU # libfuse
+	select BR2_PACKAGE_LIBFUSE
+	help
+	  Xenomai APIs can export their internal state through a
+	  pseudo-filesystem, whose files may be read to obtain
+	  information about the existing real-time objects, such as
+	  tasks, semaphores, message queues and so on.
+
+comment "registry needs a toolchain w/ threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
+
+config BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH
+	string "Custom registry root path"
+	depends on BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY
+	help
+	  Specify the root path of the registry here.
+	  To use the Xenomai default (currently: /var/run/xenomai),
+	  leave this option empty.
+
+config BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS
+	string "Additional configure options"
+	help
+	  Specify any additional options to pass to the configure
+	  script here.  See Xenomai documentation for details.
+
 config BR2_PACKAGE_XENOMAI_TESTSUITE
 	bool "Install testsuite"
 	help
@@ -67,41 +142,51 @@ config BR2_PACKAGE_XENOMAI_ANALOGY
 	  This option allows to install the Xenomai Analogy utilities
 	  and libraries
 
+menu "Skin selection"
+
 config BR2_PACKAGE_XENOMAI_NATIVE_SKIN
-	bool "Native skin library"
+	bool "Alchemy (native) skin"
 	default y
 	help
-	  This option allows to install the Native Xenomai skin
+	  This option allows to install the Alchemy Xenomai skin,
+	  previously called 'native'
 
 config BR2_PACKAGE_XENOMAI_POSIX_SKIN
-	bool "POSIX skin library"
+	bool "POSIX skin"
 	default y
 	help
 	  This option allows to install the POSIX Xenomai skin
 
-config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
-	bool "VX-Works skin library"
-	help
-	  This option allows to install the VX-Works Xenomai skin
-
 config BR2_PACKAGE_XENOMAI_PSOS_SKIN
-	bool "PSOS skin library"
+	bool "pSOS skin"
 	help
-	  This option allows to install the PSOS Xenomai skin
+	  This option allows to install the pSOS Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_RTAI_SKIN
-	bool "RTAI skin library"
+	bool "RTAI skin"
 	help
 	  This option allows to install the RTAI Xenomai skin
 
-config BR2_PACKAGE_XENOMAI_UITRON_SKIN
-	bool "uiTron skin library"
+config BR2_PACKAGE_XENOMAI_SMOKEY_SKIN
+	bool "Smokey skin"
 	help
-	  This option allows to install the uiTron Xenomai skin
+	  This option allows to install the Smokey Xenomai skin
+
+config BR2_PACKAGE_XENOMAI_UITRON_SKIN
+	bool "uITRON skin"
+	help
+	  This option allows to install the uITRON Xenomai skin
 
 config BR2_PACKAGE_XENOMAI_VRTX_SKIN
-	bool "VRTX skin library"
+	bool "VRTX skin"
 	help
 	  This option allows to install the VRTX Xenomai skin
 
+config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN
+	bool "VxWorks skin"
+	help
+	  This option allows to install the VxWorks Xenomai skin
+
+endmenu
+
 endif
diff --git a/bsp/buildroot/package/xenomai/xenomai.hash b/bsp/buildroot/package/xenomai/xenomai.hash
index 4d74472e..c36badb6 100644
--- a/bsp/buildroot/package/xenomai/xenomai.hash
+++ b/bsp/buildroot/package/xenomai/xenomai.hash
@@ -1,2 +1,2 @@
 # Locally computed;
-sha256  b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8  xenomai-2.6.4.tar.bz2
+sha256 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94  xenomai-3.0.6.tar.bz2
diff --git a/bsp/buildroot/package/xenomai/xenomai.mk b/bsp/buildroot/package/xenomai/xenomai.mk
index 6e0e4416..6bf08edf 100644
--- a/bsp/buildroot/package/xenomai/xenomai.mk
+++ b/bsp/buildroot/package/xenomai/xenomai.mk
@@ -6,16 +6,26 @@
 
 XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION))
 ifeq ($(XENOMAI_VERSION),)
-XENOMAI_VERSION = 2.6.4
+XENOMAI_VERSION = 3.0.6
 else
 BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE)
 endif
 
-XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable
+XENOMAI_SITE = http://xenomai.org/downloads/xenomai/stable
 XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2
-XENOMAI_LICENSE = GPLv2+ with exception (headers), LGPLv2.1+ (libraries), GPLv2+ (kernel), GFDLv1.2+ (docs), GPLv2 (ipipe patch, can driver)
+XENOMAI_LICENSE = GPL-2.0+ with exception (headers), LGPL-2.1+ (libraries), GPL-2.0+ (kernel), GFDL-1.2+ (docs), GPL-2.0 (ipipe patch, can driver)
 # GFDL is not included but refers to gnu.org
-XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING
+XENOMAI_LICENSE_FILES = debian/copyright include/COPYING kernel/cobalt/COPYING \
+	kernel/cobalt/posix/COPYING kernel/cobalt/rtdm/COPYING \
+	lib/alchemy/COPYING lib/analogy/COPYING \
+	lib/boilerplate/iniparser/LICENSE lib/boilerplate/COPYING \
+	lib/cobalt/COPYING lib/copperplate/COPYING lib/psos/COPYING \
+	lib/smokey/COPYING lib/trank/COPYING lib/vxworks/COPYING
+
+XENOMAI_DEPENDENCIES = host-pkgconf
+
+# 0002-boilerplate-build-obstack-support-conditionally.patch
+XENOMAI_AUTORECONF = YES
 
 XENOMAI_INSTALL_STAGING = YES
 XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user
@@ -23,24 +33,54 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user
 
 XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install
 
-define XENOMAI_REMOVE_DEVFILES
-	for i in xeno-config xeno-info wrap-link.sh ; do \
+ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y)
+XENOMAI_CONF_OPTS += --with-core=mercury
+else
+XENOMAI_CONF_OPTS += --with-core=cobalt
+endif
+
+ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_SMP),y)
+XENOMAI_CONF_OPTS += --enable-smp
+else
+XENOMAI_CONF_OPTS += --disable-smp
+endif
+
+ifeq ($(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY),y)
+XENOMAI_DEPENDENCIES += libfuse
+XENOMAI_REGISTRY_PATH = $(call qstrip,$(BR2_PACKAGE_XENOMAI_ENABLE_REGISTRY_PATH))
+ifeq ($(XENOMAI_REGISTRY_PATH),)
+XENOMAI_CONF_OPTS += --enable-registry
+else
+XENOMAI_CONF_OPTS += --enable-registry=$(XENOMAI_REGISTRY_PATH)
+endif
+else
+XENOMAI_CONF_OPTS += --disable-registry
+endif
+
+XENOMAI_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_XENOMAI_ADDITIONAL_CONF_OPTS))
+
+# Some of these files may be desired by some users -- at that point specific
+# config options need to be added to keep a particular set.
+define XENOMAI_REMOVE_UNNEEDED_FILES
+	for i in xeno xeno-config xeno-info wrap-link.sh ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
+	for i in autotune corectl hdb rtnet nomaccfg rtcfg rtifconfig \
+		rtiwconfig rtping rtroute tdmacfg rtps slackspot version; do \
+		rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
+	done
 endef
 
-XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES
+XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES
 
 ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),)
 define XENOMAI_REMOVE_TESTSUITE
 	rm -rf $(TARGET_DIR)/usr/share/xenomai/
-	for i in klatency rtdm xeno xeno-load check-vdso \
-		irqloop cond-torture-posix switchtest arith \
-		sigtest clocktest cyclictest latency wakeup-time \
-		xeno-test cond-torture-native mutex-torture-posix \
-		mutex-torture-native ; do \
+	for i in clocktest gpiotest latency spitest switchtest \
+		xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
+	rm -rf $(TARGET_DIR)/usr/demo/
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE
@@ -59,23 +99,26 @@ endif
 
 ifeq ($(BR2_PACKAGE_XENOMAI_ANALOGY),)
 define XENOMAI_REMOVE_ANALOGY
-	for i in cmd_bits cmd_read cmd_write insn_write \
-		insn_bits insn_read ; do \
+	for i in cmd_read cmd_write cmd_bits insn_read insn_write insn_bits \
+			wf_generate ; do \
 		rm -f $(TARGET_DIR)/usr/bin/$$i ; \
 	done
-	rm -f $(TARGET_DIR)/usr/sbin/analogy_config
+	for i in analogy_config analogy_calibrate ; do \
+		rm -f $(TARGET_DIR)/usr/sbin/$$i ; \
+	done
 	rm -f $(TARGET_DIR)/usr/lib/libanalogy.*
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY
 endif
 
-XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,native)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,alchemy)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix)
-XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_SMOKEY_SKIN),,smokey)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron)
+XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks)
 XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx)
 
 define XENOMAI_REMOVE_SKINS
@@ -84,15 +127,18 @@ define XENOMAI_REMOVE_SKINS
 		if [ $$i == "posix" ] ; then \
 			rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \
 		fi ; \
+		if [ $$i == "smokey" ] ; then \
+			rm -f $(TARGET_DIR)/usr/bin/smokey* ; \
+		fi ; \
 	done
 endef
 
 XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS
 
 define XENOMAI_DEVICES
-/dev/rtheap  c  666  0  0  10  254  0  0  -
-/dev/rtscope c  666  0  0  10  253  0  0  -
-/dev/rtp     c  666  0  0  150 0    0  1  32
+	/dev/rtheap  c  666  0  0  10  254  0  0  -
+	/dev/rtscope c  666  0  0  10  253  0  0  -
+	/dev/rtp     c  666  0  0  150 0    0  1  32
 endef
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
@@ -100,7 +146,7 @@ XENOMAI_DEPENDENCIES += udev
 
 define XENOMAI_INSTALL_UDEV_RULES
 	if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \
-		for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \
+		for f in $(@D)/kernel/cobalt/udev/*.rules ; do \
 			cp $$f $(TARGET_DIR)/etc/udev/rules.d/ || exit 1 ; \
 		done ; \
 	fi;
diff --git a/bsp/buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/bsp/buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
index 4e4160fb..2bb0b7db 100644
--- a/bsp/buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
+++ b/bsp/buildroot/package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch
@@ -10,7 +10,7 @@ linking for libuuid only. Otherwise the build will fail like this:
 ld: attempted static link of dynamic object `/usr/lib/libuuid.so'
 
 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
-[Sent upstream: http://oss.sgi.com/pipermail/xfs/2015-November/045136.html]
+[Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html]
 ---
  mdrestore/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bsp/buildroot/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch b/bsp/buildroot/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch
deleted file mode 100644
index 36896b5b..00000000
--- a/bsp/buildroot/package/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 15 Dec 2015 20:51:35 -0300
-Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC
-
-When cross-compiling CFLAGS might not be suitable for the host
-(BUILD_CC) compiler since it might contain arch-specific options.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- libxfs/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index e021625..ad76a04 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY)
- 
- crc32table.h: gen_crc32table.c
- 	@echo "    [CC]     gen_crc32table"
--	$(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $<
-+	$(Q) $(BUILD_CC) -o gen_crc32table $<
- 	@echo "    [GENERATE] $@"
- 	$(Q) ./gen_crc32table > crc32table.h
- 
-@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c
- # disk.
- crc32selftest: gen_crc32table.c crc32table.h crc32.c
- 	@echo "    [TEST]    CRC32"
--	$(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@
-+	$(Q) $(BUILD_CC) -D CRC32_SELFTEST=1 crc32.c -o $@
- 	$(Q) ./$@
- 
- # set up include/xfs header directory
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch b/bsp/buildroot/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch
deleted file mode 100644
index 8ff0580f..00000000
--- a/bsp/buildroot/package/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 1e9bb2fba94bc508659f1667bf95501324849bb9 Mon Sep 17 00:00:00 2001
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Date: Sun, 26 Feb 2017 12:04:54 +0100
-Subject: [PATCH] build: add EXTRALIBS to link with
-
-When doing a uClibc static build, the build fails to link:
-    http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/build-end.log
-
-The cause is due to:
-  - xfsprogs links dome programs with util-linux' libblkid
-  - util-linux' libblkid is linked to util-linux' libuuid
-  - util-linux' libuuid uses i18n functions when locales are enabled
-  - uClibc does not provide i18n functions
-  - i18n functions are provided by libintl from libintl from gettext
-
-util-linux installs pkg-config files for thos two libs. However,
-xfsprogs does not use pkg-config to find libblkid or libuuid, thus it
-misses the Libs.private field from libuid.
-
-In this case, it is necessary to pass LIBS=-lintl at configure time, so
-that configure correctly finds libblkid.
-
-Still, this is not enough, because the build will not use LIBS during
-the link phase.
-
-We fix that last bit by adding EXTRALIBS to the libraries to link with,
-so that it is possible to pass EXTRALIBS=-lintl at build time:
-
-    $ ./configure [...] LIBS=-lintl
-    $ make EXTRALIBS=-lintl
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Cc: Waldemar Brodkorb <wbx@openadk.org>
----
- include/buildmacros | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/buildmacros b/include/buildmacros
-index a7c5d8a..dd62d80 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -11,7 +11,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules
- 
- LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS)
- LTLDFLAGS += $(LOADERFLAGS)
--LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB)
-+LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) $(EXTRALIBS)
- 
- MAKEOPTS = --no-print-directory Q=$(Q)
- SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES)
--- 
-2.7.4
-
diff --git a/bsp/buildroot/package/xfsprogs/Config.in b/bsp/buildroot/package/xfsprogs/Config.in
index 78c1aa90..024cde9f 100644
--- a/bsp/buildroot/package/xfsprogs/Config.in
+++ b/bsp/buildroot/package/xfsprogs/Config.in
@@ -1,11 +1,10 @@
-comment "xfsprogs needs a glibc or uClibc toolchain w/ threads"
+comment "xfsprogs needs a toolchain w/ threads"
 	depends on BR2_USE_MMU
-	depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 config BR2_PACKAGE_XFSPROGS
 	bool "xfsprogs"
 	depends on BR2_USE_MMU # fork()
-	depends on !BR2_TOOLCHAIN_USES_MUSL
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_UTIL_LINUX
 	select BR2_PACKAGE_UTIL_LINUX_LIBUUID
diff --git a/bsp/buildroot/package/xfsprogs/xfsprogs.hash b/bsp/buildroot/package/xfsprogs/xfsprogs.hash
index e990b78d..886a8f10 100644
--- a/bsp/buildroot/package/xfsprogs/xfsprogs.hash
+++ b/bsp/buildroot/package/xfsprogs/xfsprogs.hash
@@ -1,3 +1,3 @@
-# Locally calculated after checking pgp signature:
-#   https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign
-sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9  xfsprogs-4.8.0.tar.xz
+# From https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/sha256sums.asc
+sha256 b1b710b268bc95d6f45eca06e1262c29eb38865a19cd4404e48ba446e043b7ec  xfsprogs-4.14.0.tar.xz
+sha256 ee304b1b1da08b261f1d1f31d229fc70d2d0c552c7429e9e84c0fac878d94209  doc/COPYING
diff --git a/bsp/buildroot/package/xfsprogs/xfsprogs.mk b/bsp/buildroot/package/xfsprogs/xfsprogs.mk
index c110733c..e6e84936 100644
--- a/bsp/buildroot/package/xfsprogs/xfsprogs.mk
+++ b/bsp/buildroot/package/xfsprogs/xfsprogs.mk
@@ -4,9 +4,11 @@
 #
 ################################################################################
 
-XFSPROGS_VERSION = 4.8.0
+XFSPROGS_VERSION = 4.14.0
 XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs
 XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz
+XFSPROGS_LICENSE = GPL-2.0, GPL-2.0+, LGPL-2.1 (libhandle, few headers)
+XFSPROGS_LICENSE_FILES = doc/COPYING
 
 XFSPROGS_DEPENDENCIES = util-linux
 
@@ -18,23 +20,6 @@ XFSPROGS_CONF_OPTS = \
 	INSTALL_GROUP=root \
 	--enable-static
 
-# xfsprogs links some of its programs to libs from util-linux, which use
-# i18n functions. For shared-only builds, that's automatically pulled in.
-# Static builds need some help, though...
-#
-# No need to depend on gettext in this case: xfsprogs does not use it for
-# itself; util-linux does need it and has it in its own dependencies.
-#
-# xfsprogs' buildsystem uses hand-made Makefiles, not automake, and they
-# do not use the LIBS variable set by configure. So we use EXTRALIBS that
-# is added by our patch.
-#
-# It is not needed to propagate the EXTRALIBS to the install step.
-ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS)$(BR2_NEEDS_GETTEXT_IF_LOCALE),yy)
-XFSPROGS_CONF_OPTS += LIBS=-lintl
-XFSPROGS_MAKE_OPTS = EXTRALIBS=-lintl
-endif
-
 XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install
 
 $(eval $(autotools-package))
diff --git a/bsp/buildroot/package/xinetd/Config.in b/bsp/buildroot/package/xinetd/Config.in
index 7f3575ce..3bf3043d 100644
--- a/bsp/buildroot/package/xinetd/Config.in
+++ b/bsp/buildroot/package/xinetd/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XINETD
 	bool "xinetd"
 	depends on BR2_USE_MMU # fork()
 	help
-	  xinetd is a secure replacement for inetd. It was originally written by
-	  panos@cs.colorado.edu.
+	  xinetd is a secure replacement for inetd. It was originally
+	  written by panos@cs.colorado.edu.
 
 	  http://www.xinetd.org
diff --git a/bsp/buildroot/package/xl2tp/Config.in b/bsp/buildroot/package/xl2tp/Config.in
index f0b1e834..7e2d2f6e 100644
--- a/bsp/buildroot/package/xl2tp/Config.in
+++ b/bsp/buildroot/package/xl2tp/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XL2TP
 	bool "xl2tp"
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBPCAP
-	select BR2_PACKAGE_OPENSSL
 	help
 	  Layer 2 Tunnelling Protocol (RFC2661).
 
diff --git a/bsp/buildroot/package/xl2tp/xl2tp.mk b/bsp/buildroot/package/xl2tp/xl2tp.mk
index ff802a4e..eee5c04d 100644
--- a/bsp/buildroot/package/xl2tp/xl2tp.mk
+++ b/bsp/buildroot/package/xl2tp/xl2tp.mk
@@ -6,8 +6,8 @@
 
 XL2TP_VERSION = v1.3.8
 XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION))
-XL2TP_DEPENDENCIES = libpcap openssl
-XL2TP_LICENSE = GPLv2
+XL2TP_DEPENDENCIES = libpcap
+XL2TP_LICENSE = GPL-2.0
 XL2TP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_STATIC_LIBS),y)
diff --git a/bsp/buildroot/package/xmlstarlet/xmlstarlet.mk b/bsp/buildroot/package/xmlstarlet/xmlstarlet.mk
index 61d38f29..1d748dc5 100644
--- a/bsp/buildroot/package/xmlstarlet/xmlstarlet.mk
+++ b/bsp/buildroot/package/xmlstarlet/xmlstarlet.mk
@@ -19,9 +19,16 @@ XMLSTARLET_CONF_OPTS += \
 
 ifeq ($(BR2_STATIC_LIBS),y)
 XMLSTARLET_CONF_OPTS += --enable-static-libs
-XMLSTARLET_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libxml-2.0 libexslt` $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)"
+XMLSTARLET_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libxml-2.0 libexslt`"
 else
 XMLSTARLET_CONF_OPTS += --disable-static-libs
 endif
 
+HOST_XMLSTARLET_DEPENDENCIES += host-libxml2 host-libxslt
+
+HOST_XMLSTARLET_CONF_OPTS += \
+	--with-libxml-prefix=$(HOST_DIR)/usr \
+	--with-libxslt-prefix=$(HOST_DIR)/usr
+
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/xorriso/0001-fix-musl-build.patch b/bsp/buildroot/package/xorriso/0001-fix-musl-build.patch
deleted file mode 100644
index 86d251d7..00000000
--- a/bsp/buildroot/package/xorriso/0001-fix-musl-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix musl build
-
-Add missing header needed for ssize_t.
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
----
-Patch status: posted upstream
-(http://lists.gnu.org/archive/html/bug-xorriso/2016-05/msg00000.html)
-
-diff -Nuar xorriso-1.4.2-orig/libisofs/aaip_0_2.h xorriso-1.4.2/libisofs/aaip_0_2.h
---- xorriso-1.4.2-orig/libisofs/aaip_0_2.h	2015-11-28 16:41:33.000000000 +0200
-+++ xorriso-1.4.2/libisofs/aaip_0_2.h	2016-05-24 11:40:43.874191174 +0300
-@@ -16,6 +16,7 @@
- #ifndef Aaip_h_is_includeD
- #define Aaip_h_is_includeD yes
- 
-+#include <unistd.h>
- 
- /* --------------------------------- Encoder ---------------------------- */
- 
diff --git a/bsp/buildroot/package/xorriso/0001-use-sys-xattr.h.patch b/bsp/buildroot/package/xorriso/0001-use-sys-xattr.h.patch
new file mode 100644
index 00000000..5ae1aae7
--- /dev/null
+++ b/bsp/buildroot/package/xorriso/0001-use-sys-xattr.h.patch
@@ -0,0 +1,33 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+
+---
+Upstream status: alternate, more complex patch pending...
+
+diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac
+--- xorriso-1.4.6.orig/configure.ac	2016-09-16 15:51:33.000000000 +0200
++++ xorriso-1.4.6/configure.ac	2018-05-06 23:45:38.377153069 +0200
+@@ -264,7 +264,7 @@
+ dnl Check whether there is the header for Linux xattr.
+ dnl If not, erase this macro which would enable use of listxattr and others
+         XATTR_DEF="-DLibisofs_with_aaip_xattR"
+-        AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
++        AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
+                                                    XATTR_DEF= ), XATTR_DEF= )
+     fi
+ elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr
+diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c
+--- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c	2016-09-16 15:51:34.000000000 +0200
++++ xorriso-1.4.6/libisofs/aaip-os-linux.c	2018-05-06 23:47:25.764941583 +0200
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ #ifdef Libisofs_with_aaip_xattR
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #endif
+ 
+ 
diff --git a/bsp/buildroot/package/xorriso/Config.in b/bsp/buildroot/package/xorriso/Config.in
index f9bb10ac..60b2642d 100644
--- a/bsp/buildroot/package/xorriso/Config.in
+++ b/bsp/buildroot/package/xorriso/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_XORRISO
 	bool "xorriso"
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
 	help
 	  xorriso copies file objects from POSIX compliant
 	  filesystems into Rock Ridge enhanced ISO 9660 filesystems
diff --git a/bsp/buildroot/package/xorriso/xorriso.hash b/bsp/buildroot/package/xorriso/xorriso.hash
index 3c2a726e..f1ee9d67 100644
--- a/bsp/buildroot/package/xorriso/xorriso.hash
+++ b/bsp/buildroot/package/xorriso/xorriso.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 2843beded1aa4c678706e96fdf9cc5e4b34430b559bdf5bc35df5202125004b3 xorriso-1.4.2.tar.gz
+sha256 526f728c7eee6f8c4b69fbf391789e6c80806197c2861cf5922cf7cfe1035784 xorriso-1.4.6.tar.gz
diff --git a/bsp/buildroot/package/xorriso/xorriso.mk b/bsp/buildroot/package/xorriso/xorriso.mk
index be193221..de431c3a 100644
--- a/bsp/buildroot/package/xorriso/xorriso.mk
+++ b/bsp/buildroot/package/xorriso/xorriso.mk
@@ -4,10 +4,23 @@
 #
 ################################################################################
 
-XORRISO_VERSION = 1.4.2
+XORRISO_VERSION = 1.4.6
 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
-XORRISO_LICENSE = GPLv3+
+XORRISO_LICENSE = GPL-3.0+
 XORRISO_LICENSE_FILES = COPYING COPYRIGHT
+
+# 0001-use-sys-xattr.h.patch
+XORRISO_DEPENDENCIES = host-pkgconf
+HOST_XORRISO_DEPENDENCIES = host-pkgconf
+XORRISO_AUTORECONF = YES
+
+# Make autoreconf happy
+define XORRISO_NEWS
+	touch $(@D)/NEWS
+endef
+XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS
+HOST_XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS
+
 # Disable everything until we actually need those features, and add the correct
 # host libraries
 HOST_XORRISO_CONF_OPTS = \
@@ -18,19 +31,14 @@ HOST_XORRISO_CONF_OPTS = \
 	--disable-libedit \
 	--disable-libacl
 
+# libcdio doesn't make sense for Linux
+# http://lists.gnu.org/archive/html/bug-xorriso/2017-04/msg00004.html
+XORRISO_CONF_OPTS = --disable-libcdio
+
 ifeq ($(BR2_PACKAGE_LIBICONV),y)
 XORRISO_DEPENDENCIES += libiconv
 endif
 
-ifeq ($(BR2_PACKAGE_LIBCDIO),y)
-XORRISO_DEPENDENCIES += host-pkgconf libcdio
-XORRISO_CONF_OPTS += \
-	--enable-pkg-check-modules \
-	--enable-libcdio
-else
-XORRISO_CONF_OPTS += --disable-libcdio
-endif
-
 ifeq ($(BR2_PACKAGE_READLINE),y)
 XORRISO_DEPENDENCIES += readline
 XORRISO_CONF_OPTS += --enable-libreadline
diff --git a/bsp/buildroot/package/xr819-xradio/Config.in b/bsp/buildroot/package/xr819-xradio/Config.in
new file mode 100644
index 00000000..9d7fa4b0
--- /dev/null
+++ b/bsp/buildroot/package/xr819-xradio/Config.in
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_XR819_XRADIO
+	bool "xr819-xradio"
+	depends on BR2_LINUX_KERNEL
+	help
+	  Wireless driver for SDIO WiFi chip XR819
+
+	  https://github.com/fifteenhex/xradio
+
+comment "xr819-xradio driver needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
diff --git a/bsp/buildroot/package/xr819-xradio/xr819-xradio.hash b/bsp/buildroot/package/xr819-xradio/xr819-xradio.hash
new file mode 100644
index 00000000..341747c5
--- /dev/null
+++ b/bsp/buildroot/package/xr819-xradio/xr819-xradio.hash
@@ -0,0 +1,4 @@
+# Locally computed
+sha256 7b78fc61d13a428a0d8a3d8dcffaa604d23b5a17c6e8e86d2e5e8372dcd17672 xr819-xradio-33f4b1c25eff0d9db7cbac19f36b130da9857f37.tar.gz
+# Locally computed
+sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE
diff --git a/bsp/buildroot/package/xr819-xradio/xr819-xradio.mk b/bsp/buildroot/package/xr819-xradio/xr819-xradio.mk
new file mode 100644
index 00000000..edf423bc
--- /dev/null
+++ b/bsp/buildroot/package/xr819-xradio/xr819-xradio.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# xr819-xradio
+#
+################################################################################
+
+XR819_XRADIO_VERSION = 33f4b1c25eff0d9db7cbac19f36b130da9857f37
+XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION))
+XR819_XRADIO_LICENSE = GPL-2.0
+XR819_XRADIO_LICENSE_FILES = LICENSE
+
+$(eval $(kernel-module))
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/xscreensaver/Config.in b/bsp/buildroot/package/xscreensaver/Config.in
index 5213ce36..efb8d1a6 100644
--- a/bsp/buildroot/package/xscreensaver/Config.in
+++ b/bsp/buildroot/package/xscreensaver/Config.in
@@ -11,14 +11,14 @@ config BR2_PACKAGE_XSCREENSAVER
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXT
-	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	help
-	  XScreenSaver is the standard screen saver collection shipped on most
-	  Linux and Unix systems running the X11 Window System.
+	  XScreenSaver is the standard screen saver collection shipped
+	  on most Linux and Unix systems running the X11 Window
+	  System.
 
-	  On X11 systems, XScreenSaver is two things: it is both a large
-	  collection of screen savers; and it is also the framework for
-	  blanking and locking the screen.
+	  On X11 systems, XScreenSaver is two things: it is both a
+	  large collection of screen savers; and it is also the
+	  framework for blanking and locking the screen.
 
 	  http://www.jwz.org/xscreensaver/
 
diff --git a/bsp/buildroot/package/xscreensaver/xscreensaver.hash b/bsp/buildroot/package/xscreensaver/xscreensaver.hash
index 7e7a07e3..48bc2b1e 100644
--- a/bsp/buildroot/package/xscreensaver/xscreensaver.hash
+++ b/bsp/buildroot/package/xscreensaver/xscreensaver.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd xscreensaver-5.32.tar.gz
+sha256 6b8b5238047f1613d99149bb02d5ed3384675f3ce74a0a8ba25290bd61abc06c  xscreensaver-5.36.tar.gz
diff --git a/bsp/buildroot/package/xscreensaver/xscreensaver.mk b/bsp/buildroot/package/xscreensaver/xscreensaver.mk
index 831349be..34b11638 100644
--- a/bsp/buildroot/package/xscreensaver/xscreensaver.mk
+++ b/bsp/buildroot/package/xscreensaver/xscreensaver.mk
@@ -4,15 +4,15 @@
 #
 ################################################################################
 
-XSCREENSAVER_VERSION = 5.32
-XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver
+XSCREENSAVER_VERSION = 5.36
+XSCREENSAVER_SITE = https://www.jwz.org/xscreensaver
 
-# N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built.
-XSCREENSAVER_LICENSE = MIT-like, GPLv2+
+# N.B. GPL-2.0+ code (in the hacks/glx subdirectory) is not currently built.
+XSCREENSAVER_LICENSE = MIT-like, GPL-2.0+
 XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h
 
 XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \
-	$(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool
+	$(TARGET_NLS_DEPENDENCIES) host-intltool
 
 # otherwise we end up with host include/library dirs passed to the
 # compiler/linker
diff --git a/bsp/buildroot/package/xtables-addons/Config.in b/bsp/buildroot/package/xtables-addons/Config.in
index 45385196..39fafe72 100644
--- a/bsp/buildroot/package/xtables-addons/Config.in
+++ b/bsp/buildroot/package/xtables-addons/Config.in
@@ -13,7 +13,7 @@ config BR2_PACKAGE_XTABLES_ADDONS
 	select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra
 	help
 	  Xtables-addons is the successor to patch-o-matic(-ng).
-	  Likewise, it contains extensions that were not, or are not yet,
-	  accepted in the main kernel/iptables packages.
+	  Likewise, it contains extensions that were not, or are not
+	  yet, accepted in the main kernel/iptables packages.
 
 	  http://xtables-addons.sourceforge.net/
diff --git a/bsp/buildroot/package/xtables-addons/xtables-addons.mk b/bsp/buildroot/package/xtables-addons/xtables-addons.mk
index 274e6818..5c3be160 100644
--- a/bsp/buildroot/package/xtables-addons/xtables-addons.mk
+++ b/bsp/buildroot/package/xtables-addons/xtables-addons.mk
@@ -8,7 +8,7 @@ XTABLES_ADDONS_VERSION = 2.12
 XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz
 XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons
 XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf
-XTABLES_ADDONS_LICENSE = GPLv2+
+XTABLES_ADDONS_LICENSE = GPL-2.0+
 XTABLES_ADDONS_LICENSE_FILES = LICENSE
 
 XTABLES_ADDONS_CONF_OPTS = \
diff --git a/bsp/buildroot/package/xterm/Config.in b/bsp/buildroot/package/xterm/Config.in
index f11aafad..f3bc4500 100644
--- a/bsp/buildroot/package/xterm/Config.in
+++ b/bsp/buildroot/package/xterm/Config.in
@@ -1,11 +1,11 @@
 config BR2_PACKAGE_XTERM
 	bool "xterm"
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_XLIB_LIBXAW
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU # fork()
 	# ARC toolchain issue
 	depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_XLIB_LIBXAW
 	help
 	  xterm terminal emulator
 
diff --git a/bsp/buildroot/package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch b/bsp/buildroot/package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch
deleted file mode 100644
index f0566254..00000000
--- a/bsp/buildroot/package/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 99bbdc042ee4c92a13edcfeaf336aa755a199d0f Mon Sep 17 00:00:00 2001
-From: Anup Patel <anup@brainfault.org>
-Date: Sun, 11 Sep 2016 19:53:40 +0530
-Subject: [PATCH] Makefile: Fix oldconfig make target
-
-Use "-s" instead of "-o" option of "openconf/conf" tool because
-the "-o" option does not generate all required openconf files.
-
-Signed-off-by: Anup Patel <anup@brainfault.org>
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 149a682..e05e801 100644
---- a/Makefile
-+++ b/Makefile
-@@ -434,7 +434,7 @@ menuconfig:
- oldconfig:
- 	$(V)mkdir -p $(OPENCONF_TMPDIR)
- 	$(V)$(MAKE) -C tools/openconf oldconfig
--	./tools/openconf/conf -o $(OPENCONF_INPUT)
-+	./tools/openconf/conf -s $(OPENCONF_INPUT)
- 
- # Rule for "make savedefconfig"
- .PHONY: savedefconfig
--- 
-2.4.11
-
diff --git a/bsp/buildroot/package/xvisor/0002-openconf-do-not-check-stdin.patch b/bsp/buildroot/package/xvisor/0002-openconf-do-not-check-stdin.patch
deleted file mode 100644
index 34b350de..00000000
--- a/bsp/buildroot/package/xvisor/0002-openconf-do-not-check-stdin.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 6b49c1dbe0ac43e39eec97a7e79cf5fb995747dc Mon Sep 17 00:00:00 2001
-From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Date: Mon, 12 Sep 2016 21:49:55 +0530
-Subject: [PATCH] openconf: do not check stdin
-
-Do not check if stdin is redirected when ask_silent is true, so the
-`yes` program can be used to answer the questions about new values.
-
-Example:
-
-  yes "" | make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- oldconfig
-
-Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
-Signed-off-by: Anup Patel <anup@brainfault.org>
----
- tools/openconf/conf.c | 12 ------------
- 1 file changed, 12 deletions(-)
-
-diff --git a/tools/openconf/conf.c b/tools/openconf/conf.c
-index a428058..711cf0b 100644
---- a/tools/openconf/conf.c
-+++ b/tools/openconf/conf.c
-@@ -65,16 +65,6 @@ static void strip(char *str)
- 		*p-- = 0;
- }
- 
--static void check_stdin(void)
--{
--	if (!valid_stdin) {
--		printf("aborted!\n\n");
--		printf("Console input/output is redirected. ");
--		printf("Run 'make oldconfig' to update configuration.\n\n");
--		exit(1);
--	}
--}
--
- static int conf_askvalue(struct symbol *sym, const char *def)
- {
- 	char *ret;
-@@ -100,7 +90,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
- 			printf("%s\n", def);
- 			return 0;
- 		}
--		check_stdin();
- 	case ask_all:
- 		fflush(stdout);
- 		ret = fgets(line, 128, stdin);
-@@ -306,7 +295,6 @@ static int conf_choice(struct menu *menu)
- 				printf("%d\n", cnt);
- 				break;
- 			}
--			check_stdin();
- 		case ask_all:
- 			fflush(stdout);
- 			ret = fgets(line, 128, stdin);
--- 
-2.4.11
-
diff --git a/bsp/buildroot/package/xvisor/Config.in b/bsp/buildroot/package/xvisor/Config.in
index 44bd461c..eb7475b8 100644
--- a/bsp/buildroot/package/xvisor/Config.in
+++ b/bsp/buildroot/package/xvisor/Config.in
@@ -10,9 +10,9 @@ menuconfig BR2_PACKAGE_XVISOR
 	depends on BR2_PACKAGE_XVISOR_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 	help
-	  Xvisor is an open-source type-1 hypervisor, which aims at providing
-	  a monolithic, light-weight, portable, and flexible virtualization
-	  solution.
+	  Xvisor is an open-source type-1 hypervisor, which aims at
+	  providing a monolithic, light-weight, portable, and flexible
+	  virtualization solution.
 
 	  http://www.xhypervisor.org/
 
@@ -32,12 +32,12 @@ endchoice
 
 config BR2_PACKAGE_XVISOR_DEFCONFIG
 	string "Defconfig name"
-	depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG
 	default "generic-v5" if BR2_ARM_CPU_ARMV5
 	default "generic-v6" if BR2_ARM_CPU_ARMV6
 	default "generic-v7" if BR2_ARM_CPU_ARMV7A
 	default "generic-v8" if BR2_aarch64
 	default "x86_64_generic" if BR2_x86_64
+	depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG
 	help
 	  Name of the Xvisor defconfig file to use, without the
 	  trailing -defconfig. The defconfig is located in
diff --git a/bsp/buildroot/package/xvisor/xvisor.hash b/bsp/buildroot/package/xvisor/xvisor.hash
index 13335beb..c170fdb9 100644
--- a/bsp/buildroot/package/xvisor/xvisor.hash
+++ b/bsp/buildroot/package/xvisor/xvisor.hash
@@ -1,2 +1,2 @@
 # Locally generated
-sha256 9347080c3481fb8586d196dd51a580a57084bfea1bc425e89f7fa0da7170708a xvisor-0.2.8.tar.gz
+sha256 29b3b830380dde4f596611abd34487fb753e120ce462dbb0056f3025b88ef14f  xvisor-0.2.9.tar.gz
diff --git a/bsp/buildroot/package/xvisor/xvisor.mk b/bsp/buildroot/package/xvisor/xvisor.mk
index c7afb71f..f75175a4 100644
--- a/bsp/buildroot/package/xvisor/xvisor.mk
+++ b/bsp/buildroot/package/xvisor/xvisor.mk
@@ -4,12 +4,13 @@
 #
 ################################################################################
 
-XVISOR_VERSION = 0.2.8
+XVISOR_VERSION = 0.2.9
 XVISOR_SITE = http://www.xhypervisor.org/tarball
-XVISOR_LICENSE = GPLv2+
+XVISOR_LICENSE = GPL-2.0+
 XVISOR_LICENSE_FILES = COPYING
 XVISOR_INSTALL_IMAGES = YES
 XVISOR_INSTALL_TARGET = NO
+XVISOR_DEPENDENCIES = host-bison host-flex
 
 XVISOR_MAKE_TARGETS = all
 
diff --git a/bsp/buildroot/package/xvkbd/xvkbd.mk b/bsp/buildroot/package/xvkbd/xvkbd.mk
index 14e3f42f..132d7e1f 100644
--- a/bsp/buildroot/package/xvkbd/xvkbd.mk
+++ b/bsp/buildroot/package/xvkbd/xvkbd.mk
@@ -6,7 +6,7 @@
 
 XVKBD_VERSION = 3.7
 XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd
-XVKBD_LICENSE = GPLv2+
+XVKBD_LICENSE = GPL-2.0+
 XVKBD_LICENSE_FILES = README
 
 # Passing USRLIBDIR ensures that the stupid Makefile doesn't add
diff --git a/bsp/buildroot/package/xxhash/xxhash.mk b/bsp/buildroot/package/xxhash/xxhash.mk
index 47ead750..7e040663 100644
--- a/bsp/buildroot/package/xxhash/xxhash.mk
+++ b/bsp/buildroot/package/xxhash/xxhash.mk
@@ -6,7 +6,7 @@
 
 XXHASH_VERSION = r40
 XXHASH_SITE = $(call github,Cyan4973,xxHash,$(XXHASH_VERSION))
-XXHASH_LICENSE = BSD-2c, GPLv2+
+XXHASH_LICENSE = BSD-2-Clause, GPL-2.0+
 XXHASH_LICENSE_FILES = LICENSE xxhsum.c
 
 define XXHASH_BUILD_CMDS
diff --git a/bsp/buildroot/package/xz/Config.in b/bsp/buildroot/package/xz/Config.in
index 50116f29..70c72669 100644
--- a/bsp/buildroot/package/xz/Config.in
+++ b/bsp/buildroot/package/xz/Config.in
@@ -2,13 +2,14 @@ config BR2_PACKAGE_XZ
 	bool "xz-utils"
 	help
 	  XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm
-	  compression format, which provides memory-hungry but powerful
-	  compression (often better than bzip2) and fast, easy decompression.
+	  compression format, which provides memory-hungry but
+	  powerful compression (often better than bzip2) and fast,
+	  easy decompression.
 
-	  This package provides the command line tools for working with XZ
-	  compression, including xz, unxz, xzcat, xzgrep, and so on. They can
-	  also handle the older LZMA format, and if invoked via appropriate
-	  symlinks will emulate the behavior of the commands in the lzma
-	  package.
+	  This package provides the command line tools for working
+	  with XZ compression, including xz, unxz, xzcat, xzgrep, and
+	  so on. They can also handle the older LZMA format, and if
+	  invoked via appropriate symlinks will emulate the behavior
+	  of the commands in the lzma package.
 
 	  http://tukaani.org/xz/
diff --git a/bsp/buildroot/package/xz/xz.mk b/bsp/buildroot/package/xz/xz.mk
index 40adb3d1..e8116f24 100644
--- a/bsp/buildroot/package/xz/xz.mk
+++ b/bsp/buildroot/package/xz/xz.mk
@@ -9,7 +9,7 @@ XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2
 XZ_SITE = http://tukaani.org/xz
 XZ_INSTALL_STAGING = YES
 XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99'
-XZ_LICENSE = GPLv2+, GPLv3+, LGPLv2.1+
+XZ_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-2.1+
 XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
 
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
diff --git a/bsp/buildroot/package/yad/Config.in b/bsp/buildroot/package/yad/Config.in
index 50b97c59..300525ee 100644
--- a/bsp/buildroot/package/yad/Config.in
+++ b/bsp/buildroot/package/yad/Config.in
@@ -3,8 +3,8 @@ config BR2_PACKAGE_YAD
 	depends on BR2_PACKAGE_XORG7
 	depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11
 	help
-	  YAD (yet another dialog) is a tool for create graphical dialogs
-	  from shell scripts.
+	  YAD (yet another dialog) is a tool for create graphical
+	  dialogs from shell scripts.
 
 	  http://sourceforge.net/projects/yad-dialog/
 
diff --git a/bsp/buildroot/package/yad/yad.mk b/bsp/buildroot/package/yad/yad.mk
index a7f5ba25..d674316c 100644
--- a/bsp/buildroot/package/yad/yad.mk
+++ b/bsp/buildroot/package/yad/yad.mk
@@ -7,7 +7,7 @@
 YAD_VERSION = 0.33.1
 YAD_SOURCE = yad-$(YAD_VERSION).tar.xz
 YAD_SITE = http://sourceforge.net/projects/yad-dialog/files
-YAD_LICENSE = GPLv3
+YAD_LICENSE = GPL-3.0
 YAD_LICENSE_FILES = COPYING
 YAD_DEPENDENCIES = host-intltool host-pkgconf
 YAD_CONF_OPTS = --enable-html=no
diff --git a/bsp/buildroot/package/yaffs2utils/yaffs2utils.mk b/bsp/buildroot/package/yaffs2utils/yaffs2utils.mk
index fdd5f67e..c2a87eac 100644
--- a/bsp/buildroot/package/yaffs2utils/yaffs2utils.mk
+++ b/bsp/buildroot/package/yaffs2utils/yaffs2utils.mk
@@ -7,7 +7,7 @@
 YAFFS2UTILS_VERSION = 0.2.9
 YAFFS2UTILS_SOURCE = $(YAFFS2UTILS_VERSION).tar.gz
 YAFFS2UTILS_SITE = https://yaffs2utils.googlecode.com/files
-YAFFS2UTILS_LICENSE = GPLv2
+YAFFS2UTILS_LICENSE = GPL-2.0
 YAFFS2UTILS_LICENSE_FILES = COPYING
 
 define HOST_YAFFS2UTILS_BUILD_CMDS
@@ -15,7 +15,7 @@ define HOST_YAFFS2UTILS_BUILD_CMDS
 endef
 
 define HOST_YAFFS2UTILS_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLDIR=$(HOST_DIR)/usr/bin install
+	$(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLDIR=$(HOST_DIR)/bin install
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/yaml-cpp/Config.in b/bsp/buildroot/package/yaml-cpp/Config.in
index c1ba410a..6d34f421 100644
--- a/bsp/buildroot/package/yaml-cpp/Config.in
+++ b/bsp/buildroot/package/yaml-cpp/Config.in
@@ -8,7 +8,7 @@ config BR2_PACKAGE_YAML_CPP
 	  yaml-cpp is a YAML parser and emitter in C++ matching
 	  the YAML 1.2 spec.
 
-	  https://code.google.com/p/yaml-cpp/
+	  https://github.com/jbeder/yaml-cpp
 
 comment "yaml-cpp needs a toolchain w/ C++, threads, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
diff --git a/bsp/buildroot/package/yasm/yasm.mk b/bsp/buildroot/package/yasm/yasm.mk
index 19800344..b294bd3a 100644
--- a/bsp/buildroot/package/yasm/yasm.mk
+++ b/bsp/buildroot/package/yasm/yasm.mk
@@ -6,7 +6,7 @@
 
 YASM_VERSION = 1.3.0
 YASM_SITE = http://www.tortall.net/projects/yasm/releases
-YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPLv2, LGPLv2
+YASM_LICENSE = BSD-2-Clause, BSD-3-Clause, Artistic, GPL-2.0, LGPL-2.0
 YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0
 
 # This sed prevents it compiling 2 programs (vsyasm and ytasm)
diff --git a/bsp/buildroot/package/yavta/yavta.mk b/bsp/buildroot/package/yavta/yavta.mk
index 04af2a63..4e3d76e3 100644
--- a/bsp/buildroot/package/yavta/yavta.mk
+++ b/bsp/buildroot/package/yavta/yavta.mk
@@ -6,7 +6,7 @@
 
 YAVTA_VERSION = 82ff2efdb9787737b9f21b6f4759f077c827b238
 YAVTA_SITE = git://git.ideasonboard.org/yavta.git
-YAVTA_LICENSE = GPLv2+
+YAVTA_LICENSE = GPL-2.0+
 YAVTA_LICENSE_FILES = COPYING.GPL
 
 define YAVTA_BUILD_CMDS
diff --git a/bsp/buildroot/package/ympd/Config.in b/bsp/buildroot/package/ympd/Config.in
index d0901c71..39b3a86d 100644
--- a/bsp/buildroot/package/ympd/Config.in
+++ b/bsp/buildroot/package/ympd/Config.in
@@ -1,9 +1,9 @@
 config BR2_PACKAGE_YMPD
 	bool "ympd"
-	select BR2_PACKAGE_LIBMPDCLIENT
 	depends on BR2_USE_MMU # fork()
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_LIBMPDCLIENT
 	help
 	  ympd, a standalone MPD Web GUI written in C, utilizing
 	  Websockets and Bootstrap/JS
diff --git a/bsp/buildroot/package/ympd/ympd.mk b/bsp/buildroot/package/ympd/ympd.mk
index 61e9cab8..a50aee07 100644
--- a/bsp/buildroot/package/ympd/ympd.mk
+++ b/bsp/buildroot/package/ympd/ympd.mk
@@ -6,7 +6,7 @@
 
 YMPD_VERSION = v1.2.3
 YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION))
-YMPD_LICENSE = GPLv2
+YMPD_LICENSE = GPL-2.0
 YMPD_LICENSE_FILES = LICENSE
 YMPD_DEPENDENCIES = libmpdclient
 
diff --git a/bsp/buildroot/package/zbar/Config.in b/bsp/buildroot/package/zbar/Config.in
index 5097f574..05c9b769 100644
--- a/bsp/buildroot/package/zbar/Config.in
+++ b/bsp/buildroot/package/zbar/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_ZBAR
 	bool "zbar"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l
 	depends on BR2_USE_MMU # libv4l
-	depends on !BR2_STATIC_LIBS # libv4l
 	depends on BR2_INSTALL_LIBSTDCPP # libv4l
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l
 	select BR2_PACKAGE_JPEG
@@ -12,7 +11,7 @@ config BR2_PACKAGE_ZBAR
 
 	  http://zbar.sourceforge.net/
 
-comment "zbar needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0"
+comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
+	depends on !BR2_TOOLCHAIN_HAS_THREADS \
 		|| !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
diff --git a/bsp/buildroot/package/zbar/zbar.mk b/bsp/buildroot/package/zbar/zbar.mk
index aba78d1b..c8fc8995 100644
--- a/bsp/buildroot/package/zbar/zbar.mk
+++ b/bsp/buildroot/package/zbar/zbar.mk
@@ -7,7 +7,7 @@
 # github have some additional commits for compiling with recent kernel
 ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f
 ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION))
-ZBAR_LICENSE = LGPLv2.1+
+ZBAR_LICENSE = LGPL-2.1+
 ZBAR_LICENSE_FILES = LICENSE
 ZBAR_INSTALL_STAGING = YES
 ZBAR_AUTORECONF = YES
diff --git a/bsp/buildroot/package/zd1211-firmware/zd1211-firmware.mk b/bsp/buildroot/package/zd1211-firmware/zd1211-firmware.mk
index 59ea2199..860aa76c 100644
--- a/bsp/buildroot/package/zd1211-firmware/zd1211-firmware.mk
+++ b/bsp/buildroot/package/zd1211-firmware/zd1211-firmware.mk
@@ -7,7 +7,7 @@
 ZD1211_FIRMWARE_VERSION = 1.4
 ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION)
 ZD1211_FIRMWARE_SOURCE = zd1211-firmware-$(ZD1211_FIRMWARE_VERSION).tar.bz2
-ZD1211_FIRMWARE_LICENSE = GPLv2
+ZD1211_FIRMWARE_LICENSE = GPL-2.0
 ZD1211_FIRMWARE_LICENSE_FILES = COPYING
 
 # Not all of the firmware files are used
diff --git a/bsp/buildroot/package/zeromq/Config.in b/bsp/buildroot/package/zeromq/Config.in
index 53cbbb8f..69be9f00 100644
--- a/bsp/buildroot/package/zeromq/Config.in
+++ b/bsp/buildroot/package/zeromq/Config.in
@@ -48,8 +48,8 @@ config BR2_PACKAGE_ZEROMQ_PGM
 	depends on BR2_USE_WCHAR # openpgm
 	select BR2_PACKAGE_OPENPGM
 	help
-	  Add support for Pragmatic General Multicast protocol (RFC 3208)
-	  implemented either over raw IP packets or UDP datagrams
-	  (encapsulated PGM).
+	  Add support for Pragmatic General Multicast protocol (RFC
+	  3208) implemented either over raw IP packets or UDP
+	  datagrams (encapsulated PGM).
 
 endif
diff --git a/bsp/buildroot/package/zeromq/zeromq.hash b/bsp/buildroot/package/zeromq/zeromq.hash
index 76067d93..486656e4 100644
--- a/bsp/buildroot/package/zeromq/zeromq.hash
+++ b/bsp/buildroot/package/zeromq/zeromq.hash
@@ -1,4 +1,4 @@
 # From https://github.com/zeromq/zeromq4-1/releases
-sha1	2b7490b77860be3060b1b1f92cd73184d309ca69	zeromq-4.1.5.tar.gz
+sha1 b956df8c6f77c174683b51fbee67f99c94945651  zeromq-4.1.6.tar.gz
 # Calculated based on the hash above
-sha256	04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf	zeromq-4.1.5.tar.gz
+sha256 02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a  zeromq-4.1.6.tar.gz
diff --git a/bsp/buildroot/package/zeromq/zeromq.mk b/bsp/buildroot/package/zeromq/zeromq.mk
index 5c99983b..caf56437 100644
--- a/bsp/buildroot/package/zeromq/zeromq.mk
+++ b/bsp/buildroot/package/zeromq/zeromq.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-ZEROMQ_VERSION = 4.1.5
+ZEROMQ_VERSION = 4.1.6
 ZEROMQ_SITE = https://github.com/zeromq/zeromq4-1/releases/download/v$(ZEROMQ_VERSION)
 ZEROMQ_INSTALL_STAGING = YES
 ZEROMQ_DEPENDENCIES = util-linux
 ZEROMQ_CONF_OPTS = --without-documentation
-ZEROMQ_LICENSE = LGPLv3+ with exceptions
+ZEROMQ_LICENSE = LGPL-3.0+ with exceptions
 ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER
 # For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch
 ZEROMQ_AUTORECONF = YES
diff --git a/bsp/buildroot/package/zic/zic.hash b/bsp/buildroot/package/zic/zic.hash
index 6fe27bd2..df578fe1 100644
--- a/bsp/buildroot/package/zic/zic.hash
+++ b/bsp/buildroot/package/zic/zic.hash
@@ -1,2 +1,2 @@
-# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html
-sha512 cac19dded22ff80cd784641ac239358c28cce535ac1eb60b52b7e51c6e9e5fe5f795ea0252daf32c949dddb9c5b24d7e4456d7869aa2725d49c5af58b564822a	tzcode2016j.tar.gz
+# From http://mm.icann.org/pipermail/tz-announce/2018-January/000048.html
+sha512 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2	tzcode2018c.tar.gz
diff --git a/bsp/buildroot/package/zic/zic.mk b/bsp/buildroot/package/zic/zic.mk
index ed7b04eb..aba8bc5b 100644
--- a/bsp/buildroot/package/zic/zic.mk
+++ b/bsp/buildroot/package/zic/zic.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZIC_VERSION = 2016j
+ZIC_VERSION = 2018c
 ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz
 ZIC_SITE = http://www.iana.org/time-zones/repository/releases
 ZIC_STRIP_COMPONENTS = 0
@@ -15,10 +15,10 @@ define HOST_ZIC_BUILD_CMDS
 endef
 
 define HOST_ZIC_INSTALL_CMDS
-	$(INSTALL) -D -m 755 $(@D)/zic $(HOST_DIR)/usr/sbin/zic
-	$(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/usr/include/tzfile.h
+	$(INSTALL) -D -m 755 $(@D)/zic $(HOST_DIR)/sbin/zic
+	$(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/include/tzfile.h
 endef
 
 $(eval $(host-generic-package))
 
-ZIC = $(HOST_DIR)/usr/sbin/zic
+ZIC = $(HOST_DIR)/sbin/zic
diff --git a/bsp/buildroot/package/zip/zip.mk b/bsp/buildroot/package/zip/zip.mk
index 66d94b3c..0bd3d3c1 100644
--- a/bsp/buildroot/package/zip/zip.mk
+++ b/bsp/buildroot/package/zip/zip.mk
@@ -47,7 +47,7 @@ endef
 
 define HOST_ZIP_INSTALL_CMDS
 	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
-		prefix=$(HOST_DIR)/usr
+		prefix=$(HOST_DIR)
 endef
 
 $(eval $(generic-package))
diff --git a/bsp/buildroot/package/zisofs-tools/zisofs-tools.hash b/bsp/buildroot/package/zisofs-tools/zisofs-tools.hash
new file mode 100644
index 00000000..d2f594c7
--- /dev/null
+++ b/bsp/buildroot/package/zisofs-tools/zisofs-tools.hash
@@ -0,0 +1,5 @@
+# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/cdrkit_1.1.11-3.dsc
+sha256  d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da  cdrkit_1.1.11.orig.tar.gz
+
+# Locally computed
+sha256  32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  3rd-party/zisofs_tools/COPYING
diff --git a/bsp/buildroot/package/zisofs-tools/zisofs-tools.mk b/bsp/buildroot/package/zisofs-tools/zisofs-tools.mk
new file mode 100644
index 00000000..fd8c371f
--- /dev/null
+++ b/bsp/buildroot/package/zisofs-tools/zisofs-tools.mk
@@ -0,0 +1,15 @@
+################################################################################
+#
+# zisofs-tools
+#
+################################################################################
+
+ZISOFS_TOOLS_VERSION = 1.1.11
+ZISOFS_TOOLS_SOURCE = cdrkit_$(ZISOFS_TOOLS_VERSION).orig.tar.gz
+ZISOFS_TOOLS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit
+ZISOFS_TOOLS_LICENSE = GPL-2.0+
+ZISOFS_TOOLS_LICENSE_FILES = 3rd-party/zisofs_tools/COPYING
+ZISOFS_TOOLS_SUBDIR = 3rd-party/zisofs_tools
+HOST_ZISOFS_TOOLS_DEPENDENCIES = host-zlib
+
+$(eval $(host-autotools-package))
diff --git a/bsp/buildroot/package/zlib-ng/zlib-ng.hash b/bsp/buildroot/package/zlib-ng/zlib-ng.hash
new file mode 100644
index 00000000..2e89a8d7
--- /dev/null
+++ b/bsp/buildroot/package/zlib-ng/zlib-ng.hash
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256	2ec78c8c13530bffaebfc10be2f4695c47cf50fe2fbc2104606467703836fa0e zlib-ng-a17fefa147942edbf80ab22a16bcbc2419def12d.tar.gz
+sha256	d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md
diff --git a/bsp/buildroot/package/zlib-ng/zlib-ng.mk b/bsp/buildroot/package/zlib-ng/zlib-ng.mk
new file mode 100644
index 00000000..3d9651c0
--- /dev/null
+++ b/bsp/buildroot/package/zlib-ng/zlib-ng.mk
@@ -0,0 +1,22 @@
+################################################################################
+#
+# zlib-ng
+#
+################################################################################
+
+ZLIB_NG_VERSION = a17fefa147942edbf80ab22a16bcbc2419def12d
+ZLIB_NG_SITE = $(call github,mtl1979,zlib-ng,$(ZLIB_NG_VERSION))
+ZLIB_NG_LICENSE = Zlib
+ZLIB_NG_LICENSE_FILES = LICENSE.md
+ZLIB_NG_INSTALL_STAGING = YES
+ZLIB_NG_PROVIDES = zlib
+
+# Build with zlib compatible API, gzFile support and optimizations on
+ZLIB_NG_CONF_OPTS += -DZLIB_COMPAT=1 -DWITH_GZFILEOP=1 -DWITH_OPTIM=1 -DCC=$(TARGET_CC)
+
+# Enable NEON and ACLE on ARM
+ifeq ($(BR2_arm),y)
+ZLIB_NG_CONF_OPTS += -DWITH_ACLE=1 -DWITH_NEON=1
+endif
+
+$(eval $(cmake-package))
diff --git a/bsp/buildroot/package/zlib/Config.in b/bsp/buildroot/package/zlib/Config.in
index 6201aba1..0f6179f5 100644
--- a/bsp/buildroot/package/zlib/Config.in
+++ b/bsp/buildroot/package/zlib/Config.in
@@ -1,7 +1,55 @@
+config BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS
+	bool
+	default y if BR2_arm
+	default y if BR2_aarch64
+	default y if BR2_i386
+	default y if BR2_x86_64
+
 config BR2_PACKAGE_ZLIB
+	bool "zlib support"
+	help
+	  Select the desired Zlib library provider.
+
+if BR2_PACKAGE_ZLIB
+
+choice
+	prompt "zlib variant"
+	default BR2_PACKAGE_LIBZLIB
+	help
+	  Select the desired Zlib library provider.
+
+config BR2_PACKAGE_LIBZLIB
 	bool "zlib"
+	select BR2_PACKAGE_HAS_ZLIB
 	help
 	  Standard (de)compression library. Used by things like
 	  gzip and libpng.
 
 	  http://www.zlib.net
+
+config BR2_PACKAGE_ZLIB_NG
+	bool "zlib-ng"
+	depends on BR2_PACKAGE_ZLIB_NG_ARCH_SUPPORTS
+	select BR2_PACKAGE_HAS_ZLIB
+	help
+	  Zlib replacement with optimizations for
+	  "next generation" systems.
+
+	  https://github.com/mtl1979/zlib-ng/tree/renamelib
+
+endchoice
+
+config BR2_PACKAGE_HAS_ZLIB
+	bool
+
+config BR2_PACKAGE_PROVIDES_ZLIB
+	string
+	default "libzlib" if BR2_PACKAGE_LIBZLIB
+	default "zlib-ng" if BR2_PACKAGE_ZLIB_NG
+
+endif
+
+# ensure libzlib is used for the host variant
+config BR2_PACKAGE_PROVIDES_HOST_ZLIB
+	string
+	default "host-libzlib"
diff --git a/bsp/buildroot/package/zlib/zlib.hash b/bsp/buildroot/package/zlib/zlib.hash
deleted file mode 100644
index 81cb64ef..00000000
--- a/bsp/buildroot/package/zlib/zlib.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://www.zlib.net/
-sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066  zlib-1.2.11.tar.xz
diff --git a/bsp/buildroot/package/zlib/zlib.mk b/bsp/buildroot/package/zlib/zlib.mk
index deea5a5e..78f48ff0 100644
--- a/bsp/buildroot/package/zlib/zlib.mk
+++ b/bsp/buildroot/package/zlib/zlib.mk
@@ -4,74 +4,5 @@
 #
 ################################################################################
 
-ZLIB_VERSION = 1.2.11
-ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz
-ZLIB_SITE = http://www.zlib.net
-ZLIB_LICENSE = zlib license
-ZLIB_LICENSE_FILES = README
-ZLIB_INSTALL_STAGING = YES
-
-# It is not possible to build only a shared version of zlib, so we build both
-# shared and static, unless we only want the static libs, and we eventually
-# selectively remove what we do not want
-ifeq ($(BR2_STATIC_LIBS),y)
-ZLIB_PIC =
-ZLIB_SHARED = --static
-else
-ZLIB_PIC = -fPIC
-ZLIB_SHARED = --shared
-endif
-
-define ZLIB_CONFIGURE_CMDS
-	(cd $(@D); rm -rf config.cache; \
-		$(TARGET_CONFIGURE_ARGS) \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) $(ZLIB_PIC)" \
-		./configure \
-		$(ZLIB_SHARED) \
-		--prefix=/usr \
-	)
-endef
-
-define HOST_ZLIB_CONFIGURE_CMDS
-	(cd $(@D); rm -rf config.cache; \
-		$(HOST_CONFIGURE_ARGS) \
-		$(HOST_CONFIGURE_OPTS) \
-		./configure \
-		--prefix="$(HOST_DIR)/usr" \
-		--sysconfdir="$(HOST_DIR)/etc" \
-	)
-endef
-
-define ZLIB_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)
-endef
-
-define HOST_ZLIB_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D)
-endef
-
-define ZLIB_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) LDCONFIG=true install
-endef
-
-define ZLIB_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) LDCONFIG=true install
-endef
-
-# We don't care removing the .a from target, since it not used at link
-# time to build other packages, and it is anyway removed later before
-# assembling the filesystem images anyway.
-ifeq ($(BR2_SHARED_LIBS),y)
-define ZLIB_RM_STATIC_STAGING
-	rm -f $(STAGING_DIR)/usr/lib/libz.a
-endef
-ZLIB_POST_INSTALL_STAGING_HOOKS += ZLIB_RM_STATIC_STAGING
-endif
-
-define HOST_ZLIB_INSTALL_CMDS
-	$(HOST_MAKE_ENV) $(MAKE1) -C $(@D) LDCONFIG=true install
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
+$(eval $(virtual-package))
+$(eval $(host-virtual-package))
diff --git a/bsp/buildroot/package/zlog/zlog.mk b/bsp/buildroot/package/zlog/zlog.mk
index 4f7f4692..8e005e43 100644
--- a/bsp/buildroot/package/zlog/zlog.mk
+++ b/bsp/buildroot/package/zlog/zlog.mk
@@ -6,7 +6,7 @@
 
 ZLOG_VERSION = 6ddb9bbf3ff0123e701bf60996f351576ebe9c00
 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION))
-ZLOG_LICENSE = LGPLv2.1
+ZLOG_LICENSE = LGPL-2.1
 ZLOG_LICENSE_FILES = COPYING
 ZLOG_INSTALL_STAGING = YES
 
diff --git a/bsp/buildroot/package/zmqpp/Config.in b/bsp/buildroot/package/zmqpp/Config.in
index 04a6d241..8dad80e4 100644
--- a/bsp/buildroot/package/zmqpp/Config.in
+++ b/bsp/buildroot/package/zmqpp/Config.in
@@ -8,8 +8,8 @@ config BR2_PACKAGE_ZMQPP
 	help
 	  C++ binding for zeromq (ZeroMQ, 0MQ, zmq).
 
-	  This C++ binding is a 'high-level' library that hides most of the
-	  C-style interface core zeromq provides.
+	  This C++ binding is a 'high-level' library that hides most
+	  of the C-style interface core zeromq provides.
 
 	  http://github.com/benjamg/zmqpp
 
@@ -27,8 +27,8 @@ config BR2_PACKAGE_ZMQPP_CLIENT
 	select BR2_PACKAGE_BOOST
 	select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS
 	help
-	  Build and install the zmqpp client, a command line tool that can be
-	  used to listen or send to zeromq sockets.
+	  Build and install the zmqpp client, a command line tool that
+	  can be used to listen or send to zeromq sockets.
 
 comment "zmqpp client needs a toolchain w/ dynamic library, threads, wchar"
 	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \
diff --git a/bsp/buildroot/package/zmqpp/zmqpp.mk b/bsp/buildroot/package/zmqpp/zmqpp.mk
index cf233b95..e57f7de4 100644
--- a/bsp/buildroot/package/zmqpp/zmqpp.mk
+++ b/bsp/buildroot/package/zmqpp/zmqpp.mk
@@ -8,10 +8,19 @@ ZMQPP_VERSION = 4.1.2
 ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION))
 ZMQPP_INSTALL_STAGING = YES
 ZMQPP_DEPENDENCIES = zeromq
-ZMQPP_LICENSE = MPLv2.0
+ZMQPP_LICENSE = MPL-2.0
 ZMQPP_LICENSE_FILES = LICENSE
 ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr
 ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread
+ZMQPP_CONFIG = $(if $(BR2_ENABLE_DEBUG),debug,release)
+
+# gcc bug internal compiler error: in merge_overlapping_regs, at
+# regrename.c:304. This bug is fixed since gcc 6.
+# By setting CONFIG to empty, all optimizations such as -funroll-loops
+# -ffast-math -finline-functions -fomit-frame-pointer are disabled
+ifeq ($(BR2_or1k):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:)
+ZMQPP_CONFIG =
+endif
 
 ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
 ZMQPP_LDFLAGS += -latomic
@@ -31,7 +40,7 @@ endif
 
 define ZMQPP_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		LDFLAGS="$(ZMQPP_LDFLAGS)" \
+		CONFIG=$(ZMQPP_CONFIG) LDFLAGS="$(ZMQPP_LDFLAGS)" \
 		$(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),client,library) -C $(@D)
 endef
 
diff --git a/bsp/buildroot/package/znc/0001-Add-time.h-includes-where-appropiate.patch b/bsp/buildroot/package/znc/0001-Add-time.h-includes-where-appropiate.patch
deleted file mode 100644
index c8ba6d45..00000000
--- a/bsp/buildroot/package/znc/0001-Add-time.h-includes-where-appropiate.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-From 9a51195e916f14a36c2a2a809f2393e5ed2424a3 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Thu, 6 Aug 2015 11:20:54 -0300
-Subject: [PATCH] Add <time.h> includes where appropiate
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- modules/adminlog.cpp    | 1 +
- modules/ctcpflood.cpp   | 1 +
- modules/flooddetach.cpp | 1 +
- modules/lastseen.cpp    | 1 +
- modules/log.cpp         | 1 +
- modules/simple_away.cpp | 1 +
- src/Buffer.cpp          | 1 +
- src/FileUtils.cpp       | 1 +
- src/IRCSock.cpp         | 1 +
- src/User.cpp            | 1 +
- src/WebModules.cpp      | 1 +
- src/ZNCDebug.cpp        | 1 +
- src/main.cpp            | 1 +
- src/znc.cpp             | 1 +
- 14 files changed, 14 insertions(+)
-
-diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp
-index d08369e..1636799 100644
---- a/modules/adminlog.cpp
-+++ b/modules/adminlog.cpp
-@@ -20,6 +20,7 @@
- #include <znc/User.h>
- 
- #include <syslog.h>
-+#include <time.h>
- 
- class CAdminLogMod : public CModule {
- public:
-diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp
-index 7697ef8..c105ef7 100644
---- a/modules/ctcpflood.cpp
-+++ b/modules/ctcpflood.cpp
-@@ -16,6 +16,7 @@
- 
- #include <znc/Modules.h>
- #include <znc/Chan.h>
-+#include <time.h>
- 
- class CCtcpFloodMod : public CModule {
- public:
-diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp
-index 9c41734..cd88bd2 100644
---- a/modules/flooddetach.cpp
-+++ b/modules/flooddetach.cpp
-@@ -16,6 +16,7 @@
- 
- #include <znc/Chan.h>
- #include <znc/IRCNetwork.h>
-+#include <time.h>
- 
- using std::map;
- 
-diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp
-index 416a111..414310f 100644
---- a/modules/lastseen.cpp
-+++ b/modules/lastseen.cpp
-@@ -16,6 +16,7 @@
- 
- #include <znc/User.h>
- #include <znc/znc.h>
-+#include <time.h>
- 
- using std::map;
- using std::pair;
-diff --git a/modules/log.cpp b/modules/log.cpp
-index 2f3124a..e238bb1 100644
---- a/modules/log.cpp
-+++ b/modules/log.cpp
-@@ -20,6 +20,7 @@
- #include <znc/IRCNetwork.h>
- #include <znc/Chan.h>
- #include <znc/Server.h>
-+#include <time.h>
- #include <algorithm>
- 
- using std::vector;
-diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp
-index 57d6e7a..2f73b0a 100644
---- a/modules/simple_away.cpp
-+++ b/modules/simple_away.cpp
-@@ -16,6 +16,7 @@
- 
- #include <znc/User.h>
- #include <znc/IRCNetwork.h>
-+#include <time.h>
- 
- #define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s"
- #define SIMPLE_AWAY_DEFAULT_TIME   60
-diff --git a/src/Buffer.cpp b/src/Buffer.cpp
-index 4715f76..dc14642 100644
---- a/src/Buffer.cpp
-+++ b/src/Buffer.cpp
-@@ -17,6 +17,7 @@
- #include <znc/Buffer.h>
- #include <znc/znc.h>
- #include <znc/User.h>
-+#include <time.h>
- 
- CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) : m_sFormat(sFormat), m_sText(sText), m_time() {
- 	if (ts == nullptr)
-diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp
-index d358aa4..92218f3 100644
---- a/src/FileUtils.cpp
-+++ b/src/FileUtils.cpp
-@@ -22,6 +22,7 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <time.h>
- 
- #ifndef HAVE_LSTAT
- #  define lstat(a, b)	stat(a, b)
-diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp
-index 738b5bf..c97b8fe 100644
---- a/src/IRCSock.cpp
-+++ b/src/IRCSock.cpp
-@@ -20,6 +20,7 @@
- #include <znc/IRCNetwork.h>
- #include <znc/Server.h>
- #include <znc/Query.h>
-+#include <time.h>
- 
- using std::set;
- using std::vector;
-diff --git a/src/User.cpp b/src/User.cpp
-index f3b5b91..580b52d 100644
---- a/src/User.cpp
-+++ b/src/User.cpp
-@@ -22,6 +22,7 @@
- #include <znc/Chan.h>
- #include <znc/Query.h>
- #include <math.h>
-+#include <time.h>
- #include <algorithm>
- 
- using std::vector;
-diff --git a/src/WebModules.cpp b/src/WebModules.cpp
-index 832a2e1..74e56de 100644
---- a/src/WebModules.cpp
-+++ b/src/WebModules.cpp
-@@ -19,6 +19,7 @@
- #include <znc/User.h>
- #include <znc/IRCNetwork.h>
- #include <znc/znc.h>
-+#include <time.h>
- #include <algorithm>
- #include <sstream>
- 
-diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp
-index 6e36b57..be2f77f 100644
---- a/src/ZNCDebug.cpp
-+++ b/src/ZNCDebug.cpp
-@@ -18,6 +18,7 @@
- #include <iostream>
- #include <sys/time.h>
- #include <stdio.h>
-+#include <time.h>
- 
- bool CDebug::stdoutIsTTY = true;
- bool CDebug::debug =
-diff --git a/src/main.cpp b/src/main.cpp
-index 465e1a0..cbe72bf 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -16,6 +16,7 @@
- 
- #include <znc/znc.h>
- #include <signal.h>
-+#include <time.h>
- 
- #if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD)
- #include <znc/Threads.h>
-diff --git a/src/znc.cpp b/src/znc.cpp
-index 624b92c..4c1ffcd 100644
---- a/src/znc.cpp
-+++ b/src/znc.cpp
-@@ -21,6 +21,7 @@
- #include <znc/User.h>
- #include <znc/IRCNetwork.h>
- #include <znc/Config.h>
-+#include <time.h>
- #include <tuple>
- #include <algorithm>
- 
--- 
-2.4.6
-
diff --git a/bsp/buildroot/package/znc/0002-csocket-timeh.patch b/bsp/buildroot/package/znc/0002-csocket-timeh.patch
deleted file mode 100644
index cbd435fc..00000000
--- a/bsp/buildroot/package/znc/0002-csocket-timeh.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Include time.h since time_t is used.
-
-Status: not upstream, seems to be fixed in newer CSocket versions in a
-different way but it hasn't been updated/bundled in znc yet.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura znc-1.6.1.orig/src/Csocket.cpp znc-1.6.1.cs/src/Csocket.cpp
---- znc-1.6.1.orig/src/Csocket.cpp	2015-08-06 10:14:45.256246307 -0300
-+++ znc-1.6.1.cs/src/Csocket.cpp	2015-08-06 10:27:25.380446888 -0300
-@@ -54,6 +54,8 @@
- #include <unicode/ucnv_cb.h>
- #endif /* HAVE_ICU */
- 
-+#include <time.h>
-+
- #include <list>
- 
- #define CS_SRANDBUFFER 128
diff --git a/bsp/buildroot/package/znc/Config.in b/bsp/buildroot/package/znc/Config.in
index 154d4b07..4fc7bbb9 100644
--- a/bsp/buildroot/package/znc/Config.in
+++ b/bsp/buildroot/package/znc/Config.in
@@ -3,13 +3,14 @@ config BR2_PACKAGE_ZNC
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  Advanced IRC bouncer
 
 	  http://www.znc.in
 
-comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.7"
+comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
diff --git a/bsp/buildroot/package/znc/znc.hash b/bsp/buildroot/package/znc/znc.hash
index 36823514..7a145959 100644
--- a/bsp/buildroot/package/znc/znc.hash
+++ b/bsp/buildroot/package/znc/znc.hash
@@ -1,2 +1,3 @@
 # Locally calculated
-sha256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c  znc-1.6.4.tar.gz
+sha256 44cfea7158ea05dc2547c7c6bc22371e66c869def90351de0ab90a9c200d39c4  znc-1.7.1.tar.gz
+sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/bsp/buildroot/package/znc/znc.mk b/bsp/buildroot/package/znc/znc.mk
index 5b96ee52..5235fd91 100644
--- a/bsp/buildroot/package/znc/znc.mk
+++ b/bsp/buildroot/package/znc/znc.mk
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-ZNC_VERSION = 1.6.4
-ZNC_SITE = http://znc.in/releases
+ZNC_VERSION = 1.7.1
+ZNC_SITE = http://znc.in/releases/archive
 ZNC_LICENSE = Apache-2.0
 ZNC_LICENSE_FILES = LICENSE
 ZNC_DEPENDENCIES = host-pkgconf
@@ -32,7 +32,8 @@ else
 ZNC_CONF_OPTS += --disable-zlib
 endif
 
-ifeq ($(BR2_PACKAGE_PYTHON3),y)
+# python support depends on icu
+ifeq ($(BR2_PACKAGE_ICU)$(BR2_PACKAGE_PYTHON3),yy)
 ZNC_DEPENDENCIES += python3 host-swig
 ZNC_CONF_OPTS += --enable-python=python3
 else
diff --git a/bsp/buildroot/package/zsh/Config.in b/bsp/buildroot/package/zsh/Config.in
index ed8cf678..2e9daac6 100644
--- a/bsp/buildroot/package/zsh/Config.in
+++ b/bsp/buildroot/package/zsh/Config.in
@@ -4,9 +4,9 @@ config BR2_PACKAGE_ZSH
 	depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	select BR2_PACKAGE_NCURSES
 	help
-	  zsh is a shell designed for interactive use, although it is also
-	  a powerful scripting language. Many of the useful features of bash,
-	  ksh, and tcsh were incorporated into zsh; many original features
-	  were added.
+	  zsh is a shell designed for interactive use, although it is
+	  also a powerful scripting language. Many of the useful
+	  features of bash, ksh, and tcsh were incorporated into zsh;
+	  many original features were added.
 
 	  http://www.zsh.org/
diff --git a/bsp/buildroot/package/zsh/zsh.hash b/bsp/buildroot/package/zsh/zsh.hash
index 0eeebd43..0770d8e2 100644
--- a/bsp/buildroot/package/zsh/zsh.hash
+++ b/bsp/buildroot/package/zsh/zsh.hash
@@ -1,4 +1,7 @@
 # From http://www.zsh.org/pub/MD5SUM
-md5	c5ba34e68fcf62a2e78adc56bf3d328a	zsh-5.3.tar.xz
-# Calculated based on the hash above
-sha256	76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a	zsh-5.3.tar.xz
+md5	dfe156fd69b0d8d1745ecf6d6e02e047	zsh-5.4.2.tar.gz
+# Calculated based on the hash above and after checking signature
+# http://www.zsh.org/pub/zsh-5.4.2.tar.gz.asc
+sha256	957bcdb2c57f64c02f673693ea5a7518ef24b6557aeb3a4ce222cefa6d74acc9	zsh-5.4.2.tar.gz
+# Locally calculated
+sha256	d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5  LICENCE
diff --git a/bsp/buildroot/package/zsh/zsh.mk b/bsp/buildroot/package/zsh/zsh.mk
index 9d11b971..bfd0a1a3 100644
--- a/bsp/buildroot/package/zsh/zsh.mk
+++ b/bsp/buildroot/package/zsh/zsh.mk
@@ -4,11 +4,11 @@
 #
 ################################################################################
 
-ZSH_VERSION = 5.3
+ZSH_VERSION = 5.4.2
 ZSH_SITE = http://www.zsh.org/pub
-ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz
 ZSH_DEPENDENCIES = ncurses
 ZSH_CONF_OPTS = --bindir=/bin
+ZSH_CONF_ENV = zsh_cv_sys_nis=no zsh_cv_sys_nis_plus=no
 ZSH_LICENSE = MIT-like
 ZSH_LICENSE_FILES = LICENCE
 
diff --git a/bsp/buildroot/package/zstd/Config.in b/bsp/buildroot/package/zstd/Config.in
new file mode 100644
index 00000000..9fa70c65
--- /dev/null
+++ b/bsp/buildroot/package/zstd/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_ZSTD
+	bool "zstd"
+	help
+	  Zstandard, or zstd as short version, is a fast lossless
+	  compression algorithm, targeting real-time compression
+	  scenarios at zlib-level and better compression ratios
+
+	  The selection of other packages will enable some features:
+	  xz, lz4 and/or zlib will enable support for corresponding
+	  compression formats
+
+	  https://facebook.github.io/zstd
diff --git a/bsp/buildroot/package/zstd/zstd.hash b/bsp/buildroot/package/zstd/zstd.hash
new file mode 100644
index 00000000..51e5fc24
--- /dev/null
+++ b/bsp/buildroot/package/zstd/zstd.hash
@@ -0,0 +1,6 @@
+# Locally computed
+sha256 a77c47153ee7de02626c5b2a097005786b71688be61e9fb81806a011f90b297b zstd-v1.3.3.tar.gz
+
+# License files (locally computed as well)
+sha256 2c1a7fa704df8f3a606f6fc010b8b5aaebf403f3aeec339a12048f1ba7331a0b LICENSE
+sha256 f9c375a1be4a41f7b70301dd83c91cb89e41567478859b77eef375a52d782505 COPYING
diff --git a/bsp/buildroot/package/zstd/zstd.mk b/bsp/buildroot/package/zstd/zstd.mk
new file mode 100644
index 00000000..c0fa8802
--- /dev/null
+++ b/bsp/buildroot/package/zstd/zstd.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# zstd
+#
+################################################################################
+
+ZSTD_VERSION = v1.3.3
+ZSTD_SITE = $(call github,facebook,zstd,$(ZSTD_VERSION))
+ZSTD_LICENSE = BSD-3-Clause or GPL-2.0
+ZSTD_LICENSE_FILES = LICENSE COPYING
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+ZSTD_OPTS += HAVE_THREAD=1
+else
+ZSTD_OPTS += HAVE_THREAD=0
+endif
+
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+ZSTD_DEPENDENCIES += zlib
+ZSTD_OPTS += HAVE_ZLIB=1
+else
+ZSTD_OPTS += HAVE_ZLIB=0
+endif
+
+ifeq ($(BR2_PACKAGE_XZ),y)
+ZSTD_DEPENDENCIES += xz
+ZSTD_OPTS += HAVE_LZMA=1
+else
+ZSTD_OPTS += HAVE_LZMA=0
+endif
+
+ifeq ($(BR2_PACKAGE_LZ4),y)
+ZSTD_DEPENDENCIES += lz4
+ZSTD_OPTS += HAVE_LZ4=1
+else
+ZSTD_OPTS += HAVE_LZ4=0
+endif
+
+define ZSTD_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+		-C $(@D) zstd
+endef
+
+define ZSTD_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) $(ZSTD_OPTS) \
+		DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D)/programs install
+endef
+
+$(eval $(generic-package))
diff --git a/bsp/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk b/bsp/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk
index 46051fb8..3648c636 100644
--- a/bsp/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk
+++ b/bsp/buildroot/package/zynq-boot-bin/zynq-boot-bin.mk
@@ -7,7 +7,7 @@
 ZYNQ_BOOT_BIN_VERSION = xilinx-v2015.1
 ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py
 ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/$(ZYNQ_BOOT_BIN_VERSION)/tools
-ZYNQ_BOOT_BIN_LICENSE = GPLv3+
+ZYNQ_BOOT_BIN_LICENSE = GPL-3.0+
 
 HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python
 
@@ -16,7 +16,7 @@ define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS
 endef
 
 define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/usr/bin/$(ZYNQ_BOOT_BIN_SOURCE)
+	$(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/bin/$(ZYNQ_BOOT_BIN_SOURCE)
 endef
 
 $(eval $(host-generic-package))
diff --git a/bsp/buildroot/package/zyre/zyre.mk b/bsp/buildroot/package/zyre/zyre.mk
index e47da975..baaa57f5 100644
--- a/bsp/buildroot/package/zyre/zyre.mk
+++ b/bsp/buildroot/package/zyre/zyre.mk
@@ -6,7 +6,7 @@
 
 ZYRE_VERSION = 1d949e4bf79b694ea883c325f5813e87ddc2a687
 ZYRE_SITE = $(call github,zeromq,zyre,$(ZYRE_VERSION))
-ZYRE_LICENSE = MPLv2.0
+ZYRE_LICENSE = MPL-2.0
 ZYRE_LICENSE_FILES = LICENSE
 ZYRE_INSTALL_STAGING = YES
 ZYRE_DEPENDENCIES = czmq zeromq host-pkgconf
diff --git a/bsp/buildroot/support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config b/bsp/buildroot/support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config
new file mode 100644
index 00000000..c2f4cb62
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config
@@ -0,0 +1,10 @@
+BR2_arm=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv5-ctng-linux-gnueabi.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv5-ctng-linux-gnueabi"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config b/bsp/buildroot/support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config
new file mode 100644
index 00000000..60ec9529
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config
@@ -0,0 +1,13 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_NEON=y
+BR2_ARM_ENABLE_VFP=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/armv7-ctng-linux-gnueabihf.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="armv7-ctng-linux-gnueabihf"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config
new file mode 100644
index 00000000..af1cbf89
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-aarch64-glibc.config
@@ -0,0 +1,9 @@
+BR2_aarch64=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-aarch64-glibc-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arc-full-internal.config b/bsp/buildroot/support/config-fragments/autobuild/br-arc-full-internal.config
new file mode 100644
index 00000000..4755c9e4
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arc-full-internal.config
@@ -0,0 +1,3 @@
+BR2_arcle=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arc-internal-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-arc-internal-glibc.config
new file mode 100644
index 00000000..b9d68572
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arc-internal-glibc.config
@@ -0,0 +1,4 @@
+BR2_arcle=y
+BR2_archs38=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config b/bsp/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
new file mode 100644
index 00000000..be4f5353
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arcle-hs38.config
@@ -0,0 +1,11 @@
+BR2_arcle=y
+BR2_archs38=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arcle-hs38-full-2017.11-rc2-15-g9d544fe.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-basic.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-basic.config
new file mode 100644
index 00000000..a420284c
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-basic.config
@@ -0,0 +1,8 @@
+BR2_arm=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-basic-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
new file mode 100644
index 00000000..fea1564a
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config
@@ -0,0 +1,11 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_VFP=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-glibc-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
new file mode 100644
index 00000000..2db2aa0b
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-a9-musl.config
@@ -0,0 +1,11 @@
+BR2_arm=y
+BR2_cortex_a9=y
+BR2_ARM_ENABLE_VFP=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
new file mode 100644
index 00000000..f60df91f
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-cortex-m4-full.config
@@ -0,0 +1,12 @@
+BR2_arm=y
+BR2_cortex_m4=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-m4-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config
new file mode 100644
index 00000000..33034cf7
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-full-nothread.config
@@ -0,0 +1,11 @@
+BR2_arm=y
+BR2_arm1176jzf_s=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm11-full-nothread-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-full-static.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-full-static.config
new file mode 100644
index 00000000..dd0a3931
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-full-static.config
@@ -0,0 +1,11 @@
+BR2_arm=y
+BR2_STATIC_LIBS=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-static-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-full.config
new file mode 100644
index 00000000..659d07ce
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-full.config
@@ -0,0 +1,10 @@
+BR2_arm=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-full.config
new file mode 100644
index 00000000..b5f10069
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-full.config
@@ -0,0 +1,5 @@
+BR2_arm=y
+BR2_ARM_EABI=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config
new file mode 100644
index 00000000..6b2566ee
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-glibc.config
@@ -0,0 +1,4 @@
+BR2_arm=y
+BR2_cortex_a8=y
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-musl.config b/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-musl.config
new file mode 100644
index 00000000..92788626
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-arm-internal-musl.config
@@ -0,0 +1,4 @@
+BR2_arm=y
+BR2_cortex_a8=y
+BR2_TOOLCHAIN_BUILDROOT_MUSL=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-bfin-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-bfin-full.config
new file mode 100644
index 00000000..eeefcefb
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-bfin-full.config
@@ -0,0 +1,12 @@
+BR2_bfin=y
+BR2_bf512=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-bfin-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config b/bsp/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
new file mode 100644
index 00000000..b9041a77
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config
@@ -0,0 +1,10 @@
+BR2_x86_pentium_mmx=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-i386-pentium-mmx-musl-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
new file mode 100644
index 00000000..08eb21b8
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-i386-pentium4-full.config
@@ -0,0 +1,10 @@
+BR2_x86_pentium4=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config
new file mode 100644
index 00000000..bf455e08
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-m68k-5208-full.config
@@ -0,0 +1,11 @@
+BR2_m68k=y
+BR2_m68k_cf5208=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-5208-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config
new file mode 100644
index 00000000..0766ffc3
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-m68k-68040-full.config
@@ -0,0 +1,10 @@
+BR2_m68k=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-m68k-68040-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-microblazeel-full-internal.config b/bsp/buildroot/support/config-fragments/autobuild/br-microblazeel-full-internal.config
new file mode 100644
index 00000000..0d2d7df8
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-microblazeel-full-internal.config
@@ -0,0 +1 @@
+BR2_microblazeel=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
new file mode 100644
index 00000000..ea920f0a
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-microblazeel-full.config
@@ -0,0 +1,10 @@
+BR2_microblazeel=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-microblaze-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
new file mode 100644
index 00000000..237265bd
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config
@@ -0,0 +1,11 @@
+BR2_mipsel=y
+BR2_mips_32r6=y
+# BR2_MIPS_SOFT_FLOAT is not set
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips32r6-el-hf-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config
new file mode 100644
index 00000000..f8a67f2c
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-mips64-n64-full.config
@@ -0,0 +1,10 @@
+BR2_mips64el=y
+BR2_MIPS_NABI64=y
+# BR2_MIPS_SOFT_FLOAT is not set
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64-n64-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
new file mode 100644
index 00000000..b0e92360
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config
@@ -0,0 +1,12 @@
+BR2_mips64el=y
+BR2_mips_64r6=y
+BR2_MIPS_NABI64=y
+# BR2_MIPS_SOFT_FLOAT is not set
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mips64r6-n64-el-hf-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config
new file mode 100644
index 00000000..e608b424
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-mipsel-o32-full.config
@@ -0,0 +1,10 @@
+BR2_mipsel=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-mipsel-o32-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
new file mode 100644
index 00000000..52b9f7f9
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-nios2-glibc.config
@@ -0,0 +1,10 @@
+BR2_nios2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-nios2-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_SSP is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config
new file mode 100644
index 00000000..3a4f0b62
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-openrisc-uclibc.config
@@ -0,0 +1,10 @@
+BR2_or1k=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-openrisc-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_5=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
new file mode 100644
index 00000000..63cffef7
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config
@@ -0,0 +1,10 @@
+BR2_powerpc=y
+BR2_powerpc_603e=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-603e-basic-cpp-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
new file mode 100644
index 00000000..83b4c093
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-e500mc-full.config
@@ -0,0 +1,11 @@
+BR2_powerpc=y
+BR2_powerpc_e500mc=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-powerpc-e500mc-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-internal-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-internal-full.config
new file mode 100644
index 00000000..61b3e7a9
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc-internal-full.config
@@ -0,0 +1,4 @@
+BR2_powerpc=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
new file mode 100644
index 00000000..99ab1695
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc64-power7-glibc.config
@@ -0,0 +1,9 @@
+BR2_powerpc64=y
+BR2_powerpc_power7=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64-power7-glibc-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
new file mode 100644
index 00000000..12e3e8fc
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config
@@ -0,0 +1,9 @@
+BR2_powerpc64le=y
+BR2_powerpc_power8=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/br-powerpc64le-power8-glibc-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-sh4-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-sh4-full.config
new file mode 100644
index 00000000..884fbc79
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-sh4-full.config
@@ -0,0 +1,10 @@
+BR2_sh=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sh4-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
new file mode 100644
index 00000000..19bce355
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-sparc-uclibc.config
@@ -0,0 +1,9 @@
+BR2_sparc=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc-uclibc-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config b/bsp/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
new file mode 100644
index 00000000..093de54b
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-sparc64-glibc.config
@@ -0,0 +1,8 @@
+BR2_sparc64=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-sparc64-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
new file mode 100644
index 00000000..c1ccddbe
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-x86-64-core2-full.config
@@ -0,0 +1,11 @@
+BR2_x86_64=y
+BR2_x86_core2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-core2-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config b/bsp/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config
new file mode 100644
index 00000000..6ee19ab2
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-x86-64-musl.config
@@ -0,0 +1,10 @@
+BR2_x86_64=y
+BR2_x86_atom=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-x86-64-musl-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-xtensa-full-internal.config b/bsp/buildroot/support/config-fragments/autobuild/br-xtensa-full-internal.config
new file mode 100644
index 00000000..89e81d4c
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-xtensa-full-internal.config
@@ -0,0 +1,3 @@
+BR2_xtensa=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/br-xtensa-full.config b/bsp/buildroot/support/config-fragments/autobuild/br-xtensa-full.config
new file mode 100644
index 00000000..23e2b8b7
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/br-xtensa-full.config
@@ -0,0 +1,9 @@
+BR2_xtensa=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-xtensa-full-2017.11-rc1.tar.bz2"
+BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13=y
+BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/i686-ctng-linux-gnu.config b/bsp/buildroot/support/config-fragments/autobuild/i686-ctng-linux-gnu.config
new file mode 100644
index 00000000..9a961123
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/i686-ctng-linux-gnu.config
@@ -0,0 +1,10 @@
+BR2_x86_i686=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/i686-ctng-linux-gnu.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i686-ctng-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/linaro-aarch64.config b/bsp/buildroot/support/config-fragments/autobuild/linaro-aarch64.config
new file mode 100644
index 00000000..f65f78a3
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/linaro-aarch64.config
@@ -0,0 +1,3 @@
+BR2_aarch64=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/linaro-arm.config b/bsp/buildroot/support/config-fragments/autobuild/linaro-arm.config
new file mode 100644
index 00000000..d72e19b3
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/linaro-arm.config
@@ -0,0 +1,5 @@
+BR2_arm=y
+BR2_cortex_a8=y
+BR2_ARM_EABIHF=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config b/bsp/buildroot/support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config
new file mode 100644
index 00000000..cf33ea26
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config
@@ -0,0 +1,9 @@
+BR2_mips64el=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mips64el-ctng_n32-linux-gnu.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="mips64el-ctng_n32-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config b/bsp/buildroot/support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config
new file mode 100644
index 00000000..942a1b13
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config
@@ -0,0 +1,11 @@
+BR2_mips64el=y
+BR2_MIPS_NABI64=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/mips64el-ctng_n64-linux-gnu.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="mips64el-ctng_n64-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config b/bsp/buildroot/support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config
new file mode 100644
index 00000000..e82d3fbd
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config
@@ -0,0 +1,11 @@
+BR2_powerpc=y
+BR2_powerpc_8548=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/powerpc-ctng_e500v2-linux-gnuspe.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="powerpc-ctng_e500v2-linux-gnuspe"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_7=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_12=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm-armv4t.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm-armv4t.config
new file mode 100644
index 00000000..4c0e01fe
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm-armv4t.config
@@ -0,0 +1,4 @@
+BR2_arm=y
+BR2_arm920t=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm-thumb2.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm-thumb2.config
new file mode 100644
index 00000000..e726757a
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm-thumb2.config
@@ -0,0 +1,7 @@
+BR2_arm=y
+BR2_cortex_a8=y
+BR2_ARM_EABI=y
+BR2_ARM_INSTRUCTIONS_THUMB2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y
+BR2_TARGET_OPTIMIZATION=""
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm.config
new file mode 100644
index 00000000..8ade4647
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-arm.config
@@ -0,0 +1,3 @@
+BR2_arm=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-mips.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-mips.config
new file mode 100644
index 00000000..103e20bf
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-mips.config
@@ -0,0 +1,4 @@
+BR2_mips=y
+BR2_mips_32r2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-mips64.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-mips64.config
new file mode 100644
index 00000000..77e3a853
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-mips64.config
@@ -0,0 +1,5 @@
+BR2_mips64el=y
+BR2_mips_64r2=y
+BR2_MIPS_NABI64=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-nios2.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-nios2.config
new file mode 100644
index 00000000..d58407d5
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-nios2.config
@@ -0,0 +1,3 @@
+BR2_nios2=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config b/bsp/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config
new file mode 100644
index 00000000..6c7ad4c5
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/sourcery-x86-64.config
@@ -0,0 +1,4 @@
+BR2_x86_64=y
+BR2_x86_steamroller=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64=y
diff --git a/bsp/buildroot/support/config-fragments/autobuild/toolchain-configs.csv b/bsp/buildroot/support/config-fragments/autobuild/toolchain-configs.csv
new file mode 100644
index 00000000..2010113f
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/toolchain-configs.csv
@@ -0,0 +1,55 @@
+support/config-fragments/autobuild/armv5-ctng-linux-gnueabi.config,x86
+support/config-fragments/autobuild/armv7-ctng-linux-gnueabihf.config,x86
+support/config-fragments/autobuild/br-aarch64-glibc.config,x86_64
+support/config-fragments/autobuild/br-arc-full-internal.config,any
+support/config-fragments/autobuild/br-arc-internal-glibc.config,any
+support/config-fragments/autobuild/br-arcle-hs38.config,x86_64
+support/config-fragments/autobuild/br-arm-basic.config,x86_64
+support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config,x86_64
+support/config-fragments/autobuild/br-arm-cortex-a9-musl.config,x86_64
+support/config-fragments/autobuild/br-arm-cortex-m4-full.config,x86_64
+support/config-fragments/autobuild/br-arm-full.config,x86_64
+support/config-fragments/autobuild/br-arm-full-nothread.config,x86_64
+support/config-fragments/autobuild/br-arm-full-static.config,x86_64
+support/config-fragments/autobuild/br-arm-internal-full.config,any
+support/config-fragments/autobuild/br-arm-internal-glibc.config,any
+support/config-fragments/autobuild/br-arm-internal-musl.config,any
+support/config-fragments/autobuild/br-bfin-full.config,x86_64
+support/config-fragments/autobuild/br-i386-pentium4-full.config,x86_64
+support/config-fragments/autobuild/br-i386-pentium-mmx-musl.config,x86_64
+support/config-fragments/autobuild/br-m68k-5208-full.config,x86_64
+support/config-fragments/autobuild/br-m68k-68040-full.config,x86_64
+support/config-fragments/autobuild/br-microblazeel-full.config,x86_64
+support/config-fragments/autobuild/br-microblazeel-full-internal.config,any
+support/config-fragments/autobuild/br-mips64-n64-full.config,x86_64
+support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config,x86_64
+support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config,x86_64
+support/config-fragments/autobuild/br-mipsel-o32-full.config,x86_64
+support/config-fragments/autobuild/br-nios2-glibc.config,x86_64
+support/config-fragments/autobuild/br-openrisc-uclibc.config,x86_64
+support/config-fragments/autobuild/br-powerpc-603e-basic-cpp.config,x86_64
+support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config,x86_64
+support/config-fragments/autobuild/br-powerpc64-power7-glibc.config,x86_64
+support/config-fragments/autobuild/br-powerpc-e500mc-full.config,x86_64
+support/config-fragments/autobuild/br-powerpc-internal-full.config,any
+support/config-fragments/autobuild/br-sh4-full.config,x86_64
+support/config-fragments/autobuild/br-sparc-uclibc.config,x86_64
+support/config-fragments/autobuild/br-sparc64-glibc.config,x86_64
+support/config-fragments/autobuild/br-x86-64-core2-full.config,x86_64
+support/config-fragments/autobuild/br-x86-64-musl.config,x86_64
+support/config-fragments/autobuild/br-xtensa-full.config,x86_64
+support/config-fragments/autobuild/br-xtensa-full-internal.config,any
+support/config-fragments/autobuild/i686-ctng-linux-gnu.config,x86
+support/config-fragments/autobuild/linaro-aarch64.config,x86
+support/config-fragments/autobuild/linaro-arm.config,x86
+support/config-fragments/autobuild/mips64el-ctng_n32-linux-gnu.config,x86
+support/config-fragments/autobuild/mips64el-ctng_n64-linux-gnu.config,x86
+support/config-fragments/autobuild/powerpc-ctng_e500v2-linux-gnuspe.config,x86
+support/config-fragments/autobuild/sourcery-arm-armv4t.config,x86
+support/config-fragments/autobuild/sourcery-arm.config,x86
+support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86
+support/config-fragments/autobuild/sourcery-mips64.config,x86
+support/config-fragments/autobuild/sourcery-mips.config,x86
+support/config-fragments/autobuild/sourcery-nios2.config,x86
+support/config-fragments/autobuild/sourcery-x86-64.config,x86
+support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config,x86
diff --git a/bsp/buildroot/support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config b/bsp/buildroot/support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config
new file mode 100644
index 00000000..435034be
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/autobuild/x86_64-ctng_locales-linux-gnu.config
@@ -0,0 +1,11 @@
+BR2_x86_64=y
+BR2_x86_corei7=y
+BR2_TOOLCHAIN_EXTERNAL=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/x86_64-ctng_locales-linux-gnu.tar.xz"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-ctng_locales-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_GCC_4_8=y
+BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_9=y
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
diff --git a/bsp/buildroot/support/config-fragments/minimal.config b/bsp/buildroot/support/config-fragments/minimal.config
new file mode 100644
index 00000000..71344e2c
--- /dev/null
+++ b/bsp/buildroot/support/config-fragments/minimal.config
@@ -0,0 +1,8 @@
+# This config fragment disables Buildroot options that are turned on by
+# default, in order to arrive at minimal build time.
+BR2_INIT_NONE=y
+BR2_SYSTEM_BIN_SH_NONE=y
+# BR2_PACKAGE_BUSYBOX is not set
+# BR2_TARGET_ROOTFS_TAR is not set
+BR2_COMPILER_PARANOID_UNSAFE_PATH=y
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
diff --git a/bsp/buildroot/support/dependencies/check-host-cmake.mk b/bsp/buildroot/support/dependencies/check-host-cmake.mk
index 8002278a..4300e6f6 100644
--- a/bsp/buildroot/support/dependencies/check-host-cmake.mk
+++ b/bsp/buildroot/support/dependencies/check-host-cmake.mk
@@ -10,9 +10,10 @@
 #
 BR2_CMAKE_VERSION_MIN = 3.1
 
-BR2_CMAKE ?= cmake
-ifeq ($(call suitable-host-package,cmake,\
-	$(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),)
-BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
+BR2_CMAKE_CANDIDATES ?= cmake cmake3
+BR2_CMAKE ?= $(call suitable-host-package,cmake,\
+	$(BR2_CMAKE_VERSION_MIN) $(BR2_CMAKE_CANDIDATES))
+ifeq ($(BR2_CMAKE),)
+BR2_CMAKE = $(HOST_DIR)/bin/cmake
 BR2_CMAKE_HOST_DEPENDENCY = host-cmake
 endif
diff --git a/bsp/buildroot/support/dependencies/check-host-cmake.sh b/bsp/buildroot/support/dependencies/check-host-cmake.sh
index 84c26c25..fadeae9f 100755
--- a/bsp/buildroot/support/dependencies/check-host-cmake.sh
+++ b/bsp/buildroot/support/dependencies/check-host-cmake.sh
@@ -1,47 +1,45 @@
 #!/bin/sh
 
-candidate="${1}"
-version_min="${2}"
+# prevent shift error
+[ $# -lt 2 ] && exit 1
 
-major_min="${version_min%.*}"
-minor_min="${version_min#*.}"
+major_min="${1%.*}"
+minor_min="${1#*.}"
 
-# cmake-3.7 incorrectly handles rpath, linking to host libraries
-blacklist_version="3.7"
+shift
 
-cmake=`which ${candidate}`
-if [ ! -x "${cmake}" ]; then
-    # echo nothing: no suitable cmake found
-    exit 1
-fi
+for candidate; do
 
-# Extract version X.Y from versions in the form X.Y or X.Y.Z
-# with X, Y and Z numbers with one or more digits each, e.g.
-#   3.2     -> 3.2
-#   3.2.3   -> 3.2
-#   3.2.42  -> 3.2
-#   3.10    -> 3.10
-#   3.10.4  -> 3.10
-#   3.10.42 -> 3.10
-version="$(${cmake} --version \
-           |sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \
-                   -e 's//\1/'
-          )"
-major="${version%.*}"
-minor="${version#*.}"
+    # Try to locate the candidate. Discard it if not located.
+    cmake=`which "${candidate}" 2>/dev/null`
+    [ -n "${cmake}" ] || continue
 
-if [ "${version}" = "${blacklist_version}" ]; then
-    # echo nothing: no suitable cmake found
-    exit 1
-fi
+    # Extract version X.Y from versions in the form X.Y or X.Y.Z
+    # with X, Y and Z numbers with one or more digits each, e.g.
+    #   3.2     -> 3.2
+    #   3.2.3   -> 3.2
+    #   3.2.42  -> 3.2
+    #   3.10    -> 3.10
+    #   3.10.4  -> 3.10
+    #   3.10.42 -> 3.10
+    # Discard the candidate if no version can be obtained
+    version="$(${cmake} --version \
+               |sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \
+                       -e 's//\1/'
+              )"
+    [ -n "${version}" ] || continue
 
-if [ ${major} -gt ${major_min} ]; then
-    echo "${cmake}"
-else
-    if [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then
+    major="${version%.*}"
+    minor="${version#*.}"
+
+    if [ ${major} -gt ${major_min} ]; then
         echo "${cmake}"
-    else
-        # echo nothing: no suitable cmake found
-        exit 1
+        exit
+    elif [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then
+        echo "${cmake}"
+        exit
     fi
-fi
+done
+
+# echo nothing: no suitable cmake found
+exit 1
diff --git a/bsp/buildroot/support/dependencies/check-host-lzip.mk b/bsp/buildroot/support/dependencies/check-host-lzip.mk
index 6acfdc6d..00cdd0a2 100644
--- a/bsp/buildroot/support/dependencies/check-host-lzip.mk
+++ b/bsp/buildroot/support/dependencies/check-host-lzip.mk
@@ -1,5 +1,5 @@
 ifeq (,$(call suitable-host-package,lzip,$(LZCAT)))
 DEPENDENCIES_HOST_PREREQ += host-lzip
 EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .lz
-LZCAT = $(HOST_DIR)/usr/bin/lzip -d -c
+LZCAT = $(HOST_DIR)/bin/lzip -d -c
 endif
diff --git a/bsp/buildroot/support/dependencies/check-host-tar.mk b/bsp/buildroot/support/dependencies/check-host-tar.mk
index 9840a55e..ad0b32e2 100644
--- a/bsp/buildroot/support/dependencies/check-host-tar.mk
+++ b/bsp/buildroot/support/dependencies/check-host-tar.mk
@@ -2,5 +2,5 @@ TAR ?= tar
 
 ifeq (,$(call suitable-host-package,tar,$(TAR)))
 DEPENDENCIES_HOST_PREREQ += host-tar
-TAR = $(HOST_DIR)/usr/bin/tar
+TAR = $(HOST_DIR)/bin/tar
 endif
diff --git a/bsp/buildroot/support/dependencies/check-host-tar.sh b/bsp/buildroot/support/dependencies/check-host-tar.sh
index 21438775..08573073 100755
--- a/bsp/buildroot/support/dependencies/check-host-tar.sh
+++ b/bsp/buildroot/support/dependencies/check-host-tar.sh
@@ -26,10 +26,11 @@ if [ ! -z "${version_bsd}" ] ; then
   minor=0
 fi
 
-# Minimal version = 1.17 (previous versions do not correctly unpack archives
-# containing hard-links if the --strip-components option is used).
+# Minimal version = 1.27 (previous versions do not correctly unpack archives
+# containing hard-links if the --strip-components option is used or create
+# different gnu long link headers for path elements > 100 characters).
 major_min=1
-minor_min=17
+minor_min=27
 
 # Maximal version = 1.29 (1.30 changed --numeric-owner output for
 # filenames > 100 characters). This is really a fix for a bug in
diff --git a/bsp/buildroot/support/dependencies/check-host-xzcat.mk b/bsp/buildroot/support/dependencies/check-host-xzcat.mk
index c6d9eebe..9be75c73 100644
--- a/bsp/buildroot/support/dependencies/check-host-xzcat.mk
+++ b/bsp/buildroot/support/dependencies/check-host-xzcat.mk
@@ -4,5 +4,5 @@
 ifeq (,$(call suitable-host-package,xzcat,$(XZCAT)))
 DEPENDENCIES_HOST_PREREQ += host-xz
 EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS += .xz .lzma
-XZCAT = $(HOST_DIR)/usr/bin/xzcat
+XZCAT = $(HOST_DIR)/bin/xzcat
 endif
diff --git a/bsp/buildroot/support/dependencies/dependencies.mk b/bsp/buildroot/support/dependencies/dependencies.mk
index e81745d0..3fc23586 100644
--- a/bsp/buildroot/support/dependencies/dependencies.mk
+++ b/bsp/buildroot/support/dependencies/dependencies.mk
@@ -22,12 +22,13 @@ DEPENDENCIES_HOST_PREREQ += host-ccache
 endif
 
 core-dependencies:
-	@HOSTCC="$(firstword $(HOSTCC))" MAKE="$(MAKE)" \
-		DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
+	@MAKE="$(MAKE)" DL_TOOLS="$(sort $(DL_TOOLS_DEPENDENCIES))" \
 		$(TOPDIR)/support/dependencies/dependencies.sh
 
-core-dependencies $(DEPENDENCIES_HOST_PREREQ): HOSTCC=$(HOSTCC_NOCCACHE)
-core-dependencies $(DEPENDENCIES_HOST_PREREQ): HOSTCXX=$(HOSTCXX_NOCCACHE)
+$(DEPENDENCIES_HOST_PREREQ): HOSTCC=$(HOSTCC_NOCCACHE)
+$(DEPENDENCIES_HOST_PREREQ): HOSTCXX=$(HOSTCXX_NOCCACHE)
+$(DEPENDENCIES_HOST_PREREQ): core-dependencies
+
 dependencies: core-dependencies $(DEPENDENCIES_HOST_PREREQ)
 
 ################################################################################
diff --git a/bsp/buildroot/support/dependencies/dependencies.sh b/bsp/buildroot/support/dependencies/dependencies.sh
index 168d1960..c5f29d32 100755
--- a/bsp/buildroot/support/dependencies/dependencies.sh
+++ b/bsp/buildroot/support/dependencies/dependencies.sh
@@ -11,39 +11,38 @@ if test $? != 0 ; then
 	exit 1
 fi
 
-# sanity check for CWD in LD_LIBRARY_PATH
-# try not to rely on egrep..
-if test -n "$LD_LIBRARY_PATH" ; then
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep '::' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start:' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':TRiGGER_end' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$LD_LIBRARY_PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1
-	if test $? = 0; then
-		echo
-		echo "You seem to have the current working directory in your"
-		echo "LD_LIBRARY_PATH environment variable. This doesn't work."
-		exit 1;
-	fi
-fi;
+# Sanity check for CWD in LD_LIBRARY_PATH
+case ":${LD_LIBRARY_PATH:-unset}:" in
+(*::*|*:.:*)
+	echo
+	echo "You seem to have the current working directory in your"
+	echo "LD_LIBRARY_PATH environment variable. This doesn't work."
+	exit 1
+	;;
+esac
 
-# sanity check for CWD in PATH. Having the current working directory
-# in the PATH makes the toolchain build process break.
-# try not to rely on egrep..
-if test -n "$PATH" ; then
-	echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.:' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.:' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$PATH"TRiGGER_end | grep ':\.TRiGGER_end' >/dev/null 2>&1 ||
-	echo TRiGGER_start"$PATH"TRiGGER_end | grep 'TRiGGER_start\.TRiGGER_end' >/dev/null 2>&1
-	if test $? = 0; then
-		echo
-		echo "You seem to have the current working directory in your"
-		echo "PATH environment variable. This doesn't work."
-		exit 1;
-	fi
-fi;
+# Sanity check for CWD in PATH. Having the current working directory
+# in the PATH makes various packages (e.g. toolchain, coreutils...)
+# build process break.
+# PATH should not contain a newline, otherwise it fails in spectacular
+# ways as soon as PATH is referenced in a package rule
+# An empty PATH is technically possible, but in practice we would not
+# even arrive here if that was the case.
+case ":${PATH:-unset}:" in
+(*::*|*:.:*)
+	echo
+	echo "You seem to have the current working directory in your"
+	echo "PATH environment variable. This doesn't work."
+	exit 1
+	;;
+(*"
+"*)	printf "\n"
+	# Break the '\n' sequence, or a \n is printed (which is not what we want).
+	printf "Your PATH contains a newline (%sn) character.\n" "\\"
+	printf "This doesn't work. Fix you PATH.\n"
+	exit 1
+	;;
+esac
 
 if test -n "$PERL_MM_OPT" ; then
 	echo
@@ -188,7 +187,7 @@ if grep ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG > /dev/null; then
 		echo "You need locale support on your build machine to build a toolchain supporting locales"
 		exit 1 ;
 	fi
-	if ! locale -a | grep -q -i utf8$ ; then
+	if ! locale -a | grep -q -i -E 'utf-?8$' ; then
 		echo
 		echo "You need at least one UTF8 locale to build a toolchain supporting locales"
 		exit 1 ;
@@ -223,6 +222,8 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_LIBS=y $BR2_CONFIG ; then
 		echo "If you're running a Debian/Ubuntu distribution, install the libc6-i386,"
 		echo "lib32stdc++6, and lib32z1 packages (or alternatively libc6:i386,"
 		echo "libstdc++6:i386, and zlib1g:i386)."
+		echo "If you're running a RedHat/Fedora distribution, install the glibc.i686 and"
+		echo "zlib.i686 packages."
 		echo "For other distributions, refer to the documentation on how to install the 32 bits"
 		echo "compatibility libraries."
 		exit 1
@@ -237,6 +238,14 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then
 		echo "For other distributions, refer to their documentation."
 		exit 1
 	fi
+
+	if ! echo "int main(void) {}" | g++ -m32 -x c++ - -o /dev/null 2>/dev/null; then
+		echo
+		echo "Your Buildroot configuration needs a compiler capable of building 32 bits binaries."
+		echo "If you're running a Debian/Ubuntu distribution, install the g++-multilib package."
+		echo "For other distributions, refer to their documentation."
+		exit 1
+	fi
 fi
 
 # Check that the Perl installation is complete enough for Buildroot.
@@ -268,3 +277,8 @@ if [ -n "$missing_perl_modules" ] ; then
 	echo
 	exit 1
 fi
+
+if ! python -c "import argparse" > /dev/null 2>&1 ; then
+	echo "Your Python installation is not complete enough: argparse module is missing"
+	exit 1
+fi
diff --git a/bsp/buildroot/support/docker/Dockerfile b/bsp/buildroot/support/docker/Dockerfile
new file mode 100644
index 00000000..ce3fdd9c
--- /dev/null
+++ b/bsp/buildroot/support/docker/Dockerfile
@@ -0,0 +1,44 @@
+# This Dockerfile generates the docker image that gets used by Gitlab CI
+# To build it (YYYYMMDD.HHMM is the current date and time in UTC):
+#   sudo docker build -t buildroot/base:YYYYMMDD.HHMM support/docker
+#   sudo docker push buildroot/base:YYYYMMDD.HHMM
+
+# We use a specific tag for the base image *and* the corresponding date
+# for the repository., so do not forget to update the apt-sources.list
+# file that is shipped next to this Dockerfile.
+FROM debian:stretch-20171210
+
+LABEL maintainer="Buildroot mailing list <buildroot@buildroot.org>" \
+      vendor="Buildroot" \
+description="Container with everything needed to run Buildroot"
+
+# Setup environment
+ENV DEBIAN_FRONTEND noninteractive
+
+# This repository can be a bit slow at times. Don't panic...
+COPY apt-sources.list /etc/apt/sources.list
+
+# The container has no package lists, so need to update first
+RUN dpkg --add-architecture i386 && \
+    apt-get update -y && \
+    apt-get install -y --no-install-recommends \
+        build-essential cmake libc6:i386 g++-multilib \
+        bc ca-certificates file locales rsync \
+        cvs bzr git mercurial subversion wget \
+        cpio unzip \
+        libncurses5-dev \
+        python-nose2 python-pexpect qemu-system-arm qemu-system-x86 && \
+    apt-get -y autoremove && \
+    apt-get -y clean
+
+# To be able to generate a toolchain with locales, enable one UTF-8 locale
+RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \
+    /usr/sbin/locale-gen
+
+RUN useradd -ms /bin/bash br-user && \
+    chown -R br-user:br-user /home/br-user
+
+USER br-user
+WORKDIR /home/br-user
+ENV HOME /home/br-user
+ENV LC_ALL en_US.UTF-8
diff --git a/bsp/buildroot/support/docker/apt-sources.list b/bsp/buildroot/support/docker/apt-sources.list
new file mode 100644
index 00000000..789fb8fc
--- /dev/null
+++ b/bsp/buildroot/support/docker/apt-sources.list
@@ -0,0 +1,4 @@
+# Latest just before 20171210T000000Z:
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch main
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20171209T220346Z/ stretch-updates main
+deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20171209T224618Z/ stretch/updates main
diff --git a/bsp/buildroot/support/download/check-hash b/bsp/buildroot/support/download/check-hash
index c1ff53c0..fe9c1057 100755
--- a/bsp/buildroot/support/download/check-hash
+++ b/bsp/buildroot/support/download/check-hash
@@ -42,8 +42,9 @@ if [ ! -f "${h_file}" ]; then
 fi
 
 # Check one hash for a file
-# $1: known hash
-# $2: file (full path)
+# $1: algo hash
+# $2: known hash
+# $3: file (full path)
 check_one_hash() {
     _h="${1}"
     _known="${2}"
diff --git a/bsp/buildroot/support/download/git b/bsp/buildroot/support/download/git
index 033a984f..f590ff64 100755
--- a/bsp/buildroot/support/download/git
+++ b/bsp/buildroot/support/download/git
@@ -85,8 +85,11 @@ if [ ${recurse} -eq 1 ]; then
     _git submodule update --init --recursive
 fi
 
-# We do not need the .git dir; we keep other .git files, in case they
+# We do not want the .git dir; we keep other .git files, in case they
 # are the only files in their directory.
+# The .git dir would generate non reproducible tarballs as it depends on
+# the state of the remote server. It also would generate large tarballs
+# (gigabytes for some linux trees) when a full clone took place.
 rm -rf .git
 
 popd >/dev/null
diff --git a/bsp/buildroot/support/download/svn b/bsp/buildroot/support/download/svn
index 9f27d71f..77abf3d0 100755
--- a/bsp/buildroot/support/download/svn
+++ b/bsp/buildroot/support/download/svn
@@ -33,6 +33,6 @@ _svn() {
     eval ${SVN} "${@}"
 }
 
-_svn --non-interactive export ${verbose} "${@}" "'${repo}@${rev}'" "'${basename}'"
+_svn export ${verbose} "${@}" "'${repo}@${rev}'" "'${basename}'"
 
 tar czf "${output}" "${basename}"
diff --git a/bsp/buildroot/support/kconfig/merge_config.sh b/bsp/buildroot/support/kconfig/merge_config.sh
index 8a1708b5..e1d7ffa7 100755
--- a/bsp/buildroot/support/kconfig/merge_config.sh
+++ b/bsp/buildroot/support/kconfig/merge_config.sh
@@ -33,6 +33,7 @@ usage() {
 	echo "  -n    use allnoconfig instead of alldefconfig"
 	echo "  -r    list redundant entries when merging fragments"
 	echo "  -O    dir to put generated output files"
+	echo "  -e    colon-separated list of br2-external trees to use (optional)"
 }
 
 MAKE=true
@@ -71,6 +72,11 @@ while true; do
 		shift 2
 		continue
 		;;
+	"-e")
+		EXTERNAL_ARG="BR2_EXTERNAL=$2"
+		shift 2
+		continue
+		;;
 	*)
 		break
 		;;
@@ -131,7 +137,7 @@ fi
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
+make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
diff --git a/bsp/buildroot/support/legal-info/buildroot.hash b/bsp/buildroot/support/legal-info/buildroot.hash
new file mode 100644
index 00000000..1b62dbee
--- /dev/null
+++ b/bsp/buildroot/support/legal-info/buildroot.hash
@@ -0,0 +1,2 @@
+# Locally computed
+sha256 9755181e27175cb3510b4da8629caa406fb355a19aa8e7d55f06bf8ab33323c4  COPYING
diff --git a/bsp/buildroot/support/misc/Buildroot.cmake b/bsp/buildroot/support/misc/Buildroot.cmake
new file mode 100644
index 00000000..9f5f5652
--- /dev/null
+++ b/bsp/buildroot/support/misc/Buildroot.cmake
@@ -0,0 +1,7 @@
+# Impersonate a Linux system. Afterall, that's what we are...
+set(CMAKE_SYSTEM_NAME Linux)
+include(Platform/Linux)
+
+# Override problematic settings, to avoid RPATH against host lib directories.
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
+set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
diff --git a/bsp/buildroot/support/misc/Vagrantfile b/bsp/buildroot/support/misc/Vagrantfile
index 33ca6b80..54b45da6 100644
--- a/bsp/buildroot/support/misc/Vagrantfile
+++ b/bsp/buildroot/support/misc/Vagrantfile
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Buildroot version to use
-RELEASE='2017.02'
+RELEASE='2018.02'
 
 ### Change here for more memory/cores ###
 VM_MEMORY=2048
diff --git a/bsp/buildroot/support/misc/relocate-sdk.sh b/bsp/buildroot/support/misc/relocate-sdk.sh
new file mode 100755
index 00000000..caabeaa6
--- /dev/null
+++ b/bsp/buildroot/support/misc/relocate-sdk.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+if [ "$#" -ne 0 ]; then
+    echo "Run this script to relocate the buildroot SDK at that location"
+    exit 1
+fi
+
+LOCFILE="share/buildroot/sdk-location"
+FILEPATH="$(readlink -f "$0")"
+NEWPATH="$(dirname "${FILEPATH}")"
+
+cd "${NEWPATH}"
+if [ ! -r "${LOCFILE}" ]; then
+    echo "Previous location of the buildroot SDK not found!"
+    exit 1
+fi
+OLDPATH="$(cat "${LOCFILE}")"
+
+if [ "${NEWPATH}" = "${OLDPATH}" ]; then
+    echo "This buildroot SDK has already been relocated!"
+    exit 0
+fi
+
+# Check if the path substitution does work properly, e.g.  a tree
+# "/a/b/c" copied into "/a/b/c/a/b/c/" would not be allowed.
+newpath="$(sed -e "s|${OLDPATH}|${NEWPATH}|g" "${LOCFILE}")"
+if [ "${NEWPATH}" != "${newpath}" ]; then
+    echo "Something went wrong with substituting the path!"
+    echo "Please choose another location for your SDK!"
+    exit 1
+fi
+
+echo "Relocating the buildroot SDK from ${OLDPATH} to ${NEWPATH} ..."
+
+# Make sure file uses the right language
+export LC_ALL=C
+# Replace the old path with the new one in all text files
+grep -lr "${OLDPATH}" . | while read -r FILE ; do
+    if file -b --mime-type "${FILE}" | grep -q '^text/' && [ "${FILE}" != "${LOCFILE}" ]
+    then
+        sed -i "s|${OLDPATH}|${NEWPATH}|g" "${FILE}"
+    fi
+done
+
+# At the very end, we update the location file to not break the
+# SDK if this script gets interruted.
+sed -i "s|${OLDPATH}|${NEWPATH}|g" ${LOCFILE}
diff --git a/bsp/buildroot/support/misc/target-dir-warning.txt b/bsp/buildroot/support/misc/target-dir-warning.txt
index 90f88414..94d2e0c0 100644
--- a/bsp/buildroot/support/misc/target-dir-warning.txt
+++ b/bsp/buildroot/support/misc/target-dir-warning.txt
@@ -25,5 +25,5 @@ can extract as root:
 
 Those image files are created using the contents of the target/
 directory, but there is a post-processing step to create device files
-and set owernship/permissions properly even if Buildroot does not run
+and set ownership/permissions properly even if Buildroot does not run
 as root.
diff --git a/bsp/buildroot/support/misc/toolchainfile.cmake.in b/bsp/buildroot/support/misc/toolchainfile.cmake.in
index d4252dd9..1f5d2371 100644
--- a/bsp/buildroot/support/misc/toolchainfile.cmake.in
+++ b/bsp/buildroot/support/misc/toolchainfile.cmake.in
@@ -4,13 +4,17 @@
 #
 
 # In order to allow the toolchain to be relocated, we calculate the
-# HOST_DIR based on this file's location: $(HOST_DIR)/usr/share/buildroot
+# HOST_DIR based on this file's location: $(HOST_DIR)/share/buildroot
 # and store it in RELOCATED_HOST_DIR.
 # All the other variables that need to refer to HOST_DIR will use the
 # RELOCATED_HOST_DIR variable.
-string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR})
+string(REPLACE "/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST_DIR})
 
-set(CMAKE_SYSTEM_NAME Linux)
+# Point cmake to the location where we have our custom modules,
+# so that it can find our custom platform description.
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+set(CMAKE_SYSTEM_NAME Buildroot)
 set(CMAKE_SYSTEM_PROCESSOR @@CMAKE_SYSTEM_PROCESSOR@@)
 
 # Set the {C,CXX}FLAGS appended by CMake depending on the build type
@@ -44,7 +48,7 @@ set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@" CACHE STRING "Buildroot LDFLAGS
 
 set(CMAKE_INSTALL_SO_NO_EXE 0)
 
-set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/usr/bin")
+set(CMAKE_PROGRAM_PATH "${RELOCATED_HOST_DIR}/bin")
 set(CMAKE_SYSROOT "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
 set(CMAKE_FIND_ROOT_PATH "${RELOCATED_HOST_DIR}/@@STAGING_SUBDIR@@")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
diff --git a/bsp/buildroot/support/scripts/apply-patches.sh b/bsp/buildroot/support/scripts/apply-patches.sh
index 7ccb39dd..66fef262 100755
--- a/bsp/buildroot/support/scripts/apply-patches.sh
+++ b/bsp/buildroot/support/scripts/apply-patches.sh
@@ -113,6 +113,11 @@ function apply_patch {
         echo "  to be applied  : ${path}/${patch}"
         exit 1
     fi
+    if grep -q "^rename from" ${path}/${patch} && \
+       grep -q "^rename to" ${path}/${patch} ; then
+        echo "Error: patch contains some renames, not supported by old patch versions"
+        exit 1
+    fi
     echo "${path}/${patch}" >> ${builddir}/.applied_patches_list
     ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t -N $silent
     if [ $? != 0 ] ; then
diff --git a/bsp/buildroot/support/scripts/br2-external b/bsp/buildroot/support/scripts/br2-external
index 7e816081..00cb57d1 100755
--- a/bsp/buildroot/support/scripts/br2-external
+++ b/bsp/buildroot/support/scripts/br2-external
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -e
 
 # This script must be able to run with bash-3.1, so it can't use
diff --git a/bsp/buildroot/support/scripts/brpkgutil.py b/bsp/buildroot/support/scripts/brpkgutil.py
index a0e2352b..4c99ae91 100644
--- a/bsp/buildroot/support/scripts/brpkgutil.py
+++ b/bsp/buildroot/support/scripts/brpkgutil.py
@@ -3,11 +3,12 @@
 import sys
 import subprocess
 
+
 # Execute the "make <pkg>-show-version" command to get the version of a given
 # list of packages, and return the version formatted as a Python dictionary.
 def get_version(pkgs):
     sys.stderr.write("Getting version for %s\n" % pkgs)
-    cmd = ["make", "-s", "--no-print-directory" ]
+    cmd = ["make", "-s", "--no-print-directory"]
     for pkg in pkgs:
         cmd.append("%s-show-version" % pkg)
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)
@@ -25,9 +26,10 @@ def get_version(pkgs):
         version[pkg] = output[i]
     return version
 
+
 def _get_depends(pkgs, rule):
     sys.stderr.write("Getting dependencies for %s\n" % pkgs)
-    cmd = ["make", "-s", "--no-print-directory" ]
+    cmd = ["make", "-s", "--no-print-directory"]
     for pkg in pkgs:
         cmd.append("%s-%s" % (pkg, rule))
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)
@@ -49,12 +51,14 @@ def _get_depends(pkgs, rule):
             deps[pkg] = pkg_deps
     return deps
 
+
 # Execute the "make <pkg>-show-depends" command to get the list of
 # dependencies of a given list of packages, and return the list of
 # dependencies formatted as a Python dictionary.
 def get_depends(pkgs):
     return _get_depends(pkgs, 'show-depends')
 
+
 # Execute the "make <pkg>-show-rdepends" command to get the list of
 # reverse dependencies of a given list of packages, and return the
 # list of dependencies formatted as a Python dictionary.
diff --git a/bsp/buildroot/support/scripts/check-bin-arch b/bsp/buildroot/support/scripts/check-bin-arch
new file mode 100755
index 00000000..7f976967
--- /dev/null
+++ b/bsp/buildroot/support/scripts/check-bin-arch
@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+# List of hardcoded paths that should be ignored, as they may
+# contain binaries for an architecture different from the
+# architecture of the target.
+declare -a IGNORES=(
+	# Skip firmware files, they could be ELF files for other
+	# architectures
+	"/lib/firmware"
+	"/usr/lib/firmware"
+
+	# Skip kernel modules
+	# When building a 32-bit userland on 64-bit architectures, the kernel
+	# and its modules may still be 64-bit. To keep the basic
+	# check-bin-arch logic simple, just skip this directory.
+	"/lib/modules"
+	"/usr/lib/modules"
+
+	# Skip files in /usr/share, several packages (qemu,
+	# pru-software-support) legitimately install ELF binaries that
+	# are not for the target architecture
+	"/usr/share"
+)
+
+while getopts p:l:r:a:i: OPT ; do
+	case "${OPT}" in
+	p) package="${OPTARG}";;
+	l) pkg_list="${OPTARG}";;
+	r) readelf="${OPTARG}";;
+	a) arch_name="${OPTARG}";;
+	i)
+		# Ensure we do have single '/' as separators,
+		# and that we have a leading and a trailing one.
+		pattern="$(sed -r -e 's:/+:/:g; s:^/*:/:; s:/*$:/:;' <<<"${OPTARG}")"
+		IGNORES+=("${pattern}")
+		;;
+	:) error "option '%s' expects a mandatory argument\n" "${OPTARG}";;
+	\?) error "unknown option '%s'\n" "${OPTARG}";;
+	esac
+done
+
+if test -z "${package}" -o -z "${pkg_list}" -o -z "${readelf}" -o -z "${arch_name}" ; then
+	echo "Usage: $0 -p <pkg> -l <pkg-file-list> -r <readelf> -a <arch name> [-i PATH ...]"
+	exit 1
+fi
+
+exitcode=0
+
+# Only split on new lines, for filenames-with-spaces
+IFS="
+"
+
+while read f; do
+	for ignore in "${IGNORES[@]}"; do
+		if [[ "${f}" =~ ^"${ignore}" ]]; then
+			continue 2
+		fi
+	done
+
+	# Skip symlinks. Some symlinks may have absolute paths as
+	# target, pointing to host binaries while we're building.
+	if [[ -L "${TARGET_DIR}/${f}" ]]; then
+		continue
+	fi
+
+	# Get architecture using readelf. We pipe through 'head -1' so
+	# that when the file is a static library (.a), we only take
+	# into account the architecture of the first object file.
+	arch=$(LC_ALL=C ${readelf} -h "${TARGET_DIR}/${f}" 2>&1 | \
+		       sed -r -e '/^  Machine: +(.+)/!d; s//\1/;' | head -1)
+
+	# If no architecture found, assume it was not an ELF file
+	if test "${arch}" = "" ; then
+		continue
+	fi
+
+	# Architecture is correct
+	if test "${arch}" = "${arch_name}" ; then
+		continue
+	fi
+
+	printf 'ERROR: architecture for "%s" is "%s", should be "%s"\n' \
+	       "${f}" "${arch}" "${arch_name}"
+
+	exitcode=1
+done < <( sed -r -e "/^${package},\.(.+)$/!d; s//\1/;" ${pkg_list} )
+
+exit ${exitcode}
diff --git a/bsp/buildroot/support/scripts/check-host-rpath b/bsp/buildroot/support/scripts/check-host-rpath
index 6ce547cb..169628de 100755
--- a/bsp/buildroot/support/scripts/check-host-rpath
+++ b/bsp/buildroot/support/scripts/check-host-rpath
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This script scans $(HOST_DIR)/{bin,sbin} for all ELF files, and checks
-# they have an RPATH to $(HOST_DIR)/usr/lib if they need libraries from
+# they have an RPATH to $(HOST_DIR)/lib if they need libraries from
 # there.
 
 # Override the user's locale so we are sure we can parse the output of
@@ -18,6 +18,7 @@ main() {
 
     ret=0
     while read file; do
+        is_elf "${file}" || continue
         elf_needs_rpath "${file}" "${hostdir}" || continue
         check_elf_has_rpath "${file}" "${hostdir}" && continue
         if [ ${ret} -eq 0 ]; then
@@ -26,21 +27,25 @@ main() {
             printf "*** ERROR: package %s installs executables without proper RPATH:\n" "${pkg}"
         fi
         printf "***   %s\n" "${file}"
-    done < <( find "${hostdir}"/{,usr/}{bin,sbin} -type f -exec file {} + 2>/dev/null \
-              |sed -r -e '/^([^:]+):.*\<ELF\>.*\<executable\>.*/!d'                \
-                      -e 's//\1/'                                                  \
-            )
+    done < <( find "${hostdir}"/{bin,sbin} -type f 2>/dev/null )
 
     return ${ret}
 }
 
+is_elf() {
+    local f="${1}"
+
+    readelf -l "${f}" 2>/dev/null \
+    |grep -E 'Requesting program interpreter:' >/dev/null 2>&1
+}
+
 elf_needs_rpath() {
     local file="${1}"
     local hostdir="${2}"
     local lib
 
     while read lib; do
-        [ -e "${hostdir}/usr/lib/${lib}" ] && return 0
+        [ -e "${hostdir}/lib/${lib}" ] && return 0
     done < <( readelf -d "${file}"                                         \
               |sed -r -e '/^.* \(NEEDED\) .*Shared library: \[(.+)\]$/!d;' \
                      -e 's//\1/;'                                          \
@@ -58,7 +63,7 @@ check_elf_has_rpath() {
         for dir in ${rpath//:/ }; do
             # Remove duplicate and trailing '/' for proper match
             dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )"
-            [ "${dir}" = "${hostdir}/usr/lib" ] && return 0
+            [ "${dir}" = "${hostdir}/lib" -o "${dir}" = "\$ORIGIN/../lib" ] && return 0
         done
     done < <( readelf -d "${file}"                                              \
               |sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
diff --git a/bsp/buildroot/support/scripts/check-uniq-files b/bsp/buildroot/support/scripts/check-uniq-files
new file mode 100755
index 00000000..f1101762
--- /dev/null
+++ b/bsp/buildroot/support/scripts/check-uniq-files
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+import sys
+import csv
+import argparse
+from collections import defaultdict
+
+warn = 'Warning: {0} file "{1}" is touched by more than one package: {2}\n'
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('packages_file_list', nargs='*',
+                        help='The packages-file-list to check from')
+    parser.add_argument('-t', '--type', metavar="TYPE",
+                        help='Report as a TYPE file (TYPE is either target, staging, or host)')
+
+    args = parser.parse_args()
+
+    if not len(args.packages_file_list) == 1:
+        sys.stderr.write('No packages-file-list was provided.\n')
+        return False
+
+    if args.type is None:
+        sys.stderr.write('No type was provided\n')
+        return False
+
+    file_to_pkg = defaultdict(list)
+    with open(args.packages_file_list[0], 'rb') as pkg_file_list:
+        for line in pkg_file_list.readlines():
+            pkg, _, file = line.rstrip(b'\n').partition(b',')
+            file_to_pkg[file].append(pkg)
+
+    for file in file_to_pkg:
+        if len(file_to_pkg[file]) > 1:
+            # If possible, try to decode the binary strings with
+            # the default user's locale
+            try:
+                sys.stderr.write(warn.format(args.type, file.decode(),
+                                             [p.decode() for p in file_to_pkg[file]]))
+            except UnicodeDecodeError:
+                # ... but fallback to just dumping them raw if they
+                # contain non-representable chars
+                sys.stderr.write(warn.format(args.type, file,
+                                             file_to_pkg[file]))
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/bsp/buildroot/support/scripts/eclipse-register-toolchain b/bsp/buildroot/support/scripts/eclipse-register-toolchain
index 6f919985..891d29ee 100755
--- a/bsp/buildroot/support/scripts/eclipse-register-toolchain
+++ b/bsp/buildroot/support/scripts/eclipse-register-toolchain
@@ -45,7 +45,7 @@ if test ! -d ${project_directory}/host ; then
     exit 1
 fi
 
-if test ! -e ${project_directory}/host/usr/bin/${toolchain_prefix}gcc ; then
+if test ! -e ${project_directory}/host/bin/${toolchain_prefix}gcc ; then
     echo "Cannot find the cross-compiler in the project directory"
     exit 1
 fi
diff --git a/bsp/buildroot/support/scripts/fix-configure-powerpc64.sh b/bsp/buildroot/support/scripts/fix-configure-powerpc64.sh
index ad710422..ff2b283c 100755
--- a/bsp/buildroot/support/scripts/fix-configure-powerpc64.sh
+++ b/bsp/buildroot/support/scripts/fix-configure-powerpc64.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This is a script to find, and correct, a problem with old versions of
 # configure that affect powerpc64 and powerpc64le.
diff --git a/bsp/buildroot/support/scripts/fix-rpath b/bsp/buildroot/support/scripts/fix-rpath
new file mode 100755
index 00000000..fa138ca1
--- /dev/null
+++ b/bsp/buildroot/support/scripts/fix-rpath
@@ -0,0 +1,147 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2016 Samuel Martin <s.martin49@gmail.com>
+# Copyright (C) 2017 Wolfgang Grandegger <wg@grandegger.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+usage() {
+  cat <<EOF >&2
+Usage:  ${0} TREE_KIND
+
+Description:
+
+    This script scans a tree and sanitize ELF files' RPATH found in there.
+
+    Sanitization behaves the same whatever the kind of the processed tree,
+    but the resulting RPATH differs. The rpath sanitization is done using
+    "patchelf --make-rpath-relative".
+
+Arguments:
+
+    TREE_KIND    Kind of tree to be processed.
+                 Allowed values: host, target, staging
+
+Environment:
+
+    PATCHELF     patchelf program to use
+                 (default: HOST_DIR/bin/patchelf)
+
+    HOST_DIR     host directory
+    STAGING_DIR  staging directory
+    TARGET_DIR   target directory
+
+    TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR
+                 (default HOST_DIR/opt/ext-toolchain)
+
+Returns:         0 if success or 1 in case of error
+
+EOF
+}
+
+: ${PATCHELF:=${HOST_DIR}/bin/patchelf}
+
+# ELF files should not be in these sub-directories
+HOST_EXCLUDEPATHS="/share/terminfo"
+STAGING_EXCLUDEPATHS="/usr/include /usr/share/terminfo"
+TARGET_EXCLUDEPATHS="/lib/firmware"
+
+main() {
+    local rootdir
+    local tree="${1}"
+    local find_args=( )
+    local sanitize_extra_args=( )
+
+    if ! "${PATCHELF}" --version > /dev/null 2>&1; then
+	echo "Error: can't execute patchelf utility '${PATCHELF}'"
+	exit 1
+    fi
+
+    case "${tree}" in
+        host)
+            rootdir="${HOST_DIR}"
+
+            # do not process the sysroot (only contains target binaries)
+            find_args+=( "-path" "${STAGING_DIR}" "-prune" "-o" )
+
+            # do not process the external toolchain installation directory to
+            # avoid breaking it.
+            test "${TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR}" != "" && \
+                find_args+=( "-path" "${TOOLCHAIN_EXTERNAL_DOWNLOAD_INSTALL_DIR}" "-prune" "-o" )
+
+            for excludepath in ${HOST_EXCLUDEPATHS}; do
+                find_args+=( "-path" "${HOST_DIR}""${excludepath}" "-prune" "-o" )
+            done
+
+            # do not process the patchelf binary but a copy to work-around "file in use"
+            find_args+=( "-path" "${PATCHELF}" "-prune" "-o" )
+            cp "${PATCHELF}" "${PATCHELF}.__to_be_patched"
+
+            # we always want $ORIGIN-based rpaths to make it relocatable.
+            sanitize_extra_args+=( "--relative-to-file" )
+            ;;
+
+        staging)
+            rootdir="${STAGING_DIR}"
+
+            # ELF files should not be in these sub-directories
+            for excludepath in ${STAGING_EXCLUDEPATHS}; do
+                find_args+=( "-path" "${STAGING_DIR}""${excludepath}" "-prune" "-o" )
+            done
+
+            # should be like for the target tree below
+            sanitize_extra_args+=( "--no-standard-lib-dirs" )
+            ;;
+
+        target)
+            rootdir="${TARGET_DIR}"
+
+            for excludepath in ${TARGET_EXCLUDEPATHS}; do
+                find_args+=( "-path" "${TARGET_DIR}""${excludepath}" "-prune" "-o" )
+            done
+
+            # we don't want $ORIGIN-based rpaths but absolute paths without rootdir.
+            # we also want to remove rpaths pointing to /lib or /usr/lib.
+            sanitize_extra_args+=( "--no-standard-lib-dirs" )
+            ;;
+
+        *)
+            usage
+            exit 1
+            ;;
+    esac
+
+    find_args+=( "-type" "f" "-print" )
+
+    while read file ; do
+        # check if it's an ELF file
+        if ${PATCHELF} --print-rpath "${file}" > /dev/null 2>&1; then
+            # make files writable if necessary
+            changed=$(chmod -c u+w "${file}")
+            # call patchelf to sanitize the rpath
+            ${PATCHELF} --make-rpath-relative "${rootdir}" ${sanitize_extra_args[@]} "${file}"
+            # restore the original permission
+            test "${changed}" != "" && chmod u-w "${file}"
+        fi
+    done < <(find "${rootdir}" ${find_args[@]})
+
+    # Restore patched patchelf utility
+    test "${tree}" = "host" && mv "${PATCHELF}.__to_be_patched" "${PATCHELF}"
+
+    # ignore errors
+    return 0
+}
+
+main ${@}
diff --git a/bsp/buildroot/support/scripts/genimage.sh b/bsp/buildroot/support/scripts/genimage.sh
new file mode 100755
index 00000000..039b3fef
--- /dev/null
+++ b/bsp/buildroot/support/scripts/genimage.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+die() {
+  cat <<EOF >&2
+Error: $@
+
+Usage: ${0} -c GENIMAGE_CONFIG_FILE
+EOF
+  exit 1
+}
+
+# Parse arguments and put into argument list of the script
+opts="$(getopt -n "${0##*/}" -o c: -- "$@")" || exit $?
+eval set -- "$opts"
+
+GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
+
+while true ; do
+	case "$1" in
+	-c)
+	  GENIMAGE_CFG="${2}";
+	  shift 2 ;;
+	--) # Discard all non-option parameters
+	  shift 1;
+	  break ;;
+	*)
+	  die "unknown option '${1}'" ;;
+	esac
+done
+
+[ -n "${GENIMAGE_CFG}" ] || die "Missing argument"
+
+rm -rf "${GENIMAGE_TMP}"
+
+genimage \
+	--rootpath "${TARGET_DIR}"     \
+	--tmppath "${GENIMAGE_TMP}"    \
+	--inputpath "${BINARIES_DIR}"  \
+	--outputpath "${BINARIES_DIR}" \
+	--config "${GENIMAGE_CFG}"
diff --git a/bsp/buildroot/support/scripts/get-developers b/bsp/buildroot/support/scripts/get-developers
deleted file mode 100755
index 40ed08ff..00000000
--- a/bsp/buildroot/support/scripts/get-developers
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-
-import argparse
-import getdeveloperlib
-
-def parse_args():
-    parser = argparse.ArgumentParser()
-    parser.add_argument('patches', metavar='P', type=argparse.FileType('r'), nargs='*',
-                        help='list of patches (use - to read patches from stdin)')
-    parser.add_argument('-a', dest='architecture', action='store',
-                        help='find developers in charge of this architecture')
-    parser.add_argument('-p', dest='package', action='store',
-                        help='find developers in charge of this package')
-    parser.add_argument('-c', dest='check', action='store_const',
-                        const=True, help='list files not handled by any developer')
-    return parser.parse_args()
-
-def __main__():
-    devs = getdeveloperlib.parse_developers()
-    if devs is None:
-        sys.exit(1)
-    args = parse_args()
-
-    # Check that only one action is given
-    action = 0
-    if args.architecture is not None:
-        action += 1
-    if args.package is not None:
-        action += 1
-    if args.check:
-        action += 1
-    if len(args.patches) != 0:
-        action += 1
-    if action > 1:
-        print("Cannot do more than one action")
-        return
-    if action == 0:
-        print("No action specified")
-        return
-
-    # Handle the check action
-    if args.check:
-        files = getdeveloperlib.check_developers(devs)
-        for f in files:
-            print(f)
-
-    # Handle the architecture action
-    if args.architecture is not None:
-        for dev in devs:
-            if args.architecture in dev.architectures:
-                print(dev.name)
-        return
-
-    # Handle the package action
-    if args.package is not None:
-        for dev in devs:
-            if args.package in dev.packages:
-                print(dev.name)
-        return
-
-    # Handle the patches action
-    if len(args.patches) != 0:
-        (files, infras) = getdeveloperlib.analyze_patches(args.patches)
-        matching_devs = set()
-        for dev in devs:
-            # See if we have developers matching by package name
-            for f in files:
-                if dev.hasfile(f):
-                    matching_devs.add(dev.name)
-            # See if we have developers matching by package infra
-            for i in infras:
-                if i in dev.infras:
-                    matching_devs.add(dev.name)
-
-        result = "--to buildroot@buildroot.org"
-        for dev in matching_devs:
-            result += " --cc \"%s\"" % dev
-
-        if result != "":
-            print("git send-email %s" % result)
-
-__main__()
-
diff --git a/bsp/buildroot/support/scripts/getdeveloperlib.py b/bsp/buildroot/support/scripts/getdeveloperlib.py
deleted file mode 100644
index 65191073..00000000
--- a/bsp/buildroot/support/scripts/getdeveloperlib.py
+++ /dev/null
@@ -1,200 +0,0 @@
-import sys
-import os
-import re
-import argparse
-import glob
-import subprocess
-
-#
-# Patch parsing functions
-#
-
-FIND_INFRA_IN_PATCH = re.compile("^\+\$\(eval \$\((host-)?([^-]*)-package\)\)$")
-
-def analyze_patch(patch):
-    """Parse one patch and return the list of files modified, added or
-    removed by the patch."""
-    files = set()
-    infras = set()
-    for line in patch:
-        # If the patch is adding a package, find which infra it is
-        m = FIND_INFRA_IN_PATCH.match(line)
-        if m:
-            infras.add(m.group(2))
-        if not line.startswith("+++ "):
-            continue
-        line.strip()
-        fname = line[line.find("/") + 1 : ].strip()
-        if fname == "dev/null":
-            continue
-        files.add(fname)
-    return (files, infras)
-
-FIND_INFRA_IN_MK = re.compile("^\$\(eval \$\((host-)?([^-]*)-package\)\)$")
-
-def fname_get_package_infra(fname):
-    """Checks whether the file name passed as argument is a Buildroot .mk
-    file describing a package, and find the infrastructure it's using."""
-    if not fname.endswith(".mk"):
-        return None
-
-    if not os.path.exists(fname):
-        return None
-
-    with open(fname, "r") as f:
-        for l in f:
-            l = l.strip()
-            m = FIND_INFRA_IN_MK.match(l)
-            if m:
-                return m.group(2)
-    return None
-
-def get_infras(files):
-    """Search in the list of files for .mk files, and collect the package
-    infrastructures used by those .mk files."""
-    infras = set()
-    for fname in files:
-        infra = fname_get_package_infra(fname)
-        if infra:
-            infras.add(infra)
-    return infras
-
-def analyze_patches(patches):
-    """Parse a list of patches and returns the list of files modified,
-    added or removed by the patches, as well as the list of package
-    infrastructures used by those patches (if any)"""
-    allfiles = set()
-    allinfras = set()
-    for patch in patches:
-        (files, infras) = analyze_patch(patch)
-        allfiles = allfiles | files
-        allinfras = allinfras | infras
-    allinfras = allinfras | get_infras(allfiles)
-    return (allfiles, allinfras)
-
-#
-# DEVELOPERS file parsing functions
-#
-
-class Developer:
-    def __init__(self, name, files):
-        self.name = name
-        self.files = files
-        self.packages = parse_developer_packages(files)
-        self.architectures = parse_developer_architectures(files)
-        self.infras = parse_developer_infras(files)
-
-    def hasfile(self, f):
-        f = os.path.abspath(f)
-        for fs in self.files:
-            if f.startswith(fs):
-                return True
-        return False
-
-def parse_developer_packages(fnames):
-    """Given a list of file patterns, travel through the Buildroot source
-    tree to find which packages are implemented by those file
-    patterns, and return a list of those packages."""
-    packages = set()
-    for fname in fnames:
-        for root, dirs, files in os.walk(fname):
-            for f in files:
-                path = os.path.join(root, f)
-                if fname_get_package_infra(path):
-                    pkg = os.path.splitext(f)[0]
-                    packages.add(pkg)
-    return packages
-
-def parse_arches_from_config_in(fname):
-    """Given a path to an arch/Config.in.* file, parse it to get the list
-    of BR2_ARCH values for this architecture."""
-    arches = set()
-    with open(fname, "r") as f:
-        parsing_arches = False
-        for l in f:
-            l = l.strip()
-            if l == "config BR2_ARCH":
-                parsing_arches = True
-                continue
-            if parsing_arches:
-                m = re.match("^\s*default \"([^\"]*)\".*", l)
-                if m:
-                    arches.add(m.group(1))
-                else:
-                    parsing_arches = False
-    return arches
-
-def parse_developer_architectures(fnames):
-    """Given a list of file names, find the ones starting by
-    'arch/Config.in.', and use that to determine the architecture a
-    developer is working on."""
-    arches = set()
-    for fname in fnames:
-        if not re.match("^.*/arch/Config\.in\..*$", fname):
-            continue
-        arches = arches | parse_arches_from_config_in(fname)
-    return arches
-
-def parse_developer_infras(fnames):
-    infras = set()
-    for fname in fnames:
-        m = re.match("^package/pkg-([^.]*).mk$", fname)
-        if m:
-            infras.add(m.group(1))
-    return infras
-
-def parse_developers(basepath=None):
-    """Parse the DEVELOPERS file and return a list of Developer objects."""
-    developers = []
-    linen = 0
-    if basepath == None:
-        basepath = os.getcwd()
-    with open(os.path.join(basepath, "DEVELOPERS"), "r") as f:
-        files = []
-        name = None
-        for l in f:
-            l = l.strip()
-            if l.startswith("#"):
-                continue
-            elif l.startswith("N:"):
-                if name is not None or len(files) != 0:
-                    print("Syntax error in DEVELOPERS file, line %d" % linen)
-                name = l[2:].strip()
-            elif l.startswith("F:"):
-                fname = l[2:].strip()
-                dev_files = glob.glob(os.path.join(basepath, fname))
-                if len(dev_files) == 0:
-                    print("WARNING: '%s' doesn't match any file" % fname)
-                files += dev_files
-            elif l == "":
-                if not name:
-                    continue
-                developers.append(Developer(name, files))
-                files = []
-                name = None
-            else:
-                print("Syntax error in DEVELOPERS file, line %d: '%s'" % (linen, l))
-                return None
-            linen += 1
-    # handle last developer
-    if name is not None:
-        developers.append(Developer(name, files))
-    return developers
-
-def check_developers(developers, basepath=None):
-    """Look at the list of files versioned in Buildroot, and returns the
-    list of files that are not handled by any developer"""
-    if basepath == None:
-        basepath = os.getcwd()
-    cmd = ["git", "--git-dir", os.path.join(basepath, ".git"), "ls-files"]
-    files = subprocess.check_output(cmd).strip().split("\n")
-    unhandled_files = []
-    for f in files:
-        handled = False
-        for d in developers:
-            if d.hasfile(os.path.join(basepath, f)):
-                handled = True
-                break
-        if not handled:
-            unhandled_files.append(f)
-    return unhandled_files
diff --git a/bsp/buildroot/support/scripts/graph-build-time b/bsp/buildroot/support/scripts/graph-build-time
index 0ba0f2d3..415d431f 100755
--- a/bsp/buildroot/support/scripts/graph-build-time
+++ b/bsp/buildroot/support/scripts/graph-build-time
@@ -64,14 +64,14 @@ except ImportError:
 # Note: matplotlib.use() must be called *before* matplotlib.pyplot.
 mpl.use('Agg')
 
-import matplotlib.pyplot as plt
-import matplotlib.font_manager as fm
-import csv
-import argparse
+import matplotlib.pyplot as plt       # noqa: E402
+import matplotlib.font_manager as fm  # noqa: E402
+import csv                            # noqa: E402
+import argparse                       # noqa: E402
 
-steps = [ 'extract', 'patch', 'configure', 'build',
-          'install-target', 'install-staging', 'install-images',
-          'install-host']
+steps = ['extract', 'patch', 'configure', 'build',
+         'install-target', 'install-staging', 'install-images',
+         'install-host']
 
 default_colors = ['#e60004', '#009836', '#2e1d86', '#ffed00',
                   '#0068b5', '#f28e00', '#940084', '#97c000']
@@ -79,6 +79,7 @@ default_colors = ['#e60004', '#009836', '#2e1d86', '#ffed00',
 alternate_colors = ['#00e0e0', '#3f7f7f', '#ff0000', '#00c000',
                     '#0080ff', '#c000ff', '#00eeee', '#e0e000']
 
+
 class Package:
     def __init__(self, name):
         self.name = name
@@ -104,6 +105,7 @@ class Package:
             return self.steps_duration[step]
         return 0
 
+
 # Generate an histogram of the time spent in each step of each
 # package.
 def pkg_histogram(data, output, order="build"):
@@ -132,10 +134,10 @@ def pkg_histogram(data, output, order="build"):
     for i in range(0, len(vals)):
         b = plt.bar(ind+0.1, vals[i], width=0.8, color=colors[i], bottom=bottom, linewidth=0.25)
         legenditems.append(b[0])
-        bottom = [ bottom[j] + vals[i][j] for j in range(0, len(vals[i])) ]
+        bottom = [bottom[j] + vals[i][j] for j in range(0, len(vals[i]))]
 
     # Draw the package names
-    plt.xticks(ind + .6, [ p.name for p in data ], rotation=-60, rotation_mode="anchor", fontsize=8, ha='left')
+    plt.xticks(ind + .6, [p.name for p in data], rotation=-60, rotation_mode="anchor", fontsize=8, ha='left')
 
     # Adjust size of graph depending on the number of packages
     # Ensure a minimal size twice as the default
@@ -172,6 +174,7 @@ def pkg_histogram(data, output, order="build"):
     # Save graph
     plt.savefig(output)
 
+
 # Generate a pie chart with the time spent building each package.
 def pkg_pie_time_per_package(data, output):
     # Compute total build duration
@@ -184,7 +187,7 @@ def pkg_pie_time_per_package(data, output):
     labels = []
     values = []
     other_value = 0
-    for p in data:
+    for p in sorted(data, key=lambda p: p.get_duration()):
         if p.get_duration() < (total * 0.01):
             other_value += p.get_duration()
         else:
@@ -210,6 +213,7 @@ def pkg_pie_time_per_package(data, output):
     plt.title('Build time per package')
     plt.savefig(output)
 
+
 # Generate a pie chart with a portion for the overall time spent in
 # each step for all packages.
 def pkg_pie_time_per_step(data, output):
@@ -236,6 +240,7 @@ def pkg_pie_time_per_step(data, output):
     plt.title('Build time per step')
     plt.savefig(output)
 
+
 # Parses the csv file passed on standard input and returns a list of
 # Package objects, filed with the duration of each step and the total
 # duration of the package.
@@ -269,6 +274,7 @@ def read_data(input_file):
 
     return pkgs
 
+
 parser = argparse.ArgumentParser(description='Draw build time graphs')
 parser.add_argument("--type", '-t', metavar="GRAPH_TYPE",
                     help="Type of graph (histogram, pie-packages, pie-steps)")
diff --git a/bsp/buildroot/support/scripts/graph-depends b/bsp/buildroot/support/scripts/graph-depends
index b258c565..85c9bf0a 100755
--- a/bsp/buildroot/support/scripts/graph-depends
+++ b/bsp/buildroot/support/scripts/graph-depends
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # Usage (the graphviz package must be installed in your distribution)
 #  ./support/scripts/graph-depends [-p package-name] > test.dot
@@ -30,7 +30,7 @@ import brpkgutil
 
 # Modes of operation:
 MODE_FULL = 1   # draw full dependency graph for all selected packages
-MODE_PKG  = 2   # draw dependency graph for a given package
+MODE_PKG = 2    # draw dependency graph for a given package
 mode = 0
 
 # Limit drawing the dependency graph to this depth. 0 means 'no limit'.
@@ -49,18 +49,18 @@ parser.add_argument("--package", '-p', metavar="PACKAGE",
 parser.add_argument("--depth", '-d', metavar="DEPTH", dest="depth", type=int, default=0,
                     help="Limit the dependency graph to DEPTH levels; 0 means no limit.")
 parser.add_argument("--stop-on", "-s", metavar="PACKAGE", dest="stop_list", action="append",
-                    help="Do not graph past this package (can be given multiple times)." \
-                       + " Can be a package name or a glob, " \
-                       + " 'virtual' to stop on virtual packages, or " \
-                       + "'host' to stop on host packages.")
+                    help="Do not graph past this package (can be given multiple times)." +
+                         " Can be a package name or a glob, " +
+                         " 'virtual' to stop on virtual packages, or " +
+                         "'host' to stop on host packages.")
 parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append",
                     help="Like --stop-on, but do not add PACKAGE to the graph.")
 parser.add_argument("--colours", "-c", metavar="COLOR_LIST", dest="colours",
                     default="lightblue,grey,gainsboro",
-                    help="Comma-separated list of the three colours to use" \
-                       + " to draw the top-level package, the target" \
-                       + " packages, and the host packages, in this order." \
-                       + " Defaults to: 'lightblue,grey,gainsboro'")
+                    help="Comma-separated list of the three colours to use" +
+                         " to draw the top-level package, the target" +
+                         " packages, and the host packages, in this order." +
+                         " Defaults to: 'lightblue,grey,gainsboro'")
 parser.add_argument("--transitive", dest="transitive", action='store_true',
                     default=False)
 parser.add_argument("--no-transitive", dest="transitive", action='store_false',
@@ -114,7 +114,7 @@ else:
 # Get the colours: we need exactly three colours,
 # so no need not split more than 4
 # We'll let 'dot' validate the colours...
-colours = args.colours.split(',',4)
+colours = args.colours.split(',', 4)
 if len(colours) != 3:
     sys.stderr.write("Error: incorrect colour list '%s'\n" % args.colours)
     sys.exit(1)
@@ -124,6 +124,7 @@ host_colour = colours[2]
 
 allpkgs = []
 
+
 # Execute the "make show-targets" command to get the list of the main
 # Buildroot PACKAGES and return it formatted as a Python list. This
 # list is used as the starting point for full dependency graphs
@@ -138,6 +139,7 @@ def get_targets():
         return []
     return output.split(' ')
 
+
 # Recursive function that builds the tree of dependencies for a given
 # list of packages. The dependencies are built in a list called
 # 'dependencies', which contains tuples of the form (pkg1 ->
@@ -179,10 +181,12 @@ def get_all_depends(pkgs):
 
     return dependencies
 
+
 # The Graphviz "dot" utility doesn't like dashes in node names. So for
 # node names, we strip all dashes.
 def pkg_node_name(pkg):
-    return pkg.replace("-","")
+    return pkg.replace("-", "")
+
 
 TARGET_EXCEPTIONS = [
     "target-finalize",
@@ -225,35 +229,39 @@ for dep in dependencies:
 # sub-dicts is "pkg2".
 is_dep_cache = {}
 
+
 def is_dep_cache_insert(pkg, pkg2, val):
     try:
         is_dep_cache[pkg].update({pkg2: val})
     except KeyError:
         is_dep_cache[pkg] = {pkg2: val}
 
+
 # Retrieves from the cache whether pkg2 is a transitive dependency
 # of pkg.
 # Note: raises a KeyError exception if the dependency is not known.
 def is_dep_cache_lookup(pkg, pkg2):
     return is_dep_cache[pkg][pkg2]
 
+
 # This function return True if pkg is a dependency (direct or
 # transitive) of pkg2, dependencies being listed in the deps
 # dictionary. Returns False otherwise.
 # This is the un-cached version.
-def is_dep_uncached(pkg,pkg2,deps):
+def is_dep_uncached(pkg, pkg2, deps):
     try:
         for p in deps[pkg2]:
             if pkg == p:
                 return True
-            if is_dep(pkg,p,deps):
+            if is_dep(pkg, p, deps):
                 return True
     except KeyError:
         pass
     return False
 
+
 # See is_dep_uncached() above; this is the cached version.
-def is_dep(pkg,pkg2,deps):
+def is_dep(pkg, pkg2, deps):
     try:
         return is_dep_cache_lookup(pkg, pkg2)
     except KeyError:
@@ -261,6 +269,7 @@ def is_dep(pkg,pkg2,deps):
         is_dep_cache_insert(pkg, pkg2, val)
         return val
 
+
 # This function eliminates transitive dependencies; for example, given
 # these dependency chain: A->{B,C} and B->{C}, the A->{C} dependency is
 # already covered by B->{C}, so C is a transitive dependency of A, via B.
@@ -269,30 +278,32 @@ def is_dep(pkg,pkg2,deps):
 #     - if d[i] is a dependency of any of the other dependencies d[j]
 #       - do not keep d[i]
 #     - otherwise keep d[i]
-def remove_transitive_deps(pkg,deps):
+def remove_transitive_deps(pkg, deps):
     d = deps[pkg]
     new_d = []
     for i in range(len(d)):
         keep_me = True
         for j in range(len(d)):
-            if j==i:
+            if j == i:
                 continue
-            if is_dep(d[i],d[j],deps):
+            if is_dep(d[i], d[j], deps):
                 keep_me = False
         if keep_me:
             new_d.append(d[i])
     return new_d
 
+
 # This function removes the dependency on some 'mandatory' package, like the
 # 'toolchain' package, or the 'skeleton' package
-def remove_mandatory_deps(pkg,deps):
+def remove_mandatory_deps(pkg, deps):
     return [p for p in deps[pkg] if p not in ['toolchain', 'skeleton']]
 
+
 # This function will check that there is no loop in the dependency chain
 # As a side effect, it builds up the dependency cache.
 def check_circular_deps(deps):
     def recurse(pkg):
-        if not pkg in list(deps.keys()):
+        if pkg not in list(deps.keys()):
             return
         if pkg in not_loop:
             return
@@ -314,24 +325,27 @@ def check_circular_deps(deps):
     for pkg in list(deps.keys()):
         recurse(pkg)
 
+
 # This functions trims down the dependency list of all packages.
 # It applies in sequence all the dependency-elimination methods.
 def remove_extra_deps(deps):
     for pkg in list(deps.keys()):
         if not pkg == 'all':
-            deps[pkg] = remove_mandatory_deps(pkg,deps)
+            deps[pkg] = remove_mandatory_deps(pkg, deps)
     for pkg in list(deps.keys()):
         if not transitive or pkg == 'all':
-            deps[pkg] = remove_transitive_deps(pkg,deps)
+            deps[pkg] = remove_transitive_deps(pkg, deps)
     return deps
 
+
 check_circular_deps(dict_deps)
 if check_only:
     sys.exit(0)
 
 dict_deps = remove_extra_deps(dict_deps)
 dict_version = brpkgutil.get_version([pkg for pkg in allpkgs
-                                if pkg != "all" and not pkg.startswith("root")])
+                                      if pkg != "all" and not pkg.startswith("root")])
+
 
 # Print the attributes of a node: label and fill-color
 def print_attrs(pkg):
@@ -344,8 +358,8 @@ def print_attrs(pkg):
         color = root_colour
     else:
         if pkg.startswith('host') \
-        or pkg.startswith('toolchain') \
-        or pkg.startswith('rootfs'):
+                or pkg.startswith('toolchain') \
+                or pkg.startswith('rootfs'):
             color = host_colour
         else:
             color = target_colour
@@ -356,6 +370,7 @@ def print_attrs(pkg):
         outfile.write("%s [label = \"%s\"]\n" % (name, label))
     outfile.write("%s [color=%s,style=filled]\n" % (name, color))
 
+
 # Print the dependency graph of a package
 def print_pkg_deps(depth, pkg):
     if pkg in done_deps:
@@ -381,12 +396,13 @@ def print_pkg_deps(depth, pkg):
                 continue
             add = True
             for p in exclude_list:
-                if fnmatch(d,p):
+                if fnmatch(d, p):
                     add = False
                     break
             if add:
                 outfile.write("%s -> %s [dir=%s]\n" % (pkg_node_name(pkg), pkg_node_name(d), arrow_dir))
-                print_pkg_deps(depth+1, d)
+                print_pkg_deps(depth + 1, d)
+
 
 # Start printing the graph data
 outfile.write("digraph G {\n")
diff --git a/bsp/buildroot/support/scripts/hardlink-or-copy b/bsp/buildroot/support/scripts/hardlink-or-copy
index b046bdf0..a052318f 100755
--- a/bsp/buildroot/support/scripts/hardlink-or-copy
+++ b/bsp/buildroot/support/scripts/hardlink-or-copy
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Try to hardlink a file into a directory, fallback to copy on failure.
 #
diff --git a/bsp/buildroot/support/scripts/mkusers b/bsp/buildroot/support/scripts/mkusers
index 5bbec3e1..d00ba338 100755
--- a/bsp/buildroot/support/scripts/mkusers
+++ b/bsp/buildroot/support/scripts/mkusers
@@ -75,6 +75,14 @@ get_gid() {
         '$1 == group { printf( "%d\n", $3 ); }' "${GROUP}"
 }
 
+#----------------------------------------------------------------------------
+get_members() {
+    local group="${1}"
+
+    awk -F: -v group="${group}"                             \
+        '$1 == group { printf( "%s\n", $4 ); }' "${GROUP}"
+}
+
 #----------------------------------------------------------------------------
 get_username() {
     local uid="${1}"
@@ -211,16 +219,17 @@ generate_gid() {
 add_one_group() {
     local group="${1}"
     local gid="${2}"
-    local _f
+    local members
 
     # Generate a new GID if needed
     if [ ${gid} -eq -1 ]; then
         gid="$( generate_gid "${group}" )"
     fi
 
+    members=$(get_members "$group")
     # Remove any previous instance of this group, and re-add the new one
     sed -i --follow-symlinks -e '/^'"${group}"':.*/d;' "${GROUP}"
-    printf "%s:x:%d:\n" "${group}" "${gid}" >>"${GROUP}"
+    printf "%s:x:%d:%s\n" "${group}" "${gid}" "${members}" >>"${GROUP}"
 
     # Ditto for /etc/gshadow if it exists
     if [ -f "${GSHADOW}" ]; then
diff --git a/bsp/buildroot/support/scripts/pkg-stats b/bsp/buildroot/support/scripts/pkg-stats
index 421fa5cf..48a2cc29 100755
--- a/bsp/buildroot/support/scripts/pkg-stats
+++ b/bsp/buildroot/support/scripts/pkg-stats
@@ -26,6 +26,7 @@
 #
 
 echo "<head>
+<script src=\"https://www.kryogenix.org/code/browser/sorttable/sorttable.js\"></script>
 <style type=\"text/css\">
 table {
   width: 100%;
@@ -59,7 +60,9 @@ td.lotsofpatches {
 
 <a href=\"#results\">Results</a><br/>
 
-<table>
+<p id=\"sortable_hint\"></p>
+
+<table class=\"sortable\">
 <tr>
 <td>Id</td>
 <td>Package</td>
@@ -68,6 +71,7 @@ td.lotsofpatches {
 <td class=\"centered\">License</td>
 <td class=\"centered\">License files</td>
 <td class=\"centered\">Hash file</td>
+<td class=\"centered\">Warnings</td>
 </tr>
 "
 
@@ -80,6 +84,7 @@ python_packages=0
 rebar_packages=0
 virtual_packages=0
 generic_packages=0
+waf_packages=0
 manual_packages=0
 packages_with_licence=0
 packages_without_licence=0
@@ -90,7 +95,7 @@ packages_without_hash_file=0
 total_patch_count=0
 cnt=0
 
-for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
+for i in $(find boot/ linux/ package/ toolchain/ -name '*.mk' | sort) ; do
 
     if test \
 	$i = "boot/common.mk" -o \
@@ -118,7 +123,15 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	$i = "package/pkg-virtual.mk" -o \
 	$i = "package/pkg-download.mk" -o \
 	$i = "package/pkg-generic.mk" -o \
-	$i = "package/pkg-utils.mk" ; then
+	$i = "package/pkg-waf.mk" -o \
+	$i = "package/pkg-kernel-module.mk" -o \
+	$i = "package/pkg-utils.mk" -o \
+	$i = "package/nvidia-tegra23/nvidia-tegra23.mk" -o \
+	$i = "toolchain/toolchain-external/pkg-toolchain-external.mk" -o \
+	$i = "toolchain/toolchain-external/toolchain-external.mk" -o \
+	$i = "toolchain/toolchain.mk" -o \
+	$i = "toolchain/helpers.mk" -o \
+	$i = "toolchain/toolchain-wrapper.mk" ; then
 	echo "skipping $i" 1>&2
 	continue
     fi
@@ -215,6 +228,16 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	hastarget=1
     fi
 
+    if grep -E "\(toolchain-external-package\)" $i > /dev/null ; then
+	infratype="toolchain-external"
+	hastarget=1
+    fi
+
+    if grep -E "\(waf-package\)" $i > /dev/null ; then
+	infratype="waf"
+	hastarget=1
+    fi
+
     pkg=$(basename $i)
     dir=$(dirname $i)
     pkg=${pkg%.mk}
@@ -243,6 +266,8 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	virtual_packages=$(($virtual_packages+1))
     elif [ ${infratype} = "generic" ]; then
 	generic_packages=$(($generic_packages+1))
+    elif [ ${infratype} = "waf" ]; then
+	waf_packages=$(($waf_packages+1))
     fi
 
     if grep -qE "^${pkgvariable}_LICENSE[ ]*=" $i ; then
@@ -323,6 +348,14 @@ for i in $(find boot/ linux/ package/ -name '*.mk' | sort) ; do
 	echo "<td class=\"centered correct\">Yes</td>"
     fi
 
+    file_list=$(find ${package_dir} -name '*.mk' -o -name '*.in*' -o -name '*.hash')
+    nwarnings=$(./utils/check-package ${file_list} 2>&1 | sed '/\([0-9]*\) warnings generated/!d; s//\1/')
+    if [ ${nwarnings} -eq 0 ] ; then
+	echo "<td class=\"centered correct\">${nwarnings}</td>"
+    else
+	echo "<td class=\"centered wrong\">${nwarnings}</td>"
+    fi
+
     echo "</tr>"
 
 done
@@ -367,6 +400,10 @@ echo "<td>Packages using the <i>virtual</i> infrastructure</td>"
 echo "<td>$virtual_packages</td>"
 echo "</tr>"
 echo "<tr>"
+echo "<td>Packages using the <i>waf</i> infrastructure</td>"
+echo "<td>$waf_packages</td>"
+echo "</tr>"
+echo "<tr>"
 echo "<td>Packages not using any infrastructure</td>"
 echo "<td>$manual_packages</td>"
 echo "</tr>"
@@ -407,4 +444,12 @@ echo "</table>"
 echo "<hr/>"
 echo "<i>Updated on $(LANG=C date), Git commit $(git log master -n 1 --pretty=format:%H)</i>"
 echo "</body>"
+
+echo "<script>
+if (typeof sorttable === \"object\") {
+  document.getElementById(\"sortable_hint\").innerHTML =
+  \"hint: the table can be sorted by clicking the column headers\"
+}
+</script>
+"
 echo "</html>"
diff --git a/bsp/buildroot/support/scripts/pycompile.py b/bsp/buildroot/support/scripts/pycompile.py
index fde711a4..9192a701 100644
--- a/bsp/buildroot/support/scripts/pycompile.py
+++ b/bsp/buildroot/support/scripts/pycompile.py
@@ -1,24 +1,69 @@
 #!/usr/bin/env python
 
-# Wrapper for python2 and python3 around compileall to raise exception
-# when a python byte code generation failed.
-#
-# Inspired from:
-#   http://stackoverflow.com/questions/615632/how-to-detect-errors-from-compileall-compile-dir
+'''Wrapper for python2 and python3 around compileall to raise exception
+when a python byte code generation failed.
 
+Inspired from:
+   http://stackoverflow.com/questions/615632/how-to-detect-errors-from-compileall-compile-dir
+'''
 from __future__ import print_function
 import sys
 import py_compile
 import compileall
+import argparse
 
-class ReportProblem:
-    def __nonzero__(self):
-        type, value, traceback = sys.exc_info()
-        if type is not None and issubclass(type, py_compile.PyCompileError):
-            print("Cannot compile %s" %value.file)
+
+def check_for_errors(comparison):
+    '''Wrap comparison operator with code checking for PyCompileError.
+    If PyCompileError was raised, re-raise it again to abort execution,
+    otherwise perform comparison as expected.
+    '''
+    def operator(self, other):
+        exc_type, value, traceback = sys.exc_info()
+        if exc_type is not None and issubclass(exc_type,
+                                               py_compile.PyCompileError):
+            print("Cannot compile %s" % value.file)
             raise value
-        return 1
 
-report_problem = ReportProblem()
+        return comparison(self, other)
 
-compileall.compile_dir(sys.argv[1], quiet=report_problem)
+    return operator
+
+
+class ReportProblem(int):
+    '''Class that pretends to be an int() object but implements all of its
+    comparison operators such that it'd detect being called in
+    PyCompileError handling context and abort execution
+    '''
+    VALUE = 1
+
+    def __new__(cls, *args, **kwargs):
+        return int.__new__(cls, ReportProblem.VALUE, **kwargs)
+
+    @check_for_errors
+    def __lt__(self, other):
+        return ReportProblem.VALUE < other
+
+    @check_for_errors
+    def __eq__(self, other):
+        return ReportProblem.VALUE == other
+
+    def __ge__(self, other):
+        return not self < other
+
+    def __gt__(self, other):
+        return not self < other and not self == other
+
+    def __ne__(self, other):
+        return not self == other
+
+
+parser = argparse.ArgumentParser(description='Compile Python source files in a directory tree.')
+parser.add_argument("target", metavar='DIRECTORY',
+                    help='Directory to scan')
+parser.add_argument("--force", action='store_true',
+                    help="Force compilation even if alread compiled")
+
+args = parser.parse_args()
+
+compileall.compile_dir(args.target, force=args.force, quiet=ReportProblem())
diff --git a/bsp/buildroot/support/scripts/scancpan b/bsp/buildroot/support/scripts/scancpan
deleted file mode 100755
index 32908f31..00000000
--- a/bsp/buildroot/support/scripts/scancpan
+++ /dev/null
@@ -1,861 +0,0 @@
-#!/usr/bin/env perl
-
-# This chunk of stuff was generated by App::FatPacker. To find the original
-# file's code, look for the end of this BEGIN block or the string 'FATPACK'
-BEGIN {
-my %fatpacked;
-
-$fatpacked{"MetaCPAN/API/Tiny.pm"} = <<'METACPAN_API_TINY';
-  package MetaCPAN::API::Tiny;
-  {
-    $MetaCPAN::API::Tiny::VERSION = '1.131730';
-  }
-  use strict;
-  use warnings;
-  # ABSTRACT: A Tiny API client for MetaCPAN
-
-  use Carp;
-  use JSON::PP 'encode_json', 'decode_json';
-  use HTTP::Tiny;
-
-
-  sub new {
-      my ($class, @args) = @_;
-
-      $#_ % 2 == 0
-          or croak 'Arguments must be provided as name/value pairs';
-
-      my %params = @args;
-
-      die 'ua_args must be an array reference'
-          if $params{ua_args} && ref($params{ua_args}) ne 'ARRAY';
-
-      my $self = +{
-          base_url => $params{base_url} || 'http://api.metacpan.org/v0',
-          ua => $params{ua} || HTTP::Tiny->new(
-              $params{ua_args}
-                  ? @{$params{ua_args}}
-                  : (agent => 'MetaCPAN::API::Tiny/'
-                      . ($MetaCPAN::API::VERSION || 'xx'))),
-      };
-
-      return bless($self, $class);
-  }
-
-  sub _build_extra_params {
-      my $self = shift;
-
-      @_ % 2 == 0
-          or croak 'Incorrect number of params, must be key/value';
-
-      my %extra = @_;
-      my $ua = $self->{ua};
-
-      foreach my $key (keys %extra)
-      {
-          # The implementation in HTTP::Tiny uses + instead of %20, fix that
-          $extra{$key} = $ua->_uri_escape($extra{$key});
-          $extra{$key} =~ s/\+/%20/g;
-      }
-
-      my $params = join '&', map { "$_=" . $extra{$_} } sort keys %extra;
-
-      return $params;
-  }
-
-
-  # /source/{author}/{release}/{path}
-  sub source {
-      my $self  = shift;
-      my %opts  = @_ ? @_ : ();
-      my $url   = '';
-      my $error = "Provide 'author' and 'release' and 'path'";
-
-      %opts or croak $error;
-
-      if (
-          defined ( my $author  = $opts{'author'}  ) &&
-          defined ( my $release = $opts{'release'} ) &&
-          defined ( my $path    = $opts{'path'}    )
-        ) {
-          $url = "source/$author/$release/$path";
-      } else {
-          croak $error;
-      }
-
-      $url = $self->{base_url} . "/$url";
-
-      my $result = $self->{ua}->get($url);
-      $result->{'success'}
-          or croak "Failed to fetch '$url': " . $result->{'reason'};
-
-      return $result->{'content'};
-  }
-
-
-  # /release/{distribution}
-  # /release/{author}/{release}
-  sub release {
-      my $self  = shift;
-      my %opts  = @_ ? @_ : ();
-      my $url   = '';
-      my $error = "Either provide 'distribution', or 'author' and 'release', " .
-                  "or 'search'";
-
-      %opts or croak $error;
-
-      my %extra_opts = ();
-
-      if ( defined ( my $dist = $opts{'distribution'} ) ) {
-          $url = "release/$dist";
-      } elsif (
-          defined ( my $author  = $opts{'author'}  ) &&
-          defined ( my $release = $opts{'release'} )
-        ) {
-          $url = "release/$author/$release";
-      } elsif ( defined ( my $search_opts = $opts{'search'} ) ) {
-          ref $search_opts && ref $search_opts eq 'HASH'
-              or croak $error;
-
-          %extra_opts = %{$search_opts};
-          $url        = 'release/_search';
-      } else {
-          croak $error;
-      }
-
-      return $self->fetch( $url, %extra_opts );
-  }
-
-
-  # /pod/{module}
-  # /pod/{author}/{release}/{path}
-  sub pod {
-      my $self  = shift;
-      my %opts  = @_ ? @_ : ();
-      my $url   = '';
-      my $error = "Either provide 'module' or 'author and 'release' and 'path'";
-
-      %opts or croak $error;
-
-      if ( defined ( my $module = $opts{'module'} ) ) {
-          $url = "pod/$module";
-      } elsif (
-          defined ( my $author  = $opts{'author'}  ) &&
-          defined ( my $release = $opts{'release'} ) &&
-          defined ( my $path    = $opts{'path'}    )
-        ) {
-          $url = "pod/$author/$release/$path";
-      } else {
-          croak $error;
-      }
-
-      # check content-type
-      my %extra = ();
-      if ( defined ( my $type = $opts{'content-type'} ) ) {
-          $type =~ m{^ text/ (?: html|plain|x-pod|x-markdown ) $}x
-              or croak 'Incorrect content-type provided';
-
-          $extra{headers}{'content-type'} = $type;
-      }
-
-      $url = $self->{base_url}. "/$url";
-
-      my $result = $self->{ua}->get( $url, \%extra );
-      $result->{'success'}
-          or croak "Failed to fetch '$url': " . $result->{'reason'};
-
-      return $result->{'content'};
-  }
-
-
-  # /module/{module}
-  sub module {
-      my $self = shift;
-      my $name = shift;
-
-      $name or croak 'Please provide a module name';
-
-      return $self->fetch("module/$name");
-  }
-
-
-  # file() is a synonym of module
-  sub file { goto &module }
-
-
-  # /author/{author}
-  sub author {
-      my $self = shift;
-      my ( $pause_id, $url, %extra_opts );
-
-      if ( @_ == 1 ) {
-          $url = 'author/' . shift;
-      } elsif ( @_ == 2 ) {
-          my %opts = @_;
-
-          if ( defined $opts{'pauseid'} ) {
-              $url = "author/" . $opts{'pauseid'};
-          } elsif ( defined $opts{'search'} ) {
-              my $search_opts = $opts{'search'};
-
-              ref $search_opts && ref $search_opts eq 'HASH'
-                  or croak "'search' key must be hashref";
-
-              %extra_opts = %{$search_opts};
-              $url        = 'author/_search';
-          } else {
-              croak 'Unknown option given';
-          }
-      } else {
-          croak 'Please provide an author PAUSEID or a "search"';
-      }
-
-      return $self->fetch( $url, %extra_opts );
-  }
-
-
-
-  sub fetch {
-      my $self    = shift;
-      my $url     = shift;
-      my $extra   = $self->_build_extra_params(@_);
-      my $base    = $self->{base_url};
-      my $req_url = $extra ? "$base/$url?$extra" : "$base/$url";
-
-      my $result  = $self->{ua}->get($req_url);
-      return $self->_decode_result( $result, $req_url );
-  }
-
-
-  sub post {
-      my $self  = shift;
-      my $url   = shift;
-      my $query = shift;
-      my $base  = $self->{base_url};
-
-      defined $url
-          or croak 'First argument of URL must be provided';
-
-      ref $query and ref $query eq 'HASH'
-          or croak 'Second argument of query hashref must be provided';
-
-      my $query_json = encode_json( $query );
-      my $result     = $self->{ua}->request(
-          'POST',
-          "$base/$url",
-          {
-              headers => { 'Content-Type' => 'application/json' },
-              content => $query_json,
-          }
-      );
-
-      return $self->_decode_result( $result, $url, $query_json );
-  }
-
-  sub _decode_result {
-      my $self = shift;
-      my ( $result, $url, $original ) = @_;
-      my $decoded_result;
-
-      ref $result and ref $result eq 'HASH'
-          or croak 'First argument must be hashref';
-
-      defined $url
-          or croak 'Second argument of a URL must be provided';
-
-      if ( defined ( my $success = $result->{'success'} ) ) {
-          my $reason = $result->{'reason'} || '';
-          $reason .= ( defined $original ? " (request: $original)" : '' );
-
-          $success or croak "Failed to fetch '$url': $reason";
-      } else {
-          croak 'Missing success in return value';
-      }
-
-      defined ( my $content = $result->{'content'} )
-          or croak 'Missing content in return value';
-
-      eval { $decoded_result = decode_json $content; 1 }
-      or do { croak "Couldn't decode '$content': $@" };
-
-      return $decoded_result;
-  }
-
-  1;
-
-  __END__
-
-  =pod
-
-  =head1 NAME
-
-  MetaCPAN::API::Tiny - A Tiny API client for MetaCPAN
-
-  =head1 VERSION
-
-  version 1.131730
-
-  =head1 DESCRIPTION
-
-  This is the Tiny version of L<MetaCPAN::API>. It implements a compatible API
-  with a few notable exceptions:
-
-  =over 4
-
-  =item Attributes are direct hash access
-
-  The attributes defined using Mo(o|u)se are now accessed via the blessed hash
-  directly. There are no accessors defined to access this elements.
-
-  =item Exception handling
-
-  Instead of using Try::Tiny, raw evals are used. This could potentially cause
-  issues, so just be aware.
-
-  =item Testing
-
-  Test::Fatal was replaced with an eval implementation of exception().
-  Test::TinyMocker usage is retained, but may be absorbed since it is pure perl
-
-  =back
-
-  =head1 CLASS_METHODS
-
-  =head2 new
-
-  new is the constructor for MetaCPAN::API::Tiny. In the non-tiny version of this
-  module, this is provided via Any::Moose built from the attributes defined. In
-  the tiny version, we define our own constructor. It takes the same arguments
-  and provides similar checks to MetaCPAN::API with regards to arguments passed.
-
-  =head1 PUBLIC_METHODS
-
-  =head2 source
-
-      my $source = $mcpan->source(
-          author  => 'DOY',
-          release => 'Moose-2.0201',
-          path    => 'lib/Moose.pm',
-      );
-
-  Searches MetaCPAN for a module or a specific release and returns the plain source.
-
-  =head2 release
-
-      my $result = $mcpan->release( distribution => 'Moose' );
-
-      # or
-      my $result = $mcpan->release( author => 'DOY', release => 'Moose-2.0001' );
-
-  Searches MetaCPAN for a dist.
-
-  You can do complex searches using 'search' parameter:
-
-      # example lifted from MetaCPAN docs
-      my $result = $mcpan->release(
-          search => {
-              author => "OALDERS AND ",
-              filter => "status:latest",
-              fields => "name",
-              size   => 1,
-          },
-      );
-
-  =head2 pod
-
-      my $result = $mcpan->pod( module => 'Moose' );
-
-      # or
-      my $result = $mcpan->pod(
-          author  => 'DOY',
-          release => 'Moose-2.0201',
-          path    => 'lib/Moose.pm',
-      );
-
-  Searches MetaCPAN for a module or a specific release and returns the POD.
-
-  =head2 module
-
-      my $result = $mcpan->module('MetaCPAN::API');
-
-  Searches MetaCPAN and returns a module's ".pm" file.
-
-  =head2 file
-
-  A synonym of L</module>
-
-  =head2 author
-
-      my $result1 = $mcpan->author('XSAWYERX');
-      my $result2 = $mcpan->author( pauseid => 'XSAWYERX' );
-
-  Searches MetaCPAN for a specific author.
-
-  You can do complex searches using 'search' parameter:
-
-      # example lifted from MetaCPAN docs
-      my $result = $mcpan->author(
-          search => {
-              q    => 'profile.name:twitter',
-              size => 1,
-          },
-      );
-
-  =head2 fetch
-
-      my $result = $mcpan->fetch('/release/distribution/Moose');
-
-      # with parameters
-      my $more = $mcpan->fetch(
-          '/release/distribution/Moose',
-          param => 'value',
-      );
-
-  This is a helper method for API implementations. It fetches a path from MetaCPAN, decodes the JSON from the content variable and returns it.
-
-  You don't really need to use it, but you can in case you want to write your own extension implementation to MetaCPAN::API.
-
-  It accepts an additional hash as "GET" parameters.
-
-  =head2 post
-
-      # /release&content={"query":{"match_all":{}},"filter":{"prefix":{"archive":"Cache-Cache-1.06"}}}
-      my $result = $mcpan->post(
-          'release',
-          {
-              query  => { match_all => {} },
-              filter => { prefix => { archive => 'Cache-Cache-1.06' } },
-          },
-      );
-
-  The POST equivalent of the "fetch()" method. It gets the path and JSON request.
-
-  =head1 THANKS
-
-  Overall the tests and code were ripped directly from MetaCPAN::API and
-  tiny-fied. A big thanks to Sawyer X for writing the original module.
-
-  =head1 AUTHOR
-
-  Nicholas R. Perez <nperez@cpan.org>
-
-  =head1 COPYRIGHT AND LICENSE
-
-  This software is copyright (c) 2013 by Nicholas R. Perez <nperez@cpan.org>.
-
-  This is free software; you can redistribute it and/or modify it under
-  the same terms as the Perl 5 programming language system itself.
-
-  =cut
-METACPAN_API_TINY
-
-s/^  //mg for values %fatpacked;
-
-unshift @INC, sub {
-  if (my $fat = $fatpacked{$_[1]}) {
-    if ($] < 5.008) {
-      return sub {
-        return 0 unless length $fat;
-        $fat =~ s/^([^\n]*\n?)//;
-        $_ = $1;
-        return 1;
-      };
-    }
-    open my $fh, '<', \$fat
-      or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
-    return $fh;
-  }
-  return
-};
-
-} # END OF FATPACK CODE
-
-
-use 5.010;
-use strict;
-use warnings;
-use Fatal qw(open close);
-
-use Getopt::Long;
-use Pod::Usage;
-use File::Basename;
-use Module::CoreList;
-use HTTP::Tiny;
-use Safe;
-use MetaCPAN::API::Tiny;
-
-# Below, 5.024 should be aligned with the version of perl actually
-# bundled in Buildroot:
-die <<"MSG" if $] < 5.024;
-This script needs a host perl with the same major version as Buildroot target perl.
-
-Your current host perl is:
-    $^X
-    version $]
-
-You may install a local one by running:
-    perlbrew install perl-5.24.0
-MSG
-
-my ($help, $man, $quiet, $force, $recommend, $test, $host);
-my $target = 1;
-GetOptions( 'help|?' => \$help,
-            'man' => \$man,
-            'quiet|q' => \$quiet,
-            'force|f' => \$force,
-            'host!' => \$host,
-            'target!' => \$target,
-            'recommend' => \$recommend,
-            'test' => \$test
-) or pod2usage(-exitval => 1);
-pod2usage(-exitval => 0) if $help;
-pod2usage(-exitval => 0, -verbose => 2) if $man;
-pod2usage(-exitval => 1) if scalar @ARGV == 0;
-
-my %dist;               # name -> metacpan data
-my %need_target;        # name -> 1 if target package is needed
-my %need_host;          # name -> 1 if host package is needed
-my %need_dlopen;        # name -> 1 if requires dynamic library
-my %deps_build;         # name -> list of host dependencies
-my %deps_runtime;       # name -> list of target dependencies
-my %deps_optional;      # name -> list of optional target dependencies
-my %license_files;      # name -> list of license files
-my %checksum;           # author -> list of checksum
-my $mcpan = MetaCPAN::API::Tiny->new(base_url => 'http://fastapi.metacpan.org/v1');
-my $ua = HTTP::Tiny->new();
-
-sub get_checksum {
-    my ($url) = @_;
-    my($path) = $url =~ m|^[^:/?#]+://[^/?#]*([^?#]*)|;
-    my($basename, $dirname) = fileparse( $path );
-    unless ($checksum{$dirname}) {
-        my $response = $ua->get(qq{http://cpan.metacpan.org${dirname}CHECKSUMS});
-        $checksum{$dirname} = $response->{content};
-    }
-    my $chksum = Safe->new->reval($checksum{$dirname});
-    return $chksum->{$basename}, $basename;
-}
-
-sub get_manifest {
-    my ($author, $distname, $version) = @_;
-    my $url = qq{http://fastapi.metacpan.org/source/${author}/${distname}-${version}/MANIFEST};
-    my $response = $ua->get($url);
-    return $response->{content};
-}
-
-sub is_xs {
-    my ($manifest) = @_;
-    # This heuristic determines if a module is a native extension, by searching
-    # some file extension types in the MANIFEST of the distribution.
-    # It was inspired by http://deps.cpantesters.org/static/purity.html
-    return $manifest =~ m/\.(swg|xs|c|h|i)[\n\s]/;
-}
-
-sub find_license_files {
-    my ($manifest) = @_;
-    my @license_files;
-    foreach (split /\n/, $manifest) {
-        next if m|/|;
-        push @license_files, $_ if m/(ARTISTIC|COPYING|COPYRIGHT|LICENSE)/i;
-    }
-    if (scalar @license_files == 0 && $manifest =~ m/(README)[\n\s]/i) {
-        @license_files = ($1);
-    }
-    return \@license_files;
-}
-
-sub fetch {
-    my ($name, $need_target, $need_host, $top) = @_;
-    $need_target{$name} = $need_target if $need_target;
-    $need_host{$name} = $need_host if $need_host;
-    unless ($dist{$name} && !$top) {
-        say qq{fetch ${name}} unless $quiet;
-        my $result = $mcpan->release( distribution => $name );
-        $dist{$name} = $result;
-        my $manifest = get_manifest( $result->{author}, $name, $result->{version} );
-        $need_dlopen{$name} = is_xs( $manifest );
-        $license_files{$name} = find_license_files( $manifest );
-        my %build = ();
-        my %runtime = ();
-        my %optional = ();
-        foreach my $dep (@{$result->{dependency}}) {
-            my $modname = ${$dep}{module};
-            next if $modname eq q{perl};
-            next if $modname =~ m|^Alien|;
-            next if $modname =~ m|^Win32|;
-            next if !($test && $top) && $modname =~ m|^Test|;
-            next if Module::CoreList::is_core( $modname, undef, $] );
-            # we could use the host Module::CoreList data, because host perl and
-            # target perl have the same major version
-            next if ${$dep}{phase} eq q{develop};
-            next if !($test && $top) && ${$dep}{phase} eq q{test};
-            my $distname = $mcpan->module( $modname )->{distribution};
-            if (${$dep}{phase} eq q{runtime}) {
-                if (${$dep}{relationship} eq q{requires}) {
-                    $runtime{$distname} = 1;
-                }
-                else {
-                    $optional{$distname} = 1 if $recommend && $top;
-                }
-            }
-            else { # configure, build
-                $build{$distname} = 1;
-            }
-        }
-        $deps_build{$name} = [keys %build];
-        $deps_runtime{$name} = [keys %runtime];
-        $deps_optional{$name} = [keys %optional];
-        foreach my $distname (@{$deps_build{$name}}) {
-            fetch( $distname, 0, 1 );
-        }
-        foreach my $distname (@{$deps_runtime{$name}}) {
-            fetch( $distname, $need_target, $need_host );
-            $need_dlopen{$name} ||= $need_dlopen{$distname};
-        }
-        foreach my $distname (@{$deps_optional{$name}}) {
-            fetch( $distname, $need_target, $need_host );
-        }
-    }
-    return;
-}
-
-foreach my $distname (@ARGV) {
-    # Command-line's distributions
-    fetch( $distname, !!$target, !!$host, 1 );
-}
-say scalar keys %dist, q{ packages fetched.} unless $quiet;
-
-# Buildroot package name: lowercase
-sub fsname {
-    my $name = shift;
-    $name =~ s|_|-|g;
-    return q{perl-} . lc $name;
-}
-
-# Buildroot variable name: uppercase
-sub brname {
-    my $name = shift;
-    $name =~ s|-|_|g;
-    return uc $name;
-}
-
-while (my ($distname, $dist) = each %dist) {
-    my $fsname = fsname( $distname );
-    my $dirname = q{package/} . $fsname;
-    my $cfgname = $dirname . q{/Config.in};
-    my $mkname = $dirname . q{/} . $fsname . q{.mk};
-    my $hashname = $dirname . q{/} . $fsname . q{.hash};
-    my $brname = brname( $fsname );
-    mkdir $dirname unless -d $dirname;
-    if ($need_target{$distname} && ($force || !-f $cfgname)) {
-        my $abstract = $dist->{abstract};
-        my $homepage = $dist->{resources}->{homepage} || qq{https://metacpan.org/release/${distname}};
-        say qq{write ${cfgname}} unless $quiet;
-        open my $fh, q{>}, $cfgname;
-        say {$fh} qq{config BR2_PACKAGE_${brname}};
-        say {$fh} qq{\tbool "${fsname}"};
-        say {$fh} qq{\tdepends on !BR2_STATIC_LIBS} if $need_dlopen{$distname};
-        foreach my $dep (sort @{$deps_runtime{$distname}}) {
-            my $brdep = brname( fsname( $dep ) );
-            say {$fh} qq{\tselect BR2_PACKAGE_${brdep}};
-        }
-        say {$fh} qq{\thelp};
-        say {$fh} qq{\t  ${abstract}\n} if $abstract;
-        say {$fh} qq{\t  ${homepage}};
-        if ($need_dlopen{$distname}) {
-            say {$fh} qq{\ncomment "${fsname} needs a toolchain w/ dynamic library"};
-            say {$fh} qq{\tdepends on BR2_STATIC_LIBS};
-        }
-        close $fh;
-    }
-    if ($force || !-f $mkname) {
-        my $version = $dist->{version};
-        my($path) = $dist->{download_url} =~ m|^[^:/?#]+://[^/?#]*([^?#]*)|;
-        # this URL contains only the scheme, auth and path parts (but no query and fragment parts)
-        # the scheme is not used, because the job is done by the BR download infrastructure
-        # the auth part is not used, because we use $(BR2_CPAN_MIRROR)
-        my($filename, $directories, $suffix) = fileparse( $path, q{tar.gz}, q{tgz} );
-        $directories =~ s|/$||;
-        my $dependencies = join q{ }, map( { q{host-} . fsname( $_ ); } sort @{$deps_build{$distname}} ),
-                                      map( { fsname( $_ ); } sort @{$deps_runtime{$distname}} );
-        my $host_dependencies = join q{ }, map { q{host-} . fsname( $_ ); } sort( @{$deps_build{$distname}},
-                                                                                  @{$deps_runtime{$distname}} );
-        my $license = ref $dist->{license} eq 'ARRAY'
-                    ? join q{ or }, @{$dist->{license}}
-                    : $dist->{license};
-        # BR requires license name as in http://spdx.org/licenses/
-        $license =~ s|apache_2_0|Apache-2.0|;
-        $license =~ s|artistic_2|Artistic-2.0|;
-        $license =~ s|mit|MIT|;
-        $license =~ s|openssl|OpenSSL|;
-        $license =~ s|perl_5|Artistic or GPLv1+|;
-        my $license_files = join q{ }, @{$license_files{$distname}};
-        say qq{write ${mkname}} unless $quiet;
-        open my $fh, q{>}, $mkname;
-        say {$fh} qq{################################################################################};
-        say {$fh} qq{#};
-        say {$fh} qq{# ${fsname}};
-        say {$fh} qq{#};
-        say {$fh} qq{################################################################################};
-        say {$fh} qq{};
-        say {$fh} qq{${brname}_VERSION = ${version}};
-        say {$fh} qq{${brname}_SOURCE = ${distname}-\$(${brname}_VERSION).${suffix}};
-        say {$fh} qq{${brname}_SITE = \$(BR2_CPAN_MIRROR)${directories}};
-        say {$fh} qq{${brname}_DEPENDENCIES = ${dependencies}} if $need_target{$distname} && $dependencies;
-        say {$fh} qq{HOST_${brname}_DEPENDENCIES = ${host_dependencies}} if $need_host{$distname} && $host_dependencies;
-        say {$fh} qq{${brname}_LICENSE = ${license}} if $license && $license ne q{unknown};
-        say {$fh} qq{${brname}_LICENSE_FILES = ${license_files}} if $license_files;
-        say {$fh} qq{};
-        foreach (sort @{$deps_optional{$distname}}) {
-            next if grep { $_ eq $distname; } @{$deps_runtime{$_}};     # avoid cyclic dependencies
-            my $opt_brname = brname( $_ );
-            my $opt_fsname = fsname( $_ );
-            say {$fh} qq{ifeq (\$(BR2_PACKAGE_PERL_${opt_brname}),y)};
-            say {$fh} qq{${brname}_DEPENDENCIES += ${opt_fsname}};
-            say {$fh} qq{endif};
-            say {$fh} qq{};
-        }
-        say {$fh} qq{\$(eval \$(perl-package))} if $need_target{$distname};
-        say {$fh} qq{\$(eval \$(host-perl-package))} if $need_host{$distname};
-        close $fh;
-    }
-    if ($force || !-f $hashname) {
-        my($checksum, $filename) = get_checksum($dist->{download_url});
-        my $md5 = $checksum->{md5};
-        my $sha256 = $checksum->{sha256};
-        say qq{write ${hashname}} unless $quiet;
-        open my $fh, q{>}, $hashname;
-        say {$fh} qq{# retrieved by scancpan from http://cpan.metacpan.org/};
-        say {$fh} qq{md5    ${md5} ${filename}};
-        say {$fh} qq{sha256 ${sha256} ${filename}};
-        close $fh;
-    }
-}
-
-my %pkg;
-my $cfgname = q{package/Config.in};
-if (-f $cfgname) {
-    open my $fh, q{<}, $cfgname;
-    while (<$fh>) {
-        chomp;
-        $pkg{$_} = 1 if m|package/perl-|;
-    }
-    close $fh;
-}
-
-foreach my $distname (keys %need_target) {
-    my $fsname = fsname( $distname );
-    $pkg{qq{\tsource "package/${fsname}/Config.in"}} = 1;
-}
-
-say qq{${cfgname} must contain the following lines:};
-say join qq{\n}, sort keys %pkg;
-
-__END__
-
-=head1 NAME
-
-support/scripts/scancpan Try-Tiny Moo
-
-=head1 SYNOPSIS
-
-supports/scripts/scancpan [options] [distname ...]
-
- Options:
-   -help
-   -man
-   -quiet
-   -force
-   -target/-notarget
-   -host/-nohost
-   -recommend
-   -test
-
-=head1 OPTIONS
-
-=over 8
-
-=item B<-help>
-
-Prints a brief help message and exits.
-
-=item B<-man>
-
-Prints the manual page and exits.
-
-=item B<-quiet>
-
-Executes without output
-
-=item B<-force>
-
-Forces the overwriting of existing files.
-
-=item B<-target/-notarget>
-
-Switches package generation for the target variant (the default is C<-target>).
-
-=item B<-host/-nohost>
-
-Switches package generation for the host variant (the default is C<-nohost>).
-
-=item B<-recommend>
-
-Adds I<recommended> dependencies.
-
-=item B<-test>
-
-Adds dependencies for test.
-
-=back
-
-=head1 DESCRIPTION
-
-This script creates templates of the Buildroot package files for all the
-Perl/CPAN distributions required by the specified distnames. The
-dependencies and metadata are fetched from https://metacpan.org/.
-
-After running this script, it is necessary to check the generated files.
-You have to manually add the license files (PERL_FOO_LICENSE_FILES variable).
-For distributions that link against a target library, you have to add the
-buildroot package name for that library to the DEPENDENCIES variable.
-
-See the Buildroot documentation for details on the usage of the Perl
-infrastructure.
-
-The major version of the host perl must be aligned on the target one,
-in order to work with the right CoreList data.
-
-=head1 LICENSE
-
-Copyright (C) 2013-2016 by Francois Perrad <francois.perrad@gadz.org>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-This script is a part of Buildroot.
-
-This script requires the module C<MetaCPAN::API::Tiny> (version 1.131730)
-which was included at the beginning of this file by the tool C<fatpack>.
-
-See L<http://search.cpan.org/~nperez/MetaCPAN-API-Tiny-1.131730/>.
-
-See L<http://search.cpan.org/search?query=App-FatPacker&mode=dist>.
-
-These both libraries are free software and may be distributed under the same
-terms as perl itself.
-
-And perl may be distributed under the terms of Artistic v1 or GPL v1 license.
-
-=cut
diff --git a/bsp/buildroot/support/scripts/scanpypi b/bsp/buildroot/support/scripts/scanpypi
deleted file mode 100755
index e150ae58..00000000
--- a/bsp/buildroot/support/scripts/scanpypi
+++ /dev/null
@@ -1,653 +0,0 @@
-#!/usr/bin/python2
-"""
-
-Utility for building Buildroot packages for existing PyPI packages
-
-Any package built by scanpypi should be manually checked for
-errors.
-"""
-from __future__ import print_function
-import argparse
-import json
-import urllib2
-import sys
-import os
-import shutil
-import StringIO
-import tarfile
-import zipfile
-import errno
-import hashlib
-import re
-import textwrap
-import tempfile
-import imp
-from functools import wraps
-
-def setup_decorator(func, method):
-    """
-    Decorator for distutils.core.setup and setuptools.setup.
-    Puts the arguments with which setup is called as a dict
-    Add key 'method' which should be either 'setuptools' or 'distutils'.
-
-    Keyword arguments:
-    func -- either setuptools.setup or distutils.core.setup
-    method -- either 'setuptools' or 'distutils'
-    """
-
-    @wraps(func)
-    def closure(*args, **kwargs):
-        # Any python packages calls its setup function to be installed.
-        # Argument 'name' of this setup function is the package's name
-        BuildrootPackage.setup_args[kwargs['name']] = kwargs
-        BuildrootPackage.setup_args[kwargs['name']]['method'] = method
-    return closure
-
-# monkey patch
-import setuptools
-setuptools.setup = setup_decorator(setuptools.setup, 'setuptools')
-import distutils
-distutils.core.setup = setup_decorator(setuptools.setup, 'distutils')
-
-def find_file_upper_case(filenames, path='./'):
-    """
-    List generator:
-    Recursively find files that matches one of the specified filenames.
-    Returns a relative path starting with path argument.
-
-    Keyword arguments:
-    filenames -- List of filenames to be found
-    path -- Path to the directory to search
-    """
-    for root, dirs, files in os.walk(path):
-        for file in files:
-            if file.upper() in filenames:
-                yield (os.path.join(root, file))
-
-
-def pkg_buildroot_name(pkg_name):
-    """
-    Returns the Buildroot package name for the PyPI package pkg_name.
-    Remove all non alphanumeric characters except -
-    Also lowers the name and adds 'python-' suffix
-
-    Keyword arguments:
-    pkg_name -- String to rename
-    """
-    name = re.sub('[^\w-]', '', pkg_name.lower())
-    prefix = 'python-'
-    pattern = re.compile('^(?!' + prefix + ')(.+?)$')
-    name = pattern.sub(r'python-\1', name)
-    return name
-
-class DownloadFailed(Exception):
-    pass
-
-class BuildrootPackage():
-    """This class's methods are not meant to be used individually please
-    use them in the correct order:
-
-    __init__
-
-    download_package
-
-    extract_package
-
-    load_module
-
-    get_requirements
-
-    create_package_mk
-
-    create_hash_file
-
-    create_config_in
-
-    """
-    setup_args = {}
-
-    def __init__(self, real_name, pkg_folder):
-        self.real_name = real_name
-        self.buildroot_name = pkg_buildroot_name(self.real_name)
-        self.pkg_dir = os.path.join(pkg_folder, self.buildroot_name)
-        self.mk_name = self.buildroot_name.upper().replace('-', '_')
-        self.as_string = None
-        self.md5_sum = None
-        self.metadata = None
-        self.metadata_name = None
-        self.metadata_url = None
-        self.pkg_req = None
-        self.setup_metadata = None
-        self.tmp_extract = None
-        self.used_url = None
-        self.filename = None
-        self.url = None
-        self.version = None
-
-    def fetch_package_info(self):
-        """
-        Fetch a package's metadata from the python package index
-        """
-        self.metadata_url = 'https://pypi.python.org/pypi/{pkg}/json'.format(
-            pkg=self.real_name)
-        try:
-            pkg_json = urllib2.urlopen(self.metadata_url).read().decode()
-        except urllib2.HTTPError as error:
-            print('ERROR:', error.getcode(), error.msg, file=sys.stderr)
-            print('ERROR: Could not find package {pkg}.\n'
-                  'Check syntax inside the python package index:\n'
-                  'https://pypi.python.org/pypi/ '
-                  .format(pkg=self.real_name))
-            raise
-        except urllib2.URLError:
-            print('ERROR: Could not find package {pkg}.\n'
-                  'Check syntax inside the python package index:\n'
-                  'https://pypi.python.org/pypi/ '
-                  .format(pkg=self.real_name))
-            raise
-        self.metadata = json.loads(pkg_json)
-        self.version = self.metadata['info']['version']
-        self.metadata_name = self.metadata['info']['name']
-
-    def download_package(self):
-        """
-        Download a package using metadata from pypi
-        """
-        try:
-            self.metadata['urls'][0]['filename']
-        except IndexError:
-            print(
-                'Non-conventional package, ',
-                'please check carefully after creation')
-            self.metadata['urls'] = [{
-                'packagetype': 'sdist',
-                'url': self.metadata['info']['download_url'],
-                'md5_digest': None}]
-            # In this case, we can't get the name of the downloaded file
-            # from the pypi api, so we need to find it, this should work
-            urlpath = urllib2.urlparse.urlparse(
-                self.metadata['info']['download_url']).path
-            # urlparse().path give something like
-            # /path/to/file-version.tar.gz
-            # We use basename to remove /path/to
-            self.metadata['urls'][0]['filename'] = os.path.basename(urlpath)
-        for download_url in self.metadata['urls']:
-            if 'bdist' in download_url['packagetype']:
-                continue
-            try:
-                print('Downloading package {pkg} from {url}...'.format(
-                      pkg=self.real_name, url=download_url['url']))
-                download = urllib2.urlopen(download_url['url'])
-            except urllib2.HTTPError as http_error:
-                download = http_error
-            else:
-                self.used_url = download_url
-                self.as_string = download.read()
-                if not download_url['md5_digest']:
-                    break
-                self.md5_sum = hashlib.md5(self.as_string).hexdigest()
-                if self.md5_sum == download_url['md5_digest']:
-                    break
-        else:
-            if download.__class__ == urllib2.HTTPError:
-                raise download
-            raise DownloadFailed('Failed to downloas package {pkg}'
-                                 .format(pkg=self.real_name))
-        self.filename = self.used_url['filename']
-        self.url = self.used_url['url']
-
-    def extract_package(self, tmp_path):
-        """
-        Extract the package contents into a directrory
-
-        Keyword arguments:
-        tmp_path -- directory where you want the package to be extracted
-        """
-        as_file = StringIO.StringIO(self.as_string)
-        if self.filename[-3:] == 'zip':
-            with zipfile.ZipFile(as_file) as as_zipfile:
-                tmp_pkg = os.path.join(tmp_path, self.buildroot_name)
-                try:
-                    os.makedirs(tmp_pkg)
-                except OSError as exception:
-                    if exception.errno != errno.EEXIST:
-                        print("ERROR: ", exception.message, file=sys.stderr)
-                        return None, None
-                    print('WARNING:', exception.message, file=sys.stderr)
-                    print('Removing {pkg}...'.format(pkg=tmp_pkg))
-                    shutil.rmtree(tmp_pkg)
-                    os.makedirs(tmp_pkg)
-                as_zipfile.extractall(tmp_pkg)
-        else:
-            with tarfile.open(fileobj=as_file) as as_tarfile:
-                tmp_pkg = os.path.join(tmp_path, self.buildroot_name)
-                try:
-                    os.makedirs(tmp_pkg)
-                except OSError as exception:
-                    if exception.errno != errno.EEXIST:
-                        print("ERROR: ", exception.message, file=sys.stderr)
-                        return None, None
-                    print('WARNING:', exception.message, file=sys.stderr)
-                    print('Removing {pkg}...'.format(pkg=tmp_pkg))
-                    shutil.rmtree(tmp_pkg)
-                    os.makedirs(tmp_pkg)
-                as_tarfile.extractall(tmp_pkg)
-
-        tmp_extract = '{folder}/{name}-{version}'
-        self.tmp_extract = tmp_extract.format(
-            folder=tmp_pkg,
-            name=self.metadata_name,
-            version=self.version)
-
-    def load_setup(self):
-        """
-        Loads the corresponding setup and store its metadata
-        """
-        current_dir = os.getcwd()
-        os.chdir(self.tmp_extract)
-        sys.path.append(self.tmp_extract)
-        s_file, s_path, s_desc = imp.find_module('setup', [self.tmp_extract])
-        setup = imp.load_module('setup', s_file, s_path, s_desc)
-        try:
-            self.setup_metadata = self.setup_args[self.metadata_name]
-        except KeyError:
-            # This means setup was not called which most likely mean that it is
-            # called through the if __name__ == '__main__' directive.
-            # In this case, we can only pray that it is called through a
-            # function called main() in setup.py.
-            setup.main([]) # Will raise AttributeError if not found
-            self.setup_metadata = self.setup_args[self.metadata_name]
-        # Here we must remove the module the hard way.
-        # We must do this because of a very sepcific case: if a package calls
-        # setup from the __main__ but does not come with a 'main()' function,
-        # for some reason setup.main([]) will successfully call the main
-        # function of a previous package...
-        sys.modules.pop('setup',None)
-        del setup
-        os.chdir(current_dir)
-        sys.path.remove(self.tmp_extract)
-
-    def get_requirements(self, pkg_folder):
-        """
-        Retrieve dependencies from the metadata found in the setup.py script of
-        a pypi package.
-
-        Keyword Arguments:
-        pkg_folder -- location of the already created packages
-        """
-        if 'install_requires' not in self.setup_metadata:
-            self.pkg_req = None
-            return set()
-        self.pkg_req = self.setup_metadata['install_requires']
-        self.pkg_req = [re.sub('([-.\w]+).*', r'\1', req)
-                        for req in self.pkg_req]
-        req_not_found = self.pkg_req
-        self.pkg_req = map(pkg_buildroot_name, self.pkg_req)
-        pkg_tuples = zip(req_not_found, self.pkg_req)
-        # pkg_tuples is a list of tuples that looks like
-        # ('werkzeug','python-werkzeug') because I need both when checking if
-        # dependencies already exist or are already in the download list
-        req_not_found = set(
-            pkg[0] for pkg in pkg_tuples
-            if not os.path.isdir(pkg[1])
-            )
-        return req_not_found
-
-    def __create_mk_header(self):
-        """
-        Create the header of the <package_name>.mk file
-        """
-        header = ['#' * 80 + '\n']
-        header.append('#\n')
-        header.append('# {name}\n'.format(name=self.buildroot_name))
-        header.append('#\n')
-        header.append('#' * 80 + '\n')
-        header.append('\n')
-        return header
-
-    def __create_mk_download_info(self):
-        """
-        Create the lines refering to the download information of the
-        <package_name>.mk file
-        """
-        lines = []
-        version_line = '{name}_VERSION = {version}\n'.format(
-            name=self.mk_name,
-            version=self.version)
-        lines.append(version_line)
-
-        targz = self.filename.replace(
-            self.version,
-            '$({name}_VERSION)'.format(name=self.mk_name))
-        targz_line = '{name}_SOURCE = {filename}\n'.format(
-            name=self.mk_name,
-            filename=targz)
-        lines.append(targz_line)
-
-        if self.filename not in self.url:
-            # Sometimes the filename is in the url, sometimes it's not
-            site_url = self.url
-        else:
-            site_url = self.url[:self.url.find(self.filename)]
-        site_line = '{name}_SITE = {url}'.format(name=self.mk_name,
-                                                 url=site_url)
-        site_line = site_line.rstrip('/') + '\n'
-        lines.append(site_line)
-        return lines
-
-    def __create_mk_setup(self):
-        """
-        Create the line refering to the setup method of the package of the
-        <package_name>.mk file
-
-        There are two things you can use to make an installer
-        for a python package: distutils or setuptools
-        distutils comes with python but does not support dependencies.
-        distutils is mostly still there for backward support.
-        setuptools is what smart people use,
-        but it is not shipped with python :(
-        """
-        lines = []
-        setup_type_line = '{name}_SETUP_TYPE = {method}\n'.format(
-            name=self.mk_name,
-            method=self.setup_metadata['method'])
-        lines.append(setup_type_line)
-        return lines
-
-    def __create_mk_license(self):
-        """
-        Create the lines referring to the package's license informations of the
-        <package_name>.mk file
-
-        The license is found using the metadata from pypi.
-        In the metadata, the license can be found either with standard names in
-        the classifiers part or with naming from the packager in the "License"
-        part.
-
-        From the classifiers, the license is "translated" according to
-        buildroot standards if need be (i.e. from Apache Software License to
-        Apache-2.0).
-
-        From the License part, we cannot guess what formatting the packager
-        used. Hence, it is likely to be incorrect. (i.e. Apache License 2.0
-        instead of Apache-2.0).
-
-        The license's files are found by searching the package for files named
-        license or license.txt (case insensitive).
-        If more than one license file is found, the user is asked to select
-        which ones he wants to use.
-        """
-        license_dict = {
-            'Apache Software License': 'Apache-2.0',
-            'BSD License': 'BSD',
-            'European Union Public Licence 1.0': 'EUPLv1.0',
-            'European Union Public Licence 1.1': 'EUPLv1.1',
-            "GNU General Public License": "GPL",
-            "GNU General Public License v2": "GPLv2",
-            "GNU General Public License v2 or later": "GPLv2+",
-            "GNU General Public License v3": "GPLv3",
-            "GNU General Public License v3 or later": "GPLv3+",
-            "GNU Lesser General Public License v2": "LGPLv2.1",
-            "GNU Lesser General Public License v2 or later": "LGPLv2.1+",
-            "GNU Lesser General Public License v3": "LGPLv3",
-            "GNU Lesser General Public License v3 or later": "LGPLv3+",
-            "GNU Library or Lesser General Public License": "LGPLv2",
-            "ISC License": "ISC",
-            "MIT License": "MIT",
-            "Mozilla Public License 1.0": "MPL-1.0",
-            "Mozilla Public License 1.1": "MPL-1.1",
-            "Mozilla Public License 2.0": "MPL-2.0",
-            "Zope Public License": "ZPL"
-            }
-        regexp = re.compile('^License :* *.* *:+ (.*)( \(.*\))?$')
-        classifiers_licenses = [regexp.sub(r"\1", lic)
-                                for lic in self.metadata['info']['classifiers']
-                                if regexp.match(lic)]
-        licenses = map(lambda x: license_dict[x] if x in license_dict else x,
-                       classifiers_licenses)
-        lines = []
-        if not len(licenses):
-            print('WARNING: License has been set to "{license}". It is most'
-                  ' likely wrong, please change it if need be'.format(
-                      license=', '.join(licenses)))
-            licenses = [self.metadata['info']['license']]
-        license_line = '{name}_LICENSE = {license}\n'.format(
-            name=self.mk_name,
-            license=', '.join(licenses))
-        lines.append(license_line)
-
-        filenames = ['LICENCE', 'LICENSE', 'LICENSE.TXT', 'COPYING',
-		     'COPYING.TXT']
-        license_files = list(find_file_upper_case(filenames, self.tmp_extract))
-        license_files = [license.replace(self.tmp_extract, '')[1:]
-                         for license in license_files]
-        if len(license_files) > 0:
-            if len(license_files) > 1:
-                print('More than one file found for license:',
-                      ', '.join(license_files))
-            license_files = [filename
-                             for index, filename in enumerate(license_files)]
-            license_file_line = ('{name}_LICENSE_FILES ='
-                                 ' {files}\n'.format(
-                                     name=self.mk_name,
-                                     files=' '.join(license_files)))
-            lines.append(license_file_line)
-        else:
-            print('WARNING: No license file found,'
-                  ' please specify it manually afterwards')
-            license_file_line = '# No license file found\n'
-
-        return lines
-
-    def __create_mk_requirements(self):
-        """
-        Create the lines referring to the dependencies of the of the
-        <package_name>.mk file
-
-        Keyword Arguments:
-        pkg_name -- name of the package
-        pkg_req -- dependencies of the package
-        """
-        lines = []
-        dependencies_line = ('{name}_DEPENDENCIES ='
-                             ' {reqs}\n'.format(
-                                 name=self.mk_name,
-                                 reqs=' '.join(self.pkg_req)))
-        lines.append(dependencies_line)
-        return lines
-
-    def create_package_mk(self):
-        """
-        Create the lines corresponding to the <package_name>.mk file
-        """
-        pkg_mk = '{name}.mk'.format(name=self.buildroot_name)
-        path_to_mk = os.path.join(self.pkg_dir, pkg_mk)
-        print('Creating {file}...'.format(file=path_to_mk))
-        lines = self.__create_mk_header()
-        lines += self.__create_mk_download_info()
-        lines += self.__create_mk_setup()
-        lines += self.__create_mk_license()
-
-        lines.append('\n')
-        lines.append('$(eval $(python-package))')
-        lines.append('\n')
-        with open(path_to_mk, 'w') as mk_file:
-            mk_file.writelines(lines)
-
-    def create_hash_file(self):
-        """
-        Create the lines corresponding to the <package_name>.hash files
-        """
-        pkg_hash = '{name}.hash'.format(name=self.buildroot_name)
-        path_to_hash = os.path.join(self.pkg_dir, pkg_hash)
-        print('Creating {filename}...'.format(filename=path_to_hash))
-        lines = []
-        if self.used_url['md5_digest']:
-            md5_comment = '# md5 from {url}, sha256 locally computed\n'.format(
-		url=self.metadata_url)
-            lines.append(md5_comment)
-            hash_line = '{method}\t{digest}  {filename}\n'.format(
-                method='md5',
-                digest=self.used_url['md5_digest'],
-                filename=self.filename)
-            lines.append(hash_line)
-        digest = hashlib.sha256(self.as_string).hexdigest()
-        hash_line = '{method}\t{digest}  {filename}\n'.format(
-            method='sha256',
-            digest=digest,
-            filename=self.filename)
-        lines.append(hash_line)
-
-        with open(path_to_hash, 'w') as hash_file:
-            hash_file.writelines(lines)
-
-    def create_config_in(self):
-        """
-        Creates the Config.in file of a package
-        """
-        path_to_config = os.path.join(self.pkg_dir, 'Config.in')
-        print('Creating {file}...'.format(file=path_to_config))
-        lines = []
-        config_line = 'config BR2_PACKAGE_{name}\n'.format(
-            name=self.mk_name)
-        lines.append(config_line)
-
-        bool_line = '\tbool "{name}"\n'.format(name=self.buildroot_name)
-        lines.append(bool_line)
-        if self.pkg_req:
-            for dep in self.pkg_req:
-                dep_line = '\tselect BR2_PACKAGE_{req} # runtime\n'.format(
-                    req=dep.upper().replace('-', '_'))
-                lines.append(dep_line)
-
-        lines.append('\thelp\n')
-
-        help_lines = textwrap.wrap(self.metadata['info']['summary'],
-                                   initial_indent='\t  ',
-                                   subsequent_indent='\t  ')
-
-        # make sure a help text is terminated with a full stop
-        if help_lines[-1][-1] != '.':
-            help_lines[-1] += '.'
-
-        # \t + two spaces is 3 char long
-        help_lines.append('')
-        help_lines.append('\t  ' + self.metadata['info']['home_page'])
-        help_lines = map(lambda x: x + '\n', help_lines)
-        lines += help_lines
-
-        with open(path_to_config, 'w') as config_file:
-            config_file.writelines(lines)
-
-
-def main():
-    # Building the parser
-    parser = argparse.ArgumentParser(
-        description="Creates buildroot packages from the metadata of "
-                    "an existing PyPI packages and include it "
-                    "in menuconfig")
-    parser.add_argument("packages",
-                        help="list of packages to be created",
-                        nargs='+')
-    parser.add_argument("-o", "--output",
-                        help="""
-                        Output directory for packages.
-                        Default is ./package
-                        """,
-                        default='./package')
-
-    args = parser.parse_args()
-    packages = list(set(args.packages))
-
-    # tmp_path is where we'll extract the files later
-    tmp_prefix = 'scanpypi-'
-    pkg_folder = args.output
-    tmp_path = tempfile.mkdtemp(prefix=tmp_prefix)
-    try:
-        for real_pkg_name in packages:
-            package = BuildrootPackage(real_pkg_name, pkg_folder)
-            print('buildroot package name for {}:'.format(package.real_name),
-                  package.buildroot_name)
-            # First we download the package
-            # Most of the info we need can only be found inside the package
-            print('Package:', package.buildroot_name)
-            print('Fetching package', package.real_name)
-            try:
-                package.fetch_package_info()
-            except (urllib2.URLError, urllib2.HTTPError):
-                continue
-            if package.metadata_name.lower() == 'setuptools':
-                # setuptools imports itself, that does not work very well
-                # with the monkey path at the begining
-                print('Error: setuptools cannot be built using scanPyPI')
-                continue
-
-            try:
-                package.download_package()
-            except urllib2.HTTPError as error:
-                print('Error: {code} {reason}'.format(code=error.code,
-                                                      reason=error.reason))
-                print('Error downloading package :', package.buildroot_name)
-                print()
-                continue
-
-            # extract the tarball
-            try:
-                package.extract_package(tmp_path)
-            except (tarfile.ReadError, zipfile.BadZipfile):
-                print('Error extracting package {}'.format(package.real_name))
-                print()
-                continue
-
-            # Loading the package install info from the package
-            try:
-                package.load_setup()
-            except ImportError as err:
-                if 'buildutils' in err.message:
-                    print('This package needs buildutils')
-                else:
-                    raise
-                continue
-            except AttributeError:
-                print('Error: Could not install package {pkg}'.format(
-                    pkg=package.real_name))
-                continue
-
-            # Package requirement are an argument of the setup function
-            req_not_found = package.get_requirements(pkg_folder)
-            req_not_found = req_not_found.difference(packages)
-
-            packages += req_not_found
-            if req_not_found:
-                print('Added packages \'{pkgs}\' as dependencies of {pkg}'
-                      .format(pkgs=", ".join(req_not_found),
-                              pkg=package.buildroot_name))
-            print('Checking if package {name} already exists...'.format(
-                name=package.pkg_dir))
-            try:
-                os.makedirs(package.pkg_dir)
-            except OSError as exception:
-                if exception.errno != errno.EEXIST:
-                    print("ERROR: ", exception.message, file=sys.stderr)
-                    continue
-                print('Error: Package {name} already exists'
-                      .format(name=package.pkg_dir))
-                del_pkg = raw_input(
-                    'Do you want to delete existing package ? [y/N]')
-                if del_pkg.lower() == 'y':
-                    shutil.rmtree(package.pkg_dir)
-                    os.makedirs(package.pkg_dir)
-                else:
-                    continue
-            package.create_package_mk()
-
-            package.create_hash_file()
-
-            package.create_config_in()
-            print()
-            # printing an empty line for visual confort
-    finally:
-        shutil.rmtree(tmp_path)
-
-if __name__ == "__main__":
-    main()
diff --git a/bsp/buildroot/support/scripts/size-stats b/bsp/buildroot/support/scripts/size-stats
index 3ff2a1ce..deea92e2 100755
--- a/bsp/buildroot/support/scripts/size-stats
+++ b/bsp/buildroot/support/scripts/size-stats
@@ -35,6 +35,7 @@ except ImportError:
 colors = ['#e60004', '#009836', '#2e1d86', '#ffed00',
           '#0068b5', '#f28e00', '#940084', '#97c000']
 
+
 #
 # This function adds a new file to 'filesdict', after checking its
 # size. The 'filesdict' contain the relative path of the file as the
@@ -54,6 +55,7 @@ def add_file(filesdict, relpath, abspath, pkg):
     sz = os.stat(abspath).st_size
     filesdict[relpath] = (pkg, sz)
 
+
 #
 # This function returns a dict where each key is the path of a file in
 # the root filesystem, and the value is a tuple containing two
@@ -73,6 +75,7 @@ def build_package_dict(builddir):
             add_file(filesdict, fpath, fullpath, pkg)
     return filesdict
 
+
 #
 # This function builds a dictionary that contains the name of a
 # package as key, and the size of the files installed by this package
@@ -103,7 +106,7 @@ def build_package_size(filesdict, builddir):
                 seeninodes.add(st.st_ino)
 
             frelpath = os.path.relpath(fpath, os.path.join(builddir, "target"))
-            if not frelpath in filesdict:
+            if frelpath not in filesdict:
                 print("WARNING: %s is not part of any package" % frelpath)
                 pkg = "unknown"
             else:
@@ -113,6 +116,7 @@ def build_package_size(filesdict, builddir):
 
     return pkgsize
 
+
 #
 # Given a dict returned by build_package_size(), this function
 # generates a pie chart of the size installed by each package.
@@ -127,7 +131,7 @@ def draw_graph(pkgsize, outputf):
     labels = []
     values = []
     other_value = 0
-    for (p, sz) in pkgsize.items():
+    for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1]):
         if sz < (total * 0.01):
             other_value += sz
         else:
@@ -150,6 +154,7 @@ def draw_graph(pkgsize, outputf):
     plt.title("Total filesystem size: %d kB" % (total / 1000.), fontsize=10, y=.96)
     plt.savefig(outputf)
 
+
 #
 # Generate a CSV file with statistics about the size of each file, its
 # size contribution to the package and to the overall system.
@@ -208,6 +213,7 @@ def gen_packages_csv(pkgsizes, outputf):
         for (pkg, size) in pkgsizes.items():
             wr.writerow([pkg, size, "%.1f" % (float(size) / total * 100)])
 
+
 parser = argparse.ArgumentParser(description='Draw size statistics graphs')
 
 parser.add_argument("--builddir", '-i', metavar="BUILDDIR", required=True,
diff --git a/bsp/buildroot/support/scripts/size-stats-compare b/bsp/buildroot/support/scripts/size-stats-compare
deleted file mode 100755
index e5a1ec3f..00000000
--- a/bsp/buildroot/support/scripts/size-stats-compare
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2016 Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-# TODO (improvements)
-# - support K,M,G size suffixes for threshold
-# - output CSV file in addition to stdout reporting
-
-import csv
-import argparse
-import sys
-
-def read_file_size_csv(inputf, detail=None):
-    """Extract package or file sizes from CSV file into size dictionary"""
-    sizes = {}
-    reader = csv.reader(inputf)
-
-    header = next(reader)
-    if (header[0] != 'File name' or header[1] != 'Package name' or
-        header[2] != 'File size' or header[3] != 'Package size'):
-        print(("Input file %s does not contain the expected header. Are you "
-               "sure this file corresponds to the file-size-stats.csv "
-               "file created by 'make graph-size'?") % inputf.name)
-        sys.exit(1)
-
-    for row in reader:
-        if detail:
-            sizes[row[0]] = int(row[2])
-        else:
-            sizes[row[1]] = int(row[3])
-
-    return sizes
-
-def compare_sizes(old, new):
-    """Return delta/added/removed dictionaries based on two input size
-    dictionaries"""
-    delta = {}
-    oldkeys = set(old.keys())
-    newkeys = set(new.keys())
-
-    # packages/files in both
-    for entry in newkeys.intersection(oldkeys):
-        delta[entry] = ('', new[entry] - old[entry])
-    # packages/files only in new
-    for entry in newkeys.difference(oldkeys):
-        delta[entry] = ('added', new[entry])
-    # packages/files only in old
-    for entry in oldkeys.difference(newkeys):
-        delta[entry] = ('removed', -old[entry])
-
-    return delta
-
-def print_results(result, threshold):
-    """Print the given result dictionary sorted by size, ignoring any entries
-    below or equal to threshold"""
-
-    from six import iteritems
-    list_result = list(iteritems(result))
-    # result is a dictionary: name -> (flag, size difference)
-    # list_result is a list of tuples: (name, (flag, size difference))
-
-    for entry in sorted(list_result, key=lambda entry: entry[1][1]):
-        if threshold is not None and abs(entry[1][1]) <= threshold:
-            continue
-        print('%12s %7s %s' % (entry[1][1], entry[1][0], entry[0]))
-
-
-# main #########################################################################
-
-description = """
-Compare rootfs size between Buildroot compilations, for example after changing
-configuration options or after switching to another Buildroot release.
-
-This script compares the file-size-stats.csv file generated by 'make graph-size'
-with the corresponding file from another Buildroot compilation.
-The size differences can be reported per package or per file.
-Size differences smaller or equal than a given threshold can be ignored.
-"""
-
-parser = argparse.ArgumentParser(description=description,
-                                 formatter_class=argparse.RawDescriptionHelpFormatter)
-
-parser.add_argument('-d', '--detail', action='store_true',
-                    help='''report differences for individual files rather than
-                            packages''')
-parser.add_argument('-t', '--threshold', type=int,
-                    help='''ignore size differences smaller or equal than this
-                            value (bytes)''')
-parser.add_argument('old_file_size_csv', type=argparse.FileType('r'),
-                    metavar='old-file-size-stats.csv',
-                    help="""old CSV file with file and package size statistics,
-                            generated by 'make graph-size'""")
-parser.add_argument('new_file_size_csv', type=argparse.FileType('r'),
-                    metavar='new-file-size-stats.csv',
-                    help='new CSV file with file and package size statistics')
-args = parser.parse_args()
-
-if args.detail:
-    keyword = 'file'
-else:
-    keyword = 'package'
-
-old_sizes = read_file_size_csv(args.old_file_size_csv, args.detail)
-new_sizes = read_file_size_csv(args.new_file_size_csv, args.detail)
-
-delta = compare_sizes(old_sizes, new_sizes)
-
-print('Size difference per %s (bytes), threshold = %s' % (keyword, args.threshold))
-print(80*'-')
-print_results(delta, args.threshold)
-print(80*'-')
-print_results({'TOTAL': ('', sum(new_sizes.values()) - sum(old_sizes.values()))},
-              threshold=None)
diff --git a/bsp/buildroot/support/scripts/test-pkg b/bsp/buildroot/support/scripts/test-pkg
deleted file mode 100755
index a040ce1a..00000000
--- a/bsp/buildroot/support/scripts/test-pkg
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/bin/bash
-set -e
-
-TOOLCHAINS_URL='http://autobuild.buildroot.org/toolchains/configs/toolchain-configs.csv'
-
-main() {
-    local o O opts
-    local cfg dir pkg random toolchain
-    local ret nb nb_skip nb_fail
-    local -a toolchains
-
-    o='hc:d:p:r:'
-    O='help,config-snippet:build-dir:package:,random:'
-    opts="$(getopt -n "${my_name}" -o "${o}" -l "${O}" -- "${@}")"
-    eval set -- "${opts}"
-
-    random=0
-    while [ ${#} -gt 0 ]; do
-        case "${1}" in
-        (-h|--help)
-            help; exit 0
-            ;;
-        (-c|--config-snippet)
-            cfg="${2}"; shift 2
-            ;;
-        (-d|--build-dir)
-            dir="${2}"; shift 2
-            ;;
-        (-p|--package)
-            pkg="${2}"; shift 2
-            ;;
-        (-r|--random)
-            random="${2}"; shift 2
-            ;;
-        (--)
-            shift; break
-            ;;
-        esac
-    done
-    if [ -z "${cfg}" ]; then
-        printf "error: no config snippet specified\n" >&2; exit 1
-    fi
-    if [ ! -e "${cfg}" ]; then
-        printf "error: %s: no such file\n" "${cfg}" >&2; exit 1
-    fi
-    if [ -z "${dir}" ]; then
-        dir="${HOME}/br-test-pkg"
-    fi
-
-    # Extract the URLs of the toolchains; drop internal toolchains
-    # E.g.: http://server/path/to/name.config,arch,libc
-    #  -->  http://server/path/to/name.config
-    toolchains=($(curl -s "${TOOLCHAINS_URL}" \
-                  |sed -r -e 's/,.*//; /internal/d;' \
-                  |if [ ${random} -gt 0 ]; then \
-                      sort -R |head -n ${random}
-                   else
-                      cat
-                   fi |sort
-                 )
-               )
-
-    if [ ${#toolchains[@]} -eq 0 ]; then
-        printf "error: no toolchain found (networking issue?)\n" >&2; exit 1
-    fi
-
-    nb=0
-    nb_skip=0
-    nb_fail=0
-    for toolchain in "${toolchains[@]}"; do
-        build_one "${dir}" "${toolchain}" "${cfg}" "${pkg}" && ret=0 || ret=${?}
-        case ${ret} in
-        (0) ;;
-        (1) : $((nb_skip++));;
-        (2) : $((nb_fail++));;
-        esac
-        : $((nb++))
-    done
-
-    printf "%d builds, %d skipped, %d failed\n" ${nb} ${nb_skip} ${nb_fail}
-}
-
-build_one() {
-    local dir="${1}"
-    local url="${2}"
-    local cfg="${3}"
-    local pkg="${4}"
-    local toolchain
-
-    # Using basename(1) on a URL works nicely
-    toolchain="$(basename "${url}" .config)"
-
-    printf "%40s: " "${toolchain}"
-
-    dir="${dir}/${toolchain}"
-    mkdir -p "${dir}"
-
-    if ! curl -s "${url}" >"${dir}/.config"; then
-        printf "FAILED\n"
-        return 2
-    fi
-
-    cat >>"${dir}/.config" <<-_EOF_
-	BR2_INIT_NONE=y
-	BR2_SYSTEM_BIN_SH_NONE=y
-	# BR2_PACKAGE_BUSYBOX is not set
-	# BR2_TARGET_ROOTFS_TAR is not set
-	_EOF_
-    cat "${cfg}" >>"${dir}/.config"
-
-    if ! make O="${dir}" olddefconfig >/dev/null 2>&1; then
-        printf "FAILED\n"
-        return 2
-    fi
-    # We want all the options from the snippet to be present as-is (set
-    # or not set) in the actual .config; if one of them is not, it means
-    # some dependency from the toolchain or arch is not available, in
-    # which case this config is untestable and we skip it.
-    # We don't care about the locale to sort in, as long as both sort are
-    # done in the same locale.
-    comm -23 <(sort "${cfg}") <(sort "${dir}/.config") >"${dir}/missing.config"
-    if [ -s "${dir}/missing.config" ]; then
-        printf "SKIPPED\n"
-        return 1
-    fi
-    # Remove file, it's empty anyway.
-    rm -f "${dir}/missing.config"
-
-    if [ -n "${pkg}" ]; then
-        if ! make O="${dir}" "${pkg}-dirclean" >> "${dir}/logfile" 2>&1; then
-            printf "FAILED\n"
-            return 2
-        fi
-    fi
-
-    # shellcheck disable=SC2086
-    if ! make O="${dir}" ${pkg} >> "${dir}/logfile" 2>&1; then
-        printf "FAILED\n"
-        return 2
-    fi
-
-    printf "OK\n"
-}
-
-help() {
-    cat <<_EOF_
-test-pkg: test-build a package against various toolchains and architectures
-
-The supplied config snippet is appended to each toolchain config, the
-resulting configuration is checked to ensure it still contains all options
-specified in the snippet; if any is missing, the build is skipped, on the
-assumption that the package under test requires a toolchain or architecture
-feature that is missing.
-
-In case failures are noticed, you can fix the package and just re-run the
-same command again; it will re-run the test where it failed. If you did
-specify a package (with -p), the package build dir will be removed first.
-
-The list of toolchains is retrieved from the Buildroot autobuilders, available
-at ${TOOLCHAINS_URL}.
-
-Options:
-
-    -h, --help
-        Print this help.
-
-    -c CFG, --config-snippet CFG
-        Use the CFG file as the source for the config snippet. This file
-        should contain all the config options required to build a package.
-
-    -d DIR, --build-dir DIR
-        Do the builds in directory DIR, one sub-dir per toolchain.
-
-    -p PKG, --package PKG
-        Test-build the package PKG, by running 'make PKG'; if not specified,
-        just runs 'make'.
-
-    -r N, --random N
-        Limit the tests to the N randomly selected toolchains, instead of
-        building with all toolchains.
-
-Example:
-
-    Testing libcec would require a config snippet that contains:
-        BR2_PACKAGE_LIBCEC=y
-
-    Testing libcurl with openSSL support would require a snippet such as:
-        BR2_PACKAGE_OPENSSL=y
-        BR2_PACKAGE_LIBCURL=y
-
-_EOF_
-}
-
-my_name="${0##*/}"
-main "${@}"
diff --git a/bsp/buildroot/support/scripts/xorg-release b/bsp/buildroot/support/scripts/xorg-release
index 66fc100b..c512038c 100755
--- a/bsp/buildroot/support/scripts/xorg-release
+++ b/bsp/buildroot/support/scripts/xorg-release
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # This script generates a report on the packaging status of X.org
 # releases in Buildroot. It does so by downloading the list of
diff --git a/bsp/buildroot/support/testing/conf/grub2.cfg b/bsp/buildroot/support/testing/conf/grub2.cfg
new file mode 100644
index 00000000..a982d0b7
--- /dev/null
+++ b/bsp/buildroot/support/testing/conf/grub2.cfg
@@ -0,0 +1,7 @@
+set default="0"
+set timeout="1"
+
+menuentry "Buildroot" {
+	linux __KERNEL_PATH__ root=/dev/sr0 console=ttyS0,115200
+	initrd __INITRD_PATH__
+}
diff --git a/bsp/buildroot/support/testing/conf/isolinux.cfg b/bsp/buildroot/support/testing/conf/isolinux.cfg
new file mode 100644
index 00000000..ba031a68
--- /dev/null
+++ b/bsp/buildroot/support/testing/conf/isolinux.cfg
@@ -0,0 +1,5 @@
+default 1
+label 1
+      kernel __KERNEL_PATH__
+      initrd __INITRD_PATH__
+      append root=/dev/sr0 console=ttyS0,115200
diff --git a/bsp/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config b/bsp/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config
new file mode 100644
index 00000000..cc8ee6a7
--- /dev/null
+++ b/bsp/buildroot/support/testing/conf/minimal-x86-qemu-kernel.config
@@ -0,0 +1,49 @@
+CONFIG_SYSVIPC=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_SMP=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_DEV_SR=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_ATA=y
+CONFIG_ATA_PIIX=y
+CONFIG_NETDEVICES=y
+CONFIG_VIRTIO_NET=y
+CONFIG_NE2K_PCI=y
+CONFIG_8139CP=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_DRM=y
+CONFIG_DRM_BOCHS=y
+CONFIG_DRM_QXL=y
+CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_HDA_INTEL=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+CONFIG_EXT4_FS=y
+CONFIG_ISO9660_FS=y
+CONFIG_ZISOFS=y
+CONFIG_JOLIET=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
diff --git a/bsp/buildroot/support/testing/conf/unittest.cfg b/bsp/buildroot/support/testing/conf/unittest.cfg
new file mode 100644
index 00000000..4f516fb8
--- /dev/null
+++ b/bsp/buildroot/support/testing/conf/unittest.cfg
@@ -0,0 +1,5 @@
+[unittest]
+plugins = nose2.plugins.mp
+
+[multiprocess]
+always-on = True
diff --git a/bsp/buildroot/support/testing/infra/__init__.py b/bsp/buildroot/support/testing/infra/__init__.py
new file mode 100644
index 00000000..b03e8917
--- /dev/null
+++ b/bsp/buildroot/support/testing/infra/__init__.py
@@ -0,0 +1,97 @@
+import os
+import re
+import sys
+import tempfile
+import subprocess
+from urllib2 import urlopen, HTTPError, URLError
+
+ARTIFACTS_URL = "http://autobuild.buildroot.net/artefacts/"
+
+
+def open_log_file(builddir, stage, logtofile=True):
+    """
+    Open a file for logging and return its handler.
+    If logtofile is True, returns sys.stdout. Otherwise opens a file
+    with a suitable name in the build directory.
+    """
+    if logtofile:
+        fhandle = open("{}-{}.log".format(builddir, stage), 'a+')
+    else:
+        fhandle = sys.stdout
+    return fhandle
+
+
+def filepath(relpath):
+    return os.path.join(os.getcwd(), "support/testing", relpath)
+
+
+def download(dldir, filename):
+    finalpath = os.path.join(dldir, filename)
+    if os.path.exists(finalpath):
+        return finalpath
+
+    if not os.path.exists(dldir):
+        os.makedirs(dldir)
+
+    tmpfile = tempfile.mktemp(dir=dldir)
+    print "Downloading to {}".format(tmpfile)
+
+    try:
+        url_fh = urlopen(os.path.join(ARTIFACTS_URL, filename))
+        with open(tmpfile, "w+") as tmpfile_fh:
+            tmpfile_fh.write(url_fh.read())
+    except (HTTPError, URLError), err:
+        os.unlink(tmpfile)
+        raise err
+
+    print "Renaming from %s to %s" % (tmpfile, finalpath)
+    os.rename(tmpfile, finalpath)
+    return finalpath
+
+
+def get_elf_arch_tag(builddir, prefix, fpath, tag):
+    """
+    Runs the cross readelf on 'fpath', then extracts the value of tag 'tag'.
+    Example:
+    >>> get_elf_arch_tag('output', 'arm-none-linux-gnueabi-',
+                         'bin/busybox', 'Tag_CPU_arch')
+    v5TEJ
+    >>>
+    """
+    cmd = ["host/bin/{}-readelf".format(prefix),
+           "-A", os.path.join("target", fpath)]
+    out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"})
+    regexp = re.compile("^  {}: (.*)$".format(tag))
+    for line in out.splitlines():
+        m = regexp.match(line)
+        if not m:
+            continue
+        return m.group(1)
+    return None
+
+
+def get_file_arch(builddir, prefix, fpath):
+    return get_elf_arch_tag(builddir, prefix, fpath, "Tag_CPU_arch")
+
+
+def get_elf_prog_interpreter(builddir, prefix, fpath):
+    """
+    Runs the cross readelf on 'fpath' to extract the program interpreter
+    name and returns it.
+    Example:
+    >>> get_elf_prog_interpreter('br-tests/TestExternalToolchainLinaroArm',
+                                 'arm-linux-gnueabihf',
+                                 'bin/busybox')
+    /lib/ld-linux-armhf.so.3
+    >>>
+    """
+    cmd = ["host/bin/{}-readelf".format(prefix),
+           "-l", os.path.join("target", fpath)]
+    out = subprocess.check_output(cmd, cwd=builddir, env={"LANG": "C"})
+    regexp = re.compile("^ *\[Requesting program interpreter: (.*)\]$")
+    for line in out.splitlines():
+        m = regexp.match(line)
+        if not m:
+            continue
+        return m.group(1)
+    return None
diff --git a/bsp/buildroot/support/testing/infra/basetest.py b/bsp/buildroot/support/testing/infra/basetest.py
new file mode 100644
index 00000000..75492269
--- /dev/null
+++ b/bsp/buildroot/support/testing/infra/basetest.py
@@ -0,0 +1,71 @@
+import unittest
+import os
+import datetime
+
+from infra.builder import Builder
+from infra.emulator import Emulator
+
+BASIC_TOOLCHAIN_CONFIG = \
+    """
+    BR2_arm=y
+    BR2_TOOLCHAIN_EXTERNAL=y
+    BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+    BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+    BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.05-1078-g95b1dae.tar.bz2"
+    BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
+    BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
+    BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+    # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+    BR2_TOOLCHAIN_EXTERNAL_CXX=y
+    """
+
+MINIMAL_CONFIG = \
+    """
+    BR2_INIT_NONE=y
+    BR2_SYSTEM_BIN_SH_NONE=y
+    # BR2_PACKAGE_BUSYBOX is not set
+    # BR2_TARGET_ROOTFS_TAR is not set
+    """
+
+
+class BRTest(unittest.TestCase):
+    config = None
+    downloaddir = None
+    outputdir = None
+    logtofile = True
+    keepbuilds = False
+    jlevel = 0
+    timeout_multiplier = 1
+
+    def __init__(self, names):
+        super(BRTest, self).__init__(names)
+        self.testname = self.__class__.__name__
+        self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
+        self.emulator = None
+        self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
+
+    def show_msg(self, msg):
+        print "{} {:40s} {}".format(datetime.datetime.now().strftime("%H:%M:%S"),
+                                    self.testname, msg)
+
+    def setUp(self):
+        self.show_msg("Starting")
+        self.b = Builder(self.config, self.builddir, self.logtofile)
+
+        if not self.keepbuilds:
+            self.b.delete()
+
+        if not self.b.is_finished():
+            self.show_msg("Building")
+            self.b.build()
+            self.show_msg("Building done")
+
+        self.emulator = Emulator(self.builddir, self.downloaddir,
+                                 self.logtofile, self.timeout_multiplier)
+
+    def tearDown(self):
+        self.show_msg("Cleaning up")
+        if self.emulator:
+            self.emulator.stop()
+        if self.b and not self.keepbuilds:
+            self.b.delete()
diff --git a/bsp/buildroot/support/testing/infra/builder.py b/bsp/buildroot/support/testing/infra/builder.py
new file mode 100644
index 00000000..7512339a
--- /dev/null
+++ b/bsp/buildroot/support/testing/infra/builder.py
@@ -0,0 +1,49 @@
+import os
+import shutil
+import subprocess
+
+import infra
+
+
+class Builder(object):
+    def __init__(self, config, builddir, logtofile):
+        self.config = '\n'.join([line.lstrip() for line in
+                                 config.splitlines()]) + '\n'
+        self.builddir = builddir
+        self.logfile = infra.open_log_file(builddir, "build", logtofile)
+
+    def build(self):
+        if not os.path.isdir(self.builddir):
+            os.makedirs(self.builddir)
+
+        config_file = os.path.join(self.builddir, ".config")
+        with open(config_file, "w+") as cf:
+            cf.write(self.config)
+        # dump the defconfig to the logfile for easy debugging
+        self.logfile.write("> start defconfig\n" + self.config +
+                           "> end defconfig\n")
+        self.logfile.flush()
+
+        cmd = ["make",
+               "O={}".format(self.builddir),
+               "olddefconfig"]
+        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
+        if ret != 0:
+            raise SystemError("Cannot olddefconfig")
+
+        cmd = ["make", "-C", self.builddir]
+        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
+        if ret != 0:
+            raise SystemError("Build failed")
+
+        open(self.stamp_path(), 'a').close()
+
+    def stamp_path(self):
+        return os.path.join(self.builddir, "build-done")
+
+    def is_finished(self):
+        return os.path.exists(self.stamp_path())
+
+    def delete(self):
+        if os.path.exists(self.builddir):
+            shutil.rmtree(self.builddir)
diff --git a/bsp/buildroot/support/testing/infra/emulator.py b/bsp/buildroot/support/testing/infra/emulator.py
new file mode 100644
index 00000000..802e89d4
--- /dev/null
+++ b/bsp/buildroot/support/testing/infra/emulator.py
@@ -0,0 +1,119 @@
+import pexpect
+
+import infra
+
+
+class Emulator(object):
+
+    def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier):
+        self.qemu = None
+        self.downloaddir = downloaddir
+        self.logfile = infra.open_log_file(builddir, "run", logtofile)
+        # We use elastic runners on the cloud to runs our tests. Those runners
+        # can take a long time to run the emulator. Use a timeout multiplier
+        # when running the tests to avoid sporadic failures.
+        self.timeout_multiplier = timeout_multiplier
+
+    # Start Qemu to boot the system
+    #
+    # arch: Qemu architecture to use
+    #
+    # kernel: path to the kernel image, or the special string
+    # 'builtin'. 'builtin' means a pre-built kernel image will be
+    # downloaded from ARTEFACTS_URL and suitable options are
+    # automatically passed to qemu and added to the kernel cmdline. So
+    # far only armv5, armv7 and i386 builtin kernels are available.
+    # If None, then no kernel is used, and we assume a bootable device
+    # will be specified.
+    #
+    # kernel_cmdline: array of kernel arguments to pass to Qemu -append option
+    #
+    # options: array of command line options to pass to Qemu
+    #
+    def boot(self, arch, kernel=None, kernel_cmdline=None, options=None):
+        if arch in ["armv7", "armv5"]:
+            qemu_arch = "arm"
+        else:
+            qemu_arch = arch
+
+        qemu_cmd = ["qemu-system-{}".format(qemu_arch),
+                    "-serial", "stdio",
+                    "-display", "none"]
+
+        if options:
+            qemu_cmd += options
+
+        if kernel_cmdline is None:
+            kernel_cmdline = []
+
+        if kernel:
+            if kernel == "builtin":
+                if arch in ["armv7", "armv5"]:
+                    kernel_cmdline.append("console=ttyAMA0")
+
+                if arch == "armv7":
+                    kernel = infra.download(self.downloaddir,
+                                            "kernel-vexpress")
+                    dtb = infra.download(self.downloaddir,
+                                         "vexpress-v2p-ca9.dtb")
+                    qemu_cmd += ["-dtb", dtb]
+                    qemu_cmd += ["-M", "vexpress-a9"]
+                elif arch == "armv5":
+                    kernel = infra.download(self.downloaddir,
+                                            "kernel-versatile")
+                    qemu_cmd += ["-M", "versatilepb"]
+
+            qemu_cmd += ["-kernel", kernel]
+
+        if kernel_cmdline:
+            qemu_cmd += ["-append", " ".join(kernel_cmdline)]
+
+        self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd))
+        self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:],
+                                  timeout=5 * self.timeout_multiplier,
+                                  env={"QEMU_AUDIO_DRV": "none"})
+        # We want only stdout into the log to avoid double echo
+        self.qemu.logfile_read = self.logfile
+
+    # Wait for the login prompt to appear, and then login as root with
+    # the provided password, or no password if not specified.
+    def login(self, password=None):
+        # The login prompt can take some time to appear when running multiple
+        # instances in parallel, so set the timeout to a large value
+        index = self.qemu.expect(["buildroot login:", pexpect.TIMEOUT],
+                                 timeout=60 * self.timeout_multiplier)
+        if index != 0:
+            self.logfile.write("==> System does not boot")
+            raise SystemError("System does not boot")
+
+        self.qemu.sendline("root")
+        if password:
+            self.qemu.expect("Password:")
+            self.qemu.sendline(password)
+        index = self.qemu.expect(["# ", pexpect.TIMEOUT])
+        if index != 0:
+            raise SystemError("Cannot login")
+        self.run("dmesg -n 1")
+
+    # Run the given 'cmd' with a 'timeout' on the target
+    # return a tuple (output, exit_code)
+    def run(self, cmd, timeout=-1):
+        self.qemu.sendline(cmd)
+        if timeout != -1:
+            timeout *= self.timeout_multiplier
+        self.qemu.expect("# ", timeout=timeout)
+        # Remove double carriage return from qemu stdout so str.splitlines()
+        # works as expected.
+        output = self.qemu.before.replace("\r\r", "\r").splitlines()[1:]
+
+        self.qemu.sendline("echo $?")
+        self.qemu.expect("# ")
+        exit_code = self.qemu.before.splitlines()[2]
+        exit_code = int(exit_code)
+
+        return output, exit_code
+
+    def stop(self):
+        if self.qemu is None:
+            return
+        self.qemu.terminate(force=True)
diff --git a/bsp/buildroot/support/testing/run-tests b/bsp/buildroot/support/testing/run-tests
new file mode 100755
index 00000000..f8cee09e
--- /dev/null
+++ b/bsp/buildroot/support/testing/run-tests
@@ -0,0 +1,123 @@
+#!/usr/bin/env python2
+import argparse
+import sys
+import os
+import nose2
+import multiprocessing
+
+from infra.basetest import BRTest
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Run Buildroot tests')
+    parser.add_argument('testname', nargs='*',
+                        help='list of test cases to execute')
+    parser.add_argument('-l', '--list', action='store_true',
+                        help='list of available test cases')
+    parser.add_argument('-a', '--all', action='store_true',
+                        help='execute all test cases')
+    parser.add_argument('-s', '--stdout', action='store_true',
+                        help='log everything to stdout')
+    parser.add_argument('-o', '--output',
+                        help='output directory')
+    parser.add_argument('-d', '--download',
+                        help='download directory')
+    parser.add_argument('-k', '--keep',
+                        help='keep build directories',
+                        action='store_true')
+    parser.add_argument('-t', '--testcases', type=int, default=1,
+                        help='number of testcases to run simultaneously')
+    parser.add_argument('-j', '--jlevel', type=int,
+                        help='BR2_JLEVEL to use for each testcase')
+    parser.add_argument('--timeout-multiplier', type=int, default=1,
+                        help='increase timeouts (useful for slow machines)')
+
+    args = parser.parse_args()
+
+    script_path = os.path.realpath(__file__)
+    test_dir = os.path.dirname(script_path)
+
+    if args.stdout:
+        BRTest.logtofile = False
+
+    if args.list:
+        print "List of tests"
+        nose2.discover(argv=[script_path,
+                             "-s", test_dir,
+                             "-v",
+                             "--collect-only"],
+                       plugins=["nose2.plugins.collect"])
+        return 0
+
+    if args.download is None:
+        args.download = os.getenv("BR2_DL_DIR")
+        if args.download is None:
+            print "Missing download directory, please use -d/--download"
+            print ""
+            parser.print_help()
+            return 1
+
+    BRTest.downloaddir = os.path.abspath(args.download)
+    os.putenv("BR2_DL_DIR", BRTest.downloaddir)
+
+    if args.output is None:
+        print "Missing output directory, please use -o/--output"
+        print ""
+        parser.print_help()
+        return 1
+
+    if not os.path.exists(args.output):
+        os.mkdir(args.output)
+
+    BRTest.outputdir = os.path.abspath(args.output)
+
+    if args.all is False and len(args.testname) == 0:
+        print "No test selected"
+        print ""
+        parser.print_help()
+        return 1
+
+    BRTest.keepbuilds = args.keep
+
+    if args.testcases != 1:
+        if args.testcases < 1:
+            print "Invalid number of testcases to run simultaneously"
+            print ""
+            parser.print_help()
+            return 1
+        # same default BR2_JLEVEL as package/Makefile.in
+        br2_jlevel = 1 + multiprocessing.cpu_count()
+        each_testcase = br2_jlevel / args.testcases
+        if each_testcase < 1:
+            each_testcase = 1
+        BRTest.jlevel = each_testcase
+
+    if args.jlevel:
+        if args.jlevel < 0:
+            print "Invalid BR2_JLEVEL to use for each testcase"
+            print ""
+            parser.print_help()
+            return 1
+        # the user can override the auto calculated value
+        BRTest.jlevel = args.jlevel
+
+    if args.timeout_multiplier < 1:
+        print "Invalid multiplier for timeout values"
+        print ""
+        parser.print_help()
+        return 1
+    BRTest.timeout_multiplier = args.timeout_multiplier
+
+    nose2_args = ["-v",
+                  "-N", str(args.testcases),
+                  "-s", test_dir,
+                  "-c", os.path.join(test_dir, "conf/unittest.cfg")]
+
+    if len(args.testname) != 0:
+        nose2_args += args.testname
+
+    nose2.discover(argv=nose2_args)
+
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/bsp/buildroot/support/testing/tests/__init__.py b/bsp/buildroot/support/testing/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/boot/__init__.py b/bsp/buildroot/support/testing/tests/boot/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/boot/test_atf.py b/bsp/buildroot/support/testing/tests/boot/test_atf.py
new file mode 100644
index 00000000..75cea01f
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/boot/test_atf.py
@@ -0,0 +1,82 @@
+import infra.basetest
+
+
+class TestATFVexpress(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_aarch64=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/ARM-software/arm-trusted-firmware.git"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="v1.5"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="juno"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+        BR2_TARGET_UBOOT=y
+        BR2_TARGET_UBOOT_BOARDNAME="vexpress_aemv8a_juno"
+        BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.03"
+        BR2_TARGET_VEXPRESS_FIRMWARE=y
+        """
+
+    def test_run(self):
+        pass
+
+
+class TestATFAllwinner(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_aarch64=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
+        BR2_TARGET_UBOOT=y
+        BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+        BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+        BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
+        BR2_TARGET_UBOOT_NEEDS_DTC=y
+        BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
+        BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+        BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
+        BR2_TARGET_UBOOT_SPL=y
+        BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+        """
+
+    def test_run(self):
+        pass
+
+
+class TestATFMarvell(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_aarch64=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/MarvellEmbeddedProcessors/atf-marvell.git"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="43965481990fd92e9666cf9371a8cf478055ec7c"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="a80x0_mcbin"
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y
+        BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0"
+        BR2_TARGET_BINARIES_MARVELL=y
+        BR2_TARGET_BINARIES_MARVELL_8040=y
+        BR2_TARGET_MV_DDR_MARVELL=y
+        BR2_TARGET_UBOOT=y
+        BR2_TARGET_UBOOT_BOARDNAME="mvebu_mcbin-88f8040"
+        BR2_TARGET_UBOOT_CUSTOM_VERSION=y
+        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.09"
+        BR2_TARGET_UBOOT_NEEDS_DTC=y
+        """
+
+    def test_run(self):
+        pass
diff --git a/bsp/buildroot/support/testing/tests/core/__init__.py b/bsp/buildroot/support/testing/tests/core/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/core/device_table2.txt b/bsp/buildroot/support/testing/tests/core/device_table2.txt
new file mode 100644
index 00000000..f8323217
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/device_table2.txt
@@ -0,0 +1,7 @@
+# <name>				<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
+/usr/sbin/getcap                        f       755     0       0	-	-	-	-	-
+|xattr cap_sys_nice+eip
+# leading spaces are ignored for xattr
+  |xattr cap_kill+eip
+# leading tabs are ignored for xattr
+	|xattr cap_sys_time+eip
diff --git a/bsp/buildroot/support/testing/tests/core/post-build.sh b/bsp/buildroot/support/testing/tests/core/post-build.sh
new file mode 100755
index 00000000..f3d0dbe5
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/post-build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+(
+printf "arg1,%s\n" "${1}"
+printf "arg2,%s\n" "${2}"
+printf "arg3,%s\n" "${3}"
+printf "TARGET_DIR,%s\n" "${TARGET_DIR}"
+printf "BUILD_DIR,%s\n" "${BUILD_DIR}"
+printf "HOST_DIR,%s\n" "${HOST_DIR}"
+printf "STAGING_DIR,%s\n" "${STAGING_DIR}"
+printf "BINARIES_DIR,%s\n" "${BINARIES_DIR}"
+printf "BR2_CONFIG,%s\n" "${BR2_CONFIG}"
+) > ${BUILD_DIR}/$(basename "${0}" .sh).log
diff --git a/bsp/buildroot/support/testing/tests/core/post-fakeroot.sh b/bsp/buildroot/support/testing/tests/core/post-fakeroot.sh
new file mode 120000
index 00000000..d680fcca
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/post-fakeroot.sh
@@ -0,0 +1 @@
+post-build.sh
\ No newline at end of file
diff --git a/bsp/buildroot/support/testing/tests/core/post-image.sh b/bsp/buildroot/support/testing/tests/core/post-image.sh
new file mode 120000
index 00000000..d680fcca
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/post-image.sh
@@ -0,0 +1 @@
+post-build.sh
\ No newline at end of file
diff --git a/bsp/buildroot/support/testing/tests/core/rootfs-overlay1/test-file1 b/bsp/buildroot/support/testing/tests/core/rootfs-overlay1/test-file1
new file mode 100644
index 00000000..323fae03
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/rootfs-overlay1/test-file1
@@ -0,0 +1 @@
+foobar
diff --git a/bsp/buildroot/support/testing/tests/core/rootfs-overlay2/etc/test-file2 b/bsp/buildroot/support/testing/tests/core/rootfs-overlay2/etc/test-file2
new file mode 100644
index 00000000..34a3ec23
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/rootfs-overlay2/etc/test-file2
@@ -0,0 +1 @@
+barfoo
diff --git a/bsp/buildroot/support/testing/tests/core/squashfs-xattr-kernel.config b/bsp/buildroot/support/testing/tests/core/squashfs-xattr-kernel.config
new file mode 100644
index 00000000..81b21b94
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/squashfs-xattr-kernel.config
@@ -0,0 +1 @@
+CONFIG_SQUASHFS_XATTR=y
diff --git a/bsp/buildroot/support/testing/tests/core/test_file_capabilities.py b/bsp/buildroot/support/testing/tests/core/test_file_capabilities.py
new file mode 100644
index 00000000..945b48a4
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/test_file_capabilities.py
@@ -0,0 +1,47 @@
+import os
+import subprocess
+
+import infra.basetest
+
+
+class TestFileCapabilities(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_ROOTFS_DEVICE_TABLE="system/device_table.txt {}"
+        BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES=y
+        BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+        BR2_LINUX_KERNEL=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
+        BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+        BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{}"
+        BR2_LINUX_KERNEL_DTS_SUPPORT=y
+        BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
+        BR2_PACKAGE_LIBCAP=y
+        BR2_PACKAGE_LIBCAP_TOOLS=y
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """.format(infra.filepath("tests/core/device_table2.txt"),
+                   infra.filepath("tests/core/squashfs-xattr-kernel.config"))
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.squashfs")
+        subprocess.call(["truncate", "-s", "%1M", img])
+
+        self.emulator.boot(arch="armv7",
+                           kernel=os.path.join(self.builddir, "images", "zImage"),
+                           kernel_cmdline=["root=/dev/mmcblk0",
+                                           "rootfstype=squashfs"],
+                           options=["-drive", "file={},if=sd,format=raw".format(img),
+                                    "-M", "vexpress-a9",
+                                    "-dtb", os.path.join(self.builddir, "images", "vexpress-v2p-ca9.dtb")])
+        self.emulator.login()
+
+        cmd = "getcap -v /usr/sbin/getcap"
+        output, _ = self.emulator.run(cmd)
+        self.assertIn("cap_kill", output[0])
+        self.assertIn("cap_sys_nice", output[0])
+        self.assertIn("cap_sys_time", output[0])
+        self.assertIn("+eip", output[0])
diff --git a/bsp/buildroot/support/testing/tests/core/test_post_scripts.py b/bsp/buildroot/support/testing/tests/core/test_post_scripts.py
new file mode 100644
index 00000000..edb339d8
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/test_post_scripts.py
@@ -0,0 +1,45 @@
+import os
+import csv
+
+import infra.basetest
+
+
+class TestPostScripts(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_INIT_NONE=y
+        BR2_SYSTEM_BIN_SH_NONE=y
+        # BR2_PACKAGE_BUSYBOX is not set
+        BR2_ROOTFS_POST_BUILD_SCRIPT="{}"
+        BR2_ROOTFS_POST_FAKEROOT_SCRIPT="{}"
+        BR2_ROOTFS_POST_IMAGE_SCRIPT="{}"
+        BR2_ROOTFS_POST_SCRIPT_ARGS="foobar baz"
+        """.format(infra.filepath("tests/core/post-build.sh"),
+                   infra.filepath("tests/core/post-fakeroot.sh"),
+                   infra.filepath("tests/core/post-image.sh"))
+
+    def check_post_log_file(self, path, what):
+        lines = {}
+        with open(path, 'rb') as csvfile:
+            r = csv.reader(csvfile, delimiter=',')
+            for row in r:
+                lines[row[0]] = row[1]
+
+        self.assertEqual(lines["arg1"], os.path.join(self.builddir, what))
+        self.assertEqual(lines["arg2"], "foobar")
+        self.assertEqual(lines["arg3"], "baz")
+        self.assertEqual(lines["TARGET_DIR"], os.path.join(self.builddir, "target"))
+        self.assertEqual(lines["BUILD_DIR"], os.path.join(self.builddir, "build"))
+        self.assertEqual(lines["HOST_DIR"], os.path.join(self.builddir, "host"))
+        staging = os.readlink(os.path.join(self.builddir, "staging"))
+        self.assertEqual(lines["STAGING_DIR"], staging)
+        self.assertEqual(lines["BINARIES_DIR"], os.path.join(self.builddir, "images"))
+        self.assertEqual(lines["BR2_CONFIG"], os.path.join(self.builddir, ".config"))
+
+    def test_run(self):
+        f = os.path.join(self.builddir, "build", "post-build.log")
+        self.check_post_log_file(f, "target")
+        f = os.path.join(self.builddir, "build", "post-fakeroot.log")
+        self.check_post_log_file(f, "target")
+        f = os.path.join(self.builddir, "build", "post-image.log")
+        self.check_post_log_file(f, "images")
diff --git a/bsp/buildroot/support/testing/tests/core/test_rootfs_overlay.py b/bsp/buildroot/support/testing/tests/core/test_rootfs_overlay.py
new file mode 100644
index 00000000..fedd40d8
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/test_rootfs_overlay.py
@@ -0,0 +1,30 @@
+import os
+import subprocess
+
+import infra.basetest
+
+
+def compare_file(file1, file2):
+    return subprocess.call(["cmp", file1, file2])
+
+
+class TestRootfsOverlay(infra.basetest.BRTest):
+
+    rootfs_overlay_path = infra.filepath("tests/core/rootfs-overlay")
+
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        infra.basetest.MINIMAL_CONFIG + \
+        """
+        BR2_ROOTFS_OVERLAY="{0}1 {0}2"
+        """.format(rootfs_overlay_path)
+
+    def test_run(self):
+        target_file = os.path.join(self.builddir, "target", "test-file1")
+        overlay_file = "{}1/test-file1".format(self.rootfs_overlay_path)
+        ret = compare_file(overlay_file, target_file)
+        self.assertEqual(ret, 0)
+
+        target_file = os.path.join(self.builddir, "target", "etc", "test-file2")
+        overlay_file = "{}2/etc/test-file2".format(self.rootfs_overlay_path)
+        ret = compare_file(overlay_file, target_file)
+        self.assertEqual(ret, 0)
diff --git a/bsp/buildroot/support/testing/tests/core/test_timezone.py b/bsp/buildroot/support/testing/tests/core/test_timezone.py
new file mode 100644
index 00000000..050624e0
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/core/test_timezone.py
@@ -0,0 +1,72 @@
+import os
+
+import infra.basetest
+
+
+def boot_armv5_cpio(emulator, builddir):
+        img = os.path.join(builddir, "images", "rootfs.cpio")
+        emulator.boot(arch="armv5", kernel="builtin",
+                      options=["-initrd", img])
+        emulator.login()
+
+
+class TestNoTimezone(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        # BR2_TARGET_TZ_INFO is not set
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        boot_armv5_cpio(self.emulator, self.builddir)
+        tz, _ = self.emulator.run("TZ=UTC date +%Z")
+        self.assertEqual(tz[0].strip(), "UTC")
+        tz, _ = self.emulator.run("TZ=America/Los_Angeles date +%Z")
+        self.assertEqual(tz[0].strip(), "UTC")
+
+
+class TestGlibcAllTimezone(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TARGET_TZ_INFO=y
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        boot_armv5_cpio(self.emulator, self.builddir)
+        tz, _ = self.emulator.run("date +%Z")
+        self.assertEqual(tz[0].strip(), "UTC")
+        tz, _ = self.emulator.run("TZ=UTC date +%Z")
+        self.assertEqual(tz[0].strip(), "UTC")
+        tz, _ = self.emulator.run("TZ=America/Los_Angeles date +%Z")
+        self.assertEqual(tz[0].strip(), "PST")
+        tz, _ = self.emulator.run("TZ=Europe/Paris date +%Z")
+        self.assertEqual(tz[0].strip(), "CET")
+
+
+class TestGlibcNonDefaultLimitedTimezone(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TARGET_TZ_INFO=y
+        BR2_TARGET_TZ_ZONELIST="northamerica"
+        BR2_TARGET_LOCALTIME="America/New_York"
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        boot_armv5_cpio(self.emulator, self.builddir)
+        tz, _ = self.emulator.run("date +%Z")
+        self.assertEqual(tz[0].strip(), "EST")
+        tz, _ = self.emulator.run("TZ=UTC date +%Z")
+        self.assertEqual(tz[0].strip(), "UTC")
+        tz, _ = self.emulator.run("TZ=America/Los_Angeles date +%Z")
+        self.assertEqual(tz[0].strip(), "PST")
+        tz, _ = self.emulator.run("TZ=Europe/Paris date +%Z")
+        self.assertEqual(tz[0].strip(), "Europe")
diff --git a/bsp/buildroot/support/testing/tests/fs/__init__.py b/bsp/buildroot/support/testing/tests/fs/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/fs/test_ext.py b/bsp/buildroot/support/testing/tests/fs/test_ext.py
new file mode 100644
index 00000000..f5f9e9fd
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/fs/test_ext.py
@@ -0,0 +1,125 @@
+import os
+import subprocess
+
+import infra.basetest
+
+VOLNAME_PROP = "Filesystem volume name"
+REVISION_PROP = "Filesystem revision #"
+FEATURES_PROP = "Filesystem features"
+BLOCKCNT_PROP = "Block count"
+INODECNT_PROP = "Inode count"
+RESBLKCNT_PROP = "Reserved block count"
+
+CHECK_FS_TYPE_CMD = "mount | grep '/dev/root on / type {}'"
+
+
+def dumpe2fs_run(builddir, image):
+    cmd = ["host/sbin/dumpe2fs", os.path.join("images", image)]
+    ret = subprocess.check_output(cmd,
+                                  stderr=open(os.devnull, "w"),
+                                  cwd=builddir,
+                                  env={"LANG": "C"})
+    return ret.strip().splitlines()
+
+
+def dumpe2fs_getprop(out, prop):
+    for line in out:
+        fields = line.split(": ")
+        if fields[0] == prop:
+            return fields[1].strip()
+
+
+def boot_img_and_check_fs_type(emulator, builddir, fs_type):
+    img = os.path.join(builddir, "images", "rootfs.{}".format(fs_type))
+    emulator.boot(arch="armv7",
+                  kernel="builtin",
+                  kernel_cmdline=["root=/dev/mmcblk0",
+                                  "rootfstype={}".format(fs_type)],
+                  options=["-drive", "file={},if=sd".format(img)])
+    emulator.login()
+    _, exit_code = emulator.run(CHECK_FS_TYPE_CMD.format(fs_type))
+    return exit_code
+
+
+class TestExt2(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_EXT2=y
+        BR2_TARGET_ROOTFS_EXT2_2r0=y
+        BR2_TARGET_ROOTFS_EXT2_LABEL="foobaz"
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        out = dumpe2fs_run(self.builddir, "rootfs.ext2")
+        self.assertEqual(dumpe2fs_getprop(out, VOLNAME_PROP), "foobaz")
+        self.assertEqual(dumpe2fs_getprop(out, REVISION_PROP), "0 (original)")
+
+        exit_code = boot_img_and_check_fs_type(self.emulator,
+                                               self.builddir, "ext2")
+        self.assertEqual(exit_code, 0)
+
+
+class TestExt2r1(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_EXT2=y
+        BR2_TARGET_ROOTFS_EXT2_2r1=y
+        BR2_TARGET_ROOTFS_EXT2_LABEL="foobar"
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        out = dumpe2fs_run(self.builddir, "rootfs.ext2")
+        self.assertEqual(dumpe2fs_getprop(out, VOLNAME_PROP), "foobar")
+        self.assertEqual(dumpe2fs_getprop(out, REVISION_PROP), "1 (dynamic)")
+        self.assertNotIn("has_journal", dumpe2fs_getprop(out, FEATURES_PROP))
+
+        exit_code = boot_img_and_check_fs_type(self.emulator,
+                                               self.builddir, "ext2")
+        self.assertEqual(exit_code, 0)
+
+
+class TestExt3(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_EXT2=y
+        BR2_TARGET_ROOTFS_EXT2_3=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        out = dumpe2fs_run(self.builddir, "rootfs.ext3")
+        self.assertEqual(dumpe2fs_getprop(out, REVISION_PROP), "1 (dynamic)")
+        self.assertIn("has_journal", dumpe2fs_getprop(out, FEATURES_PROP))
+        self.assertNotIn("extent", dumpe2fs_getprop(out, FEATURES_PROP))
+
+        exit_code = boot_img_and_check_fs_type(self.emulator,
+                                               self.builddir, "ext3")
+        self.assertEqual(exit_code, 0)
+
+
+class TestExt4(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_EXT2=y
+        BR2_TARGET_ROOTFS_EXT2_4=y
+        BR2_TARGET_ROOTFS_EXT2_SIZE="16384"
+        BR2_TARGET_ROOTFS_EXT2_INODES=3000
+        BR2_TARGET_ROOTFS_EXT2_RESBLKS=10
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        out = dumpe2fs_run(self.builddir, "rootfs.ext4")
+        self.assertEqual(dumpe2fs_getprop(out, REVISION_PROP), "1 (dynamic)")
+        self.assertEqual(dumpe2fs_getprop(out, BLOCKCNT_PROP), "16384")
+        # Yes there are 8 more inodes than requested
+        self.assertEqual(dumpe2fs_getprop(out, INODECNT_PROP), "3008")
+        self.assertEqual(dumpe2fs_getprop(out, RESBLKCNT_PROP), "1638")
+        self.assertIn("has_journal", dumpe2fs_getprop(out, FEATURES_PROP))
+        self.assertIn("extent", dumpe2fs_getprop(out, FEATURES_PROP))
+
+        exit_code = boot_img_and_check_fs_type(self.emulator,
+                                               self.builddir, "ext4")
+        self.assertEqual(exit_code, 0)
diff --git a/bsp/buildroot/support/testing/tests/fs/test_iso9660.py b/bsp/buildroot/support/testing/tests/fs/test_iso9660.py
new file mode 100644
index 00000000..68f48408
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/fs/test_iso9660.py
@@ -0,0 +1,169 @@
+import os
+
+import infra.basetest
+
+BASIC_CONFIG = \
+    """
+    BR2_x86_pentium4=y
+    BR2_TOOLCHAIN_EXTERNAL=y
+    BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+    BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+    BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-i386-pentium4-full-2017.05-1078-g95b1dae.tar.bz2"
+    BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+    BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_2=y
+    BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+    # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+    BR2_TOOLCHAIN_EXTERNAL_CXX=y
+    BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
+    BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y
+    BR2_LINUX_KERNEL=y
+    BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+    BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11"
+    BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+    BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}"
+    # BR2_TARGET_ROOTFS_TAR is not set
+    """.format(infra.filepath("conf/minimal-x86-qemu-kernel.config"))
+
+
+def test_mount_internal_external(emulator, builddir, internal=True):
+    img = os.path.join(builddir, "images", "rootfs.iso9660")
+    emulator.boot(arch="i386", options=["-cdrom", img])
+    emulator.login()
+
+    if internal:
+        cmd = "mount | grep 'rootfs on / type rootfs'"
+    else:
+        cmd = "mount | grep '/dev/root on / type iso9660'"
+
+    _, exit_code = emulator.run(cmd)
+    return exit_code
+
+
+def test_touch_file(emulator):
+    _, exit_code = emulator.run("touch test")
+    return exit_code
+
+#
+# Grub 2
+
+
+class TestIso9660Grub2External(infra.basetest.BRTest):
+    config = BASIC_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_ISO9660=y
+        # BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
+        BR2_TARGET_GRUB2=y
+        BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
+        BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
+        BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
+        """.format(infra.filepath("conf/grub2.cfg"))
+
+    def test_run(self):
+        exit_code = test_mount_internal_external(self.emulator,
+                                                 self.builddir, internal=False)
+        self.assertEqual(exit_code, 0)
+
+        exit_code = test_touch_file(self.emulator)
+        self.assertEqual(exit_code, 1)
+
+
+class TestIso9660Grub2ExternalCompress(infra.basetest.BRTest):
+    config = BASIC_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_ISO9660=y
+        # BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
+        BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION=y
+        BR2_TARGET_GRUB2=y
+        BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
+        BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
+        BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
+        """.format(infra.filepath("conf/grub2.cfg"))
+
+    def test_run(self):
+        exit_code = test_mount_internal_external(self.emulator,
+                                                 self.builddir, internal=False)
+        self.assertEqual(exit_code, 0)
+
+        exit_code = test_touch_file(self.emulator)
+        self.assertEqual(exit_code, 1)
+
+
+class TestIso9660Grub2Internal(infra.basetest.BRTest):
+    config = BASIC_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_ISO9660=y
+        BR2_TARGET_ROOTFS_ISO9660_INITRD=y
+        BR2_TARGET_GRUB2=y
+        BR2_TARGET_GRUB2_BOOT_PARTITION="cd"
+        BR2_TARGET_GRUB2_BUILTIN_MODULES="boot linux ext2 fat part_msdos part_gpt normal biosdisk iso9660"
+        BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
+        """.format(infra.filepath("conf/grub2.cfg"))
+
+    def test_run(self):
+        exit_code = test_mount_internal_external(self.emulator,
+                                                 self.builddir, internal=True)
+        self.assertEqual(exit_code, 0)
+
+        exit_code = test_touch_file(self.emulator)
+        self.assertEqual(exit_code, 0)
+
+#
+# Syslinux
+
+
+class TestIso9660SyslinuxExternal(infra.basetest.BRTest):
+    config = BASIC_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_ISO9660=y
+        # BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
+        BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
+        BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
+        BR2_TARGET_SYSLINUX=y
+        """.format(infra.filepath("conf/isolinux.cfg"))
+
+    def test_run(self):
+        exit_code = test_mount_internal_external(self.emulator,
+                                                 self.builddir, internal=False)
+        self.assertEqual(exit_code, 0)
+
+        exit_code = test_touch_file(self.emulator)
+        self.assertEqual(exit_code, 1)
+
+
+class TestIso9660SyslinuxExternalCompress(infra.basetest.BRTest):
+    config = BASIC_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_ISO9660=y
+        # BR2_TARGET_ROOTFS_ISO9660_INITRD is not set
+        BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION=y
+        BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
+        BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
+        BR2_TARGET_SYSLINUX=y
+        """.format(infra.filepath("conf/isolinux.cfg"))
+
+    def test_run(self):
+        exit_code = test_mount_internal_external(self.emulator,
+                                                 self.builddir, internal=False)
+        self.assertEqual(exit_code, 0)
+
+        exit_code = test_touch_file(self.emulator)
+        self.assertEqual(exit_code, 1)
+
+
+class TestIso9660SyslinuxInternal(infra.basetest.BRTest):
+    config = BASIC_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_ISO9660=y
+        BR2_TARGET_ROOTFS_ISO9660_INITRD=y
+        BR2_TARGET_ROOTFS_ISO9660_HYBRID=y
+        BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU="{}"
+        BR2_TARGET_SYSLINUX=y
+        """.format(infra.filepath("conf/isolinux.cfg"))
+
+    def test_run(self):
+        exit_code = test_mount_internal_external(self.emulator,
+                                                 self.builddir, internal=True)
+        self.assertEqual(exit_code, 0)
+
+        exit_code = test_touch_file(self.emulator)
+        self.assertEqual(exit_code, 0)
diff --git a/bsp/buildroot/support/testing/tests/fs/test_jffs2.py b/bsp/buildroot/support/testing/tests/fs/test_jffs2.py
new file mode 100644
index 00000000..2ff50991
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/fs/test_jffs2.py
@@ -0,0 +1,47 @@
+import os
+import subprocess
+
+import infra.basetest
+
+
+def jffs2dump_find_file(files_list, fname):
+    for file_name in files_list:
+        file_name = file_name.strip()
+        if file_name.startswith("Dirent") and file_name.endswith(fname):
+            return True
+    return False
+
+
+class TestJffs2(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_JFFS2=y
+        BR2_TARGET_ROOTFS_JFFS2_CUSTOM=y
+        BR2_TARGET_ROOTFS_JFFS2_CUSTOM_EBSIZE=0x80000
+        BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y
+        BR2_TARGET_ROOTFS_JFFS2_PAD=y
+        BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x4000000
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    # TODO: there are some scary JFFS2 messages when one starts to
+    # write files in the rootfs: "jffs2: Newly-erased block contained
+    # word 0x0 at offset 0x046c0000". To be investigated.
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.jffs2")
+        out = subprocess.check_output(["host/sbin/jffs2dump", "-c", img],
+                                      cwd=self.builddir,
+                                      env={"LANG": "C"})
+        out = out.splitlines()
+        self.assertTrue(jffs2dump_find_file(out, "busybox"))
+
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           kernel_cmdline=["root=/dev/mtdblock0",
+                                           "rootfstype=jffs2"],
+                           options=["-drive", "file={},if=pflash".format(img)])
+        self.emulator.login()
+        cmd = "mount | grep '/dev/root on / type jffs2'"
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
diff --git a/bsp/buildroot/support/testing/tests/fs/test_squashfs.py b/bsp/buildroot/support/testing/tests/fs/test_squashfs.py
new file mode 100644
index 00000000..066c0543
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/fs/test_squashfs.py
@@ -0,0 +1,38 @@
+import os
+import subprocess
+
+import infra.basetest
+
+
+class TestSquashfs(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        # BR2_TARGET_ROOTFS_SQUASHFS4_GZIP is not set
+        BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        unsquashfs_cmd = ["host/bin/unsquashfs", "-s", "images/rootfs.squashfs"]
+        out = subprocess.check_output(unsquashfs_cmd,
+                                      cwd=self.builddir,
+                                      env={"LANG": "C"})
+        out = out.splitlines()
+        self.assertEqual(out[0],
+                         "Found a valid SQUASHFS 4:0 superblock on images/rootfs.squashfs.")
+        self.assertEqual(out[3], "Compression lz4")
+
+        img = os.path.join(self.builddir, "images", "rootfs.squashfs")
+        subprocess.call(["truncate", "-s", "%1M", img])
+
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           kernel_cmdline=["root=/dev/mmcblk0",
+                                           "rootfstype=squashfs"],
+                           options=["-drive", "file={},if=sd,format=raw".format(img)])
+        self.emulator.login()
+
+        cmd = "mount | grep '/dev/root on / type squashfs'"
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
diff --git a/bsp/buildroot/support/testing/tests/fs/test_ubi.py b/bsp/buildroot/support/testing/tests/fs/test_ubi.py
new file mode 100644
index 00000000..015d82f7
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/fs/test_ubi.py
@@ -0,0 +1,40 @@
+import subprocess
+import os
+
+import infra.basetest
+
+
+class TestUbi(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_UBIFS=y
+        BR2_TARGET_ROOTFS_UBIFS_LEBSIZE=0x7ff80
+        BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE=0x1
+        BR2_TARGET_ROOTFS_UBI=y
+        BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x80000
+        BR2_TARGET_ROOTFS_UBI_SUBSIZE=1
+        """
+
+    # TODO: if you boot Qemu twice on the same UBI image, it fails to
+    # attach the image the second time, with "ubi0 error:
+    # ubi_read_volume_table: the layout volume was not found".
+    # To be investigated.
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.ubi")
+        out = subprocess.check_output(["file", img],
+                                      cwd=self.builddir,
+                                      env={"LANG": "C"})
+        out = out.splitlines()
+
+        subprocess.call(["truncate", "-s 128M", img])
+
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           kernel_cmdline=["root=ubi0:rootfs",
+                                           "ubi.mtd=0",
+                                           "rootfstype=ubifs"],
+                           options=["-drive", "file={},if=pflash".format(img)])
+        self.emulator.login()
+        cmd = "mount | grep 'ubi0:rootfs on / type ubifs'"
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
diff --git a/bsp/buildroot/support/testing/tests/fs/test_yaffs2.py b/bsp/buildroot/support/testing/tests/fs/test_yaffs2.py
new file mode 100644
index 00000000..b60e90e6
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/fs/test_yaffs2.py
@@ -0,0 +1,15 @@
+import os
+
+import infra.basetest
+
+
+class TestYaffs2(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        infra.basetest.MINIMAL_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_YAFFS2=y
+        """
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.yaffs2")
+        self.assertTrue(os.path.exists(img))
diff --git a/bsp/buildroot/support/testing/tests/init/__init__.py b/bsp/buildroot/support/testing/tests/init/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/init/base.py b/bsp/buildroot/support/testing/tests/init/base.py
new file mode 100644
index 00000000..75cfbe9c
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/init/base.py
@@ -0,0 +1,48 @@
+import os
+import subprocess
+import infra.basetest
+
+
+class InitSystemBase(infra.basetest.BRTest):
+
+    def start_emulator(self, fs_type, kernel=None, dtb=None, init=None):
+        img = os.path.join(self.builddir, "images", "rootfs.{}".format(fs_type))
+        subprocess.call(["truncate", "-s", "%1M", img])
+
+        options = ["-drive",
+                   "file={},if=sd,format=raw".format(img),
+                   "-M", "vexpress-a9"]
+
+        if kernel is None:
+            kernel = "builtin"
+        else:
+            kernel = os.path.join(self.builddir, "images", kernel)
+            options.extend(["-dtb", os.path.join(self.builddir, "images",
+                                                 "{}.dtb".format(dtb))])
+
+        kernel_cmdline = ["root=/dev/mmcblk0",
+                          "rootfstype={}".format(fs_type),
+                          "rootwait",
+                          "ro",
+                          "console=ttyAMA0"]
+
+        if init is not None:
+            kernel_cmdline.extend(["init={}".format(init)])
+
+        self.emulator.boot(arch="armv7",
+                           kernel=kernel,
+                           kernel_cmdline=kernel_cmdline,
+                           options=options)
+
+        if init is None:
+            self.emulator.login()
+
+    def check_init(self, path):
+        cmd = "cmp /proc/1/exe {}".format(path)
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
+
+    def check_network(self, interface, exitCode=0):
+        cmd = "ip addr show {} |grep inet".format(interface)
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, exitCode)
diff --git a/bsp/buildroot/support/testing/tests/init/systemd-factory/var/foo/bar b/bsp/buildroot/support/testing/tests/init/systemd-factory/var/foo/bar
new file mode 100644
index 00000000..323fae03
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/init/systemd-factory/var/foo/bar
@@ -0,0 +1 @@
+foobar
diff --git a/bsp/buildroot/support/testing/tests/init/test_busybox.py b/bsp/buildroot/support/testing/tests/init/test_busybox.py
new file mode 100644
index 00000000..3be4dea3
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/init/test_busybox.py
@@ -0,0 +1,64 @@
+import infra.basetest
+from tests.init.base import InitSystemBase as InitSystemBase
+
+
+class InitSystemBusyboxBase(InitSystemBase):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def check_init(self):
+        super(InitSystemBusyboxBase, self).check_init("/bin/busybox")
+
+
+class TestInitSystemBusyboxRo(InitSystemBusyboxBase):
+    config = InitSystemBusyboxBase.config + \
+        """
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """
+
+    def test_run(self):
+        self.start_emulator("squashfs")
+        self.check_init()
+        self.check_network("eth0", 1)
+
+
+class TestInitSystemBusyboxRw(InitSystemBusyboxBase):
+    config = InitSystemBusyboxBase.config + \
+        """
+        BR2_TARGET_ROOTFS_EXT2=y
+        """
+
+    def test_run(self):
+        self.start_emulator("ext2")
+        self.check_init()
+        self.check_network("eth0", 1)
+
+
+class TestInitSystemBusyboxRoNet(InitSystemBusyboxBase):
+    config = InitSystemBusyboxBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """
+
+    def test_run(self):
+        self.start_emulator("squashfs")
+        self.check_init()
+        self.check_network("eth0")
+
+
+class TestInitSystemBusyboxRwNet(InitSystemBusyboxBase):
+    config = InitSystemBusyboxBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        BR2_TARGET_ROOTFS_EXT2=y
+        """
+
+    def test_run(self):
+        self.start_emulator("ext2")
+        self.check_init()
+        self.check_network("eth0")
diff --git a/bsp/buildroot/support/testing/tests/init/test_none.py b/bsp/buildroot/support/testing/tests/init/test_none.py
new file mode 100644
index 00000000..5b9b4e43
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/init/test_none.py
@@ -0,0 +1,33 @@
+import pexpect
+
+import infra.basetest
+from tests.init.base import InitSystemBase as InitSystemBase
+
+
+class TestInitSystemNone(InitSystemBase):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_INIT_NONE=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """
+
+    def test_run(self):
+        self.start_emulator(fs_type="squashfs", init="/bin/sh")
+        index = self.emulator.qemu.expect(["/bin/sh: can't access tty; job control turned off", pexpect.TIMEOUT], timeout=60)
+        if index != 0:
+            self.emulator.logfile.write("==> System does not boot")
+            raise SystemError("System does not boot")
+        index = self.emulator.qemu.expect(["#", pexpect.TIMEOUT], timeout=60)
+        if index != 0:
+            self.emulator.logfile.write("==> System does not boot")
+            raise SystemError("System does not boot")
+
+        out, exit_code = self.emulator.run("sh -c 'echo $PPID'")
+        self.assertEqual(exit_code, 0)
+        self.assertEqual(out[0], "1")
+
+        _, exit_code = self.emulator.run("mount -t proc none /proc")
+        self.assertEqual(exit_code, 0)
+
+        self.check_init("/bin/sh")
diff --git a/bsp/buildroot/support/testing/tests/init/test_systemd.py b/bsp/buildroot/support/testing/tests/init/test_systemd.py
new file mode 100644
index 00000000..a324ba85
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/init/test_systemd.py
@@ -0,0 +1,159 @@
+import infra.basetest
+from tests.init.base import InitSystemBase as InitSystemBase
+
+
+class InitSystemSystemdBase(InitSystemBase):
+    config = \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_INIT_SYSTEMD=y
+        BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+        BR2_LINUX_KERNEL=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+        BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
+        BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+        BR2_LINUX_KERNEL_DTS_SUPPORT=y
+        BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def check_init(self):
+        super(InitSystemSystemdBase, self).check_init("/lib/systemd/systemd")
+
+        # Test all units are OK
+        output, _ = self.emulator.run("systemctl --no-pager --failed --no-legend")
+        self.assertEqual(len(output), 0)
+
+        # Test we can reach the DBus daemon
+        _, exit_code = self.emulator.run("busctl --no-pager")
+        self.assertEqual(exit_code, 0)
+
+        # Test we can read at least one line from the journal
+        output, _ = self.emulator.run("journalctl --no-pager --lines 1 --quiet")
+        self.assertEqual(len(output), 1)
+
+
+class TestInitSystemSystemdRoNetworkd(InitSystemSystemdBase):
+    config = InitSystemSystemdBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_ROOTFS_OVERLAY="{}"
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """.format(infra.filepath("tests/init/systemd-factory"))
+
+    def test_run(self):
+        self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+        self.check_network("eth0")
+
+        # This one must be executed on the target, to check that
+        # the factory feature works as expected
+        out, exit_code = self.emulator.run("cat /var/foo/bar")
+        self.assertEqual(exit_code, 0)
+        self.assertEqual(out[0], "foobar")
+
+
+class TestInitSystemSystemdRwNetworkd(InitSystemSystemdBase):
+    config = InitSystemSystemdBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        BR2_TARGET_ROOTFS_EXT2=y
+        """
+
+    def test_run(self):
+        self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+        self.check_network("eth0")
+
+
+class TestInitSystemSystemdRoIfupdown(InitSystemSystemdBase):
+    config = InitSystemSystemdBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """
+
+    def test_run(self):
+        self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+        self.check_network("eth0")
+
+
+class TestInitSystemSystemdRwIfupdown(InitSystemSystemdBase):
+    config = InitSystemSystemdBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_TARGET_ROOTFS_EXT2=y
+        """
+
+    def test_run(self):
+        self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+        self.check_network("eth0")
+
+
+class TestInitSystemSystemdRoFull(InitSystemSystemdBase):
+    config = InitSystemSystemdBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+        BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y
+        BR2_PACKAGE_SYSTEMD_BACKLIGHT=y
+        BR2_PACKAGE_SYSTEMD_BINFMT=y
+        BR2_PACKAGE_SYSTEMD_COREDUMP=y
+        BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y
+        BR2_PACKAGE_SYSTEMD_HIBERNATE=y
+        BR2_PACKAGE_SYSTEMD_IMPORTD=y
+        BR2_PACKAGE_SYSTEMD_LOCALED=y
+        BR2_PACKAGE_SYSTEMD_LOGIND=y
+        BR2_PACKAGE_SYSTEMD_MACHINED=y
+        BR2_PACKAGE_SYSTEMD_POLKIT=y
+        BR2_PACKAGE_SYSTEMD_QUOTACHECK=y
+        BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
+        BR2_PACKAGE_SYSTEMD_RFKILL=y
+        BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y
+        BR2_PACKAGE_SYSTEMD_SYSUSERS=y
+        BR2_PACKAGE_SYSTEMD_VCONSOLE=y
+        BR2_TARGET_ROOTFS_SQUASHFS=y
+        """
+
+    def test_run(self):
+        self.start_emulator("squashfs", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+        self.check_network("eth0")
+
+
+class TestInitSystemSystemdRwFull(InitSystemSystemdBase):
+    config = InitSystemSystemdBase.config + \
+        """
+        BR2_SYSTEM_DHCP="eth0"
+        BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY=y
+        BR2_PACKAGE_SYSTEMD_BACKLIGHT=y
+        BR2_PACKAGE_SYSTEMD_BINFMT=y
+        BR2_PACKAGE_SYSTEMD_COREDUMP=y
+        BR2_PACKAGE_SYSTEMD_FIRSTBOOT=y
+        BR2_PACKAGE_SYSTEMD_HIBERNATE=y
+        BR2_PACKAGE_SYSTEMD_IMPORTD=y
+        BR2_PACKAGE_SYSTEMD_LOCALED=y
+        BR2_PACKAGE_SYSTEMD_LOGIND=y
+        BR2_PACKAGE_SYSTEMD_MACHINED=y
+        BR2_PACKAGE_SYSTEMD_POLKIT=y
+        BR2_PACKAGE_SYSTEMD_QUOTACHECK=y
+        BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
+        BR2_PACKAGE_SYSTEMD_RFKILL=y
+        BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT=y
+        BR2_PACKAGE_SYSTEMD_SYSUSERS=y
+        BR2_PACKAGE_SYSTEMD_VCONSOLE=y
+        BR2_TARGET_ROOTFS_EXT2=y
+        """
+
+    def test_run(self):
+        self.start_emulator("ext2", "zImage", "vexpress-v2p-ca9")
+        self.check_init()
+        self.check_network("eth0")
diff --git a/bsp/buildroot/support/testing/tests/package/__init__.py b/bsp/buildroot/support/testing/tests/package/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/package/test_dropbear.py b/bsp/buildroot/support/testing/tests/package/test_dropbear.py
new file mode 100644
index 00000000..8f7f1fee
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/package/test_dropbear.py
@@ -0,0 +1,29 @@
+import os
+
+import infra.basetest
+
+
+class TestDropbear(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_GENERIC_ROOT_PASSWD="testpwd"
+        BR2_SYSTEM_DHCP="eth0"
+        BR2_PACKAGE_DROPBEAR=y
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+
+    def test_run(self):
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv5",
+                           kernel="builtin",
+                           options=["-initrd", img,
+                                    "-net", "nic",
+                                    "-net", "user,hostfwd=tcp::2222-:22"])
+        self.emulator.login("testpwd")
+        cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:22"
+        _, exit_code = self.emulator.run(cmd)
+        self.assertEqual(exit_code, 0)
+        # Would be useful to try to login through SSH here, through
+        # localhost:2222, though it is not easy to pass the ssh
+        # password on the command line.
diff --git a/bsp/buildroot/support/testing/tests/package/test_ipython.py b/bsp/buildroot/support/testing/tests/package/test_ipython.py
new file mode 100644
index 00000000..3b291d95
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/package/test_ipython.py
@@ -0,0 +1,36 @@
+from tests.package.test_python import TestPythonBase
+#
+# The following pythong tests are not being used here:
+#
+# - version_test: IPython does not support --version option
+#
+# - zlib_test: IPython does not return a non-zero code the way CPython
+#              does, so this test ends up being a false-negative
+
+
+class TestIPythonPy2(TestPythonBase):
+    config = TestPythonBase.config + \
+        """
+        BR2_PACKAGE_PYTHON=y
+        BR2_PACKAGE_PYTHON_IPYTHON=y
+        """
+    interpreter = "ipython"
+
+    def test_run(self):
+        self.login()
+        self.math_floor_test(40)
+        self.libc_time_test(40)
+
+
+class TestIPythonPy3(TestPythonBase):
+    config = TestPythonBase.config + \
+        """
+        BR2_PACKAGE_PYTHON3=y
+        BR2_PACKAGE_PYTHON_IPYTHON=y
+        """
+    interpreter = "ipython"
+
+    def test_run(self):
+        self.login()
+        self.math_floor_test(40)
+        self.libc_time_test(40)
diff --git a/bsp/buildroot/support/testing/tests/package/test_python.py b/bsp/buildroot/support/testing/tests/package/test_python.py
new file mode 100644
index 00000000..26cf4994
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/package/test_python.py
@@ -0,0 +1,70 @@
+import os
+
+import infra.basetest
+
+
+class TestPythonBase(infra.basetest.BRTest):
+    config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
+        """
+        BR2_TARGET_ROOTFS_CPIO=y
+        # BR2_TARGET_ROOTFS_TAR is not set
+        """
+    interpreter = "python"
+
+    def login(self):
+        cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv5",
+                           kernel="builtin",
+                           options=["-initrd", cpio_file])
+        self.emulator.login()
+
+    def version_test(self, version, timeout=-1):
+        cmd = self.interpreter + " --version 2>&1 | grep '^{}'".format(version)
+        _, exit_code = self.emulator.run(cmd, timeout)
+        self.assertEqual(exit_code, 0)
+
+    def math_floor_test(self, timeout=-1):
+        cmd = self.interpreter + " -c 'import math; math.floor(12.3)'"
+        _, exit_code = self.emulator.run(cmd, timeout)
+        self.assertEqual(exit_code, 0)
+
+    def libc_time_test(self, timeout=-1):
+        cmd = self.interpreter + " -c 'from __future__ import print_function;"
+        cmd += "import ctypes;"
+        cmd += "libc = ctypes.cdll.LoadLibrary(\"libc.so.1\");"
+        cmd += "print(libc.time(None))'"
+        _, exit_code = self.emulator.run(cmd, timeout)
+        self.assertEqual(exit_code, 0)
+
+    def zlib_test(self, timeout=-1):
+        cmd = self.interpreter + " -c 'import zlib'"
+        _, exit_code = self.emulator.run(cmd, timeout)
+        self.assertEqual(exit_code, 1)
+
+
+class TestPython2(TestPythonBase):
+    config = TestPythonBase.config + \
+        """
+        BR2_PACKAGE_PYTHON=y
+        """
+
+    def test_run(self):
+        self.login()
+        self.version_test("Python 2")
+        self.math_floor_test()
+        self.libc_time_test()
+        self.zlib_test()
+
+
+class TestPython3(TestPythonBase):
+    config = TestPythonBase.config + \
+        """
+        BR2_PACKAGE_PYTHON3=y
+        """
+
+    def test_run(self):
+        self.login()
+        self.version_test("Python 3")
+        self.math_floor_test()
+        self.libc_time_test()
+        self.zlib_test()
diff --git a/bsp/buildroot/support/testing/tests/package/test_rust.py b/bsp/buildroot/support/testing/tests/package/test_rust.py
new file mode 100644
index 00000000..2dc814f9
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/package/test_rust.py
@@ -0,0 +1,114 @@
+import os
+import tempfile
+import subprocess
+import shutil
+
+import infra.basetest
+
+
+class TestRustBase(infra.basetest.BRTest):
+
+    target = 'armv7-unknown-linux-gnueabihf'
+    crate = 'hello-world'
+
+    def login(self):
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+    def build_test_prog(self):
+        hostdir = os.path.join(self.builddir, 'host')
+        env = os.environ.copy()
+        env["USER"] = "br-user"
+        env["PATH"] = "{}:".format(os.path.join(hostdir, 'bin')) + env["PATH"]
+        env["CARGO_HOME"] = os.path.join(hostdir, 'usr', 'share', 'cargo')
+        env["RUST_TARGET_PATH"] = os.path.join(hostdir, 'etc', 'rustc')
+        cargo = os.path.join(hostdir, 'bin', 'cargo')
+        workdir = os.path.join(tempfile.mkdtemp(suffix='-br2-testing-rust'),
+                               self.crate)
+        manifest = os.path.join(workdir, 'Cargo.toml')
+        prog = os.path.join(workdir, 'target', self.target, 'debug', self.crate)
+
+        cmd = [cargo, 'init', '--bin', '--vcs', 'none', '-vv', workdir]
+        ret = subprocess.call(cmd,
+                              stdout=self.b.logfile,
+                              stderr=self.b.logfile,
+                              env=env)
+        if ret != 0:
+            raise SystemError("Cargo init failed")
+
+        cmd = [
+            cargo, 'build', '-vv', '--target', self.target,
+            '--manifest-path', manifest
+        ]
+        ret = subprocess.call(cmd,
+                              stdout=self.b.logfile,
+                              stderr=self.b.logfile,
+                              env=env)
+        if ret != 0:
+            raise SystemError("Cargo build failed")
+
+        shutil.copy(prog, os.path.join(self.builddir, 'target', 'usr', 'bin'))
+        self.b.build()
+        shutil.rmtree(workdir)
+
+
+class TestRustBin(TestRustBase):
+    config = \
+             """
+             BR2_arm=y
+             BR2_cortex_a9=y
+             BR2_ARM_ENABLE_NEON=y
+             BR2_ARM_ENABLE_VFP=y
+             BR2_TOOLCHAIN_EXTERNAL=y
+             BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+             BR2_SYSTEM_DHCP="eth0"
+             BR2_LINUX_KERNEL=y
+             BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+             BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
+             BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+             BR2_LINUX_KERNEL_DTS_SUPPORT=y
+             BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
+             BR2_TARGET_ROOTFS_CPIO=y
+             # BR2_TARGET_ROOTFS_TAR is not set
+             BR2_PACKAGE_HOST_CARGO=y
+             BR2_PACKAGE_HOST_RUSTC=y
+             """
+
+    def test_run(self):
+        self.build_test_prog()
+        self.login()
+        _, exit_code = self.emulator.run(self.crate)
+        self.assertEqual(exit_code, 0)
+
+
+class TestRust(TestRustBase):
+    config = \
+             """
+             BR2_arm=y
+             BR2_cortex_a9=y
+             BR2_ARM_ENABLE_NEON=y
+             BR2_ARM_ENABLE_VFP=y
+             BR2_TOOLCHAIN_EXTERNAL=y
+             BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
+             BR2_SYSTEM_DHCP="eth0"
+             BR2_LINUX_KERNEL=y
+             BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+             BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.3"
+             BR2_LINUX_KERNEL_DEFCONFIG="vexpress"
+             BR2_LINUX_KERNEL_DTS_SUPPORT=y
+             BR2_LINUX_KERNEL_INTREE_DTS_NAME="vexpress-v2p-ca9"
+             BR2_TARGET_ROOTFS_CPIO=y
+             # BR2_TARGET_ROOTFS_TAR is not set
+             BR2_PACKAGE_HOST_CARGO=y
+             BR2_PACKAGE_HOST_RUSTC=y
+             BR2_PACKAGE_HOST_RUST=y
+             """
+
+    def test_run(self):
+        self.build_test_prog()
+        self.login()
+        _, exit_code = self.emulator.run(self.crate)
+        self.assertEqual(exit_code, 0)
diff --git a/bsp/buildroot/support/testing/tests/toolchain/__init__.py b/bsp/buildroot/support/testing/tests/toolchain/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/support/testing/tests/toolchain/test_external.py b/bsp/buildroot/support/testing/tests/toolchain/test_external.py
new file mode 100644
index 00000000..881d2b00
--- /dev/null
+++ b/bsp/buildroot/support/testing/tests/toolchain/test_external.py
@@ -0,0 +1,252 @@
+import os
+import infra
+
+BASIC_CONFIG = \
+    """
+    BR2_TARGET_ROOTFS_CPIO=y
+    # BR2_TARGET_ROOTFS_TAR is not set
+    """
+
+
+def has_broken_links(path):
+    for root, dirs, files in os.walk(path):
+        for f in files:
+            fpath = os.path.join(root, f)
+            if not os.path.exists(fpath):
+                return True
+    return False
+
+
+class TestExternalToolchain(infra.basetest.BRTest):
+    def common_check(self):
+        # Check for broken symlinks
+        for d in ["lib", "usr/lib"]:
+            path = os.path.join(self.builddir, "staging", d)
+            self.assertFalse(has_broken_links(path))
+            path = os.path.join(self.builddir, "target", d)
+            self.assertFalse(has_broken_links(path))
+
+        interp = infra.get_elf_prog_interpreter(self.builddir,
+                                                self.toolchain_prefix,
+                                                "bin/busybox")
+        interp_path = os.path.join(self.builddir, "target", interp[1:])
+        self.assertTrue(os.path.exists(interp_path))
+
+
+class TestExternalToolchainSourceryArmv4(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_arm920t=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y
+        """
+    toolchain_prefix = "arm-none-linux-gnueabi"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+
+        # Check the architecture variant
+        arch = infra.get_file_arch(self.builddir,
+                                   self.toolchain_prefix,
+                                   "lib/libc.so.6")
+        self.assertEqual(arch, "v4T")
+
+        # Check the sysroot symlink
+        symlink = os.path.join(self.builddir, "staging", "armv4t")
+        self.assertTrue(os.path.exists(symlink))
+        self.assertEqual(os.readlink(symlink), "./")
+
+        # Boot the system
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv5",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainSourceryArmv5(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y
+        """
+    toolchain_prefix = "arm-none-linux-gnueabi"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+
+        # Check the architecture variant
+        arch = infra.get_file_arch(self.builddir,
+                                   self.toolchain_prefix,
+                                   "lib/libc.so.6")
+        self.assertEqual(arch, "v5TE")
+
+        # Boot the system
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv5",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainSourceryArmv7(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_cortex_a8=y
+        BR2_ARM_EABI=y
+        BR2_ARM_INSTRUCTIONS_THUMB2=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y
+        """
+    toolchain_prefix = "arm-none-linux-gnueabi"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+
+        # Check the architecture variant
+        arch = infra.get_file_arch(self.builddir,
+                                   self.toolchain_prefix,
+                                   "lib/libc.so.6")
+        self.assertEqual(arch, "v7")
+        isa = infra.get_elf_arch_tag(self.builddir,
+                                     self.toolchain_prefix,
+                                     "lib/libc.so.6",
+                                     "Tag_THUMB_ISA_use")
+        self.assertEqual(isa, "Thumb-2")
+
+        # Check we have the sysroot symlink
+        symlink = os.path.join(self.builddir, "staging", "thumb2")
+        self.assertTrue(os.path.exists(symlink))
+        self.assertEqual(os.readlink(symlink), "./")
+
+        # Boot the system
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainLinaroArm(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_cortex_a8=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM=y
+        """
+    toolchain_prefix = "arm-linux-gnueabihf"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+
+        # Check the architecture variant
+        arch = infra.get_file_arch(self.builddir,
+                                   self.toolchain_prefix,
+                                   "lib/libc.so.6")
+        self.assertEqual(arch, "v7")
+        isa = infra.get_elf_arch_tag(self.builddir,
+                                     self.toolchain_prefix,
+                                     "lib/libc.so.6",
+                                     "Tag_THUMB_ISA_use")
+        self.assertEqual(isa, "Thumb-2")
+
+        # Boot the system
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainBuildrootMusl(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_cortex_a9=y
+        BR2_ARM_ENABLE_VFP=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+        BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+        BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-cortex-a9-musl-2017.05-1078-g95b1dae.tar.bz2"
+        BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
+        BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12=y
+        BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+        BR2_TOOLCHAIN_EXTERNAL_CXX=y
+        """
+    toolchain_prefix = "arm-linux"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainCtngMusl(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_cortex_a9=y
+        BR2_ARM_ENABLE_VFP=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+        BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+        BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/arm-ctng-linux-musleabihf.tar.xz"
+        BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="arm-ctng-linux-musleabihf"
+        BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
+        BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
+        BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL=y
+        BR2_TOOLCHAIN_EXTERNAL_CXX=y
+        """
+    toolchain_prefix = "arm-ctng-linux-musleabihf"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainBuildrootuClibc(TestExternalToolchain):
+    config = BASIC_CONFIG + \
+        """
+        BR2_arm=y
+        BR2_TOOLCHAIN_EXTERNAL=y
+        BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+        BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
+        BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.05-1078-g95b1dae.tar.bz2"
+        BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
+        BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
+        BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
+        # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
+        BR2_TOOLCHAIN_EXTERNAL_CXX=y
+        """
+    toolchain_prefix = "arm-linux"
+
+    def test_run(self):
+        TestExternalToolchain.common_check(self)
+        img = os.path.join(self.builddir, "images", "rootfs.cpio")
+        self.emulator.boot(arch="armv7",
+                           kernel="builtin",
+                           options=["-initrd", img])
+        self.emulator.login()
+
+
+class TestExternalToolchainCCache(TestExternalToolchainBuildrootuClibc):
+    extraconfig = \
+        """
+        BR2_CCACHE=y
+        BR2_CCACHE_DIR="{builddir}/ccache-dir"
+        """
+
+    def __init__(self, names):
+        super(TestExternalToolchainBuildrootuClibc, self).__init__(names)
+        self.config += self.extraconfig.format(builddir=self.builddir)
diff --git a/bsp/buildroot/system/Config.in b/bsp/buildroot/system/Config.in
index 2d2bb872..d48cf8d8 100644
--- a/bsp/buildroot/system/Config.in
+++ b/bsp/buildroot/system/Config.in
@@ -1,15 +1,24 @@
 menu "System configuration"
 
+# Note: usually, it is not possible to select a provider of a virtual
+# package. But here we have an exception: there are only four providers
+# and they only get selected by separate entries in this choice and
+# under different, exclusive conditions. So this is a safe situation.
 choice
 	prompt "Root FS skeleton"
 
 config BR2_ROOTFS_SKELETON_DEFAULT
 	bool "default target skeleton"
+	select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_SYSV
+	select BR2_PACKAGE_SKELETON_INIT_SYSV if BR2_INIT_BUSYBOX
+	select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_INIT_SYSTEMD
+	select BR2_PACKAGE_SKELETON_INIT_NONE if BR2_INIT_NONE
 	help
 	  Use default target skeleton
 
 config BR2_ROOTFS_SKELETON_CUSTOM
 	bool "custom target skeleton"
+	select BR2_PACKAGE_SKELETON_CUSTOM
 	help
 	  Use custom target skeleton.
 
@@ -127,7 +136,6 @@ config BR2_INIT_SYSTEMD
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
 	select BR2_ROOTFS_MERGED_USR
 	select BR2_PACKAGE_SYSTEMD
-	select BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW if BR2_ROOTFS_SKELETON_DEFAULT
 
 comment "systemd needs a glibc toolchain, headers >= 3.10"
 	depends on !(BR2_TOOLCHAIN_USES_GLIBC \
@@ -218,6 +226,7 @@ config BR2_ROOTFS_MERGED_USR
 config BR2_TARGET_ENABLE_ROOT_LOGIN
 	bool "Enable root login with password"
 	default y
+	select BR2_PACKAGE_HOST_MKPASSWD if BR2_TARGET_GENERIC_ROOT_PASSWD != ""
 	help
 	  Allow root to log in with a password.
 
@@ -424,6 +433,25 @@ config BR2_GENERATE_LOCALE
 	  specified, UTF-8 is assumed. Examples of locales: en_US,
 	  fr_FR.UTF-8.
 
+config BR2_SYSTEM_ENABLE_NLS
+	bool "Enable Native Language Support (NLS)"
+	depends on BR2_USE_WCHAR
+	#  - glibc has built-in NLS support, but anyway doesn't
+	#    support static linking
+	#  - musl and uclibc support static linking, but they don't
+	#    have built-in NLS support, which is provided by the
+	#    libintl library from gettext. The fact that it is a
+	#    separate library causes too many problems for static
+	#    linking.
+	depends on !BR2_STATIC_LIBS
+	select BR2_PACKAGE_GETTEXT if !BR2_TOOLCHAIN_HAS_FULL_GETTEXT
+	help
+	  This option will enable Native Language Support, which will
+	  allow software packages to support translations.
+
+comment "NLS support needs a toolchain w/ wchar, dynamic library"
+	depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
+
 config BR2_TARGET_TZ_INFO
 	bool "Install timezone info"
 	select BR2_PACKAGE_TZDATA if BR2_TOOLCHAIN_USES_GLIBC
@@ -452,15 +480,13 @@ config BR2_TARGET_LOCALTIME
 	help
 	  The time zone to install as the default local time, expressed as a
 	  tzdata location, such as:
+	    Etc/UTC             (the default)
 	    GMT
 	    Europe/Paris
 	    America/New_York
 	    Pacific/Wallis
 	    ...
 
-	  If empty, no local time will be set, and the dates will be
-	  expressed in UTC.
-
 endif # BR2_TARGET_TZ_INFO
 
 config BR2_ROOTFS_USERS_TABLES
diff --git a/bsp/buildroot/system/skeleton/dev/.empty b/bsp/buildroot/system/skeleton/dev/.empty
new file mode 100644
index 00000000..e69de29b
diff --git a/bsp/buildroot/system/skeleton/etc/profile b/bsp/buildroot/system/skeleton/etc/profile
index 3a97427f..1255d23f 100644
--- a/bsp/buildroot/system/skeleton/etc/profile
+++ b/bsp/buildroot/system/skeleton/etc/profile
@@ -8,7 +8,7 @@ if [ "$PS1" ]; then
 	fi
 fi
 
-export PAGER='/bin/more '
+export PAGER='/bin/more'
 export EDITOR='/bin/vi'
 
 # Source configuration files from /etc/profile.d
@@ -16,5 +16,5 @@ for i in /etc/profile.d/*.sh ; do
 	if [ -r "$i" ]; then
 		. $i
 	fi
-	unset i
 done
+unset i
diff --git a/bsp/buildroot/system/system.mk b/bsp/buildroot/system/system.mk
new file mode 100644
index 00000000..ca6bf138
--- /dev/null
+++ b/bsp/buildroot/system/system.mk
@@ -0,0 +1,88 @@
+################################################################################
+#
+# system-related variables and macros
+#
+################################################################################
+
+# This file exists to define variables and macros that pertain to the system
+# settings, like rsyncing a directory for skeletons, or the /lib vs. /usr/lib
+# symlink handling.
+#
+# Some variables may be used as conditions in Makefile code, so they must be
+# defined properly before they are used; this file is included early, before
+# any package is.
+
+# - SYSTEM_USR_SYMLINKS_OR_DIRS
+#   create /lib, /bin and /sbin, either as directories or as symlinks to
+#   their /usr conterparts
+#
+# - SYSTEM_RSYNC
+#   rsync $(1) to $(2), with proper exclusions and rights
+#
+# - SYSTEM_LIB_SYMLINK
+#   create the appropriate /lib{32,64} symlinks
+#
+# - SYSTEM_GETTY_PORT
+# - SYSTEM_GETTY_BAUDRATE
+# - SYSTEM_GETTY_TERM
+# - SYSTEM_GETTY_OPTIONS
+#   the un-quoted getty setting
+#
+# - SYSTEM_REMOUNT_ROOT_INITTAB
+#   set inittab to remount root read-write or read-only
+#
+
+# This function handles the merged or non-merged /usr cases
+ifeq ($(BR2_ROOTFS_MERGED_USR),y)
+define SYSTEM_USR_SYMLINKS_OR_DIRS
+	ln -snf usr/bin $(1)/bin
+	ln -snf usr/sbin $(1)/sbin
+	ln -snf usr/lib $(1)/lib
+endef
+else
+define SYSTEM_USR_SYMLINKS_OR_DIRS
+	$(INSTALL) -d -m 0755 $(1)/bin
+	$(INSTALL) -d -m 0755 $(1)/sbin
+	$(INSTALL) -d -m 0755 $(1)/lib
+endef
+endif
+
+# This function rsyncs the skeleton directory in $(1) to the destination
+# in $(2), which should be either $(TARTGET_DIR) or $(STAGING_DIR)
+define SYSTEM_RSYNC
+	rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \
+		--chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \
+		$(1)/ $(2)/
+endef
+
+# Make a symlink lib32->lib or lib64->lib as appropriate.
+# MIPS64/n32 requires lib32 even though it's a 64-bit arch.
+# $(1): base dir (either staging or target)
+ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y)
+define SYSTEM_LIB_SYMLINK
+	ln -snf lib $(1)/lib64
+	ln -snf lib $(1)/usr/lib64
+endef
+else
+define SYSTEM_LIB_SYMLINK
+	ln -snf lib $(1)/lib32
+	ln -snf lib $(1)/usr/lib32
+endef
+endif
+
+SYSTEM_GETTY_PORT = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT))
+SYSTEM_GETTY_BAUDRATE = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE))
+SYSTEM_GETTY_TERM = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM))
+SYSTEM_GETTY_OPTIONS = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_OPTIONS))
+
+ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y)
+# Find commented line, if any, and remove leading '#'s
+define SYSTEM_REMOUNT_ROOT_INITTAB
+	$(SED) '/^#.*-o remount,rw \/$$/s~^#\+~~' $(TARGET_DIR)/etc/inittab
+endef
+else
+# Find uncommented line, if any, and add a leading '#'
+define SYSTEM_REMOUNT_ROOT_INITTAB
+	$(SED) '/^[^#].*-o remount,rw \/$$/s~^~#~' $(TARGET_DIR)/etc/inittab
+endef
+endif
diff --git a/bsp/buildroot/toolchain/Config.in b/bsp/buildroot/toolchain/Config.in
index 92a49263..bf1166b6 100644
--- a/bsp/buildroot/toolchain/Config.in
+++ b/bsp/buildroot/toolchain/Config.in
@@ -11,6 +11,7 @@ config BR2_TOOLCHAIN_USES_GLIBC
 	bool
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
+	select BR2_TOOLCHAIN_HAS_FULL_GETTEXT
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
@@ -42,10 +43,7 @@ choice
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
 	select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
-	depends on !BR2_bf606
-	depends on !BR2_bf607
-	depends on !BR2_bf608
-	depends on !BR2_bf609
+	depends on BR2_ARCH_HAS_TOOLCHAIN_BUILDROOT
 
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External toolchain"
diff --git a/bsp/buildroot/toolchain/helpers.mk b/bsp/buildroot/toolchain/helpers.mk
index 922c8215..1792286a 100644
--- a/bsp/buildroot/toolchain/helpers.mk
+++ b/bsp/buildroot/toolchain/helpers.mk
@@ -6,31 +6,26 @@
 # toolchain logic, and the glibc package, so care must be taken when
 # changing this function.
 #
-# $1: library name
+# $1: library name pattern (can include glob wildcards)
 #
 copy_toolchain_lib_root = \
-	LIB="$(strip $1)"; \
-\
-	LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIB}" 2>/dev/null` ; \
+	LIBPATTERN="$(strip $1)"; \
+	LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIBPATTERN}" 2>/dev/null` ; \
 	for LIBPATH in $${LIBPATHS} ; do \
-		DESTDIR=`echo $${LIBPATH} | sed "s,^$(STAGING_DIR)/,," | xargs dirname` ; \
-		mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
 		while true ; do \
 			LIBNAME=`basename $${LIBPATH}`; \
-			LIBDIR=`dirname $${LIBPATH}` ; \
-			LINKTARGET=`readlink $${LIBPATH}` ; \
+			DESTDIR=`echo $${LIBPATH} | sed "s,^$(STAGING_DIR)/,," | xargs dirname` ; \
+			mkdir -p $(TARGET_DIR)/$${DESTDIR}; \
 			rm -fr $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
 			if test -h $${LIBPATH} ; then \
-				ln -sf `basename $${LINKTARGET}` $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME} ; \
+				cp -d $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
+				LIBPATH="`readlink -f $${LIBPATH}`"; \
 			elif test -f $${LIBPATH}; then \
 				$(INSTALL) -D -m0755 $${LIBPATH} $(TARGET_DIR)/$${DESTDIR}/$${LIBNAME}; \
+				break ; \
 			else \
 				exit -1; \
 			fi; \
-			if test -z "$${LINKTARGET}" ; then \
-				break ; \
-			fi ; \
-			LIBPATH="`readlink -f $${LIBPATH}`"; \
 		done; \
 	done
 
@@ -39,17 +34,38 @@ copy_toolchain_lib_root = \
 # dir. The operation of this function is rendered a little bit
 # complicated by the support for multilib toolchains.
 #
-# We start by copying etc, lib, sbin and usr from the sysroot of the
-# selected architecture variant (as pointed by ARCH_SYSROOT_DIR). This
-# allows to import into the staging directory the C library and
-# companion libraries for the correct architecture variant. We
-# explictly only copy etc, lib, sbin and usr since other directories
+# We start by copying etc, 'lib', sbin, usr and usr/'lib' from the
+# sysroot of the selected architecture variant (as pointed to by
+# ARCH_SYSROOT_DIR). This allows to import into the staging directory
+# the C library and companion libraries for the correct architecture
+# variant. 'lib' may not be literally 'lib' but could be something else,
+# e.g. lib32-fp (as determined by ARCH_LIB_DIR) and we only want to copy
+# that lib directory and no other. When copying usr, we therefore need
+# to be extra careful not to include usr/lib* but we _do_ want to
+# include usr/libexec.
+# We are selective in the directories we copy since other directories
 # might exist for other architecture variants (on Codesourcery
 # toolchain, the sysroot for the default architecture variant contains
 # the armv4t and thumb2 subdirectories, which are the sysroot for the
 # corresponding architecture variants), and we don't want to import
 # them.
 #
+# If ARCH_LIB_DIR is not a singular directory component, e.g.
+# 'lib32/octeon2', then symbolic links in ARCH_LIB_DIR and
+# usr/ARCH_LIB_DIR may be broken because Buildroot will flatten the
+# directory structure (e.g. lib32/octeon2/foo is actually stored in
+# lib/foo). This is only relevant for links that contain one or more ../
+# components, as links to the current directory are always fine.
+# We need to fix the broken links by removing the right amount of ../
+# dots from the link destination.
+# Once the link destination is valid again, it can be simplified to
+# remove the dependency on intermediate directory symlinks.
+#
+# It is possible that ARCH_LIB_DIR does not contain the dynamic loader
+# (ld*.so or similar) because it (or the main symlink to it) normally
+# resides in /lib while ARCH_LIB_DIR may be something else (e.g. lib64,
+# lib/<tuple>, ...). Therefore, copy the dynamic loader separately.
+#
 # Then, if the selected architecture variant is not the default one
 # (i.e, if SYSROOT_DIR != ARCH_SYSROOT_DIR), then we :
 #
@@ -89,22 +105,47 @@ copy_toolchain_sysroot = \
 	ARCH_LIB_DIR="$(strip $4)" ; \
 	SUPPORT_LIB_DIR="$(strip $5)" ; \
 	for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR}; do \
-		if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
-			rsync -au --chmod=u=rwX,go=rX --exclude 'usr/lib/locale' \
+		if [ ! -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \
+			continue ; \
+		fi ; \
+		if [ "$$i" = "usr" ]; then \
+			rsync -au --chmod=u=rwX,go=rX --exclude 'locale/' \
 				--include '/libexec*/' --exclude '/lib*/' \
 				$${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \
+		else \
+			rsync -au --chmod=u=rwX,go=rX --exclude 'locale/' \
+				$${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \
 		fi ; \
 	done ; \
+	for link in $$(find $(STAGING_DIR) -type l); do \
+		target=$$(readlink $${link}) ; \
+		if [ "$${target}" == "$${target\#/}" ] ; then \
+			continue ; \
+		fi ; \
+		relpath="$(call relpath_prefix,$${target\#/})" ; \
+		echo "Fixing symlink $${link} from $${target} to $${relpath}$${target\#/}" ; \
+		ln -sf $${relpath}$${target\#/} $${link} ; \
+	done ; \
+	relpath="$(call relpath_prefix,$${ARCH_LIB_DIR})" ; \
+	if [ "$${relpath}" != "" ]; then \
+		for i in $$(find -H $(STAGING_DIR)/$${ARCH_LIB_DIR} $(STAGING_DIR)/usr/$${ARCH_LIB_DIR} -type l -xtype l); do \
+			LINKTARGET=`readlink $$i` ; \
+			NEWLINKTARGET=$${LINKTARGET\#$$relpath} ; \
+			ln -sf $${NEWLINKTARGET} $$i ; \
+			$(call simplify_symlink,$$i,$(STAGING_DIR)) ; \
+		done ; \
+	fi ; \
+	if [ ! -e $(STAGING_DIR)/lib/ld*.so.* ]; then \
+		if [ -e $${ARCH_SYSROOT_DIR}/lib/ld*.so.* ]; then \
+			cp -a $${ARCH_SYSROOT_DIR}/lib/ld*.so.* $(STAGING_DIR)/lib/ ; \
+		fi ; \
+	fi ; \
 	if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \
 		if [ ! -d $${ARCH_SYSROOT_DIR}/usr/include ] ; then \
 			cp -a $${SYSROOT_DIR}/usr/include $(STAGING_DIR)/usr ; \
 		fi ; \
 		mkdir -p `dirname $(STAGING_DIR)/$${ARCH_SUBDIR}` ; \
-		relpath="./" ; \
-		nbslashs=`printf $${ARCH_SUBDIR} | sed 's%[^/]%%g' | wc -c` ; \
-		for slash in `seq 1 $${nbslashs}` ; do \
-			relpath=$${relpath}"../" ; \
-		done ; \
+		relpath="$(call relpath_prefix,$${ARCH_SUBDIR})./" ; \
 		ln -s $${relpath} $(STAGING_DIR)/$${ARCH_SUBDIR} ; \
 		echo "Symlinking $(STAGING_DIR)/$${ARCH_SUBDIR} -> $${relpath}" ; \
 	fi ; \
@@ -186,7 +227,7 @@ check_glibc_rpc_feature = \
 #
 check_glibc = \
 	SYSROOT_DIR="$(strip $1)"; \
-	if test `find $${SYSROOT_DIR}/ -maxdepth 2 -name 'ld-linux*.so.*' -o -name 'ld.so.*' -o -name 'ld64.so.*' | wc -l` -eq 0 ; then \
+	if test `find -L $${SYSROOT_DIR}/ -maxdepth 2 -name 'ld-linux*.so.*' -o -name 'ld.so.*' -o -name 'ld64.so.*' | wc -l` -eq 0 ; then \
 		echo "Incorrect selection of the C library"; \
 		exit -1; \
 	fi; \
@@ -196,13 +237,18 @@ check_glibc = \
 #
 # Check that the selected C library really is musl
 #
-# $1: sysroot directory
+# $1: cross-gcc path
+# $2: cross-readelf path
 check_musl = \
-	SYSROOT_DIR="$(strip $1)"; \
-	if test ! -f $${SYSROOT_DIR}/lib/libc.so -o -e $${SYSROOT_DIR}/lib/libm.so ; then \
+	__CROSS_CC=$(strip $1) ; \
+	__CROSS_READELF=$(strip $2) ; \
+	echo 'void main(void) {}' | $${__CROSS_CC} -x c -o $(BUILD_DIR)/.br-toolchain-test.tmp - >/dev/null 2>&1; \
+	if ! $${__CROSS_READELF} -l $(BUILD_DIR)/.br-toolchain-test.tmp 2> /dev/null | grep 'program interpreter: /lib/ld-musl' -q; then \
+		rm -f $(BUILD_DIR)/.br-toolchain-test.tmp*; \
 		echo "Incorrect selection of the C library" ; \
 		exit -1; \
-	fi
+	fi ; \
+	rm -f $(BUILD_DIR)/.br-toolchain-test.tmp*
 
 #
 # Check the conformity of Buildroot configuration with regard to the
@@ -271,7 +317,6 @@ check_uclibc = \
 #
 check_arm_abi = \
 	__CROSS_CC=$(strip $1) ; \
-	__CROSS_READELF=$(strip $2) ; \
 	EXT_TOOLCHAIN_TARGET=`LANG=C $${__CROSS_CC} -v 2>&1 | grep ^Target | cut -f2 -d ' '` ; \
 	if ! echo $${EXT_TOOLCHAIN_TARGET} | grep -qE 'eabi(hf)?$$' ; then \
 		echo "External toolchain uses the unsuported OABI" ; \
@@ -376,7 +421,7 @@ check_unusable_toolchain = \
 #
 check_toolchain_ssp = \
 	__CROSS_CC=$(strip $1) ; \
-	__HAS_SSP=`echo 'void main(){}' | $${__CROSS_CC} -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \
+	__HAS_SSP=`echo 'void main(){}' | $${__CROSS_CC} -Werror -fstack-protector -x c - -o $(BUILD_DIR)/.br-toolchain-test.tmp >/dev/null 2>&1 && echo y` ; \
 	if [ "$(BR2_TOOLCHAIN_HAS_SSP)" != "y" -a "$${__HAS_SSP}" = "y" ] ; then \
 		echo "SSP support available in this toolchain, please enable BR2_TOOLCHAIN_EXTERNAL_HAS_SSP" ; \
 		exit 1 ; \
@@ -393,3 +438,49 @@ check_toolchain_ssp = \
 gen_gdbinit_file = \
 	mkdir -p $(STAGING_DIR)/usr/share/buildroot/ ; \
 	echo "set sysroot $(STAGING_DIR)" > $(STAGING_DIR)/usr/share/buildroot/gdbinit
+
+# Given a path, determine the relative prefix (../) needed to return to the
+# root level. Note that the last component is treated as a file component; use a
+# trailing slash to force treating it as a directory. Examples:
+#     relpath_prefix(lib32) = ""
+#     relpath_prefix(lib32/octeon2) = "../"
+#     relpath_prefix(lib32/octeon2/) = "../../"
+#
+# $1: input path
+define relpath_prefix
+$$( \
+	prefix="" ; \
+	nbslashs=`printf $1 | sed 's%[^/]%%g' | wc -c` ; \
+	for slash in `seq 1 $${nbslashs}` ; do \
+		prefix=$${prefix}"../" ; \
+	done ; \
+	printf "$$prefix" ; \
+)
+endef
+
+# Replace the destination of a symbolic link with a simpler version
+# For example,
+#     usr/lib/libfoo.so -> ../../lib32/libfoo.so.1
+# becomes
+#     usr/lib/libfoo.so -> ../../lib/libfoo.so.1
+# since 'lib32' is a symlink to 'lib'.
+#
+# Likewise,
+#     usr/lib/octeon2/libbar.so -> ../../../lib32/octeon2/libbar.so.1
+# becomes
+#     usr/lib/octeon2/libbar.so -> ../../lib/libbar.so.1
+# assuming lib32->lib and lib/octeon2->lib.
+#
+# $1: symlink
+# $2: base path
+define simplify_symlink
+( \
+	FULL_SRC="$$(readlink -f $$(dirname $1))/$$(basename $1)" ; \
+	FULL_DEST="$$(readlink -f $1)" ; \
+	FULL_BASE="$$(readlink -f $2)" ; \
+	REL_SRC="$${FULL_SRC#$${FULL_BASE}/}" ; \
+	REL_DEST="$${FULL_DEST#$${FULL_BASE}/}" ; \
+	DOTS="$(call relpath_prefix,$${REL_SRC})" ; \
+	ln -sf "$${DOTS}$${REL_DEST}" "$${FULL_SRC}" ; \
+)
+endef
diff --git a/bsp/buildroot/toolchain/toolchain-buildroot/Config.in b/bsp/buildroot/toolchain/toolchain-buildroot/Config.in
index 91cddc23..3f576297 100644
--- a/bsp/buildroot/toolchain/toolchain-buildroot/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-buildroot/Config.in
@@ -22,7 +22,7 @@ config BR2_TOOLCHAIN_BUILDROOT_VENDOR
 
 choice
 	prompt "C library"
-	default BR2_TOOLCHAIN_UCLIBC
+	default BR2_TOOLCHAIN_BUILDROOT_UCLIBC
 	default BR2_TOOLCHAIN_BUILDROOT_GLIBC if BR2_powerpc64
 
 config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
@@ -47,9 +47,12 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 		   BR2_mipsel      || BR2_mips64     || BR2_mips64el|| \
 		   BR2_powerpc     || BR2_powerpc64  || BR2_powerpc64le || \
 		   BR2_sh          || BR2_sparc64    || BR2_x86_64 || \
-		   BR2_microblaze || BR2_nios2
+		   BR2_microblaze  || BR2_nios2      || BR2_archs38
 	depends on BR2_USE_MMU
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 || !BR2_powerpc64le
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5 || !BR2_MIPS_NAN_2008
 	depends on !BR2_powerpc_SPE
 	select BR2_TOOLCHAIN_USES_GLIBC
 	# our glibc.mk enables RPC support
@@ -60,16 +63,26 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 
 	  http://www.gnu.org/software/libc/
 
-comment "glibc only available with shared lib support"
+comment "glibc needs a toolchain w/ dynamic library, kernel headers >= 3.2"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+
+# glibc >= 2.26 require kernel headers >= 3.10 on powerpc64le.
+comment "glibc on powerpc64le needs a toolchain w/ headers >= 3.10"
+	depends on BR2_powerpc64le
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10
+
+# Support for MIPS NAN2008 needs headers >= 4.5
+comment "glibc on MIPS w/ NAN2008 needs a toolchain w/ headers >= 4.5"
+	depends on BR2_MIPS_NAN_2008
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_5
 
 config BR2_TOOLCHAIN_BUILDROOT_MUSL
 	bool "musl"
-	depends on BR2_aarch64	  || BR2_arm     || BR2_armeb     || BR2_i386 || \
-		   BR2_microblaze || BR2_mips    || BR2_mipsel    || BR2_mips64 || \
-		   BR2_mips64el   || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
-		   BR2_sh         || BR2_x86_64
+	depends on BR2_aarch64	   || BR2_arm   || BR2_armeb   || BR2_i386 || \
+		   BR2_microblaze  || BR2_mips  || BR2_mipsel  || BR2_mips64 || \
+		   BR2_mips64el    || BR2_or1k  || BR2_powerpc || BR2_powerpc64 || \
+		   BR2_powerpc64le || BR2_sh    || BR2_x86_64
 	depends on !BR2_powerpc_SPE # not supported, build breaks
 	# sh2 nommu is supported by musl, but we don't have support
 	# for it in Buildroot.
diff --git a/bsp/buildroot/toolchain/toolchain-common.in b/bsp/buildroot/toolchain/toolchain-common.in
index 38baaa92..8941e0f3 100644
--- a/bsp/buildroot/toolchain/toolchain-common.in
+++ b/bsp/buildroot/toolchain/toolchain-common.in
@@ -22,10 +22,8 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735
 	default y if BR2_ARM_CPU_ARMV4
 	default y if BR2_ARM_CPU_ARMV5
 	default y if BR2_sparc_v8
-
-# https://sourceware.org/bugzilla/show_bug.cgi?id=19405
-config BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405
-	bool
+	default y if BR2_m68k_cf5208
+	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7
 
 config BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	bool
@@ -82,19 +80,11 @@ config BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_LIST
 
 	  Note: the full set of gconv libs are ~8MiB (on ARM).
 
-# glibc and eglibc directly include gettext, so a separatly compiled
-# gettext isn't needed and shouldn't be built to avoid conflicts. Some
-# packages always need gettext, other packages only need gettext when
-# locale support is enabled. See the documentation for how packages
-# should rely on the following two options.
-
-config BR2_NEEDS_GETTEXT
+# This boolean is true if the toolchain provides a built-in full
+# featured gettext implementation (glibc), and false if only a stub
+# gettext implementation is provided (uclibc, musl)
+config BR2_TOOLCHAIN_HAS_FULL_GETTEXT
 	bool
-	default y if BR2_TOOLCHAIN_USES_UCLIBC
-
-config BR2_NEEDS_GETTEXT_IF_LOCALE
-	bool
-	default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE)
 
 config BR2_USE_MMU
 	bool "Enable MMU support" if BR2_ARCH_HAS_MMU_OPTIONAL
@@ -248,10 +238,40 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
 	bool
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
 
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+	bool
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_HEADERS_AT_LEAST
 	string
+	default "4.15" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+	default "4.14" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+	default "4.13" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+	default "4.12" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+	default "4.11" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+	default "4.10" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
 	default "4.9"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
 	default "4.8"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
 	default "4.7"  if BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
@@ -319,10 +339,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	bool
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
+config BR2_TOOLCHAIN_GCC_AT_LEAST_7
+	bool
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+
 # This order guarantees that the highest version is set, as kconfig
 # stops affecting a value on the first matching default.
 config BR2_TOOLCHAIN_GCC_AT_LEAST
 	string
+	default "7"	if BR2_TOOLCHAIN_GCC_AT_LEAST_7
 	default "6"	if BR2_TOOLCHAIN_GCC_AT_LEAST_6
 	default "5"	if BR2_TOOLCHAIN_GCC_AT_LEAST_5
 	default "4.9"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
@@ -333,6 +358,10 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST
 	default "4.4"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
 	default "4.3"	if BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
 
+config BR2_TOOLCHAIN_HAS_MNAN_OPTION
+	bool
+	default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
+
 config BR2_TOOLCHAIN_HAS_SYNC_1
 	bool
 	default y
diff --git a/bsp/buildroot/toolchain/toolchain-external/Config.in b/bsp/buildroot/toolchain/toolchain-external/Config.in
index 35db5824..c4063b17 100644
--- a/bsp/buildroot/toolchain/toolchain-external/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/Config.in
@@ -33,12 +33,8 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi
 # NIOSII
 source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in"
 
-# SH4a
-source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in"
-
-# x86/x86_64 (use amd64 toolchain by default for AMD64)
+# x86_64
 source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in"
-source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in"
 
 # Kept last, so it remains the non-default choice, unless there isn't
 # any available toolchain profile for the currently selected
@@ -71,10 +67,14 @@ endchoice
 
 config BR2_TOOLCHAIN_EXTERNAL_PATH
 	string "Toolchain path"
-	default "/path/to/toolchain/usr"
+	default ""
 	depends on BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED
 	help
-	  Path to where the external toolchain is installed.
+	  Path to where the external toolchain is installed. The
+	  compiler itself is expected to be in the "bin" subdirectory
+	  of this path.
+
+	  If empty, the compiler will be searched in $PATH.
 
 config BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	bool
@@ -127,12 +127,8 @@ source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Confi
 # NIOSII
 source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options"
 
-# SH4a
-source "toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options"
-
-# x86/x86_64
+# x86_64
 source "toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in.options"
-source "toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options"
 
 # Custom toolchains
 source "toolchain/toolchain-external/toolchain-external-custom/Config.in.options"
diff --git a/bsp/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk b/bsp/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
index 23b941a8..3bf9fac4 100644
--- a/bsp/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/pkg-toolchain-external.mk
@@ -13,10 +13,9 @@
 #  * Toolchains provided by Linaro for the ARM and AArch64
 #    architectures
 #  * Sourcery CodeBench toolchains (from Mentor Graphics) for the ARM,
-#    MIPS, PowerPC, x86, x86_64 and NIOS 2 architectures. For the MIPS
+#    MIPS, PowerPC, x86_64 and NIOS 2 architectures. For the MIPS
 #    toolchain, the -muclibc variant isn't supported yet, only the
 #    default glibc-based variant is.
-#  * Xilinx toolchains for the Microblaze architecture
 #  * Synopsys DesignWare toolchains for ARC cores
 #
 # The basic principle is the following
@@ -55,7 +54,7 @@
 #  so we're sure the correct configuration is always used and the
 #  toolchain behaves similar to an internal toolchain.
 #  This toolchain wrapper and symlinks are installed into
-#  $(HOST_DIR)/usr/bin like for the internal toolchains, and the rest
+#  $(HOST_DIR)/bin like for the internal toolchains, and the rest
 #  of Buildroot is handled identical for the 2 toolchain types.
 ################################################################################
 
@@ -75,10 +74,10 @@ endif
 ifeq ($(TOOLCHAIN_EXTERNAL_INSTALL_DIR),)
 ifneq ($(TOOLCHAIN_EXTERNAL_PREFIX),)
 # if no path set, figure it out from path
-TOOLCHAIN_EXTERNAL_BIN := $(shell dirname $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
+TOOLCHAIN_EXTERNAL_BIN := $(dir $(shell which $(TOOLCHAIN_EXTERNAL_PREFIX)-gcc))
 endif
 else
-TOOLCHAIN_EXTERNAL_BIN := $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
+TOOLCHAIN_EXTERNAL_BIN = $(TOOLCHAIN_EXTERNAL_INSTALL_DIR)/bin
 endif
 
 # If this is a buildroot toolchain, it already has a wrapper which we want to
@@ -91,7 +90,7 @@ TOOLCHAIN_EXTERNAL_CROSS = $(TOOLCHAIN_EXTERNAL_BIN)/$(TOOLCHAIN_EXTERNAL_PREFIX
 TOOLCHAIN_EXTERNAL_CC = $(TOOLCHAIN_EXTERNAL_CROSS)gcc$(TOOLCHAIN_EXTERNAL_SUFFIX)
 TOOLCHAIN_EXTERNAL_CXX = $(TOOLCHAIN_EXTERNAL_CROSS)g++$(TOOLCHAIN_EXTERNAL_SUFFIX)
 TOOLCHAIN_EXTERNAL_FC = $(TOOLCHAIN_EXTERNAL_CROSS)gfortran$(TOOLCHAIN_EXTERNAL_SUFFIX)
-TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf$(TOOLCHAIN_EXTERNAL_SUFFIX)
+TOOLCHAIN_EXTERNAL_READELF = $(TOOLCHAIN_EXTERNAL_CROSS)readelf
 
 # Normal handling of downloaded toolchain tarball extraction.
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD),y)
@@ -108,13 +107,11 @@ endif
 #
 # Definitions of the list of libraries that should be copied to the target.
 #
+
+TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.* libatomic.so.*
+
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
-TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_ARM_EABIHF),yy)
-TOOLCHAIN_EXTERNAL_LIBS += ld-linux-armhf.so.*
-else
-TOOLCHAIN_EXTERNAL_LIBS += ld*.so.*
-endif
+TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
 ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.*
 ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
@@ -128,7 +125,7 @@ TOOLCHAIN_EXTERNAL_LIBS += libnss_files.so.* libnss_dns.so.* libmvec.so.* libanl
 endif
 
 ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
-TOOLCHAIN_EXTERNAL_LIBS += libc.so libgcc_s.so.*
+TOOLCHAIN_EXTERNAL_LIBS += libc.so
 endif
 
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
@@ -157,6 +154,8 @@ CC_TARGET_CPU_ := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVIS
 endif
 CC_TARGET_ARCH_ := $(call qstrip,$(BR2_GCC_TARGET_ARCH))
 CC_TARGET_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_ABI))
+CC_TARGET_NAN_ := $(call qstrip,$(BR2_GCC_TARGET_NAN))
+CC_TARGET_FP32_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_FP32_MODE))
 CC_TARGET_FPU_ := $(call qstrip,$(BR2_GCC_TARGET_FPU))
 CC_TARGET_FLOAT_ABI_ := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI))
 CC_TARGET_MODE_ := $(call qstrip,$(BR2_GCC_TARGET_MODE))
@@ -179,6 +178,16 @@ ifneq ($(CC_TARGET_ABI_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mabi=$(CC_TARGET_ABI_)
 TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(CC_TARGET_ABI_)"'
 endif
+ifeq ($(BR2_TOOLCHAIN_HAS_MNAN_OPTION),y)
+ifneq ($(CC_TARGET_NAN_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mnan=$(CC_TARGET_NAN_)
+TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_NAN='"$(CC_TARGET_NAN_)"'
+endif
+endif
+ifneq ($(CC_TARGET_FP32_MODE_),)
+TOOLCHAIN_EXTERNAL_CFLAGS += -mfp$(CC_TARGET_FP32_MODE_)
+TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FP32_MODE='"$(CC_TARGET_FP32_MODE_)"'
+endif
 ifneq ($(CC_TARGET_FPU_),)
 TOOLCHAIN_EXTERNAL_CFLAGS += -mfpu=$(CC_TARGET_FPU_)
 TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(CC_TARGET_FPU_)"'
@@ -231,13 +240,13 @@ endif
 
 #
 # The following functions creates the symbolic links needed to get the
-# cross-compilation tools visible in $(HOST_DIR)/usr/bin. Some of
+# cross-compilation tools visible in $(HOST_DIR)/bin. Some of
 # links are done directly to the corresponding tool in the external
 # toolchain installation directory, while some other links are done to
 # the toolchain wrapper (preprocessor, C, C++ and Fortran compiler)
 #
 # We skip gdb symlink when we are building our own gdb to prevent two
-# gdb's in $(HOST_DIR)/usr/bin.
+# gdb's in $(HOST_DIR)/bin.
 #
 # The LTO support in gcc creates wrappers for ar, ranlib and nm which load
 # the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and
@@ -246,23 +255,23 @@ endif
 # match the *cc-* pattern. Therefore, an additional case is added for *-ar,
 # *-ranlib and *-nm.
 define TOOLCHAIN_EXTERNAL_INSTALL_WRAPPER
-	$(Q)cd $(HOST_DIR)/usr/bin; \
+	$(Q)cd $(HOST_DIR)/bin; \
 	for i in $(TOOLCHAIN_EXTERNAL_CROSS)*; do \
 		base=$${i##*/}; \
 		case "$$base" in \
 		*-ar|*-ranlib|*-nm) \
-			ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
+			ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
 			;; \
 		*cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \
 			ln -sf toolchain-wrapper $$base; \
 			;; \
 		*gdb|*gdbtui) \
 			if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \
-				ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
+				ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
 			fi \
 			;; \
 		*) \
-			ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \
+			ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%..%') .; \
 			;; \
 		esac; \
 	done
@@ -332,7 +341,7 @@ endef
 # Returns the lib subdirectory for the given compiler + flags (i.e
 # typically lib32 or lib64 for some toolchains)
 define toolchain_find_libdir
-$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?)/([^/]*/)?libc.a:\2:')
+$$(printf $(call toolchain_find_libc_a,$(1)) | sed -r -e 's:.*/(usr/)?(lib(32|64)?([^/]*)?(/[^/]*)?)/libc.a:\2:')
 endef
 
 # Returns the location of the libc.a file for the given compiler + flags
@@ -387,8 +396,8 @@ endef
 ifeq ($(BR2_STATIC_LIBS),)
 define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS
 	$(Q)$(call MESSAGE,"Copying external toolchain libraries to target...")
-	$(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \
-		$(call copy_toolchain_lib_root,$$libs); \
+	$(Q)for libpattern in $(TOOLCHAIN_EXTERNAL_LIBS); do \
+		$(call copy_toolchain_lib_root,$$libpattern); \
 	done
 endef
 endif
@@ -445,19 +454,20 @@ endef
 #
 # $1: destination directory (TARGET_DIR / STAGING_DIR)
 create_lib_symlinks = \
-       $(Q)DESTDIR="$(strip $1)" ; \
-       ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
-       if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \
-               ln -snf lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \
-               ln -snf lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \
-       fi
+	$(Q)DESTDIR="$(strip $1)" ; \
+	ARCH_LIB_DIR="$(call toolchain_find_libdir,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))" ; \
+	if [ ! -e "$${DESTDIR}/$${ARCH_LIB_DIR}" -a ! -e "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ]; then \
+		relpath="$(call relpath_prefix,$${ARCH_LIB_DIR})" ; \
+		ln -snf $${relpath}lib "$${DESTDIR}/$${ARCH_LIB_DIR}" ; \
+		ln -snf $${relpath}lib "$${DESTDIR}/usr/$${ARCH_LIB_DIR}" ; \
+	fi
 
 define TOOLCHAIN_EXTERNAL_CREATE_STAGING_LIB_SYMLINK
-       $(call create_lib_symlinks,$(STAGING_DIR))
+	$(call create_lib_symlinks,$(STAGING_DIR))
 endef
 
 define TOOLCHAIN_EXTERNAL_CREATE_TARGET_LIB_SYMLINK
-       $(call create_lib_symlinks,$(TARGET_DIR))
+	$(call create_lib_symlinks,$(TARGET_DIR))
 endef
 
 #
@@ -470,30 +480,6 @@ define TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT
 	fi
 endef
 
-# Various utility functions used by the external toolchain based on musl.
-
-# With the musl C library, the libc.so library directly plays the role
-# of the dynamic library loader. We just need to create a symbolic
-# link to libc.so with the appropriate name.
-ifeq ($(BR2_TOOLCHAIN_EXTERNAL_MUSL):$(BR2_STATIC_LIBS),y:)
-ifeq ($(BR2_i386),y)
-MUSL_ARCH = i386
-else ifeq ($(BR2_ARM_EABIHF),y)
-MUSL_ARCH = armhf
-else ifeq ($(BR2_mips):$(BR2_SOFT_FLOAT),y:y)
-MUSL_ARCH = mips-sf
-else ifeq ($(BR2_mipsel):$(BR2_SOFT_FLOAT),y:y)
-MUSL_ARCH = mipsel-sf
-else ifeq ($(BR2_sh),y)
-MUSL_ARCH = sh
-else
-MUSL_ARCH = $(ARCH)
-endif
-define TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
-	ln -sf libc.so $(TARGET_DIR)/lib/ld-musl-$(MUSL_ARCH).so.1
-endef
-endif
-
 # uClibc-ng dynamic loader is called ld-uClibc.so.1, but gcc is not
 # patched specifically for uClibc-ng, so it continues to generate
 # binaries that expect the dynamic loader to be named ld-uClibc.so.0,
@@ -555,8 +541,7 @@ define $(2)_CONFIGURE_CMDS
 		$$(call qstrip,$$(BR2_TOOLCHAIN_GCC_AT_LEAST))); \
 	if test "$$(BR2_arm)" = "y" ; then \
 		$$(call check_arm_abi,\
-			"$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\
-			$$(TOOLCHAIN_EXTERNAL_READELF)) ; \
+			"$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)") ; \
 	fi ; \
 	if test "$$(BR2_INSTALL_LIBSTDCPP)" = "y" ; then \
 		$$(call check_cplusplus,$$(TOOLCHAIN_EXTERNAL_CXX)) ; \
@@ -567,7 +552,9 @@ define $(2)_CONFIGURE_CMDS
 	if test "$$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)" = "y" ; then \
 		$$(call check_uclibc,$$$${SYSROOT_DIR}) ; \
 	elif test "$$(BR2_TOOLCHAIN_EXTERNAL_MUSL)" = "y" ; then \
-		$$(call check_musl,$$$${SYSROOT_DIR}) ; \
+		$$(call check_musl,\
+			"$$(TOOLCHAIN_EXTERNAL_CC) $$(TOOLCHAIN_EXTERNAL_CFLAGS)",\
+			$$(TOOLCHAIN_EXTERNAL_READELF)) ; \
 	else \
 		$$(call check_glibc,$$$${SYSROOT_DIR}) ; \
 	fi
@@ -586,10 +573,6 @@ define $(2)_INSTALL_STAGING_CMDS
 	$$(TOOLCHAIN_EXTERNAL_INSTALL_GDBINIT)
 endef
 
-ifeq ($$(BR2_TOOLCHAIN_EXTERNAL_MUSL),y)
-$(2)_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_MUSL_LD_LINK
-endif
-
 # Even though we're installing things in both the staging, the host
 # and the target directory, we do everything within the
 # install-staging step, arbitrarily.
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
index e29c4dcb..8b2eab0a 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in
@@ -1,6 +1,7 @@
 config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS
 	bool "Codescape IMG GNU Linux Toolchain 2016.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT)
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
index efe6f852..db191fd1 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in
@@ -1,6 +1,7 @@
 config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS
 	bool "Codescape MTI GNU Linux Toolchain 2016.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) || \
 		BR2_MIPS_CPU_MIPS32R5 || (BR2_MIPS_CPU_MIPS64R5 && !BR2_MIPS_SOFT_FLOAT)
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in
index 2fbb218e..24cbcffa 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in
@@ -1,6 +1,9 @@
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64
 	bool "CodeSourcery AArch64 2014.11"
 	depends on BR2_aarch64
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+	# a57/a53 and a72/a53 appeared in gcc-6 or were broken before
+	depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_STATIC_LIBS
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk
index e320d3d3..192763a0 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk
@@ -9,14 +9,4 @@ TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95
 TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
 TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
 
-define TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_STAGING_FIXUP
-	ln -sf ld-2.20.so $(STAGING_DIR)/lib/ld-linux-aarch64.so.1
-endef
-TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_POST_INSTALL_STAGING_HOOKS += TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_STAGING_FIXUP
-
-define TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_TARGET_FIXUP
-	ln -sf ld-2.20.so $(TARGET_DIR)/lib/ld-linux-aarch64.so.1
-endef
-TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_POST_INSTALL_TARGET_HOOKS += TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_TARGET_FIXUP
-
 $(eval $(toolchain-external-package))
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in
index 101e227a..50c5a200 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-amd64/Config.in
@@ -1,6 +1,7 @@
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64
 	bool "Sourcery CodeBench AMD64 2016.11"
 	depends on BR2_x86_64
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_x86_jaguar || BR2_x86_steamroller
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in
index 6331873d..bdbe2aca 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in
@@ -1,10 +1,11 @@
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
 	bool "Sourcery CodeBench ARM 2014.05"
 	depends on BR2_arm
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABI
 	# Unsupported ARM cores
-	depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8
+	depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8A
 	depends on !BR2_STATIC_LIBS
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	select BR2_TOOLCHAIN_HAS_SSP
@@ -31,5 +32,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
 
 comment "Sourcery CodeBench toolchains available for the EABI ABI"
 	depends on BR2_arm
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 	depends on !BR2_ARM_EABI
 	depends on !BR2_STATIC_LIBS
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in
index 6a13ae6c..734f0e4c 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in
@@ -2,6 +2,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
 	bool "Sourcery CodeBench MIPS 2016.05"
 	depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
 	depends on BR2_MIPS_CPU_MIPS32R2 || BR2_MIPS_CPU_MIPS64R2
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	# Unsupported MIPS cores
 	depends on !BR2_mips_interaptiv
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
@@ -89,5 +90,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
 	      Select BR2_SOFT_FLOAT
 
 comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	depends on BR2_MIPS_NABI32
 	depends on !BR2_STATIC_LIBS
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
index 9675c67a..4ac9c95c 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in
@@ -1,17 +1,16 @@
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
-	bool "Sourcery CodeBench Nios-II 2016.11"
+	bool "Sourcery CodeBench Nios-II 2017.05"
 	depends on BR2_nios2
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_STATIC_LIBS
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_SSP
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_HOSTARCH_NEEDS_IA32_LIBS
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
-	select BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # based-on binutils-2.26
 	help
 	  Sourcery CodeBench toolchain for the Nios-II architecture,
-	  from Mentor Graphics. It uses gcc 6.2, binutils 2.26,
-	  glibc 2.24, gdb 7.11 and kernel headers 4.7.
+	  from Mentor Graphics. It uses gcc 6.3, binutils 2.26,
+	  glibc 2.25, gdb 7.11 and kernel headers 4.7.
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash
index 17130b42..3643f921 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.hash
@@ -1,3 +1,6 @@
+# From https://sourcery.mentor.com/GNUToolchain/release3302
+md5 54b7f7056c2159f3a9ddeca8ca775ed1 sourceryg++-2017.05-4-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
+md5 529a7fecf33d0d113a446413b9d1e173 sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2
 # Locally calculated
-sha256 97e3b878c67e46430f2b9a42b11bc95b1ef9fef263e6b5ee9103d1239c9e847d  sourceryg++-2016.11-32-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
-sha256 ee2c4391137be8fee987411301bbf9f0e4a823400e37c9f8c1cae9900485cbca  sourceryg++-2016.11-32-nios2-linux-gnu.src.tar.bz2
+sha256 3f0307da3c0770b7cc3ed4a845038e6e438d3e3a96ce880f9a86b3d35f948a07  sourceryg++-2017.05-4-nios2-linux-gnu-i686-pc-linux-gnu.tar.bz2
+sha256 6e65878d0453708ee19098d3d68985bda244938d35999f3859915a2f5574fa08  sourceryg++-2017.05-4-nios2-linux-gnu.src.tar.bz2
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk
index dcca94f0..dfa4ea42 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-niosII/toolchain-external-codesourcery-niosII.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2016.11-32
+TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION = 2017.05-4
 
 TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
 TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_SOURCE = sourceryg++-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in
deleted file mode 100644
index a47dab76..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in
+++ /dev/null
@@ -1,25 +0,0 @@
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
-	bool "Sourcery CodeBench SH 2012.09"
-	depends on BR2_sh4a || BR2_sh4aeb
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	depends on !BR2_STATIC_LIBS
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_SSP
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-	help
-	  Sourcery CodeBench toolchain for the SuperH architecture,
-	  from Mentor Graphics. It uses gcc 4.7.2, binutils 2.23.51,
-	  glibc 2.16, uClibc 0.9.30, gdb 7.4.50 and kernel headers
-	  3.5.4. It has support for the following variants:
-	    - SH4A, glibc, little endian
-	      Default.
-	    - SH4A, glibc, big endian
-	      Add -mb to BR2_TARGET_OPTIMIZATION
-	    - SH4A, uClibc, little endian
-	      Not usable in Buildroot yet.
-	    - SH4A, uClibc, big endian
-	      Not usable in Buildroot yet.
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options
deleted file mode 100644
index 90061cef..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/Config.in.options
+++ /dev/null
@@ -1,9 +0,0 @@
-if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH
-
-config BR2_TOOLCHAIN_EXTERNAL_PREFIX
-	default "sh-linux-gnu"
-
-config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL
-	default "toolchain-external-codesourcery-sh"
-
-endif
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash
deleted file mode 100644
index ff2ba5f4..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256 59d6766fde244931aa52db01433d5acd051998762a931121c5fc109536a1a802  renesas-2012.09-61-sh-linux-gnu-i686-pc-linux-gnu.tar.bz2
-sha256 e2e58c10e52395d5d35157e35f85233f713c6f9223a652dfc56194cfd2eed004  renesas-2012.09-61-sh-linux-gnu.src.tar.bz2
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk
deleted file mode 100644
index 5370bb22..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-sh/toolchain-external-codesourcery-sh.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-################################################################################
-#
-# toolchain-external-sourcery-sh
-#
-################################################################################
-
-TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_VERSION = 2012.09-61
-
-TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
-TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_SOURCE = renesas-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2
-TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_ACTUAL_SOURCE_TARBALL = renesas-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_SH_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
-
-$(eval $(toolchain-external-package))
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in
deleted file mode 100644
index bcbdd269..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in
+++ /dev/null
@@ -1,29 +0,0 @@
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86
-	bool "Sourcery CodeBench x86/x86_64 2012.09"
-	depends on BR2_i386 || BR2_x86_64
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	depends on !BR2_STATIC_LIBS
-	depends on !BR2_x86_jaguar
-	depends on !BR2_x86_steamroller
-	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_SSP
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
-	help
-	  Sourcery CodeBench toolchain for the x86/x86_64
-	  architectures, from Mentor Graphics. It uses gcc 4.7.2,
-	  binutils 2.23.51, glibc 2.16, gdb 7.4.50 and kernel headers
-	  3.5.4. It has support for the following variants:
-	    - Intel Pentium 4, glibc, 32 bits
-	      Default for x86, nothing special to do.
-	    - Intel Atom, glibc, 32 bits
-	      Select an Atom core
-	    - Intel Xeon, glibc, 64 bits
-	      Default for x86_64, nothing special to do.
-	    - Intel Core 2, glibc, 64 bits
-	      Select a Core 2 core
-	  Other architecture variants (beyond Pentium-4/Xeon) are
-	  supported as well, but glibc is not optimised for it.
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options
deleted file mode 100644
index 65b62f32..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/Config.in.options
+++ /dev/null
@@ -1,9 +0,0 @@
-if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_X86
-
-config BR2_TOOLCHAIN_EXTERNAL_PREFIX
-	default "i686-pc-linux-gnu"
-
-config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL
-	default "toolchain-external-codesourcery-x86"
-
-endif
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash
deleted file mode 100644
index a003f7ab..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# Locally calculated
-sha256 ea804cf02014369da52abc4f64e91e96bde2dd2230aca96109459013d4545458  ia32-2012.09-62-i686-pc-linux-gnu-i386-linux.tar.bz2
-sha256 1a9519e415a1e6892c760bf21f7e98f3a633a9d1c5bb8781a96d338e4dd62717  ia32-2012.09-62-i686-pc-linux-gnu.src.tar.bz2
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk
deleted file mode 100644
index 5ee6991c..00000000
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-codesourcery-x86/toolchain-external-codesourcery-x86.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-################################################################################
-#
-# toolchain-external-codesourcery-x86
-#
-################################################################################
-
-TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX)
-TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION = 2012.09-62
-TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_SOURCE = ia32-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i386-linux.tar.bz2
-TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_ACTUAL_SOURCE_TARBALL = ia32-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_X86_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2
-
-$(eval $(toolchain-external-package))
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
index ed2b082d..70c7d8e3 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-custom/Config.in.options
@@ -18,49 +18,68 @@ config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX
 
 choice
 	bool "External toolchain gcc version"
+	default BR2_TOOLCHAIN_EXTERNAL_GCC_7   if BR2_ARCH_NEEDS_GCC_AT_LEAST_7
+	default BR2_TOOLCHAIN_EXTERNAL_GCC_6   if BR2_ARCH_NEEDS_GCC_AT_LEAST_6
+	default BR2_TOOLCHAIN_EXTERNAL_GCC_5   if BR2_ARCH_NEEDS_GCC_AT_LEAST_5
+	default BR2_TOOLCHAIN_EXTERNAL_GCC_4_9 if BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
+	default BR2_TOOLCHAIN_EXTERNAL_GCC_4_8 if BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	default BR2_TOOLCHAIN_EXTERNAL_GCC_4_3
 	help
 	  Set to the gcc version that is used by your external
 	  toolchain.
 
+config BR2_TOOLCHAIN_EXTERNAL_GCC_7
+	bool "7.x"
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
+
 config BR2_TOOLCHAIN_EXTERNAL_GCC_6
 	bool "6.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_5
 	bool "5.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_5
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_9
 	bool "4.9.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_8
 	bool "4.8.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_7
 	bool "4.7.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_7
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_6
 	bool "4.6.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_6
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_5
 	bool "4.5.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_5
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_4
 	bool "4.4.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_4
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_4_3
 	bool "4.3.x"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	select BR2_TOOLCHAIN_GCC_AT_LEAST_4_3
 
 config BR2_TOOLCHAIN_EXTERNAL_GCC_OLD
 	bool "older"
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_8
 	help
 	  Use this option if your GCC version is older than any of the
 	  above.
@@ -89,6 +108,30 @@ choice
 	    m = ( LINUX_VERSION_CODE >> 8  ) & 0xFF
 	    p = ( LINUX_VERSION_CODE >> 0  ) & 0xFF
 
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_15
+	bool "4.15.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15
+
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14
+	bool "4.14.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
+
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_13
+	bool "4.13.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13
+
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_12
+	bool "4.12.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_11
+	bool "4.11.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_10
+	bool "4.10.x"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+
 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9
 	bool "4.9.x"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in
index 5f66f566..9134c27f 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in
@@ -1,5 +1,5 @@
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64
-	bool "Linaro AArch64 2017.08"
+	bool "Linaro AArch64 2017.11"
 	depends on BR2_aarch64
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on !BR2_STATIC_LIBS
@@ -7,8 +7,8 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64
 	select BR2_TOOLCHAIN_HAS_SSP
 	select BR2_INSTALL_LIBSTDCPP
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
 	select BR2_TOOLCHAIN_HAS_FORTRAN
 	help
 	  Toolchain for the AArch64 architecture, from
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash
index 2360280e..fb24f1b3 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 6365480ab93e30185ffd33070b9332e0caa2c3c0813dd71bfbc83d300b76b4c9  gcc-linaro-6.4.1-2017.08-i686_aarch64-linux-gnu.tar.xz
-sha256 f507d071c6969665e26c595d6d952d7b18eb11609a71cb6debbafb55d700522a  gcc-linaro-6.4.1-2017.08-x86_64_aarch64-linux-gnu.tar.xz
+sha256 3130033eaf18d7f7d775aa8ade1c7044683b0db6f332cae29cab7d1caaee97ed  gcc-linaro-7.2.1-2017.11-i686_aarch64-linux-gnu.tar.xz
+sha256 20181f828e1075f1a493947ff91e82dd578ce9f8638fbdfc39e24b62857d8f8d  gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu.tar.xz
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk
index 6053ea78..93e00669 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-aarch64/toolchain-external-linaro-aarch64.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.08
-TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/6.4-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu
+TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION = 2017.11
+TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SITE = https://releases.linaro.org/components/toolchain/binaries/7.2-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)/aarch64-linux-gnu
 
 ifeq ($(HOSTARCH),x86)
-TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz
+TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-i686_aarch64-linux-gnu.tar.xz
 else
-TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz
+TOOLCHAIN_EXTERNAL_LINARO_AARCH64_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_AARCH64_VERSION)-x86_64_aarch64-linux-gnu.tar.xz
 endif
 
 $(eval $(toolchain-external-package))
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in
index fd4e03b2..d383273c 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in
@@ -4,9 +4,9 @@ comment "Linaro toolchains available for Cortex-A + EABIhf"
 	depends on !BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM
-	bool "Linaro ARM 2017.08"
+	bool "Linaro ARM 2017.11"
 	depends on BR2_arm
-	depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8
+	depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABIHF
 	depends on !BR2_STATIC_LIBS
@@ -14,13 +14,13 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARM
 	select BR2_TOOLCHAIN_HAS_SSP
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
 	select BR2_TOOLCHAIN_HAS_FORTRAN
 	help
 	  Linaro toolchain for the ARM architecture. It uses Linaro
-	  GCC 2017.08 (based on gcc 6.4.1), Linaro GDB 2017.08 (based on
-	  GDB 8.0), glibc 2.23, Binutils 2017.08 (based on 2.27). It
+	  GCC 2017.11 (based on gcc 7.2.1), Linaro GDB 2017.11 (based on
+	  GDB 8.0), glibc 2.25, Binutils 2017.11 (based on 2.28). It
 	  generates code that runs on all Cortex-A profile devices,
 	  but tuned for the Cortex-A9. The code generated is Thumb 2,
 	  with the hard floating point calling convention, and uses
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash
index 664663df..352cbb25 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 a99029dff3d17d28c89831f2cd2aa37752c2f85fe89fe38fdd17971c36a9f1dc  gcc-linaro-6.4.1-2017.08-i686_arm-linux-gnueabihf.tar.xz
-sha256 1c975a1936cc966099b3fcaff8f387d748caff27f43593214ae6d4601241ae40  gcc-linaro-6.4.1-2017.08-x86_64_arm-linux-gnueabihf.tar.xz
+sha256 72919a3a99d4e28309bc8b0e615f44c65824ef012de50db3ffe9a34776e6f510  gcc-linaro-7.2.1-2017.11-i686_arm-linux-gnueabihf.tar.xz
+sha256 cee0087b1f1205b73996651b99acd3a926d136e71047048f1758ffcec69b1ca2  gcc-linaro-7.2.1-2017.11-x86_64_arm-linux-gnueabihf.tar.xz
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk
index a165184b..5437fe2d 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-arm/toolchain-external-linaro-arm.mk
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.08
-TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/6.4-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf
+TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION = 2017.11
+TOOLCHAIN_EXTERNAL_LINARO_ARM_SITE = https://releases.linaro.org/components/toolchain/binaries/7.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)/arm-linux-gnueabihf
 
 ifeq ($(HOSTARCH),x86)
-TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz
+TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-i686_arm-linux-gnueabihf.tar.xz
 else
-TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz
+TOOLCHAIN_EXTERNAL_LINARO_ARM_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARM_VERSION)-x86_64_arm-linux-gnueabihf.tar.xz
 endif
 
 $(eval $(toolchain-external-package))
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in
index 5fb7eb5c..a3dd3c90 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in
@@ -4,9 +4,9 @@ comment "Linaro toolchains available for Cortex-A + EABIhf"
 	depends on !BR2_STATIC_LIBS
 
 config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB
-	bool "Linaro armeb 2017.08"
+	bool "Linaro armeb 2017.11"
 	depends on BR2_armeb
-	depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8
+	depends on BR2_ARM_CPU_ARMV7A || BR2_ARM_CPU_ARMV8A
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	depends on BR2_ARM_EABIHF
 	depends on !BR2_STATIC_LIBS
@@ -14,13 +14,13 @@ config BR2_TOOLCHAIN_EXTERNAL_LINARO_ARMEB
 	select BR2_TOOLCHAIN_HAS_SSP
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_INSTALL_LIBSTDCPP
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_6
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_10
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
 	help
 	  Linaro toolchain for the ARM big endian architecture. It
-	  uses Linaro GCC 2017.08 (based on gcc 6.4.1), Linaro GDB
-	  2017.08 (based on GDB 8.0), glibc 2.23, Binutils 2017.08
-	  (based on 2.27). It generates code that runs on all Cortex-A
+	  uses Linaro GCC 2017.11 (based on gcc 7.2.1), Linaro GDB
+	  2017.11 (based on GDB 8.0), glibc 2.25, Binutils 2017.11
+	  (based on 2.28). It generates code that runs on all Cortex-A
 	  profile devices, but tuned for the Cortex-A9. The code
 	  generated is Thumb 2, with the hard floating point calling
 	  convention, and uses the VFPv3-D16 FPU instructions.
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash
index c70d6404..c61611c0 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 7472ed65dd73945d4574e30fd2d26ef15d65b309dee83aaaf5a97df8fe3a94c7  gcc-linaro-6.4.1-2017.08-i686_armeb-linux-gnueabihf.tar.xz
-sha256 97a0de6ce7a77a2df7398e907621242752e6e5f1787772d7b308c82a3a039fab  gcc-linaro-6.4.1-2017.08-x86_64_armeb-linux-gnueabihf.tar.xz
+sha256 1337734b61fa246ab20a371d2802d09ad80d7b17eb62327b3b69b9edfb6bc4a1  gcc-linaro-7.2.1-2017.11-i686_armeb-linux-gnueabihf.tar.xz
+sha256 c313149b6ea14e31f643aeee39e1460ae4245b75c75befd042ff4b63a07971c0  gcc-linaro-7.2.1-2017.11-x86_64_armeb-linux-gnueabihf.tar.xz
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk
index ff2c5d60..1daa1c93 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-linaro-armeb/toolchain-external-linaro-armeb.mk
@@ -4,13 +4,14 @@
 #
 ################################################################################
 
-TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.08
-TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/6.4-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf
+TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION = 2017.11
+
+TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SITE = https://releases.linaro.org/components/toolchain/binaries/7.2-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)/armeb-linux-gnueabihf
 
 ifeq ($(HOSTARCH),x86)
-TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz
+TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-i686_armeb-linux-gnueabihf.tar.xz
 else
-TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-6.4.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz
+TOOLCHAIN_EXTERNAL_LINARO_ARMEB_SOURCE = gcc-linaro-7.2.1-$(TOOLCHAIN_EXTERNAL_LINARO_ARMEB_VERSION)-x86_64_armeb-linux-gnueabihf.tar.xz
 endif
 
 $(eval $(toolchain-external-package))
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in
index f438ea76..fefbb47b 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in
@@ -1,18 +1,18 @@
 config BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC
-	bool "Synopsys ARC 2016.09 toolchain"
+	bool "Synopsys ARC 2017.09 toolchain"
 	depends on BR2_arc
+	depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
 	depends on BR2_HOSTARCH = "x86_64"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_ENABLE_LOCALE
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
 	select BR2_TOOLCHAIN_HAS_SSP
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8
-	select BR2_TOOLCHAIN_GCC_AT_LEAST_6
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
+	select BR2_TOOLCHAIN_GCC_AT_LEAST_7
 	help
 	  Toolchain for the ARC cores, from
 	  https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash
index c96f53b1..3479e18c 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.hash
@@ -1,5 +1,5 @@
-# Locally calculated
-sha256 9123e35510cc9105e5f9468d5154e0093770d7c11ed771c1a595ecf813692baf  arc_gnu_2016.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz
-sha256 3140066cdbda2df7ed0fb60424bbd9db740fb25393928e733234b0bf65508df2  arc_gnu_2016.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz
-sha256 aa6edb2101b13df3ac59f8d8ccbcfba37a6f7882f0e03baa9d9883480dbed4e7  arc_gnu_2016.09_prebuilt_uclibc_le_archs_linux_install.tar.gz
-sha256 4de227bf73536a87784d88e5f10085b91ede62c76ef8fedf53b4bf2e215054cf  arc_gnu_2016.09_prebuilt_uclibc_be_archs_linux_install.tar.gz
+# From https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/tag/arc-2017.09-release
+sha256 ef74a7567a7341bc5e5d7bf6bcff64c2515be175d08a7def52df847583080ac2  arc_gnu_2017.09_prebuilt_uclibc_le_arc700_linux_install.tar.gz
+sha256 8a7620dd7500641de40adb2ae490d90d53fcad01d13f77ba305fc00df32a26e3  arc_gnu_2017.09_prebuilt_uclibc_be_arc700_linux_install.tar.gz
+sha256 ef7afba0da38cc08d863850f4987ebd16c71c8920c51990f490ad79389f102c1  arc_gnu_2017.09_prebuilt_uclibc_le_archs_linux_install.tar.gz
+sha256 eab1d4872298008bd141104368ec0b7873af600a09704827f767ae57b067c874  arc_gnu_2017.09_prebuilt_uclibc_be_archs_linux_install.tar.gz
diff --git a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk
index f4cb7b73..d751934c 100644
--- a/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk
+++ b/bsp/buildroot/toolchain/toolchain-external/toolchain-external-synopsys-arc/toolchain-external-synopsys-arc.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2016.09
+TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION = 2017.09
 TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_SITE = https://github.com/foss-for-synopsys-dwc-arc-processors/toolchain/releases/download/arc-$(TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC_VERSION)-release
 
 ifeq ($(BR2_arc750d)$(BR2_arc770d),y)
diff --git a/bsp/buildroot/toolchain/toolchain-wrapper.c b/bsp/buildroot/toolchain/toolchain-wrapper.c
index 100aa181..c5eb813d 100644
--- a/bsp/buildroot/toolchain/toolchain-wrapper.c
+++ b/bsp/buildroot/toolchain/toolchain-wrapper.c
@@ -22,12 +22,19 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <time.h>
+#include <stdbool.h>
 
 #ifdef BR_CCACHE
 static char ccache_path[PATH_MAX];
 #endif
 static char path[PATH_MAX];
 static char sysroot[PATH_MAX];
+/* As would be defined by gcc:
+ *   https://gcc.gnu.org/onlinedocs/cpp/Standard-Predefined-Macros.html
+ * sizeof() on string literals includes the terminating \0. */
+static char _time_[sizeof("-D__TIME__=\"HH:MM:SS\"")];
+static char _date_[sizeof("-D__DATE__=\"MMM DD YYYY\"")];
 
 /**
  * GCC errors out with certain combinations of arguments (examples are
@@ -35,12 +42,15 @@ static char sysroot[PATH_MAX];
  * that we only pass the predefined one to the real compiler if the inverse
  * option isn't in the argument list.
  * This specifies the worst case number of extra arguments we might pass
- * Currently, we have:
+ * Currently, we may have:
  * 	-mfloat-abi=
  * 	-march=
  * 	-mcpu=
+ * 	-D__TIME__=
+ * 	-D__DATE__=
+ * 	-Wno-builtin-macro-redefined
  */
-#define EXCLUSIVE_ARGS	3
+#define EXCLUSIVE_ARGS	6
 
 static char *predef_args[] = {
 #ifdef BR_CCACHE
@@ -51,6 +61,9 @@ static char *predef_args[] = {
 #ifdef BR_ABI
 	"-mabi=" BR_ABI,
 #endif
+#ifdef BR_NAN
+	"-mnan=" BR_NAN,
+#endif
 #ifdef BR_FPU
 	"-mfpu=" BR_FPU,
 #endif
@@ -69,6 +82,9 @@ static char *predef_args[] = {
 #ifdef BR_NO_FUSED_MADD
 	"-mno-fused-madd",
 #endif
+#ifdef BR_FP_CONTRACT_OFF
+	"-ffp-contract=off",
+#endif
 #ifdef BR_BINFMT_FLAT
 	"-Wl,-elf2flt",
 #endif
@@ -157,6 +173,60 @@ static void check_unsafe_path(const char *arg,
 	}
 }
 
+/* Returns false if SOURCE_DATE_EPOCH was not defined in the environment.
+ *
+ * Returns true if SOURCE_DATE_EPOCH is in the environment and represent
+ * a valid timestamp, in which case the timestamp is formatted into the
+ * global variables _date_ and _time_.
+ *
+ * Aborts if SOURCE_DATE_EPOCH was set in the environment but did not
+ * contain a valid timestamp.
+ *
+ * Valid values are defined in the spec:
+ *     https://reproducible-builds.org/specs/source-date-epoch/
+ * but we further restrict them to be positive or null.
+ */
+bool parse_source_date_epoch_from_env(void)
+{
+	char *epoch_env, *endptr;
+	time_t epoch;
+	struct tm epoch_tm;
+
+	if ((epoch_env = getenv("SOURCE_DATE_EPOCH")) == NULL)
+		return false;
+	errno = 0;
+	epoch = (time_t) strtoll(epoch_env, &endptr, 10);
+	/* We just need to test if it is incorrect, but we do not
+	 * care why it is incorrect.
+	 */
+	if ((errno != 0) || !*epoch_env || *endptr || (epoch < 0)) {
+		fprintf(stderr, "%s: invalid SOURCE_DATE_EPOCH='%s'\n",
+			program_invocation_short_name,
+			epoch_env);
+		exit(1);
+	}
+	tzset(); /* For localtime_r(), below. */
+	if (localtime_r(&epoch, &epoch_tm) == NULL) {
+		fprintf(stderr, "%s: cannot parse SOURCE_DATE_EPOCH=%s\n",
+				program_invocation_short_name,
+				getenv("SOURCE_DATE_EPOCH"));
+		exit(1);
+	}
+	if (!strftime(_time_, sizeof(_time_), "-D__TIME__=\"%T\"", &epoch_tm)) {
+		fprintf(stderr, "%s: cannot set time from SOURCE_DATE_EPOCH=%s\n",
+				program_invocation_short_name,
+				getenv("SOURCE_DATE_EPOCH"));
+		exit(1);
+	}
+	if (!strftime(_date_, sizeof(_date_), "-D__DATE__=\"%b %e %Y\"", &epoch_tm)) {
+		fprintf(stderr, "%s: cannot set date from SOURCE_DATE_EPOCH=%s\n",
+				program_invocation_short_name,
+				getenv("SOURCE_DATE_EPOCH"));
+		exit(1);
+	}
+	return true;
+}
+
 int main(int argc, char **argv)
 {
 	char **args, **cur, **exec_args;
@@ -178,7 +248,7 @@ int main(int argc, char **argv)
 			perror(__FILE__ ": malloc");
 			return 2;
 		}
-		sprintf(relbasedir, "%s/../..", argv[0]);
+		sprintf(relbasedir, "%s/..", argv[0]);
 		absbasedir = realpath(relbasedir, NULL);
 	} else {
 		basename = progpath;
@@ -192,7 +262,7 @@ int main(int argc, char **argv)
 		for (i = ret; i > 0; i--) {
 			if (absbasedir[i] == '/') {
 				absbasedir[i] = '\0';
-				if (++count == 3)
+				if (++count == 2)
 					break;
 			}
 		}
@@ -208,14 +278,14 @@ int main(int argc, char **argv)
 #elif defined(BR_CROSS_PATH_ABS)
 	ret = snprintf(path, sizeof(path), BR_CROSS_PATH_ABS "/%s" BR_CROSS_PATH_SUFFIX, basename);
 #else
-	ret = snprintf(path, sizeof(path), "%s/usr/bin/%s" BR_CROSS_PATH_SUFFIX, absbasedir, basename);
+	ret = snprintf(path, sizeof(path), "%s/bin/%s" BR_CROSS_PATH_SUFFIX, absbasedir, basename);
 #endif
 	if (ret >= sizeof(path)) {
 		perror(__FILE__ ": overflow");
 		return 3;
 	}
 #ifdef BR_CCACHE
-	ret = snprintf(ccache_path, sizeof(ccache_path), "%s/usr/bin/ccache", absbasedir);
+	ret = snprintf(ccache_path, sizeof(ccache_path), "%s/bin/ccache", absbasedir);
 	if (ret >= sizeof(ccache_path)) {
 		perror(__FILE__ ": overflow");
 		return 3;
@@ -251,6 +321,20 @@ int main(int argc, char **argv)
 		*cur++ = "-mfloat-abi=" BR_FLOAT_ABI;
 #endif
 
+#ifdef BR_FP32_MODE
+	/* add fp32 mode if soft-float is not args or hard-float overrides soft-float */
+	int add_fp32_mode = 1;
+	for (i = 1; i < argc; i++) {
+		if (!strcmp(argv[i], "-msoft-float"))
+			add_fp32_mode = 0;
+		else if (!strcmp(argv[i], "-mhard-float"))
+			add_fp32_mode = 1;
+	}
+
+	if (add_fp32_mode == 1)
+		*cur++ = "-mfp" BR_FP32_MODE;
+#endif
+
 #if defined(BR_ARCH) || \
     defined(BR_CPU)
 	/* Add our -march/cpu flags, but only if none of
@@ -272,6 +356,13 @@ int main(int argc, char **argv)
 	}
 #endif /* ARCH || CPU */
 
+	if (parse_source_date_epoch_from_env()) {
+		*cur++ = _time_;
+		*cur++ = _date_;
+		/* This has existed since gcc-4.4.0. */
+		*cur++ = "-Wno-builtin-macro-redefined";
+	}
+
 	paranoid_wrapper = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
 	if (paranoid_wrapper && strlen(paranoid_wrapper) > 0)
 		paranoid = 1;
diff --git a/bsp/buildroot/toolchain/toolchain-wrapper.mk b/bsp/buildroot/toolchain/toolchain-wrapper.mk
index c7b50195..6e95545e 100644
--- a/bsp/buildroot/toolchain/toolchain-wrapper.mk
+++ b/bsp/buildroot/toolchain/toolchain-wrapper.mk
@@ -28,8 +28,14 @@ endif
 
 # Avoid FPU bug on XBurst CPUs
 ifeq ($(BR2_mips_xburst),y)
+# Before gcc 4.6, -mno-fused-madd was needed, after -ffp-contract is
+# needed
+ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_6),y)
+TOOLCHAIN_WRAPPER_ARGS += -DBR_FP_CONTRACT_OFF
+else
 TOOLCHAIN_WRAPPER_ARGS += -DBR_NO_FUSED_MADD
 endif
+endif
 
 ifeq ($(BR2_CCACHE_USE_BASEDIR),y)
 TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_BASEDIR='"$(BASE_DIR)"'
@@ -44,5 +50,5 @@ endef
 
 define TOOLCHAIN_WRAPPER_INSTALL
 	$(INSTALL) -D -m 0755 $(@D)/toolchain-wrapper \
-		$(HOST_DIR)/usr/bin/toolchain-wrapper
+		$(HOST_DIR)/bin/toolchain-wrapper
 endef
diff --git a/bsp/buildroot/toolchain/toolchain/toolchain.mk b/bsp/buildroot/toolchain/toolchain/toolchain.mk
index 68babc3d..179c09ed 100644
--- a/bsp/buildroot/toolchain/toolchain/toolchain.mk
+++ b/bsp/buildroot/toolchain/toolchain/toolchain.mk
@@ -13,18 +13,18 @@ endif
 TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO
 
 # Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc
-# headers and kernel headers. This is a temporary measure until musl finds a
-# better solution.
+# headers and kernel headers. This is needed for kernel headers older than
+# 4.15. Kernel headers 4.15 and newer don't require __GLIBC__ to be defined.
 #
 # Augment the original suggestion with __USE_MISC since recent kernels
-# require this glibc internal macro. Also, as musl defines IFF_LOWER_UP,
-# IFF_DORMANT and IFF_ECHO, add another macro to suppress them in the
-# kernel header, and avoid macro/enum conflict.
+# (older than 4.15) require this glibc internal macro. Also, as musl defines
+# IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO, add another macro to suppress
+# them in the kernel header, and avoid macro/enum conflict.
 #
 # Kernel version 3.12 introduced the libc-compat.h header.
 #
 # [1] http://www.openwall.com/lists/musl/2015/10/08/2
-ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12),yy)
+ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12):$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_15),yy:)
 define TOOLCHAIN_MUSL_KERNEL_HEADERS_COMPATIBILITY_HACK
 	$(SED) 's/^#if defined(__GLIBC__)$$/#if 1/' \
 		$(STAGING_DIR)/usr/include/linux/libc-compat.h
@@ -39,4 +39,5 @@ endif
 
 $(eval $(virtual-package))
 
-toolchain: $(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake
+toolchain: $(HOST_DIR)/share/buildroot/toolchainfile.cmake
+toolchain: $(HOST_DIR)/share/buildroot/Platform/Buildroot.cmake